diff --git a/.travis.yml b/.travis.yml
index 7c52d413f6..21f77350e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,7 @@
 language: php
 
 php:
- - 5.4
- - 5.5
+ - 5.5.9
  - 5.6
  - 7.0
  
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7c35e5e55c..3c5b53c2ac 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,3 +19,29 @@ PLEASE READ THE FOLLOWING BEFORE POSTING A BUG.
 **POST A GITHUB ISSUE / SUBMIT PR**
 > Make sure to put as many details as possible. If you are referring to a discussion on the Forum, add the link. The more info you give, the more easily we can reproduce the bug, the quicker we can fix it.  
 > If you are submitting a Pull Request, please sign the [Contributor License Agreement](https://pydio.com/en/community/contribute/contributor-license-agreement-cla).
+
+
+#### Setting up your dev environment
+
+Pydio 7 requires **PHP5.6** and upper. 
+
+The web root of the application is located in ***core/src/***. Create a virtual host to point to this folder, set up your webserver to use index.php as default page. This is generally done by default. 
+
+Pydio uses Composer and NPM to manage dependencies respectively in PHP and JS. It uses Grunt to build javascript sources. In order to start Pydio locally after a fresh `git clone`, you will first have to run these tools in both the core and in many plugins. 
+
+ - First install Composer (see https://getcomposer.org) and NPM (https://docs.npmjs.com/getting-started/installing-node)
+ - Install Grunt globally by running `npm install -g grunt-cli``
+ - Inside the core folder (under webroot, i.e. core/src/core/ from root of git repository), run `composer install`
+ - For each plugin that contains a composer.json file, run `composer install` as well.
+ - For each plugin tat contains a package.json file, run
+   - `npm install`
+   - `grunt`
+
+On a unix-based machine, this can be achieved by the following command (from the webroot directory):  
+```
+find . -maxdepth 5 -name Gruntfile.js -execdir bash -c "npm install && grunt" \;  
+find . -maxdepth 5 -name composer.json -execdir composer install \;
+```
+
+You should be good to go. When modifying JS files that require transpilation, there is generally a `grunt watch` task available to automatically run grunt on each file change.
+
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000..dba13ed2dd
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 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 Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are 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.
+
+  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.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  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 Affero 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. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  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 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 work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero 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 Affero 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 Affero 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 Affero 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.
+
+                     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
+state 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 Affero 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 Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
diff --git a/README.md b/README.md
index 88a54dfea7..d5f85c6287 100644
--- a/README.md
+++ b/README.md
@@ -2,13 +2,15 @@
 
 [Homepage](https://pydio.com/) |
 [GitHub-Repository](https://github.com/pydio/pydio-core) |
-[Issue-Tracker](https://github.com/pydio/pydio-core/issues) |
- [![Codacy Badge](https://api.codacy.com/project/badge/3b5cafea44e949e789d1928687e04032)](https://www.codacy.com/app/charles_3085/pydio-core) |
- [![Build Status](https://travis-ci.org/pydio/pydio-core.svg)](https://travis-ci.org/pydio/pydio-core)
+[Issue-Tracker](https://github.com/pydio/pydio-core/issues) 
+| ![Latest Stable](https://img.shields.io/badge/stable-6.4.2-brightgreen.svg) 
+| ![License Badge](https://img.shields.io/badge/License-AGPL%203%2B-blue.svg)
+| [![Codacy Badge](https://api.codacy.com/project/badge/3b5cafea44e949e789d1928687e04032)](https://www.codacy.com/app/charles_3085/pydio-core) 
+|  [![Build Status](https://travis-ci.org/pydio/pydio-core.svg)](https://travis-ci.org/pydio/pydio-core) 
 
 This is the main source code repository of Pydio (formerly AjaXplorer), containing all the PHP server and HTML5 Web GUI.
 
-* Latest Stable release : 6.4.1
+* Latest Stable release : 6.4.2
 * Latest Dev release : 6.3.1 (was RC for Pydio 6.4)
 * License: [AGPLv3](https://www.gnu.org/licenses/agpl.html)
 * Lead developer  : Charles du Jeu (cdujeu): [Github](https://github.com/cdujeu) | [Twitter](https://twitter.com/Pydio)
@@ -20,6 +22,31 @@ Please DO NOT send emails to Charles, but use the forum located on https://pydio
 
 ### How to contribute / Developer Resources
 
+#### Setting up your dev environment
+
+Pydio 7 requires **PHP5.5.9** and upper. 
+
+The web root of the application is located in ***core/src/***. Create a virtual host to point to this folder, set up your webserver to use index.php as default page. This is generally done by default. 
+
+Pydio uses Composer and NPM to manage dependencies respectively in PHP and JS. It uses Grunt to build javascript sources. In order to start Pydio locally after a fresh `git clone`, you will first have to run these tools in both the core and in many plugins. 
+
+ - First install Composer (see https://getcomposer.org) and NPM (https://docs.npmjs.com/getting-started/installing-node)
+ - Install Grunt globally by running `npm install -g grunt-cli``
+ - Inside the core folder (under webroot, i.e. core/src/core/ from root of git repository), run `composer install`
+ - For each plugin that contains a composer.json file, run `composer install` as well.
+ - For each plugin tat contains a package.json file, run
+   - `npm install`
+   - `grunt`
+
+On a unix-based machine, this can be achieved by the following command (from the webroot directory):  
+```
+find . -maxdepth 5 -name Gruntfile.js -execdir bash -c "npm install && grunt" \;  
+find . -maxdepth 5 -name composer.json -execdir composer install \;
+```
+
+You should be good to go. When modifying JS files that require transpilation, there is generally a `grunt watch` task available to automatically run grunt on each file change.
+
+
 #### Coding guidelines
 
 To enforce some coding standards, please run scripts in
diff --git a/core/src/.gitignore b/core/src/.gitignore
index 97c57dd2ad..a806073d94 100644
--- a/core/src/.gitignore
+++ b/core/src/.gitignore
@@ -1,7 +1,3 @@
-/plugins/access.ajxp_home/res/build
-/plugins/access.inbox/res/build
-/plugins/core.mailer/js/build
-/plugins/gui.ajax/res/js/ui/reactjs/build/
 .idea/
 data/cache/*
 data/files/*
@@ -10,9 +6,17 @@ data/personal/*
 data/plugins/*
 data/public/*
 data/tmp
-node_modules/
+node_modules
 .DS_Store
 .jshintignore
 .jshintrc
-/plugins/gui.ajax/res/mui/mui-sources
-.validate.json
\ No newline at end of file
+.validate.json
+composer.lock
+/core/vendor/
+/plugins/*/vendor/
+/plugins/access.ajxp_user/build
+/plugins/access.ajxp_home/res/build
+/plugins/access.inbox/res/build
+/plugins/core.mailer/js/build
+/plugins/uploader.html/js/build
+/plugins/core.tasks/js/build
diff --git a/core/src/.htaccess b/core/src/.htaccess
index b1cae48ce6..2a032edc5d 100644
--- a/core/src/.htaccess
+++ b/core/src/.htaccess
@@ -8,14 +8,6 @@ RewriteEngine on
 RewriteBase /
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule ^shares ./dav.php [L]
-RewriteRule ^api ./rest.php [L]
-RewriteRule ^ocs/ ./opencollab.php [L]
-RewriteRule ^ocs-provider/ ./opencollab.php [L]
-RewriteRule ^user ./index.php?get_action=user_access_point [L]
-RewriteCond %{REQUEST_URI} !^/index
-RewriteCond %{REQUEST_URI} !^/plugins
-RewriteCond %{REQUEST_URI} ^/dashboard|^/settings|^/welcome|^/ws-
 RewriteRule (.*) index.php [L]
 
 #Following lines seem to be necessary if PHP is working
@@ -29,8 +21,8 @@ RewriteRule (.*) index.php [L]
 # to make sure that authorization is transmitted.
 # Just remove the # at the beginning of the line
 
-#SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
+SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
 
 </IfModule>
 
-AddType application/json .json
\ No newline at end of file
+AddType application/json .json
diff --git a/core/src/base.conf.php b/core/src/base.conf.php
index 7e0c651065..eb24a818bc 100644
--- a/core/src/base.conf.php
+++ b/core/src/base.conf.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  *
  * This is the main configuration file for configuring the core of the application.
  * In a standard usage, you should not have to change any variables.
diff --git a/core/src/cmd.php b/core/src/cmd.php
index d48ff8bd4f..bdfdae9e2f 100644
--- a/core/src/cmd.php
+++ b/core/src/cmd.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
  * This file is part of Pydio.
  *
  * Pydio is free software: you can redistribute it and/or modify
@@ -16,235 +16,24 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  *
  * Description : Command line access of the framework.
  */
 if (php_sapi_name() !== "cli") {
     die("This is the command line version of the framework, you are not allowed to access this page");
 }
-
-include_once("base.conf.php");
-
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-header("Cache-Control: no-cache, must-revalidate");
-header("Pragma: no-cache");
-//set_error_handler(array("AJXP_XMLWriter", "catchError"), E_ALL & ~E_NOTICE );
-//set_exception_handler(array("AJXP_XMLWriter", "catchException"));
+include_once ("base.conf.php");
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\AuthService;
+use Symfony\Component\Console\Application;
+use Pydio\Core\Http\Cli\Command;
 
 ConfService::init();
 ConfService::start();
 
-$confStorageDriver = ConfService::getConfStorageImpl();
-require_once($confStorageDriver->getUserClassFileName());
-//session_name("AjaXplorer");
-//session_start();
-
-
-$optArgs = array();
-$options = array();
-$regex = '/^-(-?)([a-zA-z0-9_]*)=(.*)/';
-foreach ($argv as $key => $argument) {
-    //echo("$key => $argument \n");
-    if (preg_match($regex, $argument, $matches)) {
-        if ($matches[1] == "-") {
-            $optArgs[trim($matches[2])] = SystemTextEncoding::toUTF8(trim($matches[3]));
-        } else {
-            $options[trim($matches[2])] = SystemTextEncoding::toUTF8(trim($matches[3]));
-        }
-    }
-}
-
-$optUser = $options["u"];
-if (!empty($optUser)) {
-
-    if (isSet($options["p"])) {
-        $optPass = $options["p"];
-    } else {
-        // Consider "u" is a crypted version of u:p
-        $optToken = $options["t"];
-        $cKey = ConfService::getCoreConf("AJXP_CLI_SECRET_KEY", "conf");
-        if(empty($cKey)) $cKey = "\1CDAFx¨op#";
-        $optUser = trim(mcrypt_decrypt(MCRYPT_RIJNDAEL_256, md5($optToken.$cKey), base64_decode($optUser), MCRYPT_MODE_ECB), "\0");
-        $env = getenv("AJXP_SAFE_CREDENTIALS");
-        if(!empty($env)){
-            $array = AJXP_Safe::getCredentialsFromEncodedString($env);
-            if(isSet($array["user"]) && $array["user"] == $optUser){
-                unset($optToken);
-                $optPass = $array["password"];
-            }
-        }
-    }
-    if (strpos($optUser,",") !== false) {
-        $originalOptUser = $optUser;
-        $nextUsers = explode(",", $optUser);
-        $optUser = array_shift($nextUsers);
-        $nextUsers = implode(",",$nextUsers);
-    } else if (strpos($optUser, "queue:") === 0) {
-        $optUserQueue = substr($optUser, strlen("queue:"));
-        $optUser = false;
-        //echo("QUEUE : ".$optUserQueue);
-        if (is_file($optUserQueue)) {
-            $lines = file($optUserQueue);
-            if (count($lines) && !empty($lines[0])) {
-                $allUsers = explode(",", $lines[0]);
-                $optUser = array_shift($allUsers);
-                file_put_contents($optUserQueue, implode(",", $allUsers));
-            }
-        }
-        if ($optUser === false) {
-            if (is_file($optUserQueue)) {
-                unlink($optUserQueue);
-            }
-            die("No more users inside queue");
-        }
-    }
-}
-
-
-$optStatusFile = $options["s"] OR false;
-$optAction = $options["a"];
-$optRepoId = $options["r"] OR false;
-if (strpos($optRepoId,",") !== false) {
-    $nextRepositories = explode(",", $optRepoId);
-    $optRepoId = array_shift($nextRepositories);
-    $nextRepositories = implode(",", $nextRepositories);
-}
-
-//echo("REPOSITORY : ".$optRepoId." USER : ".$optUser."\n");
-
-$optDetectUser = $options["detect_user"] OR false;
-$detectedUser = false;
-
-if ($optRepoId !== false) {
-    $repository = ConfService::getRepositoryById($optRepoId);
-    if ($repository == null) {
-        $repository = ConfService::getRepositoryByAlias($optRepoId);
-        if ($repository != null) {
-            $optRepoId =($repository->isWriteable()?$repository->getUniqueId():$repository->getId());
-        }
-    }
-    if ($optDetectUser != false) {
-        $path = $repository->getOption("PATH", true);
-        if (strpos($path, "AJXP_USER") !== false) {
-            $path = str_replace(
-                array("AJXP_INSTALL_PATH", "AJXP_DATA_PATH", "/"),
-                array(AJXP_INSTALL_PATH, AJXP_DATA_PATH, DIRECTORY_SEPARATOR),
-                $path
-            );
-            $parts = explode("AJXP_USER", $path);
-            if(count($parts) == 1) $parts[1] = "";
-            $first = str_replace("\\", "\\\\", $parts[0]);
-            $last = str_replace("\\", "\\\\", $parts[1]);
-            if (preg_match("/$first(.*)$last.*/", $optDetectUser, $matches)) {
-                $detectedUser = $matches[1];
-            }
-        }
-    }
-    try{
-        ConfService::switchRootDir($optRepoId, true);
-    }catch(AJXP_Exception $e){}
-} else {
-    if ($optStatusFile) {
-        file_put_contents($optStatusFile, "ERROR:You must pass a -r argument specifying either a repository id or alias");
-    }
-    die("You must pass a -r argument specifying either a repository id or alias");
-}
-
-if (AuthService::usersEnabled() && !empty($optUser)) {
-    $seed = AuthService::generateSeed();
-    if ($seed != -1) {
-        $optPass = md5(md5($optPass).$seed);
-    }
-    $loggingResult = AuthService::logUser($optUser, $optPass, isSet($optToken), false, $seed);
-    // Check that current user can access current repository, try to switch otherwise.
-    $loggedUser = AuthService::getLoggedUser();
-    if ($loggedUser != null && $detectedUser !== false && $loggedUser->isAdmin()) {
-        AuthService::disconnect();
-        AuthService::logUser($detectedUser, "empty", true, false, "");
-        $loggedUser = AuthService::getLoggedUser();
-    }
-
-    if ($loggedUser != null) {
-        ConfService::switchRootDir($optRepoId, true);
-        /*
-        $res = ConfService::switchUserToActiveRepository($loggedUser, $optRepoId);
-        if (!$res) {
-            AuthService::disconnect();
-            $requireAuth = true;
-        }
-        */
-    }
-    if (isset($loggingResult) && $loggingResult != 1) {
-        AJXP_XMLWriter::header();
-        AJXP_XMLWriter::loggingResult($loggingResult, false, false, "");
-        AJXP_XMLWriter::close();
-        if ($optStatusFile) {
-            file_put_contents($optStatusFile, "ERROR:No user logged");
-        }
-    }
-} else {
-    AJXP_Logger::debug(ConfService::getCurrentRepositoryId());
-}
-
-//Set language
-$loggedUser = AuthService::getLoggedUser();
-if($loggedUser != null && $loggedUser->getPref("lang") != "") ConfService::setLanguage($loggedUser->getPref("lang"));
-else if(isSet($_COOKIE["AJXP_lang"])) ConfService::setLanguage($_COOKIE["AJXP_lang"]);
-$mess = ConfService::getMessages();
-
-// THIS FIRST DRIVERS DO NOT NEED ID CHECK
-//$ajxpDriver = AJXP_PluginsService::findPlugin("gui", "ajax");
-$authDriver = ConfService::getAuthDriverImpl();
-// DRIVERS BELOW NEED IDENTIFICATION CHECK
-if (!AuthService::usersEnabled() || ConfService::getCoreConf("ALLOW_GUEST_BROWSING", "auth") || AuthService::getLoggedUser()!=null) {
-    $confDriver = ConfService::getConfStorageImpl();
-    $loadRepo = ConfService::getRepository();
-    $Driver = ConfService::loadDriverForRepository($loadRepo);
-}
-AJXP_PluginsService::getInstance()->initActivePlugins();
-require_once(AJXP_BIN_FOLDER."/class.AJXP_Controller.php");
-$xmlResult = AJXP_Controller::findActionAndApply($optAction, $optArgs, array());
-if ($xmlResult !== false && $xmlResult != "") {
-    AJXP_XMLWriter::header();
-    print($xmlResult);
-    AJXP_XMLWriter::close();
-} else if (isset($requireAuth) && AJXP_Controller::$lastActionNeedsAuth) {
-    AJXP_XMLWriter::header();
-    AJXP_XMLWriter::requireAuth();
-    AJXP_XMLWriter::close();
-}
-//echo("NEXT REPO ".$nextRepositories." (".$options["r"].")\n");
-//echo("NEXT USERS ".$nextUsers." ( ".$originalOptUser." )\n");
-if (!empty($nextUsers) || !empty($nextRepositories) || !empty($optUserQueue) ) {
-
-    if (!empty($nextUsers)) {
-        sleep(1);
-        $process = AJXP_Controller::applyActionInBackground($options["r"], $optAction, $optArgs, $nextUsers, $optStatusFile);
-        if ($process != null && is_a($process, "UnixProcess") && isSet($optStatusFile)) {
-            file_put_contents($optStatusFile, "RUNNING:".$process->getPid());
-        }
-    }
-    if (!empty($optUserQueue)) {
-        sleep(1);
-        //echo("Should go to next with $optUserQueue");
-        $process = AJXP_Controller::applyActionInBackground($options["r"], $optAction, $optArgs, "queue:".$optUserQueue, $optStatusFile);
-        if ($process != null && is_a($process, "UnixProcess") && isSet($optStatusFile)) {
-            file_put_contents($optStatusFile, "RUNNING:".$process->getPid());
-        }
-    }
-    if (!empty($nextRepositories)) {
-        sleep(1);
-        $process = AJXP_Controller::applyActionInBackground($nextRepositories, $optAction, $optArgs, $originalOptUser, $optStatusFile);
-        if ($process != null && is_a($process, "UnixProcess") && isSet($optStatusFile)) {
-            file_put_contents($optStatusFile, "RUNNING:".$process->getPid());
-        }
-    }
-
-} else if (isSet($optStatusFile)) {
-
-    $status = explode(":", file_get_contents($optStatusFile));
-    file_put_contents($optStatusFile, "FINISHED".(in_array("QUEUED", $status)?":QUEUED":""));
-
-}
+$input = new \Pydio\Core\Http\Cli\FreeArgvOptions();
+$application = new Application();
+$application->add(new Command());
+$application->setDefaultCommand("pydio");
+$application->run($input);
\ No newline at end of file
diff --git a/core/src/conf/RELEASE_NOTE b/core/src/conf/RELEASE_NOTE
index 7fefd8f132..e9e226041d 100644
--- a/core/src/conf/RELEASE_NOTE
+++ b/core/src/conf/RELEASE_NOTE
@@ -1,5 +1,17 @@
 Pydio ##VERSION_NUMBER## Release Note
 
+TODO : This is a temporary package for testing upgrade from v6 to v7
+
+Second beta for Pydio 7
+
+----
+Pydio Core 6.5.1
+
+Very first beta for Pydio 7
+
+----
+Pydio Core 6.4.2
+
 Pydio Core 6.4.2 fixes vulnerabilities discovered in remote download and some specific path filtering on Windows server OS. Installation is done via the "Stable" update channel in-app, or via Linux packages manager depending on your installation mode.
 
 [Most noticeable changes]
@@ -140,8 +152,8 @@ Do not encodeURIComponent for oldSchoolMailer - Should fix #1138
 Fix #1180: Unpatch the path for zip files before we check against the…  …
 Force overriding conf/extensions.conf.php during upgrade, as output f… …
 Init new release note.
-FIx JSPacker static function call.
-
+Fix JSPacker static function call.
+Fix FormManager when setting default value inside group-based selectors
 
 -------
 Pydio Core 6.4.1 - Bug Fixes for 6.4
diff --git a/core/src/conf/bootstrap_conf.php b/core/src/conf/bootstrap_conf.php
index ea5ca2d17c..be488a84ac 100644
--- a/core/src/conf/bootstrap_conf.php
+++ b/core/src/conf/bootstrap_conf.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  *
  * These configuration must be set at the very root loading of the framework
  */
diff --git a/core/src/conf/bootstrap_context.php b/core/src/conf/bootstrap_context.php
index dad91ece71..952a1887f8 100644
--- a/core/src/conf/bootstrap_context.php
+++ b/core/src/conf/bootstrap_context.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  *
  * This is the main configuration file for configuring the core of the application.
  * In a standard usage, you should not have to change any variables.
@@ -53,12 +53,15 @@
 define("AJXP_PLUGINS_MESSAGES_FILE", AJXP_CACHE_DIR."/plugins_messages.ser");
 define("AJXP_SERVER_ACCESS", "index.php");
 define("AJXP_PLUGINS_FOLDER", "plugins");
-define("AJXP_BIN_FOLDER_REL", "core/classes");
-define("AJXP_BIN_FOLDER", AJXP_INSTALL_PATH."/core/classes");
+define("AJXP_BIN_FOLDER_REL", "core/src");
+define("AJXP_VENDOR_FOLDER_REL", "core/vendor");
+define("AJXP_BIN_FOLDER", AJXP_INSTALL_PATH."/core/src");
+define("AJXP_VENDOR_FOLDER", AJXP_INSTALL_PATH."/core/vendor");
 define("AJXP_DOCS_FOLDER", "core/doc");
 define("AJXP_COREI18N_FOLDER", AJXP_INSTALL_PATH."/plugins/core.ajaxplorer/i18n");
-define("TESTS_RESULT_FILE", AJXP_CACHE_DIR."/diag_result.php");
-define("AJXP_TESTS_FOLDER", AJXP_INSTALL_PATH."/core/tests");
+define("TESTS_RESULT_FILE", AJXP_DATA_PATH."/plugins/boot.conf/diag_result.php");
+define("TESTS_RESULT_FILE_LEGACY", AJXP_CACHE_DIR."/diag_result.php");
+define("AJXP_TESTS_FOLDER", AJXP_BIN_FOLDER."/pydio/Tests");
 define("INITIAL_ADMIN_PASSWORD", "admin");
 // Startup admin password (used at first creation). Once
 // The admin password is created and his password is changed,
@@ -70,10 +73,6 @@
 // example in log.serial. Do not forget the trailing slash
 // define("AJXP_FORCE_LOGPATH", "/var/log/ajaxplorer/");
 
-// KEY-VALUE-CACHE
-define("AJXP_KVCACHE_PREFIX", "pydio-unique-id");
-define("AJXP_KVCACHE_IGNORE", true);
-
 // DEBUG OPTIONS
 define("AJXP_CLIENT_DEBUG"  ,	false);
 define("AJXP_SERVER_DEBUG"  ,	false);
@@ -92,44 +91,52 @@
 define("HASH_SALT_INDEX", 2);
 define("HASH_PBKDF2_INDEX", 3);
 
+// Used to identify the booster admin tasks
+define("PYDIO_BOOSTER_TASK_IDENTIFIER", "pydio-booster");
+
 // CAN BE SWITCHED TO TRUE TO MAKE THE SECURE TOKEN MORE SAFE
 // MAKE SURE YOU HAVE PHP.5.3, OPENSSL, AND THAT IT DOES NOT DEGRADE PERFORMANCES
 define("USE_OPENSSL_RANDOM", false);
 
-function AjaXplorer_autoload($className)
+require_once (AJXP_VENDOR_FOLDER . "/autoload.php");
+$corePlugAutoloads = glob(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/core.*/vendor/autoload.php", GLOB_NOSORT);
+if ($corePlugAutoloads !== false && count($corePlugAutoloads)) {
+    foreach($corePlugAutoloads as $autoloader){
+        require_once ($autoloader);
+    }
+}
+
+/**
+ * Used as autoloader
+ * @param $className
+ */
+function pydioAutoloader($className)
 {
+    // Temp : super dummy autoloader, take only class name
+    $parts = explode("\\", $className);
+    $className = array_pop($parts);
+
     if($className == "dibi"){
-        require_once(AJXP_BIN_FOLDER."/dibi/dibi.php");
+        require_once(AJXP_BIN_FOLDER."/lib/dibi/dibi.php");
     }
-    $fileName = AJXP_BIN_FOLDER."/"."class.".$className.".php";
-    if (file_exists($fileName)) {
-        require_once($fileName);
-        return;
-    }
-    $fileName = AJXP_BIN_FOLDER."/"."interface.".$className.".php";
-    if (file_exists($fileName)) {
-        require_once($fileName);
-        return;
-    }
-    $corePlugClass = glob(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/core.*/class.".$className.".php", GLOB_NOSORT);
+    $corePlugClass = glob(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/core.*/".$className.".php", GLOB_NOSORT);
     if ($corePlugClass !== false && count($corePlugClass)) {
         require_once($corePlugClass[0]);
         return;
     }
-    $corePlugInterface = glob(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/core.*/interface.".$className.".php", GLOB_NOSORT);
-    if ($corePlugInterface !== false && count($corePlugInterface)) {
-        require_once($corePlugInterface[0]);
-        return;
-    }
 }
-spl_autoload_register('AjaXplorer_autoload');
+spl_autoload_register('pydioAutoloader');
+
+include_once(AJXP_INSTALL_PATH . "/core/compat.php");
+
+use Pydio\Core\Services\ApplicationState;
 
-AJXP_Utils::safeIniSet("session.cookie_httponly", 1);
+ApplicationState::safeIniSet("session.cookie_httponly", 1);
 
 if (is_file(AJXP_CONF_PATH."/bootstrap_conf.php")) {
     include(AJXP_CONF_PATH."/bootstrap_conf.php");
     if (isSet($AJXP_INISET)) {
-        foreach($AJXP_INISET as $key => $value) AJXP_Utils::safeIniSet($key, $value);
+        foreach($AJXP_INISET as $key => $value) ApplicationState::safeIniSet($key, $value);
     }
     if (defined('AJXP_LOCALE')) {
         setlocale(LC_CTYPE, AJXP_LOCALE);
diff --git a/core/src/conf/bootstrap_repositories.php b/core/src/conf/bootstrap_repositories.php
index b56d664e47..1ed4e4e8d1 100644
--- a/core/src/conf/bootstrap_repositories.php
+++ b/core/src/conf/bootstrap_repositories.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  *
  * Description : configuration file
  * BASIC REPOSITORY CONFIGURATION.
diff --git a/core/src/conf/extensions.conf.php b/core/src/conf/extensions.conf.php
index 478a17c4c6..bbf03c4f90 100644
--- a/core/src/conf/extensions.conf.php
+++ b/core/src/conf/extensions.conf.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  *
  * Core extensions and icons supported. You can add a line in this file to support
  * more extensions.
diff --git a/core/src/conf/templates/bootstrap_plugins.bridges.php b/core/src/conf/templates/bootstrap_plugins.bridges.php
deleted file mode 100644
index c727824f9c..0000000000
--- a/core/src/conf/templates/bootstrap_plugins.bridges.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- * This is the main configuration file for configuring the basic plugins the application
- * needs to run properly : an Authentication plugin, a Configuration plugin, and a Logger plugin.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-/********************************************
- * CUSTOM VARIABLES HOOK
- ********************************************/
-/**
- * This is a sample "hard" hook, directly included. See directly the PluginSkeleton class
- * for more explanation.
- */
-//require_once AJXP_INSTALL_PATH."/plugins/action.skeleton/class.PluginSkeleton.php";
-//AJXP_Controller::registerIncludeHook("vars.filter", array("PluginSkeleton", "filterVars"));
-
-/*********************************************************
- * PLUGINS DEFINITIONS
- * Drivers will define how the application will work. For
- * each type of operation, there are multiple implementation
- * possible. Check the content of the plugins folder.
- * CONF = users and repositories definition,
- * AUTH = users authentication mechanism,
- * LOG = logs of the application.
- *
- * This template shows how to configure the auth.remote plugin
- * for joomla or Drupal
- *
-*********************************************************/
-$PLUGINS = array(
-    "CONF_DRIVER" => array(
-           "NAME"		=> "serial",
-           "OPTIONS"	=> array(
-               "REPOSITORIES_FILEPATH"	=> "AJXP_DATA_PATH/plugins/conf.serial/repo.ser",
-               "ROLES_FILEPATH"		=> "AJXP_DATA_PATH/plugins/auth.serial/roles.ser",
-               "USERS_DIRPATH"			=> "AJXP_DATA_PATH/plugins/auth.serial",
-               "FAST_CHECKS"		    => false,
-               "CUSTOM_DATA"			=> array(
-                       "email"	    => "Email",
-                       "country"   => "Country",
-                       "USER_QUOTA"=> "Quota"
-                   )
-               )
-       ),
-    "AUTH_DRIVER" => array(
-           "NAME"		=> "remote",
-           "OPTIONS"	=> array(
-               "SLAVE_MODE"  => true,
-               "USERS_FILEPATH" => "AJXP_DATA_PATH/plugins/auth.serial/users.ser",
-               "MASTER_AUTH_FUNCTION" => "joomla_remote_auth",
-               "MASTER_HOST"		=> "localhost",
-               "MASTER_URI"		=> "/joomla/",
-               "LOGIN_URL" => "/joomla/",  // The URL to redirect (or call) upon login (typically if one of your user type: http://yourserver/path/to/ajxp, he will get redirected to this url to login into your frontend
-               "LOGOUT_URL" => "/joomla/",  // The URL to redirect upon login out (see above)
-               "SECRET" => "myprivatesecret",// the same as the one you put in the WP plugin option.
-               "TRANSMIT_CLEAR_PASS"   => true // Don't touch this. It's unsafe (and useless here) to transmit clear password.
-           )
-       ),
-    /*
-       // Same for Drupal 7.X
-       "AUTH_DRIVER"  => array(
-           "NAME" => "remote",
-           "OPTIONS" => array(
-               "SLAVE_MODE" => true,
-               "USERS_FILEPATH" => "AJXP_INSTALL_PATH/plugins/auth.serial/users.ser",
-               "LOGIN_URL" => "/drupal/",
-               "LOGOUT_URL" => "/drupal/?q=user/logout",
-               "MASTER_AUTH_FUNCTION" => "drupal_remote_auth",
-               "MASTER_HOST" => "192.168.0.10",
-               "MASTER_URI" => "/drupal/",
-               "MASTER_AUTH_FORM_ID" => "user-login-form",
-               "SECRET" => "my_own_private_Drupal_key",
-               "TRANSMIT_CLEAR_PASS" => true
-               )
-       ),
-    */
-    "LOG_DRIVER" => array(
-         "NAME" => "text",
-         "OPTIONS" => array(
-             "LOG_PATH" => (defined("AJXP_FORCE_LOGPATH")?AJXP_FORCE_LOGPATH:"AJXP_INSTALL_PATH/data/logs/"),
-             "LOG_FILE_NAME" => 'log_' . date('m-d-y') . '.txt',
-             "LOG_CHMOD" => 0770
-         )
-    ),
-
-);
diff --git a/core/src/conf/templates/bootstrap_plugins.multi.php b/core/src/conf/templates/bootstrap_plugins.multi.php
deleted file mode 100644
index 6e84c31eb1..0000000000
--- a/core/src/conf/templates/bootstrap_plugins.multi.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- * This is the main configuration file for configuring the basic plugins the application
- * needs to run properly : an Authentication plugin, a Configuration plugin, and a Logger plugin.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-/********************************************
- * CUSTOM VARIABLES HOOK
- ********************************************/
-/**
- * This is a sample "hard" hook, directly included. See directly the PluginSkeleton class
- * for more explanation.
- */
-//require_once AJXP_INSTALL_PATH."/plugins/action.skeleton/class.PluginSkeleton.php";
-//AJXP_Controller::registerIncludeHook("vars.filter", array("PluginSkeleton", "filterVars"));
-
-/*********************************************************
- * PLUGINS DEFINITIONS
- * Drivers will define how the application will work. For
- * each type of operation, there are multiple implementation
- * possible. Check the content of the plugins folder.
- * CONF = users and repositories definition,
- * AUTH = users authentication mechanism,
- * LOG = logs of the application.
- *
- * This template shows how to configure the auth.remote plugin
- * for joomla or Drupal
- *
-*********************************************************/
-$PLUGINS = array(
-    "CONF_DRIVER" => array(
-           "NAME"		=> "serial",
-           "OPTIONS"	=> array(
-               "REPOSITORIES_FILEPATH"	=> "AJXP_DATA_PATH/plugins/conf.serial/repo.ser",
-               "ROLES_FILEPATH"		=> "AJXP_DATA_PATH/plugins/auth.serial/roles.ser",
-               "USERS_DIRPATH"			=> "AJXP_DATA_PATH/plugins/auth.serial",
-               "FAST_CHECKS"		    => false,
-               "CUSTOM_DATA"			=> array(
-                       "email"	    => "Email",
-                       "country"   => "Country",
-                       "USER_QUOTA"=> "Quota"
-                   )
-               )
-       ),
-
-    /**
-     * THIS CONFIGURATION WILL USE AN LDAP SERVER AS MASTER, AND A LOCAL BASE FOR CREATING TMP USERS
-     */
-    "AUTH_DRIVER" => array(
-        "NAME"  => "multi",
-        "OPTIONS" => array(
-            "MODE"  => "MASTER_SLAVE",
-            "MASTER_DRIVER" => "ldap",
-            "USER_BASE_DRIVER" => "serial",
-            "TRANSMIT_CLEAR_PASS" => true,
-            "DRIVERS"  => array(
-                "ldap" => array(
-                    "NAME"   => "ldap",
-                    "OPTIONS"   => array(
-                       "LDAP_URL" => "SERVER_HOST",
-                       "LDAP_PORT" => 389,
-                       "LDAP_USER" => "cn=admin,dc=domain,dc=ext",
-                       "LDAP_PASSWORD" => "SERVER_PASSWORD",
-                       "LDAP_DN" => "ou=People,dc=domain,dc=ext",
-                       "LDAP_FILTER" => "(objectClass=account)",
-                       "LDAP_USERATTR" => "uid"
-                    )
-                ),
-                "serial" => array(
-                       "NAME"		=> "serial",
-                       "OPTIONS"	=> array(
-                           "LOGIN_REDIRECT"		=> false,
-                           "USERS_FILEPATH"		=> "AJXP_DATA_PATH/plugins/auth.serial/users.ser",
-                           "AUTOCREATE_AJXPUSER" 	=> false,
-                        "FAST_CHECKS"		    => false
-                    )
-                   )
-            )
-        )
-    ),
-
-     /*
-     * HERE, WOULD ALLOW TO LOG FROM THE LOCAL SERIAL FILES, OR AUTHENTICATING AGAINST A PREDEFINED FTP SERVER.
-     * THE REPOSITORY "dynamic_ftp" SHOULD BE DEFINED INSIDE bootstrap_repositories.php
-     * WITH THE CORRECT FTP CONNEXION DATA, AND THE CORE APPLICATION CONFIG "Set Credentials in Session"
-     * SHOULD BE SET TO TRUE.
-    "AUTH_DRIVER" => array(
-        "NAME"      => "multi",
-        "OPTIONS"   => array(
-            "MASTER_DRIVER"         => "serial",
-            "TRANSMIT_CLEAR_PASS"	=> true,
-            "USER_ID_SEPARATOR"     => "_-_",
-            "DRIVERS" => array(
-                "serial" => array(
-                        "LABEL"     => "Local",
-                        "NAME"		=> "serial",
-                        "OPTIONS"	=> array(
-                            "LOGIN_REDIRECT"		=> false,
-                            "USERS_FILEPATH"		=> "AJXP_DATA_PATH/plugins/auth.serial/users.ser",
-                            "AUTOCREATE_AJXPUSER" 	=> false,
-                            "TRANSMIT_CLEAR_PASS"	=> false )
-                    ),
-                "ftp"   => array(
-                    "LABEL"     => "Remote FTP",
-                    "NAME"		=> "ftp",
-                    "OPTIONS"	=> array(
-                        "LOGIN_REDIRECT"		=> false,
-                        "REPOSITORY_ID"		    => "dynamic_ftp",
-                        "ADMIN_USER"		    => "admin",
-                        "FTP_LOGIN_SCREEN"      => false,
-                        "AUTOCREATE_AJXPUSER" 	=> true,
-                        "TRANSMIT_CLEAR_PASS"	=> true,
-                    )
-                )
-            )
-        )
-    ),
-    */
-
-    "LOG_DRIVER" => array(
-         "NAME" => "text",
-         "OPTIONS" => array(
-             "LOG_PATH" => (defined("AJXP_FORCE_LOGPATH")?AJXP_FORCE_LOGPATH:"AJXP_INSTALL_PATH/data/logs/"),
-             "LOG_FILE_NAME" => 'log_' . date('m-d-y') . '.txt',
-             "LOG_CHMOD" => 0770
-         )
-    ),
-
-);
diff --git a/core/src/conf/templates/bootstrap_plugins.sql.php b/core/src/conf/templates/bootstrap_plugins.sql.php
deleted file mode 100644
index 1c12515aba..0000000000
--- a/core/src/conf/templates/bootstrap_plugins.sql.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- * This is the main configuration file for configuring the basic plugins the application
- * needs to run properly : an Authentication plugin, a Configuration plugin, and a Logger plugin.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-/********************************************
- * CUSTOM VARIABLES HOOK
- ********************************************/
-/**
- * This is a sample "hard" hook, directly included. See directly the PluginSkeleton class
- * for more explanation.
- */
-//require_once AJXP_INSTALL_PATH."/plugins/action.skeleton/class.PluginSkeleton.php";
-//AJXP_Controller::registerIncludeHook("vars.filter", array("PluginSkeleton", "filterVars"));
-
-/*********************************************************/
-/* PLUGINS DEFINITIONS
-/* Drivers will define how the application will work. For
-/* each type of operation, there are multiple implementation
-/* possible. Check the content of the plugins folder.
-/* CONF = users and repositories definition,
-/* AUTH = users authentication mechanism,
-/* LOG = logs of the application.
-/*
-/* This template shows how to configure the three plugins
-/* using SQL database. It is based on the dibiphp.com
-/* implementation and thus can be stored in various db types.
-*/
-/*********************************************************/
-$sqlDriver =  array(
-    "driver"        => "mysql|sqlite|etc..",
-    "host"          => "YOUR_HOST",
-    "database"      => "DATABASE_NAME",
-    "user"          => "DB_USER",
-    "password"      => "DB_PASSWORD",
-);
-
-$PLUGINS = array(
-    "AUTH_DRIVER" => array(
-        "NAME"		=> "sql",
-              "OPTIONS"	=> array(
-                  "SQL_DRIVER"	=> $sqlDriver,
-            )
-    ),
-    "CONF_DRIVER" => array(
-        "NAME"		=> "sql",
-        "OPTIONS"	=> array(
-            "SQL_DRIVER"	=> $sqlDriver,
-            )
-    ),
-    "LOG_DRIVER"    => array(
-        "NAME" => "sql",
-        "OPTIONS" => array(
-            "SQL_DRIVER"    => $sqlDriver
-        )
-    )
-
-);
diff --git a/core/src/content.php b/core/src/content.php
deleted file mode 100644
index 38933ae363..0000000000
--- a/core/src/content.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- * Description : duplication of index.php to ensure backward compatibility.
- * Could be fixed by URL rewritting also.
- */
-include("index.php");
diff --git a/core/src/core/classes/class.AJXP_AbstractMetaSource.php b/core/src/core/classes/class.AJXP_AbstractMetaSource.php
deleted file mode 100644
index 9c74e24f2a..0000000000
--- a/core/src/core/classes/class.AJXP_AbstractMetaSource.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Class AJXP_AbstractMetaSource
- * Abstract class from which all meta.* plugins must extend.
- */
-abstract class AJXP_AbstractMetaSource extends AJXP_Plugin {
-
-    /**
-     * @var AbstractAccessDriver
-     */
-    protected $accessDriver;
-
-    /**
-     *
-     * @param AbstractAccessDriver $accessDriver
-     */
-    public function initMeta($accessDriver){
-
-        $this->accessDriver = $accessDriver;
-        // Override options with parent META SOURCE options
-        // Could be refined ?
-        if($this->accessDriver->repository->hasParent()){
-            $parentRepo = ConfService::getRepositoryById($this->accessDriver->repository->getParentId());
-            if($parentRepo != null){
-                $sources = $parentRepo->getOption("META_SOURCES");
-                $qParent = $sources["meta.quota"];
-                if(is_array($qParent)) $this->options = array_merge($this->options, $qParent);
-            }
-        }
-
-    }
-
-} 
\ No newline at end of file
diff --git a/core/src/core/classes/class.AJXP_Cache.php b/core/src/core/classes/class.AJXP_Cache.php
deleted file mode 100644
index e5d71c26f2..0000000000
--- a/core/src/core/classes/class.AJXP_Cache.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-/**
- * Generic caching system that can be used by the plugins. Use the static factory getItem() to generate
- * a actual cached instance.
- * @package Pydio
- * @subpackage Core
- */
-class AJXP_Cache
-{
-    protected $cacheDir;
-    protected $cacheId;
-    protected $masterFile;
-    protected $dataCallback;
-    protected $idComputerCallback;
-
-    /**
-     * Create an AJXP_Cache instance
-     * @param string $pluginId
-     * @param string $filepath
-     * @param callable $dataCallback A function to generate the data cache. If no callback provided, will simply use the content of the master item as the cache data
-     * @param string $idComputerCallback A function to generate the ID of the cache. If not provided, will generate a random hash
-     * @return AJXP_Cache
-     */
-    public static function getItem($pluginId, $filepath, $dataCallback=null, $idComputerCallback = null)
-    {
-        if ($dataCallback == null) {
-            $dataCallback = array("AJXP_Cache", "simpleCopy");
-        }
-        return new AJXP_Cache($pluginId,$filepath, $dataCallback, $idComputerCallback);
-    }
-
-    /**
-     * The default dataCallback
-     * @static
-     * @param string $master
-     * @param string $target
-     * @return void
-     */
-    public static function simpleCopy($master, $target)
-    {
-        file_put_contents($target, file_get_contents($master));
-    }
-
-    /**
-     * Clear a cache item associated with the master filepath
-     * @static
-     * @param String $pluginId
-     * @param String $filepath
-     * @return void
-     */
-    public static function clearItem($pluginId, $filepath)
-    {
-        $inst = new AJXP_Cache($pluginId,$filepath, false);
-        if (file_exists($inst->getId())) {
-            @unlink($inst->getId());
-        }
-    }
-
-    /**
-     * Actual Cache object. Should not be used directly, but via the factory static method getItem()
-     * @param $pluginId
-     * @param $filepath
-     * @param $dataCallback
-     * @param null $idComputerCallback
-     * @return void
-     */
-    function __construct($pluginId, $filepath, $dataCallback, $idComputerCallback = NULL) {
-        $this->cacheDir = (defined('AJXP_SHARED_CACHE_DIR')?AJXP_SHARED_CACHE_DIR:AJXP_CACHE_DIR);
-        $this->masterFile = $filepath;
-        $this->dataCallback = $dataCallback;
-        if ($idComputerCallback != null) {
-            $this->idComputerCallback = $idComputerCallback;
-        }
-        $this->cacheId = $this->buildCacheId($pluginId, $filepath);
-    }
-
-    /**
-     * Load the actual data, either from the cache or from the master, and save it in the cache if necessary.
-     * @return string
-     */
-    public function getData()
-    {
-        if (!$this->hasCachedVersion()) {
-            $result = call_user_func($this->dataCallback, $this->masterFile, $this->cacheId);
-            if ($result !== false) {
-                $this->touch();
-            }
-        } else {
-
-        }
-        return file_get_contents($this->cacheId);
-    }
-
-    /**
-     * Check if the cache dir is writeable
-     * @return bool
-     */
-    public function writeable()
-    {
-        return is_dir($this->cacheDir) && is_writeable($this->cacheDir);
-    }
-
-    /**
-     * The unique ID of the item
-     * @return string
-     */
-    public function getId()
-    {
-        return $this->cacheId;
-    }
-
-    /**
-     * Check whether a cached version of the master file exists or not
-     * @return bool
-     */
-    public function hasCachedVersion()
-    {
-        $modifTime = filemtime($this->masterFile);
-        if (file_exists($this->cacheId) && filemtime($this->cacheId) >= $modifTime) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Refresh the cached version modif date to the master modif date
-     * @return void
-     */
-    public function touch()
-    {
-        @touch($this->cacheId, filemtime($this->masterFile));
-    }
-
-    /**
-     * Generate an ID for the cached file, either using the idComputerCallback, or a simple hash function.
-     * @param $pluginId
-     * @param $filePath
-     * @return string
-     */
-    protected function buildCacheId($pluginId, $filePath)
-    {
-        if (!is_dir($this->cacheDir."/".$pluginId)) {
-            mkdir($this->cacheDir."/".$pluginId, 0755);
-        }
-        $root =  $this->cacheDir ."/".$pluginId."/";
-        if (isSet($this->idComputerCallback)) {
-            $hash = call_user_func($this->idComputerCallback, $filePath);
-        } else {
-            $info = pathinfo($filePath);
-            $hash = md5($filePath).(!empty($info["extension"])?".".$info["extension"]:"");
-        }
-        return $root.$hash;
-    }
-
-
-}
diff --git a/core/src/core/classes/class.AJXP_Controller.php b/core/src/core/classes/class.AJXP_Controller.php
deleted file mode 100755
index 7add27601e..0000000000
--- a/core/src/core/classes/class.AJXP_Controller.php
+++ /dev/null
@@ -1,586 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-/**
- * Core controller for dispatching the actions.
- * It uses the XML Registry (simple version, not extended) to search all the <action> tags and find the action.
- * @package Pydio
- * @subpackage Core
- */
-class AJXP_Controller
-{
-    /**
-     * @var DOMXPath
-     */
-    private static $xPath;
-    /**
-     * @var bool
-     */
-    public static $lastActionNeedsAuth = false;
-    /**
-     * @var array
-     */
-    private static $includeHooks = array();
-
-    private static $hooksCache = array();
-
-    /**
-     * Initialize the queryable xPath object
-     * @static
-     * @param bool $useCache Whether to cache the registry version in a memory cache.
-     * @return DOMXPath
-     */
-    private static function initXPath($useCache = false)
-    {
-        if (!isSet(self::$xPath)) {
-            $registry = ConfService::getFilteredXMLRegistry(false, false, $useCache);
-            self::$xPath = new DOMXPath($registry);
-        }
-        return self::$xPath;
-    }
-
-    public static function registryReset(){
-        self::$xPath = null;
-        self::$hooksCache = array();
-    }
-
-    /**
-     * @param $actionName
-     * @param $path
-     * @return bool
-     */
-    public static function findRestActionAndApply($actionName, $path)
-    {
-        $xPath = self::initXPath(true);
-        $actions = $xPath->query("actions/action[@name='$actionName']");
-        if (!$actions->length) {
-            self::$lastActionNeedsAuth = true;
-            return false;
-        }
-        $action = $actions->item(0);
-        $restPathList = $xPath->query("processing/serverCallback/@restParams", $action);
-        if (!$restPathList->length) {
-            self::$lastActionNeedsAuth = true;
-            return false;
-        }
-        $restPath = $restPathList->item(0)->nodeValue;
-        $paramNames = explode("/", trim($restPath, "/"));
-        $exploded = explode("?", $path);
-        $path = array_shift($exploded);
-        $paramValues = array_map("urldecode", explode("/", trim($path, "/"), count($paramNames)));
-        foreach ($paramNames as $i => $pName) {
-            if (strpos($pName, "+") !== false) {
-                $paramNames[$i] = str_replace("+", "", $pName);
-                $paramValues[$i] = "/" . $paramValues[$i];
-            }
-        }
-        if (count($paramValues) < count($paramNames)) {
-            $paramNames = array_slice($paramNames, 0, count($paramValues));
-        }
-        $paramValues = array_map(array("SystemTextEncoding", "toUTF8"), $paramValues);
-        $httpVars = array_merge($_GET, $_POST, array_combine($paramNames, $paramValues));
-        return self::findActionAndApply($actionName, $httpVars, $_FILES, $action);
-
-    }
-
-    /**
-     * @static
-     * @param Array $parameters
-     * @param DOMNode $callbackNode
-     * @param DOMXPath $xPath
-     * @throws Exception
-     */
-    public static function checkParams(&$parameters, $callbackNode, $xPath)
-    {
-        if (!$callbackNode->attributes->getNamedItem('checkParams') || $callbackNode->attributes->getNamedItem('checkParams')->nodeValue != "true") {
-            return;
-        }
-        $inputParams = $xPath->query("input_param", $callbackNode);
-        $declaredParams = array();
-        foreach ($inputParams as $param) {
-            $name = $param->attributes->getNamedItem("name")->nodeValue;
-            $type = $param->attributes->getNamedItem("type")->nodeValue;
-            $defaultNode = $param->attributes->getNamedItem("default");
-            $mandatory = ($param->attributes->getNamedItem("mandatory")->nodeValue == "true");
-            if ($mandatory && !isSet($parameters[$name])) {
-                throw new Exception("Missing parameter '".$name."' of type '$type'");
-            }
-            if ($defaultNode != null && !isSet($parameters[$name])) {
-                $parameters[$name] = $defaultNode->nodeValue;
-            }
-            $declaredParams[] = $name;
-        }
-        foreach ($parameters as $k => $n) {
-            if(!in_array($k, $declaredParams)) unset($parameters[$k]);
-        }
-    }
-
-    /**
-     * Main method for querying the XML registry, find an action and all its associated processors,
-     * and apply all the callbacks.
-     * @static
-     * @param String $actionName
-     * @param array $httpVars
-     * @param array $fileVars
-     * @param DOMNode $action
-     * @return mixed
-     */
-    public static function findActionAndApply($actionName, $httpVars, $fileVars, &$action = null)
-    {
-        $actionName = AJXP_Utils::sanitize($actionName, AJXP_SANITIZE_EMAILCHARS);
-        if ($actionName == "cross_copy") {
-            $pService = AJXP_PluginsService::getInstance();
-            $actives = $pService->getActivePlugins();
-            $accessPlug = $pService->getPluginsByType("access");
-            if (count($accessPlug)) {
-                foreach ($accessPlug as $key=>$objbect) {
-                    if ($actives[$objbect->getId()] === true) {
-                        call_user_func(array($pService->getPluginById($objbect->getId()), "crossRepositoryCopy"), $httpVars);
-                        break;
-                    }
-                }
-            }
-            self::$lastActionNeedsAuth = true;
-            return null;
-        }
-        $xPath = self::initXPath(true);
-        if ($action == null) {
-            $actions = $xPath->query("actions/action[@name='$actionName']");
-            if (!$actions->length) {
-                self::$lastActionNeedsAuth = true;
-                return false;
-            }
-            $action = $actions->item(0);
-        }
-        //Check Rights
-        if (AuthService::usersEnabled()) {
-            $loggedUser = AuthService::getLoggedUser();
-            if( $actionName != "logout" && AJXP_Controller::actionNeedsRight($action, $xPath, "userLogged", "only") && $loggedUser == null){
-                    AJXP_XMLWriter::header();
-                    AJXP_XMLWriter::requireAuth();
-                    AJXP_XMLWriter::close();
-                    exit(1);
-                }
-            if( AJXP_Controller::actionNeedsRight($action, $xPath, "adminOnly") &&
-                ($loggedUser == null || !$loggedUser->isAdmin())){
-                    $mess = ConfService::getMessages();
-                    AJXP_XMLWriter::header();
-                    AJXP_XMLWriter::sendMessage(null, $mess[207]);
-                    AJXP_XMLWriter::requireAuth();
-                    AJXP_XMLWriter::close();
-                    exit(1);
-                }
-            if( AJXP_Controller::actionNeedsRight($action, $xPath, "read") &&
-                ($loggedUser == null || !$loggedUser->canRead(ConfService::getCurrentRepositoryId().""))){
-                    AJXP_XMLWriter::header();
-                    if($actionName == "ls" & $loggedUser!=null
-                        && $loggedUser->canWrite(ConfService::getCurrentRepositoryId()."")){
-                        // Special case of "write only" right : return empty listing, no auth error.
-                        AJXP_XMLWriter::close();
-                        exit(1);
-                    }
-                    $mess = ConfService::getMessages();
-                    AJXP_XMLWriter::sendMessage(null, $mess[208]);
-                    AJXP_XMLWriter::requireAuth();
-                    AJXP_XMLWriter::close();
-                    exit(1);
-                }
-            if( AJXP_Controller::actionNeedsRight($action, $xPath, "write") &&
-                ($loggedUser == null || !$loggedUser->canWrite(ConfService::getCurrentRepositoryId().""))){
-                    $mess = ConfService::getMessages();
-                    AJXP_XMLWriter::header();
-                    AJXP_XMLWriter::sendMessage(null, $mess[207]);
-                    AJXP_XMLWriter::requireAuth();
-                    AJXP_XMLWriter::close();
-                    exit(1);
-                }
-        }
-
-        $preCalls = self::getCallbackNode($xPath, $action, 'pre_processing/serverCallback', $actionName, $httpVars, $fileVars, true);
-        $postCalls = self::getCallbackNode($xPath, $action, 'post_processing/serverCallback[not(@capture="true")]', $actionName, $httpVars, $fileVars, true);
-        $captureCalls = self::getCallbackNode($xPath, $action, 'post_processing/serverCallback[@capture="true"]', $actionName, $httpVars, $fileVars, true);
-        $mainCall = self::getCallbackNode($xPath, $action, "processing/serverCallback",$actionName, $httpVars, $fileVars, false);
-        if ($mainCall != null) {
-            self::checkParams($httpVars, $mainCall, $xPath);
-        }
-
-        if ($captureCalls !== false) {
-            // Make sure the ShutdownScheduler has its own OB started BEFORE, as it will presumabily be
-            // executed AFTER the end of this one.
-            AJXP_ShutdownScheduler::getInstance();
-            ob_start();
-            $params = array("pre_processor_results" => array(), "post_processor_results" => array());
-        }
-        if ($preCalls !== false) {
-            foreach ($preCalls as $preCall) {
-                // A Preprocessing callback can modify its input arguments (passed by ref)
-                $preResult = self::applyCallback($preCall, $actionName, $httpVars, $fileVars);
-                if (isSet($params)) {
-                    $params["pre_processor_results"][$preCall->getAttribute("pluginId")] = $preResult;
-                }
-            }
-        }
-        if ($mainCall) {
-            $result = self::applyCallback($mainCall, $actionName, $httpVars, $fileVars);
-            if (isSet($params)) {
-                $params["processor_result"] = $result;
-            }
-        }
-        if ($postCalls !== false) {
-            foreach ($postCalls as $postCall) {
-                // A Preprocessing callback can modify its input arguments (passed by ref)
-                $postResult = self::applyCallback($postCall, $actionName, $httpVars, $fileVars);
-                if (isSet($params)) {
-                    $params["post_processor_results"][$postCall->getAttribute("pluginId")] = $postResult;
-                }
-            }
-        }
-        if ($captureCalls !== false) {
-            $params["ob_output"] = ob_get_contents();
-            ob_end_clean();
-            foreach ($captureCalls as $captureCall) {
-                self::applyCallback($captureCall, $actionName, $httpVars, $params);
-            }
-        } else {
-            if(isSet($result)) return $result;
-        }
-        return null;
-    }
-
-    /**
-     * Launch a command-line version of the framework by passing the actionName & parameters as arguments.
-     * @static
-     * @param String $currentRepositoryId
-     * @param String $actionName
-     * @param Array $parameters
-     * @param string $user
-     * @param string $statusFile
-     * @return null|UnixProcess
-     */
-    public static function applyActionInBackground($currentRepositoryId, $actionName, $parameters, $user ="", $statusFile = "")
-    {
-        $token = md5(time());
-        $logDir = AJXP_CACHE_DIR."/cmd_outputs";
-        if(!is_dir($logDir)) mkdir($logDir, 0755);
-        $logFile = $logDir."/".$token.".out";
-        if (empty($user)) {
-            if(AuthService::usersEnabled() && AuthService::getLoggedUser() !== null) $user = AuthService::getLoggedUser()->getId();
-            else $user = "shared";
-        }
-        if (AuthService::usersEnabled()) {
-            $cKey = ConfService::getCoreConf("AJXP_CLI_SECRET_KEY", "conf");
-            if(empty($cKey)){
-                $cKey = "\1CDAFx¨op#";
-            }
-            $user = base64_encode(mcrypt_encrypt(MCRYPT_RIJNDAEL_256,  md5($token.$cKey), $user, MCRYPT_MODE_ECB));
-        }
-        $robustInstallPath = str_replace("/", DIRECTORY_SEPARATOR, AJXP_INSTALL_PATH);
-        $cmd = ConfService::getCoreConf("CLI_PHP")." ".$robustInstallPath.DIRECTORY_SEPARATOR."cmd.php -u=$user -t=$token -a=$actionName -r=$currentRepositoryId";
-        /* Inserted next 3 lines to quote the command if in windows - rmeske*/
-        if (PHP_OS == "WIN32" || PHP_OS == "WINNT" || PHP_OS == "Windows") {
-            $cmd = ConfService::getCoreConf("CLI_PHP")." ".chr(34).$robustInstallPath.DIRECTORY_SEPARATOR."cmd.php".chr(34)." -u=$user -t=$token -a=$actionName -r=$currentRepositoryId";
-        }
-        if ($statusFile != "") {
-            $cmd .= " -s=".$statusFile;
-        }
-        foreach ($parameters as $key=>$value) {
-            if($key == "action" || $key == "get_action") continue;
-            if(is_array($value)){
-                $index = 0;
-                foreach($value as $v){
-                    $cmd .= " --file_".$index."=".escapeshellarg($v);
-                    $index++;
-                }
-            }else{
-                $cmd .= " --$key=".escapeshellarg($value);
-            }
-        }
-
-        $repoObject = ConfService::getRepository();
-        $clearEnv = false;
-        if($repoObject->getOption("USE_SESSION_CREDENTIALS")){
-            $encodedCreds = AJXP_Safe::getEncodedCredentialString();
-            if(!empty($encodedCreds)){
-                putenv("AJXP_SAFE_CREDENTIALS=".$encodedCreds);
-                $clearEnv = "AJXP_SAFE_CREDENTIALS";
-            }
-        }
-
-        $res = self::runCommandInBackground($cmd, $logFile);
-        if(!empty($clearEnv)){
-            putenv($clearEnv);
-        }
-        return $res;
-    }
-
-    /**
-     * @param $cmd
-     * @param $logFile
-     * @return UnixProcess|null
-     */
-    public static function runCommandInBackground($cmd, $logFile)
-    {
-        if (PHP_OS == "WIN32" || PHP_OS == "WINNT" || PHP_OS == "Windows") {
-              if(AJXP_SERVER_DEBUG) $cmd .= " > ".$logFile;
-              if (class_exists("COM") && ConfService::getCoreConf("CLI_USE_COM")) {
-                  $WshShell   = new COM("WScript.Shell");
-                  $oExec      = $WshShell->Run("cmd /C $cmd", 0, false);
-              } else {
-                  $basePath = str_replace("/", DIRECTORY_SEPARATOR, AJXP_INSTALL_PATH);
-                  $tmpBat = implode(DIRECTORY_SEPARATOR, array( $basePath, "data","tmp", md5(time()).".bat"));
-                  $cmd = "@chcp 1252 > nul \r\n".$cmd;
-                  $cmd .= "\n DEL ".chr(34).$tmpBat.chr(34);
-                  AJXP_Logger::debug("Writing file $cmd to $tmpBat");
-                  file_put_contents($tmpBat, $cmd);
-                  pclose(popen('start /b "CLI" "'.$tmpBat.'"', 'r'));
-              }
-            return null;
-        } else {
-            $process = new UnixProcess($cmd, (AJXP_SERVER_DEBUG?$logFile:null));
-            AJXP_Logger::debug("Starting process and sending output dev null");
-            return $process;
-        }
-    }
-
-    /**
-     * Find a callback node by its xpath query, filtering with the applyCondition if the xml attribute exists.
-     * @static
-     * @param DOMXPath $xPath
-     * @param DOMNode $actionNode
-     * @param string $query
-     * @param string $actionName
-     * @param array $httpVars
-     * @param array $fileVars
-     * @param bool $multiple
-     * @return DOMElement|bool|DOMElement[]
-     */
-    private static function getCallbackNode($xPath, $actionNode, $query ,$actionName, $httpVars, $fileVars, $multiple = true)
-    {
-        $callbacks = $xPath->query($query, $actionNode);
-        if(!$callbacks->length) return false;
-        if ($multiple) {
-            $cbArray = array();
-            foreach ($callbacks as $callback) {
-                if (self::appliesCondition($callback, $actionName, $httpVars, $fileVars)) {
-                    $cbArray[] = $callback;
-                }
-            }
-            if(!count($cbArray)) return  false;
-            return $cbArray;
-        } else {
-            $callback=$callbacks->item(0);
-            if(!self::appliesCondition($callback, $actionName, $httpVars, $fileVars)) return false;
-            return $callback;
-        }
-    }
-
-    /**
-     * Check in the callback node if an applyCondition XML attribute exists, and eval its content.
-     * The content must set an $apply boolean as result
-     * @static
-     * @param DOMElement|DOMNode $callback
-     * @param string $actionName
-     * @param array $httpVars
-     * @param array $fileVars
-     * @return bool
-     */
-    private static function appliesCondition($callback, $actionName, $httpVars, $fileVars)
-    {
-        if ($callback->getAttribute("applyCondition")!="") {
-            $apply = false;
-            eval($callback->getAttribute("applyCondition"));
-            if(!$apply) return false;
-        }
-        return true;
-    }
-
-    /**
-     * Applies a callback node
-     * @static
-     * @param DOMElement|Array $callback The DOM Node or directly an array of attributes
-     * @param String $actionName
-     * @param Array $httpVars
-     * @param Array $fileVars
-     * @param null $variableArgs
-     * @param bool $defer
-     * @throws AJXP_Exception* @internal param \DOMXPath $xPath
-     * @return mixed
-     */
-    private static function applyCallback($callback, &$actionName, &$httpVars, &$fileVars, &$variableArgs = null, $defer = false)
-    {
-        //Processing
-        if(is_array($callback)){
-            $plugId = $callback["pluginId"];
-            $methodName = $callback["methodName"];
-        }else{
-            $plugId = $callback->getAttribute("pluginId");
-            $methodName = $callback->getAttribute("methodName");
-        }
-        $plugInstance = AJXP_PluginsService::findPluginById($plugId);
-        //return call_user_func(array($plugInstance, $methodName), $actionName, $httpVars, $fileVars);
-        // Do not use call_user_func, it cannot pass parameters by reference.
-        if (method_exists($plugInstance, $methodName)) {
-            if ($variableArgs == null) {
-                return $plugInstance->$methodName($actionName, $httpVars, $fileVars);
-            } else {
-                if ($defer == true) {
-                    AJXP_ShutdownScheduler::getInstance()->registerShutdownEventArray(array($plugInstance, $methodName), $variableArgs);
-                } else {
-                    call_user_func_array(array($plugInstance, $methodName), $variableArgs);
-                }
-            }
-        } else {
-            throw new AJXP_Exception("Cannot find method $methodName for plugin $plugId!");
-        }
-        return null;
-    }
-
-    /**
-     * Find all callbacks registered for a given hook and apply them
-     * @static
-     * @param string $hookName
-     * @param array $args
-     * @param bool $forceNonDefer
-     * @return void
-     */
-    public static function applyHook($hookName, $args, $forceNonDefer = false)
-    {
-        if(isSet(self::$hooksCache[$hookName])){
-            $hooks = self::$hooksCache[$hookName];
-            foreach($hooks as $hook){
-                if (isSet($hook["applyCondition"]) && $hook["applyCondition"]!="") {
-                    $apply = false;
-                    eval($hook["applyCondition"]);
-                    if(!$apply) continue;
-                }
-                $defer = $hook["defer"];
-                if($defer && $forceNonDefer) $defer = false;
-                self::applyCallback($hook, $fake1, $fake2, $fake3, $args, $defer);
-            }
-            return;
-        }
-        $xPath = self::initXPath(true);
-        $callbacks = $xPath->query("hooks/serverCallback[@hookName='$hookName']");
-        if(!$callbacks->length) return ;
-        self::$hooksCache[$hookName] = array();
-        /**
-         * @var $callback DOMElement
-         */
-        foreach ($callbacks as $callback) {
-            $defer = ($callback->getAttribute("defer") === "true");
-            $applyCondition = $callback->getAttribute("applyCondition");
-            $plugId = $callback->getAttribute("pluginId");
-            $methodName = $callback->getAttribute("methodName");
-            $dontBreakOnExceptionAtt = $callback->getAttribute("dontBreakOnException");
-            $dontBreakOnException = !empty($dontBreakOnExceptionAtt) && $dontBreakOnExceptionAtt == "true";
-            $hookCallback = array(
-                "defer" => $defer,
-                "applyCondition" => $applyCondition,
-                "pluginId"    => $plugId,
-                "methodName"    => $methodName
-            );
-            self::$hooksCache[$hookName][] = $hookCallback;
-            if (!empty($applyCondition)) {
-                $apply = false;
-                eval($applyCondition);
-                if(!$apply) continue;
-            }
-            if($defer && $forceNonDefer) $defer = false;
-            if($dontBreakOnException){
-                try{
-                    self::applyCallback($hookCallback, $fake1, $fake2, $fake3, $args, $defer);
-                }catch(Exception $e){
-                    AJXP_Logger::error("[Hook $hookName]", "[Callback ".$plugId.".".$methodName."]", $e->getMessage());
-                }
-            }else{
-                self::applyCallback($hookCallback, $fake1, $fake2, $fake3, $args, $defer);
-            }
-        }
-    }
-
-    /**
-     * Find the statically defined callbacks for a given hook and apply them
-     * @static
-     * @param $hookName
-     * @param $args
-     * @return void
-     */
-    public static function applyIncludeHook($hookName, &$args)
-    {
-        if(!isSet(self::$includeHooks[$hookName])) return;
-        foreach (self::$includeHooks[$hookName] as $callback) {
-            call_user_func_array($callback, $args);
-        }
-    }
-
-    /**
-     * Register a hook statically when it must be defined before the XML registry construction.
-     * @static
-     * @param $hookName
-     * @param $callback
-     * @return void
-     */
-    public static function registerIncludeHook($hookName, $callback)
-    {
-        if (!isSet(self::$includeHooks[$hookName])) {
-            self::$includeHooks[$hookName] = array();
-        }
-        self::$includeHooks[$hookName][] = $callback;
-    }
-
-    /**
-     * Check the rightsContext node of an action.
-     * @static
-     * @param DOMNode $actionNode
-     * @param DOMXPath $xPath
-     * @param string $right
-     * @return bool
-     */
-    public static function actionNeedsRight($actionNode, $xPath, $right, $expectedValue="true")
-    {
-        $rights = $xPath->query("rightsContext", $actionNode);
-        if(!$rights->length) return false;
-        $rightNode =  $rights->item(0);
-        $rightAttr = $xPath->query("@".$right, $rightNode);
-        if ($rightAttr->length && $rightAttr->item(0)->value == $expectedValue) {
-            self::$lastActionNeedsAuth = true;
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Utilitary used by the postprocesors to forward previously computed data
-     * @static
-     * @param array $postProcessData
-     * @return void
-     */
-    public static function passProcessDataThrough($postProcessData)
-    {
-        if (isSet($postProcessData["pre_processor_results"]) && is_array($postProcessData["pre_processor_results"])) {
-            print(implode("", $postProcessData["pre_processor_results"]));
-        }
-        if (isSet($postProcessData["processor_result"])) {
-            print($postProcessData["processor_result"]);
-        }
-        if(isSet($postProcessData["ob_output"])) print($postProcessData["ob_output"]);
-    }
-}
diff --git a/core/src/core/classes/class.AJXP_Exception.php b/core/src/core/classes/class.AJXP_Exception.php
deleted file mode 100644
index d561eaa7b5..0000000000
--- a/core/src/core/classes/class.AJXP_Exception.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-/**
- * Custom exception (legacy from php4 when there were no exceptions)
- * @package Pydio
- * @subpackage Core
- */
-class AJXP_Exception extends Exception
-{
-    public function __construct($messageString, $messageId = false)
-    {
-        if ($messageId !== false && class_exists("ConfService")) {
-            $messages = ConfService::getMessages();
-            if (array_key_exists($messageId, $messages)) {
-                $messageString = $messages[$messageId];
-            } else {
-                $messageString = $messageId;
-            }
-        }
-        parent::__construct($messageString);
-    }
-
-    public function errorToXml($mixed)
-    {
-        if (is_a($mixed, "Exception")) {
-            throw $this;
-        } else {
-            throw new AJXP_Exception($mixed);
-        }
-    }
-}
diff --git a/core/src/core/classes/class.AJXP_JSPacker.php b/core/src/core/classes/class.AJXP_JSPacker.php
deleted file mode 100644
index 095aa5770d..0000000000
--- a/core/src/core/classes/class.AJXP_JSPacker.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Encapsulation of the javascript/css packing library
- * @package Pydio
- * @subpackage Core
- */
-class AJXP_JSPacker
-{
-    /**
-     * Static function for packing all js and css into big files
-     * Auto detect /js/*_list.txt files and /css/*_list.txt files and pack them.
-     */
-    public static function pack()
-    {
-        // Make sure that the gui.* plugin is loaded
-        AJXP_PluginsService::getInstance()->getPluginsByType("gui");
-
-        $sList = glob(CLIENT_RESOURCES_FOLDER."/js/*_list.txt");
-        foreach ($sList as $list) {
-            $scriptName = str_replace("_list.txt", ".js", $list);
-            AJXP_JSPacker::concatListAndPack($list,
-                                             $scriptName,
-                                            "Normal");
-            if(isSet($_GET["separate"])){
-                self::compactEach($list, "Normal");
-            }
-        }
-        $sList = glob(AJXP_THEME_FOLDER."/css/*_list.txt");
-        foreach ($sList as $list) {
-            $scriptName = str_replace("_list.txt", ".css", $list);
-            AJXP_JSPacker::concatListAndPack($list,
-                                             $scriptName,
-                                            "None");
-        }
-    }
-
-    /**
-     * Perform actual compression
-     * @param $src
-     * @param $out
-     * @param $mode
-     * @return bool
-     */
-    public static function concatListAndPack($src, $out, $mode)
-    {
-        if (!is_file($src) || !is_readable($src)) {
-            return false;
-        }
-
-        // Concat List into one big string
-        $jscode = '' ;
-        $noMiniCode = '';
-        $lines = file($src);
-        foreach($lines as $jsline){
-            if(trim($jsline) == '') continue;
-            $noMini = false;
-            if(strpos($jsline, "#NO_MINI") !== FALSE){
-                $jsline = str_replace("#NO_MINI", "", $jsline);
-                $noMini = true;
-            }
-            $code = file_get_contents(AJXP_INSTALL_PATH."/".CLIENT_RESOURCES_FOLDER."/".rtrim($jsline,"\n\r")) ;
-            if ($code) {
-                if($noMini) $noMiniCode .= $code;
-                else $jscode .= $code ;
-            }
-
-        }
-
-        // Pack and write to file
-        require_once("packer/class.JavaScriptPacker.php");
-        $packer = new JavaScriptPacker($jscode, $mode , true, false);
-        $packed = $packer->pack();
-        if ($mode == "None") { // css case, hack for I.E.
-            $packed = str_replace("solid#", "solid #", $packed);
-        }
-        if(!empty($noMiniCode)){
-            $packed.="\n".$noMiniCode;
-        }
-        @file_put_contents($out, $packed);
-
-        return true;
-    }
-
-    public function compactEach($list, $mode){
-        $lines = file($list);
-        require_once("packer/class.JavaScriptPacker.php");
-        $fullcode = '';
-        foreach($lines as $line){
-            $in = AJXP_INSTALL_PATH."/".CLIENT_RESOURCES_FOLDER."/".rtrim($line,"\n\r");
-            $out = str_replace("/js/", "/js/min/", $in);
-            $outfull = str_replace(".js", ".full.js", $out);
-            $jscode = file_get_contents($in);
-            $fullcode .= $jscode;
-            // Pack and write to file
-            $packer = new JavaScriptPacker($jscode, $mode , true, false);
-            $packed = $packer->pack();
-            file_put_contents($out, $packed);
-
-            // Pack and write to file
-            $packer = new JavaScriptPacker($fullcode, $mode , true, false);
-            $packed = $packer->pack();
-            file_put_contents($outfull, $packed);
-        }
-    }
-
-}
diff --git a/core/src/core/classes/class.AJXP_KeyValueCache.php b/core/src/core/classes/class.AJXP_KeyValueCache.php
deleted file mode 100644
index 9c36886aec..0000000000
--- a/core/src/core/classes/class.AJXP_KeyValueCache.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-
-/**
- * Class AJXP_KeyValueCache
- *
- * Simple Key/Value cache stored in memory, independant of the implementation.
- * Currently APC only, we should replace with the Doctrine/cache library (see https://github.com/doctrine/cache )
- * We do implement their Cache Interface for future migration.
- */
-class AJXP_KeyValueCache {
-
-    protected function makeId($id){
-        if(defined('AJXP_KVCACHE_PREFIX')){
-            return AJXP_KVCACHE_PREFIX . " - ".$id;
-        }
-        return $id;
-    }
-
-    /**
-     * Fetches an entry from the cache.
-     *
-     * @param string $id The id of the cache entry to fetch.
-     *
-     * @return mixed The cached data or FALSE, if no cache entry exists for the given id.
-     */
-    public function fetch($id){
-        if(!function_exists('apc_fetch')) return FALSE;
-        if(defined('AJXP_KVCACHE_IGNORE') && AJXP_KVCACHE_IGNORE) return FALSE;
-        $result = apc_fetch($this->makeId($id), $success);
-        if($success) return $result;
-        else return false;
-    }
-    /**
-     * Tests if an entry exists in the cache.
-     *
-     * @param string $id The cache id of the entry to check for.
-     *
-     * @return boolean TRUE if a cache entry exists for the given cache id, FALSE otherwise.
-     */
-    public function contains($id){
-        if(!function_exists('apc_fetch')) return FALSE;
-        if(defined('AJXP_KVCACHE_IGNORE') && AJXP_KVCACHE_IGNORE) return FALSE;
-        apc_fetch($this->makeId($id), $success);
-        return $success;
-    }
-    /**
-     * Puts data into the cache.
-     *
-     * @param string $id       The cache id.
-     * @param mixed  $data     The cache entry/data.
-     * @param int    $lifeTime The cache lifetime.
-     *                         If != 0, sets a specific lifetime for this cache entry (0 => infinite lifeTime).
-     *
-     * @return boolean TRUE if the entry was successfully stored in the cache, FALSE otherwise.
-     */
-    public function save($id, $data, $lifeTime = 0){
-        if(!function_exists('apc_store')) return false;
-        if(defined("AJXP_KVCACHE_IGNORE") && AJXP_KVCACHE_IGNORE) return false;
-        $res = apc_store($this->makeId($id), $data, $lifeTime);
-        if($res !== false) return true;
-        return false;
-    }
-
-    /**
-     * Deletes a cache entry.
-     *
-     * @param string $id The cache id.
-     *
-     * @return boolean TRUE if the cache entry was successfully deleted, FALSE otherwise.
-     */
-    public function delete($id){
-        if(!function_exists('apc_delete')) return true;
-        return apc_delete($this->makeId($id));
-    }
-
-    /**
-     * Flush a whole cache
-     */
-    public function deleteAll(){
-        if(function_exists('apc_clear_cache')){
-            apc_clear_cache('user');
-        }
-    }
-
-
-}
\ No newline at end of file
diff --git a/core/src/core/classes/class.AJXP_MetaStreamWrapper.php b/core/src/core/classes/class.AJXP_MetaStreamWrapper.php
deleted file mode 100644
index 4b6a591e71..0000000000
--- a/core/src/core/classes/class.AJXP_MetaStreamWrapper.php
+++ /dev/null
@@ -1,595 +0,0 @@
-<?php
-/*
- * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-/**
- * Class AJXP_MetaStreamWrapper
- *
- * Global streamWrapper that encapsulates all wrappers to access a driver's resource.
- * Registered under the "pydio" protocol, it should replace all the old ajxp.XX direct calls.
- * The static "appendMetaWrapper" method allows to add additional wrapper that will be sequentially called until
- * reaching the driver ajxp.XX wrapper.
- *
- * @package Pydio
- * @subpackage Core
- */
-class AJXP_MetaStreamWrapper implements AjxpWrapper
-{
-    /**
-     * @var resource
-     */
-    protected $handle;
-
-    /**
-     * @var string
-     */
-    protected $currentDirPath;
-
-    protected static $metaWrappers = [
-        'core' => [
-            'pydio' => 'AJXP_MetaStreamWrapper'
-        ]
-    ];
-
-    protected static $cachedRepositoriesWrappers = array();
-
-    protected $currentUniquePath;
-
-    /**
-     * Register the stack of protocols/wrappers.
-     * @param null $registered_wrappers
-     */
-    public static function register($registered_wrappers = null){
-        if($registered_wrappers == null){
-            $registered_wrappers = stream_get_wrappers();
-        }
-        $it = new RecursiveIteratorIterator(new RecursiveArrayIterator(self::$metaWrappers));
-        foreach($it as $protocol => $className){
-            if(!in_array($protocol, $registered_wrappers)){
-                stream_wrapper_register($protocol, $className);
-            }
-        }
-    }
-
-    /**
-     * Register an addition protocol/wrapper in the stack
-     * @param $name string
-     * @param $className string
-     */
-    public static function appendMetaWrapper($name, $className, $parent = "core"){
-        self::$metaWrappers[$parent][$name] = $className;
-        self::register();
-    }
-
-    protected static function getMetaWrappers($scheme) {
-        return array_merge((array) self::$metaWrappers['core'], (array) self::$metaWrappers[$scheme]);
-    }
-
-    protected static function getNextScheme($url, $context='core'){
-        $parts = parse_url($url);
-        $metaWrapperKeys = array_keys(self::getMetaWrappers($context));
-        $key = array_search($parts["scheme"], $metaWrapperKeys);
-        if($key < count($metaWrapperKeys) - 1){
-            // Return next registered meta wrapper
-            return $metaWrapperKeys[$key + 1];
-        }else{
-            // Otherwise return repository wrapper
-            $data = self::actualRepositoryWrapperData($parts["host"]);
-            return $data["protocol"];
-        }
-    }
-
-    /**
-     * @param string $url
-     * @param AJXP_MetaStreamWrapper $crtInstance
-     * @return string
-     * @throws Exception
-     */
-    protected static function translateScheme($url, $crtInstance = null){
-        $parts=parse_url($url);
-        $currentScheme = $parts['scheme'];
-        $context = self::actualRepositoryWrapperProtocol($parts['host']);
-        $newScheme = self::getNextScheme($url, $context);
-        $repository = ConfService::getRepositoryById(parse_url($url, PHP_URL_HOST));
-        if($currentScheme == "pydio" && $repository->hasContentFilter()){
-
-            $contentFilter = $repository->getContentFilter();
-
-            if ($contentFilter instanceof ContentFilter) {
-                $baseDir = $contentFilter->getBaseDir();
-
-                if ($crtInstance != null) {
-                    $crtInstance->currentUniquePath = $contentFilter->getUniquePath();
-                }
-
-                if (!empty($baseDir) || $baseDir != "/") {
-                    $crtPath = parse_url($url, PHP_URL_PATH);
-                    $crtBase = basename($crtPath);
-                    if (!empty($crtPath) && $crtPath != "/" && fsAccessWrapper::unPatchPathForBaseDir($crtBase) != $contentFilter->getUniquePath() && $crtBase != ".ajxp_meta") {
-                        throw new Exception("Cannot find file " . $crtBase);
-                    }
-                    // Prepend baseDir in path
-                    $url = str_replace($currentScheme . "://" . $repository->getId() . $crtPath, $currentScheme . "://" . $repository->getId() . rtrim($baseDir . $crtPath, "/"), $url);
-                }
-            }
-        }
-
-        $newUrl = str_replace($currentScheme."://", $newScheme."://", $url);
-
-        self::applyInitPathHook($newUrl, $context);
-
-        return $newUrl;
-    }
-
-    protected static function findWrapperClassName($scheme, $context = "core"){
-
-        $metaWrappers = self::getMetaWrappers($context);
-
-        if(isSet($metaWrappers[$scheme])){
-            $wrapper = $metaWrappers[$scheme];
-        }else{
-            $wrapper = AJXP_PluginsService::getInstance()->getWrapperClassName($scheme);
-        }
-        if(empty($wrapper)) {
-            throw new Exception("Cannot find any wrapper for the scheme " . $scheme . " in context " . $context);
-        }
-        return $wrapper;
-    }
-
-    protected static function findSubWrapperClassName($url){
-        $repositoryId = parse_url($url, PHP_URL_HOST);
-        $context = self::actualRepositoryWrapperProtocol($repositoryId);
-        $nextScheme = self::getNextScheme($url, $context);
-
-        return self::findWrapperClassName($nextScheme, $context);
-    }
-
-    protected static function actualRepositoryWrapperData($repositoryId){
-        if(isSet(self::$cachedRepositoriesWrappers[$repositoryId])){
-            return self::$cachedRepositoriesWrappers[$repositoryId];
-        }
-        $repository = ConfService::getRepositoryById($repositoryId);
-        if(!is_a($repository, "Repository")){
-            throw new Exception("Cannot find repository with this id!");
-        }
-        if($repository->detectStreamWrapper(false)){
-            self::$cachedRepositoriesWrappers[$repositoryId] = $repository->streamData;
-            return $repository->streamData;
-        }else{
-            throw new Exception("Repository does not provide a stream wrapper!");
-        }
-    }
-
-    /**
-     * Return the final ajxp.XX wrapper class name.
-     * @param $repositoryId
-     * @return string mixed
-     * @throws Exception
-     */
-    public static function actualRepositoryWrapperClass($repositoryId){
-        $data = self::actualRepositoryWrapperData($repositoryId);
-        return $data["classname"];
-    }
-
-    /**
-     * Return the final ajxp.XX wrapper protocol.
-     * @param $repositoryId
-     * @return string mixed
-     * @throws Exception
-     */
-    public static function actualRepositoryWrapperProtocol($repositoryId){
-        $data = self::actualRepositoryWrapperData($repositoryId);
-        return $data["protocol"];
-    }
-
-
-
-    /**
-     * Call Init function for a translated Path if defined
-     *
-     * @param string $path
-     */
-    public static function applyInitPathHook($path, $context = 'core') {
-        $currentScheme = parse_url($path, PHP_URL_SCHEME);
-        $wrapper = self::findWrapperClassName($currentScheme, $context);
-
-        if (is_callable(array($wrapper, "applyInitPathHook"))){
-            call_user_func(array($wrapper, "applyInitPathHook"), $path);
-        }
-    }
-
-    /**
-     * Get a "usable" reference to a file : the real file or a tmp copy.
-     *
-     * @param string $path
-     * @param bool $persistent
-     * @return string
-     * @throws Exception
-     */
-    public static function getRealFSReference($path, $persistent = false)
-    {
-        $wrapper = self::findSubWrapperClassName($path);
-        return call_user_func(array($wrapper, "getRealFSReference"), self::translateScheme($path), $persistent);
-    }
-
-    /**
-     * Read a file (by chunks) and copy the data directly inside the given stream.
-     *
-     * @param string $path
-     * @param resource $stream
-     */
-    public static function copyFileInStream($path, $stream)
-    {
-        $wrapper = self::findSubWrapperClassName($path);
-        call_user_func(array($wrapper, "copyFileInStream"), self::translateScheme($path), $stream);
-        $meta = stream_get_meta_data($stream);
-        if(isSet($meta["uri"]) && $meta["uri"] === "php://output" && intval(ini_get("output_buffering")) > 0){
-            ob_end_flush();
-        }
-    }
-
-    /**
-     * Chmod implementation for this type of access.
-     *
-     * @param string $path
-     * @param number $chmodValue
-     */
-    public static function changeMode($path, $chmodValue)
-    {
-        $wrapper = self::findSubWrapperClassName($path);
-        call_user_func(array($wrapper, "changeMode"), self::translateScheme($path), $chmodValue);
-    }
-
-    /**
-     * Describe whether the current wrapper operates on a remote server or not.
-     * @static
-     * @return boolean
-     * @throws Exception
-     */
-    public static function isRemote()
-    {
-        throw new Exception("Do not call this method directly, but AJXP_MetaStreamWrapper::wrapperIsRemote() instead");
-    }
-
-    /**
-     * Describe whether the current wrapper operates on a remote server or not.
-     * @param String $url Url of the resource
-     * @static
-     * @return boolean
-     * @throws Exception
-     */
-    public static function isSeekable($url)
-    {
-        throw new Exception("Do not call this method directly, but AJXP_MetaStreamWrapper::wrapperIsSeekable() instead");
-    }
-
-    /**
-     * @param string $url
-     * @return boolean
-     */
-    public static function wrapperIsRemote($url){
-        $repositoryId = parse_url($url, PHP_URL_HOST);
-        return call_user_func(array(self::actualRepositoryWrapperClass($repositoryId), "isRemote"));
-    }
-
-    /**
-     * @param string $url
-     * @return boolean
-     */
-    public static function wrapperIsSeekable($url){
-        $repositoryId = parse_url($url, PHP_URL_HOST);
-        return call_user_func(array(self::actualRepositoryWrapperClass($repositoryId), "isSeekable"), $url);
-    }
-
-    public static function nodesUseSameWrappers($url1, $url2){
-        $w1 = self::actualRepositoryWrapperClass(parse_url($url1, PHP_URL_HOST));
-        $w2 = self::actualRepositoryWrapperClass(parse_url($url2, PHP_URL_HOST));
-        return $w1 == $w2;
-    }
-
-    /**
-     *
-     *
-     * @return bool
-     */
-    public function dir_closedir()
-    {
-        if(isSet($this->handle) && is_resource($this->handle)){
-            closedir($this->handle);
-        }
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path
-     * @param int $options
-     * @return bool
-     */
-    public function dir_opendir($path, $options)
-    {
-        $newPath = self::translateScheme($path, $this);
-        $this->handle = opendir($newPath);
-        if($this->handle !== false){
-            $this->currentDirPath = parse_url($path, PHP_URL_PATH);
-            return true;
-        }else{
-            return false;
-        }
-    }
-
-    /**
-     * Standard readdir() implementation
-     *
-     * @return string
-     */
-    public function dir_readdir()
-    {
-        if(isSet($this->handle) && is_resource($this->handle)){
-            if($this->currentUniquePath != null){
-                return $this->innerReadDirFiltered($this->handle);
-            }else{
-                return readdir($this->handle);
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Skip values until correct one is found
-     * @param Resource $resource
-     * @return string
-     */
-    protected function innerReadDirFiltered($resource){
-        $test = readdir($resource);
-        if($test === false || $test == "." || $test == ".."){
-            return $test;
-        }
-        if($this->currentUniquePath == $test) {
-            return $test;
-        }
-        // Return next one
-        return $this->innerReadDirFiltered($resource);
-    }
-
-
-    /**
-     * Enter description here...
-     *
-     * @return bool
-     */
-    public function dir_rewinddir()
-    {
-        $this->currentDirPath = null;
-        if(isSet($this->handle) && is_resource($this->handle)){
-            return rewind($this->handle);
-        }
-        return false;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path
-     * @param int $mode
-     * @param int $options
-     * @return bool
-     */
-    public function mkdir($path, $mode, $options)
-    {
-        return mkdir($this->translateScheme($path), $mode, $options);
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path_from
-     * @param string $path_to
-     * @return bool
-     */
-    public function rename($path_from, $path_to)
-    {
-        return rename($this->translateScheme($path_from), $this->translateScheme($path_to));
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path
-     * @param int $options
-     * @return bool
-     */
-    public function rmdir($path, $options)
-    {
-        if(is_resource($options)){
-            return rmdir(AJXP_MetaStreamWrapper::translateScheme($path), $options);
-        }else{
-            return rmdir(AJXP_MetaStreamWrapper::translateScheme($path));
-        }
-    }
-
-    /**
-     * Enter description here...
-     *
-     */
-    public function stream_close()
-    {
-        if(isSet($this->handle) && is_resource($this->handle)){
-            return fclose($this->handle);
-        }
-        return false;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @return bool
-     */
-    public function stream_eof()
-    {
-        if(isSet($this->handle) && is_resource($this->handle)){
-            return feof($this->handle);
-        }
-        return false;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @return bool
-     */
-    public function stream_flush()
-    {
-        if(isSet($this->handle) && is_resource($this->handle)){
-            return fflush($this->handle);
-        }
-        return false;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path
-     * @param string $mode
-     * @param int $options
-     * @param string &$context
-     * @return bool
-     */
-    public function stream_open($path, $mode, $options, &$context)
-    {
-        if(is_resource($context)){
-            $this->handle = fopen($this->translateScheme($path), $mode, $options, $context);
-        }else{
-            $this->handle = fopen($this->translateScheme($path), $mode, $options);
-        }
-        return ($this->handle !== false);
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param int $count
-     * @return string
-     */
-    public function stream_read($count)
-    {
-        if(isSet($this->handle) && is_resource($this->handle)){
-            return fread($this->handle, $count);
-        }
-        return null;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param int $offset
-     * @param int $whence = SEEK_SET
-     * @return bool
-     */
-    public function stream_seek($offset, $whence = SEEK_SET)
-    {
-        if(isSet($this->handle) && is_resource($this->handle)){
-            return fseek($this->handle, $offset, $whence);
-        }
-        return false;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @return array
-     */
-    public function stream_stat()
-    {
-        if(isSet($this->handle) && is_resource($this->handle)){
-            return fstat($this->handle);
-        }
-        return false;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @return int
-     */
-    public function stream_tell()
-    {
-        if(isSet($this->handle) && is_resource($this->handle)){
-            return ftell($this->handle);
-        }
-        return false;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $data
-     * @return int
-     */
-    public function stream_write($data)
-    {
-        if(isSet($this->handle) && is_resource($this->handle)){
-            return fwrite($this->handle, $data);
-        }
-        return false;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path
-     * @return bool
-     */
-    public function unlink($path)
-    {
-        return unlink($this->translateScheme($path));
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path
-     * @param int $flags
-     * @return array
-     */
-    public function url_stat($path, $flags)
-    {
-        $stat = @stat($this->translateScheme($path));
-        if($stat === false){
-            return null;
-        }
-        $bytesize = $stat["size"];
-        $wrapper = self::actualRepositoryWrapperClass(parse_url($path, PHP_URL_HOST));
-        if(method_exists($wrapper, "getLastRealSize")){
-            $custom = call_user_func(array($wrapper, "getLastRealSize"));
-            if ($custom !== false) {
-                $bytesize = $custom;
-            }
-        }
-        if ($bytesize < 0) {
-            $bytesize = sprintf("%u", $bytesize);
-        }
-        $stat["size"] = $stat[7] = $bytesize;
-
-        return $stat;
-    }
-}
diff --git a/core/src/core/classes/class.AJXP_Node.php b/core/src/core/classes/class.AJXP_Node.php
deleted file mode 100644
index f0c3cfd29e..0000000000
--- a/core/src/core/classes/class.AJXP_Node.php
+++ /dev/null
@@ -1,605 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Atomic representation of a data. This the basic node of the hierarchical data.
- * Encapsulates the path and url, the nature (leaf or not) and the metadata of the node.
- * @package Pydio
- * @subpackage Core
- */
-class AJXP_Node
-{
-    /**
-     * @var string URL of the node in the form ajxp.protocol://repository_id/path/to/node
-     */
-    protected $_url;
-    /**
-     * @var array The node metadata
-     */
-    protected $_metadata = array();
-    /**
-     * @var string Associated wrapper
-     */
-    protected $_wrapperClassName;
-    /**
-     * @var array Parsed url fragments
-     */
-    protected $urlParts = array();
-    /**
-     * @var string A local representation of a real file, if possible
-     */
-    protected $realFilePointer;
-    /**
-     * @var bool Whether the core information of the node is already loaded or not
-     */
-    protected $nodeInfoLoaded = false;
-    /**
-     * @var string Details level passed to nodeLoadInfo()
-     */
-    protected $nodeInfoLevel = "minimal";
-    /**
-     * @var Repository
-     */
-    private $_repository;
-    /**
-     * @var AbstractAccessDriver
-     */
-    private $_accessDriver;
-    /**
-     * @var MetaStoreProvider
-     */
-    private $_metaStore;
-
-    /**
-     * @var String
-     */
-    private $_user;
-
-    /**
-     * @var array
-     */
-    private $_indexableMetaKeys = array();
-
-    /**
-     * @param string $url URL of the node in the form ajxp.protocol://repository_id/path/to/node
-     * @param array $metadata Node metadata
-     */
-    public function __construct($url, $metadata = array())
-    {
-        $this->setUrl($url);
-        $this->_metadata = $metadata;
-    }
-
-    public function __sleep()
-    {
-        $t = array_diff(array_keys(get_class_vars("AJXP_Node")), array("_accessDriver", "_repository", "_metaStore"));
-        return $t;
-    }
-
-    /**
-     * @param String $url of the node in the form ajxp.protocol://repository_id/path/to/node
-     * @return void
-     */
-    public function setUrl($url)
-    {
-        $this->_url = $url;
-        // Clean url
-        $testExp = explode("//", $url);
-        if (count($testExp) > 1) {
-            $this->_url = array_shift($testExp)."//";
-            $this->_url .= implode("/", $testExp);
-        }
-        $this->parseUrl();
-    }
-
-    public function getRepository()
-    {
-        if (!isSet($this->_repository)) {
-            $this->_repository = ConfService::getRepositoryById($this->urlParts["host"]);
-        }
-        return $this->_repository;
-    }
-
-    /**
-     * @return AbstractAccessDriver
-     */
-    public function getDriver()
-    {
-        if (!isSet($this->_accessDriver)) {
-            $repo = $this->getRepository();
-            if ($repo != null) {
-                $this->_accessDriver = ConfService::loadDriverForRepository($repo);
-            }
-        }
-        return $this->_accessDriver;
-    }
-
-    /**
-     * @param AbstractAccessDriver
-     */
-    public function setDriver($accessDriver)
-    {
-        $this->_accessDriver = $accessDriver;
-    }
-
-    /**
-     * @return MetaStoreProvider
-     */
-    protected function getMetaStore()
-    {
-        if (!isSet($this->_metaStore)) {
-            $this->getDriver();
-            $this->_metaStore = AJXP_PluginsService::getInstance()->getUniqueActivePluginForType("metastore");
-        }
-        return $this->_metaStore;
-    }
-
-    public function hasMetaStore()
-    {
-        return ($this->getMetaStore() != false);
-    }
-
-    /**
-     * @param $nameSpace
-     * @param $metaData
-     * @param bool $private
-     * @param int $scope
-     * @param bool $indexable
-     */
-    public function setMetadata($nameSpace, $metaData, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY, $indexable = false)
-    {
-        $metaStore = $this->getMetaStore();
-        if ($metaStore !== false) {
-            $metaStore->setMetadata($this, $nameSpace, $metaData, $private, $scope);
-            //$this->mergeMetadata($metaData);
-            if ($indexable) {
-                if(!isSet($this->_indexableMetaKeys[$private ? "user":"shared"]))$this->_indexableMetaKeys[$private ? "user":"shared"] = array();
-                $this->_indexableMetaKeys[$private ? "user":"shared"][$nameSpace] = $nameSpace;
-            }
-            AJXP_Controller::applyHook("node.meta_change", array(&$this));
-        }
-    }
-
-    /**
-     * @param String $nameSpace
-     * @param bool $private
-     * @param int $scope
-     * @param bool $indexable
-     */
-    public function removeMetadata($nameSpace, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY, $indexable = false)
-    {
-        $metaStore = $this->getMetaStore();
-        if ($metaStore !== false) {
-            $metaStore->removeMetadata($this, $nameSpace, $private, $scope);
-            if ($indexable && isSet($this->_indexableMetaKeys[$private ? "user":"shared"]) && isset($this->_indexableMetaKeys[$private ? "user":"shared"][$nameSpace])) {
-                unset($this->_indexableMetaKeys[$private ? "user":"shared"][$nameSpace]);
-            }
-            AJXP_Controller::applyHook("node.meta_change", array(&$this));
-        }
-    }
-
-    /**
-     * @param String $nameSpace
-     * @param bool $private
-     * @param int $scope
-     * @param bool $indexable
-     * @return array
-     */
-    public function retrieveMetadata($nameSpace, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY, $indexable = false)
-    {
-        $metaStore = $this->getMetaStore();
-        if ($metaStore !== false) {
-            $data = $metaStore->retrieveMetadata($this, $nameSpace, $private, $scope);
-            if (!empty($data) && $indexable) {
-                if(!isSet($this->_indexableMetaKeys[$private ? "user":"shared"]))$this->_indexableMetaKeys[$private ? "user":"shared"] = array();
-                $this->_indexableMetaKeys[$private ? "user":"shared"][$nameSpace] = $nameSpace;
-            }
-            return $data;
-        }
-        return array();
-    }
-
-    /**
-     * @param AJXP_Node $originalNode
-     * @param string $nameSpace
-     * @param string $operation
-     * @param bool $private
-     * @param int $scope
-     * @param bool $indexable
-     * @return array()
-     */
-    public function copyOrMoveMetadataFromNode($originalNode, $nameSpace, $operation="move", $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY, $indexable = false){
-
-        if($this->getMetaStore() == false || $this->getMetaStore()->inherentMetaMove()){
-            return array();
-        }
-        $metaData = $originalNode->retrieveMetadata($nameSpace, $private, $scope, $indexable);
-        if(isSet($metaData) && !empty($metaData)){
-            $this->setMetadata($nameSpace, $metaData, $private, $scope, $indexable);
-            if($operation == "move"){
-                $originalNode->removeMetadata($nameSpace, $private, $scope, $indexable);
-            }
-            return $metaData;
-        }
-        return array();
-
-    }
-
-    /**
-     * @return AJXP_Node|null
-     */
-    public function getParent(){
-
-        if(empty($this->urlParts["path"]) || $this->urlParts["path"] == "/"){
-            return null;
-        }
-        $parent = new AJXP_Node(dirname($this->_url));
-        $parent->setDriver($this->_accessDriver);
-        return $parent;
-
-    }
-
-    public function findMetadataInParent($nameSpace, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY, $indexable = false){
-
-        $metadata = false;
-        $parentNode = $this->getParent();
-        if($parentNode != null){
-            $metadata = $parentNode->retrieveMetadata($nameSpace, $private, $scope,$indexable);
-            if($metadata == false){
-                $metadata = $parentNode->findMetadataInParent($nameSpace, $private, $scope, $indexable);
-            }else{
-                $metadata["SOURCE_NODE"] = $parentNode;
-            }
-        }
-        return $metadata;
-
-    }
-
-    /**
-     * @param String $nameSpace
-     * @param bool $private
-     * @param int $scope
-     * @param bool $indexable
-     * @param array $collect
-     */
-    public function collectMetadataInParents($nameSpace, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY, $indexable = false, &$collect=array()){
-
-        $parentNode = $this->getParent();
-        if($parentNode != null){
-            $metadata = $parentNode->retrieveMetadata($nameSpace, $private, $scope,$indexable);
-            if($metadata != false){
-                $metadata["SOURCE_NODE"] = $parentNode;
-                $collect[] = $metadata;
-            }
-            $parentNode->collectMetadataInParents($nameSpace, $private, $scope, $indexable, $collect);
-        }
-
-    }
-
-    /**
-     * @param array $nameSpaces
-     * @param bool $private
-     * @param int $scope
-     * @param bool $indexable
-     * @param array $collect
-     */
-    public function collectMetadatasInParents($nameSpaces, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY, $indexable = false, &$collect=array()){
-
-        $parentNode = $this->getParent();
-        if($parentNode != null){
-            $nodeMeta = array();
-            foreach($nameSpaces as $nameSpace){
-                $metadata = $parentNode->retrieveMetadata($nameSpace, $private, $scope,$indexable);
-                if($metadata != false){
-                    $nodeMeta[$nameSpace] = $metadata;
-                }
-            }
-            if(count($nodeMeta)){
-                $nodeMeta["SOURCE_NODE"] = $parentNode;
-                $collect[] = $nodeMeta;
-            }
-            $parentNode->collectMetadatasInParents($nameSpaces, $private, $scope, $indexable, $collect);
-        }
-
-    }
-
-    public function collectRepositoryMetadatasInChildren($nameSpace, $userScope){
-        $result = array();
-        $metaStore = $this->getMetaStore();
-        if($metaStore !== false && method_exists($metaStore, "collectChildrenWithRepositoryMeta")){
-            $result = $metaStore->collectChildrenWithRepositoryMeta($this, $nameSpace, $userScope);
-        }
-        return $result;
-    }
-
-    /**
-     * @param bool $boolean Leaf or Collection?
-     * @return void
-     */
-    public function setLeaf($boolean)
-    {
-        $this->_metadata["is_file"] = $boolean;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isLeaf()
-    {
-        return isSet($this->_metadata["is_file"])?$this->_metadata["is_file"]:true;
-    }
-
-    /**
-     * @param $label String Main label, will set the metadata "text" key.
-     * @return void
-     */
-    public function setLabel($label)
-    {
-        $this->_metadata["text"] = $label;
-    }
-
-    /**
-     * @return string Try to get the metadata "text" key, or the basename of the node path.
-     */
-    public function getLabel()
-    {
-        return isSet($this->_metadata["text"])? $this->_metadata["text"] : basename($this->urlParts["path"]);
-    }
-
-    /**
-     * @return string
-     */
-    public function getExtension(){
-        return strtolower(pathinfo($this->urlParts["path"], PATHINFO_EXTENSION));
-    }
-
-    /**
-     * @param $string
-     * @return bool
-     */
-    public function hasExtension($string){
-        return strcasecmp($string, $this->getExtension()) == 0;
-    }
-
-    /**
-     * List all set metadata keys
-     * @return array
-     */
-    public function listMetaKeys()
-    {
-        return array_keys($this->_metadata);
-    }
-
-    /**
-     * Applies the "node.info" hook, thus going through the plugins that have registered this node, and loading
-     * all metadata at once.
-     * @param bool $forceRefresh
-     * @param bool $contextNode The parent node, if it can be useful for the hooks callbacks
-     * @param mixed $details A specification of expected metadata fields, or minimal
-     * @return void
-     */
-    public function loadNodeInfo($forceRefresh = false, $contextNode = false, $details = false)
-    {
-        if($this->nodeInfoLoaded && $this->nodeInfoLevel != $details){
-            $forceRefresh = true;
-        }
-        if($this->nodeInfoLoaded && !$forceRefresh){
-            return;
-        }
-        if (!empty($this->_wrapperClassName)) {
-            $registered = AJXP_PluginsService::getInstance()->getRegisteredWrappers();
-            if (!isSet($registered[$this->getScheme()])) {
-                $driver = $this->getDriver();
-                if(is_object($driver)) $driver->detectStreamWrapper(true);
-            }
-        }
-        AJXP_Controller::applyHook("node.info.start", array(&$this, $contextNode, $details));
-        if($this->nodeInfoLoaded && !$forceRefresh){
-            return;
-        }
-        AJXP_Controller::applyHook("node.info", array(&$this, $contextNode, $details));
-        AJXP_Controller::applyHook("node.info.end", array(&$this, $contextNode, $details));
-        $this->nodeInfoLoaded = true;
-        $this->nodeInfoLevel = $details;
-    }
-
-    /**
-     * Get a real reference to the filesystem. Remote wrappers will copy the file locally.
-     * This will last the time of the script and will be removed afterward.
-     * @return string
-     */
-    public function getRealFile()
-    {
-        if (!isset($this->realFilePointer)) {
-        $this->realFilePointer = AJXP_MetaStreamWrapper::getRealFSReference($this->_url, true);
-            $isRemote = AJXP_MetaStreamWrapper::wrapperIsRemote($this->_url);
-            if ($isRemote) {
-                register_shutdown_function(array("AJXP_Utils", "silentUnlink"), $this->realFilePointer);
-            }
-        }
-        return $this->realFilePointer;
-    }
-
-    /**
-     * @return string URL of the node in the form ajxp.protocol://repository_id/path/to/node
-     */
-    public function getUrl()
-    {
-        return $this->_url;
-    }
-
-    /**
-     * @return string The path from the root of the repository
-     */
-    public function getPath()
-    {
-        return $this->urlParts["path"];
-    }
-
-    public function isRoot()
-    {
-        return !isset($this->urlParts["path"]) || $this->urlParts["path"] == "/";
-    }
-
-    /**
-     * @return string The scheme part of the url
-     */
-    public function getScheme()
-    {
-        return $this->urlParts["scheme"];
-    }
-
-    /**
-     * @return string A username
-     */
-    public function getUser(){
-        return $this->_user;
-    }
-
-    /**
-     * @param string $userId A username
-     */
-    public function setUser($userId){
-        $this->_user = $userId;
-        $this->urlParts["user"] = $userId;
-        // Update url with a user@workspaceID
-        $crt = $this->getScheme()."://".$this->getRepositoryId();
-        $this->_url = str_replace($crt, $this->getScheme()."://".$this->_user."@".$this->getRepositoryId(), $this->_url);
-    }
-
-    /**
-     * @return string A username passed through url
-     */
-    public function hasUser(){
-        return isSet($this->_user);
-    }
-
-    /**
-     * @return string The repository identifer
-     */
-    public function getRepositoryId()
-    {
-        return $this->urlParts["host"];
-    }
-
-    /**
-     * Pass an array of metadata and merge its content with the current metadata.
-     * @param array $metadata
-     * @param bool $mergeValues
-     * @return void
-     */
-    public function mergeMetadata($metadata, $mergeValues = false)
-    {
-        if ($mergeValues) {
-            foreach ($metadata as $key => $value) {
-                if (isSet($this->_metadata[$key])) {
-                    $existingValue = explode(",", $this->_metadata[$key]);
-                    if (!in_array($value, $existingValue)) {
-                        array_push($existingValue, $value);
-                        $this->_metadata[$key] = implode(",", $existingValue);
-                    }
-                } else {
-                    $this->_metadata[$key] = $value;
-                }
-            }
-        } else {
-            $this->_metadata = array_merge($this->_metadata, $metadata);
-        }
-    }
-
-    /**
-     * Return all metadata loaded during node.info, mainly used for caching.
-     * @return array
-     */
-    public function getNodeInfoMeta(){
-        return $this->_metadata;
-    }
-
-    /**
-     * Set nodeInfoLoaded to true from external.
-     * @param string $level
-     */
-    public function setInfoLoaded($level){
-        $this->nodeInfoLoaded = true;
-        $this->nodeInfoLevel = $level;
-    }
-
-    /**
-     * Magic getter for metadata
-     * @param $varName
-     * @return array|null|string
-     */
-    public function __get($varName)
-    {
-        if(strtolower($varName) == "wrapperclassname") return $this->_wrapperClassName;
-        if(strtolower($varName) == "url") return $this->_url;
-        if(strtolower($varName) == "metadata") return $this->_metadata;
-        if(strtolower($varName) == "indexablemetakeys") return $this->_indexableMetaKeys;
-
-        if (isSet($this->_metadata[$varName])) {
-            return $this->_metadata[$varName];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Magic setter for metadata
-     * @param $metaName
-     * @param $metaValue
-     * @return void
-     */
-    public function __set($metaName, $metaValue)
-    {
-        if (strtolower($metaName) == "metadata") {
-            $this->_metadata = $metaValue;
-            return;
-        }
-        if($metaValue == null) unset($this->_metadata[$metaName]);
-        else $this->_metadata[$metaName] = $metaValue;
-    }
-
-    /**
-     * Safe parseUrl implementation
-     * @return void
-     */
-    protected function parseUrl()
-    {
-        if (strstr($this->_url, "#") !== false) {
-            $url = str_replace("#", "__HASH__", $this->_url);
-            $this->urlParts = parse_url($url);
-            foreach ($this->urlParts as $partKey => $partValue) {
-                $this->urlParts[$partKey] = str_replace("__HASH__", "#", $partValue);
-            }
-        } else {
-            $this->urlParts = parse_url($this->_url);
-        }
-
-        if (strstr($this->urlParts["scheme"], "ajxp.")!==false) {
-            $pServ = AJXP_PluginsService::getInstance();
-            $this->_wrapperClassName = $pServ->getWrapperClassName($this->urlParts["scheme"]);
-        }else if($this->urlParts["scheme"] == "pydio"){
-            $this->_wrapperClassName = "AJXP_MetaStreamWrapper";
-        }
-    }
-
-}
diff --git a/core/src/core/classes/class.AJXP_Permission.php b/core/src/core/classes/class.AJXP_Permission.php
deleted file mode 100755
index 29008293bb..0000000000
--- a/core/src/core/classes/class.AJXP_Permission.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-/*
- * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-/**
- * Class AJXP_Permission
- *
- * Atomic permission associated to a folder path. Can be initialized either with an integer
- * value (use MASK constants) or with a string value like "r", "rw", etc.
- *
- * @package Pydio
- * @subpackage Core
- */
-class AJXP_Permission implements JsonSerializable
-{
-    /**
-     * Use an integer number to store permission
-     *  |r|w|d|t|....|..
-     *  |0|1|0|0|....|..
-     */
-
-    const MASK = 15; // 0000..001111 means use 4 first bits for encoding permission. The rest will be cut off.
-    const READ = 1; // 0001
-    const WRITE = 2; // 0010
-    const DENY = 4; // 0100
-    const TRAVEL = 8; //1000
-
-    private $value = 0;
-
-    /**
-     * @param array|null $value
-     */
-    function __construct($value = null){
-        if($value != null){
-            if(is_array($value)) $this->value = $value;
-            elseif(is_integer($value)) {
-                $this->value = $value & self::MASK;
-            }
-            elseif(is_string($value)){
-                if(strpos($value, "r") !== false) $this->setRead();
-                if(strpos($value, "w") !== false) $this->setWrite();
-                if(strpos($value, "d") !== false) $this->setDeny();
-            }
-        }
-    }
-
-    /**
-     * Replicate this permission.
-     * @return AJXP_Permission
-     */
-    function getCopy(){
-        return new AJXP_Permission($this->value);
-    }
-
-    /**
-     * Test if the permission is readable
-     * @return bool
-     */
-    function canRead(){
-        return ($this->value & self::READ) === self::READ;
-    }
-
-    /**
-     * Test if the permission is writeable
-     * @return bool
-     */
-    function canWrite(){
-        return ($this->value & self::WRITE) === self::WRITE;
-    }
-
-    /**
-     * Test if the permission denies access, whatever happens.
-     * @return bool
-     */
-    function denies(){
-        if ($this->value === self::DENY) return true;
-        if ($this->value === 0) return true;
-        return false;
-    }
-
-    /**
-     * Test if the permission is just empty
-     * @return bool
-     */
-    function isEmpty(){
-        return $this->value === 0;
-    }
-
-    /**
-     * Test permission against an integer value
-     * @param int $numPerm
-     * @return bool
-     * @throws Exception
-     */
-    function testPermission($numPerm){
-        if(is_integer($numPerm) && ($numPerm < self::MASK)){
-            $numPerm = $numPerm & self::MASK;
-            if (($this->value !== 0) && $numPerm === 0) return false;
-            if (($this->value === 0) && $numPerm === self::DENY) return true;
-            if ( ($this->value & self::DENY ) === self::DENY) return false;
-            return (($this->value & $numPerm) === $numPerm);
-        }
-        else{
-            throw new Exception("Unimplemented permission : " . $numPerm);
-        }
-    }
-
-    /**
-     * Set this permission as readable
-     * @param bool|true $value
-     */
-    function setRead($value = true){
-        if($value)
-            $this->value = $this->value | self::READ;
-        else{
-            $this->value = $this->value & (self::READ ^ self::MASK);
-        }
-    }
-
-    /**
-     * Set this permission as writeable
-     * @param bool|true $value
-     */
-    function setWrite($value = true){
-        if($value)
-            $this->value = $this->value | self::WRITE;
-        else{
-            $this->value = $this->value & (self::WRITE ^ self::MASK);
-        }
-    }
-
-    /**
-     * Set this permission as denied
-     * @param bool|true $value
-     */
-    function setDeny($value = true){
-        if($value)
-            $this->value = self::DENY;
-        else{
-            $this->value = $this->value & (self::DENY ^ self::MASK);
-        }
-    }
-
-    /**
-     * Override this permission value with the one passed in parameter
-     * @param AJXP_Permission $perm
-     * @return AJXP_Permission
-     */
-    function override($perm){
-        $newPerm = $perm->getCopy();
-        if($this->denies()){
-            $newPerm->setDeny();
-        }else{
-            if($this->canRead())
-                $newPerm->setRead();
-            if($this->canWrite())
-                $newPerm->setWrite();
-        }
-        return $newPerm;
-    }
-
-    function __toString(){
-        if($this->denies()) {
-            return "DENY";
-        }else if($this->canRead() && !$this->canWrite()) {
-            return "READONLY";
-        }else if(!$this->canRead() && $this->canWrite()) {
-            return "WRITEONLY";
-        }else{
-            return "READ WRITE";
-        }
-    }
-
-    /**
-     * Specify data which should be serialized to JSON
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     * @return mixed data which can be serialized by <b>json_encode</b>,
-     * which is a value of any type other than a resource.
-     * @since 5.4.0
-     */
-    function jsonSerialize()
-    {
-        return array("read" => $this->canRead(), "write" => $this->canWrite(), "deny" => $this->denies());
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/classes/class.AJXP_PermissionMask.php b/core/src/core/classes/class.AJXP_PermissionMask.php
deleted file mode 100755
index 1358bfd43e..0000000000
--- a/core/src/core/classes/class.AJXP_PermissionMask.php
+++ /dev/null
@@ -1,315 +0,0 @@
-<?php
-/*
- * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-/**
- * Class AJXP_PermissionMask
- *
- * Stores a mapping of path => AJXP_Permission that can be used as a mask on an existing folder structure.
- *
- * @package Pydio
- * @subpackage Core
- *
- */
-class AJXP_PermissionMask implements JsonSerializable, Serializable
-{
-    /**
-     * @var array
-     */
-    private $permissionTree = array();
-
-    /**
-     * Initialize an empty mask, or from a serializedForm.
-     * @param array|null $serializedForm
-     */
-    function __construct($serializedForm = null){
-        if($serializedForm != null){
-            foreach($serializedForm as $path => $permissionValue){
-                $path = AJXP_Utils::sanitize(AJXP_Utils::securePath($path), AJXP_SANITIZE_DIRNAME);
-                if(!is_array($permissionValue) || $permissionValue["children"]) continue;
-                $perm = new AJXP_Permission();
-                if($permissionValue["read"]) $perm->setRead();
-                if($permissionValue["write"]) $perm->setWrite();
-                if($permissionValue["deny"]) $perm->setDeny();
-                if($perm->isEmpty()) continue;
-                $this->updateBranch($path, $perm);
-            }
-        }
-    }
-
-    /**
-     * Returns the whole permission tree
-     * @return array
-     */
-    function getTree(){
-        if($this->permissionTree == null) return array();
-        return $this->permissionTree;
-    }
-
-    /**
-     * Set the permision tree at once
-     * @param array $tree
-     * @return AJXP_PermissionMask;
-     */
-    function updateTree($tree){
-        $this->permissionTree = $tree;
-        return $this;
-    }
-
-    /**
-     * Add a branch in the permissions tree
-     * @param string $path
-     * @param AJXP_Permission $permission
-     * @return AJXP_PermissionMask
-     */
-    function updateBranch($path, $permission){
-        // Update the tree
-        $this->permissionTree = $this->mergeTrees($this->permissionTree, $this->pathToBranch($path, $permission));
-        return $this;
-    }
-
-    /**
-     * Delete a branch from the permission tree
-     * @param string $path
-     * @return AJXP_PermissionMask
-     */
-    function deleteBranch($path){
-        // Update the tree
-        return $this;
-    }
-
-    /**
-     * Merge the current permission tree with the one passed in parameter. The latter takes precedence on the first.
-     * @param AJXP_PermissionMask $mask
-     * @return AJXP_PermissionMask
-     */
-    function override($mask){
-        // Return a new mask
-        $newMask = new AJXP_PermissionMask();
-        $newMask->updateTree($this->mergeTrees($this->permissionTree, $mask->getTree()));
-        return $newMask;
-    }
-
-    /**
-     * Copy the full tree from the one passed in parameter
-     * @param AJXP_PermissionMask $mask
-     * @return AJXP_PermissionMask
-     */
-
-    function copyMask($mask){
-        $this->updateTree($mask->getTree());
-    }
-
-    /**
-     * Test if a given path does have the given permission according to this mask permission tree.
-     * @param string $test
-     * @param  string $permission
-     * @return bool
-     */
-    function match($test, $permission){
-        // Check if a path has the given permission
-        $pathes = $this->flattenTree();
-
-        if(empty($test) || $test == "/" || $test == "/." || $test == "/..") {
-            if(!count($pathes)) return true;
-            if(isSet($pathes["/"])) {
-                $permObject = $pathes["/"];
-                // If not read or write, must be read at least for root
-                if($permObject->denies()) $permObject->setRead(true);
-                return $permObject->testPermission($permission);
-            }
-            if($permission == AJXP_Permission::READ) return true;
-            else if($permission == AJXP_Permission::WRITE) return false;
-            return true;
-        }
-
-        foreach($pathes as $path => $permObject){
-            if(strpos($test, rtrim($path, "/")."/") === 0 || $test === $path){
-                return $permObject->testPermission($permission);
-            }
-        }
-        // test is not under a defined permission, check if it needs traversal
-        foreach($pathes as $path => $permObject){
-            if(strpos($path, $test) === 0 && !$permObject->denies()){
-                if($permission == AJXP_Permission::READ) return true;
-                else if($permission == AJXP_Permission::WRITE) return false;
-                return $permObject->testPermission($permission);
-            }
-        }
-
-        // Not in any path
-        return false;
-
-    }
-
-    /**
-     * Merge two trees
-     * @param array $t1
-     * @param array $t2
-     * @return array
-     */
-    private function mergeTrees($t1, $t2){
-        $result = $t1;
-        foreach($t2 as $key => $value2){
-            if(!isset($t1[$key])){
-                // Add branch
-                $result[$key] = $value2;
-                continue;
-            }
-            $value1 = $t1[$key];
-            if(is_a($value1, "AJXP_Permission") && is_a($value2, "AJXP_Permission")){
-                /**
-                 * @var AJXP_Permission $value2
-                 */
-                $result[$key] = $value2->override($value1);
-            }else if(is_a($value1, "AJXP_Permission")){
-                $result[$key] = $value2;
-            }else if(is_a($value2, "AJXP_Permission")){
-                /**
-                 * @var AJXP_Permission $value2
-                 */
-                //if($value2->denies()) {
-                    $result[$key] = $value2;
-                //} else{
-                    // do nothing, keep original branch
-                //}
-            }else{
-                // Two arrays
-                $result[$key] = $this->mergeTrees($value1, $value2);
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Translate a path=> AJXP_Permission to an array-based branch.
-     * @param string $path
-     * @param AJXP_Permission $permission
-     * @return array
-     */
-    private function pathToBranch($path, $permission){
-        $parts = explode("/", trim($path, "/"));
-        $l = count($parts);
-        $br = array();
-        $current = &$br;
-        for($i=0;$i<$l; $i++){
-            if($i < $l - 1){
-                $current[$parts[$i]] = array();
-                $current = &$current[$parts[$i]];
-            }else{
-                $current[$parts[$i]] = $permission;
-            }
-        }
-        return $br;
-    }
-
-    /**
-     * Transform the permission tree into a flat structure of pathes => permissions.
-     * @param array|null $tree
-     * @param array|null $pathes
-     * @param string $currentRoot
-     * @return AJXP_Permission[]
-     */
-    public function flattenTree($tree = null, &$pathes = null, $currentRoot=""){
-        if($tree == null) $tree = $this->getTree();
-        if($pathes == null) $pathes = array();
-        if(!is_array($tree) || $tree == null) $tree = array();
-        foreach($tree as $pathPart => $value){
-            if(is_a($value, "AJXP_Permission")){
-                $pathes[$currentRoot."/".$pathPart] = $value;
-            }else{
-                $this->flattenTree($value, $pathes, $currentRoot."/".$pathPart);
-            }
-        }
-
-        return $pathes;
-    }
-
-
-    /**
-     * Print the tree as a string (for debug puprpose).
-     * @param $permissionTree
-     * @param $level
-     */
-    public function toStr($permissionTree, $level)
-    {
-        $level = $level + 1;
-        foreach ($permissionTree as $key => $node) {
-
-            $this->printSpace($level);
-            echo "[" . $key . "]";
-            if ($node instanceof AJXP_Permission) echo "(".$node.")";
-
-            echo "\n";
-            if (is_array($node) && count($node) > 0) {
-                $permissionTree = $node;
-                $this->toStr($permissionTree, $level);
-            }
-
-        }
-        $level = $level - 1;
-        //echo "\n";
-    }
-
-    public function printSpace($number){
-        for ($i = 0; $i < $number; $i++){
-            echo "--";
-        }
-    }
-
-    /**
-     * Specify data which should be serialized to JSON
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     * @return mixed data which can be serialized by <b>json_encode</b>,
-     * which is a value of any type other than a resource.
-     * @since 5.4.0
-     */
-    function jsonSerialize()
-    {
-        return $this->flattenTree();
-    }
-
-    /**
-     * String representation of object
-     * @link http://php.net/manual/en/serializable.serialize.php
-     * @return string the string representation of the object or null
-     * @since 5.1.0
-     */
-    public function serialize()
-    {
-        return serialize($this->permissionTree);
-    }
-
-    /**
-     * Constructs the object
-     * @link http://php.net/manual/en/serializable.unserialize.php
-     * @param string $serialized <p>
-     * The string representation of the object.
-     * </p>
-     * @return void
-     * @since 5.1.0
-     */
-    public function unserialize($serialized)
-    {
-        $this->permissionTree = unserialize($serialized);
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/classes/class.AJXP_Plugin.php b/core/src/core/classes/class.AJXP_Plugin.php
deleted file mode 100644
index de78d5ce39..0000000000
--- a/core/src/core/classes/class.AJXP_Plugin.php
+++ /dev/null
@@ -1,1048 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-if (!defined('LOG_LEVEL_DEBUG')) {
-    define("LOG_LEVEL_DEBUG", "Debug");
-    define("LOG_LEVEL_INFO", "Info");
-    define("LOG_LEVEL_NOTICE", "Notice");
-    define("LOG_LEVEL_WARNING", "Warning");
-    define("LOG_LEVEL_ERROR", "Error");
-}
-
-/**
- * The basic concept of plugin. Only needs a manifest.xml file.
- * @package Pydio
- * @subpackage Core
- */
-class AJXP_Plugin implements Serializable
-{
-    protected $baseDir;
-    protected $id;
-    protected $name;
-    protected $type;
-    /**
-     * XPath query
-     *
-     * @var DOMXPath
-     */
-    private $xPath;
-    protected $manifestLoaded = false;
-    protected $externalFilesAppended = false;
-    protected $enabled;
-    protected $registryContributions = array();
-    protected $contributionsLoaded = false;
-    protected $options; // can be passed at init time
-    protected $pluginConf; // can be passed at load time
-    protected $pluginConfDefinition;
-    protected $dependencies;
-    protected $extensionsDependencies;
-    protected $streamData;
-    protected $mixins = array();
-    protected $cachedXPathResults = array();
-    public $loadingState = "";
-    /**
-     * The manifest.xml loaded
-     *
-     * @var DOMDocument
-     */
-    protected $manifestDoc;
-
-    /**
-     * Internally store XML during serialization state.
-     *
-     * @var string
-     */
-    private $manifestXML;
-
-    private $serializableAttributes = array(
-        "baseDir",
-        "id",
-        "name",
-        "type",
-        "manifestLoaded",
-        "externalFilesAppended",
-        "enabled",
-        "registryContributions",
-        "contributionsLoaded",
-        "mixins",
-        "streamData",
-        "options", "pluginConf", "pluginConfDefinition", "dependencies", "extensionsDependencies", "loadingState", "manifestXML", "cachedXPathResults");
-
-    /**
-     * Construction method
-     *
-     * @param string $id
-     * @param string $baseDir
-     */
-    public function __construct($id, $baseDir)
-    {
-        $this->baseDir = $baseDir;
-        $this->id = $id;
-        $split = explode(".", $id);
-        $this->type = $split[0];
-        $this->name = $split[1];
-        $this->dependencies = array();
-        $this->extensionsDependencies = array();
-    }
-
-    public static function getWorkDirForPluginId($pluginId) {
-        return AJXP_DATA_PATH.DIRECTORY_SEPARATOR."plugins".DIRECTORY_SEPARATOR.$pluginId;
-    }
-
-    protected function getPluginWorkDir($check = false)
-    {
-        $d = self::getWorkDirForPluginId($this->getId());
-        if(!$check) return $d;
-        if (!is_dir($d)) {
-            $res = @mkdir($d, 0755, true);
-            if(!$res) throw new Exception("Error while creating plugin directory for ".$this->getId());
-        }
-        return $d;
-    }
-
-    protected function getPluginCacheDir($shared = false, $check = false)
-    {
-        $d = ($shared ? AJXP_SHARED_CACHE_DIR : AJXP_CACHE_DIR).DIRECTORY_SEPARATOR."plugins".DIRECTORY_SEPARATOR.$this->getId();
-        if(!$check) return $d;
-        if (!is_dir($d)) {
-            $res = @mkdir($d, 0755, true);
-            if(!$res) throw new Exception("Error while creating plugin cache directory for ".$this->getId());
-        }
-        return $d;
-    }
-
-    /**
-     * @return DOMXPath
-     */
-    protected function getXPath(){
-        $this->unserializeManifest();
-        return $this->xPath;
-    }
-
-    /**
-     * @param $options
-     * @return void
-     */
-    public function init($options)
-    {
-        $this->options = array_merge($this->loadOptionsDefaults(), $options);
-    }
-
-    /**
-     * @param string $optionName
-     * @param string|Repository $repositoryScope
-     * @param null|AbstractAjxpUser $userObject
-     * @return mixed|null
-     */
-    protected function getFilteredOption($optionName, $repositoryScope = AJXP_REPO_SCOPE_ALL, $userObject = null)
-    {
-        if(!is_array($this->options)) $this->options = array();
-        $merged = $this->options;
-        if(is_array($this->pluginConf)) $merged = array_merge($merged, $this->pluginConf);
-        $loggedUser = $userObject;
-        if($loggedUser == null){
-            $loggedUser = AuthService::getLoggedUser();
-        }
-        if ($loggedUser != null) {
-            if ($repositoryScope === AJXP_REPO_SCOPE_ALL) {
-                $repo = ConfService::getRepository();
-                if($repo != null) $repositoryScope = $repo->getId();
-            }else if(is_a($repositoryScope, "Repository")){
-                $repo = $repositoryScope;
-                $repositoryScope = $repo->getId();
-            }
-            $test = $loggedUser->mergedRole->filterParameterValue(
-                $this->getId(),
-                $optionName,
-                $repositoryScope,
-                isSet($merged[$optionName]) ? $merged[$optionName] : null
-            );
-            if (isSet($repo) && $repo != null && $repo->hasParent()) {
-                $retest = $loggedUser->mergedRole->filterParameterValue(
-                    $this->getId(),
-                    $optionName,
-                    $repo->getParentId(),
-                    null
-                );
-                if($retest !== null) {
-                    $test = $retest;
-                }else if($repo->hasOwner()){
-                    // Test shared scope
-                    $retest = $loggedUser->mergedRole->filterParameterValue(
-                        $this->getId(),
-                        $optionName,
-                        AJXP_REPO_SCOPE_SHARED,
-                        null
-                    );
-                    if($retest !== null) {
-                        $test = $retest;
-                    }
-                }
-            }
-            return $test;
-        } else {
-            return isSet($merged[$optionName]) ? $merged[$optionName] : null;
-        }
-    }
-    /**
-     * Perform initialization checks, and throw exception if problems found.
-     * @throws Exception
-     */
-    public function performChecks()
-    {
-    }
-    /**
-     * @return bool
-     */
-    public function isEnabled()
-    {
-        if(isSet($this->enabled)) return $this->enabled;
-        $this->enabled = true;
-        if(isSet($this->cachedXPathResults["@enabled"])){
-            $value = $this->cachedXPathResults["@enabled"];
-            if($value === "false"){
-                $this->enabled = false;
-            }
-            return $this->enabled;
-        }
-        if ($this->manifestLoaded) {
-            if($this->manifestXML != null) $this->unserializeManifest();
-            $l = $this->xPath->query("@enabled", $this->manifestDoc->documentElement);
-            if ($l->length && $l->item(0)->nodeValue === "false") {
-                $this->enabled = false;
-            }
-        }
-        return $this->enabled;
-    }
-
-    /**
-     * Main function for loading all the nodes under registry_contributions.
-     * @param bool $dry
-     */
-    protected function loadRegistryContributions($dry = false)
-    {
-        if($this->manifestXML != null) $this->unserializeManifest();
-        $regNodes = $this->xPath->query("registry_contributions/*");
-        for ($i=0;$i<$regNodes->length;$i++) {
-            $regNode = $regNodes->item($i);
-            if($regNode->nodeType != XML_ELEMENT_NODE) continue;
-            if ($regNode->nodeName == "external_file" && !$this->externalFilesAppended) {
-                $data = $this->nodeAttrToHash($regNode);
-                $filename = $data["filename"] OR "";
-                $include = $data["include"] OR "*";
-                $exclude = $data["exclude"] OR "";
-                if(!is_file(AJXP_INSTALL_PATH."/".$filename)) continue;
-                if ($include != "*") {
-                    $include = explode(",", $include);
-                } else {
-                    $include = array("*");
-                }
-                if ($exclude != "") {
-                    $exclude = explode(",", $exclude);
-                } else {
-                    $exclude = array();
-                }
-                $this->initXmlContributionFile($filename, $include, $exclude, $dry);
-            } else {
-                if (!$dry) {
-                    $this->registryContributions[]=$regNode;
-                    $this->parseSpecificContributions($regNode);
-                }
-            }
-        }
-        // add manifest as a "plugins" (remove parsed contrib)
-        $pluginContrib = new DOMDocument();
-        $pluginContrib->loadXML("<plugins uuidAttr='name'></plugins>");
-        $manifestNode = $pluginContrib->importNode($this->manifestDoc->documentElement, true);
-        $pluginContrib->documentElement->appendChild($manifestNode);
-        $xP=new DOMXPath($pluginContrib);
-        $regNodeParent = $xP->query("registry_contributions", $manifestNode);
-        if ($regNodeParent->length) {
-            $manifestNode->removeChild($regNodeParent->item(0));
-        }
-        if (!$dry) {
-            $this->registryContributions[]=$pluginContrib->documentElement;
-            $this->parseSpecificContributions($pluginContrib->documentElement);
-            $this->contributionsLoaded = true;
-        }
-    }
-
-    /**
-     * Load an external XML file and include/exclude its nodes as contributions.
-     * @param string $xmlFile Path to the file from the base install path
-     * @param array $include XPath query for XML Nodes to include
-     * @param array $exclude XPath query for XML Nodes to exclude from the included ones.
-     * @param bool $dry Dry-run of the inclusion
-     */
-    protected function initXmlContributionFile($xmlFile, $include=array("*"), $exclude=array(), $dry = false)
-    {
-        $contribDoc = new DOMDocument();
-        $contribDoc->load(AJXP_INSTALL_PATH."/".$xmlFile);
-        if (!is_array($include) && !is_array($exclude)) {
-            if (!$dry) {
-                $this->registryContributions[] = $contribDoc->documentElement;
-                $this->parseSpecificContributions($contribDoc->documentElement);
-            }
-            return;
-        }
-        $xPath = new DOMXPath($contribDoc);
-        $excluded = array();
-        foreach ($exclude as $excludePath) {
-            $children = $xPath->query($excludePath);
-            foreach ($children as $child) {
-                $excluded[] = $child;
-            }
-        }
-        $selected = array();
-        foreach ($include as $includePath) {
-            $incChildren = $xPath->query($includePath);
-            if(!$incChildren->length) continue;
-            $parentNode = $incChildren->item(0)->parentNode;
-            if (!isSet($selected[$parentNode->nodeName])) {
-                $selected[$parentNode->nodeName]=array("parent"=>$parentNode, "nodes"=>array());
-            }
-            foreach ($incChildren as $incChild) {
-                $foundEx = false;
-                foreach ($excluded as $exChild) {
-                    if ($this->nodesEqual($exChild, $incChild)) {
-                        $foundEx = true;break;
-                    }
-                }
-                if($foundEx) continue;
-                $selected[$parentNode->nodeName]["nodes"][] = $incChild;
-            }
-            if (!count($selected[$parentNode->nodeName]["nodes"])) {
-                unset($selected[$parentNode->nodeName]);
-            }
-        }
-        if(!count($selected)) return;
-        $originalRegContrib = $this->xPath->query("registry_contributions")->item(0);
-        $localRegParent = null;
-        foreach ($selected as $parentNodeName => $data) {
-            $node = $data["parent"]->cloneNode(false);
-            //$newNode = $originalRegContrib->ownerDocument->importNode($node, false);
-            if ($dry) {
-                $localRegParent = $this->xPath->query("registry_contributions/".$parentNodeName);
-                if ($localRegParent->length) {
-                    $localRegParent = $localRegParent->item(0);
-                } else {
-                    $localRegParent = $originalRegContrib->ownerDocument->createElement($parentNodeName);
-                    $originalRegContrib->appendChild($localRegParent);
-                }
-            }
-            foreach ($data["nodes"] as $childNode) {
-                $node->appendChild($childNode);
-                if($dry) $localRegParent->appendChild($localRegParent->ownerDocument->importNode($childNode, true));
-            }
-            if (!$dry) {
-                $this->registryContributions[] = $node;
-                $this->parseSpecificContributions($node);
-            } else {
-                $this->reloadXPath();
-            }
-        }
-    }
-    /**
-     * Dynamically modify some registry contributions nodes. Can be easily derivated to enable/disable
-     * some features dynamically during plugin initialization.
-     * @param DOMNode $contribNode
-     * @return void
-     */
-    protected function parseSpecificContributions(&$contribNode)
-    {
-        //Append plugin id to callback tags
-        $callbacks = $contribNode->getElementsByTagName("serverCallback");
-        foreach ($callbacks as $callback) {
-            $attr = $callback->ownerDocument->createAttribute("pluginId");
-            $attr->value = $this->id;
-            $callback->appendChild($attr);
-        }
-    }
-
-    /**
-     * Load the main manifest.xml file of the plugni
-     * @throws Exception
-     * @return void
-     */
-    public function loadManifest()
-    {
-        $file = $this->baseDir."/manifest.xml";
-        if (!is_file($file)) {
-            return;
-        }
-        $this->manifestDoc = new DOMDocument();
-        try {
-            $this->manifestDoc->load($file);
-        } catch (Exception $e) {
-            throw $e;
-        }
-        $id = $this->manifestDoc->documentElement->getAttribute("id");
-        if (empty($id) || $id != $this->getId()) {
-            $this->manifestDoc->documentElement->setAttribute("id", $this->getId());
-        }
-        $this->xPath = new DOMXPath($this->manifestDoc);
-        $this->loadMixins();
-        $this->detectStreamWrapper();
-        $this->manifestLoaded = true;
-        $this->loadDependencies();
-    }
-
-    /**
-     * Get the plugin label as defined in the manifest file (label attribute)
-     * @return mixed|string
-     */
-    public function getManifestLabel()
-    {
-        if($this->manifestXML != null) $this->unserializeManifest();
-        $l = $this->xPath->query("@label", $this->manifestDoc->documentElement);
-        if($l->length) return AJXP_XMLWriter::replaceAjxpXmlKeywords($l->item(0)->nodeValue);
-        else return $this->id;
-    }
-    /**
-     * Get the plugin description as defined in the manifest file (description attribute)
-     * @return mixed|string
-     */
-    public function getManifestDescription()
-    {
-        if($this->manifestXML != null) $this->unserializeManifest();
-        $l = $this->xPath->query("@description", $this->manifestDoc->documentElement);
-        if($l->length) return AJXP_XMLWriter::replaceAjxpXmlKeywords($l->item(0)->nodeValue);
-        else return "";
-    }
-
-    /**
-     * Serialized all declared attributes and return a serialized representation of this plugin.
-     * The XML Manifest is base64 encoded before serialization.
-     * @return string
-     */
-    public function serialize()
-    {
-        if ($this->manifestDoc != null) {
-            $this->manifestXML = serialize(base64_encode($this->manifestDoc->saveXML()));
-        }
-        $serialArray = array();
-        foreach ($this->serializableAttributes as $attr) {
-            $serialArray[$attr] = $this->$attr;
-        }
-        return serialize($serialArray);
-    }
-
-    /**
-     * Load this plugin from its serialized reprensation. The manifest XML is base64 decoded.
-     * @param $string
-     * @return void
-     */
-    public function unserialize($string)
-    {
-        $serialArray = unserialize($string);
-        foreach ($serialArray as $key => $value) {
-            $this->$key = $value;
-        }
-        /*
-        if ($this->manifestXML != NULL) {
-            $this->manifestDoc = new DOMDocument(1.0, "UTF-8");
-            $this->manifestDoc->loadXML(base64_decode(unserialize($this->manifestXML)));
-            $this->reloadXPath();
-            unset($this->manifestXML);
-        }
-        */
-    }
-
-    /**
-     * Load DOMDocument from serialized value. Must be called after checking
-     * that property $this->manifestXML is not null.
-     */
-    protected function unserializeManifest(){
-        if($this->manifestXML != null){
-            $this->manifestDoc = new DOMDocument(1.0, "UTF-8");
-            $this->manifestDoc->loadXML(base64_decode(unserialize($this->manifestXML)));
-            $this->reloadXPath();
-            unset($this->manifestXML);
-        }
-    }
-
-    /**
-     * Legacy function, should better be used to return XML Nodes than string. Perform a query
-     * on the manifest.
-     * @param string $xmlNodeName
-     * @param string $format
-     * @param bool $externalFiles
-     * @return DOMElement|DOMNodeList|string
-     */
-    public function getManifestRawContent($xmlNodeName = "", $format = "string", $externalFiles = false)
-    {
-        if ($externalFiles && !$this->externalFilesAppended) {
-            $this->loadRegistryContributions(true);
-            $this->externalFilesAppended = true;
-        }
-        if($this->manifestXML != null) $this->unserializeManifest();
-        if ($xmlNodeName == "") {
-            if ($format == "string") {
-                return $this->manifestDoc->saveXML($this->manifestDoc->documentElement);
-            } else {
-                return $this->manifestDoc->documentElement;
-            }
-        } else {
-            $nodes = $this->xPath->query($xmlNodeName);
-            if ($format == "string") {
-                $buffer = "";
-                foreach ($nodes as $node) {
-                    $buffer .= $this->manifestDoc->saveXML($node);
-                }
-                return $buffer;
-            } else {
-                return $nodes;
-            }
-        }
-    }
-    /**
-     * Return the registry contributions. The parameter can be used by subclasses to optimize the size of the XML returned :
-     * the extended version is called when sending to the client, whereas the "small" version is loaded to find and apply actions.
-     * @param bool $extendedVersion Can be used by subclasses to optimize the size of the XML returned.
-     * @return array
-     */
-    public function getRegistryContributions($extendedVersion = true)
-    {
-        if (!$this->contributionsLoaded) {
-            $this->loadRegistryContributions();
-        }
-        return $this->registryContributions;
-    }
-    /**
-     * Load the declared dependant plugins
-     * @return void
-     */
-    protected function loadDependencies()
-    {
-        $depPaths = "dependencies/*/@pluginName";
-        $nodes = $this->xPath->query($depPaths);
-        foreach ($nodes as $attr) {
-            $value = $attr->value;
-            $this->dependencies = array_merge($this->dependencies, explode("|", $value));
-        }
-        $extPaths = "dependencies/phpExtension/@name";
-        $nodes = $this->xPath->query($extPaths);
-        foreach ($nodes as $attr) {
-            $this->extensionsDependencies[] = $attr->value;
-        }
-        $this->cachedNodesFromManifest("dependencies/activePlugin");
-        $this->cachedNodesFromManifest("//server_settings/param[@default]");
-        $this->cachedNodesFromManifest("//server_settings/global_param|//server_settings/param");
-        $l = $this->xPath->query("@enabled", $this->manifestDoc->documentElement);
-        if ($l->length) {
-            $this->cachedXPathResults["@enabled"] = $l->item(0)->nodeValue;
-        }else{
-            $this->cachedXPathResults["@enabled"] = "not_set";
-        }
-
-    }
-    /**
-     * Update dependencies dynamically
-     * @param AJXP_PluginsService $pluginService
-     * @return void
-     */
-    public function updateDependencies($pluginService)
-    {
-        $append = false;
-        foreach ($this->dependencies as $index => $dependency) {
-            if ($dependency == "access.AJXP_STREAM_PROVIDER") {
-                unset($this->dependencies[$index]);
-                $append = true;
-            }
-        }
-        if ($append) {
-            $this->dependencies = array_merge($this->dependencies, $pluginService->getStreamWrapperPlugins());
-        }
-    }
-    /**
-     * Check if this plugin depends on another one.
-     * @param string $pluginName
-     * @return bool
-     */
-    public function dependsOn($pluginName)
-    {
-        return (in_array($pluginName, $this->dependencies)
-            || in_array(substr($pluginName, 0, strpos($pluginName, "."))."+", $this->dependencies));
-    }
-
-    protected function cachedNodesFromManifest($query){
-        if(isSet($this->cachedXPathResults[$query])){
-            return $this->cachedXPathResults[$query];
-        }
-        if(!$this->manifestLoaded) return array();
-        if($this->manifestXML != null) $this->unserializeManifest();
-        $nodes = $this->xPath->query($query);
-        $res = array();
-        foreach($nodes as $xmlNode){
-            $arrayNode = $this->nodeAttrToHash($xmlNode);
-            $arrayNode["__NODE_NAME__"] = $xmlNode->nodeName;
-            $res[] = $arrayNode;
-        }
-        $this->cachedXPathResults[$query] = $res;
-        return $res;
-    }
-
-    /**
-     * Get dependencies
-     *
-     * @param AJXP_PluginsService $pluginService
-     * @return array
-     */
-    public function getActiveDependencies($pluginService)
-    {
-        $deps = array();
-        $nodes = $this->cachedNodesFromManifest("dependencies/activePlugin");
-        foreach ($nodes as $arrayNode) {
-            $value = $arrayNode["pluginName"];
-            $parts = explode("|", $value);
-            foreach ($parts as $depName) {
-                if ($depName == "access.AJXP_STREAM_PROVIDER") {
-                    $deps = array_merge($deps, $pluginService->getStreamWrapperPlugins());
-                } else if (strpos($depName, "+") !== false) {
-                    $typed = $pluginService->getPluginsByType(substr($depName, 0, strlen($depName)-1));
-                    foreach($typed as $typPlug) $deps[] = $typPlug->getId();
-                } else {
-                    $deps[] = $depName;// array_merge($deps, explode("|", $value));
-                }
-            }
-        }
-        return $deps;
-    }
-    /**
-     * Load the global parameters for this plugin
-     * @return void
-     */
-    protected function loadConfigsDefinitions()
-    {
-        $params = $this->cachedNodesFromManifest("//server_settings/global_param|//server_settings/param");
-        $this->pluginConf = array();
-        foreach ($params as $paramNode) {
-            $global = ($paramNode['__NODE_NAME__'] == "global_param");
-            $this->pluginConfDefinition[$paramNode["name"]] = $paramNode;
-            if ($global && isset($paramNode["default"])) {
-                if ($paramNode["type"] == "boolean") {
-                    $paramNode["default"] = ($paramNode["default"] === "true" ? true: false);
-                } else if ($paramNode["type"] == "integer") {
-                    $paramNode["default"] = intval($paramNode["default"]);
-                }
-                $this->pluginConf[$paramNode["name"]] = $paramNode["default"];
-            }
-        }
-    }
-    /**
-     * Load the default values for this plugin options
-     * @return array
-     */
-    protected function loadOptionsDefaults()
-    {
-        $optionsDefaults = array();
-        $params = $this->cachedNodesFromManifest("//server_settings/param[@default]");
-        foreach ($params as $node) {
-            $default = $node["default"];
-            if ($node["type"] == "boolean") {
-                $default = ($default === "true" ? true: false);
-            } else if ($node["type"] == "integer") {
-                $default = intval($default);
-            }
-            $optionsDefaults[$node["name"]] = $default;
-        }
-        return $optionsDefaults;
-    }
-    /**
-     * @return array
-     */
-    public function getConfigsDefinitions()
-    {
-        return $this->pluginConfDefinition;
-    }
-    /**
-     * Load the configs passed as parameter. This method will
-     * + Parse the config definitions and load the default values
-     * + Merge these values with the $configData parameter
-     * + Publish their value in the manifest if the global_param is "exposed" to the client.
-     * @param array $configData
-     * @return void
-     */
-    public function loadConfigs($configData)
-    {
-        // PARSE DEFINITIONS AND LOAD DEFAULT VALUES
-        if (!isSet($this->pluginConf)) {
-            $this->loadConfigsDefinitions();
-        }
-        // MERGE WITH PASSED CONFIGS
-        $this->pluginConf = array_merge($this->pluginConf, $configData);
-
-        // PUBLISH IF NECESSARY
-        foreach ($this->pluginConf as $key => $value) {
-            if (isSet($this->pluginConfDefinition[$key]) && isSet($this->pluginConfDefinition[$key]["expose"]) && $this->pluginConfDefinition[$key]["expose"] == "true") {
-                $this->exposeConfigInManifest($key, $value);
-            }
-        }
-
-        // ASSIGN SPECIFIC OPTIONS TO PLUGIN KEY
-        if (isSet($this->pluginConf["AJXP_PLUGIN_ENABLED"])) {
-            $this->enabled = $this->pluginConf["AJXP_PLUGIN_ENABLED"];
-        }
-    }
-    /**
-     * Return this plugin configs, merged with its associated "core" configs.
-     * @return array
-     */
-    public function getConfigs()
-    {
-        $core = AJXP_PluginsService::getInstance()->findPlugin("core", $this->type);
-        if (!empty($core)) {
-            $coreConfs = $core->getConfigs();
-            return array_merge($coreConfs, $this->pluginConf);
-        } else {
-            return $this->pluginConf;
-        }
-    }
-    /**
-     * Return the file path of the specific class to load
-     * @return array|bool
-     */
-    public function getClassFile()
-    {
-        if($this->manifestXML != null) $this->unserializeManifest();
-        $files = $this->xPath->query("class_definition");
-        if(!$files->length) return false;
-        return $this->nodeAttrToHash($files->item(0));
-    }
-
-    public function missingExtensions(){
-        $missing = array();
-        if(count($this->extensionsDependencies)){
-            foreach($this->extensionsDependencies as $ext){
-                if (!extension_loaded($ext)) {
-                    $missing[] = $ext;
-                }
-            }
-        }
-        return $missing;
-    }
-
-    public function hasMissingExtensions(){
-        return count($this->missingExtensions()) > 0;
-    }
-
-    /**
-     * @return bool
-     */
-    public function manifestLoaded()
-    {
-        return $this->manifestLoaded;
-    }
-    /**
-     * @return string
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-    /**
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-    /**
-     * @return string
-     */
-    public function getBaseDir()
-    {
-        return $this->baseDir;
-    }
-    /**
-     * @return array
-     */
-    public function getDependencies()
-    {
-        return $this->dependencies;
-    }
-    /**
-     * Write a debug log with the plugin id as source
-     * @param string $prefix  A quick description or action
-     * @param array|string $message Variable number of message args (string or array)
-     * @return void
-     */
-    public function logDebug($prefix, $message = "")
-    {
-        if(!class_exists("ConfService")) return ;
-        if(!ConfService::getConf("SERVER_DEBUG")) return ;
-        $args = func_get_args();
-        array_shift($args);
-        AJXP_Logger::log2(LOG_LEVEL_DEBUG, $this->getId(), $prefix, $args);
-    }
-
-    /**
-     * Write an info log with the plugin id as source
-     * @param string $prefix  A quick description or action
-     * @param array|string $message Variable number of message args (string or array)
-     * @return void
-     */
-    public function logInfo($prefix, $message)
-    {
-        $args = func_get_args();
-        array_shift($args);
-        AJXP_Logger::log2(LOG_LEVEL_INFO, $this->getId(), $prefix, $args);
-    }
-
-    /**
-     * Write a notice log with the plugin id as source
-     * @param string $prefix  A quick description or action
-     * @param array|string $message Variable number of message args (string or array)
-     * @return void
-     */
-    public function logNotice($prefix, $message)
-    {
-        $args = func_get_args();
-        array_shift($args);
-        AJXP_Logger::log2(LOG_LEVEL_NOTICE, $this->getId(), $prefix, $args);
-    }
-
-    /**
-     * Write a warning log with the plugin id as source
-     * @param string $prefix  A quick description or action
-     * @param array|string $message Variable number of message args (string or array)
-     * @return void
-     */
-    public function logWarning($prefix, $message)
-    {
-        $args = func_get_args();
-        array_shift($args);
-        AJXP_Logger::log2(LOG_LEVEL_WARNING, $this->getId(), $prefix, $args);
-    }
-
-    /**
-     * Write an error log with the plugin id as source
-     * @param string $prefix  A quick description or action
-     * @param array|string $message Variable number of message args (string or array)
-     * @return void
-     */
-    public function logError($prefix, $message)
-    {
-        $args = func_get_args();
-        array_shift($args);
-        AJXP_Logger::log2(LOG_LEVEL_ERROR, $this->getId(), $prefix, $args);
-    }
-
-    /**
-     * Detect if this plugin declares a StreamWrapper, and if yes loads it and register the stream.
-     * @param bool $register
-     * @return array|bool
-     */
-    public function detectStreamWrapper($register = false)
-    {
-        if (isSet($this->streamData)) {
-            if($this->streamData === false) return false;
-            $streamData = $this->streamData;
-            // include wrapper, no other checks needed.
-            include_once(AJXP_INSTALL_PATH."/".$streamData["filename"]);
-        } else {
-            if($this->manifestXML != null) $this->unserializeManifest();
-            $files = $this->xPath->query("class_stream_wrapper");
-            if (!$files->length) {
-                $this->streamData = false;
-                return false;
-            }
-            $streamData = $this->nodeAttrToHash($files->item(0));
-            if (!is_file(AJXP_INSTALL_PATH."/".$streamData["filename"])) {
-                $this->streamData = false;
-                return false;
-            }
-            include_once(AJXP_INSTALL_PATH."/".$streamData["filename"]);
-            if (!class_exists($streamData["classname"])) {
-                $this->streamData = false;
-                return false;
-            }
-            $this->streamData = $streamData;
-        }
-        if ($register) {
-            $pServ = AJXP_PluginsService::getInstance();
-            $wrappers = stream_get_wrappers();
-            if (!in_array($streamData["protocol"], $wrappers)) {
-                stream_wrapper_register($streamData["protocol"], $streamData["classname"]);
-                $pServ->registerWrapperClass($streamData["protocol"], $streamData["classname"]);
-            }
-            AJXP_MetaStreamWrapper::register($wrappers);
-        }
-        return $streamData;
-    }
-    /**
-     * Add a name/value pair in the manifest to be published to the world.
-     * @param $configName
-     * @param $configValue
-     * @return void
-     */
-    protected function exposeConfigInManifest($configName, $configValue)
-    {
-        if($this->manifestXML != null) $this->unserializeManifest();
-        $confBranch = $this->xPath->query("plugin_configs");
-        if (!$confBranch->length) {
-            $configNode = $this->manifestDoc->importNode(new DOMElement("plugin_configs", ""));
-            $this->manifestDoc->documentElement->appendChild($configNode);
-        } else {
-            $configNode = $confBranch->item(0);
-        }
-        $prop = $this->manifestDoc->createElement("property");
-        $propValue = $this->manifestDoc->createCDATASection(json_encode($configValue));
-        $prop->appendChild($propValue);
-        $attName = $this->manifestDoc->createAttribute("name");
-        $attValue = $this->manifestDoc->createTextNode($configName);
-        $attName->appendChild($attValue);
-        $prop->appendChild($attName);
-        $configNode->appendChild($prop);
-        $this->reloadXPath();
-    }
-
-    public function getPluginInformation()
-    {
-        $info = array(
-            "plugin_author" => "",
-            "plugin_uri"   => "",
-            "core_packaged" => true,
-            "plugin_version"=> "follow",
-            "core_version" => AJXP_VERSION,
-        );
-        if($this->manifestXML != null) $this->unserializeManifest();
-        $infoBranch = $this->xPath->query("plugin_info");
-        if ($infoBranch->length) {
-            foreach ($infoBranch->item(0)->childNodes as $child) {
-                if($child->nodeType != 1) continue;
-                if ($child->nodeName != "core_relation") {
-                    $info[$child->nodeName] = $child->nodeValue;
-                } else {
-                    if($child->getAttribute("packaged") == "false") $info["core_packaged"] = false;
-                    $coreV = $child->getAttribute("tested_version");
-                    if($coreV == "follow") $coreV = AJXP_VERSION;
-                    $info["core_version"] = $coreV;
-                }
-            }
-        }
-        return $info;
-    }
-
-    public function getPluginInformationHTML($defaultAuthor, $defaultUriBase)
-    {
-        $pInfo = $this->getPluginInformation();
-        $pInfoString = "";
-        if (empty($pInfo["plugin_uri"])) {
-            if($pInfo["core_packaged"]) $pInfo["plugin_uri"] = $defaultUriBase.$this->getType()."/".$this->getName()."/";
-            else $pInfo["plugin_uri"] = "N/A";
-        }
-        if ($pInfo["plugin_uri"] != "N/A") {
-            $pInfo["plugin_uri"] = "<a href='".$pInfo["plugin_uri"]."' title='".$pInfo["plugin_uri"]."' target='_blank'>".$pInfo["plugin_uri"]."</a>";
-        }
-        if ($pInfo["core_packaged"]) {
-            unset($pInfo["plugin_version"]);
-            unset($pInfo["core_version"]);
-        }
-        $pInfo["core_packaged"] = ($pInfo["core_packaged"] === true ? "Yes": "No");
-        $humanKeys = array(
-            "plugin_author" => "Author",
-            "plugin_version" => "Version",
-            "plugin_uri"    => "Url",
-            "core_packaged" => "Core distrib.",
-            "core_version"   => "Core version"
-        );
-        if(empty($pInfo["plugin_author"])) $pInfo["plugin_author"] = $defaultAuthor;
-        foreach ($pInfo as $k => $v) {
-            $pInfoString .= "<li><span class='pluginfo_key'>".$humanKeys[$k]."</span><span class='pluginfo_value'>$v</span></li>";
-        }
-        return "<ul class='pluginfo_list'>$pInfoString</ul>";
-    }
-
-    /**
-     * @return void
-     */
-    public function reloadXPath()
-    {
-        // Relaunch xpath
-        $this->xPath = new DOMXPath($this->manifestDoc);
-    }
-    /**
-     * @param $mixinName
-     * @return bool
-     */
-    public function hasMixin($mixinName)
-    {
-        return (in_array($mixinName, $this->mixins));
-    }
-    /**
-     * Check if the plugin declares mixins, and load them using AJXP_PluginsService::patchPluginWithMixin method
-     * @return void
-     */
-    protected function loadMixins()
-    {
-        $attr = $this->manifestDoc->documentElement->getAttribute("mixins");
-        if ($attr != "") {
-            $this->mixins = explode(",", $attr);
-            foreach ($this->mixins as $mixin) {
-                AJXP_PluginsService::getInstance()->patchPluginWithMixin($this, $this->manifestDoc, $mixin);
-            }
-        }
-    }
-
-    /**
-     * Transform a simple node and its attributes to a HashTable
-     *
-     * @param DOMNode $node
-     * @return array
-     */
-    protected function nodeAttrToHash($node)
-    {
-        $hash = array();
-        $attributes  = $node->attributes;
-        if ($attributes!=null) {
-            foreach ($attributes as $domAttr) {
-                $hash[$domAttr->name] = $domAttr->value;
-            }
-        }
-        return $hash;
-    }
-    /**
-     * Compare two nodes at first level (nodename and attributes)
-     *
-     * @param DOMNode $node1
-     * @param DOMNode $node2
-     * @return bool
-     */
-    protected function nodesEqual($node1, $node2)
-    {
-        if($node1->nodeName != $node2->nodeName) return false;
-        $hash1 = $this->nodeAttrToHash($node1);
-        $hash2 = $this->nodeAttrToHash($node2);
-        foreach ($hash1 as $name=>$value) {
-            if(!isSet($hash2[$name]) || $hash2[$name] != $value) return false;
-        }
-        return true;
-    }
-}
diff --git a/core/src/core/classes/class.AJXP_PluginsService.php b/core/src/core/classes/class.AJXP_PluginsService.php
deleted file mode 100644
index 2e4e5c53e8..0000000000
--- a/core/src/core/classes/class.AJXP_PluginsService.php
+++ /dev/null
@@ -1,929 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Core parser for loading / serving plugins
- * @package Pydio
- * @subpackage Core
- */
-class AJXP_PluginsService
-{
-    private static $instance;
-    private $registry = array();
-    private $required_files = array();
-    private $activePlugins = array();
-    private $streamWrapperPlugins = array();
-    private $registeredWrappers = array();
-    private $xmlRegistry;
-    private $registryVersion;
-    private $tmpDeferRegistryBuild = false;
-    /**
-     * @var AbstractConfDriver
-     */
-    private $confStorage;
-    /**
-     * @var AbstractCacheDriver
-     */
-    private $cacheStorage;
-    private $mixinsDoc;
-    private $mixinsXPath;
-
-
-    /**
-     * @return bool
-     */
-    private function _loadRegistryFromCache(){
-
-        if((!defined("AJXP_SKIP_CACHE") || AJXP_SKIP_CACHE === false)){
-            $reqs = AJXP_Utils::loadSerialFile(AJXP_PLUGINS_REQUIRES_FILE);
-            if (count($reqs)) {
-                foreach ($reqs as $fileName) {
-                    if (!is_file($fileName)) {
-                        // Cache is out of sync
-                        return false;
-                    }
-                    require_once($fileName);
-                }
-
-                $res = null;
-
-                // Retrieving Registry from Server Cache
-                if ($this->cacheStorage) {
-                    $res = $this->cacheStorage->fetch(AJXP_CACHE_SERVICE_NS_SHARED, 'plugins_registry');
-
-                    $this->registry=$res;
-                }
-
-                // Retrieving Registry from files cache
-                if (empty($res)) {
-                    $res = AJXP_Utils::loadSerialFile(AJXP_PLUGINS_CACHE_FILE);
-                    $this->registry=$res;
-                    $this->savePluginsRegistryToCache();
-                }
-
-                // Refresh streamWrapperPlugins
-                foreach ($this->registry as $plugs) {
-                    foreach ($plugs as $plugin) {
-                        if (method_exists($plugin, "detectStreamWrapper") && $plugin->detectStreamWrapper(false) !== false) {
-                            $this->streamWrapperPlugins[] = $plugin->getId();
-                        }
-                    }
-                }
-
-                return true;
-            }else{
-                return false;
-            }
-        }else{
-            return false;
-        }
-
-    }
-
-    /**
-     * Loads the full registry, from the cache only
-     *
-     */
-    public function loadPluginsRegistryFromCache($cacheStorage = null) {
-
-        $this->cacheStorage = $cacheStorage;
-
-        if(!empty($this->registry)){
-            return true;
-        }
-        if($this->_loadRegistryFromCache()){
-            return true;
-        }
-    }
-
-    /**
-     * Save plugin registry to cache
-     *
-     */
-    public function savePluginsRegistryToCache() {
-        if (!empty ($this->cacheStorage)) {
-            $this->cacheStorage->save(AJXP_CACHE_SERVICE_NS_SHARED, "plugins_registry", $this->registry);
-        }
-    }
-
-    /**
-     * Loads the full registry, from the cache or not
-     * @param String $pluginFolder
-     * @param AbstractConfDriver $confStorage
-     * @param bool $rewriteCache Force a cache rewriting
-     */
-    public function loadPluginsRegistry($pluginFolder, $confStorage, $rewriteCache = false)
-    {
-        if(!$rewriteCache){
-            if ($this->loadPluginsRegistryFromCache()) return;
-        }
-
-        if (is_string($pluginFolder)) {
-            $pluginFolder = array($pluginFolder);
-        }
-
-        $this->confStorage = $confStorage;
-        $pluginsPool = array();
-
-        foreach ($pluginFolder as $sourceFolder) {
-            $handler = @opendir($sourceFolder);
-            if ($handler) {
-                while ( ($item = readdir($handler)) !==false) {
-                    if($item == "." || $item == ".." || !@is_dir($sourceFolder."/".$item) || strstr($item,".")===false) continue ;
-                    $plugin = new AJXP_Plugin($item, $sourceFolder."/".$item);
-                    $plugin->loadManifest();
-                    if ($plugin->manifestLoaded()) {
-                        $pluginsPool[$plugin->getId()] = $plugin;
-                        if (method_exists($plugin, "detectStreamWrapper") && $plugin->detectStreamWrapper(false) !== false) {
-                            $this->streamWrapperPlugins[] = $plugin->getId();
-                        }
-                    }
-                }
-                closedir($handler);
-            }
-        }
-        if (count($pluginsPool)) {
-            $this->checkDependencies($pluginsPool);
-            foreach ($pluginsPool as $plugin) {
-                $this->recursiveLoadPlugin($plugin, $pluginsPool);
-            }
-        }
-
-        if (!defined("AJXP_SKIP_CACHE") || AJXP_SKIP_CACHE === false) {
-            AJXP_Utils::saveSerialFile(AJXP_PLUGINS_REQUIRES_FILE, $this->required_files, false, false);
-            AJXP_Utils::saveSerialFile(AJXP_PLUGINS_CACHE_FILE, $this->registry, false, false);
-            if (is_file(AJXP_PLUGINS_QUERIES_CACHE)) {
-                @unlink(AJXP_PLUGINS_QUERIES_CACHE);
-            }
-
-            $this->savePluginsRegistryToCache();
-        }
-    }
-
-    /**
-     * Load plugin class with dependencies first
-     *
-     * @param AJXP_Plugin $plugin
-     * @param array $pluginsPool
-     */
-    private function recursiveLoadPlugin($plugin, $pluginsPool)
-    {
-        if ($plugin->loadingState!="") {
-            return ;
-        }
-        $dependencies = $plugin->getDependencies();
-        $plugin->loadingState = "lock";
-        foreach ($dependencies as $dependencyId) {
-            if (isSet($pluginsPool[$dependencyId])) {
-                $this->recursiveLoadPlugin($pluginsPool[$dependencyId], $pluginsPool);
-            } else if (strpos($dependencyId, "+") !== false) {
-                foreach (array_keys($pluginsPool) as $pId) {
-                    if (strpos($pId, str_replace("+", "", $dependencyId)) === 0) {
-                        $this->recursiveLoadPlugin($pluginsPool[$pId], $pluginsPool);
-                    }
-                }
-            }
-        }
-        $plugType = $plugin->getType();
-        if (!isSet($this->registry[$plugType])) {
-            $this->registry[$plugType] = array();
-        }
-        $options = $this->confStorage->loadPluginConfig($plugType, $plugin->getName());
-        if($plugin->isEnabled() || (isSet($options["AJXP_PLUGIN_ENABLED"]) && $options["AJXP_PLUGIN_ENABLED"] === true)){
-            $plugin = $this->instanciatePluginClass($plugin);
-        }
-        $plugin->loadConfigs($options);
-        $this->registry[$plugType][$plugin->getName()] = $plugin;
-        $plugin->loadingState = "loaded";
-    }
-
-    public function loadFromPluginQueriesCache($key)
-    {
-        if(AJXP_SKIP_CACHE) return null;
-        $test = AJXP_Utils::loadSerialFile(AJXP_PLUGINS_QUERIES_CACHE);
-        if (!empty($test) && is_array($test) && isset($test[$key])) {
-            return $test[$key];
-        }
-        return null;
-    }
-
-    public function storeToPluginQueriesCache($key, $value)
-    {
-        if(AJXP_SKIP_CACHE) return;
-        $test = AJXP_Utils::loadSerialFile(AJXP_PLUGINS_QUERIES_CACHE);
-        if(!is_array($test)) $test = array();
-        $test[$key] = $value;
-        AJXP_Utils::saveSerialFile(AJXP_PLUGINS_QUERIES_CACHE, $test);
-    }
-
-    public static function clearPluginsCache(){
-        @unlink(AJXP_PLUGINS_CACHE_FILE);
-        @unlink(AJXP_PLUGINS_REQUIRES_FILE);
-        @unlink(AJXP_PLUGINS_QUERIES_CACHE);
-        @unlink(AJXP_PLUGINS_BOOTSTRAP_CACHE);
-        if(@unlink(AJXP_PLUGINS_REPOSITORIES_CACHE)){
-            $content = "<?php \n";
-            $boots = glob(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/*/repositories.php");
-            if($boots !== false){
-                foreach($boots as $b){
-                    $content .= 'require_once("'.$b.'");'."\n";
-                }
-            }
-            @file_put_contents(AJXP_PLUGINS_REPOSITORIES_CACHE, $content);
-        }
-    }
-
-    /**
-     * Simply load a plugin class, without the whole dependencies et.all
-     * @param string $pluginId
-     * @param array $pluginOptions
-     * @return AJXP_Plugin
-     */
-    public function softLoad($pluginId, $pluginOptions)
-    {
-        // Try to get from cache
-        list($type, $name) = explode(".", $pluginId);
-        if(!empty($this->registry) && isSet($this->registry[$type][$name])) {
-            /**
-             * @var AJXP_Plugin $plugin
-             */
-            $plugin = $this->registry[$type][$name];
-            $plugin->init($pluginOptions);
-            return clone $plugin;
-        }
-
-
-        $plugin = new AJXP_Plugin($pluginId, AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/".$pluginId);
-        $plugin->loadManifest();
-        $plugin = $this->instanciatePluginClass($plugin);
-        $plugin->loadConfigs(array()); // Load default
-        $plugin->init($pluginOptions);
-        return $plugin;
-    }
-
-    /**
-     * Find a PHP class and instanciate it to replace the empty AJXP_Plugin
-     *
-     * @param AJXP_Plugin $plugin
-     * @return AJXP_Plugin
-     */
-    private function instanciatePluginClass($plugin)
-    {
-        $definition = $plugin->getClassFile();
-        if(!$definition) return $plugin;
-        $filename = AJXP_INSTALL_PATH."/".$definition["filename"];
-        $className = $definition["classname"];
-        if (is_file($filename)) {
-            /**
-             * @var AJXP_Plugin $newPlugin
-             */
-            require_once($filename);
-            $newPlugin = new $className($plugin->getId(), $plugin->getBaseDir());
-            $newPlugin->loadManifest();
-            $this->required_files[$filename] = $filename;
-            return $newPlugin;
-        } else {
-            return $plugin;
-        }
-    }
-
-    /**
-     * Check that a plugin dependencies are loaded, disable it otherwise.
-     * @param AJXP_Plugin[] $arrayToSort
-     */
-    private function checkDependencies(&$arrayToSort)
-    {
-        // First make sure that the given dependencies are present
-        foreach ($arrayToSort as $plugId => $plugObject) {
-            $plugObject->updateDependencies($this);
-            if($plugObject->hasMissingExtensions()){
-                unset($arrayToSort[$plugId]);
-                continue;
-            }
-            $dependencies = $plugObject->getDependencies();
-            if(!count($dependencies)) continue;// return ;
-            $found = false;
-            foreach ($dependencies as $requiredPlugId) {
-                if ( strpos($requiredPlugId, "+") !== false || isSet($arrayToSort[$requiredPlugId])) {
-                    $found = true; break;
-                }
-            }
-            if (!$found) {
-                unset($arrayToSort[$plugId]);
-            }
-        }
-    }
-
-    /**
-     * User function for sorting
-     *
-     * @param $pluginIdA
-     * @param $pluginIdB
-     * @internal param String $pluginA
-     * @internal param String $pluginB
-     * @return integer
-     */
-    public static function sortByDependencyIds($pluginIdA, $pluginIdB)
-    {
-        if($pluginIdA == $pluginIdB) return 0;
-        $pluginA = self::findPluginById($pluginIdA);
-        $pluginB = self::findPluginById($pluginIdB);
-        if($pluginA == null || $pluginB == null) return 0;
-        if ($pluginA->dependsOn($pluginIdB)) {
-            return 1;
-        }
-        if ($pluginB->dependsOn($pluginIdA)) {
-            return -1;
-        }
-        return 0;
-    }
-
-    public function getOrderByDependency($plugins, $withStatus = true)
-    {
-        $keys = array();
-        $unkowns = array();
-        if ($withStatus) {
-            foreach ($plugins as $pid => $status) {
-                if($status) $keys[] = $pid;
-            }
-        } else {
-            $keys = array_keys($plugins);
-        }
-        $result = array();
-        while (count($keys) > 0) {
-            $test = array_shift($keys);
-            $testObject = $this->getPluginById($test);
-            $deps = $testObject->getActiveDependencies(self::getInstance());
-            if (!count($deps)) {
-                $result[] = $test;
-                continue;
-            }
-            $found = false;
-            $inOriginalPlugins = false;
-            foreach ($deps as $depId) {
-                if (in_array($depId, $result)) {
-                    $found = true;
-                    break;
-                }
-                if (!$inOriginalPlugins && array_key_exists($depId, $plugins) && (!$withStatus || $plugins[$depId] == true)) {
-                    $inOriginalPlugins = true;
-                }
-            }
-            if ($found) {
-                $result[] = $test;
-            } else {
-                if($inOriginalPlugins) $keys[] = $test;
-                else {
-                    unset($plugins[$test]);
-                    $unkowns[] = $test;
-                }
-            }
-        }
-        return array_merge($result, $unkowns);
-    }
-
-
-
-
-    /**
-     * All the plugins of a given type
-     * @param string $type
-     * @return AJXP_Plugin[]
-     */
-    public function getPluginsByType($type)
-    {
-        if(isSet($this->registry[$type])) return $this->registry[$type];
-        else return array();
-    }
-
-    /**
-     * Get a plugin instance
-     *
-     * @param string $pluginId
-     * @return AJXP_Plugin
-     */
-    public function getPluginById($pluginId)
-    {
-        $split = explode(".", $pluginId);
-        return $this->getPluginByTypeName($split[0], $split[1]);
-    }
-
-    /**
-     * Remove a plugin
-     * @param string $pluginId
-     * @return void
-     */
-    public function removePluginById($pluginId)
-    {
-        $split = explode(".", $pluginId);
-        if (isSet($this->registry[$split[0]]) && isSet($this->registry[$split[0]][$split[1]])) {
-            unset($this->registry[$split[0]][$split[1]]);
-        }
-    }
-
-    /**
-     * Load the plugins list, and set active the plugins automatically,
-     * except for the specific types that declare a "core.*" plugin. In that case,
-     * either the core class has an AUTO_LOAD_TYPE property and all plugins are activated,
-     * or it's the task of the core class to load the necessary plugin(s) of this type.
-     * @return void
-     */
-    public function initActivePlugins()
-    {
-        /**
-         * @var AJXP_Plugin $pObject
-         */
-        $detected = $this->getDetectedPlugins();
-        $toActivate = array();
-        foreach ($detected as $pType => $pObjects) {
-            $coreP = $this->findPlugin("core", $pType);
-            if($coreP !== false && !isSet($coreP->AUTO_LOAD_TYPE)) continue;
-            foreach ($pObjects as $pName => $pObject) {
-                $toActivate[$pObject->getId()] = $pObject ;
-            }
-        }
-        $o = $this->getOrderByDependency($toActivate, false);
-        foreach ($o as $id) {
-            $pObject = $toActivate[$id];
-            $pObject->init(array());
-            try {
-                $pObject->performChecks();
-                if(!$pObject->isEnabled() || $pObject->hasMissingExtensions()) continue;
-                $this->setPluginActiveInst($pObject->getType(), $pObject->getName(), true);
-            } catch (Exception $e) {
-                //$this->errors[$pName] = "[$pName] ".$e->getMessage();
-            }
-
-        }
-    }
-
-    /**
-     * Add a plugin to the list of active plugins
-     * @static
-     * @param string $type
-     * @param string $name
-     * @param bool $active
-     * @param AJXP_Plugin $updateInstance
-     * @return void
-     */
-    public static function setPluginActive($type, $name, $active=true, $updateInstance = null)
-    {
-        self::getInstance()->setPluginActiveInst($type, $name, $active, $updateInstance);
-    }
-    /**
-     * Instance implementation of the setPluginActive
-     * @param $type
-     * @param $name
-     * @param bool $active
-     * @param AJXP_Plugin $updateInstance
-     * @return void
-     */
-    public function setPluginActiveInst($type, $name, $active=true, $updateInstance = null)
-    {
-        if ($active) {
-            // Check active plugin dependencies
-            $plug = $this->getPluginById($type.".".$name);
-            if(!$plug || !$plug->isEnabled()) return;
-            $deps = $plug->getActiveDependencies($this);
-            if (count($deps)) {
-                $found = false;
-                foreach ($deps as $dep) {
-                    if (isSet($this->activePlugins[$dep]) && $this->activePlugins[$dep] !== false) {
-                        $found = true; break;
-                    }
-                }
-                if (!$found) {
-                    $this->activePlugins[$type.".".$name] = false;
-                    return ;
-                }
-            }
-        }
-        if(isSet($this->activePlugins[$type.".".$name])){
-            unset($this->activePlugins[$type.".".$name]);
-        }
-        $this->activePlugins[$type.".".$name] = $active;
-        if (isSet($updateInstance) && isSet($this->registry[$type][$name])) {
-            $this->registry[$type][$name] = $updateInstance;
-        }
-        if (isSet($this->xmlRegistry) && !$this->tmpDeferRegistryBuild) {
-            $this->buildXmlRegistry(($this->registryVersion == "extended"));
-        }
-    }
-
-    public static function deferBuildingRegistry(){
-        self::getInstance()->tmpDeferRegistryBuild = true;
-    }
-
-    public static function flushDeferredRegistryBuilding(){
-        $t = self::getInstance();
-        $t->tmpDeferRegistryBuild = false;
-        if (isSet($t->xmlRegistry)) {
-            $t->buildXmlRegistry(($t->registryVersion == "extended"));
-        }
-    }
-
-    /**
-     * Some type require only one active plugin at a time
-     * @param $type
-     * @param $name
-     * @param AJXP_Plugin $updateInstance
-     * @return void
-     */
-    public function setPluginUniqueActiveForType($type, $name, $updateInstance = null)
-    {
-        $typePlugs = $this->getPluginsByType($type);
-        $originalValue = $this->tmpDeferRegistryBuild;
-        $this->tmpDeferRegistryBuild = true;
-        foreach ($typePlugs as $plugName => $plugObject) {
-            $this->setPluginActiveInst($type, $plugName, false);
-        }
-        $this->tmpDeferRegistryBuild = $originalValue;
-        $this->setPluginActiveInst($type, $name, true, $updateInstance);
-    }
-    /**
-     * Retrieve the whole active plugins list
-     * @return array
-     */
-    public function getActivePlugins()
-    {
-        return $this->activePlugins;
-    }
-    /**
-     * Retrieve an array of active plugins for type
-     * @param string $type
-     * @param bool $unique
-     * @return AJXP_Plugin[]
-     */
-    public function getActivePluginsForType($type, $unique = false)
-    {
-        $acts = array();
-        foreach ($this->activePlugins as $plugId => $active) {
-            if(!$active) continue;
-            list($pT,$pN) = explode(".", $plugId);
-            if ($pT == $type && isset($this->registry[$pT][$pN])) {
-                if ($unique) {
-                    return $this->registry[$pT][$pN];
-                    break;
-                }
-                $acts[$pN] = $this->registry[$pT][$pN];
-            }
-        }
-        if($unique && !count($acts)) return false;
-        return $acts;
-    }
-
-    /**
-     * Return only one of getActivePluginsForType
-     * @param $type
-     * @return array|bool
-     */
-    public function getUniqueActivePluginForType($type)
-    {
-        return $this->getActivePluginsForType($type, true);
-    }
-    /**
-     * All the plugins registry, active or not
-     * @return array
-     */
-    public function getDetectedPlugins()
-    {
-        return $this->registry;
-    }
-    /**
-     * All the plugins that declare a stream wrapper
-     * @return array
-     */
-    public function getStreamWrapperPlugins()
-    {
-        return $this->streamWrapperPlugins;
-    }
-    /**
-     * Add the $protocol/$wrapper to an internal cache
-     * @param string $protocol
-     * @param string $wrapperClassName
-     * @return void
-     */
-    public function registerWrapperClass($protocol, $wrapperClassName)
-    {
-        $this->registeredWrappers[$protocol] = $wrapperClassName;
-    }
-
-    /**
-     * Find a classname for a given protocol
-     * @param $protocol
-     * @return
-     */
-    public function getWrapperClassName($protocol)
-    {
-        return $this->registeredWrappers[$protocol];
-    }
-    /**
-     * The protocol/classnames table
-     * @return array
-     */
-    public function getRegisteredWrappers()
-    {
-        return $this->registeredWrappers;
-    }
-    /**
-     * Go through all plugins and call their getRegistryContributions() method.
-     * Add all these contributions to the main XML ajxp_registry document.
-     * @param bool $extendedVersion Will be passed to the plugin, for optimization purpose.
-     * @return void
-     */
-    public function buildXmlRegistry($extendedVersion = true)
-    {
-        $actives = $this->getActivePlugins();
-        $reg = new DOMDocument();
-        $reg->loadXML("<ajxp_registry></ajxp_registry>");
-        foreach ($actives as $activeName=>$status) {
-            if($status === false) continue;
-            $plug = $this->getPluginById($activeName);
-            $contribs = $plug->getRegistryContributions($extendedVersion);
-            foreach ($contribs as $contrib) {
-                $parent = $contrib->nodeName;
-                $nodes = $contrib->childNodes;
-                if(!$nodes->length) continue;
-                $uuidAttr = $contrib->getAttribute("uuidAttr");
-                if($uuidAttr == "") $uuidAttr = "name";
-                $this->mergeNodes($reg, $parent, $uuidAttr, $nodes);
-            }
-        }
-        $this->xmlRegistry = $reg;
-    }
-
-    /**
-     * Build the XML Registry if not already built, and return it.
-     * @static
-     * @param bool $extendedVersion
-     * @return DOMDocument The registry
-     */
-    public static function getXmlRegistry($extendedVersion = true)
-    {
-        $self = self::getInstance();
-        if (!isSet($self->xmlRegistry) || ($self->registryVersion == "light" && $extendedVersion)) {
-            $self->buildXmlRegistry( $extendedVersion );
-            $self->registryVersion = ($extendedVersion ? "extended":"light");
-        }
-        return $self->xmlRegistry;
-    }
-
-    /**
-     * Replace the current xml registry
-     * @static
-     * @param $registry
-     * @param bool $extendedVersion
-     */
-    public static function updateXmlRegistry($registry, $extendedVersion = true)
-    {
-        $self = self::getInstance();
-        $self->xmlRegistry = $registry;
-        $self->registryVersion = ($extendedVersion? "extended" : "light");
-    }
-
-    /**
-     * Append some predefined XML to a plugin instance
-     * @param AJXP_Plugin $plugin
-     * @param DOMDocument $manifestDoc
-     * @param String $mixinName
-     */
-    public function patchPluginWithMixin(&$plugin, &$manifestDoc, $mixinName)
-    {
-        // Load behaviours if not already
-        if (!isSet($this->mixinsDoc)) {
-            $this->mixinsDoc = new DOMDocument();
-            $this->mixinsDoc->load(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/core.ajaxplorer/ajxp_mixins.xml");
-            $this->mixinsXPath = new DOMXPath($this->mixinsDoc);
-        }
-        // Merge into manifestDoc
-        $nodeList = $this->mixinsXPath->query($mixinName);
-        if(!$nodeList->length) return;
-        $mixinNode = $nodeList->item(0);
-        foreach ($mixinNode->childNodes as $child) {
-            if($child->nodeType != XML_ELEMENT_NODE) continue;
-            $uuidAttr = $child->getAttribute("uuidAttr") OR "name";
-            $this->mergeNodes($manifestDoc, $child->nodeName, $uuidAttr, $child->childNodes, true);
-        }
-
-        // Reload plugin XPath
-        $plugin->reloadXPath();
-    }
-
-    /**
-     * Search all plugins manifest with an XPath query, and return either the Nodes, or directly an XML string.
-     * @param string $query
-     * @param string $stringOrNodeFormat
-     * @param boolean $limitToActivePlugins Whether to search only in active plugins or in all plugins
-     * @param bool $limitToEnabledPlugins
-     * @param bool $loadExternalFiles
-     * @return DOMNode[]
-     */
-    public static function searchAllManifests($query, $stringOrNodeFormat = "string", $limitToActivePlugins = false, $limitToEnabledPlugins = false, $loadExternalFiles = false)
-    {
-        $buffer = "";
-        $nodes = array();
-        $self = self::getInstance();
-        foreach ($self->registry as $plugType) {
-            foreach ($plugType as $plugName => $plugObject) {
-                if ($limitToActivePlugins) {
-                    $plugId = $plugObject->getId();
-                    if ($limitToActivePlugins && (!isSet($self->activePlugins[$plugId]) || $self->activePlugins[$plugId] === false)) {
-                        continue;
-                    }
-                }
-                if ($limitToEnabledPlugins) {
-                    if(!$plugObject->isEnabled()) continue;
-                }
-                $res = $plugObject->getManifestRawContent($query, $stringOrNodeFormat, $loadExternalFiles);
-                if ($stringOrNodeFormat == "string") {
-                    $buffer .= $res;
-                } else {
-                    foreach ($res as $node) {
-                        $nodes[] = $node;
-                    }
-                }
-            }
-        }
-        if($stringOrNodeFormat == "string") return $buffer;
-        else return $nodes;
-    }
-
-    /**
-     * Central function of the registry construction, merges some nodes into the existing registry.
-     * @param DOMDocument $original
-     * @param $parentName
-     * @param $uuidAttr
-     * @param $childrenNodes
-     * @param bool $doNotOverrideChildren
-     * @return void
-     */
-    protected function mergeNodes(&$original, $parentName, $uuidAttr, $childrenNodes, $doNotOverrideChildren = false)
-    {
-        // find or create parent
-        $parentSelection = $original->getElementsByTagName($parentName);
-        if ($parentSelection->length) {
-            $parentNode = $parentSelection->item(0);
-            $xPath = new DOMXPath($original);
-            foreach ($childrenNodes as $child) {
-                if($child->nodeType != XML_ELEMENT_NODE) continue;
-                if ($child->getAttribute($uuidAttr) == "*") {
-                    $query = $parentName.'/'.$child->nodeName;
-                } else {
-                    $query = $parentName.'/'.$child->nodeName.'[@'.$uuidAttr.' = "'.$child->getAttribute($uuidAttr).'"]';
-                }
-                $childrenSel = $xPath->query($query);
-                if ($childrenSel->length) {
-                    if($doNotOverrideChildren) continue;
-                    foreach ($childrenSel as $existingNode) {
-                        if($existingNode->getAttribute("forbidOverride") == "true"){
-                            continue;
-                        }
-                        // Clone as many as needed
-                        $clone = $original->importNode($child, true);
-                        $this->mergeChildByTagName($clone, $existingNode);
-                    }
-                } else {
-                    $clone = $original->importNode($child, true);
-                    $parentNode->appendChild($clone);
-                }
-            }
-        } else {
-            //create parentNode and append children
-            if ($childrenNodes->length) {
-                $parentNode = $original->importNode($childrenNodes->item(0)->parentNode, true);
-                $original->documentElement->appendChild($parentNode);
-            } else {
-                $parentNode = $original->createElement($parentName);
-                $original->documentElement->appendChild($parentNode);
-            }
-        }
-    }
-
-    /**
-     * Utilitary function
-     * @param $new
-     * @param $old
-     */
-    protected function mergeChildByTagName($new, &$old)
-    {
-        if (!$this->hasElementChild($new) || !$this->hasElementChild($old)) {
-            $old->parentNode->replaceChild($new, $old);
-            return;
-        }
-        foreach ($new->childNodes as $newChild) {
-            if($newChild->nodeType != XML_ELEMENT_NODE) continue;
-
-            $found = null;
-            foreach ($old->childNodes as $oldChild) {
-                if($oldChild->nodeType != XML_ELEMENT_NODE) continue;
-                if ($oldChild->nodeName == $newChild->nodeName) {
-                    $found = $oldChild;
-                }
-            }
-            if ($found != null) {
-                if ($newChild->nodeName == "post_processing" || $newChild->nodeName == "pre_processing") {
-                    $old->appendChild($newChild->cloneNode(true));
-                } else {
-                    if($found->getAttribute("forbidOverride") == "true") {
-                        continue;
-                    }
-                    $this->mergeChildByTagName($newChild->cloneNode(true), $found);
-                }
-            } else {
-                // CloneNode or it's messing with the current foreach loop.
-                $old->appendChild($newChild->cloneNode(true));
-            }
-        }
-    }
-
-    /**
-     * Utilitary
-     * @param $node
-     * @return bool
-     */
-    private function hasElementChild($node)
-    {
-        if(!$node->hasChildNodes()) return false;
-        foreach ($node->childNodes as $child) {
-            if($child->nodeType == XML_ELEMENT_NODE) return true;
-        }
-        return false;
-    }
-
-    /**
-     * @param string $plugType
-     * @param string $plugName
-     * @return AJXP_Plugin
-     */
-    public function getPluginByTypeName($plugType, $plugName)
-    {
-        if (isSet($this->registry[$plugType]) && isSet($this->registry[$plugType][$plugName])) {
-            return $this->registry[$plugType][$plugName];
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     *
-     * @param string $type
-     * @param string $name
-     * @return AJXP_Plugin
-     */
-    public static function findPlugin($type, $name)
-    {
-        $instance = self::getInstance();
-        return $instance->getPluginByTypeName($type, $name);
-    }
-
-    /**
-     * Simply find a plugin by its id (type.name)
-     * @static
-     * @param $id
-     * @return AJXP_Plugin
-     */
-    public static function findPluginById($id)
-    {
-        return self::getInstance()->getPluginById($id);
-    }
-
-    private function __construct()
-    {
-    }
-    /**
-     * Singleton method
-     *
-     * @return AJXP_PluginsService the service instance
-     */
-    public static function getInstance()
-    {
-        if (!isSet(self::$instance)) {
-            $c = __CLASS__;
-            self::$instance = new $c;
-        }
-        return self::$instance;
-    }
-    public function __clone()
-    {
-        trigger_error("Cannot clone me, i'm a singleton!", E_USER_ERROR);
-    }
-}
diff --git a/core/src/core/classes/class.AJXP_ProgressBarCLI.php b/core/src/core/classes/class.AJXP_ProgressBarCLI.php
deleted file mode 100644
index 6b22a87655..0000000000
--- a/core/src/core/classes/class.AJXP_ProgressBarCLI.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Class AJXP_ProgressBarCLI
- * Simple object to print a progress bar on the command-line.
- *
- * @package Pydio
- * @subpackage Core
- */
-class AJXP_ProgressBarCLI {
-    private $strProgress = "";
-    private $strLength = 25; // 50 '='
-    private $strName   = "";
-    private $strNameLengthMax = 20;
-    private $total       = 0;
-    private $isFinish     = false;
-    private $lastPercent = -1;
-    private $barSign     = "=";
-    private $startPoint ;
-    private $lastsecond = 0;
-
-    public function init($currentValue = 0, $total, $name){
-        if(!(php_sapi_name() == "cli")) return;
-        $this->total        = $total;
-        $this->strName      = $name;
-        $this->startPoint   = time();
-        $this->barSign = "=";
-        //echo "\nobjects: ". $this->total."\n";
-        $str = '';
-        $str .= $this->convertNumToStrBlank($this->strNameLengthMax)."[==";
-        $str .= "Total: ".$total." objects";
-        $str .= $this->convertNumToStr($this->strLength - strlen($str) + 21);
-        $str .= "]";
-        echo "\n";
-        echo $str;
-        echo "\n";
-    }
-
-    public function update($currentValue = 0){
-        if(!(php_sapi_name() == "cli")) return;
-        if($this->isFinish) return;
-        $percentage = $this->convertToPercent($currentValue, $this->total);
-        if (($percentage != $this->lastPercent) || ((time() - $this->lastsecond) > 0.9)){
-            $this->lastPercent = $percentage;
-            $this->lastsecond = time();
-        }
-        else{
-            return;
-        }
-        $strDone = $this->convertNumToStr((int) $percentage/4);
-        $this->strProgress .= $strDone;
-        $this->strProgress .= $this->convertNumToStrBlank($this->strLength - strlen($strDone));
-        $this->addStartString();
-        $this->strProgress = $this->formatName($this->strName).$this->strProgress;
-        $this->addEndString();
-        $this->strProgress .= " ";
-
-        if($percentage < 10){
-            $this->strProgress .= "  ";
-        }elseif($percentage > 10 && $percentage < 100){
-            $this->strProgress .= " ";
-        }
-        $this->strProgress .= "".$percentage." %  " . $this->ago($this->startPoint);
-        $this->clearLine(strlen($this->strProgress) + 2);
-        echo $this->strProgress;
-        $this->strProgress = "";
-        if($percentage == 100){
-            echo "\n";
-            $this->isFinish = true;
-            return ;
-        }
-    }
-
-    private function addStartString(){
-        $this->strProgress = "[".$this->strProgress;
-    }
-
-    private function addEndString(){
-        $this->strProgress = $this->strProgress."]";
-    }
-
-    private function convertToPercent($currentValue = 0, $maxValue){
-        if($maxValue > 0 && $currentValue > 0){
-            $percent = ( int ) ((100*$currentValue) / $maxValue);
-            return $percent;
-        }
-        elseif($maxValue === $currentValue){
-            return 100;
-        }
-        return 0;
-    }
-
-    private function convertNumToStr($num){
-        if ($num >= 0 && $num <= $this->strLength){
-            $str = "";
-            for($i = 0; $i < $num; $i++){
-                $str .= $this->barSign;
-            }
-            return $str;
-        }else{
-            return "";
-        }
-    }
-
-    private function formatName($name){
-        if(strlen($name) > $this->strNameLengthMax){
-            return substr($name, 0, $this->strNameLengthMax);
-        }else{
-            $str = $name . $this->convertNumToStrBlank($this->strNameLengthMax - strlen($name));
-            return $str;
-        }
-    }
-
-    public function convertNumToStrBlank($num){
-        if($num > 0){
-            $str = "";
-            for($i = 0; $i < $num; $i++){
-                $str .= " ";
-            }
-            return $str;
-        }
-        return "";
-    }
-
-    public function clearLine($lineLength = 80){
-        for($i = 0; $i < $lineLength ;$i ++){
-            echo "\010";
-        }
-    }
-
-    public function setName($name){
-        $this->strName = $name;
-    }
-
-    public function ago($time) {
-        $timediff=time()-$time;
-
-        $days=intval($timediff/86400);
-        $remain=$timediff%86400;
-        $hours=intval($remain/3600);
-        $remain=$remain%3600;
-        $mins=intval($remain/60);
-        $secs=$remain%60;
-        $timestring = "-";
-
-        if ($secs>=0) $timestring = "0m".$secs."s";
-        if ($mins>0) $timestring = $mins."m".$secs."s";
-        if ($hours>0) $timestring = $hours."u".$mins."m";
-        if ($days>0) $timestring = $days."d".$hours."u";
-
-        return $timestring;
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/classes/class.AJXP_PromptException.php b/core/src/core/classes/class.AJXP_PromptException.php
deleted file mode 100644
index 8cfb485281..0000000000
--- a/core/src/core/classes/class.AJXP_PromptException.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-define('AJXP_PROMPT_EXCEPTION_PROMPT', 'AJXP_PROMPT_EXCEPTION_PROMPT');
-define('AJXP_PROMPT_EXCEPTION_CONFIRM', 'AJXP_PROMPT_EXCEPTION_CONFIRM');
-define('AJXP_PROMPT_EXCEPTION_ALERT', 'AJXP_PROMPT_EXCEPTION_ALERT');
-
-/**
- * Class AJXP_PromptException
- * Specific exception that triggers a prompt in the UI instead of displaying an error message.
- *
- * @package Pydio
- * @subpackage Core
- */
-class AJXP_PromptException extends AJXP_Exception{
-
-    private $promptType = "prompt";
-    /**
-     * @var array
-     */
-    private $promptData = array();
-
-    /**
-     * @return array
-     */
-    public function getPromptData()
-    {
-        return $this->promptData;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPromptType()
-    {
-        return $this->promptType;
-    }
-
-    /**
-     * @param $promptType
-     * @param array $data
-     * @param String $messageString
-     * @param string|bool $messageId
-     */
-    public function __construct($promptType, $data, $messageString, $messageId = false)
-    {
-        $this->promptType = $promptType;
-        $this->promptData = $data;
-        parent::__construct($messageString, $messageId);
-    }
-
-    /**
-     * Prompt user for credentials
-     * @param $sessionVariable
-     * @param $switchToRepositoryId
-     * @throws AJXP_PromptException
-     */
-    public static function testOrPromptForCredentials($sessionVariable, $switchToRepositoryId){
-        if(isSet($_GET["prompt_passed_data"]) && isSet($_GET["variable_name"]) && $_GET["variable_name"] == $sessionVariable){
-            $_SESSION[$sessionVariable] = true;
-        }
-        if(!isSet($_SESSION[$sessionVariable])){
-            throw new AJXP_PromptException(
-                "confirm",
-                array(
-                    "DIALOG" => "Please enter your credentials for this workspace
-                                <input type='hidden' name='get_action' value='switch_repository'>
-                                <input type='hidden' name='repository_id' value='".$switchToRepositoryId."'>
-                                <input type='hidden' name='prompt_passed_data' value='true'>
-                                <input type='hidden' name='variable_name' value='".$sessionVariable."'>
-                                ",
-                    "OK"        => array(
-                        "GET_FIELDS" => array("get_action", "repository_id", "prompt_passed_data", "variable_name"),
-                        "EVAL" => "ajaxplorer.loadXmlRegistry();"
-                    ),
-                    "CANCEL"    => array(
-                        "EVAL" => "ajaxplorer.loadXmlRegistry();"
-                    )
-                ),
-                "Credentials Needed");
-        }
-
-    }
-
-}
\ No newline at end of file
diff --git a/core/src/core/classes/class.AJXP_Role.php b/core/src/core/classes/class.AJXP_Role.php
deleted file mode 100644
index a5e128184f..0000000000
--- a/core/src/core/classes/class.AJXP_Role.php
+++ /dev/null
@@ -1,589 +0,0 @@
-<?php
-/*
- * Copyright 2007-2012 Charles du Jeu <contact (at) cdujeu.me>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-define('AJXP_VALUE_CLEAR', "AJXP_VALUE_CLEAR");
-define('AJXP_REPO_SCOPE_ALL',"AJXP_REPO_SCOPE_ALL");
-define('AJXP_REPO_SCOPE_SHARED',"AJXP_REPO_SCOPE_SHARED");
-define('AJXP_PLUGINS_SCOPE_ALL',"plugin_all");
-
-/**
- * @package Pydio
- * @subpackage Core
- */
-class AJXP_Role implements AjxpGroupPathProvider
-{
-
-    /**
-     * @var String path of this role, default is root path
-     */
-    protected $groupPath;
-    /**
-     * @var String Role identifier
-     */
-    protected $roleId;
-
-    /**
-     * @var array List of access rights for each workspaces (wsId => "r", "w", "rw", "d")
-     */
-    protected $acls = array();
-    /**
-     * @var array List of plugins parameters values, (SCOPE => PLUGIN NAME => PARAM NAME => value)
-     */
-    protected $parameters = array();
-    /**
-     * @var array List of plugin actions that can be disabled/enabled (SCOPE => PLUGIN NAME => ACTION NAME => status)
-     */
-    protected $actions = array();
-    /**
-     * @var array Automatically applies to a given list of profiles
-     */
-    protected $autoApplies = array();
-    /**
-     * @var AJXP_PermissionMask[]
-     */
-    protected $masks = array();
-
-    /**
-     * @var integer
-     */
-    protected $lastUpdated = 0;
-
-    static $cypheredPassPrefix = '$pydio_password$';
-
-    public function __construct($id)
-    {
-        $this->roleId = $id;
-    }
-
-    public function migrateDeprectated($repositoriesList, AjxpRole $oldRole)
-    {
-        $repositoriesList["ajxp.all"] = "";
-        foreach ($repositoriesList as $repoId => $repoObject) {
-            $right = $oldRole->getRight($repoId);
-            if(!empty($right)) $this->setAcl($repoId, $right);
-            $actions = $oldRole->getSpecificActionsRights($repoId);
-            if (count($actions)) {
-                foreach ($actions as $act => $status) {
-                    if ($repoId == "ajxp.all") {
-                        $this->setActionState(AJXP_PLUGINS_SCOPE_ALL, $act, AJXP_REPO_SCOPE_ALL, $status);
-                    } else {
-                        $this->setActionState(AJXP_PLUGINS_SCOPE_ALL, $act, $repoId, $status);
-                    }
-                }
-            }
-        }
-        $this->setGroupPath($oldRole->getGroupPath());
-        if ($oldRole->isDefault()) {
-            $this->setAutoApplies(array("all"));
-        }
-    }
-
-    public function isGroupRole()
-    {
-        return strpos($this->roleId, "AJXP_GRP_") === 0;
-    }
-    public function isUserRole()
-    {
-        return strpos($this->roleId, "AJXP_USER_") === 0;
-    }
-
-
-    /**
-     * Whether this role can read the given repo
-     * @param string $repositoryId Repository ID
-     * @return bool
-     */
-    public function canRead($repositoryId)
-    {
-        $right = $this->getAcl($repositoryId);
-        if($right == "rw" || $right == "r") return true;
-        return false;
-    }
-
-    /**
-     * Whether this role can write the given repo
-     * @param string $repositoryId Repository ID
-     * @return bool
-     */
-    public function canWrite($repositoryId)
-    {
-        $right = $this->getAcl($repositoryId);
-        if($right == "rw" || $right == "w") return true;
-        return false;
-    }
-
-
-    /**
-     * @param string $repositoryId
-     * @param string $rightString
-     * @return void
-     */
-    public function setAcl($repositoryId, $rightString)
-    {
-        if (empty($rightString)) {
-            if(isSet($this->acls[$repositoryId])) unset($this->acls[$repositoryId]);
-        } else {
-            $this->acls[$repositoryId] = $rightString;
-        }
-        return;
-    }
-    /**
-     * @param string $repositoryId
-     * @return string
-     */
-    public function getAcl($repositoryId)
-    {
-        if (isSet($this->acls[$repositoryId])) {
-            return $this->acls[$repositoryId];
-        }
-        return "";
-    }
-
-    /**
-     * @param bool $accessibleOnly If set to true, return only r, w, or rw.
-     * @return array Associative array[REPO_ID] => RIGHT_STRING (r / w / rw / AJXP_VALUE_CLEAR)
-     */
-    public function listAcls($accessibleOnly = false)
-    {
-        if(!$accessibleOnly){
-            return $this->acls;
-        }
-        $output = array();
-        foreach ($this->acls as $id => $acl) {
-            if(empty($acl) || $acl == AJXP_VALUE_CLEAR) continue;
-            $output[$id] = $acl;
-        }
-        return $output;
-    }
-
-    public function clearAcls()
-    {
-        $this->acls = array();
-    }
-
-    /**
-     * @param String $repositoryId
-     * @param AJXP_PermissionMask $mask
-     */
-    public function setMask($repositoryId, $mask){
-        $this->masks[$repositoryId] = $mask;
-    }
-
-    /**
-     * @param string $repositoryId
-     */
-    public function clearMask($repositoryId){
-        if(isSet($this->masks[$repositoryId])){
-            unset($this->masks[$repositoryId]);
-        }
-    }
-
-    /**
-     * @param string $repositoryId
-     * @return bool
-     */
-    public function hasMask($repositoryId){
-        return isSet($this->masks[$repositoryId]);
-    }
-
-    /**
-     * @param $repositoryId
-     * @return AJXP_PermissionMask|null
-     */
-    public function getMask($repositoryId){
-        return (isSet($this->masks[$repositoryId]) ? $this->masks[$repositoryId] : null);
-    }
-
-    /**
-     * @return AJXP_PermissionMask[]
-     */
-    public function listMasks(){
-        return $this->masks;
-    }
-
-    /**
-     * Send all role informations as an associative array
-     * @param bool $blurPasswords
-     * @return array
-     */
-    public function getDataArray($blurPasswords = false)
-    {
-        $roleData = array();
-        $roleData["ACL"] = $this->listAcls();
-        $roleData["MASKS"] = $this->listMasks();
-        $roleData["ACTIONS"] = $this->listActionsStates();
-        $roleData["PARAMETERS"] = $this->listParameters(false, $blurPasswords);
-        $roleData["APPLIES"] = $this->listAutoApplies();
-        return $roleData;
-    }
-
-    /**
-     * Update the role information from an associative array
-     * @see getDataArray()
-     * @param array $roleData
-     */
-    public function bunchUpdate($roleData)
-    {
-        $this->acls = $roleData["ACL"];
-        $this->actions = $roleData["ACTIONS"];
-        $this->parameters = $roleData["PARAMETERS"];
-        $this->autoApplies = $roleData["APPLIES"];
-        if(isSet($roleData["MASKS"])){
-            $this->masks = $roleData["MASKS"];
-        }
-
-    }
-
-
-    /**
-     * @param string $pluginId
-     * @param string $parameterName
-     * @param mixed $parameterValue can be AJXP_VALUE_CLEAR (force clear previous), or empty string for clearing value (apply previous).
-     * @param string|null $repositoryId
-     */
-    public function setParameterValue($pluginId, $parameterName, $parameterValue, $repositoryId = null)
-    {
-        if($repositoryId === null) $repositoryId = AJXP_REPO_SCOPE_ALL;
-        if (empty($parameterValue) && $parameterValue !== false && $parameterValue !== "0") {
-            if (isSet($this->parameters[$repositoryId][$pluginId][$parameterName])) {
-                unset($this->parameters[$repositoryId][$pluginId][$parameterName]);
-                if(!count($this->parameters[$repositoryId][$pluginId])) unset($this->parameters[$repositoryId][$pluginId]);
-                if(!count($this->parameters[$repositoryId])) unset($this->parameters[$repositoryId]);
-            }
-        } else {
-            $this->parameters = $this->setArrayValue($this->parameters, $repositoryId, $pluginId, $parameterName, $parameterValue);
-        }
-        return;
-    }
-
-    /**
-     * @param string $pluginId
-     * @param string $parameterName
-     * @param string $repositoryId
-     * @param mixed $parameterValue
-     * @return mixed
-     */
-    public function filterParameterValue($pluginId, $parameterName, $repositoryId, $parameterValue)
-    {
-        if (isSet($this->parameters[$repositoryId][$pluginId][$parameterName])) {
-            $v = $this->parameters[$repositoryId][$pluginId][$parameterName];
-            if($v === AJXP_VALUE_CLEAR) return "";
-            else return $this->filterCypheredPasswordValue($v);
-        }
-        if (isSet($this->parameters[AJXP_REPO_SCOPE_ALL][$pluginId][$parameterName])) {
-            $v = $this->parameters[AJXP_REPO_SCOPE_ALL][$pluginId][$parameterName];
-            if($v === AJXP_VALUE_CLEAR) return "";
-            else return $this->filterCypheredPasswordValue($v);
-        }
-        return $parameterValue;
-    }
-
-    /**
-     * @param bool $preserveCypheredPasswords
-     * @param bool $blurCypheredPasswords
-     * @return array Associative array of parameters : array[REPO_ID][PLUGIN_ID][PARAMETER_NAME] = PARAMETER_VALUE
-     */
-    public function listParameters($preserveCypheredPasswords = false, $blurCypheredPasswords = false)
-    {
-        if($preserveCypheredPasswords) return $this->parameters;
-
-        $copy = $this->parameters;
-        foreach($copy as $repo => &$plugs){
-            foreach($plugs as $plugName => &$plugData){
-                foreach($plugData as $paramName => &$paramValue){
-                    $testValue = $this->filterCypheredPasswordValue($paramValue);
-                    if($testValue != $paramValue){
-                        if($blurCypheredPasswords) $paramValue = "__AJXP_VALUE_SET__";
-                        else $paramValue = $testValue;
-                    }
-                }
-            }
-        }
-        return $copy;
-    }
-
-    public function listAutoApplies()
-    {
-        return $this->autoApplies;
-    }
-
-    /**
-     * @param String $value
-     * @return String
-     */
-    private function filterCypheredPasswordValue($value){
-        if(is_string($value) && strpos($value, self::$cypheredPassPrefix) === 0) return str_replace(self::$cypheredPassPrefix, "", $value);
-        return $value;
-    }
-
-    /**
-     * @param string $pluginId
-     * @param string $actionName
-     * @param string|null $repositoryId
-     * @param string $state
-     */
-    public function setActionState($pluginId, $actionName, $repositoryId = null, $state = "disabled")
-    {
-        $this->actions = $this->setArrayValue($this->actions, $repositoryId, $pluginId, $actionName, $state);
-        return;
-    }
-
-    public function listActionsStates()
-    {
-        return $this->actions;
-    }
-
-    /**
-     * @param Repository $repository
-     * @return array
-     */
-    public function listActionsStatesFor($repository)
-    {
-        $actions = array();
-        if (isSet($this->actions[AJXP_REPO_SCOPE_ALL])) {
-            $actions = $this->actions[AJXP_REPO_SCOPE_ALL];
-        }
-        if ($repository != null && isSet($this->actions[AJXP_REPO_SCOPE_SHARED]) && $repository->hasParent()) {
-            $actions = $this->array_merge_recursive2($actions, $this->actions[AJXP_REPO_SCOPE_SHARED]);
-        }
-        if ($repository != null && isSet($this->actions[$repository->getId()])) {
-            $actions = $this->array_merge_recursive2($actions, $this->actions[$repository->getId()]);
-        }
-        return $actions;
-    }
-
-    /**
-     * @param string $pluginId
-     * @param string $actionName
-     * @param string $repositoryId
-     * @param boolean $inputState
-     * @return boolean
-     */
-    public function actionEnabled($pluginId, $actionName, $repositoryId, $inputState)
-    {
-        if (isSet($this->actions[AJXP_REPO_SCOPE_ALL][$pluginId][$actionName])) {
-            return $this->actions[AJXP_REPO_SCOPE_ALL][$pluginId][$actionName] == "enabled" ? true : false ;
-        }
-        if (isSet($this->actions[$repositoryId][$pluginId][$actionName])) {
-            return $this->actions[$repositoryId][$pluginId][$actionName]  == "enabled" ? true : false ;
-        }
-        return $inputState;
-    }
-
-    /**
-     * @return array
-     */
-    public function listAllActionsStates()
-    {
-        return $this->actions;
-    }
-
-    /**
-     * @param AJXP_Role $role
-     * @return AJXP_Role
-     */
-    public function override(AJXP_Role $role)
-    {
-        $newRole = new AJXP_Role($role->getId());
-
-        $roleAcl = $role->listAcls();
-        $newAcls = $this->array_merge_recursive2($roleAcl, $this->listAcls());
-        foreach ($newAcls as $repoId => $rightString) {
-            //if($rightString == AJXP_VALUE_CLEAR) continue;
-            if(empty($rightString) && !empty($roleAcl[$repoId])){
-                $rightString = $roleAcl[$repoId];
-            }
-            $newRole->setAcl($repoId, $rightString);
-        }
-
-        $roleParameters = $role->listParameters(true);
-        $newParams = $this->array_merge_recursive2($roleParameters, $this->listParameters(true));
-        foreach ($newParams as $repoId => $data) {
-            foreach ($data as $pluginId => $param) {
-                foreach ($param as $parameterName => $parameterValue) {
-                    if ($parameterValue === true || $parameterValue === false) {
-                        $newRole->setParameterValue($pluginId, $parameterName, $parameterValue, $repoId);
-                        continue;
-                    }
-                    if($parameterValue == AJXP_VALUE_CLEAR) continue;
-                    if($parameterValue === "" && !empty($roleParameters[$repoId][$pluginId][$parameterName])){
-                        $parameterValue = $newParams[$repoId][$pluginId][$parameterName];
-                    }
-                    $newRole->setParameterValue($pluginId, $parameterName, $parameterValue, $repoId);
-                }
-            }
-        }
-
-        $newActions = $this->array_merge_recursive2($role->listActionsStates(), $this->listActionsStates());
-        foreach ($newActions as $repoId => $data) {
-            foreach ($data as $pluginId => $action) {
-                foreach ($action as $actionName => $actionState) {
-                    $newRole->setActionState($pluginId, $actionName, $repoId, $actionState);
-                }
-            }
-        }
-
-        $roleMasks = $role->listMasks();
-        $allKeys = array_merge(array_keys($this->masks), array_keys($roleMasks));
-        foreach($allKeys as $repoId){
-            if(isSet($roleMasks[$repoId]) && isSet($this->masks[$repoId])){
-                $newRole->setMask($repoId, $roleMasks[$repoId]->override($this->masks[$repoId]));
-            }else if(isSet($roleMasks[$repoId])){
-                $newRole->setMask($repoId, $roleMasks[$repoId]);
-            }else{
-                $newRole->setMask($repoId, $this->masks[$repoId]);
-            }
-        }
-
-        return $newRole;
-    }
-
-    /**
-     * @param array
-     * @param key1
-     * @param key2
-     * @param key3...
-     * @param value
-     */
-    public function setArrayValue()
-    {
-        $args = func_get_args();
-        $arr = $args[0]; //array_shift($args);
-        $argMaxIndex = count($args)-1;
-        $value = $args[$argMaxIndex]; //array_pop($args);
-        $current = &$arr;
-        foreach ($args as $index => $key) {
-            if($index == 0) continue;
-            if ($index < $argMaxIndex -1) {
-                if(!isset($current[$key])) $current[$key] = array();
-                $current = &$current[$key];
-            } else {
-                $current[$key] = $value;
-                break;
-            }
-        }
-        return $arr;
-    }
-
-    /**
-     * @param array $array1
-     * @param array $array2
-     * @return array
-     */
-    public function array_merge_recursive2($array1, $array2)
-    {
-        $arrays = func_get_args();
-        $narrays = count($arrays);
-
-        // check arguments
-        // comment out if more performance is necessary (in this case the foreach loop will trigger a warning if the argument is not an array)
-        for ($i = 0; $i < $narrays; $i ++) {
-            if (!is_array($arrays[$i])) {
-                // also array_merge_recursive returns nothing in this case
-                trigger_error('Argument #' . ($i+1) . ' is not an array - trying to merge array with scalar! Returning null!', E_USER_WARNING);
-                return null;
-            }
-        }
-
-        // the first array is in the output set in every case
-        $ret = $arrays[0];
-
-        // merege $ret with the remaining arrays
-        for ($i = 1; $i < $narrays; $i ++) {
-            foreach ($arrays[$i] as $key => $value) {
-                            //if (((string) $key) === ((string) intval($key))) { // integer or string as integer key - append
-                //    $ret[] = $value;
-                //}
-                //{ // string key - megre
-                    if (is_array($value) && isset($ret[$key])) {
-                        // if $ret[$key] is not an array you try to merge an scalar value with an array - the result is not defined (incompatible arrays)
-                        // in this case the call will trigger an E_USER_WARNING and the $ret[$key] will be null.
-                        $ret[$key] = $this->array_merge_recursive2($ret[$key], $value);
-                    } else {
-                        $ret[$key] = $value;
-                    }
-               // }
-            }
-        }
-
-        return $ret;
-    }
-
-    public function setGroupPath($groupPath)
-    {
-        $this->groupPath = $groupPath;
-    }
-
-    public function getGroupPath()
-    {
-        return $this->groupPath;
-    }
-
-    public function getId()
-    {
-        return $this->roleId;
-    }
-
-    public function setLabel($roleLabel)
-    {
-        $this->setParameterValue("core.conf", "ROLE_DISPLAY_NAME", $roleLabel);
-    }
-
-    public function getLabel()
-    {
-        $test = $this->filterParameterValue("core.conf", "ROLE_DISPLAY_NAME", AJXP_REPO_SCOPE_ALL, $this->roleId);
-        if(!empty($test)) return $test;
-        return $this->roleId;
-   }
-
-    public function alwaysOverrides()
-    {
-        return $this->filterParameterValue("core.conf", "ROLE_FORCE_OVERRIDE", AJXP_REPO_SCOPE_ALL, false);
-   }
-
-    /**
-     * @param array $specificRights
-     */
-    public function setAutoApplies($specificRights)
-    {
-        $this->autoApplies = $specificRights;
-    }
-
-    /**
-     * @param string $specificRight
-     * @return boolean
-     */
-    public function autoAppliesTo($specificRight)
-    {
-        return in_array($specificRight, $this->autoApplies);
-    }
-
-    public function getLastUpdated(){
-        return $this->lastUpdated;
-    }
-
-    public function setLastUpdated($time){
-        $this->lastUpdated = $time;
-    }
-
-}
diff --git a/core/src/core/classes/class.AJXP_Safe.php b/core/src/core/classes/class.AJXP_Safe.php
deleted file mode 100644
index a0e84c0d39..0000000000
--- a/core/src/core/classes/class.AJXP_Safe.php
+++ /dev/null
@@ -1,287 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Credential keeper that can be stored in the session, the credentials are kept crypted.
- * @package Pydio
- * @subpackage Core
- */
-class AJXP_Safe
-{
-    private static $instance;
-
-    private $user;
-    private $encodedPassword;
-    private $secretKey;
-    private $separator = "__SAFE_SEPARATOR__";
-    private $forceSessionCredentials = false;
-    /**
-     * Instance constructor
-     */
-    public function __construct()
-    {
-        if (defined('AJXP_SAFE_SECRET_KEY')) {
-            $this->secretKey = AJXP_SAFE_SECRET_KEY;
-        } else {
-            $this->secretKey = "\1CDAFx¨op#";
-        }
-    }
-    /**
-     * Store the user/password pair. Password will be encoded
-     * @param string $user
-     * @param string $password
-     * @return void
-     */
-    public function setCredentials($user, $password)
-    {
-        $this->user = $user;
-        $this->encodedPassword = $this->_encodePassword($password, $user);
-    }
-    /**
-     * Return the user/password pair, or false if cannot find it.
-     * @return array|bool
-     */
-    public function getCredentials()
-    {
-        if (isSet($this->user) && isSet($this->encodedPassword)) {
-            $decoded = $this->_decodePassword($this->encodedPassword, $this->user);
-            return array(
-                "user" 		=> $this->user,
-                "password"	=> $decoded,
-                0			=> $this->user,
-                1			=> $decoded
-            );
-        } else {
-            return false;
-        }
-    }
-    /**
-     * Use mcrypt function to encode the password
-     * @param $password
-     * @param $user
-     * @return string
-     */
-    private function _encodePassword($password, $user)
-    {
-        if (function_exists('mcrypt_encrypt')) {
-            // We encode as base64 so if we need to store the result in a database, it can be stored in text column
-            $password = base64_encode(mcrypt_encrypt(MCRYPT_RIJNDAEL_256,  md5($user.$this->secretKey), $password, MCRYPT_MODE_ECB));
-        }
-        return $password;
-    }
-    /**
-     * Use mcrypt functions to decode the password
-     * @param $encoded
-     * @param $user
-     * @return string
-     */
-    private function _decodePassword($encoded, $user)
-    {
-        if (function_exists('mcrypt_decrypt')) {
-             // We have encoded as base64 so if we need to store the result in a database, it can be stored in text column
-             $encoded = trim(mcrypt_decrypt(MCRYPT_RIJNDAEL_256, md5($user.$this->secretKey), base64_decode($encoded), MCRYPT_MODE_ECB), "\0");
-        }
-        return $encoded;
-    }
-    /**
-     * Store the password credentials in the session
-     * @return void
-     */
-    public function store()
-    {
-        $_SESSION["AJXP_SAFE_CREDENTIALS"] = base64_encode($this->user.$this->separator.$this->encodedPassword);
-    }
-
-    /**
-     * Load the credentials from session
-     * @param string $encodedString
-     * @return void
-     */
-    public function load($encodedString = "")
-    {
-        if ($encodedString == "" && !empty($_SESSION["AJXP_SAFE_CREDENTIALS"])) {
-            $encodedString = $_SESSION["AJXP_SAFE_CREDENTIALS"];
-        }
-        if(empty($encodedString)) return;
-        $sessData = base64_decode($encodedString);
-        $parts = explode($this->separator, $sessData);
-        $this->user = $parts[0];
-        $this->encodedPassword = $parts[1];
-    }
-    /**
-     * Remove the credentials from session
-     * @return void
-     */
-    public function clear()
-    {
-        unset($_SESSION["AJXP_SAFE_CREDENTIALS"]);
-        $this->user = null;
-        $this->encodedPassword = null;
-    }
-    /**
-     * For the session credentials to override other credentials set via config
-     * @return void
-     */
-    public function forceSessionCredentialsUsage()
-    {
-        $this->forceSessionCredentials = true;
-    }
-
-
-
-    /**
-     * Creates the singleton instance
-     * @return AJXP_Safe
-     */
-    public static function getInstance()
-    {
-        if (empty(self::$instance)) {
-            self::$instance = new AJXP_Safe();
-        }
-        return self::$instance;
-    }
-    /**
-     * Store the user/pass key pair
-     * @static
-     * @param string $user
-     * @param string $password
-     * @return void
-     */
-    public static function storeCredentials($user, $password)
-    {
-        $inst = AJXP_Safe::getInstance();
-        $inst->setCredentials($user, $password);
-        $inst->store();
-    }
-    /**
-     * Remove the user/pass encoded from the session
-     * @static
-     * @return void
-     */
-    public static function clearCredentials()
-    {
-        $inst = AJXP_Safe::getInstance();
-        $inst->clear();
-    }
-    /**
-     * Retrieve the user/pass from the session
-     * @static
-     * @return array|bool
-     */
-    public static function loadCredentials()
-    {
-        $inst = AJXP_Safe::getInstance();
-        $inst->load();
-        return $inst->getCredentials();
-    }
-
-    public static function getEncodedCredentialString()
-    {
-        return $_SESSION["AJXP_SAFE_CREDENTIALS"];
-    }
-
-    public static function getCredentialsFromEncodedString($encoded)
-    {
-        $tmpInstance = new AJXP_Safe();
-        $tmpInstance->load($encoded);
-        return $tmpInstance->getCredentials();
-    }
-
-    /**
-     * Will try to get the credentials for a given repository as follow :
-     * + Try to get the credentials from the url parsing
-     * + Try to get them from the user "Wallet" (personal data)
-     * + Try to get them from the repository configuration
-     * + Try to get them from the AJXP_Safe.
-     *
-     * @param array $parsedUrl
-     * @param Repository $repository
-     * @return array
-     */
-    public static function tryLoadingCredentialsFromSources($parsedUrl, $repository)
-    {
-        $user = $password = "";
-        $optionsPrefix = "";
-        if ($repository->getAccessType() == "ftp") {
-            $optionsPrefix = "FTP_";
-        }
-        // Get USER/PASS
-        // 1. Try from URL
-        if (isSet($parsedUrl["user"]) && isset($parsedUrl["pass"])) {
-            $user = rawurldecode($parsedUrl["user"]);
-            $password = rawurldecode($parsedUrl["pass"]);
-        }
-        // 2. Try from user wallet
-        if ($user=="") {
-            $loggedUser = AuthService::getLoggedUser();
-            if ($loggedUser != null) {
-                $wallet = $loggedUser->getPref("AJXP_WALLET");
-                if (is_array($wallet) && isSet($wallet[$repository->getId()][$optionsPrefix."USER"])) {
-                    $user = $wallet[$repository->getId()][$optionsPrefix."USER"];
-                    $password = AJXP_Utils::decypherStandardFormPassword($loggedUser->getId(), $wallet[$repository->getId()][$optionsPrefix."PASS"]);
-                }
-            }
-        }
-        // 2bis. Wallet is now a custom parameter
-        if ($user =="") {
-            $loggedUser = AuthService::getLoggedUser();
-            if ($loggedUser != null) {
-                $u = $loggedUser->mergedRole->filterParameterValue("access.".$repository->getAccessType(), $optionsPrefix."USER", $repository->getId(), "");
-                $p = $loggedUser->mergedRole->filterParameterValue("access.".$repository->getAccessType(), $optionsPrefix."PASS", $repository->getId(), "");
-                if (!empty($u) && !empty($p)) {
-                    $user = $u;
-                    $password = AJXP_Utils::decypherStandardFormPassword($loggedUser->getId(), $p);
-                }
-            }
-        }
-        // 3. Try from repository config
-        if ($user=="") {
-            $user = $repository->getOption($optionsPrefix."USER");
-            $password = $repository->getOption($optionsPrefix."PASS");
-        }
-        // 4. Test if there are encoded credentials available
-        if ($user == "" && $repository->getOption("ENCODED_CREDENTIALS") != "") {
-            list($user, $password) = AJXP_Safe::getCredentialsFromEncodedString($repository->getOption("ENCODED_CREDENTIALS"));
-        }
-        // 5. Try from session
-        $storeCreds = false;
-        if ($repository->getOption("META_SOURCES")) {
-            $options["META_SOURCES"] = $repository->getOption("META_SOURCES");
-            foreach ($options["META_SOURCES"] as $metaSource) {
-                if (isSet($metaSource["USE_SESSION_CREDENTIALS"]) && $metaSource["USE_SESSION_CREDENTIALS"] === true) {
-                    $storeCreds = true;
-                    break;
-                }
-            }
-        }
-        if ($user=="" && ( $repository->getOption("USE_SESSION_CREDENTIALS") || $storeCreds || self::getInstance()->forceSessionCredentials )) {
-            $safeCred = AJXP_Safe::loadCredentials();
-            if ($safeCred !== false) {
-                $user = $safeCred["user"];
-                $password = $safeCred["password"];
-            }
-        }
-        return array("user" => $user, "password" => $password);
-
-    }
-
-}
diff --git a/core/src/core/classes/class.AJXP_SchemeTranslatorWrapper.php b/core/src/core/classes/class.AJXP_SchemeTranslatorWrapper.php
deleted file mode 100644
index 7d4d09715f..0000000000
--- a/core/src/core/classes/class.AJXP_SchemeTranslatorWrapper.php
+++ /dev/null
@@ -1,341 +0,0 @@
-<?php
-/*
- * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-/**
- * Class AJXP_SchemeTranslatorWrapper
- * Simple Wrapper that justs converts a given protocol to another one.
- *
- * @package Pydio
- * @subpackage Core
- */
-class AJXP_SchemeTranslatorWrapper extends AJXP_MetaStreamWrapper implements AjxpWrapper
-{
-    /**
-     * @var resource
-     */
-    protected $handle;
-
-    /**
-     * @var string
-     */
-    protected $currentDirPath;
-
-
-    /*
-     * Initialise the path for a file
-     */
-    public static function applyInitPathHook($path, $context = 'core') {
-        //Do nothing
-    }
-
-    /**
-     * Get a "usable" reference to a file : the real file or a tmp copy.
-     *
-     * @param string $path
-     * @param bool $persistent
-     * @return string
-     * @throws Exception
-     */
-    public static function getRealFSReference($path, $persistent = false)
-    {
-        $wrapper = AJXP_MetaStreamWrapper::findSubWrapperClassName($path);
-        return call_user_func(array($wrapper, "getRealFSReference"), AJXP_MetaStreamWrapper::translateScheme($path), $persistent);
-    }
-
-    /**
-     * Read a file (by chunks) and copy the data directly inside the given stream.
-     *
-     * @param string $path
-     * @param resource $stream
-     */
-    public static function copyFileInStream($path, $stream)
-    {
-        $wrapper = AJXP_MetaStreamWrapper::findSubWrapperClassName($path);
-        call_user_func(array($wrapper, "copyFileInStream"), AJXP_MetaStreamWrapper::translateScheme($path), $stream);
-    }
-
-    /**
-     * Chmod implementation for this type of access.
-     *
-     * @param string $path
-     * @param number $chmodValue
-     */
-    public static function changeMode($path, $chmodValue)
-    {
-        $wrapper = AJXP_MetaStreamWrapper::findSubWrapperClassName($path);
-        call_user_func(array($wrapper, "changeMode"), AJXP_MetaStreamWrapper::translateScheme($path), $chmodValue);
-    }
-
-    /**
-     *
-     *
-     * @return bool
-     */
-    public function dir_closedir()
-    {
-        $this->currentDirPath = null;
-        if(isSet($this->handle) && is_resource($this->handle)){
-            closedir($this->handle);
-        }
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path
-     * @param int $options
-     * @return bool
-     */
-    public function dir_opendir($path, $options)
-    {
-        $newPath = AJXP_MetaStreamWrapper::translateScheme($path);
-        $this->handle = opendir($newPath);
-        if($this->handle !== false){
-            $this->currentDirPath = $path;
-            return true;
-        }else{
-            return false;
-        }
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @return string
-     */
-    public function dir_readdir()
-    {
-        if(isSet($this->handle) && is_resource($this->handle)){
-            return readdir($this->handle);
-        }
-        return false;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @return bool
-     */
-    public function dir_rewinddir()
-    {
-        //$this->currentDirPath = null;
-        if(isSet($this->handle) && is_resource($this->handle)){
-            return rewind($this->handle);
-        }
-        return false;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path
-     * @param int $mode
-     * @param int $options
-     * @return bool
-     */
-    public function mkdir($path, $mode, $options)
-    {
-        return mkdir(AJXP_MetaStreamWrapper::translateScheme($path), $mode, $options);
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path_from
-     * @param string $path_to
-     * @return bool
-     */
-    public function rename($path_from, $path_to)
-    {
-        return rename(AJXP_MetaStreamWrapper::translateScheme($path_from), AJXP_MetaStreamWrapper::translateScheme($path_to));
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path
-     * @param int $options
-     * @return bool
-     */
-    public function rmdir($path, $options)
-    {
-        if(is_resource($options)){
-            return rmdir(AJXP_MetaStreamWrapper::translateScheme($path), $options);
-        }else{
-            return rmdir(AJXP_MetaStreamWrapper::translateScheme($path));
-        }
-    }
-
-    /**
-     * Enter description here...
-     *
-     */
-    public function stream_close()
-    {
-        if(isSet($this->handle) && is_resource($this->handle)){
-            return fclose($this->handle);
-        }
-        return false;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @return bool
-     */
-    public function stream_eof()
-    {
-        if(isSet($this->handle) && is_resource($this->handle)){
-            return feof($this->handle);
-        }
-        return false;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @return bool
-     */
-    public function stream_flush()
-    {
-        if(isSet($this->handle) && is_resource($this->handle)){
-            return fflush($this->handle);
-        }
-        return false;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path
-     * @param string $mode
-     * @param int $options
-     * @param string &$context
-     * @return bool
-     */
-    public function stream_open($path, $mode, $options, &$context)
-    {
-        if(is_resource($context)){
-            $this->handle = fopen(AJXP_MetaStreamWrapper::translateScheme($path), $mode, $options, $context);
-        }else{
-            $this->handle = fopen(AJXP_MetaStreamWrapper::translateScheme($path), $mode, $options);
-        }
-        return ($this->handle !== false);
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param int $count
-     * @return string
-     */
-    public function stream_read($count)
-    {
-        if(isSet($this->handle) && is_resource($this->handle)){
-            return fread($this->handle, $count);
-        }
-        return null;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param int $offset
-     * @param int $whence = SEEK_SET
-     * @return bool
-     */
-    public function stream_seek($offset, $whence = SEEK_SET)
-    {
-        if(isSet($this->handle) && is_resource($this->handle)){
-            return fseek($this->handle, $offset, $whence);
-        }
-        return false;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @return array
-     */
-    public function stream_stat()
-    {
-        if(isSet($this->handle) && is_resource($this->handle)){
-            return fstat($this->handle);
-        }
-        return false;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @return int
-     */
-    public function stream_tell()
-    {
-        if(isSet($this->handle) && is_resource($this->handle)){
-            return ftell($this->handle);
-        }
-        return false;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $data
-     * @return int
-     */
-    public function stream_write($data)
-    {
-        if(isSet($this->handle) && is_resource($this->handle)){
-            return fwrite($this->handle, $data);
-        }
-        return false;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path
-     * @return bool
-     */
-    public function unlink($path)
-    {
-        return unlink(AJXP_MetaStreamWrapper::translateScheme($path));
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path
-     * @param int $flags
-     * @return array
-     */
-    public function url_stat($path, $flags)
-    {
-        $stat = @stat(AJXP_MetaStreamWrapper::translateScheme($path));
-        if($stat === false){
-            return null;
-        }
-        return $stat;
-    }
-}
diff --git a/core/src/core/classes/class.AJXP_ShutdownScheduler.php b/core/src/core/classes/class.AJXP_ShutdownScheduler.php
deleted file mode 100644
index 8d9c575b45..0000000000
--- a/core/src/core/classes/class.AJXP_ShutdownScheduler.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-/**
- *
- * Registry for callbacks that must be triggered after the script is finished.
- *
- * @package Pydio
- * @subpackage Core
- *
- */
-class AJXP_ShutdownScheduler
-{
-    private static $instance;
-
-    private $callbacks; // array to store user callbacks
-
-    /**
-     * @static
-     * @return AJXP_ShutdownScheduler
-     */
-    public static function getInstance()
-    {
-        if(self::$instance == null) self::$instance = new AJXP_ShutdownScheduler();
-        return self::$instance;
-    }
-
-     public function __construct()
-     {
-         $this->callbacks = array();
-         register_shutdown_function(array($this, 'callRegisteredShutdown'));
-         ob_start();
-     }
-    public function registerShutdownEventArray()
-    {
-        $callback = func_get_args();
-
-        if (empty($callback)) {
-            throw new Exception('No callback passed to '.__FUNCTION__.' method');
-        }
-        if (!is_callable($callback[0])) {
-            throw new Exception('Invalid callback ('.$callback[0].') passed to the '.__FUNCTION__.' method');
-        }
-        $flattenArray = array();
-        $flattenArray[0] = $callback[0];
-        if (is_array($callback[1])) {
-            foreach($callback[1] as $argument) $flattenArray[] = $argument;
-        }
-        $this->callbacks[] = $flattenArray;
-        return true;
-    }
-     public function registerShutdownEvent()
-     {
-         $callback = func_get_args();
-
-         if (empty($callback)) {
-             throw new Exception('No callback passed to '.__FUNCTION__.' method');
-         }
-         if (!is_callable($callback[0])) {
-             throw new Exception('Invalid callback ('.$callback[0].') passed to the '.__FUNCTION__.' method');
-         }
-         $this->callbacks[] = $callback;
-         return true;
-     }
-
-    public function callRegisteredShutdown()
-    {
-        session_write_close();
-        if (!headers_sent()) {
-            $size = ob_get_length();
-            header("Connection: close\r\n");
-            //header("Content-Encoding: none\r\n");
-            header("Content-Length: $size");
-        }
-        ob_end_flush();
-        flush();
-        $index = 0;
-        while (count($this->callbacks)) {
-            $arguments = array_shift($this->callbacks);
-            $callback = array_shift($arguments);
-            try {
-                call_user_func_array($callback, $arguments);
-            } catch (\Exception $e) {
-                AJXP_Logger::error(__CLASS__, __FUNCTION__, array("context" => "Applying hook " . get_class($callback[0]) . "::" . $callback[1], "message" => $e->getMessage()));
-            }
-            $index++;
-            if($index > 200) {
-                AJXP_Logger::error(__CLASS__, __FUNCTION__, "Breaking ShutdownScheduler loop, seems too big (200)");
-                break;
-            }
-        }
-    }
-
-}
diff --git a/core/src/core/classes/class.AJXP_UserAlertException.php b/core/src/core/classes/class.AJXP_UserAlertException.php
deleted file mode 100644
index e3d869d1a7..0000000000
--- a/core/src/core/classes/class.AJXP_UserAlertException.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/*
- * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-class AJXP_UserAlertException extends  AJXP_Exception{
-
-}
\ No newline at end of file
diff --git a/core/src/core/classes/class.AJXP_Utils.php b/core/src/core/classes/class.AJXP_Utils.php
deleted file mode 100644
index 3f42d2e1bc..0000000000
--- a/core/src/core/classes/class.AJXP_Utils.php
+++ /dev/null
@@ -1,2132 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die('Access not allowed');
-
-define('AJXP_SANITIZE_HTML', 1);
-define('AJXP_SANITIZE_HTML_STRICT', 2);
-define('AJXP_SANITIZE_ALPHANUM', 3);
-define('AJXP_SANITIZE_EMAILCHARS', 4);
-define('AJXP_SANITIZE_FILENAME', 5);
-define('AJXP_SANITIZE_DIRNAME', 6);
-
-// THESE ARE DEFINED IN bootstrap_context.php
-// REPEAT HERE FOR BACKWARD COMPATIBILITY.
-if (!defined('PBKDF2_HASH_ALGORITHM')) {
-
-    define("PBKDF2_HASH_ALGORITHM", "sha256");
-    define("PBKDF2_ITERATIONS", 1000);
-    define("PBKDF2_SALT_BYTE_SIZE", 24);
-    define("PBKDF2_HASH_BYTE_SIZE", 24);
-
-    define("HASH_SECTIONS", 4);
-    define("HASH_ALGORITHM_INDEX", 0);
-    define("HASH_ITERATION_INDEX", 1);
-    define("HASH_SALT_INDEX", 2);
-    define("HASH_PBKDF2_INDEX", 3);
-
-    define("USE_OPENSSL_RANDOM", false);
-
-}
-
-
-/**
- * Various functions used everywhere, static library
- * @package Pydio
- * @subpackage Core
- */
-class AJXP_Utils
-{
-
-    /**
-     * Performs a natural sort on the array keys.
-     * Behaves the same as ksort() with natural sorting added.
-     *
-     * @param Array $array The array to sort
-     * @return boolean
-     */
-    public static function natksort(&$array)
-    {
-        uksort($array, 'strnatcasecmp');
-        return true;
-    }
-
-    /**
-     * Performs a reverse natural sort on the array keys
-     * Behaves the same as krsort() with natural sorting added.
-     *
-     * @param Array $array The array to sort
-     * @return boolean
-     */
-    public static function natkrsort(&$array)
-    {
-        AJXP_Utils::natksort($array);
-        $array = array_reverse($array, TRUE);
-        return true;
-    }
-
-    /**
-     * Remove all "../../" tentatives, replace double slashes
-     * @static
-     * @param string $path
-     * @return string
-     */
-    public static function securePath($path)
-    {
-        if ($path == null) return "";
-        //
-        // REMOVE ALL "../" TENTATIVES
-        //
-        $path = str_replace(chr(0), "", $path);
-        $dirs = self::safeExplode($path);
-        for ($i = 0; $i < count($dirs); $i++) {
-            if ($dirs[$i] == '.' or $dirs[$i] == '..') {
-                $dirs[$i] = '';
-            }
-        }
-        // rebuild safe directory string
-        $path = implode('/', $dirs);
-
-        //
-        // REPLACE DOUBLE SLASHES
-        //
-        while (preg_match('/\/\//', $path)) {
-            $path = str_replace('//', '/', $path);
-        }
-        return $path;
-    }
-
-    public static function safeExplode($path) {
-        return (DIRECTORY_SEPARATOR === "\\" ? preg_split('/(\\\|\\/)/', $path) : explode('/', $path));
-    }
-
-    public static function safeDirname($path) {
-        return (DIRECTORY_SEPARATOR === "\\" ? str_replace("\\", "/", dirname($path)): dirname($path));
-    }
-
-    public static function safeBasename($path) {
-        return (DIRECTORY_SEPARATOR === "\\" ? str_replace("\\", "/", basename($path)): basename($path));
-    }
-
-    public static function clearHexaCallback($array){
-        return chr(hexdec($array[1]));
-    }
-
-    /**
-     * Given a string, this function will determine if it potentially an
-     * XSS attack and return boolean.
-     *
-     * @param string $string
-     *  The string to run XSS detection logic on
-     * @return boolean
-     *  True if the given `$string` contains XSS, false otherwise.
-     */
-    public static function detectXSS($string) {
-        $contains_xss = FALSE;
-
-        // Skip any null or non string values
-        if(is_null($string) || !is_string($string)) {
-            return $contains_xss;
-        }
-
-        // Keep a copy of the original string before cleaning up
-        $orig = $string;
-
-        // Set the patterns we'll test against
-        $patterns = array(
-            // Match any attribute starting with "on" or xmlns
-            '#(<[^>]+[\x00-\x20\"\'\/])(on|xmlns)[^>]*>?#iUu',
-
-            // Match javascript:, livescript:, vbscript: and mocha: protocols
-            '!((java|live|vb)script|mocha|feed|data):(\w)*!iUu',
-            '#-moz-binding[\x00-\x20]*:#u',
-
-            // Match style attributes
-            '#(<[^>]+[\x00-\x20\"\'\/])style=[^>]*>?#iUu',
-
-            // Match unneeded tags
-            '#</*(applet|meta|xml|blink|link|style|script|embed|object|iframe|frame|frameset|ilayer|layer|bgsound|title|base|svg)[^>]*>?#i'
-        );
-
-        foreach($patterns as $pattern) {
-            // Test both the original string and clean string
-            if(preg_match($pattern, $string) || preg_match($pattern, $orig)){
-                $contains_xss = TRUE;
-            }
-            if ($contains_xss === TRUE) return TRUE;
-        }
-
-        return FALSE;
-    }
-
-
-    /**
-     * Function to clean a string from specific characters
-     *
-     * @static
-     * @param string $s
-     * @param int $level Can be AJXP_SANITIZE_ALPHANUM, AJXP_SANITIZE_EMAILCHARS, AJXP_SANITIZE_HTML, AJXP_SANITIZE_HTML_STRICT
-     * @param string $expand
-     * @return mixed|string
-     */
-    public static function sanitize($s, $level = AJXP_SANITIZE_HTML, $expand = 'script|style|noframes|select|option')
-    {
-        if ($level == AJXP_SANITIZE_ALPHANUM) {
-            return preg_replace("/[^a-zA-Z0-9_\-\.]/", "", $s);
-        } else if ($level == AJXP_SANITIZE_EMAILCHARS) {
-            return preg_replace("/[^a-zA-Z0-9_\-\.@!%\+=|~\?]/", "", $s);
-        } else if ($level == AJXP_SANITIZE_FILENAME || $level == AJXP_SANITIZE_DIRNAME) {
-            // Convert Hexadecimals
-            $s = preg_replace_callback('!(&#|\\\)[xX]([0-9a-fA-F]+);?!', array('AJXP_Utils', 'clearHexaCallback'), $s);
-            // Clean up entities
-            $s = preg_replace('!(&#0+[0-9]+)!','$1;',$s);
-            // Decode entities
-            $s = html_entity_decode($s, ENT_NOQUOTES, 'UTF-8');
-            // Strip whitespace characters
-            $s = ltrim($s);
-            $s = str_replace(chr(0), "", $s);
-            if($level == AJXP_SANITIZE_FILENAME) $s = preg_replace("/[\"\/\|\?\\\]/", "", $s);
-            else $s = preg_replace("/[\"\|\?\\\]/", "", $s);
-            if(self::detectXSS($s)){
-                if(strpos($s, "/") === 0) $s = "/XSS Detected - Rename Me";
-                else $s = "XSS Detected - Rename Me";
-            }
-            return $s;
-        }
-
-        /**/ //prep the string
-        $s = ' ' . $s;
-
-        //begin removal
-        /**/ //remove comment blocks
-        while (stripos($s, '<!--') > 0) {
-            $pos[1] = stripos($s, '<!--');
-            $pos[2] = stripos($s, '-->', $pos[1]);
-            $len[1] = $pos[2] - $pos[1] + 3;
-            $x = substr($s, $pos[1], $len[1]);
-            $s = str_replace($x, '', $s);
-        }
-
-        /**/ //remove tags with content between them
-        if (strlen($expand) > 0) {
-            $e = explode('|', $expand);
-            for ($i = 0; $i < count($e); $i++) {
-                while (stripos($s, '<' . $e[$i]) > 0) {
-                    $len[1] = strlen('<' . $e[$i]);
-                    $pos[1] = stripos($s, '<' . $e[$i]);
-                    $pos[2] = stripos($s, $e[$i] . '>', $pos[1] + $len[1]);
-                    $len[2] = $pos[2] - $pos[1] + $len[1];
-                    $x = substr($s, $pos[1], $len[2]);
-                    $s = str_replace($x, '', $s);
-                }
-            }
-        }
-
-        $s = strip_tags($s);
-        if ($level == AJXP_SANITIZE_HTML_STRICT) {
-            $s = preg_replace("/[\",;\/`<>:\*\|\?!\^\\\]/", "", $s);
-        } else {
-            $s = str_replace(array("<", ">"), array("&lt;", "&gt;"), $s);
-        }
-        return ltrim($s);
-    }
-
-    /**
-     * Perform standard urldecode, sanitization and securepath
-     * @static
-     * @param $data
-     * @param int $sanitizeLevel
-     * @return string
-     */
-    public static function decodeSecureMagic($data, $sanitizeLevel = AJXP_SANITIZE_HTML)
-    {
-        return SystemTextEncoding::fromUTF8(AJXP_Utils::sanitize(AJXP_Utils::securePath($data), $sanitizeLevel));
-    }
-    /**
-     * Try to load the tmp dir from the CoreConf AJXP_TMP_DIR, or the constant AJXP_TMP_DIR,
-     * or the sys_get_temp_dir
-     * @static
-     * @return mixed|null|string
-     */
-    public static function getAjxpTmpDir()
-    {
-        $conf = ConfService::getCoreConf("AJXP_TMP_DIR");
-        if (!empty($conf)) {
-            return $conf;
-        }
-        if (defined("AJXP_TMP_DIR") && AJXP_TMP_DIR != "") {
-            return AJXP_TMP_DIR;
-        }
-        return realpath(sys_get_temp_dir());
-    }
-
-    public static function detectApplicationFirstRun()
-    {
-        return !file_exists(AJXP_CACHE_DIR."/first_run_passed");
-    }
-
-    public static function setApplicationFirstRunPassed()
-    {
-        @file_put_contents(AJXP_CACHE_DIR."/first_run_passed", "true");
-    }
-
-    public static function forwardSlashDirname($path)
-    {
-        return (DIRECTORY_SEPARATOR === "\\" ? str_replace("\\", "/", dirname($path)): dirname($path));
-    }
-
-    public static function forwardSlashBasename($path)
-    {
-        return (DIRECTORY_SEPARATOR === "\\" ? str_replace("\\", "/", basename($path)): basename($path));
-    }
-
-
-    /**
-     * Parse a Comma-Separated-Line value
-     * @static
-     * @param $string
-     * @param bool $hash
-     * @return array
-     */
-    public static function parseCSL($string, $hash = false)
-    {
-        $exp = array_map("trim", explode(",", $string));
-        if (!$hash) return $exp;
-        $assoc = array();
-        foreach ($exp as $explVal) {
-            $reExp = explode("|", $explVal);
-            if (count($reExp) == 1) $assoc[$reExp[0]] = $reExp[0];
-            else $assoc[$reExp[0]] = $reExp[1];
-        }
-        return $assoc;
-    }
-
-    /**
-     * Parse the $fileVars[] PHP errors
-     * @static
-     * @param $boxData
-     * @param bool $throwException
-     * @return array|null
-     * @throws Exception
-     */
-    public static function parseFileDataErrors($boxData, $throwException=false)
-    {
-        $mess = ConfService::getMessages();
-        $userfile_error = $boxData["error"];
-        $userfile_tmp_name = $boxData["tmp_name"];
-        $userfile_size = $boxData["size"];
-        if ($userfile_error != UPLOAD_ERR_OK) {
-            $errorsArray = array();
-            $errorsArray[UPLOAD_ERR_FORM_SIZE] = $errorsArray[UPLOAD_ERR_INI_SIZE] = array(409, str_replace("%i", ini_get("upload_max_filesize"), $mess["537"]));
-            $errorsArray[UPLOAD_ERR_NO_FILE] = array(410, $mess[538]);
-            $errorsArray[UPLOAD_ERR_PARTIAL] = array(410, $mess[539]);
-            $errorsArray[UPLOAD_ERR_NO_TMP_DIR] = array(410, $mess[540]);
-            $errorsArray[UPLOAD_ERR_CANT_WRITE] = array(411, $mess[541]);
-            $errorsArray[UPLOAD_ERR_EXTENSION] = array(410, $mess[542]);
-            if ($userfile_error == UPLOAD_ERR_NO_FILE) {
-                // OPERA HACK, do not display "no file found error"
-                if (strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') === false) {
-                    $data = $errorsArray[$userfile_error];
-                    if($throwException) throw new Exception($data[1], $data[0]);
-                    return $data;
-                }
-            } else {
-                $data = $errorsArray[$userfile_error];
-                if($throwException) throw new Exception($data[1], $data[0]);
-                return $data;
-            }
-        }
-        if ($userfile_tmp_name == "none" || $userfile_size == 0) {
-            if($throwException) throw new Exception($mess[31], 410);
-            return array(410, $mess[31]);
-        }
-        return null;
-    }
-
-    /**
-     * Utilitary to pass some parameters directly at startup :
-     * + repository_id / folder
-     * + compile & skipDebug
-     * + update_i18n, extract, create
-     * + external_selector_type
-     * + skipIOS
-     * + gui
-     * @static
-     * @param $parameters
-     * @param $output
-     * @param $session
-     * @return void
-     */
-    public static function parseApplicationGetParameters($parameters, &$output, &$session)
-    {
-        $output["EXT_REP"] = "/";
-
-        if (isSet($parameters["repository_id"]) && isSet($parameters["folder"]) || isSet($parameters["goto"])) {
-            if (isSet($parameters["goto"])) {
-                $explode = explode("/", ltrim($parameters["goto"], "/"));
-                $repoId = array_shift($explode);
-                $parameters["folder"] = str_replace($repoId, "", ltrim($parameters["goto"], "/"));
-            } else {
-                $repoId = $parameters["repository_id"];
-            }
-            $repository = ConfService::getRepositoryById($repoId);
-            if ($repository == null) {
-                $repository = ConfService::getRepositoryByAlias($repoId);
-                if ($repository != null) {
-                    $parameters["repository_id"] = $repository->getId();
-                }
-            } else {
-                $parameters["repository_id"] = $repository->getId();
-            }
-            require_once(AJXP_BIN_FOLDER . "/class.SystemTextEncoding.php");
-            if (AuthService::usersEnabled()) {
-                $loggedUser = AuthService::getLoggedUser();
-                if ($loggedUser != null && $loggedUser->canSwitchTo($parameters["repository_id"])) {
-                    $output["FORCE_REGISTRY_RELOAD"] = true;
-                    $output["EXT_REP"] = SystemTextEncoding::toUTF8(urldecode($parameters["folder"]));
-                    $loggedUser->setArrayPref("history", "last_repository", $parameters["repository_id"]);
-                    $loggedUser->setPref("pending_folder", SystemTextEncoding::toUTF8(AJXP_Utils::decodeSecureMagic($parameters["folder"])));
-                    AuthService::updateUser($loggedUser);
-                } else {
-                    $session["PENDING_REPOSITORY_ID"] = $parameters["repository_id"];
-                    $session["PENDING_FOLDER"] = SystemTextEncoding::toUTF8(AJXP_Utils::decodeSecureMagic($parameters["folder"]));
-                }
-            } else {
-                ConfService::switchRootDir($parameters["repository_id"]);
-                $output["EXT_REP"] = SystemTextEncoding::toUTF8(urldecode($parameters["folder"]));
-            }
-        }
-
-
-        if (isSet($parameters["skipDebug"])) {
-            ConfService::setConf("JS_DEBUG", false);
-        }
-        if (ConfService::getConf("JS_DEBUG") && isSet($parameters["compile"])) {
-            require_once(AJXP_BIN_FOLDER . "/class.AJXP_JSPacker.php");
-            AJXP_JSPacker::pack();
-        }
-        if (ConfService::getConf("JS_DEBUG") && isSet($parameters["update_i18n"])) {
-            if (isSet($parameters["extract"])) {
-                self::extractConfStringsFromManifests();
-            }
-            self::updateAllI18nLibraries((isSet($parameters["create"]) ? $parameters["create"] : ""));
-        }
-        if (ConfService::getConf("JS_DEBUG") && isSet($parameters["clear_plugins_cache"])) {
-            @unlink(AJXP_PLUGINS_CACHE_FILE);
-            @unlink(AJXP_PLUGINS_REQUIRES_FILE);
-        }
-        if (AJXP_SERVER_DEBUG && isSet($parameters["extract_application_hooks"])) {
-            self::extractHooksToDoc();
-        }
-
-        if (isSet($parameters["external_selector_type"])) {
-            $output["SELECTOR_DATA"] = array("type" => $parameters["external_selector_type"], "data" => $parameters);
-        }
-
-        if (isSet($parameters["skipIOS"])) {
-            setcookie("SKIP_IOS", "true");
-        }
-        if (isSet($parameters["skipANDROID"])) {
-            setcookie("SKIP_ANDROID", "true");
-        }
-        if (isSet($parameters["gui"])) {
-            setcookie("AJXP_GUI", $parameters["gui"]);
-            if ($parameters["gui"] == "light") $session["USE_EXISTING_TOKEN_IF_EXISTS"] = true;
-        } else {
-            if (isSet($session["USE_EXISTING_TOKEN_IF_EXISTS"])) {
-                unset($session["USE_EXISTING_TOKEN_IF_EXISTS"]);
-            }
-            setcookie("AJXP_GUI", null);
-        }
-        if (isSet($session["OVERRIDE_GUI_START_PARAMETERS"])) {
-            $output = array_merge($output, $session["OVERRIDE_GUI_START_PARAMETERS"]);
-        }
-    }
-
-    /**
-     * Remove windows carriage return
-     * @static
-     * @param $fileContent
-     * @return mixed
-     */
-    public static function removeWinReturn($fileContent)
-    {
-        $fileContent = str_replace(chr(10), "", $fileContent);
-        $fileContent = str_replace(chr(13), "", $fileContent);
-        return $fileContent;
-    }
-
-    /**
-     * Get the filename extensions using ConfService::getRegisteredExtensions()
-     * @static
-     * @param string $fileName
-     * @param string $mode "image" or "text"
-     * @param bool $isDir
-     * @return string Returns the icon name ("image") or the mime label ("text")
-     */
-    public static function mimetype($fileName, $mode, $isDir)
-    {
-        $mess = ConfService::getMessages();
-        $fileName = strtolower($fileName);
-        $EXTENSIONS = ConfService::getRegisteredExtensions();
-        if ($isDir) {
-            $mime = $EXTENSIONS["ajxp_folder"];
-        } else {
-            foreach ($EXTENSIONS as $ext) {
-                if (preg_match("/\.$ext[0]$/", $fileName)) {
-                    $mime = $ext;
-                    break;
-                }
-            }
-        }
-        if (!isSet($mime)) {
-            $mime = $EXTENSIONS["ajxp_empty"];
-        }
-        if (is_numeric($mime[3]) || array_key_exists($mime[3], $mess)) {
-            $mime[3] = $mess[$mime[3]];
-        }
-        return (($mode == "image" ? $mime[1] : $mime[3]));
-    }
-
-    public static $registeredExtensions;
-    public static function mimeData($fileName, $isDir)
-    {
-        $fileName = strtolower($fileName);
-        if (self::$registeredExtensions == null) {
-            self::$registeredExtensions = ConfService::getRegisteredExtensions();
-        }
-        if ($isDir) {
-            $mime = self::$registeredExtensions["ajxp_folder"];
-        } else {
-            $pos = strrpos($fileName, ".");
-            if ($pos !== false) {
-                $fileExt = substr($fileName, $pos + 1);
-                if (!empty($fileExt) && array_key_exists($fileExt, self::$registeredExtensions) && $fileExt != "ajxp_folder" && $fileExt != "ajxp_empty") {
-                    $mime = self::$registeredExtensions[$fileExt];
-                }
-            }
-        }
-        if (!isSet($mime)) {
-            $mime = self::$registeredExtensions["ajxp_empty"];
-        }
-        return array($mime[3], $mime[1], $mime[2]);
-
-    }
-
-
-    /**
-     * Gather a list of mime that must be treated specially. Used for dynamic replacement in XML mainly.
-     * @static
-     * @param string $keyword "editable", "image", "audio", "zip"
-     * @return string
-     */
-    public static function getAjxpMimes($keyword)
-    {
-        if ($keyword == "editable") {
-            // Gather editors!
-            $pServ = AJXP_PluginsService::getInstance();
-            $plugs = $pServ->getPluginsByType("editor");
-            //$plugin = new AJXP_Plugin();
-            $mimes = array();
-            foreach ($plugs as $plugin) {
-                $node = $plugin->getManifestRawContent("/editor/@mimes", "node");
-                $openable = $plugin->getManifestRawContent("/editor/@openable", "node");
-                if ($openable->item(0) && $openable->item(0)->value == "true" && $node->item(0)) {
-                    $mimestring = $node->item(0)->value;
-                    $mimesplit = explode(",", $mimestring);
-                    foreach ($mimesplit as $value) {
-                        $mimes[$value] = $value;
-                    }
-                }
-            }
-            return implode(",", array_values($mimes));
-        } else if ($keyword == "image") {
-            return "png,bmp,jpg,jpeg,gif";
-        } else if ($keyword == "audio") {
-            return "mp3";
-        } else if ($keyword == "zip") {
-            if (ConfService::zipBrowsingEnabled()) {
-                return "zip,ajxp_browsable_archive";
-            } else {
-                return "none_allowed";
-            }
-        }
-        return "";
-    }
-    /**
-     * Whether a file is to be considered as an image or not
-     * @static
-     * @param $fileName
-     * @return bool
-     */
-    public static function is_image($fileName)
-    {
-        if (preg_match("/\.png$|\.bmp$|\.jpg$|\.jpeg$|\.gif$/i", $fileName)) {
-            return 1;
-        }
-        return 0;
-    }
-    /**
-     * Whether a file is to be considered as an mp3... Should be DEPRECATED
-     * @static
-     * @param string $fileName
-     * @return bool
-     * @deprecated
-     */
-    public static function is_mp3($fileName)
-    {
-        if (preg_match("/\.mp3$/i", $fileName)) return 1;
-        return 0;
-    }
-    /**
-     * Static image mime type headers
-     * @static
-     * @param $fileName
-     * @return string
-     */
-    public static function getImageMimeType($fileName)
-    {
-        if (preg_match("/\.jpg$|\.jpeg$/i", $fileName)) {
-            return "image/jpeg";
-        } else if (preg_match("/\.png$/i", $fileName)) {
-            return "image/png";
-        } else if (preg_match("/\.bmp$/i", $fileName)) {
-            return "image/bmp";
-        } else if (preg_match("/\.gif$/i", $fileName)) {
-            return "image/gif";
-        }
-        return "";
-    }
-    /**
-     * Headers to send when streaming
-     * @static
-     * @param $fileName
-     * @return bool|string
-     */
-    public static function getStreamingMimeType($fileName)
-    {
-        if (preg_match("/\.mp3$/i", $fileName)) {
-            return "audio/mp3";
-        } else if (preg_match("/\.wav$/i", $fileName)) {
-            return "audio/wav";
-        } else if (preg_match("/\.aac$/i", $fileName)) {
-            return "audio/aac";
-        } else if (preg_match("/\.m4a$/i", $fileName)) {
-            return "audio/m4a";
-        } else if (preg_match("/\.aiff$/i", $fileName)) {
-            return "audio/aiff";
-        } else if (preg_match("/\.mp4$/i", $fileName)) {
-            return "video/mp4";
-        } else if (preg_match("/\.mov$/i", $fileName)) {
-            return "video/quicktime";
-        } else if (preg_match("/\.m4v$/i", $fileName)) {
-            return "video/x-m4v";
-        } else if (preg_match("/\.3gp$/i", $fileName)) {
-            return "video/3gpp";
-        } else if (preg_match("/\.3g2$/i", $fileName)) {
-            return "video/3gpp2";
-        } else return false;
-    }
-
-    public static $sizeUnit;
-    /**
-     * Display a human readable string for a bytesize (1MB, 2,3Go, etc)
-     * @static
-     * @param $filesize
-     * @param bool $phpConfig
-     * @return string
-     */
-    public static function roundSize($filesize, $phpConfig = false)
-    {
-        if (self::$sizeUnit == null) {
-            $mess = ConfService::getMessages();
-            self::$sizeUnit = $mess["byte_unit_symbol"];
-        }
-        if ($filesize < 0) {
-            $filesize = sprintf("%u", $filesize);
-        }
-        if ($filesize >= 1073741824) {
-            $filesize = round($filesize / 1073741824 * 100) / 100 . ($phpConfig ? "G" : " G" . self::$sizeUnit);
-        } elseif ($filesize >= 1048576) {
-            $filesize = round($filesize / 1048576 * 100) / 100 . ($phpConfig ? "M" : " M" . self::$sizeUnit);
-        } elseif ($filesize >= 1024) {
-            $filesize = round($filesize / 1024 * 100) / 100 . ($phpConfig ? "K" : " K" . self::$sizeUnit);
-        } else {
-            $filesize = $filesize . " " . self::$sizeUnit;
-        }
-        if ($filesize == 0) {
-            $filesize = "-";
-        }
-        return $filesize;
-    }
-
-    /**
-     * Hidden files start with dot
-     * @static
-     * @param string $fileName
-     * @return bool
-     */
-    public static function isHidden($fileName)
-    {
-        return (substr($fileName, 0, 1) == ".");
-    }
-
-    /**
-     * Whether a file is a browsable archive
-     * @static
-     * @param string $fileName
-     * @return int
-     */
-    public static function isBrowsableArchive($fileName)
-    {
-        return preg_match("/\.zip$/i", $fileName);
-    }
-
-    /**
-     * Convert a shorthand byte value from a PHP configuration directive to an integer value
-     * @param    string   $value
-     * @return   int
-     */
-    public static function convertBytes($value)
-    {
-        if (is_numeric($value)) {
-            return intval($value);
-        } else {
-            $value_length = strlen($value);
-            $value = str_replace(",",".", $value);
-            $qty = floatval(substr($value, 0, $value_length - 1));
-            $unit = strtolower(substr($value, $value_length - 1));
-            switch ($unit) {
-                case 'k':
-                    $qty *= 1024;
-                    break;
-                case 'm':
-                    $qty *= 1048576;
-                    break;
-                case 'g':
-                    $qty *= 1073741824;
-                    break;
-            }
-            return $qty;
-        }
-    }
-
-
-    //Relative Date Function
-
-    public static function relativeDate($time, $messages, $shortestForm = false)
-    {
-        $crtYear = date('Y');
-        $today = strtotime(date('M j, Y'));
-        $reldays = ($time - $today)/86400;
-        $relTime = date($messages['date_relative_time_format'], $time);
-
-        if ($reldays >= 0 && $reldays < 1) {
-            return  str_replace("TIME", $relTime, $messages['date_relative_today']);
-        } else if ($reldays >= 1 && $reldays < 2) {
-            return  str_replace("TIME", $relTime, $messages['date_relative_tomorrow']);
-        } else if ($reldays >= -1 && $reldays < 0) {
-            return  str_replace("TIME", $relTime, $messages['date_relative_yesterday']);
-        }
-
-        if (abs($reldays) < 7) {
-
-            if ($reldays > 0) {
-                $reldays = floor($reldays);
-                return  str_replace("%s", $reldays, $messages['date_relative_days_ahead']);
-                //return 'In ' . $reldays . ' day' . ($reldays != 1 ? 's' : '');
-            } else {
-                $reldays = abs(floor($reldays));
-                return  str_replace("%s", $reldays, $messages['date_relative_days_ago']);
-                //return $reldays . ' day' . ($reldays != 1 ? 's' : '') . ' ago';
-            }
-
-        }
-        $finalDate = date($messages["date_relative_date_format"], $time ? $time : time());
-        if(strpos($messages["date_relative_date_format"], "F") !== false && isSet($messages["date_intl_locale"]) && extension_loaded("intl")){
-            $intl = IntlDateFormatter::create($messages["date_intl_locale"], IntlDateFormatter::FULL, IntlDateFormatter::FULL, null, null, "MMMM");
-            $localizedMonth = $intl->format($time ? $time : time());
-            $dateFuncMonth = date("F", $time ? $time : time());
-            $finalDate = str_replace($dateFuncMonth, $localizedMonth, $finalDate);
-        }
-        if(!$shortestForm || strpos($finalDate, $crtYear) !== false){
-            $finalDate = str_replace($crtYear, '', $finalDate);
-            return str_replace("DATE", $finalDate, $messages["date_relative_date"]);
-        }else{
-            return $finalDate = date("M Y", $time ? $time : time());
-        }
-
-    }
-
-
-    /**
-     * Replace specific chars by their XML Entities, for use inside attributes value
-     * @static
-     * @param $string
-     * @param bool $toUtf8
-     * @return mixed|string
-     */
-    public static function xmlEntities($string, $toUtf8 = false)
-    {
-        $xmlSafe = str_replace(array("&", "<", ">", "\"", "\n", "\r"), array("&amp;", "&lt;", "&gt;", "&quot;", "&#13;", "&#10;"), $string);
-        if ($toUtf8 && SystemTextEncoding::getEncoding() != "UTF-8") {
-            return SystemTextEncoding::toUTF8($xmlSafe);
-        } else {
-            return $xmlSafe;
-        }
-    }
-
-
-    /**
-     * Replace specific chars by their XML Entities, for use inside attributes value
-     * @static
-     * @param $string
-     * @param bool $toUtf8
-     * @return mixed|string
-     */
-    public static function xmlContentEntities($string, $toUtf8 = false)
-    {
-        $xmlSafe = str_replace(array("&", "<", ">", "\""), array("&amp;", "&lt;", "&gt;", "&quot;"), $string);
-        if ($toUtf8) {
-            return SystemTextEncoding::toUTF8($xmlSafe);
-        } else {
-            return $xmlSafe;
-        }
-    }
-
-    /**
-     * Search include path for a given file
-     * @static
-     * @param string $file
-     * @return bool
-     */
-    public static function searchIncludePath($file)
-    {
-        $ps = explode(PATH_SEPARATOR, ini_get('include_path'));
-        foreach ($ps as $path) {
-            if (@file_exists($path . DIRECTORY_SEPARATOR . $file)) return true;
-        }
-        if (@file_exists($file)) return true;
-        return false;
-    }
-
-    /**
-     * @static
-     * @param $from
-     * @param $to
-     * @return string
-     */
-    public static function getTravelPath($from, $to)
-    {
-        $from     = explode('/', $from);
-        $to       = explode('/', $to);
-        $relPath  = $to;
-
-        foreach ($from as $depth => $dir) {
-            // find first non-matching dir
-            if ($dir === $to[$depth]) {
-                // ignore this directory
-                array_shift($relPath);
-            } else {
-                // get number of remaining dirs to $from
-                $remaining = count($from) - $depth;
-                if ($remaining > 1) {
-                    // add traversals up to first matching dir
-                    $padLength = (count($relPath) + $remaining - 1) * -1;
-                    $relPath = array_pad($relPath, $padLength, '..');
-                    break;
-                } else {
-                    $relPath[0] = './' . $relPath[0];
-                }
-            }
-        }
-        return implode('/', $relPath);
-    }
-
-
-    /**
-     * Build the current server URL
-     * @param bool $withURI
-     * @static
-     * @return string
-     */
-    public static function detectServerURL($withURI = false)
-    {
-        $setUrl = ConfService::getCoreConf("SERVER_URL");
-        if (!empty($setUrl)) {
-            return $setUrl;
-        }
-        if (php_sapi_name() == "cli") {
-            AJXP_Logger::debug("WARNING, THE SERVER_URL IS NOT SET, WE CANNOT BUILD THE MAIL ADRESS WHEN WORKING IN CLI");
-        }
-        $protocol = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? 'https' : 'http');
-        $port = (($protocol === 'http' && $_SERVER['SERVER_PORT'] == 80 || $protocol === 'https' && $_SERVER['SERVER_PORT'] == 443)
-                ? "" : ":" . $_SERVER['SERVER_PORT']);
-        $name = $_SERVER["SERVER_NAME"];
-        if (!$withURI) {
-            return "$protocol://$name$port";
-        } else {
-            $uri = dirname($_SERVER["REQUEST_URI"]);
-            $api = ConfService::currentContextIsRestAPI();
-            if(!empty($api)){
-                // Keep only before api base
-                $explode = explode("/".$api."/", $uri);
-                $uri = array_shift($explode);
-            }
-            return "$protocol://$name$port".$uri;
-        }
-    }
-
-    /**
-     * @param Repository $repository
-     * @return string
-     */
-    public static function getWorkspaceShortcutURL($repository){
-        if(empty($repository)){
-            return "";
-        }
-        $repoSlug = $repository->getSlug();
-        $skipHistory = ConfService::getCoreConf("SKIP_USER_HISTORY", "conf");
-        if($skipHistory){
-            $prefix = "/ws-";
-        }else{
-            $prefix = "?goto=";
-        }
-        return trim(self::detectServerURL(true), "/").$prefix.$repoSlug;
-    }
-
-    /**
-     * Modifies a string to remove all non ASCII characters and spaces.
-     * @param string $text
-     * @return string
-     */
-    public static function slugify($text)
-    {
-        if (empty($text)) return "";
-        // replace non letter or digits by -
-        $text = preg_replace('~[^\\pL\d]+~u', '-', $text);
-
-        // trim
-        $text = trim($text, '-');
-
-        // transliterate
-        if (function_exists('iconv')) {
-            $text = iconv('utf-8', 'us-ascii//TRANSLIT', $text);
-        }
-
-        // lowercase
-        $text = strtolower($text);
-
-        // remove unwanted characters
-        $text = preg_replace('~[^-\w]+~', '', $text);
-
-        if (empty($text)) {
-            return 'n-a';
-        }
-
-        return $text;
-    }
-
-    public static function getHooksFile()
-    {
-        return AJXP_INSTALL_PATH."/".AJXP_DOCS_FOLDER."/hooks.json";
-    }
-
-    public static function extractHooksToDoc()
-    {
-        $docFile = self::getHooksFile();
-        if (is_file($docFile)) {
-            copy($docFile, $docFile.".bak");
-            $existingHooks = json_decode(file_get_contents($docFile), true);
-        } else {
-            $existingHooks = array();
-        }
-        $allPhpFiles1 = self::glob_recursive(AJXP_INSTALL_PATH."/core/classes/*.php");
-        $allPhpFiles2= self::glob_recursive(AJXP_INSTALL_PATH."/plugins/*.php");
-        $allPhpFiles3= self::glob_recursive(AJXP_INSTALL_PATH."/conf/*.php");
-        $allPhpFiles = array_merge(array_merge($allPhpFiles1, $allPhpFiles2), $allPhpFiles3);
-        $hooks = array();
-        foreach ($allPhpFiles as $phpFile) {
-            $fileContent = file($phpFile);
-            foreach ($fileContent as $lineNumber => $line) {
-                if (preg_match_all('/AJXP_Controller::applyHook\("([^"]+)", (.*)\)/', $line, $matches)) {
-                    $names = $matches[1];
-                    $params = $matches[2];
-                    foreach ($names as $index => $hookName) {
-                        if(!isSet($hooks[$hookName])) $hooks[$hookName] = array("TRIGGERS" => array(), "LISTENERS" => array());
-                        $filename = substr($phpFile, strlen(AJXP_INSTALL_PATH));
-                        if(strpos($filename, "/plugins") === 0) {
-                            $source = explode("/", $filename)[2];
-                        } else {
-                            $source = str_replace(array("class.", ".php"), "", array_pop(explode("/", $filename)));
-                        }
-                        if(!isSet($hooks[$hookName]["TRIGGERS"][$source])){
-                            $hooks[$hookName]["TRIGGERS"][$source] = array();
-                        }
-                        $hooks[$hookName]["TRIGGERS"][$source][] = array(
-                            "FILE" => $filename,
-                            "LINE" => $lineNumber
-                        );
-                        $hooks[$hookName]["PARAMETER_SAMPLE"] = $params[$index];
-                    }
-                }
-
-            }
-        }
-        $registryHooks = AJXP_PluginsService::getInstance()->searchAllManifests("//hooks/serverCallback", "xml", false, false, true);
-        $regHooks = array();
-        foreach ($registryHooks as $xmlHook) {
-            $name = $xmlHook->getAttribute("hookName");
-            $method = $xmlHook->getAttribute("methodName");
-            $pluginId = $xmlHook->getAttribute("pluginId");
-            $deferred = $xmlHook->getAttribute("defer") === "true";
-            if($pluginId == "") $pluginId = $xmlHook->parentNode->parentNode->parentNode->getAttribute("id");
-            if(!isSet($regHooks[$name])) $regHooks[$name] = array();
-            $data = array("PLUGIN_ID" => $pluginId, "METHOD" => $method);
-            if($deferred) $data["DEFERRED"] = true;
-            $regHooks[$name][] = $data;
-        }
-
-        foreach ($hooks as $h => $data) {
-
-            if (isSet($regHooks[$h])) {
-                $data["LISTENERS"] = $regHooks[$h];
-            }
-            if (isSet($existingHooks[$h])) {
-                $existingHooks[$h]["TRIGGERS"] = $data["TRIGGERS"];
-                $existingHooks[$h]["LISTENERS"] = $data["LISTENERS"];
-                $existingHooks[$h]["PARAMETER_SAMPLE"] = $data["PARAMETER_SAMPLE"];
-            } else {
-                $existingHooks[$h] = $data;
-            }
-        }
-        file_put_contents($docFile, self::prettyPrintJSON(json_encode($existingHooks)));
-
-    }
-
-    /**
-     * Indents a flat JSON string to make it more human-readable.
-     *
-     * @param string $json The original JSON string to process.
-     *
-     * @return string Indented version of the original JSON string.
-     */
-    public static function prettyPrintJSON($json)
-    {
-        $result      = '';
-        $pos         = 0;
-        $strLen      = strlen($json);
-        $indentStr   = '  ';
-        $newLine     = "\n";
-        $prevChar    = '';
-        $outOfQuotes = true;
-
-        for ($i=0; $i<=$strLen; $i++) {
-
-            // Grab the next character in the string.
-            $char = substr($json, $i, 1);
-
-            // Are we inside a quoted string?
-            if ($char == '"' && $prevChar != '\\') {
-                $outOfQuotes = !$outOfQuotes;
-
-                // If this character is the end of an element,
-                // output a new line and indent the next line.
-            } else if (($char == '}' || $char == ']') && $outOfQuotes) {
-                $result .= $newLine;
-                $pos --;
-                for ($j=0; $j<$pos; $j++) {
-                    $result .= $indentStr;
-                }
-            }
-
-            // Add the character to the result string.
-            $result .= $char;
-
-            // If the last character was the beginning of an element,
-            // output a new line and indent the next line.
-            if (($char == ',' || $char == '{' || $char == '[') && $outOfQuotes) {
-                $result .= $newLine;
-                if ($char == '{' || $char == '[') {
-                    $pos ++;
-                }
-
-                for ($j = 0; $j < $pos; $j++) {
-                    $result .= $indentStr;
-                }
-            }
-
-            $prevChar = $char;
-        }
-
-        return $result;
-    }
-
-    /**
-     * i18n utilitary for extracting the CONF_MESSAGE[] strings out of the XML files
-     * @static
-     * @return void
-     */
-    public static function extractConfStringsFromManifests()
-    {
-        $plugins = AJXP_PluginsService::getInstance()->getDetectedPlugins();
-        /**
-         * @var AJXP_Plugin $plug
-         */
-        foreach ($plugins as $pType => $plugs) {
-            foreach ($plugs as $plug) {
-                $lib = $plug->getManifestRawContent("//i18n", "nodes");
-                if (!$lib->length) continue;
-                $library = $lib->item(0);
-                $namespace = $library->getAttribute("namespace");
-                $path = $library->getAttribute("path");
-                $xml = $plug->getManifestRawContent();
-                // for core, also load mixins
-                $refFile = AJXP_INSTALL_PATH . "/" . $path . "/conf/en.php";
-                $reference = array();
-                if (preg_match_all("/CONF_MESSAGE(\[.*?\])/", $xml, $matches, PREG_SET_ORDER)) {
-                    foreach ($matches as $match) {
-                        $match[1] = str_replace(array("[", "]"), "", $match[1]);
-                        $reference[$match[1]] = $match[1];
-                    }
-                }
-                if ($namespace == "") {
-                    $mixXml = file_get_contents(AJXP_INSTALL_PATH . "/" . AJXP_PLUGINS_FOLDER . "/core.ajaxplorer/ajxp_mixins.xml");
-                    if (preg_match_all("/MIXIN_MESSAGE(\[.*?\])/", $mixXml, $matches, PREG_SET_ORDER)) {
-                        foreach ($matches as $match) {
-                            $match[1] = str_replace(array("[", "]"), "", $match[1]);
-                            $reference[$match[1]] = $match[1];
-                        }
-                    }
-                }
-                if (count($reference)) {
-                    self::updateI18nFromRef($refFile, $reference);
-                }
-            }
-        }
-    }
-
-    /**
-     * Browse the i18n libraries and update the languages with the strings missing
-     * @static
-     * @param string $createLanguage
-     * @return void
-     */
-    public static function updateAllI18nLibraries($createLanguage = "")
-    {
-        // UPDATE EN => OTHER LANGUAGES
-        $nodes = AJXP_PluginsService::getInstance()->searchAllManifests("//i18n", "nodes");
-        foreach ($nodes as $node) {
-            $nameSpace = $node->getAttribute("namespace");
-            $path = AJXP_INSTALL_PATH . "/" . $node->getAttribute("path");
-            if ($nameSpace == "") {
-                self::updateI18nFiles($path, false, $createLanguage);
-                self::updateI18nFiles($path . "/conf", true, $createLanguage);
-            } else {
-                self::updateI18nFiles($path . "/conf", true, $createLanguage);
-                if($nameSpace == "user_home") continue;
-                self::updateI18nFiles($path, true, $createLanguage);
-            }
-        }
-    }
-
-    /**
-     * Patch the languages files of an i18n library with the references strings from the "en" file.
-     * @static
-     * @param $baseDir
-     * @param bool $detectLanguages
-     * @param string $createLanguage
-     */
-    public static function updateI18nFiles($baseDir, $detectLanguages = true, $createLanguage = "")
-    {
-        if (!is_dir($baseDir) || !is_file($baseDir . "/en.php")) return;
-        if ($createLanguage != "" && !is_file($baseDir . "/$createLanguage.php")) {
-            @copy(AJXP_INSTALL_PATH . "/plugins/core.ajaxplorer/i18n-template.php", $baseDir . "/$createLanguage.php");
-        }
-        if (!$detectLanguages) {
-            $languages = ConfService::listAvailableLanguages();
-            $filenames = array();
-            foreach ($languages as $key => $value) {
-                $filenames[] = $baseDir . "/" . $key . ".php";
-            }
-        } else {
-            $filenames = glob($baseDir . "/*.php");
-        }
-
-        $mess = array();
-        include($baseDir . "/en.php");
-        $reference = $mess;
-
-        foreach ($filenames as $filename) {
-            self::updateI18nFromRef($filename, $reference);
-        }
-    }
-
-    /**
-     * i18n Utilitary
-     * @static
-     * @param $filename
-     * @param $reference
-     */
-    public static function updateI18nFromRef($filename, $reference)
-    {
-        if (!is_file($filename)) return;
-        $mess = array();
-        include($filename);
-        $missing = array();
-        foreach ($reference as $messKey => $message) {
-            if (!array_key_exists($messKey, $mess)) {
-                $missing[] = "\"$messKey\" => \"$message\",";
-            }
-        }
-        //print_r($missing);
-        if (count($missing)) {
-            $header = array();
-            $currentMessages = array();
-            $footer = array();
-            $fileLines = file($filename);
-            $insideArray = false;
-            foreach ($fileLines as $line) {
-                if (strstr($line, "\"") !== false) {
-                    $currentMessages[] = trim($line);
-                    $insideArray = true;
-                } else {
-                    if (!$insideArray && strstr($line, ");") !== false) $insideArray = true;
-                    if (!$insideArray) {
-                        $header[] = trim($line);
-                    } else {
-                        $footer[] = trim($line);
-                    }
-                }
-            }
-            $currentMessages = array_merge($header, $currentMessages, $missing, $footer);
-            file_put_contents($filename, join("\n", $currentMessages));
-        }
-    }
-
-    /**
-     * Generate an HTML table for the tests results. We should use a template somewhere...
-     * @static
-     * @param $outputArray
-     * @param $testedParams
-     * @param bool $showSkipLink
-     * @return void
-     */
-    public static function testResultsToTable($outputArray, $testedParams, $showSkipLink = true)
-    {
-        $dumpRows = "";
-        $passedRows = array();
-        $warnRows = "";
-        $errRows = "";
-        $errs = $warns = 0;
-        $ALL_ROWS =  array(
-            "error" => array(),
-            "warning" => array(),
-            "dump" => array(),
-            "passed" => array(),
-        );
-        $TITLES = array(
-            "error" => "Failed Tests",
-            "warning" => "Warnings",
-            "dump" => "Server Information",
-            "passed" => "Other tests passed",
-        );
-        foreach ($outputArray as $item) {
-
-            // A test is output only if it hasn't succeeded (doText returned FALSE)
-            $result = $item["result"] ? "passed" : ($item["level"] == "info" ? "dump" : ($item["level"] == "warning"
-                    ? "warning" : "error"));
-            $success = $result == "passed";
-            if($result == "dump") $result = "passed";
-            $ALL_ROWS[$result][$item["name"]] = $item["info"];
-        }
-
-        include(AJXP_INSTALL_PATH."/core/tests/startup.phtml");
-    }
-
-    /**
-     * @static
-     * @param $outputArray
-     * @param $testedParams
-     * @return bool
-     */
-    public static function runTests(&$outputArray, &$testedParams)
-    {
-        // At first, list folder in the tests subfolder
-        chdir(AJXP_TESTS_FOLDER);
-        $files = glob('*.php');
-
-        $outputArray = array();
-        $testedParams = array();
-        $passed = true;
-        foreach ($files as $file) {
-            require_once($file);
-            // Then create the test class
-            $testName = str_replace(".php", "", substr($file, 5));
-            if(!class_exists($testName)) continue;
-            $class = new $testName();
-
-            $result = $class->doTest();
-            if (!$result && $class->failedLevel != "info") $passed = false;
-            $outputArray[] = array(
-                "name" => $class->name,
-                "result" => $result,
-                "level" => $class->failedLevel,
-                "info" => $class->failedInfo);
-            if (count($class->testedParams)) {
-                $testedParams = array_merge($testedParams, $class->testedParams);
-            }
-        }
-        // PREPARE REPOSITORY LISTS
-        $repoList = array();
-        $REPOSITORIES = array();
-        require_once("../classes/class.ConfService.php");
-        require_once("../classes/class.Repository.php");
-        include(AJXP_CONF_PATH . "/bootstrap_repositories.php");
-        foreach ($REPOSITORIES as $index => $repo) {
-            $repoList[] = ConfService::createRepositoryFromArray($index, $repo);
-        }
-        // Try with the serialized repositories
-        if (is_file(AJXP_DATA_PATH . "/plugins/conf.serial/repo.ser")) {
-            $fileLines = file(AJXP_DATA_PATH . "/plugins/conf.serial/repo.ser");
-            $repos = unserialize($fileLines[0]);
-            $repoList = array_merge($repoList, $repos);
-        }
-
-        // NOW TRY THE PLUGIN TESTS
-        chdir(AJXP_INSTALL_PATH . "/" . AJXP_PLUGINS_FOLDER);
-        $files = glob('access.*/test.*.php');
-        foreach ($files as $file) {
-            require_once($file);
-            // Then create the test class
-            list($accessFolder, $testFileName) = explode("/", $file);
-            $testName = str_replace(".php", "", substr($testFileName, 5) . "Test");
-            $class = new $testName();
-            foreach ($repoList as $repository) {
-                if($repository->isTemplate || $repository->getParentId() != null) continue;
-                $result = $class->doRepositoryTest($repository);
-                if ($result === false || $result === true) {
-                    if (!$result && $class->failedLevel != "info") {
-                        $passed = false;
-                    }
-                    $outputArray[] = array(
-                        "name" => $class->name . "\n Testing repository : " . $repository->getDisplay(),
-                        "result" => $result,
-                        "level" => $class->failedLevel,
-                        "info" => $class->failedInfo);
-                    if (count($class->testedParams)) {
-                        $testedParams = array_merge($testedParams, $class->testedParams);
-                    }
-                }
-            }
-        }
-
-        return $passed;
-    }
-
-    /**
-     * @static
-     * @param $outputArray
-     * @param $testedParams
-     * @return void
-     */
-    public static function testResultsToFile($outputArray, $testedParams)
-    {
-        ob_start();
-        echo '$diagResults = ';
-        var_export($testedParams);
-        echo ';';
-        echo '$outputArray = ';
-        var_export($outputArray);
-        echo ';';
-        $content = '<?php ' . ob_get_contents() . ' ?>';
-        ob_end_clean();
-        //print_r($content);
-        file_put_contents(TESTS_RESULT_FILE, $content);
-    }
-
-    public static function isStream($path)
-    {
-        $wrappers = stream_get_wrappers();
-        $wrappers_re = '(' . join('|', $wrappers) . ')';
-        return preg_match( "!^$wrappers_re://!", $path ) === 1;
-    }
-
-    /**
-     * Load an array stored serialized inside a file.
-     *
-     * @param String $filePath Full path to the file
-     * @param Boolean $skipCheck do not test for file existence before opening
-     * @param string $format
-     * @return Array
-     */
-    public static function loadSerialFile($filePath, $skipCheck = false, $format="ser")
-    {
-        $filePath = AJXP_VarsFilter::filter($filePath);
-        $result = array();
-        if ($skipCheck) {
-            $fileLines = @file($filePath);
-            if ($fileLines !== false) {
-                if($format == "ser") $result = unserialize(implode("", $fileLines));
-                else if($format == "json") $result = json_decode(implode("", $fileLines), true);
-            }
-            return $result;
-        }
-        if (is_file($filePath)) {
-            $fileLines = file($filePath);
-            if($format == "ser") $result = unserialize(implode("", $fileLines));
-            else if($format == "json") $result = json_decode(implode("", $fileLines), true);
-        }
-        return $result;
-    }
-
-    /**
-     * Stores an Array as a serialized string inside a file.
-     *
-     * @param String $filePath Full path to the file
-     * @param array|Object $value The value to store
-     * @param Boolean $createDir Whether to create the parent folder or not, if it does not exist.
-     * @param bool $silent Silently write the file, are throw an exception on problem.
-     * @param string $format "ser" or "json"
-     * @param bool $jsonPrettyPrint If json, use pretty printing
-     * @throws Exception
-     */
-    public static function saveSerialFile($filePath, $value, $createDir = true, $silent = false, $format="ser", $jsonPrettyPrint = false)
-    {
-        if(!in_array($format, array("ser", "json"))){
-            throw new Exception("Unsupported serialization format: ".$format);
-        }
-        $filePath = AJXP_VarsFilter::filter($filePath);
-        if ($createDir && !is_dir(dirname($filePath))) {
-            @mkdir(dirname($filePath), 0755, true);
-            if (!is_dir(dirname($filePath))) {
-                // Creation failed
-                if($silent) return;
-                else throw new Exception("[AJXP_Utils::saveSerialFile] Cannot write into " . dirname(dirname($filePath)));
-            }
-        }
-        try {
-            $fp = fopen($filePath, "w");
-            if($format == "ser") {
-                $content = serialize($value);
-            } else {
-                $content = json_encode($value);
-                if($jsonPrettyPrint) $content = self::prettyPrintJSON($content);
-            }
-            fwrite($fp, $content);
-            fclose($fp);
-        } catch (Exception $e) {
-            if ($silent) return;
-            else throw $e;
-        }
-    }
-
-    /**
-     * Detect mobile browsers
-     * @static
-     * @return bool
-     */
-    public static function userAgentIsMobile()
-    {
-        $op = strtolower($_SERVER['HTTP_X_OPERAMINI_PHONE'] OR "");
-        $ua = strtolower($_SERVER['HTTP_USER_AGENT']);
-        $ac = strtolower($_SERVER['HTTP_ACCEPT']);
-        $isMobile = strpos($ac, 'application/vnd.wap.xhtml+xml') !== false
-                    || $op != ''
-                    || strpos($ua, 'sony') !== false
-                    || strpos($ua, 'symbian') !== false
-                    || strpos($ua, 'nokia') !== false
-                    || strpos($ua, 'samsung') !== false
-                    || strpos($ua, 'mobile') !== false
-                    || strpos($ua, 'android') !== false
-                    || strpos($ua, 'windows ce') !== false
-                    || strpos($ua, 'epoc') !== false
-                    || strpos($ua, 'opera mini') !== false
-                    || strpos($ua, 'nitro') !== false
-                    || strpos($ua, 'j2me') !== false
-                    || strpos($ua, 'midp-') !== false
-                    || strpos($ua, 'cldc-') !== false
-                    || strpos($ua, 'netfront') !== false
-                    || strpos($ua, 'mot') !== false
-                    || strpos($ua, 'up.browser') !== false
-                    || strpos($ua, 'up.link') !== false
-                    || strpos($ua, 'audiovox') !== false
-                    || strpos($ua, 'blackberry') !== false
-                    || strpos($ua, 'ericsson,') !== false
-                    || strpos($ua, 'panasonic') !== false
-                    || strpos($ua, 'philips') !== false
-                    || strpos($ua, 'sanyo') !== false
-                    || strpos($ua, 'sharp') !== false
-                    || strpos($ua, 'sie-') !== false
-                    || strpos($ua, 'portalmmm') !== false
-                    || strpos($ua, 'blazer') !== false
-                    || strpos($ua, 'avantgo') !== false
-                    || strpos($ua, 'danger') !== false
-                    || strpos($ua, 'palm') !== false
-                    || strpos($ua, 'series60') !== false
-                    || strpos($ua, 'palmsource') !== false
-                    || strpos($ua, 'pocketpc') !== false
-                    || strpos($ua, 'smartphone') !== false
-                    || strpos($ua, 'rover') !== false
-                    || strpos($ua, 'ipaq') !== false
-                    || strpos($ua, 'au-mic,') !== false
-                    || strpos($ua, 'alcatel') !== false
-                    || strpos($ua, 'ericy') !== false
-                    || strpos($ua, 'up.link') !== false
-                    || strpos($ua, 'vodafone/') !== false
-                    || strpos($ua, 'wap1.') !== false
-                    || strpos($ua, 'wap2.') !== false;
-        return $isMobile;
-    }
-    /**
-     * Detect iOS browser
-     * @static
-     * @return bool
-     */
-    public static function userAgentIsIOS()
-    {
-        if (stripos($_SERVER["HTTP_USER_AGENT"], "iphone") !== false) return true;
-        if (stripos($_SERVER["HTTP_USER_AGENT"], "ipad") !== false) return true;
-        if (stripos($_SERVER["HTTP_USER_AGENT"], "ipod") !== false) return true;
-        return false;
-    }
-    /**
-     * Detect Windows Phone
-     * @static
-     * @return bool
-     */
-    public static function userAgentIsWindowsPhone()
-    {
-        if (stripos($_SERVER["HTTP_USER_AGENT"], "IEMobile") !== false) return true;
-        return false;
-    }
-    /**
-     * Detect Android UA
-     * @static
-     * @return bool
-     */
-    public static function userAgentIsAndroid()
-    {
-        return (stripos($_SERVER["HTTP_USER_AGENT"], "android") !== false);
-    }
-
-    public static function userAgentIsNativePydioApp(){
-
-        return (stripos($_SERVER["HTTP_USER_AGENT"], "ajaxplorer-ios-client") !== false
-                || stripos($_SERVER["HTTP_USER_AGENT"], "Apache-HttpClient") !== false
-                || stripos($_SERVER["HTTP_USER_AGENT"], "python-requests") !== false
-        );
-    }
-
-    public static function osFromUserAgent($useragent = null) {
-
-        $osList = array
-        (
-            'Windows 10' => 'windows nt 10.0',
-            'Windows 8.1' => 'windows nt 6.3',
-            'Windows 8' => 'windows nt 6.2',
-            'Windows 7' => 'windows nt 6.1',
-            'Windows Vista' => 'windows nt 6.0',
-            'Windows Server 2003' => 'windows nt 5.2',
-            'Windows XP' => 'windows nt 5.1',
-            'Windows 2000 sp1' => 'windows nt 5.01',
-            'Windows 2000' => 'windows nt 5.0',
-            'Windows NT 4.0' => 'windows nt 4.0',
-            'Windows Me' => 'win 9x 4.9',
-            'Windows 98' => 'windows 98',
-            'Windows 95' => 'windows 95',
-            'Windows CE' => 'windows ce',
-            'Windows (version unknown)' => 'windows',
-            'OpenBSD' => 'openbsd',
-            'SunOS' => 'sunos',
-            'Ubuntu' => 'ubuntu',
-            'Linux' => '(linux)|(x11)',
-            'Mac OSX Beta (Kodiak)' => 'mac os x beta',
-            'Mac OSX Cheetah' => 'mac os x 10.0',
-            'Mac OSX Jaguar' => 'mac os x 10.2',
-            'Mac OSX Panther' => 'mac os x 10.3',
-            'Mac OSX Tiger' => 'mac os x 10.4',
-            'Mac OSX Leopard' => 'mac os x 10.5',
-            'Mac OSX Snow Leopard' => 'mac os x 10.6',
-            'Mac OSX Lion' => 'mac os x 10.7',
-            'Mac OSX Mountain Lion' => 'mac os x 10.8',
-            'Mac OSX Mavericks' => 'mac os x 10.9',
-            'Mac OSX Yosemite' => 'mac os x 10.10',
-            'Mac OSX El Capitan' => 'mac os x 10.11',
-            'Mac OSX Puma' => 'mac os x 10.1',
-            'Mac OS (classic)' => '(mac_powerpc)|(macintosh)',
-            'QNX' => 'QNX',
-            'BeOS' => 'beos',
-            'Apple iPad' => 'iPad',
-            'Apple iPhone' => 'iPhone',
-            'OS2' => 'os\/2',
-            'SearchBot'=>'(nuhk)|(googlebot)|(yammybot)|(openbot)|(slurp)|(msnbot)|(ask jeeves\/teoma)|(ia_archiver)',
-            'Pydio iOS Native Application' => 'ajaxplorer-ios',
-            'Pydio Android Native Application' => 'Apache-HttpClient',
-            'Pydio Sync Client' => 'python-requests'
-        );
-
-        if($useragent == null){
-            $useragent = $_SERVER['HTTP_USER_AGENT'];
-            $useragent = strtolower($useragent);
-        }
-
-        $found = "Not automatically detected.$useragent";
-        foreach($osList as $os=>$match) {
-            if (preg_match('/' . $match . '/i', $useragent)) {
-                $found = $os;
-                break;
-            }
-        }
-
-        return $found;
-
-
-    }
-
-
-    /**
-     * Try to remove a file without errors
-     * @static
-     * @param $file
-     * @return void
-     */
-    public static function silentUnlink($file)
-    {
-        @unlink($file);
-    }
-
-    /**
-     * Try to set an ini config, without errors
-     * @static
-     * @param string $paramName
-     * @param string $paramValue
-     * @return void
-     */
-    public static function safeIniSet($paramName, $paramValue)
-    {
-        $current = ini_get($paramName);
-        if ($current == $paramValue) return;
-        @ini_set($paramName, $paramValue);
-    }
-
-    /**
-     * Parse URL ignoring # and ?
-     * @param $path
-     * @return array
-     */
-    public static function safeParseUrl($path)
-    {
-        $parts = parse_url(str_replace(array("#", "?"), array("__AJXP_FRAGMENT__", "__AJXP_MARK__"), $path));
-        $parts["path"]= str_replace(array("__AJXP_FRAGMENT__", "__AJXP_MARK__"), array("#", "?"), $parts["path"]);
-        return $parts;
-    }
-
-    /**
-     * Sanitize a URL removin all unwanted / trailing slashes
-     *
-     * @param array url_parts
-     * return string url
-     */
-    public function getSanitizedUrl($arr) {
-        $credentials = join(':', array_filter([$arr['user'], $arr['pass']]));
-        $hostname = join(':', array_filter([$arr['host'], $arr['port']]));
-        $domain = join('@', array_filter([$credentials, $hostname]));
-        return $arr['scheme'] . '://' . join('/', array_filter([$domain, $arr['path']]));
-    }
-
-    /**
-     * @static
-     * @param string $url
-     * @return bool|mixed|string
-     */
-    public static function getRemoteContent($url)
-    {
-        if (ini_get("allow_url_fopen")) {
-            return file_get_contents($url);
-        } else if (function_exists("curl_init")) {
-            $ch = curl_init();
-            $timeout = 30; // set to zero for no timeout
-            curl_setopt ($ch, CURLOPT_URL, $url);
-            curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1);
-            curl_setopt ($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
-            $return = curl_exec($ch);
-            curl_close($ch);
-            return $return;
-        } else {
-            $i = parse_url($url);
-            $httpClient = new HttpClient($i["host"]);
-            $httpClient->timeout = 30;
-            return $httpClient->quickGet($url);
-        }
-    }
-
-    public static function decypherStandardFormPassword($userId, $password){
-        if (function_exists('mcrypt_decrypt')) {
-            // We have encoded as base64 so if we need to store the result in a database, it can be stored in text column
-            $password = trim(mcrypt_decrypt(MCRYPT_RIJNDAEL_256, md5($userId."\1CDAFx¨op#"), base64_decode($password), MCRYPT_MODE_ECB), "\0");
-        }
-        return $password;
-    }
-
-    public static function filterFormElementsFromMeta($metadata, &$nestedData, $userId=null, $binariesContext=null, $cypheredPassPrefix=""){
-        foreach($metadata as $key => $level){
-            if(!array_key_exists($key, $nestedData)) continue;
-            if(!is_array($level)) continue;
-            if(isSet($level["ajxp_form_element"])){
-                // filter now
-                $type = $level["type"];
-                if($type == "binary" && $binariesContext != null){
-                    $value = $nestedData[$key];
-                    if ($value == "ajxp-remove-original") {
-                        if (!empty($level["original_binary"])) {
-                            ConfService::getConfStorageImpl()->deleteBinary($binariesContext, $level["original_binary"]);
-                        }
-                        $value = "";
-                    } else {
-                        $file = AJXP_Utils::getAjxpTmpDir()."/".$value;
-                        if (file_exists($file)) {
-                            $id= !empty($level["original_binary"]) ? $level["original_binary"] : null;
-                            $id=ConfService::getConfStorageImpl()->saveBinary($binariesContext, $file, $id);
-                            $value = $id;
-                        }
-                    }
-                    $nestedData[$key] = $value;
-                }
-            }else{
-                self::filterFormElementsFromMeta($level, $nestedData[$key], $userId, $binariesContext, $cypheredPassPrefix);
-            }
-        }
-    }
-
-    public static function parseStandardFormParameters(&$repDef, &$options, $userId = null, $prefix = "DRIVER_OPTION_", $binariesContext = null, $cypheredPassPrefix = "")
-    {
-        if ($binariesContext === null) {
-            $binariesContext = array("USER" => (AuthService::getLoggedUser()!= null)?AuthService::getLoggedUser()->getId():"shared");
-        }
-        $replicationGroups = array();
-        $switchesGroups = array();
-        foreach ($repDef as $key => $value) {
-            if( ( ( !empty($prefix) &&  strpos($key, $prefix)!== false && strpos($key, $prefix)==0 ) || empty($prefix) )
-                && strpos($key, "ajxptype") === false
-                && strpos($key, "_original_binary") === false
-                && strpos($key, "_replication") === false
-                && strpos($key, "_checkbox") === false){
-                if (isSet($repDef[$key."_ajxptype"])) {
-                    $type = $repDef[$key."_ajxptype"];
-                    if ($type == "boolean") {
-                        $value = ($value == "true"?true:false);
-                    } else if ($type == "integer") {
-                        $value = intval($value);
-                    } else if ($type == "array") {
-                        $value = explode(",", $value);
-                    } else if ($type == "password" && $userId!=null) {
-                        if (trim($value) != "" && $value != "__AJXP_VALUE_SET__" && function_exists('mcrypt_encrypt')) {
-                            // We encode as base64 so if we need to store the result in a database, it can be stored in text column
-                            $value = $cypheredPassPrefix . base64_encode(mcrypt_encrypt(MCRYPT_RIJNDAEL_256,  md5($userId."\1CDAFx¨op#"), $value, MCRYPT_MODE_ECB));
-                        }
-                    } else if ($type == "binary" && $binariesContext !== null) {
-                        if (!empty($value)) {
-                            if ($value == "ajxp-remove-original") {
-                                if (!empty($repDef[$key."_original_binary"])) {
-                                    ConfService::getConfStorageImpl()->deleteBinary($binariesContext, $repDef[$key."_original_binary"]);
-                                }
-                                $value = "";
-                            } else {
-                                $file = AJXP_Utils::getAjxpTmpDir()."/".$value;
-                                if (file_exists($file)) {
-                                    $id= !empty($repDef[$key."_original_binary"]) ? $repDef[$key."_original_binary"] : null;
-                                    $id=ConfService::getConfStorageImpl()->saveBinary($binariesContext, $file, $id);
-                                    $value = $id;
-                                }
-                            }
-                        } else if (!empty($repDef[$key."_original_binary"])) {
-                            $value = $repDef[$key."_original_binary"];
-                        }
-                    } else if (strpos($type,"group_switch:") === 0) {
-                        $tmp = explode(":", $type);
-                        $gSwitchName = $tmp[1];
-                        $switchesGroups[substr($key, strlen($prefix))] = $gSwitchName;
-                    } else if ($type == "text/json") {
-                        $value = json_decode($value, true);
-                    }
-                    if (!in_array($type, array("textarea", "boolean", "text/json"))) {
-                        $value = AJXP_Utils::sanitize($value, AJXP_SANITIZE_HTML);
-                    }
-                    unset($repDef[$key."_ajxptype"]);
-                }
-                if (isSet($repDef[$key."_checkbox"])) {
-                    $checked = $repDef[$key."_checkbox"] == "checked";
-                    unset($repDef[$key."_checkbox"]);
-                    if(!$checked) continue;
-                }
-                if (isSet($repDef[$key."_replication"])) {
-                    $repKey = $repDef[$key."_replication"];
-                    if(!is_array($replicationGroups[$repKey])) $replicationGroups[$repKey] = array();
-                    $replicationGroups[$repKey][] = $key;
-                }
-                $options[substr($key, strlen($prefix))] = $value;
-                unset($repDef[$key]);
-            } else {
-                $repDef[$key] = $value;
-            }
-        }
-        // DO SOMETHING WITH REPLICATED PARAMETERS?
-        if (count($switchesGroups)) {
-            $gValues = array();
-            foreach ($switchesGroups as $fieldName => $groupName) {
-                if (isSet($options[$fieldName])) {
-                    $gValues = array();
-                    $radic = $groupName."_".$options[$fieldName]."_";
-                    foreach ($options as $optN => $optV) {
-                        if (strpos($optN, $radic) === 0) {
-                            $newName = substr($optN, strlen($radic));
-                            $gValues[$newName] = $optV;
-                        }
-                    }
-                }
-                $options[$fieldName."_group_switch"] = $options[$fieldName];
-                $options[$fieldName] = $gValues;
-            }
-        }
-
-    }
-
-    private static $_dibiParamClean = array();
-    public static function cleanDibiDriverParameters($params)
-    {
-        if(!is_array($params)) return $params;
-        $value = $params["group_switch_value"];
-        if (isSet($value)) {
-            if(isSet(self::$_dibiParamClean[$value])){
-                return self::$_dibiParamClean[$value];
-            }
-            if ($value == "core") {
-                $bootStorage = ConfService::getBootConfStorageImpl();
-                $configs = $bootStorage->loadPluginConfig("core", "conf");
-                $params = $configs["DIBI_PRECONFIGURATION"];
-                if (!is_array($params)) {
-                     throw new Exception("Empty SQL default connexion, there is something wrong with your setup! You may have switch to an SQL-based plugin without defining a connexion.");
-                }
-            } else {
-                unset($params["group_switch_value"]);
-            }
-            foreach ($params as $k => $v) {
-                $explode = explode("_", $k, 2);
-                $params[array_pop($explode)] = AJXP_VarsFilter::filter($v);
-                unset($params[$k]);
-            }
-        }
-        switch ($params["driver"]) {
-            case "sqlite":
-            case "sqlite3":
-                $params["formatDateTime"] = "'Y-m-d H:i:s'";
-                $params["formatDate"] = "'Y-m-d'";
-                break;
-        }
-        if(isSet($value)){
-            self::$_dibiParamClean[$value] = $params;
-        }
-        return $params;
-    }
-
-    public static function runCreateTablesQuery($p, $file)
-    {
-
-        switch ($p["driver"]) {
-            case "sqlite":
-            case "sqlite3":
-                if (!file_exists(dirname($p["database"]))) {
-                    @mkdir(dirname($p["database"]), 0755, true);
-                }
-                $ext = ".sqlite";
-                break;
-            case "mysql":
-                $ext = ".mysql";
-                break;
-            case "postgre":
-                $ext = ".pgsql";
-                break;
-            default:
-                return "ERROR!, DB driver ". $p["driver"] ." not supported yet in __FUNCTION__";
-        }
-
-        $result = array();
-        $file = dirname($file) ."/". str_replace(".sql", $ext, basename($file) );
-        $sql = file_get_contents($file);
-        $separators = explode("/** SEPARATOR **/", $sql);
-
-        $allParts = array();
-
-        foreach($separators as $sep){
-            $explode = explode("\n", trim($sep));
-            $firstLine = array_shift($explode);
-            if($firstLine == "/** BLOCK **/"){
-                $allParts[] = $sep;
-            }else{
-                $parts = explode(";", $sep);
-                $remove = array();
-                for ($i = 0 ; $i < count($parts); $i++) {
-                    $part = $parts[$i];
-                    if (strpos($part, "BEGIN") && isSet($parts[$i+1])) {
-                        $parts[$i] .= ';'.$parts[$i+1];
-                        $remove[] = $i+1;
-                    }
-                }
-                foreach($remove as $rk) unset($parts[$rk]);
-                $allParts = array_merge($allParts, $parts);
-            }
-        }
-        dibi::connect($p);
-        dibi::begin();
-        foreach ($allParts as $createPart) {
-            $sqlPart = trim($createPart);
-            if (empty($sqlPart)) continue;
-            try {
-                dibi::nativeQuery($sqlPart);
-                $resKey = str_replace("\n", "", substr($sqlPart, 0, 50))."...";
-                $result[] = "OK: $resKey executed successfully";
-            } catch (DibiException $e) {
-                $result[] = "ERROR! $sqlPart failed";
-            }
-        }
-        dibi::commit();
-        dibi::disconnect();
-        $message = implode("\n", $result);
-        if (strpos($message, "ERROR!")) return $message;
-        else return "SUCCESS:".$message;
-    }
-
-
-    /*
-     * PBKDF2 key derivation function as defined by RSA's PKCS #5: https://www.ietf.org/rfc/rfc2898.txt
-     * $algorithm - The hash algorithm to use. Recommended: SHA256
-     * $password - The password.
-     * $salt - A salt that is unique to the password.
-     * $count - Iteration count. Higher is better, but slower. Recommended: At least 1000.
-     * $key_length - The length of the derived key in bytes.
-     * $raw_output - If true, the key is returned in raw binary format. Hex encoded otherwise.
-     * Returns: A $key_length-byte key derived from the password and salt.
-     *
-     * 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
-     */
-    public static function pbkdf2_apply($algorithm, $password, $salt, $count, $key_length, $raw_output = false)
-    {
-        $algorithm = strtolower($algorithm);
-
-        if(!in_array($algorithm, hash_algos(), true))
-            die('PBKDF2 ERROR: Invalid hash algorithm.');
-        if($count <= 0 || $key_length <= 0)
-            die('PBKDF2 ERROR: Invalid parameters.');
-
-        $hash_length = strlen(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
-            $last = $xorsum = hash_hmac($algorithm, $last, $password, true);
-
-            // perform the other $count - 1 iterations
-            for ($j = 1; $j < $count; $j++) {
-                $xorsum ^= ($last = hash_hmac($algorithm, $last, $password, true));
-            }
-
-            $output .= $xorsum;
-        }
-
-        if($raw_output)
-            return substr($output, 0, $key_length);
-        else
-            return bin2hex(substr($output, 0, $key_length));
-    }
-
-
-    // Compares two strings $a and $b in length-constant time.
-    public static function pbkdf2_slow_equals($a, $b)
-    {
-        $diff = strlen($a) ^ strlen($b);
-        for ($i = 0; $i < strlen($a) && $i < strlen($b); $i++) {
-            $diff |= ord($a[$i]) ^ ord($b[$i]);
-        }
-
-        return $diff === 0;
-    }
-
-    public static function pbkdf2_validate_password($password, $correct_hash)
-    {
-        $params = explode(":", $correct_hash);
-
-        if (count($params) < HASH_SECTIONS) {
-            if (strlen($correct_hash) == 32 && count($params) == 1) {
-                return md5($password) == $correct_hash;
-            }
-            return false;
-        }
-
-        $pbkdf2 = base64_decode($params[HASH_PBKDF2_INDEX]);
-        return self::pbkdf2_slow_equals(
-            $pbkdf2,
-             self::pbkdf2_apply(
-                $params[HASH_ALGORITHM_INDEX],
-                $password,
-                $params[HASH_SALT_INDEX],
-                (int) $params[HASH_ITERATION_INDEX],
-                strlen($pbkdf2),
-                true
-            )
-        );
-    }
-
-
-    public static function pbkdf2_create_hash($password)
-    {
-        // format: algorithm:iterations:salt:hash
-        $salt = base64_encode(mcrypt_create_iv(PBKDF2_SALT_BYTE_SIZE, MCRYPT_DEV_URANDOM));
-        return PBKDF2_HASH_ALGORITHM . ":" . PBKDF2_ITERATIONS . ":" .  $salt . ":" .
-        base64_encode(self::pbkdf2_apply(
-            PBKDF2_HASH_ALGORITHM,
-            $password,
-            $salt,
-            PBKDF2_ITERATIONS,
-            PBKDF2_HASH_BYTE_SIZE,
-            true
-        ));
-    }
-
-    /**
-     * generates a random password, uses base64: 0-9a-zA-Z
-     * @param int [optional] $length length of password, default 24 (144 Bit)
-     * @param bool $complexChars
-     * @return string password
-     */
-    public static function generateRandomString($length = 24, $complexChars = false)
-    {
-        if (function_exists('openssl_random_pseudo_bytes') && USE_OPENSSL_RANDOM && !$complexChars) {
-            $password = base64_encode(openssl_random_pseudo_bytes($length, $strong));
-            if($strong == TRUE)
-                return substr(str_replace(array("/","+","="), "", $password), 0, $length); //base64 is about 33% longer, so we need to truncate the result
-        }
-
-        //fallback to mt_rand if php < 5.3 or no openssl available
-        $characters = '0123456789';
-        $characters .= 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
-        if($complexChars){
-            $characters .= "!@#$%&*?";
-        }
-        $charactersLength = strlen($characters)-1;
-        $password = '';
-
-        //select some random characters
-        for ($i = 0; $i < $length; $i++) {
-            $password .= $characters[mt_rand(0, $charactersLength)];
-        }
-
-        return $password;
-    }
-
-    // Does not support flag GLOB_BRACE
-    public static function glob_recursive($pattern, $flags = 0)
-    {
-        $files = glob($pattern, $flags);
-        foreach (glob(dirname($pattern).'/*', GLOB_ONLYDIR|GLOB_NOSORT) as $dir) {
-            $files = array_merge($files, self::glob_recursive($dir.'/'.basename($pattern), $flags));
-        }
-        return $files;
-    }
-
-    public static function regexpToLike($regexp)
-    {
-        $regexp = trim($regexp, '/');
-        $left = "~";
-        $right = "~";
-        if ($regexp[0]=="^") {
-            $left = "";
-        }
-        if ($regexp[strlen($regexp)-1] == "$") {
-            $right = "";
-        }
-        if ($left == "" && $right == "") {
-            return "= %s";
-        }
-        return "LIKE %".$left."like".$right;
-    }
-
-    public static function cleanRegexp($regexp)
-    {
-        $regexp = str_replace("\/", "/", trim($regexp, '/'));
-        return ltrim(rtrim($regexp, "$"), "^");
-    }
-
-    public static function likeToLike($regexp)
-    {
-        $left = "";
-        $right = "";
-        if ($regexp[0]=="%") {
-            $left = "~";
-        }
-        if ($regexp[strlen($regexp)-1] == "%") {
-            $right = "~";
-        }
-        if ($left == "" && $right == "") {
-            return "= %s";
-        }
-        return "LIKE %".$left."like".$right;
-    }
-
-    public static function cleanLike($regexp)
-    {
-        return ltrim(rtrim($regexp, "%"), "%");
-    }
-
-    public static function regexpToLdap($regexp)
-    {
-        if(empty($regexp))
-            return null;
-
-        $left = "*";
-        $right = "*";
-        if ($regexp[0]=="^") {
-            $regexp = ltrim($regexp, "^");
-            $left = "";
-        }
-        if ($regexp[strlen($regexp)-1] == "$") {
-            $regexp = rtrim($regexp, "$");
-            $right = "";
-        }
-        return $left.$regexp.$right;
-    }
-
-    /**
-     * Hide file or folder for Windows OS
-     * @static
-     * @param $file
-     */
-    public static function winSetHidden($file)
-    {
-        @shell_exec("attrib +H " . escapeshellarg($file));
-    }
-}
diff --git a/core/src/core/classes/class.AJXP_VarsFilter.php b/core/src/core/classes/class.AJXP_VarsFilter.php
deleted file mode 100644
index a40ae32474..0000000000
--- a/core/src/core/classes/class.AJXP_VarsFilter.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Standard values filtering used in the core.
- * @static
- * @package Pydio
- * @subpackage Core
- */
-class AJXP_VarsFilter
-{
-    /**
-     * Filter the very basic keywords from the XML  : AJXP_USER, AJXP_INSTALL_PATH, AJXP_DATA_PATH
-     * Calls the vars.filter hooks.
-     * @static
-     * @param $value
-     * @param AbstractAjxpUser|String $resolveUser
-     * @return mixed|string
-     */
-    public static function filter($value, $resolveUser = null)
-    {
-        if (is_string($value) && strpos($value, "AJXP_USER")!==false) {
-            if (AuthService::usersEnabled()) {
-                if($resolveUser != null){
-                    if(is_string($resolveUser)){
-                        $resolveUserId = $resolveUser;
-                    } else {
-                        $resolveUserId = $resolveUser->getId();
-                    }
-                    $value = str_replace("AJXP_USER", $resolveUserId, $value);
-                }else{
-                    $loggedUser = AuthService::getLoggedUser();
-                    if ($loggedUser != null) {
-                        if ($loggedUser->hasParent() && $loggedUser->getResolveAsParent()) {
-                            $loggedUserId = $loggedUser->getParent();
-                        } else {
-                            $loggedUserId = $loggedUser->getId();
-                        }
-                        $value = str_replace("AJXP_USER", $loggedUserId, $value);
-                    } else {
-                        return "";
-                    }
-                }
-            } else {
-                $value = str_replace("AJXP_USER", "shared", $value);
-            }
-        }
-        if (is_string($value) && strpos($value, "AJXP_GROUP_PATH")!==false) {
-            if (AuthService::usersEnabled()) {
-                if($resolveUser != null){
-                    if(is_string($resolveUser) && AuthService::userExists($resolveUser)){
-                        $loggedUser = ConfService::getConfStorageImpl()->createUserObject($resolveUser);
-                    }else{
-                        $loggedUser = $resolveUser;
-                    }
-                }else{
-                    $loggedUser = AuthService::getLoggedUser();
-                }
-                if ($loggedUser != null) {
-                    $gPath = $loggedUser->getGroupPath();
-                    $value = str_replace("AJXP_GROUP_PATH_FLAT", str_replace("/", "_", trim($gPath, "/")), $value);
-                    $value = str_replace("AJXP_GROUP_PATH", $gPath, $value);
-                } else {
-                    return "";
-                }
-            } else {
-                $value = str_replace(array("AJXP_GROUP_PATH", "AJXP_GROUP_PATH_FLAT"), "shared", $value);
-            }
-        }
-        if (is_string($value) && strpos($value, "AJXP_INSTALL_PATH") !== false) {
-            $value = str_replace("AJXP_INSTALL_PATH", AJXP_INSTALL_PATH, $value);
-        }
-        if (is_string($value) && strpos($value, "AJXP_DATA_PATH") !== false) {
-            $value = str_replace("AJXP_DATA_PATH", AJXP_DATA_PATH, $value);
-        }
-        $tab = array(&$value);
-        AJXP_Controller::applyIncludeHook("vars.filter", $tab);
-        return $value;
-    }
-
-    public static function filterI18nStrings(&$array){
-        if(!is_array($array)) return;
-        $appTitle = ConfService::getCoreConf("APPLICATION_TITLE");
-        foreach($array as &$value){
-            $value = str_replace("APPLICATION_TITLE", $appTitle, $value);
-        }
-    }
-}
diff --git a/core/src/core/classes/class.AJXP_XMLWriter.php b/core/src/core/classes/class.AJXP_XMLWriter.php
deleted file mode 100644
index c5e2024d7b..0000000000
--- a/core/src/core/classes/class.AJXP_XMLWriter.php
+++ /dev/null
@@ -1,874 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * XML output Generator
- * @package Pydio
- * @subpackage Core
- */
-class AJXP_XMLWriter
-{
-    public static $headerSent = false;
-
-    /**
-     * Output Headers, XML <?xml version...?> tag and a root node
-     * @static
-     * @param string $docNode
-     * @param array $attributes
-     */
-    public static function header($docNode="tree", $attributes=array())
-    {
-        if(self::$headerSent !== false && self::$headerSent == $docNode) return ;
-        header('Content-Type: text/xml; charset=UTF-8');
-        header('Cache-Control: no-cache');
-        print('<?xml version="1.0" encoding="UTF-8"?>');
-        $attString = "";
-        if (count($attributes)) {
-            foreach ($attributes as $name=>$value) {
-                $attString.="$name=\"$value\" ";
-            }
-        }
-        self::$headerSent = $docNode;
-        print("<$docNode $attString>");
-
-    }
-    /**
-     * Outputs a closing root not (</tree>)
-     * @static
-     * @param string $docNode
-     * @return void
-     */
-    public static function close($docNode="tree")
-    {
-        print("</$docNode>");
-    }
-
-    /**
-     * @static
-     * @param string $data
-     * @param bool $print
-     * @return string
-     */
-    public static function write($data, $print)
-    {
-        if ($print) {
-            print($data);
-            return "";
-        } else {
-            return $data;
-        }
-    }
-
-    /**
-     * Ouput the <pagination> tag
-     * @static
-     * @param integer $count
-     * @param integer $currentPage
-     * @param integer $totalPages
-     * @param integer $dirsCount
-     * @param null $remoteSortAttributes
-     */
-    public static function renderPaginationData($count, $currentPage, $totalPages, $dirsCount = -1, $remoteSortAttributes = null)
-    {
-        $remoteSortString = "";
-        if (is_array($remoteSortAttributes)) {
-            foreach($remoteSortAttributes as $k => $v) $remoteSortString .= " $k='$v'";
-        }
-        $string = '<pagination count="'.$count.'" total="'.$totalPages.'" current="'.$currentPage.'" overflowMessage="'.$currentPage."/".$totalPages.'" icon="folder.png" openicon="folder_open.png" dirsCount="'.$dirsCount.'"'.$remoteSortString.'/>';
-        AJXP_XMLWriter::write($string, true);
-    }
-
-    /**
-     * Convert an arbitrary list of data (array of associative array) as standard XML list.
-     * @param $data
-     * @param $rootPath
-     * @param $idKey
-     * @param $labelKey
-     */
-    public static function renderSimpleListAsNodes($data, $rootPath, $idKey, $labelKey){
-
-        self::header();
-
-        foreach($data as $item){
-
-            $nodeName = rtrim($rootPath, "/")."/".$item[$idKey];
-            $nodeLabel = $item[$labelKey];
-            $isLeaf = true;
-            $metaData = $item;
-            self::renderNode($nodeName, $nodeLabel, $isLeaf, $metaData);
-
-        }
-
-        self::close();
-    }
-
-    /**
-     * Prints out the XML headers and preamble, then an open node
-     * @static
-     * @param $nodeName
-     * @param $nodeLabel
-     * @param $isLeaf
-     * @param array $metaData
-     * @return void
-     */
-    public static function renderHeaderNode($nodeName, $nodeLabel, $isLeaf, $metaData = array())
-    {
-        header('Content-Type: text/xml; charset=UTF-8');
-        header('Cache-Control: no-cache');
-        print('<?xml version="1.0" encoding="UTF-8"?>');
-        self::$headerSent = "tree";
-        AJXP_XMLWriter::renderNode($nodeName, $nodeLabel, $isLeaf, $metaData, false);
-    }
-
-    /**
-     * @static
-     * @param AJXP_Node $ajxpNode
-     * @return void
-     */
-    public static function renderAjxpHeaderNode($ajxpNode)
-    {
-        header('Content-Type: text/xml; charset=UTF-8');
-        header('Cache-Control: no-cache');
-        print('<?xml version="1.0" encoding="UTF-8"?>');
-        self::$headerSent = "tree";
-        self::renderAjxpNode($ajxpNode, false);
-    }
-
-    /**
-     * The basic node
-     * @static
-     * @param string $nodeName
-     * @param string $nodeLabel
-     * @param bool $isLeaf
-     * @param array $metaData
-     * @param bool $close
-     * @param bool $print
-     * @return void|string
-     */
-    public static function renderNode($nodeName, $nodeLabel, $isLeaf, $metaData = array(), $close=true, $print = true)
-    {
-        $string = "<tree";
-        $metaData["filename"] = $nodeName;
-        if(AJXP_Utils::detectXSS($nodeName)) $metaData["filename"] = "/XSS Detected - Please contact your admin";
-        if (!isSet($metaData["text"])) {
-            if(AJXP_Utils::detectXSS($nodeLabel)) $nodeLabel = "XSS Detected - Please contact your admin";
-            $metaData["text"] = $nodeLabel;
-        }else{
-            if(AJXP_Utils::detectXSS($metaData["text"])) $metaData["text"] = "XSS Detected - Please contact your admin";
-        }
-        $metaData["is_file"] = ($isLeaf?"true":"false");
-        $metaData["ajxp_im_time"] = time();
-        foreach ($metaData as $key => $value) {
-            if(AJXP_Utils::detectXSS($value)) $value = "XSS Detected!";
-            $value = AJXP_Utils::xmlEntities($value, true);
-            $string .= " $key=\"$value\"";
-        }
-        if ($close) {
-            $string .= "/>";
-        } else {
-            $string .= ">";
-        }
-        return AJXP_XMLWriter::write($string, $print);
-    }
-
-    /**
-     * @static
-     * @param AJXP_Node $ajxpNode
-     * @param bool $close
-     * @param bool $print
-     * @return void|string
-     */
-    public static function renderAjxpNode($ajxpNode, $close = true, $print = true)
-    {
-        return AJXP_XMLWriter::renderNode(
-            $ajxpNode->getPath(),
-            $ajxpNode->getLabel(),
-            $ajxpNode->isLeaf(),
-            $ajxpNode->metadata,
-            $close,
-            $print);
-    }
-
-    /**
-     * Render a node with arguments passed as array
-     * @static
-     * @param $array
-     * @return void
-     */
-    public static function renderNodeArray($array)
-    {
-        self::renderNode($array[0],$array[1],$array[2],$array[3]);
-    }
-
-    /**
-     * Error Catcher for PHP errors. Depending on the SERVER_DEBUG config
-     * shows the file/line info or not.
-     * @static
-     * @param $code
-     * @param $message
-     * @param $fichier
-     * @param $ligne
-     * @param $context
-     */
-    public static function catchError($code, $message, $fichier, $ligne, $context)
-    {
-        if(error_reporting() == 0) {
-            return ;
-        }
-        AJXP_Logger::error(basename($fichier), "error l.$ligne", array("message" => $message));
-        if (ConfService::getConf("SERVER_DEBUG")) {
-            $stack = debug_backtrace();
-            $stackLen = count($stack);
-            for ($i = 1; $i < $stackLen; $i++) {
-                $entry = $stack[$i];
-
-                $func = $entry['function'] . '(';
-                $argsLen = count($entry['args']);
-                for ($j = 0; $j < $argsLen; $j++) {
-                    $s = $entry['args'][$j];
-                    if(is_string($s)){
-                        $func .= $s;
-                    }else if (is_object($s)){
-                        $func .= get_class($s);
-                    }
-                    if ($j < $argsLen - 1) $func .= ', ';
-                }
-                $func .= ')';
-
-                $message .= "\n". str_replace(dirname(__FILE__), '', $entry['file']) . ':' . $entry['line'] . ' - ' . $func . PHP_EOL;
-            }
-        }
-        if(!headers_sent()) AJXP_XMLWriter::header();
-        if(!empty($context) && is_object($context) && is_a($context, "AJXP_PromptException")){
-            AJXP_XMLWriter::write("<prompt type=\"".$context->getPromptType()."\"><message>".$message."</message><data><![CDATA[".json_encode($context->getPromptData())."]]></data></prompt>", true);
-        }else{
-            AJXP_XMLWriter::sendMessage(null, SystemTextEncoding::toUTF8($message), true);
-        }
-        AJXP_XMLWriter::close();
-        exit(1);
-    }
-
-    /**
-     * Catch exceptions, @see catchError
-     * @param Exception $exception
-     */
-    public static function catchException($exception)
-    {
-        try {
-            AJXP_XMLWriter::catchError($exception->getCode(), SystemTextEncoding::fromUTF8($exception->getMessage()), $exception->getFile(), $exception->getLine(), $exception);
-        } catch (Exception $innerEx) {
-            error_log(get_class($innerEx)." thrown within the exception handler!");
-            error_log("Original exception was: ".$innerEx->getMessage()." in ".$innerEx->getFile()." on line ".$innerEx->getLine());
-            error_log("New exception is: ".$innerEx->getMessage()." in ".$innerEx->getFile()." on line ".$innerEx->getLine()." ".$innerEx->getTraceAsString());
-            print("Error");
-        }
-    }
-    /**
-     * Dynamically replace XML keywords with their live values.
-     * AJXP_SERVER_ACCESS, AJXP_MIMES_*,AJXP_ALL_MESSAGES, etc.
-     * @static
-     * @param string $xml
-     * @param bool $stripSpaces
-     * @return mixed
-     */
-    public static function replaceAjxpXmlKeywords($xml, $stripSpaces = false)
-    {
-        $messages = ConfService::getMessages();
-        $confMessages = ConfService::getMessagesConf();
-        $matches = array();
-        if (isSet($_SESSION["AJXP_SERVER_PREFIX_URI"])) {
-            //$xml = str_replace("AJXP_THEME_FOLDER", $_SESSION["AJXP_SERVER_PREFIX_URI"].AJXP_THEME_FOLDER, $xml);
-            $xml = str_replace("AJXP_SERVER_ACCESS", $_SESSION["AJXP_SERVER_PREFIX_URI"].AJXP_SERVER_ACCESS, $xml);
-        } else {
-            //$xml = str_replace("AJXP_THEME_FOLDER", AJXP_THEME_FOLDER, $xml);
-            $xml = str_replace("AJXP_SERVER_ACCESS", AJXP_SERVER_ACCESS, $xml);
-        }
-        $xml = str_replace("AJXP_APPLICATION_TITLE", ConfService::getCoreConf("APPLICATION_TITLE"), $xml);
-        $xml = str_replace("AJXP_MIMES_EDITABLE", AJXP_Utils::getAjxpMimes("editable"), $xml);
-        $xml = str_replace("AJXP_MIMES_IMAGE", AJXP_Utils::getAjxpMimes("image"), $xml);
-        $xml = str_replace("AJXP_MIMES_AUDIO", AJXP_Utils::getAjxpMimes("audio"), $xml);
-        $xml = str_replace("AJXP_MIMES_ZIP", AJXP_Utils::getAjxpMimes("zip"), $xml);
-        $authDriver = ConfService::getAuthDriverImpl();
-        if ($authDriver != NULL) {
-            $loginRedirect = $authDriver->getLoginRedirect();
-            $xml = str_replace("AJXP_LOGIN_REDIRECT", ($loginRedirect!==false?"'".$loginRedirect."'":"false"), $xml);
-        }
-        $xml = str_replace("AJXP_REMOTE_AUTH", "false", $xml);
-        $xml = str_replace("AJXP_NOT_REMOTE_AUTH", "true", $xml);
-        $xml = str_replace("AJXP_ALL_MESSAGES", "MessageHash=".json_encode(ConfService::getMessages()).";", $xml);
-
-        if (preg_match_all("/AJXP_MESSAGE(\[.*?\])/", $xml, $matches, PREG_SET_ORDER)) {
-            foreach ($matches as $match) {
-                $messId = str_replace("]", "", str_replace("[", "", $match[1]));
-                $xml = str_replace("AJXP_MESSAGE[$messId]", $messages[$messId], $xml);
-            }
-        }
-        if (preg_match_all("/CONF_MESSAGE(\[.*?\])/", $xml, $matches, PREG_SET_ORDER)) {
-            foreach ($matches as $match) {
-                $messId = str_replace(array("[", "]"), "", $match[1]);
-                $message = $messId;
-                if (array_key_exists($messId, $confMessages)) {
-                    $message = $confMessages[$messId];
-                }
-                $xml = str_replace("CONF_MESSAGE[$messId]", AJXP_Utils::xmlEntities($message), $xml);
-            }
-        }
-        if (preg_match_all("/MIXIN_MESSAGE(\[.*?\])/", $xml, $matches, PREG_SET_ORDER)) {
-            foreach ($matches as $match) {
-                $messId = str_replace(array("[", "]"), "", $match[1]);
-                $message = $messId;
-                if (array_key_exists($messId, $confMessages)) {
-                    $message = $confMessages[$messId];
-                }
-                $xml = str_replace("MIXIN_MESSAGE[$messId]", AJXP_Utils::xmlEntities($message), $xml);
-            }
-        }
-        if ($stripSpaces) {
-            $xml = preg_replace("/[\n\r]?/", "", $xml);
-            $xml = preg_replace("/\t/", " ", $xml);
-        }
-        $xml = str_replace(array('xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"','xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd"'), "", $xml);
-        $tab = array(&$xml);
-        AJXP_Controller::applyIncludeHook("xml.filter", $tab);
-        return $xml;
-    }
-    /**
-     * Send a <reload> XML instruction for refreshing the list
-     * @static
-     * @param string $nodePath
-     * @param string $pendingSelection
-     * @param bool $print
-     * @return string
-     */
-    public static function reloadDataNode($nodePath="", $pendingSelection="", $print = true)
-    {
-        $nodePath = AJXP_Utils::xmlEntities($nodePath, true);
-        $pendingSelection = AJXP_Utils::xmlEntities($pendingSelection, true);
-        return AJXP_XMLWriter::write("<reload_instruction object=\"data\" node=\"$nodePath\" file=\"$pendingSelection\"/>", $print);
-    }
-
-
-    /**
-     * Send a <reload> XML instruction for refreshing the list
-     * @static
-     * @param $diffNodes
-     * @param bool $print
-     * @return string
-     */
-    public static function writeNodesDiff($diffNodes, $print = false)
-    {
-        /**
-         * @var $ajxpNode AJXP_Node
-         */
-        $mess = ConfService::getMessages();
-        $buffer = "<nodes_diff>";
-        if (isSet($diffNodes["REMOVE"]) && count($diffNodes["REMOVE"])) {
-            $buffer .= "<remove>";
-            foreach ($diffNodes["REMOVE"] as $nodePath) {
-                $nodePath = AJXP_Utils::xmlEntities($nodePath, true);
-                $buffer .= "<tree filename=\"$nodePath\" ajxp_im_time=\"".time()."\"/>";
-            }
-            $buffer .= "</remove>";
-        }
-        if (isSet($diffNodes["ADD"]) && count($diffNodes["ADD"])) {
-            $buffer .= "<add>";
-            foreach ($diffNodes["ADD"] as $ajxpNode) {
-                $ajxpNode->loadNodeInfo(false, false, "all");
-                if (!empty($ajxpNode->metaData["mimestring_id"]) && array_key_exists($ajxpNode->metaData["mimestring_id"], $mess)) {
-                    $ajxpNode->mergeMetadata(array("mimestring" =>  $mess[$ajxpNode->metaData["mimestring_id"]]));
-                }
-                $buffer .=  self::renderAjxpNode($ajxpNode, true, false);
-            }
-            $buffer .= "</add>";
-        }
-        if (isSet($diffNodes["UPDATE"]) && count($diffNodes["UPDATE"])) {
-            $buffer .= "<update>";
-            foreach ($diffNodes["UPDATE"] as $originalPath => $ajxpNode) {
-                $ajxpNode->loadNodeInfo(false, false, "all");
-                if (!empty($ajxpNode->metaData["mimestring_id"]) && array_key_exists($ajxpNode->metaData["mimestring_id"], $mess)) {
-                    $ajxpNode->mergeMetadata(array("mimestring" =>  $mess[$ajxpNode->metaData["mimestring_id"]]));
-                }
-                $ajxpNode->original_path = $originalPath;
-                $buffer .= self::renderAjxpNode($ajxpNode, true, false);
-            }
-            $buffer .= "</update>";
-        }
-        $buffer .= "</nodes_diff>";
-        return AJXP_XMLWriter::write($buffer, $print);
-
-        /*
-        $nodePath = AJXP_Utils::xmlEntities($nodePath, true);
-        $pendingSelection = AJXP_Utils::xmlEntities($pendingSelection, true);
-        return AJXP_XMLWriter::write("<reload_instruction object=\"data\" node=\"$nodePath\" file=\"$pendingSelection\"/>", $print);
-        */
-    }
-
-
-    /**
-     * Send a <reload> XML instruction for refreshing the repositories list
-     * @static
-     * @param bool $print
-     * @return string
-     */
-    public static function reloadRepositoryList($print = true)
-    {
-        return AJXP_XMLWriter::write("<reload_instruction object=\"repository_list\"/>", $print);
-    }
-    /**
-     * Outputs a <require_auth/> tag
-     * @static
-     * @param bool $print
-     * @return string
-     */
-    public static function requireAuth($print = true)
-    {
-        return AJXP_XMLWriter::write("<require_auth/>", $print);
-    }
-    /**
-     * Triggers a background action client side
-     * @static
-     * @param $actionName
-     * @param $parameters
-     * @param $messageId
-     * @param bool $print
-     * @param int $delay
-     * @return string
-     */
-    public static function triggerBgAction($actionName, $parameters, $messageId, $print=true, $delay = 0)
-    {
-        $messageId = AJXP_Utils::xmlEntities($messageId);
-        $data = AJXP_XMLWriter::write("<trigger_bg_action name=\"$actionName\" messageId=\"$messageId\" delay=\"$delay\">", $print);
-        foreach ($parameters as $paramName=>$paramValue) {
-            $paramValue = AJXP_Utils::xmlEntities($paramValue);
-            $data .= AJXP_XMLWriter::write("<param name=\"$paramName\" value=\"$paramValue\"/>", $print);
-        }
-        $data .= AJXP_XMLWriter::write("</trigger_bg_action>", $print);
-        return $data;
-    }
-
-    public static function triggerBgJSAction($jsCode, $messageId, $print=true, $delay = 0)
-    {
-           $data = AJXP_XMLWriter::write("<trigger_bg_action name=\"javascript_instruction\" messageId=\"$messageId\" delay=\"$delay\">", $print);
-        $data .= AJXP_XMLWriter::write("<clientCallback><![CDATA[".$jsCode."]]></clientCallback>", $print);
-           $data .= AJXP_XMLWriter::write("</trigger_bg_action>", $print);
-           return $data;
-       }
-
-    /**
-     * List all bookmmarks as XML
-     * @static
-     * @param $allBookmarks
-     * @param bool $print
-     * @param string $format legacy|node_list
-     * @return string
-     */
-    public static function writeBookmarks($allBookmarks, $print = true, $format = "legacy")
-    {
-        $driver = false;
-        if ($format == "node_list") {
-            $driver = ConfService::loadRepositoryDriver();
-            if (!is_a($driver, "AjxpWrapperProvider")) {
-                $driver = false;
-            }
-        }
-        $buffer = "";
-        foreach ($allBookmarks as $bookmark) {
-            $path = ""; $title = "";
-            if (is_array($bookmark)) {
-                $path = $bookmark["PATH"];
-                $title = $bookmark["TITLE"];
-            } else if (is_string($bookmark)) {
-                $path = $bookmark;
-                $title = basename($bookmark);
-            }
-            if ($format == "node_list") {
-                if ($driver) {
-                    $node = new AJXP_Node($driver->getResourceUrl($path));
-                    $buffer .= AJXP_XMLWriter::renderAjxpNode($node, true, false);
-                } else {
-                    $buffer .= AJXP_XMLWriter::renderNode($path, $title, false, array('icon' => "mime_empty.png"), true, false);
-                }
-            } else {
-                $buffer .= "<bookmark path=\"".AJXP_Utils::xmlEntities($path, true)."\" title=\"".AJXP_Utils::xmlEntities($title, true)."\"/>";
-            }
-        }
-        if($print) {
-            print $buffer;
-            return null;
-        } else {
-            return $buffer;
-        }
-    }
-    /**
-     * Utilitary for generating a <component_config> tag for the FilesList component
-     * @static
-     * @param $config
-     * @return void
-     */
-    public static function sendFilesListComponentConfig($config)
-    {
-        if (is_string($config)) {
-            print("<client_configs><component_config className=\"FilesList\">$config</component_config></client_configs>");
-        }
-    }
-    /**
-     * Send a success or error message to the client.
-     * @static
-     * @param $logMessage
-     * @param $errorMessage
-     * @param bool $print
-     * @return string
-     */
-    public static function sendMessage($logMessage, $errorMessage, $print = true)
-    {
-        if ($errorMessage == null) {
-            $messageType = "SUCCESS";
-            $message = AJXP_Utils::xmlContentEntities($logMessage);
-        } else {
-            $messageType = "ERROR";
-            $message = AJXP_Utils::xmlContentEntities($errorMessage);
-        }
-        return AJXP_XMLWriter::write("<message type=\"$messageType\">".$message."</message>", $print);
-    }
-
-    /**
-     * Extract all the user data and put it in XML
-     * @static
-     * @param null $userObject * @internal param bool $details
-     * @return string
-     */
-    public static function getUserXML($userObject = null)
-    {
-        $buffer = "";
-        $loggedUser = AuthService::getLoggedUser();
-        $confDriver = ConfService::getConfStorageImpl();
-        if($userObject != null) $loggedUser = $userObject;
-        if (!AuthService::usersEnabled()) {
-            $buffer.="<user id=\"shared\">";
-            $buffer.="<active_repo id=\"".ConfService::getCurrentRepositoryId()."\" write=\"1\" read=\"1\"/>";
-            $buffer.= AJXP_XMLWriter::writeRepositoriesData(null);
-            $buffer.="</user>";
-        } else if ($loggedUser != null) {
-            $lock = $loggedUser->getLock();
-            $buffer.="<user id=\"".$loggedUser->id."\">";
-            $buffer.="<active_repo id=\"".ConfService::getCurrentRepositoryId()."\" write=\"".($loggedUser->canWrite(ConfService::getCurrentRepositoryId())?"1":"0")."\" read=\"".($loggedUser->canRead(ConfService::getCurrentRepositoryId())?"1":"0")."\"/>";
-            $buffer.= AJXP_XMLWriter::writeRepositoriesData($loggedUser);
-            $buffer.="<preferences>";
-            $preferences = $confDriver->getExposedPreferences($loggedUser);
-            foreach ($preferences as $prefName => $prefData) {
-                $atts = "";
-                if (isSet($prefData["exposed"]) && $prefData["exposed"] == true) {
-                    foreach ($prefData as $k => $v) {
-                        if($k=="name") continue;
-                        if($k == "value") $k = "default";
-                        $atts .= "$k='$v' ";
-                    }
-                }
-                if (isset($prefData["pluginId"])) {
-                    $atts .=  "pluginId='".$prefData["pluginId"]."' ";
-                }
-                if ($prefData["type"] == "string") {
-                    $buffer.="<pref name=\"$prefName\" value=\"".$prefData["value"]."\" $atts/>";
-                } else if ($prefData["type"] == "json") {
-                    $buffer.="<pref name=\"$prefName\" $atts><![CDATA[".$prefData["value"]."]]></pref>";
-                }
-            }
-            $buffer.="</preferences>";
-            $buffer.="<special_rights is_admin=\"".($loggedUser->isAdmin()?"1":"0")."\"  ".($lock!==false?"lock=\"$lock\"":"")."/>";
-            /*
-            $bMarks = $loggedUser->getBookmarks();
-            if (count($bMarks)) {
-                $buffer.= "<bookmarks>".AJXP_XMLWriter::writeBookmarks($bMarks, false)."</bookmarks>";
-            }
-            */
-            $buffer.="</user>";
-        }
-        return $buffer;
-    }
-
-    /**
-     * Write the repositories access rights in XML format
-     * @static
-     * @param AbstractAjxpUser|null $loggedUser * @internal param bool $details
-     * @return string
-     */
-    public static function writeRepositoriesData($loggedUser)
-    {
-        $st = "<repositories>";
-        $streams = ConfService::detectRepositoryStreams(false);
-
-        $exposed = array();
-        $cacheHasExposed = AJXP_PluginsService::getInstance()->loadFromPluginQueriesCache("//server_settings/param[contains(@scope,'repository') and @expose='true']");
-        if ($cacheHasExposed !== null && is_array($cacheHasExposed)) {
-            $exposed = $cacheHasExposed;
-        } else {
-            $exposed_props = AJXP_PluginsService::searchAllManifests("//server_settings/param[contains(@scope,'repository') and @expose='true']", "node", false, false, true);
-            foreach($exposed_props as $exposed_prop){
-                $pluginId = $exposed_prop->parentNode->parentNode->getAttribute("id");
-                $paramName = $exposed_prop->getAttribute("name");
-                $paramDefault = $exposed_prop->getAttribute("default");
-                $exposed[] = array("PLUGIN_ID" => $pluginId, "NAME" => $paramName, "DEFAULT" => $paramDefault);
-            }
-            AJXP_PluginsService::getInstance()->storeToPluginQueriesCache("//server_settings/param[contains(@scope,'repository') and @expose='true']", $exposed);
-        }
-
-        $accessible = ConfService::getAccessibleRepositories($loggedUser, false, false);
-
-        $inboxStatus = 0;
-        foreach($accessible as $repoId => $repoObject){
-            if(!$repoObject->hasContentFilter()) {
-                continue;
-            }
-            $accessStatus = $repoObject->getAccessStatus();
-            if(empty($accessStatus) && $loggedUser != null){
-                $lastConnected = $loggedUser->getArrayPref("repository_last_connected", $repoId);
-                if(empty($lastConnected)){
-                    $accessStatus = 1;
-                }
-            }
-            if(!empty($accessStatus)){
-                $inboxStatus ++;
-            }
-        }
-
-        foreach ($accessible as $repoId => $repoObject) {
-            if(!isSet($_SESSION["CURRENT_MINISITE"]) && $repoObject->hasContentFilter()){
-                continue;
-            }
-            $accessStatus = '';
-            if($repoObject->getAccessType() == "inbox"){
-                $accessStatus = $inboxStatus;
-            }
-            $xmlString = self::repositoryToXML($repoId, $repoObject, $exposed, $streams, $loggedUser, $accessStatus);
-            $st .= $xmlString;
-        }
-
-        $st .= "</repositories>";
-        return $st;
-    }
-
-    /**
-     * @param string $repoId
-     * @param Repository $repoObject
-     * @param array $exposed
-     * @param array $streams
-     * @param AbstractAjxpUser $loggedUser
-     * @param string $accessStatus
-     * @return string
-     * @throws Exception
-     */
-    public static function repositoryToXML($repoId, $repoObject, $exposed, $streams, $loggedUser, $accessStatus = ""){
-
-
-        $statusString = " repository_type=\"".$repoObject->getRepositoryType()."\"";
-        if(empty($accessStatus)){
-            $accessStatus = $repoObject->getAccessStatus();
-        }
-        if(!empty($accessStatus)){
-            $statusString .= " access_status=\"$accessStatus\" ";
-        }else if($loggedUser != null){
-            $lastConnected = $loggedUser->getArrayPref("repository_last_connected", $repoId);
-            if(!empty($lastConnected)) $statusString .= " last_connection=\"$lastConnected\" ";
-        }
-
-        $streamString = "";
-        if (in_array($repoObject->accessType, $streams)) {
-            $streamString = "allowCrossRepositoryCopy=\"true\"";
-        }
-        if ($repoObject->getUniqueUser()) {
-            $streamString .= " user_editable_repository=\"true\" ";
-        }
-        if ($repoObject->hasContentFilter()){
-            $streamString .= " hasContentFilter=\"true\"";
-        }
-        $slugString = "";
-        $slug = $repoObject->getSlug();
-        if (!empty($slug)) {
-            $slugString = "repositorySlug=\"$slug\"";
-        }
-        $isSharedString = "";
-        $currentUserIsOwner = false;
-        $ownerLabel = null;
-        if ($repoObject->hasOwner()) {
-            $uId = $repoObject->getOwner();
-            if(AuthService::usersEnabled() && AuthService::getLoggedUser()->getId() == $uId){
-                $currentUserIsOwner = true;
-            }
-            $label = ConfService::getUserPersonalParameter("USER_DISPLAY_NAME", $uId, "core.conf", $uId);
-            $ownerLabel = $label;
-            $isSharedString =  'owner="'.AJXP_Utils::xmlEntities($label).'"';
-        }
-        if ($repoObject->securityScope() == "USER" || $currentUserIsOwner){
-            $streamString .= " userScope=\"true\"";
-        }
-
-        $descTag = "";
-        $public = false;
-        if(!empty($_SESSION["CURRENT_MINISITE"])) $public = true;
-        $description = $repoObject->getDescription($public, $ownerLabel);
-        if (!empty($description)) {
-            $descTag = '<description>'.AJXP_Utils::xmlEntities($description, true).'</description>';
-        }
-        $roleString="";
-        if($loggedUser != null){
-            $merged = $loggedUser->mergedRole;
-            $params = array();
-            foreach($exposed as $exposed_prop){
-                $metaOptions = $repoObject->getOption("META_SOURCES");
-                if(!isSet($metaOptions[$exposed_prop["PLUGIN_ID"]])){
-                    continue;
-                }
-                $value = $exposed_prop["DEFAULT"];
-                if(isSet($metaOptions[$exposed_prop["PLUGIN_ID"]][$exposed_prop["NAME"]])){
-                    $value = $metaOptions[$exposed_prop["PLUGIN_ID"]][$exposed_prop["NAME"]];
-                }
-                $value = $merged->filterParameterValue($exposed_prop["PLUGIN_ID"], $exposed_prop["NAME"], $repoId, $value);
-                if($value !== null){
-                    if($value === true  || $value === false) $value = ($value === true ?"true":"false");
-                    $params[] = '<repository_plugin_param plugin_id="'.$exposed_prop["PLUGIN_ID"].'" name="'.$exposed_prop["NAME"].'" value="'.AJXP_Utils::xmlEntities($value).'"/>';
-                    $roleString .= str_replace(".", "_",$exposed_prop["PLUGIN_ID"])."_".$exposed_prop["NAME"].'="'.AJXP_Utils::xmlEntities($value).'" ';
-                }
-            }
-            $roleString.='acl="'.$merged->getAcl($repoId).'"';
-            if($merged->hasMask($repoId)){
-                $roleString.= ' hasMask="true" ';
-            }
-        }
-        return "<repo access_type=\"".$repoObject->accessType."\" id=\"".$repoId."\"$statusString $streamString $slugString $isSharedString $roleString><label>".SystemTextEncoding::toUTF8(AJXP_Utils::xmlEntities($repoObject->getDisplay()))."</label>".$descTag.$repoObject->getClientSettings()."</repo>";
-
-    }
-
-    /**
-     * Writes a <logging_result> tag
-     * @static
-     * @param integer $result
-     * @param string $rememberLogin
-     * @param string $rememberPass
-     * @param string $secureToken
-     * @return void
-     */
-    public static function loggingResult($result, $rememberLogin="", $rememberPass = "", $secureToken="")
-    {
-        $remString = "";
-        if ($rememberPass != "" && $rememberLogin!= "") {
-            $remString = " remember_login=\"$rememberLogin\" remember_pass=\"$rememberPass\"";
-        }
-        if ($secureToken != "") {
-            $remString .= " secure_token=\"$secureToken\"";
-        }
-        print("<logging_result value=\"$result\"$remString/>");
-    }
-
-    /**
-     * Create plain PHP associative array from XML.
-     *
-     * Example usage:
-     *   $xmlNode = simplexml_load_file('example.xml');
-     *   $arrayData = xmlToArray($xmlNode);
-     *   echo json_encode($arrayData);
-     *
-     * @param \DOMNode $domXml The dom node to load
-     * @param array $options Associative array of options
-     * @return array
-     * @link http://outlandishideas.co.uk/blog/2012/08/xml-to-json/ More info
-     * @author Tamlyn Rhodes <http://tamlyn.org>
-     * @license http://creativecommons.org/publicdomain/mark/1.0/ Public Domain
-     */
-    public static function xmlToArray($domXml, $options = array()) {
-        $xml = simplexml_import_dom($domXml);
-        $defaults = array(
-            'namespaceSeparator' => ':',//you may want this to be something other than a colon
-            'attributePrefix' => '@',   //to distinguish between attributes and nodes with the same name
-            'alwaysArray' => array(),   //array of xml tag names which should always become arrays
-            'autoArray' => true,        //only create arrays for tags which appear more than once
-            'textContent' => '$',       //key used for the text content of elements
-            'autoText' => true,         //skip textContent key if node has no attributes or child nodes
-            'keySearch' => false,       //optional search and replace on tag and attribute names
-            'keyReplace' => false       //replace values for above search values (as passed to str_replace())
-        );
-        $options = array_merge($defaults, $options);
-        $namespaces = $xml->getDocNamespaces();
-        $namespaces[''] = null; //add base (empty) namespace
-
-        //get attributes from all namespaces
-        $attributesArray = array();
-        foreach ($namespaces as $prefix => $namespace) {
-            foreach ($xml->attributes($namespace) as $attributeName => $attribute) {
-                //replace characters in attribute name
-                if ($options['keySearch']) $attributeName =
-                    str_replace($options['keySearch'], $options['keyReplace'], $attributeName);
-                $attributeKey = $options['attributePrefix']
-                    . ($prefix ? $prefix . $options['namespaceSeparator'] : '')
-                    . $attributeName;
-                $attributesArray[$attributeKey] = (string)$attribute;
-            }
-        }
-
-        //get child nodes from all namespaces
-        $tagsArray = array();
-        foreach ($namespaces as $prefix => $namespace) {
-            foreach ($xml->children($namespace) as $childXml) {
-                //recurse into child nodes
-                $childArray = self::xmlToArray($childXml, $options);
-                list($childTagName, $childProperties) = each($childArray);
-
-                //replace characters in tag name
-                if ($options['keySearch']) $childTagName =
-                    str_replace($options['keySearch'], $options['keyReplace'], $childTagName);
-                //add namespace prefix, if any
-                if ($prefix) $childTagName = $prefix . $options['namespaceSeparator'] . $childTagName;
-
-                if (!isset($tagsArray[$childTagName])) {
-                    //only entry with this key
-                    //test if tags of this type should always be arrays, no matter the element count
-                    $tagsArray[$childTagName] =
-                        in_array($childTagName, $options['alwaysArray']) || !$options['autoArray']
-                            ? array($childProperties) : $childProperties;
-                } elseif (
-                    is_array($tagsArray[$childTagName]) && array_keys($tagsArray[$childTagName])
-                    === range(0, count($tagsArray[$childTagName]) - 1)
-                ) {
-                    //key already exists and is integer indexed array
-                    $tagsArray[$childTagName][] = $childProperties;
-                } else {
-                    //key exists so convert to integer indexed array with previous value in position 0
-                    $tagsArray[$childTagName] = array($tagsArray[$childTagName], $childProperties);
-                }
-            }
-        }
-
-        //get text content of node
-        $textContentArray = array();
-        $plainText = trim((string)$xml);
-        if ($plainText !== '') $textContentArray[$options['textContent']] = $plainText;
-
-        //stick it all together
-        $propertiesArray = !$options['autoText'] || $attributesArray || $tagsArray || ($plainText === '')
-            ? array_merge($attributesArray, $tagsArray, $textContentArray) : $plainText;
-
-        //return node as array
-        return array(
-            $xml->getName() => $propertiesArray
-        );
-    }
-
-}
diff --git a/core/src/core/classes/class.AbstractTest.php b/core/src/core/classes/class.AbstractTest.php
deleted file mode 100644
index d248508d0b..0000000000
--- a/core/src/core/classes/class.AbstractTest.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-global $MAIN_testsArray;
-/**
- * Abstract test class
- * Abstract class for diagnostic tests. These tests are run at the first application start up, and their
- * results are displayed in the Diagnostic page. It's possible to re-run the full diagnostic by calling
- * the runTests.php script (first line needs to be commented first).
- * @package Pydio
- * @subpackage Core
- */
-class AbstractTest
-{
-    /** The test name */
-    public $name;
-    /** The test information when failed */
-    public $failedInfo;
-    /** The test results output (used for report) */
-    public $resultOutput;
-    /** Tested params - When used as a diagnostic tool, can store variables used by the test*/
-    public $testedParas;
-    /** The test level when failed (warning, info or error, default to error) */
-    public $failedLevel;
-    /** The test parameters */
-    public $params;
-
-    public function __construct($name, $failedInfo, $params = NULL)
-    {
-        $this->name = $name;
-        $this->failedInfo = $failedInfo;
-        $this->params = $params;
-        $this->failedLevel = "error";
-        $this->testedParams = array();
-        global $MAIN_testsArray;
-        $MAIN_testsArray[] = $this;
-    }
-
-    /**
-     * Perform the test, should be overwritten in concrete classes
-     * @abstract
-     * @return Boolean
-     */
-    public function doTest() { return FALSE; }
-
-    /**
-     * Perform the test on a given repository object, should be overwritten in concrete classes
-     * @param Repository $repository
-     * @return Boolean
-     */
-    public function doRepositoryTest($repository) { return FALSE; }
-
-    /**
-     * Utilitary to convert php config to numerical values.
-     *
-     * @param String $val
-     * @return Integer
-     */
-    public function returnBytes($val)
-    {
-        $val = trim($val);
-        $last = strtolower($val[strlen($val)-1]);
-        switch ($last) {
-            // Le modifieur 'G' est disponible depuis PHP 5.1.0
-            case 'g':
-                $val *= 1024 * 1024 * 1024;
-                break;
-            case 'm':
-                $val *= 1024 * 1024;
-                break;
-            case 'k':
-                $val *= 1024;
-                break;
-            default:
-                break;
-        }
-
-        return $val;
-    }
-};
diff --git a/core/src/core/classes/class.AjxpRole.php b/core/src/core/classes/class.AjxpRole.php
deleted file mode 100644
index 15a859f818..0000000000
--- a/core/src/core/classes/class.AjxpRole.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Authentication "role" concept : set of permissions that can be applied to
- * one or more users, plus set of actions to be disabled.
- * @package Pydio
- * @subpackage Core
- * @deprecated use AJXP_Role instead. Still present in package for automatic migration.
- */
-class AjxpRole implements AjxpGroupPathProvider
-{
-    private $id;
-    private $rights = array();
-    private $default = false;
-    /**
-     * @var String
-     */
-    protected $groupPath;
-    /**
-     * Constructor
-     * @param string $id
-     * @return void
-     */
-    public function __construct($id)
-    {
-        $this->id = $id;
-    }
-    /**
-     * @param $id
-     * @return void
-     */
-    public function setId($id)
-    {
-        $this->id = $id;
-    }
-    /**
-     * @return string
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-    /**
-     * Whether this role can read the given repo
-     * @param string $rootDirId Repository ID
-     * @return bool
-     */
-    public function canRead($rootDirId)
-    {
-        $right = $this->getRight($rootDirId);
-        if($right == "rw" || $right == "r") return true;
-        return false;
-    }
-
-    /**
-     * Whether this role can write the given repo
-     * @param string $rootDirId Repository ID
-     * @return bool
-     */
-    public function canWrite($rootDirId)
-    {
-        $right = $this->getRight($rootDirId);
-        if($right == "rw" || $right == "w") return true;
-        return false;
-    }
-
-    /**
-     * Current definitioon (r, rw, w, empty string) for the given repo
-     * @param string $rootDirId Repository ID
-     * @return string
-     */
-    public function getRight($rootDirId)
-    {
-        if(isSet($this->rights[$rootDirId])) return $this->rights[$rootDirId];
-        return "";
-    }
-
-    /**
-     * Set the right
-     * @param string $rootDirId Repo id
-     * @param string $rightString ("r", "rw", "w", "")
-     * @return void
-     */
-    public function setRight($rootDirId, $rightString)
-    {
-        $this->rights[$rootDirId] = $rightString;
-    }
-    /**
-     * Remove a right entry for the repository
-     * @param string $rootDirId
-     * @return void
-     */
-    public function removeRights($rootDirId)
-    {
-        if(isSet($this->rights[$rootDirId])) unset($this->rights[$rootDirId]);
-    }
-    /**
-     * Remove all rights
-     * @return void
-     */
-    public function clearRights()
-    {
-        $this->rights = array();
-    }
-    /**
-     * Get the specific actions rights (see setSpecificActionsRights)
-     * @param $rootDirId
-     * @return array
-     */
-    public function getSpecificActionsRights($rootDirId)
-    {
-        $res = array();
-        if ($rootDirId."" != "ajxp.all") {
-            $res = $this->getSpecificActionsRights("ajxp.all");
-        }
-        if (isSet($this->rights["ajxp.actions"]) && isSet($this->rights["ajxp.actions"][$rootDirId])) {
-            $res = array_merge($res, $this->rights["ajxp.actions"][$rootDirId]);
-        }
-        return $res;
-    }
-    /**
-     * This method allows to specifically disable some actions for a given role for one or more repository.
-     * @param string $rootDirId Repository id or "ajxp.all" for all repositories
-     * @param string $actionName
-     * @param bool $allowed
-     * @return void
-     */
-    public function setSpecificActionRight($rootDirId, $actionName, $allowed)
-    {
-        if(!isSet($this->rights["ajxp.actions"])) $this->rights["ajxp.actions"] = array();
-        if(!isset($this->rights["ajxp.actions"][$rootDirId])) $this->rights["ajxp.actions"][$rootDirId] = array();
-        $this->rights["ajxp.actions"][$rootDirId][$actionName] = $allowed;
-    }
-
-    public function setDefault($default)
-    {
-        $this->default = $default;
-    }
-
-    public function isDefault()
-    {
-        return $this->default;
-    }
-
-    /**
-     * @param String $groupPath
-     */
-    public function setGroupPath($groupPath)
-    {
-        $this->groupPath = $groupPath;
-    }
-
-    /**
-     * @return String
-     */
-    public function getGroupPath()
-    {
-        return $this->groupPath;
-    }
-
-}
diff --git a/core/src/core/classes/class.AuthService.php b/core/src/core/classes/class.AuthService.php
deleted file mode 100644
index d84d4a9fdc..0000000000
--- a/core/src/core/classes/class.AuthService.php
+++ /dev/null
@@ -1,1331 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Static access to the authentication mechanism. Encapsulates the authDriver implementation
- * @package Pydio
- * @subpackage Core
- */
-class AuthService
-{
-    public static $cacheRoles = false;
-    public static $roles;
-    public static $useSession = true;
-    private static $currentUser;
-    public static $bufferedMessage = null;
-    /**
-     * Whether the whole users management system is enabled or not.
-     * @static
-     * @return bool
-     */
-    public static function usersEnabled()
-    {
-        return ConfService::getCoreConf("ENABLE_USERS", "auth");
-    }
-    /**
-     * Whether the current auth driver supports password update or not
-     * @static
-     * @return bool
-     */
-    public static function changePasswordEnabled()
-    {
-        $authDriver = ConfService::getAuthDriverImpl();
-        return $authDriver->passwordsEditable();
-    }
-    /**
-     * Get a unique seed from the current auth driver
-     * @static
-     * @return int|string
-     */
-    public static function generateSeed()
-    {
-        $authDriver = ConfService::getAuthDriverImpl();
-        return $authDriver->getSeed(true);
-    }
-
-    /**
-     * Put a secure token in the session
-     * @static
-     * @return string
-     */
-    public static function generateSecureToken()
-    {
-        if(!isSet($_SESSION["SECURE_TOKENS"])){
-            $_SESSION["SECURE_TOKENS"] = array();
-        }
-        if(isSet($_SESSION["FORCE_SECURE_TOKEN"])){
-            $_SESSION["SECURE_TOKENS"][] = $_SESSION["FORCE_SECURE_TOKEN"];
-            return $_SESSION["FORCE_SECURE_TOKEN"];
-        }
-        $newToken = AJXP_Utils::generateRandomString(32); //md5(time());
-        $_SESSION["SECURE_TOKENS"][] = $newToken;
-        return $newToken;
-    }
-    /**
-     * Get the secure token from the session
-     * @static
-     * @return string|bool
-     */
-    public static function getSecureToken()
-    {
-        if(isSet($_SESSION["SECURE_TOKENS"]) && count($_SESSION["SECURE_TOKENS"])){
-            return true;
-        }
-        return false;
-        //return (isSet($_SESSION["SECURE_TOKENS"])?$_SESSION["SECURE_TOKEN"]:FALSE);
-    }
-    /**
-     * Verify a secure token value from the session
-     * @static
-     * @param string $token
-     * @return bool
-     */
-    public static function checkSecureToken($token)
-    {
-        if (isSet($_SESSION["SECURE_TOKENS"]) && in_array($token, $_SESSION["SECURE_TOKENS"])) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Get the currently logged user object
-     * @return AbstractAjxpUser
-     */
-    public static function getLoggedUser()
-    {
-        if (self::$useSession && isSet($_SESSION["AJXP_USER"])) {
-            if (is_a($_SESSION["AJXP_USER"], "__PHP_Incomplete_Class")) {
-                session_unset();
-                return null;
-            }
-            return $_SESSION["AJXP_USER"];
-        }
-        if(!self::$useSession && isSet(self::$currentUser)) return self::$currentUser;
-        return null;
-    }
-    /**
-     * Call the preLogUser() functino on the auth driver implementation
-     * @static
-     * @param Array $httpVars
-     * @return void
-     */
-    public static function preLogUser($httpVars)
-    {
-        if(self::getLoggedUser() != null && self::getLoggedUser()->getId() != "guest") return ;
-
-        $frontends = AJXP_PluginsService::getInstance()->getActivePluginsForType("authfront");
-        $index = 0;
-        /**
-         * @var AbstractAuthFrontend $frontendPlugin
-         */
-        foreach($frontends as $frontendPlugin){
-            if(!$frontendPlugin->isEnabled()) continue;
-            if(!method_exists($frontendPlugin, "tryToLogUser")){
-                AJXP_Logger::error(__CLASS__, __FUNCTION__, "Trying to use an authfront plugin without tryToLogUser method. Wrongly initialized?");
-                continue;
-            }
-            $res = $frontendPlugin->tryToLogUser($httpVars, ($index == count($frontends)-1));
-            $index ++;
-            if($res) break;
-        }
-        // Keep old-fashioned test, should be removed
-        $authDriver = ConfService::getAuthDriverImpl();
-        $authDriver->preLogUser((isSet($httpVars["remote_session"])?$httpVars["remote_session"]:""));
-
-        return ;
-    }
-    /**
-     * The array is located in the AjxpTmpDir/failedAJXP.log
-     * @static
-     * @return array
-     */
-    public static function getBruteForceLoginArray()
-    {
-        $failedLog = AJXP_Utils::getAjxpTmpDir()."/failedAJXP.log";
-        $loginAttempt = @file_get_contents($failedLog);
-        $loginArray = unserialize($loginAttempt);
-        $ret = array();
-        $curTime = time();
-        if (is_array($loginArray)) {
-            // Filter the array (all old time are cleaned)
-            foreach ($loginArray as $key => $login) {
-                if (($curTime - $login["time"]) <= 60 * 60 * 24) $ret[$key] = $login;
-            }
-        }
-        return $ret;
-    }
-    /**
-     * Store the array
-     * @static
-     * @param $loginArray
-     * @return void
-     */
-    public static function setBruteForceLoginArray($loginArray)
-    {
-        $failedLog = AJXP_Utils::getAjxpTmpDir()."/failedAJXP.log";
-        @file_put_contents($failedLog, serialize($loginArray));
-    }
-    /**
-     * Determines whether the user is try to make many attemps
-     * @static
-     * @param $loginArray
-     * @return bool
-     */
-    public static function checkBruteForceLogin(&$loginArray)
-    {
-        if (isSet($_SERVER['REMOTE_ADDR'])) {
-            $serverAddress = $_SERVER['REMOTE_ADDR'];
-        } else if(isSet($_SERVER['SERVER_ADDR'])) {
-            $serverAddress = $_SERVER['SERVER_ADDR'];
-        } else {
-            return TRUE;
-        }
-        $login = null;
-        if (isSet($loginArray[$serverAddress])) {
-            $login = $loginArray[$serverAddress];
-        }
-        if (is_array($login)) {
-            $login["count"]++;
-        } else $login = array("count"=>1, "time"=>time());
-        $loginArray[$serverAddress] = $login;
-        if ($login["count"] > 3) {
-            if (AJXP_SERVER_DEBUG || ConfService::getCoreConf("DISABLE_BRUTE_FORCE_CHECK", "auth") === true) {
-                AJXP_Logger::debug("Warning: failed login 3 time from address $serverAddress, but ignored because captcha is disabled.");
-                return true;
-            }
-            return FALSE;
-        }
-        return TRUE;
-    }
-    /**
-     * Is there a brute force login attempt?
-     * @static
-     * @return bool
-     */
-    public static function suspectBruteForceLogin()
-    {
-        $loginAttempt = self::getBruteForceLoginArray();
-        return !self::checkBruteForceLogin($loginAttempt);
-    }
-
-    public static function filterUserSensitivity($user)
-    {
-        if (!ConfService::getCoreConf("CASE_SENSITIVE", "auth")) {
-            return strtolower($user);
-        } else {
-            return $user;
-        }
-    }
-
-    public static function ignoreUserCase()
-    {
-        return !ConfService::getCoreConf("CASE_SENSITIVE", "auth");
-    }
-
-    /**
-     * @static
-     * @param AbstractAjxpUser $user
-     */
-    public static function refreshRememberCookie($user)
-    {
-        $current = $_COOKIE["AjaXplorer-remember"];
-        if (!empty($current)) {
-            $user->invalidateCookieString(substr($current, strpos($current, ":")+1));
-        }
-        $rememberPass = $user->getCookieString();
-        setcookie("AjaXplorer-remember", $user->id.":".$rememberPass, time()+3600*24*10, null, null, (isSet($_SERVER["HTTPS"]) && strtolower($_SERVER["HTTPS"]) == "on"), true);
-    }
-
-    /**
-     * @static
-     * @return bool
-     */
-    public static function hasRememberCookie()
-    {
-        return (isSet($_COOKIE["AjaXplorer-remember"]) && !empty($_COOKIE["AjaXplorer-remember"]));
-    }
-
-    /**
-     * @static
-     * Warning, must be called before sending other headers!
-     */
-    public static function clearRememberCookie()
-    {
-        $current = $_COOKIE["AjaXplorer-remember"];
-        $user = self::getLoggedUser();
-        if (!empty($current) && $user != null) {
-            $user->invalidateCookieString(substr($current, strpos($current, ":")+1));
-        }
-        setcookie("AjaXplorer-remember", "", time()-3600, null, null, (isSet($_SERVER["HTTPS"]) && strtolower($_SERVER["HTTPS"]) == "on"), true);
-    }
-
-    public static function logTemporaryUser($parentUserId, $temporaryUserId)
-    {
-        $parentUserId = self::filterUserSensitivity($parentUserId);
-        $temporaryUserId = self::filterUserSensitivity($temporaryUserId);
-        $confDriver = ConfService::getConfStorageImpl();
-        $parentUser = $confDriver->createUserObject($parentUserId);
-        $temporaryUser = $confDriver->createUserObject($temporaryUserId);
-        $temporaryUser->mergedRole = $parentUser->mergedRole;
-        $temporaryUser->rights = $parentUser->rights;
-        $temporaryUser->setGroupPath($parentUser->getGroupPath());
-        $temporaryUser->setParent($parentUserId);
-        $temporaryUser->setResolveAsParent(true);
-        AJXP_Logger::info(__CLASS__,"Log in", array("temporary user" => $temporaryUserId, "owner" => $parentUserId));
-        self::updateUser($temporaryUser);
-    }
-
-    public static function clearTemporaryUser($temporaryUserId)
-    {
-        AJXP_Logger::info(__CLASS__,"Log out", array("temporary user" => $temporaryUserId));
-        if (isSet($_SESSION["AJXP_USER"]) || isSet(self::$currentUser)) {
-            AJXP_Logger::info(__CLASS__, "Log Out", "");
-            unset($_SESSION["AJXP_USER"]);
-            if(isSet(self::$currentUser)) unset(self::$currentUser);
-            if (ConfService::getCoreConf("SESSION_SET_CREDENTIALS", "auth")) {
-                AJXP_Safe::clearCredentials();
-            }
-        }
-    }
-
-    /**
-     * Log the user from its credentials
-     * @static
-     * @param string $user_id The user id
-     * @param string $pwd The password
-     * @param bool $bypass_pwd Ignore password or not
-     * @param bool $cookieLogin Is it a logging from the remember me cookie?
-     * @param string $returnSeed The unique seed
-     * @return int
-     */
-    public static function logUser($user_id, $pwd, $bypass_pwd = false, $cookieLogin = false, $returnSeed="")
-    {
-        $user_id = self::filterUserSensitivity($user_id);
-        if ($cookieLogin && !isSet($_COOKIE["AjaXplorer-remember"])) {
-            return -5; // SILENT IGNORE
-        }
-        if ($cookieLogin) {
-            list($user_id, $pwd) = explode(":", $_COOKIE["AjaXplorer-remember"]);
-        }
-        $confDriver = ConfService::getConfStorageImpl();
-        if ($user_id == null) {
-            if (self::$useSession) {
-                if(isSet($_SESSION["AJXP_USER"]) && is_object($_SESSION["AJXP_USER"])) {
-                    /**
-                     * @var AbstractAjxpUser $u
-                     */
-                    $u = $_SESSION["AJXP_USER"];
-                    if($u->reloadRolesIfRequired()){
-                        ConfService::getInstance()->invalidateLoadedRepositories();
-                        self::$bufferedMessage = AJXP_XMLWriter::reloadRepositoryList(false);
-                        $_SESSION["AJXP_USER"] = $u;
-                    }
-                    return 1;
-                }
-            } else {
-                if(isSet(self::$currentUser) && is_object(self::$currentUser)) return 1;
-            }
-            if (ConfService::getCoreConf("ALLOW_GUEST_BROWSING", "auth") && !isSet($_SESSION["CURRENT_MINISITE"])) {
-                $authDriver = ConfService::getAuthDriverImpl();
-                if (!$authDriver->userExists("guest")) {
-                    self::createUser("guest", "");
-                    $guest = $confDriver->createUserObject("guest");
-                    $guest->save("superuser");
-                }
-                self::logUser("guest", null);
-                return 1;
-            }
-            return -1;
-        }
-        $authDriver = ConfService::getAuthDriverImpl();
-        // CHECK USER PASSWORD HERE!
-        $loginAttempt = self::getBruteForceLoginArray();
-        $bruteForceLogin = self::checkBruteForceLogin($loginAttempt);
-        self::setBruteForceLoginArray($loginAttempt);
-
-        if (!$authDriver->userExists($user_id)) {
-            AJXP_Logger::warning(__CLASS__, "Login failed", array("user" => AJXP_Utils::sanitize($user_id, AJXP_SANITIZE_EMAILCHARS), "error" => "Invalid user"));
-            if ($bruteForceLogin === FALSE) {
-                return -4;
-            } else {
-                return -1;
-            }
-        }
-        if (!$bypass_pwd) {
-            if (!self::checkPassword($user_id, $pwd, $cookieLogin, $returnSeed)) {
-                AJXP_Logger::warning(__CLASS__, "Login failed", array("user" => AJXP_Utils::sanitize($user_id, AJXP_SANITIZE_EMAILCHARS), "error" => "Invalid password"));
-                if ($bruteForceLogin === FALSE) {
-                    return -4;
-                } else {
-                    if($cookieLogin) return -5;
-                    return -1;
-                }
-            }
-        }
-        // Successful login attempt
-        unset($loginAttempt[$_SERVER["REMOTE_ADDR"]]);
-        self::setBruteForceLoginArray($loginAttempt);
-
-        // Setting session credentials if asked in config
-        if (ConfService::getCoreConf("SESSION_SET_CREDENTIALS", "auth")) {
-            list($authId, $authPwd) = $authDriver->filterCredentials($user_id, $pwd);
-            AJXP_Safe::storeCredentials($authId, $authPwd);
-        }
-
-        $user = $confDriver->createUserObject($user_id);
-        if ($user->getLock() == "logout") {
-            AJXP_Logger::warning(__CLASS__, "Login failed", array("user" => AJXP_Utils::sanitize($user_id, AJXP_SANITIZE_EMAILCHARS), "error" => "Locked user"));
-            return -1;
-        }
-
-        if(AuthService::$useSession && ConfService::getCoreConf("ALLOW_GUEST_BROWSING", "auth")){
-            ConfService::getInstance()->invalidateLoadedRepositories();
-        }
-
-        if ($authDriver->isAjxpAdmin($user_id)) {
-            $user->setAdmin(true);
-        }
-        if(self::$useSession) $_SESSION["AJXP_USER"] = $user;
-        else self::$currentUser = $user;
-
-        if ($user->isAdmin()) {
-            $user = self::updateAdminRights($user);
-            self::updateUser($user);
-        }
-
-        if ($authDriver->autoCreateUser() && !$user->storageExists()) {
-            $user->save("superuser"); // make sure update rights now
-        }
-        AJXP_Logger::info(__CLASS__, "Log In", array("context"=>self::$useSession?"WebUI":"API"));
-        return 1;
-    }
-    /**
-     * Store the object in the session
-     * @static
-     * @param $userObject
-     * @return void
-     */
-    public static function updateUser($userObject)
-    {
-        if(self::$useSession) $_SESSION["AJXP_USER"] = $userObject;
-        else self::$currentUser = $userObject;
-    }
-    /**
-     * Clear the session
-     * @static
-     * @return void
-     */
-    public static function disconnect()
-    {
-        if (isSet($_SESSION["AJXP_USER"]) || isSet(self::$currentUser)) {
-            $user = isSet($_SESSION["AJXP_USER"]) ? $_SESSION["AJXP_USER"] : self::$currentUser;
-            $userId = $user->id;
-            AJXP_Controller::applyHook("user.before_disconnect", array($user));
-            self::clearRememberCookie();
-            AJXP_Logger::info(__CLASS__, "Log Out", "");
-            unset($_SESSION["AJXP_USER"]);
-            if(isSet(self::$currentUser)) unset(self::$currentUser);
-            if (ConfService::getCoreConf("SESSION_SET_CREDENTIALS", "auth")) {
-                AJXP_Safe::clearCredentials();
-            }
-            AJXP_Controller::applyHook("user.after_disconnect", array($userId));
-        }
-    }
-    /**
-     * Specific operations to perform at boot time
-     * @static
-     * @param array $START_PARAMETERS A HashTable of parameters to send back to the client
-     * @return void
-     */
-    public static function bootSequence(&$START_PARAMETERS)
-    {
-        if(AJXP_Utils::detectApplicationFirstRun()) return;
-        if(file_exists(AJXP_CACHE_DIR."/admin_counted")) return;
-        $rootRole = self::getRole("AJXP_GRP_/", false);
-        if ($rootRole === false) {
-            $rootRole = new AJXP_Role("AJXP_GRP_/");
-            $rootRole->setLabel("Root Group");
-            //$rootRole->setAutoApplies(array("standard", "admin"));
-            //$dashId = "";
-            $allRepos = ConfService::getRepositoriesList("all", false);
-            foreach ($allRepos as $repositoryId => $repoObject) {
-                if($repoObject->isTemplate) continue;
-                //if($repoObject->getAccessType() == "ajxp_user") $dashId = $repositoryId;
-                $gp = $repoObject->getGroupPath();
-                if (empty($gp) || $gp == "/") {
-                    if ($repoObject->getDefaultRight() != "") {
-                        $rootRole->setAcl($repositoryId, $repoObject->getDefaultRight());
-                    }
-                }
-            }
-            //if(!empty($dashId)) $rootRole->setParameterValue("core.conf", "DEFAULT_START_REPOSITORY", $dashId);
-            $paramNodes = AJXP_PluginsService::searchAllManifests("//server_settings/param[@scope]", "node", false, false, true);
-            if (is_array($paramNodes) && count($paramNodes)) {
-                foreach ($paramNodes as $xmlNode) {
-                    $default = $xmlNode->getAttribute("default");
-                    if(empty($default)) continue;
-                    $parentNode = $xmlNode->parentNode->parentNode;
-                    $pluginId = $parentNode->getAttribute("id");
-                    if (empty($pluginId)) {
-                        $pluginId = $parentNode->nodeName.".".$parentNode->getAttribute("name");
-                    }
-                    $rootRole->setParameterValue($pluginId, $xmlNode->getAttribute("name"), $default);
-                }
-            }
-            self::updateRole($rootRole);
-        }
-        $miniRole = self::getRole("MINISITE", false);
-        if ($miniRole === false) {
-            $rootRole = new AJXP_Role("MINISITE");
-            $rootRole->setLabel("Minisite Users");
-            $actions = array(
-                "access.fs" => array("ajxp_link", "chmod", "purge"),
-                "meta.watch" => array("toggle_watch"),
-                "conf.serial"=> array("get_bookmarks"),
-                "conf.sql"=> array("get_bookmarks"),
-                "index.lucene" => array("index"),
-                "action.share" => array("share", "share-edit-shared", "share-folder-workspace", "share-file-minisite", "share-selection-minisite", "share-folder-minisite-public"),
-                "gui.ajax" => array("bookmark"),
-                "auth.serial" => array("pass_change"),
-                "auth.sql" => array("pass_change"),
-            );
-            foreach ($actions as $pluginId => $acts) {
-                foreach ($acts as $act) {
-                    $rootRole->setActionState($pluginId, $act, AJXP_REPO_SCOPE_SHARED, false);
-                }
-            }
-            self::updateRole($rootRole);
-        }
-        $miniRole = self::getRole("MINISITE_NODOWNLOAD", false);
-        if ($miniRole === false) {
-            $rootRole = new AJXP_Role("MINISITE_NODOWNLOAD");
-            $rootRole->setLabel("Minisite Users - No Download");
-            $actions = array(
-                "access.fs" => array("download", "download_chunk", "prepare_chunk_dl", "download_all")
-            );
-            foreach ($actions as $pluginId => $acts) {
-                foreach ($acts as $act) {
-                    $rootRole->setActionState($pluginId, $act, AJXP_REPO_SCOPE_SHARED, false);
-                }
-            }
-            self::updateRole($rootRole);
-        }
-        $miniRole = self::getRole("GUEST", false);
-        if ($miniRole === false) {
-            $rootRole = new AJXP_Role("GUEST");
-            $rootRole->setLabel("Guest user role");
-            $actions = array(
-                "access.fs" => array("purge"),
-                "meta.watch" => array("toggle_watch"),
-                "index.lucene" => array("index"),
-            );
-            $rootRole->setAutoApplies(array("guest"));
-            foreach ($actions as $pluginId => $acts) {
-                foreach ($acts as $act) {
-                    $rootRole->setActionState($pluginId, $act, AJXP_REPO_SCOPE_ALL);
-                }
-            }
-            self::updateRole($rootRole);
-        }
-        $adminCount = self::countAdminUsers();
-        if ($adminCount == 0) {
-            $authDriver = ConfService::getAuthDriverImpl();
-            $adminPass = ADMIN_PASSWORD;
-            if (!$authDriver->getOptionAsBool("TRANSMIT_CLEAR_PASS")) {
-                $adminPass = md5(ADMIN_PASSWORD);
-            }
-             self::createUser("admin", $adminPass, true);
-             if (ADMIN_PASSWORD == INITIAL_ADMIN_PASSWORD) {
-                 $userObject = ConfService::getConfStorageImpl()->createUserObject("admin");
-                 $userObject->setAdmin(true);
-                 self::updateAdminRights($userObject);
-                 if (self::changePasswordEnabled()) {
-                     $userObject->setLock("pass_change");
-                 }
-                 $userObject->save("superuser");
-                 $START_PARAMETERS["ALERT"] .= "Warning! User 'admin' was created with the initial password '". INITIAL_ADMIN_PASSWORD ."'. \\nPlease log in as admin and change the password now!";
-                self::updateUser($userObject);
-             }
-        } else if ($adminCount == -1) {
-            // Here we may come from a previous version! Check the "admin" user and set its right as admin.
-            $confStorage = ConfService::getConfStorageImpl();
-            $adminUser = $confStorage->createUserObject("admin");
-            $adminUser->setAdmin(true);
-            $adminUser->save("superuser");
-            $START_PARAMETERS["ALERT"] .= "There is an admin user, but without admin right. Now any user can have the administration rights, \\n your 'admin' user was set with the admin rights. Please check that this suits your security configuration.";
-        }
-        file_put_contents(AJXP_CACHE_DIR."/admin_counted", "true");
-
-    }
-    /**
-     * If the auth driver implementatino has a logout redirect URL, clear session and return it.
-     * @static
-     * @param bool $logUserOut
-     * @return bool
-     */
-    public static function getLogoutAddress($logUserOut = true)
-    {
-        $authDriver = ConfService::getAuthDriverImpl();
-        $logout = $authDriver->getLogoutRedirect();
-        if ($logUserOut) {
-            self::disconnect();
-        }
-        return $logout;
-    }
-    /**
-     * Compute the default repository id to log the current user
-     * @static
-     * @return int|string
-     */
-    public static function getDefaultRootId()
-    {
-        $loggedUser = self::getLoggedUser();
-        if($loggedUser == null) return 0;
-        $acls = $loggedUser->mergedRole->listAcls(true);
-        foreach($acls as $key => $right){
-            if (!empty($right) && ConfService::getRepositoryById($key) != null) return $key;
-        }
-        return 0;
-    }
-
-    /**
-     * Update a user with admin rights and return it
-    * @param AbstractAjxpUser $adminUser
-     * @return AbstractAjxpUser
-    */
-    public static function updateAdminRights($adminUser)
-    {
-        if($adminUser->personalRole->getAcl('ajxp_conf') != "rw"){
-            $adminUser->personalRole->setAcl('ajxp_conf', 'rw');
-            $adminUser->recomputeMergedRole();
-            $adminUser->save("superuser");
-        }
-        return $adminUser;
-    }
-
-    /**
-     * Update a user object with the default repositories rights
-     *
-     * @param AbstractAjxpUser $userObject
-     */
-    public static function updateDefaultRights(&$userObject)
-    {
-        if (!$userObject->hasParent()) {
-            /*
-            $changes = false;
-            $repoList = ConfService::getRepositoriesList("all");
-            foreach ($repoList as $repositoryId => $repoObject) {
-                if(!self::allowedForCurrentGroup($repoObject, $userObject)) continue;
-                if($repoObject->isTemplate) continue;
-                if ($repoObject->getDefaultRight() != "") {
-                    $changes = true;
-                    $userObject->personalRole->setAcl($repositoryId, $repoObject->getDefaultRight());
-                }
-            }
-            if ($changes) {
-                $userObject->recomputeMergedRole();
-            }
-            */
-            $rolesList = self::getRolesList(array(), true);
-            foreach ($rolesList as $roleId => $roleObject) {
-                if(!self::allowedForCurrentGroup($roleObject, $userObject)) continue;
-                if ($userObject->getProfile() == "shared" && $roleObject->autoAppliesTo("shared")) {
-                    $userObject->addRole($roleObject);
-                } else if ($roleObject->autoAppliesTo("standard")) {
-                    $userObject->addRole($roleObject);
-                }
-            }
-        }
-    }
-
-    /**
-     * @static
-     * @param AbstractAjxpUser $userObject
-     */
-    public static function updateAutoApplyRole(&$userObject)
-    {
-        $roles = self::getRolesList(array(), true);
-        foreach ($roles as $roleObject) {
-            if(!self::allowedForCurrentGroup($roleObject, $userObject)) continue;
-            if ($roleObject->autoAppliesTo($userObject->getProfile()) || $roleObject->autoAppliesTo("all")) {
-                $userObject->addRole($roleObject);
-            }
-        }
-    }
-
-    public static function updateAuthProvidedData(&$userObject)
-    {
-        ConfService::getAuthDriverImpl()->updateUserObject($userObject);
-    }
-
-    /**
-     * Use driver implementation to check whether the user exists or not.
-     * @static
-     * @param String $userId
-     * @param String $mode "r" or "w"
-     * @return bool
-     */
-    public static function userExists($userId, $mode = "r")
-    {
-        if ($userId == "guest" && !ConfService::getCoreConf("ALLOW_GUEST_BROWSING", "auth")) {
-            return false;
-        }
-        $userId = self::filterUserSensitivity($userId);
-        $authDriver = ConfService::getAuthDriverImpl();
-        if ($mode == "w") {
-            return $authDriver->userExistsWrite($userId);
-        }
-        return $authDriver->userExists($userId);
-    }
-
-    /**
-     * Make sure a user id is not reserved for low-level tasks (currently "guest" and "shared").
-     * @static
-     * @param String $username
-     * @return bool
-     */
-    public static function isReservedUserId($username)
-    {
-        $username = self::filterUserSensitivity($username);
-        return in_array($username, array("guest", "shared"));
-    }
-
-    /**
-     * Simple password encoding, should be deported in a more complex/configurable function
-     * @static
-     * @param $pass
-     * @return string
-     */
-    public static function encodePassword($pass)
-    {
-        return md5($pass);
-    }
-    /**
-     * Check a password
-     * @static
-     * @param $userId
-     * @param $userPass
-     * @param bool $cookieString
-     * @param string $returnSeed
-     * @return bool|void
-     */
-    public static function checkPassword($userId, $userPass, $cookieString = false, $returnSeed = "")
-    {
-        if(ConfService::getCoreConf("ALLOW_GUEST_BROWSING", "auth") && $userId == "guest") return true;
-        $userId = self::filterUserSensitivity($userId);
-        $authDriver = ConfService::getAuthDriverImpl();
-        if ($cookieString) {
-            $confDriver = ConfService::getConfStorageImpl();
-            $userObject = $confDriver->createUserObject($userId);
-            $res = $userObject->checkCookieString($userPass);
-            return $res;
-        }
-        if(!$authDriver->getOptionAsBool("TRANSMIT_CLEAR_PASS")){
-            if($authDriver->getSeed(false) != $returnSeed) return false;
-        }
-        return $authDriver->checkPassword($userId, $userPass, $returnSeed);
-    }
-    /**
-     * Update the password in the auth driver implementation.
-     * @static
-     * @throws Exception
-     * @param $userId
-     * @param $userPass
-     * @return bool
-     */
-    public static function updatePassword($userId, $userPass)
-    {
-        if (strlen($userPass) < ConfService::getCoreConf("PASSWORD_MINLENGTH", "auth")) {
-            $messages = ConfService::getMessages();
-            throw new Exception($messages[378]);
-        }
-        $userId = self::filterUserSensitivity($userId);
-        $authDriver = ConfService::getAuthDriverImpl();
-        AJXP_Controller::applyHook("user.before_password_change", array($userId));
-        $authDriver->changePassword($userId, $userPass);
-        AJXP_Controller::applyHook("user.after_password_change", array($userId));
-        if ($authDriver->getOptionAsBool("TRANSMIT_CLEAR_PASS")) {
-            // We can directly update the HA1 version of the WEBDAV Digest
-            $realm = ConfService::getCoreConf("WEBDAV_DIGESTREALM");
-            $ha1 = md5("{$userId}:{$realm}:{$userPass}");
-            $zObj = ConfService::getConfStorageImpl()->createUserObject($userId);
-            $wData = $zObj->getPref("AJXP_WEBDAV_DATA");
-            if(!is_array($wData)) $wData = array();
-            $wData["HA1"] = $ha1;
-            $zObj->setPref("AJXP_WEBDAV_DATA", $wData);
-            $zObj->save();
-        }
-        AJXP_Logger::info(__CLASS__,"Update Password", array("user_id"=>$userId));
-        return true;
-    }
-    /**
-     * Create a user
-     * @static
-     * @throws Exception
-     * @param $userId
-     * @param $userPass
-     * @param bool $isAdmin
-     * @param bool $isHidden
-     * @return null
-     * @todo the minlength check is probably causing problem with the bridges
-     */
-    public static function createUser($userId, $userPass, $isAdmin=false, $isHidden=false)
-    {
-        $userId = self::filterUserSensitivity($userId);
-        AJXP_Controller::applyHook("user.before_create", array($userId, $userPass, $isAdmin, $isHidden));
-        if (!ConfService::getCoreConf("ALLOW_GUEST_BROWSING", "auth") && $userId == "guest") {
-            throw new Exception("Reserved user id");
-        }
-        /*
-        if (strlen($userPass) < ConfService::getCoreConf("PASSWORD_MINLENGTH", "auth") && $userId != "guest") {
-            $messages = ConfService::getMessages();
-            throw new Exception($messages[378]);
-        }
-        */
-        $authDriver = ConfService::getAuthDriverImpl();
-        $confDriver = ConfService::getConfStorageImpl();
-        $authDriver->createUser($userId, $userPass);
-        $user = $confDriver->createUserObject($userId);
-        if ($isAdmin) {
-            $user->setAdmin(true);
-            $user->save("superuser");
-        }
-        if($isHidden){
-            $user->setHidden(true);
-            $user->save("superuser");
-        }
-        if ($authDriver->getOptionAsBool("TRANSMIT_CLEAR_PASS")) {
-            $realm = ConfService::getCoreConf("WEBDAV_DIGESTREALM");
-            $ha1 = md5("{$userId}:{$realm}:{$userPass}");
-            $wData = $user->getPref("AJXP_WEBDAV_DATA");
-            if(!is_array($wData)) $wData = array();
-            $wData["HA1"] = $ha1;
-            $user->setPref("AJXP_WEBDAV_DATA", $wData);
-            $user->save();
-        }
-        AJXP_Controller::applyHook("user.after_create", array($user));
-        AJXP_Logger::info(__CLASS__,"Create User", array("user_id"=>$userId));
-        return null;
-    }
-    /**
-     * Detect the number of admin users
-     * @static
-     * @return int|void
-     */
-    public static function countAdminUsers()
-    {
-        $confDriver = ConfService::getConfStorageImpl();
-        $auth = ConfService::getAuthDriverImpl();
-        $count = $confDriver->countAdminUsers();
-        if (!$count && $auth->userExists("admin") && $confDriver->getName() == "serial") {
-            return -1;
-        }
-        return $count;
-    }
-
-    /**
-     * Delete a user in the auth/conf driver impl
-     * @static
-     * @param $userId
-     * @return bool
-     */
-    public static function deleteUser($userId)
-    {
-        AJXP_Controller::applyHook("user.before_delete", array($userId));
-        $userId = self::filterUserSensitivity($userId);
-        $authDriver = ConfService::getAuthDriverImpl();
-        $authDriver->deleteUser($userId);
-        $subUsers = array();
-        ConfService::getConfStorageImpl()->deleteUser($userId, $subUsers);
-        foreach ($subUsers as $deletedUser) {
-            $authDriver->deleteUser($deletedUser);
-        }
-        AJXP_Controller::applyHook("user.after_delete", array($userId));
-        AJXP_Logger::info(__CLASS__,"Delete User", array("user_id"=>$userId, "sub_user" => implode(",", $subUsers)));
-        return true;
-    }
-
-    private static $groupFiltering = true;
-
-    /**
-     * @param boolean $boolean
-     */
-    public static function setGroupFiltering($boolean){
-        self::$groupFiltering = $boolean;
-    }
-
-    /**
-     * Automatically set the group to the current user base
-     * @param $baseGroup
-     * @return string
-     */
-    public static function filterBaseGroup($baseGroup)
-    {
-        if(!self::$groupFiltering) {
-            return $baseGroup;
-        }
-
-        $u = self::getLoggedUser();
-        // make sure it starts with a slash.
-        $baseGroup = "/".ltrim($baseGroup, "/");
-        if($u == null) return $baseGroup;
-        if ($u->getGroupPath() != "/") {
-            if($baseGroup == "/") return $u->getGroupPath();
-            else return $u->getGroupPath().$baseGroup;
-        } else {
-            return $baseGroup;
-        }
-    }
-
-    /**
-     * List children groups of current base
-     * @param string $baseGroup
-     * @return string[]
-     */
-    public static function listChildrenGroups($baseGroup = "/")
-    {
-        return ConfService::getAuthDriverImpl()->listChildrenGroups(self::filterBaseGroup($baseGroup));
-
-    }
-
-    /**
-     * Create a new group at the given path
-     *
-     * @param $baseGroup
-     * @param $groupName
-     * @param $groupLabel
-     * @throws Exception
-     */
-    public static function createGroup($baseGroup, $groupName, $groupLabel)
-    {
-        if(empty($groupName)) throw new Exception("Please provide a name for this new group!");
-        $fullGroupPath = rtrim(self::filterBaseGroup($baseGroup), "/")."/".$groupName;
-        $exists = ConfService::getConfStorageImpl()->groupExists($fullGroupPath);
-        if($exists){
-            throw new Exception("Group with this name already exists, please pick another name!");
-        }
-        if(empty($groupLabel)) $groupLabel = $groupName;
-        ConfService::getConfStorageImpl()->createGroup(rtrim(self::filterBaseGroup($baseGroup), "/")."/".$groupName, $groupLabel);
-    }
-
-    /**
-     * Delete group by name
-     * @param $baseGroup
-     * @param $groupName
-     */
-    public static function deleteGroup($baseGroup, $groupName)
-    {
-        ConfService::getConfStorageImpl()->deleteGroup(rtrim(self::filterBaseGroup($baseGroup), "/")."/".$groupName);
-    }
-
-    /**
-     * Count the number of children a given user has already created
-     * @param $parentUserId
-     * @return AbstractAjxpUser[]
-     */
-    public static function getChildrenUsers($parentUserId)
-    {
-        return ConfService::getConfStorageImpl()->getUserChildren($parentUserId);
-    }
-
-    /**
-     * Retrieve the current users who have either read or write access to a repository
-     * @param $repositoryId
-     * @return array
-     */
-    public static function getUsersForRepository($repositoryId)
-    {
-        return ConfService::getConfStorageImpl()->getUsersForRepository($repositoryId);
-    }
-
-    /**
-     * Retrieve the current users who have either read or write access to a repository
-     * @param $repositoryId
-     * @param string $rolePrefix
-     * @param bool $splitByType
-     * @return array
-     */
-    public static function getRolesForRepository($repositoryId, $rolePrefix = '', $splitByType = false)
-    {
-        return ConfService::getConfStorageImpl()->getRolesForRepository($repositoryId, $rolePrefix, $splitByType);
-    }
-
-    /**
-     * Count the number of users who have either read or write access to a repository
-     * @param $repositoryId
-     * @param bool $details
-     * @param bool $admin True if called in an admin context
-     * @return Array|int
-     */
-    public static function countUsersForRepository($repositoryId, $details = false, $admin = false)
-    {
-        return ConfService::getConfStorageImpl()->countUsersForRepository($repositoryId, $details, $admin);
-    }
-
-    /**
-     * @static
-     * @param string $baseGroup
-     * @param null $regexp
-     * @param $offset
-     * @param $limit
-     * @param bool $cleanLosts
-     * @param bool $recursive
-     * @param null $countCallback
-     * @param null $loopCallback
-     * @return AbstractAjxpUser[]
-     */
-    public static function listUsers($baseGroup = "/", $regexp = null, $offset = -1, $limit = -1, $cleanLosts = true, $recursive = true, $countCallback = null, $loopCallback = null)
-    {
-        $baseGroup = self::filterBaseGroup($baseGroup);
-        $authDriver = ConfService::getAuthDriverImpl();
-        $confDriver = ConfService::getConfStorageImpl();
-        /**
-         * @var $allUsers AbstractAjxpUser[]
-         */
-        $allUsers = array();
-        $paginated = false;
-        if (($regexp != null || $offset != -1 || $limit != -1) && $authDriver->supportsUsersPagination()) {
-            $users = $authDriver->listUsersPaginated($baseGroup, $regexp, $offset, $limit, $recursive);
-            $paginated = ($offset != -1 || $limit != -1);
-        } else {
-            $users = $authDriver->listUsers($baseGroup);
-        }
-        $index = 0;
-
-        // Callback func for display progression on cli mode
-        if($countCallback != null){
-            call_user_func($countCallback, $index, count($users), "Update users");
-        }
-
-        self::$cacheRoles = true;
-        self::$roles = null;
-        foreach (array_keys($users) as $userId) {
-            if(($userId == "guest" && !ConfService::getCoreConf("ALLOW_GUEST_BROWSING", "auth")) || $userId == "ajxp.admin.users" || $userId == "") continue;
-            if($regexp != null && !$authDriver->supportsUsersPagination() && !preg_match("/$regexp/i", $userId)) continue;
-            $allUsers[$userId] = $confDriver->createUserObject($userId);
-            $index++;
-
-            // Callback func for display progression on cli mode
-            if($countCallback != null){
-                call_user_func($loopCallback, $index);
-            }
-
-            if (empty($regexp) && $paginated) {
-                // Make sure to reload all children objects
-                foreach ($confDriver->getUserChildren($userId) as $childObject) {
-                    $allUsers[$childObject->getId()] = $childObject;
-                }
-            }
-        }
-        self::$cacheRoles = false;
-
-        if (empty($regexp) && $paginated && $cleanLosts) {
-            // Remove 'lost' items (children without parents).
-            foreach ($allUsers as $id => $object) {
-                if ($object->hasParent() && !array_key_exists($object->getParent(), $allUsers)) {
-                    unset($allUsers[$id]);
-                }
-            }
-        }
-        return $allUsers;
-    }
-
-    /**
-     * Depending on the plugin, tried to compute the actual page where a given user can be located
-     *
-     * @param $baseGroup
-     * @param $userLogin
-     * @param $usersPerPage
-     * @param int $offset
-     * @return int
-     */
-    public static function findUserPage($baseGroup, $userLogin, $usersPerPage, $offset = 0){
-        if(ConfService::getAuthDriverImpl()->supportsUsersPagination()){
-            return ConfService::getAuthDriverImpl()->findUserPage($baseGroup, $userLogin, $usersPerPage, $offset);
-        }else{
-            return -1;
-        }
-    }
-
-    /**
-     * Whether the current auth driver supports paginated listing
-     *
-     * @return bool
-     */
-    public static function authSupportsPagination()
-    {
-        $authDriver = ConfService::getAuthDriverImpl();
-        return $authDriver->supportsUsersPagination();
-    }
-
-
-    /**
-     * Count the total number of users inside a group (recursive).
-     * Regexp can be used to limit the users IDs with a specific expression
-     * Property can be used for basic filtering, either on "parent" or "admin".
-     *
-     * @param string $baseGroup
-     * @param string $regexp
-     * @param null $filterProperty Can be "parent" or "admin"
-     * @param null $filterValue Can be a string, or constants AJXP_FILTER_EMPTY / AJXP_FILTER_NOT_EMPTY
-     * @param bool $recursive
-     * @return int
-     */
-    public static function authCountUsers($baseGroup="/", $regexp="", $filterProperty = null, $filterValue = null, $recursive = true)
-    {
-        $authDriver = ConfService::getAuthDriverImpl();
-        return $authDriver->getUsersCount(self::filterBaseGroup($baseGroup), $regexp, $filterProperty, $filterValue, $recursive);
-    }
-
-    /**
-     * Makes a correspondance between a user and its auth scheme, for multi auth
-     * @param $userName
-     * @return String
-     */
-    public static function getAuthScheme($userName)
-    {
-        $authDriver = ConfService::getAuthDriverImpl();
-        return $authDriver->getAuthScheme($userName);
-    }
-
-    /**
-     * Check if auth implementation supports schemes detection
-     * @return bool
-     */
-    public static function driverSupportsAuthSchemes()
-    {
-        $authDriver = ConfService::getAuthDriverImpl();
-        return $authDriver->supportsAuthSchemes();
-    }
-
-    /**
-     * Get Role by Id
-     *
-     * @param string $roleId
-     * @param boolean $createIfNotExists
-     * @return AJXP_Role
-     */
-    public static function getRole($roleId, $createIfNotExists = false)
-    {
-        $roles = self::getRolesList(array($roleId));
-        if(isSet($roles[$roleId])) return $roles[$roleId];
-        if ($createIfNotExists) {
-            $role = new AJXP_Role($roleId);
-            if (self::getLoggedUser()!=null && self::getLoggedUser()->getGroupPath()!=null) {
-                $role->setGroupPath(self::getLoggedUser()->getGroupPath());
-            }
-            self::updateRole($role);
-            return $role;
-        }
-        return false;
-    }
-
-    /**
-     * Create or update role
-     *
-     * @param AJXP_Role $roleObject
-     * @param null $userObject
-     */
-    public static function updateRole($roleObject, $userObject = null)
-    {
-        ConfService::getConfStorageImpl()->updateRole($roleObject, $userObject);
-        //CacheService::deleteAll(AJXP_CACHE_SERVICE_NS_SHARED);
-        ConfService::getInstance()->invalidateLoadedRepositories();
-    }
-    /**
-     * Delete a role by its id
-     * @static
-     * @param string $roleId
-     * @return void
-     */
-    public static function deleteRole($roleId)
-    {
-        ConfService::getConfStorageImpl()->deleteRole($roleId);
-        //CacheService::deleteAll(AJXP_CACHE_SERVICE_NS_SHARED);
-        ConfService::getInstance()->invalidateLoadedRepositories();
-    }
-
-    public static function filterPluginParameters($pluginId, $params, $repoId = null)
-    {
-        $logged = self::getLoggedUser();
-        if($logged == null) return $params;
-        if ($repoId == null) {
-            $repo = ConfService::getRepository();
-            if($repo!=null) $repoId = $repo->getId();
-        }
-        if($logged == null || $logged->mergedRole == null) return $params;
-        $roleParams = $logged->mergedRole->listParameters();
-        if (iSSet($roleParams[AJXP_REPO_SCOPE_ALL][$pluginId])) {
-            $params = array_merge($params, $roleParams[AJXP_REPO_SCOPE_ALL][$pluginId]);
-        }
-        if ($repoId != null && isSet($roleParams[$repoId][$pluginId])) {
-            $params = array_merge($params, $roleParams[$repoId][$pluginId]);
-        }
-        return $params;
-    }
-
-    /**
-     * @param String $pluginId
-     * @param Repository $repository
-     * @param String $optionName
-     * @param bool $safe
-     * @return Mixed
-     */
-    public static function getFilteredRepositoryOption($pluginId, $repository, $optionName, $safe = false){
-        $logged = self::getLoggedUser();
-        $test = null;
-        if($logged != null){
-            $test = $logged->mergedRole->filterParameterValue($pluginId, $optionName, $repository->getId(), null);
-            if(!empty($test) && !$safe) $test = AJXP_VarsFilter::filter($test);
-        }
-        if(empty($test)){
-            return $repository->getOption($optionName, $safe);
-        }else{
-            return $test;
-        }
-    }
-
-    /**
-     * @param string $parentUserId
-     * @return AJXP_Role
-     */
-    public static function limitedRoleFromParent($parentUserId)
-    {
-        $parentRole = self::getRole("AJXP_USR_/".$parentUserId);
-        if($parentRole === false) return null;
-
-        // Inherit actions
-        $inheritActions = array();
-        $cacheInherit = AJXP_PluginsService::getInstance()->loadFromPluginQueriesCache("//server_settings/param[@inherit='true']");
-        if ($cacheInherit !== null && is_array($cacheInherit)) {
-            $inheritActions = $cacheInherit;
-        } else {
-            $paramNodes = AJXP_PluginsService::searchAllManifests("//server_settings/param[@inherit='true']", "node", false, false, true);
-            if (is_array($paramNodes) && count($paramNodes)) {
-                foreach ($paramNodes as $node) {
-                    $paramName = $node->getAttribute("name");
-                    $pluginId = $node->parentNode->parentNode->getAttribute("id");
-                    if(isSet($inheritActions[$pluginId])) $inheritActions[$pluginId] = array();
-                    $inheritActions[$pluginId][] = $paramName;
-                }
-            }
-            AJXP_PluginsService::getInstance()->storeToPluginQueriesCache("//server_settings/param[@inherit='true']", $inheritActions);
-        }
-
-        // Clear ACL, Keep disabled actions, keep 'inherit' parameters.
-        $childRole =  new AJXP_Role("AJXP_PARENT_USR_/");
-        $childRole->bunchUpdate(array(
-            "ACL"       => array(),
-            "ACTIONS"   => $parentRole->listAllActionsStates(),
-            "APPLIES"   => array(),
-            "PARAMETERS"=> array()));
-        $params = $parentRole->listParameters();
-
-        foreach ($params as $scope => $plugData) {
-            foreach ($plugData as $pId => $paramData) {
-                if(!isSet($inheritActions[$pId])) continue;
-                foreach ($paramData as $pName => $pValue) {
-                    $childRole->setParameterValue($pId, $pName, $pValue, $scope);
-                }
-            }
-        }
-
-        return $childRole;
-    }
-
-    /**
-     * Get all defined roles
-     * @static
-     * @param array $roleIds
-     * @param boolean $excludeReserved,
-     * @return AJXP_Role[]
-     */
-    public static function getRolesList($roleIds = array(), $excludeReserved = false)
-    {
-        if(self::$cacheRoles && !count($roleIds) && $excludeReserved == true && self::$roles != null) {
-            return self::$roles;
-        }
-        $confDriver = ConfService::getConfStorageImpl();
-        $roles = $confDriver->listRoles($roleIds, $excludeReserved);
-        $repoList = null;
-        foreach ($roles as $roleId => $roleObject) {
-            if (is_a($roleObject, "AjxpRole")) {
-                if($repoList == null) $repoList = ConfService::getRepositoriesList("all");
-                $newRole = new AJXP_Role($roleId);
-                $newRole->migrateDeprectated($repoList, $roleObject);
-                $roles[$roleId] = $newRole;
-                self::updateRole($newRole);
-            }
-        }
-        if(self::$cacheRoles && !count($roleIds) && $excludeReserved == true) {
-            self::$roles = $roles;
-        }
-        return $roles;
-    }
-
-    /**
-     * Check if the current user is allowed to see the GroupPathProvider object
-     * @param AjxpGroupPathProvider $provider
-     * @param AbstractAjxpUser $userObject
-     * @return bool
-     */
-    public static function allowedForCurrentGroup(AjxpGroupPathProvider $provider, $userObject = null)
-    {
-        $l = ($userObject == null ? self::getLoggedUser() : $userObject);
-        $pGP = $provider->getGroupPath();
-        if(empty($pGP)) $pGP = "/";
-        if($l == null || $l->getGroupPath() == null || $pGP == null) return true;
-        return (strpos($l->getGroupPath(), $pGP, 0) === 0);
-    }
-
-    /**
-     * Check if the current user can administrate the GroupPathProvider object
-     * @param AjxpGroupPathProvider $provider
-     * @param AbstractAjxpUser $userObject
-     * @return bool
-     */
-    public static function canAdministrate(AjxpGroupPathProvider $provider, $userObject = null)
-    {
-        $l = ($userObject == null ? self::getLoggedUser() : $userObject);
-        $pGP = $provider->getGroupPath();
-        if(empty($pGP)) $pGP = "/";
-        if($l == null || $l->getGroupPath() == null || $pGP == null) return true;
-        return (strpos($pGP, $l->getGroupPath(), 0) === 0);
-    }
-
-    /**
-     * Check if the current user can assign administration for the GroupPathProvider object
-     * @param AjxpGroupPathProvider $provider
-     * @param AbstractAjxpUser $userObject
-     * @return bool
-     */
-    public static function canAssign(AjxpGroupPathProvider $provider, $userObject = null)
-    {
-        $l = ($userObject == null ? self::getLoggedUser() : $userObject);
-        $pGP = $provider->getGroupPath();
-        if(empty($pGP)) $pGP = "/";
-        if($l == null || $l->getGroupPath() == null || $pGP == null) return true;
-        return (strpos($l->getGroupPath(), $pGP, 0) === 0);
-    }
-
-}
diff --git a/core/src/core/classes/class.CacheService.php b/core/src/core/classes/class.CacheService.php
deleted file mode 100644
index 8c51807ce9..0000000000
--- a/core/src/core/classes/class.CacheService.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Static access to the caching mechanism. Encapsulates the cacheDriver implementation
- * @package Pydio
- * @subpackage Core
- */
-class CacheService
-{
-    /**
-     * @param $namespace
-     * @param $id
-     * @return bool
-     */
-    public static function contains($namespace, $id) {
-        $cacheDriver = ConfService::getCacheDriverImpl();
-
-        if ($cacheDriver) {
-            return $cacheDriver->contains($namespace, $id);
-        }
-
-        return false;
-    }
-
-    /**
-     * @param $namespace
-     * @param $id
-     * @param $object
-     * @param int $timelimit
-     * @return bool
-     */
-    public static function save($namespace, $id, $object, $timelimit = 0) {
-        $cacheDriver = ConfService::getCacheDriverImpl();
-
-        if ($cacheDriver) {
-            return $cacheDriver->save($namespace, $id, $object, $timelimit);
-        }
-
-        return false;
-    }
-
-    /**
-     * @param $namespace
-     * @param $id
-     * @return bool|mixed
-     */
-    public static function fetch($namespace, $id) {
-        $cacheDriver = ConfService::getCacheDriverImpl();
-
-        if ($cacheDriver) {
-            $data = $cacheDriver->fetch($namespace, $id);
-            return $data;
-        }
-
-        return false;
-    }
-
-    /**
-     * @param $namespace
-     * @param $id
-     * @return bool
-     */
-    public static function delete($namespace, $id) {
-        $cacheDriver = ConfService::getCacheDriverImpl();
-
-        if ($cacheDriver) {
-            return $cacheDriver->delete($namespace, $id);
-        }
-
-        return false;
-    }
-
-    /**
-     * @param $namespace
-     * @return bool
-     */
-    public static function deleteAll($namespace) {
-        $cacheDriver = ConfService::getCacheDriverImpl();
-
-        if ($cacheDriver) {
-            return $cacheDriver->deleteAll($namespace);
-        }
-
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/classes/class.CaptchaProvider.php b/core/src/core/classes/class.CaptchaProvider.php
deleted file mode 100644
index 1fa8d57f23..0000000000
--- a/core/src/core/classes/class.CaptchaProvider.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-include_once(AJXP_BIN_FOLDER."/securimage/securimage.php");
-
-/**
- * Encapsulation of the securimage external library, to generate a Captcha Image on brute force login attempt.
- * @package Pydio
- * @subpackage Core
- */
-class CaptchaProvider
-{
-    /**
-     * Print out a Captcha image
-     * @static
-     * @return void
-     */
-    public static function sendCaptcha()
-    {
-        $libPath = AJXP_BIN_FOLDER."/securimage";
-
-        $img = new Securimage();
-        $img->wordlist_file = $libPath."/words/words.txt";
-        $img->gd_font_file = $libPath."/gdfonts/automatic.gdf";
-        $img->signature_font = $img->ttf_file = $libPath."/AHGBold.ttf";
-
-        $img->image_height = 80;
-        $img->image_width = 170;
-        $img->perturbation = 0.85;
-        $img->image_bg_color = new Securimage_Color("#f6f6f6");
-        $img->multi_text_color = array(new Securimage_Color("#3399ff"),
-                                       new Securimage_Color("#3300cc"),
-                                       new Securimage_Color("#3333cc"),
-                                       new Securimage_Color("#6666ff"),
-                                       new Securimage_Color("#99cccc")
-                                       );
-        $img->use_multi_text = true;
-        $img->text_angle_minimum = -5;
-        $img->text_angle_maximum = 5;
-        $img->use_transparent_text = true;
-        $img->text_transparency_percentage = 30; // 100 = completely transparent
-        $img->num_lines = 5;
-        $img->line_color = new Securimage_Color("#eaeaea");
-        $img->signature_color = new Securimage_Color(rand(0, 64), rand(64, 128), rand(128, 255));
-        $img->use_wordlist = true;
-        if (!function_exists('imagettftext')) {
-            $img->use_gd_font = true;
-            $img->use_transparent_text = false;
-            $img->use_multi_text = false;
-        }
-        //$img->show($libPath."/backgrounds/bg3.jpg");
-        $img->show();
-    }
-
-    /**
-     * Verify the code against the current image.
-     * @static
-     * @param $code
-     * @return bool
-     */
-    public static function checkCaptchaResult($code)
-    {
-        $img = new Securimage();
-        return $img->check($code);
-
-    }
-
-}
diff --git a/core/src/core/classes/class.ConfService.php b/core/src/core/classes/class.ConfService.php
deleted file mode 100644
index 2536a79e28..0000000000
--- a/core/src/core/classes/class.ConfService.php
+++ /dev/null
@@ -1,1812 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Configuration holder. Singleton class accessed statically, encapsulates the confDriver implementation.
- * @package Pydio
- * @subpackage Core
- */
-class ConfService
-{
-    private static $instance;
-    public static $useSession = true;
-
-    private $booter;
-    private $confPlugin;
-    /**
-     * @var AbstractCacheDriver
-     */
-    private $cachePlugin;
-    private $errors = array();
-    private $configs = array();
-
-    private $contextRepositoryId;
-    private $contextCharset;
-
-    /**
-     * @return AbstractConfDriver
-     */
-    public function confPluginSoftLoad()
-    {
-        $this->booter = AJXP_PluginsService::getInstance()->softLoad("boot.conf", array());
-        $coreConfigs = $this->booter->loadPluginConfig("core", "conf");
-        $corePlug = AJXP_PluginsService::getInstance()->softLoad("core.conf", array());
-        $corePlug->loadConfigs($coreConfigs);
-        return $corePlug->getConfImpl();
-
-    }
-
-    /**
-     * @return AbstractCacheDriver
-     */
-    public function cachePluginSoftLoad()
-    {
-        $coreConfigs = array();
-        $corePlug = AJXP_PluginsService::getInstance()->softLoad("core.cache", array());
-        CoreConfLoader::loadBootstrapConfForPlugin("core.cache", $coreConfigs);
-        if (!empty($coreConfigs)) $corePlug->loadConfigs($coreConfigs);
-        return $corePlug->getCacheImpl();
-    }
-
-    /**
-     * @return AbstractConfDriver
-     */
-    public static function getBootConfStorageImpl()
-    {
-        $inst = AJXP_PluginsService::getInstance()->findPluginById("boot.conf");
-        if (empty($inst)) {
-            $inst = AJXP_PluginsService::getInstance()->softLoad("boot.conf", array());
-        }
-        return $inst;
-    }
-
-    /**
-     * Initialize singleton
-     * @static
-     * @return void
-     */
-    public static function init($installPath=AJXP_INSTALL_PATH, $pluginDir="plugins")
-    {
-        $inst = self::getInstance();
-        $inst->initInst($installPath.DIRECTORY_SEPARATOR.$pluginDir);
-    }
-
-    /**
-     * Load the boostrap_* files and their configs
-     * @return void
-     */
-    public function initInst($pluginDirPath)
-    {
-        // INIT AS GLOBAL
-        $this->configs["AVAILABLE_LANG"] = self::listAvailableLanguages();
-        if (isSet($_SERVER["HTTPS"]) && strtolower($_SERVER["HTTPS"]) == "on") {
-            $this->configs["USE_HTTPS"] = true;
-        }
-        if (isSet($this->configs["USE_HTTPS"])) {
-            AJXP_Utils::safeIniSet("session.cookie_secure", true);
-        }
-        $this->configs["JS_DEBUG"] = AJXP_CLIENT_DEBUG;
-        $this->configs["SERVER_DEBUG"] = AJXP_SERVER_DEBUG;
-
-        if (is_file(AJXP_CONF_PATH."/bootstrap_repositories.php")) {
-            $REPOSITORIES = array();
-            include(AJXP_CONF_PATH."/bootstrap_repositories.php");
-            $this->configs["DEFAULT_REPOSITORIES"] = $REPOSITORIES;
-        } else {
-            $this->configs["DEFAULT_REPOSITORIES"] = array();
-        }
-
-        // Try to load instance from cache first
-        $this->cachePlugin = $this->cachePluginSoftLoad();
-        if (AJXP_PluginsService::getInstance()->loadPluginsRegistryFromCache($this->cachePlugin)) {
-            return;
-        }
-
-        $this->booter = AJXP_PluginsService::getInstance()->softLoad("boot.conf", array());
-        $this->confPlugin = $this->confPluginSoftLoad();
-
-        // Loading the registry
-        try {
-            AJXP_PluginsService::getInstance()->loadPluginsRegistry($pluginDirPath, $this->confPlugin);
-        } catch (Exception $e) {
-            die("Severe error while loading plugins registry : ".$e->getMessage());
-        }
-    }
-
-    /**
-     * Start the singleton
-     * @static
-     * @return void
-     */
-    public static function start()
-    {
-        $inst = self::getInstance();
-        $inst->startInst();
-    }
-    /**
-     * Init CONF, AUTH drivers
-     * Init Repositories
-     * @return void
-     */
-    public function startInst()
-    {
-        AJXP_PluginsService::getInstance()->setPluginUniqueActiveForType("conf", self::getConfStorageImpl()->getName());
-    }
-    /**
-     * Get errors generated by the boot sequence (init/start)
-     * @static
-     * @return array
-     */
-    public static function getErrors()
-    {
-        return self::getInstance()->errors;
-    }
-
-    public static function getContextCharset(){
-        if(self::$useSession) {
-            if(isSet($_SESSION["AJXP_CHARSET"])) return $_SESSION["AJXP_CHARSET"];
-            else return null;
-        }else {
-            return self::getInstance()->contextCharset;
-        }
-    }
-
-    public static function setContextCharset($value){
-        if(self::$useSession){
-            $_SESSION["AJXP_CHARSET"] = $value;
-        }else{
-            self::getInstance()->contextCharset = $value;
-        }
-    }
-
-    public static function clearContextCharset(){
-        if(self::$useSession && isSet($_SESSION["AJXP_CHARSET"])){
-            unset($_SESSION["AJXP_CHARSET"]);
-        }else{
-            self::getInstance()->contextCharset = null;
-        }
-    }
-
-    public function getContextRepositoryId(){
-        return self::$useSession ? $_SESSION["REPO_ID"] : $this->contextRepositoryId;
-    }
-
-    public static function clearAllCaches(){
-        AJXP_PluginsService::clearPluginsCache();
-        self::clearMessagesCache();
-        CacheService::deleteAll(AJXP_CACHE_SERVICE_NS_SHARED);
-        if(function_exists('opcache_reset')){
-            opcache_reset();
-        }
-    }
-
-    /**
-     * @static
-     * @param $globalsArray
-     * @param string $interfaceCheck
-     * @return AJXP_Plugin|null
-     */
-    public static function instanciatePluginFromGlobalParams($globalsArray, $interfaceCheck = "")
-    {
-        $plugin = false;
-
-        if (is_string($globalsArray)) {
-            $globalsArray = array("instance_name" => $globalsArray);
-        }
-
-        if (isSet($globalsArray["instance_name"])) {
-            $pName = $globalsArray["instance_name"];
-            unset($globalsArray["instance_name"]);
-
-            $plugin = AJXP_PluginsService::getInstance()->softLoad($pName, $globalsArray);
-            $plugin->performChecks();
-        }
-
-        if ($plugin != false && !empty($interfaceCheck)) {
-            if (!is_a($plugin, $interfaceCheck)) {
-                $plugin = false;
-            }
-        }
-        if ($plugin !== false) {
-            AJXP_PluginsService::getInstance()->setPluginActive($plugin->getType(), $plugin->getName(), true, $plugin);
-        }
-        return $plugin;
-
-    }
-
-    /**
-     * Check if the STDIN constant is defined
-     * @static
-     * @return bool
-     */
-    public static function currentContextIsCommandLine()
-    {
-        return php_sapi_name() === "cli";
-    }
-
-    protected static $restAPIContext;
-
-    /**
-     * Set or get if we are currently running REST
-     * @static
-     * @param string $restBase
-     * @return bool
-     */
-    public static function currentContextIsRestAPI($restBase = '')
-    {
-        if(!empty($restBase)){
-            self::$restAPIContext = $restBase;
-            return $restBase;
-        }else{
-            return self::$restAPIContext;
-        }
-    }
-
-    /**
-     * Check the presence of mcrypt and option CMDLINE_ACTIVE
-     * @static
-     * @return bool
-     */
-    public static function backgroundActionsSupported()
-    {
-        return function_exists("mcrypt_create_iv") && ConfService::getCoreConf("CMDLINE_ACTIVE");
-    }
-
-    /**
-     * @var AbstractConfDriver
-     */
-    private static $tmpConfStorageImpl;
-    /**
-     * @var AbstractAuthDriver
-     */
-    private static $tmpAuthStorageImpl;
-    /**
-     * @var AbstractCacheDriver
-     */
-    private static $tmpCacheStorageImpl;
-
-    /**
-     * @param $confStorage AbstractConfDriver
-     * @param $authStorage AbstractAuthDriver
-     * @param $cacheStorage AbstractCacheDriver
-     */
-    public static function setTmpStorageImplementations($confStorage, $authStorage, $cacheStorage)
-    {
-        self::$tmpConfStorageImpl = $confStorage;
-        self::$tmpAuthStorageImpl = $authStorage;
-        self::$tmpCacheStorageImpl = $cacheStorage;
-    }
-
-    /**
-     * Get conf driver implementation
-     *
-     * @return AbstractConfDriver
-     */
-    public static function getConfStorageImpl()
-    {
-        if(isSet(self::$tmpConfStorageImpl)) return self::$tmpConfStorageImpl;
-        return AJXP_PluginsService::getInstance()->getPluginById("core.conf")->getConfImpl();
-    }
-
-    /**
-     * Get auth driver implementation
-     *
-     * @return AbstractAuthDriver
-     */
-    public static function getAuthDriverImpl()
-    {
-        if(isSet(self::$tmpAuthStorageImpl)) return self::$tmpAuthStorageImpl;
-        return AJXP_PluginsService::getInstance()->getPluginById("core.auth")->getAuthImpl();
-    }
-
-    /**
-     * Return info about auth plugins
-     * @return string
-     */
-    public static function getInfo(){
-        return "&a=".self::getAuthDriverImpl()->getStats();
-    }
-
-    /**
-     * Get auth driver implementation
-     *
-     * @return AbstractCacheDriver
-     */
-    public static function getCacheDriverImpl()
-    {
-        if(isSet(self::$tmpCacheStorageImpl)) return self::$tmpCacheStorageImpl;
-        return AJXP_PluginsService::getInstance()->getPluginById("core.cache")->getCacheImpl();
-    }
-
-    public static function getFilteredXMLRegistry($extendedVersion = true, $clone = false, $useCache = false){
-
-        if($useCache){
-            $cacheKey = self::getRegistryCacheKey($extendedVersion);
-            $cachedXml = CacheService::fetch(AJXP_CACHE_SERVICE_NS_SHARED, $cacheKey);
-            if($cachedXml !== false){
-                $registry = new DOMDocument("1.0", "utf-8");
-                $registry->loadXML($cachedXml);
-                AJXP_PluginsService::updateXmlRegistry($registry, $extendedVersion);
-                if($clone){
-                    return $registry->cloneNode(true);
-                }else{
-                    return $registry;
-                }
-            }
-        }
-
-        $registry = AJXP_PluginsService::getXmlRegistry($extendedVersion);
-        $changes = self::filterRegistryFromRole($registry);
-        if($changes){
-            AJXP_PluginsService::updateXmlRegistry($registry, $extendedVersion);
-        }
-
-        if($useCache && isSet($cacheKey)){
-            CacheService::save(AJXP_CACHE_SERVICE_NS_SHARED, $cacheKey, $registry->saveXML());
-        }
-
-        if($clone){
-            $cloneDoc = $registry->cloneNode(true);
-            $registry = $cloneDoc;
-        }
-        return $registry;
-
-    }
-
-    private static function getRegistryCacheKey($extendedVersion = true){
-
-        $logged = AuthService::getLoggedUser();
-        $u = $logged == null ? "shared" : $logged->getId();
-        $a = "norepository";
-        $r = ConfService::getRepository();
-        if($r !== null){
-            $a = $r->getSlug();
-        }
-        $v = $extendedVersion ? "extended":"light";
-        return "xml_registry:".$v.":".$u.":".$a;
-
-    }
-
-    /**
-     * Check the current user "specificActionsRights" and filter the full registry actions with these.
-     * @static
-     * @param DOMDocument $registry
-     * @return bool
-     */
-    public static function filterRegistryFromRole(&$registry)
-    {
-        if(!AuthService::usersEnabled()) return false ;
-        $loggedUser = AuthService::getLoggedUser();
-        if($loggedUser == null) return false;
-        $crtRepo = ConfService::getRepository();
-        $crtRepoId = AJXP_REPO_SCOPE_ALL; // "ajxp.all";
-        if ($crtRepo != null && is_a($crtRepo, "Repository")) {
-            $crtRepoId = $crtRepo->getId();
-        }
-        $actionRights = $loggedUser->mergedRole->listActionsStatesFor($crtRepo);
-        $changes = false;
-        $xPath = new DOMXPath($registry);
-        foreach ($actionRights as $pluginName => $actions) {
-            foreach ($actions as $actionName => $enabled) {
-                if($enabled !== false) continue;
-                $actions = $xPath->query("actions/action[@name='$actionName']");
-                if (!$actions->length) {
-                    continue;
-                }
-                $action = $actions->item(0);
-                $action->parentNode->removeChild($action);
-                $changes = true;
-            }
-        }
-        $parameters = $loggedUser->mergedRole->listParameters();
-        foreach ($parameters as $scope => $paramsPlugs) {
-            if ($scope === AJXP_REPO_SCOPE_ALL || $scope === $crtRepoId || ($crtRepo!=null && $crtRepo->hasParent() && $scope === AJXP_REPO_SCOPE_SHARED)) {
-                foreach ($paramsPlugs as $plugId => $params) {
-                    foreach ($params as $name => $value) {
-                        // Search exposed plugin_configs, replace if necessary.
-                        $searchparams = $xPath->query("plugins/*[@id='$plugId']/plugin_configs/property[@name='$name']");
-                        if(!$searchparams->length) continue;
-                        $param = $searchparams->item(0);
-                        $newCdata = $registry->createCDATASection(json_encode($value));
-                        $param->removeChild($param->firstChild);
-                        $param->appendChild($newCdata);
-                    }
-                }
-            }
-        }
-        return $changes;
-    }
-
-
-    /**
-     * @param AbstractAjxpUser $loggedUser
-     * @param String|int $parameterId
-     * @return bool
-     */
-    public static function switchUserToActiveRepository($loggedUser, $parameterId = -1)
-    {
-        if (isSet($_SESSION["PENDING_REPOSITORY_ID"]) && isSet($_SESSION["PENDING_FOLDER"])) {
-            $loggedUser->setArrayPref("history", "last_repository", $_SESSION["PENDING_REPOSITORY_ID"]);
-            $loggedUser->setPref("pending_folder", $_SESSION["PENDING_FOLDER"]);
-            AuthService::updateUser($loggedUser);
-            unset($_SESSION["PENDING_REPOSITORY_ID"]);
-            unset($_SESSION["PENDING_FOLDER"]);
-        }
-        $currentRepoId = ConfService::getCurrentRepositoryId();
-        $lastRepoId  = $loggedUser->getArrayPref("history", "last_repository");
-        $defaultRepoId = AuthService::getDefaultRootId();
-        if ($defaultRepoId == -1) {
-            return false;
-        } else {
-            if ($lastRepoId !== "" && $lastRepoId!==$currentRepoId && $parameterId == -1 && $loggedUser->canSwitchTo($lastRepoId)) {
-                ConfService::switchRootDir($lastRepoId);
-            } else if ($parameterId != -1 && $loggedUser->canSwitchTo($parameterId)) {
-                ConfService::switchRootDir($parameterId);
-            } else if (!$loggedUser->canSwitchTo($currentRepoId)) {
-                ConfService::switchRootDir($defaultRepoId);
-            }
-        }
-        return true;
-    }
-
-
-    /**
-     * See instance method
-     * @static
-     * @param $rootDirIndex
-     * @param bool $temporary
-     * @return void
-     */
-    public static function switchRootDir($rootDirIndex = -1, $temporary = false)
-    {
-        self::getInstance()->switchRootDirInst($rootDirIndex, $temporary);
-    }
-    /**
-     * Switch the current repository
-     * @param $rootDirIndex
-     * @param bool $temporary
-     * @return void
-     */
-    public function switchRootDirInst($rootDirIndex=-1, $temporary=false)
-    {
-        if ($rootDirIndex == -1) {
-            $ok = false;
-            if (isSet($_SESSION['REPO_ID']) || $this->contextRepositoryId != null) {
-                $sessionId = self::$useSession ? $_SESSION['REPO_ID']  : $this->contextRepositoryId;
-                $object = self::getRepositoryById($sessionId);
-                if($object != null && self::repositoryIsAccessible($sessionId, $object)){
-                    $this->configs["REPOSITORY"] = $object;
-                    $ok = true;
-                }
-            }
-            if(!$ok) {
-                $currentRepos = $this->getLoadedRepositories();
-                $keys = array_keys($currentRepos);
-                $this->configs["REPOSITORY"] = $currentRepos[$keys[0]];
-                if(self::$useSession){
-                    $_SESSION['REPO_ID'] = $keys[0];
-                }else{
-                    $this->contextRepositoryId = $keys[0];
-                }
-            }
-        } else {
-            $object = self::getRepositoryById($rootDirIndex);
-            if($temporary && ($object == null || !self::repositoryIsAccessible($rootDirIndex, $object))) {
-                throw new AJXP_Exception("Trying to switch to an unauthorized repository");
-            }
-            if ($temporary && (isSet($_SESSION['REPO_ID']) || $this->contextRepositoryId != null)) {
-                $crtId =  self::$useSession ? $_SESSION['REPO_ID']  : $this->contextRepositoryId;
-                if ($crtId != $rootDirIndex && !isSet($_SESSION['SWITCH_BACK_REPO_ID'])) {
-                    $_SESSION['SWITCH_BACK_REPO_ID'] = $crtId;
-                    //AJXP_Logger::debug("switching to $rootDirIndex, registering $crtId");
-                }
-            } else {
-                $crtId =  self::$useSession ? $_SESSION['REPO_ID']  : $this->contextRepositoryId;
-                $_SESSION['PREVIOUS_REPO_ID'] = $crtId;
-                //AJXP_Logger::debug("switching back to $rootDirIndex");
-            }
-            if (isSet($this->configs["REPOSITORIES"]) && isSet($this->configs["REPOSITORIES"][$rootDirIndex])) {
-                $this->configs["REPOSITORY"] = $this->configs["REPOSITORIES"][$rootDirIndex];
-            } else {
-                $this->configs["REPOSITORY"] = ConfService::getRepositoryById($rootDirIndex);
-            }
-            if(self::$useSession){
-                $_SESSION['REPO_ID'] = $rootDirIndex;
-            }else{
-                $this->contextRepositoryId = $rootDirIndex;
-            }
-            if(isSet($this->configs["ACCESS_DRIVER"])) unset($this->configs["ACCESS_DRIVER"]);
-        }
-
-        if (isSet($this->configs["REPOSITORY"]) && $this->configs["REPOSITORY"]->getOption("CHARSET")!="") {
-            self::setContextCharset($this->configs["REPOSITORY"]->getOption("CHARSET"));
-        } else {
-            self::clearContextCharset();
-        }
-
-
-        if ($rootDirIndex!=-1 && AuthService::usersEnabled() && AuthService::getLoggedUser()!=null) {
-            $loggedUser = AuthService::getLoggedUser();
-            $loggedUser->setArrayPref("history", "last_repository", $rootDirIndex);
-        }
-
-    }
-
-    /**
-     * See instance method
-     * @static
-     * @param String $scope "user" or "all"
-     * @param bool $includeShared
-     * @return Repository[]
-     */
-    public static function getRepositoriesList($scope = "user", $includeShared = true)
-    {
-        if ($scope == "user") {
-            return self::getInstance()->getLoadedRepositories();
-        } else {
-            return self::getInstance()->initRepositoriesListInst("all", $includeShared);
-        }
-    }
-
-    public static function detectSessionCorrupted($logMessage){
-        if(isSet($_SESSION["REPOSITORIES"])){
-            $sessionNotCorrupted = array_reduce($_SESSION["REPOSITORIES"], function($carry, $item){ return $carry && is_a($item, "Repository"); }, true);
-            if(!$sessionNotCorrupted){
-                error_log("[session corrupted] ".$logMessage." ".$_GET["get_action"]."".$_POST["get_action"]);
-            }
-        }
-    }
-
-    /**
-     * @return Repository[]
-     */
-    private function getLoadedRepositories()
-    {
-        if (!isSet($this->configs["REPOSITORIES"]) && isSet($_SESSION["REPOSITORIES"]) && is_array($_SESSION["REPOSITORIES"])){
-            $sessionNotCorrupted = array_reduce($_SESSION["REPOSITORIES"], function($carry, $item){ return $carry && is_a($item, "Repository"); }, true);
-            if($sessionNotCorrupted){
-                $this->configs["REPOSITORIES"] = $_SESSION["REPOSITORIES"];
-                return $_SESSION["REPOSITORIES"];
-            }else{
-                unset($_SESSION["REPOSITORIES"]);
-            }
-        }
-        if (isSet($this->configs["REPOSITORIES"])) {
-            $configsNotCorrupted = array_reduce($this->configs["REPOSITORIES"], function($carry, $item){ return $carry && is_a($item, "Repository"); }, true);
-            if($configsNotCorrupted){
-                return $this->configs["REPOSITORIES"];
-            }else{
-                unset($this->configs["REPOSITORIES"]);
-            }
-        }
-        $this->configs["REPOSITORIES"] = $this->initRepositoriesListInst();
-        $_SESSION["REPOSITORIES"] = $this->configs["REPOSITORIES"];
-        return $this->configs["REPOSITORIES"];
-    }
-
-    public function invalidateLoadedRepositories()
-    {
-        if(isSet($_SESSION["REPOSITORIES"])) unset($_SESSION["REPOSITORIES"]);
-        $this->configs["REPOSITORIES"] = null;
-        CacheService::delete(AJXP_CACHE_SERVICE_NS_SHARED, $this->getRegistryCacheKey(true));
-        CacheService::delete(AJXP_CACHE_SERVICE_NS_SHARED, $this->getRegistryCacheKey(false));
-    }
-
-    private function cacheRepository($repoId, $repository){
-        if(!is_array($this->configs["REPOSITORIES"])) return;
-        $this->configs["REPOSITORIES"][$repoId] = $repository;
-        $_SESSION["REPOSITORIES"] = $this->configs["REPOSITORIES"];
-    }
-
-    private function removeRepositoryFromCache($repositoryId){
-        if(!is_array($this->configs["REPOSITORIES"]) || !isSet($this->configs["REPOSITORIES"][$repositoryId])) return;
-        unset($this->configs["REPOSITORIES"][$repositoryId]);
-        $_SESSION["REPOSITORIES"] = $this->configs["REPOSITORIES"];
-    }
-
-    /**
-     * @static
-     * @param AbstractAjxpUser $userObject
-     * @param bool $details
-     * @param bool $labelOnly
-     * @param bool $includeShared
-     * @return Repository[]
-     */
-    public static function getAccessibleRepositories($userObject=null, $details=false, $labelOnly = false, $includeShared = true)
-    {
-        $result = array();
-        $allReps = ConfService::getRepositoriesList("user");
-        foreach ($allReps as $repositoryId => $repositoryObject) {
-            if (!ConfService::repositoryIsAccessible($repositoryId, $repositoryObject, $userObject, $details, $includeShared)) {
-                continue;
-            }
-
-            if ($labelOnly) {
-                $result[$repositoryId] = $repositoryObject->getDisplay();
-            } else {
-                $result[$repositoryId] = $repositoryObject;
-            }
-
-        }
-        return $result;
-    }
-
-    /**
-     * @param String $repositoryId
-     * @param Repository $repositoryObject
-     * @param AbstractAjxpUser $userObject
-     * @param bool $details
-     * @param bool $includeShared
-     *
-     * @return bool
-     */
-    public static function repositoryIsAccessible($repositoryId, $repositoryObject, $userObject = null, $details=false, $includeShared=true)
-    {
-        if($userObject == null) $userObject = AuthService::getLoggedUser();
-        if ($userObject == null && AuthService::usersEnabled()) {
-            return false;
-        }
-        if (!AuthService::canAssign($repositoryObject, $userObject)) {
-            return false;
-        }
-        if ($repositoryObject->isTemplate) {
-            return false;
-        }
-        if (($repositoryObject->getAccessType()=="ajxp_conf" || $repositoryObject->getAccessType()=="ajxp_admin") && $userObject != null) {
-            if (AuthService::usersEnabled() && !$userObject->isAdmin()) {
-                return false;
-            }
-        }
-        if ($repositoryObject->getAccessType()=="ajxp_user" && $userObject != null) {
-            return ($userObject->canRead($repositoryId) || $userObject->canWrite($repositoryId)) ;
-        }
-        if ($repositoryObject->getAccessType() == "ajxp_shared" && !AuthService::usersEnabled()) {
-            return false;
-        }
-        if ($repositoryObject->getUniqueUser() && (!AuthService::usersEnabled() || $userObject == null  || $userObject->getId() == "shared" || $userObject->getId() != $repositoryObject->getUniqueUser() )) {
-            return false;
-        }
-        if ( $userObject != null && !($userObject->canRead($repositoryId) || $userObject->canWrite($repositoryId)) && !$details) {
-            return false;
-        }
-        if ($userObject == null || $userObject->canRead($repositoryId) || $userObject->canWrite($repositoryId) || $details) {
-            // Do not display standard repositories even in details mode for "sub"users
-            if ($userObject != null && $userObject->hasParent() && !($userObject->canRead($repositoryId) || $userObject->canWrite($repositoryId) )) {
-                return false;
-            }
-            // Do not display shared repositories otherwise.
-            if ($repositoryObject->hasOwner() && !$includeShared && ($userObject == null || $userObject->getParent() != $repositoryObject->getOwner())) {
-                return false;
-            }
-            if ($userObject != null && $repositoryObject->hasOwner() && !$userObject->hasParent()) {
-                // Display the repositories if allow_crossusers is ok
-                if(ConfService::getCoreConf("ALLOW_CROSSUSERS_SHARING", "conf") === false
-                || ConfService::getCoreConf("ALLOW_CROSSUSERS_SHARING", "conf") === 0) {
-                    return false;
-                }
-                // But still do not display its own shared repositories!
-                if ($repositoryObject->getOwner() == $userObject->getId()) {
-                    return false;
-                }
-            }
-            if ($repositoryObject->hasOwner() && $userObject != null &&  $details && !($userObject->canRead($repositoryId) || $userObject->canWrite($repositoryId) ) ) {
-                return false;
-            }
-        }
-        $res = null;
-        $args = array($repositoryId, $repositoryObject, $userObject, &$res);
-        AJXP_Controller::applyIncludeHook("repository.test_access", $args);
-        if($res === false){
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Return the full list of repositories, as id => objects
-     * @return array
-     */
-    public function getRepositoriesListInst()
-    {
-        return $this->getLoadedRepositories();
-    }
-
-    /**
-     * See instance method
-     * @static
-     * @return string
-     */
-    public static function getCurrentRepositoryId()
-    {
-        return self::getInstance()->getCurrentRepositoryIdInst();
-    }
-    /**
-     * Get the current repository ID;
-     * @return string
-     */
-    public function getCurrentRepositoryIdInst()
-    {
-        $ctxId = $this->getContextRepositoryId();
-        if(!empty($ctxId) || $ctxId."" === "0"){
-            $object = self::getRepositoryById($ctxId);
-            if($object != null && self::repositoryIsAccessible($ctxId, $object)){
-                return $ctxId;
-            }
-        }
-        $currentRepos = $this->getLoadedRepositories();
-        $keys = array_keys($currentRepos);
-        return array_shift($keys);
-    }
-    /**
-     * Get the current repo label
-     * @static
-     * @return string
-     */
-    public static function getCurrentRootDirDisplay()
-    {
-        return self::getInstance()->getCurrentRootDirDisplayInst();
-    }
-    /**
-     * @return string
-     */
-    public function getCurrentRootDirDisplayInst()
-    {
-        $currentRepos = $this->getLoadedRepositories();
-        $ctxId = $this->getContextRepositoryId();
-        if (isSet($currentRepos[$ctxId])) {
-            $repo = $currentRepos[$ctxId];
-            return $repo->getDisplay();
-        }
-        return "";
-    }
-
-    /**
-     * @param Repository[] $repoList
-     * @param array $criteria
-     * @return Repository[] array
-     */
-    public static function filterRepositoryListWithCriteria($repoList, $criteria){
-        $repositories = array();
-        $searchableKeys = array("uuid", "parent_uuid", "owner_user_id", "display", "accessType", "isTemplate", "slug", "groupPath");
-        foreach ($repoList as $repoId => $repoObject) {
-            $failOneCriteria = false;
-            foreach($criteria as $key => $value){
-                if(!in_array($key, $searchableKeys)) continue;
-                $criteriumOk = false;
-                $comp = null;
-                if($key == "uuid") $comp = $repoObject->getUniqueId();
-                else if($key == "parent_uuid") $comp = $repoObject->getParentId();
-                else if($key == "owner_user_id") $comp = $repoObject->getUniqueUser();
-                else if($key == "display") $comp = $repoObject->getDisplay();
-                else if($key == "accessType") $comp = $repoObject->getAccessType();
-                else if($key == "isTemplate") $comp = $repoObject->isTemplate;
-                else if($key == "slug") $comp = $repoObject->getSlug();
-                else if($key == "groupPath") $comp = $repoObject->getGroupPath();
-                if(is_array($value) && in_array($comp, $value)){
-                    //$repositories[$repoId] = $repoObject;
-                    $criteriumOk = true;
-                }else if($value == AJXP_FILTER_EMPTY && empty($comp)){
-                    //$repositories[$repoId] = $repoObject;
-                    $criteriumOk = true;
-                }else if($value == AJXP_FILTER_NOT_EMPTY && !empty($comp)){
-                    //$repositories[$repoId] = $repoObject;
-                    $criteriumOk = true;
-                }else if(is_string($value) && strpos($value, "regexp:")===0 && preg_match(str_replace("regexp:", "", $value), $comp)){
-                    //$repositories[$repoId] = $repoObject;
-                    $criteriumOk = true;
-                }else if($value == $comp){
-                    //$repositories[$repoId] = $repoObject;
-                    $criteriumOk = true;
-                }
-                if(!$criteriumOk) {
-                    $failOneCriteria = true;
-                    break;
-                }
-            }
-            if(!$failOneCriteria){
-                $repositories[$repoId] = $repoObject;
-            }
-        }
-        return $repositories;
-    }
-
-    /**
-     * @param array $criteria
-     * @param $count
-     * @return Repository[]
-     */
-    public static function listRepositoriesWithCriteria($criteria, &$count){
-
-        $statics = array();
-        foreach (self::getInstance()->configs["DEFAULT_REPOSITORIES"] as $index=>$repository) {
-            $repo = self::createRepositoryFromArray($index, $repository);
-            $repo->setWriteable(false);
-            $statics[$repo->getId()] = $repo;
-        }
-        $statics = self::filterRepositoryListWithCriteria($statics, $criteria);
-        $dyna = self::getInstance()->getConfStorageImpl()->listRepositoriesWithCriteria($criteria, $count);
-        $count += count($statics);
-        return array_merge($statics, $dyna);
-
-    }
-
-    /**
-     * @param $scope String "user", "all"
-     * @param bool $includeShared
-     * @return array
-     */
-    protected function initRepositoriesListInst($scope = "user", $includeShared = true)
-    {
-        // APPEND CONF FILE REPOSITORIES
-        $loggedUser = AuthService::getLoggedUser();
-        $objList = array();
-        if($loggedUser != null){
-            $l = $loggedUser->getLock();
-            if( !empty($l)) return $objList;
-        }
-        foreach ($this->configs["DEFAULT_REPOSITORIES"] as $index=>$repository) {
-            $repo = self::createRepositoryFromArray($index, $repository);
-            if($scope == "user" && $loggedUser != null && !self::repositoryIsAccessible($index, $repo, $loggedUser)){
-                continue;
-            }
-            $repo->setWriteable(false);
-            $objList["".$repo->getId()] = $repo;
-        }
-        // LOAD FROM DRIVER
-        $confDriver = self::getConfStorageImpl();
-        if($scope == "user"){
-            $acls = array();
-            if(AuthService::getLoggedUser() != null){
-                $acls = AuthService::getLoggedUser()->mergedRole->listAcls(true);
-            }
-            if(!count($acls)) {
-                $drvList = array();
-            }else{
-                $criteria = array(
-                    "uuid" => array_keys($acls)
-                );
-                $drvList = $confDriver->listRepositoriesWithCriteria($criteria);
-            }
-        }else{
-            if($includeShared){
-                $drvList = $confDriver->listRepositories();
-            }else{
-                $drvList = $confDriver->listRepositoriesWithCriteria(array(
-                    "owner_user_id" => AJXP_FILTER_EMPTY
-                ));
-            }
-        }
-        if (is_array($drvList)) {
-            /**
-             * @var $drvList Repository[]
-             */
-            foreach ($drvList as $repoId=>$repoObject) {
-                $driver = AJXP_PluginsService::getInstance()->getPluginByTypeName("access", $repoObject->getAccessType());
-                if (!is_object($driver) || !$driver->isEnabled()) {
-                    unset($drvList[$repoId]);
-                } else {
-                    $repoObject->setId($repoId);
-                    $drvList[$repoId] = $repoObject;
-                }
-                if($repoObject->hasParent() && !ConfService::findRepositoryByIdOrAlias($repoObject->getParentId())){
-                    AJXP_Logger::error(__CLASS__, __FUNCTION__, "Disabling repository ".$repoObject->getSlug()." as parent cannot be correctly loaded.");
-                    unset($drvList[$repoId]);
-                }
-            }
-            foreach($drvList as $key => $value){
-                $objList[$key] = $value;
-            }
-        }
-        $args = array(&$objList, $scope, $includeShared);
-        AJXP_Controller::applyIncludeHook("repository.list", $args);
-        return $objList;
-    }
-    /**
-     * See instance method
-     * @static
-     * @param bool $register
-     * @return array
-     */
-    public static function detectRepositoryStreams($register = false)
-    {
-        return self::getInstance()->detectRepositoryStreamsInst($register);
-    }
-    /**
-     * Call the detectStreamWrapper method
-     * @param bool $register
-     * @return array
-     */
-    public function detectRepositoryStreamsInst($register = false)
-    {
-        $streams = array();
-        $currentRepos = $this->getLoadedRepositories();
-        foreach ($currentRepos as $repository) {
-            $repository->detectStreamWrapper($register, $streams);
-        }
-        return $streams;
-    }
-
-    /**
-     * Create a repository object from a config options array
-     *
-     * @param integer $index
-     * @param Array $repository
-     * @return Repository
-     */
-    public static function createRepositoryFromArray($index, $repository)
-    {
-        return self::getInstance()->createRepositoryFromArrayInst($index, $repository);
-    }
-    /**
-     * See static method
-     * @param string $index
-     * @param array $repository
-     * @return Repository
-     */
-    public function createRepositoryFromArrayInst($index, $repository)
-    {
-        $repo = new Repository($index, $repository["DISPLAY"], $repository["DRIVER"]);
-        if (isSet($repository["DISPLAY_ID"])) {
-            $repo->setDisplayStringId($repository["DISPLAY_ID"]);
-        }
-        if (isSet($repository["DESCRIPTION_ID"])) {
-            $repo->setDescription($repository["DESCRIPTION_ID"]);
-        }
-        if (isSet($repository["AJXP_SLUG"])) {
-            $repo->setSlug($repository["AJXP_SLUG"]);
-        }
-        if (isSet($repository["IS_TEMPLATE"]) && $repository["IS_TEMPLATE"]) {
-            $repo->isTemplate = true;
-            $repo->uuid = $index;
-        }
-        if (array_key_exists("DRIVER_OPTIONS", $repository) && is_array($repository["DRIVER_OPTIONS"])) {
-            foreach ($repository["DRIVER_OPTIONS"] as $oName=>$oValue) {
-                $repo->addOption($oName, $oValue);
-            }
-        }
-        // BACKWARD COMPATIBILITY!
-        if (array_key_exists("PATH", $repository)) {
-            $repo->addOption("PATH", $repository["PATH"]);
-            $repo->addOption("CREATE", intval($repository["CREATE"]));
-            $repo->addOption("RECYCLE_BIN", $repository["RECYCLE_BIN"]);
-        }
-        return $repo;
-    }
-
-    /**
-     * Add dynamically created repository
-     *
-     * @param Repository $oRepository
-     * @return -1|null if error
-     */
-    public static function addRepository($oRepository)
-    {
-        return self::getInstance()->addRepositoryInst($oRepository);
-    }
-    /**
-     * @param Repository $oRepository
-     * @return -1|null on error
-     */
-    public function addRepositoryInst($oRepository)
-    {
-        AJXP_Controller::applyHook("workspace.before_create", array($oRepository));
-        $confStorage = self::getConfStorageImpl();
-        $res = $confStorage->saveRepository($oRepository);
-        if ($res == -1) {
-            return $res;
-        }
-        AJXP_Controller::applyHook("workspace.after_create", array($oRepository));
-        AJXP_Logger::info(__CLASS__,"Create Repository", array("repo_name"=>$oRepository->getDisplay()));
-        CacheService::save(AJXP_CACHE_SERVICE_NS_SHARED, "repository:".$oRepository->getId(), $oRepository);
-        $this->invalidateLoadedRepositories();
-        return null;
-    }
-
-    /**
-     * @param $idOrAlias
-     * @return null|Repository
-     */
-    public static function findRepositoryByIdOrAlias($idOrAlias)
-    {
-        $repository = ConfService::getRepositoryById($idOrAlias);
-        if($repository != null ) return $repository;
-        $repository = ConfService::getRepositoryByAlias($idOrAlias);
-        if($repository != null) return $repository;
-        return null;
-    }
-
-    /**
-     * Get the reserved slugs used for config defined repositories
-     * @return array
-     */
-    public static function reservedSlugsFromConfig(){
-        $inst = self::getInstance();
-        $slugs = array();
-        if(isSet($inst->configs["DEFAULT_REPOSITORIES"])){
-            foreach($inst->configs["DEFAULT_REPOSITORIES"] as $repo){
-                if(isSet($repo["AJXP_SLUG"])){
-                    $slugs[] = $repo["AJXP_SLUG"];
-                }
-            }
-        }
-        return $slugs;
-    }
-
-    /**
-     * Retrieve a repository object
-     *
-     * @param String $repoId
-     * @return Repository
-     */
-    public static function getRepositoryById($repoId)
-    {
-        return self::getInstance()->getRepositoryByIdInst($repoId);
-    }
-    /**
-     * See static method
-     * @param $repoId
-     * @return Repository|null
-     */
-    public function getRepositoryByIdInst($repoId)
-    {
-        if (isSet($this->configs["REPOSITORIES"]) && isSet($this->configs["REPOSITORIES"][$repoId])) {
-            return $this->configs["REPOSITORIES"][$repoId];
-        }
-        if (iSset($this->configs["REPOSITORY"]) && $this->configs["REPOSITORY"]->getId()."" == $repoId) {
-            return $this->configs["REPOSITORY"];
-        }
-        $test = CacheService::fetch(AJXP_CACHE_SERVICE_NS_SHARED, "repository:" . $repoId);
-        if($test !== false){
-            return $test;
-        }
-        $test =  $this->getConfStorageImpl()->getRepositoryById($repoId);
-        if($test != null) {
-            CacheService::save(AJXP_CACHE_SERVICE_NS_SHARED, "repository:" . $repoId, $test);
-            return $test;
-        }
-        // Finally try to search in default repositories
-        if (isSet($this->configs["DEFAULT_REPOSITORIES"]) && isSet($this->configs["DEFAULT_REPOSITORIES"][$repoId])) {
-            $repo = self::createRepositoryFromArray($repoId, $this->configs["DEFAULT_REPOSITORIES"][$repoId]);
-            $repo->setWriteable(false);
-            CacheService::save(AJXP_CACHE_SERVICE_NS_SHARED, "repository:" . $repoId, $repo);
-            return $repo;
-        }
-        $hookedRepo = null;
-        $args = array($repoId, &$hookedRepo);
-        AJXP_Controller::applyIncludeHook("repository.search", $args);
-        if($hookedRepo !== null){
-            return $hookedRepo;
-        }
-        return null;
-    }
-
-    /**
-     * Retrieve a repository object by its slug
-     *
-     * @param String $repoAlias
-     * @return Repository
-     */
-    public static function getRepositoryByAlias($repoAlias)
-    {
-        $repo = self::getConfStorageImpl()->getRepositoryByAlias($repoAlias);
-        if($repo !== null) return $repo;
-        // check default repositories
-        return self::getInstance()->getRepositoryByAliasInstDefaults($repoAlias);
-    }
-    /**
-     * See static method
-     * @param $repoAlias
-     * @return Repository|null
-     */
-    public function getRepositoryByAliasInstDefaults($repoAlias)
-    {
-        $conf = $this->configs["DEFAULT_REPOSITORIES"];
-        foreach ($conf as $repoId => $repoDef) {
-            if ($repoDef["AJXP_SLUG"] == $repoAlias) {
-                $repo = self::createRepositoryFromArray($repoId, $repoDef);
-                $repo->setWriteable(false);
-                return $repo;
-            }
-        }
-        return null;
-    }
-
-
-    /**
-     * Replace a repository by an update one.
-     *
-     * @param String $oldId
-     * @param Repository $oRepositoryObject
-     * @return mixed
-     */
-    public static function replaceRepository($oldId, $oRepositoryObject)
-    {
-        return self::getInstance()->replaceRepositoryInst($oldId, $oRepositoryObject);
-    }
-    /**
-     * See static method
-     * @param string $oldId
-     * @param Repository $oRepositoryObject
-     * @return int
-     */
-    public function replaceRepositoryInst($oldId, $oRepositoryObject)
-    {
-        AJXP_Controller::applyHook("workspace.before_update", array($oRepositoryObject));
-        $confStorage = self::getConfStorageImpl();
-        $res = $confStorage->saveRepository($oRepositoryObject, true);
-        if ($res == -1) {
-            return -1;
-        }
-        AJXP_Controller::applyHook("workspace.after_update", array($oRepositoryObject));
-        AJXP_Logger::info(__CLASS__,"Edit Repository", array("repo_name"=>$oRepositoryObject->getDisplay()));
-        $this->invalidateLoadedRepositories();
-        CacheService::save(AJXP_CACHE_SERVICE_NS_SHARED, "repository:" . $oRepositoryObject->getId(), $oRepositoryObject);
-        return 0;
-    }
-    /**
-     * Set a temp repository id but not in the session
-     * @static
-     * @param $repositoryObject
-     * @return void
-     */
-    public static function tmpReplaceRepository($repositoryObject)
-    {
-        $inst = self::getInstance();
-        if (isSet($inst->configs["REPOSITORIES"][$repositoryObject->getUniqueId()])) {
-            $inst->configs["REPOSITORIES"][$repositoryObject->getUniqueId()] = $repositoryObject;
-        }
-    }
-    /**
-     * Remove a repository using the conf driver implementation
-     * @static
-     * @param $repoId
-     * @return int
-     */
-    public static function deleteRepository($repoId)
-    {
-        return self::getInstance()->deleteRepositoryInst($repoId);
-    }
-    /**
-     * See static method
-     * @param $repoId
-     * @return int
-     */
-    public function deleteRepositoryInst($repoId)
-    {
-        AJXP_Controller::applyHook("workspace.before_delete", array($repoId));
-        $confStorage = self::getConfStorageImpl();
-        $shares = $confStorage->listRepositoriesWithCriteria(array("parent_uuid" => $repoId));
-        $toDelete = array();
-        foreach($shares as $share){
-            $toDelete[] = $share->getId();
-        }
-        $res = $confStorage->deleteRepository($repoId);
-        if ($res == -1) {
-            return $res;
-        }
-        foreach($toDelete as $deleteId){
-            $this->deleteRepositoryInst($deleteId);
-        }
-        AJXP_Controller::applyHook("workspace.after_delete", array($repoId));
-        AJXP_Logger::info(__CLASS__,"Delete Repository", array("repo_id"=>$repoId));
-        $this->invalidateLoadedRepositories();
-        CacheService::delete(AJXP_CACHE_SERVICE_NS_SHARED, "repository:".$repoId);
-        return 0;
-    }
-
-    /**
-     * Check if the gzopen function exists
-     * @static
-     * @return bool
-     */
-    public static function zipEnabled()
-    {
-        return (function_exists("gzopen") || function_exists("gzopen64"));
-    }
-
-    /**
-     * Check if users are allowed to browse ZIP content
-     * @static
-     * @return bool
-     */
-    public static function zipBrowsingEnabled()
-    {
-        if(!self::zipEnabled()) return false;
-        return !ConfService::getCoreConf("DISABLE_ZIP_BROWSING");
-    }
-
-    /**
-     * Check if users are allowed to create ZIP archive
-     * @static
-     * @return bool
-     */
-    public static function zipCreationEnabled()
-    {
-        if(!self::zipEnabled()) return false;
-        return ConfService::getCoreConf("ZIP_CREATION");
-    }
-
-
-    /**
-     * Get the list of all "conf" messages
-     * @static
-     * @param bool $forceRefresh Refresh the list
-     * @return
-     */
-    public static function getMessagesConf($forceRefresh = false)
-    {
-        return self::getInstance()->getMessagesInstConf($forceRefresh);
-    }
-    /**
-     * See static method
-     * @param bool $forceRefresh
-     * @return
-     */
-    public function getMessagesInstConf($forceRefresh = false)
-    {
-        // make sure they are loaded
-        $this->getMessagesInst($forceRefresh);
-        return $this->configs["CONF_MESSAGES"];
-    }
-
-    /**
-     * Get all i18n message
-     * @static
-     * @param bool $forceRefresh
-     * @return
-     */
-    public static function getMessages($forceRefresh = false)
-    {
-        return self::getInstance()->getMessagesInst($forceRefresh);
-    }
-    /**
-     * Get i18n messages
-     * @param bool $forceRefresh
-     * @return
-     */
-    public function getMessagesInst($forceRefresh = false)
-    {
-        $crtLang = self::getLanguage();
-        $messageCacheDir = dirname(AJXP_PLUGINS_MESSAGES_FILE)."/i18n";
-        $messageFile = $messageCacheDir."/".$crtLang."_".basename(AJXP_PLUGINS_MESSAGES_FILE);
-        if (isSet($this->configs["MESSAGES"]) && !$forceRefresh) {
-            return $this->configs["MESSAGES"];
-        }
-        if (!isset($this->configs["MESSAGES"]) && is_file($messageFile)) {
-            include($messageFile);
-            if (isSet($MESSAGES)) {
-                $this->configs["MESSAGES"] = $MESSAGES;
-            }
-            if (isSet($CONF_MESSAGES)) {
-                $this->configs["CONF_MESSAGES"] = $CONF_MESSAGES;
-            }
-        } else {
-            $this->configs["MESSAGES"] = array();
-            $this->configs["CONF_MESSAGES"] = array();
-            $nodes = AJXP_PluginsService::getInstance()->searchAllManifests("//i18n", "nodes");
-            foreach ($nodes as $node) {
-                $nameSpace = $node->getAttribute("namespace");
-                $path = AJXP_INSTALL_PATH."/".$node->getAttribute("path");
-                $lang = $crtLang;
-                if (!is_file($path."/".$crtLang.".php")) {
-                    $lang = "en"; // Default language, minimum required.
-                }
-                if (is_file($path."/".$lang.".php")) {
-                    require($path."/".$lang.".php");
-                    if (isSet($mess)) {
-                        foreach ($mess as $key => $message) {
-                            $this->configs["MESSAGES"][(empty($nameSpace)?"":$nameSpace.".").$key] = $message;
-                        }
-                    }
-                }
-                $lang = $crtLang;
-                if (!is_file($path."/conf/".$crtLang.".php")) {
-                    $lang = "en";
-                }
-                if (is_file($path."/conf/".$lang.".php")) {
-                    $mess = array();
-                    require($path."/conf/".$lang.".php");
-                    $this->configs["CONF_MESSAGES"] = array_merge($this->configs["CONF_MESSAGES"], $mess);
-                }
-            }
-            if(!is_dir($messageCacheDir)) mkdir($messageCacheDir);
-            AJXP_VarsFilter::filterI18nStrings($this->configs["MESSAGES"]);
-            AJXP_VarsFilter::filterI18nStrings($this->configs["CONF_MESSAGES"]);
-            @file_put_contents($messageFile, "<?php \$MESSAGES = ".var_export($this->configs["MESSAGES"], true) ." ; \$CONF_MESSAGES = ".var_export($this->configs["CONF_MESSAGES"], true) ." ; ");
-        }
-
-        return $this->configs["MESSAGES"];
-    }
-
-    /**
-     * Clear the messages cache
-     */
-    public static function clearMessagesCache(){
-        $i18nFiles = glob(dirname(AJXP_PLUGINS_MESSAGES_FILE)."/i18n/*.ser");
-        if (is_array($i18nFiles)) {
-            foreach ($i18nFiles as $file) {
-                @unlink($file);
-            }
-        }
-    }
-
-    /**
-     * Get all registered extensions, from both the conf/extensions.conf.php and from the plugins
-     * @static
-     * @return
-     */
-    public static function getRegisteredExtensions()
-    {
-        return self::getInstance()->getRegisteredExtensionsInst();
-    }
-    /**
-     * See static method
-     * @return
-     */
-    public function getRegisteredExtensionsInst()
-    {
-        if (!isSet($this->configs["EXTENSIONS"])) {
-            $EXTENSIONS = array();
-            $RESERVED_EXTENSIONS = array();
-            include_once(AJXP_CONF_PATH."/extensions.conf.php");
-            $EXTENSIONS = array_merge($RESERVED_EXTENSIONS, $EXTENSIONS);
-            foreach ($EXTENSIONS as $key => $value) {
-                unset($EXTENSIONS[$key]);
-                $EXTENSIONS[$value[0]] = $value;
-            }
-            $nodes = AJXP_PluginsService::getInstance()->searchAllManifests("//extensions/extension", "nodes", true);
-            $res = array();
-            foreach ($nodes as $node) {
-                $res[$node->getAttribute("mime")] = array(
-                    $node->getAttribute("mime"),
-                    $node->getAttribute("icon"),
-                    $node->getAttribute("font"),
-                    $node->getAttribute("messageId")
-                );
-            }
-            if (count($res)) {
-                $EXTENSIONS = array_merge($EXTENSIONS, $res);
-            }
-            $this->configs["EXTENSIONS"] = $EXTENSIONS;
-        }
-        return $this->configs["EXTENSIONS"];
-    }
-    /**
-     * Get the actions that declare to skip the secure token in the plugins
-     * @static
-     * @return array
-     */
-    public static function getDeclaredUnsecureActions()
-    {
-        $test = AJXP_PluginsService::getInstance()->loadFromPluginQueriesCache("//action[@skipSecureToken]");
-        if (!empty($test) && is_array($test)) {
-            return $test;
-        } else {
-            $nodes = AJXP_PluginsService::getInstance()->searchAllManifests("//action[@skipSecureToken]", "nodes", false, false, true);
-            $res = array();
-            foreach ($nodes as $node) {
-                $res[] = $node->getAttribute("name");
-            }
-            AJXP_PluginsService::getInstance()->storeToPluginQueriesCache("//action[@skipSecureToken]", $res);
-            return $res;
-        }
-
-    }
-    /**
-     * Detect available languages from the core i18n library
-     * @static
-     * @return array
-     */
-    public static function listAvailableLanguages()
-    {
-        // Cache in session!
-        if (isSet($_SESSION["AJXP_LANGUAGES"]) && !isSet($_GET["refresh_langs"])) {
-            return $_SESSION["AJXP_LANGUAGES"];
-        }
-        $langDir = AJXP_COREI18N_FOLDER;
-        $languages = array();
-        if (($dh = opendir($langDir))!==FALSE) {
-            while (($file = readdir($dh)) !== false) {
-                $matches = array();
-                if (preg_match("/(.*)\.php/", $file, $matches) == 1) {
-                    $fRadical = $matches[1];
-                    include($langDir."/".$fRadical.".php");
-                    $langName = isSet($mess["languageLabel"])?$mess["languageLabel"]:"Not Found";
-                    $languages[$fRadical] = $langName;
-                }
-            }
-            closedir($dh);
-        }
-        if (count($languages)) {
-            $_SESSION["AJXP_LANGUAGES"] = $languages;
-        }
-        return $languages;
-    }
-
-    /**
-     * Get a config by its name
-     * @static
-     * @param string $varName
-     * @return mixed
-     */
-    public static function getConf($varName)
-    {
-        return self::getInstance()->getConfInst($varName);
-    }
-    /**
-     * Set a config by its name
-     * @static
-     * @param string $varName
-     * @param mixed $varValue
-     * @return void
-     */
-    public static function setConf($varName, $varValue)
-    {
-        self::getInstance()->setConfInst($varName, $varValue);
-    }
-    /**
-     * See static method
-     * @param $varName
-     * @return mixed
-     */
-    public function getConfInst($varName)
-    {
-        if (isSet($this->configs[$varName])) {
-            return $this->configs[$varName];
-        }
-        if (defined("AJXP_".$varName)) {
-            return constant("AJXP_".$varName);
-        }
-        return null;
-    }
-    /**
-     * See static method
-     * @param $varName
-     * @param $varValue
-     * @return void
-     */
-    public function setConfInst($varName, $varValue)
-    {
-        $this->configs[$varName] = $varValue;
-    }
-    /**
-     * Get config from the core.$coreType plugin
-     * @static
-     * @param string $varName
-     * @param string $coreType
-     * @return mixed|null|string
-     */
-    public static function getCoreConf($varName, $coreType = "ajaxplorer")
-    {
-        $coreP = AJXP_PluginsService::getInstance()->findPlugin("core", $coreType);
-        if($coreP === false) return null;
-        $confs = $coreP->getConfigs();
-        $confs = AuthService::filterPluginParameters("core.".$coreType, $confs);
-        return (isSet($confs[$varName]) ? AJXP_VarsFilter::filter($confs[$varName]) : null);
-    }
-
-    /**
-     * @var array Keep loaded labels in memory
-     */
-    private static $usersParametersCache = array();
-
-    /**
-     * @param string $parameterName Plugin parameter name
-     * @param AbstractAjxpUser|string $userIdOrObject
-     * @param string $pluginId Plugin name, core.conf by default
-     * @param null $defaultValue
-     * @return mixed
-     */
-    public static function getUserPersonalParameter($parameterName, $userIdOrObject, $pluginId="core.conf", $defaultValue=null){
-
-        $cacheId = $pluginId."-".$parameterName;
-        if(!isSet(self::$usersParametersCache[$cacheId])){
-            self::$usersParametersCache[$cacheId] = array();
-        }
-        // Passed an already loaded object
-        if(is_a($userIdOrObject, "AbstractAjxpUser")){
-            $value = $userIdOrObject->personalRole->filterParameterValue($pluginId, $parameterName, AJXP_REPO_SCOPE_ALL, $defaultValue);
-            self::$usersParametersCache[$cacheId][$userIdOrObject->getId()] = $value;
-            if(empty($value) && !empty($defaultValue)) $value = $defaultValue;
-            return $value;
-        }
-        // Already in memory cache
-        if(isSet(self::$usersParametersCache[$cacheId][$userIdOrObject])){
-            return self::$usersParametersCache[$cacheId][$userIdOrObject];
-        }
-
-        // Try to load personal role if it was already loaded.
-        $uRole = AuthService::getRole("AJXP_USR_/".$userIdOrObject);
-        if($uRole === false){
-            $uObject = self::getConfStorageImpl()->createUserObject($userIdOrObject);
-            if(isSet($uObject)){
-                $uRole = $uObject->personalRole;
-            }
-        }
-        if(empty($uRole)){
-            return $defaultValue;
-        }
-        $value = $uRole->filterParameterValue($pluginId, $parameterName, AJXP_REPO_SCOPE_ALL, $defaultValue);
-        if(empty($value) && !empty($defaultValue)) {
-            $value = $userIdOrObject;
-        }
-        self::$usersParametersCache[$cacheId][$userIdOrObject] = $value;
-        return $value;
-
-    }
-
-    /**
-     * Set the language in the session
-     * @static
-     * @param string $lang
-     * @return void
-     */
-    public static function setLanguage($lang)
-    {
-        self::getInstance()->setLanguageInst($lang);
-    }
-    /**
-     * See static method
-     * @param string $lang
-     * @return void
-     */
-    public function setLanguageInst($lang)
-    {
-        if (array_key_exists($lang, $this->configs["AVAILABLE_LANG"])) {
-            $this->configs["LANGUE"] = $lang;
-        }
-    }
-    /**
-     * Get the language from the session
-     * @static
-     * @return string
-     */
-    public static function getLanguage()
-    {
-        $lang = self::getInstance()->getConfInst("LANGUE");
-        if ($lang == null) {
-            $lang = self::getInstance()->getCoreConf("DEFAULT_LANGUAGE");
-        }
-        if(empty($lang)) return "en";
-        return $lang;
-    }
-
-    /**
-     * The current repository
-     * @return Repository
-     */
-    public static function getRepository()
-    {
-        return self::getInstance()->getRepositoryInst();
-    }
-    /**
-     * See static method
-     * @return Repository
-     */
-    public function getRepositoryInst()
-    {
-        $ctxId = $this->getContextRepositoryId();
-        if (!empty($ctxId) && isSet($this->configs["REPOSITORIES"])  &&  isSet($this->configs["REPOSITORIES"][$ctxId])) {
-            return $this->configs["REPOSITORIES"][$ctxId];
-        }
-        return isSet($this->configs["REPOSITORY"])?$this->configs["REPOSITORY"]:null;
-    }
-
-    /**
-     * Returns the repository access driver
-     * @return AJXP_Plugin
-     */
-    public static function loadRepositoryDriver()
-    {
-        return self::getInstance()->loadRepositoryDriverInst();
-    }
-
-    /**
-     * @static
-     * @param Repository $repository
-     * @return AbstractAccessDriver
-     */
-    public static function loadDriverForRepository(&$repository)
-    {
-        return self::getInstance()->loadRepositoryDriverInst($repository);
-    }
-
-    /**
-     * See static method
-     * @param Repository|null $repository
-     * @throws AJXP_Exception|Exception
-     * @return AbstractAccessDriver
-     */
-    private function loadRepositoryDriverInst(&$repository = null)
-    {
-        $rest = false;
-        if($repository == null){
-            if (isSet($this->configs["ACCESS_DRIVER"]) && is_a($this->configs["ACCESS_DRIVER"], "AbstractAccessDriver")) {
-                return $this->configs["ACCESS_DRIVER"];
-            }
-            $this->switchRootDirInst();
-            $repository = $this->getRepositoryInst();
-            if($repository == null){
-                throw new Exception("No active repository found for user!");
-            }
-        }else{
-            $rest = true;
-            if (isset($repository->driverInstance)) {
-                return $repository->driverInstance;
-            }
-        }
-        /**
-         * @var AbstractAccessDriver $plugInstance
-         */
-        $accessType = $repository->getAccessType();
-        $pServ = AJXP_PluginsService::getInstance();
-        $plugInstance = $pServ->getPluginByTypeName("access", $accessType);
-
-        // TRIGGER BEFORE INIT META
-        $metaSources = $repository->getOption("META_SOURCES");
-        if (isSet($metaSources) && is_array($metaSources) && count($metaSources)) {
-            $keys = array_keys($metaSources);
-            foreach ($keys as $plugId) {
-                if($plugId == "") continue;
-                $instance = $pServ->getPluginById($plugId);
-                if (!is_object($instance)) {
-                    continue;
-                }
-                if (!method_exists($instance, "beforeInitMeta")) {
-                    continue;
-                }
-                try {
-                    $instance->init(AuthService::filterPluginParameters($plugId, $metaSources[$plugId], $repository->getId()));
-                    $instance->beforeInitMeta($plugInstance, $repository);
-                } catch (Exception $e) {
-                    AJXP_Logger::error(__CLASS__, 'Meta plugin', 'Cannot instanciate Meta plugin, reason : '.$e->getMessage());
-                    $this->errors[] = $e->getMessage();
-                }
-            }
-        }
-
-        // INIT MAIN DRIVER
-        $plugInstance->init($repository);
-        try {
-            $plugInstance->initRepository();
-            $repository->driverInstance = $plugInstance;
-        } catch (Exception $e) {
-            if(!$rest){
-                // Remove repositories from the lists
-                if(!is_a($e, "AJXP_UserAlertException")){
-                    $this->removeRepositoryFromCache($repository->getId());
-                }
-                if (isSet($_SESSION["PREVIOUS_REPO_ID"]) && $_SESSION["PREVIOUS_REPO_ID"] !=$repository->getId()) {
-                    $this->switchRootDir($_SESSION["PREVIOUS_REPO_ID"]);
-                } else {
-                    $this->switchRootDir();
-                }
-            }
-            throw $e;
-        }
-
-        AJXP_PluginsService::deferBuildingRegistry();
-        $pServ->setPluginUniqueActiveForType("access", $accessType);
-
-        // TRIGGER INIT META
-        $metaSources = $repository->getOption("META_SOURCES");
-        if (isSet($metaSources) && is_array($metaSources) && count($metaSources)) {
-            $keys = array_keys($metaSources);
-            foreach ($keys as $plugId) {
-                if($plugId == "") continue;
-                $split = explode(".", $plugId);
-                $instance = $pServ->getPluginById($plugId);
-                if (!is_object($instance)) {
-                    continue;
-                }
-                try {
-                    $instance->init(AuthService::filterPluginParameters($plugId, $metaSources[$plugId], $repository->getId()));
-                    if(!method_exists($instance, "initMeta")) {
-                        throw new Exception("Meta Source $plugId does not implement the initMeta method.");
-                    }
-                    $instance->initMeta($plugInstance);
-                } catch (Exception $e) {
-                    AJXP_Logger::error(__CLASS__, 'Meta plugin', 'Cannot instanciate Meta plugin, reason : '.$e->getMessage());
-                    $this->errors[] = $e->getMessage();
-                }
-                $pServ->setPluginActive($split[0], $split[1]);
-            }
-        }
-        AJXP_PluginsService::flushDeferredRegistryBuilding();
-        if (count($this->errors)>0) {
-            $e = new AJXP_Exception("Error while loading repository feature : ".implode(",",$this->errors));
-            if(!$rest){
-                // Remove repositories from the lists
-                $this->removeRepositoryFromCache($repository->getId());
-                if (isSet($_SESSION["PREVIOUS_REPO_ID"]) && $_SESSION["PREVIOUS_REPO_ID"] !=$repository->getId()) {
-                    $this->switchRootDir($_SESSION["PREVIOUS_REPO_ID"]);
-                } else {
-                    $this->switchRootDir();
-                }
-            }
-            throw $e;
-        }
-        if($rest){
-            $ctxId = $this->getContextRepositoryId();
-            if ( (!empty($ctxId) || $ctxId === 0) && $ctxId == $repository->getId()) {
-                $this->configs["REPOSITORY"] = $repository;
-                $this->cacheRepository($ctxId, $repository);
-            }
-        } else {
-            $this->configs["ACCESS_DRIVER"] = $plugInstance;
-        }
-        return $plugInstance;
-    }
-
-    /**
-     * Search the manifests declaring ajxpdriver as their root node. Remove ajxp_* drivers
-     * @static
-     * @param string $filterByTagName
-     * @param string $filterByDriverName
-     * @param bool $limitToEnabledPlugins
-     * @return string
-     */
-    public static function availableDriversToXML($filterByTagName = "", $filterByDriverName="", $limitToEnabledPlugins = false)
-    {
-        $nodeList = AJXP_PluginsService::searchAllManifests("//ajxpdriver", "node", false, $limitToEnabledPlugins);
-        $xmlBuffer = "";
-        foreach ($nodeList as $node) {
-            $dName = $node->getAttribute("name");
-            if($filterByDriverName != "" && $dName != $filterByDriverName) continue;
-            if(strpos($dName, "ajxp_") === 0) continue;
-            if ($filterByTagName == "") {
-                $xmlBuffer .= $node->ownerDocument->saveXML($node);
-                continue;
-            }
-            $q = new DOMXPath($node->ownerDocument);
-            $cNodes = $q->query("//".$filterByTagName, $node);
-            $xmlBuffer .= "<ajxpdriver ";
-            foreach($node->attributes as $attr) $xmlBuffer.= " $attr->name=\"$attr->value\" ";
-            $xmlBuffer .=">";
-            foreach ($cNodes as $child) {
-                $xmlBuffer .= $child->ownerDocument->saveXML($child);
-            }
-            $xmlBuffer .= "</ajxpdriver>";
-        }
-        return $xmlBuffer;
-    }
-
-     /**
-      * Singleton method
-      *
-      * @return ConfService the service instance
-      */
-     public static function getInstance()
-     {
-         if (!isSet(self::$instance)) {
-             $c = __CLASS__;
-             self::$instance = new $c;
-         }
-         return self::$instance;
-     }
-     private function __construct(){}
-    public function __clone()
-    {
-        trigger_error("Cannot clone me, i'm a singleton!", E_USER_ERROR);
-    }
-
-}
diff --git a/core/src/core/classes/class.ContentFilter.php b/core/src/core/classes/class.ContentFilter.php
deleted file mode 100644
index 5132a9822b..0000000000
--- a/core/src/core/classes/class.ContentFilter.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Class ContentFilter
- */
-class ContentFilter {
-
-    public $filters = array();
-    public $virtualPaths = array();
-
-    /**
-     * @param AJXP_Node[] $nodes
-     */
-    function __construct($nodes){
-        foreach($nodes as $n){
-            $virtualPath = $this->getVirtualPath($n->getPath());
-            $this->filters[$n->getPath()] = $virtualPath;
-        }
-        $this->virtualPaths = array_flip($this->filters);
-    }
-
-    private function getVirtualPath($path){
-        return "/".substr(md5($path), 0, 10)."/".basename($path);
-    }
-
-    /**
-     * @param UserSelection $userSelection
-     */
-    function filterUserSelection( &$userSelection ){
-        if($userSelection->isEmpty()){
-            foreach($this->filters as $path => $virtual){
-                $userSelection->addFile($path);
-            }
-        }else{
-            $newFiles = array();
-            foreach($userSelection->getFiles() as $f){
-                if(isSet($this->virtualPaths[$f])){
-                    $newFiles[] = $this->virtualPaths[$f];
-                }else{
-                    $testB = base64_decode($f);
-                    if(isSet($this->virtualPaths[$testB])){
-                        $newFiles[] = $this->virtualPaths[$testB];
-                    }
-                }
-            }
-            $userSelection->setFiles($newFiles);
-        }
-    }
-
-    function getBaseDir(){
-        return AJXP_Utils::safeDirname(array_keys($this->filters)[0]);
-    }
-
-    function getUniquePath(){
-        return AJXP_Utils::safeBasename(array_keys($this->filters)[0]);
-    }
-
-    /**
-     * @param AJXP_Node $node
-     * @return String
-     */
-    function externalPath(AJXP_Node $node){
-        return $this->getVirtualPath($node->getPath());
-    }
-
-    /**
-     * @param String $vPath
-     * @return String mixed
-     */
-    function filterExternalPath($vPath){
-        if(isSet($this->virtualPaths) && isSet($this->virtualPaths[$vPath])){
-            return $this->virtualPaths[$vPath];
-        }
-        return $vPath;
-    }
-
-    /**
-     * @param String $oldPath
-     * @param String $newPath
-     * @return bool Operation result
-     */
-    public function movePath($oldPath, $newPath){
-
-        if(isSet($this->filters[$oldPath])){
-            $this->filters[$newPath] = $this->getVirtualPath($newPath);
-            unset($this->filters[$oldPath]);
-            $this->virtualPaths = array_flip($this->filters);
-            return true;
-        }
-        return false;
-
-    }
-
-    /**
-     * @return array public data as array, pre-utf8 encoded
-     */
-    public function toArray(){
-        $data = array("filters" => array(), "virtualPaths" => array());
-        foreach($this->filters as $k => $v){
-            $data["filters"][SystemTextEncoding::toUTF8($k)] = SystemTextEncoding::toUTF8($v);
-        }
-        foreach($this->virtualPaths as $k => $v){
-            $data["virtualPaths"][SystemTextEncoding::toUTF8($k)] = SystemTextEncoding::toUTF8($v);
-        }
-        return $data;
-    }
-
-    public function fromFilterArray($filters){
-        $this->filters = $filters;
-        $this->virtualPaths = array_flip($this->filters);
-    }
-
-} 
\ No newline at end of file
diff --git a/core/src/core/classes/class.HTMLWriter.php b/core/src/core/classes/class.HTMLWriter.php
deleted file mode 100644
index d612bb63a5..0000000000
--- a/core/src/core/classes/class.HTMLWriter.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Static functions for generating HTML.
- * @package Pydio
- * @subpackage Core
- */
-class HTMLWriter
-{
-    /**
-     * Write an HTML block message
-     * @static
-     * @param string $logMessage
-     * @param string $errorMessage
-     * @return void
-     */
-    public static function displayMessage($logMessage, $errorMessage)
-    {
-        $mess = ConfService::getMessages();
-        echo "<div title=\"".$mess[98]."\" id=\"message_div\" onclick=\"closeMessageDiv();\" class=\"messageBox ".(isset($logMessage)?"logMessage":"errorMessage")."\"><table width=\"100%\"><tr><td style=\"width: 66%;\">".(isset($logMessage)?$logMessage:$errorMessage)."</td><td style=\"color: #999; text-align: right;padding-right: 10px; width: 30%;\"><i>".$mess[98]."</i></tr></table></div>";
-        echo "<script>tempoMessageDivClosing();</script>";
-    }
-
-    /**
-     * Replace the doc files keywords
-     * @static
-     * @param string $docFileName
-     * @return string
-     */
-    public static function getDocFile($docFileName)
-    {
-        $realName = AJXP_DOCS_FOLDER."/".$docFileName.".txt";
-        if (is_file($realName)) {
-            $content = implode("<br>", file($realName));
-            $content = preg_replace("(http:\/\/[a-z|.|\/|\-|0-9]*)", "<a target=\"_blank\" href=\"$0\">$0</a>", $content);
-            $content = preg_replace("(\[(.*)\])", "<div class=\"title\">$1</div>", $content);
-            $content = preg_replace("(\+\+ (.*) \+\+)", "<div class=\"subtitle\">$1</div>", $content);
-            $content = str_replace("__AJXP_VERSION__", AJXP_VERSION, $content);
-            $content = str_replace("__AJXP_VERSION_DATE__", AJXP_VERSION_DATE, $content);
-            return $content;
-        }
-        return "File not found : ".$docFileName;
-    }
-    /**
-     * Write repository data directly as javascript string
-     * @static
-     * @return mixed|string
-     */
-    public static function repositoryDataAsJS()
-    {
-        if(AuthService::usersEnabled()) return "";
-        require_once(AJXP_BIN_FOLDER."/class.SystemTextEncoding.php");
-        require_once(AJXP_BIN_FOLDER."/class.AJXP_XMLWriter.php");
-        return str_replace("'", "\'", AJXP_XMLWriter::writeRepositoriesData(null));
-    }
-    /**
-     * Write the messages as Javascript
-     * @static
-     * @param array $mess
-     * @return void
-     */
-    public static function writeI18nMessagesClass($mess)
-    {
-        echo "<script language=\"javascript\">\n";
-        echo "if(!MessageHash) window.MessageHash = new Hash();\n";
-        foreach ($mess as $index => $message) {
-            // Make sure \n are double antislashed (\\n).
-            $message = preg_replace("/\n/", "\\\\n", $message);
-            if (is_numeric($index)) {
-                echo "MessageHash[$index]='".str_replace("'", "\'", $message)."';\n";
-            } else {
-                echo "MessageHash['$index']='".str_replace("'", "\'", $message)."';\n";
-            }
-
-        }
-        echo "MessageHash;";
-        echo "</script>\n";
-    }
-
-    /**
-     * Send a simple Content-type header
-     * @static
-     */
-    public static function internetExplorerMainDocumentHeader()
-    {
-        if (strstr($_SERVER["HTTP_USER_AGENT"], "MSIE 9.")) {
-            header("X-UA-Compatible: IE=9");
-        } else if (strstr($_SERVER["HTTP_USER_AGENT"], "MSIE 10.")) {
-            header("X-UA-Compatible: IE=Edge,chrome=1");
-        }
-    }
-
-    /**
-     * Send a simple Content-type header
-     * @static
-     * @param string $type
-     * @param string $charset
-     * @return void
-     */
-    public static function charsetHeader($type = 'text/html', $charset='UTF-8')
-    {
-        header("Content-type:$type; charset=$charset");
-    }
-    /**
-     * Write a closing </body></html> sequence
-     * @static
-     * @return void
-     */
-    public static function closeBodyAndPage()
-    {
-        print("</body></html>");
-    }
-
-    /**
-     * Write directly an error as a javascript instruction
-     * @static
-     * @param $errorType
-     * @param $errorMessage
-     */
-    public static function javascriptErrorHandler($errorType, $errorMessage)
-    {
-        // Handle "@" case!
-        if(error_reporting() == 0) return ;
-        restore_error_handler();
-        die("<script language='javascript'>parent.ajaxplorer.displayMessage('ERROR', '".str_replace("'", "\'", $errorMessage)."');</script>");
-    }
-
-    public static function encodeAttachmentName($name){
-        if (preg_match('/ MSIE /',$_SERVER['HTTP_USER_AGENT'])
-            || preg_match('/ WebKit /',$_SERVER['HTTP_USER_AGENT'])
-            || preg_match('/ Trident/',$_SERVER['HTTP_USER_AGENT'])) {
-            $name = str_replace("+", " ", urlencode(SystemTextEncoding::toUTF8($name)));
-        }
-        return $name;
-    }
-
-    /**
-     * @static
-     * @param string $attachmentName
-     * @param int $dataSize
-     * @param bool $isFile
-     * @param bool $gzip If true, make sure the $dataSize is the size of the ENCODED data.
-     */
-    public static function generateAttachmentsHeader(&$attachmentName, $dataSize, $isFile=true, $gzip=false)
-    {
-        $attachmentName = self::encodeAttachmentName($attachmentName);
-
-        header("Content-Type: application/force-download; name=\"".$attachmentName."\"");
-        header("Content-Transfer-Encoding: binary");
-        if ($gzip) {
-            header("Content-Encoding: gzip");
-        }
-        if ($dataSize >= 0) {
-        	header("Content-Length: ".$dataSize);
-        	if ($isFile && ($dataSize != 0)) {
-            	header("Content-Range: bytes 0-" . ($dataSize- 1) . "/" . $dataSize . ";");
-        	}
-        }
-        header("Content-Disposition: attachment; filename=\"".$attachmentName."\"");
-        header("Expires: 0");
-        header("Cache-Control: no-cache, must-revalidate");
-        header("Pragma: no-cache");
-        if (preg_match('/ MSIE /',$_SERVER['HTTP_USER_AGENT'])) {
-            header("Cache-Control: max_age=0");
-            header("Pragma: public");
-        }
-
-        // IE8 is dumb
-        if (preg_match('/ MSIE /',$_SERVER['HTTP_USER_AGENT'])) {
-            header("Pragma: public");
-            header("Expires: 0");
-            header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
-            header("Cache-Control: private",false);
-        }
-
-        // For SSL websites there is a bug with IE see article KB 323308
-        // therefore we must reset the Cache-Control and Pragma Header
-        if (ConfService::getConf("USE_HTTPS")==1 && preg_match('/ MSIE /',$_SERVER['HTTP_USER_AGENT'])) {
-            header("Cache-Control:");
-            header("Pragma:");
-        }
-    }
-
-    public static function generateInlineHeaders($attachName, $fileSize, $mimeType)
-    {
-        $attachName = self::encodeAttachmentName($attachName);
-
-        //Send headers
-        header("Content-Type: " . $mimeType . "; name=\"" . $attachName . "\"");
-        header("Content-Disposition: inline; filename=\"" . $attachName . "\"");
-        // changed header for IE 7 & 8
-        if (preg_match('/ MSIE /',$_SERVER['HTTP_USER_AGENT'])) {
-            header("Pragma: public");
-            header("Expires: 0");
-            header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
-            header("Cache-Control: private",false);
-        } else {
-            header("Cache-Control: public");
-        }
-        header("Content-Length: " . $fileSize);
-
-        // Neccessary for IE 8 and xx
-        if (ConfService::getConf("USE_HTTPS")==1 && preg_match('/ MSIE /',$_SERVER['HTTP_USER_AGENT'])) {
-            header("Cache-Control:");
-            header("Pragma:");
-        }
-
-    }
-
-}
diff --git a/core/src/core/classes/class.HttpClient.php b/core/src/core/classes/class.HttpClient.php
deleted file mode 100644
index 234942b12e..0000000000
--- a/core/src/core/classes/class.HttpClient.php
+++ /dev/null
@@ -1,499 +0,0 @@
-<?php
-/**
- * Version 0.9, 6th April 2003 - Simon Willison ( http://simon.incutio.com/ )
- * Manual: http://scripts.incutio.com/httpclient/
- * @package Pydio
- * @subpackage Core
- */
-
-class HttpClient
-{
-    // Request vars
-    public $host;
-    public $port;
-    public $path;
-    public $method;
-    public $postdata = '';
-    public $cookies = array();
-    public $referer;
-    public $accept = 'text/xml,application/xml,application/xhtml+xml,text/html,text/plain,image/png,image/jpeg,image/gif,*/*';
-    public $accept_encoding = 'gzip';
-    public $accept_language = 'en-us';
-    public $user_agent = 'Incutio HttpClient v0.9';
-    // Options
-    public $timeout = 20;
-    public $use_gzip = true;
-    public $persist_cookies = true;  // If true, received cookies are placed in the $this->cookies array ready for the next request
-                                  // Note: This currently ignores the cookie path (and time) completely. Time is not important,
-                                  //       but path could possibly lead to security problems.
-    public $persist_referers = true; // For each request, sends path of last request as referer
-    public $debug = false;
-    public $handle_redirects = true; // Auaomtically redirect if Location or URI header is found
-    public $max_redirects = 5;
-    public $headers_only = false;    // If true, stops receiving once headers have been read.
-    // Basic authorization variables
-    public $username;
-    public $password;
-    // Response vars
-    public $status;
-    public $headers = array();
-    public $content = '';
-    public $errormsg;
-    // Tracker variables
-    public $redirect_count = 0;
-    public $cookie_host = '';
-    public $postFileName = "userfile";
-    public $postFileData = array();
-    public $postDataArray = array();
-
-    public $directForwarding = false;
-    /**
-     * @var bool|resource
-     */
-    public $contentDestStream = false;
-    /**
-     * @var bool|callable
-     */
-    public $eventListener = false;
-
-    public $collectHeaders;
-
-    public function __construct($host, $port=80)
-    {
-        $this->host = $host;
-        $this->port = $port;
-    }
-    public function get($path, $data = false)
-    {
-        $this->path = $path;
-        $this->method = 'GET';
-        if ($data) {
-            $this->path .= '?'.$this->buildQueryString($data);
-        }
-        return $this->doRequest();
-    }
-    public function post($path, $data)
-    {
-        $this->path = $path;
-        $this->method = 'POST';
-        $this->postdata = $this->buildQueryString($data);
-        return $this->doRequest();
-    }
-    public function postFile($path, $postData, $fileVarName, $fileData)
-    {
-        $this->path = $path;
-        $this->method = 'POST';
-        $this->postFileData = $fileData;
-        $this->postDataArray = $postData;
-        $this->postFileName = $fileVarName;
-        $this->postdata = $this->buildQueryString($postData);
-        return $this->doRequest();
-    }
-
-    public function writeContentToStream($destStream)
-    {
-        $this->contentDestStream = $destStream;
-    }
-
-    public function clearContentDestStream()
-    {
-        $this->contentDestStream = false;
-    }
-
-    public function setEventListener($callback)
-    {
-        $this->eventListener = $callback;
-    }
-
-    public function notify($eventName, $data = null)
-    {
-        if($this->eventListener == false) return;
-        call_user_func($this->eventListener, $eventName, $data);
-    }
-
-    public function buildQueryString($data)
-    {
-        $querystring = '';
-        if (is_array($data)) {
-            // Change data in to postable data
-            foreach ($data as $key => $val) {
-                if (is_array($val)) {
-                    foreach ($val as $val2) {
-                        $querystring .= urlencode($key).'='.urlencode($val2).'&';
-                    }
-                } else {
-                    $querystring .= urlencode($key).'='.urlencode($val).'&';
-                }
-            }
-            $querystring = substr($querystring, 0, -1); // Eliminate unnecessary &
-        } else {
-            $querystring = $data;
-        }
-        return $querystring;
-    }
-    public function doRequest()
-    {
-        // Performs the actual HTTP request, returning true or false depending on outcome
-        $this->notify("open");
-        if (!$fp = @fsockopen($this->host, $this->port, $errno, $errstr, $this->timeout)) {
-            // Set error message
-            switch ($errno) {
-                case -3:
-                    $this->errormsg = 'Socket creation failed (-3)';
-                    break;
-                case -4:
-                    $this->errormsg = 'DNS lookup failure (-4)';
-                    break;
-                case -5:
-                    $this->errormsg = 'Connection refused or timed out (-5)';
-                    break;
-                default:
-                    $this->errormsg = 'Connection failed on '.$this->host.'('.$errno.')';
-                $this->errormsg .= ' '.$errstr;
-                $this->debug($this->errormsg);
-            }
-            $this->notify("error", $this->errormsg);
-            $this->notify("close");
-            return false;
-        }
-        socket_set_timeout($fp, $this->timeout);
-        $request = $this->buildRequest();
-        $this->debug('Request', $request);
-        @fwrite($fp, $request);
-        // Reset all the variables that should not persist between requests
-        $this->headers = array();
-        $this->content = '';
-        $this->errormsg = '';
-        // Set a couple of flags
-        $inHeaders = true;
-        $atStart = true;
-        $parsedHeaders = false;
-        $totalReadSize = 0;
-        // Now start reading back the response
-        while (!feof($fp)) {
-            @set_time_limit(60);
-            $line = fgets($fp, 4096);
-            if ($atStart) {
-                // Deal with first line of returned data
-                $atStart = false;
-                if (!preg_match('/HTTP\/(\\d\\.\\d)\\s*(\\d+)\\s*(.*)/', $line, $m)) {
-                    $this->errormsg = "Status code line invalid: ".htmlentities($line);
-                    $this->debug($this->errormsg);
-                    $this->notify("error", $this->errormsg);
-                    $this->notify("close");
-                    return false;
-                }
-                $http_version = $m[1]; // not used
-                $this->status = $m[2];
-                $status_string = $m[3]; // not used
-                $this->debug(trim($line));
-                continue;
-            }
-            if ($inHeaders) {
-                if (trim($line) == '') {
-                    $inHeaders = false;
-                    $this->debug('Received Headers', $this->headers);
-                    if (isSet($this->collectHeaders)) {
-                        foreach ($this->headers as $hKey => $hValue) {
-                            if (isSet($this->collectHeaders[$hKey])) {
-                                if($hKey == "content-length" && $hValue == "0") continue;
-                                $this->collectHeaders[$hKey] = $hValue;
-                                AJXP_Logger::debug("Setting $hKey", $this->collectHeaders);
-                            }
-                        }
-                    }
-                    if ($this->persist_cookies && isset($this->headers['set-cookie']) && $this->host == $this->cookie_host) {
-                        $cookies = $this->headers['set-cookie'];
-                        if (!is_array($cookies)) {
-                            $cookies = array($cookies);
-                        }
-                        foreach ($cookies as $cookie) {
-                            if (preg_match('/([^=]+)=([^;]+);/', $cookie, $m)) {
-                                $this->cookies[$m[1]] = $m[2];
-                            }
-                        }
-                        // Record domain of cookies for security reasons
-                        $this->cookie_host = $this->host;
-                    }
-                    // If $persist_referers, set the referer ready for the next request
-                    if ($this->persist_referers) {
-                        //$this->debug('Persisting referer: '.$this->getRequestURL());
-                        $this->referer = $this->getRequestURL();
-                    }
-                    // Finally, if handle_redirects and a redirect is sent, do that
-                    if ($this->handle_redirects) {
-                        if (++$this->redirect_count >= $this->max_redirects) {
-                            $this->errormsg = 'Number of redirects exceeded maximum ('.$this->max_redirects.')';
-                            $this->debug($this->errormsg);
-                            $this->redirect_count = 0;
-                            return false;
-                        }
-                        $location = isset($this->headers['location']) ? $this->headers['location'] : '';
-                        $uri = isset($this->headers['uri']) ? $this->headers['uri'] : '';
-                        if ($location || $uri) {
-                            $url = parse_url($location.$uri);
-                            // This will FAIL if redirect is to a different site
-                            $this->debug("Should redirect! ", $url);
-                            $data = array();
-                            if (isSet($url['query'])) {
-                                parse_str($url["query"], $data);
-                            }
-                            $this->host = $url["host"];
-                            fclose($fp);
-                            if (isSet($this->collectHeaders) && isSet($this->collectHeaders["ajxp-last-redirection"])) {
-                                $this->collectHeaders["ajxp-last-redirection"] = $location.$uri;
-                            }
-                            return $this->get($url['path'], (!empty($data)?$data:false));
-                        }
-                    }
-
-                    if ($this->headers_only) {
-                        break; // Skip the rest of the input
-                    }
-                    continue;
-                }
-                if (!preg_match('/([^:]+):\\s*(.*)/', $line, $m)) {
-                    // Skip to the next header
-                    continue;
-                }
-                $key = strtolower(trim($m[1]));
-                $val = trim($m[2]);
-                if ($this->directForwarding) {
-                    header($line, true);
-                    continue;
-                }
-
-                // Deal with the possibility of multiple headers of same name
-                if (isset($this->headers[$key])) {
-                    if (is_array($this->headers[$key])) {
-                        $this->headers[$key][] = $val;
-                    } else {
-                        $this->headers[$key] = array($this->headers[$key], $val);
-                    }
-                } else {
-                    $this->headers[$key] = $val;
-                }
-                continue;
-            }
-
-            // We're not in the headers, so append the line to the contents
-            if ($this->directForwarding) {
-                print $line;
-                continue;
-            }
-            if ($this->contentDestStream===false) {
-                $this->content .= $line;
-            } else {
-                fwrite($this->contentDestStream, $line);
-            }
-            $totalReadSize += strlen($line);
-            $this->notify("data_read", $totalReadSize);
-        }
-        $this->notify("close");
-        fclose($fp);
-           if ($this->directForwarding) {
-               return true;
-           }
-        // If data is compressed, uncompress it
-        if (isset($this->headers['content-encoding']) && $this->headers['content-encoding'] == 'gzip') {
-            $this->debug('Content is gzip encoded, unzipping it');
-            if (!$this->headers_only) {
-                $this->content = substr($this->content, 10); // See http://www.php.net/manual/en/function.gzencode.php
-                $this->content = gzinflate($this->content);
-            }
-        }
-        // $this->debug("CONTENT : ".htmlentities($this->content));
-        return true;
-    }
-    public function buildRequest()
-    {
-        $headers = array();
-        $headers[] = "{$this->method} {$this->path} HTTP/1.0"; // Using 1.1 leads to all manner of problems, such as "chunked" encoding
-        $headers[] = "Host: {$this->host}";
-        $headers[] = "User-Agent: {$this->user_agent}";
-        $headers[] = "Accept: {$this->accept}";
-        if ($this->use_gzip) {
-            $headers[] = "Accept-encoding: {$this->accept_encoding}";
-        }
-        $headers[] = "Accept-language: {$this->accept_language}";
-        if ($this->referer) {
-            $headers[] = "Referer: {$this->referer}";
-        }
-        // Cookies
-        if ($this->cookies) {
-            $cookie = 'Cookie: ';
-            foreach ($this->cookies as $key => $value) {
-                $cookie .= "$key=$value; ";
-            }
-            $headers[] = $cookie;
-        }
-        // Basic authentication
-        if ($this->username && $this->password) {
-            $headers[] = 'Authorization: BASIC '.base64_encode($this->username.':'.$this->password);
-        }
-        if (!count($this->postFileData)) {
-            // If this is a POST, set the content type and length
-            if ($this->postdata) {
-                $headers[] = 'Content-Type: application/x-www-form-urlencoded';
-                $headers[] = 'Content-Length: '.strlen($this->postdata);
-            }
-            $request = implode("\r\n", $headers)."\r\n\r\n".$this->postdata;
-        } else {
-            srand((double) microtime()*1000000);
-            $boundary = "----".substr(md5(rand(0,32000)),0,10);
-            $headers[] = "Content-Type: multipart/form-data; boundary=$boundary";
-            $data = array();
-            // attach post vars
-            $this->postDataArray["Filename"] = $this->postFileData["name"];
-            foreach ($this->postDataArray as $index => $value) {
-                $data[]="--$boundary";
-                $data[]= "content-disposition: form-data; name=\"".$index."\"";
-                $data[]= "\r\n".$value."";
-            }
-            // and attach the file
-            //$data[]= "--$boundary";
-            $content_file = join("", file($this->postFileData["tmp_name"]));
-            $data[]="--$boundary";
-            $data[]="content-disposition: form-data; name=\"".$this->postFileName."\"; filename=\"".$this->postFileData["name"]."\"";
-            $data[]= "Content-Type: ".$this->postFileData['type']."\r\n";
-            $data[]= "".$content_file."";
-            $data[]="--$boundary--";
-            //$headers[]= "Content-Length: " . strlen(implode("",$data));
-            $data = implode("\r\n", $data);
-            $headers[]= "Content-Length: " . strlen($data);
-            $headers[] = "Cache-Control: no-cache";
-            $headers[] = "Connection: Keep-Alive";
-            $request = implode("\r\n", $headers)."\r\n\r\n".$data;
-        }
-        return $request;
-    }
-    public function getStatus()
-    {
-        return $this->status;
-    }
-    public function getContent()
-    {
-        return $this->content;
-    }
-    public function getHeaders()
-    {
-        return $this->headers;
-    }
-    public function getHeader($header)
-    {
-        $header = strtolower($header);
-        if (isset($this->headers[$header])) {
-            return $this->headers[$header];
-        } else {
-            return false;
-        }
-    }
-    public function getError()
-    {
-        return $this->errormsg;
-    }
-    public function getCookies()
-    {
-        return $this->cookies;
-    }
-    public function getRequestURL()
-    {
-        $url = 'http://'.$this->host;
-        if ($this->port != 80) {
-            $url .= ':'.$this->port;
-        }
-        $url .= $this->path;
-        return $url;
-    }
-    // Setter methods
-    public function setUserAgent($string)
-    {
-        $this->user_agent = $string;
-    }
-    public function setAuthorization($username, $password)
-    {
-        $this->username = $username;
-        $this->password = $password;
-    }
-    public function setCookies($array)
-    {
-        $this->cookies = $array;
-    }
-    // Option setting methods
-    public function useGzip($boolean)
-    {
-        $this->use_gzip = $boolean;
-    }
-    public function setPersistCookies($boolean)
-    {
-        $this->persist_cookies = $boolean;
-    }
-    public function setPersistReferers($boolean)
-    {
-        $this->persist_referers = $boolean;
-    }
-    public function setHandleRedirects($boolean)
-    {
-        $this->handle_redirects = $boolean;
-    }
-    public function setMaxRedirects($num)
-    {
-        $this->max_redirects = $num;
-    }
-    public function setHeadersOnly($boolean, &$collectHeaders = null)
-    {
-        $this->headers_only = $boolean;
-        if ($collectHeaders != null) {
-            $this->collectHeaders = $collectHeaders;
-        }
-    }
-    public function setDebug($boolean)
-    {
-        $this->debug = $boolean;
-    }
-    // "Quick" static methods
-    public function quickGet($url)
-    {
-        $bits = parse_url($url);
-        $host = $bits['host'];
-        $port = isset($bits['port']) ? $bits['port'] : 80;
-        $path = isset($bits['path']) ? $bits['path'] : '/';
-        if (isset($bits['query'])) {
-            $path .= '?'.$bits['query'];
-        }
-        $client = new HttpClient($host, $port);
-        if (!$client->get($path)) {
-            return false;
-        } else {
-            return $client->getContent();
-        }
-    }
-    public function quickPost($url, $data)
-    {
-        $bits = parse_url($url);
-        $host = $bits['host'];
-        $port = isset($bits['port']) ? $bits['port'] : 80;
-        $path = isset($bits['path']) ? $bits['path'] : '/';
-        $client = new HttpClient($host, $port);
-        if (!$client->post($path, $data)) {
-            return false;
-        } else {
-            return $client->getContent();
-        }
-    }
-    public function debug($msg, $object = false)
-    {
-        if ($this->debug) {
-            $st = '<div style="border: 1px solid red; padding: 0.5em; margin: 0.5em;"><strong>HttpClient Debug:</strong> '.$msg;
-            if ($object) {
-                ob_start();
-                print_r($object);
-                $content = htmlentities(ob_get_contents());
-                ob_end_clean();
-                $st .= '<pre>'.$content.'</pre>';
-            }
-            $st .= '</div>';
-            AJXP_Logger::debug($msg . ($object!==false?" - ".print_r($object, true):""));
-        }
-    }
-}
diff --git a/core/src/core/classes/class.PydioSdkGenerator.php b/core/src/core/classes/class.PydioSdkGenerator.php
deleted file mode 100644
index 99e8a1f715..0000000000
--- a/core/src/core/classes/class.PydioSdkGenerator.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <https://pyd.io/>.
- *
- *
- */
-
-/**
- * Class PydioSdkGenerator
- * Generate a Swagger file for Rest APIs documentation
- * @package Pydio
- * @subpackage Core
- */
-
-//define("JSON_DIR", AJXP_INSTALL_PATH."/core/doc/api");
-define("JSON_DIR", AJXP_INSTALL_PATH."/../api");
-define("JSON_URL", "https://pydio.com/static-docs/api");
-define("API_DOC_PAGE", "https://pydio.com/en/docs/references/pydio-api#!/");
-
-class PydioSdkGenerator
-{
-    static $apiGroups = [
-        "fs" => ["access.fs", "index.*", "meta.*", "editor.*", "action.share", "action.powerfs"],
-        "conf" => ["access.ajxp_conf", "action.scheduler", "action.updater"],
-        "lifecycle" => ["conf.*", "auth.*", "gui.*", "core.*", "action.avatar"],
-        "nonfs" => ["access.*"],
-        "misc" => ["*"]
-    ];
-
-    static $apiGroupsLabels = [
-        "fs" => "Most current operations on files and folders, their metadata, and additional sharing features.",
-        "conf" => "Administration task : users/groups/workspaces provisionning, maintenance tasks, etc... Generally performed using /settings/ as workspace alias.",
-        "lifecycle" => "Application objects lifecycle, like current user access rights and preferences, authentication utils, etc. As they are generally not linked to a specific workspace, these actions can be performed using /pydio/ instead of a workspace alias.",
-        "nonfs" => "Non-standard drivers accessing to structured data like IMAP, MySQL, Apis, etc.",
-        "misc" => "Other plugins actions."
-    ];
-
-    public static function findApiGroupForPlugin($pluginId){
-        list($pType, $pName) = explode(".", $pluginId);
-        foreach(self::$apiGroups as $groupName => $pluginPatterns){
-            foreach($pluginPatterns as $pattern){
-                if($pattern == "*" || $pattern == "$pType.*" || $pattern == "$pType.$pName"){
-                    return $groupName;
-                }
-            }
-        }
-        return "misc";
-    }
-
-    public static function analyzeRegistry($versionString)
-    {
-        if(!AJXP_SERVER_DEBUG) {
-            echo "Please switch the server to debug mode to use this API.";
-            return;
-        }
-
-        $pServ = AJXP_PluginsService::getInstance();
-        $nodes = $pServ->searchAllManifests('//actions/*/processing/serverCallback[@developerComment]', 'node', false, false, true);
-        $jsFile = AJXP_DATA_PATH."/public/sdkMethods.js";
-        $swaggerJsonDir = JSON_DIR."/".$versionString;
-        $swaggerAPIs = array();
-        $methods = array();
-        $alreadyParsed = array();
-        foreach ($nodes as $callbackNode) {
-            $params = array();
-            $swaggerParams = array();
-            $pluginName = $callbackNode->parentNode->parentNode->parentNode->parentNode->parentNode->getAttribute("id");
-            $actionName = $callbackNode->parentNode->parentNode->getAttribute("name");
-            $methodName = $callbackNode->getAttribute("sdkMethodName");
-            if(empty($methodName)){
-                $methodName = $actionName;
-            }
-            $outputType = 'xml';
-            /*
-            if(in_array($actionName, $alreadyParsed)){
-                continue;
-            }
-            $alreadyParsed[] = $actionName;
-            */
-            if(!isset($swaggerAPIs[$pluginName])) $swaggerAPIs[$pluginName] = array();
-
-            foreach ($callbackNode->childNodes as $child) {
-                if($child->nodeType != XML_ELEMENT_NODE)continue;
-                if ($child->nodeName == "input_param") {
-                    $params[$child->getAttribute("name")] = array(
-                        "name" => $child->getAttribute("name"),
-                        "type" => $child->getAttribute("type"),
-                        "mandatory" => $child->getAttribute("mandatory") === "true",
-                        "default" => $child->getAttribute("default"),
-                    );
-                    $default = $child->getAttribute("default");
-                    $swaggerParams[] = array(
-                        "name" => $child->getAttribute("name"),
-                        "description" => $child->getAttribute("description"). "<br>".(!empty($default) ? "Default: $default" : ""),
-                        "required" => ($child->getAttribute("mandatory") === "true"),
-                        "allowMultiple" => (strpos($child->getAttribute("type"), "[]") !== false),
-                        "dataType" => (strpos($child->getAttribute("type"), "[]") !== false) ? "array":$child->getAttribute("type"),
-                        "paramType" => "query"
-                    );
-
-                } else if ($child->nodeName=="output") {
-                    $outputType = $child->getAttribute("type");
-                }
-            }
-            $methods[$methodName] = array(
-                "action" => $actionName,
-                "params" => $params,
-                "output" => $outputType
-            );
-            $comment = $callbackNode->getAttribute("developerComment");
-            $http = $callbackNode->getAttribute("preferredHttp");
-            $restParams = $callbackNode->getAttribute("restParams");
-            $prefix = "/workspace_alias";
-            $apiGroup = self::findApiGroupForPlugin($pluginName);
-            if($apiGroup == "conf"){
-                $prefix = "/settings";
-            }else if($apiGroup == "lifecycle"){
-                $prefix = "/pydio";
-            }
-            $api = array(
-                "path"  => $prefix."/".$actionName . (empty($restParams) ? "" : $restParams),
-                "operations" => array(
-                    array(
-                        "method"        => empty($http) ? "POST" : strtoupper($http),
-                        "summary"       => substr($comment, 0, 80) . (strlen($comment) > 80 ? "..." : ""),
-                        "notes"         => $comment,
-                        "responseClass" => $outputType,
-                        "nickname"      => $methodName,
-                        "parameters"    => $swaggerParams
-                    )
-                )
-            );
-            $swaggerAPIs[$pluginName][] = $api;
-        }
-
-        file_put_contents($jsFile, "window.sdkMethods = ".json_encode($methods, JSON_PRETTY_PRINT));
-
-        $apidocs = array(
-            "apiVersion" => $versionString,
-            "swaggerVersion" => "1.2",
-            "apis" => array()
-        );
-        $allDocs = array();
-        $markdowns = array();
-
-        foreach($swaggerAPIs as $pluginName => $apis){
-
-            echo("Writing file for $pluginName");
-
-            $swaggerJson = array(
-                "apiVersion" => $versionString,
-                "swaggerVersion" => 1.2,
-                "basePath" => JSON_URL."/$versionString",
-                "resourcePath" => "/api",
-                "produces" => array("application/xml"),
-                "apis" => $apis
-            );
-            file_put_contents($swaggerJsonDir."/".$pluginName, json_encode($swaggerJson, JSON_PRETTY_PRINT));
-            $p = $pServ->findPluginById($pluginName);
-            $apiGroup = self::findApiGroupForPlugin($pluginName);
-            if(!isset($allDocs[$apiGroup])) {
-                $allDocs[$apiGroup] = array();
-                $markdowns[$apiGroup] = array();
-            }
-            $markdowns[$apiGroup][] = self::makeMarkdown($p, $apis);
-            $allDocs[$apiGroup][] = array(
-                "path" => JSON_URL."/$versionString/".$pluginName,
-                "description" => $p->getManifestDescription()
-            );
-            $apidocs["apis"][] = array(
-                "path" => JSON_URL."/$versionString/".$pluginName,
-                "description" => $p->getManifestDescription()
-            );
-
-        }
-        foreach($allDocs as $apiGroupName => $groupApis){
-            $groupApiDocs = array(
-                "apiVersion" => $versionString,
-                "swaggerVersion" => "1.2",
-                "apis" => $groupApis
-            );
-            file_put_contents($swaggerJsonDir."/api-docs-".$apiGroupName, json_encode($groupApiDocs, JSON_PRETTY_PRINT));
-            file_put_contents($swaggerJsonDir."/api-md-".$apiGroupName, self::$apiGroupsLabels[$apiGroupName]."\n\n".implode("", $markdowns[$apiGroupName]));
-        }
-        // Store file with all apis.
-        file_put_contents($swaggerJsonDir."/api-docs", json_encode($apidocs, JSON_PRETTY_PRINT));
-    }
-
-    /**
-     * @param AJXP_Plugin $plugin
-     * @param array $apis
-     * @return string
-     */
-    static public function makeMarkdown($plugin, $apis){
-
-        $md = "\n\n";
-        $md .= "## ".$plugin->getManifestLabel()."  ";
-        $md .= "\n".$plugin->getManifestDescription()."\n\n";
-        $id = $plugin->getId();
-        foreach($apis as $index => $api) {
-            $md .= "\n";
-            $md .= "- **".$api["path"]."**  \n";
-            $md .= "  ".$api["operations"][0]["notes"]."  \n";
-            $md .= "  [Details](".API_DOC_PAGE."".$id."/".$api["operations"][0]["nickname"]."_".strtolower($api["operations"][0]["method"])."_".$index.")";
-        }
-
-        return $md;
-
-    }
-
-}
diff --git a/core/src/core/classes/class.RecycleBinManager.php b/core/src/core/classes/class.RecycleBinManager.php
deleted file mode 100644
index ce01dfec72..0000000000
--- a/core/src/core/classes/class.RecycleBinManager.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-/**
- * Recycle bin actions manager. Utilitaries to check whether the current dir is the recycle bin,
- * and to filter the actions accordingly : transform an item deletion into a move into the recycle folder, etc.
- * @package Pydio
- * @subpackage Core
- */
-class RecycleBinManager
-{
-    private static $rbmRecycle;
-    private static $rbmRelativeRecycle;
-
-    public static function recycleEnabled()
-    {
-        return (isSet(self::$rbmRecycle) && self::$rbmRecycle != null && is_string(self::$rbmRecycle));
-    }
-
-    /**
-     * Initialize manager
-     * @static
-     * @param $repositoryWrapperURL
-     * @param $recyclePath
-     * @return void
-     */
-    public static function init($repositoryWrapperURL, $recyclePath)
-    {
-        self::$rbmRecycle = $repositoryWrapperURL.$recyclePath;
-        self::$rbmRelativeRecycle = $recyclePath;
-    }
-    /**
-     * Get the recycle bin path (repository URL included)
-     * @static
-     * @return string
-     */
-    public static function getRecyclePath()
-    {
-        return self::$rbmRecycle ;
-    }
-    /**
-     * Get the recycle bin path (from the root of the repository)
-     * @static
-     * @return string
-     */
-    public static function getRelativeRecycle()
-    {
-        return self::$rbmRelativeRecycle;
-    }
-    /**
-     * Is the current path the recycle?
-     * @static
-     * @param string $currentLocation PATH from the root of repo
-     * @return bool
-     */
-    public static function currentLocationIsRecycle($currentLocation)
-    {
-        return ($currentLocation == self::$rbmRelativeRecycle);
-    }
-    /**
-     * Transform delete/restore actions into move actino
-     * @static
-     * @param string $action
-     * @param UserSelection $selection
-     * @param string $currentLocation
-     * @param array $httpVars
-     * @return array
-     */
-    public static function filterActions($action, $selection, $currentLocation, $httpVars = array())
-    {
-        if(!self::recycleEnabled()) return array();
-        $newArgs = array();
-
-        // FILTER ACTION FOR DELETE
-        if ($action == "delete" && !self::currentLocationIsRecycle($currentLocation) && !isSet($httpVars["force_deletion"])) {
-            $newArgs["action"] = "move";
-            $newArgs["dest"] = self::$rbmRelativeRecycle;
-        }
-        // FILTER ACTION FOR RESTORE
-        if ($action == "restore" && self::currentLocationIsRecycle($currentLocation)) {
-            $originalRep = self::getFileOrigin($selection->getUniqueFile());
-            if ($originalRep != "") {
-                $newArgs["action"] = "move";
-                $newArgs["dest"] = $originalRep; // CHECK UTF8 HANDLING HERE
-            }
-        }
-        return $newArgs;
-
-    }
-    /**
-     * Get the file for caching recylce metadata
-     * @static
-     * @return string
-     */
-    public static function getCacheFileName()
-    {
-        return ".ajxp_recycle_cache.ser";
-    }
-    /**
-     * Update metadata
-     * @static
-     * @param string $originalFilePath
-     * @return void
-     */
-    public static function fileToRecycle($originalFilePath)
-    {
-        $cache = self::loadCache();
-        $cache[basename($originalFilePath)] = str_replace("\\", "/", dirname($originalFilePath));
-        self::saveCache($cache);
-    }
-
-    /**
-     * Update metadata
-     * @static
-     * @param $filePath
-     * @return void
-     */
-    public static function deleteFromRecycle($filePath)
-    {
-        $cache = self::loadCache();
-        if (array_key_exists(basename($filePath), $cache)) {
-            unset($cache[basename($filePath)]);
-        }
-        self::saveCache($cache);
-    }
-    /**
-     * Use metadata for getting original location
-     * @static
-     * @param $filePath
-     * @return string
-     */
-    public static function getFileOrigin($filePath)
-    {
-        $cache = self::loadCache();
-        if (is_array($cache) && array_key_exists(basename($filePath), $cache)) {
-            return $cache[basename($filePath)];
-        }
-        return "";
-    }
-    /**
-     * Load the metadata cache
-     * @static
-     * @return array|mixed|null
-     */
-    public static function loadCache()
-    {
-        $result = array();
-        if(!self::recycleEnabled()) return null;
-        $cachePath = self::getRecyclePath()."/".self::getCacheFileName();
-        $fp = @fopen($cachePath, "r");
-        if ($fp) {
-            $s = "";
-            while (!feof($fp)) {
-                $s .= fread($fp, 4096);
-            }
-            fclose($fp);
-            $result = unserialize($s);
-        }
-        return $result;
-    }
-    /**
-     * Save the metadata cache
-     * @static
-     * @param $value
-     * @return null
-     */
-    public static function saveCache($value)
-    {
-        if(!self::recycleEnabled()) return null;
-        $cachePath = self::getRecyclePath()."/".self::getCacheFileName();
-        $fp = fopen($cachePath, "w");
-        if ($fp) {
-            fwrite($fp, serialize($value));
-            fflush($fp);
-            fclose($fp);
-        }
-    }
-
-}
diff --git a/core/src/core/classes/class.Repository.php b/core/src/core/classes/class.Repository.php
deleted file mode 100644
index a9820e4699..0000000000
--- a/core/src/core/classes/class.Repository.php
+++ /dev/null
@@ -1,734 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-define('AJXP_REPOSITORY_TYPE_LOCAL', 'local');
-/**
- * The basic abstraction of a data store. Can map a FileSystem, but can also map data from a totally
- * different source, like the application configurations, a mailbox, etc.
- * @package Pydio
- * @subpackage Core
- */
-class Repository implements AjxpGroupPathProvider
-{
-    /**
-     * @var string
-     */
-    public $uuid;
-    /**
-     * @var string
-     */
-    public $id;
-    /**
-     * @var string
-     */
-    public $path;
-    /**
-     * @var string
-     */
-    public $display;
-    /**
-     * @var string
-     */
-    public $displayStringId;
-    /**
-     * @var string
-     */
-    public $accessType = "fs";
-    /**
-     * @var string
-     */
-    public $recycle = "";
-    /**
-     * @var bool
-     */
-    public $create = true;
-    /**
-     * @var bool
-     */
-    public $writeable = true;
-    /**
-     * @var bool
-     */
-    public $enabled = true;
-    /**
-     * @var array
-     */
-    public $options = array();
-    /**
-     * @var string
-     */
-    public $slug;
-    /**
-     * @var bool
-     */
-    public $isTemplate = false;
-
-    /**
-     * @var string local or remote
-     */
-    protected $repositoryType = AJXP_REPOSITORY_TYPE_LOCAL;
-
-    /**
-     * @var string status
-     */
-    protected $accessStatus;
-
-    /**
-     * @var string
-     */
-    private $owner;
-    /**
-     * @var string
-     */
-    private $parentId;
-    /**
-     * @var string
-     */
-    private $uniqueUser;
-    /**
-     * @var bool
-     */
-    private $inferOptionsFromParent;
-    /**
-     * @var Repository
-     */
-    private $parentTemplateObject;
-    /**
-     * @var array
-     */
-    public $streamData;
-
-    /**
-     * @var String the groupPath of the administrator who created that repository.
-     */
-    protected $groupPath;
-
-
-    /**
-     * @var AbstractAccessDriver
-     */
-    public $driverInstance;
-
-    /**
-     * @var ContentFilter
-     */
-    protected $contentFilter;
-
-    /**
-     * @var array Store filters as array variable to avoid serialization problems
-     */
-    private $contentFilterData;
-
-    /**
-     * @param \ContentFilter $contentFilter
-     */
-    public function setContentFilter($contentFilter)
-    {
-        $this->contentFilter = $contentFilter;
-        $this->contentFilterData  = $contentFilter->filters;
-    }
-
-    /**
-     * Fix unserialization issues by reloading object from data array
-     */
-    private function checkCFilterData(){
-        if(!is_object($this->contentFilter) && is_array($this->contentFilterData)){
-            $cf = new ContentFilter(array());
-            $cf->fromFilterArray($this->contentFilterData);
-            $this->contentFilter = $cf;
-        }
-    }
-
-    /**
-     * Check if a ContentFilter is set or not
-     * @return bool
-     */
-    public function hasContentFilter(){
-        $this->checkCFilterData();
-        return isSet($this->contentFilter);
-    }
-
-    /**
-     * @return \ContentFilter
-     */
-    public function getContentFilter()
-    {
-        $this->checkCFilterData();
-        return $this->contentFilter;
-    }
-
-    /**
-     * @param string $id
-     * @param string $display
-     * @param string $driver
-     */
-    public function __construct($id, $display, $driver)
-    {
-        $this->setAccessType($driver);
-        $this->setDisplay($display);
-        $this->setId($id);
-        $this->uuid = md5(microtime());
-        $this->slug = AJXP_Utils::slugify($display);
-        $this->inferOptionsFromParent = false;
-        $this->options["CREATION_TIME"] = time();
-        if (AuthService::usersEnabled() && AuthService::getLoggedUser() != null) {
-            $this->options["CREATION_USER"] = AuthService::getLoggedUser()->getId();
-        }
-    }
-
-    /**
-     * Create a shared version of this repository
-     * @param string $newLabel
-     * @param array $newOptions
-     * @param string $parentId
-     * @param string $owner
-     * @param string $uniqueUser
-     * @return Repository
-     */
-    public function createSharedChild($newLabel, $newOptions, $parentId = null, $owner = null, $uniqueUser = null)
-    {
-        $repo = new Repository(0, $newLabel, $this->accessType);
-        $newOptions = array_merge($this->options, $newOptions);
-        $newOptions["CREATION_TIME"] = time();
-        if (AuthService::usersEnabled() && AuthService::getLoggedUser() != null) {
-            $newOptions["CREATION_USER"] = AuthService::getLoggedUser()->getId();
-        }
-        $repo->options = $newOptions;
-        if ($parentId === null) {
-            $parentId = $this->getId();
-        }
-        $repo->setInferOptionsFromParent(true);
-        $repo->setOwnerData($parentId, $owner, $uniqueUser);
-        return $repo;
-    }
-    /**
-     * Create a child from this repository if it's a template
-     * @param string $newLabel
-     * @param array $newOptions
-     * @param string $owner
-     * @param string $uniqueUser
-     * @return Repository
-     */
-    public function createTemplateChild($newLabel, $newOptions, $owner = null, $uniqueUser = null)
-    {
-        $repo = new Repository(0, $newLabel, $this->accessType);
-        $newOptions["CREATION_TIME"] = time();
-        if (AuthService::usersEnabled() && AuthService::getLoggedUser() != null) {
-            $newOptions["CREATION_USER"] = AuthService::getLoggedUser()->getId();
-        }
-        $repo->options = $newOptions;
-        $repo->setOwnerData($this->getId(), $owner, $uniqueUser);
-        $repo->setInferOptionsFromParent(true);
-        return $repo;
-    }
-    /**
-     * Recompute uuid
-     * @return bool
-     */
-    public function upgradeId()
-    {
-        if (!isSet($this->uuid)) {
-            $this->uuid = md5(serialize($this));
-            //$this->uuid = md5(time());
-            return true;
-        }
-        return false;
-    }
-    /**
-     * Get a uuid
-     * @param bool $serial
-     * @return string
-     */
-    public function getUniqueId($serial=false)
-    {
-        if ($serial) {
-            return md5(serialize($this));
-        }
-        return $this->uuid;
-    }
-    /**
-     * Alias for this repository
-     * @return string
-     */
-    public function getSlug()
-    {
-        return $this->slug;
-    }
-    /**
-     * Use the slugify function to generate an alias from the label
-     * @param string $slug
-     * @return void
-     */
-    public function setSlug($slug = null)
-    {
-        if ($slug === null) {
-            $this->slug = AJXP_Utils::slugify($this->display);
-        } else {
-            $this->slug = $slug;
-        }
-    }
-    /**
-     * Get the <client_settings> content of the manifest.xml
-     * @return DOMElement|DOMNodeList|string
-     */
-    public function getClientSettings()
-    {
-        $plugin = AJXP_PluginsService::findPlugin("access", $this->accessType);
-        if(!$plugin) return "";
-        if (isSet($this->parentId)) {
-            $parentObject = ConfService::getRepositoryById($this->parentId);
-            if ($parentObject != null && $parentObject->isTemplate) {
-                $ic = $parentObject->getOption("TPL_ICON_SMALL");
-                $settings = $plugin->getManifestRawContent("//client_settings", "node");
-                if (!empty($ic) && $settings->length) {
-                    $newAttr = $settings->item(0)->ownerDocument->createAttribute("icon_tpl_id");
-                    $newAttr->nodeValue = $this->parentId;
-                    $settings->item(0)->appendChild($newAttr);
-                    return $settings->item(0)->ownerDocument->saveXML($settings->item(0));
-                }
-            }
-        }
-        return $plugin->getManifestRawContent("//client_settings", "string");
-    }
-    /**
-     * Find the streamWrapper declared by the access driver
-     * @param bool $register
-     * @param array $streams
-     * @return bool
-     */
-    public function detectStreamWrapper($register = false, &$streams=null)
-    {
-        if(isSet($this->driverInstance) && is_a($this->driverInstance, "AJXP_Plugin")){
-            $plugin = $this->driverInstance;
-        }else{
-            $plugin = AJXP_PluginsService::findPlugin("access", $this->accessType);
-            $this->driverInstance = $plugin;
-        }
-        if(!$plugin) return(false);
-        $streamData = $plugin->detectStreamWrapper($register);
-        if (!$register && $streamData !== false && is_array($streams)) {
-            $streams[$this->accessType] = $this->accessType;
-        }
-        if($streamData !== false) $this->streamData = $streamData;
-        return ($streamData !== false);
-    }
-
-    /**
-     * Add options
-     * @param $oName
-     * @param $oValue
-     * @return void
-     */
-    public function addOption($oName, $oValue)
-    {
-        if (strpos($oName, "PATH") !== false) {
-            $oValue = str_replace("\\", "/", $oValue);
-        }
-        $this->options[$oName] = $oValue;
-    }
-
-    /**
-     * Get the repository options, filtered in various maners
-     * @param string $oName
-     * @param bool $safe Do not filter
-     * @param AbstractAjxpUser $resolveUser
-     * @return mixed|string
-     * @throws Exception
-     */
-    public function getOption($oName, $safe=false, $resolveUser = null)
-    {
-        if(isSet($this->inferOptionsFromParent) && isSet($this->parentId)){
-            $parentTemplateObject = ConfService::getRepositoryById($this->parentId);
-            if(empty($parentTemplateObject) || !is_a($parentTemplateObject, "Repository")) {
-                throw new Exception("Option should be loaded from parent repository, but it was not found");
-            }
-        }
-        if (!$safe && $this->inferOptionsFromParent) {
-            if (isSet($parentTemplateObject)) {
-                $pvalue = $parentTemplateObject->getOption($oName, $safe);
-                $pathChanged = false;
-                if (is_string($pvalue) && strstr($pvalue, "AJXP_WORKSPACE_UUID") !== false) {
-                    $pvalue = rtrim(str_replace("AJXP_WORKSPACE_UUID", $this->getUniqueId(), $pvalue), "/");
-                    $pathChanged = true;
-                }
-                if (is_string($pvalue) && strstr($pvalue, "AJXP_WORKSPACE_SLUG") !== false) {
-                    $pvalue = rtrim(str_replace("AJXP_WORKSPACE_SLUG", $this->getSlug(), $pvalue), "/");
-                    $pathChanged = true;
-                }
-                if (is_string($pvalue) && strstr($pvalue, "AJXP_ALLOW_SUB_PATH") !== false) {
-                    $pvalue = rtrim(str_replace("AJXP_ALLOW_SUB_PATH", "", $pvalue), "/")."/".$this->options[$oName];
-                    $pathChanged = true;
-                }
-                if ($pathChanged) {
-                    return AJXP_Utils::securePath($pvalue);
-                }
-            }
-        }
-        if (isSet($this->options[$oName])) {
-            $value = $this->options[$oName];
-            if(!$safe) $value = AJXP_VarsFilter::filter($value, $resolveUser);
-            return $value;
-        }
-        if ($this->inferOptionsFromParent) {
-            if (!isset($parentTemplateObject)) {
-                $parentTemplateObject = ConfService::getRepositoryById($this->parentId);
-            }
-            if (isSet($parentTemplateObject)) {
-                return $parentTemplateObject->getOption($oName, $safe);
-            }
-        }
-        return "";
-    }
-
-    public function resolveVirtualRoots($path)
-    {
-        // Gathered from the current role
-        $roots = $this->listVirtualRoots();
-        if(!count($roots)) return $path;
-        foreach ($roots as $rootKey => $rootValue) {
-            if (strpos($path, "/".ltrim($rootKey, "/")) === 0) {
-                return preg_replace("/^\/{$rootKey}/", $rootValue["path"], $path, 1);
-            }
-        }
-        return $path;
-
-    }
-
-    public function listVirtualRoots()
-    {
-        return array();
-        /* TEST STUB
-        $roots = array(
-            "root1" => array(
-                "right" => "rw",
-                "path" => "/Test"),
-            "root2" => array(
-                "right" => "r",
-                "path" => "/Retoto/sub"
-            ));
-        return $roots;
-        */
-    }
-
-    /**
-     * Get the options that already have a value
-     * @return array
-     */
-    public function getOptionsDefined()
-    {
-        //return array_keys($this->options);
-        $keys = array();
-        foreach ($this->options as $key => $value) {
-            if(is_string($value) && strstr($value, "AJXP_ALLOW_SUB_PATH") !== false) continue;
-            $keys[] = $key;
-        }
-        return $keys;
-    }
-
-    /**
-     * Get the DEFAULT_RIGHTS option
-     * @return string
-     */
-    public function getDefaultRight()
-    {
-        $opt = $this->getOption("DEFAULT_RIGHTS");
-        return (isSet($opt)?$opt:"");
-    }
-
-
-    /**
-     * The the access driver type
-     * @return String
-     */
-    public function getAccessType()
-    {
-        return $this->accessType;
-    }
-
-    /**
-     * The label of this repository
-     * @return String
-     */
-    public function getDisplay()
-    {
-        if (isSet($this->displayStringId)) {
-            $mess = ConfService::getMessages();
-            if (isSet($mess[$this->displayStringId])) {
-                return $mess[$this->displayStringId];
-            }
-        }
-        return AJXP_VarsFilter::filter($this->display);
-    }
-
-    /**
-     * @return string
-     */
-    public function getId()
-    {
-        if($this->isWriteable() || $this->id === null) return $this->getUniqueId();
-        return $this->id;
-    }
-
-    /**
-     * @return boolean
-     */
-    public function getCreate()
-    {
-        return (bool) $this->getOption("CREATE");
-    }
-
-    /**
-     * @param boolean $create
-     */
-    public function setCreate($create)
-    {
-        $this->options["CREATE"] = (bool) $create;
-    }
-
-
-    /**
-     * @param String $accessType
-     */
-    public function setAccessType($accessType)
-    {
-        $this->accessType = $accessType;
-    }
-
-    /**
-     * @param String $display
-     */
-    public function setDisplay($display)
-    {
-        $this->display = $display;
-    }
-
-    /**
-     * @param int $id
-     */
-    public function setId($id)
-    {
-        $this->id = $id;
-    }
-
-    public function isWriteable()
-    {
-        return (bool) $this->writeable;
-    }
-
-    public function setWriteable($w)
-    {
-        $this->writeable = (bool) $w;
-    }
-
-    public function isEnabled()
-    {
-        return (bool) $this->enabled;
-    }
-
-    public function setEnabled($e)
-    {
-        $this->enabled = (bool) $e;
-    }
-
-    public function setDisplayStringId($id)
-    {
-        $this->displayStringId = $id;
-    }
-
-    public function setOwnerData($repoParentId, $ownerUserId = null, $childUserId = null)
-    {
-        $this->owner = $ownerUserId;
-        $this->uniqueUser = $childUserId;
-        $this->parentId = $repoParentId;
-    }
-
-    public function getOwner()
-    {
-        return $this->owner;
-    }
-
-    public function getParentId()
-    {
-        return $this->parentId;
-    }
-
-    public function getUniqueUser()
-    {
-        return $this->uniqueUser;
-    }
-
-    public function hasOwner()
-    {
-        return isSet($this->owner);
-    }
-
-    public function hasParent()
-    {
-        return isSet($this->parentId);
-    }
-
-    public function setInferOptionsFromParent($bool)
-    {
-        $this->inferOptionsFromParent = (bool) $bool;
-    }
-
-    public function getInferOptionsFromParent()
-    {
-        return (bool) $this->inferOptionsFromParent;
-    }
-
-    /**
-     * @param String $groupPath
-     */
-    public function setGroupPath($groupPath)
-    {
-        if(strlen($groupPath) > 1) $groupPath = rtrim($groupPath, "/");
-        $this->groupPath = $groupPath;
-    }
-
-    /**
-     * @return String
-     */
-    public function getGroupPath()
-    {
-        return $this->groupPath;
-    }
-
-    /**
-     * @param String $descriptionText
-     */
-    public function setDescription( $descriptionText )
-    {
-        $this->options["USER_DESCRIPTION"] = $descriptionText;
-    }
-
-    /**
-     * @return string
-     */
-    public function getAccessStatus()
-    {
-        return $this->accessStatus;
-    }
-
-    /**
-     * @param string $accessStatus
-     */
-    public function setAccessStatus($accessStatus)
-    {
-        $this->accessStatus = $accessStatus;
-    }
-
-    /**
-     * @return string
-     */
-    public function getRepositoryType()
-    {
-        return $this->repositoryType;
-    }
-
-    /**
-     * @param string $repositoryType
-     */
-    public function setRepositoryType($repositoryType)
-    {
-        $this->repositoryType = $repositoryType;
-    }
-
-    /**
-     * @param bool $public
-     * @param null $ownerLabel
-     * @return String
-     */
-    public function getDescription( $public = false, $ownerLabel = null )
-    {
-        $m = ConfService::getMessages();
-        if (isset($this->options["USER_DESCRIPTION"]) && !empty($this->options["USER_DESCRIPTION"])) {
-            if (isSet($m[$this->options["USER_DESCRIPTION"]])) {
-                return $m[$this->options["USER_DESCRIPTION"]];
-            } else {
-                return $this->options["USER_DESCRIPTION"];
-            }
-        }
-        if (isSet($this->parentId) && isset($this->owner)) {
-            if (isSet($this->options["CREATION_TIME"])) {
-                $date = AJXP_Utils::relativeDate($this->options["CREATION_TIME"], $m);
-                return str_replace(
-                    array("%date", "%user"),
-                    array($date, $ownerLabel!= null ? $ownerLabel : $this->owner),
-                    $public?$m["470"]:$m["473"]);
-            } else {
-                if($public) return $m["474"];
-                else return str_replace(
-                    array("%user"),
-                    array($ownerLabel!= null ? $ownerLabel : $this->owner),
-                    $m["472"]);
-            }
-        } else if ($this->isWriteable() && isSet($this->options["CREATION_TIME"])) {
-            $date = AJXP_Utils::relativeDate($this->options["CREATION_TIME"], $m);
-            if (isSet($this->options["CREATION_USER"])) {
-                return str_replace(array("%date", "%user"), array($date, $this->options["CREATION_USER"]), $m["471"]);
-            } else {
-                return str_replace(array("%date"), array($date), $m["470"]);
-            }
-        } else {
-            return $m["474"];
-        }
-    }
-
-    /**
-     * Infer a security scope for this repository. Will determine to whome the messages
-     * will be broadcasted.
-     * @return bool|string
-     */
-    public function securityScope()
-    {
-        if($this->hasParent()){
-            $parentRepo = ConfService::getRepositoryById($this->getParentId());
-            if(!empty($parentRepo) && $parentRepo->isTemplate){
-                $path = $parentRepo->getOption("PATH", true);
-                $container = $parentRepo->getOption("CONTAINER", true);
-                // If path is set in the template, compute identifier from the template path.
-                if(!empty($path) || !empty($container)) return $parentRepo->securityScope();
-            }
-        }
-        $path = $this->getOption("CONTAINER", true);
-        if(!empty($path)){
-            if(strpos($path, "AJXP_USER") !== false) return "USER";
-            if(strpos($path, "AJXP_GROUP_PATH") !== false) return "GROUP";
-            if(strpos($path, "AJXP_GROUP_PATH_FLAT") !== false) return "GROUP";
-        }
-        $path = $this->getOption("PATH", true);
-        if($this->accessType == "ajxp_conf" || $this->accessType == "ajxp_admin" || $this->accessType == "inbox") return "USER";
-        if(empty($path)) return false;
-        if(strpos($path, "AJXP_USER") !== false) return "USER";
-        if(strpos($path, "AJXP_GROUP_PATH") !== false) return "GROUP";
-        if(strpos($path, "AJXP_GROUP_PATH_FLAT") !== false) return "GROUP";
-        return false;
-    }
-
-    public function __sleep()
-    {
-        $this->driverInstance = null;
-        return array_keys(get_object_vars($this));
-    }
-
-}
diff --git a/core/src/core/classes/class.SystemTextEncoding.php b/core/src/core/classes/class.SystemTextEncoding.php
deleted file mode 100644
index 07d82b451f..0000000000
--- a/core/src/core/classes/class.SystemTextEncoding.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>, Cyril Russo
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-/**
- * Static utilitaries to encode/decode charset to/from utf8
- * @package Pydio
- * @subpackage Core
- */
-class SystemTextEncoding
-{
-    /**
-     * Change the charset of a string from input to output
-     * @static
-     * @param string $inputCharset
-     * @param string $outputCharset
-     * @param string $text
-     * @return string
-     */
-    public static function changeCharset($inputCharset, $outputCharset, $text)
-    {
-        if ($inputCharset == $outputCharset) return $text;
-        // Due to iconv bug when dealing with text with non ASCII encoding for last char, we use this workaround http://fr.php.net/manual/fr/function.iconv.php#81494
-        if (function_exists("iconv")) {
-
-            return iconv($inputCharset, $outputCharset, $text);
-        } else {
-            $content = @htmlentities($text, ENT_QUOTES, $inputCharset);
-            return @html_entity_decode($content, ENT_QUOTES , $outputCharset);
-        }
-    }
-
-    public static $currentCharsetValue;
-    /**
-     * Detect the current charset from the current locale
-     * @static
-     * @param string $locale
-     * @return string
-     */
-    public static function parseCharset($locale)
-    {
-        $test = explode("@", $locale);
-        $locale = $test[0];
-        $encoding = substr(strrchr($locale, "."), 1);
-        if (is_numeric($encoding)) {
-            if (substr($encoding, 0, 2) == "12") // CP12xx are changed to Windows-12xx to allow PHP4 conversion
-                  $encoding = "windows-".$encoding;
-              else $encoding = "CP".$encoding; // In other cases, PHP4 won't work anyway, so use CPxxxx encoding (that iconv supports)
-        } else if ($locale == "C") {   // Locale not set correctly, most probable error cause is /etc/init.d/apache having "LANG=C" defined
-            // In any case, "C" is ASCII-7 bit so it's safe to use the extra bit as if it was UTF-8
-            $encoding = "UTF-8";
-        }
-        if (!strlen($encoding)) $encoding = "UTF-8";
-        return $encoding;
-    }
-    /**
-     * Try to detect the current encoding (cached in session)
-     * @static
-     * @return string
-     */
-    public static function getEncoding()
-    {
-           if (self::$currentCharsetValue == null) {
-               $charset = ConfService::getContextCharset();
-               if (!empty($charset)) {
-                   // Check if the session get an assigned charset encoding (it's the case for remote SSH for example)
-                   self::$currentCharsetValue = $charset;
-               } else {
-                   // Get the current locale (expecting the filesystem is in the same locale, as the standard says)
-                   self::$currentCharsetValue = self::parseCharset(setlocale(LC_CTYPE, 0));
-               }
-           }
-           return self::$currentCharsetValue;
-    }
-    /**
-     * Decode a string from UTF8 to current Charset
-     * @static
-     * @param string $filesystemElement
-     * @param bool $test Try to detect if it's really utf8 or not
-     * @return string
-     */
-    public static function fromUTF8($filesystemElement, $test = false)
-    {
-        if ($test && !SystemTextEncoding::isUtf8($filesystemElement)) {
-            return $filesystemElement;
-        }
-        $enc = SystemTextEncoding::getEncoding();
-        return SystemTextEncoding::changeCharset("UTF-8", $enc, $filesystemElement);
-    }
-
-    /**
-     * This function is used when the server's PHP configuration is using magic quote
-     * @param string $text
-     * @return string
-     */
-    public static function magicDequote($text)
-    {
-        // If the PHP server enables magic quotes, remove them
-        if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc())
-            return stripslashes($text);
-        return $text;
-    }
-
-    /**
-     * call fromUTF8
-     * @static
-     * @param string $filesystemElement
-     * @return string
-     */
-    public static function fromPostedFileName($filesystemElement)
-    {
-        return SystemTextEncoding::fromUTF8(SystemTextEncoding::magicDequote($filesystemElement));
-    }
-
-    /**
-     * Transform a string from current charset to utf8
-     * @static
-     * @param string $filesystemElement
-     * @param bool $test Test if it's already UTF8 or not, to avoid double-encoding
-     * @return string
-     */
-    public static function toUTF8($filesystemElement, $test = true)
-    {
-        if ($test && SystemTextEncoding::isUtf8($filesystemElement)) {
-            return $filesystemElement;
-        }
-        $enc = SystemTextEncoding::getEncoding();
-        return SystemTextEncoding::changeCharset($enc, "UTF-8", $filesystemElement);
-    }
-    /**
-     * Test if a string seem to be already UTF8-encoded
-     * @static
-     * @param string $string
-     * @return bool
-     */
-    public static function isUtf8($string)
-    {
-        return preg_match('%^(?:
-          [\x09\x0A\x0D\x20-\x7E]            # ASCII
-        | [\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
-            )*$%xs', $string);
-    }
-    /**
-     * Transform a string from current Storage charset to utf8
-     * @static
-     * @param string $filesystemElement
-     * @param bool $test Test if it's already UTF8 or not, to avoid double-encoding
-     * @return string
-     */
-    public static function fromStorageEncoding($filesystemElement, $test = true)
-    {
-        if ($test && SystemTextEncoding::isUtf8($filesystemElement)) {
-            return $filesystemElement;
-        }
-        $enc = SystemTextEncoding::getEncoding();
-        return SystemTextEncoding::changeCharset($enc, "UTF-8", $filesystemElement);
-    }
-    /**
-     * Decode a string from UTF8 to current Storage Charset
-     * @static
-     * @param string $filesystemElement
-     * @param bool $test Try to detect if it's really utf8 or not
-     * @return string
-     */
-    public static function toStorageEncoding($filesystemElement, $test = false)
-    {
-        if ($test && !SystemTextEncoding::isUtf8($filesystemElement)) {
-            return $filesystemElement;
-        }
-        $enc = SystemTextEncoding::getEncoding();
-        return SystemTextEncoding::changeCharset("UTF-8", $enc, $filesystemElement);
-    }	
-}
diff --git a/core/src/core/classes/class.UnixProcess.php b/core/src/core/classes/class.UnixProcess.php
deleted file mode 100644
index 3e1921db00..0000000000
--- a/core/src/core/classes/class.UnixProcess.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>, Cyril Russo
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-/**
- * Utilitary to launch a process and keep track of it
- * @package Pydio
- * @subpackage Core
- */
-class UnixProcess
-{
-    /**
-     * @var string
-     */
-    private $pid;
-    /**
-     * @var string
-     */
-    private $command;
-    /**
-     * @var string
-     */
-    private $output;
-
-    /**
-     * @param bool|string $cl Command to execute
-     * @param bool|string $output A file in which to redirect the output. Send to /dev/null if false.
-     */
-    public function __construct($cl=false, $output=false)
-    {
-        if ($output != false) {
-              $this->output = $output;
-        } else {
-               $this->output = "/dev/null";
-        }
-        if ($cl != false) {
-            $this->command = $cl;
-            $this->runCom();
-        }
-    }
-    /**
-     * Run the command
-     * @return void
-     */
-    private function runCom()
-    {
-        $command = $this->command.' > '.$this->output.' 2>&1 & echo $!';
-        exec($command ,$op);
-        $this->pid = (int) $op[0];
-        $this->command = $command;
-    }
-    /**
-     * Processid setter
-     * @param $pid
-     * @return void
-     */
-    public function setPid($pid)
-    {
-        $this->pid = $pid;
-    }
-
-    /**
-     * Processid getter
-     * @return string
-     */
-    public function getPid()
-    {
-        return $this->pid;
-    }
-
-    /**
-     * Try to get status from command line by running "ps -p PID"
-     * @return bool
-     */
-    public function status()
-    {
-        $command = 'ps -p '.$this->pid;
-        exec($command,$op);
-        if (!isset($op[1]))return false;
-        else return true;
-    }
-    /**
-     * Start the command
-     * @return bool
-     */
-    public function start()
-    {
-        if ($this->command != '') $this->runCom();
-        return true;
-    }
-    /**
-     * Try to kill the process via command line.
-     * @return bool
-     */
-    public function stop()
-    {
-        $command = 'kill '.$this->pid;
-        exec($command);
-        if ($this->status() == false)return true;
-        else return false;
-    }
-}
diff --git a/core/src/core/classes/class.UserSelection.php b/core/src/core/classes/class.UserSelection.php
deleted file mode 100644
index 444e526283..0000000000
--- a/core/src/core/classes/class.UserSelection.php
+++ /dev/null
@@ -1,334 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-/**
- * Abstraction of a user selection passed via http parameters.
- * @package Pydio
- * @subpackage Core
- */
-class UserSelection
-{
-    public $files;
-    /**
-     * @var AJXP_Node[]
-     */
-    private $nodes;
-    public $varPrefix = "file";
-    public $dirPrefix = "dir";
-    public $isUnique = true;
-    public $dir;
-
-    public $inZip = false;
-    public $zipFile;
-    public $localZipPath;
-
-    /**
-     * @var Repository
-     */
-    private $repository;
-
-    /**
-     * Construction selector
-     * @param Repository|null $repository
-     * @param array|null $httpVars
-     */
-    public function __construct($repository = null, $httpVars = null)
-    {
-        $this->files = array();
-        if(isSet($repository)){
-            $this->repository = $repository;
-        }
-        if(iSset($httpVars)){
-            $this->initFromHttpVars($httpVars);
-        }
-    }
-    /**
-     * Init the selection from the query vars
-     * @param array $passedArray
-     * @return void
-     */
-    public function initFromHttpVars($passedArray=null)
-    {
-        if ($passedArray != null) {
-            if (isSet($passedArray["selection_nodes"]) && is_array($passedArray["selection_nodes"])) {
-                $this->initFromNodes($passedArray["selection_nodes"]);
-            } else {
-                $this->initFromArray($passedArray);
-            }
-        } else {
-            $this->initFromArray($_GET);
-            $this->initFromArray($_POST);
-        }
-    }
-
-    /**
-     * @param AJXP_Node[] $nodes
-     */
-    public function initFromNodes($nodes)
-    {
-        $this->nodes = $nodes;
-        $this->isUnique = (count($nodes) == 1);
-        $this->dir = '/';
-        $this->files = array();
-        $this->inZip = false;
-        foreach ($nodes as $n) {
-            $this->addFile($n->getPath());
-        }
-
-    }
-
-    /**
-     *
-     * Init from a simple array
-     * @param $array
-     */
-    public function initFromArray($array)
-    {
-        if (!is_array($array)) {
-            return ;
-        }
-        if (isSet($array[$this->varPrefix]) && $array[$this->varPrefix] != "") {
-            $v = $array[$this->varPrefix];
-            if(strpos($v, "base64encoded:") === 0){
-                $v = base64_decode(array_pop(explode(':', $v, 2)));
-            }
-            $this->addFile(AJXP_Utils::decodeSecureMagic($v));
-            $this->isUnique = true;
-            //return ;
-        }
-        if (isSet($array[$this->varPrefix."_0"])) {
-            $index = 0;
-            while (isSet($array[$this->varPrefix."_".$index])) {
-                $v = $array[$this->varPrefix."_".$index];
-                if(strpos($v, "base64encoded:") === 0){
-                    $v = base64_decode(array_pop(explode(':', $v, 2)));
-                }
-                $this->addFile(AJXP_Utils::decodeSecureMagic($v));
-                $index ++;
-            }
-            $this->isUnique = false;
-            if (count($this->files) == 1) {
-                $this->isUnique = true;
-            }
-            //return ;
-        }
-        if (isSet($array["nodes"]) && is_array($array["nodes"])) {
-            $this->files = array();
-            foreach($array["nodes"] as $value){
-                $this->addFile(AJXP_Utils::decodeSecureMagic($value));
-            }
-            $this->isUnique = count($this->files) == 1;
-        }
-        if (isSet($array[$this->dirPrefix])) {
-            $this->dir = AJXP_Utils::securePath($array[$this->dirPrefix]);
-            if ($test = $this->detectZip($this->dir)) {
-                $this->inZip = true;
-                $this->zipFile = $test[0];
-                $this->localZipPath = $test[1];
-            }
-        } else if (!$this->isEmpty() && $this->isUnique()) {
-            if ($test = $this->detectZip(AJXP_Utils::safeDirname($this->files[0]))) {
-                $this->inZip = true;
-                $this->zipFile = $test[0];
-                $this->localZipPath = $test[1];
-            }
-        }
-    }
-
-    /**
-     * Add file to selection
-     * @param string $filePath
-     */
-    public function addFile($filePath){
-        if(!in_array($filePath, $this->files)){
-            $this->files[] = $filePath;
-        }
-    }
-
-
-    /**
-     * Does the selection have one or more items
-     * @return bool
-     */
-    public function isUnique()
-    {
-        return (count($this->files) == 1);
-    }
-    /**
-     * Are we currently inside a zip?
-     * @return bool
-     */
-    public function inZip()
-    {
-        return $this->inZip;
-    }
-    /**
-     * Returns UTF8 encoded path
-     * @param bool $decode
-     * @return String
-     */
-    public function getZipPath($decode = false)
-    {
-        if($decode) return AJXP_Utils::decodeSecureMagic($this->zipFile);
-        else return $this->zipFile;
-    }
-
-    /**
-     * Returns UTF8 encoded path
-     * @param bool $decode
-     * @return String
-     */
-    public function getZipLocalPath($decode = false)
-    {
-        if($decode) return AJXP_Utils::decodeSecureMagic($this->localZipPath);
-        else return $this->localZipPath;
-    }
-    /**
-     * Number of selected items
-     * @return int
-     */
-    public function getCount()
-    {
-        return count($this->files);
-    }
-    /**
-     * List of items selected
-     * @return string[]
-     */
-    public function getFiles()
-    {
-        return $this->files;
-    }
-    /**
-     * First item of the list
-     * @return string
-     */
-    public function getUniqueFile()
-    {
-        return $this->files[0];
-    }
-
-    /**
-     * @return AJXP_Node
-     * @throws Exception
-     */
-    public function getUniqueNode()
-    {
-        if (isSet($this->nodes) && is_array($this->nodes)) {
-            return $this->nodes[0];
-        }
-        if(!isSet($this->repository)){
-            throw new Exception("UserSelection: cannot build nodes URL without a proper repository");
-        }
-        $user = AuthService::getLoggedUser();
-        if (!AuthService::usersEnabled() && $user!=null && !$user->canWrite($this->repository->getId())) {
-            throw new Exception("You have no right on this action.");
-        }
-
-        $currentFile = $this->getUniqueFile();
-        $urlBase = "pydio://".$this->repository->getId();
-        $ajxpNode = new AJXP_Node($urlBase.$currentFile);
-        return $ajxpNode;
-
-    }
-
-    /**
-     * @return AJXP_Node[]
-     * @throws Exception
-     */
-    public function buildNodes()
-    {
-        if (isSet($this->nodes)) {
-            return $this->nodes;
-        }
-        if(!isSet($this->repository)){
-            throw new Exception("UserSelection: cannot build nodes URL without a proper repository");
-        }
-        $urlBase = "pydio://".$this->repository->getId();
-        $nodes = array();
-        foreach ($this->files as $file) {
-            $nodes[] = new AJXP_Node($urlBase.$file);
-        }
-        return $nodes;
-
-    }
-
-    public function currentBaseUrl(){
-        if(!isSet($this->repository)){
-            throw new Exception("UserSelection::currentBaseUrl: cannot build nodes URL without a proper repository");
-        }
-        return "pydio://".$this->repository->getId();
-    }
-
-    /**
-     * Is this selection empty?
-     * @return bool
-     */
-    public function isEmpty()
-    {
-        if (count($this->files) == 0) {
-            return true;
-        }
-        return false;
-    }
-    /**
-     * Detect if there is .zip somewhere in the path
-     * @static
-     * @param string $dirPath
-     * @return array|bool
-     */
-    public static function detectZip($dirPath)
-    {
-        if (preg_match("/\.zip\//i", $dirPath) || preg_match("/\.zip$/i", $dirPath)) {
-            $contExt = strrpos(strtolower($dirPath), ".zip");
-            $zipPath = substr($dirPath, 0, $contExt+4);
-            $localPath = substr($dirPath, $contExt+4);
-            if($localPath == "") $localPath = "/";
-            return array($zipPath, $localPath);
-        }
-        return false;
-    }
-    /**
-     * Sets the selected items
-     * @param array $files
-     * @return void
-     */
-    public function setFiles($files)
-    {
-        $this->files = $files;
-    }
-
-    public function removeFile($file){
-        $newFiles = array();
-        foreach($this->files as $k => $f){
-            if($f != $file) $newFiles[] = $file;
-        }
-        $this->files = $newFiles;
-        if(isSet($this->nodes)){
-            $newNodes = array();
-            foreach($this->nodes as $l => $n){
-                if($n->getPath() != $file) $newNodes[] = $n;
-            }
-            $this->nodes = $newNodes;
-        }
-    }
-    
-}
diff --git a/core/src/core/classes/dibi.compact.php b/core/src/core/classes/dibi.compact.php
deleted file mode 100644
index 3899a822ad..0000000000
--- a/core/src/core/classes/dibi.compact.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-require_once("dibi/dibi.php");
diff --git a/core/src/core/classes/guzzle/composer.json b/core/src/core/classes/guzzle/composer.json
deleted file mode 100644
index 3fca3784de..0000000000
--- a/core/src/core/classes/guzzle/composer.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "require": {
-        "guzzlehttp/guzzle": "~5",
-        "guzzlehttp/command": "~0.7",
-        "guzzlehttp/guzzle-services": "~0.5",
-        "gimler/guzzle-description-loader" : "*",
-        "commerceguys/guzzle-oauth2-plugin": "~2.0"
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/autoload.php b/core/src/core/classes/guzzle/vendor/autoload.php
deleted file mode 100644
index 0b0d7037af..0000000000
--- a/core/src/core/classes/guzzle/vendor/autoload.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-// autoload.php @generated by Composer
-
-require_once __DIR__ . '/composer' . '/autoload_real.php';
-
-return ComposerAutoloaderInitd34ad80d4d6e8f56f3411c9698c8a661::getLoader();
diff --git a/core/src/core/classes/guzzle/vendor/composer/ClassLoader.php b/core/src/core/classes/guzzle/vendor/composer/ClassLoader.php
deleted file mode 100644
index ff6ecfb822..0000000000
--- a/core/src/core/classes/guzzle/vendor/composer/ClassLoader.php
+++ /dev/null
@@ -1,413 +0,0 @@
-<?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;
-
-    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;
-    }
-
-    /**
-     * 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)
-    {
-        // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
-        if ('\\' == $class[0]) {
-            $class = substr($class, 1);
-        }
-
-        // class map lookup
-        if (isset($this->classMap[$class])) {
-            return $this->classMap[$class];
-        }
-        if ($this->classMapAuthoritative) {
-            return false;
-        }
-
-        $file = $this->findFileWithExtension($class, '.php');
-
-        // Search for Hack files if we are running on HHVM
-        if ($file === null && defined('HHVM_VERSION')) {
-            $file = $this->findFileWithExtension($class, '.hh');
-        }
-
-        if ($file === null) {
-            // Remember that this class does not exist.
-            return $this->classMap[$class] = false;
-        }
-
-        return $file;
-    }
-
-    private function findFileWithExtension($class, $ext)
-    {
-        // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
-
-        $first = $class[0];
-        if (isset($this->prefixLengthsPsr4[$first])) {
-            foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
-                            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;
-        }
-    }
-}
-
-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- */
-function includeFile($file)
-{
-    include $file;
-}
diff --git a/core/src/core/classes/guzzle/vendor/composer/LICENSE b/core/src/core/classes/guzzle/vendor/composer/LICENSE
deleted file mode 100644
index 1a28124886..0000000000
--- a/core/src/core/classes/guzzle/vendor/composer/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-
-Copyright (c) 2016 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/src/core/classes/guzzle/vendor/composer/autoload_classmap.php b/core/src/core/classes/guzzle/vendor/composer/autoload_classmap.php
deleted file mode 100644
index 59a0cdf083..0000000000
--- a/core/src/core/classes/guzzle/vendor/composer/autoload_classmap.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-// autoload_classmap.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-    'BeforeValidException' => $vendorDir . '/firebase/php-jwt/Exceptions/BeforeValidException.php',
-    'ExpiredException' => $vendorDir . '/firebase/php-jwt/Exceptions/ExpiredException.php',
-    'JWT' => $vendorDir . '/firebase/php-jwt/Authentication/JWT.php',
-    'SignatureInvalidException' => $vendorDir . '/firebase/php-jwt/Exceptions/SignatureInvalidException.php',
-);
diff --git a/core/src/core/classes/guzzle/vendor/composer/autoload_files.php b/core/src/core/classes/guzzle/vendor/composer/autoload_files.php
deleted file mode 100644
index 80babd7e9c..0000000000
--- a/core/src/core/classes/guzzle/vendor/composer/autoload_files.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-// autoload_files.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-    'ad155f8f1cf0d418fe49e248db8c661b' => $vendorDir . '/react/promise/src/functions_include.php',
-);
diff --git a/core/src/core/classes/guzzle/vendor/composer/autoload_namespaces.php b/core/src/core/classes/guzzle/vendor/composer/autoload_namespaces.php
deleted file mode 100644
index b7fc0125db..0000000000
--- a/core/src/core/classes/guzzle/vendor/composer/autoload_namespaces.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-// autoload_namespaces.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-);
diff --git a/core/src/core/classes/guzzle/vendor/composer/autoload_psr4.php b/core/src/core/classes/guzzle/vendor/composer/autoload_psr4.php
deleted file mode 100644
index 42754cd2c9..0000000000
--- a/core/src/core/classes/guzzle/vendor/composer/autoload_psr4.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-// autoload_psr4.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-    'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
-    'Symfony\\Component\\Filesystem\\' => array($vendorDir . '/symfony/filesystem'),
-    'Symfony\\Component\\Config\\' => array($vendorDir . '/symfony/config'),
-    'React\\Promise\\' => array($vendorDir . '/react/promise/src'),
-    'Guzzle\\Service\\Loader\\' => array($vendorDir . '/gimler/guzzle-description-loader/src'),
-    'GuzzleHttp\\Stream\\' => array($vendorDir . '/guzzlehttp/streams/src'),
-    'GuzzleHttp\\Ring\\' => array($vendorDir . '/guzzlehttp/ringphp/src'),
-    'GuzzleHttp\\Command\\Guzzle\\' => array($vendorDir . '/guzzlehttp/guzzle-services/src'),
-    'GuzzleHttp\\Command\\' => array($vendorDir . '/guzzlehttp/command/src'),
-    'GuzzleHttp\\' => array($vendorDir . '/guzzlehttp/guzzle/src'),
-    'CommerceGuys\\Guzzle\\Oauth2\\' => array($vendorDir . '/commerceguys/guzzle-oauth2-plugin/src'),
-);
diff --git a/core/src/core/classes/guzzle/vendor/composer/autoload_real.php b/core/src/core/classes/guzzle/vendor/composer/autoload_real.php
deleted file mode 100644
index b4d2ed09a1..0000000000
--- a/core/src/core/classes/guzzle/vendor/composer/autoload_real.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-// autoload_real.php @generated by Composer
-
-class ComposerAutoloaderInitd34ad80d4d6e8f56f3411c9698c8a661
-{
-    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('ComposerAutoloaderInitd34ad80d4d6e8f56f3411c9698c8a661', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitd34ad80d4d6e8f56f3411c9698c8a661', 'loadClassLoader'));
-
-        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION');
-        if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
-
-            call_user_func(\Composer\Autoload\ComposerStaticInitd34ad80d4d6e8f56f3411c9698c8a661::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\ComposerStaticInitd34ad80d4d6e8f56f3411c9698c8a661::$files;
-        } else {
-            $includeFiles = require __DIR__ . '/autoload_files.php';
-        }
-        foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequired34ad80d4d6e8f56f3411c9698c8a661($fileIdentifier, $file);
-        }
-
-        return $loader;
-    }
-}
-
-function composerRequired34ad80d4d6e8f56f3411c9698c8a661($fileIdentifier, $file)
-{
-    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
-        require $file;
-
-        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/composer/installed.json b/core/src/core/classes/guzzle/vendor/composer/installed.json
deleted file mode 100644
index 1f725cb7c1..0000000000
--- a/core/src/core/classes/guzzle/vendor/composer/installed.json
+++ /dev/null
@@ -1,597 +0,0 @@
-[
-    {
-        "name": "guzzlehttp/streams",
-        "version": "3.0.0",
-        "version_normalized": "3.0.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/guzzle/streams.git",
-            "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/guzzle/streams/zipball/47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
-            "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.4.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.0"
-        },
-        "time": "2014-10-12 19:18:40",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "3.0-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "GuzzleHttp\\Stream\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Michael Dowling",
-                "email": "mtdowling@gmail.com",
-                "homepage": "https://github.com/mtdowling"
-            }
-        ],
-        "description": "Provides a simple abstraction over streams of data",
-        "homepage": "http://guzzlephp.org/",
-        "keywords": [
-            "Guzzle",
-            "stream"
-        ]
-    },
-    {
-        "name": "guzzlehttp/ringphp",
-        "version": "1.1.0",
-        "version_normalized": "1.1.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/guzzle/RingPHP.git",
-            "reference": "dbbb91d7f6c191e5e405e900e3102ac7f261bc0b"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/guzzle/RingPHP/zipball/dbbb91d7f6c191e5e405e900e3102ac7f261bc0b",
-            "reference": "dbbb91d7f6c191e5e405e900e3102ac7f261bc0b",
-            "shasum": ""
-        },
-        "require": {
-            "guzzlehttp/streams": "~3.0",
-            "php": ">=5.4.0",
-            "react/promise": "~2.0"
-        },
-        "require-dev": {
-            "ext-curl": "*",
-            "phpunit/phpunit": "~4.0"
-        },
-        "suggest": {
-            "ext-curl": "Guzzle will use specific adapters if cURL is present"
-        },
-        "time": "2015-05-20 03:37:09",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.1-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "GuzzleHttp\\Ring\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Michael Dowling",
-                "email": "mtdowling@gmail.com",
-                "homepage": "https://github.com/mtdowling"
-            }
-        ],
-        "description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function."
-    },
-    {
-        "name": "guzzlehttp/command",
-        "version": "0.7.1",
-        "version_normalized": "0.7.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/guzzle/command.git",
-            "reference": "2e8286ff81f75f97b00f7dcc2f51e2efafb373bd"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/guzzle/command/zipball/2e8286ff81f75f97b00f7dcc2f51e2efafb373bd",
-            "reference": "2e8286ff81f75f97b00f7dcc2f51e2efafb373bd",
-            "shasum": ""
-        },
-        "require": {
-            "guzzlehttp/guzzle": "~5.0",
-            "php": ">=5.4.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.0"
-        },
-        "time": "2015-01-14 18:54:57",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "0.7-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "GuzzleHttp\\Command\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Michael Dowling",
-                "email": "mtdowling@gmail.com",
-                "homepage": "https://github.com/mtdowling"
-            }
-        ],
-        "description": "Provides the foundation for building command based web service clients"
-    },
-    {
-        "name": "guzzlehttp/guzzle-services",
-        "version": "0.5.0",
-        "version_normalized": "0.5.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/guzzle/guzzle-services.git",
-            "reference": "5402867628d266748db88f05c90ede54fd1d884c"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/guzzle/guzzle-services/zipball/5402867628d266748db88f05c90ede54fd1d884c",
-            "reference": "5402867628d266748db88f05c90ede54fd1d884c",
-            "shasum": ""
-        },
-        "require": {
-            "guzzlehttp/command": "0.7.*",
-            "php": ">=5.4.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.0"
-        },
-        "time": "2014-12-23 19:13:18",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "0.4-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "GuzzleHttp\\Command\\Guzzle\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Michael Dowling",
-                "email": "mtdowling@gmail.com",
-                "homepage": "https://github.com/mtdowling"
-            }
-        ],
-        "description": "Provides an implementation of the Guzzle Command library that uses Guzzle service descriptions to describe web services, serialize requests, and parse responses into easy to use model structures."
-    },
-    {
-        "name": "symfony/yaml",
-        "version": "v3.1.2",
-        "version_normalized": "3.1.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/yaml.git",
-            "reference": "2884c26ce4c1d61aebf423a8b912950fe7c764de"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/yaml/zipball/2884c26ce4c1d61aebf423a8b912950fe7c764de",
-            "reference": "2884c26ce4c1d61aebf423a8b912950fe7c764de",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.5.9"
-        },
-        "time": "2016-06-29 05:41:56",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "3.1-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"
-    },
-    {
-        "name": "symfony/filesystem",
-        "version": "v3.1.2",
-        "version_normalized": "3.1.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/filesystem.git",
-            "reference": "322da5f0910d8aa0b25fa65ffccaba68dbddb890"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/filesystem/zipball/322da5f0910d8aa0b25fa65ffccaba68dbddb890",
-            "reference": "322da5f0910d8aa0b25fa65ffccaba68dbddb890",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.5.9"
-        },
-        "time": "2016-06-29 05:41:56",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "3.1-dev"
-            }
-        },
-        "installation-source": "dist",
-        "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"
-    },
-    {
-        "name": "symfony/config",
-        "version": "v3.1.2",
-        "version_normalized": "3.1.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/config.git",
-            "reference": "bcf5aebabc95b56e370e13d78565f74c7d8726dc"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/config/zipball/bcf5aebabc95b56e370e13d78565f74c7d8726dc",
-            "reference": "bcf5aebabc95b56e370e13d78565f74c7d8726dc",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.5.9",
-            "symfony/filesystem": "~2.8|~3.0"
-        },
-        "suggest": {
-            "symfony/yaml": "To use the yaml reference dumper"
-        },
-        "time": "2016-06-29 05:41:56",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "3.1-dev"
-            }
-        },
-        "installation-source": "dist",
-        "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"
-    },
-    {
-        "name": "gimler/guzzle-description-loader",
-        "version": "v0.0.4",
-        "version_normalized": "0.0.4.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/gimler/guzzle-description-loader.git",
-            "reference": "d1384a65ffb1a10a7e9e17c427e77b281ae38498"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/gimler/guzzle-description-loader/zipball/d1384a65ffb1a10a7e9e17c427e77b281ae38498",
-            "reference": "d1384a65ffb1a10a7e9e17c427e77b281ae38498",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.5.0",
-            "symfony/config": "~3.0",
-            "symfony/yaml": "~3.0"
-        },
-        "time": "2016-01-27 06:35:21",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Guzzle\\Service\\Loader\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Gordon Franke",
-                "email": "info@nevalon.de"
-            },
-            {
-                "name": "Community",
-                "homepage": "https://github.com/gimler/guzzle-description-loader/contributors"
-            }
-        ],
-        "description": "Load guzzle service description from various file formats"
-    },
-    {
-        "name": "react/promise",
-        "version": "v2.4.1",
-        "version_normalized": "2.4.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/reactphp/promise.git",
-            "reference": "8025426794f1944de806618671d4fa476dc7626f"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/reactphp/promise/zipball/8025426794f1944de806618671d4fa476dc7626f",
-            "reference": "8025426794f1944de806618671d4fa476dc7626f",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.4.0"
-        },
-        "time": "2016-05-03 17:50:52",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.0-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "React\\Promise\\": "src/"
-            },
-            "files": [
-                "src/functions_include.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Jan Sorgalla",
-                "email": "jsorgalla@gmail.com"
-            }
-        ],
-        "description": "A lightweight implementation of CommonJS Promises/A for PHP"
-    },
-    {
-        "name": "firebase/php-jwt",
-        "version": "v2.2.0",
-        "version_normalized": "2.2.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/firebase/php-jwt.git",
-            "reference": "e0a75bfb6413f22092c99b70f310ccb2cca3efa5"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/firebase/php-jwt/zipball/e0a75bfb6413f22092c99b70f310ccb2cca3efa5",
-            "reference": "e0a75bfb6413f22092c99b70f310ccb2cca3efa5",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.2.0"
-        },
-        "time": "2015-06-22 23:26:39",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "classmap": [
-                "Authentication/",
-                "Exceptions/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Neuman Vong",
-                "email": "neuman+pear@twilio.com",
-                "role": "Developer"
-            },
-            {
-                "name": "Anant Narayanan",
-                "email": "anant@php.net",
-                "role": "Developer"
-            }
-        ],
-        "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
-        "homepage": "https://github.com/firebase/php-jwt"
-    },
-    {
-        "name": "guzzlehttp/guzzle",
-        "version": "5.3.1",
-        "version_normalized": "5.3.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/guzzle/guzzle.git",
-            "reference": "70f1fa53b71c4647bf2762c09068a95f77e12fb8"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/guzzle/guzzle/zipball/70f1fa53b71c4647bf2762c09068a95f77e12fb8",
-            "reference": "70f1fa53b71c4647bf2762c09068a95f77e12fb8",
-            "shasum": ""
-        },
-        "require": {
-            "guzzlehttp/ringphp": "^1.1",
-            "php": ">=5.4.0"
-        },
-        "require-dev": {
-            "ext-curl": "*",
-            "phpunit/phpunit": "^4.0"
-        },
-        "time": "2016-07-15 19:28:39",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "GuzzleHttp\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Michael Dowling",
-                "email": "mtdowling@gmail.com",
-                "homepage": "https://github.com/mtdowling"
-            }
-        ],
-        "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients",
-        "homepage": "http://guzzlephp.org/",
-        "keywords": [
-            "client",
-            "curl",
-            "framework",
-            "http",
-            "http client",
-            "rest",
-            "web service"
-        ]
-    },
-    {
-        "name": "commerceguys/guzzle-oauth2-plugin",
-        "version": "v2.1.1",
-        "version_normalized": "2.1.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/commerceguys/guzzle-oauth2-plugin.git",
-            "reference": "f7ed19171c3c5accfb6f0b3d1209eb5815ef8148"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/commerceguys/guzzle-oauth2-plugin/zipball/f7ed19171c3c5accfb6f0b3d1209eb5815ef8148",
-            "reference": "f7ed19171c3c5accfb6f0b3d1209eb5815ef8148",
-            "shasum": ""
-        },
-        "require": {
-            "firebase/php-jwt": "~2.0",
-            "guzzlehttp/guzzle": "~5.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.5"
-        },
-        "time": "2015-12-12 23:27:25",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "CommerceGuys\\Guzzle\\Oauth2\\": "src"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Bojan Zivanovic"
-            },
-            {
-                "name": "Damien Tournoud"
-            },
-            {
-                "name": "Patrick Dawkins"
-            }
-        ],
-        "description": "An OAuth2 plugin (subscriber) for Guzzle"
-    }
-]
diff --git a/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/.gitignore b/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/.gitignore
deleted file mode 100644
index 3ce5adbbde..0000000000
--- a/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.idea
-vendor
diff --git a/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/.travis.yml b/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/.travis.yml
deleted file mode 100644
index b9e8c39db9..0000000000
--- a/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/.travis.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-language: php
-
-sudo: false
-
-matrix:
-    include:
-        - php: hhvm
-        - php: 5.5
-        - php: 5.6
-        - php: 7
-    fast_finish: true
-
-install: composer install --dev --prefer-source
-script:  phpunit
diff --git a/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/LICENSE b/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/LICENSE
deleted file mode 100644
index 1ee7e36a44..0000000000
--- a/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2011 Gordon Franke, https://github.com/gimler <info@nevalon.de>
-
-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/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/README.md b/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/README.md
deleted file mode 100644
index 30305d389d..0000000000
--- a/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
-[![Build Status](https://secure.travis-ci.org/gimler/guzzle-description-loader.png?branch=master)](http://travis-ci.org/gimler/guzzle-description-loader)
-[![Dependency Status](https://www.versioneye.com/user/projects/55f17b93d4d204001e000053/badge.png)](https://www.versioneye.com/user/projects/55f17b93d4d204001e000053)
-
-# Guzzle Service Description Loader
-
-A stand-alone Service Description loader for Guzzle 5.x.
-
-## Installation
-
-If you are using Composer, and you should, just run the following command:
-
-``` sh
-composer require "gimler/guzzle-description-loader"
-```
-
-## Supported File Formats
-
-* Yaml
-* Php
-* Json
-
-## Usage
-
-``` php
-use Guzzle\Service\Loader\JsonLoader;
-use GuzzleHttp\Command\Guzzle\Description;
-use Symfony\Component\Config\FileLocator;
-
-$configDirectories = array(DESCRIPTION_PATH);
-$this->locator = new FileLocator($configDirectories);
-
-$this->jsonLoader = new JsonLoader($this->locator);
-
-$description = $this->jsonLoader->load($this->locator->locate('description.json'));
-$description = new Description($description);
-```
-
-## Sample
-
-``` json
-{
-  "operations": {
-    "certificates.list": {
-      "httpMethod": "GET",
-      "uri": "certificates",
-      "description": "Lists and returns basic information about all of the management certificates associated with the specified subscription.",
-      "responseModel": "CertificateList"
-    }
-  },
-  "models": {
-    "CertificateList": {
-      "type": "array",
-      "name": "certificates",
-      "sentAs": "SubscriptionCertificate",
-      "location": "xml",
-      "items": {
-        "type": "object"
-      }
-    }
-  },
-  "imports": [
-    "description_import.json"
-  ]
-}
-```
diff --git a/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/composer.json b/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/composer.json
deleted file mode 100644
index e93a85366c..0000000000
--- a/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/composer.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "name": "gimler/guzzle-description-loader",
-    "description": "Load guzzle service description from various file formats",
-    "require": {
-        "php": ">=5.5.0",
-        "symfony/config": "~3.0",
-        "symfony/yaml": "~3.0"
-    },
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Gordon Franke",
-            "email": "info@nevalon.de"
-        },
-        {
-            "name": "Community",
-            "homepage": "https://github.com/gimler/guzzle-description-loader/contributors"
-        }
-    ],
-    "autoload": {
-        "psr-4": {
-            "Guzzle\\Service\\Loader\\": "src/"
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/composer.lock b/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/composer.lock
deleted file mode 100644
index 2e9db002d9..0000000000
--- a/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/composer.lock
+++ /dev/null
@@ -1,169 +0,0 @@
-{
-    "_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"
-    ],
-    "hash": "950a6c7017df36346b2daebfd6a55cf7",
-    "content-hash": "b19a782dc303a22631422c69ca828fa0",
-    "packages": [
-        {
-            "name": "symfony/config",
-            "version": "v3.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/config.git",
-                "reference": "58680a6516a457a6c65044fe33586c4a81fdff01"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/58680a6516a457a6c65044fe33586c4a81fdff01",
-                "reference": "58680a6516a457a6c65044fe33586c4a81fdff01",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9",
-                "symfony/filesystem": "~2.8|~3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-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": "2015-12-26 13:39:53"
-        },
-        {
-            "name": "symfony/filesystem",
-            "version": "v3.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "c2e59d11dccd135dc8f00ee97f34fe1de842e70c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/c2e59d11dccd135dc8f00ee97f34fe1de842e70c",
-                "reference": "c2e59d11dccd135dc8f00ee97f34fe1de842e70c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-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": "2015-12-22 10:39:06"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v3.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "3df409958a646dad2bc5046c3fb671ee24a1a691"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/3df409958a646dad2bc5046c3fb671ee24a1a691",
-                "reference": "3df409958a646dad2bc5046c3fb671ee24a1a691",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-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": "2015-12-26 13:39:53"
-        }
-    ],
-    "packages-dev": [],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {
-        "php": ">=5.5.0"
-    },
-    "platform-dev": []
-}
diff --git a/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/phpunit.xml.dist b/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/phpunit.xml.dist
deleted file mode 100644
index 46c634f0f5..0000000000
--- a/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/phpunit.xml.dist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./tests/bootstrap.php"
-         colors="true">
-    <testsuites>
-        <testsuite>
-            <directory>tests/suite</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/src/FileLoader.php b/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/src/FileLoader.php
deleted file mode 100644
index 6a7f2bfc84..0000000000
--- a/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/src/FileLoader.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/*
- * This file is part of the Guzzle description loader package.
- *
- * (c) Gordon Franke <info@nevalon.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Guzzle\Service\Loader;
-
-use Symfony\Component\Config\Loader\FileLoader as BaseFileLoader;
-
-abstract class FileLoader extends BaseFileLoader
-{
-
-    public function load($resource, $type = null)
-    {
-        if (!stream_is_local($resource)) {
-            throw new \Exception(sprintf('This is not a local file "%s".', $resource));
-        }
-        if (!file_exists($resource)) {
-            throw new \Exception(sprintf('File "%s" not found.', $resource));
-        }
-
-        $configValues = $this->loadResource($resource);
-
-        if (isset($configValues["imports"])) {
-            foreach($configValues["imports"] as $file) {
-                $configValues = array_merge_recursive($configValues, $this->import($this->locator->locate($file)));
-            }
-        }
-
-        unset($configValues["imports"]);
-
-        return $configValues;
-    }
-
-    /*
-     * @param string $resource
-     *
-     * @return array
-     *
-     * @throws InvalidResourceException If stream content has an invalid format.
-     */
-    abstract protected function loadResource($resource);
-}
\ No newline at end of file
diff --git a/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/src/JsonLoader.php b/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/src/JsonLoader.php
deleted file mode 100644
index 5be3001cea..0000000000
--- a/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/src/JsonLoader.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/*
- * This file is part of the Guzzle description loader package.
- *
- * (c) Gordon Franke <info@nevalon.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Guzzle\Service\Loader;
-
-use Guzzle\Service\Loader\FileLoader;
-
-class JsonLoader extends FileLoader
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function loadResource($resource)
-    {
-        $configValues = array();
-        if ($data = file_get_contents($resource)) {
-            $configValues = json_decode($data, true);
-            if (0 < $errorCode = json_last_error()) {
-                throw new \Exception(sprintf('Error parsing JSON - %s', $this->getJSONErrorMessage($errorCode)));
-            }
-        }
-
-        return $configValues;
-    }
-
-    /**
-     * Translates JSON_ERROR_* constant into meaningful message.
-     *
-     * @param int $errorCode Error code returned by json_last_error() call
-     *
-     * @return string Message string
-     */
-    private function getJSONErrorMessage($errorCode)
-    {
-        switch ($errorCode) {
-            case JSON_ERROR_DEPTH:
-                return 'Maximum stack depth exceeded';
-            case JSON_ERROR_STATE_MISMATCH:
-                return 'Underflow or the modes mismatch';
-            case JSON_ERROR_CTRL_CHAR:
-                return 'Unexpected control character found';
-            case JSON_ERROR_SYNTAX:
-                return 'Syntax error, malformed JSON';
-            case JSON_ERROR_UTF8:
-                return 'Malformed UTF-8 characters, possibly incorrectly encoded';
-            default:
-                return 'Unknown error';
-        }
-    }
-
-    public function supports($resource, $type = null)
-    {
-        return is_string($resource) && 'json' === pathinfo(
-            $resource,
-            PATHINFO_EXTENSION
-        );
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/src/PhpLoader.php b/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/src/PhpLoader.php
deleted file mode 100644
index b358341c59..0000000000
--- a/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/src/PhpLoader.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of the Guzzle description loader package.
- *
- * (c) Gordon Franke <info@nevalon.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Guzzle\Service\Loader;
-
-use Guzzle\Service\Loader\FileLoader;
-
-class PhpLoader extends FileLoader
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function loadResource($resource)
-    {
-        return require $resource;
-    }
-
-    public function supports($resource, $type = null)
-    {
-        return is_string($resource) && 'php' === pathinfo(
-            $resource,
-            PATHINFO_EXTENSION
-        );
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/src/YamlLoader.php b/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/src/YamlLoader.php
deleted file mode 100644
index 2a1e49612f..0000000000
--- a/core/src/core/classes/guzzle/vendor/gimler/guzzle-description-loader/src/YamlLoader.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/*
- * This file is part of the Guzzle description loader package.
- *
- * (c) Gordon Franke <info@nevalon.de>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Guzzle\Service\Loader;
-
-use Guzzle\Service\Loader\FileLoader;
-use Symfony\Component\Yaml\Parser as YamlParser;
-use Symfony\Component\Yaml\Exception\ParseException;
-
-class YamlLoader extends FileLoader
-{
-    private $yamlParser;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function loadResource($resource)
-    {
-        if (null === $this->yamlParser) {
-            if (!class_exists('Symfony\Component\Yaml\Parser')) {
-                throw new \LogicException('Loading translations from the YAML format requires the Symfony Yaml component.');
-            }
-            $this->yamlParser = new YamlParser();
-        }
-
-        $configValues = $this->yamlParser->parse(file_get_contents($resource));
-
-        return $configValues;
-    }
-
-    public function supports($resource, $type = null)
-    {
-        return is_string($resource) && 'yml' === pathinfo(
-            $resource,
-            PATHINFO_EXTENSION
-        );
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/LICENSE b/core/src/core/classes/guzzle/vendor/guzzlehttp/command/LICENSE
deleted file mode 100644
index 581d95f920..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2015 Michael Dowling, https://github.com/mtdowling <mtdowling@gmail.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.
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/composer.json b/core/src/core/classes/guzzle/vendor/guzzlehttp/command/composer.json
deleted file mode 100644
index 214c6c421d..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/composer.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "name": "guzzlehttp/command",
-    "description": "Provides the foundation for building command based web service clients",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Michael Dowling",
-            "email": "mtdowling@gmail.com",
-            "homepage": "https://github.com/mtdowling"
-        }
-    ],
-    "require": {
-        "php": ">=5.4.0",
-        "guzzlehttp/guzzle": "~5.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "GuzzleHttp\\Command\\": "src/"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "0.7-dev"
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/AbstractClient.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/AbstractClient.php
deleted file mode 100644
index e54074afba..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/AbstractClient.php
+++ /dev/null
@@ -1,285 +0,0 @@
-<?php
-namespace GuzzleHttp\Command;
-
-use GuzzleHttp\ClientInterface;
-use GuzzleHttp\Collection;
-use GuzzleHttp\Command\Event\InitEvent;
-use GuzzleHttp\Command\Event\PreparedEvent;
-use GuzzleHttp\Command\Event\ProcessEvent;
-use GuzzleHttp\Command\Exception\CommandException;
-use GuzzleHttp\Event\EndEvent;
-use GuzzleHttp\Event\HasEmitterTrait;
-use GuzzleHttp\Pool;
-use GuzzleHttp\Ring\Future\FutureInterface;
-use GuzzleHttp\Ring\Future\FutureValue;
-use GuzzleHttp\Event\RequestEvents;
-use GuzzleHttp\Message\RequestInterface;
-
-/**
- * Abstract client implementation that provides a basic implementation of
- * several methods. Concrete implementations may choose to extend this class
- * or to completely implement all of the methods of ServiceClientInterface.
- */
-abstract class AbstractClient implements ServiceClientInterface
-{
-    use HasEmitterTrait;
-
-    /** @var ClientInterface HTTP client used to send requests */
-    private $client;
-
-    /** @var Collection Service client configuration data */
-    private $config;
-
-    /**
-     * The default client constructor is responsible for setting private
-     * properties on the client and accepts an associative array of
-     * configuration parameters:
-     *
-     * - defaults: Associative array of default command parameters to add to
-     *   each command created by the client.
-     * - emitter: (internal only) A custom event emitter to use with the client.
-     *
-     * Concrete implementations may choose to support additional configuration
-     * settings as needed.
-     *
-     * @param ClientInterface $client Client used to send HTTP requests
-     * @param array           $config Client configuration options
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function __construct(
-        ClientInterface $client,
-        array $config = []
-    ) {
-        $this->client = $client;
-
-        // Ensure the defaults key is an array so we can easily merge later.
-        if (!isset($config['defaults'])) {
-            $config['defaults'] = [];
-        }
-
-        if (isset($config['emitter'])) {
-            $this->emitter = $config['emitter'];
-            unset($config['emitter']);
-        }
-
-        $this->config = new Collection($config);
-    }
-
-    public function __call($name, array $arguments)
-    {
-        return $this->execute(
-            $this->getCommand(
-                $name,
-                isset($arguments[0]) ? $arguments[0] : []
-            )
-        );
-    }
-
-    public function execute(CommandInterface $command)
-    {
-        $trans = $this->initTransaction($command);
-
-        if ($trans->result !== null) {
-            return $trans->result;
-        }
-
-        try {
-            $trans->response = $this->client->send($trans->request);
-            return $trans->response instanceof FutureInterface
-                ? $this->createFutureResult($trans)
-                : $trans->response;
-        } catch (CommandException $e) {
-            // Command exceptions are thrown in the command layer, so throw 'em.
-            throw $e;
-        } catch (\Exception $e) {
-            // Handle when a command result is set after a terminal request
-            // error was encountered.
-            if ($trans->result !== null) {
-                return $trans->result;
-            }
-            $trans->exception = $e;
-            throw $this->createCommandException($trans);
-        }
-    }
-
-    public function executeAll($commands, array $options = [])
-    {
-        $this->createPool($commands, $options)->wait();
-    }
-
-    public function createPool($commands, array $options = [])
-    {
-        return new Pool(
-            $this->client,
-            new CommandToRequestIterator(
-                function (CommandInterface $command) {
-                    $trans = $this->initTransaction($command);
-                    return [
-                        'request' => $trans->request,
-                        'result'  => $trans->result
-                    ];
-                },
-                $commands,
-                $options
-            ),
-            isset($options['pool_size']) ? ['pool_size' => $options['pool_size']] : []
-        );
-    }
-
-    public function getHttpClient()
-    {
-        return $this->client;
-    }
-
-    public function getConfig($keyOrPath = null)
-    {
-        if ($keyOrPath === null) {
-            return $this->config->toArray();
-        }
-
-        if (strpos($keyOrPath, '/') === false) {
-            return $this->config[$keyOrPath];
-        }
-
-        return $this->config->getPath($keyOrPath);
-    }
-
-    public function setConfig($keyOrPath, $value)
-    {
-        $this->config->setPath($keyOrPath, $value);
-    }
-
-    public function createCommandException(CommandTransaction $transaction)
-    {
-        $cn = 'GuzzleHttp\\Command\\Exception\\CommandException';
-
-        // Don't continuously wrap the same exceptions.
-        if ($transaction->exception instanceof CommandException) {
-            return $transaction->exception;
-        }
-
-        if ($transaction->response) {
-            $statusCode = (string) $transaction->response->getStatusCode();
-            if ($statusCode[0] == '4') {
-                $cn = 'GuzzleHttp\\Command\\Exception\\CommandClientException';
-            } elseif ($statusCode[0] == '5') {
-                $cn = 'GuzzleHttp\\Command\\Exception\\CommandServerException';
-            }
-        }
-
-        return new $cn(
-            "Error executing command: " . $transaction->exception->getMessage(),
-            $transaction,
-            $transaction->exception
-        );
-    }
-
-    /**
-     * Prepares a request for the command.
-     *
-     * @param CommandTransaction $trans Command and context to serialize.
-     *
-     * @return RequestInterface
-     */
-    abstract protected function serializeRequest(CommandTransaction $trans);
-
-    /**
-     * Creates a future result for a given command transaction.
-     *
-     * This method really should beoverridden in subclasses to implement custom
-     * future response results.
-     *
-     * @param CommandTransaction $transaction
-     *
-     * @return FutureInterface
-     */
-    protected function createFutureResult(CommandTransaction $transaction)
-    {
-        return new FutureValue(
-            $transaction->response->then(function () use ($transaction) {
-                return $transaction->result;
-            }),
-            // Wait function derefs the response which populates the result.
-            [$transaction->response, 'wait'],
-            [$transaction->response, 'cancel']
-        );
-    }
-
-    /**
-     * Initialize a transaction for a command and send the prepare event.
-     *
-     * @param CommandInterface $command Command to associate with the trans.
-     *
-     * @return CommandTransaction
-     */
-    protected function initTransaction(CommandInterface $command)
-    {
-        $trans = new CommandTransaction($this, $command);
-        // Throwing in the init event WILL NOT emit an error event.
-        $command->getEmitter()->emit('init', new InitEvent($trans));
-        $trans->request = $this->serializeRequest($trans);
-
-        if ($future = $command->getFuture()) {
-            $trans->request->getConfig()->set('future', $future);
-        }
-
-        $trans->state = 'prepared';
-        $prep = new PreparedEvent($trans);
-
-        try {
-            $command->getEmitter()->emit('prepared', $prep);
-        } catch (\Exception $e) {
-            $trans->exception = $e;
-            $trans->exception = $this->createCommandException($trans);
-        }
-
-        // If the command failed in the prepare event or was intercepted, then
-        // emit the process event now and skip hooking up the request.
-        if ($trans->exception || $prep->isPropagationStopped()) {
-            $this->emitProcess($trans);
-            return $trans;
-        }
-
-        $trans->state = 'executing';
-
-        // When a request completes, process the request at the command
-        // layer.
-        $trans->request->getEmitter()->on(
-            'end',
-            function (EndEvent $e) use ($trans) {
-                $trans->response = $e->getResponse();
-                if ($trans->exception = $e->getException()) {
-                    $trans->exception = $this->createCommandException($trans);
-                }
-                $this->emitProcess($trans);
-            }, RequestEvents::LATE
-        );
-
-        return $trans;
-    }
-
-    /**
-     * Finishes the process event for the command.
-     */
-    private function emitProcess(CommandTransaction $trans)
-    {
-        $trans->state = 'process';
-
-        try {
-            // Emit the final "process" event for the command.
-            $trans->command->getEmitter()->emit('process', new ProcessEvent($trans));
-        } catch (\Exception $ex) {
-            // Override any previous exception with the most recent exception.
-            $trans->exception = $ex;
-            $trans->exception = $this->createCommandException($trans);
-        }
-
-        $trans->state = 'end';
-
-        // If the transaction still has the exception, then throw it.
-        if ($trans->exception) {
-            throw $trans->exception;
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Command.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Command.php
deleted file mode 100644
index 10c2871d28..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Command.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-namespace GuzzleHttp\Command;
-
-use GuzzleHttp\HasDataTrait;
-use GuzzleHttp\Event\HasEmitterTrait;
-
-/**
- * Default command implementation.
- */
-class Command implements CommandInterface
-{
-    use HasDataTrait, HasEmitterTrait;
-
-    /** @var string */
-    private $name;
-
-    /** @var bool */
-    private $future = false;
-
-    /**
-     * @param string $name    Name of the command
-     * @param array  $args    Arguments to pass to the command
-     * @param array  $options Array of command options.
-     *                        - emitter: Event emitter to use.
-     *                        - future: Set to true to create a future async
-     *                          command.
-     */
-    public function __construct(
-        $name,
-        array $args = [],
-        array $options = []
-    ) {
-        $this->name = $name;
-        $this->data = $args;
-
-        if (isset($options['emitter'])) {
-            $this->emitter = $options['emitter'];
-        }
-
-        if (isset($options['future'])) {
-            $this->future = $options['future'];
-        }
-    }
-
-    /**
-     * Ensure that the emitter is cloned.
-     */
-    public function __clone()
-    {
-        if ($this->emitter) {
-            $this->emitter = clone $this->emitter;
-        }
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function hasParam($name)
-    {
-        return array_key_exists($name, $this->data);
-    }
-
-    public function setFuture($useFuture)
-    {
-        $this->future = $useFuture;
-    }
-
-    public function getFuture()
-    {
-        return $this->future;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/CommandInterface.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/CommandInterface.php
deleted file mode 100644
index b949d1460b..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/CommandInterface.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-namespace GuzzleHttp\Command;
-
-use GuzzleHttp\Event\HasEmitterInterface;
-use GuzzleHttp\ToArrayInterface;
-
-/**
- * A command object encapsulates the input parameters used to control the
- * creation of a HTTP request and processing of a HTTP response.
- *
- * Using the toArray() method will return the input parameters of the command
- * as an associative array.
- *
- * A command emits the following events:
- * - prepare: Emitted when the command is converting a command into a request
- * - process: Emitted when the command is processing a response
- * - error:   Emitted after an error occurs for a command.
- */
-interface CommandInterface extends
-    \ArrayAccess,
-    ToArrayInterface,
-    HasEmitterInterface
-{
-    /**
-     * Get the name of the command
-     *
-     * @return string
-     */
-    public function getName();
-
-    /**
-     * Check if the command has a parameter by name.
-     *
-     * @param string $name Name of the parameter to check
-     *
-     * @return bool
-     */
-    public function hasParam($name);
-
-    /**
-     * Specify whether or not the command will return a future result if the
-     * underlying adapter supports it.
-     *
-     * @param bool|string $useFuture Set to true or false or a future string.
-     */
-    public function setFuture($useFuture);
-
-    /**
-     * Gets the future setting of the command.
-     *
-     * @return bool|string
-     */
-    public function getFuture();
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/CommandToRequestIterator.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/CommandToRequestIterator.php
deleted file mode 100644
index 66fa01d903..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/CommandToRequestIterator.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-namespace GuzzleHttp\Command;
-
-use GuzzleHttp\Command\Event\ProcessEvent;
-use GuzzleHttp\Event\RequestEvents;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Event\ListenerAttacherTrait;
-use GuzzleHttp\Ring\Core;
-
-/**
- * Iterator used for easily creating request objects from an iterator or array
- * that contains commands.
- *
- * This iterator is useful when implementing the
- * {@see ServiceClientInterface::executeAll()} method.
- */
-class CommandToRequestIterator implements \Iterator
-{
-    use ListenerAttacherTrait;
-
-    /** @var \Iterator */
-    private $commands;
-
-    /** @var callable request builder function */
-    private $requestBuilder;
-
-    /** @var RequestInterface|null Current request */
-    private $currentRequest;
-
-    /** @var array Listeners to attach to each command */
-    private $eventListeners = [];
-
-    /**
-     * @param callable $requestBuilder A function that accepts a command and
-     *       returns a hash containing a request key mapping to a request that
-     *       has emitted it's prepare event, and a result key mapping to the
-     *       result if one was injected in the prepare event.
-     * @param array|\Iterator        $commands Collection of command objects
-     * @param array                  $options  Hash of options:
-     *     - prepare: Callable to invoke for the "prepare" event. This event is
-     *       called only once per execution.
-     *     - before: Callable to invoke when the "process" event is fired. This
-     *       event is fired one or more times.
-     *     - process: Callable to invoke when the "process" event is fired. This
-     *       event can be fired one or more times.
-     *     - error: Callable to invoke when the "error" event of a command is
-     *       emitted. This event can be fired one or more times.
-     *     - end: Callable to invoke when the terminal "end" event of a command
-     *       is emitted. This event is fired once per command execution.
-     *
-     * @throws \InvalidArgumentException If the source is invalid
-     */
-    public function __construct(
-        callable $requestBuilder,
-        $commands,
-        array $options = []
-    ) {
-        $this->requestBuilder = $requestBuilder;
-        $this->eventListeners = $this->prepareListeners(
-            $options,
-            ['init', 'prepared', 'process']
-        );
-
-        if ($commands instanceof \Iterator) {
-            $this->commands = $commands;
-        } elseif (is_array($commands)) {
-            $this->commands = new \ArrayIterator($commands);
-        } else {
-            throw new \InvalidArgumentException('Command iterators must be '
-                . 'created using an \\Iterator or array or commands');
-        }
-    }
-
-    public function current()
-    {
-        return $this->currentRequest;
-    }
-
-    public function next()
-    {
-        $this->currentRequest = null;
-        $this->commands->next();
-    }
-
-    public function key()
-    {
-        return $this->commands->key();
-    }
-
-    public function valid()
-    {
-        get_next:
-
-        // Return true if this function has already been called for iteration.
-        if ($this->currentRequest) {
-            return true;
-        }
-
-        // Return false if we are at the end of the provided commands iterator.
-        if (!$this->commands->valid()) {
-            return false;
-        }
-
-        $command = $this->commands->current();
-
-        if (!($command instanceof CommandInterface)) {
-            throw new \RuntimeException('All commands provided to the ' . __CLASS__
-                . ' must implement GuzzleHttp\\Command\\CommandInterface.'
-                . ' Encountered a ' . Core::describeType($command) . ' value.');
-        }
-
-        $command->setFuture('lazy');
-        $this->attachListeners($command, $this->eventListeners);
-
-        // Prevent transfer exceptions from throwing.
-        $command->getEmitter()->on(
-            'process',
-            function (ProcessEvent $e) {
-                if ($e->getException()) {
-                    $e->setResult(null);
-                }
-            },
-            RequestEvents::LATE
-        );
-
-        $builder = $this->requestBuilder;
-        $result = $builder($command);
-
-        // Skip commands that were intercepted with a result.
-        if (isset($result['result'])) {
-            $this->commands->next();
-            goto get_next;
-        }
-
-        $this->currentRequest = $result['request'];
-
-        return true;
-    }
-
-    public function rewind()
-    {
-        $this->currentRequest = null;
-
-        if (!($this->commands instanceof \Generator)) {
-            $this->commands->rewind();
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/CommandTransaction.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/CommandTransaction.php
deleted file mode 100644
index 4e5487d481..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/CommandTransaction.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-namespace GuzzleHttp\Command;
-
-use GuzzleHttp\Collection;
-use GuzzleHttp\Command\Exception\CommandException;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Message\ResponseInterface;
-use GuzzleHttp\ClientInterface;
-
-/**
- * Represents a command transaction as it is sent over the wire and inspected
- * by event listeners.
- */
-class CommandTransaction
-{
-    /**
-     * Web service client used in the transaction
-     *
-     * @var ServiceClientInterface
-     */
-    public $serviceClient;
-
-    /**
-     * The command being executed.
-     *
-     * @var CommandInterface
-     */
-    public $command;
-
-    /**
-     * The result of the command (if available)
-     *
-     * @var mixed|null
-     */
-    public $result;
-
-    /**
-     * The exception that was received while transferring (if any).
-     *
-     * @var CommandException
-     */
-    public $exception;
-
-    /**
-     * Contains contextual information about the transaction.
-     *
-     * The information added to this collection can be anything required to
-     * implement a command abstraction.
-     *
-     * @var Collection
-     */
-    public $context;
-
-    /**
-     * HTTP client used to transfer the request.
-     *
-     * @var ClientInterface
-     */
-    public $client;
-
-    /**
-     * The request that is being sent.
-     *
-     * @var RequestInterface
-     */
-    public $request;
-
-    /**
-     * The response associated with the transaction. A response will not be
-     * present when a networking error occurs or an error occurs before sending
-     * the request.
-     *
-     * @var ResponseInterface|null
-     */
-    public $response;
-
-    /**
-     * The transaction's state.
-     *
-     * @var string
-     */
-    public $state;
-
-    /**
-     * @param ServiceClientInterface $client  Client that executes commands.
-     * @param CommandInterface       $command Command being executed.
-     * @param array                  $context Command context array of data.
-     */
-    public function __construct(
-        ServiceClientInterface $client,
-        CommandInterface $command,
-        array $context = []
-    ) {
-        $this->serviceClient = $client;
-        $this->client = $client->getHttpClient();
-        $this->command = $command;
-        $this->context = new Collection($context);
-        $this->state = 'init';
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/CommandUtils.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/CommandUtils.php
deleted file mode 100644
index 69b2750736..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/CommandUtils.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-namespace GuzzleHttp\Command;
-
-use GuzzleHttp\Event\RequestEvents;
-use GuzzleHttp\Command\Event\ProcessEvent;
-use GuzzleHttp\BatchResults;
-
-/**
- * Provides useful functions for interacting with web service clients.
- */
-class CommandUtils
-{
-    /**
-     * Sends multiple commands concurrently and returns a hash map of commands
-     * mapped to their corresponding result or exception.
-     *
-     * Note: This method keeps every command and command and result in memory,
-     * and as such is NOT recommended when sending a large number or an
-     * indeterminable number of commands concurrently. Instead, you should use
-     * executeAll() and utilize the event system to work with results.
-     *
-     * @param ServiceClientInterface $client
-     * @param array|\Iterator        $commands Commands to send.
-     * @param array                  $options  Passes through the options available
-     *                                         in {@see ServiceClientInterface::createPool()}
-     *
-     * @return BatchResults
-     * @throws \InvalidArgumentException if the event format is incorrect.
-     */
-    public static function batch(
-        ServiceClientInterface $client,
-        $commands,
-        array $options = []
-    ) {
-        $hash = new \SplObjectStorage();
-        foreach ($commands as $command) {
-            $hash->attach($command);
-        }
-
-        $client->executeAll($commands, RequestEvents::convertEventArray(
-            $options,
-            ['process'],
-            [
-                'priority' => RequestEvents::LATE,
-                'fn'       => function (ProcessEvent $e) use ($hash) {
-                    if ($e->getException()) {
-                        $hash[$e->getCommand()] = $e->getException();
-                    } else {
-                        $hash[$e->getCommand()] = $e->getResult();
-                    }
-                }
-            ]
-        ));
-
-        return new BatchResults($hash);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Event/CommandEvent.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Event/CommandEvent.php
deleted file mode 100644
index 7b5d00745b..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Event/CommandEvent.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Event;
-
-use GuzzleHttp\Event\AbstractEvent;
-use GuzzleHttp\Command\CommandInterface;
-use GuzzleHttp\Command\ServiceClientInterface;
-use GuzzleHttp\Command\CommandTransaction;
-use GuzzleHttp\Collection;
-
-/**
- * Base command event that is emitted.
- */
-class CommandEvent extends AbstractEvent
-{
-    /** @var CommandTransaction */
-    protected $trans;
-
-    /**
-     * @param CommandTransaction $trans Command transaction
-     */
-    public function __construct(CommandTransaction $trans)
-    {
-        $this->trans = $trans;
-    }
-
-    /**
-     * Get the command associated with the event
-     *
-     * @return CommandInterface
-     */
-    public function getCommand()
-    {
-        return $this->trans->command;
-    }
-
-    /**
-     * Get the service client associated with the command transfer.
-     *
-     * @return ServiceClientInterface
-     */
-    public function getClient()
-    {
-        return $this->trans->serviceClient;
-    }
-
-    /**
-     * Get context associated with the command transfer.
-     *
-     * The return value is a Guzzle collection object which can be accessed and
-     * mutated like a PHP associative array. You can add arbitrary data to the
-     * context for application specific purposes.
-     *
-     * @return Collection
-     */
-    public function getContext()
-    {
-        return $this->trans->context;
-    }
-
-    /**
-     * Gets the transaction associated with the event
-     *
-     * @return CommandTransaction
-     */
-    public function getTransaction()
-    {
-        return $this->trans;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Event/InitEvent.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Event/InitEvent.php
deleted file mode 100644
index 83276c2158..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Event/InitEvent.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Event;
-
-/**
- * Event fired when a command is initializing before a request is serialized.
- *
- * This event is useful for adding default parameters and command validation.
- */
-class InitEvent extends CommandEvent {}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Event/PreparedEvent.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Event/PreparedEvent.php
deleted file mode 100644
index d67cecbe4e..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Event/PreparedEvent.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Event;
-
-use GuzzleHttp\Command\CommandTransaction;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Exception\StateException;
-
-/**
- * Event emitted when a command is being prepared.
- *
- * Event listeners can use this event to modify the request that was created
- * by the client, and to intercept the event to prevent HTTP requests from
- * being sent over the wire.
- *
- * This event provides a good way for a listener to hook into the HTTP level
- * event system.
- */
-class PreparedEvent extends CommandEvent
-{
-    /**
-     * @param CommandTransaction $trans Command transaction
-     * @throws StateException
-     */
-    public function __construct(CommandTransaction $trans)
-    {
-        if (!$trans->request) {
-            throw new StateException('No request on the command transaction');
-        }
-
-        $this->trans = $trans;
-    }
-
-    /**
-     * Gets the HTTP request that will be sent for the command.
-     *
-     * @return RequestInterface
-     */
-    public function getRequest()
-    {
-        return $this->trans->request;
-    }
-
-    /**
-     * Set a result on the command transaction to prevent the command from
-     * actually sending an HTTP request.
-     *
-     * Subsequent listeners ARE NOT emitted even when a result is set in the
-     * prepare event.
-     *
-     * @param mixed $result Result to associate with the command
-     */
-    public function intercept($result)
-    {
-        $this->trans->exception = null;
-        $this->trans->result = $result;
-        $this->stopPropagation();
-    }
-
-    /**
-     * Returns the result of the command (if one is available).
-     *
-     * @return mixed|null
-     */
-    public function getResult()
-    {
-        return $this->trans->result;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Event/ProcessEvent.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Event/ProcessEvent.php
deleted file mode 100644
index 4b4f1bd3c5..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Event/ProcessEvent.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Event;
-
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Message\ResponseInterface;
-
-/**
- * Event emitted when the command has finished executing the underlying
- * request. This event is emitted to process the the result of a command.
- *
- * This event is emitted when there is an exception or when the underlying
- * request succeeded. You'll need to account for both cases when listening
- * to the process event.
- */
-class ProcessEvent extends CommandEvent
-{
-    /**
-     * Returns an exception if one was encountered.
-     *
-     * @return \Exception|null
-     */
-    public function getException()
-    {
-        return $this->trans->exception;
-    }
-
-    /**
-     * Gets the HTTP request that was sent.
-     *
-     * @return RequestInterface
-     */
-    public function getRequest()
-    {
-        return $this->trans->request;
-    }
-
-    /**
-     * Get the response that was received for the request if one was received.
-     *
-     * It is important to remember that a response will not be available if the
-     * HTTP request failed with a networking error.
-     *
-     * @return ResponseInterface|null
-     */
-    public function getResponse()
-    {
-        return $this->trans->response;
-    }
-
-    /**
-     * Set the processed result on the event.
-     *
-     * Subsequent listeners ARE STILL emitted even when a result is set.
-     * Calling this method will remove any exceptions associated with the
-     * command.
-     *
-     * @param mixed $result Result to associate with the command
-     */
-    public function setResult($result)
-    {
-        $this->trans->exception = null;
-        $this->trans->result = $result;
-    }
-
-    /**
-     * Returns the result of the command (if one is available).
-     *
-     * @return mixed|null
-     */
-    public function getResult()
-    {
-        return $this->trans->result;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Exception/CommandClientException.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Exception/CommandClientException.php
deleted file mode 100644
index f5d555b41c..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Exception/CommandClientException.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Exception;
-
-/**
- * Exception encountered when a 4xx level response is received for a request
- */
-class CommandClientException extends CommandException {}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Exception/CommandException.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Exception/CommandException.php
deleted file mode 100644
index 319299b662..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Exception/CommandException.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Exception;
-
-use GuzzleHttp\Command\CommandTransaction;
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Command\ServiceClientInterface;
-use GuzzleHttp\Command\CommandInterface;
-use GuzzleHttp\Collection;
-use GuzzleHttp\Message\Request;
-
-/**
- * Exception encountered while transferring a command.
- */
-class CommandException extends RequestException
-{
-    /** @var CommandTransaction */
-    private $trans;
-
-    /**
-     * @param string             $message  Exception message
-     * @param CommandTransaction $trans    Contextual transfer information
-     * @param \Exception         $previous Previous exception (if any)
-     */
-    public function __construct(
-        $message,
-        CommandTransaction $trans,
-        \Exception $previous = null
-    ) {
-        $this->trans = $trans;
-        $request = $trans->request ?: new Request(null, null);
-        $response = $trans->response;
-        parent::__construct($message, $request, $response, $previous);
-    }
-
-    /**
-     * Gets the service client associated with the failed command.
-     *
-     * @return ServiceClientInterface
-     */
-    public function getClient()
-    {
-        return $this->trans->serviceClient;
-    }
-
-    /**
-     * Gets the command that failed.
-     *
-     * @return CommandInterface
-     */
-    public function getCommand()
-    {
-        return $this->trans->command;
-    }
-
-    /**
-     * Gets the result of the command if a result was set.
-     *
-     * @return mixed
-     */
-    public function getResult()
-    {
-        return $this->trans->result;
-    }
-
-    /**
-     * Gets the context of the command as a collection.
-     *
-     * @return Collection
-     */
-    public function getContext()
-    {
-        return $this->trans->context;
-    }
-
-    /**
-     * Gets the transaction associated with the exception.
-     *
-     * @return CommandTransaction
-     */
-    public function getTransaction()
-    {
-        return $this->trans;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Exception/CommandServerException.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Exception/CommandServerException.php
deleted file mode 100644
index 22356b526a..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Exception/CommandServerException.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Exception;
-
-/**
- * Exception encountered when a 5xx level response is received for a request
- */
-class CommandServerException extends CommandException {}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/ServiceClientInterface.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/ServiceClientInterface.php
deleted file mode 100644
index 7e5b48cfa9..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/ServiceClientInterface.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-namespace GuzzleHttp\Command;
-
-use GuzzleHttp\Event\HasEmitterInterface;
-use GuzzleHttp\ClientInterface;
-use GuzzleHttp\Ring\FutureInterface;
-
-/**
- * Web service client interface.
- *
- * Any event listener or subscriber added to the client is added to each
- * command created by the client when the command is created.
- */
-interface ServiceClientInterface extends HasEmitterInterface
-{
-    /**
-     * Creates and executes a command for an operation by name.
-     *
-     * @param string $name      Name of the command to execute.
-     * @param array  $arguments Arguments to pass to the getCommand method.
-     *
-     * @throws \Exception
-     * @see \GuzzleHttp\Command\ServiceClientInterface::getCommand
-     */
-    public function __call($name, array $arguments);
-
-    /**
-     * Create a command for an operation name.
-     *
-     * Special keys may be set on the command to control how it behaves.
-     * Implementations SHOULD be able to utilize the following keys or throw
-     * an exception if unable.
-     *
-     * - @future: Set to true to create a future if possible. When processed,
-     *   the "@future" key value pair can be removed from the input data before
-     *   serializing the command.
-     *
-     * @param string $name   Name of the operation to use in the command
-     * @param array  $args   Arguments to pass to the command
-     *
-     * @return CommandInterface
-     * @throws \InvalidArgumentException if no command can be found by name
-     */
-    public function getCommand($name, array $args = []);
-
-    /**
-     * Execute a single command.
-     *
-     * @param CommandInterface $command Command to execute
-     *
-     * @return mixed Returns the result of the executed command
-     * @throws \Exception
-     */
-    public function execute(CommandInterface $command);
-
-    /**
-     * Executes many commands concurrently using a fixed pool size.
-     *
-     * Exceptions encountered while executing the commands will not be thrown.
-     * Instead, callers are expected to handle errors using the event system.
-     *
-     *     $commands = [$client->getCommand('foo', ['baz' => 'bar'])];
-     *     $client->executeAll($commands);
-     *
-     * @param array|\Iterator $commands Array or iterator that contains
-     *     CommandInterface objects to execute.
-     * @param array $options Associative array of options to apply.
-     * @see GuzzleHttp\Command\ServiceClientInterface::createCommandPool for
-     *      a list of options.
-     */
-    public function executeAll($commands, array $options = []);
-
-    /**
-     * Creates a future object that, when dereferenced, sends commands in
-     * parallel using a fixed pool size.
-     *
-     * Exceptions encountered while executing the commands will not be thrown.
-     * Instead, callers are expected to handle errors using the event system.
-     *
-     * @param array|\Iterator $commands Array or iterator that contains
-     *     CommandInterface objects to execute with the client.
-     * @param array $options Associative array of options to apply.
-     *     - pool_size: (int) Max number of commands to send concurrently.
-     *       When this number of concurrent requests are created, the sendAll
-     *       function blocks until all of the futures have completed.
-     *     - init: (callable) Receives an InitEvent from each command.
-     *     - prepare: (callable) Receives a PrepareEvent from each command.
-     *     - process: (callable) Receives a ProcessEvent from each command.
-     *
-     * @return FutureInterface
-     */
-    public function createPool($commands, array $options = []);
-
-    /**
-     * Get the HTTP client used to send requests for the web service client
-     *
-     * @return ClientInterface
-     */
-    public function getHttpClient();
-
-    /**
-     * Get a client configuration value.
-     *
-     * @param string|int|null $keyOrPath The Path to a particular configuration
-     *     value. The syntax uses a path notation that allows you to retrieve
-     *     nested array values without throwing warnings.
-     *
-     * @return mixed
-     */
-    public function getConfig($keyOrPath = null);
-
-    /**
-     * Set a client configuration value at the specified configuration path.
-     *
-     * @param string|int $keyOrPath Path at which to change a configuration
-     *     value. This path syntax follows the same path syntax specified in
-     *     {@see getConfig}.
-     *
-     * @param mixed $value Value to set
-     */
-    public function setConfig($keyOrPath, $value);
-
-    /**
-     * Create an exception for a command based on a previous exception.
-     *
-     * This method is invoked when an exception occurs while executing a
-     * command. You may choose to use a custom exception class for exceptions
-     * or return the provided exception as-is.
-     *
-     * @param CommandTransaction $transaction Command transaction context
-     *
-     * @return \Exception
-     */
-    public function createCommandException(CommandTransaction $transaction);
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Subscriber/Debug.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Subscriber/Debug.php
deleted file mode 100644
index f93392fe2b..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Subscriber/Debug.php
+++ /dev/null
@@ -1,427 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Subscriber;
-
-use GuzzleHttp\Command\CommandInterface;
-use GuzzleHttp\Command\Event\InitEvent;
-use GuzzleHttp\Command\Event\PreparedEvent;
-use GuzzleHttp\Command\Event\ProcessEvent;
-use GuzzleHttp\Command\ServiceClientInterface;
-use GuzzleHttp\Event\EventInterface;
-use GuzzleHttp\Event\RequestEvents;
-use GuzzleHttp\Event\SubscriberInterface;
-use GuzzleHttp\Message\AbstractMessage;
-use GuzzleHttp\Message\MessageInterface;
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Stream\StreamInterface;
-use GuzzleHttp\ToArrayInterface;
-
-/**
- * Provides debug information about operations, including HTTP wire traces.
- *
- * This subscriber is useful for debugging the command and request event
- * system and seeing what data was sent and received over the wire.
- */
-class Debug implements SubscriberInterface
-{
-    /** @var \GuzzleHttp\Stream\StreamInterface */
-    private $output;
-    private $http;
-    private $maxStreamSize;
-    private $states;
-    private $adapterDebug;
-
-    /**
-     * The constructor accepts a hash of debug options.
-     *
-     * - output: Where debug data is written (fopen or StreamInterface)
-     * - http: Set to false to not display debug HTTP event data
-     * - max_stream_size: Set to an integer to override the default maximum
-     *   stream size of 10240 bytes (or 10 KB). This value determines whether
-     *   or not stream data is written to the output stream based on the size
-     *   of the stream.
-     * - adapter_debug: Set to false to disable turning on the debug adapter
-     *   setting.
-     *
-     * @param array $options Hash of debug options
-     */
-    public function __construct(array $options = [])
-    {
-        $this->states = new \SplObjectStorage();
-        $this->output = isset($options['output'])
-            ? $options['output']
-            : fopen('php://output', 'w');
-        $this->output = Stream::factory($this->output);
-        $this->http = isset($options['http']) ? $options['http'] : true;
-        $this->adapterDebug = isset($options['adapter_debug'])
-            ? $options['adapter_debug']
-            : true;
-        $this->maxStreamSize = isset($options['max_stream_size'])
-            ? $options['max_stream_size']
-            : 10240;
-    }
-
-    public function getEvents()
-    {
-        return [
-            'init' => [
-                ['beforeInit', 'first'],
-                ['afterInit', 'last']
-            ],
-            'prepared' => [
-                ['beforePrepared', 'first'],
-                ['afterPrepared', 'last']
-            ],
-            'process' => [
-                ['beforeProcess', 'first'],
-                ['afterProcess', 'last']
-            ]
-        ];
-    }
-
-    private function write($text)
-    {
-        $this->output->write(date('c') . ': ' . $text . PHP_EOL);
-    }
-
-    private function hashCommand(
-        ServiceClientInterface $client,
-        CommandInterface $command,
-        EventInterface $event
-    ) {
-        return get_class($client) . '::' . $command->getName()
-            . ' (' . spl_object_hash($event) . ')';
-    }
-
-    private function startEvent(
-        $name,
-        $hash,
-        $command,
-        $request = null,
-        $response = null,
-        $result = null,
-        $error = null
-    ) {
-        $last = isset($this->states[$command])
-            ? $this->states[$command]
-            : null;
-        $this->states[$command] = $this->eventState(func_get_args());
-        $this->write(sprintf(
-            "Starting the %s event for %s: %s",
-            $name,
-            $hash,
-            $this->diffStates($last, $this->states[$command])
-        ));
-    }
-
-    private function endEvent(
-        $name,
-        $hash,
-        $command,
-        $request = null,
-        $response = null,
-        $result = null,
-        $error = null
-    ) {
-        if (!isset($this->states[$command])) {
-            throw new \RuntimeException('Matching start event not found');
-        }
-
-        $last = $this->states[$command];
-        $this->states[$command] = $this->eventState(func_get_args());
-        $this->write(sprintf(
-            "Done with the %s event for %s (took %f seconds): %s",
-            $name,
-            $hash,
-            microtime(true) - $last['time'],
-            $this->diffStates($last, $this->states[$command])
-        ));
-    }
-
-    public function beforeInit(InitEvent $e)
-    {
-        $this->proxyEvent('command:init', $e);
-    }
-
-    public function afterInit(InitEvent $e)
-    {
-        $this->proxyEvent('command:init', $e);
-    }
-
-    public function beforePrepared(PreparedEvent $e)
-    {
-        $this->proxyEvent('command:prepared', $e);
-    }
-
-    public function afterPrepared(PreparedEvent $e)
-    {
-        $this->proxyEvent('command:prepared', $e);
-        $request = $e->getRequest();
-
-        if (!$this->http || !$request) {
-            return;
-        }
-
-        if ($this->adapterDebug) {
-            $request->getConfig()->set('debug', true);
-        }
-
-        // Attach listeners to request events
-        $before = function ($before) use ($e) {
-            $this->proxyReqEvent('startEvent', $e, $before);
-        };
-
-        $after = function ($after) use ($e) {
-            $this->proxyReqEvent('endEvent', $e, $after);
-        };
-
-        foreach (['before', 'complete', 'error', 'end'] as $event) {
-            $request->getEmitter()->on($event, $before, RequestEvents::EARLY);
-            $request->getEmitter()->on($event, $after, RequestEvents::LATE);
-        }
-    }
-
-    public function beforeProcess(ProcessEvent $e)
-    {
-        $this->proxyEvent('command:process', $e);
-    }
-
-    public function afterProcess(ProcessEvent $e)
-    {
-        $this->proxyEvent('command:process', $e);
-    }
-
-    /**
-     * Proxies the appropriate call to start or end event
-     *
-     * @param string         $name Name of the event
-     * @param EventInterface $e    Event to proxy
-     */
-    public function proxyEvent($name, EventInterface $e)
-    {
-        $meth = substr(debug_backtrace()[1]['function'], 0, 6) == 'before'
-            ? 'startEvent'
-            : 'endEvent';
-
-        call_user_func_array(
-            [$this, $meth],
-            [
-                $name,
-                $this->hashCommand($e->getClient(), $e->getCommand(), $e),
-                $e->getCommand(),
-                method_exists($e, 'getRequest') ? $e->getRequest() : null,
-                method_exists($e, 'getResponse') ? $e->getResponse() : null,
-                method_exists($e, 'getResult') ? $e->getResult() : null,
-                method_exists($e, 'getException') ? $e->getException() : null
-            ]
-        );
-    }
-
-    /**
-     * Proxies a call to start or end event based on a request event.
-     *
-     * @param string         $meth startEvent or endEvent
-     * @param EventInterface $cev  Command event
-     * @param EventInterface $rev  Request event
-     */
-    private function proxyReqEvent(
-        $meth,
-        EventInterface $cev,
-        EventInterface $rev
-    ) {
-        call_user_func(
-            [$this, $meth],
-            $this->getEventName($rev),
-            $this->hashCommand($cev->getClient(), $cev->getCommand(), $rev),
-            $cev->getCommand(),
-            $rev->getRequest(),
-            method_exists($rev, 'getResponse') ? $rev->getResponse() : null,
-            method_exists($cev, 'getResult') ? $cev->getResult() : null,
-            method_exists($cev, 'getError') ? $cev->getError() : null
-        );
-    }
-
-    /**
-     * Gets the state of an event as a hash.
-     *
-     * @param array $args Ordered array of arguments passed to an event fn
-     *
-     * @return array
-     */
-    private function eventState($args)
-    {
-        return [
-            'time'     => microtime(true),
-            'command'  => $this->toArrayState($args[2]),
-            'request'  => $this->messageState($args[3]),
-            'response' => $this->messageState($args[4]),
-            'result'   => $this->resultState($args[5]),
-            'error'    => $this->errorState($args[6])
-        ];
-    }
-
-    /**
-     * Calculates the event name of a request event.
-     *
-     * @param EventInterface $event
-     *
-     * @return string
-     */
-    private function getEventName(EventInterface $event)
-    {
-        $cl = get_class($event);
-        $name = strtolower(substr($cl, strrpos($cl, '\\') + 1));
-        return 'request:' . substr($name, 0, -5);
-    }
-
-    /**
-     * Gets the state of a stream as a hash or null.
-     *
-     * If the size of the stream is below the max threshold and the stream is
-     * seekable, then the contents of the stream is included in the hash.
-     *
-     * @param StreamInterface $stream
-     *
-     * @return array|null
-     */
-    private function streamState(StreamInterface $stream = null)
-    {
-        if (!$stream) {
-            return null;
-        }
-
-        $result = [
-            'class' => get_class($stream),
-            'size'  => $stream->getSize(),
-            'tell'  => $stream->tell()
-        ];
-
-        if ($stream->getSize() < $this->maxStreamSize &&
-            $stream->isSeekable()
-        ) {
-            $pos = $stream->tell();
-            $result['contents'] = (string) $stream;
-            $stream->seek($pos);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Gets the state of a message as a hash.
-     *
-     * @param MessageInterface $msg
-     *
-     * @return array|null
-     */
-    private function messageState(MessageInterface $msg = null)
-    {
-        return !$msg ? null : [
-            'start-line' => AbstractMessage::getStartLine($msg),
-            'headers'    => AbstractMessage::getHeadersAsString($msg),
-            'body'       => $this->streamState($msg->getBody())
-        ];
-    }
-
-    /**
-     * Converts a ToArrayInterface object into a hash with streams mapped as
-     * needed to hash states.
-     *
-     * @param ToArrayInterface $data
-     *
-     * @return array
-     */
-    private function toArrayState(ToArrayInterface $data)
-    {
-        $params = $data->toArray();
-        array_walk_recursive($params, function (&$value) {
-            if ($value instanceof StreamInterface) {
-                $value = $this->streamState($value);
-            }
-        });
-
-        $result = [
-            'id'    => spl_object_hash($data),
-            'class' => get_class($data),
-            'keys'  => $params
-        ];
-
-        if ($data instanceof CommandInterface) {
-            $result['name'] = $data->getName();
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns the most appropriate JSON encodable value for a result state.
-     *
-     * @param null $result
-     *
-     * @return array|null|string
-     */
-    private function resultState($result = null)
-    {
-        if ($result === null) {
-            return null;
-        } elseif ($result instanceof ToArrayInterface) {
-            return $this->toArrayState($result);
-        } elseif ($result instanceof StreamInterface) {
-            return $this->streamState($result);
-        } else {
-            return json_encode($result);
-        }
-    }
-
-    /**
-     * Returns the state of an exception as a hash or null.
-     *
-     * @param \Exception $e
-     *
-     * @return array|null
-     */
-    private function errorState(\Exception $e = null)
-    {
-        return !$e ? null : [
-            'class'   => get_class($e),
-            'message' => $e->getMessage(),
-            'line'    => $e->getLine(),
-            'file'    => $e->getFile(),
-            'code'    => $e->getCode()
-        ];
-    }
-
-    /**
-     * Provides a diff between two states as a string
-     */
-    private function diffStates($a, $b)
-    {
-        if (!$a) {
-            return 'State was changed to ' . print_r($b, true);
-        }
-
-        unset($a['time'], $b['time']);
-        $diff = $this->diff($a, $b);
-
-        return $diff ? print_r($diff, true) : 'No change';
-    }
-
-    private function diff($a, $b) {
-
-        $result = [];
-
-        // Check differences in previous keys
-        foreach ($a as $k => $v) {
-            if (!array_key_exists($k, $b)) {
-                $result[$k . ' was removed, previously'] = $v;
-            } elseif (is_array($v)) {
-                if ($diff = $this->diff($v, $b[$k])) {
-                    $result[$k . ' has a change'] = $diff;
-                }
-            } elseif ($v !== $b[$k]) {
-                $result[$k . ' was changed'] = $b[$k];
-            }
-        }
-
-        return $result;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Subscriber/ResultMock.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Subscriber/ResultMock.php
deleted file mode 100644
index 1f25e9c18f..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/command/src/Subscriber/ResultMock.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Subscriber;
-
-use GuzzleHttp\Command\Event\PreparedEvent;
-use GuzzleHttp\Event\SubscriberInterface;
-
-/**
- * Queues mock results and/or exceptions and delivers them in a FIFO order.
- */
-class ResultMock implements SubscriberInterface, \Countable
-{
-    /** @var array Array of mock results and exceptions */
-    private $queue = [];
-
-    /**
-     * @param array $results Array of results and exceptions to queue
-     */
-    public function __construct(array $results = [])
-    {
-        $this->addMultiple($results);
-    }
-
-    public function getEvents()
-    {
-        return ['prepare' => ['onPrepared', 'last']];
-    }
-
-    /**
-     * @throws \Exception if one has been queued.
-     * @throws \OutOfBoundsException if the queue is empty.
-     */
-    public function onPrepared(PreparedEvent $event)
-    {
-        if (!$result = array_shift($this->queue)) {
-            throw new \OutOfBoundsException('Result mock queue is empty');
-        } elseif ($result instanceof \Exception) {
-            throw $result;
-        } else {
-            $event->intercept($result);
-        }
-    }
-
-    public function count()
-    {
-        return count($this->queue);
-    }
-
-    /**
-     * Add a result to the end of the queue.
-     *
-     * @param mixed $result The result of the command.
-     *
-     * @return self
-     */
-    public function addResult($result)
-    {
-        $this->queue[] = $result;
-
-        return $this;
-    }
-
-    /**
-     * Add an exception to the end of the queue.
-     *
-     * @param \Exception $exception Thrown when executing.
-     *
-     * @return self
-     */
-    public function addException(\Exception $exception)
-    {
-        $this->queue[] = $exception;
-
-        return $this;
-    }
-
-    /**
-     * Add multiple results/exceptions to the queue
-     *
-     * @param array $results Results to add
-     *
-     * @return self
-     */
-    public function addMultiple(array $results)
-    {
-        foreach ($results as $result) {
-            if ($result instanceof \Exception) {
-                $this->addException($result);
-            } else {
-                $this->addResult($result);
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Clear the queue.
-     *
-     * @return self
-     */
-    public function clearQueue()
-    {
-        $this->queue = [];
-
-        return $this;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/.gitignore b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/.gitignore
deleted file mode 100644
index 571a384ed3..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.idea
-.DS_STORE
-phpunit.xml
-composer.lock
-vendor/
-artifacts/
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/.travis.yml b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/.travis.yml
deleted file mode 100644
index 3a02bb382a..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/.travis.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-language: php
-
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-
-before_script:
-  - composer self-update
-  - composer install --no-interaction --prefer-source --dev
-
-script: make test
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/LICENSE b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/LICENSE
deleted file mode 100644
index 71d3b783cb..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2014 Michael Dowling, https://github.com/mtdowling <mtdowling@gmail.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.
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/Makefile b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/Makefile
deleted file mode 100644
index cfb82e4507..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-all: clean test
-
-test:
-	vendor/bin/phpunit
-
-coverage:
-	vendor/bin/phpunit --coverage-html=artifacts/coverage
-
-view-coverage:
-	open artifacts/coverage/index.html
-
-clean:
-	rm -rf artifacts/*
-
-.PHONY: coverage
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/README.rst b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/README.rst
deleted file mode 100644
index 9f30e95bd3..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/README.rst
+++ /dev/null
@@ -1,63 +0,0 @@
-===============
-Guzzle Services
-===============
-
-Provides an implementation of the Guzzle Command library that uses Guzzle service descriptions to describe web services, serialize requests, and parse responses into easy to use model structures.
-
-.. code-block:: php
-
-    use GuzzleHttp\Client;
-    use GuzzleHttp\Command\Guzzle\GuzzleClient;
-    use GuzzleHttp\Command\Guzzle\Description;
-
-    $client = new Client();
-    $description = new Description([
-        'baseUrl' => 'http://httpbin.org/',
-        'operations' => [
-            'testing' => [
-                'httpMethod' => 'GET',
-                'uri' => '/get/{foo}',
-                'responseModel' => 'getResponse',
-                'parameters' => [
-                    'foo' => [
-                        'type' => 'string',
-                        'location' => 'uri'
-                    ],
-                    'bar' => [
-                        'type' => 'string',
-                        'location' => 'query'
-                    ]
-                ]
-            ]
-        ],
-        'models' => [
-            'getResponse' => [
-                'type' => 'object',
-                'additionalProperties' => [
-                    'location' => 'json'
-                ]
-            ]
-        ]
-    ]);
-
-    $guzzleClient = new GuzzleClient($client, $description);
-
-    $result = $guzzleClient->testing(['foo' => 'bar']);
-    echo $result['args']['foo'];
-    // bar
-
-Installing
-==========
-
-This project can be installed using Composer. Add the following to your
-composer.json:
-
-.. code-block:: javascript
-
-    {
-        "require": {
-            "guzzlehttp/guzzle-services": "0.4.*"
-        }
-    }
-
-More documentation coming soon.
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/composer.json b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/composer.json
deleted file mode 100644
index 6d0ef37310..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "guzzlehttp/guzzle-services",
-    "description": "Provides an implementation of the Guzzle Command library that uses Guzzle service descriptions to describe web services, serialize requests, and parse responses into easy to use model structures.",
-    "type": "library",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Michael Dowling",
-            "email": "mtdowling@gmail.com",
-            "homepage": "https://github.com/mtdowling"
-        }
-    ],
-    "require": {
-        "php": ">=5.4.0",
-        "guzzlehttp/command": "0.7.*"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "GuzzleHttp\\Command\\Guzzle\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "GuzzleHttp\\Tests\\Command\\Guzzle\\": "tests/"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "0.4-dev"
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/phpunit.xml.dist b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/phpunit.xml.dist
deleted file mode 100644
index 994e1584ea..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/phpunit.xml.dist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./vendor/autoload.php"
-         colors="true">
-    <testsuites>
-        <testsuite>
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/Description.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/Description.php
deleted file mode 100644
index 3a0c749754..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/Description.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Guzzle;
-
-use GuzzleHttp\Url;
-
-/**
- * Represents a Guzzle service description
- */
-class Description implements DescriptionInterface
-{
-    /** @var array Array of {@see OperationInterface} objects */
-    private $operations = [];
-
-    /** @var array Array of API models */
-    private $models = [];
-
-    /** @var string Name of the API */
-    private $name;
-
-    /** @var string API version */
-    private $apiVersion;
-
-    /** @var string Summary of the API */
-    private $description;
-
-    /** @var array Any extra API data */
-    private $extraData = [];
-
-    /** @var string baseUrl/basePath */
-    private $baseUrl;
-
-    /** @var SchemaFormatter */
-    private $formatter;
-
-    /**
-     * @param array $config  Service description data
-     * @param array $options Custom options to apply to the description
-     *     - formatter: Can provide a custom SchemaFormatter class
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function __construct(array $config, array $options = [])
-    {
-        // Keep a list of default keys used in service descriptions that is
-        // later used to determine extra data keys.
-        static $defaultKeys = ['name', 'models', 'apiVersion', 'description'];
-
-        // Pull in the default configuration values
-        foreach ($defaultKeys as $key) {
-            if (isset($config[$key])) {
-                $this->{$key} = $config[$key];
-            }
-        }
-
-        // Set the baseUrl
-        $this->baseUrl = Url::fromString(isset($config['baseUrl']) ? $config['baseUrl'] : '');
-
-        // Ensure that the models and operations properties are always arrays
-        $this->models = (array) $this->models;
-        $this->operations = (array) $this->operations;
-
-        // We want to add operations differently than adding the other properties
-        $defaultKeys[] = 'operations';
-
-        // Create operations for each operation
-        if (isset($config['operations'])) {
-            foreach ($config['operations'] as $name => $operation) {
-                if (!is_array($operation)) {
-                    throw new \InvalidArgumentException('Operations must be arrays');
-                }
-                $this->operations[$name] = $operation;
-            }
-        }
-
-        // Get all of the additional properties of the service description and
-        // store them in a data array
-        foreach (array_diff(array_keys($config), $defaultKeys) as $key) {
-            $this->extraData[$key] = $config[$key];
-        }
-
-        // Configure the schema formatter
-        if (isset($options['formatter'])) {
-            $this->formatter = $options['formatter'];
-        } else {
-            static $defaultFormatter;
-            if (!$defaultFormatter) {
-                $defaultFormatter = new SchemaFormatter();
-            }
-            $this->formatter = $defaultFormatter;
-        }
-    }
-
-    /**
-     * Get the basePath/baseUrl of the description
-     *
-     * @return Url
-     */
-    public function getBaseUrl()
-    {
-        return $this->baseUrl;
-    }
-
-    /**
-     * Get the API operations of the service
-     *
-     * @return Operation[] Returns an array of {@see Operation} objects
-     */
-    public function getOperations()
-    {
-        return $this->operations;
-    }
-
-    /**
-     * Check if the service has an operation by name
-     *
-     * @param string $name Name of the operation to check
-     *
-     * @return bool
-     */
-    public function hasOperation($name)
-    {
-        return isset($this->operations[$name]);
-    }
-
-    /**
-     * Get an API operation by name
-     *
-     * @param string $name Name of the command
-     *
-     * @return Operation
-     * @throws \InvalidArgumentException if the operation is not found
-     */
-    public function getOperation($name)
-    {
-        if (!$this->hasOperation($name)) {
-            throw new \InvalidArgumentException("No operation found named $name");
-        }
-
-        // Lazily create operations as they are retrieved
-        if (!($this->operations[$name] instanceof Operation)) {
-            $this->operations[$name]['name'] = $name;
-            $this->operations[$name] = new Operation($this->operations[$name], $this);
-        }
-
-        return $this->operations[$name];
-    }
-
-    /**
-     * Get a shared definition structure.
-     *
-     * @param string $id ID/name of the model to retrieve
-     *
-     * @return Parameter
-     * @throws \InvalidArgumentException if the model is not found
-     */
-    public function getModel($id)
-    {
-        if (!$this->hasModel($id)) {
-            throw new \InvalidArgumentException("No model found named $id");
-        }
-
-        // Lazily create models as they are retrieved
-        if (!($this->models[$id] instanceof Parameter)) {
-            $this->models[$id] = new Parameter(
-                $this->models[$id],
-                ['description' => $this]
-            );
-        }
-
-        return $this->models[$id];
-    }
-
-    /**
-     * Get all models of the service description.
-     *
-     * @return array
-     */
-    public function getModels()
-    {
-        $models = [];
-        foreach ($this->models as $name => $model) {
-            $models[$name] = $this->getModel($name);
-        }
-
-        return $models;
-    }
-
-    /**
-     * Check if the service description has a model by name.
-     *
-     * @param string $id Name/ID of the model to check
-     *
-     * @return bool
-     */
-    public function hasModel($id)
-    {
-        return isset($this->models[$id]);
-    }
-
-    /**
-     * Get the API version of the service
-     *
-     * @return string
-     */
-    public function getApiVersion()
-    {
-        return $this->apiVersion;
-    }
-
-    /**
-     * Get the name of the API
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Get a summary of the purpose of the API
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->description;
-    }
-
-    /**
-     * Format a parameter using named formats.
-     *
-     * @param string $format Format to convert it to
-     * @param mixed  $input  Input string
-     *
-     * @return mixed
-     */
-    public function format($format, $input)
-    {
-        return $this->formatter->format($format, $input);
-    }
-
-    /**
-     * Get arbitrary data from the service description that is not part of the
-     * Guzzle service description specification.
-     *
-     * @param string $key Data key to retrieve or null to retrieve all extra
-     *
-     * @return null|mixed
-     */
-    public function getData($key = null)
-    {
-        if ($key === null) {
-            return $this->extraData;
-        } elseif (isset($this->extraData[$key])) {
-            return $this->extraData[$key];
-        } else {
-            return null;
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/DescriptionInterface.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/DescriptionInterface.php
deleted file mode 100644
index 2abb1e9d32..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/DescriptionInterface.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Guzzle;
-
-use GuzzleHttp\Url;
-
-interface DescriptionInterface
-{
-    /**
-     * Get the basePath/baseUrl of the description
-     *
-     * @return Url
-     */
-    public function getBaseUrl();
-
-    /**
-     * Get the API operations of the service
-     *
-     * @return Operation[] Returns an array of {@see Operation} objects
-     */
-    public function getOperations();
-
-    /**
-     * Check if the service has an operation by name
-     *
-     * @param string $name Name of the operation to check
-     *
-     * @return bool
-     */
-    public function hasOperation($name);
-
-    /**
-     * Get an API operation by name
-     *
-     * @param string $name Name of the command
-     *
-     * @return Operation
-     * @throws \InvalidArgumentException if the operation is not found
-     */
-    public function getOperation($name);
-
-    /**
-     * Get a shared definition structure.
-     *
-     * @param string $id ID/name of the model to retrieve
-     *
-     * @return Parameter
-     * @throws \InvalidArgumentException if the model is not found
-     */
-    public function getModel($id);
-
-    /**
-     * Get all models of the service description.
-     *
-     * @return array
-     */
-    public function getModels();
-
-    /**
-     * Check if the service description has a model by name.
-     *
-     * @param string $id Name/ID of the model to check
-     *
-     * @return bool
-     */
-    public function hasModel($id);
-
-    /**
-     * Get the API version of the service
-     *
-     * @return string
-     */
-    public function getApiVersion();
-
-    /**
-     * Get the name of the API
-     *
-     * @return string
-     */
-    public function getName();
-
-    /**
-     * Get a summary of the purpose of the API
-     *
-     * @return string
-     */
-    public function getDescription();
-
-    /**
-     * Format a parameter using named formats.
-     *
-     * @param string $format Format to convert it to
-     * @param mixed  $input  Input string
-     *
-     * @return mixed
-     */
-    public function format($format, $input);
-
-    /**
-     * Get arbitrary data from the service description that is not part of the
-     * Guzzle service description specification.
-     *
-     * @param string $key Data key to retrieve or null to retrieve all extra
-     *
-     * @return null|mixed
-     */
-    public function getData($key = null);
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/GuzzleClient.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/GuzzleClient.php
deleted file mode 100644
index cbfdc1beb7..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/GuzzleClient.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Guzzle;
-
-use GuzzleHttp\ClientInterface;
-use GuzzleHttp\Command\AbstractClient;
-use GuzzleHttp\Command\Command;
-use GuzzleHttp\Command\CommandTransaction;
-use GuzzleHttp\Command\Guzzle\Subscriber\ProcessResponse;
-use GuzzleHttp\Command\Guzzle\Subscriber\ValidateInput;
-use GuzzleHttp\Event\HasEmitterTrait;
-use GuzzleHttp\Command\ServiceClientInterface;
-use GuzzleHttp\Ring\Future\FutureArray;
-
-/**
- * Default Guzzle web service client implementation.
- */
-class GuzzleClient extends AbstractClient
-{
-    /** @var Description Guzzle service description */
-    private $description;
-
-    /** @var callable Factory used for creating commands */
-    private $commandFactory;
-
-    /** @var callable Serializer */
-    private $serializer;
-
-    /**
-     * The client constructor accepts an associative array of configuration
-     * options:
-     *
-     * - defaults: Associative array of default command parameters to add to
-     *   each command created by the client.
-     * - validate: Specify if command input is validated (defaults to true).
-     *   Changing this setting after the client has been created will have no
-     *   effect.
-     * - process: Specify if HTTP responses are parsed (defaults to true).
-     *   Changing this setting after the client has been created will have no
-     *   effect.
-     * - response_locations: Associative array of location types mapping to
-     *   ResponseLocationInterface objects.
-     * - serializer: Optional callable that accepts a CommandTransactions and
-     *   returns a serialized request object.
-     *
-     * @param ClientInterface      $client      HTTP client to use.
-     * @param DescriptionInterface $description Guzzle service description
-     * @param array                $config      Configuration options
-     */
-    public function __construct(
-        ClientInterface $client,
-        DescriptionInterface $description,
-        array $config = []
-    ) {
-        parent::__construct($client, $config);
-        $this->description = $description;
-        $this->processConfig($config);
-    }
-
-    public function getCommand($name, array $args = [])
-    {
-        $factory = $this->commandFactory;
-
-        // Determine if a future array should be returned.
-        if (!empty($args['@future'])) {
-            $future = !empty($args['@future']);
-            unset($args['@future']);
-        } else {
-            $future = false;
-        }
-
-        // Merge in default command options
-        $args += $this->getConfig('defaults');
-
-        if ($command = $factory($name, $args, $this)) {
-            $command->setFuture($future);
-            return $command;
-        }
-
-        throw new \InvalidArgumentException("No operation found named $name");
-    }
-
-    public function getDescription()
-    {
-        return $this->description;
-    }
-
-    protected function createFutureResult(CommandTransaction $transaction)
-    {
-        return new FutureArray(
-            $transaction->response->then(function () use ($transaction) {
-                return $transaction->result;
-            }),
-            [$transaction->response, 'wait'],
-            [$transaction->response, 'cancel']
-        );
-    }
-
-    protected function serializeRequest(CommandTransaction $trans)
-    {
-        $fn = $this->serializer;
-        return $fn($trans);
-    }
-
-    /**
-     * Creates a callable function used to create command objects from a
-     * service description.
-     *
-     * @param DescriptionInterface $description Service description
-     *
-     * @return callable Returns a command factory
-     */
-    public static function defaultCommandFactory(DescriptionInterface $description)
-    {
-        return function (
-            $name,
-            array $args = [],
-            ServiceClientInterface $client
-        ) use ($description) {
-            $operation = null;
-
-            if ($description->hasOperation($name)) {
-                $operation = $description->getOperation($name);
-            } else {
-                $name = ucfirst($name);
-                if ($description->hasOperation($name)) {
-                    $operation = $description->getOperation($name);
-                }
-            }
-
-            if (!$operation) {
-                return null;
-            }
-
-            return new Command($name, $args, ['emitter' => clone $client->getEmitter()]);
-        };
-    }
-
-    /**
-     * Prepares the client based on the configuration settings of the client.
-     *
-     * @param array $config Constructor config as an array
-     */
-    protected function processConfig(array $config)
-    {
-        // Use the passed in command factory or a custom factory if provided
-        $this->commandFactory = isset($config['command_factory'])
-            ? $config['command_factory']
-            : self::defaultCommandFactory($this->description);
-
-        // Add event listeners based on the configuration option
-        $emitter = $this->getEmitter();
-
-        if (!isset($config['validate']) ||
-            $config['validate'] === true
-        ) {
-            $emitter->attach(new ValidateInput($this->description));
-        }
-
-        $this->serializer = isset($config['serializer'])
-            ? $config['serializer']
-            : new Serializer($this->description);
-
-        if (!isset($config['process']) ||
-            $config['process'] === true
-        ) {
-            $emitter->attach(
-                new ProcessResponse(
-                    $this->description,
-                    isset($config['response_locations'])
-                        ? $config['response_locations']
-                        : []
-                )
-            );
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/Operation.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/Operation.php
deleted file mode 100644
index 9ae4bf5e7b..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/Operation.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Guzzle;
-
-use GuzzleHttp\ToArrayInterface;
-
-/**
- * Guzzle operation
- */
-class Operation implements ToArrayInterface
-{
-    /** @var array Parameters */
-    private $parameters = [];
-
-    /** @var Parameter Additional parameters schema */
-    private $additionalParameters;
-
-    /** @var Description */
-    private $description;
-
-    /** @var array Config data */
-    private $config;
-
-    /**
-     * Builds an Operation object using an array of configuration data.
-     *
-     * - name: (string) Name of the command
-     * - httpMethod: (string) HTTP method of the operation
-     * - uri: (string) URI template that can create a relative or absolute URL
-     * - parameters: (array) Associative array of parameters for the command.
-     *   Each value must be an array that is used to create {@see Parameter}
-     *   objects.
-     * - summary: (string) This is a short summary of what the operation does
-     * - notes: (string) A longer description of the operation.
-     * - documentationUrl: (string) Reference URL providing more information
-     *   about the operation.
-     * - responseModel: (string) The model name used for processing response.
-     * - deprecated: (bool) Set to true if this is a deprecated command
-     * - errorResponses: (array) Errors that could occur when executing the
-     *   command. Array of hashes, each with a 'code' (the HTTP response code),
-     *   'phrase' (response reason phrase or description of the error), and
-     *   'class' (a custom exception class that would be thrown if the error is
-     *   encountered).
-     * - data: (array) Any extra data that might be used to help build or
-     *   serialize the operation
-     * - additionalParameters: (null|array) Parameter schema to use when an
-     *   option is passed to the operation that is not in the schema
-     *
-     * @param array                 $config      Array of configuration data
-     * @param DescriptionInterface  $description Service description used to resolve models if $ref tags are found
-     * @throws \InvalidArgumentException
-     */
-    public function __construct(array $config = [], DescriptionInterface $description)
-    {
-        static $defaults = [
-            'name' => '',
-            'httpMethod' => '',
-            'uri' => '',
-            'responseModel' => null,
-            'notes' => '',
-            'summary' => '',
-            'documentationUrl' => null,
-            'deprecated' => false,
-            'data' => [],
-            'parameters' => [],
-            'additionalParameters' => null,
-            'errorResponses' => []
-        ];
-
-        $this->description = $description;
-
-        if (isset($config['extends'])) {
-            $config = $this->resolveExtends($config['extends'], $config);
-        }
-
-        $this->config = $config + $defaults;
-
-        // Account for the old style of using responseClass
-        if (isset($config['responseClass'])) {
-            $this->config['responseModel'] = $config['responseClass'];
-        }
-
-        $this->resolveParameters();
-    }
-
-    public function toArray()
-    {
-        return $this->config;
-    }
-
-    /**
-     * Get the service description that the operation belongs to
-     *
-     * @return Description
-     */
-    public function getServiceDescription()
-    {
-        return $this->description;
-    }
-
-    /**
-     * Get the params of the operation
-     *
-     * @return Parameter[]
-     */
-    public function getParams()
-    {
-        return $this->parameters;
-    }
-
-    /**
-     * Get additionalParameters of the operation
-     *
-     * @return Parameter|null
-     */
-    public function getAdditionalParameters()
-    {
-        return $this->additionalParameters;
-    }
-
-    /**
-     * Check if the operation has a specific parameter by name
-     *
-     * @param string $name Name of the param
-     *
-     * @return bool
-     */
-    public function hasParam($name)
-    {
-        return isset($this->parameters[$name]);
-    }
-
-    /**
-     * Get a single parameter of the operation
-     *
-     * @param string $name Parameter to retrieve by name
-     *
-     * @return Parameter|null
-     */
-    public function getParam($name)
-    {
-        return isset($this->parameters[$name])
-            ? $this->parameters[$name]
-            : null;
-    }
-
-    /**
-     * Get the HTTP method of the operation
-     *
-     * @return string|null
-     */
-    public function getHttpMethod()
-    {
-        return $this->config['httpMethod'];
-    }
-
-    /**
-     * Get the name of the operation
-     *
-     * @return string|null
-     */
-    public function getName()
-    {
-        return $this->config['name'];
-    }
-
-    /**
-     * Get a short summary of what the operation does
-     *
-     * @return string|null
-     */
-    public function getSummary()
-    {
-        return $this->config['summary'];
-    }
-
-    /**
-     * Get a longer text field to explain the behavior of the operation
-     *
-     * @return string|null
-     */
-    public function getNotes()
-    {
-        return $this->config['notes'];
-    }
-
-    /**
-     * Get the documentation URL of the operation
-     *
-     * @return string|null
-     */
-    public function getDocumentationUrl()
-    {
-        return $this->config['documentationUrl'];
-    }
-
-    /**
-     * Get the name of the model used for processing the response.
-     *
-     * @return string
-     */
-    public function getResponseModel()
-    {
-        return $this->config['responseModel'];
-    }
-
-    /**
-     * Get whether or not the operation is deprecated
-     *
-     * @return bool
-     */
-    public function getDeprecated()
-    {
-        return $this->config['deprecated'];
-    }
-
-    /**
-     * Get the URI that will be merged into the generated request
-     *
-     * @return string
-     */
-    public function getUri()
-    {
-        return $this->config['uri'];
-    }
-
-    /**
-     * Get the errors that could be encountered when executing the operation
-     *
-     * @return array
-     */
-    public function getErrorResponses()
-    {
-        return $this->config['errorResponses'];
-    }
-
-    /**
-     * Get extra data from the operation
-     *
-     * @param string $name Name of the data point to retrieve or null to
-     *     retrieve all of the extra data.
-     *
-     * @return mixed|null
-     */
-    public function getData($name = null)
-    {
-        if ($name === null) {
-            return $this->config['data'];
-        } elseif (isset($this->config['data'][$name])) {
-            return $this->config['data'][$name];
-        } else {
-            return null;
-        }
-    }
-
-    private function resolveExtends($name, array $config)
-    {
-        if (!$this->description->hasOperation($name)) {
-            throw new \InvalidArgumentException('No operation named ' . $name);
-        }
-
-        // Merge parameters together one level deep
-        $base = $this->description->getOperation($name)->toArray();
-        $result = $config + $base;
-
-        if (isset($base['parameters']) && isset($config['parameters'])) {
-            $result['parameters'] = $config['parameters'] + $base['parameters'];
-        }
-
-        return $result;
-    }
-
-    private function resolveParameters()
-    {
-        // Parameters need special handling when adding
-        foreach ($this->config['parameters'] as $name => $param) {
-            if (!is_array($param)) {
-                throw new \InvalidArgumentException(
-                    'Parameters must be arrays'
-                );
-            }
-            $param['name'] = $name;
-            $this->parameters[$name] = new Parameter(
-                $param,
-                ['description' => $this->description]
-            );
-        }
-
-        if ($this->config['additionalParameters']) {
-            if (is_array($this->config['additionalParameters'])) {
-                $this->additionalParameters = new Parameter(
-                    $this->config['additionalParameters'],
-                    ['description' => $this->description]
-                );
-            } else {
-                $this->additionalParameters = $this->config['additionalParameters'];
-            }
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/Parameter.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/Parameter.php
deleted file mode 100644
index 112f09f677..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/Parameter.php
+++ /dev/null
@@ -1,596 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Guzzle;
-
-use GuzzleHttp\ToArrayInterface;
-
-/**
- * API parameter object used with service descriptions
- */
-class Parameter implements ToArrayInterface
-{
-    private $originalData;
-    private $name;
-    private $description;
-    private $type;
-    private $required;
-    private $enum;
-    private $pattern;
-    private $minimum;
-    private $maximum;
-    private $minLength;
-    private $maxLength;
-    private $minItems;
-    private $maxItems;
-    private $default;
-    private $static;
-    private $filters;
-    private $location;
-    private $sentAs;
-    private $data;
-    private $properties = [];
-    private $additionalProperties;
-    private $items;
-    private $format;
-    private $propertiesCache = null;
-
-    /** @var Description */
-    private $serviceDescription;
-
-    /**
-     * Create a new Parameter using an associative array of data.
-     *
-     * The array can contain the following information:
-     *
-     * - name: (string) Unique name of the parameter
-     *
-     * - type: (string|array) Type of variable (string, number, integer,
-     *   boolean, object, array, numeric, null, any). Types are using for
-     *   validation and determining the structure of a parameter. You can use a
-     *   union type by providing an array of simple types. If one of the union
-     *   types matches the provided value, then the value is valid.
-     *
-     * - required: (bool) Whether or not the parameter is required
-     *
-     * - default: (mixed) Default value to use if no value is supplied
-     *
-     * - static: (bool) Set to true to specify that the parameter value cannot
-     *   be changed from the default.
-     *
-     * - description: (string) Documentation of the parameter
-     *
-     * - location: (string) The location of a request used to apply a parameter.
-     *   Custom locations can be registered with a command, but the defaults
-     *   are uri, query, header, body, json, xml, postField, postFile.
-     *
-     * - sentAs: (string) Specifies how the data being modeled is sent over the
-     *   wire. For example, you may wish to include certain headers in a
-     *   response model that have a normalized casing of FooBar, but the actual
-     *   header is x-foo-bar. In this case, sentAs would be set to x-foo-bar.
-     *
-     * - filters: (array) Array of static method names to to run a parameter
-     *   value through. Each value in the array must be a string containing the
-     *   full class path to a static method or an array of complex filter
-     *   information. You can specify static methods of classes using the full
-     *   namespace class name followed by '::' (e.g. Foo\Bar::baz). Some
-     *   filters require arguments in order to properly filter a value. For
-     *   complex filters, use a hash containing a 'method' key pointing to a
-     *   static method, and an 'args' key containing an array of positional
-     *   arguments to pass to the method. Arguments can contain keywords that
-     *   are replaced when filtering a value: '@value' is replaced with the
-     *   value being validated, '@api' is replaced with the Parameter object.
-     *
-     * - properties: When the type is an object, you can specify nested parameters
-     *
-     * - additionalProperties: (array) This attribute defines a schema for all
-     *   properties that are not explicitly defined in an object type
-     *   definition. If specified, the value MUST be a schema or a boolean. If
-     *   false is provided, no additional properties are allowed beyond the
-     *   properties defined in the schema. The default value is an empty schema
-     *   which allows any value for additional properties.
-     *
-     * - items: This attribute defines the allowed items in an instance array,
-     *   and MUST be a schema or an array of schemas. The default value is an
-     *   empty schema which allows any value for items in the instance array.
-     *   When this attribute value is a schema and the instance value is an
-     *   array, then all the items in the array MUST be valid according to the
-     *   schema.
-     *
-     * - pattern: When the type is a string, you can specify the regex pattern
-     *   that a value must match
-     *
-     * - enum: When the type is a string, you can specify a list of acceptable
-     *   values.
-     *
-     * - minItems: (int) Minimum number of items allowed in an array
-     *
-     * - maxItems: (int) Maximum number of items allowed in an array
-     *
-     * - minLength: (int) Minimum length of a string
-     *
-     * - maxLength: (int) Maximum length of a string
-     *
-     * - minimum: (int) Minimum value of an integer
-     *
-     * - maximum: (int) Maximum value of an integer
-     *
-     * - data: (array) Any additional custom data to use when serializing,
-     *   validating, etc
-     *
-     * - format: (string) Format used to coax a value into the correct format
-     *   when serializing or unserializing. You may specify either an array of
-     *   filters OR a format, but not both. Supported values: date-time, date,
-     *   time, timestamp, date-time-http, and boolean-string.
-     *
-     * - $ref: (string) String referencing a service description model. The
-     *   parameter is replaced by the schema contained in the model.
-     *
-     * @param array $data    Array of data as seen in service descriptions
-     * @param array $options Options used when creating the parameter. You can
-     *     specify a Guzzle service description in the 'description' key.
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function __construct(array $data = [], array $options = [])
-    {
-        $this->originalData = $data;
-
-        if (isset($options['description'])) {
-            $this->serviceDescription = $options['description'];
-            if (!($this->serviceDescription instanceof DescriptionInterface)) {
-                throw new \InvalidArgumentException('description must be a Description');
-            }
-            if (isset($data['$ref'])) {
-                if ($model = $this->serviceDescription->getModel($data['$ref'])) {
-                    $name = isset($data['name']) ? $data['name'] : null;
-                    $data = $model->toArray() + $data;
-                    if ($name) {
-                        $data['name'] = $name;
-                    }
-                }
-            } elseif (isset($data['extends'])) {
-                // If this parameter extends from another parameter then start
-                // with the actual data union in the parent's data (e.g. actual
-                // supersedes parent)
-                if ($extends = $this->serviceDescription->getModel($data['extends'])) {
-                    $data += $extends->toArray();
-                }
-            }
-        }
-
-        // Pull configuration data into the parameter
-        foreach ($data as $key => $value) {
-            $this->{$key} = $value;
-        }
-
-        $this->required = (bool) $this->required;
-        $this->data = (array) $this->data;
-
-        if ($this->filters) {
-            $this->setFilters((array) $this->filters);
-        }
-
-        if ($this->type == 'object' && $this->additionalProperties === null) {
-            $this->additionalProperties = true;
-        }
-    }
-
-    /**
-     * Convert the object to an array
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        return $this->originalData;
-    }
-
-    /**
-     * Get the default or static value of the command based on a value
-     *
-     * @param string $value Value that is currently set
-     *
-     * @return mixed Returns the value, a static value if one is present, or a default value
-     */
-    public function getValue($value)
-    {
-        if ($this->static || ($this->default !== null && $value === null)) {
-            return $this->default;
-        }
-
-        return $value;
-    }
-
-    /**
-     * Run a value through the filters OR format attribute associated with the
-     * parameter.
-     *
-     * @param mixed $value Value to filter
-     *
-     * @return mixed Returns the filtered value
-     * @throws \RuntimeException when trying to format when no service
-     *     description is available.
-     */
-    public function filter($value)
-    {
-        // Formats are applied exclusively and supersed filters
-        if ($this->format) {
-            if (!$this->serviceDescription) {
-                throw new \RuntimeException('No service description was set so '
-                    . 'the value cannot be formatted.');
-            }
-            return $this->serviceDescription->format($this->format, $value);
-        }
-
-        // Convert Boolean values
-        if ($this->type == 'boolean' && !is_bool($value)) {
-            $value = filter_var($value, FILTER_VALIDATE_BOOLEAN);
-        }
-
-        // Apply filters to the value
-        if ($this->filters) {
-            foreach ($this->filters as $filter) {
-                if (is_array($filter)) {
-                    // Convert complex filters that hold value place holders
-                    foreach ($filter['args'] as &$data) {
-                        if ($data == '@value') {
-                            $data = $value;
-                        } elseif ($data == '@api') {
-                            $data = $this;
-                        }
-                    }
-                    $value = call_user_func_array(
-                        $filter['method'],
-                        $filter['args']
-                    );
-                } else {
-                    $value = call_user_func($filter, $value);
-                }
-            }
-        }
-
-        return $value;
-    }
-
-    /**
-     * Get the name of the parameter
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Set the name of the parameter
-     *
-     * @param string $name Name to set
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-    }
-
-    /**
-     * Get the key of the parameter, where sentAs will supersede name if it is
-     * set.
-     *
-     * @return string
-     */
-    public function getWireName()
-    {
-        return $this->sentAs ?: $this->name;
-    }
-
-    /**
-     * Get the type(s) of the parameter
-     *
-     * @return string|array
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * Get if the parameter is required
-     *
-     * @return bool
-     */
-    public function getRequired()
-    {
-        return $this->required;
-    }
-
-    /**
-     * Get the default value of the parameter
-     *
-     * @return string|null
-     */
-    public function getDefault()
-    {
-        return $this->default;
-    }
-
-    /**
-     * Get the description of the parameter
-     *
-     * @return string|null
-     */
-    public function getDescription()
-    {
-        return $this->description;
-    }
-
-    /**
-     * Get the minimum acceptable value for an integer
-     *
-     * @return int|null
-     */
-    public function getMinimum()
-    {
-        return $this->minimum;
-    }
-
-    /**
-     * Get the maximum acceptable value for an integer
-     *
-     * @return int|null
-     */
-    public function getMaximum()
-    {
-        return $this->maximum;
-    }
-
-    /**
-     * Get the minimum allowed length of a string value
-     *
-     * @return int
-     */
-    public function getMinLength()
-    {
-        return $this->minLength;
-    }
-
-    /**
-     * Get the maximum allowed length of a string value
-     *
-     * @return int|null
-     */
-    public function getMaxLength()
-    {
-        return $this->maxLength;
-    }
-
-    /**
-     * Get the maximum allowed number of items in an array value
-     *
-     * @return int|null
-     */
-    public function getMaxItems()
-    {
-        return $this->maxItems;
-    }
-
-    /**
-     * Get the minimum allowed number of items in an array value
-     *
-     * @return int
-     */
-    public function getMinItems()
-    {
-        return $this->minItems;
-    }
-
-    /**
-     * Get the location of the parameter
-     *
-     * @return string|null
-     */
-    public function getLocation()
-    {
-        return $this->location;
-    }
-
-    /**
-     * Get the sentAs attribute of the parameter that used with locations to
-     * sentAs an attribute when it is being applied to a location.
-     *
-     * @return string|null
-     */
-    public function getSentAs()
-    {
-        return $this->sentAs;
-    }
-
-    /**
-     * Retrieve a known property from the parameter by name or a data property
-     * by name. When not specific name value is specified, all data properties
-     * will be returned.
-     *
-     * @param string|null $name Specify a particular property name to retrieve
-     *
-     * @return array|mixed|null
-     */
-    public function getData($name = null)
-    {
-        if (!$name) {
-            return $this->data;
-        } elseif (isset($this->data[$name])) {
-            return $this->data[$name];
-        } elseif (isset($this->{$name})) {
-            return $this->{$name};
-        }
-
-        return null;
-    }
-
-    /**
-     * Get whether or not the default value can be changed
-     *
-     * @return mixed|null
-     */
-    public function getStatic()
-    {
-        return $this->static;
-    }
-
-    /**
-     * Get an array of filters used by the parameter
-     *
-     * @return array
-     */
-    public function getFilters()
-    {
-        return $this->filters ?: [];
-    }
-
-    /**
-     * Get the properties of the parameter
-     *
-     * @return Parameter[]
-     */
-    public function getProperties()
-    {
-        if (!$this->propertiesCache) {
-            $this->propertiesCache = [];
-            foreach (array_keys($this->properties) as $name) {
-                $this->propertiesCache[$name] = $this->getProperty($name);
-            }
-        }
-
-        return $this->propertiesCache;
-    }
-
-    /**
-     * Get a specific property from the parameter
-     *
-     * @param string $name Name of the property to retrieve
-     *
-     * @return null|Parameter
-     */
-    public function getProperty($name)
-    {
-        if (!isset($this->properties[$name])) {
-            return null;
-        }
-
-        if (!($this->properties[$name] instanceof self)) {
-            $this->properties[$name]['name'] = $name;
-            $this->properties[$name] = new static(
-                $this->properties[$name],
-                ['description' => $this->serviceDescription]
-            );
-        }
-
-        return $this->properties[$name];
-    }
-
-    /**
-     * Get the additionalProperties value of the parameter
-     *
-     * @return bool|Parameter|null
-     */
-    public function getAdditionalProperties()
-    {
-        if (is_array($this->additionalProperties)) {
-            $this->additionalProperties = new static(
-                $this->additionalProperties,
-                ['description' => $this->serviceDescription]
-            );
-        }
-
-        return $this->additionalProperties;
-    }
-
-    /**
-     * Get the item data of the parameter
-     *
-     * @return Parameter|null
-     */
-    public function getItems()
-    {
-        if (is_array($this->items)) {
-            $this->items = new static(
-                $this->items,
-                ['description' => $this->serviceDescription]
-            );
-        }
-
-        return $this->items;
-    }
-
-    /**
-     * Get the enum of strings that are valid for the parameter
-     *
-     * @return array|null
-     */
-    public function getEnum()
-    {
-        return $this->enum;
-    }
-
-    /**
-     * Get the regex pattern that must match a value when the value is a string
-     *
-     * @return string
-     */
-    public function getPattern()
-    {
-        return $this->pattern;
-    }
-
-    /**
-     * Get the format attribute of the schema
-     *
-     * @return string
-     */
-    public function getFormat()
-    {
-        return $this->format;
-    }
-
-    /**
-     * Set the array of filters used by the parameter
-     *
-     * @param array $filters Array of functions to use as filters
-     *
-     * @return self
-     */
-    private function setFilters(array $filters)
-    {
-        $this->filters = [];
-        foreach ($filters as $filter) {
-            $this->addFilter($filter);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Add a filter to the parameter
-     *
-     * @param string|array $filter Method to filter the value through
-     *
-     * @return self
-     * @throws \InvalidArgumentException
-     */
-    private function addFilter($filter)
-    {
-        if (is_array($filter)) {
-            if (!isset($filter['method'])) {
-                throw new \InvalidArgumentException(
-                    'A [method] value must be specified for each complex filter'
-                );
-            }
-        }
-
-        if (!$this->filters) {
-            $this->filters = [$filter];
-        } else {
-            $this->filters[] = $filter;
-        }
-
-        return $this;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/RequestLocation/AbstractLocation.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/RequestLocation/AbstractLocation.php
deleted file mode 100644
index a27a9abe06..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/RequestLocation/AbstractLocation.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Guzzle\RequestLocation;
-
-use GuzzleHttp\Command\Guzzle\Operation;
-use GuzzleHttp\Command\Guzzle\Parameter;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Command\CommandInterface;
-
-abstract class AbstractLocation implements RequestLocationInterface
-{
-    /** @var string */
-    protected $locationName;
-
-    /**
-     * Set the name of the location
-     *
-     * @param $locationName
-     */
-    public function __construct($locationName)
-    {
-        $this->locationName = $locationName;
-    }
-
-    public function visit(
-        CommandInterface $command,
-        RequestInterface $request,
-        Parameter $param,
-        array $context
-    ) {}
-
-    public function after(
-        CommandInterface $command,
-        RequestInterface $request,
-        Operation $operation,
-        array $context
-    ) {}
-
-    /**
-     * Prepare (filter and set desired name for request item) the value for
-     * request.
-     *
-     * @param mixed     $value
-     * @param Parameter $param
-     *
-     * @return array|mixed
-     */
-    protected function prepareValue($value, Parameter $param)
-    {
-        return is_array($value)
-            ? $this->resolveRecursively($value, $param)
-            : $param->filter($value);
-    }
-
-    /**
-     * Recursively prepare and filter nested values.
-     *
-     * @param array     $value Value to map
-     * @param Parameter $param Parameter related to the current key.
-     *
-     * @return array Returns the mapped array
-     */
-    protected function resolveRecursively(array $value, Parameter $param)
-    {
-        foreach ($value as $name => &$v) {
-            switch ($param->getType()) {
-                case 'object':
-                    if ($subParam = $param->getProperty($name)) {
-                        $key = $subParam->getWireName();
-                        $value[$key] = $this->prepareValue($v, $subParam);
-                        if ($name != $key) {
-                            unset($value[$name]);
-                        }
-                    } elseif ($param->getAdditionalProperties() instanceof Parameter) {
-                        $v = $this->prepareValue($v, $param->getAdditionalProperties());
-                    }
-                    break;
-                case 'array':
-                    if ($items = $param->getItems()) {
-                        $v = $this->prepareValue($v, $items);
-                    }
-                    break;
-            }
-        }
-
-        return $param->filter($value);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/RequestLocation/BodyLocation.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/RequestLocation/BodyLocation.php
deleted file mode 100644
index 17446b1ffd..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/RequestLocation/BodyLocation.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Guzzle\RequestLocation;
-
-use GuzzleHttp\Command\CommandInterface;
-use GuzzleHttp\Command\Guzzle\Parameter;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Stream\Stream;
-
-/**
- * Adds a body to a request
- */
-class BodyLocation extends AbstractLocation
-{
-    public function visit(
-        CommandInterface $command,
-        RequestInterface $request,
-        Parameter $param,
-        array $context
-    ) {
-        $value = $command[$param->getName()];
-        $request->setBody(Stream::factory($param->filter($value)));
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/RequestLocation/HeaderLocation.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/RequestLocation/HeaderLocation.php
deleted file mode 100644
index 3d31cfcb59..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/RequestLocation/HeaderLocation.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Guzzle\RequestLocation;
-
-use GuzzleHttp\Command\Guzzle\Parameter;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Command\Guzzle\Operation;
-use GuzzleHttp\Command\CommandInterface;
-
-/**
- * Request header location
- */
-class HeaderLocation extends AbstractLocation
-{
-    public function visit(
-        CommandInterface $command,
-        RequestInterface $request,
-        Parameter $param,
-        array $context
-    ) {
-        $value = $command[$param->getName()];
-        $request->setHeader($param->getWireName(), $param->filter($value));
-    }
-
-    public function after(
-        CommandInterface $command,
-        RequestInterface $request,
-        Operation $operation,
-        array $context
-    ) {
-        $additional = $operation->getAdditionalParameters();
-        if ($additional && $additional->getLocation() == $this->locationName) {
-            foreach ($command->toArray() as $key => $value) {
-                if (!$operation->hasParam($key)) {
-                    $request->setHeader($key, $additional->filter($value));
-                }
-            }
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/RequestLocation/JsonLocation.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/RequestLocation/JsonLocation.php
deleted file mode 100644
index da46338e19..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/RequestLocation/JsonLocation.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Guzzle\RequestLocation;
-
-use GuzzleHttp\Command\Guzzle\Operation;
-use GuzzleHttp\Command\Guzzle\Parameter;
-use GuzzleHttp\Command\CommandInterface;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Stream\Stream;
-
-/**
- * Creates a JSON document
- */
-class JsonLocation extends AbstractLocation
-{
-    /** @var bool Whether or not to add a Content-Type header when JSON is found */
-    private $jsonContentType;
-
-    /** @var array */
-    private $jsonData;
-
-    /**
-     * @param string $locationName Name of the location
-     * @param string $contentType  Content-Type header to add to the request if
-     *     JSON is added to the body. Pass an empty string to omit.
-     */
-    public function __construct($locationName, $contentType = 'application/json')
-    {
-        $this->locationName = $locationName;
-        $this->jsonContentType = $contentType;
-    }
-
-    public function visit(
-        CommandInterface $command,
-        RequestInterface $request,
-        Parameter $param,
-        array $context
-    ) {
-        $this->jsonData[$param->getWireName()] = $this->prepareValue(
-            $command[$param->getName()],
-            $param
-        );
-    }
-
-    public function after(
-        CommandInterface $command,
-        RequestInterface $request,
-        Operation $operation,
-        array $context
-    ) {
-        $data = $this->jsonData;
-        $this->jsonData = null;
-
-        // Add additional parameters to the JSON document
-        $additional = $operation->getAdditionalParameters();
-        if ($additional && $additional->getLocation() == $this->locationName) {
-            foreach ($command->toArray() as $key => $value) {
-                if (!$operation->hasParam($key)) {
-                    $data[$key] = $this->prepareValue($value, $additional);
-                }
-            }
-        }
-
-        // Don't overwrite the Content-Type if one is set
-        if ($this->jsonContentType && !$request->hasHeader('Content-Type')) {
-            $request->setHeader('Content-Type', $this->jsonContentType);
-        }
-
-        $request->setBody(Stream::factory(json_encode($data)));
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/RequestLocation/PostFieldLocation.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/RequestLocation/PostFieldLocation.php
deleted file mode 100644
index f0a0ab3876..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/RequestLocation/PostFieldLocation.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Guzzle\RequestLocation;
-
-use GuzzleHttp\Command\Guzzle\Parameter;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Post\PostBodyInterface;
-use GuzzleHttp\Command\CommandInterface;
-use GuzzleHttp\Command\Guzzle\Operation;
-
-/**
- * Adds POST fields to a request
- */
-class PostFieldLocation extends AbstractLocation
-{
-    public function visit(
-        CommandInterface $command,
-        RequestInterface $request,
-        Parameter $param,
-        array $context
-    ) {
-        $body = $request->getBody();
-        if (!($body instanceof PostBodyInterface)) {
-            throw new \RuntimeException('Must be a POST body interface');
-        }
-
-        $body->setField(
-            $param->getWireName(),
-            $this->prepareValue($command[$param->getName()], $param)
-        );
-    }
-
-    public function after(
-        CommandInterface $command,
-        RequestInterface $request,
-        Operation $operation,
-        array $context
-    ) {
-        $additional = $operation->getAdditionalParameters();
-        if ($additional && $additional->getLocation() == $this->locationName) {
-
-            $body = $request->getBody();
-            if (!($body instanceof PostBodyInterface)) {
-                throw new \RuntimeException('Must be a POST body interface');
-            }
-
-            foreach ($command->toArray() as $key => $value) {
-                if (!$operation->hasParam($key)) {
-                    $body->setField(
-                        $key,
-                        $this->prepareValue($value, $additional)
-                    );
-                }
-            }
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/RequestLocation/PostFileLocation.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/RequestLocation/PostFileLocation.php
deleted file mode 100644
index 94434720a9..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/RequestLocation/PostFileLocation.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Guzzle\RequestLocation;
-
-use GuzzleHttp\Command\Guzzle\Parameter;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Post\PostBodyInterface;
-use GuzzleHttp\Post\PostFileInterface;
-use GuzzleHttp\Post\PostFile;
-use GuzzleHttp\Command\CommandInterface;
-
-/**
- * Adds POST files to a request
- */
-class PostFileLocation extends AbstractLocation
-{
-    public function visit(
-        CommandInterface $command,
-        RequestInterface $request,
-        Parameter $param,
-        array $context
-    ) {
-        $body = $request->getBody();
-        if (!($body instanceof PostBodyInterface)) {
-            throw new \RuntimeException('Must be a POST body interface');
-        }
-
-        $value = $param->filter($command[$param->getName()]);
-        if (!($value instanceof PostFileInterface)) {
-            $value = new PostFile($param->getWireName(), $value);
-        }
-
-        $body->addFile($value);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/RequestLocation/QueryLocation.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/RequestLocation/QueryLocation.php
deleted file mode 100644
index bdcb74d583..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/RequestLocation/QueryLocation.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Guzzle\RequestLocation;
-
-use GuzzleHttp\Command\Guzzle\Parameter;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Command\Guzzle\Operation;
-use GuzzleHttp\Command\CommandInterface;
-
-/**
- * Adds query string values to requests
- */
-class QueryLocation extends AbstractLocation
-{
-    public function visit(
-        CommandInterface $command,
-        RequestInterface $request,
-        Parameter $param,
-        array $context
-    ) {
-        $request->getQuery()[$param->getWireName()] = $this->prepareValue(
-            $command[$param->getName()],
-            $param
-        );
-    }
-
-    public function after(
-        CommandInterface $command,
-        RequestInterface $request,
-        Operation $operation,
-        array $context
-    ) {
-        $additional = $operation->getAdditionalParameters();
-        if ($additional && $additional->getLocation() == $this->locationName) {
-            foreach ($command->toArray() as $key => $value) {
-                if (!$operation->hasParam($key)) {
-                    $request->getQuery()[$key] = $this->prepareValue(
-                        $value,
-                        $additional
-                    );
-                }
-            }
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/RequestLocation/RequestLocationInterface.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/RequestLocation/RequestLocationInterface.php
deleted file mode 100644
index 8f98228ec0..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/RequestLocation/RequestLocationInterface.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace GuzzleHttp\Command\Guzzle\RequestLocation;
-
-use GuzzleHttp\Command\Guzzle\Operation;
-use GuzzleHttp\Command\Guzzle\Parameter;
-use GuzzleHttp\Command\CommandInterface;
-use GuzzleHttp\Message\RequestInterface;
-
-/**
- * Handles locations specified in a service description
- */
-interface RequestLocationInterface
-{
-    /**
-     * Visits a location for each top-level parameter
-     *
-     * @param CommandInterface $command Command being prepared
-     * @param RequestInterface $request Request being modified
-     * @param Parameter        $param   Parameter being visited
-     * @param array            $context Associative array containing a
-     *     'client' key referencing the client that created the command.
-     */
-    public function visit(
-        CommandInterface $command,
-        RequestInterface $request,
-        Parameter $param,
-        array $context
-    );
-
-    /**
-     * Called when all of the parameters of a command have been visited.
-     *
-     * @param CommandInterface $command   Command being prepared
-     * @param RequestInterface $request   Request being modified
-     * @param Operation        $operation Operation being serialized
-     * @param array            $context   Associative array containing a
-     *     'client' key referencing the client that created the command.
-     */
-    public function after(
-        CommandInterface $command,
-        RequestInterface $request,
-        Operation $operation,
-        array $context
-    );
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/RequestLocation/XmlLocation.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/RequestLocation/XmlLocation.php
deleted file mode 100644
index d61e3b9bd9..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/RequestLocation/XmlLocation.php
+++ /dev/null
@@ -1,300 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Guzzle\RequestLocation;
-
-use GuzzleHttp\Command\Guzzle\Operation;
-use GuzzleHttp\Command\Guzzle\Parameter;
-use GuzzleHttp\Command\CommandInterface;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Stream\Stream;
-
-/**
- * Creates an XML document
- */
-class XmlLocation extends AbstractLocation
-{
-    /** @var \XMLWriter XML writer resource */
-    private $writer;
-
-    /** @var bool Content-Type header added when XML is found */
-    private $contentType;
-
-    /** @var Parameter[] Buffered elements to write */
-    private $buffered = [];
-
-    /**
-     * @param string $locationName Name of the location
-     * @param string $contentType  Set to a non-empty string to add a
-     *     Content-Type header to a request if any XML content is added to the
-     *     body. Pass an empty string to disable the addition of the header.
-     */
-    public function __construct($locationName, $contentType = 'application/xml')
-    {
-        $this->locationName = $locationName;
-        $this->contentType = $contentType;
-        $this->data = new \SplObjectStorage();
-    }
-
-    public function visit(
-        CommandInterface $command,
-        RequestInterface $request,
-        Parameter $param,
-        array $context
-    ) {
-        // Buffer and order the parameters to visit based on if they are
-        // top-level attributes or child nodes.
-        // @link https://github.com/guzzle/guzzle/pull/494
-        if ($param->getData('xmlAttribute')) {
-            array_unshift($this->buffered, $param);
-        } else {
-            $this->buffered[] = $param;
-        }
-    }
-
-    public function after(
-        CommandInterface $command,
-        RequestInterface $request,
-        Operation $operation,
-        array $context
-    ) {
-        foreach ($this->buffered as $param) {
-            $this->visitWithValue(
-                $command[$param->getName()],
-                $param,
-                $operation
-            );
-        }
-
-        $this->buffered = [];
-
-        $additional = $operation->getAdditionalParameters();
-        if ($additional && $additional->getLocation() == $this->locationName) {
-            foreach ($command->toArray() as $key => $value) {
-                if (!$operation->hasParam($key)) {
-                    $additional->setName($key);
-                    $this->visitWithValue($value, $additional, $operation);
-                }
-            }
-            $additional->setName(null);
-        }
-
-        // If data was found that needs to be serialized, then do so
-        $xml = null;
-        if ($this->writer) {
-            $xml = $this->finishDocument($this->writer);
-        } elseif ($operation->getData('xmlAllowEmpty')) {
-            // Check if XML should always be sent for the command
-            $writer = $this->createRootElement($operation);
-            $xml = $this->finishDocument($writer);
-        }
-
-        if ($xml) {
-            $request->setBody(Stream::factory($xml));
-            // Don't overwrite the Content-Type if one is set
-            if ($this->contentType && !$request->hasHeader('Content-Type')) {
-                $request->setHeader('Content-Type', $this->contentType);
-            }
-        }
-
-        $this->writer = null;
-    }
-
-    /**
-     * Create the root XML element to use with a request
-     *
-     * @param Operation $operation Operation object
-     *
-     * @return \XMLWriter
-     */
-    protected function createRootElement(Operation $operation)
-    {
-        static $defaultRoot = ['name' => 'Request'];
-        // If no root element was specified, then just wrap the XML in 'Request'
-        $root = $operation->getData('xmlRoot') ?: $defaultRoot;
-        // Allow the XML declaration to be customized with xmlEncoding
-        $encoding = $operation->getData('xmlEncoding');
-        $writer = $this->startDocument($encoding);
-        $writer->startElement($root['name']);
-
-        // Create the wrapping element with no namespaces if no namespaces were present
-        if (!empty($root['namespaces'])) {
-            // Create the wrapping element with an array of one or more namespaces
-            foreach ((array) $root['namespaces'] as $prefix => $uri) {
-                $nsLabel = 'xmlns';
-                if (!is_numeric($prefix)) {
-                    $nsLabel .= ':'.$prefix;
-                }
-                $writer->writeAttribute($nsLabel, $uri);
-            }
-        }
-
-        return $writer;
-    }
-
-    /**
-     * Recursively build the XML body
-     *
-     * @param \XMLWriter $writer XML to modify
-     * @param Parameter  $param     API Parameter
-     * @param mixed      $value     Value to add
-     */
-    protected function addXml(\XMLWriter $writer, Parameter $param, $value)
-    {
-        $value = $param->filter($value);
-        $type = $param->getType();
-        $name = $param->getWireName();
-        $prefix = null;
-        $namespace = $param->getData('xmlNamespace');
-        if (false !== strpos($name, ':')) {
-            list($prefix, $name) = explode(':', $name, 2);
-        }
-
-        if ($type == 'object' || $type == 'array') {
-            if (!$param->getData('xmlFlattened')) {
-                if ($namespace) {
-                    $writer->startElementNS(null, $name, $namespace);
-                } else {
-                    $writer->startElement($name);
-                }
-            }
-            if ($param->getType() == 'array') {
-                $this->addXmlArray($writer, $param, $value);
-            } elseif ($param->getType() == 'object') {
-                $this->addXmlObject($writer, $param, $value);
-            }
-            if (!$param->getData('xmlFlattened')) {
-                $writer->endElement();
-            }
-            return;
-        }
-        if ($param->getData('xmlAttribute')) {
-            $this->writeAttribute($writer, $prefix, $name, $namespace, $value);
-        } else {
-            $this->writeElement($writer, $prefix, $name, $namespace, $value);
-        }
-    }
-
-    /**
-     * Write an attribute with namespace if used
-     *
-     * @param  \XMLWriter $writer XMLWriter instance
-     * @param  string     $prefix    Namespace prefix if any
-     * @param  string     $name      Attribute name
-     * @param  string     $namespace The uri of the namespace
-     * @param  string     $value     The attribute content
-     */
-    protected function writeAttribute($writer, $prefix, $name, $namespace, $value)
-    {
-        if ($namespace) {
-            $writer->writeAttributeNS($prefix, $name, $namespace, $value);
-        } else {
-            $writer->writeAttribute($name, $value);
-        }
-    }
-
-    /**
-     * Write an element with namespace if used
-     *
-     * @param  \XMLWriter $writer XML writer resource
-     * @param  string     $prefix    Namespace prefix if any
-     * @param  string     $name      Element name
-     * @param  string     $namespace The uri of the namespace
-     * @param  string     $value     The element content
-     */
-    protected function writeElement(\XMLWriter $writer, $prefix, $name, $namespace, $value)
-    {
-        if ($namespace) {
-            $writer->startElementNS($prefix, $name, $namespace);
-        } else {
-            $writer->startElement($name);
-        }
-        if (strpbrk($value, '<>&')) {
-            $writer->writeCData($value);
-        } else {
-            $writer->writeRaw($value);
-        }
-        $writer->endElement();
-    }
-
-    /**
-     * Create a new xml writer and start a document
-     *
-     * @param  string $encoding document encoding
-     *
-     * @return \XMLWriter the writer resource
-     * @throws \RuntimeException if the document cannot be started
-     */
-    protected function startDocument($encoding)
-    {
-        $this->writer = new \XMLWriter();
-        if (!$this->writer->openMemory()) {
-            throw new \RuntimeException('Unable to open XML document in memory');
-        }
-        if (!$this->writer->startDocument('1.0', $encoding)) {
-            throw new \RuntimeException('Unable to start XML document');
-        }
-
-        return $this->writer;
-    }
-
-    /**
-     * End the document and return the output
-     *
-     * @param \XMLWriter $writer
-     *
-     * @return \string the writer resource
-     */
-    protected function finishDocument($writer)
-    {
-        $writer->endDocument();
-
-        return $writer->outputMemory();
-    }
-
-    /**
-     * Add an array to the XML
-     */
-    protected function addXmlArray(\XMLWriter $writer, Parameter $param, &$value)
-    {
-        if ($items = $param->getItems()) {
-            foreach ($value as $v) {
-                $this->addXml($writer, $items, $v);
-            }
-        }
-    }
-
-    /**
-     * Add an object to the XML
-     */
-    protected function addXmlObject(\XMLWriter $writer, Parameter $param, &$value)
-    {
-        $noAttributes = [];
-
-        // add values which have attributes
-        foreach ($value as $name => $v) {
-            if ($property = $param->getProperty($name)) {
-                if ($property->getData('xmlAttribute')) {
-                    $this->addXml($writer, $property, $v);
-                } else {
-                    $noAttributes[] = ['value' => $v, 'property' => $property];
-                }
-            }
-        }
-
-        // now add values with no attributes
-        foreach ($noAttributes as $element) {
-            $this->addXml($writer, $element['property'], $element['value']);
-        }
-    }
-
-    private function visitWithValue(
-        $value,
-        Parameter $param,
-        Operation $operation
-    ) {
-        if (!$this->writer) {
-            $this->createRootElement($operation);
-        }
-
-        $this->addXml($this->writer, $param, $value);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/ResponseLocation/AbstractLocation.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/ResponseLocation/AbstractLocation.php
deleted file mode 100644
index e985ec9aac..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/ResponseLocation/AbstractLocation.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Guzzle\ResponseLocation;
-
-use GuzzleHttp\Command\Guzzle\Parameter;
-use GuzzleHttp\Message\ResponseInterface;
-use GuzzleHttp\Command\CommandInterface;
-
-abstract class AbstractLocation implements ResponseLocationInterface
-{
-    /** @var string */
-    protected $locationName;
-
-    /**
-     * Set the name of the location
-     *
-     * @param $locationName
-     */
-    public function __construct($locationName)
-    {
-        $this->locationName = $locationName;
-    }
-
-    public function before(
-        CommandInterface $command,
-        ResponseInterface $response,
-        Parameter $model,
-        &$result,
-        array $context = []
-    ) {}
-
-    public function after(
-        CommandInterface $command,
-        ResponseInterface $response,
-        Parameter $model,
-        &$result,
-        array $context = []
-    ) {}
-
-    public function visit(
-        CommandInterface $command,
-        ResponseInterface $response,
-        Parameter $param,
-        &$result,
-        array $context = []
-    ) {}
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/ResponseLocation/BodyLocation.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/ResponseLocation/BodyLocation.php
deleted file mode 100644
index d88888b5f0..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/ResponseLocation/BodyLocation.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Guzzle\ResponseLocation;
-
-use GuzzleHttp\Command\Guzzle\Parameter;
-use GuzzleHttp\Message\ResponseInterface;
-use GuzzleHttp\Command\CommandInterface;
-
-/**
- * Extracts the body of a response into a result field
- */
-class BodyLocation extends AbstractLocation
-{
-    public function visit(
-        CommandInterface $command,
-        ResponseInterface $response,
-        Parameter $param,
-        &$result,
-        array $context = []
-    ) {
-        $result[$param->getName()] = $param->filter($response->getBody());
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/ResponseLocation/HeaderLocation.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/ResponseLocation/HeaderLocation.php
deleted file mode 100644
index df230dc7fc..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/ResponseLocation/HeaderLocation.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Guzzle\ResponseLocation;
-
-use GuzzleHttp\Command\Guzzle\Parameter;
-use GuzzleHttp\Message\ResponseInterface;
-use GuzzleHttp\Command\CommandInterface;
-
-/**
- * Extracts headers from the response into a result fields
- */
-class HeaderLocation extends AbstractLocation
-{
-    public function visit(
-        CommandInterface $command,
-        ResponseInterface $response,
-        Parameter $param,
-        &$result,
-        array $context = []
-    ) {
-        // Retrieving a single header by name
-        $name = $param->getName();
-        if ($header = $response->getHeader($param->getWireName())) {
-            $result[$name] = $param->filter($header);
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/ResponseLocation/JsonLocation.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/ResponseLocation/JsonLocation.php
deleted file mode 100644
index fa620417d9..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/ResponseLocation/JsonLocation.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Guzzle\ResponseLocation;
-
-use GuzzleHttp\Command\Guzzle\Parameter;
-use GuzzleHttp\Message\ResponseInterface;
-use GuzzleHttp\Command\CommandInterface;
-
-/**
- * Extracts elements from a JSON document.
- */
-class JsonLocation extends AbstractLocation
-{
-    /** @var array The JSON document being visited */
-    private $json = [];
-
-    public function before(
-        CommandInterface $command,
-        ResponseInterface $response,
-        Parameter $model,
-        &$result,
-        array $context = []
-    ) {
-        $this->json = $response->json() ?: [];
-        // relocate named arrays, so that they have the same structure as
-        //  arrays nested in objects and visit can work on them in the same way
-        if ($model->getType() == 'array' && ($name = $model->getName())) {
-            $this->json = [$name => $this->json];
-        }
-    }
-
-    public function after(
-        CommandInterface $command,
-        ResponseInterface $response,
-        Parameter $model,
-        &$result,
-        array $context = []
-    ) {
-        // Handle additional, undefined properties
-        $additional = $model->getAdditionalProperties();
-        if (!($additional instanceof Parameter)) {
-            return;
-        }
-
-        // Use the model location as the default if one is not set on additional
-        $addLocation = $additional->getLocation() ?: $model->getLocation();
-        if ($addLocation == $this->locationName) {
-            foreach ($this->json as $prop => $val) {
-                if (!isset($result[$prop])) {
-                    // Only recurse if there is a type specified
-                    $result[$prop] = $additional->getType()
-                        ? $this->recurse($additional, $val)
-                        : $val;
-                }
-            }
-        }
-
-        $this->json = [];
-    }
-
-    public function visit(
-        CommandInterface $command,
-        ResponseInterface $response,
-        Parameter $param,
-        &$result,
-        array $context = []
-    ) {
-        $name = $param->getName();
-        $key = $param->getWireName();
-
-        // Check if the result should be treated as a list
-        if ($param->getType() == 'array') {
-            // Treat as javascript array
-            if ($name) {
-                // name provided, store it under a key in the array
-                $result[$name] = $this->recurse($param, $this->json[$name]);
-            } else {
-                // top-level `array` or an empty name
-                $result = array_merge($result, $this->recurse($param, $this->json));
-            }
-        } elseif (isset($this->json[$key])) {
-            $result[$name] = $this->recurse($param, $this->json[$key]);
-        }
-    }
-
-    /**
-     * Recursively process a parameter while applying filters
-     *
-     * @param Parameter $param API parameter being validated
-     * @param mixed     $value Value to process.
-     * @return mixed|null
-     */
-    private function recurse(Parameter $param, $value)
-    {
-        if (!is_array($value)) {
-            return $param->filter($value);
-        }
-
-        $result = [];
-        $type = $param->getType();
-
-        if ($type == 'array') {
-            $items = $param->getItems();
-            foreach ($value as $val) {
-                $result[] = $this->recurse($items, $val);
-            }
-        } elseif ($type == 'object' && !isset($value[0])) {
-            // On the above line, we ensure that the array is associative and
-            // not numerically indexed
-            if ($properties = $param->getProperties()) {
-                foreach ($properties as $property) {
-                    $key = $property->getWireName();
-                    if (isset($value[$key])) {
-                        $result[$property->getName()] = $this->recurse(
-                            $property,
-                            $value[$key]
-                        );
-                        // Remove from the value so that AP can later be handled
-                        unset($value[$key]);
-                    }
-                }
-            }
-            // Only check additional properties if everything wasn't already
-            // handled
-            if ($value) {
-                $additional = $param->getAdditionalProperties();
-                if ($additional === null || $additional === true) {
-                    // Merge the JSON under the resulting array
-                    $result += $value;
-                } elseif ($additional instanceof Parameter) {
-                    // Process all child elements according to the given schema
-                    foreach ($value as $prop => $val) {
-                        $result[$prop] = $this->recurse($additional, $val);
-                    }
-                }
-            }
-        }
-
-        return $param->filter($result);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/ResponseLocation/ReasonPhraseLocation.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/ResponseLocation/ReasonPhraseLocation.php
deleted file mode 100644
index 9c4323bdca..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/ResponseLocation/ReasonPhraseLocation.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Guzzle\ResponseLocation;
-
-use GuzzleHttp\Command\Guzzle\Parameter;
-use GuzzleHttp\Message\ResponseInterface;
-use GuzzleHttp\Command\CommandInterface;
-
-/**
- * Extracts the reason phrase of a response into a result field
- */
-class ReasonPhraseLocation extends AbstractLocation
-{
-    public function visit(
-        CommandInterface $command,
-        ResponseInterface $response,
-        Parameter $param,
-        &$result,
-        array $context = []
-    ) {
-        $result[$param->getName()] = $param->filter(
-            $response->getReasonPhrase()
-        );
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/ResponseLocation/ResponseLocationInterface.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/ResponseLocation/ResponseLocationInterface.php
deleted file mode 100644
index b41b94643c..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/ResponseLocation/ResponseLocationInterface.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Guzzle\ResponseLocation;
-
-use GuzzleHttp\Command\Guzzle\Parameter;
-use GuzzleHttp\Message\ResponseInterface;
-use GuzzleHttp\Command\CommandInterface;
-
-/**
- * Location visitor used to parse values out of a response into an associative
- * array
- */
-interface ResponseLocationInterface
-{
-    /**
-     * Called before visiting all parameters. This can be used for seeding the
-     * result of a command with default data (e.g. populating with JSON data in
-     * the response then adding to the parsed data).
-     *
-     * @param CommandInterface  $command  Command being visited
-     * @param ResponseInterface $response Response being visited
-     * @param Parameter         $model    Response model
-     * @param mixed             $result   Result associative array value
-     *                                    being updated by reference.
-     * @param array             $context  Parsing context
-     */
-    public function before(
-        CommandInterface $command,
-        ResponseInterface $response,
-        Parameter $model,
-        &$result,
-        array $context = []
-    );
-
-    /**
-     * Called after visiting all parameters
-     *
-     * @param CommandInterface  $command  Command being visited
-     * @param ResponseInterface $response Response being visited
-     * @param Parameter         $model    Response model
-     * @param mixed             $result   Result associative array value
-     *                                    being updated by reference.
-     * @param array             $context  Parsing context
-     */
-    public function after(
-        CommandInterface $command,
-        ResponseInterface $response,
-        Parameter $model,
-        &$result,
-        array $context = []
-    );
-
-    /**
-     * Called once for each parameter being visited that matches the location
-     * type.
-     *
-     * @param CommandInterface  $command  Command being visited
-     * @param ResponseInterface $response Response being visited
-     * @param Parameter         $param    Parameter being visited
-     * @param mixed             $result   Result associative array value
-     *                                    being updated by reference.
-     * @param array             $context  Parsing context
-     */
-    public function visit(
-        CommandInterface $command,
-        ResponseInterface $response,
-        Parameter $param,
-        &$result,
-        array $context = []
-    );
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/ResponseLocation/StatusCodeLocation.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/ResponseLocation/StatusCodeLocation.php
deleted file mode 100644
index d403885f2e..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/ResponseLocation/StatusCodeLocation.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Guzzle\ResponseLocation;
-
-use GuzzleHttp\Command\Guzzle\Parameter;
-use GuzzleHttp\Message\ResponseInterface;
-use GuzzleHttp\Command\CommandInterface;
-
-/**
- * Extracts the status code of a response into a result field
- */
-class StatusCodeLocation extends AbstractLocation
-{
-    public function visit(
-        CommandInterface $command,
-        ResponseInterface $response,
-        Parameter $param,
-        &$result,
-        array $context = []
-    ) {
-        $result[$param->getName()] = $param->filter($response->getStatusCode());
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/ResponseLocation/XmlLocation.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/ResponseLocation/XmlLocation.php
deleted file mode 100644
index b9a58c5b7c..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/ResponseLocation/XmlLocation.php
+++ /dev/null
@@ -1,269 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Guzzle\ResponseLocation;
-
-use GuzzleHttp\Command\Guzzle\Parameter;
-use GuzzleHttp\Message\ResponseInterface;
-use GuzzleHttp\Command\CommandInterface;
-
-/**
- * Extracts elements from an XML document
- */
-class XmlLocation extends AbstractLocation
-{
-    /** @var \SimpleXMLElement XML document being visited */
-    private $xml;
-
-    public function before(
-        CommandInterface $command,
-        ResponseInterface $response,
-        Parameter $model,
-        &$result,
-        array $context = []
-    ) {
-        $this->xml = $response->xml();
-    }
-
-    public function after(
-        CommandInterface $command,
-        ResponseInterface $response,
-        Parameter $model,
-        &$result,
-        array $context = []
-    ) {
-        // Handle additional, undefined properties
-        $additional = $model->getAdditionalProperties();
-        if ($additional instanceof Parameter &&
-            $additional->getLocation() == $this->locationName
-        ) {
-            $result += self::xmlToArray($this->xml);
-        }
-
-        $this->xml = null;
-    }
-
-    public function visit(
-        CommandInterface $command,
-        ResponseInterface $response,
-        Parameter $param,
-        &$result,
-        array $context = []
-    ) {
-        $sentAs = $param->getWireName();
-        $ns = null;
-        if (strstr($sentAs, ':')) {
-            list($ns, $sentAs) = explode(':', $sentAs);
-        }
-
-        // Process the primary property
-        if (count($this->xml->children($ns, true)->{$sentAs})) {
-            $result[$param->getName()] = $this->recursiveProcess(
-                $param,
-                $this->xml->children($ns, true)->{$sentAs}
-            );
-        }
-    }
-
-    /**
-     * Recursively process a parameter while applying filters
-     *
-     * @param Parameter         $param API parameter being processed
-     * @param \SimpleXMLElement $node  Node being processed
-     * @return array
-     */
-    private function recursiveProcess(
-        Parameter $param,
-        \SimpleXMLElement $node
-    ) {
-        $result = [];
-        $type = $param->getType();
-
-        if ($type == 'object') {
-            $result = $this->processObject($param, $node);
-        } elseif ($type == 'array') {
-            $result = $this->processArray($param, $node);
-        } else {
-            // We are probably handling a flat data node (i.e. string or
-            // integer), so let's check if it's childless, which indicates a
-            // node containing plain text.
-            if ($node->children()->count() == 0) {
-                // Retrieve text from node
-                $result = (string) $node;
-            }
-        }
-
-        // Filter out the value
-        if (isset($result)) {
-            $result = $param->filter($result);
-        }
-
-        return $result;
-    }
-
-    private function processArray(Parameter $param, \SimpleXMLElement $node)
-    {
-        // Cast to an array if the value was a string, but should be an array
-        $items = $param->getItems();
-        $sentAs = $items->getWireName();
-        $result = [];
-        $ns = null;
-
-        if (strstr($sentAs, ':')) {
-            // Get namespace from the wire name
-            list($ns, $sentAs) = explode(':', $sentAs);
-        } else {
-            // Get namespace from data
-            $ns = $items->getData('xmlNs');
-        }
-
-        if ($sentAs === null) {
-            // A general collection of nodes
-            foreach ($node as $child) {
-                $result[] = $this->recursiveProcess($items, $child);
-            }
-        } else {
-            // A collection of named, repeating nodes
-            // (i.e. <collection><foo></foo><foo></foo></collection>)
-            $children = $node->children($ns, true)->{$sentAs};
-            foreach ($children as $child) {
-                $result[] = $this->recursiveProcess($items, $child);
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Process an object
-     *
-     * @param Parameter         $param API parameter being parsed
-     * @param \SimpleXMLElement $node  Value to process
-     * @return array
-     */
-    private function processObject(Parameter $param, \SimpleXMLElement $node)
-    {
-        $result = $knownProps = $knownAttributes = [];
-
-        // Handle known properties
-        if ($properties = $param->getProperties()) {
-            foreach ($properties as $property) {
-                $name = $property->getName();
-                $sentAs = $property->getWireName();
-                $knownProps[$sentAs] = 1;
-                if (strpos($sentAs, ':')) {
-                    list($ns, $sentAs) = explode(':', $sentAs);
-                } else {
-                    $ns = $property->getData('xmlNs');
-                }
-
-                if ($property->getData('xmlAttribute')) {
-                    // Handle XML attributes
-                    $result[$name] = (string) $node->attributes($ns, true)->{$sentAs};
-                    $knownAttributes[$sentAs] = 1;
-                } elseif (count($node->children($ns, true)->{$sentAs})) {
-                    // Found a child node matching wire name
-                    $childNode = $node->children($ns, true)->{$sentAs};
-                    $result[$name] = $this->recursiveProcess(
-                        $property,
-                        $childNode
-                    );
-                }
-            }
-        }
-
-        // Handle additional, undefined properties
-        $additional = $param->getAdditionalProperties();
-        if ($additional instanceof Parameter) {
-            // Process all child elements according to the given schema
-            foreach ($node->children($additional->getData('xmlNs'), true) as $childNode) {
-                $sentAs = $childNode->getName();
-                if (!isset($knownProps[$sentAs])) {
-                    $result[$sentAs] = $this->recursiveProcess(
-                        $additional,
-                        $childNode
-                    );
-                }
-            }
-        } elseif ($additional === null || $additional === true) {
-            // Blindly transform the XML into an array preserving as much data
-            // as possible. Remove processed, aliased properties.
-            $array = array_diff_key(static::xmlToArray($node), $knownProps);
-            // Remove @attributes that were explicitly plucked from the
-            // attributes list.
-            if (isset($array['@attributes']) && $knownAttributes) {
-                $array['@attributes'] = array_diff_key($array['@attributes'], $knownProps);
-                if (!$array['@attributes']) {
-                    unset($array['@attributes']);
-                }
-            }
-
-            // Merge it together with the original result
-            $result = array_merge($array, $result);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Convert an XML document to an array.
-     *
-     * @param \SimpleXMLElement $xml
-     * @param int               $nesting
-     * @param null              $ns
-     *
-     * @return array
-     */
-    private static function xmlToArray(
-        \SimpleXMLElement $xml,
-        $ns = null,
-        $nesting = 0
-    ) {
-        $result = [];
-        $children = $xml->children($ns, true);
-
-        foreach ($children as $name => $child) {
-            $attributes = (array) $child->attributes($ns, true);
-            if (!isset($result[$name])) {
-                $childArray = static::xmlToArray($child, $ns, $nesting + 1);
-                $result[$name] = $attributes
-                    ? array_merge($attributes, $childArray)
-                    : $childArray;
-                continue;
-            }
-            // A child element with this name exists so we're assuming
-            // that the node contains a list of elements
-            if (!is_array($result[$name])) {
-                $result[$name] = [$result[$name]];
-            }
-            $childArray = static::xmlToArray($child, $ns, $nesting + 1);
-            if ($attributes) {
-                $result[$name][] = array_merge($attributes, $childArray);
-            } else {
-                $result[$name][] = $childArray;
-            }
-        }
-
-        // Extract text from node
-        $text = trim((string) $xml);
-        if ($text === '') {
-            $text = null;
-        }
-
-        // Process attributes
-        $attributes = (array) $xml->attributes($ns, true);
-        if ($attributes) {
-            if ($text !== null) {
-                $result['value'] = $text;
-            }
-            $result = array_merge($attributes, $result);
-        } elseif ($text !== null) {
-            $result = $text;
-        }
-
-        // Make sure we're always returning an array
-        if ($nesting == 0 && !is_array($result)) {
-            $result = [$result];
-        }
-
-        return $result;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/SchemaFormatter.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/SchemaFormatter.php
deleted file mode 100644
index 33280a6c69..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/SchemaFormatter.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Guzzle;
-
-/**
- * JSON Schema formatter class
- */
-class SchemaFormatter
-{
-    /**
-     * Format a value by a registered format name
-     *
-     * @param string $format Registered format used to format the value
-     * @param mixed  $value  Value being formatted
-     *
-     * @return mixed
-     */
-    public function format($format, $value)
-    {
-        switch ($format) {
-            case 'date-time':
-                return $this->formatDateTime($value);
-            case 'date-time-http':
-                return $this->formatDateTimeHttp($value);
-            case 'date':
-                return $this->formatDate($value);
-            case 'time':
-                return $this->formatTime($value);
-            case 'timestamp':
-                return $this->formatTimestamp($value);
-            case 'boolean-string':
-                return $this->formatBooleanAsString($value);
-            default:
-                return $value;
-        }
-    }
-
-    /**
-     * Perform the actual DateTime formatting
-     *
-     * @param int|string|\DateTime $dateTime Date time value
-     * @param string               $format   Format of the result
-     *
-     * @return string
-     * @throws \InvalidArgumentException
-     */
-    protected function dateFormatter($dateTime, $format)
-    {
-        if (is_numeric($dateTime)) {
-            return gmdate($format, (int) $dateTime);
-        }
-
-        if (is_string($dateTime)) {
-            $dateTime = new \DateTime($dateTime);
-        }
-
-        if ($dateTime instanceof \DateTime) {
-            static $utc;
-            if (!$utc) {
-                $utc = new \DateTimeZone('UTC');
-            }
-            return $dateTime->setTimezone($utc)->format($format);
-        }
-
-        throw new \InvalidArgumentException('Date/Time values must be either '
-            . 'be a string, integer, or DateTime object');
-    }
-
-    /**
-     * Create a ISO 8601 (YYYY-MM-DDThh:mm:ssZ) formatted date time value in
-     * UTC time.
-     *
-     * @param string|integer|\DateTime $value Date time value
-     *
-     * @return string
-     */
-    private function formatDateTime($value)
-    {
-        return $this->dateFormatter($value, 'Y-m-d\TH:i:s\Z');
-    }
-
-    /**
-     * Create an HTTP date (RFC 1123 / RFC 822) formatted UTC date-time string
-     *
-     * @param string|integer|\DateTime $value Date time value
-     *
-     * @return string
-     */
-    private function formatDateTimeHttp($value)
-    {
-        return $this->dateFormatter($value, 'D, d M Y H:i:s \G\M\T');
-    }
-
-    /**
-     * Create a YYYY-MM-DD formatted string
-     *
-     * @param string|integer|\DateTime $value Date time value
-     *
-     * @return string
-     */
-    private function formatDate($value)
-    {
-        return $this->dateFormatter($value, 'Y-m-d');
-    }
-
-    /**
-     * Create a hh:mm:ss formatted string
-     *
-     * @param string|integer|\DateTime $value Date time value
-     *
-     * @return string
-     */
-    private function formatTime($value)
-    {
-        return $this->dateFormatter($value, 'H:i:s');
-    }
-
-    /**
-     * Formats a boolean value as a string
-     *
-     * @param string|integer|bool $value Value to convert to a boolean
-     *                                   'true' / 'false' value
-     *
-     * @return string
-     */
-    private function formatBooleanAsString($value)
-    {
-        return filter_var($value, FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false';
-    }
-
-    /**
-     * Return a UNIX timestamp in the UTC timezone
-     *
-     * @param string|integer|\DateTime $value Time value
-     *
-     * @return int
-     */
-    private function formatTimestamp($value)
-    {
-        return (int) $this->dateFormatter($value, 'U');
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/SchemaValidator.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/SchemaValidator.php
deleted file mode 100644
index 88e0420afe..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/SchemaValidator.php
+++ /dev/null
@@ -1,296 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Guzzle;
-
-use GuzzleHttp\ToArrayInterface;
-
-/**
- * Default parameter validator
- */
-class SchemaValidator
-{
-    /**
-     * Whether or not integers are converted to strings when an integer is
-     * received for a string input
-     *
-     * @var bool
-     */
-    protected $castIntegerToStringType;
-
-    /** @var array Errors encountered while validating */
-    protected $errors;
-
-    /**
-     * @param bool $castIntegerToStringType Set to true to convert integers
-     *     into strings when a required type is a string and the input value is
-     *     an integer. Defaults to true.
-     */
-    public function __construct($castIntegerToStringType = true)
-    {
-        $this->castIntegerToStringType = $castIntegerToStringType;
-    }
-
-    public function validate(Parameter $param, &$value)
-    {
-        $this->errors = [];
-        $this->recursiveProcess($param, $value);
-
-        if (empty($this->errors)) {
-            return true;
-        } else {
-            sort($this->errors);
-            return false;
-        }
-    }
-
-    /**
-     * Get the errors encountered while validating
-     *
-     * @return array
-     */
-    public function getErrors()
-    {
-        return $this->errors ?: [];
-    }
-
-    /**
-     * From the allowable types, determine the type that the variable matches
-     *
-     * @param string $type  Parameter type
-     * @param mixed  $value Value to determine the type
-     *
-     * @return string|bool Returns the matching type on
-     */
-    protected function determineType($type, $value)
-    {
-        foreach ((array) $type as $t) {
-            if ($t == 'string'
-                && (is_string($value) || (is_object($value) && method_exists($value, '__toString')))
-            ) {
-                return 'string';
-            } elseif ($t == 'object' && (is_array($value) || is_object($value))) {
-                return 'object';
-            } elseif ($t == 'array' && is_array($value)) {
-                return 'array';
-            } elseif ($t == 'integer' && is_integer($value)) {
-                return 'integer';
-            } elseif ($t == 'boolean' && is_bool($value)) {
-                return 'boolean';
-            } elseif ($t == 'number' && is_numeric($value)) {
-                return 'number';
-            } elseif ($t == 'numeric' && is_numeric($value)) {
-                return 'numeric';
-            } elseif ($t == 'null' && !$value) {
-                return 'null';
-            } elseif ($t == 'any') {
-                return 'any';
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Recursively validate a parameter
-     *
-     * @param Parameter $param  API parameter being validated
-     * @param mixed     $value  Value to validate and validate. The value may
-     *                          change during this validate.
-     * @param string    $path   Current validation path (used for error reporting)
-     * @param int       $depth  Current depth in the validation validate
-     *
-     * @return bool Returns true if valid, or false if invalid
-     */
-    protected function recursiveProcess(
-        Parameter $param,
-        &$value,
-        $path = '',
-        $depth = 0
-    ) {
-        // Update the value by adding default or static values
-        $value = $param->getValue($value);
-
-        $required = $param->getRequired();
-        // if the value is null and the parameter is not required or is static,
-        // then skip any further recursion
-        if ((null === $value && !$required) || $param->getStatic()) {
-            return true;
-        }
-
-        $type = $param->getType();
-        // Attempt to limit the number of times is_array is called by tracking
-        // if the value is an array
-        $valueIsArray = is_array($value);
-        // If a name is set then update the path so that validation messages
-        // are more helpful
-        if ($name = $param->getName()) {
-            $path .= "[{$name}]";
-        }
-
-        if ($type == 'object') {
-
-            // Determine whether or not this "value" has properties and should
-            // be traversed
-            $traverse = $temporaryValue = false;
-
-            // Convert the value to an array
-            if (!$valueIsArray && $value instanceof ToArrayInterface) {
-                $value = $value->toArray();
-            }
-
-            if ($valueIsArray) {
-                // Ensure that the array is associative and not numerically
-                // indexed
-                if (isset($value[0])) {
-                    $this->errors[] = "{$path} must be an array of properties. Got a numerically indexed array.";
-                    return false;
-                }
-                $traverse = true;
-            } elseif ($value === null) {
-                // Attempt to let the contents be built up by default values if
-                // possible
-                $value = [];
-                $temporaryValue = $valueIsArray = $traverse = true;
-            }
-
-            if ($traverse) {
-
-                if ($properties = $param->getProperties()) {
-                    // if properties were found, validate each property
-                    foreach ($properties as $property) {
-                        $name = $property->getName();
-                        if (isset($value[$name])) {
-                            $this->recursiveProcess($property, $value[$name], $path, $depth + 1);
-                        } else {
-                            $current = null;
-                            $this->recursiveProcess($property, $current, $path, $depth + 1);
-                            // Only set the value if it was populated
-                            if (null !== $current) {
-                                $value[$name] = $current;
-                            }
-                        }
-                    }
-                }
-
-                $additional = $param->getAdditionalProperties();
-                if ($additional !== true) {
-                    // If additional properties were found, then validate each
-                    // against the additionalProperties attr.
-                    $keys = array_keys($value);
-                    // Determine the keys that were specified that were not
-                    // listed in the properties of the schema
-                    $diff = array_diff($keys, array_keys($properties));
-                    if (!empty($diff)) {
-                        // Determine which keys are not in the properties
-                        if ($additional instanceOf Parameter) {
-                            foreach ($diff as $key) {
-                                $this->recursiveProcess($additional, $value[$key], "{$path}[{$key}]", $depth);
-                            }
-                        } else {
-                            // if additionalProperties is set to false and there
-                            // are additionalProperties in the values, then fail
-                            foreach ($diff as $prop) {
-                                $this->errors[] = sprintf('%s[%s] is not an allowed property', $path, $prop);
-                            }
-                        }
-                    }
-                }
-
-                // A temporary value will be used to traverse elements that
-                // have no corresponding input value. This allows nested
-                // required parameters with default values to bubble up into the
-                // input. Here we check if we used a temp value and nothing
-                // bubbled up, then we need to remote the value.
-                if ($temporaryValue && empty($value)) {
-                    $value = null;
-                    $valueIsArray = false;
-                }
-            }
-
-        } elseif ($type == 'array' && $valueIsArray && $param->getItems()) {
-            foreach ($value as $i => &$item) {
-                // Validate each item in an array against the items attribute of the schema
-                $this->recursiveProcess($param->getItems(), $item, $path . "[{$i}]", $depth + 1);
-            }
-        }
-
-        // If the value is required and the type is not null, then there is an
-        // error if the value is not set
-        if ($required && $value === null && $type != 'null') {
-            $message = "{$path} is " . ($param->getType()
-                ? ('a required ' . implode(' or ', (array) $param->getType()))
-                : 'required');
-            if ($param->getDescription()) {
-                $message .= ': ' . $param->getDescription();
-            }
-            $this->errors[] = $message;
-            return false;
-        }
-
-        // Validate that the type is correct. If the type is string but an
-        // integer was passed, the class can be instructed to cast the integer
-        // to a string to pass validation. This is the default behavior.
-        if ($type && (!$type = $this->determineType($type, $value))) {
-            if ($this->castIntegerToStringType
-                && $param->getType() == 'string'
-                && is_integer($value)
-            ) {
-                $value = (string) $value;
-            } else {
-                $this->errors[] = "{$path} must be of type " . implode(' or ', (array) $param->getType());
-            }
-        }
-
-        // Perform type specific validation for strings, arrays, and integers
-        if ($type == 'string') {
-
-            // Strings can have enums which are a list of predefined values
-            if (($enum = $param->getEnum()) && !in_array($value, $enum)) {
-                $this->errors[] = "{$path} must be one of " . implode(' or ', array_map(function ($s) {
-                        return '"' . addslashes($s) . '"';
-                    }, $enum));
-            }
-            // Strings can have a regex pattern that the value must match
-            if (($pattern  = $param->getPattern()) && !preg_match($pattern, $value)) {
-                $this->errors[] = "{$path} must match the following regular expression: {$pattern}";
-            }
-
-            $strLen = null;
-            if ($min = $param->getMinLength()) {
-                $strLen = strlen($value);
-                if ($strLen < $min) {
-                    $this->errors[] = "{$path} length must be greater than or equal to {$min}";
-                }
-            }
-            if ($max = $param->getMaxLength()) {
-                if (($strLen ?: strlen($value)) > $max) {
-                    $this->errors[] = "{$path} length must be less than or equal to {$max}";
-                }
-            }
-
-        } elseif ($type == 'array') {
-
-            $size = null;
-            if ($min = $param->getMinItems()) {
-                $size = count($value);
-                if ($size < $min) {
-                    $this->errors[] = "{$path} must contain {$min} or more elements";
-                }
-            }
-            if ($max = $param->getMaxItems()) {
-                if (($size ?: count($value)) > $max) {
-                    $this->errors[] = "{$path} must contain {$max} or fewer elements";
-                }
-            }
-
-        } elseif ($type == 'integer' || $type == 'number' || $type == 'numeric') {
-            if (($min = $param->getMinimum()) && $value < $min) {
-                $this->errors[] = "{$path} must be greater than or equal to {$min}";
-            }
-            if (($max = $param->getMaximum()) && $value > $max) {
-                $this->errors[] = "{$path} must be less than or equal to {$max}";
-            }
-        }
-
-        return empty($this->errors);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/Serializer.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/Serializer.php
deleted file mode 100644
index 7986bda819..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/Serializer.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Guzzle;
-
-use GuzzleHttp\Command\ServiceClientInterface;
-use GuzzleHttp\Command\CommandInterface;
-use GuzzleHttp\Command\CommandTransaction;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Command\Guzzle\RequestLocation\BodyLocation;
-use GuzzleHttp\Command\Guzzle\RequestLocation\HeaderLocation;
-use GuzzleHttp\Command\Guzzle\RequestLocation\JsonLocation;
-use GuzzleHttp\Command\Guzzle\RequestLocation\PostFieldLocation;
-use GuzzleHttp\Command\Guzzle\RequestLocation\PostFileLocation;
-use GuzzleHttp\Command\Guzzle\RequestLocation\QueryLocation;
-use GuzzleHttp\Command\Guzzle\RequestLocation\XmlLocation;
-use GuzzleHttp\Command\Guzzle\RequestLocation\RequestLocationInterface;
-use GuzzleHttp\Utils;
-
-/**
- * Serializes requests for a given command.
- */
-class Serializer
-{
-    /** @var RequestLocationInterface[] */
-    private $requestLocations;
-
-    /** @var DescriptionInterface */
-    private $description;
-
-    /**
-     * @param DescriptionInterface       $description
-     * @param RequestLocationInterface[] $requestLocations Extra request locations
-     */
-    public function __construct(
-        DescriptionInterface $description,
-        array $requestLocations = []
-    ) {
-        static $defaultRequestLocations;
-        if (!$defaultRequestLocations) {
-            $defaultRequestLocations = [
-                'body'      => new BodyLocation('body'),
-                'query'     => new QueryLocation('query'),
-                'header'    => new HeaderLocation('header'),
-                'json'      => new JsonLocation('json'),
-                'xml'       => new XmlLocation('xml'),
-                'postField' => new PostFieldLocation('postField'),
-                'postFile'  => new PostFileLocation('postFile')
-            ];
-        }
-
-        $this->requestLocations = $requestLocations + $defaultRequestLocations;
-        $this->description = $description;
-    }
-
-    public function __invoke(CommandTransaction $trans)
-    {
-        $request = $this->createRequest($trans);
-        $this->prepareRequest($trans, $request);
-
-        return $request;
-    }
-
-    /**
-     * Prepares a request for sending using location visitors
-     *
-     * @param CommandTransaction $trans
-     * @param RequestInterface       $request Request being created
-     * @throws \RuntimeException If a location cannot be handled
-     */
-    protected function prepareRequest(
-        CommandTransaction $trans,
-        RequestInterface $request
-    ) {
-        $visitedLocations = [];
-        $context = ['client' => $trans->client, 'command' => $trans->command];
-        $operation = $this->description->getOperation($trans->command->getName());
-
-        // Visit each actual parameter
-        foreach ($operation->getParams() as $name => $param) {
-            /* @var Parameter $param */
-            $location = $param->getLocation();
-            // Skip parameters that have not been set or are URI location
-            if ($location == 'uri' || !$trans->command->hasParam($name)) {
-                continue;
-            }
-            if (!isset($this->requestLocations[$location])) {
-                throw new \RuntimeException("No location registered for $location");
-            }
-            $visitedLocations[$location] = true;
-            $this->requestLocations[$location]->visit(
-                $trans->command,
-                $request,
-                $param,
-                $context
-            );
-        }
-
-        // Ensure that the after() method is invoked for additionalParameters
-        if ($additional = $operation->getAdditionalParameters()) {
-            $visitedLocations[$additional->getLocation()] = true;
-        }
-
-        // Call the after() method for each visited location
-        foreach (array_keys($visitedLocations) as $location) {
-            $this->requestLocations[$location]->after(
-                $trans->command,
-                $request,
-                $operation,
-                $context
-            );
-        }
-    }
-
-    /**
-     * Create a request for the command and operation
-     *
-     * @param CommandTransaction $trans
-     *
-     * @return RequestInterface
-     * @throws \RuntimeException
-     */
-    protected function createRequest(CommandTransaction $trans)
-    {
-        $operation = $this->description->getOperation($trans->command->getName());
-
-        // If the command does not specify a template, then assume the base URL
-        // of the client
-        if (null === ($uri = $operation->getUri())) {
-            return $trans->client->createRequest(
-                $operation->getHttpMethod(),
-                $this->description->getBaseUrl(),
-                $trans->command['request_options'] ?: []
-            );
-        }
-
-        return $this->createCommandWithUri(
-            $operation, $trans->command, $trans->serviceClient
-        );
-    }
-
-    /**
-     * Create a request for an operation with a uri merged onto a base URI
-     */
-    private function createCommandWithUri(
-        Operation $operation,
-        CommandInterface $command,
-        ServiceClientInterface $client
-    ) {
-        // Get the path values and use the client config settings
-        $variables = [];
-        foreach ($operation->getParams() as $name => $arg) {
-            /* @var Parameter $arg */
-            if ($arg->getLocation() == 'uri') {
-                if (isset($command[$name])) {
-                    $variables[$name] = $arg->filter($command[$name]);
-                    if (!is_array($variables[$name])) {
-                        $variables[$name] = (string) $variables[$name];
-                    }
-                }
-            }
-        }
-
-        // Expand the URI template.
-        $uri = Utils::uriTemplate($operation->getUri(), $variables);
-
-        return $client->getHttpClient()->createRequest(
-            $operation->getHttpMethod(),
-            $this->description->getBaseUrl()->combine($uri),
-            $command['request_options'] ?: []
-        );
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/Subscriber/ProcessResponse.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/Subscriber/ProcessResponse.php
deleted file mode 100644
index 3ddf81b89b..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/Subscriber/ProcessResponse.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Guzzle\Subscriber;
-
-use GuzzleHttp\Command\Guzzle\DescriptionInterface;
-use GuzzleHttp\Event\SubscriberInterface;
-use GuzzleHttp\Message\ResponseInterface;
-use GuzzleHttp\Command\Guzzle\Parameter;
-use GuzzleHttp\Command\CommandInterface;
-use GuzzleHttp\Command\Guzzle\ResponseLocation\JsonLocation;
-use GuzzleHttp\Command\Event\ProcessEvent;
-use GuzzleHttp\Command\Guzzle\ResponseLocation\ResponseLocationInterface;
-use GuzzleHttp\Command\Guzzle\ResponseLocation\BodyLocation;
-use GuzzleHttp\Command\Guzzle\ResponseLocation\StatusCodeLocation;
-use GuzzleHttp\Command\Guzzle\ResponseLocation\ReasonPhraseLocation;
-use GuzzleHttp\Command\Guzzle\ResponseLocation\HeaderLocation;
-use GuzzleHttp\Command\Guzzle\ResponseLocation\XmlLocation;
-
-/**
- * Subscriber used to create response models based on an HTTP response and
- * a service description.
- *
- * Response location visitors are registered with this subscriber to handle
- * locations (e.g., 'xml', 'json', 'header'). All of the locations of a response
- * model that will be visited first have their ``before`` method triggered.
- * After the before method is called on every visitor that will be walked, each
- * visitor is triggered using the ``visit()`` method. After all of the visitors
- * are visited, the ``after()`` method is called on each visitor. This is the
- * place in which you should handle things like additionalProperties with
- * custom locations (i.e., this is how it is handled in the JSON visitor).
- */
-class ProcessResponse implements SubscriberInterface
-{
-    /** @var ResponseLocationInterface[] */
-    private $responseLocations;
-
-    /** @var DescriptionInterface */
-    private $description;
-
-    /**
-     * @param DescriptionInterface        $description
-     * @param ResponseLocationInterface[] $responseLocations Extra response locations
-     */
-    public function __construct(
-        DescriptionInterface $description,
-        array $responseLocations = []
-    ) {
-        static $defaultResponseLocations;
-        if (!$defaultResponseLocations) {
-            $defaultResponseLocations = [
-                'body'         => new BodyLocation('body'),
-                'header'       => new HeaderLocation('header'),
-                'reasonPhrase' => new ReasonPhraseLocation('reasonPhrase'),
-                'statusCode'   => new StatusCodeLocation('statusCode'),
-                'xml'          => new XmlLocation('xml'),
-                'json'         => new JsonLocation('json')
-            ];
-        }
-
-        $this->responseLocations = $responseLocations + $defaultResponseLocations;
-        $this->description = $description;
-    }
-
-    public function getEvents()
-    {
-        return ['process' => ['onProcess']];
-    }
-
-    public function onProcess(ProcessEvent $event)
-    {
-        // Only add a result object if no exception was encountered.
-        if ($event->getException()) {
-            return;
-        }
-
-        $command = $event->getCommand();
-
-        // Do not overwrite a previous result
-        if ($event->getResult()) {
-            return;
-        }
-
-        $operation = $this->description->getOperation($command->getName());
-
-        // Add a default Model as the result if no matching schema was found.
-        if (!($modelName = $operation->getResponseModel())) {
-            $event->setResult([]);
-            return;
-        }
-
-        $model = $operation->getServiceDescription()->getModel($modelName);
-        if (!$model) {
-            throw new \RuntimeException("Unknown model: {$modelName}");
-        }
-
-        $event->setResult($this->visit($model, $event));
-    }
-
-    protected function visit(Parameter $model, ProcessEvent $event)
-    {
-        $result = [];
-        $context = ['client' => $event->getClient(), 'visitors' => []];
-        $command = $event->getCommand();
-        $response = $event->getResponse();
-
-        if ($model->getType() == 'object') {
-            $this->visitOuterObject($model, $result, $command, $response, $context);
-        } elseif ($model->getType() == 'array') {
-            $this->visitOuterArray($model, $result, $command, $response, $context);
-        } else {
-            throw new \InvalidArgumentException('Invalid response model: ' . $model->getType());
-        }
-
-        // Call the after() method of each found visitor
-        foreach ($context['visitors'] as $visitor) {
-            $visitor->after($command, $response, $model, $result, $context);
-        }
-
-        return $result;
-    }
-
-    private function triggerBeforeVisitor(
-        $location,
-        Parameter $model,
-        array &$result,
-        CommandInterface $command,
-        ResponseInterface $response,
-        array &$context
-    ) {
-        if (!isset($this->responseLocations[$location])) {
-            throw new \RuntimeException("Unknown location: $location");
-        }
-
-        $context['visitors'][$location] = $this->responseLocations[$location];
-
-        $this->responseLocations[$location]->before(
-            $command,
-            $response,
-            $model,
-            $result,
-            $context
-        );
-    }
-
-    private function visitOuterObject(
-        Parameter $model,
-        array &$result,
-        CommandInterface $command,
-        ResponseInterface $response,
-        array &$context
-    ) {
-        $parentLocation = $model->getLocation();
-
-        // If top-level additionalProperties is a schema, then visit it
-        $additional = $model->getAdditionalProperties();
-        if ($additional instanceof Parameter) {
-            // Use the model location if none set on additionalProperties.
-            $location = $additional->getLocation() ?: $parentLocation;
-            $this->triggerBeforeVisitor(
-                $location, $model, $result, $command, $response, $context
-            );
-        }
-
-        // Use 'location' from all individual defined properties, but fall back
-        // to the model location if no per-property location is set. Collect
-        // the properties that need to be visited into an array.
-        $visitProperties = [];
-        foreach ($model->getProperties() as $schema) {
-            $location = $schema->getLocation() ?: $parentLocation;
-            if ($location) {
-                $visitProperties[] = [$location, $schema];
-                // Trigger the before method on each unique visitor location
-                if (!isset($context['visitors'][$location])) {
-                    $this->triggerBeforeVisitor(
-                        $location, $model, $result, $command, $response, $context
-                    );
-                }
-            }
-        }
-
-        // Actually visit each response element
-        foreach ($visitProperties as $prop) {
-            $this->responseLocations[$prop[0]]->visit(
-                $command, $response, $prop[1], $result, $context
-            );
-        }
-    }
-
-    private function visitOuterArray(
-        Parameter $model,
-        array &$result,
-        CommandInterface $command,
-        ResponseInterface $response,
-        array &$context
-    ) {
-        // Use 'location' defined on the top of the model
-        if (!($location = $model->getLocation())) {
-            return;
-        }
-
-        if (!isset($foundVisitors[$location])) {
-            $this->triggerBeforeVisitor(
-                $location, $model, $result, $command, $response, $context
-            );
-        }
-
-        // Visit each item in the response
-        $this->responseLocations[$location]->visit(
-            $command, $response, $model, $result, $context
-        );
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/Subscriber/ValidateInput.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/Subscriber/ValidateInput.php
deleted file mode 100644
index 8cac3c5605..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle-services/src/Subscriber/ValidateInput.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-namespace GuzzleHttp\Command\Guzzle\Subscriber;
-
-use GuzzleHttp\Command\Guzzle\DescriptionInterface;
-use GuzzleHttp\Event\SubscriberInterface;
-use GuzzleHttp\Command\Exception\CommandException;
-use GuzzleHttp\Command\Guzzle\SchemaValidator;
-use GuzzleHttp\Command\Event\InitEvent;
-
-/**
- * Subscriber used to validate command input against a service description.
- */
-class ValidateInput implements SubscriberInterface
-{
-    /** @var SchemaValidator */
-    private $validator;
-
-    /** @var DescriptionInterface */
-    private $description;
-
-    public function __construct(
-        DescriptionInterface $description,
-        SchemaValidator $schemaValidator = null
-    ) {
-        $this->description = $description;
-        $this->validator = $schemaValidator ?: new SchemaValidator();
-    }
-
-    public function getEvents()
-    {
-        return ['init' => ['onInit']];
-    }
-
-    public function onInit(InitEvent $event)
-    {
-        $command = $event->getCommand();
-        $errors = [];
-        $operation = $this->description->getOperation($command->getName());
-
-        foreach ($operation->getParams() as $name => $schema) {
-            $value = $command[$name];
-            if (!$this->validator->validate($schema, $value)) {
-                $errors = array_merge($errors, $this->validator->getErrors());
-            } elseif ($value !== $command[$name]) {
-                // Update the config value if it changed and no validation
-                // errors were encountered
-                $command[$name] = $value;
-            }
-        }
-
-        if ($params = $operation->getAdditionalParameters()) {
-            foreach ($command->toArray() as $name => $value) {
-                // It's only additional if it isn't defined in the schema
-                if (!$operation->hasParam($name)) {
-                    // Always set the name so that error messages are useful
-                    $params->setName($name);
-                    if (!$this->validator->validate($params, $value)) {
-                        $errors = array_merge(
-                            $errors,
-                            $this->validator->getErrors()
-                        );
-                    } elseif ($value !== $command[$name]) {
-                        $command[$name] = $value;
-                    }
-                }
-            }
-        }
-
-        if ($errors) {
-            throw new CommandException(
-                'Validation errors: ' . implode("\n", $errors),
-                $event->getTransaction()
-            );
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/.travis.yml b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/.travis.yml
deleted file mode 100644
index 55ec89253b..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/.travis.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-language: php
-
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
-
-before_script:
-  - curl --version
-  - pear config-set php_ini ~/.phpenv/versions/`php -r 'echo phpversion();'`/etc/php.ini || echo 'Error modifying PEAR'
-  - pecl install uri_template || echo 'Error installing uri_template'
-  - composer self-update
-  - composer install --no-interaction --prefer-source --dev
-  - ~/.nvm/nvm.sh install v0.6.14
-  - ~/.nvm/nvm.sh run v0.6.14
-
-script: make test
-
-matrix:
-  allow_failures:
-    - php: hhvm
-    - php: 7.0
-  fast_finish: true
-
-before_deploy:
-  - make package
-
-deploy:
-  provider: releases
-  api_key:
-    secure: UpypqlYgsU68QT/x40YzhHXvzWjFwCNo9d+G8KAdm7U9+blFfcWhV1aMdzugvPMl6woXgvJj7qHq5tAL4v6oswCORhpSBfLgOQVFaica5LiHsvWlAedOhxGmnJqMTwuepjBCxXhs3+I8Kof1n4oUL9gKytXjOVCX/f7XU1HiinU=
-  file:
-    - build/artifacts/guzzle.phar
-    - build/artifacts/guzzle.zip
-  on:
-    repo: guzzle/guzzle
-    tags: true
-    all_branches: true
-    php: 5.4
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/CHANGELOG.md b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/CHANGELOG.md
deleted file mode 100644
index 7bd0a720a4..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/CHANGELOG.md
+++ /dev/null
@@ -1,1060 +0,0 @@
-# CHANGELOG
-
-## 5.3.1 - 2016-07-18
-
-* Address HTTP_PROXY security vulnerability, CVE-2016-5385:
-  https://httpoxy.org/
-* Event name fix: https://github.com/guzzle/guzzle/commit/fcae91ff31de41e312fe113ec3acbcda31b2622e
-* Response header case sensitivity fix: https://github.com/guzzle/guzzle/commit/043eeadf20ee40ddc6712faee4d3957a91f2b041
-
-## 5.3.0 - 2015-05-19
-
-* Mock now supports `save_to`
-* Marked `AbstractRequestEvent::getTransaction()` as public.
-* Fixed a bug in which multiple headers using different casing would overwrite
-  previous headers in the associative array.
-* Added `Utils::getDefaultHandler()`
-* Marked `GuzzleHttp\Client::getDefaultUserAgent` as deprecated.
-* URL scheme is now always lowercased.
-
-## 5.2.0 - 2015-01-27
-
-* Added `AppliesHeadersInterface` to make applying headers to a request based
-  on the body more generic and not specific to `PostBodyInterface`.
-* Reduced the number of stack frames needed to send requests.
-* Nested futures are now resolved in the client rather than the RequestFsm
-* Finishing state transitions is now handled in the RequestFsm rather than the
-  RingBridge.
-* Added a guard in the Pool class to not use recursion for request retries.
-
-## 5.1.0 - 2014-12-19
-
-* Pool class no longer uses recursion when a request is intercepted.
-* The size of a Pool can now be dynamically adjusted using a callback.
-  See https://github.com/guzzle/guzzle/pull/943.
-* Setting a request option to `null` when creating a request with a client will
-  ensure that the option is not set. This allows you to overwrite default
-  request options on a per-request basis.
-  See https://github.com/guzzle/guzzle/pull/937.
-* Added the ability to limit which protocols are allowed for redirects by
-  specifying a `protocols` array in the `allow_redirects` request option.
-* Nested futures due to retries are now resolved when waiting for synchronous
-  responses. See https://github.com/guzzle/guzzle/pull/947.
-* `"0"` is now an allowed URI path. See
-  https://github.com/guzzle/guzzle/pull/935.
-* `Query` no longer typehints on the `$query` argument in the constructor,
-  allowing for strings and arrays.
-* Exceptions thrown in the `end` event are now correctly wrapped with Guzzle
-  specific exceptions if necessary.
-
-## 5.0.3 - 2014-11-03
-
-This change updates query strings so that they are treated as un-encoded values
-by default where the value represents an un-encoded value to send over the
-wire. A Query object then encodes the value before sending over the wire. This
-means that even value query string values (e.g., ":") are url encoded. This
-makes the Query class match PHP's http_build_query function. However, if you
-want to send requests over the wire using valid query string characters that do
-not need to be encoded, then you can provide a string to Url::setQuery() and
-pass true as the second argument to specify that the query string is a raw
-string that should not be parsed or encoded (unless a call to getQuery() is
-subsequently made, forcing the query-string to be converted into a Query
-object).
-
-## 5.0.2 - 2014-10-30
-
-* Added a trailing `\r\n` to multipart/form-data payloads. See
-  https://github.com/guzzle/guzzle/pull/871
-* Added a `GuzzleHttp\Pool::send()` convenience method to match the docs.
-* Status codes are now returned as integers. See
-  https://github.com/guzzle/guzzle/issues/881
-* No longer overwriting an existing `application/x-www-form-urlencoded` header
-  when sending POST requests, allowing for customized headers. See
-  https://github.com/guzzle/guzzle/issues/877
-* Improved path URL serialization.
-
-  * No longer double percent-encoding characters in the path or query string if
-    they are already encoded.
-  * Now properly encoding the supplied path to a URL object, instead of only
-    encoding ' ' and '?'.
-  * Note: This has been changed in 5.0.3 to now encode query string values by
-    default unless the `rawString` argument is provided when setting the query
-    string on a URL: Now allowing many more characters to be present in the
-    query string without being percent encoded. See http://tools.ietf.org/html/rfc3986#appendix-A
-
-## 5.0.1 - 2014-10-16
-
-Bugfix release.
-
-* Fixed an issue where connection errors still returned response object in
-  error and end events event though the response is unusable. This has been
-  corrected so that a response is not returned in the `getResponse` method of
-  these events if the response did not complete. https://github.com/guzzle/guzzle/issues/867
-* Fixed an issue where transfer statistics were not being populated in the
-  RingBridge. https://github.com/guzzle/guzzle/issues/866
-
-## 5.0.0 - 2014-10-12
-
-Adding support for non-blocking responses and some minor API cleanup.
-
-### New Features
-
-* Added support for non-blocking responses based on `guzzlehttp/guzzle-ring`.
-* Added a public API for creating a default HTTP adapter.
-* Updated the redirect plugin to be non-blocking so that redirects are sent
-  concurrently. Other plugins like this can now be updated to be non-blocking.
-* Added a "progress" event so that you can get upload and download progress
-  events.
-* Added `GuzzleHttp\Pool` which implements FutureInterface and transfers
-  requests concurrently using a capped pool size as efficiently as possible.
-* Added `hasListeners()` to EmitterInterface.
-* Removed `GuzzleHttp\ClientInterface::sendAll` and marked
-  `GuzzleHttp\Client::sendAll` as deprecated (it's still there, just not the
-  recommended way).
-
-### Breaking changes
-
-The breaking changes in this release are relatively minor. The biggest thing to
-look out for is that request and response objects no longer implement fluent
-interfaces.
-
-* Removed the fluent interfaces (i.e., `return $this`) from requests,
-  responses, `GuzzleHttp\Collection`, `GuzzleHttp\Url`,
-  `GuzzleHttp\Query`, `GuzzleHttp\Post\PostBody`, and
-  `GuzzleHttp\Cookie\SetCookie`. This blog post provides a good outline of
-  why I did this: http://ocramius.github.io/blog/fluent-interfaces-are-evil/.
-  This also makes the Guzzle message interfaces compatible with the current
-  PSR-7 message proposal.
-* Removed "functions.php", so that Guzzle is truly PSR-4 compliant. Except
-  for the HTTP request functions from function.php, these functions are now
-  implemented in `GuzzleHttp\Utils` using camelCase. `GuzzleHttp\json_decode`
-  moved to `GuzzleHttp\Utils::jsonDecode`. `GuzzleHttp\get_path` moved to
-  `GuzzleHttp\Utils::getPath`. `GuzzleHttp\set_path` moved to
-  `GuzzleHttp\Utils::setPath`. `GuzzleHttp\batch` should now be
-  `GuzzleHttp\Pool::batch`, which returns an `objectStorage`. Using functions.php
-  caused problems for many users: they aren't PSR-4 compliant, require an
-  explicit include, and needed an if-guard to ensure that the functions are not
-  declared multiple times.
-* Rewrote adapter layer.
-    * Removing all classes from `GuzzleHttp\Adapter`, these are now
-      implemented as callables that are stored in `GuzzleHttp\Ring\Client`.
-    * Removed the concept of "parallel adapters". Sending requests serially or
-      concurrently is now handled using a single adapter.
-    * Moved `GuzzleHttp\Adapter\Transaction` to `GuzzleHttp\Transaction`. The
-      Transaction object now exposes the request, response, and client as public
-      properties. The getters and setters have been removed.
-* Removed the "headers" event. This event was only useful for changing the
-  body a response once the headers of the response were known. You can implement
-  a similar behavior in a number of ways. One example might be to use a
-  FnStream that has access to the transaction being sent. For example, when the
-  first byte is written, you could check if the response headers match your
-  expectations, and if so, change the actual stream body that is being
-  written to.
-* Removed the `asArray` parameter from
-  `GuzzleHttp\Message\MessageInterface::getHeader`. If you want to get a header
-  value as an array, then use the newly added `getHeaderAsArray()` method of
-  `MessageInterface`. This change makes the Guzzle interfaces compatible with
-  the PSR-7 interfaces.
-* `GuzzleHttp\Message\MessageFactory` no longer allows subclasses to add
-  custom request options using double-dispatch (this was an implementation
-  detail). Instead, you should now provide an associative array to the
-  constructor which is a mapping of the request option name mapping to a
-  function that applies the option value to a request.
-* Removed the concept of "throwImmediately" from exceptions and error events.
-  This control mechanism was used to stop a transfer of concurrent requests
-  from completing. This can now be handled by throwing the exception or by
-  cancelling a pool of requests or each outstanding future request individually.
-* Updated to "GuzzleHttp\Streams" 3.0.
-    * `GuzzleHttp\Stream\StreamInterface::getContents()` no longer accepts a
-      `maxLen` parameter. This update makes the Guzzle streams project
-      compatible with the current PSR-7 proposal.
-    * `GuzzleHttp\Stream\Stream::__construct`,
-      `GuzzleHttp\Stream\Stream::factory`, and
-      `GuzzleHttp\Stream\Utils::create` no longer accept a size in the second
-      argument. They now accept an associative array of options, including the
-      "size" key and "metadata" key which can be used to provide custom metadata.
-
-## 4.2.2 - 2014-09-08
-
-* Fixed a memory leak in the CurlAdapter when reusing cURL handles.
-* No longer using `request_fulluri` in stream adapter proxies.
-* Relative redirects are now based on the last response, not the first response.
-
-## 4.2.1 - 2014-08-19
-
-* Ensuring that the StreamAdapter does not always add a Content-Type header
-* Adding automated github releases with a phar and zip
-
-## 4.2.0 - 2014-08-17
-
-* Now merging in default options using a case-insensitive comparison.
-  Closes https://github.com/guzzle/guzzle/issues/767
-* Added the ability to automatically decode `Content-Encoding` response bodies
-  using the `decode_content` request option. This is set to `true` by default
-  to decode the response body if it comes over the wire with a
-  `Content-Encoding`. Set this value to `false` to disable decoding the
-  response content, and pass a string to provide a request `Accept-Encoding`
-  header and turn on automatic response decoding. This feature now allows you
-  to pass an `Accept-Encoding` header in the headers of a request but still
-  disable automatic response decoding.
-  Closes https://github.com/guzzle/guzzle/issues/764
-* Added the ability to throw an exception immediately when transferring
-  requests in parallel. Closes https://github.com/guzzle/guzzle/issues/760
-* Updating guzzlehttp/streams dependency to ~2.1
-* No longer utilizing the now deprecated namespaced methods from the stream
-  package.
-
-## 4.1.8 - 2014-08-14
-
-* Fixed an issue in the CurlFactory that caused setting the `stream=false`
-  request option to throw an exception.
-  See: https://github.com/guzzle/guzzle/issues/769
-* TransactionIterator now calls rewind on the inner iterator.
-  See: https://github.com/guzzle/guzzle/pull/765
-* You can now set the `Content-Type` header to `multipart/form-data`
-  when creating POST requests to force multipart bodies.
-  See https://github.com/guzzle/guzzle/issues/768
-
-## 4.1.7 - 2014-08-07
-
-* Fixed an error in the HistoryPlugin that caused the same request and response
-  to be logged multiple times when an HTTP protocol error occurs.
-* Ensuring that cURL does not add a default Content-Type when no Content-Type
-  has been supplied by the user. This prevents the adapter layer from modifying
-  the request that is sent over the wire after any listeners may have already
-  put the request in a desired state (e.g., signed the request).
-* Throwing an exception when you attempt to send requests that have the
-  "stream" set to true in parallel using the MultiAdapter.
-* Only calling curl_multi_select when there are active cURL handles. This was
-  previously changed and caused performance problems on some systems due to PHP
-  always selecting until the maximum select timeout.
-* Fixed a bug where multipart/form-data POST fields were not correctly
-  aggregated (e.g., values with "&").
-
-## 4.1.6 - 2014-08-03
-
-* Added helper methods to make it easier to represent messages as strings,
-  including getting the start line and getting headers as a string.
-
-## 4.1.5 - 2014-08-02
-
-* Automatically retrying cURL "Connection died, retrying a fresh connect"
-  errors when possible.
-* cURL implementation cleanup
-* Allowing multiple event subscriber listeners to be registered per event by
-  passing an array of arrays of listener configuration.
-
-## 4.1.4 - 2014-07-22
-
-* Fixed a bug that caused multi-part POST requests with more than one field to
-  serialize incorrectly.
-* Paths can now be set to "0"
-* `ResponseInterface::xml` now accepts a `libxml_options` option and added a
-  missing default argument that was required when parsing XML response bodies.
-* A `save_to` stream is now created lazily, which means that files are not
-  created on disk unless a request succeeds.
-
-## 4.1.3 - 2014-07-15
-
-* Various fixes to multipart/form-data POST uploads
-* Wrapping function.php in an if-statement to ensure Guzzle can be used
-  globally and in a Composer install
-* Fixed an issue with generating and merging in events to an event array
-* POST headers are only applied before sending a request to allow you to change
-  the query aggregator used before uploading
-* Added much more robust query string parsing
-* Fixed various parsing and normalization issues with URLs
-* Fixing an issue where multi-valued headers were not being utilized correctly
-  in the StreamAdapter
-
-## 4.1.2 - 2014-06-18
-
-* Added support for sending payloads with GET requests
-
-## 4.1.1 - 2014-06-08
-
-* Fixed an issue related to using custom message factory options in subclasses
-* Fixed an issue with nested form fields in a multi-part POST
-* Fixed an issue with using the `json` request option for POST requests
-* Added `ToArrayInterface` to `GuzzleHttp\Cookie\CookieJar`
-
-## 4.1.0 - 2014-05-27
-
-* Added a `json` request option to easily serialize JSON payloads.
-* Added a `GuzzleHttp\json_decode()` wrapper to safely parse JSON.
-* Added `setPort()` and `getPort()` to `GuzzleHttp\Message\RequestInterface`.
-* Added the ability to provide an emitter to a client in the client constructor.
-* Added the ability to persist a cookie session using $_SESSION.
-* Added a trait that can be used to add event listeners to an iterator.
-* Removed request method constants from RequestInterface.
-* Fixed warning when invalid request start-lines are received.
-* Updated MessageFactory to work with custom request option methods.
-* Updated cacert bundle to latest build.
-
-4.0.2 (2014-04-16)
-------------------
-
-* Proxy requests using the StreamAdapter now properly use request_fulluri (#632)
-* Added the ability to set scalars as POST fields (#628)
-
-## 4.0.1 - 2014-04-04
-
-* The HTTP status code of a response is now set as the exception code of
-  RequestException objects.
-* 303 redirects will now correctly switch from POST to GET requests.
-* The default parallel adapter of a client now correctly uses the MultiAdapter.
-* HasDataTrait now initializes the internal data array as an empty array so
-  that the toArray() method always returns an array.
-
-## 4.0.0 - 2014-03-29
-
-* For more information on the 4.0 transition, see:
-  http://mtdowling.com/blog/2014/03/15/guzzle-4-rc/
-* For information on changes and upgrading, see:
-  https://github.com/guzzle/guzzle/blob/master/UPGRADING.md#3x-to-40
-* Added `GuzzleHttp\batch()` as a convenience function for sending requests in
-  parallel without needing to write asynchronous code.
-* Restructured how events are added to `GuzzleHttp\ClientInterface::sendAll()`.
-  You can now pass a callable or an array of associative arrays where each
-  associative array contains the "fn", "priority", and "once" keys.
-
-## 4.0.0.rc-2 - 2014-03-25
-
-* Removed `getConfig()` and `setConfig()` from clients to avoid confusion
-  around whether things like base_url, message_factory, etc. should be able to
-  be retrieved or modified.
-* Added `getDefaultOption()` and `setDefaultOption()` to ClientInterface
-* functions.php functions were renamed using snake_case to match PHP idioms
-* Added support for `HTTP_PROXY`, `HTTPS_PROXY`, and
-  `GUZZLE_CURL_SELECT_TIMEOUT` environment variables
-* Added the ability to specify custom `sendAll()` event priorities
-* Added the ability to specify custom stream context options to the stream
-  adapter.
-* Added a functions.php function for `get_path()` and `set_path()`
-* CurlAdapter and MultiAdapter now use a callable to generate curl resources
-* MockAdapter now properly reads a body and emits a `headers` event
-* Updated Url class to check if a scheme and host are set before adding ":"
-  and "//". This allows empty Url (e.g., "") to be serialized as "".
-* Parsing invalid XML no longer emits warnings
-* Curl classes now properly throw AdapterExceptions
-* Various performance optimizations
-* Streams are created with the faster `Stream\create()` function
-* Marked deprecation_proxy() as internal
-* Test server is now a collection of static methods on a class
-
-## 4.0.0-rc.1 - 2014-03-15
-
-* See https://github.com/guzzle/guzzle/blob/master/UPGRADING.md#3x-to-40
-
-## 3.8.1 - 2014-01-28
-
-* Bug: Always using GET requests when redirecting from a 303 response
-* Bug: CURLOPT_SSL_VERIFYHOST is now correctly set to false when setting `$certificateAuthority` to false in
-  `Guzzle\Http\ClientInterface::setSslVerification()`
-* Bug: RedirectPlugin now uses strict RFC 3986 compliance when combining a base URL with a relative URL
-* Bug: The body of a request can now be set to `"0"`
-* Sending PHP stream requests no longer forces `HTTP/1.0`
-* Adding more information to ExceptionCollection exceptions so that users have more context, including a stack trace of
-  each sub-exception
-* Updated the `$ref` attribute in service descriptions to merge over any existing parameters of a schema (rather than
-  clobbering everything).
-* Merging URLs will now use the query string object from the relative URL (thus allowing custom query aggregators)
-* Query strings are now parsed in a way that they do no convert empty keys with no value to have a dangling `=`.
-  For example `foo&bar=baz` is now correctly parsed and recognized as `foo&bar=baz` rather than `foo=&bar=baz`.
-* Now properly escaping the regular expression delimiter when matching Cookie domains.
-* Network access is now disabled when loading XML documents
-
-## 3.8.0 - 2013-12-05
-
-* Added the ability to define a POST name for a file
-* JSON response parsing now properly walks additionalProperties
-* cURL error code 18 is now retried automatically in the BackoffPlugin
-* Fixed a cURL error when URLs contain fragments
-* Fixed an issue in the BackoffPlugin retry event where it was trying to access all exceptions as if they were
-  CurlExceptions
-* CURLOPT_PROGRESS function fix for PHP 5.5 (69fcc1e)
-* Added the ability for Guzzle to work with older versions of cURL that do not support `CURLOPT_TIMEOUT_MS`
-* Fixed a bug that was encountered when parsing empty header parameters
-* UriTemplate now has a `setRegex()` method to match the docs
-* The `debug` request parameter now checks if it is truthy rather than if it exists
-* Setting the `debug` request parameter to true shows verbose cURL output instead of using the LogPlugin
-* Added the ability to combine URLs using strict RFC 3986 compliance
-* Command objects can now return the validation errors encountered by the command
-* Various fixes to cache revalidation (#437 and 29797e5)
-* Various fixes to the AsyncPlugin
-* Cleaned up build scripts
-
-## 3.7.4 - 2013-10-02
-
-* Bug fix: 0 is now an allowed value in a description parameter that has a default value (#430)
-* Bug fix: SchemaFormatter now returns an integer when formatting to a Unix timestamp
-  (see https://github.com/aws/aws-sdk-php/issues/147)
-* Bug fix: Cleaned up and fixed URL dot segment removal to properly resolve internal dots
-* Minimum PHP version is now properly specified as 5.3.3 (up from 5.3.2) (#420)
-* Updated the bundled cacert.pem (#419)
-* OauthPlugin now supports adding authentication to headers or query string (#425)
-
-## 3.7.3 - 2013-09-08
-
-* Added the ability to get the exception associated with a request/command when using `MultiTransferException` and
-  `CommandTransferException`.
-* Setting `additionalParameters` of a response to false is now honored when parsing responses with a service description
-* Schemas are only injected into response models when explicitly configured.
-* No longer guessing Content-Type based on the path of a request. Content-Type is now only guessed based on the path of
-  an EntityBody.
-* Bug fix: ChunkedIterator can now properly chunk a \Traversable as well as an \Iterator.
-* Bug fix: FilterIterator now relies on `\Iterator` instead of `\Traversable`.
-* Bug fix: Gracefully handling malformed responses in RequestMediator::writeResponseBody()
-* Bug fix: Replaced call to canCache with canCacheRequest in the CallbackCanCacheStrategy of the CachePlugin
-* Bug fix: Visiting XML attributes first before visiting XML children when serializing requests
-* Bug fix: Properly parsing headers that contain commas contained in quotes
-* Bug fix: mimetype guessing based on a filename is now case-insensitive
-
-## 3.7.2 - 2013-08-02
-
-* Bug fix: Properly URL encoding paths when using the PHP-only version of the UriTemplate expander
-  See https://github.com/guzzle/guzzle/issues/371
-* Bug fix: Cookie domains are now matched correctly according to RFC 6265
-  See https://github.com/guzzle/guzzle/issues/377
-* Bug fix: GET parameters are now used when calculating an OAuth signature
-* Bug fix: Fixed an issue with cache revalidation where the If-None-Match header was being double quoted
-* `Guzzle\Common\AbstractHasDispatcher::dispatch()` now returns the event that was dispatched
-* `Guzzle\Http\QueryString::factory()` now guesses the most appropriate query aggregator to used based on the input.
-  See https://github.com/guzzle/guzzle/issues/379
-* Added a way to add custom domain objects to service description parsing using the `operation.parse_class` event. See
-  https://github.com/guzzle/guzzle/pull/380
-* cURL multi cleanup and optimizations
-
-## 3.7.1 - 2013-07-05
-
-* Bug fix: Setting default options on a client now works
-* Bug fix: Setting options on HEAD requests now works. See #352
-* Bug fix: Moving stream factory before send event to before building the stream. See #353
-* Bug fix: Cookies no longer match on IP addresses per RFC 6265
-* Bug fix: Correctly parsing header parameters that are in `<>` and quotes
-* Added `cert` and `ssl_key` as request options
-* `Host` header can now diverge from the host part of a URL if the header is set manually
-* `Guzzle\Service\Command\LocationVisitor\Request\XmlVisitor` was rewritten to change from using SimpleXML to XMLWriter
-* OAuth parameters are only added via the plugin if they aren't already set
-* Exceptions are now thrown when a URL cannot be parsed
-* Returning `false` if `Guzzle\Http\EntityBody::getContentMd5()` fails
-* Not setting a `Content-MD5` on a command if calculating the Content-MD5 fails via the CommandContentMd5Plugin
-
-## 3.7.0 - 2013-06-10
-
-* See UPGRADING.md for more information on how to upgrade.
-* Requests now support the ability to specify an array of $options when creating a request to more easily modify a
-  request. You can pass a 'request.options' configuration setting to a client to apply default request options to
-  every request created by a client (e.g. default query string variables, headers, curl options, etc.).
-* Added a static facade class that allows you to use Guzzle with static methods and mount the class to `\Guzzle`.
-  See `Guzzle\Http\StaticClient::mount`.
-* Added `command.request_options` to `Guzzle\Service\Command\AbstractCommand` to pass request options to requests
-      created by a command (e.g. custom headers, query string variables, timeout settings, etc.).
-* Stream size in `Guzzle\Stream\PhpStreamRequestFactory` will now be set if Content-Length is returned in the
-  headers of a response
-* Added `Guzzle\Common\Collection::setPath($path, $value)` to set a value into an array using a nested key
-  (e.g. `$collection->setPath('foo/baz/bar', 'test'); echo $collection['foo']['bar']['bar'];`)
-* ServiceBuilders now support storing and retrieving arbitrary data
-* CachePlugin can now purge all resources for a given URI
-* CachePlugin can automatically purge matching cached items when a non-idempotent request is sent to a resource
-* CachePlugin now uses the Vary header to determine if a resource is a cache hit
-* `Guzzle\Http\Message\Response` now implements `\Serializable`
-* Added `Guzzle\Cache\CacheAdapterFactory::fromCache()` to more easily create cache adapters
-* `Guzzle\Service\ClientInterface::execute()` now accepts an array, single command, or Traversable
-* Fixed a bug in `Guzzle\Http\Message\Header\Link::addLink()`
-* Better handling of calculating the size of a stream in `Guzzle\Stream\Stream` using fstat() and caching the size
-* `Guzzle\Common\Exception\ExceptionCollection` now creates a more readable exception message
-* Fixing BC break: Added back the MonologLogAdapter implementation rather than extending from PsrLog so that older
-  Symfony users can still use the old version of Monolog.
-* Fixing BC break: Added the implementation back in for `Guzzle\Http\Message\AbstractMessage::getTokenizedHeader()`.
-  Now triggering an E_USER_DEPRECATED warning when used. Use `$message->getHeader()->parseParams()`.
-* Several performance improvements to `Guzzle\Common\Collection`
-* Added an `$options` argument to the end of the following methods of `Guzzle\Http\ClientInterface`:
-  createRequest, head, delete, put, patch, post, options, prepareRequest
-* Added an `$options` argument to the end of `Guzzle\Http\Message\Request\RequestFactoryInterface::createRequest()`
-* Added an `applyOptions()` method to `Guzzle\Http\Message\Request\RequestFactoryInterface`
-* Changed `Guzzle\Http\ClientInterface::get($uri = null, $headers = null, $body = null)` to
-  `Guzzle\Http\ClientInterface::get($uri = null, $headers = null, $options = array())`. You can still pass in a
-  resource, string, or EntityBody into the $options parameter to specify the download location of the response.
-* Changed `Guzzle\Common\Collection::__construct($data)` to no longer accepts a null value for `$data` but a
-  default `array()`
-* Added `Guzzle\Stream\StreamInterface::isRepeatable`
-* Removed `Guzzle\Http\ClientInterface::setDefaultHeaders(). Use
-  $client->getConfig()->setPath('request.options/headers/{header_name}', 'value')`. or
-  $client->getConfig()->setPath('request.options/headers', array('header_name' => 'value'))`.
-* Removed `Guzzle\Http\ClientInterface::getDefaultHeaders(). Use $client->getConfig()->getPath('request.options/headers')`.
-* Removed `Guzzle\Http\ClientInterface::expandTemplate()`
-* Removed `Guzzle\Http\ClientInterface::setRequestFactory()`
-* Removed `Guzzle\Http\ClientInterface::getCurlMulti()`
-* Removed `Guzzle\Http\Message\RequestInterface::canCache`
-* Removed `Guzzle\Http\Message\RequestInterface::setIsRedirect`
-* Removed `Guzzle\Http\Message\RequestInterface::isRedirect`
-* Made `Guzzle\Http\Client::expandTemplate` and `getUriTemplate` protected methods.
-* You can now enable E_USER_DEPRECATED warnings to see if you are using a deprecated method by setting
-  `Guzzle\Common\Version::$emitWarnings` to true.
-* Marked `Guzzle\Http\Message\Request::isResponseBodyRepeatable()` as deprecated. Use
-      `$request->getResponseBody()->isRepeatable()` instead.
-* Marked `Guzzle\Http\Message\Request::canCache()` as deprecated. Use
-  `Guzzle\Plugin\Cache\DefaultCanCacheStrategy->canCacheRequest()` instead.
-* Marked `Guzzle\Http\Message\Request::canCache()` as deprecated. Use
-  `Guzzle\Plugin\Cache\DefaultCanCacheStrategy->canCacheRequest()` instead.
-* Marked `Guzzle\Http\Message\Request::setIsRedirect()` as deprecated. Use the HistoryPlugin instead.
-* Marked `Guzzle\Http\Message\Request::isRedirect()` as deprecated. Use the HistoryPlugin instead.
-* Marked `Guzzle\Cache\CacheAdapterFactory::factory()` as deprecated
-* Marked 'command.headers', 'command.response_body' and 'command.on_complete' as deprecated for AbstractCommand.
-  These will work through Guzzle 4.0
-* Marked 'request.params' for `Guzzle\Http\Client` as deprecated. Use [request.options][params].
-* Marked `Guzzle\Service\Client::enableMagicMethods()` as deprecated. Magic methods can no longer be disabled on a Guzzle\Service\Client.
-* Marked `Guzzle\Service\Client::getDefaultHeaders()` as deprecated. Use $client->getConfig()->getPath('request.options/headers')`.
-* Marked `Guzzle\Service\Client::setDefaultHeaders()` as deprecated. Use $client->getConfig()->setPath('request.options/headers/{header_name}', 'value')`.
-* Marked `Guzzle\Parser\Url\UrlParser` as deprecated. Just use PHP's `parse_url()` and percent encode your UTF-8.
-* Marked `Guzzle\Common\Collection::inject()` as deprecated.
-* Marked `Guzzle\Plugin\CurlAuth\CurlAuthPlugin` as deprecated. Use `$client->getConfig()->setPath('request.options/auth', array('user', 'pass', 'Basic|Digest');`
-* CacheKeyProviderInterface and DefaultCacheKeyProvider are no longer used. All of this logic is handled in a
-  CacheStorageInterface. These two objects and interface will be removed in a future version.
-* Always setting X-cache headers on cached responses
-* Default cache TTLs are now handled by the CacheStorageInterface of a CachePlugin
-* `CacheStorageInterface::cache($key, Response $response, $ttl = null)` has changed to `cache(RequestInterface
-  $request, Response $response);`
-* `CacheStorageInterface::fetch($key)` has changed to `fetch(RequestInterface $request);`
-* `CacheStorageInterface::delete($key)` has changed to `delete(RequestInterface $request);`
-* Added `CacheStorageInterface::purge($url)`
-* `DefaultRevalidation::__construct(CacheKeyProviderInterface $cacheKey, CacheStorageInterface $cache, CachePlugin
-  $plugin)` has changed to `DefaultRevalidation::__construct(CacheStorageInterface $cache,
-  CanCacheStrategyInterface $canCache = null)`
-* Added `RevalidationInterface::shouldRevalidate(RequestInterface $request, Response $response)`
-
-## 3.6.0 - 2013-05-29
-
-* ServiceDescription now implements ToArrayInterface
-* Added command.hidden_params to blacklist certain headers from being treated as additionalParameters
-* Guzzle can now correctly parse incomplete URLs
-* Mixed casing of headers are now forced to be a single consistent casing across all values for that header.
-* Messages internally use a HeaderCollection object to delegate handling case-insensitive header resolution
-* Removed the whole changedHeader() function system of messages because all header changes now go through addHeader().
-* Specific header implementations can be created for complex headers. When a message creates a header, it uses a
-  HeaderFactory which can map specific headers to specific header classes. There is now a Link header and
-  CacheControl header implementation.
-* Removed from interface: Guzzle\Http\ClientInterface::setUriTemplate
-* Removed from interface: Guzzle\Http\ClientInterface::setCurlMulti()
-* Removed Guzzle\Http\Message\Request::receivedRequestHeader() and implemented this functionality in
-  Guzzle\Http\Curl\RequestMediator
-* Removed the optional $asString parameter from MessageInterface::getHeader(). Just cast the header to a string.
-* Removed the optional $tryChunkedTransfer option from Guzzle\Http\Message\EntityEnclosingRequestInterface
-* Removed the $asObjects argument from Guzzle\Http\Message\MessageInterface::getHeaders()
-* Removed Guzzle\Parser\ParserRegister::get(). Use getParser()
-* Removed Guzzle\Parser\ParserRegister::set(). Use registerParser().
-* All response header helper functions return a string rather than mixing Header objects and strings inconsistently
-* Removed cURL blacklist support. This is no longer necessary now that Expect, Accept, etc. are managed by Guzzle
-  directly via interfaces
-* Removed the injecting of a request object onto a response object. The methods to get and set a request still exist
-  but are a no-op until removed.
-* Most classes that used to require a `Guzzle\Service\Command\CommandInterface` typehint now request a
-  `Guzzle\Service\Command\ArrayCommandInterface`.
-* Added `Guzzle\Http\Message\RequestInterface::startResponse()` to the RequestInterface to handle injecting a response
-  on a request while the request is still being transferred
-* The ability to case-insensitively search for header values
-* Guzzle\Http\Message\Header::hasExactHeader
-* Guzzle\Http\Message\Header::raw. Use getAll()
-* Deprecated cache control specific methods on Guzzle\Http\Message\AbstractMessage. Use the CacheControl header object
-  instead.
-* `Guzzle\Service\Command\CommandInterface` now extends from ToArrayInterface and ArrayAccess
-* Added the ability to cast Model objects to a string to view debug information.
-
-## 3.5.0 - 2013-05-13
-
-* Bug: Fixed a regression so that request responses are parsed only once per oncomplete event rather than multiple times
-* Bug: Better cleanup of one-time events across the board (when an event is meant to fire once, it will now remove
-  itself from the EventDispatcher)
-* Bug: `Guzzle\Log\MessageFormatter` now properly writes "total_time" and "connect_time" values
-* Bug: Cloning an EntityEnclosingRequest now clones the EntityBody too
-* Bug: Fixed an undefined index error when parsing nested JSON responses with a sentAs parameter that reference a
-  non-existent key
-* Bug: All __call() method arguments are now required (helps with mocking frameworks)
-* Deprecating Response::getRequest() and now using a shallow clone of a request object to remove a circular reference
-  to help with refcount based garbage collection of resources created by sending a request
-* Deprecating ZF1 cache and log adapters. These will be removed in the next major version.
-* Deprecating `Response::getPreviousResponse()` (method signature still exists, but it'sdeprecated). Use the
-  HistoryPlugin for a history.
-* Added a `responseBody` alias for the `response_body` location
-* Refactored internals to no longer rely on Response::getRequest()
-* HistoryPlugin can now be cast to a string
-* HistoryPlugin now logs transactions rather than requests and responses to more accurately keep track of the requests
-  and responses that are sent over the wire
-* Added `getEffectiveUrl()` and `getRedirectCount()` to Response objects
-
-## 3.4.3 - 2013-04-30
-
-* Bug fix: Fixing bug introduced in 3.4.2 where redirect responses are duplicated on the final redirected response
-* Added a check to re-extract the temp cacert bundle from the phar before sending each request
-
-## 3.4.2 - 2013-04-29
-
-* Bug fix: Stream objects now work correctly with "a" and "a+" modes
-* Bug fix: Removing `Transfer-Encoding: chunked` header when a Content-Length is present
-* Bug fix: AsyncPlugin no longer forces HEAD requests
-* Bug fix: DateTime timezones are now properly handled when using the service description schema formatter
-* Bug fix: CachePlugin now properly handles stale-if-error directives when a request to the origin server fails
-* Setting a response on a request will write to the custom request body from the response body if one is specified
-* LogPlugin now writes to php://output when STDERR is undefined
-* Added the ability to set multiple POST files for the same key in a single call
-* application/x-www-form-urlencoded POSTs now use the utf-8 charset by default
-* Added the ability to queue CurlExceptions to the MockPlugin
-* Cleaned up how manual responses are queued on requests (removed "queued_response" and now using request.before_send)
-* Configuration loading now allows remote files
-
-## 3.4.1 - 2013-04-16
-
-* Large refactoring to how CurlMulti handles work. There is now a proxy that sits in front of a pool of CurlMulti
-  handles. This greatly simplifies the implementation, fixes a couple bugs, and provides a small performance boost.
-* Exceptions are now properly grouped when sending requests in parallel
-* Redirects are now properly aggregated when a multi transaction fails
-* Redirects now set the response on the original object even in the event of a failure
-* Bug fix: Model names are now properly set even when using $refs
-* Added support for PHP 5.5's CurlFile to prevent warnings with the deprecated @ syntax
-* Added support for oauth_callback in OAuth signatures
-* Added support for oauth_verifier in OAuth signatures
-* Added support to attempt to retrieve a command first literally, then ucfirst, the with inflection
-
-## 3.4.0 - 2013-04-11
-
-* Bug fix: URLs are now resolved correctly based on http://tools.ietf.org/html/rfc3986#section-5.2. #289
-* Bug fix: Absolute URLs with a path in a service description will now properly override the base URL. #289
-* Bug fix: Parsing a query string with a single PHP array value will now result in an array. #263
-* Bug fix: Better normalization of the User-Agent header to prevent duplicate headers. #264.
-* Bug fix: Added `number` type to service descriptions.
-* Bug fix: empty parameters are removed from an OAuth signature
-* Bug fix: Revalidating a cache entry prefers the Last-Modified over the Date header
-* Bug fix: Fixed "array to string" error when validating a union of types in a service description
-* Bug fix: Removed code that attempted to determine the size of a stream when data is written to the stream
-* Bug fix: Not including an `oauth_token` if the value is null in the OauthPlugin.
-* Bug fix: Now correctly aggregating successful requests and failed requests in CurlMulti when a redirect occurs.
-* The new default CURLOPT_TIMEOUT setting has been increased to 150 seconds so that Guzzle works on poor connections.
-* Added a feature to EntityEnclosingRequest::setBody() that will automatically set the Content-Type of the request if
-  the Content-Type can be determined based on the entity body or the path of the request.
-* Added the ability to overwrite configuration settings in a client when grabbing a throwaway client from a builder.
-* Added support for a PSR-3 LogAdapter.
-* Added a `command.after_prepare` event
-* Added `oauth_callback` parameter to the OauthPlugin
-* Added the ability to create a custom stream class when using a stream factory
-* Added a CachingEntityBody decorator
-* Added support for `additionalParameters` in service descriptions to define how custom parameters are serialized.
-* The bundled SSL certificate is now provided in the phar file and extracted when running Guzzle from a phar.
-* You can now send any EntityEnclosingRequest with POST fields or POST files and cURL will handle creating bodies
-* POST requests using a custom entity body are now treated exactly like PUT requests but with a custom cURL method. This
-  means that the redirect behavior of POST requests with custom bodies will not be the same as POST requests that use
-  POST fields or files (the latter is only used when emulating a form POST in the browser).
-* Lots of cleanup to CurlHandle::factory and RequestFactory::createRequest
-
-## 3.3.1 - 2013-03-10
-
-* Added the ability to create PHP streaming responses from HTTP requests
-* Bug fix: Running any filters when parsing response headers with service descriptions
-* Bug fix: OauthPlugin fixes to allow for multi-dimensional array signing, and sorting parameters before signing
-* Bug fix: Removed the adding of default empty arrays and false Booleans to responses in order to be consistent across
-  response location visitors.
-* Bug fix: Removed the possibility of creating configuration files with circular dependencies
-* RequestFactory::create() now uses the key of a POST file when setting the POST file name
-* Added xmlAllowEmpty to serialize an XML body even if no XML specific parameters are set
-
-## 3.3.0 - 2013-03-03
-
-* A large number of performance optimizations have been made
-* Bug fix: Added 'wb' as a valid write mode for streams
-* Bug fix: `Guzzle\Http\Message\Response::json()` now allows scalar values to be returned
-* Bug fix: Fixed bug in `Guzzle\Http\Message\Response` where wrapping quotes were stripped from `getEtag()`
-* BC: Removed `Guzzle\Http\Utils` class
-* BC: Setting a service description on a client will no longer modify the client's command factories.
-* BC: Emitting IO events from a RequestMediator is now a parameter that must be set in a request's curl options using
-  the 'emit_io' key. This was previously set under a request's parameters using 'curl.emit_io'
-* BC: `Guzzle\Stream\Stream::getWrapper()` and `Guzzle\Stream\Stream::getSteamType()` are no longer converted to
-  lowercase
-* Operation parameter objects are now lazy loaded internally
-* Added ErrorResponsePlugin that can throw errors for responses defined in service description operations' errorResponses
-* Added support for instantiating responseType=class responseClass classes. Classes must implement
-  `Guzzle\Service\Command\ResponseClassInterface`
-* Added support for additionalProperties for top-level parameters in responseType=model responseClasses. These
-  additional properties also support locations and can be used to parse JSON responses where the outermost part of the
-  JSON is an array
-* Added support for nested renaming of JSON models (rename sentAs to name)
-* CachePlugin
-    * Added support for stale-if-error so that the CachePlugin can now serve stale content from the cache on error
-    * Debug headers can now added to cached response in the CachePlugin
-
-## 3.2.0 - 2013-02-14
-
-* CurlMulti is no longer reused globally. A new multi object is created per-client. This helps to isolate clients.
-* URLs with no path no longer contain a "/" by default
-* Guzzle\Http\QueryString does no longer manages the leading "?". This is now handled in Guzzle\Http\Url.
-* BadResponseException no longer includes the full request and response message
-* Adding setData() to Guzzle\Service\Description\ServiceDescriptionInterface
-* Adding getResponseBody() to Guzzle\Http\Message\RequestInterface
-* Various updates to classes to use ServiceDescriptionInterface type hints rather than ServiceDescription
-* Header values can now be normalized into distinct values when multiple headers are combined with a comma separated list
-* xmlEncoding can now be customized for the XML declaration of a XML service description operation
-* Guzzle\Http\QueryString now uses Guzzle\Http\QueryAggregator\QueryAggregatorInterface objects to add custom value
-  aggregation and no longer uses callbacks
-* The URL encoding implementation of Guzzle\Http\QueryString can now be customized
-* Bug fix: Filters were not always invoked for array service description parameters
-* Bug fix: Redirects now use a target response body rather than a temporary response body
-* Bug fix: The default exponential backoff BackoffPlugin was not giving when the request threshold was exceeded
-* Bug fix: Guzzle now takes the first found value when grabbing Cache-Control directives
-
-## 3.1.2 - 2013-01-27
-
-* Refactored how operation responses are parsed. Visitors now include a before() method responsible for parsing the
-  response body. For example, the XmlVisitor now parses the XML response into an array in the before() method.
-* Fixed an issue where cURL would not automatically decompress responses when the Accept-Encoding header was sent
-* CURLOPT_SSL_VERIFYHOST is never set to 1 because it is deprecated (see 5e0ff2ef20f839e19d1eeb298f90ba3598784444)
-* Fixed a bug where redirect responses were not chained correctly using getPreviousResponse()
-* Setting default headers on a client after setting the user-agent will not erase the user-agent setting
-
-## 3.1.1 - 2013-01-20
-
-* Adding wildcard support to Guzzle\Common\Collection::getPath()
-* Adding alias support to ServiceBuilder configs
-* Adding Guzzle\Service\Resource\CompositeResourceIteratorFactory and cleaning up factory interface
-
-## 3.1.0 - 2013-01-12
-
-* BC: CurlException now extends from RequestException rather than BadResponseException
-* BC: Renamed Guzzle\Plugin\Cache\CanCacheStrategyInterface::canCache() to canCacheRequest() and added CanCacheResponse()
-* Added getData to ServiceDescriptionInterface
-* Added context array to RequestInterface::setState()
-* Bug: Removing hard dependency on the BackoffPlugin from Guzzle\Http
-* Bug: Adding required content-type when JSON request visitor adds JSON to a command
-* Bug: Fixing the serialization of a service description with custom data
-* Made it easier to deal with exceptions thrown when transferring commands or requests in parallel by providing
-  an array of successful and failed responses
-* Moved getPath from Guzzle\Service\Resource\Model to Guzzle\Common\Collection
-* Added Guzzle\Http\IoEmittingEntityBody
-* Moved command filtration from validators to location visitors
-* Added `extends` attributes to service description parameters
-* Added getModels to ServiceDescriptionInterface
-
-## 3.0.7 - 2012-12-19
-
-* Fixing phar detection when forcing a cacert to system if null or true
-* Allowing filename to be passed to `Guzzle\Http\Message\Request::setResponseBody()`
-* Cleaning up `Guzzle\Common\Collection::inject` method
-* Adding a response_body location to service descriptions
-
-## 3.0.6 - 2012-12-09
-
-* CurlMulti performance improvements
-* Adding setErrorResponses() to Operation
-* composer.json tweaks
-
-## 3.0.5 - 2012-11-18
-
-* Bug: Fixing an infinite recursion bug caused from revalidating with the CachePlugin
-* Bug: Response body can now be a string containing "0"
-* Bug: Using Guzzle inside of a phar uses system by default but now allows for a custom cacert
-* Bug: QueryString::fromString now properly parses query string parameters that contain equal signs
-* Added support for XML attributes in service description responses
-* DefaultRequestSerializer now supports array URI parameter values for URI template expansion
-* Added better mimetype guessing to requests and post files
-
-## 3.0.4 - 2012-11-11
-
-* Bug: Fixed a bug when adding multiple cookies to a request to use the correct glue value
-* Bug: Cookies can now be added that have a name, domain, or value set to "0"
-* Bug: Using the system cacert bundle when using the Phar
-* Added json and xml methods to Response to make it easier to parse JSON and XML response data into data structures
-* Enhanced cookie jar de-duplication
-* Added the ability to enable strict cookie jars that throw exceptions when invalid cookies are added
-* Added setStream to StreamInterface to actually make it possible to implement custom rewind behavior for entity bodies
-* Added the ability to create any sort of hash for a stream rather than just an MD5 hash
-
-## 3.0.3 - 2012-11-04
-
-* Implementing redirects in PHP rather than cURL
-* Added PECL URI template extension and using as default parser if available
-* Bug: Fixed Content-Length parsing of Response factory
-* Adding rewind() method to entity bodies and streams. Allows for custom rewinding of non-repeatable streams.
-* Adding ToArrayInterface throughout library
-* Fixing OauthPlugin to create unique nonce values per request
-
-## 3.0.2 - 2012-10-25
-
-* Magic methods are enabled by default on clients
-* Magic methods return the result of a command
-* Service clients no longer require a base_url option in the factory
-* Bug: Fixed an issue with URI templates where null template variables were being expanded
-
-## 3.0.1 - 2012-10-22
-
-* Models can now be used like regular collection objects by calling filter, map, etc.
-* Models no longer require a Parameter structure or initial data in the constructor
-* Added a custom AppendIterator to get around a PHP bug with the `\AppendIterator`
-
-## 3.0.0 - 2012-10-15
-
-* Rewrote service description format to be based on Swagger
-    * Now based on JSON schema
-    * Added nested input structures and nested response models
-    * Support for JSON and XML input and output models
-    * Renamed `commands` to `operations`
-    * Removed dot class notation
-    * Removed custom types
-* Broke the project into smaller top-level namespaces to be more component friendly
-* Removed support for XML configs and descriptions. Use arrays or JSON files.
-* Removed the Validation component and Inspector
-* Moved all cookie code to Guzzle\Plugin\Cookie
-* Magic methods on a Guzzle\Service\Client now return the command un-executed.
-* Calling getResult() or getResponse() on a command will lazily execute the command if needed.
-* Now shipping with cURL's CA certs and using it by default
-* Added previousResponse() method to response objects
-* No longer sending Accept and Accept-Encoding headers on every request
-* Only sending an Expect header by default when a payload is greater than 1MB
-* Added/moved client options:
-    * curl.blacklist to curl.option.blacklist
-    * Added ssl.certificate_authority
-* Added a Guzzle\Iterator component
-* Moved plugins from Guzzle\Http\Plugin to Guzzle\Plugin
-* Added a more robust backoff retry strategy (replaced the ExponentialBackoffPlugin)
-* Added a more robust caching plugin
-* Added setBody to response objects
-* Updating LogPlugin to use a more flexible MessageFormatter
-* Added a completely revamped build process
-* Cleaning up Collection class and removing default values from the get method
-* Fixed ZF2 cache adapters
-
-## 2.8.8 - 2012-10-15
-
-* Bug: Fixed a cookie issue that caused dot prefixed domains to not match where popular browsers did
-
-## 2.8.7 - 2012-09-30
-
-* Bug: Fixed config file aliases for JSON includes
-* Bug: Fixed cookie bug on a request object by using CookieParser to parse cookies on requests
-* Bug: Removing the path to a file when sending a Content-Disposition header on a POST upload
-* Bug: Hardening request and response parsing to account for missing parts
-* Bug: Fixed PEAR packaging
-* Bug: Fixed Request::getInfo
-* Bug: Fixed cases where CURLM_CALL_MULTI_PERFORM return codes were causing curl transactions to fail
-* Adding the ability for the namespace Iterator factory to look in multiple directories
-* Added more getters/setters/removers from service descriptions
-* Added the ability to remove POST fields from OAuth signatures
-* OAuth plugin now supports 2-legged OAuth
-
-## 2.8.6 - 2012-09-05
-
-* Added the ability to modify and build service descriptions
-* Added the use of visitors to apply parameters to locations in service descriptions using the dynamic command
-* Added a `json` parameter location
-* Now allowing dot notation for classes in the CacheAdapterFactory
-* Using the union of two arrays rather than an array_merge when extending service builder services and service params
-* Ensuring that a service is a string before doing strpos() checks on it when substituting services for references
-  in service builder config files.
-* Services defined in two different config files that include one another will by default replace the previously
-  defined service, but you can now create services that extend themselves and merge their settings over the previous
-* The JsonLoader now supports aliasing filenames with different filenames. This allows you to alias something like
-  '_default' with a default JSON configuration file.
-
-## 2.8.5 - 2012-08-29
-
-* Bug: Suppressed empty arrays from URI templates
-* Bug: Added the missing $options argument from ServiceDescription::factory to enable caching
-* Added support for HTTP responses that do not contain a reason phrase in the start-line
-* AbstractCommand commands are now invokable
-* Added a way to get the data used when signing an Oauth request before a request is sent
-
-## 2.8.4 - 2012-08-15
-
-* Bug: Custom delay time calculations are no longer ignored in the ExponentialBackoffPlugin
-* Added the ability to transfer entity bodies as a string rather than streamed. This gets around curl error 65. Set `body_as_string` in a request's curl options to enable.
-* Added a StreamInterface, EntityBodyInterface, and added ftell() to Guzzle\Common\Stream
-* Added an AbstractEntityBodyDecorator and a ReadLimitEntityBody decorator to transfer only a subset of a decorated stream
-* Stream and EntityBody objects will now return the file position to the previous position after a read required operation (e.g. getContentMd5())
-* Added additional response status codes
-* Removed SSL information from the default User-Agent header
-* DELETE requests can now send an entity body
-* Added an EventDispatcher to the ExponentialBackoffPlugin and added an ExponentialBackoffLogger to log backoff retries
-* Added the ability of the MockPlugin to consume mocked request bodies
-* LogPlugin now exposes request and response objects in the extras array
-
-## 2.8.3 - 2012-07-30
-
-* Bug: Fixed a case where empty POST requests were sent as GET requests
-* Bug: Fixed a bug in ExponentialBackoffPlugin that caused fatal errors when retrying an EntityEnclosingRequest that does not have a body
-* Bug: Setting the response body of a request to null after completing a request, not when setting the state of a request to new
-* Added multiple inheritance to service description commands
-* Added an ApiCommandInterface and added `getParamNames()` and `hasParam()`
-* Removed the default 2mb size cutoff from the Md5ValidatorPlugin so that it now defaults to validating everything
-* Changed CurlMulti::perform to pass a smaller timeout to CurlMulti::executeHandles
-
-## 2.8.2 - 2012-07-24
-
-* Bug: Query string values set to 0 are no longer dropped from the query string
-* Bug: A Collection object is no longer created each time a call is made to `Guzzle\Service\Command\AbstractCommand::getRequestHeaders()`
-* Bug: `+` is now treated as an encoded space when parsing query strings
-* QueryString and Collection performance improvements
-* Allowing dot notation for class paths in filters attribute of a service descriptions
-
-## 2.8.1 - 2012-07-16
-
-* Loosening Event Dispatcher dependency
-* POST redirects can now be customized using CURLOPT_POSTREDIR
-
-## 2.8.0 - 2012-07-15
-
-* BC: Guzzle\Http\Query
-    * Query strings with empty variables will always show an equal sign unless the variable is set to QueryString::BLANK (e.g. ?acl= vs ?acl)
-    * Changed isEncodingValues() and isEncodingFields() to isUrlEncoding()
-    * Changed setEncodeValues(bool) and setEncodeFields(bool) to useUrlEncoding(bool)
-    * Changed the aggregation functions of QueryString to be static methods
-    * Can now use fromString() with querystrings that have a leading ?
-* cURL configuration values can be specified in service descriptions using `curl.` prefixed parameters
-* Content-Length is set to 0 before emitting the request.before_send event when sending an empty request body
-* Cookies are no longer URL decoded by default
-* Bug: URI template variables set to null are no longer expanded
-
-## 2.7.2 - 2012-07-02
-
-* BC: Moving things to get ready for subtree splits. Moving Inflection into Common. Moving Guzzle\Http\Parser to Guzzle\Parser.
-* BC: Removing Guzzle\Common\Batch\Batch::count() and replacing it with isEmpty()
-* CachePlugin now allows for a custom request parameter function to check if a request can be cached
-* Bug fix: CachePlugin now only caches GET and HEAD requests by default
-* Bug fix: Using header glue when transferring headers over the wire
-* Allowing deeply nested arrays for composite variables in URI templates
-* Batch divisors can now return iterators or arrays
-
-## 2.7.1 - 2012-06-26
-
-* Minor patch to update version number in UA string
-* Updating build process
-
-## 2.7.0 - 2012-06-25
-
-* BC: Inflection classes moved to Guzzle\Inflection. No longer static methods. Can now inject custom inflectors into classes.
-* BC: Removed magic setX methods from commands
-* BC: Magic methods mapped to service description commands are now inflected in the command factory rather than the client __call() method
-* Verbose cURL options are no longer enabled by default. Set curl.debug to true on a client to enable.
-* Bug: Now allowing colons in a response start-line (e.g. HTTP/1.1 503 Service Unavailable: Back-end server is at capacity)
-* Guzzle\Service\Resource\ResourceIteratorApplyBatched now internally uses the Guzzle\Common\Batch namespace
-* Added Guzzle\Service\Plugin namespace and a PluginCollectionPlugin
-* Added the ability to set POST fields and files in a service description
-* Guzzle\Http\EntityBody::factory() now accepts objects with a __toString() method
-* Adding a command.before_prepare event to clients
-* Added BatchClosureTransfer and BatchClosureDivisor
-* BatchTransferException now includes references to the batch divisor and transfer strategies
-* Fixed some tests so that they pass more reliably
-* Added Guzzle\Common\Log\ArrayLogAdapter
-
-## 2.6.6 - 2012-06-10
-
-* BC: Removing Guzzle\Http\Plugin\BatchQueuePlugin
-* BC: Removing Guzzle\Service\Command\CommandSet
-* Adding generic batching system (replaces the batch queue plugin and command set)
-* Updating ZF cache and log adapters and now using ZF's composer repository
-* Bug: Setting the name of each ApiParam when creating through an ApiCommand
-* Adding result_type, result_doc, deprecated, and doc_url to service descriptions
-* Bug: Changed the default cookie header casing back to 'Cookie'
-
-## 2.6.5 - 2012-06-03
-
-* BC: Renaming Guzzle\Http\Message\RequestInterface::getResourceUri() to getResource()
-* BC: Removing unused AUTH_BASIC and AUTH_DIGEST constants from
-* BC: Guzzle\Http\Cookie is now used to manage Set-Cookie data, not Cookie data
-* BC: Renaming methods in the CookieJarInterface
-* Moving almost all cookie logic out of the CookiePlugin and into the Cookie or CookieJar implementations
-* Making the default glue for HTTP headers ';' instead of ','
-* Adding a removeValue to Guzzle\Http\Message\Header
-* Adding getCookies() to request interface.
-* Making it easier to add event subscribers to HasDispatcherInterface classes. Can now directly call addSubscriber()
-
-## 2.6.4 - 2012-05-30
-
-* BC: Cleaning up how POST files are stored in EntityEnclosingRequest objects. Adding PostFile class.
-* BC: Moving ApiCommand specific functionality from the Inspector and on to the ApiCommand
-* Bug: Fixing magic method command calls on clients
-* Bug: Email constraint only validates strings
-* Bug: Aggregate POST fields when POST files are present in curl handle
-* Bug: Fixing default User-Agent header
-* Bug: Only appending or prepending parameters in commands if they are specified
-* Bug: Not requiring response reason phrases or status codes to match a predefined list of codes
-* Allowing the use of dot notation for class namespaces when using instance_of constraint
-* Added any_match validation constraint
-* Added an AsyncPlugin
-* Passing request object to the calculateWait method of the ExponentialBackoffPlugin
-* Allowing the result of a command object to be changed
-* Parsing location and type sub values when instantiating a service description rather than over and over at runtime
-
-## 2.6.3 - 2012-05-23
-
-* [BC] Guzzle\Common\FromConfigInterface no longer requires any config options.
-* [BC] Refactoring how POST files are stored on an EntityEnclosingRequest. They are now separate from POST fields.
-* You can now use an array of data when creating PUT request bodies in the request factory.
-* Removing the requirement that HTTPS requests needed a Cache-Control: public directive to be cacheable.
-* [Http] Adding support for Content-Type in multipart POST uploads per upload
-* [Http] Added support for uploading multiple files using the same name (foo[0], foo[1])
-* Adding more POST data operations for easier manipulation of POST data.
-* You can now set empty POST fields.
-* The body of a request is only shown on EntityEnclosingRequest objects that do not use POST files.
-* Split the Guzzle\Service\Inspector::validateConfig method into two methods. One to initialize when a command is created, and one to validate.
-* CS updates
-
-## 2.6.2 - 2012-05-19
-
-* [Http] Better handling of nested scope requests in CurlMulti.  Requests are now always prepares in the send() method rather than the addRequest() method.
-
-## 2.6.1 - 2012-05-19
-
-* [BC] Removing 'path' support in service descriptions.  Use 'uri'.
-* [BC] Guzzle\Service\Inspector::parseDocBlock is now protected. Adding getApiParamsForClass() with cache.
-* [BC] Removing Guzzle\Common\NullObject.  Use https://github.com/mtdowling/NullObject if you need it.
-* [BC] Removing Guzzle\Common\XmlElement.
-* All commands, both dynamic and concrete, have ApiCommand objects.
-* Adding a fix for CurlMulti so that if all of the connections encounter some sort of curl error, then the loop exits.
-* Adding checks to EntityEnclosingRequest so that empty POST files and fields are ignored.
-* Making the method signature of Guzzle\Service\Builder\ServiceBuilder::factory more flexible.
-
-## 2.6.0 - 2012-05-15
-
-* [BC] Moving Guzzle\Service\Builder to Guzzle\Service\Builder\ServiceBuilder
-* [BC] Executing a Command returns the result of the command rather than the command
-* [BC] Moving all HTTP parsing logic to Guzzle\Http\Parsers. Allows for faster C implementations if needed.
-* [BC] Changing the Guzzle\Http\Message\Response::setProtocol() method to accept a protocol and version in separate args.
-* [BC] Moving ResourceIterator* to Guzzle\Service\Resource
-* [BC] Completely refactored ResourceIterators to iterate over a cloned command object
-* [BC] Moved Guzzle\Http\UriTemplate to Guzzle\Http\Parser\UriTemplate\UriTemplate
-* [BC] Guzzle\Guzzle is now deprecated
-* Moving Guzzle\Common\Guzzle::inject to Guzzle\Common\Collection::inject
-* Adding Guzzle\Version class to give version information about Guzzle
-* Adding Guzzle\Http\Utils class to provide getDefaultUserAgent() and getHttpDate()
-* Adding Guzzle\Curl\CurlVersion to manage caching curl_version() data
-* ServiceDescription and ServiceBuilder are now cacheable using similar configs
-* Changing the format of XML and JSON service builder configs.  Backwards compatible.
-* Cleaned up Cookie parsing
-* Trimming the default Guzzle User-Agent header
-* Adding a setOnComplete() method to Commands that is called when a command completes
-* Keeping track of requests that were mocked in the MockPlugin
-* Fixed a caching bug in the CacheAdapterFactory
-* Inspector objects can be injected into a Command object
-* Refactoring a lot of code and tests to be case insensitive when dealing with headers
-* Adding Guzzle\Http\Message\HeaderComparison for easy comparison of HTTP headers using a DSL
-* Adding the ability to set global option overrides to service builder configs
-* Adding the ability to include other service builder config files from within XML and JSON files
-* Moving the parseQuery method out of Url and on to QueryString::fromString() as a static factory method.
-
-## 2.5.0 - 2012-05-08
-
-* Major performance improvements
-* [BC] Simplifying Guzzle\Common\Collection.  Please check to see if you are using features that are now deprecated.
-* [BC] Using a custom validation system that allows a flyweight implementation for much faster validation. No longer using Symfony2 Validation component.
-* [BC] No longer supporting "{{ }}" for injecting into command or UriTemplates.  Use "{}"
-* Added the ability to passed parameters to all requests created by a client
-* Added callback functionality to the ExponentialBackoffPlugin
-* Using microtime in ExponentialBackoffPlugin to allow more granular backoff strategies.
-* Rewinding request stream bodies when retrying requests
-* Exception is thrown when JSON response body cannot be decoded
-* Added configurable magic method calls to clients and commands.  This is off by default.
-* Fixed a defect that added a hash to every parsed URL part
-* Fixed duplicate none generation for OauthPlugin.
-* Emitting an event each time a client is generated by a ServiceBuilder
-* Using an ApiParams object instead of a Collection for parameters of an ApiCommand
-* cache.* request parameters should be renamed to params.cache.*
-* Added the ability to set arbitrary curl options on requests (disable_wire, progress, etc.). See CurlHandle.
-* Added the ability to disable type validation of service descriptions
-* ServiceDescriptions and ServiceBuilders are now Serializable
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/LICENSE b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/LICENSE
deleted file mode 100644
index 9af9fba682..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2011-2015 Michael Dowling, https://github.com/mtdowling <mtdowling@gmail.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.
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/README.md b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/README.md
deleted file mode 100644
index d41e7e7588..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/README.md
+++ /dev/null
@@ -1,70 +0,0 @@
-Guzzle, PHP HTTP client and webservice framework
-================================================
-
-[![Build Status](https://secure.travis-ci.org/guzzle/guzzle.svg?branch=master)](http://travis-ci.org/guzzle/guzzle)
-
-Guzzle is a PHP HTTP client that makes it easy to send HTTP requests and
-trivial to integrate with web services.
-
-- Manages things like persistent connections, represents query strings as
-  collections, simplifies sending streaming POST requests with fields and
-  files, and abstracts away the underlying HTTP transport layer.
-- Can send both synchronous and asynchronous requests using the same interface
-  without requiring a dependency on a specific event loop.
-- Pluggable HTTP adapters allows Guzzle to integrate with any method you choose
-  for sending HTTP requests over the wire (e.g., cURL, sockets, PHP's stream
-  wrapper, non-blocking event loops like ReactPHP.
-- Guzzle makes it so that you no longer need to fool around with cURL options,
-  stream contexts, or sockets.
-
-```php
-$client = new GuzzleHttp\Client();
-$response = $client->get('http://guzzlephp.org');
-$res = $client->get('https://api.github.com/user', ['auth' =>  ['user', 'pass']]);
-echo $res->getStatusCode();
-// "200"
-echo $res->getHeader('content-type');
-// 'application/json; charset=utf8'
-echo $res->getBody();
-// {"type":"User"...'
-var_export($res->json());
-// Outputs the JSON decoded data
-
-// Send an asynchronous request.
-$req = $client->createRequest('GET', 'http://httpbin.org', ['future' => true]);
-$client->send($req)->then(function ($response) {
-    echo 'I completed! ' . $response;
-});
-```
-
-Get more information and answers with the
-[Documentation](http://guzzlephp.org/),
-[Forums](https://groups.google.com/forum/?hl=en#!forum/guzzle),
-and [Gitter](https://gitter.im/guzzle/guzzle).
-
-### Installing via Composer
-
-The recommended way to install Guzzle is through
-[Composer](http://getcomposer.org).
-
-```bash
-# Install Composer
-curl -sS https://getcomposer.org/installer | php
-```
-
-Next, run the Composer command to install the latest stable version of Guzzle:
-
-```bash
-composer.phar require guzzlehttp/guzzle
-```
-
-After installing, you need to require Composer's autoloader:
-
-```php
-require 'vendor/autoload.php';
-```
-
-### Documentation
-
-More information can be found in the online documentation at
-http://guzzlephp.org/.
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/UPGRADING.md b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/UPGRADING.md
deleted file mode 100644
index 2b3877fa87..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/UPGRADING.md
+++ /dev/null
@@ -1,1050 +0,0 @@
-Guzzle Upgrade Guide
-====================
-
-4.x to 5.0
-----------
-
-## Rewritten Adapter Layer
-
-Guzzle now uses [RingPHP](http://ringphp.readthedocs.org/en/latest) to send
-HTTP requests. The `adapter` option in a `GuzzleHttp\Client` constructor
-is still supported, but it has now been renamed to `handler`. Instead of
-passing a `GuzzleHttp\Adapter\AdapterInterface`, you must now pass a PHP
-`callable` that follows the RingPHP specification.
-
-## Removed Fluent Interfaces
-
-[Fluent interfaces were removed](http://ocramius.github.io/blog/fluent-interfaces-are-evil)
-from the following classes:
-
-- `GuzzleHttp\Collection`
-- `GuzzleHttp\Url`
-- `GuzzleHttp\Query`
-- `GuzzleHttp\Post\PostBody`
-- `GuzzleHttp\Cookie\SetCookie`
-
-## Removed functions.php
-
-Removed "functions.php", so that Guzzle is truly PSR-4 compliant. The following
-functions can be used as replacements.
-
-- `GuzzleHttp\json_decode` -> `GuzzleHttp\Utils::jsonDecode`
-- `GuzzleHttp\get_path` -> `GuzzleHttp\Utils::getPath`
-- `GuzzleHttp\Utils::setPath` -> `GuzzleHttp\set_path`
-- `GuzzleHttp\Pool::batch` -> `GuzzleHttp\batch`. This function is, however,
-  deprecated in favor of using `GuzzleHttp\Pool::batch()`.
-
-The "procedural" global client has been removed with no replacement (e.g.,
-`GuzzleHttp\get()`, `GuzzleHttp\post()`, etc.). Use a `GuzzleHttp\Client`
-object as a replacement.
-
-## `throwImmediately` has been removed
-
-The concept of "throwImmediately" has been removed from exceptions and error
-events. This control mechanism was used to stop a transfer of concurrent
-requests from completing. This can now be handled by throwing the exception or
-by cancelling a pool of requests or each outstanding future request
-individually.
-
-## headers event has been removed
-
-Removed the "headers" event. This event was only useful for changing the
-body a response once the headers of the response were known. You can implement
-a similar behavior in a number of ways. One example might be to use a
-FnStream that has access to the transaction being sent. For example, when the
-first byte is written, you could check if the response headers match your
-expectations, and if so, change the actual stream body that is being
-written to.
-
-## Updates to HTTP Messages
-
-Removed the `asArray` parameter from
-`GuzzleHttp\Message\MessageInterface::getHeader`. If you want to get a header
-value as an array, then use the newly added `getHeaderAsArray()` method of
-`MessageInterface`. This change makes the Guzzle interfaces compatible with
-the PSR-7 interfaces.
-
-3.x to 4.0
-----------
-
-## Overarching changes:
-
-- Now requires PHP 5.4 or greater.
-- No longer requires cURL to send requests.
-- Guzzle no longer wraps every exception it throws. Only exceptions that are
-  recoverable are now wrapped by Guzzle.
-- Various namespaces have been removed or renamed.
-- No longer requiring the Symfony EventDispatcher. A custom event dispatcher
-  based on the Symfony EventDispatcher is
-  now utilized in `GuzzleHttp\Event\EmitterInterface` (resulting in significant
-  speed and functionality improvements).
-
-Changes per Guzzle 3.x namespace are described below.
-
-## Batch
-
-The `Guzzle\Batch` namespace has been removed. This is best left to
-third-parties to implement on top of Guzzle's core HTTP library.
-
-## Cache
-
-The `Guzzle\Cache` namespace has been removed. (Todo: No suitable replacement
-has been implemented yet, but hoping to utilize a PSR cache interface).
-
-## Common
-
-- Removed all of the wrapped exceptions. It's better to use the standard PHP
-  library for unrecoverable exceptions.
-- `FromConfigInterface` has been removed.
-- `Guzzle\Common\Version` has been removed. The VERSION constant can be found
-  at `GuzzleHttp\ClientInterface::VERSION`.
-
-### Collection
-
-- `getAll` has been removed. Use `toArray` to convert a collection to an array.
-- `inject` has been removed.
-- `keySearch` has been removed.
-- `getPath` no longer supports wildcard expressions. Use something better like
-  JMESPath for this.
-- `setPath` now supports appending to an existing array via the `[]` notation.
-
-### Events
-
-Guzzle no longer requires Symfony's EventDispatcher component. Guzzle now uses
-`GuzzleHttp\Event\Emitter`.
-
-- `Symfony\Component\EventDispatcher\EventDispatcherInterface` is replaced by
-  `GuzzleHttp\Event\EmitterInterface`.
-- `Symfony\Component\EventDispatcher\EventDispatcher` is replaced by
-  `GuzzleHttp\Event\Emitter`.
-- `Symfony\Component\EventDispatcher\Event` is replaced by
-  `GuzzleHttp\Event\Event`, and Guzzle now has an EventInterface in
-  `GuzzleHttp\Event\EventInterface`.
-- `AbstractHasDispatcher` has moved to a trait, `HasEmitterTrait`, and
-  `HasDispatcherInterface` has moved to `HasEmitterInterface`. Retrieving the
-  event emitter of a request, client, etc. now uses the `getEmitter` method
-  rather than the `getDispatcher` method.
-
-#### Emitter
-
-- Use the `once()` method to add a listener that automatically removes itself
-  the first time it is invoked.
-- Use the `listeners()` method to retrieve a list of event listeners rather than
-  the `getListeners()` method.
-- Use `emit()` instead of `dispatch()` to emit an event from an emitter.
-- Use `attach()` instead of `addSubscriber()` and `detach()` instead of
-  `removeSubscriber()`.
-
-```php
-$mock = new Mock();
-// 3.x
-$request->getEventDispatcher()->addSubscriber($mock);
-$request->getEventDispatcher()->removeSubscriber($mock);
-// 4.x
-$request->getEmitter()->attach($mock);
-$request->getEmitter()->detach($mock);
-```
-
-Use the `on()` method to add a listener rather than the `addListener()` method.
-
-```php
-// 3.x
-$request->getEventDispatcher()->addListener('foo', function (Event $event) { /* ... */ } );
-// 4.x
-$request->getEmitter()->on('foo', function (Event $event, $name) { /* ... */ } );
-```
-
-## Http
-
-### General changes
-
-- The cacert.pem certificate has been moved to `src/cacert.pem`.
-- Added the concept of adapters that are used to transfer requests over the
-  wire.
-- Simplified the event system.
-- Sending requests in parallel is still possible, but batching is no longer a
-  concept of the HTTP layer. Instead, you must use the `complete` and `error`
-  events to asynchronously manage parallel request transfers.
-- `Guzzle\Http\Url` has moved to `GuzzleHttp\Url`.
-- `Guzzle\Http\QueryString` has moved to `GuzzleHttp\Query`.
-- QueryAggregators have been rewritten so that they are simply callable
-  functions.
-- `GuzzleHttp\StaticClient` has been removed. Use the functions provided in
-  `functions.php` for an easy to use static client instance.
-- Exceptions in `GuzzleHttp\Exception` have been updated to all extend from
-  `GuzzleHttp\Exception\TransferException`.
-
-### Client
-
-Calling methods like `get()`, `post()`, `head()`, etc. no longer create and
-return a request, but rather creates a request, sends the request, and returns
-the response.
-
-```php
-// 3.0
-$request = $client->get('/');
-$response = $request->send();
-
-// 4.0
-$response = $client->get('/');
-
-// or, to mirror the previous behavior
-$request = $client->createRequest('GET', '/');
-$response = $client->send($request);
-```
-
-`GuzzleHttp\ClientInterface` has changed.
-
-- The `send` method no longer accepts more than one request. Use `sendAll` to
-  send multiple requests in parallel.
-- `setUserAgent()` has been removed. Use a default request option instead. You
-  could, for example, do something like:
-  `$client->setConfig('defaults/headers/User-Agent', 'Foo/Bar ' . $client::getDefaultUserAgent())`.
-- `setSslVerification()` has been removed. Use default request options instead,
-  like `$client->setConfig('defaults/verify', true)`.
-
-`GuzzleHttp\Client` has changed.
-
-- The constructor now accepts only an associative array. You can include a
-  `base_url` string or array to use a URI template as the base URL of a client.
-  You can also specify a `defaults` key that is an associative array of default
-  request options. You can pass an `adapter` to use a custom adapter,
-  `batch_adapter` to use a custom adapter for sending requests in parallel, or
-  a `message_factory` to change the factory used to create HTTP requests and
-  responses.
-- The client no longer emits a `client.create_request` event.
-- Creating requests with a client no longer automatically utilize a URI
-  template. You must pass an array into a creational method (e.g.,
-  `createRequest`, `get`, `put`, etc.) in order to expand a URI template.
-
-### Messages
-
-Messages no longer have references to their counterparts (i.e., a request no
-longer has a reference to it's response, and a response no loger has a
-reference to its request). This association is now managed through a
-`GuzzleHttp\Adapter\TransactionInterface` object. You can get references to
-these transaction objects using request events that are emitted over the
-lifecycle of a request.
-
-#### Requests with a body
-
-- `GuzzleHttp\Message\EntityEnclosingRequest` and
-  `GuzzleHttp\Message\EntityEnclosingRequestInterface` have been removed. The
-  separation between requests that contain a body and requests that do not
-  contain a body has been removed, and now `GuzzleHttp\Message\RequestInterface`
-  handles both use cases.
-- Any method that previously accepts a `GuzzleHttp\Response` object now accept a
-  `GuzzleHttp\Message\ResponseInterface`.
-- `GuzzleHttp\Message\RequestFactoryInterface` has been renamed to
-  `GuzzleHttp\Message\MessageFactoryInterface`. This interface is used to create
-  both requests and responses and is implemented in
-  `GuzzleHttp\Message\MessageFactory`.
-- POST field and file methods have been removed from the request object. You
-  must now use the methods made available to `GuzzleHttp\Post\PostBodyInterface`
-  to control the format of a POST body. Requests that are created using a
-  standard `GuzzleHttp\Message\MessageFactoryInterface` will automatically use
-  a `GuzzleHttp\Post\PostBody` body if the body was passed as an array or if
-  the method is POST and no body is provided.
-
-```php
-$request = $client->createRequest('POST', '/');
-$request->getBody()->setField('foo', 'bar');
-$request->getBody()->addFile(new PostFile('file_key', fopen('/path/to/content', 'r')));
-```
-
-#### Headers
-
-- `GuzzleHttp\Message\Header` has been removed. Header values are now simply
-  represented by an array of values or as a string. Header values are returned
-  as a string by default when retrieving a header value from a message. You can
-  pass an optional argument of `true` to retrieve a header value as an array
-  of strings instead of a single concatenated string.
-- `GuzzleHttp\PostFile` and `GuzzleHttp\PostFileInterface` have been moved to
-  `GuzzleHttp\Post`. This interface has been simplified and now allows the
-  addition of arbitrary headers.
-- Custom headers like `GuzzleHttp\Message\Header\Link` have been removed. Most
-  of the custom headers are now handled separately in specific
-  subscribers/plugins, and `GuzzleHttp\Message\HeaderValues::parseParams()` has
-  been updated to properly handle headers that contain parameters (like the
-  `Link` header).
-
-#### Responses
-
-- `GuzzleHttp\Message\Response::getInfo()` and
-  `GuzzleHttp\Message\Response::setInfo()` have been removed. Use the event
-  system to retrieve this type of information.
-- `GuzzleHttp\Message\Response::getRawHeaders()` has been removed.
-- `GuzzleHttp\Message\Response::getMessage()` has been removed.
-- `GuzzleHttp\Message\Response::calculateAge()` and other cache specific
-  methods have moved to the CacheSubscriber.
-- Header specific helper functions like `getContentMd5()` have been removed.
-  Just use `getHeader('Content-MD5')` instead.
-- `GuzzleHttp\Message\Response::setRequest()` and
-  `GuzzleHttp\Message\Response::getRequest()` have been removed. Use the event
-  system to work with request and response objects as a transaction.
-- `GuzzleHttp\Message\Response::getRedirectCount()` has been removed. Use the
-  Redirect subscriber instead.
-- `GuzzleHttp\Message\Response::isSuccessful()` and other related methods have
-  been removed. Use `getStatusCode()` instead.
-
-#### Streaming responses
-
-Streaming requests can now be created by a client directly, returning a
-`GuzzleHttp\Message\ResponseInterface` object that contains a body stream
-referencing an open PHP HTTP stream.
-
-```php
-// 3.0
-use Guzzle\Stream\PhpStreamRequestFactory;
-$request = $client->get('/');
-$factory = new PhpStreamRequestFactory();
-$stream = $factory->fromRequest($request);
-$data = $stream->read(1024);
-
-// 4.0
-$response = $client->get('/', ['stream' => true]);
-// Read some data off of the stream in the response body
-$data = $response->getBody()->read(1024);
-```
-
-#### Redirects
-
-The `configureRedirects()` method has been removed in favor of a
-`allow_redirects` request option.
-
-```php
-// Standard redirects with a default of a max of 5 redirects
-$request = $client->createRequest('GET', '/', ['allow_redirects' => true]);
-
-// Strict redirects with a custom number of redirects
-$request = $client->createRequest('GET', '/', [
-    'allow_redirects' => ['max' => 5, 'strict' => true]
-]);
-```
-
-#### EntityBody
-
-EntityBody interfaces and classes have been removed or moved to
-`GuzzleHttp\Stream`. All classes and interfaces that once required
-`GuzzleHttp\EntityBodyInterface` now require
-`GuzzleHttp\Stream\StreamInterface`. Creating a new body for a request no
-longer uses `GuzzleHttp\EntityBody::factory` but now uses
-`GuzzleHttp\Stream\Stream::factory` or even better:
-`GuzzleHttp\Stream\create()`.
-
-- `Guzzle\Http\EntityBodyInterface` is now `GuzzleHttp\Stream\StreamInterface`
-- `Guzzle\Http\EntityBody` is now `GuzzleHttp\Stream\Stream`
-- `Guzzle\Http\CachingEntityBody` is now `GuzzleHttp\Stream\CachingStream`
-- `Guzzle\Http\ReadLimitEntityBody` is now `GuzzleHttp\Stream\LimitStream`
-- `Guzzle\Http\IoEmittyinEntityBody` has been removed.
-
-#### Request lifecycle events
-
-Requests previously submitted a large number of requests. The number of events
-emitted over the lifecycle of a request has been significantly reduced to make
-it easier to understand how to extend the behavior of a request. All events
-emitted during the lifecycle of a request now emit a custom
-`GuzzleHttp\Event\EventInterface` object that contains context providing
-methods and a way in which to modify the transaction at that specific point in
-time (e.g., intercept the request and set a response on the transaction).
-
-- `request.before_send` has been renamed to `before` and now emits a
-  `GuzzleHttp\Event\BeforeEvent`
-- `request.complete` has been renamed to `complete` and now emits a
-  `GuzzleHttp\Event\CompleteEvent`.
-- `request.sent` has been removed. Use `complete`.
-- `request.success` has been removed. Use `complete`.
-- `error` is now an event that emits a `GuzzleHttp\Event\ErrorEvent`.
-- `request.exception` has been removed. Use `error`.
-- `request.receive.status_line` has been removed.
-- `curl.callback.progress` has been removed. Use a custom `StreamInterface` to
-  maintain a status update.
-- `curl.callback.write` has been removed. Use a custom `StreamInterface` to
-  intercept writes.
-- `curl.callback.read` has been removed. Use a custom `StreamInterface` to
-  intercept reads.
-
-`headers` is a new event that is emitted after the response headers of a
-request have been received before the body of the response is downloaded. This
-event emits a `GuzzleHttp\Event\HeadersEvent`.
-
-You can intercept a request and inject a response using the `intercept()` event
-of a `GuzzleHttp\Event\BeforeEvent`, `GuzzleHttp\Event\CompleteEvent`, and
-`GuzzleHttp\Event\ErrorEvent` event.
-
-See: http://docs.guzzlephp.org/en/latest/events.html
-
-## Inflection
-
-The `Guzzle\Inflection` namespace has been removed. This is not a core concern
-of Guzzle.
-
-## Iterator
-
-The `Guzzle\Iterator` namespace has been removed.
-
-- `Guzzle\Iterator\AppendIterator`, `Guzzle\Iterator\ChunkedIterator`, and
-  `Guzzle\Iterator\MethodProxyIterator` are nice, but not a core requirement of
-  Guzzle itself.
-- `Guzzle\Iterator\FilterIterator` is no longer needed because an equivalent
-  class is shipped with PHP 5.4.
-- `Guzzle\Iterator\MapIterator` is not really needed when using PHP 5.5 because
-  it's easier to just wrap an iterator in a generator that maps values.
-
-For a replacement of these iterators, see https://github.com/nikic/iter
-
-## Log
-
-The LogPlugin has moved to https://github.com/guzzle/log-subscriber. The
-`Guzzle\Log` namespace has been removed. Guzzle now relies on
-`Psr\Log\LoggerInterface` for all logging. The MessageFormatter class has been
-moved to `GuzzleHttp\Subscriber\Log\Formatter`.
-
-## Parser
-
-The `Guzzle\Parser` namespace has been removed. This was previously used to
-make it possible to plug in custom parsers for cookies, messages, URI
-templates, and URLs; however, this level of complexity is not needed in Guzzle
-so it has been removed.
-
-- Cookie: Cookie parsing logic has been moved to
-  `GuzzleHttp\Cookie\SetCookie::fromString`.
-- Message: Message parsing logic for both requests and responses has been moved
-  to `GuzzleHttp\Message\MessageFactory::fromMessage`. Message parsing is only
-  used in debugging or deserializing messages, so it doesn't make sense for
-  Guzzle as a library to add this level of complexity to parsing messages.
-- UriTemplate: URI template parsing has been moved to
-  `GuzzleHttp\UriTemplate`. The Guzzle library will automatically use the PECL
-  URI template library if it is installed.
-- Url: URL parsing is now performed in `GuzzleHttp\Url::fromString` (previously
-  it was `Guzzle\Http\Url::factory()`). If custom URL parsing is necessary,
-  then developers are free to subclass `GuzzleHttp\Url`.
-
-## Plugin
-
-The `Guzzle\Plugin` namespace has been renamed to `GuzzleHttp\Subscriber`.
-Several plugins are shipping with the core Guzzle library under this namespace.
-
-- `GuzzleHttp\Subscriber\Cookie`: Replaces the old CookiePlugin. Cookie jar
-  code has moved to `GuzzleHttp\Cookie`.
-- `GuzzleHttp\Subscriber\History`: Replaces the old HistoryPlugin.
-- `GuzzleHttp\Subscriber\HttpError`: Throws errors when a bad HTTP response is
-  received.
-- `GuzzleHttp\Subscriber\Mock`: Replaces the old MockPlugin.
-- `GuzzleHttp\Subscriber\Prepare`: Prepares the body of a request just before
-  sending. This subscriber is attached to all requests by default.
-- `GuzzleHttp\Subscriber\Redirect`: Replaces the RedirectPlugin.
-
-The following plugins have been removed (third-parties are free to re-implement
-these if needed):
-
-- `GuzzleHttp\Plugin\Async` has been removed.
-- `GuzzleHttp\Plugin\CurlAuth` has been removed.
-- `GuzzleHttp\Plugin\ErrorResponse\ErrorResponsePlugin` has been removed. This
-  functionality should instead be implemented with event listeners that occur
-  after normal response parsing occurs in the guzzle/command package.
-
-The following plugins are not part of the core Guzzle package, but are provided
-in separate repositories:
-
-- `Guzzle\Http\Plugin\BackoffPlugin` has been rewritten to be muchs simpler
-  to build custom retry policies using simple functions rather than various
-  chained classes. See: https://github.com/guzzle/retry-subscriber
-- `Guzzle\Http\Plugin\Cache\CachePlugin` has moved to
-  https://github.com/guzzle/cache-subscriber
-- `Guzzle\Http\Plugin\Log\LogPlugin` has moved to
-  https://github.com/guzzle/log-subscriber
-- `Guzzle\Http\Plugin\Md5\Md5Plugin` has moved to
-  https://github.com/guzzle/message-integrity-subscriber
-- `Guzzle\Http\Plugin\Mock\MockPlugin` has moved to
-  `GuzzleHttp\Subscriber\MockSubscriber`.
-- `Guzzle\Http\Plugin\Oauth\OauthPlugin` has moved to
-  https://github.com/guzzle/oauth-subscriber
-
-## Service
-
-The service description layer of Guzzle has moved into two separate packages:
-
-- http://github.com/guzzle/command Provides a high level abstraction over web
-  services by representing web service operations using commands.
-- http://github.com/guzzle/guzzle-services Provides an implementation of
-  guzzle/command that provides request serialization and response parsing using
-  Guzzle service descriptions.
-
-## Stream
-
-Stream have moved to a separate package available at
-https://github.com/guzzle/streams.
-
-`Guzzle\Stream\StreamInterface` has been given a large update to cleanly take
-on the responsibilities of `Guzzle\Http\EntityBody` and
-`Guzzle\Http\EntityBodyInterface` now that they have been removed. The number
-of methods implemented by the `StreamInterface` has been drastically reduced to
-allow developers to more easily extend and decorate stream behavior.
-
-## Removed methods from StreamInterface
-
-- `getStream` and `setStream` have been removed to better encapsulate streams.
-- `getMetadata` and `setMetadata` have been removed in favor of
-  `GuzzleHttp\Stream\MetadataStreamInterface`.
-- `getWrapper`, `getWrapperData`, `getStreamType`, and `getUri` have all been
-  removed. This data is accessible when
-  using streams that implement `GuzzleHttp\Stream\MetadataStreamInterface`.
-- `rewind` has been removed. Use `seek(0)` for a similar behavior.
-
-## Renamed methods
-
-- `detachStream` has been renamed to `detach`.
-- `feof` has been renamed to `eof`.
-- `ftell` has been renamed to `tell`.
-- `readLine` has moved from an instance method to a static class method of
-  `GuzzleHttp\Stream\Stream`.
-
-## Metadata streams
-
-`GuzzleHttp\Stream\MetadataStreamInterface` has been added to denote streams
-that contain additional metadata accessible via `getMetadata()`.
-`GuzzleHttp\Stream\StreamInterface::getMetadata` and
-`GuzzleHttp\Stream\StreamInterface::setMetadata` have been removed.
-
-## StreamRequestFactory
-
-The entire concept of the StreamRequestFactory has been removed. The way this
-was used in Guzzle 3 broke the actual interface of sending streaming requests
-(instead of getting back a Response, you got a StreamInterface). Streeaming
-PHP requests are now implemented throught the `GuzzleHttp\Adapter\StreamAdapter`.
-
-3.6 to 3.7
-----------
-
-### Deprecations
-
-- You can now enable E_USER_DEPRECATED warnings to see if you are using any deprecated methods.:
-
-```php
-\Guzzle\Common\Version::$emitWarnings = true;
-```
-
-The following APIs and options have been marked as deprecated:
-
-- Marked `Guzzle\Http\Message\Request::isResponseBodyRepeatable()` as deprecated. Use `$request->getResponseBody()->isRepeatable()` instead.
-- Marked `Guzzle\Http\Message\Request::canCache()` as deprecated. Use `Guzzle\Plugin\Cache\DefaultCanCacheStrategy->canCacheRequest()` instead.
-- Marked `Guzzle\Http\Message\Request::canCache()` as deprecated. Use `Guzzle\Plugin\Cache\DefaultCanCacheStrategy->canCacheRequest()` instead.
-- Marked `Guzzle\Http\Message\Request::setIsRedirect()` as deprecated. Use the HistoryPlugin instead.
-- Marked `Guzzle\Http\Message\Request::isRedirect()` as deprecated. Use the HistoryPlugin instead.
-- Marked `Guzzle\Cache\CacheAdapterFactory::factory()` as deprecated
-- Marked `Guzzle\Service\Client::enableMagicMethods()` as deprecated. Magic methods can no longer be disabled on a Guzzle\Service\Client.
-- Marked `Guzzle\Parser\Url\UrlParser` as deprecated. Just use PHP's `parse_url()` and percent encode your UTF-8.
-- Marked `Guzzle\Common\Collection::inject()` as deprecated.
-- Marked `Guzzle\Plugin\CurlAuth\CurlAuthPlugin` as deprecated. Use
-  `$client->getConfig()->setPath('request.options/auth', array('user', 'pass', 'Basic|Digest|NTLM|Any'));` or
-  `$client->setDefaultOption('auth', array('user', 'pass', 'Basic|Digest|NTLM|Any'));`
-
-3.7 introduces `request.options` as a parameter for a client configuration and as an optional argument to all creational
-request methods. When paired with a client's configuration settings, these options allow you to specify default settings
-for various aspects of a request. Because these options make other previous configuration options redundant, several
-configuration options and methods of a client and AbstractCommand have been deprecated.
-
-- Marked `Guzzle\Service\Client::getDefaultHeaders()` as deprecated. Use `$client->getDefaultOption('headers')`.
-- Marked `Guzzle\Service\Client::setDefaultHeaders()` as deprecated. Use `$client->setDefaultOption('headers/{header_name}', 'value')`.
-- Marked 'request.params' for `Guzzle\Http\Client` as deprecated. Use `$client->setDefaultOption('params/{param_name}', 'value')`
-- Marked 'command.headers', 'command.response_body' and 'command.on_complete' as deprecated for AbstractCommand. These will work through Guzzle 4.0
-
-        $command = $client->getCommand('foo', array(
-            'command.headers' => array('Test' => '123'),
-            'command.response_body' => '/path/to/file'
-        ));
-
-        // Should be changed to:
-
-        $command = $client->getCommand('foo', array(
-            'command.request_options' => array(
-                'headers' => array('Test' => '123'),
-                'save_as' => '/path/to/file'
-            )
-        ));
-
-### Interface changes
-
-Additions and changes (you will need to update any implementations or subclasses you may have created):
-
-- Added an `$options` argument to the end of the following methods of `Guzzle\Http\ClientInterface`:
-  createRequest, head, delete, put, patch, post, options, prepareRequest
-- Added an `$options` argument to the end of `Guzzle\Http\Message\Request\RequestFactoryInterface::createRequest()`
-- Added an `applyOptions()` method to `Guzzle\Http\Message\Request\RequestFactoryInterface`
-- Changed `Guzzle\Http\ClientInterface::get($uri = null, $headers = null, $body = null)` to
-  `Guzzle\Http\ClientInterface::get($uri = null, $headers = null, $options = array())`. You can still pass in a
-  resource, string, or EntityBody into the $options parameter to specify the download location of the response.
-- Changed `Guzzle\Common\Collection::__construct($data)` to no longer accepts a null value for `$data` but a
-  default `array()`
-- Added `Guzzle\Stream\StreamInterface::isRepeatable`
-- Made `Guzzle\Http\Client::expandTemplate` and `getUriTemplate` protected methods.
-
-The following methods were removed from interfaces. All of these methods are still available in the concrete classes
-that implement them, but you should update your code to use alternative methods:
-
-- Removed `Guzzle\Http\ClientInterface::setDefaultHeaders(). Use
-  `$client->getConfig()->setPath('request.options/headers/{header_name}', 'value')`. or
-  `$client->getConfig()->setPath('request.options/headers', array('header_name' => 'value'))` or
-  `$client->setDefaultOption('headers/{header_name}', 'value')`. or
-  `$client->setDefaultOption('headers', array('header_name' => 'value'))`.
-- Removed `Guzzle\Http\ClientInterface::getDefaultHeaders(). Use `$client->getConfig()->getPath('request.options/headers')`.
-- Removed `Guzzle\Http\ClientInterface::expandTemplate()`. This is an implementation detail.
-- Removed `Guzzle\Http\ClientInterface::setRequestFactory()`. This is an implementation detail.
-- Removed `Guzzle\Http\ClientInterface::getCurlMulti()`. This is a very specific implementation detail.
-- Removed `Guzzle\Http\Message\RequestInterface::canCache`. Use the CachePlugin.
-- Removed `Guzzle\Http\Message\RequestInterface::setIsRedirect`. Use the HistoryPlugin.
-- Removed `Guzzle\Http\Message\RequestInterface::isRedirect`. Use the HistoryPlugin.
-
-### Cache plugin breaking changes
-
-- CacheKeyProviderInterface and DefaultCacheKeyProvider are no longer used. All of this logic is handled in a
-  CacheStorageInterface. These two objects and interface will be removed in a future version.
-- Always setting X-cache headers on cached responses
-- Default cache TTLs are now handled by the CacheStorageInterface of a CachePlugin
-- `CacheStorageInterface::cache($key, Response $response, $ttl = null)` has changed to `cache(RequestInterface
-  $request, Response $response);`
-- `CacheStorageInterface::fetch($key)` has changed to `fetch(RequestInterface $request);`
-- `CacheStorageInterface::delete($key)` has changed to `delete(RequestInterface $request);`
-- Added `CacheStorageInterface::purge($url)`
-- `DefaultRevalidation::__construct(CacheKeyProviderInterface $cacheKey, CacheStorageInterface $cache, CachePlugin
-  $plugin)` has changed to `DefaultRevalidation::__construct(CacheStorageInterface $cache,
-  CanCacheStrategyInterface $canCache = null)`
-- Added `RevalidationInterface::shouldRevalidate(RequestInterface $request, Response $response)`
-
-3.5 to 3.6
-----------
-
-* Mixed casing of headers are now forced to be a single consistent casing across all values for that header.
-* Messages internally use a HeaderCollection object to delegate handling case-insensitive header resolution
-* Removed the whole changedHeader() function system of messages because all header changes now go through addHeader().
-  For example, setHeader() first removes the header using unset on a HeaderCollection and then calls addHeader().
-  Keeping the Host header and URL host in sync is now handled by overriding the addHeader method in Request.
-* Specific header implementations can be created for complex headers. When a message creates a header, it uses a
-  HeaderFactory which can map specific headers to specific header classes. There is now a Link header and
-  CacheControl header implementation.
-* Moved getLinks() from Response to just be used on a Link header object.
-
-If you previously relied on Guzzle\Http\Message\Header::raw(), then you will need to update your code to use the
-HeaderInterface (e.g. toArray(), getAll(), etc.).
-
-### Interface changes
-
-* Removed from interface: Guzzle\Http\ClientInterface::setUriTemplate
-* Removed from interface: Guzzle\Http\ClientInterface::setCurlMulti()
-* Removed Guzzle\Http\Message\Request::receivedRequestHeader() and implemented this functionality in
-  Guzzle\Http\Curl\RequestMediator
-* Removed the optional $asString parameter from MessageInterface::getHeader(). Just cast the header to a string.
-* Removed the optional $tryChunkedTransfer option from Guzzle\Http\Message\EntityEnclosingRequestInterface
-* Removed the $asObjects argument from Guzzle\Http\Message\MessageInterface::getHeaders()
-
-### Removed deprecated functions
-
-* Removed Guzzle\Parser\ParserRegister::get(). Use getParser()
-* Removed Guzzle\Parser\ParserRegister::set(). Use registerParser().
-
-### Deprecations
-
-* The ability to case-insensitively search for header values
-* Guzzle\Http\Message\Header::hasExactHeader
-* Guzzle\Http\Message\Header::raw. Use getAll()
-* Deprecated cache control specific methods on Guzzle\Http\Message\AbstractMessage. Use the CacheControl header object
-  instead.
-
-### Other changes
-
-* All response header helper functions return a string rather than mixing Header objects and strings inconsistently
-* Removed cURL blacklist support. This is no longer necessary now that Expect, Accept, etc. are managed by Guzzle
-  directly via interfaces
-* Removed the injecting of a request object onto a response object. The methods to get and set a request still exist
-  but are a no-op until removed.
-* Most classes that used to require a `Guzzle\Service\Command\CommandInterface` typehint now request a
-  `Guzzle\Service\Command\ArrayCommandInterface`.
-* Added `Guzzle\Http\Message\RequestInterface::startResponse()` to the RequestInterface to handle injecting a response
-  on a request while the request is still being transferred
-* `Guzzle\Service\Command\CommandInterface` now extends from ToArrayInterface and ArrayAccess
-
-3.3 to 3.4
-----------
-
-Base URLs of a client now follow the rules of http://tools.ietf.org/html/rfc3986#section-5.2.2 when merging URLs.
-
-3.2 to 3.3
-----------
-
-### Response::getEtag() quote stripping removed
-
-`Guzzle\Http\Message\Response::getEtag()` no longer strips quotes around the ETag response header
-
-### Removed `Guzzle\Http\Utils`
-
-The `Guzzle\Http\Utils` class was removed. This class was only used for testing.
-
-### Stream wrapper and type
-
-`Guzzle\Stream\Stream::getWrapper()` and `Guzzle\Stream\Stream::getStreamType()` are no longer converted to lowercase.
-
-### curl.emit_io became emit_io
-
-Emitting IO events from a RequestMediator is now a parameter that must be set in a request's curl options using the
-'emit_io' key. This was previously set under a request's parameters using 'curl.emit_io'
-
-3.1 to 3.2
-----------
-
-### CurlMulti is no longer reused globally
-
-Before 3.2, the same CurlMulti object was reused globally for each client. This can cause issue where plugins added
-to a single client can pollute requests dispatched from other clients.
-
-If you still wish to reuse the same CurlMulti object with each client, then you can add a listener to the
-ServiceBuilder's `service_builder.create_client` event to inject a custom CurlMulti object into each client as it is
-created.
-
-```php
-$multi = new Guzzle\Http\Curl\CurlMulti();
-$builder = Guzzle\Service\Builder\ServiceBuilder::factory('/path/to/config.json');
-$builder->addListener('service_builder.create_client', function ($event) use ($multi) {
-    $event['client']->setCurlMulti($multi);
-}
-});
-```
-
-### No default path
-
-URLs no longer have a default path value of '/' if no path was specified.
-
-Before:
-
-```php
-$request = $client->get('http://www.foo.com');
-echo $request->getUrl();
-// >> http://www.foo.com/
-```
-
-After:
-
-```php
-$request = $client->get('http://www.foo.com');
-echo $request->getUrl();
-// >> http://www.foo.com
-```
-
-### Less verbose BadResponseException
-
-The exception message for `Guzzle\Http\Exception\BadResponseException` no longer contains the full HTTP request and
-response information. You can, however, get access to the request and response object by calling `getRequest()` or
-`getResponse()` on the exception object.
-
-### Query parameter aggregation
-
-Multi-valued query parameters are no longer aggregated using a callback function. `Guzzle\Http\Query` now has a
-setAggregator() method that accepts a `Guzzle\Http\QueryAggregator\QueryAggregatorInterface` object. This object is
-responsible for handling the aggregation of multi-valued query string variables into a flattened hash.
-
-2.8 to 3.x
-----------
-
-### Guzzle\Service\Inspector
-
-Change `\Guzzle\Service\Inspector::fromConfig` to `\Guzzle\Common\Collection::fromConfig`
-
-**Before**
-
-```php
-use Guzzle\Service\Inspector;
-
-class YourClient extends \Guzzle\Service\Client
-{
-    public static function factory($config = array())
-    {
-        $default = array();
-        $required = array('base_url', 'username', 'api_key');
-        $config = Inspector::fromConfig($config, $default, $required);
-
-        $client = new self(
-            $config->get('base_url'),
-            $config->get('username'),
-            $config->get('api_key')
-        );
-        $client->setConfig($config);
-
-        $client->setDescription(ServiceDescription::factory(__DIR__ . DIRECTORY_SEPARATOR . 'client.json'));
-
-        return $client;
-    }
-```
-
-**After**
-
-```php
-use Guzzle\Common\Collection;
-
-class YourClient extends \Guzzle\Service\Client
-{
-    public static function factory($config = array())
-    {
-        $default = array();
-        $required = array('base_url', 'username', 'api_key');
-        $config = Collection::fromConfig($config, $default, $required);
-
-        $client = new self(
-            $config->get('base_url'),
-            $config->get('username'),
-            $config->get('api_key')
-        );
-        $client->setConfig($config);
-
-        $client->setDescription(ServiceDescription::factory(__DIR__ . DIRECTORY_SEPARATOR . 'client.json'));
-
-        return $client;
-    }
-```
-
-### Convert XML Service Descriptions to JSON
-
-**Before**
-
-```xml
-<?xml version="1.0" encoding="UTF-8"?>
-<client>
-    <commands>
-        <!-- Groups -->
-        <command name="list_groups" method="GET" uri="groups.json">
-            <doc>Get a list of groups</doc>
-        </command>
-        <command name="search_groups" method="GET" uri='search.json?query="{{query}} type:group"'>
-            <doc>Uses a search query to get a list of groups</doc>
-            <param name="query" type="string" required="true" />
-        </command>
-        <command name="create_group" method="POST" uri="groups.json">
-            <doc>Create a group</doc>
-            <param name="data" type="array" location="body" filters="json_encode" doc="Group JSON"/>
-            <param name="Content-Type" location="header" static="application/json"/>
-        </command>
-        <command name="delete_group" method="DELETE" uri="groups/{{id}}.json">
-            <doc>Delete a group by ID</doc>
-            <param name="id" type="integer" required="true"/>
-        </command>
-        <command name="get_group" method="GET" uri="groups/{{id}}.json">
-            <param name="id" type="integer" required="true"/>
-        </command>
-        <command name="update_group" method="PUT" uri="groups/{{id}}.json">
-            <doc>Update a group</doc>
-            <param name="id" type="integer" required="true"/>
-            <param name="data" type="array" location="body" filters="json_encode" doc="Group JSON"/>
-            <param name="Content-Type" location="header" static="application/json"/>
-        </command>
-    </commands>
-</client>
-```
-
-**After**
-
-```json
-{
-    "name":       "Zendesk REST API v2",
-    "apiVersion": "2012-12-31",
-    "description":"Provides access to Zendesk views, groups, tickets, ticket fields, and users",
-    "operations": {
-        "list_groups":  {
-            "httpMethod":"GET",
-            "uri":       "groups.json",
-            "summary":   "Get a list of groups"
-        },
-        "search_groups":{
-            "httpMethod":"GET",
-            "uri":       "search.json?query=\"{query} type:group\"",
-            "summary":   "Uses a search query to get a list of groups",
-            "parameters":{
-                "query":{
-                    "location":   "uri",
-                    "description":"Zendesk Search Query",
-                    "type":       "string",
-                    "required":   true
-                }
-            }
-        },
-        "create_group": {
-            "httpMethod":"POST",
-            "uri":       "groups.json",
-            "summary":   "Create a group",
-            "parameters":{
-                "data":        {
-                    "type":       "array",
-                    "location":   "body",
-                    "description":"Group JSON",
-                    "filters":    "json_encode",
-                    "required":   true
-                },
-                "Content-Type":{
-                    "type":    "string",
-                    "location":"header",
-                    "static":  "application/json"
-                }
-            }
-        },
-        "delete_group": {
-            "httpMethod":"DELETE",
-            "uri":       "groups/{id}.json",
-            "summary":   "Delete a group",
-            "parameters":{
-                "id":{
-                    "location":   "uri",
-                    "description":"Group to delete by ID",
-                    "type":       "integer",
-                    "required":   true
-                }
-            }
-        },
-        "get_group":    {
-            "httpMethod":"GET",
-            "uri":       "groups/{id}.json",
-            "summary":   "Get a ticket",
-            "parameters":{
-                "id":{
-                    "location":   "uri",
-                    "description":"Group to get by ID",
-                    "type":       "integer",
-                    "required":   true
-                }
-            }
-        },
-        "update_group": {
-            "httpMethod":"PUT",
-            "uri":       "groups/{id}.json",
-            "summary":   "Update a group",
-            "parameters":{
-                "id":          {
-                    "location":   "uri",
-                    "description":"Group to update by ID",
-                    "type":       "integer",
-                    "required":   true
-                },
-                "data":        {
-                    "type":       "array",
-                    "location":   "body",
-                    "description":"Group JSON",
-                    "filters":    "json_encode",
-                    "required":   true
-                },
-                "Content-Type":{
-                    "type":    "string",
-                    "location":"header",
-                    "static":  "application/json"
-                }
-            }
-        }
-}
-```
-
-### Guzzle\Service\Description\ServiceDescription
-
-Commands are now called Operations
-
-**Before**
-
-```php
-use Guzzle\Service\Description\ServiceDescription;
-
-$sd = new ServiceDescription();
-$sd->getCommands();     // @returns ApiCommandInterface[]
-$sd->hasCommand($name);
-$sd->getCommand($name); // @returns ApiCommandInterface|null
-$sd->addCommand($command); // @param ApiCommandInterface $command
-```
-
-**After**
-
-```php
-use Guzzle\Service\Description\ServiceDescription;
-
-$sd = new ServiceDescription();
-$sd->getOperations();           // @returns OperationInterface[]
-$sd->hasOperation($name);
-$sd->getOperation($name);       // @returns OperationInterface|null
-$sd->addOperation($operation);  // @param OperationInterface $operation
-```
-
-### Guzzle\Common\Inflection\Inflector
-
-Namespace is now `Guzzle\Inflection\Inflector`
-
-### Guzzle\Http\Plugin
-
-Namespace is now `Guzzle\Plugin`. Many other changes occur within this namespace and are detailed in their own sections below.
-
-### Guzzle\Http\Plugin\LogPlugin and Guzzle\Common\Log
-
-Now `Guzzle\Plugin\Log\LogPlugin` and `Guzzle\Log` respectively.
-
-**Before**
-
-```php
-use Guzzle\Common\Log\ClosureLogAdapter;
-use Guzzle\Http\Plugin\LogPlugin;
-
-/** @var \Guzzle\Http\Client */
-$client;
-
-// $verbosity is an integer indicating desired message verbosity level
-$client->addSubscriber(new LogPlugin(new ClosureLogAdapter(function($m) { echo $m; }, $verbosity = LogPlugin::LOG_VERBOSE);
-```
-
-**After**
-
-```php
-use Guzzle\Log\ClosureLogAdapter;
-use Guzzle\Log\MessageFormatter;
-use Guzzle\Plugin\Log\LogPlugin;
-
-/** @var \Guzzle\Http\Client */
-$client;
-
-// $format is a string indicating desired message format -- @see MessageFormatter
-$client->addSubscriber(new LogPlugin(new ClosureLogAdapter(function($m) { echo $m; }, $format = MessageFormatter::DEBUG_FORMAT);
-```
-
-### Guzzle\Http\Plugin\CurlAuthPlugin
-
-Now `Guzzle\Plugin\CurlAuth\CurlAuthPlugin`.
-
-### Guzzle\Http\Plugin\ExponentialBackoffPlugin
-
-Now `Guzzle\Plugin\Backoff\BackoffPlugin`, and other changes.
-
-**Before**
-
-```php
-use Guzzle\Http\Plugin\ExponentialBackoffPlugin;
-
-$backoffPlugin = new ExponentialBackoffPlugin($maxRetries, array_merge(
-        ExponentialBackoffPlugin::getDefaultFailureCodes(), array(429)
-    ));
-
-$client->addSubscriber($backoffPlugin);
-```
-
-**After**
-
-```php
-use Guzzle\Plugin\Backoff\BackoffPlugin;
-use Guzzle\Plugin\Backoff\HttpBackoffStrategy;
-
-// Use convenient factory method instead -- see implementation for ideas of what
-// you can do with chaining backoff strategies
-$backoffPlugin = BackoffPlugin::getExponentialBackoff($maxRetries, array_merge(
-        HttpBackoffStrategy::getDefaultFailureCodes(), array(429)
-    ));
-$client->addSubscriber($backoffPlugin);
-```
-
-### Known Issues
-
-#### [BUG] Accept-Encoding header behavior changed unintentionally.
-
-(See #217) (Fixed in 09daeb8c666fb44499a0646d655a8ae36456575e)
-
-In version 2.8 setting the `Accept-Encoding` header would set the CURLOPT_ENCODING option, which permitted cURL to
-properly handle gzip/deflate compressed responses from the server. In versions affected by this bug this does not happen.
-See issue #217 for a workaround, or use a version containing the fix.
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/composer.json b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/composer.json
deleted file mode 100644
index 717b3be4b3..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "guzzlehttp/guzzle",
-    "type": "library",
-    "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients",
-    "keywords": ["framework", "http", "rest", "web service", "curl", "client", "HTTP client"],
-    "homepage": "http://guzzlephp.org/",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Michael Dowling",
-            "email": "mtdowling@gmail.com",
-            "homepage": "https://github.com/mtdowling"
-        }
-    ],
-    "require": {
-        "php": ">=5.4.0",
-        "guzzlehttp/ringphp": "^1.1"
-    },
-    "require-dev": {
-        "ext-curl": "*",
-        "phpunit/phpunit": "^4.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "GuzzleHttp\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "GuzzleHttp\\Tests\\": "tests/"
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/BatchResults.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/BatchResults.php
deleted file mode 100644
index e5af433ddf..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/BatchResults.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-/**
- * Represents the result of a batch operation. This result container is
- * iterable, countable, and you can can get a result by value using the
- * getResult function.
- *
- * Successful results are anything other than exceptions. Failure results are
- * exceptions.
- *
- * @package GuzzleHttp
- */
-class BatchResults implements \Countable, \IteratorAggregate, \ArrayAccess
-{
-    private $hash;
-
-    /**
-     * @param \SplObjectStorage $hash Hash of key objects to result values.
-     */
-    public function __construct(\SplObjectStorage $hash)
-    {
-        $this->hash = $hash;
-    }
-
-    /**
-     * Get the keys that are available on the batch result.
-     *
-     * @return array
-     */
-    public function getKeys()
-    {
-        return iterator_to_array($this->hash);
-    }
-
-    /**
-     * Gets a result from the container for the given object. When getting
-     * results for a batch of requests, provide the request object.
-     *
-     * @param object $forObject Object to retrieve the result for.
-     *
-     * @return mixed|null
-     */
-    public function getResult($forObject)
-    {
-        return isset($this->hash[$forObject]) ? $this->hash[$forObject] : null;
-    }
-
-    /**
-     * Get an array of successful results.
-     *
-     * @return array
-     */
-    public function getSuccessful()
-    {
-        $results = [];
-        foreach ($this->hash as $key) {
-            if (!($this->hash[$key] instanceof \Exception)) {
-                $results[] = $this->hash[$key];
-            }
-        }
-
-        return $results;
-    }
-
-    /**
-     * Get an array of failed results.
-     *
-     * @return array
-     */
-    public function getFailures()
-    {
-        $results = [];
-        foreach ($this->hash as $key) {
-            if ($this->hash[$key] instanceof \Exception) {
-                $results[] = $this->hash[$key];
-            }
-        }
-
-        return $results;
-    }
-
-    /**
-     * Allows iteration over all batch result values.
-     *
-     * @return \ArrayIterator
-     */
-    public function getIterator()
-    {
-        $results = [];
-        foreach ($this->hash as $key) {
-            $results[] = $this->hash[$key];
-        }
-
-        return new \ArrayIterator($results);
-    }
-
-    /**
-     * Counts the number of elements in the batch result.
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->hash);
-    }
-
-    /**
-     * Checks if the batch contains a specific numerical array index.
-     *
-     * @param int $key Index to access
-     *
-     * @return bool
-     */
-    public function offsetExists($key)
-    {
-        return $key < count($this->hash);
-    }
-
-    /**
-     * Allows access of the batch using a numerical array index.
-     *
-     * @param int $key Index to access.
-     *
-     * @return mixed|null
-     */
-    public function offsetGet($key)
-    {
-        $i = -1;
-        foreach ($this->hash as $obj) {
-            if ($key === ++$i) {
-                return $this->hash[$obj];
-            }
-        }
-
-        return null;
-    }
-
-    public function offsetUnset($key)
-    {
-        throw new \RuntimeException('Not implemented');
-    }
-
-    public function offsetSet($key, $value)
-    {
-        throw new \RuntimeException('Not implemented');
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Client.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Client.php
deleted file mode 100644
index fa1038dad5..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Client.php
+++ /dev/null
@@ -1,355 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-use GuzzleHttp\Event\HasEmitterTrait;
-use GuzzleHttp\Message\MessageFactory;
-use GuzzleHttp\Message\MessageFactoryInterface;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Message\FutureResponse;
-use GuzzleHttp\Ring\Core;
-use GuzzleHttp\Ring\Future\FutureInterface;
-use GuzzleHttp\Exception\RequestException;
-use React\Promise\FulfilledPromise;
-use React\Promise\RejectedPromise;
-
-/**
- * HTTP client
- */
-class Client implements ClientInterface
-{
-    use HasEmitterTrait;
-
-    /** @var MessageFactoryInterface Request factory used by the client */
-    private $messageFactory;
-
-    /** @var Url Base URL of the client */
-    private $baseUrl;
-
-    /** @var array Default request options */
-    private $defaults;
-
-    /** @var callable Request state machine */
-    private $fsm;
-
-    /**
-     * Clients accept an array of constructor parameters.
-     *
-     * Here's an example of creating a client using an URI template for the
-     * client's base_url and an array of default request options to apply
-     * to each request:
-     *
-     *     $client = new Client([
-     *         'base_url' => [
-     *              'http://www.foo.com/{version}/',
-     *              ['version' => '123']
-     *          ],
-     *         'defaults' => [
-     *             'timeout'         => 10,
-     *             'allow_redirects' => false,
-     *             'proxy'           => '192.168.16.1:10'
-     *         ]
-     *     ]);
-     *
-     * @param array $config Client configuration settings
-     *     - base_url: Base URL of the client that is merged into relative URLs.
-     *       Can be a string or an array that contains a URI template followed
-     *       by an associative array of expansion variables to inject into the
-     *       URI template.
-     *     - handler: callable RingPHP handler used to transfer requests
-     *     - message_factory: Factory used to create request and response object
-     *     - defaults: Default request options to apply to each request
-     *     - emitter: Event emitter used for request events
-     *     - fsm: (internal use only) The request finite state machine. A
-     *       function that accepts a transaction and optional final state. The
-     *       function is responsible for transitioning a request through its
-     *       lifecycle events.
-     */
-    public function __construct(array $config = [])
-    {
-        $this->configureBaseUrl($config);
-        $this->configureDefaults($config);
-
-        if (isset($config['emitter'])) {
-            $this->emitter = $config['emitter'];
-        }
-
-        $this->messageFactory = isset($config['message_factory'])
-            ? $config['message_factory']
-            : new MessageFactory();
-
-        if (isset($config['fsm'])) {
-            $this->fsm = $config['fsm'];
-        } else {
-            if (isset($config['handler'])) {
-                $handler = $config['handler'];
-            } elseif (isset($config['adapter'])) {
-                $handler = $config['adapter'];
-            } else {
-                $handler = Utils::getDefaultHandler();
-            }
-            $this->fsm = new RequestFsm($handler, $this->messageFactory);
-        }
-    }
-
-    public function getDefaultOption($keyOrPath = null)
-    {
-        return $keyOrPath === null
-            ? $this->defaults
-            : Utils::getPath($this->defaults, $keyOrPath);
-    }
-
-    public function setDefaultOption($keyOrPath, $value)
-    {
-        Utils::setPath($this->defaults, $keyOrPath, $value);
-    }
-
-    public function getBaseUrl()
-    {
-        return (string) $this->baseUrl;
-    }
-
-    public function createRequest($method, $url = null, array $options = [])
-    {
-        $options = $this->mergeDefaults($options);
-        // Use a clone of the client's emitter
-        $options['config']['emitter'] = clone $this->getEmitter();
-        $url = $url || (is_string($url) && strlen($url))
-            ? $this->buildUrl($url)
-            : (string) $this->baseUrl;
-
-        return $this->messageFactory->createRequest($method, $url, $options);
-    }
-
-    public function get($url = null, $options = [])
-    {
-        return $this->send($this->createRequest('GET', $url, $options));
-    }
-
-    public function head($url = null, array $options = [])
-    {
-        return $this->send($this->createRequest('HEAD', $url, $options));
-    }
-
-    public function delete($url = null, array $options = [])
-    {
-        return $this->send($this->createRequest('DELETE', $url, $options));
-    }
-
-    public function put($url = null, array $options = [])
-    {
-        return $this->send($this->createRequest('PUT', $url, $options));
-    }
-
-    public function patch($url = null, array $options = [])
-    {
-        return $this->send($this->createRequest('PATCH', $url, $options));
-    }
-
-    public function post($url = null, array $options = [])
-    {
-        return $this->send($this->createRequest('POST', $url, $options));
-    }
-
-    public function options($url = null, array $options = [])
-    {
-        return $this->send($this->createRequest('OPTIONS', $url, $options));
-    }
-
-    public function send(RequestInterface $request)
-    {
-        $isFuture = $request->getConfig()->get('future');
-        $trans = new Transaction($this, $request, $isFuture);
-        $fn = $this->fsm;
-
-        try {
-            $fn($trans);
-            if ($isFuture) {
-                // Turn the normal response into a future if needed.
-                return $trans->response instanceof FutureInterface
-                    ? $trans->response
-                    : new FutureResponse(new FulfilledPromise($trans->response));
-            }
-            // Resolve deep futures if this is not a future
-            // transaction. This accounts for things like retries
-            // that do not have an immediate side-effect.
-            while ($trans->response instanceof FutureInterface) {
-                $trans->response = $trans->response->wait();
-            }
-            return $trans->response;
-        } catch (\Exception $e) {
-            if ($isFuture) {
-                // Wrap the exception in a promise
-                return new FutureResponse(new RejectedPromise($e));
-            }
-            throw RequestException::wrapException($trans->request, $e);
-        }
-    }
-
-    /**
-     * Get an array of default options to apply to the client
-     *
-     * @return array
-     */
-    protected function getDefaultOptions()
-    {
-        $settings = [
-            'allow_redirects' => true,
-            'exceptions'      => true,
-            'decode_content'  => true,
-            'verify'          => true
-        ];
-
-        // Use the standard Linux HTTP_PROXY and HTTPS_PROXY if set.
-        // We can only trust the HTTP_PROXY environment variable in a CLI
-        // process due to the fact that PHP has no reliable mechanism to
-        // get environment variables that start with "HTTP_".
-        if (php_sapi_name() == 'cli' && getenv('HTTP_PROXY')) {
-            $settings['proxy']['http'] = getenv('HTTP_PROXY');
-        }
-
-        if ($proxy = getenv('HTTPS_PROXY')) {
-            $settings['proxy']['https'] = $proxy;
-        }
-
-        return $settings;
-    }
-
-    /**
-     * Expand a URI template and inherit from the base URL if it's relative
-     *
-     * @param string|array $url URL or an array of the URI template to expand
-     *                          followed by a hash of template varnames.
-     * @return string
-     * @throws \InvalidArgumentException
-     */
-    private function buildUrl($url)
-    {
-        // URI template (absolute or relative)
-        if (!is_array($url)) {
-            return strpos($url, '://')
-                ? (string) $url
-                : (string) $this->baseUrl->combine($url);
-        }
-
-        if (!isset($url[1])) {
-            throw new \InvalidArgumentException('You must provide a hash of '
-                . 'varname options in the second element of a URL array.');
-        }
-
-        // Absolute URL
-        if (strpos($url[0], '://')) {
-            return Utils::uriTemplate($url[0], $url[1]);
-        }
-
-        // Combine the relative URL with the base URL
-        return (string) $this->baseUrl->combine(
-            Utils::uriTemplate($url[0], $url[1])
-        );
-    }
-
-    private function configureBaseUrl(&$config)
-    {
-        if (!isset($config['base_url'])) {
-            $this->baseUrl = new Url('', '');
-        } elseif (!is_array($config['base_url'])) {
-            $this->baseUrl = Url::fromString($config['base_url']);
-        } elseif (count($config['base_url']) < 2) {
-            throw new \InvalidArgumentException('You must provide a hash of '
-                . 'varname options in the second element of a base_url array.');
-        } else {
-            $this->baseUrl = Url::fromString(
-                Utils::uriTemplate(
-                    $config['base_url'][0],
-                    $config['base_url'][1]
-                )
-            );
-            $config['base_url'] = (string) $this->baseUrl;
-        }
-    }
-
-    private function configureDefaults($config)
-    {
-        if (!isset($config['defaults'])) {
-            $this->defaults = $this->getDefaultOptions();
-        } else {
-            $this->defaults = array_replace(
-                $this->getDefaultOptions(),
-                $config['defaults']
-            );
-        }
-
-        // Add the default user-agent header
-        if (!isset($this->defaults['headers'])) {
-            $this->defaults['headers'] = [
-                'User-Agent' => Utils::getDefaultUserAgent()
-            ];
-        } elseif (!Core::hasHeader($this->defaults, 'User-Agent')) {
-            // Add the User-Agent header if one was not already set
-            $this->defaults['headers']['User-Agent'] = Utils::getDefaultUserAgent();
-        }
-    }
-
-    /**
-     * Merges default options into the array passed by reference.
-     *
-     * @param array $options Options to modify by reference
-     *
-     * @return array
-     */
-    private function mergeDefaults($options)
-    {
-        $defaults = $this->defaults;
-
-        // Case-insensitively merge in default headers if both defaults and
-        // options have headers specified.
-        if (!empty($defaults['headers']) && !empty($options['headers'])) {
-            // Create a set of lowercased keys that are present.
-            $lkeys = [];
-            foreach (array_keys($options['headers']) as $k) {
-                $lkeys[strtolower($k)] = true;
-            }
-            // Merge in lowercase default keys when not present in above set.
-            foreach ($defaults['headers'] as $key => $value) {
-                if (!isset($lkeys[strtolower($key)])) {
-                    $options['headers'][$key] = $value;
-                }
-            }
-            // No longer need to merge in headers.
-            unset($defaults['headers']);
-        }
-
-        $result = array_replace_recursive($defaults, $options);
-        foreach ($options as $k => $v) {
-            if ($v === null) {
-                unset($result[$k]);
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * @deprecated Use {@see GuzzleHttp\Pool} instead.
-     * @see GuzzleHttp\Pool
-     */
-    public function sendAll($requests, array $options = [])
-    {
-        Pool::send($this, $requests, $options);
-    }
-
-    /**
-     * @deprecated Use GuzzleHttp\Utils::getDefaultHandler
-     */
-    public static function getDefaultHandler()
-    {
-        return Utils::getDefaultHandler();
-    }
-
-    /**
-     * @deprecated Use GuzzleHttp\Utils::getDefaultUserAgent
-     */
-    public static function getDefaultUserAgent()
-    {
-        return Utils::getDefaultUserAgent();
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/ClientInterface.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/ClientInterface.php
deleted file mode 100644
index 6668597d3d..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/ClientInterface.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-use GuzzleHttp\Event\HasEmitterInterface;
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Message\ResponseInterface;
-
-/**
- * Client interface for sending HTTP requests
- */
-interface ClientInterface extends HasEmitterInterface
-{
-    const VERSION = '5.3.1';
-
-    /**
-     * Create and return a new {@see RequestInterface} object.
-     *
-     * Use an absolute path to override the base path of the client, or a
-     * relative path to append to the base path of the client. The URL can
-     * contain the query string as well. Use an array to provide a URL
-     * template and additional variables to use in the URL template expansion.
-     *
-     * @param string           $method  HTTP method
-     * @param string|array|Url $url     URL or URI template
-     * @param array            $options Array of request options to apply.
-     *
-     * @return RequestInterface
-     */
-    public function createRequest($method, $url = null, array $options = []);
-
-    /**
-     * Send a GET request
-     *
-     * @param string|array|Url $url     URL or URI template
-     * @param array            $options Array of request options to apply.
-     *
-     * @return ResponseInterface
-     * @throws RequestException When an error is encountered
-     */
-    public function get($url = null, $options = []);
-
-    /**
-     * Send a HEAD request
-     *
-     * @param string|array|Url $url     URL or URI template
-     * @param array            $options Array of request options to apply.
-     *
-     * @return ResponseInterface
-     * @throws RequestException When an error is encountered
-     */
-    public function head($url = null, array $options = []);
-
-    /**
-     * Send a DELETE request
-     *
-     * @param string|array|Url $url     URL or URI template
-     * @param array            $options Array of request options to apply.
-     *
-     * @return ResponseInterface
-     * @throws RequestException When an error is encountered
-     */
-    public function delete($url = null, array $options = []);
-
-    /**
-     * Send a PUT request
-     *
-     * @param string|array|Url $url     URL or URI template
-     * @param array            $options Array of request options to apply.
-     *
-     * @return ResponseInterface
-     * @throws RequestException When an error is encountered
-     */
-    public function put($url = null, array $options = []);
-
-    /**
-     * Send a PATCH request
-     *
-     * @param string|array|Url $url     URL or URI template
-     * @param array            $options Array of request options to apply.
-     *
-     * @return ResponseInterface
-     * @throws RequestException When an error is encountered
-     */
-    public function patch($url = null, array $options = []);
-
-    /**
-     * Send a POST request
-     *
-     * @param string|array|Url $url     URL or URI template
-     * @param array            $options Array of request options to apply.
-     *
-     * @return ResponseInterface
-     * @throws RequestException When an error is encountered
-     */
-    public function post($url = null, array $options = []);
-
-    /**
-     * Send an OPTIONS request
-     *
-     * @param string|array|Url $url     URL or URI template
-     * @param array            $options Array of request options to apply.
-     *
-     * @return ResponseInterface
-     * @throws RequestException When an error is encountered
-     */
-    public function options($url = null, array $options = []);
-
-    /**
-     * Sends a single request
-     *
-     * @param RequestInterface $request Request to send
-     *
-     * @return \GuzzleHttp\Message\ResponseInterface
-     * @throws \LogicException When the handler does not populate a response
-     * @throws RequestException When an error is encountered
-     */
-    public function send(RequestInterface $request);
-
-    /**
-     * Get default request options of the client.
-     *
-     * @param string|null $keyOrPath The Path to a particular default request
-     *     option to retrieve or pass null to retrieve all default request
-     *     options. The syntax uses "/" to denote a path through nested PHP
-     *     arrays. For example, "headers/content-type".
-     *
-     * @return mixed
-     */
-    public function getDefaultOption($keyOrPath = null);
-
-    /**
-     * Set a default request option on the client so that any request created
-     * by the client will use the provided default value unless overridden
-     * explicitly when creating a request.
-     *
-     * @param string|null $keyOrPath The Path to a particular configuration
-     *     value to set. The syntax uses a path notation that allows you to
-     *     specify nested configuration values (e.g., 'headers/content-type').
-     * @param mixed $value Default request option value to set
-     */
-    public function setDefaultOption($keyOrPath, $value);
-
-    /**
-     * Get the base URL of the client.
-     *
-     * @return string Returns the base URL if present
-     */
-    public function getBaseUrl();
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Collection.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Collection.php
deleted file mode 100644
index 4aabd20b00..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Collection.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-/**
- * Key value pair collection object
- */
-class Collection implements
-    \ArrayAccess,
-    \IteratorAggregate,
-    \Countable,
-    ToArrayInterface
-{
-    use HasDataTrait;
-
-    /**
-     * @param array $data Associative array of data to set
-     */
-    public function __construct(array $data = [])
-    {
-        $this->data = $data;
-    }
-
-    /**
-     * Create a new collection from an array, validate the keys, and add default
-     * values where missing
-     *
-     * @param array $config   Configuration values to apply.
-     * @param array $defaults Default parameters
-     * @param array $required Required parameter names
-     *
-     * @return self
-     * @throws \InvalidArgumentException if a parameter is missing
-     */
-    public static function fromConfig(
-        array $config = [],
-        array $defaults = [],
-        array $required = []
-    ) {
-        $data = $config + $defaults;
-
-        if ($missing = array_diff($required, array_keys($data))) {
-            throw new \InvalidArgumentException(
-                'Config is missing the following keys: ' .
-                implode(', ', $missing));
-        }
-
-        return new self($data);
-    }
-
-    /**
-     * Removes all key value pairs
-     */
-    public function clear()
-    {
-        $this->data = [];
-    }
-
-    /**
-     * Get a specific key value.
-     *
-     * @param string $key Key to retrieve.
-     *
-     * @return mixed|null Value of the key or NULL
-     */
-    public function get($key)
-    {
-        return isset($this->data[$key]) ? $this->data[$key] : null;
-    }
-
-    /**
-     * Set a key value pair
-     *
-     * @param string $key   Key to set
-     * @param mixed  $value Value to set
-     */
-    public function set($key, $value)
-    {
-        $this->data[$key] = $value;
-    }
-
-    /**
-     * Add a value to a key.  If a key of the same name has already been added,
-     * the key value will be converted into an array and the new value will be
-     * pushed to the end of the array.
-     *
-     * @param string $key   Key to add
-     * @param mixed  $value Value to add to the key
-     */
-    public function add($key, $value)
-    {
-        if (!array_key_exists($key, $this->data)) {
-            $this->data[$key] = $value;
-        } elseif (is_array($this->data[$key])) {
-            $this->data[$key][] = $value;
-        } else {
-            $this->data[$key] = array($this->data[$key], $value);
-        }
-    }
-
-    /**
-     * Remove a specific key value pair
-     *
-     * @param string $key A key to remove
-     */
-    public function remove($key)
-    {
-        unset($this->data[$key]);
-    }
-
-    /**
-     * Get all keys in the collection
-     *
-     * @return array
-     */
-    public function getKeys()
-    {
-        return array_keys($this->data);
-    }
-
-    /**
-     * Returns whether or not the specified key is present.
-     *
-     * @param string $key The key for which to check the existence.
-     *
-     * @return bool
-     */
-    public function hasKey($key)
-    {
-        return array_key_exists($key, $this->data);
-    }
-
-    /**
-     * Checks if any keys contains a certain value
-     *
-     * @param string $value Value to search for
-     *
-     * @return mixed Returns the key if the value was found FALSE if the value
-     *     was not found.
-     */
-    public function hasValue($value)
-    {
-        return array_search($value, $this->data, true);
-    }
-
-    /**
-     * Replace the data of the object with the value of an array
-     *
-     * @param array $data Associative array of data
-     */
-    public function replace(array $data)
-    {
-        $this->data = $data;
-    }
-
-    /**
-     * Add and merge in a Collection or array of key value pair data.
-     *
-     * @param Collection|array $data Associative array of key value pair data
-     */
-    public function merge($data)
-    {
-        foreach ($data as $key => $value) {
-            $this->add($key, $value);
-        }
-    }
-
-    /**
-     * Overwrite key value pairs in this collection with all of the data from
-     * an array or collection.
-     *
-     * @param array|\Traversable $data Values to override over this config
-     */
-    public function overwriteWith($data)
-    {
-        if (is_array($data)) {
-            $this->data = $data + $this->data;
-        } elseif ($data instanceof Collection) {
-            $this->data = $data->toArray() + $this->data;
-        } else {
-            foreach ($data as $key => $value) {
-                $this->data[$key] = $value;
-            }
-        }
-    }
-
-    /**
-     * Returns a Collection containing all the elements of the collection after
-     * applying the callback function to each one.
-     *
-     * The callable should accept three arguments:
-     * - (string) $key
-     * - (string) $value
-     * - (array) $context
-     *
-     * The callable must return a the altered or unaltered value.
-     *
-     * @param callable $closure Map function to apply
-     * @param array    $context Context to pass to the callable
-     *
-     * @return Collection
-     */
-    public function map(callable $closure, array $context = [])
-    {
-        $collection = new static();
-        foreach ($this as $key => $value) {
-            $collection[$key] = $closure($key, $value, $context);
-        }
-
-        return $collection;
-    }
-
-    /**
-     * Iterates over each key value pair in the collection passing them to the
-     * callable. If the callable returns true, the current value from input is
-     * returned into the result Collection.
-     *
-     * The callable must accept two arguments:
-     * - (string) $key
-     * - (string) $value
-     *
-     * @param callable $closure Evaluation function
-     *
-     * @return Collection
-     */
-    public function filter(callable $closure)
-    {
-        $collection = new static();
-        foreach ($this->data as $key => $value) {
-            if ($closure($key, $value)) {
-                $collection[$key] = $value;
-            }
-        }
-
-        return $collection;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
deleted file mode 100644
index f8ac7dd350..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
+++ /dev/null
@@ -1,248 +0,0 @@
-<?php
-namespace GuzzleHttp\Cookie;
-
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Message\ResponseInterface;
-use GuzzleHttp\ToArrayInterface;
-
-/**
- * Cookie jar that stores cookies an an array
- */
-class CookieJar implements CookieJarInterface, ToArrayInterface
-{
-    /** @var SetCookie[] Loaded cookie data */
-    private $cookies = [];
-
-    /** @var bool */
-    private $strictMode;
-
-    /**
-     * @param bool $strictMode   Set to true to throw exceptions when invalid
-     *                           cookies are added to the cookie jar.
-     * @param array $cookieArray Array of SetCookie objects or a hash of arrays
-     *                           that can be used with the SetCookie constructor
-     */
-    public function __construct($strictMode = false, $cookieArray = [])
-    {
-        $this->strictMode = $strictMode;
-
-        foreach ($cookieArray as $cookie) {
-            if (!($cookie instanceof SetCookie)) {
-                $cookie = new SetCookie($cookie);
-            }
-            $this->setCookie($cookie);
-        }
-    }
-
-    /**
-     * Create a new Cookie jar from an associative array and domain.
-     *
-     * @param array  $cookies Cookies to create the jar from
-     * @param string $domain  Domain to set the cookies to
-     *
-     * @return self
-     */
-    public static function fromArray(array $cookies, $domain)
-    {
-        $cookieJar = new self();
-        foreach ($cookies as $name => $value) {
-            $cookieJar->setCookie(new SetCookie([
-                'Domain'  => $domain,
-                'Name'    => $name,
-                'Value'   => $value,
-                'Discard' => true
-            ]));
-        }
-
-        return $cookieJar;
-    }
-
-    /**
-     * Quote the cookie value if it is not already quoted and it contains
-     * problematic characters.
-     *
-     * @param string $value Value that may or may not need to be quoted
-     *
-     * @return string
-     */
-    public static function getCookieValue($value)
-    {
-        if (substr($value, 0, 1) !== '"' &&
-            substr($value, -1, 1) !== '"' &&
-            strpbrk($value, ';,')
-        ) {
-            $value = '"' . $value . '"';
-        }
-
-        return $value;
-    }
-
-    public function toArray()
-    {
-        return array_map(function (SetCookie $cookie) {
-            return $cookie->toArray();
-        }, $this->getIterator()->getArrayCopy());
-    }
-
-    public function clear($domain = null, $path = null, $name = null)
-    {
-        if (!$domain) {
-            $this->cookies = [];
-            return;
-        } elseif (!$path) {
-            $this->cookies = array_filter(
-                $this->cookies,
-                function (SetCookie $cookie) use ($path, $domain) {
-                    return !$cookie->matchesDomain($domain);
-                }
-            );
-        } elseif (!$name) {
-            $this->cookies = array_filter(
-                $this->cookies,
-                function (SetCookie $cookie) use ($path, $domain) {
-                    return !($cookie->matchesPath($path) &&
-                        $cookie->matchesDomain($domain));
-                }
-            );
-        } else {
-            $this->cookies = array_filter(
-                $this->cookies,
-                function (SetCookie $cookie) use ($path, $domain, $name) {
-                    return !($cookie->getName() == $name &&
-                        $cookie->matchesPath($path) &&
-                        $cookie->matchesDomain($domain));
-                }
-            );
-        }
-    }
-
-    public function clearSessionCookies()
-    {
-        $this->cookies = array_filter(
-            $this->cookies,
-            function (SetCookie $cookie) {
-                return !$cookie->getDiscard() && $cookie->getExpires();
-            }
-        );
-    }
-
-    public function setCookie(SetCookie $cookie)
-    {
-        // Only allow cookies with set and valid domain, name, value
-        $result = $cookie->validate();
-        if ($result !== true) {
-            if ($this->strictMode) {
-                throw new \RuntimeException('Invalid cookie: ' . $result);
-            } else {
-                $this->removeCookieIfEmpty($cookie);
-                return false;
-            }
-        }
-
-        // Resolve conflicts with previously set cookies
-        foreach ($this->cookies as $i => $c) {
-
-            // Two cookies are identical, when their path, and domain are
-            // identical.
-            if ($c->getPath() != $cookie->getPath() ||
-                $c->getDomain() != $cookie->getDomain() ||
-                $c->getName() != $cookie->getName()
-            ) {
-                continue;
-            }
-
-            // The previously set cookie is a discard cookie and this one is
-            // not so allow the new cookie to be set
-            if (!$cookie->getDiscard() && $c->getDiscard()) {
-                unset($this->cookies[$i]);
-                continue;
-            }
-
-            // If the new cookie's expiration is further into the future, then
-            // replace the old cookie
-            if ($cookie->getExpires() > $c->getExpires()) {
-                unset($this->cookies[$i]);
-                continue;
-            }
-
-            // If the value has changed, we better change it
-            if ($cookie->getValue() !== $c->getValue()) {
-                unset($this->cookies[$i]);
-                continue;
-            }
-
-            // The cookie exists, so no need to continue
-            return false;
-        }
-
-        $this->cookies[] = $cookie;
-
-        return true;
-    }
-
-    public function count()
-    {
-        return count($this->cookies);
-    }
-
-    public function getIterator()
-    {
-        return new \ArrayIterator(array_values($this->cookies));
-    }
-
-    public function extractCookies(
-        RequestInterface $request,
-        ResponseInterface $response
-    ) {
-        if ($cookieHeader = $response->getHeaderAsArray('Set-Cookie')) {
-            foreach ($cookieHeader as $cookie) {
-                $sc = SetCookie::fromString($cookie);
-                if (!$sc->getDomain()) {
-                    $sc->setDomain($request->getHost());
-                }
-                $this->setCookie($sc);
-            }
-        }
-    }
-
-    public function addCookieHeader(RequestInterface $request)
-    {
-        $values = [];
-        $scheme = $request->getScheme();
-        $host = $request->getHost();
-        $path = $request->getPath();
-
-        foreach ($this->cookies as $cookie) {
-            if ($cookie->matchesPath($path) &&
-                $cookie->matchesDomain($host) &&
-                !$cookie->isExpired() &&
-                (!$cookie->getSecure() || $scheme == 'https')
-            ) {
-                $values[] = $cookie->getName() . '='
-                    . self::getCookieValue($cookie->getValue());
-            }
-        }
-
-        if ($values) {
-            $request->setHeader('Cookie', implode('; ', $values));
-        }
-    }
-
-    /**
-     * If a cookie already exists and the server asks to set it again with a
-     * null value, the cookie must be deleted.
-     *
-     * @param SetCookie $cookie
-     */
-    private function removeCookieIfEmpty(SetCookie $cookie)
-    {
-        $cookieValue = $cookie->getValue();
-        if ($cookieValue === null || $cookieValue === '') {
-            $this->clear(
-                $cookie->getDomain(),
-                $cookie->getPath(),
-                $cookie->getName()
-            );
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php
deleted file mode 100644
index 4ea8567e87..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-namespace GuzzleHttp\Cookie;
-
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Message\ResponseInterface;
-
-/**
- * Stores HTTP cookies.
- *
- * It extracts cookies from HTTP requests, and returns them in HTTP responses.
- * CookieJarInterface instances automatically expire contained cookies when
- * necessary. Subclasses are also responsible for storing and retrieving
- * cookies from a file, database, etc.
- *
- * @link http://docs.python.org/2/library/cookielib.html Inspiration
- */
-interface CookieJarInterface extends \Countable, \IteratorAggregate
-{
-    /**
-     * Add a Cookie header to a request.
-     *
-     * If no matching cookies are found in the cookie jar, then no Cookie
-     * header is added to the request.
-     *
-     * @param RequestInterface $request Request object to update
-     */
-    public function addCookieHeader(RequestInterface $request);
-
-    /**
-     * Extract cookies from an HTTP response and store them in the CookieJar.
-     *
-     * @param RequestInterface  $request  Request that was sent
-     * @param ResponseInterface $response Response that was received
-     */
-    public function extractCookies(
-        RequestInterface $request,
-        ResponseInterface $response
-    );
-
-    /**
-     * Sets a cookie in the cookie jar.
-     *
-     * @param SetCookie $cookie Cookie to set.
-     *
-     * @return bool Returns true on success or false on failure
-     */
-    public function setCookie(SetCookie $cookie);
-
-    /**
-     * Remove cookies currently held in the cookie jar.
-     *
-     * Invoking this method without arguments will empty the whole cookie jar.
-     * If given a $domain argument only cookies belonging to that domain will
-     * be removed. If given a $domain and $path argument, cookies belonging to
-     * the specified path within that domain are removed. If given all three
-     * arguments, then the cookie with the specified name, path and domain is
-     * removed.
-     *
-     * @param string $domain Clears cookies matching a domain
-     * @param string $path   Clears cookies matching a domain and path
-     * @param string $name   Clears cookies matching a domain, path, and name
-     *
-     * @return CookieJarInterface
-     */
-    public function clear($domain = null, $path = null, $name = null);
-
-    /**
-     * Discard all sessions cookies.
-     *
-     * Removes cookies that don't have an expire field or a have a discard
-     * field set to true. To be called when the user agent shuts down according
-     * to RFC 2965.
-     */
-    public function clearSessionCookies();
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php
deleted file mode 100644
index e43185172d..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-namespace GuzzleHttp\Cookie;
-
-use GuzzleHttp\Utils;
-
-/**
- * Persists non-session cookies using a JSON formatted file
- */
-class FileCookieJar extends CookieJar
-{
-    /** @var string filename */
-    private $filename;
-
-    /**
-     * Create a new FileCookieJar object
-     *
-     * @param string $cookieFile File to store the cookie data
-     *
-     * @throws \RuntimeException if the file cannot be found or created
-     */
-    public function __construct($cookieFile)
-    {
-        $this->filename = $cookieFile;
-
-        if (file_exists($cookieFile)) {
-            $this->load($cookieFile);
-        }
-    }
-
-    /**
-     * Saves the file when shutting down
-     */
-    public function __destruct()
-    {
-        $this->save($this->filename);
-    }
-
-    /**
-     * Saves the cookies to a file.
-     *
-     * @param string $filename File to save
-     * @throws \RuntimeException if the file cannot be found or created
-     */
-    public function save($filename)
-    {
-        $json = [];
-        foreach ($this as $cookie) {
-            if ($cookie->getExpires() && !$cookie->getDiscard()) {
-                $json[] = $cookie->toArray();
-            }
-        }
-
-        if (false === file_put_contents($filename, json_encode($json))) {
-            // @codeCoverageIgnoreStart
-            throw new \RuntimeException("Unable to save file {$filename}");
-            // @codeCoverageIgnoreEnd
-        }
-    }
-
-    /**
-     * Load cookies from a JSON formatted file.
-     *
-     * Old cookies are kept unless overwritten by newly loaded ones.
-     *
-     * @param string $filename Cookie file to load.
-     * @throws \RuntimeException if the file cannot be loaded.
-     */
-    public function load($filename)
-    {
-        $json = file_get_contents($filename);
-        if (false === $json) {
-            // @codeCoverageIgnoreStart
-            throw new \RuntimeException("Unable to load file {$filename}");
-            // @codeCoverageIgnoreEnd
-        }
-
-        $data = Utils::jsonDecode($json, true);
-        if (is_array($data)) {
-            foreach (Utils::jsonDecode($json, true) as $cookie) {
-                $this->setCookie(new SetCookie($cookie));
-            }
-        } elseif (strlen($data)) {
-            throw new \RuntimeException("Invalid cookie file: {$filename}");
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php
deleted file mode 100644
index 71a02d56dc..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-namespace GuzzleHttp\Cookie;
-
-use GuzzleHttp\Utils;
-
-/**
- * Persists cookies in the client session
- */
-class SessionCookieJar extends CookieJar
-{
-    /** @var string session key */
-    private $sessionKey;
-
-    /**
-     * Create a new SessionCookieJar object
-     *
-     * @param string $sessionKey Session key name to store the cookie data in session
-     */
-    public function __construct($sessionKey)
-    {
-        $this->sessionKey = $sessionKey;
-        $this->load();
-    }
-
-    /**
-     * Saves cookies to session when shutting down
-     */
-    public function __destruct()
-    {
-        $this->save();
-    }
-
-    /**
-     * Save cookies to the client session
-     */
-    public function save()
-    {
-        $json = [];
-        foreach ($this as $cookie) {
-            if ($cookie->getExpires() && !$cookie->getDiscard()) {
-                $json[] = $cookie->toArray();
-            }
-        }
-
-        $_SESSION[$this->sessionKey] = json_encode($json);
-    }
-
-    /**
-     * Load the contents of the client session into the data array
-     */
-    protected function load()
-    {
-        $cookieJar = isset($_SESSION[$this->sessionKey])
-            ? $_SESSION[$this->sessionKey]
-            : null;
-
-        $data = Utils::jsonDecode($cookieJar, true);
-        if (is_array($data)) {
-            foreach ($data as $cookie) {
-                $this->setCookie(new SetCookie($cookie));
-            }
-        } elseif (strlen($data)) {
-            throw new \RuntimeException("Invalid cookie data");
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php
deleted file mode 100644
index ac9a890813..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php
+++ /dev/null
@@ -1,373 +0,0 @@
-<?php
-namespace GuzzleHttp\Cookie;
-
-use GuzzleHttp\ToArrayInterface;
-
-/**
- * Set-Cookie object
- */
-class SetCookie implements ToArrayInterface
-{
-    /** @var array */
-    private static $defaults = [
-        'Name'     => null,
-        'Value'    => null,
-        'Domain'   => null,
-        'Path'     => '/',
-        'Max-Age'  => null,
-        'Expires'  => null,
-        'Secure'   => false,
-        'Discard'  => false,
-        'HttpOnly' => false
-    ];
-
-    /** @var array Cookie data */
-    private $data;
-
-    /**
-     * Create a new SetCookie object from a string
-     *
-     * @param string $cookie Set-Cookie header string
-     *
-     * @return self
-     */
-    public static function fromString($cookie)
-    {
-        // Create the default return array
-        $data = self::$defaults;
-        // Explode the cookie string using a series of semicolons
-        $pieces = array_filter(array_map('trim', explode(';', $cookie)));
-        // The name of the cookie (first kvp) must include an equal sign.
-        if (empty($pieces) || !strpos($pieces[0], '=')) {
-            return new self($data);
-        }
-
-        // Add the cookie pieces into the parsed data array
-        foreach ($pieces as $part) {
-
-            $cookieParts = explode('=', $part, 2);
-            $key = trim($cookieParts[0]);
-            $value = isset($cookieParts[1])
-                ? trim($cookieParts[1], " \n\r\t\0\x0B\"")
-                : true;
-
-            // Only check for non-cookies when cookies have been found
-            if (empty($data['Name'])) {
-                $data['Name'] = $key;
-                $data['Value'] = $value;
-            } else {
-                foreach (array_keys(self::$defaults) as $search) {
-                    if (!strcasecmp($search, $key)) {
-                        $data[$search] = $value;
-                        continue 2;
-                    }
-                }
-                $data[$key] = $value;
-            }
-        }
-
-        return new self($data);
-    }
-
-    /**
-     * @param array $data Array of cookie data provided by a Cookie parser
-     */
-    public function __construct(array $data = [])
-    {
-        $this->data = array_replace(self::$defaults, $data);
-        // Extract the Expires value and turn it into a UNIX timestamp if needed
-        if (!$this->getExpires() && $this->getMaxAge()) {
-            // Calculate the Expires date
-            $this->setExpires(time() + $this->getMaxAge());
-        } elseif ($this->getExpires() && !is_numeric($this->getExpires())) {
-            $this->setExpires($this->getExpires());
-        }
-    }
-
-    public function __toString()
-    {
-        $str = $this->data['Name'] . '=' . $this->data['Value'] . '; ';
-        foreach ($this->data as $k => $v) {
-            if ($k != 'Name' && $k != 'Value' && $v !== null && $v !== false) {
-                if ($k == 'Expires') {
-                    $str .= 'Expires=' . gmdate('D, d M Y H:i:s \G\M\T', $v) . '; ';
-                } else {
-                    $str .= ($v === true ? $k : "{$k}={$v}") . '; ';
-                }
-            }
-        }
-
-        return rtrim($str, '; ');
-    }
-
-    public function toArray()
-    {
-        return $this->data;
-    }
-
-    /**
-     * Get the cookie name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->data['Name'];
-    }
-
-    /**
-     * Set the cookie name
-     *
-     * @param string $name Cookie name
-     */
-    public function setName($name)
-    {
-        $this->data['Name'] = $name;
-    }
-
-    /**
-     * Get the cookie value
-     *
-     * @return string
-     */
-    public function getValue()
-    {
-        return $this->data['Value'];
-    }
-
-    /**
-     * Set the cookie value
-     *
-     * @param string $value Cookie value
-     */
-    public function setValue($value)
-    {
-        $this->data['Value'] = $value;
-    }
-
-    /**
-     * Get the domain
-     *
-     * @return string|null
-     */
-    public function getDomain()
-    {
-        return $this->data['Domain'];
-    }
-
-    /**
-     * Set the domain of the cookie
-     *
-     * @param string $domain
-     */
-    public function setDomain($domain)
-    {
-        $this->data['Domain'] = $domain;
-    }
-
-    /**
-     * Get the path
-     *
-     * @return string
-     */
-    public function getPath()
-    {
-        return $this->data['Path'];
-    }
-
-    /**
-     * Set the path of the cookie
-     *
-     * @param string $path Path of the cookie
-     */
-    public function setPath($path)
-    {
-        $this->data['Path'] = $path;
-    }
-
-    /**
-     * Maximum lifetime of the cookie in seconds
-     *
-     * @return int|null
-     */
-    public function getMaxAge()
-    {
-        return $this->data['Max-Age'];
-    }
-
-    /**
-     * Set the max-age of the cookie
-     *
-     * @param int $maxAge Max age of the cookie in seconds
-     */
-    public function setMaxAge($maxAge)
-    {
-        $this->data['Max-Age'] = $maxAge;
-    }
-
-    /**
-     * The UNIX timestamp when the cookie Expires
-     *
-     * @return mixed
-     */
-    public function getExpires()
-    {
-        return $this->data['Expires'];
-    }
-
-    /**
-     * Set the unix timestamp for which the cookie will expire
-     *
-     * @param int $timestamp Unix timestamp
-     */
-    public function setExpires($timestamp)
-    {
-        $this->data['Expires'] = is_numeric($timestamp)
-            ? (int) $timestamp
-            : strtotime($timestamp);
-    }
-
-    /**
-     * Get whether or not this is a secure cookie
-     *
-     * @return null|bool
-     */
-    public function getSecure()
-    {
-        return $this->data['Secure'];
-    }
-
-    /**
-     * Set whether or not the cookie is secure
-     *
-     * @param bool $secure Set to true or false if secure
-     */
-    public function setSecure($secure)
-    {
-        $this->data['Secure'] = $secure;
-    }
-
-    /**
-     * Get whether or not this is a session cookie
-     *
-     * @return null|bool
-     */
-    public function getDiscard()
-    {
-        return $this->data['Discard'];
-    }
-
-    /**
-     * Set whether or not this is a session cookie
-     *
-     * @param bool $discard Set to true or false if this is a session cookie
-     */
-    public function setDiscard($discard)
-    {
-        $this->data['Discard'] = $discard;
-    }
-
-    /**
-     * Get whether or not this is an HTTP only cookie
-     *
-     * @return bool
-     */
-    public function getHttpOnly()
-    {
-        return $this->data['HttpOnly'];
-    }
-
-    /**
-     * Set whether or not this is an HTTP only cookie
-     *
-     * @param bool $httpOnly Set to true or false if this is HTTP only
-     */
-    public function setHttpOnly($httpOnly)
-    {
-        $this->data['HttpOnly'] = $httpOnly;
-    }
-
-    /**
-     * Check if the cookie matches a path value
-     *
-     * @param string $path Path to check against
-     *
-     * @return bool
-     */
-    public function matchesPath($path)
-    {
-        return !$this->getPath() || 0 === stripos($path, $this->getPath());
-    }
-
-    /**
-     * Check if the cookie matches a domain value
-     *
-     * @param string $domain Domain to check against
-     *
-     * @return bool
-     */
-    public function matchesDomain($domain)
-    {
-        // Remove the leading '.' as per spec in RFC 6265.
-        // http://tools.ietf.org/html/rfc6265#section-5.2.3
-        $cookieDomain = ltrim($this->getDomain(), '.');
-
-        // Domain not set or exact match.
-        if (!$cookieDomain || !strcasecmp($domain, $cookieDomain)) {
-            return true;
-        }
-
-        // Matching the subdomain according to RFC 6265.
-        // http://tools.ietf.org/html/rfc6265#section-5.1.3
-        if (filter_var($domain, FILTER_VALIDATE_IP)) {
-            return false;
-        }
-
-        return (bool) preg_match('/\.' . preg_quote($cookieDomain) . '$/i', $domain);
-    }
-
-    /**
-     * Check if the cookie is expired
-     *
-     * @return bool
-     */
-    public function isExpired()
-    {
-        return $this->getExpires() && time() > $this->getExpires();
-    }
-
-    /**
-     * Check if the cookie is valid according to RFC 6265
-     *
-     * @return bool|string Returns true if valid or an error message if invalid
-     */
-    public function validate()
-    {
-        // Names must not be empty, but can be 0
-        $name = $this->getName();
-        if (empty($name) && !is_numeric($name)) {
-            return 'The cookie name must not be empty';
-        }
-
-        // Check if any of the invalid characters are present in the cookie name
-        if (preg_match("/[=,; \t\r\n\013\014]/", $name)) {
-            return "Cookie name must not cannot invalid characters: =,; \\t\\r\\n\\013\\014";
-        }
-
-        // Value must not be empty, but can be 0
-        $value = $this->getValue();
-        if (empty($value) && !is_numeric($value)) {
-            return 'The cookie value must not be empty';
-        }
-
-        // Domains must not be empty, but can be 0
-        // A "0" is not a valid internet domain, but may be used as server name
-        // in a private network.
-        $domain = $this->getDomain();
-        if (empty($domain) && !is_numeric($domain)) {
-            return 'The cookie domain must not be empty';
-        }
-
-        return true;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/AbstractEvent.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/AbstractEvent.php
deleted file mode 100644
index 0d2f4dbf0c..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/AbstractEvent.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-/**
- * Basic event class that can be extended.
- */
-abstract class AbstractEvent implements EventInterface
-{
-    private $propagationStopped = false;
-
-    public function isPropagationStopped()
-    {
-        return $this->propagationStopped;
-    }
-
-    public function stopPropagation()
-    {
-        $this->propagationStopped = true;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/AbstractRequestEvent.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/AbstractRequestEvent.php
deleted file mode 100644
index 8a6ee47c85..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/AbstractRequestEvent.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-use GuzzleHttp\Transaction;
-use GuzzleHttp\ClientInterface;
-use GuzzleHttp\Message\RequestInterface;
-
-/**
- * Base class for request events, providing a request and client getter.
- */
-abstract class AbstractRequestEvent extends AbstractEvent
-{
-    /** @var Transaction */
-    protected $transaction;
-
-    /**
-     * @param Transaction $transaction
-     */
-    public function __construct(Transaction $transaction)
-    {
-        $this->transaction = $transaction;
-    }
-
-    /**
-     * Get the HTTP client associated with the event.
-     *
-     * @return ClientInterface
-     */
-    public function getClient()
-    {
-        return $this->transaction->client;
-    }
-
-    /**
-     * Get the request object
-     *
-     * @return RequestInterface
-     */
-    public function getRequest()
-    {
-        return $this->transaction->request;
-    }
-
-    /**
-     * Get the number of transaction retries.
-     *
-     * @return int
-     */
-    public function getRetryCount()
-    {
-        return $this->transaction->retries;
-    }
-
-    /**
-     * @return Transaction
-     */
-    public function getTransaction()
-    {
-        return $this->transaction;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/AbstractRetryableEvent.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/AbstractRetryableEvent.php
deleted file mode 100644
index bbbdfaf831..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/AbstractRetryableEvent.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-/**
- * Abstract request event that can be retried.
- */
-class AbstractRetryableEvent extends AbstractTransferEvent
-{
-    /**
-     * Mark the request as needing a retry and stop event propagation.
-     *
-     * This action allows you to retry a request without emitting the "end"
-     * event multiple times for a given request. When retried, the request
-     * emits a before event and is then sent again using the client that sent
-     * the original request.
-     *
-     * When retrying, it is important to limit the number of retries you allow
-     * to prevent infinite loops.
-     *
-     * This action can only be taken during the "complete" and "error" events.
-     *
-     * @param int $afterDelay If specified, the amount of time in milliseconds
-     *                        to delay before retrying. Note that this must
-     *                        be supported by the underlying RingPHP handler
-     *                        to work properly. Set to 0 or provide no value
-     *                        to retry immediately.
-     */
-    public function retry($afterDelay = 0)
-    {
-        // Setting the transition state to 'retry' will cause the next state
-        // transition of the transaction to retry the request.
-        $this->transaction->state = 'retry';
-
-        if ($afterDelay) {
-            $this->transaction->request->getConfig()->set('delay', $afterDelay);
-        }
-
-        $this->stopPropagation();
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/AbstractTransferEvent.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/AbstractTransferEvent.php
deleted file mode 100644
index 3b106df007..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/AbstractTransferEvent.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-use GuzzleHttp\Message\ResponseInterface;
-use GuzzleHttp\Ring\Future\FutureInterface;
-
-/**
- * Event that contains transfer statistics, and can be intercepted.
- */
-abstract class AbstractTransferEvent extends AbstractRequestEvent
-{
-    /**
-     * Get all transfer information as an associative array if no $name
-     * argument is supplied, or gets a specific transfer statistic if
-     * a $name attribute is supplied (e.g., 'total_time').
-     *
-     * @param string $name Name of the transfer stat to retrieve
-     *
-     * @return mixed|null|array
-     */
-    public function getTransferInfo($name = null)
-    {
-        if (!$name) {
-            return $this->transaction->transferInfo;
-        }
-
-        return isset($this->transaction->transferInfo[$name])
-            ? $this->transaction->transferInfo[$name]
-            : null;
-    }
-
-    /**
-     * Returns true/false if a response is available.
-     *
-     * @return bool
-     */
-    public function hasResponse()
-    {
-        return !($this->transaction->response instanceof FutureInterface);
-    }
-
-    /**
-     * Get the response.
-     *
-     * @return ResponseInterface|null
-     */
-    public function getResponse()
-    {
-        return $this->hasResponse() ? $this->transaction->response : null;
-    }
-
-    /**
-     * Intercept the request and associate a response
-     *
-     * @param ResponseInterface $response Response to set
-     */
-    public function intercept(ResponseInterface $response)
-    {
-        $this->transaction->response = $response;
-        $this->transaction->exception = null;
-        $this->stopPropagation();
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/BeforeEvent.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/BeforeEvent.php
deleted file mode 100644
index f313c37561..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/BeforeEvent.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-use GuzzleHttp\Message\ResponseInterface;
-
-/**
- * Event object emitted before a request is sent.
- *
- * This event MAY be emitted multiple times (i.e., if a request is retried).
- * You MAY change the Response associated with the request using the
- * intercept() method of the event.
- */
-class BeforeEvent extends AbstractRequestEvent
-{
-    /**
-     * Intercept the request and associate a response
-     *
-     * @param ResponseInterface $response Response to set
-     */
-    public function intercept(ResponseInterface $response)
-    {
-        $this->transaction->response = $response;
-        $this->transaction->exception = null;
-        $this->stopPropagation();
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/CompleteEvent.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/CompleteEvent.php
deleted file mode 100644
index 56cc557e3e..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/CompleteEvent.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-/**
- * Event object emitted after a request has been completed.
- *
- * This event MAY be emitted multiple times for a single request. You MAY
- * change the Response associated with the request using the intercept()
- * method of the event.
- *
- * This event allows the request to be retried if necessary using the retry()
- * method of the event.
- */
-class CompleteEvent extends AbstractRetryableEvent {}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/Emitter.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/Emitter.php
deleted file mode 100644
index d034fdae99..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/Emitter.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-/**
- * Guzzle event emitter.
- *
- * Some of this class is based on the Symfony EventDispatcher component, which
- * ships with the following license:
- *
- *     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.
- *
- * @link https://github.com/symfony/symfony/tree/master/src/Symfony/Component/EventDispatcher
- */
-class Emitter implements EmitterInterface
-{
-    /** @var array */
-    private $listeners = [];
-
-    /** @var array */
-    private $sorted = [];
-
-    public function on($eventName, callable $listener, $priority = 0)
-    {
-        if ($priority === 'first') {
-            $priority = isset($this->listeners[$eventName])
-                ? max(array_keys($this->listeners[$eventName])) + 1
-                : 1;
-        } elseif ($priority === 'last') {
-            $priority = isset($this->listeners[$eventName])
-                ? min(array_keys($this->listeners[$eventName])) - 1
-                : -1;
-        }
-
-        $this->listeners[$eventName][$priority][] = $listener;
-        unset($this->sorted[$eventName]);
-    }
-
-    public function once($eventName, callable $listener, $priority = 0)
-    {
-        $onceListener = function (
-            EventInterface $event
-        ) use (&$onceListener, $eventName, $listener, $priority) {
-            $this->removeListener($eventName, $onceListener);
-            $listener($event, $eventName);
-        };
-
-        $this->on($eventName, $onceListener, $priority);
-    }
-
-    public function removeListener($eventName, callable $listener)
-    {
-        if (empty($this->listeners[$eventName])) {
-            return;
-        }
-
-        foreach ($this->listeners[$eventName] as $priority => $listeners) {
-            if (false !== ($key = array_search($listener, $listeners, true))) {
-                unset(
-                    $this->listeners[$eventName][$priority][$key],
-                    $this->sorted[$eventName]
-                );
-            }
-        }
-    }
-
-    public function listeners($eventName = null)
-    {
-        // Return all events in a sorted priority order
-        if ($eventName === null) {
-            foreach (array_keys($this->listeners) as $eventName) {
-                if (empty($this->sorted[$eventName])) {
-                    $this->listeners($eventName);
-                }
-            }
-            return $this->sorted;
-        }
-
-        // Return the listeners for a specific event, sorted in priority order
-        if (empty($this->sorted[$eventName])) {
-            $this->sorted[$eventName] = [];
-            if (isset($this->listeners[$eventName])) {
-                krsort($this->listeners[$eventName], SORT_NUMERIC);
-                foreach ($this->listeners[$eventName] as $listeners) {
-                    foreach ($listeners as $listener) {
-                        $this->sorted[$eventName][] = $listener;
-                    }
-                }
-            }
-        }
-
-        return $this->sorted[$eventName];
-    }
-
-    public function hasListeners($eventName)
-    {
-        return !empty($this->listeners[$eventName]);
-    }
-
-    public function emit($eventName, EventInterface $event)
-    {
-        if (isset($this->listeners[$eventName])) {
-            foreach ($this->listeners($eventName) as $listener) {
-                $listener($event, $eventName);
-                if ($event->isPropagationStopped()) {
-                    break;
-                }
-            }
-        }
-
-        return $event;
-    }
-
-    public function attach(SubscriberInterface $subscriber)
-    {
-        foreach ($subscriber->getEvents() as $eventName => $listeners) {
-            if (is_array($listeners[0])) {
-                foreach ($listeners as $listener) {
-                    $this->on(
-                        $eventName,
-                        [$subscriber, $listener[0]],
-                        isset($listener[1]) ? $listener[1] : 0
-                    );
-                }
-            } else {
-                $this->on(
-                    $eventName,
-                    [$subscriber, $listeners[0]],
-                    isset($listeners[1]) ? $listeners[1] : 0
-                );
-            }
-        }
-    }
-
-    public function detach(SubscriberInterface $subscriber)
-    {
-        foreach ($subscriber->getEvents() as $eventName => $listener) {
-            $this->removeListener($eventName, [$subscriber, $listener[0]]);
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/EmitterInterface.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/EmitterInterface.php
deleted file mode 100644
index 9783efd15a..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/EmitterInterface.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-/**
- * Guzzle event emitter.
- */
-interface EmitterInterface
-{
-    /**
-     * Binds a listener to a specific event.
-     *
-     * @param string     $eventName Name of the event to bind to.
-     * @param callable   $listener  Listener to invoke when triggered.
-     * @param int|string $priority  The higher this value, the earlier an event
-     *     listener will be triggered in the chain (defaults to 0). You can
-     *     pass "first" or "last" to dynamically specify the event priority
-     *     based on the current event priorities associated with the given
-     *     event name in the emitter. Use "first" to set the priority to the
-     *     current highest priority plus one. Use "last" to set the priority to
-     *     the current lowest event priority minus one.
-     */
-    public function on($eventName, callable $listener, $priority = 0);
-
-    /**
-     * Binds a listener to a specific event. After the listener is triggered
-     * once, it is removed as a listener.
-     *
-     * @param string   $eventName Name of the event to bind to.
-     * @param callable $listener  Listener to invoke when triggered.
-     * @param int      $priority  The higher this value, the earlier an event
-     *     listener will be triggered in the chain (defaults to 0)
-     */
-    public function once($eventName, callable $listener, $priority = 0);
-
-    /**
-     * Removes an event listener from the specified event.
-     *
-     * @param string   $eventName The event to remove a listener from
-     * @param callable $listener  The listener to remove
-     */
-    public function removeListener($eventName, callable $listener);
-
-    /**
-     * Gets the listeners of a specific event or all listeners if no event is
-     * specified.
-     *
-     * @param string $eventName The name of the event. Pass null (the default)
-     *     to retrieve all listeners.
-     *
-     * @return array The event listeners for the specified event, or all event
-     *   listeners by event name. The format of the array when retrieving a
-     *   specific event list is an array of callables. The format of the array
-     *   when retrieving all listeners is an associative array of arrays of
-     *   callables.
-     */
-    public function listeners($eventName = null);
-
-    /**
-     * Checks if the emitter has listeners by the given name.
-     *
-     * @param string $eventName The name of the event to check.
-     *
-     * @return bool
-     */
-    public function hasListeners($eventName);
-
-    /**
-     * Emits an event to all registered listeners.
-     *
-     * Each event that is bound to the emitted eventName receives a
-     * EventInterface, the name of the event, and the event emitter.
-     *
-     * @param string         $eventName The name of the event to dispatch.
-     * @param EventInterface $event     The event to pass to the event handlers/listeners.
-     *
-     * @return EventInterface Returns the provided event object
-     */
-    public function emit($eventName, EventInterface $event);
-
-    /**
-     * Attaches an event subscriber.
-     *
-     * The subscriber is asked for all the events it is interested in and added
-     * as an event listener for each event.
-     *
-     * @param SubscriberInterface $subscriber Subscriber to attach.
-     */
-    public function attach(SubscriberInterface $subscriber);
-
-    /**
-     * Detaches an event subscriber.
-     *
-     * @param SubscriberInterface $subscriber Subscriber to detach.
-     */
-    public function detach(SubscriberInterface $subscriber);
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/EndEvent.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/EndEvent.php
deleted file mode 100644
index c89432b02d..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/EndEvent.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-/**
- * A terminal event that is emitted when a request transaction has ended.
- *
- * This event is emitted for both successful responses and responses that
- * encountered an exception. You need to check if an exception is present
- * in your listener to know the difference.
- *
- * You MAY intercept the response associated with the event if needed, but keep
- * in mind that the "complete" event will not be triggered as a result.
- */
-class EndEvent extends AbstractTransferEvent
-{
-    /**
-     * Get the exception that was encountered (if any).
-     *
-     * This method should be used to check if the request was sent successfully
-     * or if it encountered errors.
-     *
-     * @return \Exception|null
-     */
-    public function getException()
-    {
-        return $this->transaction->exception;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/ErrorEvent.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/ErrorEvent.php
deleted file mode 100644
index 7432134d03..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/ErrorEvent.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-use GuzzleHttp\Exception\RequestException;
-
-/**
- * Event emitted when an error occurs while sending a request.
- *
- * This event MAY be emitted multiple times. You MAY intercept the exception
- * and inject a response into the event to rescue the request using the
- * intercept() method of the event.
- *
- * This event allows the request to be retried using the "retry" method of the
- * event.
- */
-class ErrorEvent extends AbstractRetryableEvent
-{
-    /**
-     * Get the exception that was encountered
-     *
-     * @return RequestException
-     */
-    public function getException()
-    {
-        return $this->transaction->exception;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/EventInterface.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/EventInterface.php
deleted file mode 100644
index 97247e84c6..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/EventInterface.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-/**
- * Base event interface used when dispatching events to listeners using an
- * event emitter.
- */
-interface EventInterface
-{
-    /**
-     * Returns whether or not stopPropagation was called on the event.
-     *
-     * @return bool
-     * @see Event::stopPropagation
-     */
-    public function isPropagationStopped();
-
-    /**
-     * Stops the propagation of the event, preventing subsequent listeners
-     * registered to the same event from being invoked.
-     */
-    public function stopPropagation();
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/HasEmitterInterface.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/HasEmitterInterface.php
deleted file mode 100644
index a1a8612499..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/HasEmitterInterface.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-/**
- * Holds an event emitter
- */
-interface HasEmitterInterface
-{
-    /**
-     * Get the event emitter of the object
-     *
-     * @return EmitterInterface
-     */
-    public function getEmitter();
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/HasEmitterTrait.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/HasEmitterTrait.php
deleted file mode 100644
index 8e36ce385c..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/HasEmitterTrait.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-/**
- * Trait that implements the methods of HasEmitterInterface
- */
-trait HasEmitterTrait
-{
-    /** @var EmitterInterface */
-    private $emitter;
-
-    public function getEmitter()
-    {
-        if (!$this->emitter) {
-            $this->emitter = new Emitter();
-        }
-
-        return $this->emitter;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/ListenerAttacherTrait.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/ListenerAttacherTrait.php
deleted file mode 100644
index 407dc92dd5..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/ListenerAttacherTrait.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-/**
- * Trait that provides methods for extract event listeners specified in an array
- * and attaching them to an emitter owned by the object or one of its direct
- * dependencies.
- */
-trait ListenerAttacherTrait
-{
-    /**
-     * Attaches event listeners and properly sets their priorities and whether
-     * or not they are are only executed once.
-     *
-     * @param HasEmitterInterface $object    Object that has the event emitter.
-     * @param array               $listeners Array of hashes representing event
-     *                                       event listeners. Each item contains
-     *                                       "name", "fn", "priority", & "once".
-     */
-    private function attachListeners(HasEmitterInterface $object, array $listeners)
-    {
-        $emitter = $object->getEmitter();
-        foreach ($listeners as $el) {
-            if ($el['once']) {
-                $emitter->once($el['name'], $el['fn'], $el['priority']);
-            } else {
-                $emitter->on($el['name'], $el['fn'], $el['priority']);
-            }
-        }
-    }
-
-    /**
-     * Extracts the allowed events from the provided array, and ignores anything
-     * else in the array. The event listener must be specified as a callable or
-     * as an array of event listener data ("name", "fn", "priority", "once").
-     *
-     * @param array $source Array containing callables or hashes of data to be
-     *                      prepared as event listeners.
-     * @param array $events Names of events to look for in the provided $source
-     *                      array. Other keys are ignored.
-     * @return array
-     */
-    private function prepareListeners(array $source, array $events)
-    {
-        $listeners = [];
-        foreach ($events as $name) {
-            if (isset($source[$name])) {
-                $this->buildListener($name, $source[$name], $listeners);
-            }
-        }
-
-        return $listeners;
-    }
-
-    /**
-     * Creates a complete event listener definition from the provided array of
-     * listener data. Also works recursively if more than one listeners are
-     * contained in the provided array.
-     *
-     * @param string         $name      Name of the event the listener is for.
-     * @param array|callable $data      Event listener data to prepare.
-     * @param array          $listeners Array of listeners, passed by reference.
-     *
-     * @throws \InvalidArgumentException if the event data is malformed.
-     */
-    private function buildListener($name, $data, &$listeners)
-    {
-        static $defaults = ['priority' => 0, 'once' => false];
-
-        // If a callable is provided, normalize it to the array format.
-        if (is_callable($data)) {
-            $data = ['fn' => $data];
-        }
-
-        // Prepare the listener and add it to the array, recursively.
-        if (isset($data['fn'])) {
-            $data['name'] = $name;
-            $listeners[] = $data + $defaults;
-        } elseif (is_array($data)) {
-            foreach ($data as $listenerData) {
-                $this->buildListener($name, $listenerData, $listeners);
-            }
-        } else {
-            throw new \InvalidArgumentException('Each event listener must be a '
-                . 'callable or an associative array containing a "fn" key.');
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/ProgressEvent.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/ProgressEvent.php
deleted file mode 100644
index 3fd0de4ac0..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/ProgressEvent.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-use GuzzleHttp\Transaction;
-
-/**
- * Event object emitted when upload or download progress is made.
- *
- * You can access the progress values using their corresponding public
- * properties:
- *
- * - $downloadSize: The number of bytes that will be downloaded (if known)
- * - $downloaded: The number of bytes that have been downloaded
- * - $uploadSize: The number of bytes that will be uploaded (if known)
- * - $uploaded: The number of bytes that have been uploaded
- */
-class ProgressEvent extends AbstractRequestEvent
-{
-    /** @var int Amount of data to be downloaded */
-    public $downloadSize;
-
-    /** @var int Amount of data that has been downloaded */
-    public $downloaded;
-
-    /** @var int Amount of data to upload */
-    public $uploadSize;
-
-    /** @var int Amount of data that has been uploaded */
-    public $uploaded;
-
-    /**
-     * @param Transaction $transaction  Transaction being sent.
-     * @param int         $downloadSize Amount of data to download (if known)
-     * @param int         $downloaded   Amount of data that has been downloaded
-     * @param int         $uploadSize   Amount of data to upload (if known)
-     * @param int         $uploaded     Amount of data that had been uploaded
-     */
-    public function __construct(
-        Transaction $transaction,
-        $downloadSize,
-        $downloaded,
-        $uploadSize,
-        $uploaded
-    ) {
-        parent::__construct($transaction);
-        $this->downloadSize = $downloadSize;
-        $this->downloaded = $downloaded;
-        $this->uploadSize = $uploadSize;
-        $this->uploaded = $uploaded;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/RequestEvents.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/RequestEvents.php
deleted file mode 100644
index f51d420654..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/RequestEvents.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-/**
- * Contains methods used to manage the request event lifecycle.
- */
-final class RequestEvents
-{
-    // Generic event priorities
-    const EARLY = 10000;
-    const LATE = -10000;
-
-    // "before" priorities
-    const PREPARE_REQUEST = -100;
-    const SIGN_REQUEST = -10000;
-
-    // "complete" and "error" response priorities
-    const VERIFY_RESPONSE = 100;
-    const REDIRECT_RESPONSE = 200;
-
-    /**
-     * Converts an array of event options into a formatted array of valid event
-     * configuration.
-     *
-     * @param array $options Event array to convert
-     * @param array $events  Event names to convert in the options array.
-     * @param mixed $handler Event handler to utilize
-     *
-     * @return array
-     * @throws \InvalidArgumentException if the event config is invalid
-     * @internal
-     */
-    public static function convertEventArray(
-        array $options,
-        array $events,
-        $handler
-    ) {
-        foreach ($events as $name) {
-            if (!isset($options[$name])) {
-                $options[$name] = [$handler];
-            } elseif (is_callable($options[$name])) {
-                $options[$name] = [$options[$name], $handler];
-            } elseif (is_array($options[$name])) {
-                if (isset($options[$name]['fn'])) {
-                    $options[$name] = [$options[$name], $handler];
-                } else {
-                    $options[$name][] = $handler;
-                }
-            } else {
-                throw new \InvalidArgumentException('Invalid event format');
-            }
-        }
-
-        return $options;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/SubscriberInterface.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/SubscriberInterface.php
deleted file mode 100644
index 33d7702130..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Event/SubscriberInterface.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-namespace GuzzleHttp\Event;
-
-/**
- * SubscriberInterface provides an array of events to an
- * EventEmitterInterface when it is registered. The emitter then binds the
- * listeners specified by the EventSubscriber.
- *
- * This interface is based on the SubscriberInterface of the Symfony.
- * @link https://github.com/symfony/symfony/tree/master/src/Symfony/Component/EventDispatcher
- */
-interface SubscriberInterface
-{
-    /**
-     * Returns an array of event names this subscriber wants to listen to.
-     *
-     * The returned array keys MUST map to an event name. Each array value
-     * MUST be an array in which the first element is the name of a function
-     * on the EventSubscriber OR an array of arrays in the aforementioned
-     * format. The second element in the array is optional, and if specified,
-     * designates the event priority.
-     *
-     * For example, the following are all valid:
-     *
-     *  - ['eventName' => ['methodName']]
-     *  - ['eventName' => ['methodName', $priority]]
-     *  - ['eventName' => [['methodName'], ['otherMethod']]
-     *  - ['eventName' => [['methodName'], ['otherMethod', $priority]]
-     *  - ['eventName' => [['methodName', $priority], ['otherMethod', $priority]]
-     *
-     * @return array
-     */
-    public function getEvents();
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php
deleted file mode 100644
index fd78431ea7..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-namespace GuzzleHttp\Exception;
-
-/**
- * Exception when an HTTP error occurs (4xx or 5xx error)
- */
-class BadResponseException extends RequestException {}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/ClientException.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/ClientException.php
deleted file mode 100644
index f95c09f2b1..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/ClientException.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-namespace GuzzleHttp\Exception;
-
-/**
- * Exception when a client error is encountered (4xx codes)
- */
-class ClientException extends BadResponseException {}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/ConnectException.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/ConnectException.php
deleted file mode 100644
index a91c5a68ed..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/ConnectException.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-namespace GuzzleHttp\Exception;
-
-class ConnectException extends RequestException {}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/CouldNotRewindStreamException.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/CouldNotRewindStreamException.php
deleted file mode 100644
index fbe2dcd7cc..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/CouldNotRewindStreamException.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-namespace GuzzleHttp\Exception;
-
-class CouldNotRewindStreamException extends RequestException {}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/ParseException.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/ParseException.php
deleted file mode 100644
index e593e3d5e5..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/ParseException.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-namespace GuzzleHttp\Exception;
-
-use GuzzleHttp\Message\ResponseInterface;
-
-/**
- * Exception when a client is unable to parse the response body as XML or JSON
- */
-class ParseException extends TransferException
-{
-    /** @var ResponseInterface */
-    private $response;
-
-    public function __construct(
-        $message = '',
-        ResponseInterface $response = null,
-        \Exception $previous = null
-    ) {
-        parent::__construct($message, 0, $previous);
-        $this->response = $response;
-    }
-    /**
-     * Get the associated response
-     *
-     * @return ResponseInterface|null
-     */
-    public function getResponse()
-    {
-        return $this->response;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php
deleted file mode 100644
index 3f052d36db..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-namespace GuzzleHttp\Exception;
-
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Message\ResponseInterface;
-use GuzzleHttp\Ring\Exception\ConnectException;
-use GuzzleHttp\Exception\ConnectException as HttpConnectException;
-use GuzzleHttp\Ring\Future\FutureInterface;
-
-/**
- * HTTP Request exception
- */
-class RequestException extends TransferException
-{
-    /** @var RequestInterface */
-    private $request;
-
-    /** @var ResponseInterface */
-    private $response;
-
-    public function __construct(
-        $message,
-        RequestInterface $request,
-        ResponseInterface $response = null,
-        \Exception $previous = null
-    ) {
-        // Set the code of the exception if the response is set and not future.
-        $code = $response && !($response instanceof FutureInterface)
-            ? $response->getStatusCode()
-            : 0;
-        parent::__construct($message, $code, $previous);
-        $this->request = $request;
-        $this->response = $response;
-    }
-
-    /**
-     * Wrap non-RequestExceptions with a RequestException
-     *
-     * @param RequestInterface $request
-     * @param \Exception       $e
-     *
-     * @return RequestException
-     */
-    public static function wrapException(RequestInterface $request, \Exception $e)
-    {
-        if ($e instanceof RequestException) {
-            return $e;
-        } elseif ($e instanceof ConnectException) {
-            return new HttpConnectException($e->getMessage(), $request, null, $e);
-        } else {
-            return new RequestException($e->getMessage(), $request, null, $e);
-        }
-    }
-
-    /**
-     * Factory method to create a new exception with a normalized error message
-     *
-     * @param RequestInterface  $request  Request
-     * @param ResponseInterface $response Response received
-     * @param \Exception        $previous Previous exception
-     *
-     * @return self
-     */
-    public static function create(
-        RequestInterface $request,
-        ResponseInterface $response = null,
-        \Exception $previous = null
-    ) {
-        if (!$response) {
-            return new self('Error completing request', $request, null, $previous);
-        }
-
-        $level = floor($response->getStatusCode() / 100);
-        if ($level == '4') {
-            $label = 'Client error response';
-            $className = __NAMESPACE__ . '\\ClientException';
-        } elseif ($level == '5') {
-            $label = 'Server error response';
-            $className = __NAMESPACE__ . '\\ServerException';
-        } else {
-            $label = 'Unsuccessful response';
-            $className = __CLASS__;
-        }
-
-        $message = $label . ' [url] ' . $request->getUrl()
-            . ' [status code] ' . $response->getStatusCode()
-            . ' [reason phrase] ' . $response->getReasonPhrase();
-
-        return new $className($message, $request, $response, $previous);
-    }
-
-    /**
-     * Get the request that caused the exception
-     *
-     * @return RequestInterface
-     */
-    public function getRequest()
-    {
-        return $this->request;
-    }
-
-    /**
-     * Get the associated response
-     *
-     * @return ResponseInterface|null
-     */
-    public function getResponse()
-    {
-        return $this->response;
-    }
-
-    /**
-     * Check if a response was received
-     *
-     * @return bool
-     */
-    public function hasResponse()
-    {
-        return $this->response !== null;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php
deleted file mode 100644
index 7cdd340866..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-namespace GuzzleHttp\Exception;
-
-/**
- * Exception when a server error is encountered (5xx codes)
- */
-class ServerException extends BadResponseException {}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/StateException.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/StateException.php
deleted file mode 100644
index a7652a384f..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/StateException.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-namespace GuzzleHttp\Exception;
-
-class StateException extends TransferException {};
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/TooManyRedirectsException.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/TooManyRedirectsException.php
deleted file mode 100644
index b60a9678d6..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/TooManyRedirectsException.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-namespace GuzzleHttp\Exception;
-
-class TooManyRedirectsException extends RequestException {}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php
deleted file mode 100644
index 92d7de6917..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-namespace GuzzleHttp\Exception;
-
-class TransferException extends \RuntimeException {}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/XmlParseException.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/XmlParseException.php
deleted file mode 100644
index a4a1a0af47..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Exception/XmlParseException.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace GuzzleHttp\Exception;
-
-use GuzzleHttp\Message\ResponseInterface;
-
-/**
- * Exception when a client is unable to parse the response body as XML
- */
-class XmlParseException extends ParseException
-{
-    /** @var \LibXMLError */
-    protected $error;
-
-    public function __construct(
-        $message = '',
-        ResponseInterface $response = null,
-        \Exception $previous = null,
-        \LibXMLError $error = null
-    ) {
-        parent::__construct($message, $response, $previous);
-        $this->error = $error;
-    }
-
-    /**
-     * Get the associated error
-     *
-     * @return \LibXMLError|null
-     */
-    public function getError()
-    {
-        return $this->error;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/HasDataTrait.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/HasDataTrait.php
deleted file mode 100644
index 020dfc9aba..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/HasDataTrait.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-/**
- * Trait implementing ToArrayInterface, \ArrayAccess, \Countable,
- * \IteratorAggregate, and some path style methods.
- */
-trait HasDataTrait
-{
-    /** @var array */
-    protected $data = [];
-
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->data);
-    }
-
-    public function offsetGet($offset)
-    {
-        return isset($this->data[$offset]) ? $this->data[$offset] : null;
-    }
-
-    public function offsetSet($offset, $value)
-    {
-        $this->data[$offset] = $value;
-    }
-
-    public function offsetExists($offset)
-    {
-        return isset($this->data[$offset]);
-    }
-
-    public function offsetUnset($offset)
-    {
-        unset($this->data[$offset]);
-    }
-
-    public function toArray()
-    {
-        return $this->data;
-    }
-
-    public function count()
-    {
-        return count($this->data);
-    }
-
-    /**
-     * Get a value from the collection using a path syntax to retrieve nested
-     * data.
-     *
-     * @param string $path Path to traverse and retrieve a value from
-     *
-     * @return mixed|null
-     */
-    public function getPath($path)
-    {
-        return Utils::getPath($this->data, $path);
-    }
-
-    /**
-     * Set a value into a nested array key. Keys will be created as needed to
-     * set the value.
-     *
-     * @param string $path  Path to set
-     * @param mixed  $value Value to set at the key
-     *
-     * @throws \RuntimeException when trying to setPath using a nested path
-     *     that travels through a scalar value
-     */
-    public function setPath($path, $value)
-    {
-        Utils::setPath($this->data, $path, $value);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/AbstractMessage.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/AbstractMessage.php
deleted file mode 100644
index f118e0fe5f..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/AbstractMessage.php
+++ /dev/null
@@ -1,253 +0,0 @@
-<?php
-namespace GuzzleHttp\Message;
-
-use GuzzleHttp\Stream\StreamInterface;
-
-abstract class AbstractMessage implements MessageInterface
-{
-    /** @var array HTTP header collection */
-    private $headers = [];
-
-    /** @var array mapping a lowercase header name to its name over the wire */
-    private $headerNames = [];
-
-    /** @var StreamInterface Message body */
-    private $body;
-
-    /** @var string HTTP protocol version of the message */
-    private $protocolVersion = '1.1';
-
-    public function __toString()
-    {
-        return static::getStartLineAndHeaders($this)
-            . "\r\n\r\n" . $this->getBody();
-    }
-
-    public function getProtocolVersion()
-    {
-        return $this->protocolVersion;
-    }
-
-    public function getBody()
-    {
-        return $this->body;
-    }
-
-    public function setBody(StreamInterface $body = null)
-    {
-        if ($body === null) {
-            // Setting a null body will remove the body of the request
-            $this->removeHeader('Content-Length');
-            $this->removeHeader('Transfer-Encoding');
-        }
-
-        $this->body = $body;
-    }
-
-    public function addHeader($header, $value)
-    {
-        if (is_array($value)) {
-            $current = array_merge($this->getHeaderAsArray($header), $value);
-        } else {
-            $current = $this->getHeaderAsArray($header);
-            $current[] = (string) $value;
-        }
-
-        $this->setHeader($header, $current);
-    }
-
-    public function addHeaders(array $headers)
-    {
-        foreach ($headers as $name => $header) {
-            $this->addHeader($name, $header);
-        }
-    }
-
-    public function getHeader($header)
-    {
-        $name = strtolower($header);
-        return isset($this->headers[$name])
-            ? implode(', ', $this->headers[$name])
-            : '';
-    }
-
-    public function getHeaderAsArray($header)
-    {
-        $name = strtolower($header);
-        return isset($this->headers[$name]) ? $this->headers[$name] : [];
-    }
-
-    public function getHeaders()
-    {
-        $headers = [];
-        foreach ($this->headers as $name => $values) {
-            $headers[$this->headerNames[$name]] = $values;
-        }
-
-        return $headers;
-    }
-
-    public function setHeader($header, $value)
-    {
-        $header = trim($header);
-        $name = strtolower($header);
-        $this->headerNames[$name] = $header;
-
-        if (is_array($value)) {
-            foreach ($value as &$v) {
-                $v = trim($v);
-            }
-            $this->headers[$name] = $value;
-        } else {
-            $this->headers[$name] = [trim($value)];
-        }
-    }
-
-    public function setHeaders(array $headers)
-    {
-        $this->headers = $this->headerNames = [];
-        foreach ($headers as $key => $value) {
-            $this->addHeader($key, $value);
-        }
-    }
-
-    public function hasHeader($header)
-    {
-        return isset($this->headers[strtolower($header)]);
-    }
-
-    public function removeHeader($header)
-    {
-        $name = strtolower($header);
-        unset($this->headers[$name], $this->headerNames[$name]);
-    }
-
-    /**
-     * Parse an array of header values containing ";" separated data into an
-     * array of associative arrays representing the header key value pair
-     * data of the header. When a parameter does not contain a value, but just
-     * contains a key, this function will inject a key with a '' string value.
-     *
-     * @param MessageInterface $message That contains the header
-     * @param string           $header  Header to retrieve from the message
-     *
-     * @return array Returns the parsed header values.
-     */
-    public static function parseHeader(MessageInterface $message, $header)
-    {
-        static $trimmed = "\"'  \n\t\r";
-        $params = $matches = [];
-
-        foreach (self::normalizeHeader($message, $header) as $val) {
-            $part = [];
-            foreach (preg_split('/;(?=([^"]*"[^"]*")*[^"]*$)/', $val) as $kvp) {
-                if (preg_match_all('/<[^>]+>|[^=]+/', $kvp, $matches)) {
-                    $m = $matches[0];
-                    if (isset($m[1])) {
-                        $part[trim($m[0], $trimmed)] = trim($m[1], $trimmed);
-                    } else {
-                        $part[] = trim($m[0], $trimmed);
-                    }
-                }
-            }
-            if ($part) {
-                $params[] = $part;
-            }
-        }
-
-        return $params;
-    }
-
-    /**
-     * Converts an array of header values that may contain comma separated
-     * headers into an array of headers with no comma separated values.
-     *
-     * @param MessageInterface $message That contains the header
-     * @param string              $header  Header to retrieve from the message
-     *
-     * @return array Returns the normalized header field values.
-     */
-    public static function normalizeHeader(MessageInterface $message, $header)
-    {
-        $h = $message->getHeaderAsArray($header);
-        for ($i = 0, $total = count($h); $i < $total; $i++) {
-            if (strpos($h[$i], ',') === false) {
-                continue;
-            }
-            foreach (preg_split('/,(?=([^"]*"[^"]*")*[^"]*$)/', $h[$i]) as $v) {
-                $h[] = trim($v);
-            }
-            unset($h[$i]);
-        }
-
-        return $h;
-    }
-
-    /**
-     * Gets the start-line and headers of a message as a string
-     *
-     * @param MessageInterface $message
-     *
-     * @return string
-     */
-    public static function getStartLineAndHeaders(MessageInterface $message)
-    {
-        return static::getStartLine($message)
-            . self::getHeadersAsString($message);
-    }
-
-    /**
-     * Gets the headers of a message as a string
-     *
-     * @param MessageInterface $message
-     *
-     * @return string
-     */
-    public static function getHeadersAsString(MessageInterface $message)
-    {
-        $result  = '';
-        foreach ($message->getHeaders() as $name => $values) {
-            $result .= "\r\n{$name}: " . implode(', ', $values);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Gets the start line of a message
-     *
-     * @param MessageInterface $message
-     *
-     * @return string
-     * @throws \InvalidArgumentException
-     */
-    public static function getStartLine(MessageInterface $message)
-    {
-        if ($message instanceof RequestInterface) {
-            return trim($message->getMethod() . ' '
-                . $message->getResource())
-                . ' HTTP/' . $message->getProtocolVersion();
-        } elseif ($message instanceof ResponseInterface) {
-            return 'HTTP/' . $message->getProtocolVersion() . ' '
-                . $message->getStatusCode() . ' '
-                . $message->getReasonPhrase();
-        } else {
-            throw new \InvalidArgumentException('Unknown message type');
-        }
-    }
-
-    /**
-     * Accepts and modifies the options provided to the message in the
-     * constructor.
-     *
-     * Can be overridden in subclasses as necessary.
-     *
-     * @param array $options Options array passed by reference.
-     */
-    protected function handleOptions(array &$options)
-    {
-        if (isset($options['protocol_version'])) {
-            $this->protocolVersion = $options['protocol_version'];
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/AppliesHeadersInterface.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/AppliesHeadersInterface.php
deleted file mode 100644
index ca42f20f30..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/AppliesHeadersInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-namespace GuzzleHttp\Message;
-
-/**
- * Applies headers to a request.
- *
- * This interface can be used with Guzzle streams to apply body specific
- * headers to a request during the PREPARE_REQUEST priority of the before event
- *
- * NOTE: a body that implements this interface will prevent a default
- * content-type from being added to a request during the before event. If you
- * want a default content-type to be added, then it will need to be done
- * manually (e.g., using {@see GuzzleHttp\Mimetypes}).
- */
-interface AppliesHeadersInterface
-{
-    /**
-     * Apply headers to a request appropriate for the current state of the
-     * object.
-     *
-     * @param RequestInterface $request Request
-     */
-    public function applyRequestHeaders(RequestInterface $request);
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/FutureResponse.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/FutureResponse.php
deleted file mode 100644
index 5e5037e1b9..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/FutureResponse.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-namespace GuzzleHttp\Message;
-
-use GuzzleHttp\Ring\Future\MagicFutureTrait;
-use GuzzleHttp\Ring\Future\FutureInterface;
-use GuzzleHttp\Stream\StreamInterface;
-
-/**
- * Represents a response that has not been fulfilled.
- *
- * When created, you must provide a function that is used to dereference the
- * future result and return it's value. The function has no arguments and MUST
- * return an instance of a {@see GuzzleHttp\Message\ResponseInterface} object.
- *
- * You can optionally provide a function in the constructor that can be used to
- * cancel the future from completing if possible. This function has no
- * arguments and returns a boolean value representing whether or not the
- * response could be cancelled.
- *
- * @property ResponseInterface $_value
- */
-class FutureResponse implements ResponseInterface, FutureInterface
-{
-    use MagicFutureTrait;
-
-    /**
-     * Returns a FutureResponse that wraps another future.
-     *
-     * @param FutureInterface $future      Future to wrap with a new future
-     * @param callable        $onFulfilled Invoked when the future fulfilled
-     * @param callable        $onRejected  Invoked when the future rejected
-     * @param callable        $onProgress  Invoked when the future progresses
-     *
-     * @return FutureResponse
-     */
-    public static function proxy(
-        FutureInterface $future,
-        callable $onFulfilled = null,
-        callable $onRejected = null,
-        callable $onProgress = null
-    ) {
-        return new FutureResponse(
-            $future->then($onFulfilled, $onRejected, $onProgress),
-            [$future, 'wait'],
-            [$future, 'cancel']
-        );
-    }
-
-    public function getStatusCode()
-    {
-        return $this->_value->getStatusCode();
-    }
-
-    public function setStatusCode($code)
-    {
-        $this->_value->setStatusCode($code);
-    }
-
-    public function getReasonPhrase()
-    {
-        return $this->_value->getReasonPhrase();
-    }
-
-    public function setReasonPhrase($phrase)
-    {
-        $this->_value->setReasonPhrase($phrase);
-    }
-
-    public function getEffectiveUrl()
-    {
-        return $this->_value->getEffectiveUrl();
-    }
-
-    public function setEffectiveUrl($url)
-    {
-        $this->_value->setEffectiveUrl($url);
-    }
-
-    public function json(array $config = [])
-    {
-        return $this->_value->json($config);
-    }
-
-    public function xml(array $config = [])
-    {
-        return $this->_value->xml($config);
-    }
-
-    public function __toString()
-    {
-        try {
-            return $this->_value->__toString();
-        } catch (\Exception $e) {
-            trigger_error($e->getMessage(), E_USER_WARNING);
-            return '';
-        }
-    }
-
-    public function getProtocolVersion()
-    {
-        return $this->_value->getProtocolVersion();
-    }
-
-    public function setBody(StreamInterface $body = null)
-    {
-        $this->_value->setBody($body);
-    }
-
-    public function getBody()
-    {
-        return $this->_value->getBody();
-    }
-
-    public function getHeaders()
-    {
-        return $this->_value->getHeaders();
-    }
-
-    public function getHeader($header)
-    {
-        return $this->_value->getHeader($header);
-    }
-
-    public function getHeaderAsArray($header)
-    {
-        return $this->_value->getHeaderAsArray($header);
-    }
-
-    public function hasHeader($header)
-    {
-        return $this->_value->hasHeader($header);
-    }
-
-    public function removeHeader($header)
-    {
-        $this->_value->removeHeader($header);
-    }
-
-    public function addHeader($header, $value)
-    {
-        $this->_value->addHeader($header, $value);
-    }
-
-    public function addHeaders(array $headers)
-    {
-        $this->_value->addHeaders($headers);
-    }
-
-    public function setHeader($header, $value)
-    {
-        $this->_value->setHeader($header, $value);
-    }
-
-    public function setHeaders(array $headers)
-    {
-        $this->_value->setHeaders($headers);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/MessageFactory.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/MessageFactory.php
deleted file mode 100644
index d469ef1e6b..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/MessageFactory.php
+++ /dev/null
@@ -1,364 +0,0 @@
-<?php
-namespace GuzzleHttp\Message;
-
-use GuzzleHttp\Cookie\CookieJar;
-use GuzzleHttp\Cookie\CookieJarInterface;
-use GuzzleHttp\Event\ListenerAttacherTrait;
-use GuzzleHttp\Post\PostBody;
-use GuzzleHttp\Post\PostFile;
-use GuzzleHttp\Post\PostFileInterface;
-use GuzzleHttp\Query;
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Subscriber\Cookie;
-use GuzzleHttp\Subscriber\HttpError;
-use GuzzleHttp\Subscriber\Redirect;
-use GuzzleHttp\Url;
-use \InvalidArgumentException as Iae;
-
-/**
- * Default HTTP request factory used to create Request and Response objects.
- */
-class MessageFactory implements MessageFactoryInterface
-{
-    use ListenerAttacherTrait;
-
-    /** @var HttpError */
-    private $errorPlugin;
-
-    /** @var Redirect */
-    private $redirectPlugin;
-
-    /** @var array */
-    private $customOptions;
-
-    /** @var array Request options passed through to request Config object */
-    private static $configMap = [
-        'connect_timeout' => 1, 'timeout' => 1, 'verify' => 1, 'ssl_key' => 1,
-        'cert' => 1, 'proxy' => 1, 'debug' => 1, 'save_to' => 1, 'stream' => 1,
-        'expect' => 1, 'future' => 1
-    ];
-
-    /** @var array Default allow_redirects request option settings  */
-    private static $defaultRedirect = [
-        'max'       => 5,
-        'strict'    => false,
-        'referer'   => false,
-        'protocols' => ['http', 'https']
-    ];
-
-    /**
-     * @param array $customOptions Associative array of custom request option
-     *                             names mapping to functions used to apply
-     *                             the option. The function accepts the request
-     *                             and the option value to apply.
-     */
-    public function __construct(array $customOptions = [])
-    {
-        $this->errorPlugin = new HttpError();
-        $this->redirectPlugin = new Redirect();
-        $this->customOptions = $customOptions;
-    }
-
-    public function createResponse(
-        $statusCode,
-        array $headers = [],
-        $body = null,
-        array $options = []
-    ) {
-        if (null !== $body) {
-            $body = Stream::factory($body);
-        }
-
-        return new Response($statusCode, $headers, $body, $options);
-    }
-
-    public function createRequest($method, $url, array $options = [])
-    {
-        // Handle the request protocol version option that needs to be
-        // specified in the request constructor.
-        if (isset($options['version'])) {
-            $options['config']['protocol_version'] = $options['version'];
-            unset($options['version']);
-        }
-
-        $request = new Request($method, $url, [], null,
-            isset($options['config']) ? $options['config'] : []);
-
-        unset($options['config']);
-
-        // Use a POST body by default
-        if (strtoupper($method) == 'POST'
-            && !isset($options['body'])
-            && !isset($options['json'])
-        ) {
-            $options['body'] = [];
-        }
-
-        if ($options) {
-            $this->applyOptions($request, $options);
-        }
-
-        return $request;
-    }
-
-    /**
-     * Create a request or response object from an HTTP message string
-     *
-     * @param string $message Message to parse
-     *
-     * @return RequestInterface|ResponseInterface
-     * @throws \InvalidArgumentException if unable to parse a message
-     */
-    public function fromMessage($message)
-    {
-        static $parser;
-        if (!$parser) {
-            $parser = new MessageParser();
-        }
-
-        // Parse a response
-        if (strtoupper(substr($message, 0, 4)) == 'HTTP') {
-            $data = $parser->parseResponse($message);
-            return $this->createResponse(
-                $data['code'],
-                $data['headers'],
-                $data['body'] === '' ? null : $data['body'],
-                $data
-            );
-        }
-
-        // Parse a request
-        if (!($data = ($parser->parseRequest($message)))) {
-            throw new \InvalidArgumentException('Unable to parse request');
-        }
-
-        return $this->createRequest(
-            $data['method'],
-            Url::buildUrl($data['request_url']),
-            [
-                'headers' => $data['headers'],
-                'body' => $data['body'] === '' ? null : $data['body'],
-                'config' => [
-                    'protocol_version' => $data['protocol_version']
-                ]
-            ]
-        );
-    }
-
-    /**
-     * Apply POST fields and files to a request to attempt to give an accurate
-     * representation.
-     *
-     * @param RequestInterface $request Request to update
-     * @param array            $body    Body to apply
-     */
-    protected function addPostData(RequestInterface $request, array $body)
-    {
-        static $fields = ['string' => true, 'array' => true, 'NULL' => true,
-            'boolean' => true, 'double' => true, 'integer' => true];
-
-        $post = new PostBody();
-        foreach ($body as $key => $value) {
-            if (isset($fields[gettype($value)])) {
-                $post->setField($key, $value);
-            } elseif ($value instanceof PostFileInterface) {
-                $post->addFile($value);
-            } else {
-                $post->addFile(new PostFile($key, $value));
-            }
-        }
-
-        if ($request->getHeader('Content-Type') == 'multipart/form-data') {
-            $post->forceMultipartUpload(true);
-        }
-
-        $request->setBody($post);
-    }
-
-    protected function applyOptions(
-        RequestInterface $request,
-        array $options = []
-    ) {
-        $config = $request->getConfig();
-        $emitter = $request->getEmitter();
-
-        foreach ($options as $key => $value) {
-
-            if (isset(self::$configMap[$key])) {
-                $config[$key] = $value;
-                continue;
-            }
-
-            switch ($key) {
-
-            case 'allow_redirects':
-
-                if ($value === false) {
-                    continue;
-                }
-
-                if ($value === true) {
-                    $value = self::$defaultRedirect;
-                } elseif (!is_array($value)) {
-                    throw new Iae('allow_redirects must be true, false, or array');
-                } else {
-                    // Merge the default settings with the provided settings
-                    $value += self::$defaultRedirect;
-                }
-
-                $config['redirect'] = $value;
-                $emitter->attach($this->redirectPlugin);
-                break;
-
-            case 'decode_content':
-
-                if ($value === false) {
-                    continue;
-                }
-
-                $config['decode_content'] = true;
-                if ($value !== true) {
-                    $request->setHeader('Accept-Encoding', $value);
-                }
-                break;
-
-            case 'headers':
-
-                if (!is_array($value)) {
-                    throw new Iae('header value must be an array');
-                }
-                foreach ($value as $k => $v) {
-                    $request->setHeader($k, $v);
-                }
-                break;
-
-            case 'exceptions':
-
-                if ($value === true) {
-                    $emitter->attach($this->errorPlugin);
-                }
-                break;
-
-            case 'body':
-
-                if (is_array($value)) {
-                    $this->addPostData($request, $value);
-                } elseif ($value !== null) {
-                    $request->setBody(Stream::factory($value));
-                }
-                break;
-
-            case 'auth':
-
-                if (!$value) {
-                    continue;
-                }
-
-                if (is_array($value)) {
-                    $type = isset($value[2]) ? strtolower($value[2]) : 'basic';
-                } else {
-                    $type = strtolower($value);
-                }
-
-                $config['auth'] = $value;
-
-                if ($type == 'basic') {
-                    $request->setHeader(
-                        'Authorization',
-                        'Basic ' . base64_encode("$value[0]:$value[1]")
-                    );
-                } elseif ($type == 'digest') {
-                    // @todo: Do not rely on curl
-                    $config->setPath('curl/' . CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
-                    $config->setPath('curl/' . CURLOPT_USERPWD, "$value[0]:$value[1]");
-                }
-                break;
-
-            case 'query':
-
-                if ($value instanceof Query) {
-                    $original = $request->getQuery();
-                    // Do not overwrite existing query string variables by
-                    // overwriting the object with the query string data passed
-                    // in the URL
-                    $value->overwriteWith($original->toArray());
-                    $request->setQuery($value);
-                } elseif (is_array($value)) {
-                    // Do not overwrite existing query string variables
-                    $query = $request->getQuery();
-                    foreach ($value as $k => $v) {
-                        if (!isset($query[$k])) {
-                            $query[$k] = $v;
-                        }
-                    }
-                } else {
-                    throw new Iae('query must be an array or Query object');
-                }
-                break;
-
-            case 'cookies':
-
-                if ($value === true) {
-                    static $cookie = null;
-                    if (!$cookie) {
-                        $cookie = new Cookie();
-                    }
-                    $emitter->attach($cookie);
-                } elseif (is_array($value)) {
-                    $emitter->attach(
-                        new Cookie(CookieJar::fromArray($value, $request->getHost()))
-                    );
-                } elseif ($value instanceof CookieJarInterface) {
-                    $emitter->attach(new Cookie($value));
-                } elseif ($value !== false) {
-                    throw new Iae('cookies must be an array, true, or CookieJarInterface');
-                }
-                break;
-
-            case 'events':
-
-                if (!is_array($value)) {
-                    throw new Iae('events must be an array');
-                }
-
-                $this->attachListeners($request,
-                    $this->prepareListeners(
-                        $value,
-                        ['before', 'complete', 'error', 'progress', 'end']
-                    )
-                );
-                break;
-
-            case 'subscribers':
-
-                if (!is_array($value)) {
-                    throw new Iae('subscribers must be an array');
-                }
-
-                foreach ($value as $subscribers) {
-                    $emitter->attach($subscribers);
-                }
-                break;
-
-            case 'json':
-
-                $request->setBody(Stream::factory(json_encode($value)));
-                if (!$request->hasHeader('Content-Type')) {
-                    $request->setHeader('Content-Type', 'application/json');
-                }
-                break;
-
-            default:
-
-                // Check for custom handler functions.
-                if (isset($this->customOptions[$key])) {
-                    $fn = $this->customOptions[$key];
-                    $fn($request, $value);
-                    continue;
-                }
-
-                throw new Iae("No method can handle the {$key} config key");
-            }
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/MessageFactoryInterface.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/MessageFactoryInterface.php
deleted file mode 100644
index 86ae9c7ee0..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/MessageFactoryInterface.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-namespace GuzzleHttp\Message;
-
-use GuzzleHttp\Url;
-
-/**
- * Request and response factory
- */
-interface MessageFactoryInterface
-{
-    /**
-     * Creates a response
-     *
-     * @param string $statusCode HTTP status code
-     * @param array  $headers    Response headers
-     * @param mixed  $body       Response body
-     * @param array  $options    Response options
-     *     - protocol_version: HTTP protocol version
-     *     - header_factory: Factory used to create headers
-     *     - And any other options used by a concrete message implementation
-     *
-     * @return ResponseInterface
-     */
-    public function createResponse(
-        $statusCode,
-        array $headers = [],
-        $body = null,
-        array $options = []
-    );
-
-    /**
-     * Create a new request based on the HTTP method.
-     *
-     * This method accepts an associative array of request options. Below is a
-     * brief description of each parameter. See
-     * http://docs.guzzlephp.org/en/latest/clients.html#request-options for a much more
-     * in-depth description of each parameter.
-     *
-     * - headers: Associative array of headers to add to the request
-     * - body: string|resource|array|StreamInterface request body to send
-     * - json: mixed Uploads JSON encoded data using an application/json Content-Type header.
-     * - query: Associative array of query string values to add to the request
-     * - auth: array|string HTTP auth settings (user, pass[, type="basic"])
-     * - version: The HTTP protocol version to use with the request
-     * - cookies: true|false|CookieJarInterface To enable or disable cookies
-     * - allow_redirects: true|false|array Controls HTTP redirects
-     * - save_to: string|resource|StreamInterface Where the response is saved
-     * - events: Associative array of event names to callables or arrays
-     * - subscribers: Array of event subscribers to add to the request
-     * - exceptions: Specifies whether or not exceptions are thrown for HTTP protocol errors
-     * - timeout: Timeout of the request in seconds. Use 0 to wait indefinitely
-     * - connect_timeout: Number of seconds to wait while trying to connect. (0 to wait indefinitely)
-     * - verify: SSL validation. True/False or the path to a PEM file
-     * - cert: Path a SSL cert or array of (path, pwd)
-     * - ssl_key: Path to a private SSL key or array of (path, pwd)
-     * - proxy: Specify an HTTP proxy or hash of protocols to proxies
-     * - debug: Set to true or a resource to view handler specific debug info
-     * - stream: Set to true to stream a response body rather than download it all up front
-     * - expect: true/false/integer Controls the "Expect: 100-Continue" header
-     * - config: Associative array of request config collection options
-     * - decode_content: true/false/string to control decoding content-encoding responses
-     *
-     * @param string     $method  HTTP method (GET, POST, PUT, etc.)
-     * @param string|Url $url     HTTP URL to connect to
-     * @param array      $options Array of options to apply to the request
-     *
-     * @return RequestInterface
-     * @link http://docs.guzzlephp.org/en/latest/clients.html#request-options
-     */
-    public function createRequest($method, $url, array $options = []);
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/MessageInterface.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/MessageInterface.php
deleted file mode 100644
index b2b472b6ed..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/MessageInterface.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-namespace GuzzleHttp\Message;
-
-use GuzzleHttp\Stream\StreamInterface;
-
-/**
- * Request and response message interface
- */
-interface MessageInterface
-{
-    /**
-     * Get a string representation of the message
-     *
-     * @return string
-     */
-    public function __toString();
-
-    /**
-     * Get the HTTP protocol version of the message
-     *
-     * @return string
-     */
-    public function getProtocolVersion();
-
-    /**
-     * Sets the body of the message.
-     *
-     * The body MUST be a StreamInterface object. Setting the body to null MUST
-     * remove the existing body.
-     *
-     * @param StreamInterface|null $body Body.
-     */
-    public function setBody(StreamInterface $body = null);
-
-    /**
-     * Get the body of the message
-     *
-     * @return StreamInterface|null
-     */
-    public function getBody();
-
-    /**
-     * Gets all message headers.
-     *
-     * The keys represent the header name as it will be sent over the wire, and
-     * each value is an array of strings associated with the header.
-     *
-     *     // Represent the headers as a string
-     *     foreach ($message->getHeaders() as $name => $values) {
-     *         echo $name . ": " . implode(", ", $values);
-     *     }
-     *
-     * @return array Returns an associative array of the message's headers.
-     */
-    public function getHeaders();
-
-    /**
-     * Retrieve a header by the given case-insensitive name.
-     *
-     * @param string $header Case-insensitive header name.
-     *
-     * @return string
-     */
-    public function getHeader($header);
-
-    /**
-     * Retrieves a header by the given case-insensitive name as an array of strings.
-     *
-     * @param string $header Case-insensitive header name.
-     *
-     * @return string[]
-     */
-    public function getHeaderAsArray($header);
-
-    /**
-     * Checks if a header exists by the given case-insensitive name.
-     *
-     * @param string $header Case-insensitive header name.
-     *
-     * @return bool Returns true if any header names match the given header
-     *     name using a case-insensitive string comparison. Returns false if
-     *     no matching header name is found in the message.
-     */
-    public function hasHeader($header);
-
-    /**
-     * Remove a specific header by case-insensitive name.
-     *
-     * @param string $header Case-insensitive header name.
-     */
-    public function removeHeader($header);
-
-    /**
-     * Appends a header value to any existing values associated with the
-     * given header name.
-     *
-     * @param string $header Header name to add
-     * @param string $value  Value of the header
-     */
-    public function addHeader($header, $value);
-
-    /**
-     * Merges in an associative array of headers.
-     *
-     * Each array key MUST be a string representing the case-insensitive name
-     * of a header. Each value MUST be either a string or an array of strings.
-     * For each value, the value is appended to any existing header of the same
-     * name, or, if a header does not already exist by the given name, then the
-     * header is added.
-     *
-     * @param array $headers Associative array of headers to add to the message
-     */
-    public function addHeaders(array $headers);
-
-    /**
-     * Sets a header, replacing any existing values of any headers with the
-     * same case-insensitive name.
-     *
-     * The header values MUST be a string or an array of strings.
-     *
-     * @param string       $header Header name
-     * @param string|array $value  Header value(s)
-     */
-    public function setHeader($header, $value);
-
-    /**
-     * Sets headers, replacing any headers that have already been set on the
-     * message.
-     *
-     * The array keys MUST be a string. The array values must be either a
-     * string or an array of strings.
-     *
-     * @param array $headers Headers to set.
-     */
-    public function setHeaders(array $headers);
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/MessageParser.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/MessageParser.php
deleted file mode 100644
index c3cc195e32..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/MessageParser.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-namespace GuzzleHttp\Message;
-
-/**
- * Request and response parser used by Guzzle
- */
-class MessageParser
-{
-    /**
-     * Parse an HTTP request message into an associative array of parts.
-     *
-     * @param string $message HTTP request to parse
-     *
-     * @return array|bool Returns false if the message is invalid
-     */
-    public function parseRequest($message)
-    {
-        if (!($parts = $this->parseMessage($message))) {
-            return false;
-        }
-
-        // Parse the protocol and protocol version
-        if (isset($parts['start_line'][2])) {
-            $startParts = explode('/', $parts['start_line'][2]);
-            $protocol = strtoupper($startParts[0]);
-            $version = isset($startParts[1]) ? $startParts[1] : '1.1';
-        } else {
-            $protocol = 'HTTP';
-            $version = '1.1';
-        }
-
-        $parsed = [
-            'method'   => strtoupper($parts['start_line'][0]),
-            'protocol' => $protocol,
-            'protocol_version' => $version,
-            'headers'  => $parts['headers'],
-            'body'     => $parts['body']
-        ];
-
-        $parsed['request_url'] = $this->getUrlPartsFromMessage(
-            (isset($parts['start_line'][1]) ? $parts['start_line'][1] : ''), $parsed);
-
-        return $parsed;
-    }
-
-    /**
-     * Parse an HTTP response message into an associative array of parts.
-     *
-     * @param string $message HTTP response to parse
-     *
-     * @return array|bool Returns false if the message is invalid
-     */
-    public function parseResponse($message)
-    {
-        if (!($parts = $this->parseMessage($message))) {
-            return false;
-        }
-
-        list($protocol, $version) = explode('/', trim($parts['start_line'][0]));
-
-        return [
-            'protocol'         => $protocol,
-            'protocol_version' => $version,
-            'code'             => $parts['start_line'][1],
-            'reason_phrase'    => isset($parts['start_line'][2]) ? $parts['start_line'][2] : '',
-            'headers'          => $parts['headers'],
-            'body'             => $parts['body']
-        ];
-    }
-
-    /**
-     * Parse a message into parts
-     *
-     * @param string $message Message to parse
-     *
-     * @return array|bool
-     */
-    private function parseMessage($message)
-    {
-        if (!$message) {
-            return false;
-        }
-
-        $startLine = null;
-        $headers = [];
-        $body = '';
-
-        // Iterate over each line in the message, accounting for line endings
-        $lines = preg_split('/(\\r?\\n)/', $message, -1, PREG_SPLIT_DELIM_CAPTURE);
-        for ($i = 0, $totalLines = count($lines); $i < $totalLines; $i += 2) {
-
-            $line = $lines[$i];
-
-            // If two line breaks were encountered, then this is the end of body
-            if (empty($line)) {
-                if ($i < $totalLines - 1) {
-                    $body = implode('', array_slice($lines, $i + 2));
-                }
-                break;
-            }
-
-            // Parse message headers
-            if (!$startLine) {
-                $startLine = explode(' ', $line, 3);
-            } elseif (strpos($line, ':')) {
-                $parts = explode(':', $line, 2);
-                $key = trim($parts[0]);
-                $value = isset($parts[1]) ? trim($parts[1]) : '';
-                if (!isset($headers[$key])) {
-                    $headers[$key] = $value;
-                } elseif (!is_array($headers[$key])) {
-                    $headers[$key] = [$headers[$key], $value];
-                } else {
-                    $headers[$key][] = $value;
-                }
-            }
-        }
-
-        return [
-            'start_line' => $startLine,
-            'headers'    => $headers,
-            'body'       => $body
-        ];
-    }
-
-    /**
-     * Create URL parts from HTTP message parts
-     *
-     * @param string $requestUrl Associated URL
-     * @param array  $parts      HTTP message parts
-     *
-     * @return array
-     */
-    private function getUrlPartsFromMessage($requestUrl, array $parts)
-    {
-        // Parse the URL information from the message
-        $urlParts = ['path' => $requestUrl, 'scheme' => 'http'];
-
-        // Check for the Host header
-        if (isset($parts['headers']['Host'])) {
-            $urlParts['host'] = $parts['headers']['Host'];
-        } elseif (isset($parts['headers']['host'])) {
-            $urlParts['host'] = $parts['headers']['host'];
-        } else {
-            $urlParts['host'] = null;
-        }
-
-        if (false === strpos($urlParts['host'], ':')) {
-            $urlParts['port'] = '';
-        } else {
-            $hostParts = explode(':', $urlParts['host']);
-            $urlParts['host'] = trim($hostParts[0]);
-            $urlParts['port'] = (int) trim($hostParts[1]);
-            if ($urlParts['port'] == 443) {
-                $urlParts['scheme'] = 'https';
-            }
-        }
-
-        // Check if a query is present
-        $path = $urlParts['path'];
-        $qpos = strpos($path, '?');
-        if ($qpos) {
-            $urlParts['query'] = substr($path, $qpos + 1);
-            $urlParts['path'] = substr($path, 0, $qpos);
-        } else {
-            $urlParts['query'] = '';
-        }
-
-        return $urlParts;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/Request.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/Request.php
deleted file mode 100644
index 38714af80f..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/Request.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-namespace GuzzleHttp\Message;
-
-use GuzzleHttp\Collection;
-use GuzzleHttp\Event\HasEmitterTrait;
-use GuzzleHttp\Subscriber\Prepare;
-use GuzzleHttp\Url;
-
-/**
- * HTTP request class to send requests
- */
-class Request extends AbstractMessage implements RequestInterface
-{
-    use HasEmitterTrait;
-
-    /** @var Url HTTP Url */
-    private $url;
-
-    /** @var string HTTP method */
-    private $method;
-
-    /** @var Collection Transfer options */
-    private $transferOptions;
-
-    /**
-     * @param string           $method  HTTP method
-     * @param string|Url       $url     HTTP URL to connect to. The URI scheme,
-     *   host header, and URI are parsed from the full URL. If query string
-     *   parameters are present they will be parsed as well.
-     * @param array|Collection $headers HTTP headers
-     * @param mixed            $body    Body to send with the request
-     * @param array            $options Array of options to use with the request
-     *     - emitter: Event emitter to use with the request
-     */
-    public function __construct(
-        $method,
-        $url,
-        $headers = [],
-        $body = null,
-        array $options = []
-    ) {
-        $this->setUrl($url);
-        $this->method = strtoupper($method);
-        $this->handleOptions($options);
-        $this->transferOptions = new Collection($options);
-        $this->addPrepareEvent();
-
-        if ($body !== null) {
-            $this->setBody($body);
-        }
-
-        if ($headers) {
-            foreach ($headers as $key => $value) {
-                $this->addHeader($key, $value);
-            }
-        }
-    }
-
-    public function __clone()
-    {
-        if ($this->emitter) {
-            $this->emitter = clone $this->emitter;
-        }
-        $this->transferOptions = clone $this->transferOptions;
-        $this->url = clone $this->url;
-    }
-
-    public function setUrl($url)
-    {
-        $this->url = $url instanceof Url ? $url : Url::fromString($url);
-        $this->updateHostHeaderFromUrl();
-    }
-
-    public function getUrl()
-    {
-        return (string) $this->url;
-    }
-
-    public function setQuery($query)
-    {
-        $this->url->setQuery($query);
-    }
-
-    public function getQuery()
-    {
-        return $this->url->getQuery();
-    }
-
-    public function setMethod($method)
-    {
-        $this->method = strtoupper($method);
-    }
-
-    public function getMethod()
-    {
-        return $this->method;
-    }
-
-    public function getScheme()
-    {
-        return $this->url->getScheme();
-    }
-
-    public function setScheme($scheme)
-    {
-        $this->url->setScheme($scheme);
-    }
-
-    public function getPort()
-    {
-        return $this->url->getPort();
-    }
-
-    public function setPort($port)
-    {
-        $this->url->setPort($port);
-        $this->updateHostHeaderFromUrl();
-    }
-
-    public function getHost()
-    {
-        return $this->url->getHost();
-    }
-
-    public function setHost($host)
-    {
-        $this->url->setHost($host);
-        $this->updateHostHeaderFromUrl();
-    }
-
-    public function getPath()
-    {
-        return '/' . ltrim($this->url->getPath(), '/');
-    }
-
-    public function setPath($path)
-    {
-        $this->url->setPath($path);
-    }
-
-    public function getResource()
-    {
-        $resource = $this->getPath();
-        if ($query = (string) $this->url->getQuery()) {
-            $resource .= '?' . $query;
-        }
-
-        return $resource;
-    }
-
-    public function getConfig()
-    {
-        return $this->transferOptions;
-    }
-
-    protected function handleOptions(array &$options)
-    {
-        parent::handleOptions($options);
-        // Use a custom emitter if one is specified, and remove it from
-        // options that are exposed through getConfig()
-        if (isset($options['emitter'])) {
-            $this->emitter = $options['emitter'];
-            unset($options['emitter']);
-        }
-    }
-
-    /**
-     * Adds a subscriber that ensures a request's body is prepared before
-     * sending.
-     */
-    private function addPrepareEvent()
-    {
-        static $subscriber;
-        if (!$subscriber) {
-            $subscriber = new Prepare();
-        }
-
-        $this->getEmitter()->attach($subscriber);
-    }
-
-    private function updateHostHeaderFromUrl()
-    {
-        $port = $this->url->getPort();
-        $scheme = $this->url->getScheme();
-        if ($host = $this->url->getHost()) {
-            if (($port == 80 && $scheme == 'http') ||
-                ($port == 443 && $scheme == 'https')
-            ) {
-                $this->setHeader('Host', $host);
-            } else {
-                $this->setHeader('Host', "{$host}:{$port}");
-            }
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/RequestInterface.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/RequestInterface.php
deleted file mode 100644
index f6a69d1e1f..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/RequestInterface.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-namespace GuzzleHttp\Message;
-
-use GuzzleHttp\Event\HasEmitterInterface;
-use GuzzleHttp\Query;
-
-/**
- * Generic HTTP request interface
- */
-interface RequestInterface extends MessageInterface, HasEmitterInterface
-{
-    /**
-     * Sets the request URL.
-     *
-     * The URL MUST be a string, or an object that implements the
-     * `__toString()` method.
-     *
-     * @param string $url Request URL.
-     *
-     * @throws \InvalidArgumentException If the URL is invalid.
-     */
-    public function setUrl($url);
-
-    /**
-     * Gets the request URL as a string.
-     *
-     * @return string Returns the URL as a string.
-     */
-    public function getUrl();
-
-    /**
-     * Get the resource part of the the request, including the path, query
-     * string, and fragment.
-     *
-     * @return string
-     */
-    public function getResource();
-
-    /**
-     * Get the collection of key value pairs that will be used as the query
-     * string in the request.
-     *
-     * @return Query
-     */
-    public function getQuery();
-
-    /**
-     * Set the query string used by the request
-     *
-     * @param array|Query $query Query to set
-     */
-    public function setQuery($query);
-
-    /**
-     * Get the HTTP method of the request.
-     *
-     * @return string
-     */
-    public function getMethod();
-
-    /**
-     * Set the HTTP method of the request.
-     *
-     * @param string $method HTTP method
-     */
-    public function setMethod($method);
-
-    /**
-     * Get the URI scheme of the request (http, https, etc.).
-     *
-     * @return string
-     */
-    public function getScheme();
-
-    /**
-     * Set the URI scheme of the request (http, https, etc.).
-     *
-     * @param string $scheme Scheme to set
-     */
-    public function setScheme($scheme);
-
-    /**
-     * Get the port scheme of the request (e.g., 80, 443, etc.).
-     *
-     * @return int
-     */
-    public function getPort();
-
-    /**
-     * Set the port of the request.
-     *
-     * Setting a port modifies the Host header of a request as necessary.
-     *
-     * @param int $port Port to set
-     */
-    public function setPort($port);
-
-    /**
-     * Get the host of the request.
-     *
-     * @return string
-     */
-    public function getHost();
-
-    /**
-     * Set the host of the request including an optional port.
-     *
-     * Including a port in the host argument will explicitly change the port of
-     * the request. If no port is found, the default port of the current
-     * request scheme will be utilized.
-     *
-     * @param string $host Host to set (e.g. www.yahoo.com, www.yahoo.com:80)
-     */
-    public function setHost($host);
-
-    /**
-     * Get the path of the request (e.g. '/', '/index.html').
-     *
-     * @return string
-     */
-    public function getPath();
-
-    /**
-     * Set the path of the request (e.g. '/', '/index.html').
-     *
-     * @param string|array $path Path to set or array of segments to implode
-     */
-    public function setPath($path);
-
-    /**
-     * Get the request's configuration options.
-     *
-     * @return \GuzzleHttp\Collection
-     */
-    public function getConfig();
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/Response.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/Response.php
deleted file mode 100644
index 42e10e64e2..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/Response.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-namespace GuzzleHttp\Message;
-
-use GuzzleHttp\Exception\ParseException;
-use GuzzleHttp\Exception\XmlParseException;
-use GuzzleHttp\Stream\StreamInterface;
-use GuzzleHttp\Utils;
-
-/**
- * Guzzle HTTP response object
- */
-class Response extends AbstractMessage implements ResponseInterface
-{
-    /** @var array Mapping of status codes to reason phrases */
-    private static $statusTexts = [
-        100 => 'Continue',
-        101 => 'Switching Protocols',
-        102 => 'Processing',
-        200 => 'OK',
-        201 => 'Created',
-        202 => 'Accepted',
-        203 => 'Non-Authoritative Information',
-        204 => 'No Content',
-        205 => 'Reset Content',
-        206 => 'Partial Content',
-        207 => 'Multi-Status',
-        208 => 'Already Reported',
-        226 => 'IM Used',
-        300 => 'Multiple Choices',
-        301 => 'Moved Permanently',
-        302 => 'Found',
-        303 => 'See Other',
-        304 => 'Not Modified',
-        305 => 'Use Proxy',
-        307 => 'Temporary Redirect',
-        308 => 'Permanent Redirect',
-        400 => 'Bad Request',
-        401 => 'Unauthorized',
-        402 => 'Payment Required',
-        403 => 'Forbidden',
-        404 => 'Not Found',
-        405 => 'Method Not Allowed',
-        406 => 'Not Acceptable',
-        407 => 'Proxy Authentication Required',
-        408 => 'Request Timeout',
-        409 => 'Conflict',
-        410 => 'Gone',
-        411 => 'Length Required',
-        412 => 'Precondition Failed',
-        413 => 'Request Entity Too Large',
-        414 => 'Request-URI Too Long',
-        415 => 'Unsupported Media Type',
-        416 => 'Requested Range Not Satisfiable',
-        417 => 'Expectation Failed',
-        422 => 'Unprocessable Entity',
-        423 => 'Locked',
-        424 => 'Failed Dependency',
-        425 => 'Reserved for WebDAV advanced collections expired proposal',
-        426 => 'Upgrade required',
-        428 => 'Precondition Required',
-        429 => 'Too Many Requests',
-        431 => 'Request Header Fields Too Large',
-        500 => 'Internal Server Error',
-        501 => 'Not Implemented',
-        502 => 'Bad Gateway',
-        503 => 'Service Unavailable',
-        504 => 'Gateway Timeout',
-        505 => 'HTTP Version Not Supported',
-        506 => 'Variant Also Negotiates (Experimental)',
-        507 => 'Insufficient Storage',
-        508 => 'Loop Detected',
-        510 => 'Not Extended',
-        511 => 'Network Authentication Required',
-    ];
-
-    /** @var string The reason phrase of the response (human readable code) */
-    private $reasonPhrase;
-
-    /** @var string The status code of the response */
-    private $statusCode;
-
-    /** @var string The effective URL that returned this response */
-    private $effectiveUrl;
-
-    /**
-     * @param int|string      $statusCode The response status code (e.g. 200)
-     * @param array           $headers    The response headers
-     * @param StreamInterface $body       The body of the response
-     * @param array           $options    Response message options
-     *     - reason_phrase: Set a custom reason phrase
-     *     - protocol_version: Set a custom protocol version
-     */
-    public function __construct(
-        $statusCode,
-        array $headers = [],
-        StreamInterface $body = null,
-        array $options = []
-    ) {
-        $this->statusCode = (int) $statusCode;
-        $this->handleOptions($options);
-
-        // Assume a reason phrase if one was not applied as an option
-        if (!$this->reasonPhrase &&
-            isset(self::$statusTexts[$this->statusCode])
-        ) {
-            $this->reasonPhrase = self::$statusTexts[$this->statusCode];
-        }
-
-        if ($headers) {
-            $this->setHeaders($headers);
-        }
-
-        if ($body) {
-            $this->setBody($body);
-        }
-    }
-
-    public function getStatusCode()
-    {
-        return $this->statusCode;
-    }
-
-    public function setStatusCode($code)
-    {
-        return $this->statusCode = (int) $code;
-    }
-
-    public function getReasonPhrase()
-    {
-        return $this->reasonPhrase;
-    }
-
-    public function setReasonPhrase($phrase)
-    {
-        return $this->reasonPhrase = $phrase;
-    }
-
-    public function json(array $config = [])
-    {
-        try {
-            return Utils::jsonDecode(
-                (string) $this->getBody(),
-                isset($config['object']) ? !$config['object'] : true,
-                512,
-                isset($config['big_int_strings']) ? JSON_BIGINT_AS_STRING : 0
-            );
-        } catch (\InvalidArgumentException $e) {
-            throw new ParseException(
-                $e->getMessage(),
-                $this
-            );
-        }
-    }
-
-    public function xml(array $config = [])
-    {
-        $disableEntities = libxml_disable_entity_loader(true);
-        $internalErrors = libxml_use_internal_errors(true);
-
-        try {
-            // Allow XML to be retrieved even if there is no response body
-            $xml = new \SimpleXMLElement(
-                (string) $this->getBody() ?: '<root />',
-                isset($config['libxml_options']) ? $config['libxml_options'] : LIBXML_NONET,
-                false,
-                isset($config['ns']) ? $config['ns'] : '',
-                isset($config['ns_is_prefix']) ? $config['ns_is_prefix'] : false
-            );
-            libxml_disable_entity_loader($disableEntities);
-            libxml_use_internal_errors($internalErrors);
-        } catch (\Exception $e) {
-            libxml_disable_entity_loader($disableEntities);
-            libxml_use_internal_errors($internalErrors);
-            throw new XmlParseException(
-                'Unable to parse response body into XML: ' . $e->getMessage(),
-                $this,
-                $e,
-                (libxml_get_last_error()) ?: null
-            );
-        }
-
-        return $xml;
-    }
-
-    public function getEffectiveUrl()
-    {
-        return $this->effectiveUrl;
-    }
-
-    public function setEffectiveUrl($url)
-    {
-        $this->effectiveUrl = $url;
-    }
-
-    /**
-     * Accepts and modifies the options provided to the response in the
-     * constructor.
-     *
-     * @param array $options Options array passed by reference.
-     */
-    protected function handleOptions(array &$options = [])
-    {
-        parent::handleOptions($options);
-        if (isset($options['reason_phrase'])) {
-            $this->reasonPhrase = $options['reason_phrase'];
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/ResponseInterface.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/ResponseInterface.php
deleted file mode 100644
index c0ae9be93b..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Message/ResponseInterface.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-namespace GuzzleHttp\Message;
-
-/**
- * Represents an HTTP response message.
- */
-interface ResponseInterface extends MessageInterface
-{
-    /**
-     * Gets the response Status-Code.
-     *
-     * The Status-Code is a 3-digit integer result code of the server's attempt
-     * to understand and satisfy the request.
-     *
-     * @return int Status code.
-     */
-    public function getStatusCode();
-
-    /**
-     * Sets the status code of this response.
-     *
-     * @param int $code The 3-digit integer result code to set.
-     */
-    public function setStatusCode($code);
-
-    /**
-     * Gets the response Reason-Phrase, a short textual description of the
-     * Status-Code.
-     *
-     * Because a Reason-Phrase is not a required element in response
-     * Status-Line, the Reason-Phrase value MAY be null. Implementations MAY
-     * choose to return the default RFC 2616 recommended reason phrase for the
-     * response's Status-Code.
-     *
-     * @return string|null Reason phrase, or null if unknown.
-     */
-    public function getReasonPhrase();
-
-    /**
-     * Sets the Reason-Phrase of the response.
-     *
-     * If no Reason-Phrase is specified, implementations MAY choose to default
-     * to the RFC 2616 recommended reason phrase for the response's Status-Code.
-     *
-     * @param string $phrase The Reason-Phrase to set.
-     */
-    public function setReasonPhrase($phrase);
-
-    /**
-     * Get the effective URL that resulted in this response (e.g. the last
-     * redirect URL).
-     *
-     * @return string
-     */
-    public function getEffectiveUrl();
-
-    /**
-     * Set the effective URL that resulted in this response (e.g. the last
-     * redirect URL).
-     *
-     * @param string $url Effective URL
-     */
-    public function setEffectiveUrl($url);
-
-    /**
-     * Parse the JSON response body and return the JSON decoded data.
-     *
-     * @param array $config Associative array of configuration settings used
-     *     to control how the JSON data is parsed. Concrete implementations MAY
-     *     add further configuration settings as needed, but they MUST implement
-     *     functionality for the following options:
-     *
-     *     - object: Set to true to parse JSON objects as PHP objects rather
-     *       than associative arrays. Defaults to false.
-     *     - big_int_strings: When set to true, large integers are converted to
-     *       strings rather than floats. Defaults to false.
-     *
-     *     Implementations are free to add further configuration settings as
-     *     needed.
-     *
-     * @return mixed Returns the JSON decoded data based on the provided
-     *     parse settings.
-     * @throws \RuntimeException if the response body is not in JSON format
-     */
-    public function json(array $config = []);
-
-    /**
-     * Parse the XML response body and return a \SimpleXMLElement.
-     *
-     * In order to prevent XXE attacks, this method disables loading external
-     * entities. If you rely on external entities, then you must parse the
-     * XML response manually by accessing the response body directly.
-     *
-     * @param array $config Associative array of configuration settings used
-     *     to control how the XML is parsed. Concrete implementations MAY add
-     *     further configuration settings as needed, but they MUST implement
-     *     functionality for the following options:
-     *
-     *     - ns: Set to a string to represent the namespace prefix or URI
-     *     - ns_is_prefix: Set to true to specify that the NS is a prefix rather
-     *       than a URI (defaults to false).
-     *     - libxml_options: Bitwise OR of the libxml option constants
-     *       listed at http://php.net/manual/en/libxml.constants.php
-     *       (defaults to LIBXML_NONET)
-     *
-     * @return \SimpleXMLElement
-     * @throws \RuntimeException if the response body is not in XML format
-     * @link http://websec.io/2012/08/27/Preventing-XXE-in-PHP.html
-     */
-    public function xml(array $config = []);
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Mimetypes.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Mimetypes.php
deleted file mode 100644
index 66ac63cfa5..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Mimetypes.php
+++ /dev/null
@@ -1,963 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-/**
- * Provides mappings of file extensions to mimetypes
- * @link http://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x/conf/mime.types
- */
-class Mimetypes
-{
-    /** @var self */
-    protected static $instance;
-
-    /** @var array Mapping of extension to mimetype */
-    protected $mimetypes = array(
-        '3dml' => 'text/vnd.in3d.3dml',
-        '3g2' => 'video/3gpp2',
-        '3gp' => 'video/3gpp',
-        '7z' => 'application/x-7z-compressed',
-        'aab' => 'application/x-authorware-bin',
-        'aac' => 'audio/x-aac',
-        'aam' => 'application/x-authorware-map',
-        'aas' => 'application/x-authorware-seg',
-        'abw' => 'application/x-abiword',
-        'ac' => 'application/pkix-attr-cert',
-        'acc' => 'application/vnd.americandynamics.acc',
-        'ace' => 'application/x-ace-compressed',
-        'acu' => 'application/vnd.acucobol',
-        'acutc' => 'application/vnd.acucorp',
-        'adp' => 'audio/adpcm',
-        'aep' => 'application/vnd.audiograph',
-        'afm' => 'application/x-font-type1',
-        'afp' => 'application/vnd.ibm.modcap',
-        'ahead' => 'application/vnd.ahead.space',
-        'ai' => 'application/postscript',
-        'aif' => 'audio/x-aiff',
-        'aifc' => 'audio/x-aiff',
-        'aiff' => 'audio/x-aiff',
-        'air' => 'application/vnd.adobe.air-application-installer-package+zip',
-        'ait' => 'application/vnd.dvb.ait',
-        'ami' => 'application/vnd.amiga.ami',
-        'apk' => 'application/vnd.android.package-archive',
-        'application' => 'application/x-ms-application',
-        'apr' => 'application/vnd.lotus-approach',
-        'asa' => 'text/plain',
-        'asax' => 'application/octet-stream',
-        'asc' => 'application/pgp-signature',
-        'ascx' => 'text/plain',
-        'asf' => 'video/x-ms-asf',
-        'ashx' => 'text/plain',
-        'asm' => 'text/x-asm',
-        'asmx' => 'text/plain',
-        'aso' => 'application/vnd.accpac.simply.aso',
-        'asp' => 'text/plain',
-        'aspx' => 'text/plain',
-        'asx' => 'video/x-ms-asf',
-        'atc' => 'application/vnd.acucorp',
-        'atom' => 'application/atom+xml',
-        'atomcat' => 'application/atomcat+xml',
-        'atomsvc' => 'application/atomsvc+xml',
-        'atx' => 'application/vnd.antix.game-component',
-        'au' => 'audio/basic',
-        'avi' => 'video/x-msvideo',
-        'aw' => 'application/applixware',
-        'axd' => 'text/plain',
-        'azf' => 'application/vnd.airzip.filesecure.azf',
-        'azs' => 'application/vnd.airzip.filesecure.azs',
-        'azw' => 'application/vnd.amazon.ebook',
-        'bat' => 'application/x-msdownload',
-        'bcpio' => 'application/x-bcpio',
-        'bdf' => 'application/x-font-bdf',
-        'bdm' => 'application/vnd.syncml.dm+wbxml',
-        'bed' => 'application/vnd.realvnc.bed',
-        'bh2' => 'application/vnd.fujitsu.oasysprs',
-        'bin' => 'application/octet-stream',
-        'bmi' => 'application/vnd.bmi',
-        'bmp' => 'image/bmp',
-        'book' => 'application/vnd.framemaker',
-        'box' => 'application/vnd.previewsystems.box',
-        'boz' => 'application/x-bzip2',
-        'bpk' => 'application/octet-stream',
-        'btif' => 'image/prs.btif',
-        'bz' => 'application/x-bzip',
-        'bz2' => 'application/x-bzip2',
-        'c' => 'text/x-c',
-        'c11amc' => 'application/vnd.cluetrust.cartomobile-config',
-        'c11amz' => 'application/vnd.cluetrust.cartomobile-config-pkg',
-        'c4d' => 'application/vnd.clonk.c4group',
-        'c4f' => 'application/vnd.clonk.c4group',
-        'c4g' => 'application/vnd.clonk.c4group',
-        'c4p' => 'application/vnd.clonk.c4group',
-        'c4u' => 'application/vnd.clonk.c4group',
-        'cab' => 'application/vnd.ms-cab-compressed',
-        'car' => 'application/vnd.curl.car',
-        'cat' => 'application/vnd.ms-pki.seccat',
-        'cc' => 'text/x-c',
-        'cct' => 'application/x-director',
-        'ccxml' => 'application/ccxml+xml',
-        'cdbcmsg' => 'application/vnd.contact.cmsg',
-        'cdf' => 'application/x-netcdf',
-        'cdkey' => 'application/vnd.mediastation.cdkey',
-        'cdmia' => 'application/cdmi-capability',
-        'cdmic' => 'application/cdmi-container',
-        'cdmid' => 'application/cdmi-domain',
-        'cdmio' => 'application/cdmi-object',
-        'cdmiq' => 'application/cdmi-queue',
-        'cdx' => 'chemical/x-cdx',
-        'cdxml' => 'application/vnd.chemdraw+xml',
-        'cdy' => 'application/vnd.cinderella',
-        'cer' => 'application/pkix-cert',
-        'cfc' => 'application/x-coldfusion',
-        'cfm' => 'application/x-coldfusion',
-        'cgm' => 'image/cgm',
-        'chat' => 'application/x-chat',
-        'chm' => 'application/vnd.ms-htmlhelp',
-        'chrt' => 'application/vnd.kde.kchart',
-        'cif' => 'chemical/x-cif',
-        'cii' => 'application/vnd.anser-web-certificate-issue-initiation',
-        'cil' => 'application/vnd.ms-artgalry',
-        'cla' => 'application/vnd.claymore',
-        'class' => 'application/java-vm',
-        'clkk' => 'application/vnd.crick.clicker.keyboard',
-        'clkp' => 'application/vnd.crick.clicker.palette',
-        'clkt' => 'application/vnd.crick.clicker.template',
-        'clkw' => 'application/vnd.crick.clicker.wordbank',
-        'clkx' => 'application/vnd.crick.clicker',
-        'clp' => 'application/x-msclip',
-        'cmc' => 'application/vnd.cosmocaller',
-        'cmdf' => 'chemical/x-cmdf',
-        'cml' => 'chemical/x-cml',
-        'cmp' => 'application/vnd.yellowriver-custom-menu',
-        'cmx' => 'image/x-cmx',
-        'cod' => 'application/vnd.rim.cod',
-        'com' => 'application/x-msdownload',
-        'conf' => 'text/plain',
-        'cpio' => 'application/x-cpio',
-        'cpp' => 'text/x-c',
-        'cpt' => 'application/mac-compactpro',
-        'crd' => 'application/x-mscardfile',
-        'crl' => 'application/pkix-crl',
-        'crt' => 'application/x-x509-ca-cert',
-        'cryptonote' => 'application/vnd.rig.cryptonote',
-        'cs' => 'text/plain',
-        'csh' => 'application/x-csh',
-        'csml' => 'chemical/x-csml',
-        'csp' => 'application/vnd.commonspace',
-        'css' => 'text/css',
-        'cst' => 'application/x-director',
-        'csv' => 'text/csv',
-        'cu' => 'application/cu-seeme',
-        'curl' => 'text/vnd.curl',
-        'cww' => 'application/prs.cww',
-        'cxt' => 'application/x-director',
-        'cxx' => 'text/x-c',
-        'dae' => 'model/vnd.collada+xml',
-        'daf' => 'application/vnd.mobius.daf',
-        'dataless' => 'application/vnd.fdsn.seed',
-        'davmount' => 'application/davmount+xml',
-        'dcr' => 'application/x-director',
-        'dcurl' => 'text/vnd.curl.dcurl',
-        'dd2' => 'application/vnd.oma.dd2+xml',
-        'ddd' => 'application/vnd.fujixerox.ddd',
-        'deb' => 'application/x-debian-package',
-        'def' => 'text/plain',
-        'deploy' => 'application/octet-stream',
-        'der' => 'application/x-x509-ca-cert',
-        'dfac' => 'application/vnd.dreamfactory',
-        'dic' => 'text/x-c',
-        'dir' => 'application/x-director',
-        'dis' => 'application/vnd.mobius.dis',
-        'dist' => 'application/octet-stream',
-        'distz' => 'application/octet-stream',
-        'djv' => 'image/vnd.djvu',
-        'djvu' => 'image/vnd.djvu',
-        'dll' => 'application/x-msdownload',
-        'dmg' => 'application/octet-stream',
-        'dms' => 'application/octet-stream',
-        'dna' => 'application/vnd.dna',
-        'doc' => 'application/msword',
-        'docm' => 'application/vnd.ms-word.document.macroenabled.12',
-        'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-        'dot' => 'application/msword',
-        'dotm' => 'application/vnd.ms-word.template.macroenabled.12',
-        'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
-        'dp' => 'application/vnd.osgi.dp',
-        'dpg' => 'application/vnd.dpgraph',
-        'dra' => 'audio/vnd.dra',
-        'dsc' => 'text/prs.lines.tag',
-        'dssc' => 'application/dssc+der',
-        'dtb' => 'application/x-dtbook+xml',
-        'dtd' => 'application/xml-dtd',
-        'dts' => 'audio/vnd.dts',
-        'dtshd' => 'audio/vnd.dts.hd',
-        'dump' => 'application/octet-stream',
-        'dvi' => 'application/x-dvi',
-        'dwf' => 'model/vnd.dwf',
-        'dwg' => 'image/vnd.dwg',
-        'dxf' => 'image/vnd.dxf',
-        'dxp' => 'application/vnd.spotfire.dxp',
-        'dxr' => 'application/x-director',
-        'ecelp4800' => 'audio/vnd.nuera.ecelp4800',
-        'ecelp7470' => 'audio/vnd.nuera.ecelp7470',
-        'ecelp9600' => 'audio/vnd.nuera.ecelp9600',
-        'ecma' => 'application/ecmascript',
-        'edm' => 'application/vnd.novadigm.edm',
-        'edx' => 'application/vnd.novadigm.edx',
-        'efif' => 'application/vnd.picsel',
-        'ei6' => 'application/vnd.pg.osasli',
-        'elc' => 'application/octet-stream',
-        'eml' => 'message/rfc822',
-        'emma' => 'application/emma+xml',
-        'eol' => 'audio/vnd.digital-winds',
-        'eot' => 'application/vnd.ms-fontobject',
-        'eps' => 'application/postscript',
-        'epub' => 'application/epub+zip',
-        'es3' => 'application/vnd.eszigno3+xml',
-        'esf' => 'application/vnd.epson.esf',
-        'et3' => 'application/vnd.eszigno3+xml',
-        'etx' => 'text/x-setext',
-        'exe' => 'application/x-msdownload',
-        'exi' => 'application/exi',
-        'ext' => 'application/vnd.novadigm.ext',
-        'ez' => 'application/andrew-inset',
-        'ez2' => 'application/vnd.ezpix-album',
-        'ez3' => 'application/vnd.ezpix-package',
-        'f' => 'text/x-fortran',
-        'f4v' => 'video/x-f4v',
-        'f77' => 'text/x-fortran',
-        'f90' => 'text/x-fortran',
-        'fbs' => 'image/vnd.fastbidsheet',
-        'fcs' => 'application/vnd.isac.fcs',
-        'fdf' => 'application/vnd.fdf',
-        'fe_launch' => 'application/vnd.denovo.fcselayout-link',
-        'fg5' => 'application/vnd.fujitsu.oasysgp',
-        'fgd' => 'application/x-director',
-        'fh' => 'image/x-freehand',
-        'fh4' => 'image/x-freehand',
-        'fh5' => 'image/x-freehand',
-        'fh7' => 'image/x-freehand',
-        'fhc' => 'image/x-freehand',
-        'fig' => 'application/x-xfig',
-        'fli' => 'video/x-fli',
-        'flo' => 'application/vnd.micrografx.flo',
-        'flv' => 'video/x-flv',
-        'flw' => 'application/vnd.kde.kivio',
-        'flx' => 'text/vnd.fmi.flexstor',
-        'fly' => 'text/vnd.fly',
-        'fm' => 'application/vnd.framemaker',
-        'fnc' => 'application/vnd.frogans.fnc',
-        'for' => 'text/x-fortran',
-        'fpx' => 'image/vnd.fpx',
-        'frame' => 'application/vnd.framemaker',
-        'fsc' => 'application/vnd.fsc.weblaunch',
-        'fst' => 'image/vnd.fst',
-        'ftc' => 'application/vnd.fluxtime.clip',
-        'fti' => 'application/vnd.anser-web-funds-transfer-initiation',
-        'fvt' => 'video/vnd.fvt',
-        'fxp' => 'application/vnd.adobe.fxp',
-        'fxpl' => 'application/vnd.adobe.fxp',
-        'fzs' => 'application/vnd.fuzzysheet',
-        'g2w' => 'application/vnd.geoplan',
-        'g3' => 'image/g3fax',
-        'g3w' => 'application/vnd.geospace',
-        'gac' => 'application/vnd.groove-account',
-        'gdl' => 'model/vnd.gdl',
-        'geo' => 'application/vnd.dynageo',
-        'gex' => 'application/vnd.geometry-explorer',
-        'ggb' => 'application/vnd.geogebra.file',
-        'ggt' => 'application/vnd.geogebra.tool',
-        'ghf' => 'application/vnd.groove-help',
-        'gif' => 'image/gif',
-        'gim' => 'application/vnd.groove-identity-message',
-        'gmx' => 'application/vnd.gmx',
-        'gnumeric' => 'application/x-gnumeric',
-        'gph' => 'application/vnd.flographit',
-        'gqf' => 'application/vnd.grafeq',
-        'gqs' => 'application/vnd.grafeq',
-        'gram' => 'application/srgs',
-        'gre' => 'application/vnd.geometry-explorer',
-        'grv' => 'application/vnd.groove-injector',
-        'grxml' => 'application/srgs+xml',
-        'gsf' => 'application/x-font-ghostscript',
-        'gtar' => 'application/x-gtar',
-        'gtm' => 'application/vnd.groove-tool-message',
-        'gtw' => 'model/vnd.gtw',
-        'gv' => 'text/vnd.graphviz',
-        'gxt' => 'application/vnd.geonext',
-        'h' => 'text/x-c',
-        'h261' => 'video/h261',
-        'h263' => 'video/h263',
-        'h264' => 'video/h264',
-        'hal' => 'application/vnd.hal+xml',
-        'hbci' => 'application/vnd.hbci',
-        'hdf' => 'application/x-hdf',
-        'hh' => 'text/x-c',
-        'hlp' => 'application/winhlp',
-        'hpgl' => 'application/vnd.hp-hpgl',
-        'hpid' => 'application/vnd.hp-hpid',
-        'hps' => 'application/vnd.hp-hps',
-        'hqx' => 'application/mac-binhex40',
-        'hta' => 'application/octet-stream',
-        'htc' => 'text/html',
-        'htke' => 'application/vnd.kenameaapp',
-        'htm' => 'text/html',
-        'html' => 'text/html',
-        'hvd' => 'application/vnd.yamaha.hv-dic',
-        'hvp' => 'application/vnd.yamaha.hv-voice',
-        'hvs' => 'application/vnd.yamaha.hv-script',
-        'i2g' => 'application/vnd.intergeo',
-        'icc' => 'application/vnd.iccprofile',
-        'ice' => 'x-conference/x-cooltalk',
-        'icm' => 'application/vnd.iccprofile',
-        'ico' => 'image/x-icon',
-        'ics' => 'text/calendar',
-        'ief' => 'image/ief',
-        'ifb' => 'text/calendar',
-        'ifm' => 'application/vnd.shana.informed.formdata',
-        'iges' => 'model/iges',
-        'igl' => 'application/vnd.igloader',
-        'igm' => 'application/vnd.insors.igm',
-        'igs' => 'model/iges',
-        'igx' => 'application/vnd.micrografx.igx',
-        'iif' => 'application/vnd.shana.informed.interchange',
-        'imp' => 'application/vnd.accpac.simply.imp',
-        'ims' => 'application/vnd.ms-ims',
-        'in' => 'text/plain',
-        'ini' => 'text/plain',
-        'ipfix' => 'application/ipfix',
-        'ipk' => 'application/vnd.shana.informed.package',
-        'irm' => 'application/vnd.ibm.rights-management',
-        'irp' => 'application/vnd.irepository.package+xml',
-        'iso' => 'application/octet-stream',
-        'itp' => 'application/vnd.shana.informed.formtemplate',
-        'ivp' => 'application/vnd.immervision-ivp',
-        'ivu' => 'application/vnd.immervision-ivu',
-        'jad' => 'text/vnd.sun.j2me.app-descriptor',
-        'jam' => 'application/vnd.jam',
-        'jar' => 'application/java-archive',
-        'java' => 'text/x-java-source',
-        'jisp' => 'application/vnd.jisp',
-        'jlt' => 'application/vnd.hp-jlyt',
-        'jnlp' => 'application/x-java-jnlp-file',
-        'joda' => 'application/vnd.joost.joda-archive',
-        'jpe' => 'image/jpeg',
-        'jpeg' => 'image/jpeg',
-        'jpg' => 'image/jpeg',
-        'jpgm' => 'video/jpm',
-        'jpgv' => 'video/jpeg',
-        'jpm' => 'video/jpm',
-        'js' => 'text/javascript',
-        'json' => 'application/json',
-        'kar' => 'audio/midi',
-        'karbon' => 'application/vnd.kde.karbon',
-        'kfo' => 'application/vnd.kde.kformula',
-        'kia' => 'application/vnd.kidspiration',
-        'kml' => 'application/vnd.google-earth.kml+xml',
-        'kmz' => 'application/vnd.google-earth.kmz',
-        'kne' => 'application/vnd.kinar',
-        'knp' => 'application/vnd.kinar',
-        'kon' => 'application/vnd.kde.kontour',
-        'kpr' => 'application/vnd.kde.kpresenter',
-        'kpt' => 'application/vnd.kde.kpresenter',
-        'ksp' => 'application/vnd.kde.kspread',
-        'ktr' => 'application/vnd.kahootz',
-        'ktx' => 'image/ktx',
-        'ktz' => 'application/vnd.kahootz',
-        'kwd' => 'application/vnd.kde.kword',
-        'kwt' => 'application/vnd.kde.kword',
-        'lasxml' => 'application/vnd.las.las+xml',
-        'latex' => 'application/x-latex',
-        'lbd' => 'application/vnd.llamagraphics.life-balance.desktop',
-        'lbe' => 'application/vnd.llamagraphics.life-balance.exchange+xml',
-        'les' => 'application/vnd.hhe.lesson-player',
-        'lha' => 'application/octet-stream',
-        'link66' => 'application/vnd.route66.link66+xml',
-        'list' => 'text/plain',
-        'list3820' => 'application/vnd.ibm.modcap',
-        'listafp' => 'application/vnd.ibm.modcap',
-        'log' => 'text/plain',
-        'lostxml' => 'application/lost+xml',
-        'lrf' => 'application/octet-stream',
-        'lrm' => 'application/vnd.ms-lrm',
-        'ltf' => 'application/vnd.frogans.ltf',
-        'lvp' => 'audio/vnd.lucent.voice',
-        'lwp' => 'application/vnd.lotus-wordpro',
-        'lzh' => 'application/octet-stream',
-        'm13' => 'application/x-msmediaview',
-        'm14' => 'application/x-msmediaview',
-        'm1v' => 'video/mpeg',
-        'm21' => 'application/mp21',
-        'm2a' => 'audio/mpeg',
-        'm2v' => 'video/mpeg',
-        'm3a' => 'audio/mpeg',
-        'm3u' => 'audio/x-mpegurl',
-        'm3u8' => 'application/vnd.apple.mpegurl',
-        'm4a' => 'audio/mp4',
-        'm4u' => 'video/vnd.mpegurl',
-        'm4v' => 'video/mp4',
-        'ma' => 'application/mathematica',
-        'mads' => 'application/mads+xml',
-        'mag' => 'application/vnd.ecowin.chart',
-        'maker' => 'application/vnd.framemaker',
-        'man' => 'text/troff',
-        'mathml' => 'application/mathml+xml',
-        'mb' => 'application/mathematica',
-        'mbk' => 'application/vnd.mobius.mbk',
-        'mbox' => 'application/mbox',
-        'mc1' => 'application/vnd.medcalcdata',
-        'mcd' => 'application/vnd.mcd',
-        'mcurl' => 'text/vnd.curl.mcurl',
-        'mdb' => 'application/x-msaccess',
-        'mdi' => 'image/vnd.ms-modi',
-        'me' => 'text/troff',
-        'mesh' => 'model/mesh',
-        'meta4' => 'application/metalink4+xml',
-        'mets' => 'application/mets+xml',
-        'mfm' => 'application/vnd.mfmp',
-        'mgp' => 'application/vnd.osgeo.mapguide.package',
-        'mgz' => 'application/vnd.proteus.magazine',
-        'mid' => 'audio/midi',
-        'midi' => 'audio/midi',
-        'mif' => 'application/vnd.mif',
-        'mime' => 'message/rfc822',
-        'mj2' => 'video/mj2',
-        'mjp2' => 'video/mj2',
-        'mlp' => 'application/vnd.dolby.mlp',
-        'mmd' => 'application/vnd.chipnuts.karaoke-mmd',
-        'mmf' => 'application/vnd.smaf',
-        'mmr' => 'image/vnd.fujixerox.edmics-mmr',
-        'mny' => 'application/x-msmoney',
-        'mobi' => 'application/x-mobipocket-ebook',
-        'mods' => 'application/mods+xml',
-        'mov' => 'video/quicktime',
-        'movie' => 'video/x-sgi-movie',
-        'mp2' => 'audio/mpeg',
-        'mp21' => 'application/mp21',
-        'mp2a' => 'audio/mpeg',
-        'mp3' => 'audio/mpeg',
-        'mp4' => 'video/mp4',
-        'mp4a' => 'audio/mp4',
-        'mp4s' => 'application/mp4',
-        'mp4v' => 'video/mp4',
-        'mpc' => 'application/vnd.mophun.certificate',
-        'mpe' => 'video/mpeg',
-        'mpeg' => 'video/mpeg',
-        'mpg' => 'video/mpeg',
-        'mpg4' => 'video/mp4',
-        'mpga' => 'audio/mpeg',
-        'mpkg' => 'application/vnd.apple.installer+xml',
-        'mpm' => 'application/vnd.blueice.multipass',
-        'mpn' => 'application/vnd.mophun.application',
-        'mpp' => 'application/vnd.ms-project',
-        'mpt' => 'application/vnd.ms-project',
-        'mpy' => 'application/vnd.ibm.minipay',
-        'mqy' => 'application/vnd.mobius.mqy',
-        'mrc' => 'application/marc',
-        'mrcx' => 'application/marcxml+xml',
-        'ms' => 'text/troff',
-        'mscml' => 'application/mediaservercontrol+xml',
-        'mseed' => 'application/vnd.fdsn.mseed',
-        'mseq' => 'application/vnd.mseq',
-        'msf' => 'application/vnd.epson.msf',
-        'msh' => 'model/mesh',
-        'msi' => 'application/x-msdownload',
-        'msl' => 'application/vnd.mobius.msl',
-        'msty' => 'application/vnd.muvee.style',
-        'mts' => 'model/vnd.mts',
-        'mus' => 'application/vnd.musician',
-        'musicxml' => 'application/vnd.recordare.musicxml+xml',
-        'mvb' => 'application/x-msmediaview',
-        'mwf' => 'application/vnd.mfer',
-        'mxf' => 'application/mxf',
-        'mxl' => 'application/vnd.recordare.musicxml',
-        'mxml' => 'application/xv+xml',
-        'mxs' => 'application/vnd.triscape.mxs',
-        'mxu' => 'video/vnd.mpegurl',
-        'n-gage' => 'application/vnd.nokia.n-gage.symbian.install',
-        'n3' => 'text/n3',
-        'nb' => 'application/mathematica',
-        'nbp' => 'application/vnd.wolfram.player',
-        'nc' => 'application/x-netcdf',
-        'ncx' => 'application/x-dtbncx+xml',
-        'ngdat' => 'application/vnd.nokia.n-gage.data',
-        'nlu' => 'application/vnd.neurolanguage.nlu',
-        'nml' => 'application/vnd.enliven',
-        'nnd' => 'application/vnd.noblenet-directory',
-        'nns' => 'application/vnd.noblenet-sealer',
-        'nnw' => 'application/vnd.noblenet-web',
-        'npx' => 'image/vnd.net-fpx',
-        'nsf' => 'application/vnd.lotus-notes',
-        'oa2' => 'application/vnd.fujitsu.oasys2',
-        'oa3' => 'application/vnd.fujitsu.oasys3',
-        'oas' => 'application/vnd.fujitsu.oasys',
-        'obd' => 'application/x-msbinder',
-        'oda' => 'application/oda',
-        'odb' => 'application/vnd.oasis.opendocument.database',
-        'odc' => 'application/vnd.oasis.opendocument.chart',
-        'odf' => 'application/vnd.oasis.opendocument.formula',
-        'odft' => 'application/vnd.oasis.opendocument.formula-template',
-        'odg' => 'application/vnd.oasis.opendocument.graphics',
-        'odi' => 'application/vnd.oasis.opendocument.image',
-        'odm' => 'application/vnd.oasis.opendocument.text-master',
-        'odp' => 'application/vnd.oasis.opendocument.presentation',
-        'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
-        'odt' => 'application/vnd.oasis.opendocument.text',
-        'oga' => 'audio/ogg',
-        'ogg' => 'audio/ogg',
-        'ogv' => 'video/ogg',
-        'ogx' => 'application/ogg',
-        'onepkg' => 'application/onenote',
-        'onetmp' => 'application/onenote',
-        'onetoc' => 'application/onenote',
-        'onetoc2' => 'application/onenote',
-        'opf' => 'application/oebps-package+xml',
-        'oprc' => 'application/vnd.palm',
-        'org' => 'application/vnd.lotus-organizer',
-        'osf' => 'application/vnd.yamaha.openscoreformat',
-        'osfpvg' => 'application/vnd.yamaha.openscoreformat.osfpvg+xml',
-        'otc' => 'application/vnd.oasis.opendocument.chart-template',
-        'otf' => 'application/x-font-otf',
-        'otg' => 'application/vnd.oasis.opendocument.graphics-template',
-        'oth' => 'application/vnd.oasis.opendocument.text-web',
-        'oti' => 'application/vnd.oasis.opendocument.image-template',
-        'otp' => 'application/vnd.oasis.opendocument.presentation-template',
-        'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template',
-        'ott' => 'application/vnd.oasis.opendocument.text-template',
-        'oxt' => 'application/vnd.openofficeorg.extension',
-        'p' => 'text/x-pascal',
-        'p10' => 'application/pkcs10',
-        'p12' => 'application/x-pkcs12',
-        'p7b' => 'application/x-pkcs7-certificates',
-        'p7c' => 'application/pkcs7-mime',
-        'p7m' => 'application/pkcs7-mime',
-        'p7r' => 'application/x-pkcs7-certreqresp',
-        'p7s' => 'application/pkcs7-signature',
-        'p8' => 'application/pkcs8',
-        'pas' => 'text/x-pascal',
-        'paw' => 'application/vnd.pawaafile',
-        'pbd' => 'application/vnd.powerbuilder6',
-        'pbm' => 'image/x-portable-bitmap',
-        'pcf' => 'application/x-font-pcf',
-        'pcl' => 'application/vnd.hp-pcl',
-        'pclxl' => 'application/vnd.hp-pclxl',
-        'pct' => 'image/x-pict',
-        'pcurl' => 'application/vnd.curl.pcurl',
-        'pcx' => 'image/x-pcx',
-        'pdb' => 'application/vnd.palm',
-        'pdf' => 'application/pdf',
-        'pfa' => 'application/x-font-type1',
-        'pfb' => 'application/x-font-type1',
-        'pfm' => 'application/x-font-type1',
-        'pfr' => 'application/font-tdpfr',
-        'pfx' => 'application/x-pkcs12',
-        'pgm' => 'image/x-portable-graymap',
-        'pgn' => 'application/x-chess-pgn',
-        'pgp' => 'application/pgp-encrypted',
-        'php' => 'text/x-php',
-        'phps' => 'application/x-httpd-phps',
-        'pic' => 'image/x-pict',
-        'pkg' => 'application/octet-stream',
-        'pki' => 'application/pkixcmp',
-        'pkipath' => 'application/pkix-pkipath',
-        'plb' => 'application/vnd.3gpp.pic-bw-large',
-        'plc' => 'application/vnd.mobius.plc',
-        'plf' => 'application/vnd.pocketlearn',
-        'pls' => 'application/pls+xml',
-        'pml' => 'application/vnd.ctc-posml',
-        'png' => 'image/png',
-        'pnm' => 'image/x-portable-anymap',
-        'portpkg' => 'application/vnd.macports.portpkg',
-        'pot' => 'application/vnd.ms-powerpoint',
-        'potm' => 'application/vnd.ms-powerpoint.template.macroenabled.12',
-        'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
-        'ppam' => 'application/vnd.ms-powerpoint.addin.macroenabled.12',
-        'ppd' => 'application/vnd.cups-ppd',
-        'ppm' => 'image/x-portable-pixmap',
-        'pps' => 'application/vnd.ms-powerpoint',
-        'ppsm' => 'application/vnd.ms-powerpoint.slideshow.macroenabled.12',
-        'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
-        'ppt' => 'application/vnd.ms-powerpoint',
-        'pptm' => 'application/vnd.ms-powerpoint.presentation.macroenabled.12',
-        'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-        'pqa' => 'application/vnd.palm',
-        'prc' => 'application/x-mobipocket-ebook',
-        'pre' => 'application/vnd.lotus-freelance',
-        'prf' => 'application/pics-rules',
-        'ps' => 'application/postscript',
-        'psb' => 'application/vnd.3gpp.pic-bw-small',
-        'psd' => 'image/vnd.adobe.photoshop',
-        'psf' => 'application/x-font-linux-psf',
-        'pskcxml' => 'application/pskc+xml',
-        'ptid' => 'application/vnd.pvi.ptid1',
-        'pub' => 'application/x-mspublisher',
-        'pvb' => 'application/vnd.3gpp.pic-bw-var',
-        'pwn' => 'application/vnd.3m.post-it-notes',
-        'pya' => 'audio/vnd.ms-playready.media.pya',
-        'pyv' => 'video/vnd.ms-playready.media.pyv',
-        'qam' => 'application/vnd.epson.quickanime',
-        'qbo' => 'application/vnd.intu.qbo',
-        'qfx' => 'application/vnd.intu.qfx',
-        'qps' => 'application/vnd.publishare-delta-tree',
-        'qt' => 'video/quicktime',
-        'qwd' => 'application/vnd.quark.quarkxpress',
-        'qwt' => 'application/vnd.quark.quarkxpress',
-        'qxb' => 'application/vnd.quark.quarkxpress',
-        'qxd' => 'application/vnd.quark.quarkxpress',
-        'qxl' => 'application/vnd.quark.quarkxpress',
-        'qxt' => 'application/vnd.quark.quarkxpress',
-        'ra' => 'audio/x-pn-realaudio',
-        'ram' => 'audio/x-pn-realaudio',
-        'rar' => 'application/x-rar-compressed',
-        'ras' => 'image/x-cmu-raster',
-        'rb' => 'text/plain',
-        'rcprofile' => 'application/vnd.ipunplugged.rcprofile',
-        'rdf' => 'application/rdf+xml',
-        'rdz' => 'application/vnd.data-vision.rdz',
-        'rep' => 'application/vnd.businessobjects',
-        'res' => 'application/x-dtbresource+xml',
-        'resx' => 'text/xml',
-        'rgb' => 'image/x-rgb',
-        'rif' => 'application/reginfo+xml',
-        'rip' => 'audio/vnd.rip',
-        'rl' => 'application/resource-lists+xml',
-        'rlc' => 'image/vnd.fujixerox.edmics-rlc',
-        'rld' => 'application/resource-lists-diff+xml',
-        'rm' => 'application/vnd.rn-realmedia',
-        'rmi' => 'audio/midi',
-        'rmp' => 'audio/x-pn-realaudio-plugin',
-        'rms' => 'application/vnd.jcp.javame.midlet-rms',
-        'rnc' => 'application/relax-ng-compact-syntax',
-        'roff' => 'text/troff',
-        'rp9' => 'application/vnd.cloanto.rp9',
-        'rpss' => 'application/vnd.nokia.radio-presets',
-        'rpst' => 'application/vnd.nokia.radio-preset',
-        'rq' => 'application/sparql-query',
-        'rs' => 'application/rls-services+xml',
-        'rsd' => 'application/rsd+xml',
-        'rss' => 'application/rss+xml',
-        'rtf' => 'application/rtf',
-        'rtx' => 'text/richtext',
-        's' => 'text/x-asm',
-        'saf' => 'application/vnd.yamaha.smaf-audio',
-        'sbml' => 'application/sbml+xml',
-        'sc' => 'application/vnd.ibm.secure-container',
-        'scd' => 'application/x-msschedule',
-        'scm' => 'application/vnd.lotus-screencam',
-        'scq' => 'application/scvp-cv-request',
-        'scs' => 'application/scvp-cv-response',
-        'scurl' => 'text/vnd.curl.scurl',
-        'sda' => 'application/vnd.stardivision.draw',
-        'sdc' => 'application/vnd.stardivision.calc',
-        'sdd' => 'application/vnd.stardivision.impress',
-        'sdkd' => 'application/vnd.solent.sdkm+xml',
-        'sdkm' => 'application/vnd.solent.sdkm+xml',
-        'sdp' => 'application/sdp',
-        'sdw' => 'application/vnd.stardivision.writer',
-        'see' => 'application/vnd.seemail',
-        'seed' => 'application/vnd.fdsn.seed',
-        'sema' => 'application/vnd.sema',
-        'semd' => 'application/vnd.semd',
-        'semf' => 'application/vnd.semf',
-        'ser' => 'application/java-serialized-object',
-        'setpay' => 'application/set-payment-initiation',
-        'setreg' => 'application/set-registration-initiation',
-        'sfd-hdstx' => 'application/vnd.hydrostatix.sof-data',
-        'sfs' => 'application/vnd.spotfire.sfs',
-        'sgl' => 'application/vnd.stardivision.writer-global',
-        'sgm' => 'text/sgml',
-        'sgml' => 'text/sgml',
-        'sh' => 'application/x-sh',
-        'shar' => 'application/x-shar',
-        'shf' => 'application/shf+xml',
-        'sig' => 'application/pgp-signature',
-        'silo' => 'model/mesh',
-        'sis' => 'application/vnd.symbian.install',
-        'sisx' => 'application/vnd.symbian.install',
-        'sit' => 'application/x-stuffit',
-        'sitx' => 'application/x-stuffitx',
-        'skd' => 'application/vnd.koan',
-        'skm' => 'application/vnd.koan',
-        'skp' => 'application/vnd.koan',
-        'skt' => 'application/vnd.koan',
-        'sldm' => 'application/vnd.ms-powerpoint.slide.macroenabled.12',
-        'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
-        'slt' => 'application/vnd.epson.salt',
-        'sm' => 'application/vnd.stepmania.stepchart',
-        'smf' => 'application/vnd.stardivision.math',
-        'smi' => 'application/smil+xml',
-        'smil' => 'application/smil+xml',
-        'snd' => 'audio/basic',
-        'snf' => 'application/x-font-snf',
-        'so' => 'application/octet-stream',
-        'spc' => 'application/x-pkcs7-certificates',
-        'spf' => 'application/vnd.yamaha.smaf-phrase',
-        'spl' => 'application/x-futuresplash',
-        'spot' => 'text/vnd.in3d.spot',
-        'spp' => 'application/scvp-vp-response',
-        'spq' => 'application/scvp-vp-request',
-        'spx' => 'audio/ogg',
-        'src' => 'application/x-wais-source',
-        'sru' => 'application/sru+xml',
-        'srx' => 'application/sparql-results+xml',
-        'sse' => 'application/vnd.kodak-descriptor',
-        'ssf' => 'application/vnd.epson.ssf',
-        'ssml' => 'application/ssml+xml',
-        'st' => 'application/vnd.sailingtracker.track',
-        'stc' => 'application/vnd.sun.xml.calc.template',
-        'std' => 'application/vnd.sun.xml.draw.template',
-        'stf' => 'application/vnd.wt.stf',
-        'sti' => 'application/vnd.sun.xml.impress.template',
-        'stk' => 'application/hyperstudio',
-        'stl' => 'application/vnd.ms-pki.stl',
-        'str' => 'application/vnd.pg.format',
-        'stw' => 'application/vnd.sun.xml.writer.template',
-        'sub' => 'image/vnd.dvb.subtitle',
-        'sus' => 'application/vnd.sus-calendar',
-        'susp' => 'application/vnd.sus-calendar',
-        'sv4cpio' => 'application/x-sv4cpio',
-        'sv4crc' => 'application/x-sv4crc',
-        'svc' => 'application/vnd.dvb.service',
-        'svd' => 'application/vnd.svd',
-        'svg' => 'image/svg+xml',
-        'svgz' => 'image/svg+xml',
-        'swa' => 'application/x-director',
-        'swf' => 'application/x-shockwave-flash',
-        'swi' => 'application/vnd.aristanetworks.swi',
-        'sxc' => 'application/vnd.sun.xml.calc',
-        'sxd' => 'application/vnd.sun.xml.draw',
-        'sxg' => 'application/vnd.sun.xml.writer.global',
-        'sxi' => 'application/vnd.sun.xml.impress',
-        'sxm' => 'application/vnd.sun.xml.math',
-        'sxw' => 'application/vnd.sun.xml.writer',
-        't' => 'text/troff',
-        'tao' => 'application/vnd.tao.intent-module-archive',
-        'tar' => 'application/x-tar',
-        'tcap' => 'application/vnd.3gpp2.tcap',
-        'tcl' => 'application/x-tcl',
-        'teacher' => 'application/vnd.smart.teacher',
-        'tei' => 'application/tei+xml',
-        'teicorpus' => 'application/tei+xml',
-        'tex' => 'application/x-tex',
-        'texi' => 'application/x-texinfo',
-        'texinfo' => 'application/x-texinfo',
-        'text' => 'text/plain',
-        'tfi' => 'application/thraud+xml',
-        'tfm' => 'application/x-tex-tfm',
-        'thmx' => 'application/vnd.ms-officetheme',
-        'tif' => 'image/tiff',
-        'tiff' => 'image/tiff',
-        'tmo' => 'application/vnd.tmobile-livetv',
-        'torrent' => 'application/x-bittorrent',
-        'tpl' => 'application/vnd.groove-tool-template',
-        'tpt' => 'application/vnd.trid.tpt',
-        'tr' => 'text/troff',
-        'tra' => 'application/vnd.trueapp',
-        'trm' => 'application/x-msterminal',
-        'tsd' => 'application/timestamped-data',
-        'tsv' => 'text/tab-separated-values',
-        'ttc' => 'application/x-font-ttf',
-        'ttf' => 'application/x-font-ttf',
-        'ttl' => 'text/turtle',
-        'twd' => 'application/vnd.simtech-mindmapper',
-        'twds' => 'application/vnd.simtech-mindmapper',
-        'txd' => 'application/vnd.genomatix.tuxedo',
-        'txf' => 'application/vnd.mobius.txf',
-        'txt' => 'text/plain',
-        'u32' => 'application/x-authorware-bin',
-        'udeb' => 'application/x-debian-package',
-        'ufd' => 'application/vnd.ufdl',
-        'ufdl' => 'application/vnd.ufdl',
-        'umj' => 'application/vnd.umajin',
-        'unityweb' => 'application/vnd.unity',
-        'uoml' => 'application/vnd.uoml+xml',
-        'uri' => 'text/uri-list',
-        'uris' => 'text/uri-list',
-        'urls' => 'text/uri-list',
-        'ustar' => 'application/x-ustar',
-        'utz' => 'application/vnd.uiq.theme',
-        'uu' => 'text/x-uuencode',
-        'uva' => 'audio/vnd.dece.audio',
-        'uvd' => 'application/vnd.dece.data',
-        'uvf' => 'application/vnd.dece.data',
-        'uvg' => 'image/vnd.dece.graphic',
-        'uvh' => 'video/vnd.dece.hd',
-        'uvi' => 'image/vnd.dece.graphic',
-        'uvm' => 'video/vnd.dece.mobile',
-        'uvp' => 'video/vnd.dece.pd',
-        'uvs' => 'video/vnd.dece.sd',
-        'uvt' => 'application/vnd.dece.ttml+xml',
-        'uvu' => 'video/vnd.uvvu.mp4',
-        'uvv' => 'video/vnd.dece.video',
-        'uvva' => 'audio/vnd.dece.audio',
-        'uvvd' => 'application/vnd.dece.data',
-        'uvvf' => 'application/vnd.dece.data',
-        'uvvg' => 'image/vnd.dece.graphic',
-        'uvvh' => 'video/vnd.dece.hd',
-        'uvvi' => 'image/vnd.dece.graphic',
-        'uvvm' => 'video/vnd.dece.mobile',
-        'uvvp' => 'video/vnd.dece.pd',
-        'uvvs' => 'video/vnd.dece.sd',
-        'uvvt' => 'application/vnd.dece.ttml+xml',
-        'uvvu' => 'video/vnd.uvvu.mp4',
-        'uvvv' => 'video/vnd.dece.video',
-        'uvvx' => 'application/vnd.dece.unspecified',
-        'uvx' => 'application/vnd.dece.unspecified',
-        'vcd' => 'application/x-cdlink',
-        'vcf' => 'text/x-vcard',
-        'vcg' => 'application/vnd.groove-vcard',
-        'vcs' => 'text/x-vcalendar',
-        'vcx' => 'application/vnd.vcx',
-        'vis' => 'application/vnd.visionary',
-        'viv' => 'video/vnd.vivo',
-        'vor' => 'application/vnd.stardivision.writer',
-        'vox' => 'application/x-authorware-bin',
-        'vrml' => 'model/vrml',
-        'vsd' => 'application/vnd.visio',
-        'vsf' => 'application/vnd.vsf',
-        'vss' => 'application/vnd.visio',
-        'vst' => 'application/vnd.visio',
-        'vsw' => 'application/vnd.visio',
-        'vtu' => 'model/vnd.vtu',
-        'vxml' => 'application/voicexml+xml',
-        'w3d' => 'application/x-director',
-        'wad' => 'application/x-doom',
-        'wav' => 'audio/x-wav',
-        'wax' => 'audio/x-ms-wax',
-        'wbmp' => 'image/vnd.wap.wbmp',
-        'wbs' => 'application/vnd.criticaltools.wbs+xml',
-        'wbxml' => 'application/vnd.wap.wbxml',
-        'wcm' => 'application/vnd.ms-works',
-        'wdb' => 'application/vnd.ms-works',
-        'weba' => 'audio/webm',
-        'webm' => 'video/webm',
-        'webp' => 'image/webp',
-        'wg' => 'application/vnd.pmi.widget',
-        'wgt' => 'application/widget',
-        'wks' => 'application/vnd.ms-works',
-        'wm' => 'video/x-ms-wm',
-        'wma' => 'audio/x-ms-wma',
-        'wmd' => 'application/x-ms-wmd',
-        'wmf' => 'application/x-msmetafile',
-        'wml' => 'text/vnd.wap.wml',
-        'wmlc' => 'application/vnd.wap.wmlc',
-        'wmls' => 'text/vnd.wap.wmlscript',
-        'wmlsc' => 'application/vnd.wap.wmlscriptc',
-        'wmv' => 'video/x-ms-wmv',
-        'wmx' => 'video/x-ms-wmx',
-        'wmz' => 'application/x-ms-wmz',
-        'woff' => 'application/x-font-woff',
-        'wpd' => 'application/vnd.wordperfect',
-        'wpl' => 'application/vnd.ms-wpl',
-        'wps' => 'application/vnd.ms-works',
-        'wqd' => 'application/vnd.wqd',
-        'wri' => 'application/x-mswrite',
-        'wrl' => 'model/vrml',
-        'wsdl' => 'application/wsdl+xml',
-        'wspolicy' => 'application/wspolicy+xml',
-        'wtb' => 'application/vnd.webturbo',
-        'wvx' => 'video/x-ms-wvx',
-        'x32' => 'application/x-authorware-bin',
-        'x3d' => 'application/vnd.hzn-3d-crossword',
-        'xap' => 'application/x-silverlight-app',
-        'xar' => 'application/vnd.xara',
-        'xbap' => 'application/x-ms-xbap',
-        'xbd' => 'application/vnd.fujixerox.docuworks.binder',
-        'xbm' => 'image/x-xbitmap',
-        'xdf' => 'application/xcap-diff+xml',
-        'xdm' => 'application/vnd.syncml.dm+xml',
-        'xdp' => 'application/vnd.adobe.xdp+xml',
-        'xdssc' => 'application/dssc+xml',
-        'xdw' => 'application/vnd.fujixerox.docuworks',
-        'xenc' => 'application/xenc+xml',
-        'xer' => 'application/patch-ops-error+xml',
-        'xfdf' => 'application/vnd.adobe.xfdf',
-        'xfdl' => 'application/vnd.xfdl',
-        'xht' => 'application/xhtml+xml',
-        'xhtml' => 'application/xhtml+xml',
-        'xhvml' => 'application/xv+xml',
-        'xif' => 'image/vnd.xiff',
-        'xla' => 'application/vnd.ms-excel',
-        'xlam' => 'application/vnd.ms-excel.addin.macroenabled.12',
-        'xlc' => 'application/vnd.ms-excel',
-        'xlm' => 'application/vnd.ms-excel',
-        'xls' => 'application/vnd.ms-excel',
-        'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroenabled.12',
-        'xlsm' => 'application/vnd.ms-excel.sheet.macroenabled.12',
-        'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-        'xlt' => 'application/vnd.ms-excel',
-        'xltm' => 'application/vnd.ms-excel.template.macroenabled.12',
-        'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
-        'xlw' => 'application/vnd.ms-excel',
-        'xml' => 'application/xml',
-        'xo' => 'application/vnd.olpc-sugar',
-        'xop' => 'application/xop+xml',
-        'xpi' => 'application/x-xpinstall',
-        'xpm' => 'image/x-xpixmap',
-        'xpr' => 'application/vnd.is-xpr',
-        'xps' => 'application/vnd.ms-xpsdocument',
-        'xpw' => 'application/vnd.intercon.formnet',
-        'xpx' => 'application/vnd.intercon.formnet',
-        'xsl' => 'application/xml',
-        'xslt' => 'application/xslt+xml',
-        'xsm' => 'application/vnd.syncml+xml',
-        'xspf' => 'application/xspf+xml',
-        'xul' => 'application/vnd.mozilla.xul+xml',
-        'xvm' => 'application/xv+xml',
-        'xvml' => 'application/xv+xml',
-        'xwd' => 'image/x-xwindowdump',
-        'xyz' => 'chemical/x-xyz',
-        'yaml' => 'text/yaml',
-        'yang' => 'application/yang',
-        'yin' => 'application/yin+xml',
-        'yml' => 'text/yaml',
-        'zaz' => 'application/vnd.zzazz.deck+xml',
-        'zip' => 'application/zip',
-        'zir' => 'application/vnd.zul',
-        'zirz' => 'application/vnd.zul',
-        'zmm' => 'application/vnd.handheld-entertainment+xml'
-    );
-
-    /**
-     * Get a singleton instance of the class
-     *
-     * @return self
-     * @codeCoverageIgnore
-     */
-    public static function getInstance()
-    {
-        if (!self::$instance) {
-            self::$instance = new self();
-        }
-
-        return self::$instance;
-    }
-
-    /**
-     * Get a mimetype value from a file extension
-     *
-     * @param string $extension File extension
-     *
-     * @return string|null
-     *
-     */
-    public function fromExtension($extension)
-    {
-        $extension = strtolower($extension);
-
-        return isset($this->mimetypes[$extension])
-            ? $this->mimetypes[$extension]
-            : null;
-    }
-
-    /**
-     * Get a mimetype from a filename
-     *
-     * @param string $filename Filename to generate a mimetype from
-     *
-     * @return string|null
-     */
-    public function fromFilename($filename)
-    {
-        return $this->fromExtension(pathinfo($filename, PATHINFO_EXTENSION));
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Pool.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Pool.php
deleted file mode 100644
index 7b9d83a4ea..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Pool.php
+++ /dev/null
@@ -1,333 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-use GuzzleHttp\Event\BeforeEvent;
-use GuzzleHttp\Event\RequestEvents;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Message\ResponseInterface;
-use GuzzleHttp\Ring\Core;
-use GuzzleHttp\Ring\Future\FutureInterface;
-use GuzzleHttp\Event\ListenerAttacherTrait;
-use GuzzleHttp\Event\EndEvent;
-use React\Promise\Deferred;
-use React\Promise\FulfilledPromise;
-use React\Promise\PromiseInterface;
-use React\Promise\RejectedPromise;
-
-/**
- * Sends and iterator of requests concurrently using a capped pool size.
- *
- * The Pool object implements FutureInterface, meaning it can be used later
- * when necessary, the requests provided to the pool can be cancelled, and
- * you can check the state of the pool to know if it has been dereferenced
- * (sent) or has been cancelled.
- *
- * When sending the pool, keep in mind that no results are returned: callers
- * are expected to handle results asynchronously using Guzzle's event system.
- * When requests complete, more are added to the pool to ensure that the
- * requested pool size is always filled as much as possible.
- *
- * IMPORTANT: Do not provide a pool size greater that what the utilized
- * underlying RingPHP handler can support. This will result is extremely poor
- * performance.
- */
-class Pool implements FutureInterface
-{
-    use ListenerAttacherTrait;
-
-    /** @var \GuzzleHttp\ClientInterface */
-    private $client;
-
-    /** @var \Iterator Yields requests */
-    private $iter;
-
-    /** @var Deferred */
-    private $deferred;
-
-    /** @var PromiseInterface */
-    private $promise;
-
-    private $waitQueue = [];
-    private $eventListeners = [];
-    private $poolSize;
-    private $isRealized = false;
-
-    /**
-     * The option values for 'before', 'complete', 'error' and 'end' can be a
-     * callable, an associative array containing event data, or an array of
-     * event data arrays. Event data arrays contain the following keys:
-     *
-     * - fn: callable to invoke that receives the event
-     * - priority: Optional event priority (defaults to 0)
-     * - once: Set to true so that the event is removed after it is triggered
-     *
-     * @param ClientInterface $client   Client used to send the requests.
-     * @param array|\Iterator $requests Requests to send in parallel
-     * @param array           $options  Associative array of options
-     *     - pool_size: (callable|int)   Maximum number of requests to send
-     *                                   concurrently, or a callback that receives
-     *                                   the current queue size and returns the
-     *                                   number of new requests to send
-     *     - before:    (callable|array) Receives a BeforeEvent
-     *     - complete:  (callable|array) Receives a CompleteEvent
-     *     - error:     (callable|array) Receives a ErrorEvent
-     *     - end:       (callable|array) Receives an EndEvent
-     */
-    public function __construct(
-        ClientInterface $client,
-        $requests,
-        array $options = []
-    ) {
-        $this->client = $client;
-        $this->iter = $this->coerceIterable($requests);
-        $this->deferred = new Deferred();
-        $this->promise = $this->deferred->promise();
-        $this->poolSize = isset($options['pool_size'])
-            ? $options['pool_size'] : 25;
-        $this->eventListeners = $this->prepareListeners(
-            $options,
-            ['before', 'complete', 'error', 'end']
-        );
-    }
-
-    /**
-     * Sends multiple requests in parallel and returns an array of responses
-     * and exceptions that uses the same ordering as the provided requests.
-     *
-     * IMPORTANT: This method keeps every request and response in memory, and
-     * as such, is NOT recommended when sending a large number or an
-     * indeterminate number of requests concurrently.
-     *
-     * @param ClientInterface $client   Client used to send the requests
-     * @param array|\Iterator $requests Requests to send in parallel
-     * @param array           $options  Passes through the options available in
-     *                                  {@see GuzzleHttp\Pool::__construct}
-     *
-     * @return BatchResults Returns a container for the results.
-     * @throws \InvalidArgumentException if the event format is incorrect.
-     */
-    public static function batch(
-        ClientInterface $client,
-        $requests,
-        array $options = []
-    ) {
-        $hash = new \SplObjectStorage();
-        foreach ($requests as $request) {
-            $hash->attach($request);
-        }
-
-        // In addition to the normally run events when requests complete, add
-        // and event to continuously track the results of transfers in the hash.
-        (new self($client, $requests, RequestEvents::convertEventArray(
-            $options,
-            ['end'],
-            [
-                'priority' => RequestEvents::LATE,
-                'fn'       => function (EndEvent $e) use ($hash) {
-                    $hash[$e->getRequest()] = $e->getException()
-                        ? $e->getException()
-                        : $e->getResponse();
-                }
-            ]
-        )))->wait();
-
-        return new BatchResults($hash);
-    }
-
-    /**
-     * Creates a Pool and immediately sends the requests.
-     *
-     * @param ClientInterface $client   Client used to send the requests
-     * @param array|\Iterator $requests Requests to send in parallel
-     * @param array           $options  Passes through the options available in
-     *                                  {@see GuzzleHttp\Pool::__construct}
-     */
-    public static function send(
-        ClientInterface $client,
-        $requests,
-        array $options = []
-    ) {
-        $pool = new self($client, $requests, $options);
-        $pool->wait();
-    }
-
-    private function getPoolSize()
-    {
-        return is_callable($this->poolSize)
-            ? call_user_func($this->poolSize, count($this->waitQueue))
-            : $this->poolSize;
-    }
-
-    /**
-     * Add as many requests as possible up to the current pool limit.
-     */
-    private function addNextRequests()
-    {
-        $limit = max($this->getPoolSize() - count($this->waitQueue), 0);
-        while ($limit--) {
-            if (!$this->addNextRequest()) {
-                break;
-            }
-        }
-    }
-
-    public function wait()
-    {
-        if ($this->isRealized) {
-            return false;
-        }
-
-        // Seed the pool with N number of requests.
-        $this->addNextRequests();
-
-        // Stop if the pool was cancelled while transferring requests.
-        if ($this->isRealized) {
-            return false;
-        }
-
-        // Wait on any outstanding FutureResponse objects.
-        while ($response = array_pop($this->waitQueue)) {
-            try {
-                $response->wait();
-            } catch (\Exception $e) {
-                // Eat exceptions because they should be handled asynchronously
-            }
-            $this->addNextRequests();
-        }
-
-        // Clean up no longer needed state.
-        $this->isRealized = true;
-        $this->waitQueue = $this->eventListeners = [];
-        $this->client = $this->iter = null;
-        $this->deferred->resolve(true);
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * Attempt to cancel all outstanding requests (requests that are queued for
-     * dereferencing). Returns true if all outstanding requests can be
-     * cancelled.
-     *
-     * @return bool
-     */
-    public function cancel()
-    {
-        if ($this->isRealized) {
-            return false;
-        }
-
-        $success = $this->isRealized = true;
-        foreach ($this->waitQueue as $response) {
-            if (!$response->cancel()) {
-                $success = false;
-            }
-        }
-
-        return $success;
-    }
-
-    /**
-     * Returns a promise that is invoked when the pool completed. There will be
-     * no passed value.
-     *
-     * {@inheritdoc}
-     */
-    public function then(
-        callable $onFulfilled = null,
-        callable $onRejected = null,
-        callable $onProgress = null
-    ) {
-        return $this->promise->then($onFulfilled, $onRejected, $onProgress);
-    }
-
-    public function promise()
-    {
-        return $this->promise;
-    }
-
-    private function coerceIterable($requests)
-    {
-        if ($requests instanceof \Iterator) {
-            return $requests;
-        } elseif (is_array($requests)) {
-            return new \ArrayIterator($requests);
-        }
-
-        throw new \InvalidArgumentException('Expected Iterator or array. '
-            . 'Found ' . Core::describeType($requests));
-    }
-
-    /**
-     * Adds the next request to pool and tracks what requests need to be
-     * dereferenced when completing the pool.
-     */
-    private function addNextRequest()
-    {
-        add_next:
-
-        if ($this->isRealized || !$this->iter || !$this->iter->valid()) {
-            return false;
-        }
-
-        $request = $this->iter->current();
-        $this->iter->next();
-
-        if (!($request instanceof RequestInterface)) {
-            throw new \InvalidArgumentException(sprintf(
-                'All requests in the provided iterator must implement '
-                . 'RequestInterface. Found %s',
-                Core::describeType($request)
-            ));
-        }
-
-        // Be sure to use "lazy" futures, meaning they do not send right away.
-        $request->getConfig()->set('future', 'lazy');
-        $hash = spl_object_hash($request);
-        $this->attachListeners($request, $this->eventListeners);
-        $request->getEmitter()->on('before', [$this, '_trackRetries'], RequestEvents::EARLY);
-        $response = $this->client->send($request);
-        $this->waitQueue[$hash] = $response;
-        $promise = $response->promise();
-
-        // Don't recursively call itself for completed or rejected responses.
-        if ($promise instanceof FulfilledPromise
-            || $promise instanceof RejectedPromise
-        ) {
-            try {
-                $this->finishResponse($request, $response->wait(), $hash);
-            } catch (\Exception $e) {
-                $this->finishResponse($request, $e, $hash);
-            }
-            goto add_next;
-        }
-
-        // Use this function for both resolution and rejection.
-        $thenFn = function ($value) use ($request, $hash) {
-            $this->finishResponse($request, $value, $hash);
-            if (!$request->getConfig()->get('_pool_retries')) {
-                $this->addNextRequests();
-            }
-        };
-
-        $promise->then($thenFn, $thenFn);
-
-        return true;
-    }
-
-    public function _trackRetries(BeforeEvent $e)
-    {
-        $e->getRequest()->getConfig()->set('_pool_retries', $e->getRetryCount());
-    }
-
-    private function finishResponse($request, $value, $hash)
-    {
-        unset($this->waitQueue[$hash]);
-        $result = $value instanceof ResponseInterface
-            ? ['request' => $request, 'response' => $value, 'error' => null]
-            : ['request' => $request, 'response' => null, 'error' => $value];
-        $this->deferred->notify($result);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Post/MultipartBody.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Post/MultipartBody.php
deleted file mode 100644
index 1149e62354..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Post/MultipartBody.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-namespace GuzzleHttp\Post;
-
-use GuzzleHttp\Stream\AppendStream;
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Stream\StreamDecoratorTrait;
-use GuzzleHttp\Stream\StreamInterface;
-
-/**
- * Stream that when read returns bytes for a streaming multipart/form-data body
- */
-class MultipartBody implements StreamInterface
-{
-    use StreamDecoratorTrait;
-
-    private $boundary;
-
-    /**
-     * @param array  $fields   Associative array of field names to values where
-     *                         each value is a string or array of strings.
-     * @param array  $files    Associative array of PostFileInterface objects
-     * @param string $boundary You can optionally provide a specific boundary
-     * @throws \InvalidArgumentException
-     */
-    public function __construct(
-        array $fields = [],
-        array $files = [],
-        $boundary = null
-    ) {
-        $this->boundary = $boundary ?: uniqid();
-        $this->stream = $this->createStream($fields, $files);
-    }
-
-    /**
-     * Get the boundary
-     *
-     * @return string
-     */
-    public function getBoundary()
-    {
-        return $this->boundary;
-    }
-
-    public function isWritable()
-    {
-        return false;
-    }
-
-    /**
-     * Get the string needed to transfer a POST field
-     */
-    private function getFieldString($name, $value)
-    {
-        return sprintf(
-            "--%s\r\nContent-Disposition: form-data; name=\"%s\"\r\n\r\n%s\r\n",
-            $this->boundary,
-            $name,
-            $value
-        );
-    }
-
-    /**
-     * Get the headers needed before transferring the content of a POST file
-     */
-    private function getFileHeaders(PostFileInterface $file)
-    {
-        $headers = '';
-        foreach ($file->getHeaders() as $key => $value) {
-            $headers .= "{$key}: {$value}\r\n";
-        }
-
-        return "--{$this->boundary}\r\n" . trim($headers) . "\r\n\r\n";
-    }
-
-    /**
-     * Create the aggregate stream that will be used to upload the POST data
-     */
-    protected function createStream(array $fields, array $files)
-    {
-        $stream = new AppendStream();
-
-        foreach ($fields as $name => $fieldValues) {
-            foreach ((array) $fieldValues as $value) {
-                $stream->addStream(
-                    Stream::factory($this->getFieldString($name, $value))
-                );
-            }
-        }
-
-        foreach ($files as $file) {
-
-            if (!$file instanceof PostFileInterface) {
-                throw new \InvalidArgumentException('All POST fields must '
-                    . 'implement PostFieldInterface');
-            }
-
-            $stream->addStream(
-                Stream::factory($this->getFileHeaders($file))
-            );
-            $stream->addStream($file->getContent());
-            $stream->addStream(Stream::factory("\r\n"));
-        }
-
-        // Add the trailing boundary with CRLF
-        $stream->addStream(Stream::factory("--{$this->boundary}--\r\n"));
-
-        return $stream;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Post/PostBody.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Post/PostBody.php
deleted file mode 100644
index ed14d1f703..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Post/PostBody.php
+++ /dev/null
@@ -1,287 +0,0 @@
-<?php
-namespace GuzzleHttp\Post;
-
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Stream\Exception\CannotAttachException;
-use GuzzleHttp\Stream\StreamInterface;
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Query;
-
-/**
- * Holds POST fields and files and creates a streaming body when read methods
- * are called on the object.
- */
-class PostBody implements PostBodyInterface
-{
-    /** @var StreamInterface */
-    private $body;
-
-    /** @var callable */
-    private $aggregator;
-
-    private $fields = [];
-
-    /** @var PostFileInterface[] */
-    private $files = [];
-    private $forceMultipart = false;
-    private $detached = false;
-
-    /**
-     * Applies request headers to a request based on the POST state
-     *
-     * @param RequestInterface $request Request to update
-     */
-    public function applyRequestHeaders(RequestInterface $request)
-    {
-        if ($this->files || $this->forceMultipart) {
-            $request->setHeader(
-                'Content-Type',
-                'multipart/form-data; boundary=' . $this->getBody()->getBoundary()
-            );
-        } elseif ($this->fields && !$request->hasHeader('Content-Type')) {
-            $request->setHeader(
-                'Content-Type',
-                'application/x-www-form-urlencoded'
-            );
-        }
-
-        if ($size = $this->getSize()) {
-            $request->setHeader('Content-Length', $size);
-        }
-    }
-
-    public function forceMultipartUpload($force)
-    {
-        $this->forceMultipart = $force;
-    }
-
-    public function setAggregator(callable $aggregator)
-    {
-        $this->aggregator = $aggregator;
-    }
-
-    public function setField($name, $value)
-    {
-        $this->fields[$name] = $value;
-        $this->mutate();
-    }
-
-    public function replaceFields(array $fields)
-    {
-        $this->fields = $fields;
-        $this->mutate();
-    }
-
-    public function getField($name)
-    {
-        return isset($this->fields[$name]) ? $this->fields[$name] : null;
-    }
-
-    public function removeField($name)
-    {
-        unset($this->fields[$name]);
-        $this->mutate();
-    }
-
-    public function getFields($asString = false)
-    {
-        if (!$asString) {
-            return $this->fields;
-        }
-
-        $query = new Query($this->fields);
-        $query->setEncodingType(Query::RFC1738);
-        $query->setAggregator($this->getAggregator());
-
-        return (string) $query;
-    }
-
-    public function hasField($name)
-    {
-        return isset($this->fields[$name]);
-    }
-
-    public function getFile($name)
-    {
-        foreach ($this->files as $file) {
-            if ($file->getName() == $name) {
-                return $file;
-            }
-        }
-
-        return null;
-    }
-
-    public function getFiles()
-    {
-        return $this->files;
-    }
-
-    public function addFile(PostFileInterface $file)
-    {
-        $this->files[] = $file;
-        $this->mutate();
-    }
-
-    public function clearFiles()
-    {
-        $this->files = [];
-        $this->mutate();
-    }
-
-    /**
-     * Returns the numbers of fields + files
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->files) + count($this->fields);
-    }
-
-    public function __toString()
-    {
-        return (string) $this->getBody();
-    }
-
-    public function getContents($maxLength = -1)
-    {
-        return $this->getBody()->getContents();
-    }
-
-    public function close()
-    {
-        $this->detach();
-    }
-
-    public function detach()
-    {
-        $this->detached = true;
-        $this->fields = $this->files = [];
-
-        if ($this->body) {
-            $this->body->close();
-            $this->body = null;
-        }
-    }
-
-    public function attach($stream)
-    {
-        throw new CannotAttachException();
-    }
-
-    public function eof()
-    {
-        return $this->getBody()->eof();
-    }
-
-    public function tell()
-    {
-        return $this->body ? $this->body->tell() : 0;
-    }
-
-    public function isSeekable()
-    {
-        return true;
-    }
-
-    public function isReadable()
-    {
-        return true;
-    }
-
-    public function isWritable()
-    {
-        return false;
-    }
-
-    public function getSize()
-    {
-        return $this->getBody()->getSize();
-    }
-
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        return $this->getBody()->seek($offset, $whence);
-    }
-
-    public function read($length)
-    {
-        return $this->getBody()->read($length);
-    }
-
-    public function write($string)
-    {
-        return false;
-    }
-
-    public function getMetadata($key = null)
-    {
-        return $key ? null : [];
-    }
-
-    /**
-     * Return a stream object that is built from the POST fields and files.
-     *
-     * If one has already been created, the previously created stream will be
-     * returned.
-     */
-    private function getBody()
-    {
-        if ($this->body) {
-            return $this->body;
-        } elseif ($this->files || $this->forceMultipart) {
-            return $this->body = $this->createMultipart();
-        } elseif ($this->fields) {
-            return $this->body = $this->createUrlEncoded();
-        } else {
-            return $this->body = Stream::factory();
-        }
-    }
-
-    /**
-     * Get the aggregator used to join multi-valued field parameters
-     *
-     * @return callable
-     */
-    final protected function getAggregator()
-    {
-        if (!$this->aggregator) {
-            $this->aggregator = Query::phpAggregator();
-        }
-
-        return $this->aggregator;
-    }
-
-    /**
-     * Creates a multipart/form-data body stream
-     *
-     * @return MultipartBody
-     */
-    private function createMultipart()
-    {
-        // Flatten the nested query string values using the correct aggregator
-        return new MultipartBody(
-            call_user_func($this->getAggregator(), $this->fields),
-            $this->files
-        );
-    }
-
-    /**
-     * Creates an application/x-www-form-urlencoded stream body
-     *
-     * @return StreamInterface
-     */
-    private function createUrlEncoded()
-    {
-        return Stream::factory($this->getFields(true));
-    }
-
-    /**
-     * Get rid of any cached data
-     */
-    private function mutate()
-    {
-        $this->body = null;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Post/PostBodyInterface.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Post/PostBodyInterface.php
deleted file mode 100644
index c2ec9a62c5..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Post/PostBodyInterface.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-namespace GuzzleHttp\Post;
-
-use GuzzleHttp\Message\AppliesHeadersInterface;
-use GuzzleHttp\Stream\StreamInterface;
-
-/**
- * Represents a POST body that is sent as either a multipart/form-data stream
- * or application/x-www-urlencoded stream.
- */
-interface PostBodyInterface extends StreamInterface, \Countable, AppliesHeadersInterface
-{
-    /**
-     * Set a specific field
-     *
-     * @param string       $name  Name of the field to set
-     * @param string|array $value Value to set
-     */
-    public function setField($name, $value);
-
-    /**
-     * Set the aggregation strategy that will be used to turn multi-valued
-     * fields into a string.
-     *
-     * The aggregation function accepts a deeply nested array of query string
-     * values and returns a flattened associative array of key value pairs.
-     *
-     * @param callable $aggregator
-     */
-    public function setAggregator(callable $aggregator);
-
-    /**
-     * Set to true to force a multipart upload even if there are no files.
-     *
-     * @param bool $force Set to true to force multipart uploads or false to
-     *     remove this flag.
-     */
-    public function forceMultipartUpload($force);
-
-    /**
-     * Replace all existing form fields with an array of fields
-     *
-     * @param array $fields Associative array of fields to set
-     */
-    public function replaceFields(array $fields);
-
-    /**
-     * Get a specific field by name
-     *
-     * @param string $name Name of the POST field to retrieve
-     *
-     * @return string|null
-     */
-    public function getField($name);
-
-    /**
-     * Remove a field by name
-     *
-     * @param string $name Name of the field to remove
-     */
-    public function removeField($name);
-
-    /**
-     * Returns an associative array of names to values or a query string.
-     *
-     * @param bool $asString Set to true to retrieve the fields as a query
-     *     string.
-     *
-     * @return array|string
-     */
-    public function getFields($asString = false);
-
-    /**
-     * Returns true if a field is set
-     *
-     * @param string $name Name of the field to set
-     *
-     * @return bool
-     */
-    public function hasField($name);
-
-    /**
-     * Get all of the files
-     *
-     * @return array Returns an array of PostFileInterface objects
-     */
-    public function getFiles();
-
-    /**
-     * Get a POST file by name.
-     *
-     * @param string $name Name of the POST file to retrieve
-     *
-     * @return PostFileInterface|null
-     */
-    public function getFile($name);
-
-    /**
-     * Add a file to the POST
-     *
-     * @param PostFileInterface $file File to add
-     */
-    public function addFile(PostFileInterface $file);
-
-    /**
-     * Remove all files from the collection
-     */
-    public function clearFiles();
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Post/PostFile.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Post/PostFile.php
deleted file mode 100644
index e102c02430..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Post/PostFile.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-namespace GuzzleHttp\Post;
-
-use GuzzleHttp\Mimetypes;
-use GuzzleHttp\Stream\StreamInterface;
-use GuzzleHttp\Stream\Stream;
-
-/**
- * Post file upload
- */
-class PostFile implements PostFileInterface
-{
-    private $name;
-    private $filename;
-    private $content;
-    private $headers = [];
-
-    /**
-     * @param string          $name     Name of the form field
-     * @param mixed           $content  Data to send
-     * @param string|null     $filename Filename content-disposition attribute
-     * @param array           $headers  Array of headers to set on the file
-     *                                  (can override any default headers)
-     * @throws \RuntimeException when filename is not passed or can't be determined
-     */
-    public function __construct(
-        $name,
-        $content,
-        $filename = null,
-        array $headers = []
-    ) {
-        $this->headers = $headers;
-        $this->name = $name;
-        $this->prepareContent($content);
-        $this->prepareFilename($filename);
-        $this->prepareDefaultHeaders();
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function getFilename()
-    {
-        return $this->filename;
-    }
-
-    public function getContent()
-    {
-        return $this->content;
-    }
-
-    public function getHeaders()
-    {
-        return $this->headers;
-    }
-
-    /**
-     * Prepares the contents of a POST file.
-     *
-     * @param mixed $content Content of the POST file
-     */
-    private function prepareContent($content)
-    {
-        $this->content = $content;
-
-        if (!($this->content instanceof StreamInterface)) {
-            $this->content = Stream::factory($this->content);
-        } elseif ($this->content instanceof MultipartBody) {
-            if (!$this->hasHeader('Content-Disposition')) {
-                $disposition = 'form-data; name="' . $this->name .'"';
-                $this->headers['Content-Disposition'] = $disposition;
-            }
-
-            if (!$this->hasHeader('Content-Type')) {
-                $this->headers['Content-Type'] = sprintf(
-                    "multipart/form-data; boundary=%s",
-                    $this->content->getBoundary()
-                );
-            }
-        }
-    }
-
-    /**
-     * Applies a file name to the POST file based on various checks.
-     *
-     * @param string|null $filename Filename to apply (or null to guess)
-     */
-    private function prepareFilename($filename)
-    {
-        $this->filename = $filename;
-
-        if (!$this->filename) {
-            $this->filename = $this->content->getMetadata('uri');
-        }
-
-        if (!$this->filename || substr($this->filename, 0, 6) === 'php://') {
-            $this->filename = $this->name;
-        }
-    }
-
-    /**
-     * Applies default Content-Disposition and Content-Type headers if needed.
-     */
-    private function prepareDefaultHeaders()
-    {
-        // Set a default content-disposition header if one was no provided
-        if (!$this->hasHeader('Content-Disposition')) {
-            $this->headers['Content-Disposition'] = sprintf(
-                'form-data; name="%s"; filename="%s"',
-                $this->name,
-                basename($this->filename)
-            );
-        }
-
-        // Set a default Content-Type if one was not supplied
-        if (!$this->hasHeader('Content-Type')) {
-            $this->headers['Content-Type'] = Mimetypes::getInstance()
-                ->fromFilename($this->filename) ?: 'text/plain';
-        }
-    }
-
-    /**
-     * Check if a specific header exists on the POST file by name.
-     *
-     * @param string $name Case-insensitive header to check
-     *
-     * @return bool
-     */
-    private function hasHeader($name)
-    {
-        return isset(array_change_key_case($this->headers)[strtolower($name)]);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Post/PostFileInterface.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Post/PostFileInterface.php
deleted file mode 100644
index 2e816c0884..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Post/PostFileInterface.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-namespace GuzzleHttp\Post;
-
-use GuzzleHttp\Stream\StreamInterface;
-
-/**
- * Post file upload interface
- */
-interface PostFileInterface
-{
-    /**
-     * Get the name of the form field
-     *
-     * @return string
-     */
-    public function getName();
-
-    /**
-     * Get the full path to the file
-     *
-     * @return string
-     */
-    public function getFilename();
-
-    /**
-     * Get the content
-     *
-     * @return StreamInterface
-     */
-    public function getContent();
-
-    /**
-     * Gets all POST file headers.
-     *
-     * The keys represent the header name as it will be sent over the wire, and
-     * each value is a string.
-     *
-     * @return array Returns an associative array of the file's headers.
-     */
-    public function getHeaders();
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Query.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Query.php
deleted file mode 100644
index d053def6e9..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Query.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-/**
- * Manages query string variables and can aggregate them into a string
- */
-class Query extends Collection
-{
-    const RFC3986 = 'RFC3986';
-    const RFC1738 = 'RFC1738';
-
-    /** @var callable Encoding function */
-    private $encoding = 'rawurlencode';
-    /** @var callable */
-    private $aggregator;
-
-    /**
-     * Parse a query string into a Query object
-     *
-     * $urlEncoding is used to control how the query string is parsed and how
-     * it is ultimately serialized. The value can be set to one of the
-     * following:
-     *
-     * - true: (default) Parse query strings using RFC 3986 while still
-     *   converting "+" to " ".
-     * - false: Disables URL decoding of the input string and URL encoding when
-     *   the query string is serialized.
-     * - 'RFC3986': Use RFC 3986 URL encoding/decoding
-     * - 'RFC1738': Use RFC 1738 URL encoding/decoding
-     *
-     * @param string      $query       Query string to parse
-     * @param bool|string $urlEncoding Controls how the input string is decoded
-     *                                 and encoded.
-     * @return self
-     */
-    public static function fromString($query, $urlEncoding = true)
-    {
-        static $qp;
-        if (!$qp) {
-            $qp = new QueryParser();
-        }
-
-        $q = new static();
-
-        if ($urlEncoding !== true) {
-            $q->setEncodingType($urlEncoding);
-        }
-
-        $qp->parseInto($q, $query, $urlEncoding);
-
-        return $q;
-    }
-
-    /**
-     * Convert the query string parameters to a query string string
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        if (!$this->data) {
-            return '';
-        }
-
-        // The default aggregator is statically cached
-        static $defaultAggregator;
-
-        if (!$this->aggregator) {
-            if (!$defaultAggregator) {
-                $defaultAggregator = self::phpAggregator();
-            }
-            $this->aggregator = $defaultAggregator;
-        }
-
-        $result = '';
-        $aggregator = $this->aggregator;
-        $encoder = $this->encoding;
-
-        foreach ($aggregator($this->data) as $key => $values) {
-            foreach ($values as $value) {
-                if ($result) {
-                    $result .= '&';
-                }
-                $result .= $encoder($key);
-                if ($value !== null) {
-                    $result .= '=' . $encoder($value);
-                }
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Controls how multi-valued query string parameters are aggregated into a
-     * string.
-     *
-     *     $query->setAggregator($query::duplicateAggregator());
-     *
-     * @param callable $aggregator Callable used to convert a deeply nested
-     *     array of query string variables into a flattened array of key value
-     *     pairs. The callable accepts an array of query data and returns a
-     *     flattened array of key value pairs where each value is an array of
-     *     strings.
-     */
-    public function setAggregator(callable $aggregator)
-    {
-        $this->aggregator = $aggregator;
-    }
-
-    /**
-     * Specify how values are URL encoded
-     *
-     * @param string|bool $type One of 'RFC1738', 'RFC3986', or false to disable encoding
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setEncodingType($type)
-    {
-        switch ($type) {
-            case self::RFC3986:
-                $this->encoding = 'rawurlencode';
-                break;
-            case self::RFC1738:
-                $this->encoding = 'urlencode';
-                break;
-            case false:
-                $this->encoding = function ($v) { return $v; };
-                break;
-            default:
-                throw new \InvalidArgumentException('Invalid URL encoding type');
-        }
-    }
-
-    /**
-     * Query string aggregator that does not aggregate nested query string
-     * values and allows duplicates in the resulting array.
-     *
-     * Example: http://test.com?q=1&q=2
-     *
-     * @return callable
-     */
-    public static function duplicateAggregator()
-    {
-        return function (array $data) {
-            return self::walkQuery($data, '', function ($key, $prefix) {
-                return is_int($key) ? $prefix : "{$prefix}[{$key}]";
-            });
-        };
-    }
-
-    /**
-     * Aggregates nested query string variables using the same technique as
-     * ``http_build_query()``.
-     *
-     * @param bool $numericIndices Pass false to not include numeric indices
-     *     when multi-values query string parameters are present.
-     *
-     * @return callable
-     */
-    public static function phpAggregator($numericIndices = true)
-    {
-        return function (array $data) use ($numericIndices) {
-            return self::walkQuery(
-                $data,
-                '',
-                function ($key, $prefix) use ($numericIndices) {
-                    return !$numericIndices && is_int($key)
-                        ? "{$prefix}[]"
-                        : "{$prefix}[{$key}]";
-                }
-            );
-        };
-    }
-
-    /**
-     * Easily create query aggregation functions by providing a key prefix
-     * function to this query string array walker.
-     *
-     * @param array    $query     Query string to walk
-     * @param string   $keyPrefix Key prefix (start with '')
-     * @param callable $prefixer  Function used to create a key prefix
-     *
-     * @return array
-     */
-    public static function walkQuery(array $query, $keyPrefix, callable $prefixer)
-    {
-        $result = [];
-        foreach ($query as $key => $value) {
-            if ($keyPrefix) {
-                $key = $prefixer($key, $keyPrefix);
-            }
-            if (is_array($value)) {
-                $result += self::walkQuery($value, $key, $prefixer);
-            } elseif (isset($result[$key])) {
-                $result[$key][] = $value;
-            } else {
-                $result[$key] = array($value);
-            }
-        }
-
-        return $result;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/QueryParser.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/QueryParser.php
deleted file mode 100644
index 90727cc6cf..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/QueryParser.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-/**
- * Parses query strings into a Query object.
- *
- * While parsing, the parser will attempt to determine the most appropriate
- * query string aggregator to use when serializing the parsed query string
- * object back into a string. The hope is that parsing then serializing a
- * query string should be a lossless operation.
- *
- * @internal Use Query::fromString()
- */
-class QueryParser
-{
-    private $duplicates;
-    private $numericIndices;
-
-    /**
-     * Parse a query string into a Query object.
-     *
-     * @param Query       $query       Query object to populate
-     * @param string      $str         Query string to parse
-     * @param bool|string $urlEncoding How the query string is encoded
-     */
-    public function parseInto(Query $query, $str, $urlEncoding = true)
-    {
-        if ($str === '') {
-            return;
-        }
-
-        $result = [];
-        $this->duplicates = false;
-        $this->numericIndices = true;
-        $decoder = self::getDecoder($urlEncoding);
-
-        foreach (explode('&', $str) as $kvp) {
-
-            $parts = explode('=', $kvp, 2);
-            $key = $decoder($parts[0]);
-            $value = isset($parts[1]) ? $decoder($parts[1]) : null;
-
-            // Special handling needs to be taken for PHP nested array syntax
-            if (strpos($key, '[') !== false) {
-                $this->parsePhpValue($key, $value, $result);
-                continue;
-            }
-
-            if (!isset($result[$key])) {
-                $result[$key] = $value;
-            } else {
-                $this->duplicates = true;
-                if (!is_array($result[$key])) {
-                    $result[$key] = [$result[$key]];
-                }
-                $result[$key][] = $value;
-            }
-        }
-
-        $query->replace($result);
-
-        if (!$this->numericIndices) {
-            $query->setAggregator(Query::phpAggregator(false));
-        } elseif ($this->duplicates) {
-            $query->setAggregator(Query::duplicateAggregator());
-        }
-    }
-
-    /**
-     * Returns a callable that is used to URL decode query keys and values.
-     *
-     * @param string|bool $type One of true, false, RFC3986, and RFC1738
-     *
-     * @return callable|string
-     */
-    private static function getDecoder($type)
-    {
-        if ($type === true) {
-            return function ($value) {
-                return rawurldecode(str_replace('+', ' ', $value));
-            };
-        } elseif ($type == Query::RFC3986) {
-            return 'rawurldecode';
-        } elseif ($type == Query::RFC1738) {
-            return 'urldecode';
-        } else {
-            return function ($str) { return $str; };
-        }
-    }
-
-    /**
-     * Parses a PHP style key value pair.
-     *
-     * @param string      $key    Key to parse (e.g., "foo[a][b]")
-     * @param string|null $value  Value to set
-     * @param array       $result Result to modify by reference
-     */
-    private function parsePhpValue($key, $value, array &$result)
-    {
-        $node =& $result;
-        $keyBuffer = '';
-
-        for ($i = 0, $t = strlen($key); $i < $t; $i++) {
-            switch ($key[$i]) {
-                case '[':
-                    if ($keyBuffer) {
-                        $this->prepareNode($node, $keyBuffer);
-                        $node =& $node[$keyBuffer];
-                        $keyBuffer = '';
-                    }
-                    break;
-                case ']':
-                    $k = $this->cleanKey($node, $keyBuffer);
-                    $this->prepareNode($node, $k);
-                    $node =& $node[$k];
-                    $keyBuffer = '';
-                    break;
-                default:
-                    $keyBuffer .= $key[$i];
-                    break;
-            }
-        }
-
-        if (isset($node)) {
-            $this->duplicates = true;
-            $node[] = $value;
-        } else {
-            $node = $value;
-        }
-    }
-
-    /**
-     * Prepares a value in the array at the given key.
-     *
-     * If the key already exists, the key value is converted into an array.
-     *
-     * @param array  $node Result node to modify
-     * @param string $key  Key to add or modify in the node
-     */
-    private function prepareNode(&$node, $key)
-    {
-        if (!isset($node[$key])) {
-            $node[$key] = null;
-        } elseif (!is_array($node[$key])) {
-            $node[$key] = [$node[$key]];
-        }
-    }
-
-    /**
-     * Returns the appropriate key based on the node and key.
-     */
-    private function cleanKey($node, $key)
-    {
-        if ($key === '') {
-            $key = $node ? (string) count($node) : 0;
-            // Found a [] key, so track this to ensure that we disable numeric
-            // indexing of keys in the resolved query aggregator.
-            $this->numericIndices = false;
-        }
-
-        return $key;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/RequestFsm.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/RequestFsm.php
deleted file mode 100644
index b37c190d43..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/RequestFsm.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-use GuzzleHttp\Event\BeforeEvent;
-use GuzzleHttp\Event\ErrorEvent;
-use GuzzleHttp\Event\CompleteEvent;
-use GuzzleHttp\Event\EndEvent;
-use GuzzleHttp\Exception\StateException;
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Message\FutureResponse;
-use GuzzleHttp\Message\MessageFactoryInterface;
-use GuzzleHttp\Ring\Future\FutureInterface;
-
-/**
- * Responsible for transitioning requests through lifecycle events.
- */
-class RequestFsm
-{
-    private $handler;
-    private $mf;
-    private $maxTransitions;
-
-    public function __construct(
-        callable $handler,
-        MessageFactoryInterface $messageFactory,
-        $maxTransitions = 200
-    ) {
-        $this->mf = $messageFactory;
-        $this->maxTransitions = $maxTransitions;
-        $this->handler = $handler;
-    }
-
-    /**
-     * Runs the state machine until a terminal state is entered or the
-     * optionally supplied $finalState is entered.
-     *
-     * @param Transaction $trans      Transaction being transitioned.
-     *
-     * @throws \Exception if a terminal state throws an exception.
-     */
-    public function __invoke(Transaction $trans)
-    {
-        $trans->_transitionCount = 0;
-
-        if (!$trans->state) {
-            $trans->state = 'before';
-        }
-
-        transition:
-
-        if (++$trans->_transitionCount > $this->maxTransitions) {
-            throw new StateException("Too many state transitions were "
-                . "encountered ({$trans->_transitionCount}). This likely "
-                . "means that a combination of event listeners are in an "
-                . "infinite loop.");
-        }
-
-        switch ($trans->state) {
-            case 'before': goto before;
-            case 'complete': goto complete;
-            case 'error': goto error;
-            case 'retry': goto retry;
-            case 'send': goto send;
-            case 'end': goto end;
-            default: throw new StateException("Invalid state: {$trans->state}");
-        }
-
-        before: {
-            try {
-                $trans->request->getEmitter()->emit('before', new BeforeEvent($trans));
-                $trans->state = 'send';
-                if ((bool) $trans->response) {
-                    $trans->state = 'complete';
-                }
-            } catch (\Exception $e) {
-                $trans->state = 'error';
-                $trans->exception = $e;
-            }
-            goto transition;
-        }
-
-        complete: {
-            try {
-                if ($trans->response instanceof FutureInterface) {
-                    // Futures will have their own end events emitted when
-                    // dereferenced.
-                    return;
-                }
-                $trans->state = 'end';
-                $trans->response->setEffectiveUrl($trans->request->getUrl());
-                $trans->request->getEmitter()->emit('complete', new CompleteEvent($trans));
-            } catch (\Exception $e) {
-                $trans->state = 'error';
-                $trans->exception = $e;
-            }
-            goto transition;
-        }
-
-        error: {
-            try {
-                // Convert non-request exception to a wrapped exception
-                $trans->exception = RequestException::wrapException(
-                    $trans->request, $trans->exception
-                );
-                $trans->state = 'end';
-                $trans->request->getEmitter()->emit('error', new ErrorEvent($trans));
-                // An intercepted request (not retried) transitions to complete
-                if (!$trans->exception && $trans->state !== 'retry') {
-                    $trans->state = 'complete';
-                }
-            } catch (\Exception $e) {
-                $trans->state = 'end';
-                $trans->exception = $e;
-            }
-            goto transition;
-        }
-
-        retry: {
-            $trans->retries++;
-            $trans->response = null;
-            $trans->exception = null;
-            $trans->state = 'before';
-            goto transition;
-        }
-
-        send: {
-            $fn = $this->handler;
-            $trans->response = FutureResponse::proxy(
-                $fn(RingBridge::prepareRingRequest($trans)),
-                function ($value) use ($trans) {
-                    RingBridge::completeRingResponse($trans, $value, $this->mf, $this);
-                    $this($trans);
-                    return $trans->response;
-                }
-            );
-            return;
-        }
-
-        end: {
-            $trans->request->getEmitter()->emit('end', new EndEvent($trans));
-            // Throw exceptions in the terminal event if the exception
-            // was not handled by an "end" event listener.
-            if ($trans->exception) {
-                if (!($trans->exception instanceof RequestException)) {
-                    $trans->exception = RequestException::wrapException(
-                        $trans->request, $trans->exception
-                    );
-                }
-                throw $trans->exception;
-            }
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/RingBridge.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/RingBridge.php
deleted file mode 100644
index bc6841d42b..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/RingBridge.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-use GuzzleHttp\Message\MessageFactoryInterface;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Event\ProgressEvent;
-use GuzzleHttp\Message\Request;
-use GuzzleHttp\Ring\Core;
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Exception\RequestException;
-
-/**
- * Provides the bridge between Guzzle requests and responses and Guzzle Ring.
- */
-class RingBridge
-{
-    /**
-     * Creates a Ring request from a request object.
-     *
-     * This function does not hook up the "then" and "progress" events that
-     * would be required for actually sending a Guzzle request through a
-     * RingPHP handler.
-     *
-     * @param RequestInterface $request Request to convert.
-     *
-     * @return array Converted Guzzle Ring request.
-     */
-    public static function createRingRequest(RequestInterface $request)
-    {
-        $options = $request->getConfig()->toArray();
-        $url = $request->getUrl();
-        // No need to calculate the query string twice (in URL and query).
-        $qs = ($pos = strpos($url, '?')) ? substr($url, $pos + 1) : null;
-
-        return [
-            'scheme'       => $request->getScheme(),
-            'http_method'  => $request->getMethod(),
-            'url'          => $url,
-            'uri'          => $request->getPath(),
-            'headers'      => $request->getHeaders(),
-            'body'         => $request->getBody(),
-            'version'      => $request->getProtocolVersion(),
-            'client'       => $options,
-            'query_string' => $qs,
-            'future'       => isset($options['future']) ? $options['future'] : false
-        ];
-    }
-
-    /**
-     * Creates a Ring request from a request object AND prepares the callbacks.
-     *
-     * @param Transaction $trans Transaction to update.
-     *
-     * @return array Converted Guzzle Ring request.
-     */
-    public static function prepareRingRequest(Transaction $trans)
-    {
-        // Clear out the transaction state when initiating.
-        $trans->exception = null;
-        $request = self::createRingRequest($trans->request);
-
-        // Emit progress events if any progress listeners are registered.
-        if ($trans->request->getEmitter()->hasListeners('progress')) {
-            $emitter = $trans->request->getEmitter();
-            $request['client']['progress'] = function ($a, $b, $c, $d) use ($trans, $emitter) {
-                $emitter->emit('progress', new ProgressEvent($trans, $a, $b, $c, $d));
-            };
-        }
-
-        return $request;
-    }
-
-    /**
-     * Handles the process of processing a response received from a ring
-     * handler. The created response is added to the transaction, and the
-     * transaction stat is set appropriately.
-     *
-     * @param Transaction             $trans          Owns request and response.
-     * @param array                   $response       Ring response array
-     * @param MessageFactoryInterface $messageFactory Creates response objects.
-     */
-    public static function completeRingResponse(
-        Transaction $trans,
-        array $response,
-        MessageFactoryInterface $messageFactory
-    ) {
-        $trans->state = 'complete';
-        $trans->transferInfo = isset($response['transfer_stats'])
-            ? $response['transfer_stats'] : [];
-
-        if (!empty($response['status'])) {
-            $options = [];
-            if (isset($response['version'])) {
-                $options['protocol_version'] = $response['version'];
-            }
-            if (isset($response['reason'])) {
-                $options['reason_phrase'] = $response['reason'];
-            }
-            $trans->response = $messageFactory->createResponse(
-                $response['status'],
-                isset($response['headers']) ? $response['headers'] : [],
-                isset($response['body']) ? $response['body'] : null,
-                $options
-            );
-            if (isset($response['effective_url'])) {
-                $trans->response->setEffectiveUrl($response['effective_url']);
-            }
-        } elseif (empty($response['error'])) {
-            // When nothing was returned, then we need to add an error.
-            $response['error'] = self::getNoRingResponseException($trans->request);
-        }
-
-        if (isset($response['error'])) {
-            $trans->state = 'error';
-            $trans->exception = $response['error'];
-        }
-    }
-
-    /**
-     * Creates a Guzzle request object using a ring request array.
-     *
-     * @param array $request Ring request
-     *
-     * @return Request
-     * @throws \InvalidArgumentException for incomplete requests.
-     */
-    public static function fromRingRequest(array $request)
-    {
-        $options = [];
-        if (isset($request['version'])) {
-            $options['protocol_version'] = $request['version'];
-        }
-
-        if (!isset($request['http_method'])) {
-            throw new \InvalidArgumentException('No http_method');
-        }
-
-        return new Request(
-            $request['http_method'],
-            Core::url($request),
-            isset($request['headers']) ? $request['headers'] : [],
-            isset($request['body']) ? Stream::factory($request['body']) : null,
-            $options
-        );
-    }
-
-    /**
-     * Get an exception that can be used when a RingPHP handler does not
-     * populate a response.
-     *
-     * @param RequestInterface $request
-     *
-     * @return RequestException
-     */
-    public static function getNoRingResponseException(RequestInterface $request)
-    {
-        $message = <<<EOT
-Sending the request did not return a response, exception, or populate the
-transaction with a response. This is most likely due to an incorrectly
-implemented RingPHP handler. If you are simply trying to mock responses,
-then it is recommended to use the GuzzleHttp\Ring\Client\MockHandler.
-EOT;
-        return new RequestException($message, $request);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Subscriber/Cookie.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Subscriber/Cookie.php
deleted file mode 100644
index cacabb66d7..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Subscriber/Cookie.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-namespace GuzzleHttp\Subscriber;
-
-use GuzzleHttp\Cookie\CookieJar;
-use GuzzleHttp\Cookie\CookieJarInterface;
-use GuzzleHttp\Event\BeforeEvent;
-use GuzzleHttp\Event\CompleteEvent;
-use GuzzleHttp\Event\RequestEvents;
-use GuzzleHttp\Event\SubscriberInterface;
-
-/**
- * Adds, extracts, and persists cookies between HTTP requests
- */
-class Cookie implements SubscriberInterface
-{
-    /** @var CookieJarInterface */
-    private $cookieJar;
-
-    /**
-     * @param CookieJarInterface $cookieJar Cookie jar used to hold cookies
-     */
-    public function __construct(CookieJarInterface $cookieJar = null)
-    {
-        $this->cookieJar = $cookieJar ?: new CookieJar();
-    }
-
-    public function getEvents()
-    {
-        // Fire the cookie plugin complete event before redirecting
-        return [
-            'before'   => ['onBefore'],
-            'complete' => ['onComplete', RequestEvents::REDIRECT_RESPONSE + 10]
-        ];
-    }
-
-    /**
-     * Get the cookie cookieJar
-     *
-     * @return CookieJarInterface
-     */
-    public function getCookieJar()
-    {
-        return $this->cookieJar;
-    }
-
-    public function onBefore(BeforeEvent $event)
-    {
-        $this->cookieJar->addCookieHeader($event->getRequest());
-    }
-
-    public function onComplete(CompleteEvent $event)
-    {
-        $this->cookieJar->extractCookies(
-            $event->getRequest(),
-            $event->getResponse()
-        );
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Subscriber/History.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Subscriber/History.php
deleted file mode 100644
index 5cf06119f6..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Subscriber/History.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-namespace GuzzleHttp\Subscriber;
-
-use GuzzleHttp\Event\CompleteEvent;
-use GuzzleHttp\Event\ErrorEvent;
-use GuzzleHttp\Event\RequestEvents;
-use GuzzleHttp\Event\SubscriberInterface;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Message\ResponseInterface;
-
-/**
- * Maintains a list of requests and responses sent using a request or client
- */
-class History implements SubscriberInterface, \IteratorAggregate, \Countable
-{
-    /** @var int The maximum number of requests to maintain in the history */
-    private $limit;
-
-    /** @var array Requests and responses that have passed through the plugin */
-    private $transactions = [];
-
-    public function __construct($limit = 10)
-    {
-        $this->limit = $limit;
-    }
-
-    public function getEvents()
-    {
-        return [
-            'complete' => ['onComplete', RequestEvents::EARLY],
-            'error'    => ['onError', RequestEvents::EARLY],
-        ];
-    }
-
-    /**
-     * Convert to a string that contains all request and response headers
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        $lines = array();
-        foreach ($this->transactions as $entry) {
-            $response = isset($entry['response']) ? $entry['response'] : '';
-            $lines[] = '> ' . trim($entry['sent_request'])
-                . "\n\n< " . trim($response) . "\n";
-        }
-
-        return implode("\n", $lines);
-    }
-
-    public function onComplete(CompleteEvent $event)
-    {
-        $this->add($event->getRequest(), $event->getResponse());
-    }
-
-    public function onError(ErrorEvent $event)
-    {
-        // Only track when no response is present, meaning this didn't ever
-        // emit a complete event
-        if (!$event->getResponse()) {
-            $this->add($event->getRequest());
-        }
-    }
-
-    /**
-     * Returns an Iterator that yields associative array values where each
-     * associative array contains the following key value pairs:
-     *
-     * - request: Representing the actual request that was received.
-     * - sent_request: A clone of the request that will not be mutated.
-     * - response: The response that was received (if available).
-     *
-     * @return \Iterator
-     */
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->transactions);
-    }
-
-    /**
-     * Get all of the requests sent through the plugin.
-     *
-     * Requests can be modified after they are logged by the history
-     * subscriber. By default this method will return the actual request
-     * instances that were received. Pass true to this method if you wish to
-     * get copies of the requests that represent the request state when it was
-     * initially logged by the history subscriber.
-     *
-     * @param bool $asSent Set to true to get clones of the requests that have
-     *                     not been mutated since the request was received by
-     *                     the history subscriber.
-     *
-     * @return RequestInterface[]
-     */
-    public function getRequests($asSent = false)
-    {
-        return array_map(function ($t) use ($asSent) {
-            return $asSent ? $t['sent_request'] : $t['request'];
-        }, $this->transactions);
-    }
-
-    /**
-     * Get the number of requests in the history
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->transactions);
-    }
-
-    /**
-     * Get the last request sent.
-     *
-     * Requests can be modified after they are logged by the history
-     * subscriber. By default this method will return the actual request
-     * instance that was received. Pass true to this method if you wish to get
-     * a copy of the request that represents the request state when it was
-     * initially logged by the history subscriber.
-     *
-     * @param bool $asSent Set to true to get a clone of the last request that
-     *                     has not been mutated since the request was received
-     *                     by the history subscriber.
-     *
-     * @return RequestInterface
-     */
-    public function getLastRequest($asSent = false)
-    {
-        return $asSent
-            ? end($this->transactions)['sent_request']
-            : end($this->transactions)['request'];
-    }
-
-    /**
-     * Get the last response in the history
-     *
-     * @return ResponseInterface|null
-     */
-    public function getLastResponse()
-    {
-        return end($this->transactions)['response'];
-    }
-
-    /**
-     * Clears the history
-     */
-    public function clear()
-    {
-        $this->transactions = array();
-    }
-
-    /**
-     * Add a request to the history
-     *
-     * @param RequestInterface  $request  Request to add
-     * @param ResponseInterface $response Response of the request
-     */
-    private function add(
-        RequestInterface $request,
-        ResponseInterface $response = null
-    ) {
-        $this->transactions[] = [
-            'request'      => $request,
-            'sent_request' => clone $request,
-            'response'     => $response
-        ];
-        if (count($this->transactions) > $this->limit) {
-            array_shift($this->transactions);
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Subscriber/HttpError.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Subscriber/HttpError.php
deleted file mode 100644
index ed9de5bcc0..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Subscriber/HttpError.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-namespace GuzzleHttp\Subscriber;
-
-use GuzzleHttp\Event\CompleteEvent;
-use GuzzleHttp\Event\RequestEvents;
-use GuzzleHttp\Event\SubscriberInterface;
-use GuzzleHttp\Exception\RequestException;
-
-/**
- * Throws exceptions when a 4xx or 5xx response is received
- */
-class HttpError implements SubscriberInterface
-{
-    public function getEvents()
-    {
-        return ['complete' => ['onComplete', RequestEvents::VERIFY_RESPONSE]];
-    }
-
-    /**
-     * Throw a RequestException on an HTTP protocol error
-     *
-     * @param CompleteEvent $event Emitted event
-     * @throws RequestException
-     */
-    public function onComplete(CompleteEvent $event)
-    {
-        $code = (string) $event->getResponse()->getStatusCode();
-        // Throw an exception for an unsuccessful response
-        if ($code[0] >= 4) {
-            throw RequestException::create(
-                $event->getRequest(),
-                $event->getResponse()
-            );
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Subscriber/Mock.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Subscriber/Mock.php
deleted file mode 100644
index 2af4d3758d..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Subscriber/Mock.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-namespace GuzzleHttp\Subscriber;
-
-use GuzzleHttp\Event\RequestEvents;
-use GuzzleHttp\Event\SubscriberInterface;
-use GuzzleHttp\Event\BeforeEvent;
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\Message\MessageFactory;
-use GuzzleHttp\Message\ResponseInterface;
-use GuzzleHttp\Stream\StreamInterface;
-
-/**
- * Queues mock responses or exceptions and delivers mock responses or
- * exceptions in a fifo order.
- */
-class Mock implements SubscriberInterface, \Countable
-{
-    /** @var array Array of mock responses / exceptions */
-    private $queue = [];
-
-    /** @var bool Whether or not to consume an entity body when mocking */
-    private $readBodies;
-
-    /** @var MessageFactory */
-    private $factory;
-
-    /**
-     * @param array $items      Array of responses or exceptions to queue
-     * @param bool  $readBodies Set to false to not consume the entity body of
-     *                          a request when a mock is served.
-     */
-    public function __construct(array $items = [], $readBodies = true)
-    {
-        $this->factory = new MessageFactory();
-        $this->readBodies = $readBodies;
-        $this->addMultiple($items);
-    }
-
-    public function getEvents()
-    {
-        // Fire the event last, after signing
-        return ['before' => ['onBefore', RequestEvents::SIGN_REQUEST - 10]];
-    }
-
-    /**
-     * @throws \OutOfBoundsException|\Exception
-     */
-    public function onBefore(BeforeEvent $event)
-    {
-        if (!$item = array_shift($this->queue)) {
-            throw new \OutOfBoundsException('Mock queue is empty');
-        } elseif ($item instanceof RequestException) {
-            throw $item;
-        }
-
-        // Emulate reading a response body
-        $request = $event->getRequest();
-        if ($this->readBodies && $request->getBody()) {
-            while (!$request->getBody()->eof()) {
-                $request->getBody()->read(8096);
-            }
-        }
-
-        $saveTo = $event->getRequest()->getConfig()->get('save_to');
-
-        if (null !== $saveTo) {
-            $body = $item->getBody();
-
-            if (is_resource($saveTo)) {
-                fwrite($saveTo, $body);
-            } elseif (is_string($saveTo)) {
-                file_put_contents($saveTo, $body);
-            } elseif ($saveTo instanceof StreamInterface) {
-                $saveTo->write($body);
-            }
-        }
-
-        $event->intercept($item);
-    }
-
-    public function count()
-    {
-        return count($this->queue);
-    }
-
-    /**
-     * Add a response to the end of the queue
-     *
-     * @param string|ResponseInterface $response Response or path to response file
-     *
-     * @return self
-     * @throws \InvalidArgumentException if a string or Response is not passed
-     */
-    public function addResponse($response)
-    {
-        if (is_string($response)) {
-            $response = file_exists($response)
-                ? $this->factory->fromMessage(file_get_contents($response))
-                : $this->factory->fromMessage($response);
-        } elseif (!($response instanceof ResponseInterface)) {
-            throw new \InvalidArgumentException('Response must a message '
-                . 'string, response object, or path to a file');
-        }
-
-        $this->queue[] = $response;
-
-        return $this;
-    }
-
-    /**
-     * Add an exception to the end of the queue
-     *
-     * @param RequestException $e Exception to throw when the request is executed
-     *
-     * @return self
-     */
-    public function addException(RequestException $e)
-    {
-        $this->queue[] = $e;
-
-        return $this;
-    }
-
-    /**
-     * Add multiple items to the queue
-     *
-     * @param array $items Items to add
-     */
-    public function addMultiple(array $items)
-    {
-        foreach ($items as $item) {
-            if ($item instanceof RequestException) {
-                $this->addException($item);
-            } else {
-                $this->addResponse($item);
-            }
-        }
-    }
-
-    /**
-     * Clear the queue
-     */
-    public function clearQueue()
-    {
-        $this->queue = [];
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Subscriber/Prepare.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Subscriber/Prepare.php
deleted file mode 100644
index b5ed4e2609..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Subscriber/Prepare.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-namespace GuzzleHttp\Subscriber;
-
-use GuzzleHttp\Event\BeforeEvent;
-use GuzzleHttp\Event\RequestEvents;
-use GuzzleHttp\Event\SubscriberInterface;
-use GuzzleHttp\Message\AppliesHeadersInterface;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Mimetypes;
-use GuzzleHttp\Stream\StreamInterface;
-
-/**
- * Prepares requests with a body before sending
- *
- * **Request Options**
- *
- * - expect: Set to true to enable the "Expect: 100-Continue" header for a
- *   request that send a body. Set to false to disable "Expect: 100-Continue".
- *   Set to a number so that the size of the payload must be greater than the
- *   number in order to send the Expect header. Setting to a number will send
- *   the Expect header for all requests in which the size of the payload cannot
- *   be determined or where the body is not rewindable.
- */
-class Prepare implements SubscriberInterface
-{
-    public function getEvents()
-    {
-        return ['before' => ['onBefore', RequestEvents::PREPARE_REQUEST]];
-    }
-
-    public function onBefore(BeforeEvent $event)
-    {
-        $request = $event->getRequest();
-
-        // Set the appropriate Content-Type for a request if one is not set and
-        // there are form fields
-        if (!($body = $request->getBody())) {
-            return;
-        }
-
-        $this->addContentLength($request, $body);
-
-        if ($body instanceof AppliesHeadersInterface) {
-            // Synchronize the body with the request headers
-            $body->applyRequestHeaders($request);
-        } elseif (!$request->hasHeader('Content-Type')) {
-            $this->addContentType($request, $body);
-        }
-
-        $this->addExpectHeader($request, $body);
-    }
-
-    private function addContentType(
-        RequestInterface $request,
-        StreamInterface $body
-    ) {
-        if (!($uri = $body->getMetadata('uri'))) {
-            return;
-        }
-
-        // Guess the content-type based on the stream's "uri" metadata value.
-        // The file extension is used to determine the appropriate mime-type.
-        if ($contentType = Mimetypes::getInstance()->fromFilename($uri)) {
-            $request->setHeader('Content-Type', $contentType);
-        }
-    }
-
-    private function addContentLength(
-        RequestInterface $request,
-        StreamInterface $body
-    ) {
-        // Set the Content-Length header if it can be determined, and never
-        // send a Transfer-Encoding: chunked and Content-Length header in
-        // the same request.
-        if ($request->hasHeader('Content-Length')) {
-            // Remove transfer-encoding if content-length is set.
-            $request->removeHeader('Transfer-Encoding');
-            return;
-        }
-
-        if ($request->hasHeader('Transfer-Encoding')) {
-            return;
-        }
-
-        if (null !== ($size = $body->getSize())) {
-            $request->setHeader('Content-Length', $size);
-            $request->removeHeader('Transfer-Encoding');
-        } elseif ('1.1' == $request->getProtocolVersion()) {
-            // Use chunked Transfer-Encoding if there is no determinable
-            // content-length header and we're using HTTP/1.1.
-            $request->setHeader('Transfer-Encoding', 'chunked');
-            $request->removeHeader('Content-Length');
-        }
-    }
-
-    private function addExpectHeader(
-        RequestInterface $request,
-        StreamInterface $body
-    ) {
-        // Determine if the Expect header should be used
-        if ($request->hasHeader('Expect')) {
-            return;
-        }
-
-        $expect = $request->getConfig()['expect'];
-
-        // Return if disabled or if you're not using HTTP/1.1
-        if ($expect === false || $request->getProtocolVersion() !== '1.1') {
-            return;
-        }
-
-        // The expect header is unconditionally enabled
-        if ($expect === true) {
-            $request->setHeader('Expect', '100-Continue');
-            return;
-        }
-
-        // By default, send the expect header when the payload is > 1mb
-        if ($expect === null) {
-            $expect = 1048576;
-        }
-
-        // Always add if the body cannot be rewound, the size cannot be
-        // determined, or the size is greater than the cutoff threshold
-        $size = $body->getSize();
-        if ($size === null || $size >= (int) $expect || !$body->isSeekable()) {
-            $request->setHeader('Expect', '100-Continue');
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Subscriber/Redirect.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Subscriber/Redirect.php
deleted file mode 100644
index ff992268bb..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Subscriber/Redirect.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-namespace GuzzleHttp\Subscriber;
-
-use GuzzleHttp\Event\CompleteEvent;
-use GuzzleHttp\Event\RequestEvents;
-use GuzzleHttp\Event\SubscriberInterface;
-use GuzzleHttp\Exception\BadResponseException;
-use GuzzleHttp\Exception\CouldNotRewindStreamException;
-use GuzzleHttp\Exception\TooManyRedirectsException;
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Message\ResponseInterface;
-use GuzzleHttp\Url;
-
-/**
- * Subscriber used to implement HTTP redirects.
- *
- * **Request options**
- *
- * - redirect: Associative array containing the 'max', 'strict', and 'referer'
- *   keys.
- *
- *   - max: Maximum number of redirects allowed per-request
- *   - strict: You can use strict redirects by setting this value to ``true``.
- *     Strict redirects adhere to strict RFC compliant redirection (e.g.,
- *     redirect POST with POST) vs doing what most clients do (e.g., redirect
- *     POST request with a GET request).
- *   - referer: Set to true to automatically add the "Referer" header when a
- *     redirect request is sent.
- *   - protocols: Array of allowed protocols. Defaults to 'http' and 'https'.
- *     When a redirect attempts to utilize a protocol that is not white listed,
- *     an exception is thrown.
- */
-class Redirect implements SubscriberInterface
-{
-    public function getEvents()
-    {
-        return ['complete' => ['onComplete', RequestEvents::REDIRECT_RESPONSE]];
-    }
-
-    /**
-     * Rewind the entity body of the request if needed
-     *
-     * @param RequestInterface $redirectRequest
-     * @throws CouldNotRewindStreamException
-     */
-    public static function rewindEntityBody(RequestInterface $redirectRequest)
-    {
-        // Rewind the entity body of the request if needed
-        if ($body = $redirectRequest->getBody()) {
-            // Only rewind the body if some of it has been read already, and
-            // throw an exception if the rewind fails
-            if ($body->tell() && !$body->seek(0)) {
-                throw new CouldNotRewindStreamException(
-                    'Unable to rewind the non-seekable request body after redirecting',
-                    $redirectRequest
-                );
-            }
-        }
-    }
-
-    /**
-     * Called when a request receives a redirect response
-     *
-     * @param CompleteEvent $event Event emitted
-     * @throws TooManyRedirectsException
-     */
-    public function onComplete(CompleteEvent $event)
-    {
-        $response = $event->getResponse();
-
-        if (substr($response->getStatusCode(), 0, 1) != '3'
-            || !$response->hasHeader('Location')
-        ) {
-            return;
-        }
-
-        $request = $event->getRequest();
-        $config = $request->getConfig();
-
-        // Increment the redirect and initialize the redirect state.
-        if ($redirectCount = $config['redirect_count']) {
-            $config['redirect_count'] = ++$redirectCount;
-        } else {
-            $config['redirect_scheme'] = $request->getScheme();
-            $config['redirect_count'] = $redirectCount = 1;
-        }
-
-        $max = $config->getPath('redirect/max') ?: 5;
-
-        if ($redirectCount > $max) {
-            throw new TooManyRedirectsException(
-                "Will not follow more than {$redirectCount} redirects",
-                $request
-            );
-        }
-
-        $this->modifyRedirectRequest($request, $response);
-        $event->retry();
-    }
-
-    private function modifyRedirectRequest(
-        RequestInterface $request,
-        ResponseInterface $response
-    ) {
-        $config = $request->getConfig();
-        $protocols = $config->getPath('redirect/protocols') ?: ['http', 'https'];
-
-        // Use a GET request if this is an entity enclosing request and we are
-        // not forcing RFC compliance, but rather emulating what all browsers
-        // would do.
-        $statusCode = $response->getStatusCode();
-        if ($statusCode == 303 ||
-            ($statusCode <= 302 && $request->getBody() && !$config->getPath('redirect/strict'))
-        ) {
-            $request->setMethod('GET');
-            $request->setBody(null);
-        }
-
-        $previousUrl = $request->getUrl();
-        $this->setRedirectUrl($request, $response, $protocols);
-        $this->rewindEntityBody($request);
-
-        // Add the Referer header if it is told to do so and only
-        // add the header if we are not redirecting from https to http.
-        if ($config->getPath('redirect/referer')
-            && ($request->getScheme() == 'https' || $request->getScheme() == $config['redirect_scheme'])
-        ) {
-            $url = Url::fromString($previousUrl);
-            $url->setUsername(null);
-            $url->setPassword(null);
-            $request->setHeader('Referer', (string) $url);
-        } else {
-            $request->removeHeader('Referer');
-        }
-    }
-
-    /**
-     * Set the appropriate URL on the request based on the location header
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @param array             $protocols
-     */
-    private function setRedirectUrl(
-        RequestInterface $request,
-        ResponseInterface $response,
-        array $protocols
-    ) {
-        $location = $response->getHeader('Location');
-        $location = Url::fromString($location);
-
-        // Combine location with the original URL if it is not absolute.
-        if (!$location->isAbsolute()) {
-            $originalUrl = Url::fromString($request->getUrl());
-            // Remove query string parameters and just take what is present on
-            // the redirect Location header
-            $originalUrl->getQuery()->clear();
-            $location = $originalUrl->combine($location);
-        }
-
-        // Ensure that the redirect URL is allowed based on the protocols.
-        if (!in_array($location->getScheme(), $protocols)) {
-            throw new BadResponseException(
-                sprintf(
-                    'Redirect URL, %s, does not use one of the allowed redirect protocols: %s',
-                    $location,
-                    implode(', ', $protocols)
-                ),
-                $request,
-                $response
-            );
-        }
-
-        $request->setUrl($location);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/ToArrayInterface.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/ToArrayInterface.php
deleted file mode 100644
index d57c0229a4..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/ToArrayInterface.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-/**
- * An object that can be represented as an array
- */
-interface ToArrayInterface
-{
-    /**
-     * Get the array representation of an object
-     *
-     * @return array
-     */
-    public function toArray();
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Transaction.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Transaction.php
deleted file mode 100644
index 30a3f94691..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Transaction.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-use GuzzleHttp\Message\RequestInterface;
-use GuzzleHttp\Message\ResponseInterface;
-
-/**
- * Represents the relationship between a client, request, and response.
- *
- * You can access the request, response, and client using their corresponding
- * public properties.
- */
-class Transaction
-{
-    /**
-     * HTTP client used to transfer the request.
-     *
-     * @var ClientInterface
-     */
-    public $client;
-
-    /**
-     * The request that is being sent.
-     *
-     * @var RequestInterface
-     */
-    public $request;
-
-    /**
-     * The response associated with the transaction. A response will not be
-     * present when a networking error occurs or an error occurs before sending
-     * the request.
-     *
-     * @var ResponseInterface|null
-     */
-    public $response;
-
-    /**
-     * Exception associated with the transaction. If this exception is present
-     * when processing synchronous or future commands, then it is thrown. When
-     * intercepting a failed transaction, you MUST set this value to null in
-     * order to prevent the exception from being thrown.
-     *
-     * @var \Exception
-     */
-    public $exception;
-
-    /**
-     * Associative array of handler specific transfer statistics and custom
-     * key value pair information. When providing similar information, handlers
-     * should follow the same key value pair naming conventions as PHP's
-     * curl_getinfo() (http://php.net/manual/en/function.curl-getinfo.php).
-     *
-     * @var array
-     */
-    public $transferInfo = [];
-
-    /**
-     * The number of transaction retries.
-     *
-     * @var int
-     */
-    public $retries = 0;
-
-    /**
-     * The transaction's current state.
-     *
-     * @var string
-     */
-    public $state;
-
-    /**
-     * Whether or not this is a future transaction. This value should not be
-     * changed after the future is constructed.
-     *
-     * @var bool
-     */
-    public $future;
-
-    /**
-     * The number of state transitions that this transaction has been through.
-     *
-     * @var int
-     * @internal This is for internal use only. If you modify this, then you
-     *           are asking for trouble.
-     */
-    public $_transitionCount = 0;
-
-    /**
-     * @param ClientInterface  $client  Client that is used to send the requests
-     * @param RequestInterface $request Request to send
-     * @param bool             $future  Whether or not this is a future request.
-     */
-    public function __construct(
-        ClientInterface $client,
-        RequestInterface $request,
-        $future = false
-    ) {
-        $this->client = $client;
-        $this->request = $request;
-        $this->_future = $future;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/UriTemplate.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/UriTemplate.php
deleted file mode 100644
index 55dfeb5a4c..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/UriTemplate.php
+++ /dev/null
@@ -1,241 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-/**
- * Expands URI templates. Userland implementation of PECL uri_template.
- *
- * @link http://tools.ietf.org/html/rfc6570
- */
-class UriTemplate
-{
-    /** @var string URI template */
-    private $template;
-
-    /** @var array Variables to use in the template expansion */
-    private $variables;
-
-    /** @var array Hash for quick operator lookups */
-    private static $operatorHash = array(
-        ''  => array('prefix' => '',  'joiner' => ',', 'query' => false),
-        '+' => array('prefix' => '',  'joiner' => ',', 'query' => false),
-        '#' => array('prefix' => '#', 'joiner' => ',', 'query' => false),
-        '.' => array('prefix' => '.', 'joiner' => '.', 'query' => false),
-        '/' => array('prefix' => '/', 'joiner' => '/', 'query' => false),
-        ';' => array('prefix' => ';', 'joiner' => ';', 'query' => true),
-        '?' => array('prefix' => '?', 'joiner' => '&', 'query' => true),
-        '&' => array('prefix' => '&', 'joiner' => '&', 'query' => true)
-    );
-
-    /** @var array Delimiters */
-    private static $delims = array(':', '/', '?', '#', '[', ']', '@', '!', '$',
-        '&', '\'', '(', ')', '*', '+', ',', ';', '=');
-
-    /** @var array Percent encoded delimiters */
-    private static $delimsPct = array('%3A', '%2F', '%3F', '%23', '%5B', '%5D',
-        '%40', '%21', '%24', '%26', '%27', '%28', '%29', '%2A', '%2B', '%2C',
-        '%3B', '%3D');
-
-    public function expand($template, array $variables)
-    {
-        if (false === strpos($template, '{')) {
-            return $template;
-        }
-
-        $this->template = $template;
-        $this->variables = $variables;
-
-        return preg_replace_callback(
-            '/\{([^\}]+)\}/',
-            [$this, 'expandMatch'],
-            $this->template
-        );
-    }
-
-    /**
-     * Parse an expression into parts
-     *
-     * @param string $expression Expression to parse
-     *
-     * @return array Returns an associative array of parts
-     */
-    private function parseExpression($expression)
-    {
-        $result = array();
-
-        if (isset(self::$operatorHash[$expression[0]])) {
-            $result['operator'] = $expression[0];
-            $expression = substr($expression, 1);
-        } else {
-            $result['operator'] = '';
-        }
-
-        foreach (explode(',', $expression) as $value) {
-            $value = trim($value);
-            $varspec = array();
-            if ($colonPos = strpos($value, ':')) {
-                $varspec['value'] = substr($value, 0, $colonPos);
-                $varspec['modifier'] = ':';
-                $varspec['position'] = (int) substr($value, $colonPos + 1);
-            } elseif (substr($value, -1) == '*') {
-                $varspec['modifier'] = '*';
-                $varspec['value'] = substr($value, 0, -1);
-            } else {
-                $varspec['value'] = (string) $value;
-                $varspec['modifier'] = '';
-            }
-            $result['values'][] = $varspec;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Process an expansion
-     *
-     * @param array $matches Matches met in the preg_replace_callback
-     *
-     * @return string Returns the replacement string
-     */
-    private function expandMatch(array $matches)
-    {
-        static $rfc1738to3986 = array('+' => '%20', '%7e' => '~');
-
-        $replacements = array();
-        $parsed = self::parseExpression($matches[1]);
-        $prefix = self::$operatorHash[$parsed['operator']]['prefix'];
-        $joiner = self::$operatorHash[$parsed['operator']]['joiner'];
-        $useQuery = self::$operatorHash[$parsed['operator']]['query'];
-
-        foreach ($parsed['values'] as $value) {
-
-            if (!isset($this->variables[$value['value']])) {
-                continue;
-            }
-
-            $variable = $this->variables[$value['value']];
-            $actuallyUseQuery = $useQuery;
-            $expanded = '';
-
-            if (is_array($variable)) {
-
-                $isAssoc = $this->isAssoc($variable);
-                $kvp = array();
-                foreach ($variable as $key => $var) {
-
-                    if ($isAssoc) {
-                        $key = rawurlencode($key);
-                        $isNestedArray = is_array($var);
-                    } else {
-                        $isNestedArray = false;
-                    }
-
-                    if (!$isNestedArray) {
-                        $var = rawurlencode($var);
-                        if ($parsed['operator'] == '+' ||
-                            $parsed['operator'] == '#'
-                        ) {
-                            $var = $this->decodeReserved($var);
-                        }
-                    }
-
-                    if ($value['modifier'] == '*') {
-                        if ($isAssoc) {
-                            if ($isNestedArray) {
-                                // Nested arrays must allow for deeply nested
-                                // structures.
-                                $var = strtr(
-                                    http_build_query([$key => $var]),
-                                    $rfc1738to3986
-                                );
-                            } else {
-                                $var = $key . '=' . $var;
-                            }
-                        } elseif ($key > 0 && $actuallyUseQuery) {
-                            $var = $value['value'] . '=' . $var;
-                        }
-                    }
-
-                    $kvp[$key] = $var;
-                }
-
-                if (empty($variable)) {
-                    $actuallyUseQuery = false;
-                } elseif ($value['modifier'] == '*') {
-                    $expanded = implode($joiner, $kvp);
-                    if ($isAssoc) {
-                        // Don't prepend the value name when using the explode
-                        // modifier with an associative array.
-                        $actuallyUseQuery = false;
-                    }
-                } else {
-                    if ($isAssoc) {
-                        // When an associative array is encountered and the
-                        // explode modifier is not set, then the result must be
-                        // a comma separated list of keys followed by their
-                        // respective values.
-                        foreach ($kvp as $k => &$v) {
-                            $v = $k . ',' . $v;
-                        }
-                    }
-                    $expanded = implode(',', $kvp);
-                }
-
-            } else {
-                if ($value['modifier'] == ':') {
-                    $variable = substr($variable, 0, $value['position']);
-                }
-                $expanded = rawurlencode($variable);
-                if ($parsed['operator'] == '+' || $parsed['operator'] == '#') {
-                    $expanded = $this->decodeReserved($expanded);
-                }
-            }
-
-            if ($actuallyUseQuery) {
-                if (!$expanded && $joiner != '&') {
-                    $expanded = $value['value'];
-                } else {
-                    $expanded = $value['value'] . '=' . $expanded;
-                }
-            }
-
-            $replacements[] = $expanded;
-        }
-
-        $ret = implode($joiner, $replacements);
-        if ($ret && $prefix) {
-            return $prefix . $ret;
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Determines if an array is associative.
-     *
-     * This makes the assumption that input arrays are sequences or hashes.
-     * This assumption is a tradeoff for accuracy in favor of speed, but it
-     * should work in almost every case where input is supplied for a URI
-     * template.
-     *
-     * @param array $array Array to check
-     *
-     * @return bool
-     */
-    private function isAssoc(array $array)
-    {
-        return $array && array_keys($array)[0] !== 0;
-    }
-
-    /**
-     * Removes percent encoding on reserved characters (used with + and #
-     * modifiers).
-     *
-     * @param string $string String to fix
-     *
-     * @return string
-     */
-    private function decodeReserved($string)
-    {
-        return str_replace(self::$delimsPct, self::$delims, $string);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Url.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Url.php
deleted file mode 100644
index 637f60c2ab..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Url.php
+++ /dev/null
@@ -1,595 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-use GuzzleHttp\Ring\Core;
-
-/**
- * Parses and generates URLs based on URL parts
- */
-class Url
-{
-    private $scheme;
-    private $host;
-    private $port;
-    private $username;
-    private $password;
-    private $path = '';
-    private $fragment;
-    private static $defaultPorts = ['http' => 80, 'https' => 443, 'ftp' => 21];
-    private static $pathPattern = '/[^a-zA-Z0-9\-\._~!\$&\'\(\)\*\+,;=%:@\/]+|%(?![A-Fa-f0-9]{2})/';
-    private static $queryPattern = '/[^a-zA-Z0-9\-\._~!\$\'\(\)\*\+,;%:@\/\?=&]+|%(?![A-Fa-f0-9]{2})/';
-    /** @var Query|string Query part of the URL */
-    private $query;
-
-    /**
-     * Factory method to create a new URL from a URL string
-     *
-     * @param string $url Full URL used to create a Url object
-     *
-     * @return Url
-     * @throws \InvalidArgumentException
-     */
-    public static function fromString($url)
-    {
-        static $defaults = ['scheme' => null, 'host' => null,
-            'path' => null, 'port' => null, 'query' => null,
-            'user' => null, 'pass' => null, 'fragment' => null];
-
-        if (false === ($parts = parse_url($url))) {
-            throw new \InvalidArgumentException('Unable to parse malformed '
-                . 'url: ' . $url);
-        }
-
-        $parts += $defaults;
-
-        // Convert the query string into a Query object
-        if ($parts['query'] || 0 !== strlen($parts['query'])) {
-            $parts['query'] = Query::fromString($parts['query']);
-        }
-
-        return new static($parts['scheme'], $parts['host'], $parts['user'],
-            $parts['pass'], $parts['port'], $parts['path'], $parts['query'],
-            $parts['fragment']);
-    }
-
-    /**
-     * Build a URL from parse_url parts. The generated URL will be a relative
-     * URL if a scheme or host are not provided.
-     *
-     * @param array $parts Array of parse_url parts
-     *
-     * @return string
-     */
-    public static function buildUrl(array $parts)
-    {
-        $url = $scheme = '';
-
-        if (!empty($parts['scheme'])) {
-            $scheme = $parts['scheme'];
-            $url .= $scheme . ':';
-        }
-
-        if (!empty($parts['host'])) {
-            $url .= '//';
-            if (isset($parts['user'])) {
-                $url .= $parts['user'];
-                if (isset($parts['pass'])) {
-                    $url .= ':' . $parts['pass'];
-                }
-                $url .=  '@';
-            }
-
-            $url .= $parts['host'];
-
-            // Only include the port if it is not the default port of the scheme
-            if (isset($parts['port']) &&
-                (!isset(self::$defaultPorts[$scheme]) ||
-                 $parts['port'] != self::$defaultPorts[$scheme])
-            ) {
-                $url .= ':' . $parts['port'];
-            }
-        }
-
-        // Add the path component if present
-        if (isset($parts['path']) && strlen($parts['path'])) {
-            // Always ensure that the path begins with '/' if set and something
-            // is before the path
-            if (!empty($parts['host']) && $parts['path'][0] != '/') {
-                $url .= '/';
-            }
-            $url .= $parts['path'];
-        }
-
-        // Add the query string if present
-        if (isset($parts['query'])) {
-            $queryStr = (string) $parts['query'];
-            if ($queryStr || $queryStr === '0') {
-                $url .= '?' . $queryStr;
-            }
-        }
-
-        // Ensure that # is only added to the url if fragment contains anything.
-        if (isset($parts['fragment'])) {
-            $url .= '#' . $parts['fragment'];
-        }
-
-        return $url;
-    }
-
-    /**
-     * Create a new URL from URL parts
-     *
-     * @param string             $scheme   Scheme of the URL
-     * @param string             $host     Host of the URL
-     * @param string             $username Username of the URL
-     * @param string             $password Password of the URL
-     * @param int                $port     Port of the URL
-     * @param string             $path     Path of the URL
-     * @param Query|array|string $query    Query string of the URL
-     * @param string             $fragment Fragment of the URL
-     */
-    public function __construct(
-        $scheme,
-        $host,
-        $username = null,
-        $password = null,
-        $port = null,
-        $path = null,
-        $query = null,
-        $fragment = null
-    ) {
-        $this->scheme = strtolower($scheme);
-        $this->host = $host;
-        $this->port = $port;
-        $this->username = $username;
-        $this->password = $password;
-        $this->fragment = $fragment;
-
-        if ($query) {
-            $this->setQuery($query);
-        }
-
-        $this->setPath($path);
-    }
-
-    /**
-     * Clone the URL
-     */
-    public function __clone()
-    {
-        if ($this->query instanceof Query) {
-            $this->query = clone $this->query;
-        }
-    }
-
-    /**
-     * Returns the URL as a URL string
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return static::buildUrl($this->getParts());
-    }
-
-    /**
-     * Get the parts of the URL as an array
-     *
-     * @return array
-     */
-    public function getParts()
-    {
-        return array(
-            'scheme'   => $this->scheme,
-            'user'     => $this->username,
-            'pass'     => $this->password,
-            'host'     => $this->host,
-            'port'     => $this->port,
-            'path'     => $this->path,
-            'query'    => $this->query,
-            'fragment' => $this->fragment,
-        );
-    }
-
-    /**
-     * Set the host of the request.
-     *
-     * @param string $host Host to set (e.g. www.yahoo.com, yahoo.com)
-     *
-     * @return Url
-     */
-    public function setHost($host)
-    {
-        if (strpos($host, ':') === false) {
-            $this->host = $host;
-        } else {
-            list($host, $port) = explode(':', $host);
-            $this->host = $host;
-            $this->setPort($port);
-        }
-    }
-
-    /**
-     * Get the host part of the URL
-     *
-     * @return string
-     */
-    public function getHost()
-    {
-        return $this->host;
-    }
-
-    /**
-     * Set the scheme part of the URL (http, https, ftp, etc.)
-     *
-     * @param string $scheme Scheme to set
-     */
-    public function setScheme($scheme)
-    {
-        // Remove the default port if one is specified
-        if ($this->port
-            && isset(self::$defaultPorts[$this->scheme])
-            && self::$defaultPorts[$this->scheme] == $this->port
-        ) {
-            $this->port = null;
-        }
-
-        $this->scheme = strtolower($scheme);
-    }
-
-    /**
-     * Get the scheme part of the URL
-     *
-     * @return string
-     */
-    public function getScheme()
-    {
-        return $this->scheme;
-    }
-
-    /**
-     * Set the port part of the URL
-     *
-     * @param int $port Port to set
-     */
-    public function setPort($port)
-    {
-        $this->port = $port;
-    }
-
-    /**
-     * Get the port part of the URl.
-     *
-     * If no port was set, this method will return the default port for the
-     * scheme of the URI.
-     *
-     * @return int|null
-     */
-    public function getPort()
-    {
-        if ($this->port) {
-            return $this->port;
-        } elseif (isset(self::$defaultPorts[$this->scheme])) {
-            return self::$defaultPorts[$this->scheme];
-        }
-
-        return null;
-    }
-
-    /**
-     * Set the path part of the URL.
-     *
-     * The provided URL is URL encoded as necessary.
-     *
-     * @param string $path Path string to set
-     */
-    public function setPath($path)
-    {
-        $this->path = self::encodePath($path);
-    }
-
-    /**
-     * Removes dot segments from a URL
-     * @link http://tools.ietf.org/html/rfc3986#section-5.2.4
-     */
-    public function removeDotSegments()
-    {
-        static $noopPaths = ['' => true, '/' => true, '*' => true];
-        static $ignoreSegments = ['.' => true, '..' => true];
-
-        if (isset($noopPaths[$this->path])) {
-            return;
-        }
-
-        $results = [];
-        $segments = $this->getPathSegments();
-        foreach ($segments as $segment) {
-            if ($segment == '..') {
-                array_pop($results);
-            } elseif (!isset($ignoreSegments[$segment])) {
-                $results[] = $segment;
-            }
-        }
-
-        $newPath = implode('/', $results);
-
-        // Add the leading slash if necessary
-        if (substr($this->path, 0, 1) === '/' &&
-            substr($newPath, 0, 1) !== '/'
-        ) {
-            $newPath = '/' . $newPath;
-        }
-
-        // Add the trailing slash if necessary
-        if ($newPath != '/' && isset($ignoreSegments[end($segments)])) {
-            $newPath .= '/';
-        }
-
-        $this->path = $newPath;
-    }
-
-    /**
-     * Add a relative path to the currently set path.
-     *
-     * @param string $relativePath Relative path to add
-     */
-    public function addPath($relativePath)
-    {
-        if ($relativePath != '/' &&
-            is_string($relativePath) &&
-            strlen($relativePath) > 0
-        ) {
-            // Add a leading slash if needed
-            if ($relativePath[0] !== '/' &&
-                substr($this->path, -1, 1) !== '/'
-            ) {
-                $relativePath = '/' . $relativePath;
-            }
-
-            $this->setPath($this->path . $relativePath);
-        }
-    }
-
-    /**
-     * Get the path part of the URL
-     *
-     * @return string
-     */
-    public function getPath()
-    {
-        return $this->path;
-    }
-
-    /**
-     * Get the path segments of the URL as an array
-     *
-     * @return array
-     */
-    public function getPathSegments()
-    {
-        return explode('/', $this->path);
-    }
-
-    /**
-     * Set the password part of the URL
-     *
-     * @param string $password Password to set
-     */
-    public function setPassword($password)
-    {
-        $this->password = $password;
-    }
-
-    /**
-     * Get the password part of the URL
-     *
-     * @return null|string
-     */
-    public function getPassword()
-    {
-        return $this->password;
-    }
-
-    /**
-     * Set the username part of the URL
-     *
-     * @param string $username Username to set
-     */
-    public function setUsername($username)
-    {
-        $this->username = $username;
-    }
-
-    /**
-     * Get the username part of the URl
-     *
-     * @return null|string
-     */
-    public function getUsername()
-    {
-        return $this->username;
-    }
-
-    /**
-     * Get the query part of the URL as a Query object
-     *
-     * @return Query
-     */
-    public function getQuery()
-    {
-        // Convert the query string to a query object if not already done.
-        if (!$this->query instanceof Query) {
-            $this->query = $this->query === null
-                ? new Query()
-                : Query::fromString($this->query);
-        }
-
-        return $this->query;
-    }
-
-    /**
-     * Set the query part of the URL.
-     *
-     * You may provide a query string as a string and pass $rawString as true
-     * to provide a query string that is not parsed until a call to getQuery()
-     * is made. Setting a raw query string will still encode invalid characters
-     * in a query string.
-     *
-     * @param Query|string|array $query Query string value to set. Can
-     *     be a string that will be parsed into a Query object, an array
-     *     of key value pairs, or a Query object.
-     * @param bool $rawString Set to true when providing a raw query string.
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setQuery($query, $rawString = false)
-    {
-        if ($query instanceof Query) {
-            $this->query = $query;
-        } elseif (is_string($query)) {
-            if (!$rawString) {
-                $this->query = Query::fromString($query);
-            } else {
-                // Ensure the query does not have illegal characters.
-                $this->query = preg_replace_callback(
-                    self::$queryPattern,
-                    [__CLASS__, 'encodeMatch'],
-                    $query
-                );
-            }
-
-        } elseif (is_array($query)) {
-            $this->query = new Query($query);
-        } else {
-            throw new \InvalidArgumentException('Query must be a Query, '
-                . 'array, or string. Got ' . Core::describeType($query));
-        }
-    }
-
-    /**
-     * Get the fragment part of the URL
-     *
-     * @return null|string
-     */
-    public function getFragment()
-    {
-        return $this->fragment;
-    }
-
-    /**
-     * Set the fragment part of the URL
-     *
-     * @param string $fragment Fragment to set
-     */
-    public function setFragment($fragment)
-    {
-        $this->fragment = $fragment;
-    }
-
-    /**
-     * Check if this is an absolute URL
-     *
-     * @return bool
-     */
-    public function isAbsolute()
-    {
-        return $this->scheme && $this->host;
-    }
-
-    /**
-     * Combine the URL with another URL and return a new URL instance.
-     *
-     * Follows the rules specific in RFC 3986 section 5.4.
-     *
-     * @param string $url Relative URL to combine with
-     *
-     * @return Url
-     * @throws \InvalidArgumentException
-     * @link http://tools.ietf.org/html/rfc3986#section-5.4
-     */
-    public function combine($url)
-    {
-        $url = static::fromString($url);
-
-        // Use the more absolute URL as the base URL
-        if (!$this->isAbsolute() && $url->isAbsolute()) {
-            $url = $url->combine($this);
-        }
-
-        $parts = $url->getParts();
-
-        // Passing a URL with a scheme overrides everything
-        if ($parts['scheme']) {
-            return clone $url;
-        }
-
-        // Setting a host overrides the entire rest of the URL
-        if ($parts['host']) {
-            return new static(
-                $this->scheme,
-                $parts['host'],
-                $parts['user'],
-                $parts['pass'],
-                $parts['port'],
-                $parts['path'],
-                $parts['query'] instanceof Query
-                    ? clone $parts['query']
-                    : $parts['query'],
-                $parts['fragment']
-            );
-        }
-
-        if (!$parts['path'] && $parts['path'] !== '0') {
-            // The relative URL has no path, so check if it is just a query
-            $path = $this->path ?: '';
-            $query = $parts['query'] ?: $this->query;
-        } else {
-            $query = $parts['query'];
-            if ($parts['path'][0] == '/' || !$this->path) {
-                // Overwrite the existing path if the rel path starts with "/"
-                $path = $parts['path'];
-            } else {
-                // If the relative URL does not have a path or the base URL
-                // path does not end in a "/" then overwrite the existing path
-                // up to the last "/"
-                $path = substr($this->path, 0, strrpos($this->path, '/') + 1) . $parts['path'];
-            }
-        }
-
-        $result = new self(
-            $this->scheme,
-            $this->host,
-            $this->username,
-            $this->password,
-            $this->port,
-            $path,
-            $query instanceof Query ? clone $query : $query,
-            $parts['fragment']
-        );
-
-        if ($path) {
-            $result->removeDotSegments();
-        }
-
-        return $result;
-    }
-
-    /**
-     * Encodes the path part of a URL without double-encoding percent-encoded
-     * key value pairs.
-     *
-     * @param string $path Path to encode
-     *
-     * @return string
-     */
-    public static function encodePath($path)
-    {
-        static $cb = [__CLASS__, 'encodeMatch'];
-        return preg_replace_callback(self::$pathPattern, $cb, $path);
-    }
-
-    private static function encodeMatch(array $match)
-    {
-        return rawurlencode($match[0]);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Utils.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Utils.php
deleted file mode 100644
index 1c89661060..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/guzzle/src/Utils.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-namespace GuzzleHttp;
-
-use GuzzleHttp\Ring\Client\CurlHandler;
-use GuzzleHttp\Ring\Client\CurlMultiHandler;
-use GuzzleHttp\Ring\Client\StreamHandler;
-use GuzzleHttp\Ring\Client\Middleware;
-
-/**
- * Utility methods used throughout Guzzle.
- */
-final class Utils
-{
-    /**
-     * Gets a value from an array using a path syntax to retrieve nested data.
-     *
-     * This method does not allow for keys that contain "/". You must traverse
-     * the array manually or using something more advanced like JMESPath to
-     * work with keys that contain "/".
-     *
-     *     // Get the bar key of a set of nested arrays.
-     *     // This is equivalent to $collection['foo']['baz']['bar'] but won't
-     *     // throw warnings for missing keys.
-     *     GuzzleHttp\get_path($data, 'foo/baz/bar');
-     *
-     * @param array  $data Data to retrieve values from
-     * @param string $path Path to traverse and retrieve a value from
-     *
-     * @return mixed|null
-     */
-    public static function getPath($data, $path)
-    {
-        $path = explode('/', $path);
-
-        while (null !== ($part = array_shift($path))) {
-            if (!is_array($data) || !isset($data[$part])) {
-                return null;
-            }
-            $data = $data[$part];
-        }
-
-        return $data;
-    }
-
-    /**
-     * Set a value in a nested array key. Keys will be created as needed to set
-     * the value.
-     *
-     * This function does not support keys that contain "/" or "[]" characters
-     * because these are special tokens used when traversing the data structure.
-     * A value may be prepended to an existing array by using "[]" as the final
-     * key of a path.
-     *
-     *     GuzzleHttp\get_path($data, 'foo/baz'); // null
-     *     GuzzleHttp\set_path($data, 'foo/baz/[]', 'a');
-     *     GuzzleHttp\set_path($data, 'foo/baz/[]', 'b');
-     *     GuzzleHttp\get_path($data, 'foo/baz');
-     *     // Returns ['a', 'b']
-     *
-     * @param array  $data  Data to modify by reference
-     * @param string $path  Path to set
-     * @param mixed  $value Value to set at the key
-     *
-     * @throws \RuntimeException when trying to setPath using a nested path
-     *     that travels through a scalar value.
-     */
-    public static function setPath(&$data, $path, $value)
-    {
-        $queue = explode('/', $path);
-        // Optimization for simple sets.
-        if (count($queue) === 1) {
-            $data[$path] = $value;
-            return;
-        }
-
-        $current =& $data;
-        while (null !== ($key = array_shift($queue))) {
-            if (!is_array($current)) {
-                throw new \RuntimeException("Trying to setPath {$path}, but "
-                    . "{$key} is set and is not an array");
-            } elseif (!$queue) {
-                if ($key == '[]') {
-                    $current[] = $value;
-                } else {
-                    $current[$key] = $value;
-                }
-            } elseif (isset($current[$key])) {
-                $current =& $current[$key];
-            } else {
-                $current[$key] = [];
-                $current =& $current[$key];
-            }
-        }
-    }
-
-    /**
-     * Expands a URI template
-     *
-     * @param string $template  URI template
-     * @param array  $variables Template variables
-     *
-     * @return string
-     */
-    public static function uriTemplate($template, array $variables)
-    {
-        if (function_exists('\\uri_template')) {
-            return \uri_template($template, $variables);
-        }
-
-        static $uriTemplate;
-        if (!$uriTemplate) {
-            $uriTemplate = new UriTemplate();
-        }
-
-        return $uriTemplate->expand($template, $variables);
-    }
-
-    /**
-     * Wrapper for JSON decode that implements error detection with helpful
-     * error messages.
-     *
-     * @param string $json    JSON data to parse
-     * @param bool $assoc     When true, returned objects will be converted
-     *                        into associative arrays.
-     * @param int    $depth   User specified recursion depth.
-     * @param int    $options Bitmask of JSON decode options.
-     *
-     * @return mixed
-     * @throws \InvalidArgumentException if the JSON cannot be parsed.
-     * @link http://www.php.net/manual/en/function.json-decode.php
-     */
-    public static function jsonDecode($json, $assoc = false, $depth = 512, $options = 0)
-    {
-        static $jsonErrors = [
-            JSON_ERROR_DEPTH => 'JSON_ERROR_DEPTH - Maximum stack depth exceeded',
-            JSON_ERROR_STATE_MISMATCH => 'JSON_ERROR_STATE_MISMATCH - Underflow or the modes mismatch',
-            JSON_ERROR_CTRL_CHAR => 'JSON_ERROR_CTRL_CHAR - Unexpected control character found',
-            JSON_ERROR_SYNTAX => 'JSON_ERROR_SYNTAX - Syntax error, malformed JSON',
-            JSON_ERROR_UTF8 => 'JSON_ERROR_UTF8 - Malformed UTF-8 characters, possibly incorrectly encoded'
-        ];
-
-        $data = \json_decode($json, $assoc, $depth, $options);
-
-        if (JSON_ERROR_NONE !== json_last_error()) {
-            $last = json_last_error();
-            throw new \InvalidArgumentException(
-                'Unable to parse JSON data: '
-                . (isset($jsonErrors[$last])
-                    ? $jsonErrors[$last]
-                    : 'Unknown error')
-            );
-        }
-
-        return $data;
-    }
-
-    /**
-     * Get the default User-Agent string to use with Guzzle
-     *
-     * @return string
-     */
-    public static function getDefaultUserAgent()
-    {
-        static $defaultAgent = '';
-        if (!$defaultAgent) {
-            $defaultAgent = 'Guzzle/' . ClientInterface::VERSION;
-            if (extension_loaded('curl')) {
-                $defaultAgent .= ' curl/' . curl_version()['version'];
-            }
-            $defaultAgent .= ' PHP/' . PHP_VERSION;
-        }
-
-        return $defaultAgent;
-    }
-
-    /**
-     * Create a default handler to use based on the environment
-     *
-     * @throws \RuntimeException if no viable Handler is available.
-     */
-    public static function getDefaultHandler()
-    {
-        $default = $future = null;
-
-        if (extension_loaded('curl')) {
-            $config = [
-                'select_timeout' => getenv('GUZZLE_CURL_SELECT_TIMEOUT') ?: 1
-            ];
-            if ($maxHandles = getenv('GUZZLE_CURL_MAX_HANDLES')) {
-                $config['max_handles'] = $maxHandles;
-            }
-            if (function_exists('curl_reset')) {
-                $default = new CurlHandler();
-                $future = new CurlMultiHandler($config);
-            } else {
-                $default = new CurlMultiHandler($config);
-            }
-        }
-
-        if (ini_get('allow_url_fopen')) {
-            $default = !$default
-                ? new StreamHandler()
-                : Middleware::wrapStreaming($default, new StreamHandler());
-        } elseif (!$default) {
-            throw new \RuntimeException('Guzzle requires cURL, the '
-                . 'allow_url_fopen ini setting, or a custom HTTP handler.');
-        }
-
-        return $future ? Middleware::wrapFuture($default, $future) : $default;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/.gitignore b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/.gitignore
deleted file mode 100644
index 290a945241..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-vendor
-build/artifacts/
-composer.lock
-docs/_build/
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/.travis.yml b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/.travis.yml
deleted file mode 100644
index e43fbdd9cd..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/.travis.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-language: php
-
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
-
-before_script:
-  - composer self-update
-  - composer install --no-interaction --prefer-source --dev
-  - ~/.nvm/nvm.sh install v0.6.14
-  - ~/.nvm/nvm.sh run v0.6.14
-
-script:
-  - make test
-
-matrix:
-  allow_failures:
-    - php: hhvm
-  fast_finish: true
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/CHANGELOG.md b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/CHANGELOG.md
deleted file mode 100644
index d399d82624..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/CHANGELOG.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# CHANGELOG
-
-## 1.1.0 - 2015-05-19
-
-* Added `CURL_HTTP_VERSION_2_0`
-* The PHP stream wrapper handler now sets `allow_self_signed` to `false` to
-  match the cURL handler when `verify` is set to `true` or a certificate file.
-* Ensuring that a directory exists before using the `save_to` option.
-* Response protocol version is now correctly extracted from a response.
-* Fixed a bug in which the result of `CurlFactory::retryFailedRewind` did not
-  return an array.
-
-## 1.0.7 - 2015-03-29
-
-* PHP 7 fixes.
-
-## 1.0.6 - 2015-02-26
-
-* Bug fix: futures now extend from React's PromiseInterface to ensure that they
-  are properly forwarded down the promise chain.
-* The multi handle of the CurlMultiHandler is now created lazily.
-
-## 1.0.5 - 2014-12-10
-
-* Adding more error information to PHP stream wrapper exceptions.
-* Added digest auth integration test support to test server.
-
-## 1.0.4 - 2014-12-01
-
-* Added support for older versions of cURL that do not have CURLOPT_TIMEOUT_MS.
-* Setting debug to `false` does not enable debug output.
-* Added a fix to the StreamHandler to return a `FutureArrayInterface` when an
-  error occurs.
-
-## 1.0.3 - 2014-11-03
-
-* Setting the `header` stream option as a string to be compatible with GAE.
-* Header parsing now ensures that header order is maintained in the parsed
-  message.
-
-## 1.0.2 - 2014-10-28
-
-* Now correctly honoring a `version` option is supplied in a request.
-  See https://github.com/guzzle/RingPHP/pull/8
-
-## 1.0.1 - 2014-10-26
-
-* Fixed a header parsing issue with the `CurlHandler` and `CurlMultiHandler`
-  that caused cURL requests with multiple responses to merge repsonses together
-  (e.g., requests with digest authentication).
-
-## 1.0.0 - 2014-10-12
-
-* Initial release.
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/LICENSE b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/LICENSE
deleted file mode 100644
index 71d3b783cb..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2014 Michael Dowling, https://github.com/mtdowling <mtdowling@gmail.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.
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/Makefile b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/Makefile
deleted file mode 100644
index 21c812e381..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-all: clean coverage docs
-
-docs:
-	cd docs && make html
-
-view-docs:
-	open docs/_build/html/index.html
-
-start-server: stop-server
-	node tests/Client/server.js &> /dev/null &
-
-stop-server:
-	@PID=$(shell ps axo pid,command \
-	  | grep 'tests/Client/server.js' \
-	  | grep -v grep \
-	  | cut -f 1 -d " "\
-	) && [ -n "$$PID" ] && kill $$PID || true
-
-test: start-server
-	vendor/bin/phpunit $(TEST)
-	$(MAKE) stop-server
-
-coverage: start-server
-	vendor/bin/phpunit --coverage-html=build/artifacts/coverage $(TEST)
-	$(MAKE) stop-server
-
-view-coverage:
-	open build/artifacts/coverage/index.html
-
-clean:
-	rm -rf build/artifacts/*
-	cd docs && make clean
-
-tag:
-	$(if $(TAG),,$(error TAG is not defined. Pass via "make tag TAG=4.2.1"))
-	@echo Tagging $(TAG)
-	chag update -m '$(TAG) ()'
-	git add -A
-	git commit -m '$(TAG) release'
-	chag tag
-
-perf: start-server
-	php tests/perf.php
-	$(MAKE) stop-server
-
-.PHONY: docs
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/README.rst b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/README.rst
deleted file mode 100644
index 10374e813b..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/README.rst
+++ /dev/null
@@ -1,46 +0,0 @@
-=======
-RingPHP
-=======
-
-Provides a simple API and specification that abstracts away the details of HTTP
-into a single PHP function. RingPHP be used to power HTTP clients and servers
-through a PHP function that accepts a request hash and returns a response hash
-that is fulfilled using a `promise <https://github.com/reactphp/promise>`_,
-allowing RingPHP to support both synchronous and asynchronous workflows.
-
-By abstracting the implementation details of different HTTP clients and
-servers, RingPHP allows you to utilize pluggable HTTP clients and servers
-without tying your application to a specific implementation.
-
-.. code-block:: php
-
-    <?php
-    require 'vendor/autoload.php';
-
-    use GuzzleHttp\Ring\Client\CurlHandler;
-
-    $handler = new CurlHandler();
-    $response = $handler([
-        'http_method' => 'GET',
-        'uri'         => '/',
-        'headers'     => [
-            'host'  => ['www.google.com'],
-            'x-foo' => ['baz']
-        ]
-    ]);
-
-    $response->then(function (array $response) {
-        echo $response['status'];
-    });
-
-    $response->wait();
-
-RingPHP is inspired by Clojure's `Ring <https://github.com/ring-clojure/ring>`_,
-which, in turn, was inspired by Python's WSGI and Ruby's Rack. RingPHP is
-utilized as the handler layer in `Guzzle <http://guzzlephp.org>`_ 5.0+ to send
-HTTP requests.
-
-Documentation
--------------
-
-See http://ringphp.readthedocs.org/ for the full online documentation.
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/composer.json b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/composer.json
deleted file mode 100644
index 22002efca7..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/composer.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "name": "guzzlehttp/ringphp",
-    "description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function.",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Michael Dowling",
-            "email": "mtdowling@gmail.com",
-            "homepage": "https://github.com/mtdowling"
-        }
-    ],
-    "require": {
-        "php": ">=5.4.0",
-        "guzzlehttp/streams": "~3.0",
-        "react/promise": "~2.0"
-    },
-    "require-dev": {
-        "ext-curl": "*",
-        "phpunit/phpunit": "~4.0"
-    },
-    "suggest": {
-        "ext-curl": "Guzzle will use specific adapters if cURL is present"
-    },
-    "autoload": {
-        "psr-4": {
-            "GuzzleHttp\\Ring\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "GuzzleHttp\\Tests\\Ring\\": "tests/"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.1-dev"
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/docs/Makefile b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/docs/Makefile
deleted file mode 100644
index 51270aa5d3..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/docs/Makefile
+++ /dev/null
@@ -1,153 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-PAPER         =
-BUILDDIR      = _build
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-# the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  texinfo    to make Texinfo files"
-	@echo "  info       to make Texinfo files and run them through makeinfo"
-	@echo "  gettext    to make PO message catalogs"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
-
-clean:
-	-rm -rf $(BUILDDIR)/*
-
-html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/GuzzleRing.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/GuzzleRing.qhc"
-
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/GuzzleRing"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/GuzzleRing"
-	@echo "# devhelp"
-
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-texinfo:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo
-	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
-	@echo "Run \`make' in that directory to run these through makeinfo" \
-	      "(use \`make info' here to do that automatically)."
-
-info:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo "Running Texinfo files through makeinfo..."
-	make -C $(BUILDDIR)/texinfo info
-	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
-
-gettext:
-	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
-	@echo
-	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/docs/client_handlers.rst b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/docs/client_handlers.rst
deleted file mode 100644
index 3151f00216..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/docs/client_handlers.rst
+++ /dev/null
@@ -1,173 +0,0 @@
-===============
-Client Handlers
-===============
-
-Client handlers accept a request array and return a future response array that
-can be used synchronously as an array or asynchronously using a promise.
-
-Built-In Handlers
------------------
-
-RingPHP comes with three built-in client handlers.
-
-Stream Handler
-~~~~~~~~~~~~~~
-
-The ``GuzzleHttp\Ring\Client\StreamHandler`` uses PHP's
-`http stream wrapper <http://php.net/manual/en/wrappers.http.php>`_ to send
-requests.
-
-.. note::
-
-    This handler cannot send requests concurrently.
-
-You can provide an associative array of custom stream context options to the
-StreamHandler using the ``stream_context`` key of the ``client`` request
-option.
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Client\StreamHandler;
-
-    $response = $handler([
-        'http_method' => 'GET',
-        'uri' => '/',
-        'headers' => ['host' => ['httpbin.org']],
-        'client' => [
-            'stream_context' => [
-                'http' => [
-                    'request_fulluri' => true,
-                    'method' => 'HEAD'
-                ],
-                'socket' => [
-                    'bindto' => '127.0.0.1:0'
-                ],
-                'ssl' => [
-                    'verify_peer' => false
-                ]
-            ]
-        ]
-    ]);
-
-    // Even though it's already completed, you can still use a promise
-    $response->then(function ($response) {
-        echo $response['status']; // 200
-    });
-
-    // Or access the response using the future interface
-    echo $response['status']; // 200
-
-cURL Handler
-~~~~~~~~~~~~
-
-The ``GuzzleHttp\Ring\Client\CurlHandler`` can be used with PHP 5.5+ to send
-requests using cURL easy handles. This handler is great for sending requests
-one at a time because the execute and select loop is implemented in C code
-which executes faster and consumes less memory than using PHP's
-``curl_multi_*`` interface.
-
-.. note::
-
-    This handler cannot send requests concurrently.
-
-When using the CurlHandler, custom curl options can be specified as an
-associative array of `cURL option constants <http://php.net/manual/en/curl.constants.php>`_
-mapping to values in the ``client`` option of a requst using the **curl** key.
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Client\CurlHandler;
-
-    $handler = new CurlHandler();
-
-    $request = [
-        'http_method' => 'GET',
-        'headers'     => ['host' => [Server::$host]],
-        'client'      => ['curl' => [CURLOPT_LOW_SPEED_LIMIT => 10]]
-    ];
-
-    $response = $handler($request);
-
-    // The response can be used directly as an array.
-    echo $response['status']; // 200
-
-    // Or, it can be used as a promise (that has already fulfilled).
-    $response->then(function ($response) {
-        echo $response['status']; // 200
-    });
-
-cURL Multi Handler
-~~~~~~~~~~~~~~~~~~
-
-The ``GuzzleHttp\Ring\Client\CurlMultiHandler`` transfers requests using
-cURL's `multi API <http://curl.haxx.se/libcurl/c/libcurl-multi.html>`_. The
-``CurlMultiHandler`` is great for sending requests concurrently.
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Client\CurlMultiHandler;
-
-    $handler = new CurlMultiHandler();
-
-    $request = [
-        'http_method' => 'GET',
-        'headers'     => ['host' => [Server::$host]]
-    ];
-
-    // this call returns a future array immediately.
-    $response = $handler($request);
-
-    // Ideally, you should use the promise API to not block.
-    $response
-        ->then(function ($response) {
-            // Got the response at some point in the future
-            echo $response['status']; // 200
-            // Don't break the chain
-            return $response;
-        })->then(function ($response) {
-            // ...
-        });
-
-    // If you really need to block, then you can use the response as an
-    // associative array. This will block until it has completed.
-    echo $response['status']; // 200
-
-Just like the ``CurlHandler``, the ``CurlMultiHandler`` accepts custom curl
-option in the ``curl`` key of the ``client`` request option.
-
-Mock Handler
-~~~~~~~~~~~~
-
-The ``GuzzleHttp\Ring\Client\MockHandler`` is used to return mock responses.
-When constructed, the handler can be configured to return the same response
-array over and over, a future response, or a the evaluation of a callback
-function.
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Client\MockHandler;
-
-    // Return a canned response.
-    $mock = new MockHandler(['status' => 200]);
-    $response = $mock([]);
-    assert(200 == $response['status']);
-    assert([] == $response['headers']);
-
-Implementing Handlers
----------------------
-
-Client handlers are just PHP callables (functions or classes that have the
-``__invoke`` magic method). The callable accepts a request array and MUST
-return an instance of ``GuzzleHttp\Ring\Future\FutureArrayInterface`` so that
-the response can be used by both blocking and non-blocking consumers.
-
-Handlers need to follow a few simple rules:
-
-1. Do not throw exceptions. If an error is encountered, return an array that
-   contains the ``error`` key that maps to an ``\Exception`` value.
-2. If the request has a ``delay`` client option, then the handler should only
-   send the request after the specified delay time in seconds. Blocking
-   handlers may find it convenient to just let the
-   ``GuzzleHttp\Ring\Core::doSleep($request)`` function handle this for them.
-3. Always return an instance of ``GuzzleHttp\Ring\Future\FutureArrayInterface``.
-4. Complete any outstanding requests when the handler is destructed.
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/docs/client_middleware.rst b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/docs/client_middleware.rst
deleted file mode 100644
index 5a2c1a8abd..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/docs/client_middleware.rst
+++ /dev/null
@@ -1,165 +0,0 @@
-=================
-Client Middleware
-=================
-
-Middleware intercepts requests before they are sent over the wire and can be
-used to add functionality to handlers.
-
-Modifying Requests
-------------------
-
-Let's say you wanted to modify requests before they are sent over the wire
-so that they always add specific headers. This can be accomplished by creating
-a function that accepts a handler and returns a new function that adds the
-composed behavior.
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Client\CurlHandler;
-
-    $handler = new CurlHandler();
-
-    $addHeaderHandler = function (callable $handler, array $headers = []) {
-        return function (array $request) use ($handler, $headers) {
-            // Add our custom headers
-            foreach ($headers as $key => $value) {
-                $request['headers'][$key] = $value;
-            }
-
-            // Send the request using the handler and return the response.
-            return $handler($request);
-        }
-    };
-
-    // Create a new handler that adds headers to each request.
-    $handler = $addHeaderHandler($handler, [
-        'X-AddMe'       => 'hello',
-        'Authorization' => 'Basic xyz'
-    ]);
-
-    $response = $handler([
-        'http_method' => 'GET',
-        'headers'     => ['Host' => ['httpbin.org']]
-    ]);
-
-Modifying Responses
--------------------
-
-You can change a response as it's returned from a middleware. Remember that
-responses returned from an handler (including middleware) must implement
-``GuzzleHttp\Ring\Future\FutureArrayInterface``. In order to be a good citizen,
-you should not expect that the responses returned through your middleware will
-be completed synchronously. Instead, you should use the
-``GuzzleHttp\Ring\Core::proxy()`` function to modify the response when the
-underlying promise is resolved. This function is a helper function that makes it
-easy to create a new instance of ``FutureArrayInterface`` that wraps an existing
-``FutureArrayInterface`` object.
-
-Let's say you wanted to add headers to a response as they are returned from
-your middleware, but you want to make sure you aren't causing future
-responses to be dereferenced right away. You can achieve this by modifying the
-incoming request and using the ``Core::proxy`` function.
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Core;
-    use GuzzleHttp\Ring\Client\CurlHandler;
-
-    $handler = new CurlHandler();
-
-    $responseHeaderHandler = function (callable $handler, array $headers) {
-        return function (array $request) use ($handler, $headers) {
-            // Send the request using the wrapped handler.
-            return Core::proxy($handler($request), function ($response) use ($headers) {
-                // Add the headers to the response when it is available.
-                foreach ($headers as $key => $value) {
-                    $response['headers'][$key] = (array) $value;
-                }
-                // Note that you can return a regular response array when using
-                // the proxy method.
-                return $response;
-            });
-        }
-    };
-
-    // Create a new handler that adds headers to each response.
-    $handler = $responseHeaderHandler($handler, ['X-Header' => 'hello!']);
-
-    $response = $handler([
-        'http_method' => 'GET',
-        'headers'     => ['Host' => ['httpbin.org']]
-    ]);
-
-    assert($response['headers']['X-Header'] == 'hello!');
-
-Built-In Middleware
--------------------
-
-RingPHP comes with a few basic client middlewares that modify requests
-and responses.
-
-Streaming Middleware
-~~~~~~~~~~~~~~~~~~~~
-
-If you want to send all requests with the ``streaming`` option to a specific
-handler but other requests to a different handler, then use the streaming
-middleware.
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Client\CurlHandler;
-    use GuzzleHttp\Ring\Client\StreamHandler;
-    use GuzzleHttp\Ring\Client\Middleware;
-
-    $defaultHandler = new CurlHandler();
-    $streamingHandler = new StreamHandler();
-    $streamingHandler = Middleware::wrapStreaming(
-        $defaultHandler,
-        $streamingHandler
-    );
-
-    // Send the request using the streaming handler.
-    $response = $streamingHandler([
-        'http_method' => 'GET',
-        'headers'     => ['Host' => ['www.google.com']],
-        'stream'      => true
-    ]);
-
-    // Send the request using the default handler.
-    $response = $streamingHandler([
-        'http_method' => 'GET',
-        'headers'     => ['Host' => ['www.google.com']]
-    ]);
-
-Future Middleware
-~~~~~~~~~~~~~~~~~
-
-If you want to send all requests with the ``future`` option to a specific
-handler but other requests to a different handler, then use the future
-middleware.
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Client\CurlHandler;
-    use GuzzleHttp\Ring\Client\CurlMultiHandler;
-    use GuzzleHttp\Ring\Client\Middleware;
-
-    $defaultHandler = new CurlHandler();
-    $futureHandler = new CurlMultiHandler();
-    $futureHandler = Middleware::wrapFuture(
-        $defaultHandler,
-        $futureHandler
-    );
-
-    // Send the request using the blocking CurlHandler.
-    $response = $futureHandler([
-        'http_method' => 'GET',
-        'headers'     => ['Host' => ['www.google.com']]
-    ]);
-
-    // Send the request using the non-blocking CurlMultiHandler.
-    $response = $futureHandler([
-        'http_method' => 'GET',
-        'headers'     => ['Host' => ['www.google.com']],
-        'future'      => true
-    ]);
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/docs/conf.py b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/docs/conf.py
deleted file mode 100644
index c6404aa1e1..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/docs/conf.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import sys, os
-import sphinx_rtd_theme
-from sphinx.highlighting import lexers
-from pygments.lexers.web import PhpLexer
-
-
-lexers['php'] = PhpLexer(startinline=True, linenos=1)
-lexers['php-annotations'] = PhpLexer(startinline=True, linenos=1)
-primary_domain = 'php'
-
-extensions = []
-templates_path = ['_templates']
-source_suffix = '.rst'
-master_doc = 'index'
-project = u'RingPHP'
-copyright = u'2014, Michael Dowling'
-version = '1.0.0-alpha'
-exclude_patterns = ['_build']
-
-html_title = "RingPHP"
-html_short_title = "RingPHP"
-html_theme = "sphinx_rtd_theme"
-html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/docs/futures.rst b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/docs/futures.rst
deleted file mode 100644
index af29cb3780..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/docs/futures.rst
+++ /dev/null
@@ -1,164 +0,0 @@
-=======
-Futures
-=======
-
-Futures represent a computation that may have not yet completed. RingPHP
-uses hybrid of futures and promises to provide a consistent API that can be
-used for both blocking and non-blocking consumers.
-
-Promises
---------
-
-You can get the result of a future when it is ready using the promise interface
-of a future. Futures expose a promise API via a ``then()`` method that utilizes
-`React's promise library <https://github.com/reactphp/promise>`_. You should
-use this API when you do not wish to block.
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Client\CurlMultiHandler;
-
-    $request = [
-        'http_method' => 'GET',
-        'uri'         => '/',
-        'headers'     => ['host' => ['httpbin.org']]
-    ];
-
-    $response = $handler($request);
-
-    // Use the then() method to use the promise API of the future.
-    $response->then(function ($response) {
-        echo $response['status'];
-    });
-
-You can get the promise used by a future, an instance of
-``React\Promise\PromiseInterface``, by calling the ``promise()`` method.
-
-.. code-block:: php
-
-    $response = $handler($request);
-    $promise = $response->promise();
-    $promise->then(function ($response) {
-        echo $response['status'];
-    });
-
-This promise value can be used with React's
-`aggregate promise functions <https://github.com/reactphp/promise#functions>`_.
-
-Waiting
--------
-
-You can wait on a future to complete and retrieve the value, or *dereference*
-the future, using the ``wait()`` method. Calling the ``wait()`` method of a
-future will block until the result is available. The result is then returned or
-an exception is thrown if and exception was encountered while waiting on the
-the result. Subsequent calls to dereference a future will return the previously
-completed result or throw the previously encountered exception. Futures can be
-cancelled, which stops the computation if possible.
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Client\CurlMultiHandler;
-
-    $response = $handler([
-        'http_method' => 'GET',
-        'uri'         => '/',
-        'headers'     => ['host' => ['httpbin.org']]
-    ]);
-
-    // You can explicitly call block to wait on a result.
-    $realizedResponse = $response->wait();
-
-    // Future responses can be used like a regular PHP array.
-    echo $response['status'];
-
-In addition to explicitly calling the ``wait()`` function, using a future like
-a normal value will implicitly trigger the ``wait()`` function.
-
-Future Responses
-----------------
-
-RingPHP uses futures to return asynchronous responses immediately. Client
-handlers always return future responses that implement
-``GuzzleHttp\Ring\Future\ArrayFutureInterface``. These future responses act
-just like normal PHP associative arrays for blocking access and provide a
-promise interface for non-blocking access.
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Client\CurlMultiHandler;
-
-    $handler = new CurlMultiHandler();
-
-    $request = [
-        'http_method'  => 'GET',
-        'uri'          => '/',
-        'headers'      => ['Host' => ['www.google.com']]
-    ];
-
-    $response = $handler($request);
-
-    // Use the promise API for non-blocking access to the response. The actual
-    // response value will be delivered to the promise.
-    $response->then(function ($response) {
-        echo $response['status'];
-    });
-
-    // You can wait (block) until the future is completed.
-    $response->wait();
-
-    // This will implicitly call wait(), and will block too!
-    $response['status'];
-
-.. important::
-
-    Futures that are not completed by the time the underlying handler is
-    destructed will be completed when the handler is shutting down.
-
-Cancelling
-----------
-
-Futures can be cancelled if they have not already been dereferenced.
-
-RingPHP futures are typically implemented with the
-``GuzzleHttp\Ring\Future\BaseFutureTrait``. This trait provides the cancellation
-functionality that should be common to most implementations. Cancelling a
-future response will try to prevent the request from sending over the wire.
-
-When a future is cancelled, the cancellation function is invoked and performs
-the actual work needed to cancel the request from sending if possible
-(e.g., telling an event loop to stop sending a request or to close a socket).
-If no cancellation function is provided, then a request cannot be cancelled. If
-a cancel function is provided, then it should accept the future as an argument
-and return true if the future was successfully cancelled or false if it could
-not be cancelled.
-
-Wrapping an existing Promise
-----------------------------
-
-You can easily create a future from any existing promise using the
-``GuzzleHttp\Ring\Future\FutureValue`` class. This class's constructor
-accepts a promise as the first argument, a wait function as the second
-argument, and a cancellation function as the third argument. The dereference
-function is used to force the promise to resolve (for example, manually ticking
-an event loop). The cancel function is optional and is used to tell the thing
-that created the promise that it can stop computing the result (for example,
-telling an event loop to stop transferring a request).
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Future\FutureValue;
-    use React\Promise\Deferred;
-
-    $deferred = new Deferred();
-    $promise = $deferred->promise();
-
-    $f = new FutureValue(
-        $promise,
-        function () use ($deferred) {
-            // This function is responsible for blocking and resolving the
-            // promise. Here we pass in a reference to the deferred so that
-            // it can be resolved or rejected.
-            $deferred->resolve('foo');
-        }
-    );
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/docs/index.rst b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/docs/index.rst
deleted file mode 100644
index 4bbce631c7..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/docs/index.rst
+++ /dev/null
@@ -1,50 +0,0 @@
-=======
-RingPHP
-=======
-
-Provides a simple API and specification that abstracts away the details of HTTP
-into a single PHP function. RingPHP be used to power HTTP clients and servers
-through a PHP function that accepts a request hash and returns a response hash
-that is fulfilled using a `promise <https://github.com/reactphp/promise>`_,
-allowing RingPHP to support both synchronous and asynchronous workflows.
-
-By abstracting the implementation details of different HTTP clients and
-servers, RingPHP allows you to utilize pluggable HTTP clients and servers
-without tying your application to a specific implementation.
-
-.. toctree::
-   :maxdepth: 2
-
-   spec
-   futures
-   client_middleware
-   client_handlers
-   testing
-
-.. code-block:: php
-
-    <?php
-    require 'vendor/autoload.php';
-
-    use GuzzleHttp\Ring\Client\CurlHandler;
-
-    $handler = new CurlHandler();
-    $response = $handler([
-        'http_method' => 'GET',
-        'uri'         => '/',
-        'headers'     => [
-            'host'  => ['www.google.com'],
-            'x-foo' => ['baz']
-        ]
-    ]);
-
-    $response->then(function (array $response) {
-        echo $response['status'];
-    });
-
-    $response->wait();
-
-RingPHP is inspired by Clojure's `Ring <https://github.com/ring-clojure/ring>`_,
-which, in turn, was inspired by Python's WSGI and Ruby's Rack. RingPHP is
-utilized as the handler layer in `Guzzle <http://guzzlephp.org>`_ 5.0+ to send
-HTTP requests.
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/docs/requirements.txt b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/docs/requirements.txt
deleted file mode 100644
index 483a4e9600..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/docs/requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-sphinx_rtd_theme
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/docs/spec.rst b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/docs/spec.rst
deleted file mode 100644
index bc9107898f..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/docs/spec.rst
+++ /dev/null
@@ -1,311 +0,0 @@
-=============
-Specification
-=============
-
-RingPHP applications consist of handlers, requests, responses, and
-middleware.
-
-Handlers
---------
-
-Handlers are implemented as a PHP ``callable`` that accept a request array 
-and return a response array (``GuzzleHttp\Ring\Future\FutureArrayInterface``).
-
-For example:
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Future\CompletedFutureArray;
-
-    $mockHandler = function (array $request) {
-        return new CompletedFutureArray([
-            'status'  => 200,
-            'headers' => ['X-Foo' => ['Bar']],
-            'body'    => 'Hello!'
-         ]);
-    };
-
-This handler returns the same response each time it is invoked. All RingPHP
-handlers must return a ``GuzzleHttp\Ring\Future\FutureArrayInterface``. Use
-``GuzzleHttp\Ring\Future\CompletedFutureArray`` when returning a response that
-has already completed.
-
-Requests
---------
-
-A request array is a PHP associative array that contains the configuration
-settings need to send a request.
-
-.. code-block:: php
-
-    $request = [
-        'http_method' => 'GET',
-        'scheme'      => 'http',
-        'uri'         => '/',
-        'body'        => 'hello!',
-        'client'      => ['timeout' => 1.0],
-        'headers'     => [
-            'host'  => ['httpbin.org'],
-            'X-Foo' => ['baz', 'bar']
-        ]
-    ];
-
-The request array contains the following key value pairs:
-
-request_method
-    (string, required) The HTTP request method, must be all caps corresponding
-    to a HTTP request method, such as ``GET`` or ``POST``.
-
-scheme
-    (string) The transport protocol, must be one of ``http`` or ``https``.
-    Defaults to ``http``.
-
-uri
-    (string, required) The request URI excluding the query string. Must
-    start with "/".
-
-query_string
-    (string) The query string, if present (e.g., ``foo=bar``).
-
-version
-    (string) HTTP protocol version. Defaults to ``1.1``.
-
-headers
-    (required, array) Associative array of headers. Each key represents the
-    header name. Each value contains an array of strings where each entry of
-    the array SHOULD be sent over the wire on a separate header line.
-
-body
-    (string, fopen resource, ``Iterator``, ``GuzzleHttp\Stream\StreamInterface``)
-    The body of the request, if present. Can be a string, resource returned
-    from fopen, an ``Iterator`` that yields chunks of data, an object that
-    implemented ``__toString``, or a ``GuzzleHttp\Stream\StreamInterface``.
-
-future
-    (bool, string) Controls the asynchronous behavior of a response.
-
-    Set to ``true`` or omit the ``future`` option to *request* that a request
-    will be completed asynchronously. Keep in mind that your request might not
-    necessarily be completed asynchronously based on the handler you are using.
-    Set the ``future`` option to ``false`` to request that a synchronous
-    response be provided.
-
-    You can provide a string value to specify fine-tuned future behaviors that
-    may be specific to the underlying handlers you are using. There are,
-    however, some common future options that handlers should implement if
-    possible.
-
-    lazy
-        Requests that the handler does not open and send the request
-        immediately, but rather only opens and sends the request once the
-        future is dereferenced. This option is often useful for sending a large
-        number of requests concurrently to allow handlers to take better
-        advantage of non-blocking transfers by first building up a pool of
-        requests.
-
-    If an handler does not implement or understand a provided string value,
-    then the request MUST be treated as if the user provided ``true`` rather
-    than the string value.
-
-    Future responses created by asynchronous handlers MUST attempt to complete
-    any outstanding future responses when they are destructed. Asynchronous
-    handlers MAY choose to automatically complete responses when the number
-    of outstanding requests reaches an handler-specific threshold.
-
-Client Specific Options
-~~~~~~~~~~~~~~~~~~~~~~~
-
-The following options are only used in ring client handlers.
-
-.. _client-options:
-
-client
-    (array) Associative array of client specific transfer options. The
-    ``client`` request key value pair can contain the following keys:
-
-    cert
-        (string, array) Set to a string to specify the path to a file
-        containing a PEM formatted SSL client side certificate. If a password
-        is required, then set ``cert`` to an array containing the path to the
-        PEM file in the first array element followed by the certificate
-        password in the second array element.
-
-    connect_timeout
-        (float) Float describing the number of seconds to wait while trying to
-        connect to a server. Use ``0`` to wait indefinitely (the default
-        behavior).
-
-    debug
-        (bool, fopen() resource) Set to true or set to a PHP stream returned by
-        fopen() to enable debug output with the handler used to send a request.
-        If set to ``true``, the output is written to PHP's STDOUT. If a PHP
-        ``fopen`` resource handle is provided, the output is written to the
-        stream.
-
-        "Debug output" is handler specific: different handlers will yield
-        different output and various various level of detail. For example, when
-        using cURL to transfer requests, cURL's `CURLOPT_VERBOSE <http://curl.haxx.se/libcurl/c/CURLOPT_VERBOSE.html>`_
-        will be used. When using the PHP stream wrapper, `stream notifications <http://php.net/manual/en/function.stream-notification-callback.php>`_
-        will be emitted.
-
-    decode_content
-        (bool) Specify whether or not ``Content-Encoding`` responses
-        (gzip, deflate, etc.) are automatically decoded. Set to ``true`` to
-        automatically decode encoded responses. Set to ``false`` to not decode
-        responses. By default, content is *not* decoded automatically.
-
-    delay
-        (int) The number of milliseconds to delay before sending the request.
-        This is often used for delaying before retrying a request. Handlers
-        SHOULD implement this if possible, but it is not a strict requirement.
-
-    progress
-        (function) Defines a function to invoke when transfer progress is made.
-        The function accepts the following arguments:
-
-        1. The total number of bytes expected to be downloaded
-        2. The number of bytes downloaded so far
-        3. The number of bytes expected to be uploaded
-        4. The number of bytes uploaded so far
-
-    proxy
-        (string, array) Pass a string to specify an HTTP proxy, or an
-        associative array to specify different proxies for different protocols
-        where the scheme is the key and the value is the proxy address.
-
-        .. code-block:: php
-
-            $request = [
-                'http_method' => 'GET',
-                'headers'     => ['host' => ['httpbin.org']],
-                'client'      => [
-                    // Use different proxies for different URI schemes.
-                    'proxy' => [
-                        'http'  => 'http://proxy.example.com:5100',
-                        'https' => 'https://proxy.example.com:6100'
-                    ]
-                ]
-            ];
-
-    ssl_key
-        (string, array) Specify the path to a file containing a private SSL key
-        in PEM format. If a password is required, then set to an array
-        containing the path to the SSL key in the first array element followed
-        by the password required for the certificate in the second element.
-
-    save_to
-        (string, fopen resource, ``GuzzleHttp\Stream\StreamInterface``)
-        Specifies where the body of the response is downloaded. Pass a string to
-        open a local file on disk and save the output to the file. Pass an fopen
-        resource to save the output to a PHP stream resource. Pass a
-        ``GuzzleHttp\Stream\StreamInterface`` to save the output to a Guzzle
-        StreamInterface. Omitting this option will typically save the body of a
-        response to a PHP temp stream.
-
-    stream
-        (bool) Set to true to stream a response rather than download it all
-        up-front. This option will only be utilized when the corresponding
-        handler supports it.
-
-    timeout
-        (float) Float describing the timeout of the request in seconds. Use 0 to
-        wait indefinitely (the default behavior).
-
-    verify
-        (bool, string) Describes the SSL certificate verification behavior of a
-        request. Set to true to enable SSL certificate verification using the
-        system CA bundle when available (the default). Set to false to disable
-        certificate verification (this is insecure!). Set to a string to provide
-        the path to a CA bundle on disk to enable verification using a custom
-        certificate.
-
-    version
-        (string) HTTP protocol version to use with the request.
-
-Server Specific Options
-~~~~~~~~~~~~~~~~~~~~~~~
-
-The following options are only used in ring server handlers.
-
-server_port
-    (integer) The port on which the request is being handled. This is only
-    used with ring servers, and is required.
-
-server_name
-    (string) The resolved server name, or the server IP address. Required when
-    using a Ring server.
-
-remote_addr
-    (string) The IP address of the client or the last proxy that sent the
-    request. Required when using a Ring server.
-
-Responses
----------
-
-A response is an array-like object that implements
-``GuzzleHttp\Ring\Future\FutureArrayInterface``. Responses contain the
-following key value pairs:
-
-body
-    (string, fopen resource, ``Iterator``, ``GuzzleHttp\Stream\StreamInterface``)
-    The body of the response, if present. Can be a string, resource returned
-    from fopen, an ``Iterator`` that yields chunks of data, an object that
-    implemented ``__toString``, or a ``GuzzleHttp\Stream\StreamInterface``.
-
-effective_url
-    (string) The URL that returned the resulting response.
-
-error
-    (``\Exception``) Contains an exception describing any errors that were
-    encountered during the transfer.
-
-headers
-    (Required, array) Associative array of headers. Each key represents the
-    header name. Each value contains an array of strings where each entry of
-    the array is a header line. The headers array MAY be an empty array in the
-    event an error occurred before a response was received.
-
-reason
-    (string) Optional reason phrase. This option should be provided when the
-    reason phrase does not match the typical reason phrase associated with the
-    ``status`` code. See `RFC 7231 <http://tools.ietf.org/html/rfc7231#section-6.1>`_
-    for a list of HTTP reason phrases mapped to status codes.
-
-status
-    (Required, integer) The HTTP status code. The status code MAY be set to
-    ``null`` in the event an error occurred before a response was received
-    (e.g., a networking error).
-
-transfer_stats
-    (array) Provides an associative array of arbitrary transfer statistics if
-    provided by the underlying handler.
-
-version
-    (string) HTTP protocol version. Defaults to ``1.1``.
-
-Middleware
-----------
-
-Ring middleware augments the functionality of handlers by invoking them in the
-process of generating responses. Middleware is typically implemented as a
-higher-order function that takes one or more handlers as arguments followed by
-an optional associative array of options as the last argument, returning a new
-handler with the desired compound behavior.
-
-Here's an example of a middleware that adds a Content-Type header to each
-request.
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Client\CurlHandler;
-    use GuzzleHttp\Ring\Core;
-
-    $contentTypeHandler = function(callable $handler, $contentType) {
-        return function (array $request) use ($handler, $contentType) {
-            return $handler(Core::setHeader('Content-Type', $contentType));
-        };
-    };
-
-    $baseHandler = new CurlHandler();
-    $wrappedHandler = $contentTypeHandler($baseHandler, 'text/html');
-    $response = $wrappedHandler([/** request hash **/]);
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/docs/testing.rst b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/docs/testing.rst
deleted file mode 100644
index 9df2562ed4..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/docs/testing.rst
+++ /dev/null
@@ -1,74 +0,0 @@
-=======
-Testing
-=======
-
-RingPHP tests client handlers using `PHPUnit <https://phpunit.de/>`_ and a
-built-in node.js web server.
-
-Running Tests
--------------
-
-First, install the dependencies using `Composer <https://getcomposer.org>`_.
-
-    composer.phar install
-
-Next, run the unit tests using ``Make``.
-
-    make test
-
-The tests are also run on Travis-CI on each commit: https://travis-ci.org/guzzle/guzzle-ring
-
-Test Server
------------
-
-Testing client handlers usually involves actually sending HTTP requests.
-RingPHP provides a node.js web server that returns canned responses and
-keep a list of the requests that have been received. The server can then
-be queried to get a list of the requests that were sent by the client so that
-you can ensure that the client serialized and transferred requests as intended.
-
-The server keeps a list of queued responses and returns responses that are
-popped off of the queue as HTTP requests are received. When there are not
-more responses to serve, the server returns a 500 error response.
-
-The test server uses the ``GuzzleHttp\Tests\Ring\Client\Server`` class to
-control the server.
-
-.. code-block:: php
-
-    use GuzzleHttp\Ring\Client\StreamHandler;
-    use GuzzleHttp\Tests\Ring\Client\Server;
-
-    // First return a 200 followed by a 404 response.
-    Server::enqueue([
-        ['status' => 200],
-        ['status' => 404]
-    ]);
-
-    $handler = new StreamHandler();
-
-    $response = $handler([
-        'http_method' => 'GET',
-        'headers'     => ['host' => [Server::$host]],
-        'uri'         => '/'
-    ]);
-
-    assert(200 == $response['status']);
-
-    $response = $handler([
-        'http_method' => 'HEAD',
-        'headers'     => ['host' => [Server::$host]],
-        'uri'         => '/'
-    ]);
-
-    assert(404 == $response['status']);
-
-After requests have been sent, you can get a list of the requests as they
-were sent over the wire to ensure they were sent correctly.
-
-.. code-block:: php
-
-    $received = Server::received();
-
-    assert('GET' == $received[0]['http_method']);
-    assert('HEAD' == $received[1]['http_method']);
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/phpunit.xml.dist b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/phpunit.xml.dist
deleted file mode 100644
index 1d19290250..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/phpunit.xml.dist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./tests/bootstrap.php"
-         colors="true">
-    <testsuites>
-        <testsuite>
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Client/ClientUtils.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Client/ClientUtils.php
deleted file mode 100644
index 2acf92eba0..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Client/ClientUtils.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Client;
-
-/**
- * Client specific utility functions.
- */
-class ClientUtils
-{
-    /**
-     * Returns the default cacert bundle for the current system.
-     *
-     * First, the openssl.cafile and curl.cainfo php.ini settings are checked.
-     * If those settings are not configured, then the common locations for
-     * bundles found on Red Hat, CentOS, Fedora, Ubuntu, Debian, FreeBSD, OS X
-     * and Windows are checked. If any of these file locations are found on
-     * disk, they will be utilized.
-     *
-     * Note: the result of this function is cached for subsequent calls.
-     *
-     * @return string
-     * @throws \RuntimeException if no bundle can be found.
-     */
-    public static function getDefaultCaBundle()
-    {
-        static $cached = null;
-        static $cafiles = [
-            // Red Hat, CentOS, Fedora (provided by the ca-certificates package)
-            '/etc/pki/tls/certs/ca-bundle.crt',
-            // Ubuntu, Debian (provided by the ca-certificates package)
-            '/etc/ssl/certs/ca-certificates.crt',
-            // FreeBSD (provided by the ca_root_nss package)
-            '/usr/local/share/certs/ca-root-nss.crt',
-            // OS X provided by homebrew (using the default path)
-            '/usr/local/etc/openssl/cert.pem',
-            // Windows?
-            'C:\\windows\\system32\\curl-ca-bundle.crt',
-            'C:\\windows\\curl-ca-bundle.crt',
-        ];
-
-        if ($cached) {
-            return $cached;
-        }
-
-        if ($ca = ini_get('openssl.cafile')) {
-            return $cached = $ca;
-        }
-
-        if ($ca = ini_get('curl.cainfo')) {
-            return $cached = $ca;
-        }
-
-        foreach ($cafiles as $filename) {
-            if (file_exists($filename)) {
-                return $cached = $filename;
-            }
-        }
-
-        throw new \RuntimeException(self::CA_ERR);
-    }
-
-    const CA_ERR = "
-No system CA bundle could be found in any of the the common system locations.
-PHP versions earlier than 5.6 are not properly configured to use the system's
-CA bundle by default. In order to verify peer certificates, you will need to
-supply the path on disk to a certificate bundle to the 'verify' request
-option: http://docs.guzzlephp.org/en/latest/clients.html#verify. If you do not
-need a specific certificate bundle, then Mozilla provides a commonly used CA
-bundle which can be downloaded here (provided by the maintainer of cURL):
-https://raw.githubusercontent.com/bagder/ca-bundle/master/ca-bundle.crt. Once
-you have a CA bundle available on disk, you can set the 'openssl.cafile' PHP
-ini setting to point to the path to the file, allowing you to omit the 'verify'
-request option. See http://curl.haxx.se/docs/sslcerts.html for more
-information.";
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Client/CurlFactory.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Client/CurlFactory.php
deleted file mode 100644
index efe4659bf4..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Client/CurlFactory.php
+++ /dev/null
@@ -1,560 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Client;
-
-use GuzzleHttp\Ring\Core;
-use GuzzleHttp\Ring\Exception\ConnectException;
-use GuzzleHttp\Ring\Exception\RingException;
-use GuzzleHttp\Stream\LazyOpenStream;
-use GuzzleHttp\Stream\StreamInterface;
-
-/**
- * Creates curl resources from a request
- */
-class CurlFactory
-{
-    /**
-     * Creates a cURL handle, header resource, and body resource based on a
-     * transaction.
-     *
-     * @param array         $request Request hash
-     * @param null|resource $handle  Optionally provide a curl handle to modify
-     *
-     * @return array Returns an array of the curl handle, headers array, and
-     *               response body handle.
-     * @throws \RuntimeException when an option cannot be applied
-     */
-    public function __invoke(array $request, $handle = null)
-    {
-        $headers = [];
-        $options = $this->getDefaultOptions($request, $headers);
-        $this->applyMethod($request, $options);
-
-        if (isset($request['client'])) {
-            $this->applyHandlerOptions($request, $options);
-        }
-
-        $this->applyHeaders($request, $options);
-        unset($options['_headers']);
-
-        // Add handler options from the request's configuration options
-        if (isset($request['client']['curl'])) {
-            $options = $this->applyCustomCurlOptions(
-                $request['client']['curl'],
-                $options
-            );
-        }
-
-        if (!$handle) {
-            $handle = curl_init();
-        }
-
-        $body = $this->getOutputBody($request, $options);
-        curl_setopt_array($handle, $options);
-
-        return [$handle, &$headers, $body];
-    }
-
-    /**
-     * Creates a response hash from a cURL result.
-     *
-     * @param callable $handler  Handler that was used.
-     * @param array    $request  Request that sent.
-     * @param array    $response Response hash to update.
-     * @param array    $headers  Headers received during transfer.
-     * @param resource $body     Body fopen response.
-     *
-     * @return array
-     */
-    public static function createResponse(
-        callable $handler,
-        array $request,
-        array $response,
-        array $headers,
-        $body
-    ) {
-        if (isset($response['transfer_stats']['url'])) {
-            $response['effective_url'] = $response['transfer_stats']['url'];
-        }
-
-        if (!empty($headers)) {
-            $startLine = explode(' ', array_shift($headers), 3);
-            $headerList = Core::headersFromLines($headers);
-            $response['headers'] = $headerList;
-            $response['version'] = isset($startLine[0]) ? substr($startLine[0], 5) : null;
-            $response['status'] = isset($startLine[1]) ? (int) $startLine[1] : null;
-            $response['reason'] = isset($startLine[2]) ? $startLine[2] : null;
-            $response['body'] = $body;
-            Core::rewindBody($response);
-        }
-
-        return !empty($response['curl']['errno']) || !isset($response['status'])
-            ? self::createErrorResponse($handler, $request, $response)
-            : $response;
-    }
-
-    private static function createErrorResponse(
-        callable $handler,
-        array $request,
-        array $response
-    ) {
-        static $connectionErrors = [
-            CURLE_OPERATION_TIMEOUTED  => true,
-            CURLE_COULDNT_RESOLVE_HOST => true,
-            CURLE_COULDNT_CONNECT      => true,
-            CURLE_SSL_CONNECT_ERROR    => true,
-            CURLE_GOT_NOTHING          => true,
-        ];
-
-        // Retry when nothing is present or when curl failed to rewind.
-        if (!isset($response['err_message'])
-            && (empty($response['curl']['errno'])
-                || $response['curl']['errno'] == 65)
-        ) {
-            return self::retryFailedRewind($handler, $request, $response);
-        }
-
-        $message = isset($response['err_message'])
-            ? $response['err_message']
-            : sprintf('cURL error %s: %s',
-                $response['curl']['errno'],
-                isset($response['curl']['error'])
-                    ? $response['curl']['error']
-                    : 'See http://curl.haxx.se/libcurl/c/libcurl-errors.html');
-
-        $error = isset($response['curl']['errno'])
-            && isset($connectionErrors[$response['curl']['errno']])
-            ? new ConnectException($message)
-            : new RingException($message);
-
-        return $response + [
-            'status'  => null,
-            'reason'  => null,
-            'body'    => null,
-            'headers' => [],
-            'error'   => $error,
-        ];
-    }
-
-    private function getOutputBody(array $request, array &$options)
-    {
-        // Determine where the body of the response (if any) will be streamed.
-        if (isset($options[CURLOPT_WRITEFUNCTION])) {
-            return $request['client']['save_to'];
-        }
-
-        if (isset($options[CURLOPT_FILE])) {
-            return $options[CURLOPT_FILE];
-        }
-
-        if ($request['http_method'] != 'HEAD') {
-            // Create a default body if one was not provided
-            return $options[CURLOPT_FILE] = fopen('php://temp', 'w+');
-        }
-
-        return null;
-    }
-
-    private function getDefaultOptions(array $request, array &$headers)
-    {
-        $url = Core::url($request);
-        $startingResponse = false;
-
-        $options = [
-            '_headers'             => $request['headers'],
-            CURLOPT_CUSTOMREQUEST  => $request['http_method'],
-            CURLOPT_URL            => $url,
-            CURLOPT_RETURNTRANSFER => false,
-            CURLOPT_HEADER         => false,
-            CURLOPT_CONNECTTIMEOUT => 150,
-            CURLOPT_HEADERFUNCTION => function ($ch, $h) use (&$headers, &$startingResponse) {
-                $value = trim($h);
-                if ($value === '') {
-                    $startingResponse = true;
-                } elseif ($startingResponse) {
-                    $startingResponse = false;
-                    $headers = [$value];
-                } else {
-                    $headers[] = $value;
-                }
-                return strlen($h);
-            },
-        ];
-
-        if (isset($request['version'])) {
-            if ($request['version'] == 2.0) {
-                $options[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_2_0;
-            } else if ($request['version'] == 1.1) {
-                $options[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_1;
-            } else {
-                $options[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_0;
-            }
-        }
-
-        if (defined('CURLOPT_PROTOCOLS')) {
-            $options[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
-        }
-
-        return $options;
-    }
-
-    private function applyMethod(array $request, array &$options)
-    {
-        if (isset($request['body'])) {
-            $this->applyBody($request, $options);
-            return;
-        }
-
-        switch ($request['http_method']) {
-            case 'PUT':
-            case 'POST':
-                // See http://tools.ietf.org/html/rfc7230#section-3.3.2
-                if (!Core::hasHeader($request, 'Content-Length')) {
-                    $options[CURLOPT_HTTPHEADER][] = 'Content-Length: 0';
-                }
-                break;
-            case 'HEAD':
-                $options[CURLOPT_NOBODY] = true;
-                unset(
-                    $options[CURLOPT_WRITEFUNCTION],
-                    $options[CURLOPT_READFUNCTION],
-                    $options[CURLOPT_FILE],
-                    $options[CURLOPT_INFILE]
-                );
-        }
-    }
-
-    private function applyBody(array $request, array &$options)
-    {
-        $contentLength = Core::firstHeader($request, 'Content-Length');
-        $size = $contentLength !== null ? (int) $contentLength : null;
-
-        // Send the body as a string if the size is less than 1MB OR if the
-        // [client][curl][body_as_string] request value is set.
-        if (($size !== null && $size < 1000000) ||
-            isset($request['client']['curl']['body_as_string']) ||
-            is_string($request['body'])
-        ) {
-            $options[CURLOPT_POSTFIELDS] = Core::body($request);
-            // Don't duplicate the Content-Length header
-            $this->removeHeader('Content-Length', $options);
-            $this->removeHeader('Transfer-Encoding', $options);
-        } else {
-            $options[CURLOPT_UPLOAD] = true;
-            if ($size !== null) {
-                // Let cURL handle setting the Content-Length header
-                $options[CURLOPT_INFILESIZE] = $size;
-                $this->removeHeader('Content-Length', $options);
-            }
-            $this->addStreamingBody($request, $options);
-        }
-
-        // If the Expect header is not present, prevent curl from adding it
-        if (!Core::hasHeader($request, 'Expect')) {
-            $options[CURLOPT_HTTPHEADER][] = 'Expect:';
-        }
-
-        // cURL sometimes adds a content-type by default. Prevent this.
-        if (!Core::hasHeader($request, 'Content-Type')) {
-            $options[CURLOPT_HTTPHEADER][] = 'Content-Type:';
-        }
-    }
-
-    private function addStreamingBody(array $request, array &$options)
-    {
-        $body = $request['body'];
-
-        if ($body instanceof StreamInterface) {
-            $options[CURLOPT_READFUNCTION] = function ($ch, $fd, $length) use ($body) {
-                return (string) $body->read($length);
-            };
-            if (!isset($options[CURLOPT_INFILESIZE])) {
-                if ($size = $body->getSize()) {
-                    $options[CURLOPT_INFILESIZE] = $size;
-                }
-            }
-        } elseif (is_resource($body)) {
-            $options[CURLOPT_INFILE] = $body;
-        } elseif ($body instanceof \Iterator) {
-            $buf = '';
-            $options[CURLOPT_READFUNCTION] = function ($ch, $fd, $length) use ($body, &$buf) {
-                if ($body->valid()) {
-                    $buf .= $body->current();
-                    $body->next();
-                }
-                $result = (string) substr($buf, 0, $length);
-                $buf = substr($buf, $length);
-                return $result;
-            };
-        } else {
-            throw new \InvalidArgumentException('Invalid request body provided');
-        }
-    }
-
-    private function applyHeaders(array $request, array &$options)
-    {
-        foreach ($options['_headers'] as $name => $values) {
-            foreach ($values as $value) {
-                $options[CURLOPT_HTTPHEADER][] = "$name: $value";
-            }
-        }
-
-        // Remove the Accept header if one was not set
-        if (!Core::hasHeader($request, 'Accept')) {
-            $options[CURLOPT_HTTPHEADER][] = 'Accept:';
-        }
-    }
-
-    /**
-     * Takes an array of curl options specified in the 'curl' option of a
-     * request's configuration array and maps them to CURLOPT_* options.
-     *
-     * This method is only called when a  request has a 'curl' config setting.
-     *
-     * @param array $config  Configuration array of custom curl option
-     * @param array $options Array of existing curl options
-     *
-     * @return array Returns a new array of curl options
-     */
-    private function applyCustomCurlOptions(array $config, array $options)
-    {
-        $curlOptions = [];
-        foreach ($config as $key => $value) {
-            if (is_int($key)) {
-                $curlOptions[$key] = $value;
-            }
-        }
-
-        return $curlOptions + $options;
-    }
-
-    /**
-     * Remove a header from the options array.
-     *
-     * @param string $name    Case-insensitive header to remove
-     * @param array  $options Array of options to modify
-     */
-    private function removeHeader($name, array &$options)
-    {
-        foreach (array_keys($options['_headers']) as $key) {
-            if (!strcasecmp($key, $name)) {
-                unset($options['_headers'][$key]);
-                return;
-            }
-        }
-    }
-
-    /**
-     * Applies an array of request client options to a the options array.
-     *
-     * This method uses a large switch rather than double-dispatch to save on
-     * high overhead of calling functions in PHP.
-     */
-    private function applyHandlerOptions(array $request, array &$options)
-    {
-        foreach ($request['client'] as $key => $value) {
-            switch ($key) {
-            // Violating PSR-4 to provide more room.
-            case 'verify':
-
-                if ($value === false) {
-                    unset($options[CURLOPT_CAINFO]);
-                    $options[CURLOPT_SSL_VERIFYHOST] = 0;
-                    $options[CURLOPT_SSL_VERIFYPEER] = false;
-                    continue;
-                }
-
-                $options[CURLOPT_SSL_VERIFYHOST] = 2;
-                $options[CURLOPT_SSL_VERIFYPEER] = true;
-
-                if (is_string($value)) {
-                    $options[CURLOPT_CAINFO] = $value;
-                    if (!file_exists($value)) {
-                        throw new \InvalidArgumentException(
-                            "SSL CA bundle not found: $value"
-                        );
-                    }
-                }
-                break;
-
-            case 'decode_content':
-
-                if ($value === false) {
-                    continue;
-                }
-
-                $accept = Core::firstHeader($request, 'Accept-Encoding');
-                if ($accept) {
-                    $options[CURLOPT_ENCODING] = $accept;
-                } else {
-                    $options[CURLOPT_ENCODING] = '';
-                    // Don't let curl send the header over the wire
-                    $options[CURLOPT_HTTPHEADER][] = 'Accept-Encoding:';
-                }
-                break;
-
-            case 'save_to':
-
-                if (is_string($value)) {
-                    if (!is_dir(dirname($value))) {
-                        throw new \RuntimeException(sprintf(
-                            'Directory %s does not exist for save_to value of %s',
-                            dirname($value),
-                            $value
-                        ));
-                    }
-                    $value = new LazyOpenStream($value, 'w+');
-                }
-
-                if ($value instanceof StreamInterface) {
-                    $options[CURLOPT_WRITEFUNCTION] =
-                        function ($ch, $write) use ($value) {
-                            return $value->write($write);
-                        };
-                } elseif (is_resource($value)) {
-                    $options[CURLOPT_FILE] = $value;
-                } else {
-                    throw new \InvalidArgumentException('save_to must be a '
-                        . 'GuzzleHttp\Stream\StreamInterface or resource');
-                }
-                break;
-
-            case 'timeout':
-
-                if (defined('CURLOPT_TIMEOUT_MS')) {
-                    $options[CURLOPT_TIMEOUT_MS] = $value * 1000;
-                } else {
-                    $options[CURLOPT_TIMEOUT] = $value;
-                }
-                break;
-
-            case 'connect_timeout':
-
-                if (defined('CURLOPT_CONNECTTIMEOUT_MS')) {
-                    $options[CURLOPT_CONNECTTIMEOUT_MS] = $value * 1000;
-                } else {
-                    $options[CURLOPT_CONNECTTIMEOUT] = $value;
-                }
-                break;
-
-            case 'proxy':
-
-                if (!is_array($value)) {
-                    $options[CURLOPT_PROXY] = $value;
-                } elseif (isset($request['scheme'])) {
-                    $scheme = $request['scheme'];
-                    if (isset($value[$scheme])) {
-                        $options[CURLOPT_PROXY] = $value[$scheme];
-                    }
-                }
-                break;
-
-            case 'cert':
-
-                if (is_array($value)) {
-                    $options[CURLOPT_SSLCERTPASSWD] = $value[1];
-                    $value = $value[0];
-                }
-
-                if (!file_exists($value)) {
-                    throw new \InvalidArgumentException(
-                        "SSL certificate not found: {$value}"
-                    );
-                }
-
-                $options[CURLOPT_SSLCERT] = $value;
-                break;
-
-            case 'ssl_key':
-
-                if (is_array($value)) {
-                    $options[CURLOPT_SSLKEYPASSWD] = $value[1];
-                    $value = $value[0];
-                }
-
-                if (!file_exists($value)) {
-                    throw new \InvalidArgumentException(
-                        "SSL private key not found: {$value}"
-                    );
-                }
-
-                $options[CURLOPT_SSLKEY] = $value;
-                break;
-
-            case 'progress':
-
-                if (!is_callable($value)) {
-                    throw new \InvalidArgumentException(
-                        'progress client option must be callable'
-                    );
-                }
-
-                $options[CURLOPT_NOPROGRESS] = false;
-                $options[CURLOPT_PROGRESSFUNCTION] =
-                    function () use ($value) {
-                        $args = func_get_args();
-                        // PHP 5.5 pushed the handle onto the start of the args
-                        if (is_resource($args[0])) {
-                            array_shift($args);
-                        }
-                        call_user_func_array($value, $args);
-                    };
-                break;
-
-            case 'debug':
-
-                if ($value) {
-                    $options[CURLOPT_STDERR] = Core::getDebugResource($value);
-                    $options[CURLOPT_VERBOSE] = true;
-                }
-                break;
-            }
-        }
-    }
-
-    /**
-     * This function ensures that a response was set on a transaction. If one
-     * was not set, then the request is retried if possible. This error
-     * typically means you are sending a payload, curl encountered a
-     * "Connection died, retrying a fresh connect" error, tried to rewind the
-     * stream, and then encountered a "necessary data rewind wasn't possible"
-     * error, causing the request to be sent through curl_multi_info_read()
-     * without an error status.
-     */
-    private static function retryFailedRewind(
-        callable $handler,
-        array $request,
-        array $response
-    ) {
-        // If there is no body, then there is some other kind of issue. This
-        // is weird and should probably never happen.
-        if (!isset($request['body'])) {
-            $response['err_message'] = 'No response was received for a request '
-                . 'with no body. This could mean that you are saturating your '
-                . 'network.';
-            return self::createErrorResponse($handler, $request, $response);
-        }
-
-        if (!Core::rewindBody($request)) {
-            $response['err_message'] = 'The connection unexpectedly failed '
-                . 'without providing an error. The request would have been '
-                . 'retried, but attempting to rewind the request body failed.';
-            return self::createErrorResponse($handler, $request, $response);
-        }
-
-        // Retry no more than 3 times before giving up.
-        if (!isset($request['curl']['retries'])) {
-            $request['curl']['retries'] = 1;
-        } elseif ($request['curl']['retries'] == 2) {
-            $response['err_message'] = 'The cURL request was retried 3 times '
-                . 'and did no succeed. cURL was unable to rewind the body of '
-                . 'the request and subsequent retries resulted in the same '
-                . 'error. Turn on the debug option to see what went wrong. '
-                . 'See https://bugs.php.net/bug.php?id=47204 for more information.';
-            return self::createErrorResponse($handler, $request, $response);
-        } else {
-            $request['curl']['retries']++;
-        }
-
-        return $handler($request);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Client/CurlHandler.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Client/CurlHandler.php
deleted file mode 100644
index e00aa4eaca..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Client/CurlHandler.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Client;
-
-use GuzzleHttp\Ring\Future\CompletedFutureArray;
-use GuzzleHttp\Ring\Core;
-
-/**
- * HTTP handler that uses cURL easy handles as a transport layer.
- *
- * Requires PHP 5.5+
- *
- * When using the CurlHandler, custom curl options can be specified as an
- * associative array of curl option constants mapping to values in the
- * **curl** key of the "client" key of the request.
- */
-class CurlHandler
-{
-    /** @var callable */
-    private $factory;
-
-    /** @var array Array of curl easy handles */
-    private $handles = [];
-
-    /** @var array Array of owned curl easy handles */
-    private $ownedHandles = [];
-
-    /** @var int Total number of idle handles to keep in cache */
-    private $maxHandles;
-
-    /**
-     * Accepts an associative array of options:
-     *
-     * - factory: Optional callable factory used to create cURL handles.
-     *   The callable is passed a request hash when invoked, and returns an
-     *   array of the curl handle, headers resource, and body resource.
-     * - max_handles: Maximum number of idle handles (defaults to 5).
-     *
-     * @param array $options Array of options to use with the handler
-     */
-    public function __construct(array $options = [])
-    {
-        $this->handles = $this->ownedHandles = [];
-        $this->factory = isset($options['handle_factory'])
-            ? $options['handle_factory']
-            : new CurlFactory();
-        $this->maxHandles = isset($options['max_handles'])
-            ? $options['max_handles']
-            : 5;
-    }
-
-    public function __destruct()
-    {
-        foreach ($this->handles as $handle) {
-            if (is_resource($handle)) {
-                curl_close($handle);
-            }
-        }
-    }
-
-    /**
-     * @param array $request
-     *
-     * @return CompletedFutureArray
-     */
-    public function __invoke(array $request)
-    {
-        return new CompletedFutureArray(
-            $this->_invokeAsArray($request)
-        );
-    }
-
-    /**
-     * @internal
-     *
-     * @param array $request
-     *
-     * @return array
-     */
-    public function _invokeAsArray(array $request)
-    {
-        $factory = $this->factory;
-
-        // Ensure headers are by reference. They're updated elsewhere.
-        $result = $factory($request, $this->checkoutEasyHandle());
-        $h = $result[0];
-        $hd =& $result[1];
-        $bd = $result[2];
-        Core::doSleep($request);
-        curl_exec($h);
-        $response = ['transfer_stats' => curl_getinfo($h)];
-        $response['curl']['error'] = curl_error($h);
-        $response['curl']['errno'] = curl_errno($h);
-        $response['transfer_stats'] = array_merge($response['transfer_stats'], $response['curl']);
-        $this->releaseEasyHandle($h);
-
-        return CurlFactory::createResponse([$this, '_invokeAsArray'], $request, $response, $hd, $bd);
-    }
-
-    private function checkoutEasyHandle()
-    {
-        // Find an unused handle in the cache
-        if (false !== ($key = array_search(false, $this->ownedHandles, true))) {
-            $this->ownedHandles[$key] = true;
-            return $this->handles[$key];
-        }
-
-        // Add a new handle
-        $handle = curl_init();
-        $id = (int) $handle;
-        $this->handles[$id] = $handle;
-        $this->ownedHandles[$id] = true;
-
-        return $handle;
-    }
-
-    private function releaseEasyHandle($handle)
-    {
-        $id = (int) $handle;
-        if (count($this->ownedHandles) > $this->maxHandles) {
-            curl_close($this->handles[$id]);
-            unset($this->handles[$id], $this->ownedHandles[$id]);
-        } else {
-            // curl_reset doesn't clear these out for some reason
-            static $unsetValues = [
-                CURLOPT_HEADERFUNCTION   => null,
-                CURLOPT_WRITEFUNCTION    => null,
-                CURLOPT_READFUNCTION     => null,
-                CURLOPT_PROGRESSFUNCTION => null,
-            ];
-            curl_setopt_array($handle, $unsetValues);
-            curl_reset($handle);
-            $this->ownedHandles[$id] = false;
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Client/CurlMultiHandler.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Client/CurlMultiHandler.php
deleted file mode 100644
index b45f6c3979..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Client/CurlMultiHandler.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Client;
-
-use GuzzleHttp\Ring\Future\FutureArray;
-use React\Promise\Deferred;
-
-/**
- * Returns an asynchronous response using curl_multi_* functions.
- *
- * This handler supports future responses and the "delay" request client
- * option that can be used to delay before sending a request.
- *
- * When using the CurlMultiHandler, custom curl options can be specified as an
- * associative array of curl option constants mapping to values in the
- * **curl** key of the "client" key of the request.
- *
- * @property resource $_mh Internal use only. Lazy loaded multi-handle.
- */
-class CurlMultiHandler
-{
-    /** @var callable */
-    private $factory;
-    private $selectTimeout;
-    private $active;
-    private $handles = [];
-    private $delays = [];
-    private $maxHandles;
-
-    /**
-     * This handler accepts the following options:
-     *
-     * - mh: An optional curl_multi resource
-     * - handle_factory: An optional callable used to generate curl handle
-     *   resources. the callable accepts a request hash and returns an array
-     *   of the handle, headers file resource, and the body resource.
-     * - select_timeout: Optional timeout (in seconds) to block before timing
-     *   out while selecting curl handles. Defaults to 1 second.
-     * - max_handles: Optional integer representing the maximum number of
-     *   open requests. When this number is reached, the queued futures are
-     *   flushed.
-     *
-     * @param array $options
-     */
-    public function __construct(array $options = [])
-    {
-        if (isset($options['mh'])) {
-            $this->_mh = $options['mh'];
-        }
-        $this->factory = isset($options['handle_factory'])
-            ? $options['handle_factory'] : new CurlFactory();
-        $this->selectTimeout = isset($options['select_timeout'])
-            ? $options['select_timeout'] : 1;
-        $this->maxHandles = isset($options['max_handles'])
-            ? $options['max_handles'] : 100;
-    }
-
-    public function __get($name)
-    {
-        if ($name === '_mh') {
-            return $this->_mh = curl_multi_init();
-        }
-
-        throw new \BadMethodCallException();
-    }
-
-    public function __destruct()
-    {
-        // Finish any open connections before terminating the script.
-        if ($this->handles) {
-            $this->execute();
-        }
-
-        if (isset($this->_mh)) {
-            curl_multi_close($this->_mh);
-            unset($this->_mh);
-        }
-    }
-
-    public function __invoke(array $request)
-    {
-        $factory = $this->factory;
-        $result = $factory($request);
-        $entry = [
-            'request'  => $request,
-            'response' => [],
-            'handle'   => $result[0],
-            'headers'  => &$result[1],
-            'body'     => $result[2],
-            'deferred' => new Deferred(),
-        ];
-
-        $id = (int) $result[0];
-
-        $future = new FutureArray(
-            $entry['deferred']->promise(),
-            [$this, 'execute'],
-            function () use ($id) {
-                return $this->cancel($id);
-            }
-        );
-
-        $this->addRequest($entry);
-
-        // Transfer outstanding requests if there are too many open handles.
-        if (count($this->handles) >= $this->maxHandles) {
-            $this->execute();
-        }
-
-        return $future;
-    }
-
-    /**
-     * Runs until all outstanding connections have completed.
-     */
-    public function execute()
-    {
-        do {
-
-            if ($this->active &&
-                curl_multi_select($this->_mh, $this->selectTimeout) === -1
-            ) {
-                // Perform a usleep if a select returns -1.
-                // See: https://bugs.php.net/bug.php?id=61141
-                usleep(250);
-            }
-
-            // Add any delayed futures if needed.
-            if ($this->delays) {
-                $this->addDelays();
-            }
-
-            do {
-                $mrc = curl_multi_exec($this->_mh, $this->active);
-            } while ($mrc === CURLM_CALL_MULTI_PERFORM);
-
-            $this->processMessages();
-
-            // If there are delays but no transfers, then sleep for a bit.
-            if (!$this->active && $this->delays) {
-                usleep(500);
-            }
-
-        } while ($this->active || $this->handles);
-    }
-
-    private function addRequest(array &$entry)
-    {
-        $id = (int) $entry['handle'];
-        $this->handles[$id] = $entry;
-
-        // If the request is a delay, then add the reques to the curl multi
-        // pool only after the specified delay.
-        if (isset($entry['request']['client']['delay'])) {
-            $this->delays[$id] = microtime(true) + ($entry['request']['client']['delay'] / 1000);
-        } elseif (empty($entry['request']['future'])) {
-            curl_multi_add_handle($this->_mh, $entry['handle']);
-        } else {
-            curl_multi_add_handle($this->_mh, $entry['handle']);
-            // "lazy" futures are only sent once the pool has many requests.
-            if ($entry['request']['future'] !== 'lazy') {
-                do {
-                    $mrc = curl_multi_exec($this->_mh, $this->active);
-                } while ($mrc === CURLM_CALL_MULTI_PERFORM);
-                $this->processMessages();
-            }
-        }
-    }
-
-    private function removeProcessed($id)
-    {
-        if (isset($this->handles[$id])) {
-            curl_multi_remove_handle(
-                $this->_mh,
-                $this->handles[$id]['handle']
-            );
-            curl_close($this->handles[$id]['handle']);
-            unset($this->handles[$id], $this->delays[$id]);
-        }
-    }
-
-    /**
-     * Cancels a handle from sending and removes references to it.
-     *
-     * @param int $id Handle ID to cancel and remove.
-     *
-     * @return bool True on success, false on failure.
-     */
-    private function cancel($id)
-    {
-        // Cannot cancel if it has been processed.
-        if (!isset($this->handles[$id])) {
-            return false;
-        }
-
-        $handle = $this->handles[$id]['handle'];
-        unset($this->delays[$id], $this->handles[$id]);
-        curl_multi_remove_handle($this->_mh, $handle);
-        curl_close($handle);
-
-        return true;
-    }
-
-    private function addDelays()
-    {
-        $currentTime = microtime(true);
-
-        foreach ($this->delays as $id => $delay) {
-            if ($currentTime >= $delay) {
-                unset($this->delays[$id]);
-                curl_multi_add_handle(
-                    $this->_mh,
-                    $this->handles[$id]['handle']
-                );
-            }
-        }
-    }
-
-    private function processMessages()
-    {
-        while ($done = curl_multi_info_read($this->_mh)) {
-            $id = (int) $done['handle'];
-
-            if (!isset($this->handles[$id])) {
-                // Probably was cancelled.
-                continue;
-            }
-
-            $entry = $this->handles[$id];
-            $entry['response']['transfer_stats'] = curl_getinfo($done['handle']);
-
-            if ($done['result'] !== CURLM_OK) {
-                $entry['response']['curl']['errno'] = $done['result'];
-                if (function_exists('curl_strerror')) {
-                    $entry['response']['curl']['error'] = curl_strerror($done['result']);
-                }
-            }
-
-            $result = CurlFactory::createResponse(
-                $this,
-                $entry['request'],
-                $entry['response'],
-                $entry['headers'],
-                $entry['body']
-            );
-
-            $this->removeProcessed($id);
-            $entry['deferred']->resolve($result);
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Client/Middleware.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Client/Middleware.php
deleted file mode 100644
index 6fa7318aba..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Client/Middleware.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Client;
-
-/**
- * Provides basic middleware wrappers.
- *
- * If a middleware is more complex than a few lines of code, then it should
- * be implemented in a class rather than a static method.
- */
-class Middleware
-{
-    /**
-     * Sends future requests to a future compatible handler while sending all
-     * other requests to a default handler.
-     *
-     * When the "future" option is not provided on a request, any future responses
-     * are automatically converted to synchronous responses and block.
-     *
-     * @param callable $default Handler used for non-streaming responses
-     * @param callable $future  Handler used for future responses
-     *
-     * @return callable Returns the composed handler.
-     */
-    public static function wrapFuture(
-        callable $default,
-        callable $future
-    ) {
-        return function (array $request) use ($default, $future) {
-            return empty($request['client']['future'])
-                ? $default($request)
-                : $future($request);
-        };
-    }
-
-    /**
-     * Sends streaming requests to a streaming compatible handler while sendin
-     * all other requests to a default handler.
-     *
-     * This, for example, could be useful for taking advantage of the
-     * performance benefits of curl while still supporting true streaming
-     * through the StreamHandler.
-     *
-     * @param callable $default   Handler used for non-streaming responses
-     * @param callable $streaming Handler used for streaming responses
-     *
-     * @return callable Returns the composed handler.
-     */
-    public static function wrapStreaming(
-        callable $default,
-        callable $streaming
-    ) {
-        return function (array $request) use ($default, $streaming) {
-            return empty($request['client']['stream'])
-                ? $default($request)
-                : $streaming($request);
-        };
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Client/MockHandler.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Client/MockHandler.php
deleted file mode 100644
index 56cc32da77..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Client/MockHandler.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Client;
-
-use GuzzleHttp\Ring\Core;
-use GuzzleHttp\Ring\Future\CompletedFutureArray;
-use GuzzleHttp\Ring\Future\FutureArrayInterface;
-
-/**
- * Ring handler that returns a canned response or evaluated function result.
- */
-class MockHandler
-{
-    /** @var callable|array|FutureArrayInterface */
-    private $result;
-
-    /**
-     * Provide an array or future to always return the same value. Provide a
-     * callable that accepts a request object and returns an array or future
-     * to dynamically create a response.
-     *
-     * @param array|FutureArrayInterface|callable $result Mock return value.
-     */
-    public function __construct($result)
-    {
-        $this->result = $result;
-    }
-
-    public function __invoke(array $request)
-    {
-        Core::doSleep($request);
-        $response = is_callable($this->result)
-            ? call_user_func($this->result, $request)
-            : $this->result;
-
-        if (is_array($response)) {
-            $response = new CompletedFutureArray($response + [
-                'status'        => null,
-                'body'          => null,
-                'headers'       => [],
-                'reason'        => null,
-                'effective_url' => null,
-            ]);
-        } elseif (!$response instanceof FutureArrayInterface) {
-            throw new \InvalidArgumentException(
-                'Response must be an array or FutureArrayInterface. Found '
-                . Core::describeType($request)
-            );
-        }
-
-        return $response;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Client/StreamHandler.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Client/StreamHandler.php
deleted file mode 100644
index 4bacec1337..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Client/StreamHandler.php
+++ /dev/null
@@ -1,414 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Client;
-
-use GuzzleHttp\Ring\Core;
-use GuzzleHttp\Ring\Exception\ConnectException;
-use GuzzleHttp\Ring\Exception\RingException;
-use GuzzleHttp\Ring\Future\CompletedFutureArray;
-use GuzzleHttp\Stream\InflateStream;
-use GuzzleHttp\Stream\StreamInterface;
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Stream\Utils;
-
-/**
- * RingPHP client handler that uses PHP's HTTP stream wrapper.
- */
-class StreamHandler
-{
-    private $options;
-    private $lastHeaders;
-
-    public function __construct(array $options = [])
-    {
-        $this->options = $options;
-    }
-
-    public function __invoke(array $request)
-    {
-        $url = Core::url($request);
-        Core::doSleep($request);
-
-        try {
-            // Does not support the expect header.
-            $request = Core::removeHeader($request, 'Expect');
-            $stream = $this->createStream($url, $request);
-            return $this->createResponse($request, $url, $stream);
-        } catch (RingException $e) {
-            return $this->createErrorResponse($url, $e);
-        }
-    }
-
-    private function createResponse(array $request, $url, $stream)
-    {
-        $hdrs = $this->lastHeaders;
-        $this->lastHeaders = null;
-        $parts = explode(' ', array_shift($hdrs), 3);
-        $response = [
-            'version'        => substr($parts[0], 5),
-            'status'         => $parts[1],
-            'reason'         => isset($parts[2]) ? $parts[2] : null,
-            'headers'        => Core::headersFromLines($hdrs),
-            'effective_url'  => $url,
-        ];
-
-        $stream = $this->checkDecode($request, $response, $stream);
-
-        // If not streaming, then drain the response into a stream.
-        if (empty($request['client']['stream'])) {
-            $dest = isset($request['client']['save_to'])
-                ? $request['client']['save_to']
-                : fopen('php://temp', 'r+');
-            $stream = $this->drain($stream, $dest);
-        }
-
-        $response['body'] = $stream;
-
-        return new CompletedFutureArray($response);
-    }
-
-    private function checkDecode(array $request, array $response, $stream)
-    {
-        // Automatically decode responses when instructed.
-        if (!empty($request['client']['decode_content'])) {
-            switch (Core::firstHeader($response, 'Content-Encoding', true)) {
-                case 'gzip':
-                case 'deflate':
-                    $stream = new InflateStream(Stream::factory($stream));
-                    break;
-            }
-        }
-
-        return $stream;
-    }
-
-    /**
-     * Drains the stream into the "save_to" client option.
-     *
-     * @param resource                        $stream
-     * @param string|resource|StreamInterface $dest
-     *
-     * @return Stream
-     * @throws \RuntimeException when the save_to option is invalid.
-     */
-    private function drain($stream, $dest)
-    {
-        if (is_resource($stream)) {
-            if (!is_resource($dest)) {
-                $stream = Stream::factory($stream);
-            } else {
-                stream_copy_to_stream($stream, $dest);
-                fclose($stream);
-                rewind($dest);
-                return $dest;
-            }
-        }
-
-        // Stream the response into the destination stream
-        $dest = is_string($dest)
-            ? new Stream(Utils::open($dest, 'r+'))
-            : Stream::factory($dest);
-
-        Utils::copyToStream($stream, $dest);
-        $dest->seek(0);
-        $stream->close();
-
-        return $dest;
-    }
-
-    /**
-     * Creates an error response for the given stream.
-     *
-     * @param string        $url
-     * @param RingException $e
-     *
-     * @return array
-     */
-    private function createErrorResponse($url, RingException $e)
-    {
-        // Determine if the error was a networking error.
-        $message = $e->getMessage();
-
-        // This list can probably get more comprehensive.
-        if (strpos($message, 'getaddrinfo') // DNS lookup failed
-            || strpos($message, 'Connection refused')
-        ) {
-            $e = new ConnectException($e->getMessage(), 0, $e);
-        }
-
-        return new CompletedFutureArray([
-            'status'        => null,
-            'body'          => null,
-            'headers'       => [],
-            'effective_url' => $url,
-            'error'         => $e
-        ]);
-    }
-
-    /**
-     * Create a resource and check to ensure it was created successfully
-     *
-     * @param callable $callback Callable that returns stream resource
-     *
-     * @return resource
-     * @throws \RuntimeException on error
-     */
-    private function createResource(callable $callback)
-    {
-        $errors = null;
-        set_error_handler(function ($_, $msg, $file, $line) use (&$errors) {
-            $errors[] = [
-                'message' => $msg,
-                'file'    => $file,
-                'line'    => $line
-            ];
-            return true;
-        });
-
-        $resource = $callback();
-        restore_error_handler();
-
-        if (!$resource) {
-            $message = 'Error creating resource: ';
-            foreach ($errors as $err) {
-                foreach ($err as $key => $value) {
-                    $message .= "[$key] $value" . PHP_EOL;
-                }
-            }
-            throw new RingException(trim($message));
-        }
-
-        return $resource;
-    }
-
-    private function createStream($url, array $request)
-    {
-        static $methods;
-        if (!$methods) {
-            $methods = array_flip(get_class_methods(__CLASS__));
-        }
-
-        // HTTP/1.1 streams using the PHP stream wrapper require a
-        // Connection: close header
-        if ((!isset($request['version']) || $request['version'] == '1.1')
-            && !Core::hasHeader($request, 'Connection')
-        ) {
-            $request['headers']['Connection'] = ['close'];
-        }
-
-        // Ensure SSL is verified by default
-        if (!isset($request['client']['verify'])) {
-            $request['client']['verify'] = true;
-        }
-
-        $params = [];
-        $options = $this->getDefaultOptions($request);
-
-        if (isset($request['client'])) {
-            foreach ($request['client'] as $key => $value) {
-                $method = "add_{$key}";
-                if (isset($methods[$method])) {
-                    $this->{$method}($request, $options, $value, $params);
-                }
-            }
-        }
-
-        return $this->createStreamResource(
-            $url,
-            $request,
-            $options,
-            $this->createContext($request, $options, $params)
-        );
-    }
-
-    private function getDefaultOptions(array $request)
-    {
-        $headers = "";
-        foreach ($request['headers'] as $name => $value) {
-            foreach ((array) $value as $val) {
-                $headers .= "$name: $val\r\n";
-            }
-        }
-
-        $context = [
-            'http' => [
-                'method'           => $request['http_method'],
-                'header'           => $headers,
-                'protocol_version' => isset($request['version']) ? $request['version'] : 1.1,
-                'ignore_errors'    => true,
-                'follow_location'  => 0,
-            ],
-        ];
-
-        $body = Core::body($request);
-        if (isset($body)) {
-            $context['http']['content'] = $body;
-            // Prevent the HTTP handler from adding a Content-Type header.
-            if (!Core::hasHeader($request, 'Content-Type')) {
-                $context['http']['header'] .= "Content-Type:\r\n";
-            }
-        }
-
-        $context['http']['header'] = rtrim($context['http']['header']);
-
-        return $context;
-    }
-
-    private function add_proxy(array $request, &$options, $value, &$params)
-    {
-        if (!is_array($value)) {
-            $options['http']['proxy'] = $value;
-        } else {
-            $scheme = isset($request['scheme']) ? $request['scheme'] : 'http';
-            if (isset($value[$scheme])) {
-                $options['http']['proxy'] = $value[$scheme];
-            }
-        }
-    }
-
-    private function add_timeout(array $request, &$options, $value, &$params)
-    {
-        $options['http']['timeout'] = $value;
-    }
-
-    private function add_verify(array $request, &$options, $value, &$params)
-    {
-        if ($value === true) {
-            // PHP 5.6 or greater will find the system cert by default. When
-            // < 5.6, use the Guzzle bundled cacert.
-            if (PHP_VERSION_ID < 50600) {
-                $options['ssl']['cafile'] = ClientUtils::getDefaultCaBundle();
-            }
-        } elseif (is_string($value)) {
-            $options['ssl']['cafile'] = $value;
-            if (!file_exists($value)) {
-                throw new RingException("SSL CA bundle not found: $value");
-            }
-        } elseif ($value === false) {
-            $options['ssl']['verify_peer'] = false;
-            $options['ssl']['allow_self_signed'] = true;
-            return;
-        } else {
-            throw new RingException('Invalid verify request option');
-        }
-
-        $options['ssl']['verify_peer'] = true;
-        $options['ssl']['allow_self_signed'] = false;
-    }
-
-    private function add_cert(array $request, &$options, $value, &$params)
-    {
-        if (is_array($value)) {
-            $options['ssl']['passphrase'] = $value[1];
-            $value = $value[0];
-        }
-
-        if (!file_exists($value)) {
-            throw new RingException("SSL certificate not found: {$value}");
-        }
-
-        $options['ssl']['local_cert'] = $value;
-    }
-
-    private function add_progress(array $request, &$options, $value, &$params)
-    {
-        $fn = function ($code, $_1, $_2, $_3, $transferred, $total) use ($value) {
-            if ($code == STREAM_NOTIFY_PROGRESS) {
-                $value($total, $transferred, null, null);
-            }
-        };
-
-        // Wrap the existing function if needed.
-        $params['notification'] = isset($params['notification'])
-            ? Core::callArray([$params['notification'], $fn])
-            : $fn;
-    }
-
-    private function add_debug(array $request, &$options, $value, &$params)
-    {
-        if ($value === false) {
-            return;
-        }
-
-        static $map = [
-            STREAM_NOTIFY_CONNECT       => 'CONNECT',
-            STREAM_NOTIFY_AUTH_REQUIRED => 'AUTH_REQUIRED',
-            STREAM_NOTIFY_AUTH_RESULT   => 'AUTH_RESULT',
-            STREAM_NOTIFY_MIME_TYPE_IS  => 'MIME_TYPE_IS',
-            STREAM_NOTIFY_FILE_SIZE_IS  => 'FILE_SIZE_IS',
-            STREAM_NOTIFY_REDIRECTED    => 'REDIRECTED',
-            STREAM_NOTIFY_PROGRESS      => 'PROGRESS',
-            STREAM_NOTIFY_FAILURE       => 'FAILURE',
-            STREAM_NOTIFY_COMPLETED     => 'COMPLETED',
-            STREAM_NOTIFY_RESOLVE       => 'RESOLVE',
-        ];
-
-        static $args = ['severity', 'message', 'message_code',
-            'bytes_transferred', 'bytes_max'];
-
-        $value = Core::getDebugResource($value);
-        $ident = $request['http_method'] . ' ' . Core::url($request);
-        $fn = function () use ($ident, $value, $map, $args) {
-            $passed = func_get_args();
-            $code = array_shift($passed);
-            fprintf($value, '<%s> [%s] ', $ident, $map[$code]);
-            foreach (array_filter($passed) as $i => $v) {
-                fwrite($value, $args[$i] . ': "' . $v . '" ');
-            }
-            fwrite($value, "\n");
-        };
-
-        // Wrap the existing function if needed.
-        $params['notification'] = isset($params['notification'])
-            ? Core::callArray([$params['notification'], $fn])
-            : $fn;
-    }
-
-    private function applyCustomOptions(array $request, array &$options)
-    {
-        if (!isset($request['client']['stream_context'])) {
-            return;
-        }
-
-        if (!is_array($request['client']['stream_context'])) {
-            throw new RingException('stream_context must be an array');
-        }
-
-        $options = array_replace_recursive(
-            $options,
-            $request['client']['stream_context']
-        );
-    }
-
-    private function createContext(array $request, array $options, array $params)
-    {
-        $this->applyCustomOptions($request, $options);
-        return $this->createResource(
-            function () use ($request, $options, $params) {
-                return stream_context_create($options, $params);
-            },
-            $request,
-            $options
-        );
-    }
-
-    private function createStreamResource(
-        $url,
-        array $request,
-        array $options,
-        $context
-    ) {
-        return $this->createResource(
-            function () use ($url, $context) {
-                if (false === strpos($url, 'http')) {
-                    trigger_error("URL is invalid: {$url}", E_USER_WARNING);
-                    return null;
-                }
-                $resource = fopen($url, 'r', null, $context);
-                $this->lastHeaders = $http_response_header;
-                return $resource;
-            },
-            $request,
-            $options
-        );
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Core.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Core.php
deleted file mode 100644
index dd7d1a0c5a..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Core.php
+++ /dev/null
@@ -1,364 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring;
-
-use GuzzleHttp\Stream\StreamInterface;
-use GuzzleHttp\Ring\Future\FutureArrayInterface;
-use GuzzleHttp\Ring\Future\FutureArray;
-
-/**
- * Provides core functionality of Ring handlers and middleware.
- */
-class Core
-{
-    /**
-     * Returns a function that calls all of the provided functions, in order,
-     * passing the arguments provided to the composed function to each function.
-     *
-     * @param callable[] $functions Array of functions to proxy to.
-     *
-     * @return callable
-     */
-    public static function callArray(array $functions)
-    {
-        return function () use ($functions) {
-            $args = func_get_args();
-            foreach ($functions as $fn) {
-                call_user_func_array($fn, $args);
-            }
-        };
-    }
-
-    /**
-     * Gets an array of header line values from a message for a specific header
-     *
-     * This method searches through the "headers" key of a message for a header
-     * using a case-insensitive search.
-     *
-     * @param array  $message Request or response hash.
-     * @param string $header  Header to retrieve
-     *
-     * @return array
-     */
-    public static function headerLines($message, $header)
-    {
-        $result = [];
-
-        if (!empty($message['headers'])) {
-            foreach ($message['headers'] as $name => $value) {
-                if (!strcasecmp($name, $header)) {
-                    $result = array_merge($result, $value);
-                }
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Gets a header value from a message as a string or null
-     *
-     * This method searches through the "headers" key of a message for a header
-     * using a case-insensitive search. The lines of the header are imploded
-     * using commas into a single string return value.
-     *
-     * @param array  $message Request or response hash.
-     * @param string $header  Header to retrieve
-     *
-     * @return string|null Returns the header string if found, or null if not.
-     */
-    public static function header($message, $header)
-    {
-        $match = self::headerLines($message, $header);
-        return $match ? implode(', ', $match) : null;
-    }
-
-    /**
-     * Returns the first header value from a message as a string or null. If
-     * a header line contains multiple values separated by a comma, then this
-     * function will return the first value in the list.
-     *
-     * @param array  $message Request or response hash.
-     * @param string $header  Header to retrieve
-     *
-     * @return string|null Returns the value as a string if found.
-     */
-    public static function firstHeader($message, $header)
-    {
-        if (!empty($message['headers'])) {
-            foreach ($message['headers'] as $name => $value) {
-                if (!strcasecmp($name, $header)) {
-                    // Return the match itself if it is a single value.
-                    $pos = strpos($value[0], ',');
-                    return $pos ? substr($value[0], 0, $pos) : $value[0];
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Returns true if a message has the provided case-insensitive header.
-     *
-     * @param array  $message Request or response hash.
-     * @param string $header  Header to check
-     *
-     * @return bool
-     */
-    public static function hasHeader($message, $header)
-    {
-        if (!empty($message['headers'])) {
-            foreach ($message['headers'] as $name => $value) {
-                if (!strcasecmp($name, $header)) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Parses an array of header lines into an associative array of headers.
-     *
-     * @param array $lines Header lines array of strings in the following
-     *                     format: "Name: Value"
-     * @return array
-     */
-    public static function headersFromLines($lines)
-    {
-        $headers = [];
-
-        foreach ($lines as $line) {
-            $parts = explode(':', $line, 2);
-            $headers[trim($parts[0])][] = isset($parts[1])
-                ? trim($parts[1])
-                : null;
-        }
-
-        return $headers;
-    }
-
-    /**
-     * Removes a header from a message using a case-insensitive comparison.
-     *
-     * @param array  $message Message that contains 'headers'
-     * @param string $header  Header to remove
-     *
-     * @return array
-     */
-    public static function removeHeader(array $message, $header)
-    {
-        if (isset($message['headers'])) {
-            foreach (array_keys($message['headers']) as $key) {
-                if (!strcasecmp($header, $key)) {
-                    unset($message['headers'][$key]);
-                }
-            }
-        }
-
-        return $message;
-    }
-
-    /**
-     * Replaces any existing case insensitive headers with the given value.
-     *
-     * @param array  $message Message that contains 'headers'
-     * @param string $header  Header to set.
-     * @param array  $value   Value to set.
-     *
-     * @return array
-     */
-    public static function setHeader(array $message, $header, array $value)
-    {
-        $message = self::removeHeader($message, $header);
-        $message['headers'][$header] = $value;
-
-        return $message;
-    }
-
-    /**
-     * Creates a URL string from a request.
-     *
-     * If the "url" key is present on the request, it is returned, otherwise
-     * the url is built up based on the scheme, host, uri, and query_string
-     * request values.
-     *
-     * @param array $request Request to get the URL from
-     *
-     * @return string Returns the request URL as a string.
-     * @throws \InvalidArgumentException if no Host header is present.
-     */
-    public static function url(array $request)
-    {
-        if (isset($request['url'])) {
-            return $request['url'];
-        }
-
-        $uri = (isset($request['scheme'])
-                ? $request['scheme'] : 'http') . '://';
-
-        if ($host = self::header($request, 'host')) {
-            $uri .= $host;
-        } else {
-            throw new \InvalidArgumentException('No Host header was provided');
-        }
-
-        if (isset($request['uri'])) {
-            $uri .= $request['uri'];
-        }
-
-        if (isset($request['query_string'])) {
-            $uri .= '?' . $request['query_string'];
-        }
-
-        return $uri;
-    }
-
-    /**
-     * Reads the body of a message into a string.
-     *
-     * @param array|FutureArrayInterface $message Array containing a "body" key
-     *
-     * @return null|string Returns the body as a string or null if not set.
-     * @throws \InvalidArgumentException if a request body is invalid.
-     */
-    public static function body($message)
-    {
-        if (!isset($message['body'])) {
-            return null;
-        }
-
-        if ($message['body'] instanceof StreamInterface) {
-            return (string) $message['body'];
-        }
-
-        switch (gettype($message['body'])) {
-            case 'string':
-                return $message['body'];
-            case 'resource':
-                return stream_get_contents($message['body']);
-            case 'object':
-                if ($message['body'] instanceof \Iterator) {
-                    return implode('', iterator_to_array($message['body']));
-                } elseif (method_exists($message['body'], '__toString')) {
-                    return (string) $message['body'];
-                }
-            default:
-                throw new \InvalidArgumentException('Invalid request body: '
-                    . self::describeType($message['body']));
-        }
-    }
-
-    /**
-     * Rewind the body of the provided message if possible.
-     *
-     * @param array $message Message that contains a 'body' field.
-     *
-     * @return bool Returns true on success, false on failure
-     */
-    public static function rewindBody($message)
-    {
-        if ($message['body'] instanceof StreamInterface) {
-            return $message['body']->seek(0);
-        }
-
-        if ($message['body'] instanceof \Generator) {
-            return false;
-        }
-
-        if ($message['body'] instanceof \Iterator) {
-            $message['body']->rewind();
-            return true;
-        }
-
-        if (is_resource($message['body'])) {
-            return rewind($message['body']);
-        }
-
-        return is_string($message['body'])
-            || (is_object($message['body'])
-                && method_exists($message['body'], '__toString'));
-    }
-
-    /**
-     * Debug function used to describe the provided value type and class.
-     *
-     * @param mixed $input
-     *
-     * @return string Returns a string containing the type of the variable and
-     *                if a class is provided, the class name.
-     */
-    public static function describeType($input)
-    {
-        switch (gettype($input)) {
-            case 'object':
-                return 'object(' . get_class($input) . ')';
-            case 'array':
-                return 'array(' . count($input) . ')';
-            default:
-                ob_start();
-                var_dump($input);
-                // normalize float vs double
-                return str_replace('double(', 'float(', rtrim(ob_get_clean()));
-        }
-    }
-
-    /**
-     * Sleep for the specified amount of time specified in the request's
-     * ['client']['delay'] option if present.
-     *
-     * This function should only be used when a non-blocking sleep is not
-     * possible.
-     *
-     * @param array $request Request to sleep
-     */
-    public static function doSleep(array $request)
-    {
-        if (isset($request['client']['delay'])) {
-            usleep($request['client']['delay'] * 1000);
-        }
-    }
-
-    /**
-     * Returns a proxied future that modifies the dereferenced value of another
-     * future using a promise.
-     *
-     * @param FutureArrayInterface $future      Future to wrap with a new future
-     * @param callable    $onFulfilled Invoked when the future fulfilled
-     * @param callable    $onRejected  Invoked when the future rejected
-     * @param callable    $onProgress  Invoked when the future progresses
-     *
-     * @return FutureArray
-     */
-    public static function proxy(
-        FutureArrayInterface $future,
-        callable $onFulfilled = null,
-        callable $onRejected = null,
-        callable $onProgress = null
-    ) {
-        return new FutureArray(
-            $future->then($onFulfilled, $onRejected, $onProgress),
-            [$future, 'wait'],
-            [$future, 'cancel']
-        );
-    }
-
-    /**
-     * Returns a debug stream based on the provided variable.
-     *
-     * @param mixed $value Optional value
-     *
-     * @return resource
-     */
-    public static function getDebugResource($value = null)
-    {
-        if (is_resource($value)) {
-            return $value;
-        } elseif (defined('STDOUT')) {
-            return STDOUT;
-        } else {
-            return fopen('php://output', 'w');
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Exception/CancelledException.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Exception/CancelledException.php
deleted file mode 100644
index 95b353acfd..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Exception/CancelledException.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Exception;
-
-/**
- * Marker interface for cancelled exceptions.
- */
-interface CancelledException {}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Exception/CancelledFutureAccessException.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Exception/CancelledFutureAccessException.php
deleted file mode 100644
index 4a14574df8..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Exception/CancelledFutureAccessException.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Exception;
-
-class CancelledFutureAccessException extends RingException implements CancelledException {}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Exception/ConnectException.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Exception/ConnectException.php
deleted file mode 100644
index 925cd133c8..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Exception/ConnectException.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Exception;
-
-/**
- * Occurs when the connection failed.
- */
-class ConnectException extends RingException {}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Exception/RingException.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Exception/RingException.php
deleted file mode 100644
index eed0daf7dd..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Exception/RingException.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Exception;
-
-class RingException extends \RuntimeException {};
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Future/BaseFutureTrait.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Future/BaseFutureTrait.php
deleted file mode 100644
index e6a7ca77c3..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Future/BaseFutureTrait.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Future;
-
-use GuzzleHttp\Ring\Exception\CancelledFutureAccessException;
-use GuzzleHttp\Ring\Exception\RingException;
-use React\Promise\PromiseInterface;
-
-/**
- * Implements common future functionality built on top of promises.
- */
-trait BaseFutureTrait
-{
-    /** @var callable */
-    private $waitfn;
-
-    /** @var callable */
-    private $cancelfn;
-
-    /** @var PromiseInterface */
-    private $wrappedPromise;
-
-    /** @var \Exception Error encountered. */
-    private $error;
-
-    /** @var mixed Result of the future */
-    private $result;
-
-    private $isRealized = false;
-
-    /**
-     * @param PromiseInterface $promise Promise to shadow with the future.
-     * @param callable         $wait    Function that blocks until the deferred
-     *                                  computation has been resolved. This
-     *                                  function MUST resolve the deferred value
-     *                                  associated with the supplied promise.
-     * @param callable         $cancel  If possible and reasonable, provide a
-     *                                  function that can be used to cancel the
-     *                                  future from completing.
-     */
-    public function __construct(
-        PromiseInterface $promise,
-        callable $wait = null,
-        callable $cancel = null
-    ) {
-        $this->wrappedPromise = $promise;
-        $this->waitfn = $wait;
-        $this->cancelfn = $cancel;
-    }
-
-    public function wait()
-    {
-        if (!$this->isRealized) {
-            $this->addShadow();
-            if (!$this->isRealized && $this->waitfn) {
-                $this->invokeWait();
-            }
-            if (!$this->isRealized) {
-                $this->error = new RingException('Waiting did not resolve future');
-            }
-        }
-
-        if ($this->error) {
-            throw $this->error;
-        }
-
-        return $this->result;
-    }
-
-    public function promise()
-    {
-        return $this->wrappedPromise;
-    }
-
-    public function then(
-        callable $onFulfilled = null,
-        callable $onRejected = null,
-        callable $onProgress = null
-    ) {
-        return $this->wrappedPromise->then($onFulfilled, $onRejected, $onProgress);
-    }
-
-    public function cancel()
-    {
-        if (!$this->isRealized) {
-            $cancelfn = $this->cancelfn;
-            $this->waitfn = $this->cancelfn = null;
-            $this->isRealized = true;
-            $this->error = new CancelledFutureAccessException();
-            if ($cancelfn) {
-                $cancelfn($this);
-            }
-        }
-    }
-
-    private function addShadow()
-    {
-        // Get the result and error when the promise is resolved. Note that
-        // calling this function might trigger the resolution immediately.
-        $this->wrappedPromise->then(
-            function ($value) {
-                $this->isRealized = true;
-                $this->result = $value;
-                $this->waitfn = $this->cancelfn = null;
-            },
-            function ($error) {
-                $this->isRealized = true;
-                $this->error = $error;
-                $this->waitfn = $this->cancelfn = null;
-            }
-        );
-    }
-
-    private function invokeWait()
-    {
-        try {
-            $wait = $this->waitfn;
-            $this->waitfn = null;
-            $wait();
-        } catch (\Exception $e) {
-            // Defer can throw to reject.
-            $this->error = $e;
-            $this->isRealized = true;
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Future/CompletedFutureArray.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Future/CompletedFutureArray.php
deleted file mode 100644
index 0a90c939f7..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Future/CompletedFutureArray.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Future;
-
-/**
- * Represents a future array that has been completed successfully.
- */
-class CompletedFutureArray extends CompletedFutureValue implements FutureArrayInterface
-{
-    public function __construct(array $result)
-    {
-        parent::__construct($result);
-    }
-
-    public function offsetExists($offset)
-    {
-        return isset($this->result[$offset]);
-    }
-
-    public function offsetGet($offset)
-    {
-        return $this->result[$offset];
-    }
-
-    public function offsetSet($offset, $value)
-    {
-        $this->result[$offset] = $value;
-    }
-
-    public function offsetUnset($offset)
-    {
-        unset($this->result[$offset]);
-    }
-
-    public function count()
-    {
-        return count($this->result);
-    }
-
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->result);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Future/CompletedFutureValue.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Future/CompletedFutureValue.php
deleted file mode 100644
index 0d25af72d4..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Future/CompletedFutureValue.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Future;
-
-use React\Promise\FulfilledPromise;
-use React\Promise\RejectedPromise;
-
-/**
- * Represents a future value that has been resolved or rejected.
- */
-class CompletedFutureValue implements FutureInterface
-{
-    protected $result;
-    protected $error;
-
-    private $cachedPromise;
-
-    /**
-     * @param mixed      $result Resolved result
-     * @param \Exception $e      Error. Pass a GuzzleHttp\Ring\Exception\CancelledFutureAccessException
-     *                           to mark the future as cancelled.
-     */
-    public function __construct($result, \Exception $e = null)
-    {
-        $this->result = $result;
-        $this->error = $e;
-    }
-
-    public function wait()
-    {
-        if ($this->error) {
-            throw $this->error;
-        }
-
-        return $this->result;
-    }
-
-    public function cancel() {}
-
-    public function promise()
-    {
-        if (!$this->cachedPromise) {
-            $this->cachedPromise = $this->error
-                ? new RejectedPromise($this->error)
-                : new FulfilledPromise($this->result);
-        }
-
-        return $this->cachedPromise;
-    }
-
-    public function then(
-        callable $onFulfilled = null,
-        callable $onRejected = null,
-        callable $onProgress = null
-    ) {
-        return $this->promise()->then($onFulfilled, $onRejected, $onProgress);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Future/FutureArray.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Future/FutureArray.php
deleted file mode 100644
index 3d64c9643a..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Future/FutureArray.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Future;
-
-/**
- * Represents a future array value that when dereferenced returns an array.
- */
-class FutureArray implements FutureArrayInterface
-{
-    use MagicFutureTrait;
-
-    public function offsetExists($offset)
-    {
-        return isset($this->_value[$offset]);
-    }
-
-    public function offsetGet($offset)
-    {
-        return $this->_value[$offset];
-    }
-
-    public function offsetSet($offset, $value)
-    {
-        $this->_value[$offset] = $value;
-    }
-
-    public function offsetUnset($offset)
-    {
-        unset($this->_value[$offset]);
-    }
-
-    public function count()
-    {
-        return count($this->_value);
-    }
-
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->_value);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Future/FutureArrayInterface.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Future/FutureArrayInterface.php
deleted file mode 100644
index 58f5f73670..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Future/FutureArrayInterface.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Future;
-
-/**
- * Future that provides array-like access.
- */
-interface FutureArrayInterface extends
-    FutureInterface,
-    \ArrayAccess,
-    \Countable,
-    \IteratorAggregate {};
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Future/FutureInterface.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Future/FutureInterface.php
deleted file mode 100644
index 43d18117b1..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Future/FutureInterface.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Future;
-
-use React\Promise\PromiseInterface;
-use React\Promise\PromisorInterface;
-
-/**
- * Represents the result of a computation that may not have completed yet.
- *
- * You can use the future in a blocking manner using the wait() function, or
- * you can use a promise from the future to receive the result when the future
- * has been resolved.
- *
- * When the future is dereferenced using wait(), the result of the computation
- * is cached and returned for subsequent calls to wait(). If the result of the
- * computation has not yet completed when wait() is called, the call to wait()
- * will block until the future has completed.
- */
-interface FutureInterface extends PromiseInterface, PromisorInterface
-{
-    /**
-     * Returns the result of the future either from cache or by blocking until
-     * it is complete.
-     *
-     * This method must block until the future has a result or is cancelled.
-     * Throwing an exception in the wait() method will mark the future as
-     * realized and will throw the exception each time wait() is called.
-     * Throwing an instance of GuzzleHttp\Ring\CancelledException will mark
-     * the future as realized, will not throw immediately, but will throw the
-     * exception if the future's wait() method is called again.
-     *
-     * @return mixed
-     */
-    public function wait();
-
-    /**
-     * Cancels the future, if possible.
-     */
-    public function cancel();
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Future/FutureValue.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Future/FutureValue.php
deleted file mode 100644
index 4cac9281b9..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Future/FutureValue.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Future;
-
-/**
- * Represents a future value that responds to wait() to retrieve the promised
- * value, but can also return promises that are delivered the value when it is
- * available.
- */
-class FutureValue implements FutureInterface
-{
-    use BaseFutureTrait;
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Future/MagicFutureTrait.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Future/MagicFutureTrait.php
deleted file mode 100644
index 58d779db49..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/ringphp/src/Future/MagicFutureTrait.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-namespace GuzzleHttp\Ring\Future;
-
-/**
- * Implements common future functionality that is triggered when the result
- * property is accessed via a magic __get method.
- *
- * @property mixed $_value Actual data used by the future. Accessing this
- *     property will cause the future to block if needed.
- */
-trait MagicFutureTrait
-{
-    use BaseFutureTrait;
-
-    /**
-     * This function handles retrieving the dereferenced result when requested.
-     *
-     * @param string $name Should always be "data" or an exception is thrown.
-     *
-     * @return mixed Returns the dereferenced data.
-     * @throws \RuntimeException
-     * @throws \GuzzleHttp\Ring\Exception\CancelledException
-     */
-    public function __get($name)
-    {
-        if ($name !== '_value') {
-            throw new \RuntimeException("Class has no {$name} property");
-        }
-
-        return $this->_value = $this->wait();
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/.gitignore b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/.gitignore
deleted file mode 100644
index c33d3965fd..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.idea
-.DS_STORE
-coverage
-phpunit.xml
-composer.lock
-vendor/
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/.travis.yml b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/.travis.yml
deleted file mode 100644
index a6f8a87b7d..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/.travis.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-language: php
-
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-
-before_script:
-  - composer self-update
-  - composer install --no-interaction --prefer-source --dev
-
-script: vendor/bin/phpunit
-
-matrix:
-  allow_failures:
-    - php: hhvm
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/CHANGELOG.rst b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/CHANGELOG.rst
deleted file mode 100644
index 0018ffe353..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/CHANGELOG.rst
+++ /dev/null
@@ -1,94 +0,0 @@
-=========
-Changelog
-=========
-
-3.0.0 (2014-10-12)
-------------------
-
-* Now supports creating streams from functions and iterators.
-* Supports creating buffered streams and asynchronous streams.
-* Removed ``functions.php``. Use the corresponding functions provided by
-  ``GuzzleHttp\Streams\Utils`` instead.
-* Moved ``GuzzleHttp\Stream\MetadataStreamInterface::getMetadata`` to
-  ``GuzzleHttp\Stream\StreamInterface``. MetadataStreamInterface is no longer
-  used and is marked as deprecated.
-* Added ``attach()`` to ``GuzzleHttp\Stream\StreamInterface`` for PSR-7
-  compatibility.
-* Removed ``flush()`` from StreamInterface.
-* Removed the ``$maxLength`` parameter from
-  ``GuzzleHttp\Stream\StreamInterface::getContents()``. This function now
-  returns the entire remainder of the stream. If you want to limit the maximum
-  amount of data read from the stream, use the
-  ``GuzzleHttp\Stream\Utils::copyToString()`` function.
-* Streams that return an empty string, ``''``, are no longer considered a
-  failure. You MUST return ``false`` to mark the read as a failure, and ensure
-  that any decorators you create properly return ``true`` in response to the
-  ``eof()`` method when the stream is consumed.
-* ``GuzzleHttp\Stream\Stream::__construct``,
-  ``GuzzleHttp\Stream\Stream::factory``, and
-  ``GuzzleHttp\Stream\Utils::create`` no longer accept a size in the second
-  argument. They now accept an associative array of options, including the
-  "size" key and "metadata" key which can be used to provide custom metadata.
-* Added ``GuzzleHttp\Stream\BufferStream`` to add support for buffering data,
-  and when read, shifting data off of the buffer.
-* Added ``GuzzleHttp\Stream\NullBuffer`` which can be used as a buffer that
-  does not actually store any data.
-* Added ``GuzzleHttp\Stream\AsyncStream`` to provide support for non-blocking
-  streams that can be filled by a remote source (e.g., an event-loop). If a
-  ``drain`` option is provided, the stream can also act as if it is a blocking
-  stream.
-
-2.1.0 (2014-08-17)
-------------------
-
-* Added an InflateStream to inflate gzipped or deflated content.
-* Added ``flush`` to stream wrapper.
-* Added the ability to easily register the GuzzleStreamWrapper if needed.
-
-2.0.0 (2014-08-16)
-------------------
-
-* Deprecated functions.php and moved all of those methods to
-  ``GuzzleHttp\Streams\Utils``. Use ``GuzzleHttp\Stream\Stream::factory()``
-  instead of ``GuzzleHttp\Stream\create()`` to create new streams.
-* Added ``flush()`` to ``StreamInterface``. This method is used to flush any
-  underlying stream write buffers.
-* Added ``FnStream`` to easily decorate stream behavior with callables.
-* ``Utils::hash`` now throws an exception when the stream cannot seek to 0.
-
-1.5.1 (2014-09-10)
-------------------
-
-* Stream metadata is grabbed from the underlying stream each time
-  ``getMetadata`` is called rather than returning a value from a cache.
-* Properly closing all underlying streams when AppendStream is closed.
-* Seek functions no longer throw exceptions.
-* LazyOpenStream now correctly returns the underlying stream resource when
-  detached.
-
-1.5.0 (2014-08-07)
-------------------
-
-* Added ``Stream\safe_open`` to open stream resources and throw exceptions
-  instead of raising errors.
-
-1.4.0 (2014-07-19)
-------------------
-
-* Added a LazyOpenStream
-
-1.3.0 (2014-07-15)
-------------------
-
-* Added an AppendStream to stream over multiple stream one after the other.
-
-1.2.0 (2014-07-15)
-------------------
-
-* Updated the ``detach()`` method to return the underlying stream resource or
-  ``null`` if it does not wrap a resource.
-* Multiple fixes for how streams behave when the underlying resource is
-  detached
-* Do not clear statcache when a stream does not have a 'uri'
-* Added a fix to LimitStream
-* Added a condition to ensure that functions.php can be required multiple times
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/LICENSE b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/LICENSE
deleted file mode 100644
index 71d3b783cb..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2014 Michael Dowling, https://github.com/mtdowling <mtdowling@gmail.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.
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/Makefile b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/Makefile
deleted file mode 100644
index f4d42849e5..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-all: clean coverage
-
-release: tag
-	git push origin --tags
-
-tag:
-	chag tag --sign --debug CHANGELOG.rst
-
-test:
-	vendor/bin/phpunit
-
-coverage:
-	vendor/bin/phpunit --coverage-html=artifacts/coverage
-
-view-coverage:
-	open artifacts/coverage/index.html
-
-clean:
-	rm -rf artifacts/*
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/README.rst b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/README.rst
deleted file mode 100644
index baff63b37d..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/README.rst
+++ /dev/null
@@ -1,36 +0,0 @@
-==============
-Guzzle Streams
-==============
-
-Provides a simple abstraction over streams of data.
-
-This library is used in `Guzzle 5 <https://github.com/guzzle/guzzle>`_, and is
-(currently) compatible with the WIP PSR-7.
-
-Installation
-============
-
-This package can be installed easily using `Composer <http://getcomposer.org>`_.
-Simply add the following to the composer.json file at the root of your project:
-
-.. code-block:: javascript
-
-    {
-      "require": {
-        "guzzlehttp/streams": "~3.0"
-      }
-    }
-
-Then install your dependencies using ``composer.phar install``.
-
-Documentation
-=============
-
-The documentation for this package can be found on the main Guzzle website at
-http://docs.guzzlephp.org/en/guzzle4/streams.html.
-
-Testing
-=======
-
-This library is tested using PHPUnit. You'll need to install the dependencies
-using `Composer <http://getcomposer.org>`_ then run ``make test``.
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/composer.json b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/composer.json
deleted file mode 100644
index 6d7034370b..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/composer.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "name": "guzzlehttp/streams",
-    "description": "Provides a simple abstraction over streams of data",
-    "homepage": "http://guzzlephp.org/",
-    "keywords": ["stream", "guzzle"],
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Michael Dowling",
-            "email": "mtdowling@gmail.com",
-            "homepage": "https://github.com/mtdowling"
-        }
-    ],
-    "require": {
-        "php": ">=5.4.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.0"
-    },
-    "autoload": {
-        "psr-4": { "GuzzleHttp\\Stream\\": "src/" }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.0-dev"
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/phpunit.xml.dist b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/phpunit.xml.dist
deleted file mode 100644
index 6e758c1927..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/phpunit.xml.dist
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./vendor/autoload.php"
-         colors="true">
-    <testsuites>
-        <testsuite>
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src</directory>
-            <exclude>
-                <file>src/functions.php</file>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/AppendStream.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/AppendStream.php
deleted file mode 100644
index 94bda7173f..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/AppendStream.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-namespace GuzzleHttp\Stream;
-
-use GuzzleHttp\Stream\Exception\CannotAttachException;
-
-/**
- * Reads from multiple streams, one after the other.
- *
- * This is a read-only stream decorator.
- */
-class AppendStream implements StreamInterface
-{
-    /** @var StreamInterface[] Streams being decorated */
-    private $streams = [];
-
-    private $seekable = true;
-    private $current = 0;
-    private $pos = 0;
-    private $detached = false;
-
-    /**
-     * @param StreamInterface[] $streams Streams to decorate. Each stream must
-     *                                   be readable.
-     */
-    public function __construct(array $streams = [])
-    {
-        foreach ($streams as $stream) {
-            $this->addStream($stream);
-        }
-    }
-
-    public function __toString()
-    {
-        try {
-            $this->seek(0);
-            return $this->getContents();
-        } catch (\Exception $e) {
-            return '';
-        }
-    }
-
-    /**
-     * Add a stream to the AppendStream
-     *
-     * @param StreamInterface $stream Stream to append. Must be readable.
-     *
-     * @throws \InvalidArgumentException if the stream is not readable
-     */
-    public function addStream(StreamInterface $stream)
-    {
-        if (!$stream->isReadable()) {
-            throw new \InvalidArgumentException('Each stream must be readable');
-        }
-
-        // The stream is only seekable if all streams are seekable
-        if (!$stream->isSeekable()) {
-            $this->seekable = false;
-        }
-
-        $this->streams[] = $stream;
-    }
-
-    public function getContents()
-    {
-        return Utils::copyToString($this);
-    }
-
-    /**
-     * Closes each attached stream.
-     *
-     * {@inheritdoc}
-     */
-    public function close()
-    {
-        $this->pos = $this->current = 0;
-
-        foreach ($this->streams as $stream) {
-            $stream->close();
-        }
-
-        $this->streams = [];
-    }
-
-    /**
-     * Detaches each attached stream
-     *
-     * {@inheritdoc}
-     */
-    public function detach()
-    {
-        $this->close();
-        $this->detached = true;
-    }
-
-    public function attach($stream)
-    {
-        throw new CannotAttachException();
-    }
-
-    public function tell()
-    {
-        return $this->pos;
-    }
-
-    /**
-     * Tries to calculate the size by adding the size of each stream.
-     *
-     * If any of the streams do not return a valid number, then the size of the
-     * append stream cannot be determined and null is returned.
-     *
-     * {@inheritdoc}
-     */
-    public function getSize()
-    {
-        $size = 0;
-
-        foreach ($this->streams as $stream) {
-            $s = $stream->getSize();
-            if ($s === null) {
-                return null;
-            }
-            $size += $s;
-        }
-
-        return $size;
-    }
-
-    public function eof()
-    {
-        return !$this->streams ||
-            ($this->current >= count($this->streams) - 1 &&
-             $this->streams[$this->current]->eof());
-    }
-
-    /**
-     * Attempts to seek to the given position. Only supports SEEK_SET.
-     *
-     * {@inheritdoc}
-     */
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        if (!$this->seekable || $whence !== SEEK_SET) {
-            return false;
-        }
-
-        $success = true;
-        $this->pos = $this->current = 0;
-
-        // Rewind each stream
-        foreach ($this->streams as $stream) {
-            if (!$stream->seek(0)) {
-                $success = false;
-            }
-        }
-
-        if (!$success) {
-            return false;
-        }
-
-        // Seek to the actual position by reading from each stream
-        while ($this->pos < $offset && !$this->eof()) {
-            $this->read(min(8096, $offset - $this->pos));
-        }
-
-        return $this->pos == $offset;
-    }
-
-    /**
-     * Reads from all of the appended streams until the length is met or EOF.
-     *
-     * {@inheritdoc}
-     */
-    public function read($length)
-    {
-        $buffer = '';
-        $total = count($this->streams) - 1;
-        $remaining = $length;
-
-        while ($remaining > 0) {
-            // Progress to the next stream if needed.
-            if ($this->streams[$this->current]->eof()) {
-                if ($this->current == $total) {
-                    break;
-                }
-                $this->current++;
-            }
-            $buffer .= $this->streams[$this->current]->read($remaining);
-            $remaining = $length - strlen($buffer);
-        }
-
-        $this->pos += strlen($buffer);
-
-        return $buffer;
-    }
-
-    public function isReadable()
-    {
-        return true;
-    }
-
-    public function isWritable()
-    {
-        return false;
-    }
-
-    public function isSeekable()
-    {
-        return $this->seekable;
-    }
-
-    public function write($string)
-    {
-        return false;
-    }
-
-    public function getMetadata($key = null)
-    {
-        return $key ? null : [];
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/AsyncReadStream.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/AsyncReadStream.php
deleted file mode 100644
index 25ad96021a..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/AsyncReadStream.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-namespace GuzzleHttp\Stream;
-
-/**
- * Represents an asynchronous read-only stream that supports a drain event and
- * pumping data from a source stream.
- *
- * The AsyncReadStream can be used as a completely asynchronous stream, meaning
- * the data you can read from the stream will immediately return only
- * the data that is currently buffered.
- *
- * AsyncReadStream can also be used in a "blocking" manner if a "pump" function
- * is provided. When a caller requests more bytes than are available in the
- * buffer, then the pump function is used to block until the requested number
- * of bytes are available or the remote source stream has errored, closed, or
- * timed-out. This behavior isn't strictly "blocking" because the pump function
- * can send other transfers while waiting on the desired buffer size to be
- * ready for reading (e.g., continue to tick an event loop).
- *
- * @unstable This class is subject to change.
- */
-class AsyncReadStream implements StreamInterface
-{
-    use StreamDecoratorTrait;
-
-    /** @var callable|null Fn used to notify writers the buffer has drained */
-    private $drain;
-
-    /** @var callable|null Fn used to block for more data */
-    private $pump;
-
-    /** @var int|null Highwater mark of the underlying buffer */
-    private $hwm;
-
-    /** @var bool Whether or not drain needs to be called at some point */
-    private $needsDrain;
-
-    /** @var int The expected size of the remote source */
-    private $size;
-
-    /**
-     * In order to utilize high water marks to tell writers to slow down, the
-     * provided stream must answer to the "hwm" stream metadata variable,
-     * providing the high water mark. If no "hwm" metadata value is available,
-     * then the "drain" functionality is not utilized.
-     *
-     * This class accepts an associative array of configuration options.
-     *
-     * - drain: (callable) Function to invoke when the stream has drained,
-     *   meaning the buffer is now writable again because the size of the
-     *   buffer is at an acceptable level (e.g., below the high water mark).
-     *   The function accepts a single argument, the buffer stream object that
-     *   has drained.
-     * - pump: (callable) A function that accepts the number of bytes to read
-     *   from the source stream. This function will block until all of the data
-     *   that was requested has been read, EOF of the source stream, or the
-     *   source stream is closed.
-     * - size: (int) The expected size in bytes of the data that will be read
-     *   (if known up-front).
-     *
-     * @param StreamInterface $buffer   Buffer that contains the data that has
-     *                                  been read by the event loop.
-     * @param array           $config   Associative array of options.
-     *
-     * @throws \InvalidArgumentException if the buffer is not readable and
-     *                                   writable.
-     */
-    public function __construct(
-        StreamInterface $buffer,
-        array $config = []
-    ) {
-        if (!$buffer->isReadable() || !$buffer->isWritable()) {
-            throw new \InvalidArgumentException(
-                'Buffer must be readable and writable'
-            );
-        }
-
-        if (isset($config['size'])) {
-            $this->size = $config['size'];
-        }
-
-        static $callables = ['pump', 'drain'];
-        foreach ($callables as $check) {
-            if (isset($config[$check])) {
-                if (!is_callable($config[$check])) {
-                    throw new \InvalidArgumentException(
-                        $check . ' must be callable'
-                    );
-                }
-                $this->{$check} = $config[$check];
-            }
-        }
-
-        $this->hwm = $buffer->getMetadata('hwm');
-
-        // Cannot drain when there's no high water mark.
-        if ($this->hwm === null) {
-            $this->drain = null;
-        }
-
-        $this->stream = $buffer;
-    }
-
-    /**
-     * Factory method used to create new async stream and an underlying buffer
-     * if no buffer is provided.
-     *
-     * This function accepts the same options as AsyncReadStream::__construct,
-     * but added the following key value pairs:
-     *
-     * - buffer: (StreamInterface) Buffer used to buffer data. If none is
-     *   provided, a default buffer is created.
-     * - hwm: (int) High water mark to use if a buffer is created on your
-     *   behalf.
-     * - max_buffer: (int) If provided, wraps the utilized buffer in a
-     *   DroppingStream decorator to ensure that buffer does not exceed a given
-     *   length. When exceeded, the stream will begin dropping data. Set the
-     *   max_buffer to 0, to use a NullStream which does not store data.
-     * - write: (callable) A function that is invoked when data is written
-     *   to the underlying buffer. The function accepts the buffer as the first
-     *   argument, and the data being written as the second. The function MUST
-     *   return the number of bytes that were written or false to let writers
-     *   know to slow down.
-     * - drain: (callable) See constructor documentation.
-     * - pump: (callable) See constructor documentation.
-     *
-     * @param array $options Associative array of options.
-     *
-     * @return array Returns an array containing the buffer used to buffer
-     *               data, followed by the ready to use AsyncReadStream object.
-     */
-    public static function create(array $options = [])
-    {
-        $maxBuffer = isset($options['max_buffer'])
-            ? $options['max_buffer']
-            : null;
-
-        if ($maxBuffer === 0) {
-            $buffer = new NullStream();
-        } elseif (isset($options['buffer'])) {
-            $buffer = $options['buffer'];
-        } else {
-            $hwm = isset($options['hwm']) ? $options['hwm'] : 16384;
-            $buffer = new BufferStream($hwm);
-        }
-
-        if ($maxBuffer > 0) {
-            $buffer = new DroppingStream($buffer, $options['max_buffer']);
-        }
-
-        // Call the on_write callback if an on_write function was provided.
-        if (isset($options['write'])) {
-            $onWrite = $options['write'];
-            $buffer = FnStream::decorate($buffer, [
-                'write' => function ($string) use ($buffer, $onWrite) {
-                    $result = $buffer->write($string);
-                    $onWrite($buffer, $string);
-                    return $result;
-                }
-            ]);
-        }
-
-        return [$buffer, new self($buffer, $options)];
-    }
-
-    public function getSize()
-    {
-        return $this->size;
-    }
-
-    public function isWritable()
-    {
-        return false;
-    }
-
-    public function write($string)
-    {
-        return false;
-    }
-
-    public function read($length)
-    {
-        if (!$this->needsDrain && $this->drain) {
-            $this->needsDrain = $this->stream->getSize() >= $this->hwm;
-        }
-
-        $result = $this->stream->read($length);
-
-        // If we need to drain, then drain when the buffer is empty.
-        if ($this->needsDrain && $this->stream->getSize() === 0) {
-            $this->needsDrain = false;
-            $drainFn = $this->drain;
-            $drainFn($this->stream);
-        }
-
-        $resultLen = strlen($result);
-
-        // If a pump was provided, the buffer is still open, and not enough
-        // data was given, then block until the data is provided.
-        if ($this->pump && $resultLen < $length) {
-            $pumpFn = $this->pump;
-            $result .= $pumpFn($length - $resultLen);
-        }
-
-        return $result;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/BufferStream.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/BufferStream.php
deleted file mode 100644
index 0fffbd63a8..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/BufferStream.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-namespace GuzzleHttp\Stream;
-
-use GuzzleHttp\Stream\Exception\CannotAttachException;
-
-/**
- * Provides a buffer stream that can be written to to fill a buffer, and read
- * from to remove bytes from the buffer.
- *
- * This stream returns a "hwm" metadata value that tells upstream consumers
- * what the configured high water mark of the stream is, or the maximum
- * preferred size of the buffer.
- *
- * @package GuzzleHttp\Stream
- */
-class BufferStream implements StreamInterface
-{
-    private $hwm;
-    private $buffer = '';
-
-    /**
-     * @param int $hwm High water mark, representing the preferred maximum
-     *                 buffer size. If the size of the buffer exceeds the high
-     *                 water mark, then calls to write will continue to succeed
-     *                 but will return false to inform writers to slow down
-     *                 until the buffer has been drained by reading from it.
-     */
-    public function __construct($hwm = 16384)
-    {
-        $this->hwm = $hwm;
-    }
-
-    public function __toString()
-    {
-        return $this->getContents();
-    }
-
-    public function getContents()
-    {
-        $buffer = $this->buffer;
-        $this->buffer = '';
-
-        return $buffer;
-    }
-
-    public function close()
-    {
-        $this->buffer = '';
-    }
-
-    public function detach()
-    {
-        $this->close();
-    }
-
-    public function attach($stream)
-    {
-        throw new CannotAttachException();
-    }
-
-    public function getSize()
-    {
-        return strlen($this->buffer);
-    }
-
-    public function isReadable()
-    {
-        return true;
-    }
-
-    public function isWritable()
-    {
-        return true;
-    }
-
-    public function isSeekable()
-    {
-        return false;
-    }
-
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        return false;
-    }
-
-    public function eof()
-    {
-        return strlen($this->buffer) === 0;
-    }
-
-    public function tell()
-    {
-        return false;
-    }
-
-    /**
-     * Reads data from the buffer.
-     */
-    public function read($length)
-    {
-        $currentLength = strlen($this->buffer);
-
-        if ($length >= $currentLength) {
-            // No need to slice the buffer because we don't have enough data.
-            $result = $this->buffer;
-            $this->buffer = '';
-        } else {
-            // Slice up the result to provide a subset of the buffer.
-            $result = substr($this->buffer, 0, $length);
-            $this->buffer = substr($this->buffer, $length);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Writes data to the buffer.
-     */
-    public function write($string)
-    {
-        $this->buffer .= $string;
-
-        if (strlen($this->buffer) >= $this->hwm) {
-            return false;
-        }
-
-        return strlen($string);
-    }
-
-    public function getMetadata($key = null)
-    {
-        if ($key == 'hwm') {
-            return $this->hwm;
-        }
-
-        return $key ? null : [];
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/CachingStream.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/CachingStream.php
deleted file mode 100644
index 60bb9056c4..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/CachingStream.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-namespace GuzzleHttp\Stream;
-
-use GuzzleHttp\Stream\Exception\SeekException;
-
-/**
- * Stream decorator that can cache previously read bytes from a sequentially
- * read stream.
- */
-class CachingStream implements StreamInterface
-{
-    use StreamDecoratorTrait;
-
-    /** @var StreamInterface Stream being wrapped */
-    private $remoteStream;
-
-    /** @var int Number of bytes to skip reading due to a write on the buffer */
-    private $skipReadBytes = 0;
-
-    /**
-     * We will treat the buffer object as the body of the stream
-     *
-     * @param StreamInterface $stream Stream to cache
-     * @param StreamInterface $target Optionally specify where data is cached
-     */
-    public function __construct(
-        StreamInterface $stream,
-        StreamInterface $target = null
-    ) {
-        $this->remoteStream = $stream;
-        $this->stream = $target ?: new Stream(fopen('php://temp', 'r+'));
-    }
-
-    public function getSize()
-    {
-        return max($this->stream->getSize(), $this->remoteStream->getSize());
-    }
-
-    /**
-     * {@inheritdoc}
-     * @throws SeekException When seeking with SEEK_END or when seeking
-     *     past the total size of the buffer stream
-     */
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        if ($whence == SEEK_SET) {
-            $byte = $offset;
-        } elseif ($whence == SEEK_CUR) {
-            $byte = $offset + $this->tell();
-        } else {
-            return false;
-        }
-
-        // You cannot skip ahead past where you've read from the remote stream
-        if ($byte > $this->stream->getSize()) {
-            throw new SeekException(
-                $this,
-                $byte,
-                sprintf('Cannot seek to byte %d when the buffered stream only'
-                    . ' contains %d bytes', $byte, $this->stream->getSize())
-            );
-        }
-
-        return $this->stream->seek($byte);
-    }
-
-    public function read($length)
-    {
-        // Perform a regular read on any previously read data from the buffer
-        $data = $this->stream->read($length);
-        $remaining = $length - strlen($data);
-
-        // More data was requested so read from the remote stream
-        if ($remaining) {
-            // If data was written to the buffer in a position that would have
-            // been filled from the remote stream, then we must skip bytes on
-            // the remote stream to emulate overwriting bytes from that
-            // position. This mimics the behavior of other PHP stream wrappers.
-            $remoteData = $this->remoteStream->read(
-                $remaining + $this->skipReadBytes
-            );
-
-            if ($this->skipReadBytes) {
-                $len = strlen($remoteData);
-                $remoteData = substr($remoteData, $this->skipReadBytes);
-                $this->skipReadBytes = max(0, $this->skipReadBytes - $len);
-            }
-
-            $data .= $remoteData;
-            $this->stream->write($remoteData);
-        }
-
-        return $data;
-    }
-
-    public function write($string)
-    {
-        // When appending to the end of the currently read stream, you'll want
-        // to skip bytes from being read from the remote stream to emulate
-        // other stream wrappers. Basically replacing bytes of data of a fixed
-        // length.
-        $overflow = (strlen($string) + $this->tell()) - $this->remoteStream->tell();
-        if ($overflow > 0) {
-            $this->skipReadBytes += $overflow;
-        }
-
-        return $this->stream->write($string);
-    }
-
-    public function eof()
-    {
-        return $this->stream->eof() && $this->remoteStream->eof();
-    }
-
-    /**
-     * Close both the remote stream and buffer stream
-     */
-    public function close()
-    {
-        $this->remoteStream->close() && $this->stream->close();
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/DroppingStream.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/DroppingStream.php
deleted file mode 100644
index 56ee80c123..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/DroppingStream.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-namespace GuzzleHttp\Stream;
-
-/**
- * Stream decorator that begins dropping data once the size of the underlying
- * stream becomes too full.
- */
-class DroppingStream implements StreamInterface
-{
-    use StreamDecoratorTrait;
-
-    private $maxLength;
-
-    /**
-     * @param StreamInterface $stream    Underlying stream to decorate.
-     * @param int             $maxLength Maximum size before dropping data.
-     */
-    public function __construct(StreamInterface $stream, $maxLength)
-    {
-        $this->stream = $stream;
-        $this->maxLength = $maxLength;
-    }
-
-    public function write($string)
-    {
-        $diff = $this->maxLength - $this->stream->getSize();
-
-        // Begin returning false when the underlying stream is too large.
-        if ($diff <= 0) {
-            return false;
-        }
-
-        // Write the stream or a subset of the stream if needed.
-        if (strlen($string) < $diff) {
-            return $this->stream->write($string);
-        }
-
-        $this->stream->write(substr($string, 0, $diff));
-
-        return false;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/Exception/CannotAttachException.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/Exception/CannotAttachException.php
deleted file mode 100644
index e631b9fa44..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/Exception/CannotAttachException.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-namespace GuzzleHttp\Stream\Exception;
-
-class CannotAttachException extends \RuntimeException {}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/Exception/SeekException.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/Exception/SeekException.php
deleted file mode 100644
index 3f6d5ebad5..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/Exception/SeekException.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-namespace GuzzleHttp\Stream\Exception;
-
-use GuzzleHttp\Stream\StreamInterface;
-
-/**
- * Exception thrown when a seek fails on a stream.
- */
-class SeekException extends \RuntimeException
-{
-    private $stream;
-
-    public function __construct(StreamInterface $stream, $pos = 0, $msg = '')
-    {
-        $this->stream = $stream;
-        $msg = $msg ?: 'Could not seek the stream to position ' . $pos;
-        parent::__construct($msg);
-    }
-
-    /**
-     * @return StreamInterface
-     */
-    public function getStream()
-    {
-        return $this->stream;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/FnStream.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/FnStream.php
deleted file mode 100644
index 6b5872d7f6..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/FnStream.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-namespace GuzzleHttp\Stream;
-
-/**
- * Compose stream implementations based on a hash of functions.
- *
- * Allows for easy testing and extension of a provided stream without needing
- * to create a concrete class for a simple extension point.
- */
-class FnStream implements StreamInterface
-{
-    /** @var array */
-    private $methods;
-
-    /** @var array Methods that must be implemented in the given array */
-    private static $slots = ['__toString', 'close', 'detach', 'attach',
-        'getSize', 'tell', 'eof', 'isSeekable', 'seek', 'isWritable', 'write',
-        'isReadable', 'read', 'getContents', 'getMetadata'];
-
-    /**
-     * @param array $methods Hash of method name to a callable.
-     */
-    public function __construct(array $methods)
-    {
-        $this->methods = $methods;
-
-        // Create the functions on the class
-        foreach ($methods as $name => $fn) {
-            $this->{'_fn_' . $name} = $fn;
-        }
-    }
-
-    /**
-     * Lazily determine which methods are not implemented.
-     * @throws \BadMethodCallException
-     */
-    public function __get($name)
-    {
-        throw new \BadMethodCallException(str_replace('_fn_', '', $name)
-            . '() is not implemented in the FnStream');
-    }
-
-    /**
-     * The close method is called on the underlying stream only if possible.
-     */
-    public function __destruct()
-    {
-        if (isset($this->_fn_close)) {
-            call_user_func($this->_fn_close);
-        }
-    }
-
-    /**
-     * Adds custom functionality to an underlying stream by intercepting
-     * specific method calls.
-     *
-     * @param StreamInterface $stream  Stream to decorate
-     * @param array           $methods Hash of method name to a closure
-     *
-     * @return FnStream
-     */
-    public static function decorate(StreamInterface $stream, array $methods)
-    {
-        // If any of the required methods were not provided, then simply
-        // proxy to the decorated stream.
-        foreach (array_diff(self::$slots, array_keys($methods)) as $diff) {
-            $methods[$diff] = [$stream, $diff];
-        }
-
-        return new self($methods);
-    }
-
-    public function __toString()
-    {
-        return call_user_func($this->_fn___toString);
-    }
-
-    public function close()
-    {
-        return call_user_func($this->_fn_close);
-    }
-
-    public function detach()
-    {
-        return call_user_func($this->_fn_detach);
-    }
-
-    public function attach($stream)
-    {
-        return call_user_func($this->_fn_attach, $stream);
-    }
-
-    public function getSize()
-    {
-        return call_user_func($this->_fn_getSize);
-    }
-
-    public function tell()
-    {
-        return call_user_func($this->_fn_tell);
-    }
-
-    public function eof()
-    {
-        return call_user_func($this->_fn_eof);
-    }
-
-    public function isSeekable()
-    {
-        return call_user_func($this->_fn_isSeekable);
-    }
-
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        return call_user_func($this->_fn_seek, $offset, $whence);
-    }
-
-    public function isWritable()
-    {
-        return call_user_func($this->_fn_isWritable);
-    }
-
-    public function write($string)
-    {
-        return call_user_func($this->_fn_write, $string);
-    }
-
-    public function isReadable()
-    {
-        return call_user_func($this->_fn_isReadable);
-    }
-
-    public function read($length)
-    {
-        return call_user_func($this->_fn_read, $length);
-    }
-
-    public function getContents()
-    {
-        return call_user_func($this->_fn_getContents);
-    }
-
-    public function getMetadata($key = null)
-    {
-        return call_user_func($this->_fn_getMetadata, $key);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/GuzzleStreamWrapper.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/GuzzleStreamWrapper.php
deleted file mode 100644
index 4d049a6936..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/GuzzleStreamWrapper.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-namespace GuzzleHttp\Stream;
-
-/**
- * Converts Guzzle streams into PHP stream resources.
- */
-class GuzzleStreamWrapper
-{
-    /** @var resource */
-    public $context;
-
-    /** @var StreamInterface */
-    private $stream;
-
-    /** @var string r, r+, or w */
-    private $mode;
-
-    /**
-     * Returns a resource representing the stream.
-     *
-     * @param StreamInterface $stream The stream to get a resource for
-     *
-     * @return resource
-     * @throws \InvalidArgumentException if stream is not readable or writable
-     */
-    public static function getResource(StreamInterface $stream)
-    {
-        self::register();
-
-        if ($stream->isReadable()) {
-            $mode = $stream->isWritable() ? 'r+' : 'r';
-        } elseif ($stream->isWritable()) {
-            $mode = 'w';
-        } else {
-            throw new \InvalidArgumentException('The stream must be readable, '
-                . 'writable, or both.');
-        }
-
-        return fopen('guzzle://stream', $mode, null, stream_context_create([
-            'guzzle' => ['stream' => $stream]
-        ]));
-    }
-
-    /**
-     * Registers the stream wrapper if needed
-     */
-    public static function register()
-    {
-        if (!in_array('guzzle', stream_get_wrappers())) {
-            stream_wrapper_register('guzzle', __CLASS__);
-        }
-    }
-
-    public function stream_open($path, $mode, $options, &$opened_path)
-    {
-        $options = stream_context_get_options($this->context);
-
-        if (!isset($options['guzzle']['stream'])) {
-            return false;
-        }
-
-        $this->mode = $mode;
-        $this->stream = $options['guzzle']['stream'];
-
-        return true;
-    }
-
-    public function stream_read($count)
-    {
-        return $this->stream->read($count);
-    }
-
-    public function stream_write($data)
-    {
-        return (int) $this->stream->write($data);
-    }
-
-    public function stream_tell()
-    {
-        return $this->stream->tell();
-    }
-
-    public function stream_eof()
-    {
-        return $this->stream->eof();
-    }
-
-    public function stream_seek($offset, $whence)
-    {
-        return $this->stream->seek($offset, $whence);
-    }
-
-    public function stream_stat()
-    {
-        static $modeMap = [
-            'r'  => 33060,
-            'r+' => 33206,
-            'w'  => 33188
-        ];
-
-        return [
-            'dev'     => 0,
-            'ino'     => 0,
-            'mode'    => $modeMap[$this->mode],
-            'nlink'   => 0,
-            'uid'     => 0,
-            'gid'     => 0,
-            'rdev'    => 0,
-            'size'    => $this->stream->getSize() ?: 0,
-            'atime'   => 0,
-            'mtime'   => 0,
-            'ctime'   => 0,
-            'blksize' => 0,
-            'blocks'  => 0
-        ];
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/InflateStream.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/InflateStream.php
deleted file mode 100644
index 978af21031..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/InflateStream.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-namespace GuzzleHttp\Stream;
-
-/**
- * Uses PHP's zlib.inflate filter to inflate deflate or gzipped content.
- *
- * This stream decorator skips the first 10 bytes of the given stream to remove
- * the gzip header, converts the provided stream to a PHP stream resource,
- * then appends the zlib.inflate filter. The stream is then converted back
- * to a Guzzle stream resource to be used as a Guzzle stream.
- *
- * @link http://tools.ietf.org/html/rfc1952
- * @link http://php.net/manual/en/filters.compression.php
- */
-class InflateStream implements StreamInterface
-{
-    use StreamDecoratorTrait;
-
-    public function __construct(StreamInterface $stream)
-    {
-        // Skip the first 10 bytes
-        $stream = new LimitStream($stream, -1, 10);
-        $resource = GuzzleStreamWrapper::getResource($stream);
-        stream_filter_append($resource, 'zlib.inflate', STREAM_FILTER_READ);
-        $this->stream = new Stream($resource);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/LazyOpenStream.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/LazyOpenStream.php
deleted file mode 100644
index 6242ee7b57..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/LazyOpenStream.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-namespace GuzzleHttp\Stream;
-
-/**
- * Lazily reads or writes to a file that is opened only after an IO operation
- * take place on the stream.
- */
-class LazyOpenStream implements StreamInterface
-{
-    use StreamDecoratorTrait;
-
-    /** @var string File to open */
-    private $filename;
-
-    /** @var string $mode */
-    private $mode;
-
-    /**
-     * @param string $filename File to lazily open
-     * @param string $mode     fopen mode to use when opening the stream
-     */
-    public function __construct($filename, $mode)
-    {
-        $this->filename = $filename;
-        $this->mode = $mode;
-    }
-
-    /**
-     * Creates the underlying stream lazily when required.
-     *
-     * @return StreamInterface
-     */
-    protected function createStream()
-    {
-        return Stream::factory(Utils::open($this->filename, $this->mode));
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/LimitStream.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/LimitStream.php
deleted file mode 100644
index e9fad98573..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/LimitStream.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-namespace GuzzleHttp\Stream;
-
-use GuzzleHttp\Stream\Exception\SeekException;
-
-/**
- * Decorator used to return only a subset of a stream
- */
-class LimitStream implements StreamInterface
-{
-    use StreamDecoratorTrait;
-
-    /** @var int Offset to start reading from */
-    private $offset;
-
-    /** @var int Limit the number of bytes that can be read */
-    private $limit;
-
-    /**
-     * @param StreamInterface $stream Stream to wrap
-     * @param int             $limit  Total number of bytes to allow to be read
-     *                                from the stream. Pass -1 for no limit.
-     * @param int|null        $offset Position to seek to before reading (only
-     *                                works on seekable streams).
-     */
-    public function __construct(
-        StreamInterface $stream,
-        $limit = -1,
-        $offset = 0
-    ) {
-        $this->stream = $stream;
-        $this->setLimit($limit);
-        $this->setOffset($offset);
-    }
-
-    public function eof()
-    {
-        // Always return true if the underlying stream is EOF
-        if ($this->stream->eof()) {
-            return true;
-        }
-
-        // No limit and the underlying stream is not at EOF
-        if ($this->limit == -1) {
-            return false;
-        }
-
-        $tell = $this->stream->tell();
-        if ($tell === false) {
-            return false;
-        }
-
-        return $tell >= $this->offset + $this->limit;
-    }
-
-    /**
-     * Returns the size of the limited subset of data
-     * {@inheritdoc}
-     */
-    public function getSize()
-    {
-        if (null === ($length = $this->stream->getSize())) {
-            return null;
-        } elseif ($this->limit == -1) {
-            return $length - $this->offset;
-        } else {
-            return min($this->limit, $length - $this->offset);
-        }
-    }
-
-    /**
-     * Allow for a bounded seek on the read limited stream
-     * {@inheritdoc}
-     */
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        if ($whence !== SEEK_SET || $offset < 0) {
-            return false;
-        }
-
-        $offset += $this->offset;
-
-        if ($this->limit !== -1) {
-            if ($offset > $this->offset + $this->limit) {
-                $offset = $this->offset + $this->limit;
-            }
-        }
-
-        return $this->stream->seek($offset);
-    }
-
-    /**
-     * Give a relative tell()
-     * {@inheritdoc}
-     */
-    public function tell()
-    {
-        return $this->stream->tell() - $this->offset;
-    }
-
-    /**
-     * Set the offset to start limiting from
-     *
-     * @param int $offset Offset to seek to and begin byte limiting from
-     *
-     * @return self
-     * @throws SeekException
-     */
-    public function setOffset($offset)
-    {
-        $current = $this->stream->tell();
-
-        if ($current !== $offset) {
-            // If the stream cannot seek to the offset position, then read to it
-            if (!$this->stream->seek($offset)) {
-                if ($current > $offset) {
-                    throw new SeekException($this, $offset);
-                } else {
-                    $this->stream->read($offset - $current);
-                }
-            }
-        }
-
-        $this->offset = $offset;
-
-        return $this;
-    }
-
-    /**
-     * Set the limit of bytes that the decorator allows to be read from the
-     * stream.
-     *
-     * @param int $limit Number of bytes to allow to be read from the stream.
-     *                   Use -1 for no limit.
-     * @return self
-     */
-    public function setLimit($limit)
-    {
-        $this->limit = $limit;
-
-        return $this;
-    }
-
-    public function read($length)
-    {
-        if ($this->limit == -1) {
-            return $this->stream->read($length);
-        }
-
-        // Check if the current position is less than the total allowed
-        // bytes + original offset
-        $remaining = ($this->offset + $this->limit) - $this->stream->tell();
-        if ($remaining > 0) {
-            // Only return the amount of requested data, ensuring that the byte
-            // limit is not exceeded
-            return $this->stream->read(min($remaining, $length));
-        } else {
-            return false;
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/MetadataStreamInterface.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/MetadataStreamInterface.php
deleted file mode 100644
index c1433ad83e..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/MetadataStreamInterface.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-namespace GuzzleHttp\Stream;
-
-/**
- * This interface is deprecated and should no longer be used. Just use
- * StreamInterface now that the getMetadata method has been added to
- * StreamInterface.
- *
- * @deprecated
- */
-interface MetadataStreamInterface extends StreamInterface {}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/NoSeekStream.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/NoSeekStream.php
deleted file mode 100644
index 3d42395d76..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/NoSeekStream.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-namespace GuzzleHttp\Stream;
-
-/**
- * Stream decorator that prevents a stream from being seeked
- */
-class NoSeekStream implements StreamInterface
-{
-    use StreamDecoratorTrait;
-
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        return false;
-    }
-
-    public function isSeekable()
-    {
-        return false;
-    }
-
-    public function attach($stream)
-    {
-        $this->stream->attach($stream);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/NullStream.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/NullStream.php
deleted file mode 100644
index 41ee776683..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/NullStream.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-namespace GuzzleHttp\Stream;
-use GuzzleHttp\Stream\Exception\CannotAttachException;
-
-/**
- * Does not store any data written to it.
- */
-class NullStream implements StreamInterface
-{
-    public function __toString()
-    {
-        return '';
-    }
-
-    public function getContents()
-    {
-        return '';
-    }
-
-    public function close() {}
-
-    public function detach() {}
-
-    public function attach($stream)
-    {
-        throw new CannotAttachException();
-    }
-
-    public function getSize()
-    {
-        return 0;
-    }
-
-    public function isReadable()
-    {
-        return true;
-    }
-
-    public function isWritable()
-    {
-        return true;
-    }
-
-    public function isSeekable()
-    {
-        return true;
-    }
-
-    public function eof()
-    {
-        return true;
-    }
-
-    public function tell()
-    {
-        return 0;
-    }
-
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        return false;
-    }
-
-    public function read($length)
-    {
-        return false;
-    }
-
-    public function write($string)
-    {
-        return strlen($string);
-    }
-
-    public function getMetadata($key = null)
-    {
-        return $key ? null : [];
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/PumpStream.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/PumpStream.php
deleted file mode 100644
index 9963207296..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/PumpStream.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-namespace GuzzleHttp\Stream;
-
-use GuzzleHttp\Stream\Exception\CannotAttachException;
-
-/**
- * Provides a read only stream that pumps data from a PHP callable.
- *
- * When invoking the provided callable, the PumpStream will pass the amount of
- * data requested to read to the callable. The callable can choose to ignore
- * this value and return fewer or more bytes than requested. Any extra data
- * returned by the provided callable is buffered internally until drained using
- * the read() function of the PumpStream. The provided callable MUST return
- * false when there is no more data to read.
- */
-class PumpStream implements StreamInterface
-{
-    /** @var callable */
-    private $source;
-
-    /** @var int */
-    private $size;
-
-    /** @var int */
-    private $tellPos = 0;
-
-    /** @var array */
-    private $metadata;
-
-    /** @var BufferStream */
-    private $buffer;
-
-    /**
-     * @param callable $source Source of the stream data. The callable MAY
-     *                         accept an integer argument used to control the
-     *                         amount of data to return. The callable MUST
-     *                         return a string when called, or false on error
-     *                         or EOF.
-     * @param array $options   Stream options:
-     *                         - metadata: Hash of metadata to use with stream.
-     *                         - size: Size of the stream, if known.
-     */
-    public function __construct(callable $source, array $options = [])
-    {
-        $this->source = $source;
-        $this->size = isset($options['size']) ? $options['size'] : null;
-        $this->metadata = isset($options['metadata']) ? $options['metadata'] : [];
-        $this->buffer = new BufferStream();
-    }
-
-    public function __toString()
-    {
-        return Utils::copyToString($this);
-    }
-
-    public function close()
-    {
-        $this->detach();
-    }
-
-    public function detach()
-    {
-        $this->tellPos = false;
-        $this->source = null;
-    }
-
-    public function attach($stream)
-    {
-        throw new CannotAttachException();
-    }
-
-    public function getSize()
-    {
-        return $this->size;
-    }
-
-    public function tell()
-    {
-        return $this->tellPos;
-    }
-
-    public function eof()
-    {
-        return !$this->source;
-    }
-
-    public function isSeekable()
-    {
-        return false;
-    }
-
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        return false;
-    }
-
-    public function isWritable()
-    {
-        return false;
-    }
-
-    public function write($string)
-    {
-        return false;
-    }
-
-    public function isReadable()
-    {
-        return true;
-    }
-
-    public function read($length)
-    {
-        $data = $this->buffer->read($length);
-        $readLen = strlen($data);
-        $this->tellPos += $readLen;
-        $remaining = $length - $readLen;
-
-        if ($remaining) {
-            $this->pump($remaining);
-            $data .= $this->buffer->read($remaining);
-            $this->tellPos += strlen($data) - $readLen;
-        }
-
-        return $data;
-    }
-
-    public function getContents()
-    {
-        $result = '';
-        while (!$this->eof()) {
-            $result .= $this->read(1000000);
-        }
-
-        return $result;
-    }
-
-    public function getMetadata($key = null)
-    {
-        if (!$key) {
-            return $this->metadata;
-        }
-
-        return isset($this->metadata[$key]) ? $this->metadata[$key] : null;
-    }
-
-    private function pump($length)
-    {
-        if ($this->source) {
-            do {
-                $data = call_user_func($this->source, $length);
-                if ($data === false || $data === null) {
-                    $this->source = null;
-                    return;
-                }
-                $this->buffer->write($data);
-                $length -= strlen($data);
-            } while ($length > 0);
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/Stream.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/Stream.php
deleted file mode 100644
index 7adbc5e3f3..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/Stream.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<?php
-namespace GuzzleHttp\Stream;
-
-/**
- * PHP stream implementation
- */
-class Stream implements StreamInterface
-{
-    private $stream;
-    private $size;
-    private $seekable;
-    private $readable;
-    private $writable;
-    private $uri;
-    private $customMetadata;
-
-    /** @var array Hash of readable and writable stream types */
-    private static $readWriteHash = [
-        'read' => [
-            'r' => true, 'w+' => true, 'r+' => true, 'x+' => true, 'c+' => true,
-            'rb' => true, 'w+b' => true, 'r+b' => true, 'x+b' => true,
-            'c+b' => true, 'rt' => true, 'w+t' => true, 'r+t' => true,
-            'x+t' => true, 'c+t' => true, 'a+' => true
-        ],
-        'write' => [
-            'w' => true, 'w+' => true, 'rw' => true, 'r+' => true, 'x+' => true,
-            'c+' => true, 'wb' => true, 'w+b' => true, 'r+b' => true,
-            'x+b' => true, 'c+b' => true, 'w+t' => true, 'r+t' => true,
-            'x+t' => true, 'c+t' => true, 'a' => true, 'a+' => true
-        ]
-    ];
-
-    /**
-     * Create a new stream based on the input type.
-     *
-     * This factory accepts the same associative array of options as described
-     * in the constructor.
-     *
-     * @param resource|string|StreamInterface $resource Entity body data
-     * @param array                           $options  Additional options
-     *
-     * @return Stream
-     * @throws \InvalidArgumentException if the $resource arg is not valid.
-     */
-    public static function factory($resource = '', array $options = [])
-    {
-        $type = gettype($resource);
-
-        if ($type == 'string') {
-            $stream = fopen('php://temp', 'r+');
-            if ($resource !== '') {
-                fwrite($stream, $resource);
-                fseek($stream, 0);
-            }
-            return new self($stream, $options);
-        }
-
-        if ($type == 'resource') {
-            return new self($resource, $options);
-        }
-
-        if ($resource instanceof StreamInterface) {
-            return $resource;
-        }
-
-        if ($type == 'object' && method_exists($resource, '__toString')) {
-            return self::factory((string) $resource, $options);
-        }
-
-        if (is_callable($resource)) {
-            return new PumpStream($resource, $options);
-        }
-
-        if ($resource instanceof \Iterator) {
-            return new PumpStream(function () use ($resource) {
-                if (!$resource->valid()) {
-                    return false;
-                }
-                $result = $resource->current();
-                $resource->next();
-                return $result;
-            }, $options);
-        }
-
-        throw new \InvalidArgumentException('Invalid resource type: ' . $type);
-    }
-
-    /**
-     * This constructor accepts an associative array of options.
-     *
-     * - size: (int) If a read stream would otherwise have an indeterminate
-     *   size, but the size is known due to foreknownledge, then you can
-     *   provide that size, in bytes.
-     * - metadata: (array) Any additional metadata to return when the metadata
-     *   of the stream is accessed.
-     *
-     * @param resource $stream  Stream resource to wrap.
-     * @param array    $options Associative array of options.
-     *
-     * @throws \InvalidArgumentException if the stream is not a stream resource
-     */
-    public function __construct($stream, $options = [])
-    {
-        if (!is_resource($stream)) {
-            throw new \InvalidArgumentException('Stream must be a resource');
-        }
-
-        if (isset($options['size'])) {
-            $this->size = $options['size'];
-        }
-
-        $this->customMetadata = isset($options['metadata'])
-            ? $options['metadata']
-            : [];
-
-        $this->attach($stream);
-    }
-
-    /**
-     * Closes the stream when the destructed
-     */
-    public function __destruct()
-    {
-        $this->close();
-    }
-
-    public function __toString()
-    {
-        if (!$this->stream) {
-            return '';
-        }
-
-        $this->seek(0);
-
-        return (string) stream_get_contents($this->stream);
-    }
-
-    public function getContents()
-    {
-        return $this->stream ? stream_get_contents($this->stream) : '';
-    }
-
-    public function close()
-    {
-        if (is_resource($this->stream)) {
-            fclose($this->stream);
-        }
-
-        $this->detach();
-    }
-
-    public function detach()
-    {
-        $result = $this->stream;
-        $this->stream = $this->size = $this->uri = null;
-        $this->readable = $this->writable = $this->seekable = false;
-
-        return $result;
-    }
-
-    public function attach($stream)
-    {
-        $this->stream = $stream;
-        $meta = stream_get_meta_data($this->stream);
-        $this->seekable = $meta['seekable'];
-        $this->readable = isset(self::$readWriteHash['read'][$meta['mode']]);
-        $this->writable = isset(self::$readWriteHash['write'][$meta['mode']]);
-        $this->uri = $this->getMetadata('uri');
-    }
-
-    public function getSize()
-    {
-        if ($this->size !== null) {
-            return $this->size;
-        }
-
-        if (!$this->stream) {
-            return null;
-        }
-
-        // Clear the stat cache if the stream has a URI
-        if ($this->uri) {
-            clearstatcache(true, $this->uri);
-        }
-
-        $stats = fstat($this->stream);
-        if (isset($stats['size'])) {
-            $this->size = $stats['size'];
-            return $this->size;
-        }
-
-        return null;
-    }
-
-    public function isReadable()
-    {
-        return $this->readable;
-    }
-
-    public function isWritable()
-    {
-        return $this->writable;
-    }
-
-    public function isSeekable()
-    {
-        return $this->seekable;
-    }
-
-    public function eof()
-    {
-        return !$this->stream || feof($this->stream);
-    }
-
-    public function tell()
-    {
-        return $this->stream ? ftell($this->stream) : false;
-    }
-
-    public function setSize($size)
-    {
-        $this->size = $size;
-
-        return $this;
-    }
-
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        return $this->seekable
-            ? fseek($this->stream, $offset, $whence) === 0
-            : false;
-    }
-
-    public function read($length)
-    {
-        return $this->readable ? fread($this->stream, $length) : false;
-    }
-
-    public function write($string)
-    {
-        // We can't know the size after writing anything
-        $this->size = null;
-
-        return $this->writable ? fwrite($this->stream, $string) : false;
-    }
-
-    public function getMetadata($key = null)
-    {
-        if (!$this->stream) {
-            return $key ? null : [];
-        } elseif (!$key) {
-            return $this->customMetadata + stream_get_meta_data($this->stream);
-        } elseif (isset($this->customMetadata[$key])) {
-            return $this->customMetadata[$key];
-        }
-
-        $meta = stream_get_meta_data($this->stream);
-
-        return isset($meta[$key]) ? $meta[$key] : null;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/StreamDecoratorTrait.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/StreamDecoratorTrait.php
deleted file mode 100644
index 39c19c58cc..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/StreamDecoratorTrait.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-namespace GuzzleHttp\Stream;
-use GuzzleHttp\Stream\Exception\CannotAttachException;
-
-/**
- * Stream decorator trait
- * @property StreamInterface stream
- */
-trait StreamDecoratorTrait
-{
-    /**
-     * @param StreamInterface $stream Stream to decorate
-     */
-    public function __construct(StreamInterface $stream)
-    {
-        $this->stream = $stream;
-    }
-
-    /**
-     * Magic method used to create a new stream if streams are not added in
-     * the constructor of a decorator (e.g., LazyOpenStream).
-     */
-    public function __get($name)
-    {
-        if ($name == 'stream') {
-            $this->stream = $this->createStream();
-            return $this->stream;
-        }
-
-        throw new \UnexpectedValueException("$name not found on class");
-    }
-
-    public function __toString()
-    {
-        try {
-            $this->seek(0);
-            return $this->getContents();
-        } catch (\Exception $e) {
-            // Really, PHP? https://bugs.php.net/bug.php?id=53648
-            trigger_error('StreamDecorator::__toString exception: '
-                . (string) $e, E_USER_ERROR);
-            return '';
-        }
-    }
-
-    public function getContents()
-    {
-        return Utils::copyToString($this);
-    }
-
-    /**
-     * Allow decorators to implement custom methods
-     *
-     * @param string $method Missing method name
-     * @param array  $args   Method arguments
-     *
-     * @return mixed
-     */
-    public function __call($method, array $args)
-    {
-        $result = call_user_func_array(array($this->stream, $method), $args);
-
-        // Always return the wrapped object if the result is a return $this
-        return $result === $this->stream ? $this : $result;
-    }
-
-    public function close()
-    {
-        $this->stream->close();
-    }
-
-    public function getMetadata($key = null)
-    {
-        return $this->stream->getMetadata($key);
-    }
-
-    public function detach()
-    {
-        return $this->stream->detach();
-    }
-
-    public function attach($stream)
-    {
-        throw new CannotAttachException();
-    }
-
-    public function getSize()
-    {
-        return $this->stream->getSize();
-    }
-
-    public function eof()
-    {
-        return $this->stream->eof();
-    }
-
-    public function tell()
-    {
-        return $this->stream->tell();
-    }
-
-    public function isReadable()
-    {
-        return $this->stream->isReadable();
-    }
-
-    public function isWritable()
-    {
-        return $this->stream->isWritable();
-    }
-
-    public function isSeekable()
-    {
-        return $this->stream->isSeekable();
-    }
-
-    public function seek($offset, $whence = SEEK_SET)
-    {
-        return $this->stream->seek($offset, $whence);
-    }
-
-    public function read($length)
-    {
-        return $this->stream->read($length);
-    }
-
-    public function write($string)
-    {
-        return $this->stream->write($string);
-    }
-
-    /**
-     * Implement in subclasses to dynamically create streams when requested.
-     *
-     * @return StreamInterface
-     * @throws \BadMethodCallException
-     */
-    protected function createStream()
-    {
-        throw new \BadMethodCallException('createStream() not implemented in '
-            . get_class($this));
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/StreamInterface.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/StreamInterface.php
deleted file mode 100644
index fd19c6f25a..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/StreamInterface.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-namespace GuzzleHttp\Stream;
-
-/**
- * Describes a stream instance.
- */
-interface StreamInterface
-{
-    /**
-     * Attempts to seek to the beginning of the stream and reads all data into
-     * a string until the end of the stream is reached.
-     *
-     * Warning: This could attempt to load a large amount of data into memory.
-     *
-     * @return string
-     */
-    public function __toString();
-
-    /**
-     * Closes the stream and any underlying resources.
-     */
-    public function close();
-
-    /**
-     * Separates any underlying resources from the stream.
-     *
-     * After the underlying resource has been detached, the stream object is in
-     * an unusable state. If you wish to use a Stream object as a PHP stream
-     * but keep the Stream object in a consistent state, use
-     * {@see GuzzleHttp\Stream\GuzzleStreamWrapper::getResource}.
-     *
-     * @return resource|null Returns the underlying PHP stream resource or null
-     *                       if the Stream object did not utilize an underlying
-     *                       stream resource.
-     */
-    public function detach();
-
-    /**
-     * Replaces the underlying stream resource with the provided stream.
-     *
-     * Use this method to replace the underlying stream with another; as an
-     * example, in server-side code, if you decide to return a file, you
-     * would replace the original content-oriented stream with the file
-     * stream.
-     *
-     * Any internal state such as caching of cursor position should be reset
-     * when attach() is called, as the stream has changed.
-     *
-     * @param resource $stream
-     *
-     * @return void
-     */
-    public function attach($stream);
-
-    /**
-     * Get the size of the stream if known
-     *
-     * @return int|null Returns the size in bytes if known, or null if unknown
-     */
-    public function getSize();
-
-    /**
-     * Returns the current position of the file read/write pointer
-     *
-     * @return int|bool Returns the position of the file pointer or false on error
-     */
-    public function tell();
-
-    /**
-     * Returns true if the stream is at the end of the stream.
-     *
-     * @return bool
-     */
-    public function eof();
-
-    /**
-     * Returns whether or not the stream is seekable
-     *
-     * @return bool
-     */
-    public function isSeekable();
-
-    /**
-     * Seek to a position in the stream
-     *
-     * @param int $offset Stream offset
-     * @param int $whence Specifies how the cursor position will be calculated
-     *                    based on the seek offset. Valid values are identical
-     *                    to the built-in PHP $whence values for `fseek()`.
-     *                    SEEK_SET: Set position equal to offset bytes
-     *                    SEEK_CUR: Set position to current location plus offset
-     *                    SEEK_END: Set position to end-of-stream plus offset
-     *
-     * @return bool Returns true on success or false on failure
-     * @link   http://www.php.net/manual/en/function.fseek.php
-     */
-    public function seek($offset, $whence = SEEK_SET);
-
-    /**
-     * Returns whether or not the stream is writable
-     *
-     * @return bool
-     */
-    public function isWritable();
-
-    /**
-     * Write data to the stream
-     *
-     * @param string $string The string that is to be written.
-     *
-     * @return int|bool Returns the number of bytes written to the stream on
-     *                  success returns false on failure (e.g., broken pipe,
-     *                  writer needs to slow down, buffer is full, etc.)
-     */
-    public function write($string);
-
-    /**
-     * Returns whether or not the stream is readable
-     *
-     * @return bool
-     */
-    public function isReadable();
-
-    /**
-     * Read data from the stream
-     *
-     * @param int $length Read up to $length bytes from the object and return
-     *                    them. Fewer than $length bytes may be returned if
-     *                    underlying stream call returns fewer bytes.
-     *
-     * @return string     Returns the data read from the stream.
-     */
-    public function read($length);
-
-    /**
-     * Returns the remaining contents of the stream as a string.
-     *
-     * Note: this could potentially load a large amount of data into memory.
-     *
-     * @return string
-     */
-    public function getContents();
-
-    /**
-     * Get stream metadata as an associative array or retrieve a specific key.
-     *
-     * The keys returned are identical to the keys returned from PHP's
-     * stream_get_meta_data() function.
-     *
-     * @param string $key Specific metadata to retrieve.
-     *
-     * @return array|mixed|null Returns an associative array if no key is
-     *                          no key is provided. Returns a specific key
-     *                          value if a key is provided and the value is
-     *                          found, or null if the key is not found.
-     * @see http://php.net/manual/en/function.stream-get-meta-data.php
-     */
-    public function getMetadata($key = null);
-}
diff --git a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/Utils.php b/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/Utils.php
deleted file mode 100644
index 94cb42d31d..0000000000
--- a/core/src/core/classes/guzzle/vendor/guzzlehttp/streams/src/Utils.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-namespace GuzzleHttp\Stream;
-
-use GuzzleHttp\Stream\Exception\SeekException;
-
-/**
- * Static utility class because PHP's autoloaders don't support the concept
- * of namespaced function autoloading.
- */
-class Utils
-{
-    /**
-     * Safely opens a PHP stream resource using a filename.
-     *
-     * When fopen fails, PHP normally raises a warning. This function adds an
-     * error handler that checks for errors and throws an exception instead.
-     *
-     * @param string $filename File to open
-     * @param string $mode     Mode used to open the file
-     *
-     * @return resource
-     * @throws \RuntimeException if the file cannot be opened
-     */
-    public static function open($filename, $mode)
-    {
-        $ex = null;
-        set_error_handler(function () use ($filename, $mode, &$ex) {
-            $ex = new \RuntimeException(sprintf(
-                'Unable to open %s using mode %s: %s',
-                $filename,
-                $mode,
-                func_get_args()[1]
-            ));
-        });
-
-        $handle = fopen($filename, $mode);
-        restore_error_handler();
-
-        if ($ex) {
-            /** @var $ex \RuntimeException */
-            throw $ex;
-        }
-
-        return $handle;
-    }
-
-    /**
-     * Copy the contents of a stream into a string until the given number of
-     * bytes have been read.
-     *
-     * @param StreamInterface $stream Stream to read
-     * @param int             $maxLen Maximum number of bytes to read. Pass -1
-     *                                to read the entire stream.
-     * @return string
-     */
-    public static function copyToString(StreamInterface $stream, $maxLen = -1)
-    {
-        $buffer = '';
-
-        if ($maxLen === -1) {
-            while (!$stream->eof()) {
-                $buf = $stream->read(1048576);
-                if ($buf === false) {
-                    break;
-                }
-                $buffer .= $buf;
-            }
-            return $buffer;
-        }
-
-        $len = 0;
-        while (!$stream->eof() && $len < $maxLen) {
-            $buf = $stream->read($maxLen - $len);
-            if ($buf === false) {
-                break;
-            }
-            $buffer .= $buf;
-            $len = strlen($buffer);
-        }
-
-        return $buffer;
-    }
-
-    /**
-     * Copy the contents of a stream into another stream until the given number
-     * of bytes have been read.
-     *
-     * @param StreamInterface $source Stream to read from
-     * @param StreamInterface $dest   Stream to write to
-     * @param int             $maxLen Maximum number of bytes to read. Pass -1
-     *                                to read the entire stream.
-     */
-    public static function copyToStream(
-        StreamInterface $source,
-        StreamInterface $dest,
-        $maxLen = -1
-    ) {
-        if ($maxLen === -1) {
-            while (!$source->eof()) {
-                if (!$dest->write($source->read(1048576))) {
-                    break;
-                }
-            }
-            return;
-        }
-
-        $bytes = 0;
-        while (!$source->eof()) {
-            $buf = $source->read($maxLen - $bytes);
-            if (!($len = strlen($buf))) {
-                break;
-            }
-            $bytes += $len;
-            $dest->write($buf);
-            if ($bytes == $maxLen) {
-                break;
-            }
-        }
-    }
-
-    /**
-     * Calculate a hash of a Stream
-     *
-     * @param StreamInterface $stream    Stream to calculate the hash for
-     * @param string          $algo      Hash algorithm (e.g. md5, crc32, etc)
-     * @param bool            $rawOutput Whether or not to use raw output
-     *
-     * @return string Returns the hash of the stream
-     * @throws SeekException
-     */
-    public static function hash(
-        StreamInterface $stream,
-        $algo,
-        $rawOutput = false
-    ) {
-        $pos = $stream->tell();
-
-        if ($pos > 0 && !$stream->seek(0)) {
-            throw new SeekException($stream);
-        }
-
-        $ctx = hash_init($algo);
-        while (!$stream->eof()) {
-            hash_update($ctx, $stream->read(1048576));
-        }
-
-        $out = hash_final($ctx, (bool) $rawOutput);
-        $stream->seek($pos);
-
-        return $out;
-    }
-
-    /**
-     * Read a line from the stream up to the maximum allowed buffer length
-     *
-     * @param StreamInterface $stream    Stream to read from
-     * @param int             $maxLength Maximum buffer length
-     *
-     * @return string|bool
-     */
-    public static function readline(StreamInterface $stream, $maxLength = null)
-    {
-        $buffer = '';
-        $size = 0;
-
-        while (!$stream->eof()) {
-            if (false === ($byte = $stream->read(1))) {
-                return $buffer;
-            }
-            $buffer .= $byte;
-            // Break when a new line is found or the max length - 1 is reached
-            if ($byte == PHP_EOL || ++$size == $maxLength - 1) {
-                break;
-            }
-        }
-
-        return $buffer;
-    }
-
-    /**
-     * Alias of GuzzleHttp\Stream\Stream::factory.
-     *
-     * @param mixed $resource Resource to create
-     * @param array $options  Associative array of stream options defined in
-     *                        {@see \GuzzleHttp\Stream\Stream::__construct}
-     *
-     * @return StreamInterface
-     *
-     * @see GuzzleHttp\Stream\Stream::factory
-     * @see GuzzleHttp\Stream\Stream::__construct
-     */
-    public static function create($resource, array $options = [])
-    {
-        return Stream::factory($resource, $options);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/react/promise/.gitignore b/core/src/core/classes/guzzle/vendor/react/promise/.gitignore
deleted file mode 100644
index 5241c60aba..0000000000
--- a/core/src/core/classes/guzzle/vendor/react/promise/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-composer.lock
-composer.phar
-phpunit.xml
-build/
-vendor/
diff --git a/core/src/core/classes/guzzle/vendor/react/promise/.travis.yml b/core/src/core/classes/guzzle/vendor/react/promise/.travis.yml
deleted file mode 100644
index 19c08ab1a9..0000000000
--- a/core/src/core/classes/guzzle/vendor/react/promise/.travis.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-language: php
-
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - nightly
-  - hhvm
-
-before_install:
-  - composer self-update
-
-install:
-  - composer install
-
-script:
-  - phpunit -v --coverage-text --coverage-clover=./build/logs/clover.xml
-
-after_script:
-  - if [ -f ./build/logs/clover.xml ]; then travis_retry composer require satooshi/php-coveralls --no-interaction --update-with-dependencies; fi
-  - if [ -f ./build/logs/clover.xml ]; then php vendor/bin/coveralls -v; fi
diff --git a/core/src/core/classes/guzzle/vendor/react/promise/CHANGELOG.md b/core/src/core/classes/guzzle/vendor/react/promise/CHANGELOG.md
deleted file mode 100644
index 4b1d59d02f..0000000000
--- a/core/src/core/classes/guzzle/vendor/react/promise/CHANGELOG.md
+++ /dev/null
@@ -1,93 +0,0 @@
-CHANGELOG
-=========
-
-* 2.4.1 (2016-05-03)
-
-    * Fix `some()` not cancelling pending promises when too much input promises
-      reject (16ff799).
-
-* 2.4.0 (2016-03-31)
-
-    * Support foreign thenables in `resolve()`.
-      Any object that provides a `then()` method is now assimilated to a trusted
-      promise that follows the state of this thenable (#52).
-    * Fix `some()` and `any()` for input arrays containing not enough items
-      (#34).
-
-* 2.3.0 (2016-03-24)
-
-    * Allow cancellation of promises returned by functions working on promise
-      collections (#36).
-    * Handle `\Throwable` in the same way as `\Exception` (#51 by @joshdifabio).
-
-* 2.2.2 (2016-02-26)
-
-    * Fix cancellation handlers called multiple times (#47 by @clue).
-
-* 2.2.1 (2015-07-03)
-
-    * Fix stack error when resolving a promise in its own fulfillment or
-      rejection handlers.
-
-* 2.2.0 (2014-12-30)
-
-    * Introduce new `ExtendedPromiseInterface` implemented by all promises.
-    * Add new `done()` method (part of the `ExtendedPromiseInterface`).
-    * Add new `otherwise()` method (part of the `ExtendedPromiseInterface`).
-    * Add new `always()` method (part of the `ExtendedPromiseInterface`).
-    * Add new `progress()` method (part of the `ExtendedPromiseInterface`).
-    * Rename `Deferred::progress` to `Deferred::notify` to avoid confusion with
-      `ExtendedPromiseInterface::progress` (a `Deferred::progress` alias is
-      still available for backward compatibility)
-    * `resolve()` now always returns a `ExtendedPromiseInterface`.
-
-* 2.1.0 (2014-10-15)
-
-    * Introduce new `CancellablePromiseInterface` implemented by all promises.
-    * Add new `cancel()` method (part of the `CancellablePromiseInterface`).
-
-* 2.0.0 (2013-12-10)
-
-    New major release. The goal is to streamline the API and to make it more
-    compliant with other promise libraries and especially with the new upcoming
-    [ES6 promises specification](https://github.com/domenic/promises-unwrapping/).
-
-    * Add standalone Promise class.
-    * Add new `race()` function.
-    * BC break: Bump minimum PHP version to PHP 5.4.
-    * BC break: Remove `ResolverInterface` and `PromiseInterface` from 
-      `Deferred`.
-    * BC break: Change signature of `PromiseInterface`.
-    * BC break: Remove `When` and `Util` classes and move static methods to
-      functions.
-    * BC break: `FulfilledPromise` and `RejectedPromise` now throw an exception
-      when initialized with a promise instead of a value/reason.
-    * BC break: `Deferred::resolve()` and `Deferred::reject()` no longer return
-      a promise.
-
-* 1.0.4 (2013-04-03)
-
-    * Trigger PHP errors when invalid callback is passed.
-    * Fully resolve rejection value before calling rejection handler.
-    * Add `When::lazy()` to create lazy promises which will be initialized once
-      a consumer calls the `then()` method.
-
-* 1.0.3 (2012-11-17)
-
-    * Add `PromisorInterface` for objects that have a `promise()` method.
-
-* 1.0.2 (2012-11-14)
-
-    * Fix bug in `When::any()` not correctly unwrapping to a single result
-      value.
-    * `$promiseOrValue` argument of `When::resolve()` and When::reject() is now
-      optional.
-
-* 1.0.1 (2012-11-13)
-
-    * Prevent deep recursion which was reaching `xdebug.max_nesting_level`
-      default of 100.
-
-* 1.0.0 (2012-11-07)
-
-    * First tagged release.
diff --git a/core/src/core/classes/guzzle/vendor/react/promise/LICENSE b/core/src/core/classes/guzzle/vendor/react/promise/LICENSE
deleted file mode 100644
index 5919d20ff3..0000000000
--- a/core/src/core/classes/guzzle/vendor/react/promise/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2012-2016 Jan Sorgalla
-
-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/src/core/classes/guzzle/vendor/react/promise/README.md b/core/src/core/classes/guzzle/vendor/react/promise/README.md
deleted file mode 100644
index 9c0558c04d..0000000000
--- a/core/src/core/classes/guzzle/vendor/react/promise/README.md
+++ /dev/null
@@ -1,840 +0,0 @@
-React/Promise
-=============
-
-A lightweight implementation of
-[CommonJS Promises/A](http://wiki.commonjs.org/wiki/Promises/A) for PHP.
-
-[![Build Status](https://travis-ci.org/reactphp/promise.svg?branch=master)](http://travis-ci.org/reactphp/promise)
-[![Coverage Status](https://coveralls.io/repos/github/reactphp/promise/badge.svg?branch=master)](https://coveralls.io/github/reactphp/promise?branch=master)
-
-Table of Contents
------------------
-
-1. [Introduction](#introduction)
-2. [Concepts](#concepts)
-   * [Deferred](#deferred)
-   * [Promise](#promise)
-3. [API](#api)
-   * [Deferred](#deferred-1)
-     * [Deferred::promise()](#deferredpromise)
-     * [Deferred::resolve()](#deferredresolve)
-     * [Deferred::reject()](#deferredreject)
-     * [Deferred::notify()](#deferrednotify)
-   * [PromiseInterface](#promiseinterface)
-     * [PromiseInterface::then()](#promiseinterfacethen)
-   * [ExtendedPromiseInterface](#extendedpromiseinterface)
-        * [ExtendedPromiseInterface::done()](#extendedpromiseinterfacedone)
-        * [ExtendedPromiseInterface::otherwise()](#extendedpromiseinterfaceotherwise)
-        * [ExtendedPromiseInterface::always()](#extendedpromiseinterfacealways)
-        * [ExtendedPromiseInterface::progress()](#extendedpromiseinterfaceprogress)
-   * [CancellablePromiseInterface](#cancellablepromiseinterface)
-        * [CancellablePromiseInterface::cancel()](#cancellablepromiseinterfacecancel)
-   * [Promise](#promise-1)
-   * [FulfilledPromise](#fulfilledpromise)
-   * [RejectedPromise](#rejectedpromise)
-   * [LazyPromise](#lazypromise)
-   * [Functions](#functions)
-     * [resolve()](#resolve)
-     * [reject()](#reject)
-     * [all()](#all)
-     * [race()](#race)
-     * [any()](#any)
-     * [some()](#some)
-     * [map()](#map)
-     * [reduce()](#reduce)
-   * [PromisorInterface](#promisorinterface)
-4. [Examples](#examples)
-   * [How to use Deferred](#how-to-use-deferred)
-   * [How promise forwarding works](#how-promise-forwarding-works)
-     * [Resolution forwarding](#resolution-forwarding)
-     * [Rejection forwarding](#rejection-forwarding)
-     * [Mixed resolution and rejection forwarding](#mixed-resolution-and-rejection-forwarding)
-     * [Progress event forwarding](#progress-event-forwarding)
-   * [done() vs. then()](#done-vs-then)
-5. [Credits](#credits)
-6. [License](#license)
-
-Introduction
-------------
-
-React/Promise is a library implementing
-[CommonJS Promises/A](http://wiki.commonjs.org/wiki/Promises/A) for PHP.
-
-It also provides several other useful promise-related concepts, such as joining
-multiple promises and mapping and reducing collections of promises.
-
-If you've never heard about promises before,
-[read this first](https://gist.github.com/3889970).
-
-Concepts
---------
-
-### Deferred
-
-A **Deferred** represents a computation or unit of work that may not have
-completed yet. Typically (but not always), that computation will be something
-that executes asynchronously and completes at some point in the future.
-
-### Promise
-
-While a deferred represents the computation itself, a **Promise** represents
-the result of that computation. Thus, each deferred has a promise that acts as
-a placeholder for its actual result.
-
-API
----
-
-### Deferred
-
-A deferred represents an operation whose resolution is pending. It has separate
-promise and resolver parts.
-
-```php
-$deferred = new React\Promise\Deferred();
-
-$promise = $deferred->promise();
-
-$deferred->resolve(mixed $value = null);
-$deferred->reject(mixed $reason = null);
-$deferred->notify(mixed $update = null);
-```
-
-The `promise` method returns the promise of the deferred.
-
-The `resolve` and `reject` methods control the state of the deferred.
-
-The `notify` method is for progress notification.
-
-The constructor of the `Deferred` accepts an optional `$canceller` argument.
-See [Promise](#promise-1) for more information.
-
-#### Deferred::promise()
-
-```php
-$promise = $deferred->promise();
-```
-
-Returns the promise of the deferred, which you can hand out to others while
-keeping the authority to modify its state to yourself.
-
-#### Deferred::resolve()
-
-```php
-$deferred->resolve(mixed $value = null);
-```
-
-Resolves the promise returned by `promise()`. All consumers are notified by
-having `$onFulfilled` (which they registered via `$promise->then()`) called with
-`$value`.
-
-If `$value` itself is a promise, the promise will transition to the state of
-this promise once it is resolved.
-
-#### Deferred::reject()
-
-```php
-$deferred->reject(mixed $reason = null);
-```
-
-Rejects the promise returned by `promise()`, signalling that the deferred's
-computation failed.
-All consumers are notified by having `$onRejected` (which they registered via
-`$promise->then()`) called with `$reason`.
-
-If `$reason` itself is a promise, the promise will be rejected with the outcome
-of this promise regardless whether it fulfills or rejects.
-
-#### Deferred::notify()
-
-```php
-$deferred->notify(mixed $update = null);
-```
-
-Triggers progress notifications, to indicate to consumers that the computation
-is making progress toward its result.
-
-All consumers are notified by having `$onProgress` (which they registered via
-`$promise->then()`) called with `$update`.
-
-### PromiseInterface
-
-The promise interface provides the common interface for all promise
-implementations.
-
-A promise represents an eventual outcome, which is either fulfillment (success)
-and an associated value, or rejection (failure) and an associated reason.
-
-Once in the fulfilled or rejected state, a promise becomes immutable.
-Neither its state nor its result (or error) can be modified.
-
-#### Implementations
-
-* [Promise](#promise-1)
-* [FulfilledPromise](#fulfilledpromise)
-* [RejectedPromise](#rejectedpromise)
-* [LazyPromise](#lazypromise)
-
-#### PromiseInterface::then()
-
-```php
-$transformedPromise = $promise->then(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null);
-```
-
-Transforms a promise's value by applying a function to the promise's fulfillment
-or rejection value. Returns a new promise for the transformed result.
-
-The `then()` method registers new fulfilled, rejection and progress handlers
-with a promise (all parameters are optional):
-
-  * `$onFulfilled` will be invoked once the promise is fulfilled and passed
-    the result as the first argument.
-  * `$onRejected` will be invoked once the promise is rejected and passed the
-    reason as the first argument.
-  * `$onProgress` will be invoked whenever the producer of the promise
-    triggers progress notifications and passed a single argument (whatever it
-    wants) to indicate progress.
-
-It returns a new promise that will fulfill with the return value of either
-`$onFulfilled` or `$onRejected`, whichever is called, or will reject with
-the thrown exception if either throws.
-
-A promise makes the following guarantees about handlers registered in
-the same call to `then()`:
-
-  1. Only one of `$onFulfilled` or `$onRejected` will be called,
-     never both.
-  2. `$onFulfilled` and `$onRejected` will never be called more
-     than once.
-  3. `$onProgress` may be called multiple times.
-
-#### See also
-
-* [resolve()](#resolve) - Creating a resolved promise
-* [reject()](#reject) - Creating a rejected promise
-* [ExtendedPromiseInterface::done()](#extendedpromiseinterfacedone)
-* [done() vs. then()](#done-vs-then)
-
-### ExtendedPromiseInterface
-
-The ExtendedPromiseInterface extends the PromiseInterface with useful shortcut
-and utility methods which are not part of the Promises/A specification.
-
-#### Implementations
-
-* [Promise](#promise-1)
-* [FulfilledPromise](#fulfilledpromise)
-* [RejectedPromise](#rejectedpromise)
-* [LazyPromise](#lazypromise)
-
-#### ExtendedPromiseInterface::done()
-
-```php
-$promise->done(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null);
-```
-
-Consumes the promise's ultimate value if the promise fulfills, or handles the
-ultimate error.
-
-It will cause a fatal error if either `$onFulfilled` or `$onRejected` throw or
-return a rejected promise.
-
-Since the purpose of `done()` is consumption rather than transformation,
-`done()` always returns `null`.
-
-#### See also
-
-* [PromiseInterface::then()](#promiseinterfacethen)
-* [done() vs. then()](#done-vs-then)
-
-#### ExtendedPromiseInterface::otherwise()
-
-```php
-$promise->otherwise(callable $onRejected);
-```
-
-Registers a rejection handler for promise. It is a shortcut for:
-
-```php
-$promise->then(null, $onRejected);
-```
-
-Additionally, you can type hint the `$reason` argument of `$onRejected` to catch
-only specific errors.
-
-```php
-$promise
-    ->otherwise(function (\RuntimeException $reason) {
-        // Only catch \RuntimeException instances
-        // All other types of errors will propagate automatically
-    })
-    ->otherwise(function ($reason) {
-        // Catch other errors
-    )};
-```
-
-#### ExtendedPromiseInterface::always()
-
-```php
-$newPromise = $promise->always(callable $onFulfilledOrRejected);
-```
-
-Allows you to execute "cleanup" type tasks in a promise chain.
-
-It arranges for `$onFulfilledOrRejected` to be called, with no arguments,
-when the promise is either fulfilled or rejected.
-
-* If `$promise` fulfills, and `$onFulfilledOrRejected` returns successfully,
-  `$newPromise` will fulfill with the same value as `$promise`.
-* If `$promise` fulfills, and `$onFulfilledOrRejected` throws or returns a
-  rejected promise, `$newPromise` will reject with the thrown exception or
-  rejected promise's reason.
-* If `$promise` rejects, and `$onFulfilledOrRejected` returns successfully,
-  `$newPromise` will reject with the same reason as `$promise`.
-* If `$promise` rejects, and `$onFulfilledOrRejected` throws or returns a
-  rejected promise, `$newPromise` will reject with the thrown exception or
-  rejected promise's reason.
-
-`always()` behaves similarly to the synchronous finally statement. When combined
-with `otherwise()`, `always()` allows you to write code that is similar to the familiar
-synchronous catch/finally pair.
-
-Consider the following synchronous code:
-
-```php
-try {
-  return doSomething();
-} catch(\Exception $e) {
-    return handleError($e);
-} finally {
-    cleanup();
-}
-```
-
-Similar asynchronous code (with `doSomething()` that returns a promise) can be
-written:
-
-```php
-return doSomething()
-    ->otherwise('handleError')
-    ->always('cleanup');
-```
-
-#### ExtendedPromiseInterface::progress()
-
-```php
-$promise->progress(callable $onProgress);
-```
-
-Registers a handler for progress updates from promise. It is a shortcut for:
-
-```php
-$promise->then(null, null, $onProgress);
-```
-
-### CancellablePromiseInterface
-
-A cancellable promise provides a mechanism for consumers to notify the creator
-of the promise that they are not longer interested in the result of an
-operation.
-
-#### CancellablePromiseInterface::cancel()
-
-``` php
-$promise->cancel();
-```
-
-The `cancel()` method notifies the creator of the promise that there is no
-further interest in the results of the operation.
-
-Once a promise is settled (either fulfilled or rejected), calling `cancel()` on
-a promise has no effect.
-
-#### Implementations
-
-* [Promise](#promise-1)
-* [FulfilledPromise](#fulfilledpromise)
-* [RejectedPromise](#rejectedpromise)
-* [LazyPromise](#lazypromise)
-
-### Promise
-
-Creates a promise whose state is controlled by the functions passed to
-`$resolver`.
-
-```php
-$resolver = function (callable $resolve, callable $reject, callable $notify) {
-    // Do some work, possibly asynchronously, and then
-    // resolve or reject. You can notify of progress events
-    // along the way if you want/need.
-
-    $resolve($awesomeResult);
-    // or $resolve($anotherPromise);
-    // or $reject($nastyError);
-    // or $notify($progressNotification);
-};
-
-$canceller = function (callable $resolve, callable $reject, callable $progress) {
-    // Cancel/abort any running operations like network connections, streams etc.
-
-    $reject(new \Exception('Promise cancelled'));
-};
-
-$promise = new React\Promise\Promise($resolver, $canceller);
-```
-
-The promise constructor receives a resolver function and an optional canceller
-function which both will be called with 3 arguments:
-
-  * `$resolve($value)` - Primary function that seals the fate of the
-    returned promise. Accepts either a non-promise value, or another promise.
-    When called with a non-promise value, fulfills promise with that value.
-    When called with another promise, e.g. `$resolve($otherPromise)`, promise's
-    fate will be equivalent to that of `$otherPromise`.
-  * `$reject($reason)` - Function that rejects the promise.
-  * `$notify($update)` - Function that issues progress events for the promise.
-
-If the resolver or canceller throw an exception, the promise will be rejected
-with that thrown exception as the rejection reason.
-
-The resolver function will be called immediately, the canceller function only
-once all consumers called the `cancel()` method of the promise.
-
-### FulfilledPromise
-
-Creates a already fulfilled promise.
-
-```php
-$promise = React\Promise\FulfilledPromise($value);
-```
-
-Note, that `$value` **cannot** be a promise. It's recommended to use
-[resolve()](#resolve) for creating resolved promises.
-
-### RejectedPromise
-
-Creates a already rejected promise.
-
-```php
-$promise = React\Promise\RejectedPromise($reason);
-```
-
-Note, that `$reason` **cannot** be a promise. It's recommended to use
-[reject()](#reject) for creating rejected promises.
-
-### LazyPromise
-
-Creates a promise which will be lazily initialized by `$factory` once a consumer
-calls the `then()` method.
-
-```php
-$factory = function () {
-    $deferred = new React\Promise\Deferred();
-
-    // Do some heavy stuff here and resolve the deferred once completed
-
-    return $deferred->promise();
-};
-
-$promise = React\Promise\LazyPromise($factory);
-
-// $factory will only be executed once we call then()
-$promise->then(function ($value) {
-});
-```
-
-### Functions
-
-Useful functions for creating, joining, mapping and reducing collections of
-promises.
-
-All functions working on promise collections (like `all()`, `race()`, `some()`
-etc.) support cancellation. This means, if you call `cancel()` on the returned
-promise, all promises in the collection are cancelled. If the collection itself
-is a promise which resolves to an array, this promise is also cancelled.
-
-#### resolve()
-
-```php
-$promise = React\Promise\resolve(mixed $promiseOrValue);
-```
-
-Creates a promise for the supplied `$promiseOrValue`.
-
-If `$promiseOrValue` is a value, it will be the resolution value of the
-returned promise.
-
-If `$promiseOrValue` is a thenable (any object that provides a `then()` method),
-a trusted promise that follows the state of the thenable is returned.
-
-If `$promiseOrValue` is a promise, it will be returned as is.
-
-Note: The promise returned is always a promise implementing
-[ExtendedPromiseInterface](#extendedpromiseinterface). If you pass in a custom
-promise which only implements [PromiseInterface](#promiseinterface), this
-promise will be assimilated to a extended promise following `$promiseOrValue`.
-
-#### reject()
-
-```php
-$promise = React\Promise\reject(mixed $promiseOrValue);
-```
-
-Creates a rejected promise for the supplied `$promiseOrValue`.
-
-If `$promiseOrValue` is a value, it will be the rejection value of the
-returned promise.
-
-If `$promiseOrValue` is a promise, its completion value will be the rejected
-value of the returned promise.
-
-This can be useful in situations where you need to reject a promise without
-throwing an exception. For example, it allows you to propagate a rejection with
-the value of another promise.
-
-#### all()
-
-```php
-$promise = React\Promise\all(array|React\Promise\PromiseInterface $promisesOrValues);
-```
-
-Returns a promise that will resolve only once all the items in
-`$promisesOrValues` have resolved. The resolution value of the returned promise
-will be an array containing the resolution values of each of the items in
-`$promisesOrValues`.
-
-#### race()
-
-```php
-$promise = React\Promise\race(array|React\Promise\PromiseInterface $promisesOrValues);
-```
-
-Initiates a competitive race that allows one winner. Returns a promise which is
-resolved in the same way the first settled promise resolves.
-
-#### any()
-
-```php
-$promise = React\Promise\any(array|React\Promise\PromiseInterface $promisesOrValues);
-```
-
-Returns a promise that will resolve when any one of the items in
-`$promisesOrValues` resolves. The resolution value of the returned promise
-will be the resolution value of the triggering item.
-
-The returned promise will only reject if *all* items in `$promisesOrValues` are
-rejected. The rejection value will be an array of all rejection reasons.
-
-The returned promise will also reject with a `React\Promise\Exception\LengthException`
-if `$promisesOrValues` contains 0 items.
-
-#### some()
-
-```php
-$promise = React\Promise\some(array|React\Promise\PromiseInterface $promisesOrValues, integer $howMany);
-```
-
-Returns a promise that will resolve when `$howMany` of the supplied items in
-`$promisesOrValues` resolve. The resolution value of the returned promise
-will be an array of length `$howMany` containing the resolution values of the
-triggering items.
-
-The returned promise will reject if it becomes impossible for `$howMany` items
-to resolve (that is, when `(count($promisesOrValues) - $howMany) + 1` items
-reject). The rejection value will be an array of
-`(count($promisesOrValues) - $howMany) + 1` rejection reasons.
-
-The returned promise will also reject with a `React\Promise\Exception\LengthException`
-if `$promisesOrValues` contains less items than `$howMany`.
-
-#### map()
-
-```php
-$promise = React\Promise\map(array|React\Promise\PromiseInterface $promisesOrValues, callable $mapFunc);
-```
-
-Traditional map function, similar to `array_map()`, but allows input to contain
-promises and/or values, and `$mapFunc` may return either a value or a promise.
-
-The map function receives each item as argument, where item is a fully resolved
-value of a promise or value in `$promisesOrValues`.
-
-#### reduce()
-
-```php
-$promise = React\Promise\reduce(array|React\Promise\PromiseInterface $promisesOrValues, callable $reduceFunc , $initialValue = null);
-```
-
-Traditional reduce function, similar to `array_reduce()`, but input may contain
-promises and/or values, and `$reduceFunc` may return either a value or a
-promise, *and* `$initialValue` may be a promise or a value for the starting
-value.
-
-### PromisorInterface
-
-The `React\Promise\PromisorInterface` provides a common interface for objects
-that provide a promise. `React\Promise\Deferred` implements it, but since it
-is part of the public API anyone can implement it.
-
-Examples
---------
-
-### How to use Deferred
-
-```php
-function getAwesomeResultPromise()
-{
-    $deferred = new React\Promise\Deferred();
-
-    // Execute a Node.js-style function using the callback pattern
-    computeAwesomeResultAsynchronously(function ($error, $result) use ($deferred) {
-        if ($error) {
-            $deferred->reject($error);
-        } else {
-            $deferred->resolve($result);
-        }
-    });
-
-    // Return the promise
-    return $deferred->promise();
-}
-
-getAwesomeResultPromise()
-    ->then(
-        function ($value) {
-            // Deferred resolved, do something with $value
-        },
-        function ($reason) {
-            // Deferred rejected, do something with $reason
-        },
-        function ($update) {
-            // Progress notification triggered, do something with $update
-        }
-    );
-```
-
-### How promise forwarding works
-
-A few simple examples to show how the mechanics of Promises/A forwarding works.
-These examples are contrived, of course, and in real usage, promise chains will
-typically be spread across several function calls, or even several levels of
-your application architecture.
-
-#### Resolution forwarding
-
-Resolved promises forward resolution values to the next promise.
-The first promise, `$deferred->promise()`, will resolve with the value passed
-to `$deferred->resolve()` below.
-
-Each call to `then()` returns a new promise that will resolve with the return
-value of the previous handler. This creates a promise "pipeline".
-
-```php
-$deferred = new React\Promise\Deferred();
-
-$deferred->promise()
-    ->then(function ($x) {
-        // $x will be the value passed to $deferred->resolve() below
-        // and returns a *new promise* for $x + 1
-        return $x + 1;
-    })
-    ->then(function ($x) {
-        // $x === 2
-        // This handler receives the return value of the
-        // previous handler.
-        return $x + 1;
-    })
-    ->then(function ($x) {
-        // $x === 3
-        // This handler receives the return value of the
-        // previous handler.
-        return $x + 1;
-    })
-    ->then(function ($x) {
-        // $x === 4
-        // This handler receives the return value of the
-        // previous handler.
-        echo 'Resolve ' . $x;
-    });
-
-$deferred->resolve(1); // Prints "Resolve 4"
-```
-
-#### Rejection forwarding
-
-Rejected promises behave similarly, and also work similarly to try/catch:
-When you catch an exception, you must rethrow for it to propagate.
-
-Similarly, when you handle a rejected promise, to propagate the rejection,
-"rethrow" it by either returning a rejected promise, or actually throwing
-(since promise translates thrown exceptions into rejections)
-
-```php
-$deferred = new React\Promise\Deferred();
-
-$deferred->promise()
-    ->then(function ($x) {
-        throw new \Exception($x + 1);
-    })
-    ->otherwise(function (\Exception $x) {
-        // Propagate the rejection
-        throw $x;
-    })
-    ->otherwise(function (\Exception $x) {
-        // Can also propagate by returning another rejection
-        return React\Promise\reject(
-            new \Exception($x->getMessage() + 1)
-        );
-    })
-    ->otherwise(function ($x) {
-        echo 'Reject ' . $x->getMessage(); // 3
-    });
-
-$deferred->resolve(1);  // Prints "Reject 3"
-```
-
-#### Mixed resolution and rejection forwarding
-
-Just like try/catch, you can choose to propagate or not. Mixing resolutions and
-rejections will still forward handler results in a predictable way.
-
-```php
-$deferred = new React\Promise\Deferred();
-
-$deferred->promise()
-    ->then(function ($x) {
-        return $x + 1;
-    })
-    ->then(function ($x) {
-        throw new \Exception($x + 1);
-    })
-    ->otherwise(function (\Exception $x) {
-        // Handle the rejection, and don't propagate.
-        // This is like catch without a rethrow
-        return $x->getMessage() + 1;
-    })
-    ->then(function ($x) {
-        echo 'Mixed ' . $x; // 4
-    });
-
-$deferred->resolve(1);  // Prints "Mixed 4"
-```
-
-#### Progress event forwarding
-
-In the same way as resolution and rejection handlers, your progress handler
-**MUST** return a progress event to be propagated to the next link in the chain.
-If you return nothing, `null` will be propagated.
-
-Also in the same way as resolutions and rejections, if you don't register a
-progress handler, the update will be propagated through.
-
-If your progress handler throws an exception, the exception will be propagated
-to the next link in the chain. The best thing to do is to ensure your progress
-handlers do not throw exceptions.
-
-This gives you the opportunity to transform progress events at each step in the
-chain so that they are meaningful to the next step. It also allows you to choose
-not to transform them, and simply let them propagate untransformed, by not
-registering a progress handler.
-
-```php
-$deferred = new React\Promise\Deferred();
-
-$deferred->promise()
-    ->progress(function ($update) {
-        return $update + 1;
-    })
-    ->progress(function ($update) {
-        echo 'Progress ' . $update; // 2
-    });
-
-$deferred->notify(1);  // Prints "Progress 2"
-```
-
-### done() vs. then()
-
-The golden rule is:
-
-    Either return your promise, or call done() on it.
-
-At a first glance, `then()` and `done()` seem very similar. However, there are
-important distinctions.
-
-The intent of `then()` is to transform a promise's value and to pass or return
-a new promise for the transformed value along to other parts of your code.
-
-The intent of `done()` is to consume a promise's value, transferring
-responsibility for the value to your code.
-
-In addition to transforming a value, `then()` allows you to recover from, or
-propagate intermediate errors. Any errors that are not handled will be caught
-by the promise machinery and used to reject the promise returned by `then()`.
-
-Calling `done()` transfers all responsibility for errors to your code. If an
-error (either a thrown exception or returned rejection) escapes the
-`$onFulfilled` or `$onRejected` callbacks you provide to done, it will be
-rethrown in an uncatchable way causing a fatal error.
-
-```php
-function getJsonResult()
-{
-    return queryApi()
-        ->then(
-            // Transform API results to an object
-            function ($jsonResultString) {
-                return json_decode($jsonResultString);
-            },
-            // Transform API errors to an exception
-            function ($jsonErrorString) {
-                $object = json_decode($jsonErrorString);
-                throw new ApiErrorException($object->errorMessage);
-            }
-        );
-}
-
-// Here we provide no rejection handler. If the promise returned has been
-// rejected, the ApiErrorException will be thrown
-getJsonResult()
-    ->done(
-        // Consume transformed object
-        function ($jsonResultObject) {
-            // Do something with $jsonResultObject
-        }
-    );
-
-// Here we provide a rejection handler which will either throw while debugging
-// or log the exception
-getJsonResult()
-    ->done(
-        function ($jsonResultObject) {
-            // Do something with $jsonResultObject
-        },
-        function (ApiErrorException $exception) {
-            if (isDebug()) {
-                throw $exception;
-            } else {
-                logException($exception);
-            }
-        }
-    );
-```
-
-Note that if a rejection value is not an instance of `\Exception`, it will be
-wrapped in an exception of the type `React\Promise\UnhandledRejectionException`.
-
-You can get the original rejection reason by calling `$exception->getReason()`.
-
-Credits
--------
-
-React/Promise is a port of [when.js](https://github.com/cujojs/when)
-by [Brian Cavalier](https://github.com/briancavalier).
-
-Also, large parts of the documentation have been ported from the when.js
-[Wiki](https://github.com/cujojs/when/wiki) and the
-[API docs](https://github.com/cujojs/when/blob/master/docs/api.md).
-
-License
--------
-
-React/Promise is released under the [MIT](https://github.com/reactphp/promise/blob/master/LICENSE) license.
diff --git a/core/src/core/classes/guzzle/vendor/react/promise/composer.json b/core/src/core/classes/guzzle/vendor/react/promise/composer.json
deleted file mode 100644
index 22dae5a25e..0000000000
--- a/core/src/core/classes/guzzle/vendor/react/promise/composer.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "name": "react/promise",
-    "description": "A lightweight implementation of CommonJS Promises/A for PHP",
-    "license": "MIT",
-    "authors": [
-        {"name": "Jan Sorgalla", "email": "jsorgalla@gmail.com"}
-    ],
-    "require": {
-        "php": ">=5.4.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "React\\Promise\\": "src/"
-        },
-        "files": ["src/functions_include.php"]
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "React\\Promise\\": "tests/fixtures"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.0-dev"
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/react/promise/phpunit.xml.dist b/core/src/core/classes/guzzle/vendor/react/promise/phpunit.xml.dist
deleted file mode 100644
index b9a689d74f..0000000000
--- a/core/src/core/classes/guzzle/vendor/react/promise/phpunit.xml.dist
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="tests/bootstrap.php"
->
-    <testsuites>
-        <testsuite name="Promise Test Suite">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./src/</directory>
-            <exclude>
-                <file>./src/functions_include.php</file>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/core/src/core/classes/guzzle/vendor/react/promise/src/CancellablePromiseInterface.php b/core/src/core/classes/guzzle/vendor/react/promise/src/CancellablePromiseInterface.php
deleted file mode 100644
index 896db2d372..0000000000
--- a/core/src/core/classes/guzzle/vendor/react/promise/src/CancellablePromiseInterface.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-interface CancellablePromiseInterface extends PromiseInterface
-{
-    /**
-     * @return void
-     */
-    public function cancel();
-}
diff --git a/core/src/core/classes/guzzle/vendor/react/promise/src/Deferred.php b/core/src/core/classes/guzzle/vendor/react/promise/src/Deferred.php
deleted file mode 100644
index f23980c311..0000000000
--- a/core/src/core/classes/guzzle/vendor/react/promise/src/Deferred.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-class Deferred implements PromisorInterface
-{
-    private $promise;
-    private $resolveCallback;
-    private $rejectCallback;
-    private $notifyCallback;
-    private $canceller;
-
-    public function __construct(callable $canceller = null)
-    {
-        $this->canceller = $canceller;
-    }
-
-    public function promise()
-    {
-        if (null === $this->promise) {
-            $this->promise = new Promise(function ($resolve, $reject, $notify) {
-                $this->resolveCallback = $resolve;
-                $this->rejectCallback  = $reject;
-                $this->notifyCallback  = $notify;
-            }, $this->canceller);
-        }
-
-        return $this->promise;
-    }
-
-    public function resolve($value = null)
-    {
-        $this->promise();
-
-        call_user_func($this->resolveCallback, $value);
-    }
-
-    public function reject($reason = null)
-    {
-        $this->promise();
-
-        call_user_func($this->rejectCallback, $reason);
-    }
-
-    public function notify($update = null)
-    {
-        $this->promise();
-
-        call_user_func($this->notifyCallback, $update);
-    }
-
-    /**
-     * @deprecated 2.2.0
-     * @see Deferred::notify()
-     */
-    public function progress($update = null)
-    {
-        $this->notify($update);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/react/promise/src/ExtendedPromiseInterface.php b/core/src/core/classes/guzzle/vendor/react/promise/src/ExtendedPromiseInterface.php
deleted file mode 100644
index 9cb6435987..0000000000
--- a/core/src/core/classes/guzzle/vendor/react/promise/src/ExtendedPromiseInterface.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-interface ExtendedPromiseInterface extends PromiseInterface
-{
-    /**
-     * @return void
-     */
-    public function done(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null);
-
-    /**
-     * @return ExtendedPromiseInterface
-     */
-    public function otherwise(callable $onRejected);
-
-    /**
-     * @return ExtendedPromiseInterface
-     */
-    public function always(callable $onFulfilledOrRejected);
-
-    /**
-     * @return ExtendedPromiseInterface
-     */
-    public function progress(callable $onProgress);
-}
diff --git a/core/src/core/classes/guzzle/vendor/react/promise/src/FulfilledPromise.php b/core/src/core/classes/guzzle/vendor/react/promise/src/FulfilledPromise.php
deleted file mode 100644
index 914bb5c15a..0000000000
--- a/core/src/core/classes/guzzle/vendor/react/promise/src/FulfilledPromise.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-class FulfilledPromise implements ExtendedPromiseInterface, CancellablePromiseInterface
-{
-    private $value;
-
-    public function __construct($value = null)
-    {
-        if ($value instanceof PromiseInterface) {
-            throw new \InvalidArgumentException('You cannot create React\Promise\FulfilledPromise with a promise. Use React\Promise\resolve($promiseOrValue) instead.');
-        }
-
-        $this->value = $value;
-    }
-
-    public function then(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null)
-    {
-        if (null === $onFulfilled) {
-            return $this;
-        }
-
-        try {
-            return resolve($onFulfilled($this->value));
-        } catch (\Throwable $exception) {
-            return new RejectedPromise($exception);
-        } catch (\Exception $exception) {
-            return new RejectedPromise($exception);
-        }
-    }
-
-    public function done(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null)
-    {
-        if (null === $onFulfilled) {
-            return;
-        }
-
-        $result = $onFulfilled($this->value);
-
-        if ($result instanceof ExtendedPromiseInterface) {
-            $result->done();
-        }
-    }
-
-    public function otherwise(callable $onRejected)
-    {
-        return $this;
-    }
-
-    public function always(callable $onFulfilledOrRejected)
-    {
-        return $this->then(function ($value) use ($onFulfilledOrRejected) {
-            return resolve($onFulfilledOrRejected())->then(function () use ($value) {
-                return $value;
-            });
-        });
-    }
-
-    public function progress(callable $onProgress)
-    {
-        return $this;
-    }
-
-    public function cancel()
-    {
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/react/promise/src/LazyPromise.php b/core/src/core/classes/guzzle/vendor/react/promise/src/LazyPromise.php
deleted file mode 100644
index d72619e13d..0000000000
--- a/core/src/core/classes/guzzle/vendor/react/promise/src/LazyPromise.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-class LazyPromise implements ExtendedPromiseInterface, CancellablePromiseInterface
-{
-    private $factory;
-    private $promise;
-
-    public function __construct(callable $factory)
-    {
-        $this->factory = $factory;
-    }
-
-    public function then(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null)
-    {
-        return $this->promise()->then($onFulfilled, $onRejected, $onProgress);
-    }
-
-    public function done(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null)
-    {
-        return $this->promise()->done($onFulfilled, $onRejected, $onProgress);
-    }
-
-    public function otherwise(callable $onRejected)
-    {
-        return $this->promise()->otherwise($onRejected);
-    }
-
-    public function always(callable $onFulfilledOrRejected)
-    {
-        return $this->promise()->always($onFulfilledOrRejected);
-    }
-
-    public function progress(callable $onProgress)
-    {
-        return $this->promise()->progress($onProgress);
-    }
-
-    public function cancel()
-    {
-        return $this->promise()->cancel();
-    }
-
-    private function promise()
-    {
-        if (null === $this->promise) {
-            try {
-                $this->promise = resolve(call_user_func($this->factory));
-            } catch (\Throwable $exception) {
-                $this->promise = new RejectedPromise($exception);
-            } catch (\Exception $exception) {
-                $this->promise = new RejectedPromise($exception);
-            }
-        }
-
-        return $this->promise;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/react/promise/src/Promise.php b/core/src/core/classes/guzzle/vendor/react/promise/src/Promise.php
deleted file mode 100644
index bfbdc06dd0..0000000000
--- a/core/src/core/classes/guzzle/vendor/react/promise/src/Promise.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-class Promise implements ExtendedPromiseInterface, CancellablePromiseInterface
-{
-    private $canceller;
-    private $result;
-
-    private $handlers = [];
-    private $progressHandlers = [];
-
-    private $requiredCancelRequests = 0;
-    private $cancelRequests = 0;
-
-    public function __construct(callable $resolver, callable $canceller = null)
-    {
-        $this->canceller = $canceller;
-        $this->call($resolver);
-    }
-
-    public function then(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null)
-    {
-        if (null !== $this->result) {
-            return $this->result()->then($onFulfilled, $onRejected, $onProgress);
-        }
-
-        if (null === $this->canceller) {
-            return new static($this->resolver($onFulfilled, $onRejected, $onProgress));
-        }
-
-        $this->requiredCancelRequests++;
-
-        return new static($this->resolver($onFulfilled, $onRejected, $onProgress), function () {
-            if (++$this->cancelRequests < $this->requiredCancelRequests) {
-                return;
-            }
-
-            $this->cancel();
-        });
-    }
-
-    public function done(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null)
-    {
-        if (null !== $this->result) {
-            return $this->result()->done($onFulfilled, $onRejected, $onProgress);
-        }
-
-        $this->handlers[] = function (ExtendedPromiseInterface $promise) use ($onFulfilled, $onRejected) {
-            $promise
-                ->done($onFulfilled, $onRejected);
-        };
-
-        if ($onProgress) {
-            $this->progressHandlers[] = $onProgress;
-        }
-    }
-
-    public function otherwise(callable $onRejected)
-    {
-        return $this->then(null, function ($reason) use ($onRejected) {
-            if (!_checkTypehint($onRejected, $reason)) {
-                return new RejectedPromise($reason);
-            }
-
-            return $onRejected($reason);
-        });
-    }
-
-    public function always(callable $onFulfilledOrRejected)
-    {
-        return $this->then(function ($value) use ($onFulfilledOrRejected) {
-            return resolve($onFulfilledOrRejected())->then(function () use ($value) {
-                return $value;
-            });
-        }, function ($reason) use ($onFulfilledOrRejected) {
-            return resolve($onFulfilledOrRejected())->then(function () use ($reason) {
-                return new RejectedPromise($reason);
-            });
-        });
-    }
-
-    public function progress(callable $onProgress)
-    {
-        return $this->then(null, null, $onProgress);
-    }
-
-    public function cancel()
-    {
-        if (null === $this->canceller || null !== $this->result) {
-            return;
-        }
-
-        $canceller = $this->canceller;
-        $this->canceller = null;
-
-        $this->call($canceller);
-    }
-
-    private function resolver(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null)
-    {
-        return function ($resolve, $reject, $notify) use ($onFulfilled, $onRejected, $onProgress) {
-            if ($onProgress) {
-                $progressHandler = function ($update) use ($notify, $onProgress) {
-                    try {
-                        $notify($onProgress($update));
-                    } catch (\Throwable $e) {
-                        $notify($e);
-                    } catch (\Exception $e) {
-                        $notify($e);
-                    }
-                };
-            } else {
-                $progressHandler = $notify;
-            }
-
-            $this->handlers[] = function (ExtendedPromiseInterface $promise) use ($onFulfilled, $onRejected, $resolve, $reject, $progressHandler) {
-                $promise
-                    ->then($onFulfilled, $onRejected)
-                    ->done($resolve, $reject, $progressHandler);
-            };
-
-            $this->progressHandlers[] = $progressHandler;
-        };
-    }
-
-    private function resolve($value = null)
-    {
-        if (null !== $this->result) {
-            return;
-        }
-
-        $this->settle(resolve($value));
-    }
-
-    private function reject($reason = null)
-    {
-        if (null !== $this->result) {
-            return;
-        }
-
-        $this->settle(reject($reason));
-    }
-
-    private function notify($update = null)
-    {
-        if (null !== $this->result) {
-            return;
-        }
-
-        foreach ($this->progressHandlers as $handler) {
-            $handler($update);
-        }
-    }
-
-    private function settle(ExtendedPromiseInterface $promise)
-    {
-        $handlers = $this->handlers;
-
-        $this->progressHandlers = $this->handlers = [];
-        $this->result = $promise;
-
-        foreach ($handlers as $handler) {
-            $handler($promise);
-        }
-    }
-
-    private function result()
-    {
-        while ($this->result instanceof self && null !== $this->result->result) {
-            $this->result = $this->result->result;
-        }
-
-        return $this->result;
-    }
-
-    private function call(callable $callback)
-    {
-        try {
-            $callback(
-                function ($value = null) {
-                    $this->resolve($value);
-                },
-                function ($reason = null) {
-                    $this->reject($reason);
-                },
-                function ($update = null) {
-                    $this->notify($update);
-                }
-            );
-        } catch (\Throwable $e) {
-            $this->reject($e);
-        } catch (\Exception $e) {
-            $this->reject($e);
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/react/promise/src/PromiseInterface.php b/core/src/core/classes/guzzle/vendor/react/promise/src/PromiseInterface.php
deleted file mode 100644
index d80d11421a..0000000000
--- a/core/src/core/classes/guzzle/vendor/react/promise/src/PromiseInterface.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-interface PromiseInterface
-{
-    /**
-     * @return PromiseInterface
-     */
-    public function then(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null);
-}
diff --git a/core/src/core/classes/guzzle/vendor/react/promise/src/PromisorInterface.php b/core/src/core/classes/guzzle/vendor/react/promise/src/PromisorInterface.php
deleted file mode 100644
index 9341a4fa83..0000000000
--- a/core/src/core/classes/guzzle/vendor/react/promise/src/PromisorInterface.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-interface PromisorInterface
-{
-    /**
-     * @return PromiseInterface
-     */
-    public function promise();
-}
diff --git a/core/src/core/classes/guzzle/vendor/react/promise/src/RejectedPromise.php b/core/src/core/classes/guzzle/vendor/react/promise/src/RejectedPromise.php
deleted file mode 100644
index 479a746b34..0000000000
--- a/core/src/core/classes/guzzle/vendor/react/promise/src/RejectedPromise.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-class RejectedPromise implements ExtendedPromiseInterface, CancellablePromiseInterface
-{
-    private $reason;
-
-    public function __construct($reason = null)
-    {
-        if ($reason instanceof PromiseInterface) {
-            throw new \InvalidArgumentException('You cannot create React\Promise\RejectedPromise with a promise. Use React\Promise\reject($promiseOrValue) instead.');
-        }
-
-        $this->reason = $reason;
-    }
-
-    public function then(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null)
-    {
-        if (null === $onRejected) {
-            return $this;
-        }
-
-        try {
-            return resolve($onRejected($this->reason));
-        } catch (\Throwable $exception) {
-            return new RejectedPromise($exception);
-        } catch (\Exception $exception) {
-            return new RejectedPromise($exception);
-        }
-    }
-
-    public function done(callable $onFulfilled = null, callable $onRejected = null, callable $onProgress = null)
-    {
-        if (null === $onRejected) {
-            throw UnhandledRejectionException::resolve($this->reason);
-        }
-
-        $result = $onRejected($this->reason);
-
-        if ($result instanceof self) {
-            throw UnhandledRejectionException::resolve($result->reason);
-        }
-
-        if ($result instanceof ExtendedPromiseInterface) {
-            $result->done();
-        }
-    }
-
-    public function otherwise(callable $onRejected)
-    {
-        if (!_checkTypehint($onRejected, $this->reason)) {
-            return $this;
-        }
-
-        return $this->then(null, $onRejected);
-    }
-
-    public function always(callable $onFulfilledOrRejected)
-    {
-        return $this->then(null, function ($reason) use ($onFulfilledOrRejected) {
-            return resolve($onFulfilledOrRejected())->then(function () use ($reason) {
-                return new RejectedPromise($reason);
-            });
-        });
-    }
-
-    public function progress(callable $onProgress)
-    {
-        return $this;
-    }
-
-    public function cancel()
-    {
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/react/promise/src/UnhandledRejectionException.php b/core/src/core/classes/guzzle/vendor/react/promise/src/UnhandledRejectionException.php
deleted file mode 100644
index a44b7a1bff..0000000000
--- a/core/src/core/classes/guzzle/vendor/react/promise/src/UnhandledRejectionException.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-class UnhandledRejectionException extends \RuntimeException
-{
-    private $reason;
-
-    public static function resolve($reason)
-    {
-        if ($reason instanceof \Exception || $reason instanceof \Throwable) {
-            return $reason;
-        }
-
-        return new static($reason);
-    }
-
-    public function __construct($reason)
-    {
-        $this->reason = $reason;
-
-        $message = sprintf('Unhandled Rejection: %s', json_encode($reason));
-
-        parent::__construct($message, 0);
-    }
-
-    public function getReason()
-    {
-        return $this->reason;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/react/promise/src/functions.php b/core/src/core/classes/guzzle/vendor/react/promise/src/functions.php
deleted file mode 100644
index 5f55f2eaf3..0000000000
--- a/core/src/core/classes/guzzle/vendor/react/promise/src/functions.php
+++ /dev/null
@@ -1,255 +0,0 @@
-<?php
-
-namespace React\Promise;
-
-function resolve($promiseOrValue = null)
-{
-    if ($promiseOrValue instanceof ExtendedPromiseInterface) {
-        return $promiseOrValue;
-    }
-
-    if (method_exists($promiseOrValue, 'then')) {
-        $canceller = null;
-
-        if (method_exists($promiseOrValue, 'cancel')) {
-            $canceller = [$promiseOrValue, 'cancel'];
-        }
-
-        return new Promise(function ($resolve, $reject, $notify) use ($promiseOrValue) {
-            $promiseOrValue->then($resolve, $reject, $notify);
-        }, $canceller);
-    }
-
-    return new FulfilledPromise($promiseOrValue);
-}
-
-function reject($promiseOrValue = null)
-{
-    if ($promiseOrValue instanceof PromiseInterface) {
-        return resolve($promiseOrValue)->then(function ($value) {
-            return new RejectedPromise($value);
-        });
-    }
-
-    return new RejectedPromise($promiseOrValue);
-}
-
-function all($promisesOrValues)
-{
-    return map($promisesOrValues, function ($val) {
-        return $val;
-    });
-}
-
-function race($promisesOrValues)
-{
-    $cancellationQueue = new CancellationQueue();
-    $cancellationQueue->enqueue($promisesOrValues);
-
-    return new Promise(function ($resolve, $reject, $notify) use ($promisesOrValues, $cancellationQueue) {
-        resolve($promisesOrValues)
-            ->done(function ($array) use ($cancellationQueue, $resolve, $reject, $notify) {
-                if (!is_array($array) || !$array) {
-                    $resolve();
-                    return;
-                }
-
-                $fulfiller = function ($value) use ($cancellationQueue, $resolve) {
-                    $cancellationQueue();
-                    $resolve($value);
-                };
-
-                $rejecter = function ($reason) use ($cancellationQueue, $reject) {
-                    $cancellationQueue();
-                    $reject($reason);
-                };
-
-                foreach ($array as $promiseOrValue) {
-                    $cancellationQueue->enqueue($promiseOrValue);
-
-                    resolve($promiseOrValue)
-                        ->done($fulfiller, $rejecter, $notify);
-                }
-            }, $reject, $notify);
-    }, $cancellationQueue);
-}
-
-function any($promisesOrValues)
-{
-    return some($promisesOrValues, 1)
-        ->then(function ($val) {
-            return array_shift($val);
-        });
-}
-
-function some($promisesOrValues, $howMany)
-{
-    $cancellationQueue = new CancellationQueue();
-    $cancellationQueue->enqueue($promisesOrValues);
-
-    return new Promise(function ($resolve, $reject, $notify) use ($promisesOrValues, $howMany, $cancellationQueue) {
-        resolve($promisesOrValues)
-            ->done(function ($array) use ($howMany, $cancellationQueue, $resolve, $reject, $notify) {
-                if (!is_array($array) || $howMany < 1) {
-                    $resolve([]);
-                    return;
-                }
-
-                $len = count($array);
-
-                if ($len < $howMany) {
-                    throw new Exception\LengthException(
-                        sprintf(
-                            'Input array must contain at least %d item%s but contains only %s item%s.',
-                            $howMany,
-                            1 === $howMany ? '' : 's',
-                            $len,
-                            1 === $len ? '' : 's'
-                        )
-                    );
-                }
-
-                $toResolve = $howMany;
-                $toReject  = ($len - $toResolve) + 1;
-                $values    = [];
-                $reasons   = [];
-
-                foreach ($array as $i => $promiseOrValue) {
-                    $fulfiller = function ($val) use ($i, &$values, &$toResolve, $toReject, $resolve, $cancellationQueue) {
-                        if ($toResolve < 1 || $toReject < 1) {
-                            return;
-                        }
-
-                        $values[$i] = $val;
-
-                        if (0 === --$toResolve) {
-                            $cancellationQueue();
-                            $resolve($values);
-                        }
-                    };
-
-                    $rejecter = function ($reason) use ($i, &$reasons, &$toReject, $toResolve, $reject, $cancellationQueue) {
-                        if ($toResolve < 1 || $toReject < 1) {
-                            return;
-                        }
-
-                        $reasons[$i] = $reason;
-
-                        if (0 === --$toReject) {
-                            $cancellationQueue();
-                            $reject($reasons);
-                        }
-                    };
-
-                    $cancellationQueue->enqueue($promiseOrValue);
-
-                    resolve($promiseOrValue)
-                        ->done($fulfiller, $rejecter, $notify);
-                }
-            }, $reject, $notify);
-    }, $cancellationQueue);
-}
-
-function map($promisesOrValues, callable $mapFunc)
-{
-    $cancellationQueue = new CancellationQueue();
-    $cancellationQueue->enqueue($promisesOrValues);
-
-    return new Promise(function ($resolve, $reject, $notify) use ($promisesOrValues, $mapFunc, $cancellationQueue) {
-        resolve($promisesOrValues)
-            ->done(function ($array) use ($mapFunc, $cancellationQueue, $resolve, $reject, $notify) {
-                if (!is_array($array) || !$array) {
-                    $resolve([]);
-                    return;
-                }
-
-                $toResolve = count($array);
-                $values    = [];
-
-                foreach ($array as $i => $promiseOrValue) {
-                    $cancellationQueue->enqueue($promiseOrValue);
-
-                    resolve($promiseOrValue)
-                        ->then($mapFunc)
-                        ->done(
-                            function ($mapped) use ($i, &$values, &$toResolve, $resolve) {
-                                $values[$i] = $mapped;
-
-                                if (0 === --$toResolve) {
-                                    $resolve($values);
-                                }
-                            },
-                            $reject,
-                            $notify
-                        );
-                }
-            }, $reject, $notify);
-    }, $cancellationQueue);
-}
-
-function reduce($promisesOrValues, callable $reduceFunc, $initialValue = null)
-{
-    $cancellationQueue = new CancellationQueue();
-    $cancellationQueue->enqueue($promisesOrValues);
-
-    return new Promise(function ($resolve, $reject, $notify) use ($promisesOrValues, $reduceFunc, $initialValue, $cancellationQueue) {
-        resolve($promisesOrValues)
-            ->done(function ($array) use ($reduceFunc, $initialValue, $cancellationQueue, $resolve, $reject, $notify) {
-                if (!is_array($array)) {
-                    $array = [];
-                }
-
-                $total = count($array);
-                $i = 0;
-
-                // Wrap the supplied $reduceFunc with one that handles promises and then
-                // delegates to the supplied.
-                $wrappedReduceFunc = function ($current, $val) use ($reduceFunc, $cancellationQueue, $total, &$i) {
-                    $cancellationQueue->enqueue($val);
-
-                    return $current
-                        ->then(function ($c) use ($reduceFunc, $total, &$i, $val) {
-                            return resolve($val)
-                                ->then(function ($value) use ($reduceFunc, $total, &$i, $c) {
-                                    return $reduceFunc($c, $value, $i++, $total);
-                                });
-                        });
-                };
-
-                $cancellationQueue->enqueue($initialValue);
-
-                array_reduce($array, $wrappedReduceFunc, resolve($initialValue))
-                    ->done($resolve, $reject, $notify);
-            }, $reject, $notify);
-    }, $cancellationQueue);
-}
-
-// Internal functions
-function _checkTypehint(callable $callback, $object)
-{
-    if (!is_object($object)) {
-        return true;
-    }
-
-    if (is_array($callback)) {
-        $callbackReflection = new \ReflectionMethod($callback[0], $callback[1]);
-    } elseif (is_object($callback) && !$callback instanceof \Closure) {
-        $callbackReflection = new \ReflectionMethod($callback, '__invoke');
-    } else {
-        $callbackReflection = new \ReflectionFunction($callback);
-    }
-
-    $parameters = $callbackReflection->getParameters();
-
-    if (!isset($parameters[0])) {
-        return true;
-    }
-
-    $expectedException = $parameters[0];
-
-    if (!$expectedException->getClass()) {
-        return true;
-    }
-
-    return $expectedException->getClass()->isInstance($object);
-}
diff --git a/core/src/core/classes/guzzle/vendor/react/promise/src/functions_include.php b/core/src/core/classes/guzzle/vendor/react/promise/src/functions_include.php
deleted file mode 100644
index c71decbf98..0000000000
--- a/core/src/core/classes/guzzle/vendor/react/promise/src/functions_include.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-if (!function_exists('React\Promise\resolve')) {
-    require __DIR__.'/functions.php';
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/.gitignore b/core/src/core/classes/guzzle/vendor/symfony/config/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/CHANGELOG.md b/core/src/core/classes/guzzle/vendor/symfony/config/CHANGELOG.md
deleted file mode 100644
index b752df6fe2..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/CHANGELOG.md
+++ /dev/null
@@ -1,62 +0,0 @@
-CHANGELOG
-=========
-
-3.0.0
------
-
- * removed `ReferenceDumper` class
- * removed the `ResourceInterface::isFresh()` method
- * removed `BCResourceInterfaceChecker` class
- * removed `ResourceInterface::getResource()` method
-
-2.8.0
------
-
-The edge case of defining just one value for nodes of type Enum is now allowed:
-
-```php
-$rootNode
-    ->children()
-        ->enumNode('variable')
-            ->values(array('value'))
-        ->end()
-    ->end()
-;
-```
-
-Before: `InvalidArgumentException` (variable must contain at least two
-distinct elements).
-After: the code will work as expected and it will restrict the values of the
-`variable` option to just `value`.
- 
- * deprecated the `ResourceInterface::isFresh()` method. If you implement custom resource types and they
-   can be validated that way, make them implement the new `SelfCheckingResourceInterface`.
- * deprecated the getResource() method in ResourceInterface. You can still call this method
-   on concrete classes implementing the interface, but it does not make sense at the interface
-   level as you need to know about the particular type of resource at hand to understand the
-   semantics of the returned value.
-
-2.7.0
------
-
- * added `ConfigCacheInterface`, `ConfigCacheFactoryInterface` and a basic `ConfigCacheFactory`
-   implementation to delegate creation of ConfigCache instances
-   
-2.2.0
------
-
- * added `ArrayNodeDefinition::canBeEnabled()` and `ArrayNodeDefinition::canBeDisabled()`
-   to ease configuration when some sections are respectively disabled / enabled
-   by default.
- * added a `normalizeKeys()` method for array nodes (to avoid key normalization)
- * added numerical type handling for config definitions
- * added convenience methods for optional configuration sections to `ArrayNodeDefinition`
- * added a utils class for XML manipulations
-
-2.1.0
------
-
- * added a way to add documentation on configuration
- * implemented `Serializable` on resources
- * `LoaderResolverInterface` is now used instead of `LoaderResolver` for type
-   hinting
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/ConfigCache.php b/core/src/core/classes/guzzle/vendor/symfony/config/ConfigCache.php
deleted file mode 100644
index 8318684186..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/ConfigCache.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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\Config;
-
-use Symfony\Component\Config\Resource\SelfCheckingResourceChecker;
-
-/**
- * ConfigCache caches arbitrary content in files on disk.
- *
- * When in debug mode, those metadata resources that implement
- * \Symfony\Component\Config\Resource\SelfCheckingResourceInterface will
- * be used to check cache freshness.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Matthias Pigulla <mp@webfactory.de>
- */
-class ConfigCache extends ResourceCheckerConfigCache
-{
-    private $debug;
-
-    /**
-     * @param string $file  The absolute cache path
-     * @param bool   $debug Whether debugging is enabled or not
-     */
-    public function __construct($file, $debug)
-    {
-        parent::__construct($file, array(
-            new SelfCheckingResourceChecker(),
-        ));
-        $this->debug = (bool) $debug;
-    }
-
-    /**
-     * Checks if the cache is still fresh.
-     *
-     * This implementation always returns true when debug is off and the
-     * cache file exists.
-     *
-     * @return bool true if the cache is fresh, false otherwise
-     */
-    public function isFresh()
-    {
-        if (!$this->debug && is_file($this->getPath())) {
-            return true;
-        }
-
-        return parent::isFresh();
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/ConfigCacheFactory.php b/core/src/core/classes/guzzle/vendor/symfony/config/ConfigCacheFactory.php
deleted file mode 100644
index 396536e2d8..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/ConfigCacheFactory.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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\Config;
-
-/**
- * Basic implementation of ConfigCacheFactoryInterface that
- * creates an instance of the default ConfigCache.
- *
- * This factory and/or cache <em>do not</em> support cache validation
- * by means of ResourceChecker instances (that is, service-based).
- *
- * @author Matthias Pigulla <mp@webfactory.de>
- */
-class ConfigCacheFactory implements ConfigCacheFactoryInterface
-{
-    /**
-     * @var bool Debug flag passed to the ConfigCache
-     */
-    private $debug;
-
-    /**
-     * @param bool $debug The debug flag to pass to ConfigCache
-     */
-    public function __construct($debug)
-    {
-        $this->debug = $debug;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function cache($file, $callback)
-    {
-        if (!is_callable($callback)) {
-            throw new \InvalidArgumentException(sprintf('Invalid type for callback argument. Expected callable, but got "%s".', gettype($callback)));
-        }
-
-        $cache = new ConfigCache($file, $this->debug);
-        if (!$cache->isFresh()) {
-            call_user_func($callback, $cache);
-        }
-
-        return $cache;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/ConfigCacheFactoryInterface.php b/core/src/core/classes/guzzle/vendor/symfony/config/ConfigCacheFactoryInterface.php
deleted file mode 100644
index bd614c4b6b..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/ConfigCacheFactoryInterface.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\Config;
-
-/**
- * Interface for a ConfigCache factory. This factory creates
- * an instance of ConfigCacheInterface and initializes the
- * cache if necessary.
- *
- * @author Matthias Pigulla <mp@webfactory.de>
- */
-interface ConfigCacheFactoryInterface
-{
-    /**
-     * Creates a cache instance and (re-)initializes it if necessary.
-     *
-     * @param string   $file     The absolute cache file path
-     * @param callable $callable The callable to be executed when the cache needs to be filled (i. e. is not fresh). The cache will be passed as the only parameter to this callback
-     *
-     * @return ConfigCacheInterface $configCache The cache instance
-     */
-    public function cache($file, $callable);
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/ConfigCacheInterface.php b/core/src/core/classes/guzzle/vendor/symfony/config/ConfigCacheInterface.php
deleted file mode 100644
index 7c47ad70a5..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/ConfigCacheInterface.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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\Config;
-
-use Symfony\Component\Config\Resource\ResourceInterface;
-
-/**
- * Interface for ConfigCache.
- *
- * @author Matthias Pigulla <mp@webfactory.de>
- */
-interface ConfigCacheInterface
-{
-    /**
-     * Gets the cache file path.
-     *
-     * @return string The cache file path
-     */
-    public function getPath();
-
-    /**
-     * Checks if the cache is still fresh.
-     *
-     * This check should take the metadata passed to the write() method into consideration.
-     *
-     * @return bool Whether the cache is still fresh
-     */
-    public function isFresh();
-
-    /**
-     * Writes the given content into the cache file. Metadata will be stored
-     * independently and can be used to check cache freshness at a later time.
-     *
-     * @param string                   $content  The content to write into the cache
-     * @param ResourceInterface[]|null $metadata An array of ResourceInterface instances
-     *
-     * @throws \RuntimeException When the cache file cannot be written
-     */
-    public function write($content, array $metadata = null);
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/ArrayNode.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/ArrayNode.php
deleted file mode 100644
index fe5599da8a..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/ArrayNode.php
+++ /dev/null
@@ -1,400 +0,0 @@
-<?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\Config\Definition;
-
-use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
-use Symfony\Component\Config\Definition\Exception\InvalidTypeException;
-use Symfony\Component\Config\Definition\Exception\UnsetKeyException;
-
-/**
- * Represents an Array node in the config tree.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class ArrayNode extends BaseNode implements PrototypeNodeInterface
-{
-    protected $xmlRemappings = array();
-    protected $children = array();
-    protected $allowFalse = false;
-    protected $allowNewKeys = true;
-    protected $addIfNotSet = false;
-    protected $performDeepMerging = true;
-    protected $ignoreExtraKeys = false;
-    protected $removeExtraKeys = true;
-    protected $normalizeKeys = true;
-
-    public function setNormalizeKeys($normalizeKeys)
-    {
-        $this->normalizeKeys = (bool) $normalizeKeys;
-    }
-
-    /**
-     * Normalizes keys between the different configuration formats.
-     *
-     * Namely, you mostly have foo_bar in YAML while you have foo-bar in XML.
-     * After running this method, all keys are normalized to foo_bar.
-     *
-     * If you have a mixed key like foo-bar_moo, it will not be altered.
-     * The key will also not be altered if the target key already exists.
-     *
-     * @param mixed $value
-     *
-     * @return array The value with normalized keys
-     */
-    protected function preNormalize($value)
-    {
-        if (!$this->normalizeKeys || !is_array($value)) {
-            return $value;
-        }
-
-        $normalized = array();
-
-        foreach ($value as $k => $v) {
-            if (false !== strpos($k, '-') && false === strpos($k, '_') && !array_key_exists($normalizedKey = str_replace('-', '_', $k), $value)) {
-                $normalized[$normalizedKey] = $v;
-            } else {
-                $normalized[$k] = $v;
-            }
-        }
-
-        return $normalized;
-    }
-
-    /**
-     * Retrieves the children of this node.
-     *
-     * @return array The children
-     */
-    public function getChildren()
-    {
-        return $this->children;
-    }
-
-    /**
-     * Sets the xml remappings that should be performed.
-     *
-     * @param array $remappings an array of the form array(array(string, string))
-     */
-    public function setXmlRemappings(array $remappings)
-    {
-        $this->xmlRemappings = $remappings;
-    }
-
-    /**
-     * Gets the xml remappings that should be performed.
-     *
-     * @return array $remappings an array of the form array(array(string, string))
-     */
-    public function getXmlRemappings()
-    {
-        return $this->xmlRemappings;
-    }
-
-    /**
-     * Sets whether to add default values for this array if it has not been
-     * defined in any of the configuration files.
-     *
-     * @param bool $boolean
-     */
-    public function setAddIfNotSet($boolean)
-    {
-        $this->addIfNotSet = (bool) $boolean;
-    }
-
-    /**
-     * Sets whether false is allowed as value indicating that the array should be unset.
-     *
-     * @param bool $allow
-     */
-    public function setAllowFalse($allow)
-    {
-        $this->allowFalse = (bool) $allow;
-    }
-
-    /**
-     * Sets whether new keys can be defined in subsequent configurations.
-     *
-     * @param bool $allow
-     */
-    public function setAllowNewKeys($allow)
-    {
-        $this->allowNewKeys = (bool) $allow;
-    }
-
-    /**
-     * Sets if deep merging should occur.
-     *
-     * @param bool $boolean
-     */
-    public function setPerformDeepMerging($boolean)
-    {
-        $this->performDeepMerging = (bool) $boolean;
-    }
-
-    /**
-     * Whether extra keys should just be ignore without an exception.
-     *
-     * @param bool $boolean To allow extra keys
-     * @param bool $remove  To remove extra keys
-     */
-    public function setIgnoreExtraKeys($boolean, $remove = true)
-    {
-        $this->ignoreExtraKeys = (bool) $boolean;
-        $this->removeExtraKeys = $this->ignoreExtraKeys && $remove;
-    }
-
-    /**
-     * Sets the node Name.
-     *
-     * @param string $name The node's name
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-    }
-
-    /**
-     * Checks if the node has a default value.
-     *
-     * @return bool
-     */
-    public function hasDefaultValue()
-    {
-        return $this->addIfNotSet;
-    }
-
-    /**
-     * Retrieves the default value.
-     *
-     * @return array The default value
-     *
-     * @throws \RuntimeException if the node has no default value
-     */
-    public function getDefaultValue()
-    {
-        if (!$this->hasDefaultValue()) {
-            throw new \RuntimeException(sprintf('The node at path "%s" has no default value.', $this->getPath()));
-        }
-
-        $defaults = array();
-        foreach ($this->children as $name => $child) {
-            if ($child->hasDefaultValue()) {
-                $defaults[$name] = $child->getDefaultValue();
-            }
-        }
-
-        return $defaults;
-    }
-
-    /**
-     * Adds a child node.
-     *
-     * @param NodeInterface $node The child node to add
-     *
-     * @throws \InvalidArgumentException when the child node has no name
-     * @throws \InvalidArgumentException when the child node's name is not unique
-     */
-    public function addChild(NodeInterface $node)
-    {
-        $name = $node->getName();
-        if (!strlen($name)) {
-            throw new \InvalidArgumentException('Child nodes must be named.');
-        }
-        if (isset($this->children[$name])) {
-            throw new \InvalidArgumentException(sprintf('A child node named "%s" already exists.', $name));
-        }
-
-        $this->children[$name] = $node;
-    }
-
-    /**
-     * Finalizes the value of this node.
-     *
-     * @param mixed $value
-     *
-     * @return mixed The finalised value
-     *
-     * @throws UnsetKeyException
-     * @throws InvalidConfigurationException if the node doesn't have enough children
-     */
-    protected function finalizeValue($value)
-    {
-        if (false === $value) {
-            $msg = sprintf('Unsetting key for path "%s", value: %s', $this->getPath(), json_encode($value));
-            throw new UnsetKeyException($msg);
-        }
-
-        foreach ($this->children as $name => $child) {
-            if (!array_key_exists($name, $value)) {
-                if ($child->isRequired()) {
-                    $msg = sprintf('The child node "%s" at path "%s" must be configured.', $name, $this->getPath());
-                    $ex = new InvalidConfigurationException($msg);
-                    $ex->setPath($this->getPath());
-
-                    throw $ex;
-                }
-
-                if ($child->hasDefaultValue()) {
-                    $value[$name] = $child->getDefaultValue();
-                }
-
-                continue;
-            }
-
-            try {
-                $value[$name] = $child->finalize($value[$name]);
-            } catch (UnsetKeyException $e) {
-                unset($value[$name]);
-            }
-        }
-
-        return $value;
-    }
-
-    /**
-     * Validates the type of the value.
-     *
-     * @param mixed $value
-     *
-     * @throws InvalidTypeException
-     */
-    protected function validateType($value)
-    {
-        if (!is_array($value) && (!$this->allowFalse || false !== $value)) {
-            $ex = new InvalidTypeException(sprintf(
-                'Invalid type for path "%s". Expected array, but got %s',
-                $this->getPath(),
-                gettype($value)
-            ));
-            if ($hint = $this->getInfo()) {
-                $ex->addHint($hint);
-            }
-            $ex->setPath($this->getPath());
-
-            throw $ex;
-        }
-    }
-
-    /**
-     * Normalizes the value.
-     *
-     * @param mixed $value The value to normalize
-     *
-     * @return mixed The normalized value
-     *
-     * @throws InvalidConfigurationException
-     */
-    protected function normalizeValue($value)
-    {
-        if (false === $value) {
-            return $value;
-        }
-
-        $value = $this->remapXml($value);
-
-        $normalized = array();
-        foreach ($value as $name => $val) {
-            if (isset($this->children[$name])) {
-                $normalized[$name] = $this->children[$name]->normalize($val);
-                unset($value[$name]);
-            } elseif (!$this->removeExtraKeys) {
-                $normalized[$name] = $val;
-            }
-        }
-
-        // if extra fields are present, throw exception
-        if (count($value) && !$this->ignoreExtraKeys) {
-            $msg = sprintf('Unrecognized option%s "%s" under "%s"', 1 === count($value) ? '' : 's', implode(', ', array_keys($value)), $this->getPath());
-            $ex = new InvalidConfigurationException($msg);
-            $ex->setPath($this->getPath());
-
-            throw $ex;
-        }
-
-        return $normalized;
-    }
-
-    /**
-     * Remaps multiple singular values to a single plural value.
-     *
-     * @param array $value The source values
-     *
-     * @return array The remapped values
-     */
-    protected function remapXml($value)
-    {
-        foreach ($this->xmlRemappings as $transition) {
-            list($singular, $plural) = $transition;
-            if (!isset($value[$singular])) {
-                continue;
-            }
-
-            $value[$plural] = Processor::normalizeConfig($value, $singular, $plural);
-            unset($value[$singular]);
-        }
-
-        return $value;
-    }
-
-    /**
-     * Merges values together.
-     *
-     * @param mixed $leftSide  The left side to merge
-     * @param mixed $rightSide The right side to merge
-     *
-     * @return mixed The merged values
-     *
-     * @throws InvalidConfigurationException
-     * @throws \RuntimeException
-     */
-    protected function mergeValues($leftSide, $rightSide)
-    {
-        if (false === $rightSide) {
-            // if this is still false after the last config has been merged the
-            // finalization pass will take care of removing this key entirely
-            return false;
-        }
-
-        if (false === $leftSide || !$this->performDeepMerging) {
-            return $rightSide;
-        }
-
-        foreach ($rightSide as $k => $v) {
-            // no conflict
-            if (!array_key_exists($k, $leftSide)) {
-                if (!$this->allowNewKeys) {
-                    $ex = new InvalidConfigurationException(sprintf(
-                        'You are not allowed to define new elements for path "%s". '
-                       .'Please define all elements for this path in one config file. '
-                       .'If you are trying to overwrite an element, make sure you redefine it '
-                       .'with the same name.',
-                        $this->getPath()
-                    ));
-                    $ex->setPath($this->getPath());
-
-                    throw $ex;
-                }
-
-                $leftSide[$k] = $v;
-                continue;
-            }
-
-            if (!isset($this->children[$k])) {
-                throw new \RuntimeException('merge() expects a normalized config array.');
-            }
-
-            $leftSide[$k] = $this->children[$k]->merge($leftSide[$k], $v);
-        }
-
-        return $leftSide;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/BaseNode.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/BaseNode.php
deleted file mode 100644
index dbf36335b6..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/BaseNode.php
+++ /dev/null
@@ -1,356 +0,0 @@
-<?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\Config\Definition;
-
-use Symfony\Component\Config\Definition\Exception\Exception;
-use Symfony\Component\Config\Definition\Exception\ForbiddenOverwriteException;
-use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
-use Symfony\Component\Config\Definition\Exception\InvalidTypeException;
-
-/**
- * The base node class.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-abstract class BaseNode implements NodeInterface
-{
-    protected $name;
-    protected $parent;
-    protected $normalizationClosures = array();
-    protected $finalValidationClosures = array();
-    protected $allowOverwrite = true;
-    protected $required = false;
-    protected $equivalentValues = array();
-    protected $attributes = array();
-
-    /**
-     * Constructor.
-     *
-     * @param string        $name   The name of the node
-     * @param NodeInterface $parent The parent of this node
-     *
-     * @throws \InvalidArgumentException if the name contains a period.
-     */
-    public function __construct($name, NodeInterface $parent = null)
-    {
-        if (false !== strpos($name, '.')) {
-            throw new \InvalidArgumentException('The name must not contain ".".');
-        }
-
-        $this->name = $name;
-        $this->parent = $parent;
-    }
-
-    public function setAttribute($key, $value)
-    {
-        $this->attributes[$key] = $value;
-    }
-
-    public function getAttribute($key, $default = null)
-    {
-        return isset($this->attributes[$key]) ? $this->attributes[$key] : $default;
-    }
-
-    public function hasAttribute($key)
-    {
-        return isset($this->attributes[$key]);
-    }
-
-    public function getAttributes()
-    {
-        return $this->attributes;
-    }
-
-    public function setAttributes(array $attributes)
-    {
-        $this->attributes = $attributes;
-    }
-
-    public function removeAttribute($key)
-    {
-        unset($this->attributes[$key]);
-    }
-
-    /**
-     * Sets an info message.
-     *
-     * @param string $info
-     */
-    public function setInfo($info)
-    {
-        $this->setAttribute('info', $info);
-    }
-
-    /**
-     * Returns info message.
-     *
-     * @return string The info text
-     */
-    public function getInfo()
-    {
-        return $this->getAttribute('info');
-    }
-
-    /**
-     * Sets the example configuration for this node.
-     *
-     * @param string|array $example
-     */
-    public function setExample($example)
-    {
-        $this->setAttribute('example', $example);
-    }
-
-    /**
-     * Retrieves the example configuration for this node.
-     *
-     * @return string|array The example
-     */
-    public function getExample()
-    {
-        return $this->getAttribute('example');
-    }
-
-    /**
-     * Adds an equivalent value.
-     *
-     * @param mixed $originalValue
-     * @param mixed $equivalentValue
-     */
-    public function addEquivalentValue($originalValue, $equivalentValue)
-    {
-        $this->equivalentValues[] = array($originalValue, $equivalentValue);
-    }
-
-    /**
-     * Set this node as required.
-     *
-     * @param bool $boolean Required node
-     */
-    public function setRequired($boolean)
-    {
-        $this->required = (bool) $boolean;
-    }
-
-    /**
-     * Sets if this node can be overridden.
-     *
-     * @param bool $allow
-     */
-    public function setAllowOverwrite($allow)
-    {
-        $this->allowOverwrite = (bool) $allow;
-    }
-
-    /**
-     * Sets the closures used for normalization.
-     *
-     * @param \Closure[] $closures An array of Closures used for normalization
-     */
-    public function setNormalizationClosures(array $closures)
-    {
-        $this->normalizationClosures = $closures;
-    }
-
-    /**
-     * Sets the closures used for final validation.
-     *
-     * @param \Closure[] $closures An array of Closures used for final validation
-     */
-    public function setFinalValidationClosures(array $closures)
-    {
-        $this->finalValidationClosures = $closures;
-    }
-
-    /**
-     * Checks if this node is required.
-     *
-     * @return bool
-     */
-    public function isRequired()
-    {
-        return $this->required;
-    }
-
-    /**
-     * Returns the name of this node.
-     *
-     * @return string The Node's name
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Retrieves the path of this node.
-     *
-     * @return string The Node's path
-     */
-    public function getPath()
-    {
-        $path = $this->name;
-
-        if (null !== $this->parent) {
-            $path = $this->parent->getPath().'.'.$path;
-        }
-
-        return $path;
-    }
-
-    /**
-     * Merges two values together.
-     *
-     * @param mixed $leftSide
-     * @param mixed $rightSide
-     *
-     * @return mixed The merged value
-     *
-     * @throws ForbiddenOverwriteException
-     */
-    final public function merge($leftSide, $rightSide)
-    {
-        if (!$this->allowOverwrite) {
-            throw new ForbiddenOverwriteException(sprintf(
-                'Configuration path "%s" cannot be overwritten. You have to '
-               .'define all options for this path, and any of its sub-paths in '
-               .'one configuration section.',
-                $this->getPath()
-            ));
-        }
-
-        $this->validateType($leftSide);
-        $this->validateType($rightSide);
-
-        return $this->mergeValues($leftSide, $rightSide);
-    }
-
-    /**
-     * Normalizes a value, applying all normalization closures.
-     *
-     * @param mixed $value Value to normalize
-     *
-     * @return mixed The normalized value
-     */
-    final public function normalize($value)
-    {
-        $value = $this->preNormalize($value);
-
-        // run custom normalization closures
-        foreach ($this->normalizationClosures as $closure) {
-            $value = $closure($value);
-        }
-
-        // replace value with their equivalent
-        foreach ($this->equivalentValues as $data) {
-            if ($data[0] === $value) {
-                $value = $data[1];
-            }
-        }
-
-        // validate type
-        $this->validateType($value);
-
-        // normalize value
-        return $this->normalizeValue($value);
-    }
-
-    /**
-     * Normalizes the value before any other normalization is applied.
-     *
-     * @param $value
-     *
-     * @return $value The normalized array value
-     */
-    protected function preNormalize($value)
-    {
-        return $value;
-    }
-
-    /**
-     * Returns parent node for this node.
-     *
-     * @return NodeInterface|null
-     */
-    public function getParent()
-    {
-        return $this->parent;
-    }
-
-    /**
-     * Finalizes a value, applying all finalization closures.
-     *
-     * @param mixed $value The value to finalize
-     *
-     * @return mixed The finalized value
-     *
-     * @throws Exception
-     * @throws InvalidConfigurationException
-     */
-    final public function finalize($value)
-    {
-        $this->validateType($value);
-
-        $value = $this->finalizeValue($value);
-
-        // Perform validation on the final value if a closure has been set.
-        // The closure is also allowed to return another value.
-        foreach ($this->finalValidationClosures as $closure) {
-            try {
-                $value = $closure($value);
-            } catch (Exception $e) {
-                throw $e;
-            } catch (\Exception $e) {
-                throw new InvalidConfigurationException(sprintf('Invalid configuration for path "%s": %s', $this->getPath(), $e->getMessage()), $e->getCode(), $e);
-            }
-        }
-
-        return $value;
-    }
-
-    /**
-     * Validates the type of a Node.
-     *
-     * @param mixed $value The value to validate
-     *
-     * @throws InvalidTypeException when the value is invalid
-     */
-    abstract protected function validateType($value);
-
-    /**
-     * Normalizes the value.
-     *
-     * @param mixed $value The value to normalize
-     *
-     * @return mixed The normalized value
-     */
-    abstract protected function normalizeValue($value);
-
-    /**
-     * Merges two values together.
-     *
-     * @param mixed $leftSide
-     * @param mixed $rightSide
-     *
-     * @return mixed The merged value
-     */
-    abstract protected function mergeValues($leftSide, $rightSide);
-
-    /**
-     * Finalizes a value.
-     *
-     * @param mixed $value The value to finalize
-     *
-     * @return mixed The finalized value
-     */
-    abstract protected function finalizeValue($value);
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/BooleanNode.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/BooleanNode.php
deleted file mode 100644
index 08e1a77307..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/BooleanNode.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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\Config\Definition;
-
-use Symfony\Component\Config\Definition\Exception\InvalidTypeException;
-
-/**
- * This node represents a Boolean value in the config tree.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class BooleanNode extends ScalarNode
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function validateType($value)
-    {
-        if (!is_bool($value)) {
-            $ex = new InvalidTypeException(sprintf(
-                'Invalid type for path "%s". Expected boolean, but got %s.',
-                $this->getPath(),
-                gettype($value)
-            ));
-            if ($hint = $this->getInfo()) {
-                $ex->addHint($hint);
-            }
-            $ex->setPath($this->getPath());
-
-            throw $ex;
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function isValueEmpty($value)
-    {
-        // a boolean value cannot be empty
-        return false;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/ArrayNodeDefinition.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/ArrayNodeDefinition.php
deleted file mode 100644
index dc1c2fd8db..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/ArrayNodeDefinition.php
+++ /dev/null
@@ -1,493 +0,0 @@
-<?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\Config\Definition\Builder;
-
-use Symfony\Component\Config\Definition\ArrayNode;
-use Symfony\Component\Config\Definition\PrototypedArrayNode;
-use Symfony\Component\Config\Definition\Exception\InvalidDefinitionException;
-
-/**
- * This class provides a fluent interface for defining an array node.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinitionInterface
-{
-    protected $performDeepMerging = true;
-    protected $ignoreExtraKeys = false;
-    protected $removeExtraKeys = true;
-    protected $children = array();
-    protected $prototype;
-    protected $atLeastOne = false;
-    protected $allowNewKeys = true;
-    protected $key;
-    protected $removeKeyItem;
-    protected $addDefaults = false;
-    protected $addDefaultChildren = false;
-    protected $nodeBuilder;
-    protected $normalizeKeys = true;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct($name, NodeParentInterface $parent = null)
-    {
-        parent::__construct($name, $parent);
-
-        $this->nullEquivalent = array();
-        $this->trueEquivalent = array();
-    }
-
-    /**
-     * Sets a custom children builder.
-     *
-     * @param NodeBuilder $builder A custom NodeBuilder
-     */
-    public function setBuilder(NodeBuilder $builder)
-    {
-        $this->nodeBuilder = $builder;
-    }
-
-    /**
-     * Returns a builder to add children nodes.
-     *
-     * @return NodeBuilder
-     */
-    public function children()
-    {
-        return $this->getNodeBuilder();
-    }
-
-    /**
-     * Sets a prototype for child nodes.
-     *
-     * @param string $type the type of node
-     *
-     * @return NodeDefinition
-     */
-    public function prototype($type)
-    {
-        return $this->prototype = $this->getNodeBuilder()->node(null, $type)->setParent($this);
-    }
-
-    /**
-     * Adds the default value if the node is not set in the configuration.
-     *
-     * This method is applicable to concrete nodes only (not to prototype nodes).
-     * If this function has been called and the node is not set during the finalization
-     * phase, it's default value will be derived from its children default values.
-     *
-     * @return ArrayNodeDefinition
-     */
-    public function addDefaultsIfNotSet()
-    {
-        $this->addDefaults = true;
-
-        return $this;
-    }
-
-    /**
-     * Adds children with a default value when none are defined.
-     *
-     * @param int|string|array|null $children The number of children|The child name|The children names to be added
-     *
-     * This method is applicable to prototype nodes only.
-     *
-     * @return ArrayNodeDefinition
-     */
-    public function addDefaultChildrenIfNoneSet($children = null)
-    {
-        $this->addDefaultChildren = $children;
-
-        return $this;
-    }
-
-    /**
-     * Requires the node to have at least one element.
-     *
-     * This method is applicable to prototype nodes only.
-     *
-     * @return ArrayNodeDefinition
-     */
-    public function requiresAtLeastOneElement()
-    {
-        $this->atLeastOne = true;
-
-        return $this;
-    }
-
-    /**
-     * Disallows adding news keys in a subsequent configuration.
-     *
-     * If used all keys have to be defined in the same configuration file.
-     *
-     * @return ArrayNodeDefinition
-     */
-    public function disallowNewKeysInSubsequentConfigs()
-    {
-        $this->allowNewKeys = false;
-
-        return $this;
-    }
-
-    /**
-     * Sets a normalization rule for XML configurations.
-     *
-     * @param string $singular The key to remap
-     * @param string $plural   The plural of the key for irregular plurals
-     *
-     * @return ArrayNodeDefinition
-     */
-    public function fixXmlConfig($singular, $plural = null)
-    {
-        $this->normalization()->remap($singular, $plural);
-
-        return $this;
-    }
-
-    /**
-     * Sets the attribute which value is to be used as key.
-     *
-     * This is useful when you have an indexed array that should be an
-     * associative array. You can select an item from within the array
-     * to be the key of the particular item. For example, if "id" is the
-     * "key", then:
-     *
-     *     array(
-     *         array('id' => 'my_name', 'foo' => 'bar'),
-     *     );
-     *
-     *   becomes
-     *
-     *     array(
-     *         'my_name' => array('foo' => 'bar'),
-     *     );
-     *
-     * If you'd like "'id' => 'my_name'" to still be present in the resulting
-     * array, then you can set the second argument of this method to false.
-     *
-     * This method is applicable to prototype nodes only.
-     *
-     * @param string $name          The name of the key
-     * @param bool   $removeKeyItem Whether or not the key item should be removed
-     *
-     * @return ArrayNodeDefinition
-     */
-    public function useAttributeAsKey($name, $removeKeyItem = true)
-    {
-        $this->key = $name;
-        $this->removeKeyItem = $removeKeyItem;
-
-        return $this;
-    }
-
-    /**
-     * Sets whether the node can be unset.
-     *
-     * @param bool $allow
-     *
-     * @return ArrayNodeDefinition
-     */
-    public function canBeUnset($allow = true)
-    {
-        $this->merge()->allowUnset($allow);
-
-        return $this;
-    }
-
-    /**
-     * Adds an "enabled" boolean to enable the current section.
-     *
-     * By default, the section is disabled. If any configuration is specified then
-     * the node will be automatically enabled:
-     *
-     * enableableArrayNode: {enabled: true, ...}   # The config is enabled & default values get overridden
-     * enableableArrayNode: ~                      # The config is enabled & use the default values
-     * enableableArrayNode: true                   # The config is enabled & use the default values
-     * enableableArrayNode: {other: value, ...}    # The config is enabled & default values get overridden
-     * enableableArrayNode: {enabled: false, ...}  # The config is disabled
-     * enableableArrayNode: false                  # The config is disabled
-     *
-     * @return ArrayNodeDefinition
-     */
-    public function canBeEnabled()
-    {
-        $this
-            ->addDefaultsIfNotSet()
-            ->treatFalseLike(array('enabled' => false))
-            ->treatTrueLike(array('enabled' => true))
-            ->treatNullLike(array('enabled' => true))
-            ->beforeNormalization()
-                ->ifArray()
-                ->then(function ($v) {
-                    $v['enabled'] = isset($v['enabled']) ? $v['enabled'] : true;
-
-                    return $v;
-                })
-            ->end()
-            ->children()
-                ->booleanNode('enabled')
-                    ->defaultFalse()
-        ;
-
-        return $this;
-    }
-
-    /**
-     * Adds an "enabled" boolean to enable the current section.
-     *
-     * By default, the section is enabled.
-     *
-     * @return ArrayNodeDefinition
-     */
-    public function canBeDisabled()
-    {
-        $this
-            ->addDefaultsIfNotSet()
-            ->treatFalseLike(array('enabled' => false))
-            ->treatTrueLike(array('enabled' => true))
-            ->treatNullLike(array('enabled' => true))
-            ->children()
-                ->booleanNode('enabled')
-                    ->defaultTrue()
-        ;
-
-        return $this;
-    }
-
-    /**
-     * Disables the deep merging of the node.
-     *
-     * @return ArrayNodeDefinition
-     */
-    public function performNoDeepMerging()
-    {
-        $this->performDeepMerging = false;
-
-        return $this;
-    }
-
-    /**
-     * Allows extra config keys to be specified under an array without
-     * throwing an exception.
-     *
-     * Those config values are simply ignored and removed from the
-     * resulting array. This should be used only in special cases where
-     * you want to send an entire configuration array through a special
-     * tree that processes only part of the array.
-     *
-     * @param bool $remove Whether to remove the extra keys
-     *
-     * @return ArrayNodeDefinition
-     */
-    public function ignoreExtraKeys($remove = true)
-    {
-        $this->ignoreExtraKeys = true;
-        $this->removeExtraKeys = $remove;
-
-        return $this;
-    }
-
-    /**
-     * Sets key normalization.
-     *
-     * @param bool $bool Whether to enable key normalization
-     *
-     * @return ArrayNodeDefinition
-     */
-    public function normalizeKeys($bool)
-    {
-        $this->normalizeKeys = (bool) $bool;
-
-        return $this;
-    }
-
-    /**
-     * Appends a node definition.
-     *
-     *     $node = new ArrayNodeDefinition()
-     *         ->children()
-     *             ->scalarNode('foo')->end()
-     *             ->scalarNode('baz')->end()
-     *         ->end()
-     *         ->append($this->getBarNodeDefinition())
-     *     ;
-     *
-     * @param NodeDefinition $node A NodeDefinition instance
-     *
-     * @return ArrayNodeDefinition This node
-     */
-    public function append(NodeDefinition $node)
-    {
-        $this->children[$node->name] = $node->setParent($this);
-
-        return $this;
-    }
-
-    /**
-     * Returns a node builder to be used to add children and prototype.
-     *
-     * @return NodeBuilder The node builder
-     */
-    protected function getNodeBuilder()
-    {
-        if (null === $this->nodeBuilder) {
-            $this->nodeBuilder = new NodeBuilder();
-        }
-
-        return $this->nodeBuilder->setParent($this);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function createNode()
-    {
-        if (null === $this->prototype) {
-            $node = new ArrayNode($this->name, $this->parent);
-
-            $this->validateConcreteNode($node);
-
-            $node->setAddIfNotSet($this->addDefaults);
-
-            foreach ($this->children as $child) {
-                $child->parent = $node;
-                $node->addChild($child->getNode());
-            }
-        } else {
-            $node = new PrototypedArrayNode($this->name, $this->parent);
-
-            $this->validatePrototypeNode($node);
-
-            if (null !== $this->key) {
-                $node->setKeyAttribute($this->key, $this->removeKeyItem);
-            }
-
-            if (true === $this->atLeastOne) {
-                $node->setMinNumberOfElements(1);
-            }
-
-            if ($this->default) {
-                $node->setDefaultValue($this->defaultValue);
-            }
-
-            if (false !== $this->addDefaultChildren) {
-                $node->setAddChildrenIfNoneSet($this->addDefaultChildren);
-                if ($this->prototype instanceof static && null === $this->prototype->prototype) {
-                    $this->prototype->addDefaultsIfNotSet();
-                }
-            }
-
-            $this->prototype->parent = $node;
-            $node->setPrototype($this->prototype->getNode());
-        }
-
-        $node->setAllowNewKeys($this->allowNewKeys);
-        $node->addEquivalentValue(null, $this->nullEquivalent);
-        $node->addEquivalentValue(true, $this->trueEquivalent);
-        $node->addEquivalentValue(false, $this->falseEquivalent);
-        $node->setPerformDeepMerging($this->performDeepMerging);
-        $node->setRequired($this->required);
-        $node->setIgnoreExtraKeys($this->ignoreExtraKeys, $this->removeExtraKeys);
-        $node->setNormalizeKeys($this->normalizeKeys);
-
-        if (null !== $this->normalization) {
-            $node->setNormalizationClosures($this->normalization->before);
-            $node->setXmlRemappings($this->normalization->remappings);
-        }
-
-        if (null !== $this->merge) {
-            $node->setAllowOverwrite($this->merge->allowOverwrite);
-            $node->setAllowFalse($this->merge->allowFalse);
-        }
-
-        if (null !== $this->validation) {
-            $node->setFinalValidationClosures($this->validation->rules);
-        }
-
-        return $node;
-    }
-
-    /**
-     * Validate the configuration of a concrete node.
-     *
-     * @param ArrayNode $node The related node
-     *
-     * @throws InvalidDefinitionException
-     */
-    protected function validateConcreteNode(ArrayNode $node)
-    {
-        $path = $node->getPath();
-
-        if (null !== $this->key) {
-            throw new InvalidDefinitionException(
-                sprintf('->useAttributeAsKey() is not applicable to concrete nodes at path "%s"', $path)
-            );
-        }
-
-        if (true === $this->atLeastOne) {
-            throw new InvalidDefinitionException(
-                sprintf('->requiresAtLeastOneElement() is not applicable to concrete nodes at path "%s"', $path)
-            );
-        }
-
-        if ($this->default) {
-            throw new InvalidDefinitionException(
-                sprintf('->defaultValue() is not applicable to concrete nodes at path "%s"', $path)
-            );
-        }
-
-        if (false !== $this->addDefaultChildren) {
-            throw new InvalidDefinitionException(
-                sprintf('->addDefaultChildrenIfNoneSet() is not applicable to concrete nodes at path "%s"', $path)
-            );
-        }
-    }
-
-    /**
-     * Validate the configuration of a prototype node.
-     *
-     * @param PrototypedArrayNode $node The related node
-     *
-     * @throws InvalidDefinitionException
-     */
-    protected function validatePrototypeNode(PrototypedArrayNode $node)
-    {
-        $path = $node->getPath();
-
-        if ($this->addDefaults) {
-            throw new InvalidDefinitionException(
-                sprintf('->addDefaultsIfNotSet() is not applicable to prototype nodes at path "%s"', $path)
-            );
-        }
-
-        if (false !== $this->addDefaultChildren) {
-            if ($this->default) {
-                throw new InvalidDefinitionException(
-                    sprintf('A default value and default children might not be used together at path "%s"', $path)
-                );
-            }
-
-            if (null !== $this->key && (null === $this->addDefaultChildren || is_int($this->addDefaultChildren) && $this->addDefaultChildren > 0)) {
-                throw new InvalidDefinitionException(
-                    sprintf('->addDefaultChildrenIfNoneSet() should set default children names as ->useAttributeAsKey() is used at path "%s"', $path)
-                );
-            }
-
-            if (null === $this->key && (is_string($this->addDefaultChildren) || is_array($this->addDefaultChildren))) {
-                throw new InvalidDefinitionException(
-                    sprintf('->addDefaultChildrenIfNoneSet() might not set default children names as ->useAttributeAsKey() is not used at path "%s"', $path)
-                );
-            }
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/BooleanNodeDefinition.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/BooleanNodeDefinition.php
deleted file mode 100644
index 28e56579ad..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/BooleanNodeDefinition.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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\Config\Definition\Builder;
-
-use Symfony\Component\Config\Definition\BooleanNode;
-use Symfony\Component\Config\Definition\Exception\InvalidDefinitionException;
-
-/**
- * This class provides a fluent interface for defining a node.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class BooleanNodeDefinition extends ScalarNodeDefinition
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct($name, NodeParentInterface $parent = null)
-    {
-        parent::__construct($name, $parent);
-
-        $this->nullEquivalent = true;
-    }
-
-    /**
-     * Instantiate a Node.
-     *
-     * @return BooleanNode The node
-     */
-    protected function instantiateNode()
-    {
-        return new BooleanNode($this->name, $this->parent);
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @throws InvalidDefinitionException
-     */
-    public function cannotBeEmpty()
-    {
-        throw new InvalidDefinitionException('->cannotBeEmpty() is not applicable to BooleanNodeDefinition.');
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/EnumNodeDefinition.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/EnumNodeDefinition.php
deleted file mode 100644
index 5d3ff014f1..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/EnumNodeDefinition.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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\Config\Definition\Builder;
-
-use Symfony\Component\Config\Definition\EnumNode;
-
-/**
- * Enum Node Definition.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class EnumNodeDefinition extends ScalarNodeDefinition
-{
-    private $values;
-
-    /**
-     * @param array $values
-     *
-     * @return EnumNodeDefinition|$this
-     */
-    public function values(array $values)
-    {
-        $values = array_unique($values);
-
-        if (empty($values)) {
-            throw new \InvalidArgumentException('->values() must be called with at least one value.');
-        }
-
-        $this->values = $values;
-
-        return $this;
-    }
-
-    /**
-     * Instantiate a Node.
-     *
-     * @return EnumNode The node
-     *
-     * @throws \RuntimeException
-     */
-    protected function instantiateNode()
-    {
-        if (null === $this->values) {
-            throw new \RuntimeException('You must call ->values() on enum nodes.');
-        }
-
-        return new EnumNode($this->name, $this->parent, $this->values);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/ExprBuilder.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/ExprBuilder.php
deleted file mode 100644
index 3d79b29858..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/ExprBuilder.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?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\Config\Definition\Builder;
-
-use Symfony\Component\Config\Definition\Exception\UnsetKeyException;
-
-/**
- * This class builds an if expression.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- * @author Christophe Coevoet <stof@notk.org>
- */
-class ExprBuilder
-{
-    protected $node;
-    public $ifPart;
-    public $thenPart;
-
-    /**
-     * Constructor.
-     *
-     * @param NodeDefinition $node The related node
-     */
-    public function __construct(NodeDefinition $node)
-    {
-        $this->node = $node;
-    }
-
-    /**
-     * Marks the expression as being always used.
-     *
-     * @param \Closure $then
-     *
-     * @return ExprBuilder
-     */
-    public function always(\Closure $then = null)
-    {
-        $this->ifPart = function ($v) { return true; };
-
-        if (null !== $then) {
-            $this->thenPart = $then;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Sets a closure to use as tests.
-     *
-     * The default one tests if the value is true.
-     *
-     * @param \Closure $closure
-     *
-     * @return ExprBuilder
-     */
-    public function ifTrue(\Closure $closure = null)
-    {
-        if (null === $closure) {
-            $closure = function ($v) { return true === $v; };
-        }
-
-        $this->ifPart = $closure;
-
-        return $this;
-    }
-
-    /**
-     * Tests if the value is a string.
-     *
-     * @return ExprBuilder
-     */
-    public function ifString()
-    {
-        $this->ifPart = function ($v) { return is_string($v); };
-
-        return $this;
-    }
-
-    /**
-     * Tests if the value is null.
-     *
-     * @return ExprBuilder
-     */
-    public function ifNull()
-    {
-        $this->ifPart = function ($v) { return null === $v; };
-
-        return $this;
-    }
-
-    /**
-     * Tests if the value is an array.
-     *
-     * @return ExprBuilder
-     */
-    public function ifArray()
-    {
-        $this->ifPart = function ($v) { return is_array($v); };
-
-        return $this;
-    }
-
-    /**
-     * Tests if the value is in an array.
-     *
-     * @param array $array
-     *
-     * @return ExprBuilder
-     */
-    public function ifInArray(array $array)
-    {
-        $this->ifPart = function ($v) use ($array) { return in_array($v, $array, true); };
-
-        return $this;
-    }
-
-    /**
-     * Tests if the value is not in an array.
-     *
-     * @param array $array
-     *
-     * @return ExprBuilder
-     */
-    public function ifNotInArray(array $array)
-    {
-        $this->ifPart = function ($v) use ($array) { return !in_array($v, $array, true); };
-
-        return $this;
-    }
-
-    /**
-     * Sets the closure to run if the test pass.
-     *
-     * @param \Closure $closure
-     *
-     * @return ExprBuilder
-     */
-    public function then(\Closure $closure)
-    {
-        $this->thenPart = $closure;
-
-        return $this;
-    }
-
-    /**
-     * Sets a closure returning an empty array.
-     *
-     * @return ExprBuilder
-     */
-    public function thenEmptyArray()
-    {
-        $this->thenPart = function ($v) { return array(); };
-
-        return $this;
-    }
-
-    /**
-     * Sets a closure marking the value as invalid at validation time.
-     *
-     * if you want to add the value of the node in your message just use a %s placeholder.
-     *
-     * @param string $message
-     *
-     * @return ExprBuilder
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function thenInvalid($message)
-    {
-        $this->thenPart = function ($v) use ($message) {throw new \InvalidArgumentException(sprintf($message, json_encode($v))); };
-
-        return $this;
-    }
-
-    /**
-     * Sets a closure unsetting this key of the array at validation time.
-     *
-     * @return ExprBuilder
-     *
-     * @throws UnsetKeyException
-     */
-    public function thenUnset()
-    {
-        $this->thenPart = function ($v) { throw new UnsetKeyException('Unsetting key'); };
-
-        return $this;
-    }
-
-    /**
-     * Returns the related node.
-     *
-     * @return NodeDefinition
-     *
-     * @throws \RuntimeException
-     */
-    public function end()
-    {
-        if (null === $this->ifPart) {
-            throw new \RuntimeException('You must specify an if part.');
-        }
-        if (null === $this->thenPart) {
-            throw new \RuntimeException('You must specify a then part.');
-        }
-
-        return $this->node;
-    }
-
-    /**
-     * Builds the expressions.
-     *
-     * @param ExprBuilder[] $expressions An array of ExprBuilder instances to build
-     *
-     * @return array
-     */
-    public static function buildExpressions(array $expressions)
-    {
-        foreach ($expressions as $k => $expr) {
-            if ($expr instanceof self) {
-                $if = $expr->ifPart;
-                $then = $expr->thenPart;
-                $expressions[$k] = function ($v) use ($if, $then) {
-                    return $if($v) ? $then($v) : $v;
-                };
-            }
-        }
-
-        return $expressions;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/FloatNodeDefinition.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/FloatNodeDefinition.php
deleted file mode 100644
index c0bed462bf..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/FloatNodeDefinition.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\Config\Definition\Builder;
-
-use Symfony\Component\Config\Definition\FloatNode;
-
-/**
- * This class provides a fluent interface for defining a float node.
- *
- * @author Jeanmonod David <david.jeanmonod@gmail.com>
- */
-class FloatNodeDefinition extends NumericNodeDefinition
-{
-    /**
-     * Instantiates a Node.
-     *
-     * @return FloatNode The node
-     */
-    protected function instantiateNode()
-    {
-        return new FloatNode($this->name, $this->parent, $this->min, $this->max);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/IntegerNodeDefinition.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/IntegerNodeDefinition.php
deleted file mode 100644
index f6c3c147f3..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/IntegerNodeDefinition.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\Config\Definition\Builder;
-
-use Symfony\Component\Config\Definition\IntegerNode;
-
-/**
- * This class provides a fluent interface for defining an integer node.
- *
- * @author Jeanmonod David <david.jeanmonod@gmail.com>
- */
-class IntegerNodeDefinition extends NumericNodeDefinition
-{
-    /**
-     * Instantiates a Node.
-     *
-     * @return IntegerNode The node
-     */
-    protected function instantiateNode()
-    {
-        return new IntegerNode($this->name, $this->parent, $this->min, $this->max);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/MergeBuilder.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/MergeBuilder.php
deleted file mode 100644
index f908a499ca..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/MergeBuilder.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?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\Config\Definition\Builder;
-
-/**
- * This class builds merge conditions.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class MergeBuilder
-{
-    protected $node;
-    public $allowFalse = false;
-    public $allowOverwrite = true;
-
-    /**
-     * Constructor.
-     *
-     * @param NodeDefinition $node The related node
-     */
-    public function __construct(NodeDefinition $node)
-    {
-        $this->node = $node;
-    }
-
-    /**
-     * Sets whether the node can be unset.
-     *
-     * @param bool $allow
-     *
-     * @return MergeBuilder
-     */
-    public function allowUnset($allow = true)
-    {
-        $this->allowFalse = $allow;
-
-        return $this;
-    }
-
-    /**
-     * Sets whether the node can be overwritten.
-     *
-     * @param bool $deny Whether the overwriting is forbidden or not
-     *
-     * @return MergeBuilder
-     */
-    public function denyOverwrite($deny = true)
-    {
-        $this->allowOverwrite = !$deny;
-
-        return $this;
-    }
-
-    /**
-     * Returns the related node.
-     *
-     * @return NodeDefinition
-     */
-    public function end()
-    {
-        return $this->node;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/NodeBuilder.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/NodeBuilder.php
deleted file mode 100644
index b2b63368e2..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/NodeBuilder.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?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\Config\Definition\Builder;
-
-/**
- * This class provides a fluent interface for building a node.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class NodeBuilder implements NodeParentInterface
-{
-    protected $parent;
-    protected $nodeMapping;
-
-    /**
-     * Constructor.
-     */
-    public function __construct()
-    {
-        $this->nodeMapping = array(
-            'variable' => __NAMESPACE__.'\\VariableNodeDefinition',
-            'scalar' => __NAMESPACE__.'\\ScalarNodeDefinition',
-            'boolean' => __NAMESPACE__.'\\BooleanNodeDefinition',
-            'integer' => __NAMESPACE__.'\\IntegerNodeDefinition',
-            'float' => __NAMESPACE__.'\\FloatNodeDefinition',
-            'array' => __NAMESPACE__.'\\ArrayNodeDefinition',
-            'enum' => __NAMESPACE__.'\\EnumNodeDefinition',
-        );
-    }
-
-    /**
-     * Set the parent node.
-     *
-     * @param ParentNodeDefinitionInterface $parent The parent node
-     *
-     * @return NodeBuilder This node builder
-     */
-    public function setParent(ParentNodeDefinitionInterface $parent = null)
-    {
-        $this->parent = $parent;
-
-        return $this;
-    }
-
-    /**
-     * Creates a child array node.
-     *
-     * @param string $name The name of the node
-     *
-     * @return ArrayNodeDefinition The child node
-     */
-    public function arrayNode($name)
-    {
-        return $this->node($name, 'array');
-    }
-
-    /**
-     * Creates a child scalar node.
-     *
-     * @param string $name the name of the node
-     *
-     * @return ScalarNodeDefinition The child node
-     */
-    public function scalarNode($name)
-    {
-        return $this->node($name, 'scalar');
-    }
-
-    /**
-     * Creates a child Boolean node.
-     *
-     * @param string $name The name of the node
-     *
-     * @return BooleanNodeDefinition The child node
-     */
-    public function booleanNode($name)
-    {
-        return $this->node($name, 'boolean');
-    }
-
-    /**
-     * Creates a child integer node.
-     *
-     * @param string $name the name of the node
-     *
-     * @return IntegerNodeDefinition The child node
-     */
-    public function integerNode($name)
-    {
-        return $this->node($name, 'integer');
-    }
-
-    /**
-     * Creates a child float node.
-     *
-     * @param string $name the name of the node
-     *
-     * @return FloatNodeDefinition The child node
-     */
-    public function floatNode($name)
-    {
-        return $this->node($name, 'float');
-    }
-
-    /**
-     * Creates a child EnumNode.
-     *
-     * @param string $name
-     *
-     * @return EnumNodeDefinition
-     */
-    public function enumNode($name)
-    {
-        return $this->node($name, 'enum');
-    }
-
-    /**
-     * Creates a child variable node.
-     *
-     * @param string $name The name of the node
-     *
-     * @return VariableNodeDefinition The builder of the child node
-     */
-    public function variableNode($name)
-    {
-        return $this->node($name, 'variable');
-    }
-
-    /**
-     * Returns the parent node.
-     *
-     * @return ParentNodeDefinitionInterface The parent node
-     */
-    public function end()
-    {
-        return $this->parent;
-    }
-
-    /**
-     * Creates a child node.
-     *
-     * @param string $name The name of the node
-     * @param string $type The type of the node
-     *
-     * @return NodeDefinition The child node
-     *
-     * @throws \RuntimeException When the node type is not registered
-     * @throws \RuntimeException When the node class is not found
-     */
-    public function node($name, $type)
-    {
-        $class = $this->getNodeClass($type);
-
-        $node = new $class($name);
-
-        $this->append($node);
-
-        return $node;
-    }
-
-    /**
-     * Appends a node definition.
-     *
-     * Usage:
-     *
-     *     $node = new ArrayNodeDefinition('name')
-     *         ->children()
-     *             ->scalarNode('foo')->end()
-     *             ->scalarNode('baz')->end()
-     *             ->append($this->getBarNodeDefinition())
-     *         ->end()
-     *     ;
-     *
-     * @param NodeDefinition $node
-     *
-     * @return NodeBuilder This node builder
-     */
-    public function append(NodeDefinition $node)
-    {
-        if ($node instanceof ParentNodeDefinitionInterface) {
-            $builder = clone $this;
-            $builder->setParent(null);
-            $node->setBuilder($builder);
-        }
-
-        if (null !== $this->parent) {
-            $this->parent->append($node);
-            // Make this builder the node parent to allow for a fluid interface
-            $node->setParent($this);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Adds or overrides a node Type.
-     *
-     * @param string $type  The name of the type
-     * @param string $class The fully qualified name the node definition class
-     *
-     * @return NodeBuilder This node builder
-     */
-    public function setNodeClass($type, $class)
-    {
-        $this->nodeMapping[strtolower($type)] = $class;
-
-        return $this;
-    }
-
-    /**
-     * Returns the class name of the node definition.
-     *
-     * @param string $type The node type
-     *
-     * @return string The node definition class name
-     *
-     * @throws \RuntimeException When the node type is not registered
-     * @throws \RuntimeException When the node class is not found
-     */
-    protected function getNodeClass($type)
-    {
-        $type = strtolower($type);
-
-        if (!isset($this->nodeMapping[$type])) {
-            throw new \RuntimeException(sprintf('The node type "%s" is not registered.', $type));
-        }
-
-        $class = $this->nodeMapping[$type];
-
-        if (!class_exists($class)) {
-            throw new \RuntimeException(sprintf('The node class "%s" does not exist.', $class));
-        }
-
-        return $class;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/NodeDefinition.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/NodeDefinition.php
deleted file mode 100644
index f7f84bc071..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/NodeDefinition.php
+++ /dev/null
@@ -1,343 +0,0 @@
-<?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\Config\Definition\Builder;
-
-use Symfony\Component\Config\Definition\NodeInterface;
-use Symfony\Component\Config\Definition\Exception\InvalidDefinitionException;
-
-/**
- * This class provides a fluent interface for defining a node.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-abstract class NodeDefinition implements NodeParentInterface
-{
-    protected $name;
-    protected $normalization;
-    protected $validation;
-    protected $defaultValue;
-    protected $default = false;
-    protected $required = false;
-    protected $merge;
-    protected $allowEmptyValue = true;
-    protected $nullEquivalent;
-    protected $trueEquivalent = true;
-    protected $falseEquivalent = false;
-
-    /**
-     * @var NodeParentInterface|null
-     */
-    protected $parent;
-    protected $attributes = array();
-
-    /**
-     * Constructor.
-     *
-     * @param string                   $name   The name of the node
-     * @param NodeParentInterface|null $parent The parent
-     */
-    public function __construct($name, NodeParentInterface $parent = null)
-    {
-        $this->parent = $parent;
-        $this->name = $name;
-    }
-
-    /**
-     * Sets the parent node.
-     *
-     * @param NodeParentInterface $parent The parent
-     *
-     * @return NodeDefinition|$this
-     */
-    public function setParent(NodeParentInterface $parent)
-    {
-        $this->parent = $parent;
-
-        return $this;
-    }
-
-    /**
-     * Sets info message.
-     *
-     * @param string $info The info text
-     *
-     * @return NodeDefinition|$this
-     */
-    public function info($info)
-    {
-        return $this->attribute('info', $info);
-    }
-
-    /**
-     * Sets example configuration.
-     *
-     * @param string|array $example
-     *
-     * @return NodeDefinition|$this
-     */
-    public function example($example)
-    {
-        return $this->attribute('example', $example);
-    }
-
-    /**
-     * Sets an attribute on the node.
-     *
-     * @param string $key
-     * @param mixed  $value
-     *
-     * @return NodeDefinition|$this
-     */
-    public function attribute($key, $value)
-    {
-        $this->attributes[$key] = $value;
-
-        return $this;
-    }
-
-    /**
-     * Returns the parent node.
-     *
-     * @return NodeParentInterface|null The builder of the parent node
-     */
-    public function end()
-    {
-        return $this->parent;
-    }
-
-    /**
-     * Creates the node.
-     *
-     * @param bool $forceRootNode Whether to force this node as the root node
-     *
-     * @return NodeInterface
-     */
-    public function getNode($forceRootNode = false)
-    {
-        if ($forceRootNode) {
-            $this->parent = null;
-        }
-
-        if (null !== $this->normalization) {
-            $this->normalization->before = ExprBuilder::buildExpressions($this->normalization->before);
-        }
-
-        if (null !== $this->validation) {
-            $this->validation->rules = ExprBuilder::buildExpressions($this->validation->rules);
-        }
-
-        $node = $this->createNode();
-        $node->setAttributes($this->attributes);
-
-        return $node;
-    }
-
-    /**
-     * Sets the default value.
-     *
-     * @param mixed $value The default value
-     *
-     * @return NodeDefinition|$this
-     */
-    public function defaultValue($value)
-    {
-        $this->default = true;
-        $this->defaultValue = $value;
-
-        return $this;
-    }
-
-    /**
-     * Sets the node as required.
-     *
-     * @return NodeDefinition|$this
-     */
-    public function isRequired()
-    {
-        $this->required = true;
-
-        return $this;
-    }
-
-    /**
-     * Sets the equivalent value used when the node contains null.
-     *
-     * @param mixed $value
-     *
-     * @return NodeDefinition|$this
-     */
-    public function treatNullLike($value)
-    {
-        $this->nullEquivalent = $value;
-
-        return $this;
-    }
-
-    /**
-     * Sets the equivalent value used when the node contains true.
-     *
-     * @param mixed $value
-     *
-     * @return NodeDefinition|$this
-     */
-    public function treatTrueLike($value)
-    {
-        $this->trueEquivalent = $value;
-
-        return $this;
-    }
-
-    /**
-     * Sets the equivalent value used when the node contains false.
-     *
-     * @param mixed $value
-     *
-     * @return NodeDefinition|$this
-     */
-    public function treatFalseLike($value)
-    {
-        $this->falseEquivalent = $value;
-
-        return $this;
-    }
-
-    /**
-     * Sets null as the default value.
-     *
-     * @return NodeDefinition|$this
-     */
-    public function defaultNull()
-    {
-        return $this->defaultValue(null);
-    }
-
-    /**
-     * Sets true as the default value.
-     *
-     * @return NodeDefinition|$this
-     */
-    public function defaultTrue()
-    {
-        return $this->defaultValue(true);
-    }
-
-    /**
-     * Sets false as the default value.
-     *
-     * @return NodeDefinition|$this
-     */
-    public function defaultFalse()
-    {
-        return $this->defaultValue(false);
-    }
-
-    /**
-     * Sets an expression to run before the normalization.
-     *
-     * @return ExprBuilder
-     */
-    public function beforeNormalization()
-    {
-        return $this->normalization()->before();
-    }
-
-    /**
-     * Denies the node value being empty.
-     *
-     * @return NodeDefinition|$this
-     */
-    public function cannotBeEmpty()
-    {
-        $this->allowEmptyValue = false;
-
-        return $this;
-    }
-
-    /**
-     * Sets an expression to run for the validation.
-     *
-     * The expression receives the value of the node and must return it. It can
-     * modify it.
-     * An exception should be thrown when the node is not valid.
-     *
-     * @return ExprBuilder
-     */
-    public function validate()
-    {
-        return $this->validation()->rule();
-    }
-
-    /**
-     * Sets whether the node can be overwritten.
-     *
-     * @param bool $deny Whether the overwriting is forbidden or not
-     *
-     * @return NodeDefinition|$this
-     */
-    public function cannotBeOverwritten($deny = true)
-    {
-        $this->merge()->denyOverwrite($deny);
-
-        return $this;
-    }
-
-    /**
-     * Gets the builder for validation rules.
-     *
-     * @return ValidationBuilder
-     */
-    protected function validation()
-    {
-        if (null === $this->validation) {
-            $this->validation = new ValidationBuilder($this);
-        }
-
-        return $this->validation;
-    }
-
-    /**
-     * Gets the builder for merging rules.
-     *
-     * @return MergeBuilder
-     */
-    protected function merge()
-    {
-        if (null === $this->merge) {
-            $this->merge = new MergeBuilder($this);
-        }
-
-        return $this->merge;
-    }
-
-    /**
-     * Gets the builder for normalization rules.
-     *
-     * @return NormalizationBuilder
-     */
-    protected function normalization()
-    {
-        if (null === $this->normalization) {
-            $this->normalization = new NormalizationBuilder($this);
-        }
-
-        return $this->normalization;
-    }
-
-    /**
-     * Instantiate and configure the node according to this definition.
-     *
-     * @return NodeInterface $node The node instance
-     *
-     * @throws InvalidDefinitionException When the definition is invalid
-     */
-    abstract protected function createNode();
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/NodeParentInterface.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/NodeParentInterface.php
deleted file mode 100644
index 305e993167..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/NodeParentInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Config\Definition\Builder;
-
-/**
- * An interface that must be implemented by all node parents.
- *
- * @author Victor Berchet <victor@suumit.com>
- */
-interface NodeParentInterface
-{
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/NormalizationBuilder.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/NormalizationBuilder.php
deleted file mode 100644
index 748c9f28cb..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/NormalizationBuilder.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?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\Config\Definition\Builder;
-
-/**
- * This class builds normalization conditions.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class NormalizationBuilder
-{
-    protected $node;
-    public $before = array();
-    public $remappings = array();
-
-    /**
-     * Constructor.
-     *
-     * @param NodeDefinition $node The related node
-     */
-    public function __construct(NodeDefinition $node)
-    {
-        $this->node = $node;
-    }
-
-    /**
-     * Registers a key to remap to its plural form.
-     *
-     * @param string $key    The key to remap
-     * @param string $plural The plural of the key in case of irregular plural
-     *
-     * @return NormalizationBuilder
-     */
-    public function remap($key, $plural = null)
-    {
-        $this->remappings[] = array($key, null === $plural ? $key.'s' : $plural);
-
-        return $this;
-    }
-
-    /**
-     * Registers a closure to run before the normalization or an expression builder to build it if null is provided.
-     *
-     * @param \Closure $closure
-     *
-     * @return ExprBuilder|NormalizationBuilder
-     */
-    public function before(\Closure $closure = null)
-    {
-        if (null !== $closure) {
-            $this->before[] = $closure;
-
-            return $this;
-        }
-
-        return $this->before[] = new ExprBuilder($this->node);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/NumericNodeDefinition.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/NumericNodeDefinition.php
deleted file mode 100644
index 8451e75b26..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/NumericNodeDefinition.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?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\Config\Definition\Builder;
-
-use Symfony\Component\Config\Definition\Exception\InvalidDefinitionException;
-
-/**
- * Abstract class that contains common code of integer and float node definitions.
- *
- * @author David Jeanmonod <david.jeanmonod@gmail.com>
- */
-abstract class NumericNodeDefinition extends ScalarNodeDefinition
-{
-    protected $min;
-    protected $max;
-
-    /**
-     * Ensures that the value is smaller than the given reference.
-     *
-     * @param mixed $max
-     *
-     * @return NumericNodeDefinition
-     *
-     * @throws \InvalidArgumentException when the constraint is inconsistent
-     */
-    public function max($max)
-    {
-        if (isset($this->min) && $this->min > $max) {
-            throw new \InvalidArgumentException(sprintf('You cannot define a max(%s) as you already have a min(%s)', $max, $this->min));
-        }
-        $this->max = $max;
-
-        return $this;
-    }
-
-    /**
-     * Ensures that the value is bigger than the given reference.
-     *
-     * @param mixed $min
-     *
-     * @return NumericNodeDefinition
-     *
-     * @throws \InvalidArgumentException when the constraint is inconsistent
-     */
-    public function min($min)
-    {
-        if (isset($this->max) && $this->max < $min) {
-            throw new \InvalidArgumentException(sprintf('You cannot define a min(%s) as you already have a max(%s)', $min, $this->max));
-        }
-        $this->min = $min;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @throws InvalidDefinitionException
-     */
-    public function cannotBeEmpty()
-    {
-        throw new InvalidDefinitionException('->cannotBeEmpty() is not applicable to NumericNodeDefinition.');
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/ParentNodeDefinitionInterface.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/ParentNodeDefinitionInterface.php
deleted file mode 100644
index 575495bb68..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/ParentNodeDefinitionInterface.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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\Config\Definition\Builder;
-
-/**
- * An interface that must be implemented by nodes which can have children.
- *
- * @author Victor Berchet <victor@suumit.com>
- */
-interface ParentNodeDefinitionInterface
-{
-    public function children();
-
-    public function append(NodeDefinition $node);
-
-    public function setBuilder(NodeBuilder $builder);
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/ScalarNodeDefinition.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/ScalarNodeDefinition.php
deleted file mode 100644
index 6170555ccf..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/ScalarNodeDefinition.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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\Config\Definition\Builder;
-
-use Symfony\Component\Config\Definition\ScalarNode;
-
-/**
- * This class provides a fluent interface for defining a node.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class ScalarNodeDefinition extends VariableNodeDefinition
-{
-    /**
-     * Instantiate a Node.
-     *
-     * @return ScalarNode The node
-     */
-    protected function instantiateNode()
-    {
-        return new ScalarNode($this->name, $this->parent);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/TreeBuilder.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/TreeBuilder.php
deleted file mode 100644
index 5d02848a09..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/TreeBuilder.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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\Config\Definition\Builder;
-
-use Symfony\Component\Config\Definition\NodeInterface;
-
-/**
- * This is the entry class for building a config tree.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class TreeBuilder implements NodeParentInterface
-{
-    protected $tree;
-    protected $root;
-    protected $builder;
-
-    /**
-     * Creates the root node.
-     *
-     * @param string      $name    The name of the root node
-     * @param string      $type    The type of the root node
-     * @param NodeBuilder $builder A custom node builder instance
-     *
-     * @return ArrayNodeDefinition|NodeDefinition The root node (as an ArrayNodeDefinition when the type is 'array')
-     *
-     * @throws \RuntimeException When the node type is not supported
-     */
-    public function root($name, $type = 'array', NodeBuilder $builder = null)
-    {
-        $builder = $builder ?: new NodeBuilder();
-
-        return $this->root = $builder->node($name, $type)->setParent($this);
-    }
-
-    /**
-     * Builds the tree.
-     *
-     * @return NodeInterface
-     *
-     * @throws \RuntimeException
-     */
-    public function buildTree()
-    {
-        if (null === $this->root) {
-            throw new \RuntimeException('The configuration tree has no root node.');
-        }
-        if (null !== $this->tree) {
-            return $this->tree;
-        }
-
-        return $this->tree = $this->root->getNode(true);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/ValidationBuilder.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/ValidationBuilder.php
deleted file mode 100644
index e885823892..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/ValidationBuilder.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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\Config\Definition\Builder;
-
-/**
- * This class builds validation conditions.
- *
- * @author Christophe Coevoet <stof@notk.org>
- */
-class ValidationBuilder
-{
-    protected $node;
-    public $rules = array();
-
-    /**
-     * Constructor.
-     *
-     * @param NodeDefinition $node The related node
-     */
-    public function __construct(NodeDefinition $node)
-    {
-        $this->node = $node;
-    }
-
-    /**
-     * Registers a closure to run as normalization or an expression builder to build it if null is provided.
-     *
-     * @param \Closure $closure
-     *
-     * @return ExprBuilder|ValidationBuilder
-     */
-    public function rule(\Closure $closure = null)
-    {
-        if (null !== $closure) {
-            $this->rules[] = $closure;
-
-            return $this;
-        }
-
-        return $this->rules[] = new ExprBuilder($this->node);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/VariableNodeDefinition.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/VariableNodeDefinition.php
deleted file mode 100644
index a46b7ea61d..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Builder/VariableNodeDefinition.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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\Config\Definition\Builder;
-
-use Symfony\Component\Config\Definition\VariableNode;
-
-/**
- * This class provides a fluent interface for defining a node.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class VariableNodeDefinition extends NodeDefinition
-{
-    /**
-     * Instantiate a Node.
-     *
-     * @return VariableNode The node
-     */
-    protected function instantiateNode()
-    {
-        return new VariableNode($this->name, $this->parent);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function createNode()
-    {
-        $node = $this->instantiateNode();
-
-        if (null !== $this->normalization) {
-            $node->setNormalizationClosures($this->normalization->before);
-        }
-
-        if (null !== $this->merge) {
-            $node->setAllowOverwrite($this->merge->allowOverwrite);
-        }
-
-        if (true === $this->default) {
-            $node->setDefaultValue($this->defaultValue);
-        }
-
-        $node->setAllowEmptyValue($this->allowEmptyValue);
-        $node->addEquivalentValue(null, $this->nullEquivalent);
-        $node->addEquivalentValue(true, $this->trueEquivalent);
-        $node->addEquivalentValue(false, $this->falseEquivalent);
-        $node->setRequired($this->required);
-
-        if (null !== $this->validation) {
-            $node->setFinalValidationClosures($this->validation->rules);
-        }
-
-        return $node;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/ConfigurationInterface.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/ConfigurationInterface.php
deleted file mode 100644
index d6456edb84..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/ConfigurationInterface.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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\Config\Definition;
-
-/**
- * Configuration interface.
- *
- * @author Victor Berchet <victor@suumit.com>
- */
-interface ConfigurationInterface
-{
-    /**
-     * Generates the configuration tree builder.
-     *
-     * @return \Symfony\Component\Config\Definition\Builder\TreeBuilder The tree builder
-     */
-    public function getConfigTreeBuilder();
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Dumper/XmlReferenceDumper.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Dumper/XmlReferenceDumper.php
deleted file mode 100644
index 2cc71b344e..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Dumper/XmlReferenceDumper.php
+++ /dev/null
@@ -1,304 +0,0 @@
-<?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\Config\Definition\Dumper;
-
-use Symfony\Component\Config\Definition\ConfigurationInterface;
-use Symfony\Component\Config\Definition\NodeInterface;
-use Symfony\Component\Config\Definition\ArrayNode;
-use Symfony\Component\Config\Definition\EnumNode;
-use Symfony\Component\Config\Definition\PrototypedArrayNode;
-
-/**
- * Dumps a XML reference configuration for the given configuration/node instance.
- *
- * @author Wouter J <waldio.webdesign@gmail.com>
- */
-class XmlReferenceDumper
-{
-    private $reference;
-
-    public function dump(ConfigurationInterface $configuration, $namespace = null)
-    {
-        return $this->dumpNode($configuration->getConfigTreeBuilder()->buildTree(), $namespace);
-    }
-
-    public function dumpNode(NodeInterface $node, $namespace = null)
-    {
-        $this->reference = '';
-        $this->writeNode($node, 0, true, $namespace);
-        $ref = $this->reference;
-        $this->reference = null;
-
-        return $ref;
-    }
-
-    /**
-     * @param NodeInterface $node
-     * @param int           $depth
-     * @param bool          $root      If the node is the root node
-     * @param string        $namespace The namespace of the node
-     */
-    private function writeNode(NodeInterface $node, $depth = 0, $root = false, $namespace = null)
-    {
-        $rootName = ($root ? 'config' : $node->getName());
-        $rootNamespace = ($namespace ?: ($root ? 'http://example.org/schema/dic/'.$node->getName() : null));
-
-        // xml remapping
-        if ($node->getParent()) {
-            $remapping = array_filter($node->getParent()->getXmlRemappings(), function ($mapping) use ($rootName) {
-                return $rootName === $mapping[1];
-            });
-
-            if (count($remapping)) {
-                list($singular) = current($remapping);
-                $rootName = $singular;
-            }
-        }
-        $rootName = str_replace('_', '-', $rootName);
-
-        $rootAttributes = array();
-        $rootAttributeComments = array();
-        $rootChildren = array();
-        $rootComments = array();
-
-        if ($node instanceof ArrayNode) {
-            $children = $node->getChildren();
-
-            // comments about the root node
-            if ($rootInfo = $node->getInfo()) {
-                $rootComments[] = $rootInfo;
-            }
-
-            if ($rootNamespace) {
-                $rootComments[] = 'Namespace: '.$rootNamespace;
-            }
-
-            // render prototyped nodes
-            if ($node instanceof PrototypedArrayNode) {
-                $prototype = $node->getPrototype();
-
-                $info = 'prototype';
-                if (null !== $prototype->getInfo()) {
-                    $info .= ': '.$prototype->getInfo();
-                }
-                array_unshift($rootComments, $info);
-
-                if ($key = $node->getKeyAttribute()) {
-                    $rootAttributes[$key] = str_replace('-', ' ', $rootName).' '.$key;
-                }
-
-                if ($prototype instanceof ArrayNode) {
-                    $children = $prototype->getChildren();
-                } else {
-                    if ($prototype->hasDefaultValue()) {
-                        $prototypeValue = $prototype->getDefaultValue();
-                    } else {
-                        switch (get_class($prototype)) {
-                            case 'Symfony\Component\Config\Definition\ScalarNode':
-                                $prototypeValue = 'scalar value';
-                                break;
-
-                            case 'Symfony\Component\Config\Definition\FloatNode':
-                            case 'Symfony\Component\Config\Definition\IntegerNode':
-                                $prototypeValue = 'numeric value';
-                                break;
-
-                            case 'Symfony\Component\Config\Definition\BooleanNode':
-                                $prototypeValue = 'true|false';
-                                break;
-
-                            case 'Symfony\Component\Config\Definition\EnumNode':
-                                $prototypeValue = implode('|', array_map('json_encode', $prototype->getValues()));
-                                break;
-
-                            default:
-                                $prototypeValue = 'value';
-                        }
-                    }
-                }
-            }
-
-            // get attributes and elements
-            foreach ($children as $child) {
-                if (!$child instanceof ArrayNode) {
-                    // get attributes
-
-                    // metadata
-                    $name = str_replace('_', '-', $child->getName());
-                    $value = '%%%%not_defined%%%%'; // use a string which isn't used in the normal world
-
-                    // comments
-                    $comments = array();
-                    if ($info = $child->getInfo()) {
-                        $comments[] = $info;
-                    }
-
-                    if ($example = $child->getExample()) {
-                        $comments[] = 'Example: '.$example;
-                    }
-
-                    if ($child->isRequired()) {
-                        $comments[] = 'Required';
-                    }
-
-                    if ($child instanceof EnumNode) {
-                        $comments[] = 'One of '.implode('; ', array_map('json_encode', $child->getValues()));
-                    }
-
-                    if (count($comments)) {
-                        $rootAttributeComments[$name] = implode(";\n", $comments);
-                    }
-
-                    // default values
-                    if ($child->hasDefaultValue()) {
-                        $value = $child->getDefaultValue();
-                    }
-
-                    // append attribute
-                    $rootAttributes[$name] = $value;
-                } else {
-                    // get elements
-                    $rootChildren[] = $child;
-                }
-            }
-        }
-
-        // render comments
-
-        // root node comment
-        if (count($rootComments)) {
-            foreach ($rootComments as $comment) {
-                $this->writeLine('<!-- '.$comment.' -->', $depth);
-            }
-        }
-
-        // attribute comments
-        if (count($rootAttributeComments)) {
-            foreach ($rootAttributeComments as $attrName => $comment) {
-                $commentDepth = $depth + 4 + strlen($attrName) + 2;
-                $commentLines = explode("\n", $comment);
-                $multiline = (count($commentLines) > 1);
-                $comment = implode(PHP_EOL.str_repeat(' ', $commentDepth), $commentLines);
-
-                if ($multiline) {
-                    $this->writeLine('<!--', $depth);
-                    $this->writeLine($attrName.': '.$comment, $depth + 4);
-                    $this->writeLine('-->', $depth);
-                } else {
-                    $this->writeLine('<!-- '.$attrName.': '.$comment.' -->', $depth);
-                }
-            }
-        }
-
-        // render start tag + attributes
-        $rootIsVariablePrototype = isset($prototypeValue);
-        $rootIsEmptyTag = (0 === count($rootChildren) && !$rootIsVariablePrototype);
-        $rootOpenTag = '<'.$rootName;
-        if (1 >= ($attributesCount = count($rootAttributes))) {
-            if (1 === $attributesCount) {
-                $rootOpenTag .= sprintf(' %s="%s"', current(array_keys($rootAttributes)), $this->writeValue(current($rootAttributes)));
-            }
-
-            $rootOpenTag .= $rootIsEmptyTag ? ' />' : '>';
-
-            if ($rootIsVariablePrototype) {
-                $rootOpenTag .= $prototypeValue.'</'.$rootName.'>';
-            }
-
-            $this->writeLine($rootOpenTag, $depth);
-        } else {
-            $this->writeLine($rootOpenTag, $depth);
-
-            $i = 1;
-
-            foreach ($rootAttributes as $attrName => $attrValue) {
-                $attr = sprintf('%s="%s"', $attrName, $this->writeValue($attrValue));
-
-                $this->writeLine($attr, $depth + 4);
-
-                if ($attributesCount === $i++) {
-                    $this->writeLine($rootIsEmptyTag ? '/>' : '>', $depth);
-
-                    if ($rootIsVariablePrototype) {
-                        $rootOpenTag .= $prototypeValue.'</'.$rootName.'>';
-                    }
-                }
-            }
-        }
-
-        // render children tags
-        foreach ($rootChildren as $child) {
-            $this->writeLine('');
-            $this->writeNode($child, $depth + 4);
-        }
-
-        // render end tag
-        if (!$rootIsEmptyTag && !$rootIsVariablePrototype) {
-            $this->writeLine('');
-
-            $rootEndTag = '</'.$rootName.'>';
-            $this->writeLine($rootEndTag, $depth);
-        }
-    }
-
-    /**
-     * Outputs a single config reference line.
-     *
-     * @param string $text
-     * @param int    $indent
-     */
-    private function writeLine($text, $indent = 0)
-    {
-        $indent = strlen($text) + $indent;
-        $format = '%'.$indent.'s';
-
-        $this->reference .= sprintf($format, $text).PHP_EOL;
-    }
-
-    /**
-     * Renders the string conversion of the value.
-     *
-     * @param mixed $value
-     *
-     * @return string
-     */
-    private function writeValue($value)
-    {
-        if ('%%%%not_defined%%%%' === $value) {
-            return '';
-        }
-
-        if (is_string($value) || is_numeric($value)) {
-            return $value;
-        }
-
-        if (false === $value) {
-            return 'false';
-        }
-
-        if (true === $value) {
-            return 'true';
-        }
-
-        if (null === $value) {
-            return 'null';
-        }
-
-        if (empty($value)) {
-            return '';
-        }
-
-        if (is_array($value)) {
-            return implode(',', $value);
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Dumper/YamlReferenceDumper.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Dumper/YamlReferenceDumper.php
deleted file mode 100644
index d38e6ebeff..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Dumper/YamlReferenceDumper.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?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\Config\Definition\Dumper;
-
-use Symfony\Component\Config\Definition\ConfigurationInterface;
-use Symfony\Component\Config\Definition\NodeInterface;
-use Symfony\Component\Config\Definition\ArrayNode;
-use Symfony\Component\Config\Definition\EnumNode;
-use Symfony\Component\Config\Definition\PrototypedArrayNode;
-use Symfony\Component\Yaml\Inline;
-
-/**
- * Dumps a Yaml reference configuration for the given configuration/node instance.
- *
- * @author Kevin Bond <kevinbond@gmail.com>
- */
-class YamlReferenceDumper
-{
-    private $reference;
-
-    public function dump(ConfigurationInterface $configuration)
-    {
-        return $this->dumpNode($configuration->getConfigTreeBuilder()->buildTree());
-    }
-
-    public function dumpNode(NodeInterface $node)
-    {
-        $this->reference = '';
-        $this->writeNode($node);
-        $ref = $this->reference;
-        $this->reference = null;
-
-        return $ref;
-    }
-
-    /**
-     * @param NodeInterface $node
-     * @param int           $depth
-     */
-    private function writeNode(NodeInterface $node, $depth = 0)
-    {
-        $comments = array();
-        $default = '';
-        $defaultArray = null;
-        $children = null;
-        $example = $node->getExample();
-
-        // defaults
-        if ($node instanceof ArrayNode) {
-            $children = $node->getChildren();
-
-            if ($node instanceof PrototypedArrayNode) {
-                $prototype = $node->getPrototype();
-
-                if ($prototype instanceof ArrayNode) {
-                    $children = $prototype->getChildren();
-                }
-
-                // check for attribute as key
-                if ($key = $node->getKeyAttribute()) {
-                    $keyNodeClass = 'Symfony\Component\Config\Definition\\'.($prototype instanceof ArrayNode ? 'ArrayNode' : 'ScalarNode');
-                    $keyNode = new $keyNodeClass($key, $node);
-
-                    $info = 'Prototype';
-                    if (null !== $prototype->getInfo()) {
-                        $info .= ': '.$prototype->getInfo();
-                    }
-                    $keyNode->setInfo($info);
-
-                    // add children
-                    foreach ($children as $childNode) {
-                        $keyNode->addChild($childNode);
-                    }
-                    $children = array($key => $keyNode);
-                }
-            }
-
-            if (!$children) {
-                if ($node->hasDefaultValue() && count($defaultArray = $node->getDefaultValue())) {
-                    $default = '';
-                } elseif (!is_array($example)) {
-                    $default = '[]';
-                }
-            }
-        } elseif ($node instanceof EnumNode) {
-            $comments[] = 'One of '.implode('; ', array_map('json_encode', $node->getValues()));
-            $default = $node->hasDefaultValue() ? Inline::dump($node->getDefaultValue()) : '~';
-        } else {
-            $default = '~';
-
-            if ($node->hasDefaultValue()) {
-                $default = $node->getDefaultValue();
-
-                if (is_array($default)) {
-                    if (count($defaultArray = $node->getDefaultValue())) {
-                        $default = '';
-                    } elseif (!is_array($example)) {
-                        $default = '[]';
-                    }
-                } else {
-                    $default = Inline::dump($default);
-                }
-            }
-        }
-
-        // required?
-        if ($node->isRequired()) {
-            $comments[] = 'Required';
-        }
-
-        // example
-        if ($example && !is_array($example)) {
-            $comments[] = 'Example: '.$example;
-        }
-
-        $default = (string) $default != '' ? ' '.$default : '';
-        $comments = count($comments) ? '# '.implode(', ', $comments) : '';
-
-        $text = rtrim(sprintf('%-20s %s %s', $node->getName().':', $default, $comments), ' ');
-
-        if ($info = $node->getInfo()) {
-            $this->writeLine('');
-            // indenting multi-line info
-            $info = str_replace("\n", sprintf("\n%".($depth * 4).'s# ', ' '), $info);
-            $this->writeLine('# '.$info, $depth * 4);
-        }
-
-        $this->writeLine($text, $depth * 4);
-
-        // output defaults
-        if ($defaultArray) {
-            $this->writeLine('');
-
-            $message = count($defaultArray) > 1 ? 'Defaults' : 'Default';
-
-            $this->writeLine('# '.$message.':', $depth * 4 + 4);
-
-            $this->writeArray($defaultArray, $depth + 1);
-        }
-
-        if (is_array($example)) {
-            $this->writeLine('');
-
-            $message = count($example) > 1 ? 'Examples' : 'Example';
-
-            $this->writeLine('# '.$message.':', $depth * 4 + 4);
-
-            $this->writeArray($example, $depth + 1);
-        }
-
-        if ($children) {
-            foreach ($children as $childNode) {
-                $this->writeNode($childNode, $depth + 1);
-            }
-        }
-    }
-
-    /**
-     * Outputs a single config reference line.
-     *
-     * @param string $text
-     * @param int    $indent
-     */
-    private function writeLine($text, $indent = 0)
-    {
-        $indent = strlen($text) + $indent;
-        $format = '%'.$indent.'s';
-
-        $this->reference .= sprintf($format, $text)."\n";
-    }
-
-    private function writeArray(array $array, $depth)
-    {
-        $isIndexed = array_values($array) === $array;
-
-        foreach ($array as $key => $value) {
-            if (is_array($value)) {
-                $val = '';
-            } else {
-                $val = $value;
-            }
-
-            if ($isIndexed) {
-                $this->writeLine('- '.$val, $depth * 4);
-            } else {
-                $this->writeLine(sprintf('%-20s %s', $key.':', $val), $depth * 4);
-            }
-
-            if (is_array($value)) {
-                $this->writeArray($value, $depth + 1);
-            }
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/EnumNode.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/EnumNode.php
deleted file mode 100644
index 9b4c4156e3..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/EnumNode.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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\Config\Definition;
-
-use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
-
-/**
- * Node which only allows a finite set of values.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class EnumNode extends ScalarNode
-{
-    private $values;
-
-    public function __construct($name, NodeInterface $parent = null, array $values = array())
-    {
-        $values = array_unique($values);
-        if (empty($values)) {
-            throw new \InvalidArgumentException('$values must contain at least one element.');
-        }
-
-        parent::__construct($name, $parent);
-        $this->values = $values;
-    }
-
-    public function getValues()
-    {
-        return $this->values;
-    }
-
-    protected function finalizeValue($value)
-    {
-        $value = parent::finalizeValue($value);
-
-        if (!in_array($value, $this->values, true)) {
-            $ex = new InvalidConfigurationException(sprintf(
-                'The value %s is not allowed for path "%s". Permissible values: %s',
-                json_encode($value),
-                $this->getPath(),
-                implode(', ', array_map('json_encode', $this->values))));
-            $ex->setPath($this->getPath());
-
-            throw $ex;
-        }
-
-        return $value;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Exception/DuplicateKeyException.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Exception/DuplicateKeyException.php
deleted file mode 100644
index 48dd9325e9..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Exception/DuplicateKeyException.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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\Config\Definition\Exception;
-
-/**
- * This exception is thrown whenever the key of an array is not unique. This can
- * only be the case if the configuration is coming from an XML file.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class DuplicateKeyException extends InvalidConfigurationException
-{
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Exception/Exception.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Exception/Exception.php
deleted file mode 100644
index 8933a49233..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Exception/Exception.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Config\Definition\Exception;
-
-/**
- * Base exception for all configuration exceptions.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class Exception extends \RuntimeException
-{
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Exception/ForbiddenOverwriteException.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Exception/ForbiddenOverwriteException.php
deleted file mode 100644
index 726c07fb8b..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Exception/ForbiddenOverwriteException.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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\Config\Definition\Exception;
-
-/**
- * This exception is thrown when a configuration path is overwritten from a
- * subsequent configuration file, but the entry node specifically forbids this.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class ForbiddenOverwriteException extends InvalidConfigurationException
-{
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Exception/InvalidConfigurationException.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Exception/InvalidConfigurationException.php
deleted file mode 100644
index 3dbc57b153..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Exception/InvalidConfigurationException.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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\Config\Definition\Exception;
-
-/**
- * A very general exception which can be thrown whenever non of the more specific
- * exceptions is suitable.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class InvalidConfigurationException extends Exception
-{
-    private $path;
-    private $containsHints = false;
-
-    public function setPath($path)
-    {
-        $this->path = $path;
-    }
-
-    public function getPath()
-    {
-        return $this->path;
-    }
-
-    /**
-     * Adds extra information that is suffixed to the original exception message.
-     *
-     * @param string $hint
-     */
-    public function addHint($hint)
-    {
-        if (!$this->containsHints) {
-            $this->message .= "\nHint: ".$hint;
-            $this->containsHints = true;
-        } else {
-            $this->message .= ', '.$hint;
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Exception/InvalidDefinitionException.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Exception/InvalidDefinitionException.php
deleted file mode 100644
index 98310dae02..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Exception/InvalidDefinitionException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Config\Definition\Exception;
-
-/**
- * Thrown when an error is detected in a node Definition.
- *
- * @author Victor Berchet <victor.berchet@suumit.com>
- */
-class InvalidDefinitionException extends Exception
-{
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Exception/InvalidTypeException.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Exception/InvalidTypeException.php
deleted file mode 100644
index d7ca8c9d09..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Exception/InvalidTypeException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Config\Definition\Exception;
-
-/**
- * This exception is thrown if an invalid type is encountered.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class InvalidTypeException extends InvalidConfigurationException
-{
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Exception/UnsetKeyException.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Exception/UnsetKeyException.php
deleted file mode 100644
index 863181a33f..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Exception/UnsetKeyException.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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\Config\Definition\Exception;
-
-/**
- * This exception is usually not encountered by the end-user, but only used
- * internally to signal the parent scope to unset a key.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class UnsetKeyException extends Exception
-{
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/FloatNode.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/FloatNode.php
deleted file mode 100644
index 5e1af17ada..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/FloatNode.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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\Config\Definition;
-
-use Symfony\Component\Config\Definition\Exception\InvalidTypeException;
-
-/**
- * This node represents a float value in the config tree.
- *
- * @author Jeanmonod David <david.jeanmonod@gmail.com>
- */
-class FloatNode extends NumericNode
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function validateType($value)
-    {
-        // Integers are also accepted, we just cast them
-        if (is_int($value)) {
-            $value = (float) $value;
-        }
-
-        if (!is_float($value)) {
-            $ex = new InvalidTypeException(sprintf('Invalid type for path "%s". Expected float, but got %s.', $this->getPath(), gettype($value)));
-            if ($hint = $this->getInfo()) {
-                $ex->addHint($hint);
-            }
-            $ex->setPath($this->getPath());
-
-            throw $ex;
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/IntegerNode.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/IntegerNode.php
deleted file mode 100644
index ba2307024c..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/IntegerNode.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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\Config\Definition;
-
-use Symfony\Component\Config\Definition\Exception\InvalidTypeException;
-
-/**
- * This node represents an integer value in the config tree.
- *
- * @author Jeanmonod David <david.jeanmonod@gmail.com>
- */
-class IntegerNode extends NumericNode
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function validateType($value)
-    {
-        if (!is_int($value)) {
-            $ex = new InvalidTypeException(sprintf('Invalid type for path "%s". Expected int, but got %s.', $this->getPath(), gettype($value)));
-            if ($hint = $this->getInfo()) {
-                $ex->addHint($hint);
-            }
-            $ex->setPath($this->getPath());
-
-            throw $ex;
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/NodeInterface.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/NodeInterface.php
deleted file mode 100644
index b9bddc4938..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/NodeInterface.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?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\Config\Definition;
-
-/**
- * Common Interface among all nodes.
- *
- * In most cases, it is better to inherit from BaseNode instead of implementing
- * this interface yourself.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-interface NodeInterface
-{
-    /**
-     * Returns the name of the node.
-     *
-     * @return string The name of the node
-     */
-    public function getName();
-
-    /**
-     * Returns the path of the node.
-     *
-     * @return string The node path
-     */
-    public function getPath();
-
-    /**
-     * Returns true when the node is required.
-     *
-     * @return bool If the node is required
-     */
-    public function isRequired();
-
-    /**
-     * Returns true when the node has a default value.
-     *
-     * @return bool If the node has a default value
-     */
-    public function hasDefaultValue();
-
-    /**
-     * Returns the default value of the node.
-     *
-     * @return mixed The default value
-     *
-     * @throws \RuntimeException if the node has no default value
-     */
-    public function getDefaultValue();
-
-    /**
-     * Normalizes the supplied value.
-     *
-     * @param mixed $value The value to normalize
-     *
-     * @return mixed The normalized value
-     */
-    public function normalize($value);
-
-    /**
-     * Merges two values together.
-     *
-     * @param mixed $leftSide
-     * @param mixed $rightSide
-     *
-     * @return mixed The merged values
-     */
-    public function merge($leftSide, $rightSide);
-
-    /**
-     * Finalizes a value.
-     *
-     * @param mixed $value The value to finalize
-     *
-     * @return mixed The finalized value
-     */
-    public function finalize($value);
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/NumericNode.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/NumericNode.php
deleted file mode 100644
index 439935e455..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/NumericNode.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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\Config\Definition;
-
-use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
-
-/**
- * This node represents a numeric value in the config tree.
- *
- * @author David Jeanmonod <david.jeanmonod@gmail.com>
- */
-class NumericNode extends ScalarNode
-{
-    protected $min;
-    protected $max;
-
-    public function __construct($name, NodeInterface $parent = null, $min = null, $max = null)
-    {
-        parent::__construct($name, $parent);
-        $this->min = $min;
-        $this->max = $max;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function finalizeValue($value)
-    {
-        $value = parent::finalizeValue($value);
-
-        $errorMsg = null;
-        if (isset($this->min) && $value < $this->min) {
-            $errorMsg = sprintf('The value %s is too small for path "%s". Should be greater than or equal to %s', $value, $this->getPath(), $this->min);
-        }
-        if (isset($this->max) && $value > $this->max) {
-            $errorMsg = sprintf('The value %s is too big for path "%s". Should be less than or equal to %s', $value, $this->getPath(), $this->max);
-        }
-        if (isset($errorMsg)) {
-            $ex = new InvalidConfigurationException($errorMsg);
-            $ex->setPath($this->getPath());
-            throw $ex;
-        }
-
-        return $value;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function isValueEmpty($value)
-    {
-        // a numeric value cannot be empty
-        return false;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Processor.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Processor.php
deleted file mode 100644
index 025e69378f..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/Processor.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?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\Config\Definition;
-
-/**
- * This class is the entry point for config normalization/merging/finalization.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class Processor
-{
-    /**
-     * Processes an array of configurations.
-     *
-     * @param NodeInterface $configTree The node tree describing the configuration
-     * @param array         $configs    An array of configuration items to process
-     *
-     * @return array The processed configuration
-     */
-    public function process(NodeInterface $configTree, array $configs)
-    {
-        $currentConfig = array();
-        foreach ($configs as $config) {
-            $config = $configTree->normalize($config);
-            $currentConfig = $configTree->merge($currentConfig, $config);
-        }
-
-        return $configTree->finalize($currentConfig);
-    }
-
-    /**
-     * Processes an array of configurations.
-     *
-     * @param ConfigurationInterface $configuration The configuration class
-     * @param array                  $configs       An array of configuration items to process
-     *
-     * @return array The processed configuration
-     */
-    public function processConfiguration(ConfigurationInterface $configuration, array $configs)
-    {
-        return $this->process($configuration->getConfigTreeBuilder()->buildTree(), $configs);
-    }
-
-    /**
-     * Normalizes a configuration entry.
-     *
-     * This method returns a normalize configuration array for a given key
-     * to remove the differences due to the original format (YAML and XML mainly).
-     *
-     * Here is an example.
-     *
-     * The configuration in XML:
-     *
-     * <twig:extension>twig.extension.foo</twig:extension>
-     * <twig:extension>twig.extension.bar</twig:extension>
-     *
-     * And the same configuration in YAML:
-     *
-     * extensions: ['twig.extension.foo', 'twig.extension.bar']
-     *
-     * @param array  $config A config array
-     * @param string $key    The key to normalize
-     * @param string $plural The plural form of the key if it is irregular
-     *
-     * @return array
-     */
-    public static function normalizeConfig($config, $key, $plural = null)
-    {
-        if (null === $plural) {
-            $plural = $key.'s';
-        }
-
-        if (isset($config[$plural])) {
-            return $config[$plural];
-        }
-
-        if (isset($config[$key])) {
-            if (is_string($config[$key]) || !is_int(key($config[$key]))) {
-                // only one
-                return  array($config[$key]);
-            }
-
-            return  $config[$key];
-        }
-
-        return array();
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/PrototypeNodeInterface.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/PrototypeNodeInterface.php
deleted file mode 100644
index 8bbb84d4dc..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/PrototypeNodeInterface.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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\Config\Definition;
-
-/**
- * This interface must be implemented by nodes which can be used as prototypes.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-interface PrototypeNodeInterface extends NodeInterface
-{
-    /**
-     * Sets the name of the node.
-     *
-     * @param string $name The name of the node
-     */
-    public function setName($name);
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/PrototypedArrayNode.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/PrototypedArrayNode.php
deleted file mode 100644
index ae1a76663a..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/PrototypedArrayNode.php
+++ /dev/null
@@ -1,331 +0,0 @@
-<?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\Config\Definition;
-
-use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
-use Symfony\Component\Config\Definition\Exception\DuplicateKeyException;
-use Symfony\Component\Config\Definition\Exception\UnsetKeyException;
-use Symfony\Component\Config\Definition\Exception\Exception;
-
-/**
- * Represents a prototyped Array node in the config tree.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class PrototypedArrayNode extends ArrayNode
-{
-    protected $prototype;
-    protected $keyAttribute;
-    protected $removeKeyAttribute = false;
-    protected $minNumberOfElements = 0;
-    protected $defaultValue = array();
-    protected $defaultChildren;
-
-    /**
-     * Sets the minimum number of elements that a prototype based node must
-     * contain. By default this is zero, meaning no elements.
-     *
-     * @param int $number
-     */
-    public function setMinNumberOfElements($number)
-    {
-        $this->minNumberOfElements = $number;
-    }
-
-    /**
-     * Sets the attribute which value is to be used as key.
-     *
-     * This is useful when you have an indexed array that should be an
-     * associative array. You can select an item from within the array
-     * to be the key of the particular item. For example, if "id" is the
-     * "key", then:
-     *
-     *     array(
-     *         array('id' => 'my_name', 'foo' => 'bar'),
-     *     );
-     *
-     *  becomes
-     *
-     *      array(
-     *          'my_name' => array('foo' => 'bar'),
-     *      );
-     *
-     * If you'd like "'id' => 'my_name'" to still be present in the resulting
-     * array, then you can set the second argument of this method to false.
-     *
-     * @param string $attribute The name of the attribute which value is to be used as a key
-     * @param bool   $remove    Whether or not to remove the key
-     */
-    public function setKeyAttribute($attribute, $remove = true)
-    {
-        $this->keyAttribute = $attribute;
-        $this->removeKeyAttribute = $remove;
-    }
-
-    /**
-     * Retrieves the name of the attribute which value should be used as key.
-     *
-     * @return string The name of the attribute
-     */
-    public function getKeyAttribute()
-    {
-        return $this->keyAttribute;
-    }
-
-    /**
-     * Sets the default value of this node.
-     *
-     * @param string $value
-     *
-     * @throws \InvalidArgumentException if the default value is not an array
-     */
-    public function setDefaultValue($value)
-    {
-        if (!is_array($value)) {
-            throw new \InvalidArgumentException($this->getPath().': the default value of an array node has to be an array.');
-        }
-
-        $this->defaultValue = $value;
-    }
-
-    /**
-     * Checks if the node has a default value.
-     *
-     * @return bool
-     */
-    public function hasDefaultValue()
-    {
-        return true;
-    }
-
-    /**
-     * Adds default children when none are set.
-     *
-     * @param int|string|array|null $children The number of children|The child name|The children names to be added
-     */
-    public function setAddChildrenIfNoneSet($children = array('defaults'))
-    {
-        if (null === $children) {
-            $this->defaultChildren = array('defaults');
-        } else {
-            $this->defaultChildren = is_int($children) && $children > 0 ? range(1, $children) : (array) $children;
-        }
-    }
-
-    /**
-     * Retrieves the default value.
-     *
-     * The default value could be either explicited or derived from the prototype
-     * default value.
-     *
-     * @return array The default value
-     */
-    public function getDefaultValue()
-    {
-        if (null !== $this->defaultChildren) {
-            $default = $this->prototype->hasDefaultValue() ? $this->prototype->getDefaultValue() : array();
-            $defaults = array();
-            foreach (array_values($this->defaultChildren) as $i => $name) {
-                $defaults[null === $this->keyAttribute ? $i : $name] = $default;
-            }
-
-            return $defaults;
-        }
-
-        return $this->defaultValue;
-    }
-
-    /**
-     * Sets the node prototype.
-     *
-     * @param PrototypeNodeInterface $node
-     */
-    public function setPrototype(PrototypeNodeInterface $node)
-    {
-        $this->prototype = $node;
-    }
-
-    /**
-     * Retrieves the prototype.
-     *
-     * @return PrototypeNodeInterface The prototype
-     */
-    public function getPrototype()
-    {
-        return $this->prototype;
-    }
-
-    /**
-     * Disable adding concrete children for prototyped nodes.
-     *
-     * @param NodeInterface $node The child node to add
-     *
-     * @throws Exception
-     */
-    public function addChild(NodeInterface $node)
-    {
-        throw new Exception('A prototyped array node can not have concrete children.');
-    }
-
-    /**
-     * Finalizes the value of this node.
-     *
-     * @param mixed $value
-     *
-     * @return mixed The finalized value
-     *
-     * @throws UnsetKeyException
-     * @throws InvalidConfigurationException if the node doesn't have enough children
-     */
-    protected function finalizeValue($value)
-    {
-        if (false === $value) {
-            $msg = sprintf('Unsetting key for path "%s", value: %s', $this->getPath(), json_encode($value));
-            throw new UnsetKeyException($msg);
-        }
-
-        foreach ($value as $k => $v) {
-            $this->prototype->setName($k);
-            try {
-                $value[$k] = $this->prototype->finalize($v);
-            } catch (UnsetKeyException $e) {
-                unset($value[$k]);
-            }
-        }
-
-        if (count($value) < $this->minNumberOfElements) {
-            $msg = sprintf('The path "%s" should have at least %d element(s) defined.', $this->getPath(), $this->minNumberOfElements);
-            $ex = new InvalidConfigurationException($msg);
-            $ex->setPath($this->getPath());
-
-            throw $ex;
-        }
-
-        return $value;
-    }
-
-    /**
-     * Normalizes the value.
-     *
-     * @param mixed $value The value to normalize
-     *
-     * @return mixed The normalized value
-     *
-     * @throws InvalidConfigurationException
-     * @throws DuplicateKeyException
-     */
-    protected function normalizeValue($value)
-    {
-        if (false === $value) {
-            return $value;
-        }
-
-        $value = $this->remapXml($value);
-
-        $isAssoc = array_keys($value) !== range(0, count($value) - 1);
-        $normalized = array();
-        foreach ($value as $k => $v) {
-            if (null !== $this->keyAttribute && is_array($v)) {
-                if (!isset($v[$this->keyAttribute]) && is_int($k) && !$isAssoc) {
-                    $msg = sprintf('The attribute "%s" must be set for path "%s".', $this->keyAttribute, $this->getPath());
-                    $ex = new InvalidConfigurationException($msg);
-                    $ex->setPath($this->getPath());
-
-                    throw $ex;
-                } elseif (isset($v[$this->keyAttribute])) {
-                    $k = $v[$this->keyAttribute];
-
-                    // remove the key attribute when required
-                    if ($this->removeKeyAttribute) {
-                        unset($v[$this->keyAttribute]);
-                    }
-
-                    // if only "value" is left
-                    if (1 == count($v) && isset($v['value'])) {
-                        $v = $v['value'];
-                    }
-                }
-
-                if (array_key_exists($k, $normalized)) {
-                    $msg = sprintf('Duplicate key "%s" for path "%s".', $k, $this->getPath());
-                    $ex = new DuplicateKeyException($msg);
-                    $ex->setPath($this->getPath());
-
-                    throw $ex;
-                }
-            }
-
-            $this->prototype->setName($k);
-            if (null !== $this->keyAttribute || $isAssoc) {
-                $normalized[$k] = $this->prototype->normalize($v);
-            } else {
-                $normalized[] = $this->prototype->normalize($v);
-            }
-        }
-
-        return $normalized;
-    }
-
-    /**
-     * Merges values together.
-     *
-     * @param mixed $leftSide  The left side to merge
-     * @param mixed $rightSide The right side to merge
-     *
-     * @return mixed The merged values
-     *
-     * @throws InvalidConfigurationException
-     * @throws \RuntimeException
-     */
-    protected function mergeValues($leftSide, $rightSide)
-    {
-        if (false === $rightSide) {
-            // if this is still false after the last config has been merged the
-            // finalization pass will take care of removing this key entirely
-            return false;
-        }
-
-        if (false === $leftSide || !$this->performDeepMerging) {
-            return $rightSide;
-        }
-
-        foreach ($rightSide as $k => $v) {
-            // prototype, and key is irrelevant, so simply append the element
-            if (null === $this->keyAttribute) {
-                $leftSide[] = $v;
-                continue;
-            }
-
-            // no conflict
-            if (!array_key_exists($k, $leftSide)) {
-                if (!$this->allowNewKeys) {
-                    $ex = new InvalidConfigurationException(sprintf(
-                        'You are not allowed to define new elements for path "%s". '.
-                        'Please define all elements for this path in one config file.',
-                        $this->getPath()
-                    ));
-                    $ex->setPath($this->getPath());
-
-                    throw $ex;
-                }
-
-                $leftSide[$k] = $v;
-                continue;
-            }
-
-            $this->prototype->setName($k);
-            $leftSide[$k] = $this->prototype->merge($leftSide[$k], $v);
-        }
-
-        return $leftSide;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/ScalarNode.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/ScalarNode.php
deleted file mode 100644
index 6b3fd0b68f..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/ScalarNode.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?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\Config\Definition;
-
-use Symfony\Component\Config\Definition\Exception\InvalidTypeException;
-
-/**
- * This node represents a scalar value in the config tree.
- *
- * The following values are considered scalars:
- *   * booleans
- *   * strings
- *   * null
- *   * integers
- *   * floats
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- */
-class ScalarNode extends VariableNode
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function validateType($value)
-    {
-        if (!is_scalar($value) && null !== $value) {
-            $ex = new InvalidTypeException(sprintf(
-                'Invalid type for path "%s". Expected scalar, but got %s.',
-                $this->getPath(),
-                gettype($value)
-            ));
-            if ($hint = $this->getInfo()) {
-                $ex->addHint($hint);
-            }
-            $ex->setPath($this->getPath());
-
-            throw $ex;
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function isValueEmpty($value)
-    {
-        return null === $value || '' === $value;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/VariableNode.php b/core/src/core/classes/guzzle/vendor/symfony/config/Definition/VariableNode.php
deleted file mode 100644
index a9c35284cd..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Definition/VariableNode.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?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\Config\Definition;
-
-use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
-
-/**
- * This node represents a value of variable type in the config tree.
- *
- * This node is intended for values of arbitrary type.
- * Any PHP type is accepted as a value.
- *
- * @author Jeremy Mikola <jmikola@gmail.com>
- */
-class VariableNode extends BaseNode implements PrototypeNodeInterface
-{
-    protected $defaultValueSet = false;
-    protected $defaultValue;
-    protected $allowEmptyValue = true;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setDefaultValue($value)
-    {
-        $this->defaultValueSet = true;
-        $this->defaultValue = $value;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function hasDefaultValue()
-    {
-        return $this->defaultValueSet;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getDefaultValue()
-    {
-        $v = $this->defaultValue;
-
-        return $v instanceof \Closure ? $v() : $v;
-    }
-
-    /**
-     * Sets if this node is allowed to have an empty value.
-     *
-     * @param bool $boolean True if this entity will accept empty values
-     */
-    public function setAllowEmptyValue($boolean)
-    {
-        $this->allowEmptyValue = (bool) $boolean;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function validateType($value)
-    {
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function finalizeValue($value)
-    {
-        if (!$this->allowEmptyValue && $this->isValueEmpty($value)) {
-            $ex = new InvalidConfigurationException(sprintf(
-                'The path "%s" cannot contain an empty value, but got %s.',
-                $this->getPath(),
-                json_encode($value)
-            ));
-            if ($hint = $this->getInfo()) {
-                $ex->addHint($hint);
-            }
-            $ex->setPath($this->getPath());
-
-            throw $ex;
-        }
-
-        return $value;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function normalizeValue($value)
-    {
-        return $value;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function mergeValues($leftSide, $rightSide)
-    {
-        return $rightSide;
-    }
-
-    /**
-     * Evaluates if the given value is to be treated as empty.
-     *
-     * By default, PHP's empty() function is used to test for emptiness. This
-     * method may be overridden by subtypes to better match their understanding
-     * of empty data.
-     *
-     * @param mixed $value
-     *
-     * @return bool
-     */
-    protected function isValueEmpty($value)
-    {
-        return empty($value);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Exception/FileLoaderImportCircularReferenceException.php b/core/src/core/classes/guzzle/vendor/symfony/config/Exception/FileLoaderImportCircularReferenceException.php
deleted file mode 100644
index 6a3b01cfbe..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Exception/FileLoaderImportCircularReferenceException.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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\Config\Exception;
-
-/**
- * Exception class for when a circular reference is detected when importing resources.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class FileLoaderImportCircularReferenceException extends FileLoaderLoadException
-{
-    public function __construct(array $resources, $code = null, $previous = null)
-    {
-        $message = sprintf('Circular reference detected in "%s" ("%s" > "%s").', $this->varToString($resources[0]), implode('" > "', $resources), $resources[0]);
-
-        \Exception::__construct($message, $code, $previous);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Exception/FileLoaderLoadException.php b/core/src/core/classes/guzzle/vendor/symfony/config/Exception/FileLoaderLoadException.php
deleted file mode 100644
index 6af3dd0a6d..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Exception/FileLoaderLoadException.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?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\Config\Exception;
-
-/**
- * Exception class for when a resource cannot be loaded or imported.
- *
- * @author Ryan Weaver <ryan@thatsquality.com>
- */
-class FileLoaderLoadException extends \Exception
-{
-    /**
-     * @param string     $resource       The resource that could not be imported
-     * @param string     $sourceResource The original resource importing the new resource
-     * @param int        $code           The error code
-     * @param \Exception $previous       A previous exception
-     */
-    public function __construct($resource, $sourceResource = null, $code = null, $previous = null)
-    {
-        $message = '';
-        if ($previous) {
-            // Include the previous exception, to help the user see what might be the underlying cause
-
-            // Trim the trailing period of the previous message. We only want 1 period remove so no rtrim...
-            if ('.' === substr($previous->getMessage(), -1)) {
-                $trimmedMessage = substr($previous->getMessage(), 0, -1);
-                $message .= sprintf('%s', $trimmedMessage).' in ';
-            } else {
-                $message .= sprintf('%s', $previous->getMessage()).' in ';
-            }
-            $message .= $resource.' ';
-
-            // show tweaked trace to complete the human readable sentence
-            if (null === $sourceResource) {
-                $message .= sprintf('(which is loaded in resource "%s")', $this->varToString($resource));
-            } else {
-                $message .= sprintf('(which is being imported from "%s")', $this->varToString($sourceResource));
-            }
-            $message .= '.';
-
-        // if there's no previous message, present it the default way
-        } elseif (null === $sourceResource) {
-            $message .= sprintf('Cannot load resource "%s".', $this->varToString($resource));
-        } else {
-            $message .= sprintf('Cannot import resource "%s" from "%s".', $this->varToString($resource), $this->varToString($sourceResource));
-        }
-
-        // Is the resource located inside a bundle?
-        if ('@' === $resource[0]) {
-            $parts = explode(DIRECTORY_SEPARATOR, $resource);
-            $bundle = substr($parts[0], 1);
-            $message .= sprintf(' Make sure the "%s" bundle is correctly registered and loaded in the application kernel class.', $bundle);
-            $message .= sprintf(' If the bundle is registered, make sure the bundle path "%s" is not empty.', $resource);
-        }
-
-        parent::__construct($message, $code, $previous);
-    }
-
-    protected function varToString($var)
-    {
-        if (is_object($var)) {
-            return sprintf('Object(%s)', get_class($var));
-        }
-
-        if (is_array($var)) {
-            $a = array();
-            foreach ($var as $k => $v) {
-                $a[] = sprintf('%s => %s', $k, $this->varToString($v));
-            }
-
-            return sprintf('Array(%s)', implode(', ', $a));
-        }
-
-        if (is_resource($var)) {
-            return sprintf('Resource(%s)', get_resource_type($var));
-        }
-
-        if (null === $var) {
-            return 'null';
-        }
-
-        if (false === $var) {
-            return 'false';
-        }
-
-        if (true === $var) {
-            return 'true';
-        }
-
-        return (string) $var;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/FileLocator.php b/core/src/core/classes/guzzle/vendor/symfony/config/FileLocator.php
deleted file mode 100644
index c6600c7783..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/FileLocator.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?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\Config;
-
-/**
- * FileLocator uses an array of pre-defined paths to find files.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class FileLocator implements FileLocatorInterface
-{
-    protected $paths;
-
-    /**
-     * Constructor.
-     *
-     * @param string|array $paths A path or an array of paths where to look for resources
-     */
-    public function __construct($paths = array())
-    {
-        $this->paths = (array) $paths;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function locate($name, $currentPath = null, $first = true)
-    {
-        if ('' == $name) {
-            throw new \InvalidArgumentException('An empty file name is not valid to be located.');
-        }
-
-        if ($this->isAbsolutePath($name)) {
-            if (!file_exists($name)) {
-                throw new \InvalidArgumentException(sprintf('The file "%s" does not exist.', $name));
-            }
-
-            return $name;
-        }
-
-        $paths = $this->paths;
-
-        if (null !== $currentPath) {
-            array_unshift($paths, $currentPath);
-        }
-
-        $paths = array_unique($paths);
-        $filepaths = array();
-
-        foreach ($paths as $path) {
-            if (file_exists($file = $path.DIRECTORY_SEPARATOR.$name)) {
-                if (true === $first) {
-                    return $file;
-                }
-                $filepaths[] = $file;
-            }
-        }
-
-        if (!$filepaths) {
-            throw new \InvalidArgumentException(sprintf('The file "%s" does not exist (in: %s).', $name, implode(', ', $paths)));
-        }
-
-        return $filepaths;
-    }
-
-    /**
-     * Returns whether the file path is an absolute path.
-     *
-     * @param string $file A file path
-     *
-     * @return bool
-     */
-    private function isAbsolutePath($file)
-    {
-        if ($file[0] === '/' || $file[0] === '\\'
-            || (strlen($file) > 3 && ctype_alpha($file[0])
-                && $file[1] === ':'
-                && ($file[2] === '\\' || $file[2] === '/')
-            )
-            || null !== parse_url($file, PHP_URL_SCHEME)
-        ) {
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/FileLocatorInterface.php b/core/src/core/classes/guzzle/vendor/symfony/config/FileLocatorInterface.php
deleted file mode 100644
index 66057982db..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/FileLocatorInterface.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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\Config;
-
-/**
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface FileLocatorInterface
-{
-    /**
-     * Returns a full path for a given file name.
-     *
-     * @param string      $name        The file name to locate
-     * @param string|null $currentPath The current path
-     * @param bool        $first       Whether to return the first occurrence or an array of filenames
-     *
-     * @return string|array The full path to the file or an array of file paths
-     *
-     * @throws \InvalidArgumentException When file is not found
-     */
-    public function locate($name, $currentPath = null, $first = true);
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/LICENSE b/core/src/core/classes/guzzle/vendor/symfony/config/LICENSE
deleted file mode 100644
index 12a74531e4..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2004-2016 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/src/core/classes/guzzle/vendor/symfony/config/Loader/DelegatingLoader.php b/core/src/core/classes/guzzle/vendor/symfony/config/Loader/DelegatingLoader.php
deleted file mode 100644
index 3097878bf0..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Loader/DelegatingLoader.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?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\Config\Loader;
-
-use Symfony\Component\Config\Exception\FileLoaderLoadException;
-
-/**
- * DelegatingLoader delegates loading to other loaders using a loader resolver.
- *
- * This loader acts as an array of LoaderInterface objects - each having
- * a chance to load a given resource (handled by the resolver)
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class DelegatingLoader extends Loader
-{
-    /**
-     * Constructor.
-     *
-     * @param LoaderResolverInterface $resolver A LoaderResolverInterface instance
-     */
-    public function __construct(LoaderResolverInterface $resolver)
-    {
-        $this->resolver = $resolver;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function load($resource, $type = null)
-    {
-        if (false === $loader = $this->resolver->resolve($resource, $type)) {
-            throw new FileLoaderLoadException($resource);
-        }
-
-        return $loader->load($resource, $type);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supports($resource, $type = null)
-    {
-        return false !== $this->resolver->resolve($resource, $type);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Loader/FileLoader.php b/core/src/core/classes/guzzle/vendor/symfony/config/Loader/FileLoader.php
deleted file mode 100644
index 3bd3fae17c..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Loader/FileLoader.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?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\Config\Loader;
-
-use Symfony\Component\Config\FileLocatorInterface;
-use Symfony\Component\Config\Exception\FileLoaderLoadException;
-use Symfony\Component\Config\Exception\FileLoaderImportCircularReferenceException;
-
-/**
- * FileLoader is the abstract class used by all built-in loaders that are file based.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class FileLoader extends Loader
-{
-    /**
-     * @var array
-     */
-    protected static $loading = array();
-
-    /**
-     * @var FileLocatorInterface
-     */
-    protected $locator;
-
-    private $currentDir;
-
-    /**
-     * Constructor.
-     *
-     * @param FileLocatorInterface $locator A FileLocatorInterface instance
-     */
-    public function __construct(FileLocatorInterface $locator)
-    {
-        $this->locator = $locator;
-    }
-
-    /**
-     * Sets the current directory.
-     *
-     * @param string $dir
-     */
-    public function setCurrentDir($dir)
-    {
-        $this->currentDir = $dir;
-    }
-
-    /**
-     * Returns the file locator used by this loader.
-     *
-     * @return FileLocatorInterface
-     */
-    public function getLocator()
-    {
-        return $this->locator;
-    }
-
-    /**
-     * Imports a resource.
-     *
-     * @param mixed       $resource       A Resource
-     * @param string|null $type           The resource type or null if unknown
-     * @param bool        $ignoreErrors   Whether to ignore import errors or not
-     * @param string|null $sourceResource The original resource importing the new resource
-     *
-     * @return mixed
-     *
-     * @throws FileLoaderLoadException
-     * @throws FileLoaderImportCircularReferenceException
-     */
-    public function import($resource, $type = null, $ignoreErrors = false, $sourceResource = null)
-    {
-        try {
-            $loader = $this->resolve($resource, $type);
-
-            if ($loader instanceof self && null !== $this->currentDir) {
-                $resource = $loader->getLocator()->locate($resource, $this->currentDir, false);
-            }
-
-            $resources = is_array($resource) ? $resource : array($resource);
-            for ($i = 0; $i < $resourcesCount = count($resources); ++$i) {
-                if (isset(self::$loading[$resources[$i]])) {
-                    if ($i == $resourcesCount - 1) {
-                        throw new FileLoaderImportCircularReferenceException(array_keys(self::$loading));
-                    }
-                } else {
-                    $resource = $resources[$i];
-                    break;
-                }
-            }
-            self::$loading[$resource] = true;
-
-            try {
-                $ret = $loader->load($resource, $type);
-            } catch (\Exception $e) {
-                unset(self::$loading[$resource]);
-                throw $e;
-            }
-
-                unset(self::$loading[$resource]);
-
-            return $ret;
-        } catch (FileLoaderImportCircularReferenceException $e) {
-            throw $e;
-        } catch (\Exception $e) {
-            if (!$ignoreErrors) {
-                // prevent embedded imports from nesting multiple exceptions
-                if ($e instanceof FileLoaderLoadException) {
-                    throw $e;
-                }
-
-                throw new FileLoaderLoadException($resource, $sourceResource, null, $e);
-            }
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Loader/Loader.php b/core/src/core/classes/guzzle/vendor/symfony/config/Loader/Loader.php
deleted file mode 100644
index de4e127386..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Loader/Loader.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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\Config\Loader;
-
-use Symfony\Component\Config\Exception\FileLoaderLoadException;
-
-/**
- * Loader is the abstract class used by all built-in loaders.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-abstract class Loader implements LoaderInterface
-{
-    protected $resolver;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getResolver()
-    {
-        return $this->resolver;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setResolver(LoaderResolverInterface $resolver)
-    {
-        $this->resolver = $resolver;
-    }
-
-    /**
-     * Imports a resource.
-     *
-     * @param mixed       $resource A resource
-     * @param string|null $type     The resource type or null if unknown
-     *
-     * @return mixed
-     */
-    public function import($resource, $type = null)
-    {
-        return $this->resolve($resource, $type)->load($resource, $type);
-    }
-
-    /**
-     * Finds a loader able to load an imported resource.
-     *
-     * @param mixed       $resource A resource
-     * @param string|null $type     The resource type or null if unknown
-     *
-     * @return LoaderInterface A LoaderInterface instance
-     *
-     * @throws FileLoaderLoadException If no loader is found
-     */
-    public function resolve($resource, $type = null)
-    {
-        if ($this->supports($resource, $type)) {
-            return $this;
-        }
-
-        $loader = null === $this->resolver ? false : $this->resolver->resolve($resource, $type);
-
-        if (false === $loader) {
-            throw new FileLoaderLoadException($resource);
-        }
-
-        return $loader;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Loader/LoaderInterface.php b/core/src/core/classes/guzzle/vendor/symfony/config/Loader/LoaderInterface.php
deleted file mode 100644
index dd0a85a6b0..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Loader/LoaderInterface.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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\Config\Loader;
-
-/**
- * LoaderInterface is the interface implemented by all loader classes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface LoaderInterface
-{
-    /**
-     * Loads a resource.
-     *
-     * @param mixed       $resource The resource
-     * @param string|null $type     The resource type or null if unknown
-     *
-     * @throws \Exception If something went wrong
-     */
-    public function load($resource, $type = null);
-
-    /**
-     * Returns whether this class supports the given resource.
-     *
-     * @param mixed       $resource A resource
-     * @param string|null $type     The resource type or null if unknown
-     *
-     * @return bool True if this class supports the given resource, false otherwise
-     */
-    public function supports($resource, $type = null);
-
-    /**
-     * Gets the loader resolver.
-     *
-     * @return LoaderResolverInterface A LoaderResolverInterface instance
-     */
-    public function getResolver();
-
-    /**
-     * Sets the loader resolver.
-     *
-     * @param LoaderResolverInterface $resolver A LoaderResolverInterface instance
-     */
-    public function setResolver(LoaderResolverInterface $resolver);
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Loader/LoaderResolver.php b/core/src/core/classes/guzzle/vendor/symfony/config/Loader/LoaderResolver.php
deleted file mode 100644
index dc6846df8d..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Loader/LoaderResolver.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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\Config\Loader;
-
-/**
- * LoaderResolver selects a loader for a given resource.
- *
- * A resource can be anything (e.g. a full path to a config file or a Closure).
- * Each loader determines whether it can load a resource and how.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class LoaderResolver implements LoaderResolverInterface
-{
-    /**
-     * @var LoaderInterface[] An array of LoaderInterface objects
-     */
-    private $loaders = array();
-
-    /**
-     * Constructor.
-     *
-     * @param LoaderInterface[] $loaders An array of loaders
-     */
-    public function __construct(array $loaders = array())
-    {
-        foreach ($loaders as $loader) {
-            $this->addLoader($loader);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function resolve($resource, $type = null)
-    {
-        foreach ($this->loaders as $loader) {
-            if ($loader->supports($resource, $type)) {
-                return $loader;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Adds a loader.
-     *
-     * @param LoaderInterface $loader A LoaderInterface instance
-     */
-    public function addLoader(LoaderInterface $loader)
-    {
-        $this->loaders[] = $loader;
-        $loader->setResolver($this);
-    }
-
-    /**
-     * Returns the registered loaders.
-     *
-     * @return LoaderInterface[] An array of LoaderInterface instances
-     */
-    public function getLoaders()
-    {
-        return $this->loaders;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Loader/LoaderResolverInterface.php b/core/src/core/classes/guzzle/vendor/symfony/config/Loader/LoaderResolverInterface.php
deleted file mode 100644
index 40f1a1a63f..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Loader/LoaderResolverInterface.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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\Config\Loader;
-
-/**
- * LoaderResolverInterface selects a loader for a given resource.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface LoaderResolverInterface
-{
-    /**
-     * Returns a loader able to load the resource.
-     *
-     * @param mixed       $resource A resource
-     * @param string|null $type     The resource type or null if unknown
-     *
-     * @return LoaderInterface|false The loader or false if none is able to load the resource
-     */
-    public function resolve($resource, $type = null);
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/README.md b/core/src/core/classes/guzzle/vendor/symfony/config/README.md
deleted file mode 100644
index bf400da196..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-Config Component
-================
-
-The Config component provides several classes to help you find, load, combine,
-autofill and validate configuration values of any kind, whatever their source
-may be (YAML, XML, INI files, or for instance a database).
-
-Resources
----------
-
-  * [Documentation](https://symfony.com/doc/current/components/config/index.html)
-  * [Contributing](https://symfony.com/doc/current/contributing/index.html)
-  * [Report issues](https://github.com/symfony/symfony/issues) and
-    [send Pull Requests](https://github.com/symfony/symfony/pulls)
-    in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Resource/DirectoryResource.php b/core/src/core/classes/guzzle/vendor/symfony/config/Resource/DirectoryResource.php
deleted file mode 100644
index eaef8d5b1e..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Resource/DirectoryResource.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?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\Config\Resource;
-
-/**
- * DirectoryResource represents a resources stored in a subdirectory tree.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class DirectoryResource implements SelfCheckingResourceInterface, \Serializable
-{
-    private $resource;
-    private $pattern;
-
-    /**
-     * Constructor.
-     *
-     * @param string      $resource The file path to the resource
-     * @param string|null $pattern  A pattern to restrict monitored files
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function __construct($resource, $pattern = null)
-    {
-        $this->resource = realpath($resource);
-        $this->pattern = $pattern;
-
-        if (false === $this->resource || !is_dir($this->resource)) {
-            throw new \InvalidArgumentException(sprintf('The directory "%s" does not exist.', $resource));
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __toString()
-    {
-        return md5(serialize(array($this->resource, $this->pattern)));
-    }
-
-    /**
-     * @return string The file path to the resource
-     */
-    public function getResource()
-    {
-        return $this->resource;
-    }
-
-    /**
-     * Returns the pattern to restrict monitored files.
-     *
-     * @return string|null
-     */
-    public function getPattern()
-    {
-        return $this->pattern;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isFresh($timestamp)
-    {
-        if (!is_dir($this->resource)) {
-            return false;
-        }
-
-        $newestMTime = filemtime($this->resource);
-        foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->resource), \RecursiveIteratorIterator::SELF_FIRST) as $file) {
-            // if regex filtering is enabled only check matching files
-            if ($this->pattern && $file->isFile() && !preg_match($this->pattern, $file->getBasename())) {
-                continue;
-            }
-
-            // always monitor directories for changes, except the .. entries
-            // (otherwise deleted files wouldn't get detected)
-            if ($file->isDir() && '/..' === substr($file, -3)) {
-                continue;
-            }
-
-            $newestMTime = max($file->getMTime(), $newestMTime);
-        }
-
-        return $newestMTime < $timestamp;
-    }
-
-    public function serialize()
-    {
-        return serialize(array($this->resource, $this->pattern));
-    }
-
-    public function unserialize($serialized)
-    {
-        list($this->resource, $this->pattern) = unserialize($serialized);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Resource/FileExistenceResource.php b/core/src/core/classes/guzzle/vendor/symfony/config/Resource/FileExistenceResource.php
deleted file mode 100644
index 349402edf0..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Resource/FileExistenceResource.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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\Config\Resource;
-
-/**
- * FileExistenceResource represents a resource stored on the filesystem.
- * Freshness is only evaluated against resource creation or deletion.
- *
- * The resource can be a file or a directory.
- *
- * @author Charles-Henri Bruyand <charleshenri.bruyand@gmail.com>
- */
-class FileExistenceResource implements SelfCheckingResourceInterface, \Serializable
-{
-    private $resource;
-
-    private $exists;
-
-    /**
-     * Constructor.
-     *
-     * @param string $resource The file path to the resource
-     */
-    public function __construct($resource)
-    {
-        $this->resource = (string) $resource;
-        $this->exists = file_exists($resource);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __toString()
-    {
-        return $this->resource;
-    }
-
-    /**
-     * @return string The file path to the resource
-     */
-    public function getResource()
-    {
-        return $this->resource;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isFresh($timestamp)
-    {
-        return file_exists($this->resource) === $this->exists;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function serialize()
-    {
-        return serialize(array($this->resource, $this->exists));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function unserialize($serialized)
-    {
-        list($this->resource, $this->exists) = unserialize($serialized);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Resource/FileResource.php b/core/src/core/classes/guzzle/vendor/symfony/config/Resource/FileResource.php
deleted file mode 100644
index 6a06dcd609..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Resource/FileResource.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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\Config\Resource;
-
-/**
- * FileResource represents a resource stored on the filesystem.
- *
- * The resource can be a file or a directory.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class FileResource implements SelfCheckingResourceInterface, \Serializable
-{
-    /**
-     * @var string|false
-     */
-    private $resource;
-
-    /**
-     * Constructor.
-     *
-     * @param string $resource The file path to the resource
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function __construct($resource)
-    {
-        $this->resource = realpath($resource);
-
-        if (false === $this->resource && file_exists($resource)) {
-            $this->resource = $resource;
-        }
-
-        if (false === $this->resource) {
-            throw new \InvalidArgumentException(sprintf('The file "%s" does not exist.', $resource));
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __toString()
-    {
-        return $this->resource;
-    }
-
-    /**
-     * @return string The canonicalized, absolute path to the resource
-     */
-    public function getResource()
-    {
-        return $this->resource;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isFresh($timestamp)
-    {
-        return file_exists($this->resource) && @filemtime($this->resource) <= $timestamp;
-    }
-
-    public function serialize()
-    {
-        return serialize($this->resource);
-    }
-
-    public function unserialize($serialized)
-    {
-        $this->resource = unserialize($serialized);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Resource/ResourceInterface.php b/core/src/core/classes/guzzle/vendor/symfony/config/Resource/ResourceInterface.php
deleted file mode 100644
index d98fd427a2..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Resource/ResourceInterface.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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\Config\Resource;
-
-/**
- * ResourceInterface is the interface that must be implemented by all Resource classes.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-interface ResourceInterface
-{
-    /**
-     * Returns a string representation of the Resource.
-     *
-     * This method is necessary to allow for resource de-duplication, for example by means
-     * of array_unique(). The string returned need not have a particular meaning, but has
-     * to be identical for different ResourceInterface instances referring to the same
-     * resource; and it should be unlikely to collide with that of other, unrelated
-     * resource instances.
-     *
-     * @return string A string representation unique to the underlying Resource
-     */
-    public function __toString();
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Resource/SelfCheckingResourceChecker.php b/core/src/core/classes/guzzle/vendor/symfony/config/Resource/SelfCheckingResourceChecker.php
deleted file mode 100644
index d72203bc1a..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Resource/SelfCheckingResourceChecker.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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\Config\Resource;
-
-use Symfony\Component\Config\ResourceCheckerInterface;
-
-/**
- * Resource checker for instances of SelfCheckingResourceInterface.
- *
- * As these resources perform the actual check themselves, we can provide
- * this class as a standard way of validating them.
- *
- * @author Matthias Pigulla <mp@webfactory.de>
- */
-class SelfCheckingResourceChecker implements ResourceCheckerInterface
-{
-    public function supports(ResourceInterface $metadata)
-    {
-        return $metadata instanceof SelfCheckingResourceInterface;
-    }
-
-    public function isFresh(ResourceInterface $resource, $timestamp)
-    {
-        /* @var SelfCheckingResourceInterface $resource */
-        return $resource->isFresh($timestamp);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Resource/SelfCheckingResourceInterface.php b/core/src/core/classes/guzzle/vendor/symfony/config/Resource/SelfCheckingResourceInterface.php
deleted file mode 100644
index b3260f2be3..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Resource/SelfCheckingResourceInterface.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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\Config\Resource;
-
-/**
- * Interface for Resources that can check for freshness autonomously,
- * without special support from external services.
- *
- * @author Matthias Pigulla <mp@webfactory.de>
- */
-interface SelfCheckingResourceInterface extends ResourceInterface
-{
-    /**
-     * Returns true if the resource has not been updated since the given timestamp.
-     *
-     * @param int $timestamp The last time the resource was loaded
-     *
-     * @return bool True if the resource has not been updated, false otherwise
-     */
-    public function isFresh($timestamp);
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/ResourceCheckerConfigCache.php b/core/src/core/classes/guzzle/vendor/symfony/config/ResourceCheckerConfigCache.php
deleted file mode 100644
index 3cef781907..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/ResourceCheckerConfigCache.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?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\Config;
-
-use Symfony\Component\Config\Resource\ResourceInterface;
-use Symfony\Component\Filesystem\Exception\IOException;
-use Symfony\Component\Filesystem\Filesystem;
-
-/**
- * ResourceCheckerConfigCache uses instances of ResourceCheckerInterface
- * to check whether cached data is still fresh.
- *
- * @author Matthias Pigulla <mp@webfactory.de>
- */
-class ResourceCheckerConfigCache implements ConfigCacheInterface
-{
-    /**
-     * @var string
-     */
-    private $file;
-
-    /**
-     * @var ResourceCheckerInterface[]
-     */
-    private $resourceCheckers;
-
-    /**
-     * @param string                     $file             The absolute cache path
-     * @param ResourceCheckerInterface[] $resourceCheckers The ResourceCheckers to use for the freshness check
-     */
-    public function __construct($file, array $resourceCheckers = array())
-    {
-        $this->file = $file;
-        $this->resourceCheckers = $resourceCheckers;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPath()
-    {
-        return $this->file;
-    }
-
-    /**
-     * Checks if the cache is still fresh.
-     *
-     * This implementation will make a decision solely based on the ResourceCheckers
-     * passed in the constructor.
-     *
-     * The first ResourceChecker that supports a given resource is considered authoritative.
-     * Resources with no matching ResourceChecker will silently be ignored and considered fresh.
-     *
-     * @return bool true if the cache is fresh, false otherwise
-     */
-    public function isFresh()
-    {
-        if (!is_file($this->file)) {
-            return false;
-        }
-
-        if (!$this->resourceCheckers) {
-            return true; // shortcut - if we don't have any checkers we don't need to bother with the meta file at all
-        }
-
-        $metadata = $this->getMetaFile();
-        if (!is_file($metadata)) {
-            return true;
-        }
-
-        $time = filemtime($this->file);
-        $meta = unserialize(file_get_contents($metadata));
-
-        foreach ($meta as $resource) {
-            /* @var ResourceInterface $resource */
-            foreach ($this->resourceCheckers as $checker) {
-                if (!$checker->supports($resource)) {
-                    continue; // next checker
-                }
-                if ($checker->isFresh($resource, $time)) {
-                    break; // no need to further check this resource
-                }
-
-                return false; // cache is stale
-            }
-            // no suitable checker found, ignore this resource
-        }
-
-        return true;
-    }
-
-    /**
-     * Writes cache.
-     *
-     * @param string              $content  The content to write in the cache
-     * @param ResourceInterface[] $metadata An array of metadata
-     *
-     * @throws \RuntimeException When cache file can't be written
-     */
-    public function write($content, array $metadata = null)
-    {
-        $mode = 0666;
-        $umask = umask();
-        $filesystem = new Filesystem();
-        $filesystem->dumpFile($this->file, $content, null);
-        try {
-            $filesystem->chmod($this->file, $mode, $umask);
-        } catch (IOException $e) {
-            // discard chmod failure (some filesystem may not support it)
-        }
-
-        if (null !== $metadata) {
-            $filesystem->dumpFile($this->getMetaFile(), serialize($metadata), null);
-            try {
-                $filesystem->chmod($this->getMetaFile(), $mode, $umask);
-            } catch (IOException $e) {
-                // discard chmod failure (some filesystem may not support it)
-            }
-        }
-    }
-
-    /**
-     * Gets the meta file path.
-     *
-     * @return string The meta file path
-     */
-    private function getMetaFile()
-    {
-        return $this->file.'.meta';
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/ResourceCheckerConfigCacheFactory.php b/core/src/core/classes/guzzle/vendor/symfony/config/ResourceCheckerConfigCacheFactory.php
deleted file mode 100644
index 61d732cc1c..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/ResourceCheckerConfigCacheFactory.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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\Config;
-
-/**
- * A ConfigCacheFactory implementation that validates the
- * cache with an arbitrary set of ResourceCheckers.
- *
- * @author Matthias Pigulla <mp@webfactory.de>
- */
-class ResourceCheckerConfigCacheFactory implements ConfigCacheFactoryInterface
-{
-    /**
-     * @var ResourceCheckerInterface[]
-     */
-    private $resourceCheckers = array();
-
-    /**
-     * @param ResourceCheckerInterface[] $resourceCheckers
-     */
-    public function __construct(array $resourceCheckers = array())
-    {
-        $this->resourceCheckers = $resourceCheckers;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function cache($file, $callback)
-    {
-        if (!is_callable($callback)) {
-            throw new \InvalidArgumentException(sprintf('Invalid type for callback argument. Expected callable, but got "%s".', gettype($callback)));
-        }
-
-        $cache = new ResourceCheckerConfigCache($file, $this->resourceCheckers);
-        if (!$cache->isFresh()) {
-            call_user_func($callback, $cache);
-        }
-
-        return $cache;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/ResourceCheckerInterface.php b/core/src/core/classes/guzzle/vendor/symfony/config/ResourceCheckerInterface.php
deleted file mode 100644
index 612d777864..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/ResourceCheckerInterface.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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\Config;
-
-use Symfony\Component\Config\Resource\ResourceInterface;
-
-/**
- * Interface for ResourceCheckers.
- *
- * When a ResourceCheckerConfigCache instance is checked for freshness, all its associated
- * metadata resources are passed to ResourceCheckers. The ResourceCheckers
- * can then inspect the resources and decide whether the cache can be considered
- * fresh or not.
- *
- * @author Matthias Pigulla <mp@webfactory.de>
- * @author Benjamin Klotz <bk@webfactory.de>
- */
-interface ResourceCheckerInterface
-{
-    /**
-     * Queries the ResourceChecker whether it can validate a given
-     * resource or not.
-     *
-     * @param ResourceInterface $metadata The resource to be checked for freshness
-     *
-     * @return bool True if the ResourceChecker can handle this resource type, false if not
-     */
-    public function supports(ResourceInterface $metadata);
-
-    /**
-     * Validates the resource.
-     *
-     * @param ResourceInterface $resource  The resource to be validated
-     * @param int               $timestamp The timestamp at which the cache associated with this resource was created
-     *
-     * @return bool True if the resource has not changed since the given timestamp, false otherwise
-     */
-    public function isFresh(ResourceInterface $resource, $timestamp);
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/ConfigCacheFactoryTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/ConfigCacheFactoryTest.php
deleted file mode 100644
index 291243dead..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/ConfigCacheFactoryTest.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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\Config\Tests;
-
-use Symfony\Component\Config\ConfigCacheFactory;
-
-class ConfigCacheFactoryTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Invalid type for callback argument. Expected callable, but got "object".
-     */
-    public function testCachWithInvalidCallback()
-    {
-        $cacheFactory = new ConfigCacheFactory(true);
-
-        $cacheFactory->cache('file', new \stdClass());
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/ConfigCacheTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/ConfigCacheTest.php
deleted file mode 100644
index faa37f0e9d..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/ConfigCacheTest.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?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\Config\Tests;
-
-use Symfony\Component\Config\ConfigCache;
-use Symfony\Component\Config\Tests\Resource\ResourceStub;
-
-class ConfigCacheTest extends \PHPUnit_Framework_TestCase
-{
-    private $cacheFile = null;
-
-    protected function setUp()
-    {
-        $this->cacheFile = tempnam(sys_get_temp_dir(), 'config_');
-    }
-
-    protected function tearDown()
-    {
-        $files = array($this->cacheFile, $this->cacheFile.'.meta');
-
-        foreach ($files as $file) {
-            if (file_exists($file)) {
-                unlink($file);
-            }
-        }
-    }
-
-    /**
-     * @dataProvider debugModes
-     */
-    public function testCacheIsNotValidIfNothingHasBeenCached($debug)
-    {
-        unlink($this->cacheFile); // remove tempnam() side effect
-        $cache = new ConfigCache($this->cacheFile, $debug);
-
-        $this->assertFalse($cache->isFresh());
-    }
-
-    public function testIsAlwaysFreshInProduction()
-    {
-        $staleResource = new ResourceStub();
-        $staleResource->setFresh(false);
-
-        $cache = new ConfigCache($this->cacheFile, false);
-        $cache->write('', array($staleResource));
-
-        $this->assertTrue($cache->isFresh());
-    }
-
-    /**
-     * @dataProvider debugModes
-     */
-    public function testIsFreshWhenNoResourceProvided($debug)
-    {
-        $cache = new ConfigCache($this->cacheFile, $debug);
-        $cache->write('', array());
-        $this->assertTrue($cache->isFresh());
-    }
-
-    public function testFreshResourceInDebug()
-    {
-        $freshResource = new ResourceStub();
-        $freshResource->setFresh(true);
-
-        $cache = new ConfigCache($this->cacheFile, true);
-        $cache->write('', array($freshResource));
-
-        $this->assertTrue($cache->isFresh());
-    }
-
-    public function testStaleResourceInDebug()
-    {
-        $staleResource = new ResourceStub();
-        $staleResource->setFresh(false);
-
-        $cache = new ConfigCache($this->cacheFile, true);
-        $cache->write('', array($staleResource));
-
-        $this->assertFalse($cache->isFresh());
-    }
-
-    public function debugModes()
-    {
-        return array(
-            array(true),
-            array(false),
-        );
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/ArrayNodeTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/ArrayNodeTest.php
deleted file mode 100644
index 993941f9a6..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/ArrayNodeTest.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?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\Config\Tests\Definition;
-
-use Symfony\Component\Config\Definition\ArrayNode;
-use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
-use Symfony\Component\Config\Definition\ScalarNode;
-
-class ArrayNodeTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidTypeException
-     */
-    public function testNormalizeThrowsExceptionWhenFalseIsNotAllowed()
-    {
-        $node = new ArrayNode('root');
-        $node->normalize(false);
-    }
-
-    /**
-     * @expectedException        \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
-     * @expectedExceptionMessage Unrecognized option "foo" under "root"
-     */
-    public function testExceptionThrownOnUnrecognizedChild()
-    {
-        $node = new ArrayNode('root');
-        $node->normalize(array('foo' => 'bar'));
-    }
-
-    public function ignoreAndRemoveMatrixProvider()
-    {
-        $unrecognizedOptionException = new InvalidConfigurationException('Unrecognized option "foo" under "root"');
-
-        return array(
-            array(true, true, array(), 'no exception is thrown for an unrecognized child if the ignoreExtraKeys option is set to true'),
-            array(true, false, array('foo' => 'bar'), 'extra keys are not removed when ignoreExtraKeys second option is set to false'),
-            array(false, true, $unrecognizedOptionException),
-            array(false, false, $unrecognizedOptionException),
-        );
-    }
-
-    /**
-     * @dataProvider ignoreAndRemoveMatrixProvider
-     */
-    public function testIgnoreAndRemoveBehaviors($ignore, $remove, $expected, $message = '')
-    {
-        if ($expected instanceof \Exception) {
-            $this->setExpectedException(get_class($expected), $expected->getMessage());
-        }
-        $node = new ArrayNode('root');
-        $node->setIgnoreExtraKeys($ignore, $remove);
-        $result = $node->normalize(array('foo' => 'bar'));
-        $this->assertSame($expected, $result, $message);
-    }
-
-    /**
-     * @dataProvider getPreNormalizationTests
-     */
-    public function testPreNormalize($denormalized, $normalized)
-    {
-        $node = new ArrayNode('foo');
-
-        $r = new \ReflectionMethod($node, 'preNormalize');
-        $r->setAccessible(true);
-
-        $this->assertSame($normalized, $r->invoke($node, $denormalized));
-    }
-
-    public function getPreNormalizationTests()
-    {
-        return array(
-            array(
-                array('foo-bar' => 'foo'),
-                array('foo_bar' => 'foo'),
-            ),
-            array(
-                array('foo-bar_moo' => 'foo'),
-                array('foo-bar_moo' => 'foo'),
-            ),
-            array(
-                array('anything-with-dash-and-no-underscore' => 'first', 'no_dash' => 'second'),
-                array('anything_with_dash_and_no_underscore' => 'first', 'no_dash' => 'second'),
-            ),
-            array(
-                array('foo-bar' => null, 'foo_bar' => 'foo'),
-                array('foo-bar' => null, 'foo_bar' => 'foo'),
-            ),
-        );
-    }
-
-    /**
-     * @dataProvider getZeroNamedNodeExamplesData
-     */
-    public function testNodeNameCanBeZero($denormalized, $normalized)
-    {
-        $zeroNode = new ArrayNode(0);
-        $zeroNode->addChild(new ScalarNode('name'));
-        $fiveNode = new ArrayNode(5);
-        $fiveNode->addChild(new ScalarNode(0));
-        $fiveNode->addChild(new ScalarNode('new_key'));
-        $rootNode = new ArrayNode('root');
-        $rootNode->addChild($zeroNode);
-        $rootNode->addChild($fiveNode);
-        $rootNode->addChild(new ScalarNode('string_key'));
-        $r = new \ReflectionMethod($rootNode, 'normalizeValue');
-        $r->setAccessible(true);
-
-        $this->assertSame($normalized, $r->invoke($rootNode, $denormalized));
-    }
-
-    public function getZeroNamedNodeExamplesData()
-    {
-        return array(
-            array(
-                array(
-                    0 => array(
-                        'name' => 'something',
-                    ),
-                    5 => array(
-                        0 => 'this won\'t work too',
-                        'new_key' => 'some other value',
-                    ),
-                    'string_key' => 'just value',
-                ),
-                array(
-                    0 => array(
-                        'name' => 'something',
-                    ),
-                    5 => array(
-                        0 => 'this won\'t work too',
-                        'new_key' => 'some other value',
-                    ),
-                    'string_key' => 'just value',
-                ),
-            ),
-        );
-    }
-
-    /**
-     * @dataProvider getPreNormalizedNormalizedOrderedData
-     */
-    public function testChildrenOrderIsMaintainedOnNormalizeValue($prenormalized, $normalized)
-    {
-        $scalar1 = new ScalarNode('1');
-        $scalar2 = new ScalarNode('2');
-        $scalar3 = new ScalarNode('3');
-        $node = new ArrayNode('foo');
-        $node->addChild($scalar1);
-        $node->addChild($scalar3);
-        $node->addChild($scalar2);
-
-        $r = new \ReflectionMethod($node, 'normalizeValue');
-        $r->setAccessible(true);
-
-        $this->assertSame($normalized, $r->invoke($node, $prenormalized));
-    }
-
-    public function getPreNormalizedNormalizedOrderedData()
-    {
-        return array(
-            array(
-                array('2' => 'two', '1' => 'one', '3' => 'three'),
-                array('2' => 'two', '1' => 'one', '3' => 'three'),
-            ),
-        );
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/BooleanNodeTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/BooleanNodeTest.php
deleted file mode 100644
index b0cb079e96..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/BooleanNodeTest.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?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\Config\Tests\Definition;
-
-use Symfony\Component\Config\Definition\BooleanNode;
-
-class BooleanNodeTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @dataProvider getValidValues
-     */
-    public function testNormalize($value)
-    {
-        $node = new BooleanNode('test');
-        $this->assertSame($value, $node->normalize($value));
-    }
-
-    /**
-     * @dataProvider getValidValues
-     *
-     * @param bool $value
-     */
-    public function testValidNonEmptyValues($value)
-    {
-        $node = new BooleanNode('test');
-        $node->setAllowEmptyValue(false);
-
-        $this->assertSame($value, $node->finalize($value));
-    }
-
-    public function getValidValues()
-    {
-        return array(
-            array(false),
-            array(true),
-        );
-    }
-
-    /**
-     * @dataProvider getInvalidValues
-     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidTypeException
-     */
-    public function testNormalizeThrowsExceptionOnInvalidValues($value)
-    {
-        $node = new BooleanNode('test');
-        $node->normalize($value);
-    }
-
-    public function getInvalidValues()
-    {
-        return array(
-            array(null),
-            array(''),
-            array('foo'),
-            array(0),
-            array(1),
-            array(0.0),
-            array(0.1),
-            array(array()),
-            array(array('foo' => 'bar')),
-            array(new \stdClass()),
-        );
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php
deleted file mode 100644
index e75ed34f46..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/Builder/ArrayNodeDefinitionTest.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?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\Config\Tests\Definition\Builder;
-
-use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
-use Symfony\Component\Config\Definition\Processor;
-use Symfony\Component\Config\Definition\Builder\ScalarNodeDefinition;
-use Symfony\Component\Config\Definition\Exception\InvalidDefinitionException;
-
-class ArrayNodeDefinitionTest extends \PHPUnit_Framework_TestCase
-{
-    public function testAppendingSomeNode()
-    {
-        $parent = new ArrayNodeDefinition('root');
-        $child = new ScalarNodeDefinition('child');
-
-        $parent
-            ->children()
-                ->scalarNode('foo')->end()
-                ->scalarNode('bar')->end()
-            ->end()
-            ->append($child);
-
-        $this->assertCount(3, $this->getField($parent, 'children'));
-        $this->assertTrue(in_array($child, $this->getField($parent, 'children')));
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidDefinitionException
-     * @dataProvider providePrototypeNodeSpecificCalls
-     */
-    public function testPrototypeNodeSpecificOption($method, $args)
-    {
-        $node = new ArrayNodeDefinition('root');
-
-        call_user_func_array(array($node, $method), $args);
-
-        $node->getNode();
-    }
-
-    public function providePrototypeNodeSpecificCalls()
-    {
-        return array(
-            array('defaultValue', array(array())),
-            array('addDefaultChildrenIfNoneSet', array()),
-            array('requiresAtLeastOneElement', array()),
-            array('useAttributeAsKey', array('foo')),
-        );
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidDefinitionException
-     */
-    public function testConcreteNodeSpecificOption()
-    {
-        $node = new ArrayNodeDefinition('root');
-        $node
-            ->addDefaultsIfNotSet()
-            ->prototype('array')
-        ;
-        $node->getNode();
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidDefinitionException
-     */
-    public function testPrototypeNodesCantHaveADefaultValueWhenUsingDefaultChildren()
-    {
-        $node = new ArrayNodeDefinition('root');
-        $node
-            ->defaultValue(array())
-            ->addDefaultChildrenIfNoneSet('foo')
-            ->prototype('array')
-        ;
-        $node->getNode();
-    }
-
-    public function testPrototypedArrayNodeDefaultWhenUsingDefaultChildren()
-    {
-        $node = new ArrayNodeDefinition('root');
-        $node
-            ->addDefaultChildrenIfNoneSet()
-            ->prototype('array')
-        ;
-        $tree = $node->getNode();
-        $this->assertEquals(array(array()), $tree->getDefaultValue());
-    }
-
-    /**
-     * @dataProvider providePrototypedArrayNodeDefaults
-     */
-    public function testPrototypedArrayNodeDefault($args, $shouldThrowWhenUsingAttrAsKey, $shouldThrowWhenNotUsingAttrAsKey, $defaults)
-    {
-        $node = new ArrayNodeDefinition('root');
-        $node
-            ->addDefaultChildrenIfNoneSet($args)
-            ->prototype('array')
-        ;
-
-        try {
-            $tree = $node->getNode();
-            $this->assertFalse($shouldThrowWhenNotUsingAttrAsKey);
-            $this->assertEquals($defaults, $tree->getDefaultValue());
-        } catch (InvalidDefinitionException $e) {
-            $this->assertTrue($shouldThrowWhenNotUsingAttrAsKey);
-        }
-
-        $node = new ArrayNodeDefinition('root');
-        $node
-            ->useAttributeAsKey('attr')
-            ->addDefaultChildrenIfNoneSet($args)
-            ->prototype('array')
-        ;
-
-        try {
-            $tree = $node->getNode();
-            $this->assertFalse($shouldThrowWhenUsingAttrAsKey);
-            $this->assertEquals($defaults, $tree->getDefaultValue());
-        } catch (InvalidDefinitionException $e) {
-            $this->assertTrue($shouldThrowWhenUsingAttrAsKey);
-        }
-    }
-
-    public function providePrototypedArrayNodeDefaults()
-    {
-        return array(
-            array(null, true, false, array(array())),
-            array(2, true, false, array(array(), array())),
-            array('2', false, true, array('2' => array())),
-            array('foo', false, true, array('foo' => array())),
-            array(array('foo'), false, true, array('foo' => array())),
-            array(array('foo', 'bar'), false, true, array('foo' => array(), 'bar' => array())),
-        );
-    }
-
-    public function testNestedPrototypedArrayNodes()
-    {
-        $node = new ArrayNodeDefinition('root');
-        $node
-            ->addDefaultChildrenIfNoneSet()
-            ->prototype('array')
-                  ->prototype('array')
-        ;
-        $node->getNode();
-    }
-
-    public function testEnabledNodeDefaults()
-    {
-        $node = new ArrayNodeDefinition('root');
-        $node
-            ->canBeEnabled()
-            ->children()
-                ->scalarNode('foo')->defaultValue('bar')->end()
-        ;
-
-        $this->assertEquals(array('enabled' => false, 'foo' => 'bar'), $node->getNode()->getDefaultValue());
-    }
-
-    /**
-     * @dataProvider getEnableableNodeFixtures
-     */
-    public function testTrueEnableEnabledNode($expected, $config, $message)
-    {
-        $processor = new Processor();
-        $node = new ArrayNodeDefinition('root');
-        $node
-            ->canBeEnabled()
-            ->children()
-                ->scalarNode('foo')->defaultValue('bar')->end()
-        ;
-
-        $this->assertEquals(
-            $expected,
-            $processor->process($node->getNode(), $config),
-            $message
-        );
-    }
-
-    public function getEnableableNodeFixtures()
-    {
-        return array(
-            array(array('enabled' => true, 'foo' => 'bar'), array(true), 'true enables an enableable node'),
-            array(array('enabled' => true, 'foo' => 'bar'), array(null), 'null enables an enableable node'),
-            array(array('enabled' => true, 'foo' => 'bar'), array(array('enabled' => true)), 'An enableable node can be enabled'),
-            array(array('enabled' => true, 'foo' => 'baz'), array(array('foo' => 'baz')), 'any configuration enables an enableable node'),
-            array(array('enabled' => false, 'foo' => 'baz'), array(array('foo' => 'baz', 'enabled' => false)), 'An enableable node can be disabled'),
-            array(array('enabled' => false, 'foo' => 'bar'), array(false), 'false disables an enableable node'),
-        );
-    }
-
-    protected function getField($object, $field)
-    {
-        $reflection = new \ReflectionProperty($object, $field);
-        $reflection->setAccessible(true);
-
-        return $reflection->getValue($object);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/Builder/EnumNodeDefinitionTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/Builder/EnumNodeDefinitionTest.php
deleted file mode 100644
index 8d7ab2f7f0..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/Builder/EnumNodeDefinitionTest.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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\Config\Tests\Definition\Builder;
-
-use Symfony\Component\Config\Definition\Builder\EnumNodeDefinition;
-
-class EnumNodeDefinitionTest extends \PHPUnit_Framework_TestCase
-{
-    public function testWithOneValue()
-    {
-        $def = new EnumNodeDefinition('foo');
-        $def->values(array('foo'));
-
-        $node = $def->getNode();
-        $this->assertEquals(array('foo'), $node->getValues());
-    }
-
-    public function testWithOneDistinctValue()
-    {
-        $def = new EnumNodeDefinition('foo');
-        $def->values(array('foo', 'foo'));
-
-        $node = $def->getNode();
-        $this->assertEquals(array('foo'), $node->getValues());
-    }
-
-    /**
-     * @expectedException \RuntimeException
-     * @expectedExceptionMessage You must call ->values() on enum nodes.
-     */
-    public function testNoValuesPassed()
-    {
-        $def = new EnumNodeDefinition('foo');
-        $def->getNode();
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage ->values() must be called with at least one value.
-     */
-    public function testWithNoValues()
-    {
-        $def = new EnumNodeDefinition('foo');
-        $def->values(array());
-    }
-
-    public function testGetNode()
-    {
-        $def = new EnumNodeDefinition('foo');
-        $def->values(array('foo', 'bar'));
-
-        $node = $def->getNode();
-        $this->assertEquals(array('foo', 'bar'), $node->getValues());
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/Builder/ExprBuilderTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/Builder/ExprBuilderTest.php
deleted file mode 100644
index 147bf1324c..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/Builder/ExprBuilderTest.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?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\Config\Tests\Definition\Builder;
-
-use Symfony\Component\Config\Definition\Builder\TreeBuilder;
-
-class ExprBuilderTest extends \PHPUnit_Framework_TestCase
-{
-    public function testAlwaysExpression()
-    {
-        $test = $this->getTestBuilder()
-            ->always($this->returnClosure('new_value'))
-        ->end();
-
-        $this->assertFinalizedValueIs('new_value', $test);
-    }
-
-    public function testIfTrueExpression()
-    {
-        $test = $this->getTestBuilder()
-            ->ifTrue()
-            ->then($this->returnClosure('new_value'))
-        ->end();
-        $this->assertFinalizedValueIs('new_value', $test, array('key' => true));
-
-        $test = $this->getTestBuilder()
-            ->ifTrue(function ($v) { return true; })
-            ->then($this->returnClosure('new_value'))
-        ->end();
-        $this->assertFinalizedValueIs('new_value', $test);
-
-        $test = $this->getTestBuilder()
-            ->ifTrue(function ($v) { return false; })
-            ->then($this->returnClosure('new_value'))
-        ->end();
-        $this->assertFinalizedValueIs('value', $test);
-    }
-
-    public function testIfStringExpression()
-    {
-        $test = $this->getTestBuilder()
-            ->ifString()
-            ->then($this->returnClosure('new_value'))
-        ->end();
-        $this->assertFinalizedValueIs('new_value', $test);
-
-        $test = $this->getTestBuilder()
-            ->ifString()
-            ->then($this->returnClosure('new_value'))
-        ->end();
-        $this->assertFinalizedValueIs(45, $test, array('key' => 45));
-    }
-
-    public function testIfNullExpression()
-    {
-        $test = $this->getTestBuilder()
-            ->ifNull()
-            ->then($this->returnClosure('new_value'))
-        ->end();
-        $this->assertFinalizedValueIs('new_value', $test, array('key' => null));
-
-        $test = $this->getTestBuilder()
-            ->ifNull()
-            ->then($this->returnClosure('new_value'))
-        ->end();
-        $this->assertFinalizedValueIs('value', $test);
-    }
-
-    public function testIfArrayExpression()
-    {
-        $test = $this->getTestBuilder()
-            ->ifArray()
-            ->then($this->returnClosure('new_value'))
-        ->end();
-        $this->assertFinalizedValueIs('new_value', $test, array('key' => array()));
-
-        $test = $this->getTestBuilder()
-            ->ifArray()
-            ->then($this->returnClosure('new_value'))
-        ->end();
-        $this->assertFinalizedValueIs('value', $test);
-    }
-
-    public function testIfInArrayExpression()
-    {
-        $test = $this->getTestBuilder()
-            ->ifInArray(array('foo', 'bar', 'value'))
-            ->then($this->returnClosure('new_value'))
-        ->end();
-        $this->assertFinalizedValueIs('new_value', $test);
-
-        $test = $this->getTestBuilder()
-            ->ifInArray(array('foo', 'bar'))
-            ->then($this->returnClosure('new_value'))
-        ->end();
-        $this->assertFinalizedValueIs('value', $test);
-    }
-
-    public function testIfNotInArrayExpression()
-    {
-        $test = $this->getTestBuilder()
-            ->ifNotInArray(array('foo', 'bar'))
-            ->then($this->returnClosure('new_value'))
-        ->end();
-        $this->assertFinalizedValueIs('new_value', $test);
-
-        $test = $this->getTestBuilder()
-            ->ifNotInArray(array('foo', 'bar', 'value_from_config'))
-            ->then($this->returnClosure('new_value'))
-        ->end();
-        $this->assertFinalizedValueIs('new_value', $test);
-    }
-
-    public function testThenEmptyArrayExpression()
-    {
-        $test = $this->getTestBuilder()
-            ->ifString()
-            ->thenEmptyArray()
-        ->end();
-        $this->assertFinalizedValueIs(array(), $test);
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
-     */
-    public function testThenInvalid()
-    {
-        $test = $this->getTestBuilder()
-            ->ifString()
-            ->thenInvalid('Invalid value')
-        ->end();
-        $this->finalizeTestBuilder($test);
-    }
-
-    public function testThenUnsetExpression()
-    {
-        $test = $this->getTestBuilder()
-            ->ifString()
-            ->thenUnset()
-        ->end();
-        $this->assertEquals(array(), $this->finalizeTestBuilder($test));
-    }
-
-    /**
-     * Create a test treebuilder with a variable node, and init the validation.
-     *
-     * @return TreeBuilder
-     */
-    protected function getTestBuilder()
-    {
-        $builder = new TreeBuilder();
-
-        return $builder
-            ->root('test')
-            ->children()
-            ->variableNode('key')
-            ->validate()
-        ;
-    }
-
-    /**
-     * Close the validation process and finalize with the given config.
-     *
-     * @param TreeBuilder $testBuilder The tree builder to finalize
-     * @param array       $config      The config you want to use for the finalization, if nothing provided
-     *                                 a simple array('key'=>'value') will be used
-     *
-     * @return array The finalized config values
-     */
-    protected function finalizeTestBuilder($testBuilder, $config = null)
-    {
-        return $testBuilder
-            ->end()
-            ->end()
-            ->end()
-            ->buildTree()
-            ->finalize(null === $config ? array('key' => 'value') : $config)
-        ;
-    }
-
-    /**
-     * Return a closure that will return the given value.
-     *
-     * @param mixed $val The value that the closure must return
-     *
-     * @return \Closure
-     */
-    protected function returnClosure($val)
-    {
-        return function ($v) use ($val) {
-            return $val;
-        };
-    }
-
-    /**
-     * Assert that the given test builder, will return the given value.
-     *
-     * @param mixed       $value       The value to test
-     * @param TreeBuilder $treeBuilder The tree builder to finalize
-     * @param mixed       $config      The config values that new to be finalized
-     */
-    protected function assertFinalizedValueIs($value, $treeBuilder, $config = null)
-    {
-        $this->assertEquals(array('key' => $value), $this->finalizeTestBuilder($treeBuilder, $config));
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/Builder/NodeBuilderTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/Builder/NodeBuilderTest.php
deleted file mode 100644
index 22c399ca9d..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/Builder/NodeBuilderTest.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?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\Config\Tests\Definition\Builder;
-
-use Symfony\Component\Config\Definition\Builder\NodeBuilder as BaseNodeBuilder;
-use Symfony\Component\Config\Definition\Builder\VariableNodeDefinition as BaseVariableNodeDefinition;
-
-class NodeBuilderTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @expectedException \RuntimeException
-     */
-    public function testThrowsAnExceptionWhenTryingToCreateANonRegisteredNodeType()
-    {
-        $builder = new BaseNodeBuilder();
-        $builder->node('', 'foobar');
-    }
-
-    /**
-     * @expectedException \RuntimeException
-     */
-    public function testThrowsAnExceptionWhenTheNodeClassIsNotFound()
-    {
-        $builder = new BaseNodeBuilder();
-        $builder
-            ->setNodeClass('noclasstype', '\\foo\\bar\\noclass')
-            ->node('', 'noclasstype');
-    }
-
-    public function testAddingANewNodeType()
-    {
-        $class = __NAMESPACE__.'\\SomeNodeDefinition';
-
-        $builder = new BaseNodeBuilder();
-        $node = $builder
-            ->setNodeClass('newtype', $class)
-            ->node('', 'newtype');
-
-        $this->assertInstanceOf($class, $node);
-    }
-
-    public function testOverridingAnExistingNodeType()
-    {
-        $class = __NAMESPACE__.'\\SomeNodeDefinition';
-
-        $builder = new BaseNodeBuilder();
-        $node = $builder
-            ->setNodeClass('variable', $class)
-            ->node('', 'variable');
-
-        $this->assertInstanceOf($class, $node);
-    }
-
-    public function testNodeTypesAreNotCaseSensitive()
-    {
-        $builder = new BaseNodeBuilder();
-
-        $node1 = $builder->node('', 'VaRiAbLe');
-        $node2 = $builder->node('', 'variable');
-
-        $this->assertInstanceOf(get_class($node1), $node2);
-
-        $builder->setNodeClass('CuStOm', __NAMESPACE__.'\\SomeNodeDefinition');
-
-        $node1 = $builder->node('', 'CUSTOM');
-        $node2 = $builder->node('', 'custom');
-
-        $this->assertInstanceOf(get_class($node1), $node2);
-    }
-
-    public function testNumericNodeCreation()
-    {
-        $builder = new BaseNodeBuilder();
-
-        $node = $builder->integerNode('foo')->min(3)->max(5);
-        $this->assertInstanceOf('Symfony\Component\Config\Definition\Builder\IntegerNodeDefinition', $node);
-
-        $node = $builder->floatNode('bar')->min(3.0)->max(5.0);
-        $this->assertInstanceOf('Symfony\Component\Config\Definition\Builder\FloatNodeDefinition', $node);
-    }
-}
-
-class SomeNodeDefinition extends BaseVariableNodeDefinition
-{
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/Builder/NumericNodeDefinitionTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/Builder/NumericNodeDefinitionTest.php
deleted file mode 100644
index 8f0cdbb4eb..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/Builder/NumericNodeDefinitionTest.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?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\Config\Tests\Definition\Builder;
-
-use Symfony\Component\Config\Definition\Builder\IntegerNodeDefinition as NumericNodeDefinition;
-use Symfony\Component\Config\Definition\Builder\IntegerNodeDefinition;
-use Symfony\Component\Config\Definition\Builder\FloatNodeDefinition;
-
-class NumericNodeDefinitionTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage You cannot define a min(4) as you already have a max(3)
-     */
-    public function testIncoherentMinAssertion()
-    {
-        $def = new NumericNodeDefinition('foo');
-        $def->max(3)->min(4);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage You cannot define a max(2) as you already have a min(3)
-     */
-    public function testIncoherentMaxAssertion()
-    {
-        $node = new NumericNodeDefinition('foo');
-        $node->min(3)->max(2);
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
-     * @expectedExceptionMessage The value 4 is too small for path "foo". Should be greater than or equal to 5
-     */
-    public function testIntegerMinAssertion()
-    {
-        $def = new IntegerNodeDefinition('foo');
-        $def->min(5)->getNode()->finalize(4);
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
-     * @expectedExceptionMessage The value 4 is too big for path "foo". Should be less than or equal to 3
-     */
-    public function testIntegerMaxAssertion()
-    {
-        $def = new IntegerNodeDefinition('foo');
-        $def->max(3)->getNode()->finalize(4);
-    }
-
-    public function testIntegerValidMinMaxAssertion()
-    {
-        $def = new IntegerNodeDefinition('foo');
-        $node = $def->min(3)->max(7)->getNode();
-        $this->assertEquals(4, $node->finalize(4));
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
-     * @expectedExceptionMessage The value 400 is too small for path "foo". Should be greater than or equal to 500
-     */
-    public function testFloatMinAssertion()
-    {
-        $def = new FloatNodeDefinition('foo');
-        $def->min(5E2)->getNode()->finalize(4e2);
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
-     * @expectedExceptionMessage The value 4.3 is too big for path "foo". Should be less than or equal to 0.3
-     */
-    public function testFloatMaxAssertion()
-    {
-        $def = new FloatNodeDefinition('foo');
-        $def->max(0.3)->getNode()->finalize(4.3);
-    }
-
-    public function testFloatValidMinMaxAssertion()
-    {
-        $def = new FloatNodeDefinition('foo');
-        $node = $def->min(3.0)->max(7e2)->getNode();
-        $this->assertEquals(4.5, $node->finalize(4.5));
-    }
-
-    /**
-     * @expectedException Symfony\Component\Config\Definition\Exception\InvalidDefinitionException
-     * @expectedExceptionMessage ->cannotBeEmpty() is not applicable to NumericNodeDefinition.
-     */
-    public function testCannotBeEmptyThrowsAnException()
-    {
-        $def = new NumericNodeDefinition('foo');
-        $def->cannotBeEmpty();
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/Builder/TreeBuilderTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/Builder/TreeBuilderTest.php
deleted file mode 100644
index a146e89c32..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/Builder/TreeBuilderTest.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?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\Config\Tests\Definition\Builder;
-
-use Symfony\Component\Config\Tests\Definition\Builder\NodeBuilder as CustomNodeBuilder;
-use Symfony\Component\Config\Definition\Builder\TreeBuilder;
-
-require __DIR__.'/../../Fixtures/Builder/NodeBuilder.php';
-require __DIR__.'/../../Fixtures/Builder/BarNodeDefinition.php';
-require __DIR__.'/../../Fixtures/Builder/VariableNodeDefinition.php';
-
-class TreeBuilderTest extends \PHPUnit_Framework_TestCase
-{
-    public function testUsingACustomNodeBuilder()
-    {
-        $builder = new TreeBuilder();
-        $root = $builder->root('custom', 'array', new CustomNodeBuilder());
-
-        $nodeBuilder = $root->children();
-
-        $this->assertInstanceOf('Symfony\Component\Config\Tests\Definition\Builder\NodeBuilder', $nodeBuilder);
-
-        $nodeBuilder = $nodeBuilder->arrayNode('deeper')->children();
-
-        $this->assertInstanceOf('Symfony\Component\Config\Tests\Definition\Builder\NodeBuilder', $nodeBuilder);
-    }
-
-    public function testOverrideABuiltInNodeType()
-    {
-        $builder = new TreeBuilder();
-        $root = $builder->root('override', 'array', new CustomNodeBuilder());
-
-        $definition = $root->children()->variableNode('variable');
-
-        $this->assertInstanceOf('Symfony\Component\Config\Tests\Definition\Builder\VariableNodeDefinition', $definition);
-    }
-
-    public function testAddANodeType()
-    {
-        $builder = new TreeBuilder();
-        $root = $builder->root('override', 'array', new CustomNodeBuilder());
-
-        $definition = $root->children()->barNode('variable');
-
-        $this->assertInstanceOf('Symfony\Component\Config\Tests\Definition\Builder\BarNodeDefinition', $definition);
-    }
-
-    public function testCreateABuiltInNodeTypeWithACustomNodeBuilder()
-    {
-        $builder = new TreeBuilder();
-        $root = $builder->root('builtin', 'array', new CustomNodeBuilder());
-
-        $definition = $root->children()->booleanNode('boolean');
-
-        $this->assertInstanceOf('Symfony\Component\Config\Definition\Builder\BooleanNodeDefinition', $definition);
-    }
-
-    public function testPrototypedArrayNodeUseTheCustomNodeBuilder()
-    {
-        $builder = new TreeBuilder();
-        $root = $builder->root('override', 'array', new CustomNodeBuilder());
-
-        $root->prototype('bar')->end();
-    }
-
-    public function testAnExtendedNodeBuilderGetsPropagatedToTheChildren()
-    {
-        $builder = new TreeBuilder();
-
-        $builder->root('propagation')
-            ->children()
-                ->setNodeClass('extended', 'Symfony\Component\Config\Tests\Definition\Builder\VariableNodeDefinition')
-                ->node('foo', 'extended')->end()
-                ->arrayNode('child')
-                    ->children()
-                        ->node('foo', 'extended')
-                    ->end()
-                ->end()
-            ->end()
-        ->end();
-    }
-
-    public function testDefinitionInfoGetsTransferredToNode()
-    {
-        $builder = new TreeBuilder();
-
-        $builder->root('test')->info('root info')
-            ->children()
-                ->node('child', 'variable')->info('child info')->defaultValue('default')
-            ->end()
-        ->end();
-
-        $tree = $builder->buildTree();
-        $children = $tree->getChildren();
-
-        $this->assertEquals('root info', $tree->getInfo());
-        $this->assertEquals('child info', $children['child']->getInfo());
-    }
-
-    public function testDefinitionExampleGetsTransferredToNode()
-    {
-        $builder = new TreeBuilder();
-
-        $builder->root('test')
-            ->example(array('key' => 'value'))
-            ->children()
-                ->node('child', 'variable')->info('child info')->defaultValue('default')->example('example')
-            ->end()
-        ->end();
-
-        $tree = $builder->buildTree();
-        $children = $tree->getChildren();
-
-        $this->assertInternalType('array', $tree->getExample());
-        $this->assertEquals('example', $children['child']->getExample());
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/Dumper/XmlReferenceDumperTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/Dumper/XmlReferenceDumperTest.php
deleted file mode 100644
index 6d9d52dd3a..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/Dumper/XmlReferenceDumperTest.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?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\Config\Tests\Definition\Dumper;
-
-use Symfony\Component\Config\Definition\Dumper\XmlReferenceDumper;
-use Symfony\Component\Config\Tests\Fixtures\Configuration\ExampleConfiguration;
-
-class XmlReferenceDumperTest extends \PHPUnit_Framework_TestCase
-{
-    public function testDumper()
-    {
-        $configuration = new ExampleConfiguration();
-
-        $dumper = new XmlReferenceDumper();
-        $this->assertEquals($this->getConfigurationAsString(), $dumper->dump($configuration));
-    }
-
-    public function testNamespaceDumper()
-    {
-        $configuration = new ExampleConfiguration();
-
-        $dumper = new XmlReferenceDumper();
-        $this->assertEquals(str_replace('http://example.org/schema/dic/acme_root', 'http://symfony.com/schema/dic/symfony', $this->getConfigurationAsString()), $dumper->dump($configuration, 'http://symfony.com/schema/dic/symfony'));
-    }
-
-    private function getConfigurationAsString()
-    {
-        return str_replace("\n", PHP_EOL, <<<EOL
-<!-- Namespace: http://example.org/schema/dic/acme_root -->
-<!-- scalar-required: Required -->
-<!-- enum-with-default: One of "this"; "that" -->
-<!-- enum: One of "this"; "that" -->
-<config
-    boolean="true"
-    scalar-empty=""
-    scalar-null="null"
-    scalar-true="true"
-    scalar-false="false"
-    scalar-default="default"
-    scalar-array-empty=""
-    scalar-array-defaults="elem1,elem2"
-    scalar-required=""
-    enum-with-default="this"
-    enum=""
->
-
-    <!-- some info -->
-    <!--
-        child3: this is a long
-                multi-line info text
-                which should be indented;
-                Example: example setting
-    -->
-    <array
-        child1=""
-        child2=""
-        child3=""
-    />
-
-    <!-- prototype: Parameter name -->
-    <parameter name="parameter name">scalar value</parameter>
-
-    <!-- prototype -->
-    <connection
-        user=""
-        pass=""
-    />
-
-</config>
-
-EOL
-        );
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/Dumper/YamlReferenceDumperTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
deleted file mode 100644
index 28d0cd6ad2..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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\Config\Tests\Definition\Dumper;
-
-use Symfony\Component\Config\Definition\Dumper\YamlReferenceDumper;
-use Symfony\Component\Config\Tests\Fixtures\Configuration\ExampleConfiguration;
-
-class YamlReferenceDumperTest extends \PHPUnit_Framework_TestCase
-{
-    public function testDumper()
-    {
-        $configuration = new ExampleConfiguration();
-
-        $dumper = new YamlReferenceDumper();
-
-        $this->markTestIncomplete('The Yaml Dumper currently does not support prototyped arrays');
-        $this->assertEquals($this->getConfigurationAsString(), $dumper->dump($configuration));
-    }
-
-    private function getConfigurationAsString()
-    {
-        return <<<'EOL'
-acme_root:
-    boolean:              true
-    scalar_empty:         ~
-    scalar_null:          ~
-    scalar_true:          true
-    scalar_false:         false
-    scalar_default:       default
-    scalar_array_empty:   []
-    scalar_array_defaults:
-
-        # Defaults:
-        - elem1
-        - elem2
-    scalar_required:      ~ # Required
-    enum_with_default:    this # One of "this"; "that"
-    enum:                 ~ # One of "this"; "that"
-
-    # some info
-    array:
-        child1:               ~
-        child2:               ~
-
-        # this is a long
-        # multi-line info text
-        # which should be indented
-        child3:               ~ # Example: example setting
-    parameters:
-
-        # Prototype: Parameter name
-        name:                 ~
-    connections:
-        # Prototype
-        - { user: ~, pass: ~ }
-
-EOL;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/EnumNodeTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/EnumNodeTest.php
deleted file mode 100644
index 654d5050dd..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/EnumNodeTest.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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\Config\Tests\Definition;
-
-use Symfony\Component\Config\Definition\EnumNode;
-
-class EnumNodeTest extends \PHPUnit_Framework_TestCase
-{
-    public function testFinalizeValue()
-    {
-        $node = new EnumNode('foo', null, array('foo', 'bar'));
-        $this->assertSame('foo', $node->finalize('foo'));
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage $values must contain at least one element.
-     */
-    public function testConstructionWithNoValues()
-    {
-        new EnumNode('foo', null, array());
-    }
-
-    public function testConstructionWithOneValue()
-    {
-        $node = new EnumNode('foo', null, array('foo'));
-        $this->assertSame('foo', $node->finalize('foo'));
-    }
-
-    public function testConstructionWithOneDistinctValue()
-    {
-        $node = new EnumNode('foo', null, array('foo', 'foo'));
-        $this->assertSame('foo', $node->finalize('foo'));
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
-     * @expectedExceptionMessage The value "foobar" is not allowed for path "foo". Permissible values: "foo", "bar"
-     */
-    public function testFinalizeWithInvalidValue()
-    {
-        $node = new EnumNode('foo', null, array('foo', 'bar'));
-        $node->finalize('foobar');
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/FinalizationTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/FinalizationTest.php
deleted file mode 100644
index 19fc347d8f..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/FinalizationTest.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?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\Config\Tests\Definition;
-
-use Symfony\Component\Config\Definition\Builder\TreeBuilder;
-use Symfony\Component\Config\Definition\Processor;
-use Symfony\Component\Config\Definition\NodeInterface;
-
-class FinalizationTest extends \PHPUnit_Framework_TestCase
-{
-    public function testUnsetKeyWithDeepHierarchy()
-    {
-        $tb = new TreeBuilder();
-        $tree = $tb
-            ->root('config', 'array')
-                ->children()
-                    ->node('level1', 'array')
-                        ->canBeUnset()
-                        ->children()
-                            ->node('level2', 'array')
-                                ->canBeUnset()
-                                ->children()
-                                    ->node('somevalue', 'scalar')->end()
-                                    ->node('anothervalue', 'scalar')->end()
-                                ->end()
-                            ->end()
-                            ->node('level1_scalar', 'scalar')->end()
-                        ->end()
-                    ->end()
-                ->end()
-            ->end()
-            ->buildTree()
-        ;
-
-        $a = array(
-            'level1' => array(
-                'level2' => array(
-                    'somevalue' => 'foo',
-                    'anothervalue' => 'bar',
-                ),
-                'level1_scalar' => 'foo',
-            ),
-        );
-
-        $b = array(
-            'level1' => array(
-                'level2' => false,
-            ),
-        );
-
-        $this->assertEquals(array(
-            'level1' => array(
-                'level1_scalar' => 'foo',
-            ),
-        ), $this->process($tree, array($a, $b)));
-    }
-
-    protected function process(NodeInterface $tree, array $configs)
-    {
-        $processor = new Processor();
-
-        return $processor->process($tree, $configs);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/FloatNodeTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/FloatNodeTest.php
deleted file mode 100644
index 84afd6c104..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/FloatNodeTest.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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\Config\Tests\Definition;
-
-use Symfony\Component\Config\Definition\FloatNode;
-
-class FloatNodeTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @dataProvider getValidValues
-     */
-    public function testNormalize($value)
-    {
-        $node = new FloatNode('test');
-        $this->assertSame($value, $node->normalize($value));
-    }
-
-    /**
-     * @dataProvider getValidValues
-     *
-     * @param int $value
-     */
-    public function testValidNonEmptyValues($value)
-    {
-        $node = new FloatNode('test');
-        $node->setAllowEmptyValue(false);
-
-        $this->assertSame($value, $node->finalize($value));
-    }
-
-    public function getValidValues()
-    {
-        return array(
-            array(1798.0),
-            array(-678.987),
-            array(12.56E45),
-            array(0.0),
-            // Integer are accepted too, they will be cast
-            array(17),
-            array(-10),
-            array(0),
-        );
-    }
-
-    /**
-     * @dataProvider getInvalidValues
-     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidTypeException
-     */
-    public function testNormalizeThrowsExceptionOnInvalidValues($value)
-    {
-        $node = new FloatNode('test');
-        $node->normalize($value);
-    }
-
-    public function getInvalidValues()
-    {
-        return array(
-            array(null),
-            array(''),
-            array('foo'),
-            array(true),
-            array(false),
-            array(array()),
-            array(array('foo' => 'bar')),
-            array(new \stdClass()),
-        );
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/IntegerNodeTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/IntegerNodeTest.php
deleted file mode 100644
index 58d2148599..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/IntegerNodeTest.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?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\Config\Tests\Definition;
-
-use Symfony\Component\Config\Definition\IntegerNode;
-
-class IntegerNodeTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @dataProvider getValidValues
-     */
-    public function testNormalize($value)
-    {
-        $node = new IntegerNode('test');
-        $this->assertSame($value, $node->normalize($value));
-    }
-
-    /**
-     * @dataProvider getValidValues
-     *
-     * @param int $value
-     */
-    public function testValidNonEmptyValues($value)
-    {
-        $node = new IntegerNode('test');
-        $node->setAllowEmptyValue(false);
-
-        $this->assertSame($value, $node->finalize($value));
-    }
-
-    public function getValidValues()
-    {
-        return array(
-            array(1798),
-            array(-678),
-            array(0),
-        );
-    }
-
-    /**
-     * @dataProvider getInvalidValues
-     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidTypeException
-     */
-    public function testNormalizeThrowsExceptionOnInvalidValues($value)
-    {
-        $node = new IntegerNode('test');
-        $node->normalize($value);
-    }
-
-    public function getInvalidValues()
-    {
-        return array(
-            array(null),
-            array(''),
-            array('foo'),
-            array(true),
-            array(false),
-            array(0.0),
-            array(0.1),
-            array(array()),
-            array(array('foo' => 'bar')),
-            array(new \stdClass()),
-        );
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/MergeTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/MergeTest.php
deleted file mode 100644
index 08ddc3209e..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/MergeTest.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?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\Config\Tests\Definition;
-
-use Symfony\Component\Config\Definition\Builder\TreeBuilder;
-
-class MergeTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @expectedException \Symfony\Component\Config\Definition\Exception\ForbiddenOverwriteException
-     */
-    public function testForbiddenOverwrite()
-    {
-        $tb = new TreeBuilder();
-        $tree = $tb
-            ->root('root', 'array')
-                ->children()
-                    ->node('foo', 'scalar')
-                        ->cannotBeOverwritten()
-                    ->end()
-                ->end()
-            ->end()
-            ->buildTree()
-        ;
-
-        $a = array(
-            'foo' => 'bar',
-        );
-
-        $b = array(
-            'foo' => 'moo',
-        );
-
-        $tree->merge($a, $b);
-    }
-
-    public function testUnsetKey()
-    {
-        $tb = new TreeBuilder();
-        $tree = $tb
-            ->root('root', 'array')
-                ->children()
-                    ->node('foo', 'scalar')->end()
-                    ->node('bar', 'scalar')->end()
-                    ->node('unsettable', 'array')
-                        ->canBeUnset()
-                        ->children()
-                            ->node('foo', 'scalar')->end()
-                            ->node('bar', 'scalar')->end()
-                        ->end()
-                    ->end()
-                    ->node('unsetted', 'array')
-                        ->canBeUnset()
-                        ->prototype('scalar')->end()
-                    ->end()
-                ->end()
-            ->end()
-            ->buildTree()
-        ;
-
-        $a = array(
-            'foo' => 'bar',
-            'unsettable' => array(
-                'foo' => 'a',
-                'bar' => 'b',
-            ),
-            'unsetted' => false,
-        );
-
-        $b = array(
-            'foo' => 'moo',
-            'bar' => 'b',
-            'unsettable' => false,
-            'unsetted' => array('a', 'b'),
-        );
-
-        $this->assertEquals(array(
-            'foo' => 'moo',
-            'bar' => 'b',
-            'unsettable' => false,
-            'unsetted' => array('a', 'b'),
-        ), $tree->merge($a, $b));
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
-     */
-    public function testDoesNotAllowNewKeysInSubsequentConfigs()
-    {
-        $tb = new TreeBuilder();
-        $tree = $tb
-            ->root('config', 'array')
-                ->children()
-                    ->node('test', 'array')
-                        ->disallowNewKeysInSubsequentConfigs()
-                        ->useAttributeAsKey('key')
-                        ->prototype('array')
-                            ->children()
-                                ->node('value', 'scalar')->end()
-                            ->end()
-                        ->end()
-                    ->end()
-                ->end()
-            ->end()
-            ->buildTree();
-
-        $a = array(
-            'test' => array(
-                'a' => array('value' => 'foo'),
-            ),
-        );
-
-        $b = array(
-            'test' => array(
-                'b' => array('value' => 'foo'),
-            ),
-        );
-
-        $tree->merge($a, $b);
-    }
-
-    public function testPerformsNoDeepMerging()
-    {
-        $tb = new TreeBuilder();
-
-        $tree = $tb
-            ->root('config', 'array')
-                ->children()
-                    ->node('no_deep_merging', 'array')
-                        ->performNoDeepMerging()
-                        ->children()
-                            ->node('foo', 'scalar')->end()
-                            ->node('bar', 'scalar')->end()
-                        ->end()
-                    ->end()
-                ->end()
-            ->end()
-            ->buildTree()
-        ;
-
-        $a = array(
-            'no_deep_merging' => array(
-                'foo' => 'a',
-                'bar' => 'b',
-            ),
-        );
-
-        $b = array(
-            'no_deep_merging' => array(
-                'c' => 'd',
-            ),
-        );
-
-        $this->assertEquals(array(
-            'no_deep_merging' => array(
-                'c' => 'd',
-            ),
-        ), $tree->merge($a, $b));
-    }
-
-    public function testPrototypeWithoutAKeyAttribute()
-    {
-        $tb = new TreeBuilder();
-
-        $tree = $tb
-            ->root('config', 'array')
-                ->children()
-                    ->arrayNode('append_elements')
-                        ->prototype('scalar')->end()
-                    ->end()
-                ->end()
-            ->end()
-            ->buildTree()
-        ;
-
-        $a = array(
-            'append_elements' => array('a', 'b'),
-        );
-
-        $b = array(
-            'append_elements' => array('c', 'd'),
-        );
-
-        $this->assertEquals(array('append_elements' => array('a', 'b', 'c', 'd')), $tree->merge($a, $b));
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/NormalizationTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/NormalizationTest.php
deleted file mode 100644
index a896f96221..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/NormalizationTest.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?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\Config\Tests\Definition;
-
-use Symfony\Component\Config\Definition\NodeInterface;
-use Symfony\Component\Config\Definition\Builder\TreeBuilder;
-
-class NormalizationTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @dataProvider getEncoderTests
-     */
-    public function testNormalizeEncoders($denormalized)
-    {
-        $tb = new TreeBuilder();
-        $tree = $tb
-            ->root('root_name', 'array')
-                ->fixXmlConfig('encoder')
-                ->children()
-                    ->node('encoders', 'array')
-                        ->useAttributeAsKey('class')
-                        ->prototype('array')
-                            ->beforeNormalization()->ifString()->then(function ($v) { return array('algorithm' => $v); })->end()
-                            ->children()
-                                ->node('algorithm', 'scalar')->end()
-                            ->end()
-                        ->end()
-                    ->end()
-                ->end()
-            ->end()
-            ->buildTree()
-        ;
-
-        $normalized = array(
-            'encoders' => array(
-                'foo' => array('algorithm' => 'plaintext'),
-            ),
-        );
-
-        $this->assertNormalized($tree, $denormalized, $normalized);
-    }
-
-    public function getEncoderTests()
-    {
-        $configs = array();
-
-        // XML
-        $configs[] = array(
-            'encoder' => array(
-                array('class' => 'foo', 'algorithm' => 'plaintext'),
-            ),
-        );
-
-        // XML when only one element of this type
-        $configs[] = array(
-            'encoder' => array('class' => 'foo', 'algorithm' => 'plaintext'),
-        );
-
-        // YAML/PHP
-        $configs[] = array(
-            'encoders' => array(
-                array('class' => 'foo', 'algorithm' => 'plaintext'),
-            ),
-        );
-
-        // YAML/PHP
-        $configs[] = array(
-            'encoders' => array(
-                'foo' => 'plaintext',
-            ),
-        );
-
-        // YAML/PHP
-        $configs[] = array(
-            'encoders' => array(
-                'foo' => array('algorithm' => 'plaintext'),
-            ),
-        );
-
-        return array_map(function ($v) {
-            return array($v);
-        }, $configs);
-    }
-
-    /**
-     * @dataProvider getAnonymousKeysTests
-     */
-    public function testAnonymousKeysArray($denormalized)
-    {
-        $tb = new TreeBuilder();
-        $tree = $tb
-            ->root('root', 'array')
-                ->children()
-                    ->node('logout', 'array')
-                        ->fixXmlConfig('handler')
-                        ->children()
-                            ->node('handlers', 'array')
-                                ->prototype('scalar')->end()
-                            ->end()
-                        ->end()
-                    ->end()
-                ->end()
-            ->end()
-            ->buildTree()
-        ;
-
-        $normalized = array('logout' => array('handlers' => array('a', 'b', 'c')));
-
-        $this->assertNormalized($tree, $denormalized, $normalized);
-    }
-
-    public function getAnonymousKeysTests()
-    {
-        $configs = array();
-
-        $configs[] = array(
-            'logout' => array(
-                'handlers' => array('a', 'b', 'c'),
-            ),
-        );
-
-        $configs[] = array(
-            'logout' => array(
-                'handler' => array('a', 'b', 'c'),
-            ),
-        );
-
-        return array_map(function ($v) { return array($v); }, $configs);
-    }
-
-    /**
-     * @dataProvider getNumericKeysTests
-     */
-    public function testNumericKeysAsAttributes($denormalized)
-    {
-        $normalized = array(
-            'thing' => array(42 => array('foo', 'bar'), 1337 => array('baz', 'qux')),
-        );
-
-        $this->assertNormalized($this->getNumericKeysTestTree(), $denormalized, $normalized);
-    }
-
-    public function getNumericKeysTests()
-    {
-        $configs = array();
-
-        $configs[] = array(
-            'thing' => array(
-                42 => array('foo', 'bar'), 1337 => array('baz', 'qux'),
-            ),
-        );
-
-        $configs[] = array(
-            'thing' => array(
-                array('foo', 'bar', 'id' => 42), array('baz', 'qux', 'id' => 1337),
-            ),
-        );
-
-        return array_map(function ($v) { return array($v); }, $configs);
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
-     * @expectedExceptionMessage The attribute "id" must be set for path "root.thing".
-     */
-    public function testNonAssociativeArrayThrowsExceptionIfAttributeNotSet()
-    {
-        $denormalized = array(
-            'thing' => array(
-                array('foo', 'bar'), array('baz', 'qux'),
-            ),
-        );
-
-        $this->assertNormalized($this->getNumericKeysTestTree(), $denormalized, array());
-    }
-
-    public function testAssociativeArrayPreserveKeys()
-    {
-        $tb = new TreeBuilder();
-        $tree = $tb
-            ->root('root', 'array')
-                ->prototype('array')
-                    ->children()
-                        ->node('foo', 'scalar')->end()
-                    ->end()
-                ->end()
-            ->end()
-            ->buildTree()
-        ;
-
-        $data = array('first' => array('foo' => 'bar'));
-
-        $this->assertNormalized($tree, $data, $data);
-    }
-
-    public static function assertNormalized(NodeInterface $tree, $denormalized, $normalized)
-    {
-        self::assertSame($normalized, $tree->normalize($denormalized));
-    }
-
-    private function getNumericKeysTestTree()
-    {
-        $tb = new TreeBuilder();
-        $tree = $tb
-            ->root('root', 'array')
-                ->children()
-                    ->node('thing', 'array')
-                        ->useAttributeAsKey('id')
-                        ->prototype('array')
-                            ->prototype('scalar')->end()
-                        ->end()
-                    ->end()
-                ->end()
-            ->end()
-            ->buildTree()
-        ;
-
-        return $tree;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/PrototypedArrayNodeTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/PrototypedArrayNodeTest.php
deleted file mode 100644
index c343fcfd94..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/PrototypedArrayNodeTest.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?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\Config\Tests\Definition;
-
-use Symfony\Component\Config\Definition\PrototypedArrayNode;
-use Symfony\Component\Config\Definition\ArrayNode;
-use Symfony\Component\Config\Definition\ScalarNode;
-
-class PrototypedArrayNodeTest extends \PHPUnit_Framework_TestCase
-{
-    public function testGetDefaultValueReturnsAnEmptyArrayForPrototypes()
-    {
-        $node = new PrototypedArrayNode('root');
-        $prototype = new ArrayNode(null, $node);
-        $node->setPrototype($prototype);
-        $this->assertEmpty($node->getDefaultValue());
-    }
-
-    public function testGetDefaultValueReturnsDefaultValueForPrototypes()
-    {
-        $node = new PrototypedArrayNode('root');
-        $prototype = new ArrayNode(null, $node);
-        $node->setPrototype($prototype);
-        $node->setDefaultValue(array('test'));
-        $this->assertEquals(array('test'), $node->getDefaultValue());
-    }
-
-    // a remapped key (e.g. "mapping" -> "mappings") should be unset after being used
-    public function testRemappedKeysAreUnset()
-    {
-        $node = new ArrayNode('root');
-        $mappingsNode = new PrototypedArrayNode('mappings');
-        $node->addChild($mappingsNode);
-
-        // each item under mappings is just a scalar
-        $prototype = new ScalarNode(null, $mappingsNode);
-        $mappingsNode->setPrototype($prototype);
-
-        $remappings = array();
-        $remappings[] = array('mapping', 'mappings');
-        $node->setXmlRemappings($remappings);
-
-        $normalized = $node->normalize(array('mapping' => array('foo', 'bar')));
-        $this->assertEquals(array('mappings' => array('foo', 'bar')), $normalized);
-    }
-
-    /**
-     * Tests that when a key attribute is mapped, that key is removed from the array.
-     *
-     *     <things>
-     *         <option id="option1" value="foo">
-     *         <option id="option2" value="bar">
-     *     </things>
-     *
-     * The above should finally be mapped to an array that looks like this
-     * (because "id" is the key attribute).
-     *
-     *     array(
-     *         'things' => array(
-     *             'option1' => 'foo',
-     *             'option2' => 'bar',
-     *         )
-     *     )
-     */
-    public function testMappedAttributeKeyIsRemoved()
-    {
-        $node = new PrototypedArrayNode('root');
-        $node->setKeyAttribute('id', true);
-
-        // each item under the root is an array, with one scalar item
-        $prototype = new ArrayNode(null, $node);
-        $prototype->addChild(new ScalarNode('foo'));
-        $node->setPrototype($prototype);
-
-        $children = array();
-        $children[] = array('id' => 'item_name', 'foo' => 'bar');
-        $normalized = $node->normalize($children);
-
-        $expected = array();
-        $expected['item_name'] = array('foo' => 'bar');
-        $this->assertEquals($expected, $normalized);
-    }
-
-    /**
-     * Tests the opposite of the testMappedAttributeKeyIsRemoved because
-     * the removal can be toggled with an option.
-     */
-    public function testMappedAttributeKeyNotRemoved()
-    {
-        $node = new PrototypedArrayNode('root');
-        $node->setKeyAttribute('id', false);
-
-        // each item under the root is an array, with two scalar items
-        $prototype = new ArrayNode(null, $node);
-        $prototype->addChild(new ScalarNode('foo'));
-        $prototype->addChild(new ScalarNode('id')); // the key attribute will remain
-        $node->setPrototype($prototype);
-
-        $children = array();
-        $children[] = array('id' => 'item_name', 'foo' => 'bar');
-        $normalized = $node->normalize($children);
-
-        $expected = array();
-        $expected['item_name'] = array('id' => 'item_name', 'foo' => 'bar');
-        $this->assertEquals($expected, $normalized);
-    }
-
-    public function testAddDefaultChildren()
-    {
-        $node = $this->getPrototypeNodeWithDefaultChildren();
-        $node->setAddChildrenIfNoneSet();
-        $this->assertTrue($node->hasDefaultValue());
-        $this->assertEquals(array(array('foo' => 'bar')), $node->getDefaultValue());
-
-        $node = $this->getPrototypeNodeWithDefaultChildren();
-        $node->setKeyAttribute('foobar');
-        $node->setAddChildrenIfNoneSet();
-        $this->assertTrue($node->hasDefaultValue());
-        $this->assertEquals(array('defaults' => array('foo' => 'bar')), $node->getDefaultValue());
-
-        $node = $this->getPrototypeNodeWithDefaultChildren();
-        $node->setKeyAttribute('foobar');
-        $node->setAddChildrenIfNoneSet('defaultkey');
-        $this->assertTrue($node->hasDefaultValue());
-        $this->assertEquals(array('defaultkey' => array('foo' => 'bar')), $node->getDefaultValue());
-
-        $node = $this->getPrototypeNodeWithDefaultChildren();
-        $node->setKeyAttribute('foobar');
-        $node->setAddChildrenIfNoneSet(array('defaultkey'));
-        $this->assertTrue($node->hasDefaultValue());
-        $this->assertEquals(array('defaultkey' => array('foo' => 'bar')), $node->getDefaultValue());
-
-        $node = $this->getPrototypeNodeWithDefaultChildren();
-        $node->setKeyAttribute('foobar');
-        $node->setAddChildrenIfNoneSet(array('dk1', 'dk2'));
-        $this->assertTrue($node->hasDefaultValue());
-        $this->assertEquals(array('dk1' => array('foo' => 'bar'), 'dk2' => array('foo' => 'bar')), $node->getDefaultValue());
-
-        $node = $this->getPrototypeNodeWithDefaultChildren();
-        $node->setAddChildrenIfNoneSet(array(5, 6));
-        $this->assertTrue($node->hasDefaultValue());
-        $this->assertEquals(array(0 => array('foo' => 'bar'), 1 => array('foo' => 'bar')), $node->getDefaultValue());
-
-        $node = $this->getPrototypeNodeWithDefaultChildren();
-        $node->setAddChildrenIfNoneSet(2);
-        $this->assertTrue($node->hasDefaultValue());
-        $this->assertEquals(array(array('foo' => 'bar'), array('foo' => 'bar')), $node->getDefaultValue());
-    }
-
-    public function testDefaultChildrenWinsOverDefaultValue()
-    {
-        $node = $this->getPrototypeNodeWithDefaultChildren();
-        $node->setAddChildrenIfNoneSet();
-        $node->setDefaultValue(array('bar' => 'foo'));
-        $this->assertTrue($node->hasDefaultValue());
-        $this->assertEquals(array(array('foo' => 'bar')), $node->getDefaultValue());
-    }
-
-    protected function getPrototypeNodeWithDefaultChildren()
-    {
-        $node = new PrototypedArrayNode('root');
-        $prototype = new ArrayNode(null, $node);
-        $child = new ScalarNode('foo');
-        $child->setDefaultValue('bar');
-        $prototype->addChild($child);
-        $prototype->setAddIfNotSet(true);
-        $node->setPrototype($prototype);
-
-        return $node;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/ScalarNodeTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/ScalarNodeTest.php
deleted file mode 100644
index 86c1803018..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Definition/ScalarNodeTest.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?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\Config\Tests\Definition;
-
-use Symfony\Component\Config\Definition\ScalarNode;
-
-class ScalarNodeTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @dataProvider getValidValues
-     */
-    public function testNormalize($value)
-    {
-        $node = new ScalarNode('test');
-        $this->assertSame($value, $node->normalize($value));
-    }
-
-    public function getValidValues()
-    {
-        return array(
-            array(false),
-            array(true),
-            array(null),
-            array(''),
-            array('foo'),
-            array(0),
-            array(1),
-            array(0.0),
-            array(0.1),
-        );
-    }
-
-    /**
-     * @dataProvider getInvalidValues
-     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidTypeException
-     */
-    public function testNormalizeThrowsExceptionOnInvalidValues($value)
-    {
-        $node = new ScalarNode('test');
-        $node->normalize($value);
-    }
-
-    public function getInvalidValues()
-    {
-        return array(
-            array(array()),
-            array(array('foo' => 'bar')),
-            array(new \stdClass()),
-        );
-    }
-
-    public function testNormalizeThrowsExceptionWithoutHint()
-    {
-        $node = new ScalarNode('test');
-
-        $this->setExpectedException('Symfony\Component\Config\Definition\Exception\InvalidTypeException', 'Invalid type for path "test". Expected scalar, but got array.');
-
-        $node->normalize(array());
-    }
-
-    public function testNormalizeThrowsExceptionWithErrorMessage()
-    {
-        $node = new ScalarNode('test');
-        $node->setInfo('"the test value"');
-
-        $this->setExpectedException('Symfony\Component\Config\Definition\Exception\InvalidTypeException', "Invalid type for path \"test\". Expected scalar, but got array.\nHint: \"the test value\"");
-
-        $node->normalize(array());
-    }
-
-    /**
-     * @dataProvider getValidNonEmptyValues
-     *
-     * @param mixed $value
-     */
-    public function testValidNonEmptyValues($value)
-    {
-        $node = new ScalarNode('test');
-        $node->setAllowEmptyValue(false);
-
-        $this->assertSame($value, $node->finalize($value));
-    }
-
-    public function getValidNonEmptyValues()
-    {
-        return array(
-            array(false),
-            array(true),
-            array('foo'),
-            array(0),
-            array(1),
-            array(0.0),
-            array(0.1),
-        );
-    }
-
-    /**
-     * @dataProvider getEmptyValues
-     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
-     *
-     * @param mixed $value
-     */
-    public function testNotAllowedEmptyValuesThrowException($value)
-    {
-        $node = new ScalarNode('test');
-        $node->setAllowEmptyValue(false);
-        $node->finalize($value);
-    }
-
-    public function getEmptyValues()
-    {
-        return array(
-            array(null),
-            array(''),
-        );
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Exception/FileLoaderLoadExceptionTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Exception/FileLoaderLoadExceptionTest.php
deleted file mode 100644
index c3d050c75d..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Exception/FileLoaderLoadExceptionTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?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\Config\Tests\Exception;
-
-use Symfony\Component\Config\Exception\FileLoaderLoadException;
-
-class FileLoaderLoadExceptionTest extends \PHPUnit_Framework_TestCase
-{
-    public function testMessageCannotLoadResource()
-    {
-        $exception = new FileLoaderLoadException('resource', null);
-        $this->assertEquals('Cannot load resource "resource".', $exception->getMessage());
-    }
-
-    public function testMessageCannotImportResourceFromSource()
-    {
-        $exception = new FileLoaderLoadException('resource', 'sourceResource');
-        $this->assertEquals('Cannot import resource "resource" from "sourceResource".', $exception->getMessage());
-    }
-
-    public function testMessageCannotImportBundleResource()
-    {
-        $exception = new FileLoaderLoadException('@resource', 'sourceResource');
-        $this->assertEquals(
-            'Cannot import resource "@resource" from "sourceResource". '.
-            'Make sure the "resource" bundle is correctly registered and loaded in the application kernel class. '.
-            'If the bundle is registered, make sure the bundle path "@resource" is not empty.',
-            $exception->getMessage()
-        );
-    }
-
-    public function testMessageHasPreviousErrorWithDotAndUnableToLoad()
-    {
-        $exception = new FileLoaderLoadException(
-            'resource',
-            null,
-            null,
-            new \Exception('There was a previous error with an ending dot.')
-        );
-        $this->assertEquals(
-            'There was a previous error with an ending dot in resource (which is loaded in resource "resource").',
-            $exception->getMessage()
-        );
-    }
-
-    public function testMessageHasPreviousErrorWithoutDotAndUnableToLoad()
-    {
-        $exception = new FileLoaderLoadException(
-            'resource',
-            null,
-            null,
-            new \Exception('There was a previous error with no ending dot')
-        );
-        $this->assertEquals(
-            'There was a previous error with no ending dot in resource (which is loaded in resource "resource").',
-            $exception->getMessage()
-        );
-    }
-
-    public function testMessageHasPreviousErrorAndUnableToLoadBundle()
-    {
-        $exception = new FileLoaderLoadException(
-            '@resource',
-            null,
-            null,
-            new \Exception('There was a previous error with an ending dot.')
-        );
-        $this->assertEquals(
-            'There was a previous error with an ending dot in @resource '.
-            '(which is loaded in resource "@resource"). '.
-            'Make sure the "resource" bundle is correctly registered and loaded in the application kernel class. '.
-            'If the bundle is registered, make sure the bundle path "@resource" is not empty.',
-            $exception->getMessage()
-        );
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/FileLocatorTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/FileLocatorTest.php
deleted file mode 100644
index d479f2569f..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/FileLocatorTest.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?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\Config\Tests;
-
-use Symfony\Component\Config\FileLocator;
-
-class FileLocatorTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @dataProvider getIsAbsolutePathTests
-     */
-    public function testIsAbsolutePath($path)
-    {
-        $loader = new FileLocator(array());
-        $r = new \ReflectionObject($loader);
-        $m = $r->getMethod('isAbsolutePath');
-        $m->setAccessible(true);
-
-        $this->assertTrue($m->invoke($loader, $path), '->isAbsolutePath() returns true for an absolute path');
-    }
-
-    public function getIsAbsolutePathTests()
-    {
-        return array(
-            array('/foo.xml'),
-            array('c:\\\\foo.xml'),
-            array('c:/foo.xml'),
-            array('\\server\\foo.xml'),
-            array('https://server/foo.xml'),
-            array('phar://server/foo.xml'),
-        );
-    }
-
-    public function testLocate()
-    {
-        $loader = new FileLocator(__DIR__.'/Fixtures');
-
-        $this->assertEquals(
-            __DIR__.DIRECTORY_SEPARATOR.'FileLocatorTest.php',
-            $loader->locate('FileLocatorTest.php', __DIR__),
-            '->locate() returns the absolute filename if the file exists in the given path'
-        );
-
-        $this->assertEquals(
-            __DIR__.'/Fixtures'.DIRECTORY_SEPARATOR.'foo.xml',
-            $loader->locate('foo.xml', __DIR__),
-            '->locate() returns the absolute filename if the file exists in one of the paths given in the constructor'
-        );
-
-        $this->assertEquals(
-            __DIR__.'/Fixtures'.DIRECTORY_SEPARATOR.'foo.xml',
-            $loader->locate(__DIR__.'/Fixtures'.DIRECTORY_SEPARATOR.'foo.xml', __DIR__),
-            '->locate() returns the absolute filename if the file exists in one of the paths given in the constructor'
-        );
-
-        $loader = new FileLocator(array(__DIR__.'/Fixtures', __DIR__.'/Fixtures/Again'));
-
-        $this->assertEquals(
-            array(__DIR__.'/Fixtures'.DIRECTORY_SEPARATOR.'foo.xml', __DIR__.'/Fixtures/Again'.DIRECTORY_SEPARATOR.'foo.xml'),
-            $loader->locate('foo.xml', __DIR__, false),
-            '->locate() returns an array of absolute filenames'
-        );
-
-        $this->assertEquals(
-            array(__DIR__.'/Fixtures'.DIRECTORY_SEPARATOR.'foo.xml', __DIR__.'/Fixtures/Again'.DIRECTORY_SEPARATOR.'foo.xml'),
-            $loader->locate('foo.xml', __DIR__.'/Fixtures', false),
-            '->locate() returns an array of absolute filenames'
-        );
-
-        $loader = new FileLocator(__DIR__.'/Fixtures/Again');
-
-        $this->assertEquals(
-            array(__DIR__.'/Fixtures'.DIRECTORY_SEPARATOR.'foo.xml', __DIR__.'/Fixtures/Again'.DIRECTORY_SEPARATOR.'foo.xml'),
-            $loader->locate('foo.xml', __DIR__.'/Fixtures', false),
-            '->locate() returns an array of absolute filenames'
-        );
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage The file "foobar.xml" does not exist
-     */
-    public function testLocateThrowsAnExceptionIfTheFileDoesNotExists()
-    {
-        $loader = new FileLocator(array(__DIR__.'/Fixtures'));
-
-        $loader->locate('foobar.xml', __DIR__);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testLocateThrowsAnExceptionIfTheFileDoesNotExistsInAbsolutePath()
-    {
-        $loader = new FileLocator(array(__DIR__.'/Fixtures'));
-
-        $loader->locate(__DIR__.'/Fixtures/foobar.xml', __DIR__);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage An empty file name is not valid to be located.
-     */
-    public function testLocateEmpty()
-    {
-        $loader = new FileLocator(array(__DIR__.'/Fixtures'));
-
-        $loader->locate(null, __DIR__);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Again/foo.xml b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Again/foo.xml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Builder/BarNodeDefinition.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Builder/BarNodeDefinition.php
deleted file mode 100644
index 47701c1b29..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Builder/BarNodeDefinition.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Config\Tests\Definition\Builder;
-
-use Symfony\Component\Config\Definition\Builder\NodeDefinition;
-
-class BarNodeDefinition extends NodeDefinition
-{
-    protected function createNode()
-    {
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Builder/NodeBuilder.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Builder/NodeBuilder.php
deleted file mode 100644
index aa5986311b..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Builder/NodeBuilder.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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\Config\Tests\Definition\Builder;
-
-use Symfony\Component\Config\Definition\Builder\NodeBuilder as BaseNodeBuilder;
-
-class NodeBuilder extends BaseNodeBuilder
-{
-    public function barNode($name)
-    {
-        return $this->node($name, 'bar');
-    }
-
-    protected function getNodeClass($type)
-    {
-        switch ($type) {
-            case 'variable':
-                return __NAMESPACE__.'\\'.ucfirst($type).'NodeDefinition';
-            case 'bar':
-                return __NAMESPACE__.'\\'.ucfirst($type).'NodeDefinition';
-            default:
-                return parent::getNodeClass($type);
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Builder/VariableNodeDefinition.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Builder/VariableNodeDefinition.php
deleted file mode 100644
index 1017880c11..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Builder/VariableNodeDefinition.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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\Config\Tests\Definition\Builder;
-
-use Symfony\Component\Config\Definition\Builder\VariableNodeDefinition as BaseVariableNodeDefinition;
-
-class VariableNodeDefinition extends BaseVariableNodeDefinition
-{
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Configuration/ExampleConfiguration.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Configuration/ExampleConfiguration.php
deleted file mode 100644
index 7125dc491e..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Configuration/ExampleConfiguration.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?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\Config\Tests\Fixtures\Configuration;
-
-use Symfony\Component\Config\Definition\Builder\TreeBuilder;
-use Symfony\Component\Config\Definition\ConfigurationInterface;
-
-class ExampleConfiguration implements ConfigurationInterface
-{
-    public function getConfigTreeBuilder()
-    {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('acme_root');
-
-        $rootNode
-            ->fixXmlConfig('parameter')
-            ->fixXmlConfig('connection')
-            ->children()
-                ->booleanNode('boolean')->defaultTrue()->end()
-                ->scalarNode('scalar_empty')->end()
-                ->scalarNode('scalar_null')->defaultNull()->end()
-                ->scalarNode('scalar_true')->defaultTrue()->end()
-                ->scalarNode('scalar_false')->defaultFalse()->end()
-                ->scalarNode('scalar_default')->defaultValue('default')->end()
-                ->scalarNode('scalar_array_empty')->defaultValue(array())->end()
-                ->scalarNode('scalar_array_defaults')->defaultValue(array('elem1', 'elem2'))->end()
-                ->scalarNode('scalar_required')->isRequired()->end()
-                ->enumNode('enum_with_default')->values(array('this', 'that'))->defaultValue('this')->end()
-                ->enumNode('enum')->values(array('this', 'that'))->end()
-                ->arrayNode('array')
-                    ->info('some info')
-                    ->canBeUnset()
-                    ->children()
-                        ->scalarNode('child1')->end()
-                        ->scalarNode('child2')->end()
-                        ->scalarNode('child3')
-                            ->info(
-                                "this is a long\n".
-                                "multi-line info text\n".
-                                'which should be indented'
-                            )
-                            ->example('example setting')
-                        ->end()
-                    ->end()
-                ->end()
-                ->arrayNode('parameters')
-                    ->useAttributeAsKey('name')
-                    ->prototype('scalar')->info('Parameter name')->end()
-                ->end()
-                ->arrayNode('connections')
-                    ->prototype('array')
-                        ->children()
-                            ->scalarNode('user')->end()
-                            ->scalarNode('pass')->end()
-                        ->end()
-                    ->end()
-                ->end()
-            ->end()
-        ;
-
-        return $treeBuilder;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Util/document_type.xml b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Util/document_type.xml
deleted file mode 100644
index 4c25228263..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Util/document_type.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE scan [<!ENTITY test SYSTEM "php://filter/read=convert.base64-encode/resource={{ resource }}">]>
-<scan></scan>
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Util/invalid.xml b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Util/invalid.xml
deleted file mode 100644
index a07af9fd85..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Util/invalid.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Util/invalid_schema.xml b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Util/invalid_schema.xml
deleted file mode 100644
index e2725a2c2a..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Util/invalid_schema.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root2 xmlns="http://example.com/schema" />
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Util/schema.xsd b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Util/schema.xsd
deleted file mode 100644
index e56820f691..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Util/schema.xsd
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema xmlns="http://example.com/schema"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://example.com/schema"
-    elementFormDefault="qualified">
-
-  <xsd:element name="root" />
-</xsd:schema>
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Util/valid.xml b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Util/valid.xml
deleted file mode 100644
index a96bb38267..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/Util/valid.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root xmlns="http://example.com/schema">
-</root>
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/foo.xml b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Fixtures/foo.xml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Loader/DelegatingLoaderTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Loader/DelegatingLoaderTest.php
deleted file mode 100644
index cdb0980307..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Loader/DelegatingLoaderTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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\Config\Tests\Loader;
-
-use Symfony\Component\Config\Loader\LoaderResolver;
-use Symfony\Component\Config\Loader\DelegatingLoader;
-
-class DelegatingLoaderTest extends \PHPUnit_Framework_TestCase
-{
-    public function testConstructor()
-    {
-        $loader = new DelegatingLoader($resolver = new LoaderResolver());
-        $this->assertTrue(true, '__construct() takes a loader resolver as its first argument');
-    }
-
-    public function testGetSetResolver()
-    {
-        $resolver = new LoaderResolver();
-        $loader = new DelegatingLoader($resolver);
-        $this->assertSame($resolver, $loader->getResolver(), '->getResolver() gets the resolver loader');
-        $loader->setResolver($resolver = new LoaderResolver());
-        $this->assertSame($resolver, $loader->getResolver(), '->setResolver() sets the resolver loader');
-    }
-
-    public function testSupports()
-    {
-        $loader1 = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
-        $loader1->expects($this->once())->method('supports')->will($this->returnValue(true));
-        $loader = new DelegatingLoader(new LoaderResolver(array($loader1)));
-        $this->assertTrue($loader->supports('foo.xml'), '->supports() returns true if the resource is loadable');
-
-        $loader1 = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
-        $loader1->expects($this->once())->method('supports')->will($this->returnValue(false));
-        $loader = new DelegatingLoader(new LoaderResolver(array($loader1)));
-        $this->assertFalse($loader->supports('foo.foo'), '->supports() returns false if the resource is not loadable');
-    }
-
-    public function testLoad()
-    {
-        $loader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
-        $loader->expects($this->once())->method('supports')->will($this->returnValue(true));
-        $loader->expects($this->once())->method('load');
-        $resolver = new LoaderResolver(array($loader));
-        $loader = new DelegatingLoader($resolver);
-
-        $loader->load('foo');
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Config\Exception\FileLoaderLoadException
-     */
-    public function testLoadThrowsAnExceptionIfTheResourceCannotBeLoaded()
-    {
-        $loader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
-        $loader->expects($this->once())->method('supports')->will($this->returnValue(false));
-        $resolver = new LoaderResolver(array($loader));
-        $loader = new DelegatingLoader($resolver);
-
-        $loader->load('foo');
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Loader/FileLoaderTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Loader/FileLoaderTest.php
deleted file mode 100644
index 1e8e91eda1..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Loader/FileLoaderTest.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?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\Config\Tests\Loader;
-
-use Symfony\Component\Config\Loader\FileLoader;
-use Symfony\Component\Config\Loader\LoaderResolver;
-
-class FileLoaderTest extends \PHPUnit_Framework_TestCase
-{
-    public function testImportWithFileLocatorDelegation()
-    {
-        $locatorMock = $this->getMock('Symfony\Component\Config\FileLocatorInterface');
-
-        $locatorMockForAdditionalLoader = $this->getMock('Symfony\Component\Config\FileLocatorInterface');
-        $locatorMockForAdditionalLoader->expects($this->any())->method('locate')->will($this->onConsecutiveCalls(
-                array('path/to/file1'),                    // Default
-                array('path/to/file1', 'path/to/file2'),   // First is imported
-                array('path/to/file1', 'path/to/file2'),   // Second is imported
-                array('path/to/file1'),                    // Exception
-                array('path/to/file1', 'path/to/file2')    // Exception
-                ));
-
-        $fileLoader = new TestFileLoader($locatorMock);
-        $fileLoader->setSupports(false);
-        $fileLoader->setCurrentDir('.');
-
-        $additionalLoader = new TestFileLoader($locatorMockForAdditionalLoader);
-        $additionalLoader->setCurrentDir('.');
-
-        $fileLoader->setResolver($loaderResolver = new LoaderResolver(array($fileLoader, $additionalLoader)));
-
-        // Default case
-        $this->assertSame('path/to/file1', $fileLoader->import('my_resource'));
-
-        // Check first file is imported if not already loading
-        $this->assertSame('path/to/file1', $fileLoader->import('my_resource'));
-
-        // Check second file is imported if first is already loading
-        $fileLoader->addLoading('path/to/file1');
-        $this->assertSame('path/to/file2', $fileLoader->import('my_resource'));
-
-        // Check exception throws if first (and only available) file is already loading
-        try {
-            $fileLoader->import('my_resource');
-            $this->fail('->import() throws a FileLoaderImportCircularReferenceException if the resource is already loading');
-        } catch (\Exception $e) {
-            $this->assertInstanceOf('Symfony\Component\Config\Exception\FileLoaderImportCircularReferenceException', $e, '->import() throws a FileLoaderImportCircularReferenceException if the resource is already loading');
-        }
-
-        // Check exception throws if all files are already loading
-        try {
-            $fileLoader->addLoading('path/to/file2');
-            $fileLoader->import('my_resource');
-            $this->fail('->import() throws a FileLoaderImportCircularReferenceException if the resource is already loading');
-        } catch (\Exception $e) {
-            $this->assertInstanceOf('Symfony\Component\Config\Exception\FileLoaderImportCircularReferenceException', $e, '->import() throws a FileLoaderImportCircularReferenceException if the resource is already loading');
-        }
-    }
-}
-
-class TestFileLoader extends FileLoader
-{
-    private $supports = true;
-
-    public function load($resource, $type = null)
-    {
-        return $resource;
-    }
-
-    public function supports($resource, $type = null)
-    {
-        return $this->supports;
-    }
-
-    public function addLoading($resource)
-    {
-        self::$loading[$resource] = true;
-    }
-
-    public function removeLoading($resource)
-    {
-        unset(self::$loading[$resource]);
-    }
-
-    public function clearLoading()
-    {
-        self::$loading = array();
-    }
-
-    public function setSupports($supports)
-    {
-        $this->supports = $supports;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Loader/LoaderResolverTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Loader/LoaderResolverTest.php
deleted file mode 100644
index 03db21be4e..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Loader/LoaderResolverTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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\Config\Tests\Loader;
-
-use Symfony\Component\Config\Loader\LoaderResolver;
-
-class LoaderResolverTest extends \PHPUnit_Framework_TestCase
-{
-    public function testConstructor()
-    {
-        $resolver = new LoaderResolver(array(
-            $loader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface'),
-        ));
-
-        $this->assertEquals(array($loader), $resolver->getLoaders(), '__construct() takes an array of loaders as its first argument');
-    }
-
-    public function testResolve()
-    {
-        $loader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
-        $resolver = new LoaderResolver(array($loader));
-        $this->assertFalse($resolver->resolve('foo.foo'), '->resolve() returns false if no loader is able to load the resource');
-
-        $loader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
-        $loader->expects($this->once())->method('supports')->will($this->returnValue(true));
-        $resolver = new LoaderResolver(array($loader));
-        $this->assertEquals($loader, $resolver->resolve(function () {}), '->resolve() returns the loader for the given resource');
-    }
-
-    public function testLoaders()
-    {
-        $resolver = new LoaderResolver();
-        $resolver->addLoader($loader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface'));
-
-        $this->assertEquals(array($loader), $resolver->getLoaders(), 'addLoader() adds a loader');
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Loader/LoaderTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Loader/LoaderTest.php
deleted file mode 100644
index e938a4b071..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Loader/LoaderTest.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?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\Config\Tests\Loader;
-
-use Symfony\Component\Config\Loader\Loader;
-
-class LoaderTest extends \PHPUnit_Framework_TestCase
-{
-    public function testGetSetResolver()
-    {
-        $resolver = $this->getMock('Symfony\Component\Config\Loader\LoaderResolverInterface');
-
-        $loader = new ProjectLoader1();
-        $loader->setResolver($resolver);
-
-        $this->assertSame($resolver, $loader->getResolver(), '->setResolver() sets the resolver loader');
-    }
-
-    public function testResolve()
-    {
-        $resolvedLoader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
-
-        $resolver = $this->getMock('Symfony\Component\Config\Loader\LoaderResolverInterface');
-        $resolver->expects($this->once())
-            ->method('resolve')
-            ->with('foo.xml')
-            ->will($this->returnValue($resolvedLoader));
-
-        $loader = new ProjectLoader1();
-        $loader->setResolver($resolver);
-
-        $this->assertSame($loader, $loader->resolve('foo.foo'), '->resolve() finds a loader');
-        $this->assertSame($resolvedLoader, $loader->resolve('foo.xml'), '->resolve() finds a loader');
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Config\Exception\FileLoaderLoadException
-     */
-    public function testResolveWhenResolverCannotFindLoader()
-    {
-        $resolver = $this->getMock('Symfony\Component\Config\Loader\LoaderResolverInterface');
-        $resolver->expects($this->once())
-            ->method('resolve')
-            ->with('FOOBAR')
-            ->will($this->returnValue(false));
-
-        $loader = new ProjectLoader1();
-        $loader->setResolver($resolver);
-
-        $loader->resolve('FOOBAR');
-    }
-
-    public function testImport()
-    {
-        $resolvedLoader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
-        $resolvedLoader->expects($this->once())
-            ->method('load')
-            ->with('foo')
-            ->will($this->returnValue('yes'));
-
-        $resolver = $this->getMock('Symfony\Component\Config\Loader\LoaderResolverInterface');
-        $resolver->expects($this->once())
-            ->method('resolve')
-            ->with('foo')
-            ->will($this->returnValue($resolvedLoader));
-
-        $loader = new ProjectLoader1();
-        $loader->setResolver($resolver);
-
-        $this->assertEquals('yes', $loader->import('foo'));
-    }
-
-    public function testImportWithType()
-    {
-        $resolvedLoader = $this->getMock('Symfony\Component\Config\Loader\LoaderInterface');
-        $resolvedLoader->expects($this->once())
-            ->method('load')
-            ->with('foo', 'bar')
-            ->will($this->returnValue('yes'));
-
-        $resolver = $this->getMock('Symfony\Component\Config\Loader\LoaderResolverInterface');
-        $resolver->expects($this->once())
-            ->method('resolve')
-            ->with('foo', 'bar')
-            ->will($this->returnValue($resolvedLoader));
-
-        $loader = new ProjectLoader1();
-        $loader->setResolver($resolver);
-
-        $this->assertEquals('yes', $loader->import('foo', 'bar'));
-    }
-}
-
-class ProjectLoader1 extends Loader
-{
-    public function load($resource, $type = null)
-    {
-    }
-
-    public function supports($resource, $type = null)
-    {
-        return is_string($resource) && 'foo' === pathinfo($resource, PATHINFO_EXTENSION);
-    }
-
-    public function getType()
-    {
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Resource/DirectoryResourceTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Resource/DirectoryResourceTest.php
deleted file mode 100644
index 651a59e39d..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Resource/DirectoryResourceTest.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?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\Config\Tests\Resource;
-
-use Symfony\Component\Config\Resource\DirectoryResource;
-
-class DirectoryResourceTest extends \PHPUnit_Framework_TestCase
-{
-    protected $directory;
-
-    protected function setUp()
-    {
-        $this->directory = sys_get_temp_dir().DIRECTORY_SEPARATOR.'symfonyDirectoryIterator';
-        if (!file_exists($this->directory)) {
-            mkdir($this->directory);
-        }
-        touch($this->directory.'/tmp.xml');
-    }
-
-    protected function tearDown()
-    {
-        if (!is_dir($this->directory)) {
-            return;
-        }
-        $this->removeDirectory($this->directory);
-    }
-
-    protected function removeDirectory($directory)
-    {
-        $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($directory), \RecursiveIteratorIterator::CHILD_FIRST);
-        foreach ($iterator as $path) {
-            if (preg_match('#[/\\\\]\.\.?$#', $path->__toString())) {
-                continue;
-            }
-            if ($path->isDir()) {
-                rmdir($path->__toString());
-            } else {
-                unlink($path->__toString());
-            }
-        }
-        rmdir($directory);
-    }
-
-    public function testGetResource()
-    {
-        $resource = new DirectoryResource($this->directory);
-        $this->assertSame($this->directory, $resource->getResource(), '->getResource() returns the path to the resource');
-    }
-
-    public function testGetPattern()
-    {
-        $resource = new DirectoryResource($this->directory, 'bar');
-        $this->assertEquals('bar', $resource->getPattern());
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessageRegExp /The directory ".*" does not exist./
-     */
-    public function testResourceDoesNotExist()
-    {
-        $resource = new DirectoryResource('/____foo/foobar'.mt_rand(1, 999999));
-    }
-
-    public function testIsFresh()
-    {
-        $resource = new DirectoryResource($this->directory);
-        $this->assertTrue($resource->isFresh(time() + 10), '->isFresh() returns true if the resource has not changed');
-        $this->assertFalse($resource->isFresh(time() - 86400), '->isFresh() returns false if the resource has been updated');
-    }
-
-    public function testIsFreshForDeletedResources()
-    {
-        $resource = new DirectoryResource($this->directory);
-        $this->removeDirectory($this->directory);
-
-        $this->assertFalse($resource->isFresh(time()), '->isFresh() returns false if the resource does not exist');
-    }
-
-    public function testIsFreshUpdateFile()
-    {
-        $resource = new DirectoryResource($this->directory);
-        touch($this->directory.'/tmp.xml', time() + 20);
-        $this->assertFalse($resource->isFresh(time() + 10), '->isFresh() returns false if an existing file is modified');
-    }
-
-    public function testIsFreshNewFile()
-    {
-        $resource = new DirectoryResource($this->directory);
-        touch($this->directory.'/new.xml', time() + 20);
-        $this->assertFalse($resource->isFresh(time() + 10), '->isFresh() returns false if a new file is added');
-    }
-
-    public function testIsFreshNewFileWithDifferentPattern()
-    {
-        $resource = new DirectoryResource($this->directory, '/.xml$/');
-        touch($this->directory.'/new.yaml', time() + 20);
-        $this->assertTrue($resource->isFresh(time() + 10), '->isFresh() returns true if a new file with a non-matching pattern is added');
-    }
-
-    public function testIsFreshDeleteFile()
-    {
-        $resource = new DirectoryResource($this->directory);
-        unlink($this->directory.'/tmp.xml');
-        $this->assertFalse($resource->isFresh(time()), '->isFresh() returns false if an existing file is removed');
-    }
-
-    public function testIsFreshDeleteDirectory()
-    {
-        $resource = new DirectoryResource($this->directory);
-        $this->removeDirectory($this->directory);
-        $this->assertFalse($resource->isFresh(time()), '->isFresh() returns false if the whole resource is removed');
-    }
-
-    public function testIsFreshCreateFileInSubdirectory()
-    {
-        $subdirectory = $this->directory.'/subdirectory';
-        mkdir($subdirectory);
-
-        $resource = new DirectoryResource($this->directory);
-        $this->assertTrue($resource->isFresh(time() + 10), '->isFresh() returns true if an unmodified subdirectory exists');
-
-        touch($subdirectory.'/newfile.xml', time() + 20);
-        $this->assertFalse($resource->isFresh(time() + 10), '->isFresh() returns false if a new file in a subdirectory is added');
-    }
-
-    public function testIsFreshModifySubdirectory()
-    {
-        $resource = new DirectoryResource($this->directory);
-
-        $subdirectory = $this->directory.'/subdirectory';
-        mkdir($subdirectory);
-        touch($subdirectory, time() + 20);
-
-        $this->assertFalse($resource->isFresh(time() + 10), '->isFresh() returns false if a subdirectory is modified (e.g. a file gets deleted)');
-    }
-
-    public function testFilterRegexListNoMatch()
-    {
-        $resource = new DirectoryResource($this->directory, '/\.(foo|xml)$/');
-
-        touch($this->directory.'/new.bar', time() + 20);
-        $this->assertTrue($resource->isFresh(time() + 10), '->isFresh() returns true if a new file not matching the filter regex is created');
-    }
-
-    public function testFilterRegexListMatch()
-    {
-        $resource = new DirectoryResource($this->directory, '/\.(foo|xml)$/');
-
-        touch($this->directory.'/new.xml', time() + 20);
-        $this->assertFalse($resource->isFresh(time() + 10), '->isFresh() returns false if an new file matching the filter regex is created ');
-    }
-
-    public function testSerializeUnserialize()
-    {
-        $resource = new DirectoryResource($this->directory, '/\.(foo|xml)$/');
-
-        $unserialized = unserialize(serialize($resource));
-
-        $this->assertSame($this->directory, $resource->getResource());
-        $this->assertSame('/\.(foo|xml)$/', $resource->getPattern());
-    }
-
-    public function testResourcesWithDifferentPatternsAreDifferent()
-    {
-        $resourceA = new DirectoryResource($this->directory, '/.xml$/');
-        $resourceB = new DirectoryResource($this->directory, '/.yaml$/');
-
-        $this->assertEquals(2, count(array_unique(array($resourceA, $resourceB))));
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Resource/FileExistenceResourceTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Resource/FileExistenceResourceTest.php
deleted file mode 100644
index 56ee584b1a..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Resource/FileExistenceResourceTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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\Config\Tests\Resource;
-
-use Symfony\Component\Config\Resource\FileExistenceResource;
-
-class FileExistenceResourceTest extends \PHPUnit_Framework_TestCase
-{
-    protected $resource;
-    protected $file;
-    protected $time;
-
-    protected function setUp()
-    {
-        $this->file = realpath(sys_get_temp_dir()).'/tmp.xml';
-        $this->time = time();
-        $this->resource = new FileExistenceResource($this->file);
-    }
-
-    protected function tearDown()
-    {
-        if (file_exists($this->file)) {
-            unlink($this->file);
-        }
-    }
-
-    public function testToString()
-    {
-        $this->assertSame($this->file, (string) $this->resource);
-    }
-
-    public function testGetResource()
-    {
-        $this->assertSame($this->file, $this->resource->getResource(), '->getResource() returns the path to the resource');
-    }
-
-    public function testIsFreshWithExistingResource()
-    {
-        touch($this->file, $this->time);
-        $serialized = serialize(new FileExistenceResource($this->file));
-
-        $resource = unserialize($serialized);
-        $this->assertTrue($resource->isFresh($this->time), '->isFresh() returns true if the resource is still present');
-
-        unlink($this->file);
-        $resource = unserialize($serialized);
-        $this->assertFalse($resource->isFresh($this->time), '->isFresh() returns false if the resource has been deleted');
-    }
-
-    public function testIsFreshWithAbsentResource()
-    {
-        $serialized = serialize(new FileExistenceResource($this->file));
-
-        $resource = unserialize($serialized);
-        $this->assertTrue($resource->isFresh($this->time), '->isFresh() returns true if the resource is still absent');
-
-        touch($this->file, $this->time);
-        $resource = unserialize($serialized);
-        $this->assertFalse($resource->isFresh($this->time), '->isFresh() returns false if the resource has been created');
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Resource/FileResourceTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Resource/FileResourceTest.php
deleted file mode 100644
index 6a168e6351..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Resource/FileResourceTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?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\Config\Tests\Resource;
-
-use Symfony\Component\Config\Resource\FileResource;
-
-class FileResourceTest extends \PHPUnit_Framework_TestCase
-{
-    protected $resource;
-    protected $file;
-    protected $time;
-
-    protected function setUp()
-    {
-        $this->file = sys_get_temp_dir().'/tmp.xml';
-        $this->time = time();
-        touch($this->file, $this->time);
-        $this->resource = new FileResource($this->file);
-    }
-
-    protected function tearDown()
-    {
-        if (!file_exists($this->file)) {
-            return;
-        }
-
-        unlink($this->file);
-    }
-
-    public function testGetResource()
-    {
-        $this->assertSame(realpath($this->file), $this->resource->getResource(), '->getResource() returns the path to the resource');
-    }
-
-    public function testGetResourceWithScheme()
-    {
-        $resource = new FileResource('file://'.$this->file);
-        $this->assertSame('file://'.$this->file, $resource->getResource(), '->getResource() returns the path to the schemed resource');
-    }
-
-    public function testToString()
-    {
-        $this->assertSame(realpath($this->file), (string) $this->resource);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessageRegExp /The file ".*" does not exist./
-     */
-    public function testResourceDoesNotExist()
-    {
-        $resource = new FileResource('/____foo/foobar'.mt_rand(1, 999999));
-    }
-
-    public function testIsFresh()
-    {
-        $this->assertTrue($this->resource->isFresh($this->time), '->isFresh() returns true if the resource has not changed in same second');
-        $this->assertTrue($this->resource->isFresh($this->time + 10), '->isFresh() returns true if the resource has not changed');
-        $this->assertFalse($this->resource->isFresh($this->time - 86400), '->isFresh() returns false if the resource has been updated');
-    }
-
-    public function testIsFreshForDeletedResources()
-    {
-        unlink($this->file);
-
-        $this->assertFalse($this->resource->isFresh($this->time), '->isFresh() returns false if the resource does not exist');
-    }
-
-    public function testSerializeUnserialize()
-    {
-        $unserialized = unserialize(serialize($this->resource));
-
-        $this->assertSame(realpath($this->file), $this->resource->getResource());
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Resource/ResourceStub.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Resource/ResourceStub.php
deleted file mode 100644
index b01729cbff..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Resource/ResourceStub.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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\Config\Tests\Resource;
-
-use Symfony\Component\Config\Resource\SelfCheckingResourceInterface;
-
-class ResourceStub implements SelfCheckingResourceInterface
-{
-    private $fresh = true;
-
-    public function setFresh($isFresh)
-    {
-        $this->fresh = $isFresh;
-    }
-
-    public function __toString()
-    {
-        return 'stub';
-    }
-
-    public function isFresh($timestamp)
-    {
-        return $this->fresh;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/ResourceCheckerConfigCacheTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/ResourceCheckerConfigCacheTest.php
deleted file mode 100644
index 6a915ffed7..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/ResourceCheckerConfigCacheTest.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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\Config\Tests;
-
-use Symfony\Component\Config\Tests\Resource\ResourceStub;
-use Symfony\Component\Config\ResourceCheckerConfigCache;
-
-class ResourceCheckerConfigCacheTest extends \PHPUnit_Framework_TestCase
-{
-    private $cacheFile = null;
-
-    protected function setUp()
-    {
-        $this->cacheFile = tempnam(sys_get_temp_dir(), 'config_');
-    }
-
-    protected function tearDown()
-    {
-        $files = array($this->cacheFile, "{$this->cacheFile}.meta");
-
-        foreach ($files as $file) {
-            if (file_exists($file)) {
-                unlink($file);
-            }
-        }
-    }
-
-    public function testGetPath()
-    {
-        $cache = new ResourceCheckerConfigCache($this->cacheFile);
-
-        $this->assertSame($this->cacheFile, $cache->getPath());
-    }
-
-    public function testCacheIsNotFreshIfEmpty()
-    {
-        $checker = $this->getMock('\Symfony\Component\Config\ResourceCheckerInterface')
-            ->expects($this->never())->method('supports');
-
-        /* If there is nothing in the cache, it needs to be filled (and thus it's not fresh).
-            It does not matter if you provide checkers or not. */
-
-        unlink($this->cacheFile); // remove tempnam() side effect
-        $cache = new ResourceCheckerConfigCache($this->cacheFile, array($checker));
-
-        $this->assertFalse($cache->isFresh());
-    }
-
-    public function testCacheIsFreshIfNocheckerProvided()
-    {
-        /* For example in prod mode, you may choose not to run any checkers
-           at all. In that case, the cache should always be considered fresh. */
-        $cache = new ResourceCheckerConfigCache($this->cacheFile);
-        $this->assertTrue($cache->isFresh());
-    }
-
-    public function testResourcesWithoutcheckersAreIgnoredAndConsideredFresh()
-    {
-        /* As in the previous test, but this time we have a resource. */
-        $cache = new ResourceCheckerConfigCache($this->cacheFile);
-        $cache->write('', array(new ResourceStub()));
-
-        $this->assertTrue($cache->isFresh()); // no (matching) ResourceChecker passed
-    }
-
-    public function testIsFreshWithchecker()
-    {
-        $checker = $this->getMock('\Symfony\Component\Config\ResourceCheckerInterface');
-
-        $checker->expects($this->once())
-                  ->method('supports')
-                  ->willReturn(true);
-
-        $checker->expects($this->once())
-                  ->method('isFresh')
-                  ->willReturn(true);
-
-        $cache = new ResourceCheckerConfigCache($this->cacheFile, array($checker));
-        $cache->write('', array(new ResourceStub()));
-
-        $this->assertTrue($cache->isFresh());
-    }
-
-    public function testIsNotFreshWithchecker()
-    {
-        $checker = $this->getMock('\Symfony\Component\Config\ResourceCheckerInterface');
-
-        $checker->expects($this->once())
-                  ->method('supports')
-                  ->willReturn(true);
-
-        $checker->expects($this->once())
-                  ->method('isFresh')
-                  ->willReturn(false);
-
-        $cache = new ResourceCheckerConfigCache($this->cacheFile, array($checker));
-        $cache->write('', array(new ResourceStub()));
-
-        $this->assertFalse($cache->isFresh());
-    }
-
-    public function testCacheKeepsContent()
-    {
-        $cache = new ResourceCheckerConfigCache($this->cacheFile);
-        $cache->write('FOOBAR');
-
-        $this->assertSame('FOOBAR', file_get_contents($cache->getPath()));
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Util/XmlUtilsTest.php b/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Util/XmlUtilsTest.php
deleted file mode 100644
index 4a53c92e07..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Tests/Util/XmlUtilsTest.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?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\Config\Tests\Util;
-
-use Symfony\Component\Config\Util\XmlUtils;
-
-class XmlUtilsTest extends \PHPUnit_Framework_TestCase
-{
-    public function testLoadFile()
-    {
-        $fixtures = __DIR__.'/../Fixtures/Util/';
-
-        try {
-            XmlUtils::loadFile($fixtures.'invalid.xml');
-            $this->fail();
-        } catch (\InvalidArgumentException $e) {
-            $this->assertContains('ERROR 77', $e->getMessage());
-        }
-
-        try {
-            XmlUtils::loadFile($fixtures.'document_type.xml');
-            $this->fail();
-        } catch (\InvalidArgumentException $e) {
-            $this->assertContains('Document types are not allowed', $e->getMessage());
-        }
-
-        try {
-            XmlUtils::loadFile($fixtures.'invalid_schema.xml', $fixtures.'schema.xsd');
-            $this->fail();
-        } catch (\InvalidArgumentException $e) {
-            $this->assertContains('ERROR 1845', $e->getMessage());
-        }
-
-        try {
-            XmlUtils::loadFile($fixtures.'invalid_schema.xml', 'invalid_callback_or_file');
-            $this->fail();
-        } catch (\InvalidArgumentException $e) {
-            $this->assertContains('XSD file or callable', $e->getMessage());
-        }
-
-        $mock = $this->getMock(__NAMESPACE__.'\Validator');
-        $mock->expects($this->exactly(2))->method('validate')->will($this->onConsecutiveCalls(false, true));
-
-        try {
-            XmlUtils::loadFile($fixtures.'valid.xml', array($mock, 'validate'));
-            $this->fail();
-        } catch (\InvalidArgumentException $e) {
-            $this->assertContains('is not valid', $e->getMessage());
-        }
-
-        $this->assertInstanceOf('DOMDocument', XmlUtils::loadFile($fixtures.'valid.xml', array($mock, 'validate')));
-        $this->assertSame(array(), libxml_get_errors());
-    }
-
-    public function testLoadFileWithInternalErrorsEnabled()
-    {
-        $internalErrors = libxml_use_internal_errors(true);
-
-        $this->assertSame(array(), libxml_get_errors());
-        $this->assertInstanceOf('DOMDocument', XmlUtils::loadFile(__DIR__.'/../Fixtures/Util/invalid_schema.xml'));
-        $this->assertSame(array(), libxml_get_errors());
-
-        libxml_clear_errors();
-        libxml_use_internal_errors($internalErrors);
-    }
-
-    /**
-     * @dataProvider getDataForConvertDomToArray
-     */
-    public function testConvertDomToArray($expected, $xml, $root = false, $checkPrefix = true)
-    {
-        $dom = new \DOMDocument();
-        $dom->loadXML($root ? $xml : '<root>'.$xml.'</root>');
-
-        $this->assertSame($expected, XmlUtils::convertDomElementToArray($dom->documentElement, $checkPrefix));
-    }
-
-    public function getDataForConvertDomToArray()
-    {
-        return array(
-            array(null, ''),
-            array('bar', 'bar'),
-            array(array('bar' => 'foobar'), '<foo bar="foobar" />', true),
-            array(array('foo' => null), '<foo />'),
-            array(array('foo' => 'bar'), '<foo>bar</foo>'),
-            array(array('foo' => array('foo' => 'bar')), '<foo foo="bar"/>'),
-            array(array('foo' => array('foo' => 0)), '<foo><foo>0</foo></foo>'),
-            array(array('foo' => array('foo' => 'bar')), '<foo><foo>bar</foo></foo>'),
-            array(array('foo' => array('foo' => 'bar', 'value' => 'text')), '<foo foo="bar">text</foo>'),
-            array(array('foo' => array('attr' => 'bar', 'foo' => 'text')), '<foo attr="bar"><foo>text</foo></foo>'),
-            array(array('foo' => array('bar', 'text')), '<foo>bar</foo><foo>text</foo>'),
-            array(array('foo' => array(array('foo' => 'bar'), array('foo' => 'text'))), '<foo foo="bar"/><foo foo="text" />'),
-            array(array('foo' => array('foo' => array('bar', 'text'))), '<foo foo="bar"><foo>text</foo></foo>'),
-            array(array('foo' => 'bar'), '<foo><!-- Comment -->bar</foo>'),
-            array(array('foo' => 'text'), '<foo xmlns:h="http://www.example.org/bar" h:bar="bar">text</foo>'),
-            array(array('foo' => array('bar' => 'bar', 'value' => 'text')), '<foo xmlns:h="http://www.example.org/bar" h:bar="bar">text</foo>', false, false),
-            array(array('attr' => 1, 'b' => 'hello'), '<foo:a xmlns:foo="http://www.example.org/foo" xmlns:h="http://www.example.org/bar" attr="1" h:bar="bar"><foo:b>hello</foo:b><h:c>2</h:c></foo:a>', true),
-        );
-    }
-
-    /**
-     * @dataProvider getDataForPhpize
-     */
-    public function testPhpize($expected, $value)
-    {
-        $this->assertSame($expected, XmlUtils::phpize($value));
-    }
-
-    public function getDataForPhpize()
-    {
-        return array(
-            array('', ''),
-            array(null, 'null'),
-            array(true, 'true'),
-            array(false, 'false'),
-            array(null, 'Null'),
-            array(true, 'True'),
-            array(false, 'False'),
-            array(0, '0'),
-            array(1, '1'),
-            array(-1, '-1'),
-            array(0777, '0777'),
-            array(255, '0xFF'),
-            array(100.0, '1e2'),
-            array(-120.0, '-1.2E2'),
-            array(-10100.1, '-10100.1'),
-            array('-10,100.1', '-10,100.1'),
-            array('1234 5678 9101 1121 3141', '1234 5678 9101 1121 3141'),
-            array('1,2,3,4', '1,2,3,4'),
-            array('11,22,33,44', '11,22,33,44'),
-            array('11,222,333,4', '11,222,333,4'),
-            array('1,222,333,444', '1,222,333,444'),
-            array('11,222,333,444', '11,222,333,444'),
-            array('111,222,333,444', '111,222,333,444'),
-            array('1111,2222,3333,4444,5555', '1111,2222,3333,4444,5555'),
-            array('foo', 'foo'),
-            array(6, '0b0110'),
-        );
-    }
-
-    public function testLoadEmptyXmlFile()
-    {
-        $file = __DIR__.'/../Fixtures/foo.xml';
-        $this->setExpectedException('InvalidArgumentException', sprintf('File %s does not contain valid XML, it is empty.', $file));
-        XmlUtils::loadFile($file);
-    }
-
-    // test for issue https://github.com/symfony/symfony/issues/9731
-    public function testLoadWrongEmptyXMLWithErrorHandler()
-    {
-        $originalDisableEntities = libxml_disable_entity_loader(false);
-        $errorReporting = error_reporting(-1);
-
-        set_error_handler(function ($errno, $errstr) {
-            throw new \Exception($errstr, $errno);
-        });
-
-        $file = __DIR__.'/../Fixtures/foo.xml';
-        try {
-            try {
-                XmlUtils::loadFile($file);
-                $this->fail('An exception should have been raised');
-            } catch (\InvalidArgumentException $e) {
-                $this->assertEquals(sprintf('File %s does not contain valid XML, it is empty.', $file), $e->getMessage());
-            }
-        } catch (\Exception $e) {
-            restore_error_handler();
-            error_reporting($errorReporting);
-
-            throw $e;
-        }
-
-            restore_error_handler();
-            error_reporting($errorReporting);
-
-        $disableEntities = libxml_disable_entity_loader(true);
-        libxml_disable_entity_loader($disableEntities);
-
-        libxml_disable_entity_loader($originalDisableEntities);
-
-        $this->assertFalse($disableEntities);
-
-        // should not throw an exception
-        XmlUtils::loadFile(__DIR__.'/../Fixtures/Util/valid.xml', __DIR__.'/../Fixtures/Util/schema.xsd');
-    }
-}
-
-interface Validator
-{
-    public function validate();
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/Util/XmlUtils.php b/core/src/core/classes/guzzle/vendor/symfony/config/Util/XmlUtils.php
deleted file mode 100644
index d8d4eaa3b1..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/Util/XmlUtils.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?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\Config\Util;
-
-/**
- * XMLUtils is a bunch of utility methods to XML operations.
- *
- * This class contains static methods only and is not meant to be instantiated.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Martin Hasoň <martin.hason@gmail.com>
- */
-class XmlUtils
-{
-    /**
-     * This class should not be instantiated.
-     */
-    private function __construct()
-    {
-    }
-
-    /**
-     * Loads an XML file.
-     *
-     * @param string               $file             An XML file path
-     * @param string|callable|null $schemaOrCallable An XSD schema file path, a callable, or null to disable validation
-     *
-     * @return \DOMDocument
-     *
-     * @throws \InvalidArgumentException When loading of XML file returns error
-     */
-    public static function loadFile($file, $schemaOrCallable = null)
-    {
-        $content = @file_get_contents($file);
-        if ('' === trim($content)) {
-            throw new \InvalidArgumentException(sprintf('File %s does not contain valid XML, it is empty.', $file));
-        }
-
-        $internalErrors = libxml_use_internal_errors(true);
-        $disableEntities = libxml_disable_entity_loader(true);
-        libxml_clear_errors();
-
-        $dom = new \DOMDocument();
-        $dom->validateOnParse = true;
-        if (!$dom->loadXML($content, LIBXML_NONET | (defined('LIBXML_COMPACT') ? LIBXML_COMPACT : 0))) {
-            libxml_disable_entity_loader($disableEntities);
-
-            throw new \InvalidArgumentException(implode("\n", static::getXmlErrors($internalErrors)));
-        }
-
-        $dom->normalizeDocument();
-
-        libxml_use_internal_errors($internalErrors);
-        libxml_disable_entity_loader($disableEntities);
-
-        foreach ($dom->childNodes as $child) {
-            if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) {
-                throw new \InvalidArgumentException('Document types are not allowed.');
-            }
-        }
-
-        if (null !== $schemaOrCallable) {
-            $internalErrors = libxml_use_internal_errors(true);
-            libxml_clear_errors();
-
-            $e = null;
-            if (is_callable($schemaOrCallable)) {
-                try {
-                    $valid = call_user_func($schemaOrCallable, $dom, $internalErrors);
-                } catch (\Exception $e) {
-                    $valid = false;
-                }
-            } elseif (!is_array($schemaOrCallable) && is_file((string) $schemaOrCallable)) {
-                $schemaSource = file_get_contents((string) $schemaOrCallable);
-                $valid = @$dom->schemaValidateSource($schemaSource);
-            } else {
-                libxml_use_internal_errors($internalErrors);
-
-                throw new \InvalidArgumentException('The schemaOrCallable argument has to be a valid path to XSD file or callable.');
-            }
-
-            if (!$valid) {
-                $messages = static::getXmlErrors($internalErrors);
-                if (empty($messages)) {
-                    $messages = array(sprintf('The XML file "%s" is not valid.', $file));
-                }
-                throw new \InvalidArgumentException(implode("\n", $messages), 0, $e);
-            }
-        }
-
-        libxml_clear_errors();
-        libxml_use_internal_errors($internalErrors);
-
-        return $dom;
-    }
-
-    /**
-     * Converts a \DomElement object to a PHP array.
-     *
-     * The following rules applies during the conversion:
-     *
-     *  * Each tag is converted to a key value or an array
-     *    if there is more than one "value"
-     *
-     *  * The content of a tag is set under a "value" key (<foo>bar</foo>)
-     *    if the tag also has some nested tags
-     *
-     *  * The attributes are converted to keys (<foo foo="bar"/>)
-     *
-     *  * The nested-tags are converted to keys (<foo><foo>bar</foo></foo>)
-     *
-     * @param \DomElement $element     A \DomElement instance
-     * @param bool        $checkPrefix Check prefix in an element or an attribute name
-     *
-     * @return array A PHP array
-     */
-    public static function convertDomElementToArray(\DomElement $element, $checkPrefix = true)
-    {
-        $prefix = (string) $element->prefix;
-        $empty = true;
-        $config = array();
-        foreach ($element->attributes as $name => $node) {
-            if ($checkPrefix && !in_array((string) $node->prefix, array('', $prefix), true)) {
-                continue;
-            }
-            $config[$name] = static::phpize($node->value);
-            $empty = false;
-        }
-
-        $nodeValue = false;
-        foreach ($element->childNodes as $node) {
-            if ($node instanceof \DOMText) {
-                if ('' !== trim($node->nodeValue)) {
-                    $nodeValue = trim($node->nodeValue);
-                    $empty = false;
-                }
-            } elseif ($checkPrefix && $prefix != (string) $node->prefix) {
-                continue;
-            } elseif (!$node instanceof \DOMComment) {
-                $value = static::convertDomElementToArray($node, $checkPrefix);
-
-                $key = $node->localName;
-                if (isset($config[$key])) {
-                    if (!is_array($config[$key]) || !is_int(key($config[$key]))) {
-                        $config[$key] = array($config[$key]);
-                    }
-                    $config[$key][] = $value;
-                } else {
-                    $config[$key] = $value;
-                }
-
-                $empty = false;
-            }
-        }
-
-        if (false !== $nodeValue) {
-            $value = static::phpize($nodeValue);
-            if (count($config)) {
-                $config['value'] = $value;
-            } else {
-                $config = $value;
-            }
-        }
-
-        return !$empty ? $config : null;
-    }
-
-    /**
-     * Converts an xml value to a PHP type.
-     *
-     * @param mixed $value
-     *
-     * @return mixed
-     */
-    public static function phpize($value)
-    {
-        $value = (string) $value;
-        $lowercaseValue = strtolower($value);
-
-        switch (true) {
-            case 'null' === $lowercaseValue:
-                return;
-            case ctype_digit($value):
-                $raw = $value;
-                $cast = (int) $value;
-
-                return '0' == $value[0] ? octdec($value) : (((string) $raw === (string) $cast) ? $cast : $raw);
-            case isset($value[1]) && '-' === $value[0] && ctype_digit(substr($value, 1)):
-                $raw = $value;
-                $cast = (int) $value;
-
-                return '0' == $value[1] ? octdec($value) : (((string) $raw === (string) $cast) ? $cast : $raw);
-            case 'true' === $lowercaseValue:
-                return true;
-            case 'false' === $lowercaseValue:
-                return false;
-            case isset($value[1]) && '0b' == $value[0].$value[1]:
-                return bindec($value);
-            case is_numeric($value):
-                return '0x' === $value[0].$value[1] ? hexdec($value) : (float) $value;
-            case preg_match('/^0x[0-9a-f]++$/i', $value):
-                return hexdec($value);
-            case preg_match('/^(-|\+)?[0-9]+(\.[0-9]+)?$/', $value):
-                return (float) $value;
-            default:
-                return $value;
-        }
-    }
-
-    protected static function getXmlErrors($internalErrors)
-    {
-        $errors = array();
-        foreach (libxml_get_errors() as $error) {
-            $errors[] = sprintf('[%s %s] %s (in %s - line %d, column %d)',
-                LIBXML_ERR_WARNING == $error->level ? 'WARNING' : 'ERROR',
-                $error->code,
-                trim($error->message),
-                $error->file ?: 'n/a',
-                $error->line,
-                $error->column
-            );
-        }
-
-        libxml_clear_errors();
-        libxml_use_internal_errors($internalErrors);
-
-        return $errors;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/composer.json b/core/src/core/classes/guzzle/vendor/symfony/config/composer.json
deleted file mode 100644
index 711ed9605d..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/composer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "name": "symfony/config",
-    "type": "library",
-    "description": "Symfony Config Component",
-    "keywords": [],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=5.5.9",
-        "symfony/filesystem": "~2.8|~3.0"
-    },
-    "suggest": {
-        "symfony/yaml": "To use the yaml reference dumper"
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Component\\Config\\": "" },
-        "exclude-from-classmap": [
-            "/Tests/"
-        ]
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.1-dev"
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/config/phpunit.xml.dist b/core/src/core/classes/guzzle/vendor/symfony/config/phpunit.xml.dist
deleted file mode 100644
index 3fe6fd87c8..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/config/phpunit.xml.dist
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Symfony Config Component Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/core/src/core/classes/guzzle/vendor/symfony/filesystem/.gitignore b/core/src/core/classes/guzzle/vendor/symfony/filesystem/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/filesystem/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/core/src/core/classes/guzzle/vendor/symfony/filesystem/CHANGELOG.md b/core/src/core/classes/guzzle/vendor/symfony/filesystem/CHANGELOG.md
deleted file mode 100644
index 9e303821e6..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/filesystem/CHANGELOG.md
+++ /dev/null
@@ -1,38 +0,0 @@
-CHANGELOG
-=========
-
-3.0.0
------
-
- * removed `$mode` argument from `Filesystem::dumpFile()`
-
-2.8.0
------
-
- * added tempnam() a stream aware version of PHP's native tempnam()
-
-2.6.0
------
-
- * added LockHandler
-
-2.3.12
-------
-
- * deprecated dumpFile() file mode argument.
-
-2.3.0
------
-
- * added the dumpFile() method to atomically write files
-
-2.2.0
------
-
- * added a delete option for the mirror() method
-
-2.1.0
------
-
- * 24eb396 : BC Break : mkdir() function now throws exception in case of failure instead of returning Boolean value
- * created the component
diff --git a/core/src/core/classes/guzzle/vendor/symfony/filesystem/Exception/ExceptionInterface.php b/core/src/core/classes/guzzle/vendor/symfony/filesystem/Exception/ExceptionInterface.php
deleted file mode 100644
index 8f4f10aac7..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/filesystem/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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\Filesystem\Exception;
-
-/**
- * Exception interface for all exceptions thrown by the component.
- *
- * @author Romain Neutron <imprec@gmail.com>
- */
-interface ExceptionInterface
-{
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/filesystem/Exception/FileNotFoundException.php b/core/src/core/classes/guzzle/vendor/symfony/filesystem/Exception/FileNotFoundException.php
deleted file mode 100644
index bcc8fe81fc..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/filesystem/Exception/FileNotFoundException.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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\Filesystem\Exception;
-
-/**
- * Exception class thrown when a file couldn't be found.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Christian Gärtner <christiangaertner.film@googlemail.com>
- */
-class FileNotFoundException extends IOException
-{
-    public function __construct($message = null, $code = 0, \Exception $previous = null, $path = null)
-    {
-        if (null === $message) {
-            if (null === $path) {
-                $message = 'File could not be found.';
-            } else {
-                $message = sprintf('File "%s" could not be found.', $path);
-            }
-        }
-
-        parent::__construct($message, $code, $previous, $path);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/filesystem/Exception/IOException.php b/core/src/core/classes/guzzle/vendor/symfony/filesystem/Exception/IOException.php
deleted file mode 100644
index 144e0e602b..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/filesystem/Exception/IOException.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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\Filesystem\Exception;
-
-/**
- * Exception class thrown when a filesystem operation failure happens.
- *
- * @author Romain Neutron <imprec@gmail.com>
- * @author Christian Gärtner <christiangaertner.film@googlemail.com>
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class IOException extends \RuntimeException implements IOExceptionInterface
-{
-    private $path;
-
-    public function __construct($message, $code = 0, \Exception $previous = null, $path = null)
-    {
-        $this->path = $path;
-
-        parent::__construct($message, $code, $previous);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPath()
-    {
-        return $this->path;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/filesystem/Exception/IOExceptionInterface.php b/core/src/core/classes/guzzle/vendor/symfony/filesystem/Exception/IOExceptionInterface.php
deleted file mode 100644
index c11965a424..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/filesystem/Exception/IOExceptionInterface.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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\Filesystem\Exception;
-
-/**
- * IOException interface for file and input/output stream related exceptions thrown by the component.
- *
- * @author Christian Gärtner <christiangaertner.film@googlemail.com>
- */
-interface IOExceptionInterface extends ExceptionInterface
-{
-    /**
-     * Returns the associated path for the exception.
-     *
-     * @return string The path
-     */
-    public function getPath();
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/filesystem/Filesystem.php b/core/src/core/classes/guzzle/vendor/symfony/filesystem/Filesystem.php
deleted file mode 100644
index bc58b070e3..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/filesystem/Filesystem.php
+++ /dev/null
@@ -1,589 +0,0 @@
-<?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\Filesystem;
-
-use Symfony\Component\Filesystem\Exception\IOException;
-use Symfony\Component\Filesystem\Exception\FileNotFoundException;
-
-/**
- * Provides basic utility to manipulate the file system.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- */
-class Filesystem
-{
-    /**
-     * Copies a file.
-     *
-     * If the target file is older than the origin file, it's always overwritten.
-     * If the target file is newer, it is overwritten only when the
-     * $overwriteNewerFiles option is set to true.
-     *
-     * @param string $originFile          The original filename
-     * @param string $targetFile          The target filename
-     * @param bool   $overwriteNewerFiles If true, target files newer than origin files are overwritten
-     *
-     * @throws FileNotFoundException When originFile doesn't exist
-     * @throws IOException           When copy fails
-     */
-    public function copy($originFile, $targetFile, $overwriteNewerFiles = false)
-    {
-        if (stream_is_local($originFile) && !is_file($originFile)) {
-            throw new FileNotFoundException(sprintf('Failed to copy "%s" because file does not exist.', $originFile), 0, null, $originFile);
-        }
-
-        $this->mkdir(dirname($targetFile));
-
-        $doCopy = true;
-        if (!$overwriteNewerFiles && null === parse_url($originFile, PHP_URL_HOST) && is_file($targetFile)) {
-            $doCopy = filemtime($originFile) > filemtime($targetFile);
-        }
-
-        if ($doCopy) {
-            // https://bugs.php.net/bug.php?id=64634
-            if (false === $source = @fopen($originFile, 'r')) {
-                throw new IOException(sprintf('Failed to copy "%s" to "%s" because source file could not be opened for reading.', $originFile, $targetFile), 0, null, $originFile);
-            }
-
-            // Stream context created to allow files overwrite when using FTP stream wrapper - disabled by default
-            if (false === $target = @fopen($targetFile, 'w', null, stream_context_create(array('ftp' => array('overwrite' => true))))) {
-                throw new IOException(sprintf('Failed to copy "%s" to "%s" because target file could not be opened for writing.', $originFile, $targetFile), 0, null, $originFile);
-            }
-
-            $bytesCopied = stream_copy_to_stream($source, $target);
-            fclose($source);
-            fclose($target);
-            unset($source, $target);
-
-            if (!is_file($targetFile)) {
-                throw new IOException(sprintf('Failed to copy "%s" to "%s".', $originFile, $targetFile), 0, null, $originFile);
-            }
-
-            // Like `cp`, preserve executable permission bits
-            @chmod($targetFile, fileperms($targetFile) | (fileperms($originFile) & 0111));
-
-            if (stream_is_local($originFile) && $bytesCopied !== ($bytesOrigin = filesize($originFile))) {
-                throw new IOException(sprintf('Failed to copy the whole content of "%s" to "%s" (%g of %g bytes copied).', $originFile, $targetFile, $bytesCopied, $bytesOrigin), 0, null, $originFile);
-            }
-        }
-    }
-
-    /**
-     * Creates a directory recursively.
-     *
-     * @param string|array|\Traversable $dirs The directory path
-     * @param int                       $mode The directory mode
-     *
-     * @throws IOException On any directory creation failure
-     */
-    public function mkdir($dirs, $mode = 0777)
-    {
-        foreach ($this->toIterator($dirs) as $dir) {
-            if (is_dir($dir)) {
-                continue;
-            }
-
-            if (true !== @mkdir($dir, $mode, true)) {
-                $error = error_get_last();
-                if (!is_dir($dir)) {
-                    // The directory was not created by a concurrent process. Let's throw an exception with a developer friendly error message if we have one
-                    if ($error) {
-                        throw new IOException(sprintf('Failed to create "%s": %s.', $dir, $error['message']), 0, null, $dir);
-                    }
-                    throw new IOException(sprintf('Failed to create "%s"', $dir), 0, null, $dir);
-                }
-            }
-        }
-    }
-
-    /**
-     * Checks the existence of files or directories.
-     *
-     * @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to check
-     *
-     * @return bool true if the file exists, false otherwise
-     */
-    public function exists($files)
-    {
-        foreach ($this->toIterator($files) as $file) {
-            if ('\\' === DIRECTORY_SEPARATOR && strlen($file) > 258) {
-                throw new IOException('Could not check if file exist because path length exceeds 258 characters.', 0, null, $file);
-            }
-
-            if (!file_exists($file)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Sets access and modification time of file.
-     *
-     * @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to create
-     * @param int                       $time  The touch time as a Unix timestamp
-     * @param int                       $atime The access time as a Unix timestamp
-     *
-     * @throws IOException When touch fails
-     */
-    public function touch($files, $time = null, $atime = null)
-    {
-        foreach ($this->toIterator($files) as $file) {
-            $touch = $time ? @touch($file, $time, $atime) : @touch($file);
-            if (true !== $touch) {
-                throw new IOException(sprintf('Failed to touch "%s".', $file), 0, null, $file);
-            }
-        }
-    }
-
-    /**
-     * Removes files or directories.
-     *
-     * @param string|array|\Traversable $files A filename, an array of files, or a \Traversable instance to remove
-     *
-     * @throws IOException When removal fails
-     */
-    public function remove($files)
-    {
-        if ($files instanceof \Traversable) {
-            $files = iterator_to_array($files, false);
-        } elseif (!is_array($files)) {
-            $files = array($files);
-        }
-        $files = array_reverse($files);
-        foreach ($files as $file) {
-            if (is_link($file)) {
-                // See https://bugs.php.net/52176
-                if (!@(unlink($file) || '\\' !== DIRECTORY_SEPARATOR || rmdir($file)) && file_exists($file)) {
-                    $error = error_get_last();
-                    throw new IOException(sprintf('Failed to remove symlink "%s": %s.', $file, $error['message']));
-                }
-            } elseif (is_dir($file)) {
-                $this->remove(new \FilesystemIterator($file, \FilesystemIterator::CURRENT_AS_PATHNAME | \FilesystemIterator::SKIP_DOTS));
-
-                if (!@rmdir($file) && file_exists($file)) {
-                    $error = error_get_last();
-                    throw new IOException(sprintf('Failed to remove directory "%s": %s.', $file, $error['message']));
-                }
-            } elseif (!@unlink($file) && file_exists($file)) {
-                $error = error_get_last();
-                throw new IOException(sprintf('Failed to remove file "%s": %s.', $file, $error['message']));
-            }
-        }
-    }
-
-    /**
-     * Change mode for an array of files or directories.
-     *
-     * @param string|array|\Traversable $files     A filename, an array of files, or a \Traversable instance to change mode
-     * @param int                       $mode      The new mode (octal)
-     * @param int                       $umask     The mode mask (octal)
-     * @param bool                      $recursive Whether change the mod recursively or not
-     *
-     * @throws IOException When the change fail
-     */
-    public function chmod($files, $mode, $umask = 0000, $recursive = false)
-    {
-        foreach ($this->toIterator($files) as $file) {
-            if (true !== @chmod($file, $mode & ~$umask)) {
-                throw new IOException(sprintf('Failed to chmod file "%s".', $file), 0, null, $file);
-            }
-            if ($recursive && is_dir($file) && !is_link($file)) {
-                $this->chmod(new \FilesystemIterator($file), $mode, $umask, true);
-            }
-        }
-    }
-
-    /**
-     * Change the owner of an array of files or directories.
-     *
-     * @param string|array|\Traversable $files     A filename, an array of files, or a \Traversable instance to change owner
-     * @param string                    $user      The new owner user name
-     * @param bool                      $recursive Whether change the owner recursively or not
-     *
-     * @throws IOException When the change fail
-     */
-    public function chown($files, $user, $recursive = false)
-    {
-        foreach ($this->toIterator($files) as $file) {
-            if ($recursive && is_dir($file) && !is_link($file)) {
-                $this->chown(new \FilesystemIterator($file), $user, true);
-            }
-            if (is_link($file) && function_exists('lchown')) {
-                if (true !== @lchown($file, $user)) {
-                    throw new IOException(sprintf('Failed to chown file "%s".', $file), 0, null, $file);
-                }
-            } else {
-                if (true !== @chown($file, $user)) {
-                    throw new IOException(sprintf('Failed to chown file "%s".', $file), 0, null, $file);
-                }
-            }
-        }
-    }
-
-    /**
-     * Change the group of an array of files or directories.
-     *
-     * @param string|array|\Traversable $files     A filename, an array of files, or a \Traversable instance to change group
-     * @param string                    $group     The group name
-     * @param bool                      $recursive Whether change the group recursively or not
-     *
-     * @throws IOException When the change fail
-     */
-    public function chgrp($files, $group, $recursive = false)
-    {
-        foreach ($this->toIterator($files) as $file) {
-            if ($recursive && is_dir($file) && !is_link($file)) {
-                $this->chgrp(new \FilesystemIterator($file), $group, true);
-            }
-            if (is_link($file) && function_exists('lchgrp')) {
-                if (true !== @lchgrp($file, $group) || (defined('HHVM_VERSION') && !posix_getgrnam($group))) {
-                    throw new IOException(sprintf('Failed to chgrp file "%s".', $file), 0, null, $file);
-                }
-            } else {
-                if (true !== @chgrp($file, $group)) {
-                    throw new IOException(sprintf('Failed to chgrp file "%s".', $file), 0, null, $file);
-                }
-            }
-        }
-    }
-
-    /**
-     * Renames a file or a directory.
-     *
-     * @param string $origin    The origin filename or directory
-     * @param string $target    The new filename or directory
-     * @param bool   $overwrite Whether to overwrite the target if it already exists
-     *
-     * @throws IOException When target file or directory already exists
-     * @throws IOException When origin cannot be renamed
-     */
-    public function rename($origin, $target, $overwrite = false)
-    {
-        // we check that target does not exist
-        if (!$overwrite && $this->isReadable($target)) {
-            throw new IOException(sprintf('Cannot rename because the target "%s" already exists.', $target), 0, null, $target);
-        }
-
-        if (true !== @rename($origin, $target)) {
-            throw new IOException(sprintf('Cannot rename "%s" to "%s".', $origin, $target), 0, null, $target);
-        }
-    }
-
-    /**
-     * Tells whether a file exists and is readable.
-     *
-     * @param string $filename Path to the file
-     *
-     * @throws IOException When windows path is longer than 258 characters
-     */
-    private function isReadable($filename)
-    {
-        if ('\\' === DIRECTORY_SEPARATOR && strlen($filename) > 258) {
-            throw new IOException('Could not check if file is readable because path length exceeds 258 characters.', 0, null, $filename);
-        }
-
-        return is_readable($filename);
-    }
-
-    /**
-     * Creates a symbolic link or copy a directory.
-     *
-     * @param string $originDir     The origin directory path
-     * @param string $targetDir     The symbolic link name
-     * @param bool   $copyOnWindows Whether to copy files if on Windows
-     *
-     * @throws IOException When symlink fails
-     */
-    public function symlink($originDir, $targetDir, $copyOnWindows = false)
-    {
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $originDir = strtr($originDir, '/', '\\');
-            $targetDir = strtr($targetDir, '/', '\\');
-
-            if ($copyOnWindows) {
-                $this->mirror($originDir, $targetDir);
-
-                return;
-            }
-        }
-
-        $this->mkdir(dirname($targetDir));
-
-        $ok = false;
-        if (is_link($targetDir)) {
-            if (readlink($targetDir) != $originDir) {
-                $this->remove($targetDir);
-            } else {
-                $ok = true;
-            }
-        }
-
-        if (!$ok && true !== @symlink($originDir, $targetDir)) {
-            $report = error_get_last();
-            if (is_array($report)) {
-                if ('\\' === DIRECTORY_SEPARATOR && false !== strpos($report['message'], 'error code(1314)')) {
-                    throw new IOException('Unable to create symlink due to error code 1314: \'A required privilege is not held by the client\'. Do you have the required Administrator-rights?', 0, null, $targetDir);
-                }
-            }
-            throw new IOException(sprintf('Failed to create symbolic link from "%s" to "%s".', $originDir, $targetDir), 0, null, $targetDir);
-        }
-    }
-
-    /**
-     * Given an existing path, convert it to a path relative to a given starting path.
-     *
-     * @param string $endPath   Absolute path of target
-     * @param string $startPath Absolute path where traversal begins
-     *
-     * @return string Path of target relative to starting path
-     */
-    public function makePathRelative($endPath, $startPath)
-    {
-        // Normalize separators on Windows
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $endPath = str_replace('\\', '/', $endPath);
-            $startPath = str_replace('\\', '/', $startPath);
-        }
-
-        // Split the paths into arrays
-        $startPathArr = explode('/', trim($startPath, '/'));
-        $endPathArr = explode('/', trim($endPath, '/'));
-
-        // Find for which directory the common path stops
-        $index = 0;
-        while (isset($startPathArr[$index]) && isset($endPathArr[$index]) && $startPathArr[$index] === $endPathArr[$index]) {
-            ++$index;
-        }
-
-        // Determine how deep the start path is relative to the common path (ie, "web/bundles" = 2 levels)
-        $depth = count($startPathArr) - $index;
-
-        // When we need to traverse from the start, and we are starting from a root path, don't add '../'
-        if ('/' === $startPath[0] && 0 === $index && 1 === $depth) {
-            $traverser = '';
-        } else {
-            // Repeated "../" for each level need to reach the common path
-            $traverser = str_repeat('../', $depth);
-        }
-
-        $endPathRemainder = implode('/', array_slice($endPathArr, $index));
-
-        // Construct $endPath from traversing to the common path, then to the remaining $endPath
-        $relativePath = $traverser.('' !== $endPathRemainder ? $endPathRemainder.'/' : '');
-
-        return '' === $relativePath ? './' : $relativePath;
-    }
-
-    /**
-     * Mirrors a directory to another.
-     *
-     * @param string       $originDir The origin directory
-     * @param string       $targetDir The target directory
-     * @param \Traversable $iterator  A Traversable instance
-     * @param array        $options   An array of boolean options
-     *                                Valid options are:
-     *                                - $options['override'] Whether to override an existing file on copy or not (see copy())
-     *                                - $options['copy_on_windows'] Whether to copy files instead of links on Windows (see symlink())
-     *                                - $options['delete'] Whether to delete files that are not in the source directory (defaults to false)
-     *
-     * @throws IOException When file type is unknown
-     */
-    public function mirror($originDir, $targetDir, \Traversable $iterator = null, $options = array())
-    {
-        $targetDir = rtrim($targetDir, '/\\');
-        $originDir = rtrim($originDir, '/\\');
-
-        // Iterate in destination folder to remove obsolete entries
-        if ($this->exists($targetDir) && isset($options['delete']) && $options['delete']) {
-            $deleteIterator = $iterator;
-            if (null === $deleteIterator) {
-                $flags = \FilesystemIterator::SKIP_DOTS;
-                $deleteIterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($targetDir, $flags), \RecursiveIteratorIterator::CHILD_FIRST);
-            }
-            foreach ($deleteIterator as $file) {
-                $origin = str_replace($targetDir, $originDir, $file->getPathname());
-                if (!$this->exists($origin)) {
-                    $this->remove($file);
-                }
-            }
-        }
-
-        $copyOnWindows = false;
-        if (isset($options['copy_on_windows'])) {
-            $copyOnWindows = $options['copy_on_windows'];
-        }
-
-        if (null === $iterator) {
-            $flags = $copyOnWindows ? \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS : \FilesystemIterator::SKIP_DOTS;
-            $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($originDir, $flags), \RecursiveIteratorIterator::SELF_FIRST);
-        }
-
-        if ($this->exists($originDir)) {
-            $this->mkdir($targetDir);
-        }
-
-        foreach ($iterator as $file) {
-            $target = str_replace($originDir, $targetDir, $file->getPathname());
-
-            if ($copyOnWindows) {
-                if (is_file($file)) {
-                    $this->copy($file, $target, isset($options['override']) ? $options['override'] : false);
-                } elseif (is_dir($file)) {
-                    $this->mkdir($target);
-                } else {
-                    throw new IOException(sprintf('Unable to guess "%s" file type.', $file), 0, null, $file);
-                }
-            } else {
-                if (is_link($file)) {
-                    $this->symlink($file->getLinkTarget(), $target);
-                } elseif (is_dir($file)) {
-                    $this->mkdir($target);
-                } elseif (is_file($file)) {
-                    $this->copy($file, $target, isset($options['override']) ? $options['override'] : false);
-                } else {
-                    throw new IOException(sprintf('Unable to guess "%s" file type.', $file), 0, null, $file);
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns whether the file path is an absolute path.
-     *
-     * @param string $file A file path
-     *
-     * @return bool
-     */
-    public function isAbsolutePath($file)
-    {
-        return strspn($file, '/\\', 0, 1)
-            || (strlen($file) > 3 && ctype_alpha($file[0])
-                && substr($file, 1, 1) === ':'
-                && strspn($file, '/\\', 2, 1)
-            )
-            || null !== parse_url($file, PHP_URL_SCHEME)
-        ;
-    }
-
-    /**
-     * Creates a temporary file with support for custom stream wrappers.
-     *
-     * @param string $dir    The directory where the temporary filename will be created
-     * @param string $prefix The prefix of the generated temporary filename
-     *                       Note: Windows uses only the first three characters of prefix
-     *
-     * @return string The new temporary filename (with path), or throw an exception on failure
-     */
-    public function tempnam($dir, $prefix)
-    {
-        list($scheme, $hierarchy) = $this->getSchemeAndHierarchy($dir);
-
-        // If no scheme or scheme is "file" or "gs" (Google Cloud) create temp file in local filesystem
-        if (null === $scheme || 'file' === $scheme || 'gs' === $scheme) {
-            $tmpFile = tempnam($hierarchy, $prefix);
-
-            // If tempnam failed or no scheme return the filename otherwise prepend the scheme
-            if (false !== $tmpFile) {
-                if (null !== $scheme && 'gs' !== $scheme) {
-                    return $scheme.'://'.$tmpFile;
-                }
-
-                return $tmpFile;
-            }
-
-            throw new IOException('A temporary file could not be created.');
-        }
-
-        // Loop until we create a valid temp file or have reached 10 attempts
-        for ($i = 0; $i < 10; ++$i) {
-            // Create a unique filename
-            $tmpFile = $dir.'/'.$prefix.uniqid(mt_rand(), true);
-
-            // Use fopen instead of file_exists as some streams do not support stat
-            // Use mode 'x+' to atomically check existence and create to avoid a TOCTOU vulnerability
-            $handle = @fopen($tmpFile, 'x+');
-
-            // If unsuccessful restart the loop
-            if (false === $handle) {
-                continue;
-            }
-
-            // Close the file if it was successfully opened
-            @fclose($handle);
-
-            return $tmpFile;
-        }
-
-        throw new IOException('A temporary file could not be created.');
-    }
-
-    /**
-     * Atomically dumps content into a file.
-     *
-     * @param string $filename The file to be written to
-     * @param string $content  The data to write into the file
-     *
-     * @throws IOException If the file cannot be written to.
-     */
-    public function dumpFile($filename, $content)
-    {
-        $dir = dirname($filename);
-
-        if (!is_dir($dir)) {
-            $this->mkdir($dir);
-        } elseif (!is_writable($dir)) {
-            throw new IOException(sprintf('Unable to write to the "%s" directory.', $dir), 0, null, $dir);
-        }
-
-        // Will create a temp file with 0600 access rights
-        // when the filesystem supports chmod.
-        $tmpFile = $this->tempnam($dir, basename($filename));
-
-        if (false === @file_put_contents($tmpFile, $content)) {
-            throw new IOException(sprintf('Failed to write file "%s".', $filename), 0, null, $filename);
-        }
-
-        // Ignore for filesystems that do not support umask
-        @chmod($tmpFile, 0666);
-        $this->rename($tmpFile, $filename, true);
-    }
-
-    /**
-     * @param mixed $files
-     *
-     * @return \Traversable
-     */
-    private function toIterator($files)
-    {
-        if (!$files instanceof \Traversable) {
-            $files = new \ArrayObject(is_array($files) ? $files : array($files));
-        }
-
-        return $files;
-    }
-
-    /**
-     * Gets a 2-tuple of scheme (may be null) and hierarchical part of a filename (e.g. file:///tmp -> array(file, tmp)).
-     *
-     * @param string $filename The filename to be parsed
-     *
-     * @return array The filename scheme and hierarchical part
-     */
-    private function getSchemeAndHierarchy($filename)
-    {
-        $components = explode('://', $filename, 2);
-
-        return 2 === count($components) ? array($components[0], $components[1]) : array(null, $components[0]);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/filesystem/LICENSE b/core/src/core/classes/guzzle/vendor/symfony/filesystem/LICENSE
deleted file mode 100644
index 12a74531e4..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/filesystem/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2004-2016 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/src/core/classes/guzzle/vendor/symfony/filesystem/LockHandler.php b/core/src/core/classes/guzzle/vendor/symfony/filesystem/LockHandler.php
deleted file mode 100644
index 67e6f8f522..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/filesystem/LockHandler.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?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\Filesystem;
-
-use Symfony\Component\Filesystem\Exception\IOException;
-
-/**
- * LockHandler class provides a simple abstraction to lock anything by means of
- * a file lock.
- *
- * A locked file is created based on the lock name when calling lock(). Other
- * lock handlers will not be able to lock the same name until it is released
- * (explicitly by calling release() or implicitly when the instance holding the
- * lock is destroyed).
- *
- * @author Grégoire Pineau <lyrixx@lyrixx.info>
- * @author Romain Neutron <imprec@gmail.com>
- * @author Nicolas Grekas <p@tchwork.com>
- */
-class LockHandler
-{
-    private $file;
-    private $handle;
-
-    /**
-     * @param string      $name     The lock name
-     * @param string|null $lockPath The directory to store the lock. Default values will use temporary directory
-     *
-     * @throws IOException If the lock directory could not be created or is not writable
-     */
-    public function __construct($name, $lockPath = null)
-    {
-        $lockPath = $lockPath ?: sys_get_temp_dir();
-
-        if (!is_dir($lockPath)) {
-            $fs = new Filesystem();
-            $fs->mkdir($lockPath);
-        }
-
-        if (!is_writable($lockPath)) {
-            throw new IOException(sprintf('The directory "%s" is not writable.', $lockPath), 0, null, $lockPath);
-        }
-
-        $this->file = sprintf('%s/sf.%s.%s.lock', $lockPath, preg_replace('/[^a-z0-9\._-]+/i', '-', $name), hash('sha256', $name));
-    }
-
-    /**
-     * Lock the resource.
-     *
-     * @param bool $blocking wait until the lock is released
-     *
-     * @return bool Returns true if the lock was acquired, false otherwise
-     *
-     * @throws IOException If the lock file could not be created or opened
-     */
-    public function lock($blocking = false)
-    {
-        if ($this->handle) {
-            return true;
-        }
-
-        // Silence error reporting
-        set_error_handler(function () {});
-
-        if (!$this->handle = fopen($this->file, 'r')) {
-            if ($this->handle = fopen($this->file, 'x')) {
-                chmod($this->file, 0444);
-            } elseif (!$this->handle = fopen($this->file, 'r')) {
-                usleep(100); // Give some time for chmod() to complete
-                $this->handle = fopen($this->file, 'r');
-            }
-        }
-        restore_error_handler();
-
-        if (!$this->handle) {
-            $error = error_get_last();
-            throw new IOException($error['message'], 0, null, $this->file);
-        }
-
-        // On Windows, even if PHP doc says the contrary, LOCK_NB works, see
-        // https://bugs.php.net/54129
-        if (!flock($this->handle, LOCK_EX | ($blocking ? 0 : LOCK_NB))) {
-            fclose($this->handle);
-            $this->handle = null;
-
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Release the resource.
-     */
-    public function release()
-    {
-        if ($this->handle) {
-            flock($this->handle, LOCK_UN | LOCK_NB);
-            fclose($this->handle);
-            $this->handle = null;
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/filesystem/README.md b/core/src/core/classes/guzzle/vendor/symfony/filesystem/README.md
deleted file mode 100644
index 877ab3543f..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/filesystem/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-Filesystem Component
-====================
-
-The Filesystem component provides basic utilities for the filesystem.
-
-Resources
----------
-
-  * [Documentation](https://symfony.com/doc/current/components/filesystem/index.html)
-  * [Contributing](https://symfony.com/doc/current/contributing/index.html)
-  * [Report issues](https://github.com/symfony/symfony/issues) and
-    [send Pull Requests](https://github.com/symfony/symfony/pulls)
-    in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/core/src/core/classes/guzzle/vendor/symfony/filesystem/Tests/ExceptionTest.php b/core/src/core/classes/guzzle/vendor/symfony/filesystem/Tests/ExceptionTest.php
deleted file mode 100644
index 53bd8db76a..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/filesystem/Tests/ExceptionTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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\Filesystem\Tests;
-
-use Symfony\Component\Filesystem\Exception\IOException;
-use Symfony\Component\Filesystem\Exception\FileNotFoundException;
-
-/**
- * Test class for Filesystem.
- */
-class ExceptionTest extends \PHPUnit_Framework_TestCase
-{
-    public function testGetPath()
-    {
-        $e = new IOException('', 0, null, '/foo');
-        $this->assertEquals('/foo', $e->getPath(), 'The pass should be returned.');
-    }
-
-    public function testGeneratedMessage()
-    {
-        $e = new FileNotFoundException(null, 0, null, '/foo');
-        $this->assertEquals('/foo', $e->getPath());
-        $this->assertEquals('File "/foo" could not be found.', $e->getMessage(), 'A message should be generated.');
-    }
-
-    public function testGeneratedMessageWithoutPath()
-    {
-        $e = new FileNotFoundException();
-        $this->assertEquals('File could not be found.', $e->getMessage(), 'A message should be generated.');
-    }
-
-    public function testCustomMessage()
-    {
-        $e = new FileNotFoundException('bar', 0, null, '/foo');
-        $this->assertEquals('bar', $e->getMessage(), 'A custom message should be possible still.');
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/filesystem/Tests/FilesystemTest.php b/core/src/core/classes/guzzle/vendor/symfony/filesystem/Tests/FilesystemTest.php
deleted file mode 100644
index 9a65543098..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/filesystem/Tests/FilesystemTest.php
+++ /dev/null
@@ -1,1166 +0,0 @@
-<?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\Filesystem\Tests;
-
-/**
- * Test class for Filesystem.
- */
-class FilesystemTest extends FilesystemTestCase
-{
-    public function testCopyCreatesNewFile()
-    {
-        $sourceFilePath = $this->workspace.DIRECTORY_SEPARATOR.'copy_source_file';
-        $targetFilePath = $this->workspace.DIRECTORY_SEPARATOR.'copy_target_file';
-
-        file_put_contents($sourceFilePath, 'SOURCE FILE');
-
-        $this->filesystem->copy($sourceFilePath, $targetFilePath);
-
-        $this->assertFileExists($targetFilePath);
-        $this->assertEquals('SOURCE FILE', file_get_contents($targetFilePath));
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Filesystem\Exception\IOException
-     */
-    public function testCopyFails()
-    {
-        $sourceFilePath = $this->workspace.DIRECTORY_SEPARATOR.'copy_source_file';
-        $targetFilePath = $this->workspace.DIRECTORY_SEPARATOR.'copy_target_file';
-
-        $this->filesystem->copy($sourceFilePath, $targetFilePath);
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Filesystem\Exception\IOException
-     */
-    public function testCopyUnreadableFileFails()
-    {
-        // skip test on Windows; PHP can't easily set file as unreadable on Windows
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $this->markTestSkipped('This test cannot run on Windows.');
-        }
-
-        $sourceFilePath = $this->workspace.DIRECTORY_SEPARATOR.'copy_source_file';
-        $targetFilePath = $this->workspace.DIRECTORY_SEPARATOR.'copy_target_file';
-
-        file_put_contents($sourceFilePath, 'SOURCE FILE');
-
-        // make sure target cannot be read
-        $this->filesystem->chmod($sourceFilePath, 0222);
-
-        $this->filesystem->copy($sourceFilePath, $targetFilePath);
-    }
-
-    public function testCopyOverridesExistingFileIfModified()
-    {
-        $sourceFilePath = $this->workspace.DIRECTORY_SEPARATOR.'copy_source_file';
-        $targetFilePath = $this->workspace.DIRECTORY_SEPARATOR.'copy_target_file';
-
-        file_put_contents($sourceFilePath, 'SOURCE FILE');
-        file_put_contents($targetFilePath, 'TARGET FILE');
-        touch($targetFilePath, time() - 1000);
-
-        $this->filesystem->copy($sourceFilePath, $targetFilePath);
-
-        $this->assertFileExists($targetFilePath);
-        $this->assertEquals('SOURCE FILE', file_get_contents($targetFilePath));
-    }
-
-    public function testCopyDoesNotOverrideExistingFileByDefault()
-    {
-        $sourceFilePath = $this->workspace.DIRECTORY_SEPARATOR.'copy_source_file';
-        $targetFilePath = $this->workspace.DIRECTORY_SEPARATOR.'copy_target_file';
-
-        file_put_contents($sourceFilePath, 'SOURCE FILE');
-        file_put_contents($targetFilePath, 'TARGET FILE');
-
-        // make sure both files have the same modification time
-        $modificationTime = time() - 1000;
-        touch($sourceFilePath, $modificationTime);
-        touch($targetFilePath, $modificationTime);
-
-        $this->filesystem->copy($sourceFilePath, $targetFilePath);
-
-        $this->assertFileExists($targetFilePath);
-        $this->assertEquals('TARGET FILE', file_get_contents($targetFilePath));
-    }
-
-    public function testCopyOverridesExistingFileIfForced()
-    {
-        $sourceFilePath = $this->workspace.DIRECTORY_SEPARATOR.'copy_source_file';
-        $targetFilePath = $this->workspace.DIRECTORY_SEPARATOR.'copy_target_file';
-
-        file_put_contents($sourceFilePath, 'SOURCE FILE');
-        file_put_contents($targetFilePath, 'TARGET FILE');
-
-        // make sure both files have the same modification time
-        $modificationTime = time() - 1000;
-        touch($sourceFilePath, $modificationTime);
-        touch($targetFilePath, $modificationTime);
-
-        $this->filesystem->copy($sourceFilePath, $targetFilePath, true);
-
-        $this->assertFileExists($targetFilePath);
-        $this->assertEquals('SOURCE FILE', file_get_contents($targetFilePath));
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Filesystem\Exception\IOException
-     */
-    public function testCopyWithOverrideWithReadOnlyTargetFails()
-    {
-        // skip test on Windows; PHP can't easily set file as unwritable on Windows
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $this->markTestSkipped('This test cannot run on Windows.');
-        }
-
-        $sourceFilePath = $this->workspace.DIRECTORY_SEPARATOR.'copy_source_file';
-        $targetFilePath = $this->workspace.DIRECTORY_SEPARATOR.'copy_target_file';
-
-        file_put_contents($sourceFilePath, 'SOURCE FILE');
-        file_put_contents($targetFilePath, 'TARGET FILE');
-
-        // make sure both files have the same modification time
-        $modificationTime = time() - 1000;
-        touch($sourceFilePath, $modificationTime);
-        touch($targetFilePath, $modificationTime);
-
-        // make sure target is read-only
-        $this->filesystem->chmod($targetFilePath, 0444);
-
-        $this->filesystem->copy($sourceFilePath, $targetFilePath, true);
-    }
-
-    public function testCopyCreatesTargetDirectoryIfItDoesNotExist()
-    {
-        $sourceFilePath = $this->workspace.DIRECTORY_SEPARATOR.'copy_source_file';
-        $targetFileDirectory = $this->workspace.DIRECTORY_SEPARATOR.'directory';
-        $targetFilePath = $targetFileDirectory.DIRECTORY_SEPARATOR.'copy_target_file';
-
-        file_put_contents($sourceFilePath, 'SOURCE FILE');
-
-        $this->filesystem->copy($sourceFilePath, $targetFilePath);
-
-        $this->assertTrue(is_dir($targetFileDirectory));
-        $this->assertFileExists($targetFilePath);
-        $this->assertEquals('SOURCE FILE', file_get_contents($targetFilePath));
-    }
-
-    public function testCopyForOriginUrlsAndExistingLocalFileDefaultsToCopy()
-    {
-        $sourceFilePath = 'http://symfony.com/images/common/logo/logo_symfony_header.png';
-        $targetFilePath = $this->workspace.DIRECTORY_SEPARATOR.'copy_target_file';
-
-        file_put_contents($targetFilePath, 'TARGET FILE');
-
-        $this->filesystem->copy($sourceFilePath, $targetFilePath, false);
-
-        $this->assertFileExists($targetFilePath);
-        $this->assertEquals(file_get_contents($sourceFilePath), file_get_contents($targetFilePath));
-    }
-
-    public function testMkdirCreatesDirectoriesRecursively()
-    {
-        $directory = $this->workspace
-            .DIRECTORY_SEPARATOR.'directory'
-            .DIRECTORY_SEPARATOR.'sub_directory';
-
-        $this->filesystem->mkdir($directory);
-
-        $this->assertTrue(is_dir($directory));
-    }
-
-    public function testMkdirCreatesDirectoriesFromArray()
-    {
-        $basePath = $this->workspace.DIRECTORY_SEPARATOR;
-        $directories = array(
-            $basePath.'1', $basePath.'2', $basePath.'3',
-        );
-
-        $this->filesystem->mkdir($directories);
-
-        $this->assertTrue(is_dir($basePath.'1'));
-        $this->assertTrue(is_dir($basePath.'2'));
-        $this->assertTrue(is_dir($basePath.'3'));
-    }
-
-    public function testMkdirCreatesDirectoriesFromTraversableObject()
-    {
-        $basePath = $this->workspace.DIRECTORY_SEPARATOR;
-        $directories = new \ArrayObject(array(
-            $basePath.'1', $basePath.'2', $basePath.'3',
-        ));
-
-        $this->filesystem->mkdir($directories);
-
-        $this->assertTrue(is_dir($basePath.'1'));
-        $this->assertTrue(is_dir($basePath.'2'));
-        $this->assertTrue(is_dir($basePath.'3'));
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Filesystem\Exception\IOException
-     */
-    public function testMkdirCreatesDirectoriesFails()
-    {
-        $basePath = $this->workspace.DIRECTORY_SEPARATOR;
-        $dir = $basePath.'2';
-
-        file_put_contents($dir, '');
-
-        $this->filesystem->mkdir($dir);
-    }
-
-    public function testTouchCreatesEmptyFile()
-    {
-        $file = $this->workspace.DIRECTORY_SEPARATOR.'1';
-
-        $this->filesystem->touch($file);
-
-        $this->assertFileExists($file);
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Filesystem\Exception\IOException
-     */
-    public function testTouchFails()
-    {
-        $file = $this->workspace.DIRECTORY_SEPARATOR.'1'.DIRECTORY_SEPARATOR.'2';
-
-        $this->filesystem->touch($file);
-    }
-
-    public function testTouchCreatesEmptyFilesFromArray()
-    {
-        $basePath = $this->workspace.DIRECTORY_SEPARATOR;
-        $files = array(
-            $basePath.'1', $basePath.'2', $basePath.'3',
-        );
-
-        $this->filesystem->touch($files);
-
-        $this->assertFileExists($basePath.'1');
-        $this->assertFileExists($basePath.'2');
-        $this->assertFileExists($basePath.'3');
-    }
-
-    public function testTouchCreatesEmptyFilesFromTraversableObject()
-    {
-        $basePath = $this->workspace.DIRECTORY_SEPARATOR;
-        $files = new \ArrayObject(array(
-            $basePath.'1', $basePath.'2', $basePath.'3',
-        ));
-
-        $this->filesystem->touch($files);
-
-        $this->assertFileExists($basePath.'1');
-        $this->assertFileExists($basePath.'2');
-        $this->assertFileExists($basePath.'3');
-    }
-
-    public function testRemoveCleansFilesAndDirectoriesIteratively()
-    {
-        $basePath = $this->workspace.DIRECTORY_SEPARATOR.'directory'.DIRECTORY_SEPARATOR;
-
-        mkdir($basePath);
-        mkdir($basePath.'dir');
-        touch($basePath.'file');
-
-        $this->filesystem->remove($basePath);
-
-        $this->assertFileNotExists($basePath);
-    }
-
-    public function testRemoveCleansArrayOfFilesAndDirectories()
-    {
-        $basePath = $this->workspace.DIRECTORY_SEPARATOR;
-
-        mkdir($basePath.'dir');
-        touch($basePath.'file');
-
-        $files = array(
-            $basePath.'dir', $basePath.'file',
-        );
-
-        $this->filesystem->remove($files);
-
-        $this->assertFileNotExists($basePath.'dir');
-        $this->assertFileNotExists($basePath.'file');
-    }
-
-    public function testRemoveCleansTraversableObjectOfFilesAndDirectories()
-    {
-        $basePath = $this->workspace.DIRECTORY_SEPARATOR;
-
-        mkdir($basePath.'dir');
-        touch($basePath.'file');
-
-        $files = new \ArrayObject(array(
-            $basePath.'dir', $basePath.'file',
-        ));
-
-        $this->filesystem->remove($files);
-
-        $this->assertFileNotExists($basePath.'dir');
-        $this->assertFileNotExists($basePath.'file');
-    }
-
-    public function testRemoveIgnoresNonExistingFiles()
-    {
-        $basePath = $this->workspace.DIRECTORY_SEPARATOR;
-
-        mkdir($basePath.'dir');
-
-        $files = array(
-            $basePath.'dir', $basePath.'file',
-        );
-
-        $this->filesystem->remove($files);
-
-        $this->assertFileNotExists($basePath.'dir');
-    }
-
-    public function testRemoveCleansInvalidLinks()
-    {
-        $this->markAsSkippedIfSymlinkIsMissing();
-
-        $basePath = $this->workspace.DIRECTORY_SEPARATOR.'directory'.DIRECTORY_SEPARATOR;
-
-        mkdir($basePath);
-        mkdir($basePath.'dir');
-        // create symlink to nonexistent file
-        @symlink($basePath.'file', $basePath.'file-link');
-
-        // create symlink to dir using trailing forward slash
-        $this->filesystem->symlink($basePath.'dir/', $basePath.'dir-link');
-        $this->assertTrue(is_dir($basePath.'dir-link'));
-
-        // create symlink to nonexistent dir
-        rmdir($basePath.'dir');
-        $this->assertFalse('\\' === DIRECTORY_SEPARATOR ? @readlink($basePath.'dir-link') : is_dir($basePath.'dir-link'));
-
-        $this->filesystem->remove($basePath);
-
-        $this->assertFileNotExists($basePath);
-    }
-
-    public function testFilesExists()
-    {
-        $basePath = $this->workspace.DIRECTORY_SEPARATOR.'directory'.DIRECTORY_SEPARATOR;
-
-        mkdir($basePath);
-        touch($basePath.'file1');
-        mkdir($basePath.'folder');
-
-        $this->assertTrue($this->filesystem->exists($basePath.'file1'));
-        $this->assertTrue($this->filesystem->exists($basePath.'folder'));
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Filesystem\Exception\IOException
-     */
-    public function testFilesExistsFails()
-    {
-        if ('\\' !== DIRECTORY_SEPARATOR) {
-            $this->markTestSkipped('Test covers edge case on Windows only.');
-        }
-
-        $basePath = $this->workspace.'\\directory\\';
-
-        $oldPath = getcwd();
-        mkdir($basePath);
-        chdir($basePath);
-        $file = str_repeat('T', 259 - strlen($basePath));
-        $path = $basePath.$file;
-        exec('TYPE NUL >>'.$file); // equivalent of touch, we can not use the php touch() here because it suffers from the same limitation
-        $this->longPathNamesWindows[] = $path; // save this so we can clean up later
-        chdir($oldPath);
-        $this->filesystem->exists($path);
-    }
-
-    public function testFilesExistsTraversableObjectOfFilesAndDirectories()
-    {
-        $basePath = $this->workspace.DIRECTORY_SEPARATOR;
-
-        mkdir($basePath.'dir');
-        touch($basePath.'file');
-
-        $files = new \ArrayObject(array(
-            $basePath.'dir', $basePath.'file',
-        ));
-
-        $this->assertTrue($this->filesystem->exists($files));
-    }
-
-    public function testFilesNotExistsTraversableObjectOfFilesAndDirectories()
-    {
-        $basePath = $this->workspace.DIRECTORY_SEPARATOR;
-
-        mkdir($basePath.'dir');
-        touch($basePath.'file');
-        touch($basePath.'file2');
-
-        $files = new \ArrayObject(array(
-            $basePath.'dir', $basePath.'file', $basePath.'file2',
-        ));
-
-        unlink($basePath.'file');
-
-        $this->assertFalse($this->filesystem->exists($files));
-    }
-
-    public function testInvalidFileNotExists()
-    {
-        $basePath = $this->workspace.DIRECTORY_SEPARATOR.'directory'.DIRECTORY_SEPARATOR;
-
-        $this->assertFalse($this->filesystem->exists($basePath.time()));
-    }
-
-    public function testChmodChangesFileMode()
-    {
-        $this->markAsSkippedIfChmodIsMissing();
-
-        $dir = $this->workspace.DIRECTORY_SEPARATOR.'dir';
-        mkdir($dir);
-        $file = $dir.DIRECTORY_SEPARATOR.'file';
-        touch($file);
-
-        $this->filesystem->chmod($file, 0400);
-        $this->filesystem->chmod($dir, 0753);
-
-        $this->assertFilePermissions(753, $dir);
-        $this->assertFilePermissions(400, $file);
-    }
-
-    public function testChmodWrongMod()
-    {
-        $this->markAsSkippedIfChmodIsMissing();
-
-        $dir = $this->workspace.DIRECTORY_SEPARATOR.'file';
-        touch($dir);
-
-        $this->filesystem->chmod($dir, 'Wrongmode');
-    }
-
-    public function testChmodRecursive()
-    {
-        $this->markAsSkippedIfChmodIsMissing();
-
-        $dir = $this->workspace.DIRECTORY_SEPARATOR.'dir';
-        mkdir($dir);
-        $file = $dir.DIRECTORY_SEPARATOR.'file';
-        touch($file);
-
-        $this->filesystem->chmod($file, 0400, 0000, true);
-        $this->filesystem->chmod($dir, 0753, 0000, true);
-
-        $this->assertFilePermissions(753, $dir);
-        $this->assertFilePermissions(753, $file);
-    }
-
-    public function testChmodAppliesUmask()
-    {
-        $this->markAsSkippedIfChmodIsMissing();
-
-        $file = $this->workspace.DIRECTORY_SEPARATOR.'file';
-        touch($file);
-
-        $this->filesystem->chmod($file, 0770, 0022);
-        $this->assertFilePermissions(750, $file);
-    }
-
-    public function testChmodChangesModeOfArrayOfFiles()
-    {
-        $this->markAsSkippedIfChmodIsMissing();
-
-        $directory = $this->workspace.DIRECTORY_SEPARATOR.'directory';
-        $file = $this->workspace.DIRECTORY_SEPARATOR.'file';
-        $files = array($directory, $file);
-
-        mkdir($directory);
-        touch($file);
-
-        $this->filesystem->chmod($files, 0753);
-
-        $this->assertFilePermissions(753, $file);
-        $this->assertFilePermissions(753, $directory);
-    }
-
-    public function testChmodChangesModeOfTraversableFileObject()
-    {
-        $this->markAsSkippedIfChmodIsMissing();
-
-        $directory = $this->workspace.DIRECTORY_SEPARATOR.'directory';
-        $file = $this->workspace.DIRECTORY_SEPARATOR.'file';
-        $files = new \ArrayObject(array($directory, $file));
-
-        mkdir($directory);
-        touch($file);
-
-        $this->filesystem->chmod($files, 0753);
-
-        $this->assertFilePermissions(753, $file);
-        $this->assertFilePermissions(753, $directory);
-    }
-
-    public function testChmodChangesZeroModeOnSubdirectoriesOnRecursive()
-    {
-        $this->markAsSkippedIfChmodIsMissing();
-
-        $directory = $this->workspace.DIRECTORY_SEPARATOR.'directory';
-        $subdirectory = $directory.DIRECTORY_SEPARATOR.'subdirectory';
-
-        mkdir($directory);
-        mkdir($subdirectory);
-        chmod($subdirectory, 0000);
-
-        $this->filesystem->chmod($directory, 0753, 0000, true);
-
-        $this->assertFilePermissions(753, $subdirectory);
-    }
-
-    public function testChown()
-    {
-        $this->markAsSkippedIfPosixIsMissing();
-
-        $dir = $this->workspace.DIRECTORY_SEPARATOR.'dir';
-        mkdir($dir);
-
-        $this->filesystem->chown($dir, $this->getFileOwner($dir));
-    }
-
-    public function testChownRecursive()
-    {
-        $this->markAsSkippedIfPosixIsMissing();
-
-        $dir = $this->workspace.DIRECTORY_SEPARATOR.'dir';
-        mkdir($dir);
-        $file = $dir.DIRECTORY_SEPARATOR.'file';
-        touch($file);
-
-        $this->filesystem->chown($dir, $this->getFileOwner($dir), true);
-    }
-
-    public function testChownSymlink()
-    {
-        $this->markAsSkippedIfSymlinkIsMissing();
-
-        $file = $this->workspace.DIRECTORY_SEPARATOR.'file';
-        $link = $this->workspace.DIRECTORY_SEPARATOR.'link';
-
-        touch($file);
-
-        $this->filesystem->symlink($file, $link);
-
-        $this->filesystem->chown($link, $this->getFileOwner($link));
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Filesystem\Exception\IOException
-     */
-    public function testChownSymlinkFails()
-    {
-        $this->markAsSkippedIfSymlinkIsMissing();
-
-        $file = $this->workspace.DIRECTORY_SEPARATOR.'file';
-        $link = $this->workspace.DIRECTORY_SEPARATOR.'link';
-
-        touch($file);
-
-        $this->filesystem->symlink($file, $link);
-
-        $this->filesystem->chown($link, 'user'.time().mt_rand(1000, 9999));
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Filesystem\Exception\IOException
-     */
-    public function testChownFail()
-    {
-        $this->markAsSkippedIfPosixIsMissing();
-
-        $dir = $this->workspace.DIRECTORY_SEPARATOR.'dir';
-        mkdir($dir);
-
-        $this->filesystem->chown($dir, 'user'.time().mt_rand(1000, 9999));
-    }
-
-    public function testChgrp()
-    {
-        $this->markAsSkippedIfPosixIsMissing();
-
-        $dir = $this->workspace.DIRECTORY_SEPARATOR.'dir';
-        mkdir($dir);
-
-        $this->filesystem->chgrp($dir, $this->getFileGroup($dir));
-    }
-
-    public function testChgrpRecursive()
-    {
-        $this->markAsSkippedIfPosixIsMissing();
-
-        $dir = $this->workspace.DIRECTORY_SEPARATOR.'dir';
-        mkdir($dir);
-        $file = $dir.DIRECTORY_SEPARATOR.'file';
-        touch($file);
-
-        $this->filesystem->chgrp($dir, $this->getFileGroup($dir), true);
-    }
-
-    public function testChgrpSymlink()
-    {
-        $this->markAsSkippedIfSymlinkIsMissing();
-
-        $file = $this->workspace.DIRECTORY_SEPARATOR.'file';
-        $link = $this->workspace.DIRECTORY_SEPARATOR.'link';
-
-        touch($file);
-
-        $this->filesystem->symlink($file, $link);
-
-        $this->filesystem->chgrp($link, $this->getFileGroup($link));
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Filesystem\Exception\IOException
-     */
-    public function testChgrpSymlinkFails()
-    {
-        $this->markAsSkippedIfSymlinkIsMissing();
-
-        $file = $this->workspace.DIRECTORY_SEPARATOR.'file';
-        $link = $this->workspace.DIRECTORY_SEPARATOR.'link';
-
-        touch($file);
-
-        $this->filesystem->symlink($file, $link);
-
-        $this->filesystem->chgrp($link, 'user'.time().mt_rand(1000, 9999));
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Filesystem\Exception\IOException
-     */
-    public function testChgrpFail()
-    {
-        $this->markAsSkippedIfPosixIsMissing();
-
-        $dir = $this->workspace.DIRECTORY_SEPARATOR.'dir';
-        mkdir($dir);
-
-        $this->filesystem->chgrp($dir, 'user'.time().mt_rand(1000, 9999));
-    }
-
-    public function testRename()
-    {
-        $file = $this->workspace.DIRECTORY_SEPARATOR.'file';
-        $newPath = $this->workspace.DIRECTORY_SEPARATOR.'new_file';
-        touch($file);
-
-        $this->filesystem->rename($file, $newPath);
-
-        $this->assertFileNotExists($file);
-        $this->assertFileExists($newPath);
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Filesystem\Exception\IOException
-     */
-    public function testRenameThrowsExceptionIfTargetAlreadyExists()
-    {
-        $file = $this->workspace.DIRECTORY_SEPARATOR.'file';
-        $newPath = $this->workspace.DIRECTORY_SEPARATOR.'new_file';
-
-        touch($file);
-        touch($newPath);
-
-        $this->filesystem->rename($file, $newPath);
-    }
-
-    public function testRenameOverwritesTheTargetIfItAlreadyExists()
-    {
-        $file = $this->workspace.DIRECTORY_SEPARATOR.'file';
-        $newPath = $this->workspace.DIRECTORY_SEPARATOR.'new_file';
-
-        touch($file);
-        touch($newPath);
-
-        $this->filesystem->rename($file, $newPath, true);
-
-        $this->assertFileNotExists($file);
-        $this->assertFileExists($newPath);
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Filesystem\Exception\IOException
-     */
-    public function testRenameThrowsExceptionOnError()
-    {
-        $file = $this->workspace.DIRECTORY_SEPARATOR.uniqid('fs_test_', true);
-        $newPath = $this->workspace.DIRECTORY_SEPARATOR.'new_file';
-
-        $this->filesystem->rename($file, $newPath);
-    }
-
-    public function testSymlink()
-    {
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $this->markTestSkipped('Windows does not support creating "broken" symlinks');
-        }
-
-        $file = $this->workspace.DIRECTORY_SEPARATOR.'file';
-        $link = $this->workspace.DIRECTORY_SEPARATOR.'link';
-
-        // $file does not exists right now: creating "broken" links is a wanted feature
-        $this->filesystem->symlink($file, $link);
-
-        $this->assertTrue(is_link($link));
-
-        // Create the linked file AFTER creating the link
-        touch($file);
-
-        $this->assertEquals($file, readlink($link));
-    }
-
-    /**
-     * @depends testSymlink
-     */
-    public function testRemoveSymlink()
-    {
-        $this->markAsSkippedIfSymlinkIsMissing();
-
-        $link = $this->workspace.DIRECTORY_SEPARATOR.'link';
-
-        $this->filesystem->remove($link);
-
-        $this->assertTrue(!is_link($link));
-        $this->assertTrue(!is_file($link));
-        $this->assertTrue(!is_dir($link));
-    }
-
-    public function testSymlinkIsOverwrittenIfPointsToDifferentTarget()
-    {
-        $this->markAsSkippedIfSymlinkIsMissing();
-
-        $file = $this->workspace.DIRECTORY_SEPARATOR.'file';
-        $link = $this->workspace.DIRECTORY_SEPARATOR.'link';
-
-        touch($file);
-        symlink($this->workspace, $link);
-
-        $this->filesystem->symlink($file, $link);
-
-        $this->assertTrue(is_link($link));
-        $this->assertEquals($file, readlink($link));
-    }
-
-    public function testSymlinkIsNotOverwrittenIfAlreadyCreated()
-    {
-        $this->markAsSkippedIfSymlinkIsMissing();
-
-        $file = $this->workspace.DIRECTORY_SEPARATOR.'file';
-        $link = $this->workspace.DIRECTORY_SEPARATOR.'link';
-
-        touch($file);
-        symlink($file, $link);
-
-        $this->filesystem->symlink($file, $link);
-
-        $this->assertTrue(is_link($link));
-        $this->assertEquals($file, readlink($link));
-    }
-
-    public function testSymlinkCreatesTargetDirectoryIfItDoesNotExist()
-    {
-        $this->markAsSkippedIfSymlinkIsMissing();
-
-        $file = $this->workspace.DIRECTORY_SEPARATOR.'file';
-        $link1 = $this->workspace.DIRECTORY_SEPARATOR.'dir'.DIRECTORY_SEPARATOR.'link';
-        $link2 = $this->workspace.DIRECTORY_SEPARATOR.'dir'.DIRECTORY_SEPARATOR.'subdir'.DIRECTORY_SEPARATOR.'link';
-
-        touch($file);
-
-        $this->filesystem->symlink($file, $link1);
-        $this->filesystem->symlink($file, $link2);
-
-        $this->assertTrue(is_link($link1));
-        $this->assertEquals($file, readlink($link1));
-        $this->assertTrue(is_link($link2));
-        $this->assertEquals($file, readlink($link2));
-    }
-
-    /**
-     * @dataProvider providePathsForMakePathRelative
-     */
-    public function testMakePathRelative($endPath, $startPath, $expectedPath)
-    {
-        $path = $this->filesystem->makePathRelative($endPath, $startPath);
-
-        $this->assertEquals($expectedPath, $path);
-    }
-
-    /**
-     * @return array
-     */
-    public function providePathsForMakePathRelative()
-    {
-        $paths = array(
-            array('/var/lib/symfony/src/Symfony/', '/var/lib/symfony/src/Symfony/Component', '../'),
-            array('/var/lib/symfony/src/Symfony/', '/var/lib/symfony/src/Symfony/Component/', '../'),
-            array('/var/lib/symfony/src/Symfony', '/var/lib/symfony/src/Symfony/Component', '../'),
-            array('/var/lib/symfony/src/Symfony', '/var/lib/symfony/src/Symfony/Component/', '../'),
-            array('var/lib/symfony/', 'var/lib/symfony/src/Symfony/Component', '../../../'),
-            array('/usr/lib/symfony/', '/var/lib/symfony/src/Symfony/Component', '../../../../../../usr/lib/symfony/'),
-            array('/var/lib/symfony/src/Symfony/', '/var/lib/symfony/', 'src/Symfony/'),
-            array('/aa/bb', '/aa/bb', './'),
-            array('/aa/bb', '/aa/bb/', './'),
-            array('/aa/bb/', '/aa/bb', './'),
-            array('/aa/bb/', '/aa/bb/', './'),
-            array('/aa/bb/cc', '/aa/bb/cc/dd', '../'),
-            array('/aa/bb/cc', '/aa/bb/cc/dd/', '../'),
-            array('/aa/bb/cc/', '/aa/bb/cc/dd', '../'),
-            array('/aa/bb/cc/', '/aa/bb/cc/dd/', '../'),
-            array('/aa/bb/cc', '/aa', 'bb/cc/'),
-            array('/aa/bb/cc', '/aa/', 'bb/cc/'),
-            array('/aa/bb/cc/', '/aa', 'bb/cc/'),
-            array('/aa/bb/cc/', '/aa/', 'bb/cc/'),
-            array('/a/aab/bb', '/a/aa', '../aab/bb/'),
-            array('/a/aab/bb', '/a/aa/', '../aab/bb/'),
-            array('/a/aab/bb/', '/a/aa', '../aab/bb/'),
-            array('/a/aab/bb/', '/a/aa/', '../aab/bb/'),
-            array('/a/aab/bb/', '/', 'a/aab/bb/'),
-            array('/a/aab/bb/', '/b/aab', '../../a/aab/bb/'),
-        );
-
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $paths[] = array('c:\var\lib/symfony/src/Symfony/', 'c:/var/lib/symfony/', 'src/Symfony/');
-        }
-
-        return $paths;
-    }
-
-    public function testMirrorCopiesFilesAndDirectoriesRecursively()
-    {
-        $sourcePath = $this->workspace.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR;
-        $directory = $sourcePath.'directory'.DIRECTORY_SEPARATOR;
-        $file1 = $directory.'file1';
-        $file2 = $sourcePath.'file2';
-
-        mkdir($sourcePath);
-        mkdir($directory);
-        file_put_contents($file1, 'FILE1');
-        file_put_contents($file2, 'FILE2');
-
-        $targetPath = $this->workspace.DIRECTORY_SEPARATOR.'target'.DIRECTORY_SEPARATOR;
-
-        $this->filesystem->mirror($sourcePath, $targetPath);
-
-        $this->assertTrue(is_dir($targetPath));
-        $this->assertTrue(is_dir($targetPath.'directory'));
-        $this->assertFileEquals($file1, $targetPath.'directory'.DIRECTORY_SEPARATOR.'file1');
-        $this->assertFileEquals($file2, $targetPath.'file2');
-
-        $this->filesystem->remove($file1);
-
-        $this->filesystem->mirror($sourcePath, $targetPath, null, array('delete' => false));
-        $this->assertTrue($this->filesystem->exists($targetPath.'directory'.DIRECTORY_SEPARATOR.'file1'));
-
-        $this->filesystem->mirror($sourcePath, $targetPath, null, array('delete' => true));
-        $this->assertFalse($this->filesystem->exists($targetPath.'directory'.DIRECTORY_SEPARATOR.'file1'));
-
-        file_put_contents($file1, 'FILE1');
-
-        $this->filesystem->mirror($sourcePath, $targetPath, null, array('delete' => true));
-        $this->assertTrue($this->filesystem->exists($targetPath.'directory'.DIRECTORY_SEPARATOR.'file1'));
-
-        $this->filesystem->remove($directory);
-        $this->filesystem->mirror($sourcePath, $targetPath, null, array('delete' => true));
-        $this->assertFalse($this->filesystem->exists($targetPath.'directory'));
-        $this->assertFalse($this->filesystem->exists($targetPath.'directory'.DIRECTORY_SEPARATOR.'file1'));
-    }
-
-    public function testMirrorCreatesEmptyDirectory()
-    {
-        $sourcePath = $this->workspace.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR;
-
-        mkdir($sourcePath);
-
-        $targetPath = $this->workspace.DIRECTORY_SEPARATOR.'target'.DIRECTORY_SEPARATOR;
-
-        $this->filesystem->mirror($sourcePath, $targetPath);
-
-        $this->assertTrue(is_dir($targetPath));
-
-        $this->filesystem->remove($sourcePath);
-    }
-
-    public function testMirrorCopiesLinks()
-    {
-        $this->markAsSkippedIfSymlinkIsMissing();
-
-        $sourcePath = $this->workspace.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR;
-
-        mkdir($sourcePath);
-        file_put_contents($sourcePath.'file1', 'FILE1');
-        symlink($sourcePath.'file1', $sourcePath.'link1');
-
-        $targetPath = $this->workspace.DIRECTORY_SEPARATOR.'target'.DIRECTORY_SEPARATOR;
-
-        $this->filesystem->mirror($sourcePath, $targetPath);
-
-        $this->assertTrue(is_dir($targetPath));
-        $this->assertFileEquals($sourcePath.'file1', $targetPath.'link1');
-        $this->assertTrue(is_link($targetPath.DIRECTORY_SEPARATOR.'link1'));
-    }
-
-    public function testMirrorCopiesLinkedDirectoryContents()
-    {
-        $this->markAsSkippedIfSymlinkIsMissing(true);
-
-        $sourcePath = $this->workspace.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR;
-
-        mkdir($sourcePath.'nested/', 0777, true);
-        file_put_contents($sourcePath.'/nested/file1.txt', 'FILE1');
-        // Note: We symlink directory, not file
-        symlink($sourcePath.'nested', $sourcePath.'link1');
-
-        $targetPath = $this->workspace.DIRECTORY_SEPARATOR.'target'.DIRECTORY_SEPARATOR;
-
-        $this->filesystem->mirror($sourcePath, $targetPath);
-
-        $this->assertTrue(is_dir($targetPath));
-        $this->assertFileEquals($sourcePath.'/nested/file1.txt', $targetPath.'link1/file1.txt');
-        $this->assertTrue(is_link($targetPath.DIRECTORY_SEPARATOR.'link1'));
-    }
-
-    public function testMirrorCopiesRelativeLinkedContents()
-    {
-        $this->markAsSkippedIfSymlinkIsMissing(true);
-
-        $sourcePath = $this->workspace.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR;
-        $oldPath = getcwd();
-
-        mkdir($sourcePath.'nested/', 0777, true);
-        file_put_contents($sourcePath.'/nested/file1.txt', 'FILE1');
-        // Note: Create relative symlink
-        chdir($sourcePath);
-        symlink('nested', 'link1');
-
-        chdir($oldPath);
-
-        $targetPath = $this->workspace.DIRECTORY_SEPARATOR.'target'.DIRECTORY_SEPARATOR;
-
-        $this->filesystem->mirror($sourcePath, $targetPath);
-
-        $this->assertTrue(is_dir($targetPath));
-        $this->assertFileEquals($sourcePath.'/nested/file1.txt', $targetPath.'link1/file1.txt');
-        $this->assertTrue(is_link($targetPath.DIRECTORY_SEPARATOR.'link1'));
-        $this->assertEquals('\\' === DIRECTORY_SEPARATOR ? realpath($sourcePath.'\nested') : 'nested', readlink($targetPath.DIRECTORY_SEPARATOR.'link1'));
-    }
-
-    /**
-     * @dataProvider providePathsForIsAbsolutePath
-     */
-    public function testIsAbsolutePath($path, $expectedResult)
-    {
-        $result = $this->filesystem->isAbsolutePath($path);
-
-        $this->assertEquals($expectedResult, $result);
-    }
-
-    /**
-     * @return array
-     */
-    public function providePathsForIsAbsolutePath()
-    {
-        return array(
-            array('/var/lib', true),
-            array('c:\\\\var\\lib', true),
-            array('\\var\\lib', true),
-            array('var/lib', false),
-            array('../var/lib', false),
-            array('', false),
-            array(null, false),
-        );
-    }
-
-    public function testTempnam()
-    {
-        $dirname = $this->workspace;
-
-        $filename = $this->filesystem->tempnam($dirname, 'foo');
-
-        $this->assertFileExists($filename);
-    }
-
-    public function testTempnamWithFileScheme()
-    {
-        $scheme = 'file://';
-        $dirname = $scheme.$this->workspace;
-
-        $filename = $this->filesystem->tempnam($dirname, 'foo');
-
-        $this->assertStringStartsWith($scheme, $filename);
-        $this->assertFileExists($filename);
-    }
-
-    public function testTempnamWithMockScheme()
-    {
-        stream_wrapper_register('mock', 'Symfony\Component\Filesystem\Tests\Fixtures\MockStream\MockStream');
-
-        $scheme = 'mock://';
-        $dirname = $scheme.$this->workspace;
-
-        $filename = $this->filesystem->tempnam($dirname, 'foo');
-
-        $this->assertStringStartsWith($scheme, $filename);
-        $this->assertFileExists($filename);
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Filesystem\Exception\IOException
-     */
-    public function testTempnamWithZlibSchemeFails()
-    {
-        $scheme = 'compress.zlib://';
-        $dirname = $scheme.$this->workspace;
-
-        // The compress.zlib:// stream does not support mode x: creates the file, errors "failed to open stream: operation failed" and returns false
-        $this->filesystem->tempnam($dirname, 'bar');
-    }
-
-    public function testTempnamWithPHPTempSchemeFails()
-    {
-        $scheme = 'php://temp';
-        $dirname = $scheme;
-
-        $filename = $this->filesystem->tempnam($dirname, 'bar');
-
-        $this->assertStringStartsWith($scheme, $filename);
-
-        // The php://temp stream deletes the file after close
-        $this->assertFileNotExists($filename);
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Filesystem\Exception\IOException
-     */
-    public function testTempnamWithPharSchemeFails()
-    {
-        // Skip test if Phar disabled phar.readonly must be 0 in php.ini
-        if (!\Phar::canWrite()) {
-            $this->markTestSkipped('This test cannot run when phar.readonly is 1.');
-        }
-
-        $scheme = 'phar://';
-        $dirname = $scheme.$this->workspace;
-        $pharname = 'foo.phar';
-
-        new \Phar($this->workspace.'/'.$pharname, 0, $pharname);
-        // The phar:// stream does not support mode x: fails to create file, errors "failed to open stream: phar error: "$filename" is not a file in phar "$pharname"" and returns false
-        $this->filesystem->tempnam($dirname, $pharname.'/bar');
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Filesystem\Exception\IOException
-     */
-    public function testTempnamWithHTTPSchemeFails()
-    {
-        $scheme = 'http://';
-        $dirname = $scheme.$this->workspace;
-
-        // The http:// scheme is read-only
-        $this->filesystem->tempnam($dirname, 'bar');
-    }
-
-    public function testTempnamOnUnwritableFallsBackToSysTmp()
-    {
-        $scheme = 'file://';
-        $dirname = $scheme.$this->workspace.DIRECTORY_SEPARATOR.'does_not_exist';
-
-        $filename = $this->filesystem->tempnam($dirname, 'bar');
-        $realTempDir = realpath(sys_get_temp_dir());
-        $this->assertStringStartsWith(rtrim($scheme.$realTempDir, DIRECTORY_SEPARATOR), $filename);
-        $this->assertFileExists($filename);
-
-        // Tear down
-        @unlink($filename);
-    }
-
-    public function testDumpFile()
-    {
-        $filename = $this->workspace.DIRECTORY_SEPARATOR.'foo'.DIRECTORY_SEPARATOR.'baz.txt';
-
-        $this->filesystem->dumpFile($filename, 'bar');
-        $this->assertFileExists($filename);
-        $this->assertSame('bar', file_get_contents($filename));
-
-        // skip mode check on Windows
-        if ('\\' !== DIRECTORY_SEPARATOR) {
-            $this->assertFilePermissions(666, $filename);
-        }
-    }
-
-    public function testDumpFileOverwritesAnExistingFile()
-    {
-        $filename = $this->workspace.DIRECTORY_SEPARATOR.'foo.txt';
-        file_put_contents($filename, 'FOO BAR');
-
-        $this->filesystem->dumpFile($filename, 'bar');
-
-        $this->assertFileExists($filename);
-        $this->assertSame('bar', file_get_contents($filename));
-    }
-
-    public function testDumpFileWithFileScheme()
-    {
-        if (defined('HHVM_VERSION')) {
-            $this->markTestSkipped('HHVM does not handle the file:// scheme correctly');
-        }
-
-        $scheme = 'file://';
-        $filename = $scheme.$this->workspace.DIRECTORY_SEPARATOR.'foo'.DIRECTORY_SEPARATOR.'baz.txt';
-
-        $this->filesystem->dumpFile($filename, 'bar', null);
-
-        $this->assertFileExists($filename);
-        $this->assertSame('bar', file_get_contents($filename));
-    }
-
-    public function testDumpFileWithZlibScheme()
-    {
-        $scheme = 'compress.zlib://';
-        $filename = $this->workspace.DIRECTORY_SEPARATOR.'foo'.DIRECTORY_SEPARATOR.'baz.txt';
-
-        $this->filesystem->dumpFile($filename, 'bar', null);
-
-        // Zlib stat uses file:// wrapper so remove scheme
-        $this->assertFileExists(str_replace($scheme, '', $filename));
-        $this->assertSame('bar', file_get_contents($filename));
-    }
-
-    public function testCopyShouldKeepExecutionPermission()
-    {
-        $this->markAsSkippedIfChmodIsMissing();
-
-        $sourceFilePath = $this->workspace.DIRECTORY_SEPARATOR.'copy_source_file';
-        $targetFilePath = $this->workspace.DIRECTORY_SEPARATOR.'copy_target_file';
-
-        file_put_contents($sourceFilePath, 'SOURCE FILE');
-        chmod($sourceFilePath, 0745);
-
-        $this->filesystem->copy($sourceFilePath, $targetFilePath);
-
-        $this->assertFilePermissions(767, $targetFilePath);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/filesystem/Tests/FilesystemTestCase.php b/core/src/core/classes/guzzle/vendor/symfony/filesystem/Tests/FilesystemTestCase.php
deleted file mode 100644
index 63d8b8fc90..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/filesystem/Tests/FilesystemTestCase.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?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\Filesystem\Tests;
-
-use Symfony\Component\Filesystem\Filesystem;
-
-class FilesystemTestCase extends \PHPUnit_Framework_TestCase
-{
-    private $umask;
-
-    protected $longPathNamesWindows = array();
-
-    /**
-     * @var \Symfony\Component\Filesystem\Filesystem
-     */
-    protected $filesystem = null;
-
-    /**
-     * @var string
-     */
-    protected $workspace = null;
-
-    private static $symlinkOnWindows = null;
-
-    public static function setUpBeforeClass()
-    {
-        if ('\\' === DIRECTORY_SEPARATOR && null === self::$symlinkOnWindows) {
-            $target = tempnam(sys_get_temp_dir(), 'sl');
-            $link = sys_get_temp_dir().'/sl'.microtime(true).mt_rand();
-            self::$symlinkOnWindows = @symlink($target, $link) && is_link($link);
-            @unlink($link);
-            unlink($target);
-        }
-    }
-
-    protected function setUp()
-    {
-        $this->umask = umask(0);
-        $this->filesystem = new Filesystem();
-        $this->workspace = sys_get_temp_dir().'/'.microtime(true).'.'.mt_rand();
-        mkdir($this->workspace, 0777, true);
-        $this->workspace = realpath($this->workspace);
-    }
-
-    protected function tearDown()
-    {
-        if (!empty($this->longPathNamesWindows)) {
-            foreach ($this->longPathNamesWindows as $path) {
-                exec('DEL '.$path);
-            }
-            $this->longPathNamesWindows = array();
-        }
-
-        $this->filesystem->remove($this->workspace);
-        umask($this->umask);
-    }
-
-    /**
-     * @param int    $expectedFilePerms expected file permissions as three digits (i.e. 755)
-     * @param string $filePath
-     */
-    protected function assertFilePermissions($expectedFilePerms, $filePath)
-    {
-        $actualFilePerms = (int) substr(sprintf('%o', fileperms($filePath)), -3);
-        $this->assertEquals(
-            $expectedFilePerms,
-            $actualFilePerms,
-            sprintf('File permissions for %s must be %s. Actual %s', $filePath, $expectedFilePerms, $actualFilePerms)
-        );
-    }
-
-    protected function getFileOwner($filepath)
-    {
-        $this->markAsSkippedIfPosixIsMissing();
-
-        $infos = stat($filepath);
-        if ($datas = posix_getpwuid($infos['uid'])) {
-            return $datas['name'];
-        }
-    }
-
-    protected function getFileGroup($filepath)
-    {
-        $this->markAsSkippedIfPosixIsMissing();
-
-        $infos = stat($filepath);
-        if ($datas = posix_getgrgid($infos['gid'])) {
-            return $datas['name'];
-        }
-
-        $this->markTestSkipped('Unable to retrieve file group name');
-    }
-
-    protected function markAsSkippedIfSymlinkIsMissing($relative = false)
-    {
-        if ('\\' === DIRECTORY_SEPARATOR && false === self::$symlinkOnWindows) {
-            $this->markTestSkipped('symlink requires "Create symbolic links" privilege on Windows');
-        }
-
-        // https://bugs.php.net/bug.php?id=69473
-        if ($relative && '\\' === DIRECTORY_SEPARATOR && 1 === PHP_ZTS) {
-            $this->markTestSkipped('symlink does not support relative paths on thread safe Windows PHP versions');
-        }
-    }
-
-    protected function markAsSkippedIfChmodIsMissing()
-    {
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $this->markTestSkipped('chmod is not supported on Windows');
-        }
-    }
-
-    protected function markAsSkippedIfPosixIsMissing()
-    {
-        if (!function_exists('posix_isatty')) {
-            $this->markTestSkipped('Function posix_isatty is required.');
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/filesystem/Tests/Fixtures/MockStream/MockStream.php b/core/src/core/classes/guzzle/vendor/symfony/filesystem/Tests/Fixtures/MockStream/MockStream.php
deleted file mode 100644
index f14420fb60..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/filesystem/Tests/Fixtures/MockStream/MockStream.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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\Filesystem\Tests\Fixtures\MockStream;
-
-/**
- * Mock stream class to be used with stream_wrapper_register.
- * stream_wrapper_register('mock', 'Symfony\Component\Filesystem\Tests\Fixtures\MockStream\MockStream').
- */
-class MockStream
-{
-    /**
-     * Opens file or URL.
-     *
-     * @param string $path        Specifies the URL that was passed to the original function
-     * @param string $mode        The mode used to open the file, as detailed for fopen()
-     * @param int    $options     Holds additional flags set by the streams API
-     * @param string $opened_path If the path is opened successfully, and STREAM_USE_PATH is set in options,
-     *                            opened_path should be set to the full path of the file/resource that was actually opened
-     *
-     * @return bool
-     */
-    public function stream_open($path, $mode, $options, &$opened_path)
-    {
-        return true;
-    }
-
-    /**
-     * @param string $path  The file path or URL to stat
-     * @param array  $flags Holds additional flags set by the streams API
-     *
-     * @return array File stats
-     */
-    public function url_stat($path, $flags)
-    {
-        return array();
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/filesystem/Tests/LockHandlerTest.php b/core/src/core/classes/guzzle/vendor/symfony/filesystem/Tests/LockHandlerTest.php
deleted file mode 100644
index c7509f61e6..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/filesystem/Tests/LockHandlerTest.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?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\Filesystem\Tests;
-
-use Symfony\Component\Filesystem\LockHandler;
-
-class LockHandlerTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @expectedException \Symfony\Component\Filesystem\Exception\IOException
-     * @expectedExceptionMessage Failed to create "/a/b/c/d/e": mkdir(): Permission denied.
-     */
-    public function testConstructWhenRepositoryDoesNotExist()
-    {
-        if (!getenv('USER') || 'root' === getenv('USER')) {
-            $this->markTestSkipped('This test will fail if run under superuser');
-        }
-        new LockHandler('lock', '/a/b/c/d/e');
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Filesystem\Exception\IOException
-     * @expectedExceptionMessage The directory "/" is not writable.
-     */
-    public function testConstructWhenRepositoryIsNotWriteable()
-    {
-        if (!getenv('USER') || 'root' === getenv('USER')) {
-            $this->markTestSkipped('This test will fail if run under superuser');
-        }
-        new LockHandler('lock', '/');
-    }
-
-    public function testConstructSanitizeName()
-    {
-        $lock = new LockHandler('<?php echo "% hello word ! %" ?>');
-
-        $file = sprintf('%s/sf.-php-echo-hello-word-.4b3d9d0d27ddef3a78a64685dda3a963e478659a9e5240feaf7b4173a8f28d5f.lock', sys_get_temp_dir());
-        // ensure the file does not exist before the lock
-        @unlink($file);
-
-        $lock->lock();
-
-        $this->assertFileExists($file);
-
-        $lock->release();
-    }
-
-    public function testLockRelease()
-    {
-        $name = 'symfony-test-filesystem.lock';
-
-        $l1 = new LockHandler($name);
-        $l2 = new LockHandler($name);
-
-        $this->assertTrue($l1->lock());
-        $this->assertFalse($l2->lock());
-
-        $l1->release();
-
-        $this->assertTrue($l2->lock());
-        $l2->release();
-    }
-
-    public function testLockTwice()
-    {
-        $name = 'symfony-test-filesystem.lock';
-
-        $lockHandler = new LockHandler($name);
-
-        $this->assertTrue($lockHandler->lock());
-        $this->assertTrue($lockHandler->lock());
-
-        $lockHandler->release();
-    }
-
-    public function testLockIsReleased()
-    {
-        $name = 'symfony-test-filesystem.lock';
-
-        $l1 = new LockHandler($name);
-        $l2 = new LockHandler($name);
-
-        $this->assertTrue($l1->lock());
-        $this->assertFalse($l2->lock());
-
-        $l1 = null;
-
-        $this->assertTrue($l2->lock());
-        $l2->release();
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/filesystem/composer.json b/core/src/core/classes/guzzle/vendor/symfony/filesystem/composer.json
deleted file mode 100644
index cead795d0f..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/filesystem/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "symfony/filesystem",
-    "type": "library",
-    "description": "Symfony Filesystem Component",
-    "keywords": [],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=5.5.9"
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Component\\Filesystem\\": "" },
-        "exclude-from-classmap": [
-            "/Tests/"
-        ]
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.1-dev"
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/filesystem/phpunit.xml.dist b/core/src/core/classes/guzzle/vendor/symfony/filesystem/phpunit.xml.dist
deleted file mode 100644
index d066ed7969..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/filesystem/phpunit.xml.dist
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Symfony Filesystem Component Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/.gitignore b/core/src/core/classes/guzzle/vendor/symfony/yaml/.gitignore
deleted file mode 100644
index c49a5d8df5..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/CHANGELOG.md b/core/src/core/classes/guzzle/vendor/symfony/yaml/CHANGELOG.md
deleted file mode 100644
index aa0c3fa565..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/CHANGELOG.md
+++ /dev/null
@@ -1,67 +0,0 @@
-CHANGELOG
-=========
-
-3.1.0
------
-
- * Strings that are not UTF-8 encoded will be dumped as base64 encoded binary
-   data.
-
- * Added support for dumping multi line strings as literal blocks.
-
- * Added support for parsing base64 encoded binary data when they are tagged
-   with the `!!binary` tag.
-
- * Added support for parsing timestamps as `\DateTime` objects:
-
-   ```php
-   Yaml::parse('2001-12-15 21:59:43.10 -5', Yaml::PARSE_DATETIME);
-   ```
-
- * `\DateTime` and `\DateTimeImmutable` objects are dumped as YAML timestamps.
-
- * Deprecated usage of `%` at the beginning of an unquoted string.
-
- * Added support for customizing the YAML parser behavior through an optional bit field:
-
-   ```php
-   Yaml::parse('{ "foo": "bar", "fiz": "cat" }', Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE | Yaml::PARSE_OBJECT | Yaml::PARSE_OBJECT_FOR_MAP);
-   ```
-
- * Added support for customizing the dumped YAML string through an optional bit field:
-
-   ```php
-   Yaml::dump(array('foo' => new A(), 'bar' => 1), 0, 0, Yaml::DUMP_EXCEPTION_ON_INVALID_TYPE | Yaml::DUMP_OBJECT);
-   ```
-
-3.0.0
------
-
- * Yaml::parse() now throws an exception when a blackslash is not escaped
-   in double-quoted strings
-
-2.8.0
------
-
- * Deprecated usage of a colon in an unquoted mapping value
- * Deprecated usage of @, \`, | and > at the beginning of an unquoted string
- * When surrounding strings with double-quotes, you must now escape `\` characters. Not
-   escaping those characters (when surrounded by double-quotes) is deprecated.
-
-   Before:
-
-   ```yml
-   class: "Foo\Var"
-   ```
-
-   After:
-
-   ```yml
-   class: "Foo\\Var"
-   ```
-
-2.1.0
------
-
- * Yaml::parse() does not evaluate loaded files as PHP files by default
-   anymore (call Yaml::enablePhpParsing() to get back the old behavior)
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Dumper.php b/core/src/core/classes/guzzle/vendor/symfony/yaml/Dumper.php
deleted file mode 100644
index 10ffe82b01..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Dumper.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?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;
-
-    /**
-     * @param int $indentation
-     */
-    public function __construct($indentation = 4)
-    {
-        if ($indentation < 1) {
-            throw new \InvalidArgumentException('The indentation must be greater than zero.');
-        }
-
-        $this->indentation = $indentation;
-    }
-
-    /**
-     * Sets the indentation.
-     *
-     * @param int $num The amount of spaces to use for indentation of nested nodes
-     */
-    public function setIndentation($num)
-    {
-        @trigger_error('The '.__METHOD__.' method is deprecated since version 3.1 and will be removed in 4.0. Pass the indentation to the constructor instead.', E_USER_DEPRECATED);
-
-        $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 int   $flags  A bit field of Yaml::DUMP_* constants to customize the dumped YAML string
-     *
-     * @return string The YAML representation of the PHP value
-     */
-    public function dump($input, $inline = 0, $indent = 0, $flags = 0)
-    {
-        if (is_bool($flags)) {
-            @trigger_error('Passing a boolean flag to toggle exception handling is deprecated since version 3.1 and will be removed in 4.0. Use the Yaml::DUMP_EXCEPTION_ON_INVALID_TYPE flag instead.', E_USER_DEPRECATED);
-
-            if ($flags) {
-                $flags = Yaml::DUMP_EXCEPTION_ON_INVALID_TYPE;
-            } else {
-                $flags = 0;
-            }
-        }
-
-        if (func_num_args() >= 5) {
-            @trigger_error('Passing a boolean flag to toggle object support is deprecated since version 3.1 and will be removed in 4.0. Use the Yaml::DUMP_OBJECT flag instead.', E_USER_DEPRECATED);
-
-            if (func_get_arg(4)) {
-                $flags |= Yaml::DUMP_OBJECT;
-            }
-        }
-
-        $output = '';
-        $prefix = $indent ? str_repeat(' ', $indent) : '';
-
-        if ($inline <= 0 || !is_array($input) || empty($input)) {
-            $output .= $prefix.Inline::dump($input, $flags);
-        } else {
-            $isAHash = Inline::isHash($input);
-
-            foreach ($input as $key => $value) {
-                if ($inline > 1 && Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && is_string($value) && false !== strpos($value, "\n")) {
-                    $output .= sprintf("%s%s%s |\n", $prefix, $isAHash ? Inline::dump($key, $flags).':' : '-', '');
-
-                    foreach (preg_split('/\n|\r\n/', $value) as $row) {
-                        $output .= sprintf("%s%s%s\n", $prefix, str_repeat(' ', $this->indentation), $row);
-                    }
-
-                    continue;
-                }
-
-                $willBeInlined = $inline - 1 <= 0 || !is_array($value) || empty($value);
-
-                $output .= sprintf('%s%s%s%s',
-                    $prefix,
-                    $isAHash ? Inline::dump($key, $flags).':' : '-',
-                    $willBeInlined ? ' ' : "\n",
-                    $this->dump($value, $inline - 1, $willBeInlined ? 0 : $indent + $this->indentation, $flags)
-                ).($willBeInlined ? "\n" : '');
-            }
-        }
-
-        return $output;
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Escaper.php b/core/src/core/classes/guzzle/vendor/symfony/yaml/Escaper.php
deleted file mode 100644
index a74f14dd9c..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Escaper.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?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 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 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/src/core/classes/guzzle/vendor/symfony/yaml/Exception/DumpException.php b/core/src/core/classes/guzzle/vendor/symfony/yaml/Exception/DumpException.php
deleted file mode 100644
index cce972f246..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Exception/DumpException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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/src/core/classes/guzzle/vendor/symfony/yaml/Exception/ExceptionInterface.php b/core/src/core/classes/guzzle/vendor/symfony/yaml/Exception/ExceptionInterface.php
deleted file mode 100644
index ad850eea1d..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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/src/core/classes/guzzle/vendor/symfony/yaml/Exception/ParseException.php b/core/src/core/classes/guzzle/vendor/symfony/yaml/Exception/ParseException.php
deleted file mode 100644
index ba3be7d4fa..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Exception/ParseException.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?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;
-
-    /**
-     * Constructor.
-     *
-     * @param string     $message    The error message
-     * @param int        $parsedLine The line where the error occurred
-     * @param int        $snippet    The snippet of code near the problem
-     * @param string     $parsedFile The file name where the error occurred
-     * @param \Exception $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) {
-            $this->message .= sprintf(' in %s', json_encode($this->parsedFile, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
-        }
-
-        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/src/core/classes/guzzle/vendor/symfony/yaml/Exception/RuntimeException.php b/core/src/core/classes/guzzle/vendor/symfony/yaml/Exception/RuntimeException.php
deleted file mode 100644
index 3f36b73bec..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Exception/RuntimeException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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/src/core/classes/guzzle/vendor/symfony/yaml/Inline.php b/core/src/core/classes/guzzle/vendor/symfony/yaml/Inline.php
deleted file mode 100644
index 95d9a90963..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Inline.php
+++ /dev/null
@@ -1,685 +0,0 @@
-<?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>
- *
- * @internal
- */
-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 array.
-     *
-     * @param string $value      A YAML string
-     * @param int    $flags      A bit field of PARSE_* constants to customize the YAML parser behavior
-     * @param array  $references Mapping of variable names to values
-     *
-     * @return array A PHP array representing the YAML string
-     *
-     * @throws ParseException
-     */
-    public static function parse($value, $flags = 0, $references = array())
-    {
-        if (is_bool($flags)) {
-            @trigger_error('Passing a boolean flag to toggle exception handling is deprecated since version 3.1 and will be removed in 4.0. Use the Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE flag instead.', E_USER_DEPRECATED);
-
-            if ($flags) {
-                $flags = Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE;
-            } else {
-                $flags = 0;
-            }
-        }
-
-        if (func_num_args() >= 3 && !is_array($references)) {
-            @trigger_error('Passing a boolean flag to toggle object support is deprecated since version 3.1 and will be removed in 4.0. Use the Yaml::PARSE_OBJECT flag instead.', E_USER_DEPRECATED);
-
-            if ($references) {
-                $flags |= Yaml::PARSE_OBJECT;
-            }
-
-            if (func_num_args() >= 4) {
-                @trigger_error('Passing a boolean flag to toggle object for map support is deprecated since version 3.1 and will be removed in 4.0. Use the Yaml::PARSE_OBJECT_FOR_MAP flag instead.', E_USER_DEPRECATED);
-
-                if (func_get_arg(3)) {
-                    $flags |= Yaml::PARSE_OBJECT_FOR_MAP;
-                }
-            }
-
-            if (func_num_args() >= 5) {
-                $references = func_get_arg(4);
-            } else {
-                $references = array();
-            }
-        }
-
-        self::$exceptionOnInvalidType = (bool) (Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE & $flags);
-        self::$objectSupport = (bool) (Yaml::PARSE_OBJECT & $flags);
-        self::$objectForMap = (bool) (Yaml::PARSE_OBJECT_FOR_MAP & $flags);
-
-        $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, $flags, $i, $references);
-                ++$i;
-                break;
-            case '{':
-                $result = self::parseMapping($value, $flags, $i, $references);
-                ++$i;
-                break;
-            default:
-                $result = self::parseScalar($value, $flags, 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 int   $flags A bit field of Yaml::DUMP_* constants to customize the dumped YAML string
-     *
-     * @return string The YAML string representing the PHP array
-     *
-     * @throws DumpException When trying to dump PHP resource
-     */
-    public static function dump($value, $flags = 0)
-    {
-        if (is_bool($flags)) {
-            @trigger_error('Passing a boolean flag to toggle exception handling is deprecated since version 3.1 and will be removed in 4.0. Use the Yaml::DUMP_EXCEPTION_ON_INVALID_TYPE flag instead.', E_USER_DEPRECATED);
-
-            if ($flags) {
-                $flags = Yaml::DUMP_EXCEPTION_ON_INVALID_TYPE;
-            } else {
-                $flags = 0;
-            }
-        }
-
-        if (func_num_args() >= 3) {
-            @trigger_error('Passing a boolean flag to toggle object support is deprecated since version 3.1 and will be removed in 4.0. Use the Yaml::DUMP_OBJECT flag instead.', E_USER_DEPRECATED);
-
-            if (func_get_arg(2)) {
-                $flags |= Yaml::DUMP_OBJECT;
-            }
-        }
-
-        switch (true) {
-            case is_resource($value):
-                if (Yaml::DUMP_EXCEPTION_ON_INVALID_TYPE & $flags) {
-                    throw new DumpException(sprintf('Unable to dump PHP resources in a YAML file ("%s").', get_resource_type($value)));
-                }
-
-                return 'null';
-            case $value instanceof \DateTimeInterface:
-                return $value->format('c');
-            case is_object($value):
-                if (Yaml::DUMP_OBJECT & $flags) {
-                    return '!php/object:'.serialize($value);
-                }
-
-                if (Yaml::DUMP_OBJECT_AS_MAP & $flags && ($value instanceof \stdClass || $value instanceof \ArrayObject)) {
-                    return self::dumpArray((array) $value, $flags);
-                }
-
-                if (Yaml::DUMP_EXCEPTION_ON_INVALID_TYPE & $flags) {
-                    throw new DumpException('Object support when dumping a YAML file has been disabled.');
-                }
-
-                return 'null';
-            case is_array($value):
-                return self::dumpArray($value, $flags);
-            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 self::isBinaryString($value):
-                return '!!binary '.base64_encode($value);
-            case Escaper::requiresDoubleQuoting($value):
-                return Escaper::escapeWithDoubleQuotes($value);
-            case Escaper::requiresSingleQuoting($value):
-            case preg_match(self::getHexRegex(), $value):
-            case 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 int   $flags A bit field of Yaml::DUMP_* constants to customize the dumped YAML string
-     *
-     * @return string The YAML string representing the PHP array
-     */
-    private static function dumpArray($value, $flags)
-    {
-        // array
-        if ($value && !self::isHash($value)) {
-            $output = array();
-            foreach ($value as $val) {
-                $output[] = self::dump($val, $flags);
-            }
-
-            return sprintf('[%s]', implode(', ', $output));
-        }
-
-        // hash
-        $output = array();
-        foreach ($value as $key => $val) {
-            $output[] = sprintf('%s: %s', self::dump($key, $flags), self::dump($val, $flags));
-        }
-
-        return sprintf('{ %s }', implode(', ', $output));
-    }
-
-    /**
-     * Parses a scalar to a YAML string.
-     *
-     * @param string $scalar
-     * @param int    $flags
-     * @param string $delimiters
-     * @param array  $stringDelimiters
-     * @param int    &$i
-     * @param bool   $evaluate
-     * @param array  $references
-     *
-     * @return string A YAML string
-     *
-     * @throws ParseException When malformed inline YAML string is parsed
-     *
-     * @internal
-     */
-    public static function parseScalar($scalar, $flags = 0, $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 (!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 (preg_match('/[ \t]+#/', $output, $match, PREG_OFFSET_CAPTURE)) {
-                    $output = substr($output, 0, $match[0][1]);
-                }
-            } elseif (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])) {
-                throw new ParseException(sprintf('The reserved indicator "%s" cannot start a plain scalar; you need to quote the scalar.', $output[0]));
-            }
-
-            if ($output && '%' === $output[0]) {
-                @trigger_error('Not quoting a scalar starting with the "%" indicator character is deprecated since Symfony 3.1 and will throw a ParseException in 4.0.', E_USER_DEPRECATED);
-            }
-
-            if ($evaluate) {
-                $output = self::evaluateScalar($output, $flags, $references);
-            }
-        }
-
-        return $output;
-    }
-
-    /**
-     * Parses a quoted scalar to YAML.
-     *
-     * @param string $scalar
-     * @param int    &$i
-     *
-     * @return string A YAML string
-     *
-     * @throws ParseException When malformed inline YAML string is parsed
-     */
-    private static function parseQuotedScalar($scalar, &$i)
-    {
-        if (!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 sequence to a YAML string.
-     *
-     * @param string $sequence
-     * @param int    $flags
-     * @param int    &$i
-     * @param array  $references
-     *
-     * @return string A YAML string
-     *
-     * @throws ParseException When malformed inline YAML string is parsed
-     */
-    private static function parseSequence($sequence, $flags, &$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, $flags, $i, $references);
-                    break;
-                case '{':
-                    // nested mapping
-                    $output[] = self::parseMapping($sequence, $flags, $i, $references);
-                    break;
-                case ']':
-                    return $output;
-                case ',':
-                case ' ':
-                    break;
-                default:
-                    $isQuoted = in_array($sequence[$i], array('"', "'"));
-                    $value = self::parseScalar($sequence, $flags, array(',', ']'), array('"', "'"), $i, true, $references);
-
-                    // the value can be an array if a reference has been resolved to an array var
-                    if (is_string($value) && !$isQuoted && false !== strpos($value, ': ')) {
-                        // embedded mapping?
-                        try {
-                            $pos = 0;
-                            $value = self::parseMapping('{'.$value.'}', $flags, $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 mapping to a YAML string.
-     *
-     * @param string $mapping
-     * @param int    $flags
-     * @param int    &$i
-     * @param array  $references
-     *
-     * @return string A YAML string
-     *
-     * @throws ParseException When malformed inline YAML string is parsed
-     */
-    private static function parseMapping($mapping, $flags, &$i = 0, $references = array())
-    {
-        $output = array();
-        $len = strlen($mapping);
-        ++$i;
-
-        // {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, $flags, array(':', ' '), array('"', "'"), $i, false);
-
-            // value
-            $done = false;
-
-            while ($i < $len) {
-                switch ($mapping[$i]) {
-                    case '[':
-                        // nested sequence
-                        $value = self::parseSequence($mapping, $flags, $i, $references);
-                        // Spec: Keys MUST be unique; first one wins.
-                        // Parser cannot abort this mapping earlier, since lines
-                        // are processed sequentially.
-                        if (!isset($output[$key])) {
-                            $output[$key] = $value;
-                        }
-                        $done = true;
-                        break;
-                    case '{':
-                        // nested mapping
-                        $value = self::parseMapping($mapping, $flags, $i, $references);
-                        // Spec: Keys MUST be unique; first one wins.
-                        // Parser cannot abort this mapping earlier, since lines
-                        // are processed sequentially.
-                        if (!isset($output[$key])) {
-                            $output[$key] = $value;
-                        }
-                        $done = true;
-                        break;
-                    case ':':
-                    case ' ':
-                        break;
-                    default:
-                        $value = self::parseScalar($mapping, $flags, array(',', '}'), array('"', "'"), $i, true, $references);
-                        // Spec: Keys MUST be unique; first one wins.
-                        // Parser cannot abort this mapping earlier, since lines
-                        // are processed sequentially.
-                        if (!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 int    $flags
-     * @param array  $references
-     *
-     * @return string A 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, $flags, $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), $flags);
-                    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) {
-                            @trigger_error('The !!php/object tag to indicate dumped PHP objects is deprecated since version 3.1 and will be removed in 4.0. Use the !php/object tag instead.', E_USER_DEPRECATED);
-
-                            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 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 0 === strpos($scalar, '!!binary '):
-                        return self::evaluateBinaryScalar(substr($scalar, 9));
-                    case preg_match('/^(-|\+)?[0-9,]+(\.[0-9]+)?$/', $scalar):
-                        return (float) str_replace(',', '', $scalar);
-                    case preg_match(self::getTimestampRegex(), $scalar):
-                        if (Yaml::PARSE_DATETIME & $flags) {
-                            return new \DateTime($scalar, new \DateTimeZone('UTC'));
-                        }
-
-                        $timeZone = date_default_timezone_get();
-                        date_default_timezone_set('UTC');
-                        $time = strtotime($scalar);
-                        date_default_timezone_set($timeZone);
-
-                        return $time;
-                }
-            default:
-                return (string) $scalar;
-        }
-    }
-
-    /**
-     * @param string $scalar
-     *
-     * @return string
-     *
-     * @internal
-     */
-    public static function evaluateBinaryScalar($scalar)
-    {
-        $parsedBinaryData = self::parseScalar(preg_replace('/\s/', '', $scalar));
-
-        if (0 !== (strlen($parsedBinaryData) % 4)) {
-            throw new ParseException(sprintf('The normalized base64 encoded data (data without whitespace characters) length must be a multiple of four (%d bytes given).', strlen($parsedBinaryData)));
-        }
-
-        if (!preg_match('#^[A-Z0-9+/]+={0,2}$#i', $parsedBinaryData)) {
-            throw new ParseException(sprintf('The base64 encoded data (%s) contains invalid characters.', $parsedBinaryData));
-        }
-
-        return base64_decode($parsedBinaryData, true);
-    }
-
-    private static function isBinaryString($value)
-    {
-        return !preg_match('//u', $value) || preg_match('/[^\x09-\x0d\x20-\xff]/', $value);
-    }
-
-    /**
-     * 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/src/core/classes/guzzle/vendor/symfony/yaml/LICENSE b/core/src/core/classes/guzzle/vendor/symfony/yaml/LICENSE
deleted file mode 100644
index 12a74531e4..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2004-2016 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/src/core/classes/guzzle/vendor/symfony/yaml/Parser.php b/core/src/core/classes/guzzle/vendor/symfony/yaml/Parser.php
deleted file mode 100644
index 5cf5a88824..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Parser.php
+++ /dev/null
@@ -1,856 +0,0 @@
-<?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 TAG_PATTERN = '((?P<tag>![\w!.\/:-]+) +)?';
-    const BLOCK_SCALAR_HEADER_PATTERN = '(?P<separator>\||>)(?P<modifiers>\+|\-|\d+|\+\d+|\-\d+|\d+\+|\d+\-)?(?P<comments> +#.*)?';
-
-    private $offset = 0;
-    private $totalNumberOfLines;
-    private $lines = array();
-    private $currentLineNb = -1;
-    private $currentLine = '';
-    private $refs = array();
-    private $skippedLineNumbers = array();
-    private $locallySkippedLineNumbers = array();
-
-    /**
-     * Constructor.
-     *
-     * @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 int    $flags A bit field of PARSE_* constants to customize the YAML parser behavior
-     *
-     * @return mixed A PHP value
-     *
-     * @throws ParseException If the YAML is not valid
-     */
-    public function parse($value, $flags = 0)
-    {
-        if (is_bool($flags)) {
-            @trigger_error('Passing a boolean flag to toggle exception handling is deprecated since version 3.1 and will be removed in 4.0. Use the Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE flag instead.', E_USER_DEPRECATED);
-
-            if ($flags) {
-                $flags = Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE;
-            } else {
-                $flags = 0;
-            }
-        }
-
-        if (func_num_args() >= 3) {
-            @trigger_error('Passing a boolean flag to toggle object support is deprecated since version 3.1 and will be removed in 4.0. Use the Yaml::PARSE_OBJECT flag instead.', E_USER_DEPRECATED);
-
-            if (func_get_arg(2)) {
-                $flags |= Yaml::PARSE_OBJECT;
-            }
-        }
-
-        if (func_num_args() >= 4) {
-            @trigger_error('Passing a boolean flag to toggle object for map support is deprecated since version 3.1 and will be removed in 4.0. Use the Yaml::PARSE_OBJECT_FOR_MAP flag instead.', E_USER_DEPRECATED);
-
-            if (func_get_arg(3)) {
-                $flags |= Yaml::PARSE_OBJECT_FOR_MAP;
-            }
-        }
-
-        if (!preg_match('//u', $value)) {
-            throw new ParseException('The YAML value does not appear to be valid UTF-8.');
-        }
-        $this->currentLineNb = -1;
-        $this->currentLine = '';
-        $value = $this->cleanup($value);
-        $this->lines = explode("\n", $value);
-
-        if (null === $this->totalNumberOfLines) {
-            $this->totalNumberOfLines = count($this->lines);
-        }
-
-        if (2 /* MB_OVERLOAD_STRING */ & (int) ini_get('mbstring.func_overload')) {
-            $mbEncoding = mb_internal_encoding();
-            mb_internal_encoding('UTF-8');
-        }
-
-        $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 (preg_match('#^\-((?P<leadspaces>\s+)(?P<value>.+?))?\s*$#u', $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']) && 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), $flags);
-                } else {
-                    if (isset($values['leadspaces'])
-                        && preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'|[^ \'"\{\[].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $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, $flags);
-                    } else {
-                        $data[] = $this->parseValue($values['value'], $flags, $context);
-                    }
-                }
-                if ($isRef) {
-                    $this->refs[$isRef] = end($data);
-                }
-            } elseif (preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'|[^ \'"\[\{].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $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, $flags, $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) {
-                    $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);
-                        }
-
-                        foreach ($refValue as $key => $value) {
-                            if (!isset($data[$key])) {
-                                $data[$key] = $value;
-                            }
-                        }
-                    } else {
-                        if (isset($values['value']) && $values['value'] !== '') {
-                            $value = $values['value'];
-                        } else {
-                            $value = $this->getNextEmbedBlock();
-                        }
-                        $parsed = $this->parseBlock($this->getRealCurrentLineNb() + 1, $value, $flags);
-
-                        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);
-                                }
-
-                                foreach ($parsedItem as $key => $value) {
-                                    if (!isset($data[$key])) {
-                                        $data[$key] = $value;
-                                    }
-                                }
-                            }
-                        } 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.
-                            foreach ($parsed as $key => $value) {
-                                if (!isset($data[$key])) {
-                                    $data[$key] = $value;
-                                }
-                            }
-                        }
-                    }
-                } elseif (isset($values['value']) && 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'], ' '), '#')) {
-                    // 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(), $flags);
-                        // 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;
-                        }
-                    }
-                } else {
-                    $value = $this->parseValue($values['value'], $flags, $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], $flags, $this->refs);
-                    } catch (ParseException $e) {
-                        $e->setParsedLine($this->getRealCurrentLineNb() + 1);
-                        $e->setSnippet($this->currentLine);
-
-                        throw $e;
-                    }
-
-                    if (is_array($value)) {
-                        $first = reset($value);
-                        if (is_string($first) && 0 === strpos($first, '*')) {
-                            $data = array();
-                            foreach ($value as $alias) {
-                                $data[] = $this->refs[substr($alias, 1)];
-                            }
-                            $value = $data;
-                        }
-                    }
-
-                    if (isset($mbEncoding)) {
-                        mb_internal_encoding($mbEncoding);
-                    }
-
-                    return $value;
-                }
-
-                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 = 'Unable to parse.';
-                }
-
-                throw new ParseException($error, $this->getRealCurrentLineNb() + 1, $this->currentLine);
-            }
-        }
-
-        if (isset($mbEncoding)) {
-            mb_internal_encoding($mbEncoding);
-        }
-
-        if (Yaml::PARSE_OBJECT_FOR_MAP & $flags && !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, $flags)
-    {
-        $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->parse($yaml, $flags);
-    }
-
-    /**
-     * 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->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 int    $flags   A bit field of PARSE_* constants to customize the YAML parser behavior
-     * @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, $flags, $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 (preg_match('/^'.self::TAG_PATTERN.self::BLOCK_SCALAR_HEADER_PATTERN.'$/', $value, $matches)) {
-            $modifiers = isset($matches['modifiers']) ? $matches['modifiers'] : '';
-
-            $data = $this->parseBlockScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), (int) abs($modifiers));
-
-            if (isset($matches['tag']) && '!!binary' === $matches['tag']) {
-                return Inline::evaluateBinaryScalar($data);
-            }
-
-            return $data;
-        }
-
-        try {
-            $parsedValue = Inline::parse($value, $flags, $this->refs);
-
-            if ('mapping' === $context && is_string($parsedValue) && '"' !== $value[0] && "'" !== $value[0] && '[' !== $value[0] && '{' !== $value[0] && '!' !== $value[0] && false !== strpos($parsedValue, ': ')) {
-                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 (preg_match('/^ +/', $this->currentLine, $matches)) {
-                $indentation = strlen($matches[0]);
-            }
-        }
-
-        if ($indentation > 0) {
-            $pattern = sprintf('/^ {%d}(.*)$/', $indentation);
-
-            while (
-                $notEOF && (
-                    $isCurrentLineBlank ||
-                    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; $i < count($blockLines); ++$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 = false;
-        if ($this->getCurrentLineIndentation() > $currentIndentation) {
-            $ret = true;
-        }
-
-        $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 ($count == 1) {
-            // 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 ($count == 1) {
-            // 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 = false;
-        if (
-            $this->getCurrentLineIndentation() == $currentIndentation
-            &&
-            $this->isStringUnIndentedCollectionItem()
-        ) {
-            $ret = true;
-        }
-
-        $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) preg_match('~'.self::BLOCK_SCALAR_HEADER_PATTERN.'$~', $this->currentLine);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/README.md b/core/src/core/classes/guzzle/vendor/symfony/yaml/README.md
deleted file mode 100644
index 0d324881ce..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-Yaml Component
-==============
-
-The Yaml component loads and dumps YAML files.
-
-Resources
----------
-
-  * [Documentation](https://symfony.com/doc/current/components/yaml/index.html)
-  * [Contributing](https://symfony.com/doc/current/contributing/index.html)
-  * [Report issues](https://github.com/symfony/symfony/issues) and
-    [send Pull Requests](https://github.com/symfony/symfony/pulls)
-    in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/DumperTest.php b/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/DumperTest.php
deleted file mode 100644
index afc4912095..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/DumperTest.php
+++ /dev/null
@@ -1,370 +0,0 @@
-<?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\Tests;
-
-use Symfony\Component\Yaml\Parser;
-use Symfony\Component\Yaml\Dumper;
-use Symfony\Component\Yaml\Yaml;
-
-class DumperTest extends \PHPUnit_Framework_TestCase
-{
-    protected $parser;
-    protected $dumper;
-    protected $path;
-
-    protected $array = array(
-        '' => 'bar',
-        'foo' => '#bar',
-        'foo\'bar' => array(),
-        'bar' => array(1, 'foo'),
-        'foobar' => array(
-            'foo' => 'bar',
-            'bar' => array(1, 'foo'),
-            'foobar' => array(
-                'foo' => 'bar',
-                'bar' => array(1, 'foo'),
-            ),
-        ),
-    );
-
-    protected function setUp()
-    {
-        $this->parser = new Parser();
-        $this->dumper = new Dumper();
-        $this->path = __DIR__.'/Fixtures';
-    }
-
-    protected function tearDown()
-    {
-        $this->parser = null;
-        $this->dumper = null;
-        $this->path = null;
-        $this->array = null;
-    }
-
-    public function testIndentationInConstructor()
-    {
-        $dumper = new Dumper(7);
-        $expected = <<<'EOF'
-'': bar
-foo: '#bar'
-'foo''bar': {  }
-bar:
-       - 1
-       - foo
-foobar:
-       foo: bar
-       bar:
-              - 1
-              - foo
-       foobar:
-              foo: bar
-              bar:
-                     - 1
-                     - foo
-
-EOF;
-        $this->assertEquals($expected, $dumper->dump($this->array, 4, 0));
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testSetIndentation()
-    {
-        $this->dumper->setIndentation(7);
-
-        $expected = <<<'EOF'
-'': bar
-foo: '#bar'
-'foo''bar': {  }
-bar:
-       - 1
-       - foo
-foobar:
-       foo: bar
-       bar:
-              - 1
-              - foo
-       foobar:
-              foo: bar
-              bar:
-                     - 1
-                     - foo
-
-EOF;
-        $this->assertEquals($expected, $this->dumper->dump($this->array, 4, 0));
-    }
-
-    public function testSpecifications()
-    {
-        $files = $this->parser->parse(file_get_contents($this->path.'/index.yml'));
-        foreach ($files as $file) {
-            $yamls = file_get_contents($this->path.'/'.$file.'.yml');
-
-            // split YAMLs documents
-            foreach (preg_split('/^---( %YAML\:1\.0)?/m', $yamls) as $yaml) {
-                if (!$yaml) {
-                    continue;
-                }
-
-                $test = $this->parser->parse($yaml);
-                if (isset($test['dump_skip']) && $test['dump_skip']) {
-                    continue;
-                } elseif (isset($test['todo']) && $test['todo']) {
-                    // TODO
-                } else {
-                    eval('$expected = '.trim($test['php']).';');
-                    $this->assertSame($expected, $this->parser->parse($this->dumper->dump($expected, 10)), $test['test']);
-                }
-            }
-        }
-    }
-
-    public function testInlineLevel()
-    {
-        $expected = <<<'EOF'
-{ '': bar, foo: '#bar', 'foo''bar': {  }, bar: [1, foo], foobar: { foo: bar, bar: [1, foo], foobar: { foo: bar, bar: [1, foo] } } }
-EOF;
-        $this->assertEquals($expected, $this->dumper->dump($this->array, -10), '->dump() takes an inline level argument');
-        $this->assertEquals($expected, $this->dumper->dump($this->array, 0), '->dump() takes an inline level argument');
-
-        $expected = <<<'EOF'
-'': bar
-foo: '#bar'
-'foo''bar': {  }
-bar: [1, foo]
-foobar: { foo: bar, bar: [1, foo], foobar: { foo: bar, bar: [1, foo] } }
-
-EOF;
-        $this->assertEquals($expected, $this->dumper->dump($this->array, 1), '->dump() takes an inline level argument');
-
-        $expected = <<<'EOF'
-'': bar
-foo: '#bar'
-'foo''bar': {  }
-bar:
-    - 1
-    - foo
-foobar:
-    foo: bar
-    bar: [1, foo]
-    foobar: { foo: bar, bar: [1, foo] }
-
-EOF;
-        $this->assertEquals($expected, $this->dumper->dump($this->array, 2), '->dump() takes an inline level argument');
-
-        $expected = <<<'EOF'
-'': bar
-foo: '#bar'
-'foo''bar': {  }
-bar:
-    - 1
-    - foo
-foobar:
-    foo: bar
-    bar:
-        - 1
-        - foo
-    foobar:
-        foo: bar
-        bar: [1, foo]
-
-EOF;
-        $this->assertEquals($expected, $this->dumper->dump($this->array, 3), '->dump() takes an inline level argument');
-
-        $expected = <<<'EOF'
-'': bar
-foo: '#bar'
-'foo''bar': {  }
-bar:
-    - 1
-    - foo
-foobar:
-    foo: bar
-    bar:
-        - 1
-        - foo
-    foobar:
-        foo: bar
-        bar:
-            - 1
-            - foo
-
-EOF;
-        $this->assertEquals($expected, $this->dumper->dump($this->array, 4), '->dump() takes an inline level argument');
-        $this->assertEquals($expected, $this->dumper->dump($this->array, 10), '->dump() takes an inline level argument');
-    }
-
-    public function testObjectSupportEnabled()
-    {
-        $dump = $this->dumper->dump(array('foo' => new A(), 'bar' => 1), 0, 0, Yaml::DUMP_OBJECT);
-
-        $this->assertEquals('{ foo: !php/object:O:30:"Symfony\Component\Yaml\Tests\A":1:{s:1:"a";s:3:"foo";}, bar: 1 }', $dump, '->dump() is able to dump objects');
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testObjectSupportEnabledPassingTrue()
-    {
-        $dump = $this->dumper->dump(array('foo' => new A(), 'bar' => 1), 0, 0, false, true);
-
-        $this->assertEquals('{ foo: !php/object:O:30:"Symfony\Component\Yaml\Tests\A":1:{s:1:"a";s:3:"foo";}, bar: 1 }', $dump, '->dump() is able to dump objects');
-    }
-
-    public function testObjectSupportDisabledButNoExceptions()
-    {
-        $dump = $this->dumper->dump(array('foo' => new A(), 'bar' => 1));
-
-        $this->assertEquals('{ foo: null, bar: 1 }', $dump, '->dump() does not dump objects when disabled');
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\DumpException
-     */
-    public function testObjectSupportDisabledWithExceptions()
-    {
-        $this->dumper->dump(array('foo' => new A(), 'bar' => 1), 0, 0, Yaml::DUMP_EXCEPTION_ON_INVALID_TYPE);
-    }
-
-    /**
-     * @group legacy
-     * @expectedException \Symfony\Component\Yaml\Exception\DumpException
-     */
-    public function testObjectSupportDisabledWithExceptionsPassingTrue()
-    {
-        $this->dumper->dump(array('foo' => new A(), 'bar' => 1), 0, 0, true);
-    }
-
-    /**
-     * @dataProvider getEscapeSequences
-     */
-    public function testEscapedEscapeSequencesInQuotedScalar($input, $expected)
-    {
-        $this->assertEquals($expected, $this->dumper->dump($input));
-    }
-
-    public function getEscapeSequences()
-    {
-        return array(
-            'null' => array("\t\\0", '"\t\\\\0"'),
-            'bell' => array("\t\\a", '"\t\\\\a"'),
-            'backspace' => array("\t\\b", '"\t\\\\b"'),
-            'horizontal-tab' => array("\t\\t", '"\t\\\\t"'),
-            'line-feed' => array("\t\\n", '"\t\\\\n"'),
-            'vertical-tab' => array("\t\\v", '"\t\\\\v"'),
-            'form-feed' => array("\t\\f", '"\t\\\\f"'),
-            'carriage-return' => array("\t\\r", '"\t\\\\r"'),
-            'escape' => array("\t\\e", '"\t\\\\e"'),
-            'space' => array("\t\\ ", '"\t\\\\ "'),
-            'double-quote' => array("\t\\\"", '"\t\\\\\\""'),
-            'slash' => array("\t\\/", '"\t\\\\/"'),
-            'backslash' => array("\t\\\\", '"\t\\\\\\\\"'),
-            'next-line' => array("\t\\N", '"\t\\\\N"'),
-            'non-breaking-space' => array("\t\\�", '"\t\\\\�"'),
-            'line-separator' => array("\t\\L", '"\t\\\\L"'),
-            'paragraph-separator' => array("\t\\P", '"\t\\\\P"'),
-        );
-    }
-
-    public function testBinaryDataIsDumpedBase64Encoded()
-    {
-        $binaryData = file_get_contents(__DIR__.'/Fixtures/arrow.gif');
-        $expected = '{ data: !!binary '.base64_encode($binaryData).' }';
-
-        $this->assertSame($expected, $this->dumper->dump(array('data' => $binaryData)));
-    }
-
-    public function testNonUtf8DataIsDumpedBase64Encoded()
-    {
-        // "für" (ISO-8859-1 encoded)
-        $this->assertSame('!!binary ZsM/cg==', $this->dumper->dump("f\xc3\x3fr"));
-    }
-
-    /**
-     * @dataProvider objectAsMapProvider
-     */
-    public function testDumpObjectAsMap($object, $expected)
-    {
-        $yaml = $this->dumper->dump($object, 0, 0, Yaml::DUMP_OBJECT_AS_MAP);
-
-        $this->assertEquals($expected, Yaml::parse($yaml, Yaml::PARSE_OBJECT_FOR_MAP));
-    }
-
-    public function objectAsMapProvider()
-    {
-        $tests = array();
-
-        $bar = new \stdClass();
-        $bar->class = 'classBar';
-        $bar->args = array('bar');
-        $zar = new \stdClass();
-        $foo = new \stdClass();
-        $foo->bar = $bar;
-        $foo->zar = $zar;
-        $object = new \stdClass();
-        $object->foo = $foo;
-        $tests['stdClass'] = array($object, $object);
-
-        $arrayObject = new \ArrayObject();
-        $arrayObject['foo'] = 'bar';
-        $arrayObject['baz'] = 'foobar';
-        $parsedArrayObject = new \stdClass();
-        $parsedArrayObject->foo = 'bar';
-        $parsedArrayObject->baz = 'foobar';
-        $tests['ArrayObject'] = array($arrayObject, $parsedArrayObject);
-
-        $a = new A();
-        $tests['arbitrary-object'] = array($a, null);
-
-        return $tests;
-    }
-
-    public function testDumpMultiLineStringAsScalarBlock()
-    {
-        $data = array(
-            'data' => array(
-                'single_line' => 'foo bar baz',
-                'multi_line' => "foo\nline with trailing spaces:\n  \nbar\r\ninteger like line:\n123456789\nempty line:\n\nbaz",
-                'nested_inlined_multi_line_string' => array(
-                    'inlined_multi_line' => "foo\nbar\r\nempty line:\n\nbaz",
-                ),
-            ),
-        );
-
-        $this->assertSame(file_get_contents(__DIR__.'/Fixtures/multiple_lines_as_literal_block.yml'), $this->dumper->dump($data, 3, 0, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK));
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage The indentation must be greater than zero
-     */
-    public function testZeroIndentationThrowsException()
-    {
-        new Dumper(0);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage The indentation must be greater than zero
-     */
-    public function testNegativeIndentationThrowsException()
-    {
-        new Dumper(-4);
-    }
-}
-
-class A
-{
-    public $a = 'foo';
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsAnchorAlias.yml b/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsAnchorAlias.yml
deleted file mode 100644
index 5f9c94275b..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsAnchorAlias.yml
+++ /dev/null
@@ -1,31 +0,0 @@
---- %YAML:1.0
-test: Simple Alias Example
-brief: >
-    If you need to refer to the same item of data twice,
-    you can give that item an alias.  The alias is a plain
-    string, starting with an ampersand.  The item may then
-    be referred to by the alias throughout your document
-    by using an asterisk before the name of the alias.
-    This is called an anchor.
-yaml: |
-    - &showell Steve
-    - Clark
-    - Brian
-    - Oren
-    - *showell
-php: |
-    array('Steve', 'Clark', 'Brian', 'Oren', 'Steve')
-
----
-test: Alias of a Mapping
-brief: >
-    An alias can be used on any item of data, including
-    sequences, mappings, and other complex data types.
-yaml: |
-    - &hello
-        Meat: pork
-        Starch: potato
-    - banana
-    - *hello
-php: |
-    array(array('Meat'=>'pork', 'Starch'=>'potato'), 'banana', array('Meat'=>'pork', 'Starch'=>'potato'))
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsBasicTests.yml b/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsBasicTests.yml
deleted file mode 100644
index dfd93021d1..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsBasicTests.yml
+++ /dev/null
@@ -1,202 +0,0 @@
---- %YAML:1.0
-test: Simple Sequence
-brief: |
-    You can specify a list in YAML by placing each
-    member of the list on a new line with an opening
-    dash. These lists are called sequences.
-yaml: |
-    - apple
-    - banana
-    - carrot
-php: |
-    array('apple', 'banana', 'carrot')
----
-test: Sequence With Item Being Null In The Middle
-brief: |
-    You can specify a list in YAML by placing each
-    member of the list on a new line with an opening
-    dash. These lists are called sequences.
-yaml: |
-    - apple
-    -
-    - carrot
-php: |
-    array('apple', null, 'carrot')
----
-test: Sequence With Last Item Being Null
-brief: |
-    You can specify a list in YAML by placing each
-    member of the list on a new line with an opening
-    dash. These lists are called sequences.
-yaml: |
-    - apple
-    - banana
-    -
-php: |
-    array('apple', 'banana', null)
----
-test: Nested Sequences
-brief: |
-    You can include a sequence within another
-    sequence by giving the sequence an empty
-    dash, followed by an indented list.
-yaml: |
-    -
-     - foo
-     - bar
-     - baz
-php: |
-    array(array('foo', 'bar', 'baz'))
----
-test: Mixed Sequences
-brief: |
-    Sequences can contain any YAML data,
-    including strings and other sequences.
-yaml: |
-    - apple
-    -
-     - foo
-     - bar
-     - x123
-    - banana
-    - carrot
-php: |
-    array('apple', array('foo', 'bar', 'x123'), 'banana', 'carrot')
----
-test: Deeply Nested Sequences
-brief: |
-    Sequences can be nested even deeper, with each
-    level of indentation representing a level of
-    depth.
-yaml: |
-    -
-     -
-      - uno
-      - dos
-php: |
-    array(array(array('uno', 'dos')))
----
-test: Simple Mapping
-brief: |
-    You can add a keyed list (also known as a dictionary or
-    hash) to your document by placing each member of the
-    list on a new line, with a colon separating the key
-    from its value.  In YAML, this type of list is called
-    a mapping.
-yaml: |
-    foo: whatever
-    bar: stuff
-php: |
-    array('foo' => 'whatever', 'bar' => 'stuff')
----
-test: Sequence in a Mapping
-brief: |
-    A value in a mapping can be a sequence.
-yaml: |
-    foo: whatever
-    bar:
-     - uno
-     - dos
-php: |
-    array('foo' => 'whatever', 'bar' => array('uno', 'dos'))
----
-test: Nested Mappings
-brief: |
-    A value in a mapping can be another mapping.
-yaml: |
-    foo: whatever
-    bar:
-     fruit: apple
-     name: steve
-     sport: baseball
-php: |
-    array(
-      'foo' => 'whatever',
-      'bar' => array(
-         'fruit' => 'apple',
-         'name' => 'steve',
-         'sport' => 'baseball'
-       )
-    )
----
-test: Mixed Mapping
-brief: |
-    A mapping can contain any assortment
-    of mappings and sequences as values.
-yaml: |
-    foo: whatever
-    bar:
-     -
-       fruit: apple
-       name: steve
-       sport: baseball
-     - more
-     -
-       python: rocks
-       perl: papers
-       ruby: scissorses
-php: |
-    array(
-      'foo' => 'whatever',
-      'bar' => array(
-        array(
-            'fruit' => 'apple',
-            'name' => 'steve',
-            'sport' => 'baseball'
-        ),
-        'more',
-        array(
-            'python' => 'rocks',
-            'perl' => 'papers',
-            'ruby' => 'scissorses'
-        )
-      )
-    )
----
-test: Mapping-in-Sequence Shortcut
-todo: true
-brief: |
-     If you are adding a mapping to a sequence, you
-     can place the mapping on the same line as the
-     dash as a shortcut.
-yaml: |
-     - work on YAML.py:
-        - work on Store
-php: |
-    array(array('work on YAML.py' => array('work on Store')))
----
-test: Sequence-in-Mapping Shortcut
-todo: true
-brief: |
-     The dash in a sequence counts as indentation, so
-     you can add a sequence inside of a mapping without
-     needing spaces as indentation.
-yaml: |
-     allow:
-     - 'localhost'
-     - '%.sourceforge.net'
-     - '%.freepan.org'
-php: |
-     array('allow' => array('localhost', '%.sourceforge.net', '%.freepan.org'))
----
-todo: true
-test: Merge key
-brief: |
-     A merge key ('<<') can be used in a mapping to insert other mappings.  If
-     the value associated with the merge key is a mapping, each of its key/value
-     pairs is inserted into the current mapping.
-yaml: |
-     mapping:
-       name: Joe
-       job: Accountant
-       <<:
-         age: 38
-php: |
-     array(
-       'mapping' =>
-       array(
-         'name' => 'Joe',
-         'job' => 'Accountant',
-         'age' => 38
-       )
-     )
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsBlockMapping.yml b/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsBlockMapping.yml
deleted file mode 100644
index f7ca469b40..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsBlockMapping.yml
+++ /dev/null
@@ -1,51 +0,0 @@
----
-test: One Element Mapping
-brief: |
-    A mapping with one key/value pair
-yaml: |
-    foo: bar
-php: |
-    array('foo' => 'bar')
----
-test: Multi Element Mapping
-brief: |
-    More than one key/value pair
-yaml: |
-    red: baron
-    white: walls
-    blue: berries
-php: |
-    array(
-     'red' => 'baron',
-     'white' => 'walls',
-     'blue' => 'berries',
-    )
----
-test: Values aligned
-brief: |
-    Often times human editors of documents will align the values even
-    though YAML emitters generally don't.
-yaml: |
-    red:   baron
-    white: walls
-    blue:  berries
-php: |
-    array(
-     'red' => 'baron',
-     'white' => 'walls',
-     'blue' => 'berries',
-    )
----
-test: Colons aligned
-brief: |
-    Spaces can come before the ': ' key/value separator.
-yaml: |
-    red   : baron
-    white : walls
-    blue  : berries
-php: |
-    array(
-     'red' => 'baron',
-     'white' => 'walls',
-     'blue' => 'berries',
-    )
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsDocumentSeparator.yml b/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsDocumentSeparator.yml
deleted file mode 100644
index d98810256e..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsDocumentSeparator.yml
+++ /dev/null
@@ -1,85 +0,0 @@
---- %YAML:1.0
-test: Trailing Document Separator
-todo: true
-brief: >
-    You can separate YAML documents
-    with a string of three dashes.
-yaml: |
-    - foo: 1
-      bar: 2
-    ---
-    more: stuff
-python: |
-    [
-        [ { 'foo': 1, 'bar': 2 } ],
-        { 'more': 'stuff' }
-    ]
-ruby: |
-    [ { 'foo' => 1, 'bar' => 2 } ]
-
----
-test: Leading Document Separator
-todo: true
-brief: >
-    You can explicitly give an opening
-    document separator to your YAML stream.
-yaml: |
-    ---
-    - foo: 1
-      bar: 2
-    ---
-    more: stuff
-python: |
-    [
-        [ {'foo': 1, 'bar': 2}],
-        {'more': 'stuff'}
-    ]
-ruby: |
-    [ { 'foo' => 1, 'bar' => 2 } ]
-
----
-test: YAML Header
-todo: true
-brief: >
-    The opening separator can contain directives
-    to the YAML parser, such as the version
-    number.
-yaml: |
-    --- %YAML:1.0
-    foo: 1
-    bar: 2
-php: |
-    array('foo' => 1, 'bar' => 2)
-documents: 1
-
----
-test: Red Herring Document Separator
-brief: >
-    Separators included in blocks or strings
-    are treated as blocks or strings, as the
-    document separator should have no indentation
-    preceding it.
-yaml: |
-    foo: |
-        ---
-php: |
-    array('foo' => "---\n")
-
----
-test: Multiple Document Separators in Block
-brief: >
-    This technique allows you to embed other YAML
-    documents within literal blocks.
-yaml: |
-    foo: |
-        ---
-        foo: bar
-        ---
-        yo: baz
-    bar: |
-        fooness
-php: |
-    array(
-       'foo' => "---\nfoo: bar\n---\nyo: baz\n",
-       'bar' => "fooness\n"
-    )
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsErrorTests.yml b/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsErrorTests.yml
deleted file mode 100644
index e8506fcb66..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsErrorTests.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-test: Missing value for hash item
-todo: true
-brief: |
-    Third item in this hash doesn't have a value
-yaml: |
-    okay: value
-    also okay: ~
-    causes error because no value specified
-    last key: value okay here too
-python-error: causes error because no value specified
-
----
-test: Not indenting enough
-brief: |
-    There was a bug in PyYaml where it was off by one
-    in the indentation check.  It was allowing the YAML
-    below.
-# This is actually valid YAML now. Someone should tell showell.
-yaml: |
-    foo:
-    firstline: 1
-    secondline: 2
-php: |
-  array('foo' => null, 'firstline' => 1, 'secondline' => 2)
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsFlowCollections.yml b/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsFlowCollections.yml
deleted file mode 100644
index 03090e4abc..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsFlowCollections.yml
+++ /dev/null
@@ -1,60 +0,0 @@
----
-test: Simple Inline Array
-brief: >
-    Sequences can be contained on a
-    single line, using the inline syntax.
-    Separate each entry with commas and
-    enclose in square brackets.
-yaml: |
-    seq: [ a, b, c ]
-php: |
-    array('seq' => array('a', 'b', 'c'))
----
-test: Simple Inline Hash
-brief: >
-    Mapping can also be contained on
-    a single line, using the inline
-    syntax.  Each key-value pair is
-    separated by a colon, with a comma
-    between each entry in the mapping.
-    Enclose with curly braces.
-yaml: |
-    hash: { name: Steve, foo: bar }
-php: |
-    array('hash' => array('name' => 'Steve', 'foo' => 'bar'))
----
-test: Multi-line Inline Collections
-todo: true
-brief: >
-    Both inline sequences and inline mappings
-    can span multiple lines, provided that you
-    indent the additional lines.
-yaml: |
-    languages: [ Ruby,
-                 Perl,
-                 Python ]
-    websites: { YAML: yaml.org,
-                Ruby: ruby-lang.org,
-                Python: python.org,
-                Perl: use.perl.org }
-php: |
-    array(
-      'languages' => array('Ruby', 'Perl', 'Python'),
-      'websites' => array(
-        'YAML' => 'yaml.org',
-        'Ruby' => 'ruby-lang.org',
-        'Python' => 'python.org',
-        'Perl' => 'use.perl.org'
-      )
-    )
----
-test: Commas in Values (not in the spec!)
-todo: true
-brief: >
-    List items in collections are delimited by commas, but
-    there must be a space after each comma.  This allows you
-    to add numbers without quoting.
-yaml: |
-    attendances: [ 45,123, 70,000, 17,222 ]
-php: |
-    array('attendances' => array(45123, 70000, 17222))
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsFoldedScalars.yml b/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsFoldedScalars.yml
deleted file mode 100644
index a14735a55a..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsFoldedScalars.yml
+++ /dev/null
@@ -1,176 +0,0 @@
---- %YAML:1.0
-test: Single ending newline
-brief: >
-    A pipe character, followed by an indented
-    block of text is treated as a literal
-    block, in which newlines are preserved
-    throughout the block, including the final
-    newline.
-yaml: |
-    ---
-    this: |
-        Foo
-        Bar
-php: |
-    array('this' => "Foo\nBar\n")
----
-test: The '+' indicator
-brief: >
-    The '+' indicator says to keep newlines at the end of text
-    blocks.
-yaml: |
-    normal: |
-      extra new lines not kept
-
-    preserving: |+
-      extra new lines are kept
-
-
-    dummy: value
-php: |
-    array(
-        'normal' => "extra new lines not kept\n",
-        'preserving' => "extra new lines are kept\n\n\n",
-        'dummy' => 'value'
-    )
----
-test: Three trailing newlines in literals
-brief: >
-    To give you more control over how space
-    is preserved in text blocks, YAML has
-    the keep '+' and chomp '-' indicators.
-    The keep indicator will preserve all
-    ending newlines, while the chomp indicator
-    will strip all ending newlines.
-yaml: |
-    clipped: |
-        This has one newline.
-
-
-
-    same as "clipped" above: "This has one newline.\n"
-
-    stripped: |-
-        This has no newline.
-
-
-
-    same as "stripped" above: "This has no newline."
-
-    kept: |+
-        This has four newlines.
-
-
-
-    same as "kept" above: "This has four newlines.\n\n\n\n"
-php: |
-    array(
-      'clipped' => "This has one newline.\n",
-      'same as "clipped" above' => "This has one newline.\n",
-      'stripped' => 'This has no newline.',
-      'same as "stripped" above' => 'This has no newline.',
-      'kept' => "This has four newlines.\n\n\n\n",
-      'same as "kept" above' => "This has four newlines.\n\n\n\n"
-    )
----
-test: Extra trailing newlines with spaces
-todo: true
-brief: >
-    Normally, only a single newline is kept
-    from the end of a literal block, unless the
-    keep '+' character is used in combination
-    with the pipe.  The following example
-    will preserve all ending whitespace
-    since the last line of both literal blocks
-    contains spaces which extend past the indentation
-    level.
-yaml: |
-    ---
-    this: |
-        Foo
-
-
-    kept: |+
-        Foo
-
-
-php: |
-    array('this' => "Foo\n\n  \n",
-      'kept' => "Foo\n\n  \n" )
-
----
-test: Folded Block in a Sequence
-brief: >
-    A greater-then character, followed by an indented
-    block of text is treated as a folded block, in
-    which lines of text separated by a single newline
-    are concatenated as a single line.
-yaml: |
-    ---
-    - apple
-    - banana
-    - >
-        can't you see
-        the beauty of yaml?
-        hmm
-    - dog
-php: |
-    array(
-        'apple',
-        'banana',
-        "can't you see the beauty of yaml? hmm\n",
-        'dog'
-    )
----
-test: Folded Block as a Mapping Value
-brief: >
-    Both literal and folded blocks can be
-    used in collections, as values in a
-    sequence or a mapping.
-yaml: |
-    ---
-    quote: >
-        Mark McGwire's
-        year was crippled
-        by a knee injury.
-    source: espn
-php: |
-    array(
-        'quote' => "Mark McGwire's year was crippled by a knee injury.\n",
-        'source' => 'espn'
-    )
----
-test: Three trailing newlines in folded blocks
-brief: >
-    The keep and chomp indicators can also
-    be applied to folded blocks.
-yaml: |
-    clipped: >
-        This has one newline.
-
-
-
-    same as "clipped" above: "This has one newline.\n"
-
-    stripped: >-
-        This has no newline.
-
-
-
-    same as "stripped" above: "This has no newline."
-
-    kept: >+
-        This has four newlines.
-
-
-
-    same as "kept" above: "This has four newlines.\n\n\n\n"
-php: |
-    array(
-      'clipped' => "This has one newline.\n",
-      'same as "clipped" above' => "This has one newline.\n",
-      'stripped' => 'This has no newline.',
-      'same as "stripped" above' => 'This has no newline.',
-      'kept' => "This has four newlines.\n\n\n\n",
-      'same as "kept" above' => "This has four newlines.\n\n\n\n"
-    )
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsNullsAndEmpties.yml b/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsNullsAndEmpties.yml
deleted file mode 100644
index 9a5300f2ef..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsNullsAndEmpties.yml
+++ /dev/null
@@ -1,45 +0,0 @@
---- %YAML:1.0
-test: Empty Sequence
-brief: >
-    You can represent the empty sequence
-    with an empty inline sequence.
-yaml: |
-    empty: []
-php: |
-    array('empty' => array())
----
-test: Empty Mapping
-brief: >
-    You can represent the empty mapping
-    with an empty inline mapping.
-yaml: |
-    empty: {}
-php: |
-    array('empty' => array())
----
-test: Empty Sequence as Entire Document
-yaml: |
-    []
-php: |
-    array()
----
-test: Empty Mapping as Entire Document
-yaml: |
-    {}
-php: |
-    array()
----
-test: Null as Document
-yaml: |
-    ~
-php: |
-    null
----
-test: Empty String
-brief: >
-    You can represent an empty string
-    with a pair of quotes.
-yaml: |
-    ''
-php: |
-    ''
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsSpecificationExamples.yml b/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsSpecificationExamples.yml
deleted file mode 100644
index ec1c4c3a1a..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsSpecificationExamples.yml
+++ /dev/null
@@ -1,1697 +0,0 @@
---- %YAML:1.0
-test: Sequence of scalars
-spec: 2.1
-yaml: |
-  - Mark McGwire
-  - Sammy Sosa
-  - Ken Griffey
-php: |
-  array('Mark McGwire', 'Sammy Sosa', 'Ken Griffey')
----
-test: Mapping of scalars to scalars
-spec: 2.2
-yaml: |
-  hr:  65
-  avg: 0.278
-  rbi: 147
-php: |
-  array('hr' => 65, 'avg' => 0.278, 'rbi' => 147)
----
-test: Mapping of scalars to sequences
-spec: 2.3
-yaml: |
-    american:
-       - Boston Red Sox
-       - Detroit Tigers
-       - New York Yankees
-    national:
-       - New York Mets
-       - Chicago Cubs
-       - Atlanta Braves
-php: |
-    array('american' =>
-        array( 'Boston Red Sox', 'Detroit Tigers',
-          'New York Yankees' ),
-      'national' =>
-        array( 'New York Mets', 'Chicago Cubs',
-          'Atlanta Braves' )
-    )
----
-test: Sequence of mappings
-spec: 2.4
-yaml: |
-    -
-      name: Mark McGwire
-      hr:   65
-      avg:  0.278
-    -
-      name: Sammy Sosa
-      hr:   63
-      avg:  0.288
-php: |
-    array(
-      array('name' => 'Mark McGwire', 'hr' => 65, 'avg' => 0.278),
-      array('name' => 'Sammy Sosa', 'hr' => 63, 'avg' => 0.288)
-    )
----
-test: Legacy A5
-todo: true
-spec: legacy_A5
-yaml: |
-    ?
-        - New York Yankees
-        - Atlanta Braves
-    :
-      - 2001-07-02
-      - 2001-08-12
-      - 2001-08-14
-    ?
-        - Detroit Tigers
-        - Chicago Cubs
-    :
-      - 2001-07-23
-perl-busted: >
-    YAML.pm will be able to emulate this behavior soon. In this regard
-    it may be somewhat more correct than Python's native behaviour which
-    can only use tuples as mapping keys. PyYAML will also need to figure
-    out some clever way to roundtrip structured keys.
-python: |
-    [
-    {
-        ('New York Yankees', 'Atlanta Braves'):
-            [yaml.timestamp('2001-07-02'),
-             yaml.timestamp('2001-08-12'),
-             yaml.timestamp('2001-08-14')],
-        ('Detroit Tigers', 'Chicago Cubs'):
-        [yaml.timestamp('2001-07-23')]
-    }
-    ]
-ruby: |
-    {
-      [ 'New York Yankees', 'Atlanta Braves' ] =>
-        [ Date.new( 2001, 7, 2 ), Date.new( 2001, 8, 12 ), Date.new( 2001, 8, 14 ) ],
-      [ 'Detroit Tigers', 'Chicago Cubs' ] =>
-        [ Date.new( 2001, 7, 23 ) ]
-    }
-syck: |
-  struct test_node seq1[] = {
-      { T_STR, 0, "New York Yankees" },
-      { T_STR, 0, "Atlanta Braves" },
-      end_node
-  };
-  struct test_node seq2[] = {
-      { T_STR, 0, "2001-07-02" },
-      { T_STR, 0, "2001-08-12" },
-      { T_STR, 0, "2001-08-14" },
-      end_node
-  };
-  struct test_node seq3[] = {
-      { T_STR, 0, "Detroit Tigers" },
-      { T_STR, 0, "Chicago Cubs" },
-      end_node
-  };
-  struct test_node seq4[] = {
-      { T_STR, 0, "2001-07-23" },
-      end_node
-  };
-  struct test_node map[] = {
-      { T_SEQ, 0, 0, seq1 },
-      { T_SEQ, 0, 0, seq2 },
-      { T_SEQ, 0, 0, seq3 },
-      { T_SEQ, 0, 0, seq4 },
-      end_node
-  };
-  struct test_node stream[] = {
-      { T_MAP, 0, 0, map },
-      end_node
-  };
-
----
-test: Sequence of sequences
-spec: 2.5
-yaml: |
-  - [ name         , hr , avg   ]
-  - [ Mark McGwire , 65 , 0.278 ]
-  - [ Sammy Sosa   , 63 , 0.288 ]
-php: |
-  array(
-    array( 'name', 'hr', 'avg' ),
-    array( 'Mark McGwire', 65, 0.278 ),
-    array( 'Sammy Sosa', 63, 0.288 )
-  )
----
-test: Mapping of mappings
-todo: true
-spec: 2.6
-yaml: |
-  Mark McGwire: {hr: 65, avg: 0.278}
-  Sammy Sosa: {
-      hr: 63,
-      avg: 0.288
-    }
-php: |
-  array(
-    'Mark McGwire' =>
-      array( 'hr' => 65, 'avg' => 0.278 ),
-    'Sammy Sosa' =>
-      array( 'hr' => 63, 'avg' => 0.288 )
-  )
----
-test: Two documents in a stream each with a leading comment
-todo: true
-spec: 2.7
-yaml: |
-  # Ranking of 1998 home runs
-  ---
-  - Mark McGwire
-  - Sammy Sosa
-  - Ken Griffey
-
-  # Team ranking
-  ---
-  - Chicago Cubs
-  - St Louis Cardinals
-ruby: |
-  y = YAML::Stream.new
-  y.add( [ 'Mark McGwire', 'Sammy Sosa', 'Ken Griffey' ] )
-  y.add( [ 'Chicago Cubs', 'St Louis Cardinals' ] )
-documents: 2
-
----
-test: Play by play feed from a game
-todo: true
-spec: 2.8
-yaml: |
-  ---
-  time: 20:03:20
-  player: Sammy Sosa
-  action: strike (miss)
-  ...
-  ---
-  time: 20:03:47
-  player: Sammy Sosa
-  action: grand slam
-  ...
-perl: |
-  [ 'Mark McGwire', 'Sammy Sosa', 'Ken Griffey' ]
-documents: 2
-
----
-test: Single document with two comments
-spec: 2.9
-yaml: |
-  hr: # 1998 hr ranking
-    - Mark McGwire
-    - Sammy Sosa
-  rbi:
-    # 1998 rbi ranking
-    - Sammy Sosa
-    - Ken Griffey
-php: |
-  array(
-    'hr' => array( 'Mark McGwire', 'Sammy Sosa' ),
-    'rbi' => array( 'Sammy Sosa', 'Ken Griffey' )
-  )
----
-test: Node for Sammy Sosa appears twice in this document
-spec: 2.10
-yaml: |
-   ---
-   hr:
-      - Mark McGwire
-      # Following node labeled SS
-      - &SS Sammy Sosa
-   rbi:
-      - *SS # Subsequent occurrence
-      - Ken Griffey
-php: |
-   array(
-      'hr' =>
-         array('Mark McGwire', 'Sammy Sosa'),
-      'rbi' =>
-         array('Sammy Sosa', 'Ken Griffey')
-   )
----
-test: Mapping between sequences
-todo: true
-spec: 2.11
-yaml: |
-   ? # PLAY SCHEDULE
-     - Detroit Tigers
-     - Chicago Cubs
-   :
-     - 2001-07-23
-
-   ? [ New York Yankees,
-       Atlanta Braves ]
-   : [ 2001-07-02, 2001-08-12,
-       2001-08-14 ]
-ruby: |
-   {
-      [ 'Detroit Tigers', 'Chicago Cubs' ] => [ Date.new( 2001, 7, 23 ) ],
-      [ 'New York Yankees', 'Atlanta Braves' ] => [ Date.new( 2001, 7, 2 ), Date.new( 2001, 8, 12 ), Date.new( 2001, 8, 14 ) ]
-   }
-syck: |
-  struct test_node seq1[] = {
-      { T_STR, 0, "New York Yankees" },
-      { T_STR, 0, "Atlanta Braves" },
-      end_node
-  };
-  struct test_node seq2[] = {
-      { T_STR, 0, "2001-07-02" },
-      { T_STR, 0, "2001-08-12" },
-      { T_STR, 0, "2001-08-14" },
-      end_node
-  };
-  struct test_node seq3[] = {
-      { T_STR, 0, "Detroit Tigers" },
-      { T_STR, 0, "Chicago Cubs" },
-      end_node
-  };
-  struct test_node seq4[] = {
-      { T_STR, 0, "2001-07-23" },
-      end_node
-  };
-  struct test_node map[] = {
-      { T_SEQ, 0, 0, seq3 },
-      { T_SEQ, 0, 0, seq4 },
-      { T_SEQ, 0, 0, seq1 },
-      { T_SEQ, 0, 0, seq2 },
-      end_node
-  };
-  struct test_node stream[] = {
-      { T_MAP, 0, 0, map },
-      end_node
-  };
-
----
-test: Sequence key shortcut
-spec: 2.12
-yaml: |
-  ---
-  # products purchased
-  - item    : Super Hoop
-    quantity: 1
-  - item    : Basketball
-    quantity: 4
-  - item    : Big Shoes
-    quantity: 1
-php: |
-  array (
-    array (
-      'item' => 'Super Hoop',
-      'quantity' => 1,
-    ),
-    array (
-      'item' => 'Basketball',
-      'quantity' => 4,
-    ),
-    array (
-      'item' => 'Big Shoes',
-      'quantity' => 1,
-    )
-  )
-perl: |
-  [
-     { item => 'Super Hoop', quantity => 1 },
-     { item => 'Basketball', quantity => 4 },
-     { item => 'Big Shoes',  quantity => 1 }
-  ]
-
-ruby: |
-  [
-     { 'item' => 'Super Hoop', 'quantity' => 1 },
-     { 'item' => 'Basketball', 'quantity' => 4 },
-     { 'item' => 'Big Shoes', 'quantity' => 1 }
-  ]
-python: |
-  [
-       { 'item': 'Super Hoop', 'quantity': 1 },
-       { 'item': 'Basketball', 'quantity': 4 },
-       { 'item': 'Big Shoes',  'quantity': 1 }
-  ]
-syck: |
-  struct test_node map1[] = {
-      { T_STR, 0, "item" },
-          { T_STR, 0, "Super Hoop" },
-      { T_STR, 0, "quantity" },
-          { T_STR, 0, "1" },
-      end_node
-  };
-  struct test_node map2[] = {
-      { T_STR, 0, "item" },
-          { T_STR, 0, "Basketball" },
-      { T_STR, 0, "quantity" },
-          { T_STR, 0, "4" },
-      end_node
-  };
-  struct test_node map3[] = {
-      { T_STR, 0, "item" },
-          { T_STR, 0, "Big Shoes" },
-      { T_STR, 0, "quantity" },
-          { T_STR, 0, "1" },
-      end_node
-  };
-  struct test_node seq[] = {
-      { T_MAP, 0, 0, map1 },
-      { T_MAP, 0, 0, map2 },
-      { T_MAP, 0, 0, map3 },
-      end_node
-  };
-  struct test_node stream[] = {
-      { T_SEQ, 0, 0, seq },
-      end_node
-  };
-
-
----
-test: Literal perserves newlines
-todo: true
-spec: 2.13
-yaml: |
-  # ASCII Art
-  --- |
-    \//||\/||
-    // ||  ||_
-perl: |
-  "\\//||\\/||\n// ||  ||_\n"
-ruby: |
-  "\\//||\\/||\n// ||  ||_\n"
-python: |
-    [
-        flushLeft(
-        """
-        \//||\/||
-        // ||  ||_
-        """
-        )
-    ]
-syck: |
-  struct test_node stream[] = {
-      { T_STR, 0, "\\//||\\/||\n// ||  ||_\n" },
-      end_node
-  };
-
----
-test: Folded treats newlines as a space
-todo: true
-spec: 2.14
-yaml: |
-  ---
-    Mark McGwire's
-    year was crippled
-    by a knee injury.
-perl: |
-  "Mark McGwire's year was crippled by a knee injury."
-ruby: |
-  "Mark McGwire's year was crippled by a knee injury."
-python: |
-    [ "Mark McGwire's year was crippled by a knee injury." ]
-syck: |
-  struct test_node stream[] = {
-      { T_STR, 0, "Mark McGwire's year was crippled by a knee injury." },
-      end_node
-  };
-
----
-test: Newlines preserved for indented and blank lines
-todo: true
-spec: 2.15
-yaml: |
-  --- >
-   Sammy Sosa completed another
-   fine season with great stats.
-
-     63 Home Runs
-     0.288 Batting Average
-
-   What a year!
-perl: |
-  "Sammy Sosa completed another fine season with great stats.\n\n  63 Home Runs\n  0.288 Batting Average\n\nWhat a year!\n"
-ruby: |
-  "Sammy Sosa completed another fine season with great stats.\n\n  63 Home Runs\n  0.288 Batting Average\n\nWhat a year!\n"
-python: |
-    [
-        flushLeft(
-        """
-        Sammy Sosa completed another fine season with great stats.
-
-          63 Home Runs
-          0.288 Batting Average
-
-        What a year!
-        """
-        )
-    ]
-syck: |
-  struct test_node stream[] = {
-      { T_STR, 0, "Sammy Sosa completed another fine season with great stats.\n\n  63 Home Runs\n  0.288 Batting Average\n\nWhat a year!\n" },
-      end_node
-  };
-
-
----
-test: Indentation determines scope
-spec: 2.16
-yaml: |
-  name: Mark McGwire
-  accomplishment: >
-     Mark set a major league
-     home run record in 1998.
-  stats: |
-     65 Home Runs
-     0.278 Batting Average
-php: |
-  array(
-    'name' => 'Mark McGwire',
-    'accomplishment' => "Mark set a major league home run record in 1998.\n",
-    'stats' => "65 Home Runs\n0.278 Batting Average\n"
-  )
----
-test: Quoted scalars
-todo: true
-spec: 2.17
-yaml: |
-  unicode: "Sosa did fine.\u263A"
-  control: "\b1998\t1999\t2000\n"
-  hexesc:  "\x0D\x0A is \r\n"
-
-  single: '"Howdy!" he cried.'
-  quoted: ' # not a ''comment''.'
-  tie-fighter: '|\-*-/|'
-ruby: |
-  {
-    "tie-fighter" => "|\\-*-/|",
-    "control"=>"\0101998\t1999\t2000\n",
-    "unicode"=>"Sosa did fine." + ["263A".hex ].pack('U*'),
-    "quoted"=>" # not a 'comment'.",
-    "single"=>"\"Howdy!\" he cried.",
-    "hexesc"=>"\r\n is \r\n"
-  }
----
-test: Multiline flow scalars
-todo: true
-spec: 2.18
-yaml: |
-  plain:
-    This unquoted scalar
-    spans many lines.
-
-  quoted: "So does this
-    quoted scalar.\n"
-ruby: |
-  {
-    'plain' => 'This unquoted scalar spans many lines.',
-    'quoted' => "So does this quoted scalar.\n"
-  }
----
-test: Integers
-spec: 2.19
-yaml: |
-  canonical: 12345
-  decimal: +12,345
-  octal: 014
-  hexadecimal: 0xC
-php: |
-  array(
-    'canonical' => 12345,
-    'decimal' => 12345.0,
-    'octal' => 014,
-    'hexadecimal' => 0xC
-  )
----
-# FIX: spec shows parens around -inf and NaN
-test: Floating point
-spec: 2.20
-yaml: |
-  canonical: 1.23015e+3
-  exponential: 12.3015e+02
-  fixed: 1,230.15
-  negative infinity: -.inf
-  not a number: .NaN
-  float as whole number: !!float 1
-php: |
-  array(
-    'canonical' => 1230.15,
-    'exponential' => 1230.15,
-    'fixed' => 1230.15,
-    'negative infinity' => log(0),
-    'not a number' => -log(0),
-    'float as whole number' => (float) 1
-  )
----
-test: Miscellaneous
-spec: 2.21
-yaml: |
-  null: ~
-  true: true
-  false: false
-  string: '12345'
-php: |
-  array(
-    '' => null,
-    1 => true,
-    0 => false,
-    'string' => '12345'
-  )
----
-test: Timestamps
-todo: true
-spec: 2.22
-yaml: |
-  canonical: 2001-12-15T02:59:43.1Z
-  iso8601:  2001-12-14t21:59:43.10-05:00
-  spaced:  2001-12-14 21:59:43.10 -05:00
-  date:   2002-12-14 # Time is noon UTC
-php: |
-  array(
-    'canonical' => YAML::mktime( 2001, 12, 15, 2, 59, 43, 0.10 ),
-    'iso8601' => YAML::mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ),
-    'spaced' => YAML::mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ),
-    'date' => Date.new( 2002, 12, 14 )
-  )
----
-test: legacy Timestamps test
-todo: true
-spec: legacy D4
-yaml: |
-    canonical: 2001-12-15T02:59:43.00Z
-    iso8601:  2001-02-28t21:59:43.00-05:00
-    spaced:  2001-12-14 21:59:43.00 -05:00
-    date:   2002-12-14
-php: |
-   array(
-     'canonical' => Time::utc( 2001, 12, 15, 2, 59, 43, 0 ),
-     'iso8601' => YAML::mktime( 2001, 2, 28, 21, 59, 43, 0, "-05:00" ),
-     'spaced' => YAML::mktime( 2001, 12, 14, 21, 59, 43, 0, "-05:00" ),
-     'date' => Date.new( 2002, 12, 14 )
-   )
----
-test: Various explicit families
-todo: true
-spec: 2.23
-yaml: |
-  not-date: !str 2002-04-28
-  picture: !binary |
-   R0lGODlhDAAMAIQAAP//9/X
-   17unp5WZmZgAAAOfn515eXv
-   Pz7Y6OjuDg4J+fn5OTk6enp
-   56enmleECcgggoBADs=
-
-  application specific tag: !!something |
-   The semantics of the tag
-   above may be different for
-   different documents.
-
-ruby-setup: |
-  YAML.add_private_type( "something" ) do |type, val|
-    "SOMETHING: #{val}"
-  end
-ruby: |
-  {
-    'not-date' => '2002-04-28',
-    'picture' => "GIF89a\f\000\f\000\204\000\000\377\377\367\365\365\356\351\351\345fff\000\000\000\347\347\347^^^\363\363\355\216\216\216\340\340\340\237\237\237\223\223\223\247\247\247\236\236\236i^\020' \202\n\001\000;",
-    'application specific tag' => "SOMETHING: The semantics of the tag\nabove may be different for\ndifferent documents.\n"
-  }
----
-test: Application specific family
-todo: true
-spec: 2.24
-yaml: |
-  # Establish a tag prefix
-  --- !clarkevans.com,2002/graph/^shape
-    # Use the prefix: shorthand for
-    # !clarkevans.com,2002/graph/circle
-  - !^circle
-    center: &ORIGIN {x: 73, 'y': 129}
-    radius: 7
-  - !^line # !clarkevans.com,2002/graph/line
-    start: *ORIGIN
-    finish: { x: 89, 'y': 102 }
-  - !^label
-    start: *ORIGIN
-    color: 0xFFEEBB
-    value: Pretty vector drawing.
-ruby-setup: |
-  YAML.add_domain_type( "clarkevans.com,2002", 'graph/shape' ) { |type, val|
-    if Array === val
-      val << "Shape Container"
-      val
-    else
-      raise YAML::Error, "Invalid graph of class #{ val.class }: " + val.inspect
-    end
-  }
-  one_shape_proc = Proc.new { |type, val|
-    scheme, domain, type = type.split( /:/, 3 )
-    if val.is_a? ::Hash
-      val['TYPE'] = "Shape: #{type}"
-      val
-    else
-      raise YAML::Error, "Invalid graph of class #{ val.class }: " + val.inspect
-    end
-  }
-  YAML.add_domain_type( "clarkevans.com,2002", 'graph/circle', &one_shape_proc )
-  YAML.add_domain_type( "clarkevans.com,2002", 'graph/line', &one_shape_proc )
-  YAML.add_domain_type( "clarkevans.com,2002", 'graph/label', &one_shape_proc )
-ruby: |
-  [
-    {
-      "radius" => 7,
-      "center"=>
-      {
-        "x" => 73,
-        "y" => 129
-      },
-      "TYPE" => "Shape: graph/circle"
-    }, {
-      "finish" =>
-      {
-        "x" => 89,
-        "y" => 102
-      },
-      "TYPE" => "Shape: graph/line",
-      "start" =>
-      {
-        "x" => 73,
-        "y" => 129
-      }
-    }, {
-      "TYPE" => "Shape: graph/label",
-      "value" => "Pretty vector drawing.",
-      "start" =>
-      {
-        "x" => 73,
-        "y" => 129
-      },
-      "color" => 16772795
-    },
-    "Shape Container"
-  ]
-# ---
-# test: Unordered set
-# spec: 2.25
-# yaml: |
-#   # sets are represented as a
-#   # mapping where each key is
-#   # associated with the empty string
-#   --- !set
-#   ? Mark McGwire
-#   ? Sammy Sosa
-#   ? Ken Griff
----
-test: Ordered mappings
-todo: true
-spec: 2.26
-yaml: |
-  # ordered maps are represented as
-  # a sequence of mappings, with
-  # each mapping having one key
-  --- !omap
-  - Mark McGwire: 65
-  - Sammy Sosa: 63
-  - Ken Griffy: 58
-ruby: |
-  YAML::Omap[
-    'Mark McGwire', 65,
-    'Sammy Sosa', 63,
-    'Ken Griffy', 58
-  ]
----
-test: Invoice
-dump_skip: true
-spec: 2.27
-yaml: |
-  --- !clarkevans.com,2002/^invoice
-  invoice: 34843
-  date   : 2001-01-23
-  bill-to: &id001
-      given  : Chris
-      family : Dumars
-      address:
-          lines: |
-              458 Walkman Dr.
-              Suite #292
-          city    : Royal Oak
-          state   : MI
-          postal  : 48046
-  ship-to: *id001
-  product:
-      -
-        sku         : BL394D
-        quantity    : 4
-        description : Basketball
-        price       : 450.00
-      -
-        sku         : BL4438H
-        quantity    : 1
-        description : Super Hoop
-        price       : 2392.00
-  tax  : 251.42
-  total: 4443.52
-  comments: >
-    Late afternoon is best.
-    Backup contact is Nancy
-    Billsmer @ 338-4338.
-php: |
-  array(
-     'invoice' => 34843, 'date' => gmmktime(0, 0, 0, 1, 23, 2001),
-     'bill-to' =>
-      array( 'given' => 'Chris', 'family' => 'Dumars', 'address' => array( 'lines' => "458 Walkman Dr.\nSuite #292\n", 'city' => 'Royal Oak', 'state' => 'MI', 'postal' => 48046 ) )
-     , 'ship-to' =>
-      array( 'given' => 'Chris', 'family' => 'Dumars', 'address' => array( 'lines' => "458 Walkman Dr.\nSuite #292\n", 'city' => 'Royal Oak', 'state' => 'MI', 'postal' => 48046 ) )
-     , 'product' =>
-       array(
-        array( 'sku' => 'BL394D', 'quantity' => 4, 'description' => 'Basketball', 'price' => 450.00 ),
-        array( 'sku' => 'BL4438H', 'quantity' => 1, 'description' => 'Super Hoop', 'price' => 2392.00 )
-      ),
-     'tax' => 251.42, 'total' => 4443.52,
-     'comments' => "Late afternoon is best. Backup contact is Nancy Billsmer @ 338-4338.\n"
-  )
----
-test: Log file
-todo: true
-spec: 2.28
-yaml: |
-  ---
-  Time: 2001-11-23 15:01:42 -05:00
-  User: ed
-  Warning: >
-    This is an error message
-    for the log file
-  ---
-  Time: 2001-11-23 15:02:31 -05:00
-  User: ed
-  Warning: >
-    A slightly different error
-    message.
-  ---
-  Date: 2001-11-23 15:03:17 -05:00
-  User: ed
-  Fatal: >
-    Unknown variable "bar"
-  Stack:
-    - file: TopClass.py
-      line: 23
-      code: |
-        x = MoreObject("345\n")
-    - file: MoreClass.py
-      line: 58
-      code: |-
-        foo = bar
-ruby: |
-  y = YAML::Stream.new
-  y.add( { 'Time' => YAML::mktime( 2001, 11, 23, 15, 01, 42, 00, "-05:00" ),
-           'User' => 'ed', 'Warning' => "This is an error message for the log file\n" } )
-  y.add( { 'Time' => YAML::mktime( 2001, 11, 23, 15, 02, 31, 00, "-05:00" ),
-           'User' => 'ed', 'Warning' => "A slightly different error message.\n" } )
-  y.add( { 'Date' => YAML::mktime( 2001, 11, 23, 15, 03, 17, 00, "-05:00" ),
-           'User' => 'ed', 'Fatal' => "Unknown variable \"bar\"\n",
-           'Stack' => [
-           { 'file' => 'TopClass.py', 'line' => 23, 'code' => "x = MoreObject(\"345\\n\")\n" },
-           { 'file' => 'MoreClass.py', 'line' => 58, 'code' => "foo = bar" } ] } )
-documents: 3
-
----
-test: Throwaway comments
-yaml: |
-   ### These are four throwaway comment  ###
-
-   ### lines (the second line is empty). ###
-   this: |   # Comments may trail lines.
-      contains three lines of text.
-      The third one starts with a
-      # character. This isn't a comment.
-
-   # These are three throwaway comment
-   # lines (the first line is empty).
-php: |
-   array(
-     'this' => "contains three lines of text.\nThe third one starts with a\n# character. This isn't a comment.\n"
-   )
----
-test: Document with a single value
-todo: true
-yaml: |
-   --- >
-   This YAML stream contains a single text value.
-   The next stream is a log file - a sequence of
-   log entries. Adding an entry to the log is a
-   simple matter of appending it at the end.
-ruby: |
-   "This YAML stream contains a single text value. The next stream is a log file - a sequence of log entries. Adding an entry to the log is a simple matter of appending it at the end.\n"
----
-test: Document stream
-todo: true
-yaml: |
-   ---
-   at: 2001-08-12 09:25:00.00 Z
-   type: GET
-   HTTP: '1.0'
-   url: '/index.html'
-   ---
-   at: 2001-08-12 09:25:10.00 Z
-   type: GET
-   HTTP: '1.0'
-   url: '/toc.html'
-ruby: |
-   y = YAML::Stream.new
-   y.add( {
-      'at' => Time::utc( 2001, 8, 12, 9, 25, 00 ),
-      'type' => 'GET',
-      'HTTP' => '1.0',
-      'url' => '/index.html'
-   } )
-   y.add( {
-      'at' => Time::utc( 2001, 8, 12, 9, 25, 10 ),
-      'type' => 'GET',
-      'HTTP' => '1.0',
-      'url' => '/toc.html'
-   } )
-documents: 2
-
----
-test: Top level mapping
-yaml: |
-   # This stream is an example of a top-level mapping.
-   invoice : 34843
-   date    : 2001-01-23
-   total   : 4443.52
-php: |
-   array(
-      'invoice' => 34843,
-      'date' => gmmktime(0, 0, 0, 1, 23, 2001),
-      'total' => 4443.52
-   )
----
-test: Single-line documents
-todo: true
-yaml: |
-  # The following is a sequence of three documents.
-  # The first contains an empty mapping, the second
-  # an empty sequence, and the last an empty string.
-  --- {}
-  --- [ ]
-  --- ''
-ruby: |
-  y = YAML::Stream.new
-  y.add( {} )
-  y.add( [] )
-  y.add( '' )
-documents: 3
-
----
-test: Document with pause
-todo: true
-yaml: |
-  # A communication channel based on a YAML stream.
-  ---
-  sent at: 2002-06-06 11:46:25.10 Z
-  payload: Whatever
-  # Receiver can process this as soon as the following is sent:
-  ...
-  # Even if the next message is sent long after:
-  ---
-  sent at: 2002-06-06 12:05:53.47 Z
-  payload: Whatever
-  ...
-ruby: |
-  y = YAML::Stream.new
-  y.add(
-    { 'sent at' => YAML::mktime( 2002, 6, 6, 11, 46, 25, 0.10 ),
-      'payload' => 'Whatever' }
-  )
-  y.add(
-    { "payload" => "Whatever", "sent at" => YAML::mktime( 2002, 6, 6, 12, 5, 53, 0.47 ) }
-  )
-documents: 2
-
----
-test: Explicit typing
-yaml: |
-   integer: 12
-   also int: ! "12"
-   string: !str 12
-php: |
-   array( 'integer' => 12, 'also int' => 12, 'string' => '12' )
----
-test: Private types
-todo: true
-yaml: |
-  # Both examples below make use of the 'x-private:ball'
-  # type family URI, but with different semantics.
-  ---
-  pool: !!ball
-    number: 8
-    color: black
-  ---
-  bearing: !!ball
-    material: steel
-ruby: |
-  y = YAML::Stream.new
-  y.add( { 'pool' =>
-    YAML::PrivateType.new( 'ball',
-      { 'number' => 8, 'color' => 'black' } ) }
-  )
-  y.add( { 'bearing' =>
-    YAML::PrivateType.new( 'ball',
-      { 'material' => 'steel' } ) }
-  )
-documents: 2
-
----
-test: Type family under yaml.org
-yaml: |
-  # The URI is 'tag:yaml.org,2002:str'
-  - !str a Unicode string
-php: |
-  array( 'a Unicode string' )
----
-test: Type family under perl.yaml.org
-todo: true
-yaml: |
-  # The URI is 'tag:perl.yaml.org,2002:Text::Tabs'
-  - !perl/Text::Tabs {}
-ruby: |
-  [ YAML::DomainType.new( 'perl.yaml.org,2002', 'Text::Tabs', {} ) ]
----
-test: Type family under clarkevans.com
-todo: true
-yaml: |
-  # The URI is 'tag:clarkevans.com,2003-02:timesheet'
-  - !clarkevans.com,2003-02/timesheet {}
-ruby: |
-  [ YAML::DomainType.new( 'clarkevans.com,2003-02', 'timesheet', {} ) ]
----
-test: URI Escaping
-todo: true
-yaml: |
-  same:
-    - !domain.tld,2002/type\x30 value
-    - !domain.tld,2002/type0 value
-  different: # As far as the YAML parser is concerned
-    - !domain.tld,2002/type%30 value
-    - !domain.tld,2002/type0 value
-ruby-setup: |
-  YAML.add_domain_type( "domain.tld,2002", "type0" ) { |type, val|
-    "ONE: #{val}"
-  }
-  YAML.add_domain_type( "domain.tld,2002", "type%30" ) { |type, val|
-    "TWO: #{val}"
-  }
-ruby: |
-  { 'same' => [ 'ONE: value', 'ONE: value' ], 'different' => [ 'TWO: value', 'ONE: value' ] }
----
-test: URI Prefixing
-todo: true
-yaml: |
-  # 'tag:domain.tld,2002:invoice' is some type family.
-  invoice: !domain.tld,2002/^invoice
-    # 'seq' is shorthand for 'tag:yaml.org,2002:seq'.
-    # This does not effect '^customer' below
-    # because it is does not specify a prefix.
-    customers: !seq
-      # '^customer' is shorthand for the full
-      # notation 'tag:domain.tld,2002:customer'.
-      - !^customer
-        given : Chris
-        family : Dumars
-ruby-setup: |
-  YAML.add_domain_type( "domain.tld,2002", /(invoice|customer)/ ) { |type, val|
-    if val.is_a? ::Hash
-      scheme, domain, type = type.split( /:/, 3 )
-      val['type'] = "domain #{type}"
-      val
-    else
-      raise YAML::Error, "Not a Hash in domain.tld/invoice: " + val.inspect
-    end
-  }
-ruby: |
-  { "invoice"=> { "customers"=> [ { "given"=>"Chris", "type"=>"domain customer", "family"=>"Dumars" } ], "type"=>"domain invoice" } }
-
----
-test: Overriding anchors
-yaml: |
-  anchor : &A001 This scalar has an anchor.
-  override : &A001 >
-   The alias node below is a
-   repeated use of this value.
-  alias : *A001
-php: |
-  array( 'anchor' => 'This scalar has an anchor.',
-    'override' => "The alias node below is a repeated use of this value.\n",
-    'alias' => "The alias node below is a repeated use of this value.\n" )
----
-test: Flow and block formatting
-todo: true
-yaml: |
-  empty: []
-  flow: [ one, two, three # May span lines,
-           , four,           # indentation is
-             five ]          # mostly ignored.
-  block:
-   - First item in top sequence
-   -
-    - Subordinate sequence entry
-   - >
-     A folded sequence entry
-   - Sixth item in top sequence
-ruby: |
-  { 'empty' => [], 'flow' => [ 'one', 'two', 'three', 'four', 'five' ],
-    'block' => [ 'First item in top sequence', [ 'Subordinate sequence entry' ],
-    "A folded sequence entry\n", 'Sixth item in top sequence' ] }
----
-test: Complete mapping test
-todo: true
-yaml: |
- empty: {}
- flow: { one: 1, two: 2 }
- spanning: { one: 1,
-    two: 2 }
- block:
-  first : First entry
-  second:
-   key: Subordinate mapping
-  third:
-   - Subordinate sequence
-   - { }
-   - Previous mapping is empty.
-   - A key: value pair in a sequence.
-     A second: key:value pair.
-   - The previous entry is equal to the following one.
-   -
-     A key: value pair in a sequence.
-     A second: key:value pair.
-  !float 12 : This key is a float.
-  ? >
-   ?
-  : This key had to be protected.
-  "\a" : This key had to be escaped.
-  ? >
-   This is a
-   multi-line
-   folded key
-  : Whose value is
-    also multi-line.
-  ? this also works as a key
-  : with a value at the next line.
-  ?
-   - This key
-   - is a sequence
-  :
-   - With a sequence value.
-  ?
-   This: key
-   is a: mapping
-  :
-   with a: mapping value.
-ruby: |
-  { 'empty' => {}, 'flow' => { 'one' => 1, 'two' => 2 },
-    'spanning' => { 'one' => 1, 'two' => 2 },
-    'block' => { 'first' => 'First entry', 'second' =>
-    { 'key' => 'Subordinate mapping' }, 'third' =>
-      [ 'Subordinate sequence', {}, 'Previous mapping is empty.',
-        { 'A key' => 'value pair in a sequence.', 'A second' => 'key:value pair.' },
-        'The previous entry is equal to the following one.',
-        { 'A key' => 'value pair in a sequence.', 'A second' => 'key:value pair.' } ],
-    12.0 => 'This key is a float.', "?\n" => 'This key had to be protected.',
-    "\a" => 'This key had to be escaped.',
-    "This is a multi-line folded key\n" => "Whose value is also multi-line.",
-    'this also works as a key' => 'with a value at the next line.',
-    [ 'This key', 'is a sequence' ] => [ 'With a sequence value.' ] } }
-  # Couldn't recreate map exactly, so we'll do a detailed check to be sure it's entact
-  obj_y['block'].keys.each { |k|
-    if Hash === k
-      v = obj_y['block'][k]
-      if k['This'] == 'key' and k['is a'] == 'mapping' and v['with a'] == 'mapping value.'
-         obj_r['block'][k] = v
-      end
-    end
-  }
----
-test: Literal explicit indentation
-yaml: |
-   # Explicit indentation must
-   # be given in all the three
-   # following cases.
-   leading spaces: |2
-         This value starts with four spaces.
-
-   leading line break: |2
-
-     This value starts with a line break.
-
-   leading comment indicator: |2
-     # first line starts with a
-     # character.
-
-   # Explicit indentation may
-   # also be given when it is
-   # not required.
-   redundant: |2
-     This value is indented 2 spaces.
-php: |
-   array(
-      'leading spaces' => "    This value starts with four spaces.\n",
-      'leading line break' => "\nThis value starts with a line break.\n",
-      'leading comment indicator' => "# first line starts with a\n# character.\n",
-      'redundant' => "This value is indented 2 spaces.\n"
-   )
----
-test: Chomping and keep modifiers
-yaml: |
-    clipped: |
-        This has one newline.
-
-    same as "clipped" above: "This has one newline.\n"
-
-    stripped: |-
-        This has no newline.
-
-    same as "stripped" above: "This has no newline."
-
-    kept: |+
-        This has two newlines.
-
-    same as "kept" above: "This has two newlines.\n\n"
-php: |
-    array(
-      'clipped' => "This has one newline.\n",
-      'same as "clipped" above' => "This has one newline.\n",
-      'stripped' => 'This has no newline.',
-      'same as "stripped" above' => 'This has no newline.',
-      'kept' => "This has two newlines.\n\n",
-      'same as "kept" above' => "This has two newlines.\n\n"
-    )
----
-test: Literal combinations
-todo: true
-yaml: |
-   empty: |
-
-   literal: |
-    The \ ' " characters may be
-    freely used. Leading white
-       space is significant.
-
-    Line breaks are significant.
-    Thus this value contains one
-    empty line and ends with a
-    single line break, but does
-    not start with one.
-
-   is equal to: "The \\ ' \" characters may \
-    be\nfreely used. Leading white\n   space \
-    is significant.\n\nLine breaks are \
-    significant.\nThus this value contains \
-    one\nempty line and ends with a\nsingle \
-    line break, but does\nnot start with one.\n"
-
-   # Comments may follow a block
-   # scalar value. They must be
-   # less indented.
-
-   # Modifiers may be combined in any order.
-   indented and chomped: |2-
-       This has no newline.
-
-   also written as: |-2
-       This has no newline.
-
-   both are equal to: "  This has no newline."
-php: |
-   array(
-     'empty' => '',
-     'literal' => "The \\ ' \" characters may be\nfreely used. Leading white\n   space " +
-       "is significant.\n\nLine breaks are significant.\nThus this value contains one\n" +
-       "empty line and ends with a\nsingle line break, but does\nnot start with one.\n",
-     'is equal to' => "The \\ ' \" characters may be\nfreely used. Leading white\n   space " +
-       "is significant.\n\nLine breaks are significant.\nThus this value contains one\n" +
-       "empty line and ends with a\nsingle line break, but does\nnot start with one.\n",
-     'indented and chomped' => '  This has no newline.',
-     'also written as' => '  This has no newline.',
-     'both are equal to' => '  This has no newline.'
-   )
----
-test: Folded combinations
-todo: true
-yaml: |
-   empty: >
-
-   one paragraph: >
-    Line feeds are converted
-    to spaces, so this value
-    contains no line breaks
-    except for the final one.
-
-   multiple paragraphs: >2
-
-     An empty line, either
-     at the start or in
-     the value:
-
-     Is interpreted as a
-     line break. Thus this
-     value contains three
-     line breaks.
-
-   indented text: >
-       This is a folded
-       paragraph followed
-       by a list:
-        * first entry
-        * second entry
-       Followed by another
-       folded paragraph,
-       another list:
-
-        * first entry
-
-        * second entry
-
-       And a final folded
-       paragraph.
-
-   above is equal to: |
-       This is a folded paragraph followed by a list:
-        * first entry
-        * second entry
-       Followed by another folded paragraph, another list:
-
-        * first entry
-
-        * second entry
-
-       And a final folded paragraph.
-
-   # Explicit comments may follow
-   # but must be less indented.
-php: |
-   array(
-     'empty' => '',
-     'one paragraph' => 'Line feeds are converted to spaces, so this value'.
-       " contains no line breaks except for the final one.\n",
-     'multiple paragraphs' => "\nAn empty line, either at the start or in the value:\n".
-       "Is interpreted as a line break. Thus this value contains three line breaks.\n",
-     'indented text' => "This is a folded paragraph followed by a list:\n".
-       " * first entry\n * second entry\nFollowed by another folded paragraph, ".
-       "another list:\n\n * first entry\n\n * second entry\n\nAnd a final folded paragraph.\n",
-     'above is equal to' => "This is a folded paragraph followed by a list:\n".
-       " * first entry\n * second entry\nFollowed by another folded paragraph, ".
-       "another list:\n\n * first entry\n\n * second entry\n\nAnd a final folded paragraph.\n"
-   )
----
-test: Single quotes
-todo: true
-yaml: |
-   empty: ''
-   second: '! : \ etc. can be used freely.'
-   third: 'a single quote '' must be escaped.'
-   span: 'this contains
-         six spaces
-
-         and one
-         line break'
-   is same as: "this contains six spaces\nand one line break"
-php: |
-   array(
-     'empty' => '',
-     'second' => '! : \\ etc. can be used freely.',
-     'third' => "a single quote ' must be escaped.",
-     'span' => "this contains six spaces\nand one line break",
-     'is same as' => "this contains six spaces\nand one line break"
-   )
----
-test: Double quotes
-todo: true
-yaml: |
-   empty: ""
-   second: "! : etc. can be used freely."
-   third: "a \" or a \\ must be escaped."
-   fourth: "this value ends with an LF.\n"
-   span: "this contains
-     four  \
-         spaces"
-   is equal to: "this contains four  spaces"
-php: |
-   array(
-     'empty' => '',
-     'second' => '! : etc. can be used freely.',
-     'third' => 'a " or a \\ must be escaped.',
-     'fourth' => "this value ends with an LF.\n",
-     'span' => "this contains four  spaces",
-     'is equal to' => "this contains four  spaces"
-   )
----
-test: Unquoted strings
-todo: true
-yaml: |
-   first: There is no unquoted empty string.
-
-   second: 12          ## This is an integer.
-
-   third: !str 12      ## This is a string.
-
-   span: this contains
-         six spaces
-
-         and one
-         line break
-
-   indicators: this has no comments.
-               #:foo and bar# are
-               both text.
-
-   flow: [ can span
-              lines, # comment
-              like
-              this ]
-
-   note: { one-line keys: but multi-line values }
-
-php: |
-   array(
-     'first' => 'There is no unquoted empty string.',
-     'second' => 12,
-     'third' => '12',
-     'span' => "this contains six spaces\nand one line break",
-     'indicators' => "this has no comments. #:foo and bar# are both text.",
-     'flow' => [ 'can span lines', 'like this' ],
-     'note' => { 'one-line keys' => 'but multi-line values' }
-   )
----
-test: Spanning sequences
-todo: true
-yaml: |
-   # The following are equal seqs
-   # with different identities.
-   flow: [ one, two ]
-   spanning: [ one,
-        two ]
-   block:
-     - one
-     - two
-php: |
-   array(
-     'flow' => [ 'one', 'two' ],
-     'spanning' => [ 'one', 'two' ],
-     'block' => [ 'one', 'two' ]
-   )
----
-test: Flow mappings
-yaml: |
-   # The following are equal maps
-   # with different identities.
-   flow: { one: 1, two: 2 }
-   block:
-       one: 1
-       two: 2
-php: |
-   array(
-     'flow' => array( 'one' => 1, 'two' => 2 ),
-     'block' => array( 'one' => 1, 'two' => 2 )
-   )
----
-test: Representations of 12
-todo: true
-yaml: |
-   - 12 # An integer
-   # The following scalars
-   # are loaded to the
-   # string value '1' '2'.
-   - !str 12
-   - '12'
-   - "12"
-   - "\
-     1\
-     2\
-     "
-   # Strings containing paths and regexps can be unquoted:
-   - /foo/bar
-   - d:/foo/bar
-   - foo/bar
-   - /a.*b/
-php: |
-   array( 12, '12', '12', '12', '12', '/foo/bar', 'd:/foo/bar', 'foo/bar', '/a.*b/' )
----
-test: "Null"
-todo: true
-yaml: |
-   canonical: ~
-
-   english: null
-
-   # This sequence has five
-   # entries, two with values.
-   sparse:
-     - ~
-     - 2nd entry
-     - Null
-     - 4th entry
-     -
-
-   four: This mapping has five keys,
-         only two with values.
-
-php: |
-   array (
-     'canonical' => null,
-     'english' => null,
-     'sparse' => array( null, '2nd entry', null, '4th entry', null ]),
-     'four' => 'This mapping has five keys, only two with values.'
-   )
----
-test: Omap
-todo: true
-yaml: |
-   # Explicitly typed dictionary.
-   Bestiary: !omap
-     - aardvark: African pig-like ant eater. Ugly.
-     - anteater: South-American ant eater. Two species.
-     - anaconda: South-American constrictor snake. Scary.
-     # Etc.
-ruby: |
-   {
-     'Bestiary' => YAML::Omap[
-       'aardvark', 'African pig-like ant eater. Ugly.',
-       'anteater', 'South-American ant eater. Two species.',
-       'anaconda', 'South-American constrictor snake. Scary.'
-     ]
-   }
-
----
-test: Pairs
-todo: true
-yaml: |
-  # Explicitly typed pairs.
-  tasks: !pairs
-    - meeting: with team.
-    - meeting: with boss.
-    - break: lunch.
-    - meeting: with client.
-ruby: |
-  {
-    'tasks' => YAML::Pairs[
-      'meeting', 'with team.',
-      'meeting', 'with boss.',
-      'break', 'lunch.',
-      'meeting', 'with client.'
-    ]
-  }
-
----
-test: Set
-todo: true
-yaml: |
-  # Explicitly typed set.
-  baseball players: !set
-    Mark McGwire:
-    Sammy Sosa:
-    Ken Griffey:
-ruby: |
-  {
-    'baseball players' => YAML::Set[
-      'Mark McGwire', nil,
-      'Sammy Sosa', nil,
-      'Ken Griffey', nil
-    ]
-  }
-
----
-test: Boolean
-yaml: |
-   false: used as key
-   logical:  true
-   answer: false
-php: |
-   array(
-     false => 'used as key',
-     'logical' => true,
-     'answer' => false
-   )
----
-test: Integer
-yaml: |
-   canonical: 12345
-   decimal: +12,345
-   octal: 014
-   hexadecimal: 0xC
-php: |
-   array(
-     'canonical' => 12345,
-     'decimal' => 12345.0,
-     'octal' => 12,
-     'hexadecimal' => 12
-   )
----
-test: Float
-yaml: |
-   canonical: 1.23015e+3
-   exponential: 12.3015e+02
-   fixed: 1,230.15
-   negative infinity: -.inf
-   not a number: .NaN
-php: |
-  array(
-    'canonical' => 1230.15,
-    'exponential' => 1230.15,
-    'fixed' => 1230.15,
-    'negative infinity' => log(0),
-    'not a number' => -log(0)
-  )
----
-test: Timestamp
-todo: true
-yaml: |
-   canonical:       2001-12-15T02:59:43.1Z
-   valid iso8601:   2001-12-14t21:59:43.10-05:00
-   space separated: 2001-12-14 21:59:43.10 -05:00
-   date (noon UTC): 2002-12-14
-ruby: |
-   array(
-     'canonical' => YAML::mktime( 2001, 12, 15, 2, 59, 43, 0.10 ),
-     'valid iso8601' => YAML::mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ),
-     'space separated' => YAML::mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ),
-     'date (noon UTC)' => Date.new( 2002, 12, 14 )
-   )
----
-test: Binary
-todo: true
-yaml: |
-   canonical: !binary "\
-    R0lGODlhDAAMAIQAAP//9/X17unp5WZmZgAAAOfn515eXvPz7Y6OjuDg4J+fn5\
-    OTk6enp56enmlpaWNjY6Ojo4SEhP/++f/++f/++f/++f/++f/++f/++f/++f/+\
-    +f/++f/++f/++f/++f/++SH+Dk1hZGUgd2l0aCBHSU1QACwAAAAADAAMAAAFLC\
-    AgjoEwnuNAFOhpEMTRiggcz4BNJHrv/zCFcLiwMWYNG84BwwEeECcgggoBADs="
-   base64: !binary |
-    R0lGODlhDAAMAIQAAP//9/X17unp5WZmZgAAAOfn515eXvPz7Y6OjuDg4J+fn5
-    OTk6enp56enmlpaWNjY6Ojo4SEhP/++f/++f/++f/++f/++f/++f/++f/++f/+
-    +f/++f/++f/++f/++f/++SH+Dk1hZGUgd2l0aCBHSU1QACwAAAAADAAMAAAFLC
-    AgjoEwnuNAFOhpEMTRiggcz4BNJHrv/zCFcLiwMWYNG84BwwEeECcgggoBADs=
-   description: >
-    The binary value above is a tiny arrow
-    encoded as a gif image.
-ruby-setup: |
-   arrow_gif = "GIF89a\f\000\f\000\204\000\000\377\377\367\365\365\356\351\351\345fff\000\000\000\347\347\347^^^\363\363\355\216\216\216\340\340\340\237\237\237\223\223\223\247\247\247\236\236\236iiiccc\243\243\243\204\204\204\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371!\376\016Made with GIMP\000,\000\000\000\000\f\000\f\000\000\005,  \216\2010\236\343@\024\350i\020\304\321\212\010\034\317\200M$z\357\3770\205p\270\2601f\r\e\316\001\303\001\036\020' \202\n\001\000;"
-ruby: |
-   {
-     'canonical' => arrow_gif,
-     'base64' => arrow_gif,
-     'description' => "The binary value above is a tiny arrow encoded as a gif image.\n"
-   }
-
----
-test: Merge key
-todo: true
-yaml: |
-  ---
-  - &CENTER { x: 1, y: 2 }
-  - &LEFT { x: 0, y: 2 }
-  - &BIG { r: 10 }
-  - &SMALL { r: 1 }
-
-  # All the following maps are equal:
-
-  - # Explicit keys
-    x: 1
-    y: 2
-    r: 10
-    label: center/big
-
-  - # Merge one map
-    << : *CENTER
-    r: 10
-    label: center/big
-
-  - # Merge multiple maps
-    << : [ *CENTER, *BIG ]
-    label: center/big
-
-  - # Override
-    << : [ *BIG, *LEFT, *SMALL ]
-    x: 1
-    label: center/big
-
-ruby-setup: |
-  center = { 'x' => 1, 'y' => 2 }
-  left = { 'x' => 0, 'y' => 2 }
-  big = { 'r' => 10 }
-  small = { 'r' => 1 }
-  node1 = { 'x' => 1, 'y' => 2, 'r' => 10, 'label' => 'center/big' }
-  node2 = center.dup
-  node2.update( { 'r' => 10, 'label' => 'center/big' } )
-  node3 = big.dup
-  node3.update( center )
-  node3.update( { 'label' => 'center/big' } )
-  node4 = small.dup
-  node4.update( left )
-  node4.update( big )
-  node4.update( { 'x' => 1, 'label' => 'center/big' } )
-
-ruby: |
-  [
-    center, left, big, small, node1, node2, node3, node4
-  ]
-
----
-test: Default key
-todo: true
-yaml: |
-   ---     # Old schema
-   link with:
-     - library1.dll
-     - library2.dll
-   ---     # New schema
-   link with:
-     - = : library1.dll
-       version: 1.2
-     - = : library2.dll
-       version: 2.3
-ruby: |
-   y = YAML::Stream.new
-   y.add( { 'link with' => [ 'library1.dll', 'library2.dll' ] } )
-   obj_h = Hash[ 'version' => 1.2 ]
-   obj_h.default = 'library1.dll'
-   obj_h2 = Hash[ 'version' => 2.3 ]
-   obj_h2.default = 'library2.dll'
-   y.add( { 'link with' => [ obj_h, obj_h2 ] } )
-documents: 2
-
----
-test: Special keys
-todo: true
-yaml: |
-   "!": These three keys
-   "&": had to be quoted
-   "=": and are normal strings.
-   # NOTE: the following node should NOT be serialized this way.
-   encoded node :
-    !special '!' : '!type'
-    !special|canonical '&' : 12
-    = : value
-   # The proper way to serialize the above node is as follows:
-   node : !!type &12 value
-ruby: |
-   { '!' => 'These three keys', '&' => 'had to be quoted',
-     '=' => 'and are normal strings.',
-     'encoded node' => YAML::PrivateType.new( 'type', 'value' ),
-     'node' => YAML::PrivateType.new( 'type', 'value' ) }
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsTypeTransfers.yml b/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsTypeTransfers.yml
deleted file mode 100644
index 46c8d4a2c0..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/YtsTypeTransfers.yml
+++ /dev/null
@@ -1,244 +0,0 @@
---- %YAML:1.0
-test: Strings
-brief: >
-    Any group of characters beginning with an
-    alphabetic or numeric character is a string,
-    unless it belongs to one of the groups below
-    (such as an Integer or Time).
-yaml: |
-    String
-php: |
-    'String'
----
-test: String characters
-brief: >
-    A string can contain any alphabetic or
-    numeric character, along with many
-    punctuation characters, including the
-    period, dash, space, quotes, exclamation, and
-    question mark.
-yaml: |
-    - What's Yaml?
-    - It's for writing data structures in plain text.
-    - And?
-    - And what? That's not good enough for you?
-    - No, I mean, "And what about Yaml?"
-    - Oh, oh yeah. Uh.. Yaml for Ruby.
-php: |
-    array(
-      "What's Yaml?",
-      "It's for writing data structures in plain text.",
-      "And?",
-      "And what? That's not good enough for you?",
-      "No, I mean, \"And what about Yaml?\"",
-      "Oh, oh yeah. Uh.. Yaml for Ruby."
-    )
----
-test: Indicators in Strings
-brief: >
-    Be careful using indicators in strings.  In particular,
-    the comma, colon, and pound sign must be used carefully.
-yaml: |
-    the colon followed by space is an indicator: but is a string:right here
-    same for the pound sign: here we have it#in a string
-    the comma can, honestly, be used in most cases: [ but not in, inline collections ]
-php: |
-    array(
-      'the colon followed by space is an indicator' => 'but is a string:right here',
-      'same for the pound sign' => 'here we have it#in a string',
-      'the comma can, honestly, be used in most cases' => array('but not in', 'inline collections')
-    )
----
-test: Forcing Strings
-brief: >
-    Any YAML type can be forced into a string using the
-    explicit !str method.
-yaml: |
-    date string: !str 2001-08-01
-    number string: !str 192
-php: |
-    array(
-      'date string' => '2001-08-01',
-      'number string' => '192'
-    )
----
-test: Single-quoted Strings
-brief: >
-    You can also enclose your strings within single quotes,
-    which allows use of slashes, colons, and other indicators
-    freely.  Inside single quotes, you can represent a single
-    quote in your string by using two single quotes next to
-    each other.
-yaml: |
-    all my favorite symbols: '#:!/%.)'
-    a few i hate: '&(*'
-    why do i hate them?: 'it''s very hard to explain'
-    entities: '&pound; me'
-php: |
-    array(
-      'all my favorite symbols' => '#:!/%.)',
-      'a few i hate' => '&(*',
-      'why do i hate them?' => 'it\'s very hard to explain',
-      'entities' => '&pound; me'
-    )
----
-test: Double-quoted Strings
-brief: >
-    Enclosing strings in double quotes allows you
-    to use escapings to represent ASCII and
-    Unicode characters.
-yaml: |
-    i know where i want my line breaks: "one here\nand another here\n"
-php: |
-    array(
-      'i know where i want my line breaks' => "one here\nand another here\n"
-    )
----
-test: Multi-line Quoted Strings
-todo: true
-brief: >
-    Both single- and double-quoted strings may be
-    carried on to new lines in your YAML document.
-    They must be indented a step and indentation
-    is interpreted as a single space.
-yaml: |
-    i want a long string: "so i'm going to
-      let it go on and on to other lines
-      until i end it with a quote."
-php: |
-    array('i want a long string' => "so i'm going to ".
-         "let it go on and on to other lines ".
-         "until i end it with a quote."
-    )
-
----
-test: Plain scalars
-todo: true
-brief: >
-    Unquoted strings may also span multiple lines, if they
-    are free of YAML space indicators and indented.
-yaml: |
-    - My little toe is broken in two places;
-    - I'm crazy to have skied this way;
-    - I'm not the craziest he's seen, since there was always the German guy
-      who skied for 3 hours on a broken shin bone (just below the kneecap);
-    - Nevertheless, second place is respectable, and he doesn't
-      recommend going for the record;
-    - He's going to put my foot in plaster for a month;
-    - This would impair my skiing ability somewhat for the
-      duration, as can be imagined.
-php: |
-    array(
-      "My little toe is broken in two places;",
-      "I'm crazy to have skied this way;",
-      "I'm not the craziest he's seen, since there was always ".
-         "the German guy who skied for 3 hours on a broken shin ".
-         "bone (just below the kneecap);",
-      "Nevertheless, second place is respectable, and he doesn't ".
-         "recommend going for the record;",
-      "He's going to put my foot in plaster for a month;",
-      "This would impair my skiing ability somewhat for the duration, ".
-         "as can be imagined."
-    )
----
-test: 'Null'
-brief: >
-    You can use the tilde '~' character for a null value.
-yaml: |
-    name: Mr. Show
-    hosted by: Bob and David
-    date of next season: ~
-php: |
-    array(
-      'name' => 'Mr. Show',
-      'hosted by' => 'Bob and David',
-      'date of next season' => null
-    )
----
-test: Boolean
-brief: >
-    You can use 'true' and 'false' for Boolean values.
-yaml: |
-    Is Gus a Liar?: true
-    Do I rely on Gus for Sustenance?: false
-php: |
-    array(
-      'Is Gus a Liar?' => true,
-      'Do I rely on Gus for Sustenance?' => false
-    )
----
-test: Integers
-dump_skip: true
-brief: >
-    An integer is a series of numbers, optionally
-    starting with a positive or negative sign.  Integers
-    may also contain commas for readability.
-yaml: |
-    zero: 0
-    simple: 12
-    one-thousand: 1,000
-    negative one-thousand: -1,000
-php: |
-    array(
-      'zero' => 0,
-      'simple' => 12,
-      'one-thousand' => 1000.0,
-      'negative one-thousand' => -1000.0
-    )
----
-test: Integers as Map Keys
-brief: >
-    An integer can be used a dictionary key.
-yaml: |
-    1: one
-    2: two
-    3: three
-php: |
-    array(
-        1 => 'one',
-        2 => 'two',
-        3 => 'three'
-    )
----
-test: Floats
-dump_skip: true
-brief: >
-     Floats are represented by numbers with decimals,
-     allowing for scientific notation, as well as
-     positive and negative infinity and "not a number."
-yaml: |
-     a simple float: 2.00
-     larger float: 1,000.09
-     scientific notation: 1.00009e+3
-php: |
-     array(
-       'a simple float' => 2.0,
-       'larger float' => 1000.09,
-       'scientific notation' => 1000.09
-     )
----
-test: Time
-todo: true
-brief: >
-    You can represent timestamps by using
-    ISO8601 format, or a variation which
-    allows spaces between the date, time and
-    time zone.
-yaml: |
-    iso8601: 2001-12-14t21:59:43.10-05:00
-    space separated: 2001-12-14 21:59:43.10 -05:00
-php: |
-    array(
-      'iso8601' => mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ),
-      'space separated' => mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" )
-    )
----
-test: Date
-todo: true
-brief: >
-    A date can be represented by its year,
-    month and day in ISO8601 order.
-yaml: |
-    1976-07-31
-php: |
-    date( 1976, 7, 31 )
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/embededPhp.yml b/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/embededPhp.yml
deleted file mode 100644
index ec456ed09f..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/embededPhp.yml
+++ /dev/null
@@ -1 +0,0 @@
-value: <?php echo 1 + 2 + 3 ?>
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/escapedCharacters.yml b/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/escapedCharacters.yml
deleted file mode 100644
index 6ca044c8da..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/escapedCharacters.yml
+++ /dev/null
@@ -1,155 +0,0 @@
-test: outside double quotes
-yaml: |
-    \0 \ \a \b \n
-php: |
-    "\\0 \\ \\a \\b \\n"
----
-test: null
-yaml: |
-    "\0"
-php: |
-    "\x00"
----
-test: bell
-yaml: |
-    "\a"
-php: |
-    "\x07"
----
-test: backspace
-yaml: |
-    "\b"
-php: |
-    "\x08"
----
-test: horizontal tab (1)
-yaml: |
-    "\t"
-php: |
-    "\x09"
----
-test: horizontal tab (2)
-yaml: |
-    "\	"
-php: |
-    "\x09"
----
-test: line feed
-yaml: |
-    "\n"
-php: |
-    "\x0a"
----
-test: vertical tab
-yaml: |
-    "\v"
-php: |
-    "\x0b"
----
-test: form feed
-yaml: |
-    "\f"
-php: |
-    "\x0c"
----
-test: carriage return
-yaml: |
-    "\r"
-php: |
-    "\x0d"
----
-test: escape
-yaml: |
-    "\e"
-php: |
-   "\x1b"
----
-test: space
-yaml: |
-    "\ "
-php: |
-    "\x20"
----
-test: slash
-yaml: |
-    "\/"
-php: |
-    "\x2f"
----
-test: backslash
-yaml: |
-    "\\"
-php: |
-    "\\"
----
-test: Unicode next line
-yaml: |
-    "\N"
-php: |
-    "\xc2\x85"
----
-test: Unicode non-breaking space
-yaml: |
-    "\_"
-php: |
-    "\xc2\xa0"
----
-test: Unicode line separator
-yaml: |
-    "\L"
-php: |
-    "\xe2\x80\xa8"
----
-test: Unicode paragraph separator
-yaml: |
-    "\P"
-php: |
-    "\xe2\x80\xa9"
----
-test: Escaped 8-bit Unicode
-yaml: |
-    "\x42"
-php: |
-    "B"
----
-test: Escaped 16-bit Unicode
-yaml: |
-    "\u20ac"
-php: |
-    "\xe2\x82\xac"
----
-test: Escaped 32-bit Unicode
-yaml: |
-    "\U00000043"
-php: |
-    "C"
----
-test: Example 5.13 Escaped Characters
-note: |
-    Currently throws an error parsing first line. Maybe Symfony Yaml doesn't support
-    continuation of string across multiple lines? Keeping test here but disabled.
-todo: true
-yaml: |
-    "Fun with \\
-    \" \a \b \e \f \
-    \n \r \t \v \0 \
-    \  \_ \N \L \P \
-    \x41 \u0041 \U00000041"
-php: |
-    "Fun with \x5C\n\x22 \x07 \x08 \x1B \x0C\n\x0A \x0D \x09 \x0B \x00\n\x20 \xA0 \x85 \xe2\x80\xa8 \xe2\x80\xa9\nA A A"
----
-test: Double quotes with a line feed
-yaml: |
-   { double: "some value\n \"some quoted string\" and 'some single quotes one'" }
-php: |
-    array(
-        'double' => "some value\n \"some quoted string\" and 'some single quotes one'"
-    )
----
-test: Backslashes
-yaml: |
-    { single: 'foo\Var', no-quotes: foo\Var, double: "foo\\Var" }
-php: |
-    array(
-        'single' => 'foo\Var', 'no-quotes' => 'foo\Var', 'double' => 'foo\Var'
-    )
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/index.yml b/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/index.yml
deleted file mode 100644
index 3216a89ebb..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/index.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-- escapedCharacters
-- sfComments
-- sfCompact
-- sfTests
-- sfObjects
-- sfMergeKey
-- sfQuotes
-- YtsAnchorAlias
-- YtsBasicTests
-- YtsBlockMapping
-- YtsDocumentSeparator
-- YtsErrorTests
-- YtsFlowCollections
-- YtsFoldedScalars
-- YtsNullsAndEmpties
-- YtsSpecificationExamples
-- YtsTypeTransfers
-- unindentedCollections
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/sfComments.yml b/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/sfComments.yml
deleted file mode 100644
index b72a9b6996..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/sfComments.yml
+++ /dev/null
@@ -1,76 +0,0 @@
---- %YAML:1.0
-test: Comments at the end of a line
-brief: >
-    Comments at the end of a line
-yaml: |
-    ex1: "foo # bar"
-    ex2: "foo # bar" # comment
-    ex3: 'foo # bar' # comment
-    ex4: foo # comment
-    ex5: foo	#	comment with tab before  
-    ex6: foo#foo # comment here
-    ex7: foo 	# ignore me # and me
-php: |
-    array('ex1' => 'foo # bar', 'ex2' => 'foo # bar', 'ex3' => 'foo # bar', 'ex4' => 'foo', 'ex5' => 'foo', 'ex6' => 'foo#foo', 'ex7' => 'foo')
----
-test: Comments in the middle
-brief: >
-  Comments in the middle
-yaml: |
-    foo:
-    # some comment
-    # some comment
-      bar: foo
-    # some comment
-    # some comment
-php: |
-    array('foo' => array('bar' => 'foo'))
----
-test: Comments on a hash line
-brief: >
-  Comments on a hash line
-yaml: |
-    foo:   # a comment
-      foo: bar # a comment
-php: |
-    array('foo' => array('foo' => 'bar'))
----
-test: 'Value starting with a #'
-brief: >
-  'Value starting with a #'
-yaml: |
-    foo:   '#bar'
-php: |
-    array('foo' => '#bar')
----
-test: Document starting with a comment and a separator
-brief: >
-  Commenting before document start is allowed
-yaml: |
-    # document comment
-    ---
-    foo: bar # a comment
-php: |
-    array('foo' => 'bar')
----
-test: Comment containing a colon on a hash line
-brief: >
-    Comment containing a colon on a scalar line
-yaml: 'foo # comment: this is also part of the comment'
-php: |
-    'foo'
----
-test: 'Hash key containing a #'
-brief: >
-    'Hash key containing a #'
-yaml: 'foo#bar: baz'
-php: |
-    array('foo#bar' => 'baz')
----
-test: 'Hash key ending with a space and a #'
-brief: >
-    'Hash key ending with a space and a #'
-yaml: |
-    'foo #': baz
-php: |
-    array('foo #' => 'baz')
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/sfCompact.yml b/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/sfCompact.yml
deleted file mode 100644
index 1339d23a63..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/sfCompact.yml
+++ /dev/null
@@ -1,159 +0,0 @@
---- %YAML:1.0
-test: Compact notation
-brief: |
-    Compact notation for sets of mappings with single element
-yaml: |
-  ---
-  # products purchased
-  - item    : Super Hoop
-  - item    : Basketball
-    quantity: 1
-  - item:
-      name: Big Shoes
-      nick: Biggies
-    quantity: 1
-php: |
-  array (
-    array (
-      'item' => 'Super Hoop',
-    ),
-    array (
-      'item' => 'Basketball',
-      'quantity' => 1,
-    ),
-    array (
-      'item' => array(
-        'name' => 'Big Shoes',
-        'nick' => 'Biggies'
-      ),
-      'quantity' => 1
-    )
-  )
----
-test: Compact notation combined with inline notation
-brief: |
-    Combinations of compact and inline notation are allowed
-yaml: |
-  ---
-  items:
-    - { item: Super Hoop, quantity: 1 }
-    - [ Basketball, Big Shoes ]
-php: |
-  array (
-    'items' => array (
-      array (
-        'item' => 'Super Hoop',
-        'quantity' => 1,
-      ),
-      array (
-        'Basketball',
-        'Big Shoes'
-      )
-    )
-  )
---- %YAML:1.0
-test: Compact notation
-brief: |
-    Compact notation for sets of mappings with single element
-yaml: |
-  ---
-  # products purchased
-  - item    : Super Hoop
-  - item    : Basketball
-    quantity: 1
-  - item:
-      name: Big Shoes
-      nick: Biggies
-    quantity: 1
-php: |
-  array (
-    array (
-      'item' => 'Super Hoop',
-    ),
-    array (
-      'item' => 'Basketball',
-      'quantity' => 1,
-    ),
-    array (
-      'item' => array(
-        'name' => 'Big Shoes',
-        'nick' => 'Biggies'
-      ),
-      'quantity' => 1
-    )
-  )
----
-test: Compact notation combined with inline notation
-brief: |
-    Combinations of compact and inline notation are allowed
-yaml: |
-  ---
-  items:
-    - { item: Super Hoop, quantity: 1 }
-    - [ Basketball, Big Shoes ]
-php: |
-  array (
-    'items' => array (
-      array (
-        'item' => 'Super Hoop',
-        'quantity' => 1,
-      ),
-      array (
-        'Basketball',
-        'Big Shoes'
-      )
-    )
-  )
---- %YAML:1.0
-test: Compact notation
-brief: |
-    Compact notation for sets of mappings with single element
-yaml: |
-  ---
-  # products purchased
-  - item    : Super Hoop
-  - item    : Basketball
-    quantity: 1
-  - item:
-      name: Big Shoes
-      nick: Biggies
-    quantity: 1
-php: |
-  array (
-    array (
-      'item' => 'Super Hoop',
-    ),
-    array (
-      'item' => 'Basketball',
-      'quantity' => 1,
-    ),
-    array (
-      'item' => array(
-        'name' => 'Big Shoes',
-        'nick' => 'Biggies'
-      ),
-      'quantity' => 1
-    )
-  )
----
-test: Compact notation combined with inline notation
-brief: |
-    Combinations of compact and inline notation are allowed
-yaml: |
-  ---
-  items:
-    - { item: Super Hoop, quantity: 1 }
-    - [ Basketball, Big Shoes ]
-php: |
-  array (
-    'items' => array (
-      array (
-        'item' => 'Super Hoop',
-        'quantity' => 1,
-      ),
-      array (
-        'Basketball',
-        'Big Shoes'
-      )
-    )
-  )
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/sfMergeKey.yml b/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/sfMergeKey.yml
deleted file mode 100644
index 4b67d34100..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/sfMergeKey.yml
+++ /dev/null
@@ -1,58 +0,0 @@
---- %YAML:1.0
-test: Simple In Place Substitution
-brief: >
-    If you want to reuse an entire alias, only overwriting what is different
-    you can use a << in place substitution. This is not part of the official
-    YAML spec, but a widely implemented extension. See the following URL for
-    details: http://yaml.org/type/merge.html
-yaml: |
-    foo: &foo
-        a: Steve
-        b: Clark
-        c: Brian
-    bar:
-        a: before
-        d: other
-        <<: *foo
-        b: new
-        x: Oren
-        c:
-            foo: bar
-            foo: ignore
-            bar: foo
-    duplicate:
-        foo: bar
-        foo: ignore
-    foo2: &foo2
-        a: Ballmer
-    ding: &dong [ fi, fei, fo, fam]
-    check:
-        <<:
-            - *foo
-            - *dong
-        isit: tested
-    head:
-        <<: [ *foo , *dong , *foo2 ]
-    taz: &taz
-        a: Steve
-        w:
-            p: 1234
-    nested:
-        <<: *taz
-        d: Doug
-        w: &nestedref
-            p: 12345
-        z:
-            <<: *nestedref
-php: |
-    array(
-        'foo' => array('a' => 'Steve', 'b' => 'Clark', 'c' => 'Brian'),
-        'bar' => array('a' => 'before', 'd' => 'other', 'b' => 'new', 'c' => array('foo' => 'bar', 'bar' => 'foo'), 'x' => 'Oren'),
-        'duplicate' => array('foo' => 'bar'),
-        'foo2' => array('a' => 'Ballmer'),
-        'ding' => array('fi', 'fei', 'fo', 'fam'),
-        'check' => array('a' => 'Steve', 'b' => 'Clark', 'c' => 'Brian', 'fi', 'fei', 'fo', 'fam', 'isit' => 'tested'),
-        'head' => array('a' => 'Steve', 'b' => 'Clark', 'c' => 'Brian', 'fi', 'fei', 'fo', 'fam'),
-        'taz' => array('a' => 'Steve', 'w' => array('p' => 1234)),
-        'nested' => array('a' => 'Steve', 'w' => array('p' => 12345), 'd' => 'Doug', 'z' => array('p' => 12345))
-    )
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/sfObjects.yml b/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/sfObjects.yml
deleted file mode 100644
index ee124b2446..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/sfObjects.yml
+++ /dev/null
@@ -1,11 +0,0 @@
---- %YAML:1.0
-test: Objects
-brief: >
-    Comments at the end of a line
-yaml: |
-    ex1: "foo # bar"
-    ex2: "foo # bar" # comment
-    ex3: 'foo # bar' # comment
-    ex4: foo # comment
-php: |
-    array('ex1' => 'foo # bar', 'ex2' => 'foo # bar', 'ex3' => 'foo # bar', 'ex4' => 'foo')
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/sfQuotes.yml b/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/sfQuotes.yml
deleted file mode 100644
index 7c60baec97..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/sfQuotes.yml
+++ /dev/null
@@ -1,33 +0,0 @@
---- %YAML:1.0
-test: Some characters at the beginning of a string must be escaped
-brief: >
-    Some characters at the beginning of a string must be escaped
-yaml: |
-    foo: '| bar'
-php: |
-    array('foo' => '| bar')
----
-test: A key can be a quoted string
-brief: >
-  A key can be a quoted string
-yaml: |
-    "foo1": bar
-    'foo2': bar
-    "foo \" bar": bar
-    'foo '' bar': bar
-    'foo3: ': bar
-    "foo4: ": bar
-    foo5: { "foo \" bar: ": bar, 'foo '' bar: ': bar }
-php: |
-    array(
-      'foo1' => 'bar',
-      'foo2' => 'bar',
-      'foo " bar' => 'bar',
-      'foo \' bar' => 'bar',
-      'foo3: ' => 'bar',
-      'foo4: ' => 'bar',
-      'foo5' => array(
-        'foo " bar: ' => 'bar',
-        'foo \' bar: ' => 'bar',
-      ),
-    )
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/sfTests.yml b/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/sfTests.yml
deleted file mode 100644
index a427be1c84..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/sfTests.yml
+++ /dev/null
@@ -1,149 +0,0 @@
---- %YAML:1.0
-test: Multiple quoted string on one line
-brief: >
-    Multiple quoted string on one line
-yaml: |
-    stripped_title: { name: "foo bar", help: "bar foo" }
-php: |
-    array('stripped_title' => array('name' => 'foo bar', 'help' => 'bar foo'))
----
-test: Empty sequence
-yaml: |
-    foo: [ ]
-php: |
-    array('foo' => array())
----
-test: Empty value
-yaml: |
-    foo:
-php: |
-    array('foo' => null)
----
-test: Inline string parsing
-brief: >
-    Inline string parsing
-yaml: |
-    test: ['complex: string', 'another [string]']
-php: |
-    array('test' => array('complex: string', 'another [string]'))
----
-test: Boolean
-brief: >
-    Boolean
-yaml: |
-    - false
-    - true
-    - null
-    - ~
-    - 'false'
-    - 'true'
-    - 'null'
-    - '~'
-php: |
-    array(
-      false,
-      true,
-      null,
-      null,
-      'false',
-      'true',
-      'null',
-      '~',
-    )
----
-test: Empty lines in literal blocks
-brief: >
-  Empty lines in literal blocks
-yaml: |
-  foo:
-    bar: |
-      foo
-
-
-        
-      bar
-php: |
-  array('foo' => array('bar' => "foo\n\n\n  \nbar\n"))
----
-test: Empty lines in folded blocks
-brief: >
-  Empty lines in folded blocks
-yaml: |
-  foo:
-    bar: >
-
-      foo
-
-      
-      bar
-php: |
-  array('foo' => array('bar' => "\nfoo\n\nbar\n"))
----
-test: IP addresses
-brief: >
-  IP addresses
-yaml: |
-  foo: 10.0.0.2
-php: |
-  array('foo' => '10.0.0.2')
----
-test: A sequence with an embedded mapping
-brief: >
-  A sequence with an embedded mapping
-yaml: |
-  - foo
-  - bar: { bar: foo }
-php: |
-  array('foo', array('bar' => array('bar' => 'foo')))
----
-test: A sequence with an unordered array
-brief: >
-  A sequence with an unordered array
-yaml: |
-  1: foo
-  0: bar
-php: |
-  array(1 => 'foo', 0 => 'bar')
----
-test: Octal
-brief: as in spec example 2.19, octal value is converted
-yaml: |
-  foo: 0123
-php: |
-  array('foo' => 83)
----
-test: Octal strings
-brief: Octal notation in a string must remain a string
-yaml: |
-  foo: "0123"
-php: |
-  array('foo' => '0123')
----
-test: Octal strings
-brief: Octal notation in a string must remain a string
-yaml: |
-  foo: '0123'
-php: |
-  array('foo' => '0123')
----
-test: Octal strings
-brief: Octal notation in a string must remain a string
-yaml: |
-  foo: |
-    0123
-php: |
-  array('foo' => "0123\n")
----
-test: Document as a simple hash
-brief: Document as a simple hash
-yaml: |
-  { foo: bar }
-php: |
-  array('foo' => 'bar')
----
-test: Document as a simple array
-brief: Document as a simple array
-yaml: |
-  [ foo, bar ]
-php: |
-  array('foo', 'bar')
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/unindentedCollections.yml b/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/unindentedCollections.yml
deleted file mode 100644
index 0c96108e99..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/Fixtures/unindentedCollections.yml
+++ /dev/null
@@ -1,82 +0,0 @@
---- %YAML:1.0
-test: Unindented collection
-brief: >
-    Unindented collection
-yaml: |
-    collection:
-    - item1
-    - item2
-    - item3
-php: |
-    array('collection' => array('item1', 'item2', 'item3'))
----
-test: Nested unindented collection (two levels)
-brief: >
-    Nested unindented collection
-yaml: |
-    collection:
-        key:
-        - a
-        - b
-        - c
-php: |
-    array('collection' => array('key' => array('a', 'b', 'c')))
----
-test: Nested unindented collection (three levels)
-brief: >
-    Nested unindented collection
-yaml: |
-    collection:
-        key:
-            subkey:
-            - one
-            - two
-            - three
-php: |
-    array('collection' => array('key' => array('subkey' => array('one', 'two', 'three'))))
----
-test: Key/value after unindented collection (1)
-brief: >
-    Key/value after unindented collection (1)
-yaml: |
-    collection:
-        key:
-        - a
-        - b
-        - c
-    foo: bar
-php: |
-    array('collection' => array('key' => array('a', 'b', 'c')), 'foo' => 'bar')
----
-test: Key/value after unindented collection (at the same level)
-brief: >
-    Key/value after unindented collection
-yaml: |
-    collection:
-        key:
-        - a
-        - b
-        - c
-        foo: bar
-php: |
-    array('collection' => array('key' => array('a', 'b', 'c'), 'foo' => 'bar'))
----
-test: Shortcut Key after unindented collection
-brief: >
-    Key/value after unindented collection
-yaml: |
-    collection:
-    - key: foo
-      foo: bar
-php: |
-    array('collection' => array(array('key' => 'foo', 'foo' => 'bar')))
----
-test: Shortcut Key after unindented collection with custom spaces
-brief: >
-    Key/value after unindented collection
-yaml: |
-    collection:
-    -  key: foo
-       foo: bar
-php: |
-    array('collection' => array(array('key' => 'foo', 'foo' => 'bar')))
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/InlineTest.php b/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/InlineTest.php
deleted file mode 100644
index ebcd5e36ac..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/InlineTest.php
+++ /dev/null
@@ -1,602 +0,0 @@
-<?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\Tests;
-
-use Symfony\Bridge\PhpUnit\ErrorAssert;
-use Symfony\Component\Yaml\Inline;
-use Symfony\Component\Yaml\Yaml;
-
-class InlineTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @dataProvider getTestsForParse
-     */
-    public function testParse($yaml, $value)
-    {
-        $this->assertSame($value, Inline::parse($yaml), sprintf('::parse() converts an inline YAML to a PHP structure (%s)', $yaml));
-    }
-
-    /**
-     * @dataProvider getTestsForParseWithMapObjects
-     */
-    public function testParseWithMapObjects($yaml, $value)
-    {
-        $actual = Inline::parse($yaml, Yaml::PARSE_OBJECT_FOR_MAP);
-
-        $this->assertSame(serialize($value), serialize($actual));
-    }
-
-    /**
-     * @group legacy
-     * @dataProvider getTestsForParseWithMapObjects
-     */
-    public function testParseWithMapObjectsPassingTrue($yaml, $value)
-    {
-        $actual = Inline::parse($yaml, false, false, true);
-
-        $this->assertSame(serialize($value), serialize($actual));
-    }
-
-    /**
-     * @dataProvider getTestsForDump
-     */
-    public function testDump($yaml, $value)
-    {
-        $this->assertEquals($yaml, Inline::dump($value), sprintf('::dump() converts a PHP structure to an inline YAML (%s)', $yaml));
-
-        $this->assertSame($value, Inline::parse(Inline::dump($value)), 'check consistency');
-    }
-
-    public function testDumpNumericValueWithLocale()
-    {
-        $locale = setlocale(LC_NUMERIC, 0);
-        if (false === $locale) {
-            $this->markTestSkipped('Your platform does not support locales.');
-        }
-
-        try {
-            $requiredLocales = array('fr_FR.UTF-8', 'fr_FR.UTF8', 'fr_FR.utf-8', 'fr_FR.utf8', 'French_France.1252');
-            if (false === setlocale(LC_NUMERIC, $requiredLocales)) {
-                $this->markTestSkipped('Could not set any of required locales: '.implode(', ', $requiredLocales));
-            }
-
-            $this->assertEquals('1.2', Inline::dump(1.2));
-            $this->assertContains('fr', strtolower(setlocale(LC_NUMERIC, 0)));
-            setlocale(LC_NUMERIC, $locale);
-        } catch (\Exception $e) {
-            setlocale(LC_NUMERIC, $locale);
-            throw $e;
-        }
-    }
-
-    public function testHashStringsResemblingExponentialNumericsShouldNotBeChangedToINF()
-    {
-        $value = '686e444';
-
-        $this->assertSame($value, Inline::parse(Inline::dump($value)));
-    }
-
-    /**
-     * @expectedException        \Symfony\Component\Yaml\Exception\ParseException
-     * @expectedExceptionMessage Found unknown escape character "\V".
-     */
-    public function testParseScalarWithNonEscapedBlackslashShouldThrowException()
-    {
-        Inline::parse('"Foo\Var"');
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     */
-    public function testParseScalarWithNonEscapedBlackslashAtTheEndShouldThrowException()
-    {
-        Inline::parse('"Foo\\"');
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     */
-    public function testParseScalarWithIncorrectlyQuotedStringShouldThrowException()
-    {
-        $value = "'don't do somthin' like that'";
-        Inline::parse($value);
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     */
-    public function testParseScalarWithIncorrectlyDoubleQuotedStringShouldThrowException()
-    {
-        $value = '"don"t do somthin" like that"';
-        Inline::parse($value);
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     */
-    public function testParseInvalidMappingKeyShouldThrowException()
-    {
-        $value = '{ "foo " bar": "bar" }';
-        Inline::parse($value);
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     */
-    public function testParseInvalidMappingShouldThrowException()
-    {
-        Inline::parse('[foo] bar');
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     */
-    public function testParseInvalidSequenceShouldThrowException()
-    {
-        Inline::parse('{ foo: bar } bar');
-    }
-
-    public function testParseScalarWithCorrectlyQuotedStringShouldReturnString()
-    {
-        $value = "'don''t do somthin'' like that'";
-        $expect = "don't do somthin' like that";
-
-        $this->assertSame($expect, Inline::parseScalar($value));
-    }
-
-    /**
-     * @dataProvider getDataForParseReferences
-     */
-    public function testParseReferences($yaml, $expected)
-    {
-        $this->assertSame($expected, Inline::parse($yaml, 0, array('var' => 'var-value')));
-    }
-
-    /**
-     * @group legacy
-     * @dataProvider getDataForParseReferences
-     */
-    public function testParseReferencesAsFifthArgument($yaml, $expected)
-    {
-        $this->assertSame($expected, Inline::parse($yaml, false, false, false, array('var' => 'var-value')));
-    }
-
-    public function getDataForParseReferences()
-    {
-        return array(
-            'scalar' => array('*var', 'var-value'),
-            'list' => array('[ *var ]', array('var-value')),
-            'list-in-list' => array('[[ *var ]]', array(array('var-value'))),
-            'map-in-list' => array('[ { key: *var } ]', array(array('key' => 'var-value'))),
-            'embedded-mapping-in-list' => array('[ key: *var ]', array(array('key' => 'var-value'))),
-            'map' => array('{ key: *var }', array('key' => 'var-value')),
-            'list-in-map' => array('{ key: [*var] }', array('key' => array('var-value'))),
-            'map-in-map' => array('{ foo: { bar: *var } }', array('foo' => array('bar' => 'var-value'))),
-        );
-    }
-
-    public function testParseMapReferenceInSequence()
-    {
-        $foo = array(
-            'a' => 'Steve',
-            'b' => 'Clark',
-            'c' => 'Brian',
-        );
-        $this->assertSame(array($foo), Inline::parse('[*foo]', 0, array('foo' => $foo)));
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testParseMapReferenceInSequenceAsFifthArgument()
-    {
-        $foo = array(
-            'a' => 'Steve',
-            'b' => 'Clark',
-            'c' => 'Brian',
-        );
-        $this->assertSame(array($foo), Inline::parse('[*foo]', false, false, false, array('foo' => $foo)));
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     * @expectedExceptionMessage A reference must contain at least one character.
-     */
-    public function testParseUnquotedAsterisk()
-    {
-        Inline::parse('{ foo: * }');
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     * @expectedExceptionMessage A reference must contain at least one character.
-     */
-    public function testParseUnquotedAsteriskFollowedByAComment()
-    {
-        Inline::parse('{ foo: * #foo }');
-    }
-
-    /**
-     * @dataProvider getReservedIndicators
-     * @expectedException Symfony\Component\Yaml\Exception\ParseException
-     * @expectedExceptionMessage cannot start a plain scalar; you need to quote the scalar.
-     */
-    public function testParseUnquotedScalarStartingWithReservedIndicator($indicator)
-    {
-        Inline::parse(sprintf('{ foo: %sfoo }', $indicator));
-    }
-
-    public function getReservedIndicators()
-    {
-        return array(array('@'), array('`'));
-    }
-
-    /**
-     * @dataProvider getScalarIndicators
-     * @expectedException Symfony\Component\Yaml\Exception\ParseException
-     * @expectedExceptionMessage cannot start a plain scalar; you need to quote the scalar.
-     */
-    public function testParseUnquotedScalarStartingWithScalarIndicator($indicator)
-    {
-        Inline::parse(sprintf('{ foo: %sfoo }', $indicator));
-    }
-
-    public function getScalarIndicators()
-    {
-        return array(array('|'), array('>'));
-    }
-
-    /**
-     * @group legacy
-     * throws \Symfony\Component\Yaml\Exception\ParseException in 4.0
-     */
-    public function testParseUnquotedScalarStartingWithPercentCharacter()
-    {
-        ErrorAssert::assertDeprecationsAreTriggered('Not quoting a scalar starting with the "%" indicator character is deprecated since Symfony 3.1 and will throw a ParseException in 4.0.', function () {
-            Inline::parse('{ foo: %foo }');
-        });
-    }
-
-    /**
-     * @dataProvider getDataForIsHash
-     */
-    public function testIsHash($array, $expected)
-    {
-        $this->assertSame($expected, Inline::isHash($array));
-    }
-
-    public function getDataForIsHash()
-    {
-        return array(
-            array(array(), false),
-            array(array(1, 2, 3), false),
-            array(array(2 => 1, 1 => 2, 0 => 3), true),
-            array(array('foo' => 1, 'bar' => 2), true),
-        );
-    }
-
-    public function getTestsForParse()
-    {
-        return array(
-            array('', ''),
-            array('null', null),
-            array('false', false),
-            array('true', true),
-            array('12', 12),
-            array('-12', -12),
-            array('"quoted string"', 'quoted string'),
-            array("'quoted string'", 'quoted string'),
-            array('12.30e+02', 12.30e+02),
-            array('0x4D2', 0x4D2),
-            array('02333', 02333),
-            array('.Inf', -log(0)),
-            array('-.Inf', log(0)),
-            array("'686e444'", '686e444'),
-            array('686e444', 646e444),
-            array('123456789123456789123456789123456789', '123456789123456789123456789123456789'),
-            array('"foo\r\nbar"', "foo\r\nbar"),
-            array("'foo#bar'", 'foo#bar'),
-            array("'foo # bar'", 'foo # bar'),
-            array("'#cfcfcf'", '#cfcfcf'),
-            array('::form_base.html.twig', '::form_base.html.twig'),
-
-            // Pre-YAML-1.2 booleans
-            array("'y'", 'y'),
-            array("'n'", 'n'),
-            array("'yes'", 'yes'),
-            array("'no'", 'no'),
-            array("'on'", 'on'),
-            array("'off'", 'off'),
-
-            array('2007-10-30', gmmktime(0, 0, 0, 10, 30, 2007)),
-            array('2007-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 2007)),
-            array('2007-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 2007)),
-            array('1960-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 1960)),
-            array('1730-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 1730)),
-
-            array('"a \\"string\\" with \'quoted strings inside\'"', 'a "string" with \'quoted strings inside\''),
-            array("'a \"string\" with ''quoted strings inside'''", 'a "string" with \'quoted strings inside\''),
-
-            // sequences
-            // urls are no key value mapping. see #3609. Valid yaml "key: value" mappings require a space after the colon
-            array('[foo, http://urls.are/no/mappings, false, null, 12]', array('foo', 'http://urls.are/no/mappings', false, null, 12)),
-            array('[  foo  ,   bar , false  ,  null     ,  12  ]', array('foo', 'bar', false, null, 12)),
-            array('[\'foo,bar\', \'foo bar\']', array('foo,bar', 'foo bar')),
-
-            // mappings
-            array('{foo:bar,bar:foo,false:false,null:null,integer:12}', array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12)),
-            array('{ foo  : bar, bar : foo,  false  :   false,  null  :   null,  integer :  12  }', array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12)),
-            array('{foo: \'bar\', bar: \'foo: bar\'}', array('foo' => 'bar', 'bar' => 'foo: bar')),
-            array('{\'foo\': \'bar\', "bar": \'foo: bar\'}', array('foo' => 'bar', 'bar' => 'foo: bar')),
-            array('{\'foo\'\'\': \'bar\', "bar\"": \'foo: bar\'}', array('foo\'' => 'bar', 'bar"' => 'foo: bar')),
-            array('{\'foo: \': \'bar\', "bar: ": \'foo: bar\'}', array('foo: ' => 'bar', 'bar: ' => 'foo: bar')),
-
-            // nested sequences and mappings
-            array('[foo, [bar, foo]]', array('foo', array('bar', 'foo'))),
-            array('[foo, {bar: foo}]', array('foo', array('bar' => 'foo'))),
-            array('{ foo: {bar: foo} }', array('foo' => array('bar' => 'foo'))),
-            array('{ foo: [bar, foo] }', array('foo' => array('bar', 'foo'))),
-
-            array('[  foo, [  bar, foo  ]  ]', array('foo', array('bar', 'foo'))),
-
-            array('[{ foo: {bar: foo} }]', array(array('foo' => array('bar' => 'foo')))),
-
-            array('[foo, [bar, [foo, [bar, foo]], foo]]', array('foo', array('bar', array('foo', array('bar', 'foo')), 'foo'))),
-
-            array('[foo, {bar: foo, foo: [foo, {bar: foo}]}, [foo, {bar: foo}]]', array('foo', array('bar' => 'foo', 'foo' => array('foo', array('bar' => 'foo'))), array('foo', array('bar' => 'foo')))),
-
-            array('[foo, bar: { foo: bar }]', array('foo', '1' => array('bar' => array('foo' => 'bar')))),
-            array('[foo, \'@foo.baz\', { \'%foo%\': \'foo is %foo%\', bar: \'%foo%\' }, true, \'@service_container\']', array('foo', '@foo.baz', array('%foo%' => 'foo is %foo%', 'bar' => '%foo%'), true, '@service_container')),
-        );
-    }
-
-    public function getTestsForParseWithMapObjects()
-    {
-        return array(
-            array('', ''),
-            array('null', null),
-            array('false', false),
-            array('true', true),
-            array('12', 12),
-            array('-12', -12),
-            array('"quoted string"', 'quoted string'),
-            array("'quoted string'", 'quoted string'),
-            array('12.30e+02', 12.30e+02),
-            array('0x4D2', 0x4D2),
-            array('02333', 02333),
-            array('.Inf', -log(0)),
-            array('-.Inf', log(0)),
-            array("'686e444'", '686e444'),
-            array('686e444', 646e444),
-            array('123456789123456789123456789123456789', '123456789123456789123456789123456789'),
-            array('"foo\r\nbar"', "foo\r\nbar"),
-            array("'foo#bar'", 'foo#bar'),
-            array("'foo # bar'", 'foo # bar'),
-            array("'#cfcfcf'", '#cfcfcf'),
-            array('::form_base.html.twig', '::form_base.html.twig'),
-
-            array('2007-10-30', gmmktime(0, 0, 0, 10, 30, 2007)),
-            array('2007-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 2007)),
-            array('2007-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 2007)),
-            array('1960-10-30 02:59:43 Z', gmmktime(2, 59, 43, 10, 30, 1960)),
-            array('1730-10-30T02:59:43Z', gmmktime(2, 59, 43, 10, 30, 1730)),
-
-            array('"a \\"string\\" with \'quoted strings inside\'"', 'a "string" with \'quoted strings inside\''),
-            array("'a \"string\" with ''quoted strings inside'''", 'a "string" with \'quoted strings inside\''),
-
-            // sequences
-            // urls are no key value mapping. see #3609. Valid yaml "key: value" mappings require a space after the colon
-            array('[foo, http://urls.are/no/mappings, false, null, 12]', array('foo', 'http://urls.are/no/mappings', false, null, 12)),
-            array('[  foo  ,   bar , false  ,  null     ,  12  ]', array('foo', 'bar', false, null, 12)),
-            array('[\'foo,bar\', \'foo bar\']', array('foo,bar', 'foo bar')),
-
-            // mappings
-            array('{foo:bar,bar:foo,false:false,null:null,integer:12}', (object) array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12)),
-            array('{ foo  : bar, bar : foo,  false  :   false,  null  :   null,  integer :  12  }', (object) array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12)),
-            array('{foo: \'bar\', bar: \'foo: bar\'}', (object) array('foo' => 'bar', 'bar' => 'foo: bar')),
-            array('{\'foo\': \'bar\', "bar": \'foo: bar\'}', (object) array('foo' => 'bar', 'bar' => 'foo: bar')),
-            array('{\'foo\'\'\': \'bar\', "bar\"": \'foo: bar\'}', (object) array('foo\'' => 'bar', 'bar"' => 'foo: bar')),
-            array('{\'foo: \': \'bar\', "bar: ": \'foo: bar\'}', (object) array('foo: ' => 'bar', 'bar: ' => 'foo: bar')),
-
-            // nested sequences and mappings
-            array('[foo, [bar, foo]]', array('foo', array('bar', 'foo'))),
-            array('[foo, {bar: foo}]', array('foo', (object) array('bar' => 'foo'))),
-            array('{ foo: {bar: foo} }', (object) array('foo' => (object) array('bar' => 'foo'))),
-            array('{ foo: [bar, foo] }', (object) array('foo' => array('bar', 'foo'))),
-
-            array('[  foo, [  bar, foo  ]  ]', array('foo', array('bar', 'foo'))),
-
-            array('[{ foo: {bar: foo} }]', array((object) array('foo' => (object) array('bar' => 'foo')))),
-
-            array('[foo, [bar, [foo, [bar, foo]], foo]]', array('foo', array('bar', array('foo', array('bar', 'foo')), 'foo'))),
-
-            array('[foo, {bar: foo, foo: [foo, {bar: foo}]}, [foo, {bar: foo}]]', array('foo', (object) array('bar' => 'foo', 'foo' => array('foo', (object) array('bar' => 'foo'))), array('foo', (object) array('bar' => 'foo')))),
-
-            array('[foo, bar: { foo: bar }]', array('foo', '1' => (object) array('bar' => (object) array('foo' => 'bar')))),
-            array('[foo, \'@foo.baz\', { \'%foo%\': \'foo is %foo%\', bar: \'%foo%\' }, true, \'@service_container\']', array('foo', '@foo.baz', (object) array('%foo%' => 'foo is %foo%', 'bar' => '%foo%'), true, '@service_container')),
-
-            array('{}', new \stdClass()),
-            array('{ foo  : bar, bar : {}  }', (object) array('foo' => 'bar', 'bar' => new \stdClass())),
-            array('{ foo  : [], bar : {}  }', (object) array('foo' => array(), 'bar' => new \stdClass())),
-            array('{foo: \'bar\', bar: {} }', (object) array('foo' => 'bar', 'bar' => new \stdClass())),
-            array('{\'foo\': \'bar\', "bar": {}}', (object) array('foo' => 'bar', 'bar' => new \stdClass())),
-            array('{\'foo\': \'bar\', "bar": \'{}\'}', (object) array('foo' => 'bar', 'bar' => '{}')),
-
-            array('[foo, [{}, {}]]', array('foo', array(new \stdClass(), new \stdClass()))),
-            array('[foo, [[], {}]]', array('foo', array(array(), new \stdClass()))),
-            array('[foo, [[{}, {}], {}]]', array('foo', array(array(new \stdClass(), new \stdClass()), new \stdClass()))),
-            array('[foo, {bar: {}}]', array('foo', '1' => (object) array('bar' => new \stdClass()))),
-        );
-    }
-
-    public function getTestsForDump()
-    {
-        return array(
-            array('null', null),
-            array('false', false),
-            array('true', true),
-            array('12', 12),
-            array("'quoted string'", 'quoted string'),
-            array('!!float 1230', 12.30e+02),
-            array('1234', 0x4D2),
-            array('1243', 02333),
-            array('.Inf', -log(0)),
-            array('-.Inf', log(0)),
-            array("'686e444'", '686e444'),
-            array('"foo\r\nbar"', "foo\r\nbar"),
-            array("'foo#bar'", 'foo#bar'),
-            array("'foo # bar'", 'foo # bar'),
-            array("'#cfcfcf'", '#cfcfcf'),
-
-            array("'a \"string\" with ''quoted strings inside'''", 'a "string" with \'quoted strings inside\''),
-
-            array("'-dash'", '-dash'),
-            array("'-'", '-'),
-
-            // Pre-YAML-1.2 booleans
-            array("'y'", 'y'),
-            array("'n'", 'n'),
-            array("'yes'", 'yes'),
-            array("'no'", 'no'),
-            array("'on'", 'on'),
-            array("'off'", 'off'),
-
-            // sequences
-            array('[foo, bar, false, null, 12]', array('foo', 'bar', false, null, 12)),
-            array('[\'foo,bar\', \'foo bar\']', array('foo,bar', 'foo bar')),
-
-            // mappings
-            array('{ foo: bar, bar: foo, \'false\': false, \'null\': null, integer: 12 }', array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12)),
-            array('{ foo: bar, bar: \'foo: bar\' }', array('foo' => 'bar', 'bar' => 'foo: bar')),
-
-            // nested sequences and mappings
-            array('[foo, [bar, foo]]', array('foo', array('bar', 'foo'))),
-
-            array('[foo, [bar, [foo, [bar, foo]], foo]]', array('foo', array('bar', array('foo', array('bar', 'foo')), 'foo'))),
-
-            array('{ foo: { bar: foo } }', array('foo' => array('bar' => 'foo'))),
-
-            array('[foo, { bar: foo }]', array('foo', array('bar' => 'foo'))),
-
-            array('[foo, { bar: foo, foo: [foo, { bar: foo }] }, [foo, { bar: foo }]]', array('foo', array('bar' => 'foo', 'foo' => array('foo', array('bar' => 'foo'))), array('foo', array('bar' => 'foo')))),
-
-            array('[foo, \'@foo.baz\', { \'%foo%\': \'foo is %foo%\', bar: \'%foo%\' }, true, \'@service_container\']', array('foo', '@foo.baz', array('%foo%' => 'foo is %foo%', 'bar' => '%foo%'), true, '@service_container')),
-
-            array('{ foo: { bar: { 1: 2, baz: 3 } } }', array('foo' => array('bar' => array(1 => 2, 'baz' => 3)))),
-        );
-    }
-
-    /**
-     * @dataProvider getTimestampTests
-     */
-    public function testParseTimestampAsUnixTimestampByDefault($yaml, $year, $month, $day, $hour, $minute, $second)
-    {
-        $this->assertSame(gmmktime($hour, $minute, $second, $month, $day, $year), Inline::parse($yaml));
-    }
-
-    /**
-     * @dataProvider getTimestampTests
-     */
-    public function testParseTimestampAsDateTimeObject($yaml, $year, $month, $day, $hour, $minute, $second)
-    {
-        $expected = new \DateTime($yaml);
-        $expected->setTimeZone(new \DateTimeZone('UTC'));
-        $expected->setDate($year, $month, $day);
-        $expected->setTime($hour, $minute, $second);
-
-        $this->assertEquals($expected, Inline::parse($yaml, Yaml::PARSE_DATETIME));
-    }
-
-    public function getTimestampTests()
-    {
-        return array(
-            'canonical' => array('2001-12-15T02:59:43.1Z', 2001, 12, 15, 2, 59, 43),
-            'ISO-8601' => array('2001-12-15t21:59:43.10-05:00', 2001, 12, 16, 2, 59, 43),
-            'spaced' => array('2001-12-15 21:59:43.10 -5', 2001, 12, 16, 2, 59, 43),
-            'date' => array('2001-12-15', 2001, 12, 15, 0, 0, 0),
-        );
-    }
-
-    /**
-     * @dataProvider getTimestampTests
-     */
-    public function testParseNestedTimestampListAsDateTimeObject($yaml, $year, $month, $day, $hour, $minute, $second)
-    {
-        $expected = new \DateTime($yaml);
-        $expected->setTimeZone(new \DateTimeZone('UTC'));
-        $expected->setDate($year, $month, $day);
-        $expected->setTime($hour, $minute, $second);
-
-        $expectedNested = array('nested' => array($expected));
-        $yamlNested = "{nested: [$yaml]}";
-
-        $this->assertEquals($expectedNested, Inline::parse($yamlNested, Yaml::PARSE_DATETIME));
-    }
-
-    /**
-     * @dataProvider getDateTimeDumpTests
-     */
-    public function testDumpDateTime($dateTime, $expected)
-    {
-        $this->assertSame($expected, Inline::dump($dateTime));
-    }
-
-    public function getDateTimeDumpTests()
-    {
-        $tests = array();
-
-        $dateTime = new \DateTime('2001-12-15 21:59:43', new \DateTimeZone('UTC'));
-        $tests['date-time-utc'] = array($dateTime, '2001-12-15T21:59:43+00:00');
-
-        $dateTime = new \DateTimeImmutable('2001-07-15 21:59:43', new \DateTimeZone('Europe/Berlin'));
-        $tests['immutable-date-time-europe-berlin'] = array($dateTime, '2001-07-15T21:59:43+02:00');
-
-        return $tests;
-    }
-
-    /**
-     * @dataProvider getBinaryData
-     */
-    public function testParseBinaryData($data)
-    {
-        $this->assertSame('Hello world', Inline::parse($data));
-    }
-
-    public function getBinaryData()
-    {
-        return array(
-            'enclosed with double quotes' => array('!!binary "SGVsbG8gd29ybGQ="'),
-            'enclosed with single quotes' => array("!!binary 'SGVsbG8gd29ybGQ='"),
-            'containing spaces' => array('!!binary  "SGVs bG8gd 29ybGQ="'),
-        );
-    }
-
-    /**
-     * @dataProvider getInvalidBinaryData
-     */
-    public function testParseInvalidBinaryData($data, $expectedMessage)
-    {
-        $this->setExpectedExceptionRegExp('\Symfony\Component\Yaml\Exception\ParseException', $expectedMessage);
-
-        Inline::parse($data);
-    }
-
-    public function getInvalidBinaryData()
-    {
-        return array(
-            'length not a multiple of four' => array('!!binary "SGVsbG8d29ybGQ="', '/The normalized base64 encoded data \(data without whitespace characters\) length must be a multiple of four \(\d+ bytes given\)/'),
-            'invalid characters' => array('!!binary "SGVsbG8#d29ybGQ="', '/The base64 encoded data \(.*\) contains invalid characters/'),
-            'too many equals characters' => array('!!binary "SGVsbG8gd29yb==="', '/The base64 encoded data \(.*\) contains invalid characters/'),
-            'misplaced equals character' => array('!!binary "SGVsbG8gd29ybG=Q"', '/The base64 encoded data \(.*\) contains invalid characters/'),
-        );
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/ParseExceptionTest.php b/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/ParseExceptionTest.php
deleted file mode 100644
index 7286d45a09..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/ParseExceptionTest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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\Tests;
-
-use Symfony\Component\Yaml\Exception\ParseException;
-
-class ParseExceptionTest extends \PHPUnit_Framework_TestCase
-{
-    public function testGetMessage()
-    {
-        $exception = new ParseException('Error message', 42, 'foo: bar', '/var/www/app/config.yml');
-        $message = 'Error message in "/var/www/app/config.yml" at line 42 (near "foo: bar")';
-
-        $this->assertEquals($message, $exception->getMessage());
-    }
-
-    public function testGetMessageWithUnicodeInFilename()
-    {
-        $exception = new ParseException('Error message', 42, 'foo: bar', 'äöü.yml');
-        $message = 'Error message in "äöü.yml" at line 42 (near "foo: bar")';
-
-        $this->assertEquals($message, $exception->getMessage());
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/ParserTest.php b/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/ParserTest.php
deleted file mode 100644
index c2f4891d46..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/ParserTest.php
+++ /dev/null
@@ -1,1338 +0,0 @@
-<?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\Tests;
-
-use Symfony\Component\Yaml\Yaml;
-use Symfony\Component\Yaml\Parser;
-
-class ParserTest extends \PHPUnit_Framework_TestCase
-{
-    protected $parser;
-
-    protected function setUp()
-    {
-        $this->parser = new Parser();
-    }
-
-    protected function tearDown()
-    {
-        $this->parser = null;
-    }
-
-    /**
-     * @dataProvider getDataFormSpecifications
-     */
-    public function testSpecifications($file, $expected, $yaml, $comment)
-    {
-        $this->assertEquals($expected, var_export($this->parser->parse($yaml), true), $comment);
-    }
-
-    public function getDataFormSpecifications()
-    {
-        $parser = new Parser();
-        $path = __DIR__.'/Fixtures';
-
-        $tests = array();
-        $files = $parser->parse(file_get_contents($path.'/index.yml'));
-        foreach ($files as $file) {
-            $yamls = file_get_contents($path.'/'.$file.'.yml');
-
-            // split YAMLs documents
-            foreach (preg_split('/^---( %YAML\:1\.0)?/m', $yamls) as $yaml) {
-                if (!$yaml) {
-                    continue;
-                }
-
-                $test = $parser->parse($yaml);
-                if (isset($test['todo']) && $test['todo']) {
-                    // TODO
-                } else {
-                    eval('$expected = '.trim($test['php']).';');
-
-                    $tests[] = array($file, var_export($expected, true), $test['yaml'], $test['test']);
-                }
-            }
-        }
-
-        return $tests;
-    }
-
-    public function testTabsInYaml()
-    {
-        // test tabs in YAML
-        $yamls = array(
-            "foo:\n	bar",
-            "foo:\n 	bar",
-            "foo:\n	 bar",
-            "foo:\n 	 bar",
-        );
-
-        foreach ($yamls as $yaml) {
-            try {
-                $content = $this->parser->parse($yaml);
-
-                $this->fail('YAML files must not contain tabs');
-            } catch (\Exception $e) {
-                $this->assertInstanceOf('\Exception', $e, 'YAML files must not contain tabs');
-                $this->assertEquals('A YAML file cannot contain tabs as indentation at line 2 (near "'.strpbrk($yaml, "\t").'").', $e->getMessage(), 'YAML files must not contain tabs');
-            }
-        }
-    }
-
-    public function testEndOfTheDocumentMarker()
-    {
-        $yaml = <<<'EOF'
---- %YAML:1.0
-foo
-...
-EOF;
-
-        $this->assertEquals('foo', $this->parser->parse($yaml));
-    }
-
-    public function getBlockChompingTests()
-    {
-        $tests = array();
-
-        $yaml = <<<'EOF'
-foo: |-
-    one
-    two
-bar: |-
-    one
-    two
-
-EOF;
-        $expected = array(
-            'foo' => "one\ntwo",
-            'bar' => "one\ntwo",
-        );
-        $tests['Literal block chomping strip with single trailing newline'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: |-
-    one
-    two
-
-bar: |-
-    one
-    two
-
-
-EOF;
-        $expected = array(
-            'foo' => "one\ntwo",
-            'bar' => "one\ntwo",
-        );
-        $tests['Literal block chomping strip with multiple trailing newlines'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-{}
-
-
-EOF;
-        $expected = array();
-        $tests['Literal block chomping strip with multiple trailing newlines after a 1-liner'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: |-
-    one
-    two
-bar: |-
-    one
-    two
-EOF;
-        $expected = array(
-            'foo' => "one\ntwo",
-            'bar' => "one\ntwo",
-        );
-        $tests['Literal block chomping strip without trailing newline'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: |
-    one
-    two
-bar: |
-    one
-    two
-
-EOF;
-        $expected = array(
-            'foo' => "one\ntwo\n",
-            'bar' => "one\ntwo\n",
-        );
-        $tests['Literal block chomping clip with single trailing newline'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: |
-    one
-    two
-
-bar: |
-    one
-    two
-
-
-EOF;
-        $expected = array(
-            'foo' => "one\ntwo\n",
-            'bar' => "one\ntwo\n",
-        );
-        $tests['Literal block chomping clip with multiple trailing newlines'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: |
-    one
-    two
-bar: |
-    one
-    two
-EOF;
-        $expected = array(
-            'foo' => "one\ntwo\n",
-            'bar' => "one\ntwo",
-        );
-        $tests['Literal block chomping clip without trailing newline'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: |+
-    one
-    two
-bar: |+
-    one
-    two
-
-EOF;
-        $expected = array(
-            'foo' => "one\ntwo\n",
-            'bar' => "one\ntwo\n",
-        );
-        $tests['Literal block chomping keep with single trailing newline'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: |+
-    one
-    two
-
-bar: |+
-    one
-    two
-
-
-EOF;
-        $expected = array(
-            'foo' => "one\ntwo\n\n",
-            'bar' => "one\ntwo\n\n",
-        );
-        $tests['Literal block chomping keep with multiple trailing newlines'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: |+
-    one
-    two
-bar: |+
-    one
-    two
-EOF;
-        $expected = array(
-            'foo' => "one\ntwo\n",
-            'bar' => "one\ntwo",
-        );
-        $tests['Literal block chomping keep without trailing newline'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: >-
-    one
-    two
-bar: >-
-    one
-    two
-
-EOF;
-        $expected = array(
-            'foo' => 'one two',
-            'bar' => 'one two',
-        );
-        $tests['Folded block chomping strip with single trailing newline'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: >-
-    one
-    two
-
-bar: >-
-    one
-    two
-
-
-EOF;
-        $expected = array(
-            'foo' => 'one two',
-            'bar' => 'one two',
-        );
-        $tests['Folded block chomping strip with multiple trailing newlines'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: >-
-    one
-    two
-bar: >-
-    one
-    two
-EOF;
-        $expected = array(
-            'foo' => 'one two',
-            'bar' => 'one two',
-        );
-        $tests['Folded block chomping strip without trailing newline'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: >
-    one
-    two
-bar: >
-    one
-    two
-
-EOF;
-        $expected = array(
-            'foo' => "one two\n",
-            'bar' => "one two\n",
-        );
-        $tests['Folded block chomping clip with single trailing newline'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: >
-    one
-    two
-
-bar: >
-    one
-    two
-
-
-EOF;
-        $expected = array(
-            'foo' => "one two\n",
-            'bar' => "one two\n",
-        );
-        $tests['Folded block chomping clip with multiple trailing newlines'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: >
-    one
-    two
-bar: >
-    one
-    two
-EOF;
-        $expected = array(
-            'foo' => "one two\n",
-            'bar' => 'one two',
-        );
-        $tests['Folded block chomping clip without trailing newline'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: >+
-    one
-    two
-bar: >+
-    one
-    two
-
-EOF;
-        $expected = array(
-            'foo' => "one two\n",
-            'bar' => "one two\n",
-        );
-        $tests['Folded block chomping keep with single trailing newline'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: >+
-    one
-    two
-
-bar: >+
-    one
-    two
-
-
-EOF;
-        $expected = array(
-            'foo' => "one two\n\n",
-            'bar' => "one two\n\n",
-        );
-        $tests['Folded block chomping keep with multiple trailing newlines'] = array($expected, $yaml);
-
-        $yaml = <<<'EOF'
-foo: >+
-    one
-    two
-bar: >+
-    one
-    two
-EOF;
-        $expected = array(
-            'foo' => "one two\n",
-            'bar' => 'one two',
-        );
-        $tests['Folded block chomping keep without trailing newline'] = array($expected, $yaml);
-
-        return $tests;
-    }
-
-    /**
-     * @dataProvider getBlockChompingTests
-     */
-    public function testBlockChomping($expected, $yaml)
-    {
-        $this->assertSame($expected, $this->parser->parse($yaml));
-    }
-
-    /**
-     * Regression test for issue #7989.
-     *
-     * @see https://github.com/symfony/symfony/issues/7989
-     */
-    public function testBlockLiteralWithLeadingNewlines()
-    {
-        $yaml = <<<'EOF'
-foo: |-
-
-
-    bar
-
-EOF;
-        $expected = array(
-            'foo' => "\n\nbar",
-        );
-
-        $this->assertSame($expected, $this->parser->parse($yaml));
-    }
-
-    public function testObjectSupportEnabled()
-    {
-        $input = <<<EOF
-foo: !php/object:O:30:"Symfony\Component\Yaml\Tests\B":1:{s:1:"b";s:3:"foo";}
-bar: 1
-EOF;
-        $this->assertEquals(array('foo' => new B(), 'bar' => 1), $this->parser->parse($input, Yaml::PARSE_OBJECT), '->parse() is able to parse objects');
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testObjectSupportEnabledPassingTrue()
-    {
-        $input = <<<EOF
-foo: !php/object:O:30:"Symfony\Component\Yaml\Tests\B":1:{s:1:"b";s:3:"foo";}
-bar: 1
-EOF;
-        $this->assertEquals(array('foo' => new B(), 'bar' => 1), $this->parser->parse($input, false, true), '->parse() is able to parse objects');
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testObjectSupportEnabledWithDeprecatedTag()
-    {
-        $input = <<<EOF
-foo: !!php/object:O:30:"Symfony\Component\Yaml\Tests\B":1:{s:1:"b";s:3:"foo";}
-bar: 1
-EOF;
-        $this->assertEquals(array('foo' => new B(), 'bar' => 1), $this->parser->parse($input, Yaml::PARSE_OBJECT), '->parse() is able to parse objects');
-    }
-
-    /**
-     * @dataProvider invalidDumpedObjectProvider
-     */
-    public function testObjectSupportDisabledButNoExceptions($input)
-    {
-        $this->assertEquals(array('foo' => null, 'bar' => 1), $this->parser->parse($input), '->parse() does not parse objects');
-    }
-
-    /**
-     * @dataProvider getObjectForMapTests
-     */
-    public function testObjectForMap($yaml, $expected)
-    {
-        $this->assertEquals($expected, $this->parser->parse($yaml, Yaml::PARSE_OBJECT_FOR_MAP));
-    }
-
-    /**
-     * @group legacy
-     * @dataProvider getObjectForMapTests
-     */
-    public function testObjectForMapEnabledWithMappingUsingBooleanToggles($yaml, $expected)
-    {
-        $this->assertEquals($expected, $this->parser->parse($yaml, false, false, true));
-    }
-
-    public function getObjectForMapTests()
-    {
-        $tests = array();
-
-        $yaml = <<<EOF
-foo:
-    fiz: [cat]
-EOF;
-        $expected = new \stdClass();
-        $expected->foo = new \stdClass();
-        $expected->foo->fiz = array('cat');
-        $tests['mapping'] = array($yaml, $expected);
-
-        $yaml = '{ "foo": "bar", "fiz": "cat" }';
-        $expected = new \stdClass();
-        $expected->foo = 'bar';
-        $expected->fiz = 'cat';
-        $tests['inline-mapping'] = array($yaml, $expected);
-
-        $yaml = "foo: bar\nbaz: foobar";
-        $expected = new \stdClass();
-        $expected->foo = 'bar';
-        $expected->baz = 'foobar';
-        $tests['object-for-map-is-applied-after-parsing'] = array($yaml, $expected);
-
-        $yaml = <<<EOT
-array:
-  - key: one
-  - key: two
-EOT;
-        $expected = new \stdClass();
-        $expected->array = array();
-        $expected->array[0] = new \stdClass();
-        $expected->array[0]->key = 'one';
-        $expected->array[1] = new \stdClass();
-        $expected->array[1]->key = 'two';
-        $tests['nest-map-and-sequence'] = array($yaml, $expected);
-
-        $yaml = <<<YAML
-map:
-  1: one
-  2: two
-YAML;
-        $expected = new \stdClass();
-        $expected->map = new \stdClass();
-        $expected->map->{1} = 'one';
-        $expected->map->{2} = 'two';
-        $tests['numeric-keys'] = array($yaml, $expected);
-
-        $yaml = <<<YAML
-map:
-  0: one
-  1: two
-YAML;
-        $expected = new \stdClass();
-        $expected->map = new \stdClass();
-        $expected->map->{0} = 'one';
-        $expected->map->{1} = 'two';
-        $tests['zero-indexed-numeric-keys'] = array($yaml, $expected);
-
-        return $tests;
-    }
-
-    /**
-     * @dataProvider invalidDumpedObjectProvider
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     */
-    public function testObjectsSupportDisabledWithExceptions($yaml)
-    {
-        $this->parser->parse($yaml, Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE);
-    }
-
-    /**
-     * @group legacy
-     * @dataProvider invalidDumpedObjectProvider
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     */
-    public function testObjectsSupportDisabledWithExceptionsUsingBooleanToggles($yaml)
-    {
-        $this->parser->parse($yaml, true);
-    }
-
-    public function invalidDumpedObjectProvider()
-    {
-        $yamlTag = <<<EOF
-foo: !!php/object:O:30:"Symfony\Tests\Component\Yaml\B":1:{s:1:"b";s:3:"foo";}
-bar: 1
-EOF;
-        $localTag = <<<EOF
-foo: !php/object:O:30:"Symfony\Tests\Component\Yaml\B":1:{s:1:"b";s:3:"foo";}
-bar: 1
-EOF;
-
-        return array(
-            'yaml-tag' => array($yamlTag),
-            'local-tag' => array($localTag),
-        );
-    }
-
-    /**
-     * @requires extension iconv
-     */
-    public function testNonUtf8Exception()
-    {
-        $yamls = array(
-            iconv('UTF-8', 'ISO-8859-1', "foo: 'äöüß'"),
-            iconv('UTF-8', 'ISO-8859-15', "euro: '€'"),
-            iconv('UTF-8', 'CP1252', "cp1252: '©ÉÇáñ'"),
-        );
-
-        foreach ($yamls as $yaml) {
-            try {
-                $this->parser->parse($yaml);
-
-                $this->fail('charsets other than UTF-8 are rejected.');
-            } catch (\Exception $e) {
-                $this->assertInstanceOf('Symfony\Component\Yaml\Exception\ParseException', $e, 'charsets other than UTF-8 are rejected.');
-            }
-        }
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     */
-    public function testUnindentedCollectionException()
-    {
-        $yaml = <<<'EOF'
-
-collection:
--item1
--item2
--item3
-
-EOF;
-
-        $this->parser->parse($yaml);
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     */
-    public function testShortcutKeyUnindentedCollectionException()
-    {
-        $yaml = <<<'EOF'
-
-collection:
--  key: foo
-  foo: bar
-
-EOF;
-
-        $this->parser->parse($yaml);
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     * @expectedExceptionMessageRegExp /^Multiple documents are not supported.+/
-     */
-    public function testMultipleDocumentsNotSupportedException()
-    {
-        Yaml::parse(<<<'EOL'
-# Ranking of 1998 home runs
----
-- Mark McGwire
-- Sammy Sosa
-- Ken Griffey
-
-# Team ranking
----
-- Chicago Cubs
-- St Louis Cardinals
-EOL
-        );
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     */
-    public function testSequenceInAMapping()
-    {
-        Yaml::parse(<<<'EOF'
-yaml:
-  hash: me
-  - array stuff
-EOF
-        );
-    }
-
-    public function testSequenceInMappingStartedBySingleDashLine()
-    {
-        $yaml = <<<EOT
-a:
--
-  b:
-  -
-    bar: baz
-- foo
-d: e
-EOT;
-        $expected = array(
-            'a' => array(
-                array(
-                    'b' => array(
-                        array(
-                            'bar' => 'baz',
-                        ),
-                    ),
-                ),
-                'foo',
-            ),
-            'd' => 'e',
-        );
-
-        $this->assertSame($expected, $this->parser->parse($yaml));
-    }
-
-    public function testSequenceFollowedByCommentEmbeddedInMapping()
-    {
-        $yaml = <<<EOT
-a:
-    b:
-        - c
-# comment
-    d: e
-EOT;
-        $expected = array(
-            'a' => array(
-                'b' => array('c'),
-                'd' => 'e',
-            ),
-        );
-
-        $this->assertSame($expected, $this->parser->parse($yaml));
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     */
-    public function testMappingInASequence()
-    {
-        Yaml::parse(<<<'EOF'
-yaml:
-  - array stuff
-  hash: me
-EOF
-        );
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     * @expectedExceptionMessage missing colon
-     */
-    public function testScalarInSequence()
-    {
-        Yaml::parse(<<<EOF
-foo:
-    - bar
-"missing colon"
-    foo: bar
-EOF
-        );
-    }
-
-    /**
-     * > It is an error for two equal keys to appear in the same mapping node.
-     * > In such a case the YAML processor may continue, ignoring the second
-     * > `key: value` pair and issuing an appropriate warning. This strategy
-     * > preserves a consistent information model for one-pass and random access
-     * > applications.
-     *
-     * @see http://yaml.org/spec/1.2/spec.html#id2759572
-     * @see http://yaml.org/spec/1.1/#id932806
-     */
-    public function testMappingDuplicateKeyBlock()
-    {
-        $input = <<<EOD
-parent:
-    child: first
-    child: duplicate
-parent:
-    child: duplicate
-    child: duplicate
-EOD;
-        $expected = array(
-            'parent' => array(
-                'child' => 'first',
-            ),
-        );
-        $this->assertSame($expected, Yaml::parse($input));
-    }
-
-    public function testMappingDuplicateKeyFlow()
-    {
-        $input = <<<EOD
-parent: { child: first, child: duplicate }
-parent: { child: duplicate, child: duplicate }
-EOD;
-        $expected = array(
-            'parent' => array(
-                'child' => 'first',
-            ),
-        );
-        $this->assertSame($expected, Yaml::parse($input));
-    }
-
-    public function testEmptyValue()
-    {
-        $input = <<<'EOF'
-hash:
-EOF;
-
-        $this->assertEquals(array('hash' => null), Yaml::parse($input));
-    }
-
-    public function testCommentAtTheRootIndent()
-    {
-        $this->assertEquals(array(
-            'services' => array(
-                'app.foo_service' => array(
-                    'class' => 'Foo',
-                ),
-                'app/bar_service' => array(
-                    'class' => 'Bar',
-                ),
-            ),
-        ), Yaml::parse(<<<'EOF'
-# comment 1
-services:
-# comment 2
-    # comment 3
-    app.foo_service:
-        class: Foo
-# comment 4
-    # comment 5
-    app/bar_service:
-        class: Bar
-EOF
-        ));
-    }
-
-    public function testStringBlockWithComments()
-    {
-        $this->assertEquals(array('content' => <<<'EOT'
-# comment 1
-header
-
-    # comment 2
-    <body>
-        <h1>title</h1>
-    </body>
-
-footer # comment3
-EOT
-        ), Yaml::parse(<<<'EOF'
-content: |
-    # comment 1
-    header
-
-        # comment 2
-        <body>
-            <h1>title</h1>
-        </body>
-
-    footer # comment3
-EOF
-        ));
-    }
-
-    public function testFoldedStringBlockWithComments()
-    {
-        $this->assertEquals(array(array('content' => <<<'EOT'
-# comment 1
-header
-
-    # comment 2
-    <body>
-        <h1>title</h1>
-    </body>
-
-footer # comment3
-EOT
-        )), Yaml::parse(<<<'EOF'
--
-    content: |
-        # comment 1
-        header
-
-            # comment 2
-            <body>
-                <h1>title</h1>
-            </body>
-
-        footer # comment3
-EOF
-        ));
-    }
-
-    public function testNestedFoldedStringBlockWithComments()
-    {
-        $this->assertEquals(array(array(
-            'title' => 'some title',
-            'content' => <<<'EOT'
-# comment 1
-header
-
-    # comment 2
-    <body>
-        <h1>title</h1>
-    </body>
-
-footer # comment3
-EOT
-        )), Yaml::parse(<<<'EOF'
--
-    title: some title
-    content: |
-        # comment 1
-        header
-
-            # comment 2
-            <body>
-                <h1>title</h1>
-            </body>
-
-        footer # comment3
-EOF
-        ));
-    }
-
-    public function testReferenceResolvingInInlineStrings()
-    {
-        $this->assertEquals(array(
-            'var' => 'var-value',
-            'scalar' => 'var-value',
-            'list' => array('var-value'),
-            'list_in_list' => array(array('var-value')),
-            'map_in_list' => array(array('key' => 'var-value')),
-            'embedded_mapping' => array(array('key' => 'var-value')),
-            'map' => array('key' => 'var-value'),
-            'list_in_map' => array('key' => array('var-value')),
-            'map_in_map' => array('foo' => array('bar' => 'var-value')),
-        ), Yaml::parse(<<<'EOF'
-var:  &var var-value
-scalar: *var
-list: [ *var ]
-list_in_list: [[ *var ]]
-map_in_list: [ { key: *var } ]
-embedded_mapping: [ key: *var ]
-map: { key: *var }
-list_in_map: { key: [*var] }
-map_in_map: { foo: { bar: *var } }
-EOF
-        ));
-    }
-
-    public function testYamlDirective()
-    {
-        $yaml = <<<'EOF'
-%YAML 1.2
----
-foo: 1
-bar: 2
-EOF;
-        $this->assertEquals(array('foo' => 1, 'bar' => 2), $this->parser->parse($yaml));
-    }
-
-    public function testFloatKeys()
-    {
-        $yaml = <<<'EOF'
-foo:
-    1.2: "bar"
-    1.3: "baz"
-EOF;
-
-        $expected = array(
-            'foo' => array(
-                '1.2' => 'bar',
-                '1.3' => 'baz',
-            ),
-        );
-
-        $this->assertEquals($expected, $this->parser->parse($yaml));
-    }
-
-    /**
-     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
-     * @expectedExceptionMessage A colon cannot be used in an unquoted mapping value
-     */
-    public function testColonInMappingValueException()
-    {
-        $yaml = <<<EOF
-foo: bar: baz
-EOF;
-
-        $this->parser->parse($yaml);
-    }
-
-    public function testColonInMappingValueExceptionNotTriggeredByColonInComment()
-    {
-        $yaml = <<<EOT
-foo:
-    bar: foobar # Note: a comment after a colon
-EOT;
-
-        $this->assertSame(array('foo' => array('bar' => 'foobar')), $this->parser->parse($yaml));
-    }
-
-    /**
-     * @dataProvider getCommentLikeStringInScalarBlockData
-     */
-    public function testCommentLikeStringsAreNotStrippedInBlockScalars($yaml, $expectedParserResult)
-    {
-        $this->assertSame($expectedParserResult, $this->parser->parse($yaml));
-    }
-
-    public function getCommentLikeStringInScalarBlockData()
-    {
-        $tests = array();
-
-        $yaml = <<<'EOT'
-pages:
-    -
-        title: some title
-        content: |
-            # comment 1
-            header
-
-                # comment 2
-                <body>
-                    <h1>title</h1>
-                </body>
-
-            footer # comment3
-EOT;
-        $expected = array(
-            'pages' => array(
-                array(
-                    'title' => 'some title',
-                    'content' => <<<'EOT'
-# comment 1
-header
-
-    # comment 2
-    <body>
-        <h1>title</h1>
-    </body>
-
-footer # comment3
-EOT
-                    ,
-                ),
-            ),
-        );
-        $tests[] = array($yaml, $expected);
-
-        $yaml = <<<'EOT'
-test: |
-    foo
-    # bar
-    baz
-collection:
-    - one: |
-        foo
-        # bar
-        baz
-    - two: |
-        foo
-        # bar
-        baz
-EOT;
-        $expected = array(
-            'test' => <<<'EOT'
-foo
-# bar
-baz
-
-EOT
-            ,
-            'collection' => array(
-                array(
-                    'one' => <<<'EOT'
-foo
-# bar
-baz
-
-EOT
-                    ,
-                ),
-                array(
-                    'two' => <<<'EOT'
-foo
-# bar
-baz
-EOT
-                    ,
-                ),
-            ),
-        );
-        $tests[] = array($yaml, $expected);
-
-        $yaml = <<<EOT
-foo:
-  bar:
-    scalar-block: >
-      line1
-      line2>
-  baz:
-# comment
-    foobar: ~
-EOT;
-        $expected = array(
-            'foo' => array(
-                'bar' => array(
-                    'scalar-block' => "line1 line2>\n",
-                ),
-                'baz' => array(
-                    'foobar' => null,
-                ),
-            ),
-        );
-        $tests[] = array($yaml, $expected);
-
-        $yaml = <<<'EOT'
-a:
-    b: hello
-#    c: |
-#        first row
-#        second row
-    d: hello
-EOT;
-        $expected = array(
-            'a' => array(
-                'b' => 'hello',
-                'd' => 'hello',
-            ),
-        );
-        $tests[] = array($yaml, $expected);
-
-        return $tests;
-    }
-
-    public function testBlankLinesAreParsedAsNewLinesInFoldedBlocks()
-    {
-        $yaml = <<<EOT
-test: >
-    <h2>A heading</h2>
-
-    <ul>
-    <li>a list</li>
-    <li>may be a good example</li>
-    </ul>
-EOT;
-
-        $this->assertSame(
-            array(
-                'test' => <<<EOT
-<h2>A heading</h2>
-<ul> <li>a list</li> <li>may be a good example</li> </ul>
-EOT
-                ,
-            ),
-            $this->parser->parse($yaml)
-        );
-    }
-
-    public function testAdditionallyIndentedLinesAreParsedAsNewLinesInFoldedBlocks()
-    {
-        $yaml = <<<EOT
-test: >
-    <h2>A heading</h2>
-
-    <ul>
-      <li>a list</li>
-      <li>may be a good example</li>
-    </ul>
-EOT;
-
-        $this->assertSame(
-            array(
-                'test' => <<<EOT
-<h2>A heading</h2>
-<ul>
-  <li>a list</li>
-  <li>may be a good example</li>
-</ul>
-EOT
-                ,
-            ),
-            $this->parser->parse($yaml)
-        );
-    }
-
-    /**
-     * @dataProvider getBinaryData
-     */
-    public function testParseBinaryData($data)
-    {
-        $this->assertSame(array('data' => 'Hello world'), $this->parser->parse($data));
-    }
-
-    public function getBinaryData()
-    {
-        return array(
-            'enclosed with double quotes' => array('data: !!binary "SGVsbG8gd29ybGQ="'),
-            'enclosed with single quotes' => array("data: !!binary 'SGVsbG8gd29ybGQ='"),
-            'containing spaces' => array('data: !!binary  "SGVs bG8gd 29ybGQ="'),
-            'in block scalar' => array(
-                <<<EOT
-data: !!binary |
-    SGVsbG8gd29ybGQ=
-EOT
-    ),
-            'containing spaces in block scalar' => array(
-                <<<EOT
-data: !!binary |
-    SGVs bG8gd 29ybGQ=
-EOT
-    ),
-        );
-    }
-
-    /**
-     * @dataProvider getInvalidBinaryData
-     */
-    public function testParseInvalidBinaryData($data, $expectedMessage)
-    {
-        $this->setExpectedExceptionRegExp('\Symfony\Component\Yaml\Exception\ParseException', $expectedMessage);
-
-        $this->parser->parse($data);
-    }
-
-    public function getInvalidBinaryData()
-    {
-        return array(
-            'length not a multiple of four' => array('data: !!binary "SGVsbG8d29ybGQ="', '/The normalized base64 encoded data \(data without whitespace characters\) length must be a multiple of four \(\d+ bytes given\)/'),
-            'invalid characters' => array('!!binary "SGVsbG8#d29ybGQ="', '/The base64 encoded data \(.*\) contains invalid characters/'),
-            'too many equals characters' => array('data: !!binary "SGVsbG8gd29yb==="', '/The base64 encoded data \(.*\) contains invalid characters/'),
-            'misplaced equals character' => array('data: !!binary "SGVsbG8gd29ybG=Q"', '/The base64 encoded data \(.*\) contains invalid characters/'),
-            'length not a multiple of four in block scalar' => array(
-                <<<EOT
-data: !!binary |
-    SGVsbG8d29ybGQ=
-EOT
-                ,
-                '/The normalized base64 encoded data \(data without whitespace characters\) length must be a multiple of four \(\d+ bytes given\)/',
-            ),
-            'invalid characters in block scalar' => array(
-                <<<EOT
-data: !!binary |
-    SGVsbG8#d29ybGQ=
-EOT
-                ,
-                '/The base64 encoded data \(.*\) contains invalid characters/',
-            ),
-            'too many equals characters in block scalar' => array(
-                <<<EOT
-data: !!binary |
-    SGVsbG8gd29yb===
-EOT
-                ,
-                '/The base64 encoded data \(.*\) contains invalid characters/',
-            ),
-            'misplaced equals character in block scalar' => array(
-                <<<EOT
-data: !!binary |
-    SGVsbG8gd29ybG=Q
-EOT
-                ,
-                '/The base64 encoded data \(.*\) contains invalid characters/',
-            ),
-        );
-    }
-
-    public function testParseDateAsMappingValue()
-    {
-        $yaml = <<<EOT
-date: 2002-12-14
-EOT;
-        $expectedDate = new \DateTime();
-        $expectedDate->setTimeZone(new \DateTimeZone('UTC'));
-        $expectedDate->setDate(2002, 12, 14);
-        $expectedDate->setTime(0, 0, 0);
-
-        $this->assertEquals(array('date' => $expectedDate), $this->parser->parse($yaml, Yaml::PARSE_DATETIME));
-    }
-
-    /**
-     * @param $lineNumber
-     * @param $yaml
-     * @dataProvider parserThrowsExceptionWithCorrectLineNumberProvider
-     */
-    public function testParserThrowsExceptionWithCorrectLineNumber($lineNumber, $yaml)
-    {
-        $this->setExpectedException(
-            '\Symfony\Component\Yaml\Exception\ParseException',
-            sprintf('Unexpected characters near "," at line %d (near "bar: "123",").', $lineNumber)
-        );
-
-        $this->parser->parse($yaml);
-    }
-
-    public function parserThrowsExceptionWithCorrectLineNumberProvider()
-    {
-        return array(
-            array(
-                4,
-                <<<YAML
-foo:
-    -
-        # bar
-        bar: "123",
-YAML
-            ),
-            array(
-                5,
-                <<<YAML
-foo:
-    -
-        # bar
-        # bar
-        bar: "123",
-YAML
-            ),
-            array(
-                8,
-                <<<YAML
-foo:
-    -
-        # foobar
-        baz: 123
-bar:
-    -
-        # bar
-        bar: "123",
-YAML
-            ),
-            array(
-                10,
-                <<<YAML
-foo:
-    -
-        # foobar
-        # foobar
-        baz: 123
-bar:
-    -
-        # bar
-        # bar
-        bar: "123",
-YAML
-            ),
-        );
-    }
-}
-
-class B
-{
-    public $b = 'foo';
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/YamlTest.php b/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/YamlTest.php
deleted file mode 100644
index b1a606a220..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Tests/YamlTest.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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\Tests;
-
-use Symfony\Component\Yaml\Yaml;
-
-class YamlTest extends \PHPUnit_Framework_TestCase
-{
-    public function testParseAndDump()
-    {
-        $data = array('lorem' => 'ipsum', 'dolor' => 'sit');
-        $yml = Yaml::dump($data);
-        $parsed = Yaml::parse($yml);
-        $this->assertEquals($data, $parsed);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage The indentation must be greater than zero
-     */
-    public function testZeroIndentationThrowsException()
-    {
-        Yaml::dump(array('lorem' => 'ipsum', 'dolor' => 'sit'), 2, 0);
-    }
-
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage The indentation must be greater than zero
-     */
-    public function testNegativeIndentationThrowsException()
-    {
-        Yaml::dump(array('lorem' => 'ipsum', 'dolor' => 'sit'), 2, -4);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/Unescaper.php b/core/src/core/classes/guzzle/vendor/symfony/yaml/Unescaper.php
deleted file mode 100644
index 6e863e12f2..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Unescaper.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?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;
-
-/**
- * Unescaper encapsulates unescaping rules for single and double-quoted
- * YAML strings.
- *
- * @author Matthew Lewinski <matthew@lewinski.org>
- *
- * @internal
- */
-class Unescaper
-{
-    /**
-     * 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)
-    {
-        $callback = function ($match) {
-            return $this->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
-     */
-    private 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:
-                throw new ParseException(sprintf('Found unknown escape character "%s".', $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/src/core/classes/guzzle/vendor/symfony/yaml/Yaml.php b/core/src/core/classes/guzzle/vendor/symfony/yaml/Yaml.php
deleted file mode 100644
index 213ef898c1..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/Yaml.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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
-{
-    const DUMP_OBJECT = 1;
-    const PARSE_EXCEPTION_ON_INVALID_TYPE = 2;
-    const PARSE_OBJECT = 4;
-    const PARSE_OBJECT_FOR_MAP = 8;
-    const DUMP_EXCEPTION_ON_INVALID_TYPE = 16;
-    const PARSE_DATETIME = 32;
-    const DUMP_OBJECT_AS_MAP = 64;
-    const DUMP_MULTI_LINE_LITERAL_BLOCK = 128;
-
-    /**
-     * Parses YAML into a PHP value.
-     *
-     *  Usage:
-     *  <code>
-     *   $array = Yaml::parse(file_get_contents('config.yml'));
-     *   print_r($array);
-     *  </code>
-     *
-     * @param string $input A string containing YAML
-     * @param int    $flags A bit field of PARSE_* constants to customize the YAML parser behavior
-     *
-     * @return mixed The YAML converted to a PHP value
-     *
-     * @throws ParseException If the YAML is not valid
-     */
-    public static function parse($input, $flags = 0)
-    {
-        if (is_bool($flags)) {
-            @trigger_error('Passing a boolean flag to toggle exception handling is deprecated since version 3.1 and will be removed in 4.0. Use the PARSE_EXCEPTION_ON_INVALID_TYPE flag instead.', E_USER_DEPRECATED);
-
-            if ($flags) {
-                $flags = self::PARSE_EXCEPTION_ON_INVALID_TYPE;
-            } else {
-                $flags = 0;
-            }
-        }
-
-        if (func_num_args() >= 3) {
-            @trigger_error('Passing a boolean flag to toggle object support is deprecated since version 3.1 and will be removed in 4.0. Use the PARSE_OBJECT flag instead.', E_USER_DEPRECATED);
-
-            if (func_get_arg(2)) {
-                $flags |= self::PARSE_OBJECT;
-            }
-        }
-
-        if (func_num_args() >= 4) {
-            @trigger_error('Passing a boolean flag to toggle object for map support is deprecated since version 3.1 and will be removed in 4.0. Use the Yaml::PARSE_OBJECT_FOR_MAP flag instead.', E_USER_DEPRECATED);
-
-            if (func_get_arg(3)) {
-                $flags |= self::PARSE_OBJECT_FOR_MAP;
-            }
-        }
-
-        $yaml = new Parser();
-
-        return $yaml->parse($input, $flags);
-    }
-
-    /**
-     * Dumps a PHP array to a YAML string.
-     *
-     * The dump method, when supplied with an array, will do its best
-     * to convert the array into friendly YAML.
-     *
-     * @param array $array  PHP array
-     * @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 int   $flags  A bit field of DUMP_* constants to customize the dumped YAML string
-     *
-     * @return string A YAML string representing the original PHP array
-     */
-    public static function dump($array, $inline = 2, $indent = 4, $flags = 0)
-    {
-        if (is_bool($flags)) {
-            @trigger_error('Passing a boolean flag to toggle exception handling is deprecated since version 3.1 and will be removed in 4.0. Use the DUMP_EXCEPTION_ON_INVALID_TYPE flag instead.', E_USER_DEPRECATED);
-
-            if ($flags) {
-                $flags = self::DUMP_EXCEPTION_ON_INVALID_TYPE;
-            } else {
-                $flags = 0;
-            }
-        }
-
-        if (func_num_args() >= 5) {
-            @trigger_error('Passing a boolean flag to toggle object support is deprecated since version 3.1 and will be removed in 4.0. Use the DUMP_OBJECT flag instead.', E_USER_DEPRECATED);
-
-            if (func_get_arg(4)) {
-                $flags |= self::DUMP_OBJECT;
-            }
-        }
-
-        $yaml = new Dumper($indent);
-
-        return $yaml->dump($array, $inline, 0, $flags);
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/composer.json b/core/src/core/classes/guzzle/vendor/symfony/yaml/composer.json
deleted file mode 100644
index b835655f6a..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "symfony/yaml",
-    "type": "library",
-    "description": "Symfony Yaml Component",
-    "keywords": [],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Fabien Potencier",
-            "email": "fabien@symfony.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=5.5.9"
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Component\\Yaml\\": "" },
-        "exclude-from-classmap": [
-            "/Tests/"
-        ]
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.1-dev"
-        }
-    }
-}
diff --git a/core/src/core/classes/guzzle/vendor/symfony/yaml/phpunit.xml.dist b/core/src/core/classes/guzzle/vendor/symfony/yaml/phpunit.xml.dist
deleted file mode 100644
index 6bdbea16e6..0000000000
--- a/core/src/core/classes/guzzle/vendor/symfony/yaml/phpunit.xml.dist
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Symfony Yaml Component Test Suite">
-            <directory>./Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/core/src/core/classes/http_class/LICENSE.txt b/core/src/core/classes/http_class/LICENSE.txt
deleted file mode 100644
index 29e83e173b..0000000000
--- a/core/src/core/classes/http_class/LICENSE.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-HTTP client PHP class
-
-This LICENSE is in the BSD license style.
-
-License Version Control:
-@(#) $Id: LICENSE.txt,v 1.1 2006/04/17 19:44:04 mlemos Exp $
-
-Copyright (c) 1999 - 2006, Manuel Lemos
-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 Manuel Lemos nor the names of his 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 REGENTS 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.
diff --git a/core/src/core/classes/http_class/http_class.php b/core/src/core/classes/http_class/http_class.php
deleted file mode 100644
index 5d902eb899..0000000000
--- a/core/src/core/classes/http_class/http_class.php
+++ /dev/null
@@ -1,1883 +0,0 @@
-<?php
-/*
- * http.php
- *
- * @(#) $Header: /opt2/ena/metal/http/http.php,v 1.88 2011/10/24 08:26:56 mlemos Exp $
- *
- */
-
-define('HTTP_CLIENT_ERROR_UNSPECIFIED_ERROR',       -1);
-define('HTTP_CLIENT_ERROR_NO_ERROR',                 0);
-define('HTTP_CLIENT_ERROR_INVALID_SERVER_ADDRESS',   1);
-define('HTTP_CLIENT_ERROR_CANNOT_CONNECT',           2);
-define('HTTP_CLIENT_ERROR_COMMUNICATION_FAILURE',    3);
-define('HTTP_CLIENT_ERROR_CANNOT_ACCESS_LOCAL_FILE', 4);
-define('HTTP_CLIENT_ERROR_PROTOCOL_FAILURE',         5);
-define('HTTP_CLIENT_ERROR_INVALID_PARAMETERS',       6);
-
-class http_class
-{
-    public $host_name="";
-    public $host_port=0;
-    public $proxy_host_name="";
-    public $proxy_host_port=80;
-    public $socks_host_name = '';
-    public $socks_host_port = 1080;
-    public $socks_version = '5';
-
-    public $protocol="http";
-    public $request_method="GET";
-    public $user_agent='httpclient (http://www.phpclasses.org/httpclient $Revision: 1.88 $)';
-    public $accept='';
-    public $authentication_mechanism="";
-    public $user;
-    public $password;
-    public $realm;
-    public $workstation;
-    public $proxy_authentication_mechanism="";
-    public $proxy_user;
-    public $proxy_password;
-    public $proxy_realm;
-    public $proxy_workstation;
-    public $request_uri="";
-    public $request="";
-    public $request_headers=array();
-    public $request_user;
-    public $request_password;
-    public $request_realm;
-    public $request_workstation;
-    public $proxy_request_user;
-    public $proxy_request_password;
-    public $proxy_request_realm;
-    public $proxy_request_workstation;
-    public $request_body="";
-    public $request_arguments=array();
-    public $protocol_version="1.1";
-    public $timeout=0;
-    public $data_timeout=0;
-    public $debug=0;
-    public $log_debug=0;
-    public $debug_response_body=1;
-    public $html_debug=0;
-    public $support_cookies=1;
-    public $cookies=array();
-    public $error="";
-    public $error_code = HTTP_CLIENT_ERROR_NO_ERROR;
-    public $exclude_address="";
-    public $follow_redirect=0;
-    public $redirection_limit=5;
-    public $response_status="";
-    public $response_message="";
-    public $file_buffer_length=8000;
-    public $force_multipart_form_post=0;
-    public $prefer_curl = 0;
-    public $keep_alive = 1;
-
-    /* private variables - DO NOT ACCESS */
-
-    public $state="Disconnected";
-    public $use_curl=0;
-    public $connection=0;
-    public $content_length=0;
-    public $response="";
-    public $read_response=0;
-    public $read_length=0;
-    public $request_host="";
-    public $next_token="";
-    public $redirection_level=0;
-    public $chunked=0;
-    public $remaining_chunk=0;
-    public $last_chunk_read=0;
-    public $months=array(
-        "Jan"=>"01",
-        "Feb"=>"02",
-        "Mar"=>"03",
-        "Apr"=>"04",
-        "May"=>"05",
-        "Jun"=>"06",
-        "Jul"=>"07",
-        "Aug"=>"08",
-        "Sep"=>"09",
-        "Oct"=>"10",
-        "Nov"=>"11",
-        "Dec"=>"12");
-    public $session='';
-    public $connection_close=0;
-    public $force_close = 0;
-    public $connected_host = '';
-    public $connected_port = -1;
-    public $connected_ssl = 0;
-
-    /* Private methods - DO NOT CALL */
-
-    public Function Tokenize($string,$separator="")
-    {
-        if (!strcmp($separator,"")) {
-            $separator=$string;
-            $string=$this->next_token;
-        }
-        for ($character=0;$character<strlen($separator);$character++) {
-            if(GetType($position=strpos($string,$separator[$character]))=="integer")
-                $found=(IsSet($found) ? min($found,$position) : $position);
-        }
-        if (IsSet($found)) {
-            $this->next_token=substr($string,$found+1);
-            return(substr($string,0,$found));
-        } else {
-            $this->next_token="";
-            return($string);
-        }
-    }
-
-    public Function CookieEncode($value, $name)
-    {
-        return($name ? str_replace("=", "%25", $value) : str_replace(";", "%3B", $value));
-    }
-
-    public Function SetError($error, $error_code = HTTP_CLIENT_ERROR_UNSPECIFIED_ERROR)
-    {
-        $this->error_code = $error_code;
-        return($this->error=$error);
-    }
-
-    public Function SetPHPError($error, &$php_error_message, $error_code = HTTP_CLIENT_ERROR_UNSPECIFIED_ERROR)
-    {
-        if(IsSet($php_error_message)
-        && strlen($php_error_message))
-            $error.=": ".$php_error_message;
-        return($this->SetError($error, $error_code));
-    }
-
-    public Function SetDataAccessError($error,$check_connection=0)
-    {
-        $this->error=$error;
-        $this->error_code = HTTP_CLIENT_ERROR_COMMUNICATION_FAILURE;
-        if(!$this->use_curl
-        && function_exists("socket_get_status"))
-        {
-            $status=socket_get_status($this->connection);
-            if($status["timed_out"])
-                $this->error.=": data access time out";
-            elseif ($status["eof"]) {
-                if($check_connection)
-                    $this->error="";
-                else
-                    $this->error.=": the server disconnected";
-            }
-        }
-    }
-
-    public Function OutputDebug($message)
-    {
-        if($this->log_debug)
-            error_log($message);
-        else {
-            $message.="\n";
-            if($this->html_debug)
-                $message=str_replace("\n","<br />\n",HtmlEntities($message));
-            echo $message;
-            flush();
-        }
-    }
-
-    public Function GetLine()
-    {
-        for ($line="";;) {
-            if ($this->use_curl) {
-                $eol=strpos($this->response,"\n",$this->read_response);
-                $data=($eol ? substr($this->response,$this->read_response,$eol+1-$this->read_response) : "");
-                $this->read_response+=strlen($data);
-            } else {
-                if (feof($this->connection)) {
-                    $this->SetDataAccessError("reached the end of data while reading from the HTTP server connection");
-                    return(0);
-                }
-                $data=fgets($this->connection,100);
-            }
-            if(GetType($data)!="string"
-            || strlen($data)==0)
-            {
-                $this->SetDataAccessError("it was not possible to read line from the HTTP server");
-                return(0);
-            }
-            $line.=$data;
-            $length=strlen($line);
-            if($length
-            && !strcmp(substr($line,$length-1,1),"\n"))
-            {
-                $length-=(($length>=2 && !strcmp(substr($line,$length-2,1),"\r")) ? 2 : 1);
-                $line=substr($line,0,$length);
-                if($this->debug)
-                    $this->OutputDebug("S $line");
-                return($line);
-            }
-        }
-    }
-
-    public Function PutLine($line)
-    {
-        if($this->debug)
-            $this->OutputDebug("C $line");
-        if (!fputs($this->connection,$line."\r\n")) {
-            $this->SetDataAccessError("it was not possible to send a line to the HTTP server");
-            return(0);
-        }
-        return(1);
-    }
-
-    public Function PutData($data)
-    {
-        if (strlen($data)) {
-            if($this->debug)
-                $this->OutputDebug('C '.$data);
-            if (!fputs($this->connection,$data)) {
-                $this->SetDataAccessError("it was not possible to send data to the HTTP server");
-                return(0);
-            }
-        }
-        return(1);
-    }
-
-    public Function FlushData()
-    {
-        if (!fflush($this->connection)) {
-            $this->SetDataAccessError("it was not possible to send data to the HTTP server");
-            return(0);
-        }
-        return(1);
-    }
-
-    public Function ReadChunkSize()
-    {
-        if ($this->remaining_chunk==0) {
-            $debug=$this->debug;
-            if(!$this->debug_response_body)
-                $this->debug=0;
-            $line=$this->GetLine();
-            $this->debug=$debug;
-            if(GetType($line)!="string")
-                return($this->SetError("could not read chunk start: ".$this->error, $this->error_code));
-            $this->remaining_chunk=hexdec($line);
-            if ($this->remaining_chunk == 0) {
-                if(!$this->debug_response_body)
-                    $this->debug=0;
-                $line=$this->GetLine();
-                $this->debug=$debug;
-                if(GetType($line)!="string")
-                    return($this->SetError("could not read chunk end: ".$this->error, $this->error_code));
-            }
-        }
-        return("");
-    }
-
-    public Function ReadBytes($length)
-    {
-        if ($this->use_curl) {
-            $bytes=substr($this->response,$this->read_response,min($length,strlen($this->response)-$this->read_response));
-            $this->read_response+=strlen($bytes);
-            if($this->debug
-            && $this->debug_response_body
-            && strlen($bytes))
-                $this->OutputDebug("S ".$bytes);
-        } else {
-            if ($this->chunked) {
-                for ($bytes="",$remaining=$length;$remaining;) {
-                    if(strlen($this->ReadChunkSize()))
-                        return("");
-                    if ($this->remaining_chunk==0) {
-                        $this->last_chunk_read=1;
-                        break;
-                    }
-                    $ask=min($this->remaining_chunk,$remaining);
-                    $chunk=@fread($this->connection,$ask);
-                    $read=strlen($chunk);
-                    if ($read==0) {
-                        $this->SetDataAccessError("it was not possible to read data chunk from the HTTP server");
-                        return("");
-                    }
-                    if($this->debug
-                    && $this->debug_response_body)
-                        $this->OutputDebug("S ".$chunk);
-                    $bytes.=$chunk;
-                    $this->remaining_chunk-=$read;
-                    $remaining-=$read;
-                    if ($this->remaining_chunk==0) {
-                        if(feof($this->connection))
-                            return($this->SetError("reached the end of data while reading the end of data chunk mark from the HTTP server", HTTP_CLIENT_ERROR_PROTOCOL_FAILURE));
-                        $data=@fread($this->connection,2);
-                        if (strcmp($data,"\r\n")) {
-                            $this->SetDataAccessError("it was not possible to read end of data chunk from the HTTP server");
-                            return("");
-                        }
-                    }
-                }
-            } else {
-                $bytes=@fread($this->connection,$length);
-                if (strlen($bytes)) {
-                    if($this->debug
-                    && $this->debug_response_body)
-                        $this->OutputDebug("S ".$bytes);
-                } else
-                    $this->SetDataAccessError("it was not possible to read data from the HTTP server", $this->connection_close);
-            }
-        }
-        return($bytes);
-    }
-
-    public Function EndOfInput()
-    {
-        if($this->use_curl)
-            return($this->read_response>=strlen($this->response));
-        if($this->chunked)
-            return($this->last_chunk_read);
-        if($this->content_length_set)
-            return($this->content_length <= $this->read_length);
-        return(feof($this->connection));
-    }
-
-    public Function Resolve($domain, &$ip, $server_type)
-    {
-        if(preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/',$domain))
-            $ip=$domain;
-        else {
-            if($this->debug)
-                $this->OutputDebug('Resolving '.$server_type.' server domain "'.$domain.'"...');
-            if(!strcmp($ip=@gethostbyname($domain),$domain))
-                $ip="";
-        }
-        if(strlen($ip)==0
-        || (strlen($this->exclude_address)
-        && !strcmp(@gethostbyname($this->exclude_address),$ip)))
-            return($this->SetError("could not resolve the host domain \"".$domain."\"", HTTP_CLIENT_ERROR_INVALID_SERVER_ADDRESS));
-        return('');
-    }
-
-    public Function Connect($host_name, $host_port, $ssl, $server_type = 'HTTP')
-    {
-        $domain=$host_name;
-        $port = $host_port;
-        if(strlen($error = $this->Resolve($domain, $ip, $server_type)))
-            return($error);
-        if (strlen($this->socks_host_name)) {
-            switch ($this->socks_version) {
-                case '4':
-                    $version = 4;
-                    break;
-                case '5':
-                    $version = 5;
-                    break;
-                default:
-                    return('it was not specified a supported SOCKS protocol version');
-                    break;
-            }
-            $host_ip = $ip;
-            $port = $this->socks_host_port;
-            $host_server_type = $server_type;
-            $server_type = 'SOCKS';
-            if(strlen($error = $this->Resolve($this->socks_host_name, $ip, $server_type)))
-                return($error);
-        }
-        if($this->debug)
-            $this->OutputDebug('Connecting to '.$server_type.' server IP '.$ip.' port '.$port.'...');
-        if($ssl)
-            $ip="ssl://".$host_name;
-        if (($this->connection=($this->timeout ? @fsockopen($ip, $port, $errno, $error, $this->timeout) : @fsockopen($ip, $port, $errno)))==0) {
-            $error_code = HTTP_CLIENT_ERROR_CANNOT_CONNECT;
-            switch ($errno) {
-                case -3:
-                    return($this->SetError("socket could not be created", $error_code));
-                case -4:
-                    return($this->SetError("dns lookup on hostname \"".$host_name."\" failed", $error_code));
-                case -5:
-                    return($this->SetError("connection refused or timed out", $error_code));
-                case -6:
-                    return($this->SetError("fdopen() call failed", $error_code));
-                case -7:
-                    return($this->SetError("setvbuf() call failed", $error_code));
-                default:
-                    return($this->SetPHPError($errno." could not connect to the host \"".$host_name."\"",$php_errormsg, $error_code));
-            }
-        } else {
-            if($this->data_timeout
-            && function_exists("socket_set_timeout"))
-                socket_set_timeout($this->connection,$this->data_timeout,0);
-            if (strlen($this->socks_host_name)) {
-                if($this->debug)
-                    $this->OutputDebug('Connected to the SOCKS server '.$this->socks_host_name);
-                $send_error = 'it was not possible to send data to the SOCKS server';
-                $receive_error = 'it was not possible to receive data from the SOCKS server';
-                switch ($version) {
-                    case 4:
-                        $command = 1;
-                        $user = '';
-                        if(!fputs($this->connection, chr($version).chr($command).pack('nN', $host_port, ip2long($host_ip)).$user.Chr(0)))
-                            $error = $this->SetDataAccessError($send_error);
-                        else {
-                            $response = fgets($this->connection, 9);
-                            if(strlen($response) != 8)
-                                $error = $this->SetDataAccessError($receive_error);
-                            else {
-                                $socks_errors = array(
-                                    "\x5a"=>'',
-                                    "\x5b"=>'request rejected',
-                                    "\x5c"=>'request failed because client is not running identd (or not reachable from the server)',
-                                    "\x5d"=>'request failed because client\'s identd could not confirm the user ID string in the request',
-                                );
-                                $error_code = $response[1];
-                                $error = (IsSet($socks_errors[$error_code]) ? $socks_errors[$error_code] : 'unknown');
-                                if(strlen($error))
-                                    $error = 'SOCKS error: '.$error;
-                            }
-                        }
-                        break;
-                    case 5:
-                        if($this->debug)
-                            $this->OutputDebug('Negotiating the authentication method ...');
-                        $methods = 1;
-                        $method = 0;
-                        if(!fputs($this->connection, chr($version).chr($methods).chr($method)))
-                            $error = $this->SetDataAccessError($send_error);
-                        else {
-                            $response = fgets($this->connection, 3);
-                            if(strlen($response) != 2)
-                                $error = $this->SetDataAccessError($receive_error);
-                            elseif(Ord($response[1]) != $method)
-                                $error = 'the SOCKS server requires an authentication method that is not yet supported';
-                            else {
-                                if($this->debug)
-                                    $this->OutputDebug('Connecting to '.$host_server_type.' server IP '.$host_ip.' port '.$host_port.'...');
-                                $command = 1;
-                                $address_type = 1;
-                                if(!fputs($this->connection, chr($version).chr($command)."\x00".chr($address_type).pack('Nn', ip2long($host_ip), $host_port)))
-                                    $error = $this->SetDataAccessError($send_error);
-                                else {
-                                    $response = fgets($this->connection, 11);
-                                    if(strlen($response) != 10)
-                                        $error = $this->SetDataAccessError($receive_error);
-                                    else {
-                                        $socks_errors = array(
-                                            "\x00"=>'',
-                                            "\x01"=>'general SOCKS server failure',
-                                            "\x02"=>'connection not allowed by ruleset',
-                                            "\x03"=>'Network unreachable',
-                                            "\x04"=>'Host unreachable',
-                                            "\x05"=>'Connection refused',
-                                            "\x06"=>'TTL expired',
-                                            "\x07"=>'Command not supported',
-                                            "\x08"=>'Address type not supported'
-                                        );
-                                        $error_code = $response[1];
-                                        $error = (IsSet($socks_errors[$error_code]) ? $socks_errors[$error_code] : 'unknown');
-                                        if(strlen($error))
-                                            $error = 'SOCKS error: '.$error;
-                                    }
-                                }
-                            }
-                        }
-                        break;
-                    default:
-                        $error = 'support for SOCKS protocol version '.$this->socks_version.' is not yet implemented';
-                        break;
-                }
-                if (strlen($error)) {
-                    fclose($this->connection);
-                    return($error);
-                }
-            }
-            if($this->debug)
-                $this->OutputDebug("Connected to $host_name");
-            if(strlen($this->proxy_host_name)
-            && !strcmp(strtolower($this->protocol), 'https'))
-            {
-                if(function_exists('stream_socket_enable_crypto')
-                && in_array('ssl', stream_get_transports()))
-                    $this->state = "ConnectedToProxy";
-                else {
-                    $this->OutputDebug("It is not possible to start SSL after connecting to the proxy server. If the proxy refuses to forward the SSL request, you may need to upgrade to PHP 5.1 or later with OpenSSL support enabled.");
-                    $this->state="Connected";
-                }
-            } else
-                $this->state="Connected";
-            return("");
-        }
-    }
-
-    public Function Disconnect()
-    {
-        if($this->debug)
-            $this->OutputDebug("Disconnected from ".$this->connected_host);
-        if ($this->use_curl) {
-            curl_close($this->connection);
-            $this->response="";
-        } else
-            fclose($this->connection);
-        $this->state="Disconnected";
-        return("");
-    }
-
-    /* Public methods */
-
-    public Function GetRequestArguments($url, &$arguments)
-    {
-        $this->error = '';
-        $this->error_code = HTTP_CLIENT_ERROR_NO_ERROR;
-        $arguments=array();
-        $url = str_replace(' ', '%20', $url);
-        $parameters=@parse_url($url);
-        if(!$parameters)
-            return($this->SetError("it was not specified a valid URL", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-        if(!IsSet($parameters["scheme"]))
-            return($this->SetError("it was not specified the protocol type argument", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-        switch (strtolower($parameters["scheme"])) {
-            case "http":
-            case "https":
-                $arguments["Protocol"]=$parameters["scheme"];
-                break;
-            default:
-                return($parameters["scheme"]." connection scheme is not yet supported");
-        }
-        if(!IsSet($parameters["host"]))
-            return($this->SetError("it was not specified the connection host argument", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-        $arguments["HostName"]=$parameters["host"];
-        $arguments["Headers"]=array("Host"=>$parameters["host"].(IsSet($parameters["port"]) ? ":".$parameters["port"] : ""));
-        if (IsSet($parameters["user"])) {
-            $arguments["AuthUser"]=UrlDecode($parameters["user"]);
-            if(!IsSet($parameters["pass"]))
-                $arguments["AuthPassword"]="";
-        }
-        if (IsSet($parameters["pass"])) {
-            if(!IsSet($parameters["user"]))
-                $arguments["AuthUser"]="";
-            $arguments["AuthPassword"]=UrlDecode($parameters["pass"]);
-        }
-        if (IsSet($parameters["port"])) {
-            if(strcmp($parameters["port"],strval(intval($parameters["port"]))))
-                return($this->SetError("it was not specified a valid connection host argument", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-            $arguments["HostPort"]=intval($parameters["port"]);
-        } else
-            $arguments["HostPort"]=0;
-        $arguments["RequestURI"]=(IsSet($parameters["path"]) ? $parameters["path"] : "/").(IsSet($parameters["query"]) ? "?".$parameters["query"] : "");
-        if(strlen($this->user_agent))
-            $arguments["Headers"]["User-Agent"]=$this->user_agent;
-        if(strlen($this->accept))
-            $arguments["Headers"]["Accept"]=$this->accept;
-        return("");
-    }
-
-    public Function Open($arguments)
-    {
-        if(strlen($this->error))
-            return($this->error);
-        $error_code = HTTP_CLIENT_ERROR_UNSPECIFIED_ERROR;
-        if(IsSet($arguments["HostName"]))
-            $this->host_name=$arguments["HostName"];
-        if(IsSet($arguments["HostPort"]))
-            $this->host_port=$arguments["HostPort"];
-        if(IsSet($arguments["ProxyHostName"]))
-            $this->proxy_host_name=$arguments["ProxyHostName"];
-        if(IsSet($arguments["ProxyHostPort"]))
-            $this->proxy_host_port=$arguments["ProxyHostPort"];
-        if(IsSet($arguments["SOCKSHostName"]))
-            $this->socks_host_name=$arguments["SOCKSHostName"];
-        if(IsSet($arguments["SOCKSHostPort"]))
-            $this->socks_host_port=$arguments["SOCKSHostPort"];
-        if(IsSet($arguments["SOCKSVersion"]))
-            $this->socks_version=$arguments["SOCKSVersion"];
-        if(IsSet($arguments["Protocol"]))
-            $this->protocol=$arguments["Protocol"];
-        switch (strtolower($this->protocol)) {
-            case "http":
-                $default_port=80;
-                break;
-            case "https":
-                $default_port=443;
-                break;
-            default:
-                return($this->SetError("it was not specified a valid connection protocol", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-        }
-        if (strlen($this->proxy_host_name)==0) {
-            if(strlen($this->host_name)==0)
-                return($this->SetError("it was not specified a valid hostname", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-            $host_name=$this->host_name;
-            $host_port=($this->host_port ? $this->host_port : $default_port);
-            $server_type = 'HTTP';
-        } else {
-            $host_name=$this->proxy_host_name;
-            $host_port=$this->proxy_host_port;
-            $server_type = 'HTTP proxy';
-        }
-        $ssl=(strtolower($this->protocol)=="https" && strlen($this->proxy_host_name)==0);
-        if($ssl
-        && strlen($this->socks_host_name))
-            return($this->SetError('establishing SSL connections via a SOCKS server is not yet supported', HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-        $this->use_curl=($ssl && $this->prefer_curl && function_exists("curl_init"));
-        switch ($this->state) {
-            case 'Connected':
-                if(!strcmp($host_name, $this->connected_host)
-                && intval($host_port) == $this->connected_port
-                && intval($ssl) == $this->connected_ssl)
-                {
-                    if($this->debug)
-                        $this->OutputDebug("Reusing connection to ".$this->connected_host);
-                    return('');
-                }
-                if(strlen($error = $this->Disconnect()))
-                    return($error);
-            case "Disconnected":
-                break;
-            default:
-                return("1 already connected");
-        }
-        if($this->debug)
-            $this->OutputDebug("Connecting to ".$this->host_name);
-        if ($this->use_curl) {
-            $error=(($this->connection=curl_init($this->protocol."://".$this->host_name.($host_port==$default_port ? "" : ":".strval($host_port))."/")) ? "" : "Could not initialize a CURL session");
-            if (strlen($error)==0) {
-                if(IsSet($arguments["SSLCertificateFile"]))
-                    curl_setopt($this->connection,CURLOPT_SSLCERT,$arguments["SSLCertificateFile"]);
-                if(IsSet($arguments["SSLCertificatePassword"]))
-                    curl_setopt($this->connection,CURLOPT_SSLCERTPASSWD,$arguments["SSLCertificatePassword"]);
-                if(IsSet($arguments["SSLKeyFile"]))
-                    curl_setopt($this->connection,CURLOPT_SSLKEY,$arguments["SSLKeyFile"]);
-                if(IsSet($arguments["SSLKeyPassword"]))
-                    curl_setopt($this->connection,CURLOPT_SSLKEYPASSWD,$arguments["SSLKeyPassword"]);
-            }
-            $this->state="Connected";
-        } else {
-            $error="";
-            if(strlen($this->proxy_host_name)
-            && (IsSet($arguments["SSLCertificateFile"])
-            || IsSet($arguments["SSLCertificateFile"])))
-                $error="establishing SSL connections using certificates or private keys via non-SSL proxies is not supported";
-            else {
-                if ($ssl) {
-                    if(IsSet($arguments["SSLCertificateFile"]))
-                        $error="establishing SSL connections using certificates is only supported when the cURL extension is enabled";
-                    elseif(IsSet($arguments["SSLKeyFile"]))
-                        $error="establishing SSL connections using a private key is only supported when the cURL extension is enabled";
-                    else {
-                        $version=explode(".",function_exists("phpversion") ? phpversion() : "3.0.7");
-                        $php_version=intval($version[0])*1000000+intval($version[1])*1000+intval($version[2]);
-                        if($php_version<4003000)
-                            $error="establishing SSL connections requires at least PHP version 4.3.0 or having the cURL extension enabled";
-                        elseif(!function_exists("extension_loaded")
-                        || !extension_loaded("openssl"))
-                            $error="establishing SSL connections requires the OpenSSL extension enabled";
-                    }
-                }
-                if (strlen($error)==0) {
-                    $error=$this->Connect($host_name, $host_port, $ssl, $server_type);
-                    $error_code = $this->error_code;
-                }
-            }
-        }
-        if(strlen($error))
-            return($this->SetError($error, $error_code));
-        $this->session=md5(uniqid(""));
-        $this->connected_host = $host_name;
-        $this->connected_port = intval($host_port);
-        $this->connected_ssl = intval($ssl);
-        return("");
-    }
-
-    public Function Close($force = 0)
-    {
-        if($this->state=="Disconnected")
-            return("1 already disconnected");
-        if(!$this->force_close
-        && $this->keep_alive
-        && !$force
-        && $this->state == 'ResponseReceived')
-        {
-            if($this->debug)
-                $this->OutputDebug('Keeping the connection alive to '.$this->connected_host);
-            $this->state = 'Connected';
-            return('');
-        }
-        return($this->Disconnect());
-    }
-
-    public Function PickCookies(&$cookies,$secure)
-    {
-        if (IsSet($this->cookies[$secure])) {
-            $now=gmdate("Y-m-d H-i-s");
-            for ($domain=0,Reset($this->cookies[$secure]);$domain<count($this->cookies[$secure]);Next($this->cookies[$secure]),$domain++) {
-                $domain_pattern=Key($this->cookies[$secure]);
-                $match=strlen($this->request_host)-strlen($domain_pattern);
-                if($match>=0
-                && !strcmp($domain_pattern,substr($this->request_host,$match))
-                && ($match==0
-                || $domain_pattern[0]=="."
-                || $this->request_host[$match-1]=="."))
-                {
-                    for (Reset($this->cookies[$secure][$domain_pattern]),$path_part=0;$path_part<count($this->cookies[$secure][$domain_pattern]);Next($this->cookies[$secure][$domain_pattern]),$path_part++) {
-                        $path=Key($this->cookies[$secure][$domain_pattern]);
-                        if(strlen($this->request_uri)>=strlen($path)
-                        && substr($this->request_uri,0,strlen($path))==$path)
-                        {
-                            for (Reset($this->cookies[$secure][$domain_pattern][$path]),$cookie=0;$cookie<count($this->cookies[$secure][$domain_pattern][$path]);Next($this->cookies[$secure][$domain_pattern][$path]),$cookie++) {
-                                $cookie_name=Key($this->cookies[$secure][$domain_pattern][$path]);
-                                $expires=$this->cookies[$secure][$domain_pattern][$path][$cookie_name]["expires"];
-                                if($expires==""
-                                || strcmp($now,$expires)<0)
-                                    $cookies[$cookie_name]=$this->cookies[$secure][$domain_pattern][$path][$cookie_name];
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    public Function GetFileDefinition($file, &$definition)
-    {
-        $name="";
-        if(IsSet($file["FileName"]))
-            $name=basename($file["FileName"]);
-        if(IsSet($file["Name"]))
-            $name=$file["Name"];
-        if(strlen($name)==0)
-            return("it was not specified the file part name");
-        if (IsSet($file["Content-Type"])) {
-            $content_type=$file["Content-Type"];
-            $type=$this->Tokenize(strtolower($content_type),"/");
-            $sub_type=$this->Tokenize("");
-            switch ($type) {
-                case "text":
-                case "image":
-                case "audio":
-                case "video":
-                case "application":
-                case "message":
-                    break;
-                case "automatic":
-                    switch ($sub_type) {
-                        case "name":
-                            switch (GetType($dot=strrpos($name,"."))=="integer" ? strtolower(substr($name,$dot)) : "") {
-                                case ".xls":
-                                    $content_type="application/excel";
-                                    break;
-                                case ".hqx":
-                                    $content_type="application/macbinhex40";
-                                    break;
-                                case ".doc":
-                                case ".dot":
-                                case ".wrd":
-                                    $content_type="application/msword";
-                                    break;
-                                case ".pdf":
-                                    $content_type="application/pdf";
-                                    break;
-                                case ".pgp":
-                                    $content_type="application/pgp";
-                                    break;
-                                case ".ps":
-                                case ".eps":
-                                case ".ai":
-                                    $content_type="application/postscript";
-                                    break;
-                                case ".ppt":
-                                    $content_type="application/powerpoint";
-                                    break;
-                                case ".rtf":
-                                    $content_type="application/rtf";
-                                    break;
-                                case ".tgz":
-                                case ".gtar":
-                                    $content_type="application/x-gtar";
-                                    break;
-                                case ".gz":
-                                    $content_type="application/x-gzip";
-                                    break;
-                                case ".php":
-                                case ".php3":
-                                    $content_type="application/x-httpd-php";
-                                    break;
-                                case ".js":
-                                    $content_type="application/x-javascript";
-                                    break;
-                                case ".ppd":
-                                case ".psd":
-                                    $content_type="application/x-photoshop";
-                                    break;
-                                case ".swf":
-                                case ".swc":
-                                case ".rf":
-                                    $content_type="application/x-shockwave-flash";
-                                    break;
-                                case ".tar":
-                                    $content_type="application/x-tar";
-                                    break;
-                                case ".zip":
-                                    $content_type="application/zip";
-                                    break;
-                                case ".mid":
-                                case ".midi":
-                                case ".kar":
-                                    $content_type="audio/midi";
-                                    break;
-                                case ".mp2":
-                                case ".mp3":
-                                case ".mpga":
-                                    $content_type="audio/mpeg";
-                                    break;
-                                case ".ra":
-                                    $content_type="audio/x-realaudio";
-                                    break;
-                                case ".wav":
-                                    $content_type="audio/wav";
-                                    break;
-                                case ".bmp":
-                                    $content_type="image/bitmap";
-                                    break;
-                                case ".gif":
-                                    $content_type="image/gif";
-                                    break;
-                                case ".iff":
-                                    $content_type="image/iff";
-                                    break;
-                                case ".jb2":
-                                    $content_type="image/jb2";
-                                    break;
-                                case ".jpg":
-                                case ".jpe":
-                                case ".jpeg":
-                                    $content_type="image/jpeg";
-                                    break;
-                                case ".jpx":
-                                    $content_type="image/jpx";
-                                    break;
-                                case ".png":
-                                    $content_type="image/png";
-                                    break;
-                                case ".tif":
-                                case ".tiff":
-                                    $content_type="image/tiff";
-                                    break;
-                                case ".wbmp":
-                                    $content_type="image/vnd.wap.wbmp";
-                                    break;
-                                case ".xbm":
-                                    $content_type="image/xbm";
-                                    break;
-                                case ".css":
-                                    $content_type="text/css";
-                                    break;
-                                case ".txt":
-                                    $content_type="text/plain";
-                                    break;
-                                case ".htm":
-                                case ".html":
-                                    $content_type="text/html";
-                                    break;
-                                case ".xml":
-                                    $content_type="text/xml";
-                                    break;
-                                case ".mpg":
-                                case ".mpe":
-                                case ".mpeg":
-                                    $content_type="video/mpeg";
-                                    break;
-                                case ".qt":
-                                case ".mov":
-                                    $content_type="video/quicktime";
-                                    break;
-                                case ".avi":
-                                    $content_type="video/x-ms-video";
-                                    break;
-                                case ".eml":
-                                    $content_type="message/rfc822";
-                                    break;
-                                default:
-                                    $content_type="application/octet-stream";
-                                    break;
-                            }
-                            break;
-                        default:
-                            return($content_type." is not a supported automatic content type detection method");
-                    }
-                    break;
-                default:
-                    return($content_type." is not a supported file content type");
-            }
-        } else
-            $content_type="application/octet-stream";
-        $definition=array(
-            "Content-Type"=>$content_type,
-            "NAME"=>$name
-        );
-        if (IsSet($file["FileName"])) {
-            if (GetType($length=@filesize($file["FileName"]))!="integer") {
-                $error="it was not possible to determine the length of the file ".$file["FileName"];
-                if(IsSet($php_errormsg)
-                && strlen($php_errormsg))
-                    $error.=": ".$php_errormsg;
-                if(!file_exists($file["FileName"]))
-                    $error="it was not possible to access the file ".$file["FileName"];
-                return($error);
-            }
-            $definition["FILENAME"]=$file["FileName"];
-            $definition["Content-Length"]=$length;
-        } elseif(IsSet($file["Data"]))
-            $definition["Content-Length"]=strlen($definition["DATA"]=$file["Data"]);
-        else
-            return("it was not specified a valid file name");
-        return("");
-    }
-
-    public Function ConnectFromProxy($arguments, &$headers)
-    {
-        if(!$this->PutLine('CONNECT '.$this->host_name.':'.($this->host_port ? $this->host_port : 443).' HTTP/1.0')
-        || (strlen($this->user_agent)
-        && !$this->PutLine('User-Agent: '.$this->user_agent))
-        || (strlen($this->accept)
-        && !$this->PutLine('Accept: '.$this->accept))
-        || (IsSet($arguments['Headers']['Proxy-Authorization'])
-        && !$this->PutLine('Proxy-Authorization: '.$arguments['Headers']['Proxy-Authorization']))
-        || !$this->PutLine(''))
-        {
-            $this->Disconnect();
-            return($this->error);
-        }
-        $this->state = "ConnectSent";
-        if(strlen($error=$this->ReadReplyHeadersResponse($headers)))
-            return($error);
-        $proxy_authorization="";
-        while (!strcmp($this->response_status, "100")) {
-            $this->state="ConnectSent";
-            if(strlen($error=$this->ReadReplyHeadersResponse($headers)))
-                return($error);
-        }
-        switch ($this->response_status) {
-            case "200":
-                if (!@stream_socket_enable_crypto($this->connection, 1, STREAM_CRYPTO_METHOD_SSLv23_CLIENT)) {
-                    $this->SetPHPError('it was not possible to start a SSL encrypted connection via this proxy', $php_errormsg, HTTP_CLIENT_ERROR_COMMUNICATION_FAILURE);
-                    $this->Disconnect();
-                    return($this->error);
-                }
-                $this->state = "Connected";
-                break;
-            case "407":
-                if(strlen($error=$this->Authenticate($headers, -1, $proxy_authorization, $this->proxy_request_user, $this->proxy_request_password, $this->proxy_request_realm, $this->proxy_request_workstation)))
-                    return($error);
-                break;
-            default:
-                return($this->SetError("unable to send request via proxy", HTTP_CLIENT_ERROR_PROTOCOL_FAILURE));
-        }
-        return("");
-    }
-
-    public Function SendRequest($arguments)
-    {
-        if(strlen($this->error))
-            return($this->error);
-        if(IsSet($arguments["ProxyUser"]))
-            $this->proxy_request_user=$arguments["ProxyUser"];
-        elseif(IsSet($this->proxy_user))
-            $this->proxy_request_user=$this->proxy_user;
-        if(IsSet($arguments["ProxyPassword"]))
-            $this->proxy_request_password=$arguments["ProxyPassword"];
-        elseif(IsSet($this->proxy_password))
-            $this->proxy_request_password=$this->proxy_password;
-        if(IsSet($arguments["ProxyRealm"]))
-            $this->proxy_request_realm=$arguments["ProxyRealm"];
-        elseif(IsSet($this->proxy_realm))
-            $this->proxy_request_realm=$this->proxy_realm;
-        if(IsSet($arguments["ProxyWorkstation"]))
-            $this->proxy_request_workstation=$arguments["ProxyWorkstation"];
-        elseif(IsSet($this->proxy_workstation))
-            $this->proxy_request_workstation=$this->proxy_workstation;
-        switch ($this->state) {
-            case "Disconnected":
-                return($this->SetError("connection was not yet established", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-            case "Connected":
-                $connect = 0;
-                break;
-            case "ConnectedToProxy":
-                if(strlen($error = $this->ConnectFromProxy($arguments, $headers)))
-                    return($error);
-                $connect = 1;
-                break;
-            default:
-                return($this->SetError("can not send request in the current connection state", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-        }
-        if(IsSet($arguments["RequestMethod"]))
-            $this->request_method=$arguments["RequestMethod"];
-        if(IsSet($arguments["User-Agent"]))
-            $this->user_agent=$arguments["User-Agent"];
-        if(!IsSet($arguments["Headers"]["User-Agent"])
-        && strlen($this->user_agent))
-            $arguments["Headers"]["User-Agent"]=$this->user_agent;
-        if(IsSet($arguments["KeepAlive"]))
-            $this->keep_alive=intval($arguments["KeepAlive"]);
-        if(!IsSet($arguments["Headers"]["Connection"])
-        && $this->keep_alive)
-            $arguments["Headers"]["Connection"]='Keep-Alive';
-        if(IsSet($arguments["Accept"]))
-            $this->user_agent=$arguments["Accept"];
-        if(!IsSet($arguments["Headers"]["Accept"])
-        && strlen($this->accept))
-            $arguments["Headers"]["Accept"]=$this->accept;
-        if(strlen($this->request_method)==0)
-            return($this->SetError("it was not specified a valid request method", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-        if(IsSet($arguments["RequestURI"]))
-            $this->request_uri=$arguments["RequestURI"];
-        if(strlen($this->request_uri)==0
-        || substr($this->request_uri,0,1)!="/")
-            return($this->SetError("it was not specified a valid request URI", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-        $this->request_arguments=$arguments;
-        $this->request_headers=(IsSet($arguments["Headers"]) ? $arguments["Headers"] : array());
-        $body_length=0;
-        $this->request_body="";
-        $get_body=1;
-        if($this->request_method=="POST"
-        || $this->request_method=="PUT")
-        {
-            if (IsSet($arguments['StreamRequest'])) {
-                $get_body = 0;
-                $this->request_headers["Transfer-Encoding"]="chunked";
-            } elseif(IsSet($arguments["PostFiles"])
-            || ($this->force_multipart_form_post
-            && IsSet($arguments["PostValues"])))
-            {
-                $boundary="--".md5(uniqid(time()));
-                $this->request_headers["Content-Type"]="multipart/form-data; boundary=".$boundary.(IsSet($arguments["CharSet"]) ? "; charset=".$arguments["CharSet"] : "");
-                $post_parts=array();
-                if (IsSet($arguments["PostValues"])) {
-                    $values=$arguments["PostValues"];
-                    if(GetType($values)!="array")
-                        return($this->SetError("it was not specified a valid POST method values array", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-                    for (Reset($values),$value=0;$value<count($values);Next($values),$value++) {
-                        $input=Key($values);
-                        $headers="--".$boundary."\r\nContent-Disposition: form-data; name=\"".$input."\"\r\n\r\n";
-                        $data=$values[$input];
-                        $post_parts[]=array("HEADERS"=>$headers,"DATA"=>$data);
-                        $body_length+=strlen($headers)+strlen($data)+strlen("\r\n");
-                    }
-                }
-                $body_length+=strlen("--".$boundary."--\r\n");
-                $files=(IsSet($arguments["PostFiles"]) ? $arguments["PostFiles"] : array());
-                Reset($files);
-                $end=(GetType($input=Key($files))!="string");
-                for (;!$end;) {
-                    if(strlen($error=$this->GetFileDefinition($files[$input],$definition)))
-                        return("3 ".$error);
-                    $headers="--".$boundary."\r\nContent-Disposition: form-data; name=\"".$input."\"; filename=\"".$definition["NAME"]."\"\r\nContent-Type: ".$definition["Content-Type"]."\r\n\r\n";
-                    $part=count($post_parts);
-                    $post_parts[$part]=array("HEADERS"=>$headers);
-                    if (IsSet($definition["FILENAME"])) {
-                        $post_parts[$part]["FILENAME"]=$definition["FILENAME"];
-                        $data="";
-                    } else
-                        $data=$definition["DATA"];
-                    $post_parts[$part]["DATA"]=$data;
-                    $body_length+=strlen($headers)+$definition["Content-Length"]+strlen("\r\n");
-                    Next($files);
-                    $end=(GetType($input=Key($files))!="string");
-                }
-                $get_body=0;
-            } elseif (IsSet($arguments["PostValues"])) {
-                $values=$arguments["PostValues"];
-                if(GetType($values)!="array")
-                    return($this->SetError("it was not specified a valid POST method values array", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-                for (Reset($values),$value=0;$value<count($values);Next($values),$value++) {
-                    $k=Key($values);
-                    if (GetType($values[$k])=="array") {
-                        for ($v = 0; $v < count($values[$k]); $v++) {
-                            if($value+$v>0)
-                                $this->request_body.="&";
-                            $this->request_body.=UrlEncode($k)."=".UrlEncode($values[$k][$v]);
-                        }
-                    } else {
-                        if($value>0)
-                            $this->request_body.="&";
-                        $this->request_body.=UrlEncode($k)."=".UrlEncode($values[$k]);
-                    }
-                }
-                $this->request_headers["Content-Type"]="application/x-www-form-urlencoded".(IsSet($arguments["CharSet"]) ? "; charset=".$arguments["CharSet"] : "");
-                $get_body=0;
-            }
-        }
-        if($get_body
-        && (IsSet($arguments["Body"])
-        || IsSet($arguments["BodyStream"])))
-        {
-            if(IsSet($arguments["Body"]))
-                $this->request_body=$arguments["Body"];
-            else {
-                $stream=$arguments["BodyStream"];
-                $this->request_body="";
-                for ($part=0; $part<count($stream); $part++) {
-                    if(IsSet($stream[$part]["Data"]))
-                        $this->request_body.=$stream[$part]["Data"];
-                    elseif (IsSet($stream[$part]["File"])) {
-                        if(!($file=@fopen($stream[$part]["File"],"rb")))
-                            return($this->SetPHPError("could not open upload file ".$stream[$part]["File"], $php_errormsg, HTTP_CLIENT_ERROR_CANNOT_ACCESS_LOCAL_FILE));
-                        while (!feof($file)) {
-                            if (GetType($block=@fread($file,$this->file_buffer_length))!="string") {
-                                $error=$this->SetPHPError("could not read body stream file ".$stream[$part]["File"], $php_errormsg, HTTP_CLIENT_ERROR_CANNOT_ACCESS_LOCAL_FILE);
-                                fclose($file);
-                                return($error);
-                            }
-                            $this->request_body.=$block;
-                        }
-                        fclose($file);
-                    } else
-                        return("5 it was not specified a valid file or data body stream element at position ".$part);
-                }
-            }
-            if(!IsSet($this->request_headers["Content-Type"]))
-                $this->request_headers["Content-Type"]="application/octet-stream".(IsSet($arguments["CharSet"]) ? "; charset=".$arguments["CharSet"] : "");
-        }
-        if(IsSet($arguments["AuthUser"]))
-            $this->request_user=$arguments["AuthUser"];
-        elseif(IsSet($this->user))
-            $this->request_user=$this->user;
-        if(IsSet($arguments["AuthPassword"]))
-            $this->request_password=$arguments["AuthPassword"];
-        elseif(IsSet($this->password))
-            $this->request_password=$this->password;
-        if(IsSet($arguments["AuthRealm"]))
-            $this->request_realm=$arguments["AuthRealm"];
-        elseif(IsSet($this->realm))
-            $this->request_realm=$this->realm;
-        if(IsSet($arguments["AuthWorkstation"]))
-            $this->request_workstation=$arguments["AuthWorkstation"];
-        elseif(IsSet($this->workstation))
-            $this->request_workstation=$this->workstation;
-        if(strlen($this->proxy_host_name)==0
-        || $connect)
-            $request_uri=$this->request_uri;
-        else {
-            switch (strtolower($this->protocol)) {
-                case "http":
-                    $default_port=80;
-                    break;
-                case "https":
-                    $default_port=443;
-                    break;
-            }
-            $request_uri=strtolower($this->protocol)."://".$this->host_name.(($this->host_port==0 || $this->host_port==$default_port) ? "" : ":".$this->host_port).$this->request_uri;
-        }
-        if ($this->use_curl) {
-            $version=(GetType($v=curl_version())=="array" ? (IsSet($v["version"]) ? $v["version"] : "0.0.0") : (preg_match("/^libcurl\\/([0-9]+\\.[0-9]+\\.[0-9]+)/",$v,$m) ? $m[1] : "0.0.0"));
-            $curl_version=100000*intval($this->Tokenize($version,"."))+1000*intval($this->Tokenize("."))+intval($this->Tokenize(""));
-            $protocol_version=($curl_version<713002 ? "1.0" : $this->protocol_version);
-        } else
-            $protocol_version=$this->protocol_version;
-        $this->request=$this->request_method." ".$request_uri." HTTP/".$protocol_version;
-        if($body_length
-        || ($body_length=strlen($this->request_body)))
-            $this->request_headers["Content-Length"]=$body_length;
-        for ($headers=array(),$host_set=0,Reset($this->request_headers),$header=0;$header<count($this->request_headers);Next($this->request_headers),$header++) {
-            $header_name=Key($this->request_headers);
-            $header_value=$this->request_headers[$header_name];
-            if (GetType($header_value)=="array") {
-                for(Reset($header_value),$value=0;$value<count($header_value);Next($header_value),$value++)
-                    $headers[]=$header_name.": ".$header_value[Key($header_value)];
-            } else
-                $headers[]=$header_name.": ".$header_value;
-            if (strtolower(Key($this->request_headers))=="host") {
-                $this->request_host=strtolower($header_value);
-                $host_set=1;
-            }
-        }
-        if (!$host_set) {
-            $headers[]="Host: ".$this->host_name;
-            $this->request_host=strtolower($this->host_name);
-        }
-        if (count($this->cookies)) {
-            $cookies=array();
-            $this->PickCookies($cookies,0);
-            if(strtolower($this->protocol)=="https")
-                $this->PickCookies($cookies,1);
-            if (count($cookies)) {
-                $h=count($headers);
-                $headers[$h]="Cookie:";
-                for (Reset($cookies),$cookie=0;$cookie<count($cookies);Next($cookies),$cookie++) {
-                    $cookie_name=Key($cookies);
-                    $headers[$h].=" ".$cookie_name."=".$cookies[$cookie_name]["value"].";";
-                }
-            }
-        }
-        $next_state = "RequestSent";
-        if ($this->use_curl) {
-            if(IsSet($arguments['StreamRequest']))
-                return($this->SetError("Streaming request data is not supported when using Curl", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-            if($body_length
-            && strlen($this->request_body)==0)
-            {
-                for ($request_body="",$success=1,$part=0;$part<count($post_parts);$part++) {
-                    $request_body.=$post_parts[$part]["HEADERS"].$post_parts[$part]["DATA"];
-                    if (IsSet($post_parts[$part]["FILENAME"])) {
-                        if (!($file=@fopen($post_parts[$part]["FILENAME"],"rb"))) {
-                            $this->SetPHPError("could not open upload file ".$post_parts[$part]["FILENAME"], $php_errormsg, HTTP_CLIENT_ERROR_CANNOT_ACCESS_LOCAL_FILE);
-                            $success=0;
-                            break;
-                        }
-                        while (!feof($file)) {
-                            if (GetType($block=@fread($file,$this->file_buffer_length))!="string") {
-                                $this->SetPHPError("could not read upload file", $php_errormsg, HTTP_CLIENT_ERROR_CANNOT_ACCESS_LOCAL_FILE);
-                                $success=0;
-                                break;
-                            }
-                            $request_body.=$block;
-                        }
-                        fclose($file);
-                        if(!$success)
-                            break;
-                    }
-                    $request_body.="\r\n";
-                }
-                $request_body.="--".$boundary."--\r\n";
-            } else
-                $request_body=$this->request_body;
-            curl_setopt($this->connection,CURLOPT_HEADER,1);
-            curl_setopt($this->connection,CURLOPT_RETURNTRANSFER,1);
-            if($this->timeout)
-                curl_setopt($this->connection,CURLOPT_TIMEOUT,$this->timeout);
-            curl_setopt($this->connection,CURLOPT_SSL_VERIFYPEER,0);
-            curl_setopt($this->connection,CURLOPT_SSL_VERIFYHOST,0);
-            $request=$this->request."\r\n".implode("\r\n",$headers)."\r\n\r\n".$request_body;
-            curl_setopt($this->connection,CURLOPT_CUSTOMREQUEST,$request);
-            if($this->debug)
-                $this->OutputDebug("C ".$request);
-            if (!($success=(strlen($this->response=curl_exec($this->connection))!=0))) {
-                $error=curl_error($this->connection);
-                $this->SetError("Could not execute the request".(strlen($error) ? ": ".$error : ""), HTTP_CLIENT_ERROR_PROTOCOL_FAILURE);
-            }
-        } else {
-            if (($success=$this->PutLine($this->request))) {
-                for ($header=0;$header<count($headers);$header++) {
-                    if(!$success=$this->PutLine($headers[$header]))
-                        break;
-                }
-                if($success
-                && ($success=$this->PutLine("")))
-                {
-                    if(IsSet($arguments['StreamRequest']))
-                        $next_state = "SendingRequestBody";
-                    elseif ($body_length) {
-                        if(strlen($this->request_body))
-                            $success=$this->PutData($this->request_body);
-                        else {
-                            for ($part=0;$part<count($post_parts);$part++) {
-                                if(!($success=$this->PutData($post_parts[$part]["HEADERS"]))
-                                || !($success=$this->PutData($post_parts[$part]["DATA"])))
-                                    break;
-                                if (IsSet($post_parts[$part]["FILENAME"])) {
-                                    if (!($file=@fopen($post_parts[$part]["FILENAME"],"rb"))) {
-                                        $this->SetPHPError("could not open upload file ".$post_parts[$part]["FILENAME"], $php_errormsg, HTTP_CLIENT_ERROR_CANNOT_ACCESS_LOCAL_FILE);
-                                        $success=0;
-                                        break;
-                                    }
-                                    while (!feof($file)) {
-                                        if (GetType($block=@fread($file,$this->file_buffer_length))!="string") {
-                                            $this->SetPHPError("could not read upload file", $php_errormsg, HTTP_CLIENT_ERROR_CANNOT_ACCESS_LOCAL_FILE);
-                                            $success=0;
-                                            break;
-                                        }
-                                        if(!($success=$this->PutData($block)))
-                                            break;
-                                    }
-                                    fclose($file);
-                                    if(!$success)
-                                        break;
-                                }
-                                if(!($success=$this->PutLine("")))
-                                    break;
-                            }
-                            if($success)
-                                $success=$this->PutLine("--".$boundary."--");
-                        }
-                        if($success)
-                            $sucess=$this->FlushData();
-                    }
-                }
-            }
-        }
-        if(!$success)
-            return($this->SetError("could not send the HTTP request: ".$this->error, $this->error_code));
-        $this->state=$next_state;
-        return("");
-    }
-
-    public Function SetCookie($name, $value, $expires="" , $path="/" , $domain="" , $secure=0, $verbatim=0)
-    {
-        if(strlen($this->error))
-            return($this->error);
-        if(strlen($name)==0)
-            return($this->SetError("it was not specified a valid cookie name", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-        if(strlen($path)==0
-        || strcmp($path[0],"/"))
-            return($this->SetError($path." is not a valid path for setting cookie ".$name, HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-        if($domain==""
-        || !strpos($domain,".",$domain[0]=="." ? 1 : 0))
-            return($this->SetError($domain." is not a valid domain for setting cookie ".$name, HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-        $domain=strtolower($domain);
-        if(!strcmp($domain[0],"."))
-            $domain=substr($domain,1);
-        if (!$verbatim) {
-            $name=$this->CookieEncode($name,1);
-            $value=$this->CookieEncode($value,0);
-        }
-        $secure=intval($secure);
-        $this->cookies[$secure][$domain][$path][$name]=array(
-            "name"=>$name,
-            "value"=>$value,
-            "domain"=>$domain,
-            "path"=>$path,
-            "expires"=>$expires,
-            "secure"=>$secure
-        );
-        return("");
-    }
-
-    public Function SendRequestBody($data, $end_of_data)
-    {
-        if(strlen($this->error))
-            return($this->error);
-        switch ($this->state) {
-            case "Disconnected":
-                return($this->SetError("connection was not yet established", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-            case "Connected":
-            case "ConnectedToProxy":
-                return($this->SetError("request was not sent", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-            case "SendingRequestBody":
-                break;
-            case "RequestSent":
-                return($this->SetError("request body was already sent", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-            default:
-                return($this->SetError("can not send the request body in the current connection state", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-        }
-        $length = strlen($data);
-        if ($length) {
-            $size = dechex($length)."\r\n";
-            if(!$this->PutData($size)
-            || !$this->PutData($data))
-                return($this->error);
-        }
-        if ($end_of_data) {
-            $size = "0\r\n";
-            if(!$this->PutData($size))
-                return($this->error);
-            $this->state = "RequestSent";
-        }
-        return("");
-    }
-
-    public Function ReadReplyHeadersResponse(&$headers)
-    {
-        $headers=array();
-        if(strlen($this->error))
-            return($this->error);
-        switch ($this->state) {
-            case "Disconnected":
-                return($this->SetError("connection was not yet established", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-            case "Connected":
-                return($this->SetError("request was not sent", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-            case "ConnectedToProxy":
-                return($this->SetError("connection from the remote server from the proxy was not yet established", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-            case "SendingRequestBody":
-                return($this->SetError("request body data was not completely sent", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-            case "ConnectSent":
-                $connect = 1;
-                break;
-            case "RequestSent":
-                $connect = 0;
-                break;
-            default:
-                return($this->SetError("can not get request headers in the current connection state", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-        }
-        $this->content_length=$this->read_length=$this->read_response=$this->remaining_chunk=0;
-        $this->content_length_set=$this->chunked=$this->last_chunk_read=$chunked=0;
-        $this->force_close = $this->connection_close=0;
-        for ($this->response_status="";;) {
-            $line=$this->GetLine();
-            if(GetType($line)!="string")
-                return($this->SetError("could not read request reply: ".$this->error, $this->error_code));
-            if (strlen($this->response_status)==0) {
-                if(!preg_match($match="/^http\\/[0-9]+\\.[0-9]+[ \t]+([0-9]+)[ \t]*(.*)\$/i",$line,$matches))
-                    return($this->SetError("it was received an unexpected HTTP response status", HTTP_CLIENT_ERROR_PROTOCOL_FAILURE));
-                $this->response_status=$matches[1];
-                $this->response_message=$matches[2];
-            }
-            if ($line=="") {
-                if(strlen($this->response_status)==0)
-                    return($this->SetError("it was not received HTTP response status", HTTP_CLIENT_ERROR_PROTOCOL_FAILURE));
-                $this->state=($connect ? "GotConnectHeaders" : "GotReplyHeaders");
-                break;
-            }
-            $header_name=strtolower($this->Tokenize($line,":"));
-            $header_value=Trim(Chop($this->Tokenize("\r\n")));
-            if (IsSet($headers[$header_name])) {
-                if(GetType($headers[$header_name])=="string")
-                    $headers[$header_name]=array($headers[$header_name]);
-                $headers[$header_name][]=$header_value;
-            } else
-                $headers[$header_name]=$header_value;
-            if (!$connect) {
-                switch ($header_name) {
-                    case "content-length":
-                        $this->content_length=intval($headers[$header_name]);
-                        $this->content_length_set=1;
-                        break;
-                    case "transfer-encoding":
-                        $encoding=$this->Tokenize($header_value,"; \t");
-                        if(!$this->use_curl
-                        && !strcmp($encoding,"chunked"))
-                            $chunked=1;
-                        break;
-                    case "set-cookie":
-                        if ($this->support_cookies) {
-                            if(GetType($headers[$header_name])=="array")
-                                $cookie_headers=$headers[$header_name];
-                            else
-                                $cookie_headers=array($headers[$header_name]);
-                            for ($cookie=0;$cookie<count($cookie_headers);$cookie++) {
-                                $cookie_name=trim($this->Tokenize($cookie_headers[$cookie],"="));
-                                $cookie_value=$this->Tokenize(";");
-                                $domain=$this->request_host;
-                                $path="/";
-                                $expires="";
-                                $secure=0;
-                                while (($name = strtolower(trim(UrlDecode($this->Tokenize("=")))))!="") {
-                                    $value=UrlDecode($this->Tokenize(";"));
-                                    switch ($name) {
-                                        case "domain":
-                                            $domain=$value;
-                                            break;
-                                        case "path":
-                                            $path=$value;
-                                            break;
-                                        case "expires":
-                                            if (preg_match("/^((Mon|Monday|Tue|Tuesday|Wed|Wednesday|Thu|Thursday|Fri|Friday|Sat|Saturday|Sun|Sunday), )?([0-9]{2})\\-(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\\-([0-9]{2,4}) ([0-9]{2})\\:([0-9]{2})\\:([0-9]{2}) GMT\$/",$value,$matches)) {
-                                                $year=intval($matches[5]);
-                                                if($year<1900)
-                                                    $year+=($year<70 ? 2000 : 1900);
-                                                $expires="$year-".$this->months[$matches[4]]."-".$matches[3]." ".$matches[6].":".$matches[7].":".$matches[8];
-                                            }
-                                            break;
-                                        case "secure":
-                                            $secure=1;
-                                            break;
-                                    }
-                                }
-                                if(strlen($this->SetCookie($cookie_name, $cookie_value, $expires, $path , $domain, $secure, 1)))
-                                    $this->error="";
-                            }
-                        }
-                        break;
-                    case "connection":
-                        $this->force_close = $this->connection_close=!strcmp(strtolower($header_value),"close");
-                        break;
-                }
-            }
-        }
-        $this->chunked=$chunked;
-        if($this->content_length_set)
-            $this->connection_close=0;
-        return("");
-    }
-
-    public Function Redirect(&$headers)
-    {
-        if ($this->follow_redirect) {
-            if(!IsSet($headers["location"])
-            || (GetType($headers["location"])!="array"
-            && strlen($location=$headers["location"])==0)
-            || (GetType($headers["location"])=="array"
-            && strlen($location=$headers["location"][0])==0))
-                return($this->SetError("it was received a redirect without location URL", HTTP_CLIENT_ERROR_PROTOCOL_FAILURE));
-            if (strcmp($location[0],"/")) {
-                if(!($location_arguments=@parse_url($location)))
-                    return($this->SetError("the server did not return a valid redirection location URL", HTTP_CLIENT_ERROR_PROTOCOL_FAILURE));
-                if(!IsSet($location_arguments["scheme"]))
-                    $location=((GetType($end=strrpos($this->request_uri,"/"))=="integer" && $end>1) ? substr($this->request_uri,0,$end) : "")."/".$location;
-            }
-            if(!strcmp($location[0],"/"))
-                $location=$this->protocol."://".$this->host_name.($this->host_port ? ":".$this->host_port : "").$location;
-            $error=$this->GetRequestArguments($location,$arguments);
-            if(strlen($error))
-                return($this->SetError("could not process redirect url: ".$error, HTTP_CLIENT_ERROR_PROTOCOL_FAILURE));
-            $arguments["RequestMethod"]="GET";
-            if(strlen($error=$this->Close())==0
-            && strlen($error=$this->Open($arguments))==0
-            && strlen($error=$this->SendRequest($arguments))==0)
-            {
-                $this->redirection_level++;
-                if ($this->redirection_level>$this->redirection_limit) {
-                    $error="it was exceeded the limit of request redirections";
-                    $this->error_code = HTTP_CLIENT_ERROR_PROTOCOL_FAILURE;
-                } else
-                    $error=$this->ReadReplyHeaders($headers);
-                $this->redirection_level--;
-            }
-            if(strlen($error))
-                return($this->SetError($error, $this->error_code));
-        }
-        return("");
-    }
-
-    public Function Authenticate(&$headers, $proxy, &$proxy_authorization, &$user, &$password, &$realm, &$workstation)
-    {
-        if ($proxy) {
-            $authenticate_header="proxy-authenticate";
-            $authorization_header="Proxy-Authorization";
-            $authenticate_status="407";
-            $authentication_mechanism=$this->proxy_authentication_mechanism;
-        } else {
-            $authenticate_header="www-authenticate";
-            $authorization_header="Authorization";
-            $authenticate_status="401";
-            $authentication_mechanism=$this->authentication_mechanism;
-        }
-        if (IsSet($headers[$authenticate_header])) {
-            if(function_exists("class_exists")
-            && !class_exists("sasl_client_class"))
-                return($this->SetError("the SASL client class needs to be loaded to be able to authenticate".($proxy ? " with the proxy server" : "")." and access this site", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-            if(GetType($headers[$authenticate_header])=="array")
-                $authenticate=$headers[$authenticate_header];
-            else
-                $authenticate=array($headers[$authenticate_header]);
-            for ($response="", $mechanisms=array(),$m=0;$m<count($authenticate);$m++) {
-                $mechanism=$this->Tokenize($authenticate[$m]," ");
-                $response=$this->Tokenize("");
-                if (strlen($authentication_mechanism)) {
-                    if (!strcmp($authentication_mechanism,$mechanism)) {
-                        $mechanisms[]=$mechanism;
-                        break;
-                    }
-                } else
-                    $mechanisms[]=$mechanism;
-            }
-            $sasl=new sasl_client_class;
-            if(IsSet($user))
-                $sasl->SetCredential("user",$user);
-            if(IsSet($password))
-                $sasl->SetCredential("password",$password);
-            if(IsSet($realm))
-                $sasl->SetCredential("realm",$realm);
-            if(IsSet($workstation))
-                $sasl->SetCredential("workstation",$workstation);
-            $sasl->SetCredential("uri",$this->request_uri);
-            $sasl->SetCredential("method",$this->request_method);
-            $sasl->SetCredential("session",$this->session);
-            do {
-                $status=$sasl->Start($mechanisms,$message,$interactions);
-            } while ($status==SASL_INTERACT);
-            switch ($status) {
-                case SASL_CONTINUE:
-                    break;
-                case SASL_NOMECH:
-                    return($this->SetError(($proxy ? "proxy " : "")."authentication error: ".(strlen($authentication_mechanism) ? "authentication mechanism ".$authentication_mechanism." may not be used: " : "").$sasl->error, HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-                default:
-                    return($this->SetError("Could not start the SASL ".($proxy ? "proxy " : "")."authentication client: ".$sasl->error, HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-            }
-            if ($proxy >= 0) {
-                for (;;) {
-                    if(strlen($error=$this->ReadReplyBody($body,$this->file_buffer_length)))
-                        return($error);
-                    if(strlen($body)==0)
-                        break;
-                }
-            }
-            $authorization_value=$sasl->mechanism.(IsSet($message) ? " ".($sasl->encode_response ? base64_encode($message) : $message) : "");
-            $request_arguments=$this->request_arguments;
-            $arguments=$request_arguments;
-            $arguments["Headers"][$authorization_header]=$authorization_value;
-            if(!$proxy
-            && strlen($proxy_authorization))
-                $arguments["Headers"]["Proxy-Authorization"]=$proxy_authorization;
-            if(strlen($error=$this->Close())
-            || strlen($error=$this->Open($arguments)))
-                return($this->SetError($error, $this->error_code));
-            $authenticated=0;
-            if (IsSet($message)) {
-                if ($proxy < 0) {
-                    if(strlen($error=$this->ConnectFromProxy($arguments, $headers)))
-                        return($this->SetError($error, $this->error_code));
-                } else {
-                    if(strlen($error=$this->SendRequest($arguments))
-                    || strlen($error=$this->ReadReplyHeadersResponse($headers)))
-                        return($this->SetError($error, $this->error_code));
-                }
-                if(!IsSet($headers[$authenticate_header]))
-                    $authenticate=array();
-                elseif(GetType($headers[$authenticate_header])=="array")
-                    $authenticate=$headers[$authenticate_header];
-                else
-                    $authenticate=array($headers[$authenticate_header]);
-                for ($mechanism=0;$mechanism<count($authenticate);$mechanism++) {
-                    if (!strcmp($this->Tokenize($authenticate[$mechanism]," "),$sasl->mechanism)) {
-                        $response=$this->Tokenize("");
-                        break;
-                    }
-                }
-                switch ($this->response_status) {
-                    case $authenticate_status:
-                        break;
-                    case "301":
-                    case "302":
-                    case "303":
-                    case "307":
-                        if($proxy >= 0)
-                            return($this->Redirect($headers));
-                    default:
-                        if (intval($this->response_status/100)==2) {
-                            if($proxy)
-                                $proxy_authorization=$authorization_value;
-                            $authenticated=1;
-                            break;
-                        }
-                        if($proxy
-                        && !strcmp($this->response_status,"401"))
-                        {
-                            $proxy_authorization=$authorization_value;
-                            $authenticated=1;
-                            break;
-                        }
-                        return($this->SetError(($proxy ? "proxy " : "")."authentication error: ".$this->response_status." ".$this->response_message, HTTP_CLIENT_ERROR_PROTOCOL_FAILURE));
-                }
-            }
-            for (;!$authenticated;) {
-                do {
-                    $status=$sasl->Step($response,$message,$interactions);
-                } while ($status==SASL_INTERACT);
-                switch ($status) {
-                    case SASL_CONTINUE:
-                        $authorization_value=$sasl->mechanism.(IsSet($message) ? " ".($sasl->encode_response ? base64_encode($message) : $message) : "");
-                        $arguments=$request_arguments;
-                        $arguments["Headers"][$authorization_header]=$authorization_value;
-                        if(!$proxy
-                        && strlen($proxy_authorization))
-                            $arguments["Headers"]["Proxy-Authorization"]=$proxy_authorization;
-                        if ($proxy < 0) {
-                            if(strlen($error=$this->ConnectFromProxy($arguments, $headers)))
-                                return($this->SetError($error, $this->error_code));
-                        } else {
-                            if(strlen($error=$this->SendRequest($arguments))
-                            || strlen($error=$this->ReadReplyHeadersResponse($headers)))
-                                return($this->SetError($error, $this->error_code));
-                        }
-                        switch ($this->response_status) {
-                            case $authenticate_status:
-                                if(GetType($headers[$authenticate_header])=="array")
-                                    $authenticate=$headers[$authenticate_header];
-                                else
-                                    $authenticate=array($headers[$authenticate_header]);
-                                for ($response="",$mechanism=0;$mechanism<count($authenticate);$mechanism++) {
-                                    if (!strcmp($this->Tokenize($authenticate[$mechanism]," "),$sasl->mechanism)) {
-                                        $response=$this->Tokenize("");
-                                        break;
-                                    }
-                                }
-                                if ($proxy >= 0) {
-                                    for (;;) {
-                                        if(strlen($error=$this->ReadReplyBody($body,$this->file_buffer_length)))
-                                            return($error);
-                                        if(strlen($body)==0)
-                                            break;
-                                    }
-                                }
-                                $this->state="Connected";
-                                break;
-                            case "301":
-                            case "302":
-                            case "303":
-                            case "307":
-                                if($proxy >= 0)
-                                    return($this->Redirect($headers));
-                            default:
-                                if (intval($this->response_status/100)==2) {
-                                    if($proxy)
-                                        $proxy_authorization=$authorization_value;
-                                    $authenticated=1;
-                                    break;
-                                }
-                                if($proxy
-                                && !strcmp($this->response_status,"401"))
-                                {
-                                    $proxy_authorization=$authorization_value;
-                                    $authenticated=1;
-                                    break;
-                                }
-                                return($this->SetError(($proxy ? "proxy " : "")."authentication error: ".$this->response_status." ".$this->response_message));
-                        }
-                        break;
-                    default:
-                        return($this->SetError("Could not process the SASL ".($proxy ? "proxy " : "")."authentication step: ".$sasl->error, HTTP_CLIENT_ERROR_PROTOCOL_FAILURE));
-                }
-            }
-        }
-        return("");
-    }
-
-    public Function ReadReplyHeaders(&$headers)
-    {
-        if(strlen($error=$this->ReadReplyHeadersResponse($headers)))
-            return($error);
-        $proxy_authorization="";
-        while (!strcmp($this->response_status, "100")) {
-            $this->state="RequestSent";
-            if(strlen($error=$this->ReadReplyHeadersResponse($headers)))
-                return($error);
-        }
-        switch ($this->response_status) {
-            case "301":
-            case "302":
-            case "303":
-            case "307":
-                if(strlen($error=$this->Redirect($headers)))
-                    return($error);
-                break;
-            case "407":
-                if(strlen($error=$this->Authenticate($headers, 1, $proxy_authorization, $this->proxy_request_user, $this->proxy_request_password, $this->proxy_request_realm, $this->proxy_request_workstation)))
-                    return($error);
-                if(strcmp($this->response_status,"401"))
-                    return("");
-            case "401":
-                return($this->Authenticate($headers, 0, $proxy_authorization, $this->request_user, $this->request_password, $this->request_realm, $this->request_workstation));
-        }
-        return("");
-    }
-
-    public Function ReadReplyBody(&$body,$length)
-    {
-        $body="";
-        if(strlen($this->error))
-            return($this->error);
-        switch ($this->state) {
-            case "Disconnected":
-                return($this->SetError("connection was not yet established", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-            case "Connected":
-            case "ConnectedToProxy":
-                return($this->SetError("request was not sent", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-            case "RequestSent":
-                if(($error=$this->ReadReplyHeaders($headers))!="")
-                    return($error);
-                break;
-            case "GotReplyHeaders":
-                break;
-            case 'ResponseReceived':
-                $body = '';
-                return('');
-            default:
-                return($this->SetError("can not get request headers in the current connection state", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-        }
-        if($this->content_length_set)
-            $length=min($this->content_length-$this->read_length,$length);
-        $body = '';
-        if ($length>0) {
-            if(!$this->EndOfInput()
-            && ($body=$this->ReadBytes($length))=="")
-            {
-                if(strlen($this->error))
-                    return($this->SetError("could not get the request reply body: ".$this->error, $this->error_code));
-            }
-            $this->read_length+=strlen($body);
-            if($this->EndOfInput())
-                $this->state = 'ResponseReceived';
-        }
-        return("");
-    }
-
-    public Function ReadWholeReplyBody(&$body)
-    {
-        $body = '';
-        for (;;) {
-            if(strlen($error = $this->ReadReplyBody($block, $this->file_buffer_length)))
-                return($error);
-            if(strlen($block) == 0)
-                return('');
-            $body .= $block;
-        }
-    }
-
-    public Function SaveCookies(&$cookies, $domain='', $secure_only=0, $persistent_only=0)
-    {
-        $now=gmdate("Y-m-d H-i-s");
-        $cookies=array();
-        for ($secure_cookies=0,Reset($this->cookies);$secure_cookies<count($this->cookies);Next($this->cookies),$secure_cookies++) {
-            $secure=Key($this->cookies);
-            if(!$secure_only
-            || $secure)
-            {
-                for ($cookie_domain=0,Reset($this->cookies[$secure]);$cookie_domain<count($this->cookies[$secure]);Next($this->cookies[$secure]),$cookie_domain++) {
-                    $domain_pattern=Key($this->cookies[$secure]);
-                    $match=strlen($domain)-strlen($domain_pattern);
-                    if(strlen($domain)==0
-                    || ($match>=0
-                    && !strcmp($domain_pattern,substr($domain,$match))
-                    && ($match==0
-                    || $domain_pattern[0]=="."
-                    || $domain[$match-1]==".")))
-                    {
-                        for (Reset($this->cookies[$secure][$domain_pattern]),$path_part=0;$path_part<count($this->cookies[$secure][$domain_pattern]);Next($this->cookies[$secure][$domain_pattern]),$path_part++) {
-                            $path=Key($this->cookies[$secure][$domain_pattern]);
-                            for (Reset($this->cookies[$secure][$domain_pattern][$path]),$cookie=0;$cookie<count($this->cookies[$secure][$domain_pattern][$path]);Next($this->cookies[$secure][$domain_pattern][$path]),$cookie++) {
-                                $cookie_name=Key($this->cookies[$secure][$domain_pattern][$path]);
-                                $expires=$this->cookies[$secure][$domain_pattern][$path][$cookie_name]["expires"];
-                                if((!$persistent_only
-                                && strlen($expires)==0)
-                                || (strlen($expires)
-                                && strcmp($now,$expires)<0))
-                                    $cookies[$secure][$domain_pattern][$path][$cookie_name]=$this->cookies[$secure][$domain_pattern][$path][$cookie_name];
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    public Function SavePersistentCookies(&$cookies, $domain='', $secure_only=0)
-    {
-        $this->SaveCookies($cookies, $domain, $secure_only, 1);
-    }
-
-    public Function GetPersistentCookies(&$cookies, $domain='', $secure_only=0)
-    {
-        $this->SavePersistentCookies($cookies, $domain, $secure_only);
-    }
-
-    public Function RestoreCookies($cookies, $clear=1)
-    {
-        $new_cookies=($clear ? array() : $this->cookies);
-        for ($secure_cookies=0, Reset($cookies); $secure_cookies<count($cookies); Next($cookies), $secure_cookies++) {
-            $secure=Key($cookies);
-            if(GetType($secure)!="integer")
-                return($this->SetError("invalid cookie secure value type (".serialize($secure).")", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-            for ($cookie_domain=0,Reset($cookies[$secure]);$cookie_domain<count($cookies[$secure]);Next($cookies[$secure]),$cookie_domain++) {
-                $domain_pattern=Key($cookies[$secure]);
-                if(GetType($domain_pattern)!="string")
-                    return($this->SetError("invalid cookie domain value type (".serialize($domain_pattern).")", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-                for (Reset($cookies[$secure][$domain_pattern]),$path_part=0;$path_part<count($cookies[$secure][$domain_pattern]);Next($cookies[$secure][$domain_pattern]),$path_part++) {
-                    $path=Key($cookies[$secure][$domain_pattern]);
-                    if(GetType($path)!="string"
-                    || strcmp(substr($path, 0, 1), "/"))
-                        return($this->SetError("invalid cookie path value type (".serialize($path).")", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-                    for (Reset($cookies[$secure][$domain_pattern][$path]),$cookie=0;$cookie<count($cookies[$secure][$domain_pattern][$path]);Next($cookies[$secure][$domain_pattern][$path]),$cookie++) {
-                        $cookie_name=Key($cookies[$secure][$domain_pattern][$path]);
-                        $expires=$cookies[$secure][$domain_pattern][$path][$cookie_name]["expires"];
-                        $value=$cookies[$secure][$domain_pattern][$path][$cookie_name]["value"];
-                        if(GetType($expires)!="string"
-                        || (strlen($expires)
-                        && !preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}\$/", $expires)))
-                            return($this->SetError("invalid cookie expiry value type (".serialize($expires).")", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
-                        $new_cookies[$secure][$domain_pattern][$path][$cookie_name]=array(
-                            "name"=>$cookie_name,
-                            "value"=>$value,
-                            "domain"=>$domain_pattern,
-                            "path"=>$path,
-                            "expires"=>$expires,
-                            "secure"=>$secure
-                        );
-                    }
-                }
-            }
-        }
-        $this->cookies=$new_cookies;
-        return("");
-    }
-};
diff --git a/core/src/core/classes/interface.AjxpGroupPathProvider.php b/core/src/core/classes/interface.AjxpGroupPathProvider.php
deleted file mode 100644
index 5f82b57611..0000000000
--- a/core/src/core/classes/interface.AjxpGroupPathProvider.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * @package Pydio
- * @subpackage Core
- */
-interface AjxpGroupPathProvider
-{
-    /**
-     * @abstract
-     * @return String
-     */
-    public function getGroupPath();
-
-
-    /**
-     * @abstract
-     * @param String $groupPath
-     * @return void
-     */
-    public function setGroupPath($groupPath);
-
-}
diff --git a/core/src/core/classes/interface.AjxpWrapper.php b/core/src/core/classes/interface.AjxpWrapper.php
deleted file mode 100644
index 148ff8da18..0000000000
--- a/core/src/core/classes/interface.AjxpWrapper.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Defines the methods that an access driver must implement to be considered as a file wrapper.
- * @package Pydio
- * @subpackage Core
- * @interface AjxpWrapper
- */
-interface AjxpWrapper
-{
-    /**
-     * Get a "usable" reference to a file : the real file or a tmp copy.
-     *
-     * @param string $path
-     * @param bool $persistent
-     */
-    public static function getRealFSReference($path, $persistent = false);
-
-    /**
-     * Read a file (by chunks) and copy the data directly inside the given stream.
-     *
-     * @param string $path
-     * @param resource $stream
-     */
-    public static function copyFileInStream($path, $stream);
-
-    /**
-     * Chmod implementation for this type of access.
-     *
-     * @param string $path
-     * @param number $chmodValue
-     */
-    public static function changeMode($path, $chmodValue);
-
-    /**
-     * Describe whether the current wrapper operates on a remote server or not.
-     * @static
-     * @abstract
-     * @return boolean
-     */
-    public static function isRemote();
-
-    /**
-     * Describe whether the current wrapper can rewind a stream or not.
-     * @param String $url Url of the resource
-     * @static
-     * @abstract
-     * @return boolean
-     */
-    public static function isSeekable($url);
-
-    /**
-     *
-     *
-     * @return bool
-     */
-    public function dir_closedir();
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path
-     * @param int $options
-     * @return bool
-     */
-    public function dir_opendir($path , $options);
-
-    /**
-     * Enter description here...
-     *
-     * @return string
-     */
-    public function dir_readdir();
-
-    /**
-     * Enter description here...
-     *
-     * @return bool
-     */
-    public function dir_rewinddir();
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path
-     * @param int $mode
-     * @param int $options
-     * @return bool
-     */
-    public function mkdir($path , $mode , $options);
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path_from
-     * @param string $path_to
-     * @return bool
-     */
-    public function rename($path_from , $path_to);
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path
-     * @param int $options
-     * @return bool
-     */
-    public function rmdir($path , $options);
-
-    /**
-     * Enter description here...
-     *
-     */
-    public function stream_close();
-
-    /**
-     * Enter description here...
-     *
-     * @return bool
-     */
-    public function stream_eof();
-
-    /**
-     * Enter description here...
-     *
-     * @return bool
-     */
-    public function stream_flush();
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path
-     * @param string $mode
-     * @param int $options
-     * @param string &$opened_path
-     * @return bool
-     */
-    public function stream_open($path , $mode , $options , &$opened_path);
-
-    /**
-     * Enter description here...
-     *
-     * @param int $count
-     * @return string
-     */
-    public function stream_read($count);
-
-    /**
-     * Enter description here...
-     *
-     * @param int $offset
-     * @param int $whence = SEEK_SET
-     * @return bool
-     */
-    public function stream_seek($offset , $whence = SEEK_SET);
-
-    /**
-     * Enter description here...
-     *
-     * @return array
-     */
-    public function stream_stat();
-
-    /**
-     * Enter description here...
-     *
-     * @return int
-     */
-    public function stream_tell();
-
-    /**
-     * Enter description here...
-     *
-     * @param string $data
-     * @return int
-     */
-    public function stream_write($data);
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path
-     * @return bool
-     */
-    public function unlink($path);
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path
-     * @param int $flags
-     * @return array
-     */
-    public function url_stat($path , $flags);
-}
diff --git a/core/src/core/classes/interface.AjxpWrapperProvider.php b/core/src/core/classes/interface.AjxpWrapperProvider.php
deleted file mode 100644
index 118c9018e7..0000000000
--- a/core/src/core/classes/interface.AjxpWrapperProvider.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Interface must be implemented for access drivers that can be accessed via a wrapper protocol.
- * @package Pydio
- * @subpackage Core
- * @interface AjxpWrapperProvider
- */
-interface AjxpWrapperProvider
-{
-    /**
-     * Convert a path (from the repository root) to a fully
-     * qualified ajaxplorer url like ajxp.protocol://repoId/path/to/node
-     * @param String $path
-     * @return String
-     */
-    public function getResourceUrl($path);
-
-    /**
-     * Creates a directory
-     * @param String $path
-     * @param String $newDirName
-     */
-    public function mkDir($path, $newDirName);
-
-    /**
-     * Creates an empty file
-     * @param String $path
-     * @param String $newDirName
-     */
-    public function createEmptyFile($path, $newDirName);
-
-    /**
-     * @param String $from
-     * @param String $to
-     * @param Boolean $copy
-     */
-    public function nodeChanged(&$from, &$to, $copy = false);
-
-    /**
-     * @param String $node
-     * @param null $newSize
-     * @return
-     */
-    public function nodeWillChange($node, $newSize = null);
-
-    /**
-     * @param $nodePath
-     * @param $nodeName
-     * @param $isLeaf
-     * @param $lsOptions
-     * @return mixed
-     */
-    public function filterNodeName($nodePath, $nodeName, &$isLeaf, $lsOptions);
-}
diff --git a/core/src/core/classes/interface.SqlTableProvider.php b/core/src/core/classes/interface.SqlTableProvider.php
deleted file mode 100644
index b3b7769148..0000000000
--- a/core/src/core/classes/interface.SqlTableProvider.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Interface SqlTableProvider
- * Plugins that need to have their SQL tables installed at startup
- * must implement this interface.
- * @package Pydio
- * @subpackage Core
- * @interface SqlTableProvider
- */
-interface SqlTableProvider{
-
-    /**
-     * Install SQL table using a dibi driver data
-     * @param $param array("SQL_DRIVER" => $dibiDriverData)
-     * @return mixed
-     */
-    public function installSQLTables($param);
-
-}
\ No newline at end of file
diff --git a/core/src/core/classes/packer/class.JavaScriptPacker.php b/core/src/core/classes/packer/class.JavaScriptPacker.php
deleted file mode 100644
index 98d34ebb7f..0000000000
--- a/core/src/core/classes/packer/class.JavaScriptPacker.php
+++ /dev/null
@@ -1,777 +0,0 @@
-<?php
-/* 9 April 2008. version 1.1
- *
- * This is the php version of the Dean Edwards JavaScript's Packer,
- * Based on :
- *
- * ParseMaster, version 1.0.2 (2005-08-19) Copyright 2005, Dean Edwards
- * a multi-pattern parser.
- * KNOWN BUG: erroneous behavior when using escapeChar with a replacement
- * value that is a function
- *
- * packer, version 2.0.2 (2005-08-19) Copyright 2004-2005, Dean Edwards
- *
- * License: http://creativecommons.org/licenses/LGPL/2.1/
- *
- * Ported to PHP by Nicolas Martin.
- *
- * ----------------------------------------------------------------------
- * changelog:
- * 1.1 : correct a bug, '\0' packed then unpacked becomes '\'.
- * ----------------------------------------------------------------------
- *
- * examples of usage :
- * $myPacker = new JavaScriptPacker($script, 62, true, false);
- * $packed = $myPacker->pack();
- *
- * or
- *
- * $myPacker = new JavaScriptPacker($script, 'Normal', true, false);
- * $packed = $myPacker->pack();
- *
- * or (default values)
- *
- * $myPacker = new JavaScriptPacker($script);
- * $packed = $myPacker->pack();
- *
- *
- * params of the constructor :
- * $script:       the JavaScript to pack, string.
- * $encoding:     level of encoding, int or string :
- *                0,10,62,95 or 'None', 'Numeric', 'Normal', 'High ASCII'.
- *                default: 62.
- * $fastDecode:   include the fast decoder in the packed result, boolean.
- *                default : true.
- * $specialChars: if you are flagged your private and local variables
- *                in the script, boolean.
- *                default: false.
- *
- * The pack() method return the compressed JavasScript, as a string.
- *
- * see http://dean.edwards.name/packer/usage/ for more information.
- *
- * Notes :
- * # need PHP 5 . Tested with PHP 5.1.2, 5.1.3, 5.1.4, 5.2.3
- *
- * # The packed result may be different than with the Dean Edwards
- *   version, but with the same length. The reason is that the PHP
- *   function usort to sort array don't necessarily preserve the
- *   original order of two equal member. The Javascript sort function
- *   in fact preserve this order (but that's not require by the
- *   ECMAScript standard). So the encoded keywords order can be
- *   different in the two results.
- *
- * # Be careful with the 'High ASCII' Level encoding if you use
- *   UTF-8 in your files...
- */
-
-
-class JavaScriptPacker
-{
-    // constants
-    const IGNORE = '$1';
-
-    // validate parameters
-    private $_script = '';
-    private $_encoding = 62;
-    private $_fastDecode = true;
-    private $_specialChars = false;
-
-    private $LITERAL_ENCODING = array(
-        'None' => 0,
-        'Numeric' => 10,
-        'Normal' => 62,
-        'High ASCII' => 95
-    );
-
-    public function __construct($_script, $_encoding = 62, $_fastDecode = true, $_specialChars = false)
-    {
-        $this->_script = $_script . "\n";
-        if (array_key_exists($_encoding, $this->LITERAL_ENCODING))
-            $_encoding = $this->LITERAL_ENCODING[$_encoding];
-        $this->_encoding = min((int) $_encoding, 95);
-        $this->_fastDecode = $_fastDecode;
-        $this->_specialChars = $_specialChars;
-    }
-
-    public function pack()
-    {
-        $this->_addParser('_basicCompression');
-        if ($this->_specialChars)
-            $this->_addParser('_encodeSpecialChars');
-        if ($this->_encoding)
-            $this->_addParser('_encodeKeywords');
-
-        // go!
-        return $this->_pack($this->_script);
-    }
-
-    // apply all parsing routines
-    private function _pack($script)
-    {
-        for ($i = 0; isset($this->_parsers[$i]); $i++) {
-            $script = call_user_func(array(&$this,$this->_parsers[$i]), $script);
-        }
-        return $script;
-    }
-
-    // keep a list of parsing functions, they'll be executed all at once
-    private $_parsers = array();
-    private function _addParser($parser)
-    {
-        $this->_parsers[] = $parser;
-    }
-
-    // zero encoding - just removal of white space and comments
-    private function _basicCompression($script)
-    {
-        $parser = new ParseMaster();
-        // make safe
-        $parser->escapeChar = '\\';
-        // protect strings
-        $parser->add('/\'[^\'\\n\\r]*\'/', self::IGNORE);
-        $parser->add('/"[^"\\n\\r]*"/', self::IGNORE);
-        // remove comments
-        $parser->add('/\\/\\/[^\\n\\r]*[\\n\\r]/', ' ');
-        $parser->add('/\\/\\*[^*]*\\*+([^\\/][^*]*\\*+)*\\//', ' ');
-        // protect regular expressions
-        $parser->add('/\\s+(\\/[^\\/\\n\\r\\*][^\\/\\n\\r]*\\/g?i?)/', '$2'); // IGNORE
-        $parser->add('/[^\\w\\x24\\/\'"*)\\?:]\\/[^\\/\\n\\r\\*][^\\/\\n\\r]*\\/g?i?/', self::IGNORE);
-        // remove: ;;; doSomething();
-        if ($this->_specialChars) $parser->add('/;;;[^\\n\\r]+[\\n\\r]/');
-        // remove redundant semi-colons
-        $parser->add('/\\(;;\\)/', self::IGNORE); // protect for (;;) loops
-        $parser->add('/;+\\s*([};])/', '$2');
-        // apply the above
-        $script = $parser->exec($script);
-
-        // remove white-space
-        $parser->add('/(\\b|\\x24)\\s+(\\b|\\x24)/', '$2 $3');
-        $parser->add('/([+\\-])\\s+([+\\-])/', '$2 $3');
-        $parser->add('/\\s+/', '');
-        // done
-        return $parser->exec($script);
-    }
-
-    private function _encodeSpecialChars($script)
-    {
-        $parser = new ParseMaster();
-        // replace: $name -> n, $$name -> na
-        $parser->add('/((\\x24+)([a-zA-Z$_]+))(\\d*)/',
-                     array('fn' => '_replace_name')
-        );
-        // replace: _name -> _0, double-underscore (__name) is ignored
-        $regexp = '/\\b_[A-Za-z\\d]\\w*/';
-        // build the word list
-        $keywords = $this->_analyze($script, $regexp, '_encodePrivate');
-        // quick ref
-        $encoded = $keywords['encoded'];
-
-        $parser->add($regexp,
-            array(
-                'fn' => '_replace_encoded',
-                'data' => $encoded
-            )
-        );
-        return $parser->exec($script);
-    }
-
-    private function _encodeKeywords($script)
-    {
-        // escape high-ascii values already in the script (i.e. in strings)
-        if ($this->_encoding > 62)
-            $script = $this->_escape95($script);
-        // create the parser
-        $parser = new ParseMaster();
-        $encode = $this->_getEncoder($this->_encoding);
-        // for high-ascii, don't encode single character low-ascii
-        $regexp = ($this->_encoding > 62) ? '/\\w\\w+/' : '/\\w+/';
-        // build the word list
-        $keywords = $this->_analyze($script, $regexp, $encode);
-        $encoded = $keywords['encoded'];
-
-        // encode
-        $parser->add($regexp,
-            array(
-                'fn' => '_replace_encoded',
-                'data' => $encoded
-            )
-        );
-        if (empty($script)) return $script;
-        else {
-            //$res = $parser->exec($script);
-            //$res = $this->_bootStrap($res, $keywords);
-            //return $res;
-            return $this->_bootStrap($parser->exec($script), $keywords);
-        }
-    }
-
-    private function _analyze($script, $regexp, $encode)
-    {
-        // analyse
-        // retreive all words in the script
-        $all = array();
-        preg_match_all($regexp, $script, $all);
-        $_sorted = array(); // list of words sorted by frequency
-        $_encoded = array(); // dictionary of word->encoding
-        $_protected = array(); // instances of "protected" words
-        $all = $all[0]; // simulate the javascript comportement of global match
-        if (!empty($all)) {
-            $unsorted = array(); // same list, not sorted
-            $protected = array(); // "protected" words (dictionary of word->"word")
-            $value = array(); // dictionary of charCode->encoding (eg. 256->ff)
-            $this->_count = array(); // word->count
-            $i = count($all); $j = 0; //$word = null;
-            // count the occurrences - used for sorting later
-            do {
-                --$i;
-                $word = '$' . $all[$i];
-                if (!isset($this->_count[$word])) {
-                    $this->_count[$word] = 0;
-                    $unsorted[$j] = $word;
-                    // make a dictionary of all of the protected words in this script
-                    //  these are words that might be mistaken for encoding
-                    //if (is_string($encode) && method_exists($this, $encode))
-                    $values[$j] = call_user_func(array(&$this, $encode), $j);
-                    $protected['$' . $values[$j]] = $j++;
-                }
-                // increment the word counter
-                $this->_count[$word]++;
-            } while ($i > 0);
-            // prepare to sort the word list, first we must protect
-            //  words that are also used as codes. we assign them a code
-            //  equivalent to the word itself.
-            // e.g. if "do" falls within our encoding range
-            //      then we store keywords["do"] = "do";
-            // this avoids problems when decoding
-            $i = count($unsorted);
-            do {
-                $word = $unsorted[--$i];
-                if (isset($protected[$word]) /*!= null*/) {
-                    $_sorted[$protected[$word]] = substr($word, 1);
-                    $_protected[$protected[$word]] = true;
-                    $this->_count[$word] = 0;
-                }
-            } while ($i);
-
-            // sort the words by frequency
-            // Note: the javascript and php version of sort can be different :
-            // in php manual, usort :
-            // " If two members compare as equal,
-            // their order in the sorted array is undefined."
-            // so the final packed script is different of the Dean's javascript version
-            // but equivalent.
-            // the ECMAscript standard does not guarantee this behaviour,
-            // and thus not all browsers (e.g. Mozilla versions dating back to at
-            // least 2003) respect this.
-            usort($unsorted, array(&$this, '_sortWords'));
-            $j = 0;
-            // because there are "protected" words in the list
-            //  we must add the sorted words around them
-            do {
-                if (!isset($_sorted[$i]))
-                    $_sorted[$i] = substr($unsorted[$j++], 1);
-                $_encoded[$_sorted[$i]] = $values[$i];
-            } while (++$i < count($unsorted));
-        }
-        return array(
-            'sorted'  => $_sorted,
-            'encoded' => $_encoded,
-            'protected' => $_protected);
-    }
-
-    private $_count = array();
-    private function _sortWords($match1, $match2)
-    {
-        return $this->_count[$match2] - $this->_count[$match1];
-    }
-
-    // build the boot function used for loading and decoding
-    private function _bootStrap($packed, $keywords)
-    {
-        $ENCODE = $this->_safeRegExp('$encode\\($count\\)');
-
-        // $packed: the packed script
-        $packed = "'" . $this->_escape($packed) . "'";
-
-        // $ascii: base for encoding
-        $ascii = min(count($keywords['sorted']), $this->_encoding);
-        if ($ascii == 0) $ascii = 1;
-
-        // $count: number of words contained in the script
-        $count = count($keywords['sorted']);
-
-        // $keywords: list of words contained in the script
-        foreach ($keywords['protected'] as $i=>$value) {
-            $keywords['sorted'][$i] = '';
-        }
-        // convert from a string to an array
-        ksort($keywords['sorted']);
-        $keywords = "'" . implode('|',$keywords['sorted']) . "'.split('|')";
-
-        $encode = ($this->_encoding > 62) ? '_encode95' : $this->_getEncoder($ascii);
-        $encode = $this->_getJSFunction($encode);
-        $encode = preg_replace('/_encoding/','$ascii', $encode);
-        $encode = preg_replace('/arguments\\.callee/','$encode', $encode);
-        $inline = '\\$count' . ($ascii > 10 ? '.toString(\\$ascii)' : '');
-
-        // $decode: code snippet to speed up decoding
-        if ($this->_fastDecode) {
-            // create the decoder
-            $decode = $this->_getJSFunction('_decodeBody');
-            if ($this->_encoding > 62)
-                $decode = preg_replace('/\\\\w/', '[\\xa1-\\xff]', $decode);
-            // perform the encoding inline for lower ascii values
-            elseif ($ascii < 36)
-                $decode = preg_replace($ENCODE, $inline, $decode);
-            // special case: when $count==0 there are no keywords. I want to keep
-            //  the basic shape of the unpacking funcion so i'll frig the code...
-            if ($count == 0)
-                $decode = preg_replace($this->_safeRegExp('($count)\\s*=\\s*1'), '$1=0', $decode, 1);
-        }
-
-        // boot function
-        $unpack = $this->_getJSFunction('_unpack');
-        if ($this->_fastDecode) {
-            // insert the decoder
-            $this->buffer = $decode;
-            $unpack = preg_replace_callback('/\\{/', array(&$this, '_insertFastDecode'), $unpack, 1);
-        }
-        $unpack = preg_replace('/"/', "'", $unpack);
-        if ($this->_encoding > 62) { // high-ascii
-            // get rid of the word-boundaries for regexp matches
-            $unpack = preg_replace('/\'\\\\\\\\b\'\s*\\+|\\+\s*\'\\\\\\\\b\'/', '', $unpack);
-        }
-        if ($ascii > 36 || $this->_encoding > 62 || $this->_fastDecode) {
-            // insert the encode function
-            $this->buffer = $encode;
-            $unpack = preg_replace_callback('/\\{/', array(&$this, '_insertFastEncode'), $unpack, 1);
-        } else {
-            // perform the encoding inline
-            $unpack = preg_replace($ENCODE, $inline, $unpack);
-        }
-        // pack the boot function too
-        $unpackPacker = new JavaScriptPacker($unpack, 0, false, true);
-        $unpack = $unpackPacker->pack();
-
-        // arguments
-        $params = array($packed, $ascii, $count, $keywords);
-        if ($this->_fastDecode) {
-            $params[] = 0;
-            $params[] = '{}';
-        }
-        $params = implode(',', $params);
-
-        // the whole thing
-        return 'eval(' . $unpack . '(' . $params . "))\n";
-    }
-
-    private $buffer;
-    private function _insertFastDecode($match)
-    {
-        return '{' . $this->buffer . ';';
-    }
-    private function _insertFastEncode($match)
-    {
-        return '{$encode=' . $this->buffer . ';';
-    }
-
-    // mmm.. ..which one do i need ??
-    private function _getEncoder($ascii)
-    {
-        return $ascii > 10 ? $ascii > 36 ? $ascii > 62 ?
-               '_encode95' : '_encode62' : '_encode36' : '_encode10';
-    }
-
-    // zero encoding
-    // characters: 0123456789
-    private function _encode10($charCode)
-    {
-        return $charCode;
-    }
-
-    // inherent base36 support
-    // characters: 0123456789abcdefghijklmnopqrstuvwxyz
-    private function _encode36($charCode)
-    {
-        return base_convert($charCode, 10, 36);
-    }
-
-    // hitch a ride on base36 and add the upper case alpha characters
-    // characters: 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ
-    private function _encode62($charCode)
-    {
-        $res = '';
-        if ($charCode >= $this->_encoding) {
-            $res = $this->_encode62((int) ($charCode / $this->_encoding));
-        }
-        $charCode = $charCode % $this->_encoding;
-
-        if ($charCode > 35)
-            return $res . chr($charCode + 29);
-        else
-            return $res . base_convert($charCode, 10, 36);
-    }
-
-    // use high-ascii values
-    // characters: ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþ
-    private function _encode95($charCode)
-    {
-        $res = '';
-        if ($charCode >= $this->_encoding)
-            $res = $this->_encode95($charCode / $this->_encoding);
-
-        return $res . chr(($charCode % $this->_encoding) + 161);
-    }
-
-    private function _safeRegExp($string)
-    {
-        return '/'.preg_replace('/\$/', '\\\$', $string).'/';
-    }
-
-    private function _encodePrivate($charCode)
-    {
-        return "_" . $charCode;
-    }
-
-    // protect characters used by the parser
-    private function _escape($script)
-    {
-        return preg_replace('/([\\\\\'])/', '\\\$1', $script);
-    }
-
-    // protect high-ascii characters already in the script
-    private function _escape95($script)
-    {
-        return preg_replace_callback(
-            '/[\\xa1-\\xff]/',
-            array(&$this, '_escape95Bis'),
-            $script
-        );
-    }
-    private function _escape95Bis($match)
-    {
-        return '\x'.((string) dechex(ord($match)));
-    }
-
-
-    private function _getJSFunction($aName)
-    {
-        if (defined('self::JSFUNCTION'.$aName))
-            return constant('self::JSFUNCTION'.$aName);
-        else
-            return '';
-    }
-
-    // JavaScript Functions used.
-    // Note : In Dean's version, these functions are converted
-    // with 'String(aFunctionName);'.
-    // This internal conversion complete the original code, ex :
-    // 'while (aBool) anAction();' is converted to
-    // 'while (aBool) { anAction(); }'.
-    // The JavaScript functions below are corrected.
-
-    // unpacking function - this is the boot strap function
-    //  data extracted from this packing routine is passed to
-    //  this function when decoded in the target
-    // NOTE ! : without the ';' final.
-    const JSFUNCTION_unpack =
-
-'function($packed, $ascii, $count, $keywords, $encode, $decode) {
-    while ($count--) {
-        if ($keywords[$count]) {
-            $packed = $packed.replace(new RegExp(\'\\\\b\' + $encode($count) + \'\\\\b\', \'g\'), $keywords[$count]);
-        }
-    }
-    return $packed;
-}';
-/*
-'function($packed, $ascii, $count, $keywords, $encode, $decode) {
-    while ($count--)
-        if ($keywords[$count])
-            $packed = $packed.replace(new RegExp(\'\\\\b\' + $encode($count) + \'\\\\b\', \'g\'), $keywords[$count]);
-    return $packed;
-}';
-*/
-
-    // code-snippet inserted into the unpacker to speed up decoding
-    const JSFUNCTION_decodeBody =
-//_decode = function() {
-// does the browser support String.replace where the
-//  replacement value is a function?
-
-'    if (!\'\'.replace(/^/, String)) {
-        // decode all the values we need
-        while ($count--) {
-            $decode[$encode($count)] = $keywords[$count] || $encode($count);
-        }
-        // global replacement function
-        $keywords = [function ($encoded) {return $decode[$encoded]}];
-        // generic match
-        $encode = function () {return \'\\\\w+\'};
-        // reset the loop counter -  we are now doing a global replace
-        $count = 1;
-    }
-';
-//};
-/*
-'	if (!\'\'.replace(/^/, String)) {
-        // decode all the values we need
-        while ($count--) $decode[$encode($count)] = $keywords[$count] || $encode($count);
-        // global replacement function
-        $keywords = [function ($encoded) {return $decode[$encoded]}];
-        // generic match
-        $encode = function () {return\'\\\\w+\'};
-        // reset the loop counter -  we are now doing a global replace
-        $count = 1;
-    }';
-*/
-
-     // zero encoding
-     // characters: 0123456789
-     const JSFUNCTION_encode10 =
-'function($charCode) {
-    return $charCode;
-}';//;';
-
-     // inherent base36 support
-     // characters: 0123456789abcdefghijklmnopqrstuvwxyz
-     const JSFUNCTION_encode36 =
-'function($charCode) {
-    return $charCode.toString(36);
-}';//;';
-
-    // hitch a ride on base36 and add the upper case alpha characters
-    // characters: 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ
-    const JSFUNCTION_encode62 =
-'function($charCode) {
-    return ($charCode < _encoding ? \'\' : arguments.callee(parseInt($charCode / _encoding))) +
-    (($charCode = $charCode % _encoding) > 35 ? String.fromCharCode($charCode + 29) : $charCode.toString(36));
-}';
-
-    // use high-ascii values
-    // characters: ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþ
-    const JSFUNCTION_encode95 =
-'function($charCode) {
-    return ($charCode < _encoding ? \'\' : arguments.callee($charCode / _encoding)) +
-        String.fromCharCode($charCode % _encoding + 161);
-}';
-
-}
-
-
-class ParseMaster
-{
-    public $ignoreCase = false;
-    public $escapeChar = '';
-
-    // constants
-    const EXPRESSION = 0;
-    const REPLACEMENT = 1;
-    const LENGTH = 2;
-
-    // used to determine nesting levels
-    private $GROUPS = '/\\(/';//g
-    private $SUB_REPLACE = '/\\$\\d/';
-    private $INDEXED = '/^\\$\\d+$/';
-    private $TRIM = '/([\'"])\\1\\.(.*)\\.\\1\\1$/';
-    private $ESCAPE = '/\\\./';//g
-    private $QUOTE = '/\'/';
-    private $DELETED = '/\\x01[^\\x01]*\\x01/';//g
-
-    public function add($expression, $replacement = '')
-    {
-        // count the number of sub-expressions
-        //  - add one because each pattern is itself a sub-expression
-        $length = 1 + preg_match_all($this->GROUPS, $this->_internalEscape((string) $expression), $out);
-
-        // treat only strings $replacement
-        if (is_string($replacement)) {
-            // does the pattern deal with sub-expressions?
-            if (preg_match($this->SUB_REPLACE, $replacement)) {
-                // a simple lookup? (e.g. "$2")
-                if (preg_match($this->INDEXED, $replacement)) {
-                    // store the index (used for fast retrieval of matched strings)
-                    $replacement = (int) (substr($replacement, 1)) - 1;
-                } else { // a complicated lookup (e.g. "Hello $2 $1")
-                    // build a function to do the lookup
-                    $quote = preg_match($this->QUOTE, $this->_internalEscape($replacement))
-                             ? '"' : "'";
-                    $replacement = array(
-                        'fn' => '_backReferences',
-                        'data' => array(
-                            'replacement' => $replacement,
-                            'length' => $length,
-                            'quote' => $quote
-                        )
-                    );
-                }
-            }
-        }
-        // pass the modified arguments
-        if (!empty($expression)) $this->_add($expression, $replacement, $length);
-        else $this->_add('/^$/', $replacement, $length);
-    }
-
-    public function exec($string)
-    {
-        // execute the global replacement
-        $this->_escaped = array();
-
-        // simulate the _patterns.toSTring of Dean
-        $regexp = '/';
-        foreach ($this->_patterns as $reg) {
-            $regexp .= '(' . substr($reg[self::EXPRESSION], 1, -1) . ')|';
-        }
-        $regexp = substr($regexp, 0, -1) . '/';
-        $regexp .= ($this->ignoreCase) ? 'i' : '';
-
-        $string = $this->_escape($string, $this->escapeChar);
-        $string = preg_replace_callback(
-            $regexp,
-            array(
-                &$this,
-                '_replacement'
-            ),
-            $string
-        );
-        $string = $this->_unescape($string, $this->escapeChar);
-
-        return preg_replace($this->DELETED, '', $string);
-    }
-
-    public function reset()
-    {
-        // clear the patterns collection so that this object may be re-used
-        $this->_patterns = array();
-    }
-
-    // private
-    private $_escaped = array();  // escaped characters
-    private $_patterns = array(); // patterns stored by index
-
-    // create and add a new pattern to the patterns collection
-    private function _add()
-    {
-        $arguments = func_get_args();
-        $this->_patterns[] = $arguments;
-    }
-
-    // this is the global replace function (it's quite complicated)
-    private function _replacement($arguments)
-    {
-        if (empty($arguments)) return '';
-
-        $i = 1; $j = 0;
-        // loop through the patterns
-        while (isset($this->_patterns[$j])) {
-            $pattern = $this->_patterns[$j++];
-            // do we have a result?
-            if (isset($arguments[$i]) && ($arguments[$i] != '')) {
-                $replacement = $pattern[self::REPLACEMENT];
-
-                if (is_array($replacement) && isset($replacement['fn'])) {
-
-                    if (isset($replacement['data'])) $this->buffer = $replacement['data'];
-                    return call_user_func(array(&$this, $replacement['fn']), $arguments, $i);
-
-                } elseif (is_int($replacement)) {
-                    return $arguments[$replacement + $i];
-
-                }
-                $delete = ($this->escapeChar == '' ||
-                           strpos($arguments[$i], $this->escapeChar) === false)
-                        ? '' : "\x01" . $arguments[$i] . "\x01";
-                return $delete . $replacement;
-
-            // skip over references to sub-expressions
-            } else {
-                $i += $pattern[self::LENGTH];
-            }
-        }
-    }
-
-    private function _backReferences($match, $offset)
-    {
-        $replacement = $this->buffer['replacement'];
-        $quote = $this->buffer['quote'];
-        $i = $this->buffer['length'];
-        while ($i) {
-            $replacement = str_replace('$'.$i--, $match[$offset + $i], $replacement);
-        }
-        return $replacement;
-    }
-
-    private function _replace_name($match, $offset)
-    {
-        $length = strlen($match[$offset + 2]);
-        $start = $length - max($length - strlen($match[$offset + 3]), 0);
-        return substr($match[$offset + 1], $start, $length) . $match[$offset + 4];
-    }
-
-    private function _replace_encoded($match, $offset)
-    {
-        return $this->buffer[$match[$offset]];
-    }
-
-
-    // php : we cannot pass additional data to preg_replace_callback,
-    // and we cannot use &$this in create_function, so let's go to lower level
-    private $buffer;
-
-    // encode escaped characters
-    private function _escape($string, $escapeChar)
-    {
-        if ($escapeChar) {
-            $this->buffer = $escapeChar;
-            return preg_replace_callback(
-                '/\\' . $escapeChar . '(.)' .'/',
-                array(&$this, '_escapeBis'),
-                $string
-            );
-
-        } else {
-            return $string;
-        }
-    }
-    private function _escapeBis($match)
-    {
-        $this->_escaped[] = $match[1];
-        return $this->buffer;
-    }
-
-    // decode escaped characters
-    private function _unescape($string, $escapeChar)
-    {
-        if ($escapeChar) {
-            $regexp = '/'.'\\'.$escapeChar.'/';
-            $this->buffer = array('escapeChar'=> $escapeChar, 'i' => 0);
-            return preg_replace_callback
-            (
-                $regexp,
-                array(&$this, '_unescapeBis'),
-                $string
-            );
-
-        } else {
-            return $string;
-        }
-    }
-    private function _unescapeBis()
-    {
-        if (isset($this->_escaped[$this->buffer['i']])
-            && $this->_escaped[$this->buffer['i']] != '')
-        {
-             $temp = $this->_escaped[$this->buffer['i']];
-        } else {
-            $temp = '';
-        }
-        $this->buffer['i']++;
-        return $this->buffer['escapeChar'] . $temp;
-    }
-
-    private function _internalEscape($string)
-    {
-        return preg_replace($this->ESCAPE, '', $string);
-    }
-}
diff --git a/core/src/core/classes/packer/index.html b/core/src/core/classes/packer/index.html
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/core/src/core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_AuthBackendBasic.php b/core/src/core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_AuthBackendBasic.php
deleted file mode 100644
index 1aeb5559f3..0000000000
--- a/core/src/core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_AuthBackendBasic.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu <contact (at) cdujeu.me>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-
-class AJXP_Sabre_AuthBackendBasic extends Sabre\DAV\Auth\Backend\AbstractBasic
-{
-    protected $currentUser;
-    private $repositoryId;
-
-    /**
-     * Utilitary method to detect basic header.
-     * @return bool
-     */
-    public static function detectBasicHeader()
-    {
-        if(isSet($_SERVER["PHP_AUTH_USER"])) return true;
-        if(isSet($_SERVER["HTTP_AUTHORIZATION"])) $value = $_SERVER["HTTP_AUTHORIZATION"];
-        if(!isSet($value) && isSet($_SERVER["REDIRECT_HTTP_AUTHORIZATION"])) $value = $_SERVER["HTTP_AUTHORIZATION"];
-        if(!isSet($value)) return false;
-        return  (strpos(strtolower($value),'basic') ===0) ;
-    }
-
-    public function __construct($repositoryId)
-    {
-        $this->repositoryId = $repositoryId;
-    }
-
-
-    protected function validateUserPass($username, $password)
-    {
-        // Warning, this can only work if TRANSMIT_CLEAR_PASS is true;
-        return AuthService::checkPassword($username, $password, false, -1);
-    }
-
-    public function authenticate(Sabre\DAV\Server $server, $realm)
-    {
-        $auth = new Sabre\HTTP\BasicAuth();
-        $auth->setHTTPRequest($server->httpRequest);
-        $auth->setHTTPResponse($server->httpResponse);
-        $auth->setRealm($realm);
-        $userpass = $auth->getUserPass();
-        if (!$userpass) {
-            $auth->requireLogin();
-            throw new Sabre\DAV\Exception\NotAuthenticated('No basic authentication headers were found');
-        }
-
-        // Authenticates the user
-        //AJXP_Logger::info(__CLASS__,"authenticate",$userpass[0]);
-
-        $confDriver = ConfService::getConfStorageImpl();
-        $userObject = $confDriver->createUserObject($userpass[0]);
-        $webdavData = $userObject->getPref("AJXP_WEBDAV_DATA");
-        if (empty($webdavData) || !isset($webdavData["ACTIVE"]) || $webdavData["ACTIVE"] !== true) {
-            AJXP_Logger::warning(__CLASS__, "Login failed", array("user" => $userpass[0], "error" => "WebDAV user not found or disabled"));
-            throw new Sabre\DAV\Exception\NotAuthenticated();
-        }
-        // check if there are cached credentials. prevents excessive authentication calls to external
-        // auth mechanism.
-        $cachedPasswordValid = 0;
-        $secret = (defined("AJXP_SECRET_KEY")? AJXP_SECRET_KEY:"\1CDAFx¨op#");
-        $encryptedPass = md5($userpass[1].$secret.date('YmdHi'));
-        if (isSet($webdavData["TMP_PASS"]) && ($encryptedPass == $webdavData["TMP_PASS"])) {
-            $cachedPasswordValid = true;
-            //AJXP_Logger::debug("Using Cached Password");
-        }
-
-
-        if (!$cachedPasswordValid && (!$this->validateUserPass($userpass[0],$userpass[1]))) {
-            AJXP_Logger::warning(__CLASS__, "Login failed", array("user" => $userpass[0], "error" => "Invalid WebDAV user or password"));
-            $auth->requireLogin();
-            throw new Sabre\DAV\Exception\NotAuthenticated('Username or password does not match');
-        }
-        $this->currentUser = $userpass[0];
-
-        $res = AuthService::logUser($this->currentUser, $userpass[1], true);
-        if ($res < 1) {
-          throw new Sabre\DAV\Exception\NotAuthenticated();
-        }
-        $this->updateCurrentUserRights(AuthService::getLoggedUser());
-        if (ConfService::getCoreConf("SESSION_SET_CREDENTIALS", "auth")) {
-            AJXP_Safe::storeCredentials($this->currentUser, $userpass[1]);
-        }
-        if(isSet($this->repositoryId) && ConfService::getRepositoryById($this->repositoryId)->getOption("AJXP_WEBDAV_DISABLED") === true){
-            throw new Sabre\DAV\Exception\NotAuthenticated('You are not allowed to access this workspace');
-        }
-        ConfService::switchRootDir($this->repositoryId);
-        // the method used here will invalidate the cached password every minute on the minute
-        if (!$cachedPasswordValid) {
-            $webdavData["TMP_PASS"] = $encryptedPass;
-            $userObject->setPref("AJXP_WEBDAV_DATA", $webdavData);
-            $userObject->save("user");
-            AuthService::updateUser($userObject);
-        }
-
-        return true;
-    }
-
-
-    /**
-     * @param AbstractAjxpUser $user
-     * @return bool
-     */
-    protected function updateCurrentUserRights($user)
-    {
-        if ($this->repositoryId == null) {
-            return true;
-        }
-        if (!$user->canSwitchTo($this->repositoryId)) {
-            throw new Sabre\DAV\Exception\NotAuthenticated();
-        }
-    }
-
-
-}
diff --git a/core/src/core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_AuthBackendDigest.php b/core/src/core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_AuthBackendDigest.php
deleted file mode 100644
index 1324ae9494..0000000000
--- a/core/src/core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_AuthBackendDigest.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * @package Pydio
- * @subpackage SabreDav
- */
-class AJXP_Sabre_AuthBackendDigest extends Sabre\DAV\Auth\Backend\AbstractDigest
-{
-    protected $currentUser;
-    private $secretKey;
-    private $repositoryId;
-
-    public function __construct($repositoryId)
-    {
-        $this->repositoryId = $repositoryId;
-        if (defined('AJXP_SAFE_SECRET_KEY')) {
-            $this->secretKey = AJXP_SAFE_SECRET_KEY;
-        } else {
-            $this->secretKey = "\1CDAFx¨op#";
-        }
-    }
-
-    public function getDigestHash($realm, $username)
-    {
-        if (!AuthService::userExists($username)) {
-            return false;
-        }
-        $confDriver = ConfService::getConfStorageImpl();
-        $user = $confDriver->createUserObject($username);
-        $webdavData = $user->getPref("AJXP_WEBDAV_DATA");
-        if (empty($webdavData) || !isset($webdavData["ACTIVE"]) || $webdavData["ACTIVE"] !== true || (!isSet($webdavData["PASS"]) && !isset($webdavData["HA1"]) ) ) {
-            return false;
-        }
-        if (isSet($webdavData["HA1"])) {
-            return $webdavData["HA1"];
-        } else {
-            $pass = $this->_decodePassword($webdavData["PASS"], $username);
-            return md5("{$username}:{$realm}:{$pass}");
-        }
-
-    }
-
-    public function authenticate(Sabre\DAV\Server $server, $realm)
-    {
-        //AJXP_Logger::debug("Try authentication on $realm", $server);
-
-        try {
-          $success = parent::authenticate($server, $realm);
-        }
-        catch(Exception $e) {
-          $success = 0;
-          $errmsg = $e->getMessage();
-          if ($errmsg != "No digest authentication headers were found")
-            $success = false;
-        }
-        if ($success) {
-            $res = AuthService::logUser($this->currentUser, null, true);
-            if ($res < 1) {
-                throw new Sabre\DAV\Exception\NotAuthenticated();
-            }
-            $this->updateCurrentUserRights(AuthService::getLoggedUser());
-            if (ConfService::getCoreConf("SESSION_SET_CREDENTIALS", "auth")) {
-                $webdavData = AuthService::getLoggedUser()->getPref("AJXP_WEBDAV_DATA");
-                AJXP_Safe::storeCredentials($this->currentUser, $this->_decodePassword($webdavData["PASS"], $this->currentUser));
-            }
-        }
-        else {
-          if ($success === false) {
-            AJXP_Logger::warning(__CLASS__, "Login failed", array("user" => $this->currentUser, "error" => "Invalid WebDAV user or password"));
-          }
-          throw new Sabre\DAV\Exception\NotAuthenticated($errmsg);
-        }
-        ConfService::switchRootDir($this->repositoryId);
-        return true;
-    }
-
-    protected function updateCurrentUserRights($user)
-    {
-        if ($this->repositoryId == null) {
-            return true;
-        }
-        if (!$user->canSwitchTo($this->repositoryId)) {
-            throw new Sabre\DAV\Exception\NotAuthenticated();
-        }
-    }
-
-    private function _decodePassword($encoded, $user)
-    {
-        if (function_exists('mcrypt_decrypt')) {
-            $iv = mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB), MCRYPT_RAND);
-            $encoded = trim(mcrypt_decrypt(MCRYPT_RIJNDAEL_256, md5($user.$this->secretKey), base64_decode($encoded), MCRYPT_MODE_ECB, $iv), "\0");
-        }
-        return $encoded;
-    }
-
-
-
-}
diff --git a/core/src/core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_BrowserPlugin.php b/core/src/core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_BrowserPlugin.php
deleted file mode 100755
index 097db6bb0c..0000000000
--- a/core/src/core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_BrowserPlugin.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * @package Pydio
- * @subpackage SabreDav
- */
-class AJXP_Sabre_BrowserPlugin extends Sabre\DAV\Browser\Plugin
-{
-
-    protected $repositoryLabel;
-
-    public function __construct($currentRepositoryLabel = null)
-    {
-        parent::__construct(false, true);
-        $this->repositoryLabel = $currentRepositoryLabel;
-    }
-
-    public function generateDirectoryIndex($path)
-    {
-        $html = parent::generateDirectoryIndex($path);
-        $html = str_replace("image/vnd.microsoft.icon", "image/png", $html);
-
-        $title = ConfService::getCoreConf("APPLICATION_TITLE");
-        $html = preg_replace("/<title>(.*)<\/title>/i", '<title>'.$title.'</title>', $html);
-
-        $repoString = "</h1>";
-        if (!empty($this->repositoryLabel)) {
-            $repoString = " - ".$this->repositoryLabel."</h1><h2>Index of ".$this->escapeHTML($path)."/</h2>";
-        }
-        $html = preg_replace("/<h1>(.*)<\/h1>/i", "<h1>".$title.$repoString, $html);
-
-        $html = str_replace("h1 { font-size: 150% }", "h1 { font-size: 150% } \n h2 { font-size: 115% }", $html);
-
-        return $html;
-
-    }
-
-    public function getLocalAssetPath($name)
-    {
-        if ($name != "favicon.ico") {
-            return parent::getLocalAssetPath($name);
-        }
-        return AJXP_INSTALL_PATH."/plugins/gui.ajax/res/themes/orbit/images/html-folder.png";
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_Collection.php b/core/src/core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_Collection.php
deleted file mode 100755
index 497a3f35ac..0000000000
--- a/core/src/core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_Collection.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * @package Pydio
- * @subpackage SabreDav
- */
-class AJXP_Sabre_Collection extends AJXP_Sabre_Node implements Sabre\DAV\ICollection
-{
-
-    protected $children;
-
-    /**
-     * Creates a new file in the directory
-     *
-     * Data will either be supplied as a stream resource, or in certain cases
-     * as a string. Keep in mind that you may have to support either.
-     *
-     * After succesful creation of the file, you may choose to return the ETag
-     * of the new file here.
-     *
-     * The returned ETag must be surrounded by double-quotes (The quotes should
-     * be part of the actual string).
-     *
-     * If you cannot accurately determine the ETag, you should not return it.
-     * If you don't store the file exactly as-is (you're transforming it
-     * somehow) you should also not return an ETag.
-     *
-     * This means that if a subsequent GET to this new file does not exactly
-     * return the same contents of what was submitted here, you are strongly
-     * recommended to omit the ETag.
-     *
-     * @param string $name Name of the file
-     * @param resource|string $data Initial payload
-     * @return null|string
-     */
-    public function createFile($name, $data = null)
-    {
-        try {
-            $name = ltrim($name, "/");
-            AJXP_Logger::debug("CREATE FILE $name");
-
-            AJXP_Controller::findActionAndApply("mkfile", array(
-                "dir" => $this->path,
-                "filename" => $name
-            ), array());
-
-            if ( $data != null && is_file($this->getUrl()."/".$name)) {
-
-                $p = $this->path."/".$name;
-                $this->getAccessDriver()->nodeWillChange($p, intval($_SERVER["CONTENT_LENGTH"]));
-                //AJXP_Logger::debug("Should now copy stream or string in ".$this->getUrl()."/".$name);
-                if (is_resource($data)) {
-                    $stream = fopen($this->getUrl()."/".$name, "w");
-                    stream_copy_to_stream($data, $stream);
-                    fclose($stream);
-                } else if (is_string($data)) {
-                    file_put_contents($data, $this->getUrl()."/".$name);
-                }
-
-                $toto = null;
-                $this->getAccessDriver()->nodeChanged($toto, $p);
-
-            }
-            $node = new AJXP_Sabre_NodeLeaf($this->path."/".$name, $this->repository, $this->getAccessDriver());
-            if (isSet($this->children)) {
-                $this->children = null;
-            }
-            return $node->getETag();
-
-        } catch (Exception $e) {
-            AJXP_Logger::debug("Error ".$e->getMessage(), $e->getTraceAsString());
-            return null;
-        }
-
-
-    }
-
-    /**
-     * Creates a new subdirectory
-     *
-     * @param string $name
-     * @return void
-     */
-    public function createDirectory($name)
-    {
-        if (isSet($this->children)) {
-            $this->children = null;
-        }
-
-        AJXP_Controller::findActionAndApply("mkdir", array(
-            "dir" => $this->path,
-            "dirname" => $name
-        ), array());
-
-    }
-
-    /**
-     * Returns a specific child node, referenced by its name
-     *
-     * @param string $name
-     * @throws Sabre\DAV\Exception\NotFound
-     * @return Sabre\DAV\INode
-     */
-    public function getChild($name)
-    {
-        foreach ($this->getChildren() as $child) {
-
-            if ($child->getName()==$name) return $child;
-
-        }
-        throw new Sabre\DAV\Exception\NotFound('File not found: ' . $name);
-
-    }
-
-    /**
-     * Returns an array with all the child nodes
-     *
-     * @return Sabre\DAV\INode[]
-     */
-    public function getChildren()
-    {
-        if (isSet($this->children)) {
-            return $this->children;
-        }
-
-
-        $contents = array();
-        $errors = array();
-
-        $nodes = scandir($this->getUrl());
-
-        foreach ($nodes as $file) {
-            if ($file == "." || $file == "..") {
-                continue;
-            }
-            // This function will perform the is_dir() call and update $isLeaf variable.
-            $isLeaf = "";
-            if (!$this->getAccessDriver()->filterNodeName($this->getUrl(), $file, $isLeaf, array("d"=>true, "f"=>true, "z"=>true))){
-                continue;
-            }
-            if ( !$isLeaf ) {
-                // Add collection without any children
-                $contents[] = new AJXP_Sabre_Collection($this->path."/".$file, $this->repository, $this->getAccessDriver());
-            } else {
-                // Add files without content
-                $contents[] = new AJXP_Sabre_NodeLeaf($this->path."/".$file, $this->repository, $this->getAccessDriver());
-            }
-        }
-        $this->children = $contents;
-
-        $ajxpNode = new AJXP_Node($this->getUrl());
-        AJXP_Controller::applyHook("node.read", array(&$ajxpNode));
-
-        return $contents;
-
-    }
-
-    /**
-     * Checks if a child-node with the specified name exists
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function childExists($name)
-    {
-        foreach ($this->getChildren() as $child) {
-
-            if ($child->getName()==$name) return true;
-
-        }
-        return false;
-
-    }
-}
diff --git a/core/src/core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_Node.php b/core/src/core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_Node.php
deleted file mode 100755
index cc1243321a..0000000000
--- a/core/src/core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_Node.php
+++ /dev/null
@@ -1,243 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * @package Pydio
- * @subpackage SabreDav
- */
-class AJXP_Sabre_Node implements Sabre\DAV\INode, Sabre\DAV\IProperties
-{
-
-    /**
-     * @var Repository
-     */
-    protected $repository;
-    /**
-     * @var AjxpWrapperProvider
-     */
-    protected $accessDriver;
-
-    /**
-     * @var String
-     */
-    protected $url;
-    protected $path;
-
-    public function __construct($path, $repository, $accessDriver = null)
-    {
-        $this->repository = $repository;
-        $this->path = $path;
-        if ($accessDriver != null) {
-            $this->accessDriver = $accessDriver;
-        }
-    }
-
-    /**
-     * @param Repository $repository
-     */
-    public function updateRepository($repository){
-        $this->repository = $repository;
-    }
-
-    /**
-     * @return AjxpWrapperProvider
-     * @throws \Sabre\DAV\Exception\NotFound
-     */
-    public function getAccessDriver()
-    {
-        if (!isset($this->accessDriver)) {
-            //$RID = $this->repository->getId();
-            //ConfService::switchRootDir($RID);
-            ConfService::getConfStorageImpl();
-            $this->accessDriver = ConfService::loadDriverForRepository($this->repository);
-            if (!$this->accessDriver instanceof AjxpWrapperProvider) {
-                throw new Sabre\DAV\Exception\NotFound( $this->repository->getId() );
-            }
-            $this->accessDriver->detectStreamWrapper(true);
-        }
-        return $this->accessDriver;
-    }
-
-    /**
-     * @return String
-     */
-    public function getUrl()
-    {
-        if (!isSet($this->url)) {
-            $this->url = $this->getAccessDriver()->getResourceUrl($this->path);
-        }
-        return $this->url;
-    }
-
-    /**
-     * Deleted the current node
-     *
-     * @return void
-     */
-    public function delete()
-    {
-        ob_start();
-        try {
-            AJXP_Controller::findActionAndApply("delete", array(
-                "dir"       => dirname($this->path),
-                "file_0"    => $this->path
-            ), array());
-        } catch (Exception $e) {
-
-        }
-        ob_get_flush();
-        $this->putResourceData(array());
-
-    }
-
-    /**
-     * Returns the name of the node.
-     *
-     * This is used to generate the url.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return basename($this->getUrl());
-    }
-
-    /**
-     * Renames the node
-     *
-     * @param string $name The new name
-     * @return void
-     */
-    public function setName($name)
-    {
-        $data = $this->getResourceData();
-        ob_start();
-        AJXP_Controller::findActionAndApply("rename", array(
-            "filename_new"      => $name,
-            "dir"               => dirname($this->path),
-            "file"              => $this->path
-        ), array());
-        ob_get_flush();
-        $this->putResourceData(array());
-        $this->putResourceData($data, dirname($this->getUrl())."/".$name);
-    }
-
-    /**
-     * Returns the last modification time, as a unix timestamp
-     *
-     * @return int
-     */
-    public function getLastModified()
-    {
-        return filemtime($this->getUrl());
-    }
-
-
-    /**
-     * Updates properties on this node,
-     *
-     * @param array $properties
-     * @see Sabre\DAV\IProperties::updateProperties
-     * @return bool|array
-     */
-    public function updateProperties($properties)
-    {
-        $resourceData = $this->getResourceData();
-
-        foreach ($properties as $propertyName=>$propertyValue) {
-
-            // If it was null, we need to delete the property
-            if (is_null($propertyValue)) {
-                if (isset($resourceData['properties'][$propertyName])) {
-                    unset($resourceData['properties'][$propertyName]);
-                }
-            } else {
-                $resourceData['properties'][$propertyName] = $propertyValue;
-            }
-
-        }
-
-        //AJXP_Logger::debug("Saving Data", $resourceData);
-        $this->putResourceData($resourceData);
-        return true;
-    }
-
-    /**
-     * Returns a list of properties for this nodes.;
-     *
-     * The properties list is a list of propertynames the client requested, encoded as xmlnamespace#tagName, for example: http://www.example.org/namespace#author
-     * If the array is empty, all properties should be returned
-     *
-     * @param array $properties
-     * @return array
-     */
-    public function getProperties($properties)
-    {
-        $resourceData = $this->getResourceData();
-
-        // if the array was empty, we need to return everything
-        if (!$properties) return $resourceData['properties'];
-
-        $props = array();
-        foreach ($properties as $property) {
-            if (isset($resourceData['properties'][$property])) $props[$property] = $resourceData['properties'][$property];
-        }
-
-        return $props;
-
-    }
-
-    protected function putResourceData($array, $newURL = null)
-    {
-        $metaStore = $this->getMetastore();
-        if ($metaStore != false) {
-            $metaStore->setMetadata(new AJXP_Node(($newURL!=null?$newURL:$this->getUrl())), "SABRE_DAV", $array, false, AJXP_METADATA_SCOPE_GLOBAL);
-        }
-
-    }
-
-
-    protected function getResourceData()
-    {
-        $metaStore = $this->getMetastore();
-        $data = array();
-        if ($metaStore != false) {
-            $data = $metaStore->retrieveMetadata(new AJXP_Node($this->getUrl()), "SABRE_DAV", false, AJXP_METADATA_SCOPE_GLOBAL);
-        }
-        if (!isset($data['properties'])) $data['properties'] = array();
-        return $data;
-    }
-
-
-    /**
-     * @return MetaStoreProvider|bool
-     */
-    protected function getMetastore()
-    {
-        $metaStore = AJXP_PluginsService::getInstance()->getUniqueActivePluginForType("metastore");
-        if($metaStore === false) return false;
-        $metaStore->initMeta($this->getAccessDriver());
-        return $metaStore;
-    }
-
-
-}
diff --git a/core/src/core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_NodeLeaf.php b/core/src/core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_NodeLeaf.php
deleted file mode 100755
index 1bc9ca0cd4..0000000000
--- a/core/src/core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_NodeLeaf.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * @package AjaXplorer
- * @subpackage SabreDav
- */
-class AJXP_Sabre_NodeLeaf extends AJXP_Sabre_Node implements Sabre\DAV\IFile
-{
-
-    /**
-     * Updates the data
-     *
-     * The data argument is a readable stream resource.
-     *
-     * After a succesful put operation, you may choose to return an ETag. The
-     * etag must always be surrounded by double-quotes. These quotes must
-     * appear in the actual string you're returning.
-     *
-     * Clients may use the ETag from a PUT request to later on make sure that
-     * when they update the file, the contents haven't changed in the mean
-     * time.
-     *
-     * If you don't plan to store the file byte-by-byte, and you return a
-     * different object on a subsequent GET you are strongly recommended to not
-     * return an ETag, and just return null.
-     *
-     * @param resource $data
-     * @return string|null
-     */
-    public function put($data)
-    {
-        // Warning, passed by ref
-        $p = $this->path;
-
-        if (!AuthService::getLoggedUser()->canWrite($this->repository->getId())) {
-            throw new \Sabre\DAV\Exception\Forbidden() ;
-        }
-        $this->getAccessDriver()->nodeWillChange($p, intval($_SERVER["CONTENT_LENGTH"]));
-
-        $stream = fopen($this->getUrl(), "w");
-        stream_copy_to_stream($data, $stream);
-        fclose($stream);
-
-        $toto = null;
-        $this->getAccessDriver()->nodeChanged($toto, $p);
-
-        return $this->getETag();
-    }
-
-    /**
-     * Returns the data
-     *
-     * This method may either return a string or a readable stream resource
-     *
-     * @return mixed
-     */
-    public function get()
-    {
-        $ajxpNode = new AJXP_Node($this->getUrl());
-        AJXP_Controller::applyHook("node.read", array(&$ajxpNode));
-        return fopen($this->getUrl(), "r");
-    }
-
-    /**
-     * Returns the mime-type for a file
-     *
-     * If null is returned, we'll assume application/octet-stream
-     *
-     * @return void|string
-     */
-    public function getContentType()
-    {
-         //Get mimetype with fileinfo PECL extension
-        $fp = fopen($this->getUrl(), "r");
-        $fileMime = null;
-        if (class_exists("finfo")) {
-            $finfo = new finfo(FILEINFO_MIME);
-            $fileMime = $finfo->buffer(fread($fp, 100));
-        } elseif (function_exists("mime_content_type")) {
-            $fileMime = @mime_content_type($fp);
-        } else {
-            $fileExt = substr(strrchr(basename($this->getUrl()), '.'), 1);
-            if(empty($fileExt))
-                $fileMime = "application/octet-stream";
-            else {
-                $regex = "/^([\w\+\-\.\/]+)\s+(\w+\s)*($fileExt\s)/i";
-                $lines = file( AJXP_CONF_PATH ."/mime.types");
-                foreach ($lines as $line) {
-                    if(substr($line, 0, 1) == '#')
-                        continue; // skip comments
-                    $line = rtrim($line) . " ";
-                    if(!preg_match($regex, $line, $matches))
-                        continue; // no match to the extension
-                    $fileMime = $matches[1];
-                }
-            }
-        }
-        fclose($fp);
-        return $fileMime;
-        /*
-        if ( $this->options->useMimeExts && ezcBaseFeatures::hasExtensionSupport( 'fileinfo' ) ) {
-            $fInfo = new fInfo( FILEINFO_MIME );
-            $mimeType = $fInfo->file( $this->getUrl() );
-
-            // The documentation tells to do this, but it does not work with a
-            // current version of pecl/fileinfo
-            // $fInfo->close();
-
-            return $mimeType;
-        }
-
-        // Check if extension ext/mime-magic is usable.
-        if ( $this->options->useMimeExts &&
-            ezcBaseFeatures::hasExtensionSupport( 'mime_magic' ) &&
-            ( $mimeType = mime_content_type( $this->getUrl() ) ) !== false )
-        {
-            return $mimeType;
-        }
-        */
-    }
-
-    /**
-     * Returns the ETag for a file
-     *
-     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
-     *
-     * Return null if the ETag can not effectively be determined
-     *
-     * @return String|null
-     */
-    public function getETag()
-    {
-        clearstatcache();
-        return '"'.md5(
-            $this->path
-                . $this->getSize()
-                . date( 'c', $this->getLastModified() )
-        ).'"';
-    }
-
-    /**
-     * Returns the size of the node, in bytes
-     *
-     * @return int
-     */
-    public function getSize()
-    {
-        return filesize($this->getUrl());
-    }
-
-
-
-
-}
diff --git a/core/src/core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_RootCollection.php b/core/src/core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_RootCollection.php
deleted file mode 100755
index ec523a08e5..0000000000
--- a/core/src/core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_RootCollection.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * @package Pydio
- * @subpackage SabreDav
- */
-class AJXP_Sabre_RootCollection extends Sabre\DAV\SimpleCollection
-{
-
-    public function getChildren()
-    {
-        $this->children = array();
-        $u = AuthService::getLoggedUser();
-        if ($u != null) {
-            $repos = ConfService::getAccessibleRepositories($u);
-            // Refilter to make sure the driver is an AjxpWebdavProvider
-            foreach ($repos as $repository) {
-                $accessType = $repository->getAccessType();
-                $driver = AJXP_PluginsService::getInstance()->getPluginByTypeName("access", $accessType);
-                if (is_a($driver, "AjxpWrapperProvider") && $repository->getOption("AJXP_WEBDAV_DISABLED") !== true) {
-                    $this->children[$repository->getSlug()] = new Sabre\DAV\SimpleCollection($repository->getSlug());
-                }
-            }
-        }
-        return $this->children;
-    }
-
-    public function childExists($name)
-    {
-        $c = $this->getChildren();
-        return array_key_exists($name, $c);
-    }
-
-    public function getChild($name)
-    {
-        $c = $this->getChildren();
-        return $c[$name];
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Backend/AbstractBackend.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Backend/AbstractBackend.php
deleted file mode 100644
index c83409eab1..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Backend/AbstractBackend.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Backend;
-
-use Sabre\VObject;
-use Sabre\CalDAV;
-
-/**
- * Abstract Calendaring backend. Extend this class to create your own backends.
- *
- * Checkout the BackendInterface for all the methods that must be implemented.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-abstract class AbstractBackend implements BackendInterface {
-
-    /**
-     * Updates properties for a calendar.
-     *
-     * The mutations array uses the propertyName in clark-notation as key,
-     * and the array value for the property value. In the case a property
-     * should be deleted, the property value will be null.
-     *
-     * This method must be atomic. If one property cannot be changed, the
-     * entire operation must fail.
-     *
-     * If the operation was successful, true can be returned.
-     * If the operation failed, false can be returned.
-     *
-     * Deletion of a non-existent property is always successful.
-     *
-     * Lastly, it is optional to return detailed information about any
-     * failures. In this case an array should be returned with the following
-     * structure:
-     *
-     * array(
-     *   403 => array(
-     *      '{DAV:}displayname' => null,
-     *   ),
-     *   424 => array(
-     *      '{DAV:}owner' => null,
-     *   )
-     * )
-     *
-     * In this example it was forbidden to update {DAV:}displayname.
-     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
-     * (424 Failed Dependency) because the request needs to be atomic.
-     *
-     * @param mixed $calendarId
-     * @param array $mutations
-     * @return bool|array
-     */
-    public function updateCalendar($calendarId, array $mutations) {
-
-        return false;
-
-    }
-
-    /**
-     * Performs a calendar-query on the contents of this calendar.
-     *
-     * The calendar-query is defined in RFC4791 : CalDAV. Using the
-     * calendar-query it is possible for a client to request a specific set of
-     * object, based on contents of iCalendar properties, date-ranges and
-     * iCalendar component types (VTODO, VEVENT).
-     *
-     * This method should just return a list of (relative) urls that match this
-     * query.
-     *
-     * The list of filters are specified as an array. The exact array is
-     * documented by \Sabre\CalDAV\CalendarQueryParser.
-     *
-     * Note that it is extremely likely that getCalendarObject for every path
-     * returned from this method will be called almost immediately after. You
-     * may want to anticipate this to speed up these requests.
-     *
-     * This method provides a default implementation, which parses *all* the
-     * iCalendar objects in the specified calendar.
-     *
-     * This default may well be good enough for personal use, and calendars
-     * that aren't very large. But if you anticipate high usage, big calendars
-     * or high loads, you are strongly adviced to optimize certain paths.
-     *
-     * The best way to do so is override this method and to optimize
-     * specifically for 'common filters'.
-     *
-     * Requests that are extremely common are:
-     *   * requests for just VEVENTS
-     *   * requests for just VTODO
-     *   * requests with a time-range-filter on either VEVENT or VTODO.
-     *
-     * ..and combinations of these requests. It may not be worth it to try to
-     * handle every possible situation and just rely on the (relatively
-     * easy to use) CalendarQueryValidator to handle the rest.
-     *
-     * Note that especially time-range-filters may be difficult to parse. A
-     * time-range filter specified on a VEVENT must for instance also handle
-     * recurrence rules correctly.
-     * A good example of how to interprete all these filters can also simply
-     * be found in \Sabre\CalDAV\CalendarQueryFilter. This class is as correct
-     * as possible, so it gives you a good idea on what type of stuff you need
-     * to think of.
-     *
-     * @param mixed $calendarId
-     * @param array $filters
-     * @return array
-     */
-    public function calendarQuery($calendarId, array $filters) {
-
-        $result = array();
-        $objects = $this->getCalendarObjects($calendarId);
-
-        $validator = new \Sabre\CalDAV\CalendarQueryValidator();
-
-        foreach($objects as $object) {
-
-            if ($this->validateFilterForObject($object, $filters)) {
-                $result[] = $object['uri'];
-            }
-
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * This method validates if a filters (as passed to calendarQuery) matches
-     * the given object.
-     *
-     * @param array $object
-     * @param array $filters
-     * @return bool
-     */
-    protected function validateFilterForObject(array $object, array $filters) {
-
-        // Unfortunately, setting the 'calendardata' here is optional. If
-        // it was excluded, we actually need another call to get this as
-        // well.
-        if (!isset($object['calendardata'])) {
-            $object = $this->getCalendarObject($object['calendarid'], $object['uri']);
-        }
-
-        $data = is_resource($object['calendardata'])?stream_get_contents($object['calendardata']):$object['calendardata'];
-        $vObject = VObject\Reader::read($data);
-
-        $validator = new CalDAV\CalendarQueryValidator();
-        return $validator->validate($vObject, $filters);
-
-    }
-
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Backend/BackendInterface.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Backend/BackendInterface.php
deleted file mode 100644
index 0dc31e5f4a..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Backend/BackendInterface.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Backend;
-
-/**
- * Every CalDAV backend must at least implement this interface.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface BackendInterface {
-
-    /**
-     * Returns a list of calendars for a principal.
-     *
-     * Every project is an array with the following keys:
-     *  * id, a unique id that will be used by other functions to modify the
-     *    calendar. This can be the same as the uri or a database key.
-     *  * uri, which the basename of the uri with which the calendar is
-     *    accessed.
-     *  * principaluri. The owner of the calendar. Almost always the same as
-     *    principalUri passed to this method.
-     *
-     * Furthermore it can contain webdav properties in clark notation. A very
-     * common one is '{DAV:}displayname'.
-     *
-     * @param string $principalUri
-     * @return array
-     */
-    public function getCalendarsForUser($principalUri);
-
-    /**
-     * Creates a new calendar for a principal.
-     *
-     * If the creation was a success, an id must be returned that can be used to reference
-     * this calendar in other methods, such as updateCalendar.
-     *
-     * @param string $principalUri
-     * @param string $calendarUri
-     * @param array $properties
-     * @return void
-     */
-    public function createCalendar($principalUri,$calendarUri,array $properties);
-
-    /**
-     * Updates properties for a calendar.
-     *
-     * The mutations array uses the propertyName in clark-notation as key,
-     * and the array value for the property value. In the case a property
-     * should be deleted, the property value will be null.
-     *
-     * This method must be atomic. If one property cannot be changed, the
-     * entire operation must fail.
-     *
-     * If the operation was successful, true can be returned.
-     * If the operation failed, false can be returned.
-     *
-     * Deletion of a non-existent property is always successful.
-     *
-     * Lastly, it is optional to return detailed information about any
-     * failures. In this case an array should be returned with the following
-     * structure:
-     *
-     * array(
-     *   403 => array(
-     *      '{DAV:}displayname' => null,
-     *   ),
-     *   424 => array(
-     *      '{DAV:}owner' => null,
-     *   )
-     * )
-     *
-     * In this example it was forbidden to update {DAV:}displayname.
-     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
-     * (424 Failed Dependency) because the request needs to be atomic.
-     *
-     * @param mixed $calendarId
-     * @param array $mutations
-     * @return bool|array
-     */
-    public function updateCalendar($calendarId, array $mutations);
-
-    /**
-     * Delete a calendar and all it's objects
-     *
-     * @param mixed $calendarId
-     * @return void
-     */
-    public function deleteCalendar($calendarId);
-
-    /**
-     * Returns all calendar objects within a calendar.
-     *
-     * Every item contains an array with the following keys:
-     *   * id - unique identifier which will be used for subsequent updates
-     *   * calendardata - The iCalendar-compatible calendar data
-     *   * uri - a unique key which will be used to construct the uri. This can be any arbitrary string.
-     *   * lastmodified - a timestamp of the last modification time
-     *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
-     *   '  "abcdef"')
-     *   * calendarid - The calendarid as it was passed to this function.
-     *   * size - The size of the calendar objects, in bytes.
-     *
-     * Note that the etag is optional, but it's highly encouraged to return for
-     * speed reasons.
-     *
-     * The calendardata is also optional. If it's not returned
-     * 'getCalendarObject' will be called later, which *is* expected to return
-     * calendardata.
-     *
-     * If neither etag or size are specified, the calendardata will be
-     * used/fetched to determine these numbers. If both are specified the
-     * amount of times this is needed is reduced by a great degree.
-     *
-     * @param mixed $calendarId
-     * @return array
-     */
-    public function getCalendarObjects($calendarId);
-
-    /**
-     * Returns information from a single calendar object, based on it's object
-     * uri.
-     *
-     * The returned array must have the same keys as getCalendarObjects. The
-     * 'calendardata' object is required here though, while it's not required
-     * for getCalendarObjects.
-     *
-     * This method must return null if the object did not exist.
-     *
-     * @param mixed $calendarId
-     * @param string $objectUri
-     * @return array|null
-     */
-    public function getCalendarObject($calendarId,$objectUri);
-
-    /**
-     * Creates a new calendar object.
-     *
-     * It is possible return an etag from this function, which will be used in
-     * the response to this PUT request. Note that the ETag must be surrounded
-     * by double-quotes.
-     *
-     * However, you should only really return this ETag if you don't mangle the
-     * calendar-data. If the result of a subsequent GET to this object is not
-     * the exact same as this request body, you should omit the ETag.
-     *
-     * @param mixed $calendarId
-     * @param string $objectUri
-     * @param string $calendarData
-     * @return string|null
-     */
-    public function createCalendarObject($calendarId,$objectUri,$calendarData);
-
-    /**
-     * Updates an existing calendarobject, based on it's uri.
-     *
-     * It is possible return an etag from this function, which will be used in
-     * the response to this PUT request. Note that the ETag must be surrounded
-     * by double-quotes.
-     *
-     * However, you should only really return this ETag if you don't mangle the
-     * calendar-data. If the result of a subsequent GET to this object is not
-     * the exact same as this request body, you should omit the ETag.
-     *
-     * @param mixed $calendarId
-     * @param string $objectUri
-     * @param string $calendarData
-     * @return string|null
-     */
-    public function updateCalendarObject($calendarId,$objectUri,$calendarData);
-
-    /**
-     * Deletes an existing calendar object.
-     *
-     * @param mixed $calendarId
-     * @param string $objectUri
-     * @return void
-     */
-    public function deleteCalendarObject($calendarId,$objectUri);
-
-    /**
-     * Performs a calendar-query on the contents of this calendar.
-     *
-     * The calendar-query is defined in RFC4791 : CalDAV. Using the
-     * calendar-query it is possible for a client to request a specific set of
-     * object, based on contents of iCalendar properties, date-ranges and
-     * iCalendar component types (VTODO, VEVENT).
-     *
-     * This method should just return a list of (relative) urls that match this
-     * query.
-     *
-     * The list of filters are specified as an array. The exact array is
-     * documented by Sabre\CalDAV\CalendarQueryParser.
-     *
-     * Note that it is extremely likely that getCalendarObject for every path
-     * returned from this method will be called almost immediately after. You
-     * may want to anticipate this to speed up these requests.
-     *
-     * This method provides a default implementation, which parses *all* the
-     * iCalendar objects in the specified calendar.
-     *
-     * This default may well be good enough for personal use, and calendars
-     * that aren't very large. But if you anticipate high usage, big calendars
-     * or high loads, you are strongly adviced to optimize certain paths.
-     *
-     * The best way to do so is override this method and to optimize
-     * specifically for 'common filters'.
-     *
-     * Requests that are extremely common are:
-     *   * requests for just VEVENTS
-     *   * requests for just VTODO
-     *   * requests with a time-range-filter on either VEVENT or VTODO.
-     *
-     * ..and combinations of these requests. It may not be worth it to try to
-     * handle every possible situation and just rely on the (relatively
-     * easy to use) CalendarQueryValidator to handle the rest.
-     *
-     * Note that especially time-range-filters may be difficult to parse. A
-     * time-range filter specified on a VEVENT must for instance also handle
-     * recurrence rules correctly.
-     * A good example of how to interprete all these filters can also simply
-     * be found in Sabre\CalDAV\CalendarQueryFilter. This class is as correct
-     * as possible, so it gives you a good idea on what type of stuff you need
-     * to think of.
-     *
-     * @param mixed $calendarId
-     * @param array $filters
-     * @return array
-     */
-    public function calendarQuery($calendarId, array $filters);
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Backend/NotificationSupport.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Backend/NotificationSupport.php
deleted file mode 100644
index 96533ad6ab..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Backend/NotificationSupport.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Backend;
-
-/**
- * Adds caldav notification support to a backend.
- *
- * Note: This feature is experimental, and may change in between different
- * SabreDAV versions.
- *
- * Notifications are defined at:
- * http://svn.calendarserver.org/repository/calendarserver/CalendarServer/trunk/doc/Extensions/caldav-notifications.txt
- *
- * These notifications are basically a list of server-generated notifications
- * displayed to the user. Users can dismiss notifications by deleting them.
- *
- * The primary usecase is to allow for calendar-sharing.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface NotificationSupport extends BackendInterface {
-
-    /**
-     * Returns a list of notifications for a given principal url.
-     *
-     * The returned array should only consist of implementations of
-     * \Sabre\CalDAV\Notifications\INotificationType.
-     *
-     * @param string $principalUri
-     * @return array
-     */
-    public function getNotificationsForPrincipal($principalUri);
-
-    /**
-     * This deletes a specific notifcation.
-     *
-     * This may be called by a client once it deems a notification handled.
-     *
-     * @param string $principalUri
-     * @param \Sabre\CalDAV\Notifications\INotificationType $notification
-     * @return void
-     */
-    public function deleteNotification($principalUri, \Sabre\CalDAV\Notifications\INotificationType $notification);
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Backend/PDO.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Backend/PDO.php
deleted file mode 100644
index 2e93a7b252..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Backend/PDO.php
+++ /dev/null
@@ -1,691 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Backend;
-
-use Sabre\VObject;
-use Sabre\CalDAV;
-use Sabre\DAV;
-
-/**
- * PDO CalDAV backend
- *
- * This backend is used to store calendar-data in a PDO database, such as
- * sqlite or MySQL
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class PDO extends AbstractBackend {
-
-    /**
-     * We need to specify a max date, because we need to stop *somewhere*
-     *
-     * On 32 bit system the maximum for a signed integer is 2147483647, so
-     * MAX_DATE cannot be higher than date('Y-m-d', 2147483647) which results
-     * in 2038-01-19 to avoid problems when the date is converted
-     * to a unix timestamp.
-     */
-    const MAX_DATE = '2038-01-01';
-
-    /**
-     * pdo
-     *
-     * @var \PDO
-     */
-    protected $pdo;
-
-    /**
-     * The table name that will be used for calendars
-     *
-     * @var string
-     */
-    protected $calendarTableName;
-
-    /**
-     * The table name that will be used for calendar objects
-     *
-     * @var string
-     */
-    protected $calendarObjectTableName;
-
-    /**
-     * List of CalDAV properties, and how they map to database fieldnames
-     * Add your own properties by simply adding on to this array.
-     *
-     * Note that only string-based properties are supported here.
-     *
-     * @var array
-     */
-    public $propertyMap = array(
-        '{DAV:}displayname'                          => 'displayname',
-        '{urn:ietf:params:xml:ns:caldav}calendar-description' => 'description',
-        '{urn:ietf:params:xml:ns:caldav}calendar-timezone'    => 'timezone',
-        '{http://apple.com/ns/ical/}calendar-order'  => 'calendarorder',
-        '{http://apple.com/ns/ical/}calendar-color'  => 'calendarcolor',
-    );
-
-    /**
-     * Creates the backend
-     *
-     * @param \PDO $pdo
-     * @param string $calendarTableName
-     * @param string $calendarObjectTableName
-     */
-    public function __construct(\PDO $pdo, $calendarTableName = 'calendars', $calendarObjectTableName = 'calendarobjects') {
-
-        $this->pdo = $pdo;
-        $this->calendarTableName = $calendarTableName;
-        $this->calendarObjectTableName = $calendarObjectTableName;
-
-    }
-
-    /**
-     * Returns a list of calendars for a principal.
-     *
-     * Every project is an array with the following keys:
-     *  * id, a unique id that will be used by other functions to modify the
-     *    calendar. This can be the same as the uri or a database key.
-     *  * uri, which the basename of the uri with which the calendar is
-     *    accessed.
-     *  * principaluri. The owner of the calendar. Almost always the same as
-     *    principalUri passed to this method.
-     *
-     * Furthermore it can contain webdav properties in clark notation. A very
-     * common one is '{DAV:}displayname'.
-     *
-     * @param string $principalUri
-     * @return array
-     */
-    public function getCalendarsForUser($principalUri) {
-
-        $fields = array_values($this->propertyMap);
-        $fields[] = 'id';
-        $fields[] = 'uri';
-        $fields[] = 'ctag';
-        $fields[] = 'components';
-        $fields[] = 'principaluri';
-        $fields[] = 'transparent';
-
-        // Making fields a comma-delimited list
-        $fields = implode(', ', $fields);
-        $stmt = $this->pdo->prepare("SELECT " . $fields . " FROM ".$this->calendarTableName." WHERE principaluri = ? ORDER BY calendarorder ASC");
-        $stmt->execute(array($principalUri));
-
-        $calendars = array();
-        while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-
-            $components = array();
-            if ($row['components']) {
-                $components = explode(',',$row['components']);
-            }
-
-            $calendar = array(
-                'id' => $row['id'],
-                'uri' => $row['uri'],
-                'principaluri' => $row['principaluri'],
-                '{' . CalDAV\Plugin::NS_CALENDARSERVER . '}getctag' => $row['ctag']?$row['ctag']:'0',
-                '{' . CalDAV\Plugin::NS_CALDAV . '}supported-calendar-component-set' => new CalDAV\Property\SupportedCalendarComponentSet($components),
-                '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-calendar-transp' => new CalDAV\Property\ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
-            );
-
-
-            foreach($this->propertyMap as $xmlName=>$dbName) {
-                $calendar[$xmlName] = $row[$dbName];
-            }
-
-            $calendars[] = $calendar;
-
-        }
-
-        return $calendars;
-
-    }
-
-    /**
-     * Creates a new calendar for a principal.
-     *
-     * If the creation was a success, an id must be returned that can be used to reference
-     * this calendar in other methods, such as updateCalendar
-     *
-     * @param string $principalUri
-     * @param string $calendarUri
-     * @param array $properties
-     * @return string
-     */
-    public function createCalendar($principalUri, $calendarUri, array $properties) {
-
-        $fieldNames = array(
-            'principaluri',
-            'uri',
-            'ctag',
-            'transparent',
-        );
-        $values = array(
-            ':principaluri' => $principalUri,
-            ':uri'          => $calendarUri,
-            ':ctag'         => 1,
-            ':transparent'  => 0,
-        );
-
-        // Default value
-        $sccs = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
-        $fieldNames[] = 'components';
-        if (!isset($properties[$sccs])) {
-            $values[':components'] = 'VEVENT,VTODO';
-        } else {
-            if (!($properties[$sccs] instanceof CalDAV\Property\SupportedCalendarComponentSet)) {
-                throw new DAV\Exception('The ' . $sccs . ' property must be of type: \Sabre\CalDAV\Property\SupportedCalendarComponentSet');
-            }
-            $values[':components'] = implode(',',$properties[$sccs]->getValue());
-        }
-        $transp = '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-calendar-transp';
-        if (isset($properties[$transp])) {
-            $values[':transparent'] = $properties[$transp]->getValue()==='transparent';
-        }
-
-        foreach($this->propertyMap as $xmlName=>$dbName) {
-            if (isset($properties[$xmlName])) {
-
-                $values[':' . $dbName] = $properties[$xmlName];
-                $fieldNames[] = $dbName;
-            }
-        }
-
-        $stmt = $this->pdo->prepare("INSERT INTO ".$this->calendarTableName." (".implode(', ', $fieldNames).") VALUES (".implode(', ',array_keys($values)).")");
-        $stmt->execute($values);
-
-        return $this->pdo->lastInsertId();
-
-    }
-
-    /**
-     * Updates properties for a calendar.
-     *
-     * The mutations array uses the propertyName in clark-notation as key,
-     * and the array value for the property value. In the case a property
-     * should be deleted, the property value will be null.
-     *
-     * This method must be atomic. If one property cannot be changed, the
-     * entire operation must fail.
-     *
-     * If the operation was successful, true can be returned.
-     * If the operation failed, false can be returned.
-     *
-     * Deletion of a non-existent property is always successful.
-     *
-     * Lastly, it is optional to return detailed information about any
-     * failures. In this case an array should be returned with the following
-     * structure:
-     *
-     * array(
-     *   403 => array(
-     *      '{DAV:}displayname' => null,
-     *   ),
-     *   424 => array(
-     *      '{DAV:}owner' => null,
-     *   )
-     * )
-     *
-     * In this example it was forbidden to update {DAV:}displayname.
-     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
-     * (424 Failed Dependency) because the request needs to be atomic.
-     *
-     * @param string $calendarId
-     * @param array $mutations
-     * @return bool|array
-     */
-    public function updateCalendar($calendarId, array $mutations) {
-
-        $newValues = array();
-        $result = array(
-            200 => array(), // Ok
-            403 => array(), // Forbidden
-            424 => array(), // Failed Dependency
-        );
-
-        $hasError = false;
-
-        foreach($mutations as $propertyName=>$propertyValue) {
-
-            switch($propertyName) {
-                case '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-calendar-transp' :
-                    $fieldName = 'transparent';
-                    $newValues[$fieldName] = $propertyValue->getValue()==='transparent';
-                    break;
-                default :
-                    // Checking the property map
-                    if (!isset($this->propertyMap[$propertyName])) {
-                        // We don't know about this property.
-                        $hasError = true;
-                        $result[403][$propertyName] = null;
-                        unset($mutations[$propertyName]);
-                        continue;
-                    }
-
-                    $fieldName = $this->propertyMap[$propertyName];
-                    $newValues[$fieldName] = $propertyValue;
-            }
-
-        }
-
-        // If there were any errors we need to fail the request
-        if ($hasError) {
-            // Properties has the remaining properties
-            foreach($mutations as $propertyName=>$propertyValue) {
-                $result[424][$propertyName] = null;
-            }
-
-            // Removing unused statuscodes for cleanliness
-            foreach($result as $status=>$properties) {
-                if (is_array($properties) && count($properties)===0) unset($result[$status]);
-            }
-
-            return $result;
-
-        }
-
-        // Success
-
-        // Now we're generating the sql query.
-        $valuesSql = array();
-        foreach($newValues as $fieldName=>$value) {
-            $valuesSql[] = $fieldName . ' = ?';
-        }
-        $valuesSql[] = 'ctag = ctag + 1';
-
-        $stmt = $this->pdo->prepare("UPDATE " . $this->calendarTableName . " SET " . implode(', ',$valuesSql) . " WHERE id = ?");
-        $newValues['id'] = $calendarId;
-        $stmt->execute(array_values($newValues));
-
-        return true;
-
-    }
-
-    /**
-     * Delete a calendar and all it's objects
-     *
-     * @param string $calendarId
-     * @return void
-     */
-    public function deleteCalendar($calendarId) {
-
-        $stmt = $this->pdo->prepare('DELETE FROM '.$this->calendarObjectTableName.' WHERE calendarid = ?');
-        $stmt->execute(array($calendarId));
-
-        $stmt = $this->pdo->prepare('DELETE FROM '.$this->calendarTableName.' WHERE id = ?');
-        $stmt->execute(array($calendarId));
-
-    }
-
-    /**
-     * Returns all calendar objects within a calendar.
-     *
-     * Every item contains an array with the following keys:
-     *   * id - unique identifier which will be used for subsequent updates
-     *   * calendardata - The iCalendar-compatible calendar data
-     *   * uri - a unique key which will be used to construct the uri. This can be any arbitrary string.
-     *   * lastmodified - a timestamp of the last modification time
-     *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
-     *   '  "abcdef"')
-     *   * calendarid - The calendarid as it was passed to this function.
-     *   * size - The size of the calendar objects, in bytes.
-     *
-     * Note that the etag is optional, but it's highly encouraged to return for
-     * speed reasons.
-     *
-     * The calendardata is also optional. If it's not returned
-     * 'getCalendarObject' will be called later, which *is* expected to return
-     * calendardata.
-     *
-     * If neither etag or size are specified, the calendardata will be
-     * used/fetched to determine these numbers. If both are specified the
-     * amount of times this is needed is reduced by a great degree.
-     *
-     * @param string $calendarId
-     * @return array
-     */
-    public function getCalendarObjects($calendarId) {
-
-        $stmt = $this->pdo->prepare('SELECT id, uri, lastmodified, etag, calendarid, size FROM '.$this->calendarObjectTableName.' WHERE calendarid = ?');
-        $stmt->execute(array($calendarId));
-
-        $result = array();
-        foreach($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
-            $result[] = array(
-                'id'           => $row['id'],
-                'uri'          => $row['uri'],
-                'lastmodified' => $row['lastmodified'],
-                'etag'         => '"' . $row['etag'] . '"',
-                'calendarid'   => $row['calendarid'],
-                'size'         => (int)$row['size'],
-            );
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * Returns information from a single calendar object, based on it's object
-     * uri.
-     *
-     * The returned array must have the same keys as getCalendarObjects. The
-     * 'calendardata' object is required here though, while it's not required
-     * for getCalendarObjects.
-     *
-     * This method must return null if the object did not exist.
-     *
-     * @param string $calendarId
-     * @param string $objectUri
-     * @return array|null
-     */
-    public function getCalendarObject($calendarId,$objectUri) {
-
-        $stmt = $this->pdo->prepare('SELECT id, uri, lastmodified, etag, calendarid, size, calendardata FROM '.$this->calendarObjectTableName.' WHERE calendarid = ? AND uri = ?');
-        $stmt->execute(array($calendarId, $objectUri));
-        $row = $stmt->fetch(\PDO::FETCH_ASSOC);
-
-        if(!$row) return null;
-
-        return array(
-            'id'           => $row['id'],
-            'uri'          => $row['uri'],
-            'lastmodified' => $row['lastmodified'],
-            'etag'         => '"' . $row['etag'] . '"',
-            'calendarid'   => $row['calendarid'],
-            'size'         => (int)$row['size'],
-            'calendardata' => $row['calendardata'],
-         );
-
-    }
-
-
-    /**
-     * Creates a new calendar object.
-     *
-     * It is possible return an etag from this function, which will be used in
-     * the response to this PUT request. Note that the ETag must be surrounded
-     * by double-quotes.
-     *
-     * However, you should only really return this ETag if you don't mangle the
-     * calendar-data. If the result of a subsequent GET to this object is not
-     * the exact same as this request body, you should omit the ETag.
-     *
-     * @param mixed $calendarId
-     * @param string $objectUri
-     * @param string $calendarData
-     * @return string|null
-     */
-    public function createCalendarObject($calendarId,$objectUri,$calendarData) {
-
-        $extraData = $this->getDenormalizedData($calendarData);
-
-        $stmt = $this->pdo->prepare('INSERT INTO '.$this->calendarObjectTableName.' (calendarid, uri, calendardata, lastmodified, etag, size, componenttype, firstoccurence, lastoccurence) VALUES (?,?,?,?,?,?,?,?,?)');
-        $stmt->execute(array(
-            $calendarId,
-            $objectUri,
-            $calendarData,
-            time(),
-            $extraData['etag'],
-            $extraData['size'],
-            $extraData['componentType'],
-            $extraData['firstOccurence'],
-            $extraData['lastOccurence'],
-        ));
-        $stmt = $this->pdo->prepare('UPDATE '.$this->calendarTableName.' SET ctag = ctag + 1 WHERE id = ?');
-        $stmt->execute(array($calendarId));
-
-        return '"' . $extraData['etag'] . '"';
-
-    }
-
-    /**
-     * Updates an existing calendarobject, based on it's uri.
-     *
-     * It is possible return an etag from this function, which will be used in
-     * the response to this PUT request. Note that the ETag must be surrounded
-     * by double-quotes.
-     *
-     * However, you should only really return this ETag if you don't mangle the
-     * calendar-data. If the result of a subsequent GET to this object is not
-     * the exact same as this request body, you should omit the ETag.
-     *
-     * @param mixed $calendarId
-     * @param string $objectUri
-     * @param string $calendarData
-     * @return string|null
-     */
-    public function updateCalendarObject($calendarId,$objectUri,$calendarData) {
-
-        $extraData = $this->getDenormalizedData($calendarData);
-
-        $stmt = $this->pdo->prepare('UPDATE '.$this->calendarObjectTableName.' SET calendardata = ?, lastmodified = ?, etag = ?, size = ?, componenttype = ?, firstoccurence = ?, lastoccurence = ? WHERE calendarid = ? AND uri = ?');
-        $stmt->execute(array($calendarData,time(), $extraData['etag'], $extraData['size'], $extraData['componentType'], $extraData['firstOccurence'], $extraData['lastOccurence'] ,$calendarId,$objectUri));
-        $stmt = $this->pdo->prepare('UPDATE '.$this->calendarTableName.' SET ctag = ctag + 1 WHERE id = ?');
-        $stmt->execute(array($calendarId));
-
-        return '"' . $extraData['etag'] . '"';
-
-    }
-
-    /**
-     * Parses some information from calendar objects, used for optimized
-     * calendar-queries.
-     *
-     * Returns an array with the following keys:
-     *   * etag
-     *   * size
-     *   * componentType
-     *   * firstOccurence
-     *   * lastOccurence
-     *
-     * @param string $calendarData
-     * @return array
-     */
-    protected function getDenormalizedData($calendarData) {
-
-        $vObject = VObject\Reader::read($calendarData);
-        $componentType = null;
-        $component = null;
-        $firstOccurence = null;
-        $lastOccurence = null;
-        foreach($vObject->getComponents() as $component) {
-            if ($component->name!=='VTIMEZONE') {
-                $componentType = $component->name;
-                break;
-            }
-        }
-        if (!$componentType) {
-            throw new \Sabre\DAV\Exception\BadRequest('Calendar objects must have a VJOURNAL, VEVENT or VTODO component');
-        }
-        if ($componentType === 'VEVENT') {
-            $firstOccurence = $component->DTSTART->getDateTime()->getTimeStamp();
-            // Finding the last occurence is a bit harder
-            if (!isset($component->RRULE)) {
-                if (isset($component->DTEND)) {
-                    $lastOccurence = $component->DTEND->getDateTime()->getTimeStamp();
-                } elseif (isset($component->DURATION)) {
-                    $endDate = clone $component->DTSTART->getDateTime();
-                    $endDate->add(VObject\DateTimeParser::parse($component->DURATION->getValue()));
-                    $lastOccurence = $endDate->getTimeStamp();
-                } elseif (!$component->DTSTART->hasTime()) {
-                    $endDate = clone $component->DTSTART->getDateTime();
-                    $endDate->modify('+1 day');
-                    $lastOccurence = $endDate->getTimeStamp();
-                } else {
-                    $lastOccurence = $firstOccurence;
-                }
-            } else {
-                $it = new VObject\RecurrenceIterator($vObject, (string)$component->UID);
-                $maxDate = new \DateTime(self::MAX_DATE);
-                if ($it->isInfinite()) {
-                    $lastOccurence = $maxDate->getTimeStamp();
-                } else {
-                    $end = $it->getDtEnd();
-                    while($it->valid() && $end < $maxDate) {
-                        $end = $it->getDtEnd();
-                        $it->next();
-
-                    }
-                    $lastOccurence = $end->getTimeStamp();
-                }
-
-            }
-        }
-
-        return array(
-            'etag' => md5($calendarData),
-            'size' => strlen($calendarData),
-            'componentType' => $componentType,
-            'firstOccurence' => $firstOccurence,
-            'lastOccurence'  => $lastOccurence,
-        );
-
-    }
-
-    /**
-     * Deletes an existing calendar object.
-     *
-     * @param string $calendarId
-     * @param string $objectUri
-     * @return void
-     */
-    public function deleteCalendarObject($calendarId,$objectUri) {
-
-        $stmt = $this->pdo->prepare('DELETE FROM '.$this->calendarObjectTableName.' WHERE calendarid = ? AND uri = ?');
-        $stmt->execute(array($calendarId,$objectUri));
-        $stmt = $this->pdo->prepare('UPDATE '. $this->calendarTableName .' SET ctag = ctag + 1 WHERE id = ?');
-        $stmt->execute(array($calendarId));
-
-    }
-
-    /**
-     * Performs a calendar-query on the contents of this calendar.
-     *
-     * The calendar-query is defined in RFC4791 : CalDAV. Using the
-     * calendar-query it is possible for a client to request a specific set of
-     * object, based on contents of iCalendar properties, date-ranges and
-     * iCalendar component types (VTODO, VEVENT).
-     *
-     * This method should just return a list of (relative) urls that match this
-     * query.
-     *
-     * The list of filters are specified as an array. The exact array is
-     * documented by \Sabre\CalDAV\CalendarQueryParser.
-     *
-     * Note that it is extremely likely that getCalendarObject for every path
-     * returned from this method will be called almost immediately after. You
-     * may want to anticipate this to speed up these requests.
-     *
-     * This method provides a default implementation, which parses *all* the
-     * iCalendar objects in the specified calendar.
-     *
-     * This default may well be good enough for personal use, and calendars
-     * that aren't very large. But if you anticipate high usage, big calendars
-     * or high loads, you are strongly adviced to optimize certain paths.
-     *
-     * The best way to do so is override this method and to optimize
-     * specifically for 'common filters'.
-     *
-     * Requests that are extremely common are:
-     *   * requests for just VEVENTS
-     *   * requests for just VTODO
-     *   * requests with a time-range-filter on a VEVENT.
-     *
-     * ..and combinations of these requests. It may not be worth it to try to
-     * handle every possible situation and just rely on the (relatively
-     * easy to use) CalendarQueryValidator to handle the rest.
-     *
-     * Note that especially time-range-filters may be difficult to parse. A
-     * time-range filter specified on a VEVENT must for instance also handle
-     * recurrence rules correctly.
-     * A good example of how to interprete all these filters can also simply
-     * be found in \Sabre\CalDAV\CalendarQueryFilter. This class is as correct
-     * as possible, so it gives you a good idea on what type of stuff you need
-     * to think of.
-     *
-     * This specific implementation (for the PDO) backend optimizes filters on
-     * specific components, and VEVENT time-ranges.
-     *
-     * @param string $calendarId
-     * @param array $filters
-     * @return array
-     */
-    public function calendarQuery($calendarId, array $filters) {
-
-        $result = array();
-        $validator = new \Sabre\CalDAV\CalendarQueryValidator();
-
-        $componentType = null;
-        $requirePostFilter = true;
-        $timeRange = null;
-
-        // if no filters were specified, we don't need to filter after a query
-        if (!$filters['prop-filters'] && !$filters['comp-filters']) {
-            $requirePostFilter = false;
-        }
-
-        // Figuring out if there's a component filter
-        if (count($filters['comp-filters']) > 0 && !$filters['comp-filters'][0]['is-not-defined']) {
-            $componentType = $filters['comp-filters'][0]['name'];
-
-            // Checking if we need post-filters
-            if (!$filters['prop-filters'] && !$filters['comp-filters'][0]['comp-filters'] && !$filters['comp-filters'][0]['time-range'] && !$filters['comp-filters'][0]['prop-filters']) {
-                $requirePostFilter = false;
-            }
-            // There was a time-range filter
-            if ($componentType == 'VEVENT' && isset($filters['comp-filters'][0]['time-range'])) {
-                $timeRange = $filters['comp-filters'][0]['time-range'];
-
-                // If start time OR the end time is not specified, we can do a
-                // 100% accurate mysql query.
-                if (!$filters['prop-filters'] && !$filters['comp-filters'][0]['comp-filters'] && !$filters['comp-filters'][0]['prop-filters'] && (!$timeRange['start'] || !$timeRange['end'])) {
-                    $requirePostFilter = false;
-                }
-            }
-
-        }
-
-        if ($requirePostFilter) {
-            $query = "SELECT uri, calendardata FROM ".$this->calendarObjectTableName." WHERE calendarid = :calendarid";
-        } else {
-            $query = "SELECT uri FROM ".$this->calendarObjectTableName." WHERE calendarid = :calendarid";
-        }
-
-        $values = array(
-            'calendarid' => $calendarId,
-        );
-
-        if ($componentType) {
-            $query.=" AND componenttype = :componenttype";
-            $values['componenttype'] = $componentType;
-        }
-
-        if ($timeRange && $timeRange['start']) {
-            $query.=" AND lastoccurence > :startdate";
-            $values['startdate'] = $timeRange['start']->getTimeStamp();
-        }
-        if ($timeRange && $timeRange['end']) {
-            $query.=" AND firstoccurence < :enddate";
-            $values['enddate'] = $timeRange['end']->getTimeStamp();
-        }
-
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute($values);
-
-        $result = array();
-        while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-            if ($requirePostFilter) {
-                if (!$this->validateFilterForObject($row, $filters)) {
-                    continue;
-                }
-            }
-            $result[] = $row['uri'];
-
-        }
-
-        return $result;
-
-    }
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Backend/SharingSupport.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Backend/SharingSupport.php
deleted file mode 100644
index 4538fa5b58..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Backend/SharingSupport.php
+++ /dev/null
@@ -1,243 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Backend;
-
-/**
- * Adds support for sharing features to a CalDAV server.
- *
- * Note: This feature is experimental, and may change in between different
- * SabreDAV versions.
- *
- * Early warning: Currently SabreDAV provides no implementation for this. This
- * is, because in it's current state there is no elegant way to do this.
- * The problem lies in the fact that a real CalDAV server with sharing support
- * would first need email support (with invite notifications), and really also
- * a browser-frontend that allows people to accept or reject these shares.
- *
- * In addition, the CalDAV backends are currently kept as independent as
- * possible, and should not be aware of principals, email addresses or
- * accounts.
- *
- * Adding an implementation for Sharing to standard-sabredav would contradict
- * these goals, so for this reason this is currently not implemented, although
- * it may very well in the future; but probably not before SabreDAV 2.0.
- *
- * The interface works however, so if you implement all this, and do it
- * correctly sharing _will_ work. It's not particularly easy, and I _urge you_
- * to make yourself acquainted with the following document first:
- *
- * https://trac.calendarserver.org/browser/CalendarServer/trunk/doc/Extensions/caldav-sharing.txt
- *
- * An overview
- * ===========
- *
- * Implementing this interface will allow a user to share his or her calendars
- * to other users. Effectively, when a calendar is shared the calendar will
- * show up in both the Sharer's and Sharee's calendar-home root.
- * This interface adds a few methods that ensure that this happens, and there
- * are also a number of new requirements in the base-class you must now follow.
- *
- *
- * How it works
- * ============
- *
- * When a user shares a calendar, the updateShares() method will be called with
- * a list of sharees that are now added, and a list of sharees that have been
- * removed.
- * Removal is instant, but when a sharee is added the sharee first gets a
- * chance to accept or reject the invitation for a share.
- *
- * After a share is accepted, the calendar will be returned from
- * getUserCalendars for both the sharer, and the sharee.
- *
- * If the sharee deletes the calendar, only their share gets deleted. When the
- * owner deletes a calendar, it will be removed for everybody.
- *
- *
- * Notifications
- * =============
- *
- * During all these sharing operations, a lot of notifications are sent back
- * and forward.
- *
- * Whenever the list of sharees for a calendar has been changed (they have been
- * added, removed or modified) all sharees should get a notification for this
- * change.
- * This notification is always represented by:
- *
- * Sabre\CalDAV\Notifications\Notification\Invite
- *
- * In the case of an invite, the sharee may reply with an 'accept' or
- * 'decline'. These are always represented by:
- *
- * Sabre\CalDAV\Notifications\Notification\Invite
- *
- *
- * Calendar access by sharees
- * ==========================
- *
- * As mentioned earlier, shared calendars must now also be returned for
- * getCalendarsForUser for sharees. A few things change though.
- *
- * The following properties must be specified:
- *
- * 1. {http://calendarserver.org/ns/}shared-url
- *
- * This property MUST contain the url to the original calendar, that is.. the
- * path to the calendar from the owner.
- *
- * 2. {http://sabredav.org/ns}owner-principal
- *
- * This is a url to to the principal who is sharing the calendar.
- *
- * 3. {http://sabredav.org/ns}read-only
- *
- * This should be either 0 or 1, depending on if the user has read-only or
- * read-write access to the calendar.
- *
- * Only when this is done, the calendar will correctly be marked as a calendar
- * that's shared to him, thus allowing clients to display the correct interface
- * and ACL enforcement.
- *
- * If a sharee deletes their calendar, only their instance of the calendar
- * should be deleted, the original should still exists.
- * Pretty much any 'dead' WebDAV properties on these shared calendars should be
- * specific to a user. This means that if the displayname is changed by a
- * sharee, the original is not affected. This is also true for:
- *   * The description
- *   * The color
- *   * The order
- *   * And any other dead properties.
- *
- * Properties like a ctag should not be different for multiple instances of the
- * calendar.
- *
- * Lastly, objects *within* calendars should also have user-specific data. The
- * two things that are user-specific are:
- *   * VALARM objects
- *   * The TRANSP property
- *
- * This _also_ implies that if a VALARM is deleted by a sharee for some event,
- * this has no effect on the original VALARM.
- *
- * Understandably, the this last requirement is one of the hardest.
- * Realisticly, I can see people ignoring this part of the spec, but that could
- * cause a different set of issues.
- *
- *
- * Publishing
- * ==========
- *
- * When a user publishes a url, the server should generate a 'publish url'.
- * This is a read-only url, anybody can use to consume the calendar feed.
- *
- * Calendars are in one of two states:
- *   * published
- *   * unpublished
- *
- * If a calendar is published, the following property should be returned
- * for each calendar in getCalendarsForPrincipal.
- *
- * {http://calendarserver.org/ns/}publish-url
- *
- * This element should contain a {DAV:}href element, which points to the
- * public url that does not require authentication. Unlike every other href,
- * this url must be absolute.
- *
- * Ideally, the following property is always returned
- *
- * {http://calendarserver.org/ns/}pre-publish-url
- *
- * This property should contain the url that the calendar _would_ have, if it
- * were to be published. iCal uses this to display the url, before the user
- * will actually publish it.
- *
- *
- * Selectively disabling publish or share feature
- * ==============================================
- *
- * If Sabre\CalDAV\Property\AllowedSharingModes is returned from
- * getCalendarsByUser, this allows the server to specify whether either sharing,
- * or publishing is supported.
- *
- * This allows a client to determine in advance which features are available,
- * and update the interface appropriately. If this property is not returned by
- * the backend, the SharingPlugin automatically injects it and assumes both
- * features are available.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface SharingSupport extends NotificationSupport {
-
-    /**
-     * Updates the list of shares.
-     *
-     * The first array is a list of people that are to be added to the
-     * calendar.
-     *
-     * Every element in the add array has the following properties:
-     *   * href - A url. Usually a mailto: address
-     *   * commonName - Usually a first and last name, or false
-     *   * summary - A description of the share, can also be false
-     *   * readOnly - A boolean value
-     *
-     * Every element in the remove array is just the address string.
-     *
-     * Note that if the calendar is currently marked as 'not shared' by and
-     * this method is called, the calendar should be 'upgraded' to a shared
-     * calendar.
-     *
-     * @param mixed $calendarId
-     * @param array $add
-     * @param array $remove
-     * @return void
-     */
-    function updateShares($calendarId, array $add, array $remove);
-
-    /**
-     * Returns the list of people whom this calendar is shared with.
-     *
-     * Every element in this array should have the following properties:
-     *   * href - Often a mailto: address
-     *   * commonName - Optional, for example a first + last name
-     *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
-     *   * readOnly - boolean
-     *   * summary - Optional, a description for the share
-     *
-     * This method may be called by either the original instance of the
-     * calendar, as well as the shared instances. In the case of the shared
-     * instances, it is perfectly acceptable to return an empty array in case
-     * there are privacy concerns.
-     *
-     * @param mixed $calendarId
-     * @return array
-     */
-    function getShares($calendarId);
-
-    /**
-     * This method is called when a user replied to a request to share.
-     *
-     * If the user chose to accept the share, this method should return the
-     * newly created calendar url.
-     *
-     * @param string href The sharee who is replying (often a mailto: address)
-     * @param int status One of the SharingPlugin::STATUS_* constants
-     * @param string $calendarUri The url to the calendar thats being shared
-     * @param string $inReplyTo The unique id this message is a response to
-     * @param string $summary A description of the reply
-     * @return null|string
-     */
-    function shareReply($href, $status, $calendarUri, $inReplyTo, $summary = null);
-
-    /**
-     * Publishes a calendar
-     *
-     * @param mixed $calendarId
-     * @param bool $value
-     * @return void
-     */
-    function setPublishStatus($calendarId, $value);
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Calendar.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Calendar.php
deleted file mode 100644
index 74fa15bb15..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Calendar.php
+++ /dev/null
@@ -1,376 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV;
-
-use Sabre\DAV;
-use Sabre\DAVACL;
-
-/**
- * This object represents a CalDAV calendar.
- *
- * A calendar can contain multiple TODO and or Events. These are represented
- * as \Sabre\CalDAV\CalendarObject objects.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Calendar implements ICalendar, DAV\IProperties, DAVACL\IACL {
-
-    /**
-     * This is an array with calendar information
-     *
-     * @var array
-     */
-    protected $calendarInfo;
-
-    /**
-     * CalDAV backend
-     *
-     * @var Backend\BackendInterface
-     */
-    protected $caldavBackend;
-
-    /**
-     * Constructor
-     *
-     * @param Backend\BackendInterface $caldavBackend
-     * @param array $calendarInfo
-     */
-    public function __construct(Backend\BackendInterface $caldavBackend, $calendarInfo) {
-
-        $this->caldavBackend = $caldavBackend;
-        $this->calendarInfo = $calendarInfo;
-
-    }
-
-    /**
-     * Returns the name of the calendar
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return $this->calendarInfo['uri'];
-
-    }
-
-    /**
-     * Updates properties such as the display name and description
-     *
-     * @param array $mutations
-     * @return array
-     */
-    public function updateProperties($mutations) {
-
-        return $this->caldavBackend->updateCalendar($this->calendarInfo['id'],$mutations);
-
-    }
-
-    /**
-     * Returns the list of properties
-     *
-     * @param array $requestedProperties
-     * @return array
-     */
-    public function getProperties($requestedProperties) {
-
-        $response = array();
-
-        foreach($requestedProperties as $prop) switch($prop) {
-
-            case '{urn:ietf:params:xml:ns:caldav}supported-calendar-data' :
-                $response[$prop] = new Property\SupportedCalendarData();
-                break;
-            case '{urn:ietf:params:xml:ns:caldav}supported-collation-set' :
-                $response[$prop] =  new Property\SupportedCollationSet();
-                break;
-            case '{DAV:}owner' :
-                $response[$prop] = new DAVACL\Property\Principal(DAVACL\Property\Principal::HREF,$this->calendarInfo['principaluri']);
-                break;
-            default :
-                if (isset($this->calendarInfo[$prop])) $response[$prop] = $this->calendarInfo[$prop];
-                break;
-
-        }
-        return $response;
-
-    }
-
-    /**
-     * Returns a calendar object
-     *
-     * The contained calendar objects are for example Events or Todo's.
-     *
-     * @param string $name
-     * @return \Sabre\CalDAV\ICalendarObject
-     */
-    public function getChild($name) {
-
-        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'],$name);
-
-        if (!$obj) throw new DAV\Exception\NotFound('Calendar object not found');
-
-        $obj['acl'] = $this->getACL();
-        // Removing the irrelivant
-        foreach($obj['acl'] as $key=>$acl) {
-            if ($acl['privilege'] === '{' . Plugin::NS_CALDAV . '}read-free-busy') {
-                unset($obj['acl'][$key]);
-            }
-        }
-
-        return new CalendarObject($this->caldavBackend,$this->calendarInfo,$obj);
-
-    }
-
-    /**
-     * Returns the full list of calendar objects
-     *
-     * @return array
-     */
-    public function getChildren() {
-
-        $objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id']);
-        $children = array();
-        foreach($objs as $obj) {
-            $obj['acl'] = $this->getACL();
-            // Removing the irrelivant
-            foreach($obj['acl'] as $key=>$acl) {
-                if ($acl['privilege'] === '{' . Plugin::NS_CALDAV . '}read-free-busy') {
-                    unset($obj['acl'][$key]);
-                }
-            }
-            $children[] = new CalendarObject($this->caldavBackend,$this->calendarInfo,$obj);
-        }
-        return $children;
-
-    }
-
-    /**
-     * Checks if a child-node exists.
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function childExists($name) {
-
-        $obj = $this->caldavBackend->getCalendarObject($this->calendarInfo['id'],$name);
-        if (!$obj)
-            return false;
-        else
-            return true;
-
-    }
-
-    /**
-     * Creates a new directory
-     *
-     * We actually block this, as subdirectories are not allowed in calendars.
-     *
-     * @param string $name
-     * @return void
-     */
-    public function createDirectory($name) {
-
-        throw new DAV\Exception\MethodNotAllowed('Creating collections in calendar objects is not allowed');
-
-    }
-
-    /**
-     * Creates a new file
-     *
-     * The contents of the new file must be a valid ICalendar string.
-     *
-     * @param string $name
-     * @param resource $calendarData
-     * @return string|null
-     */
-    public function createFile($name,$calendarData = null) {
-
-        if (is_resource($calendarData)) {
-            $calendarData = stream_get_contents($calendarData);
-        }
-        return $this->caldavBackend->createCalendarObject($this->calendarInfo['id'],$name,$calendarData);
-
-    }
-
-    /**
-     * Deletes the calendar.
-     *
-     * @return void
-     */
-    public function delete() {
-
-        $this->caldavBackend->deleteCalendar($this->calendarInfo['id']);
-
-    }
-
-    /**
-     * Renames the calendar. Note that most calendars use the
-     * {DAV:}displayname to display a name to display a name.
-     *
-     * @param string $newName
-     * @return void
-     */
-    public function setName($newName) {
-
-        throw new DAV\Exception\MethodNotAllowed('Renaming calendars is not yet supported');
-
-    }
-
-    /**
-     * Returns the last modification date as a unix timestamp.
-     *
-     * @return void
-     */
-    public function getLastModified() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->calendarInfo['principaluri'];
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->getOwner(),
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->getOwner(),
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->getOwner() . '/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->getOwner() . '/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->getOwner() . '/calendar-proxy-read',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{' . Plugin::NS_CALDAV . '}read-free-busy',
-                'principal' => '{DAV:}authenticated',
-                'protected' => true,
-            ),
-
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new DAV\Exception\MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See \Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        $default = DAVACL\Plugin::getDefaultSupportedPrivilegeSet();
-
-        // We need to inject 'read-free-busy' in the tree, aggregated under
-        // {DAV:}read.
-        foreach($default['aggregates'] as &$agg) {
-
-            if ($agg['privilege'] !== '{DAV:}read') continue;
-
-            $agg['aggregates'][] = array(
-                'privilege' => '{' . Plugin::NS_CALDAV . '}read-free-busy',
-            );
-
-        }
-        return $default;
-
-    }
-
-    /**
-     * Performs a calendar-query on the contents of this calendar.
-     *
-     * The calendar-query is defined in RFC4791 : CalDAV. Using the
-     * calendar-query it is possible for a client to request a specific set of
-     * object, based on contents of iCalendar properties, date-ranges and
-     * iCalendar component types (VTODO, VEVENT).
-     *
-     * This method should just return a list of (relative) urls that match this
-     * query.
-     *
-     * The list of filters are specified as an array. The exact array is
-     * documented by Sabre\CalDAV\CalendarQueryParser.
-     *
-     * @param array $filters
-     * @return array
-     */
-    public function calendarQuery(array $filters) {
-
-        return $this->caldavBackend->calendarQuery($this->calendarInfo['id'], $filters);
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/CalendarObject.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/CalendarObject.php
deleted file mode 100644
index 2b9d2877e2..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/CalendarObject.php
+++ /dev/null
@@ -1,279 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV;
-
-/**
- * The CalendarObject represents a single VEVENT or VTODO within a Calendar.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class CalendarObject extends \Sabre\DAV\File implements ICalendarObject, \Sabre\DAVACL\IACL {
-
-    /**
-     * Sabre\CalDAV\Backend\BackendInterface
-     *
-     * @var Sabre\CalDAV\Backend\AbstractBackend
-     */
-    protected $caldavBackend;
-
-    /**
-     * Array with information about this CalendarObject
-     *
-     * @var array
-     */
-    protected $objectData;
-
-    /**
-     * Array with information about the containing calendar
-     *
-     * @var array
-     */
-    protected $calendarInfo;
-
-    /**
-     * Constructor
-     *
-     * @param Backend\BackendInterface $caldavBackend
-     * @param array $calendarInfo
-     * @param array $objectData
-     */
-    public function __construct(Backend\BackendInterface $caldavBackend,array $calendarInfo,array $objectData) {
-
-        $this->caldavBackend = $caldavBackend;
-
-        if (!isset($objectData['calendarid'])) {
-            throw new \InvalidArgumentException('The objectData argument must contain a \'calendarid\' property');
-        }
-        if (!isset($objectData['uri'])) {
-            throw new \InvalidArgumentException('The objectData argument must contain an \'uri\' property');
-        }
-
-        $this->calendarInfo = $calendarInfo;
-        $this->objectData = $objectData;
-
-    }
-
-    /**
-     * Returns the uri for this object
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return $this->objectData['uri'];
-
-    }
-
-    /**
-     * Returns the ICalendar-formatted object
-     *
-     * @return string
-     */
-    public function get() {
-
-        // Pre-populating the 'calendardata' is optional, if we don't have it
-        // already we fetch it from the backend.
-        if (!isset($this->objectData['calendardata'])) {
-            $this->objectData = $this->caldavBackend->getCalendarObject($this->objectData['calendarid'], $this->objectData['uri']);
-        }
-        return $this->objectData['calendardata'];
-
-    }
-
-    /**
-     * Updates the ICalendar-formatted object
-     *
-     * @param string|resource $calendarData
-     * @return string
-     */
-    public function put($calendarData) {
-
-        if (is_resource($calendarData)) {
-            $calendarData = stream_get_contents($calendarData);
-        }
-        $etag = $this->caldavBackend->updateCalendarObject($this->calendarInfo['id'],$this->objectData['uri'],$calendarData);
-        $this->objectData['calendardata'] = $calendarData;
-        $this->objectData['etag'] = $etag;
-
-        return $etag;
-
-    }
-
-    /**
-     * Deletes the calendar object
-     *
-     * @return void
-     */
-    public function delete() {
-
-        $this->caldavBackend->deleteCalendarObject($this->calendarInfo['id'],$this->objectData['uri']);
-
-    }
-
-    /**
-     * Returns the mime content-type
-     *
-     * @return string
-     */
-    public function getContentType() {
-
-        return 'text/calendar; charset=utf-8';
-
-    }
-
-    /**
-     * Returns an ETag for this object.
-     *
-     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
-     *
-     * @return string
-     */
-    public function getETag() {
-
-        if (isset($this->objectData['etag'])) {
-            return $this->objectData['etag'];
-        } else {
-            return '"' . md5($this->get()). '"';
-        }
-
-    }
-
-    /**
-     * Returns the last modification date as a unix timestamp
-     *
-     * @return int
-     */
-    public function getLastModified() {
-
-        return $this->objectData['lastmodified'];
-
-    }
-
-    /**
-     * Returns the size of this object in bytes
-     *
-     * @return int
-     */
-    public function getSize() {
-
-        if (array_key_exists('size',$this->objectData)) {
-            return $this->objectData['size'];
-        } else {
-            return strlen($this->get());
-        }
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->calendarInfo['principaluri'];
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        // An alternative acl may be specified in the object data.
-        if (isset($this->objectData['acl'])) {
-            return $this->objectData['acl'];
-        }
-
-        // The default ACL
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->calendarInfo['principaluri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->calendarInfo['principaluri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-read',
-                'protected' => true,
-            ),
-
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new \Sabre\DAV\Exception\MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See \Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/CalendarQueryParser.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/CalendarQueryParser.php
deleted file mode 100644
index 0a3472408a..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/CalendarQueryParser.php
+++ /dev/null
@@ -1,298 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV;
-
-use Sabre\VObject;
-
-/**
- * Parses the calendar-query report request body.
- *
- * Whoever designed this format, and the CalDAV equivalent even more so,
- * has no feel for design.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class CalendarQueryParser {
-
-    /**
-     * List of requested properties the client wanted
-     *
-     * @var array
-     */
-    public $requestedProperties;
-
-    /**
-     * List of property/component filters.
-     *
-     * @var array
-     */
-    public $filters;
-
-    /**
-     * This property will contain null if CALDAV:expand was not specified,
-     * otherwise it will contain an array with 2 elements (start, end). Each
-     * contain a DateTime object.
-     *
-     * If expand is specified, recurring calendar objects are to be expanded
-     * into their individual components, and only the components that fall
-     * within the specified time-range are to be returned.
-     *
-     * For more details, see rfc4791, section 9.6.5.
-     *
-     * @var null|array
-     */
-    public $expand;
-
-    /**
-     * DOM Document
-     *
-     * @var DOMDocument
-     */
-    protected $dom;
-
-    /**
-     * DOM XPath object
-     *
-     * @var DOMXPath
-     */
-    protected $xpath;
-
-    /**
-     * Creates the parser
-     *
-     * @param \DOMDocument $dom
-     */
-    public function __construct(\DOMDocument $dom) {
-
-        $this->dom = $dom;
-        $this->xpath = new \DOMXPath($dom);
-        $this->xpath->registerNameSpace('cal',Plugin::NS_CALDAV);
-        $this->xpath->registerNameSpace('dav','urn:DAV');
-
-    }
-
-    /**
-     * Parses the request.
-     *
-     * @return void
-     */
-    public function parse() {
-
-        $filterNode = null;
-
-        $filter = $this->xpath->query('/cal:calendar-query/cal:filter');
-        if ($filter->length !== 1) {
-            throw new \Sabre\DAV\Exception\BadRequest('Only one filter element is allowed');
-        }
-
-        $compFilters = $this->parseCompFilters($filter->item(0));
-        if (count($compFilters)!==1) {
-            throw new \Sabre\DAV\Exception\BadRequest('There must be exactly 1 top-level comp-filter.');
-        }
-
-        $this->filters = $compFilters[0];
-        $this->requestedProperties = array_keys(\Sabre\DAV\XMLUtil::parseProperties($this->dom->firstChild));
-
-        $expand = $this->xpath->query('/cal:calendar-query/dav:prop/cal:calendar-data/cal:expand');
-        if ($expand->length>0) {
-            $this->expand = $this->parseExpand($expand->item(0));
-        }
-
-
-    }
-
-    /**
-     * Parses all the 'comp-filter' elements from a node
-     *
-     * @param \DOMElement $parentNode
-     * @return array
-     */
-    protected function parseCompFilters(\DOMElement $parentNode) {
-
-        $compFilterNodes = $this->xpath->query('cal:comp-filter', $parentNode);
-        $result = array();
-
-        for($ii=0; $ii < $compFilterNodes->length; $ii++) {
-
-            $compFilterNode = $compFilterNodes->item($ii);
-
-            $compFilter = array();
-            $compFilter['name'] = $compFilterNode->getAttribute('name');
-            $compFilter['is-not-defined'] = $this->xpath->query('cal:is-not-defined', $compFilterNode)->length>0;
-            $compFilter['comp-filters'] = $this->parseCompFilters($compFilterNode);
-            $compFilter['prop-filters'] = $this->parsePropFilters($compFilterNode);
-            $compFilter['time-range'] = $this->parseTimeRange($compFilterNode);
-
-            if ($compFilter['time-range'] && !in_array($compFilter['name'],array(
-                'VEVENT',
-                'VTODO',
-                'VJOURNAL',
-                'VFREEBUSY',
-                'VALARM',
-            ))) {
-                throw new \Sabre\DAV\Exception\BadRequest('The time-range filter is not defined for the ' . $compFilter['name'] . ' component');
-            };
-
-            $result[] = $compFilter;
-
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * Parses all the prop-filter elements from a node
-     *
-     * @param \DOMElement $parentNode
-     * @return array
-     */
-    protected function parsePropFilters(\DOMElement $parentNode) {
-
-        $propFilterNodes = $this->xpath->query('cal:prop-filter', $parentNode);
-        $result = array();
-
-        for ($ii=0; $ii < $propFilterNodes->length; $ii++) {
-
-            $propFilterNode = $propFilterNodes->item($ii);
-            $propFilter = array();
-            $propFilter['name'] = $propFilterNode->getAttribute('name');
-            $propFilter['is-not-defined'] = $this->xpath->query('cal:is-not-defined', $propFilterNode)->length>0;
-            $propFilter['param-filters'] = $this->parseParamFilters($propFilterNode);
-            $propFilter['text-match'] = $this->parseTextMatch($propFilterNode);
-            $propFilter['time-range'] = $this->parseTimeRange($propFilterNode);
-
-            $result[] = $propFilter;
-
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * Parses the param-filter element
-     *
-     * @param \DOMElement $parentNode
-     * @return array
-     */
-    protected function parseParamFilters(\DOMElement $parentNode) {
-
-        $paramFilterNodes = $this->xpath->query('cal:param-filter', $parentNode);
-        $result = array();
-
-        for($ii=0;$ii<$paramFilterNodes->length;$ii++) {
-
-            $paramFilterNode = $paramFilterNodes->item($ii);
-            $paramFilter = array();
-            $paramFilter['name'] = $paramFilterNode->getAttribute('name');
-            $paramFilter['is-not-defined'] = $this->xpath->query('cal:is-not-defined', $paramFilterNode)->length>0;
-            $paramFilter['text-match'] = $this->parseTextMatch($paramFilterNode);
-
-            $result[] = $paramFilter;
-
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * Parses the text-match element
-     *
-     * @param \DOMElement $parentNode
-     * @return array|null
-     */
-    protected function parseTextMatch(\DOMElement $parentNode) {
-
-        $textMatchNodes = $this->xpath->query('cal:text-match', $parentNode);
-
-        if ($textMatchNodes->length === 0)
-            return null;
-
-        $textMatchNode = $textMatchNodes->item(0);
-        $negateCondition = $textMatchNode->getAttribute('negate-condition');
-        $negateCondition = $negateCondition==='yes';
-        $collation = $textMatchNode->getAttribute('collation');
-        if (!$collation) $collation = 'i;ascii-casemap';
-
-        return array(
-            'negate-condition' => $negateCondition,
-            'collation' => $collation,
-            'value' => $textMatchNode->nodeValue
-        );
-
-    }
-
-    /**
-     * Parses the time-range element
-     *
-     * @param \DOMElement $parentNode
-     * @return array|null
-     */
-    protected function parseTimeRange(\DOMElement $parentNode) {
-
-        $timeRangeNodes = $this->xpath->query('cal:time-range', $parentNode);
-        if ($timeRangeNodes->length === 0) {
-            return null;
-        }
-
-        $timeRangeNode = $timeRangeNodes->item(0);
-
-        if ($start = $timeRangeNode->getAttribute('start')) {
-            $start = VObject\DateTimeParser::parseDateTime($start);
-        } else {
-            $start = null;
-        }
-        if ($end = $timeRangeNode->getAttribute('end')) {
-            $end = VObject\DateTimeParser::parseDateTime($end);
-        } else {
-            $end = null;
-        }
-
-        if (!is_null($start) && !is_null($end) && $end <= $start) {
-            throw new \Sabre\DAV\Exception\BadRequest('The end-date must be larger than the start-date in the time-range filter');
-        }
-
-        return array(
-            'start' => $start,
-            'end' => $end,
-        );
-
-    }
-
-    /**
-     * Parses the CALDAV:expand element
-     *
-     * @param \DOMElement $parentNode
-     * @return void
-     */
-    protected function parseExpand(\DOMElement $parentNode) {
-
-        $start = $parentNode->getAttribute('start');
-        if(!$start) {
-            throw new \Sabre\DAV\Exception\BadRequest('The "start" attribute is required for the CALDAV:expand element');
-        }
-        $start = VObject\DateTimeParser::parseDateTime($start);
-
-        $end = $parentNode->getAttribute('end');
-        if(!$end) {
-            throw new \Sabre\DAV\Exception\BadRequest('The "end" attribute is required for the CALDAV:expand element');
-        }
-
-        $end = VObject\DateTimeParser::parseDateTime($end);
-
-        if ($end <= $start) {
-            throw new \Sabre\DAV\Exception\BadRequest('The end-date must be larger than the start-date in the expand element.');
-        }
-
-        return array(
-            'start' => $start,
-            'end' => $end,
-        );
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/CalendarQueryValidator.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/CalendarQueryValidator.php
deleted file mode 100644
index 494aed1a7d..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/CalendarQueryValidator.php
+++ /dev/null
@@ -1,392 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV;
-
-use Sabre\VObject;
-use DateTime;
-
-/**
- * CalendarQuery Validator
- *
- * This class is responsible for checking if an iCalendar object matches a set
- * of filters. The main function to do this is 'validate'.
- *
- * This is used to determine which icalendar objects should be returned for a
- * calendar-query REPORT request.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class CalendarQueryValidator {
-
-    /**
-     * Verify if a list of filters applies to the calendar data object
-     *
-     * The list of filters must be formatted as parsed by \Sabre\CalDAV\CalendarQueryParser
-     *
-     * @param VObject\Component $vObject
-     * @param array $filters
-     * @return bool
-     */
-    public function validate(VObject\Component $vObject,array $filters) {
-
-        // The top level object is always a component filter.
-        // We'll parse it manually, as it's pretty simple.
-        if ($vObject->name !== $filters['name']) {
-            return false;
-        }
-
-        return
-            $this->validateCompFilters($vObject, $filters['comp-filters']) &&
-            $this->validatePropFilters($vObject, $filters['prop-filters']);
-
-
-    }
-
-    /**
-     * This method checks the validity of comp-filters.
-     *
-     * A list of comp-filters needs to be specified. Also the parent of the
-     * component we're checking should be specified, not the component to check
-     * itself.
-     *
-     * @param VObject\Component $parent
-     * @param array $filters
-     * @return bool
-     */
-    protected function validateCompFilters(VObject\Component $parent, array $filters) {
-
-        foreach($filters as $filter) {
-
-            $isDefined = isset($parent->$filter['name']);
-
-            if ($filter['is-not-defined']) {
-
-                if ($isDefined) {
-                    return false;
-                } else {
-                    continue;
-                }
-
-            }
-            if (!$isDefined) {
-                return false;
-            }
-
-            if ($filter['time-range']) {
-                foreach($parent->$filter['name'] as $subComponent) {
-                    if ($this->validateTimeRange($subComponent, $filter['time-range']['start'], $filter['time-range']['end'])) {
-                        continue 2;
-                    }
-                }
-                return false;
-            }
-
-            if (!$filter['comp-filters'] && !$filter['prop-filters']) {
-                continue;
-            }
-
-            // If there are sub-filters, we need to find at least one component
-            // for which the subfilters hold true.
-            foreach($parent->$filter['name'] as $subComponent) {
-
-                if (
-                    $this->validateCompFilters($subComponent, $filter['comp-filters']) &&
-                    $this->validatePropFilters($subComponent, $filter['prop-filters'])) {
-                        // We had a match, so this comp-filter succeeds
-                        continue 2;
-                }
-
-            }
-
-            // If we got here it means there were sub-comp-filters or
-            // sub-prop-filters and there was no match. This means this filter
-            // needs to return false.
-            return false;
-
-        }
-
-        // If we got here it means we got through all comp-filters alive so the
-        // filters were all true.
-        return true;
-
-    }
-
-    /**
-     * This method checks the validity of prop-filters.
-     *
-     * A list of prop-filters needs to be specified. Also the parent of the
-     * property we're checking should be specified, not the property to check
-     * itself.
-     *
-     * @param VObject\Component $parent
-     * @param array $filters
-     * @return bool
-     */
-    protected function validatePropFilters(VObject\Component $parent, array $filters) {
-
-        foreach($filters as $filter) {
-
-            $isDefined = isset($parent->$filter['name']);
-
-            if ($filter['is-not-defined']) {
-
-                if ($isDefined) {
-                    return false;
-                } else {
-                    continue;
-                }
-
-            }
-            if (!$isDefined) {
-                return false;
-            }
-
-            if ($filter['time-range']) {
-                foreach($parent->$filter['name'] as $subComponent) {
-                    if ($this->validateTimeRange($subComponent, $filter['time-range']['start'], $filter['time-range']['end'])) {
-                        continue 2;
-                    }
-                }
-                return false;
-            }
-
-            if (!$filter['param-filters'] && !$filter['text-match']) {
-                continue;
-            }
-
-            // If there are sub-filters, we need to find at least one property
-            // for which the subfilters hold true.
-            foreach($parent->$filter['name'] as $subComponent) {
-
-                if(
-                    $this->validateParamFilters($subComponent, $filter['param-filters']) &&
-                    (!$filter['text-match'] || $this->validateTextMatch($subComponent, $filter['text-match']))
-                ) {
-                    // We had a match, so this prop-filter succeeds
-                    continue 2;
-                }
-
-            }
-
-            // If we got here it means there were sub-param-filters or
-            // text-match filters and there was no match. This means the
-            // filter needs to return false.
-            return false;
-
-        }
-
-        // If we got here it means we got through all prop-filters alive so the
-        // filters were all true.
-        return true;
-
-    }
-
-    /**
-     * This method checks the validity of param-filters.
-     *
-     * A list of param-filters needs to be specified. Also the parent of the
-     * parameter we're checking should be specified, not the parameter to check
-     * itself.
-     *
-     * @param VObject\Property $parent
-     * @param array $filters
-     * @return bool
-     */
-    protected function validateParamFilters(VObject\Property $parent, array $filters) {
-
-        foreach($filters as $filter) {
-
-            $isDefined = isset($parent[$filter['name']]);
-
-            if ($filter['is-not-defined']) {
-
-                if ($isDefined) {
-                    return false;
-                } else {
-                    continue;
-                }
-
-            }
-            if (!$isDefined) {
-                return false;
-            }
-
-            if (!$filter['text-match']) {
-                continue;
-            }
-
-            if (version_compare(VObject\Version::VERSION, '3.0.0beta1', '>=')) {
-
-                // If there are sub-filters, we need to find at least one parameter
-                // for which the subfilters hold true.
-                foreach($parent[$filter['name']]->getParts() as $subParam) {
-
-                    if($this->validateTextMatch($subParam,$filter['text-match'])) {
-                        // We had a match, so this param-filter succeeds
-                        continue 2;
-                    }
-
-                }
-
-            } else {
-
-                // If there are sub-filters, we need to find at least one parameter
-                // for which the subfilters hold true.
-                foreach($parent[$filter['name']] as $subParam) {
-
-                    if($this->validateTextMatch($subParam,$filter['text-match'])) {
-                        // We had a match, so this param-filter succeeds
-                        continue 2;
-                    }
-
-                }
-
-            }
-
-            // If we got here it means there was a text-match filter and there
-            // were no matches. This means the filter needs to return false.
-            return false;
-
-        }
-
-        // If we got here it means we got through all param-filters alive so the
-        // filters were all true.
-        return true;
-
-    }
-
-    /**
-     * This method checks the validity of a text-match.
-     *
-     * A single text-match should be specified as well as the specific property
-     * or parameter we need to validate.
-     *
-     * @param VObject\Node|string $check Value to check against.
-     * @param array $textMatch
-     * @return bool
-     */
-    protected function validateTextMatch($check, array $textMatch) {
-
-        if ($check instanceof VObject\Node) {
-            $check = (string)$check;
-        }
-
-        $isMatching = \Sabre\DAV\StringUtil::textMatch($check, $textMatch['value'], $textMatch['collation']);
-
-        return ($textMatch['negate-condition'] xor $isMatching);
-
-    }
-
-    /**
-     * Validates if a component matches the given time range.
-     *
-     * This is all based on the rules specified in rfc4791, which are quite
-     * complex.
-     *
-     * @param VObject\Node $component
-     * @param DateTime $start
-     * @param DateTime $end
-     * @return bool
-     */
-    protected function validateTimeRange(VObject\Node $component, $start, $end) {
-
-        if (is_null($start)) {
-            $start = new DateTime('1900-01-01');
-        }
-        if (is_null($end)) {
-            $end = new DateTime('3000-01-01');
-        }
-
-        switch($component->name) {
-
-            case 'VEVENT' :
-            case 'VTODO' :
-            case 'VJOURNAL' :
-
-                return $component->isInTimeRange($start, $end);
-
-            case 'VALARM' :
-
-                // If the valarm is wrapped in a recurring event, we need to
-                // expand the recursions, and validate each.
-                //
-                // Our datamodel doesn't easily allow us to do this straight
-                // in the VALARM component code, so this is a hack, and an
-                // expensive one too.
-                if ($component->parent->name === 'VEVENT' && $component->parent->RRULE) {
-
-                    // Fire up the iterator!
-                    $it = new VObject\RecurrenceIterator($component->parent->parent, (string)$component->parent->UID);
-                    while($it->valid()) {
-                        $expandedEvent = $it->getEventObject();
-
-                        // We need to check from these expanded alarms, which
-                        // one is the first to trigger. Based on this, we can
-                        // determine if we can 'give up' expanding events.
-                        $firstAlarm = null;
-                        if ($expandedEvent->VALARM !== null) {
-                            foreach($expandedEvent->VALARM as $expandedAlarm) {
-
-                                $effectiveTrigger = $expandedAlarm->getEffectiveTriggerTime();
-                                if ($expandedAlarm->isInTimeRange($start, $end)) {
-                                    return true;
-                                }
-
-                                if ((string)$expandedAlarm->TRIGGER['VALUE'] === 'DATE-TIME') {
-                                    // This is an alarm with a non-relative trigger
-                                    // time, likely created by a buggy client. The
-                                    // implication is that every alarm in this
-                                    // recurring event trigger at the exact same
-                                    // time. It doesn't make sense to traverse
-                                    // further.
-                                } else {
-                                    // We store the first alarm as a means to
-                                    // figure out when we can stop traversing.
-                                    if (!$firstAlarm || $effectiveTrigger < $firstAlarm) {
-                                        $firstAlarm = $effectiveTrigger;
-                                    }
-                                }
-                            }
-                        }
-                        if (is_null($firstAlarm)) {
-                            // No alarm was found.
-                            //
-                            // Or technically: No alarm that will change for
-                            // every instance of the recurrence was found,
-                            // which means we can assume there was no match.
-                            return false;
-                        }
-                        if ($firstAlarm > $end) {
-                            return false;
-                        }
-                        $it->next();
-                    }
-                    return false;
-                } else {
-                    return $component->isInTimeRange($start, $end);
-                }
-
-            case 'VFREEBUSY' :
-                throw new \Sabre\DAV\Exception\NotImplemented('time-range filters are currently not supported on ' . $component->name . ' components');
-
-            case 'COMPLETED' :
-            case 'CREATED' :
-            case 'DTEND' :
-            case 'DTSTAMP' :
-            case 'DTSTART' :
-            case 'DUE' :
-            case 'LAST-MODIFIED' :
-                return ($start <= $component->getDateTime() && $end >= $component->getDateTime());
-
-
-
-            default :
-                throw new \Sabre\DAV\Exception\BadRequest('You cannot create a time-range filter on a ' . $component->name . ' component');
-
-        }
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/CalendarRootNode.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/CalendarRootNode.php
deleted file mode 100644
index 4f72ad4444..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/CalendarRootNode.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV;
-
-use Sabre\DAVACL\PrincipalBackend;
-
-/**
- * Calendars collection
- *
- * This object is responsible for generating a list of calendar-homes for each
- * user.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class CalendarRootNode extends \Sabre\DAVACL\AbstractPrincipalCollection {
-
-    /**
-     * CalDAV backend
-     *
-     * @var Sabre\CalDAV\Backend\BackendInterface
-     */
-    protected $caldavBackend;
-
-    /**
-     * Constructor
-     *
-     * This constructor needs both an authentication and a caldav backend.
-     *
-     * By default this class will show a list of calendar collections for
-     * principals in the 'principals' collection. If your main principals are
-     * actually located in a different path, use the $principalPrefix argument
-     * to override this.
-     *
-     * @param PrincipalBackend\BackendInterface $principalBackend
-     * @param Backend\BackendInterface $caldavBackend
-     * @param string $principalPrefix
-     */
-    public function __construct(PrincipalBackend\BackendInterface $principalBackend,Backend\BackendInterface $caldavBackend, $principalPrefix = 'principals') {
-
-        parent::__construct($principalBackend, $principalPrefix);
-        $this->caldavBackend = $caldavBackend;
-
-    }
-
-    /**
-     * Returns the nodename
-     *
-     * We're overriding this, because the default will be the 'principalPrefix',
-     * and we want it to be Sabre\CalDAV\Plugin::CALENDAR_ROOT
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return Plugin::CALENDAR_ROOT;
-
-    }
-
-    /**
-     * This method returns a node for a principal.
-     *
-     * The passed array contains principal information, and is guaranteed to
-     * at least contain a uri item. Other properties may or may not be
-     * supplied by the authentication backend.
-     *
-     * @param array $principal
-     * @return \Sabre\DAV\INode
-     */
-    public function getChildForPrincipal(array $principal) {
-
-        return new UserCalendars($this->caldavBackend, $principal);
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Exception/InvalidComponentType.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Exception/InvalidComponentType.php
deleted file mode 100644
index f2a64e33f2..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Exception/InvalidComponentType.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Exception;
-
-use Sabre\DAV;
-use Sabre\CalDAV;
-
-/**
- * InvalidComponentType
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class InvalidComponentType extends DAV\Exception\Forbidden {
-
-    /**
-     * Adds in extra information in the xml response.
-     *
-     * This method adds the {CALDAV:}supported-calendar-component as defined in rfc4791
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(DAV\Server $server, \DOMElement $errorNode) {
-
-        $doc = $errorNode->ownerDocument;
-
-        $np = $doc->createElementNS(CalDAV\Plugin::NS_CALDAV,'cal:supported-calendar-component');
-        $errorNode->appendChild($np);
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/ICSExportPlugin.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/ICSExportPlugin.php
deleted file mode 100644
index bba7fbd5ad..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/ICSExportPlugin.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV;
-
-use Sabre\DAV;
-use Sabre\VObject;
-
-/**
- * ICS Exporter
- *
- * This plugin adds the ability to export entire calendars as .ics files.
- * This is useful for clients that don't support CalDAV yet. They often do
- * support ics files.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class ICSExportPlugin extends DAV\ServerPlugin {
-
-    /**
-     * Reference to Server class
-     *
-     * @var \Sabre\DAV\Server
-     */
-    protected $server;
-
-    /**
-     * Initializes the plugin and registers event handlers
-     *
-     * @param \Sabre\DAV\Server $server
-     * @return void
-     */
-    public function initialize(DAV\Server $server) {
-
-        $this->server = $server;
-        $this->server->subscribeEvent('beforeMethod',array($this,'beforeMethod'), 90);
-
-    }
-
-    /**
-     * 'beforeMethod' event handles. This event handles intercepts GET requests ending
-     * with ?export
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function beforeMethod($method, $uri) {
-
-        if ($method!='GET') return;
-        if ($this->server->httpRequest->getQueryString()!='export') return;
-
-        // splitting uri
-        list($uri) = explode('?',$uri,2);
-
-        $node = $this->server->tree->getNodeForPath($uri);
-
-        if (!($node instanceof Calendar)) return;
-
-        // Checking ACL, if available.
-        if ($aclPlugin = $this->server->getPlugin('acl')) {
-            $aclPlugin->checkPrivileges($uri, '{DAV:}read');
-        }
-
-        $this->server->httpResponse->setHeader('Content-Type','text/calendar');
-        $this->server->httpResponse->sendStatus(200);
-
-        $nodes = $this->server->getPropertiesForPath($uri, array(
-            '{' . Plugin::NS_CALDAV . '}calendar-data',
-        ),1);
-
-        $this->server->httpResponse->sendBody($this->generateICS($nodes));
-
-        // Returning false to break the event chain
-        return false;
-
-    }
-
-    /**
-     * Merges all calendar objects, and builds one big ics export
-     *
-     * @param array $nodes
-     * @return string
-     */
-    public function generateICS(array $nodes) {
-
-        $calendar = new VObject\Component\VCalendar();
-        $calendar->version = '2.0';
-        if (DAV\Server::$exposeVersion) {
-            $calendar->prodid = '-//SabreDAV//SabreDAV ' . DAV\Version::VERSION . '//EN';
-        } else {
-            $calendar->prodid = '-//SabreDAV//SabreDAV//EN';
-        }
-        $calendar->calscale = 'GREGORIAN';
-
-        $collectedTimezones = array();
-
-        $timezones = array();
-        $objects = array();
-
-        foreach($nodes as $node) {
-
-            if (!isset($node[200]['{' . Plugin::NS_CALDAV . '}calendar-data'])) {
-                continue;
-            }
-            $nodeData = $node[200]['{' . Plugin::NS_CALDAV . '}calendar-data'];
-
-            $nodeComp = VObject\Reader::read($nodeData);
-
-            foreach($nodeComp->children() as $child) {
-
-                switch($child->name) {
-                    case 'VEVENT' :
-                    case 'VTODO' :
-                    case 'VJOURNAL' :
-                        $objects[] = $child;
-                        break;
-
-                    // VTIMEZONE is special, because we need to filter out the duplicates
-                    case 'VTIMEZONE' :
-                        // Naively just checking tzid.
-                        if (in_array((string)$child->TZID, $collectedTimezones)) continue;
-
-                        $timezones[] = $child;
-                        $collectedTimezones[] = $child->TZID;
-                        break;
-
-                }
-
-            }
-
-        }
-
-        foreach($timezones as $tz) $calendar->add($tz);
-        foreach($objects as $obj) $calendar->add($obj);
-
-        return $calendar->serialize();
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/ICalendar.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/ICalendar.php
deleted file mode 100644
index 0f0547046f..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/ICalendar.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV;
-use Sabre\DAV;
-
-/**
- * Calendar interface
- *
- * Implement this interface to allow a node to be recognized as an calendar.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface ICalendar extends DAV\ICollection {
-
-    /**
-     * Performs a calendar-query on the contents of this calendar.
-     *
-     * The calendar-query is defined in RFC4791 : CalDAV. Using the
-     * calendar-query it is possible for a client to request a specific set of
-     * object, based on contents of iCalendar properties, date-ranges and
-     * iCalendar component types (VTODO, VEVENT).
-     *
-     * This method should just return a list of (relative) urls that match this
-     * query.
-     *
-     * The list of filters are specified as an array. The exact array is
-     * documented by \Sabre\CalDAV\CalendarQueryParser.
-     *
-     * @param array $filters
-     * @return array
-     */
-    public function calendarQuery(array $filters);
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/ICalendarObject.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/ICalendarObject.php
deleted file mode 100644
index 0776abff0f..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/ICalendarObject.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV;
-use Sabre\DAV;
-
-/**
- * CalendarObject interface
- *
- * Extend the ICalendarObject interface to allow your custom nodes to be picked up as
- * CalendarObjects.
- *
- * Calendar objects are resources such as Events, Todo's or Journals.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface ICalendarObject extends DAV\IFile {
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/IShareableCalendar.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/IShareableCalendar.php
deleted file mode 100644
index 4dd62e5c68..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/IShareableCalendar.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV;
-
-/**
- * This interface represents a Calendar that can be shared with other users.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface IShareableCalendar extends ICalendar {
-
-    /**
-     * Updates the list of shares.
-     *
-     * The first array is a list of people that are to be added to the
-     * calendar.
-     *
-     * Every element in the add array has the following properties:
-     *   * href - A url. Usually a mailto: address
-     *   * commonName - Usually a first and last name, or false
-     *   * summary - A description of the share, can also be false
-     *   * readOnly - A boolean value
-     *
-     * Every element in the remove array is just the address string.
-     *
-     * @param array $add
-     * @param array $remove
-     * @return void
-     */
-    function updateShares(array $add, array $remove);
-
-    /**
-     * Returns the list of people whom this calendar is shared with.
-     *
-     * Every element in this array should have the following properties:
-     *   * href - Often a mailto: address
-     *   * commonName - Optional, for example a first + last name
-     *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
-     *   * readOnly - boolean
-     *   * summary - Optional, a description for the share
-     *
-     * @return array
-     */
-    function getShares();
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/ISharedCalendar.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/ISharedCalendar.php
deleted file mode 100644
index 917d1c4983..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/ISharedCalendar.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV;
-
-/**
- * This interface represents a Calendar that is shared by a different user.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface ISharedCalendar extends ICalendar {
-
-    /**
-     * This method should return the url of the owners' copy of the shared
-     * calendar.
-     *
-     * @return string
-     */
-    function getSharedUrl();
-
-    /**
-     * Returns the list of people whom this calendar is shared with.
-     *
-     * Every element in this array should have the following properties:
-     *   * href - Often a mailto: address
-     *   * commonName - Optional, for example a first + last name
-     *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
-     *   * readOnly - boolean
-     *   * summary - Optional, a description for the share
-     *
-     * @return array
-     */
-    function getShares();
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Notifications/Collection.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Notifications/Collection.php
deleted file mode 100644
index 028b00d879..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Notifications/Collection.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Notifications;
-
-use Sabre\DAV;
-use Sabre\CalDAV;
-use Sabre\DAVACL;
-
-/**
- * This node represents a list of notifications.
- *
- * It provides no additional functionality, but you must implement this
- * interface to allow the Notifications plugin to mark the collection
- * as a notifications collection.
- *
- * This collection should only return Sabre\CalDAV\Notifications\INode nodes as
- * its children.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Collection extends DAV\Collection implements ICollection, DAVACL\IACL {
-
-    /**
-     * The notification backend
-     *
-     * @var Sabre\CalDAV\Backend\NotificationSupport
-     */
-    protected $caldavBackend;
-
-    /**
-     * Principal uri
-     *
-     * @var string
-     */
-    protected $principalUri;
-
-    /**
-     * Constructor
-     *
-     * @param CalDAV\Backend\NotificationSupport $caldavBackend
-     * @param string $principalUri
-     */
-    public function __construct(CalDAV\Backend\NotificationSupport $caldavBackend, $principalUri) {
-
-        $this->caldavBackend = $caldavBackend;
-        $this->principalUri = $principalUri;
-
-    }
-
-    /**
-     * Returns all notifications for a principal
-     *
-     * @return array
-     */
-    public function getChildren() {
-
-        $children = array();
-        $notifications = $this->caldavBackend->getNotificationsForPrincipal($this->principalUri);
-
-        foreach($notifications as $notification) {
-
-            $children[] = new Node(
-                $this->caldavBackend,
-                $this->principalUri,
-                $notification
-            );
-        }
-
-        return $children;
-
-    }
-
-    /**
-     * Returns the name of this object
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return 'notifications';
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->principalUri;
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'principal' => $this->getOwner(),
-                'privilege' => '{DAV:}read',
-                'protected' => true,
-            ),
-            array(
-                'principal' => $this->getOwner(),
-                'privilege' => '{DAV:}write',
-                'protected' => true,
-            )
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's as an array argument.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new DAV\Exception\NotImplemented('Updating ACLs is not implemented here');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Notifications/ICollection.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Notifications/ICollection.php
deleted file mode 100644
index 26e13b2119..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Notifications/ICollection.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Notifications;
-
-use Sabre\DAV;
-
-/**
- * This node represents a list of notifications.
- *
- * It provides no additional functionality, but you must implement this
- * interface to allow the Notifications plugin to mark the collection
- * as a notifications collection.
- *
- * This collection should only return Sabre\CalDAV\Notifications\INode nodes as
- * its children.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface ICollection extends DAV\ICollection {
-
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Notifications/INode.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Notifications/INode.php
deleted file mode 100644
index cd7fc57987..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Notifications/INode.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Notifications;
-
-/**
- * This node represents a single notification.
- *
- * The signature is mostly identical to that of Sabre\DAV\IFile, but the get() method
- * MUST return an xml document that matches the requirements of the
- * 'caldav-notifications.txt' spec.
- *
- * For a complete example, check out the Notification class, which contains
- * some helper functions.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface INode {
-
-    /**
-     * This method must return an xml element, using the
-     * Sabre\CalDAV\Notifications\INotificationType classes.
-     *
-     * @return INotificationType
-     */
-    function getNotificationType();
-
-    /**
-     * Returns the etag for the notification.
-     *
-     * The etag must be surrounded by litteral double-quotes.
-     *
-     * @return string
-     */
-    function getETag();
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Notifications/INotificationType.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Notifications/INotificationType.php
deleted file mode 100644
index b646399b9d..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Notifications/INotificationType.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Notifications;
-use Sabre\DAV;
-
-/**
- * This interface reflects a single notification type.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface INotificationType extends DAV\PropertyInterface {
-
-    /**
-     * This method serializes the entire notification, as it is used in the
-     * response body.
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $node
-     * @return void
-     */
-    function serializeBody(DAV\Server $server, \DOMElement $node);
-
-    /**
-     * Returns a unique id for this notification
-     *
-     * This is just the base url. This should generally be some kind of unique
-     * id.
-     *
-     * @return string
-     */
-    function getId();
-
-    /**
-     * Returns the ETag for this notification.
-     *
-     * The ETag must be surrounded by literal double-quotes.
-     *
-     * @return string
-     */
-    function getETag();
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Notifications/Node.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Notifications/Node.php
deleted file mode 100644
index 6367e9388b..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Notifications/Node.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Notifications;
-
-use Sabre\DAV;
-use Sabre\CalDAV;
-use Sabre\DAVACL;
-
-/**
- * This node represents a single notification.
- *
- * The signature is mostly identical to that of Sabre\DAV\IFile, but the get() method
- * MUST return an xml document that matches the requirements of the
- * 'caldav-notifications.txt' spec.
-
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Node extends DAV\File implements INode, DAVACL\IACL {
-
-    /**
-     * The notification backend
-     *
-     * @var Sabre\CalDAV\Backend\NotificationSupport
-     */
-    protected $caldavBackend;
-
-    /**
-     * The actual notification
-     *
-     * @var Sabre\CalDAV\Notifications\INotificationType
-     */
-    protected $notification;
-
-    /**
-     * Owner principal of the notification
-     *
-     * @var string
-     */
-    protected $principalUri;
-
-    /**
-     * Constructor
-     *
-     * @param CalDAV\Backend\NotificationSupport $caldavBackend
-     * @param string $principalUri
-     * @param CalDAV\Notifications\INotificationType $notification
-     */
-    public function __construct(CalDAV\Backend\NotificationSupport $caldavBackend, $principalUri, INotificationType $notification) {
-
-        $this->caldavBackend = $caldavBackend;
-        $this->principalUri = $principalUri;
-        $this->notification = $notification;
-
-    }
-
-    /**
-     * Returns the path name for this notification
-     *
-     * @return id
-     */
-    public function getName() {
-
-        return $this->notification->getId() . '.xml';
-
-    }
-
-    /**
-     * Returns the etag for the notification.
-     *
-     * The etag must be surrounded by litteral double-quotes.
-     *
-     * @return string
-     */
-    public function getETag() {
-
-        return $this->notification->getETag();
-
-    }
-
-    /**
-     * This method must return an xml element, using the
-     * Sabre\CalDAV\Notifications\INotificationType classes.
-     *
-     * @return INotificationType
-     */
-    public function getNotificationType() {
-
-        return $this->notification;
-
-    }
-
-    /**
-     * Deletes this notification
-     *
-     * @return void
-     */
-    public function delete() {
-
-        $this->caldavBackend->deleteNotification($this->getOwner(), $this->notification);
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->principalUri;
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'principal' => $this->getOwner(),
-                'privilege' => '{DAV:}read',
-                'protected' => true,
-            ),
-            array(
-                'principal' => $this->getOwner(),
-                'privilege' => '{DAV:}write',
-                'protected' => true,
-            )
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's as an array argument.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new DAV\Exception\NotImplemented('Updating ACLs is not implemented here');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Notifications/Notification/Invite.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Notifications/Notification/Invite.php
deleted file mode 100644
index 8d6974d459..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Notifications/Notification/Invite.php
+++ /dev/null
@@ -1,324 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Notifications\Notification;
-
-use Sabre\CalDAV\SharingPlugin as SharingPlugin;
-use Sabre\DAV;
-use Sabre\CalDAV;
-
-/**
- * This class represents the cs:invite-notification notification element.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Invite extends DAV\Property implements CalDAV\Notifications\INotificationType {
-
-    /**
-     * A unique id for the message
-     *
-     * @var string
-     */
-    protected $id;
-
-    /**
-     * Timestamp of the notification
-     *
-     * @var DateTime
-     */
-    protected $dtStamp;
-
-    /**
-     * A url to the recipient of the notification. This can be an email
-     * address (mailto:), or a principal url.
-     *
-     * @var string
-     */
-    protected $href;
-
-    /**
-     * The type of message, see the SharingPlugin::STATUS_* constants.
-     *
-     * @var int
-     */
-    protected $type;
-
-    /**
-     * True if access to a calendar is read-only.
-     *
-     * @var bool
-     */
-    protected $readOnly;
-
-    /**
-     * A url to the shared calendar.
-     *
-     * @var string
-     */
-    protected $hostUrl;
-
-    /**
-     * Url to the sharer of the calendar
-     *
-     * @var string
-     */
-    protected $organizer;
-
-    /**
-     * The name of the sharer.
-     *
-     * @var string
-     */
-    protected $commonName;
-
-    /**
-     * The name of the sharer.
-     *
-     * @var string
-     */
-    protected $firstName;
-
-    /**
-     * The name of the sharer.
-     *
-     * @var string
-     */
-    protected $lastName;
-
-    /**
-     * A description of the share request
-     *
-     * @var string
-     */
-    protected $summary;
-
-    /**
-     * The Etag for the notification
-     *
-     * @var string
-     */
-    protected $etag;
-
-    /**
-     * The list of supported components
-     *
-     * @var Sabre\CalDAV\Property\SupportedCalendarComponentSet
-     */
-    protected $supportedComponents;
-
-    /**
-     * Creates the Invite notification.
-     *
-     * This constructor receives an array with the following elements:
-     *
-     *   * id           - A unique id
-     *   * etag         - The etag
-     *   * dtStamp      - A DateTime object with a timestamp for the notification.
-     *   * type         - The type of notification, see SharingPlugin::STATUS_*
-     *                    constants for details.
-     *   * readOnly     - This must be set to true, if this is an invite for
-     *                    read-only access to a calendar.
-     *   * hostUrl      - A url to the shared calendar.
-     *   * organizer    - Url to the sharer principal.
-     *   * commonName   - The real name of the sharer (optional).
-     *   * firstName    - The first name of the sharer (optional).
-     *   * lastName     - The last name of the sharer (optional).
-     *   * summary      - Description of the share, can be the same as the
-     *                    calendar, but may also be modified (optional).
-     *   * supportedComponents - An instance of
-     *                    Sabre\CalDAV\Property\SupportedCalendarComponentSet.
-     *                    This allows the client to determine which components
-     *                    will be supported in the shared calendar. This is
-     *                    also optional.
-     *
-     * @param array $values All the options
-     */
-    public function __construct(array $values) {
-
-        $required = array(
-            'id',
-            'etag',
-            'href',
-            'dtStamp',
-            'type',
-            'readOnly',
-            'hostUrl',
-            'organizer',
-        );
-        foreach($required as $item) {
-            if (!isset($values[$item])) {
-                throw new \InvalidArgumentException($item . ' is a required constructor option');
-            }
-        }
-
-        foreach($values as $key=>$value) {
-            if (!property_exists($this, $key)) {
-                throw new \InvalidArgumentException('Unknown option: ' . $key);
-            }
-            $this->$key = $value;
-        }
-
-    }
-
-    /**
-     * Serializes the notification as a single property.
-     *
-     * You should usually just encode the single top-level element of the
-     * notification.
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $node
-     * @return void
-     */
-    public function serialize(DAV\Server $server, \DOMElement $node) {
-
-        $prop = $node->ownerDocument->createElement('cs:invite-notification');
-        $node->appendChild($prop);
-
-    }
-
-    /**
-     * This method serializes the entire notification, as it is used in the
-     * response body.
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $node
-     * @return void
-     */
-    public function serializeBody(DAV\Server $server, \DOMElement $node) {
-
-        $doc = $node->ownerDocument;
-
-        $dt = $doc->createElement('cs:dtstamp');
-        $this->dtStamp->setTimezone(new \DateTimezone('GMT'));
-        $dt->appendChild($doc->createTextNode($this->dtStamp->format('Ymd\\THis\\Z')));
-        $node->appendChild($dt);
-
-        $prop = $doc->createElement('cs:invite-notification');
-        $node->appendChild($prop);
-
-        $uid = $doc->createElement('cs:uid');
-        $uid->appendChild( $doc->createTextNode($this->id) );
-        $prop->appendChild($uid);
-
-        $href = $doc->createElement('d:href');
-        $href->appendChild( $doc->createTextNode( $this->href ) );
-        $prop->appendChild($href);
-
-        $nodeName = null;
-        switch($this->type) {
-
-            case SharingPlugin::STATUS_ACCEPTED :
-                $nodeName = 'cs:invite-accepted';
-                break;
-            case SharingPlugin::STATUS_DECLINED :
-                $nodeName = 'cs:invite-declined';
-                break;
-            case SharingPlugin::STATUS_DELETED :
-                $nodeName = 'cs:invite-deleted';
-                break;
-            case SharingPlugin::STATUS_NORESPONSE :
-                $nodeName = 'cs:invite-noresponse';
-                break;
-
-        }
-        $prop->appendChild(
-            $doc->createElement($nodeName)
-        );
-        $hostHref = $doc->createElement('d:href', $server->getBaseUri() . $this->hostUrl);
-        $hostUrl  = $doc->createElement('cs:hosturl');
-        $hostUrl->appendChild($hostHref);
-        $prop->appendChild($hostUrl);
-
-        $access = $doc->createElement('cs:access');
-        if ($this->readOnly) {
-            $access->appendChild($doc->createElement('cs:read'));
-        } else {
-            $access->appendChild($doc->createElement('cs:read-write'));
-        }
-        $prop->appendChild($access);
-
-        $organizerUrl  = $doc->createElement('cs:organizer');
-        // If the organizer contains a 'mailto:' part, it means it should be
-        // treated as absolute.
-        if (strtolower(substr($this->organizer,0,7))==='mailto:') {
-            $organizerHref = new DAV\Property\Href($this->organizer, false);
-        } else {
-            $organizerHref = new DAV\Property\Href($this->organizer, true);
-        }
-        $organizerHref->serialize($server, $organizerUrl);
-
-        if ($this->commonName) {
-            $commonName = $doc->createElement('cs:common-name');
-            $commonName->appendChild($doc->createTextNode($this->commonName));
-            $organizerUrl->appendChild($commonName);
-
-            $commonNameOld = $doc->createElement('cs:organizer-cn');
-            $commonNameOld->appendChild($doc->createTextNode($this->commonName));
-            $prop->appendChild($commonNameOld);
-
-        }
-        if ($this->firstName) {
-            $firstName = $doc->createElement('cs:first-name');
-            $firstName->appendChild($doc->createTextNode($this->firstName));
-            $organizerUrl->appendChild($firstName);
-
-            $firstNameOld = $doc->createElement('cs:organizer-first');
-            $firstNameOld->appendChild($doc->createTextNode($this->firstName));
-            $prop->appendChild($firstNameOld);
-        }
-        if ($this->lastName) {
-            $lastName = $doc->createElement('cs:last-name');
-            $lastName->appendChild($doc->createTextNode($this->lastName));
-            $organizerUrl->appendChild($lastName);
-
-            $lastNameOld = $doc->createElement('cs:organizer-last');
-            $lastNameOld->appendChild($doc->createTextNode($this->lastName));
-            $prop->appendChild($lastNameOld);
-        }
-        $prop->appendChild($organizerUrl);
-
-        if ($this->summary) {
-            $summary = $doc->createElement('cs:summary');
-            $summary->appendChild($doc->createTextNode($this->summary));
-            $prop->appendChild($summary);
-        }
-        if ($this->supportedComponents) {
-
-            $xcomp = $doc->createElement('cal:supported-calendar-component-set');
-            $this->supportedComponents->serialize($server, $xcomp);
-            $prop->appendChild($xcomp);
-
-        }
-
-    }
-
-    /**
-     * Returns a unique id for this notification
-     *
-     * This is just the base url. This should generally be some kind of unique
-     * id.
-     *
-     * @return string
-     */
-    public function getId() {
-
-        return $this->id;
-
-    }
-
-    /**
-     * Returns the ETag for this notification.
-     *
-     * The ETag must be surrounded by literal double-quotes.
-     *
-     * @return string
-     */
-    public function getETag() {
-
-        return $this->etag;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Notifications/Notification/InviteReply.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Notifications/Notification/InviteReply.php
deleted file mode 100644
index e40751346b..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Notifications/Notification/InviteReply.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Notifications\Notification;
-
-use Sabre\CalDAV\SharingPlugin as SharingPlugin;
-use Sabre\DAV;
-use Sabre\CalDAV;
-
-/**
- * This class represents the cs:invite-reply notification element.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class InviteReply extends DAV\Property implements CalDAV\Notifications\INotificationType {
-
-    /**
-     * A unique id for the message
-     *
-     * @var string
-     */
-    protected $id;
-
-    /**
-     * Timestamp of the notification
-     *
-     * @var DateTime
-     */
-    protected $dtStamp;
-
-    /**
-     * The unique id of the notification this was a reply to.
-     *
-     * @var string
-     */
-    protected $inReplyTo;
-
-    /**
-     * A url to the recipient of the original (!) notification.
-     *
-     * @var string
-     */
-    protected $href;
-
-    /**
-     * The type of message, see the SharingPlugin::STATUS_ constants.
-     *
-     * @var int
-     */
-    protected $type;
-
-    /**
-     * A url to the shared calendar.
-     *
-     * @var string
-     */
-    protected $hostUrl;
-
-    /**
-     * A description of the share request
-     *
-     * @var string
-     */
-    protected $summary;
-
-    /**
-     * Notification Etag
-     *
-     * @var string
-     */
-    protected $etag;
-
-    /**
-     * Creates the Invite Reply Notification.
-     *
-     * This constructor receives an array with the following elements:
-     *
-     *   * id           - A unique id
-     *   * etag         - The etag
-     *   * dtStamp      - A DateTime object with a timestamp for the notification.
-     *   * inReplyTo    - This should refer to the 'id' of the notification
-     *                    this is a reply to.
-     *   * type         - The type of notification, see SharingPlugin::STATUS_*
-     *                    constants for details.
-     *   * hostUrl      - A url to the shared calendar.
-     *   * summary      - Description of the share, can be the same as the
-     *                    calendar, but may also be modified (optional).
-     */
-    public function __construct(array $values) {
-
-        $required = array(
-            'id',
-            'etag',
-            'href',
-            'dtStamp',
-            'inReplyTo',
-            'type',
-            'hostUrl',
-        );
-        foreach($required as $item) {
-            if (!isset($values[$item])) {
-                throw new \InvalidArgumentException($item . ' is a required constructor option');
-            }
-        }
-
-        foreach($values as $key=>$value) {
-            if (!property_exists($this, $key)) {
-                throw new \InvalidArgumentException('Unknown option: ' . $key);
-            }
-            $this->$key = $value;
-        }
-
-    }
-
-    /**
-     * Serializes the notification as a single property.
-     *
-     * You should usually just encode the single top-level element of the
-     * notification.
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $node
-     * @return void
-     */
-    public function serialize(DAV\Server $server, \DOMElement $node) {
-
-        $prop = $node->ownerDocument->createElement('cs:invite-reply');
-        $node->appendChild($prop);
-
-    }
-
-    /**
-     * This method serializes the entire notification, as it is used in the
-     * response body.
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $node
-     * @return void
-     */
-    public function serializeBody(DAV\Server $server, \DOMElement $node) {
-
-        $doc = $node->ownerDocument;
-
-        $dt = $doc->createElement('cs:dtstamp');
-        $this->dtStamp->setTimezone(new \DateTimezone('GMT'));
-        $dt->appendChild($doc->createTextNode($this->dtStamp->format('Ymd\\THis\\Z')));
-        $node->appendChild($dt);
-
-        $prop = $doc->createElement('cs:invite-reply');
-        $node->appendChild($prop);
-
-        $uid = $doc->createElement('cs:uid');
-        $uid->appendChild($doc->createTextNode($this->id));
-        $prop->appendChild($uid);
-
-        $inReplyTo = $doc->createElement('cs:in-reply-to');
-        $inReplyTo->appendChild( $doc->createTextNode($this->inReplyTo) );
-        $prop->appendChild($inReplyTo);
-
-        $href = $doc->createElement('d:href');
-        $href->appendChild( $doc->createTextNode($this->href) );
-        $prop->appendChild($href);
-
-        $nodeName = null;
-        switch($this->type) {
-
-            case SharingPlugin::STATUS_ACCEPTED :
-                $nodeName = 'cs:invite-accepted';
-                break;
-            case SharingPlugin::STATUS_DECLINED :
-                $nodeName = 'cs:invite-declined';
-                break;
-
-        }
-        $prop->appendChild(
-            $doc->createElement($nodeName)
-        );
-        $hostHref = $doc->createElement('d:href', $server->getBaseUri() . $this->hostUrl);
-        $hostUrl  = $doc->createElement('cs:hosturl');
-        $hostUrl->appendChild($hostHref);
-        $prop->appendChild($hostUrl);
-
-        if ($this->summary) {
-            $summary = $doc->createElement('cs:summary');
-            $summary->appendChild($doc->createTextNode($this->summary));
-            $prop->appendChild($summary);
-        }
-
-    }
-
-    /**
-     * Returns a unique id for this notification
-     *
-     * This is just the base url. This should generally be some kind of unique
-     * id.
-     *
-     * @return string
-     */
-    public function getId() {
-
-        return $this->id;
-
-    }
-
-    /**
-     * Returns the ETag for this notification.
-     *
-     * The ETag must be surrounded by literal double-quotes.
-     *
-     * @return string
-     */
-    public function getETag() {
-
-        return $this->etag;
-
-    }
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Notifications/Notification/SystemStatus.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Notifications/Notification/SystemStatus.php
deleted file mode 100644
index 608892dab0..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Notifications/Notification/SystemStatus.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Notifications\Notification;
-
-use Sabre\DAV;
-use Sabre\CalDAV;
-
-/**
- * SystemStatus notification
- *
- * This notification can be used to indicate to the user that the system is
- * down.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class SystemStatus extends DAV\Property implements CalDAV\Notifications\INotificationType {
-
-    const TYPE_LOW = 1;
-    const TYPE_MEDIUM = 2;
-    const TYPE_HIGH = 3;
-
-    /**
-     * A unique id
-     *
-     * @var string
-     */
-    protected $id;
-
-    /**
-     * The type of alert. This should be one of the TYPE_ constants.
-     *
-     * @var int
-     */
-    protected $type;
-
-    /**
-     * A human-readable description of the problem.
-     *
-     * @var string
-     */
-    protected $description;
-
-    /**
-     * A url to a website with more information for the user.
-     *
-     * @var string
-     */
-    protected $href;
-
-    /**
-     * Notification Etag
-     *
-     * @var string
-     */
-    protected $etag;
-
-    /**
-     * Creates the notification.
-     *
-     * Some kind of unique id should be provided. This is used to generate a
-     * url.
-     *
-     * @param string $id
-     * @param string $etag
-     * @param int $type
-     * @param string $description
-     * @param string $href
-     */
-    public function __construct($id, $etag, $type = self::TYPE_HIGH, $description = null, $href = null) {
-
-        $this->id = $id;
-        $this->type = $type;
-        $this->description = $description;
-        $this->href = $href;
-        $this->etag = $etag;
-
-    }
-
-    /**
-     * Serializes the notification as a single property.
-     *
-     * You should usually just encode the single top-level element of the
-     * notification.
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $node
-     * @return void
-     */
-    public function serialize(DAV\Server $server, \DOMElement $node) {
-
-        switch($this->type) {
-            case self::TYPE_LOW :
-                $type = 'low';
-                break;
-            case self::TYPE_MEDIUM :
-                $type = 'medium';
-                break;
-            default :
-            case self::TYPE_HIGH :
-                $type = 'high';
-                break;
-        }
-
-        $prop = $node->ownerDocument->createElement('cs:systemstatus');
-        $prop->setAttribute('type', $type);
-
-        $node->appendChild($prop);
-
-    }
-
-    /**
-     * This method serializes the entire notification, as it is used in the
-     * response body.
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $node
-     * @return void
-     */
-    public function serializeBody(DAV\Server $server, \DOMElement $node) {
-
-        switch($this->type) {
-            case self::TYPE_LOW :
-                $type = 'low';
-                break;
-            case self::TYPE_MEDIUM :
-                $type = 'medium';
-                break;
-            default :
-            case self::TYPE_HIGH :
-                $type = 'high';
-                break;
-        }
-
-        $prop = $node->ownerDocument->createElement('cs:systemstatus');
-        $prop->setAttribute('type', $type);
-
-        if ($this->description) {
-            $text = $node->ownerDocument->createTextNode($this->description);
-            $desc = $node->ownerDocument->createElement('cs:description');
-            $desc->appendChild($text);
-            $prop->appendChild($desc);
-        }
-        if ($this->href) {
-            $text = $node->ownerDocument->createTextNode($this->href);
-            $href = $node->ownerDocument->createElement('d:href');
-            $href->appendChild($text);
-            $prop->appendChild($href);
-        }
-
-        $node->appendChild($prop);
-
-    }
-
-    /**
-     * Returns a unique id for this notification
-     *
-     * This is just the base url. This should generally be some kind of unique
-     * id.
-     *
-     * @return string
-     */
-    public function getId() {
-
-        return $this->id;
-
-    }
-
-    /*
-     * Returns the ETag for this notification.
-     *
-     * The ETag must be surrounded by literal double-quotes.
-     *
-     * @return string
-     */
-    public function getETag() {
-
-        return $this->etag;
-
-    }
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Plugin.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Plugin.php
deleted file mode 100644
index 610929388c..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Plugin.php
+++ /dev/null
@@ -1,1338 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV;
-
-use Sabre\DAV;
-use Sabre\DAVACL;
-use Sabre\VObject;
-
-/**
- * CalDAV plugin
- *
- * This plugin provides functionality added by CalDAV (RFC 4791)
- * It implements new reports, and the MKCALENDAR method.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Plugin extends DAV\ServerPlugin {
-
-    /**
-     * This is the official CalDAV namespace
-     */
-    const NS_CALDAV = 'urn:ietf:params:xml:ns:caldav';
-
-    /**
-     * This is the namespace for the proprietary calendarserver extensions
-     */
-    const NS_CALENDARSERVER = 'http://calendarserver.org/ns/';
-
-    /**
-     * The hardcoded root for calendar objects. It is unfortunate
-     * that we're stuck with it, but it will have to do for now
-     */
-    const CALENDAR_ROOT = 'calendars';
-
-    /**
-     * Reference to server object
-     *
-     * @var DAV\Server
-     */
-    protected $server;
-
-    /**
-     * The email handler for invites and other scheduling messages.
-     *
-     * @var Schedule\IMip
-     */
-    protected $imipHandler;
-
-    /**
-     * Sets the iMIP handler.
-     *
-     * iMIP = The email transport of iCalendar scheduling messages. Setting
-     * this is optional, but if you want the server to allow invites to be sent
-     * out, you must set a handler.
-     *
-     * Specifically iCal will plain assume that the server supports this. If
-     * the server doesn't, iCal will display errors when inviting people to
-     * events.
-     *
-     * @param Schedule\IMip $imipHandler
-     * @return void
-     */
-    public function setIMipHandler(Schedule\IMip $imipHandler) {
-
-        $this->imipHandler = $imipHandler;
-
-    }
-
-    /**
-     * Use this method to tell the server this plugin defines additional
-     * HTTP methods.
-     *
-     * This method is passed a uri. It should only return HTTP methods that are
-     * available for the specified uri.
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getHTTPMethods($uri) {
-
-        // The MKCALENDAR is only available on unmapped uri's, whose
-        // parents extend IExtendedCollection
-        list($parent, $name) = DAV\URLUtil::splitPath($uri);
-
-        $node = $this->server->tree->getNodeForPath($parent);
-
-        if ($node instanceof DAV\IExtendedCollection) {
-            try {
-                $node->getChild($name);
-            } catch (DAV\Exception\NotFound $e) {
-                return array('MKCALENDAR');
-            }
-        }
-        return array();
-
-    }
-
-    /**
-     * Returns a list of features for the DAV: HTTP header.
-     *
-     * @return array
-     */
-    public function getFeatures() {
-
-        return array('calendar-access', 'calendar-proxy');
-
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using DAV\Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return 'caldav';
-
-    }
-
-    /**
-     * Returns a list of reports this plugin supports.
-     *
-     * This will be used in the {DAV:}supported-report-set property.
-     * Note that you still need to subscribe to the 'report' event to actually
-     * implement them
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getSupportedReportSet($uri) {
-
-        $node = $this->server->tree->getNodeForPath($uri);
-
-        $reports = array();
-        if ($node instanceof ICalendar || $node instanceof ICalendarObject) {
-            $reports[] = '{' . self::NS_CALDAV . '}calendar-multiget';
-            $reports[] = '{' . self::NS_CALDAV . '}calendar-query';
-        }
-        if ($node instanceof ICalendar) {
-            $reports[] = '{' . self::NS_CALDAV . '}free-busy-query';
-        }
-        return $reports;
-
-    }
-
-    /**
-     * Initializes the plugin
-     *
-     * @param DAV\Server $server
-     * @return void
-     */
-    public function initialize(DAV\Server $server) {
-
-        $this->server = $server;
-
-        $server->subscribeEvent('unknownMethod',array($this,'unknownMethod'));
-        //$server->subscribeEvent('unknownMethod',array($this,'unknownMethod2'),1000);
-        $server->subscribeEvent('report',array($this,'report'));
-        $server->subscribeEvent('beforeGetProperties',array($this,'beforeGetProperties'));
-        $server->subscribeEvent('onHTMLActionsPanel', array($this,'htmlActionsPanel'));
-        $server->subscribeEvent('onBrowserPostAction', array($this,'browserPostAction'));
-        $server->subscribeEvent('beforeWriteContent', array($this, 'beforeWriteContent'));
-        $server->subscribeEvent('beforeCreateFile', array($this, 'beforeCreateFile'));
-        $server->subscribeEvent('beforeMethod', array($this,'beforeMethod'));
-
-        $server->xmlNamespaces[self::NS_CALDAV] = 'cal';
-        $server->xmlNamespaces[self::NS_CALENDARSERVER] = 'cs';
-
-        $server->propertyMap['{' . self::NS_CALDAV . '}supported-calendar-component-set'] = 'Sabre\\CalDAV\\Property\\SupportedCalendarComponentSet';
-        $server->propertyMap['{' . self::NS_CALDAV . '}schedule-calendar-transp'] = 'Sabre\\CalDAV\\Property\\ScheduleCalendarTransp';
-
-        $server->resourceTypeMapping['\\Sabre\\CalDAV\\ICalendar'] = '{urn:ietf:params:xml:ns:caldav}calendar';
-        $server->resourceTypeMapping['\\Sabre\\CalDAV\\Schedule\\IOutbox'] = '{urn:ietf:params:xml:ns:caldav}schedule-outbox';
-        $server->resourceTypeMapping['\\Sabre\\CalDAV\\Principal\\IProxyRead'] = '{http://calendarserver.org/ns/}calendar-proxy-read';
-        $server->resourceTypeMapping['\\Sabre\\CalDAV\\Principal\\IProxyWrite'] = '{http://calendarserver.org/ns/}calendar-proxy-write';
-        $server->resourceTypeMapping['\\Sabre\\CalDAV\\Notifications\\ICollection'] = '{' . self::NS_CALENDARSERVER . '}notification';
-
-        array_push($server->protectedProperties,
-
-            '{' . self::NS_CALDAV . '}supported-calendar-component-set',
-            '{' . self::NS_CALDAV . '}supported-calendar-data',
-            '{' . self::NS_CALDAV . '}max-resource-size',
-            '{' . self::NS_CALDAV . '}min-date-time',
-            '{' . self::NS_CALDAV . '}max-date-time',
-            '{' . self::NS_CALDAV . '}max-instances',
-            '{' . self::NS_CALDAV . '}max-attendees-per-instance',
-            '{' . self::NS_CALDAV . '}calendar-home-set',
-            '{' . self::NS_CALDAV . '}supported-collation-set',
-            '{' . self::NS_CALDAV . '}calendar-data',
-
-            // scheduling extension
-            '{' . self::NS_CALDAV . '}schedule-inbox-URL',
-            '{' . self::NS_CALDAV . '}schedule-outbox-URL',
-            '{' . self::NS_CALDAV . '}calendar-user-address-set',
-            '{' . self::NS_CALDAV . '}calendar-user-type',
-
-            // CalendarServer extensions
-            '{' . self::NS_CALENDARSERVER . '}getctag',
-            '{' . self::NS_CALENDARSERVER . '}calendar-proxy-read-for',
-            '{' . self::NS_CALENDARSERVER . '}calendar-proxy-write-for',
-            '{' . self::NS_CALENDARSERVER . '}notification-URL',
-            '{' . self::NS_CALENDARSERVER . '}notificationtype'
-
-        );
-    }
-
-    /**
-     * This function handles support for the MKCALENDAR method
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function unknownMethod($method, $uri) {
-
-        switch ($method) {
-            case 'MKCALENDAR' :
-                $this->httpMkCalendar($uri);
-                // false is returned to stop the propagation of the
-                // unknownMethod event.
-                return false;
-            case 'POST' :
-
-                // Checking if this is a text/calendar content type
-                $contentType = $this->server->httpRequest->getHeader('Content-Type');
-                if (strpos($contentType, 'text/calendar')!==0) {
-                    return;
-                }
-
-                // Checking if we're talking to an outbox
-                try {
-                    $node = $this->server->tree->getNodeForPath($uri);
-                } catch (DAV\Exception\NotFound $e) {
-                    return;
-                }
-                if (!$node instanceof Schedule\IOutbox)
-                    return;
-
-                $this->outboxRequest($node, $uri);
-                return false;
-
-        }
-
-    }
-
-    /**
-     * This functions handles REPORT requests specific to CalDAV
-     *
-     * @param string $reportName
-     * @param \DOMNode $dom
-     * @return bool
-     */
-    public function report($reportName,$dom) {
-
-        switch($reportName) {
-            case '{'.self::NS_CALDAV.'}calendar-multiget' :
-                $this->calendarMultiGetReport($dom);
-                return false;
-            case '{'.self::NS_CALDAV.'}calendar-query' :
-                $this->calendarQueryReport($dom);
-                return false;
-            case '{'.self::NS_CALDAV.'}free-busy-query' :
-                $this->freeBusyQueryReport($dom);
-                return false;
-
-        }
-
-
-    }
-
-    /**
-     * This function handles the MKCALENDAR HTTP method, which creates
-     * a new calendar.
-     *
-     * @param string $uri
-     * @return void
-     */
-    public function httpMkCalendar($uri) {
-
-        // Due to unforgivable bugs in iCal, we're completely disabling MKCALENDAR support
-        // for clients matching iCal in the user agent
-        //$ua = $this->server->httpRequest->getHeader('User-Agent');
-        //if (strpos($ua,'iCal/')!==false) {
-        //    throw new \Sabre\DAV\Exception\Forbidden('iCal has major bugs in it\'s RFC3744 support. Therefore we are left with no other choice but disabling this feature.');
-        //}
-
-        $body = $this->server->httpRequest->getBody(true);
-        $properties = array();
-
-        if ($body) {
-
-            $dom = DAV\XMLUtil::loadDOMDocument($body);
-
-            foreach($dom->firstChild->childNodes as $child) {
-
-                if (DAV\XMLUtil::toClarkNotation($child)!=='{DAV:}set') continue;
-                foreach(DAV\XMLUtil::parseProperties($child,$this->server->propertyMap) as $k=>$prop) {
-                    $properties[$k] = $prop;
-                }
-
-            }
-        }
-
-        $resourceType = array('{DAV:}collection','{urn:ietf:params:xml:ns:caldav}calendar');
-
-        $this->server->createCollection($uri,$resourceType,$properties);
-
-        $this->server->httpResponse->sendStatus(201);
-        $this->server->httpResponse->setHeader('Content-Length',0);
-    }
-
-    /**
-     * beforeGetProperties
-     *
-     * This method handler is invoked before any after properties for a
-     * resource are fetched. This allows us to add in any CalDAV specific
-     * properties.
-     *
-     * @param string $path
-     * @param DAV\INode $node
-     * @param array $requestedProperties
-     * @param array $returnedProperties
-     * @return void
-     */
-    public function beforeGetProperties($path, DAV\INode $node, &$requestedProperties, &$returnedProperties) {
-
-        if ($node instanceof DAVACL\IPrincipal) {
-
-            // calendar-home-set property
-            $calHome = '{' . self::NS_CALDAV . '}calendar-home-set';
-            if (in_array($calHome,$requestedProperties)) {
-                $principalId = $node->getName();
-                $calendarHomePath = self::CALENDAR_ROOT . '/' . $principalId . '/';
-
-                unset($requestedProperties[array_search($calHome, $requestedProperties)]);
-                $returnedProperties[200][$calHome] = new DAV\Property\Href($calendarHomePath);
-
-            }
-
-            // schedule-outbox-URL property
-            $scheduleProp = '{' . self::NS_CALDAV . '}schedule-outbox-URL';
-            if (in_array($scheduleProp,$requestedProperties)) {
-                $principalId = $node->getName();
-                $outboxPath = self::CALENDAR_ROOT . '/' . $principalId . '/outbox';
-
-                unset($requestedProperties[array_search($scheduleProp, $requestedProperties)]);
-                $returnedProperties[200][$scheduleProp] = new DAV\Property\Href($outboxPath);
-
-            }
-
-            // calendar-user-address-set property
-            $calProp = '{' . self::NS_CALDAV . '}calendar-user-address-set';
-            if (in_array($calProp,$requestedProperties)) {
-
-                $addresses = $node->getAlternateUriSet();
-                $addresses[] = $this->server->getBaseUri() . DAV\URLUtil::encodePath($node->getPrincipalUrl() . '/');
-                unset($requestedProperties[array_search($calProp, $requestedProperties)]);
-                $returnedProperties[200][$calProp] = new DAV\Property\HrefList($addresses, false);
-
-            }
-
-            // These two properties are shortcuts for ical to easily find
-            // other principals this principal has access to.
-            $propRead = '{' . self::NS_CALENDARSERVER . '}calendar-proxy-read-for';
-            $propWrite = '{' . self::NS_CALENDARSERVER . '}calendar-proxy-write-for';
-            if (in_array($propRead,$requestedProperties) || in_array($propWrite,$requestedProperties)) {
-
-                $aclPlugin = $this->server->getPlugin('acl');
-                $membership = $aclPlugin->getPrincipalMembership($path);
-                $readList = array();
-                $writeList = array();
-
-                foreach($membership as $group) {
-
-                    $groupNode = $this->server->tree->getNodeForPath($group);
-
-                    // If the node is either ap proxy-read or proxy-write
-                    // group, we grab the parent principal and add it to the
-                    // list.
-                    if ($groupNode instanceof Principal\IProxyRead) {
-                        list($readList[]) = DAV\URLUtil::splitPath($group);
-                    }
-                    if ($groupNode instanceof Principal\IProxyWrite) {
-                        list($writeList[]) = DAV\URLUtil::splitPath($group);
-                    }
-
-                }
-                if (in_array($propRead,$requestedProperties)) {
-                    unset($requestedProperties[$propRead]);
-                    $returnedProperties[200][$propRead] = new DAV\Property\HrefList($readList);
-                }
-                if (in_array($propWrite,$requestedProperties)) {
-                    unset($requestedProperties[$propWrite]);
-                    $returnedProperties[200][$propWrite] = new DAV\Property\HrefList($writeList);
-                }
-
-            }
-
-            // notification-URL property
-            $notificationUrl = '{' . self::NS_CALENDARSERVER . '}notification-URL';
-            if (($index = array_search($notificationUrl, $requestedProperties)) !== false) {
-                $principalId = $node->getName();
-                $calendarHomePath = 'calendars/' . $principalId . '/notifications/';
-                unset($requestedProperties[$index]);
-                $returnedProperties[200][$notificationUrl] = new DAV\Property\Href($calendarHomePath);
-            }
-
-        } // instanceof IPrincipal
-
-        if ($node instanceof Notifications\INode) {
-
-            $propertyName = '{' . self::NS_CALENDARSERVER . '}notificationtype';
-            if (($index = array_search($propertyName, $requestedProperties)) !== false) {
-
-                $returnedProperties[200][$propertyName] =
-                    $node->getNotificationType();
-
-                unset($requestedProperties[$index]);
-
-            }
-
-        } // instanceof Notifications_INode
-
-
-        if ($node instanceof ICalendarObject) {
-            // The calendar-data property is not supposed to be a 'real'
-            // property, but in large chunks of the spec it does act as such.
-            // Therefore we simply expose it as a property.
-            $calDataProp = '{' . Plugin::NS_CALDAV . '}calendar-data';
-            if (in_array($calDataProp, $requestedProperties)) {
-                unset($requestedProperties[$calDataProp]);
-                $val = $node->get();
-                if (is_resource($val))
-                    $val = stream_get_contents($val);
-
-                // Taking out \r to not screw up the xml output
-                $returnedProperties[200][$calDataProp] = str_replace("\r","", $val);
-
-            }
-        }
-
-    }
-
-    /**
-     * This function handles the calendar-multiget REPORT.
-     *
-     * This report is used by the client to fetch the content of a series
-     * of urls. Effectively avoiding a lot of redundant requests.
-     *
-     * @param \DOMNode $dom
-     * @return void
-     */
-    public function calendarMultiGetReport($dom) {
-
-        $properties = array_keys(DAV\XMLUtil::parseProperties($dom->firstChild));
-        $hrefElems = $dom->getElementsByTagNameNS('urn:DAV','href');
-
-        $xpath = new \DOMXPath($dom);
-        $xpath->registerNameSpace('cal',Plugin::NS_CALDAV);
-        $xpath->registerNameSpace('dav','urn:DAV');
-
-        $expand = $xpath->query('/cal:calendar-multiget/dav:prop/cal:calendar-data/cal:expand');
-        if ($expand->length>0) {
-            $expandElem = $expand->item(0);
-            $start = $expandElem->getAttribute('start');
-            $end = $expandElem->getAttribute('end');
-            if(!$start || !$end) {
-                throw new DAV\Exception\BadRequest('The "start" and "end" attributes are required for the CALDAV:expand element');
-            }
-            $start = VObject\DateTimeParser::parseDateTime($start);
-            $end = VObject\DateTimeParser::parseDateTime($end);
-
-            if ($end <= $start) {
-                throw new DAV\Exception\BadRequest('The end-date must be larger than the start-date in the expand element.');
-            }
-
-            $expand = true;
-
-        } else {
-
-            $expand = false;
-
-        }
-
-        foreach($hrefElems as $elem) {
-            $uri = $this->server->calculateUri($elem->nodeValue);
-            list($objProps) = $this->server->getPropertiesForPath($uri,$properties);
-
-            if ($expand && isset($objProps[200]['{' . self::NS_CALDAV . '}calendar-data'])) {
-                $vObject = VObject\Reader::read($objProps[200]['{' . self::NS_CALDAV . '}calendar-data']);
-                $vObject->expand($start, $end);
-                $objProps[200]['{' . self::NS_CALDAV . '}calendar-data'] = $vObject->serialize();
-            }
-
-            $propertyList[]=$objProps;
-
-        }
-
-        $prefer = $this->server->getHTTPPRefer();
-
-        $this->server->httpResponse->sendStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->setHeader('Vary','Brief,Prefer');
-        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($propertyList, $prefer['return-minimal']));
-
-    }
-
-    /**
-     * This function handles the calendar-query REPORT
-     *
-     * This report is used by clients to request calendar objects based on
-     * complex conditions.
-     *
-     * @param \DOMNode $dom
-     * @return void
-     */
-    public function calendarQueryReport($dom) {
-
-        $parser = new CalendarQueryParser($dom);
-        $parser->parse();
-
-        $node = $this->server->tree->getNodeForPath($this->server->getRequestUri());
-        $depth = $this->server->getHTTPDepth(0);
-
-        // The default result is an empty array
-        $result = array();
-
-        // The calendarobject was requested directly. In this case we handle
-        // this locally.
-        if ($depth == 0 && $node instanceof ICalendarObject) {
-
-            $requestedCalendarData = true;
-            $requestedProperties = $parser->requestedProperties;
-
-            if (!in_array('{urn:ietf:params:xml:ns:caldav}calendar-data', $requestedProperties)) {
-
-                // We always retrieve calendar-data, as we need it for filtering.
-                $requestedProperties[] = '{urn:ietf:params:xml:ns:caldav}calendar-data';
-
-                // If calendar-data wasn't explicitly requested, we need to remove
-                // it after processing.
-                $requestedCalendarData = false;
-            }
-
-            $properties = $this->server->getPropertiesForPath(
-                $this->server->getRequestUri(),
-                $requestedProperties,
-                0
-            );
-
-            // This array should have only 1 element, the first calendar
-            // object.
-            $properties = current($properties);
-
-            // If there wasn't any calendar-data returned somehow, we ignore
-            // this.
-            if (isset($properties[200]['{urn:ietf:params:xml:ns:caldav}calendar-data'])) {
-
-                $validator = new CalendarQueryValidator();
-
-                $vObject = VObject\Reader::read($properties[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']);
-                if ($validator->validate($vObject,$parser->filters)) {
-
-                    // If the client didn't require the calendar-data property,
-                    // we won't give it back.
-                    if (!$requestedCalendarData) {
-                        unset($properties[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']);
-                    } else {
-                        if ($parser->expand) {
-                            $vObject->expand($parser->expand['start'], $parser->expand['end']);
-                            $properties[200]['{' . self::NS_CALDAV . '}calendar-data'] = $vObject->serialize();
-                        }
-                    }
-
-                    $result = array($properties);
-
-                }
-
-            }
-
-        }
-        // If we're dealing with a calendar, the calendar itself is responsible
-        // for the calendar-query.
-        if ($node instanceof ICalendar && $depth = 1) {
-
-            $nodePaths = $node->calendarQuery($parser->filters);
-
-            foreach($nodePaths as $path) {
-
-                list($properties) =
-                    $this->server->getPropertiesForPath($this->server->getRequestUri() . '/' . $path, $parser->requestedProperties);
-
-                if ($parser->expand) {
-                    // We need to do some post-processing
-                    $vObject = VObject\Reader::read($properties[200]['{urn:ietf:params:xml:ns:caldav}calendar-data']);
-                    $vObject->expand($parser->expand['start'], $parser->expand['end']);
-                    $properties[200]['{' . self::NS_CALDAV . '}calendar-data'] = $vObject->serialize();
-                }
-
-                $result[] = $properties;
-
-            }
-
-        }
-
-        $prefer = $this->server->getHTTPPRefer();
-
-        $this->server->httpResponse->sendStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->setHeader('Vary','Brief,Prefer');
-        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($result, $prefer['return-minimal']));
-
-    }
-
-    /**
-     * This method is responsible for parsing the request and generating the
-     * response for the CALDAV:free-busy-query REPORT.
-     *
-     * @param \DOMNode $dom
-     * @return void
-     */
-    protected function freeBusyQueryReport(\DOMNode $dom) {
-
-        $start = null;
-        $end = null;
-
-        foreach($dom->firstChild->childNodes as $childNode) {
-
-            $clark = DAV\XMLUtil::toClarkNotation($childNode);
-            if ($clark == '{' . self::NS_CALDAV . '}time-range') {
-                $start = $childNode->getAttribute('start');
-                $end = $childNode->getAttribute('end');
-                break;
-            }
-
-        }
-        if ($start) {
-            $start = VObject\DateTimeParser::parseDateTime($start);
-        }
-        if ($end) {
-            $end = VObject\DateTimeParser::parseDateTime($end);
-        }
-
-        if (!$start && !$end) {
-            throw new DAV\Exception\BadRequest('The freebusy report must have a time-range filter');
-        }
-        $acl = $this->server->getPlugin('acl');
-
-        if (!$acl) {
-            throw new DAV\Exception('The ACL plugin must be loaded for free-busy queries to work');
-        }
-        $uri = $this->server->getRequestUri();
-        $acl->checkPrivileges($uri,'{' . self::NS_CALDAV . '}read-free-busy');
-
-        $calendar = $this->server->tree->getNodeForPath($uri);
-        if (!$calendar instanceof ICalendar) {
-            throw new DAV\Exception\NotImplemented('The free-busy-query REPORT is only implemented on calendars');
-        }
-
-        // Doing a calendar-query first, to make sure we get the most
-        // performance.
-        $urls = $calendar->calendarQuery(array(
-            'name' => 'VCALENDAR',
-            'comp-filters' => array(
-                array(
-                    'name' => 'VEVENT',
-                    'comp-filters' => array(),
-                    'prop-filters' => array(),
-                    'is-not-defined' => false,
-                    'time-range' => array(
-                        'start' => $start,
-                        'end' => $end,
-                    ),
-                ),
-            ),
-            'prop-filters' => array(),
-            'is-not-defined' => false,
-            'time-range' => null,
-        ));
-
-        $objects = array_map(function($url) use ($calendar) {
-            $obj = $calendar->getChild($url)->get();
-            return $obj;
-        }, $urls);
-
-        $generator = new VObject\FreeBusyGenerator();
-        $generator->setObjects($objects);
-        $generator->setTimeRange($start, $end);
-        $result = $generator->getResult();
-        $result = $result->serialize();
-
-        $this->server->httpResponse->sendStatus(200);
-        $this->server->httpResponse->setHeader('Content-Type', 'text/calendar');
-        $this->server->httpResponse->setHeader('Content-Length', strlen($result));
-        $this->server->httpResponse->sendBody($result);
-
-    }
-
-    /**
-     * This method is triggered before a file gets updated with new content.
-     *
-     * This plugin uses this method to ensure that CalDAV objects receive
-     * valid calendar data.
-     *
-     * @param string $path
-     * @param DAV\IFile $node
-     * @param resource $data
-     * @return void
-     */
-    public function beforeWriteContent($path, DAV\IFile $node, &$data) {
-
-        if (!$node instanceof ICalendarObject)
-            return;
-
-        $this->validateICalendar($data, $path);
-
-    }
-
-    /**
-     * This method is triggered before a new file is created.
-     *
-     * This plugin uses this method to ensure that newly created calendar
-     * objects contain valid calendar data.
-     *
-     * @param string $path
-     * @param resource $data
-     * @param DAV\ICollection $parentNode
-     * @return void
-     */
-    public function beforeCreateFile($path, &$data, DAV\ICollection $parentNode) {
-
-        if (!$parentNode instanceof Calendar)
-            return;
-
-        $this->validateICalendar($data, $path);
-
-    }
-
-    /**
-     * This event is triggered before any HTTP request is handled.
-     *
-     * We use this to intercept GET calls to notification nodes, and return the
-     * proper response.
-     *
-     * @param string $method
-     * @param string $path
-     * @return void
-     */
-    public function beforeMethod($method, $path) {
-
-        if ($method!=='GET') return;
-
-        try {
-            $node = $this->server->tree->getNodeForPath($path);
-        } catch (DAV\Exception\NotFound $e) {
-            return;
-        }
-
-        if (!$node instanceof Notifications\INode)
-            return;
-
-        if (!$this->server->checkPreconditions(true)) return false;
-        $dom = new \DOMDocument('1.0', 'UTF-8');
-
-        $dom->formatOutput = true;
-
-        $root = $dom->createElement('cs:notification');
-        foreach($this->server->xmlNamespaces as $namespace => $prefix) {
-            $root->setAttribute('xmlns:' . $prefix, $namespace);
-        }
-
-        $dom->appendChild($root);
-        $node->getNotificationType()->serializeBody($this->server, $root);
-
-        $this->server->httpResponse->setHeader('Content-Type','application/xml');
-        $this->server->httpResponse->setHeader('ETag',$node->getETag());
-        $this->server->httpResponse->sendStatus(200);
-        $this->server->httpResponse->sendBody($dom->saveXML());
-
-        return false;
-
-    }
-
-    /**
-     * Checks if the submitted iCalendar data is in fact, valid.
-     *
-     * An exception is thrown if it's not.
-     *
-     * @param resource|string $data
-     * @param string $path
-     * @return void
-     */
-    protected function validateICalendar(&$data, $path) {
-
-        // If it's a stream, we convert it to a string first.
-        if (is_resource($data)) {
-            $data = stream_get_contents($data);
-        }
-
-        // Converting the data to unicode, if needed.
-        $data = DAV\StringUtil::ensureUTF8($data);
-
-        try {
-
-            $vobj = VObject\Reader::read($data);
-
-        } catch (VObject\ParseException $e) {
-
-            throw new DAV\Exception\UnsupportedMediaType('This resource only supports valid iCalendar 2.0 data. Parse error: ' . $e->getMessage());
-
-        }
-
-        if ($vobj->name !== 'VCALENDAR') {
-            throw new DAV\Exception\UnsupportedMediaType('This collection can only support iCalendar objects.');
-        }
-
-        // Get the Supported Components for the target calendar
-        list($parentPath,$object) = DAV\URLUtil::splitPath($path);
-        $calendarProperties = $this->server->getProperties($parentPath,array('{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set'));
-        $supportedComponents = $calendarProperties['{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set']->getValue();
-
-        $foundType = null;
-        $foundUID = null;
-        foreach($vobj->getComponents() as $component) {
-            switch($component->name) {
-                case 'VTIMEZONE' :
-                    continue 2;
-                case 'VEVENT' :
-                case 'VTODO' :
-                case 'VJOURNAL' :
-                    if (is_null($foundType)) {
-                        $foundType = $component->name;
-                        if (!in_array($foundType, $supportedComponents)) {
-                            throw new Exception\InvalidComponentType('This calendar only supports ' . implode(', ', $supportedComponents) . '. We found a ' . $foundType);
-                        }
-                        if (!isset($component->UID)) {
-                            throw new DAV\Exception\BadRequest('Every ' . $component->name . ' component must have an UID');
-                        }
-                        $foundUID = (string)$component->UID;
-                    } else {
-                        if ($foundType !== $component->name) {
-                            throw new DAV\Exception\BadRequest('A calendar object must only contain 1 component. We found a ' . $component->name . ' as well as a ' . $foundType);
-                        }
-                        if ($foundUID !== (string)$component->UID) {
-                            throw new DAV\Exception\BadRequest('Every ' . $component->name . ' in this object must have identical UIDs');
-                        }
-                    }
-                    break;
-                default :
-                    throw new DAV\Exception\BadRequest('You are not allowed to create components of type: ' . $component->name . ' here');
-
-            }
-        }
-        if (!$foundType)
-            throw new DAV\Exception\BadRequest('iCalendar object must contain at least 1 of VEVENT, VTODO or VJOURNAL');
-
-    }
-
-    /**
-     * This method handles POST requests to the schedule-outbox.
-     *
-     * Currently, two types of requests are support:
-     *   * FREEBUSY requests from RFC 6638
-     *   * Simple iTIP messages from draft-desruisseaux-caldav-sched-04
-     *
-     * The latter is from an expired early draft of the CalDAV scheduling
-     * extensions, but iCal depends on a feature from that spec, so we
-     * implement it.
-     *
-     * @param Schedule\IOutbox $outboxNode
-     * @param string $outboxUri
-     * @return void
-     */
-    public function outboxRequest(Schedule\IOutbox $outboxNode, $outboxUri) {
-
-        // Parsing the request body
-        try {
-            $vObject = VObject\Reader::read($this->server->httpRequest->getBody(true));
-        } catch (VObject\ParseException $e) {
-            throw new DAV\Exception\BadRequest('The request body must be a valid iCalendar object. Parse error: ' . $e->getMessage());
-        }
-
-        // The incoming iCalendar object must have a METHOD property, and a
-        // component. The combination of both determines what type of request
-        // this is.
-        $componentType = null;
-        foreach($vObject->getComponents() as $component) {
-            if ($component->name !== 'VTIMEZONE') {
-                $componentType = $component->name;
-                break;
-            }
-        }
-        if (is_null($componentType)) {
-            throw new DAV\Exception\BadRequest('We expected at least one VTODO, VJOURNAL, VFREEBUSY or VEVENT component');
-        }
-
-        // Validating the METHOD
-        $method = strtoupper((string)$vObject->METHOD);
-        if (!$method) {
-            throw new DAV\Exception\BadRequest('A METHOD property must be specified in iTIP messages');
-        }
-
-        // So we support two types of requests:
-        //
-        // REQUEST with a VFREEBUSY component
-        // REQUEST, REPLY, ADD, CANCEL on VEVENT components
-
-        $acl = $this->server->getPlugin('acl');
-
-        if ($componentType === 'VFREEBUSY' && $method === 'REQUEST') {
-
-            $acl && $acl->checkPrivileges($outboxUri,'{' . Plugin::NS_CALDAV . '}schedule-query-freebusy');
-            $this->handleFreeBusyRequest($outboxNode, $vObject);
-
-        } elseif ($componentType === 'VEVENT' && in_array($method, array('REQUEST','REPLY','ADD','CANCEL'))) {
-
-            $acl && $acl->checkPrivileges($outboxUri,'{' . Plugin::NS_CALDAV . '}schedule-post-vevent');
-            $this->handleEventNotification($outboxNode, $vObject);
-
-        } else {
-
-            throw new DAV\Exception\NotImplemented('SabreDAV supports only VFREEBUSY (REQUEST) and VEVENT (REQUEST, REPLY, ADD, CANCEL)');
-
-        }
-
-    }
-
-    /**
-     * This method handles the REQUEST, REPLY, ADD and CANCEL methods for
-     * VEVENT iTip messages.
-     *
-     * @return void
-     */
-    protected function handleEventNotification(Schedule\IOutbox $outboxNode, VObject\Component $vObject) {
-
-        $originator = $this->server->httpRequest->getHeader('Originator');
-        $recipients = $this->server->httpRequest->getHeader('Recipient');
-
-        if (!$originator) {
-            throw new DAV\Exception\BadRequest('The Originator: header must be specified when making POST requests');
-        }
-        if (!$recipients) {
-            throw new DAV\Exception\BadRequest('The Recipient: header must be specified when making POST requests');
-        }
-
-        $recipients = explode(',',$recipients);
-        foreach($recipients as $k=>$recipient) {
-
-            $recipient = trim($recipient);
-            if (!preg_match('/^mailto:(.*)@(.*)$/i', $recipient)) {
-                throw new DAV\Exception\BadRequest('Recipients must start with mailto: and must be valid email address');
-            }
-            $recipient = substr($recipient, 7);
-            $recipients[$k] = $recipient;
-        }
-
-        // We need to make sure that 'originator' matches one of the email
-        // addresses of the selected principal.
-        $principal = $outboxNode->getOwner();
-        $props = $this->server->getProperties($principal,array(
-            '{' . self::NS_CALDAV . '}calendar-user-address-set',
-        ));
-
-        $addresses = array();
-        if (isset($props['{' . self::NS_CALDAV . '}calendar-user-address-set'])) {
-            $addresses = $props['{' . self::NS_CALDAV . '}calendar-user-address-set']->getHrefs();
-        }
-
-        $found = false;
-        foreach($addresses as $address) {
-
-            // Trimming the / on both sides, just in case..
-            if (rtrim(strtolower($originator),'/') === rtrim(strtolower($address),'/')) {
-                $found = true;
-                break;
-            }
-
-        }
-
-        if (!$found) {
-            throw new DAV\Exception\Forbidden('The addresses specified in the Originator header did not match any addresses in the owners calendar-user-address-set header');
-        }
-
-        // If the Originator header was a url, and not a mailto: address..
-        // we're going to try to pull the mailto: from the vobject body.
-        if (strtolower(substr($originator,0,7)) !== 'mailto:') {
-            $originator = (string)$vObject->VEVENT->ORGANIZER;
-
-        }
-        if (strtolower(substr($originator,0,7)) !== 'mailto:') {
-            throw new DAV\Exception\Forbidden('Could not find mailto: address in both the Orignator header, and the ORGANIZER property in the VEVENT');
-        }
-        $originator = substr($originator,7);
-
-        $result = $this->iMIPMessage($originator, $recipients, $vObject, $principal);
-        $this->server->httpResponse->sendStatus(200);
-        $this->server->httpResponse->setHeader('Content-Type','application/xml');
-        $this->server->httpResponse->sendBody($this->generateScheduleResponse($result));
-
-    }
-
-    /**
-     * Sends an iMIP message by email.
-     *
-     * This method must return an array with status codes per recipient.
-     * This should look something like:
-     *
-     * array(
-     *    'user1@example.org' => '2.0;Success'
-     * )
-     *
-     * Formatting for this status code can be found at:
-     * https://tools.ietf.org/html/rfc5545#section-3.8.8.3
-     *
-     * A list of valid status codes can be found at:
-     * https://tools.ietf.org/html/rfc5546#section-3.6
-     *
-     * @param string $originator
-     * @param array $recipients
-     * @param VObject\Component $vObject
-     * @param string $principal Principal url
-     * @return array 
-     */
-    protected function iMIPMessage($originator, array $recipients, VObject\Component $vObject, $principal) {
-
-        if (!$this->imipHandler) {
-            $resultStatus = '5.2;This server does not support this operation';
-        } else {
-            $this->imipHandler->sendMessage($originator, $recipients, $vObject, $principal);
-            $resultStatus = '2.0;Success';
-        }
-
-        $result = array();
-        foreach($recipients as $recipient) {
-            $result[$recipient] = $resultStatus;
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * Generates a schedule-response XML body
-     *
-     * The recipients array is a key->value list, containing email addresses
-     * and iTip status codes. See the iMIPMessage method for a description of
-     * the value.
-     *
-     * @param array $recipients
-     * @return string
-     */
-    public function generateScheduleResponse(array $recipients) {
-
-        $dom = new \DOMDocument('1.0','utf-8');
-        $dom->formatOutput = true;
-        $xscheduleResponse = $dom->createElement('cal:schedule-response');
-        $dom->appendChild($xscheduleResponse);
-
-        foreach($this->server->xmlNamespaces as $namespace=>$prefix) {
-
-            $xscheduleResponse->setAttribute('xmlns:' . $prefix, $namespace);
-
-        }
-
-        foreach($recipients as $recipient=>$status) {
-            $xresponse = $dom->createElement('cal:response');
-
-            $xrecipient = $dom->createElement('cal:recipient');
-            $xrecipient->appendChild($dom->createTextNode($recipient));
-            $xresponse->appendChild($xrecipient);
-
-            $xrequestStatus = $dom->createElement('cal:request-status');
-            $xrequestStatus->appendChild($dom->createTextNode($status));
-            $xresponse->appendChild($xrequestStatus);
-
-            $xscheduleResponse->appendChild($xresponse);
-
-        }
-
-        return $dom->saveXML();
-
-    }
-
-    /**
-     * This method is responsible for parsing a free-busy query request and
-     * returning it's result.
-     *
-     * @param Schedule\IOutbox $outbox
-     * @param string $request
-     * @return string
-     */
-    protected function handleFreeBusyRequest(Schedule\IOutbox $outbox, VObject\Component $vObject) {
-
-        $vFreeBusy = $vObject->VFREEBUSY;
-        $organizer = $vFreeBusy->organizer;
-
-        $organizer = (string)$organizer;
-
-        // Validating if the organizer matches the owner of the inbox.
-        $owner = $outbox->getOwner();
-
-        $caldavNS = '{' . Plugin::NS_CALDAV . '}';
-
-        $uas = $caldavNS . 'calendar-user-address-set';
-        $props = $this->server->getProperties($owner,array($uas));
-
-        if (empty($props[$uas]) || !in_array($organizer, $props[$uas]->getHrefs())) {
-            throw new DAV\Exception\Forbidden('The organizer in the request did not match any of the addresses for the owner of this inbox');
-        }
-
-        if (!isset($vFreeBusy->ATTENDEE)) {
-            throw new DAV\Exception\BadRequest('You must at least specify 1 attendee');
-        }
-
-        $attendees = array();
-        foreach($vFreeBusy->ATTENDEE as $attendee) {
-            $attendees[]= (string)$attendee;
-        }
-
-
-        if (!isset($vFreeBusy->DTSTART) || !isset($vFreeBusy->DTEND)) {
-            throw new DAV\Exception\BadRequest('DTSTART and DTEND must both be specified');
-        }
-
-        $startRange = $vFreeBusy->DTSTART->getDateTime();
-        $endRange = $vFreeBusy->DTEND->getDateTime();
-
-        $results = array();
-        foreach($attendees as $attendee) {
-            $results[] = $this->getFreeBusyForEmail($attendee, $startRange, $endRange, $vObject);
-        }
-
-        $dom = new \DOMDocument('1.0','utf-8');
-        $dom->formatOutput = true;
-        $scheduleResponse = $dom->createElement('cal:schedule-response');
-        foreach($this->server->xmlNamespaces as $namespace=>$prefix) {
-
-            $scheduleResponse->setAttribute('xmlns:' . $prefix,$namespace);
-
-        }
-        $dom->appendChild($scheduleResponse);
-
-        foreach($results as $result) {
-            $response = $dom->createElement('cal:response');
-
-            $recipient = $dom->createElement('cal:recipient');
-            $recipientHref = $dom->createElement('d:href');
-
-            $recipientHref->appendChild($dom->createTextNode($result['href']));
-            $recipient->appendChild($recipientHref);
-            $response->appendChild($recipient);
-
-            $reqStatus = $dom->createElement('cal:request-status');
-            $reqStatus->appendChild($dom->createTextNode($result['request-status']));
-            $response->appendChild($reqStatus);
-
-            if (isset($result['calendar-data'])) {
-
-                $calendardata = $dom->createElement('cal:calendar-data');
-                $calendardata->appendChild($dom->createTextNode(str_replace("\r\n","\n",$result['calendar-data']->serialize())));
-                $response->appendChild($calendardata);
-
-            }
-            $scheduleResponse->appendChild($response);
-        }
-
-        $this->server->httpResponse->sendStatus(200);
-        $this->server->httpResponse->setHeader('Content-Type','application/xml');
-        $this->server->httpResponse->sendBody($dom->saveXML());
-
-    }
-
-    /**
-     * Returns free-busy information for a specific address. The returned
-     * data is an array containing the following properties:
-     *
-     * calendar-data : A VFREEBUSY VObject
-     * request-status : an iTip status code.
-     * href: The principal's email address, as requested
-     *
-     * The following request status codes may be returned:
-     *   * 2.0;description
-     *   * 3.7;description
-     *
-     * @param string $email address
-     * @param \DateTime $start
-     * @param \DateTime $end
-     * @param VObject\Component $request
-     * @return array
-     */
-    protected function getFreeBusyForEmail($email, \DateTime $start, \DateTime $end, VObject\Component $request) {
-
-        $caldavNS = '{' . Plugin::NS_CALDAV . '}';
-
-        $aclPlugin = $this->server->getPlugin('acl');
-        if (substr($email,0,7)==='mailto:') $email = substr($email,7);
-
-        $result = $aclPlugin->principalSearch(
-            array('{http://sabredav.org/ns}email-address' => $email),
-            array(
-                '{DAV:}principal-URL', $caldavNS . 'calendar-home-set',
-                '{http://sabredav.org/ns}email-address',
-            )
-        );
-
-        if (!count($result)) {
-            return array(
-                'request-status' => '3.7;Could not find principal',
-                'href' => 'mailto:' . $email,
-            );
-        }
-
-        if (!isset($result[0][200][$caldavNS . 'calendar-home-set'])) {
-            return array(
-                'request-status' => '3.7;No calendar-home-set property found',
-                'href' => 'mailto:' . $email,
-            );
-        }
-        $homeSet = $result[0][200][$caldavNS . 'calendar-home-set']->getHref();
-
-        // Grabbing the calendar list
-        $objects = array();
-        foreach($this->server->tree->getNodeForPath($homeSet)->getChildren() as $node) {
-            if (!$node instanceof ICalendar) {
-                continue;
-            }
-            $aclPlugin->checkPrivileges($homeSet . $node->getName() ,$caldavNS . 'read-free-busy');
-
-            // Getting the list of object uris within the time-range
-            $urls = $node->calendarQuery(array(
-                'name' => 'VCALENDAR',
-                'comp-filters' => array(
-                    array(
-                        'name' => 'VEVENT',
-                        'comp-filters' => array(),
-                        'prop-filters' => array(),
-                        'is-not-defined' => false,
-                        'time-range' => array(
-                            'start' => $start,
-                            'end' => $end,
-                        ),
-                    ),
-                ),
-                'prop-filters' => array(),
-                'is-not-defined' => false,
-                'time-range' => null,
-            ));
-
-            $calObjects = array_map(function($url) use ($node) {
-                $obj = $node->getChild($url)->get();
-                return $obj;
-            }, $urls);
-
-            $objects = array_merge($objects,$calObjects);
-
-        }
-
-        $vcalendar = new VObject\Component\VCalendar();
-        $vcalendar->VERSION = '2.0';
-        $vcalendar->METHOD = 'REPLY';
-        $vcalendar->CALSCALE = 'GREGORIAN';
-        $vcalendar->PRODID = '-//SabreDAV//SabreDAV ' . DAV\Version::VERSION . '//EN';
-
-        $generator = new VObject\FreeBusyGenerator();
-        $generator->setObjects($objects);
-        $generator->setTimeRange($start, $end);
-        $generator->setBaseObject($vcalendar);
-
-        $result = $generator->getResult();
-
-        $vcalendar->VFREEBUSY->ATTENDEE = 'mailto:' . $email;
-        $vcalendar->VFREEBUSY->UID = (string)$request->VFREEBUSY->UID;
-        $vcalendar->VFREEBUSY->ORGANIZER = clone $request->VFREEBUSY->ORGANIZER;
-
-        return array(
-            'calendar-data' => $result,
-            'request-status' => '2.0;Success',
-            'href' => 'mailto:' . $email,
-        );
-    }
-
-    /**
-     * This method is used to generate HTML output for the
-     * DAV\Browser\Plugin. This allows us to generate an interface users
-     * can use to create new calendars.
-     *
-     * @param DAV\INode $node
-     * @param string $output
-     * @return bool
-     */
-    public function htmlActionsPanel(DAV\INode $node, &$output) {
-
-        if (!$node instanceof UserCalendars)
-            return;
-
-        $output.= '<tr><td colspan="2"><form method="post" action="">
-            <h3>Create new calendar</h3>
-            <input type="hidden" name="sabreAction" value="mkcalendar" />
-            <label>Name (uri):</label> <input type="text" name="name" /><br />
-            <label>Display name:</label> <input type="text" name="{DAV:}displayname" /><br />
-            <input type="submit" value="create" />
-            </form>
-            </td></tr>';
-
-        return false;
-
-    }
-
-    /**
-     * This method allows us to intercept the 'mkcalendar' sabreAction. This
-     * action enables the user to create new calendars from the browser plugin.
-     *
-     * @param string $uri
-     * @param string $action
-     * @param array $postVars
-     * @return bool
-     */
-    public function browserPostAction($uri, $action, array $postVars) {
-
-        if ($action!=='mkcalendar')
-            return;
-
-        $resourceType = array('{DAV:}collection','{urn:ietf:params:xml:ns:caldav}calendar');
-        $properties = array();
-        if (isset($postVars['{DAV:}displayname'])) {
-            $properties['{DAV:}displayname'] = $postVars['{DAV:}displayname'];
-        }
-        $this->server->createCollection($uri . '/' . $postVars['name'],$resourceType,$properties);
-        return false;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Principal/Collection.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Principal/Collection.php
deleted file mode 100644
index 8a747a644b..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Principal/Collection.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Principal;
-use Sabre\DAVACL;
-
-/**
- * Principal collection
- *
- * This is an alternative collection to the standard ACL principal collection.
- * This collection adds support for the calendar-proxy-read and
- * calendar-proxy-write sub-principals, as defined by the caldav-proxy
- * specification.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Collection extends DAVACL\AbstractPrincipalCollection {
-
-    /**
-     * Returns a child object based on principal information
-     *
-     * @param array $principalInfo
-     * @return User
-     */
-    public function getChildForPrincipal(array $principalInfo) {
-
-        return new User($this->principalBackend, $principalInfo);
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Principal/IProxyRead.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Principal/IProxyRead.php
deleted file mode 100644
index 548411fa86..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Principal/IProxyRead.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Principal;
-
-use Sabre\DAVACL;
-
-/**
- * ProxyRead principal interface
- *
- * Any principal node implementing this interface will be picked up as a 'proxy
- * principal group'.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface IProxyRead extends DAVACL\IPrincipal {
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Principal/IProxyWrite.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Principal/IProxyWrite.php
deleted file mode 100644
index f0e6e47cbf..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Principal/IProxyWrite.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Principal;
-
-use Sabre\DAVACL;
-
-/**
- * ProxyWrite principal interface
- *
- * Any principal node implementing this interface will be picked up as a 'proxy
- * principal group'.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface IProxyWrite extends DAVACL\IPrincipal {
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Principal/ProxyRead.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Principal/ProxyRead.php
deleted file mode 100644
index 62f66b98c1..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Principal/ProxyRead.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Principal;
-use Sabre\DAVACL;
-use Sabre\DAV;
-
-/**
- * ProxyRead principal
- *
- * This class represents a principal group, hosted under the main principal.
- * This is needed to implement 'Calendar delegation' support. This class is
- * instantiated by User.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class ProxyRead implements IProxyRead {
-
-    /**
-     * Principal information from the parent principal.
-     *
-     * @var array
-     */
-    protected $principalInfo;
-
-    /**
-     * Principal backend
-     *
-     * @var DAVACL\PrincipalBackend\BackendInterface
-     */
-    protected $principalBackend;
-
-    /**
-     * Creates the object.
-     *
-     * Note that you MUST supply the parent principal information.
-     *
-     * @param DAVACL\PrincipalBackend\BackendInterface $principalBackend
-     * @param array $principalInfo
-     */
-    public function __construct(DAVACL\PrincipalBackend\BackendInterface $principalBackend, array $principalInfo) {
-
-        $this->principalInfo = $principalInfo;
-        $this->principalBackend = $principalBackend;
-
-    }
-
-    /**
-     * Returns this principals name.
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return 'calendar-proxy-read';
-
-    }
-
-    /**
-     * Returns the last modification time
-     *
-     * @return null
-     */
-    public function getLastModified() {
-
-        return null;
-
-    }
-
-    /**
-     * Deletes the current node
-     *
-     * @throws DAV\Exception\Forbidden
-     * @return void
-     */
-    public function delete() {
-
-        throw new DAV\Exception\Forbidden('Permission denied to delete node');
-
-    }
-
-    /**
-     * Renames the node
-     *
-     * @throws DAV\Exception\Forbidden
-     * @param string $name The new name
-     * @return void
-     */
-    public function setName($name) {
-
-        throw new DAV\Exception\Forbidden('Permission denied to rename file');
-
-    }
-
-
-    /**
-     * Returns a list of alternative urls for a principal
-     *
-     * This can for example be an email address, or ldap url.
-     *
-     * @return array
-     */
-    public function getAlternateUriSet() {
-
-        return array();
-
-    }
-
-    /**
-     * Returns the full principal url
-     *
-     * @return string
-     */
-    public function getPrincipalUrl() {
-
-        return $this->principalInfo['uri'] . '/' . $this->getName();
-
-    }
-
-    /**
-     * Returns the list of group members
-     *
-     * If this principal is a group, this function should return
-     * all member principal uri's for the group.
-     *
-     * @return array
-     */
-    public function getGroupMemberSet() {
-
-        return $this->principalBackend->getGroupMemberSet($this->getPrincipalUrl());
-
-    }
-
-    /**
-     * Returns the list of groups this principal is member of
-     *
-     * If this principal is a member of a (list of) groups, this function
-     * should return a list of principal uri's for it's members.
-     *
-     * @return array
-     */
-    public function getGroupMembership() {
-
-        return $this->principalBackend->getGroupMembership($this->getPrincipalUrl());
-
-    }
-
-    /**
-     * Sets a list of group members
-     *
-     * If this principal is a group, this method sets all the group members.
-     * The list of members is always overwritten, never appended to.
-     *
-     * This method should throw an exception if the members could not be set.
-     *
-     * @param array $principals
-     * @return void
-     */
-    public function setGroupMemberSet(array $principals) {
-
-        $this->principalBackend->setGroupMemberSet($this->getPrincipalUrl(), $principals);
-
-    }
-
-    /**
-     * Returns the displayname
-     *
-     * This should be a human readable name for the principal.
-     * If none is available, return the nodename.
-     *
-     * @return string
-     */
-    public function getDisplayName() {
-
-        return $this->getName();
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Principal/ProxyWrite.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Principal/ProxyWrite.php
deleted file mode 100644
index 02cd81f709..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Principal/ProxyWrite.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Principal;
-use Sabre\DAVACL;
-use Sabre\DAV;
-
-/**
- * ProxyWrite principal
- *
- * This class represents a principal group, hosted under the main principal.
- * This is needed to implement 'Calendar delegation' support. This class is
- * instantiated by User.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class ProxyWrite implements IProxyWrite {
-
-    /**
-     * Parent principal information
-     *
-     * @var array
-     */
-    protected $principalInfo;
-
-    /**
-     * Principal Backend
-     *
-     * @var DAVACL\PrincipalBackend\BackendInterface
-     */
-    protected $principalBackend;
-
-    /**
-     * Creates the object
-     *
-     * Note that you MUST supply the parent principal information.
-     *
-     * @param DAVACL\PrincipalBackend\BackendInterface $principalBackend
-     * @param array $principalInfo
-     */
-    public function __construct(DAVACL\PrincipalBackend\BackendInterface $principalBackend, array $principalInfo) {
-
-        $this->principalInfo = $principalInfo;
-        $this->principalBackend = $principalBackend;
-
-    }
-
-    /**
-     * Returns this principals name.
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return 'calendar-proxy-write';
-
-    }
-
-    /**
-     * Returns the last modification time
-     *
-     * @return null
-     */
-    public function getLastModified() {
-
-        return null;
-
-    }
-
-    /**
-     * Deletes the current node
-     *
-     * @throws DAV\Exception\Forbidden
-     * @return void
-     */
-    public function delete() {
-
-        throw new DAV\Exception\Forbidden('Permission denied to delete node');
-
-    }
-
-    /**
-     * Renames the node
-     *
-     * @throws DAV\Exception\Forbidden
-     * @param string $name The new name
-     * @return void
-     */
-    public function setName($name) {
-
-        throw new DAV\Exception\Forbidden('Permission denied to rename file');
-
-    }
-
-
-    /**
-     * Returns a list of alternative urls for a principal
-     *
-     * This can for example be an email address, or ldap url.
-     *
-     * @return array
-     */
-    public function getAlternateUriSet() {
-
-        return array();
-
-    }
-
-    /**
-     * Returns the full principal url
-     *
-     * @return string
-     */
-    public function getPrincipalUrl() {
-
-        return $this->principalInfo['uri'] . '/' . $this->getName();
-
-    }
-
-    /**
-     * Returns the list of group members
-     *
-     * If this principal is a group, this function should return
-     * all member principal uri's for the group.
-     *
-     * @return array
-     */
-    public function getGroupMemberSet() {
-
-        return $this->principalBackend->getGroupMemberSet($this->getPrincipalUrl());
-
-    }
-
-    /**
-     * Returns the list of groups this principal is member of
-     *
-     * If this principal is a member of a (list of) groups, this function
-     * should return a list of principal uri's for it's members.
-     *
-     * @return array
-     */
-    public function getGroupMembership() {
-
-        return $this->principalBackend->getGroupMembership($this->getPrincipalUrl());
-
-    }
-
-    /**
-     * Sets a list of group members
-     *
-     * If this principal is a group, this method sets all the group members.
-     * The list of members is always overwritten, never appended to.
-     *
-     * This method should throw an exception if the members could not be set.
-     *
-     * @param array $principals
-     * @return void
-     */
-    public function setGroupMemberSet(array $principals) {
-
-        $this->principalBackend->setGroupMemberSet($this->getPrincipalUrl(), $principals);
-
-    }
-
-    /**
-     * Returns the displayname
-     *
-     * This should be a human readable name for the principal.
-     * If none is available, return the nodename.
-     *
-     * @return string
-     */
-    public function getDisplayName() {
-
-        return $this->getName();
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Principal/User.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Principal/User.php
deleted file mode 100644
index 6f3ccb8689..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Principal/User.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Principal;
-use Sabre\DAV;
-use Sabre\DAVACL;
-
-/**
- * CalDAV principal
- *
- * This is a standard user-principal for CalDAV. This principal is also a
- * collection and returns the caldav-proxy-read and caldav-proxy-write child
- * principals.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class User extends DAVACL\Principal implements DAV\ICollection {
-
-    /**
-     * Creates a new file in the directory
-     *
-     * @param string $name Name of the file
-     * @param resource $data Initial payload, passed as a readable stream resource.
-     * @throws DAV\Exception\Forbidden
-     * @return void
-     */
-    public function createFile($name, $data = null) {
-
-        throw new DAV\Exception\Forbidden('Permission denied to create file (filename ' . $name . ')');
-
-    }
-
-    /**
-     * Creates a new subdirectory
-     *
-     * @param string $name
-     * @throws DAV\Exception\Forbidden
-     * @return void
-     */
-    public function createDirectory($name) {
-
-        throw new DAV\Exception\Forbidden('Permission denied to create directory');
-
-    }
-
-    /**
-     * Returns a specific child node, referenced by its name
-     *
-     * @param string $name
-     * @return DAV\INode
-     */
-    public function getChild($name) {
-
-        $principal = $this->principalBackend->getPrincipalByPath($this->getPrincipalURL() . '/' . $name);
-        if (!$principal) {
-            throw new DAV\Exception\NotFound('Node with name ' . $name . ' was not found');
-        }
-        if ($name === 'calendar-proxy-read')
-            return new ProxyRead($this->principalBackend, $this->principalProperties);
-
-        if ($name === 'calendar-proxy-write')
-            return new ProxyWrite($this->principalBackend, $this->principalProperties);
-
-        throw new DAV\Exception\NotFound('Node with name ' . $name . ' was not found');
-
-    }
-
-    /**
-     * Returns an array with all the child nodes
-     *
-    * @return DAV\INode[]
-     */
-    public function getChildren() {
-
-        $r = array();
-        if ($this->principalBackend->getPrincipalByPath($this->getPrincipalURL() . '/calendar-proxy-read')) {
-            $r[] = new ProxyRead($this->principalBackend, $this->principalProperties);
-        }
-        if ($this->principalBackend->getPrincipalByPath($this->getPrincipalURL() . '/calendar-proxy-write')) {
-            $r[] = new ProxyWrite($this->principalBackend, $this->principalProperties);
-        }
-
-        return $r;
-
-    }
-
-    /**
-     * Returns whether or not the child node exists
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function childExists($name) {
-
-        try {
-            $this->getChild($name);
-            return true;
-        } catch (DAV\Exception\NotFound $e) {
-            return false;
-        }
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        $acl = parent::getACL();
-        $acl[] = array(
-            'privilege' => '{DAV:}read',
-            'principal' => $this->principalProperties['uri'] . '/calendar-proxy-read',
-            'protected' => true,
-        );
-        $acl[] = array(
-            'privilege' => '{DAV:}read',
-            'principal' => $this->principalProperties['uri'] . '/calendar-proxy-write',
-            'protected' => true,
-        );
-        return $acl;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Property/AllowedSharingModes.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Property/AllowedSharingModes.php
deleted file mode 100644
index ca8312d408..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Property/AllowedSharingModes.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Property;
-
-use Sabre\DAV;
-
-/**
- * AllowedSharingModes
- *
- * This property encodes the 'allowed-sharing-modes' property, as defined by
- * the 'caldav-sharing-02' spec, in the http://calendarserver.org/ns/
- * namespace.
- *
- * This property is a representation of the supported-calendar_component-set
- * property in the CalDAV namespace. It simply requires an array of components,
- * such as VEVENT, VTODO
- *
- * @see https://trac.calendarserver.org/browser/CalendarServer/trunk/doc/Extensions/caldav-sharing-02.txt
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class AllowedSharingModes extends DAV\Property {
-
-    /**
-     * Whether or not a calendar can be shared with another user
-     *
-     * @var bool
-     */
-    protected $canBeShared;
-
-    /**
-     * Whether or not the calendar can be placed on a public url.
-     *
-     * @var bool
-     */
-    protected $canBePublished;
-
-    /**
-     * Constructor
-     *
-     * @param bool $canBeShared
-     * @param bool $canBePublished
-     * @return void
-     */
-    public function __construct($canBeShared, $canBePublished) {
-
-        $this->canBeShared = $canBeShared;
-        $this->canBePublished = $canBePublished;
-
-    }
-
-    /**
-     * Serializes the property in a DOMDocument
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $node
-     * @return void
-     */
-    public function serialize(DAV\Server $server, \DOMElement $node) {
-
-       $doc = $node->ownerDocument;
-       if ($this->canBeShared) {
-            $xcomp = $doc->createElement('cs:can-be-shared');
-            $node->appendChild($xcomp);
-       }
-       if ($this->canBePublished) {
-            $xcomp = $doc->createElement('cs:can-be-published');
-            $node->appendChild($xcomp);
-       }
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Property/Invite.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Property/Invite.php
deleted file mode 100644
index 86ef69e803..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Property/Invite.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Property;
-
-use Sabre\CalDAV\SharingPlugin as SharingPlugin;
-use Sabre\DAV;
-use Sabre\CalDAV;
-
-/**
- * Invite property
- *
- * This property encodes the 'invite' property, as defined by
- * the 'caldav-sharing-02' spec, in the http://calendarserver.org/ns/
- * namespace.
- *
- * @see https://trac.calendarserver.org/browser/CalendarServer/trunk/doc/Extensions/caldav-sharing-02.txt
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Invite extends DAV\Property {
-
-    /**
-     * The list of users a calendar has been shared to.
-     *
-     * @var array
-     */
-    protected $users;
-
-    /**
-     * The organizer contains information about the person who shared the
-     * object.
-     *
-     * @var array
-     */
-    protected $organizer;
-
-    /**
-     * Creates the property.
-     *
-     * Users is an array. Each element of the array has the following
-     * properties:
-     *
-     *   * href - Often a mailto: address
-     *   * commonName - Optional, for example a first and lastname for a user.
-     *   * status - One of the SharingPlugin::STATUS_* constants.
-     *   * readOnly - true or false
-     *   * summary - Optional, description of the share
-     *
-     * The organizer key is optional to specify. It's only useful when a
-     * 'sharee' requests the sharing information.
-     *
-     * The organizer may have the following properties:
-     *   * href - Often a mailto: address.
-     *   * commonName - Optional human-readable name.
-     *   * firstName - Optional first name.
-     *   * lastName - Optional last name.
-     *
-     * If you wonder why these two structures are so different, I guess a
-     * valid answer is that the current spec is still a draft.
-     *
-     * @param array $users
-     */
-    public function __construct(array $users, array $organizer = null) {
-
-        $this->users = $users;
-        $this->organizer = $organizer;
-
-    }
-
-    /**
-     * Returns the list of users, as it was passed to the constructor.
-     *
-     * @return array
-     */
-    public function getValue() {
-
-        return $this->users;
-
-    }
-
-    /**
-     * Serializes the property in a DOMDocument
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $node
-     * @return void
-     */
-    public function serialize(DAV\Server $server,\DOMElement $node) {
-
-       $doc = $node->ownerDocument;
-
-       if (!is_null($this->organizer)) {
-
-           $xorganizer = $doc->createElement('cs:organizer');
-
-           $href = $doc->createElement('d:href');
-           $href->appendChild($doc->createTextNode($this->organizer['href']));
-           $xorganizer->appendChild($href);
-
-           if (isset($this->organizer['commonName']) && $this->organizer['commonName']) {
-               $commonName = $doc->createElement('cs:common-name');
-               $commonName->appendChild($doc->createTextNode($this->organizer['commonName']));
-               $xorganizer->appendChild($commonName);
-           }
-           if (isset($this->organizer['firstName']) && $this->organizer['firstName']) {
-               $firstName = $doc->createElement('cs:first-name');
-               $firstName->appendChild($doc->createTextNode($this->organizer['firstName']));
-               $xorganizer->appendChild($firstName);
-           }
-           if (isset($this->organizer['lastName']) && $this->organizer['lastName']) {
-               $lastName = $doc->createElement('cs:last-name');
-               $lastName->appendChild($doc->createTextNode($this->organizer['lastName']));
-               $xorganizer->appendChild($lastName);
-           }
-
-           $node->appendChild($xorganizer);
-
-
-       }
-
-       foreach($this->users as $user) {
-
-           $xuser = $doc->createElement('cs:user');
-
-           $href = $doc->createElement('d:href');
-           $href->appendChild($doc->createTextNode($user['href']));
-           $xuser->appendChild($href);
-
-           if (isset($user['commonName']) && $user['commonName']) {
-               $commonName = $doc->createElement('cs:common-name');
-               $commonName->appendChild($doc->createTextNode($user['commonName']));
-               $xuser->appendChild($commonName);
-           }
-
-           switch($user['status']) {
-
-               case SharingPlugin::STATUS_ACCEPTED :
-                   $status = $doc->createElement('cs:invite-accepted');
-                   $xuser->appendChild($status);
-                   break;
-               case SharingPlugin::STATUS_DECLINED :
-                   $status = $doc->createElement('cs:invite-declined');
-                   $xuser->appendChild($status);
-                   break;
-               case SharingPlugin::STATUS_NORESPONSE :
-                   $status = $doc->createElement('cs:invite-noresponse');
-                   $xuser->appendChild($status);
-                   break;
-               case SharingPlugin::STATUS_INVALID :
-                   $status = $doc->createElement('cs:invite-invalid');
-                   $xuser->appendChild($status);
-                   break;
-
-           }
-
-           $xaccess = $doc->createElement('cs:access');
-
-           if ($user['readOnly']) {
-                $xaccess->appendChild(
-                    $doc->createElement('cs:read')
-                );
-           } else {
-                $xaccess->appendChild(
-                    $doc->createElement('cs:read-write')
-                );
-           }
-           $xuser->appendChild($xaccess);
-
-           if (isset($user['summary']) && $user['summary']) {
-               $summary = $doc->createElement('cs:summary');
-               $summary->appendChild($doc->createTextNode($user['summary']));
-               $xuser->appendChild($summary);
-           }
-
-           $node->appendChild($xuser);
-
-       }
-
-
-    }
-
-    /**
-     * Unserializes the property.
-     *
-     * This static method should return a an instance of this object.
-     *
-     * @param \DOMElement $prop
-     * @return DAV\IProperty
-     */
-    static function unserialize(\DOMElement $prop) {
-
-        $xpath = new \DOMXPath($prop->ownerDocument);
-        $xpath->registerNamespace('cs', CalDAV\Plugin::NS_CALENDARSERVER);
-        $xpath->registerNamespace('d',  'urn:DAV');
-
-        $users = array();
-
-        foreach($xpath->query('cs:user', $prop) as $user) {
-
-            $status = null;
-            if ($xpath->evaluate('boolean(cs:invite-accepted)', $user)) {
-                $status = SharingPlugin::STATUS_ACCEPTED;
-            } elseif ($xpath->evaluate('boolean(cs:invite-declined)', $user)) {
-                $status = SharingPlugin::STATUS_DECLINED;
-            } elseif ($xpath->evaluate('boolean(cs:invite-noresponse)', $user)) {
-                $status = SharingPlugin::STATUS_NORESPONSE;
-            } elseif ($xpath->evaluate('boolean(cs:invite-invalid)', $user)) {
-                $status = SharingPlugin::STATUS_INVALID;
-            } else {
-                throw new DAV\Exception('Every cs:user property must have one of cs:invite-accepted, cs:invite-declined, cs:invite-noresponse or cs:invite-invalid');
-            }
-            $users[] = array(
-                'href' => $xpath->evaluate('string(d:href)', $user),
-                'commonName' => $xpath->evaluate('string(cs:common-name)', $user),
-                'readOnly' => $xpath->evaluate('boolean(cs:access/cs:read)', $user),
-                'summary' => $xpath->evaluate('string(cs:summary)', $user),
-                'status' => $status,
-            );
-
-        }
-
-        return new self($users);
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Property/ScheduleCalendarTransp.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Property/ScheduleCalendarTransp.php
deleted file mode 100644
index 7f12d75852..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Property/ScheduleCalendarTransp.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Property;
-
-use Sabre\DAV;
-use Sabre\CalDAV;
-
-/**
- * schedule-calendar-transp property.
- *
- * This property is a representation of the schedule-calendar-transp property.
- * This property is defined in RFC6638 (caldav scheduling).
- *
- * Its values are either 'transparent' or 'opaque'. If it's transparent, it
- * means that this calendar will not be taken into consideration when a
- * different user queries for free-busy information. If it's 'opaque', it will.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class ScheduleCalendarTransp extends DAV\Property {
-
-    const TRANSPARENT = 'transparent';
-    const OPAQUE = 'opaque';
-
-    protected $value;
-
-    /**
-     * Creates the property
-     *
-     * @param string $value
-     */
-    public function __construct($value) {
-
-        if ($value !== self::TRANSPARENT && $value !== self::OPAQUE) {
-            throw new \InvalidArgumentException('The value must either be specified as "transparent" or "opaque"');
-        }
-        $this->value = $value;
-
-    }
-
-    /**
-     * Returns the current value
-     *
-     * @return string
-     */
-    public function getValue() {
-
-        return $this->value;
-
-    }
-
-    /**
-     * Serializes the property in a DOMDocument
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $node
-     * @return void
-     */
-    public function serialize(DAV\Server $server,\DOMElement $node) {
-
-        $doc = $node->ownerDocument;
-        switch($this->value) {
-            case self::TRANSPARENT :
-                $xval = $doc->createElement('cal:transparent');
-                break;
-            case self::OPAQUE :
-                $xval = $doc->createElement('cal:opaque');
-                break;
-        }
-
-        $node->appendChild($xval);
-
-    }
-
-    /**
-     * Unserializes the DOMElement back into a Property class.
-     *
-     * @param \DOMElement $node
-     * @return ScheduleCalendarTransp
-     */
-    static function unserialize(\DOMElement $node) {
-
-        $value = null;
-        foreach($node->childNodes as $childNode) {
-            switch(DAV\XMLUtil::toClarkNotation($childNode)) {
-                case '{' . CalDAV\Plugin::NS_CALDAV . '}opaque' :
-                    $value = self::OPAQUE;
-                    break;
-                case '{' . CalDAV\Plugin::NS_CALDAV . '}transparent' :
-                    $value = self::TRANSPARENT;
-                    break;
-            }
-        }
-        if (is_null($value))
-           return null;
-
-        return new self($value);
-
-    }
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
deleted file mode 100644
index 2538fa45d9..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Property;
-
-use Sabre\DAV;
-use Sabre\CalDAV;
-
-/**
- * Supported component set property
- *
- * This property is a representation of the supported-calendar_component-set
- * property in the CalDAV namespace. It simply requires an array of components,
- * such as VEVENT, VTODO
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class SupportedCalendarComponentSet extends DAV\Property {
-
-    /**
-     * List of supported components, such as "VEVENT, VTODO"
-     *
-     * @var array
-     */
-    private $components;
-
-    /**
-     * Creates the property
-     *
-     * @param array $components
-     */
-    public function __construct(array $components) {
-
-       $this->components = $components;
-
-    }
-
-    /**
-     * Returns the list of supported components
-     *
-     * @return array
-     */
-    public function getValue() {
-
-        return $this->components;
-
-    }
-
-    /**
-     * Serializes the property in a DOMDocument
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $node
-     * @return void
-     */
-    public function serialize(DAV\Server $server,\DOMElement $node) {
-
-       $doc = $node->ownerDocument;
-       foreach($this->components as $component) {
-
-            $xcomp = $doc->createElement('cal:comp');
-            $xcomp->setAttribute('name',$component);
-            $node->appendChild($xcomp);
-
-       }
-
-    }
-
-    /**
-     * Unserializes the DOMElement back into a Property class.
-     *
-     * @param \DOMElement $node
-     * @return Property_SupportedCalendarComponentSet
-     */
-    static function unserialize(\DOMElement $node) {
-
-        $components = array();
-        foreach($node->childNodes as $childNode) {
-            if (DAV\XMLUtil::toClarkNotation($childNode)==='{' . CalDAV\Plugin::NS_CALDAV . '}comp') {
-                $components[] = $childNode->getAttribute('name');
-            }
-        }
-        return new self($components);
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Property/SupportedCalendarData.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Property/SupportedCalendarData.php
deleted file mode 100644
index efab80a915..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Property/SupportedCalendarData.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Property;
-use Sabre\DAV;
-use Sabre\CalDAV\Plugin;
-
-/**
- * Supported-calendar-data property
- *
- * This property is a representation of the supported-calendar-data property
- * in the CalDAV namespace. SabreDAV only has support for text/calendar;2.0
- * so the value is currently hardcoded.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class SupportedCalendarData extends DAV\Property {
-
-    /**
-     * Serializes the property in a DOMDocument
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $node
-     * @return void
-     */
-    public function serialize(DAV\Server $server,\DOMElement $node) {
-
-        $doc = $node->ownerDocument;
-
-        $prefix = isset($server->xmlNamespaces[Plugin::NS_CALDAV])?$server->xmlNamespaces[Plugin::NS_CALDAV]:'cal';
-
-        $caldata = $doc->createElement($prefix . ':calendar-data');
-        $caldata->setAttribute('content-type','text/calendar');
-        $caldata->setAttribute('version','2.0');
-
-        $node->appendChild($caldata);
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Property/SupportedCollationSet.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Property/SupportedCollationSet.php
deleted file mode 100644
index 63c37fe5ae..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Property/SupportedCollationSet.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Property;
-use Sabre\DAV;
-
-/**
- * supported-collation-set property
- *
- * This property is a representation of the supported-collation-set property
- * in the CalDAV namespace.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class SupportedCollationSet extends DAV\Property {
-
-    /**
-     * Serializes the property in a DOM document
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $node
-     * @return void
-     */
-    public function serialize(DAV\Server $server,\DOMElement $node) {
-
-        $doc = $node->ownerDocument;
-
-        $prefix = $node->lookupPrefix('urn:ietf:params:xml:ns:caldav');
-        if (!$prefix) $prefix = 'cal';
-
-        $node->appendChild(
-            $doc->createElement($prefix . ':supported-collation','i;ascii-casemap')
-        );
-        $node->appendChild(
-            $doc->createElement($prefix . ':supported-collation','i;octet')
-        );
-        $node->appendChild(
-            $doc->createElement($prefix . ':supported-collation','i;unicode-casemap')
-        );
-
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Schedule/IMip.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Schedule/IMip.php
deleted file mode 100644
index b2b0d98b1b..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Schedule/IMip.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Schedule;
-
-use Sabre\VObject;
-use Sabre\DAV;
-
-/**
- * iMIP handler.
- *
- * This class is responsible for sending out iMIP messages. iMIP is the
- * email-based transport for iTIP. iTIP deals with scheduling operations for
- * iCalendar objects.
- *
- * If you want to customize the email that gets sent out, you can do so by
- * extending this class and overriding the sendMessage method.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class IMip {
-
-    /**
-     * Email address used in From: header.
-     *
-     * @var string
-     */
-    protected $senderEmail;
-
-    /**
-     * Creates the email handler.
-     *
-     * @param string $senderEmail. The 'senderEmail' is the email that shows up
-     *                             in the 'From:' address. This should
-     *                             generally be some kind of no-reply email
-     *                             address you own.
-     */
-    public function __construct($senderEmail) {
-
-        $this->senderEmail = $senderEmail;
-
-    }
-
-    /**
-     * Sends one or more iTip messages through email.
-     *
-     * @param string $originator Originator Email
-     * @param array $recipients Array of email addresses
-     * @param VObject\Component $vObject
-     * @param string $principal Principal Url of the originator
-     * @return void
-     */
-    public function sendMessage($originator, array $recipients, VObject\Component $vObject, $principal) {
-
-        foreach($recipients as $recipient) {
-
-            $to = $recipient;
-            $replyTo = $originator;
-            $subject = 'SabreDAV iTIP message';
-
-            switch(strtoupper($vObject->METHOD)) {
-                case 'REPLY' :
-                    $subject = 'Response for: ' . $vObject->VEVENT->SUMMARY;
-                    break;
-                case 'REQUEST' :
-                    $subject = 'Invitation for: ' .$vObject->VEVENT->SUMMARY;
-                    break;
-                case 'CANCEL' :
-                    $subject = 'Cancelled event: ' . $vObject->VEVENT->SUMMARY;
-                    break;
-            }
-
-            $headers = array();
-            $headers[] = 'Reply-To: ' . $replyTo;
-            $headers[] = 'From: ' . $this->senderEmail;
-            $headers[] = 'Content-Type: text/calendar; method=' . (string)$vObject->method . '; charset=utf-8';
-            if (DAV\Server::$exposeVersion) {
-                $headers[] = 'X-Sabre-Version: ' . DAV\Version::VERSION . '-' . DAV\Version::STABILITY;
-            }
-
-            $vcalBody = $vObject->serialize();
-
-            $this->mail($to, $subject, $vcalBody, $headers);
-
-        }
-
-    }
-
-    // @codeCoverageIgnoreStart
-    // This is deemed untestable in a reasonable manner
-
-    /**
-     * This function is reponsible for sending the actual email.
-     *
-     * @param string $to Recipient email address
-     * @param string $subject Subject of the email
-     * @param string $body iCalendar body
-     * @param array $headers List of headers
-     * @return void
-     */
-    protected function mail($to, $subject, $body, array $headers) {
-
-
-        mail($to, $subject, $body, implode("\r\n", $headers));
-
-    }
-
-    // @codeCoverageIgnoreEnd
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Schedule/IOutbox.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Schedule/IOutbox.php
deleted file mode 100644
index 7341eaa85f..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Schedule/IOutbox.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Schedule;
-
-/**
- * Implement this interface to have a node be recognized as a CalDAV scheduling
- * outbox.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface IOutbox extends \Sabre\DAV\ICollection, \Sabre\DAVACL\IACL {
-
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Schedule/Outbox.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Schedule/Outbox.php
deleted file mode 100644
index cf4500f699..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Schedule/Outbox.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV\Schedule;
-use Sabre\DAV;
-use Sabre\CalDAV;
-use Sabre\DAVACL;
-
-/**
- * The CalDAV scheduling outbox
- *
- * The outbox is mainly used as an endpoint in the tree for a client to do
- * free-busy requests. This functionality is completely handled by the
- * Scheduling plugin, so this object is actually mostly static.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Outbox extends DAV\Collection implements IOutbox {
-
-    /**
-     * The principal Uri
-     *
-     * @var string
-     */
-    protected $principalUri;
-
-    /**
-     * Constructor
-     *
-     * @param string $principalUri
-     */
-    public function __construct($principalUri) {
-
-        $this->principalUri = $principalUri;
-
-    }
-
-    /**
-     * Returns the name of the node.
-     *
-     * This is used to generate the url.
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return 'outbox';
-
-    }
-
-    /**
-     * Returns an array with all the child nodes
-     *
-     * @return \Sabre\DAV\INode[]
-     */
-    public function getChildren() {
-
-        return array();
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->principalUri;
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-query-freebusy',
-                'principal' => $this->getOwner(),
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-post-vevent',
-                'principal' => $this->getOwner(),
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->getOwner(),
-                'protected' => true,
-            ),
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new DAV\Exception\MethodNotAllowed('You\'re not allowed to update the ACL');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        $default = DAVACL\Plugin::getDefaultSupportedPrivilegeSet();
-        $default['aggregates'][] = array(
-            'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-query-freebusy',
-        );
-        $default['aggregates'][] = array(
-            'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-post-vevent',
-        );
-
-        return $default;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/ShareableCalendar.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/ShareableCalendar.php
deleted file mode 100644
index cabf7eb955..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/ShareableCalendar.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV;
-
-/**
- * This object represents a CalDAV calendar that can be shared with other
- * users.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class ShareableCalendar extends Calendar implements IShareableCalendar {
-
-    /**
-     * Updates the list of shares.
-     *
-     * The first array is a list of people that are to be added to the
-     * calendar.
-     *
-     * Every element in the add array has the following properties:
-     *   * href - A url. Usually a mailto: address
-     *   * commonName - Usually a first and last name, or false
-     *   * summary - A description of the share, can also be false
-     *   * readOnly - A boolean value
-     *
-     * Every element in the remove array is just the address string.
-     *
-     * @param array $add
-     * @param array $remove
-     * @return void
-     */
-    public function updateShares(array $add, array $remove) {
-
-        $this->caldavBackend->updateShares($this->calendarInfo['id'], $add, $remove);
-
-    }
-
-    /**
-     * Returns the list of people whom this calendar is shared with.
-     *
-     * Every element in this array should have the following properties:
-     *   * href - Often a mailto: address
-     *   * commonName - Optional, for example a first + last name
-     *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
-     *   * readOnly - boolean
-     *   * summary - Optional, a description for the share
-     *
-     * @return array
-     */
-    public function getShares() {
-
-        return $this->caldavBackend->getShares($this->calendarInfo['id']);
-
-    }
-
-    /**
-     * Marks this calendar as published.
-     *
-     * Publishing a calendar should automatically create a read-only, public,
-     * subscribable calendar.
-     *
-     * @param bool $value
-     * @return void
-     */
-    public function setPublishStatus($value) {
-
-        $this->caldavBackend->setPublishStatus($this->calendarInfo['id'], $value);
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/SharedCalendar.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/SharedCalendar.php
deleted file mode 100644
index 79eda43abb..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/SharedCalendar.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV;
-
-use Sabre\DAVACL;
-
-/**
- * This object represents a CalDAV calendar that is shared by a different user.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class SharedCalendar extends Calendar implements ISharedCalendar {
-
-    /**
-     * Constructor
-     *
-     * @param Backend\BackendInterface $caldavBackend
-     * @param array $calendarInfo
-     */
-    public function __construct(Backend\BackendInterface $caldavBackend, $calendarInfo) {
-
-        $required = array(
-            '{http://calendarserver.org/ns/}shared-url',
-            '{http://sabredav.org/ns}owner-principal',
-            '{http://sabredav.org/ns}read-only',
-        );
-        foreach($required as $r) {
-            if (!isset($calendarInfo[$r])) {
-                throw new \InvalidArgumentException('The ' . $r . ' property must be specified for SharedCalendar(s)');
-            }
-        }
-
-        parent::__construct($caldavBackend, $calendarInfo);
-
-    }
-
-    /**
-     * This method should return the url of the owners' copy of the shared
-     * calendar.
-     *
-     * @return string
-     */
-    public function getSharedUrl() {
-
-        return $this->calendarInfo['{http://calendarserver.org/ns/}shared-url'];
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->calendarInfo['{http://sabredav.org/ns}owner-principal'];
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        // The top-level ACL only contains access information for the true
-        // owner of the calendar, so we need to add the information for the
-        // sharee.
-        $acl = parent::getACL();
-        $acl[] = array(
-            'privilege' => '{DAV:}read',
-            'principal' => $this->calendarInfo['principaluri'],
-            'protected' => true,
-        );
-        if (!$this->calendarInfo['{http://sabredav.org/ns}read-only']) {
-            $acl[] = array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->calendarInfo['principaluri'],
-                'protected' => true,
-            );
-        }
-        return $acl;
-
-    }
-
-    /**
-     * Returns the list of people whom this calendar is shared with.
-     *
-     * Every element in this array should have the following properties:
-     *   * href - Often a mailto: address
-     *   * commonName - Optional, for example a first + last name
-     *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
-     *   * readOnly - boolean
-     *   * summary - Optional, a description for the share
-     *
-     * @return array
-     */
-    public function getShares() {
-
-        return $this->caldavBackend->getShares($this->calendarInfo['id']);
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/SharingPlugin.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/SharingPlugin.php
deleted file mode 100644
index e869cb278b..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/SharingPlugin.php
+++ /dev/null
@@ -1,526 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV;
-
-use Sabre\DAV;
-
-/**
- * This plugin implements support for caldav sharing.
- *
- * This spec is defined at:
- * http://svn.calendarserver.org/repository/calendarserver/CalendarServer/trunk/doc/Extensions/caldav-sharing.txt
- *
- * See:
- * Sabre\CalDAV\Backend\SharingSupport for all the documentation.
- *
- * Note: This feature is experimental, and may change in between different
- * SabreDAV versions.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class SharingPlugin extends DAV\ServerPlugin {
-
-    /**
-     * These are the various status constants used by sharing-messages.
-     */
-    const STATUS_ACCEPTED = 1;
-    const STATUS_DECLINED = 2;
-    const STATUS_DELETED = 3;
-    const STATUS_NORESPONSE = 4;
-    const STATUS_INVALID = 5;
-
-    /**
-     * Reference to SabreDAV server object.
-     *
-     * @var Sabre\DAV\Server
-     */
-    protected $server;
-
-    /**
-     * This method should return a list of server-features.
-     *
-     * This is for example 'versioning' and is added to the DAV: header
-     * in an OPTIONS response.
-     *
-     * @return array
-     */
-    public function getFeatures() {
-
-        return array('calendarserver-sharing');
-
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using Sabre\DAV\Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return 'caldav-sharing';
-
-    }
-
-    /**
-     * This initializes the plugin.
-     *
-     * This function is called by Sabre\DAV\Server, after
-     * addPlugin is called.
-     *
-     * This method should set up the required event subscriptions.
-     *
-     * @param DAV\Server $server
-     * @return void
-     */
-    public function initialize(DAV\Server $server) {
-
-        $this->server = $server;
-        $server->resourceTypeMapping['Sabre\\CalDAV\\ISharedCalendar'] = '{' . Plugin::NS_CALENDARSERVER . '}shared';
-
-        array_push(
-            $this->server->protectedProperties,
-            '{' . Plugin::NS_CALENDARSERVER . '}invite',
-            '{' . Plugin::NS_CALENDARSERVER . '}allowed-sharing-modes',
-            '{' . Plugin::NS_CALENDARSERVER . '}shared-url'
-        );
-
-        $this->server->subscribeEvent('beforeGetProperties', array($this, 'beforeGetProperties'));
-        $this->server->subscribeEvent('afterGetProperties', array($this, 'afterGetProperties'));
-        $this->server->subscribeEvent('updateProperties', array($this, 'updateProperties'));
-        $this->server->subscribeEvent('unknownMethod', array($this,'unknownMethod'));
-
-    }
-
-    /**
-     * This event is triggered when properties are requested for a certain
-     * node.
-     *
-     * This allows us to inject any properties early.
-     *
-     * @param string $path
-     * @param DAV\INode $node
-     * @param array $requestedProperties
-     * @param array $returnedProperties
-     * @return void
-     */
-    public function beforeGetProperties($path, DAV\INode $node, &$requestedProperties, &$returnedProperties) {
-
-        if ($node instanceof IShareableCalendar) {
-            if (($index = array_search('{' . Plugin::NS_CALENDARSERVER . '}invite', $requestedProperties))!==false) {
-
-                unset($requestedProperties[$index]);
-                $returnedProperties[200]['{' . Plugin::NS_CALENDARSERVER . '}invite'] =
-                    new Property\Invite(
-                        $node->getShares()
-                    );
-
-            }
-
-        }
-
-        if ($node instanceof ISharedCalendar) {
-
-            if (($index = array_search('{' . Plugin::NS_CALENDARSERVER . '}shared-url', $requestedProperties))!==false) {
-
-                unset($requestedProperties[$index]);
-                $returnedProperties[200]['{' . Plugin::NS_CALENDARSERVER . '}shared-url'] =
-                    new DAV\Property\Href(
-                        $node->getSharedUrl()
-                    );
-
-            }
-            // The 'invite' property is slightly different for the 'shared'
-            // instance of the calendar, as it also contains the owner
-            // information.
-            if (($index = array_search('{' . Plugin::NS_CALENDARSERVER . '}invite', $requestedProperties))!==false) {
-
-                unset($requestedProperties[$index]);
-
-                // Fetching owner information
-                $props = $this->server->getPropertiesForPath($node->getOwner(), array(
-                    '{http://sabredav.org/ns}email-address',
-                    '{DAV:}displayname',
-                ), 1);
-
-                $ownerInfo = array(
-                    'href' => $node->getOwner(),
-                );
-
-                if (isset($props[0][200])) {
-
-                    // We're mapping the internal webdav properties to the
-                    // elements caldav-sharing expects.
-                    if (isset($props[0][200]['{http://sabredav.org/ns}email-address'])) {
-                        $ownerInfo['href'] = 'mailto:' . $props[0][200]['{http://sabredav.org/ns}email-address'];
-                    }
-                    if (isset($props[0][200]['{DAV:}displayname'])) {
-                        $ownerInfo['commonName'] = $props[0][200]['{DAV:}displayname'];
-                    }
-
-                }
-
-                $returnedProperties[200]['{' . Plugin::NS_CALENDARSERVER . '}invite'] =
-                    new Property\Invite(
-                        $node->getShares(),
-                        $ownerInfo
-                    );
-
-            }
-
-
-        }
-
-    }
-
-    /**
-     * This method is triggered *after* all properties have been retrieved.
-     * This allows us to inject the correct resourcetype for calendars that
-     * have been shared.
-     *
-     * @param string $path
-     * @param array $properties
-     * @param DAV\INode $node
-     * @return void
-     */
-    public function afterGetProperties($path, &$properties, DAV\INode $node) {
-
-        if ($node instanceof IShareableCalendar) {
-            if (isset($properties[200]['{DAV:}resourcetype'])) {
-                if (count($node->getShares())>0) {
-                    $properties[200]['{DAV:}resourcetype']->add(
-                        '{' . Plugin::NS_CALENDARSERVER . '}shared-owner'
-                    );
-                }
-            }
-            $propName = '{' . Plugin::NS_CALENDARSERVER . '}allowed-sharing-modes';
-            if (array_key_exists($propName, $properties[404])) {
-                unset($properties[404][$propName]);
-                $properties[200][$propName] = new Property\AllowedSharingModes(true,false);
-            }
-
-        }
-
-    }
-
-    /**
-     * This method is trigged when a user attempts to update a node's
-     * properties.
-     *
-     * A previous draft of the sharing spec stated that it was possible to use
-     * PROPPATCH to remove 'shared-owner' from the resourcetype, thus unsharing
-     * the calendar.
-     *
-     * Even though this is no longer in the current spec, we keep this around
-     * because OS X 10.7 may still make use of this feature.
-     *
-     * @param array $mutations
-     * @param array $result
-     * @param DAV\INode $node
-     * @return void
-     */
-    public function updateProperties(array &$mutations, array &$result, DAV\INode $node) {
-
-        if (!$node instanceof IShareableCalendar)
-            return;
-
-        if (!isset($mutations['{DAV:}resourcetype'])) {
-            return;
-        }
-
-        // Only doing something if shared-owner is indeed not in the list.
-        if($mutations['{DAV:}resourcetype']->is('{' . Plugin::NS_CALENDARSERVER . '}shared-owner')) return;
-
-        $shares = $node->getShares();
-        $remove = array();
-        foreach($shares as $share) {
-            $remove[] = $share['href'];
-        }
-        $node->updateShares(array(), $remove);
-
-        // We're marking this update as 200 OK
-        $result[200]['{DAV:}resourcetype'] = null;
-
-        // Removing it from the mutations list
-        unset($mutations['{DAV:}resourcetype']);
-
-    }
-
-    /**
-     * This event is triggered when the server didn't know how to handle a
-     * certain request.
-     *
-     * We intercept this to handle POST requests on calendars.
-     *
-     * @param string $method
-     * @param string $uri
-     * @return null|bool
-     */
-    public function unknownMethod($method, $uri) {
-
-        if ($method!=='POST') {
-            return;
-        }
-
-        // Only handling xml
-        $contentType = $this->server->httpRequest->getHeader('Content-Type');
-        if (strpos($contentType,'application/xml')===false && strpos($contentType,'text/xml')===false)
-            return;
-
-        // Making sure the node exists
-        try {
-            $node = $this->server->tree->getNodeForPath($uri);
-        } catch (DAV\Exception\NotFound $e) {
-            return;
-        }
-
-        $requestBody = $this->server->httpRequest->getBody(true);
-
-        // If this request handler could not deal with this POST request, it
-        // will return 'null' and other plugins get a chance to handle the
-        // request.
-        //
-        // However, we already requested the full body. This is a problem,
-        // because a body can only be read once. This is why we preemptively
-        // re-populated the request body with the existing data.
-        $this->server->httpRequest->setBody($requestBody);
-
-        $dom = DAV\XMLUtil::loadDOMDocument($requestBody);
-
-        $documentType = DAV\XMLUtil::toClarkNotation($dom->firstChild);
-
-        switch($documentType) {
-
-            // Dealing with the 'share' document, which modified invitees on a
-            // calendar.
-            case '{' . Plugin::NS_CALENDARSERVER . '}share' :
-
-                // We can only deal with IShareableCalendar objects
-                if (!$node instanceof IShareableCalendar) {
-                    return;
-                }
-
-                // Getting ACL info
-                $acl = $this->server->getPlugin('acl');
-
-                // If there's no ACL support, we allow everything
-                if ($acl) {
-                    $acl->checkPrivileges($uri, '{DAV:}write');
-                }
-
-                $mutations = $this->parseShareRequest($dom);
-
-                $node->updateShares($mutations[0], $mutations[1]);
-
-                $this->server->httpResponse->sendStatus(200);
-                // Adding this because sending a response body may cause issues,
-                // and I wanted some type of indicator the response was handled.
-                $this->server->httpResponse->setHeader('X-Sabre-Status', 'everything-went-well');
-
-                // Breaking the event chain
-                return false;
-
-            // The invite-reply document is sent when the user replies to an
-            // invitation of a calendar share.
-            case '{'. Plugin::NS_CALENDARSERVER.'}invite-reply' :
-
-                // This only works on the calendar-home-root node.
-                if (!$node instanceof UserCalendars) {
-                    return;
-                }
-
-                // Getting ACL info
-                $acl = $this->server->getPlugin('acl');
-
-                // If there's no ACL support, we allow everything
-                if ($acl) {
-                    $acl->checkPrivileges($uri, '{DAV:}write');
-                }
-
-                $message = $this->parseInviteReplyRequest($dom);
-
-                $url = $node->shareReply(
-                    $message['href'],
-                    $message['status'],
-                    $message['calendarUri'],
-                    $message['inReplyTo'],
-                    $message['summary']
-                );
-
-                $this->server->httpResponse->sendStatus(200);
-                // Adding this because sending a response body may cause issues,
-                // and I wanted some type of indicator the response was handled.
-                $this->server->httpResponse->setHeader('X-Sabre-Status', 'everything-went-well');
-
-                if ($url) {
-                    $dom = new \DOMDocument('1.0', 'UTF-8');
-                    $dom->formatOutput = true;
-
-                    $root = $dom->createElement('cs:shared-as');
-                    foreach($this->server->xmlNamespaces as $namespace => $prefix) {
-                        $root->setAttribute('xmlns:' . $prefix, $namespace);
-                    }
-
-                    $dom->appendChild($root);
-                    $href = new DAV\Property\Href($url);
-
-                    $href->serialize($this->server, $root);
-                    $this->server->httpResponse->setHeader('Content-Type','application/xml');
-                    $this->server->httpResponse->sendBody($dom->saveXML());
-
-                }
-
-                // Breaking the event chain
-                return false;
-
-            case '{' . Plugin::NS_CALENDARSERVER . '}publish-calendar' :
-
-                // We can only deal with IShareableCalendar objects
-                if (!$node instanceof IShareableCalendar) {
-                    return;
-                }
-
-                // Getting ACL info
-                $acl = $this->server->getPlugin('acl');
-
-                // If there's no ACL support, we allow everything
-                if ($acl) {
-                    $acl->checkPrivileges($uri, '{DAV:}write');
-                }
-
-                $node->setPublishStatus(true);
-
-                // iCloud sends back the 202, so we will too.
-                $this->server->httpResponse->sendStatus(202);
-
-                // Adding this because sending a response body may cause issues,
-                // and I wanted some type of indicator the response was handled.
-                $this->server->httpResponse->setHeader('X-Sabre-Status', 'everything-went-well');
-
-                // Breaking the event chain
-                return false;
-
-            case '{' . Plugin::NS_CALENDARSERVER . '}unpublish-calendar' :
-
-                // We can only deal with IShareableCalendar objects
-                if (!$node instanceof IShareableCalendar) {
-                    return;
-                }
-
-                // Getting ACL info
-                $acl = $this->server->getPlugin('acl');
-
-                // If there's no ACL support, we allow everything
-                if ($acl) {
-                    $acl->checkPrivileges($uri, '{DAV:}write');
-                }
-
-                $node->setPublishStatus(false);
-
-                $this->server->httpResponse->sendStatus(200);
-
-                // Adding this because sending a response body may cause issues,
-                // and I wanted some type of indicator the response was handled.
-                $this->server->httpResponse->setHeader('X-Sabre-Status', 'everything-went-well');
-
-                // Breaking the event chain
-                return false;
-
-        }
-
-
-
-    }
-
-    /**
-     * Parses the 'share' POST request.
-     *
-     * This method returns an array, containing two arrays.
-     * The first array is a list of new sharees. Every element is a struct
-     * containing a:
-     *   * href element. (usually a mailto: address)
-     *   * commonName element (often a first and lastname, but can also be
-     *     false)
-     *   * readOnly (true or false)
-     *   * summary (A description of the share, can also be false)
-     *
-     * The second array is a list of sharees that are to be removed. This is
-     * just a simple array with 'hrefs'.
-     *
-     * @param \DOMDocument $dom
-     * @return array
-     */
-    protected function parseShareRequest(\DOMDocument $dom) {
-
-        $xpath = new \DOMXPath($dom);
-        $xpath->registerNamespace('cs', Plugin::NS_CALENDARSERVER);
-        $xpath->registerNamespace('d', 'urn:DAV');
-
-        $set = array();
-        $elems = $xpath->query('cs:set');
-
-        for($i=0; $i < $elems->length; $i++) {
-
-            $xset = $elems->item($i);
-            $set[] = array(
-                'href' => $xpath->evaluate('string(d:href)', $xset),
-                'commonName' => $xpath->evaluate('string(cs:common-name)', $xset),
-                'summary' => $xpath->evaluate('string(cs:summary)', $xset),
-                'readOnly' => $xpath->evaluate('boolean(cs:read)', $xset)!==false
-            );
-
-        }
-
-        $remove = array();
-        $elems = $xpath->query('cs:remove');
-
-        for($i=0; $i < $elems->length; $i++) {
-
-            $xremove = $elems->item($i);
-            $remove[] = $xpath->evaluate('string(d:href)', $xremove);
-
-        }
-
-        return array($set, $remove);
-
-    }
-
-    /**
-     * Parses the 'invite-reply' POST request.
-     *
-     * This method returns an array, containing the following properties:
-     *   * href - The sharee who is replying
-     *   * status - One of the self::STATUS_* constants
-     *   * calendarUri - The url of the shared calendar
-     *   * inReplyTo - The unique id of the share invitation.
-     *   * summary - Optional description of the reply.
-     *
-     * @param \DOMDocument $dom
-     * @return array
-     */
-    protected function parseInviteReplyRequest(\DOMDocument $dom) {
-
-        $xpath = new \DOMXPath($dom);
-        $xpath->registerNamespace('cs', Plugin::NS_CALENDARSERVER);
-        $xpath->registerNamespace('d', 'urn:DAV');
-
-        $hostHref = $xpath->evaluate('string(cs:hosturl/d:href)');
-        if (!$hostHref) {
-            throw new DAV\Exception\BadRequest('The {' . Plugin::NS_CALENDARSERVER . '}hosturl/{DAV:}href element is required');
-        }
-
-        return array(
-            'href' => $xpath->evaluate('string(d:href)'),
-            'calendarUri' => $this->server->calculateUri($hostHref),
-            'inReplyTo' => $xpath->evaluate('string(cs:in-reply-to)'),
-            'summary' => $xpath->evaluate('string(cs:summary)'),
-            'status' => $xpath->evaluate('boolean(cs:invite-accepted)')?self::STATUS_ACCEPTED:self::STATUS_DECLINED
-        );
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/UserCalendars.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/UserCalendars.php
deleted file mode 100644
index 6e700eb048..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/UserCalendars.php
+++ /dev/null
@@ -1,342 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV;
-
-use Sabre\DAV;
-use Sabre\DAVACL;
-
-/**
- * The UserCalenders class contains all calendars associated to one user
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class UserCalendars implements DAV\IExtendedCollection, DAVACL\IACL {
-
-    /**
-     * CalDAV backend
-     *
-     * @var Sabre\CalDAV\Backend\BackendInterface
-     */
-    protected $caldavBackend;
-
-    /**
-     * Principal information
-     *
-     * @var array
-     */
-    protected $principalInfo;
-
-    /**
-     * Constructor
-     *
-     * @param Backend\BackendInterface $caldavBackend
-     * @param mixed $userUri
-     */
-    public function __construct(Backend\BackendInterface $caldavBackend, $principalInfo) {
-
-        $this->caldavBackend = $caldavBackend;
-        $this->principalInfo = $principalInfo;
-
-    }
-
-    /**
-     * Returns the name of this object
-     *
-     * @return string
-     */
-    public function getName() {
-
-        list(,$name) = DAV\URLUtil::splitPath($this->principalInfo['uri']);
-        return $name;
-
-    }
-
-    /**
-     * Updates the name of this object
-     *
-     * @param string $name
-     * @return void
-     */
-    public function setName($name) {
-
-        throw new DAV\Exception\Forbidden();
-
-    }
-
-    /**
-     * Deletes this object
-     *
-     * @return void
-     */
-    public function delete() {
-
-        throw new DAV\Exception\Forbidden();
-
-    }
-
-    /**
-     * Returns the last modification date
-     *
-     * @return int
-     */
-    public function getLastModified() {
-
-        return null;
-
-    }
-
-    /**
-     * Creates a new file under this object.
-     *
-     * This is currently not allowed
-     *
-     * @param string $filename
-     * @param resource $data
-     * @return void
-     */
-    public function createFile($filename, $data=null) {
-
-        throw new DAV\Exception\MethodNotAllowed('Creating new files in this collection is not supported');
-
-    }
-
-    /**
-     * Creates a new directory under this object.
-     *
-     * This is currently not allowed.
-     *
-     * @param string $filename
-     * @return void
-     */
-    public function createDirectory($filename) {
-
-        throw new DAV\Exception\MethodNotAllowed('Creating new collections in this collection is not supported');
-
-    }
-
-    /**
-     * Returns a single calendar, by name
-     *
-     * @param string $name
-     * @todo needs optimizing
-     * @return Calendar
-     */
-    public function getChild($name) {
-
-        foreach($this->getChildren() as $child) {
-            if ($name==$child->getName())
-                return $child;
-
-        }
-        throw new DAV\Exception\NotFound('Calendar with name \'' . $name . '\' could not be found');
-
-    }
-
-    /**
-     * Checks if a calendar exists.
-     *
-     * @param string $name
-     * @todo needs optimizing
-     * @return bool
-     */
-    public function childExists($name) {
-
-        foreach($this->getChildren() as $child) {
-            if ($name==$child->getName())
-                return true;
-
-        }
-        return false;
-
-    }
-
-    /**
-     * Returns a list of calendars
-     *
-     * @return array
-     */
-    public function getChildren() {
-
-        $calendars = $this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']);
-        $objs = array();
-        foreach($calendars as $calendar) {
-            if ($this->caldavBackend instanceof Backend\SharingSupport) {
-                if (isset($calendar['{http://calendarserver.org/ns/}shared-url'])) {
-                    $objs[] = new SharedCalendar($this->caldavBackend, $calendar);
-                } else {
-                    $objs[] = new ShareableCalendar($this->caldavBackend, $calendar);
-                }
-            } else {
-                $objs[] = new Calendar($this->caldavBackend, $calendar);
-            }
-        }
-        $objs[] = new Schedule\Outbox($this->principalInfo['uri']);
-
-        // We're adding a notifications node, if it's supported by the backend.
-        if ($this->caldavBackend instanceof Backend\NotificationSupport) {
-            $objs[] = new Notifications\Collection($this->caldavBackend, $this->principalInfo['uri']);
-        }
-        return $objs;
-
-    }
-
-    /**
-     * Creates a new calendar
-     *
-     * @param string $name
-     * @param array $resourceType
-     * @param array $properties
-     * @return void
-     */
-    public function createExtendedCollection($name, array $resourceType, array $properties) {
-
-        $isCalendar = false;
-        foreach($resourceType as $rt) {
-            switch ($rt) {
-                case '{DAV:}collection' :
-                case '{http://calendarserver.org/ns/}shared-owner' :
-                    // ignore
-                    break;
-                case '{urn:ietf:params:xml:ns:caldav}calendar' :
-                    $isCalendar = true;
-                    break;
-                default :
-                    throw new DAV\Exception\InvalidResourceType('Unknown resourceType: ' . $rt);
-            }
-        }
-        if (!$isCalendar) {
-            throw new DAV\Exception\InvalidResourceType('You can only create calendars in this collection');
-        }
-        $this->caldavBackend->createCalendar($this->principalInfo['uri'], $name, $properties);
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->principalInfo['uri'];
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->principalInfo['uri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->principalInfo['uri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->principalInfo['uri'] . '/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->principalInfo['uri'] . '/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->principalInfo['uri'] . '/calendar-proxy-read',
-                'protected' => true,
-            ),
-
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new DAV\Exception\MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
-    /**
-     * This method is called when a user replied to a request to share.
-     *
-     * This method should return the url of the newly created calendar if the
-     * share was accepted.
-     *
-     * @param string href The sharee who is replying (often a mailto: address)
-     * @param int status One of the SharingPlugin::STATUS_* constants
-     * @param string $calendarUri The url to the calendar thats being shared
-     * @param string $inReplyTo The unique id this message is a response to
-     * @param string $summary A description of the reply
-     * @return null|string
-     */
-    public function shareReply($href, $status, $calendarUri, $inReplyTo, $summary = null) {
-
-        if (!$this->caldavBackend instanceof Backend\SharingSupport) {
-            throw new DAV\Exception\NotImplemented('Sharing support is not implemented by this backend.');
-        }
-
-        return $this->caldavBackend->shareReply($href, $status, $calendarUri, $inReplyTo, $summary);
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Version.php b/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Version.php
deleted file mode 100644
index f30fc20ea3..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CalDAV/Version.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV;
-
-/**
- * This class contains the Sabre\CalDAV version constants.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Version {
-
-    /**
-     * Full version number
-     */
-    const VERSION = '1.8.7';
-
-    /**
-     * Stability : alpha, beta, stable
-     */
-    const STABILITY = 'stable';
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/AddressBook.php b/core/src/core/classes/sabredav/lib/Sabre/CardDAV/AddressBook.php
deleted file mode 100644
index 399f38e8d9..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/AddressBook.php
+++ /dev/null
@@ -1,315 +0,0 @@
-<?php
-
-namespace Sabre\CardDAV;
-
-use Sabre\DAV;
-use Sabre\DAVACL;
-
-/**
- * The AddressBook class represents a CardDAV addressbook, owned by a specific user
- *
- * The AddressBook can contain multiple vcards
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class AddressBook extends DAV\Collection implements IAddressBook, DAV\IProperties, DAVACL\IACL {
-
-    /**
-     * This is an array with addressbook information
-     *
-     * @var array
-     */
-    protected $addressBookInfo;
-
-    /**
-     * CardDAV backend
-     *
-     * @var Backend\BackendInterface
-     */
-    protected $carddavBackend;
-
-    /**
-     * Constructor
-     *
-     * @param Backend\BackendInterface $carddavBackend
-     * @param array $addressBookInfo
-     */
-    public function __construct(Backend\BackendInterface $carddavBackend, array $addressBookInfo) {
-
-        $this->carddavBackend = $carddavBackend;
-        $this->addressBookInfo = $addressBookInfo;
-
-    }
-
-    /**
-     * Returns the name of the addressbook
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return $this->addressBookInfo['uri'];
-
-    }
-
-    /**
-     * Returns a card
-     *
-     * @param string $name
-     * @return \ICard
-     */
-    public function getChild($name) {
-
-        $obj = $this->carddavBackend->getCard($this->addressBookInfo['id'],$name);
-        if (!$obj) throw new DAV\Exception\NotFound('Card not found');
-        return new Card($this->carddavBackend,$this->addressBookInfo,$obj);
-
-    }
-
-    /**
-     * Returns the full list of cards
-     *
-     * @return array
-     */
-    public function getChildren() {
-
-        $objs = $this->carddavBackend->getCards($this->addressBookInfo['id']);
-        $children = array();
-        foreach($objs as $obj) {
-            $children[] = new Card($this->carddavBackend,$this->addressBookInfo,$obj);
-        }
-        return $children;
-
-    }
-
-    /**
-     * Creates a new directory
-     *
-     * We actually block this, as subdirectories are not allowed in addressbooks.
-     *
-     * @param string $name
-     * @return void
-     */
-    public function createDirectory($name) {
-
-        throw new DAV\Exception\MethodNotAllowed('Creating collections in addressbooks is not allowed');
-
-    }
-
-    /**
-     * Creates a new file
-     *
-     * The contents of the new file must be a valid VCARD.
-     *
-     * This method may return an ETag.
-     *
-     * @param string $name
-     * @param resource $vcardData
-     * @return string|null
-     */
-    public function createFile($name,$vcardData = null) {
-
-        if (is_resource($vcardData)) {
-            $vcardData = stream_get_contents($vcardData);
-        }
-        // Converting to UTF-8, if needed
-        $vcardData = DAV\StringUtil::ensureUTF8($vcardData);
-
-        return $this->carddavBackend->createCard($this->addressBookInfo['id'],$name,$vcardData);
-
-    }
-
-    /**
-     * Deletes the entire addressbook.
-     *
-     * @return void
-     */
-    public function delete() {
-
-        $this->carddavBackend->deleteAddressBook($this->addressBookInfo['id']);
-
-    }
-
-    /**
-     * Renames the addressbook
-     *
-     * @param string $newName
-     * @return void
-     */
-    public function setName($newName) {
-
-        throw new DAV\Exception\MethodNotAllowed('Renaming addressbooks is not yet supported');
-
-    }
-
-    /**
-     * Returns the last modification date as a unix timestamp.
-     *
-     * @return void
-     */
-    public function getLastModified() {
-
-        return null;
-
-    }
-
-    /**
-     * Updates properties on this node,
-     *
-     * The properties array uses the propertyName in clark-notation as key,
-     * and the array value for the property value. In the case a property
-     * should be deleted, the property value will be null.
-     *
-     * This method must be atomic. If one property cannot be changed, the
-     * entire operation must fail.
-     *
-     * If the operation was successful, true can be returned.
-     * If the operation failed, false can be returned.
-     *
-     * Deletion of a non-existent property is always successful.
-     *
-     * Lastly, it is optional to return detailed information about any
-     * failures. In this case an array should be returned with the following
-     * structure:
-     *
-     * array(
-     *   403 => array(
-     *      '{DAV:}displayname' => null,
-     *   ),
-     *   424 => array(
-     *      '{DAV:}owner' => null,
-     *   )
-     * )
-     *
-     * In this example it was forbidden to update {DAV:}displayname.
-     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
-     * (424 Failed Dependency) because the request needs to be atomic.
-     *
-     * @param array $mutations
-     * @return bool|array
-     */
-    public function updateProperties($mutations) {
-
-        return $this->carddavBackend->updateAddressBook($this->addressBookInfo['id'], $mutations);
-
-    }
-
-    /**
-     * Returns a list of properties for this nodes.
-     *
-     * The properties list is a list of propertynames the client requested,
-     * encoded in clark-notation {xmlnamespace}tagname
-     *
-     * If the array is empty, it means 'all properties' were requested.
-     *
-     * @param array $properties
-     * @return array
-     */
-    public function getProperties($properties) {
-
-        $response = array();
-        foreach($properties as $propertyName) {
-
-            if (isset($this->addressBookInfo[$propertyName])) {
-
-                $response[$propertyName] = $this->addressBookInfo[$propertyName];
-
-            }
-
-        }
-
-        return $response;
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->addressBookInfo['principaluri'];
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->addressBookInfo['principaluri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->addressBookInfo['principaluri'],
-                'protected' => true,
-            ),
-
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new DAV\Exception\MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/AddressBookQueryParser.php b/core/src/core/classes/sabredav/lib/Sabre/CardDAV/AddressBookQueryParser.php
deleted file mode 100644
index 3277d98b09..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/AddressBookQueryParser.php
+++ /dev/null
@@ -1,221 +0,0 @@
-<?php
-
-namespace Sabre\CardDAV;
-
-use Sabre\DAV;
-
-/**
- * Parses the addressbook-query report request body.
- *
- * Whoever designed this format, and the CalDAV equivalent even more so,
- * has no feel for design.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class AddressBookQueryParser {
-
-    const TEST_ANYOF = 'anyof';
-    const TEST_ALLOF = 'allof';
-
-    /**
-     * List of requested properties the client wanted
-     *
-     * @var array
-     */
-    public $requestedProperties;
-
-    /**
-     * The number of results the client wants
-     *
-     * null means it wasn't specified, which in most cases means 'all results'.
-     *
-     * @var int|null
-     */
-    public $limit;
-
-    /**
-     * List of property filters.
-     *
-     * @var array
-     */
-    public $filters;
-
-    /**
-     * Either TEST_ANYOF or TEST_ALLOF
-     *
-     * @var string
-     */
-    public $test;
-
-    /**
-     * DOM Document
-     *
-     * @var DOMDocument
-     */
-    protected $dom;
-
-    /**
-     * DOM XPath object
-     *
-     * @var DOMXPath
-     */
-    protected $xpath;
-
-    /**
-     * Creates the parser
-     *
-     * @param \DOMDocument $dom
-     */
-    public function __construct(\DOMDocument $dom) {
-
-        $this->dom = $dom;
-
-        $this->xpath = new \DOMXPath($dom);
-        $this->xpath->registerNameSpace('card',Plugin::NS_CARDDAV);
-
-    }
-
-    /**
-     * Parses the request.
-     *
-     * @return void
-     */
-    public function parse() {
-
-        $filterNode = null;
-
-        $limit = $this->xpath->evaluate('number(/card:addressbook-query/card:limit/card:nresults)');
-        if (is_nan($limit)) $limit = null;
-
-        $filter = $this->xpath->query('/card:addressbook-query/card:filter');
-
-        // According to the CardDAV spec there needs to be exactly 1 filter
-        // element. However, KDE 4.8.2 contains a bug that will encode 0 filter
-        // elements, so this is a workaround for that.
-        //
-        // See: https://bugs.kde.org/show_bug.cgi?id=300047
-        if ($filter->length === 0) {
-            $test = null;
-            $filter = null;
-        } elseif ($filter->length === 1) {
-            $filter = $filter->item(0);
-            $test = $this->xpath->evaluate('string(@test)', $filter);
-        } else {
-            throw new DAV\Exception\BadRequest('Only one filter element is allowed');
-        }
-
-        if (!$test) $test = self::TEST_ANYOF;
-        if ($test !== self::TEST_ANYOF && $test !== self::TEST_ALLOF) {
-            throw new DAV\Exception\BadRequest('The test attribute must either hold "anyof" or "allof"');
-        }
-
-        $propFilters = array();
-
-        $propFilterNodes = $this->xpath->query('card:prop-filter', $filter);
-        for($ii=0; $ii < $propFilterNodes->length; $ii++) {
-
-            $propFilters[] = $this->parsePropFilterNode($propFilterNodes->item($ii));
-
-
-        }
-
-        $this->filters = $propFilters;
-        $this->limit = $limit;
-        $this->requestedProperties = array_keys(DAV\XMLUtil::parseProperties($this->dom->firstChild));
-        $this->test = $test;
-
-    }
-
-    /**
-     * Parses the prop-filter xml element
-     *
-     * @param \DOMElement $propFilterNode
-     * @return array
-     */
-    protected function parsePropFilterNode(\DOMElement $propFilterNode) {
-
-        $propFilter = array();
-        $propFilter['name'] = $propFilterNode->getAttribute('name');
-        $propFilter['test'] = $propFilterNode->getAttribute('test');
-        if (!$propFilter['test']) $propFilter['test'] = 'anyof';
-
-        $propFilter['is-not-defined'] = $this->xpath->query('card:is-not-defined', $propFilterNode)->length>0;
-
-        $paramFilterNodes = $this->xpath->query('card:param-filter', $propFilterNode);
-
-        $propFilter['param-filters'] = array();
-
-
-        for($ii=0;$ii<$paramFilterNodes->length;$ii++) {
-
-            $propFilter['param-filters'][] = $this->parseParamFilterNode($paramFilterNodes->item($ii));
-
-        }
-        $propFilter['text-matches'] = array();
-        $textMatchNodes = $this->xpath->query('card:text-match', $propFilterNode);
-
-        for($ii=0;$ii<$textMatchNodes->length;$ii++) {
-
-            $propFilter['text-matches'][] = $this->parseTextMatchNode($textMatchNodes->item($ii));
-
-        }
-
-        return $propFilter;
-
-    }
-
-    /**
-     * Parses the param-filter element
-     *
-     * @param \DOMElement $paramFilterNode
-     * @return array
-     */
-    public function parseParamFilterNode(\DOMElement $paramFilterNode) {
-
-        $paramFilter = array();
-        $paramFilter['name'] = $paramFilterNode->getAttribute('name');
-        $paramFilter['is-not-defined'] = $this->xpath->query('card:is-not-defined', $paramFilterNode)->length>0;
-        $paramFilter['text-match'] = null;
-
-        $textMatch = $this->xpath->query('card:text-match', $paramFilterNode);
-        if ($textMatch->length>0) {
-            $paramFilter['text-match'] = $this->parseTextMatchNode($textMatch->item(0));
-        }
-
-        return $paramFilter;
-
-    }
-
-    /**
-     * Text match
-     *
-     * @param \DOMElement $textMatchNode
-     * @return array
-     */
-    public function parseTextMatchNode(\DOMElement $textMatchNode) {
-
-        $matchType = $textMatchNode->getAttribute('match-type');
-        if (!$matchType) $matchType = 'contains';
-
-        if (!in_array($matchType, array('contains', 'equals', 'starts-with', 'ends-with'))) {
-            throw new DAV\Exception\BadRequest('Unknown match-type: ' . $matchType);
-        }
-
-        $negateCondition = $textMatchNode->getAttribute('negate-condition');
-        $negateCondition = $negateCondition==='yes';
-        $collation = $textMatchNode->getAttribute('collation');
-        if (!$collation) $collation = 'i;unicode-casemap';
-
-        return array(
-            'negate-condition' => $negateCondition,
-            'collation' => $collation,
-            'match-type' => $matchType,
-            'value' => $textMatchNode->nodeValue
-        );
-
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/AddressBookRoot.php b/core/src/core/classes/sabredav/lib/Sabre/CardDAV/AddressBookRoot.php
deleted file mode 100644
index 789abbc5d8..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/AddressBookRoot.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-namespace Sabre\CardDAV;
-
-use Sabre\DAVACL;
-
-/**
- * AddressBook rootnode
- *
- * This object lists a collection of users, which can contain addressbooks.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class AddressBookRoot extends DAVACL\AbstractPrincipalCollection {
-
-    /**
-     * Principal Backend
-     *
-     * @var Sabre\DAVACL\PrincipalBackend\BackendInteface
-     */
-    protected $principalBackend;
-
-    /**
-     * CardDAV backend
-     *
-     * @var Backend\BackendInterface
-     */
-    protected $carddavBackend;
-
-    /**
-     * Constructor
-     *
-     * This constructor needs both a principal and a carddav backend.
-     *
-     * By default this class will show a list of addressbook collections for
-     * principals in the 'principals' collection. If your main principals are
-     * actually located in a different path, use the $principalPrefix argument
-     * to override this.
-     *
-     * @param DAVACL\PrincipalBackend\BackendInterface $principalBackend
-     * @param Backend\BackendInterface $carddavBackend
-     * @param string $principalPrefix
-     */
-    public function __construct(DAVACL\PrincipalBackend\BackendInterface $principalBackend,Backend\BackendInterface $carddavBackend, $principalPrefix = 'principals') {
-
-        $this->carddavBackend = $carddavBackend;
-        parent::__construct($principalBackend, $principalPrefix);
-
-    }
-
-    /**
-     * Returns the name of the node
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return Plugin::ADDRESSBOOK_ROOT;
-
-    }
-
-    /**
-     * This method returns a node for a principal.
-     *
-     * The passed array contains principal information, and is guaranteed to
-     * at least contain a uri item. Other properties may or may not be
-     * supplied by the authentication backend.
-     *
-     * @param array $principal
-     * @return \Sabre\DAV\INode
-     */
-    public function getChildForPrincipal(array $principal) {
-
-        return new UserAddressBooks($this->carddavBackend, $principal['uri']);
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/Backend/AbstractBackend.php b/core/src/core/classes/sabredav/lib/Sabre/CardDAV/Backend/AbstractBackend.php
deleted file mode 100644
index 46909efef1..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/Backend/AbstractBackend.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Sabre\CardDAV\Backend;
-
-/**
- * CardDAV abstract Backend
- *
- * This class serves as a base-class for addressbook backends
- *
- * This class doesn't do much, but it was added for consistency.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-abstract class AbstractBackend implements BackendInterface {
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/Backend/BackendInterface.php b/core/src/core/classes/sabredav/lib/Sabre/CardDAV/Backend/BackendInterface.php
deleted file mode 100644
index 982da3a0f6..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/Backend/BackendInterface.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-
-namespace Sabre\CardDAV\Backend;
-
-/**
- * CardDAV Backend Interface
- *
- * Any CardDAV backend must implement this interface.
- *
- * Note that there are references to 'addressBookId' scattered throughout the
- * class. The value of the addressBookId is completely up to you, it can be any
- * arbitrary value you can use as an unique identifier.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface BackendInterface {
-
-    /**
-     * Returns the list of addressbooks for a specific user.
-     *
-     * Every addressbook should have the following properties:
-     *   id - an arbitrary unique id
-     *   uri - the 'basename' part of the url
-     *   principaluri - Same as the passed parameter
-     *
-     * Any additional clark-notation property may be passed besides this. Some
-     * common ones are :
-     *   {DAV:}displayname
-     *   {urn:ietf:params:xml:ns:carddav}addressbook-description
-     *   {http://calendarserver.org/ns/}getctag
-     *
-     * @param string $principalUri
-     * @return array
-     */
-    public function getAddressBooksForUser($principalUri);
-
-    /**
-     * Updates an addressbook's properties
-     *
-     * See Sabre\DAV\IProperties for a description of the mutations array, as
-     * well as the return value.
-     *
-     * @param mixed $addressBookId
-     * @param array $mutations
-     * @see Sabre\DAV\IProperties::updateProperties
-     * @return bool|array
-     */
-    public function updateAddressBook($addressBookId, array $mutations);
-
-    /**
-     * Creates a new address book
-     *
-     * @param string $principalUri
-     * @param string $url Just the 'basename' of the url.
-     * @param array $properties
-     * @return void
-     */
-    public function createAddressBook($principalUri, $url, array $properties);
-
-    /**
-     * Deletes an entire addressbook and all its contents
-     *
-     * @param mixed $addressBookId
-     * @return void
-     */
-    public function deleteAddressBook($addressBookId);
-
-    /**
-     * Returns all cards for a specific addressbook id.
-     *
-     * This method should return the following properties for each card:
-     *   * carddata - raw vcard data
-     *   * uri - Some unique url
-     *   * lastmodified - A unix timestamp
-     *
-     * It's recommended to also return the following properties:
-     *   * etag - A unique etag. This must change every time the card changes.
-     *   * size - The size of the card in bytes.
-     *
-     * If these last two properties are provided, less time will be spent
-     * calculating them. If they are specified, you can also ommit carddata.
-     * This may speed up certain requests, especially with large cards.
-     *
-     * @param mixed $addressbookId
-     * @return array
-     */
-    public function getCards($addressbookId);
-
-    /**
-     * Returns a specfic card.
-     *
-     * The same set of properties must be returned as with getCards. The only
-     * exception is that 'carddata' is absolutely required.
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @return array
-     */
-    public function getCard($addressBookId, $cardUri);
-
-    /**
-     * Creates a new card.
-     *
-     * The addressbook id will be passed as the first argument. This is the
-     * same id as it is returned from the getAddressbooksForUser method.
-     *
-     * The cardUri is a base uri, and doesn't include the full path. The
-     * cardData argument is the vcard body, and is passed as a string.
-     *
-     * It is possible to return an ETag from this method. This ETag is for the
-     * newly created resource, and must be enclosed with double quotes (that
-     * is, the string itself must contain the double quotes).
-     *
-     * You should only return the ETag if you store the carddata as-is. If a
-     * subsequent GET request on the same card does not have the same body,
-     * byte-by-byte and you did return an ETag here, clients tend to get
-     * confused.
-     *
-     * If you don't return an ETag, you can just return null.
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @param string $cardData
-     * @return string|null
-     */
-    public function createCard($addressBookId, $cardUri, $cardData);
-
-    /**
-     * Updates a card.
-     *
-     * The addressbook id will be passed as the first argument. This is the
-     * same id as it is returned from the getAddressbooksForUser method.
-     *
-     * The cardUri is a base uri, and doesn't include the full path. The
-     * cardData argument is the vcard body, and is passed as a string.
-     *
-     * It is possible to return an ETag from this method. This ETag should
-     * match that of the updated resource, and must be enclosed with double
-     * quotes (that is: the string itself must contain the actual quotes).
-     *
-     * You should only return the ETag if you store the carddata as-is. If a
-     * subsequent GET request on the same card does not have the same body,
-     * byte-by-byte and you did return an ETag here, clients tend to get
-     * confused.
-     *
-     * If you don't return an ETag, you can just return null.
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @param string $cardData
-     * @return string|null
-     */
-    public function updateCard($addressBookId, $cardUri, $cardData);
-
-    /**
-     * Deletes a card
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @return bool
-     */
-    public function deleteCard($addressBookId, $cardUri);
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/Backend/PDO.php b/core/src/core/classes/sabredav/lib/Sabre/CardDAV/Backend/PDO.php
deleted file mode 100644
index 67e0ae3aa7..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/Backend/PDO.php
+++ /dev/null
@@ -1,333 +0,0 @@
-<?php
-
-namespace Sabre\CardDAV\Backend;
-
-use Sabre\CardDAV;
-use Sabre\DAV;
-
-/**
- * PDO CardDAV backend
- *
- * This CardDAV backend uses PDO to store addressbooks
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class PDO extends AbstractBackend {
-
-    /**
-     * PDO connection
-     *
-     * @var PDO
-     */
-    protected $pdo;
-
-    /**
-     * The PDO table name used to store addressbooks
-     */
-    protected $addressBooksTableName;
-
-    /**
-     * The PDO table name used to store cards
-     */
-    protected $cardsTableName;
-
-    /**
-     * Sets up the object
-     *
-     * @param \PDO $pdo
-     * @param string $addressBooksTableName
-     * @param string $cardsTableName
-     */
-    public function __construct(\PDO $pdo, $addressBooksTableName = 'addressbooks', $cardsTableName = 'cards') {
-
-        $this->pdo = $pdo;
-        $this->addressBooksTableName = $addressBooksTableName;
-        $this->cardsTableName = $cardsTableName;
-
-    }
-
-    /**
-     * Returns the list of addressbooks for a specific user.
-     *
-     * @param string $principalUri
-     * @return array
-     */
-    public function getAddressBooksForUser($principalUri) {
-
-        $stmt = $this->pdo->prepare('SELECT id, uri, displayname, principaluri, description, ctag FROM '.$this->addressBooksTableName.' WHERE principaluri = ?');
-        $stmt->execute(array($principalUri));
-
-        $addressBooks = array();
-
-        foreach($stmt->fetchAll() as $row) {
-
-            $addressBooks[] = array(
-                'id'  => $row['id'],
-                'uri' => $row['uri'],
-                'principaluri' => $row['principaluri'],
-                '{DAV:}displayname' => $row['displayname'],
-                '{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
-                '{http://calendarserver.org/ns/}getctag' => $row['ctag'],
-                '{' . CardDAV\Plugin::NS_CARDDAV . '}supported-address-data' =>
-                    new CardDAV\Property\SupportedAddressData(),
-            );
-
-        }
-
-        return $addressBooks;
-
-    }
-
-
-    /**
-     * Updates an addressbook's properties
-     *
-     * See Sabre\DAV\IProperties for a description of the mutations array, as
-     * well as the return value.
-     *
-     * @param mixed $addressBookId
-     * @param array $mutations
-     * @see Sabre\DAV\IProperties::updateProperties
-     * @return bool|array
-     */
-    public function updateAddressBook($addressBookId, array $mutations) {
-
-        $updates = array();
-
-        foreach($mutations as $property=>$newValue) {
-
-            switch($property) {
-                case '{DAV:}displayname' :
-                    $updates['displayname'] = $newValue;
-                    break;
-                case '{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description' :
-                    $updates['description'] = $newValue;
-                    break;
-                default :
-                    // If any unsupported values were being updated, we must
-                    // let the entire request fail.
-                    return false;
-            }
-
-        }
-
-        // No values are being updated?
-        if (!$updates) {
-            return false;
-        }
-
-        $query = 'UPDATE ' . $this->addressBooksTableName . ' SET ctag = ctag + 1 ';
-        foreach($updates as $key=>$value) {
-            $query.=', `' . $key . '` = :' . $key . ' ';
-        }
-        $query.=' WHERE id = :addressbookid';
-
-        $stmt = $this->pdo->prepare($query);
-        $updates['addressbookid'] = $addressBookId;
-
-        $stmt->execute($updates);
-
-        return true;
-
-    }
-
-    /**
-     * Creates a new address book
-     *
-     * @param string $principalUri
-     * @param string $url Just the 'basename' of the url.
-     * @param array $properties
-     * @return void
-     */
-    public function createAddressBook($principalUri, $url, array $properties) {
-
-        $values = array(
-            'displayname' => null,
-            'description' => null,
-            'principaluri' => $principalUri,
-            'uri' => $url,
-        );
-
-        foreach($properties as $property=>$newValue) {
-
-            switch($property) {
-                case '{DAV:}displayname' :
-                    $values['displayname'] = $newValue;
-                    break;
-                case '{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description' :
-                    $values['description'] = $newValue;
-                    break;
-                default :
-                    throw new DAV\Exception\BadRequest('Unknown property: ' . $property);
-            }
-
-        }
-
-        $query = 'INSERT INTO ' . $this->addressBooksTableName . ' (uri, displayname, description, principaluri, ctag) VALUES (:uri, :displayname, :description, :principaluri, 1)';
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute($values);
-
-    }
-
-    /**
-     * Deletes an entire addressbook and all its contents
-     *
-     * @param int $addressBookId
-     * @return void
-     */
-    public function deleteAddressBook($addressBookId) {
-
-        $stmt = $this->pdo->prepare('DELETE FROM ' . $this->cardsTableName . ' WHERE addressbookid = ?');
-        $stmt->execute(array($addressBookId));
-
-        $stmt = $this->pdo->prepare('DELETE FROM ' . $this->addressBooksTableName . ' WHERE id = ?');
-        $stmt->execute(array($addressBookId));
-
-    }
-
-    /**
-     * Returns all cards for a specific addressbook id.
-     *
-     * This method should return the following properties for each card:
-     *   * carddata - raw vcard data
-     *   * uri - Some unique url
-     *   * lastmodified - A unix timestamp
-     *
-     * It's recommended to also return the following properties:
-     *   * etag - A unique etag. This must change every time the card changes.
-     *   * size - The size of the card in bytes.
-     *
-     * If these last two properties are provided, less time will be spent
-     * calculating them. If they are specified, you can also ommit carddata.
-     * This may speed up certain requests, especially with large cards.
-     *
-     * @param mixed $addressbookId
-     * @return array
-     */
-    public function getCards($addressbookId) {
-
-        $stmt = $this->pdo->prepare('SELECT id, carddata, uri, lastmodified FROM ' . $this->cardsTableName . ' WHERE addressbookid = ?');
-        $stmt->execute(array($addressbookId));
-
-        return $stmt->fetchAll(\PDO::FETCH_ASSOC);
-
-
-    }
-
-    /**
-     * Returns a specfic card.
-     *
-     * The same set of properties must be returned as with getCards. The only
-     * exception is that 'carddata' is absolutely required.
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @return array
-     */
-    public function getCard($addressBookId, $cardUri) {
-
-        $stmt = $this->pdo->prepare('SELECT id, carddata, uri, lastmodified FROM ' . $this->cardsTableName . ' WHERE addressbookid = ? AND uri = ? LIMIT 1');
-        $stmt->execute(array($addressBookId, $cardUri));
-
-        $result = $stmt->fetchAll(\PDO::FETCH_ASSOC);
-
-        return (count($result)>0?$result[0]:false);
-
-    }
-
-    /**
-     * Creates a new card.
-     *
-     * The addressbook id will be passed as the first argument. This is the
-     * same id as it is returned from the getAddressbooksForUser method.
-     *
-     * The cardUri is a base uri, and doesn't include the full path. The
-     * cardData argument is the vcard body, and is passed as a string.
-     *
-     * It is possible to return an ETag from this method. This ETag is for the
-     * newly created resource, and must be enclosed with double quotes (that
-     * is, the string itself must contain the double quotes).
-     *
-     * You should only return the ETag if you store the carddata as-is. If a
-     * subsequent GET request on the same card does not have the same body,
-     * byte-by-byte and you did return an ETag here, clients tend to get
-     * confused.
-     *
-     * If you don't return an ETag, you can just return null.
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @param string $cardData
-     * @return string|null
-     */
-    public function createCard($addressBookId, $cardUri, $cardData) {
-
-        $stmt = $this->pdo->prepare('INSERT INTO ' . $this->cardsTableName . ' (carddata, uri, lastmodified, addressbookid) VALUES (?, ?, ?, ?)');
-
-        $result = $stmt->execute(array($cardData, $cardUri, time(), $addressBookId));
-
-        $stmt2 = $this->pdo->prepare('UPDATE ' . $this->addressBooksTableName . ' SET ctag = ctag + 1 WHERE id = ?');
-        $stmt2->execute(array($addressBookId));
-
-        return '"' . md5($cardData) . '"';
-
-    }
-
-    /**
-     * Updates a card.
-     *
-     * The addressbook id will be passed as the first argument. This is the
-     * same id as it is returned from the getAddressbooksForUser method.
-     *
-     * The cardUri is a base uri, and doesn't include the full path. The
-     * cardData argument is the vcard body, and is passed as a string.
-     *
-     * It is possible to return an ETag from this method. This ETag should
-     * match that of the updated resource, and must be enclosed with double
-     * quotes (that is: the string itself must contain the actual quotes).
-     *
-     * You should only return the ETag if you store the carddata as-is. If a
-     * subsequent GET request on the same card does not have the same body,
-     * byte-by-byte and you did return an ETag here, clients tend to get
-     * confused.
-     *
-     * If you don't return an ETag, you can just return null.
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @param string $cardData
-     * @return string|null
-     */
-    public function updateCard($addressBookId, $cardUri, $cardData) {
-
-        $stmt = $this->pdo->prepare('UPDATE ' . $this->cardsTableName . ' SET carddata = ?, lastmodified = ? WHERE uri = ? AND addressbookid =?');
-        $stmt->execute(array($cardData, time(), $cardUri, $addressBookId));
-
-        $stmt2 = $this->pdo->prepare('UPDATE ' . $this->addressBooksTableName . ' SET ctag = ctag + 1 WHERE id = ?');
-        $stmt2->execute(array($addressBookId));
-
-        return '"' . md5($cardData) . '"';
-
-    }
-
-    /**
-     * Deletes a card
-     *
-     * @param mixed $addressBookId
-     * @param string $cardUri
-     * @return bool
-     */
-    public function deleteCard($addressBookId, $cardUri) {
-
-        $stmt = $this->pdo->prepare('DELETE FROM ' . $this->cardsTableName . ' WHERE addressbookid = ? AND uri = ?');
-        $stmt->execute(array($addressBookId, $cardUri));
-
-        $stmt2 = $this->pdo->prepare('UPDATE ' . $this->addressBooksTableName . ' SET ctag = ctag + 1 WHERE id = ?');
-        $stmt2->execute(array($addressBookId));
-
-        return $stmt->rowCount()===1;
-
-    }
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/Card.php b/core/src/core/classes/sabredav/lib/Sabre/CardDAV/Card.php
deleted file mode 100644
index cc65f76008..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/Card.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-
-namespace Sabre\CardDAV;
-
-use Sabre\DAVACL;
-use Sabre\DAV;
-
-
-/**
- * The Card object represents a single Card from an addressbook
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Card extends DAV\File implements ICard, DAVACL\IACL {
-
-    /**
-     * CardDAV backend
-     *
-     * @var Backend\BackendInterface
-     */
-    protected $carddavBackend;
-
-    /**
-     * Array with information about this Card
-     *
-     * @var array
-     */
-    protected $cardData;
-
-    /**
-     * Array with information about the containing addressbook
-     *
-     * @var array
-     */
-    protected $addressBookInfo;
-
-    /**
-     * Constructor
-     *
-     * @param Backend\BackendInterface $carddavBackend
-     * @param array $addressBookInfo
-     * @param array $cardData
-     */
-    public function __construct(Backend\BackendInterface $carddavBackend,array $addressBookInfo,array $cardData) {
-
-        $this->carddavBackend = $carddavBackend;
-        $this->addressBookInfo = $addressBookInfo;
-        $this->cardData = $cardData;
-
-    }
-
-    /**
-     * Returns the uri for this object
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return $this->cardData['uri'];
-
-    }
-
-    /**
-     * Returns the VCard-formatted object
-     *
-     * @return string
-     */
-    public function get() {
-
-        // Pre-populating 'carddata' is optional. If we don't yet have it
-        // already, we fetch it from the backend.
-        if (!isset($this->cardData['carddata'])) {
-            $this->cardData = $this->carddavBackend->getCard($this->addressBookInfo['id'], $this->cardData['uri']);
-        }
-        return $this->cardData['carddata'];
-
-    }
-
-    /**
-     * Updates the VCard-formatted object
-     *
-     * @param string $cardData
-     * @return string|null
-     */
-    public function put($cardData) {
-
-        if (is_resource($cardData))
-            $cardData = stream_get_contents($cardData);
-
-        // Converting to UTF-8, if needed
-        $cardData = DAV\StringUtil::ensureUTF8($cardData);
-
-        $etag = $this->carddavBackend->updateCard($this->addressBookInfo['id'],$this->cardData['uri'],$cardData);
-        $this->cardData['carddata'] = $cardData;
-        $this->cardData['etag'] = $etag;
-
-        return $etag;
-
-    }
-
-    /**
-     * Deletes the card
-     *
-     * @return void
-     */
-    public function delete() {
-
-        $this->carddavBackend->deleteCard($this->addressBookInfo['id'],$this->cardData['uri']);
-
-    }
-
-    /**
-     * Returns the mime content-type
-     *
-     * @return string
-     */
-    public function getContentType() {
-
-        return 'text/x-vcard; charset=utf-8';
-
-    }
-
-    /**
-     * Returns an ETag for this object
-     *
-     * @return string
-     */
-    public function getETag() {
-
-        if (isset($this->cardData['etag'])) {
-            return $this->cardData['etag'];
-        } else {
-            $data = $this->get();
-            if (is_string($data)) {
-                return '"' . md5($data) . '"';
-            } else {
-                // We refuse to calculate the md5 if it's a stream.
-                return null;
-            }
-        }
-
-    }
-
-    /**
-     * Returns the last modification date as a unix timestamp
-     *
-     * @return int
-     */
-    public function getLastModified() {
-
-        return isset($this->cardData['lastmodified'])?$this->cardData['lastmodified']:null;
-
-    }
-
-    /**
-     * Returns the size of this object in bytes
-     *
-     * @return int
-     */
-    public function getSize() {
-
-        if (array_key_exists('size', $this->cardData)) {
-            return $this->cardData['size'];
-        } else {
-            return strlen($this->get());
-        }
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->addressBookInfo['principaluri'];
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->addressBookInfo['principaluri'],
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->addressBookInfo['principaluri'],
-                'protected' => true,
-            ),
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new DAV\Exception\MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/IAddressBook.php b/core/src/core/classes/sabredav/lib/Sabre/CardDAV/IAddressBook.php
deleted file mode 100644
index e9e990cbdd..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/IAddressBook.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace Sabre\CardDAV;
-
-use Sabre\DAV;
-
-/**
- * AddressBook interface
- *
- * Implement this interface to allow a node to be recognized as an addressbook.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface IAddressBook extends DAV\ICollection {
-
-
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/ICard.php b/core/src/core/classes/sabredav/lib/Sabre/CardDAV/ICard.php
deleted file mode 100644
index e9a6331321..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/ICard.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace Sabre\CardDAV;
-
-use Sabre\DAV;
-
-/**
- * Card interface
- *
- * Extend the ICard interface to allow your custom nodes to be picked up as
- * 'Cards'.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface ICard extends DAV\IFile {
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/IDirectory.php b/core/src/core/classes/sabredav/lib/Sabre/CardDAV/IDirectory.php
deleted file mode 100644
index c2774cb45c..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/IDirectory.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace Sabre\CardDAV;
-
-/**
- * IDirectory interface
- *
- * Implement this interface to have an addressbook marked as a 'directory'. A
- * directory is an (often) global addressbook.
- *
- * A full description can be found in the IETF draft:
- *   - draft-daboo-carddav-directory-gateway
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface IDirectory extends IAddressBook {
-
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/Plugin.php b/core/src/core/classes/sabredav/lib/Sabre/CardDAV/Plugin.php
deleted file mode 100644
index 71a61fefc6..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/Plugin.php
+++ /dev/null
@@ -1,706 +0,0 @@
-<?php
-
-namespace Sabre\CardDAV;
-
-use Sabre\DAV;
-use Sabre\DAVACL;
-use Sabre\VObject;
-
-/**
- * CardDAV plugin
- *
- * The CardDAV plugin adds CardDAV functionality to the WebDAV server
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Plugin extends DAV\ServerPlugin {
-
-    /**
-     * Url to the addressbooks
-     */
-    const ADDRESSBOOK_ROOT = 'addressbooks';
-
-    /**
-     * xml namespace for CardDAV elements
-     */
-    const NS_CARDDAV = 'urn:ietf:params:xml:ns:carddav';
-
-    /**
-     * Add urls to this property to have them automatically exposed as
-     * 'directories' to the user.
-     *
-     * @var array
-     */
-    public $directories = array();
-
-    /**
-     * Server class
-     *
-     * @var Sabre\DAV\Server
-     */
-    protected $server;
-
-    /**
-     * Initializes the plugin
-     *
-     * @param DAV\Server $server
-     * @return void
-     */
-    public function initialize(DAV\Server $server) {
-
-        /* Events */
-        $server->subscribeEvent('beforeGetProperties', array($this, 'beforeGetProperties'));
-        $server->subscribeEvent('afterGetProperties',  array($this, 'afterGetProperties'));
-        $server->subscribeEvent('updateProperties', array($this, 'updateProperties'));
-        $server->subscribeEvent('report', array($this,'report'));
-        $server->subscribeEvent('onHTMLActionsPanel', array($this,'htmlActionsPanel'));
-        $server->subscribeEvent('onBrowserPostAction', array($this,'browserPostAction'));
-        $server->subscribeEvent('beforeWriteContent', array($this, 'beforeWriteContent'));
-        $server->subscribeEvent('beforeCreateFile', array($this, 'beforeCreateFile'));
-
-        /* Namespaces */
-        $server->xmlNamespaces[self::NS_CARDDAV] = 'card';
-
-        /* Mapping Interfaces to {DAV:}resourcetype values */
-        $server->resourceTypeMapping['Sabre\\CardDAV\\IAddressBook'] = '{' . self::NS_CARDDAV . '}addressbook';
-        $server->resourceTypeMapping['Sabre\\CardDAV\\IDirectory'] = '{' . self::NS_CARDDAV . '}directory';
-
-        /* Adding properties that may never be changed */
-        $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}supported-address-data';
-        $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}max-resource-size';
-        $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}addressbook-home-set';
-        $server->protectedProperties[] = '{' . self::NS_CARDDAV . '}supported-collation-set';
-
-        $server->propertyMap['{http://calendarserver.org/ns/}me-card'] = 'Sabre\\DAV\\Property\\Href';
-
-        $this->server = $server;
-
-    }
-
-    /**
-     * Returns a list of supported features.
-     *
-     * This is used in the DAV: header in the OPTIONS and PROPFIND requests.
-     *
-     * @return array
-     */
-    public function getFeatures() {
-
-        return array('addressbook');
-
-    }
-
-    /**
-     * Returns a list of reports this plugin supports.
-     *
-     * This will be used in the {DAV:}supported-report-set property.
-     * Note that you still need to subscribe to the 'report' event to actually
-     * implement them
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getSupportedReportSet($uri) {
-
-        $node = $this->server->tree->getNodeForPath($uri);
-        if ($node instanceof IAddressBook || $node instanceof ICard) {
-            return array(
-                 '{' . self::NS_CARDDAV . '}addressbook-multiget',
-                 '{' . self::NS_CARDDAV . '}addressbook-query',
-            );
-        }
-        return array();
-
-    }
-
-
-    /**
-     * Adds all CardDAV-specific properties
-     *
-     * @param string $path
-     * @param DAV\INode $node
-     * @param array $requestedProperties
-     * @param array $returnedProperties
-     * @return void
-     */
-    public function beforeGetProperties($path, DAV\INode $node, array &$requestedProperties, array &$returnedProperties) {
-
-        if ($node instanceof DAVACL\IPrincipal) {
-
-            // calendar-home-set property
-            $addHome = '{' . self::NS_CARDDAV . '}addressbook-home-set';
-            if (in_array($addHome,$requestedProperties)) {
-                $principalId = $node->getName();
-                $addressbookHomePath = self::ADDRESSBOOK_ROOT . '/' . $principalId . '/';
-                unset($requestedProperties[array_search($addHome, $requestedProperties)]);
-                $returnedProperties[200][$addHome] = new DAV\Property\Href($addressbookHomePath);
-            }
-
-            $directories = '{' . self::NS_CARDDAV . '}directory-gateway';
-            if ($this->directories && in_array($directories, $requestedProperties)) {
-                unset($requestedProperties[array_search($directories, $requestedProperties)]);
-                $returnedProperties[200][$directories] = new DAV\Property\HrefList($this->directories);
-            }
-
-        }
-
-        if ($node instanceof ICard) {
-
-            // The address-data property is not supposed to be a 'real'
-            // property, but in large chunks of the spec it does act as such.
-            // Therefore we simply expose it as a property.
-            $addressDataProp = '{' . self::NS_CARDDAV . '}address-data';
-            if (in_array($addressDataProp, $requestedProperties)) {
-                unset($requestedProperties[$addressDataProp]);
-                $val = $node->get();
-                if (is_resource($val))
-                    $val = stream_get_contents($val);
-
-                $returnedProperties[200][$addressDataProp] = $val;
-
-            }
-        }
-
-        if ($node instanceof UserAddressBooks) {
-
-            $meCardProp = '{http://calendarserver.org/ns/}me-card';
-            if (in_array($meCardProp, $requestedProperties)) {
-
-                $props = $this->server->getProperties($node->getOwner(), array('{http://sabredav.org/ns}vcard-url'));
-                if (isset($props['{http://sabredav.org/ns}vcard-url'])) {
-
-                    $returnedProperties[200][$meCardProp] = new DAV\Property\Href(
-                        $props['{http://sabredav.org/ns}vcard-url']
-                    );
-                    $pos = array_search($meCardProp, $requestedProperties);
-                    unset($requestedProperties[$pos]);
-
-                }
-
-            }
-
-        }
-
-    }
-
-    /**
-     * This event is triggered when a PROPPATCH method is executed
-     *
-     * @param array $mutations
-     * @param array $result
-     * @param DAV\INode $node
-     * @return bool
-     */
-    public function updateProperties(&$mutations, &$result, DAV\INode $node) {
-
-        if (!$node instanceof UserAddressBooks) {
-            return true;
-        }
-
-        $meCard = '{http://calendarserver.org/ns/}me-card';
-
-        // The only property we care about
-        if (!isset($mutations[$meCard]))
-            return true;
-
-        $value = $mutations[$meCard];
-        unset($mutations[$meCard]);
-
-        if ($value instanceof DAV\Property\IHref) {
-            $value = $value->getHref();
-            $value = $this->server->calculateUri($value);
-        } elseif (!is_null($value)) {
-            $result[400][$meCard] = null;
-            return false;
-        }
-
-        $innerResult = $this->server->updateProperties(
-            $node->getOwner(),
-            array(
-                '{http://sabredav.org/ns}vcard-url' => $value,
-            )
-        );
-
-        $closureResult = false;
-        foreach($innerResult as $status => $props) {
-            if (is_array($props) && array_key_exists('{http://sabredav.org/ns}vcard-url', $props)) {
-                $result[$status][$meCard] = null;
-                $closureResult = ($status>=200 && $status<300);
-            }
-
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * This functions handles REPORT requests specific to CardDAV
-     *
-     * @param string $reportName
-     * @param \DOMNode $dom
-     * @return bool
-     */
-    public function report($reportName,$dom) {
-
-        switch($reportName) {
-            case '{'.self::NS_CARDDAV.'}addressbook-multiget' :
-                $this->addressbookMultiGetReport($dom);
-                return false;
-            case '{'.self::NS_CARDDAV.'}addressbook-query' :
-                $this->addressBookQueryReport($dom);
-                return false;
-            default :
-                return;
-
-        }
-
-
-    }
-
-    /**
-     * This function handles the addressbook-multiget REPORT.
-     *
-     * This report is used by the client to fetch the content of a series
-     * of urls. Effectively avoiding a lot of redundant requests.
-     *
-     * @param \DOMNode $dom
-     * @return void
-     */
-    public function addressbookMultiGetReport($dom) {
-
-        $properties = array_keys(DAV\XMLUtil::parseProperties($dom->firstChild));
-
-        $hrefElems = $dom->getElementsByTagNameNS('urn:DAV','href');
-        $propertyList = array();
-
-        foreach($hrefElems as $elem) {
-
-            $uri = $this->server->calculateUri($elem->nodeValue);
-            list($propertyList[]) = $this->server->getPropertiesForPath($uri,$properties);
-
-        }
-
-        $prefer = $this->server->getHTTPPRefer();
-
-        $this->server->httpResponse->sendStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->setHeader('Vary','Brief,Prefer');
-        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($propertyList, $prefer['return-minimal']));
-
-    }
-
-    /**
-     * This method is triggered before a file gets updated with new content.
-     *
-     * This plugin uses this method to ensure that Card nodes receive valid
-     * vcard data.
-     *
-     * @param string $path
-     * @param DAV\IFile $node
-     * @param resource $data
-     * @return void
-     */
-    public function beforeWriteContent($path, DAV\IFile $node, &$data) {
-
-        if (!$node instanceof ICard)
-            return;
-
-        $this->validateVCard($data);
-
-    }
-
-    /**
-     * This method is triggered before a new file is created.
-     *
-     * This plugin uses this method to ensure that Card nodes receive valid
-     * vcard data.
-     *
-     * @param string $path
-     * @param resource $data
-     * @param DAV\ICollection $parentNode
-     * @return void
-     */
-    public function beforeCreateFile($path, &$data, DAV\ICollection $parentNode) {
-
-        if (!$parentNode instanceof IAddressBook)
-            return;
-
-        $this->validateVCard($data);
-
-    }
-
-    /**
-     * Checks if the submitted iCalendar data is in fact, valid.
-     *
-     * An exception is thrown if it's not.
-     *
-     * @param resource|string $data
-     * @return void
-     */
-    protected function validateVCard(&$data) {
-
-        // If it's a stream, we convert it to a string first.
-        if (is_resource($data)) {
-            $data = stream_get_contents($data);
-        }
-
-        // Converting the data to unicode, if needed.
-        $data = DAV\StringUtil::ensureUTF8($data);
-
-        try {
-
-            $vobj = VObject\Reader::read($data);
-
-        } catch (VObject\ParseException $e) {
-
-            throw new DAV\Exception\UnsupportedMediaType('This resource only supports valid vcard data. Parse error: ' . $e->getMessage());
-
-        }
-
-        if ($vobj->name !== 'VCARD') {
-            throw new DAV\Exception\UnsupportedMediaType('This collection can only support vcard objects.');
-        }
-
-        if (!isset($vobj->UID)) {
-            // No UID in vcards is invalid, but we'll just add it in anyway.
-            $vobj->add('UID', DAV\UUIDUtil::getUUID());
-            $data = $vobj->serialize();
-        }
-
-    }
-
-
-    /**
-     * This function handles the addressbook-query REPORT
-     *
-     * This report is used by the client to filter an addressbook based on a
-     * complex query.
-     *
-     * @param \DOMNode $dom
-     * @return void
-     */
-    protected function addressbookQueryReport($dom) {
-
-        $query = new AddressBookQueryParser($dom);
-        $query->parse();
-
-        $depth = $this->server->getHTTPDepth(0);
-
-        if ($depth==0) {
-            $candidateNodes = array(
-                $this->server->tree->getNodeForPath($this->server->getRequestUri())
-            );
-        } else {
-            $candidateNodes = $this->server->tree->getChildren($this->server->getRequestUri());
-        }
-
-        $validNodes = array();
-        foreach($candidateNodes as $node) {
-
-            if (!$node instanceof ICard)
-                continue;
-
-            $blob = $node->get();
-            if (is_resource($blob)) {
-                $blob = stream_get_contents($blob);
-            }
-
-            if (!$this->validateFilters($blob, $query->filters, $query->test)) {
-                continue;
-            }
-
-            $validNodes[] = $node;
-
-            if ($query->limit && $query->limit <= count($validNodes)) {
-                // We hit the maximum number of items, we can stop now.
-                break;
-            }
-
-        }
-
-        $result = array();
-        foreach($validNodes as $validNode) {
-
-            if ($depth==0) {
-                $href = $this->server->getRequestUri();
-            } else {
-                $href = $this->server->getRequestUri() . '/' . $validNode->getName();
-            }
-
-            list($result[]) = $this->server->getPropertiesForPath($href, $query->requestedProperties, 0);
-
-        }
-
-        $prefer = $this->server->getHTTPPRefer();
-
-        $this->server->httpResponse->sendStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->setHeader('Vary','Brief,Prefer');
-        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($result, $prefer['return-minimal']));
-
-    }
-
-    /**
-     * Validates if a vcard makes it throught a list of filters.
-     *
-     * @param string $vcardData
-     * @param array $filters
-     * @param string $test anyof or allof (which means OR or AND)
-     * @return bool
-     */
-    public function validateFilters($vcardData, array $filters, $test) {
-
-        $vcard = VObject\Reader::read($vcardData);
-
-        if (!$filters) return true;
-
-        foreach($filters as $filter) {
-
-            $isDefined = isset($vcard->{$filter['name']});
-            if ($filter['is-not-defined']) {
-                if ($isDefined) {
-                    $success = false;
-                } else {
-                    $success = true;
-                }
-            } elseif ((!$filter['param-filters'] && !$filter['text-matches']) || !$isDefined) {
-
-                // We only need to check for existence
-                $success = $isDefined;
-
-            } else {
-
-                $vProperties = $vcard->select($filter['name']);
-
-                $results = array();
-                if ($filter['param-filters']) {
-                    $results[] = $this->validateParamFilters($vProperties, $filter['param-filters'], $filter['test']);
-                }
-                if ($filter['text-matches']) {
-                    $texts = array();
-                    foreach($vProperties as $vProperty)
-                        $texts[] = $vProperty->getValue();
-
-                    $results[] = $this->validateTextMatches($texts, $filter['text-matches'], $filter['test']);
-                }
-
-                if (count($results)===1) {
-                    $success = $results[0];
-                } else {
-                    if ($filter['test'] === 'anyof') {
-                        $success = $results[0] || $results[1];
-                    } else {
-                        $success = $results[0] && $results[1];
-                    }
-                }
-
-            } // else
-
-            // There are two conditions where we can already determine whether
-            // or not this filter succeeds.
-            if ($test==='anyof' && $success) {
-                return true;
-            }
-            if ($test==='allof' && !$success) {
-                return false;
-            }
-
-        } // foreach
-
-        // If we got all the way here, it means we haven't been able to
-        // determine early if the test failed or not.
-        //
-        // This implies for 'anyof' that the test failed, and for 'allof' that
-        // we succeeded. Sounds weird, but makes sense.
-        return $test==='allof';
-
-    }
-
-    /**
-     * Validates if a param-filter can be applied to a specific property.
-     *
-     * @todo currently we're only validating the first parameter of the passed
-     *       property. Any subsequence parameters with the same name are
-     *       ignored.
-     * @param array $vProperties
-     * @param array $filters
-     * @param string $test
-     * @return bool
-     */
-    protected function validateParamFilters(array $vProperties, array $filters, $test) {
-
-        foreach($filters as $filter) {
-
-            $isDefined = false;
-            foreach($vProperties as $vProperty) {
-                $isDefined = isset($vProperty[$filter['name']]);
-                if ($isDefined) break;
-            }
-
-            if ($filter['is-not-defined']) {
-                if ($isDefined) {
-                    $success = false;
-                } else {
-                    $success = true;
-                }
-
-            // If there's no text-match, we can just check for existence
-            } elseif (!$filter['text-match'] || !$isDefined) {
-
-                $success = $isDefined;
-
-            } else {
-
-                $success = false;
-                foreach($vProperties as $vProperty) {
-                    // If we got all the way here, we'll need to validate the
-                    // text-match filter.
-                    $success = DAV\StringUtil::textMatch($vProperty[$filter['name']]->getValue(), $filter['text-match']['value'], $filter['text-match']['collation'], $filter['text-match']['match-type']);
-                    if ($success) break;
-                }
-                if ($filter['text-match']['negate-condition']) {
-                    $success = !$success;
-                }
-
-            } // else
-
-            // There are two conditions where we can already determine whether
-            // or not this filter succeeds.
-            if ($test==='anyof' && $success) {
-                return true;
-            }
-            if ($test==='allof' && !$success) {
-                return false;
-            }
-
-        }
-
-        // If we got all the way here, it means we haven't been able to
-        // determine early if the test failed or not.
-        //
-        // This implies for 'anyof' that the test failed, and for 'allof' that
-        // we succeeded. Sounds weird, but makes sense.
-        return $test==='allof';
-
-    }
-
-    /**
-     * Validates if a text-filter can be applied to a specific property.
-     *
-     * @param array $texts
-     * @param array $filters
-     * @param string $test
-     * @return bool
-     */
-    protected function validateTextMatches(array $texts, array $filters, $test) {
-
-        foreach($filters as $filter) {
-
-            $success = false;
-            foreach($texts as $haystack) {
-                $success = DAV\StringUtil::textMatch($haystack, $filter['value'], $filter['collation'], $filter['match-type']);
-
-                // Breaking on the first match
-                if ($success) break;
-            }
-            if ($filter['negate-condition']) {
-                $success = !$success;
-            }
-
-            if ($success && $test==='anyof')
-                return true;
-
-            if (!$success && $test=='allof')
-                return false;
-
-
-        }
-
-        // If we got all the way here, it means we haven't been able to
-        // determine early if the test failed or not.
-        //
-        // This implies for 'anyof' that the test failed, and for 'allof' that
-        // we succeeded. Sounds weird, but makes sense.
-        return $test==='allof';
-
-    }
-
-    /**
-     * This event is triggered after webdav-properties have been retrieved.
-     *
-     * @return bool
-     */
-    public function afterGetProperties($uri, &$properties) {
-
-        // If the request was made using the SOGO connector, we must rewrite
-        // the content-type property. By default SabreDAV will send back
-        // text/x-vcard; charset=utf-8, but for SOGO we must strip that last
-        // part.
-        if (!isset($properties[200]['{DAV:}getcontenttype']))
-            return;
-
-        if (strpos($this->server->httpRequest->getHeader('User-Agent'),'Thunderbird')===false) {
-            return;
-        }
-
-        if (strpos($properties[200]['{DAV:}getcontenttype'],'text/x-vcard')===0) {
-            $properties[200]['{DAV:}getcontenttype'] = 'text/x-vcard';
-        }
-
-    }
-
-    /**
-     * This method is used to generate HTML output for the
-     * Sabre\DAV\Browser\Plugin. This allows us to generate an interface users
-     * can use to create new calendars.
-     *
-     * @param DAV\INode $node
-     * @param string $output
-     * @return bool
-     */
-    public function htmlActionsPanel(DAV\INode $node, &$output) {
-
-        if (!$node instanceof UserAddressBooks)
-            return;
-
-        $output.= '<tr><td colspan="2"><form method="post" action="">
-            <h3>Create new address book</h3>
-            <input type="hidden" name="sabreAction" value="mkaddressbook" />
-            <label>Name (uri):</label> <input type="text" name="name" /><br />
-            <label>Display name:</label> <input type="text" name="{DAV:}displayname" /><br />
-            <input type="submit" value="create" />
-            </form>
-            </td></tr>';
-
-        return false;
-
-    }
-
-    /**
-     * This method allows us to intercept the 'mkcalendar' sabreAction. This
-     * action enables the user to create new calendars from the browser plugin.
-     *
-     * @param string $uri
-     * @param string $action
-     * @param array $postVars
-     * @return bool
-     */
-    public function browserPostAction($uri, $action, array $postVars) {
-
-        if ($action!=='mkaddressbook')
-            return;
-
-        $resourceType = array('{DAV:}collection','{urn:ietf:params:xml:ns:carddav}addressbook');
-        $properties = array();
-        if (isset($postVars['{DAV:}displayname'])) {
-            $properties['{DAV:}displayname'] = $postVars['{DAV:}displayname'];
-        }
-        $this->server->createCollection($uri . '/' . $postVars['name'],$resourceType,$properties);
-        return false;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/Property/SupportedAddressData.php b/core/src/core/classes/sabredav/lib/Sabre/CardDAV/Property/SupportedAddressData.php
deleted file mode 100644
index 9d8dd2e6de..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/Property/SupportedAddressData.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-namespace Sabre\CardDAV\Property;
-
-use Sabre\DAV;
-use Sabre\CardDAV;
-
-/**
- * Supported-address-data property
- *
- * This property is a representation of the supported-address-data property
- * in the CardDAV namespace.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class SupportedAddressData extends DAV\Property {
-
-    /**
-     * supported versions
-     *
-     * @var array
-     */
-    protected $supportedData = array();
-
-    /**
-     * Creates the property
-     *
-     * @param array|null $supportedData
-     */
-    public function __construct(array $supportedData = null) {
-
-        if (is_null($supportedData)) {
-            $supportedData = array(
-                array('contentType' => 'text/vcard', 'version' => '3.0'),
-                // array('contentType' => 'text/vcard', 'version' => '4.0'),
-            );
-        }
-
-       $this->supportedData = $supportedData;
-
-    }
-
-    /**
-     * Serializes the property in a DOMDocument
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $node
-     * @return void
-     */
-    public function serialize(DAV\Server $server,\DOMElement $node) {
-
-        $doc = $node->ownerDocument;
-
-        $prefix =
-            isset($server->xmlNamespaces[CardDAV\Plugin::NS_CARDDAV]) ?
-            $server->xmlNamespaces[CardDAV\Plugin::NS_CARDDAV] :
-            'card';
-
-        foreach($this->supportedData as $supported) {
-
-            $caldata = $doc->createElementNS(CardDAV\Plugin::NS_CARDDAV, $prefix . ':address-data-type');
-            $caldata->setAttribute('content-type',$supported['contentType']);
-            $caldata->setAttribute('version',$supported['version']);
-            $node->appendChild($caldata);
-
-        }
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/UserAddressBooks.php b/core/src/core/classes/sabredav/lib/Sabre/CardDAV/UserAddressBooks.php
deleted file mode 100644
index b4af861474..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/UserAddressBooks.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-
-namespace Sabre\CardDAV;
-
-use Sabre\DAV;
-use Sabre\DAVACL;
-
-/**
- * UserAddressBooks class
- *
- * The UserAddressBooks collection contains a list of addressbooks associated with a user
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class UserAddressBooks extends DAV\Collection implements DAV\IExtendedCollection, DAVACL\IACL {
-
-    /**
-     * Principal uri
-     *
-     * @var array
-     */
-    protected $principalUri;
-
-    /**
-     * carddavBackend
-     *
-     * @var Backend\BackendInterface
-     */
-    protected $carddavBackend;
-
-    /**
-     * Constructor
-     *
-     * @param Backend\BackendInterface $carddavBackend
-     * @param string $principalUri
-     */
-    public function __construct(Backend\BackendInterface $carddavBackend, $principalUri) {
-
-        $this->carddavBackend = $carddavBackend;
-        $this->principalUri = $principalUri;
-
-    }
-
-    /**
-     * Returns the name of this object
-     *
-     * @return string
-     */
-    public function getName() {
-
-        list(,$name) = DAV\URLUtil::splitPath($this->principalUri);
-        return $name;
-
-    }
-
-    /**
-     * Updates the name of this object
-     *
-     * @param string $name
-     * @return void
-     */
-    public function setName($name) {
-
-        throw new DAV\Exception\MethodNotAllowed();
-
-    }
-
-    /**
-     * Deletes this object
-     *
-     * @return void
-     */
-    public function delete() {
-
-        throw new DAV\Exception\MethodNotAllowed();
-
-    }
-
-    /**
-     * Returns the last modification date
-     *
-     * @return int
-     */
-    public function getLastModified() {
-
-        return null;
-
-    }
-
-    /**
-     * Creates a new file under this object.
-     *
-     * This is currently not allowed
-     *
-     * @param string $filename
-     * @param resource $data
-     * @return void
-     */
-    public function createFile($filename, $data=null) {
-
-        throw new DAV\Exception\MethodNotAllowed('Creating new files in this collection is not supported');
-
-    }
-
-    /**
-     * Creates a new directory under this object.
-     *
-     * This is currently not allowed.
-     *
-     * @param string $filename
-     * @return void
-     */
-    public function createDirectory($filename) {
-
-        throw new DAV\Exception\MethodNotAllowed('Creating new collections in this collection is not supported');
-
-    }
-
-    /**
-     * Returns a single calendar, by name
-     *
-     * @param string $name
-     * @todo needs optimizing
-     * @return \AddressBook
-     */
-    public function getChild($name) {
-
-        foreach($this->getChildren() as $child) {
-            if ($name==$child->getName())
-                return $child;
-
-        }
-        throw new DAV\Exception\NotFound('Addressbook with name \'' . $name . '\' could not be found');
-
-    }
-
-    /**
-     * Returns a list of addressbooks
-     *
-     * @return array
-     */
-    public function getChildren() {
-
-        $addressbooks = $this->carddavBackend->getAddressbooksForUser($this->principalUri);
-        $objs = array();
-        foreach($addressbooks as $addressbook) {
-            $objs[] = new AddressBook($this->carddavBackend, $addressbook);
-        }
-        return $objs;
-
-    }
-
-    /**
-     * Creates a new addressbook
-     *
-     * @param string $name
-     * @param array $resourceType
-     * @param array $properties
-     * @return void
-     */
-    public function createExtendedCollection($name, array $resourceType, array $properties) {
-
-        if (!in_array('{'.Plugin::NS_CARDDAV.'}addressbook',$resourceType) || count($resourceType)!==2) {
-            throw new DAV\Exception\InvalidResourceType('Unknown resourceType for this collection');
-        }
-        $this->carddavBackend->createAddressBook($this->principalUri, $name, $properties);
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->principalUri;
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->principalUri,
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->principalUri,
-                'protected' => true,
-            ),
-
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new DAV\Exception\MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/VCFExportPlugin.php b/core/src/core/classes/sabredav/lib/Sabre/CardDAV/VCFExportPlugin.php
deleted file mode 100644
index 3f91a30127..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/VCFExportPlugin.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-namespace Sabre\CardDAV;
-
-use Sabre\DAV;
-use Sabre\VObject;
-
-/**
- * VCF Exporter
- *
- * This plugin adds the ability to export entire address books as .vcf files.
- * This is useful for clients that don't support CardDAV yet. They often do
- * support vcf files.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @author Thomas Tanghus (http://tanghus.net/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class VCFExportPlugin extends DAV\ServerPlugin {
-
-    /**
-     * Reference to Server class
-     *
-     * @var Sabre\DAV\Server
-     */
-    protected $server;
-
-    /**
-     * Initializes the plugin and registers event handlers
-     *
-     * @param DAV\Server $server
-     * @return void
-     */
-    public function initialize(DAV\Server $server) {
-
-        $this->server = $server;
-        $this->server->subscribeEvent('beforeMethod',array($this,'beforeMethod'), 90);
-
-    }
-
-    /**
-     * 'beforeMethod' event handles. This event handles intercepts GET requests ending
-     * with ?export
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function beforeMethod($method, $uri) {
-
-        if ($method!='GET') return;
-        if ($this->server->httpRequest->getQueryString()!='export') return;
-
-        // splitting uri
-        list($uri) = explode('?',$uri,2);
-
-        $node = $this->server->tree->getNodeForPath($uri);
-
-        if (!($node instanceof IAddressBook)) return;
-
-        // Checking ACL, if available.
-        if ($aclPlugin = $this->server->getPlugin('acl')) {
-            $aclPlugin->checkPrivileges($uri, '{DAV:}read');
-        }
-
-        $this->server->httpResponse->setHeader('Content-Type','text/directory');
-        $this->server->httpResponse->sendStatus(200);
-
-        $nodes = $this->server->getPropertiesForPath($uri, array(
-            '{' . Plugin::NS_CARDDAV . '}address-data',
-        ),1);
-
-        $this->server->httpResponse->sendBody($this->generateVCF($nodes));
-
-        // Returning false to break the event chain
-        return false;
-
-    }
-
-    /**
-     * Merges all vcard objects, and builds one big vcf export
-     *
-     * @param array $nodes
-     * @return string
-     */
-    public function generateVCF(array $nodes) {
-
-        $output = "";
-
-        foreach($nodes as $node) {
-
-            if (!isset($node[200]['{' . Plugin::NS_CARDDAV . '}address-data'])) {
-                continue;
-            }
-            $nodeData = $node[200]['{' . Plugin::NS_CARDDAV . '}address-data'];
-
-            // Parsing this node so VObject can clean up the output.
-            $output .=
-               VObject\Reader::read($nodeData)->serialize();
-
-        }
-
-        return $output;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/Version.php b/core/src/core/classes/sabredav/lib/Sabre/CardDAV/Version.php
deleted file mode 100644
index 00221941b3..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/CardDAV/Version.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Sabre\CardDAV;
-
-/**
- * Version Class
- *
- * This class contains the Sabre\CardDAV version information
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Version {
-
-    /**
-     * Full version number
-     */
-    const VERSION = '1.8.7';
-
-    /**
-     * Stability : alpha, beta, stable
-     */
-    const STABILITY = 'stable';
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Auth/Backend/AbstractBasic.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Auth/Backend/AbstractBasic.php
deleted file mode 100644
index 599f932d4e..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Auth/Backend/AbstractBasic.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Auth\Backend;
-
-use Sabre\DAV;
-use Sabre\HTTP;
-
-/**
- * HTTP Basic authentication backend class
- *
- * This class can be used by authentication objects wishing to use HTTP Basic
- * Most of the digest logic is handled, implementors just need to worry about
- * the validateUserPass method.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author James David Low (http://jameslow.com/)
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-abstract class AbstractBasic implements BackendInterface {
-
-    /**
-     * This variable holds the currently logged in username.
-     *
-     * @var string|null
-     */
-    protected $currentUser;
-
-    /**
-     * Validates a username and password
-     *
-     * This method should return true or false depending on if login
-     * succeeded.
-     *
-     * @param string $username
-     * @param string $password
-     * @return bool
-     */
-    abstract protected function validateUserPass($username, $password);
-
-    /**
-     * Returns information about the currently logged in username.
-     *
-     * If nobody is currently logged in, this method should return null.
-     *
-     * @return string|null
-     */
-    public function getCurrentUser() {
-        return $this->currentUser;
-    }
-
-
-    /**
-     * Authenticates the user based on the current request.
-     *
-     * If authentication is successful, true must be returned.
-     * If authentication fails, an exception must be thrown.
-     *
-     * @param DAV\Server $server
-     * @param string $realm
-     * @throws DAV\Exception\NotAuthenticated
-     * @return bool
-     */
-    public function authenticate(DAV\Server $server, $realm) {
-
-        $auth = new HTTP\BasicAuth();
-        $auth->setHTTPRequest($server->httpRequest);
-        $auth->setHTTPResponse($server->httpResponse);
-        $auth->setRealm($realm);
-        $userpass = $auth->getUserPass();
-        if (!$userpass) {
-            $auth->requireLogin();
-            throw new DAV\Exception\NotAuthenticated('No basic authentication headers were found');
-        }
-
-        // Authenticates the user
-        if (!$this->validateUserPass($userpass[0],$userpass[1])) {
-            $auth->requireLogin();
-            throw new DAV\Exception\NotAuthenticated('Username or password does not match');
-        }
-        $this->currentUser = $userpass[0];
-        return true;
-    }
-
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Auth/Backend/AbstractDigest.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Auth/Backend/AbstractDigest.php
deleted file mode 100644
index dc00438c95..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Auth/Backend/AbstractDigest.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Auth\Backend;
-
-use Sabre\HTTP;
-use Sabre\DAV;
-
-/**
- * HTTP Digest authentication backend class
- *
- * This class can be used by authentication objects wishing to use HTTP Digest
- * Most of the digest logic is handled, implementors just need to worry about
- * the getDigestHash method
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-abstract class AbstractDigest implements BackendInterface {
-
-    /**
-     * This variable holds the currently logged in username.
-     *
-     * @var array|null
-     */
-    protected $currentUser;
-
-    /**
-     * Returns a users digest hash based on the username and realm.
-     *
-     * If the user was not known, null must be returned.
-     *
-     * @param string $realm
-     * @param string $username
-     * @return string|null
-     */
-    abstract public function getDigestHash($realm, $username);
-
-    /**
-     * Authenticates the user based on the current request.
-     *
-     * If authentication is successful, true must be returned.
-     * If authentication fails, an exception must be thrown.
-     *
-     * @param DAV\Server $server
-     * @param string $realm
-     * @throws DAV\Exception\NotAuthenticated
-     * @return bool
-     */
-    public function authenticate(DAV\Server $server, $realm) {
-
-        $digest = new HTTP\DigestAuth();
-
-        // Hooking up request and response objects
-        $digest->setHTTPRequest($server->httpRequest);
-        $digest->setHTTPResponse($server->httpResponse);
-
-        $digest->setRealm($realm);
-        $digest->init();
-
-        $username = $digest->getUsername();
-
-        // No username was given
-        if (!$username) {
-            $digest->requireLogin();
-            throw new DAV\Exception\NotAuthenticated('No digest authentication headers were found');
-        }
-
-        $hash = $this->getDigestHash($realm, $username);
-        // If this was false, the user account didn't exist
-        if ($hash===false || is_null($hash)) {
-            $digest->requireLogin();
-            throw new DAV\Exception\NotAuthenticated('The supplied username was not on file');
-        }
-        if (!is_string($hash)) {
-            throw new DAV\Exception('The returned value from getDigestHash must be a string or null');
-        }
-
-        // If this was false, the password or part of the hash was incorrect.
-        if (!$digest->validateA1($hash)) {
-            $digest->requireLogin();
-            throw new DAV\Exception\NotAuthenticated('Incorrect username');
-        }
-
-        $this->currentUser = $username;
-        return true;
-
-    }
-
-    /**
-     * Returns the currently logged in username.
-     *
-     * @return string|null
-     */
-    public function getCurrentUser() {
-
-        return $this->currentUser;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Auth/Backend/Apache.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Auth/Backend/Apache.php
deleted file mode 100644
index 66fdd91e1e..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Auth/Backend/Apache.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Auth\Backend;
-use Sabre\DAV;
-
-/**
- * Apache authenticator
- *
- * This authentication backend assumes that authentication has been
- * configured in apache, rather than within SabreDAV.
- *
- * Make sure apache is properly configured for this to work.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Apache implements BackendInterface {
-
-    /**
-     * Current apache user
-     *
-     * @var string
-     */
-    protected $remoteUser;
-
-    /**
-     * Authenticates the user based on the current request.
-     *
-     * If authentication is successful, true must be returned.
-     * If authentication fails, an exception must be thrown.
-     *
-     * @param DAV\Server $server
-     * @param string $realm
-     * @return bool
-     */
-    public function authenticate(DAV\Server $server, $realm) {
-
-        $remoteUser = $server->httpRequest->getRawServerValue('REMOTE_USER');
-        if (is_null($remoteUser)) {
-            throw new DAV\Exception('We did not receive the $_SERVER[REMOTE_USER] property. This means that apache might have been misconfigured');
-        }
-
-        $this->remoteUser = $remoteUser;
-        return true;
-
-    }
-
-    /**
-     * Returns information about the currently logged in user.
-     *
-     * If nobody is currently logged in, this method should return null.
-     *
-     * @return array|null
-     */
-    public function getCurrentUser() {
-
-        return $this->remoteUser;
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Auth/Backend/BackendInterface.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Auth/Backend/BackendInterface.php
deleted file mode 100644
index b8d04e2e11..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Auth/Backend/BackendInterface.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Auth\Backend;
-
-/**
- * This is the base class for any authentication object.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface BackendInterface {
-
-    /**
-     * Authenticates the user based on the current request.
-     *
-     * If authentication is successful, true must be returned.
-     * If authentication fails, an exception must be thrown.
-     *
-     * @param \Sabre\DAV\Server $server
-     * @param string $realm
-     * @return bool
-     */
-    function authenticate(\Sabre\DAV\Server $server,$realm);
-
-    /**
-     * Returns information about the currently logged in username.
-     *
-     * If nobody is currently logged in, this method should return null.
-     *
-     * @return string|null
-     */
-    function getCurrentUser();
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Auth/Backend/File.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Auth/Backend/File.php
deleted file mode 100644
index a8e9136144..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Auth/Backend/File.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Auth\Backend;
-
-use Sabre\DAV;
-
-/**
- * This is an authentication backend that uses a file to manage passwords.
- *
- * The backend file must conform to Apache's htdigest format
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class File extends AbstractDigest {
-
-    /**
-     * List of users
-     *
-     * @var array
-     */
-    protected $users = array();
-
-    /**
-     * Creates the backend object.
-     *
-     * If the filename argument is passed in, it will parse out the specified file fist.
-     *
-     * @param string|null $filename
-     */
-    public function __construct($filename=null) {
-
-        if (!is_null($filename))
-            $this->loadFile($filename);
-
-    }
-
-    /**
-     * Loads an htdigest-formatted file. This method can be called multiple times if
-     * more than 1 file is used.
-     *
-     * @param string $filename
-     * @return void
-     */
-    public function loadFile($filename) {
-
-        foreach(file($filename,FILE_IGNORE_NEW_LINES) as $line) {
-
-            if (substr_count($line, ":") !== 2)
-                throw new DAV\Exception('Malformed htdigest file. Every line should contain 2 colons');
-
-            list($username,$realm,$A1) = explode(':',$line);
-
-            if (!preg_match('/^[a-zA-Z0-9]{32}$/', $A1))
-                throw new DAV\Exception('Malformed htdigest file. Invalid md5 hash');
-
-            $this->users[$realm . ':' . $username] = $A1;
-
-        }
-
-    }
-
-    /**
-     * Returns a users' information
-     *
-     * @param string $realm
-     * @param string $username
-     * @return string
-     */
-    public function getDigestHash($realm, $username) {
-
-        return isset($this->users[$realm . ':' . $username])?$this->users[$realm . ':' . $username]:false;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Auth/Backend/PDO.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Auth/Backend/PDO.php
deleted file mode 100644
index f153d8429b..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Auth/Backend/PDO.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Auth\Backend;
-
-/**
- * This is an authentication backend that uses a file to manage passwords.
- *
- * The backend file must conform to Apache's htdigest format
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class PDO extends AbstractDigest {
-
-    /**
-     * Reference to PDO connection
-     *
-     * @var PDO
-     */
-    protected $pdo;
-
-    /**
-     * PDO table name we'll be using
-     *
-     * @var string
-     */
-    protected $tableName;
-
-
-    /**
-     * Creates the backend object.
-     *
-     * If the filename argument is passed in, it will parse out the specified file fist.
-     *
-     * @param PDO $pdo
-     * @param string $tableName The PDO table name to use
-     */
-    public function __construct(\PDO $pdo, $tableName = 'users') {
-
-        $this->pdo = $pdo;
-        $this->tableName = $tableName;
-
-    }
-
-    /**
-     * Returns the digest hash for a user.
-     *
-     * @param string $realm
-     * @param string $username
-     * @return string|null
-     */
-    public function getDigestHash($realm,$username) {
-
-        $stmt = $this->pdo->prepare('SELECT username, digesta1 FROM '.$this->tableName.' WHERE username = ?');
-        $stmt->execute(array($username));
-        $result = $stmt->fetchAll();
-
-        if (!count($result)) return;
-
-        return $result[0]['digesta1'];
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Auth/Plugin.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Auth/Plugin.php
deleted file mode 100644
index dbebc20f05..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Auth/Plugin.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Auth;
-use Sabre\DAV;
-
-/**
- * This plugin provides Authentication for a WebDAV server.
- *
- * It relies on a Backend object, which provides user information.
- *
- * Additionally, it provides support for:
- *  * {DAV:}current-user-principal property from RFC5397
- *  * {DAV:}principal-collection-set property from RFC3744
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Plugin extends DAV\ServerPlugin {
-
-    /**
-     * Reference to main server object
-     *
-     * @var Sabre\DAV\Server
-     */
-    protected $server;
-
-    /**
-     * Authentication backend
-     *
-     * @var Backend\BackendInterface
-     */
-    protected $authBackend;
-
-    /**
-     * The authentication realm.
-     *
-     * @var string
-     */
-    private $realm;
-
-    /**
-     * __construct
-     *
-     * @param Backend\BackendInterface $authBackend
-     * @param string $realm
-     */
-    public function __construct(Backend\BackendInterface $authBackend, $realm) {
-
-        $this->authBackend = $authBackend;
-        $this->realm = $realm;
-
-    }
-
-    /**
-     * Initializes the plugin. This function is automatically called by the server
-     *
-     * @param DAV\Server $server
-     * @return void
-     */
-    public function initialize(DAV\Server $server) {
-
-        $this->server = $server;
-        $this->server->subscribeEvent('beforeMethod',array($this,'beforeMethod'),10);
-
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using DAV\Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return 'auth';
-
-    }
-
-    /**
-     * Returns the current users' principal uri.
-     *
-     * If nobody is logged in, this will return null.
-     *
-     * @return string|null
-     */
-    public function getCurrentUser() {
-
-        $userInfo = $this->authBackend->getCurrentUser();
-        if (!$userInfo) return null;
-
-        return $userInfo;
-
-    }
-
-    /**
-     * This method is called before any HTTP method and forces users to be authenticated
-     *
-     * @param string $method
-     * @param string $uri
-     * @throws Sabre\DAV\Exception\NotAuthenticated
-     * @return bool
-     */
-    public function beforeMethod($method, $uri) {
-
-        $this->authBackend->authenticate($this->server,$this->realm);
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/GuessContentType.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/GuessContentType.php
deleted file mode 100644
index 9fd47b9304..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/GuessContentType.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Browser;
-
-use Sabre\DAV;
-
-/**
- * GuessContentType plugin
- *
- * A lot of the built-in File objects just return application/octet-stream
- * as a content-type by default. This is a problem for some clients, because
- * they expect a correct contenttype.
- *
- * There's really no accurate, fast and portable way to determine the contenttype
- * so this extension does what the rest of the world does, and guesses it based
- * on the file extension.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class GuessContentType extends DAV\ServerPlugin {
-
-    /**
-     * List of recognized file extensions
-     *
-     * Feel free to add more
-     *
-     * @var array
-     */
-    public $extensionMap = array(
-
-        // images
-        'jpg' => 'image/jpeg',
-        'gif' => 'image/gif',
-        'png' => 'image/png',
-
-        // groupware
-        'ics' => 'text/calendar',
-        'vcf' => 'text/x-vcard',
-
-        // text
-        'txt' => 'text/plain',
-
-    );
-
-    /**
-     * Initializes the plugin
-     *
-     * @param DAV\Server $server
-     * @return void
-     */
-    public function initialize(DAV\Server $server) {
-
-        // Using a relatively low priority (200) to allow other extensions
-        // to set the content-type first.
-        $server->subscribeEvent('afterGetProperties',array($this,'afterGetProperties'),200);
-
-    }
-
-    /**
-     * Handler for teh afterGetProperties event
-     *
-     * @param string $path
-     * @param array $properties
-     * @return void
-     */
-    public function afterGetProperties($path, &$properties) {
-
-        if (array_key_exists('{DAV:}getcontenttype', $properties[404])) {
-
-            list(, $fileName) = DAV\URLUtil::splitPath($path);
-            $contentType = $this->getContentType($fileName);
-
-            if ($contentType) {
-                $properties[200]['{DAV:}getcontenttype'] = $contentType;
-                unset($properties[404]['{DAV:}getcontenttype']);
-            }
-
-        }
-
-    }
-
-    /**
-     * Simple method to return the contenttype
-     *
-     * @param string $fileName
-     * @return string
-     */
-    protected function getContentType($fileName) {
-
-        // Just grabbing the extension
-        $extension = strtolower(substr($fileName,strrpos($fileName,'.')+1));
-        if (isset($this->extensionMap[$extension]))
-            return $this->extensionMap[$extension];
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/MapGetToPropFind.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/MapGetToPropFind.php
deleted file mode 100644
index 881c063b90..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/MapGetToPropFind.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Browser;
-
-use Sabre\DAV;
-
-/**
- * This is a simple plugin that will map any GET request for non-files to
- * PROPFIND allprops-requests.
- *
- * This should allow easy debugging of PROPFIND
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class MapGetToPropFind extends DAV\ServerPlugin {
-
-    /**
-     * reference to server class
-     *
-     * @var Sabre\DAV\Server
-     */
-    protected $server;
-
-    /**
-     * Initializes the plugin and subscribes to events
-     *
-     * @param DAV\Server $server
-     * @return void
-     */
-    public function initialize(DAV\Server $server) {
-
-        $this->server = $server;
-        $this->server->subscribeEvent('beforeMethod',array($this,'httpGetInterceptor'));
-    }
-
-    /**
-     * This method intercepts GET requests to non-files, and changes it into an HTTP PROPFIND request
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function httpGetInterceptor($method, $uri) {
-
-        if ($method!='GET') return true;
-
-        $node = $this->server->tree->getNodeForPath($uri);
-        if ($node instanceof DAV\IFile) return;
-
-        $this->server->invokeMethod('PROPFIND',$uri);
-        return false;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/Plugin.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/Plugin.php
deleted file mode 100644
index 751c229654..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/Plugin.php
+++ /dev/null
@@ -1,491 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Browser;
-
-use Sabre\DAV;
-
-/**
- * Browser Plugin
- *
- * This plugin provides a html representation, so that a WebDAV server may be accessed
- * using a browser.
- *
- * The class intercepts GET requests to collection resources and generates a simple
- * html index.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Plugin extends DAV\ServerPlugin {
-
-    /**
-     * List of default icons for nodes.
-     *
-     * This is an array with class / interface names as keys, and asset names
-     * as values.
-     *
-     * The evaluation order is reversed. The last item in the list gets
-     * precendence.
-     *
-     * @var array
-     */
-    public $iconMap = array(
-        'Sabre\\DAV\\IFile' => 'icons/file',
-        'Sabre\\DAV\\ICollection' => 'icons/collection',
-        'Sabre\\DAVACL\\IPrincipal' => 'icons/principal',
-        'Sabre\\CalDAV\\ICalendar' => 'icons/calendar',
-        'Sabre\\CardDAV\\IAddressBook' => 'icons/addressbook',
-        'Sabre\\CardDAV\\ICard' => 'icons/card',
-    );
-
-    /**
-     * The file extension used for all icons
-     *
-     * @var string
-     */
-    public $iconExtension = '.png';
-
-    /**
-     * reference to server class
-     *
-     * @var Sabre\DAV\Server
-     */
-    protected $server;
-
-    /**
-     * enablePost turns on the 'actions' panel, which allows people to create
-     * folders and upload files straight from a browser.
-     *
-     * @var bool
-     */
-    protected $enablePost = true;
-
-    /**
-     * By default the browser plugin will generate a favicon and other images.
-     * To turn this off, set this property to false.
-     *
-     * @var bool
-     */
-    protected $enableAssets = true;
-
-    /**
-     * Creates the object.
-     *
-     * By default it will allow file creation and uploads.
-     * Specify the first argument as false to disable this
-     *
-     * @param bool $enablePost
-     * @param bool $enableAssets
-     */
-    public function __construct($enablePost=true, $enableAssets = true) {
-
-        $this->enablePost = $enablePost;
-        $this->enableAssets = $enableAssets;
-
-    }
-
-    /**
-     * Initializes the plugin and subscribes to events
-     *
-     * @param DAV\Server $server
-     * @return void
-     */
-    public function initialize(DAV\Server $server) {
-
-        $this->server = $server;
-        $this->server->subscribeEvent('beforeMethod',array($this,'httpGetInterceptor'));
-        $this->server->subscribeEvent('onHTMLActionsPanel', array($this, 'htmlActionsPanel'),200);
-        if ($this->enablePost) $this->server->subscribeEvent('unknownMethod',array($this,'httpPOSTHandler'));
-    }
-
-    /**
-     * This method intercepts GET requests to collections and returns the html
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function httpGetInterceptor($method, $uri) {
-
-        if ($method !== 'GET') return true;
-
-        // We're not using straight-up $_GET, because we want everything to be
-        // unit testable.
-        $getVars = array();
-        parse_str($this->server->httpRequest->getQueryString(), $getVars);
-
-        if (isset($getVars['sabreAction']) && $getVars['sabreAction'] === 'asset' && isset($getVars['assetName'])) {
-            $this->serveAsset($getVars['assetName']);
-            return false;
-        }
-
-        try {
-            $node = $this->server->tree->getNodeForPath($uri);
-        } catch (DAV\Exception\NotFound $e) {
-            // We're simply stopping when the file isn't found to not interfere
-            // with other plugins.
-            return;
-        }
-        if ($node instanceof DAV\IFile)
-            return;
-
-        $this->server->httpResponse->sendStatus(200);
-        $this->server->httpResponse->setHeader('Content-Type','text/html; charset=utf-8');
-
-        $this->server->httpResponse->sendBody(
-            $this->generateDirectoryIndex($uri)
-        );
-
-        return false;
-
-    }
-
-    /**
-     * Handles POST requests for tree operations.
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function httpPOSTHandler($method, $uri) {
-
-        if ($method!='POST') return;
-        $contentType = $this->server->httpRequest->getHeader('Content-Type');
-        list($contentType) = explode(';', $contentType);
-        if ($contentType !== 'application/x-www-form-urlencoded' &&
-            $contentType !== 'multipart/form-data') {
-                return;
-        }
-        $postVars = $this->server->httpRequest->getPostVars();
-
-        if (!isset($postVars['sabreAction']))
-            return;
-
-        if ($this->server->broadcastEvent('onBrowserPostAction', array($uri, $postVars['sabreAction'], $postVars))) {
-
-            switch($postVars['sabreAction']) {
-
-                case 'mkcol' :
-                    if (isset($postVars['name']) && trim($postVars['name'])) {
-                        // Using basename() because we won't allow slashes
-                        list(, $folderName) = DAV\URLUtil::splitPath(trim($postVars['name']));
-                        $this->server->createDirectory($uri . '/' . $folderName);
-                    }
-                    break;
-                case 'put' :
-                    if ($_FILES) $file = current($_FILES);
-                    else break;
-
-                    list(, $newName) = DAV\URLUtil::splitPath(trim($file['name']));
-                    if (isset($postVars['name']) && trim($postVars['name']))
-                        $newName = trim($postVars['name']);
-
-                    // Making sure we only have a 'basename' component
-                    list(, $newName) = DAV\URLUtil::splitPath($newName);
-
-                    if (is_uploaded_file($file['tmp_name'])) {
-                        $this->server->createFile($uri . '/' . $newName, fopen($file['tmp_name'],'r'));
-                    }
-                    break;
-
-            }
-
-        }
-        $this->server->httpResponse->setHeader('Location',$this->server->httpRequest->getUri());
-        $this->server->httpResponse->sendStatus(302);
-        return false;
-
-    }
-
-    /**
-     * Escapes a string for html.
-     *
-     * @param string $value
-     * @return string
-     */
-    public function escapeHTML($value) {
-
-        return htmlspecialchars($value,ENT_QUOTES,'UTF-8');
-
-    }
-
-    /**
-     * Generates the html directory index for a given url
-     *
-     * @param string $path
-     * @return string
-     */
-    public function generateDirectoryIndex($path) {
-
-        $version = '';
-        if (DAV\Server::$exposeVersion) {
-            $version = DAV\Version::VERSION ."-". DAV\Version::STABILITY;
-        }
-
-        $html = "<html>
-<head>
-  <title>Index for " . $this->escapeHTML($path) . "/ - SabreDAV " . $version . "</title>
-  <style type=\"text/css\">
-  body { Font-family: arial}
-  h1 { font-size: 150% }
-  </style>
-        ";
-
-        if ($this->enableAssets) {
-            $html.='<link rel="shortcut icon" href="'.$this->getAssetUrl('favicon.ico').'" type="image/vnd.microsoft.icon" />';
-        }
-
-        $html .= "</head>
-<body>
-  <h1>Index for " . $this->escapeHTML($path) . "/</h1>
-  <table>
-    <tr><th width=\"24\"></th><th>Name</th><th>Type</th><th>Size</th><th>Last modified</th></tr>
-    <tr><td colspan=\"5\"><hr /></td></tr>";
-
-        $files = $this->server->getPropertiesForPath($path,array(
-            '{DAV:}displayname',
-            '{DAV:}resourcetype',
-            '{DAV:}getcontenttype',
-            '{DAV:}getcontentlength',
-            '{DAV:}getlastmodified',
-        ),1);
-
-        $parent = $this->server->tree->getNodeForPath($path);
-
-
-        if ($path) {
-
-            list($parentUri) = DAV\URLUtil::splitPath($path);
-            $fullPath = DAV\URLUtil::encodePath($this->server->getBaseUri() . $parentUri);
-
-            $icon = $this->enableAssets?'<a href="' . $fullPath . '"><img src="' . $this->getAssetUrl('icons/parent' . $this->iconExtension) . '" width="24" alt="Parent" /></a>':'';
-            $html.= "<tr>
-    <td>$icon</td>
-    <td><a href=\"{$fullPath}\">..</a></td>
-    <td>[parent]</td>
-    <td></td>
-    <td></td>
-    </tr>";
-
-        }
-
-        foreach($files as $file) {
-
-            // This is the current directory, we can skip it
-            if (rtrim($file['href'],'/')==$path) continue;
-
-            list(, $name) = DAV\URLUtil::splitPath($file['href']);
-
-            $type = null;
-
-
-            if (isset($file[200]['{DAV:}resourcetype'])) {
-                $type = $file[200]['{DAV:}resourcetype']->getValue();
-
-                // resourcetype can have multiple values
-                if (!is_array($type)) $type = array($type);
-
-                foreach($type as $k=>$v) {
-
-                    // Some name mapping is preferred
-                    switch($v) {
-                        case '{DAV:}collection' :
-                            $type[$k] = 'Collection';
-                            break;
-                        case '{DAV:}principal' :
-                            $type[$k] = 'Principal';
-                            break;
-                        case '{urn:ietf:params:xml:ns:carddav}addressbook' :
-                            $type[$k] = 'Addressbook';
-                            break;
-                        case '{urn:ietf:params:xml:ns:caldav}calendar' :
-                            $type[$k] = 'Calendar';
-                            break;
-                        case '{urn:ietf:params:xml:ns:caldav}schedule-inbox' :
-                            $type[$k] = 'Schedule Inbox';
-                            break;
-                        case '{urn:ietf:params:xml:ns:caldav}schedule-outbox' :
-                            $type[$k] = 'Schedule Outbox';
-                            break;
-                        case '{http://calendarserver.org/ns/}calendar-proxy-read' :
-                            $type[$k] = 'Proxy-Read';
-                            break;
-                        case '{http://calendarserver.org/ns/}calendar-proxy-write' :
-                            $type[$k] = 'Proxy-Write';
-                            break;
-                    }
-
-                }
-                $type = implode(', ', $type);
-            }
-
-            // If no resourcetype was found, we attempt to use
-            // the contenttype property
-            if (!$type && isset($file[200]['{DAV:}getcontenttype'])) {
-                $type = $file[200]['{DAV:}getcontenttype'];
-            }
-            if (!$type) $type = 'Unknown';
-
-            $size = isset($file[200]['{DAV:}getcontentlength'])?(int)$file[200]['{DAV:}getcontentlength']:'';
-            $lastmodified = isset($file[200]['{DAV:}getlastmodified'])?$file[200]['{DAV:}getlastmodified']->getTime()->format(\DateTime::ATOM):'';
-
-            $fullPath = DAV\URLUtil::encodePath('/' . trim($this->server->getBaseUri() . ($path?$path . '/':'') . $name,'/'));
-
-            $displayName = isset($file[200]['{DAV:}displayname'])?$file[200]['{DAV:}displayname']:$name;
-
-            $displayName = $this->escapeHTML($displayName);
-            $type = $this->escapeHTML($type);
-
-            $icon = '';
-
-            if ($this->enableAssets) {
-                $node = $this->server->tree->getNodeForPath(($path?$path.'/':'') . $name);
-                foreach(array_reverse($this->iconMap) as $class=>$iconName) {
-
-                    if ($node instanceof $class) {
-                        $icon = '<a href="' . $fullPath . '"><img src="' . $this->getAssetUrl($iconName . $this->iconExtension) . '" alt="" width="24" /></a>';
-                        break;
-                    }
-
-
-                }
-
-            }
-
-            $html.= "<tr>
-    <td>$icon</td>
-    <td><a href=\"{$fullPath}\">{$displayName}</a></td>
-    <td>{$type}</td>
-    <td>{$size}</td>
-    <td>{$lastmodified}</td>
-    </tr>";
-
-        }
-
-        $html.= "<tr><td colspan=\"5\"><hr /></td></tr>";
-
-        $output = '';
-
-        if ($this->enablePost) {
-            $this->server->broadcastEvent('onHTMLActionsPanel',array($parent, &$output));
-        }
-
-        $html.=$output;
-
-        $html.= "</table>
-        <address>Generated by SabreDAV " . $version . " (c)2007-2014 <a href=\"http://sabre.io/\">http://sabre.io/</a></address>
-        </body>
-        </html>";
-
-        return $html;
-
-    }
-
-    /**
-     * This method is used to generate the 'actions panel' output for
-     * collections.
-     *
-     * This specifically generates the interfaces for creating new files, and
-     * creating new directories.
-     *
-     * @param DAV\INode $node
-     * @param mixed $output
-     * @return void
-     */
-    public function htmlActionsPanel(DAV\INode $node, &$output) {
-
-        if (!$node instanceof DAV\ICollection)
-            return;
-
-        // We also know fairly certain that if an object is a non-extended
-        // SimpleCollection, we won't need to show the panel either.
-        if (get_class($node)==='Sabre\\DAV\\SimpleCollection')
-            return;
-
-        $output.= '<tr><td colspan="2"><form method="post" action="">
-            <h3>Create new folder</h3>
-            <input type="hidden" name="sabreAction" value="mkcol" />
-            Name: <input type="text" name="name" /><br />
-            <input type="submit" value="create" />
-            </form>
-            <form method="post" action="" enctype="multipart/form-data">
-            <h3>Upload file</h3>
-            <input type="hidden" name="sabreAction" value="put" />
-            Name (optional): <input type="text" name="name" /><br />
-            File: <input type="file" name="file" /><br />
-            <input type="submit" value="upload" />
-            </form>
-            </td></tr>';
-
-    }
-
-    /**
-     * This method takes a path/name of an asset and turns it into url
-     * suiteable for http access.
-     *
-     * @param string $assetName
-     * @return string
-     */
-    protected function getAssetUrl($assetName) {
-
-        return $this->server->getBaseUri() . '?sabreAction=asset&assetName=' . urlencode($assetName);
-
-    }
-
-    /**
-     * This method returns a local pathname to an asset.
-     *
-     * @param string $assetName
-     * @return string
-     */
-    protected function getLocalAssetPath($assetName) {
-
-        $assetDir = __DIR__ . '/assets/';
-        $path = $assetDir . $assetName;
-
-        // Making sure people aren't trying to escape from the base path.
-        if (strpos(realpath($path), realpath($assetDir)) === 0) {
-            return $path;
-        }
-        throw new DAV\Exception\Forbidden('Path does not exist, or escaping from the base path was detected');
-    }
-
-    /**
-     * This method reads an asset from disk and generates a full http response.
-     *
-     * @param string $assetName
-     * @return void
-     */
-    protected function serveAsset($assetName) {
-
-        $assetPath = $this->getLocalAssetPath($assetName);
-        if (!file_exists($assetPath)) {
-            throw new DAV\Exception\NotFound('Could not find an asset with this name');
-        }
-        // Rudimentary mime type detection
-        switch(strtolower(substr($assetPath,strpos($assetPath,'.')+1))) {
-
-        case 'ico' :
-            $mime = 'image/vnd.microsoft.icon';
-            break;
-
-        case 'png' :
-            $mime = 'image/png';
-            break;
-
-        default:
-            $mime = 'application/octet-stream';
-            break;
-
-        }
-
-        $this->server->httpResponse->setHeader('Content-Type', $mime);
-        $this->server->httpResponse->setHeader('Content-Length', filesize($assetPath));
-        $this->server->httpResponse->setHeader('Cache-Control', 'public, max-age=1209600');
-        $this->server->httpResponse->sendStatus(200);
-        $this->server->httpResponse->sendBody(fopen($assetPath,'r'));
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/assets/favicon.ico b/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/assets/favicon.ico
deleted file mode 100644
index 2b2c10a22c..0000000000
Binary files a/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/assets/favicon.ico and /dev/null differ
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/assets/icons/addressbook.png b/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/assets/icons/addressbook.png
deleted file mode 100644
index c9acc84172..0000000000
Binary files a/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/assets/icons/addressbook.png and /dev/null differ
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/assets/icons/calendar.png b/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/assets/icons/calendar.png
deleted file mode 100644
index 3ecd6a800a..0000000000
Binary files a/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/assets/icons/calendar.png and /dev/null differ
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/assets/icons/card.png b/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/assets/icons/card.png
deleted file mode 100644
index 2ce954866d..0000000000
Binary files a/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/assets/icons/card.png and /dev/null differ
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/assets/icons/collection.png b/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/assets/icons/collection.png
deleted file mode 100644
index 156fa64fd5..0000000000
Binary files a/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/assets/icons/collection.png and /dev/null differ
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/assets/icons/file.png b/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/assets/icons/file.png
deleted file mode 100644
index 3b98551cec..0000000000
Binary files a/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/assets/icons/file.png and /dev/null differ
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/assets/icons/parent.png b/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/assets/icons/parent.png
deleted file mode 100644
index 156fa64fd5..0000000000
Binary files a/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/assets/icons/parent.png and /dev/null differ
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/assets/icons/principal.png b/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/assets/icons/principal.png
deleted file mode 100644
index f8988f828e..0000000000
Binary files a/core/src/core/classes/sabredav/lib/Sabre/DAV/Browser/assets/icons/principal.png and /dev/null differ
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Client.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Client.php
deleted file mode 100644
index 705b321955..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Client.php
+++ /dev/null
@@ -1,575 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-/**
- * SabreDAV DAV client
- *
- * This client wraps around Curl to provide a convenient API to a WebDAV
- * server.
- *
- * NOTE: This class is experimental, it's api will likely change in the future.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Client {
-
-    /**
-     * The propertyMap is a key-value array.
-     *
-     * If you use the propertyMap, any {DAV:}multistatus responses with the
-     * proeprties listed in this array, will automatically be mapped to a
-     * respective class.
-     *
-     * The {DAV:}resourcetype property is automatically added. This maps to
-     * Sabre\DAV\Property\ResourceType
-     *
-     * @var array
-     */
-    public $propertyMap = array();
-
-    protected $baseUri;
-    protected $userName;
-    protected $password;
-    protected $proxy;
-    protected $trustedCertificates;
-
-    /**
-     * Basic authentication
-     */
-    const AUTH_BASIC = 1;
-
-    /**
-     * Digest authentication
-     */
-    const AUTH_DIGEST = 2;
-
-    /**
-     * The authentication type we're using.
-     *
-     * This is a bitmask of AUTH_BASIC and AUTH_DIGEST.
-     *
-     * If DIGEST is used, the client makes 1 extra request per request, to get
-     * the authentication tokens.
-     *
-     * @var int
-     */
-    protected $authType;
-
-    /**
-     * Indicates if SSL verification is enabled or not.
-     *
-     * @var boolean
-     */
-    protected $verifyPeer;
-
-    /**
-     * Constructor
-     *
-     * Settings are provided through the 'settings' argument. The following
-     * settings are supported:
-     *
-     *   * baseUri
-     *   * userName (optional)
-     *   * password (optional)
-     *   * proxy (optional)
-     *
-     * @param array $settings
-     */
-    public function __construct(array $settings) {
-
-        if (!isset($settings['baseUri'])) {
-            throw new \InvalidArgumentException('A baseUri must be provided');
-        }
-
-        $validSettings = array(
-            'baseUri',
-            'userName',
-            'password',
-            'proxy',
-        );
-
-        foreach($validSettings as $validSetting) {
-            if (isset($settings[$validSetting])) {
-                $this->$validSetting = $settings[$validSetting];
-            }
-        }
-
-        if (isset($settings['authType'])) {
-            $this->authType = $settings['authType'];
-        } else {
-            $this->authType = self::AUTH_BASIC | self::AUTH_DIGEST;
-        }
-
-        $this->propertyMap['{DAV:}resourcetype'] = 'Sabre\\DAV\\Property\\ResourceType';
-
-    }
-
-    /**
-     * Add trusted root certificates to the webdav client.
-     *
-     * The parameter certificates should be a absolute path to a file
-     * which contains all trusted certificates
-     *
-     * @param string $certificates
-     */
-    public function addTrustedCertificates($certificates) {
-        $this->trustedCertificates = $certificates;
-    }
-
-    /**
-     * Enables/disables SSL peer verification
-     *
-     * @param boolean $value
-     */
-    public function setVerifyPeer($value) {
-        $this->verifyPeer = $value;
-    }
-
-    /**
-     * Does a PROPFIND request
-     *
-     * The list of requested properties must be specified as an array, in clark
-     * notation.
-     *
-     * The returned array will contain a list of filenames as keys, and
-     * properties as values.
-     *
-     * The properties array will contain the list of properties. Only properties
-     * that are actually returned from the server (without error) will be
-     * returned, anything else is discarded.
-     *
-     * Depth should be either 0 or 1. A depth of 1 will cause a request to be
-     * made to the server to also return all child resources.
-     *
-     * @param string $url
-     * @param array $properties
-     * @param int $depth
-     * @return array
-     */
-    public function propFind($url, array $properties, $depth = 0) {
-
-        $body = '<?xml version="1.0"?>' . "\n";
-        $body.= '<d:propfind xmlns:d="DAV:">' . "\n";
-        $body.= '  <d:prop>' . "\n";
-
-        foreach($properties as $property) {
-
-            list(
-                $namespace,
-                $elementName
-            ) = XMLUtil::parseClarkNotation($property);
-
-            if ($namespace === 'DAV:') {
-                $body.='    <d:' . $elementName . ' />' . "\n";
-            } else {
-                $body.="    <x:" . $elementName . " xmlns:x=\"" . $namespace . "\"/>\n";
-            }
-
-        }
-
-        $body.= '  </d:prop>' . "\n";
-        $body.= '</d:propfind>';
-
-        $response = $this->request('PROPFIND', $url, $body, array(
-            'Depth' => $depth,
-            'Content-Type' => 'application/xml'
-        ));
-
-        $result = $this->parseMultiStatus($response['body']);
-
-        // If depth was 0, we only return the top item
-        if ($depth===0) {
-            reset($result);
-            $result = current($result);
-            return isset($result[200])?$result[200]:array();
-        }
-
-        $newResult = array();
-        foreach($result as $href => $statusList) {
-
-            $newResult[$href] = isset($statusList[200])?$statusList[200]:array();
-
-        }
-
-        return $newResult;
-
-    }
-
-    /**
-     * Updates a list of properties on the server
-     *
-     * The list of properties must have clark-notation properties for the keys,
-     * and the actual (string) value for the value. If the value is null, an
-     * attempt is made to delete the property.
-     *
-     * @todo Must be building the request using the DOM, and does not yet
-     *       support complex properties.
-     * @param string $url
-     * @param array $properties
-     * @return void
-     */
-    public function propPatch($url, array $properties) {
-
-        $body = '<?xml version="1.0"?>' . "\n";
-        $body.= '<d:propertyupdate xmlns:d="DAV:">' . "\n";
-
-        foreach($properties as $propName => $propValue) {
-
-            list(
-                $namespace,
-                $elementName
-            ) = XMLUtil::parseClarkNotation($propName);
-
-            if ($propValue === null) {
-
-                $body.="<d:remove><d:prop>\n";
-
-                if ($namespace === 'DAV:') {
-                    $body.='    <d:' . $elementName . ' />' . "\n";
-                } else {
-                    $body.="    <x:" . $elementName . " xmlns:x=\"" . $namespace . "\"/>\n";
-                }
-
-                $body.="</d:prop></d:remove>\n";
-
-            } else {
-
-                $body.="<d:set><d:prop>\n";
-                if ($namespace === 'DAV:') {
-                    $body.='    <d:' . $elementName . '>';
-                } else {
-                    $body.="    <x:" . $elementName . " xmlns:x=\"" . $namespace . "\">";
-                }
-                // Shitty.. i know
-                $body.=htmlspecialchars($propValue, ENT_NOQUOTES, 'UTF-8');
-                if ($namespace === 'DAV:') {
-                    $body.='</d:' . $elementName . '>' . "\n";
-                } else {
-                    $body.="</x:" . $elementName . ">\n";
-                }
-                $body.="</d:prop></d:set>\n";
-
-            }
-
-        }
-
-        $body.= '</d:propertyupdate>';
-
-        $this->request('PROPPATCH', $url, $body, array(
-            'Content-Type' => 'application/xml'
-        ));
-
-    }
-
-    /**
-     * Performs an HTTP options request
-     *
-     * This method returns all the features from the 'DAV:' header as an array.
-     * If there was no DAV header, or no contents this method will return an
-     * empty array.
-     *
-     * @return array
-     */
-    public function options() {
-
-        $result = $this->request('OPTIONS');
-        if (!isset($result['headers']['dav'])) {
-            return array();
-        }
-
-        $features = explode(',', $result['headers']['dav']);
-        foreach($features as &$v) {
-            $v = trim($v);
-        }
-        return $features;
-
-    }
-
-    /**
-     * Performs an actual HTTP request, and returns the result.
-     *
-     * If the specified url is relative, it will be expanded based on the base
-     * url.
-     *
-     * The returned array contains 3 keys:
-     *   * body - the response body
-     *   * httpCode - a HTTP code (200, 404, etc)
-     *   * headers - a list of response http headers. The header names have
-     *     been lowercased.
-     *
-     * @param string $method
-     * @param string $url
-     * @param string $body
-     * @param array $headers
-     * @return array
-     */
-    public function request($method, $url = '', $body = null, $headers = array()) {
-
-        $url = $this->getAbsoluteUrl($url);
-
-        $curlSettings = array(
-            CURLOPT_RETURNTRANSFER => true,
-            // Return headers as part of the response
-            CURLOPT_HEADER => true,
-
-            // For security we cast this to a string. If somehow an array could
-            // be passed here, it would be possible for an attacker to use @ to
-            // post local files.
-            CURLOPT_POSTFIELDS => (string)$body,
-            // Automatically follow redirects
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_MAXREDIRS => 5,
-        );
-
-        if($this->verifyPeer !== null) {
-            $curlSettings[CURLOPT_SSL_VERIFYPEER] = $this->verifyPeer;
-        }
-
-        if($this->trustedCertificates) {
-            $curlSettings[CURLOPT_CAINFO] = $this->trustedCertificates;
-        }
-
-        switch ($method) {
-            case 'HEAD' :
-
-                // do not read body with HEAD requests (this is necessary because cURL does not ignore the body with HEAD
-                // requests when the Content-Length header is given - which in turn is perfectly valid according to HTTP
-                // specs...) cURL does unfortunately return an error in this case ("transfer closed transfer closed with
-                // ... bytes remaining to read") this can be circumvented by explicitly telling cURL to ignore the
-                // response body
-                $curlSettings[CURLOPT_NOBODY] = true;
-                $curlSettings[CURLOPT_CUSTOMREQUEST] = 'HEAD';
-                break;
-
-            default:
-                $curlSettings[CURLOPT_CUSTOMREQUEST] = $method;
-                break;
-
-        }
-
-        // Adding HTTP headers
-        $nHeaders = array();
-        foreach($headers as $key=>$value) {
-
-            $nHeaders[] = $key . ': ' . $value;
-
-        }
-        $curlSettings[CURLOPT_HTTPHEADER] = $nHeaders;
-
-        if ($this->proxy) {
-            $curlSettings[CURLOPT_PROXY] = $this->proxy;
-        }
-
-        if ($this->userName && $this->authType) {
-            $curlType = 0;
-            if ($this->authType & self::AUTH_BASIC) {
-                $curlType |= CURLAUTH_BASIC;
-            }
-            if ($this->authType & self::AUTH_DIGEST) {
-                $curlType |= CURLAUTH_DIGEST;
-            }
-            $curlSettings[CURLOPT_HTTPAUTH] = $curlType;
-            $curlSettings[CURLOPT_USERPWD] = $this->userName . ':' . $this->password;
-        }
-
-        list(
-            $response,
-            $curlInfo,
-            $curlErrNo,
-            $curlError
-        ) = $this->curlRequest($url, $curlSettings);
-
-        $headerBlob = substr($response, 0, $curlInfo['header_size']);
-        $response = substr($response, $curlInfo['header_size']);
-
-        // In the case of 100 Continue, or redirects we'll have multiple lists
-        // of headers for each separate HTTP response. We can easily split this
-        // because they are separated by \r\n\r\n
-        $headerBlob = explode("\r\n\r\n", trim($headerBlob, "\r\n"));
-
-        // We only care about the last set of headers
-        $headerBlob = $headerBlob[count($headerBlob)-1];
-
-        // Splitting headers
-        $headerBlob = explode("\r\n", $headerBlob);
-
-        $headers = array();
-        foreach($headerBlob as $header) {
-            $parts = explode(':', $header, 2);
-            if (count($parts)==2) {
-                $headers[strtolower(trim($parts[0]))] = trim($parts[1]);
-            }
-        }
-
-        $response = array(
-            'body' => $response,
-            'statusCode' => $curlInfo['http_code'],
-            'headers' => $headers
-        );
-
-        if ($curlErrNo) {
-            throw new Exception('[CURL] Error while making request: ' . $curlError . ' (error code: ' . $curlErrNo . ')');
-        }
-
-        if ($response['statusCode']>=400) {
-            switch ($response['statusCode']) {
-                case 400 :
-                    throw new Exception\BadRequest('Bad request');
-                case 401 :
-                    throw new Exception\NotAuthenticated('Not authenticated');
-                case 402 :
-                    throw new Exception\PaymentRequired('Payment required');
-                case 403 :
-                    throw new Exception\Forbidden('Forbidden');
-                case 404:
-                    throw new Exception\NotFound('Resource not found.');
-                case 405 :
-                    throw new Exception\MethodNotAllowed('Method not allowed');
-                case 409 :
-                    throw new Exception\Conflict('Conflict');
-                case 412 :
-                    throw new Exception\PreconditionFailed('Precondition failed');
-                case 416 :
-                    throw new Exception\RequestedRangeNotSatisfiable('Requested Range Not Satisfiable');
-                case 500 :
-                    throw new Exception('Internal server error');
-                case 501 :
-                    throw new Exception\NotImplemented('Not Implemented');
-                case 507 :
-                    throw new Exception\InsufficientStorage('Insufficient storage');
-                default:
-                    throw new Exception('HTTP error response. (errorcode ' . $response['statusCode'] . ')');
-            }
-        }
-
-        return $response;
-
-    }
-
-    /**
-     * Wrapper for all curl functions.
-     *
-     * The only reason this was split out in a separate method, is so it
-     * becomes easier to unittest.
-     *
-     * @param string $url
-     * @param array $settings
-     * @return array
-     */
-    // @codeCoverageIgnoreStart
-    protected function curlRequest($url, $settings) {
-
-        $curl = curl_init($url);
-        curl_setopt_array($curl, $settings);
-
-        return array(
-            curl_exec($curl),
-            curl_getinfo($curl),
-            curl_errno($curl),
-            curl_error($curl)
-        );
-
-    }
-    // @codeCoverageIgnoreEnd
-
-    /**
-     * Returns the full url based on the given url (which may be relative). All
-     * urls are expanded based on the base url as given by the server.
-     *
-     * @param string $url
-     * @return string
-     */
-    protected function getAbsoluteUrl($url) {
-
-        // If the url starts with http:// or https://, the url is already absolute.
-        if (preg_match('/^http(s?):\/\//', $url)) {
-            return $url;
-        }
-
-        // If the url starts with a slash, we must calculate the url based off
-        // the root of the base url.
-        if (strpos($url,'/') === 0) {
-            $parts = parse_url($this->baseUri);
-            return $parts['scheme'] . '://' . $parts['host'] . (isset($parts['port'])?':' . $parts['port']:'') . $url;
-        }
-
-        // Otherwise...
-        return $this->baseUri . $url;
-
-    }
-
-    /**
-     * Parses a WebDAV multistatus response body
-     *
-     * This method returns an array with the following structure
-     *
-     * array(
-     *   'url/to/resource' => array(
-     *     '200' => array(
-     *        '{DAV:}property1' => 'value1',
-     *        '{DAV:}property2' => 'value2',
-     *     ),
-     *     '404' => array(
-     *        '{DAV:}property1' => null,
-     *        '{DAV:}property2' => null,
-     *     ),
-     *   )
-     *   'url/to/resource2' => array(
-     *      .. etc ..
-     *   )
-     * )
-     *
-     *
-     * @param string $body xml body
-     * @return array
-     */
-    public function parseMultiStatus($body) {
-
-        $body = XMLUtil::convertDAVNamespace($body);
-
-        // Fixes an XXE vulnerability on PHP versions older than 5.3.23 or
-        // 5.4.13.
-        $previous = libxml_disable_entity_loader(true);
-        $responseXML = simplexml_load_string($body, null, LIBXML_NOBLANKS | LIBXML_NOCDATA);
-        libxml_disable_entity_loader($previous);
-
-        if ($responseXML===false) {
-            throw new \InvalidArgumentException('The passed data is not valid XML');
-        }
-
-        $responseXML->registerXPathNamespace('d', 'urn:DAV');
-
-        $propResult = array();
-
-        foreach($responseXML->xpath('d:response') as $response) {
-            $response->registerXPathNamespace('d', 'urn:DAV');
-            $href = $response->xpath('d:href');
-            $href = (string)$href[0];
-
-            $properties = array();
-
-            foreach($response->xpath('d:propstat') as $propStat) {
-
-                $propStat->registerXPathNamespace('d', 'urn:DAV');
-                $status = $propStat->xpath('d:status');
-                list($httpVersion, $statusCode, $message) = explode(' ', (string)$status[0],3);
-
-                // Only using the propertymap for results with status 200.
-                $propertyMap = $statusCode==='200' ? $this->propertyMap : array();
-
-                $properties[$statusCode] = XMLUtil::parseProperties(dom_import_simplexml($propStat), $propertyMap);
-
-            }
-
-            $propResult[$href] = $properties;
-
-        }
-
-        return $propResult;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Collection.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Collection.php
deleted file mode 100644
index 0090a4d6ed..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Collection.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-/**
- * Collection class
- *
- * This is a helper class, that should aid in getting collections classes setup.
- * Most of its methods are implemented, and throw permission denied exceptions
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-abstract class Collection extends Node implements ICollection {
-
-    /**
-     * Returns a child object, by its name.
-     *
-     * This method makes use of the getChildren method to grab all the child
-     * nodes, and compares the name.
-     * Generally its wise to override this, as this can usually be optimized
-     *
-     * This method must throw Sabre\DAV\Exception\NotFound if the node does not
-     * exist.
-     *
-     * @param string $name
-     * @throws Exception\NotFound
-     * @return INode
-     */
-    public function getChild($name) {
-
-        foreach($this->getChildren() as $child) {
-
-            if ($child->getName()==$name) return $child;
-
-        }
-        throw new Exception\NotFound('File not found: ' . $name);
-
-    }
-
-    /**
-     * Checks is a child-node exists.
-     *
-     * It is generally a good idea to try and override this. Usually it can be optimized.
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function childExists($name) {
-
-        try {
-
-            $this->getChild($name);
-            return true;
-
-        } catch(Exception\NotFound $e) {
-
-            return false;
-
-        }
-
-    }
-
-    /**
-     * Creates a new file in the directory
-     *
-     * Data will either be supplied as a stream resource, or in certain cases
-     * as a string. Keep in mind that you may have to support either.
-     *
-     * After succesful creation of the file, you may choose to return the ETag
-     * of the new file here.
-     *
-     * The returned ETag must be surrounded by double-quotes (The quotes should
-     * be part of the actual string).
-     *
-     * If you cannot accurately determine the ETag, you should not return it.
-     * If you don't store the file exactly as-is (you're transforming it
-     * somehow) you should also not return an ETag.
-     *
-     * This means that if a subsequent GET to this new file does not exactly
-     * return the same contents of what was submitted here, you are strongly
-     * recommended to omit the ETag.
-     *
-     * @param string $name Name of the file
-     * @param resource|string $data Initial payload
-     * @return null|string
-     */
-    public function createFile($name, $data = null) {
-
-        throw new Exception\Forbidden('Permission denied to create file (filename ' . $name . ')');
-
-    }
-
-    /**
-     * Creates a new subdirectory
-     *
-     * @param string $name
-     * @throws Exception\Forbidden
-     * @return void
-     */
-    public function createDirectory($name) {
-
-        throw new Exception\Forbidden('Permission denied to create directory');
-
-    }
-
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception.php
deleted file mode 100644
index 22a319e9f7..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * SabreDAV base exception
- *
- * This is SabreDAV's base exception file, use this to implement your own exception.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-
-namespace Sabre\DAV;
-
-/**
- * Main Exception class.
- *
- * This class defines a getHTTPCode method, which should return the appropriate HTTP code for the Exception occurred.
- * The default for this is 500.
- *
- * This class also allows you to generate custom xml data for your exceptions. This will be displayed
- * in the 'error' element in the failing response.
- */
-class Exception extends \Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 500;
-
-    }
-
-    /**
-     * This method allows the exception to include additional information into the WebDAV error response
-     *
-     * @param Server $server
-     * @param \DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(Server $server,\DOMElement $errorNode) {
-
-
-    }
-
-    /**
-     * This method allows the exception to return any extra HTTP response headers.
-     *
-     * The headers must be returned as an array.
-     *
-     * @param Server $server
-     * @return array
-     */
-    public function getHTTPHeaders(Server $server) {
-
-        return array();
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/BadRequest.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/BadRequest.php
deleted file mode 100644
index d59727e3a2..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/BadRequest.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Exception;
-
-/**
- * BadRequest
- *
- * The BadRequest is thrown when the user submitted an invalid HTTP request
- * BadRequest
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class BadRequest extends \Sabre\DAV\Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 400;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/Conflict.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/Conflict.php
deleted file mode 100644
index cbb8fcf1ac..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/Conflict.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Exception;
-
-/**
- * Conflict
- *
- * A 409 Conflict is thrown when a user tried to make a directory over an existing
- * file or in a parent directory that doesn't exist.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Conflict extends \Sabre\DAV\Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 409;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/ConflictingLock.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/ConflictingLock.php
deleted file mode 100644
index 715870f465..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/ConflictingLock.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Exception;
-
-use Sabre\DAV;
-
-/**
- * ConflictingLock
- *
- * Similar to  the Locked exception, this exception thrown when a LOCK request
- * was made, on a resource which was already locked
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class ConflictingLock extends Locked {
-
-    /**
-     * This method allows the exception to include additional information into the WebDAV error response
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(DAV\Server $server, \DOMElement $errorNode) {
-
-        if ($this->lock) {
-            $error = $errorNode->ownerDocument->createElementNS('DAV:','d:no-conflicting-lock');
-            $errorNode->appendChild($error);
-            if (!is_object($this->lock)) var_dump($this->lock);
-            $error->appendChild($errorNode->ownerDocument->createElementNS('DAV:','d:href',$this->lock->uri));
-        }
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/FileNotFound.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/FileNotFound.php
deleted file mode 100644
index aa4844cb9b..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/FileNotFound.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Exception;
-
-/**
- * FileNotFound
- *
- * Deprecated: Warning, this class is deprecated and will be removed in a
- * future version of SabreDAV. Please use Sabre\DAV\Exception\NotFound instead.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @deprecated Use Sabre\DAV\Exception\NotFound instead
- * @license http://sabre.io/license/ Modified BSD License
- */
-class FileNotFound extends NotFound {
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/Forbidden.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/Forbidden.php
deleted file mode 100644
index 2dc620612d..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/Forbidden.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Exception;
-
-/**
- * Forbidden
- *
- * This exception is thrown whenever a user tries to do an operation he's not allowed to
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Forbidden extends \Sabre\DAV\Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 403;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/InsufficientStorage.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/InsufficientStorage.php
deleted file mode 100644
index f7e382c5a7..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/InsufficientStorage.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Exception;
-
-/**
- * InsufficientStorage
- *
- * This Exception can be thrown, when for example a harddisk is full or a quota is exceeded
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class InsufficientStorage extends \Sabre\DAV\Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 507;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/InvalidResourceType.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/InvalidResourceType.php
deleted file mode 100644
index 847ed47861..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/InvalidResourceType.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Exception;
-
-/**
- * InvalidResourceType
- *
- * This exception is thrown when the user tried to create a new collection, with
- * a special resourcetype value that was not recognized by the server.
- *
- * See RFC5689 section 3.3
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class InvalidResourceType extends Forbidden {
-
-    /**
-     * This method allows the exception to include additional information into the WebDAV error response
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(\Sabre\DAV\Server $server,\DOMElement $errorNode) {
-
-        $error = $errorNode->ownerDocument->createElementNS('DAV:','d:valid-resourcetype');
-        $errorNode->appendChild($error);
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/LengthRequired.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/LengthRequired.php
deleted file mode 100644
index 9487686dc4..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/LengthRequired.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Exception;
-
-use Sabre\DAV;
-
-/**
- * LengthRequired
- *
- * This exception is thrown when a request was made that required a
- * Content-Length header, but did not contain one.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class LengthRequired extends DAV\Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 411;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
deleted file mode 100644
index 37fc7f8dcc..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Exception;
-
-use Sabre\DAV;
-
-/**
- * LockTokenMatchesRequestUri
- *
- * This exception is thrown by UNLOCK if a supplied lock-token is invalid
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class LockTokenMatchesRequestUri extends Conflict {
-
-    /**
-     * Creates the exception
-     */
-    public function __construct() {
-
-        $this->message = 'The locktoken supplied does not match any locks on this entity';
-
-    }
-
-    /**
-     * This method allows the exception to include additional information into the WebDAV error response
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(DAV\Server $server,\DOMElement $errorNode) {
-
-        $error = $errorNode->ownerDocument->createElementNS('DAV:','d:lock-token-matches-request-uri');
-        $errorNode->appendChild($error);
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/Locked.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/Locked.php
deleted file mode 100644
index 2bee1b02f1..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/Locked.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Exception;
-
-use Sabre\DAV;
-
-/**
- * Locked
- *
- * The 423 is thrown when a client tried to access a resource that was locked, without supplying a valid lock token
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Locked extends DAV\Exception {
-
-    /**
-     * Lock information
-     *
-     * @var Sabre\DAV\Locks\LockInfo
-     */
-    protected $lock;
-
-    /**
-     * Creates the exception
-     *
-     * A LockInfo object should be passed if the user should be informed
-     * which lock actually has the file locked.
-     *
-     * @param DAV\Locks\LockInfo $lock
-     */
-    public function __construct(DAV\Locks\LockInfo $lock = null) {
-
-        $this->lock = $lock;
-
-    }
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 423;
-
-    }
-
-    /**
-     * This method allows the exception to include additional information into the WebDAV error response
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(DAV\Server $server,\DOMElement $errorNode) {
-
-        if ($this->lock) {
-            $error = $errorNode->ownerDocument->createElementNS('DAV:','d:lock-token-submitted');
-            $errorNode->appendChild($error);
-
-            $href = $errorNode->ownerDocument->createElementNS('DAV:','d:href');
-            $href->appendChild($errorNode->ownerDocument->createTextNode($this->lock->uri));
-            $error->appendChild(
-                $href
-            );
-        }
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/MethodNotAllowed.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/MethodNotAllowed.php
deleted file mode 100644
index 05970cfa85..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/MethodNotAllowed.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Exception;
-
-/**
- * MethodNotAllowed
- *
- * The 405 is thrown when a client tried to create a directory on an already existing directory
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class MethodNotAllowed extends \Sabre\DAV\Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 405;
-
-    }
-
-    /**
-     * This method allows the exception to return any extra HTTP response headers.
-     *
-     * The headers must be returned as an array.
-     *
-     * @param \Sabre\DAV\Server $server
-     * @return array
-     */
-    public function getHTTPHeaders(\Sabre\DAV\Server $server) {
-
-        $methods = $server->getAllowedMethods($server->getRequestUri());
-
-        return array(
-            'Allow' => strtoupper(implode(', ',$methods)),
-        );
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/NotAuthenticated.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/NotAuthenticated.php
deleted file mode 100644
index c082d489bb..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/NotAuthenticated.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Exception;
-
-use Sabre\DAV;
-
-/**
- * NotAuthenticated
- *
- * This exception is thrown when the client did not provide valid
- * authentication credentials.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class NotAuthenticated extends DAV\Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 401;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/NotFound.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/NotFound.php
deleted file mode 100644
index 83e699cb2b..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/NotFound.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Exception;
-
-/**
- * NotFound
- *
- * This Exception is thrown when a Node couldn't be found. It returns HTTP error code 404
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class NotFound extends \Sabre\DAV\Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 404;
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/NotImplemented.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/NotImplemented.php
deleted file mode 100644
index 5f031cb7f4..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/NotImplemented.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Exception;
-
-/**
- * NotImplemented
- *
- * This exception is thrown when the client tried to call an unsupported HTTP method or other feature
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class NotImplemented extends \Sabre\DAV\Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 501;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/PaymentRequired.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/PaymentRequired.php
deleted file mode 100644
index 3c256a0649..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/PaymentRequired.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Exception;
-
-use Sabre\DAV;
-
-/**
- * Payment Required
- *
- * The PaymentRequired exception may be thrown in a case where a user must pay
- * to access a certain resource or operation.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class PaymentRequired extends DAV\Exception {
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 402;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/PreconditionFailed.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/PreconditionFailed.php
deleted file mode 100644
index deb8a5bea5..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/PreconditionFailed.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Exception;
-
-use Sabre\DAV;
-
-/**
- * PreconditionFailed
- *
- * This exception is normally thrown when a client submitted a conditional request,
- * like for example an If, If-None-Match or If-Match header, which caused the HTTP
- * request to not execute (the condition of the header failed)
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class PreconditionFailed extends DAV\Exception {
-
-    /**
-     * When this exception is thrown, the header-name might be set.
-     *
-     * This allows the exception-catching code to determine which HTTP header
-     * caused the exception.
-     *
-     * @var string
-     */
-    public $header = null;
-
-    /**
-     * Create the exception
-     *
-     * @param string $message
-     * @param string $header
-     */
-    public function __construct($message, $header=null) {
-
-        parent::__construct($message);
-        $this->header = $header;
-
-    }
-
-    /**
-     * Returns the HTTP statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 412;
-
-    }
-
-    /**
-     * This method allows the exception to include additional information into the WebDAV error response
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(DAV\Server $server,\DOMElement $errorNode) {
-
-        if ($this->header) {
-            $prop = $errorNode->ownerDocument->createElement('s:header');
-            $prop->nodeValue = $this->header;
-            $errorNode->appendChild($prop);
-        }
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/ReportNotSupported.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/ReportNotSupported.php
deleted file mode 100644
index 8e32096e0f..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/ReportNotSupported.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Exception;
-
-use Sabre\DAV;
-
-/**
- * ReportNotSupported
- *
- * This exception is thrown when the client requested an unknown report through the REPORT method
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class ReportNotSupported extends Forbidden {
-
-    /**
-     * This method allows the exception to include additional information into the WebDAV error response
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(DAV\Server $server,\DOMElement $errorNode) {
-
-        $error = $errorNode->ownerDocument->createElementNS('DAV:','d:supported-report');
-        $errorNode->appendChild($error);
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
deleted file mode 100644
index 25002be6ae..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Exception;
-
-use Sabre\DAV;
-
-/**
- * RequestedRangeNotSatisfiable
- *
- * This exception is normally thrown when the user
- * request a range that is out of the entity bounds.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class RequestedRangeNotSatisfiable extends DAV\Exception {
-
-    /**
-     * returns the http statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 416;
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/ServiceUnavailable.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/ServiceUnavailable.php
deleted file mode 100644
index 59e433954b..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/ServiceUnavailable.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Exception;
-
-use Sabre\DAV;
-
-/**
- * ServiceUnavailable
- *
- * This exception is thrown in case the service
- * is currently not available (e.g. down for maintenance).
- *
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @license http://sabre.io/license/ Modified BSD License
- */
-class ServiceUnavailable extends DAV\Exception {
-
-	/**
-	 * Returns the HTTP statuscode for this exception
-	 *
-	 * @return int
-	 */
-	public function getHTTPCode() {
-
-		return 503;
-
-	}
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/UnsupportedMediaType.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/UnsupportedMediaType.php
deleted file mode 100644
index 46eea60df6..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Exception/UnsupportedMediaType.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Exception;
-
-/**
- * UnSupportedMediaType
- *
- * The 415 Unsupported Media Type status code is generally sent back when the client
- * tried to call an HTTP method, with a body the server didn't understand
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class UnsupportedMediaType extends \Sabre\DAV\Exception {
-
-    /**
-     * returns the http statuscode for this exception
-     *
-     * @return int
-     */
-    public function getHTTPCode() {
-
-        return 415;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/FS/Directory.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/FS/Directory.php
deleted file mode 100644
index 6fdd2aecf0..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/FS/Directory.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-
-namespace Sabre\DAV\FS;
-use Sabre\DAV;
-
-/**
- * Directory class
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Directory extends Node implements DAV\ICollection, DAV\IQuota {
-
-    /**
-     * Creates a new file in the directory
-     *
-     * Data will either be supplied as a stream resource, or in certain cases
-     * as a string. Keep in mind that you may have to support either.
-     *
-     * After successful creation of the file, you may choose to return the ETag
-     * of the new file here.
-     *
-     * The returned ETag must be surrounded by double-quotes (The quotes should
-     * be part of the actual string).
-     *
-     * If you cannot accurately determine the ETag, you should not return it.
-     * If you don't store the file exactly as-is (you're transforming it
-     * somehow) you should also not return an ETag.
-     *
-     * This means that if a subsequent GET to this new file does not exactly
-     * return the same contents of what was submitted here, you are strongly
-     * recommended to omit the ETag.
-     *
-     * @param string $name Name of the file
-     * @param resource|string $data Initial payload
-     * @return null|string
-     */
-    public function createFile($name, $data = null) {
-
-        $newPath = $this->path . '/' . $name;
-        file_put_contents($newPath,$data);
-
-    }
-
-    /**
-     * Creates a new subdirectory
-     *
-     * @param string $name
-     * @return void
-     */
-    public function createDirectory($name) {
-
-        $newPath = $this->path . '/' . $name;
-        mkdir($newPath);
-
-    }
-
-    /**
-     * Returns a specific child node, referenced by its name
-     *
-     * This method must throw DAV\Exception\NotFound if the node does not
-     * exist.
-     *
-     * @param string $name
-     * @throws DAV\Exception\NotFound
-     * @return DAV\INode
-     */
-    public function getChild($name) {
-
-        $path = $this->path . '/' . $name;
-
-        if (!file_exists($path)) throw new DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
-
-        if (is_dir($path)) {
-
-            return new Directory($path);
-
-        } else {
-
-            return new File($path);
-
-        }
-
-    }
-
-    /**
-     * Returns an array with all the child nodes
-     *
-     * @return DAV\INode[]
-     */
-    public function getChildren() {
-
-        $nodes = array();
-        foreach(scandir($this->path) as $node) if($node!='.' && $node!='..') $nodes[] = $this->getChild($node);
-        return $nodes;
-
-    }
-
-    /**
-     * Checks if a child exists.
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function childExists($name) {
-
-        $path = $this->path . '/' . $name;
-        return file_exists($path);
-
-    }
-
-    /**
-     * Deletes all files in this directory, and then itself
-     *
-     * @return void
-     */
-    public function delete() {
-
-        foreach($this->getChildren() as $child) $child->delete();
-        rmdir($this->path);
-
-    }
-
-    /**
-     * Returns available diskspace information
-     *
-     * @return array
-     */
-    public function getQuotaInfo() {
-
-        return array(
-            disk_total_space($this->path)-disk_free_space($this->path),
-            disk_free_space($this->path)
-            );
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/FS/File.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/FS/File.php
deleted file mode 100644
index d10370fae0..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/FS/File.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-namespace Sabre\DAV\FS;
-
-use Sabre\DAV;
-
-/**
- * File class
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class File extends Node implements DAV\IFile {
-
-    /**
-     * Updates the data
-     *
-     * @param resource $data
-     * @return void
-     */
-    public function put($data) {
-
-        file_put_contents($this->path,$data);
-
-    }
-
-    /**
-     * Returns the data
-     *
-     * @return string
-     */
-    public function get() {
-
-        return fopen($this->path,'r');
-
-    }
-
-    /**
-     * Delete the current file
-     *
-     * @return void
-     */
-    public function delete() {
-
-        unlink($this->path);
-
-    }
-
-    /**
-     * Returns the size of the node, in bytes
-     *
-     * @return int
-     */
-    public function getSize() {
-
-        return filesize($this->path);
-
-    }
-
-    /**
-     * Returns the ETag for a file
-     *
-     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
-     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
-     *
-     * Return null if the ETag can not effectively be determined
-     *
-     * @return mixed
-     */
-    public function getETag() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns the mime-type for a file
-     *
-     * If null is returned, we'll assume application/octet-stream
-     *
-     * @return mixed
-     */
-    public function getContentType() {
-
-        return null;
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/FS/Node.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/FS/Node.php
deleted file mode 100644
index 605fa3c826..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/FS/Node.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-namespace Sabre\DAV\FS;
-
-use Sabre\DAV;
-
-/**
- * Base node-class
- *
- * The node class implements the method used by both the File and the Directory classes
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-abstract class Node implements DAV\INode {
-
-    /**
-     * The path to the current node
-     *
-     * @var string
-     */
-    protected $path;
-
-    /**
-     * Sets up the node, expects a full path name
-     *
-     * @param string $path
-     */
-    public function __construct($path) {
-
-        $this->path = $path;
-
-    }
-
-
-
-    /**
-     * Returns the name of the node
-     *
-     * @return string
-     */
-    public function getName() {
-
-        list(, $name)  = DAV\URLUtil::splitPath($this->path);
-        return $name;
-
-    }
-
-    /**
-     * Renames the node
-     *
-     * @param string $name The new name
-     * @return void
-     */
-    public function setName($name) {
-
-        list($parentPath, ) = DAV\URLUtil::splitPath($this->path);
-        list(, $newName) = DAV\URLUtil::splitPath($name);
-
-        $newPath = $parentPath . '/' . $newName;
-        rename($this->path,$newPath);
-
-        $this->path = $newPath;
-
-    }
-
-
-
-    /**
-     * Returns the last modification time, as a unix timestamp
-     *
-     * @return int
-     */
-    public function getLastModified() {
-
-        return filemtime($this->path);
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/FSExt/Directory.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/FSExt/Directory.php
deleted file mode 100644
index da3d2cc69b..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/FSExt/Directory.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-
-namespace Sabre\DAV\FSExt;
-
-use Sabre\DAV;
-
-/**
- * Directory class
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Directory extends Node implements DAV\ICollection, DAV\IQuota {
-
-    /**
-     * Creates a new file in the directory
-     *
-     * Data will either be supplied as a stream resource, or in certain cases
-     * as a string. Keep in mind that you may have to support either.
-     *
-     * After successful creation of the file, you may choose to return the ETag
-     * of the new file here.
-     *
-     * The returned ETag must be surrounded by double-quotes (The quotes should
-     * be part of the actual string).
-     *
-     * If you cannot accurately determine the ETag, you should not return it.
-     * If you don't store the file exactly as-is (you're transforming it
-     * somehow) you should also not return an ETag.
-     *
-     * This means that if a subsequent GET to this new file does not exactly
-     * return the same contents of what was submitted here, you are strongly
-     * recommended to omit the ETag.
-     *
-     * @param string $name Name of the file
-     * @param resource|string $data Initial payload
-     * @return null|string
-     */
-    public function createFile($name, $data = null) {
-
-        // We're not allowing dots
-        if ($name=='.' || $name=='..') throw new DAV\Exception\Forbidden('Permission denied to . and ..');
-        $newPath = $this->path . '/' . $name;
-        file_put_contents($newPath,$data);
-
-        return '"' . md5_file($newPath) . '"';
-
-    }
-
-    /**
-     * Creates a new subdirectory
-     *
-     * @param string $name
-     * @return void
-     */
-    public function createDirectory($name) {
-
-        // We're not allowing dots
-        if ($name=='.' || $name=='..') throw new DAV\Exception\Forbidden('Permission denied to . and ..');
-        $newPath = $this->path . '/' . $name;
-        mkdir($newPath);
-
-    }
-
-    /**
-     * Returns a specific child node, referenced by its name
-     *
-     * This method must throw Sabre\DAV\Exception\NotFound if the node does not
-     * exist.
-     *
-     * @param string $name
-     * @throws DAV\Exception\NotFound
-     * @return DAV\INode
-     */
-    public function getChild($name) {
-
-        $path = $this->path . '/' . $name;
-
-        if (!file_exists($path)) throw new DAV\Exception\NotFound('File could not be located');
-        if ($name=='.' || $name=='..') throw new DAV\Exception\Forbidden('Permission denied to . and ..');
-
-        if (is_dir($path)) {
-
-            return new Directory($path);
-
-        } else {
-
-            return new File($path);
-
-        }
-
-    }
-
-    /**
-     * Checks if a child exists.
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function childExists($name) {
-
-        if ($name=='.' || $name=='..')
-            throw new DAV\Exception\Forbidden('Permission denied to . and ..');
-
-        $path = $this->path . '/' . $name;
-        return file_exists($path);
-
-    }
-
-    /**
-     * Returns an array with all the child nodes
-     *
-     * @return DAV\INode[]
-     */
-    public function getChildren() {
-
-        $nodes = array();
-        foreach(scandir($this->path) as $node) if($node!='.' && $node!='..' && $node!='.sabredav') $nodes[] = $this->getChild($node);
-        return $nodes;
-
-    }
-
-    /**
-     * Deletes all files in this directory, and then itself
-     *
-     * @return bool
-     */
-    public function delete() {
-
-        // Deleting all children
-        foreach($this->getChildren() as $child) $child->delete();
-
-        // Removing resource info, if its still around
-        if (file_exists($this->path . '/.sabredav')) unlink($this->path . '/.sabredav');
-
-        // Removing the directory itself
-        rmdir($this->path);
-
-        return parent::delete();
-
-    }
-
-    /**
-     * Returns available diskspace information
-     *
-     * @return array
-     */
-    public function getQuotaInfo() {
-
-        return array(
-            disk_total_space($this->path)-disk_free_space($this->path),
-            disk_free_space($this->path)
-            );
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/FSExt/File.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/FSExt/File.php
deleted file mode 100644
index 6588fad7eb..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/FSExt/File.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-namespace Sabre\DAV\FSExt;
-use Sabre\DAV;
-
-/**
- * File class
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class File extends Node implements DAV\PartialUpdate\IPatchSupport {
-
-    /**
-     * Updates the data
-     *
-     * data is a readable stream resource.
-     *
-     * @param resource|string $data
-     * @return string
-     */
-    public function put($data) {
-
-        file_put_contents($this->path,$data);
-        return '"' . md5_file($this->path) . '"';
-
-    }
-
-    /**
-     * Updates the file based on a range specification.
-     *
-     * The first argument is the data, which is either a readable stream
-     * resource or a string.
-     *
-     * The second argument is the type of update we're doing.
-     * This is either:
-     * * 1. append
-     * * 2. update based on a start byte
-     * * 3. update based on an end byte
-     *;
-     * The third argument is the start or end byte.
-     *
-     * After a successful put operation, you may choose to return an ETag. The
-     * etag must always be surrounded by double-quotes. These quotes must
-     * appear in the actual string you're returning.
-     *
-     * Clients may use the ETag from a PUT request to later on make sure that
-     * when they update the file, the contents haven't changed in the mean
-     * time.
-     *
-     * @param resource|string $data
-     * @param int $rangeType
-     * @param int $offset
-     * @return string|null
-     */
-    public function patch($data, $rangeType, $offset = null) {
-
-        switch($rangeType) {
-            case 1 :
-                $f = fopen($this->path, 'a');
-                break;
-            case 2 :
-                $f = fopen($this->path, 'c');
-                fseek($f,$offset);
-                break;
-            case 3 :
-                $f = fopen($this->path, 'c');
-                fseek($f, $offset, SEEK_END);
-                break;
-        }
-        if (is_string($data)) {
-            fwrite($f, $data);
-        } else {
-            stream_copy_to_stream($data,$f);
-        }
-        fclose($f);
-        return '"' . md5_file($this->path) . '"';
-
-    }
-
-    /**
-     * Returns the data
-     *
-     * @return resource
-     */
-    public function get() {
-
-        return fopen($this->path,'r');
-
-    }
-
-    /**
-     * Delete the current file
-     *
-     * @return bool
-     */
-    public function delete() {
-
-        unlink($this->path);
-        return parent::delete();
-
-    }
-
-    /**
-     * Returns the ETag for a file
-     *
-     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
-     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
-     *
-     * Return null if the ETag can not effectively be determined
-     *
-     * @return string|null
-     */
-    public function getETag() {
-
-        return '"' . md5_file($this->path). '"';
-
-    }
-
-    /**
-     * Returns the mime-type for a file
-     *
-     * If null is returned, we'll assume application/octet-stream
-     *
-     * @return string|null
-     */
-    public function getContentType() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns the size of the file, in bytes
-     *
-     * @return int
-     */
-    public function getSize() {
-
-        return filesize($this->path);
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/FSExt/Node.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/FSExt/Node.php
deleted file mode 100644
index 0e11582f34..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/FSExt/Node.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-
-namespace Sabre\DAV\FSExt;
-
-use Sabre\DAV;
-
-/**
- * Base node-class
- *
- * The node class implements the method used by both the File and the Directory classes
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-abstract class Node extends DAV\FS\Node implements DAV\IProperties {
-
-    /**
-     * Updates properties on this node,
-     *
-     * @param array $properties
-     * @see Sabre\DAV\IProperties::updateProperties
-     * @return bool|array
-     */
-    public function updateProperties($properties) {
-
-        $resourceData = $this->getResourceData();
-
-        foreach($properties as $propertyName=>$propertyValue) {
-
-            // If it was null, we need to delete the property
-            if (is_null($propertyValue)) {
-                if (isset($resourceData['properties'][$propertyName])) {
-                    unset($resourceData['properties'][$propertyName]);
-                }
-            } else {
-                $resourceData['properties'][$propertyName] = $propertyValue;
-            }
-
-        }
-
-        $this->putResourceData($resourceData);
-        return true;
-    }
-
-    /**
-     * Returns a list of properties for this nodes.;
-     *
-     * The properties list is a list of propertynames the client requested, encoded as xmlnamespace#tagName, for example: http://www.example.org/namespace#author
-     * If the array is empty, all properties should be returned
-     *
-     * @param array $properties
-     * @return array
-     */
-    function getProperties($properties) {
-
-        $resourceData = $this->getResourceData();
-
-        // if the array was empty, we need to return everything
-        if (!$properties) return $resourceData['properties'];
-
-        $props = array();
-        foreach($properties as $property) {
-            if (isset($resourceData['properties'][$property])) $props[$property] = $resourceData['properties'][$property];
-        }
-
-        return $props;
-
-    }
-
-    /**
-     * Returns the path to the resource file
-     *
-     * @return string
-     */
-    protected function getResourceInfoPath() {
-
-        list($parentDir) = DAV\URLUtil::splitPath($this->path);
-        return $parentDir . '/.sabredav';
-
-    }
-
-    /**
-     * Returns all the stored resource information
-     *
-     * @return array
-     */
-    protected function getResourceData() {
-
-        $path = $this->getResourceInfoPath();
-        if (!file_exists($path)) return array('properties' => array());
-
-        // opening up the file, and creating a shared lock
-        $handle = fopen($path,'r');
-        flock($handle,LOCK_SH);
-        $data = '';
-
-        // Reading data until the eof
-        while(!feof($handle)) {
-            $data.=fread($handle,8192);
-        }
-
-        // We're all good
-        fclose($handle);
-
-        // Unserializing and checking if the resource file contains data for this file
-        $data = unserialize($data);
-        if (!isset($data[$this->getName()])) {
-            return array('properties' => array());
-        }
-
-        $data = $data[$this->getName()];
-        if (!isset($data['properties'])) $data['properties'] = array();
-        return $data;
-
-    }
-
-    /**
-     * Updates the resource information
-     *
-     * @param array $newData
-     * @return void
-     */
-    protected function putResourceData(array $newData) {
-
-        $path = $this->getResourceInfoPath();
-
-        // opening up the file, and creating a shared lock
-        $handle = fopen($path,'a+');
-        flock($handle,LOCK_EX);
-        $data = '';
-
-        rewind($handle);
-
-        // Reading data until the eof
-        while(!feof($handle)) {
-            $data.=fread($handle,8192);
-        }
-
-        // Unserializing and checking if the resource file contains data for this file
-        $data = unserialize($data);
-        $data[$this->getName()] = $newData;
-        ftruncate($handle,0);
-        rewind($handle);
-
-        fwrite($handle,serialize($data));
-        fclose($handle);
-
-    }
-
-    /**
-     * Renames the node
-     *
-     * @param string $name The new name
-     * @return void
-     */
-    public function setName($name) {
-
-        list($parentPath, ) = DAV\URLUtil::splitPath($this->path);
-        list(, $newName) = DAV\URLUtil::splitPath($name);
-        $newPath = $parentPath . '/' . $newName;
-
-        // We're deleting the existing resourcedata, and recreating it
-        // for the new path.
-        $resourceData = $this->getResourceData();
-        $this->deleteResourceData();
-
-        rename($this->path,$newPath);
-        $this->path = $newPath;
-        $this->putResourceData($resourceData);
-
-
-    }
-
-    /**
-     * @return bool
-     */
-    public function deleteResourceData() {
-
-        // When we're deleting this node, we also need to delete any resource information
-        $path = $this->getResourceInfoPath();
-        if (!file_exists($path)) return true;
-
-        // opening up the file, and creating a shared lock
-        $handle = fopen($path,'a+');
-        flock($handle,LOCK_EX);
-        $data = '';
-
-        rewind($handle);
-
-        // Reading data until the eof
-        while(!feof($handle)) {
-            $data.=fread($handle,8192);
-        }
-
-        // Unserializing and checking if the resource file contains data for this file
-        $data = unserialize($data);
-        if (isset($data[$this->getName()])) unset($data[$this->getName()]);
-        ftruncate($handle,0);
-        rewind($handle);
-        fwrite($handle,serialize($data));
-        fclose($handle);
-
-        return true;
-    }
-
-    public function delete() {
-
-        return $this->deleteResourceData();
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/File.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/File.php
deleted file mode 100644
index af8ce735fd..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/File.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-/**
- * File class
- *
- * This is a helper class, that should aid in getting file classes setup.
- * Most of its methods are implemented, and throw permission denied exceptions
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-abstract class File extends Node implements IFile {
-
-    /**
-     * Updates the data
-     *
-     * data is a readable stream resource.
-     *
-     * @param resource $data
-     * @return void
-     */
-    public function put($data) {
-
-        throw new Exception\Forbidden('Permission denied to change data');
-
-    }
-
-    /**
-     * Returns the data
-     *
-     * This method may either return a string or a readable stream resource
-     *
-     * @return mixed
-     */
-    public function get() {
-
-        throw new Exception\Forbidden('Permission denied to read this file');
-
-    }
-
-    /**
-     * Returns the size of the file, in bytes.
-     *
-     * @return int
-     */
-    public function getSize() {
-
-        return 0;
-
-    }
-
-    /**
-     * Returns the ETag for a file
-     *
-     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
-     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
-     *
-     * Return null if the ETag can not effectively be determined
-     *
-     * @return string|null
-     */
-    public function getETag() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns the mime-type for a file
-     *
-     * If null is returned, we'll assume application/octet-stream
-     *
-     * @return string|null
-     */
-    public function getContentType() {
-
-        return null;
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/ICollection.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/ICollection.php
deleted file mode 100644
index c38d5e5531..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/ICollection.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-/**
- * The ICollection Interface
- *
- * This interface should be implemented by each class that represents a collection
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface ICollection extends INode {
-
-    /**
-     * Creates a new file in the directory
-     *
-     * Data will either be supplied as a stream resource, or in certain cases
-     * as a string. Keep in mind that you may have to support either.
-     *
-     * After successful creation of the file, you may choose to return the ETag
-     * of the new file here.
-     *
-     * The returned ETag must be surrounded by double-quotes (The quotes should
-     * be part of the actual string).
-     *
-     * If you cannot accurately determine the ETag, you should not return it.
-     * If you don't store the file exactly as-is (you're transforming it
-     * somehow) you should also not return an ETag.
-     *
-     * This means that if a subsequent GET to this new file does not exactly
-     * return the same contents of what was submitted here, you are strongly
-     * recommended to omit the ETag.
-     *
-     * @param string $name Name of the file
-     * @param resource|string $data Initial payload
-     * @return null|string
-     */
-    function createFile($name, $data = null);
-
-    /**
-     * Creates a new subdirectory
-     *
-     * @param string $name
-     * @return void
-     */
-    function createDirectory($name);
-
-    /**
-     * Returns a specific child node, referenced by its name
-     *
-     * This method must throw Sabre\DAV\Exception\NotFound if the node does not
-     * exist.
-     *
-     * @param string $name
-     * @return DAV\INode
-     */
-    function getChild($name);
-
-    /**
-     * Returns an array with all the child nodes
-     *
-     * @return DAV\INode[]
-     */
-    function getChildren();
-
-    /**
-     * Checks if a child-node with the specified name exists
-     *
-     * @param string $name
-     * @return bool
-     */
-    function childExists($name);
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/IExtendedCollection.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/IExtendedCollection.php
deleted file mode 100644
index 8d37484676..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/IExtendedCollection.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-/**
- * The IExtendedCollection interface.
- *
- * This interface can be used to create special-type of collection-resources
- * as defined by RFC 5689.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface IExtendedCollection extends ICollection {
-
-    /**
-     * Creates a new collection
-     *
-     * @param string $name
-     * @param array $resourceType
-     * @param array $properties
-     * @return void
-     */
-    function createExtendedCollection($name, array $resourceType, array $properties);
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/IFile.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/IFile.php
deleted file mode 100644
index 6245d3fad5..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/IFile.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-/**
- * This interface represents a file in the directory tree
- *
- * A file is a bit of a broad definition. In general it implies that on
- * this specific node a PUT or GET method may be performed, to either update,
- * or retrieve the contents of the file.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface IFile extends INode {
-
-    /**
-     * Updates the data
-     *
-     * The data argument is a readable stream resource.
-     *
-     * After a succesful put operation, you may choose to return an ETag. The
-     * etag must always be surrounded by double-quotes. These quotes must
-     * appear in the actual string you're returning.
-     *
-     * Clients may use the ETag from a PUT request to later on make sure that
-     * when they update the file, the contents haven't changed in the mean
-     * time.
-     *
-     * If you don't plan to store the file byte-by-byte, and you return a
-     * different object on a subsequent GET you are strongly recommended to not
-     * return an ETag, and just return null.
-     *
-     * @param resource $data
-     * @return string|null
-     */
-    function put($data);
-
-    /**
-     * Returns the data
-     *
-     * This method may either return a string or a readable stream resource
-     *
-     * @return mixed
-     */
-    function get();
-
-    /**
-     * Returns the mime-type for a file
-     *
-     * If null is returned, we'll assume application/octet-stream
-     *
-     * @return string|null
-     */
-    function getContentType();
-
-    /**
-     * Returns the ETag for a file
-     *
-     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
-     *
-     * Return null if the ETag can not effectively be determined
-     *
-     * @return void
-     */
-    function getETag();
-
-    /**
-     * Returns the size of the node, in bytes
-     *
-     * @return int
-     */
-    function getSize();
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/INode.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/INode.php
deleted file mode 100644
index e183c84be4..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/INode.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-/**
- * The INode interface is the base interface, and the parent class of both ICollection and IFile
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface INode {
-
-    /**
-     * Deleted the current node
-     *
-     * @return void
-     */
-    function delete();
-
-    /**
-     * Returns the name of the node.
-     *
-     * This is used to generate the url.
-     *
-     * @return string
-     */
-    function getName();
-
-    /**
-     * Renames the node
-     *
-     * @param string $name The new name
-     * @return void
-     */
-    function setName($name);
-
-    /**
-     * Returns the last modification time, as a unix timestamp
-     *
-     * @return int
-     */
-    function getLastModified();
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/IProperties.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/IProperties.php
deleted file mode 100644
index f3601575b5..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/IProperties.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-/**
- * IProperties interface
- *
- * Implement this interface to support custom WebDAV properties requested and sent from clients.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface IProperties extends INode {
-
-    /**
-     * Updates properties on this node,
-     *
-     * The properties array uses the propertyName in clark-notation as key,
-     * and the array value for the property value. In the case a property
-     * should be deleted, the property value will be null.
-     *
-     * This method must be atomic. If one property cannot be changed, the
-     * entire operation must fail.
-     *
-     * If the operation was successful, true can be returned.
-     * If the operation failed, false can be returned.
-     *
-     * Deletion of a non-existent property is always successful.
-     *
-     * Lastly, it is optional to return detailed information about any
-     * failures. In this case an array should be returned with the following
-     * structure:
-     *
-     * array(
-     *   403 => array(
-     *      '{DAV:}displayname' => null,
-     *   ),
-     *   424 => array(
-     *      '{DAV:}owner' => null,
-     *   )
-     * )
-     *
-     * In this example it was forbidden to update {DAV:}displayname.
-     * (403 Forbidden), which in turn also caused {DAV:}owner to fail
-     * (424 Failed Dependency) because the request needs to be atomic.
-     *
-     * @param array $mutations
-     * @return bool|array
-     */
-    function updateProperties($mutations);
-
-    /**
-     * Returns a list of properties for this nodes.
-     *
-     * The properties list is a list of propertynames the client requested,
-     * encoded in clark-notation {xmlnamespace}tagname
-     *
-     * If the array is empty, it means 'all properties' were requested.
-     *
-     * Note that it's fine to liberally give properties back, instead of
-     * conforming to the list of requested properties.
-     * The Server class will filter out the extra.
-     *
-     * @param array $properties
-     * @return void
-     */
-    function getProperties($properties);
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/IQuota.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/IQuota.php
deleted file mode 100644
index 988df3d062..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/IQuota.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-/**
- * IQuota interface
- *
- * Implement this interface to add the ability to return quota information. The ObjectTree
- * will check for quota information on any given node. If the information is not available it will
- * attempt to fetch the information from the root node.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface IQuota extends ICollection {
-
-    /**
-     * Returns the quota information
-     *
-     * This method MUST return an array with 2 values, the first being the total used space,
-     * the second the available space (in bytes)
-     */
-    function getQuotaInfo();
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Locks/Backend/AbstractBackend.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Locks/Backend/AbstractBackend.php
deleted file mode 100644
index b2c7b983ad..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Locks/Backend/AbstractBackend.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Locks\Backend;
-
-use Sabre\DAV\Locks;
-
-/**
- * This is an Abstract clas for lock backends.
- *
- * Currently this backend has no function, but it exists for consistency, and
- * to ensure that if default code is required in the backend, there will be a
- * non-bc-breaking way to do so.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-abstract class AbstractBackend implements BackendInterface {
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Locks/Backend/BackendInterface.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Locks/Backend/BackendInterface.php
deleted file mode 100644
index bae666b2f7..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Locks/Backend/BackendInterface.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Locks\Backend;
-
-use Sabre\DAV\Locks;
-
-/**
- * If you are defining your own Locks backend, you must implement this
- * interface.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface BackendInterface {
-
-    /**
-     * Returns a list of Sabre\DAV\Locks\LockInfo objects
-     *
-     * This method should return all the locks for a particular uri, including
-     * locks that might be set on a parent uri.
-     *
-     * If returnChildLocks is set to true, this method should also look for
-     * any locks in the subtree of the uri for locks.
-     *
-     * @param string $uri
-     * @param bool $returnChildLocks
-     * @return array
-     */
-    public function getLocks($uri, $returnChildLocks);
-
-    /**
-     * Locks a uri
-     *
-     * @param string $uri
-     * @param Locks\LockInfo $lockInfo
-     * @return bool
-     */
-    public function lock($uri,Locks\LockInfo $lockInfo);
-
-    /**
-     * Removes a lock from a uri
-     *
-     * @param string $uri
-     * @param Locks\LockInfo $lockInfo
-     * @return bool
-     */
-    public function unlock($uri,Locks\LockInfo $lockInfo);
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Locks/Backend/FS.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Locks/Backend/FS.php
deleted file mode 100644
index a9b0aaaaf6..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Locks/Backend/FS.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Locks\Backend;
-
-use Sabre\DAV\Locks\LockInfo;
-
-/**
- * This Lock Backend stores all its data in the filesystem in separate file per
- * node.
- *
- * This Lock Manager is now deprecated. It has a bug that allows parent
- * collections to be deletes when children deeper in the tree are locked.
- *
- * This also means that using this backend means you will not pass the Neon
- * Litmus test.
- *
- * You are recommended to use either the PDO or the File backend instead.
- *
- * @deprecated
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class FS extends AbstractBackend {
-
-    /**
-     * The default data directory
-     *
-     * @var string
-     */
-    private $dataDir;
-
-    public function __construct($dataDir) {
-
-        $this->dataDir = $dataDir;
-
-    }
-
-    protected function getFileNameForUri($uri) {
-
-        return $this->dataDir . '/sabredav_' . md5($uri) . '.locks';
-
-    }
-
-
-    /**
-     * Returns a list of Sabre\DAV\Locks\LockInfo objects
-     *
-     * This method should return all the locks for a particular uri, including
-     * locks that might be set on a parent uri.
-     *
-     * If returnChildLocks is set to true, this method should also look for
-     * any locks in the subtree of the uri for locks.
-     *
-     * @param string $uri
-     * @param bool $returnChildLocks
-     * @return array
-     */
-    public function getLocks($uri, $returnChildLocks) {
-
-        $lockList = array();
-        $currentPath = '';
-
-        foreach(explode('/',$uri) as $uriPart) {
-
-            // weird algorithm that can probably be improved, but we're traversing the path top down
-            if ($currentPath) $currentPath.='/';
-            $currentPath.=$uriPart;
-
-            $uriLocks = $this->getData($currentPath);
-
-            foreach($uriLocks as $uriLock) {
-
-                // Unless we're on the leaf of the uri-tree we should ignore locks with depth 0
-                if($uri==$currentPath || $uriLock->depth!=0) {
-                    $uriLock->uri = $currentPath;
-                    $lockList[] = $uriLock;
-                }
-
-            }
-
-        }
-
-        // Checking if we can remove any of these locks
-        foreach($lockList as $k=>$lock) {
-            if (time() > $lock->timeout + $lock->created) unset($lockList[$k]);
-        }
-        return $lockList;
-
-    }
-
-    /**
-     * Locks a uri
-     *
-     * @param string $uri
-     * @param LockInfo $lockInfo
-     * @return bool
-     */
-    public function lock($uri, LockInfo $lockInfo) {
-
-        // We're making the lock timeout 30 minutes
-        $lockInfo->timeout = 1800;
-        $lockInfo->created = time();
-
-        $locks = $this->getLocks($uri,false);
-        foreach($locks as $k=>$lock) {
-            if ($lock->token == $lockInfo->token) unset($locks[$k]);
-        }
-        $locks[] = $lockInfo;
-        $this->putData($uri,$locks);
-        return true;
-
-    }
-
-    /**
-     * Removes a lock from a uri
-     *
-     * @param string $uri
-     * @param LockInfo $lockInfo
-     * @return bool
-     */
-    public function unlock($uri, LockInfo $lockInfo) {
-
-        $locks = $this->getLocks($uri,false);
-        foreach($locks as $k=>$lock) {
-
-            if ($lock->token == $lockInfo->token) {
-
-                unset($locks[$k]);
-                $this->putData($uri,$locks);
-                return true;
-
-            }
-        }
-        return false;
-
-    }
-
-    /**
-     * Returns the stored data for a uri
-     *
-     * @param string $uri
-     * @return array
-     */
-    protected function getData($uri) {
-
-        $path = $this->getFilenameForUri($uri);
-        if (!file_exists($path)) return array();
-
-        // opening up the file, and creating a shared lock
-        $handle = fopen($path,'r');
-        flock($handle,LOCK_SH);
-        $data = '';
-
-        // Reading data until the eof
-        while(!feof($handle)) {
-            $data.=fread($handle,8192);
-        }
-
-        // We're all good
-        fclose($handle);
-
-        // Unserializing and checking if the resource file contains data for this file
-        $data = unserialize($data);
-        if (!$data) return array();
-        return $data;
-
-    }
-
-    /**
-     * Updates the lock information
-     *
-     * @param string $uri
-     * @param array $newData
-     * @return void
-     */
-    protected function putData($uri,array $newData) {
-
-        $path = $this->getFileNameForUri($uri);
-
-        // opening up the file, and creating a shared lock
-        $handle = fopen($path,'a+');
-        flock($handle,LOCK_EX);
-        ftruncate($handle,0);
-        rewind($handle);
-
-        fwrite($handle,serialize($newData));
-        fclose($handle);
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Locks/Backend/File.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Locks/Backend/File.php
deleted file mode 100644
index 9ac7e06b29..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Locks/Backend/File.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Locks\Backend;
-
-use Sabre\DAV\Locks\LockInfo;
-
-/**
- * The Lock manager allows you to handle all file-locks centrally.
- *
- * This Lock Manager stores all its data in a single file.
- *
- * Note that this is not nearly as robust as a database, you are encouraged
- * to use the PDO backend instead.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class File extends AbstractBackend {
-
-    /**
-     * The storage file
-     *
-     * @var string
-     */
-    private $locksFile;
-
-    /**
-     * Constructor
-     *
-     * @param string $locksFile path to file
-     */
-    public function __construct($locksFile) {
-
-        $this->locksFile = $locksFile;
-
-    }
-
-    /**
-     * Returns a list of Sabre\DAV\Locks\LockInfo objects
-     *
-     * This method should return all the locks for a particular uri, including
-     * locks that might be set on a parent uri.
-     *
-     * If returnChildLocks is set to true, this method should also look for
-     * any locks in the subtree of the uri for locks.
-     *
-     * @param string $uri
-     * @param bool $returnChildLocks
-     * @return array
-     */
-    public function getLocks($uri, $returnChildLocks) {
-
-        $newLocks = array();
-
-        $locks = $this->getData();
-
-        foreach($locks as $lock) {
-
-            if ($lock->uri === $uri ||
-                //deep locks on parents
-                ($lock->depth!=0 && strpos($uri, $lock->uri . '/')===0) ||
-
-                // locks on children
-                ($returnChildLocks && (strpos($lock->uri, $uri . '/')===0)) ) {
-
-                $newLocks[] = $lock;
-
-            }
-
-        }
-
-        // Checking if we can remove any of these locks
-        foreach($newLocks as $k=>$lock) {
-            if (time() > $lock->timeout + $lock->created) unset($newLocks[$k]);
-        }
-        return $newLocks;
-
-    }
-
-    /**
-     * Locks a uri
-     *
-     * @param string $uri
-     * @param LockInfo $lockInfo
-     * @return bool
-     */
-    public function lock($uri, LockInfo $lockInfo) {
-
-        // We're making the lock timeout 30 minutes
-        $lockInfo->timeout = 1800;
-        $lockInfo->created = time();
-        $lockInfo->uri = $uri;
-
-        $locks = $this->getData();
-
-        foreach($locks as $k=>$lock) {
-            if (
-                ($lock->token == $lockInfo->token) ||
-                (time() > $lock->timeout + $lock->created)
-            ) {
-                unset($locks[$k]);
-            }
-        }
-        $locks[] = $lockInfo;
-        $this->putData($locks);
-        return true;
-
-    }
-
-    /**
-     * Removes a lock from a uri
-     *
-     * @param string $uri
-     * @param LockInfo $lockInfo
-     * @return bool
-     */
-    public function unlock($uri, LockInfo $lockInfo) {
-
-        $locks = $this->getData();
-        foreach($locks as $k=>$lock) {
-
-            if ($lock->token == $lockInfo->token) {
-
-                unset($locks[$k]);
-                $this->putData($locks);
-                return true;
-
-            }
-        }
-        return false;
-
-    }
-
-    /**
-     * Loads the lockdata from the filesystem.
-     *
-     * @return array
-     */
-    protected function getData() {
-
-        if (!file_exists($this->locksFile)) return array();
-
-        // opening up the file, and creating a shared lock
-        $handle = fopen($this->locksFile,'r');
-        flock($handle,LOCK_SH);
-
-        // Reading data until the eof
-        $data = stream_get_contents($handle);
-
-        // We're all good
-        fclose($handle);
-
-        // Unserializing and checking if the resource file contains data for this file
-        $data = unserialize($data);
-        if (!$data) return array();
-        return $data;
-
-    }
-
-    /**
-     * Saves the lockdata
-     *
-     * @param array $newData
-     * @return void
-     */
-    protected function putData(array $newData) {
-
-        // opening up the file, and creating an exclusive lock
-        $handle = fopen($this->locksFile,'a+');
-        flock($handle,LOCK_EX);
-
-        // We can only truncate and rewind once the lock is acquired.
-        ftruncate($handle,0);
-        rewind($handle);
-
-        fwrite($handle,serialize($newData));
-        fclose($handle);
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Locks/Backend/PDO.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Locks/Backend/PDO.php
deleted file mode 100644
index ebaeef860c..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Locks/Backend/PDO.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Locks\Backend;
-
-use Sabre\DAV\Locks\LockInfo;
-
-/**
- * The Lock manager allows you to handle all file-locks centrally.
- *
- * This Lock Manager stores all its data in a database. You must pass a PDO
- * connection object in the constructor.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class PDO extends AbstractBackend {
-
-    /**
-     * The PDO connection object
-     *
-     * @var pdo
-     */
-    private $pdo;
-
-    /**
-     * The PDO tablename this backend uses.
-     *
-     * @var string
-     */
-    protected $tableName;
-
-    /**
-     * Constructor
-     *
-     * @param PDO $pdo
-     * @param string $tableName
-     */
-    public function __construct(\PDO $pdo, $tableName = 'locks') {
-
-        $this->pdo = $pdo;
-        $this->tableName = $tableName;
-
-    }
-
-    /**
-     * Returns a list of Sabre\DAV\Locks\LockInfo objects
-     *
-     * This method should return all the locks for a particular uri, including
-     * locks that might be set on a parent uri.
-     *
-     * If returnChildLocks is set to true, this method should also look for
-     * any locks in the subtree of the uri for locks.
-     *
-     * @param string $uri
-     * @param bool $returnChildLocks
-     * @return array
-     */
-    public function getLocks($uri, $returnChildLocks) {
-
-        // NOTE: the following 10 lines or so could be easily replaced by
-        // pure sql. MySQL's non-standard string concatenation prevents us
-        // from doing this though.
-        $query = 'SELECT owner, token, timeout, created, scope, depth, uri FROM '.$this->tableName.' WHERE ((created + timeout) > CAST(? AS UNSIGNED INTEGER)) AND ((uri = ?)';
-        $params = array(time(),$uri);
-
-        // We need to check locks for every part in the uri.
-        $uriParts = explode('/',$uri);
-
-        // We already covered the last part of the uri
-        array_pop($uriParts);
-
-        $currentPath='';
-
-        foreach($uriParts as $part) {
-
-            if ($currentPath) $currentPath.='/';
-            $currentPath.=$part;
-
-            $query.=' OR (depth!=0 AND uri = ?)';
-            $params[] = $currentPath;
-
-        }
-
-        if ($returnChildLocks) {
-
-            $query.=' OR (uri LIKE ?)';
-            $params[] = $uri . '/%';
-
-        }
-        $query.=')';
-
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute($params);
-        $result = $stmt->fetchAll();
-
-        $lockList = array();
-        foreach($result as $row) {
-
-            $lockInfo = new LockInfo();
-            $lockInfo->owner = $row['owner'];
-            $lockInfo->token = $row['token'];
-            $lockInfo->timeout = $row['timeout'];
-            $lockInfo->created = $row['created'];
-            $lockInfo->scope = $row['scope'];
-            $lockInfo->depth = $row['depth'];
-            $lockInfo->uri   = $row['uri'];
-            $lockList[] = $lockInfo;
-
-        }
-
-        return $lockList;
-
-    }
-
-    /**
-     * Locks a uri
-     *
-     * @param string $uri
-     * @param LockInfo $lockInfo
-     * @return bool
-     */
-    public function lock($uri, LockInfo $lockInfo) {
-
-        // We're making the lock timeout 30 minutes
-        $lockInfo->timeout = 30*60;
-        $lockInfo->created = time();
-        $lockInfo->uri = $uri;
-
-        $locks = $this->getLocks($uri,false);
-        $exists = false;
-        foreach($locks as $lock) {
-            if ($lock->token == $lockInfo->token) $exists = true;
-        }
-
-        if ($exists) {
-            $stmt = $this->pdo->prepare('UPDATE '.$this->tableName.' SET owner = ?, timeout = ?, scope = ?, depth = ?, uri = ?, created = ? WHERE token = ?');
-            $stmt->execute(array($lockInfo->owner,$lockInfo->timeout,$lockInfo->scope,$lockInfo->depth,$uri,$lockInfo->created,$lockInfo->token));
-        } else {
-            $stmt = $this->pdo->prepare('INSERT INTO '.$this->tableName.' (owner,timeout,scope,depth,uri,created,token) VALUES (?,?,?,?,?,?,?)');
-            $stmt->execute(array($lockInfo->owner,$lockInfo->timeout,$lockInfo->scope,$lockInfo->depth,$uri,$lockInfo->created,$lockInfo->token));
-        }
-
-        return true;
-
-    }
-
-
-
-    /**
-     * Removes a lock from a uri
-     *
-     * @param string $uri
-     * @param LockInfo $lockInfo
-     * @return bool
-     */
-    public function unlock($uri, LockInfo $lockInfo) {
-
-        $stmt = $this->pdo->prepare('DELETE FROM '.$this->tableName.' WHERE uri = ? AND token = ?');
-        $stmt->execute(array($uri,$lockInfo->token));
-
-        return $stmt->rowCount()===1;
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Locks/LockInfo.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Locks/LockInfo.php
deleted file mode 100644
index 74bdb0f9c7..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Locks/LockInfo.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Locks;
-
-/**
- * LockInfo class
- *
- * An object of the LockInfo class holds all the information relevant to a
- * single lock.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class LockInfo {
-
-    /**
-     * A shared lock
-     */
-    const SHARED = 1;
-
-    /**
-     * An exclusive lock
-     */
-    const EXCLUSIVE = 2;
-
-    /**
-     * A never expiring timeout
-     */
-    const TIMEOUT_INFINITE = -1;
-
-    /**
-     * The owner of the lock
-     *
-     * @var string
-     */
-    public $owner;
-
-    /**
-     * The locktoken
-     *
-     * @var string
-     */
-    public $token;
-
-    /**
-     * How long till the lock is expiring
-     *
-     * @var int
-     */
-    public $timeout;
-
-    /**
-     * UNIX Timestamp of when this lock was created
-     *
-     * @var int
-     */
-    public $created;
-
-    /**
-     * Exclusive or shared lock
-     *
-     * @var int
-     */
-    public $scope = self::EXCLUSIVE;
-
-    /**
-     * Depth of lock, can be 0 or Sabre\DAV\Server::DEPTH_INFINITY
-     */
-    public $depth = 0;
-
-    /**
-     * The uri this lock locks
-     *
-     * TODO: This value is not always set
-     * @var mixed
-     */
-    public $uri;
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Locks/Plugin.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Locks/Plugin.php
deleted file mode 100644
index 001f8175df..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Locks/Plugin.php
+++ /dev/null
@@ -1,649 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Locks;
-
-use Sabre\DAV;
-
-/**
- * Locking plugin
- *
- * This plugin provides locking support to a WebDAV server.
- * The easiest way to get started, is by hooking it up as such:
- *
- * $lockBackend = new Sabre\DAV\Locks\Backend\File('./mylockdb');
- * $lockPlugin = new Sabre\DAV\Locks\Plugin($lockBackend);
- * $server->addPlugin($lockPlugin);
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Plugin extends DAV\ServerPlugin {
-
-    /**
-     * locksBackend
-     *
-     * @var Backend\Backend\Interface
-     */
-    protected $locksBackend;
-
-    /**
-     * server
-     *
-     * @var Sabre\DAV\Server
-     */
-    protected $server;
-
-    /**
-     * __construct
-     *
-     * @param Backend\BackendInterface $locksBackend
-     */
-    public function __construct(Backend\BackendInterface $locksBackend = null) {
-
-        $this->locksBackend = $locksBackend;
-
-    }
-
-    /**
-     * Initializes the plugin
-     *
-     * This method is automatically called by the Server class after addPlugin.
-     *
-     * @param DAV\Server $server
-     * @return void
-     */
-    public function initialize(DAV\Server $server) {
-
-        $this->server = $server;
-        $server->subscribeEvent('unknownMethod',array($this,'unknownMethod'));
-        $server->subscribeEvent('beforeMethod',array($this,'beforeMethod'),50);
-        $server->subscribeEvent('afterGetProperties',array($this,'afterGetProperties'));
-
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using Sabre\DAV\Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return 'locks';
-
-    }
-
-    /**
-     * This method is called by the Server if the user used an HTTP method
-     * the server didn't recognize.
-     *
-     * This plugin intercepts the LOCK and UNLOCK methods.
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function unknownMethod($method, $uri) {
-
-        switch($method) {
-
-            case 'LOCK'   : $this->httpLock($uri); return false;
-            case 'UNLOCK' : $this->httpUnlock($uri); return false;
-
-        }
-
-    }
-
-    /**
-     * This method is called after most properties have been found
-     * it allows us to add in any Lock-related properties
-     *
-     * @param string $path
-     * @param array $newProperties
-     * @return bool
-     */
-    public function afterGetProperties($path, &$newProperties) {
-
-        foreach($newProperties[404] as $propName=>$discard) {
-
-            switch($propName) {
-
-                case '{DAV:}supportedlock' :
-                    $val = false;
-                    if ($this->locksBackend) $val = true;
-                    $newProperties[200][$propName] = new DAV\Property\SupportedLock($val);
-                    unset($newProperties[404][$propName]);
-                    break;
-
-                case '{DAV:}lockdiscovery' :
-                    $newProperties[200][$propName] = new DAV\Property\LockDiscovery($this->getLocks($path));
-                    unset($newProperties[404][$propName]);
-                    break;
-
-            }
-
-
-        }
-        return true;
-
-    }
-
-
-    /**
-     * This method is called before the logic for any HTTP method is
-     * handled.
-     *
-     * This plugin uses that feature to intercept access to locked resources.
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function beforeMethod($method, $uri) {
-
-        switch($method) {
-
-            case 'DELETE' :
-                $lastLock = null;
-                if (!$this->validateLock($uri,$lastLock, true))
-                    throw new DAV\Exception\Locked($lastLock);
-                break;
-            case 'MKCOL' :
-            case 'PROPPATCH' :
-            case 'PUT' :
-            case 'PATCH' :
-                $lastLock = null;
-                if (!$this->validateLock($uri,$lastLock))
-                    throw new DAV\Exception\Locked($lastLock);
-                break;
-            case 'MOVE' :
-                $lastLock = null;
-                if (!$this->validateLock(array(
-                      $uri,
-                      $this->server->calculateUri($this->server->httpRequest->getHeader('Destination')),
-                    ),$lastLock, true))
-                        throw new DAV\Exception\Locked($lastLock);
-                break;
-            case 'COPY' :
-                $lastLock = null;
-                if (!$this->validateLock(
-                      $this->server->calculateUri($this->server->httpRequest->getHeader('Destination')),
-                      $lastLock, true))
-                        throw new DAV\Exception\Locked($lastLock);
-                break;
-        }
-
-        return true;
-
-    }
-
-    /**
-     * Use this method to tell the server this plugin defines additional
-     * HTTP methods.
-     *
-     * This method is passed a uri. It should only return HTTP methods that are
-     * available for the specified uri.
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getHTTPMethods($uri) {
-
-        if ($this->locksBackend)
-            return array('LOCK','UNLOCK');
-
-        return array();
-
-    }
-
-    /**
-     * Returns a list of features for the HTTP OPTIONS Dav: header.
-     *
-     * In this case this is only the number 2. The 2 in the Dav: header
-     * indicates the server supports locks.
-     *
-     * @return array
-     */
-    public function getFeatures() {
-
-        return array(2);
-
-    }
-
-    /**
-     * Returns all lock information on a particular uri
-     *
-     * This function should return an array with Sabre\DAV\Locks\LockInfo objects. If there are no locks on a file, return an empty array.
-     *
-     * Additionally there is also the possibility of locks on parent nodes, so we'll need to traverse every part of the tree
-     * If the $returnChildLocks argument is set to true, we'll also traverse all the children of the object
-     * for any possible locks and return those as well.
-     *
-     * @param string $uri
-     * @param bool $returnChildLocks
-     * @return array
-     */
-    public function getLocks($uri, $returnChildLocks = false) {
-
-        $lockList = array();
-
-        if ($this->locksBackend)
-            $lockList = array_merge($lockList,$this->locksBackend->getLocks($uri, $returnChildLocks));
-
-        return $lockList;
-
-    }
-
-    /**
-     * Locks an uri
-     *
-     * The WebDAV lock request can be operated to either create a new lock on a file, or to refresh an existing lock
-     * If a new lock is created, a full XML body should be supplied, containing information about the lock such as the type
-     * of lock (shared or exclusive) and the owner of the lock
-     *
-     * If a lock is to be refreshed, no body should be supplied and there should be a valid If header containing the lock
-     *
-     * Additionally, a lock can be requested for a non-existent file. In these case we're obligated to create an empty file as per RFC4918:S7.3
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpLock($uri) {
-
-        $lastLock = null;
-        if (!$this->validateLock($uri,$lastLock)) {
-
-            // If the existing lock was an exclusive lock, we need to fail
-            if (!$lastLock || $lastLock->scope == LockInfo::EXCLUSIVE) {
-                //var_dump($lastLock);
-                throw new DAV\Exception\ConflictingLock($lastLock);
-            }
-
-        }
-
-        if ($body = $this->server->httpRequest->getBody(true)) {
-            // This is a new lock request
-            $lockInfo = $this->parseLockRequest($body);
-            $lockInfo->depth = $this->server->getHTTPDepth();
-            $lockInfo->uri = $uri;
-            if($lastLock && $lockInfo->scope != LockInfo::SHARED) throw new DAV\Exception\ConflictingLock($lastLock);
-
-        } elseif ($lastLock) {
-
-            // This must have been a lock refresh
-            $lockInfo = $lastLock;
-
-            // The resource could have been locked through another uri.
-            if ($uri!=$lockInfo->uri) $uri = $lockInfo->uri;
-
-        } else {
-
-            // There was neither a lock refresh nor a new lock request
-            throw new DAV\Exception\BadRequest('An xml body is required for lock requests');
-
-        }
-
-        if ($timeout = $this->getTimeoutHeader()) $lockInfo->timeout = $timeout;
-
-        $newFile = false;
-
-        // If we got this far.. we should go check if this node actually exists. If this is not the case, we need to create it first
-        try {
-            $this->server->tree->getNodeForPath($uri);
-
-            // We need to call the beforeWriteContent event for RFC3744
-            // Edit: looks like this is not used, and causing problems now.
-            //
-            // See Issue 222
-            // $this->server->broadcastEvent('beforeWriteContent',array($uri));
-
-        } catch (DAV\Exception\NotFound $e) {
-
-            // It didn't, lets create it
-            $this->server->createFile($uri,fopen('php://memory','r'));
-            $newFile = true;
-
-        }
-
-        $this->lockNode($uri,$lockInfo);
-
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->setHeader('Lock-Token','<opaquelocktoken:' . $lockInfo->token . '>');
-        $this->server->httpResponse->sendStatus($newFile?201:200);
-        $this->server->httpResponse->sendBody($this->generateLockResponse($lockInfo));
-
-    }
-
-    /**
-     * Unlocks a uri
-     *
-     * This WebDAV method allows you to remove a lock from a node. The client should provide a valid locktoken through the Lock-token http header
-     * The server should return 204 (No content) on success
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpUnlock($uri) {
-
-        $lockToken = $this->server->httpRequest->getHeader('Lock-Token');
-
-        // If the locktoken header is not supplied, we need to throw a bad request exception
-        if (!$lockToken) throw new DAV\Exception\BadRequest('No lock token was supplied');
-
-        $locks = $this->getLocks($uri);
-
-        // Windows sometimes forgets to include < and > in the Lock-Token
-        // header
-        if ($lockToken[0]!=='<') $lockToken = '<' . $lockToken . '>';
-
-        foreach($locks as $lock) {
-
-            if ('<opaquelocktoken:' . $lock->token . '>' == $lockToken) {
-
-                $this->unlockNode($uri,$lock);
-                $this->server->httpResponse->setHeader('Content-Length','0');
-                $this->server->httpResponse->sendStatus(204);
-                return;
-
-            }
-
-        }
-
-        // If we got here, it means the locktoken was invalid
-        throw new DAV\Exception\LockTokenMatchesRequestUri();
-
-    }
-
-    /**
-     * Locks a uri
-     *
-     * All the locking information is supplied in the lockInfo object. The object has a suggested timeout, but this can be safely ignored
-     * It is important that if the existing timeout is ignored, the property is overwritten, as this needs to be sent back to the client
-     *
-     * @param string $uri
-     * @param LockInfo $lockInfo
-     * @return bool
-     */
-    public function lockNode($uri,LockInfo $lockInfo) {
-
-        if (!$this->server->broadcastEvent('beforeLock',array($uri,$lockInfo))) return;
-
-        if ($this->locksBackend) return $this->locksBackend->lock($uri,$lockInfo);
-        throw new DAV\Exception\MethodNotAllowed('Locking support is not enabled for this resource. No Locking backend was found so if you didn\'t expect this error, please check your configuration.');
-
-    }
-
-    /**
-     * Unlocks a uri
-     *
-     * This method removes a lock from a uri. It is assumed all the supplied information is correct and verified
-     *
-     * @param string $uri
-     * @param LockInfo $lockInfo
-     * @return bool
-     */
-    public function unlockNode($uri, LockInfo $lockInfo) {
-
-        if (!$this->server->broadcastEvent('beforeUnlock',array($uri,$lockInfo))) return;
-        if ($this->locksBackend) return $this->locksBackend->unlock($uri,$lockInfo);
-
-    }
-
-
-    /**
-     * Returns the contents of the HTTP Timeout header.
-     *
-     * The method formats the header into an integer.
-     *
-     * @return int
-     */
-    public function getTimeoutHeader() {
-
-        $header = $this->server->httpRequest->getHeader('Timeout');
-
-        if ($header) {
-
-            if (stripos($header,'second-')===0) $header = (int)(substr($header,7));
-            else if (strtolower($header)=='infinite') $header = LockInfo::TIMEOUT_INFINITE;
-            else throw new DAV\Exception\BadRequest('Invalid HTTP timeout header');
-
-        } else {
-
-            $header = 0;
-
-        }
-
-        return $header;
-
-    }
-
-    /**
-     * Generates the response for successful LOCK requests
-     *
-     * @param LockInfo $lockInfo
-     * @return string
-     */
-    protected function generateLockResponse(LockInfo $lockInfo) {
-
-        $dom = new \DOMDocument('1.0','utf-8');
-        $dom->formatOutput = true;
-
-        $prop = $dom->createElementNS('DAV:','d:prop');
-        $dom->appendChild($prop);
-
-        $lockDiscovery = $dom->createElementNS('DAV:','d:lockdiscovery');
-        $prop->appendChild($lockDiscovery);
-
-        $lockObj = new DAV\Property\LockDiscovery(array($lockInfo),true);
-        $lockObj->serialize($this->server,$lockDiscovery);
-
-        return $dom->saveXML();
-
-    }
-
-    /**
-     * validateLock should be called when a write operation is about to happen
-     * It will check if the requested url is locked, and see if the correct lock tokens are passed
-     *
-     * @param mixed $urls List of relevant urls. Can be an array, a string or nothing at all for the current request uri
-     * @param mixed $lastLock This variable will be populated with the last checked lock object (Sabre\DAV\Locks\LockInfo)
-     * @param bool $checkChildLocks If set to true, this function will also look for any locks set on child resources of the supplied urls. This is needed for for example deletion of entire trees.
-     * @return bool
-     */
-    protected function validateLock($urls = null,&$lastLock = null, $checkChildLocks = false) {
-
-        if (is_null($urls)) {
-            $urls = array($this->server->getRequestUri());
-        } elseif (is_string($urls)) {
-            $urls = array($urls);
-        } elseif (!is_array($urls)) {
-            throw new DAV\Exception('The urls parameter should either be null, a string or an array');
-        }
-
-        $conditions = $this->getIfConditions();
-
-        // We're going to loop through the urls and make sure all lock conditions are satisfied
-        foreach($urls as $url) {
-
-            $locks = $this->getLocks($url, $checkChildLocks);
-
-            // If there were no conditions, but there were locks, we fail
-            if (!$conditions && $locks) {
-                reset($locks);
-                $lastLock = current($locks);
-                return false;
-            }
-
-            // If there were no locks or conditions, we go to the next url
-            if (!$locks && !$conditions) continue;
-
-            foreach($conditions as $condition) {
-
-                if (!$condition['uri']) {
-                    $conditionUri = $this->server->getRequestUri();
-                } else {
-                    $conditionUri = $this->server->calculateUri($condition['uri']);
-                }
-
-                // If the condition has a url, and it isn't part of the affected url at all, check the next condition
-                if ($conditionUri && strpos($url,$conditionUri)!==0) continue;
-
-                // The tokens array contians arrays with 2 elements. 0=true/false for normal/not condition, 1=locktoken
-                // At least 1 condition has to be satisfied
-                foreach($condition['tokens'] as $conditionToken) {
-
-                    $etagValid = true;
-                    $lockValid  = true;
-
-                    // key 2 can contain an etag
-                    if ($conditionToken[2]) {
-
-                        $uri = $conditionUri?$conditionUri:$this->server->getRequestUri();
-                        $node = $this->server->tree->getNodeForPath($uri);
-                        $etagValid = $node instanceof DAV\IFile && $node->getETag()==$conditionToken[2];
-
-                    }
-
-                    // key 1 can contain a lock token
-                    if ($conditionToken[1]) {
-
-                        $lockValid = false;
-                        // Match all the locks
-                        foreach($locks as $lockIndex=>$lock) {
-
-                            $lockToken = 'opaquelocktoken:' . $lock->token;
-
-                            // Checking NOT
-                            if (!$conditionToken[0] && $lockToken != $conditionToken[1]) {
-
-                                // Condition valid, onto the next
-                                $lockValid = true;
-                                break;
-                            }
-                            if ($conditionToken[0] && $lockToken == $conditionToken[1]) {
-
-                                $lastLock = $lock;
-                                // Condition valid and lock matched
-                                unset($locks[$lockIndex]);
-                                $lockValid = true;
-                                break;
-
-                            }
-
-                        }
-
-                    }
-
-                    // If, after checking both etags and locks they are stil valid,
-                    // we can continue with the next condition.
-                    if ($etagValid && $lockValid) continue 2;
-               }
-               // No conditions matched, so we fail
-               throw new DAV\Exception\PreconditionFailed('The tokens provided in the if header did not match','If');
-            }
-
-            // Conditions were met, we'll also need to check if all the locks are gone
-            if (count($locks)) {
-
-                reset($locks);
-
-                // There's still locks, we fail
-                $lastLock = current($locks);
-                return false;
-
-            }
-
-
-        }
-
-        // We got here, this means every condition was satisfied
-        return true;
-
-    }
-
-    /**
-     * This method is created to extract information from the WebDAV HTTP 'If:' header
-     *
-     * The If header can be quite complex, and has a bunch of features. We're using a regex to extract all relevant information
-     * The function will return an array, containing structs with the following keys
-     *
-     *   * uri   - the uri the condition applies to. If this is returned as an
-     *     empty string, this implies it's referring to the request url.
-     *   * tokens - The lock token. another 2 dimensional array containing 2 elements (0 = true/false.. If this is a negative condition its set to false, 1 = the actual token)
-     *   * etag - an etag, if supplied
-     *
-     * @return array
-     */
-    public function getIfConditions() {
-
-        $header = $this->server->httpRequest->getHeader('If');
-        if (!$header) return array();
-
-        $matches = array();
-
-        $regex = '/(?:\<(?P<uri>.*?)\>\s)?\((?P<not>Not\s)?(?:\<(?P<token>[^\>]*)\>)?(?:\s?)(?:\[(?P<etag>[^\]]*)\])?\)/im';
-        preg_match_all($regex,$header,$matches,PREG_SET_ORDER);
-
-        $conditions = array();
-
-        foreach($matches as $match) {
-
-            $condition = array(
-                'uri'   => $match['uri'],
-                'tokens' => array(
-                    array($match['not']?0:1,$match['token'],isset($match['etag'])?$match['etag']:'')
-                ),
-            );
-
-            if (!$condition['uri'] && count($conditions)) $conditions[count($conditions)-1]['tokens'][] = array(
-                $match['not']?0:1,
-                $match['token'],
-                isset($match['etag'])?$match['etag']:''
-            );
-            else {
-                $conditions[] = $condition;
-            }
-
-        }
-
-        return $conditions;
-
-    }
-
-    /**
-     * Parses a webdav lock xml body, and returns a new Sabre\DAV\Locks\LockInfo object
-     *
-     * @param string $body
-     * @return DAV\Locks\LockInfo
-     */
-    protected function parseLockRequest($body) {
-
-        // Fixes an XXE vulnerability on PHP versions older than 5.3.23 or
-        // 5.4.13.
-        $previous = libxml_disable_entity_loader(true);
-
-
-        $xml = simplexml_load_string(
-            DAV\XMLUtil::convertDAVNamespace($body),
-            null,
-            LIBXML_NOWARNING);
-        libxml_disable_entity_loader($previous);
-
-        $xml->registerXPathNamespace('d','urn:DAV');
-        $lockInfo = new LockInfo();
-
-        $children = $xml->children("urn:DAV");
-        $lockInfo->owner = (string)$children->owner;
-
-        $lockInfo->token = DAV\UUIDUtil::getUUID();
-        $lockInfo->scope = count($xml->xpath('d:lockscope/d:exclusive'))>0 ? LockInfo::EXCLUSIVE : LockInfo::SHARED;
-
-        return $lockInfo;
-
-    }
-
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Mount/Plugin.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Mount/Plugin.php
deleted file mode 100644
index 8376b03b06..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Mount/Plugin.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Mount;
-
-use Sabre\DAV;
-
-/**
- * This plugin provides support for RFC4709: Mounting WebDAV servers
- *
- * Simply append ?mount to any collection to generate the davmount response.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Plugin extends DAV\ServerPlugin {
-
-    /**
-     * Reference to Server class
-     *
-     * @var Sabre\DAV\Server
-     */
-    protected $server;
-
-    /**
-     * Initializes the plugin and registers event handles
-     *
-     * @param DAV\Server $server
-     * @return void
-     */
-    public function initialize(DAV\Server $server) {
-
-        $this->server = $server;
-        $this->server->subscribeEvent('beforeMethod',array($this,'beforeMethod'), 90);
-
-    }
-
-    /**
-     * 'beforeMethod' event handles. This event handles intercepts GET requests ending
-     * with ?mount
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function beforeMethod($method, $uri) {
-
-        if ($method!='GET') return;
-        if ($this->server->httpRequest->getQueryString()!='mount') return;
-
-        $currentUri = $this->server->httpRequest->getAbsoluteUri();
-
-        // Stripping off everything after the ?
-        list($currentUri) = explode('?',$currentUri);
-
-        $this->davMount($currentUri);
-
-        // Returning false to break the event chain
-        return false;
-
-    }
-
-    /**
-     * Generates the davmount response
-     *
-     * @param string $uri absolute uri
-     * @return void
-     */
-    public function davMount($uri) {
-
-        $this->server->httpResponse->sendStatus(200);
-        $this->server->httpResponse->setHeader('Content-Type','application/davmount+xml');
-        ob_start();
-        echo '<?xml version="1.0"?>', "\n";
-        echo "<dm:mount xmlns:dm=\"http://purl.org/NET/webdav/mount\">\n";
-        echo "  <dm:url>", htmlspecialchars($uri, ENT_NOQUOTES, 'UTF-8'), "</dm:url>\n";
-        echo "</dm:mount>";
-        $this->server->httpResponse->sendBody(ob_get_clean());
-
-    }
-
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Node.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Node.php
deleted file mode 100644
index 44e47be68f..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Node.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-/**
- * Node class
- *
- * This is a helper class, that should aid in getting nodes setup.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-abstract class Node implements INode {
-
-    /**
-     * Returns the last modification time
-     *
-     * In this case, it will simply return the current time
-     *
-     * @return int
-     */
-    public function getLastModified() {
-
-        return time();
-
-    }
-
-    /**
-     * Deletes the current node
-     *
-     * @throws Sabre\DAV\Exception\Forbidden
-     * @return void
-     */
-    public function delete() {
-
-        throw new Exception\Forbidden('Permission denied to delete node');
-
-    }
-
-    /**
-     * Renames the node
-     *
-     * @throws Sabre\DAV\Exception\Forbidden
-     * @param string $name The new name
-     * @return void
-     */
-    public function setName($name) {
-
-        throw new Exception\Forbidden('Permission denied to rename file');
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/ObjectTree.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/ObjectTree.php
deleted file mode 100644
index 3e7c0fcf83..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/ObjectTree.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-/**
- * ObjectTree class
- *
- * This implementation of the Tree class makes use of the INode, IFile and ICollection API's
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class ObjectTree extends Tree {
-
-    /**
-     * The root node
-     *
-     * @var ICollection
-     */
-    protected $rootNode;
-
-    /**
-     * This is the node cache. Accessed nodes are stored here
-     *
-     * @var array
-     */
-    protected $cache = array();
-
-    /**
-     * Creates the object
-     *
-     * This method expects the rootObject to be passed as a parameter
-     *
-     * @param ICollection $rootNode
-     */
-    public function __construct(ICollection $rootNode) {
-
-        $this->rootNode = $rootNode;
-
-    }
-
-    /**
-     * Returns the INode object for the requested path
-     *
-     * @param string $path
-     * @return INode
-     */
-    public function getNodeForPath($path) {
-
-        $path = trim($path,'/');
-        if (isset($this->cache[$path])) return $this->cache[$path];
-
-        // Is it the root node?
-        if (!strlen($path)) {
-            return $this->rootNode;
-        }
-
-        // Attempting to fetch its parent
-        list($parentName, $baseName) = URLUtil::splitPath($path);
-
-        // If there was no parent, we must simply ask it from the root node.
-        if ($parentName==="") {
-            $node = $this->rootNode->getChild($baseName);
-        } else {
-            // Otherwise, we recursively grab the parent and ask him/her.
-            $parent = $this->getNodeForPath($parentName);
-
-            if (!($parent instanceof ICollection))
-                throw new Exception\NotFound('Could not find node at path: ' . $path);
-
-            $node = $parent->getChild($baseName);
-
-        }
-
-        $this->cache[$path] = $node;
-        return $node;
-
-    }
-
-    /**
-     * This function allows you to check if a node exists.
-     *
-     * @param string $path
-     * @return bool
-     */
-    public function nodeExists($path) {
-
-        try {
-
-            // The root always exists
-            if ($path==='') return true;
-
-            list($parent, $base) = URLUtil::splitPath($path);
-
-            $parentNode = $this->getNodeForPath($parent);
-            if (!$parentNode instanceof ICollection) return false;
-            return $parentNode->childExists($base);
-
-        } catch (Exception\NotFound $e) {
-
-            return false;
-
-        }
-
-    }
-
-    /**
-     * Returns a list of childnodes for a given path.
-     *
-     * @param string $path
-     * @return array
-     */
-    public function getChildren($path) {
-
-        $node = $this->getNodeForPath($path);
-        $children = $node->getChildren();
-        foreach($children as $child) {
-
-            $this->cache[trim($path,'/') . '/' . $child->getName()] = $child;
-
-        }
-        return $children;
-
-    }
-
-    /**
-     * This method is called with every tree update
-     *
-     * Examples of tree updates are:
-     *   * node deletions
-     *   * node creations
-     *   * copy
-     *   * move
-     *   * renaming nodes
-     *
-     * If Tree classes implement a form of caching, this will allow
-     * them to make sure caches will be expired.
-     *
-     * If a path is passed, it is assumed that the entire subtree is dirty
-     *
-     * @param string $path
-     * @return void
-     */
-    public function markDirty($path) {
-
-        // We don't care enough about sub-paths
-        // flushing the entire cache
-        $path = trim($path,'/');
-        foreach($this->cache as $nodePath=>$node) {
-            if ($nodePath == $path || strpos($nodePath,$path.'/')===0)
-                unset($this->cache[$nodePath]);
-
-        }
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/PartialUpdate/IFile.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/PartialUpdate/IFile.php
deleted file mode 100644
index 9cfb47377b..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/PartialUpdate/IFile.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Sabre\DAV\PartialUpdate;
-
-use Sabre\DAV;
-
-/**
- * This interface is deprecated. Use IPatchSupport instead.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Jean-Tiare LE BIGOT (http://www.jtlebi.fr/)
- * @license http://sabre.io/license/ Modified BSD License
- * @deprecated
- */
-interface IFile extends DAV\IFile {
-
-    /**
-     * Updates the data at a given offset
-     *
-     * The data argument is a readable stream resource.
-     * The offset argument is an integer describing the offset. Contrary to
-     * what's sent in the request, the offset here is a 0-based index.
-     *
-     * After a successful put operation, you may choose to return an ETag. The
-     * etag must always be surrounded by double-quotes. These quotes must
-     * appear in the actual string you're returning.
-     *
-     * Clients may use the ETag from a PUT request to later on make sure that
-     * when they update the file, the contents haven't changed in the mean
-     * time.
-     *
-     * @param resource $data
-     * @param integer $offset
-     * @return string|null
-     */
-    function putRange($data, $offset);
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/PartialUpdate/IPatchSupport.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/PartialUpdate/IPatchSupport.php
deleted file mode 100644
index aff1d320fa..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/PartialUpdate/IPatchSupport.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-namespace Sabre\DAV\PartialUpdate;
-
-use Sabre\DAV;
-
-/**
- * This interface provides a way to modify only part of a target resource
- * It may be used to update a file chunk, upload big a file into smaller
- * chunks or resume an upload
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Jean-Tiare LE BIGOT (http://www.jtlebi.fr/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface IPatchSupport extends DAV\IFile {
-
-    /**
-     * Updates the file based on a range specification.
-     *
-     * The first argument is the data, which is either a readable stream
-     * resource or a string.
-     *
-     * The second argument is the type of update we're doing.
-     * This is either:
-     * * 1. append
-     * * 2. update based on a start byte
-     * * 3. update based on an end byte
-     *;
-     * The third argument is the start or end byte.
-     *
-     * After a successful put operation, you may choose to return an ETag. The
-     * etag must always be surrounded by double-quotes. These quotes must
-     * appear in the actual string you're returning.
-     *
-     * Clients may use the ETag from a PUT request to later on make sure that
-     * when they update the file, the contents haven't changed in the mean
-     * time.
-     *
-     * @param resource|string $data
-     * @param int $rangeType
-     * @param int $offset
-     * @return string|null
-     */
-    function patch($data, $rangeType, $offset = null);
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/PartialUpdate/Plugin.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/PartialUpdate/Plugin.php
deleted file mode 100644
index 2c402dc8f2..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/PartialUpdate/Plugin.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php
-
-namespace Sabre\DAV\PartialUpdate;
-
-use Sabre\DAV;
-
-/**
- * Partial update plugin (Patch method)
- *
- * This plugin provides a way to modify only part of a target resource
- * It may bu used to update a file chunk, upload big a file into smaller
- * chunks or resume an upload.
- *
- * $patchPlugin = new \Sabre\DAV\PartialUpdate\Plugin();
- * $server->addPlugin($patchPlugin);
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Jean-Tiare LE BIGOT (http://www.jtlebi.fr/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Plugin extends DAV\ServerPlugin {
-
-    const RANGE_APPEND = 1;
-    const RANGE_START = 2;
-    const RANGE_END = 3;
-
-    /**
-     * Reference to server
-     *
-     * @var Sabre\DAV\Server
-     */
-    protected $server;
-
-    /**
-     * Initializes the plugin
-     *
-     * This method is automatically called by the Server class after addPlugin.
-     *
-     * @param DAV\Server $server
-     * @return void
-     */
-    public function initialize(DAV\Server $server) {
-
-        $this->server = $server;
-        $server->subscribeEvent('unknownMethod',array($this,'unknownMethod'));
-
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using DAV\Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return 'partialupdate';
-
-    }
-
-    /**
-     * This method is called by the Server if the user used an HTTP method
-     * the server didn't recognize.
-     *
-     * This plugin intercepts the PATCH methods.
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool|null
-     */
-    public function unknownMethod($method, $uri) {
-
-        switch($method) {
-
-            case 'PATCH':
-                return $this->httpPatch($uri);
-
-        }
-
-    }
-
-    /**
-     * Use this method to tell the server this plugin defines additional
-     * HTTP methods.
-     *
-     * This method is passed a uri. It should only return HTTP methods that are
-     * available for the specified uri.
-     *
-     * We claim to support PATCH method (partial update) if and only if
-     *     - the node exist
-     *     - the node implements our partial update interface
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getHTTPMethods($uri) {
-
-        $tree = $this->server->tree;
-        if ($tree->nodeExists($uri)) {
-            $node = $tree->getNodeForPath($uri);
-            if ($node instanceof IFile || $node instanceof IPatchSupport) {
-                return array('PATCH');
-            }
-        }
-        return array();
-
-    }
-
-    /**
-     * Returns a list of features for the HTTP OPTIONS Dav: header.
-     *
-     * @return array
-     */
-    public function getFeatures() {
-
-        return array('sabredav-partialupdate');
-
-    }
-
-    /**
-     * Patch an uri
-     *
-     * The WebDAV patch request can be used to modify only a part of an
-     * existing resource. If the resource does not exist yet and the first
-     * offset is not 0, the request fails
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpPatch($uri) {
-
-        // Get the node. Will throw a 404 if not found
-        $node = $this->server->tree->getNodeForPath($uri);
-        if (!$node instanceof IFile && !$node instanceof IPatchSupport) {
-            throw new DAV\Exception\MethodNotAllowed('The target resource does not support the PATCH method.');
-        }
-
-        $range = $this->getHTTPUpdateRange();
-
-        if (!$range) {
-            throw new DAV\Exception\BadRequest('No valid "X-Update-Range" found in the headers');
-        }
-
-        $contentType = strtolower(
-            $this->server->httpRequest->getHeader('Content-Type')
-        );
-
-        if ($contentType != 'application/x-sabredav-partialupdate') {
-            throw new DAV\Exception\UnsupportedMediaType('Unknown Content-Type header "' . $contentType . '"');
-        }
-
-        $len = $this->server->httpRequest->getHeader('Content-Length');
-        if (!$len) throw new DAV\Exception\LengthRequired('A Content-Length header is required');
-
-        switch($range[0]) {
-            case self::RANGE_START :
-                // Calculate the end-range if it doesn't exist.
-                if (!$range[2]) {
-                    $range[2] = $range[1] + $len - 1;
-                } else {
-                    if ($range[2] < $range[1]) {
-                        throw new DAV\Exception\RequestedRangeNotSatisfiable('The end offset (' . $range[2] . ') is lower than the start offset (' . $range[1] . ')');
-                    }
-                    if($range[2] - $range[1] + 1 != $len) {
-                        throw new DAV\Exception\RequestedRangeNotSatisfiable('Actual data length (' . $len . ') is not consistent with begin (' . $range[1] . ') and end (' . $range[2] . ') offsets');
-                    }
-                }
-                break;
-        }
-        // Checking If-None-Match and related headers.
-        if (!$this->server->checkPreconditions()) return;
-
-        if (!$this->server->broadcastEvent('beforeWriteContent',array($uri, $node, null)))
-            return;
-
-        $body = $this->server->httpRequest->getBody();
-
-
-        if ($node instanceof IPatchSupport) {
-            $etag = $node->patch($body, $range[0], isset($range[1])?$range[1]:null);
-        } else {
-            // The old interface
-            switch($range[0]) {
-                case self::RANGE_APPEND :
-                    throw new DAV\Exception\NotImplemented('This node does not support the append syntax. Please upgrade it to IPatchSupport');
-                case self::RANGE_START :
-                    $etag = $node->putRange($body, $range[1]);
-                    break;
-                case self::RANGE_END :
-                    throw new DAV\Exception\NotImplemented('This node does not support the end-range syntax. Please upgrade it to IPatchSupport');
-                    break;
-            }
-        }
-
-        $this->server->broadcastEvent('afterWriteContent',array($uri, $node));
-
-        $this->server->httpResponse->setHeader('Content-Length','0');
-        if ($etag) $this->server->httpResponse->setHeader('ETag',$etag);
-        $this->server->httpResponse->sendStatus(204);
-
-        return false;
-
-    }
-
-   /**
-     * Returns the HTTP custom range update header
-     *
-     * This method returns null if there is no well-formed HTTP range request
-     * header. It returns array(1) if it was an append request, array(2,
-     * $start, $end) if it's a start and end range, lastly it's array(3,
-     * $endoffset) if the offset was negative, and should be calculated from
-     * the end of the file.
-     *
-     * Examples:
-     *
-     * null - invalid
-     * array(1) - append
-     * array(2,10,15) - update bytes 10, 11, 12, 13, 14, 15
-     * array(2,10,null) - update bytes 10 until the end of the patch body
-     * array(3,-5) - update from 5 bytes from the end of the file.
-     *
-     * @return array|null
-     */
-    public function getHTTPUpdateRange() {
-
-        $range = $this->server->httpRequest->getHeader('X-Update-Range');
-        if (is_null($range)) return null;
-
-        // Matching "Range: bytes=1234-5678: both numbers are optional
-
-        if (!preg_match('/^(append)|(?:bytes=([0-9]+)-([0-9]*))|(?:bytes=(-[0-9]+))$/i',$range,$matches)) return null;
-
-        if ($matches[1]==='append') {
-            return array(self::RANGE_APPEND);
-        } elseif (strlen($matches[2])>0) {
-            return array(self::RANGE_START, $matches[2], $matches[3]?:null);
-        } elseif ($matches[4]) {
-            return array(self::RANGE_END, $matches[4]);
-        } else {
-            return null;
-        }
-
-    }
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Property.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Property.php
deleted file mode 100644
index d0c265907c..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Property.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-/**
- * Abstract property class
- *
- * Extend this class to create custom complex properties
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-abstract class Property implements PropertyInterface {
-
-    /**
-     * Unserializes the property.
-     *
-     * This static method should return a an instance of this object.
-     *
-     * @param \DOMElement $prop
-     * @return DAV\IProperty
-     */
-    static function unserialize(\DOMElement $prop) {
-
-        throw new Exception('Unserialize has not been implemented for this class');
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/GetLastModified.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/GetLastModified.php
deleted file mode 100644
index 987e3fc024..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/GetLastModified.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Property;
-
-use Sabre\DAV;
-use Sabre\HTTP;
-
-/**
- * This property represents the {DAV:}getlastmodified property.
- *
- * Although this is normally a simple property, windows requires us to add
- * some new attributes.
- *
- * This class uses unix timestamps internally, and converts them to RFC 1123 times for
- * serialization
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class GetLastModified extends DAV\Property {
-
-    /**
-     * time
-     *
-     * @var int
-     */
-    public $time;
-
-    /**
-     * __construct
-     *
-     * @param int|DateTime $time
-     */
-    public function __construct($time) {
-
-        if ($time instanceof \DateTime) {
-            $this->time = $time;
-        } elseif (is_int($time) || ctype_digit($time)) {
-            $this->time = new \DateTime('@' . $time);
-        } else {
-            $this->time = new \DateTime($time);
-        }
-
-        // Setting timezone to UTC
-        $this->time->setTimezone(new \DateTimeZone('UTC'));
-
-    }
-
-    /**
-     * serialize
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $prop
-     * @return void
-     */
-    public function serialize(DAV\Server $server, \DOMElement $prop) {
-
-        $doc = $prop->ownerDocument;
-        //$prop->setAttribute('xmlns:b','urn:uuid:c2f41010-65b3-11d1-a29f-00aa00c14882/');
-        //$prop->setAttribute('b:dt','dateTime.rfc1123');
-        $prop->nodeValue = HTTP\Util::toHTTPDate($this->time);
-
-    }
-
-    /**
-     * getTime
-     *
-     * @return \DateTime
-     */
-    public function getTime() {
-
-        return $this->time;
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/Href.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/Href.php
deleted file mode 100644
index f0c162706c..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/Href.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Property;
-
-use Sabre\DAV;
-
-/**
- * Href property
- *
- * The href property represents a url within a {DAV:}href element.
- * This is used by many WebDAV extensions, but not really within the WebDAV core spec
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Href extends DAV\Property implements IHref {
-
-    /**
-     * href
-     *
-     * @var string
-     */
-    private $href;
-
-    /**
-     * Automatically prefix the url with the server base directory
-     *
-     * @var bool
-     */
-    private $autoPrefix = true;
-
-    /**
-     * __construct
-     *
-     * @param string $href
-     * @param bool $autoPrefix
-     */
-    public function __construct($href, $autoPrefix = true) {
-
-        $this->href = $href;
-        $this->autoPrefix = $autoPrefix;
-
-    }
-
-    /**
-     * Returns the uri
-     *
-     * @return string
-     */
-    public function getHref() {
-
-        return $this->href;
-
-    }
-
-    /**
-     * Serializes this property.
-     *
-     * It will additionally prepend the href property with the server's base uri.
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $dom
-     * @return void
-     */
-    public function serialize(DAV\Server $server, \DOMElement $dom) {
-
-        $prefix = $server->xmlNamespaces['DAV:'];
-        $elem = $dom->ownerDocument->createElement($prefix . ':href');
-
-        if ($this->autoPrefix) {
-            $value = $server->getBaseUri() . DAV\URLUtil::encodePath($this->href);
-        } else {
-            $value = $this->href;
-        }
-        $elem->appendChild($dom->ownerDocument->createTextNode($value));
-
-        $dom->appendChild($elem);
-
-    }
-
-    /**
-     * Unserializes this property from a DOM Element
-     *
-     * This method returns an instance of this class.
-     * It will only decode {DAV:}href values. For non-compatible elements null will be returned.
-     *
-     * @param \DOMElement $dom
-     * @return DAV\Property\Href
-     */
-    static function unserialize(\DOMElement $dom) {
-
-        if ($dom->firstChild && DAV\XMLUtil::toClarkNotation($dom->firstChild)==='{DAV:}href') {
-            return new self($dom->firstChild->textContent,false);
-        }
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/HrefList.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/HrefList.php
deleted file mode 100644
index a5bad4ace3..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/HrefList.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Property;
-
-use Sabre\DAV;
-
-/**
- * HrefList property
- *
- * This property contains multiple {DAV:}href elements, each containing a url.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class HrefList extends DAV\Property {
-
-    /**
-     * hrefs
-     *
-     * @var array
-     */
-    private $hrefs;
-
-    /**
-     * Automatically prefix the url with the server base directory
-     *
-     * @var bool
-     */
-    private $autoPrefix = true;
-
-    /**
-     * __construct
-     *
-     * @param array $hrefs
-     * @param bool $autoPrefix
-     */
-    public function __construct(array $hrefs, $autoPrefix = true) {
-
-        $this->hrefs = $hrefs;
-        $this->autoPrefix = $autoPrefix;
-
-    }
-
-    /**
-     * Returns the uris
-     *
-     * @return array
-     */
-    public function getHrefs() {
-
-        return $this->hrefs;
-
-    }
-
-    /**
-     * Serializes this property.
-     *
-     * It will additionally prepend the href property with the server's base uri.
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $dom
-     * @return void
-     */
-    public function serialize(DAV\Server $server,\DOMElement $dom) {
-
-        $prefix = $server->xmlNamespaces['DAV:'];
-
-        foreach($this->hrefs as $href) {
-
-            $elem = $dom->ownerDocument->createElement($prefix . ':href');
-            if ($this->autoPrefix) {
-                $value = $server->getBaseUri() . DAV\URLUtil::encodePath($href);
-            } else {
-                $value = $href;
-            }
-            $elem->appendChild($dom->ownerDocument->createTextNode($value));
-
-            $dom->appendChild($elem);
-        }
-
-    }
-
-    /**
-     * Unserializes this property from a DOM Element
-     *
-     * This method returns an instance of this class.
-     * It will only decode {DAV:}href values.
-     *
-     * @param \DOMElement $dom
-     * @return DAV\Property\HrefList
-     */
-    static function unserialize(\DOMElement $dom) {
-
-        $hrefs = array();
-        foreach($dom->childNodes as $child) {
-            if (DAV\XMLUtil::toClarkNotation($child)==='{DAV:}href') {
-                $hrefs[] = $child->textContent;
-            }
-        }
-        return new self($hrefs, false);
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/IHref.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/IHref.php
deleted file mode 100644
index 268ab8d517..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/IHref.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Property;
-
-/**
- * IHref interface
- *
- * Any property implementing this interface can expose a related url.
- * This is used by certain subsystems to aquire more information about for example
- * the owner of a file
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface IHref {
-
-    /**
-     * getHref
-     *
-     * @return string
-     */
-    function getHref();
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/LockDiscovery.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/LockDiscovery.php
deleted file mode 100644
index 6b47935af4..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/LockDiscovery.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Property;
-
-use Sabre\DAV;
-
-/**
- * Represents {DAV:}lockdiscovery property
- *
- * This property contains all the open locks on a given resource
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class LockDiscovery extends DAV\Property {
-
-    /**
-     * locks
-     *
-     * @var array
-     */
-    public $locks;
-
-    /**
-     * Should we show the locktoken as well?
-     *
-     * @var bool
-     */
-    public $revealLockToken;
-
-    /**
-     * Hides the {DAV:}lockroot element from the response.
-     *
-     * It was reported that showing the lockroot in the response can break
-     * Office 2000 compatibility.
-     */
-    static public $hideLockRoot = false;
-
-    /**
-     * __construct
-     *
-     * @param array $locks
-     * @param bool $revealLockToken
-     */
-    public function __construct($locks, $revealLockToken = false) {
-
-        $this->locks = $locks;
-        $this->revealLockToken = $revealLockToken;
-
-    }
-
-    /**
-     * serialize
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $prop
-     * @return void
-     */
-    public function serialize(DAV\Server $server, \DOMElement $prop) {
-
-        $doc = $prop->ownerDocument;
-
-        foreach($this->locks as $lock) {
-
-            $activeLock = $doc->createElementNS('DAV:','d:activelock');
-            $prop->appendChild($activeLock);
-
-            $lockScope = $doc->createElementNS('DAV:','d:lockscope');
-            $activeLock->appendChild($lockScope);
-
-            $lockScope->appendChild($doc->createElementNS('DAV:','d:' . ($lock->scope==DAV\Locks\LockInfo::EXCLUSIVE?'exclusive':'shared')));
-
-            $lockType = $doc->createElementNS('DAV:','d:locktype');
-            $activeLock->appendChild($lockType);
-
-            $lockType->appendChild($doc->createElementNS('DAV:','d:write'));
-
-            /* {DAV:}lockroot */
-            if (!self::$hideLockRoot) {
-                $lockRoot = $doc->createElementNS('DAV:','d:lockroot');
-                $activeLock->appendChild($lockRoot);
-                $href = $doc->createElementNS('DAV:','d:href');
-                $href->appendChild($doc->createTextNode($server->getBaseUri() . $lock->uri));
-                $lockRoot->appendChild($href);
-            }
-
-            $activeLock->appendChild($doc->createElementNS('DAV:','d:depth',($lock->depth == DAV\Server::DEPTH_INFINITY?'infinity':$lock->depth)));
-            $activeLock->appendChild($doc->createElementNS('DAV:','d:timeout','Second-' . $lock->timeout));
-
-            if ($this->revealLockToken) {
-                $lockToken = $doc->createElementNS('DAV:','d:locktoken');
-                $activeLock->appendChild($lockToken);
-                $lockToken->appendChild($doc->createElementNS('DAV:','d:href','opaquelocktoken:' . $lock->token));
-            }
-
-            $activeLock->appendChild($doc->createElementNS('DAV:','d:owner',$lock->owner));
-
-        }
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/ResourceType.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/ResourceType.php
deleted file mode 100644
index 68134f3f91..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/ResourceType.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Property;
-
-use Sabre\DAV;
-
-/**
- * This class represents the {DAV:}resourcetype property
- *
- * Normally for files this is empty, and for collection {DAV:}collection.
- * However, other specs define different values for this.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class ResourceType extends DAV\Property {
-
-    /**
-     * resourceType
-     *
-     * @var array
-     */
-    public $resourceType = array();
-
-    /**
-     * __construct
-     *
-     * @param mixed $resourceType
-     */
-    public function __construct($resourceType = array()) {
-
-        if ($resourceType === DAV\Server::NODE_FILE)
-            $this->resourceType = array();
-        elseif ($resourceType === DAV\Server::NODE_DIRECTORY)
-            $this->resourceType = array('{DAV:}collection');
-        elseif (is_array($resourceType))
-            $this->resourceType = $resourceType;
-        else
-            $this->resourceType = array($resourceType);
-
-    }
-
-    /**
-     * serialize
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $prop
-     * @return void
-     */
-    public function serialize(DAV\Server $server, \DOMElement $prop) {
-
-        $propName = null;
-        $rt = $this->resourceType;
-
-        foreach($rt as $resourceType) {
-            if (preg_match('/^{([^}]*)}(.*)$/',$resourceType,$propName)) {
-
-                if (isset($server->xmlNamespaces[$propName[1]])) {
-                    $prop->appendChild($prop->ownerDocument->createElement($server->xmlNamespaces[$propName[1]] . ':' . $propName[2]));
-                } else {
-                    $prop->appendChild($prop->ownerDocument->createElementNS($propName[1],'custom:' . $propName[2]));
-                }
-
-            }
-        }
-
-    }
-
-    /**
-     * Returns the values in clark-notation
-     *
-     * For example array('{DAV:}collection')
-     *
-     * @return array
-     */
-    public function getValue() {
-
-        return $this->resourceType;
-
-    }
-
-    /**
-     * Checks if the principal contains a certain value
-     *
-     * @param string $type
-     * @return bool
-     */
-    public function is($type) {
-
-        return in_array($type, $this->resourceType);
-
-    }
-
-    /**
-     * Adds a resourcetype value to this property
-     *
-     * @param string $type
-     * @return void
-     */
-    public function add($type) {
-
-        $this->resourceType[] = $type;
-        $this->resourceType = array_unique($this->resourceType);
-
-    }
-
-    /**
-     * Unserializes a DOM element into a ResourceType property.
-     *
-     * @param \DOMElement $dom
-     * @return DAV\Property\ResourceType
-     */
-    static public function unserialize(\DOMElement $dom) {
-
-        $value = array();
-        foreach($dom->childNodes as $child) {
-
-            $value[] = DAV\XMLUtil::toClarkNotation($child);
-
-        }
-
-        return new self($value);
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/Response.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/Response.php
deleted file mode 100644
index 370abc26be..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/Response.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Property;
-
-use Sabre\DAV;
-
-/**
- * Response property
- *
- * This class represents the {DAV:}response XML element.
- * This is used by the Server class to encode individual items within a multistatus
- * response.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Response extends DAV\Property implements IHref {
-
-    /**
-     * Url for the response
-     *
-     * @var string
-     */
-    private $href;
-
-    /**
-     * Propertylist, ordered by HTTP status code
-     *
-     * @var array
-     */
-    private $responseProperties;
-
-    /**
-     * The responseProperties argument is a list of properties
-     * within an array with keys representing HTTP status codes
-     *
-     * @param string $href
-     * @param array $responseProperties
-     */
-    public function __construct($href, array $responseProperties) {
-
-        $this->href = $href;
-        $this->responseProperties = $responseProperties;
-
-    }
-
-    /**
-     * Returns the url
-     *
-     * @return string
-     */
-    public function getHref() {
-
-        return $this->href;
-
-    }
-
-    /**
-     * Returns the property list
-     *
-     * @return array
-     */
-    public function getResponseProperties() {
-
-        return $this->responseProperties;
-
-    }
-
-    /**
-     * serialize
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $dom
-     * @return void
-     */
-    public function serialize(DAV\Server $server, \DOMElement $dom) {
-
-        $document = $dom->ownerDocument;
-        $properties = $this->responseProperties;
-
-        $xresponse = $document->createElement('d:response');
-        $dom->appendChild($xresponse);
-
-        $uri = DAV\URLUtil::encodePath($this->href);
-
-        // Adding the baseurl to the beginning of the url
-        $uri = $server->getBaseUri() . $uri;
-
-        $xresponse->appendChild($document->createElement('d:href',$uri));
-
-        // The properties variable is an array containing properties, grouped by
-        // HTTP status
-        foreach($properties as $httpStatus=>$propertyGroup) {
-
-            // The 'href' is also in this array, and it's special cased.
-            // We will ignore it
-            if ($httpStatus=='href') continue;
-
-            // If there are no properties in this group, we can also just carry on
-            if (!count($propertyGroup)) continue;
-
-            $xpropstat = $document->createElement('d:propstat');
-            $xresponse->appendChild($xpropstat);
-
-            $xprop = $document->createElement('d:prop');
-            $xpropstat->appendChild($xprop);
-
-            $nsList = $server->xmlNamespaces;
-
-            foreach($propertyGroup as $propertyName=>$propertyValue) {
-
-                $propName = null;
-                preg_match('/^{([^}]*)}(.*)$/',$propertyName,$propName);
-
-                // special case for empty namespaces
-                if ($propName[1]=='') {
-
-                    $currentProperty = $document->createElement($propName[2]);
-                    $xprop->appendChild($currentProperty);
-                    $currentProperty->setAttribute('xmlns','');
-
-                } else {
-
-                    if (!isset($nsList[$propName[1]])) {
-                        $nsList[$propName[1]] = 'x' . count($nsList);
-                    }
-
-                    // If the namespace was defined in the top-level xml namespaces, it means
-                    // there was already a namespace declaration, and we don't have to worry about it.
-                    if (isset($server->xmlNamespaces[$propName[1]])) {
-                        $currentProperty = $document->createElement($nsList[$propName[1]] . ':' . $propName[2]);
-                    } else {
-                        $currentProperty = $document->createElementNS($propName[1],$nsList[$propName[1]].':' . $propName[2]);
-                    }
-                    $xprop->appendChild($currentProperty);
-
-                }
-
-                if (is_scalar($propertyValue)) {
-                    $text = $document->createTextNode($propertyValue);
-                    $currentProperty->appendChild($text);
-                } elseif ($propertyValue instanceof DAV\PropertyInterface) {
-                    $propertyValue->serialize($server,$currentProperty);
-                } elseif (!is_null($propertyValue)) {
-                    throw new DAV\Exception('Unknown property value type: ' . gettype($propertyValue) . ' for property: ' . $propertyName);
-                }
-
-            }
-
-            $xpropstat->appendChild($document->createElement('d:status',$server->httpResponse->getStatusMessage($httpStatus)));
-
-        }
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/ResponseList.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/ResponseList.php
deleted file mode 100644
index 9db6cbbf59..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/ResponseList.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Property;
-
-use Sabre\DAV;
-
-/**
- * ResponseList property
- *
- * This class represents multiple {DAV:}response XML elements.
- * This is used by the Server class to encode items within a multistatus
- * response.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class ResponseList extends DAV\Property {
-
-    /**
-     * Response objects.
-     *
-     * @var array
-     */
-    private $responses;
-
-    /**
-     * The only valid argument is a list of Sabre\DAV\Property\Response
-     * objects.
-     *
-     * @param array $responses;
-     */
-    public function __construct($responses) {
-
-        foreach($responses as $response) {
-            if (!($response instanceof Response)) {
-                throw new \InvalidArgumentException('You must pass an array of Sabre\DAV\Property\Response objects');
-            }
-        }
-        $this->responses = $responses;
-
-    }
-
-    /**
-     * serialize
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $dom
-     * @return void
-     */
-    public function serialize(DAV\Server $server,\DOMElement $dom) {
-
-        foreach($this->responses as $response) {
-            $response->serialize($server, $dom);
-        }
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/SupportedLock.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/SupportedLock.php
deleted file mode 100644
index 035c2f3301..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/SupportedLock.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Property;
-
-use Sabre\DAV;
-
-/**
- * This class represents the {DAV:}supportedlock property
- *
- * This property contains information about what kind of locks
- * this server supports.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class SupportedLock extends DAV\Property {
-
-    /**
-     * supportsLocks
-     *
-     * @var mixed
-     */
-    public $supportsLocks = false;
-
-    /**
-     * __construct
-     *
-     * @param mixed $supportsLocks
-     */
-    public function __construct($supportsLocks) {
-
-        $this->supportsLocks = $supportsLocks;
-
-    }
-
-    /**
-     * serialize
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $prop
-     * @return void
-     */
-    public function serialize(DAV\Server $server,\DOMElement $prop) {
-
-        $doc = $prop->ownerDocument;
-
-        if (!$this->supportsLocks) return null;
-
-        $lockEntry1 = $doc->createElement('d:lockentry');
-        $lockEntry2 = $doc->createElement('d:lockentry');
-
-        $prop->appendChild($lockEntry1);
-        $prop->appendChild($lockEntry2);
-
-        $lockScope1 = $doc->createElement('d:lockscope');
-        $lockScope2 = $doc->createElement('d:lockscope');
-        $lockType1 = $doc->createElement('d:locktype');
-        $lockType2 = $doc->createElement('d:locktype');
-
-        $lockEntry1->appendChild($lockScope1);
-        $lockEntry1->appendChild($lockType1);
-        $lockEntry2->appendChild($lockScope2);
-        $lockEntry2->appendChild($lockType2);
-
-        $lockScope1->appendChild($doc->createElement('d:exclusive'));
-        $lockScope2->appendChild($doc->createElement('d:shared'));
-
-        $lockType1->appendChild($doc->createElement('d:write'));
-        $lockType2->appendChild($doc->createElement('d:write'));
-
-        //$frag->appendXML('<d:lockentry><d:lockscope><d:exclusive /></d:lockscope><d:locktype><d:write /></d:locktype></d:lockentry>');
-        //$frag->appendXML('<d:lockentry><d:lockscope><d:shared /></d:lockscope><d:locktype><d:write /></d:locktype></d:lockentry>');
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/SupportedReportSet.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/SupportedReportSet.php
deleted file mode 100644
index a8a90bb189..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Property/SupportedReportSet.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Property;
-
-use Sabre\DAV;
-
-/**
- * supported-report-set property.
- *
- * This property is defined in RFC3253, but since it's
- * so common in other webdav-related specs, it is part of the core server.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class SupportedReportSet extends DAV\Property {
-
-    /**
-     * List of reports
-     *
-     * @var array
-     */
-    protected $reports = array();
-
-    /**
-     * Creates the property
-     *
-     * Any reports passed in the constructor
-     * should be valid report-types in clark-notation.
-     *
-     * Either a string or an array of strings must be passed.
-     *
-     * @param mixed $reports
-     */
-    public function __construct($reports = null) {
-
-        if (!is_null($reports))
-            $this->addReport($reports);
-
-    }
-
-    /**
-     * Adds a report to this property
-     *
-     * The report must be a string in clark-notation.
-     * Multiple reports can be specified as an array.
-     *
-     * @param mixed $report
-     * @return void
-     */
-    public function addReport($report) {
-
-        if (!is_array($report)) $report = array($report);
-
-        foreach($report as $r) {
-
-            if (!preg_match('/^{([^}]*)}(.*)$/',$r))
-                throw new DAV\Exception('Reportname must be in clark-notation');
-
-            $this->reports[] = $r;
-
-        }
-
-    }
-
-    /**
-     * Returns the list of supported reports
-     *
-     * @return array
-     */
-    public function getValue() {
-
-        return $this->reports;
-
-    }
-
-    /**
-     * Serializes the node
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $prop
-     * @return void
-     */
-    public function serialize(DAV\Server $server, \DOMElement $prop) {
-
-        foreach($this->reports as $reportName) {
-
-            $supportedReport = $prop->ownerDocument->createElement('d:supported-report');
-            $prop->appendChild($supportedReport);
-
-            $report = $prop->ownerDocument->createElement('d:report');
-            $supportedReport->appendChild($report);
-
-            preg_match('/^{([^}]*)}(.*)$/',$reportName,$matches);
-
-            list(, $namespace, $element) = $matches;
-
-            $prefix = isset($server->xmlNamespaces[$namespace])?$server->xmlNamespaces[$namespace]:null;
-
-            if ($prefix) {
-                $report->appendChild($prop->ownerDocument->createElement($prefix . ':' . $element));
-            } else {
-                $report->appendChild($prop->ownerDocument->createElementNS($namespace, 'x:' . $element));
-            }
-
-        }
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/PropertyInterface.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/PropertyInterface.php
deleted file mode 100644
index 2fb0d7db6b..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/PropertyInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-/**
- * PropertyInterface
- *
- * Implement this interface to create new complex properties
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface PropertyInterface {
-
-    public function serialize(Server $server, \DOMElement $prop);
-
-    static function unserialize(\DOMElement $prop);
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Server.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Server.php
deleted file mode 100644
index e0a68ab50b..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Server.php
+++ /dev/null
@@ -1,2178 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-use Sabre\HTTP;
-
-/**
- * Main DAV server class
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Server {
-
-    /**
-     * Infinity is used for some request supporting the HTTP Depth header and indicates that the operation should traverse the entire tree
-     */
-    const DEPTH_INFINITY = -1;
-
-    /**
-     * Nodes that are files, should have this as the type property
-     */
-    const NODE_FILE = 1;
-
-    /**
-     * Nodes that are directories, should use this value as the type property
-     */
-    const NODE_DIRECTORY = 2;
-
-    /**
-     * XML namespace for all SabreDAV related elements
-     */
-    const NS_SABREDAV = 'http://sabredav.org/ns';
-
-    /**
-     * The tree object
-     *
-     * @var Sabre\DAV\Tree
-     */
-    public $tree;
-
-    /**
-     * The base uri
-     *
-     * @var string
-     */
-    protected $baseUri = null;
-
-    /**
-     * httpResponse
-     *
-     * @var Sabre\HTTP\Response
-     */
-    public $httpResponse;
-
-    /**
-     * httpRequest
-     *
-     * @var Sabre\HTTP\Request
-     */
-    public $httpRequest;
-
-    /**
-     * The list of plugins
-     *
-     * @var array
-     */
-    protected $plugins = array();
-
-    /**
-     * This array contains a list of callbacks we should call when certain events are triggered
-     *
-     * @var array
-     */
-    protected $eventSubscriptions = array();
-
-    /**
-     * This is a default list of namespaces.
-     *
-     * If you are defining your own custom namespace, add it here to reduce
-     * bandwidth and improve legibility of xml bodies.
-     *
-     * @var array
-     */
-    public $xmlNamespaces = array(
-        'DAV:' => 'd',
-        'http://sabredav.org/ns' => 's',
-    );
-
-    /**
-     * The propertymap can be used to map properties from
-     * requests to property classes.
-     *
-     * @var array
-     */
-    public $propertyMap = array(
-        '{DAV:}resourcetype' => 'Sabre\\DAV\\Property\\ResourceType',
-    );
-
-    public $protectedProperties = array(
-        // RFC4918
-        '{DAV:}getcontentlength',
-        '{DAV:}getetag',
-        '{DAV:}getlastmodified',
-        '{DAV:}lockdiscovery',
-        '{DAV:}supportedlock',
-
-        // RFC4331
-        '{DAV:}quota-available-bytes',
-        '{DAV:}quota-used-bytes',
-
-        // RFC3744
-        '{DAV:}supported-privilege-set',
-        '{DAV:}current-user-privilege-set',
-        '{DAV:}acl',
-        '{DAV:}acl-restrictions',
-        '{DAV:}inherited-acl-set',
-
-    );
-
-    /**
-     * This is a flag that allow or not showing file, line and code
-     * of the exception in the returned XML
-     *
-     * @var bool
-     */
-    public $debugExceptions = false;
-
-    /**
-     * This property allows you to automatically add the 'resourcetype' value
-     * based on a node's classname or interface.
-     *
-     * The preset ensures that {DAV:}collection is automaticlly added for nodes
-     * implementing Sabre\DAV\ICollection.
-     *
-     * @var array
-     */
-    public $resourceTypeMapping = array(
-        'Sabre\\DAV\\ICollection' => '{DAV:}collection',
-    );
-
-    /**
-     * If this setting is turned off, SabreDAV's version number will be hidden
-     * from various places.
-     *
-     * Some people feel this is a good security measure.
-     *
-     * @var bool
-     */
-    static public $exposeVersion = true;
-
-    /**
-     * Sets up the server
-     *
-     * If a Sabre\DAV\Tree object is passed as an argument, it will
-     * use it as the directory tree. If a Sabre\DAV\INode is passed, it
-     * will create a Sabre\DAV\ObjectTree and use the node as the root.
-     *
-     * If nothing is passed, a Sabre\DAV\SimpleCollection is created in
-     * a Sabre\DAV\ObjectTree.
-     *
-     * If an array is passed, we automatically create a root node, and use
-     * the nodes in the array as top-level children.
-     *
-     * @param Tree|INode|array|null $treeOrNode The tree object
-     */
-    public function __construct($treeOrNode = null) {
-
-        if ($treeOrNode instanceof Tree) {
-            $this->tree = $treeOrNode;
-        } elseif ($treeOrNode instanceof INode) {
-            $this->tree = new ObjectTree($treeOrNode);
-        } elseif (is_array($treeOrNode)) {
-
-            // If it's an array, a list of nodes was passed, and we need to
-            // create the root node.
-            foreach($treeOrNode as $node) {
-                if (!($node instanceof INode)) {
-                    throw new Exception('Invalid argument passed to constructor. If you\'re passing an array, all the values must implement Sabre\\DAV\\INode');
-                }
-            }
-
-            $root = new SimpleCollection('root', $treeOrNode);
-            $this->tree = new ObjectTree($root);
-
-        } elseif (is_null($treeOrNode)) {
-            $root = new SimpleCollection('root');
-            $this->tree = new ObjectTree($root);
-        } else {
-            throw new Exception('Invalid argument passed to constructor. Argument must either be an instance of Sabre\\DAV\\Tree, Sabre\\DAV\\INode, an array or null');
-        }
-        $this->httpResponse = new HTTP\Response();
-        $this->httpRequest = new HTTP\Request();
-
-    }
-
-    /**
-     * Starts the DAV Server
-     *
-     * @return void
-     */
-    public function exec() {
-
-        try {
-
-            // If nginx (pre-1.2) is used as a proxy server, and SabreDAV as an
-            // origin, we must make sure we send back HTTP/1.0 if this was
-            // requested.
-            // This is mainly because nginx doesn't support Chunked Transfer
-            // Encoding, and this forces the webserver SabreDAV is running on,
-            // to buffer entire responses to calculate Content-Length.
-            $this->httpResponse->defaultHttpVersion = $this->httpRequest->getHTTPVersion();
-
-            $this->invokeMethod($this->httpRequest->getMethod(), $this->getRequestUri());
-
-        } catch (Exception $e) {
-
-            try {
-                $this->broadcastEvent('exception', array($e));
-            } catch (Exception $ignore) {
-            }
-            $DOM = new \DOMDocument('1.0','utf-8');
-            $DOM->formatOutput = true;
-
-            $error = $DOM->createElementNS('DAV:','d:error');
-            $error->setAttribute('xmlns:s',self::NS_SABREDAV);
-            $DOM->appendChild($error);
-
-            $h = function($v) {
-
-                return htmlspecialchars($v, ENT_NOQUOTES, 'UTF-8');
-
-            };
-
-            $error->appendChild($DOM->createElement('s:exception',$h(get_class($e))));
-            $error->appendChild($DOM->createElement('s:message',$h($e->getMessage())));
-            if ($this->debugExceptions) {
-                $error->appendChild($DOM->createElement('s:file',$h($e->getFile())));
-                $error->appendChild($DOM->createElement('s:line',$h($e->getLine())));
-                $error->appendChild($DOM->createElement('s:code',$h($e->getCode())));
-                $error->appendChild($DOM->createElement('s:stacktrace',$h($e->getTraceAsString())));
-
-            }
-            if (self::$exposeVersion) {
-                $error->appendChild($DOM->createElement('s:sabredav-version',$h(Version::VERSION)));
-            }
-
-            if($e instanceof Exception) {
-
-                $httpCode = $e->getHTTPCode();
-                $e->serialize($this,$error);
-                $headers = $e->getHTTPHeaders($this);
-
-            } else {
-
-                $httpCode = 500;
-                $headers = array();
-
-            }
-            $headers['Content-Type'] = 'application/xml; charset=utf-8';
-
-            $this->httpResponse->sendStatus($httpCode);
-            $this->httpResponse->setHeaders($headers);
-            $this->httpResponse->sendBody($DOM->saveXML());
-
-        }
-
-    }
-
-    /**
-     * Sets the base server uri
-     *
-     * @param string $uri
-     * @return void
-     */
-    public function setBaseUri($uri) {
-
-        // If the baseUri does not end with a slash, we must add it
-        if ($uri[strlen($uri)-1]!=='/')
-            $uri.='/';
-
-        $this->baseUri = $uri;
-
-    }
-
-    /**
-     * Returns the base responding uri
-     *
-     * @return string
-     */
-    public function getBaseUri() {
-
-        if (is_null($this->baseUri)) $this->baseUri = $this->guessBaseUri();
-        return $this->baseUri;
-
-    }
-
-    /**
-     * This method attempts to detect the base uri.
-     * Only the PATH_INFO variable is considered.
-     *
-     * If this variable is not set, the root (/) is assumed.
-     *
-     * @return string
-     */
-    public function guessBaseUri() {
-
-        $pathInfo = $this->httpRequest->getRawServerValue('PATH_INFO');
-        $uri = $this->httpRequest->getRawServerValue('REQUEST_URI');
-
-        // If PATH_INFO is found, we can assume it's accurate.
-        if (!empty($pathInfo)) {
-
-            // We need to make sure we ignore the QUERY_STRING part
-            if ($pos = strpos($uri,'?'))
-                $uri = substr($uri,0,$pos);
-
-            // PATH_INFO is only set for urls, such as: /example.php/path
-            // in that case PATH_INFO contains '/path'.
-            // Note that REQUEST_URI is percent encoded, while PATH_INFO is
-            // not, Therefore they are only comparable if we first decode
-            // REQUEST_INFO as well.
-            $decodedUri = URLUtil::decodePath($uri);
-
-            // A simple sanity check:
-            if(substr($decodedUri,strlen($decodedUri)-strlen($pathInfo))===$pathInfo) {
-                $baseUri = substr($decodedUri,0,strlen($decodedUri)-strlen($pathInfo));
-                return rtrim($baseUri,'/') . '/';
-            }
-
-            throw new Exception('The REQUEST_URI ('. $uri . ') did not end with the contents of PATH_INFO (' . $pathInfo . '). This server might be misconfigured.');
-
-        }
-
-        // The last fallback is that we're just going to assume the server root.
-        return '/';
-
-    }
-
-    /**
-     * Adds a plugin to the server
-     *
-     * For more information, console the documentation of Sabre\DAV\ServerPlugin
-     *
-     * @param ServerPlugin $plugin
-     * @return void
-     */
-    public function addPlugin(ServerPlugin $plugin) {
-
-        $this->plugins[$plugin->getPluginName()] = $plugin;
-        $plugin->initialize($this);
-
-    }
-
-    /**
-     * Returns an initialized plugin by it's name.
-     *
-     * This function returns null if the plugin was not found.
-     *
-     * @param string $name
-     * @return ServerPlugin
-     */
-    public function getPlugin($name) {
-
-        if (isset($this->plugins[$name]))
-            return $this->plugins[$name];
-
-        // This is a fallback and deprecated.
-        foreach($this->plugins as $plugin) {
-            if (get_class($plugin)===$name) return $plugin;
-        }
-
-        return null;
-
-    }
-
-    /**
-     * Returns all plugins
-     *
-     * @return array
-     */
-    public function getPlugins() {
-
-        return $this->plugins;
-
-    }
-
-
-    /**
-     * Subscribe to an event.
-     *
-     * When the event is triggered, we'll call all the specified callbacks.
-     * It is possible to control the order of the callbacks through the
-     * priority argument.
-     *
-     * This is for example used to make sure that the authentication plugin
-     * is triggered before anything else. If it's not needed to change this
-     * number, it is recommended to ommit.
-     *
-     * @param string $event
-     * @param callback $callback
-     * @param int $priority
-     * @return void
-     */
-    public function subscribeEvent($event, $callback, $priority = 100) {
-
-        if (!isset($this->eventSubscriptions[$event])) {
-            $this->eventSubscriptions[$event] = array();
-        }
-        while(isset($this->eventSubscriptions[$event][$priority])) $priority++;
-        $this->eventSubscriptions[$event][$priority] = $callback;
-        ksort($this->eventSubscriptions[$event]);
-
-    }
-
-    /**
-     * Broadcasts an event
-     *
-     * This method will call all subscribers. If one of the subscribers returns false, the process stops.
-     *
-     * The arguments parameter will be sent to all subscribers
-     *
-     * @param string $eventName
-     * @param array $arguments
-     * @return bool
-     */
-    public function broadcastEvent($eventName,$arguments = array()) {
-
-        if (isset($this->eventSubscriptions[$eventName])) {
-
-            foreach($this->eventSubscriptions[$eventName] as $subscriber) {
-
-                $result = call_user_func_array($subscriber,$arguments);
-                if ($result===false) return false;
-
-            }
-
-        }
-
-        return true;
-
-    }
-
-    /**
-     * Handles a http request, and execute a method based on its name
-     *
-     * @param string $method
-     * @param string $uri
-     * @return void
-     */
-    public function invokeMethod($method, $uri) {
-
-        $method = strtoupper($method);
-
-        if (!$this->broadcastEvent('beforeMethod',array($method, $uri))) return;
-
-        // Make sure this is a HTTP method we support
-        $internalMethods = array(
-            'OPTIONS',
-            'GET',
-            'HEAD',
-            'DELETE',
-            'PROPFIND',
-            'MKCOL',
-            'PUT',
-            'PROPPATCH',
-            'COPY',
-            'MOVE',
-            'REPORT'
-        );
-
-        if (in_array($method,$internalMethods)) {
-
-            call_user_func(array($this,'http' . $method), $uri);
-
-        } else {
-
-            if ($this->broadcastEvent('unknownMethod',array($method, $uri))) {
-                // Unsupported method
-                throw new Exception\NotImplemented('There was no handler found for this "' . $method . '" method');
-            }
-
-        }
-
-    }
-
-    // {{{ HTTP Method implementations
-
-    /**
-     * HTTP OPTIONS
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpOptions($uri) {
-
-        $methods = $this->getAllowedMethods($uri);
-
-        $this->httpResponse->setHeader('Allow',strtoupper(implode(', ',$methods)));
-        $features = array('1','3', 'extended-mkcol');
-
-        foreach($this->plugins as $plugin) $features = array_merge($features,$plugin->getFeatures());
-
-        $this->httpResponse->setHeader('DAV',implode(', ',$features));
-        $this->httpResponse->setHeader('MS-Author-Via','DAV');
-        $this->httpResponse->setHeader('Accept-Ranges','bytes');
-        if (self::$exposeVersion) {
-            $this->httpResponse->setHeader('X-Sabre-Version',Version::VERSION);
-        }
-        $this->httpResponse->setHeader('Content-Length',0);
-        $this->httpResponse->sendStatus(200);
-
-    }
-
-    /**
-     * HTTP GET
-     *
-     * This method simply fetches the contents of a uri, like normal
-     *
-     * @param string $uri
-     * @return bool
-     */
-    protected function httpGet($uri) {
-
-        $node = $this->tree->getNodeForPath($uri,0);
-
-        if (!$this->checkPreconditions(true)) return false;
-        if (!$node instanceof IFile) throw new Exception\NotImplemented('GET is only implemented on File objects');
-
-        $body = $node->get();
-
-        // Converting string into stream, if needed.
-        if (is_string($body)) {
-            $stream = fopen('php://temp','r+');
-            fwrite($stream,$body);
-            rewind($stream);
-            $body = $stream;
-        }
-
-        /*
-         * TODO: getetag, getlastmodified, getsize should also be used using
-         * this method
-         */
-        $httpHeaders = $this->getHTTPHeaders($uri);
-
-        /* ContentType needs to get a default, because many webservers will otherwise
-         * default to text/html, and we don't want this for security reasons.
-         */
-        if (!isset($httpHeaders['Content-Type'])) {
-            $httpHeaders['Content-Type'] = 'application/octet-stream';
-        }
-
-
-        if (isset($httpHeaders['Content-Length'])) {
-
-            $nodeSize = $httpHeaders['Content-Length'];
-
-            // Need to unset Content-Length, because we'll handle that during figuring out the range
-            unset($httpHeaders['Content-Length']);
-
-        } else {
-            $nodeSize = null;
-        }
-
-        $this->httpResponse->setHeaders($httpHeaders);
-
-        $range = $this->getHTTPRange();
-        $ifRange = $this->httpRequest->getHeader('If-Range');
-        $ignoreRangeHeader = false;
-
-        // If ifRange is set, and range is specified, we first need to check
-        // the precondition.
-        if ($nodeSize && $range && $ifRange) {
-
-            // if IfRange is parsable as a date we'll treat it as a DateTime
-            // otherwise, we must treat it as an etag.
-            try {
-                $ifRangeDate = new \DateTime($ifRange);
-
-                // It's a date. We must check if the entity is modified since
-                // the specified date.
-                if (!isset($httpHeaders['Last-Modified'])) $ignoreRangeHeader = true;
-                else {
-                    $modified = new \DateTime($httpHeaders['Last-Modified']);
-                    if($modified > $ifRangeDate) $ignoreRangeHeader = true;
-                }
-
-            } catch (\Exception $e) {
-
-                // It's an entity. We can do a simple comparison.
-                if (!isset($httpHeaders['ETag'])) $ignoreRangeHeader = true;
-                elseif ($httpHeaders['ETag']!==$ifRange) $ignoreRangeHeader = true;
-            }
-        }
-
-        // We're only going to support HTTP ranges if the backend provided a filesize
-        if (!$ignoreRangeHeader && $nodeSize && $range) {
-
-            // Determining the exact byte offsets
-            if (!is_null($range[0])) {
-
-                $start = $range[0];
-                $end = $range[1]?$range[1]:$nodeSize-1;
-                if($start >= $nodeSize)
-                    throw new Exception\RequestedRangeNotSatisfiable('The start offset (' . $range[0] . ') exceeded the size of the entity (' . $nodeSize . ')');
-
-                if($end < $start) throw new Exception\RequestedRangeNotSatisfiable('The end offset (' . $range[1] . ') is lower than the start offset (' . $range[0] . ')');
-                if($end >= $nodeSize) $end = $nodeSize-1;
-
-            } else {
-
-                $start = $nodeSize-$range[1];
-                $end  = $nodeSize-1;
-
-                if ($start<0) $start = 0;
-
-            }
-
-            // New read/write stream
-            $newStream = fopen('php://temp','r+');
-
-            // stream_copy_to_stream() has a bug/feature: the `whence` argument
-            // is interpreted as SEEK_SET (count from absolute offset 0), while
-            // for a stream it should be SEEK_CUR (count from current offset).
-            // If a stream is nonseekable, the function fails. So we *emulate*
-            // the correct behaviour with fseek():
-            if ($start > 0) {
-                if (($curOffs = ftell($body)) === false) $curOffs = 0;
-                fseek($body, $start - $curOffs, SEEK_CUR);
-            }
-            stream_copy_to_stream($body, $newStream, $end-$start+1);
-            rewind($newStream);
-
-            $this->httpResponse->setHeader('Content-Length', $end-$start+1);
-            $this->httpResponse->setHeader('Content-Range','bytes ' . $start . '-' . $end . '/' . $nodeSize);
-            $this->httpResponse->sendStatus(206);
-            $this->httpResponse->sendBody($newStream);
-
-
-        } else {
-
-            if ($nodeSize) $this->httpResponse->setHeader('Content-Length',$nodeSize);
-            $this->httpResponse->sendStatus(200);
-            $this->httpResponse->sendBody($body);
-
-        }
-
-    }
-
-    /**
-     * HTTP HEAD
-     *
-     * This method is normally used to take a peak at a url, and only get the HTTP response headers, without the body
-     * This is used by clients to determine if a remote file was changed, so they can use a local cached version, instead of downloading it again
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpHead($uri) {
-
-        $node = $this->tree->getNodeForPath($uri);
-        /* This information is only collection for File objects.
-         * Ideally we want to throw 405 Method Not Allowed for every
-         * non-file, but MS Office does not like this
-         */
-        if ($node instanceof IFile) {
-            $headers = $this->getHTTPHeaders($this->getRequestUri());
-            if (!isset($headers['Content-Type'])) {
-                $headers['Content-Type'] = 'application/octet-stream';
-            }
-            $this->httpResponse->setHeaders($headers);
-        }
-        $this->httpResponse->sendStatus(200);
-
-    }
-
-    /**
-     * HTTP Delete
-     *
-     * The HTTP delete method, deletes a given uri
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpDelete($uri) {
-
-        // Checking If-None-Match and related headers.
-        if (!$this->checkPreconditions()) return;
-
-        if (!$this->broadcastEvent('beforeUnbind',array($uri))) return;
-        $this->tree->delete($uri);
-        $this->broadcastEvent('afterUnbind',array($uri));
-
-        $this->httpResponse->sendStatus(204);
-        $this->httpResponse->setHeader('Content-Length','0');
-
-    }
-
-
-    /**
-     * WebDAV PROPFIND
-     *
-     * This WebDAV method requests information about an uri resource, or a list of resources
-     * If a client wants to receive the properties for a single resource it will add an HTTP Depth: header with a 0 value
-     * If the value is 1, it means that it also expects a list of sub-resources (e.g.: files in a directory)
-     *
-     * The request body contains an XML data structure that has a list of properties the client understands
-     * The response body is also an xml document, containing information about every uri resource and the requested properties
-     *
-     * It has to return a HTTP 207 Multi-status status code
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpPropfind($uri) {
-
-        $requestedProperties = $this->parsePropFindRequest($this->httpRequest->getBody(true));
-
-        $depth = $this->getHTTPDepth(1);
-        // The only two options for the depth of a propfind is 0 or 1
-        if ($depth!=0) $depth = 1;
-
-        $newProperties = $this->getPropertiesForPath($uri,$requestedProperties,$depth);
-
-        // This is a multi-status response
-        $this->httpResponse->sendStatus(207);
-        $this->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->httpResponse->setHeader('Vary','Brief,Prefer');
-
-        // Normally this header is only needed for OPTIONS responses, however..
-        // iCal seems to also depend on these being set for PROPFIND. Since
-        // this is not harmful, we'll add it.
-        $features = array('1','3', 'extended-mkcol');
-        foreach($this->plugins as $plugin) $features = array_merge($features,$plugin->getFeatures());
-        $this->httpResponse->setHeader('DAV',implode(', ',$features));
-
-        $prefer = $this->getHTTPPrefer();
-        $minimal = $prefer['return-minimal'];
-
-        $data = $this->generateMultiStatus($newProperties, $minimal);
-        $this->httpResponse->sendBody($data);
-
-    }
-
-    /**
-     * WebDAV PROPPATCH
-     *
-     * This method is called to update properties on a Node. The request is an XML body with all the mutations.
-     * In this XML body it is specified which properties should be set/updated and/or deleted
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpPropPatch($uri) {
-
-        $newProperties = $this->parsePropPatchRequest($this->httpRequest->getBody(true));
-
-        $result = $this->updateProperties($uri, $newProperties);
-
-        $prefer = $this->getHTTPPrefer();
-        $this->httpResponse->setHeader('Vary','Brief,Prefer');
-
-        if ($prefer['return-minimal']) {
-
-            // If return-minimal is specified, we only have to check if the
-            // request was succesful, and don't need to return the
-            // multi-status.
-            $ok = true;
-            foreach($result as $code=>$prop) {
-                if ((int)$code > 299) {
-                    $ok = false;
-                }
-            }
-
-            if ($ok) {
-
-                $this->httpResponse->sendStatus(204);
-                return;
-
-            }
-
-        }
-
-        $this->httpResponse->sendStatus(207);
-        $this->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-
-        $this->httpResponse->sendBody(
-            $this->generateMultiStatus(array($result))
-        );
-
-    }
-
-    /**
-     * HTTP PUT method
-     *
-     * This HTTP method updates a file, or creates a new one.
-     *
-     * If a new resource was created, a 201 Created status code should be returned. If an existing resource is updated, it's a 204 No Content
-     *
-     * @param string $uri
-     * @return bool
-     */
-    protected function httpPut($uri) {
-
-        $body = $this->httpRequest->getBody();
-
-        // Intercepting Content-Range
-        if ($this->httpRequest->getHeader('Content-Range')) {
-            /**
-            Content-Range is dangerous for PUT requests:  PUT per definition
-            stores a full resource.  draft-ietf-httpbis-p2-semantics-15 says
-            in section 7.6:
-              An origin server SHOULD reject any PUT request that contains a
-              Content-Range header field, since it might be misinterpreted as
-              partial content (or might be partial content that is being mistakenly
-              PUT as a full representation).  Partial content updates are possible
-              by targeting a separately identified resource with state that
-              overlaps a portion of the larger resource, or by using a different
-              method that has been specifically defined for partial updates (for
-              example, the PATCH method defined in [RFC5789]).
-            This clarifies RFC2616 section 9.6:
-              The recipient of the entity MUST NOT ignore any Content-*
-              (e.g. Content-Range) headers that it does not understand or implement
-              and MUST return a 501 (Not Implemented) response in such cases.
-            OTOH is a PUT request with a Content-Range currently the only way to
-            continue an aborted upload request and is supported by curl, mod_dav,
-            Tomcat and others.  Since some clients do use this feature which results
-            in unexpected behaviour (cf PEAR::HTTP_WebDAV_Client 1.0.1), we reject
-            all PUT requests with a Content-Range for now.
-            */
-
-            throw new Exception\NotImplemented('PUT with Content-Range is not allowed.');
-        }
-
-        // Intercepting the Finder problem
-        if (($expected = $this->httpRequest->getHeader('X-Expected-Entity-Length')) && $expected > 0) {
-
-            /**
-            Many webservers will not cooperate well with Finder PUT requests,
-            because it uses 'Chunked' transfer encoding for the request body.
-
-            The symptom of this problem is that Finder sends files to the
-            server, but they arrive as 0-length files in PHP.
-
-            If we don't do anything, the user might think they are uploading
-            files successfully, but they end up empty on the server. Instead,
-            we throw back an error if we detect this.
-
-            The reason Finder uses Chunked, is because it thinks the files
-            might change as it's being uploaded, and therefore the
-            Content-Length can vary.
-
-            Instead it sends the X-Expected-Entity-Length header with the size
-            of the file at the very start of the request. If this header is set,
-            but we don't get a request body we will fail the request to
-            protect the end-user.
-            */
-
-            // Only reading first byte
-            $firstByte = fread($body,1);
-            if (strlen($firstByte)!==1) {
-                throw new Exception\Forbidden('This server is not compatible with OS/X finder. Consider using a different WebDAV client or webserver.');
-            }
-
-            // The body needs to stay intact, so we copy everything to a
-            // temporary stream.
-
-            $newBody = fopen('php://temp','r+');
-            fwrite($newBody,$firstByte);
-            stream_copy_to_stream($body, $newBody);
-            rewind($newBody);
-
-            $body = $newBody;
-
-        }
-
-        // Checking If-None-Match and related headers.
-        if (!$this->checkPreconditions()) return;
-
-        if ($this->tree->nodeExists($uri)) {
-
-            $node = $this->tree->getNodeForPath($uri);
-
-            // If the node is a collection, we'll deny it
-            if (!($node instanceof IFile)) throw new Exception\Conflict('PUT is not allowed on non-files.');
-            if (!$this->broadcastEvent('beforeWriteContent',array($uri, $node, &$body))) return false;
-
-            $etag = $node->put($body);
-
-            $this->broadcastEvent('afterWriteContent',array($uri, $node));
-
-            $this->httpResponse->setHeader('Content-Length','0');
-            if ($etag) $this->httpResponse->setHeader('ETag',$etag);
-            $this->httpResponse->sendStatus(204);
-
-        } else {
-
-            $etag = null;
-            // If we got here, the resource didn't exist yet.
-            if (!$this->createFile($this->getRequestUri(),$body,$etag)) {
-                // For one reason or another the file was not created.
-                return;
-            }
-
-            $this->httpResponse->setHeader('Content-Length','0');
-            if ($etag) $this->httpResponse->setHeader('ETag', $etag);
-            $this->httpResponse->sendStatus(201);
-
-        }
-
-    }
-
-
-    /**
-     * WebDAV MKCOL
-     *
-     * The MKCOL method is used to create a new collection (directory) on the server
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpMkcol($uri) {
-
-        $requestBody = $this->httpRequest->getBody(true);
-
-        if ($requestBody) {
-
-            $contentType = $this->httpRequest->getHeader('Content-Type');
-            if (strpos($contentType,'application/xml')!==0 && strpos($contentType,'text/xml')!==0) {
-
-                // We must throw 415 for unsupported mkcol bodies
-                throw new Exception\UnsupportedMediaType('The request body for the MKCOL request must have an xml Content-Type');
-
-            }
-
-            $dom = XMLUtil::loadDOMDocument($requestBody);
-            if (XMLUtil::toClarkNotation($dom->firstChild)!=='{DAV:}mkcol') {
-
-                // We must throw 415 for unsupported mkcol bodies
-                throw new Exception\UnsupportedMediaType('The request body for the MKCOL request must be a {DAV:}mkcol request construct.');
-
-            }
-
-            $properties = array();
-            foreach($dom->firstChild->childNodes as $childNode) {
-
-                if (XMLUtil::toClarkNotation($childNode)!=='{DAV:}set') continue;
-                $properties = array_merge($properties, XMLUtil::parseProperties($childNode, $this->propertyMap));
-
-            }
-            if (!isset($properties['{DAV:}resourcetype']))
-                throw new Exception\BadRequest('The mkcol request must include a {DAV:}resourcetype property');
-
-            $resourceType = $properties['{DAV:}resourcetype']->getValue();
-            unset($properties['{DAV:}resourcetype']);
-
-        } else {
-
-            $properties = array();
-            $resourceType = array('{DAV:}collection');
-
-        }
-
-        $result = $this->createCollection($uri, $resourceType, $properties);
-
-        if (is_array($result)) {
-            $this->httpResponse->sendStatus(207);
-            $this->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-
-            $this->httpResponse->sendBody(
-                $this->generateMultiStatus(array($result))
-            );
-
-        } else {
-            $this->httpResponse->setHeader('Content-Length','0');
-            $this->httpResponse->sendStatus(201);
-        }
-
-    }
-
-    /**
-     * WebDAV HTTP MOVE method
-     *
-     * This method moves one uri to a different uri. A lot of the actual request processing is done in getCopyMoveInfo
-     *
-     * @param string $uri
-     * @return bool
-     */
-    protected function httpMove($uri) {
-
-        $moveInfo = $this->getCopyAndMoveInfo();
-
-        // If the destination is part of the source tree, we must fail
-        if ($moveInfo['destination']==$uri)
-            throw new Exception\Forbidden('Source and destination uri are identical.');
-
-        if ($moveInfo['destinationExists']) {
-
-            if (!$this->broadcastEvent('beforeUnbind',array($moveInfo['destination']))) return false;
-            $this->tree->delete($moveInfo['destination']);
-            $this->broadcastEvent('afterUnbind',array($moveInfo['destination']));
-
-        }
-
-        if (!$this->broadcastEvent('beforeUnbind',array($uri))) return false;
-        if (!$this->broadcastEvent('beforeBind',array($moveInfo['destination']))) return false;
-        $this->tree->move($uri,$moveInfo['destination']);
-        $this->broadcastEvent('afterUnbind',array($uri));
-        $this->broadcastEvent('afterBind',array($moveInfo['destination']));
-
-        // If a resource was overwritten we should send a 204, otherwise a 201
-        $this->httpResponse->setHeader('Content-Length','0');
-        $this->httpResponse->sendStatus($moveInfo['destinationExists']?204:201);
-
-    }
-
-    /**
-     * WebDAV HTTP COPY method
-     *
-     * This method copies one uri to a different uri, and works much like the MOVE request
-     * A lot of the actual request processing is done in getCopyMoveInfo
-     *
-     * @param string $uri
-     * @return bool
-     */
-    protected function httpCopy($uri) {
-
-        $copyInfo = $this->getCopyAndMoveInfo();
-        // If the destination is part of the source tree, we must fail
-        if ($copyInfo['destination']==$uri)
-            throw new Exception\Forbidden('Source and destination uri are identical.');
-
-        if ($copyInfo['destinationExists']) {
-            if (!$this->broadcastEvent('beforeUnbind',array($copyInfo['destination']))) return false;
-            $this->tree->delete($copyInfo['destination']);
-
-        }
-        if (!$this->broadcastEvent('beforeBind',array($copyInfo['destination']))) return false;
-        $this->tree->copy($uri,$copyInfo['destination']);
-        $this->broadcastEvent('afterBind',array($copyInfo['destination']));
-
-        // If a resource was overwritten we should send a 204, otherwise a 201
-        $this->httpResponse->setHeader('Content-Length','0');
-        $this->httpResponse->sendStatus($copyInfo['destinationExists']?204:201);
-
-    }
-
-
-
-    /**
-     * HTTP REPORT method implementation
-     *
-     * Although the REPORT method is not part of the standard WebDAV spec (it's from rfc3253)
-     * It's used in a lot of extensions, so it made sense to implement it into the core.
-     *
-     * @param string $uri
-     * @return void
-     */
-    protected function httpReport($uri) {
-
-        $body = $this->httpRequest->getBody(true);
-        $dom = XMLUtil::loadDOMDocument($body);
-
-        $reportName = XMLUtil::toClarkNotation($dom->firstChild);
-
-        if ($this->broadcastEvent('report',array($reportName,$dom, $uri))) {
-
-            // If broadcastEvent returned true, it means the report was not supported
-            throw new Exception\ReportNotSupported();
-
-        }
-
-    }
-
-    // }}}
-    // {{{ HTTP/WebDAV protocol helpers
-
-    /**
-     * Returns an array with all the supported HTTP methods for a specific uri.
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getAllowedMethods($uri) {
-
-        $methods = array(
-            'OPTIONS',
-            'GET',
-            'HEAD',
-            'DELETE',
-            'PROPFIND',
-            'PUT',
-            'PROPPATCH',
-            'COPY',
-            'MOVE',
-            'REPORT'
-        );
-
-        // The MKCOL is only allowed on an unmapped uri
-        try {
-            $this->tree->getNodeForPath($uri);
-        } catch (Exception\NotFound $e) {
-            $methods[] = 'MKCOL';
-        }
-
-        // We're also checking if any of the plugins register any new methods
-        foreach($this->plugins as $plugin) $methods = array_merge($methods, $plugin->getHTTPMethods($uri));
-        array_unique($methods);
-
-        return $methods;
-
-    }
-
-    /**
-     * Gets the uri for the request, keeping the base uri into consideration
-     *
-     * @return string
-     */
-    public function getRequestUri() {
-
-        return $this->calculateUri($this->httpRequest->getUri());
-
-    }
-
-    /**
-     * Calculates the uri for a request, making sure that the base uri is stripped out
-     *
-     * @param string $uri
-     * @throws Exception\Forbidden A permission denied exception is thrown whenever there was an attempt to supply a uri outside of the base uri
-     * @return string
-     */
-    public function calculateUri($uri) {
-
-        if ($uri[0]!='/' && strpos($uri,'://')) {
-
-            $uri = parse_url($uri,PHP_URL_PATH);
-
-        }
-
-        $uri = str_replace('//','/',$uri);
-
-        if (strpos($uri,$this->getBaseUri())===0) {
-
-            return trim(URLUtil::decodePath(substr($uri,strlen($this->getBaseUri()))),'/');
-
-        // A special case, if the baseUri was accessed without a trailing
-        // slash, we'll accept it as well.
-        } elseif ($uri.'/' === $this->getBaseUri()) {
-
-            return '';
-
-        } else {
-
-            throw new Exception\Forbidden('Requested uri (' . $uri . ') is out of base uri (' . $this->getBaseUri() . ')');
-
-        }
-
-    }
-
-    /**
-     * Returns the HTTP depth header
-     *
-     * This method returns the contents of the HTTP depth request header. If the depth header was 'infinity' it will return the Sabre\DAV\Server::DEPTH_INFINITY object
-     * It is possible to supply a default depth value, which is used when the depth header has invalid content, or is completely non-existent
-     *
-     * @param mixed $default
-     * @return int
-     */
-    public function getHTTPDepth($default = self::DEPTH_INFINITY) {
-
-        // If its not set, we'll grab the default
-        $depth = $this->httpRequest->getHeader('Depth');
-
-        if (is_null($depth)) return $default;
-
-        if ($depth == 'infinity') return self::DEPTH_INFINITY;
-
-
-        // If its an unknown value. we'll grab the default
-        if (!ctype_digit($depth)) return $default;
-
-        return (int)$depth;
-
-    }
-
-    /**
-     * Returns the HTTP range header
-     *
-     * This method returns null if there is no well-formed HTTP range request
-     * header or array($start, $end).
-     *
-     * The first number is the offset of the first byte in the range.
-     * The second number is the offset of the last byte in the range.
-     *
-     * If the second offset is null, it should be treated as the offset of the last byte of the entity
-     * If the first offset is null, the second offset should be used to retrieve the last x bytes of the entity
-     *
-     * @return array|null
-     */
-    public function getHTTPRange() {
-
-        $range = $this->httpRequest->getHeader('range');
-        if (is_null($range)) return null;
-
-        // Matching "Range: bytes=1234-5678: both numbers are optional
-
-        if (!preg_match('/^bytes=([0-9]*)-([0-9]*)$/i',$range,$matches)) return null;
-
-        if ($matches[1]==='' && $matches[2]==='') return null;
-
-        return array(
-            $matches[1]!==''?$matches[1]:null,
-            $matches[2]!==''?$matches[2]:null,
-        );
-
-    }
-
-    /**
-     * Returns the HTTP Prefer header information.
-     *
-     * The prefer header is defined in:
-     * http://tools.ietf.org/html/draft-snell-http-prefer-14
-     *
-     * This method will return an array with options.
-     *
-     * Currently, the following options may be returned:
-     *   array(
-     *      'return-asynch'         => true,
-     *      'return-minimal'        => true,
-     *      'return-representation' => true,
-     *      'wait'                  => 30,
-     *      'strict'                => true,
-     *      'lenient'               => true,
-     *   )
-     *
-     * This method also supports the Brief header, and will also return
-     * 'return-minimal' if the brief header was set to 't'.
-     *
-     * For the boolean options, false will be returned if the headers are not
-     * specified. For the integer options it will be 'null'.
-     *
-     * @return array
-     */
-    public function getHTTPPrefer() {
-
-        $result = array(
-            'return-asynch'         => false,
-            'return-minimal'        => false,
-            'return-representation' => false,
-            'wait'                  => null,
-            'strict'                => false,
-            'lenient'               => false,
-        );
-
-        if ($prefer = $this->httpRequest->getHeader('Prefer')) {
-
-            $parameters = array_map('trim',
-                explode(',', $prefer)
-            );
-
-            foreach($parameters as $parameter) {
-
-                // Right now our regex only supports the tokens actually
-                // specified in the draft. We may need to expand this if new
-                // tokens get registered.
-                if(!preg_match('/^(?P<token>[a-z0-9-]+)(?:=(?P<value>[0-9]+))?$/', $parameter, $matches)) {
-                    continue;
-                }
-
-                switch($matches['token']) {
-
-                    case 'return-asynch' :
-                    case 'return-minimal' :
-                    case 'return-representation' :
-                    case 'strict' :
-                    case 'lenient' :
-                        $result[$matches['token']] = true;
-                        break;
-                    case 'wait' :
-                        $result[$matches['token']] = $matches['value'];
-                        break;
-
-                }
-
-            }
-
-        }
-
-        if ($this->httpRequest->getHeader('Brief')=='t') {
-            $result['return-minimal'] = true;
-        }
-
-        return $result;
-
-    }
-
-
-    /**
-     * Returns information about Copy and Move requests
-     *
-     * This function is created to help getting information about the source and the destination for the
-     * WebDAV MOVE and COPY HTTP request. It also validates a lot of information and throws proper exceptions
-     *
-     * The returned value is an array with the following keys:
-     *   * destination - Destination path
-     *   * destinationExists - Whether or not the destination is an existing url (and should therefore be overwritten)
-     *
-     * @return array
-     */
-    public function getCopyAndMoveInfo() {
-
-        // Collecting the relevant HTTP headers
-        if (!$this->httpRequest->getHeader('Destination')) throw new Exception\BadRequest('The destination header was not supplied');
-        $destination = $this->calculateUri($this->httpRequest->getHeader('Destination'));
-        $overwrite = $this->httpRequest->getHeader('Overwrite');
-        if (!$overwrite) $overwrite = 'T';
-        if (strtoupper($overwrite)=='T') $overwrite = true;
-        elseif (strtoupper($overwrite)=='F') $overwrite = false;
-        // We need to throw a bad request exception, if the header was invalid
-        else throw new Exception\BadRequest('The HTTP Overwrite header should be either T or F');
-
-        list($destinationDir) = URLUtil::splitPath($destination);
-
-        try {
-            $destinationParent = $this->tree->getNodeForPath($destinationDir);
-            if (!($destinationParent instanceof ICollection)) throw new Exception\UnsupportedMediaType('The destination node is not a collection');
-        } catch (Exception\NotFound $e) {
-
-            // If the destination parent node is not found, we throw a 409
-            throw new Exception\Conflict('The destination node is not found');
-        }
-
-        try {
-
-            $destinationNode = $this->tree->getNodeForPath($destination);
-
-            // If this succeeded, it means the destination already exists
-            // we'll need to throw precondition failed in case overwrite is false
-            if (!$overwrite) throw new Exception\PreconditionFailed('The destination node already exists, and the overwrite header is set to false','Overwrite');
-
-        } catch (Exception\NotFound $e) {
-
-            // Destination didn't exist, we're all good
-            $destinationNode = false;
-
-
-
-        }
-
-        // These are the three relevant properties we need to return
-        return array(
-            'destination'       => $destination,
-            'destinationExists' => $destinationNode==true,
-            'destinationNode'   => $destinationNode,
-        );
-
-    }
-
-    /**
-     * Returns a list of properties for a path
-     *
-     * This is a simplified version getPropertiesForPath.
-     * if you aren't interested in status codes, but you just
-     * want to have a flat list of properties. Use this method.
-     *
-     * @param string $path
-     * @param array $propertyNames
-     */
-    public function getProperties($path, $propertyNames) {
-
-        $result = $this->getPropertiesForPath($path,$propertyNames,0);
-        return $result[0][200];
-
-    }
-
-    /**
-     * A kid-friendly way to fetch properties for a node's children.
-     *
-     * The returned array will be indexed by the path of the of child node.
-     * Only properties that are actually found will be returned.
-     *
-     * The parent node will not be returned.
-     *
-     * @param string $path
-     * @param array $propertyNames
-     * @return array
-     */
-    public function getPropertiesForChildren($path, $propertyNames) {
-
-        $result = array();
-        foreach($this->getPropertiesForPath($path,$propertyNames,1) as $k=>$row) {
-
-            // Skipping the parent path
-            if ($k === 0) continue;
-
-            $result[$row['href']] = $row[200];
-
-        }
-        return $result;
-
-    }
-
-    /**
-     * Returns a list of HTTP headers for a particular resource
-     *
-     * The generated http headers are based on properties provided by the
-     * resource. The method basically provides a simple mapping between
-     * DAV property and HTTP header.
-     *
-     * The headers are intended to be used for HEAD and GET requests.
-     *
-     * @param string $path
-     * @return array
-     */
-    public function getHTTPHeaders($path) {
-
-        $propertyMap = array(
-            '{DAV:}getcontenttype'   => 'Content-Type',
-            '{DAV:}getcontentlength' => 'Content-Length',
-            '{DAV:}getlastmodified'  => 'Last-Modified',
-            '{DAV:}getetag'          => 'ETag',
-        );
-
-        $properties = $this->getProperties($path,array_keys($propertyMap));
-
-        $headers = array();
-        foreach($propertyMap as $property=>$header) {
-            if (!isset($properties[$property])) continue;
-
-            if (is_scalar($properties[$property])) {
-                $headers[$header] = $properties[$property];
-
-            // GetLastModified gets special cased
-            } elseif ($properties[$property] instanceof Property\GetLastModified) {
-                $headers[$header] = HTTP\Util::toHTTPDate($properties[$property]->getTime());
-            }
-
-        }
-
-        return $headers;
-
-    }
-
-    /**
-     * Returns a list of properties for a given path
-     *
-     * The path that should be supplied should have the baseUrl stripped out
-     * The list of properties should be supplied in Clark notation. If the list is empty
-     * 'allprops' is assumed.
-     *
-     * If a depth of 1 is requested child elements will also be returned.
-     *
-     * @param string $path
-     * @param array $propertyNames
-     * @param int $depth
-     * @return array
-     */
-    public function getPropertiesForPath($path, $propertyNames = array(), $depth = 0) {
-
-        if ($depth!=0) $depth = 1;
-
-        $path = rtrim($path,'/');
-
-        // This event allows people to intercept these requests early on in the
-        // process.
-        //
-        // We're not doing anything with the result, but this can be helpful to
-        // pre-fetch certain expensive live properties.
-        $this->broadCastEvent('beforeGetPropertiesForPath', array($path, $propertyNames, $depth));
-
-        $returnPropertyList = array();
-
-        $parentNode = $this->tree->getNodeForPath($path);
-        $nodes = array(
-            $path => $parentNode
-        );
-        if ($depth==1 && $parentNode instanceof ICollection) {
-            foreach($this->tree->getChildren($path) as $childNode)
-                $nodes[$path . '/' . $childNode->getName()] = $childNode;
-        }
-
-        // If the propertyNames array is empty, it means all properties are requested.
-        // We shouldn't actually return everything we know though, and only return a
-        // sensible list.
-        $allProperties = count($propertyNames)==0;
-
-        foreach($nodes as $myPath=>$node) {
-
-            $currentPropertyNames = $propertyNames;
-
-            $newProperties = array(
-                '200' => array(),
-                '404' => array(),
-            );
-
-            if ($allProperties) {
-                // Default list of propertyNames, when all properties were requested.
-                $currentPropertyNames = array(
-                    '{DAV:}getlastmodified',
-                    '{DAV:}getcontentlength',
-                    '{DAV:}resourcetype',
-                    '{DAV:}quota-used-bytes',
-                    '{DAV:}quota-available-bytes',
-                    '{DAV:}getetag',
-                    '{DAV:}getcontenttype',
-                );
-            }
-
-            // If the resourceType was not part of the list, we manually add it
-            // and mark it for removal. We need to know the resourcetype in order
-            // to make certain decisions about the entry.
-            // WebDAV dictates we should add a / and the end of href's for collections
-            $removeRT = false;
-            if (!in_array('{DAV:}resourcetype',$currentPropertyNames)) {
-                $currentPropertyNames[] = '{DAV:}resourcetype';
-                $removeRT = true;
-            }
-
-            $result = $this->broadcastEvent('beforeGetProperties',array($myPath, $node, &$currentPropertyNames, &$newProperties));
-            // If this method explicitly returned false, we must ignore this
-            // node as it is inaccessible.
-            if ($result===false) continue;
-
-            if (count($currentPropertyNames) > 0) {
-
-                if ($node instanceof IProperties) {
-                    $nodeProperties = $node->getProperties($currentPropertyNames);
-
-                    // The getProperties method may give us too much,
-                    // properties, in case the implementor was lazy.
-                    //
-                    // So as we loop through this list, we will only take the
-                    // properties that were actually requested and discard the
-                    // rest.
-                    foreach($currentPropertyNames as $k=>$currentPropertyName) {
-                        if (isset($nodeProperties[$currentPropertyName])) {
-                            unset($currentPropertyNames[$k]);
-                            $newProperties[200][$currentPropertyName] = $nodeProperties[$currentPropertyName];
-                        }
-                    }
-
-                }
-
-            }
-
-            foreach($currentPropertyNames as $prop) {
-
-                if (isset($newProperties[200][$prop])) continue;
-
-                switch($prop) {
-                    case '{DAV:}getlastmodified'       : if ($node->getLastModified()) $newProperties[200][$prop] = new Property\GetLastModified($node->getLastModified()); break;
-                    case '{DAV:}getcontentlength'      :
-                        if ($node instanceof IFile) {
-                            $size = $node->getSize();
-                            if (!is_null($size)) {
-                                $newProperties[200][$prop] = (int)$node->getSize();
-                            }
-                        }
-                        break;
-                    case '{DAV:}quota-used-bytes'      :
-                        if ($node instanceof IQuota) {
-                            $quotaInfo = $node->getQuotaInfo();
-                            $newProperties[200][$prop] = $quotaInfo[0];
-                        }
-                        break;
-                    case '{DAV:}quota-available-bytes' :
-                        if ($node instanceof IQuota) {
-                            $quotaInfo = $node->getQuotaInfo();
-                            $newProperties[200][$prop] = $quotaInfo[1];
-                        }
-                        break;
-                    case '{DAV:}getetag'               : if ($node instanceof IFile && $etag = $node->getETag())  $newProperties[200][$prop] = $etag; break;
-                    case '{DAV:}getcontenttype'        : if ($node instanceof IFile && $ct = $node->getContentType())  $newProperties[200][$prop] = $ct; break;
-                    case '{DAV:}supported-report-set'  :
-                        $reports = array();
-                        foreach($this->plugins as $plugin) {
-                            $reports = array_merge($reports, $plugin->getSupportedReportSet($myPath));
-                        }
-                        $newProperties[200][$prop] = new Property\SupportedReportSet($reports);
-                        break;
-                    case '{DAV:}resourcetype' :
-                        $newProperties[200]['{DAV:}resourcetype'] = new Property\ResourceType();
-                        foreach($this->resourceTypeMapping as $className => $resourceType) {
-                            if ($node instanceof $className) $newProperties[200]['{DAV:}resourcetype']->add($resourceType);
-                        }
-                        break;
-
-                }
-
-                // If we were unable to find the property, we will list it as 404.
-                if (!$allProperties && !isset($newProperties[200][$prop])) $newProperties[404][$prop] = null;
-
-            }
-
-            $this->broadcastEvent('afterGetProperties',array(trim($myPath,'/'),&$newProperties, $node));
-
-            $newProperties['href'] = trim($myPath,'/');
-
-            // Its is a WebDAV recommendation to add a trailing slash to collectionnames.
-            // Apple's iCal also requires a trailing slash for principals (rfc 3744), though this is non-standard.
-            if ($myPath!='' && isset($newProperties[200]['{DAV:}resourcetype'])) {
-                $rt = $newProperties[200]['{DAV:}resourcetype'];
-                if ($rt->is('{DAV:}collection') || $rt->is('{DAV:}principal')) {
-                    $newProperties['href'] .='/';
-                }
-            }
-
-            // If the resourcetype property was manually added to the requested property list,
-            // we will remove it again.
-            if ($removeRT) unset($newProperties[200]['{DAV:}resourcetype']);
-
-            $returnPropertyList[] = $newProperties;
-
-        }
-
-        return $returnPropertyList;
-
-    }
-
-    /**
-     * This method is invoked by sub-systems creating a new file.
-     *
-     * Currently this is done by HTTP PUT and HTTP LOCK (in the Locks_Plugin).
-     * It was important to get this done through a centralized function,
-     * allowing plugins to intercept this using the beforeCreateFile event.
-     *
-     * This method will return true if the file was actually created
-     *
-     * @param string   $uri
-     * @param resource $data
-     * @param string   $etag
-     * @return bool
-     */
-    public function createFile($uri,$data, &$etag = null) {
-
-        list($dir,$name) = URLUtil::splitPath($uri);
-
-        if (!$this->broadcastEvent('beforeBind',array($uri))) return false;
-
-        $parent = $this->tree->getNodeForPath($dir);
-        if (!$parent instanceof ICollection) {
-            throw new Exception\Conflict('Files can only be created as children of collections');
-        }
-
-        if (!$this->broadcastEvent('beforeCreateFile',array($uri, &$data, $parent))) return false;
-
-        $etag = $parent->createFile($name,$data);
-        $this->tree->markDirty($dir . '/' . $name);
-
-        $this->broadcastEvent('afterBind',array($uri));
-        $this->broadcastEvent('afterCreateFile',array($uri, $parent));
-
-        return true;
-    }
-
-    /**
-     * This method is invoked by sub-systems creating a new directory.
-     *
-     * @param string $uri
-     * @return void
-     */
-    public function createDirectory($uri) {
-
-        $this->createCollection($uri,array('{DAV:}collection'),array());
-
-    }
-
-    /**
-     * Use this method to create a new collection
-     *
-     * The {DAV:}resourcetype is specified using the resourceType array.
-     * At the very least it must contain {DAV:}collection.
-     *
-     * The properties array can contain a list of additional properties.
-     *
-     * @param string $uri The new uri
-     * @param array $resourceType The resourceType(s)
-     * @param array $properties A list of properties
-     * @return array|null
-     */
-    public function createCollection($uri, array $resourceType, array $properties) {
-
-        list($parentUri,$newName) = URLUtil::splitPath($uri);
-
-        // Making sure {DAV:}collection was specified as resourceType
-        if (!in_array('{DAV:}collection', $resourceType)) {
-            throw new Exception\InvalidResourceType('The resourceType for this collection must at least include {DAV:}collection');
-        }
-
-
-        // Making sure the parent exists
-        try {
-
-            $parent = $this->tree->getNodeForPath($parentUri);
-
-        } catch (Exception\NotFound $e) {
-
-            throw new Exception\Conflict('Parent node does not exist');
-
-        }
-
-        // Making sure the parent is a collection
-        if (!$parent instanceof ICollection) {
-            throw new Exception\Conflict('Parent node is not a collection');
-        }
-
-
-
-        // Making sure the child does not already exist
-        try {
-            $parent->getChild($newName);
-
-            // If we got here.. it means there's already a node on that url, and we need to throw a 405
-            throw new Exception\MethodNotAllowed('The resource you tried to create already exists');
-
-        } catch (Exception\NotFound $e) {
-            // This is correct
-        }
-
-
-        if (!$this->broadcastEvent('beforeBind',array($uri))) return;
-
-        // There are 2 modes of operation. The standard collection
-        // creates the directory, and then updates properties
-        // the extended collection can create it directly.
-        if ($parent instanceof IExtendedCollection) {
-
-            $parent->createExtendedCollection($newName, $resourceType, $properties);
-
-        } else {
-
-            // No special resourcetypes are supported
-            if (count($resourceType)>1) {
-                throw new Exception\InvalidResourceType('The {DAV:}resourcetype you specified is not supported here.');
-            }
-
-            $parent->createDirectory($newName);
-            $rollBack = false;
-            $exception = null;
-            $errorResult = null;
-
-            if (count($properties)>0) {
-
-                try {
-
-                    $errorResult = $this->updateProperties($uri, $properties);
-                    if (!isset($errorResult[200])) {
-                        $rollBack = true;
-                    }
-
-                } catch (Exception $e) {
-
-                    $rollBack = true;
-                    $exception = $e;
-
-                }
-
-            }
-
-            if ($rollBack) {
-                if (!$this->broadcastEvent('beforeUnbind',array($uri))) return;
-                $this->tree->delete($uri);
-
-                // Re-throwing exception
-                if ($exception) throw $exception;
-
-                return $errorResult;
-            }
-
-        }
-        $this->tree->markDirty($parentUri);
-        $this->broadcastEvent('afterBind',array($uri));
-
-    }
-
-    /**
-     * This method updates a resource's properties
-     *
-     * The properties array must be a list of properties. Array-keys are
-     * property names in clarknotation, array-values are it's values.
-     * If a property must be deleted, the value should be null.
-     *
-     * Note that this request should either completely succeed, or
-     * completely fail.
-     *
-     * The response is an array with statuscodes for keys, which in turn
-     * contain arrays with propertynames. This response can be used
-     * to generate a multistatus body.
-     *
-     * @param string $uri
-     * @param array $properties
-     * @return array
-     */
-    public function updateProperties($uri, array $properties) {
-
-        // we'll start by grabbing the node, this will throw the appropriate
-        // exceptions if it doesn't.
-        $node = $this->tree->getNodeForPath($uri);
-
-        $result = array(
-            200 => array(),
-            403 => array(),
-            424 => array(),
-        );
-        $remainingProperties = $properties;
-        $hasError = false;
-
-        // Running through all properties to make sure none of them are protected
-        if (!$hasError) foreach($properties as $propertyName => $value) {
-            if(in_array($propertyName, $this->protectedProperties)) {
-                $result[403][$propertyName] = null;
-                unset($remainingProperties[$propertyName]);
-                $hasError = true;
-            }
-        }
-
-        if (!$hasError) {
-            // Allowing plugins to take care of property updating
-            $hasError = !$this->broadcastEvent('updateProperties',array(
-                &$remainingProperties,
-                &$result,
-                $node
-            ));
-        }
-
-        // If the node is not an instance of Sabre\DAV\IProperties, every
-        // property is 403 Forbidden
-        if (!$hasError && count($remainingProperties) && !($node instanceof IProperties)) {
-            $hasError = true;
-            foreach($properties as $propertyName=> $value) {
-                $result[403][$propertyName] = null;
-            }
-            $remainingProperties = array();
-        }
-
-        // Only if there were no errors we may attempt to update the resource
-        if (!$hasError) {
-
-            if (count($remainingProperties)>0) {
-
-                $updateResult = $node->updateProperties($remainingProperties);
-
-                if ($updateResult===true) {
-                    // success
-                    foreach($remainingProperties as $propertyName=>$value) {
-                        $result[200][$propertyName] = null;
-                    }
-
-                } elseif ($updateResult===false) {
-                    // The node failed to update the properties for an
-                    // unknown reason
-                    foreach($remainingProperties as $propertyName=>$value) {
-                        $result[403][$propertyName] = null;
-                    }
-
-                } elseif (is_array($updateResult)) {
-
-                    // The node has detailed update information
-                    // We need to merge the results with the earlier results.
-                    foreach($updateResult as $status => $props) {
-                        if (is_array($props)) {
-                            if (!isset($result[$status]))
-                                $result[$status] = array();
-
-                            $result[$status] = array_merge($result[$status], $updateResult[$status]);
-                        }
-                    }
-
-                } else {
-                    throw new Exception('Invalid result from updateProperties');
-                }
-                $remainingProperties = array();
-            }
-
-        }
-
-        foreach($remainingProperties as $propertyName=>$value) {
-            // if there are remaining properties, it must mean
-            // there's a dependency failure
-            $result[424][$propertyName] = null;
-        }
-
-        // Removing empty array values
-        foreach($result as $status=>$props) {
-
-            if (count($props)===0) unset($result[$status]);
-
-        }
-        $result['href'] = $uri;
-        return $result;
-
-    }
-
-    /**
-     * This method checks the main HTTP preconditions.
-     *
-     * Currently these are:
-     *   * If-Match
-     *   * If-None-Match
-     *   * If-Modified-Since
-     *   * If-Unmodified-Since
-     *
-     * The method will return true if all preconditions are met
-     * The method will return false, or throw an exception if preconditions
-     * failed. If false is returned the operation should be aborted, and
-     * the appropriate HTTP response headers are already set.
-     *
-     * Normally this method will throw 412 Precondition Failed for failures
-     * related to If-None-Match, If-Match and If-Unmodified Since. It will
-     * set the status to 304 Not Modified for If-Modified_since.
-     *
-     * If the $handleAsGET argument is set to true, it will also return 304
-     * Not Modified for failure of the If-None-Match precondition. This is the
-     * desired behaviour for HTTP GET and HTTP HEAD requests.
-     *
-     * @param bool $handleAsGET
-     * @return bool
-     */
-    public function checkPreconditions($handleAsGET = false) {
-
-        $uri = $this->getRequestUri();
-        $node = null;
-        $lastMod = null;
-        $etag = null;
-
-        if ($ifMatch = $this->httpRequest->getHeader('If-Match')) {
-
-            // If-Match contains an entity tag. Only if the entity-tag
-            // matches we are allowed to make the request succeed.
-            // If the entity-tag is '*' we are only allowed to make the
-            // request succeed if a resource exists at that url.
-            try {
-                $node = $this->tree->getNodeForPath($uri);
-            } catch (Exception\NotFound $e) {
-                throw new Exception\PreconditionFailed('An If-Match header was specified and the resource did not exist','If-Match');
-            }
-
-            // Only need to check entity tags if they are not *
-            if ($ifMatch!=='*') {
-
-                // There can be multiple etags
-                $ifMatch = explode(',',$ifMatch);
-                $haveMatch = false;
-                foreach($ifMatch as $ifMatchItem) {
-
-                    // Stripping any extra spaces
-                    $ifMatchItem = trim($ifMatchItem,' ');
-
-                    $etag = $node->getETag();
-                    if ($etag===$ifMatchItem) {
-                        $haveMatch = true;
-                    } else {
-                        // Evolution has a bug where it sometimes prepends the "
-                        // with a \. This is our workaround.
-                        if (str_replace('\\"','"', $ifMatchItem) === $etag) {
-                            $haveMatch = true;
-                        }
-                    }
-
-                }
-                if (!$haveMatch) {
-                     throw new Exception\PreconditionFailed('An If-Match header was specified, but none of the specified the ETags matched.','If-Match');
-                }
-            }
-        }
-
-        if ($ifNoneMatch = $this->httpRequest->getHeader('If-None-Match')) {
-
-            // The If-None-Match header contains an etag.
-            // Only if the ETag does not match the current ETag, the request will succeed
-            // The header can also contain *, in which case the request
-            // will only succeed if the entity does not exist at all.
-            $nodeExists = true;
-            if (!$node) {
-                try {
-                    $node = $this->tree->getNodeForPath($uri);
-                } catch (Exception\NotFound $e) {
-                    $nodeExists = false;
-                }
-            }
-            if ($nodeExists) {
-                $haveMatch = false;
-                if ($ifNoneMatch==='*') $haveMatch = true;
-                else {
-
-                    // There might be multiple etags
-                    $ifNoneMatch = explode(',', $ifNoneMatch);
-                    $etag = $node->getETag();
-
-                    foreach($ifNoneMatch as $ifNoneMatchItem) {
-
-                        // Stripping any extra spaces
-                        $ifNoneMatchItem = trim($ifNoneMatchItem,' ');
-
-                        if ($etag===$ifNoneMatchItem) $haveMatch = true;
-
-                    }
-
-                }
-
-                if ($haveMatch) {
-                    if ($handleAsGET) {
-                        $this->httpResponse->sendStatus(304);
-                        return false;
-                    } else {
-                        throw new Exception\PreconditionFailed('An If-None-Match header was specified, but the ETag matched (or * was specified).','If-None-Match');
-                    }
-                }
-            }
-
-        }
-
-        if (!$ifNoneMatch && ($ifModifiedSince = $this->httpRequest->getHeader('If-Modified-Since'))) {
-
-            // The If-Modified-Since header contains a date. We
-            // will only return the entity if it has been changed since
-            // that date. If it hasn't been changed, we return a 304
-            // header
-            // Note that this header only has to be checked if there was no If-None-Match header
-            // as per the HTTP spec.
-            $date = HTTP\Util::parseHTTPDate($ifModifiedSince);
-
-            if ($date) {
-                if (is_null($node)) {
-                    $node = $this->tree->getNodeForPath($uri);
-                }
-                $lastMod = $node->getLastModified();
-                if ($lastMod) {
-                    $lastMod = new \DateTime('@' . $lastMod);
-                    if ($lastMod <= $date) {
-                        $this->httpResponse->sendStatus(304);
-                        $this->httpResponse->setHeader('Last-Modified', HTTP\Util::toHTTPDate($lastMod));
-                        return false;
-                    }
-                }
-            }
-        }
-
-        if ($ifUnmodifiedSince = $this->httpRequest->getHeader('If-Unmodified-Since')) {
-
-            // The If-Unmodified-Since will allow allow the request if the
-            // entity has not changed since the specified date.
-            $date = HTTP\Util::parseHTTPDate($ifUnmodifiedSince);
-
-            // We must only check the date if it's valid
-            if ($date) {
-                if (is_null($node)) {
-                    $node = $this->tree->getNodeForPath($uri);
-                }
-                $lastMod = $node->getLastModified();
-                if ($lastMod) {
-                    $lastMod = new \DateTime('@' . $lastMod);
-                    if ($lastMod > $date) {
-                        throw new Exception\PreconditionFailed('An If-Unmodified-Since header was specified, but the entity has been changed since the specified date.','If-Unmodified-Since');
-                    }
-                }
-            }
-
-        }
-        return true;
-
-    }
-
-    // }}}
-    // {{{ XML Readers & Writers
-
-
-    /**
-     * Generates a WebDAV propfind response body based on a list of nodes.
-     *
-     * If 'strip404s' is set to true, all 404 responses will be removed.
-     *
-     * @param array $fileProperties The list with nodes
-     * @param bool strip404s
-     * @return string
-     */
-    public function generateMultiStatus(array $fileProperties, $strip404s = false) {
-
-        $dom = new \DOMDocument('1.0','utf-8');
-        //$dom->formatOutput = true;
-        $multiStatus = $dom->createElement('d:multistatus');
-        $dom->appendChild($multiStatus);
-
-        // Adding in default namespaces
-        foreach($this->xmlNamespaces as $namespace=>$prefix) {
-
-            $multiStatus->setAttribute('xmlns:' . $prefix,$namespace);
-
-        }
-
-        foreach($fileProperties as $entry) {
-
-            $href = $entry['href'];
-            unset($entry['href']);
-
-            if ($strip404s && isset($entry[404])) {
-                unset($entry[404]);
-            }
-
-            $response = new Property\Response($href,$entry);
-            $response->serialize($this,$multiStatus);
-
-        }
-
-        return $dom->saveXML();
-
-    }
-
-    /**
-     * This method parses a PropPatch request
-     *
-     * PropPatch changes the properties for a resource. This method
-     * returns a list of properties.
-     *
-     * The keys in the returned array contain the property name (e.g.: {DAV:}displayname,
-     * and the value contains the property value. If a property is to be removed the value
-     * will be null.
-     *
-     * @param string $body xml body
-     * @return array list of properties in need of updating or deletion
-     */
-    public function parsePropPatchRequest($body) {
-
-        //We'll need to change the DAV namespace declaration to something else in order to make it parsable
-        $dom = XMLUtil::loadDOMDocument($body);
-
-        $newProperties = array();
-
-        foreach($dom->firstChild->childNodes as $child) {
-
-            if ($child->nodeType !== XML_ELEMENT_NODE) continue;
-
-            $operation = XMLUtil::toClarkNotation($child);
-
-            if ($operation!=='{DAV:}set' && $operation!=='{DAV:}remove') continue;
-
-            $innerProperties = XMLUtil::parseProperties($child, $this->propertyMap);
-
-            foreach($innerProperties as $propertyName=>$propertyValue) {
-
-                if ($operation==='{DAV:}remove') {
-                    $propertyValue = null;
-                }
-
-                $newProperties[$propertyName] = $propertyValue;
-
-            }
-
-        }
-
-        return $newProperties;
-
-    }
-
-    /**
-     * This method parses the PROPFIND request and returns its information
-     *
-     * This will either be a list of properties, or an empty array; in which case
-     * an {DAV:}allprop was requested.
-     *
-     * @param string $body
-     * @return array
-     */
-    public function parsePropFindRequest($body) {
-
-        // If the propfind body was empty, it means IE is requesting 'all' properties
-        if (!$body) return array();
-
-        $dom = XMLUtil::loadDOMDocument($body);
-        $elem = $dom->getElementsByTagNameNS('urn:DAV','propfind')->item(0);
-        return array_keys(XMLUtil::parseProperties($elem));
-
-    }
-
-    // }}}
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/ServerPlugin.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/ServerPlugin.php
deleted file mode 100644
index c393f43fbd..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/ServerPlugin.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-/**
- * The baseclass for all server plugins.
- *
- * Plugins can modify or extend the servers behaviour.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-abstract class ServerPlugin {
-
-    /**
-     * This initializes the plugin.
-     *
-     * This function is called by Sabre\DAV\Server, after
-     * addPlugin is called.
-     *
-     * This method should set up the required event subscriptions.
-     *
-     * @param Server $server
-     * @return void
-     */
-    abstract public function initialize(Server $server);
-
-    /**
-     * This method should return a list of server-features.
-     *
-     * This is for example 'versioning' and is added to the DAV: header
-     * in an OPTIONS response.
-     *
-     * @return array
-     */
-    public function getFeatures() {
-
-        return array();
-
-    }
-
-    /**
-     * Use this method to tell the server this plugin defines additional
-     * HTTP methods.
-     *
-     * This method is passed a uri. It should only return HTTP methods that are
-     * available for the specified uri.
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getHTTPMethods($uri) {
-
-        return array();
-
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using \Sabre\DAV\Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return get_class($this);
-
-    }
-
-    /**
-     * Returns a list of reports this plugin supports.
-     *
-     * This will be used in the {DAV:}supported-report-set property.
-     * Note that you still need to subscribe to the 'report' event to actually
-     * implement them
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getSupportedReportSet($uri) {
-
-        return array();
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/SimpleCollection.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/SimpleCollection.php
deleted file mode 100644
index 1bdb166c7f..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/SimpleCollection.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-/**
- * SimpleCollection
- *
- * The SimpleCollection is used to quickly setup static directory structures.
- * Just create the object with a proper name, and add children to use it.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class SimpleCollection extends Collection {
-
-    /**
-     * List of childnodes
-     *
-     * @var array
-     */
-    protected $children = array();
-
-    /**
-     * Name of this resource
-     *
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * Creates this node
-     *
-     * The name of the node must be passed, child nodes can also be passed.
-     * This nodes must be instances of INode
-     *
-     * @param string $name
-     * @param array $children
-     */
-    public function __construct($name,array $children = array()) {
-
-        $this->name = $name;
-        foreach($children as $child) {
-
-            if (!($child instanceof INode)) throw new Exception('Only instances of Sabre\DAV\INode are allowed to be passed in the children argument');
-            $this->addChild($child);
-
-        }
-
-    }
-
-    /**
-     * Adds a new childnode to this collection
-     *
-     * @param INode $child
-     * @return void
-     */
-    public function addChild(INode $child) {
-
-        $this->children[$child->getName()] = $child;
-
-    }
-
-    /**
-     * Returns the name of the collection
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return $this->name;
-
-    }
-
-    /**
-     * Returns a child object, by its name.
-     *
-     * This method makes use of the getChildren method to grab all the child nodes, and compares the name.
-     * Generally its wise to override this, as this can usually be optimized
-     *
-     * This method must throw Sabre\DAV\Exception\NotFound if the node does not
-     * exist.
-     *
-     * @param string $name
-     * @throws Exception\NotFound
-     * @return INode
-     */
-    public function getChild($name) {
-
-        if (isset($this->children[$name])) return $this->children[$name];
-        throw new Exception\NotFound('File not found: ' . $name . ' in \'' . $this->getName() . '\'');
-
-    }
-
-    /**
-     * Returns a list of children for this collection
-     *
-     * @return array
-     */
-    public function getChildren() {
-
-        return array_values($this->children);
-
-    }
-
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/SimpleFile.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/SimpleFile.php
deleted file mode 100644
index b7413fdded..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/SimpleFile.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-/**
- * SimpleFile
- *
- * The 'SimpleFile' class is used to easily add read-only immutable files to
- * the directory structure. One usecase would be to add a 'readme.txt' to a
- * root of a webserver with some standard content.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class SimpleFile extends File {
-
-    /**
-     * File contents
-     *
-     * @var string
-     */
-    protected $contents = array();
-
-    /**
-     * Name of this resource
-     *
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * A mimetype, such as 'text/plain' or 'text/html'
-     *
-     * @var string
-     */
-    protected $mimeType;
-
-    /**
-     * Creates this node
-     *
-     * The name of the node must be passed, as well as the contents of the
-     * file.
-     *
-     * @param string $name
-     * @param string $contents
-     * @param string|null $mimeType
-     */
-    public function __construct($name, $contents, $mimeType = null) {
-
-        $this->name = $name;
-        $this->contents = $contents;
-        $this->mimeType = $mimeType;
-
-    }
-
-    /**
-     * Returns the node name for this file.
-     *
-     * This name is used to construct the url.
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return $this->name;
-
-    }
-
-    /**
-     * Returns the data
-     *
-     * This method may either return a string or a readable stream resource
-     *
-     * @return mixed
-     */
-    public function get() {
-
-        return $this->contents;
-
-    }
-
-    /**
-     * Returns the size of the file, in bytes.
-     *
-     * @return int
-     */
-    public function getSize() {
-
-        return strlen($this->contents);
-
-    }
-
-    /**
-     * Returns the ETag for a file
-     *
-     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
-     * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
-     *
-     * Return null if the ETag can not effectively be determined
-     * @return string
-     */
-    public function getETag() {
-
-        return '"' . md5($this->contents) . '"';
-
-    }
-
-    /**
-     * Returns the mime-type for a file
-     *
-     * If null is returned, we'll assume application/octet-stream
-     * @return string
-     */
-    public function getContentType() {
-
-        return $this->mimeType;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/StringUtil.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/StringUtil.php
deleted file mode 100644
index c71575f490..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/StringUtil.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-/**
- * String utility
- *
- * This class is mainly used to implement the 'text-match' filter, used by both
- * the CalDAV calendar-query REPORT, and CardDAV addressbook-query REPORT.
- * Because they both need it, it was decided to put it in Sabre\DAV instead.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class StringUtil {
-
-    /**
-     * Checks if a needle occurs in a haystack ;)
-     *
-     * @param string $haystack
-     * @param string $needle
-     * @param string $collation
-     * @param string $matchType
-     * @return bool
-     */
-    static public function textMatch($haystack, $needle, $collation, $matchType = 'contains') {
-
-        switch($collation) {
-
-            case 'i;ascii-casemap' :
-                // default strtolower takes locale into consideration
-                // we don't want this.
-                $haystack = str_replace(range('a','z'), range('A','Z'), $haystack);
-                $needle = str_replace(range('a','z'), range('A','Z'), $needle);
-                break;
-
-            case 'i;octet' :
-                // Do nothing
-                break;
-
-            case 'i;unicode-casemap' :
-                $haystack = mb_strtoupper($haystack, 'UTF-8');
-                $needle = mb_strtoupper($needle, 'UTF-8');
-                break;
-
-            default :
-                throw new Exception\BadRequest('Collation type: ' . $collation . ' is not supported');
-
-        }
-
-        switch($matchType) {
-
-            case 'contains' :
-                return strpos($haystack, $needle)!==false;
-            case 'equals' :
-                return $haystack === $needle;
-            case 'starts-with' :
-                return strpos($haystack, $needle)===0;
-            case 'ends-with' :
-                return strrpos($haystack, $needle)===strlen($haystack)-strlen($needle);
-            default :
-                throw new Exception\BadRequest('Match-type: ' . $matchType . ' is not supported');
-
-        }
-
-    }
-
-    /**
-     * This method takes an input string, checks if it's not valid UTF-8 and
-     * attempts to convert it to UTF-8 if it's not.
-     *
-     * Note that currently this can only convert ISO-8559-1 to UTF-8 (latin-1),
-     * anything else will likely fail.
-     *
-     * @param string $input
-     * @return string
-     */
-    static public function ensureUTF8($input) {
-
-        $encoding = mb_detect_encoding($input , array('UTF-8','ISO-8859-1'), true);
-
-        if ($encoding === 'ISO-8859-1') {
-            return utf8_encode($input);
-        } else {
-            return $input;
-        }
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/TemporaryFileFilterPlugin.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/TemporaryFileFilterPlugin.php
deleted file mode 100644
index 37f976b7b4..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/TemporaryFileFilterPlugin.php
+++ /dev/null
@@ -1,289 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-/**
- * Temporary File Filter Plugin
- *
- * The purpose of this filter is to intercept some of the garbage files
- * operation systems and applications tend to generate when mounting
- * a WebDAV share as a disk.
- *
- * It will intercept these files and place them in a separate directory.
- * these files are not deleted automatically, so it is adviceable to
- * delete these after they are not accessed for 24 hours.
- *
- * Currently it supports:
- *   * OS/X style resource forks and .DS_Store
- *   * desktop.ini and Thumbs.db (windows)
- *   * .*.swp (vim temporary files)
- *   * .dat.* (smultron temporary files)
- *
- * Additional patterns can be added, by adding on to the
- * temporaryFilePatterns property.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class TemporaryFileFilterPlugin extends ServerPlugin {
-
-    /**
-     * This is the list of patterns we intercept.
-     * If new patterns are added, they must be valid patterns for preg_match.
-     *
-     * @var array
-     */
-    public $temporaryFilePatterns = array(
-        '/^\._(.*)$/',     // OS/X resource forks
-        '/^.DS_Store$/',   // OS/X custom folder settings
-        '/^desktop.ini$/', // Windows custom folder settings
-        '/^Thumbs.db$/',   // Windows thumbnail cache
-        '/^.(.*).swp$/',   // ViM temporary files
-        '/^\.dat(.*)$/',   // Smultron seems to create these
-        '/^~lock.(.*)#$/', // Windows 7 lockfiles
-    );
-
-    /**
-     * A reference to the main Server class
-     *
-     * @var Sabre\DAV\Server
-     */
-    protected $server;
-
-    /**
-     * This is the directory where this plugin
-     * will store it's files.
-     *
-     * @var string
-     */
-    private $dataDir;
-
-    /**
-     * Creates the plugin.
-     *
-     * Make sure you specify a directory for your files. If you don't, we
-     * will use PHP's directory for session-storage instead, and you might
-     * not want that.
-     *
-     * @param string|null $dataDir
-     */
-    public function __construct($dataDir = null) {
-
-        if (!$dataDir) $dataDir = ini_get('session.save_path').'/sabredav/';
-        if (!is_dir($dataDir)) mkdir($dataDir);
-        $this->dataDir = $dataDir;
-
-    }
-
-    /**
-     * Initialize the plugin
-     *
-     * This is called automatically be the Server class after this plugin is
-     * added with Sabre\DAV\Server::addPlugin()
-     *
-     * @param Server $server
-     * @return void
-     */
-    public function initialize(Server $server) {
-
-        $this->server = $server;
-        $server->subscribeEvent('beforeMethod',array($this,'beforeMethod'));
-        $server->subscribeEvent('beforeCreateFile',array($this,'beforeCreateFile'));
-
-    }
-
-    /**
-     * This method is called before any HTTP method handler
-     *
-     * This method intercepts any GET, DELETE, PUT and PROPFIND calls to
-     * filenames that are known to match the 'temporary file' regex.
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function beforeMethod($method, $uri) {
-
-        if (!$tempLocation = $this->isTempFile($uri))
-            return true;
-
-        switch($method) {
-            case 'GET' :
-                return $this->httpGet($tempLocation);
-            case 'PUT' :
-                return $this->httpPut($tempLocation);
-            case 'PROPFIND' :
-                return $this->httpPropfind($tempLocation, $uri);
-            case 'DELETE' :
-                return $this->httpDelete($tempLocation);
-         }
-         return true;
-
-    }
-
-    /**
-     * This method is invoked if some subsystem creates a new file.
-     *
-     * This is used to deal with HTTP LOCK requests which create a new
-     * file.
-     *
-     * @param string $uri
-     * @param resource $data
-     * @return bool
-     */
-    public function beforeCreateFile($uri,$data) {
-
-        if ($tempPath = $this->isTempFile($uri)) {
-
-            $hR = $this->server->httpResponse;
-            $hR->setHeader('X-Sabre-Temp','true');
-            file_put_contents($tempPath,$data);
-            return false;
-        }
-        return true;
-
-    }
-
-    /**
-     * This method will check if the url matches the temporary file pattern
-     * if it does, it will return an path based on $this->dataDir for the
-     * temporary file storage.
-     *
-     * @param string $path
-     * @return boolean|string
-     */
-    protected function isTempFile($path) {
-
-        // We're only interested in the basename.
-        list(, $tempPath) = URLUtil::splitPath($path);
-
-        foreach($this->temporaryFilePatterns as $tempFile) {
-
-            if (preg_match($tempFile,$tempPath)) {
-                return $this->getDataDir() . '/sabredav_' . md5($path) . '.tempfile';
-            }
-
-        }
-
-        return false;
-
-    }
-
-
-    /**
-     * This method handles the GET method for temporary files.
-     * If the file doesn't exist, it will return false which will kick in
-     * the regular system for the GET method.
-     *
-     * @param string $tempLocation
-     * @return bool
-     */
-    public function httpGet($tempLocation) {
-
-        if (!file_exists($tempLocation)) return true;
-
-        $hR = $this->server->httpResponse;
-        $hR->setHeader('Content-Type','application/octet-stream');
-        $hR->setHeader('Content-Length',filesize($tempLocation));
-        $hR->setHeader('X-Sabre-Temp','true');
-        $hR->sendStatus(200);
-        $hR->sendBody(fopen($tempLocation,'r'));
-        return false;
-
-    }
-
-    /**
-     * This method handles the PUT method.
-     *
-     * @param string $tempLocation
-     * @return bool
-     */
-    public function httpPut($tempLocation) {
-
-        $hR = $this->server->httpResponse;
-        $hR->setHeader('X-Sabre-Temp','true');
-
-        $newFile = !file_exists($tempLocation);
-
-        if (!$newFile && ($this->server->httpRequest->getHeader('If-None-Match'))) {
-             throw new Exception\PreconditionFailed('The resource already exists, and an If-None-Match header was supplied');
-        }
-
-        file_put_contents($tempLocation,$this->server->httpRequest->getBody());
-        $hR->sendStatus($newFile?201:200);
-        return false;
-
-    }
-
-    /**
-     * This method handles the DELETE method.
-     *
-     * If the file didn't exist, it will return false, which will make the
-     * standard HTTP DELETE handler kick in.
-     *
-     * @param string $tempLocation
-     * @return bool
-     */
-    public function httpDelete($tempLocation) {
-
-        if (!file_exists($tempLocation)) return true;
-
-        unlink($tempLocation);
-        $hR = $this->server->httpResponse;
-        $hR->setHeader('X-Sabre-Temp','true');
-        $hR->sendStatus(204);
-        return false;
-
-    }
-
-    /**
-     * This method handles the PROPFIND method.
-     *
-     * It's a very lazy method, it won't bother checking the request body
-     * for which properties were requested, and just sends back a default
-     * set of properties.
-     *
-     * @param string $tempLocation
-     * @param string $uri
-     * @return bool
-     */
-    public function httpPropfind($tempLocation, $uri) {
-
-        if (!file_exists($tempLocation)) return true;
-
-        $hR = $this->server->httpResponse;
-        $hR->setHeader('X-Sabre-Temp','true');
-        $hR->sendStatus(207);
-        $hR->setHeader('Content-Type','application/xml; charset=utf-8');
-
-        $this->server->parsePropFindRequest($this->server->httpRequest->getBody(true));
-
-        $properties = array(
-            'href' => $uri,
-            200 => array(
-                '{DAV:}getlastmodified' => new Property\GetLastModified(filemtime($tempLocation)),
-                '{DAV:}getcontentlength' => filesize($tempLocation),
-                '{DAV:}resourcetype' => new Property\ResourceType(null),
-                '{'.Server::NS_SABREDAV.'}tempFile' => true,
-
-            ),
-         );
-
-        $data = $this->server->generateMultiStatus(array($properties));
-        $hR->sendBody($data);
-        return false;
-
-    }
-
-
-    /**
-     * This method returns the directory where the temporary files should be stored.
-     *
-     * @return string
-     */
-    protected function getDataDir()
-    {
-        return $this->dataDir;
-    }
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Tree.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Tree.php
deleted file mode 100644
index ab94168b29..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Tree.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-/**
- * Abstract tree object
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-abstract class Tree {
-
-    /**
-     * This function must return an INode object for a path
-     * If a Path doesn't exist, thrown a Exception_NotFound
-     *
-     * @param string $path
-     * @throws Exception\NotFound
-     * @return INode
-     */
-    abstract function getNodeForPath($path);
-
-    /**
-     * This function allows you to check if a node exists.
-     *
-     * Implementors of this class should override this method to make
-     * it cheaper.
-     *
-     * @param string $path
-     * @return bool
-     */
-    public function nodeExists($path) {
-
-        try {
-
-            $this->getNodeForPath($path);
-            return true;
-
-        } catch (Exception\NotFound $e) {
-
-            return false;
-
-        }
-
-    }
-
-    /**
-     * Copies a file from path to another
-     *
-     * @param string $sourcePath The source location
-     * @param string $destinationPath The full destination path
-     * @return void
-     */
-    public function copy($sourcePath, $destinationPath) {
-
-        $sourceNode = $this->getNodeForPath($sourcePath);
-
-        // grab the dirname and basename components
-        list($destinationDir, $destinationName) = URLUtil::splitPath($destinationPath);
-
-        $destinationParent = $this->getNodeForPath($destinationDir);
-        $this->copyNode($sourceNode,$destinationParent,$destinationName);
-
-        $this->markDirty($destinationDir);
-
-    }
-
-    /**
-     * Moves a file from one location to another
-     *
-     * @param string $sourcePath The path to the file which should be moved
-     * @param string $destinationPath The full destination path, so not just the destination parent node
-     * @return int
-     */
-    public function move($sourcePath, $destinationPath) {
-
-        list($sourceDir, $sourceName) = URLUtil::splitPath($sourcePath);
-        list($destinationDir, $destinationName) = URLUtil::splitPath($destinationPath);
-
-        if ($sourceDir===$destinationDir) {
-            $renameable = $this->getNodeForPath($sourcePath);
-            $renameable->setName($destinationName);
-        } else {
-            $this->copy($sourcePath,$destinationPath);
-            $this->getNodeForPath($sourcePath)->delete();
-        }
-        $this->markDirty($sourceDir);
-        $this->markDirty($destinationDir);
-
-    }
-
-    /**
-     * Deletes a node from the tree
-     *
-     * @param string $path
-     * @return void
-     */
-    public function delete($path) {
-
-        $node = $this->getNodeForPath($path);
-        $node->delete();
-
-        list($parent) = URLUtil::splitPath($path);
-        $this->markDirty($parent);
-
-    }
-
-    /**
-     * Returns a list of childnodes for a given path.
-     *
-     * @param string $path
-     * @return array
-     */
-    public function getChildren($path) {
-
-        $node = $this->getNodeForPath($path);
-        return $node->getChildren();
-
-    }
-
-    /**
-     * This method is called with every tree update
-     *
-     * Examples of tree updates are:
-     *   * node deletions
-     *   * node creations
-     *   * copy
-     *   * move
-     *   * renaming nodes
-     *
-     * If Tree classes implement a form of caching, this will allow
-     * them to make sure caches will be expired.
-     *
-     * If a path is passed, it is assumed that the entire subtree is dirty
-     *
-     * @param string $path
-     * @return void
-     */
-    public function markDirty($path) {
-
-
-    }
-
-    /**
-     * copyNode
-     *
-     * @param INode $source
-     * @param ICollection $destinationParent
-     * @param string $destinationName
-     * @return void
-     */
-    protected function copyNode(INode $source,ICollection $destinationParent,$destinationName = null) {
-
-        if (!$destinationName) $destinationName = $source->getName();
-
-        if ($source instanceof IFile) {
-
-            $data = $source->get();
-
-            // If the body was a string, we need to convert it to a stream
-            if (is_string($data)) {
-                $stream = fopen('php://temp','r+');
-                fwrite($stream,$data);
-                rewind($stream);
-                $data = $stream;
-            }
-            $destinationParent->createFile($destinationName,$data);
-            $destination = $destinationParent->getChild($destinationName);
-
-        } elseif ($source instanceof ICollection) {
-
-            $destinationParent->createDirectory($destinationName);
-
-            $destination = $destinationParent->getChild($destinationName);
-            foreach($source->getChildren() as $child) {
-
-                $this->copyNode($child,$destination);
-
-            }
-
-        }
-        if ($source instanceof IProperties && $destination instanceof IProperties) {
-
-            $props = $source->getProperties(array());
-            $destination->updateProperties($props);
-
-        }
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Tree/Filesystem.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Tree/Filesystem.php
deleted file mode 100644
index a477725a5c..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Tree/Filesystem.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Tree;
-
-use Sabre\DAV;
-
-/**
- * FileSystem Tree
- *
- * This class is an alternative to the standard ObjectTree. This tree can only
- * use Sabre\DAV\FS\Directory and File classes, but as a result it allows for a few
- * optimizations that otherwise wouldn't be possible.
- *
- * Specifically copying and moving are much, much faster.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Filesystem extends DAV\Tree {
-
-    /**
-     * Base url on the filesystem.
-     *
-     * @var string
-     */
-    protected $basePath;
-
-    /**
-     * Creates this tree
-     *
-     * Supply the path you'd like to share.
-     *
-     * @param string $basePath
-     */
-    public function __construct($basePath) {
-
-        $this->basePath = $basePath;
-
-    }
-
-    /**
-     * Returns a new node for the given path
-     *
-     * @param string $path
-     * @return DAV\FS\Node
-     */
-    public function getNodeForPath($path) {
-
-        $realPath = $this->getRealPath($path);
-        if (!file_exists($realPath)) { 
-            throw new DAV\Exception\NotFound('File at location ' . $realPath . ' not found');
-        }
-        if (is_dir($realPath)) {
-            return new DAV\FS\Directory($realPath);
-        } else {
-            return new DAV\FS\File($realPath);
-        }
-
-    }
-
-    /**
-     * Returns the real filesystem path for a webdav url.
-     *
-     * @param string $publicPath
-     * @return string
-     */
-    protected function getRealPath($publicPath) {
-
-        return rtrim($this->basePath,'/') . '/' . trim($publicPath,'/');
-
-    }
-
-    /**
-     * Copies a file or directory.
-     *
-     * This method must work recursively and delete the destination
-     * if it exists
-     *
-     * @param string $source
-     * @param string $destination
-     * @return void
-     */
-    public function copy($source,$destination) {
-
-        $source = $this->getRealPath($source);
-        $destination = $this->getRealPath($destination);
-        $this->realCopy($source,$destination);
-
-    }
-
-    /**
-     * Used by self::copy
-     *
-     * @param string $source
-     * @param string $destination
-     * @return void
-     */
-    protected function realCopy($source,$destination) {
-
-        if (is_file($source)) {
-            copy($source,$destination);
-        } else {
-            mkdir($destination);
-            foreach(scandir($source) as $subnode) {
-
-                if ($subnode=='.' || $subnode=='..') continue;
-                $this->realCopy($source.'/'.$subnode,$destination.'/'.$subnode);
-
-            }
-        }
-
-    }
-
-    /**
-     * Moves a file or directory recursively.
-     *
-     * If the destination exists, delete it first.
-     *
-     * @param string $source
-     * @param string $destination
-     * @return void
-     */
-    public function move($source,$destination) {
-
-        $source = $this->getRealPath($source);
-        $destination = $this->getRealPath($destination);
-        rename($source,$destination);
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/URLUtil.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/URLUtil.php
deleted file mode 100644
index b7254e9a17..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/URLUtil.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-/**
- * URL utility class
- *
- * This class provides methods to deal with encoding and decoding url (percent encoded) strings.
- *
- * It was not possible to use PHP's built-in methods for this, because some clients don't like
- * encoding of certain characters.
- *
- * Specifically, it was found that GVFS (gnome's webdav client) does not like encoding of ( and
- * ). Since these are reserved, but don't have a reserved meaning in url, these characters are
- * kept as-is.
- *
- * It was also discovered that versions of the SOGO connector for thunderbird
- * has issues with urlencoded colons.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class URLUtil {
-
-    /**
-     * Encodes the path of a url.
-     *
-     * slashes (/) are treated as path-separators.
-     *
-     * @param string $path
-     * @return string
-     */
-    static function encodePath($path) {
-
-        return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\)\/:])/',function($match) {
-
-            return '%'.sprintf('%02x',ord($match[0]));
-
-        }, $path);
-
-    }
-
-    /**
-     * Encodes a 1 segment of a path
-     *
-     * Slashes are considered part of the name, and are encoded as %2f
-     *
-     * @param string $pathSegment
-     * @return string
-     */
-    static function encodePathSegment($pathSegment) {
-
-        return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\):])/',function($match) {
-
-            return '%'.sprintf('%02x',ord($match[0]));
-
-        }, $pathSegment);
-    }
-
-    /**
-     * Decodes a url-encoded path
-     *
-     * @param string $path
-     * @return string
-     */
-    static function decodePath($path) {
-
-        return self::decodePathSegment($path);
-
-    }
-
-    /**
-     * Decodes a url-encoded path segment
-     *
-     * @param string $path
-     * @return string
-     */
-    static function decodePathSegment($path) {
-
-        $path = rawurldecode($path);
-        $encoding = mb_detect_encoding($path, array('UTF-8','ISO-8859-1'));
-
-        switch($encoding) {
-
-            case 'ISO-8859-1' :
-                $path = utf8_encode($path);
-
-        }
-
-        return $path;
-
-    }
-
-    /**
-     * Returns the 'dirname' and 'basename' for a path.
-     *
-     * The reason there is a custom function for this purpose, is because
-     * basename() is locale aware (behaviour changes if C locale or a UTF-8 locale is used)
-     * and we need a method that just operates on UTF-8 characters.
-     *
-     * In addition basename and dirname are platform aware, and will treat backslash (\) as a
-     * directory separator on windows.
-     *
-     * This method returns the 2 components as an array.
-     *
-     * If there is no dirname, it will return an empty string. Any / appearing at the end of the
-     * string is stripped off.
-     *
-     * @param string $path
-     * @return array
-     */
-    static function splitPath($path) {
-
-        $matches = array();
-        if(preg_match('/^(?:(?:(.*)(?:\/+))?([^\/]+))(?:\/?)$/u',$path,$matches)) {
-            return array($matches[1],$matches[2]);
-        } else {
-            return array(null,null);
-        }
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/UUIDUtil.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/UUIDUtil.php
deleted file mode 100644
index 6a904a7bc2..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/UUIDUtil.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-/**
- * UUID Utility
- *
- * This class has static methods to generate and validate UUID's.
- * UUIDs are used a decent amount within various *DAV standards, so it made
- * sense to include it.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class UUIDUtil {
-
-    /**
-     * Returns a pseudo-random v4 UUID
-     *
-     * This function is based on a comment by Andrew Moore on php.net
-     *
-     * @see http://www.php.net/manual/en/function.uniqid.php#94959
-     * @return string
-     */
-    static function getUUID() {
-
-        return sprintf( '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
-            // 32 bits for "time_low"
-            mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ),
-
-            // 16 bits for "time_mid"
-            mt_rand( 0, 0xffff ),
-
-            // 16 bits for "time_hi_and_version",
-            // four most significant bits holds version number 4
-            mt_rand( 0, 0x0fff ) | 0x4000,
-
-            // 16 bits, 8 bits for "clk_seq_hi_res",
-            // 8 bits for "clk_seq_low",
-            // two most significant bits holds zero and one for variant DCE1.1
-            mt_rand( 0, 0x3fff ) | 0x8000,
-
-            // 48 bits for "node"
-            mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff )
-        );
-    }
-
-    /**
-     * Checks if a string is a valid UUID.
-     *
-     * @param string $uuid
-     * @return bool
-     */
-    static function validateUUID($uuid) {
-
-        return preg_match(
-            '/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i',
-            $uuid
-        ) == true;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/Version.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/Version.php
deleted file mode 100644
index afe603c3cd..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/Version.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-/**
- * This class contains the SabreDAV version constants.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Version {
-
-    /**
-     * Full version number
-     */
-    const VERSION = '1.8.10';
-
-    /**
-     * Stability : alpha, beta, stable
-     */
-    const STABILITY = 'stable';
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAV/XMLUtil.php b/core/src/core/classes/sabredav/lib/Sabre/DAV/XMLUtil.php
deleted file mode 100644
index 2bf81b3b86..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAV/XMLUtil.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-/**
- * XML utilities for WebDAV
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class XMLUtil {
-
-    /**
-     * Returns the 'clark notation' for an element.
-     *
-     * For example, and element encoded as:
-     * <b:myelem xmlns:b="http://www.example.org/" />
-     * will be returned as:
-     * {http://www.example.org}myelem
-     *
-     * This format is used throughout the SabreDAV sourcecode.
-     * Elements encoded with the urn:DAV namespace will
-     * be returned as if they were in the DAV: namespace. This is to avoid
-     * compatibility problems.
-     *
-     * This function will return null if a nodetype other than an Element is passed.
-     *
-     * @param \DOMNode $dom
-     * @return string
-     */
-    static function toClarkNotation(\DOMNode $dom) {
-
-        if ($dom->nodeType !== XML_ELEMENT_NODE) return null;
-
-        // Mapping back to the real namespace, in case it was dav
-        if ($dom->namespaceURI=='urn:DAV') $ns = 'DAV:'; else $ns = $dom->namespaceURI;
-
-        // Mapping to clark notation
-        return '{' . $ns . '}' . $dom->localName;
-
-    }
-
-    /**
-     * Parses a clark-notation string, and returns the namespace and element
-     * name components.
-     *
-     * If the string was invalid, it will throw an InvalidArgumentException.
-     *
-     * @param string $str
-     * @throws InvalidArgumentException
-     * @return array
-     */
-    static function parseClarkNotation($str) {
-
-        if (!preg_match('/^{([^}]*)}(.*)$/',$str,$matches)) {
-            throw new \InvalidArgumentException('\'' . $str . '\' is not a valid clark-notation formatted string');
-        }
-
-        return array(
-            $matches[1],
-            $matches[2]
-        );
-
-    }
-
-    /**
-     * This method takes an XML document (as string) and converts all instances of the
-     * DAV: namespace to urn:DAV
-     *
-     * This is unfortunately needed, because the DAV: namespace violates the xml namespaces
-     * spec, and causes the DOM to throw errors
-     *
-     * @param string $xmlDocument
-     * @return array|string|null
-     */
-    static function convertDAVNamespace($xmlDocument) {
-
-        // This is used to map the DAV: namespace to urn:DAV. This is needed, because the DAV:
-        // namespace is actually a violation of the XML namespaces specification, and will cause errors
-        return preg_replace("/xmlns(:[A-Za-z0-9_]*)?=(\"|\')DAV:(\\2)/","xmlns\\1=\\2urn:DAV\\2",$xmlDocument);
-
-    }
-
-    /**
-     * This method provides a generic way to load a DOMDocument for WebDAV use.
-     *
-     * This method throws a Sabre\DAV\Exception\BadRequest exception for any xml errors.
-     * It does not preserve whitespace, and it converts the DAV: namespace to urn:DAV.
-     *
-     * @param string $xml
-     * @throws Sabre\DAV\Exception\BadRequest
-     * @return DOMDocument
-     */
-    static function loadDOMDocument($xml) {
-
-        if (empty($xml))
-            throw new Exception\BadRequest('Empty XML document sent');
-
-        // The BitKinex client sends xml documents as UTF-16. PHP 5.3.1 (and presumably lower)
-        // does not support this, so we must intercept this and convert to UTF-8.
-        if (substr($xml,0,12) === "\x3c\x00\x3f\x00\x78\x00\x6d\x00\x6c\x00\x20\x00") {
-
-            // Note: the preceeding byte sequence is "<?xml" encoded as UTF_16, without the BOM.
-            $xml = iconv('UTF-16LE','UTF-8',$xml);
-
-            // Because the xml header might specify the encoding, we must also change this.
-            // This regex looks for the string encoding="UTF-16" and replaces it with
-            // encoding="UTF-8".
-            $xml = preg_replace('|<\?xml([^>]*)encoding="UTF-16"([^>]*)>|u','<?xml\1encoding="UTF-8"\2>',$xml);
-
-        }
-
-        // Retaining old error setting
-        $oldErrorSetting =  libxml_use_internal_errors(true);
-        // Fixes an XXE vulnerability on PHP versions older than 5.3.23 or
-        // 5.4.13.
-        $oldEntityLoaderSetting = libxml_disable_entity_loader(true);
-
-        // Clearing any previous errors
-        libxml_clear_errors();
-
-        $dom = new \DOMDocument();
-
-        // We don't generally care about any whitespace
-        $dom->preserveWhiteSpace = false;
-
-        $dom->loadXML(self::convertDAVNamespace($xml),LIBXML_NOWARNING | LIBXML_NOERROR);
-
-        if ($error = libxml_get_last_error()) {
-            libxml_clear_errors();
-            throw new Exception\BadRequest('The request body had an invalid XML body. (message: ' . $error->message . ', errorcode: ' . $error->code . ', line: ' . $error->line . ')');
-        }
-
-        // Restoring old mechanism for error handling
-        if ($oldErrorSetting===false) libxml_use_internal_errors(false);
-        if ($oldEntityLoaderSetting===false) libxml_disable_entity_loader(false);
-
-        return $dom;
-
-    }
-
-    /**
-     * Parses all WebDAV properties out of a DOM Element
-     *
-     * Generally WebDAV properties are enclosed in {DAV:}prop elements. This
-     * method helps by going through all these and pulling out the actual
-     * propertynames, making them array keys and making the property values,
-     * well.. the array values.
-     *
-     * If no value was given (self-closing element) null will be used as the
-     * value. This is used in for example PROPFIND requests.
-     *
-     * Complex values are supported through the propertyMap argument. The
-     * propertyMap should have the clark-notation properties as it's keys, and
-     * classnames as values.
-     *
-     * When any of these properties are found, the unserialize() method will be
-     * (statically) called. The result of this method is used as the value.
-     *
-     * @param \DOMElement $parentNode
-     * @param array $propertyMap
-     * @return array
-     */
-    static function parseProperties(\DOMElement $parentNode, array $propertyMap = array()) {
-
-        $propList = array();
-        foreach($parentNode->childNodes as $propNode) {
-
-            if (self::toClarkNotation($propNode)!=='{DAV:}prop') continue;
-
-            foreach($propNode->childNodes as $propNodeData) {
-
-                /* If there are no elements in here, we actually get 1 text node, this special case is dedicated to netdrive */
-                if ($propNodeData->nodeType != XML_ELEMENT_NODE) continue;
-
-                $propertyName = self::toClarkNotation($propNodeData);
-                if (isset($propertyMap[$propertyName])) {
-                    $propList[$propertyName] = call_user_func(array($propertyMap[$propertyName],'unserialize'),$propNodeData);
-                } else {
-                    $propList[$propertyName] = $propNodeData->textContent;
-                }
-            }
-
-
-        }
-        return $propList;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/AbstractPrincipalCollection.php b/core/src/core/classes/sabredav/lib/Sabre/DAVACL/AbstractPrincipalCollection.php
deleted file mode 100644
index a116236f31..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/AbstractPrincipalCollection.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL;
-use Sabre\DAV;
-
-/**
- * Principals Collection
- *
- * This is a helper class that easily allows you to create a collection that
- * has a childnode for every principal.
- *
- * To use this class, simply implement the getChildForPrincipal method.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-abstract class AbstractPrincipalCollection extends DAV\Collection implements IPrincipalCollection {
-
-    /**
-     * Node or 'directory' name.
-     *
-     * @var string
-     */
-    protected $path;
-
-    /**
-     * Principal backend
-     *
-     * @var PrincipalBackend\BackendInterface
-     */
-    protected $principalBackend;
-
-    /**
-     * If this value is set to true, it effectively disables listing of users
-     * it still allows user to find other users if they have an exact url.
-     *
-     * @var bool
-     */
-    public $disableListing = false;
-
-    /**
-     * Creates the object
-     *
-     * This object must be passed the principal backend. This object will
-     * filter all principals from a specified prefix ($principalPrefix). The
-     * default is 'principals', if your principals are stored in a different
-     * collection, override $principalPrefix
-     *
-     *
-     * @param PrincipalBackend\BackendInterface $principalBackend
-     * @param string $principalPrefix
-     */
-    public function __construct(PrincipalBackend\BackendInterface $principalBackend, $principalPrefix = 'principals') {
-
-        $this->principalPrefix = $principalPrefix;
-        $this->principalBackend = $principalBackend;
-
-    }
-
-    /**
-     * This method returns a node for a principal.
-     *
-     * The passed array contains principal information, and is guaranteed to
-     * at least contain a uri item. Other properties may or may not be
-     * supplied by the authentication backend.
-     *
-     * @param array $principalInfo
-     * @return IPrincipal
-     */
-    abstract function getChildForPrincipal(array $principalInfo);
-
-    /**
-     * Returns the name of this collection.
-     *
-     * @return string
-     */
-    public function getName() {
-
-        list(,$name) = DAV\URLUtil::splitPath($this->principalPrefix);
-        return $name;
-
-    }
-
-    /**
-     * Return the list of users
-     *
-     * @return array
-     */
-    public function getChildren() {
-
-        if ($this->disableListing)
-            throw new DAV\Exception\MethodNotAllowed('Listing members of this collection is disabled');
-
-        $children = array();
-        foreach($this->principalBackend->getPrincipalsByPrefix($this->principalPrefix) as $principalInfo) {
-
-            $children[] = $this->getChildForPrincipal($principalInfo);
-
-
-        }
-        return $children;
-
-    }
-
-    /**
-     * Returns a child object, by its name.
-     *
-     * @param string $name
-     * @throws DAV\Exception\NotFound
-     * @return IPrincipal
-     */
-    public function getChild($name) {
-
-        $principalInfo = $this->principalBackend->getPrincipalByPath($this->principalPrefix . '/' . $name);
-        if (!$principalInfo) throw new DAV\Exception\NotFound('Principal with name ' . $name . ' not found');
-        return $this->getChildForPrincipal($principalInfo);
-
-    }
-
-    /**
-     * This method is used to search for principals matching a set of
-     * properties.
-     *
-     * This search is specifically used by RFC3744's principal-property-search
-     * REPORT. You should at least allow searching on
-     * http://sabredav.org/ns}email-address.
-     *
-     * The actual search should be a unicode-non-case-sensitive search. The
-     * keys in searchProperties are the WebDAV property names, while the values
-     * are the property values to search on.
-     *
-     * If multiple properties are being searched on, the search should be
-     * AND'ed.
-     *
-     * This method should simply return a list of 'child names', which may be
-     * used to call $this->getChild in the future.
-     *
-     * @param array $searchProperties
-     * @return array
-     */
-    public function searchPrincipals(array $searchProperties) {
-
-        $result = $this->principalBackend->searchPrincipals($this->principalPrefix, $searchProperties);
-        $r = array();
-
-        foreach($result as $row) {
-            list(, $r[]) = DAV\URLUtil::splitPath($row);
-        }
-
-        return $r;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Exception/AceConflict.php b/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Exception/AceConflict.php
deleted file mode 100644
index 6ee9afd73b..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Exception/AceConflict.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\Exception;
-
-use Sabre\DAV;
-
-/**
- * This exception is thrown when a client attempts to set conflicting
- * permissions.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class AceConflict extends DAV\Exception\Conflict {
-
-    /**
-     * Adds in extra information in the xml response.
-     *
-     * This method adds the {DAV:}no-ace-conflict element as defined in rfc3744
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(DAV\Server $server,\DOMElement $errorNode) {
-
-        $doc = $errorNode->ownerDocument;
-
-        $np = $doc->createElementNS('DAV:','d:no-ace-conflict');
-        $errorNode->appendChild($np);
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Exception/NeedPrivileges.php b/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Exception/NeedPrivileges.php
deleted file mode 100644
index f7e4358839..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Exception/NeedPrivileges.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\Exception;
-
-use Sabre\DAV;
-
-/**
- * NeedPrivileges
- *
- * The 403-need privileges is thrown when a user didn't have the appropriate
- * permissions to perform an operation
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class NeedPrivileges extends DAV\Exception\Forbidden {
-
-    /**
-     * The relevant uri
-     *
-     * @var string
-     */
-    protected $uri;
-
-    /**
-     * The privileges the user didn't have.
-     *
-     * @var array
-     */
-    protected $privileges;
-
-    /**
-     * Constructor
-     *
-     * @param string $uri
-     * @param array $privileges
-     */
-    public function __construct($uri,array $privileges) {
-
-        $this->uri = $uri;
-        $this->privileges = $privileges;
-
-        parent::__construct('User did not have the required privileges (' . implode(',', $privileges) . ') for path "' . $uri . '"');
-
-    }
-
-    /**
-     * Adds in extra information in the xml response.
-     *
-     * This method adds the {DAV:}need-privileges element as defined in rfc3744
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(DAV\Server $server,\DOMElement $errorNode) {
-
-        $doc = $errorNode->ownerDocument;
-
-        $np = $doc->createElementNS('DAV:','d:need-privileges');
-        $errorNode->appendChild($np);
-
-        foreach($this->privileges as $privilege) {
-
-            $resource = $doc->createElementNS('DAV:','d:resource');
-            $np->appendChild($resource);
-
-            $resource->appendChild($doc->createElementNS('DAV:','d:href',$server->getBaseUri() . $this->uri));
-
-            $priv = $doc->createElementNS('DAV:','d:privilege');
-            $resource->appendChild($priv);
-
-            preg_match('/^{([^}]*)}(.*)$/',$privilege,$privilegeParts);
-            $priv->appendChild($doc->createElementNS($privilegeParts[1],'d:' . $privilegeParts[2]));
-
-
-        }
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Exception/NoAbstract.php b/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Exception/NoAbstract.php
deleted file mode 100644
index ba6f76cdb5..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Exception/NoAbstract.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\Exception;
-
-use Sabre\DAV;
-
-/**
- * This exception is thrown when a user tries to set a privilege that's marked
- * as abstract.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class NoAbstract extends DAV\Exception\PreconditionFailed {
-
-    /**
-     * Adds in extra information in the xml response.
-     *
-     * This method adds the {DAV:}no-abstract element as defined in rfc3744
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(DAV\Server $server,\DOMElement $errorNode) {
-
-        $doc = $errorNode->ownerDocument;
-
-        $np = $doc->createElementNS('DAV:','d:no-abstract');
-        $errorNode->appendChild($np);
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php b/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
deleted file mode 100644
index f61edef073..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\Exception;
-
-use Sabre\DAV;
-
-/**
- * If a client tried to set a privilege assigned to a non-existant principal,
- * this exception will be thrown.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class NotRecognizedPrincipal extends DAV\Exception\PreconditionFailed {
-
-    /**
-     * Adds in extra information in the xml response.
-     *
-     * This method adds the {DAV:}recognized-principal element as defined in rfc3744
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(DAV\Server $server,\DOMElement $errorNode) {
-
-        $doc = $errorNode->ownerDocument;
-
-        $np = $doc->createElementNS('DAV:','d:recognized-principal');
-        $errorNode->appendChild($np);
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Exception/NotSupportedPrivilege.php b/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
deleted file mode 100644
index 6d30698cd7..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\Exception;
-
-use Sabre\DAV;
-
-/**
- * If a client tried to set a privilege that doesn't exist, this exception will
- * be thrown.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class NotSupportedPrivilege extends DAV\Exception\PreconditionFailed {
-
-    /**
-     * Adds in extra information in the xml response.
-     *
-     * This method adds the {DAV:}not-supported-privilege element as defined in rfc3744
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $errorNode
-     * @return void
-     */
-    public function serialize(DAV\Server $server,\DOMElement $errorNode) {
-
-        $doc = $errorNode->ownerDocument;
-
-        $np = $doc->createElementNS('DAV:','d:not-supported-privilege');
-        $errorNode->appendChild($np);
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/IACL.php b/core/src/core/classes/sabredav/lib/Sabre/DAVACL/IACL.php
deleted file mode 100644
index 088ca3eec8..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/IACL.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL;
-use Sabre\DAV;
-
-/**
- * ACL-enabled node
- *
- * If you want to add WebDAV ACL to a node, you must implement this class
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface IACL extends DAV\INode {
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    function getOwner();
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    function getGroup();
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    function getACL();
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's as an array argument.
-     *
-     * @param array $acl
-     * @return void
-     */
-    function setACL(array $acl);
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    function getSupportedPrivilegeSet();
-
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/IPrincipal.php b/core/src/core/classes/sabredav/lib/Sabre/DAVACL/IPrincipal.php
deleted file mode 100644
index d88a0289bd..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/IPrincipal.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL;
-
-use Sabre\DAV;
-
-/**
- * IPrincipal interface
- *
- * Implement this interface to define your own principals
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface IPrincipal extends DAV\INode {
-
-    /**
-     * Returns a list of alternative urls for a principal
-     *
-     * This can for example be an email address, or ldap url.
-     *
-     * @return array
-     */
-    function getAlternateUriSet();
-
-    /**
-     * Returns the full principal url
-     *
-     * @return string
-     */
-    function getPrincipalUrl();
-
-    /**
-     * Returns the list of group members
-     *
-     * If this principal is a group, this function should return
-     * all member principal uri's for the group.
-     *
-     * @return array
-     */
-    function getGroupMemberSet();
-
-    /**
-     * Returns the list of groups this principal is member of
-     *
-     * If this principal is a member of a (list of) groups, this function
-     * should return a list of principal uri's for it's members.
-     *
-     * @return array
-     */
-    function getGroupMembership();
-
-    /**
-     * Sets a list of group members
-     *
-     * If this principal is a group, this method sets all the group members.
-     * The list of members is always overwritten, never appended to.
-     *
-     * This method should throw an exception if the members could not be set.
-     *
-     * @param array $principals
-     * @return void
-     */
-    function setGroupMemberSet(array $principals);
-
-    /**
-     * Returns the displayname
-     *
-     * This should be a human readable name for the principal.
-     * If none is available, return the nodename.
-     *
-     * @return string
-     */
-    function getDisplayName();
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/IPrincipalCollection.php b/core/src/core/classes/sabredav/lib/Sabre/DAVACL/IPrincipalCollection.php
deleted file mode 100644
index 2c097f9d7c..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/IPrincipalCollection.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL;
-
-use Sabre\DAV;
-
-/**
- * Principal Collection interface.
- *
- * Implement this interface to ensure that your principal collection can be
- * searched using the principal-property-search REPORT.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface IPrincipalCollection extends DAV\INode {
-
-    /**
-     * This method is used to search for principals matching a set of
-     * properties.
-     *
-     * This search is specifically used by RFC3744's principal-property-search
-     * REPORT. You should at least allow searching on
-     * http://sabredav.org/ns}email-address.
-     *
-     * The actual search should be a unicode-non-case-sensitive search. The
-     * keys in searchProperties are the WebDAV property names, while the values
-     * are the property values to search on.
-     *
-     * If multiple properties are being searched on, the search should be
-     * AND'ed.
-     *
-     * This method should simply return a list of 'child names', which may be
-     * used to call $this->getChild in the future.
-     *
-     * @param array $searchProperties
-     * @return array
-     */
-    function searchPrincipals(array $searchProperties);
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Plugin.php b/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Plugin.php
deleted file mode 100644
index f9bf4bb441..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Plugin.php
+++ /dev/null
@@ -1,1402 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL;
-use Sabre\DAV;
-
-/**
- * SabreDAV ACL Plugin
- *
- * This plugin provides functionality to enforce ACL permissions.
- * ACL is defined in RFC3744.
- *
- * In addition it also provides support for the {DAV:}current-user-principal
- * property, defined in RFC5397 and the {DAV:}expand-property report, as
- * defined in RFC3253.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Plugin extends DAV\ServerPlugin {
-
-    /**
-     * Recursion constants
-     *
-     * This only checks the base node
-     */
-    const R_PARENT = 1;
-
-    /**
-     * Recursion constants
-     *
-     * This checks every node in the tree
-     */
-    const R_RECURSIVE = 2;
-
-    /**
-     * Recursion constants
-     *
-     * This checks every parentnode in the tree, but not leaf-nodes.
-     */
-    const R_RECURSIVEPARENTS = 3;
-
-    /**
-     * Reference to server object.
-     *
-     * @var Sabre\DAV\Server
-     */
-    protected $server;
-
-    /**
-     * List of urls containing principal collections.
-     * Modify this if your principals are located elsewhere.
-     *
-     * @var array
-     */
-    public $principalCollectionSet = array(
-        'principals',
-    );
-
-    /**
-     * By default ACL is only enforced for nodes that have ACL support (the
-     * ones that implement IACL). For any other node, access is
-     * always granted.
-     *
-     * To override this behaviour you can turn this setting off. This is useful
-     * if you plan to fully support ACL in the entire tree.
-     *
-     * @var bool
-     */
-    public $allowAccessToNodesWithoutACL = true;
-
-    /**
-     * By default nodes that are inaccessible by the user, can still be seen
-     * in directory listings (PROPFIND on parent with Depth: 1)
-     *
-     * In certain cases it's desirable to hide inaccessible nodes. Setting this
-     * to true will cause these nodes to be hidden from directory listings.
-     *
-     * @var bool
-     */
-    public $hideNodesFromListings = false;
-
-    /**
-     * This string is prepended to the username of the currently logged in
-     * user. This allows the plugin to determine the principal path based on
-     * the username.
-     *
-     * @var string
-     */
-    public $defaultUsernamePath = 'principals';
-
-    /**
-     * This list of properties are the properties a client can search on using
-     * the {DAV:}principal-property-search report.
-     *
-     * The keys are the property names, values are descriptions.
-     *
-     * @var array
-     */
-    public $principalSearchPropertySet = array(
-        '{DAV:}displayname' => 'Display name',
-        '{http://sabredav.org/ns}email-address' => 'Email address',
-    );
-
-    /**
-     * Any principal uri's added here, will automatically be added to the list
-     * of ACL's. They will effectively receive {DAV:}all privileges, as a
-     * protected privilege.
-     *
-     * @var array
-     */
-    public $adminPrincipals = array();
-
-    /**
-     * Returns a list of features added by this plugin.
-     *
-     * This list is used in the response of a HTTP OPTIONS request.
-     *
-     * @return array
-     */
-    public function getFeatures() {
-
-        return array('access-control', 'calendarserver-principal-property-search');
-
-    }
-
-    /**
-     * Returns a list of available methods for a given url
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getMethods($uri) {
-
-        return array('ACL');
-
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using Sabre\DAV\Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return 'acl';
-
-    }
-
-    /**
-     * Returns a list of reports this plugin supports.
-     *
-     * This will be used in the {DAV:}supported-report-set property.
-     * Note that you still need to subscribe to the 'report' event to actually
-     * implement them
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getSupportedReportSet($uri) {
-
-        return array(
-            '{DAV:}expand-property',
-            '{DAV:}principal-property-search',
-            '{DAV:}principal-search-property-set',
-        );
-
-    }
-
-
-    /**
-     * Checks if the current user has the specified privilege(s).
-     *
-     * You can specify a single privilege, or a list of privileges.
-     * This method will throw an exception if the privilege is not available
-     * and return true otherwise.
-     *
-     * @param string $uri
-     * @param array|string $privileges
-     * @param int $recursion
-     * @param bool $throwExceptions if set to false, this method won't throw exceptions.
-     * @throws Sabre\DAVACL\Exception\NeedPrivileges
-     * @return bool
-     */
-    public function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) {
-
-        if (!is_array($privileges)) $privileges = array($privileges);
-
-        $acl = $this->getCurrentUserPrivilegeSet($uri);
-
-        if (is_null($acl)) {
-            if ($this->allowAccessToNodesWithoutACL) {
-                return true;
-            } else {
-                if ($throwExceptions)
-                    throw new Exception\NeedPrivileges($uri,$privileges);
-                else
-                    return false;
-
-            }
-        }
-
-        $failed = array();
-        foreach($privileges as $priv) {
-
-            if (!in_array($priv, $acl)) {
-                $failed[] = $priv;
-            }
-
-        }
-
-        if ($failed) {
-            if ($throwExceptions)
-                throw new Exception\NeedPrivileges($uri,$failed);
-            else
-                return false;
-        }
-        return true;
-
-    }
-
-    /**
-     * Returns the standard users' principal.
-     *
-     * This is one authorative principal url for the current user.
-     * This method will return null if the user wasn't logged in.
-     *
-     * @return string|null
-     */
-    public function getCurrentUserPrincipal() {
-
-        $authPlugin = $this->server->getPlugin('auth');
-        if (is_null($authPlugin)) return null;
-        /** @var $authPlugin Sabre\DAV\Auth\Plugin */
-
-        $userName = $authPlugin->getCurrentUser();
-        if (!$userName) return null;
-
-        return $this->defaultUsernamePath . '/' .  $userName;
-
-    }
-
-
-    /**
-     * Returns a list of principals that's associated to the current
-     * user, either directly or through group membership.
-     *
-     * @return array
-     */
-    public function getCurrentUserPrincipals() {
-
-        $currentUser = $this->getCurrentUserPrincipal();
-
-        if (is_null($currentUser)) return array();
-
-        return array_merge(
-            array($currentUser),
-            $this->getPrincipalMembership($currentUser)
-        );
-
-    }
-
-    /**
-     * This array holds a cache for all the principals that are associated with
-     * a single principal.
-     *
-     * @var array
-     */
-    protected $principalMembershipCache = array();
-
-
-    /**
-     * Returns all the principal groups the specified principal is a member of.
-     *
-     * @param string $principal
-     * @return array
-     */
-    public function getPrincipalMembership($mainPrincipal) {
-
-        // First check our cache
-        if (isset($this->principalMembershipCache[$mainPrincipal])) {
-            return $this->principalMembershipCache[$mainPrincipal];
-        }
-
-        $check = array($mainPrincipal);
-        $principals = array();
-
-        while(count($check)) {
-
-            $principal = array_shift($check);
-
-            $node = $this->server->tree->getNodeForPath($principal);
-            if ($node instanceof IPrincipal) {
-                foreach($node->getGroupMembership() as $groupMember) {
-
-                    if (!in_array($groupMember, $principals)) {
-
-                        $check[] = $groupMember;
-                        $principals[] = $groupMember;
-
-                    }
-
-                }
-
-            }
-
-        }
-
-        // Store the result in the cache
-        $this->principalMembershipCache[$mainPrincipal] = $principals;
-
-        return $principals;
-
-    }
-
-    /**
-     * Returns the supported privilege structure for this ACL plugin.
-     *
-     * See RFC3744 for more details. Currently we default on a simple,
-     * standard structure.
-     *
-     * You can either get the list of privileges by a uri (path) or by
-     * specifying a Node.
-     *
-     * @param string|DAV\INode $node
-     * @return array
-     */
-    public function getSupportedPrivilegeSet($node) {
-
-        if (is_string($node)) {
-            $node = $this->server->tree->getNodeForPath($node);
-        }
-
-        if ($node instanceof IACL) {
-            $result = $node->getSupportedPrivilegeSet();
-
-            if ($result)
-                return $result;
-        }
-
-        return self::getDefaultSupportedPrivilegeSet();
-
-    }
-
-    /**
-     * Returns a fairly standard set of privileges, which may be useful for
-     * other systems to use as a basis.
-     *
-     * @return array
-     */
-    static function getDefaultSupportedPrivilegeSet() {
-
-        return array(
-            'privilege'  => '{DAV:}all',
-            'abstract'   => true,
-            'aggregates' => array(
-                array(
-                    'privilege'  => '{DAV:}read',
-                    'aggregates' => array(
-                        array(
-                            'privilege' => '{DAV:}read-acl',
-                            'abstract'  => true,
-                        ),
-                        array(
-                            'privilege' => '{DAV:}read-current-user-privilege-set',
-                            'abstract'  => true,
-                        ),
-                    ),
-                ), // {DAV:}read
-                array(
-                    'privilege'  => '{DAV:}write',
-                    'aggregates' => array(
-                        array(
-                            'privilege' => '{DAV:}write-acl',
-                            'abstract'  => true,
-                        ),
-                        array(
-                            'privilege' => '{DAV:}write-properties',
-                            'abstract'  => true,
-                        ),
-                        array(
-                            'privilege' => '{DAV:}write-content',
-                            'abstract'  => true,
-                        ),
-                        array(
-                            'privilege' => '{DAV:}bind',
-                            'abstract'  => true,
-                        ),
-                        array(
-                            'privilege' => '{DAV:}unbind',
-                            'abstract'  => true,
-                        ),
-                        array(
-                            'privilege' => '{DAV:}unlock',
-                            'abstract'  => true,
-                        ),
-                    ),
-                ), // {DAV:}write
-            ),
-        ); // {DAV:}all
-
-    }
-
-    /**
-     * Returns the supported privilege set as a flat list
-     *
-     * This is much easier to parse.
-     *
-     * The returned list will be index by privilege name.
-     * The value is a struct containing the following properties:
-     *   - aggregates
-     *   - abstract
-     *   - concrete
-     *
-     * @param string|DAV\INode $node
-     * @return array
-     */
-    final public function getFlatPrivilegeSet($node) {
-
-        $privs = $this->getSupportedPrivilegeSet($node);
-
-        $flat = array();
-        $this->getFPSTraverse($privs, null, $flat);
-
-        return $flat;
-
-    }
-
-    /**
-     * Traverses the privilege set tree for reordering
-     *
-     * This function is solely used by getFlatPrivilegeSet, and would have been
-     * a closure if it wasn't for the fact I need to support PHP 5.2.
-     *
-     * @param array $priv
-     * @param $concrete
-     * @param array $flat
-     * @return void
-     */
-    final private function getFPSTraverse($priv, $concrete, &$flat) {
-
-        $myPriv = array(
-            'privilege' => $priv['privilege'],
-            'abstract' => isset($priv['abstract']) && $priv['abstract'],
-            'aggregates' => array(),
-            'concrete' => isset($priv['abstract']) && $priv['abstract']?$concrete:$priv['privilege'],
-        );
-
-        if (isset($priv['aggregates']))
-            foreach($priv['aggregates'] as $subPriv) $myPriv['aggregates'][] = $subPriv['privilege'];
-
-        $flat[$priv['privilege']] = $myPriv;
-
-        if (isset($priv['aggregates'])) {
-
-            foreach($priv['aggregates'] as $subPriv) {
-
-                $this->getFPSTraverse($subPriv, $myPriv['concrete'], $flat);
-
-            }
-
-        }
-
-    }
-
-    /**
-     * Returns the full ACL list.
-     *
-     * Either a uri or a DAV\INode may be passed.
-     *
-     * null will be returned if the node doesn't support ACLs.
-     *
-     * @param string|DAV\INode $node
-     * @return array
-     */
-    public function getACL($node) {
-
-        if (is_string($node)) {
-            $node = $this->server->tree->getNodeForPath($node);
-        }
-        if (!$node instanceof IACL) {
-            return null;
-        }
-        $acl = $node->getACL();
-        foreach($this->adminPrincipals as $adminPrincipal) {
-            $acl[] = array(
-                'principal' => $adminPrincipal,
-                'privilege' => '{DAV:}all',
-                'protected' => true,
-            );
-        }
-        return $acl;
-
-    }
-
-    /**
-     * Returns a list of privileges the current user has
-     * on a particular node.
-     *
-     * Either a uri or a DAV\INode may be passed.
-     *
-     * null will be returned if the node doesn't support ACLs.
-     *
-     * @param string|DAV\INode $node
-     * @return array
-     */
-    public function getCurrentUserPrivilegeSet($node) {
-
-        if (is_string($node)) {
-            $node = $this->server->tree->getNodeForPath($node);
-        }
-
-        $acl = $this->getACL($node);
-
-        if (is_null($acl)) return null;
-
-        $principals = $this->getCurrentUserPrincipals();
-
-        $collected = array();
-
-        foreach($acl as $ace) {
-
-            $principal = $ace['principal'];
-
-            switch($principal) {
-
-                case '{DAV:}owner' :
-                    $owner = $node->getOwner();
-                    if ($owner && in_array($owner, $principals)) {
-                        $collected[] = $ace;
-                    }
-                    break;
-
-
-                // 'all' matches for every user
-                case '{DAV:}all' :
-
-                // 'authenticated' matched for every user that's logged in.
-                // Since it's not possible to use ACL while not being logged
-                // in, this is also always true.
-                case '{DAV:}authenticated' :
-                    $collected[] = $ace;
-                    break;
-
-                // 'unauthenticated' can never occur either, so we simply
-                // ignore these.
-                case '{DAV:}unauthenticated' :
-                    break;
-
-                default :
-                    if (in_array($ace['principal'], $principals)) {
-                        $collected[] = $ace;
-                    }
-                    break;
-
-            }
-
-
-        }
-
-        // Now we deduct all aggregated privileges.
-        $flat = $this->getFlatPrivilegeSet($node);
-
-        $collected2 = array();
-        while(count($collected)) {
-
-            $current = array_pop($collected);
-            $collected2[] = $current['privilege'];
-
-            foreach($flat[$current['privilege']]['aggregates'] as $subPriv) {
-                $collected2[] = $subPriv;
-                $collected[] = $flat[$subPriv];
-            }
-
-        }
-
-        return array_values(array_unique($collected2));
-
-    }
-
-    /**
-     * Principal property search
-     *
-     * This method can search for principals matching certain values in
-     * properties.
-     *
-     * This method will return a list of properties for the matched properties.
-     *
-     * @param array $searchProperties    The properties to search on. This is a
-     *                                   key-value list. The keys are property
-     *                                   names, and the values the strings to
-     *                                   match them on.
-     * @param array $requestedProperties This is the list of properties to
-     *                                   return for every match.
-     * @param string $collectionUri      The principal collection to search on.
-     *                                   If this is ommitted, the standard
-     *                                   principal collection-set will be used.
-     * @return array     This method returns an array structure similar to
-     *                  Sabre\DAV\Server::getPropertiesForPath. Returned
-     *                  properties are index by a HTTP status code.
-     *
-     */
-    public function principalSearch(array $searchProperties, array $requestedProperties, $collectionUri = null) {
-
-        if (!is_null($collectionUri)) {
-            $uris = array($collectionUri);
-        } else {
-            $uris = $this->principalCollectionSet;
-        }
-
-        $lookupResults = array();
-        foreach($uris as $uri) {
-
-            $principalCollection = $this->server->tree->getNodeForPath($uri);
-            if (!$principalCollection instanceof IPrincipalCollection) {
-                // Not a principal collection, we're simply going to ignore
-                // this.
-                continue;
-            }
-
-            $results = $principalCollection->searchPrincipals($searchProperties);
-            foreach($results as $result) {
-                $lookupResults[] = rtrim($uri,'/') . '/' . $result;
-            }
-
-        }
-
-        $matches = array();
-
-        foreach($lookupResults as $lookupResult) {
-
-            list($matches[]) = $this->server->getPropertiesForPath($lookupResult, $requestedProperties, 0);
-
-        }
-
-        return $matches;
-
-    }
-
-    /**
-     * Sets up the plugin
-     *
-     * This method is automatically called by the server class.
-     *
-     * @param DAV\Server $server
-     * @return void
-     */
-    public function initialize(DAV\Server $server) {
-
-        $this->server = $server;
-        $server->subscribeEvent('beforeGetProperties',array($this,'beforeGetProperties'));
-
-        $server->subscribeEvent('beforeMethod', array($this,'beforeMethod'),20);
-        $server->subscribeEvent('beforeBind', array($this,'beforeBind'),20);
-        $server->subscribeEvent('beforeUnbind', array($this,'beforeUnbind'),20);
-        $server->subscribeEvent('updateProperties',array($this,'updateProperties'));
-        $server->subscribeEvent('beforeUnlock', array($this,'beforeUnlock'),20);
-        $server->subscribeEvent('report',array($this,'report'));
-        $server->subscribeEvent('unknownMethod', array($this, 'unknownMethod'));
-
-        array_push($server->protectedProperties,
-            '{DAV:}alternate-URI-set',
-            '{DAV:}principal-URL',
-            '{DAV:}group-membership',
-            '{DAV:}principal-collection-set',
-            '{DAV:}current-user-principal',
-            '{DAV:}supported-privilege-set',
-            '{DAV:}current-user-privilege-set',
-            '{DAV:}acl',
-            '{DAV:}acl-restrictions',
-            '{DAV:}inherited-acl-set',
-            '{DAV:}owner',
-            '{DAV:}group'
-        );
-
-        // Automatically mapping nodes implementing IPrincipal to the
-        // {DAV:}principal resourcetype.
-        $server->resourceTypeMapping['Sabre\\DAVACL\\IPrincipal'] = '{DAV:}principal';
-
-        // Mapping the group-member-set property to the HrefList property
-        // class.
-        $server->propertyMap['{DAV:}group-member-set'] = 'Sabre\\DAV\\Property\\HrefList';
-
-    }
-
-
-    /* {{{ Event handlers */
-
-    /**
-     * Triggered before any method is handled
-     *
-     * @param string $method
-     * @param string $uri
-     * @return void
-     */
-    public function beforeMethod($method, $uri) {
-
-        $exists = $this->server->tree->nodeExists($uri);
-
-        // If the node doesn't exists, none of these checks apply
-        if (!$exists) return;
-
-        switch($method) {
-
-            case 'GET' :
-            case 'HEAD' :
-            case 'OPTIONS' :
-                // For these 3 we only need to know if the node is readable.
-                $this->checkPrivileges($uri,'{DAV:}read');
-                break;
-
-            case 'PUT' :
-            case 'LOCK' :
-            case 'UNLOCK' :
-                // This method requires the write-content priv if the node
-                // already exists, and bind on the parent if the node is being
-                // created.
-                // The bind privilege is handled in the beforeBind event.
-                $this->checkPrivileges($uri,'{DAV:}write-content');
-                break;
-
-
-            case 'PROPPATCH' :
-                $this->checkPrivileges($uri,'{DAV:}write-properties');
-                break;
-
-            case 'ACL' :
-                $this->checkPrivileges($uri,'{DAV:}write-acl');
-                break;
-
-            case 'COPY' :
-            case 'MOVE' :
-                // Copy requires read privileges on the entire source tree.
-                // If the target exists write-content normally needs to be
-                // checked, however, we're deleting the node beforehand and
-                // creating a new one after, so this is handled by the
-                // beforeUnbind event.
-                //
-                // The creation of the new node is handled by the beforeBind
-                // event.
-                //
-                // If MOVE is used beforeUnbind will also be used to check if
-                // the sourcenode can be deleted.
-                $this->checkPrivileges($uri,'{DAV:}read',self::R_RECURSIVE);
-
-                break;
-
-        }
-
-    }
-
-    /**
-     * Triggered before a new node is created.
-     *
-     * This allows us to check permissions for any operation that creates a
-     * new node, such as PUT, MKCOL, MKCALENDAR, LOCK, COPY and MOVE.
-     *
-     * @param string $uri
-     * @return void
-     */
-    public function beforeBind($uri) {
-
-        list($parentUri,$nodeName) = DAV\URLUtil::splitPath($uri);
-        $this->checkPrivileges($parentUri,'{DAV:}bind');
-
-    }
-
-    /**
-     * Triggered before a node is deleted
-     *
-     * This allows us to check permissions for any operation that will delete
-     * an existing node.
-     *
-     * @param string $uri
-     * @return void
-     */
-    public function beforeUnbind($uri) {
-
-        list($parentUri,$nodeName) = DAV\URLUtil::splitPath($uri);
-        $this->checkPrivileges($parentUri,'{DAV:}unbind',self::R_RECURSIVEPARENTS);
-
-    }
-
-    /**
-     * Triggered before a node is unlocked.
-     *
-     * @param string $uri
-     * @param DAV\Locks\LockInfo $lock
-     * @TODO: not yet implemented
-     * @return void
-     */
-    public function beforeUnlock($uri, DAV\Locks\LockInfo $lock) {
-
-
-    }
-
-    /**
-     * Triggered before properties are looked up in specific nodes.
-     *
-     * @param string $uri
-     * @param DAV\INode $node
-     * @param array $requestedProperties
-     * @param array $returnedProperties
-     * @TODO really should be broken into multiple methods, or even a class.
-     * @return bool
-     */
-    public function beforeGetProperties($uri, DAV\INode $node, &$requestedProperties, &$returnedProperties) {
-
-        // Checking the read permission
-        if (!$this->checkPrivileges($uri,'{DAV:}read',self::R_PARENT,false)) {
-
-            // User is not allowed to read properties
-            if ($this->hideNodesFromListings) {
-                return false;
-            }
-
-            // Marking all requested properties as '403'.
-            foreach($requestedProperties as $key=>$requestedProperty) {
-                unset($requestedProperties[$key]);
-                $returnedProperties[403][$requestedProperty] = null;
-            }
-            return;
-
-        }
-
-        /* Adding principal properties */
-        if ($node instanceof IPrincipal) {
-
-            if (false !== ($index = array_search('{DAV:}alternate-URI-set', $requestedProperties))) {
-
-                unset($requestedProperties[$index]);
-                $returnedProperties[200]['{DAV:}alternate-URI-set'] = new DAV\Property\HrefList($node->getAlternateUriSet());
-
-            }
-            if (false !== ($index = array_search('{DAV:}principal-URL', $requestedProperties))) {
-
-                unset($requestedProperties[$index]);
-                $returnedProperties[200]['{DAV:}principal-URL'] = new DAV\Property\Href($node->getPrincipalUrl() . '/');
-
-            }
-            if (false !== ($index = array_search('{DAV:}group-member-set', $requestedProperties))) {
-
-                unset($requestedProperties[$index]);
-                $returnedProperties[200]['{DAV:}group-member-set'] = new DAV\Property\HrefList($node->getGroupMemberSet());
-
-            }
-            if (false !== ($index = array_search('{DAV:}group-membership', $requestedProperties))) {
-
-                unset($requestedProperties[$index]);
-                $returnedProperties[200]['{DAV:}group-membership'] = new DAV\Property\HrefList($node->getGroupMembership());
-
-            }
-
-            if (false !== ($index = array_search('{DAV:}displayname', $requestedProperties))) {
-
-                $returnedProperties[200]['{DAV:}displayname'] = $node->getDisplayName();
-
-            }
-
-        }
-        if (false !== ($index = array_search('{DAV:}principal-collection-set', $requestedProperties))) {
-
-            unset($requestedProperties[$index]);
-            $val = $this->principalCollectionSet;
-            // Ensuring all collections end with a slash
-            foreach($val as $k=>$v) $val[$k] = $v . '/';
-            $returnedProperties[200]['{DAV:}principal-collection-set'] = new DAV\Property\HrefList($val);
-
-        }
-        if (false !== ($index = array_search('{DAV:}current-user-principal', $requestedProperties))) {
-
-            unset($requestedProperties[$index]);
-            if ($url = $this->getCurrentUserPrincipal()) {
-                $returnedProperties[200]['{DAV:}current-user-principal'] = new Property\Principal(Property\Principal::HREF, $url . '/');
-            } else {
-                $returnedProperties[200]['{DAV:}current-user-principal'] = new Property\Principal(Property\Principal::UNAUTHENTICATED);
-            }
-
-        }
-        if (false !== ($index = array_search('{DAV:}supported-privilege-set', $requestedProperties))) {
-
-            unset($requestedProperties[$index]);
-            $returnedProperties[200]['{DAV:}supported-privilege-set'] = new Property\SupportedPrivilegeSet($this->getSupportedPrivilegeSet($node));
-
-        }
-        if (false !== ($index = array_search('{DAV:}current-user-privilege-set', $requestedProperties))) {
-
-            if (!$this->checkPrivileges($uri, '{DAV:}read-current-user-privilege-set', self::R_PARENT, false)) {
-                $returnedProperties[403]['{DAV:}current-user-privilege-set'] = null;
-                unset($requestedProperties[$index]);
-            } else {
-                $val = $this->getCurrentUserPrivilegeSet($node);
-                if (!is_null($val)) {
-                    unset($requestedProperties[$index]);
-                    $returnedProperties[200]['{DAV:}current-user-privilege-set'] = new Property\CurrentUserPrivilegeSet($val);
-                }
-            }
-
-        }
-
-        /* The ACL property contains all the permissions */
-        if (false !== ($index = array_search('{DAV:}acl', $requestedProperties))) {
-
-            if (!$this->checkPrivileges($uri, '{DAV:}read-acl', self::R_PARENT, false)) {
-
-                unset($requestedProperties[$index]);
-                $returnedProperties[403]['{DAV:}acl'] = null;
-
-            } else {
-
-                $acl = $this->getACL($node);
-                if (!is_null($acl)) {
-                    unset($requestedProperties[$index]);
-                    $returnedProperties[200]['{DAV:}acl'] = new Property\Acl($this->getACL($node));
-                }
-
-            }
-
-        }
-
-        /* The acl-restrictions property contains information on how privileges
-         * must behave.
-         */
-        if (false !== ($index = array_search('{DAV:}acl-restrictions', $requestedProperties))) {
-            unset($requestedProperties[$index]);
-            $returnedProperties[200]['{DAV:}acl-restrictions'] = new Property\AclRestrictions();
-        }
-
-        /* Adding ACL properties */
-        if ($node instanceof IACL) {
-
-            if (false !== ($index = array_search('{DAV:}owner', $requestedProperties))) {
-
-                unset($requestedProperties[$index]);
-                $returnedProperties[200]['{DAV:}owner'] = new DAV\Property\Href($node->getOwner() . '/');
-
-            }
-
-        }
-
-    }
-
-    /**
-     * This method intercepts PROPPATCH methods and make sure the
-     * group-member-set is updated correctly.
-     *
-     * @param array $propertyDelta
-     * @param array $result
-     * @param DAV\INode $node
-     * @return bool
-     */
-    public function updateProperties(&$propertyDelta, &$result, DAV\INode $node) {
-
-        if (!array_key_exists('{DAV:}group-member-set', $propertyDelta))
-            return;
-
-        if (is_null($propertyDelta['{DAV:}group-member-set'])) {
-            $memberSet = array();
-        } elseif ($propertyDelta['{DAV:}group-member-set'] instanceof DAV\Property\HrefList) {
-            $memberSet = array_map(
-                array($this->server,'calculateUri'),
-                $propertyDelta['{DAV:}group-member-set']->getHrefs()
-            );
-        } else {
-            throw new DAV\Exception('The group-member-set property MUST be an instance of Sabre\DAV\Property\HrefList or null');
-        }
-
-        if (!($node instanceof IPrincipal)) {
-            $result[403]['{DAV:}group-member-set'] = null;
-            unset($propertyDelta['{DAV:}group-member-set']);
-
-            // Returning false will stop the updateProperties process
-            return false;
-        }
-
-        $node->setGroupMemberSet($memberSet);
-        // We must also clear our cache, just in case
-
-        $this->principalMembershipCache = array();
-
-        $result[200]['{DAV:}group-member-set'] = null;
-        unset($propertyDelta['{DAV:}group-member-set']);
-
-    }
-
-    /**
-     * This method handles HTTP REPORT requests
-     *
-     * @param string $reportName
-     * @param \DOMNode $dom
-     * @return bool
-     */
-    public function report($reportName, $dom) {
-
-        switch($reportName) {
-
-            case '{DAV:}principal-property-search' :
-                $this->principalPropertySearchReport($dom);
-                return false;
-            case '{DAV:}principal-search-property-set' :
-                $this->principalSearchPropertySetReport($dom);
-                return false;
-            case '{DAV:}expand-property' :
-                $this->expandPropertyReport($dom);
-                return false;
-
-        }
-
-    }
-
-    /**
-     * This event is triggered for any HTTP method that is not known by the
-     * webserver.
-     *
-     * @param string $method
-     * @param string $uri
-     * @return bool
-     */
-    public function unknownMethod($method, $uri) {
-
-        if ($method!=='ACL') return;
-
-        $this->httpACL($uri);
-        return false;
-
-    }
-
-    /**
-     * This method is responsible for handling the 'ACL' event.
-     *
-     * @param string $uri
-     * @return void
-     */
-    public function httpACL($uri) {
-
-        $body = $this->server->httpRequest->getBody(true);
-        $dom = DAV\XMLUtil::loadDOMDocument($body);
-
-        $newAcl =
-            Property\Acl::unserialize($dom->firstChild)
-            ->getPrivileges();
-
-        // Normalizing urls
-        foreach($newAcl as $k=>$newAce) {
-            $newAcl[$k]['principal'] = $this->server->calculateUri($newAce['principal']);
-        }
-
-        $node = $this->server->tree->getNodeForPath($uri);
-
-        if (!($node instanceof IACL)) {
-            throw new DAV\Exception\MethodNotAllowed('This node does not support the ACL method');
-        }
-
-        $oldAcl = $this->getACL($node);
-
-        $supportedPrivileges = $this->getFlatPrivilegeSet($node);
-
-        /* Checking if protected principals from the existing principal set are
-           not overwritten. */
-        foreach($oldAcl as $oldAce) {
-
-            if (!isset($oldAce['protected']) || !$oldAce['protected']) continue;
-
-            $found = false;
-            foreach($newAcl as $newAce) {
-                if (
-                    $newAce['privilege'] === $oldAce['privilege'] &&
-                    $newAce['principal'] === $oldAce['principal'] &&
-                    $newAce['protected']
-                )
-                $found = true;
-            }
-
-            if (!$found)
-                throw new Exception\AceConflict('This resource contained a protected {DAV:}ace, but this privilege did not occur in the ACL request');
-
-        }
-
-        foreach($newAcl as $newAce) {
-
-            // Do we recognize the privilege
-            if (!isset($supportedPrivileges[$newAce['privilege']])) {
-                throw new Exception\NotSupportedPrivilege('The privilege you specified (' . $newAce['privilege'] . ') is not recognized by this server');
-            }
-
-            if ($supportedPrivileges[$newAce['privilege']]['abstract']) {
-                throw new Exception\NoAbstract('The privilege you specified (' . $newAce['privilege'] . ') is an abstract privilege');
-            }
-
-            // Looking up the principal
-            try {
-                $principal = $this->server->tree->getNodeForPath($newAce['principal']);
-            } catch (DAV\Exception\NotFound $e) {
-                throw new Exception\NotRecognizedPrincipal('The specified principal (' . $newAce['principal'] . ') does not exist');
-            }
-            if (!($principal instanceof IPrincipal)) {
-                throw new Exception\NotRecognizedPrincipal('The specified uri (' . $newAce['principal'] . ') is not a principal');
-            }
-
-        }
-        $node->setACL($newAcl);
-
-    }
-
-    /* }}} */
-
-    /* Reports {{{ */
-
-    /**
-     * The expand-property report is defined in RFC3253 section 3-8.
-     *
-     * This report is very similar to a standard PROPFIND. The difference is
-     * that it has the additional ability to look at properties containing a
-     * {DAV:}href element, follow that property and grab additional elements
-     * there.
-     *
-     * Other rfc's, such as ACL rely on this report, so it made sense to put
-     * it in this plugin.
-     *
-     * @param \DOMElement $dom
-     * @return void
-     */
-    protected function expandPropertyReport($dom) {
-
-        $requestedProperties = $this->parseExpandPropertyReportRequest($dom->firstChild->firstChild);
-        $depth = $this->server->getHTTPDepth(0);
-        $requestUri = $this->server->getRequestUri();
-
-        $result = $this->expandProperties($requestUri,$requestedProperties,$depth);
-
-        $dom = new \DOMDocument('1.0','utf-8');
-        $dom->formatOutput = true;
-        $multiStatus = $dom->createElement('d:multistatus');
-        $dom->appendChild($multiStatus);
-
-        // Adding in default namespaces
-        foreach($this->server->xmlNamespaces as $namespace=>$prefix) {
-
-            $multiStatus->setAttribute('xmlns:' . $prefix,$namespace);
-
-        }
-
-        foreach($result as $response) {
-            $response->serialize($this->server, $multiStatus);
-        }
-
-        $xml = $dom->saveXML();
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->sendStatus(207);
-        $this->server->httpResponse->sendBody($xml);
-
-    }
-
-    /**
-     * This method is used by expandPropertyReport to parse
-     * out the entire HTTP request.
-     *
-     * @param \DOMElement $node
-     * @return array
-     */
-    protected function parseExpandPropertyReportRequest($node) {
-
-        $requestedProperties = array();
-        do {
-
-            if (DAV\XMLUtil::toClarkNotation($node)!=='{DAV:}property') continue;
-
-            if ($node->firstChild) {
-
-                $children = $this->parseExpandPropertyReportRequest($node->firstChild);
-
-            } else {
-
-                $children = array();
-
-            }
-
-            $namespace = $node->getAttribute('namespace');
-            if (!$namespace) $namespace = 'DAV:';
-
-            $propName = '{'.$namespace.'}' . $node->getAttribute('name');
-            $requestedProperties[$propName] = $children;
-
-        } while ($node = $node->nextSibling);
-
-        return $requestedProperties;
-
-    }
-
-    /**
-     * This method expands all the properties and returns
-     * a list with property values
-     *
-     * @param array $path
-     * @param array $requestedProperties the list of required properties
-     * @param int $depth
-     * @return array
-     */
-    protected function expandProperties($path, array $requestedProperties, $depth) {
-
-        $foundProperties = $this->server->getPropertiesForPath($path, array_keys($requestedProperties), $depth);
-
-        $result = array();
-
-        foreach($foundProperties as $node) {
-
-            foreach($requestedProperties as $propertyName=>$childRequestedProperties) {
-
-                // We're only traversing if sub-properties were requested
-                if(count($childRequestedProperties)===0) continue;
-
-                // We only have to do the expansion if the property was found
-                // and it contains an href element.
-                if (!array_key_exists($propertyName,$node[200])) continue;
-
-                if ($node[200][$propertyName] instanceof DAV\Property\IHref) {
-                    $hrefs = array($node[200][$propertyName]->getHref());
-                } elseif ($node[200][$propertyName] instanceof DAV\Property\HrefList) {
-                    $hrefs = $node[200][$propertyName]->getHrefs();
-                }
-
-                $childProps = array();
-                foreach($hrefs as $href) {
-                    $childProps = array_merge($childProps, $this->expandProperties($href, $childRequestedProperties, 0));
-                }
-                $node[200][$propertyName] = new DAV\Property\ResponseList($childProps);
-
-            }
-            $result[] = new DAV\Property\Response($node['href'], $node);
-
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * principalSearchPropertySetReport
-     *
-     * This method responsible for handing the
-     * {DAV:}principal-search-property-set report. This report returns a list
-     * of properties the client may search on, using the
-     * {DAV:}principal-property-search report.
-     *
-     * @param \DOMDocument $dom
-     * @return void
-     */
-    protected function principalSearchPropertySetReport(\DOMDocument $dom) {
-
-        $httpDepth = $this->server->getHTTPDepth(0);
-        if ($httpDepth!==0) {
-            throw new DAV\Exception\BadRequest('This report is only defined when Depth: 0');
-        }
-
-        if ($dom->firstChild->hasChildNodes())
-            throw new DAV\Exception\BadRequest('The principal-search-property-set report element is not allowed to have child elements');
-
-        $dom = new \DOMDocument('1.0','utf-8');
-        $dom->formatOutput = true;
-        $root = $dom->createElement('d:principal-search-property-set');
-        $dom->appendChild($root);
-        // Adding in default namespaces
-        foreach($this->server->xmlNamespaces as $namespace=>$prefix) {
-
-            $root->setAttribute('xmlns:' . $prefix,$namespace);
-
-        }
-
-        $nsList = $this->server->xmlNamespaces;
-
-        foreach($this->principalSearchPropertySet as $propertyName=>$description) {
-
-            $psp = $dom->createElement('d:principal-search-property');
-            $root->appendChild($psp);
-
-            $prop = $dom->createElement('d:prop');
-            $psp->appendChild($prop);
-
-            $propName = null;
-            preg_match('/^{([^}]*)}(.*)$/',$propertyName,$propName);
-
-            $currentProperty = $dom->createElement($nsList[$propName[1]] . ':' . $propName[2]);
-            $prop->appendChild($currentProperty);
-
-            $descriptionElem = $dom->createElement('d:description');
-            $descriptionElem->setAttribute('xml:lang','en');
-            $descriptionElem->appendChild($dom->createTextNode($description));
-            $psp->appendChild($descriptionElem);
-
-
-        }
-
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->sendStatus(200);
-        $this->server->httpResponse->sendBody($dom->saveXML());
-
-    }
-
-    /**
-     * principalPropertySearchReport
-     *
-     * This method is responsible for handing the
-     * {DAV:}principal-property-search report. This report can be used for
-     * clients to search for groups of principals, based on the value of one
-     * or more properties.
-     *
-     * @param \DOMDocument $dom
-     * @return void
-     */
-    protected function principalPropertySearchReport(\DOMDocument $dom) {
-
-        list($searchProperties, $requestedProperties, $applyToPrincipalCollectionSet) = $this->parsePrincipalPropertySearchReportRequest($dom);
-
-        $uri = null;
-        if (!$applyToPrincipalCollectionSet) {
-            $uri = $this->server->getRequestUri();
-        }
-        $result = $this->principalSearch($searchProperties, $requestedProperties, $uri);
-
-        $prefer = $this->server->getHTTPPRefer();
-
-        $this->server->httpResponse->sendStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type','application/xml; charset=utf-8');
-        $this->server->httpResponse->setHeader('Vary','Brief,Prefer');
-        $this->server->httpResponse->sendBody($this->server->generateMultiStatus($result, $prefer['return-minimal']));
-
-    }
-
-    /**
-     * parsePrincipalPropertySearchReportRequest
-     *
-     * This method parses the request body from a
-     * {DAV:}principal-property-search report.
-     *
-     * This method returns an array with two elements:
-     *  1. an array with properties to search on, and their values
-     *  2. a list of propertyvalues that should be returned for the request.
-     *
-     * @param \DOMDocument $dom
-     * @return array
-     */
-    protected function parsePrincipalPropertySearchReportRequest($dom) {
-
-        $httpDepth = $this->server->getHTTPDepth(0);
-        if ($httpDepth!==0) {
-            throw new DAV\Exception\BadRequest('This report is only defined when Depth: 0');
-        }
-
-        $searchProperties = array();
-
-        $applyToPrincipalCollectionSet = false;
-
-        // Parsing the search request
-        foreach($dom->firstChild->childNodes as $searchNode) {
-
-            if (DAV\XMLUtil::toClarkNotation($searchNode) == '{DAV:}apply-to-principal-collection-set') {
-                $applyToPrincipalCollectionSet = true;
-            }
-
-            if (DAV\XMLUtil::toClarkNotation($searchNode)!=='{DAV:}property-search')
-                continue;
-
-            $propertyName = null;
-            $propertyValue = null;
-
-            foreach($searchNode->childNodes as $childNode) {
-
-                switch(DAV\XMLUtil::toClarkNotation($childNode)) {
-
-                    case '{DAV:}prop' :
-                        $property = DAV\XMLUtil::parseProperties($searchNode);
-                        reset($property);
-                        $propertyName = key($property);
-                        break;
-
-                    case '{DAV:}match' :
-                        $propertyValue = $childNode->textContent;
-                        break;
-
-                }
-
-
-            }
-
-            if (is_null($propertyName) || is_null($propertyValue))
-                throw new DAV\Exception\BadRequest('Invalid search request. propertyname: ' . $propertyName . '. propertvvalue: ' . $propertyValue);
-
-            $searchProperties[$propertyName] = $propertyValue;
-
-        }
-
-        return array($searchProperties, array_keys(DAV\XMLUtil::parseProperties($dom->firstChild)), $applyToPrincipalCollectionSet);
-
-    }
-
-
-    /* }}} */
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Principal.php b/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Principal.php
deleted file mode 100644
index 89277f8508..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Principal.php
+++ /dev/null
@@ -1,281 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL;
-
-use Sabre\DAV;
-
-/**
- * Principal class
- *
- * This class is a representation of a simple principal
- *
- * Many WebDAV specs require a user to show up in the directory
- * structure.
- *
- * This principal also has basic ACL settings, only allowing the principal
- * access it's own principal.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Principal extends DAV\Node implements IPrincipal, DAV\IProperties, IACL {
-
-    /**
-     * Struct with principal information.
-     *
-     * @var array
-     */
-    protected $principalProperties;
-
-    /**
-     * Principal backend
-     *
-     * @var PrincipalBackend\BackendInterface
-     */
-    protected $principalBackend;
-
-    /**
-     * Creates the principal object
-     *
-     * @param IPrincipalBackend $principalBackend
-     * @param array $principalProperties
-     */
-    public function __construct(PrincipalBackend\BackendInterface $principalBackend, array $principalProperties = array()) {
-
-        if (!isset($principalProperties['uri'])) {
-            throw new DAV\Exception('The principal properties must at least contain the \'uri\' key');
-        }
-        $this->principalBackend = $principalBackend;
-        $this->principalProperties = $principalProperties;
-
-    }
-
-    /**
-     * Returns the full principal url
-     *
-     * @return string
-     */
-    public function getPrincipalUrl() {
-
-        return $this->principalProperties['uri'];
-
-    }
-
-    /**
-     * Returns a list of alternative urls for a principal
-     *
-     * This can for example be an email address, or ldap url.
-     *
-     * @return array
-     */
-    public function getAlternateUriSet() {
-
-        $uris = array();
-        if (isset($this->principalProperties['{DAV:}alternate-URI-set'])) {
-
-            $uris = $this->principalProperties['{DAV:}alternate-URI-set'];
-
-        }
-
-        if (isset($this->principalProperties['{http://sabredav.org/ns}email-address'])) {
-            $uris[] = 'mailto:' . $this->principalProperties['{http://sabredav.org/ns}email-address'];
-        }
-
-        return array_unique($uris);
-
-    }
-
-    /**
-     * Returns the list of group members
-     *
-     * If this principal is a group, this function should return
-     * all member principal uri's for the group.
-     *
-     * @return array
-     */
-    public function getGroupMemberSet() {
-
-        return $this->principalBackend->getGroupMemberSet($this->principalProperties['uri']);
-
-    }
-
-    /**
-     * Returns the list of groups this principal is member of
-     *
-     * If this principal is a member of a (list of) groups, this function
-     * should return a list of principal uri's for it's members.
-     *
-     * @return array
-     */
-    public function getGroupMembership() {
-
-        return $this->principalBackend->getGroupMemberShip($this->principalProperties['uri']);
-
-    }
-
-
-    /**
-     * Sets a list of group members
-     *
-     * If this principal is a group, this method sets all the group members.
-     * The list of members is always overwritten, never appended to.
-     *
-     * This method should throw an exception if the members could not be set.
-     *
-     * @param array $groupMembers
-     * @return void
-     */
-    public function setGroupMemberSet(array $groupMembers) {
-
-        $this->principalBackend->setGroupMemberSet($this->principalProperties['uri'], $groupMembers);
-
-    }
-
-
-    /**
-     * Returns this principals name.
-     *
-     * @return string
-     */
-    public function getName() {
-
-        $uri = $this->principalProperties['uri'];
-        list(, $name) = DAV\URLUtil::splitPath($uri);
-        return $name;
-
-    }
-
-    /**
-     * Returns the name of the user
-     *
-     * @return string
-     */
-    public function getDisplayName() {
-
-        if (isset($this->principalProperties['{DAV:}displayname'])) {
-            return $this->principalProperties['{DAV:}displayname'];
-        } else {
-            return $this->getName();
-        }
-
-    }
-
-    /**
-     * Returns a list of properties
-     *
-     * @param array $requestedProperties
-     * @return array
-     */
-    public function getProperties($requestedProperties) {
-
-        $newProperties = array();
-        foreach($requestedProperties as $propName) {
-
-            if (isset($this->principalProperties[$propName])) {
-                $newProperties[$propName] = $this->principalProperties[$propName];
-            }
-
-        }
-
-        return $newProperties;
-
-    }
-
-    /**
-     * Updates this principals properties.
-     * 
-     * @param array $mutations
-     * @see Sabre\DAV\IProperties::updateProperties
-     * @return bool|array
-     */
-    public function updateProperties($mutations) {
-
-        return $this->principalBackend->updatePrincipal($this->principalProperties['uri'], $mutations);
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->principalProperties['uri'];
-
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->getPrincipalUrl(),
-                'protected' => true,
-            ),
-        );
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new DAV\Exception\MethodNotAllowed('Updating ACLs is not allowed here');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/PrincipalBackend/AbstractBackend.php b/core/src/core/classes/sabredav/lib/Sabre/DAVACL/PrincipalBackend/AbstractBackend.php
deleted file mode 100644
index 984f9ad82f..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/PrincipalBackend/AbstractBackend.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\PrincipalBackend;
-
-/**
- * Abstract Principal Backend
- *
- * Currently this class has no function. It's here for consistency and so we
- * have a non-bc-breaking way to add a default generic implementation to
- * functions we may add in the future.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-abstract class AbstractBackend implements BackendInterface {
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/PrincipalBackend/BackendInterface.php b/core/src/core/classes/sabredav/lib/Sabre/DAVACL/PrincipalBackend/BackendInterface.php
deleted file mode 100644
index d0416ac9cc..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/PrincipalBackend/BackendInterface.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\PrincipalBackend;
-
-/**
- * Implement this interface to create your own principal backends.
- *
- * Creating backends for principals is entirely optional. You can also
- * implement Sabre\DAVACL\IPrincipal directly. This interface is used solely by
- * Sabre\DAVACL\AbstractPrincipalCollection.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface BackendInterface {
-
-    /**
-     * Returns a list of principals based on a prefix.
-     *
-     * This prefix will often contain something like 'principals'. You are only
-     * expected to return principals that are in this base path.
-     *
-     * You are expected to return at least a 'uri' for every user, you can
-     * return any additional properties if you wish so. Common properties are:
-     *   {DAV:}displayname
-     *   {http://sabredav.org/ns}email-address - This is a custom SabreDAV
-     *     field that's actually injected in a number of other properties. If
-     *     you have an email address, use this property.
-     *
-     * @param string $prefixPath
-     * @return array
-     */
-    function getPrincipalsByPrefix($prefixPath);
-
-    /**
-     * Returns a specific principal, specified by it's path.
-     * The returned structure should be the exact same as from
-     * getPrincipalsByPrefix.
-     *
-     * @param string $path
-     * @return array
-     */
-    function getPrincipalByPath($path);
-
-    /**
-     * Updates one ore more webdav properties on a principal.
-     *
-     * The list of mutations is supplied as an array. Each key in the array is
-     * a propertyname, such as {DAV:}displayname.
-     *
-     * Each value is the actual value to be updated. If a value is null, it
-     * must be deleted.
-     *
-     * This method should be atomic. It must either completely succeed, or
-     * completely fail. Success and failure can simply be returned as 'true' or
-     * 'false'.
-     *
-     * It is also possible to return detailed failure information. In that case
-     * an array such as this should be returned:
-     *
-     * array(
-     *   200 => array(
-     *      '{DAV:}prop1' => null,
-     *   ),
-     *   201 => array(
-     *      '{DAV:}prop2' => null,
-     *   ),
-     *   403 => array(
-     *      '{DAV:}prop3' => null,
-     *   ),
-     *   424 => array(
-     *      '{DAV:}prop4' => null,
-     *   ),
-     * );
-     *
-     * In this previous example prop1 was successfully updated or deleted, and
-     * prop2 was succesfully created.
-     *
-     * prop3 failed to update due to '403 Forbidden' and because of this prop4
-     * also could not be updated with '424 Failed dependency'.
-     *
-     * This last example was actually incorrect. While 200 and 201 could appear
-     * in 1 response, if there's any error (403) the other properties should
-     * always fail with 423 (failed dependency).
-     *
-     * But anyway, if you don't want to scratch your head over this, just
-     * return true or false.
-     *
-     * @param string $path
-     * @param array $mutations
-     * @return array|bool
-     */
-    function updatePrincipal($path, $mutations);
-
-    /**
-     * This method is used to search for principals matching a set of
-     * properties.
-     *
-     * This search is specifically used by RFC3744's principal-property-search
-     * REPORT. You should at least allow searching on
-     * http://sabredav.org/ns}email-address.
-     *
-     * The actual search should be a unicode-non-case-sensitive search. The
-     * keys in searchProperties are the WebDAV property names, while the values
-     * are the property values to search on.
-     *
-     * If multiple properties are being searched on, the search should be
-     * AND'ed.
-     *
-     * This method should simply return an array with full principal uri's.
-     *
-     * If somebody attempted to search on a property the backend does not
-     * support, you should simply return 0 results.
-     *
-     * You can also just return 0 results if you choose to not support
-     * searching at all, but keep in mind that this may stop certain features
-     * from working.
-     *
-     * @param string $prefixPath
-     * @param array $searchProperties
-     * @return array
-     */
-    function searchPrincipals($prefixPath, array $searchProperties);
-
-    /**
-     * Returns the list of members for a group-principal
-     *
-     * @param string $principal
-     * @return array
-     */
-    function getGroupMemberSet($principal);
-
-    /**
-     * Returns the list of groups a principal is a member of
-     *
-     * @param string $principal
-     * @return array
-     */
-    function getGroupMembership($principal);
-
-    /**
-     * Updates the list of group members for a group principal.
-     *
-     * The principals should be passed as a list of uri's.
-     *
-     * @param string $principal
-     * @param array $members
-     * @return void
-     */
-    function setGroupMemberSet($principal, array $members);
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/PrincipalBackend/PDO.php b/core/src/core/classes/sabredav/lib/Sabre/DAVACL/PrincipalBackend/PDO.php
deleted file mode 100644
index 0921768c37..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/PrincipalBackend/PDO.php
+++ /dev/null
@@ -1,428 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\PrincipalBackend;
-
-use Sabre\DAV;
-use Sabre\DAVACL;
-
-/**
- * PDO principal backend
- *
- *
- * This backend assumes all principals are in a single collection. The default collection
- * is 'principals/', but this can be overriden.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class PDO extends AbstractBackend {
-
-    /**
-     * pdo
-     *
-     * @var PDO
-     */
-    protected $pdo;
-
-    /**
-     * PDO table name for 'principals'
-     *
-     * @var string
-     */
-    protected $tableName;
-
-    /**
-     * PDO table name for 'group members'
-     *
-     * @var string
-     */
-    protected $groupMembersTableName;
-
-    /**
-     * A list of additional fields to support
-     *
-     * @var array
-     */
-    protected $fieldMap = array(
-
-        /**
-         * This property can be used to display the users' real name.
-         */
-        '{DAV:}displayname' => array(
-            'dbField' => 'displayname',
-        ),
-
-        /**
-         * This property is actually used by the CardDAV plugin, where it gets
-         * mapped to {http://calendarserver.orgi/ns/}me-card.
-         *
-         * The reason we don't straight-up use that property, is because
-         * me-card is defined as a property on the users' addressbook
-         * collection.
-         */
-        '{http://sabredav.org/ns}vcard-url' => array(
-            'dbField' => 'vcardurl',
-        ),
-        /**
-         * This is the users' primary email-address.
-         */
-        '{http://sabredav.org/ns}email-address' => array(
-            'dbField' => 'email',
-        ),
-    );
-
-    /**
-     * Sets up the backend.
-     *
-     * @param PDO $pdo
-     * @param string $tableName
-     * @param string $groupMembersTableName
-     */
-    public function __construct(\PDO $pdo, $tableName = 'principals', $groupMembersTableName = 'groupmembers') {
-
-        $this->pdo = $pdo;
-        $this->tableName = $tableName;
-        $this->groupMembersTableName = $groupMembersTableName;
-
-    }
-
-
-    /**
-     * Returns a list of principals based on a prefix.
-     *
-     * This prefix will often contain something like 'principals'. You are only
-     * expected to return principals that are in this base path.
-     *
-     * You are expected to return at least a 'uri' for every user, you can
-     * return any additional properties if you wish so. Common properties are:
-     *   {DAV:}displayname
-     *   {http://sabredav.org/ns}email-address - This is a custom SabreDAV
-     *     field that's actualy injected in a number of other properties. If
-     *     you have an email address, use this property.
-     *
-     * @param string $prefixPath
-     * @return array
-     */
-    public function getPrincipalsByPrefix($prefixPath) {
-
-        $fields = array(
-            'uri',
-        );
-
-        foreach($this->fieldMap as $key=>$value) {
-            $fields[] = $value['dbField'];
-        }
-        $result = $this->pdo->query('SELECT '.implode(',', $fields).'  FROM '. $this->tableName);
-
-        $principals = array();
-
-        while($row = $result->fetch(\PDO::FETCH_ASSOC)) {
-
-            // Checking if the principal is in the prefix
-            list($rowPrefix) = DAV\URLUtil::splitPath($row['uri']);
-            if ($rowPrefix !== $prefixPath) continue;
-
-            $principal = array(
-                'uri' => $row['uri'],
-            );
-            foreach($this->fieldMap as $key=>$value) {
-                if ($row[$value['dbField']]) {
-                    $principal[$key] = $row[$value['dbField']];
-                }
-            }
-            $principals[] = $principal;
-
-        }
-
-        return $principals;
-
-    }
-
-    /**
-     * Returns a specific principal, specified by it's path.
-     * The returned structure should be the exact same as from
-     * getPrincipalsByPrefix.
-     *
-     * @param string $path
-     * @return array
-     */
-    public function getPrincipalByPath($path) {
-
-        $fields = array(
-            'id',
-            'uri',
-        );
-
-        foreach($this->fieldMap as $key=>$value) {
-            $fields[] = $value['dbField'];
-        }
-        $stmt = $this->pdo->prepare('SELECT '.implode(',', $fields).'  FROM '. $this->tableName . ' WHERE uri = ?');
-        $stmt->execute(array($path));
-
-        $row = $stmt->fetch(\PDO::FETCH_ASSOC);
-        if (!$row) return;
-
-        $principal = array(
-            'id'  => $row['id'],
-            'uri' => $row['uri'],
-        );
-        foreach($this->fieldMap as $key=>$value) {
-            if ($row[$value['dbField']]) {
-                $principal[$key] = $row[$value['dbField']];
-            }
-        }
-        return $principal;
-
-    }
-
-    /**
-     * Updates one ore more webdav properties on a principal.
-     *
-     * The list of mutations is supplied as an array. Each key in the array is
-     * a propertyname, such as {DAV:}displayname.
-     *
-     * Each value is the actual value to be updated. If a value is null, it
-     * must be deleted.
-     *
-     * This method should be atomic. It must either completely succeed, or
-     * completely fail. Success and failure can simply be returned as 'true' or
-     * 'false'.
-     *
-     * It is also possible to return detailed failure information. In that case
-     * an array such as this should be returned:
-     *
-     * array(
-     *   200 => array(
-     *      '{DAV:}prop1' => null,
-     *   ),
-     *   201 => array(
-     *      '{DAV:}prop2' => null,
-     *   ),
-     *   403 => array(
-     *      '{DAV:}prop3' => null,
-     *   ),
-     *   424 => array(
-     *      '{DAV:}prop4' => null,
-     *   ),
-     * );
-     *
-     * In this previous example prop1 was successfully updated or deleted, and
-     * prop2 was succesfully created.
-     *
-     * prop3 failed to update due to '403 Forbidden' and because of this prop4
-     * also could not be updated with '424 Failed dependency'.
-     *
-     * This last example was actually incorrect. While 200 and 201 could appear
-     * in 1 response, if there's any error (403) the other properties should
-     * always fail with 423 (failed dependency).
-     *
-     * But anyway, if you don't want to scratch your head over this, just
-     * return true or false.
-     *
-     * @param string $path
-     * @param array $mutations
-     * @return array|bool
-     */
-    public function updatePrincipal($path, $mutations) {
-
-        $updateAble = array();
-        foreach($mutations as $key=>$value) {
-
-            // We are not aware of this field, we must fail.
-            if (!isset($this->fieldMap[$key])) {
-
-                $response = array(
-                    403 => array(
-                        $key => null,
-                    ),
-                    424 => array(),
-                );
-
-                // Adding the rest to the response as a 424
-                foreach($mutations as $subKey=>$subValue) {
-                    if ($subKey !== $key) {
-                        $response[424][$subKey] = null;
-                    }
-                }
-                return $response;
-            }
-
-            $updateAble[$this->fieldMap[$key]['dbField']] = $value;
-
-        }
-
-        // No fields to update
-        $query = "UPDATE " . $this->tableName . " SET ";
-
-        $first = true;
-        foreach($updateAble as $key => $value) {
-            if (!$first) {
-                $query.= ', ';
-            }
-            $first = false;
-            $query.= "$key = :$key ";
-        }
-        $query.='WHERE uri = :uri';
-        $stmt = $this->pdo->prepare($query);
-        $updateAble['uri'] =  $path;
-        $stmt->execute($updateAble);
-
-        return true;
-
-    }
-
-    /**
-     * This method is used to search for principals matching a set of
-     * properties.
-     *
-     * This search is specifically used by RFC3744's principal-property-search
-     * REPORT. You should at least allow searching on
-     * http://sabredav.org/ns}email-address.
-     *
-     * The actual search should be a unicode-non-case-sensitive search. The
-     * keys in searchProperties are the WebDAV property names, while the values
-     * are the property values to search on.
-     *
-     * If multiple properties are being searched on, the search should be
-     * AND'ed.
-     *
-     * This method should simply return an array with full principal uri's.
-     *
-     * If somebody attempted to search on a property the backend does not
-     * support, you should simply return 0 results.
-     *
-     * You can also just return 0 results if you choose to not support
-     * searching at all, but keep in mind that this may stop certain features
-     * from working.
-     *
-     * @param string $prefixPath
-     * @param array $searchProperties
-     * @return array
-     */
-    public function searchPrincipals($prefixPath, array $searchProperties) {
-
-        $query = 'SELECT uri FROM ' . $this->tableName . ' WHERE 1=1 ';
-        $values = array();
-        foreach($searchProperties as $property => $value) {
-
-            switch($property) {
-
-                case '{DAV:}displayname' :
-                    $query.=' AND displayname LIKE ?';
-                    $values[] = '%' . $value . '%';
-                    break;
-                case '{http://sabredav.org/ns}email-address' :
-                    $query.=' AND email LIKE ?';
-                    $values[] = '%' . $value . '%';
-                    break;
-                default :
-                    // Unsupported property
-                    return array();
-
-            }
-
-        }
-        $stmt = $this->pdo->prepare($query);
-        $stmt->execute($values);
-
-        $principals = array();
-        while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-
-            // Checking if the principal is in the prefix
-            list($rowPrefix) = DAV\URLUtil::splitPath($row['uri']);
-            if ($rowPrefix !== $prefixPath) continue;
-
-            $principals[] = $row['uri'];
-
-        }
-
-        return $principals;
-
-    }
-
-    /**
-     * Returns the list of members for a group-principal
-     *
-     * @param string $principal
-     * @return array
-     */
-    public function getGroupMemberSet($principal) {
-
-        $principal = $this->getPrincipalByPath($principal);
-        if (!$principal) throw new DAV\Exception('Principal not found');
-
-        $stmt = $this->pdo->prepare('SELECT principals.uri as uri FROM '.$this->groupMembersTableName.' AS groupmembers LEFT JOIN '.$this->tableName.' AS principals ON groupmembers.member_id = principals.id WHERE groupmembers.principal_id = ?');
-        $stmt->execute(array($principal['id']));
-
-        $result = array();
-        while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-            $result[] = $row['uri'];
-        }
-        return $result;
-
-    }
-
-    /**
-     * Returns the list of groups a principal is a member of
-     *
-     * @param string $principal
-     * @return array
-     */
-    public function getGroupMembership($principal) {
-
-        $principal = $this->getPrincipalByPath($principal);
-        if (!$principal) throw new DAV\Exception('Principal not found');
-
-        $stmt = $this->pdo->prepare('SELECT principals.uri as uri FROM '.$this->groupMembersTableName.' AS groupmembers LEFT JOIN '.$this->tableName.' AS principals ON groupmembers.principal_id = principals.id WHERE groupmembers.member_id = ?');
-        $stmt->execute(array($principal['id']));
-
-        $result = array();
-        while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-            $result[] = $row['uri'];
-        }
-        return $result;
-
-    }
-
-    /**
-     * Updates the list of group members for a group principal.
-     *
-     * The principals should be passed as a list of uri's.
-     *
-     * @param string $principal
-     * @param array $members
-     * @return void
-     */
-    public function setGroupMemberSet($principal, array $members) {
-
-        // Grabbing the list of principal id's.
-        $stmt = $this->pdo->prepare('SELECT id, uri FROM '.$this->tableName.' WHERE uri IN (? ' . str_repeat(', ? ', count($members)) . ');');
-        $stmt->execute(array_merge(array($principal), $members));
-
-        $memberIds = array();
-        $principalId = null;
-
-        while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-            if ($row['uri'] == $principal) {
-                $principalId = $row['id'];
-            } else {
-                $memberIds[] = $row['id'];
-            }
-        }
-        if (!$principalId) throw new DAV\Exception('Principal not found');
-
-        // Wiping out old members
-        $stmt = $this->pdo->prepare('DELETE FROM '.$this->groupMembersTableName.' WHERE principal_id = ?;');
-        $stmt->execute(array($principalId));
-
-        foreach($memberIds as $memberId) {
-
-            $stmt = $this->pdo->prepare('INSERT INTO '.$this->groupMembersTableName.' (principal_id, member_id) VALUES (?, ?);');
-            $stmt->execute(array($principalId, $memberId));
-
-        }
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/PrincipalCollection.php b/core/src/core/classes/sabredav/lib/Sabre/DAVACL/PrincipalCollection.php
deleted file mode 100644
index 3aadf399d3..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/PrincipalCollection.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL;
-
-/**
- * Principals Collection
- *
- * This collection represents a list of users.
- * The users are instances of Sabre\DAVACL\Principal
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class PrincipalCollection extends AbstractPrincipalCollection {
-
-    /**
-     * This method returns a node for a principal.
-     *
-     * The passed array contains principal information, and is guaranteed to
-     * at least contain a uri item. Other properties may or may not be
-     * supplied by the authentication backend.
-     *
-     * @param array $principal
-     * @return \Sabre\DAV\INode
-     */
-    public function getChildForPrincipal(array $principal) {
-
-        return new Principal($this->principalBackend, $principal);
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Property/Acl.php b/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Property/Acl.php
deleted file mode 100644
index e6a70ce911..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Property/Acl.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\Property;
-
-use Sabre\DAV;
-
-/**
- * This class represents the {DAV:}acl property
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Acl extends DAV\Property {
-
-    /**
-     * List of privileges
-     *
-     * @var array
-     */
-    private $privileges;
-
-    /**
-     * Whether or not the server base url is required to be prefixed when
-     * serializing the property.
-     *
-     * @var boolean
-     */
-    private $prefixBaseUrl;
-
-    /**
-     * Constructor
-     *
-     * This object requires a structure similar to the return value from
-     * Sabre\DAVACL\Plugin::getACL().
-     *
-     * Each privilege is a an array with at least a 'privilege' property, and a
-     * 'principal' property. A privilege may have a 'protected' property as
-     * well.
-     *
-     * The prefixBaseUrl should be set to false, if the supplied principal urls
-     * are already full urls. If this is kept to true, the servers base url
-     * will automatically be prefixed.
-     *
-     * @param bool $prefixBaseUrl
-     * @param array $privileges
-     */
-    public function __construct(array $privileges, $prefixBaseUrl = true) {
-
-        $this->privileges = $privileges;
-        $this->prefixBaseUrl = $prefixBaseUrl;
-
-    }
-
-    /**
-     * Returns the list of privileges for this property
-     *
-     * @return array
-     */
-    public function getPrivileges() {
-
-        return $this->privileges;
-
-    }
-
-    /**
-     * Serializes the property into a DOMElement
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $node
-     * @return void
-     */
-    public function serialize(DAV\Server $server,\DOMElement $node) {
-
-        $doc = $node->ownerDocument;
-        foreach($this->privileges as $ace) {
-
-            $this->serializeAce($doc, $node, $ace, $server);
-
-        }
-
-    }
-
-    /**
-     * Unserializes the {DAV:}acl xml element.
-     *
-     * @param \DOMElement $dom
-     * @return Acl
-     */
-    static public function unserialize(\DOMElement $dom) {
-
-        $privileges = array();
-        $xaces = $dom->getElementsByTagNameNS('urn:DAV','ace');
-        for($ii=0; $ii < $xaces->length; $ii++) {
-
-            $xace = $xaces->item($ii);
-            $principal = $xace->getElementsByTagNameNS('urn:DAV','principal');
-            if ($principal->length !== 1) {
-                throw new DAV\Exception\BadRequest('Each {DAV:}ace element must have one {DAV:}principal element');
-            }
-            $principal = Principal::unserialize($principal->item(0));
-
-            switch($principal->getType()) {
-                case Principal::HREF :
-                    $principal = $principal->getHref();
-                    break;
-                case Principal::AUTHENTICATED :
-                    $principal = '{DAV:}authenticated';
-                    break;
-                case Principal::UNAUTHENTICATED :
-                    $principal = '{DAV:}unauthenticated';
-                    break;
-                case Principal::ALL :
-                    $principal = '{DAV:}all';
-                    break;
-
-            }
-
-            $protected = false;
-
-            if ($xace->getElementsByTagNameNS('urn:DAV','protected')->length > 0) {
-                $protected = true;
-            }
-
-            $grants = $xace->getElementsByTagNameNS('urn:DAV','grant');
-            if ($grants->length < 1) {
-                throw new DAV\Exception\NotImplemented('Every {DAV:}ace element must have a {DAV:}grant element. {DAV:}deny is not yet supported');
-            }
-            $grant = $grants->item(0);
-
-            $xprivs = $grant->getElementsByTagNameNS('urn:DAV','privilege');
-            for($jj=0; $jj<$xprivs->length; $jj++) {
-
-                $xpriv = $xprivs->item($jj);
-
-                $privilegeName = null;
-
-                for ($kk=0;$kk<$xpriv->childNodes->length;$kk++) {
-
-                    $childNode = $xpriv->childNodes->item($kk);
-                    if ($t = DAV\XMLUtil::toClarkNotation($childNode)) {
-                        $privilegeName = $t;
-                        break;
-                    }
-                }
-                if (is_null($privilegeName)) {
-                    throw new DAV\Exception\BadRequest('{DAV:}privilege elements must have a privilege element contained within them.');
-                }
-
-                $privileges[] = array(
-                    'principal' => $principal,
-                    'protected' => $protected,
-                    'privilege' => $privilegeName,
-                );
-
-            }
-
-        }
-
-        return new self($privileges);
-
-    }
-
-    /**
-     * Serializes a single access control entry.
-     *
-     * @param \DOMDocument $doc
-     * @param \DOMElement $node
-     * @param array $ace
-     * @param DAV\Server $server
-     * @return void
-     */
-    private function serializeAce($doc,$node,$ace, DAV\Server $server) {
-
-        $xace  = $doc->createElementNS('DAV:','d:ace');
-        $node->appendChild($xace);
-
-        $principal = $doc->createElementNS('DAV:','d:principal');
-        $xace->appendChild($principal);
-        switch($ace['principal']) {
-            case '{DAV:}authenticated' :
-                $principal->appendChild($doc->createElementNS('DAV:','d:authenticated'));
-                break;
-            case '{DAV:}unauthenticated' :
-                $principal->appendChild($doc->createElementNS('DAV:','d:unauthenticated'));
-                break;
-            case '{DAV:}all' :
-                $principal->appendChild($doc->createElementNS('DAV:','d:all'));
-                break;
-            default:
-                $principal->appendChild($doc->createElementNS('DAV:','d:href',($this->prefixBaseUrl?$server->getBaseUri():'') . $ace['principal'] . '/'));
-        }
-
-        $grant = $doc->createElementNS('DAV:','d:grant');
-        $xace->appendChild($grant);
-
-        $privParts = null;
-
-        preg_match('/^{([^}]*)}(.*)$/',$ace['privilege'],$privParts);
-
-        $xprivilege = $doc->createElementNS('DAV:','d:privilege');
-        $grant->appendChild($xprivilege);
-
-        $xprivilege->appendChild($doc->createElementNS($privParts[1],'d:'.$privParts[2]));
-
-        if (isset($ace['protected']) && $ace['protected'])
-            $xace->appendChild($doc->createElement('d:protected'));
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Property/AclRestrictions.php b/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Property/AclRestrictions.php
deleted file mode 100644
index aa6fd17d6b..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Property/AclRestrictions.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\Property;
-
-use Sabre\DAV;
-
-/**
- * AclRestrictions property
- *
- * This property represents {DAV:}acl-restrictions, as defined in RFC3744.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class AclRestrictions extends DAV\Property {
-
-    /**
-     * Serializes the property into a DOMElement
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $elem
-     * @return void
-     */
-    public function serialize(DAV\Server $server,\DOMElement $elem) {
-
-        $doc = $elem->ownerDocument;
-
-        $elem->appendChild($doc->createElementNS('DAV:','d:grant-only'));
-        $elem->appendChild($doc->createElementNS('DAV:','d:no-invert'));
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php b/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
deleted file mode 100644
index e0501dbd60..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\Property;
-
-use Sabre\DAV;
-
-/**
- * CurrentUserPrivilegeSet
- *
- * This class represents the current-user-privilege-set property. When
- * requested, it contain all the privileges a user has on a specific node.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class CurrentUserPrivilegeSet extends DAV\Property {
-
-    /**
-     * List of privileges
-     *
-     * @var array
-     */
-    private $privileges;
-
-    /**
-     * Creates the object
-     *
-     * Pass the privileges in clark-notation
-     *
-     * @param array $privileges
-     */
-    public function __construct(array $privileges) {
-
-        $this->privileges = $privileges;
-
-    }
-
-    /**
-     * Serializes the property in the DOM
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $node
-     * @return void
-     */
-    public function serialize(DAV\Server $server,\DOMElement $node) {
-
-        $doc = $node->ownerDocument;
-        foreach($this->privileges as $privName) {
-
-            $this->serializePriv($doc,$node,$privName);
-
-        }
-
-    }
-
-    /**
-     * Returns true or false, whether the specified principal appears in the
-     * list.
-     *
-     * @return bool
-     */
-    public function has($privilegeName) {
-
-        return in_array($privilegeName, $this->privileges);
-
-    }
-
-    /**
-     * Serializes one privilege
-     *
-     * @param \DOMDocument $doc
-     * @param \DOMElement $node
-     * @param string $privName
-     * @return void
-     */
-    protected function serializePriv($doc,$node,$privName) {
-
-        $xp  = $doc->createElementNS('DAV:','d:privilege');
-        $node->appendChild($xp);
-
-        $privParts = null;
-        preg_match('/^{([^}]*)}(.*)$/',$privName,$privParts);
-
-        $xp->appendChild($doc->createElementNS($privParts[1],'d:'.$privParts[2]));
-
-    }
-
-    /**
-     * Unserializes the {DAV:}current-user-privilege-set element.
-     *
-     * @param DOMElement $node
-     * @return CurrentUserPrivilegeSet
-     */
-    static public function unserialize(\DOMElement $node) {
-
-        $result = array();
-
-        $xprivs = $node->getElementsByTagNameNS('urn:DAV','privilege');
-
-        for($jj=0; $jj<$xprivs->length; $jj++) {
-
-            $xpriv = $xprivs->item($jj);
-
-            $privilegeName = null;
-
-            for ($kk=0;$kk<$xpriv->childNodes->length;$kk++) {
-
-                $childNode = $xpriv->childNodes->item($kk);
-                if ($t = DAV\XMLUtil::toClarkNotation($childNode)) {
-                    $privilegeName = $t;
-                    break;
-                }
-            }
-
-            $result[] = $privilegeName;
-
-        }
-
-        return new self($result);
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Property/Principal.php b/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Property/Principal.php
deleted file mode 100644
index 6c644b024a..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Property/Principal.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\Property;
-use Sabre\DAV;
-
-/**
- * Principal property
- *
- * The principal property represents a principal from RFC3744 (ACL).
- * The property can be used to specify a principal or pseudo principals.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Principal extends DAV\Property implements DAV\Property\IHref {
-
-    /**
-     * To specify a not-logged-in user, use the UNAUTHENTICATED principal
-     */
-    const UNAUTHENTICATED = 1;
-
-    /**
-     * To specify any principal that is logged in, use AUTHENTICATED
-     */
-    const AUTHENTICATED = 2;
-
-    /**
-     * Specific principals can be specified with the HREF
-     */
-    const HREF = 3;
-
-    /**
-     * Everybody, basically
-     */
-    const ALL = 4;
-
-    /**
-     * Principal-type
-     *
-     * Must be one of the UNAUTHENTICATED, AUTHENTICATED or HREF constants.
-     *
-     * @var int
-     */
-    private $type;
-
-    /**
-     * Url to principal
-     *
-     * This value is only used for the HREF principal type.
-     *
-     * @var string
-     */
-    private $href;
-
-    /**
-     * Creates the property.
-     *
-     * The 'type' argument must be one of the type constants defined in this class.
-     *
-     * 'href' is only required for the HREF type.
-     *
-     * @param int $type
-     * @param string|null $href
-     */
-    public function __construct($type, $href = null) {
-
-        $this->type = $type;
-
-        if ($type===self::HREF && is_null($href)) {
-            throw new DAV\Exception('The href argument must be specified for the HREF principal type.');
-        }
-        $this->href = $href;
-
-    }
-
-    /**
-     * Returns the principal type
-     *
-     * @return int
-     */
-    public function getType() {
-
-        return $this->type;
-
-    }
-
-    /**
-     * Returns the principal uri.
-     *
-     * @return string
-     */
-    public function getHref() {
-
-        return $this->href;
-
-    }
-
-    /**
-     * Serializes the property into a DOMElement.
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $node
-     * @return void
-     */
-    public function serialize(DAV\Server $server, \DOMElement $node) {
-
-        $prefix = $server->xmlNamespaces['DAV:'];
-        switch($this->type) {
-
-            case self::UNAUTHENTICATED :
-                $node->appendChild(
-                    $node->ownerDocument->createElement($prefix . ':unauthenticated')
-                );
-                break;
-            case self::AUTHENTICATED :
-                $node->appendChild(
-                    $node->ownerDocument->createElement($prefix . ':authenticated')
-                );
-                break;
-            case self::HREF :
-                $href = $node->ownerDocument->createElement($prefix . ':href');
-                $href->nodeValue = $server->getBaseUri() . DAV\URLUtil::encodePath($this->href);
-                $node->appendChild($href);
-                break;
-
-        }
-
-    }
-
-    /**
-     * Deserializes a DOM element into a property object.
-     *
-     * @param \DOMElement $dom
-     * @return Principal
-     */
-    static public function unserialize(\DOMElement $dom) {
-
-        $parent = $dom->firstChild;
-        while(!DAV\XMLUtil::toClarkNotation($parent)) {
-            $parent = $parent->nextSibling;
-        }
-
-        switch(DAV\XMLUtil::toClarkNotation($parent)) {
-
-            case '{DAV:}unauthenticated' :
-                return new self(self::UNAUTHENTICATED);
-            case '{DAV:}authenticated' :
-                return new self(self::AUTHENTICATED);
-            case '{DAV:}href':
-                return new self(self::HREF, $parent->textContent);
-            case '{DAV:}all':
-                return new self(self::ALL);
-            default :
-                throw new DAV\Exception\BadRequest('Unexpected element (' . DAV\XMLUtil::toClarkNotation($parent) . '). Could not deserialize');
-
-        }
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Property/SupportedPrivilegeSet.php b/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
deleted file mode 100644
index 5f152d9e5e..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\Property;
-
-use Sabre\DAV;
-
-/**
- * SupportedPrivilegeSet property
- *
- * This property encodes the {DAV:}supported-privilege-set property, as defined
- * in rfc3744. Please consult the rfc for details about it's structure.
- *
- * This class expects a structure like the one given from
- * Sabre\DAVACL\Plugin::getSupportedPrivilegeSet as the argument in its
- * constructor.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class SupportedPrivilegeSet extends DAV\Property {
-
-    /**
-     * privileges
-     *
-     * @var array
-     */
-    private $privileges;
-
-    /**
-     * Constructor
-     *
-     * @param array $privileges
-     */
-    public function __construct(array $privileges) {
-
-        $this->privileges = $privileges;
-
-    }
-
-    /**
-     * Serializes the property into a domdocument.
-     *
-     * @param DAV\Server $server
-     * @param \DOMElement $node
-     * @return void
-     */
-    public function serialize(DAV\Server $server,\DOMElement $node) {
-
-        $doc = $node->ownerDocument;
-        $this->serializePriv($doc, $node, $this->privileges);
-
-    }
-
-    /**
-     * Serializes a property
-     *
-     * This is a recursive function.
-     *
-     * @param \DOMDocument $doc
-     * @param \DOMElement $node
-     * @param array $privilege
-     * @return void
-     */
-    private function serializePriv($doc,$node,$privilege) {
-
-        $xsp = $doc->createElementNS('DAV:','d:supported-privilege');
-        $node->appendChild($xsp);
-
-        $xp  = $doc->createElementNS('DAV:','d:privilege');
-        $xsp->appendChild($xp);
-
-        $privParts = null;
-        preg_match('/^{([^}]*)}(.*)$/',$privilege['privilege'],$privParts);
-
-        $xp->appendChild($doc->createElementNS($privParts[1],'d:'.$privParts[2]));
-
-        if (isset($privilege['abstract']) && $privilege['abstract']) {
-            $xsp->appendChild($doc->createElementNS('DAV:','d:abstract'));
-        }
-
-        if (isset($privilege['description'])) {
-            $xsp->appendChild($doc->createElementNS('DAV:','d:description',$privilege['description']));
-        }
-
-        if (isset($privilege['aggregates'])) {
-            foreach($privilege['aggregates'] as $subPrivilege) {
-                $this->serializePriv($doc,$xsp,$subPrivilege);
-            }
-        }
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Version.php b/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Version.php
deleted file mode 100644
index 344e22d7bd..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/DAVACL/Version.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL;
-
-/**
- * This class contains the SabreDAV version constants.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Version {
-
-    /**
-     * Full version number
-     */
-    const VERSION = '1.8.7';
-
-    /**
-     * Stability : alpha, beta, stable
-     */
-    const STABILITY = 'stable';
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/HTTP/AWSAuth.php b/core/src/core/classes/sabredav/lib/Sabre/HTTP/AWSAuth.php
deleted file mode 100644
index 603470fb40..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/HTTP/AWSAuth.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-/**
- * HTTP AWS Authentication handler
- *
- * Use this class to leverage amazon's AWS authentication header
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class AWSAuth extends AbstractAuth {
-
-    /**
-     * The signature supplied by the HTTP client
-     *
-     * @var string
-     */
-    private $signature = null;
-
-    /**
-     * The accesskey supplied by the HTTP client
-     *
-     * @var string
-     */
-    private $accessKey = null;
-
-    /**
-     * An error code, if any
-     *
-     * This value will be filled with one of the ERR_* constants
-     *
-     * @var int
-     */
-    public $errorCode = 0;
-
-    const ERR_NOAWSHEADER = 1;
-    const ERR_MD5CHECKSUMWRONG = 2;
-    const ERR_INVALIDDATEFORMAT = 3;
-    const ERR_REQUESTTIMESKEWED = 4;
-    const ERR_INVALIDSIGNATURE = 5;
-
-    /**
-     * Gathers all information from the headers
-     *
-     * This method needs to be called prior to anything else.
-     *
-     * @return bool
-     */
-    public function init() {
-
-        $authHeader = $this->httpRequest->getHeader('Authorization');
-        $authHeader = explode(' ',$authHeader);
-
-        if ($authHeader[0]!='AWS' || !isset($authHeader[1])) {
-            $this->errorCode = self::ERR_NOAWSHEADER;
-             return false;
-        }
-
-        list($this->accessKey,$this->signature) = explode(':',$authHeader[1]);
-
-        return true;
-
-    }
-
-    /**
-     * Returns the username for the request
-     *
-     * @return string
-     */
-    public function getAccessKey() {
-
-        return $this->accessKey;
-
-    }
-
-    /**
-     * Validates the signature based on the secretKey
-     *
-     * @param string $secretKey
-     * @return bool
-     */
-    public function validate($secretKey) {
-
-        $contentMD5 = $this->httpRequest->getHeader('Content-MD5');
-
-        if ($contentMD5) {
-            // We need to validate the integrity of the request
-            $body = $this->httpRequest->getBody(true);
-            $this->httpRequest->setBody($body,true);
-
-            if ($contentMD5!=base64_encode(md5($body,true))) {
-                // content-md5 header did not match md5 signature of body
-                $this->errorCode = self::ERR_MD5CHECKSUMWRONG;
-                return false;
-            }
-
-        }
-
-        if (!$requestDate = $this->httpRequest->getHeader('x-amz-date'))
-            $requestDate = $this->httpRequest->getHeader('Date');
-
-        if (!$this->validateRFC2616Date($requestDate))
-            return false;
-
-        $amzHeaders = $this->getAmzHeaders();
-
-        $signature = base64_encode(
-            $this->hmacsha1($secretKey,
-                $this->httpRequest->getMethod() . "\n" .
-                $contentMD5 . "\n" .
-                $this->httpRequest->getHeader('Content-type') . "\n" .
-                $requestDate . "\n" .
-                $amzHeaders .
-                $this->httpRequest->getURI()
-            )
-        );
-
-        if ($this->signature != $signature) {
-
-            $this->errorCode = self::ERR_INVALIDSIGNATURE;
-            return false;
-
-        }
-
-        return true;
-
-    }
-
-
-    /**
-     * Returns an HTTP 401 header, forcing login
-     *
-     * This should be called when username and password are incorrect, or not supplied at all
-     *
-     * @return void
-     */
-    public function requireLogin() {
-
-        $this->httpResponse->setHeader('WWW-Authenticate','AWS');
-        $this->httpResponse->sendStatus(401);
-
-    }
-
-    /**
-     * Makes sure the supplied value is a valid RFC2616 date.
-     *
-     * If we would just use strtotime to get a valid timestamp, we have no way of checking if a
-     * user just supplied the word 'now' for the date header.
-     *
-     * This function also makes sure the Date header is within 15 minutes of the operating
-     * system date, to prevent replay attacks.
-     *
-     * @param string $dateHeader
-     * @return bool
-     */
-    protected function validateRFC2616Date($dateHeader) {
-
-        $date = Util::parseHTTPDate($dateHeader);
-
-        // Unknown format
-        if (!$date) {
-            $this->errorCode = self::ERR_INVALIDDATEFORMAT;
-            return false;
-        }
-
-        $min = new \DateTime('-15 minutes');
-        $max = new \DateTime('+15 minutes');
-
-        // We allow 15 minutes around the current date/time
-        if ($date > $max || $date < $min) {
-            $this->errorCode = self::ERR_REQUESTTIMESKEWED;
-            return false;
-        }
-
-        return $date;
-
-    }
-
-    /**
-     * Returns a list of AMZ headers
-     *
-     * @return string
-     */
-    protected function getAmzHeaders() {
-
-        $amzHeaders = array();
-        $headers = $this->httpRequest->getHeaders();
-        foreach($headers as $headerName => $headerValue) {
-            if (strpos(strtolower($headerName),'x-amz-')===0) {
-                $amzHeaders[strtolower($headerName)] = str_replace(array("\r\n"),array(' '),$headerValue) . "\n";
-            }
-        }
-        ksort($amzHeaders);
-
-        $headerStr = '';
-        foreach($amzHeaders as $h=>$v) {
-            $headerStr.=$h.':'.$v;
-        }
-
-        return $headerStr;
-
-    }
-
-    /**
-     * Generates an HMAC-SHA1 signature
-     *
-     * @param string $key
-     * @param string $message
-     * @return string
-     */
-    private function hmacsha1($key, $message) {
-
-        $blocksize=64;
-        if (strlen($key)>$blocksize)
-            $key=pack('H*', sha1($key));
-        $key=str_pad($key,$blocksize,chr(0x00));
-        $ipad=str_repeat(chr(0x36),$blocksize);
-        $opad=str_repeat(chr(0x5c),$blocksize);
-        $hmac = pack('H*',sha1(($key^$opad).pack('H*',sha1(($key^$ipad).$message))));
-        return $hmac;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/HTTP/AbstractAuth.php b/core/src/core/classes/sabredav/lib/Sabre/HTTP/AbstractAuth.php
deleted file mode 100644
index 1ddf412b7e..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/HTTP/AbstractAuth.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-/**
- * HTTP Authentication baseclass
- *
- * This class has the common functionality for BasicAuth and DigestAuth
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-abstract class AbstractAuth {
-
-    /**
-     * The realm will be displayed in the dialog boxes
-     *
-     * This identifier can be changed through setRealm()
-     *
-     * @var string
-     */
-    protected $realm = 'SabreDAV';
-
-    /**
-     * HTTP response helper
-     *
-     * @var Sabre\HTTP\Response
-     */
-    protected $httpResponse;
-
-
-    /**
-     * HTTP request helper
-     *
-     * @var Sabre\HTTP\Request
-     */
-    protected $httpRequest;
-
-    /**
-     * __construct
-     *
-     */
-    public function __construct() {
-
-        $this->httpResponse = new Response();
-        $this->httpRequest = new Request();
-
-    }
-
-    /**
-     * Sets an alternative HTTP response object
-     *
-     * @param Response $response
-     * @return void
-     */
-    public function setHTTPResponse(Response $response) {
-
-        $this->httpResponse = $response;
-
-    }
-
-    /**
-     * Sets an alternative HTTP request object
-     *
-     * @param Request $request
-     * @return void
-     */
-    public function setHTTPRequest(Request $request) {
-
-        $this->httpRequest = $request;
-
-    }
-
-
-    /**
-     * Sets the realm
-     *
-     * The realm is often displayed in authentication dialog boxes
-     * Commonly an application name displayed here
-     *
-     * @param string $realm
-     * @return void
-     */
-    public function setRealm($realm) {
-
-        $this->realm = $realm;
-
-    }
-
-    /**
-     * Returns the realm
-     *
-     * @return string
-     */
-    public function getRealm() {
-
-        return $this->realm;
-
-    }
-
-    /**
-     * Returns an HTTP 401 header, forcing login
-     *
-     * This should be called when username and password are incorrect, or not supplied at all
-     *
-     * @return void
-     */
-    abstract public function requireLogin();
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/HTTP/BasicAuth.php b/core/src/core/classes/sabredav/lib/Sabre/HTTP/BasicAuth.php
deleted file mode 100644
index 659964faa1..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/HTTP/BasicAuth.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-/**
- * HTTP Basic Authentication handler
- *
- * Use this class for easy http authentication setup
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class BasicAuth extends AbstractAuth {
-
-    /**
-     * Returns the supplied username and password.
-     *
-     * The returned array has two values:
-     *   * 0 - username
-     *   * 1 - password
-     *
-     * If nothing was supplied, 'false' will be returned
-     *
-     * @return mixed
-     */
-    public function getUserPass() {
-
-        // Apache and mod_php
-        if (($user = $this->httpRequest->getRawServerValue('PHP_AUTH_USER')) && ($pass = $this->httpRequest->getRawServerValue('PHP_AUTH_PW'))) {
-
-            return array($user,$pass);
-
-        }
-
-        // Most other webservers
-        $auth = $this->httpRequest->getHeader('Authorization');
-
-        // Apache could prefix environment variables with REDIRECT_ when urls
-        // are passed through mod_rewrite
-        if (!$auth) {
-            $auth = $this->httpRequest->getRawServerValue('REDIRECT_HTTP_AUTHORIZATION');
-        }
-
-        if (!$auth) return false;
-
-        if (strpos(strtolower($auth),'basic')!==0) return false;
-
-        return explode(':', base64_decode(substr($auth, 6)),2);
-
-    }
-
-    /**
-     * Returns an HTTP 401 header, forcing login
-     *
-     * This should be called when username and password are incorrect, or not supplied at all
-     *
-     * @return void
-     */
-    public function requireLogin() {
-
-        $this->httpResponse->setHeader('WWW-Authenticate','Basic realm="' . $this->realm . '"');
-        $this->httpResponse->sendStatus(401);
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/HTTP/DigestAuth.php b/core/src/core/classes/sabredav/lib/Sabre/HTTP/DigestAuth.php
deleted file mode 100644
index aae6d84d61..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/HTTP/DigestAuth.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-/**
- * HTTP Digest Authentication handler
- *
- * Use this class for easy http digest authentication.
- * Instructions:
- *
- *  1. Create the object
- *  2. Call the setRealm() method with the realm you plan to use
- *  3. Call the init method function.
- *  4. Call the getUserName() function. This function may return false if no
- *     authentication information was supplied. Based on the username you
- *     should check your internal database for either the associated password,
- *     or the so-called A1 hash of the digest.
- *  5. Call either validatePassword() or validateA1(). This will return true
- *     or false.
- *  6. To make sure an authentication prompt is displayed, call the
- *     requireLogin() method.
- *
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class DigestAuth extends AbstractAuth {
-
-    /**
-     * These constants are used in setQOP();
-     */
-    const QOP_AUTH = 1;
-    const QOP_AUTHINT = 2;
-
-    protected $nonce;
-    protected $opaque;
-    protected $digestParts;
-    protected $A1;
-    protected $qop = self::QOP_AUTH;
-
-    /**
-     * Initializes the object
-     */
-    public function __construct() {
-
-        $this->nonce = uniqid();
-        $this->opaque = md5($this->realm);
-        parent::__construct();
-
-    }
-
-    /**
-     * Gathers all information from the headers
-     *
-     * This method needs to be called prior to anything else.
-     *
-     * @return void
-     */
-    public function init() {
-
-        $digest = $this->getDigest();
-        $this->digestParts = $this->parseDigest($digest);
-
-    }
-
-    /**
-     * Sets the quality of protection value.
-     *
-     * Possible values are:
-     *   Sabre\HTTP\DigestAuth::QOP_AUTH
-     *   Sabre\HTTP\DigestAuth::QOP_AUTHINT
-     *
-     * Multiple values can be specified using logical OR.
-     *
-     * QOP_AUTHINT ensures integrity of the request body, but this is not
-     * supported by most HTTP clients. QOP_AUTHINT also requires the entire
-     * request body to be md5'ed, which can put strains on CPU and memory.
-     *
-     * @param int $qop
-     * @return void
-     */
-    public function setQOP($qop) {
-
-        $this->qop = $qop;
-
-    }
-
-    /**
-     * Validates the user.
-     *
-     * The A1 parameter should be md5($username . ':' . $realm . ':' . $password);
-     *
-     * @param string $A1
-     * @return bool
-     */
-    public function validateA1($A1) {
-
-        $this->A1 = $A1;
-        return $this->validate();
-
-    }
-
-    /**
-     * Validates authentication through a password. The actual password must be provided here.
-     * It is strongly recommended not store the password in plain-text and use validateA1 instead.
-     *
-     * @param string $password
-     * @return bool
-     */
-    public function validatePassword($password) {
-
-        $this->A1 = md5($this->digestParts['username'] . ':' . $this->realm . ':' . $password);
-        return $this->validate();
-
-    }
-
-    /**
-     * Returns the username for the request
-     *
-     * @return string
-     */
-    public function getUsername() {
-
-        return $this->digestParts['username'];
-
-    }
-
-    /**
-     * Validates the digest challenge
-     *
-     * @return bool
-     */
-    protected function validate() {
-
-        $A2 = $this->httpRequest->getMethod() . ':' . $this->digestParts['uri'];
-
-        if ($this->digestParts['qop']=='auth-int') {
-            // Making sure we support this qop value
-            if (!($this->qop & self::QOP_AUTHINT)) return false;
-            // We need to add an md5 of the entire request body to the A2 part of the hash
-            $body = $this->httpRequest->getBody(true);
-            $this->httpRequest->setBody($body,true);
-            $A2 .= ':' . md5($body);
-        } else {
-
-            // We need to make sure we support this qop value
-            if (!($this->qop & self::QOP_AUTH)) return false;
-        }
-
-        $A2 = md5($A2);
-
-        $validResponse = md5("{$this->A1}:{$this->digestParts['nonce']}:{$this->digestParts['nc']}:{$this->digestParts['cnonce']}:{$this->digestParts['qop']}:{$A2}");
-
-        return $this->digestParts['response']==$validResponse;
-
-
-    }
-
-    /**
-     * Returns an HTTP 401 header, forcing login
-     *
-     * This should be called when username and password are incorrect, or not supplied at all
-     *
-     * @return void
-     */
-    public function requireLogin() {
-
-        $qop = '';
-        switch($this->qop) {
-            case self::QOP_AUTH    : $qop = 'auth'; break;
-            case self::QOP_AUTHINT : $qop = 'auth-int'; break;
-            case self::QOP_AUTH | self::QOP_AUTHINT : $qop = 'auth,auth-int'; break;
-        }
-
-        $this->httpResponse->setHeader('WWW-Authenticate','Digest realm="' . $this->realm . '",qop="'.$qop.'",nonce="' . $this->nonce . '",opaque="' . $this->opaque . '"');
-        $this->httpResponse->sendStatus(401);
-
-    }
-
-
-    /**
-     * This method returns the full digest string.
-     *
-     * It should be compatibile with mod_php format and other webservers.
-     *
-     * If the header could not be found, null will be returned
-     *
-     * @return mixed
-     */
-    public function getDigest() {
-
-        // mod_php
-        $digest = $this->httpRequest->getRawServerValue('PHP_AUTH_DIGEST');
-        if ($digest) return $digest;
-
-        // most other servers
-        $digest = $this->httpRequest->getHeader('Authorization');
-
-        // Apache could prefix environment variables with REDIRECT_ when urls
-        // are passed through mod_rewrite
-        if (!$digest) {
-            $digest = $this->httpRequest->getRawServerValue('REDIRECT_HTTP_AUTHORIZATION');
-        }
-
-        if ($digest && strpos(strtolower($digest),'digest')===0) {
-            return substr($digest,7);
-        } else {
-            return null;
-        }
-
-    }
-
-
-    /**
-     * Parses the different pieces of the digest string into an array.
-     *
-     * This method returns false if an incomplete digest was supplied
-     *
-     * @param string $digest
-     * @return mixed
-     */
-    protected function parseDigest($digest) {
-
-        // protect against missing data
-        $needed_parts = array('nonce'=>1, 'nc'=>1, 'cnonce'=>1, 'qop'=>1, 'username'=>1, 'uri'=>1, 'response'=>1);
-        $data = array();
-
-        preg_match_all('@(\w+)=(?:(?:")([^"]+)"|([^\s,$]+))@', $digest, $matches, PREG_SET_ORDER);
-
-        foreach ($matches as $m) {
-            $data[$m[1]] = $m[2] ? $m[2] : $m[3];
-            unset($needed_parts[$m[1]]);
-        }
-
-        return $needed_parts ? false : $data;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/HTTP/Request.php b/core/src/core/classes/sabredav/lib/Sabre/HTTP/Request.php
deleted file mode 100644
index a71a52b421..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/HTTP/Request.php
+++ /dev/null
@@ -1,284 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-/**
- * HTTP Request information
- *
- * This object can be used to easily access information about an HTTP request.
- * It can additionally be used to create 'mock' requests.
- *
- * This class mostly operates independent, but because of the nature of a single
- * request per run it can operate as a singleton. For more information check out
- * the behaviour around 'defaultInputStream'.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Request {
-
-    /**
-     * PHP's $_SERVER data
-     *
-     * @var array
-     */
-    protected $_SERVER;
-
-    /**
-     * PHP's $_POST data
-     *
-     * @var array
-     */
-    protected $_POST;
-
-    /**
-     * The request body, if any.
-     *
-     * This is stored in the form of a stream resource.
-     *
-     * @var resource
-     */
-    protected $body = null;
-
-    /**
-     * This will be set as the 'default' inputStream for a specific HTTP request
-     * We sometimes need to retain, or rebuild this if we need multiple runs
-     * of parsing the original HTTP request.
-     *
-     * @var resource
-     */
-    static $defaultInputStream=null;
-
-    /**
-     * Sets up the object
-     *
-     * The serverData and postData array can be used to override usage of PHP's
-     * global _SERVER and _POST variable respectively.
-     *
-     * @param array $serverData
-     * @param array $postData
-     */
-    public function __construct(array $serverData = null, array $postData = null) {
-
-       if ($serverData) $this->_SERVER = $serverData;
-       else $this->_SERVER =& $_SERVER;
-
-       if ($postData) $this->_POST = $postData;
-       else $this->_POST =& $_POST;
-
-    }
-
-    /**
-     * Returns the value for a specific http header.
-     *
-     * This method returns null if the header did not exist.
-     *
-     * @param string $name
-     * @return string
-     */
-    public function getHeader($name) {
-
-        $name = strtoupper(str_replace(array('-'),array('_'),$name));
-        if (isset($this->_SERVER['HTTP_' . $name])) {
-            return $this->_SERVER['HTTP_' . $name];
-        }
-
-        // There's a few headers that seem to end up in the top-level
-        // server array.
-        switch($name) {
-            case 'CONTENT_TYPE' :
-            case 'CONTENT_LENGTH' :
-                if (isset($this->_SERVER[$name])) {
-                    return $this->_SERVER[$name];
-                }
-                break;
-
-        }
-        return;
-
-    }
-
-    /**
-     * Returns all (known) HTTP headers.
-     *
-     * All headers are converted to lower-case, and additionally all underscores
-     * are automatically converted to dashes
-     *
-     * @return array
-     */
-    public function getHeaders() {
-
-        $hdrs = array();
-        foreach($this->_SERVER as $key=>$value) {
-
-            switch($key) {
-                case 'CONTENT_LENGTH' :
-                case 'CONTENT_TYPE' :
-                    $hdrs[strtolower(str_replace('_','-',$key))] = $value;
-                    break;
-                default :
-                    if (strpos($key,'HTTP_')===0) {
-                        $hdrs[substr(strtolower(str_replace('_','-',$key)),5)] = $value;
-                    }
-                    break;
-            }
-
-        }
-
-        return $hdrs;
-
-    }
-
-    /**
-     * Returns the HTTP request method
-     *
-     * This is for example POST or GET
-     *
-     * @return string
-     */
-    public function getMethod() {
-
-        return $this->_SERVER['REQUEST_METHOD'];
-
-    }
-
-    /**
-     * Returns the requested uri
-     *
-     * @return string
-     */
-    public function getUri() {
-
-        return $this->_SERVER['REQUEST_URI'];
-
-    }
-
-    /**
-     * Will return protocol + the hostname + the uri
-     *
-     * @return string
-     */
-    public function getAbsoluteUri() {
-
-        // Checking if the request was made through HTTPS. The last in line is for IIS
-        $protocol = isset($this->_SERVER['HTTPS']) && ($this->_SERVER['HTTPS']) && ($this->_SERVER['HTTPS']!='off');
-        return ($protocol?'https':'http') . '://'  . $this->getHeader('Host') . $this->getUri();
-
-    }
-
-    /**
-     * Returns everything after the ? from the current url
-     *
-     * @return string
-     */
-    public function getQueryString() {
-
-        return isset($this->_SERVER['QUERY_STRING'])?$this->_SERVER['QUERY_STRING']:'';
-
-    }
-
-    /**
-     * Returns the HTTP request body body
-     *
-     * This method returns a readable stream resource.
-     * If the asString parameter is set to true, a string is sent instead.
-     *
-     * @param bool $asString
-     * @return resource
-     */
-    public function getBody($asString = false) {
-
-        if (is_null($this->body)) {
-            if (!is_null(self::$defaultInputStream)) {
-                $this->body = self::$defaultInputStream;
-            } else {
-                $this->body = fopen('php://input','r');
-                self::$defaultInputStream = $this->body;
-            }
-        }
-        if ($asString) {
-            $body = stream_get_contents($this->body);
-            return $body;
-        } else {
-            return $this->body;
-        }
-
-    }
-
-    /**
-     * Sets the contents of the HTTP request body
-     *
-     * This method can either accept a string, or a readable stream resource.
-     *
-     * If the setAsDefaultInputStream is set to true, it means for this run of the
-     * script the supplied body will be used instead of php://input.
-     *
-     * @param mixed $body
-     * @param bool $setAsDefaultInputStream
-     * @return void
-     */
-    public function setBody($body,$setAsDefaultInputStream = false) {
-
-        if(is_resource($body)) {
-            $this->body = $body;
-        } else {
-
-            $stream = fopen('php://temp','r+');
-            fputs($stream,$body);
-            rewind($stream);
-            // String is assumed
-            $this->body = $stream;
-        }
-        if ($setAsDefaultInputStream) {
-            self::$defaultInputStream = $this->body;
-        }
-
-    }
-
-    /**
-     * Returns PHP's _POST variable.
-     *
-     * The reason this is in a method is so it can be subclassed and
-     * overridden.
-     *
-     * @return array
-     */
-    public function getPostVars() {
-
-        return $this->_POST;
-
-    }
-
-    /**
-     * Returns a specific item from the _SERVER array.
-     *
-     * Do not rely on this feature, it is for internal use only.
-     *
-     * @param string $field
-     * @return string
-     */
-    public function getRawServerValue($field) {
-
-        return isset($this->_SERVER[$field])?$this->_SERVER[$field]:null;
-
-    }
-
-    /**
-     * Returns the HTTP version specified within the request.
-     *
-     * @return string
-     */
-    public function getHTTPVersion() {
-
-        $protocol = $this->getRawServerValue('SERVER_PROTOCOL');
-        if ($protocol==='HTTP/1.0') {
-            return '1.0';
-        } else {
-            return '1.1';
-        }
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/lib/Sabre/HTTP/Response.php b/core/src/core/classes/sabredav/lib/Sabre/HTTP/Response.php
deleted file mode 100644
index a7fc0da126..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/HTTP/Response.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-/**
- * This class represents a HTTP response.
- *
- * It contains the HTTP status code, response headers and a message body.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Response {
-
-    /**
-     * The HTTP version to return in the header() line.
-     *
-     * By default you will definitely want this to be HTTP/1.1, but in some
-     * edge cases (most notably pre 1.2 nginx servers acting as a proxy), you
-     * want to force this to 1.0.
-     *
-     * @var string
-     */
-    public $defaultHttpVersion = '1.1';
-
-    /**
-     * Returns a full HTTP status message for an HTTP status code
-     *
-     * @param int $code
-     * @return string
-     */
-    public function getStatusMessage($code, $httpVersion = '1.1') {
-
-        $msg = array(
-            100 => 'Continue',
-            101 => 'Switching Protocols',
-            102 => 'Processing',
-            200 => 'OK',
-            201 => 'Created',
-            202 => 'Accepted',
-            203 => 'Non-Authorative Information',
-            204 => 'No Content',
-            205 => 'Reset Content',
-            206 => 'Partial Content',
-            207 => 'Multi-Status', // RFC 4918
-            208 => 'Already Reported', // RFC 5842
-            226 => 'IM Used', // RFC 3229
-            300 => 'Multiple Choices',
-            301 => 'Moved Permanently',
-            302 => 'Found',
-            303 => 'See Other',
-            304 => 'Not Modified',
-            305 => 'Use Proxy',
-            306 => 'Reserved',
-            307 => 'Temporary Redirect',
-            400 => 'Bad request',
-            401 => 'Unauthorized',
-            402 => 'Payment Required',
-            403 => 'Forbidden',
-            404 => 'Not Found',
-            405 => 'Method Not Allowed',
-            406 => 'Not Acceptable',
-            407 => 'Proxy Authentication Required',
-            408 => 'Request Timeout',
-            409 => 'Conflict',
-            410 => 'Gone',
-            411 => 'Length Required',
-            412 => 'Precondition failed',
-            413 => 'Request Entity Too Large',
-            414 => 'Request-URI Too Long',
-            415 => 'Unsupported Media Type',
-            416 => 'Requested Range Not Satisfiable',
-            417 => 'Expectation Failed',
-            418 => 'I\'m a teapot', // RFC 2324
-            422 => 'Unprocessable Entity', // RFC 4918
-            423 => 'Locked', // RFC 4918
-            424 => 'Failed Dependency', // RFC 4918
-            426 => 'Upgrade required',
-            428 => 'Precondition required', // draft-nottingham-http-new-status
-            429 => 'Too Many Requests', // draft-nottingham-http-new-status
-            431 => 'Request Header Fields Too Large', // draft-nottingham-http-new-status
-            500 => 'Internal Server Error',
-            501 => 'Not Implemented',
-            502 => 'Bad Gateway',
-            503 => 'Service Unavailable',
-            504 => 'Gateway Timeout',
-            505 => 'HTTP Version not supported',
-            506 => 'Variant Also Negotiates',
-            507 => 'Insufficient Storage', // RFC 4918
-            508 => 'Loop Detected', // RFC 5842
-            509 => 'Bandwidth Limit Exceeded', // non-standard
-            510 => 'Not extended',
-            511 => 'Network Authentication Required', // draft-nottingham-http-new-status
-       );
-
-       return 'HTTP/' . $httpVersion . ' ' . $code . ' ' . $msg[$code];
-
-    }
-
-    // @codeCoverageIgnoreStart
-    // We cannot reasonably test header() related methods.
-
-    /**
-     * Sends an HTTP status header to the client.
-     *
-     * @param int $code HTTP status code
-     * @return bool
-     */
-    public function sendStatus($code) {
-
-        if (!headers_sent())
-            return header($this->getStatusMessage($code, $this->defaultHttpVersion));
-        else return false;
-
-    }
-
-    /**
-     * Sets an HTTP header for the response
-     *
-     * @param string $name
-     * @param string $value
-     * @param bool $replace
-     * @return bool
-     */
-    public function setHeader($name, $value, $replace = true) {
-
-        $value = str_replace(array("\r","\n"),array('\r','\n'),$value);
-        if (!headers_sent())
-            return header($name . ': ' . $value, $replace);
-        else return false;
-
-
-    }
-    // @codeCoverageIgnoreEnd
-
-    /**
-     * Sets a bunch of HTTP Headers
-     *
-     * headersnames are specified as keys, value in the array value
-     *
-     * @param array $headers
-     * @return void
-     */
-    public function setHeaders(array $headers) {
-
-        foreach($headers as $key=>$value)
-            $this->setHeader($key, $value);
-
-    }
-
-    /**
-     * Sends the entire response body
-     *
-     * This method can accept either an open filestream, or a string.
-     *
-     * @param mixed $body
-     * @return void
-     */
-    public function sendBody($body) {
-
-        if (is_resource($body)) {
-
-            file_put_contents('php://output', $body);
-
-        } else {
-
-            // We assume a string
-            echo $body;
-
-        }
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/HTTP/Util.php b/core/src/core/classes/sabredav/lib/Sabre/HTTP/Util.php
deleted file mode 100644
index 1472462538..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/HTTP/Util.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-/**
- * HTTP utility methods
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @author Paul Voegler
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Util {
-
-    /**
-     * Parses a RFC2616-compatible date string
-     *
-     * This method returns false if the date is invalid
-     *
-     * @param string $dateHeader
-     * @return bool|DateTime
-     */
-    static function parseHTTPDate($dateHeader) {
-
-        //RFC 2616 section 3.3.1 Full Date
-        //Only the format is checked, valid ranges are checked by strtotime below
-        $month = '(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)';
-        $weekday = '(Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday)';
-        $wkday = '(Mon|Tue|Wed|Thu|Fri|Sat|Sun)';
-        $time = '[0-2]\d(\:[0-5]\d){2}';
-        $date3 = $month . ' ([1-3]\d| \d)';
-        $date2 = '[0-3]\d\-' . $month . '\-\d\d';
-        //4-digit year cannot begin with 0 - unix timestamp begins in 1970
-        $date1 = '[0-3]\d ' . $month . ' [1-9]\d{3}';
-
-        //ANSI C's asctime() format
-        //4-digit year cannot begin with 0 - unix timestamp begins in 1970
-        $asctime_date = $wkday . ' ' . $date3 . ' ' . $time . ' [1-9]\d{3}';
-        //RFC 850, obsoleted by RFC 1036
-        $rfc850_date = $weekday . ', ' . $date2 . ' ' . $time . ' GMT';
-        //RFC 822, updated by RFC 1123
-        $rfc1123_date = $wkday . ', ' . $date1 . ' ' . $time . ' GMT';
-        //allowed date formats by RFC 2616
-        $HTTP_date = "($rfc1123_date|$rfc850_date|$asctime_date)";
-
-        //allow for space around the string and strip it
-        $dateHeader = trim($dateHeader, ' ');
-        if (!preg_match('/^' . $HTTP_date . '$/', $dateHeader))
-            return false;
-
-        //append implicit GMT timezone to ANSI C time format
-        if (strpos($dateHeader, ' GMT') === false)
-            $dateHeader .= ' GMT';
-
-
-        $realDate = strtotime($dateHeader);
-        //strtotime can return -1 or false in case of error
-        if ($realDate !== false && $realDate >= 0)
-            return new \DateTime('@' . $realDate, new \DateTimeZone('UTC'));
-
-    }
-
-    /**
-     * Transforms a DateTime object to HTTP's most common date format.
-     *
-     * We're serializing it as the RFC 1123 date, which, for HTTP must be
-     * specified as GMT.
-     *
-     * @param \DateTime $dateTime
-     * @return string
-     */
-    static function toHTTPDate(\DateTime $dateTime) {
-
-        // We need to clone it, as we don't want to affect the existing
-        // DateTime.
-        $dateTime = clone $dateTime;
-        $dateTime->setTimeZone(new \DateTimeZone('GMT'));
-        return $dateTime->format('D, d M Y H:i:s \G\M\T');
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/HTTP/Version.php b/core/src/core/classes/sabredav/lib/Sabre/HTTP/Version.php
deleted file mode 100644
index 0e913835ce..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/HTTP/Version.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-/**
- * This class contains the Sabre\HTTP version constants.
- *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Version {
-
-    /**
-     * Full version number
-     */
-    const VERSION = '1.8.9';
-
-    /**
-     * Stability : alpha, beta, stable
-     */
-    const STABILITY = 'stable';
-
-}
diff --git a/core/src/core/classes/sabredav/lib/Sabre/autoload.php b/core/src/core/classes/sabredav/lib/Sabre/autoload.php
deleted file mode 100644
index c5945ee1d4..0000000000
--- a/core/src/core/classes/sabredav/lib/Sabre/autoload.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * SabreDAV's autoloader
- *
- * This file is kept for backwards compatibility purposes.
- * SabreDAV now uses the composer autoloader.
- *
- * You should stop including this file, and include 'vendor/autoload.php'
- * instead.
- *
- * @deprecated Will be removed in a future version!
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-
-/**
- * We are assuming that the composer autoloader is just 2 directories up.
- *
- * This is not the case when sabredav is installed as a dependency. But, in
- * those cases it's not expected that people will look for this file anyway.
- */
-
-require __DIR__ . '/../../vendor/autoload.php';
diff --git a/core/src/core/classes/sabredav/vendor/autoload.php b/core/src/core/classes/sabredav/vendor/autoload.php
deleted file mode 100644
index 0d71303992..0000000000
--- a/core/src/core/classes/sabredav/vendor/autoload.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-// autoload.php generated by Composer
-
-require_once __DIR__ . '/composer' . '/autoload_real.php';
-
-return ComposerAutoloaderInitdac81ad4d0ed7064b2e24af202c2e0e0::getLoader();
diff --git a/core/src/core/classes/sabredav/vendor/composer/ClassLoader.php b/core/src/core/classes/sabredav/vendor/composer/ClassLoader.php
deleted file mode 100644
index 596c65d0fe..0000000000
--- a/core/src/core/classes/sabredav/vendor/composer/ClassLoader.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?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 class loader
- *
- * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
- *
- *     $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>
- */
-class ClassLoader
-{
-    private $prefixes = array();
-    private $fallbackDirs = array();
-    private $useIncludePath = false;
-    private $classMap = array();
-
-    public function getPrefixes()
-    {
-        return $this->prefixes;
-    }
-
-    public function getFallbackDirs()
-    {
-        return $this->fallbackDirs;
-    }
-
-    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 classes, merging with any others previously set.
-     *
-     * @param string       $prefix  The classes prefix
-     * @param array|string $paths   The location(s) of the classes
-     * @param bool         $prepend Prepend the location(s)
-     */
-    public function add($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            if ($prepend) {
-                $this->fallbackDirs = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirs
-                );
-            } else {
-                $this->fallbackDirs = array_merge(
-                    $this->fallbackDirs,
-                    (array) $paths
-                );
-            }
-
-            return;
-        }
-        if (!isset($this->prefixes[$prefix])) {
-            $this->prefixes[$prefix] = (array) $paths;
-
-            return;
-        }
-        if ($prepend) {
-            $this->prefixes[$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixes[$prefix]
-            );
-        } else {
-            $this->prefixes[$prefix] = array_merge(
-                $this->prefixes[$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of classes, replacing any others previously set.
-     *
-     * @param string       $prefix  The classes prefix
-     * @param array|string $paths   The location(s) of the classes
-     */
-    public function set($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirs = (array) $paths;
-
-            return;
-        }
-        $this->prefixes[$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;
-    }
-
-    /**
-     * 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
-     */
-    public function loadClass($class)
-    {
-        if ($file = $this->findFile($class)) {
-            include $file;
-
-            return true;
-        }
-    }
-
-    /**
-     * Finds the path to the file where the class is defined.
-     *
-     * @param string $class The name of the class
-     *
-     * @return string|null The path, if found
-     */
-    public function findFile($class)
-    {
-        if ('\\' == $class[0]) {
-            $class = substr($class, 1);
-        }
-
-        if (isset($this->classMap[$class])) {
-            return $this->classMap[$class];
-        }
-
-        if (false !== $pos = strrpos($class, '\\')) {
-            // namespaced class name
-            $classPath = str_replace('\\', DIRECTORY_SEPARATOR, substr($class, 0, $pos)) . DIRECTORY_SEPARATOR;
-            $className = substr($class, $pos + 1);
-        } else {
-            // PEAR-like class name
-            $classPath = null;
-            $className = $class;
-        }
-
-        $classPath .= str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
-
-        foreach ($this->prefixes as $prefix => $dirs) {
-            if (0 === strpos($class, $prefix)) {
-                foreach ($dirs as $dir) {
-                    if (file_exists($dir . DIRECTORY_SEPARATOR . $classPath)) {
-                        return $dir . DIRECTORY_SEPARATOR . $classPath;
-                    }
-                }
-            }
-        }
-
-        foreach ($this->fallbackDirs as $dir) {
-            if (file_exists($dir . DIRECTORY_SEPARATOR . $classPath)) {
-                return $dir . DIRECTORY_SEPARATOR . $classPath;
-            }
-        }
-
-        if ($this->useIncludePath && $file = stream_resolve_include_path($classPath)) {
-            return $file;
-        }
-
-        return $this->classMap[$class] = false;
-    }
-}
diff --git a/core/src/core/classes/sabredav/vendor/composer/autoload_classmap.php b/core/src/core/classes/sabredav/vendor/composer/autoload_classmap.php
deleted file mode 100644
index 4a9177d7fe..0000000000
--- a/core/src/core/classes/sabredav/vendor/composer/autoload_classmap.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-// autoload_classmap.php generated by Composer
-
-$vendorDir = dirname(__DIR__);
-$baseDir = dirname($vendorDir);
-
-return array(
-);
diff --git a/core/src/core/classes/sabredav/vendor/composer/autoload_namespaces.php b/core/src/core/classes/sabredav/vendor/composer/autoload_namespaces.php
deleted file mode 100644
index 4ee1dda676..0000000000
--- a/core/src/core/classes/sabredav/vendor/composer/autoload_namespaces.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-// autoload_namespaces.php generated by Composer
-
-$vendorDir = dirname(__DIR__);
-$baseDir = dirname($vendorDir);
-
-return array(
-    'Sabre\\VObject' => $vendorDir . '/sabre/vobject/lib/',
-    'Sabre\\HTTP' => $baseDir . '/lib/',
-    'Sabre\\DAVACL' => $baseDir . '/lib/',
-    'Sabre\\DAV' => $baseDir . '/lib/',
-    'Sabre\\CardDAV' => $baseDir . '/lib/',
-    'Sabre\\CalDAV' => $baseDir . '/lib/',
-);
diff --git a/core/src/core/classes/sabredav/vendor/composer/autoload_real.php b/core/src/core/classes/sabredav/vendor/composer/autoload_real.php
deleted file mode 100644
index dbb6a2f6f2..0000000000
--- a/core/src/core/classes/sabredav/vendor/composer/autoload_real.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-// autoload_real.php generated by Composer
-
-class ComposerAutoloaderInitdac81ad4d0ed7064b2e24af202c2e0e0
-{
-    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('ComposerAutoloaderInitdac81ad4d0ed7064b2e24af202c2e0e0', 'loadClassLoader'));
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitdac81ad4d0ed7064b2e24af202c2e0e0', 'loadClassLoader'));
-
-        $vendorDir = dirname(__DIR__);
-        $baseDir = dirname($vendorDir);
-
-        $map = require __DIR__ . '/autoload_namespaces.php';
-        foreach ($map as $namespace => $path) {
-            $loader->add($namespace, $path);
-        }
-
-        $classMap = require __DIR__ . '/autoload_classmap.php';
-        if ($classMap) {
-            $loader->addClassMap($classMap);
-        }
-
-        $loader->register(true);
-
-        return $loader;
-    }
-}
diff --git a/core/src/core/classes/sabredav/vendor/composer/installed.json b/core/src/core/classes/sabredav/vendor/composer/installed.json
deleted file mode 100644
index 9c2e87b949..0000000000
--- a/core/src/core/classes/sabredav/vendor/composer/installed.json
+++ /dev/null
@@ -1,51 +0,0 @@
-[
-    {
-        "name": "sabre/vobject",
-        "version": "2.0.7",
-        "version_normalized": "2.0.7.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/evert/sabre-vobject.git",
-            "reference": "2.0.7"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/evert/sabre-vobject/zipball/2.0.7",
-            "reference": "2.0.7",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.1"
-        },
-        "time": "2013-03-05 12:16:55",
-        "bin": [
-            "bin/vobjectvalidate.php"
-        ],
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Sabre\\VObject": "lib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Evert Pot",
-                "email": "evert@rooftopsolutions.nl",
-                "homepage": "http://www.rooftopsolutions.nl/",
-                "role": "Developer"
-            }
-        ],
-        "description": "The VObject library for PHP allows you to easily parse and manipulate iCalendar and vCard objects",
-        "homepage": "https://github.com/evert/sabre-vobject",
-        "keywords": [
-            "VObject",
-            "iCalendar",
-            "vCard"
-        ]
-    }
-]
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/.travis.yml b/core/src/core/classes/sabredav/vendor/sabre/vobject/.travis.yml
deleted file mode 100644
index 6bf8b75929..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/.travis.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-language: php
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-
-script: phpunit --configuration tests/phpunit.xml
-
-before_script: composer install
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/ChangeLog b/core/src/core/classes/sabredav/vendor/sabre/vobject/ChangeLog
deleted file mode 100644
index 2c8cd212c9..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/ChangeLog
+++ /dev/null
@@ -1,56 +0,0 @@
-2.0.7-stable (2013-03-05)
-	* Fixed: Microsoft re-uses their magic numbers for different timezones,
-	  specifically id 2 for both Sarajevo and Lisbon). A workaround was added
-	  to deal with this.
-
-2.0.6-stable (2013-02-17)
-	* Fixed: The reader now properly parses parameters without a value.
-
-2.0.5-stable (2012-11-05)
-	* Fixed: The FreeBusyGenerator is now properly using the factory methods
-	  for creation of components and properties.
-
-2.0.4-stable (2012-11-02)
-	* Added: Known Lotus Notes / Domino timezone id's.
-
-2.0.3-stable (2012-10-29)
-	* Added: Support for 'GMT+????' format in TZID's.
-	* Added: Support for formats like SystemV/EST5EDT in TZID's.
-	* Fixed: RecurrenceIterator now repairs recurrence rules where UNTIL < DTSTART.
-	* Added: Support for BYHOUR in FREQ=DAILY (@hollodk).
-	* Added: Support for BYHOUR and BYDAY in FREQ=WEEKLY.
-
-2.0.2-stable (2012-10-06)
-	* Added: includes.php file, to load the entire library in one go.
-	* Fixed: A problem with determining alarm triggers for TODO's.
-
-2.0.1-stable (2012-09-22)
-	* Removed: Element class. It wasn't used.
-	* Added: Basic validation and repair methods for broken input data.
-	* Fixed: RecurrenceIterator could infinitely loop when an INTERVAL of 0
-	  was specified.
-	* Added: A cli script that can validate and automatically repair vcards
-	  and iCalendar objects.
-	* Added: A new 'Compound' property, that can automatically split up parts
-	  for properties such as N, ADR, ORG and CATEGORIES.
-	* Added: Splitter classes, that can split up large objects (such as exports)
-	  into individual objects (thanks @DominikTO and @armin-hackmann).
-	* Added: VFREEBUSY component, which allows easily checking wether
-	  timeslots are available.
-	* Added: The Reader class now has a 'FORGIVING' option, which allows it to
-	  parse properties with incorrect characters in the name (at this time, it
-	  just allows underscores).
-	* Added: Also added the 'IGNORE_INVALID_LINES' option, to completely
-	  disregard any invalid lines.
-	* Fixed: A bug in Windows timezone-id mappings for times created in
-	  Greenlands timezone (sorry Greenlanders! I do care!).
-	* Fixed: DTEND was not generated correctly for VFREEBUSY reports.
-	* Fixed: Parser is at least 25% faster with real-world data.
-
-2.0.0-stable (2012-08-08)
-	* VObject is now a separate project from SabreDAV. See the SabreDAV
-	  changelog for version information before 2.0.
-	* New: VObject library now uses PHP 5.3 namespaces.
-	* New: It's possible to specify lists of parameters when constructing
-	  properties.
-	* New: made it easier to construct the FreeBusyGenerator.
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/LICENSE b/core/src/core/classes/sabredav/vendor/sabre/vobject/LICENSE
deleted file mode 100644
index b1801509f9..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (C) 2007-2013 Rooftop Solutions.
-
-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 Sabre 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 OWNER 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.
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/README.md b/core/src/core/classes/sabredav/vendor/sabre/vobject/README.md
deleted file mode 100644
index 160ea7a67c..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/README.md
+++ /dev/null
@@ -1,368 +0,0 @@
-# SabreTooth VObject library
-
-[![Build Status](https://secure.travis-ci.org/evert/sabre-vobject.png?branch=master)](http://travis-ci.org/evert/sabre-vobject)
-
-The VObject library allows you to easily parse and manipulate [iCalendar](https://tools.ietf.org/html/rfc5545)
-and [vCard](https://tools.ietf.org/html/rfc6350) objects using PHP.
-The goal of the VObject library is to create a very complete library, with an easy to use API.
-
-This project is a spin-off from [SabreDAV](http://code.google.com/p/sabredav/), where it has
-been used for several years. The VObject library has 100% unittest coverage.
-
-# Installation
-
-VObject requires PHP 5.3, and should be installed using composer.
-The general composer instructions can be found on the [composer website](http://getcomposer.org/doc/00-intro.md composer website).
-
-After that, just declare the vobject dependency as follows:
-
-```
-"require" : {
-    "sabre/vobject" : "2.0.*"
-}
-```
-
-Then, run `composer.phar update` and you should be good.
-
-# Usage
-
-## Parsing
-
-For our example, we will be using the following vcard:
-
-```
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Sabre//Sabre VObject 2.0//EN
-N:Planck;Max;;;
-FN:Max Planck
-EMAIL;TYPE=WORK:mplanck@example.org
-item1.TEL;TYPE=CELL:(+49)3144435678
-item1.X-ABLabel:Private cell
-item2.TEL;TYPE=WORK:(+49)5554564744
-item2.X-ABLabel:Work
-END:VCARD
-```
-
-
-If we want to just print out Max' full name, you can just use property access:
-
-
-```php
-use Sabre\VObject;
-
-$card = VObject\Reader::read($data);
-echo $card->FN;
-```
-
-## Changing properties
-
-Creating properties is pretty similar. If we like to add his birthday, we just
-set the property:
-
-```php
-$card->BDAY = '1858-04-23';
-```
-
-Note that in the previous example, we're actually updating any existing BDAY that
-may already exist. If we want to add a new property, without overwriting the previous
-we can do this with the `add` method.
-
-```php
-$card->add('EMAIL','max@example.org');
-```
-
-## Parameters
-
-If we want to also specify that this is max' home email addresses, we can do this with
-a third parameter:
-
-```
-$card->add('EMAIL', 'max@example'org', array('type' => 'HOME'));
-```
-
-If we want to read out all the email addresses and their type, this would look something
-like this:
-
-```
-foreach($card->EMAIL as $email) {
-
-    echo $email['TYPE'], ' - ', $email;
-
-}
-```
-
-## Groups
-
-In our example, you can see that the TEL properties are prefixed. These are 'groups' and
-allow you to group multiple related properties together. The group can be any user-defined
-name.
-
-This particular example as generated by the OS X addressbook, which uses the `X-ABLabel`
-to allow the user to specify custom labels for properties. OS X addressbook uses groups
-to tie the label to the property.
-
-The VObject library simply ignores the group if you don't specify it, so this will work:
-
-```php
-foreach($card->TEL as $tel) {
-    echo $tel, "\n";
-}
-```
-
-But if you would like to target a specific group + property, this is possible too:
-
-```php
-echo $card->{'ITEM1.TEL'};
-```
-
-So if you would like to show all the phone numbers, along with their custom label, the
-following syntax is used:
-
-```php
-foreach($card->TEL as $tel) {
-
-    echo $card->{$tel->group . '.X-ABLABEL'}, ": ";
-    echo $tel, "\n";
-
-}
-```
-
-## Serializing / Saving
-
-If you want to generate your updated VObject, you can simply call the serialize() method.
-
-```php
-echo $card->serialize();
-```
-
-## Components
-
-iCalendar, unlike vCards always have sub-components. Where vCards are often just a flat
-list, iCalendar objects tend to have a tree-like structure. For the following paragraphs,
-we will use the following object as the example:
-
-```
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject 2.0//EN
-BEGIN:VEVENT
-SUMMARY:Curiosity landing
-DTSTART:20120806T051439Z
-LOCATION:Mars
-END:VEVENT
-END:VCALENDAR
-```
-
-Since events, tasks and journals are always in a sub component, this is also how we
-access them.
-
-```php
-use Sabre\VObject;
-
-$calendar = VObject\Reader::read($data);
-echo $calendar->VEVENT->SUMMARY;
-```
-
-Adding components to a calendar is done with a factory method:
-
-```php
-$event = VObject\Component::create('VEVENT');
-$calendar->add($event);
-
-$event->SUMMARY = 'Curiosity launch';
-$event->DTSTART = '20111126T150202Z';
-$event->LOCATION = 'Cape Carnival';
-```
-
-By the way.. cloning also works as expected, as the entire structure is cloned along with it:
-
-```php
-$clonedEvent = clone $calendar->VEVENT[0];
-$calendar->add($clonedEvent);
-```
-
-## Date and time handling
-
-If you ever had to deal with iCalendar timezones, you know it can be complicated.
-The way timezones are specified is flawed, which is something I may write an essay about some
-day. VObject does its best to determine the correct timezone. Many standard formats
-have been tested and verified, and special code has been implemented for special-casing
-microsoft generated timezone information, and others.
-
-To get a real php `DateTime` object, you can request this as follows:
-
-```php
-$event = $calendar->VEVENT;
-$start = $event->DTSTART->getDateTime();
-echo $start->format(\DateTime::W3C);
-```
-
-To set the property with a DateTime object, you can use the following syntax:
-
-```php
-$dateTime = new \DateTime('2012-08-07 23:53:00', new DateTimeZone('Europe/Amsterdam'));
-$event->DTSTART->setDateTime($dateTime, VObject\Property\DateTime::DATE);
-```
-
-The second argument specifies the type of date you're setting. The following three
-options exist:
-
-1. `LOCAL` This is a floating time, with no timezone information. This basically specifies that the event happens in whatever the timezone's currently in. This would be encoded as `DTSTART;VALUE=DATE-TIME:20120807235300`
-2. `UTC` This specifies that the time should be encoded as a UTC time. This is encoded as `DTSTART;VALUE=DATE-TIME:20120807205300Z`. Note the extra Z and the fact that it's two hours 'earlier'.
-3. `LOCALTZ` specifies that it's supposed to be encoded in its local timezone. For example `DTSTART;VALUE=DATE-TIME;TZID=Europe/Amsterdam:20120807235300`.
-4. `DATE` This is a date-only, and does not contain the time. In this case this would be encoded as `DTSTART;VALUE=DATE:20120807`.
-
-A few important notes:
-
-* When a `TZID` is specified, there should also be a matching `VTIMEZONE` object with all the timezone information. VObject cannot currently automatically embed this. However, in reality other clients seem to do fine without this information. Yet, for completeness, this will be added in the future.
-* As mentioned, the timezone-determination process may sometimes fail. Report any issues you find, and I'll be quick to add workarounds!
-
-## Recurrence rules
-
-Recurrence rules allow events to recur, for example for a weekly meeting, or an anniversary.
-This is done with the `RRULE` property. The `RRULE` property allows for a LOT of different
-rules. VObject only implements the ones that actually appear in calendar software.
-
-To read more about `RRULE` and all the options, check out [RFC5545](https://tools.ietf.org/html/rfc5545#section-3.8.5).
-VObject supports the following options:
-
-1. `UNTIL` for an end date.
-2. `INTERVAL` for for example "every 2 days".
-3. `COUNT` to stop recurring after x items.
-4. `FREQ=DAILY` to recur every day, and `BYDAY` to limit it to certain days.
-5. `FREQ=WEEKLY` to recur every week, `BYDAY` to expand this to multiple weekdays in every week and `WKST` to specify on which day the week starts.
-6. `FREQ=MONTHLY` to recur every month, `BYMONTHDAY` to expand this to certain days in a month, `BYDAY` to expand it to certain weekdays occuring in a month, and `BYSETPOS` to limit the last two expansions.
-7. `FREQ=YEARLY` to recur every year, `BYMONTH` to expand that to certain months in a year, and `BYDAY` and `BYWEEKDAY` to expand the `BYMONTH` rule even further.
-
-VObject supports the `EXDATE` property for exclusions, but not yet the `RDATE` and `EXRULE` 
-properties. If you're interested in this, please file a github issue, as this will put it
-on my radar.
-
-This is a bit of a complex subject to go in excruciating detail. The
-[RFC](https://tools.ietf.org/html/rfc5545#section-3.8.5) has a lot of examples though.
-
-The hard part is not to write the RRULE, it is to expand them. The most complex and
-hard-to-read code is hidden in this component. Dragons be here.
-
-So, if we have a meeting every 2nd monday of the month, this would be specified as such:
-
-```
-BEGIN:VCALENDAR
-  VERSION:2.0
-  BEGIN:VEVENT
-    UID:1102c450-e0d7-11e1-9b23-0800200c9a66
-    DTSTART:20120109T140000Z
-    RRULE:FREQ=MONTHLY;BYDAY=MO;BYSETPOS=2
-  END:VEVENT
-END:VCALENDAR
-```
-
-Note that normally it's not allowed to indent the object like this, but it does make
-it easier to read. This is also the first time I added in a UID, which is required
-for all VEVENT, VTODO and VJOURNAL objects!
-
-To figure out all the meetings for this year, we can use the following syntax:
-
-```php
-use Sabre\VObject;
-
-$calendar = VObject\Reader::read($data);
-$calendar->expand(new DateTime('2012-01-01'), new DateTime('2012-12-31'));
-```
-
-What the expand method does, is look at its inner events, and expand the recurring
-rule. Our calendar now contains 12 events. The first will have its RRULE stripped,
-and every subsequent VEVENT has the correct meeting date and a `RECURRENCE-ID` set.
-
-This results in something like this:
-
-```
-BEGIN:VCALENDAR
-  VERSION:2.0
-  BEGIN:VEVENT
-    UID:1102c450-e0d7-11e1-9b23-0800200c9a66
-    DTSTART:20120109T140000Z
-  END:VEVENT
-  BEGIN:VEVENT
-    UID:1102c450-e0d7-11e1-9b23-0800200c9a66
-    RECURRENCE-ID:20120213T140000Z
-    DTSTART:20120213T140000Z
-  END:VEVENT
-  BEGIN:VEVENT
-    UID:1102c450-e0d7-11e1-9b23-0800200c9a66
-    RECURRENCE-ID:20120312T140000Z
-    DTSTART:20120312T140000Z
-  END:VEVENT
-  ..etc..
-END:VCALENDAR
-```
-
-To show the list of dates, we would do this as such:
-
-```php
-foreach($calendar->VEVENT as $event) {
-    echo $event->DTSTART->getDateTime()->format(\DateTime::ATOM);
-}
-```
-
-In a recurring event, single instances can also be overriden. VObject also takes these
-into consideration. The reason we needed to specify a start and end-date, is because
-some recurrence rules can be 'never ending'.
-
-You should make sure you pick a sane date-range. Because if you pick a 50 year
-time-range, for a daily recurring event; this would result in over 18K objects.
-
-# Free-busy report generation
-
-Some calendaring software can make use of FREEBUSY reports to show when people are
-available.
-
-You can automatically generate these reports from calendars using the `FreeBusyGenerator`.
-
-Example based on our last event:
-
-```php
-// We're giving it the calendar object. It's also possible to specify multiple objects,
-// by setting them as an array.
-//
-// We must also specify a start and end date, because recurring events are expanded.
-$fbGenerator = new VObject\FreeBusyGenerator(
-    new DateTime('2012-01-01'),
-    new DateTime('2012-12-31'),
-    $calendar
-);
-
-// Grabbing the report
-$freebusy = $fbGenerator->result();
-
-// The freebusy report is another VCALENDAR object, so we can serialize it as usual:
-echo $freebusy->serialize();
-```
-
-The output of this script will look like this:
-
-```
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject 2.0//EN
-CALSCALE:GREGORIAN
-BEGIN:VFREEBUSY
-DTSTART;VALUE=DATE-TIME:20111231T230000Z
-DTEND;VALUE=DATE-TIME:20111231T230000Z
-DTSTAMP;VALUE=DATE-TIME:20120808T131628Z
-FREEBUSY;FBTYPE=BUSY:20120109T140000Z/20120109T140000Z
-FREEBUSY;FBTYPE=BUSY:20120213T140000Z/20120213T140000Z
-FREEBUSY;FBTYPE=BUSY:20120312T140000Z/20120312T140000Z
-FREEBUSY;FBTYPE=BUSY:20120409T140000Z/20120409T140000Z
-FREEBUSY;FBTYPE=BUSY:20120514T140000Z/20120514T140000Z
-FREEBUSY;FBTYPE=BUSY:20120611T140000Z/20120611T140000Z
-FREEBUSY;FBTYPE=BUSY:20120709T140000Z/20120709T140000Z
-FREEBUSY;FBTYPE=BUSY:20120813T140000Z/20120813T140000Z
-FREEBUSY;FBTYPE=BUSY:20120910T140000Z/20120910T140000Z
-FREEBUSY;FBTYPE=BUSY:20121008T140000Z/20121008T140000Z
-FREEBUSY;FBTYPE=BUSY:20121112T140000Z/20121112T140000Z
-FREEBUSY;FBTYPE=BUSY:20121210T140000Z/20121210T140000Z
-END:VFREEBUSY
-END:VCALENDAR
-```
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/bin/vobjectvalidate.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/bin/vobjectvalidate.php
deleted file mode 100644
index 84963a6901..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/bin/vobjectvalidate.php
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-namespace Sabre\VObject;
-
-// This sucks.. we have to try to find the composer autoloader. But chances
-// are, we can't find it this way. So we'll do our bestest
-$paths = array(
-    __DIR__ . '/../vendor/autoload.php',  // In case vobject is cloned directly
-    __DIR__ . '/../../../autoload.php',   // In case vobject is a composer dependency.
-);
-
-foreach($paths as $path) {
-    if (file_exists($path)) {
-        include $path;
-        break;
-    }
-}
-
-if (!class_exists('Sabre\\VObject\\Version')) {
-    fwrite(STDERR, "Composer autoloader could not be properly loaded.\n");
-    die(1);
-}
-
-fwrite(STDERR, "SabreTooth VObject validator " . Version::VERSION . "\n");
-
-
-$repair = false;
-$posArgs = array();
-
-// Argument parsing:
-foreach($argv as $k=>$v) {
-
-    if ($k===0) {
-        continue;
-    }
-    if (substr($v,0,2)==='--') {
-        switch($v) {
-            case '--repair' :
-                $repair = true;
-                break;
-            default :
-                throw new InvalidArgumentException('Unknown option: ' . $v);
-                break;
-        }
-        continue;
-    }
-    $posArgs[] = $v;
-
-}
-
-function help() {
-
-    global $argv;
-
-    fwrite(STDERR, <<<HELP
-Usage instructions:
-
-  {$argv[0]} [--repair] inputfile [outputfile]
-
-  inputfile   Input .vcf or .ics file.
-  outputfile  Output .vcf or .ics file. This is only used with --repair.
-  --repair    Attempt to automatically repair broken files.
-
-For both the output- and inputfile "-" can be specified, to use STDIN and STDOUT
-respectively.
-
-All other output from this script is sent to STDERR.
-
-https://github.com/evert/sabre-vobject
-
-HELP
-);
-
-}
-
-if (count($posArgs) < 1) {
-    help();
-    die();
-}
-
-if ($posArgs[0]!=='-') {
-    $input = fopen($posArgs[0],'r');
-} else {
-    $input = STDIN;
-}
-
-if (isset($posArgs[1]) && $posArgs[1]!=='-') {
-    $output = fopen($posArgs[1],'w');
-} else {
-    $output = STDOUT;
-}
-
-// This is a bit of a hack to easily support multiple objects in a single file.
-$inputStr = "BEGIN:X-SABRE-WRAPPER\r\n" . stream_get_contents($input);
-
-$inputStr = rtrim($inputStr, "\r\n") . "\r\nEND:X-SABRE-WRAPPER\r\n";
-
-// Now the actual work.
-$vObj = Reader::read($inputStr);
-
-$objects = $vObj->children();
-
-foreach($objects as $child) {
-
-    switch($child->name) {
-        case 'VCALENDAR' :
-            fwrite(STDERR, "iCalendar: " . (string)$child->VERSION . "\n");
-            break;
-        case 'VCARD' :
-            fwrite(STDERR, "vCard: " . (string)$child->VERSION . "\n");
-            break;
-        default :
-            fwrite(STDERR, "This was an unknown object, but it did parse. It's likely that validation will give you unexpected results.\n");
-            break;
-    }
-
-    $options = 0;
-    if ($repair) $options |= Node::REPAIR;
-
-    $warnings = $child->validate($options);
-
-    if (!count($warnings)) {
-        fwrite(STDERR, "[GOOD NEWS] No warnings!\n");
-    } else {
-        foreach($warnings as $warn) {
-
-            fwrite(STDERR, $warn['message'] . "\n");
-
-        }
-
-    }
-
-    if ($repair) {
-        fwrite($output, $child->serialize());
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/composer.json b/core/src/core/classes/sabredav/vendor/sabre/vobject/composer.json
deleted file mode 100644
index f99ff1d1f2..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/composer.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "name": "sabre/vobject",
-    "description" : "The VObject library for PHP allows you to easily parse and manipulate iCalendar and vCard objects",
-    "keywords" : [ "VObject", "iCalendar", "vCard" ],
-    "homepage" : "https://github.com/evert/sabre-vobject",
-    "license" : "BSD-3-Clause",
-    "require" : {
-        "php" : ">=5.3.1"
-    },
-    "authors" : [
-        {
-            "name" : "Evert Pot",
-            "email" : "evert@rooftopsolutions.nl",
-            "homepage" : "http://www.rooftopsolutions.nl/",
-            "role" : "Developer"
-        }
-    ],
-    "support" : {
-        "forum" : "https://groups.google.com/group/sabredav-discuss",
-        "source" : "https://github.com/evert/sabre-vobject"
-    },
-    "autoload" : {
-        "psr-0" : {
-            "Sabre\\VObject" : "lib/"
-        }
-    },
-    "bin" : [
-        "bin/vobjectvalidate.php"
-    ]
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component.php
deleted file mode 100644
index f3560d8671..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component.php
+++ /dev/null
@@ -1,405 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-/**
- * VObject Component
- *
- * This class represents a VCALENDAR/VCARD component. A component is for example
- * VEVENT, VTODO and also VCALENDAR. It starts with BEGIN:COMPONENTNAME and
- * ends with END:COMPONENTNAME
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Component extends Node {
-
-    /**
-     * Name, for example VEVENT
-     *
-     * @var string
-     */
-    public $name;
-
-    /**
-     * Children properties and components
-     *
-     * @var array
-     */
-    public $children = array();
-
-    /**
-     * If components are added to this map, they will be automatically mapped
-     * to their respective classes, if parsed by the reader or constructed with
-     * the 'create' method.
-     *
-     * @var array
-     */
-    static public $classMap = array(
-        'VALARM'        => 'Sabre\\VObject\\Component\\VAlarm',
-        'VCALENDAR'     => 'Sabre\\VObject\\Component\\VCalendar',
-        'VCARD'         => 'Sabre\\VObject\\Component\\VCard',
-        'VEVENT'        => 'Sabre\\VObject\\Component\\VEvent',
-        'VJOURNAL'      => 'Sabre\\VObject\\Component\\VJournal',
-        'VTODO'         => 'Sabre\\VObject\\Component\\VTodo',
-        'VFREEBUSY'     => 'Sabre\\VObject\\Component\\VFreeBusy',
-    );
-
-    /**
-     * Creates the new component by name, but in addition will also see if
-     * there's a class mapped to the property name.
-     *
-     * @param string $name
-     * @param string $value
-     * @return Component
-     */
-    static public function create($name, $value = null) {
-
-        $name = strtoupper($name);
-
-        if (isset(self::$classMap[$name])) {
-            return new self::$classMap[$name]($name, $value);
-        } else {
-            return new self($name, $value);
-        }
-
-    }
-
-    /**
-     * Creates a new component.
-     *
-     * By default this object will iterate over its own children, but this can
-     * be overridden with the iterator argument
-     *
-     * @param string $name
-     * @param ElementList $iterator
-     */
-    public function __construct($name, ElementList $iterator = null) {
-
-        $this->name = strtoupper($name);
-        if (!is_null($iterator)) $this->iterator = $iterator;
-
-    }
-
-    /**
-     * Turns the object back into a serialized blob.
-     *
-     * @return string
-     */
-    public function serialize() {
-
-        $str = "BEGIN:" . $this->name . "\r\n";
-
-        /**
-         * Gives a component a 'score' for sorting purposes.
-         *
-         * This is solely used by the childrenSort method.
-         *
-         * A higher score means the item will be lower in the list.
-         * To avoid score collisions, each "score category" has a reasonable
-         * space to accomodate elements. The $key is added to the $score to
-         * preserve the original relative order of elements.
-         *
-         * @param int $key
-         * @param array $array
-         * @return int
-         */
-        $sortScore = function($key, $array) {
-
-            if ($array[$key] instanceof Component) {
-
-                // We want to encode VTIMEZONE first, this is a personal
-                // preference.
-                if ($array[$key]->name === 'VTIMEZONE') {
-                    $score=300000000;
-                    return $score+$key;
-                } else {
-                    $score=400000000;
-                    return $score+$key;
-                }
-            } else {
-                // Properties get encoded first
-                // VCARD version 4.0 wants the VERSION property to appear first
-                if ($array[$key] instanceof Property) {
-                    if ($array[$key]->name === 'VERSION') {
-                        $score=100000000;
-                        return $score+$key;
-                    } else {
-                        // All other properties
-                        $score=200000000;
-                        return $score+$key;
-                    }
-                }
-            }
-
-        };
-
-        $tmp = $this->children;
-        uksort($this->children, function($a, $b) use ($sortScore, $tmp) {
-
-            $sA = $sortScore($a, $tmp);
-            $sB = $sortScore($b, $tmp);
-
-            if ($sA === $sB) return 0;
-
-            return ($sA < $sB) ? -1 : 1;
-
-        });
-
-        foreach($this->children as $child) $str.=$child->serialize();
-        $str.= "END:" . $this->name . "\r\n";
-
-        return $str;
-
-    }
-
-    /**
-     * Adds a new component or element
-     *
-     * You can call this method with the following syntaxes:
-     *
-     * add(Node $node)
-     * add(string $name, $value, array $parameters = array())
-     *
-     * The first version adds an Element
-     * The second adds a property as a string.
-     *
-     * @param mixed $item
-     * @param mixed $itemValue
-     * @return void
-     */
-    public function add($item, $itemValue = null, array $parameters = array()) {
-
-        if ($item instanceof Node) {
-            if (!is_null($itemValue)) {
-                throw new \InvalidArgumentException('The second argument must not be specified, when passing a VObject Node');
-            }
-            $item->parent = $this;
-            $this->children[] = $item;
-        } elseif(is_string($item)) {
-
-            $item = Property::create($item,$itemValue, $parameters);
-            $item->parent = $this;
-            $this->children[] = $item;
-
-        } else {
-
-            throw new \InvalidArgumentException('The first argument must either be a \\Sabre\\VObject\\Node or a string');
-
-        }
-
-    }
-
-    /**
-     * Returns an iterable list of children
-     *
-     * @return ElementList
-     */
-    public function children() {
-
-        return new ElementList($this->children);
-
-    }
-
-    /**
-     * Returns an array with elements that match the specified name.
-     *
-     * This function is also aware of MIME-Directory groups (as they appear in
-     * vcards). This means that if a property is grouped as "HOME.EMAIL", it
-     * will also be returned when searching for just "EMAIL". If you want to
-     * search for a property in a specific group, you can select on the entire
-     * string ("HOME.EMAIL"). If you want to search on a specific property that
-     * has not been assigned a group, specify ".EMAIL".
-     *
-     * Keys are retained from the 'children' array, which may be confusing in
-     * certain cases.
-     *
-     * @param string $name
-     * @return array
-     */
-    public function select($name) {
-
-        $group = null;
-        $name = strtoupper($name);
-        if (strpos($name,'.')!==false) {
-            list($group,$name) = explode('.', $name, 2);
-        }
-
-        $result = array();
-        foreach($this->children as $key=>$child) {
-
-            if (
-                strtoupper($child->name) === $name &&
-                (is_null($group) || ( $child instanceof Property && strtoupper($child->group) === $group))
-            ) {
-
-                $result[$key] = $child;
-
-            }
-        }
-
-        reset($result);
-        return $result;
-
-    }
-
-    /**
-     * This method only returns a list of sub-components. Properties are
-     * ignored.
-     *
-     * @return array
-     */
-    public function getComponents() {
-
-        $result = array();
-        foreach($this->children as $child) {
-            if ($child instanceof Component) {
-                $result[] = $child;
-            }
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * Validates the node for correctness.
-     *
-     * The following options are supported:
-     *   - Node::REPAIR - If something is broken, and automatic repair may
-     *                    be attempted.
-     *
-     * An array is returned with warnings.
-     *
-     * Every item in the array has the following properties:
-     *    * level - (number between 1 and 3 with severity information)
-     *    * message - (human readable message)
-     *    * node - (reference to the offending node)
-     *
-     * @param int $options
-     * @return array
-     */
-    public function validate($options = 0) {
-
-        $result = array();
-        foreach($this->children as $child) {
-            $result = array_merge($result, $child->validate($options));
-        }
-        return $result;
-
-    }
-
-    /* Magic property accessors {{{ */
-
-    /**
-     * Using 'get' you will either get a property or component,
-     *
-     * If there were no child-elements found with the specified name,
-     * null is returned.
-     *
-     * @param string $name
-     * @return Property
-     */
-    public function __get($name) {
-
-        $matches = $this->select($name);
-        if (count($matches)===0) {
-            return null;
-        } else {
-            $firstMatch = current($matches);
-            /** @var $firstMatch Property */
-            $firstMatch->setIterator(new ElementList(array_values($matches)));
-            return $firstMatch;
-        }
-
-    }
-
-    /**
-     * This method checks if a sub-element with the specified name exists.
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function __isset($name) {
-
-        $matches = $this->select($name);
-        return count($matches)>0;
-
-    }
-
-    /**
-     * Using the setter method you can add properties or subcomponents
-     *
-     * You can either pass a Component, Property
-     * object, or a string to automatically create a Property.
-     *
-     * If the item already exists, it will be removed. If you want to add
-     * a new item with the same name, always use the add() method.
-     *
-     * @param string $name
-     * @param mixed $value
-     * @return void
-     */
-    public function __set($name, $value) {
-
-        $matches = $this->select($name);
-        $overWrite = count($matches)?key($matches):null;
-
-        if ($value instanceof Component || $value instanceof Property) {
-            $value->parent = $this;
-            if (!is_null($overWrite)) {
-                $this->children[$overWrite] = $value;
-            } else {
-                $this->children[] = $value;
-            }
-        } elseif (is_scalar($value)) {
-            $property = Property::create($name,$value);
-            $property->parent = $this;
-            if (!is_null($overWrite)) {
-                $this->children[$overWrite] = $property;
-            } else {
-                $this->children[] = $property;
-            }
-        } else {
-            throw new \InvalidArgumentException('You must pass a \\Sabre\\VObject\\Component, \\Sabre\\VObject\\Property or scalar type');
-        }
-
-    }
-
-    /**
-     * Removes all properties and components within this component.
-     *
-     * @param string $name
-     * @return void
-     */
-    public function __unset($name) {
-
-        $matches = $this->select($name);
-        foreach($matches as $k=>$child) {
-
-            unset($this->children[$k]);
-            $child->parent = null;
-
-        }
-
-    }
-
-    /* }}} */
-
-    /**
-     * This method is automatically called when the object is cloned.
-     * Specifically, this will ensure all child elements are also cloned.
-     *
-     * @return void
-     */
-    public function __clone() {
-
-        foreach($this->children as $key=>$child) {
-            $this->children[$key] = clone $child;
-            $this->children[$key]->parent = $this;
-        }
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VAlarm.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VAlarm.php
deleted file mode 100644
index f119fffe08..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VAlarm.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Component;
-use Sabre\VObject;
-
-/**
- * VAlarm component
- *
- * This component contains some additional functionality specific for VALARMs.
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class VAlarm extends VObject\Component {
-
-    /**
-     * Returns a DateTime object when this alarm is going to trigger.
-     *
-     * This ignores repeated alarm, only the first trigger is returned.
-     *
-     * @return DateTime
-     */
-    public function getEffectiveTriggerTime() {
-
-        $trigger = $this->TRIGGER;
-        if(!isset($trigger['VALUE']) || strtoupper($trigger['VALUE']) === 'DURATION') {
-            $triggerDuration = VObject\DateTimeParser::parseDuration($this->TRIGGER);
-            $related = (isset($trigger['RELATED']) && strtoupper($trigger['RELATED']) == 'END') ? 'END' : 'START';
-
-            $parentComponent = $this->parent;
-            if ($related === 'START') {
-
-                if ($parentComponent->name === 'VTODO') {
-                    $propName = 'DUE';
-                } else {
-                    $propName = 'DTSTART';
-                }
-
-                $effectiveTrigger = clone $parentComponent->$propName->getDateTime();
-                $effectiveTrigger->add($triggerDuration);
-            } else {
-                if ($parentComponent->name === 'VTODO') {
-                    $endProp = 'DUE';
-                } elseif ($parentComponent->name === 'VEVENT') {
-                    $endProp = 'DTEND';
-                } else {
-                    throw new \LogicException('time-range filters on VALARM components are only supported when they are a child of VTODO or VEVENT');
-                }
-
-                if (isset($parentComponent->$endProp)) {
-                    $effectiveTrigger = clone $parentComponent->$endProp->getDateTime();
-                    $effectiveTrigger->add($triggerDuration);
-                } elseif (isset($parentComponent->DURATION)) {
-                    $effectiveTrigger = clone $parentComponent->DTSTART->getDateTime();
-                    $duration = VObject\DateTimeParser::parseDuration($parentComponent->DURATION);
-                    $effectiveTrigger->add($duration);
-                    $effectiveTrigger->add($triggerDuration);
-                } else {
-                    $effectiveTrigger = clone $parentComponent->DTSTART->getDateTime();
-                    $effectiveTrigger->add($triggerDuration);
-                }
-            }
-        } else {
-            $effectiveTrigger = $trigger->getDateTime();
-        }
-        return $effectiveTrigger;
-
-    }
-
-    /**
-     * Returns true or false depending on if the event falls in the specified
-     * time-range. This is used for filtering purposes.
-     *
-     * The rules used to determine if an event falls within the specified
-     * time-range is based on the CalDAV specification.
-     *
-     * @param \DateTime $start
-     * @param \DateTime $end
-     * @return bool
-     */
-    public function isInTimeRange(\DateTime $start, \DateTime $end) {
-
-        $effectiveTrigger = $this->getEffectiveTriggerTime();
-
-        if (isset($this->DURATION)) {
-            $duration = VObject\DateTimeParser::parseDuration($this->DURATION);
-            $repeat = (string)$this->repeat;
-            if (!$repeat) {
-                $repeat = 1;
-            }
-
-            $period = new \DatePeriod($effectiveTrigger, $duration, (int)$repeat);
-
-            foreach($period as $occurrence) {
-
-                if ($start <= $occurrence && $end > $occurrence) {
-                    return true;
-                }
-            }
-            return false;
-        } else {
-            return ($start <= $effectiveTrigger && $end > $effectiveTrigger);
-        }
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VCalendar.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VCalendar.php
deleted file mode 100644
index 8eeae8f22d..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VCalendar.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Component;
-
-use Sabre\VObject;
-
-/**
- * The VCalendar component
- *
- * This component adds functionality to a component, specific for a VCALENDAR.
- * 
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class VCalendar extends VObject\Component {
-
-    /**
-     * Returns a list of all 'base components'. For instance, if an Event has 
-     * a recurrence rule, and one instance is overridden, the overridden event 
-     * will have the same UID, but will be excluded from this list.
-     *
-     * VTIMEZONE components will always be excluded. 
-     *
-     * @param string $componentName filter by component name 
-     * @return array 
-     */
-    public function getBaseComponents($componentName = null) {
-
-        $components = array();
-        foreach($this->children as $component) {
-
-            if (!$component instanceof VObject\Component)
-                continue;
-
-            if (isset($component->{'RECURRENCE-ID'})) 
-                continue;
-
-            if ($componentName && $component->name !== strtoupper($componentName)) 
-                continue;
-
-            if ($component->name === 'VTIMEZONE')
-                continue;
-
-            $components[] = $component;
-
-        }
-
-        return $components;
-
-    }
-
-    /**
-     * If this calendar object, has events with recurrence rules, this method 
-     * can be used to expand the event into multiple sub-events.
-     *
-     * Each event will be stripped from it's recurrence information, and only 
-     * the instances of the event in the specified timerange will be left 
-     * alone.
-     *
-     * In addition, this method will cause timezone information to be stripped, 
-     * and normalized to UTC.
-     *
-     * This method will alter the VCalendar. This cannot be reversed.
-     *
-     * This functionality is specifically used by the CalDAV standard. It is 
-     * possible for clients to request expand events, if they are rather simple 
-     * clients and do not have the possibility to calculate recurrences.
-     *
-     * @param DateTime $start
-     * @param DateTime $end 
-     * @return void
-     */
-    public function expand(\DateTime $start, \DateTime $end) {
-
-        $newEvents = array();
-
-        foreach($this->select('VEVENT') as $key=>$vevent) {
-
-            if (isset($vevent->{'RECURRENCE-ID'})) {
-                unset($this->children[$key]);
-                continue;
-            } 
-
-
-            if (!$vevent->rrule) {
-                unset($this->children[$key]);
-                if ($vevent->isInTimeRange($start, $end)) {
-                    $newEvents[] = $vevent;
-                }
-                continue;
-            }
-
-            $uid = (string)$vevent->uid;
-            if (!$uid) {
-                throw new \LogicException('Event did not have a UID!');
-            }
-
-            $it = new VObject\RecurrenceIterator($this, $vevent->uid);
-            $it->fastForward($start);
-
-            while($it->valid() && $it->getDTStart() < $end) {
-
-                if ($it->getDTEnd() > $start) {
-
-                    $newEvents[] = $it->getEventObject();
-
-                }
-                $it->next();
-
-            }
-            unset($this->children[$key]);
-
-        }
-
-        foreach($newEvents as $newEvent) {
-
-            foreach($newEvent->children as $child) {
-                if ($child instanceof VObject\Property\DateTime &&
-                    $child->getDateType() == VObject\Property\DateTime::LOCALTZ) {
-                        $child->setDateTime($child->getDateTime(),VObject\Property\DateTime::UTC);
-                    }
-            }
-
-            $this->add($newEvent);
-
-        }
-
-        // Removing all VTIMEZONE components
-        unset($this->VTIMEZONE);
-
-    } 
-
-    /**
-     * Validates the node for correctness.
-     * An array is returned with warnings.
-     *
-     * Every item in the array has the following properties:
-     *    * level - (number between 1 and 3 with severity information)
-     *    * message - (human readable message)
-     *    * node - (reference to the offending node)
-     * 
-     * @return array 
-     */
-    /*
-    public function validate() {
-
-        $warnings = array();
-
-        $version = $this->select('VERSION');
-        if (count($version)!==1) {
-            $warnings[] = array(
-                'level' => 1,
-                'message' => 'The VERSION property must appear in the VCALENDAR component exactly 1 time',
-                'node' => $this,
-            );
-        } else {
-            if ((string)$this->VERSION !== '2.0') {
-                $warnings[] = array(
-                    'level' => 1,
-                    'message' => 'Only iCalendar version 2.0 as defined in rfc5545 is supported.',
-                    'node' => $this,
-                );
-            }
-        } 
-        $version = $this->select('PRODID');
-        if (count($version)!==1) {
-            $warnings[] = array(
-                'level' => 2,
-                'message' => 'The PRODID property must appear in the VCALENDAR component exactly 1 time',
-                'node' => $this,
-            );
-        }
-        if (count($this->CALSCALE) > 1) {
-            $warnings[] = array(
-                'level' => 2,
-                'message' => 'The CALSCALE property must not be specified more than once.',
-                'node' => $this,
-            );
-        }
-        if (count($this->METHOD) > 1) {
-            $warnings[] = array(
-                'level' => 2,
-                'message' => 'The METHOD property must not be specified more than once.',
-                'node' => $this,
-            );
-        }
-
-        $allowedComponents = array(
-            'VEVENT',
-            'VTODO',
-            'VJOURNAL',
-            'VFREEBUSY',
-            'VTIMEZONE',
-        );
-        $allowedProperties = array(
-            'PRODID',
-            'VERSION',
-            'CALSCALE',
-            'METHOD',
-        );
-        $componentsFound = 0;
-        foreach($this->children as $child) {
-            if($child instanceof Component) {
-                $componentsFound++;
-                if (!in_array($child->name, $allowedComponents)) {
-                    $warnings[] = array(
-                        'level' => 1,
-                        'message' => 'The ' . $child->name . " component is not allowed in the VCALENDAR component",
-                        'node' => $this,
-                    );
-                }
-            }
-            if ($child instanceof Property) {
-                if (!in_array($child->name, $allowedProperties)) {
-                    $warnings[] = array(
-                        'level' => 2,
-                        'message' => 'The ' . $child->name . " property is not allowed in the VCALENDAR component",
-                        'node' => $this,
-                    );
-                }
-            }
-        }
-
-        if ($componentsFound===0) {
-            $warnings[] = array(
-                'level' => 1,
-                'message' => 'An iCalendar object must have at least 1 component.',
-                'node' => $this,
-            );
-        }
-
-        return array_merge(
-            $warnings,
-            parent::validate()
-        );
-
-    }
-     */
-
-}
-
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VCard.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VCard.php
deleted file mode 100644
index 2e9432d1a7..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VCard.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Component;
-
-use Sabre\VObject;
-
-/**
- * The VCard component
- *
- * This component represents the BEGIN:VCARD and END:VCARD found in every
- * vcard.
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class VCard extends VObject\Component {
-
-    /**
-     * VCards with version 2.1, 3.0 and 4.0 are found.
-     *
-     * If the VCARD doesn't know its version, 4.0 is assumed.
-     */
-    const DEFAULT_VERSION = '4.0';
-
-    /**
-     * Validates the node for correctness.
-     *
-     * The following options are supported:
-     *   - Node::REPAIR - If something is broken, and automatic repair may
-     *                    be attempted.
-     *
-     * An array is returned with warnings.
-     *
-     * Every item in the array has the following properties:
-     *    * level - (number between 1 and 3 with severity information)
-     *    * message - (human readable message)
-     *    * node - (reference to the offending node)
-     *
-     * @param int $options
-     * @return array
-     */
-    public function validate($options = 0) {
-
-        $warnings = array();
-
-        $version = $this->select('VERSION');
-        if (count($version)!==1) {
-            $warnings[] = array(
-                'level' => 1,
-                'message' => 'The VERSION property must appear in the VCARD component exactly 1 time',
-                'node' => $this,
-            );
-            if ($options & self::REPAIR) {
-                $this->VERSION = self::DEFAULT_VERSION;
-            }
-        } else {
-            $version = (string)$this->VERSION;
-            if ($version!=='2.1' && $version!=='3.0' && $version!=='4.0') {
-                $warnings[] = array(
-                    'level' => 1,
-                    'message' => 'Only vcard version 4.0 (RFC6350), version 3.0 (RFC2426) or version 2.1 (icm-vcard-2.1) are supported.',
-                    'node' => $this,
-                );
-                if ($options & self::REPAIR) {
-                    $this->VERSION = '4.0';
-                }
-            }
-
-        }
-        $fn = $this->select('FN');
-        if (count($fn)!==1) {
-            $warnings[] = array(
-                'level' => 1,
-                'message' => 'The FN property must appear in the VCARD component exactly 1 time',
-                'node' => $this,
-            );
-            if (($options & self::REPAIR) && count($fn) === 0) {
-                // We're going to try to see if we can use the contents of the
-                // N property.
-                if (isset($this->N)) {
-                    $value = explode(';', (string)$this->N);
-                    if (isset($value[1]) && $value[1]) {
-                        $this->FN = $value[1] . ' ' . $value[0];
-                    } else {
-                        $this->FN = $value[0];
-                    }
-
-                // Otherwise, the ORG property may work
-                } elseif (isset($this->ORG)) {
-                    $this->FN = (string)$this->ORG;
-                }
-
-            }
-        }
-
-        return array_merge(
-            parent::validate($options),
-            $warnings
-        );
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VEvent.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VEvent.php
deleted file mode 100644
index fc6331894f..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VEvent.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Component;
-use Sabre\VObject;
-
-/**
- * VEvent component
- *
- * This component contains some additional functionality specific for VEVENT's.
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class VEvent extends VObject\Component {
-
-    /**
-     * Returns true or false depending on if the event falls in the specified
-     * time-range. This is used for filtering purposes.
-     *
-     * The rules used to determine if an event falls within the specified
-     * time-range is based on the CalDAV specification.
-     *
-     * @param \DateTime $start
-     * @param \DateTime $end
-     * @return bool
-     */
-    public function isInTimeRange(\DateTime $start, \DateTime $end) {
-
-        if ($this->RRULE) {
-            $it = new VObject\RecurrenceIterator($this);
-            $it->fastForward($start);
-
-            // We fast-forwarded to a spot where the end-time of the
-            // recurrence instance exceeded the start of the requested
-            // time-range.
-            //
-            // If the starttime of the recurrence did not exceed the
-            // end of the time range as well, we have a match.
-            return ($it->getDTStart() < $end && $it->getDTEnd() > $start);
-
-        }
-
-        $effectiveStart = $this->DTSTART->getDateTime();
-        if (isset($this->DTEND)) {
-
-            // The DTEND property is considered non inclusive. So for a 3 day
-            // event in july, dtstart and dtend would have to be July 1st and
-            // July 4th respectively.
-            //
-            // See:
-            // http://tools.ietf.org/html/rfc5545#page-54
-            $effectiveEnd = $this->DTEND->getDateTime();
-
-        } elseif (isset($this->DURATION)) {
-            $effectiveEnd = clone $effectiveStart;
-            $effectiveEnd->add( VObject\DateTimeParser::parseDuration($this->DURATION) );
-        } elseif ($this->DTSTART->getDateType() == VObject\Property\DateTime::DATE) {
-            $effectiveEnd = clone $effectiveStart;
-            $effectiveEnd->modify('+1 day');
-        } else {
-            $effectiveEnd = clone $effectiveStart;
-        }
-        return (
-            ($start <= $effectiveEnd) && ($end > $effectiveStart)
-        );
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VFreeBusy.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VFreeBusy.php
deleted file mode 100644
index df48bce28d..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VFreeBusy.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Component;
-
-use Sabre\VObject;
-
-/**
- * The VFreeBusy component
- *
- * This component adds functionality to a component, specific for VFREEBUSY
- * components.
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class VFreeBusy extends VObject\Component {
-
-    /**
-     * Checks based on the contained FREEBUSY information, if a timeslot is
-     * available.
-     *
-     * @param DateTime $start
-     * @param Datetime $end
-     * @return bool
-     */
-    public function isFree(\DateTime $start, \Datetime $end) {
-
-        foreach($this->select('FREEBUSY') as $freebusy) {
-
-            // We are only interested in FBTYPE=BUSY (the default),
-            // FBTYPE=BUSY-TENTATIVE or FBTYPE=BUSY-UNAVAILABLE.
-            if (isset($freebusy['FBTYPE']) && strtoupper(substr((string)$freebusy['FBTYPE'],0,4))!=='BUSY') {
-                continue;
-            }
-
-            // The freebusy component can hold more than 1 value, separated by
-            // commas.
-            $periods = explode(',', (string)$freebusy);
-
-            foreach($periods as $period) {
-                // Every period is formatted as [start]/[end]. The start is an
-                // absolute UTC time, the end may be an absolute UTC time, or
-                // duration (relative) value.
-                list($busyStart, $busyEnd) = explode('/', $period);
-
-                $busyStart = VObject\DateTimeParser::parse($busyStart);
-                $busyEnd = VObject\DateTimeParser::parse($busyEnd);
-                if ($busyEnd instanceof \DateInterval) {
-                    $tmp = clone $busyStart;
-                    $tmp->add($busyEnd);
-                    $busyEnd = $tmp;
-                }
-
-                if($start < $busyEnd && $end > $busyStart) {
-                    return false;
-                }
-
-            }
-
-        }
-
-        return true;
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VJournal.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VJournal.php
deleted file mode 100644
index 2306123d98..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VJournal.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Component;
-
-use Sabre\VObject;
-
-/**
- * VJournal component
- *
- * This component contains some additional functionality specific for VJOURNALs.
- * 
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class VJournal extends VObject\Component {
-
-    /**
-     * Returns true or false depending on if the event falls in the specified 
-     * time-range. This is used for filtering purposes. 
-     *
-     * The rules used to determine if an event falls within the specified 
-     * time-range is based on the CalDAV specification.
-     *
-     * @param DateTime $start
-     * @param DateTime $end 
-     * @return bool 
-     */
-    public function isInTimeRange(\DateTime $start, \DateTime $end) {
-
-        $dtstart = isset($this->DTSTART)?$this->DTSTART->getDateTime():null;
-        if ($dtstart) {
-            $effectiveEnd = clone $dtstart;
-            if ($this->DTSTART->getDateType() == VObject\Property\DateTime::DATE) {
-                $effectiveEnd->modify('+1 day');
-            }
-
-            return ($start <= $effectiveEnd && $end > $dtstart);
-
-        }
-        return false;
-
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VTodo.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VTodo.php
deleted file mode 100644
index a2c6038dc4..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Component/VTodo.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Component;
-
-use Sabre\VObject;
-
-/**
- * VTodo component
- *
- * This component contains some additional functionality specific for VTODOs.
- * 
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class VTodo extends VObject\Component {
-
-    /**
-     * Returns true or false depending on if the event falls in the specified 
-     * time-range. This is used for filtering purposes. 
-     *
-     * The rules used to determine if an event falls within the specified 
-     * time-range is based on the CalDAV specification.
-     *
-     * @param DateTime $start
-     * @param DateTime $end 
-     * @return bool 
-     */
-    public function isInTimeRange(\DateTime $start, \DateTime $end) {
-
-        $dtstart = isset($this->DTSTART)?$this->DTSTART->getDateTime():null;
-        $duration = isset($this->DURATION)?VObject\DateTimeParser::parseDuration($this->DURATION):null;
-        $due = isset($this->DUE)?$this->DUE->getDateTime():null;
-        $completed = isset($this->COMPLETED)?$this->COMPLETED->getDateTime():null;
-        $created = isset($this->CREATED)?$this->CREATED->getDateTime():null;
-
-        if ($dtstart) {
-            if ($duration) {
-                $effectiveEnd = clone $dtstart;
-                $effectiveEnd->add($duration);
-                return $start <= $effectiveEnd && $end > $dtstart;
-            } elseif ($due) {
-                return
-                    ($start < $due || $start <= $dtstart) &&
-                    ($end > $dtstart || $end >= $due);
-            } else {
-                return $start <= $dtstart && $end > $dtstart;
-            }
-        }
-        if ($due) {
-            return ($start < $due && $end >= $due);
-        }
-        if ($completed && $created) {
-            return
-                ($start <= $created || $start <= $completed) &&
-                ($end >= $created || $end >= $completed);
-        }
-        if ($completed) {
-            return ($start <= $completed && $end >= $completed);
-        }
-        if ($created) {
-            return ($end > $created);
-        }
-        return true;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/DateTimeParser.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/DateTimeParser.php
deleted file mode 100644
index 31a7fc47d6..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/DateTimeParser.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-/**
- * DateTimeParser
- *
- * This class is responsible for parsing the several different date and time
- * formats iCalendar and vCards have.
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class DateTimeParser {
-
-    /**
-     * Parses an iCalendar (rfc5545) formatted datetime and returns a DateTime object
-     *
-     * Specifying a reference timezone is optional. It will only be used
-     * if the non-UTC format is used. The argument is used as a reference, the
-     * returned DateTime object will still be in the UTC timezone.
-     *
-     * @param string $dt
-     * @param DateTimeZone $tz
-     * @return DateTime
-     */
-    static public function parseDateTime($dt,\DateTimeZone $tz = null) {
-
-        // Format is YYYYMMDD + "T" + hhmmss
-        $result = preg_match('/^([1-4][0-9]{3})([0-1][0-9])([0-3][0-9])T([0-2][0-9])([0-5][0-9])([0-5][0-9])([Z]?)$/',$dt,$matches);
-
-        if (!$result) {
-            throw new \LogicException('The supplied iCalendar datetime value is incorrect: ' . $dt);
-        }
-
-        if ($matches[7]==='Z' || is_null($tz)) {
-            $tz = new \DateTimeZone('UTC');
-        }
-        $date = new \DateTime($matches[1] . '-' . $matches[2] . '-' . $matches[3] . ' ' . $matches[4] . ':' . $matches[5] .':' . $matches[6], $tz);
-
-        // Still resetting the timezone, to normalize everything to UTC
-        $date->setTimeZone(new \DateTimeZone('UTC'));
-        return $date;
-
-    }
-
-    /**
-     * Parses an iCalendar (rfc5545) formatted date and returns a DateTime object
-     *
-     * @param string $date
-     * @return DateTime
-     */
-    static public function parseDate($date) {
-
-        // Format is YYYYMMDD
-        $result = preg_match('/^([1-4][0-9]{3})([0-1][0-9])([0-3][0-9])$/',$date,$matches);
-
-        if (!$result) {
-            throw new \LogicException('The supplied iCalendar date value is incorrect: ' . $date);
-        }
-
-        $date = new \DateTime($matches[1] . '-' . $matches[2] . '-' . $matches[3], new \DateTimeZone('UTC'));
-        return $date;
-
-    }
-
-    /**
-     * Parses an iCalendar (RFC5545) formatted duration value.
-     *
-     * This method will either return a DateTimeInterval object, or a string
-     * suitable for strtotime or DateTime::modify.
-     *
-     * @param string $duration
-     * @param bool $asString
-     * @return DateInterval|string
-     */
-    static public function parseDuration($duration, $asString = false) {
-
-        $result = preg_match('/^(?P<plusminus>\+|-)?P((?P<week>\d+)W)?((?P<day>\d+)D)?(T((?P<hour>\d+)H)?((?P<minute>\d+)M)?((?P<second>\d+)S)?)?$/', $duration, $matches);
-        if (!$result) {
-            throw new \LogicException('The supplied iCalendar duration value is incorrect: ' . $duration);
-        }
-
-        if (!$asString) {
-            $invert = false;
-            if ($matches['plusminus']==='-') {
-                $invert = true;
-            }
-
-
-            $parts = array(
-                'week',
-                'day',
-                'hour',
-                'minute',
-                'second',
-            );
-            foreach($parts as $part) {
-                $matches[$part] = isset($matches[$part])&&$matches[$part]?(int)$matches[$part]:0;
-            }
-
-
-            // We need to re-construct the $duration string, because weeks and
-            // days are not supported by DateInterval in the same string.
-            $duration = 'P';
-            $days = $matches['day'];
-            if ($matches['week']) {
-                $days+=$matches['week']*7;
-            }
-            if ($days)
-                $duration.=$days . 'D';
-
-            if ($matches['minute'] || $matches['second'] || $matches['hour']) {
-                $duration.='T';
-
-                if ($matches['hour'])
-                    $duration.=$matches['hour'].'H';
-
-                if ($matches['minute'])
-                    $duration.=$matches['minute'].'M';
-
-                if ($matches['second'])
-                    $duration.=$matches['second'].'S';
-
-            }
-
-            if ($duration==='P') {
-                $duration = 'PT0S';
-            }
-            $iv = new \DateInterval($duration);
-            if ($invert) $iv->invert = true;
-
-            return $iv;
-
-        }
-
-
-
-        $parts = array(
-            'week',
-            'day',
-            'hour',
-            'minute',
-            'second',
-        );
-
-        $newDur = '';
-        foreach($parts as $part) {
-            if (isset($matches[$part]) && $matches[$part]) {
-                $newDur.=' '.$matches[$part] . ' ' . $part . 's';
-            }
-        }
-
-        $newDur = ($matches['plusminus']==='-'?'-':'+') . trim($newDur);
-        if ($newDur === '+') { $newDur = '+0 seconds'; };
-        return $newDur;
-
-    }
-
-    /**
-     * Parses either a Date or DateTime, or Duration value.
-     *
-     * @param string $date
-     * @param DateTimeZone|string $referenceTZ
-     * @return DateTime|DateInterval
-     */
-    static public function parse($date, $referenceTZ = null) {
-
-        if ($date[0]==='P' || ($date[0]==='-' && $date[1]==='P')) {
-            return self::parseDuration($date);
-        } elseif (strlen($date)===8) {
-            return self::parseDate($date);
-        } else {
-            return self::parseDateTime($date, $referenceTZ);
-        }
-
-    }
-
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/ElementList.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/ElementList.php
deleted file mode 100644
index 303faf40ae..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/ElementList.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-/**
- * VObject ElementList
- *
- * This class represents a list of elements. Lists are the result of queries,
- * such as doing $vcalendar->vevent where there's multiple VEVENT objects.
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class ElementList implements \Iterator, \Countable, \ArrayAccess {
-
-    /**
-     * Inner elements
-     *
-     * @var array
-     */
-    protected $elements = array();
-
-    /**
-     * Creates the element list.
-     *
-     * @param array $elements
-     */
-    public function __construct(array $elements) {
-
-        $this->elements = $elements;
-
-    }
-
-    /* {{{ Iterator interface */
-
-    /**
-     * Current position
-     *
-     * @var int
-     */
-    private $key = 0;
-
-    /**
-     * Returns current item in iteration
-     *
-     * @return Element
-     */
-    public function current() {
-
-        return $this->elements[$this->key];
-
-    }
-
-    /**
-     * To the next item in the iterator
-     *
-     * @return void
-     */
-    public function next() {
-
-        $this->key++;
-
-    }
-
-    /**
-     * Returns the current iterator key
-     *
-     * @return int
-     */
-    public function key() {
-
-        return $this->key;
-
-    }
-
-    /**
-     * Returns true if the current position in the iterator is a valid one
-     *
-     * @return bool
-     */
-    public function valid() {
-
-        return isset($this->elements[$this->key]);
-
-    }
-
-    /**
-     * Rewinds the iterator
-     *
-     * @return void
-     */
-    public function rewind() {
-
-        $this->key = 0;
-
-    }
-
-    /* }}} */
-
-    /* {{{ Countable interface */
-
-    /**
-     * Returns the number of elements
-     *
-     * @return int
-     */
-    public function count() {
-
-        return count($this->elements);
-
-    }
-
-    /* }}} */
-
-    /* {{{ ArrayAccess Interface */
-
-
-    /**
-     * Checks if an item exists through ArrayAccess.
-     *
-     * @param int $offset
-     * @return bool
-     */
-    public function offsetExists($offset) {
-
-        return isset($this->elements[$offset]);
-
-    }
-
-    /**
-     * Gets an item through ArrayAccess.
-     *
-     * @param int $offset
-     * @return mixed
-     */
-    public function offsetGet($offset) {
-
-        return $this->elements[$offset];
-
-    }
-
-    /**
-     * Sets an item through ArrayAccess.
-     *
-     * @param int $offset
-     * @param mixed $value
-     * @return void
-     */
-    public function offsetSet($offset,$value) {
-
-        throw new \LogicException('You can not add new objects to an ElementList');
-
-    }
-
-    /**
-     * Sets an item through ArrayAccess.
-     *
-     * This method just forwards the request to the inner iterator
-     *
-     * @param int $offset
-     * @return void
-     */
-    public function offsetUnset($offset) {
-
-        throw new \LogicException('You can not remove objects from an ElementList');
-
-    }
-
-    /* }}} */
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/FreeBusyGenerator.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/FreeBusyGenerator.php
deleted file mode 100644
index 7a17f6ea6d..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/FreeBusyGenerator.php
+++ /dev/null
@@ -1,322 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-/**
- * This class helps with generating FREEBUSY reports based on existing sets of
- * objects.
- *
- * It only looks at VEVENT and VFREEBUSY objects from the sourcedata, and
- * generates a single VFREEBUSY object.
- *
- * VFREEBUSY components are described in RFC5545, The rules for what should
- * go in a single freebusy report is taken from RFC4791, section 7.10.
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class FreeBusyGenerator {
-
-    /**
-     * Input objects
-     *
-     * @var array
-     */
-    protected $objects;
-
-    /**
-     * Start of range
-     *
-     * @var DateTime|null
-     */
-    protected $start;
-
-    /**
-     * End of range
-     *
-     * @var DateTime|null
-     */
-    protected $end;
-
-    /**
-     * VCALENDAR object
-     *
-     * @var Component
-     */
-    protected $baseObject;
-
-    /**
-     * Creates the generator.
-     *
-     * Check the setTimeRange and setObjects methods for details about the
-     * arguments.
-     *
-     * @param DateTime $start
-     * @param DateTime $end
-     * @param mixed $objects
-     * @return void
-     */
-    public function __construct(\DateTime $start = null, \DateTime $end = null, $objects = null) {
-
-        if ($start && $end) {
-            $this->setTimeRange($start, $end);
-        }
-
-        if ($objects) {
-            $this->setObjects($objects);
-        }
-
-    }
-
-    /**
-     * Sets the VCALENDAR object.
-     *
-     * If this is set, it will not be generated for you. You are responsible
-     * for setting things like the METHOD, CALSCALE, VERSION, etc..
-     *
-     * The VFREEBUSY object will be automatically added though.
-     *
-     * @param Component $vcalendar
-     * @return void
-     */
-    public function setBaseObject(Component $vcalendar) {
-
-        $this->baseObject = $vcalendar;
-
-    }
-
-    /**
-     * Sets the input objects
-     *
-     * You must either specify a valendar object as a strong, or as the parse
-     * Component.
-     * It's also possible to specify multiple objects as an array.
-     *
-     * @param mixed $objects
-     * @return void
-     */
-    public function setObjects($objects) {
-
-        if (!is_array($objects)) {
-            $objects = array($objects);
-        }
-
-        $this->objects = array();
-        foreach($objects as $object) {
-
-            if (is_string($object)) {
-                $this->objects[] = Reader::read($object);
-            } elseif ($object instanceof Component) {
-                $this->objects[] = $object;
-            } else {
-                throw new \InvalidArgumentException('You can only pass strings or \\Sabre\\VObject\\Component arguments to setObjects');
-            }
-
-        }
-
-    }
-
-    /**
-     * Sets the time range
-     *
-     * Any freebusy object falling outside of this time range will be ignored.
-     *
-     * @param DateTime $start
-     * @param DateTime $end
-     * @return void
-     */
-    public function setTimeRange(\DateTime $start = null, \DateTime $end = null) {
-
-        $this->start = $start;
-        $this->end = $end;
-
-    }
-
-    /**
-     * Parses the input data and returns a correct VFREEBUSY object, wrapped in
-     * a VCALENDAR.
-     *
-     * @return Component
-     */
-    public function getResult() {
-
-        $busyTimes = array();
-
-        foreach($this->objects as $object) {
-
-            foreach($object->getBaseComponents() as $component) {
-
-                switch($component->name) {
-
-                    case 'VEVENT' :
-
-                        $FBTYPE = 'BUSY';
-                        if (isset($component->TRANSP) && (strtoupper($component->TRANSP) === 'TRANSPARENT')) {
-                            break;
-                        }
-                        if (isset($component->STATUS)) {
-                            $status = strtoupper($component->STATUS);
-                            if ($status==='CANCELLED') {
-                                break;
-                            }
-                            if ($status==='TENTATIVE') {
-                                $FBTYPE = 'BUSY-TENTATIVE';
-                            }
-                        }
-
-                        $times = array();
-
-                        if ($component->RRULE) {
-
-                            $iterator = new RecurrenceIterator($object, (string)$component->uid);
-                            if ($this->start) {
-                                $iterator->fastForward($this->start);
-                            }
-
-                            $maxRecurrences = 200;
-
-                            while($iterator->valid() && --$maxRecurrences) {
-
-                                $startTime = $iterator->getDTStart();
-                                if ($this->end && $startTime > $this->end) {
-                                    break;
-                                }
-                                $times[] = array(
-                                    $iterator->getDTStart(),
-                                    $iterator->getDTEnd(),
-                                );
-
-                                $iterator->next();
-
-                            }
-
-                        } else {
-
-                            $startTime = $component->DTSTART->getDateTime();
-                            if ($this->end && $startTime > $this->end) {
-                                break;
-                            }
-                            $endTime = null;
-                            if (isset($component->DTEND)) {
-                                $endTime = $component->DTEND->getDateTime();
-                            } elseif (isset($component->DURATION)) {
-                                $duration = DateTimeParser::parseDuration((string)$component->DURATION);
-                                $endTime = clone $startTime;
-                                $endTime->add($duration);
-                            } elseif ($component->DTSTART->getDateType() === Property\DateTime::DATE) {
-                                $endTime = clone $startTime;
-                                $endTime->modify('+1 day');
-                            } else {
-                                // The event had no duration (0 seconds)
-                                break;
-                            }
-
-                            $times[] = array($startTime, $endTime);
-
-                        }
-
-                        foreach($times as $time) {
-
-                            if ($this->end && $time[0] > $this->end) break;
-                            if ($this->start && $time[1] < $this->start) break;
-
-                            $busyTimes[] = array(
-                                $time[0],
-                                $time[1],
-                                $FBTYPE,
-                            );
-                        }
-                        break;
-
-                    case 'VFREEBUSY' :
-                        foreach($component->FREEBUSY as $freebusy) {
-
-                            $fbType = isset($freebusy['FBTYPE'])?strtoupper($freebusy['FBTYPE']):'BUSY';
-
-                            // Skipping intervals marked as 'free'
-                            if ($fbType==='FREE')
-                                continue;
-
-                            $values = explode(',', $freebusy);
-                            foreach($values as $value) {
-                                list($startTime, $endTime) = explode('/', $value);
-                                $startTime = DateTimeParser::parseDateTime($startTime);
-
-                                if (substr($endTime,0,1)==='P' || substr($endTime,0,2)==='-P') {
-                                    $duration = DateTimeParser::parseDuration($endTime);
-                                    $endTime = clone $startTime;
-                                    $endTime->add($duration);
-                                } else {
-                                    $endTime = DateTimeParser::parseDateTime($endTime);
-                                }
-
-                                if($this->start && $this->start > $endTime) continue;
-                                if($this->end && $this->end < $startTime) continue;
-                                $busyTimes[] = array(
-                                    $startTime,
-                                    $endTime,
-                                    $fbType
-                                );
-
-                            }
-
-
-                        }
-                        break;
-
-
-
-                }
-
-
-            }
-
-        }
-
-        if ($this->baseObject) {
-            $calendar = $this->baseObject;
-        } else {
-            $calendar = Component::create('VCALENDAR');
-            $calendar->version = '2.0';
-            $calendar->prodid = '-//Sabre//Sabre VObject ' . Version::VERSION . '//EN';
-            $calendar->calscale = 'GREGORIAN';
-        }
-
-        $vfreebusy = Component::create('VFREEBUSY');
-        $calendar->add($vfreebusy);
-
-        if ($this->start) {
-            $dtstart = Property::create('DTSTART');
-            $dtstart->setDateTime($this->start,Property\DateTime::UTC);
-            $vfreebusy->add($dtstart);
-        }
-        if ($this->end) {
-            $dtend = Property::create('DTEND');
-            $dtend->setDateTime($this->end,Property\DateTime::UTC);
-            $vfreebusy->add($dtend);
-        }
-        $dtstamp = Property::create('DTSTAMP');
-        $dtstamp->setDateTime(new \DateTime('now'), Property\DateTime::UTC);
-        $vfreebusy->add($dtstamp);
-
-        foreach($busyTimes as $busyTime) {
-
-            $busyTime[0]->setTimeZone(new \DateTimeZone('UTC'));
-            $busyTime[1]->setTimeZone(new \DateTimeZone('UTC'));
-
-            $prop = Property::create(
-                'FREEBUSY',
-                $busyTime[0]->format('Ymd\\THis\\Z') . '/' . $busyTime[1]->format('Ymd\\THis\\Z')
-            );
-            $prop['FBTYPE'] = $busyTime[2];
-            $vfreebusy->add($prop);
-
-        }
-
-        return $calendar;
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Node.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Node.php
deleted file mode 100644
index 802abb8b1f..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Node.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-/**
- * Base class for all nodes
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-abstract class Node implements \IteratorAggregate, \ArrayAccess, \Countable {
-
-    /**
-     * The following constants are used by the validate() method.
-     */
-    const REPAIR = 1;
-
-    /**
-     * Turns the object back into a serialized blob.
-     *
-     * @return string
-     */
-    abstract function serialize();
-
-    /**
-     * Iterator override
-     *
-     * @var ElementList
-     */
-    protected $iterator = null;
-
-    /**
-     * A link to the parent node
-     *
-     * @var Node
-     */
-    public $parent = null;
-
-    /**
-     * Validates the node for correctness.
-     *
-     * The following options are supported:
-     *   - Node::REPAIR - If something is broken, and automatic repair may
-     *                    be attempted.
-     *
-     * An array is returned with warnings.
-     *
-     * Every item in the array has the following properties:
-     *    * level - (number between 1 and 3 with severity information)
-     *    * message - (human readable message)
-     *    * node - (reference to the offending node)
-     *
-     * @param int $options
-     * @return array
-     */
-    public function validate($options = 0) {
-
-        return array();
-
-    }
-
-    /* {{{ IteratorAggregator interface */
-
-    /**
-     * Returns the iterator for this object
-     *
-     * @return ElementList
-     */
-    public function getIterator() {
-
-        if (!is_null($this->iterator))
-            return $this->iterator;
-
-        return new ElementList(array($this));
-
-    }
-
-    /**
-     * Sets the overridden iterator
-     *
-     * Note that this is not actually part of the iterator interface
-     *
-     * @param ElementList $iterator
-     * @return void
-     */
-    public function setIterator(ElementList $iterator) {
-
-        $this->iterator = $iterator;
-
-    }
-
-    /* }}} */
-
-    /* {{{ Countable interface */
-
-    /**
-     * Returns the number of elements
-     *
-     * @return int
-     */
-    public function count() {
-
-        $it = $this->getIterator();
-        return $it->count();
-
-    }
-
-    /* }}} */
-
-    /* {{{ ArrayAccess Interface */
-
-
-    /**
-     * Checks if an item exists through ArrayAccess.
-     *
-     * This method just forwards the request to the inner iterator
-     *
-     * @param int $offset
-     * @return bool
-     */
-    public function offsetExists($offset) {
-
-        $iterator = $this->getIterator();
-        return $iterator->offsetExists($offset);
-
-    }
-
-    /**
-     * Gets an item through ArrayAccess.
-     *
-     * This method just forwards the request to the inner iterator
-     *
-     * @param int $offset
-     * @return mixed
-     */
-    public function offsetGet($offset) {
-
-        $iterator = $this->getIterator();
-        return $iterator->offsetGet($offset);
-
-    }
-
-    /**
-     * Sets an item through ArrayAccess.
-     *
-     * This method just forwards the request to the inner iterator
-     *
-     * @param int $offset
-     * @param mixed $value
-     * @return void
-     */
-    public function offsetSet($offset,$value) {
-
-        $iterator = $this->getIterator();
-        $iterator->offsetSet($offset,$value);
-
-    // @codeCoverageIgnoreStart
-    //
-    // This method always throws an exception, so we ignore the closing
-    // brace
-    }
-    // @codeCoverageIgnoreEnd
-
-    /**
-     * Sets an item through ArrayAccess.
-     *
-     * This method just forwards the request to the inner iterator
-     *
-     * @param int $offset
-     * @return void
-     */
-    public function offsetUnset($offset) {
-
-        $iterator = $this->getIterator();
-        $iterator->offsetUnset($offset);
-
-    // @codeCoverageIgnoreStart
-    //
-    // This method always throws an exception, so we ignore the closing
-    // brace
-    }
-    // @codeCoverageIgnoreEnd
-
-    /* }}} */
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Parameter.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Parameter.php
deleted file mode 100644
index ddfb5b3fcf..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Parameter.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-/**
- * VObject Parameter
- *
- * This class represents a parameter. A parameter is always tied to a property.
- * In the case of:
- *   DTSTART;VALUE=DATE:20101108
- * VALUE=DATE would be the parameter name and value.
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Parameter extends Node {
-
-    /**
-     * Parameter name
-     *
-     * @var string
-     */
-    public $name;
-
-    /**
-     * Parameter value
-     *
-     * @var string
-     */
-    public $value;
-
-    /**
-     * Sets up the object
-     *
-     * @param string $name
-     * @param string $value
-     */
-    public function __construct($name, $value = null) {
-
-        if (!is_scalar($value) && !is_null($value)) {
-            throw new \InvalidArgumentException('The value argument must be a scalar value or null');
-        }
-
-        $this->name = strtoupper($name);
-        $this->value = $value;
-
-    }
-
-    /**
-     * Turns the object back into a serialized blob.
-     *
-     * @return string
-     */
-    public function serialize() {
-
-        if (is_null($this->value)) {
-            return $this->name;
-        }
-        $src = array(
-            '\\',
-            "\n",
-            ';',
-            ',',
-        );
-        $out = array(
-            '\\\\',
-            '\n',
-            '\;',
-            '\,',
-        );
-
-        return $this->name . '=' . str_replace($src, $out, $this->value);
-
-    }
-
-    /**
-     * Called when this object is being cast to a string
-     *
-     * @return string
-     */
-    public function __toString() {
-
-        return $this->value;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/ParseException.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/ParseException.php
deleted file mode 100644
index f82613de35..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/ParseException.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-/**
- * Exception thrown by Reader if an invalid object was attempted to be parsed.
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class ParseException extends \Exception { }
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property.php
deleted file mode 100644
index 70f0e73eef..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property.php
+++ /dev/null
@@ -1,430 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-/**
- * VObject Property
- *
- * A property in VObject is usually in the form PARAMNAME:paramValue.
- * An example is : SUMMARY:Weekly meeting
- *
- * Properties can also have parameters:
- * SUMMARY;LANG=en:Weekly meeting.
- *
- * Parameters can be accessed using the ArrayAccess interface.
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Property extends Node {
-
-    /**
-     * Propertyname
-     *
-     * @var string
-     */
-    public $name;
-
-    /**
-     * Group name
-     *
-     * This may be something like 'HOME' for vcards.
-     *
-     * @var string
-     */
-    public $group;
-
-    /**
-     * Property parameters
-     *
-     * @var array
-     */
-    public $parameters = array();
-
-    /**
-     * Property value
-     *
-     * @var string
-     */
-    public $value;
-
-    /**
-     * If properties are added to this map, they will be automatically mapped
-     * to their respective classes, if parsed by the reader or constructed with
-     * the 'create' method.
-     *
-     * @var array
-     */
-    static public $classMap = array(
-        'COMPLETED'     => 'Sabre\\VObject\\Property\\DateTime',
-        'CREATED'       => 'Sabre\\VObject\\Property\\DateTime',
-        'DTEND'         => 'Sabre\\VObject\\Property\\DateTime',
-        'DTSTAMP'       => 'Sabre\\VObject\\Property\\DateTime',
-        'DTSTART'       => 'Sabre\\VObject\\Property\\DateTime',
-        'DUE'           => 'Sabre\\VObject\\Property\\DateTime',
-        'EXDATE'        => 'Sabre\\VObject\\Property\\MultiDateTime',
-        'LAST-MODIFIED' => 'Sabre\\VObject\\Property\\DateTime',
-        'RECURRENCE-ID' => 'Sabre\\VObject\\Property\\DateTime',
-        'TRIGGER'       => 'Sabre\\VObject\\Property\\DateTime',
-        'N'             => 'Sabre\\VObject\\Property\\Compound',
-        'ORG'           => 'Sabre\\VObject\\Property\\Compound',
-        'ADR'           => 'Sabre\\VObject\\Property\\Compound',
-        'CATEGORIES'    => 'Sabre\\VObject\\Property\\Compound',
-    );
-
-    /**
-     * Creates the new property by name, but in addition will also see if
-     * there's a class mapped to the property name.
-     *
-     * Parameters can be specified with the optional third argument. Parameters
-     * must be a key->value map of the parameter name, and value. If the value
-     * is specified as an array, it is assumed that multiple parameters with
-     * the same name should be added.
-     *
-     * @param string $name
-     * @param string $value
-     * @param array $parameters
-     * @return Property
-     */
-    static public function create($name, $value = null, array $parameters = array()) {
-
-        $name = strtoupper($name);
-        $shortName = $name;
-        $group = null;
-        if (strpos($shortName,'.')!==false) {
-            list($group, $shortName) = explode('.', $shortName);
-        }
-
-        if (isset(self::$classMap[$shortName])) {
-            return new self::$classMap[$shortName]($name, $value, $parameters);
-        } else {
-            return new self($name, $value, $parameters);
-        }
-
-    }
-
-    /**
-     * Creates a new property object
-     *
-     * Parameters can be specified with the optional third argument. Parameters
-     * must be a key->value map of the parameter name, and value. If the value
-     * is specified as an array, it is assumed that multiple parameters with
-     * the same name should be added.
-     *
-     * @param string $name
-     * @param string $value
-     * @param array $parameters
-     */
-    public function __construct($name, $value = null, array $parameters = array()) {
-
-        if (!is_scalar($value) && !is_null($value)) {
-            throw new \InvalidArgumentException('The value argument must be scalar or null');
-        }
-
-        $name = strtoupper($name);
-        $group = null;
-        if (strpos($name,'.')!==false) {
-            list($group, $name) = explode('.', $name);
-        }
-        $this->name = $name;
-        $this->group = $group;
-        $this->setValue($value);
-
-        foreach($parameters as $paramName => $paramValues) {
-
-            if (!is_array($paramValues)) {
-                $paramValues = array($paramValues);
-            }
-
-            foreach($paramValues as $paramValue) {
-                $this->add($paramName, $paramValue);
-            }
-
-        }
-
-    }
-
-    /**
-     * Updates the internal value
-     *
-     * @param string $value
-     * @return void
-     */
-    public function setValue($value) {
-
-        $this->value = $value;
-
-    }
-
-    /**
-     * Turns the object back into a serialized blob.
-     *
-     * @return string
-     */
-    public function serialize() {
-
-        $str = $this->name;
-        if ($this->group) $str = $this->group . '.' . $this->name;
-
-        foreach($this->parameters as $param) {
-
-            $str.=';' . $param->serialize();
-
-        }
-
-        $src = array(
-            '\\',
-            "\n",
-        );
-        $out = array(
-            '\\\\',
-            '\n',
-        );
-        $str.=':' . str_replace($src, $out, $this->value);
-
-        $out = '';
-        while(strlen($str)>0) {
-            if (strlen($str)>75) {
-                $out.= mb_strcut($str,0,75,'utf-8') . "\r\n";
-                $str = ' ' . mb_strcut($str,75,strlen($str),'utf-8');
-            } else {
-                $out.=$str . "\r\n";
-                $str='';
-                break;
-            }
-        }
-
-        return $out;
-
-    }
-
-    /**
-     * Adds a new componenten or element
-     *
-     * You can call this method with the following syntaxes:
-     *
-     * add(Parameter $element)
-     * add(string $name, $value)
-     *
-     * The first version adds an Parameter
-     * The second adds a property as a string.
-     *
-     * @param mixed $item
-     * @param mixed $itemValue
-     * @return void
-     */
-    public function add($item, $itemValue = null) {
-
-        if ($item instanceof Parameter) {
-            if (!is_null($itemValue)) {
-                throw new \InvalidArgumentException('The second argument must not be specified, when passing a VObject');
-            }
-            $item->parent = $this;
-            $this->parameters[] = $item;
-        } elseif(is_string($item)) {
-
-            $parameter = new Parameter($item,$itemValue);
-            $parameter->parent = $this;
-            $this->parameters[] = $parameter;
-
-        } else {
-
-            throw new \InvalidArgumentException('The first argument must either be a Node a string');
-
-        }
-
-    }
-
-    /* ArrayAccess interface {{{ */
-
-    /**
-     * Checks if an array element exists
-     *
-     * @param mixed $name
-     * @return bool
-     */
-    public function offsetExists($name) {
-
-        if (is_int($name)) return parent::offsetExists($name);
-
-        $name = strtoupper($name);
-
-        foreach($this->parameters as $parameter) {
-            if ($parameter->name == $name) return true;
-        }
-        return false;
-
-    }
-
-    /**
-     * Returns a parameter, or parameter list.
-     *
-     * @param string $name
-     * @return Node
-     */
-    public function offsetGet($name) {
-
-        if (is_int($name)) return parent::offsetGet($name);
-        $name = strtoupper($name);
-
-        $result = array();
-        foreach($this->parameters as $parameter) {
-            if ($parameter->name == $name)
-                $result[] = $parameter;
-        }
-
-        if (count($result)===0) {
-            return null;
-        } elseif (count($result)===1) {
-            return $result[0];
-        } else {
-            $result[0]->setIterator(new ElementList($result));
-            return $result[0];
-        }
-
-    }
-
-    /**
-     * Creates a new parameter
-     *
-     * @param string $name
-     * @param mixed $value
-     * @return void
-     */
-    public function offsetSet($name, $value) {
-
-        if (is_int($name)) parent::offsetSet($name, $value);
-
-        if (is_scalar($value)) {
-            if (!is_string($name))
-                throw new \InvalidArgumentException('A parameter name must be specified. This means you cannot use the $array[]="string" to add parameters.');
-
-            $this->offsetUnset($name);
-            $parameter = new Parameter($name, $value);
-            $parameter->parent = $this;
-            $this->parameters[] = $parameter;
-
-        } elseif ($value instanceof Parameter) {
-            if (!is_null($name))
-                throw new \InvalidArgumentException('Don\'t specify a parameter name if you\'re passing a \\Sabre\\VObject\\Parameter. Add using $array[]=$parameterObject.');
-
-            $value->parent = $this;
-            $this->parameters[] = $value;
-        } else {
-            throw new \InvalidArgumentException('You can only add parameters to the property object');
-        }
-
-    }
-
-    /**
-     * Removes one or more parameters with the specified name
-     *
-     * @param string $name
-     * @return void
-     */
-    public function offsetUnset($name) {
-
-        if (is_int($name)) parent::offsetUnset($name);
-        $name = strtoupper($name);
-
-        foreach($this->parameters as $key=>$parameter) {
-            if ($parameter->name == $name) {
-                $parameter->parent = null;
-                unset($this->parameters[$key]);
-            }
-
-        }
-
-    }
-
-    /* }}} */
-
-    /**
-     * Called when this object is being cast to a string
-     *
-     * @return string
-     */
-    public function __toString() {
-
-        return (string)$this->value;
-
-    }
-
-    /**
-     * This method is automatically called when the object is cloned.
-     * Specifically, this will ensure all child elements are also cloned.
-     *
-     * @return void
-     */
-    public function __clone() {
-
-        foreach($this->parameters as $key=>$child) {
-            $this->parameters[$key] = clone $child;
-            $this->parameters[$key]->parent = $this;
-        }
-
-    }
-
-    /**
-     * Validates the node for correctness.
-     *
-     * The following options are supported:
-     *   - Node::REPAIR - If something is broken, and automatic repair may
-     *                    be attempted.
-     *
-     * An array is returned with warnings.
-     *
-     * Every item in the array has the following properties:
-     *    * level - (number between 1 and 3 with severity information)
-     *    * message - (human readable message)
-     *    * node - (reference to the offending node)
-     *
-     * @param int $options
-     * @return array
-     */
-    public function validate($options = 0) {
-
-        $warnings = array();
-
-        // Checking if our value is UTF-8
-        if (!StringUtil::isUTF8($this->value)) {
-            $warnings[] = array(
-                'level' => 1,
-                'message' => 'Property is not valid UTF-8!',
-                'node' => $this,
-            );
-            if ($options & self::REPAIR) {
-                $this->value = StringUtil::convertToUTF8($this->value);
-            }
-        }
-
-        // Checking if the propertyname does not contain any invalid bytes.
-        if (!preg_match('/^([A-Z0-9-]+)$/', $this->name)) {
-            $warnings[] = array(
-                'level' => 1,
-                'message' => 'The propertyname: ' . $this->name . ' contains invalid characters. Only A-Z, 0-9 and - are allowed',
-                'node' => $this,
-            );
-            if ($options & self::REPAIR) {
-                // Uppercasing and converting underscores to dashes.
-                $this->name = strtoupper(
-                    str_replace('_', '-', $this->name)
-                );
-                // Removing every other invalid character
-                $this->name = preg_replace('/([^A-Z0-9-])/u', '', $this->name);
-
-            }
-
-        }
-
-        // Validating inner parameters
-        foreach($this->parameters as $param) {
-            $warnings = array_merge($warnings, $param->validate($options));
-        }
-
-        return $warnings;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property/Compound.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property/Compound.php
deleted file mode 100644
index 8cd0dc27b3..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property/Compound.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Property;
-
-use Sabre\VObject;
-
-/**
-* Compound property.
-*
-* This class adds (de)serialization of compound properties to/from arrays.
-*
-* Currently the following properties from RFC 6350 are mapped to use this
-* class:
-*
-*  N:          Section 6.2.2
-*  ADR:        Section 6.3.1
-*  ORG:        Section 6.6.4
-*  CATEGORIES: Section 6.7.1
-*
-* In order to use this correctly, you must call setParts and getParts to
-* retrieve and modify dates respectively.
-*
-* @author Thomas Tanghus (http://tanghus.net/)
-* @author Lars Kneschke
-* @author Evert Pot (http://www.rooftopsolutions.nl/)
-* @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
-* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
-*/
-
-/**
-* This class represents a compound property in a vCard.
-*/
-class Compound extends VObject\Property {
-
-    /**
-    * If property names are added to this map, they will be (de)serialised as arrays
-    * using the getParts() and setParts() methods.
-    * The keys are the property names, values are delimiter chars.
-    *
-    * @var array
-    */
-    static public $delimiterMap = array(
-        'N'				=>	';',
-        'ADR'			=>	';',
-        'ORG'			=>	';',
-        'CATEGORIES'	=>	',',
-    );
-
-    /**
-     * The currently used delimiter.
-     *
-     * @var string
-     */
-    protected $delimiter = null;
-
-    /**
-    * Get a compound value as an array.
-    *
-    * @param $name string
-    * @return array
-    */
-    public function getParts() {
-
-        if (is_null($this->value)) {
-            return array();
-        }
-
-        $delimiter = $this->getDelimiter();
-
-        // split by any $delimiter which is NOT prefixed by a slash.
-        // Note that this is not a a perfect solution. If a value is prefixed
-        // by two slashes, it should actually be split anyway.
-        //
-        // Hopefully we can fix this better in a future version, where we can
-        // break compatibility a bit.
-        $compoundValues = preg_split("/(?<!\\\)$delimiter/", $this->value);
-
-        // remove slashes from any semicolon and comma left escaped in the single values
-        $compoundValues = array_map(
-            function($val) {
-                return strtr($val, array('\,' => ',', '\;' => ';'));
-        }, $compoundValues);
-
-        return $compoundValues;
-
-    }
-
-    /**
-     * Returns the delimiter for this property.
-     *
-     * @return string
-     */
-    public function getDelimiter() {
-
-        if (!$this->delimiter) {
-            if (isset(self::$delimiterMap[$this->name])) {
-                $this->delimiter = self::$delimiterMap[$this->name];
-            } else {
-                // To be a bit future proof, we are going to default the
-                // delimiter to ;
-                $this->delimiter = ';';
-            }
-        }
-        return $this->delimiter;
-
-    }
-
-    /**
-     * Set a compound value as an array.
-     *
-    *
-    * @param $name string
-    * @return array
-    */
-    public function setParts(array $values) {
-
-        // add slashes to all semicolons and commas in the single values
-        $values = array_map(
-            function($val) {
-                return strtr($val, array(',' => '\,', ';' => '\;'));
-            }, $values);
-
-        $this->setValue(
-            implode($this->getDelimiter(), $values)
-        );
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property/DateTime.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property/DateTime.php
deleted file mode 100644
index 9d900e6b53..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property/DateTime.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Property;
-
-use Sabre\VObject;
-
-/**
- * DateTime property
- *
- * This element is used for iCalendar properties such as the DTSTART property.
- * It basically provides a few helper functions that make it easier to deal
- * with these. It supports both DATE-TIME and DATE values.
- *
- * In order to use this correctly, you must call setDateTime and getDateTime to
- * retrieve and modify dates respectively.
- *
- * If you use the 'value' or properties directly, this object does not keep
- * reference and results might appear incorrectly.
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class DateTime extends VObject\Property {
-
-    /**
-     * Local 'floating' time
-     */
-    const LOCAL = 1;
-
-    /**
-     * UTC-based time
-     */
-    const UTC = 2;
-
-    /**
-     * Local time plus timezone
-     */
-    const LOCALTZ = 3;
-
-    /**
-     * Only a date, time is ignored
-     */
-    const DATE = 4;
-
-    /**
-     * DateTime representation
-     *
-     * @var \DateTime
-     */
-    protected $dateTime;
-
-    /**
-     * dateType
-     *
-     * @var int
-     */
-    protected $dateType;
-
-    /**
-     * Updates the Date and Time.
-     *
-     * @param \DateTime $dt
-     * @param int $dateType
-     * @return void
-     */
-    public function setDateTime(\DateTime $dt, $dateType = self::LOCALTZ) {
-
-        switch($dateType) {
-
-            case self::LOCAL :
-                $this->setValue($dt->format('Ymd\\THis'));
-                $this->offsetUnset('VALUE');
-                $this->offsetUnset('TZID');
-                $this->offsetSet('VALUE','DATE-TIME');
-                break;
-            case self::UTC :
-                $dt->setTimeZone(new \DateTimeZone('UTC'));
-                $this->setValue($dt->format('Ymd\\THis\\Z'));
-                $this->offsetUnset('VALUE');
-                $this->offsetUnset('TZID');
-                $this->offsetSet('VALUE','DATE-TIME');
-                break;
-            case self::LOCALTZ :
-                $this->setValue($dt->format('Ymd\\THis'));
-                $this->offsetUnset('VALUE');
-                $this->offsetUnset('TZID');
-                $this->offsetSet('VALUE','DATE-TIME');
-                $this->offsetSet('TZID', $dt->getTimeZone()->getName());
-                break;
-            case self::DATE :
-                $this->setValue($dt->format('Ymd'));
-                $this->offsetUnset('VALUE');
-                $this->offsetUnset('TZID');
-                $this->offsetSet('VALUE','DATE');
-                break;
-            default :
-                throw new \InvalidArgumentException('You must pass a valid dateType constant');
-
-        }
-        $this->dateTime = $dt;
-        $this->dateType = $dateType;
-
-    }
-
-    /**
-     * Returns the current DateTime value.
-     *
-     * If no value was set, this method returns null.
-     *
-     * @return \DateTime|null
-     */
-    public function getDateTime() {
-
-        if ($this->dateTime)
-            return $this->dateTime;
-
-        list(
-            $this->dateType,
-            $this->dateTime
-        ) = self::parseData($this->value, $this);
-        return $this->dateTime;
-
-    }
-
-    /**
-     * Returns the type of Date format.
-     *
-     * This method returns one of the format constants. If no date was set,
-     * this method will return null.
-     *
-     * @return int|null
-     */
-    public function getDateType() {
-
-        if ($this->dateType)
-            return $this->dateType;
-
-        list(
-            $this->dateType,
-            $this->dateTime,
-        ) = self::parseData($this->value, $this);
-        return $this->dateType;
-
-    }
-
-    /**
-     * Parses the internal data structure to figure out what the current date
-     * and time is.
-     *
-     * The returned array contains two elements:
-     *   1. A 'DateType' constant (as defined on this class), or null.
-     *   2. A DateTime object (or null)
-     *
-     * @param string|null $propertyValue The string to parse (yymmdd or
-     *                                   ymmddThhmmss, etc..)
-     * @param \Sabre\VObject\Property|null $property The instance of the
-     *                                              property we're parsing.
-     * @return array
-     */
-    static public function parseData($propertyValue, VObject\Property $property = null) {
-
-        if (is_null($propertyValue)) {
-            return array(null, null);
-        }
-
-        $date = '(?P<year>[1-2][0-9]{3})(?P<month>[0-1][0-9])(?P<date>[0-3][0-9])';
-        $time = '(?P<hour>[0-2][0-9])(?P<minute>[0-5][0-9])(?P<second>[0-5][0-9])';
-        $regex = "/^$date(T$time(?P<isutc>Z)?)?$/";
-
-        if (!preg_match($regex, $propertyValue, $matches)) {
-            throw new \InvalidArgumentException($propertyValue . ' is not a valid \DateTime or Date string');
-        }
-
-        if (!isset($matches['hour'])) {
-            // Date-only
-            return array(
-                self::DATE,
-                new \DateTime($matches['year'] . '-' . $matches['month'] . '-' . $matches['date'] . ' 00:00:00', new \DateTimeZone('UTC')),
-            );
-        }
-
-        $dateStr =
-            $matches['year'] .'-' .
-            $matches['month'] . '-' .
-            $matches['date'] . ' ' .
-            $matches['hour'] . ':' .
-            $matches['minute'] . ':' .
-            $matches['second'];
-
-        if (isset($matches['isutc'])) {
-            $dt = new \DateTime($dateStr,new \DateTimeZone('UTC'));
-            $dt->setTimeZone(new \DateTimeZone('UTC'));
-            return array(
-                self::UTC,
-                $dt
-            );
-        }
-
-        // Finding the timezone.
-        $tzid = $property['TZID'];
-        if (!$tzid) {
-            // This was a floating time string. This implies we use the
-            // timezone from date_default_timezone_set / date.timezone ini
-            // setting.
-            return array(
-                self::LOCAL,
-                new \DateTime($dateStr)
-            );
-        }
-
-        // To look up the timezone, we must first find the VCALENDAR component.
-        $root = $property;
-        while($root->parent) {
-            $root = $root->parent;
-        }
-        if ($root->name === 'VCALENDAR') {
-            $tz = VObject\TimeZoneUtil::getTimeZone((string)$tzid, $root);
-        } else {
-            $tz = VObject\TimeZoneUtil::getTimeZone((string)$tzid);
-        }
-
-        $dt = new \DateTime($dateStr, $tz);
-        $dt->setTimeZone($tz);
-
-        return array(
-            self::LOCALTZ,
-            $dt
-        );
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property/MultiDateTime.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property/MultiDateTime.php
deleted file mode 100644
index e05a0246f1..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Property/MultiDateTime.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Property;
-
-use Sabre\VObject;
-
-/**
- * Multi-DateTime property
- *
- * This element is used for iCalendar properties such as the EXDATE property.
- * It basically provides a few helper functions that make it easier to deal
- * with these. It supports both DATE-TIME and DATE values.
- *
- * In order to use this correctly, you must call setDateTimes and getDateTimes
- * to retrieve and modify dates respectively.
- *
- * If you use the 'value' or properties directly, this object does not keep
- * reference and results might appear incorrectly.
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class MultiDateTime extends VObject\Property {
-
-    /**
-     * DateTime representation
-     *
-     * @var DateTime[]
-     */
-    protected $dateTimes;
-
-    /**
-     * dateType
-     *
-     * This is one of the Sabre\VObject\Property\DateTime constants.
-     *
-     * @var int
-     */
-    protected $dateType;
-
-    /**
-     * Updates the value
-     *
-     * @param array $dt Must be an array of DateTime objects.
-     * @param int $dateType
-     * @return void
-     */
-    public function setDateTimes(array $dt, $dateType = VObject\Property\DateTime::LOCALTZ) {
-
-        foreach($dt as $i)
-            if (!$i instanceof \DateTime)
-                throw new \InvalidArgumentException('You must pass an array of DateTime objects');
-
-        $this->offsetUnset('VALUE');
-        $this->offsetUnset('TZID');
-        switch($dateType) {
-
-            case DateTime::LOCAL :
-                $val = array();
-                foreach($dt as $i) {
-                    $val[] = $i->format('Ymd\\THis');
-                }
-                $this->setValue(implode(',',$val));
-                $this->offsetSet('VALUE','DATE-TIME');
-                break;
-            case DateTime::UTC :
-                $val = array();
-                foreach($dt as $i) {
-                    $i->setTimeZone(new \DateTimeZone('UTC'));
-                    $val[] = $i->format('Ymd\\THis\\Z');
-                }
-                $this->setValue(implode(',',$val));
-                $this->offsetSet('VALUE','DATE-TIME');
-                break;
-            case DateTime::LOCALTZ :
-                $val = array();
-                foreach($dt as $i) {
-                    $val[] = $i->format('Ymd\\THis');
-                }
-                $this->setValue(implode(',',$val));
-                $this->offsetSet('VALUE','DATE-TIME');
-                $this->offsetSet('TZID', $dt[0]->getTimeZone()->getName());
-                break;
-            case DateTime::DATE :
-                $val = array();
-                foreach($dt as $i) {
-                    $val[] = $i->format('Ymd');
-                }
-                $this->setValue(implode(',',$val));
-                $this->offsetSet('VALUE','DATE');
-                break;
-            default :
-                throw new \InvalidArgumentException('You must pass a valid dateType constant');
-
-        }
-        $this->dateTimes = $dt;
-        $this->dateType = $dateType;
-
-    }
-
-    /**
-     * Returns the current DateTime value.
-     *
-     * If no value was set, this method returns null.
-     *
-     * @return array|null
-     */
-    public function getDateTimes() {
-
-        if ($this->dateTimes)
-            return $this->dateTimes;
-
-        $dts = array();
-
-        if (!$this->value) {
-            $this->dateTimes = null;
-            $this->dateType = null;
-            return null;
-        }
-
-        foreach(explode(',',$this->value) as $val) {
-            list(
-                $type,
-                $dt
-            ) = DateTime::parseData($val, $this);
-            $dts[] = $dt;
-            $this->dateType = $type;
-        }
-        $this->dateTimes = $dts;
-        return $this->dateTimes;
-
-    }
-
-    /**
-     * Returns the type of Date format.
-     *
-     * This method returns one of the format constants. If no date was set,
-     * this method will return null.
-     *
-     * @return int|null
-     */
-    public function getDateType() {
-
-        if ($this->dateType)
-            return $this->dateType;
-
-        if (!$this->value) {
-            $this->dateTimes = null;
-            $this->dateType = null;
-            return null;
-        }
-
-        $dts = array();
-        foreach(explode(',',$this->value) as $val) {
-            list(
-                $type,
-                $dt
-            ) = DateTime::parseData($val, $this);
-            $dts[] = $dt;
-            $this->dateType = $type;
-        }
-        $this->dateTimes = $dts;
-        return $this->dateType;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Reader.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Reader.php
deleted file mode 100644
index 2d9a14a296..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Reader.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-/**
- * VCALENDAR/VCARD reader
- *
- * This class reads the vobject file, and returns a full element tree.
- *
- * TODO: this class currently completely works 'statically'. This is pointless,
- * and defeats OOP principals. Needs refactoring in a future version.
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Reader {
-
-    /**
-     * If this option is passed to the reader, it will be less strict about the
-     * validity of the lines.
-     *
-     * Currently using this option just means, that it will accept underscores
-     * in property names.
-     */
-    const OPTION_FORGIVING = 1;
-
-    /**
-     * If this option is turned on, any lines we cannot parse will be ignored
-     * by the reader.
-     */
-    const OPTION_IGNORE_INVALID_LINES = 2;
-
-    /**
-     * Parses the file and returns the top component
-     *
-     * The options argument is a bitfield. Pass any of the OPTIONS constant to
-     * alter the parsers' behaviour.
-     *
-     * @param string $data
-     * @param int $options
-     * @return Node
-     */
-    static function read($data, $options = 0) {
-
-        // Normalizing newlines
-        $data = str_replace(array("\r","\n\n"), array("\n","\n"), $data);
-
-        $lines = explode("\n", $data);
-
-        // Unfolding lines
-        $lines2 = array();
-        foreach($lines as $line) {
-
-            // Skipping empty lines
-            if (!$line) continue;
-
-            if ($line[0]===" " || $line[0]==="\t") {
-                $lines2[count($lines2)-1].=substr($line,1);
-            } else {
-                $lines2[] = $line;
-            }
-
-        }
-
-        unset($lines);
-
-        reset($lines2);
-
-        return self::readLine($lines2, $options);
-
-    }
-
-    /**
-     * Reads and parses a single line.
-     *
-     * This method receives the full array of lines. The array pointer is used
-     * to traverse.
-     *
-     * This method returns null if an invalid line was encountered, and the
-     * IGNORE_INVALID_LINES option was turned on.
-     *
-     * @param array $lines
-     * @param int $options See the OPTIONS constants.
-     * @return Node
-     */
-    static private function readLine(&$lines, $options = 0) {
-
-        $line = current($lines);
-        $lineNr = key($lines);
-        next($lines);
-
-        // Components
-        if (strtoupper(substr($line,0,6)) === "BEGIN:") {
-
-            $componentName = strtoupper(substr($line,6));
-            $obj = Component::create($componentName);
-
-            $nextLine = current($lines);
-
-            while(strtoupper(substr($nextLine,0,4))!=="END:") {
-
-                $parsedLine = self::readLine($lines, $options);
-                $nextLine = current($lines);
-
-                if (is_null($parsedLine)) {
-                    continue;
-                }
-                $obj->add($parsedLine);
-
-                if ($nextLine===false)
-                    throw new ParseException('Invalid VObject. Document ended prematurely.');
-
-            }
-
-            // Checking component name of the 'END:' line.
-            if (substr($nextLine,4)!==$obj->name) {
-                throw new ParseException('Invalid VObject, expected: "END:' . $obj->name . '" got: "' . $nextLine . '"');
-            }
-            next($lines);
-
-            return $obj;
-
-        }
-
-        // Properties
-        //$result = preg_match('/(?P<name>[A-Z0-9-]+)(?:;(?P<parameters>^(?<!:):))(.*)$/',$line,$matches);
-
-        if ($options & self::OPTION_FORGIVING) {
-            $token = '[A-Z0-9-\._]+';
-        } else {
-            $token = '[A-Z0-9-\.]+';
-        }
-        $parameters = "(?:;(?P<parameters>([^:^\"]|\"([^\"]*)\")*))?";
-        $regex = "/^(?P<name>$token)$parameters:(?P<value>.*)$/i";
-
-        $result = preg_match($regex,$line,$matches);
-
-        if (!$result) {
-            if ($options & self::OPTION_IGNORE_INVALID_LINES) {
-                return null;
-            } else {
-                throw new ParseException('Invalid VObject, line ' . ($lineNr+1) . ' did not follow the icalendar/vcard format');
-            }
-        }
-
-        $propertyName = strtoupper($matches['name']);
-        $propertyValue = preg_replace_callback('#(\\\\(\\\\|N|n))#',function($matches) {
-            if ($matches[2]==='n' || $matches[2]==='N') {
-                return "\n";
-            } else {
-                return $matches[2];
-            }
-        }, $matches['value']);
-
-        $obj = Property::create($propertyName, $propertyValue);
-
-        if ($matches['parameters']) {
-
-            foreach(self::readParameters($matches['parameters']) as $param) {
-                $obj->add($param);
-            }
-
-        }
-
-        return $obj;
-
-
-    }
-
-    /**
-     * Reads a parameter list from a property
-     *
-     * This method returns an array of Parameter
-     *
-     * @param string $parameters
-     * @return array
-     */
-    static private function readParameters($parameters) {
-
-        $token = '[A-Z0-9-]+';
-
-        $paramValue = '(?P<paramValue>[^\"^;]*|"[^"]*")';
-
-        $regex = "/(?<=^|;)(?P<paramName>$token)(=$paramValue(?=$|;))?/i";
-        preg_match_all($regex, $parameters, $matches,  PREG_SET_ORDER);
-
-        $params = array();
-        foreach($matches as $match) {
-
-            if (!isset($match['paramValue'])) {
-
-                $value = null;
-
-            } else {
-
-                $value = $match['paramValue'];
-
-                if (isset($value[0]) && $value[0]==='"') {
-                    // Stripping quotes, if needed
-                    $value = substr($value,1,strlen($value)-2);
-                }
-
-                $value = preg_replace_callback('#(\\\\(\\\\|N|n|;|,))#',function($matches) {
-                    if ($matches[2]==='n' || $matches[2]==='N') {
-                        return "\n";
-                    } else {
-                        return $matches[2];
-                    }
-                }, $value);
-
-            }
-
-            $params[] = new Parameter($match['paramName'], $value);
-
-        }
-
-        return $params;
-
-    }
-
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/RecurrenceIterator.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/RecurrenceIterator.php
deleted file mode 100644
index 2f9ad5b6ac..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/RecurrenceIterator.php
+++ /dev/null
@@ -1,1112 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-/**
- * This class is used to determine new for a recurring event, when the next
- * events occur.
- *
- * This iterator may loop infinitely in the future, therefore it is important
- * that if you use this class, you set hard limits for the amount of iterations
- * you want to handle.
- *
- * Note that currently there is not full support for the entire iCalendar
- * specification, as it's very complex and contains a lot of permutations
- * that's not yet used very often in software.
- *
- * For the focus has been on features as they actually appear in Calendaring
- * software, but this may well get expanded as needed / on demand
- *
- * The following RRULE properties are supported
- *   * UNTIL
- *   * INTERVAL
- *   * COUNT
- *   * FREQ=DAILY
- *     * BYDAY
- *     * BYHOUR
- *   * FREQ=WEEKLY
- *     * BYDAY
- *     * BYHOUR
- *     * WKST
- *   * FREQ=MONTHLY
- *     * BYMONTHDAY
- *     * BYDAY
- *     * BYSETPOS
- *   * FREQ=YEARLY
- *     * BYMONTH
- *     * BYMONTHDAY (only if BYMONTH is also set)
- *     * BYDAY (only if BYMONTH is also set)
- *
- * Anything beyond this is 'undefined', which means that it may get ignored, or
- * you may get unexpected results. The effect is that in some applications the
- * specified recurrence may look incorrect, or is missing.
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class RecurrenceIterator implements \Iterator {
-
-    /**
-     * The initial event date
-     *
-     * @var DateTime
-     */
-    public $startDate;
-
-    /**
-     * The end-date of the initial event
-     *
-     * @var DateTime
-     */
-    public $endDate;
-
-    /**
-     * The 'current' recurrence.
-     *
-     * This will be increased for every iteration.
-     *
-     * @var DateTime
-     */
-    public $currentDate;
-
-
-    /**
-     * List of dates that are excluded from the rules.
-     *
-     * This list contains the items that have been overriden by the EXDATE
-     * property.
-     *
-     * @var array
-     */
-    public $exceptionDates = array();
-
-    /**
-     * Base event
-     *
-     * @var Component\VEvent
-     */
-    public $baseEvent;
-
-    /**
-     * List of dates that are overridden by other events.
-     * Similar to $overriddenEvents, but this just contains the original dates.
-     *
-     * @var array
-     */
-    public $overriddenDates = array();
-
-    /**
-     * list of events that are 'overridden'.
-     *
-     * This is an array of Component\VEvent objects.
-     *
-     * @var array
-     */
-    public $overriddenEvents = array();
-
-
-    /**
-     * Frequency is one of: secondly, minutely, hourly, daily, weekly, monthly,
-     * yearly.
-     *
-     * @var string
-     */
-    public $frequency;
-
-    /**
-     * The last instance of this recurrence, inclusively
-     *
-     * @var DateTime|null
-     */
-    public $until;
-
-    /**
-     * The number of recurrences, or 'null' if infinitely recurring.
-     *
-     * @var int
-     */
-    public $count;
-
-    /**
-     * The interval.
-     *
-     * If for example frequency is set to daily, interval = 2 would mean every
-     * 2 days.
-     *
-     * @var int
-     */
-    public $interval = 1;
-
-    /**
-     * Which seconds to recur.
-     *
-     * This is an array of integers (between 0 and 60)
-     *
-     * @var array
-     */
-    public $bySecond;
-
-    /**
-     * Which minutes to recur
-     *
-     * This is an array of integers (between 0 and 59)
-     *
-     * @var array
-     */
-    public $byMinute;
-
-    /**
-     * Which hours to recur
-     *
-     * This is an array of integers (between 0 and 23)
-     *
-     * @var array
-     */
-    public $byHour;
-
-    /**
-     * Which weekdays to recur.
-     *
-     * This is an array of weekdays
-     *
-     * This may also be preceeded by a positive or negative integer. If present,
-     * this indicates the nth occurrence of a specific day within the monthly or
-     * yearly rrule. For instance, -2TU indicates the second-last tuesday of
-     * the month, or year.
-     *
-     * @var array
-     */
-    public $byDay;
-
-    /**
-     * Which days of the month to recur
-     *
-     * This is an array of days of the months (1-31). The value can also be
-     * negative. -5 for instance means the 5th last day of the month.
-     *
-     * @var array
-     */
-    public $byMonthDay;
-
-    /**
-     * Which days of the year to recur.
-     *
-     * This is an array with days of the year (1 to 366). The values can also
-     * be negative. For instance, -1 will always represent the last day of the
-     * year. (December 31st).
-     *
-     * @var array
-     */
-    public $byYearDay;
-
-    /**
-     * Which week numbers to recur.
-     *
-     * This is an array of integers from 1 to 53. The values can also be
-     * negative. -1 will always refer to the last week of the year.
-     *
-     * @var array
-     */
-    public $byWeekNo;
-
-    /**
-     * Which months to recur
-     *
-     * This is an array of integers from 1 to 12.
-     *
-     * @var array
-     */
-    public $byMonth;
-
-    /**
-     * Which items in an existing st to recur.
-     *
-     * These numbers work together with an existing by* rule. It specifies
-     * exactly which items of the existing by-rule to filter.
-     *
-     * Valid values are 1 to 366 and -1 to -366. As an example, this can be
-     * used to recur the last workday of the month.
-     *
-     * This would be done by setting frequency to 'monthly', byDay to
-     * 'MO,TU,WE,TH,FR' and bySetPos to -1.
-     *
-     * @var array
-     */
-    public $bySetPos;
-
-    /**
-     * When a week starts
-     *
-     * @var string
-     */
-    public $weekStart = 'MO';
-
-    /**
-     * The current item in the list
-     *
-     * @var int
-     */
-    public $counter = 0;
-
-    /**
-     * Simple mapping from iCalendar day names to day numbers
-     *
-     * @var array
-     */
-    private $dayMap = array(
-        'SU' => 0,
-        'MO' => 1,
-        'TU' => 2,
-        'WE' => 3,
-        'TH' => 4,
-        'FR' => 5,
-        'SA' => 6,
-    );
-
-    /**
-     * Mappings between the day number and english day name.
-     *
-     * @var array
-     */
-    private $dayNames = array(
-        0 => 'Sunday',
-        1 => 'Monday',
-        2 => 'Tuesday',
-        3 => 'Wednesday',
-        4 => 'Thursday',
-        5 => 'Friday',
-        6 => 'Saturday',
-    );
-
-    /**
-     * If the current iteration of the event is an overriden event, this
-     * property will hold the VObject
-     *
-     * @var Component
-     */
-    private $currentOverriddenEvent;
-
-    /**
-     * This property may contain the date of the next not-overridden event.
-     * This date is calculated sometimes a bit early, before overridden events
-     * are evaluated.
-     *
-     * @var DateTime
-     */
-    private $nextDate;
-
-    /**
-     * Creates the iterator
-     *
-     * You should pass a VCALENDAR component, as well as the UID of the event
-     * we're going to traverse.
-     *
-     * @param Component $vcal
-     * @param string|null $uid
-     */
-    public function __construct(Component $vcal, $uid=null) {
-
-        if (is_null($uid)) {
-            if ($vcal->name === 'VCALENDAR') {
-                throw new \InvalidArgumentException('If you pass a VCALENDAR object, you must pass a uid argument as well');
-            }
-            $components = array($vcal);
-            $uid = (string)$vcal->uid;
-        } else {
-            $components = $vcal->select('VEVENT');
-        }
-        foreach($components as $component) {
-            if ((string)$component->uid == $uid) {
-                if (isset($component->{'RECURRENCE-ID'})) {
-                    $this->overriddenEvents[$component->DTSTART->getDateTime()->getTimeStamp()] = $component;
-                    $this->overriddenDates[] = $component->{'RECURRENCE-ID'}->getDateTime();
-                } else {
-                    $this->baseEvent = $component;
-                }
-            }
-        }
-        if (!$this->baseEvent) {
-            throw new \InvalidArgumentException('Could not find a base event with uid: ' . $uid);
-        }
-
-        $this->startDate = clone $this->baseEvent->DTSTART->getDateTime();
-
-        $this->endDate = null;
-        if (isset($this->baseEvent->DTEND)) {
-            $this->endDate = clone $this->baseEvent->DTEND->getDateTime();
-        } else {
-            $this->endDate = clone $this->startDate;
-            if (isset($this->baseEvent->DURATION)) {
-                $this->endDate->add(DateTimeParser::parse($this->baseEvent->DURATION->value));
-            } elseif ($this->baseEvent->DTSTART->getDateType()===Property\DateTime::DATE) {
-                $this->endDate->modify('+1 day');
-            }
-        }
-        $this->currentDate = clone $this->startDate;
-
-        $rrule = (string)$this->baseEvent->RRULE;
-
-        $parts = explode(';', $rrule);
-
-        // If no rrule was specified, we create a default setting
-        if (!$rrule) {
-            $this->frequency = 'daily';
-            $this->count = 1;
-        } else foreach($parts as $part) {
-
-            list($key, $value) = explode('=', $part, 2);
-
-            switch(strtoupper($key)) {
-
-                case 'FREQ' :
-                    if (!in_array(
-                        strtolower($value),
-                        array('secondly','minutely','hourly','daily','weekly','monthly','yearly')
-                    )) {
-                        throw new \InvalidArgumentException('Unknown value for FREQ=' . strtoupper($value));
-
-                    }
-                    $this->frequency = strtolower($value);
-                    break;
-
-                case 'UNTIL' :
-                    $this->until = DateTimeParser::parse($value);
-
-                    // In some cases events are generated with an UNTIL=
-                    // parameter before the actual start of the event.
-                    //
-                    // Not sure why this is happening. We assume that the
-                    // intention was that the event only recurs once.
-                    //
-                    // So we are modifying the parameter so our code doesn't
-                    // break.
-                    if($this->until < $this->baseEvent->DTSTART->getDateTime()) {
-                        $this->until = $this->baseEvent->DTSTART->getDateTime();
-                    }
-                    break;
-
-                case 'COUNT' :
-                    $this->count = (int)$value;
-                    break;
-
-                case 'INTERVAL' :
-                    $this->interval = (int)$value;
-                    if ($this->interval < 1) {
-                        throw new \InvalidArgumentException('INTERVAL in RRULE must be a positive integer!');
-                    }
-                    break;
-
-                case 'BYSECOND' :
-                    $this->bySecond = explode(',', $value);
-                    break;
-
-                case 'BYMINUTE' :
-                    $this->byMinute = explode(',', $value);
-                    break;
-
-                case 'BYHOUR' :
-                    $this->byHour = explode(',', $value);
-                    break;
-
-                case 'BYDAY' :
-                    $this->byDay = explode(',', strtoupper($value));
-                    break;
-
-                case 'BYMONTHDAY' :
-                    $this->byMonthDay = explode(',', $value);
-                    break;
-
-                case 'BYYEARDAY' :
-                    $this->byYearDay = explode(',', $value);
-                    break;
-
-                case 'BYWEEKNO' :
-                    $this->byWeekNo = explode(',', $value);
-                    break;
-
-                case 'BYMONTH' :
-                    $this->byMonth = explode(',', $value);
-                    break;
-
-                case 'BYSETPOS' :
-                    $this->bySetPos = explode(',', $value);
-                    break;
-
-                case 'WKST' :
-                    $this->weekStart = strtoupper($value);
-                    break;
-
-            }
-
-        }
-
-        // Parsing exception dates
-        if (isset($this->baseEvent->EXDATE)) {
-            foreach($this->baseEvent->EXDATE as $exDate) {
-
-                foreach(explode(',', (string)$exDate) as $exceptionDate) {
-
-                    $this->exceptionDates[] =
-                        DateTimeParser::parse($exceptionDate, $this->startDate->getTimeZone());
-
-                }
-
-            }
-
-        }
-
-    }
-
-    /**
-     * Returns the current item in the list
-     *
-     * @return DateTime
-     */
-    public function current() {
-
-        if (!$this->valid()) return null;
-        return clone $this->currentDate;
-
-    }
-
-    /**
-     * This method returns the startdate for the current iteration of the
-     * event.
-     *
-     * @return DateTime
-     */
-    public function getDtStart() {
-
-        if (!$this->valid()) return null;
-        return clone $this->currentDate;
-
-    }
-
-    /**
-     * This method returns the enddate for the current iteration of the
-     * event.
-     *
-     * @return DateTime
-     */
-    public function getDtEnd() {
-
-        if (!$this->valid()) return null;
-        $dtEnd = clone $this->currentDate;
-        $dtEnd->add( $this->startDate->diff( $this->endDate ) );
-        return clone $dtEnd;
-
-    }
-
-    /**
-     * Returns a VEVENT object with the updated start and end date.
-     *
-     * Any recurrence information is removed, and this function may return an
-     * 'overridden' event instead.
-     *
-     * This method always returns a cloned instance.
-     *
-     * @return Component\VEvent
-     */
-    public function getEventObject() {
-
-        if ($this->currentOverriddenEvent) {
-            return clone $this->currentOverriddenEvent;
-        }
-        $event = clone $this->baseEvent;
-        unset($event->RRULE);
-        unset($event->EXDATE);
-        unset($event->RDATE);
-        unset($event->EXRULE);
-
-        $event->DTSTART->setDateTime($this->getDTStart(), $event->DTSTART->getDateType());
-        if (isset($event->DTEND)) {
-            $event->DTEND->setDateTime($this->getDtEnd(), $event->DTSTART->getDateType());
-        }
-        if ($this->counter > 0) {
-            $event->{'RECURRENCE-ID'} = (string)$event->DTSTART;
-        }
-
-        return $event;
-
-    }
-
-    /**
-     * Returns the current item number
-     *
-     * @return int
-     */
-    public function key() {
-
-        return $this->counter;
-
-    }
-
-    /**
-     * Whether or not there is a 'next item'
-     *
-     * @return bool
-     */
-    public function valid() {
-
-        if (!is_null($this->count)) {
-            return $this->counter < $this->count;
-        }
-        if (!is_null($this->until)) {
-            return $this->currentDate <= $this->until;
-        }
-        return true;
-
-    }
-
-    /**
-     * Resets the iterator
-     *
-     * @return void
-     */
-    public function rewind() {
-
-        $this->currentDate = clone $this->startDate;
-        $this->counter = 0;
-
-    }
-
-    /**
-     * This method allows you to quickly go to the next occurrence after the
-     * specified date.
-     *
-     * Note that this checks the current 'endDate', not the 'stardDate'. This
-     * means that if you forward to January 1st, the iterator will stop at the
-     * first event that ends *after* January 1st.
-     *
-     * @param DateTime $dt
-     * @return void
-     */
-    public function fastForward(\DateTime $dt) {
-
-        while($this->valid() && $this->getDTEnd() <= $dt) {
-            $this->next();
-        }
-
-    }
-
-    /**
-     * Returns true if this recurring event never ends.
-     *
-     * @return bool
-     */
-    public function isInfinite() {
-
-        return !$this->count && !$this->until;
-
-    }
-
-    /**
-     * Goes on to the next iteration
-     *
-     * @return void
-     */
-    public function next() {
-
-        /*
-        if (!is_null($this->count) && $this->counter >= $this->count) {
-            $this->currentDate = null;
-        }*/
-
-
-        $previousStamp = $this->currentDate->getTimeStamp();
-
-        while(true) {
-
-            $this->currentOverriddenEvent = null;
-
-            // If we have a next date 'stored', we use that
-            if ($this->nextDate) {
-                $this->currentDate = $this->nextDate;
-                $currentStamp = $this->currentDate->getTimeStamp();
-                $this->nextDate = null;
-            } else {
-
-                // Otherwise, we calculate it
-                switch($this->frequency) {
-
-                    case 'hourly' :
-                        $this->nextHourly();
-                        break;
-
-                    case 'daily' :
-                        $this->nextDaily();
-                        break;
-
-                    case 'weekly' :
-                        $this->nextWeekly();
-                        break;
-
-                    case 'monthly' :
-                        $this->nextMonthly();
-                        break;
-
-                    case 'yearly' :
-                        $this->nextYearly();
-                        break;
-
-                }
-                $currentStamp = $this->currentDate->getTimeStamp();
-
-                // Checking exception dates
-                foreach($this->exceptionDates as $exceptionDate) {
-                    if ($this->currentDate == $exceptionDate) {
-                        $this->counter++;
-                        continue 2;
-                    }
-                }
-                foreach($this->overriddenDates as $overriddenDate) {
-                    if ($this->currentDate == $overriddenDate) {
-                        continue 2;
-                    }
-                }
-
-            }
-
-            // Checking overridden events
-            foreach($this->overriddenEvents as $index=>$event) {
-                if ($index > $previousStamp && $index <= $currentStamp) {
-
-                    // We're moving the 'next date' aside, for later use.
-                    $this->nextDate = clone $this->currentDate;
-
-                    $this->currentDate = $event->DTSTART->getDateTime();
-                    $this->currentOverriddenEvent = $event;
-
-                    break;
-                }
-            }
-
-            break;
-
-        }
-
-        /*
-        if (!is_null($this->until)) {
-            if($this->currentDate > $this->until) {
-                $this->currentDate = null;
-            }
-        }*/
-
-        $this->counter++;
-
-    }
-
-    /**
-     * Does the processing for advancing the iterator for hourly frequency.
-     *
-     * @return void
-     */
-    protected function nextHourly() {
-
-        if (!$this->byHour) {
-            $this->currentDate->modify('+' . $this->interval . ' hours');
-            return;
-        }
-    }
-
-    /**
-     * Does the processing for advancing the iterator for daily frequency.
-     *
-     * @return void
-     */
-    protected function nextDaily() {
-
-        if (!$this->byHour && !$this->byDay) {
-            $this->currentDate->modify('+' . $this->interval . ' days');
-            return;
-        }
-
-        if (isset($this->byHour)) {
-            $recurrenceHours = $this->getHours();
-        }
-
-        if (isset($this->byDay)) {
-            $recurrenceDays = $this->getDays();
-        }
-
-        do {
-
-            if ($this->byHour) {
-                if ($this->currentDate->format('G') == '23') {
-                    // to obey the interval rule
-                    $this->currentDate->modify('+' . $this->interval-1 . ' days');
-                }
-
-                $this->currentDate->modify('+1 hours');
-
-            } else {
-                $this->currentDate->modify('+' . $this->interval . ' days');
-
-            }
-
-            // Current day of the week
-            $currentDay = $this->currentDate->format('w');
-
-            // Current hour of the day
-            $currentHour = $this->currentDate->format('G');
-
-        } while (($this->byDay && !in_array($currentDay, $recurrenceDays)) || ($this->byHour && !in_array($currentHour, $recurrenceHours)));
-
-    }
-
-    /**
-     * Does the processing for advancing the iterator for weekly frequency.
-     *
-     * @return void
-     */
-    protected function nextWeekly() {
-
-        if (!$this->byHour && !$this->byDay) {
-            $this->currentDate->modify('+' . $this->interval . ' weeks');
-            return;
-        }
-
-        if ($this->byHour) {
-            $recurrenceHours = $this->getHours();
-        }
-
-        if ($this->byDay) {
-            $recurrenceDays = $this->getDays();
-        }
-
-        // First day of the week:
-        $firstDay = $this->dayMap[$this->weekStart];
-
-        do {
-
-            if ($this->byHour) {
-                $this->currentDate->modify('+1 hours');
-            } else {
-                $this->currentDate->modify('+1 days');
-            }
-
-            // Current day of the week
-            $currentDay = (int) $this->currentDate->format('w');
-
-            // Current hour of the day
-            $currentHour = (int) $this->currentDate->format('G');
-
-            // We need to roll over to the next week
-            if ($currentDay === $firstDay && (!$this->byHour || $currentHour == '0')) {
-                $this->currentDate->modify('+' . $this->interval-1 . ' weeks');
-
-                // We need to go to the first day of this week, but only if we
-                // are not already on this first day of this week.
-                if($this->currentDate->format('w') != $firstDay) {
-                    $this->currentDate->modify('last ' . $this->dayNames[$this->dayMap[$this->weekStart]]);
-                }
-            }
-
-            // We have a match
-        } while (($this->byDay && !in_array($currentDay, $recurrenceDays)) || ($this->byHour && !in_array($currentHour, $recurrenceHours)));
-    }
-
-    /**
-     * Does the processing for advancing the iterator for monthly frequency.
-     *
-     * @return void
-     */
-    protected function nextMonthly() {
-
-        $currentDayOfMonth = $this->currentDate->format('j');
-        if (!$this->byMonthDay && !$this->byDay) {
-
-            // If the current day is higher than the 28th, rollover can
-            // occur to the next month. We Must skip these invalid
-            // entries.
-            if ($currentDayOfMonth < 29) {
-                $this->currentDate->modify('+' . $this->interval . ' months');
-            } else {
-                $increase = 0;
-                do {
-                    $increase++;
-                    $tempDate = clone $this->currentDate;
-                    $tempDate->modify('+ ' . ($this->interval*$increase) . ' months');
-                } while ($tempDate->format('j') != $currentDayOfMonth);
-                $this->currentDate = $tempDate;
-            }
-            return;
-        }
-
-        while(true) {
-
-            $occurrences = $this->getMonthlyOccurrences();
-
-            foreach($occurrences as $occurrence) {
-
-                // The first occurrence thats higher than the current
-                // day of the month wins.
-                if ($occurrence > $currentDayOfMonth) {
-                    break 2;
-                }
-
-            }
-
-            // If we made it all the way here, it means there were no
-            // valid occurrences, and we need to advance to the next
-            // month.
-            $this->currentDate->modify('first day of this month');
-            $this->currentDate->modify('+ ' . $this->interval . ' months');
-
-            // This goes to 0 because we need to start counting at hte
-            // beginning.
-            $currentDayOfMonth = 0;
-
-        }
-
-        $this->currentDate->setDate($this->currentDate->format('Y'), $this->currentDate->format('n'), $occurrence);
-
-    }
-
-    /**
-     * Does the processing for advancing the iterator for yearly frequency.
-     *
-     * @return void
-     */
-    protected function nextYearly() {
-
-        $currentMonth = $this->currentDate->format('n');
-        $currentYear = $this->currentDate->format('Y');
-        $currentDayOfMonth = $this->currentDate->format('j');
-
-        // No sub-rules, so we just advance by year
-        if (!$this->byMonth) {
-
-            // Unless it was a leap day!
-            if ($currentMonth==2 && $currentDayOfMonth==29) {
-
-                $counter = 0;
-                do {
-                    $counter++;
-                    // Here we increase the year count by the interval, until
-                    // we hit a date that's also in a leap year.
-                    //
-                    // We could just find the next interval that's dividable by
-                    // 4, but that would ignore the rule that there's no leap
-                    // year every year that's dividable by a 100, but not by
-                    // 400. (1800, 1900, 2100). So we just rely on the datetime
-                    // functions instead.
-                    $nextDate = clone $this->currentDate;
-                    $nextDate->modify('+ ' . ($this->interval*$counter) . ' years');
-                } while ($nextDate->format('n')!=2);
-                $this->currentDate = $nextDate;
-
-                return;
-
-            }
-
-            // The easiest form
-            $this->currentDate->modify('+' . $this->interval . ' years');
-            return;
-
-        }
-
-        $currentMonth = $this->currentDate->format('n');
-        $currentYear = $this->currentDate->format('Y');
-        $currentDayOfMonth = $this->currentDate->format('j');
-
-        $advancedToNewMonth = false;
-
-        // If we got a byDay or getMonthDay filter, we must first expand
-        // further.
-        if ($this->byDay || $this->byMonthDay) {
-
-            while(true) {
-
-                $occurrences = $this->getMonthlyOccurrences();
-
-                foreach($occurrences as $occurrence) {
-
-                    // The first occurrence that's higher than the current
-                    // day of the month wins.
-                    // If we advanced to the next month or year, the first
-                    // occurrence is always correct.
-                    if ($occurrence > $currentDayOfMonth || $advancedToNewMonth) {
-                        break 2;
-                    }
-
-                }
-
-                // If we made it here, it means we need to advance to
-                // the next month or year.
-                $currentDayOfMonth = 1;
-                $advancedToNewMonth = true;
-                do {
-
-                    $currentMonth++;
-                    if ($currentMonth>12) {
-                        $currentYear+=$this->interval;
-                        $currentMonth = 1;
-                    }
-                } while (!in_array($currentMonth, $this->byMonth));
-
-                $this->currentDate->setDate($currentYear, $currentMonth, $currentDayOfMonth);
-
-            }
-
-            // If we made it here, it means we got a valid occurrence
-            $this->currentDate->setDate($currentYear, $currentMonth, $occurrence);
-            return;
-
-        } else {
-
-            // These are the 'byMonth' rules, if there are no byDay or
-            // byMonthDay sub-rules.
-            do {
-
-                $currentMonth++;
-                if ($currentMonth>12) {
-                    $currentYear+=$this->interval;
-                    $currentMonth = 1;
-                }
-            } while (!in_array($currentMonth, $this->byMonth));
-            $this->currentDate->setDate($currentYear, $currentMonth, $currentDayOfMonth);
-
-            return;
-
-        }
-
-    }
-
-    /**
-     * Returns all the occurrences for a monthly frequency with a 'byDay' or
-     * 'byMonthDay' expansion for the current month.
-     *
-     * The returned list is an array of integers with the day of month (1-31).
-     *
-     * @return array
-     */
-    protected function getMonthlyOccurrences() {
-
-        $startDate = clone $this->currentDate;
-
-        $byDayResults = array();
-
-        // Our strategy is to simply go through the byDays, advance the date to
-        // that point and add it to the results.
-        if ($this->byDay) foreach($this->byDay as $day) {
-
-            $dayName = $this->dayNames[$this->dayMap[substr($day,-2)]];
-
-            // Dayname will be something like 'wednesday'. Now we need to find
-            // all wednesdays in this month.
-            $dayHits = array();
-
-            $checkDate = clone $startDate;
-            $checkDate->modify('first day of this month');
-            $checkDate->modify($dayName);
-
-            do {
-                $dayHits[] = $checkDate->format('j');
-                $checkDate->modify('next ' . $dayName);
-            } while ($checkDate->format('n') === $startDate->format('n'));
-
-            // So now we have 'all wednesdays' for month. It is however
-            // possible that the user only really wanted the 1st, 2nd or last
-            // wednesday.
-            if (strlen($day)>2) {
-                $offset = (int)substr($day,0,-2);
-
-                if ($offset>0) {
-                    // It is possible that the day does not exist, such as a
-                    // 5th or 6th wednesday of the month.
-                    if (isset($dayHits[$offset-1])) {
-                        $byDayResults[] = $dayHits[$offset-1];
-                    }
-                } else {
-
-                    // if it was negative we count from the end of the array
-                    $byDayResults[] = $dayHits[count($dayHits) + $offset];
-                }
-            } else {
-                // There was no counter (first, second, last wednesdays), so we
-                // just need to add the all to the list).
-                $byDayResults = array_merge($byDayResults, $dayHits);
-
-            }
-
-        }
-
-        $byMonthDayResults = array();
-        if ($this->byMonthDay) foreach($this->byMonthDay as $monthDay) {
-
-            // Removing values that are out of range for this month
-            if ($monthDay > $startDate->format('t') ||
-                $monthDay < 0-$startDate->format('t')) {
-                    continue;
-            }
-            if ($monthDay>0) {
-                $byMonthDayResults[] = $monthDay;
-            } else {
-                // Negative values
-                $byMonthDayResults[] = $startDate->format('t') + 1 + $monthDay;
-            }
-        }
-
-        // If there was just byDay or just byMonthDay, they just specify our
-        // (almost) final list. If both were provided, then byDay limits the
-        // list.
-        if ($this->byMonthDay && $this->byDay) {
-            $result = array_intersect($byMonthDayResults, $byDayResults);
-        } elseif ($this->byMonthDay) {
-            $result = $byMonthDayResults;
-        } else {
-            $result = $byDayResults;
-        }
-        $result = array_unique($result);
-        sort($result, SORT_NUMERIC);
-
-        // The last thing that needs checking is the BYSETPOS. If it's set, it
-        // means only certain items in the set survive the filter.
-        if (!$this->bySetPos) {
-            return $result;
-        }
-
-        $filteredResult = array();
-        foreach($this->bySetPos as $setPos) {
-
-            if ($setPos<0) {
-                $setPos = count($result)-($setPos+1);
-            }
-            if (isset($result[$setPos-1])) {
-                $filteredResult[] = $result[$setPos-1];
-            }
-        }
-
-        sort($filteredResult, SORT_NUMERIC);
-        return $filteredResult;
-
-    }
-
-    protected function getHours()
-    {
-        $recurrenceHours = array();
-        foreach($this->byHour as $byHour) {
-            $recurrenceHours[] = $byHour;
-        }
-
-        return $recurrenceHours;
-    }
-
-    protected function getDays()
-    {
-        $recurrenceDays = array();
-        foreach($this->byDay as $byDay) {
-
-            // The day may be preceeded with a positive (+n) or
-            // negative (-n) integer. However, this does not make
-            // sense in 'weekly' so we ignore it here.
-            $recurrenceDays[] = $this->dayMap[substr($byDay,-2)];
-
-        }
-
-        return $recurrenceDays;
-    }
-}
-
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Splitter/ICalendar.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Splitter/ICalendar.php
deleted file mode 100644
index 8eed0cac40..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Splitter/ICalendar.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Splitter;
-
-use Sabre\VObject;
-
-/**
- * Splitter
- *
- * This class is responsible for splitting up iCalendar objects.
- *
- * This class expects a single VCALENDAR object with one or more
- * calendar-objects inside. Objects with identical UID's will be combined into
- * a single object.
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Dominik Tobschall
- * @author Armin Hackmann
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class ICalendar implements SplitterInterface {
-
-    /**
-     * Timezones
-     *
-     * @var array
-     */
-    protected $vtimezones = array();
-
-    /**
-     * iCalendar objects
-     *
-     * @var array
-     */
-    protected $objects = array();
-
-    /**
-     * Constructor
-     *
-     * The splitter should receive an readable file stream as it's input.
-     *
-     * @param resource $input
-     */
-    public function __construct($input) {
-
-        $data = VObject\Reader::read(stream_get_contents($input));
-        $vtimezones = array();
-        $components = array();
-
-        foreach($data->children as $component) {
-            if (!$component instanceof VObject\Component) {
-                continue;
-            }
-
-            // Get all timezones
-            if ($component->name === 'VTIMEZONE') {
-                $this->vtimezones[(string)$component->TZID] = $component;
-                continue;
-            }
-
-            // Get component UID for recurring Events search
-            if($component->UID) {
-                $uid = (string)$component->UID;
-            } else {
-                // Generating a random UID
-                $uid = sha1(microtime()) . '-vobjectimport';
-            }
-
-            // Take care of recurring events
-            if (!array_key_exists($uid, $this->objects)) {
-                $this->objects[$uid] = VObject\Component::create('VCALENDAR');
-            }
-
-            $this->objects[$uid]->add(clone $component);
-        }
-
-    }
-
-    /**
-     * Every time getNext() is called, a new object will be parsed, until we
-     * hit the end of the stream.
-     *
-     * When the end is reached, null will be returned.
-     *
-     * @return Sabre\VObject\Component|null
-     */
-    public function getNext() {
-
-        if($object=array_shift($this->objects)) {
-
-            // create our baseobject
-            $object->version = '2.0';
-            $object->prodid = '-//Sabre//Sabre VObject ' . VObject\Version::VERSION . '//EN';
-            $object->calscale = 'GREGORIAN';
-
-            // add vtimezone information to obj (if we have it)
-            foreach ($this->vtimezones as $vtimezone) {
-                $object->add($vtimezone);
-            }
-
-            return $object;
-
-        } else {
-
-            return null;
-
-        }
-
-   }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Splitter/SplitterInterface.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Splitter/SplitterInterface.php
deleted file mode 100644
index 54b1ff3c5d..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Splitter/SplitterInterface.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Splitter;
-
-/**
- * VObject splitter
- *
- * The splitter is responsible for reading a large vCard or iCalendar object,
- * and splitting it into multiple objects.
- *
- * This is for example for Card and CalDAV, which require every event and vcard
- * to exist in their own objects, instead of one large one.
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Dominik Tobschall
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-interface SplitterInterface {
-
-    /**
-     * Constructor
-     *
-     * The splitter should receive an readable file stream as it's input.
-     *
-     * @param resource $input
-     */
-    function __construct($input);
-
-    /**
-     * Every time getNext() is called, a new object will be parsed, until we
-     * hit the end of the stream.
-     *
-     * When the end is reached, null will be returned.
-     *
-     * @return Sabre\VObject\Component|null
-     */
-    function getNext();
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Splitter/VCard.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Splitter/VCard.php
deleted file mode 100644
index 7e443064e5..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Splitter/VCard.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Splitter;
-
-use Sabre\VObject;
-
-/**
- * Splitter
- *
- * This class is responsible for splitting up VCard objects.
- *
- * It is assumed that the input stream contains 1 or more VCARD objects. This
- * class checks for BEGIN:VCARD and END:VCARD and parses each encountered
- * component individually.
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Dominik Tobschall
- * @author Armin Hackmann
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class VCard implements SplitterInterface {
-
-    /**
-     * File handle
-     *
-     * @var resource
-     */
-    protected $input;
-
-    /**
-     * Constructor
-     *
-     * The splitter should receive an readable file stream as it's input.
-     *
-     * @param resource $input
-     */
-    public function __construct($input) {
-
-        $this->input = $input;
-
-    }
-
-    /**
-     * Every time getNext() is called, a new object will be parsed, until we
-     * hit the end of the stream.
-     *
-     * When the end is reached, null will be returned.
-     *
-     * @return Sabre\VObject\Component|null
-     */
-    public function getNext() {
-
-        $vcard = '';
-
-        do {
-
-            if (feof($this->input)) {
-                return false;
-            }
-
-            $line = fgets($this->input);
-            $vcard .= $line;
-
-        } while(strtoupper(substr($line,0,4))!=="END:");
-
-        $object = VObject\Reader::read($vcard);
-
-        if($object->name !== 'VCARD') {
-            throw new \InvalidArgumentException("Thats no vCard!", 1);
-        }
-
-        return $object;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/StringUtil.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/StringUtil.php
deleted file mode 100644
index fe1854d6cc..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/StringUtil.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-/**
- * Useful utilities for working with various strings.
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class StringUtil {
-
-    /**
-     * Returns true or false depending on if a string is valid UTF-8
-     *
-     * @param string $str
-     * @return bool
-     */
-    static function isUTF8($str) {
-
-        // First check.. mb_check_encoding
-        if (!mb_check_encoding($str, 'UTF-8')) {
-            return false;
-        }
-
-        // Control characters
-        if (preg_match('%(?:[\x00-\x08\x0B-\x0C\x0E\x0F])%', $str)) {
-            return false;
-        }
-
-        return true;
-
-    }
-
-    /**
-     * This method tries its best to convert the input string to UTF-8.
-     *
-     * Currently only ISO-5991-1 input and UTF-8 input is supported, but this
-     * may be expanded upon if we receive other examples.
-     *
-     * @param string $str
-     * @return string
-     */
-    static function convertToUTF8($str) {
-
-        $encoding = mb_detect_encoding($str , array('UTF-8','ISO-8859-1'), true);
-
-        if ($encoding === 'ISO-8859-1') {
-            $newStr = utf8_encode($str);
-        } else {
-            $newStr = $str;
-        }
-
-        // Removing any control characters
-        return (preg_replace('%(?:[\x00-\x08\x0B-\x0C\x0E\x0F])%', '', $newStr));
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/TimeZoneUtil.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/TimeZoneUtil.php
deleted file mode 100644
index 8613e864b7..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/TimeZoneUtil.php
+++ /dev/null
@@ -1,482 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-/**
- * Time zone name translation
- *
- * This file translates well-known time zone names into "Olson database" time zone names.
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Frank Edelhaeuser (fedel@users.sourceforge.net)
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class TimeZoneUtil {
-
-    public static $map = array(
-
-        // from http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/zone_tzid.html
-        // snapshot taken on 2012/01/16
-
-        // windows
-        'AUS Central Standard Time'=>'Australia/Darwin',
-        'AUS Eastern Standard Time'=>'Australia/Sydney',
-        'Afghanistan Standard Time'=>'Asia/Kabul',
-        'Alaskan Standard Time'=>'America/Anchorage',
-        'Arab Standard Time'=>'Asia/Riyadh',
-        'Arabian Standard Time'=>'Asia/Dubai',
-        'Arabic Standard Time'=>'Asia/Baghdad',
-        'Argentina Standard Time'=>'America/Buenos_Aires',
-        'Armenian Standard Time'=>'Asia/Yerevan',
-        'Atlantic Standard Time'=>'America/Halifax',
-        'Azerbaijan Standard Time'=>'Asia/Baku',
-        'Azores Standard Time'=>'Atlantic/Azores',
-        'Bangladesh Standard Time'=>'Asia/Dhaka',
-        'Canada Central Standard Time'=>'America/Regina',
-        'Cape Verde Standard Time'=>'Atlantic/Cape_Verde',
-        'Caucasus Standard Time'=>'Asia/Yerevan',
-        'Cen. Australia Standard Time'=>'Australia/Adelaide',
-        'Central America Standard Time'=>'America/Guatemala',
-        'Central Asia Standard Time'=>'Asia/Almaty',
-        'Central Brazilian Standard Time'=>'America/Cuiaba',
-        'Central Europe Standard Time'=>'Europe/Budapest',
-        'Central European Standard Time'=>'Europe/Warsaw',
-        'Central Pacific Standard Time'=>'Pacific/Guadalcanal',
-        'Central Standard Time'=>'America/Chicago',
-        'Central Standard Time (Mexico)'=>'America/Mexico_City',
-        'China Standard Time'=>'Asia/Shanghai',
-        'Dateline Standard Time'=>'Etc/GMT+12',
-        'E. Africa Standard Time'=>'Africa/Nairobi',
-        'E. Australia Standard Time'=>'Australia/Brisbane',
-        'E. Europe Standard Time'=>'Europe/Minsk',
-        'E. South America Standard Time'=>'America/Sao_Paulo',
-        'Eastern Standard Time'=>'America/New_York',
-        'Egypt Standard Time'=>'Africa/Cairo',
-        'Ekaterinburg Standard Time'=>'Asia/Yekaterinburg',
-        'FLE Standard Time'=>'Europe/Kiev',
-        'Fiji Standard Time'=>'Pacific/Fiji',
-        'GMT Standard Time'=>'Europe/London',
-        'GTB Standard Time'=>'Europe/Istanbul',
-        'Georgian Standard Time'=>'Asia/Tbilisi',
-        'Greenland Standard Time'=>'America/Godthab',
-        'Greenwich Standard Time'=>'Atlantic/Reykjavik',
-        'Hawaiian Standard Time'=>'Pacific/Honolulu',
-        'India Standard Time'=>'Asia/Calcutta',
-        'Iran Standard Time'=>'Asia/Tehran',
-        'Israel Standard Time'=>'Asia/Jerusalem',
-        'Jordan Standard Time'=>'Asia/Amman',
-        'Kamchatka Standard Time'=>'Asia/Kamchatka',
-        'Korea Standard Time'=>'Asia/Seoul',
-        'Magadan Standard Time'=>'Asia/Magadan',
-        'Mauritius Standard Time'=>'Indian/Mauritius',
-        'Mexico Standard Time'=>'America/Mexico_City',
-        'Mexico Standard Time 2'=>'America/Chihuahua',
-        'Mid-Atlantic Standard Time'=>'Etc/GMT-2',
-        'Middle East Standard Time'=>'Asia/Beirut',
-        'Montevideo Standard Time'=>'America/Montevideo',
-        'Morocco Standard Time'=>'Africa/Casablanca',
-        'Mountain Standard Time'=>'America/Denver',
-        'Mountain Standard Time (Mexico)'=>'America/Chihuahua',
-        'Myanmar Standard Time'=>'Asia/Rangoon',
-        'N. Central Asia Standard Time'=>'Asia/Novosibirsk',
-        'Namibia Standard Time'=>'Africa/Windhoek',
-        'Nepal Standard Time'=>'Asia/Katmandu',
-        'New Zealand Standard Time'=>'Pacific/Auckland',
-        'Newfoundland Standard Time'=>'America/St_Johns',
-        'North Asia East Standard Time'=>'Asia/Irkutsk',
-        'North Asia Standard Time'=>'Asia/Krasnoyarsk',
-        'Pacific SA Standard Time'=>'America/Santiago',
-        'Pacific Standard Time'=>'America/Los_Angeles',
-        'Pacific Standard Time (Mexico)'=>'America/Santa_Isabel',
-        'Pakistan Standard Time'=>'Asia/Karachi',
-        'Paraguay Standard Time'=>'America/Asuncion',
-        'Romance Standard Time'=>'Europe/Paris',
-        'Russian Standard Time'=>'Europe/Moscow',
-        'SA Eastern Standard Time'=>'America/Cayenne',
-        'SA Pacific Standard Time'=>'America/Bogota',
-        'SA Western Standard Time'=>'America/La_Paz',
-        'SE Asia Standard Time'=>'Asia/Bangkok',
-        'Samoa Standard Time'=>'Pacific/Apia',
-        'Singapore Standard Time'=>'Asia/Singapore',
-        'South Africa Standard Time'=>'Africa/Johannesburg',
-        'Sri Lanka Standard Time'=>'Asia/Colombo',
-        'Syria Standard Time'=>'Asia/Damascus',
-        'Taipei Standard Time'=>'Asia/Taipei',
-        'Tasmania Standard Time'=>'Australia/Hobart',
-        'Tokyo Standard Time'=>'Asia/Tokyo',
-        'Tonga Standard Time'=>'Pacific/Tongatapu',
-        'US Eastern Standard Time'=>'America/Indianapolis',
-        'US Mountain Standard Time'=>'America/Phoenix',
-        'UTC+12'=>'Etc/GMT-12',
-        'UTC-02'=>'Etc/GMT+2',
-        'UTC-11'=>'Etc/GMT+11',
-        'Ulaanbaatar Standard Time'=>'Asia/Ulaanbaatar',
-        'Venezuela Standard Time'=>'America/Caracas',
-        'Vladivostok Standard Time'=>'Asia/Vladivostok',
-        'W. Australia Standard Time'=>'Australia/Perth',
-        'W. Central Africa Standard Time'=>'Africa/Lagos',
-        'W. Europe Standard Time'=>'Europe/Berlin',
-        'West Asia Standard Time'=>'Asia/Tashkent',
-        'West Pacific Standard Time'=>'Pacific/Port_Moresby',
-        'Yakutsk Standard Time'=>'Asia/Yakutsk',
-
-        // Microsoft exchange timezones
-        // Source:
-        // http://msdn.microsoft.com/en-us/library/ms988620%28v=exchg.65%29.aspx
-        //
-        // Correct timezones deduced with help from:
-        // http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-        'Universal Coordinated Time' => 'UTC',
-        'Casablanca, Monrovia' => 'Africa/Casablanca',
-        'Greenwich Mean Time: Dublin, Edinburgh, Lisbon, London' => 'Europe/Lisbon',
-        'Greenwich Mean Time; Dublin, Edinburgh, London' =>  'Europe/London',
-        'Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna' => 'Europe/Berlin',
-        'Belgrade, Pozsony, Budapest, Ljubljana, Prague' => 'Europe/Prague',
-        'Brussels, Copenhagen, Madrid, Paris' => 'Europe/Paris',
-        'Paris, Madrid, Brussels, Copenhagen' => 'Europe/Paris',
-        'Prague, Central Europe' => 'Europe/Prague',
-        'Sarajevo, Skopje, Sofija, Vilnius, Warsaw, Zagreb' => 'Europe/Sarajevo',
-        'West Central Africa' => 'Africa/Luanda', // This was a best guess
-        'Athens, Istanbul, Minsk' => 'Europe/Athens',
-        'Bucharest' => 'Europe/Bucharest',
-        'Cairo' => 'Africa/Cairo',
-        'Harare, Pretoria' => 'Africa/Harare',
-        'Helsinki, Riga, Tallinn' => 'Europe/Helsinki',
-        'Israel, Jerusalem Standard Time' => 'Asia/Jerusalem',
-        'Baghdad' => 'Asia/Baghdad',
-        'Arab, Kuwait, Riyadh' => 'Asia/Kuwait',
-        'Moscow, St. Petersburg, Volgograd' => 'Europe/Moscow',
-        'East Africa, Nairobi' => 'Africa/Nairobi',
-        'Tehran' => 'Asia/Tehran',
-        'Abu Dhabi, Muscat' => 'Asia/Muscat', // Best guess
-        'Baku, Tbilisi, Yerevan' => 'Asia/Baku',
-        'Kabul' => 'Asia/Kabul',
-        'Ekaterinburg' => 'Asia/Yekaterinburg',
-        'Islamabad, Karachi, Tashkent' => 'Asia/Karachi',
-        'Kolkata, Chennai, Mumbai, New Delhi, India Standard Time' => 'Asia/Calcutta',
-        'Kathmandu, Nepal' => 'Asia/Kathmandu',
-        'Almaty, Novosibirsk, North Central Asia' => 'Asia/Almaty',
-        'Astana, Dhaka' => 'Asia/Dhaka',
-        'Sri Jayawardenepura, Sri Lanka' => 'Asia/Colombo',
-        'Rangoon' => 'Asia/Rangoon',
-        'Bangkok, Hanoi, Jakarta' => 'Asia/Bangkok',
-        'Krasnoyarsk' => 'Asia/Krasnoyarsk',
-        'Beijing, Chongqing, Hong Kong SAR, Urumqi' => 'Asia/Shanghai',
-        'Irkutsk, Ulaan Bataar' => 'Asia/Irkutsk',
-        'Kuala Lumpur, Singapore' => 'Asia/Singapore',
-        'Perth, Western Australia' => 'Australia/Perth',
-        'Taipei' => 'Asia/Taipei',
-        'Osaka, Sapporo, Tokyo' => 'Asia/Tokyo',
-        'Seoul, Korea Standard time' => 'Asia/Seoul',
-        'Yakutsk' => 'Asia/Yakutsk',
-        'Adelaide, Central Australia' => 'Australia/Adelaide',
-        'Darwin' => 'Australia/Darwin',
-        'Brisbane, East Australia' => 'Australia/Brisbane',
-        'Canberra, Melbourne, Sydney, Hobart (year 2000 only)' => 'Australia/Sydney',
-        'Guam, Port Moresby' => 'Pacific/Guam',
-        'Hobart, Tasmania' => 'Australia/Hobart',
-        'Vladivostok' => 'Asia/Vladivostok',
-        'Magadan, Solomon Is., New Caledonia' => 'Asia/Magadan',
-        'Auckland, Wellington' => 'Pacific/Auckland',
-        'Fiji Islands, Kamchatka, Marshall Is.' => 'Pacific/Fiji',
-        'Nuku\'alofa, Tonga' => 'Pacific/Tongatapu',
-        'Azores' => 'Atlantic/Azores',
-        'Cape Verde Is.' => 'Atlantic/Cape_Verde',
-        'Mid-Atlantic' => 'America/Noronha',
-        'Brasilia' => 'America/Sao_Paulo', // Best guess
-        'Buenos Aires' => 'America/Argentina/Buenos_Aires',
-        'Greenland' => 'America/Godthab',
-        'Newfoundland' => 'America/St_Johns',
-        'Atlantic Time (Canada)' => 'America/Halifax',
-        'Caracas, La Paz' => 'America/Caracas',
-        'Santiago' => 'America/Santiago',
-        'Bogota, Lima, Quito' => 'America/Bogota',
-        'Eastern Time (US & Canada)' => 'America/New_York',
-        'Indiana (East)' => 'America/Indiana/Indianapolis',
-        'Central America' => 'America/Guatemala',
-        'Central Time (US & Canada)' => 'America/Chicago',
-        'Mexico City, Tegucigalpa' => 'America/Mexico_City',
-        'Saskatchewan' => 'America/Edmonton',
-        'Arizona' => 'America/Phoenix',
-        'Mountain Time (US & Canada)' => 'America/Denver', // Best guess
-        'Pacific Time (US & Canada); Tijuana' => 'America/Los_Angeles', // Best guess
-        'Alaska' => 'America/Anchorage',
-        'Hawaii' => 'Pacific/Honolulu',
-        'Midway Island, Samoa' => 'Pacific/Midway',
-        'Eniwetok, Kwajalein, Dateline Time' => 'Pacific/Kwajalein',
-
-        // The following list are timezone names that could be generated by
-        // Lotus / Domino
-        'Dateline'               => 'Etc/GMT-12',
-        'Samoa'                  => 'Pacific/Apia',
-        'Hawaiian'               => 'Pacific/Honolulu',
-        'Alaskan'                => 'America/Anchorage',
-        'Pacific'                => 'America/Los_Angeles',
-        'Pacific Standard Time'  => 'America/Los_Angeles',
-        'Mexico Standard Time 2' => 'America/Chihuahua',
-        'Mountain'               => 'America/Denver',
-        'Mountain Standard Time' => 'America/Chihuahua',
-        'US Mountain'            => 'America/Phoenix',
-        'Canada Central'         => 'America/Edmonton',
-        'Central America'        => 'America/Guatemala',
-        'Central'                => 'America/Chicago',
-        'Central Standard Time'  => 'America/Mexico_City',
-        'Mexico'                 => 'America/Mexico_City',
-        'Eastern'                => 'America/New_York',
-        'SA Pacific'             => 'America/Bogota',
-        'US Eastern'             => 'America/Indiana/Indianapolis',
-        'Venezuela'              => 'America/Caracas',
-        'Atlantic'               => 'America/Halifax',
-        'Central Brazilian'      => 'America/Manaus',
-        'Pacific SA'             => 'America/Santiago',
-        'SA Western'             => 'America/La_Paz',
-        'Newfoundland'           => 'America/St_Johns',
-        'Argentina'              => 'America/Argentina/Buenos_Aires',
-        'E. South America'       => 'America/Belem',
-        'Greenland'              => 'America/Godthab',
-        'Montevideo'             => 'America/Montevideo',
-        'SA Eastern'             => 'America/Belem',
-        'Mid-Atlantic'           => 'Etc/GMT-2',
-        'Azores'                 => 'Atlantic/Azores',
-        'Cape Verde'             => 'Atlantic/Cape_Verde',
-        'Greenwich'              => 'Atlantic/Reykjavik', // No I'm serious.. Greenwich is not GMT.
-        'Morocco'                => 'Africa/Casablanca',
-        'Central Europe'         => 'Europe/Prague',
-        'Central European'       => 'Europe/Sarajevo',
-        'Romance'                => 'Europe/Paris',
-        'W. Central Africa'      => 'Africa/Lagos', // Best guess
-        'W. Europe'              => 'Europe/Amsterdam',
-        'E. Europe'              => 'Europe/Minsk',
-        'Egypt'                  => 'Africa/Cairo',
-        'FLE'                    => 'Europe/Helsinki',
-        'GTB'                    => 'Europe/Athens',
-        'Israel'                 => 'Asia/Jerusalem',
-        'Jordan'                 => 'Asia/Amman',
-        'Middle East'            => 'Asia/Beirut',
-        'Namibia'                => 'Africa/Windhoek',
-        'South Africa'           => 'Africa/Harare',
-        'Arab'                   => 'Asia/Kuwait',
-        'Arabic'                 => 'Asia/Baghdad',
-        'E. Africa'              => 'Africa/Nairobi',
-        'Georgian'               => 'Asia/Tbilisi',
-        'Russian'                => 'Europe/Moscow',
-        'Iran'                   => 'Asia/Tehran',
-        'Arabian'                => 'Asia/Muscat',
-        'Armenian'               => 'Asia/Yerevan',
-        'Azerbijan'              => 'Asia/Baku',
-        'Caucasus'               => 'Asia/Yerevan',
-        'Mauritius'              => 'Indian/Mauritius',
-        'Afghanistan'            => 'Asia/Kabul',
-        'Ekaterinburg'           => 'Asia/Yekaterinburg',
-        'Pakistan'               => 'Asia/Karachi',
-        'West Asia'              => 'Asia/Tashkent',
-        'India'                  => 'Asia/Calcutta',
-        'Sri Lanka'              => 'Asia/Colombo',
-        'Nepal'                  => 'Asia/Kathmandu',
-        'Central Asia'           => 'Asia/Dhaka',
-        'N. Central Asia'        => 'Asia/Almaty',
-        'Myanmar'                => 'Asia/Rangoon',
-        'North Asia'             => 'Asia/Krasnoyarsk',
-        'SE Asia'                => 'Asia/Bangkok',
-        'China'                  => 'Asia/Shanghai',
-        'North Asia East'        => 'Asia/Irkutsk',
-        'Singapore'              => 'Asia/Singapore',
-        'Taipei'                 => 'Asia/Taipei',
-        'W. Australia'           => 'Australia/Perth',
-        'Korea'                  => 'Asia/Seoul',
-        'Tokyo'                  => 'Asia/Tokyo',
-        'Yakutsk'                => 'Asia/Yakutsk',
-        'AUS Central'            => 'Australia/Darwin',
-        'Cen. Australia'         => 'Australia/Adelaide',
-        'AUS Eastern'            => 'Australia/Sydney',
-        'E. Australia'           => 'Australia/Brisbane',
-        'Tasmania'               => 'Australia/Hobart',
-        'Vladivostok'            => 'Asia/Vladivostok',
-        'West Pacific'           => 'Pacific/Guam',
-        'Central Pacific'        => 'Asia/Magadan',
-        'Fiji'                   => 'Pacific/Fiji',
-        'New Zealand'            => 'Pacific/Auckland',
-        'Tonga'                  => 'Pacific/Tongatapu',
-    );
-
-    /**
-     * List of microsoft exchange timezone ids.
-     *
-     * Source: http://msdn.microsoft.com/en-us/library/aa563018(loband).aspx
-     */
-    public static $microsoftExchangeMap = array(
-        0  => 'UTC',
-        31 => 'Africa/Casablanca',
-
-        // Insanely, id #2 is used for both Europe/Lisbon, and Europe/Sarajevo.
-        // I'm not even kidding.. We handle this special case in the
-        // getTimeZone method.
-        2  => 'Europe/Lisbon',
-        1  => 'Europe/London',
-        4  => 'Europe/Berlin',
-        6  => 'Europe/Prague',
-        3  => 'Europe/Paris',
-        69 => 'Africa/Luanda', // This was a best guess
-        7  => 'Europe/Athens',
-        5  => 'Europe/Bucharest',
-        49 => 'Africa/Cairo',
-        50 => 'Africa/Harare',
-        59 => 'Europe/Helsinki',
-        27 => 'Asia/Jerusalem',
-        26 => 'Asia/Baghdad',
-        74 => 'Asia/Kuwait',
-        51 => 'Europe/Moscow',
-        56 => 'Africa/Nairobi',
-        25 => 'Asia/Tehran',
-        24 => 'Asia/Muscat', // Best guess
-        54 => 'Asia/Baku',
-        48 => 'Asia/Kabul',
-        58 => 'Asia/Yekaterinburg',
-        47 => 'Asia/Karachi',
-        23 => 'Asia/Calcutta',
-        62 => 'Asia/Kathmandu',
-        46 => 'Asia/Almaty',
-        71 => 'Asia/Dhaka',
-        66 => 'Asia/Colombo',
-        61 => 'Asia/Rangoon',
-        22 => 'Asia/Bangkok',
-        64 => 'Asia/Krasnoyarsk',
-        45 => 'Asia/Shanghai',
-        63 => 'Asia/Irkutsk',
-        21 => 'Asia/Singapore',
-        73 => 'Australia/Perth',
-        75 => 'Asia/Taipei',
-        20 => 'Asia/Tokyo',
-        72 => 'Asia/Seoul',
-        70 => 'Asia/Yakutsk',
-        19 => 'Australia/Adelaide',
-        44 => 'Australia/Darwin',
-        18 => 'Australia/Brisbane',
-        76 => 'Australia/Sydney',
-        43 => 'Pacific/Guam',
-        42 => 'Australia/Hobart',
-        68 => 'Asia/Vladivostok',
-        41 => 'Asia/Magadan',
-        17 => 'Pacific/Auckland',
-        40 => 'Pacific/Fiji',
-        67 => 'Pacific/Tongatapu',
-        29 => 'Atlantic/Azores',
-        53 => 'Atlantic/Cape_Verde',
-        30 => 'America/Noronha',
-         8 => 'America/Sao_Paulo', // Best guess
-        32 => 'America/Argentina/Buenos_Aires',
-        60 => 'America/Godthab',
-        28 => 'America/St_Johns',
-         9 => 'America/Halifax',
-        33 => 'America/Caracas',
-        65 => 'America/Santiago',
-        35 => 'America/Bogota',
-        10 => 'America/New_York',
-        34 => 'America/Indiana/Indianapolis',
-        55 => 'America/Guatemala',
-        11 => 'America/Chicago',
-        37 => 'America/Mexico_City',
-        36 => 'America/Edmonton',
-        38 => 'America/Phoenix',
-        12 => 'America/Denver', // Best guess
-        13 => 'America/Los_Angeles', // Best guess
-        14 => 'America/Anchorage',
-        15 => 'Pacific/Honolulu',
-        16 => 'Pacific/Midway',
-        39 => 'Pacific/Kwajalein',
-    );
-
-    /**
-     * This method will try to find out the correct timezone for an iCalendar
-     * date-time value.
-     *
-     * You must pass the contents of the TZID parameter, as well as the full
-     * calendar.
-     *
-     * If the lookup fails, this method will return the default PHP timezone
-     * (as configured using date_default_timezone_set, or the date.timezone ini
-     * setting).
-     *
-     * Alternatively, if $failIfUncertain is set to true, it will throw an
-     * exception if we cannot accurately determine the timezone.
-     *
-     * @param string $tzid
-     * @param Sabre\VObject\Component $vcalendar
-     * @return DateTimeZone
-     */
-    static public function getTimeZone($tzid, Component $vcalendar = null, $failIfUncertain = false) {
-
-        // First we will just see if the tzid is a support timezone identifier.
-        try {
-            return new \DateTimeZone($tzid);
-        } catch (\Exception $e) {
-        }
-
-        // Next, we check if the tzid is somewhere in our tzid map.
-        if (isset(self::$map[$tzid])) {
-            return new \DateTimeZone(self::$map[$tzid]);
-        }
-
-        // Maybe the author was hyper-lazy and just included an offset. We
-        // support it, but we aren't happy about it.
-        if (preg_match('/^GMT(\+|-)([0-9]{4})$/', $tzid, $matches)) {
-            return new \DateTimeZone('Etc/GMT' . $matches[1] . ltrim(substr($matches[2],0,2),'0'));
-        }
-
-        if ($vcalendar) {
-
-            // If that didn't work, we will scan VTIMEZONE objects
-            foreach($vcalendar->select('VTIMEZONE') as $vtimezone) {
-
-                if ((string)$vtimezone->TZID === $tzid) {
-
-                    // Some clients add 'X-LIC-LOCATION' with the olson name.
-                    if (isset($vtimezone->{'X-LIC-LOCATION'})) {
-
-                        $lic = (string)$vtimezone->{'X-LIC-LOCATION'};
-
-                        // Libical generators may specify strings like
-                        // "SystemV/EST5EDT". For those we must remove the
-                        // SystemV part.
-                        if (substr($lic,0,8)==='SystemV/') {
-                            $lic = substr($lic,8);
-                        }
-
-                        try {
-                            return new \DateTimeZone($lic);
-                        } catch (\Exception $e) {
-                        }
-
-                    }
-                    // Microsoft may add a magic number, which we also have an
-                    // answer for.
-                    if (isset($vtimezone->{'X-MICROSOFT-CDO-TZID'})) {
-                        $cdoId = (int)$vtimezone->{'X-MICROSOFT-CDO-TZID'}->value;
-
-                        // 2 can mean both Europe/Lisbon and Europe/Sarajevo.
-                        if ($cdoId===2 && strpos((string)$vtimezone->TZID, 'Sarajevo')!==false) {
-                            return new \DateTimeZone('Europe/Sarajevo');
-                        }
-
-                        if (isset(self::$microsoftExchangeMap[$cdoId])) {
-                            return new \DateTimeZone(self::$microsoftExchangeMap[$cdoId]);
-                        }
-                    }
-
-                }
-
-            }
-
-        }
-
-        if ($failIfUncertain) {
-            throw new \InvalidArgumentException('We were unable to determine the correct PHP timezone for tzid: ' . $tzid);
-        }
-
-        // If we got all the way here, we default to UTC.
-        return new \DateTimeZone(date_default_timezone_get());
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Version.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Version.php
deleted file mode 100644
index 7fdf1fdcea..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/Version.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-/**
- * This class contains the version number for the VObject package
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-class Version {
-
-    /**
-     * Full version number
-     */
-    const VERSION = '2.0.7';
-
-    /**
-     * Stability : alpha, beta, stable
-     */
-    const STABILITY = 'stable';
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/includes.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/includes.php
deleted file mode 100644
index 746c94bfe7..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/lib/Sabre/VObject/includes.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * Includes file
- *
- * This file includes the entire VObject library in one go.
- * The benefit is that an autoloader is not needed, which is often faster.
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
- * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
- */
-
-// Begin includes
-include __DIR__ . '/DateTimeParser.php';
-include __DIR__ . '/ElementList.php';
-include __DIR__ . '/FreeBusyGenerator.php';
-include __DIR__ . '/Node.php';
-include __DIR__ . '/Parameter.php';
-include __DIR__ . '/ParseException.php';
-include __DIR__ . '/Property.php';
-include __DIR__ . '/Reader.php';
-include __DIR__ . '/RecurrenceIterator.php';
-include __DIR__ . '/Splitter/SplitterInterface.php';
-include __DIR__ . '/StringUtil.php';
-include __DIR__ . '/TimeZoneUtil.php';
-include __DIR__ . '/Version.php';
-include __DIR__ . '/Splitter/VCard.php';
-include __DIR__ . '/Component.php';
-include __DIR__ . '/Property/Compound.php';
-include __DIR__ . '/Property/DateTime.php';
-include __DIR__ . '/Property/MultiDateTime.php';
-include __DIR__ . '/Splitter/ICalendar.php';
-include __DIR__ . '/Component/VAlarm.php';
-include __DIR__ . '/Component/VCalendar.php';
-include __DIR__ . '/Component/VEvent.php';
-include __DIR__ . '/Component/VFreeBusy.php';
-include __DIR__ . '/Component/VJournal.php';
-include __DIR__ . '/Component/VTodo.php';
-// End includes
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VAlarmTest.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VAlarmTest.php
deleted file mode 100644
index d57be7aa5d..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VAlarmTest.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Component;
-
-use Sabre\VObject\Component;
-use DateTime;
-use Sabre\VObject\Reader;
-
-class VAlarmTest extends \PHPUnit_Framework_TestCase {
-
-    /**
-     * @dataProvider timeRangeTestData
-     */
-    public function testInTimeRange(VAlarm $valarm,$start,$end,$outcome) {
-
-        $this->assertEquals($outcome, $valarm->isInTimeRange($start, $end));
-
-    }
-
-    public function timeRangeTestData() {
-
-        $tests = array();
-
-        // Hard date and time        
-        $valarm1 = Component::create('VALARM');
-        $valarm1->TRIGGER = '20120312T130000Z';
-        $valarm1->TRIGGER['VALUE'] = 'DATE-TIME';
-
-        $tests[] = array($valarm1, new DateTime('2012-03-01 01:00:00'), new DateTime('2012-04-01 01:00:00'), true);
-        $tests[] = array($valarm1, new DateTime('2012-03-01 01:00:00'), new DateTime('2012-03-10 01:00:00'), false);
-
-        // Relation to start time of event
-        $valarm2 = Component::create('VALARM');
-        $valarm2->TRIGGER = '-P1D';
-        $valarm2->TRIGGER['VALUE'] = 'DURATION';
-
-        $vevent2 = Component::create('VEVENT');
-        $vevent2->DTSTART = '20120313T130000Z';
-        $vevent2->add($valarm2);
-
-        $tests[] = array($valarm2, new DateTime('2012-03-01 01:00:00'), new DateTime('2012-04-01 01:00:00'), true);
-        $tests[] = array($valarm2, new DateTime('2012-03-01 01:00:00'), new DateTime('2012-03-10 01:00:00'), false);
-
-        // Relation to end time of event
-        $valarm3 = Component::create('VALARM');
-        $valarm3->TRIGGER = '-P1D';
-        $valarm3->TRIGGER['VALUE'] = 'DURATION';
-        $valarm3->TRIGGER['RELATED']= 'END';
-
-        $vevent3 = Component::create('VEVENT');
-        $vevent3->DTSTART = '20120301T130000Z';
-        $vevent3->DTEND = '20120401T130000Z';
-        $vevent3->add($valarm3);
-
-        $tests[] = array($valarm3, new DateTime('2012-02-25 01:00:00'), new DateTime('2012-03-05 01:00:00'), false);
-        $tests[] = array($valarm3, new DateTime('2012-03-25 01:00:00'), new DateTime('2012-04-05 01:00:00'), true);
-
-        // Relation to end time of todo 
-        $valarm4 = Component::create('VALARM');
-        $valarm4->TRIGGER = '-P1D';
-        $valarm4->TRIGGER['VALUE'] = 'DURATION';
-        $valarm4->TRIGGER['RELATED']= 'END';
-
-        $vtodo4 = Component::create('VTODO');
-        $vtodo4->DTSTART = '20120301T130000Z';
-        $vtodo4->DUE = '20120401T130000Z';
-        $vtodo4->add($valarm4);
-
-        $tests[] = array($valarm4, new DateTime('2012-02-25 01:00:00'), new DateTime('2012-03-05 01:00:00'), false);
-        $tests[] = array($valarm4, new DateTime('2012-03-25 01:00:00'), new DateTime('2012-04-05 01:00:00'), true);
-
-        // Relation to start time of event + repeat
-        $valarm5 = Component::create('VALARM');
-        $valarm5->TRIGGER = '-P1D';
-        $valarm5->TRIGGER['VALUE'] = 'DURATION';
-        $valarm5->REPEAT = 10;
-        $valarm5->DURATION = 'P1D';
-
-        $vevent5 = Component::create('VEVENT');
-        $vevent5->DTSTART = '20120301T130000Z';
-        $vevent5->add($valarm5);
-
-        $tests[] = array($valarm5, new DateTime('2012-03-09 01:00:00'), new DateTime('2012-03-10 01:00:00'), true);
-
-        // Relation to start time of event + duration, but no repeat
-        $valarm6 = Component::create('VALARM');
-        $valarm6->TRIGGER = '-P1D';
-        $valarm6->TRIGGER['VALUE'] = 'DURATION';
-        $valarm6->DURATION = 'P1D';
-
-        $vevent6 = Component::create('VEVENT');
-        $vevent6->DTSTART = '20120313T130000Z';
-        $vevent6->add($valarm6);
-
-        $tests[] = array($valarm6, new DateTime('2012-03-01 01:00:00'), new DateTime('2012-04-01 01:00:00'), true);
-        $tests[] = array($valarm6, new DateTime('2012-03-01 01:00:00'), new DateTime('2012-03-10 01:00:00'), false);
-
-
-        // Relation to end time of event (DURATION instead of DTEND)
-        $valarm7 = Component::create('VALARM');
-        $valarm7->TRIGGER = '-P1D';
-        $valarm7->TRIGGER['VALUE'] = 'DURATION';
-        $valarm7->TRIGGER['RELATED']= 'END';
-
-        $vevent7 = Component::create('VEVENT');
-        $vevent7->DTSTART = '20120301T130000Z';
-        $vevent7->DURATION = 'P30D';
-        $vevent7->add($valarm7);
-
-        $tests[] = array($valarm7, new DateTime('2012-02-25 01:00:00'), new DateTime('2012-03-05 01:00:00'), false);
-        $tests[] = array($valarm7, new DateTime('2012-03-25 01:00:00'), new DateTime('2012-04-05 01:00:00'), true);
-
-        // Relation to end time of event (No DTEND or DURATION)
-        $valarm7 = Component::create('VALARM');
-        $valarm7->TRIGGER = '-P1D';
-        $valarm7->TRIGGER['VALUE'] = 'DURATION';
-        $valarm7->TRIGGER['RELATED']= 'END';
-
-        $vevent7 = Component::create('VEVENT');
-        $vevent7->DTSTART = '20120301T130000Z';
-        $vevent7->add($valarm7);
-
-        $tests[] = array($valarm7, new DateTime('2012-02-25 01:00:00'), new DateTime('2012-03-05 01:00:00'), true);
-        $tests[] = array($valarm7, new DateTime('2012-03-25 01:00:00'), new DateTime('2012-04-05 01:00:00'), false);
-
-
-        return $tests;
-    }
-
-    /**
-     * @expectedException LogicException
-     */
-    public function testInTimeRangeInvalidComponent() {
-
-        $valarm = Component::create('VALARM');
-        $valarm->TRIGGER = '-P1D';
-        $valarm->TRIGGER['RELATED'] = 'END';
-
-        $vjournal = Component::create('VJOURNAL');
-        $vjournal->add($valarm);
-
-        $valarm->isInTimeRange(new DateTime('2012-02-25 01:00:00'), new DateTime('2012-03-05 01:00:00'));
-
-    }
-
-    /**
-     * This bug was found and reported on the mailing list.
-     */
-    public function testInTimeRangeBuggy() {
-
-$input = <<<BLA
-BEGIN:VCALENDAR
-BEGIN:VTODO
-DTSTAMP:20121003T064931Z
-UID:b848cb9a7bb16e464a06c222ca1f8102@examle.com
-STATUS:NEEDS-ACTION
-DUE:20121005T000000Z
-SUMMARY:Task 1
-CATEGORIES:AlarmCategory
-BEGIN:VALARM
-TRIGGER:-PT10M
-ACTION:DISPLAY
-DESCRIPTION:Task 1
-END:VALARM
-END:VTODO
-END:VCALENDAR
-BLA;
-
-        $vobj = Reader::read($input);
-
-        $this->assertTrue($vobj->VTODO->VALARM->isInTimeRange(new \DateTime('2012-10-01 00:00:00'), new \DateTime('2012-11-01 00:00:00')));
-
-    }
-}
-
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VCalendarTest.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VCalendarTest.php
deleted file mode 100644
index 1d7e0c6031..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VCalendarTest.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Component;
-
-use Sabre\VObject;
-
-class VCalendarTest extends \PHPUnit_Framework_TestCase {
-
-    /**
-     * @dataProvider expandData
-     */
-    public function testExpand($input, $output) {
-
-        $vcal = VObject\Reader::read($input);
-        $vcal->expand(
-            new \DateTime('2011-12-01'),
-            new \DateTime('2011-12-31')
-        );
-
-        // This will normalize the output
-        $output = VObject\Reader::read($output)->serialize();
-
-        $this->assertEquals($output, $vcal->serialize());
-
-    }
-
-    public function expandData() {
-
-        $tests = array();
-
-        // No data
-        $input = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-END:VCALENDAR
-';
-
-        $output = $input;
-        $tests[] = array($input,$output);
-
-
-        // Simple events
-        $input = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-BEGIN:VEVENT
-UID:bla
-SUMMARY:InExpand
-DTSTART;VALUE=DATE:20111202
-END:VEVENT
-BEGIN:VEVENT
-UID:bla2
-SUMMARY:NotInExpand
-DTSTART;VALUE=DATE:20120101
-END:VEVENT
-END:VCALENDAR
-';
-
-        $output = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-BEGIN:VEVENT
-UID:bla
-SUMMARY:InExpand
-DTSTART;VALUE=DATE:20111202
-END:VEVENT
-END:VCALENDAR
-';
-
-        $tests[] = array($input, $output);
-
-        // Removing timezone info
-        $input = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Paris
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:bla4
-SUMMARY:RemoveTZ info
-DTSTART;TZID=Europe/Paris:20111203T130102
-END:VEVENT
-END:VCALENDAR
-';
-
-        $output = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-BEGIN:VEVENT
-UID:bla4
-SUMMARY:RemoveTZ info
-DTSTART;VALUE=DATE-TIME:20111203T120102Z
-END:VEVENT
-END:VCALENDAR
-';
-
-        $tests[] = array($input, $output);
-
-        // Recurrence rule
-        $input = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-BEGIN:VEVENT
-UID:bla6
-SUMMARY:Testing RRule
-DTSTART:20111125T120000Z
-DTEND:20111125T130000Z
-RRULE:FREQ=WEEKLY
-END:VEVENT
-END:VCALENDAR
-';
-
-        $output = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-BEGIN:VEVENT
-UID:bla6
-SUMMARY:Testing RRule
-DTSTART;VALUE=DATE-TIME:20111202T120000Z
-DTEND;VALUE=DATE-TIME:20111202T130000Z
-RECURRENCE-ID:20111202T120000Z
-END:VEVENT
-BEGIN:VEVENT
-UID:bla6
-SUMMARY:Testing RRule
-DTSTART;VALUE=DATE-TIME:20111209T120000Z
-DTEND;VALUE=DATE-TIME:20111209T130000Z
-RECURRENCE-ID:20111209T120000Z
-END:VEVENT
-BEGIN:VEVENT
-UID:bla6
-SUMMARY:Testing RRule
-DTSTART;VALUE=DATE-TIME:20111216T120000Z
-DTEND;VALUE=DATE-TIME:20111216T130000Z
-RECURRENCE-ID:20111216T120000Z
-END:VEVENT
-BEGIN:VEVENT
-UID:bla6
-SUMMARY:Testing RRule
-DTSTART;VALUE=DATE-TIME:20111223T120000Z
-DTEND;VALUE=DATE-TIME:20111223T130000Z
-RECURRENCE-ID:20111223T120000Z
-END:VEVENT
-BEGIN:VEVENT
-UID:bla6
-SUMMARY:Testing RRule
-DTSTART;VALUE=DATE-TIME:20111230T120000Z
-DTEND;VALUE=DATE-TIME:20111230T130000Z
-RECURRENCE-ID:20111230T120000Z
-END:VEVENT
-END:VCALENDAR
-';
-
-        // Recurrence rule + override
-        $input = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-BEGIN:VEVENT
-UID:bla6
-SUMMARY:Testing RRule2
-DTSTART:20111125T120000Z
-DTEND:20111125T130000Z
-RRULE:FREQ=WEEKLY
-END:VEVENT
-BEGIN:VEVENT
-UID:bla6
-RECURRENCE-ID:20111209T120000Z
-DTSTART:20111209T140000Z
-DTEND:20111209T150000Z
-SUMMARY:Override!
-END:VEVENT
-END:VCALENDAR
-';
-
-        $output = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-BEGIN:VEVENT
-UID:bla6
-SUMMARY:Testing RRule2
-DTSTART;VALUE=DATE-TIME:20111202T120000Z
-DTEND;VALUE=DATE-TIME:20111202T130000Z
-RECURRENCE-ID:20111202T120000Z
-END:VEVENT
-BEGIN:VEVENT
-UID:bla6
-RECURRENCE-ID:20111209T120000Z
-DTSTART:20111209T140000Z
-DTEND:20111209T150000Z
-SUMMARY:Override!
-END:VEVENT
-BEGIN:VEVENT
-UID:bla6
-SUMMARY:Testing RRule2
-DTSTART;VALUE=DATE-TIME:20111216T120000Z
-DTEND;VALUE=DATE-TIME:20111216T130000Z
-RECURRENCE-ID:20111216T120000Z
-END:VEVENT
-BEGIN:VEVENT
-UID:bla6
-SUMMARY:Testing RRule2
-DTSTART;VALUE=DATE-TIME:20111223T120000Z
-DTEND;VALUE=DATE-TIME:20111223T130000Z
-RECURRENCE-ID:20111223T120000Z
-END:VEVENT
-BEGIN:VEVENT
-UID:bla6
-SUMMARY:Testing RRule2
-DTSTART;VALUE=DATE-TIME:20111230T120000Z
-DTEND;VALUE=DATE-TIME:20111230T130000Z
-RECURRENCE-ID:20111230T120000Z
-END:VEVENT
-END:VCALENDAR
-';
-
-        $tests[] = array($input, $output);
-        return $tests;
-
-    }
-
-    /**
-     * @expectedException LogicException
-     */
-    public function testBrokenEventExpand() {
-
-        $input = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-BEGIN:VEVENT
-RRULE:FREQ=WEEKLY
-DTSTART;VALUE=DATE:20111202
-END:VEVENT
-END:VCALENDAR
-';
-        $vcal = VObject\Reader::read($input);
-        $vcal->expand(
-            new \DateTime('2011-12-01'),
-            new \DateTime('2011-12-31')
-        );
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VCardTest.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VCardTest.php
deleted file mode 100644
index 584a007d95..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VCardTest.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Component;
-
-use Sabre\VObject;
-
-class VCardTest extends \PHPUnit_Framework_TestCase {
-
-    /**
-     * @dataProvider validateData
-     */
-    function testValidate($input, $expectedWarnings, $expectedRepairedOutput) {
-
-        $vcard = VObject\Reader::read($input);
-
-        $warnings = $vcard->validate();
-
-        $warnMsg = array();
-        foreach($warnings as $warning) {
-            $warnMsg[] = $warning['message'];
-        }
-
-        $this->assertEquals($expectedWarnings, $warnMsg);
-
-        $vcard->validate(VObject\Component::REPAIR);
-
-        $this->assertEquals(
-            $expectedRepairedOutput,
-            $vcard->serialize()
-        );
-
-    }
-
-    public function validateData() {
-
-        $tests = array();
-
-        // Correct
-        $tests[] = array(
-            "BEGIN:VCARD\r\nVERSION:4.0\r\nFN:John Doe\r\nEND:VCARD\r\n",
-            array(),
-            "BEGIN:VCARD\r\nVERSION:4.0\r\nFN:John Doe\r\nEND:VCARD\r\n",
-        );
-
-        // No VERSION
-        $tests[] = array(
-            "BEGIN:VCARD\r\nFN:John Doe\r\nEND:VCARD\r\n",
-            array(
-                'The VERSION property must appear in the VCARD component exactly 1 time',
-            ),
-            "BEGIN:VCARD\r\nVERSION:4.0\r\nFN:John Doe\r\nEND:VCARD\r\n",
-        );
-
-        // Unknown version
-        $tests[] = array(
-            "BEGIN:VCARD\r\nVERSION:2.2\r\nFN:John Doe\r\nEND:VCARD\r\n",
-            array(
-                'Only vcard version 4.0 (RFC6350), version 3.0 (RFC2426) or version 2.1 (icm-vcard-2.1) are supported.',
-            ),
-            "BEGIN:VCARD\r\nVERSION:4.0\r\nFN:John Doe\r\nEND:VCARD\r\n",
-        );
-
-        // No FN
-        $tests[] = array(
-            "BEGIN:VCARD\r\nVERSION:4.0\r\nEND:VCARD\r\n",
-            array(
-                'The FN property must appear in the VCARD component exactly 1 time',
-            ),
-            "BEGIN:VCARD\r\nVERSION:4.0\r\nEND:VCARD\r\n",
-        );
-        // No FN, N fallback
-        $tests[] = array(
-            "BEGIN:VCARD\r\nVERSION:4.0\r\nN:Doe;John;;;;;\r\nEND:VCARD\r\n",
-            array(
-                'The FN property must appear in the VCARD component exactly 1 time',
-            ),
-            "BEGIN:VCARD\r\nVERSION:4.0\r\nN:Doe;John;;;;;\r\nFN:John Doe\r\nEND:VCARD\r\n",
-        );
-        // No FN, N fallback, no first name
-        $tests[] = array(
-            "BEGIN:VCARD\r\nVERSION:4.0\r\nN:Doe;;;;;;\r\nEND:VCARD\r\n",
-            array(
-                'The FN property must appear in the VCARD component exactly 1 time',
-            ),
-            "BEGIN:VCARD\r\nVERSION:4.0\r\nN:Doe;;;;;;\r\nFN:Doe\r\nEND:VCARD\r\n",
-        );
-
-        // No FN, ORG fallback
-        $tests[] = array(
-            "BEGIN:VCARD\r\nVERSION:4.0\r\nORG:Acme Co.\r\nEND:VCARD\r\n",
-            array(
-                'The FN property must appear in the VCARD component exactly 1 time',
-            ),
-            "BEGIN:VCARD\r\nVERSION:4.0\r\nORG:Acme Co.\r\nFN:Acme Co.\r\nEND:VCARD\r\n",
-        );
-        return $tests;
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VEventTest.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VEventTest.php
deleted file mode 100644
index 616da4ac76..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VEventTest.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Component;
-
-use Sabre\VObject;
-
-class VEventTest extends \PHPUnit_Framework_TestCase {
-
-    /**
-     * @dataProvider timeRangeTestData
-     */
-    public function testInTimeRange(VEvent $vevent,$start,$end,$outcome) {
-
-        $this->assertEquals($outcome, $vevent->isInTimeRange($start, $end));
-
-    }
-
-    public function timeRangeTestData() {
-
-        $tests = array();
-
-        $vevent = new VEvent('VEVENT');
-        $vevent->DTSTART = '20111223T120000Z';
-        $tests[] = array($vevent, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
-        $tests[] = array($vevent, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
-
-        $vevent2 = clone $vevent;
-        $vevent2->DTEND = '20111225T120000Z';
-        $tests[] = array($vevent2, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
-        $tests[] = array($vevent2, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
-
-        $vevent3 = clone $vevent;
-        $vevent3->DURATION = 'P1D';
-        $tests[] = array($vevent3, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
-        $tests[] = array($vevent3, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
-
-        $vevent4 = clone $vevent;
-        $vevent4->DTSTART = '20111225';
-        $vevent4->DTSTART['VALUE'] = 'DATE';
-        $tests[] = array($vevent4, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
-        $tests[] = array($vevent4, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
-        // Event with no end date should be treated as lasting the entire day.
-        $tests[] = array($vevent4, new \DateTime('2011-12-25 16:00:00'), new \DateTime('2011-12-25 17:00:00'), true);
-
-
-        $vevent5 = clone $vevent;
-        $vevent5->DURATION = 'P1D';
-        $vevent5->RRULE = 'FREQ=YEARLY';
-        $tests[] = array($vevent5, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
-        $tests[] = array($vevent5, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
-        $tests[] = array($vevent5, new \DateTime('2013-12-01'), new \DateTime('2013-12-31'), true);
-
-        $vevent6 = clone $vevent;
-        $vevent6->DTSTART = '20111225';
-        $vevent6->DTSTART['VALUE'] = 'DATE';
-        $vevent6->DTEND   = '20111225';
-        $vevent6->DTEND['VALUE'] = 'DATE';
-
-        $tests[] = array($vevent6, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
-        $tests[] = array($vevent6, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
-
-        // Added this test to ensure that recurrence rules with no DTEND also 
-        // get checked for the entire day.
-        $vevent7 = clone $vevent;
-        $vevent7->DTSTART = '20120101';
-        $vevent7->DTSTART['VALUE'] = 'DATE';
-        $vevent7->RRULE = 'FREQ=MONTHLY';
-        $tests[] = array($vevent7, new \DateTime('2012-02-01 15:00:00'), new \DateTime('2012-02-02'), true);
-        return $tests;
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VFreeBusyTest.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VFreeBusyTest.php
deleted file mode 100644
index 031c3c6848..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VFreeBusyTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Component;
-use Sabre\VObject;
-
-class VFreeBusyTest extends \PHPUnit_Framework_TestCase {
-
-    function testIsFree() {
-
-        $input = <<<BLA
-BEGIN:VCALENDAR
-BEGIN:VFREEBUSY
-FREEBUSY;FBTYPE=FREE:20120912T000500Z/PT1H
-FREEBUSY;FBTYPE=BUSY:20120912T010000Z/20120912T020000Z
-FREEBUSY;FBTYPE=BUSY-TENTATIVE:20120912T020000Z/20120912T030000Z
-FREEBUSY;FBTYPE=BUSY-UNAVAILABLE:20120912T030000Z/20120912T040000Z
-FREEBUSY;FBTYPE=BUSY:20120912T050000Z/20120912T060000Z,20120912T080000Z/20120912T090000Z
-FREEBUSY;FBTYPE=BUSY:20120912T100000Z/PT1H
-END:VFREEBUSY
-END:VCALENDAR
-BLA;
-
-        $obj = VObject\Reader::read($input);
-        $vfb = $obj->VFREEBUSY;
-
-        $tz = new \DateTimeZone('UTC');
-
-        $this->assertFalse($vfb->isFree(new \DateTime('2012-09-12 01:15:00', $tz), new \DateTime('2012-09-12 01:45:00', $tz)));
-        $this->assertFalse($vfb->isFree(new \DateTime('2012-09-12 08:05:00', $tz), new \DateTime('2012-09-12 08:10:00', $tz)));
-        $this->assertFalse($vfb->isFree(new \DateTime('2012-09-12 10:15:00', $tz), new \DateTime('2012-09-12 10:45:00', $tz)));
-
-        // Checking whether the end time is treated as non-inclusive
-        $this->assertTrue($vfb->isFree(new \DateTime('2012-09-12 09:00:00', $tz), new \DateTime('2012-09-12 09:15:00', $tz)));
-        $this->assertTrue($vfb->isFree(new \DateTime('2012-09-12 09:45:00', $tz), new \DateTime('2012-09-12 10:00:00', $tz)));
-        $this->assertTrue($vfb->isFree(new \DateTime('2012-09-12 11:00:00', $tz), new \DateTime('2012-09-12 12:00:00', $tz)));
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VJournalTest.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VJournalTest.php
deleted file mode 100644
index 46ecb992b1..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VJournalTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Component;
-
-use Sabre\VObject\Component;
-
-class VJournalTest extends \PHPUnit_Framework_TestCase {
-
-    /**
-     * @dataProvider timeRangeTestData
-     */
-    public function testInTimeRange(VJournal $vtodo,$start,$end,$outcome) {
-
-        $this->assertEquals($outcome, $vtodo->isInTimeRange($start, $end));
-
-    }
-
-    public function timeRangeTestData() {
-
-        $tests = array();
-
-        $vjournal = Component::create('VJOURNAL');
-        $vjournal->DTSTART = '20111223T120000Z';
-        $tests[] = array($vjournal, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
-        $tests[] = array($vjournal, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
-
-        $vjournal2 = Component::create('VJOURNAL');
-        $vjournal2->DTSTART = '20111223';
-        $vjournal2->DTSTART['VALUE'] = 'DATE';
-        $tests[] = array($vjournal2, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
-        $tests[] = array($vjournal2, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
-
-        $vjournal3 = Component::create('VJOURNAL');
-        $tests[] = array($vjournal3, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), false);
-        $tests[] = array($vjournal3, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
-
-        return $tests;
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VTodoTest.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VTodoTest.php
deleted file mode 100644
index a84da5cdf9..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Component/VTodoTest.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Component;
-
-use Sabre\VObject\Component;
-
-class VTodoTest extends \PHPUnit_Framework_TestCase {
-
-    /**
-     * @dataProvider timeRangeTestData
-     */
-    public function testInTimeRange(VTodo $vtodo,$start,$end,$outcome) {
-
-        $this->assertEquals($outcome, $vtodo->isInTimeRange($start, $end));
-
-    }
-
-    public function timeRangeTestData() {
-
-        $tests = array();
-
-        $vtodo = Component::create('VTODO');
-        $vtodo->DTSTART = '20111223T120000Z';
-        $tests[] = array($vtodo, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
-        $tests[] = array($vtodo, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
-
-        $vtodo2 = clone $vtodo;
-        $vtodo2->DURATION = 'P1D';
-        $tests[] = array($vtodo2, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
-        $tests[] = array($vtodo2, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
-
-        $vtodo3 = clone $vtodo;
-        $vtodo3->DUE = '20111225';
-        $tests[] = array($vtodo3, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
-        $tests[] = array($vtodo3, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
-
-        $vtodo4 = Component::create('VTODO');
-        $vtodo4->DUE = '20111225';
-        $tests[] = array($vtodo4, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
-        $tests[] = array($vtodo4, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
-
-        $vtodo5 = Component::create('VTODO');
-        $vtodo5->COMPLETED = '20111225';
-        $tests[] = array($vtodo5, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
-        $tests[] = array($vtodo5, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
-
-        $vtodo6 = Component::create('VTODO');
-        $vtodo6->CREATED = '20111225';
-        $tests[] = array($vtodo6, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
-        $tests[] = array($vtodo6, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
-
-        $vtodo7 = Component::create('VTODO');
-        $vtodo7->CREATED = '20111225';
-        $vtodo7->COMPLETED = '20111226';
-        $tests[] = array($vtodo7, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
-        $tests[] = array($vtodo7, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
-
-        $vtodo7 = Component::create('VTODO');
-        $tests[] = array($vtodo7, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true);
-        $tests[] = array($vtodo7, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), true);
-
-        return $tests;
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ComponentTest.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ComponentTest.php
deleted file mode 100644
index 07000bda0b..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ComponentTest.php
+++ /dev/null
@@ -1,413 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class ComponentTest extends \PHPUnit_Framework_TestCase {
-
-    function testIterate() {
-
-        $comp = new Component('VCALENDAR');
-
-        $sub = new Component('VEVENT');
-        $comp->children[] = $sub;
-
-        $sub = new Component('VTODO');
-        $comp->children[] = $sub;
-
-        $count = 0;
-        foreach($comp->children() as $key=>$subcomponent) {
-
-           $count++;
-           $this->assertInstanceOf('Sabre\\VObject\\Component',$subcomponent);
-
-        }
-        $this->assertEquals(2,$count);
-        $this->assertEquals(1,$key);
-
-    }
-
-    function testMagicGet() {
-
-        $comp = new Component('VCALENDAR');
-
-        $sub = new Component('VEVENT');
-        $comp->children[] = $sub;
-
-        $sub = new Component('VTODO');
-        $comp->children[] = $sub;
-
-        $event = $comp->vevent;
-        $this->assertInstanceOf('Sabre\\VObject\\Component', $event);
-        $this->assertEquals('VEVENT', $event->name);
-
-        $this->assertInternalType('null', $comp->vjournal);
-
-    }
-
-    function testMagicGetGroups() {
-
-        $comp = new Component('VCARD');
-
-        $sub = new Property('GROUP1.EMAIL','1@1.com');
-        $comp->children[] = $sub;
-
-        $sub = new Property('GROUP2.EMAIL','2@2.com');
-        $comp->children[] = $sub;
-
-        $sub = new Property('EMAIL','3@3.com');
-        $comp->children[] = $sub;
-
-        $emails = $comp->email;
-        $this->assertEquals(3, count($emails));
-
-        $email1 = $comp->{"group1.email"};
-        $this->assertEquals('EMAIL', $email1[0]->name);
-        $this->assertEquals('GROUP1', $email1[0]->group);
-
-        $email3 = $comp->{".email"};
-        $this->assertEquals('EMAIL', $email3[0]->name);
-        $this->assertEquals(null, $email3[0]->group);
-
-    }
-
-    function testMagicIsset() {
-
-        $comp = new Component('VCALENDAR');
-
-        $sub = new Component('VEVENT');
-        $comp->children[] = $sub;
-
-        $sub = new Component('VTODO');
-        $comp->children[] = $sub;
-
-        $this->assertTrue(isset($comp->vevent));
-        $this->assertTrue(isset($comp->vtodo));
-        $this->assertFalse(isset($comp->vjournal));
-
-    }
-
-    function testMagicSetScalar() {
-
-        $comp = new Component('VCALENDAR');
-        $comp->myProp = 'myValue';
-
-        $this->assertInstanceOf('Sabre\\VObject\\Property',$comp->MYPROP);
-        $this->assertEquals('myValue',$comp->MYPROP->value);
-
-
-    }
-
-    function testMagicSetScalarTwice() {
-
-        $comp = new Component('VCALENDAR');
-        $comp->myProp = 'myValue';
-        $comp->myProp = 'myValue';
-
-        $this->assertEquals(1,count($comp->children));
-        $this->assertInstanceOf('Sabre\\VObject\\Property',$comp->MYPROP);
-        $this->assertEquals('myValue',$comp->MYPROP->value);
-
-    }
-
-    function testMagicSetComponent() {
-
-        $comp = new Component('VCALENDAR');
-
-        // Note that 'myProp' is ignored here.
-        $comp->myProp = new Component('VEVENT');
-
-        $this->assertEquals(1, count($comp->children));
-
-        $this->assertEquals('VEVENT',$comp->VEVENT->name);
-
-    }
-
-    function testMagicSetTwice() {
-
-        $comp = new Component('VCALENDAR');
-
-        $comp->VEVENT = new Component('VEVENT');
-        $comp->VEVENT = new Component('VEVENT');
-
-        $this->assertEquals(1, count($comp->children));
-
-        $this->assertEquals('VEVENT',$comp->VEVENT->name);
-
-    }
-
-    function testArrayAccessGet() {
-
-        $comp = new Component('VCALENDAR');
-
-        $event = new Component('VEVENT');
-        $event->summary = 'Event 1';
-
-        $comp->add($event);
-
-        $event2 = clone $event;
-        $event2->summary = 'Event 2';
-
-        $comp->add($event2);
-
-        $this->assertEquals(2,count($comp->children()));
-        $this->assertTrue($comp->vevent[1] instanceof Component);
-        $this->assertEquals('Event 2', (string)$comp->vevent[1]->summary);
-
-    }
-
-    function testArrayAccessExists() {
-
-        $comp = new Component('VCALENDAR');
-
-        $event = new Component('VEVENT');
-        $event->summary = 'Event 1';
-
-        $comp->add($event);
-
-        $event2 = clone $event;
-        $event2->summary = 'Event 2';
-
-        $comp->add($event2);
-
-        $this->assertTrue(isset($comp->vevent[0]));
-        $this->assertTrue(isset($comp->vevent[1]));
-
-    }
-
-    /**
-     * @expectedException LogicException
-     */
-    function testArrayAccessSet() {
-
-        $comp = new Component('VCALENDAR');
-        $comp['hey'] = 'hi there';
-
-    }
-    /**
-     * @expectedException LogicException
-     */
-    function testArrayAccessUnset() {
-
-        $comp = new Component('VCALENDAR');
-        unset($comp[0]);
-
-    }
-
-    function testAddScalar() {
-
-        $comp = new Component('VCALENDAR');
-
-        $comp->add('myprop','value');
-
-        $this->assertEquals(1, count($comp->children));
-
-        $this->assertTrue($comp->children[0] instanceof Property);
-        $this->assertEquals('MYPROP',$comp->children[0]->name);
-        $this->assertEquals('value',$comp->children[0]->value);
-
-    }
-
-    function testAddScalarParams() {
-
-        $comp = Component::create('VCALENDAR');
-
-        $comp->add('myprop','value',array('param1'=>'value1'));
-
-        $this->assertEquals(1, count($comp->children));
-
-        $this->assertTrue($comp->children[0] instanceof Property);
-        $this->assertEquals('MYPROP',$comp->children[0]->name);
-        $this->assertEquals('value',$comp->children[0]->value);
-
-        $this->assertEquals(1, count($comp->children[0]->parameters));
-
-        $this->assertTrue($comp->children[0]->parameters[0] instanceof Parameter);
-        $this->assertEquals('PARAM1',$comp->children[0]->parameters[0]->name);
-        $this->assertEquals('value1',$comp->children[0]->parameters[0]->value);
-
-    }
-
-
-    function testAddComponent() {
-
-        $comp = new Component('VCALENDAR');
-
-        $comp->add(new Component('VEVENT'));
-
-        $this->assertEquals(1, count($comp->children));
-
-        $this->assertEquals('VEVENT',$comp->VEVENT->name);
-
-    }
-
-    function testAddComponentTwice() {
-
-        $comp = new Component('VCALENDAR');
-
-        $comp->add(new Component('VEVENT'));
-        $comp->add(new Component('VEVENT'));
-
-        $this->assertEquals(2, count($comp->children));
-
-        $this->assertEquals('VEVENT',$comp->VEVENT->name);
-
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    function testAddArgFail() {
-
-        $comp = new Component('VCALENDAR');
-        $comp->add(new Component('VEVENT'),'hello');
-
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    function testAddArgFail2() {
-
-        $comp = new Component('VCALENDAR');
-        $comp->add(array());
-
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    function testAddArgFail3() {
-
-        $comp = new Component('VCALENDAR');
-        $comp->add('hello',array());
-
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    function testMagicSetInvalid() {
-
-        $comp = new Component('VCALENDAR');
-
-        // Note that 'myProp' is ignored here.
-        $comp->myProp = new \StdClass();
-
-        $this->assertEquals(1, count($comp->children));
-
-        $this->assertEquals('VEVENT',$comp->VEVENT->name);
-
-    }
-
-    function testMagicUnset() {
-
-        $comp = new Component('VCALENDAR');
-        $comp->add(new Component('VEVENT'));
-
-        unset($comp->vevent);
-
-        $this->assertEquals(array(), $comp->children);
-
-    }
-
-
-    function testCount() {
-
-        $comp = new Component('VCALENDAR');
-        $this->assertEquals(1,$comp->count());
-
-    }
-
-    function testChildren() {
-
-        $comp = new Component('VCALENDAR');
-
-        // Note that 'myProp' is ignored here.
-        $comp->children = array(
-            new Component('VEVENT'),
-            new Component('VTODO')
-        );
-
-        $r = $comp->children();
-        $this->assertTrue($r instanceof ElementList);
-        $this->assertEquals(2,count($r));
-    }
-
-    function testGetComponents() {
-
-        $comp = new Component('VCALENDAR');
-
-        // Note that 'myProp' is ignored here.
-        $comp->children = array(
-            new Property('FOO','BAR'),
-            new Component('VTODO')
-        );
-
-        $r = $comp->getComponents();
-        $this->assertInternalType('array', $r);
-        $this->assertEquals(1, count($r));
-        $this->assertEquals('VTODO', $r[0]->name);
-    }
-
-    function testSerialize() {
-
-        $comp = new Component('VCALENDAR');
-        $this->assertEquals("BEGIN:VCALENDAR\r\nEND:VCALENDAR\r\n", $comp->serialize());
-
-    }
-
-    function testSerializeChildren() {
-
-        $comp = new Component('VCALENDAR');
-        $comp->children = array(
-            new Component('VEVENT'),
-            new Component('VTODO')
-        );
-
-        $str = $comp->serialize();
-
-        $this->assertEquals("BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nEND:VEVENT\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n", $str);
-
-    }
-
-    function testSerializeOrderCompAndProp() {
-        
-        $comp = new Component('VCALENDAR');
-        $comp->add(new Component('VEVENT'));
-        $comp->add('PROP1','BLABLA');
-        $comp->add('VERSION','2.0');
-        $comp->add(new Component('VTIMEZONE'));
-
-        $str = $comp->serialize();
-
-        $this->assertEquals("BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPROP1:BLABLA\r\nBEGIN:VTIMEZONE\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n", $str);
-
-    }
-
-    function testAnotherSerializeOrderProp() {
-
-        $prop4s=array('1', '2', '3', '4', '5', '6', '7', '8', '9', '10');
-
-        $comp = new Component('VCARD');
-        $comp->__set('SOMEPROP','FOO');
-        $comp->__set('ANOTHERPROP','FOO');
-        $comp->__set('THIRDPROP','FOO');
-        foreach ($prop4s as $prop4) {
-            $comp->add('PROP4', 'FOO '.$prop4);
-        }
-        $comp->__set('PROPNUMBERFIVE', 'FOO');
-        $comp->__set('PROPNUMBERSIX', 'FOO');
-        $comp->__set('PROPNUMBERSEVEN', 'FOO');
-        $comp->__set('PROPNUMBEREIGHT', 'FOO');
-        $comp->__set('PROPNUMBERNINE', 'FOO');
-        $comp->__set('PROPNUMBERTEN', 'FOO');
-        $comp->__set('VERSION','2.0');
-        $comp->__set('UID', 'FOO');
-
-        $str = $comp->serialize();
-
-        $this->assertEquals("BEGIN:VCARD\r\nVERSION:2.0\r\nSOMEPROP:FOO\r\nANOTHERPROP:FOO\r\nTHIRDPROP:FOO\r\nPROP4:FOO 1\r\nPROP4:FOO 2\r\nPROP4:FOO 3\r\nPROP4:FOO 4\r\nPROP4:FOO 5\r\nPROP4:FOO 6\r\nPROP4:FOO 7\r\nPROP4:FOO 8\r\nPROP4:FOO 9\r\nPROP4:FOO 10\r\nPROPNUMBERFIVE:FOO\r\nPROPNUMBERSIX:FOO\r\nPROPNUMBERSEVEN:FOO\r\nPROPNUMBEREIGHT:FOO\r\nPROPNUMBERNINE:FOO\r\nPROPNUMBERTEN:FOO\r\nUID:FOO\r\nEND:VCARD\r\n", $str);
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/DateTimeParserTest.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/DateTimeParserTest.php
deleted file mode 100644
index 6ea2faed92..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/DateTimeParserTest.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-use DateTime;
-use DateTimeZone;
-use DateInterval;
-
-class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
-
-    function testParseICalendarDuration() {
-
-        $this->assertEquals('+1 weeks', DateTimeParser::parseDuration('P1W',true));
-        $this->assertEquals('+5 days',  DateTimeParser::parseDuration('P5D',true));
-        $this->assertEquals('+5 days 3 hours 50 minutes 12 seconds', DateTimeParser::parseDuration('P5DT3H50M12S',true));
-        $this->assertEquals('-1 weeks 50 minutes', DateTimeParser::parseDuration('-P1WT50M',true));
-        $this->assertEquals('+50 days 3 hours 2 seconds', DateTimeParser::parseDuration('+P50DT3H2S',true));
-        $this->assertEquals(new DateInterval('PT0S'), DateTimeParser::parseDuration('PT0S'));
-
-    }
-
-    function testParseICalendarDurationDateInterval() {
-
-        $expected = new DateInterval('P7D');
-        $this->assertEquals($expected, DateTimeParser::parseDuration('P1W'));
-        $this->assertEquals($expected, DateTimeParser::parse('P1W'));
-
-        $expected = new DateInterval('PT3M');
-        $expected->invert = true;
-        $this->assertEquals($expected, DateTimeParser::parseDuration('-PT3M'));
-
-    }
-
-    /**
-     * @expectedException LogicException
-     */
-    function testParseICalendarDurationFail() {
-
-        DateTimeParser::parseDuration('P1X',true);
-
-    }
-
-    function testParseICalendarDateTime() {
-
-        $dateTime = DateTimeParser::parseDateTime('20100316T141405');
-
-        $compare = new DateTime('2010-03-16 14:14:05',new DateTimeZone('UTC'));
-
-        $this->assertEquals($compare, $dateTime);
-
-    }
-
-    /**
-     * @depends testParseICalendarDateTime
-     * @expectedException LogicException
-     */
-    function testParseICalendarDateTimeBadFormat() {
-
-        $dateTime = DateTimeParser::parseDateTime('20100316T141405 ');
-
-    }
-
-    /**
-     * @depends testParseICalendarDateTime
-     */
-    function testParseICalendarDateTimeUTC() {
-
-        $dateTime = DateTimeParser::parseDateTime('20100316T141405Z');
-
-        $compare = new DateTime('2010-03-16 14:14:05',new DateTimeZone('UTC'));
-        $this->assertEquals($compare, $dateTime);
-
-    }
-
-    /**
-     * @depends testParseICalendarDateTime
-     */
-    function testParseICalendarDateTimeUTC2() {
-
-        $dateTime = DateTimeParser::parseDateTime('20101211T160000Z');
-
-        $compare = new DateTime('2010-12-11 16:00:00',new DateTimeZone('UTC'));
-        $this->assertEquals($compare, $dateTime);
-
-    }
-
-    /**
-     * @depends testParseICalendarDateTime
-     */
-    function testParseICalendarDateTimeCustomTimeZone() {
-
-        $dateTime = DateTimeParser::parseDateTime('20100316T141405', new DateTimeZone('Europe/Amsterdam'));
-
-        $compare = new DateTime('2010-03-16 13:14:05',new DateTimeZone('UTC'));
-        $this->assertEquals($compare, $dateTime);
-
-    }
-
-    function testParseICalendarDate() {
-
-        $dateTime = DateTimeParser::parseDate('20100316');
-
-        $expected = new DateTime('2010-03-16 00:00:00',new DateTimeZone('UTC'));
-
-        $this->assertEquals($expected, $dateTime);
-
-        $dateTime = DateTimeParser::parse('20100316');
-        $this->assertEquals($expected, $dateTime);
-
-    }
-
-    /**
-     * TCheck if a date with year > 4000 will not throw an exception. iOS seems to use 45001231 in yearly recurring events
-     */
-    function testParseICalendarDateGreaterThan4000() {
-
-        $dateTime = DateTimeParser::parseDate('45001231');
-
-        $expected = new DateTime('4500-12-31 00:00:00',new DateTimeZone('UTC'));
-
-        $this->assertEquals($expected, $dateTime);
-
-        $dateTime = DateTimeParser::parse('45001231');
-        $this->assertEquals($expected, $dateTime);
-
-    }
-
-    /**
-     * Check if a datetime with year > 4000 will not throw an exception. iOS seems to use 45001231T235959 in yearly recurring events
-     */
-    function testParseICalendarDateTimeGreaterThan4000() {
-
-        $dateTime = DateTimeParser::parseDateTime('45001231T235959');
-
-        $expected = new DateTime('4500-12-31 23:59:59',new DateTimeZone('UTC'));
-
-        $this->assertEquals($expected, $dateTime);
-
-        $dateTime = DateTimeParser::parse('45001231T235959');
-        $this->assertEquals($expected, $dateTime);
-
-    }
-
-    /**
-     * @depends testParseICalendarDate
-     * @expectedException LogicException
-     */
-    function testParseICalendarDateBadFormat() {
-
-        $dateTime = DateTimeParser::parseDate('20100316T141405');
-
-    }
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ElementListTest.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ElementListTest.php
deleted file mode 100644
index 84e1bcbe90..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ElementListTest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class ElementListTest extends \PHPUnit_Framework_TestCase {
-
-    function testIterate() {
-
-        $sub = new Component('VEVENT');
-
-        $elems = array(
-            $sub,
-            clone $sub,
-            clone $sub
-        );
-
-        $elemList = new ElementList($elems);
-
-        $count = 0;
-        foreach($elemList as $key=>$subcomponent) {
-
-           $count++;
-           $this->assertInstanceOf('Sabre\\VObject\\Component',$subcomponent);
-
-        }
-        $this->assertEquals(3,$count);
-        $this->assertEquals(2,$key);
-
-    }
-
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/EmClientTest.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/EmClientTest.php
deleted file mode 100644
index 69d410fe7f..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/EmClientTest.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class EmClientTest extends \PHPUnit_Framework_TestCase {
-
-    function testParseTz() {
-
-        $str = 'BEGIN:VCALENDAR
-X-WR-CALNAME:Blackhawks Schedule 2011-12
-X-APPLE-CALENDAR-COLOR:#E51717
-X-WR-TIMEZONE:America/Chicago
-CALSCALE:GREGORIAN
-PRODID:-//eM Client/4.0.13961.0
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Chicago
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
-DTSTART:20070311T020000
-TZNAME:CDT
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0500
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
-DTSTART:20071104T020000
-TZNAME:CST
-TZOFFSETTO:-0600
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-CREATED:20110624T181236Z
-UID:be3bbfff-96e8-4c66-9908-ab791a62231d
-DTEND;TZID="America/Chicago":20111008T223000
-TRANSP:OPAQUE
-SUMMARY:Stars @ Blackhawks (Home Opener)
-DTSTART;TZID="America/Chicago":20111008T193000
-DTSTAMP:20120330T013232Z
-SEQUENCE:2
-X-MICROSOFT-CDO-BUSYSTATUS:BUSY
-LAST-MODIFIED:20120330T013237Z
-CLASS:PUBLIC
-END:VEVENT
-END:VCALENDAR';
-
-        $vObject = Reader::read($str);
-        $dt = $vObject->VEVENT->DTSTART->getDateTime();
-        $this->assertEquals(new \DateTime('2011-10-08 19:30:00', new \DateTimeZone('America/Chicago')), $dt);
-
-    }
-
-}
-
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/FreeBusyGeneratorTest.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/FreeBusyGeneratorTest.php
deleted file mode 100644
index 1f79e0a47c..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/FreeBusyGeneratorTest.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class FreeBusyGeneratorTest extends \PHPUnit_Framework_TestCase {
-
-    function getInput() {
-
-        // shows up
-$blob1 = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-DTSTART:20110101T120000Z
-DTEND:20110101T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-    // opaque, shows up
-$blob2 = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-TRANSP:OPAQUE
-DTSTART:20110101T130000Z
-DTEND:20110101T140000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-    // transparent, hidden
-$blob3 = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-TRANSP:TRANSPARENT
-DTSTART:20110101T140000Z
-DTEND:20110101T150000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-    // cancelled, hidden
-$blob4 = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-STATUS:CANCELLED
-DTSTART:20110101T160000Z
-DTEND:20110101T170000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-    // tentative, shows up
-$blob5 = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-STATUS:TENTATIVE
-DTSTART:20110101T180000Z
-DTEND:20110101T190000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-    // outside of time-range, hidden
-$blob6 = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-DTSTART:20110101T090000Z
-DTEND:20110101T100000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-    // outside of time-range, hidden
-$blob7 = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-DTSTART:20110104T090000Z
-DTEND:20110104T100000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-    // using duration, shows up
-$blob8 = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-DTSTART:20110101T190000Z
-DURATION:PT1H
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-    // Day-long event, shows up
-$blob9 = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-DTSTART;TYPE=DATE:20110102
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-// No duration, does not show up
-$blob10 = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-DTSTART:20110101T200000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-// encoded as object, shows up
-$blob11 = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-DTSTART:20110101T210000Z
-DURATION:PT1H
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-// Freebusy. Some parts show up
-$blob12 = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VFREEBUSY
-FREEBUSY:20110103T010000Z/20110103T020000Z
-FREEBUSY;FBTYPE=FREE:20110103T020000Z/20110103T030000Z
-FREEBUSY:20110103T030000Z/20110103T040000Z,20110103T040000Z/20110103T050000Z
-FREEBUSY:20120101T000000Z/20120101T010000Z
-FREEBUSY:20110103T050000Z/PT1H
-END:VFREEBUSY
-END:VCALENDAR
-ICS;
-
-// Yearly recurrence rule, shows up
-$blob13 = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-DTSTART:20100101T220000Z
-DTEND:20100101T230000Z
-RRULE:FREQ=YEARLY
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-// Yearly recurrence rule + duration, shows up
-$blob14 = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-DTSTART:20100101T230000Z
-DURATION:PT1H
-RRULE:FREQ=YEARLY
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
-        return array(
-            $blob1,
-            $blob2,
-            $blob3,
-            $blob4,
-            $blob5,
-            $blob6,
-            $blob7,
-            $blob8,
-            $blob9,
-            $blob10,
-            Reader::read($blob11),
-            $blob12,
-            $blob13,
-            $blob14,
-        );
-
-    }
-
-    function testGenerator() {
-
-        $gen = new FreeBusyGenerator(
-            new \DateTime('20110101T110000Z', new \DateTimeZone('UTC')),
-            new \DateTime('20110103T110000Z', new \DateTimeZone('UTC')),
-            $this->getInput()
-        );
-
-        $result = $gen->getResult();
-
-        $expected = array(
-            '20110101T120000Z/20110101T130000Z',
-            '20110101T130000Z/20110101T140000Z',
-            '20110101T180000Z/20110101T190000Z',
-            '20110101T190000Z/20110101T200000Z',
-            '20110102T000000Z/20110103T000000Z',
-            '20110101T210000Z/20110101T220000Z',
-
-            '20110103T010000Z/20110103T020000Z',
-            '20110103T030000Z/20110103T040000Z',
-            '20110103T040000Z/20110103T050000Z',
-            '20110103T050000Z/20110103T060000Z',
-
-            '20110101T220000Z/20110101T230000Z',
-            '20110101T230000Z/20110102T000000Z',
-        );
-
-        foreach($result->VFREEBUSY->FREEBUSY as $fb) {
-
-            $this->assertContains((string)$fb, $expected);
-
-            $k = array_search((string)$fb, $expected);
-            unset($expected[$k]);
-
-        }
-        if (count($expected)>0) {
-            $this->fail('There were elements in the expected array that were not found in the output: ' . "\n"  . print_r($expected,true) . "\n" . $result->serialize());
-
-        }
-
-    }
-
-    function testGeneratorBaseObject() {
-
-        $obj = new Component('VCALENDAR');
-        $obj->METHOD = 'PUBLISH';
-
-        $gen = new FreeBusyGenerator();
-        $gen->setObjects(array());
-        $gen->setBaseObject($obj);
-
-        $result = $gen->getResult();
-
-        $this->assertEquals('PUBLISH', $result->METHOD->value);
-
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    function testInvalidArg() {
-
-        $gen = new FreeBusyGenerator(
-            new \DateTime('2012-01-01'),
-            new \DateTime('2012-12-31'),
-            new \StdClass()
-        );
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue153Test.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue153Test.php
deleted file mode 100644
index 1cc14c1610..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue153Test.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class Issue153Test extends \PHPUnit_Framework_TestCase {
-
-    function testRead() {
-
-        $obj = Reader::read(file_get_contents(dirname(__FILE__) . '/issue153.vcf'));
-        $this->assertEquals('Test Benutzer', (string)$obj->fn);
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue154Test.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue154Test.php
deleted file mode 100644
index ed9c7c3f43..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Issue154Test.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class Issue154Test extends \PHPUnit_Framework_TestCase {
-
-    function testStuff() {
-
-        $vcard = new Component('VCARD');
-        $vcard->VERSION = '3.0';
-        $vcard->PHOTO = base64_encode('random_stuff');
-        $vcard->PHOTO->add('BASE64',null);
-        $vcard->UID = 'foo-bar';
-
-        $result = $vcard->serialize();
-        $expected = array(
-            "BEGIN:VCARD",
-            "VERSION:3.0",
-            "PHOTO;BASE64:" . base64_encode('random_stuff'),
-            "UID:foo-bar",
-            "END:VCARD",
-            "",
-        );
-
-        $this->assertEquals(implode("\r\n", $expected), $result);
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ParameterTest.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ParameterTest.php
deleted file mode 100644
index 9171af35c6..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ParameterTest.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class ParameterTest extends \PHPUnit_Framework_TestCase {
-
-    function testSetup() {
-
-        $param = new Parameter('name','value');
-        $this->assertEquals('NAME',$param->name);
-        $this->assertEquals('value',$param->value);
-
-    }
-
-    function testCastToString() {
-
-        $param = new Parameter('name','value');
-        $this->assertEquals('value',$param->__toString());
-        $this->assertEquals('value',(string)$param);
-
-    }
-
-    function testSerialize() {
-
-        $param = new Parameter('name','value');
-        $this->assertEquals('NAME=value',$param->serialize());
-
-    }
-
-    function testSerializeEmpty() {
-
-        $param = new Parameter('name',null);
-        $this->assertEquals('NAME',$param->serialize());
-
-    }
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Property/CompoundTest.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Property/CompoundTest.php
deleted file mode 100644
index 5d8cdaabbd..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Property/CompoundTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Property;
-use Sabre\VObject\Component;
-
-class CompoundTest extends \PHPUnit_Framework_TestCase {
-
-    function testSetParts() {
-
-        $arr = array(
-            'ABC, Inc.',
-            'North American Division',
-            'Marketing;Sales',
-        );
-
-        $elem = new Compound('ORG');
-        $elem->setParts($arr);
-
-        $this->assertEquals('ABC\, Inc.;North American Division;Marketing\;Sales', $elem->value);
-        $this->assertEquals(3, count($elem->getParts()));
-        $parts = $elem->getParts();
-        $this->assertEquals('Marketing;Sales', $parts[2]);
-
-    }
-
-    function testGetParts() {
-
-        $str = 'ABC\, Inc.;North American Division;Marketing\;Sales';
-
-        $elem = new Compound('ORG', $str);
-
-        $this->assertEquals(3, count($elem->getParts()));
-        $parts = $elem->getParts();
-        $this->assertEquals('Marketing;Sales', $parts[2]);
-    }
-
-    function testGetPartsDefaultDelimiter() {
-
-        $str = 'Hi!;Hello!';
-
-        $elem = new Compound('X-FOO', $str);
-
-        $this->assertEquals(array(
-            'Hi!',
-            'Hello!',
-        ), $elem->getParts());
-
-    }
-
-    function testGetPartsNull() {
-
-        $str = 'ABC\, Inc.;North American Division;Marketing\;Sales';
-
-        $elem = new Compound('ORG', null);
-
-        $this->assertEquals(0, count($elem->getParts()));
-
-    }
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Property/DateTimeTest.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Property/DateTimeTest.php
deleted file mode 100644
index 9dc7e86100..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Property/DateTimeTest.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Property;
-use Sabre\VObject\Component;
-
-class DateTimeTest extends \PHPUnit_Framework_TestCase {
-
-    function testSetDateTime() {
-
-        $tz = new \DateTimeZone('Europe/Amsterdam');
-        $dt = new \DateTime('1985-07-04 01:30:00', $tz);
-        $dt->setTimeZone($tz);
-
-        $elem = new DateTime('DTSTART');
-        $elem->setDateTime($dt);
-
-        $this->assertEquals('19850704T013000', $elem->value);
-        $this->assertEquals('Europe/Amsterdam', (string)$elem['TZID']);
-        $this->assertEquals('DATE-TIME', (string)$elem['VALUE']);
-
-    }
-
-    function testSetDateTimeLOCAL() {
-
-        $tz = new \DateTimeZone('Europe/Amsterdam');
-        $dt = new \DateTime('1985-07-04 01:30:00', $tz);
-        $dt->setTimeZone($tz);
-
-        $elem = new DateTime('DTSTART');
-        $elem->setDateTime($dt, DateTime::LOCAL);
-
-        $this->assertEquals('19850704T013000', $elem->value);
-        $this->assertNull($elem['TZID']);
-        $this->assertEquals('DATE-TIME', (string)$elem['VALUE']);
-
-    }
-
-    function testSetDateTimeUTC() {
-
-        $tz = new \DateTimeZone('GMT');
-        $dt = new \DateTime('1985-07-04 01:30:00', $tz);
-        $dt->setTimeZone($tz);
-
-        $elem = new DateTime('DTSTART');
-        $elem->setDateTime($dt, DateTime::UTC);
-
-        $this->assertEquals('19850704T013000Z', $elem->value);
-        $this->assertNull($elem['TZID']);
-        $this->assertEquals('DATE-TIME', (string)$elem['VALUE']);
-
-    }
-
-    function testSetDateTimeLOCALTZ() {
-
-        $tz = new \DateTimeZone('Europe/Amsterdam');
-        $dt = new \DateTime('1985-07-04 01:30:00', $tz);
-        $dt->setTimeZone($tz);
-
-        $elem = new DateTime('DTSTART');
-        $elem->setDateTime($dt, DateTime::LOCALTZ);
-
-        $this->assertEquals('19850704T013000', $elem->value);
-        $this->assertEquals('Europe/Amsterdam', (string)$elem['TZID']);
-        $this->assertEquals('DATE-TIME', (string)$elem['VALUE']);
-
-    }
-
-    function testSetDateTimeDATE() {
-
-        $tz = new \DateTimeZone('Europe/Amsterdam');
-        $dt = new \DateTime('1985-07-04 01:30:00', $tz);
-        $dt->setTimeZone($tz);
-
-        $elem = new DateTime('DTSTART');
-        $elem->setDateTime($dt, DateTime::DATE);
-
-        $this->assertEquals('19850704', $elem->value);
-        $this->assertNull($elem['TZID']);
-        $this->assertEquals('DATE', (string)$elem['VALUE']);
-
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    function testSetDateTimeInvalid() {
-
-        $tz = new \DateTimeZone('Europe/Amsterdam');
-        $dt = new \DateTime('1985-07-04 01:30:00', $tz);
-        $dt->setTimeZone($tz);
-
-        $elem = new DateTime('DTSTART');
-        $elem->setDateTime($dt, 7);
-
-    }
-
-    function testGetDateTimeCached() {
-
-        $tz = new \DateTimeZone('Europe/Amsterdam');
-        $dt = new \DateTime('1985-07-04 01:30:00', $tz);
-        $dt->setTimeZone($tz);
-
-        $elem = new DateTime('DTSTART');
-        $elem->setDateTime($dt);
-
-        $this->assertEquals($elem->getDateTime(), $dt);
-
-    }
-
-    function testGetDateTimeDateNULL() {
-
-        $elem = new DateTime('DTSTART');
-        $dt = $elem->getDateTime();
-
-        $this->assertNull($dt);
-        $this->assertNull($elem->getDateType());
-
-    }
-
-    function testGetDateTimeDateDATE() {
-
-        $elem = new DateTime('DTSTART','19850704');
-        $dt = $elem->getDateTime();
-
-        $this->assertInstanceOf('DateTime', $dt);
-        $this->assertEquals('1985-07-04 00:00:00', $dt->format('Y-m-d H:i:s'));
-        $this->assertEquals(DateTime::DATE, $elem->getDateType());
-
-    }
-
-
-    function testGetDateTimeDateLOCAL() {
-
-        $elem = new DateTime('DTSTART','19850704T013000');
-        $dt = $elem->getDateTime();
-
-        $this->assertInstanceOf('DateTime', $dt);
-        $this->assertEquals('1985-07-04 01:30:00', $dt->format('Y-m-d H:i:s'));
-        $this->assertEquals(DateTime::LOCAL, $elem->getDateType());
-
-    }
-
-    function testGetDateTimeDateUTC() {
-
-        $elem = new DateTime('DTSTART','19850704T013000Z');
-        $dt = $elem->getDateTime();
-
-        $this->assertInstanceOf('DateTime', $dt);
-        $this->assertEquals('1985-07-04 01:30:00', $dt->format('Y-m-d H:i:s'));
-        $this->assertEquals('UTC', $dt->getTimeZone()->getName());
-        $this->assertEquals(DateTime::UTC, $elem->getDateType());
-
-    }
-
-    function testGetDateTimeDateLOCALTZ() {
-
-        $elem = new DateTime('DTSTART','19850704T013000');
-        $elem['TZID'] = 'Europe/Amsterdam';
-
-        $dt = $elem->getDateTime();
-
-        $this->assertInstanceOf('DateTime', $dt);
-        $this->assertEquals('1985-07-04 01:30:00', $dt->format('Y-m-d H:i:s'));
-        $this->assertEquals('Europe/Amsterdam', $dt->getTimeZone()->getName());
-        $this->assertEquals(DateTime::LOCALTZ, $elem->getDateType());
-
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    function testGetDateTimeDateInvalid() {
-
-        $elem = new DateTime('DTSTART','bla');
-        $dt = $elem->getDateTime();
-
-    }
-
-    function testGetDateTimeWeirdTZ() {
-
-        $elem = new DateTime('DTSTART','19850704T013000');
-        $elem['TZID'] = '/freeassociation.sourceforge.net/Tzfile/Europe/Amsterdam';
-
-
-        $event = new Component('VEVENT');
-        $event->add($elem);
-
-        $timezone = new Component('VTIMEZONE');
-        $timezone->TZID = '/freeassociation.sourceforge.net/Tzfile/Europe/Amsterdam';
-        $timezone->{'X-LIC-LOCATION'} = 'Europe/Amsterdam';
-
-        $calendar = new Component('VCALENDAR');
-        $calendar->add($event);
-        $calendar->add($timezone);
-
-        $dt = $elem->getDateTime();
-
-        $this->assertInstanceOf('DateTime', $dt);
-        $this->assertEquals('1985-07-04 01:30:00', $dt->format('Y-m-d H:i:s'));
-        $this->assertEquals('Europe/Amsterdam', $dt->getTimeZone()->getName());
-        $this->assertEquals(DateTime::LOCALTZ, $elem->getDateType());
-
-    }
-
-    function testGetDateTimeBadTimeZone() {
-
-        $default = date_default_timezone_get();
-        date_default_timezone_set('Canada/Eastern');
-
-        $elem = new DateTime('DTSTART','19850704T013000');
-        $elem['TZID'] = 'Moon';
-
-
-        $event = new Component('VEVENT');
-        $event->add($elem);
-
-        $timezone = new Component('VTIMEZONE');
-        $timezone->TZID = 'Moon';
-        $timezone->{'X-LIC-LOCATION'} = 'Moon';
-
-        $calendar = new Component('VCALENDAR');
-        $calendar->add($event);
-        $calendar->add($timezone);
-
-        $dt = $elem->getDateTime();
-
-        $this->assertInstanceOf('DateTime', $dt);
-        $this->assertEquals('1985-07-04 01:30:00', $dt->format('Y-m-d H:i:s'));
-        $this->assertEquals('Canada/Eastern', $dt->getTimeZone()->getName());
-        $this->assertEquals(DateTime::LOCALTZ, $elem->getDateType());
-        date_default_timezone_set($default);
-
-    }
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Property/MultiDateTimeTest.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Property/MultiDateTimeTest.php
deleted file mode 100644
index eae3e2bb21..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Property/MultiDateTimeTest.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Property;
-
-class MultiDateTimeTest extends \PHPUnit_Framework_TestCase {
-
-    function testSetDateTime() {
-
-        $tz = new \DateTimeZone('Europe/Amsterdam');
-        $dt1 = new \DateTime('1985-07-04 01:30:00', $tz);
-        $dt2 = new \DateTime('1986-07-04 01:30:00', $tz);
-        $dt1->setTimeZone($tz);
-        $dt2->setTimeZone($tz);
-
-        $elem = new MultiDateTime('DTSTART');
-        $elem->setDateTimes(array($dt1,$dt2));
-
-        $this->assertEquals('19850704T013000,19860704T013000', $elem->value);
-        $this->assertEquals('Europe/Amsterdam', (string)$elem['TZID']);
-        $this->assertEquals('DATE-TIME', (string)$elem['VALUE']);
-
-    }
-
-    function testSetDateTimeLOCAL() {
-
-        $tz = new \DateTimeZone('Europe/Amsterdam');
-        $dt1 = new \DateTime('1985-07-04 01:30:00', $tz);
-        $dt2 = new \DateTime('1986-07-04 01:30:00', $tz);
-        $dt1->setTimeZone($tz);
-        $dt2->setTimeZone($tz);
-
-        $elem = new MultiDateTime('DTSTART');
-        $elem->setDateTimes(array($dt1,$dt2), DateTime::LOCAL);
-
-        $this->assertEquals('19850704T013000,19860704T013000', $elem->value);
-        $this->assertNull($elem['TZID']);
-        $this->assertEquals('DATE-TIME', (string)$elem['VALUE']);
-
-    }
-
-    function testSetDateTimeUTC() {
-
-        $tz = new \DateTimeZone('GMT');
-        $dt1 = new \DateTime('1985-07-04 01:30:00', $tz);
-        $dt2 = new \DateTime('1986-07-04 01:30:00', $tz);
-        $dt1->setTimeZone($tz);
-        $dt2->setTimeZone($tz);
-
-        $elem = new MultiDateTime('DTSTART');
-        $elem->setDateTimes(array($dt1,$dt2), DateTime::UTC);
-
-        $this->assertEquals('19850704T013000Z,19860704T013000Z', $elem->value);
-        $this->assertNull($elem['TZID']);
-        $this->assertEquals('DATE-TIME', (string)$elem['VALUE']);
-
-    }
-
-    function testSetDateTimeLOCALTZ() {
-
-        $tz = new \DateTimeZone('Europe/Amsterdam');
-        $dt1 = new \DateTime('1985-07-04 01:30:00', $tz);
-        $dt2 = new \DateTime('1986-07-04 01:30:00', $tz);
-        $dt1->setTimeZone($tz);
-        $dt2->setTimeZone($tz);
-
-        $elem = new MultiDateTime('DTSTART');
-        $elem->setDateTimes(array($dt1,$dt2), DateTime::LOCALTZ);
-
-        $this->assertEquals('19850704T013000,19860704T013000', $elem->value);
-        $this->assertEquals('Europe/Amsterdam', (string)$elem['TZID']);
-        $this->assertEquals('DATE-TIME', (string)$elem['VALUE']);
-
-    }
-
-    function testSetDateTimeDATE() {
-
-        $tz = new \DateTimeZone('Europe/Amsterdam');
-        $dt1 = new \DateTime('1985-07-04 01:30:00', $tz);
-        $dt2 = new \DateTime('1986-07-04 01:30:00', $tz);
-        $dt1->settimezone($tz);
-        $dt2->settimezone($tz);
-
-        $elem = new MultiDateTime('DTSTART');
-        $elem->setDateTimes(array($dt1,$dt2), DateTime::DATE);
-
-        $this->assertEquals('19850704,19860704', $elem->value);
-        $this->assertNull($elem['TZID']);
-        $this->assertEquals('DATE', (string)$elem['VALUE']);
-
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    function testSetDateTimeInvalid() {
-
-        $tz = new \DateTimeZone('Europe/Amsterdam');
-        $dt = new \DateTime('1985-07-04 01:30:00', $tz);
-        $dt->setTimeZone($tz);
-
-        $elem = new MultiDateTime('DTSTART');
-        $elem->setDateTimes(array($dt), 7);
-
-    }
-
-    function testGetDateTimeCached() {
-
-        $tz = new \DateTimeZone('Europe/Amsterdam');
-        $dt1 = new \DateTime('1985-07-04 01:30:00', $tz);
-        $dt2 = new \DateTime('1986-07-04 01:30:00', $tz);
-        $dt1->settimezone($tz);
-        $dt2->settimezone($tz);
-
-        $elem = new MultiDateTime('DTSTART');
-        $elem->setDateTimes(array($dt1,$dt2));
-
-        $this->assertEquals($elem->getDateTimes(), array($dt1,$dt2));
-
-    }
-
-    function testGetDateTimeDateNULL() {
-
-        $elem = new MultiDateTime('DTSTART');
-        $dt = $elem->getDateTimes();
-
-        $this->assertNull($dt);
-        $this->assertNull($elem->getDateType());
-
-    }
-
-    function testGetDateTimeDateDATE() {
-
-        $elem = new MultiDateTime('DTSTART','19850704,19860704');
-        $dt = $elem->getDateTimes();
-
-        $this->assertEquals('1985-07-04 00:00:00', $dt[0]->format('Y-m-d H:i:s'));
-        $this->assertEquals('1986-07-04 00:00:00', $dt[1]->format('Y-m-d H:i:s'));
-        $this->assertEquals(DateTime::DATE, $elem->getDateType());
-
-    }
-
-    function testGetDateTimeDateDATEReverse() {
-
-        $elem = new MultiDateTime('DTSTART','19850704,19860704');
-
-        $this->assertEquals(DateTime::DATE, $elem->getDateType());
-
-        $dt = $elem->getDateTimes();
-        $this->assertEquals('1985-07-04 00:00:00', $dt[0]->format('Y-m-d H:i:s'));
-        $this->assertEquals('1986-07-04 00:00:00', $dt[1]->format('Y-m-d H:i:s'));
-
-    }
-
-
-    function testGetDateTimeDateLOCAL() {
-
-        $elem = new DateTime('DTSTART','19850704T013000');
-        $dt = $elem->getDateTime();
-
-        $this->assertInstanceOf('DateTime', $dt);
-        $this->assertEquals('1985-07-04 01:30:00', $dt->format('Y-m-d H:i:s'));
-        $this->assertEquals(DateTime::LOCAL, $elem->getDateType());
-
-    }
-
-    function testGetDateTimeDateUTC() {
-
-        $elem = new DateTime('DTSTART','19850704T013000Z');
-        $dt = $elem->getDateTime();
-
-        $this->assertInstanceOf('DateTime', $dt);
-        $this->assertEquals('1985-07-04 01:30:00', $dt->format('Y-m-d H:i:s'));
-        $this->assertEquals('UTC', $dt->getTimeZone()->getName());
-        $this->assertEquals(DateTime::UTC, $elem->getDateType());
-
-    }
-
-    function testGetDateTimeDateLOCALTZ() {
-
-        $elem = new DateTime('DTSTART','19850704T013000');
-        $elem['TZID'] = 'Europe/Amsterdam';
-
-        $dt = $elem->getDateTime();
-
-        $this->assertInstanceOf('DateTime', $dt);
-        $this->assertEquals('1985-07-04 01:30:00', $dt->format('Y-m-d H:i:s'));
-        $this->assertEquals('Europe/Amsterdam', $dt->getTimeZone()->getName());
-        $this->assertEquals(DateTime::LOCALTZ, $elem->getDateType());
-
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    function testGetDateTimeDateInvalid() {
-
-        $elem = new DateTime('DTSTART','bla');
-        $dt = $elem->getDateTime();
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/PropertyTest.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/PropertyTest.php
deleted file mode 100644
index a2e258bda9..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/PropertyTest.php
+++ /dev/null
@@ -1,323 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class PropertyTest extends \PHPUnit_Framework_TestCase {
-
-    public function testToString() {
-
-        $property = new Property('propname','propvalue');
-        $this->assertEquals('PROPNAME', $property->name);
-        $this->assertEquals('propvalue', $property->value);
-        $this->assertEquals('propvalue', $property->__toString());
-        $this->assertEquals('propvalue', (string)$property);
-
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testCreateNonScalar() {
-
-        $property = new Property('propname',array());
-
-    }
-
-    public function testParameterExists() {
-
-        $property = new Property('propname','propvalue');
-        $property->parameters[] = new Parameter('paramname','paramvalue');
-
-        $this->assertTrue(isset($property['PARAMNAME']));
-        $this->assertTrue(isset($property['paramname']));
-        $this->assertFalse(isset($property['foo']));
-
-    }
-
-    public function testParameterGet() {
-
-        $property = new Property('propname','propvalue');
-        $property->parameters[] = new Parameter('paramname','paramvalue');
-
-        $this->assertInstanceOf('Sabre\\VObject\\Parameter',$property['paramname']);
-
-    }
-
-    public function testParameterNotExists() {
-
-        $property = new Property('propname','propvalue');
-        $property->parameters[] = new Parameter('paramname','paramvalue');
-
-        $this->assertInternalType('null',$property['foo']);
-
-    }
-
-    public function testParameterMultiple() {
-
-        $property = new Property('propname','propvalue');
-        $property->parameters[] = new Parameter('paramname','paramvalue');
-        $property->parameters[] = new Parameter('paramname','paramvalue');
-
-        $this->assertInstanceOf('Sabre\\VObject\\Parameter',$property['paramname']);
-        $this->assertEquals(2,count($property['paramname']));
-
-    }
-
-    public function testSetParameterAsString() {
-
-        $property = new Property('propname','propvalue');
-        $property['paramname'] = 'paramvalue';
-
-        $this->assertEquals(1,count($property->parameters));
-        $this->assertInstanceOf('Sabre\\VObject\\Parameter', $property->parameters[0]);
-        $this->assertEquals('PARAMNAME',$property->parameters[0]->name);
-        $this->assertEquals('paramvalue',$property->parameters[0]->value);
-
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testSetParameterAsStringNoKey() {
-
-        $property = new Property('propname','propvalue');
-        $property[] = 'paramvalue';
-
-    }
-
-    public function testSetParameterObject() {
-
-        $property = new Property('propname','propvalue');
-        $param = new Parameter('paramname','paramvalue');
-
-        $property[] = $param;
-
-        $this->assertEquals(1,count($property->parameters));
-        $this->assertEquals($param, $property->parameters[0]);
-
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testSetParameterObjectWithKey() {
-
-        $property = new Property('propname','propvalue');
-        $param = new Parameter('paramname','paramvalue');
-
-        $property['key'] = $param;
-
-    }
-
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testSetParameterObjectRandomObject() {
-
-        $property = new Property('propname','propvalue');
-        $property[] = new \StdClass();
-
-    }
-
-    public function testUnsetParameter() {
-
-        $property = new Property('propname','propvalue');
-        $param = new Parameter('paramname','paramvalue');
-        $property->parameters[] = $param;
-
-        unset($property['PARAMNAME']);
-        $this->assertEquals(0,count($property->parameters));
-
-    }
-
-    public function testParamCount() {
-
-        $property = new Property('propname','propvalue');
-        $param = new Parameter('paramname','paramvalue');
-        $property->parameters[] = $param;
-        $property->parameters[] = clone $param;
-
-        $this->assertEquals(2,count($property->parameters));
-
-    }
-
-    public function testSerialize() {
-
-        $property = new Property('propname','propvalue');
-
-        $this->assertEquals("PROPNAME:propvalue\r\n",$property->serialize());
-
-    }
-
-    public function testSerializeParam() {
-
-        $property = new Property('propname','propvalue');
-        $property->parameters[] = new Parameter('paramname','paramvalue');
-        $property->parameters[] = new Parameter('paramname2','paramvalue2');
-
-        $this->assertEquals("PROPNAME;PARAMNAME=paramvalue;PARAMNAME2=paramvalue2:propvalue\r\n",$property->serialize());
-
-    }
-
-    public function testSerializeNewLine() {
-
-        $property = new Property('propname',"line1\nline2");
-
-        $this->assertEquals("PROPNAME:line1\\nline2\r\n",$property->serialize());
-
-    }
-
-    public function testSerializeLongLine() {
-
-        $value = str_repeat('!',200);
-        $property = new Property('propname',$value);
-
-        $expected = "PROPNAME:" . str_repeat('!',66) . "\r\n " . str_repeat('!',74) . "\r\n " . str_repeat('!',60) . "\r\n";
-
-        $this->assertEquals($expected,$property->serialize());
-
-    }
-
-    public function testSerializeUTF8LineFold() {
-
-        $value = str_repeat('!',65) . "\xc3\xa4bla"; // inserted umlaut-a
-        $property = new Property('propname', $value);
-        $expected = "PROPNAME:" . str_repeat('!',65) . "\r\n \xc3\xa4bla\r\n";
-        $this->assertEquals($expected, $property->serialize());
-
-    }
-
-    public function testGetIterator() {
-
-        $it = new ElementList(array());
-        $property = new Property('propname','propvalue');
-        $property->setIterator($it);
-        $this->assertEquals($it,$property->getIterator());
-
-    }
-
-
-    public function testGetIteratorDefault() {
-
-        $property = new Property('propname','propvalue');
-        $it = $property->getIterator();
-        $this->assertTrue($it instanceof ElementList);
-        $this->assertEquals(1,count($it));
-
-    }
-
-    function testAddScalar() {
-
-        $property = new Property('EMAIL');
-
-        $property->add('myparam','value');
-
-        $this->assertEquals(1, count($property->parameters));
-
-        $this->assertTrue($property->parameters[0] instanceof Parameter);
-        $this->assertEquals('MYPARAM',$property->parameters[0]->name);
-        $this->assertEquals('value',$property->parameters[0]->value);
-
-    }
-
-    function testAddParameter() {
-
-        $prop = new Property('EMAIL');
-
-        $prop->add(new Parameter('MYPARAM','value'));
-
-        $this->assertEquals(1, count($prop->parameters));
-        $this->assertEquals('MYPARAM',$prop['myparam']->name);
-
-    }
-
-    function testAddParameterTwice() {
-
-        $prop = new Property('EMAIL');
-
-        $prop->add(new Parameter('MYPARAM', 'value1'));
-        $prop->add(new Parameter('MYPARAM', 'value2'));
-
-        $this->assertEquals(2, count($prop->parameters));
-
-        $this->assertEquals('MYPARAM',$prop['MYPARAM']->name);
-
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    function testAddArgFail() {
-
-        $prop = new Property('EMAIL');
-        $prop->add(new Parameter('MPARAM'),'hello');
-
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    function testAddArgFail2() {
-
-        $property = new Property('EMAIL','value');
-        $property->add(array());
-
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    function testAddArgFail3() {
-
-        $property = new Property('EMAIL','value');
-        $property->add('hello',array());
-
-    }
-
-    function testClone() {
-
-        $property = new Property('EMAIL','value');
-        $property['FOO'] = 'BAR';
-
-        $property2 = clone $property;
-        
-        $property['FOO'] = 'BAZ';
-        $this->assertEquals('BAR', (string)$property2['FOO']);
-
-    }
-
-    function testCreateParams() {
-
-        $property = Property::create('X-PROP', 'value', array(
-            'param1' => 'value1',
-            'param2' => array('value2', 'value3')
-        ));
-
-        $this->assertEquals(1, count($property['PARAM1']));
-        $this->assertEquals(2, count($property['PARAM2']));
-
-    }
-
-    function testValidateNonUTF8() {
-
-        $property = Property::create('X-PROP', "Bla\x00");
-        $result = $property->validate(Property::REPAIR);
-
-        $this->assertEquals('Property is not valid UTF-8!', $result[0]['message']);
-        $this->assertEquals('Bla', $property->value);
-
-    }
-
-
-    function testValidateBadPropertyName() {
-
-        $property = Property::create("X_*&PROP*", "Bla");
-        $result = $property->validate(Property::REPAIR);
-
-        $this->assertEquals($result[0]['message'], 'The propertyname: X_*&PROP* contains invalid characters. Only A-Z, 0-9 and - are allowed');
-        $this->assertEquals('X-PROP', $property->name);
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ReaderTest.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ReaderTest.php
deleted file mode 100644
index d5b22f8c3b..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/ReaderTest.php
+++ /dev/null
@@ -1,328 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class ReaderTest extends \PHPUnit_Framework_TestCase {
-
-    function testReadComponent() {
-
-        $data = "BEGIN:VCALENDAR\r\nEND:VCALENDAR";
-
-        $result = Reader::read($data);
-
-        $this->assertInstanceOf('Sabre\\VObject\\Component', $result);
-        $this->assertEquals('VCALENDAR', $result->name);
-        $this->assertEquals(0, count($result->children));
-
-    }
-
-    function testReadComponentUnixNewLine() {
-
-        $data = "BEGIN:VCALENDAR\nEND:VCALENDAR";
-
-        $result = Reader::read($data);
-
-        $this->assertInstanceOf('Sabre\\VObject\\Component', $result);
-        $this->assertEquals('VCALENDAR', $result->name);
-        $this->assertEquals(0, count($result->children));
-
-    }
-
-    function testReadComponentMacNewLine() {
-
-        $data = "BEGIN:VCALENDAR\rEND:VCALENDAR";
-
-        $result = Reader::read($data);
-
-        $this->assertInstanceOf('Sabre\\VObject\\Component', $result);
-        $this->assertEquals('VCALENDAR', $result->name);
-        $this->assertEquals(0, count($result->children));
-
-    }
-
-    function testReadComponentLineFold() {
-
-        $data = "BEGIN:\r\n\tVCALENDAR\r\nE\r\n ND:VCALENDAR";
-
-        $result = Reader::read($data);
-
-        $this->assertInstanceOf('Sabre\\VObject\\Component', $result);
-        $this->assertEquals('VCALENDAR', $result->name);
-        $this->assertEquals(0, count($result->children));
-
-    }
-
-    /**
-     * @expectedException Sabre\VObject\ParseException
-     */
-    function testReadCorruptComponent() {
-
-        $data = "BEGIN:VCALENDAR\r\nEND:FOO";
-
-        $result = Reader::read($data);
-
-    }
-
-    function testReadProperty() {
-
-        $data = "PROPNAME:propValue";
-        $result = Reader::read($data);
-
-        $this->assertInstanceOf('Sabre\\VObject\\Property', $result);
-        $this->assertEquals('PROPNAME', $result->name);
-        $this->assertEquals('propValue', $result->value);
-
-    }
-
-    function testReadPropertyWithNewLine() {
-
-        $data = 'PROPNAME:Line1\\nLine2\\NLine3\\\\Not the 4th line!';
-        $result = Reader::read($data);
-
-        $this->assertInstanceOf('Sabre\\VObject\\Property', $result);
-        $this->assertEquals('PROPNAME', $result->name);
-        $this->assertEquals("Line1\nLine2\nLine3\\Not the 4th line!", $result->value);
-
-    }
-
-    function testReadMappedProperty() {
-
-        $data = "DTSTART:20110529";
-        $result = Reader::read($data);
-
-        $this->assertInstanceOf('Sabre\\VObject\\Property\\DateTime', $result);
-        $this->assertEquals('DTSTART', $result->name);
-        $this->assertEquals('20110529', $result->value);
-
-    }
-
-    function testReadMappedPropertyGrouped() {
-
-        $data = "foo.DTSTART:20110529";
-        $result = Reader::read($data);
-
-        $this->assertInstanceOf('Sabre\\VObject\\Property\\DateTime', $result);
-        $this->assertEquals('DTSTART', $result->name);
-        $this->assertEquals('20110529', $result->value);
-
-    }
-
-
-    /**
-     * @expectedException Sabre\VObject\ParseException
-     */
-    function testReadBrokenLine() {
-
-        $data = "PROPNAME;propValue";
-        $result = Reader::read($data);
-
-    }
-
-    function testReadPropertyInComponent() {
-
-        $data = array(
-            "BEGIN:VCALENDAR",
-            "PROPNAME:propValue",
-            "END:VCALENDAR"
-        );
-
-        $result = Reader::read(implode("\r\n",$data));
-
-        $this->assertInstanceOf('Sabre\\VObject\\Component', $result);
-        $this->assertEquals('VCALENDAR', $result->name);
-        $this->assertEquals(1, count($result->children));
-        $this->assertInstanceOf('Sabre\\VObject\\Property', $result->children[0]);
-        $this->assertEquals('PROPNAME', $result->children[0]->name);
-        $this->assertEquals('propValue', $result->children[0]->value);
-
-    }
-    function testReadNestedComponent() {
-
-        $data = array(
-            "BEGIN:VCALENDAR",
-            "BEGIN:VTIMEZONE",
-            "BEGIN:DAYLIGHT",
-            "END:DAYLIGHT",
-            "END:VTIMEZONE",
-            "END:VCALENDAR"
-        );
-
-        $result = Reader::read(implode("\r\n",$data));
-
-        $this->assertInstanceOf('Sabre\\VObject\\Component', $result);
-        $this->assertEquals('VCALENDAR', $result->name);
-        $this->assertEquals(1, count($result->children));
-        $this->assertInstanceOf('Sabre\\VObject\\Component', $result->children[0]);
-        $this->assertEquals('VTIMEZONE', $result->children[0]->name);
-        $this->assertEquals(1, count($result->children[0]->children));
-        $this->assertInstanceOf('Sabre\\VObject\\Component', $result->children[0]->children[0]);
-        $this->assertEquals('DAYLIGHT', $result->children[0]->children[0]->name);
-
-
-    }
-
-    function testReadPropertyParameter() {
-
-        $data = "PROPNAME;PARAMNAME=paramvalue:propValue";
-        $result = Reader::read($data);
-
-        $this->assertInstanceOf('Sabre\\VObject\\Property', $result);
-        $this->assertEquals('PROPNAME', $result->name);
-        $this->assertEquals('propValue', $result->value);
-        $this->assertEquals(1, count($result->parameters));
-        $this->assertEquals('PARAMNAME', $result->parameters[0]->name);
-        $this->assertEquals('paramvalue', $result->parameters[0]->value);
-
-    }
-
-    function testReadPropertyNoValue() {
-
-        $data = "PROPNAME;PARAMNAME:propValue";
-        $result = Reader::read($data);
-
-        $this->assertInstanceOf('Sabre\\VObject\\Property', $result);
-        $this->assertEquals('PROPNAME', $result->name);
-        $this->assertEquals('propValue', $result->value);
-        $this->assertEquals(1, count($result->parameters));
-        $this->assertEquals('PARAMNAME', $result->parameters[0]->name);
-
-        $this->assertNull($result->parameters[0]->value);
-
-    }
-
-    function testReadPropertyParameterExtraColon() {
-
-        $data = "PROPNAME;PARAMNAME=paramvalue:propValue:anotherrandomstring";
-        $result = Reader::read($data);
-
-        $this->assertInstanceOf('Sabre\\VObject\\Property', $result);
-        $this->assertEquals('PROPNAME', $result->name);
-        $this->assertEquals('propValue:anotherrandomstring', $result->value);
-        $this->assertEquals(1, count($result->parameters));
-        $this->assertEquals('PARAMNAME', $result->parameters[0]->name);
-        $this->assertEquals('paramvalue', $result->parameters[0]->value);
-
-    }
-
-    function testReadProperty2Parameters() {
-
-        $data = "PROPNAME;PARAMNAME=paramvalue;PARAMNAME2=paramvalue2:propValue";
-        $result = Reader::read($data);
-
-        $this->assertInstanceOf('Sabre\\VObject\\Property', $result);
-        $this->assertEquals('PROPNAME', $result->name);
-        $this->assertEquals('propValue', $result->value);
-        $this->assertEquals(2, count($result->parameters));
-        $this->assertEquals('PARAMNAME', $result->parameters[0]->name);
-        $this->assertEquals('paramvalue', $result->parameters[0]->value);
-        $this->assertEquals('PARAMNAME2', $result->parameters[1]->name);
-        $this->assertEquals('paramvalue2', $result->parameters[1]->value);
-
-    }
-
-    function testReadPropertyParameterQuoted() {
-
-        $data = "PROPNAME;PARAMNAME=\"paramvalue\":propValue";
-        $result = Reader::read($data);
-
-        $this->assertInstanceOf('Sabre\\VObject\\Property', $result);
-        $this->assertEquals('PROPNAME', $result->name);
-        $this->assertEquals('propValue', $result->value);
-        $this->assertEquals(1, count($result->parameters));
-        $this->assertEquals('PARAMNAME', $result->parameters[0]->name);
-        $this->assertEquals('paramvalue', $result->parameters[0]->value);
-
-    }
-    function testReadPropertyParameterNewLines() {
-
-        $data = "PROPNAME;PARAMNAME=paramvalue1\\nvalue2\\\\nvalue3:propValue";
-        $result = Reader::read($data);
-
-        $this->assertInstanceOf('Sabre\\VObject\\Property', $result);
-        $this->assertEquals('PROPNAME', $result->name);
-        $this->assertEquals('propValue', $result->value);
-
-        $this->assertEquals(1, count($result->parameters));
-        $this->assertEquals('PARAMNAME', $result->parameters[0]->name);
-        $this->assertEquals("paramvalue1\nvalue2\\nvalue3", $result->parameters[0]->value);
-
-    }
-
-    function testReadPropertyParameterQuotedColon() {
-
-        $data = "PROPNAME;PARAMNAME=\"param:value\":propValue";
-        $result = Reader::read($data);
-
-        $this->assertInstanceOf('Sabre\\VObject\\Property', $result);
-        $this->assertEquals('PROPNAME', $result->name);
-        $this->assertEquals('propValue', $result->value);
-        $this->assertEquals(1, count($result->parameters));
-        $this->assertEquals('PARAMNAME', $result->parameters[0]->name);
-        $this->assertEquals('param:value', $result->parameters[0]->value);
-
-    }
-
-    function testReadForgiving() {
-
-        $data = array(
-            "BEGIN:VCALENDAR",
-            "X_PROP:propValue",
-            "END:VCALENDAR"
-        );
-
-        $caught = false;
-        try {
-            $result = Reader::read(implode("\r\n",$data));
-        } catch (ParseException $e) {
-            $caught = true;
-        }
-
-        $this->assertEquals(true, $caught);
-
-        $result = Reader::read(implode("\r\n",$data), Reader::OPTION_FORGIVING);
-
-        $expected = implode("\r\n", array(
-            "BEGIN:VCALENDAR",
-            "X_PROP:propValue",
-            "END:VCALENDAR",
-            ""
-        ));
-
-        $this->assertEquals($expected, $result->serialize());
-
-
-    }
-
-    function testReadWithInvalidLine() {
-
-        $data = array(
-            "BEGIN:VCALENDAR",
-            "DESCRIPTION:propValue",
-            "Yes, we've actually seen a file with non-idented property values on multiple lines",
-            "END:VCALENDAR"
-        );
-
-        $caught = false;
-        try {
-            $result = Reader::read(implode("\r\n",$data));
-        } catch (ParseException $e) {
-            $caught = true;
-        }
-
-        $this->assertEquals(true, $caught);
-
-        $result = Reader::read(implode("\r\n",$data), Reader::OPTION_IGNORE_INVALID_LINES);
-
-        $expected = implode("\r\n", array(
-            "BEGIN:VCALENDAR",
-            "DESCRIPTION:propValue",
-            "END:VCALENDAR",
-            ""
-        ));
-
-        $this->assertEquals($expected, $result->serialize());
-
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorFifthTuesdayProblemTest.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorFifthTuesdayProblemTest.php
deleted file mode 100644
index 069832a0fb..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorFifthTuesdayProblemTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class RecurrenceIteratorFifthTuesdayProblemTest extends \PHPUnit_Framework_TestCase {
-
-    function testGetDTEnd() {
-
-        $ics = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Apple Inc.//iCal 4.0.4//EN
-CALSCALE:GREGORIAN
-BEGIN:VEVENT
-TRANSP:OPAQUE
-DTEND;TZID=America/New_York:20070925T170000
-UID:uuid
-DTSTAMP:19700101T000000Z
-LOCATION:
-DESCRIPTION:
-STATUS:CONFIRMED
-SEQUENCE:18
-SUMMARY:Stuff
-DTSTART;TZID=America/New_York:20070925T160000
-CREATED:20071004T144642Z
-RRULE:FREQ=MONTHLY;INTERVAL=1;UNTIL=20071030T035959Z;BYDAY=5TU
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-        $vObject = Reader::read($ics);
-        $it = new RecurrenceIterator($vObject, (string)$vObject->VEVENT->UID);
-
-        while($it->valid()) {
-            $it->next();
-        }
-
-        // If we got here, it means we were successful. The bug that was in the
-        // system before would fail on the 5th tuesday of the month, if the 5th
-        // tuesday did not exist.
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorInfiniteLoopProblemTest.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorInfiniteLoopProblemTest.php
deleted file mode 100644
index 670c39baee..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorInfiniteLoopProblemTest.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-use DateTime;
-use DateTimeZone;
-
-class RecurrenceIteratorInfiniteLoopProblemTest extends \PHPUnit_Framework_TestCase {
-
-    /**
-     * This bug came from a Fruux customer. This would result in a never-ending
-     * request.
-     */
-    function testFastForwardTooFar() {
-
-        $ev = Component::create('VEVENT');
-        $ev->DTSTART = '20090420T180000Z';
-        $ev->RRULE = 'FREQ=WEEKLY;BYDAY=MO;UNTIL=20090704T205959Z;INTERVAL=1';
-
-        $this->assertFalse($ev->isInTimeRange(new DateTime('2012-01-01 12:00:00'),new DateTime('3000-01-01 00:00:00')));
-
-    }
-
-    /**
-     * Different bug, also likely an infinite loop.
-     */
-    function testYearlyByMonthLoop() {
-
-        $ev = Component::create('VEVENT');
-        $ev->UID = 'uuid';
-        $ev->DTSTART = '20120101T154500';
-        $ev->DTSTART['TZID'] = 'Europe/Berlin';
-        $ev->RRULE = 'FREQ=YEARLY;INTERVAL=1;UNTIL=20120203T225959Z;BYMONTH=2;BYSETPOS=1;BYDAY=SU,MO,TU,WE,TH,FR,SA';
-        $ev->DTEND = '20120101T164500';
-        $ev->DTEND['TZID'] = 'Europe/Berlin';
-
-        // This recurrence rule by itself is a yearly rule that should happen
-        // every february.
-        //
-        // The BYDAY part expands this to every day of the month, but the
-        // BYSETPOS limits this to only the 1st day of the month. Very crazy
-        // way to specify this, and could have certainly been a lot easier.
-        $cal = Component::create('VCALENDAR');
-        $cal->add($ev);
-
-        $it = new RecurrenceIterator($cal,'uuid');
-        $it->fastForward(new DateTime('2012-01-29 23:00:00', new DateTimeZone('UTC')));
-
-        $collect = array();
-
-        while($it->valid()) {
-            $collect[] = $it->getDTSTART();
-            if ($it->getDTSTART() > new DateTime('2013-02-05 22:59:59', new DateTimeZone('UTC'))) {
-                break;
-            }
-            $it->next();
-
-        }
-
-        $this->assertEquals(
-            array(new DateTime('2012-02-01 15:45:00', new DateTimeZone('Europe/Berlin'))),
-            $collect
-        );
-
-    }
-
-    /**
-     * Something, somewhere produced an ics with an interval set to 0. Because
-     * this means we increase the current day (or week, month) by 0, this also
-     * results in an infinite loop.
-     *
-     * @expectedException InvalidArgumentException
-     * @return void
-     */
-    function testZeroInterval() {
-
-        $ev = Component::create('VEVENT');
-        $ev->UID = 'uuid';
-        $ev->DTSTART = '20120824T145700Z';
-        $ev->RRULE = 'FREQ=YEARLY;INTERVAL=0';
-        $cal = Component::create('VCALENDAR');
-        $cal->add($ev);
-
-        $it = new RecurrenceIterator($cal,'uuid');
-        $it->fastForward(new DateTime('2013-01-01 23:00:00', new DateTimeZone('UTC')));
-
-        // if we got this far.. it means we are no longer infinitely looping
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorMinusOneProblemTest.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorMinusOneProblemTest.php
deleted file mode 100644
index 2c17f9f6be..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorMinusOneProblemTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class RecurrenceIteratorMinusOneProblemTest extends \PHPUnit_Framework_TestCase {
-
-    function testMinusOne() {
-
-        $ics = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-DTSTAMP:20120314T203127Z
-UID:foo
-SUMMARY:foo
-RRULE:FREQ=YEARLY;UNTIL=20120314
-DTSTART;VALUE=DATE:20120315
-DTEND;VALUE=DATE:20120316
-SEQUENCE:1
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-        $vObject = Reader::read($ics);
-        $it = new RecurrenceIterator($vObject, (string)$vObject->VEVENT->UID);
-
-        $this->assertTrue($it->valid());
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorTest.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorTest.php
deleted file mode 100644
index 1811d8b6f9..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorTest.php
+++ /dev/null
@@ -1,1425 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-use DateTime;
-use DateTimeZone;
-
-class RecurrenceIteratorTest extends \PHPUnit_Framework_TestCase {
-
-    function testValues() {
-
-        $ev = new Component('VEVENT');
-        $ev->UID = 'bla';
-        $ev->RRULE = 'FREQ=DAILY;BYHOUR=10;BYMINUTE=5;BYSECOND=16;BYWEEKNO=32;BYYEARDAY=100,200';
-        $dtStart = new Property\DateTime('DTSTART');
-        $dtStart->setDateTime(new DateTime('2011-10-07'),Property\DateTime::UTC);
-
-        $ev->add($dtStart);
-
-        $vcal = Component::create('VCALENDAR');
-        $vcal->add($ev);
-
-        $it = new RecurrenceIterator($vcal,(string)$ev->uid);
-
-        $this->assertTrue($it->isInfinite());
-        $this->assertEquals(array(10), $it->byHour);
-        $this->assertEquals(array(5), $it->byMinute);
-        $this->assertEquals(array(16), $it->bySecond);
-        $this->assertEquals(array(32), $it->byWeekNo);
-        $this->assertEquals(array(100,200), $it->byYearDay);
-
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     * @depends testValues
-     */
-    function testInvalidFreq() {
-
-        $ev = new Component('VEVENT');
-        $ev->RRULE = 'FREQ=SMONTHLY;INTERVAL=3;UNTIL=20111025T000000Z';
-        $dtStart = new Property\DateTime('DTSTART');
-        $dtStart->setDateTime(new DateTime('2011-10-07'),Property\DateTime::UTC);
-
-        $ev->add($dtStart);
-
-        $vcal = Component::create('VCALENDAR');
-        $vcal->add($ev);
-
-        $it = new RecurrenceIterator($vcal,(string)$ev->uid);
-
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    function testVCalendarNoUID() {
-
-        $vcal = new Component('VCALENDAR');
-        $it = new RecurrenceIterator($vcal);
-
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    function testVCalendarInvalidUID() {
-
-        $vcal = new Component('VCALENDAR');
-        $it = new RecurrenceIterator($vcal,'foo');
-
-    }
-
-    /**
-     * @depends testValues
-     */
-    function testHourly() {
-
-        $ev = new Component('VEVENT');
-        $ev->UID = 'bla';
-        $ev->RRULE = 'FREQ=HOURLY;INTERVAL=3;UNTIL=20111025T000000Z';
-        $dtStart = new Property\DateTime('DTSTART');
-        $dtStart->setDateTime(new DateTime('2011-10-07 12:00:00', new DateTimeZone('UTC')),Property\DateTime::UTC);
-
-        $ev->add($dtStart);
-
-        $vcal = Component::create('VCALENDAR');
-        $vcal->add($ev);
-
-        $it = new RecurrenceIterator($vcal,$ev->uid);
-
-        $this->assertEquals('hourly', $it->frequency);
-        $this->assertEquals(3, $it->interval);
-        $this->assertEquals(new DateTime('2011-10-25', new DateTimeZone('UTC')), $it->until);
-
-        // Max is to prevent overflow
-        $max = 12;
-        $result = array();
-        foreach($it as $item) {
-
-            $result[] = $item;
-            $max--;
-
-            if (!$max) break;
-
-        }
-
-        $tz = new DateTimeZone('UTC');
-
-        $this->assertEquals(
-            array(
-                new DateTime('2011-10-07 12:00:00', $tz),
-                new DateTime('2011-10-07 15:00:00', $tz),
-                new DateTime('2011-10-07 18:00:00', $tz),
-                new DateTime('2011-10-07 21:00:00', $tz),
-                new DateTime('2011-10-08 00:00:00', $tz),
-                new DateTime('2011-10-08 03:00:00', $tz),
-                new DateTime('2011-10-08 06:00:00', $tz),
-                new DateTime('2011-10-08 09:00:00', $tz),
-                new DateTime('2011-10-08 12:00:00', $tz),
-                new DateTime('2011-10-08 15:00:00', $tz),
-                new DateTime('2011-10-08 18:00:00', $tz),
-                new DateTime('2011-10-08 21:00:00', $tz),
-            ),
-            $result
-        );
-
-    }
-
-    /**
-     * @depends testValues
-     */
-    function testDaily() {
-
-        $ev = new Component('VEVENT');
-        $ev->UID = 'bla';
-        $ev->RRULE = 'FREQ=DAILY;INTERVAL=3;UNTIL=20111025T000000Z';
-        $dtStart = new Property\DateTime('DTSTART');
-        $dtStart->setDateTime(new DateTime('2011-10-07', new DateTimeZone('UTC')),Property\DateTime::UTC);
-
-        $ev->add($dtStart);
-
-        $vcal = Component::create('VCALENDAR');
-        $vcal->add($ev);
-
-        $it = new RecurrenceIterator($vcal,$ev->uid);
-
-        $this->assertEquals('daily', $it->frequency);
-        $this->assertEquals(3, $it->interval);
-        $this->assertEquals(new DateTime('2011-10-25', new DateTimeZone('UTC')), $it->until);
-
-        // Max is to prevent overflow
-        $max = 12;
-        $result = array();
-        foreach($it as $item) {
-
-            $result[] = $item;
-            $max--;
-
-            if (!$max) break;
-
-        }
-
-        $tz = new DateTimeZone('UTC');
-
-        $this->assertEquals(
-            array(
-                new DateTime('2011-10-07', $tz),
-                new DateTime('2011-10-10', $tz),
-                new DateTime('2011-10-13', $tz),
-                new DateTime('2011-10-16', $tz),
-                new DateTime('2011-10-19', $tz),
-                new DateTime('2011-10-22', $tz),
-                new DateTime('2011-10-25', $tz),
-            ),
-            $result
-        );
-
-    }
-
-    /**
-     * @depends testValues
-     */
-    function testNoRRULE() {
-
-        $ev = new Component('VEVENT');
-        $ev->UID = 'bla';
-        $dtStart = new Property\DateTime('DTSTART');
-        $dtStart->setDateTime(new DateTime('2011-10-07', new DateTimeZone('UTC')),Property\DateTime::UTC);
-
-        $ev->add($dtStart);
-
-        $vcal = Component::create('VCALENDAR');
-        $vcal->add($ev);
-
-        $it = new RecurrenceIterator($vcal,$ev->uid);
-
-        $this->assertEquals('daily', $it->frequency);
-        $this->assertEquals(1, $it->interval);
-
-        // Max is to prevent overflow
-        $max = 12;
-        $result = array();
-        foreach($it as $item) {
-
-            $result[] = $item;
-            $max--;
-
-            if (!$max) break;
-
-        }
-
-        $tz = new DateTimeZone('UTC');
-
-        $this->assertEquals(
-            array(
-                new DateTime('2011-10-07', $tz),
-            ),
-            $result
-        );
-
-    }
-
-    /**
-     * @depends testValues
-     */
-    function testDailyByDayByHour() {
-
-        $ev = new Component('VEVENT');
-        $ev->UID = 'bla';
-        $ev->RRULE = 'FREQ=DAILY;BYDAY=SA,SU;BYHOUR=6,7';
-        $dtStart = new Property\DateTime('DTSTART');
-        $dtStart->setDateTime(new DateTime('2011-10-08 06:00:00', new DateTimeZone('UTC')),Property\DateTime::UTC);
-
-        $ev->add($dtStart);
-
-        $vcal = Component::create('VCALENDAR');
-        $vcal->add($ev);
-
-        $it = new RecurrenceIterator($vcal,(string)$ev->uid);
-
-        $this->assertEquals('daily', $it->frequency);
-        $this->assertEquals(1, $it->interval);
-        $this->assertEquals(array('6','7'), $it->byHour);
-        $this->assertEquals(array('SA','SU'), $it->byDay);
-
-        // Grabbing the next 12 items
-        $max = 12;
-        $result = array();
-        foreach($it as $item) {
-
-            $result[] = $item;
-            $max--;
-
-            if (!$max) break;
-
-        }
-
-        $tz = new DateTimeZone('UTC');
-
-        $this->assertEquals(
-            array(
-                new datetime('2011-10-08 06:00:00', $tz),
-                new datetime('2011-10-08 07:00:00', $tz),
-                new datetime('2011-10-09 06:00:00', $tz),
-                new datetime('2011-10-09 07:00:00', $tz),
-                new datetime('2011-10-15 06:00:00', $tz),
-                new datetime('2011-10-15 07:00:00', $tz),
-                new datetime('2011-10-16 06:00:00', $tz),
-                new datetime('2011-10-16 07:00:00', $tz),
-                new datetime('2011-10-22 06:00:00', $tz),
-                new datetime('2011-10-22 07:00:00', $tz),
-                new datetime('2011-10-23 06:00:00', $tz),
-                new datetime('2011-10-23 07:00:00', $tz),
-            ),
-            $result
-        );
-
-    }
-
-    /**
-     * @depends testValues
-     */
-    function testDailyByHour() {
-
-        $ev = new Component('VEVENT');
-        $ev->UID = 'bla';
-        $ev->RRULE = 'FREQ=DAILY;INTERVAL=2;BYHOUR=10,11,12,13,14,15';
-        $dtStart = new Property\DateTime('DTSTART');
-        $dtStart->setDateTime(new DateTime('2012-10-11 12:00:00', new DateTimeZone('UTC')),Property\DateTime::UTC);
-
-        $ev->add($dtStart);
-
-        $vcal = Component::create('VCALENDAR');
-        $vcal->add($ev);
-
-        $it = new RecurrenceIterator($vcal,(string)$ev->uid);
-
-        $this->assertEquals('daily', $it->frequency);
-        $this->assertEquals(2, $it->interval);
-        $this->assertEquals(array('10','11','12','13','14','15'), $it->byHour);
-
-        // Grabbing the next 12 items
-        $max = 12;
-        $result = array();
-        foreach($it as $item) {
-
-            $result[] = $item;
-            $max--;
-
-            if (!$max) break;
-
-        }
-
-        $tz = new DateTimeZone('UTC');
-
-        $this->assertEquals(
-            array(
-                new datetime('2012-10-11 12:00:00', $tz),
-                new datetime('2012-10-11 13:00:00', $tz),
-                new datetime('2012-10-11 14:00:00', $tz),
-                new datetime('2012-10-11 15:00:00', $tz),
-                new datetime('2012-10-13 10:00:00', $tz),
-                new datetime('2012-10-13 11:00:00', $tz),
-                new datetime('2012-10-13 12:00:00', $tz),
-                new datetime('2012-10-13 13:00:00', $tz),
-                new datetime('2012-10-13 14:00:00', $tz),
-                new datetime('2012-10-13 15:00:00', $tz),
-                new datetime('2012-10-15 10:00:00', $tz),
-                new datetime('2012-10-15 11:00:00', $tz),
-            ),
-            $result
-        );
-
-    }
-
-    /**
-     * @depends testValues
-     */
-    function testDailyByDay() {
-
-        $ev = new Component('VEVENT');
-        $ev->UID = 'bla';
-        $ev->RRULE = 'FREQ=DAILY;INTERVAL=2;BYDAY=TU,WE,FR';
-        $dtStart = new Property\DateTime('DTSTART');
-        $dtStart->setDateTime(new DateTime('2011-10-07', new DateTimeZone('UTC')),Property\DateTime::UTC);
-
-        $ev->add($dtStart);
-
-        $vcal = Component::create('VCALENDAR');
-        $vcal->add($ev);
-
-        $it = new RecurrenceIterator($vcal,(string)$ev->uid);
-
-        $this->assertEquals('daily', $it->frequency);
-        $this->assertEquals(2, $it->interval);
-        $this->assertEquals(array('TU','WE','FR'), $it->byDay);
-
-        // Grabbing the next 12 items
-        $max = 12;
-        $result = array();
-        foreach($it as $item) {
-
-            $result[] = $item;
-            $max--;
-
-            if (!$max) break;
-
-        }
-
-        $tz = new DateTimeZone('UTC');
-
-        $this->assertEquals(
-            array(
-                new DateTime('2011-10-07', $tz),
-                new DateTime('2011-10-11', $tz),
-                new DateTime('2011-10-19', $tz),
-                new DateTime('2011-10-21', $tz),
-                new DateTime('2011-10-25', $tz),
-                new DateTime('2011-11-02', $tz),
-                new DateTime('2011-11-04', $tz),
-                new DateTime('2011-11-08', $tz),
-                new DateTime('2011-11-16', $tz),
-                new DateTime('2011-11-18', $tz),
-                new DateTime('2011-11-22', $tz),
-                new DateTime('2011-11-30', $tz),
-            ),
-            $result
-        );
-
-    }
-
-    /**
-     * @depends testValues
-     */
-    function testWeekly() {
-
-        $ev = new Component('VEVENT');
-        $ev->UID = 'bla';
-        $ev->RRULE = 'FREQ=WEEKLY;INTERVAL=2;COUNT=10';
-        $dtStart = new Property\DateTime('DTSTART');
-        $dtStart->setDateTime(new DateTime('2011-10-07', new DateTimeZone('UTC')),Property\DateTime::UTC);
-
-        $ev->add($dtStart);
-
-        $vcal = Component::create('VCALENDAR');
-        $vcal->add($ev);
-
-        $it = new RecurrenceIterator($vcal,(string)$ev->uid);
-
-        $this->assertEquals('weekly', $it->frequency);
-        $this->assertEquals(2, $it->interval);
-        $this->assertEquals(10, $it->count);
-
-        // Max is to prevent overflow
-        $max = 12;
-        $result = array();
-        foreach($it as $item) {
-
-            $result[] = $item;
-            $max--;
-
-            if (!$max) break;
-
-        }
-
-        $tz = new DateTimeZone('UTC');
-
-        $this->assertEquals(
-            array(
-                new DateTime('2011-10-07', $tz),
-                new DateTime('2011-10-21', $tz),
-                new DateTime('2011-11-04', $tz),
-                new DateTime('2011-11-18', $tz),
-                new DateTime('2011-12-02', $tz),
-                new DateTime('2011-12-16', $tz),
-                new DateTime('2011-12-30', $tz),
-                new DateTime('2012-01-13', $tz),
-                new DateTime('2012-01-27', $tz),
-                new DateTime('2012-02-10', $tz),
-            ),
-            $result
-        );
-
-    }
-
-    /**
-     * @depends testValues
-     */
-    function testWeeklyByDayByHour() {
-
-        $ev = new Component('VEVENT');
-        $ev->UID = 'bla';
-        $ev->RRULE = 'FREQ=WEEKLY;INTERVAL=2;BYDAY=TU,WE,FR;WKST=MO;BYHOUR=8,9,10';
-        $dtStart = new Property\DateTime('DTSTART');
-        $dtStart->setDateTime(new DateTime('2011-10-07 08:00:00', new DateTimeZone('UTC')),Property\DateTime::UTC);
-
-        $ev->add($dtStart);
-
-        $vcal = Component::create('VCALENDAR');
-        $vcal->add($ev);
-
-        $it = new RecurrenceIterator($vcal,(string)$ev->uid);
-
-        $this->assertEquals('weekly', $it->frequency);
-        $this->assertEquals(2, $it->interval);
-        $this->assertEquals(array('TU','WE','FR'), $it->byDay);
-        $this->assertEquals(array('8','9','10'), $it->byHour);
-        $this->assertEquals('MO', $it->weekStart);
-
-        // Grabbing the next 12 items
-        $max = 15;
-        $result = array();
-        foreach($it as $item) {
-
-            $result[] = $item;
-            $max--;
-
-            if (!$max) break;
-
-        }
-
-        $tz = new DateTimeZone('UTC');
-
-        $this->assertEquals(
-            array(
-                new DateTime('2011-10-07 08:00:00', $tz),
-                new DateTime('2011-10-07 09:00:00', $tz),
-                new DateTime('2011-10-07 10:00:00', $tz),
-                new DateTime('2011-10-18 08:00:00', $tz),
-                new DateTime('2011-10-18 09:00:00', $tz),
-                new DateTime('2011-10-18 10:00:00', $tz),
-                new DateTime('2011-10-19 08:00:00', $tz),
-                new DateTime('2011-10-19 09:00:00', $tz),
-                new DateTime('2011-10-19 10:00:00', $tz),
-                new DateTime('2011-10-21 08:00:00', $tz),
-                new DateTime('2011-10-21 09:00:00', $tz),
-                new DateTime('2011-10-21 10:00:00', $tz),
-                new DateTime('2011-11-01 08:00:00', $tz),
-                new DateTime('2011-11-01 09:00:00', $tz),
-                new DateTime('2011-11-01 10:00:00', $tz),
-            ),
-            $result
-        );
-
-    }
-
-    /**
-     * @depends testValues
-     */
-    function testWeeklyByDaySpecificHour() {
-
-        $ev = new Component('VEVENT');
-        $ev->UID = 'bla';
-        $ev->RRULE = 'FREQ=WEEKLY;INTERVAL=2;BYDAY=TU,WE,FR;WKST=SU';
-        $dtStart = new Property\DateTime('DTSTART');
-        $dtStart->setDateTime(new DateTime('2011-10-07 18:00:00', new DateTimeZone('UTC')),Property\DateTime::UTC);
-
-        $ev->add($dtStart);
-
-        $vcal = Component::create('VCALENDAR');
-        $vcal->add($ev);
-
-        $it = new RecurrenceIterator($vcal,(string)$ev->uid);
-
-        $this->assertEquals('weekly', $it->frequency);
-        $this->assertEquals(2, $it->interval);
-        $this->assertEquals(array('TU','WE','FR'), $it->byDay);
-        $this->assertEquals('SU', $it->weekStart);
-
-        // Grabbing the next 12 items
-        $max = 12;
-        $result = array();
-        foreach($it as $item) {
-
-            $result[] = $item;
-            $max--;
-
-            if (!$max) break;
-
-        }
-
-        $tz = new DateTimeZone('UTC');
-
-        $this->assertEquals(
-            array(
-                new DateTime('2011-10-07 18:00:00', $tz),
-                new DateTime('2011-10-18 18:00:00', $tz),
-                new DateTime('2011-10-19 18:00:00', $tz),
-                new DateTime('2011-10-21 18:00:00', $tz),
-                new DateTime('2011-11-01 18:00:00', $tz),
-                new DateTime('2011-11-02 18:00:00', $tz),
-                new DateTime('2011-11-04 18:00:00', $tz),
-                new DateTime('2011-11-15 18:00:00', $tz),
-                new DateTime('2011-11-16 18:00:00', $tz),
-                new DateTime('2011-11-18 18:00:00', $tz),
-                new DateTime('2011-11-29 18:00:00', $tz),
-                new DateTime('2011-11-30 18:00:00', $tz),
-            ),
-            $result
-        );
-
-    }
-
-    /**
-     * @depends testValues
-     */
-    function testWeeklyByDay() {
-
-        $ev = new Component('VEVENT');
-        $ev->UID = 'bla';
-        $ev->RRULE = 'FREQ=WEEKLY;INTERVAL=2;BYDAY=TU,WE,FR;WKST=SU';
-        $dtStart = new Property\DateTime('DTSTART');
-        $dtStart->setDateTime(new DateTime('2011-10-07', new DateTimeZone('UTC')),Property\DateTime::UTC);
-
-        $ev->add($dtStart);
-
-        $vcal = Component::create('VCALENDAR');
-        $vcal->add($ev);
-
-        $it = new RecurrenceIterator($vcal,(string)$ev->uid);
-
-        $this->assertEquals('weekly', $it->frequency);
-        $this->assertEquals(2, $it->interval);
-        $this->assertEquals(array('TU','WE','FR'), $it->byDay);
-        $this->assertEquals('SU', $it->weekStart);
-
-        // Grabbing the next 12 items
-        $max = 12;
-        $result = array();
-        foreach($it as $item) {
-
-            $result[] = $item;
-            $max--;
-
-            if (!$max) break;
-
-        }
-
-        $tz = new DateTimeZone('UTC');
-
-        $this->assertEquals(
-            array(
-                new DateTime('2011-10-07', $tz),
-                new DateTime('2011-10-18', $tz),
-                new DateTime('2011-10-19', $tz),
-                new DateTime('2011-10-21', $tz),
-                new DateTime('2011-11-01', $tz),
-                new DateTime('2011-11-02', $tz),
-                new DateTime('2011-11-04', $tz),
-                new DateTime('2011-11-15', $tz),
-                new DateTime('2011-11-16', $tz),
-                new DateTime('2011-11-18', $tz),
-                new DateTime('2011-11-29', $tz),
-                new DateTime('2011-11-30', $tz),
-            ),
-            $result
-        );
-
-    }
-
-    /**
-     * @depends testValues
-     */
-    function testMonthly() {
-
-        $ev = new Component('VEVENT');
-        $ev->UID = 'bla';
-        $ev->RRULE = 'FREQ=MONTHLY;INTERVAL=3;COUNT=5';
-        $dtStart = new Property\DateTime('DTSTART');
-        $dtStart->setDateTime(new DateTime('2011-12-05', new DateTimeZone('UTC')),Property\DateTime::UTC);
-
-        $ev->add($dtStart);
-
-        $vcal = Component::create('VCALENDAR');
-        $vcal->add($ev);
-
-        $it = new RecurrenceIterator($vcal,(string)$ev->uid);
-
-        $this->assertEquals('monthly', $it->frequency);
-        $this->assertEquals(3, $it->interval);
-        $this->assertEquals(5, $it->count);
-
-        $max = 14;
-        $result = array();
-        foreach($it as $item) {
-
-            $result[] = $item;
-            $max--;
-
-            if (!$max) break;
-
-        }
-
-        $tz = new DateTimeZone('UTC');
-
-        $this->assertEquals(
-            array(
-                new DateTime('2011-12-05', $tz),
-                new DateTime('2012-03-05', $tz),
-                new DateTime('2012-06-05', $tz),
-                new DateTime('2012-09-05', $tz),
-                new DateTime('2012-12-05', $tz),
-            ),
-            $result
-        );
-
-
-    }
-
-    /**
-     * @depends testValues
-     */
-    function testMonthlyEndOfMonth() {
-
-        $ev = new Component('VEVENT');
-        $ev->UID = 'bla';
-        $ev->RRULE = 'FREQ=MONTHLY;INTERVAL=2;COUNT=12';
-        $dtStart = new Property\DateTime('DTSTART');
-        $dtStart->setDateTime(new DateTime('2011-12-31', new DateTimeZone('UTC')),Property\DateTime::UTC);
-
-        $ev->add($dtStart);
-
-        $vcal = Component::create('VCALENDAR');
-        $vcal->add($ev);
-
-        $it = new RecurrenceIterator($vcal,(string)$ev->uid);
-
-        $this->assertEquals('monthly', $it->frequency);
-        $this->assertEquals(2, $it->interval);
-        $this->assertEquals(12, $it->count);
-
-        $max = 14;
-        $result = array();
-        foreach($it as $item) {
-
-            $result[] = $item;
-            $max--;
-
-            if (!$max) break;
-
-        }
-
-        $tz = new DateTimeZone('UTC');
-
-        $this->assertEquals(
-            array(
-                new DateTime('2011-12-31', $tz),
-                new DateTime('2012-08-31', $tz),
-                new DateTime('2012-10-31', $tz),
-                new DateTime('2012-12-31', $tz),
-                new DateTime('2013-08-31', $tz),
-                new DateTime('2013-10-31', $tz),
-                new DateTime('2013-12-31', $tz),
-                new DateTime('2014-08-31', $tz),
-                new DateTime('2014-10-31', $tz),
-                new DateTime('2014-12-31', $tz),
-                new DateTime('2015-08-31', $tz),
-                new DateTime('2015-10-31', $tz),
-            ),
-            $result
-        );
-
-
-    }
-
-    /**
-     * @depends testValues
-     */
-    function testMonthlyByMonthDay() {
-
-        $ev = new Component('VEVENT');
-        $ev->UID = 'bla';
-        $ev->RRULE = 'FREQ=MONTHLY;INTERVAL=5;COUNT=9;BYMONTHDAY=1,31,-7';
-        $dtStart = new Property\DateTime('DTSTART');
-        $dtStart->setDateTime(new DateTime('2011-01-01', new DateTimeZone('UTC')),Property\DateTime::UTC);
-
-        $ev->add($dtStart);
-
-        $vcal = Component::create('VCALENDAR');
-        $vcal->add($ev);
-
-        $it = new RecurrenceIterator($vcal,(string)$ev->uid);
-
-        $this->assertEquals('monthly', $it->frequency);
-        $this->assertEquals(5, $it->interval);
-        $this->assertEquals(9, $it->count);
-        $this->assertEquals(array(1, 31, -7), $it->byMonthDay);
-
-        $max = 14;
-        $result = array();
-        foreach($it as $item) {
-
-            $result[] = $item;
-            $max--;
-
-            if (!$max) break;
-
-        }
-
-        $tz = new DateTimeZone('UTC');
-
-        $this->assertEquals(
-            array(
-                new DateTime('2011-01-01', $tz),
-                new DateTime('2011-01-25', $tz),
-                new DateTime('2011-01-31', $tz),
-                new DateTime('2011-06-01', $tz),
-                new DateTime('2011-06-24', $tz),
-                new DateTime('2011-11-01', $tz),
-                new DateTime('2011-11-24', $tz),
-                new DateTime('2012-04-01', $tz),
-                new DateTime('2012-04-24', $tz),
-            ),
-            $result
-        );
-
-    }
-
-    /**
-     * @depends testValues
-     */
-    function testMonthlyByDay() {
-
-        $ev = new Component('VEVENT');
-        $ev->UID = 'bla';
-        $ev->RRULE = 'FREQ=MONTHLY;INTERVAL=2;COUNT=16;BYDAY=MO,-2TU,+1WE,3TH';
-        $dtStart = new Property\DateTime('DTSTART');
-        $dtStart->setDateTime(new DateTime('2011-01-03', new DateTimeZone('UTC')),Property\DateTime::UTC);
-
-        $ev->add($dtStart);
-
-        $vcal = Component::create('VCALENDAR');
-        $vcal->add($ev);
-
-        $it = new RecurrenceIterator($vcal,(string)$ev->uid);
-
-        $this->assertEquals('monthly', $it->frequency);
-        $this->assertEquals(2, $it->interval);
-        $this->assertEquals(16, $it->count);
-        $this->assertEquals(array('MO','-2TU','+1WE','3TH'), $it->byDay);
-
-        $max = 20;
-        $result = array();
-        foreach($it as $k=>$item) {
-
-            $result[] = $item;
-            $max--;
-
-            if (!$max) break;
-
-        }
-
-        $tz = new DateTimeZone('UTC');
-
-        $this->assertEquals(
-            array(
-                new DateTime('2011-01-03', $tz),
-                new DateTime('2011-01-05', $tz),
-                new DateTime('2011-01-10', $tz),
-                new DateTime('2011-01-17', $tz),
-                new DateTime('2011-01-18', $tz),
-                new DateTime('2011-01-20', $tz),
-                new DateTime('2011-01-24', $tz),
-                new DateTime('2011-01-31', $tz),
-                new DateTime('2011-03-02', $tz),
-                new DateTime('2011-03-07', $tz),
-                new DateTime('2011-03-14', $tz),
-                new DateTime('2011-03-17', $tz),
-                new DateTime('2011-03-21', $tz),
-                new DateTime('2011-03-22', $tz),
-                new DateTime('2011-03-28', $tz),
-                new DateTime('2011-05-02', $tz),
-            ),
-            $result
-        );
-
-    }
-
-    /**
-     * @depends testValues
-     */
-    function testMonthlyByDayByMonthDay() {
-
-        $ev = new Component('VEVENT');
-        $ev->UID = 'bla';
-        $ev->RRULE = 'FREQ=MONTHLY;COUNT=10;BYDAY=MO;BYMONTHDAY=1';
-        $dtStart = new Property\DateTime('DTSTART');
-        $dtStart->setDateTime(new DateTime('2011-08-01', new DateTimeZone('UTC')),Property\DateTime::UTC);
-
-        $ev->add($dtStart);
-
-        $vcal = Component::create('VCALENDAR');
-        $vcal->add($ev);
-
-        $it = new RecurrenceIterator($vcal,(string)$ev->uid);
-
-        $this->assertEquals('monthly', $it->frequency);
-        $this->assertEquals(1, $it->interval);
-        $this->assertEquals(10, $it->count);
-        $this->assertEquals(array('MO'), $it->byDay);
-        $this->assertEquals(array(1), $it->byMonthDay);
-
-        $max = 20;
-        $result = array();
-        foreach($it as $k=>$item) {
-
-            $result[] = $item;
-            $max--;
-
-            if (!$max) break;
-
-        }
-
-        $tz = new DateTimeZone('UTC');
-
-        $this->assertEquals(
-            array(
-                new DateTime('2011-08-01', $tz),
-                new DateTime('2012-10-01', $tz),
-                new DateTime('2013-04-01', $tz),
-                new DateTime('2013-07-01', $tz),
-                new DateTime('2014-09-01', $tz),
-                new DateTime('2014-12-01', $tz),
-                new DateTime('2015-06-01', $tz),
-                new DateTime('2016-02-01', $tz),
-                new DateTime('2016-08-01', $tz),
-                new DateTime('2017-05-01', $tz),
-            ),
-            $result
-        );
-
-    }
-
-    /**
-     * @depends testValues
-     */
-    function testMonthlyByDayBySetPos() {
-
-        $ev = new Component('VEVENT');
-        $ev->UID = 'bla';
-        $ev->RRULE = 'FREQ=MONTHLY;COUNT=10;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=1,-1';
-        $dtStart = new Property\DateTime('DTSTART');
-        $dtStart->setDateTime(new DateTime('2011-01-03', new DateTimeZone('UTC')),Property\DateTime::UTC);
-
-        $ev->add($dtStart);
-
-        $vcal = Component::create('VCALENDAR');
-        $vcal->add($ev);
-
-        $it = new RecurrenceIterator($vcal,(string)$ev->uid);
-
-        $this->assertEquals('monthly', $it->frequency);
-        $this->assertEquals(1, $it->interval);
-        $this->assertEquals(10, $it->count);
-        $this->assertEquals(array('MO','TU','WE','TH','FR'), $it->byDay);
-        $this->assertEquals(array(1,-1), $it->bySetPos);
-
-        $max = 20;
-        $result = array();
-        foreach($it as $k=>$item) {
-
-            $result[] = $item;
-            $max--;
-
-            if (!$max) break;
-
-        }
-
-        $tz = new DateTimeZone('UTC');
-
-        $this->assertEquals(
-            array(
-                new DateTime('2011-01-03', $tz),
-                new DateTime('2011-01-31', $tz),
-                new DateTime('2011-02-01', $tz),
-                new DateTime('2011-02-28', $tz),
-                new DateTime('2011-03-01', $tz),
-                new DateTime('2011-03-31', $tz),
-                new DateTime('2011-04-01', $tz),
-                new DateTime('2011-04-29', $tz),
-                new DateTime('2011-05-02', $tz),
-                new DateTime('2011-05-31', $tz),
-            ),
-            $result
-        );
-
-    }
-
-    /**
-     * @depends testValues
-     */
-    function testYearly() {
-
-        $ev = new Component('VEVENT');
-        $ev->UID = 'bla';
-        $ev->RRULE = 'FREQ=YEARLY;COUNT=10;INTERVAL=3';
-        $dtStart = new Property\DateTime('DTSTART');
-        $dtStart->setDateTime(new DateTime('2011-01-01', new DateTimeZone('UTC')),Property\DateTime::UTC);
-
-        $ev->add($dtStart);
-
-        $vcal = Component::create('VCALENDAR');
-        $vcal->add($ev);
-
-        $it = new RecurrenceIterator($vcal,(string)$ev->uid);
-
-        $this->assertEquals('yearly', $it->frequency);
-        $this->assertEquals(3, $it->interval);
-        $this->assertEquals(10, $it->count);
-
-        $max = 20;
-        $result = array();
-        foreach($it as $k=>$item) {
-
-            $result[] = $item;
-            $max--;
-
-            if (!$max) break;
-
-        }
-
-        $tz = new DateTimeZone('UTC');
-
-        $this->assertEquals(
-            array(
-                new DateTime('2011-01-01', $tz),
-                new DateTime('2014-01-01', $tz),
-                new DateTime('2017-01-01', $tz),
-                new DateTime('2020-01-01', $tz),
-                new DateTime('2023-01-01', $tz),
-                new DateTime('2026-01-01', $tz),
-                new DateTime('2029-01-01', $tz),
-                new DateTime('2032-01-01', $tz),
-                new DateTime('2035-01-01', $tz),
-                new DateTime('2038-01-01', $tz),
-            ),
-            $result
-        );
-
-    }
-
-    /**
-     * @depends testValues
-     */
-    function testYearlyLeapYear() {
-
-        $ev = new Component('VEVENT');
-        $ev->UID = 'bla';
-        $ev->RRULE = 'FREQ=YEARLY;COUNT=3';
-        $dtStart = new Property\DateTime('DTSTART');
-        $dtStart->setDateTime(new DateTime('2012-02-29', new DateTimeZone('UTC')),Property\DateTime::UTC);
-
-        $ev->add($dtStart);
-
-        $vcal = Component::create('VCALENDAR');
-        $vcal->add($ev);
-
-        $it = new RecurrenceIterator($vcal,(string)$ev->uid);
-
-        $this->assertEquals('yearly', $it->frequency);
-        $this->assertEquals(3, $it->count);
-
-        $max = 20;
-        $result = array();
-        foreach($it as $k=>$item) {
-
-            $result[] = $item;
-            $max--;
-
-            if (!$max) break;
-
-        }
-
-        $tz = new DateTimeZone('UTC');
-
-        $this->assertEquals(
-            array(
-                new DateTime('2012-02-29', $tz),
-                new DateTime('2016-02-29', $tz),
-                new DateTime('2020-02-29', $tz),
-            ),
-            $result
-        );
-
-    }
-
-    /**
-     * @depends testValues
-     */
-    function testYearlyByMonth() {
-
-        $ev = new Component('VEVENT');
-        $ev->UID = 'bla';
-        $ev->RRULE = 'FREQ=YEARLY;COUNT=8;INTERVAL=4;BYMONTH=4,10';
-        $dtStart = new Property\DateTime('DTSTART');
-        $dtStart->setDateTime(new DateTime('2011-04-07', new DateTimeZone('UTC')),Property\DateTime::UTC);
-
-        $ev->add($dtStart);
-
-        $vcal = Component::create('VCALENDAR');
-        $vcal->add($ev);
-
-        $it = new RecurrenceIterator($vcal,(string)$ev->uid);
-
-        $this->assertEquals('yearly', $it->frequency);
-        $this->assertEquals(4, $it->interval);
-        $this->assertEquals(8, $it->count);
-        $this->assertEquals(array(4,10), $it->byMonth);
-
-        $max = 20;
-        $result = array();
-        foreach($it as $k=>$item) {
-
-            $result[] = $item;
-            $max--;
-
-            if (!$max) break;
-
-        }
-
-        $tz = new DateTimeZone('UTC');
-
-        $this->assertEquals(
-            array(
-                new DateTime('2011-04-07', $tz),
-                new DateTime('2011-10-07', $tz),
-                new DateTime('2015-04-07', $tz),
-                new DateTime('2015-10-07', $tz),
-                new DateTime('2019-04-07', $tz),
-                new DateTime('2019-10-07', $tz),
-                new DateTime('2023-04-07', $tz),
-                new DateTime('2023-10-07', $tz),
-            ),
-            $result
-        );
-
-    }
-
-    /**
-     * @depends testValues
-     */
-    function testYearlyByMonthByDay() {
-
-        $ev = new Component('VEVENT');
-        $ev->UID = 'bla';
-        $ev->RRULE = 'FREQ=YEARLY;COUNT=8;INTERVAL=5;BYMONTH=4,10;BYDAY=1MO,-1SU';
-        $dtStart = new Property\DateTime('DTSTART');
-        $dtStart->setDateTime(new DateTime('2011-04-04', new DateTimeZone('UTC')),Property\DateTime::UTC);
-
-        $ev->add($dtStart);
-
-        $vcal = Component::create('VCALENDAR');
-        $vcal->add($ev);
-
-        $it = new RecurrenceIterator($vcal,(string)$ev->uid);
-
-        $this->assertEquals('yearly', $it->frequency);
-        $this->assertEquals(5, $it->interval);
-        $this->assertEquals(8, $it->count);
-        $this->assertEquals(array(4,10), $it->byMonth);
-        $this->assertEquals(array('1MO','-1SU'), $it->byDay);
-
-        $max = 20;
-        $result = array();
-        foreach($it as $k=>$item) {
-
-            $result[] = $item;
-            $max--;
-
-            if (!$max) break;
-
-        }
-
-        $tz = new DateTimeZone('UTC');
-
-        $this->assertEquals(
-            array(
-                new DateTime('2011-04-04', $tz),
-                new DateTime('2011-04-24', $tz),
-                new DateTime('2011-10-03', $tz),
-                new DateTime('2011-10-30', $tz),
-                new DateTime('2016-04-04', $tz),
-                new DateTime('2016-04-24', $tz),
-                new DateTime('2016-10-03', $tz),
-                new DateTime('2016-10-30', $tz),
-            ),
-            $result
-        );
-
-    }
-
-    /**
-     * @depends testValues
-     */
-    function testFastForward() {
-
-        $ev = new Component('VEVENT');
-        $ev->UID = 'bla';
-        $ev->RRULE = 'FREQ=YEARLY;COUNT=8;INTERVAL=5;BYMONTH=4,10;BYDAY=1MO,-1SU';
-        $dtStart = new Property\DateTime('DTSTART');
-        $dtStart->setDateTime(new DateTime('2011-04-04', new DateTimeZone('UTC')),Property\DateTime::UTC);
-
-        $ev->add($dtStart);
-
-        $vcal = Component::create('VCALENDAR');
-        $vcal->add($ev);
-
-        $it = new RecurrenceIterator($vcal,(string)$ev->uid);
-
-        // The idea is that we're fast-forwarding too far in the future, so
-        // there will be no results left.
-        $it->fastForward(new DateTime('2020-05-05', new DateTimeZone('UTC')));
-
-        $max = 20;
-        $result = array();
-        while($item = $it->current()) {
-
-            $result[] = $item;
-            $max--;
-
-            if (!$max) break;
-            $it->next();
-
-        }
-
-        $tz = new DateTimeZone('UTC');
-        $this->assertEquals(array(), $result);
-
-    }
-
-    /**
-     * @depends testValues
-     */
-    function testComplexExclusions() {
-
-        $ev = new Component('VEVENT');
-        $ev->UID = 'bla';
-        $ev->RRULE = 'FREQ=YEARLY;COUNT=10';
-        $dtStart = new Property\DateTime('DTSTART');
-
-        $tz = new DateTimeZone('Canada/Eastern');
-        $dtStart->setDateTime(new DateTime('2011-01-01 13:50:20', $tz),Property\DateTime::LOCALTZ);
-
-        $exDate1 = new Property\MultiDateTime('EXDATE');
-        $exDate1->setDateTimes(array(new DateTime('2012-01-01 13:50:20', $tz), new DateTime('2014-01-01 13:50:20', $tz)), Property\DateTime::LOCALTZ);
-        $exDate2 = new Property\MultiDateTime('EXDATE');
-        $exDate2->setDateTimes(array(new DateTime('2016-01-01 13:50:20', $tz)), Property\DateTime::LOCALTZ);
-
-        $ev->add($dtStart);
-        $ev->add($exDate1);
-        $ev->add($exDate2);
-
-        $vcal = Component::create('VCALENDAR');
-        $vcal->add($ev);
-
-        $it = new RecurrenceIterator($vcal,(string)$ev->uid);
-
-        $this->assertEquals('yearly', $it->frequency);
-        $this->assertEquals(1, $it->interval);
-        $this->assertEquals(10, $it->count);
-
-        $max = 20;
-        $result = array();
-        foreach($it as $k=>$item) {
-
-            $result[] = $item;
-            $max--;
-
-            if (!$max) break;
-
-        }
-
-        $this->assertEquals(
-            array(
-                new DateTime('2011-01-01 13:50:20', $tz),
-                new DateTime('2013-01-01 13:50:20', $tz),
-                new DateTime('2015-01-01 13:50:20', $tz),
-                new DateTime('2017-01-01 13:50:20', $tz),
-                new DateTime('2018-01-01 13:50:20', $tz),
-                new DateTime('2019-01-01 13:50:20', $tz),
-                new DateTime('2020-01-01 13:50:20', $tz),
-            ),
-            $result
-        );
-
-    }
-
-    /**
-     * @depends testValues
-     */
-    function testOverridenEvent() {
-
-        $vcal = Component::create('VCALENDAR');
-
-        $ev1 = Component::create('VEVENT');
-        $ev1->UID = 'overridden';
-        $ev1->RRULE = 'FREQ=DAILY;COUNT=10';
-        $ev1->DTSTART = '20120107T120000Z';
-        $ev1->SUMMARY = 'baseEvent';
-
-        $vcal->add($ev1);
-
-        // ev2 overrides an event, and puts it on 2pm instead.
-        $ev2 = Component::create('VEVENT');
-        $ev2->UID = 'overridden';
-        $ev2->{'RECURRENCE-ID'} = '20120110T120000Z';
-        $ev2->DTSTART = '20120110T140000Z';
-        $ev2->SUMMARY = 'Event 2';
-
-        $vcal->add($ev2);
-
-        // ev3 overrides an event, and puts it 2 days and 2 hours later
-        $ev3 = Component::create('VEVENT');
-        $ev3->UID = 'overridden';
-        $ev3->{'RECURRENCE-ID'} = '20120113T120000Z';
-        $ev3->DTSTART = '20120115T140000Z';
-        $ev3->SUMMARY = 'Event 3';
-
-        $vcal->add($ev3);
-
-        $it = new RecurrenceIterator($vcal,'overridden');
-
-        $dates = array();
-        $summaries = array();
-        while($it->valid()) {
-
-            $dates[] = $it->getDTStart();
-            $summaries[] = (string)$it->getEventObject()->SUMMARY;
-            $it->next();
-
-        }
-
-        $tz = new DateTimeZone('GMT');
-        $this->assertEquals(array(
-            new DateTime('2012-01-07 12:00:00',$tz),
-            new DateTime('2012-01-08 12:00:00',$tz),
-            new DateTime('2012-01-09 12:00:00',$tz),
-            new DateTime('2012-01-10 14:00:00',$tz),
-            new DateTime('2012-01-11 12:00:00',$tz),
-            new DateTime('2012-01-12 12:00:00',$tz),
-            new DateTime('2012-01-14 12:00:00',$tz),
-            new DateTime('2012-01-15 12:00:00',$tz),
-            new DateTime('2012-01-15 14:00:00',$tz),
-            new DateTime('2012-01-16 12:00:00',$tz),
-        ), $dates);
-
-        $this->assertEquals(array(
-            'baseEvent',
-            'baseEvent',
-            'baseEvent',
-            'Event 2',
-            'baseEvent',
-            'baseEvent',
-            'baseEvent',
-            'baseEvent',
-            'Event 3',
-            'baseEvent',
-        ), $summaries);
-
-    }
-
-    /**
-     * @depends testValues
-     */
-    function testOverridenEvent2() {
-
-        $vcal = Component::create('VCALENDAR');
-
-        $ev1 = Component::create('VEVENT');
-        $ev1->UID = 'overridden';
-        $ev1->RRULE = 'FREQ=WEEKLY;COUNT=3';
-        $ev1->DTSTART = '20120112T120000Z';
-        $ev1->SUMMARY = 'baseEvent';
-
-        $vcal->add($ev1);
-
-        // ev2 overrides an event, and puts it 6 days earlier instead.
-        $ev2 = Component::create('VEVENT');
-        $ev2->UID = 'overridden';
-        $ev2->{'RECURRENCE-ID'} = '20120119T120000Z';
-        $ev2->DTSTART = '20120113T120000Z';
-        $ev2->SUMMARY = 'Override!';
-
-        $vcal->add($ev2);
-
-        $it = new RecurrenceIterator($vcal,'overridden');
-
-        $dates = array();
-        $summaries = array();
-        while($it->valid()) {
-
-            $dates[] = $it->getDTStart();
-            $summaries[] = (string)$it->getEventObject()->SUMMARY;
-            $it->next();
-
-        }
-
-        $tz = new DateTimeZone('GMT');
-        $this->assertEquals(array(
-            new DateTime('2012-01-12 12:00:00',$tz),
-            new DateTime('2012-01-13 12:00:00',$tz),
-            new DateTime('2012-01-26 12:00:00',$tz),
-
-        ), $dates);
-
-        $this->assertEquals(array(
-            'baseEvent',
-            'Override!',
-            'baseEvent',
-        ), $summaries);
-
-    }
-
-    /**
-     * @depends testValues
-     */
-    function testOverridenEventNoValuesExpected() {
-
-        $vcal = Component::create('VCALENDAR');
-
-        $ev1 = Component::create('VEVENT');
-        $ev1->UID = 'overridden';
-        $ev1->RRULE = 'FREQ=WEEKLY;COUNT=3';
-        $ev1->DTSTART = '20120124T120000Z';
-        $ev1->SUMMARY = 'baseEvent';
-
-        $vcal->add($ev1);
-
-        // ev2 overrides an event, and puts it 6 days earlier instead.
-        $ev2 = Component::create('VEVENT');
-        $ev2->UID = 'overridden';
-        $ev2->{'RECURRENCE-ID'} = '20120131T120000Z';
-        $ev2->DTSTART = '20120125T120000Z';
-        $ev2->SUMMARY = 'Override!';
-
-        $vcal->add($ev2);
-
-        $it = new RecurrenceIterator($vcal,'overridden');
-
-        $dates = array();
-        $summaries = array();
-
-        // The reported problem was specifically related to the VCALENDAR
-        // expansion. In this parcitular case, we had to forward to the 28th of
-        // january.
-        $it->fastForward(new DateTime('2012-01-28 23:00:00'));
-
-        // We stop the loop when it hits the 6th of februari. Normally this
-        // iterator would hit 24, 25 (overriden from 31) and 7 feb but because
-        // we 'filter' from the 28th till the 6th, we should get 0 results.
-        while($it->valid() && $it->getDTSTart() < new DateTime('2012-02-06 23:00:00')) {
-
-            $dates[] = $it->getDTStart();
-            $summaries[] = (string)$it->getEventObject()->SUMMARY;
-            $it->next();
-
-        }
-
-        $this->assertEquals(array(), $dates);
-        $this->assertEquals(array(), $summaries);
-
-    }
-}
-
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Splitter/ICalendarTest.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Splitter/ICalendarTest.php
deleted file mode 100644
index 43613350f0..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Splitter/ICalendarTest.php
+++ /dev/null
@@ -1,283 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Splitter;
-
-use Sabre\VObject;
-
-class ICalendarSplitterTest extends \PHPUnit_Framework_TestCase {
-
-    protected $version;
-
-    function setup() {
-        $this->version = VObject\Version::VERSION;
-    }
-
-    function createStream($data) {
-
-        $stream = fopen('php://memory','r+');
-        fwrite($stream, $data);
-        rewind($stream);
-        return $stream;
-
-    }
-
-    function testICalendarImportValidEvent() {
-
-        $data = <<<EOT
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:foo
-END:VEVENT
-END:VCALENDAR
-EOT;
-        $tempFile = $this->createStream($data);
-
-        $objects = new ICalendar($tempFile);
-
-        $return = "";
-        while($object=$objects->getNext()) {
-            $return .= $object->serialize();
-        }
-        $this->assertEquals(array(), VObject\Reader::read($return)->validate());
-    }
-
-    function testICalendarImportEndOfData() {
-        $data = <<<EOT
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:foo
-END:VEVENT
-END:VCALENDAR
-EOT;
-        $tempFile = $this->createStream($data);
-
-        $objects = new ICalendar($tempFile);
-
-        $return = "";
-        while($object=$objects->getNext()) {
-            $return .= $object->serialize();
-        }
-        $this->assertNull($object=$objects->getNext());
-    }
-
-    /**
-     * @expectedException        Sabre\VObject\ParseException
-     */
-    function testICalendarImportInvalidEvent() {
-        $data = <<<EOT
-EOT;
-        $tempFile = $this->createStream($data);
-
-        $objects = new ICalendar($tempFile);
-    }
-
-    function testICalendarImportMultipleValidEvents() {
-
-        $event[] = <<<EOT
-BEGIN:VEVENT
-UID:foo1
-END:VEVENT
-EOT;
-
-$event[] = <<<EOT
-BEGIN:VEVENT
-UID:foo2
-END:VEVENT
-EOT;
-
-        $data = <<<EOT
-BEGIN:VCALENDAR
-$event[0]
-$event[1]
-END:VCALENDAR
-
-EOT;
-        $tempFile = $this->createStream($data);
-
-        $objects = new ICalendar($tempFile);
-
-        $return = "";
-        $i = 0;
-        while($object=$objects->getNext()) {
-
-            $expected = <<<EOT
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $this->version//EN
-CALSCALE:GREGORIAN
-$event[$i]
-END:VCALENDAR
-
-EOT;
-
-            $return .= $object->serialize();
-            $expected = str_replace("\n", "\r\n", $expected);
-            $this->assertEquals($expected, $object->serialize());
-            $i++;
-        }
-        $this->assertEquals(array(), VObject\Reader::read($return)->validate());
-    }
-
-    function testICalendarImportEventWithoutUID() {
-
-        $data = <<<EOT
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $this->version//EN
-CALSCALE:GREGORIAN
-BEGIN:VEVENT
-END:VEVENT
-END:VCALENDAR
-
-EOT;
-        $tempFile = $this->createStream($data);
-
-        $objects = new ICalendar($tempFile);
-
-        $return = "";
-        while($object=$objects->getNext()) {
-            $expected = str_replace("\n", "\r\n", $data);
-            $this->assertEquals($expected, $object->serialize());
-            $return .= $object->serialize();
-        }
-
-        $this->assertEquals(array(), VObject\Reader::read($return)->validate());
-    }
-
-    function testICalendarImportMultipleVTIMEZONESAndMultipleValidEvents() {
-
-        $timezones = <<<EOT
-BEGIN:VTIMEZONE
-TZID:Europe/Berlin
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-DTSTART:19810329T020000
-TZNAME:MESZ
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-DTSTART:19961027T030000
-TZNAME:MEZ
-TZOFFSETTO:+0100
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VTIMEZONE
-TZID:Europe/London
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-DTSTART:19810329T010000
-TZNAME:GMT+01:00
-TZOFFSETTO:+0100
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-DTSTART:19961027T020000
-TZNAME:GMT
-TZOFFSETTO:+0000
-END:STANDARD
-END:VTIMEZONE
-EOT;
-
-        $event[] = <<<EOT
-BEGIN:VEVENT
-UID:foo1
-END:VEVENT
-EOT;
-
-        $event[] = <<<EOT
-BEGIN:VEVENT
-UID:foo2
-END:VEVENT
-EOT;
-
-        $event[] = <<<EOT
-BEGIN:VEVENT
-UID:foo3
-END:VEVENT
-EOT;
-
-        $data = <<<EOT
-BEGIN:VCALENDAR
-$timezones
-$event[0]
-$event[1]
-$event[2]
-END:VCALENDAR
-
-EOT;
-        $tempFile = $this->createStream($data);
-
-        $objects = new ICalendar($tempFile);
-
-        $return = "";
-        $i = 0;
-        while($object=$objects->getNext()) {
-
-            $expected = <<<EOT
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $this->version//EN
-CALSCALE:GREGORIAN
-$timezones
-$event[$i]
-END:VCALENDAR
-
-EOT;
-            $expected = str_replace("\n", "\r\n", $expected);
-
-            $this->assertEquals($expected, $object->serialize());
-            $return .= $object->serialize();
-            $i++;
-
-        }
-
-        $this->assertEquals(array(), VObject\Reader::read($return)->validate());
-        $this->assertEquals(array(), VObject\Reader::read($return)->validate());
-    }
-
-    function testICalendarImportWithOutVTIMEZONES() {
-
-        $data = <<<EOT
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Apple Inc.//Mac OS X 10.8//EN
-CALSCALE:GREGORIAN
-BEGIN:VEVENT
-CREATED:20120605T072109Z
-UID:D6716295-C10F-4B20-82F9-E1A3026C7DCF
-DTEND;VALUE=DATE:20120717
-TRANSP:TRANSPARENT
-SUMMARY:Start Vorbereitung
-DTSTART;VALUE=DATE:20120716
-DTSTAMP:20120605T072115Z
-SEQUENCE:2
-BEGIN:VALARM
-X-WR-ALARMUID:A99EDA6A-35EB-4446-B8BC-CDA3C60C627D
-UID:A99EDA6A-35EB-4446-B8BC-CDA3C60C627D
-TRIGGER:-PT15H
-X-APPLE-DEFAULT-ALARM:TRUE
-ATTACH;VALUE=URI:Basso
-ACTION:AUDIO
-END:VALARM
-END:VEVENT
-END:VCALENDAR
-
-EOT;
-        $tempFile = $this->createStream($data);
-
-        $objects = new ICalendar($tempFile);
-
-        $return = "";
-        while($object=$objects->getNext()) {
-            $return .= $object->serialize();
-        }
-
-        $this->assertEquals(array(), VObject\Reader::read($return)->validate());
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Splitter/VCardTest.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Splitter/VCardTest.php
deleted file mode 100644
index b6b41925fc..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/Splitter/VCardTest.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Splitter;
-
-use Sabre\VObject;
-
-class VCardSplitterTest extends \PHPUnit_Framework_TestCase {
-
-    function createStream($data) {
-
-        $stream = fopen('php://memory','r+');
-        fwrite($stream, $data);
-        rewind($stream);
-        return $stream;
-
-    }
-
-    function testVCardImportValidVCard() {
-        $data = <<<EOT
-BEGIN:VCARD
-UID:foo
-END:VCARD
-EOT;
-        $tempFile = $this->createStream($data);
-
-        $objects = new VCard($tempFile);
-
-        $return = "";
-        while($object=$objects->getNext()) {
-            $return .= $object->serialize();
-        }
-
-        VObject\Reader::read($return);
-    }
-
-    function testVCardImportValidVCardsWithCategories() {
-        $data = <<<EOT
-BEGIN:VCARD
-UID:card-in-foo1-and-foo2
-CATEGORIES:foo1\,foo2
-END:VCARD
-BEGIN:VCARD
-UID:card-in-foo1
-CATEGORIES:foo1
-END:VCARD
-BEGIN:VCARD
-UID:card-in-foo3
-CATEGORIES:foo3
-END:VCARD
-BEGIN:VCARD
-UID:card-in-foo1-and-foo3
-CATEGORIES:foo1\,foo3
-END:VCARD
-EOT;
-        $tempFile = $this->createStream($data);
-
-        $objects = new VCard($tempFile);
-
-        $return = "";
-        while($object=$objects->getNext()) {
-            $return .= $object->serialize();
-        }
-
-        VObject\Reader::read($return);
-    }
-
-    function testVCardImportEndOfData() {
-        $data = <<<EOT
-BEGIN:VCARD
-UID:foo
-END:VCARD
-EOT;
-        $tempFile = $this->createStream($data);
-
-        $objects = new VCard($tempFile);
-        $object=$objects->getNext();
-
-        $this->assertFalse($object=$objects->getNext());
-
-
-    }
-
-    /**
-     * @expectedException        InvalidArgumentException
-     */
-    function testVCardImportCheckInvalidArgumentException() {
-        $data = <<<EOT
-BEGIN:FOO
-END:FOO
-EOT;
-        $tempFile = $this->createStream($data);
-
-        $objects = new VCard($tempFile);
-        while($object=$objects->getNext()) {
-            $return .= $object->serialize();
-        }
-
-    }
-
-    function testVCardImportMultipleValidVCards() {
-        $data = <<<EOT
-BEGIN:VCARD
-UID:foo
-END:VCARD
-BEGIN:VCARD
-UID:foo
-END:VCARD
-EOT;
-        $tempFile = $this->createStream($data);
-
-        $objects = new VCard($tempFile);
-
-        $return = "";
-        while($object=$objects->getNext()) {
-            $return .= $object->serialize();
-        }
-
-        VObject\Reader::read($return);
-    }
-
-    function testVCardImportVCardWithoutUID() {
-        $data = <<<EOT
-BEGIN:VCARD
-END:VCARD
-EOT;
-        $tempFile = $this->createStream($data);
-
-        $objects = new VCard($tempFile);
-
-        $return = "";
-        while($object=$objects->getNext()) {
-            $return .= $object->serialize();
-        }
-
-        VObject\Reader::read($return);
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/StringUtilTest.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/StringUtilTest.php
deleted file mode 100644
index 59a83d2945..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/StringUtilTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class StringUtilTest extends \PHPUnit_Framework_TestCase {
-
-    function testNonUTF8() {
-
-        $string = StringUtil::isUTF8(chr('0xbf'));
-
-        $this->assertEquals(false, $string);
-
-    }
-
-    function testIsUTF8() {
-
-        $string = StringUtil::isUTF8('I 💚 SabreDAV');
-
-        $this->assertEquals(true, $string);
-
-    }
-
-    function testUTF8ControlChar() {
-
-        $string = StringUtil::isUTF8(chr('0x00'));
-
-        $this->assertEquals(false, $string);
-
-    }
-
-    function testConvertToUTF8nonUTF8() {
-
-        $string = StringUtil::convertToUTF8(chr('0xbf'));
-
-        $this->assertEquals(utf8_encode(chr('0xbf')), $string);
-
-    }
-
-    function testConvertToUTF8IsUTF8() {
-
-        $string = StringUtil::convertToUTF8('I 💚 SabreDAV');
-
-        $this->assertEquals('I 💚 SabreDAV', $string);
-
-    }
-
-    function testConvertToUTF8ControlChar() {
-
-        $string = StringUtil::convertToUTF8(chr(0x00));
-
-        $this->assertEquals('', $string);
-
-    }
-
-      
-
-
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/TimeZoneUtilTest.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/TimeZoneUtilTest.php
deleted file mode 100644
index 7f76353d20..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/TimeZoneUtilTest.php
+++ /dev/null
@@ -1,297 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class TimezoneUtilTest extends \PHPUnit_Framework_TestCase {
-
-    /**
-     * @dataProvider getMapping
-     */
-    function testCorrectTZ($timezoneName) {
-
-        $tz = new \DateTimeZone($timezoneName);
-
-    }
-
-    function getMapping() {
-
-        // PHPUNit requires an array of arrays
-        return array_map(
-            function($value) {
-                return array($value);
-            },
-            TimeZoneUtil::$map
-        );
-
-    }
-
-    function testExchangeMap() {
-
-        $vobj = <<<HI
-BEGIN:VCALENDAR
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:foo
-X-MICROSOFT-CDO-TZID:2
-BEGIN:STANDARD
-DTSTART:16010101T030000
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-RRULE:FREQ=YEARLY;WKST=MO;INTERVAL=1;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:16010101T020000
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-RRULE:FREQ=YEARLY;WKST=MO;INTERVAL=1;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-DTSTAMP:20120416T092149Z
-DTSTART;TZID="foo":20120418T1
- 00000
-SUMMARY:Begin Unterhaltsreinigung
-UID:040000008200E00074C5B7101A82E0080000000010DA091DC31BCD01000000000000000
- 0100000008FECD2E607780649BE5A4C9EE6418CBC
- 000
-END:VEVENT
-END:VCALENDAR
-HI;
-
-        $tz = TimeZoneUtil::getTimeZone('foo', Reader::read($vobj));
-        $ex = new \DateTimeZone('Europe/Lisbon');
-
-        $this->assertEquals($ex->getName(), $tz->getName());
-
-    }
-
-    function testWetherMicrosoftIsStillInsane() {
-
-        $vobj = <<<HI
-BEGIN:VCALENDAR
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:(GMT+01.00) Sarajevo/Warsaw/Zagreb
-X-MICROSOFT-CDO-TZID:2
-BEGIN:STANDARD
-DTSTART:16010101T030000
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-RRULE:FREQ=YEARLY;WKST=MO;INTERVAL=1;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR
-HI;
-
-        $tz = TimeZoneUtil::getTimeZone('(GMT+01.00) Sarajevo/Warsaw/Zagreb', Reader::read($vobj));
-        $ex = new \DateTimeZone('Europe/Sarajevo');
-
-        $this->assertEquals($ex->getName(), $tz->getName());
-
-    }
-
-    function testUnknownExchangeId() {
-
-        $vobj = <<<HI
-BEGIN:VCALENDAR
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:foo
-X-MICROSOFT-CDO-TZID:2000
-BEGIN:STANDARD
-DTSTART:16010101T030000
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-RRULE:FREQ=YEARLY;WKST=MO;INTERVAL=1;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:16010101T020000
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-RRULE:FREQ=YEARLY;WKST=MO;INTERVAL=1;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-DTSTAMP:20120416T092149Z
-DTSTART;TZID="foo":20120418T1
- 00000
-SUMMARY:Begin Unterhaltsreinigung
-UID:040000008200E00074C5B7101A82E0080000000010DA091DC31BCD01000000000000000
- 0100000008FECD2E607780649BE5A4C9EE6418CBC
-DTEND;TZID="Sarajevo, Skopje, Sofija, Vilnius, Warsaw, Zagreb":20120418T103
- 000
-END:VEVENT
-END:VCALENDAR
-HI;
-
-        $tz = TimeZoneUtil::getTimeZone('foo', Reader::read($vobj));
-        $ex = new \DateTimeZone(date_default_timezone_get());
-        $this->assertEquals($ex->getName(), $tz->getName());
-
-    }
-
-    function testWindowsTimeZone() {
-
-        $tz = TimeZoneUtil::getTimeZone('Eastern Standard Time');
-        $ex = new \DateTimeZone('America/New_York');
-        $this->assertEquals($ex->getName(), $tz->getName());
-
-    }
-
-    function testTimezoneOffset() {
-
-        $tz = TimeZoneUtil::getTimeZone('GMT-0400', null, true);
-        $ex = new \DateTimeZone('Etc/GMT-4');
-        $this->assertEquals($ex->getName(), $tz->getName());
-
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    function testTimezoneFail() {
-
-        $tz = TimeZoneUtil::getTimeZone('FooBar',null,true);
-
-    }
-
-    function testFallBack() {
-
-        $vobj = <<<HI
-BEGIN:VCALENDAR
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:foo
-BEGIN:STANDARD
-DTSTART:16010101T030000
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-RRULE:FREQ=YEARLY;WKST=MO;INTERVAL=1;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:16010101T020000
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-RRULE:FREQ=YEARLY;WKST=MO;INTERVAL=1;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-DTSTAMP:20120416T092149Z
-DTSTART;TZID="foo":20120418T1
- 00000
-SUMMARY:Begin Unterhaltsreinigung
-UID:040000008200E00074C5B7101A82E0080000000010DA091DC31BCD01000000000000000
- 0100000008FECD2E607780649BE5A4C9EE6418CBC
- 000
-END:VEVENT
-END:VCALENDAR
-HI;
-
-        $tz = TimeZoneUtil::getTimeZone('foo', Reader::read($vobj));
-        $ex = new \DateTimeZone(date_default_timezone_get());
-        $this->assertEquals($ex->getName(), $tz->getName());
-
-    }
-
-    function testLjubljanaBug() {
-
-        $vobj = <<<HI
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//Ximian//NONSGML Evolution Calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/freeassociation.sourceforge.net/Tzfile/Europe/Ljubljana
-X-LIC-LOCATION:Europe/Ljubljana
-BEGIN:STANDARD
-TZNAME:CET
-DTSTART:19701028T030000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:CEST
-DTSTART:19700325T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:foo
-DTSTART;TZID=/freeassociation.sourceforge.net/Tzfile/Europe/Ljubljana:
- 20121003T080000
-DTEND;TZID=/freeassociation.sourceforge.net/Tzfile/Europe/Ljubljana:
- 20121003T083000
-TRANSP:OPAQUE
-SEQUENCE:2
-SUMMARY:testing
-CREATED:20121002T172613Z
-LAST-MODIFIED:20121002T172613Z
-END:VEVENT
-END:VCALENDAR
-
-HI;
-
-
-        $tz = TimeZoneUtil::getTimeZone('/freeassociation.sourceforge.net/Tzfile/Europe/Ljubljana', Reader::read($vobj));
-        $ex = new \DateTimeZone('Europe/Ljubljana');
-        $this->assertEquals($ex->getName(), $tz->getName());
-
-    }
-
-    function testWeirdSystemVLICs() {
-
-$vobj = <<<HI
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//Ximian//NONSGML Evolution Calendar//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:/freeassociation.sourceforge.net/Tzfile/SystemV/EST5EDT
-X-LIC-LOCATION:SystemV/EST5EDT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19701104T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19700311T020000
-RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:20121026T021107Z-6301-1000-1-0@chAir
-DTSTAMP:20120905T172126Z
-DTSTART;TZID=/freeassociation.sourceforge.net/Tzfile/SystemV/EST5EDT:
- 20121026T153000
-DTEND;TZID=/freeassociation.sourceforge.net/Tzfile/SystemV/EST5EDT:
- 20121026T160000
-TRANSP:OPAQUE
-SEQUENCE:5
-SUMMARY:pick up Ibby
-CLASS:PUBLIC
-CREATED:20121026T021108Z
-LAST-MODIFIED:20121026T021118Z
-X-EVOLUTION-MOVE-CALENDAR:1
-END:VEVENT
-END:VCALENDAR
-HI;
-
-        $tz = TimeZoneUtil::getTimeZone('/freeassociation.sourceforge.net/Tzfile/SystemV/EST5EDT', Reader::read($vobj), true);
-        $ex = new \DateTimeZone('EST5EDT');
-        $this->assertEquals($ex->getName(), $tz->getName());
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/VersionTest.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/VersionTest.php
deleted file mode 100644
index ae6855e854..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/VersionTest.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class VersionTest extends \PHPUnit_Framework_TestCase {
-
-    function testString() {
-
-        $v = Version::VERSION;
-        $this->assertEquals(-1, version_compare('0.9.0',$v));
-
-        $s = Version::STABILITY;
-        $this->assertTrue($s == 'alpha' || $s == 'beta' || $s =='stable');
-
-    }
-
-}
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/issue153.vcf b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/issue153.vcf
deleted file mode 100644
index 5fb0fa297c..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/Sabre/VObject/issue153.vcf
+++ /dev/null
@@ -1,352 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-N:Benutzer;Test;;;
-FN:Test Benutzer
-PHOTO;BASE64:
-  /9j/4AAQSkZJRgABAQAAAQABAAD/4QBYRXhpZgAATU0AKgAAAAgAAgESAAMAAAABAAEAAIdpAAQA
-  AAABAAAAJgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAABQKADAAQAAAABAAABQAAAAAD/2wBD
-  AAIBAQIBAQICAQICAgICAwUDAwMDAwYEBAMFBwYHBwcGBgYHCAsJBwgKCAYGCQ0JCgsLDAwMBwkN
-  Dg0MDgsMDAv/2wBDAQICAgMCAwUDAwULCAYICwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsL
-  CwsLCwsLCwsLCwsLCwsLCwsLCwv/wAARCAFAAUADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAA
-  AAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKB
-  kaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZn
-  aGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT
-  1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcI
-  CQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAV
-  YnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6
-  goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk
-  5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD8J7JbO8tYo1tIFCDLOVG5qfdaVZRwmSOFWzyA
-  F4H1rLt5WViMhdp6HgmtKK8O3B+4Rhx6fSgBI9FtjaNN5aErwRjilSys7lFAt41xyTtqc2yJCVlY
-  7eqgGqv2jyLcebjZnGPWncdzT0+w0u5eQXtrGiBcIyoPmNMXwpb/AGMTSRRbH6YAyPwqK21GKdfL
-  BAVfu+1SQX4jnjKFsp03dPypCKN9oEaKSkC7R0bGKpnSlSPdHErZOORXV3Ouy337sCLB6kpx+FY0
-  t+VfyrgcbuCB1oAfoMemrcImq2sZX+I7ATXS618PdK1DRlvvDEaMq5LoV2nisx4LVrUfu5BOePau
-  m8EQS6PY3HmFXjljKhTzjOf1oA4mz8OxvMrLbW5RD8wbByKg1LRrRriRYY408w/KAMba1pRaWt/H
-  a6a7CVm2u7N8lUPEujzaRekzSK6tgqVNAGNBZJauY5Yon92GTRJp0ROY0Un0A4q3c2odkaYOMjii
-  KL7NIDGcj1NDAZBplmmWv1xnoFHStfS/DFpewqYoYm3DutZ8lv8AapdyOqk8EVteEbSe3KBSrDrQ
-  BT8S+HbawiiWGCAPjsuMnPesqHS4JSFlSMP7DitbXbvfrkkM2eGw3p+FMfTh5X+hr8w7t3oAhOhW
-  u8MkMZUY3fL0Heo9UsrN5FFrbxKmMBgoG41fWFra0Acjpzg9aoXjtgRoo29vagCoun27kbY059qn
-  bwykskYjRArdTT7GEl2UqMr2q/JtVU27iR15NADdK8DC/wBPle2iicxNg5ALH6Umm6FZ/a3ttQt4
-  g2Cqnb0PbJ+tamn3j6ZCW0nILfeBORWVfO4dhLw7fMW7560AZuqeHf7MuTFcRpv6qVGVx70q2Eci
-  QwyW0SsPvOqjJrUtb6S9tHQKGeMZYuM8VUs7gRxbrncy9mWgB1x4QtTHvsQWkHJVhhax3tkhugHh
-  UkfeAXIFdPZ3v2uxkQ9G4jI6/j+tYun3r2Fy6yxeb2Py5IoAqXenJ5xaGNNvXH/1qcLSGeBdkSg9
-  CcdaswC3be0pfexOMnpn2qaS1KQkQASKoydvLCgDNi09RKTNCuO2BxVjSobc6gqXMERQHkleDUsc
-  u9VADbG6qOWAp11bLbptkjlCkZRsde9AFi5sbO3kKfZYTnkHaOlVbuO2F5thtYcADjaKXUpHj8ku
-  Co2VDFL5wLeg696YFwQ2z7Qtlb8HJO0c1Zsr7T7a9kL6XazZ4CmMFRWfHdkEgjGRjPpU9raP5LSP
-  j5h2pAWdQ0+z1KdG+y21qvcRqBn8qXSvC+iTu63ssqyE/IAuR+NQwSrGm1g+c8E9qiSQW9wPNYYP
-  OR2oAW68GNa28k3lwGNHwvzDJGfSqM9nHBgm3j59QMVdmma4zIjsUBHy5OKp6o8s2BJjZjjAoAro
-  /nysbgYY9zWmLPCR+WQQwyaz4k2F/Pbft/GtKxvUeFN+B2x+NAEptsWpZSdo9etZe8su2X7pPFdU
-  LeOazKqVwevNYt7pw5EA5HIxQBQA8tAIeGz1NWIJvJlhW5OQBzjrUMR/eN9pwoXjB4qQ3ERJeYcy
-  9P8AZoA0jf8AmybVxsHAFS6jp63ixmwjIwOfrWfaou12GcDpmt/w5qJhXc6hh2GM0AZkHiRpblVl
-  G0RjGMdxXQ+H/E0Rm+bjdw1crqEHm3EksY4Y9PTmq0cskc42qUOfpmgDovHOhLBOZ9O+aEnIUdRW
-  QZft1sgum/1Ywua3fDfiFDL5WoEPEwxzzirPizwTFPZC60kYUjcAp4NAHPSq91EoRS3061DHD9nb
-  94Mkfw020v57GbcCRt4IIqzNcedIH2jc3JyOaAIYrRZmJxtNdB4fkGn2hluBgBR+NZ2n2X9ozAQD
-  5qvaxGbKIRXkuFU4C96AMDxBKZdQkuEUkStuUegpNM1eWScAkqpHTHNPlwbjMzExZ4Pal1PS/s6+
-  dY/6vuwPSgC9G8c0A+1xEknrnpUVxaeXNm2dVUfjVazvEZAEkMrccZzV1YYyBIhJP8SZ6fhQBSmV
-  4JfMVT+96UJdSQdcMO4A6fjVmTUoJiqTOMJ/q+elRyQs0TtaxF0PVhzmgCzpd55r7YI2HHPTmrV0
-  sDTF7gnJXGO4OKyNKgn80NbFhjoBzWjqdg6SISPmIBOaAKVnI1leyhsMJOD7CqOqRtZqotjiFulW
-  rhsSMshKH1ogsZbmF475TKifdf0oApabevHIAhCYOdxp0t59luS0I+995uxqpdRyWsrqmXGeCR/K
-  rVlZfaogqv8AvD/CaAIY42kV3K5zzn1p9jNLp6u/A80YPNWWsJNPAVpC4JAZT2HfFWJoVmVVjhVk
-  HTPrQBPoi2wsoo4APtBHL+tP1mS5uVEFxgJGNqH15plp5WmyBriMRsowM8UybXTNdbrpd6A/KKAD
-  xbJAGs44FIPlnd9c/wD16ynt/LiDW2SR2qa5vP7RnMs6BNuQMd6jhkAUb2K8+tADYp0fhj8w6itC
-  yQ3CFYeAOoqi8Uew+UMuf4u9T2NwIW+UgMetO4FmS6RJ1ik6HqxHAqC+gimUiA8DvjrU0kcE8ieY
-  itu+8c0+bShaWxksSZoM4b0SkBTgha0cq33Cuc1SvrrLFV6jpWqbuGe1HnnDdAKy7i3WSY7OT2NN
-  AMulWSV8ZDNzxV7SlbaFjClx69Kpww7W3ct7jpUtnNJHd5UjZnt1NIDdt7h7NQ7qGfpt7VR1XVEh
-  dhEpP94/4VpafexTy7ZlbBGDVHxFbQh1j04HaOTkdKAM5ZVlYso3E+tVp4w8gx0Bqd7QxNu+6D6V
-  DIoVySxAx2NAFyNmli2pjYBz61paW3lWrFS3BwP8/hWJbTBFJy2D6HgfWtiTWPsqxraBHyOeBg0A
-  RSoLSTdIepzz0606exTWyQGMXljORTNT1B7+ECZR5fHzDqapfbHjbFkTsIwSTQA43ptyyS44Paun
-  8N64Z7Bre4YlZBtU5+7XLTQbjwN4Pb+IfWn2lw9uyrIw2Z5HpQBv3GirHc7LxWVZOVI71FNp7WDg
-  QYlIIGD6VvaPdi+tljb5yeAzcn8DT9YtbPSpVhDM87jJ3Htjnn6UAUIrJreD7Si7MDoKhv8AUxqt
-  pGt5GqIOr9zRfLM8ZFgZGtex2nGe4zWKN8rsDhYx2JpJ3Atx+HxcRSzWcpcL/CRwaj0zW1sQy3cS
-  nsFPSoYJpbIl7dm8tT8wzV7+0hqEO1Y4lQ9cqMn9KoCp9kW7kaaxU+Yx+5j5etWrb/RGxfr5bkdu
-  lW7KFILpfspDbVyc1fjNnrLtHqOYWP8AFjGfxpAc/e6Ql/GzW4AfqBWfpupS6Xer5vPlHmMjg10V
-  5pp0u4JhYNGvAYHrUn2WLWrVo41AvSMRZAC/8CPr1oAvafdWOuNG+lqDekY+zg8MPXPX/wDXWZrF
-  tcWNw0erKElB4Rf4R6c1BpqyaBdbrnEcwyAc4x06H0rQS9a9jUTgOXPzMwycexoAw7u1jYb3zkU3
-  Srtgdk54PFamv2C2pDQbWjcfKCeSa56aJld23YA6ZOKFqBrXGjjULuOKxKuZOTn+H/OKwr/ztOvs
-  uCrg7RgVLYapPbXAEW4EkHJNdBNBH4gtgyhFmXuw60AVpbT7VpiPJ94jLetQWsDRSIYz8mec1c0+
-  1nexdrw7GjJXk/epsFtDPG0bOdw+b5SaAKWsXA+14Y71FQi5S4RvlAC8A0y5hHmHarhvQ9BVGSQx
-  sUXPHX3oAmDCJ8rzgHg96gQ+ZGWbg9vahNRG7EnalkkF6hEXyD270MCWF3aEhdue1OsmNnMAih/r
-  VaBgAUY8561PaubdnMxJXseuKANhIY5Assp2v12itZtAgubEi2nb5xuKYHWubstQaO6SVzujTqpP
-  X8K2rXWLRF8xZJPMfjAzgUAcxcNiaRSpUocc96sW+yNgZCMVF4lvJdRvTOYkj52jbgZ98D6VWmlY
-  2qCUnJOKaVwCzviibANwYc8Utkdl7tbKhjxmpUspvm8tgn16ipigSEG4G4pxu9TSA27GeFbRlGGm
-  P3cdhUN8GEP2hV3JjafrWfpU/wBmuAcZLA4/Sr1trkarJHcRmSEZO3uTQBmrcbZCLoDZ2x1qOHSi
-  yebJIAPQipp4kmbzI1EQJ6GtCxsoHP8Ap91GB2yDQBlSWO+M/ZsBHHzZ71XkfMIWNgGU9vSt3U9N
-  t9m21uonz0Iz/hVCfRkjg82FhtHDGgCuZ8EMjDZjBzSZ8pAwU7XbGT0pWtEjjAZgV4PFOml2QKqk
-  OoOcU1qBNYRSrdkrhw3BIrah8KwXoV/m3PyVzyDWNp999kccgZq/ea7PFAGgZlJ6EUgN23thpdi4
-  V1Eucr7ev9K53V/ER1a/MkuWdBtG04zioLrXJ5wDK2XAxmqVqmZ2YPtHJ/GgDsvC3i0ppr2d2ish
-  yFAHIz706bRLNdOPnErKw4y3NcvZ3pjA8o4kB61o3OpSX9nbx3QIkU/MwoAj/sGaPzFjlWSJjk46
-  ioYYwqssjIHHAHpWm4ESN9nYDIFZV+I7uVI1wrY5b1oAtafcvb3W4MM9Nx6U/VZpNRys54ToU4zW
-  KXaDKrJuC8cVdtpi1gzs43HNAD9N195bdYtRIUR4wD1NX2KuA9uThuSQelcsZwzq9xyzfezV/SdX
-  e3m8pXJhkPKkUAdYZk8RywjVVJES7U2cE/WtA+HDHohuY3Uxg7RF/GeaPBlxaawMW6rHKnAU9SOO
-  lX/FFv8A2bpzTQk+cpAAz93nrQBx+r4c5CODEOA3Y+wrKu5V1C1GFKznkk9K6Wzv49fs8Xf7y7DY
-  MhGNgrmtX0s2t66WknnKvUp0/WgCnbrJFdot0NwJxkDFdDYp86oMjjIArJivxbR7LuMyEjKitS21
-  MW8auuW44H93/PFAG15aXdr5Uv7uULkA/wCFc+Yvstw0at8+eoq/p+rm6vRJMNwIx9KranYySXSy
-  WEZZHOCw7UARXFyj5STAk7ntWVf2gALLyfUVoataLbfLO2SO/Ws2c+VwhLK3QDpQBmz2xAyCG56d
-  6uWPlnCkFcjoTzUBkMc/3cZpwn8oZkDFs8HsKALN1apDIHOeaiLkRkMOtSXE6yxAsRUcdxldswIJ
-  HANMCuJW8xQgOP51oacWPPGAeRUUOIZQzDhecd6mbIcbPusM0gLmq6bHPohlhDeZuH4c1zzF1+Rs
-  HByDXTae0s0IhjjZg3GPWqOs+HpLCTbNGyb+cHrQBZitjPEzW/LL97vinw2v2m2aORec9AKXQbsw
-  ygBBiX72TWxfaS8kiGFQAwz8vWkncDlbqNraT5cjb/n+lMGckx8kjOa1tU2TxkPkMpxyKyrhJ4Wa
-  KIDbTAkgvIp7URzgBwe/BpZYrd4vmZWNZ81x5cgBXDdzVlIvtUOGIBHpQA2aEROpR8DsB2q3bvG9
-  iySzEsTkLnrVMqViCZzt7nrT7GBVuQRnODQA6Q+Sx80A4HApEJB3BAR9K19EmhkvCJ0ZsKe3tUc8
-  Mc1yy7cpn6YoAzoUiclnYYY8AHpUl8zRxqpPy9qtC2tULgSMAvQ460lzIl9b7YiDt4GaAKMMQlJ5
-  z9Kj8gIW5yKnS3Crlzhh6d6k0mbyZT565Q5z60ANtrRpPmhzWhbwy7DJcDhhwMdKlt7aK+gb+z33
-  yKdxVuMCqaz5cqGYfWgB6yu8rBB8o6Gs/UpjGQXBGPTvVmSfyImyepqrqjbIw3WgCDz1ib9yOTg4
-  NbVlNBJYvlVBHt1rBaPzQWU4IHSn2FwRJslJxQA6e3M0O4oAzdB6VXR2iKGQENGOK0ms1eAkFjF/
-  BjrVGaAo371smgC7pety2kwl06Vo5AOWXmuwm+Itv4g8Ota30aWlySAJQfmkP/1zXIeG4Y5SVBB3
-  evamXGly2tydwG0nKkHpQBZ86fRbpBLI252y4PGRWhO8Ml1IbJhHn+BTnNU9O1oRwvDqqhB2lHJP
-  4U6awb+z4JdKbzdh5ZurDHtQBat5LaRHiaOP7QejEZKD/Oauy+FI7W3Bsroyhxkq3QH8q5a7ujM8
-  nWOQnBqTR9burCT98xdR60AbbaHc6ZG3ymJsZC/3hVnw/fNIXt7hygHzZp2oeIBqCxzqfmCgEe3+
-  RVdrmLVAEtf3bxfOW/ve36UAV7+7DXMu5Q4/Os2e3eRWkiAGOijtWrPodxfQmeNVAPOPWsppJIpi
-  JxsKcY9aAMwRyTSbpflx68VOYvOXb97OKtXAiZdzkqT0AGc037BIIRLHjsR60AVprZrZwGj4qTY0
-  xyRj3PUVMJDduFfqvFRzxJCzrCzEr60ALEu+YI53c4qeGB7lGCnBU4FUopTBLvfk1at9R2sAMjNA
-  GtaXsnhy2FzPHvC46jgnNQ33imTXrkz3oVFAwo9Kfrtq03hAzEfJ5gyc81hWM5hhKrhgT0NPcByS
-  P5g2uVI98Vp6X4uuNGlyzCQIQR0bI7/1rNQxqW+05J7Y4qK5ZYUP2ZCW9TSA7SR9M8V30X9nMFZw
-  WfcNi5qPWPDtjo0pE7O03U/Mf055rmtFmN9E0DEox+atPWbiW7lSO8Ja4jQbcDC4A9PXFADYtM0+
-  6nc3u7aOm3IP6Vnak9tYt/xL/M445zTIbieOdmWNsE46cip42EkyC4hYx469KAFsrT7XEJgFPOT6
-  1s+H9PD3XlzxnL/MDtqn9pghgb7GjL/eJORWqfEnmrA9oFRoxjJ5BoAp6NqDW2pzRXtuyIAw3FMf
-  rVS4iF08pydmeCDxWvqeuC+Ro9qglcMw71mwReXD5aAlFJPPU0AZ0cEsbkSZKH15FD2xJJiJVj6c
-  VfnzLGEXAA71PFpDPaebE6/KOh60AYVws8TBgrFe57CmHUG25RVJA7AVozzSLbNvX5T1AHNY/m/Z
-  nPlqwDetAEtvqzJNu3FZBwQBjI96vPqkd3mRtokH31UYx+VZqWruxaFl+frkZxT1tvs1ujJgEH5m
-  PR/pQAXl2S371XAHI+Wkaf7VD8hGR2arKySylRccQ98DmiS0jifdsdgeODQBQd9x3IBx1xTYlBm3
-  En86sXUAwPswKg9QeaBErIEj6nrQC0NHRtUjt0K3AHzDABGcVW1fTzJL51jyOpz0NVooispebBI4
-  wK2YFEthk8qR07igDAgJil+TKtnnHFaP2h5yI3ZsgdSfaqd2P3im3BGM9aktsjmRgCOaAJZrMwR7
-  3A5PT0pdMvZtOning+byzuVDyh/A8VHczSzDPy7RwOKgiuHEewjKeoFAzp7TUNM8XXEw8RhYNQmP
-  7ny18uNeOM7cCtMfDiS8uY0tDEYghyynjPbn864htP8ANhLIehzWzovxDvtFsDB9+PI4I/rQI0r3
-  wNc6DO0N2VaQqW2q24YxmqFhYRgE/vkkDfMGBBP4GrSeJ7tZd6SxvIfmK4yQP84p0XiyC71gS65G
-  00zAKGX5Qv4UAbFpd28WnIsBLsDzmub1+AXt1LJEoQqfu4xu+lbWsWgs4/NsCXjPIbqK5+5kklmE
-  rDD54BFAGb5cjybCrAnnB6ipEvXil2sM4GMVpFY7m4UNmNyOWJ4qteaM0BISVZe+RQBFHC2/zISg
-  B69KlIVhIHA3HuR70lqotlBulY5P4Vcls44k3u6N5oyoHb60wM6O1SRir5LemOKv2vhuW4iLg7VA
-  6k4FTR2ax4aaVIwR3HWqGua5PcQm1WRBH6jqaQFzWbE2nhzynuIi+8HaHyKweJSEQEN6jpVcKyOw
-  cMVznOeKmtZvOPDKuOKAJbi0JYFf4eue9IW8sncfvdqnlvVFyFyu09abI0bysMZx0oArC4eCTcgb
-  juK2dNvE1N1M0ohljGQzc5A7cfSs6aweWAk7kTuapQysIT9mOSvG49aAOkvzLMxk06QNuG1l7j3r
-  PlnnJAuGJij+nNQ6XqT7wEYqyn5v9utLULaW7j321uiEjLqMkKKAIotbghb/AI8hKGPIBHNXLG6t
-  7uzk3RLbKG/iP+Fc+8f2d1eFztzyD2q5p2oCFWRoxOX52nPFAGgLyC2lyZFKdB70r69buxRJBHjr
-  nvWVdeXLE7xE8fwnoPpVKZUnQPkBhwRmgDq7a9tLyARWiiWYngL1qG4gurJ28+NowO2a5a3v3smD
-  aa5WUd1HNbC6zI0KSX13JO7D5lbHFAE4V7pi0b5x1GazdUtXSM7v4iPw5rQ0/XrcXX75FgUdxzuq
-  /qFrp+sWRe3uDkc4BFAHLRDY42ycd6uPOXiiV+RGPlWnXOg3IQvEmIB/Ft6/jUUEZmMcgydvzECg
-  C1G2+Ly3YAvyM9qY88kaFcmmp807uwPJ4FS3do+Fzn5ulAFVrjbgS8Z4yah2C03SMffNWZdPknVA
-  iluQOnHWmX9pILvyY13HHK46UAVre7LSyOCTmtjSiy7VijLeZ0IqO08OzPIUiTI74Ga6bRP7O01F
-  h1KYJOv3V4BoA4zU1lExMrkbOAvpVcSifhjgrzmtjxPp7pO7SggOcqfUViy25hG5fSgC8rrLAojb
-  d7d6SexlEgwpRfTNV7e5LFBbKAwPNWHeX7TguxI7GmBPBExhaNVIJ6egqOVknO1fkx1J61aj1gLC
-  UEKlk4LVWvozC67kCFxkD1pAQ24e3uDLC3z9CR3H/wCqrczJdOGiOxvYc5/CocMYhtUBj3xU8Qjk
-  XbKPIZOjqclvzoAu2HiO60xPKvd7wY/1fGBWnJo8WuW6y6XIPMYZEAzuH9KxISonAuzuRzgk9qtR
-  79KmMuhTt5cRyxznFADLzS2tMw6pAY5OoDEZ/Sm20TQQ74YwVQckGtMatB4kUpqreVIRw5+8aqXF
-  jc6bAsbD9yThWz94UAOmmjvrRCMJjOQRVS0sD9pLyABM5Of6Vdtrdn+RUGcZqO6uRBG0MuFI79KA
-  MfV7r7ZqDI7kohAVT6U2eJNimJQOuTnpSXFussrMvBz1pJov3YUsR9O9ABblRncQ3bAqY2EUwIiA
-  Vqr20ojfYqZx3q9bSKAGcYJPIoAoq7OCEQBffrRDGEcleM8nNPjuGkhHmbB74ApvmxltsuTnuDQA
-  +SFEjDwu5buD0qpLL5vMg2kEdOlXECMAyZGOMMePyprQRI5N0rt3BXO326UAV4b0Wt0pC5HrXS2W
-  qq9zE7jcO+OhFc81kbg7iMqeAFHSpLa8eymaNOUIwD6UAavjPQYYybq1bBmXcF9O39Kw4iXdDKcE
-  DAxW3q7NdWELISdiYIz71kz6ZNZNHI0cjqQfujIFAEtzAtu/7vODzmqlyzNyAo9vWp7uWSWJd+AM
-  jjGGqOWCSWRVVW2+uKAKskpWU5TP0p8c+ExsPPNTmCVD+5U/QrzRJHJGymeOQc45HFAFczh497KR
-  jirWlEsAudvII9znitEeBp7yAPZvEVPJUsP5ZqCO3j0yYDUNwliI6dOPpQBt/wDCR3Wj6eHFujvI
-  do3DIX9KoHXoL6J11CJYZAONlaWueIYtY8Nwx6ZHu2MdxVeTXKG0eaXKRuCeuBQB0mn+HRe2Yeze
-  MqRkFmwfyra0rwsIrRmvZICcgDLVw7xXFuFd2uEQfeAJAxUkkjSxh4J7gjPAErf40Abvjq1i0y4S
-  KByCdrfL+FUI7SR4Wc+WzMOCW5qhf3Mt9cCV2ZiihRk5qpdTSBgRI+R2DnFAFw2k6AqJZMjuD1qn
-  cxzyyAkPuiP3ieT/AJzV+01R7a2RpMZPVmGQ1WVuTqLDCptcfMBwRQBEkst/YMCSTH8vJqtJaoYQ
-  JPv1o+ZDZKAo+UnBpmrCBpRNp4/0crgZ9f8A9dAzCdGgkOynxSus2xjkj+L1qW5/fxYj+8D+NRWz
-  R4fzCd2O9Ai0lzI6mPaMOcZqW4uI7rbtJ3IMc1XScKqncQT0olPlKWfBz6UATKjSDcmdoFWtPCyR
-  kzckHiqUV0623lKVIPzHHWp7Ic/vSRz0zQBcCqdyT4J7YqC3uZdKv1a2UupO7B6H2NMglMUsmcnd
-  0Lc4q3BmaMBiDjr60AWJRBfyb9P2RueWJ6KfQVLHqMdtcEysxJXayN0x0yKyWihWQBdwTOSdxHNb
-  zWEF5ErXhX7QQAMNge2f0oAnhs4rq2kksHwirkg9SfauXnJnmL3AbL9jXSRWh0N28x1cEfMqtnA/
-  Cs+70+O9/fWRIb+76fhSTuBimbyyyKDgnipLk7AML1pZbCWO7Hnjn26U6ZykRL+veqAryuvm/Jwf
-  Sk3mo2AyHyCT6Ux5pLU5Gwg88gGkBPNAILUO3KmooyjL8ueegzTvPMsRjG4qBwKrW1sxJZzsIPGa
-  AJbmfp5q7MZx71NZawEi8qZSyHg4NRGLzCPtB3eme1R3Nutocodyd8UAaVtqEUDlI8/N3PaqV2Ht
-  X2x4lIOSwHFSWkEFyo+cD1BpbmNbNdkh20AMh1UiJ1c9RzWj/wAJa1vYiK1RmRvvetY5gDENxgnp
-  UlhN5TiI4O4845oAmu51lXzFDGQ8jnpTra4uJkBAOQavXvhG8tIhPawvJAfmY9gKE1COwgIiAZiO
-  3rQBV866T52Qsw6YrXguZNTs0WSJ8IPnHr9KwZNamNumZSpPU4pbPxBeRy/uJjtXqfWgDodMtnXK
-  QjYeo3VnalpiXjMzXMKS9O9VV1ydCXkmLY/SorWwTVJTmQEt81AHTeCY49Mik+0SJKmOg71W1bxH
-  HLdgaXaSRNnjdzWapGlBBG2ec4GKtQ6yZD5hjLMvbIzQBfutWC2ajV4ywwN2OM/Sql/JY2kKGzU/
-  McnBBqlf3Lam5e8lKMv3Yz2FU4VjgzsGQ3WgDa0ya0u7kxzgqCCcn1q43hizkEjRkOoXcAOua5Ka
-  6Mc3ygEVb0nW57ac/ZC4Xuo5zQBBeZjcwuMxRn5fUUmnySx6kv2cgg98deK1LjT31pTLpymSVuWi
-  Xqv17U2GzFgFBUCVOo7igCTT7cnTp/ty5ZnyCvGOKz2uwimOY7geQB0FWY7tzu8xiqk8A96qOvmy
-  MSowOc0AVpkkgk3uAiP39KkjtonYtnO4cKOP1q1Z3K+X5V2N6OeM8gfWiewaxiKhDsAyJB2oAk0u
-  1juAwniYshwoB61FLZfaJDv/AHWexpulXRNwpjkP7s8nu1Wd4uC7zfezxQBTjxZTHzlMigbdy8Up
-  YXEv7nPvk1aNqbhDhgARnFZMCvbzuWZgc/nQBo2l6qs63AJA6VIsiG4DI4jXP8XeqcbrK5JH3xkH
-  0pWhWVR52CF6UAa8kUd7H8rD5f1p5txHAfNPasWRCjgh8D0BrV0a+DgCdfM3DaB9RigCml/JFPyB
-  159xV+C/wfNHAbtUN9orxO3k5dhycfw1XmT7JarIjb1k6U2BcuNSVGDSAPu6be1QTXcO0CVSwbPA
-  7VRtpftEmxW2Mx6HvUv2V1J2jkdaQBFJB5jBVYemetRyW6SqTKCfTFNllCHBX5vWkLBPvk4NADTG
-  0ePKB5qdLN5NjycqvNQIpZAFVj71LsaJQBuGaAH3aCVwycKODUMsZgJjxv8AXIzUs0DpHhmBycjm
-  gOd37wdRjNAFETeTcARAbSeTViApfrhjufHXNJNCsUu18Z61Xit3Q5JxQBdW0MYKyn5hSf2BPIjS
-  24I29T6f5xUMMrs5HOF71ooVmtMyu3ynAAzQBqeCfG7aaPsmuYkiYFG3HseKq67YQW2rSNpLCS0l
-  GQ5GSh74xWZc2SyxK4OZl5x7d/0rV0K+j+xPFOu4Pwpx0oAo3OnFreM7AR9Kp/2eYpxtyCx6VoXd
-  g2nSlQzMh6UxJdjqSpKgfN6mgCOLSZGkKyYw/wCn+c1YltRodoWA+Y8Z+taPhWz866DQqxLdmq34
-  x0ZbS23yY3NgkUAcZcSyrjcc7zw3YU62meOeTazdOhrZ07TYLkYvSFVfmqveQWkDj7CW9zg0AZs9
-  8wbO3L8ZpvmGRsyZQDsO9WLu0EwZojwMc1DJCrsA5we1AFmGVZLc7Y1bA6nvU1gIyNzgxtnoKr7I
-  NgHO8dx0pJ3AYG3UnHegDRS+NpL5lsxh3dQverj38OtL/pKCKSPhWU/f+tYEt98xMnC9qgludrrJ
-  GzFl7DvQBq6pYNGdzHGO3aqS33kEBhlSME0+01z7OcXGXRupJ5H0q5fafFqNuJLLnofmGDRsBmJe
-  DzMEZGevpW7o8sN/bzLqTBML8oB71k/2YYh83FQRqbdtr7sDv60AX7jSo4ZsiVo067hj9anuNHey
-  jVizMj8gkdaqQyi+UxjO7O0A96tXDz6rEFucp5HygUANGEQKjDJGaqzWbzgyn5QOPY1p2xZtOaGN
-  VMo5BPoKqxa1NHHtmij+Q4xkUAUraZFiYScMOgNMf76CIZHf2q5KRq8arEjK4OTsGaki0oKwAEhP
-  uDmgCohEsqq/O6rrMNMj3AEdgfQmn3tqUgEcaYz1JFMtLdn0wpFGxYHhjQBa026M0XM2WQ/NnHzU
-  6Yw6tCPt6rbpH0CdvzrPtrZ45ceU4cHk9qtzW6XLOjqwY9+1AEa+HWun8zR28xU5LAZx+VLaGSV9
-  jrkr145amvEY4hGkjKMg5XoPY/571vaHFDr95HHqDMkoU4C9G+uKAOevoo5iSBjBxVYwLdRkL1Xt
-  XSeK/CdzpkjRMqyJ95SjbsD3rmJbUwoeuGOCfSgC9eWc9rcbbdA0KHPmhcq39Ka8e9DkBS5zk1X0
-  /wAR3dvEtuTm3AwVzW/D4w0xIEivbOaSTAVWBAH40AYMu6CZDkFcHcTz6UrtkYlwVHIwOtb91olr
-  qtuRZSL5h5EX8VY97pc1jKAqZ2jB/wA/nQBRJhubjE4YOOnNMC+S+DzmrMkIA819wPTbjmqwfzcM
-  4w3vQA9mbYwgIz/ENvSm2t+6jZsYKeTkVYjn/eqwGAOp9aeW+2sdkgVf5UAQLKY5MHGferNv+6IM
-  XT07CmyaeZIS1vtmkUdQKbZ+akOZoyqMe45oAvRzjUJPLLgSds8/zqyPDzwETagy4U8YwARWMbcw
-  NuDDePenPrbXEfkTn5hwrdqAO709LPSbbzlZdvqD0Ncnr/iufX793uWQrGdmFGBjpmstdQeFRHKx
-  2Nn5f73+f61E7iLCxDnrjvQBaubtNypAxyRzg0q263DMsJIzzyc1mwyDeSD82e9XIGUIrSyBNw+X
-  2+tAD3tSpcFvufrVZbdL2XbnDdjnGKnhs2nkYtcIEJ6461HMiJIApBVe5HWgB8mmtpzDzSrrkZYU
-  65mRGYoBgirEkCStiJlC7c5IqjLNsYhtu0d6AKkshbAZcAdc81Gdwb5SD6cVZjYy5WXBVu/pWppn
-  h63urfdLdxR47MDk0AYjnhehxntVq11OVANuTj8q2/8AhBZ7mwkm00CYKQBtHXrWe+kTWS7J4zE+
-  OQ1ACQX/ANrkC3DD0wODV280KQwM0jxheueKdZWcCrvkjYYHUHvRe6jFLapHtLKeDjg0AVrDQ5xd
-  xuhIUEMHx8pH1roZtH+2W+dPIbHDMOcms+81YNoqWltlFKhQD1HNP0e5udHsHFkcyMRkDoaALUPh
-  aa1n8yUgqRgjPOO/eq+reDkvHzoQYIB85JzzW5HBLqWmCSWQJM3UEdB3/Sk0S3uNPmIkBlgJyXAw
-  o/Ci4EHh3QYfDsfm3mHklGGLdFqS91HSYpvMw0jjkhTx/KqXjLUg8hihYiMn746H6Vg+QYxuV9vH
-  1oA3xrem38TNe28rqp+VUyD+gpbTU7O6ylvEYoEBPzjDAjp2HeuUk1aeyfNqMH+8BTrvVhqEAMuP
-  O7n1oA3X1Q3U0klp5S7OGHFZt7rj4DwxlTJ6riqMTiDZsHTn6/WpbfU5EP8AxMVMqdFIOMfWgCZb
-  lpEO/GDgn9K6bwZpktjcC7lUsAMYPvj/AArBi0lrpc2sqbZsHbjkV20SvDp8UUZBcDp60AY+ueIZ
-  dIu3Frh0lbD+YNxAPXBPSqLrpuunyNPBSSM7mZyQpJ/KtWQ2uqvNDcjypQjAFjnJx0rhNYhntbvy
-  7jcucgIe9AEUMOy5ImYgg4xViVVa4UFSoToc9a6DxZoEdqv2rTsHzDlx/dFcujFpG27vlPGe9AEi
-  anPpV359o7b143jqo/yP0rWs/FSavF9l1JltlB3tOerd+axl3XGfMXC9896iu7UbtyYIxg0AdTc2
-  Vrqe3+zZxIF4Uj+I1S1Hwpexu0kts8aL7Vg2t9JZ8REjJ+UD+Guh0TxjeaW3/EwAuFAxh260AY8y
-  ujfLkBOCOuabHcqgCxYAbrz0rsbSysfHdzks1rO33Y0AwTWd4h+D2r6M5mmt0ER5D85P1oAxLfWZ
-  LSYrbnAb5eKnudVnyELFkHOcCqUmjzRzBWyD9K6W38JtLo6TtkLzmgDHtryGZiZUDZqDU1Vl3wp8
-  g+9jsf8AOKmGnw2cpE8jFR1I7VdGjRXMQa0kdoSPmHrQBn6bYnWz5NydjgZVgORWeztBK8ZBJQld
-  x6nFdZ4ZtoNI1QPI7O+OB7VX8faO9rdC7ESrC4BJHqaAOcgUTtuORiraW0M9yiXLAIeoPc+1RWar
-  u6Haxq7e6ekEZkBGzGVz1ptgVprUw3ku3iJDgDPUYFEzAwZRN2CDgUw3JEkezD7+xolvytwn2pVV
-  RkADv060gLVlMk4aLIDHp7+1Vbu1+yzgThiHOOelElyIZl8v5CDkVtxWkGtaYs0bMblCcr/KgDCe
-  3LzsN20L2HepUQJnHI9KsX+gT29pHKCd79qWw0u4aPcwU4796AL+meIr2G1aDSbiWHOMhR1qxZXz
-  xXBl1n/iYBBlg/FR6VZW1nciS9mdJADgYGO1Q3pIOOu5hz60AO1vxLDqluP7Pt47eJSQ2KzvtiSg
-  eWuPpU89gsfzH5cc+1ZaSpbXRZT8tAGjjz237gNuPwrc0O48uUPOM4GBXORXC3HmJD1bB/QVZivZ
-  fLwp+71oA6fVfEiwXC+UBGjfKTj14qZbi7gtJWjkY2zx5C9s4rnbCRdZiaOUkFQTke3P9KbYa1c6
-  XcBARLEWxhzwBU2AotqzH5Ls5YdFPOKmiu1KgxfvCOqHrXTL4EXxLbl9MO6bGRkYzXPal4TuNLu2
-  ju/3csfUD9KoDO19yChhO3OcqO1VoZEUbHVckZL9x3q09s8a5uDkZxUDWX2i4OzgHvQBLCwkwyEF
-  c4z6VNDZm7utkROCfwqCzAhuGRhhV/WtR5okjjkQ7ST2oAlSRtMdUjHzR1p2OuOI2Ly4kHQViS3K
-  iYBMsW5zSNF9klEjPnPSgC1dzm4uVKSMZd4JP41oeJPD8+r6ZHLbwmW5H3yCMqvr/Os6xu/tDfvU
-  CqSOfWuj0yf7OxLO2CAG9x6UAZs6vcIqSiVw3GQMisR7RVvpFkGFU46e1dN4c1hYmCXm0quDIO9c
-  54quVl16drdDHGzZX6UAV5bTzWIi4Ws6/DQEoQSpI5q9BfywxkS7WU9OOlMa3F8hG7bj5sn86AKc
-  ErggKVA96lFwLcYHX3NQPAHnYD5e26pAnluA/JoAu6JevFqsEqs4YN0HQV39p8aL+CJVnWKWOP5c
-  OAf6VwCzrbxAIMMefpT48zEFD9RQB6hZ+PNE8YqsfiJFt5GOC0abcH6ioPF+i2/hiGK50xmuLOQ4
-  AjO9s/T8a8wlzLIdxKkHIwcc1s6R43vdJi2xurxsdriQbto9RnpQBal1C1urtzcIVjfqu3FRMNM8
-  zbpplViehyAKnuU0/X4N+ixtFdR/67e2fN+g4xzWPcWzWFyDL8gP3Qw+9+NAGhqulSWzpJHt/wBn
-  Bzj2NejeHLG28f8Ahox6/HsmA2DHBGO9eTrrksUTKSOD0Par+n/EnVdMRVsZYgpHIK9u9KwEvjn4
-  eTeF9UY2Jie3HI+bJFc6b6eMkt909j2rsrTxpYa7bGHWYpXlc8Ord/yrOu/B8gEjQul3Ao6RjLL9
-  cGhaAcu0skr7mK8HtTjEAcMMk881Zm0l7JXxg7uQBywqqzysygDBPr1qgHSWqzANL6UunXjWBOxW
-  KsaZcggbu4HSlindrf5ANxNIDqblPteiWrESNC2fujJ7Vd0bRY7KLfZswWYZYSdT2/pWJ4Q8ST21
-  1b2krIYj8pBFdd4k024ht0nsdpjA4AHNAHO6npkSs2SwPase6ieJcSYdenB+atGbWykgF9G2cHvi
-  qGqMxiWW0GFyCSRnFAFeSN4yGiLE9we1QXYEhzMo+bnAqaC9YzbpSGY8CoL/ACwDQ80AV1mxdJwQ
-  q9h1qd71WHU/QdqgDO0gJAyevFE4WI8dW60AafhzUHt5v3ZAzxVzXNFku/38Odg9KwbK4ELA4z+N
-  ddourgQKJsMv92gCr4Y8Qy6VGUmkdLcDjn5/8a6vS5tM8SWTG3kkaZeP3xIyfxrmPEuk/ZXF9akG
-  CY/LHj7tZy38tvcxSwnYw7DpQB0viLwrIigwhcHqAeKxDpbmcgJtKjOfStXRPHgjlEeuAzZ6bf4e
-  lajX+navE4gZIyQcFmxQBxd5ZPG+9iuDxmqitHGR5oO09M+tdDqmjNsDl90YPBHSsJ4N7uH7dOOt
-  MByxj+EkE/d5qwYGkUNu+VetUgxVz6gVNAryx7Y84J5PpSAeZWjG8A/Lg1sabqn2hF8wnniqPkK6
-  qk/z/TilaEWo/cgqKANPSbRba8zM6MXGDzVPxHYPPOzOOVPy471R03XmSRXlQEHv6VstqaakgJKh
-  h0X1oA5jBjYrP8uTkA9TQ0qoxLHqPyrQ1+z6TMu104x65/8A1ViSsVc5GdwoAseWbkDyQWC01QVv
-  S+5WGcbe9OguTFZqIjhxnPHWnWTCO6LyKjPnpQBDfs4n3sMc8Y7VPBKWT922498U7X0RCjRnJmAL
-  KP4aq2rtA/ycBu5HXFAGkYg0GT8rY5J5qIw5jyMORxU28zwAou5jxj1pnktAzCUlT1xQBHFP/Z8w
-  dpNsg6ccj8a6jQPFNjqdqbfxJbvPM/yxTE/LF9c1zsNsJ1U3EYIP8VPe1iicCORsnnHTBoAtat4Z
-  mS92Wn79WBK7aw0ia3uXW4jdChxkjvW/Z+KLjTZFd4hKwyAc44qy+nwazpxEOPNdvMdx1UdTQBzb
-  AbSNyqGPf+lWvDPiW58IXDtZzOIpRiVVON4qS/0ePcG04/aYV4Z8YwaoPGJrgq2AqnAPY0AdVdww
-  eJLX7XoxSKfbnyRwzn61zGooyMzsreYpwQTyn+P/ANap9NvX0S4DQtzu7dhW/rel2viWzWfRiPtC
-  L88a/wAfuaAOQEvyDepIOOamtbFJZWKzrH7Gpk02QRBLgYYHkDtSTaf5LBgM7u1AEVxbS2aiSNfm
-  xw3St7RfiTLFZi2vUe4VRt44xWJDczTzoLoFgvO096bMomlkaJfI5ztFAG7Jqdlrcm2WNYHA+82C
-  KidbiCAoVLWzfKoHOawo1dyGO4bQcc9frWppOvSwQLDcDzQSOvbmgCjcWBQsqDYwOTmo44BdAZfG
-  OeuK1NYdZLjzCdu8dAKzpLYQt+6OKAK88ciXREQ3AY5/Ckmt3dlMoznPSrMU2zJxgD2zSSRmX5kY
-  gdiO9AFWO3KSDgqMjrXQ6fYuUAjG3HO7rWRawNeSDLYKnHPeunVG0bR4ruTnc20g96AHxn7ZbNA7
-  qzgcVzup2s2mzOl0CAT8jYzvrb1TxpZ3tgr6fBFFL/EUqpp+pJqpxeqJAPulucfSgDDfcjgxAqSP
-  mB60xXXlZFBPXpV2+tms5W2oTnpk1nht0uZCAfTFAG9oOvCJBb6jueJj8qj+Grer6XFCqvHMvHTA
-  zmuajlMUmWHznoKvQ6tLDEPtKeZnsT0oAkaBVLGX7x54qOG6NvkEEA/rV2dYLi08y3fMhH3e4rMR
-  mkDLOMkHg9KALcN7vXI4Iq9ZyG5jw7An1rFuWMWMAopxTzqMkIxZAuOpINAD7ZAcg9F6VqaXdRFg
-  pX5h92sPzRbfKQdvr61c0+4MjDyxsYHkkUAdA2lvdQ+ZcDIPGOuawNY0wWNywjwVbocdK2E1ubTF
-  +T5gw5yM1Lc2kOqaX5kXMxG4nPT8KAOSUSKu5VGM03aZmRo22k9Tird26Fgp+6hwcVAZfNmCnBVu
-  mKAJp7N71FDcuOI8d6pJlLlt+d44PoK0dTZLKCI2HmCZQCd33c+1R6iqXKpJBu34+bPQGmBNpzND
-  bgH7zHjPapLiXMhEvzMRwarQXG+ILcfMP7w7VZjdHj+QgMOmaQCRF7AsVBZO2am2G5t2kIAJ9O1V
-  2vzM21l+UU9Cjj5M8eh4NAAIXjUeRl8/pUa6k1hGFtWyG6n+lWYX25Y8dsUs9t5tkVkK7Tz7+tAE
-  9l4hAj8q/RUf+Db0P1qZ/DUWrTO0paK9cfLGg+Qn61zc0SeYc53DgVr+HNfk0u623LgwSDaxHLY9
-  QaYFa80a60G58vU1VmbqF5AFWdC1k6PqaTW6qyEbSD+FdRJd2s8IikZJbO46MTmRB7nr2/WsrxD4
-  QjtohLo+9kHXPb0pAd6uh6Lrekm6hkkQSRgNtQfK/p+dc1f/AAsuGUnSWSVScgynbisHQfGFxpki
-  RKw8tRyD0z/nNWPFHji/1lFihkCxKMAocUAaNt8NNSt3bzYrYsnT5xTLvwZYQTIuqzlLh/vqigqP
-  xrk/7QuIwRHcXG4jnMpP9ary3kzhvtUkrSH7p3E0AdXqPgvT1vI47K4kfcCcYAx0/wAar2ngu2uW
-  ZIJX3pnjHFc3DqUikfPIGHU5PFb2ka3PDe7dPZGGzGW7/wCc0AX7LRLSzcxb3eXrhhxVG78JeVcA
-  bvvcVfEgudqaoyrOrbiV9Pwpmo311pMnmWmySH3w1AGRrXh6TRfLMq8yfcHGPxqxZ6fpmnmNddml
-  jlk5+RQRx/8ArqO51ptT3vMwWU9iOF/CsOZHnkIkYu3YnmgDo7qPTtPszcWTu5LcAr1ycVl6p4hk
-  1BRbsCEXkCqEGqz20wEWGEZGAeRxVy+vRqV2JpUVJiACQMAUAZ0+mvaNuuz88hwAOmaktbt7C4Ub
-  c8jvW5rGkp/YUEsRM0nLSf7PFYogSWEF/lJ6CgDWcjXyuMhwOAO9Y09hLbSyKy9+pqzpM9xo90Jr
-  co2OMMM5ropr2PxBYGK7VVXBbIXG4jnrQByUI8xSADs6HPWpPLIjGxssvr3pxQmcqx+VGwFHenJI
-  gOF5oAW0jZB5nQnnH6Usnzjrg0rW2/8AeISD1x2pWR5VySNo60AQBX2EzHIXpSQJ5kjOOFpLgrtI
-  iLFvWi2Y3CFYuoNAEt4myTBBQ46Gq6OyHKjGTzSyyyXUm+/cnHc0+PY42RtuDcDigDS03UzdQlHG
-  WHFSw3/2CX99lo+hA64NUorOeyG9FJA68VJFaLqNu0hkIlXkgelAF3VtEjvNMF1pKOctyPTFc/bw
-  tGVeMfMRzW54f119M8yJ2IjlGzk9B/k1p6f4fsmi2xXsUmeP88U7gYV5Et3aQlWCsox+NR2eUnWG
-  7bdvrZ1TRY7FXjuQsatzHJ7VkyeXbxnz38xl6NmkBFfiXR3MDKQjHI9xUMV0ijMnNdBZWbeJbUcC
-  SZU+U454rFu/DF7byNJcW0qxqeeOtAE0EcbI+4nax49qnKNY7CCG46Vjw3DRHO1gtaNrqPnBRKu1
-  R0Y80AXYDHPAzlPmzzTWG2Evn8KafMMWIsFfamKxcAyjAHbNAFSeRJpOBg0xrXykVjyp6VLqFv5b
-  AqwTI6dal02ZZ5VjuMNGentQBJZxXFtFuUZDcitDSPFrwOYrkFkfj6Vl30l7p87RpKRDn92eoIqG
-  31gRxk3qMzqRnmgC/wCJtIa2uzLYfMjgEj2rNs70woyIMjPLHtW7Y3y38gkUnGBke1R6p4dS/mNx
-  obeZgfvIVH3Pf3oAz7W3EmGzgrSSRqszF13+4/hqOOLdGSrk5HO0d6WCUxYaUMYhw4HegCM6TLcy
-  Ztkd0wckd6jtZZbPiI+aqnlem2tTStXNvcbYZyiSA4QcdMf41Y8Taf8A2dZieGMR7sAkc7s8H+dA
-  GVJqTT3AKtjIxtrStNVy/kyLuUj1rAlhG4NtKqOc/wB+l+2SpP8AcKMn3s07gdJdeHPtLRS2zpCr
-  csD171laro72bGSFWZRwzHpQdUe8hTDEMg5xU0N7Pcx7GVpIf4lzSAwlk2yAoevUDpWpa2hvYeTg
-  0mo2UM8w8lPs4HUDvRpsFz9oYW6NKB07U0BbjvptGhkgJDRMu01VLRyyIYQSgA3HstVdVMiSlZyx
-  bPKiksbyS1hdWUmKQ5K0gJpt8UgAw69iKn0/UyJdrdOmKIPIvW/cyLEqj7p4zUEUIEr+blHXJBx1
-  oAk1O28q6VoSFVhk1GbZQ25TzUlvcfakIucKAcAnqaWK1cyFkQlB70AJvJdNq5I4+tBcbCnCjv71
-  LIVcAowVhxj0qO2t9zkXHKt0bsKAIpbPIHlKWUjk06wgaNiqIBzViF/kKKwBHA9aguI5oX3REk9j
-  TQErWypGPOGc/pTLTy47gMFyob5fetB7EmcG3G6N8hSTjNWRpgsws/y7ouWB70gKd5dGSRcfKnIP
-  HFXrHSYL61e4kfyVVcYA61lC7OrxurAKxbIHtUtxfC2sTDA/A49KAEazRmkEw+TqG9as+H7YSTeX
-  bvu7ccYrIt7qRdobPLc59K6jw9pf2KUXcJBVjuI/z9aALF88MsJh1AiRoPl54Iqt5GmXUG3ABx1x
-  0/WneMbGfTryO8VB5d2N6qfTJHP5VBoNtFqUb/b28uU/d2d6AJLPV4dGtP8AQyokHGKgu/Fwu9wl
-  PXgj0pmpaSmnOxmYEdu5rOht2knZ4FX3oAimiju3AtlAznrVWSAW7OC2HQ/d7VdNjLaMjurbSeMC
-  s+4WS41BjyEB5zQBcgnk2ARnJbqKZcydmZt3fFVxB+9DRkjHfNWLh/KKGTp/6FQBGLg3C5PzFeBT
-  LeT5yEzlB0p1zb7wGtzt9RTNhWVQOHPWgDc0iUajbPbTgM5GE9aydTtPKk8sKcDrk9adZX5+0FLc
-  FZM/K1dPpmgReJLR2nOyZDhQT1z60AYWgXYtrvy5cFXBXA9+OtGpLceH9YIsZ3BwGI4+YHsaNR09
-  9C1ERTFTMjBgE6YyO9S+IoDqHlag5++RGPfGKALelpb+IbtA+Ldk+ZkXofxqHxFpn2Vpv7OXdGOW
-  56Vk3GpCBQB8pB429a0bHXN8kX2gKY1ILju1AGakfmFfJXLN0/z+VdZYQG503yda5xyPp/8AqqXw
-  2LKJJvsqbjIdwDL936Viarq8u9nhA8sNg88/TFAGrdeFbeWBHscSL/AM9DWRqnhObyS7KUYdfetH
-  wkx1Gdnm3rECAB6Vu674psYbIRxeZuHBJHWgDzZw2nybQMluDVnT9T2PsJK56Ve1OS1vJ/OhOfXj
-  pWVdWctu/mJhgTxQBeYrOS0xAxTojJHKHspCQ3GPSqaXCTuqpnf+lTQIJ5XRXwy0AaN7YxzWzT3I
-  /fSHp6VnS2LI8Yt13kj5ucAU17me4hYbvkHXJ5qvJfDMYDNlevqeaAJTAVJGBuHPFSWuoMN32iNW
-  UgjOelVo5vNUvg8HGKVollOIG4HNAGhb6dHewhrVy8gPK4qaFTZZRssT1GKzLWd7C5zDlS1a9rq5
-  vU2uFAIznuaAK93po2GSIEjqefu1C8QZApc+uBxWnbQpeyCG1OB1cnjmi5sUuTlxgpTQFBAYCWEQ
-  bjrmmsHvDypH0qYqYGPlk56DPSnWFuz3BN2MCkB0niGK10bw/ExCyMxwhVskH8K5O98SPfWixqPm
-  AxkjBNEkkz2iQSzgqn3U54rPm4RkY4YEfhQBd0gPBMGnwc8fSpvElpFBIGU5Y4Ix0qjcanIkKBG5
-  7VGzPdIHvF3P9aAHpGtymc4Ira0fU5YYUG7KA5P0rAEgjOFjfHtVqzndD8ilFkGKAPTri4h1fRrW
-  DVAojmjwjdwPY/XNcJK6aTfubdjhDgc9a19PnbUYLW2upsRJ8o61S8WeH1sryKJ2AeRSUb1oApTX
-  TXpaQMWJGcdal8PSf6UTcj5WOKz5YW0zgTKZG44Bq4THLpSqj7LhWJdsdfSgDo9e16OGFba0ji3p
-  wZCBzXOoYZp2N2u0Mecd6Zp12cIbkfIBzTbwRG53W4wp5oAbeWVmgY2ZYeuTVC4SWFAzjdGO5qws
-  HmK28jaTVi1vhaR+XfRGeJhtVR69jz6dfwpgZEcrPcAp92pl2IzMxLuRwamfSJZCXtnRhnLgcFR6
-  VWc7J9mNpbtikAW9w0MheQj5ea3NG1Y2sPmWhCvjuf5Vk7UadY48RseW960rDS11C3b7EMzL3oAt
-  6hpn9pZu4GzGq7djH5g2PzpPDsMV/Y3Fveg/uVZl+vNJYRy2KhXfcB972q5aRw310/2eZLbcuCWH
-  X8qaA4yTeT845B4qaEqjZlVtzflV+80qY31z/Z8T3ENqMs8ZAAGcd6zoZMncEwH6H0pAdDpusLZQ
-  7Rjc3ApkFoZJHmY4iAPXpms8R7oh/Gc5HtXQaALbUtGMN6ApPHrzQA/TvEdsdOWD92rRk8gcmud8
-  QXkl1cZzlfapr3QP7NujGjfKTlSKzr2Jmdgx/wBX096AIkn8ucBQQjdat/bWMLZKOOnOOKzdjL0P
-  BoiXe2Cu7vQBpxC0KAyK2488Hiql3LskbaDtbpjrV+3tlubYC2TExGBVe+tJNOAF4PmHNAFO0meG
-  R1bI9jU0iK23zcbsdagWYO+xOH7mrkMWYcNgkUAQwKGA4JC5pzyFmPlEADt61asYIgSJWA3dOKv6
-  zosFpdxPaBGVlG445BwKAMwuWADAbqs6eI/3hl++Pu1cj8NFyrRncAdxb0psElpY37NMhljD4YKe
-  poAsWmm/aIjKknlsvUnoalhtHLcbiueucA1Uu9UMs8wt4SsOfkUnkCrOmXcotj9rkV0HSLnmgDoD
-  4JSXSzPNNFJhdwCkZX9a5+K9gD+XPgDdjNTpez6ZZywwPskcZbk/KK5qZ2llPmvvYnrQATr8zE5D
-  N1zxRbou7951anhZNYuUVFw7dvSp59IltXdZ1IZKAGvpLNGfLAfufaqDCSKUEkgdMkVd07VWs7oG
-  XLL0x60+7ePUjyCpByMUAV3bBGxsk1ZikV4gAMkHOKpzW5SUmN849qjjnlil3KODxj0oA6KykW7t
-  yJW8pk4BFdxrGhwax4TS5JWWaEBEY9QDn/CvNrPUfJmBcZDHLV0s2vsfDMwt2ZYy4z7cGgDHv9NK
-  yjfD+8bgYFUNRtTps4S6HlkjIBPU/wCcVeN86xKZmJlyMc5p/ifU5L/RYVmto9wJUyZ5oAy01Dfb
-  qZV2xnoKbfX6NEv2ZcHHWmPLFJYQx2ZLTL1U1EIJA+2bAJ6Y5oAIboyDb0PU1c8xLkBJLna4Hy44
-  5x06VAbZbdcyZ3elNBXeCRjnOaAG2808N5syYmJ7fx+5q7tW5QCZQso/iqsULT7rXLr6k4xVi0dX
-  +9kmgBlxpbI7SxqZAoGWz0p+i3txZ3AezJAHXjrWlZ26mFyzEnPC+vStzTLO3vZ1M8Yjwp6Hr0oA
-  5/xFqyrIggQKrLlsdc96xpQZ5wySbu2DVnVYQ9/MJCSitxVOQFW4G1aAOm+H3iGPSbie1upBDBqC
-  CKRugwOfwrI8VWsenazNHZtvs0fEb/3h6j171Elg02N65x6Gt200i18VwwwXcjQ3Fou2NQMiTvye
-  3WgDn4riKEhkfKf3h6+9aFlGLeyS8eT5DIMoDnv3FXZ9I0iwhJFxJLMpwY2ACg1TvvISzMs77S5w
-  EUcUAW9dH9qW6y6ZKBgcgdawoNOu7iWMmNiWOMDtT4Jxb5e1bKuMEHsfWpNM1ZrG4WWFmct0BHSg
-  CprWivp0u193mMeR6VHa2jmQbVH0zV3WNRkv5mkn5YnjFRJGBMjRMScdKANvR7OO1u4pS+SGGV68
-  d61/GnhSHUYReQyqsZXiPI64rK0S5hRNzfePXvWr5w1KIwwucAccUAefW1q8kqiT+WK0RpdzFFuE
-  bFT0bHBqxrFj/Z87LjDZ/Km2ctw7Kgk3KO3SgDPQPuHmqNynv2rRs7hrhjDIcDqD6VPeafDfWbbC
-  UnUjav8AeHfn8qsaL4bl2pLcYWJT85PYdzQBq6dfjRtKX7QnmC4JQH07f1rIl0SztbsSrcoQnJQH
-  qaseJ7mBVT7PIXtDwrYwQ3esOO4RrxvLZmjI+90P5UAXrm881T9lHOeAOareXPH+8BKOB19Kb9rF
-  pcq0ILDPc8mp7m+S6k3fdKj7vWgB8Gtj7Oq3AZ3fCs7DmorqxQTbl+oAqJJlu4gJMKwIxT3kNq+H
-  G5/7o7D1zTA7Pwpd6NBrk5vQwMv3Pl+7UnjAwwXX7tFe3l5UjBbHvXP3GnCOxhuo2IL1G+qPcFYX
-  cknoT/n2pbgVZtGFxZvNbH5VOBk+vt+FZ8lrPakrcqyHGcEYzWidWS3lCxAlVPUdDWxf6pa6nLH/
-  AGlH99QoI4wTwKbA45pHEirjk1asbxYZCsoDYH1rV17wyumSKVbeGG4Y6gVk/wBn7UdgCpPc0gLw
-  aEwtLKMDtWhoNykVwHdd8JGCjDIrDkSW1g2zOhVhkVLo+puSVlKlccYoA6Dxf4PbSLRb21wto7DG
-  W7ntj61mpKdXtxaOQvlfMCSBuJrqLfWIfEvhg2muKzQoN4CnBJHT9cVyU5hEjNbB0CHABPNAGTPa
-  fZriQONjqcZ6flUtqqB1SRmMr/dJzWlDaLrEUh1Qbnx+628ZNZE1s9nfctxEccjpQBO9tLcy7Zjw
-  vfNQ31q9oee3A75qe2Yyzby5OKiutRMsjKQDg4FG4EVvEyfM5xnsD1q5bbzKHBAB9KrCJN4YMd3p
-  V+wt8szRZUCnYDXsWSGPz7jGI+SMVVuvErXKEWuRk9QMYqXVyLXTUyRmRcmsSC4EAO8D2pAXxbma
-  IMR8w7+tVdRtkUAT9ew71as7wsF2nFGsKodDOMzHo/YU0rgULe7j098qW545Gaki1FIbwzeYyzfw
-  EdvyqkyGSfaw+bvRcQLayqyEnAyaQHR6gi6/pXnBER0IGFHzN15rnmlXyTGRuQHByeQau2GrS20G
-  9OhO3H1//VWhf6RprXbXmnrMtuYsOjNk78DkfiDQBi2rpHIVQjb1otHPnBZAMAdRVUQiW6Bgyis2
-  Buq29q2nXJjn/eDsycUAOLCG8yg9zkcVCzeVIZY+cenekN0LqYRSHAHA9aLMCOTy5BlTyPegCxa6
-  ltkL2+ORzxjFWbTXpLSV3Y84+XFVJvLilKjgVFMpAyBxQBq6prEF7bQSzA+ZJ97jpVRGjDbUJAB+
-  U+tUywlJUdE6VteHLK3kuoDqQZ0zyAcYFAG3feVo+io90u2d13R/LyR35rm77VZNSmzC5SEj5hnH
-  14/Otu+hv/FN3gTWywW4KRqQM4/OsUeFZp5miaVAc9R0oAaXWa0EUWCIjuA9PeqEMbCYM3G77oAr
-  bi8Gz2YDmeLc3ygev61X1CxnnuTE8TvPb9fKXigDMuIJFlBdtzHnAPSrEF0IwDCm5hw2VNRzxTWt
-  0BeKVMnTIxj8KZ/ahtgY49uT7UAX7VH1K63oERVOTxiuu0ex0nS7L7chJkm+R1kwwyPQZrh4JJDw
-  zbVbk4/OrNpefLsnyyg5UUAf/9k=
-END:VCARD
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/bootstrap.php b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/bootstrap.php
deleted file mode 100644
index ee071ea759..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/bootstrap.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-// Composer autoloader
-include __DIR__ . '/../vendor/autoload.php';
diff --git a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/phpunit.xml b/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/phpunit.xml
deleted file mode 100644
index 8aeb65aa04..0000000000
--- a/core/src/core/classes/sabredav/vendor/sabre/vobject/tests/phpunit.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<phpunit
-  colors="true"
-  bootstrap="bootstrap.php"
-  convertErrorsToExceptions="true"
-  convertNoticesToExceptions="true"
-  convertWarningsToExceptions="true"
-  >
-  <testsuite name="Sabre_VObject">
-    <directory>Sabre/</directory>
-  </testsuite>
-
-  <filter>
-    <whitelist addUncoveredFilesFromWhitelist="true">
-       <directory suffix=".php">../lib/</directory>
-    </whitelist>
-  </filter>
-</phpunit>
diff --git a/core/src/core/classes/securimage/AHGBold.ttf b/core/src/core/classes/securimage/AHGBold.ttf
deleted file mode 100644
index 764b23d76f..0000000000
Binary files a/core/src/core/classes/securimage/AHGBold.ttf and /dev/null differ
diff --git a/core/src/core/classes/securimage/LICENSE.txt b/core/src/core/classes/securimage/LICENSE.txt
deleted file mode 100644
index 9a749e6855..0000000000
--- a/core/src/core/classes/securimage/LICENSE.txt
+++ /dev/null
@@ -1,458 +0,0 @@
-		  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
diff --git a/core/src/core/classes/securimage/README.FONT.txt b/core/src/core/classes/securimage/README.FONT.txt
deleted file mode 100644
index d4770de5a0..0000000000
--- a/core/src/core/classes/securimage/README.FONT.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-AHGBold.ttf is used by Securimage under the following license:
-
-Alte Haas Grotesk is a typeface that look like an helvetica printed in an old Muller-Brockmann Book.
-
-These fonts are freeware and can be distributed as long as they are
-together with this text file. 
-
-I would appreciate very much to see what you have done with it anyway.
-
-yann le coroller 
-www.yannlecoroller.com
-yann@lecoroller.com
\ No newline at end of file
diff --git a/core/src/core/classes/securimage/README.txt b/core/src/core/classes/securimage/README.txt
deleted file mode 100644
index b608018d49..0000000000
--- a/core/src/core/classes/securimage/README.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-NAME:
-
-    Securimage - A PHP class for creating and managing form CAPTCHA images
-
-VERSION: 2.0 BETA
-
-AUTHOR:
-
-    Drew Phillips <drew@drew-phillips.com>
-
-DOWNLOAD:
-
-    The latest version can always be
-    found at http://www.phpcaptcha.org
-
-DOCUMENTATION:
-
-    Online documentation of the class, methods, and variables can
-    be found at http://www.phpcaptcha.org/Securimage_Docs/
-
-REQUIREMENTS:
-    PHP 4.3.0
-    GD  2.0
-    FreeType (recommended, required for TTF support)
-
-SYNOPSIS:
-
-    require_once 'securimage.php';
-
-    $image = new Securimage();
-
-    $image->show();
-
-    // Code Validation
-
-    $image = new Securimage();
-    if ($image->check($_POST['code']) == true) {
-      echo "Correct!";
-    } else {
-      echo "Sorry, wrong code.";
-    }
-
-DESCRIPTION:
-
-    What is Securimage?
-
-    Securimage is a PHP class that is used to generate and validate CAPTCHA images.
-    The classes uses an existing PHP session or creates its own if none is found to store the
-    CAPTCHA code.  Variables within the class are used to control the style and display of the image.
-    The class supports TTF fonts and effects for strengthening the security of the image.
-    If TTF support is not available, GD fonts can be used as well, but certain options such as
-    transparent text and angled letters cannot be used.
-
-
-COPYRIGHT:
-    Copyright (c) 2009 Drew Phillips. All rights reserved.
-    This software is released under the GNU Lesser General Public License.
-
-    -----------------------------------------------------------------------------
-    Flash code created for Securimage by Douglas Walsh (www.douglaswalsh.net)
-    Many thanks for releasing this to the project!
-
-    ------------------------------------------------------------------------------
-    Portions of Securimage contain code from Han-Kwang Nienhuys' PHP captcha
-        
-    Han-Kwang Nienhuys' PHP captcha
-    Copyright June 2007
-    
-    This copyright message and attribution must be preserved upon
-    modification. Redistribution under other licenses is expressly allowed.
-    Other licenses include GPL 2 or higher, BSD, and non-free licenses.
-    The original, unrestricted version can be obtained from
-    http://www.lagom.nl/linux/hkcaptcha/
-    
-    -------------------------------------------------------------------------------
-    AHGBold.ttf (AlteHaasGroteskBold.ttf) font was created by Yann Le Coroller and is distributed as freeware
-    
-    Alte Haas Grotesk is a typeface that look like an helvetica printed in an old Muller-Brockmann Book.
-    
-    These fonts are freeware and can be distributed as long as they are
-    together with this text file. 
-    
-    I would appreciate very much to see what you have done with it anyway.
-    
-    yann le coroller 
-    www.yannlecoroller.com
-    yann@lecoroller.com
-
diff --git a/core/src/core/classes/securimage/gdfonts/automatic.gdf b/core/src/core/classes/securimage/gdfonts/automatic.gdf
deleted file mode 100644
index 3eee7068f3..0000000000
Binary files a/core/src/core/classes/securimage/gdfonts/automatic.gdf and /dev/null differ
diff --git a/core/src/core/classes/securimage/images/refresh.gif b/core/src/core/classes/securimage/images/refresh.gif
deleted file mode 100644
index e3bb77668e..0000000000
Binary files a/core/src/core/classes/securimage/images/refresh.gif and /dev/null differ
diff --git a/core/src/core/classes/securimage/securimage.php b/core/src/core/classes/securimage/securimage.php
deleted file mode 100644
index e3bf0d5891..0000000000
--- a/core/src/core/classes/securimage/securimage.php
+++ /dev/null
@@ -1,1584 +0,0 @@
-<?php
-
-/**
- * Project:     Securimage: A PHP class for creating and managing form CAPTCHA images<br />
- * File:        securimage.php<br />
- *
- * 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 any later version.<br /><br />
- *
- * 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.<br /><br />
- *
- * 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<br /><br />
- *
- * Any modifications to the library should be indicated clearly in the source code
- * to inform users that the changes are not a part of the original software.<br /><br />
- *
- * If you found this script useful, please take a quick moment to rate it.<br />
- * http://www.hotscripts.com/rate/49400.html  Thanks.
- *
- * @link http://www.phpcaptcha.org Securimage PHP CAPTCHA
- * @link http://www.phpcaptcha.org/latest.zip Download Latest Version
- * @link http://www.phpcaptcha.org/Securimage_Docs/ Online Documentation
- * @copyright 2009 Drew Phillips
- * @author Drew Phillips <drew@drew-phillips.com>
- * @version 2.0.1 BETA (December 6th, 2009)
- * @package Securimage
- *
- */
-
-/**
- ChangeLog
-
- 2.0.1
- - Add support for browsers with cookies disabled (requires php5, sqlite) maps users to md5 hashed ip addresses and md5 hashed codes for security
- - Add fallback to gd fonts if ttf support is not enabled or font file not found (Mike Challis http://www.642weather.com/weather/scripts.php)
- - Check for previous definition of image type constants (Mike Challis)
- - Fix mime type settings for audio output
- - Fixed color allocation issues with multiple colors and background images, consolidate allocation to one function
- - Ability to let codes expire after a given length of time
- - Allow HTML color codes to be passed to Securimage_Color (suggested by Mike Challis)
-
- 2.0.0
- - Add mathematical distortion to characters (using code from HKCaptcha)
- - Improved session support
- - Added Securimage_Color class for easier color definitions
- - Add distortion to audio output to prevent binary comparison attack (proposed by Sven "SavageTiger" Hagemann [insecurity.nl])
- - Flash button to stream mp3 audio (Douglas Walsh www.douglaswalsh.net)
- - Audio output is mp3 format by default
- - Change font to AlteHaasGrotesk by yann le coroller
- - Some code cleanup
-
- 1.0.4 (unreleased)
- - Ability to output audible codes in mp3 format to stream from flash
-
- 1.0.3.1
- - Error reading from wordlist in some cases caused words to be cut off 1 letter short
-
- 1.0.3
- - Removed shadow_text from code which could cause an undefined property error due to removal from previous version
-
- 1.0.2
- - Audible CAPTCHA Code wav files
- - Create codes from a word list instead of random strings
-
- 1.0
- - Added the ability to use a selected character set, rather than a-z0-9 only.
- - Added the multi-color text option to use different colors for each letter.
- - Switched to automatic session handling instead of using files for code storage
- - Added GD Font support if ttf support is not available.  Can use internal GD fonts or load new ones.
- - Added the ability to set line thickness
- - Added option for drawing arced lines over letters
- - Added ability to choose image type for output
-
- */
-
-/**
- * Output images in JPEG format
- */
-if (!defined('SI_IMAGE_JPEG'))
-  define('SI_IMAGE_JPEG', 1);
-/**
- * Output images in PNG format
- */
-if (!defined('SI_IMAGE_PNG'))
-  define('SI_IMAGE_PNG',  2);
-/**
- * Output images in GIF format (not recommended)
- * Must have GD >= 2.0.28!
- */
-if (!defined('SI_IMAGE_GIF'))
-  define('SI_IMAGE_GIF',  3);
-
-/**
- * Securimage CAPTCHA Class.
- *
- * @package    Securimage
- * @subpackage classes
- *
- */
-class Securimage
-{
-    /**
-     * The desired width of the CAPTCHA image.
-     *
-     * @var int
-     */
-    public $image_width;
-
-    /**
-     * The desired width of the CAPTCHA image.
-     *
-     * @var int
-     */
-    public $image_height;
-
-    /**
-     * The image format for output.<br />
-     * Valid options: SI_IMAGE_PNG, SI_IMAGE_JPG, SI_IMAGE_GIF
-     *
-     * @var int
-     */
-    public $image_type;
-
-    /**
-     * The length of the code to generate.
-     *
-     * @var int
-     */
-    public $code_length;
-
-    /**
-     * The character set for individual characters in the image.<br />
-     * Letters are converted to uppercase.<br />
-     * The font must support the letters or there may be problematic substitutions.
-     *
-     * @var string
-     */
-    public $charset;
-
-    /**
-     * Create codes using this word list
-     *
-     * @var string  The path to the word list to use for creating CAPTCHA codes
-     */
-    public $wordlist_file;
-
-    /**
-     * Use wordlist of not
-     *
-     * @var bool true to use wordlist file, false to use random code
-     */
-    public $use_wordlist = false;
-
-    /**
-     * Note: Use of GD fonts is not recommended as many distortion features are not available<br />
-     * The GD font to use.<br />
-     * Internal gd fonts can be loaded by their number.<br />
-     * Alternatively, a file path can be given and the font will be loaded from file.
-     *
-     * @var mixed
-     */
-    public $gd_font_file;
-
-    /**
-     * The approximate size of the font in pixels.<br />
-     * This does not control the size of the font because that is determined by the GD font itself.<br />
-     * This is used to aid the calculations of positioning used by this class.<br />
-     *
-     * @var int
-     */
-    public $gd_font_size;
-
-    /**
-     * Use a gd font instead of TTF
-     *
-     * @var bool true for gd font, false for TTF
-     */
-    public $use_gd_font;
-
-    // Note: These font options below do not apply if you set $use_gd_font to true with the exception of $text_color
-
-    /**
-     * The path to the TTF font file to load.
-     *
-     * @var string
-     */
-    public $ttf_file;
-
-    /**
-     * How much to distort image, higher = more distortion.<br />
-     * Distortion is only available when using TTF fonts.<br />
-     *
-     * @var float
-     */
-    public $perturbation;
-
-    /**
-     * The minimum angle in degrees, with 0 degrees being left-to-right reading text.<br />
-     * Higher values represent a counter-clockwise rotation.<br />
-     * For example, a value of 90 would result in bottom-to-top reading text.<br />
-     * This value along with maximum angle distance do not need to be very high with perturbation
-     *
-     * @var int
-     */
-    public $text_angle_minimum;
-
-    /**
-     * The minimum angle in degrees, with 0 degrees being left-to-right reading text.<br />
-     * Higher values represent a counter-clockwise rotation.<br />
-     * For example, a value of 90 would result in bottom-to-top reading text.
-     *
-     * @var int
-     */
-    public $text_angle_maximum;
-
-    /**
-     * The X-Position on the image where letter drawing will begin.<br />
-     * This value is in pixels from the left side of the image.
-     *
-     * @var int
-     * @deprecated 2.0
-     */
-    public $text_x_start;
-
-    /**
-     * The background color for the image as a Securimage_Color.<br />
-     *
-     * @var Securimage_Color
-     */
-    public $image_bg_color;
-
-    /**
-     * Scan this directory for gif, jpg, and png files to use as background images.<br />
-     * A random image file will be picked each time.<br />
-     * Change from null to the full path to your directory.<br />
-     * i.e. var $background_directory = $_SERVER['DOCUMENT_ROOT'] . '/securimage/backgrounds';
-     * Make sure not to pass a background image to the show function, otherwise this directive is ignored.
-     *
-     * @var string
-     */
-    public $background_directory = null; //'./backgrounds';
-
-    /**
-     * The text color to use for drawing characters as a Securimage_Color.<br />
-     * This value is ignored if $use_multi_text is set to true.<br />
-     * Make sure this contrasts well with the background color or image.<br />
-     *
-     * @see Securimage::$use_multi_text
-     * @var Securimage_Color
-     */
-    public $text_color;
-
-    /**
-     * Set to true to use multiple colors for each character.
-     *
-     * @see Securimage::$multi_text_color
-     * @var boolean
-     */
-    public $use_multi_text;
-
-    /**
-     * Array of Securimage_Colors which will be randomly selected for each letter.<br />
-     *
-     * @var array
-     */
-    public $multi_text_color;
-
-    /**
-     * Set to true to make the characters appear transparent.
-     *
-     * @see Securimage::$text_transparency_percentage
-     * @var boolean
-     */
-    public $use_transparent_text;
-
-    /**
-     * The percentage of transparency, 0 to 100.<br />
-     * A value of 0 is completely opaque, 100 is completely transparent (invisble)
-     *
-     * @see Securimage::$use_transparent_text
-     * @var int
-     */
-    public $text_transparency_percentage;
-
-
-    // Line options
-    /**
-    * Draw vertical and horizontal lines on the image.
-    *
-    * @see Securimage::$line_color
-    * @see Securimage::$draw_lines_over_text
-    * @var boolean
-    */
-    public $num_lines;
-
-    /**
-     * Color of lines drawn over text
-     *
-     * @var string
-     */
-    public $line_color;
-
-    /**
-     * Draw the lines over the text.<br />
-     * If fales lines will be drawn before putting the text on the image.
-     *
-     * @var boolean
-     */
-    public $draw_lines_over_text;
-
-    /**
-     * Text to write at the bottom corner of captcha image
-     *
-     * @since 2.0
-     * @var string Signature text
-     */
-    public $image_signature;
-
-    /**
-     * Color to use for writing signature text
-     *
-     * @since 2.0
-     * @var Securimage_Color
-     */
-    public $signature_color;
-
-    /**
-     * Full path to the WAV files to use to make the audio files, include trailing /.<br />
-     * Name Files  [A-Z0-9].wav
-     *
-     * @since 1.0.1
-     * @var string
-     */
-    public $audio_path;
-
-    /**
-     * Type of audio file to generate (mp3 or wav)
-     *
-     * @var string
-     */
-    public $audio_format;
-
-    /**
-     * The session name to use if not the default.  Blank for none
-     *
-     * @see http://php.net/session_name
-     * @since 2.0
-     * @var string
-     */
-    public $session_name = '';
-
-    /**
-     * The amount of time in seconds that a code remains valid.<br />
-     * Any code older than this number will be considered invalid even if entered correctly.<br />
-     * Any non-numeric or value less than 1 disables this functionality.
-     *
-     * @var int
-     */
-    public $expiry_time;
-
-    /**
-     * Path to the file to use for storing codes for users.<br />
-     * THIS FILE MUST ABSOLUTELY NOT BE ACCESSIBLE FROM A WEB BROWSER!!<br />
-     * Put this file in a directory below the web root or one that is restricted (i.e. an apache .htaccess file with deny from all)<br />
-     * If you cannot meet those requirements your forms may not be completely protected.<br />
-     * You could obscure the database file name but this is also not recommended.
-     *
-     * @var string
-     */
-    public $sqlite_database;
-
-    /**
-     * Use an SQLite database for storing codes as a backup to sessions.<br />
-     * Note: Sessions will still be used
-     */
-    public $use_sqlite_db;
-
-
-    //END USER CONFIGURATION
-    //There should be no need to edit below unless you really know what you are doing.
-
-    /**
-     * The gd image resource.
-     *
-     * @access private
-     * @var resource
-     */
-    public $im;
-
-    /**
-     * Temporary image for rendering
-     *
-     * @access private
-     * @var resource
-     */
-    public $tmpimg;
-
-    /**
-     * Internal scale factor for anti-alias @hkcaptcha
-     *
-     * @access private
-     * @since 2.0
-     * @var int
-     */
-    public $iscale; // internal scale factor for anti-alias @hkcaptcha
-
-    /**
-     * The background image resource
-     *
-     * @access private
-     * @var resource
-     */
-    public $bgimg;
-
-    /**
-     * The code generated by the script
-     *
-     * @access private
-     * @var string
-     */
-    public $code;
-
-    /**
-     * The code that was entered by the user
-     *
-     * @access private
-     * @var string
-     */
-    public $code_entered;
-
-    /**
-     * Whether or not the correct code was entered
-     *
-     * @access private
-     * @var boolean
-     */
-    public $correct_code;
-
-    /**
-     * Handle to SQLite database
-     *
-     * @access private
-     * @var resource
-     */
-    public $sqlite_handle;
-
-    /**
-     * Color resource for image line color
-     *
-     * @access private
-     * @var int
-     */
-    public $gdlinecolor;
-
-    /**
-     * Array of colors for multi colored codes
-     *
-     * @access private
-     * @var array
-     */
-    public $gdmulticolor;
-
-    /**
-     * Color resource for image font color
-     *
-     * @access private
-     * @var int
-     */
-    public $gdtextcolor;
-
-    /**
-     * Color resource for image signature color
-     *
-     * @access private
-     * @var int
-     */
-    public $gdsignaturecolor;
-
-    /**
-     * Color resource for image background color
-     *
-     * @access private
-     * @var int
-     */
-    public $gdbgcolor;
-
-
-    /**
-     * Class constructor.<br />
-     * Because the class uses sessions, this will attempt to start a session if there is no previous one.<br />
-     * If you do not start a session before calling the class, the constructor must be called before any
-     * output is sent to the browser.
-     *
-     * <code>
-     *   $securimage = new Securimage();
-     * </code>
-     *
-     */
-    public function __construct()
-    {
-        // Initialize session or attach to existing
-        if ( session_id() == '' ) { // no session has been started yet, which is needed for validation
-            if (trim($this->session_name) != '') {
-                session_name($this->session_name); // set session name if provided
-            }
-            session_start();
-        }
-
-        // Set Default Values
-        $this->image_width   = 230;
-        $this->image_height  = 80;
-        $this->image_type    = SI_IMAGE_PNG;
-
-        $this->code_length   = 6;
-        $this->charset       = 'ABCDEFGHKLMNPRSTUVWYZabcdefghklmnprstuvwyz23456789';
-        $this->wordlist_file = './words/words.txt';
-        $this->use_wordlist  = false;
-
-        $this->gd_font_file  = 'gdfonts/automatic.gdf';
-        $this->use_gd_font   = false;
-        $this->gd_font_size  = 24;
-        $this->text_x_start  = 15;
-
-        $this->ttf_file      = './AHGBold.ttf';
-
-        $this->perturbation       = 0.75;
-        $this->iscale             = 5;
-        $this->text_angle_minimum = 0;
-        $this->text_angle_maximum = 0;
-
-        $this->image_bg_color   = new Securimage_Color(0xff, 0xff, 0xff);
-    $this->text_color       = new Securimage_Color(0x3d, 0x3d, 0x3d);
-        $this->multi_text_color = array(new Securimage_Color(0x0, 0x20, 0xCC),
-                                                                        new Securimage_Color(0x0, 0x30, 0xEE),
-                                                                        new Securimage_color(0x0, 0x40, 0xCC),
-                                                                        new Securimage_Color(0x0, 0x50, 0xEE),
-                                                                        new Securimage_Color(0x0, 0x60, 0xCC));
-        $this->use_multi_text   = false;
-
-        $this->use_transparent_text         = false;
-        $this->text_transparency_percentage = 30;
-
-        $this->num_lines            = 10;
-        $this->line_color           = new Securimage_Color(0x3d, 0x3d, 0x3d);
-        $this->draw_lines_over_text = true;
-
-        $this->image_signature = '';
-        $this->signature_color = new Securimage_Color(0x20, 0x50, 0xCC);
-        $this->signature_font  = './AHGBold.ttf';
-
-        $this->audio_path   = './audio/';
-        $this->audio_format = 'mp3';
-        $this->session_name = '';
-        $this->expiry_time  = 900;
-
-        $this->sqlite_database = 'database/securimage.sqlite';
-        $this->use_sqlite_db   = false;
-
-        $this->sqlite_handle = false;
-    }
-
-    /**
-     * Generate a code and output the image to the browser.
-     *
-     * <code>
-     *   <?php
-     *   include 'securimage.php';
-     *   $securimage = new Securimage();
-     *   $securimage->show('bg.jpg');
-     *   ?>
-     * </code>
-     *
-     * @param string $background_image  The path to an image to use as the background for the CAPTCHA
-     */
-    public function show($background_image = "")
-    {
-        if ($background_image != "" && is_readable($background_image)) {
-            $this->bgimg = $background_image;
-        }
-
-        $this->doImage();
-    }
-
-    /**
-     * Validate the code entered by the user.
-     *
-     * <code>
-     *   $code = $_POST['code'];
-     *   if ($securimage->check($code) == false) {
-     *     die("Sorry, the code entered did not match.");
-     *   } else {
-     *     $valid = true;
-     *   }
-     * </code>
-     * @param string $code  The code the user entered
-     * @return boolean  true if the code was correct, false if not
-     */
-    public function check($code)
-    {
-        $this->code_entered = $code;
-        $this->validate();
-        return $this->correct_code;
-    }
-
-    /**
-     * Output audio file with HTTP headers to browser
-     *
-     * <code>
-     *   $sound = new Securimage();
-     *   $sound->audio_format = 'mp3';
-     *   $sound->outputAudioFile();
-     * </code>
-     *
-     * @since 2.0
-     */
-    public function outputAudioFile()
-    {
-        if (strtolower($this->audio_format) == 'wav') {
-            header('Content-type: audio/x-wav');
-            $ext = 'wav';
-        } else {
-            header('Content-type: audio/mpeg'); // default to mp3
-            $ext = 'mp3';
-        }
-
-        header("Content-Disposition: attachment; filename=\"securimage_audio.{$ext}\"");
-        header('Cache-Control: no-store, no-cache, must-revalidate');
-        header('Expires: Sun, 1 Jan 2000 12:00:00 GMT');
-        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . 'GMT');
-
-        $audio = $this->getAudibleCode($ext);
-
-        header('Content-Length: ' . strlen($audio));
-
-        echo $audio;
-        exit;
-    }
-
-    /**
-     * Generate and output the image
-     *
-     * @access private
-     *
-     */
-    public function doImage()
-    {
-        if ($this->use_gd_font == true) {
-            $this->iscale = 1;
-        }
-        if ($this->use_transparent_text == true || $this->bgimg != "") {
-            $this->im     = imagecreatetruecolor($this->image_width, $this->image_height);
-            $this->tmpimg = imagecreatetruecolor($this->image_width * $this->iscale, $this->image_height * $this->iscale);
-
-        } else { //no transparency
-            $this->im     = imagecreate($this->image_width, $this->image_height);
-            $this->tmpimg = imagecreate($this->image_width * $this->iscale, $this->image_height * $this->iscale);
-        }
-
-        $this->allocateColors();
-        imagepalettecopy($this->tmpimg, $this->im);
-
-        $this->setBackground();
-
-        $this->createCode();
-
-        if (!$this->draw_lines_over_text && $this->num_lines > 0) $this->drawLines();
-
-        $this->drawWord();
-        if ($this->use_gd_font == false && is_readable($this->ttf_file)) $this->distortedCopy();
-
-        if ($this->draw_lines_over_text && $this->num_lines > 0) $this->drawLines();
-
-        if (trim($this->image_signature) != '')	$this->addSignature();
-
-        $this->output();
-
-    }
-
-    /**
-     * Allocate all colors that will be used in the CAPTCHA image
-     *
-     * @since 2.0.1
-     * @access private
-     */
-    public function allocateColors()
-    {
-        // allocate bg color first for imagecreate
-        $this->gdbgcolor = imagecolorallocate($this->im, $this->image_bg_color->r, $this->image_bg_color->g, $this->image_bg_color->b);
-
-        $alpha = intval($this->text_transparency_percentage / 100 * 127);
-
-        if ($this->use_transparent_text == true) {
-      $this->gdtextcolor = imagecolorallocatealpha($this->im, $this->text_color->r, $this->text_color->g, $this->text_color->b, $alpha);
-      $this->gdlinecolor = imagecolorallocatealpha($this->im, $this->line_color->r, $this->line_color->g, $this->line_color->b, $alpha);
-        } else {
-            $this->gdtextcolor = imagecolorallocate($this->im, $this->text_color->r, $this->text_color->g, $this->text_color->b);
-      $this->gdlinecolor = imagecolorallocate($this->im, $this->line_color->r, $this->line_color->g, $this->line_color->b);
-        }
-
-    $this->gdsignaturecolor = imagecolorallocate($this->im, $this->signature_color->r, $this->signature_color->g, $this->signature_color->b);
-
-    if ($this->use_multi_text == true) {
-        $this->gdmulticolor = array();
-
-        foreach ($this->multi_text_color as $color) {
-            if ($this->use_transparent_text == true) {
-              $this->gdmulticolor[] = imagecolorallocatealpha($this->im, $color->r, $color->g, $color->b, $alpha);
-            } else {
-                $this->gdmulticolor[] = imagecolorallocate($this->im, $color->r, $color->g, $color->b);
-            }
-        }
-    }
-    }
-
-    /**
-     * Set the background of the CAPTCHA image
-     *
-     * @access private
-     *
-     */
-    public function setBackground()
-    {
-        imagefilledrectangle($this->im, 0, 0, $this->image_width * $this->iscale, $this->image_height * $this->iscale, $this->gdbgcolor);
-    imagefilledrectangle($this->tmpimg, 0, 0, $this->image_width * $this->iscale, $this->image_height * $this->iscale, $this->gdbgcolor);
-
-        if ($this->bgimg == '') {
-            if ($this->background_directory != null && is_dir($this->background_directory) && is_readable($this->background_directory)) {
-                $img = $this->getBackgroundFromDirectory();
-                if ($img != false) {
-                    $this->bgimg = $img;
-                }
-            }
-        }
-
-        $dat = @getimagesize($this->bgimg);
-        if ($dat == false) {
-            return;
-        }
-
-        switch ($dat[2]) {
-            case 1:  $newim = @imagecreatefromgif($this->bgimg); break;
-            case 2:  $newim = @imagecreatefromjpeg($this->bgimg); break;
-            case 3:  $newim = @imagecreatefrompng($this->bgimg); break;
-            case 15: $newim = @imagecreatefromwbmp($this->bgimg); break;
-            case 16: $newim = @imagecreatefromxbm($this->bgimg); break;
-            default: return;
-        }
-
-        if(!$newim) return;
-
-        imagecopyresized($this->im, $newim, 0, 0, 0, 0, $this->image_width, $this->image_height, imagesx($newim), imagesy($newim));
-    }
-
-    /**
-     * Return the full path to a random gif, jpg, or png from the background directory.
-     *
-     * @access private
-     * @see Securimage::$background_directory
-     * @return mixed  false if none found, string $path if found
-     */
-    public function getBackgroundFromDirectory()
-    {
-        $images = array();
-
-        if ($dh = opendir($this->background_directory)) {
-            while (($file = readdir($dh)) !== false) {
-                if (preg_match('/(jpg|gif|png)$/i', $file)) $images[] = $file;
-            }
-
-            closedir($dh);
-
-            if (sizeof($images) > 0) {
-                return rtrim($this->background_directory, '/') . '/' . $images[rand(0, sizeof($images)-1)];
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Draw random curvy lines over the image<br />
-     * Modified code from HKCaptcha
-     *
-     * @since 2.0
-     * @access private
-     *
-     */
-    public function drawLines()
-    {
-        for ($line = 0; $line < $this->num_lines; ++$line) {
-            $x = $this->image_width * (1 + $line) / ($this->num_lines + 1);
-            $x += (0.5 - $this->frand()) * $this->image_width / $this->num_lines;
-            $y = rand($this->image_height * 0.1, $this->image_height * 0.9);
-
-            $theta = ($this->frand()-0.5) * M_PI * 0.7;
-            $w = $this->image_width;
-            $len = rand($w * 0.4, $w * 0.7);
-            $lwid = rand(0, 2);
-
-            $k = $this->frand() * 0.6 + 0.2;
-            $k = $k * $k * 0.5;
-            $phi = $this->frand() * 6.28;
-            $step = 0.5;
-            $dx = $step * cos($theta);
-            $dy = $step * sin($theta);
-            $n = $len / $step;
-            $amp = 1.5 * $this->frand() / ($k + 5.0 / $len);
-            $x0 = $x - 0.5 * $len * cos($theta);
-            $y0 = $y - 0.5 * $len * sin($theta);
-
-            $ldx = round(-$dy * $lwid);
-            $ldy = round($dx * $lwid);
-
-            for ($i = 0; $i < $n; ++$i) {
-                $x = $x0 + $i * $dx + $amp * $dy * sin($k * $i * $step + $phi);
-                $y = $y0 + $i * $dy - $amp * $dx * sin($k * $i * $step + $phi);
-                imagefilledrectangle($this->im, $x, $y, $x + $lwid, $y + $lwid, $this->gdlinecolor);
-            }
-        }
-    }
-
-    /**
-     * Draw the CAPTCHA code over the image
-     *
-     * @access private
-     *
-     */
-    public function drawWord()
-    {
-        $width2 = $this->image_width * $this->iscale;
-        $height2 = $this->image_height * $this->iscale;
-
-        if ($this->use_gd_font == true || !is_readable($this->ttf_file)) {
-            if (!is_int($this->gd_font_file)) { //is a file name
-                $font = @imageloadfont($this->gd_font_file);
-                if ($font == false) {
-                    trigger_error("Failed to load GD Font file {$this->gd_font_file} ", E_USER_WARNING);
-                    return;
-                }
-            } else { //gd font identifier
-                $font = $this->gd_font_file;
-            }
-
-            imagestring($this->im, $font, $this->text_x_start, ($this->image_height / 2) - ($this->gd_font_size / 2), $this->code, $this->gdtextcolor);
-        } else { //ttf font
-            $font_size = $height2 * .35;
-            $bb = imagettfbbox($font_size, 0, $this->ttf_file, $this->code);
-            $tx = $bb[4] - $bb[0];
-            $ty = $bb[5] - $bb[1];
-            $x  = floor($width2 / 2 - $tx / 2 - $bb[0]);
-            $y  = round($height2 / 2 - $ty / 2 - $bb[1]);
-
-            $strlen = strlen($this->code);
-            if (!is_array($this->multi_text_color)) $this->use_multi_text = false;
-
-
-            if ($this->use_multi_text == false && $this->text_angle_minimum == 0 && $this->text_angle_maximum == 0) { // no angled or multi-color characters
-                imagettftext($this->tmpimg, $font_size, 0, $x, $y, $this->gdtextcolor, $this->ttf_file, $this->code);
-            } else {
-                for ($i = 0; $i < $strlen; ++$i) {
-                    $angle = rand($this->text_angle_minimum, $this->text_angle_maximum);
-                    $y = rand($y - 5, $y + 5);
-                    if ($this->use_multi_text == true) {
-                        $font_color = $this->gdmulticolor[rand(0, sizeof($this->gdmulticolor) - 1)];
-                    } else {
-                        $font_color = $this->gdtextcolor;
-                    }
-
-                    $ch = $this->code{$i};
-
-                    imagettftext($this->tmpimg, $font_size, $angle, $x, $y, $font_color, $this->ttf_file, $ch);
-
-                    // estimate character widths to increment $x without creating spaces that are too large or too small
-                    // these are best estimates to align text but may vary between fonts
-                    // for optimal character widths, do not use multiple text colors or character angles and the complete string will be written by imagettftext
-                    if (strpos('abcdeghknopqsuvxyz', $ch) !== false) {
-                        $min_x = $font_size - ($this->iscale * 6);
-                        $max_x = $font_size - ($this->iscale * 6);
-                    } else if (strpos('ilI1', $ch) !== false) {
-                        $min_x = $font_size / 5;
-                        $max_x = $font_size / 3;
-                    } else if (strpos('fjrt', $ch) !== false) {
-                        $min_x = $font_size - ($this->iscale * 12);
-                        $max_x = $font_size - ($this->iscale * 12);
-                    } else if ($ch == 'wm') {
-                        $min_x = $font_size;
-                        $max_x = $font_size + ($this->iscale * 3);
-                    } else { // numbers, capitals or unicode
-                        $min_x = $font_size + ($this->iscale * 2);
-                        $max_x = $font_size + ($this->iscale * 5);
-                    }
-
-                    $x += rand($min_x, $max_x);
-                } //for loop
-            } // angled or multi-color
-        } //else ttf font
-        //$this->im = $this->tmpimg;
-        //$this->output();
-    } //function
-
-    /**
-     * Warp text from temporary image onto final image.<br />
-     * Modified for securimage
-     *
-     * @access private
-     * @since 2.0
-     * @author Han-Kwang Nienhuys modified
-     * @copyright Han-Kwang Neinhuys
-     *
-     */
-    public function distortedCopy()
-    {
-        $numpoles = 3; // distortion factor
-
-        // make array of poles AKA attractor points
-        for ($i = 0; $i < $numpoles; ++$i) {
-            $px[$i]  = rand($this->image_width * 0.3, $this->image_width * 0.7);
-            $py[$i]  = rand($this->image_height * 0.3, $this->image_height * 0.7);
-            $rad[$i] = rand($this->image_width * 0.4, $this->image_width * 0.7);
-            $tmp     = -$this->frand() * 0.15 - 0.15;
-            $amp[$i] = $this->perturbation * $tmp;
-        }
-
-        $bgCol   = imagecolorat($this->tmpimg, 0, 0);
-        $width2  = $this->iscale * $this->image_width;
-        $height2 = $this->iscale * $this->image_height;
-
-        imagepalettecopy($this->im, $this->tmpimg); // copy palette to final image so text colors come across
-
-        // loop over $img pixels, take pixels from $tmpimg with distortion field
-        for ($ix = 0; $ix < $this->image_width; ++$ix) {
-            for ($iy = 0; $iy < $this->image_height; ++$iy) {
-                $x = $ix;
-                $y = $iy;
-
-                for ($i = 0; $i < $numpoles; ++$i) {
-                    $dx = $ix - $px[$i];
-                    $dy = $iy - $py[$i];
-                    if ($dx == 0 && $dy == 0) continue;
-
-                    $r = sqrt($dx * $dx + $dy * $dy);
-                    if ($r > $rad[$i]) continue;
-
-                    $rscale = $amp[$i] * sin(3.14 * $r / $rad[$i]);
-                    $x += $dx * $rscale;
-                    $y += $dy * $rscale;
-                }
-
-                $c = $bgCol;
-                $x *= $this->iscale;
-                $y *= $this->iscale;
-
-                if ($x >= 0 && $x < $width2 && $y >= 0 && $y < $height2) {
-                    $c = imagecolorat($this->tmpimg, $x, $y);
-                }
-
-                if ($c != $bgCol) { // only copy pixels of letters to preserve any background image
-                    imagesetpixel($this->im, $ix, $iy, $c);
-                }
-            }
-        }
-    }
-
-    /**
-     * Create a code and save to the session
-     *
-     * @access private
-     * @since 1.0.1
-     *
-     */
-    public function createCode()
-    {
-        $this->code = false;
-
-        if ($this->use_wordlist && is_readable($this->wordlist_file)) {
-            $this->code = $this->readCodeFromFile();
-        }
-
-        if ($this->code == false) {
-            $this->code = $this->generateCode($this->code_length);
-        }
-
-        $this->saveData();
-    }
-
-    /**
-     * Generate a code
-     *
-     * @access private
-     * @param int $len  The code length
-     * @return string
-     */
-    public function generateCode($len)
-    {
-        $code = '';
-
-        for ($i = 1, $cslen = strlen($this->charset); $i <= $len; ++$i) {
-            $code .= $this->charset{rand(0, $cslen - 1)};
-        }
-        return $code;
-    }
-
-    /**
-     * Reads a word list file to get a code
-     *
-     * @access private
-     * @since 1.0.2
-     * @return mixed  false on failure, a word on success
-     */
-    public function readCodeFromFile()
-    {
-        $fp = @fopen($this->wordlist_file, 'rb');
-        if (!$fp) return false;
-
-        $fsize = filesize($this->wordlist_file);
-        if ($fsize < 32) return false; // too small of a list to be effective
-
-        if ($fsize < 128) {
-            $max = $fsize; // still pretty small but changes the range of seeking
-        } else {
-            $max = 128;
-        }
-
-        fseek($fp, rand(0, $fsize - $max), SEEK_SET);
-        $data = fread($fp, 128); // read a random 128 bytes from file
-        fclose($fp);
-        $data = preg_replace("/\r?\n/", "\n", $data);
-
-        $start = strpos($data, "\n", rand(0, 100)) + 1; // random start position
-        $end   = strpos($data, "\n", $start);           // find end of word
-
-        return strtolower(substr($data, $start, $end - $start)); // return substring in 128 bytes
-    }
-
-    /**
-     * Output image to the browser
-     *
-     * @access private
-     *
-     */
-    public function output()
-    {
-        header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-        header("Last-Modified: " . gmdate("D, d M Y H:i:s") . "GMT");
-        header("Cache-Control: no-store, no-cache, must-revalidate");
-        header("Cache-Control: post-check=0, pre-check=0", false);
-        header("Pragma: no-cache");
-
-        switch ($this->image_type) {
-            case SI_IMAGE_JPEG:
-                header("Content-Type: image/jpeg");
-                imagejpeg($this->im, null, 90);
-                break;
-
-            case SI_IMAGE_GIF:
-                header("Content-Type: image/gif");
-                imagegif($this->im);
-                break;
-
-            default:
-                header("Content-Type: image/png");
-                imagepng($this->im);
-                break;
-        }
-
-        imagedestroy($this->im);
-        exit;
-    }
-
-    /**
-     * Get WAV or MP3 file data of the spoken code.<br />
-     * This is appropriate for output to the browser as audio/x-wav or audio/mpeg
-     *
-     * @since 1.0.1
-     * @return string  WAV or MP3 data
-     *
-     */
-    public function getAudibleCode($format = 'wav')
-    {
-        $letters = array();
-        $code    = $this->getCode();
-
-        if ($code == '') {
-            $this->createCode();
-            $code = $this->getCode();
-        }
-
-        for ($i = 0; $i < strlen($code); ++$i) {
-            $letters[] = $code{$i};
-        }
-
-        if ($format == 'mp3') {
-            return $this->generateMP3($letters);
-        } else {
-            return $this->generateWAV($letters);
-        }
-    }
-
-    /**
-     * Set the path to the audio directory.<br />
-     *
-     * @since 1.0.4
-     * @return bool true if the directory exists and is readble, false if not
-     */
-    public function setAudioPath($audio_directory)
-    {
-        if (is_dir($audio_directory) && is_readable($audio_directory)) {
-            $this->audio_path = $audio_directory;
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Save the code in the session
-     *
-     * @access private
-     *
-     */
-    public function saveData()
-    {
-        $_SESSION['securimage_code_value'] = strtolower($this->code);
-        $_SESSION['securimage_code_ctime'] = time();
-
-        $this->saveCodeToDatabase();
-    }
-
-    /**
-     * Validate the code to the user code
-     *
-     * @access private
-     *
-     */
-    public function validate()
-    {
-        // retrieve code from session, if no code exists check sqlite database if supported.
-
-        if (isset($_SESSION['securimage_code_value']) && trim($_SESSION['securimage_code_value']) != '') {
-            if ($this->isCodeExpired($_SESSION['securimage_code_ctime']) == false) {
-              $code = $_SESSION['securimage_code_value'];
-            }
-        } else if ($this->use_sqlite_db == true && function_exists('sqlite_open')) { // no code in session - may mean user has cookies turned off
-            $this->openDatabase();
-            $code = $this->getCodeFromDatabase();
-        } else {
-            // session code invalid or non-existant and code not found in sqlite db or sqlite is not available
-            $code = '';
-        }
-
-        $code               = trim(strtolower($code));
-        $code_entered       = trim(strtolower($this->code_entered));
-        $this->correct_code = false;
-
-        if ($code != '') {
-            if ($code == $code_entered) {
-              $this->correct_code = true;
-              $_SESSION['securimage_code_value'] = '';
-              $_SESSION['securimage_code_ctime'] = '';
-              $this->clearCodeFromDatabase();
-          }
-        }
-    }
-
-    /**
-     * Get the captcha code
-     *
-     * @since 1.0.1
-     * @return string
-     */
-    public function getCode()
-    {
-        if (isset($_SESSION['securimage_code_value']) && !empty($_SESSION['securimage_code_value'])) {
-            return strtolower($_SESSION['securimage_code_value']);
-        } else {
-            if ($this->sqlite_handle == false) $this->openDatabase();
-
-            return $this->getCodeFromDatabase(); // attempt to get from database, returns empty string if sqlite is not available or disabled
-        }
-    }
-
-    /**
-     * Check if the user entered code was correct
-     *
-     * @access private
-     * @return boolean
-     */
-    public function checkCode()
-    {
-        return $this->correct_code;
-    }
-
-    /**
-     * Generate a wav file by concatenating individual files
-     *
-     * @since 1.0.1
-     * @access private
-     * @param array $letters  Array of letters to build a file from
-     * @return string  WAV file data
-     */
-    public function generateWAV($letters)
-    {
-        $data_len    = 0;
-        $files       = array();
-        $out_data    = '';
-
-        foreach ($letters as $letter) {
-            $filename = $this->audio_path . strtoupper($letter) . '.wav';
-
-            $fp = fopen($filename, 'rb');
-
-            $file = array();
-
-            $data = fread($fp, filesize($filename)); // read file in
-
-            $header = substr($data, 0, 36);
-            $body   = substr($data, 44);
-
-
-            $data = unpack('NChunkID/VChunkSize/NFormat/NSubChunk1ID/VSubChunk1Size/vAudioFormat/vNumChannels/VSampleRate/VByteRate/vBlockAlign/vBitsPerSample', $header);
-
-            $file['sub_chunk1_id']   = $data['SubChunk1ID'];
-            $file['bits_per_sample'] = $data['BitsPerSample'];
-            $file['channels']        = $data['NumChannels'];
-            $file['format']          = $data['AudioFormat'];
-            $file['sample_rate']     = $data['SampleRate'];
-            $file['size']            = $data['ChunkSize'] + 8;
-            $file['data']            = $body;
-
-            if ( ($p = strpos($file['data'], 'LIST')) !== false) {
-                // If the LIST data is not at the end of the file, this will probably break your sound file
-                $info         = substr($file['data'], $p + 4, 8);
-                $data         = unpack('Vlength/Vjunk', $info);
-                $file['data'] = substr($file['data'], 0, $p);
-                $file['size'] = $file['size'] - (strlen($file['data']) - $p);
-            }
-
-            $files[] = $file;
-            $data    = null;
-            $header  = null;
-            $body    = null;
-
-            $data_len += strlen($file['data']);
-
-            fclose($fp);
-        }
-
-        $out_data = '';
-        for ($i = 0; $i < sizeof($files); ++$i) {
-            if ($i == 0) { // output header
-                $out_data .= pack('C4VC8', ord('R'), ord('I'), ord('F'), ord('F'), $data_len + 36, ord('W'), ord('A'), ord('V'), ord('E'), ord('f'), ord('m'), ord('t'), ord(' '));
-
-                $out_data .= pack('VvvVVvv',
-                16,
-                $files[$i]['format'],
-                $files[$i]['channels'],
-                $files[$i]['sample_rate'],
-                $files[$i]['sample_rate'] * (($files[$i]['bits_per_sample'] * $files[$i]['channels']) / 8),
-                ($files[$i]['bits_per_sample'] * $files[$i]['channels']) / 8,
-                $files[$i]['bits_per_sample'] );
-
-                $out_data .= pack('C4', ord('d'), ord('a'), ord('t'), ord('a'));
-
-                $out_data .= pack('V', $data_len);
-            }
-
-            $out_data .= $files[$i]['data'];
-        }
-
-        $this->scrambleAudioData($out_data, 'wav');
-        return $out_data;
-    }
-
-    /**
-     * Randomly modify the audio data to scramble sound and prevent binary recognition.<br />
-     * Take care not to "break" the audio file by leaving the header data intact.
-     *
-     * @since 2.0
-     * @access private
-     * @param $data Sound data in mp3 of wav format
-     */
-    public function scrambleAudioData(&$data, $format)
-    {
-        if ($format == 'wav') {
-            $start = strpos($data, 'data') + 4; // look for "data" indicator
-            if ($start === false) $start = 44;  // if not found assume 44 byte header
-        } else { // mp3
-            $start = 4; // 4 byte (32 bit) frame header
-        }
-
-        $start  += rand(1, 64); // randomize starting offset
-        $datalen = strlen($data) - $start - 256; // leave last 256 bytes unchanged
-
-        for ($i = $start; $i < $datalen; $i += 64) {
-            $ch = ord($data{$i});
-            if ($ch < 9 || $ch > 119) continue;
-
-            $data{$i} = chr($ch + rand(-8, 8));
-        }
-    }
-
-    /**
-     * Generate an mp3 file by concatenating individual files
-     * @since 1.0.4
-     * @access private
-     * @param array $letters  Array of letters to build a file from
-     * @return string  MP3 file data
-     */
-    public function generateMP3($letters)
-    {
-        $data_len    = 0;
-        $files       = array();
-        $out_data    = '';
-
-        foreach ($letters as $letter) {
-            $filename = $this->audio_path . strtoupper($letter) . '.mp3';
-
-            $fp   = fopen($filename, 'rb');
-            $data = fread($fp, filesize($filename)); // read file in
-
-            $this->scrambleAudioData($data, 'mp3');
-            $out_data .= $data;
-
-            fclose($fp);
-        }
-
-
-        return $out_data;
-    }
-
-    /**
-     * Generate random number less than 1
-     * @since 2.0
-     * @access private
-     * @return float
-     */
-    public function frand()
-    {
-        return 0.0001*rand(0,9999);
-    }
-
-    /**
-     * Print signature text on image
-     *
-     * @since 2.0
-     * @access private
-     *
-     */
-    public function addSignature()
-    {
-        if ($this->use_gd_font) {
-            imagestring($this->im, 5, $this->image_width - (strlen($this->image_signature) * 10), $this->image_height - 20, $this->image_signature, $this->gdsignaturecolor);
-        } else {
-
-            $bbox = imagettfbbox(10, 0, $this->signature_font, $this->image_signature);
-            $textlen = $bbox[2] - $bbox[0];
-            $x = $this->image_width - $textlen - 5;
-            $y = $this->image_height - 3;
-
-            imagettftext($this->im, 10, 0, $x, $y, $this->gdsignaturecolor, $this->signature_font, $this->image_signature);
-        }
-    }
-
-    /**
-     * Get hashed IP address of remote user
-     *
-     * @access private
-     * @since 2.0.1
-     * @return string
-     */
-    public function getIPHash()
-    {
-        return strtolower(md5($_SERVER['REMOTE_ADDR']));
-    }
-
-    /**
-     * Open SQLite database
-     *
-     * @access private
-     * @since 2.0.1
-     * @return bool true if database was opened successfully
-     */
-    public function openDatabase()
-    {
-        $this->sqlite_handle = false;
-
-        if ($this->use_sqlite_db && function_exists('sqlite_open')) {
-            $this->sqlite_handle = sqlite_open($this->sqlite_database, 0666);
-
-            if ($this->sqlite_handle !== false) {
-                $res = sqlite_query($this->sqlite_handle, "PRAGMA table_info(codes)");
-                if (sqlite_num_rows($res) == 0) {
-                  sqlite_query($this->sqlite_handle, "CREATE TABLE codes (iphash VARCHAR(32) PRIMARY KEY, code VARCHAR(32) NOT NULL, created INTEGER)");
-                }
-            }
-
-            return $this->sqlite_handle != false;
-        }
-
-        return $this->sqlite_handle;
-    }
-
-    /**
-     * Save captcha code to sqlite database
-     *
-     * @access private
-     * @since 2.0.1
-     * @return bool true if code was saved, false if not
-     */
-    public function saveCodeToDatabase()
-    {
-        $success = false;
-
-        $this->openDatabase();
-
-        if ($this->use_sqlite_db && $this->sqlite_handle !== false) {
-            $ip = $this->getIPHash();
-            $time = time();
-            $code = $_SESSION['securimage_code_value']; // hash code for security - if cookies are disabled the session still exists at this point
-            $success = sqlite_query($this->sqlite_handle, "INSERT OR REPLACE INTO codes(iphash, code, created) VALUES('$ip', '$code', $time)");
-        }
-
-        return $success !== false;
-    }
-
-    /**
-     * Get stored captcha code from sqlite database based on ip address hash
-     *
-     * @access private
-     * @since 2.0.1
-     * @return string captcha code
-     */
-    public function getCodeFromDatabase()
-    {
-    $code = '';
-
-    if ($this->use_sqlite_db && $this->sqlite_handle !== false) {
-        $ip = $this->getIPHash();
-
-        $res = sqlite_query($this->sqlite_handle, "SELECT * FROM codes WHERE iphash = '$ip'");
-        if ($res && sqlite_num_rows($res) > 0) {
-            $res = sqlite_fetch_array($res);
-
-            if ($this->isCodeExpired($res['created']) == false) {
-                $code = $res['code'];
-            }
-        }
-    }
-
-    return $code;
-    }
-
-    /**
-     * Delete a code from the database by ip address hash
-     *
-     * @access private
-     * @since 2.0.1
-     */
-    public function clearCodeFromDatabase()
-    {
-        if ($this->sqlite_handle !== false) {
-            $ip = $this->getIPHash();
-
-            sqlite_query($this->sqlite_handle, "DELETE FROM codes WHERE iphash = '$ip'");
-        }
-    }
-
-    /**
-     * Purge codes over a day old from database
-     *
-     * @access private
-     * @since 2.0.1
-     */
-    public function purgeOldCodesFromDatabase()
-    {
-        if ($this->use_sqlite_db && $this->sqlite_handle !== false) {
-            $now   = time();
-            $limit = (!is_numeric($this->expiry_time) || $this->expiry_time < 1) ? 86400 : $this->expiry_time;
-
-            sqlite_query($this->sqlite_handle, "DELETE FROM codes WHERE $now - created > $limit");
-        }
-    }
-
-    /**
-     * Check a code to see if it is expired based on creation time
-     *
-     * @access private
-     * @since 2.0.1
-     * @param $creation_time unix timestamp of code creation time
-     * @return bool true if code has expired, false if not
-     */
-    public function isCodeExpired($creation_time)
-    {
-        $expired = true;
-
-        if (!is_numeric($this->expiry_time) || $this->expiry_time < 1) {
-            $expired = false;
-        } else if (time() - $creation_time < $this->expiry_time) {
-            $expired = false;
-        }
-
-        return $expired;
-    }
-
-} /* class Securimage */
-
-
-/**
- * Color object for Securimage CAPTCHA
- *
- * @since 2.0
- * @package Securimage
- * @subpackage classes
- *
- */
-class Securimage_Color
-{
-    /**
-     * Red component: 0-255
-     *
-     * @var int
-     */
-    public $r;
-    /**
-     * Green component: 0-255
-     *
-     * @var int
-     */
-    public $g;
-    /**
-     * Blue component: 0-255
-     *
-     * @var int
-     */
-    public $b;
-
-    /**
-     * Create a new Securimage_Color object.<br />
-     * Specify the red, green, and blue components using their HTML hex code equivalent.<br />
-     * Example: The code for the HTML color #4A203C is:<br />
-     * $color = new Securimage_Color(0x4A, 0x20, 0x3C);
-     *
-     * @param $red int|String Red component 0-255
-     * @param $green int Green component 0-255
-     * @param $blue int Blue component 0-255
-     */
-    public function __construct($red, $green = null, $blue = null)
-    {
-        if ($green == null && $blue == null && preg_match('/^#[a-f0-9]{3,6}$/i', $red)) {
-            $col = substr($red, 1);
-            if (strlen($col) == 3) {
-                $red   = str_repeat(substr($col, 0, 1), 2);
-                $green = str_repeat(substr($col, 1, 1), 2);
-                $blue  = str_repeat(substr($col, 2, 1), 2);
-            } else {
-                $red   = substr($col, 0, 2);
-                $green = substr($col, 2, 2);
-                $blue  = substr($col, 4, 2);
-            }
-
-            $red   = hexdec($red);
-            $green = hexdec($green);
-            $blue  = hexdec($blue);
-        } else {
-            if ($red < 0) $red       = 0;
-            if ($red > 255) $red     = 255;
-            if ($green < 0) $green   = 0;
-            if ($green > 255) $green = 255;
-            if ($blue < 0) $blue     = 0;
-            if ($blue > 255) $blue   = 255;
-        }
-
-        $this->r = $red;
-        $this->g = $green;
-        $this->b = $blue;
-    }
-}
diff --git a/core/src/core/compat.php b/core/src/core/compat.php
new file mode 100644
index 0000000000..290429d671
--- /dev/null
+++ b/core/src/core/compat.php
@@ -0,0 +1,30 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+class_alias("Pydio\\Access\\Core\\Filter\\AJXP_Permission", "AJXP_Permission", true);
+class_alias("Pydio\\Access\\Core\\Filter\\AJXP_PermissionMask", "AJXP_PermissionMask", true);
+class_alias("Pydio\\Access\\Core\\Model\\AJXP_Node", "AJXP_Node", true);
+class_alias("Pydio\\Conf\\Core\\AJXP_Role", "AJXP_Role", true);
+class_alias("Pydio\\Access\\Core\\Model\\Repository", "Repository", true);
+class_alias("Pydio\\Access\\Core\\Filter\\ContentFilter", "ContentFilter", true);
+class_alias("Pydio\\Notification\\Core\\Notification", "AJXP_Notification", true);
\ No newline at end of file
diff --git a/core/src/core/composer.json b/core/src/core/composer.json
new file mode 100644
index 0000000000..02b5015e95
--- /dev/null
+++ b/core/src/core/composer.json
@@ -0,0 +1,26 @@
+{
+  "name" : "pydio/core",
+  "autoload": {
+    "psr-4": {
+      "Pydio\\Core\\": "./src/pydio/Core",
+      "Pydio\\Tests\\": "./src/pydio/Tests"
+    }
+  },
+  "require": {
+    "zendframework/zend-diactoros": "~1.0",
+    "guzzlehttp/guzzle": "~5",
+    "guzzlehttp/command": "~0.7",
+    "guzzlehttp/guzzle-services": "~0.5",
+    "gimler/guzzle-description-loader" : "*",
+    "commerceguys/guzzle-oauth2-plugin": "~2.0",
+    "nikic/fast-route":"~1.0",
+    "symfony/console":"^3.0",
+    "davegardnerisme/nsqphp": "dev-master",
+    "sabre/dav":"1.8.10",
+    "aws/aws-sdk-php": "^3.19.4",
+    "meenie/javascript-packer":"1.1",
+    "dapphp/securimage":"3.6.4",
+    "phpseclib/phpseclib":"2.0.3"
+  }
+
+}
\ No newline at end of file
diff --git a/core/src/core/doc/CREDITS-ONLY.txt b/core/src/core/doc/CREDITS-ONLY.txt
new file mode 100644
index 0000000000..89fb292ca1
--- /dev/null
+++ b/core/src/core/doc/CREDITS-ONLY.txt
@@ -0,0 +1,57 @@
+<h4>Pydio Core License</h4>
+<u>Pydio Core</u> is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+Pydio Core 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 Affero General Public License for more details.
+You should have received a copy of the GNU Affero General Public License along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+
+<h4>Contributors</h4>
+Cyril Russo : public links generation
+Panni (support for folder upload using jumploader, support for contextmenu in Opera)
+German : panzaeron
+Catalon : Joan
+Other translators : see mention in translation files
+Shorten.multi plugin by Miguelon
+Ultreia many fixes
+Thomas Nicot (UX or Orbit Theme): http://resetandplay.com/
+Others bugfixes and translations:
+Tran The Cuong, Nicolas Pouliquen, Pär Strindevall, Martin Schaible, Lawrence Ho,
+Arnold van Blanken, Marco De Pardi, Anael Mobilia, Dmitri Bosenko, Florian Vogt,
+Gerrit Pannek, Max Ruman, Stefan Huber, Christian Foellmann, John Regan, Sylvain Mandon,
+Gerald Me, Matthieu Simon, Florian Huwyler, Aaron Guggisberg, Stefan Wüthrich, Teki Imai,
+Nicola Mustone, Mike Rhuner, Mike Smorul, Pablo Daniel Rey, Steve Ludovicy, Lukasz Lis.
+Garnetius
+
+<h4>Third Party Library</h4>
+<h5>Amazon S3</h5>
+    S3 Stream Wrapper is released under the BSD license, Copyright 2011 P'unk Avenue LLC http://punkave.com/
+
+<h5>JavaScript</h5>
+	Prototype, Scriptaculous http://www.prototypejs.org/, http://script.aculo.us/ (MIT)
+	Modernizr 	http://modernizr.com (BSD / MIT)
+	Webfx widgets (selectable, sortable, xtree) : http://webfx.eae.net/ (Apache 2)
+	Chosen selector by Patrick Filler for Harvest (MIT): https://github.com/harvesthq/chosen
+	PDFJS library is provided by the Mozilla Foundation (Apache 2): http://mozilla.github.io/pdf.js/
+
+<h5>Images and Fonts</h5>
+	Oxygen : http://www.oxygen-icons.org/ (Creative Common SA 3.0 / LGPL)
+	Font Awesome by Dave Gandy : http://fortawesome.github.com/Font-Awesome/ (SIL Open Font License)
+	Open Sans by Steve Matteson : http://www.opensans.com/ (Apache Licence v2)
+	Background Photos : from http://unsplash.com/,
+	Embedded photos credits: http://www.gratisography.com/, Nick West, Martin Staněk, Sonja Langford
+	Folders & Files icons in Orbit Theme, by Ionic : http://ionicons.com/ (MIT License)
+
+<h5>Core PHP Classes</h5>
+    Dibi ORM: Copyright (c) 2004, 2014 David Grudl (http://davidgrudl.com) All rights reserved. (New BSD)
+	SabreDAV Library http://code.google.com/p/sabredav (New BSD)
+	SECURIMAGE http://www.phpcaptcha.org/ (LGPL)
+	Pclzip : http://www.phpconcept.net/pclzip/ (LGPL)
+
+<h5>Plugins</h5>
+	PThumb.php http://www.phpclasses.org (LPGL)
+	OpenLayers http://www.openlayers.org (BSD)
+	Video-js http://www.videojs.com/ (LGPL)
+	Zend Lucene http://www.zend.com/ (New BSD)
+	svn_lib.inc (LGPL)
+	PhpMailer-Lite http://phpmailer.sourceforge.net (LGPL)
+	Mp3 Player : http://www.alsacreations.fr/mp3-dewplayer.html
+	SoundManager : http://www.schillmania.com/projects/soundmanager2/ (BSD)
+	CAS Driver (Apache 2): https://github.com/Jasig/phpCAS
\ No newline at end of file
diff --git a/core/src/core/doc/CREDITS.txt b/core/src/core/doc/CREDITS.txt
index b22c3cae82..37f220609e 100644
--- a/core/src/core/doc/CREDITS.txt
+++ b/core/src/core/doc/CREDITS.txt
@@ -1,6 +1,6 @@
 <img src="plugins/gui.ajax/PydioLogo250.png"/>
 <div style="padding-left:10px;"><div style="font-size:0.8em;">Version __AJXP_VERSION__ - __AJXP_VERSION_DATE__
-Copyright 2007-2014 Abstrium SAS
+Copyright 2007-2016 Abstrium SAS
 The latest code can be found at https://pydio.com/.
 </div>
 ++ Getting Help ++
diff --git a/core/src/core/doc/PREVIOUS_RELEASES b/core/src/core/doc/PREVIOUS_RELEASES
index 01c5d06ed6..3616a0129c 100644
--- a/core/src/core/doc/PREVIOUS_RELEASES
+++ b/core/src/core/doc/PREVIOUS_RELEASES
@@ -2347,7 +2347,7 @@ Rework "regexp" in listUsersPaginated / getUsersCount in class.sqlAuthDriver.php
 Use HTML base tag instead of the previous complicated "travel_path_to_root" mechanism...
 New access point for managing users self-service operations (currently reset password)
 Make custom sort function to make sure users are sorted (fix #279)
-New variable AJXP_SANITIZE_FILENAME, to be less restrictive on the allowed characters than AJXP_SANITIZE_HTML_STRICT. Particularly, allow commas in filename.
+New variable InputFilter::SANITIZE_FILENAME, to be less restrictive on the allowed characters than InputFilter::SANITIZE_HTML_STRICT. Particularly, allow commas in filename.
 Login: trim username and password to avoid trailing and ending white space problems
 Better API for get_my_feed. Ability to force recycle_bin creation in workspace share
 Add node.share.create hooks
@@ -2564,7 +2564,7 @@ preg_replace(): The /e modifier is deprecated in PHP5.5
 Fix #404
 Fix #392, by adding PRE and POST callbacks to PclZip
 skipSecureToken actions were not taken into accounts in external files.
-Disable at last native autocompletion on share dialog, by removing name attribute. Styling of the Minisite, customize Logo Always sanitize user names as AJXP_SANITIZE_EMAILCHARS Users dashboard, revert styling of FetchedResultPane, was ugly. To be improved still.
+Disable at last native autocompletion on share dialog, by removing name attribute. Styling of the Minisite, customize Logo Always sanitize user names as InputFilter::SANITIZE_EMAILCHARS Users dashboard, revert styling of FetchedResultPane, was ugly. To be improved still.
 Detect if minisite logo is a binary or a real filepath
 Fix log.sql for ipv6 logging
 Add a paddingBottom when FilesList is in gridMode, to avoid hiding last line with scrollbar, fix #172
@@ -2861,7 +2861,7 @@ serialized data can contain null bytes, store them in blob (details)
 New functions in to be implemented by conf plugins (save/load/clearTemporaryKey, pruneTemporaryKeys) (details)
 Replace AJXP_REBASE if present in the html templates and passed in START_PARAMETERS (details)
 FS: Pass __AJXP_ZIP_FLAT__ to makeZip function to force all files to be at level 0 Fix tabulator et splitter resizing issues Download Cart. (details)
-New variable AJXP_SANITIZE_FILENAME, to be less restrictive on the allowed characters than AJXP_SANITIZE_HTML_STRICT. Particularly, allow commas in filename. (details)
+New variable InputFilter::SANITIZE_FILENAME, to be less restrictive on the allowed characters than InputFilter::SANITIZE_HTML_STRICT. Particularly, allow commas in filename. (details)
 New invisibleBar, and autoFoldOnEvent options on Splitter New tabsTips option on Tabulator Fix simpleTooltip positioning and style Rework layout here and there, implements the new behaviours, still to be tested and validated. (details)
 Expand and fix widgets, add a mode for horizontal tabulator positioning. (details)
 
diff --git a/core/src/core/doc/api2.json b/core/src/core/doc/api2.json
new file mode 100644
index 0000000000..d1015d58e1
--- /dev/null
+++ b/core/src/core/doc/api2.json
@@ -0,0 +1 @@
+{"swagger":"2.0","host":"localhost","schemes":["http"],"basePath":"/api/v2","info":{"version":"2.0.0","title":"Pydio API V2","description":"Access to a Pydio Server. Second version of the API."},"paths":{"/fs/{path}":{"get":{"x-pydio-action":"ls","description":"Get information about a node and its metadata. By default, it will return \nPydio \"primary\" metadata (stat, internal informations). Extended metadata can\nbe added by some plugins.  \nFor collections (folders), pass the **children** parameter to list its content.  \nTo access the actual content of the nodes, see the I/O API.\n","operationId":"getNodeInfos","parameters":[{"$ref":"#/parameters/pathParameter"},{"name":"meta","in":"query","description":"Level of precision for expected metadata","type":"string","enum":["minimal","standard","extended"],"required":true,"default":"standard"},{"name":"children","in":"query","description":"Load children if node is a collection","required":false,"type":"string","enum":["dfz","d","df","f","fz","z","dz"]},{"name":"recursive","in":"formData","description":"If requiring children, load grandchildren recursively","type":"boolean","required":false},{"name":"max_depth","in":"formData","description":"If requiring children recursively, stop at the given depth. If -1, no limit.","type":"integer","required":false,"default":-1},{"name":"max_nodes","in":"formData","description":"If requiring children recursively, stop at the given depth. If -1, no limit.","type":"integer","required":false,"default":-1},{"name":"remote_order","in":"formData","description":"Apply server-side sorting","type":"boolean","required":false,"default":false},{"name":"order_column","in":"formData","description":"Order column to use for server-side sorting","type":"string","required":false},{"name":"order_direction","in":"formData","description":"Order direction to use for server-side sorting (asc or desc)","type":"string","required":false},{"name":"page_position","in":"formData","description":"For a single file, try to detect the page position in the parent node listing.","type":"boolean","required":false,"default":false},{"name":"X-Indexation-Required","in":"header","description":"Invalidate current index and trigger a background indexation","type":"boolean","required":false}],"produces":["application/json","application/xml"],"responses":{"200":{"description":"Successful response","schema":{"$ref":"#/definitions/NodeList"}}},"tags":["File"]},"post":{"x-pydio-action":"fs_create_resource","description":"Create new resources or move/copy existing resources:\n+ Create a new folder (pass a path **with a trailing slash**), or a new empty file (no trailing slash).\n+ Copy a resource to a new destination: pass destination as {path}, and origin via copy_from parameter.\n+ Rename / Move a resource : basically a copy operation followed by a delete of original\n","operationId":"createNode","parameters":[{"$ref":"#/parameters/pathParameter"},{"name":"copy_source","in":"query","description":"If it's a move or a copy, indicated the path of the original node. Path must contain the original workspace Id, as it can be used for cross repository copy as well.","type":"string","required":false},{"name":"delete_source","in":"query","description":"If it's a move/rename, will remove original after copy operation","required":false,"type":"boolean"},{"name":"override","in":"query","description":"Ignore existing resource and override it","required":false,"type":"boolean","default":false},{"name":"recursive","in":"query","description":"For directories, create parents if necessary","required":false,"type":"boolean","default":false}],"produces":["application/json","application/xml"],"responses":{"200":{"description":"Successful response","schema":{"$ref":"#/definitions/PydioResponse"}}},"tags":["File"]},"patch":{"x-pydio-action":"fs_update_metadata","description":"Update existing resources metadata (see I/O for content modification). Basic metadata is provided by core plugins, but they can be extended by other plugins.\nFor example :\n`{\"core\": {\"chmod\": 777}}, {\"user_meta\":[{\"metaName\":\"metaValue\"}]}`\n`{\"bookmarks\":{\"bookmarked\": true}, \"locks\":{\"locked\":true}, \"meta.watch\":{\"watch\":true}}`\netc...\n","operationId":"updateNode","parameters":[{"$ref":"#/parameters/pathParameter"},{"name":"metadata","in":"formData","description":"Json-serialized metadata to update","type":"string","required":true}],"produces":["application/json","application/xml"],"responses":{"200":{"description":"Successful response","schema":{"$ref":"#/definitions/PydioResponse"}}},"tags":["File"]},"delete":{"x-pydio-action":"delete","description":"Delete existing resource\n","operationId":"deleteNode","parameters":[{"$ref":"#/parameters/pathParameter"}],"produces":["application/json","application/xml"],"responses":{"200":{"description":"Successful response","schema":{"$ref":"#/definitions/PydioResponse"}}},"tags":["File"]}},"/io/{path}":{"get":{"x-pydio-action":"download","description":"Get resource content. Depending on the attachment parameter, will try to either trigger a download, or send binary stream with appropriate headers. Depending on the active plugins, may be able to serve: + Plain text + MP3/Wav Stream + MP4 Stream + On-the-fly generated images + On-the-fly generated thumbnails for images or pdf\n","operationId":"download","parameters":[{"$ref":"#/parameters/pathParameter"},{"name":"attachment","in":"query","description":"if set, send back a force-download, otherwise use Accept header to try to find the best response Content-Type.","type":"boolean","required":false},{"name":"additional_parameters","in":"query","description":"some plugin can take more parameters to send various contents\nderived from main resource. For example, for images, you can pass\nget_thumb & dimension\n","type":"string","required":false}],"produces":["application/octet-stream"],"responses":{"200":{"description":"Successful Response","schema":{"type":"file"}}},"tags":["File"]},"put":{"x-pydio-action":"upload","description":"Create resource by posting to Input Stream\n","operationId":"uploadStream","parameters":[{"$ref":"#/parameters/pathParameter"},{"name":"inputStream","in":"body","description":"binary data","required":true,"schema":{"$ref":"#/definitions/InputStream"}}],"responses":{"200":{"description":"Successful Response","schema":{"$ref":"#/definitions/PydioResponse"}}},"tags":["File"]},"post":{"x-pydio-action":"upload","description":"Create resource by posting via form Data\n","operationId":"upload","consumes":["multipart/form-data"],"parameters":[{"$ref":"#/parameters/pathParameter"},{"name":"userfile_0","in":"formData","description":"File to upload","required":true,"type":"file"}],"responses":{"200":{"description":"Successful Response","schema":{"$ref":"#/definitions/PydioResponse"}}},"tags":["File"]},"patch":{"x-pydio-action":"upload","description":"Update existing resource via form Data\n","operationId":"appendData","consumes":["multipart/form-data"],"parameters":[{"$ref":"#/parameters/pathParameter"},{"name":"append","in":"formData","description":"wether to replace content or append at the end of the existing resource","required":true,"default":true,"type":"boolean"},{"name":"userfile_0","in":"formData","description":"File to upload","required":true,"type":"file"}],"responses":{"200":{"description":"Successful Response","schema":{"$ref":"#/definitions/PydioResponse"}}},"tags":["File"]}},"/tasks":{"get":{"description":"List tasks currently running on the server (and visible to the current user).\n","operationId":"listTasks","x-pydio-plugin":"core.tasks","x-pydio-action":"tasks_list","parameters":[{"name":"filter","in":"formData","description":"additional filters for task listing (JSON serialized)","type":"string","required":false},{"$ref":"#/parameters/workspaceIdFormParameter"},{"$ref":"#/parameters/nodeSelectionParameter"}],"responses":{"200":{"description":"Successful Response","schema":{"type":"array","items":{"$ref":"#/definitions/Task"}}}},"tags":["Task"]}},"/tasks/{taskId}":{"get":{"description":"Get information about a currently running task Id\n","operationId":"getTaskInfo","x-pydio-plugin":"core.tasks","x-pydio-action":"task_info","parameters":[{"name":"taskId","in":"path","description":"Task to monitor on the server","type":"string","required":true}],"responses":{"200":{"description":"Successful Response","schema":{"$ref":"#/definitions/Task"}}},"tags":["Task"]},"post":{"description":"Create a task on the server. This will generally trigger a server-side background \"Task\", which ID will be returned in the PydioResponse['tasks'] array\n","operationId":"createTask","x-pydio-plugin":"core.tasks","x-pydio-action":"task_create","consumes":["application/json"],"parameters":[{"name":"taskId","in":"path","description":"Task to launch on the server","type":"string","required":true},{"name":"request_body","in":"body","description":"JSON Task object","schema":{"$ref":"#/definitions/Task"}}],"responses":{"200":{"description":"Successful Response","schema":{"$ref":"#/definitions/Task"}}},"tags":["Task"]},"patch":{"description":"Update a task on the server.\n","operationId":"updateTask","x-pydio-plugin":"core.tasks","x-pydio-action":"task_update","consumes":["application/json"],"parameters":[{"name":"taskId","in":"path","description":"Task to update on the server","type":"string","required":true},{"name":"request_body","in":"body","description":"JSON Diff describing the patches to apply on the task object","schema":{"$ref":"#/definitions/Task"}}],"responses":{"200":{"description":"Successful Response","schema":{"$ref":"#/definitions/Task"}}},"tags":["Task"]},"delete":{"description":"Update a task on the server.\n","operationId":"deleteTask","x-pydio-plugin":"core.tasks","x-pydio-action":"task_delete","parameters":[{"name":"taskId","in":"path","description":"Task to delete on the server","type":"string","required":true}],"responses":{"200":{"description":"Successful Response","schema":{"$ref":"#/definitions/Task"}}},"tags":["Task"]}},"/user":{"get":{"description":"List accessible workspace for currently logged user. Alias for /state/?xPath=user/repositories\n","operationId":"userInfo","produces":["application/json"],"x-pydio-plugin":"core.conf","x-pydio-action":"user_state","responses":{"200":{"description":"Successful Response","schema":{"type":"object"}}},"tags":["User Account"]}},"/user/workspaces":{"get":{"description":"List accessible workspace for currently logged user. Alias for /state/?xPath=user/repositories\n","operationId":"userWorkspaces","produces":["application/json"],"x-pydio-plugin":"core.conf","x-pydio-action":"user_state","responses":{"200":{"description":"Successful Response","schema":{"type":"object"}}},"tags":["User Account"]}},"/user/preferences":{"get":{"description":"List accessible workspace for currently logged user. Alias for /state/?xPath=user/preferences\n","operationId":"userPreferences","produces":["application/json"],"x-pydio-plugin":"core.conf","x-pydio-action":"user_state","responses":{"200":{"description":"Successful Response","schema":{"type":"object"}}},"tags":["User Account"]}},"/workspaces/{workspaceId}":{"get":{"description":"Get information about the given workspace.\nInfo can be gathered via various plugins. Pass the expected metadata type via the X-Pydio-Ws-Info header. Currently supported values are quota|info|changes\n","operationId":"getWorkspaceInfo","produces":["application/json"],"parameters":[{"name":"X-Pydio-WS-Info","in":"header","required":true,"type":"string","enum":["quota","info"]},{"$ref":"#/parameters/workspaceIdParameter"}],"x-pydio-plugin":"core.conf","x-pydio-action":"load_repository_info","responses":{"200":{"description":"Successful Response","schema":{"type":"object","properties":{"USAGE":{"type":"integer"},"TOTAL":{"type":"integer"}}}}},"tags":["Workspace"]}},"/workspaces/{workspaceId}/changes/{sequenceId}":{"get":{"description":"Sends back all changes since a given sequence ID.  \n\nThis plugin requires **meta.syncable** active on the workspace.\n","operationId":"changes","produces":["application/json"],"parameters":[{"name":"sequenceId","in":"path","description":"File to upload","required":true,"type":"integer"},{"$ref":"#/parameters/workspaceIdParameter"}],"x-pydio-plugin":"meta.syncable","x-pydio-action":"changes","responses":{"200":{"description":"Successful Response","schema":{"type":"array","items":{"type":"object","properties":{"seq_id":{"type":"integer"},"node":{"$ref":"#/definitions/Node"}}}}}},"tags":["Workspace"]}},"/admin/roles":{"get":{"x-pydio-action":"ls","description":"List roles\n","operationId":"getRoles","produces":["application/json","application/xml"],"responses":{"200":{"description":"A list of roles represented as standard nodes","schema":{"$ref":"#/definitions/NodeList"}}},"tags":["Provisioning"]}},"/admin/roles/{roleId}":{"get":{"x-pydio-action":"edit_role","description":"Get Role by Id\n","operationId":"getRole","parameters":[{"name":"roleId","in":"path","description":"Id of the role to load","type":"string","required":true},{"name":"load_fill_values","in":"query","description":"Load additional data to build a form for editing this role","type":"boolean","required":false}],"produces":["application/json"],"responses":{"200":{"description":"Successful response","schema":{"$ref":"#/definitions/Role"}}},"tags":["Provisioning"]},"delete":{"x-pydio-action":"delete","description":"Delete Role by Id\n","operationId":"deleteRole","parameters":[{"name":"roleId","in":"path","description":"Id of the role to delete","type":"string","required":true}],"produces":["application/json"],"responses":{"200":{"description":"Successful response","schema":{"$ref":"#/definitions/PydioResponse"}}},"tags":["Provisioning"]},"post":{"x-pydio-action":"create_role","description":"Create a new role with this ID\n","operationId":"createRole","parameters":[{"name":"roleId","in":"path","description":"Id of the role to load","type":"string","required":true},{"name":"role","in":"body","schema":{"$ref":"#/definitions/Role"},"description":"JSON description of the new role","required":true}],"produces":["application/json"],"consumes":["application/json"],"responses":{"200":{"description":"Successful response","schema":{"$ref":"#/definitions/Role"}}},"tags":["Provisioning"]},"patch":{"x-pydio-action":"post_json_role","description":"Update the role\n","operationId":"updateRole","parameters":[{"name":"roleId","in":"path","description":"Id of the role to load","type":"string","required":true},{"name":"role","in":"body","schema":{"$ref":"#/definitions/Role"},"description":"JSON description of the new role","required":true}],"produces":["application/json"],"consumes":["application/json"],"responses":{"200":{"description":"Successful response","schema":{"$ref":"#/definitions/Role"}}},"tags":["Provisioning"]}},"/admin/people/{path}":{"get":{"x-pydio-action":"ls","description":"List roles\n","operationId":"getPeople","produces":["application/json","application/xml"],"parameters":[{"$ref":"#/parameters/peopleParameterOptional"},{"name":"list","in":"query","description":"list children of the current resource","type":"boolean","default":true}],"responses":{"200":{"description":"A user/group or list of users and groups","schema":{"$ref":"#/definitions/NodeList"}}},"tags":["Provisioning"]},"delete":{"x-pydio-action":"people-delete-resource","description":"Delete Role by Id\n","operationId":"deletePeople","parameters":[{"$ref":"#/parameters/peopleParameter"}],"produces":["application/json"],"responses":{"200":{"description":"Successful response","schema":{"$ref":"#/definitions/PydioResponse"}}},"tags":["Provisioning"]},"post":{"x-pydio-action":"people-create-resource","description":"Create a new user or a new group with this path. To create a user,  make sure to pass a userPass parameter. Otherwise it will create a  group.\n","operationId":"createPeople","parameters":[{"$ref":"#/parameters/peopleParameter"},{"name":"resourceType","in":"formData","type":"string","enum":["user","group"],"description":"Wether it's a user or a group","required":true},{"name":"groupLabel","in":"formData","type":"string","description":"Label of the new group if we are creating a group","required":false},{"name":"userPass","in":"formData","type":"string","description":"Password of the new user if we are creating a user","required":false}],"produces":["application/json"],"consumes":["application/json"],"responses":{"200":{"description":"Successful response","schema":{"$ref":"#/definitions/PydioResponse"}}},"tags":["Provisioning"]},"patch":{"x-pydio-action":"people-patch-resource","description":"Update user or group specific data with this path. Use resourceType parameter to discriminate, and send a parameterName/parameterValue couple to be patched.\n\nAuthorized parameterName values are described below, along with the parameterValue corresponding specification: \n- For groups\n  - groupLabel : relabel an existing group\n- For users\n  - userPass: change user password\n  - userProfile: update user profile\n  - userLock: set/remove a lock on a user. Value must be a lockname:lockvalue string where lockvalue is \"true\" or \"fale\".\n  - userRoles: Bunch update roles, eventually reorder them, as a JSON encoded array.\n  - userAddRole: add a role to the user\n  - userRemoveRole: remove a role currently applied to the user.\n  - userPreferences: a JSON associative array of key/values to update.\n\nTo edit user/group permissions or parameters, use the role api instead,  using the object specific role_id (AJXP_GRP_/groupPath or AJXP_USR_/userId).\n","operationId":"patchPeople","parameters":[{"$ref":"#/parameters/peopleParameter"},{"name":"resourceType","in":"query","type":"string","enum":["user","group"],"description":"Wether it's a user or a group","required":true},{"name":"patch-tuple","in":"body","schema":{"$ref":"#/definitions/PeoplePatch"},"description":"parameterName / parameterValue association","required":true}],"produces":["application/json"],"consumes":["application/json"],"responses":{"200":{"description":"Successful response","schema":{"$ref":"#/definitions/PydioResponse"}}},"tags":["Provisioning"]}},"/admin/workspaces":{"get":{"x-pydio-action":"ls","description":"List Workspaces\n","operationId":"adminListWorkspaces","produces":["application/json","application/xml"],"responses":{"200":{"description":"A list of workspaces represented as standard nodes","schema":{"$ref":"#/definitions/NodeList"}}},"tags":["Provisioning"]},"post":{"x-pydio-action":"post_repository","description":"NOT IMPLEMENTED YET - Create a workspace from scratch\n","operationId":"adminCreateWorkspace","parameters":[{"name":"payload","in":"body","description":"Repository details","schema":{"$ref":"#/definitions/AdminWorkspace"},"required":true}],"produces":["application/json","application/xml"],"responses":{"200":{"description":"Workspace object","schema":{"$ref":"#/definitions/AdminWorkspace"}}},"tags":["Provisioning"]}},"/admin/workspaces/{workspaceId}":{"get":{"x-pydio-action":"edit_repository","description":"Load detail of a workspace\n","operationId":"adminGetWorkspace","parameters":[{"name":"workspaceId","in":"path","description":"Id or Alias / Load detail of this workspace","type":"string","required":true},{"name":"load_fill_values","in":"query","description":"Load additional data to build a form for editing this role","type":"boolean","required":false}],"produces":["application/json","application/xml"],"responses":{"200":{"description":"Workspace object","schema":{"$ref":"#/definitions/AdminWorkspace"}}},"tags":["Provisioning"]},"delete":{"x-pydio-action":"delete","description":"Load detail of a workspace\n","operationId":"adminDeleteWorkspace","parameters":[{"name":"workspaceId","in":"path","description":"Id or Alias / Load detail of this workspace","type":"string","required":true}],"produces":["application/json","application/xml"],"responses":{"200":{"description":"Confirmation response","schema":{"$ref":"#/definitions/PydioResponse"}}},"tags":["Provisioning"]},"patch":{"x-pydio-action":"patch_repository","description":"NOT IMPLEMENTED YET - Edit details of a workspace\n","operationId":"adminEditWorkspace","parameters":[{"name":"workspaceId","in":"path","description":"Id or Alias / Update details for this workspace","type":"string","required":true},{"name":"payload","in":"body","description":"Repository details","schema":{"$ref":"#/definitions/AdminWorkspace"},"required":true}],"produces":["application/json","application/xml"],"responses":{"200":{"description":"Workspace object","schema":{"$ref":"#/definitions/AdminWorkspace"}}},"tags":["Provisioning"]}},"/admin/workspaces/{workspaceId}/features/{metaId}":{"post":{"x-pydio-action":"meta_source_add","description":"Add a metasource\n","operationId":"adminAddWorkspaceFeature","parameters":[{"name":"workspaceId","in":"path","description":"id or alias of this workspace","type":"string","required":true},{"name":"metaId","in":"path","description":"plugin id for new meta","type":"string","required":true},{"name":"parameters","in":"body","description":"Meta source parameters","schema":{"$ref":"#/definitions/MetaSourceParameters"},"required":true}],"produces":["application/json","application/xml"],"responses":{"200":{"description":"Workspace object","schema":{"$ref":"#/definitions/PydioResponse"},"examples":{"application/json":{"message":"Succesfully added metasource"}}}},"tags":["Provisioning"]},"patch":{"x-pydio-action":"meta_source_edit","description":"Edit a metasource\n","operationId":"adminEditWorkspaceFeature","parameters":[{"name":"workspaceId","in":"path","description":"id or alias of this workspace","type":"string","required":true},{"name":"metaId","in":"path","description":"plugin id for meta","type":"string","required":true},{"name":"parameters","in":"body","description":"Meta source parameters","schema":{"$ref":"#/definitions/MetaSourceParameters"},"required":true}],"produces":["application/json","application/xml"],"responses":{"200":{"description":"Workspace object","schema":{"$ref":"#/definitions/PydioResponse"}}},"tags":["Provisioning"]},"delete":{"x-pydio-action":"meta_source_delete","description":"Edit a metasource\n","operationId":"adminRemoveWorkspaceFeature","parameters":[{"name":"workspaceId","in":"path","description":"id or alias of this workspace","type":"string","required":true},{"name":"metaId","in":"path","description":"plugin id for meta","type":"string","required":true}],"produces":["application/json","application/xml"],"responses":{"200":{"description":"Workspace object","schema":{"$ref":"#/definitions/PydioResponse"}}},"tags":["Provisioning"]}}},"parameters":{"pathParameter":{"name":"path","in":"path","description":"Workspace id or alias + full path to the node, e.g. \"/my-files/path/to/node\"","required":true,"type":"string"},"workspaceIdParameter":{"name":"workspaceId","in":"path","description":"Id or Alias of the workspace","required":true,"type":"string"},"workspaceIdFormParameter":{"name":"workspaceId","in":"formData","description":"Id or Alias of the workspace","required":true,"type":"string"},"nodeSelectionParameter":{"name":"path","in":"formData","description":"One or more node pathes","required":false,"type":"array","items":{"type":"string"},"collectionFormat":"multi"},"peopleParameter":{"name":"path","in":"path","description":"User or group identifier, including full group path","required":true,"type":"string"},"peopleParameterOptional":{"name":"path","in":"path","description":"User or group identifier, including full group path (optional)","required":true,"type":"string"}},"definitions":{"PydioResponse":{"title":"PydioResponse","description":"Generic container for messages after successful operations or errors","type":"object","properties":{"message":{"type":"string"},"level":{"type":"string"},"errorCode":{"type":"integer"},"nodesDiff":{"$ref":"#/definitions/NodesDiff"},"bgAction":{"$ref":"#/definitions/BgAction"},"tasks":{"type":"array","items":{"$ref":"#/definitions/Task"}}},"example":{"message":"Operation completed successfuly"}},"Task":{"title":"Task","description":"Background operation started on the server. It's the client mission to check it on a regular basis.","type":"object","properties":{"id":{"type":"string"},"status":{"type":"integer"},"label":{"type":"string"},"description":{"type":"string"},"userId":{"type":"string"},"wsId":{"type":"string"},"actionName":{"type":"string"},"schedule":{"type":"object","properties":{"scheduleType":{"type":"string"},"scheduleValue":{"type":"string"}}},"parameters":{"type":"object"}}},"BgAction":{"title":"BgAction","description":"triggers a background action on the client side","type":"object","properties":{"actionName":{"type":"string"},"delay":{"type":"integer"}}},"Node":{"title":"Node","description":"A file or folder represented as a generic resource, including metadata and children. Properties before children are part of the \"standard\" metadat set, properties after are returned by the \"extended\" metadata set.","type":"object","properties":{"path":{"type":"string"},"is_leaf":{"type":"boolean"},"label":{"type":"string"},"ajxp_modiftime":{"type":"integer"},"bytesize":{"type":"integer"},"stat":{"type":"object"},"ajxp_relativetime":{"type":"string"},"ajxp_description":{"type":"string"},"icon":{"type":"string"},"filesize":{"type":"string"},"mimestring_id":{"type":"string"},"ajxp_readonly":{"type":"boolean"},"file_perms":{"type":"string"},"repo_has_recycle":{"type":"boolean"},"children":{"$ref":"#/definitions/NodeList"}}},"NodesDiff":{"title":"NodesDiff","description":"Description of node removed / added / updated in the backend","type":"object","properties":{"add":{"type":"array","items":{"$ref":"#/definitions/Node"}},"update":{"type":"array","description":"Nodes may have an additional attribute original_path","items":{"$ref":"#/definitions/Node"}},"remove":{"type":"array","items":{"type":"string"}}}},"NodeList":{"title":"NodeList","description":"List of Node objects","type":"object","properties":{"pagination":{"$ref":"#/definitions/PaginationData"},"data":{"type":"object","properties":{"node":{"$ref":"#/definitions/Node"},"children":{"type":"array","items":{"$ref":"#/definitions/Node"}}}}}},"PaginationData":{"title":"PaginationData","description":"Additional metadata attached to a NodeList for pagination. Could be sent through headers instead.","type":"object","properties":{"count":{"type":"integer","description":"total number of children"},"current":{"type":"integer","description":"current page"},"total":{"type":"integer","description":"total number of pages"},"dirs":{"type":"integer","description":"total number of \"collection\" childrens"},"remoteSort":{"type":"object","description":"additional attributes describing current server-side sorting"}}},"InputStream":{"title":"InputStream","description":"Simple binary stream","type":"string"},"Role":{"title":"Role","description":"Representation of a Role, central container of permissions, actions and parameters.","type":"object","properties":{"ACL":{"type":"object","description":"Key/value associating workspace IDs and rights strings (r/w)"},"MASKS":{"type":"object","description":"Folders permissions masks"},"PARAMETERS":{"type":"object","description":"Refined values of plugins parameters"},"ACTIONS":{"type":"object","description":"Enabled/disabled actions of plugins"},"APPLIES":{"type":"object","description":"Set of profiles on which this role automatically applies"}}},"PeoplePatch":{"title":"PeoplePatch","description":"a key / value tuple describing which parameter to patch","type":"object","properties":{"resourceType":{"type":"string","enum":["user","group"]},"parameterName":{"type":"string","enum":["groupLabel","userPass","userProfile","userLock","userRoles","userAddRole","userRemoveRole","userPreferences"]},"parameterValue":{"type":"string"}}},"AdminWorkspace":{"title":"Workspace Definition","description":"Parameters of a workspace, as seen by administrator","type":"object","required":["display","accessType"],"properties":{"id":{"type":"string","description":"Id of this workspace"},"slug":{"type":"string","description":"human readable identifier, computed from display"},"display":{"type":"string","description":"Label for this workspace"},"displayStringId":{"type":"string","description":"an i18n identifier to adapt the label to the user language"},"accessType":{"type":"string","description":"plugin name to be used as driver to access the storage. Resulting plugin id is \"access.accessType\"."},"writeable":{"type":"boolean","description":"wether this workspace/template is writeable or not (not writeable if defined in bootstrap php configs)."},"isTemplate":{"type":"boolean","description":"wether this is a template or a concrete workspace."},"groupPath":{"type":"string","description":"If this repository has a groupPath"},"parameters":{"type":"object","description":"a key/value object containing all driver parameters."},"features":{"type":"object","description":"The additional features parameters."},"mask":{"type":"object","description":"permission mask applied on workspace files and folders"},"info":{"type":"object","description":"additional informations provided by the server","properties":{"user":{"type":"integer","description":"computed number of users accessing this workspace"},"shares":{"type":"integer","description":"number of children shared from this workspace"}}}},"example":{"id":1,"securityScope":"USER","slug":"my-files","display":"My Files","displayStringId":432,"accessType":"fs","writeable":false,"isTemplate":false,"parameters":{"CREATION_TIME":1468593800,"USER_DESCRIPTION":476,"PATH":"AJXP_DATA_PATH/personal/AJXP_USER","CREATE":true,"RECYCLE_BIN":"recycle_bin","CHMOD_VALUE":"0600","DEFAULT_RIGHTS":"rw","PAGINATION_THRESHOLD":500,"PAGINATION_NUMBER":200},"features":{"metastore.serial":{"METADATA_FILE":".ajxp_meta","METADATA_FILE_LOCATION":"infolders"},"meta.user":{"meta_fields":"tags","meta_labels":"Tags","meta_visibility":"hidden"},"meta.filehasher":[],"meta.watch":[],"meta.syncable":{"REPO_SYNCABLE":true},"meta.exif":{"meta_fields":"COMPUTED_GPS.GPS_Latitude,COMPUTED_GPS.GPS_Longitude","meta_labels":"Latitude,Longitude"},"index.lucene":{"index_meta_fields":"tags","repository_specific_keywords":"AJXP_USER"}},"INFO":{"users":12,"shares":74}}},"MetaSourceParameters":{"title":"MetaSource","description":"A set of parameters for meta sources","type":"object","example":{"PLUGIN_PARAMETER_STRING":"parameterValue1","PLUGIN_PARAMETER_INT":1,"PLUGIN_PARAMETER_BOOL":true}}}}
\ No newline at end of file
diff --git a/core/src/core/doc/wopi.json b/core/src/core/doc/wopi.json
new file mode 100644
index 0000000000..e7585bef22
--- /dev/null
+++ b/core/src/core/doc/wopi.json
@@ -0,0 +1 @@
+{"swagger":"2.0","host":"localhost","schemes":["http"],"basePath":"/wopi","info":{"version":"0.0.1","title":"Pydio WOPI V1","description":"Access to a Pydio File via WOPI protocol."},"paths":{"/files/{path}/contents":{"get":{"x-pydio-action":"download","description":"Get resource content.\n","operationId":"download","parameters":[{"$ref":"#/parameters/pathParameter"},{"name":"access_token","in":"query","description":"An access token that the host will use to determine whether the request is authorized.","type":"string","required":true},{"name":"X-WOPI-MaxExpectedSize","in":"header","description":"An integer specifying the upper bound of the expected size of the file being requested","type":"integer","required":false}],"produces":["application/octet-stream"],"responses":{"200":{"description":"Successful Response","schema":{"type":"file"}}},"tags":["File"]},"post":{"x-pydio-action":"upload","description":"Create resource by posting via form Data\n","operationId":"uploadStream","consumes":["multipart/form-data"],"parameters":[{"$ref":"#/parameters/pathParameter"},{"name":"inputStream","in":"body","description":"binary data","required":true,"schema":{"$ref":"#/definitions/InputStream"}}],"responses":{"200":{"description":"Successful Response"}},"tags":["File"]}},"/files/{path}":{"get":{"x-pydio-action":"ls","description":"Get information about a file.\n","operationId":"getNodeInfos","parameters":[{"$ref":"#/parameters/pathParameter"},{"name":"format","in":"query","description":"Format of the response.","type":"string","required":true,"default":"json"},{"name":"access_token","in":"query","description":"An access token that the host will use to determine whether the request is authorized.","type":"string","required":true},{"name":"X-WOPI-SessionContext","in":"header","description":"The value of the Session context parameter, if provided on the initial WOPI action URL using the sc parameter.","type":"string","required":false}],"produces":["application/json","application/xml"],"responses":{"200":{"description":"Successful response","schema":{"$ref":"#/definitions/NodeList"}}},"tags":["File"]}}},"parameters":{"pathParameter":{"name":"path","in":"path","description":"Workspace id or alias + full path to the node, e.g. \"/my-files/path/to/node\"","required":true,"type":"string"}},"definitions":{"InputStream":{"title":"InputStream","description":"Simple binary stream","type":"string"},"Node":{"title":"Node","description":"A file or folder represented as a generic resource, including metadata and children. Properties before children are part of the \"standard\" metadat set, properties after are returned by the \"extended\" metadata set.","type":"object","properties":{"path":{"type":"string"},"is_leaf":{"type":"boolean"},"label":{"type":"string"},"ajxp_modiftime":{"type":"integer"},"bytesize":{"type":"integer"},"stat":{"type":"object"},"ajxp_relativetime":{"type":"string"},"ajxp_description":{"type":"string"},"icon":{"type":"string"},"filesize":{"type":"string"},"mimestring_id":{"type":"string"},"ajxp_readonly":{"type":"boolean"},"file_perms":{"type":"string"},"repo_has_recycle":{"type":"boolean"},"children":{"$ref":"#/definitions/NodeList"}}},"NodeList":{"title":"NodeList","description":"List of Node objects","type":"object","properties":{"pagination":{"$ref":"#/definitions/PaginationData"},"data":{"type":"object","properties":{"node":{"$ref":"#/definitions/Node"},"children":{"type":"array","items":{"$ref":"#/definitions/Node"}}}}}},"PaginationData":{"title":"PaginationData","description":"Additional metadata attached to a NodeList for pagination. Could be sent through headers instead.","type":"object","properties":{"count":{"type":"integer","description":"total number of children"},"current":{"type":"integer","description":"current page"},"total":{"type":"integer","description":"total number of pages"},"dirs":{"type":"integer","description":"total number of \"collection\" childrens"},"remoteSort":{"type":"object","description":"additional attributes describing current server-side sorting"}}}}}
\ No newline at end of file
diff --git a/core/src/core/classes/index.html b/core/src/core/src/index.html
similarity index 100%
rename from core/src/core/classes/index.html
rename to core/src/core/src/index.html
diff --git a/core/src/core/src/lib/HttpClient.php b/core/src/core/src/lib/HttpClient.php
new file mode 100644
index 0000000000..4d4620922a
--- /dev/null
+++ b/core/src/core/src/lib/HttpClient.php
@@ -0,0 +1,501 @@
+<?php
+use Pydio\Log\Core\Logger;
+
+/**
+ * Version 0.9, 6th April 2003 - Simon Willison ( http://simon.incutio.com/ )
+ * Manual: http://scripts.incutio.com/httpclient/
+ * @package Pydio
+ * @subpackage Core
+ */
+
+class HttpClient
+{
+    // Request vars
+    public $host;
+    public $port;
+    public $path;
+    public $method;
+    public $postdata = '';
+    public $cookies = array();
+    public $referer;
+    public $accept = 'text/xml,application/xml,application/xhtml+xml,text/html,text/plain,image/png,image/jpeg,image/gif,*/*';
+    public $accept_encoding = 'gzip';
+    public $accept_language = 'en-us';
+    public $user_agent = 'Incutio HttpClient v0.9';
+    // Options
+    public $timeout = 20;
+    public $use_gzip = true;
+    public $persist_cookies = true;  // If true, received cookies are placed in the $this->cookies array ready for the next request
+                                  // Note: This currently ignores the cookie path (and time) completely. Time is not important,
+                                  //       but path could possibly lead to security problems.
+    public $persist_referers = true; // For each request, sends path of last request as referer
+    public $debug = false;
+    public $handle_redirects = true; // Auaomtically redirect if Location or URI header is found
+    public $max_redirects = 5;
+    public $headers_only = false;    // If true, stops receiving once headers have been read.
+    // Basic authorization variables
+    public $username;
+    public $password;
+    // Response vars
+    public $status;
+    public $headers = array();
+    public $content = '';
+    public $errormsg;
+    // Tracker variables
+    public $redirect_count = 0;
+    public $cookie_host = '';
+    public $postFileName = "userfile";
+    public $postFileData = array();
+    public $postDataArray = array();
+
+    public $directForwarding = false;
+    /**
+     * @var bool|resource
+     */
+    public $contentDestStream = false;
+    /**
+     * @var bool|callable
+     */
+    public $eventListener = false;
+
+    public $collectHeaders;
+
+    public function __construct($host, $port=80)
+    {
+        $this->host = $host;
+        $this->port = $port;
+    }
+    public function get($path, $data = false)
+    {
+        $this->path = $path;
+        $this->method = 'GET';
+        if ($data) {
+            $this->path .= '?'.$this->buildQueryString($data);
+        }
+        return $this->doRequest();
+    }
+    public function post($path, $data)
+    {
+        $this->path = $path;
+        $this->method = 'POST';
+        $this->postdata = $this->buildQueryString($data);
+        return $this->doRequest();
+    }
+    public function postFile($path, $postData, $fileVarName, $fileData)
+    {
+        $this->path = $path;
+        $this->method = 'POST';
+        $this->postFileData = $fileData;
+        $this->postDataArray = $postData;
+        $this->postFileName = $fileVarName;
+        $this->postdata = $this->buildQueryString($postData);
+        return $this->doRequest();
+    }
+
+    public function writeContentToStream($destStream)
+    {
+        $this->contentDestStream = $destStream;
+    }
+
+    public function clearContentDestStream()
+    {
+        $this->contentDestStream = false;
+    }
+
+    public function setEventListener($callback)
+    {
+        $this->eventListener = $callback;
+    }
+
+    public function notify($eventName, $data = null)
+    {
+        if($this->eventListener == false) return;
+        call_user_func($this->eventListener, $eventName, $data);
+    }
+
+    public function buildQueryString($data)
+    {
+        $querystring = '';
+        if (is_array($data)) {
+            // Change data in to postable data
+            foreach ($data as $key => $val) {
+                if (is_array($val)) {
+                    foreach ($val as $val2) {
+                        $querystring .= urlencode($key).'='.urlencode($val2).'&';
+                    }
+                } else {
+                    $querystring .= urlencode($key).'='.urlencode($val).'&';
+                }
+            }
+            $querystring = substr($querystring, 0, -1); // Eliminate unnecessary &
+        } else {
+            $querystring = $data;
+        }
+        return $querystring;
+    }
+    public function doRequest()
+    {
+        // Performs the actual HTTP request, returning true or false depending on outcome
+        $this->notify("open");
+        if (!$fp = @fsockopen($this->host, $this->port, $errno, $errstr, $this->timeout)) {
+            // Set error message
+            switch ($errno) {
+                case -3:
+                    $this->errormsg = 'Socket creation failed (-3)';
+                    break;
+                case -4:
+                    $this->errormsg = 'DNS lookup failure (-4)';
+                    break;
+                case -5:
+                    $this->errormsg = 'Connection refused or timed out (-5)';
+                    break;
+                default:
+                    $this->errormsg = 'Connection failed on '.$this->host.'('.$errno.')';
+                $this->errormsg .= ' '.$errstr;
+                $this->debug($this->errormsg);
+            }
+            $this->notify("error", $this->errormsg);
+            $this->notify("close");
+            return false;
+        }
+        socket_set_timeout($fp, $this->timeout);
+        $request = $this->buildRequest();
+        $this->debug('Request', $request);
+        @fwrite($fp, $request);
+        // Reset all the variables that should not persist between requests
+        $this->headers = array();
+        $this->content = '';
+        $this->errormsg = '';
+        // Set a couple of flags
+        $inHeaders = true;
+        $atStart = true;
+        $parsedHeaders = false;
+        $totalReadSize = 0;
+        // Now start reading back the response
+        while (!feof($fp)) {
+            @set_time_limit(60);
+            $line = fgets($fp, 4096);
+            if ($atStart) {
+                // Deal with first line of returned data
+                $atStart = false;
+                if (!preg_match('/HTTP\/(\\d\\.\\d)\\s*(\\d+)\\s*(.*)/', $line, $m)) {
+                    $this->errormsg = "Status code line invalid: ".htmlentities($line);
+                    $this->debug($this->errormsg);
+                    $this->notify("error", $this->errormsg);
+                    $this->notify("close");
+                    return false;
+                }
+                $http_version = $m[1]; // not used
+                $this->status = $m[2];
+                $status_string = $m[3]; // not used
+                $this->debug(trim($line));
+                continue;
+            }
+            if ($inHeaders) {
+                if (trim($line) == '') {
+                    $inHeaders = false;
+                    $this->debug('Received Headers', $this->headers);
+                    if (isSet($this->collectHeaders)) {
+                        foreach ($this->headers as $hKey => $hValue) {
+                            if (isSet($this->collectHeaders[$hKey])) {
+                                if($hKey == "content-length" && $hValue == "0") continue;
+                                $this->collectHeaders[$hKey] = $hValue;
+                                Logger::debug("Setting $hKey", $this->collectHeaders);
+                            }
+                        }
+                    }
+                    if ($this->persist_cookies && isset($this->headers['set-cookie']) && $this->host == $this->cookie_host) {
+                        $cookies = $this->headers['set-cookie'];
+                        if (!is_array($cookies)) {
+                            $cookies = array($cookies);
+                        }
+                        foreach ($cookies as $cookie) {
+                            if (preg_match('/([^=]+)=([^;]+);/', $cookie, $m)) {
+                                $this->cookies[$m[1]] = $m[2];
+                            }
+                        }
+                        // Record domain of cookies for security reasons
+                        $this->cookie_host = $this->host;
+                    }
+                    // If $persist_referers, set the referer ready for the next request
+                    if ($this->persist_referers) {
+                        //$this->debug('Persisting referer: '.$this->getRequestURL());
+                        $this->referer = $this->getRequestURL();
+                    }
+                    // Finally, if handle_redirects and a redirect is sent, do that
+                    if ($this->handle_redirects) {
+                        if (++$this->redirect_count >= $this->max_redirects) {
+                            $this->errormsg = 'Number of redirects exceeded maximum ('.$this->max_redirects.')';
+                            $this->debug($this->errormsg);
+                            $this->redirect_count = 0;
+                            return false;
+                        }
+                        $location = isset($this->headers['location']) ? $this->headers['location'] : '';
+                        $uri = isset($this->headers['uri']) ? $this->headers['uri'] : '';
+                        if ($location || $uri) {
+                            $url = parse_url($location.$uri);
+                            // This will FAIL if redirect is to a different site
+                            $this->debug("Should redirect! ", $url);
+                            $data = array();
+                            if (isSet($url['query'])) {
+                                parse_str($url["query"], $data);
+                            }
+                            $this->host = $url["host"];
+                            fclose($fp);
+                            if (isSet($this->collectHeaders) && isSet($this->collectHeaders["ajxp-last-redirection"])) {
+                                $this->collectHeaders["ajxp-last-redirection"] = $location.$uri;
+                            }
+                            return $this->get($url['path'], (!empty($data)?$data:false));
+                        }
+                    }
+
+                    if ($this->headers_only) {
+                        break; // Skip the rest of the input
+                    }
+                    continue;
+                }
+                if (!preg_match('/([^:]+):\\s*(.*)/', $line, $m)) {
+                    // Skip to the next header
+                    continue;
+                }
+                $key = strtolower(trim($m[1]));
+                $val = trim($m[2]);
+                if ($this->directForwarding) {
+                    header($line, true);
+                    continue;
+                }
+
+                // Deal with the possibility of multiple headers of same name
+                if (isset($this->headers[$key])) {
+                    if (is_array($this->headers[$key])) {
+                        $this->headers[$key][] = $val;
+                    } else {
+                        $this->headers[$key] = array($this->headers[$key], $val);
+                    }
+                } else {
+                    $this->headers[$key] = $val;
+                }
+                continue;
+            }
+
+            // We're not in the headers, so append the line to the contents
+            if ($this->directForwarding) {
+                print $line;
+                continue;
+            }
+            if ($this->contentDestStream===false) {
+                $this->content .= $line;
+            } else {
+                fwrite($this->contentDestStream, $line);
+            }
+            $totalReadSize += strlen($line);
+            $this->notify("data_read", $totalReadSize);
+        }
+        $this->notify("close");
+        fclose($fp);
+           if ($this->directForwarding) {
+               return true;
+           }
+        // If data is compressed, uncompress it
+        if (isset($this->headers['content-encoding']) && $this->headers['content-encoding'] == 'gzip') {
+            $this->debug('Content is gzip encoded, unzipping it');
+            if (!$this->headers_only) {
+                $this->content = substr($this->content, 10); // See http://www.php.net/manual/en/function.gzencode.php
+                $this->content = gzinflate($this->content);
+            }
+        }
+        // $this->debug("CONTENT : ".htmlentities($this->content));
+        return true;
+    }
+    public function buildRequest()
+    {
+        $headers = array();
+        $headers[] = "{$this->method} {$this->path} HTTP/1.0"; // Using 1.1 leads to all manner of problems, such as "chunked" encoding
+        $headers[] = "Host: {$this->host}";
+        $headers[] = "User-Agent: {$this->user_agent}";
+        $headers[] = "Accept: {$this->accept}";
+        if ($this->use_gzip) {
+            $headers[] = "Accept-encoding: {$this->accept_encoding}";
+        }
+        $headers[] = "Accept-language: {$this->accept_language}";
+        if ($this->referer) {
+            $headers[] = "Referer: {$this->referer}";
+        }
+        // Cookies
+        if ($this->cookies) {
+            $cookie = 'Cookie: ';
+            foreach ($this->cookies as $key => $value) {
+                $cookie .= "$key=$value; ";
+            }
+            $headers[] = $cookie;
+        }
+        // Basic authentication
+        if ($this->username && $this->password) {
+            $headers[] = 'Authorization: BASIC '.base64_encode($this->username.':'.$this->password);
+        }
+        if (!count($this->postFileData)) {
+            // If this is a POST, set the content type and length
+            if ($this->postdata) {
+                $headers[] = 'Content-Type: application/x-www-form-urlencoded';
+                $headers[] = 'Content-Length: '.strlen($this->postdata);
+            }
+            $request = implode("\r\n", $headers)."\r\n\r\n".$this->postdata;
+        } else {
+            srand((double) microtime()*1000000);
+            $boundary = "----".substr(md5(rand(0,32000)),0,10);
+            $headers[] = "Content-Type: multipart/form-data; boundary=$boundary";
+            $data = array();
+            // attach post vars
+            $this->postDataArray["Filename"] = $this->postFileData["name"];
+            foreach ($this->postDataArray as $index => $value) {
+                $data[]="--$boundary";
+                $data[]= "content-disposition: form-data; name=\"".$index."\"";
+                $data[]= "\r\n".$value."";
+            }
+            // and attach the file
+            //$data[]= "--$boundary";
+            $content_file = join("", file($this->postFileData["tmp_name"]));
+            $data[]="--$boundary";
+            $data[]="content-disposition: form-data; name=\"".$this->postFileName."\"; filename=\"".$this->postFileData["name"]."\"";
+            $data[]= "Content-Type: ".$this->postFileData['type']."\r\n";
+            $data[]= "".$content_file."";
+            $data[]="--$boundary--";
+            //$headers[]= "Content-Length: " . strlen(implode("",$data));
+            $data = implode("\r\n", $data);
+            $headers[]= "Content-Length: " . strlen($data);
+            $headers[] = "Cache-Control: no-cache";
+            $headers[] = "Connection: Keep-Alive";
+            $request = implode("\r\n", $headers)."\r\n\r\n".$data;
+        }
+        return $request;
+    }
+    public function getStatus()
+    {
+        return $this->status;
+    }
+    public function getContent()
+    {
+        return $this->content;
+    }
+    public function getHeaders()
+    {
+        return $this->headers;
+    }
+    public function getHeader($header)
+    {
+        $header = strtolower($header);
+        if (isset($this->headers[$header])) {
+            return $this->headers[$header];
+        } else {
+            return false;
+        }
+    }
+    public function getError()
+    {
+        return $this->errormsg;
+    }
+    public function getCookies()
+    {
+        return $this->cookies;
+    }
+    public function getRequestURL()
+    {
+        $url = 'http://'.$this->host;
+        if ($this->port != 80) {
+            $url .= ':'.$this->port;
+        }
+        $url .= $this->path;
+        return $url;
+    }
+    // Setter methods
+    public function setUserAgent($string)
+    {
+        $this->user_agent = $string;
+    }
+    public function setAuthorization($username, $password)
+    {
+        $this->username = $username;
+        $this->password = $password;
+    }
+    public function setCookies($array)
+    {
+        $this->cookies = $array;
+    }
+    // Option setting methods
+    public function useGzip($boolean)
+    {
+        $this->use_gzip = $boolean;
+    }
+    public function setPersistCookies($boolean)
+    {
+        $this->persist_cookies = $boolean;
+    }
+    public function setPersistReferers($boolean)
+    {
+        $this->persist_referers = $boolean;
+    }
+    public function setHandleRedirects($boolean)
+    {
+        $this->handle_redirects = $boolean;
+    }
+    public function setMaxRedirects($num)
+    {
+        $this->max_redirects = $num;
+    }
+    public function setHeadersOnly($boolean, &$collectHeaders = null)
+    {
+        $this->headers_only = $boolean;
+        if ($collectHeaders != null) {
+            $this->collectHeaders = $collectHeaders;
+        }
+    }
+    public function setDebug($boolean)
+    {
+        $this->debug = $boolean;
+    }
+    // "Quick" static methods
+    public function quickGet($url)
+    {
+        $bits = parse_url($url);
+        $host = $bits['host'];
+        $port = isset($bits['port']) ? $bits['port'] : 80;
+        $path = isset($bits['path']) ? $bits['path'] : '/';
+        if (isset($bits['query'])) {
+            $path .= '?'.$bits['query'];
+        }
+        $client = new HttpClient($host, $port);
+        if (!$client->get($path)) {
+            return false;
+        } else {
+            return $client->getContent();
+        }
+    }
+    public function quickPost($url, $data)
+    {
+        $bits = parse_url($url);
+        $host = $bits['host'];
+        $port = isset($bits['port']) ? $bits['port'] : 80;
+        $path = isset($bits['path']) ? $bits['path'] : '/';
+        $client = new HttpClient($host, $port);
+        if (!$client->post($path, $data)) {
+            return false;
+        } else {
+            return $client->getContent();
+        }
+    }
+    public function debug($msg, $object = false)
+    {
+        if ($this->debug) {
+            $st = '<div style="border: 1px solid red; padding: 0.5em; margin: 0.5em;"><strong>HttpClient Debug:</strong> '.$msg;
+            if ($object) {
+                ob_start();
+                print_r($object);
+                $content = htmlentities(ob_get_contents());
+                ob_end_clean();
+                $st .= '<pre>'.$content.'</pre>';
+            }
+            $st .= '</div>';
+            Logger::debug($msg . ($object!==false?" - ".print_r($object, true):""));
+        }
+    }
+}
diff --git a/core/src/core/classes/dibi/dibi.php b/core/src/core/src/lib/dibi/dibi.php
similarity index 100%
rename from core/src/core/classes/dibi/dibi.php
rename to core/src/core/src/lib/dibi/dibi.php
diff --git a/core/src/core/classes/dibi/drivers/DibiFirebirdDriver.php b/core/src/core/src/lib/dibi/drivers/DibiFirebirdDriver.php
similarity index 100%
rename from core/src/core/classes/dibi/drivers/DibiFirebirdDriver.php
rename to core/src/core/src/lib/dibi/drivers/DibiFirebirdDriver.php
diff --git a/core/src/core/classes/dibi/drivers/DibiMsSql2005Driver.php b/core/src/core/src/lib/dibi/drivers/DibiMsSql2005Driver.php
similarity index 100%
rename from core/src/core/classes/dibi/drivers/DibiMsSql2005Driver.php
rename to core/src/core/src/lib/dibi/drivers/DibiMsSql2005Driver.php
diff --git a/core/src/core/classes/dibi/drivers/DibiMsSql2005Reflector.php b/core/src/core/src/lib/dibi/drivers/DibiMsSql2005Reflector.php
similarity index 100%
rename from core/src/core/classes/dibi/drivers/DibiMsSql2005Reflector.php
rename to core/src/core/src/lib/dibi/drivers/DibiMsSql2005Reflector.php
diff --git a/core/src/core/classes/dibi/drivers/DibiMsSqlDriver.php b/core/src/core/src/lib/dibi/drivers/DibiMsSqlDriver.php
similarity index 100%
rename from core/src/core/classes/dibi/drivers/DibiMsSqlDriver.php
rename to core/src/core/src/lib/dibi/drivers/DibiMsSqlDriver.php
diff --git a/core/src/core/classes/dibi/drivers/DibiMsSqlReflector.php b/core/src/core/src/lib/dibi/drivers/DibiMsSqlReflector.php
similarity index 100%
rename from core/src/core/classes/dibi/drivers/DibiMsSqlReflector.php
rename to core/src/core/src/lib/dibi/drivers/DibiMsSqlReflector.php
diff --git a/core/src/core/classes/dibi/drivers/DibiMySqlDriver.php b/core/src/core/src/lib/dibi/drivers/DibiMySqlDriver.php
similarity index 100%
rename from core/src/core/classes/dibi/drivers/DibiMySqlDriver.php
rename to core/src/core/src/lib/dibi/drivers/DibiMySqlDriver.php
diff --git a/core/src/core/classes/dibi/drivers/DibiMySqlReflector.php b/core/src/core/src/lib/dibi/drivers/DibiMySqlReflector.php
similarity index 100%
rename from core/src/core/classes/dibi/drivers/DibiMySqlReflector.php
rename to core/src/core/src/lib/dibi/drivers/DibiMySqlReflector.php
diff --git a/core/src/core/classes/dibi/drivers/DibiMySqliDriver.php b/core/src/core/src/lib/dibi/drivers/DibiMySqliDriver.php
similarity index 100%
rename from core/src/core/classes/dibi/drivers/DibiMySqliDriver.php
rename to core/src/core/src/lib/dibi/drivers/DibiMySqliDriver.php
diff --git a/core/src/core/classes/dibi/drivers/DibiOdbcDriver.php b/core/src/core/src/lib/dibi/drivers/DibiOdbcDriver.php
similarity index 100%
rename from core/src/core/classes/dibi/drivers/DibiOdbcDriver.php
rename to core/src/core/src/lib/dibi/drivers/DibiOdbcDriver.php
diff --git a/core/src/core/classes/dibi/drivers/DibiOracleDriver.php b/core/src/core/src/lib/dibi/drivers/DibiOracleDriver.php
similarity index 100%
rename from core/src/core/classes/dibi/drivers/DibiOracleDriver.php
rename to core/src/core/src/lib/dibi/drivers/DibiOracleDriver.php
diff --git a/core/src/core/classes/dibi/drivers/DibiPdoDriver.php b/core/src/core/src/lib/dibi/drivers/DibiPdoDriver.php
similarity index 100%
rename from core/src/core/classes/dibi/drivers/DibiPdoDriver.php
rename to core/src/core/src/lib/dibi/drivers/DibiPdoDriver.php
diff --git a/core/src/core/classes/dibi/drivers/DibiPostgreDriver.php b/core/src/core/src/lib/dibi/drivers/DibiPostgreDriver.php
similarity index 100%
rename from core/src/core/classes/dibi/drivers/DibiPostgreDriver.php
rename to core/src/core/src/lib/dibi/drivers/DibiPostgreDriver.php
diff --git a/core/src/core/classes/dibi/drivers/DibiSqlite3Driver.php b/core/src/core/src/lib/dibi/drivers/DibiSqlite3Driver.php
similarity index 100%
rename from core/src/core/classes/dibi/drivers/DibiSqlite3Driver.php
rename to core/src/core/src/lib/dibi/drivers/DibiSqlite3Driver.php
diff --git a/core/src/core/classes/dibi/drivers/DibiSqliteDriver.php b/core/src/core/src/lib/dibi/drivers/DibiSqliteDriver.php
similarity index 100%
rename from core/src/core/classes/dibi/drivers/DibiSqliteDriver.php
rename to core/src/core/src/lib/dibi/drivers/DibiSqliteDriver.php
diff --git a/core/src/core/classes/dibi/drivers/DibiSqliteReflector.php b/core/src/core/src/lib/dibi/drivers/DibiSqliteReflector.php
similarity index 100%
rename from core/src/core/classes/dibi/drivers/DibiSqliteReflector.php
rename to core/src/core/src/lib/dibi/drivers/DibiSqliteReflector.php
diff --git a/core/src/core/classes/dibi/libs/Dibi.php b/core/src/core/src/lib/dibi/libs/Dibi.php
similarity index 100%
rename from core/src/core/classes/dibi/libs/Dibi.php
rename to core/src/core/src/lib/dibi/libs/Dibi.php
diff --git a/core/src/core/classes/dibi/libs/DibiConnection.php b/core/src/core/src/lib/dibi/libs/DibiConnection.php
similarity index 100%
rename from core/src/core/classes/dibi/libs/DibiConnection.php
rename to core/src/core/src/lib/dibi/libs/DibiConnection.php
diff --git a/core/src/core/classes/dibi/libs/DibiDataSource.php b/core/src/core/src/lib/dibi/libs/DibiDataSource.php
similarity index 100%
rename from core/src/core/classes/dibi/libs/DibiDataSource.php
rename to core/src/core/src/lib/dibi/libs/DibiDataSource.php
diff --git a/core/src/core/classes/dibi/libs/DibiDatabaseInfo.php b/core/src/core/src/lib/dibi/libs/DibiDatabaseInfo.php
similarity index 100%
rename from core/src/core/classes/dibi/libs/DibiDatabaseInfo.php
rename to core/src/core/src/lib/dibi/libs/DibiDatabaseInfo.php
diff --git a/core/src/core/classes/dibi/libs/DibiDateTime.php b/core/src/core/src/lib/dibi/libs/DibiDateTime.php
similarity index 100%
rename from core/src/core/classes/dibi/libs/DibiDateTime.php
rename to core/src/core/src/lib/dibi/libs/DibiDateTime.php
diff --git a/core/src/core/classes/dibi/libs/DibiEvent.php b/core/src/core/src/lib/dibi/libs/DibiEvent.php
similarity index 100%
rename from core/src/core/classes/dibi/libs/DibiEvent.php
rename to core/src/core/src/lib/dibi/libs/DibiEvent.php
diff --git a/core/src/core/classes/dibi/libs/DibiException.php b/core/src/core/src/lib/dibi/libs/DibiException.php
similarity index 100%
rename from core/src/core/classes/dibi/libs/DibiException.php
rename to core/src/core/src/lib/dibi/libs/DibiException.php
diff --git a/core/src/core/classes/dibi/libs/DibiFileLogger.php b/core/src/core/src/lib/dibi/libs/DibiFileLogger.php
similarity index 100%
rename from core/src/core/classes/dibi/libs/DibiFileLogger.php
rename to core/src/core/src/lib/dibi/libs/DibiFileLogger.php
diff --git a/core/src/core/classes/dibi/libs/DibiFirePhpLogger.php b/core/src/core/src/lib/dibi/libs/DibiFirePhpLogger.php
similarity index 100%
rename from core/src/core/classes/dibi/libs/DibiFirePhpLogger.php
rename to core/src/core/src/lib/dibi/libs/DibiFirePhpLogger.php
diff --git a/core/src/core/classes/dibi/libs/DibiFluent.php b/core/src/core/src/lib/dibi/libs/DibiFluent.php
similarity index 100%
rename from core/src/core/classes/dibi/libs/DibiFluent.php
rename to core/src/core/src/lib/dibi/libs/DibiFluent.php
diff --git a/core/src/core/classes/dibi/libs/DibiHashMap.php b/core/src/core/src/lib/dibi/libs/DibiHashMap.php
similarity index 100%
rename from core/src/core/classes/dibi/libs/DibiHashMap.php
rename to core/src/core/src/lib/dibi/libs/DibiHashMap.php
diff --git a/core/src/core/classes/dibi/libs/DibiLiteral.php b/core/src/core/src/lib/dibi/libs/DibiLiteral.php
similarity index 100%
rename from core/src/core/classes/dibi/libs/DibiLiteral.php
rename to core/src/core/src/lib/dibi/libs/DibiLiteral.php
diff --git a/core/src/core/classes/dibi/libs/DibiObject.php b/core/src/core/src/lib/dibi/libs/DibiObject.php
similarity index 100%
rename from core/src/core/classes/dibi/libs/DibiObject.php
rename to core/src/core/src/lib/dibi/libs/DibiObject.php
diff --git a/core/src/core/classes/dibi/libs/DibiResult.php b/core/src/core/src/lib/dibi/libs/DibiResult.php
similarity index 100%
rename from core/src/core/classes/dibi/libs/DibiResult.php
rename to core/src/core/src/lib/dibi/libs/DibiResult.php
diff --git a/core/src/core/classes/dibi/libs/DibiResultIterator.php b/core/src/core/src/lib/dibi/libs/DibiResultIterator.php
similarity index 100%
rename from core/src/core/classes/dibi/libs/DibiResultIterator.php
rename to core/src/core/src/lib/dibi/libs/DibiResultIterator.php
diff --git a/core/src/core/classes/dibi/libs/DibiRow.php b/core/src/core/src/lib/dibi/libs/DibiRow.php
similarity index 100%
rename from core/src/core/classes/dibi/libs/DibiRow.php
rename to core/src/core/src/lib/dibi/libs/DibiRow.php
diff --git a/core/src/core/classes/dibi/libs/DibiTranslator.php b/core/src/core/src/lib/dibi/libs/DibiTranslator.php
similarity index 100%
rename from core/src/core/classes/dibi/libs/DibiTranslator.php
rename to core/src/core/src/lib/dibi/libs/DibiTranslator.php
diff --git a/core/src/core/classes/dibi/libs/interfaces.php b/core/src/core/src/lib/dibi/libs/interfaces.php
similarity index 100%
rename from core/src/core/classes/dibi/libs/interfaces.php
rename to core/src/core/src/lib/dibi/libs/interfaces.php
diff --git a/core/src/core/classes/pclzip.lib.php b/core/src/core/src/lib/pclzip.lib.php
similarity index 95%
rename from core/src/core/classes/pclzip.lib.php
rename to core/src/core/src/lib/pclzip.lib.php
index 83e25e9cdc..035bc4ff99 100644
--- a/core/src/core/classes/pclzip.lib.php
+++ b/core/src/core/src/lib/pclzip.lib.php
@@ -1,5798 +1,5716 @@
-<?php
-// --------------------------------------------------------------------------------
-// PhpConcept Library - Zip Module 2.8.2
-// --------------------------------------------------------------------------------
-// License GNU/LGPL - Vincent Blavet - August 2009
-// http://www.phpconcept.net
-// --------------------------------------------------------------------------------
-//
-// Presentation :
-//   PclZip is a PHP library that manage ZIP archives.
-//   So far tests show that archives generated by PclZip are readable by
-//   WinZip application and other tools.
-//
-// Description :
-//   See readme.txt and http://www.phpconcept.net
-//
-// Warning :
-//   This library and the associated files are non commercial, non professional
-//   work.
-//   It should not have unexpected results. However if any damage is caused by
-//   this software the author can not be responsible.
-//   The use of this software is at the risk of the user.
-//
-// --------------------------------------------------------------------------------
-// $Id: pclzip.lib.php,v 1.60 2009/09/30 21:01:04 vblavet Exp $
-// --------------------------------------------------------------------------------
-
-  // ----- Constants
-  if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
-    define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );
-  }
-  
-  // ----- File list separator
-  // In version 1.x of PclZip, the separator for file list is a space
-  // (which is not a very smart choice, specifically for windows paths !).
-  // A better separator should be a comma (,). This constant gives you the
-  // abilty to change that.
-  // However notice that changing this value, may have impact on existing
-  // scripts, using space separated filenames.
-  // Recommanded values for compatibility with older versions :
-  //define( 'PCLZIP_SEPARATOR', ' ' );
-  // Recommanded values for smart separation of filenames.
-  if (!defined('PCLZIP_SEPARATOR')) {
-    define( 'PCLZIP_SEPARATOR', ',' );
-  }
-
-  // ----- Error configuration
-  // 0 : PclZip Class integrated error handling
-  // 1 : PclError external library error handling. By enabling this
-  //     you must ensure that you have included PclError library.
-  // [2,...] : reserved for futur use
-  if (!defined('PCLZIP_ERROR_EXTERNAL')) {
-    define( 'PCLZIP_ERROR_EXTERNAL', 0 );
-  }
-
-  // ----- Optional static temporary directory
-  //       By default temporary files are generated in the script current
-  //       path.
-  //       If defined :
-  //       - MUST BE terminated by a '/'.
-  //       - MUST be a valid, already created directory
-  //       Samples :
-  // define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
-  // define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
-  if (!defined('PCLZIP_TEMPORARY_DIR')) {
-    define( 'PCLZIP_TEMPORARY_DIR', AJXP_Utils::getAjxpTmpDir().DIRECTORY_SEPARATOR );
-  }
-
-  // ----- Optional threshold ratio for use of temporary files
-  //       Pclzip sense the size of the file to add/extract and decide to
-  //       use or not temporary file. The algorythm is looking for 
-  //       memory_limit of PHP and apply a ratio.
-  //       threshold = memory_limit * ratio.
-  //       Recommended values are under 0.5. Default 0.47.
-  //       Samples :
-  // define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );
-  if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
-    define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.47 );
-  }
-
-// --------------------------------------------------------------------------------
-// ***** UNDER THIS LINE NOTHING NEEDS TO BE MODIFIED *****
-// --------------------------------------------------------------------------------
-
-  // ----- Global variables
-  $g_pclzip_version = "2.8.2";
-
-  // ----- Error codes
-  //   -1 : Unable to open file in binary write mode
-  //   -2 : Unable to open file in binary read mode
-  //   -3 : Invalid parameters
-  //   -4 : File does not exist
-  //   -5 : Filename is too long (max. 255)
-  //   -6 : Not a valid zip file
-  //   -7 : Invalid extracted file size
-  //   -8 : Unable to create directory
-  //   -9 : Invalid archive extension
-  //  -10 : Invalid archive format
-  //  -11 : Unable to delete file (unlink)
-  //  -12 : Unable to rename file (rename)
-  //  -13 : Invalid header checksum
-  //  -14 : Invalid archive size
-  define( 'PCLZIP_ERR_USER_ABORTED', 2 );
-  define( 'PCLZIP_ERR_NO_ERROR', 0 );
-  define( 'PCLZIP_ERR_WRITE_OPEN_FAIL', -1 );
-  define( 'PCLZIP_ERR_READ_OPEN_FAIL', -2 );
-  define( 'PCLZIP_ERR_INVALID_PARAMETER', -3 );
-  define( 'PCLZIP_ERR_MISSING_FILE', -4 );
-  define( 'PCLZIP_ERR_FILENAME_TOO_LONG', -5 );
-  define( 'PCLZIP_ERR_INVALID_ZIP', -6 );
-  define( 'PCLZIP_ERR_BAD_EXTRACTED_FILE', -7 );
-  define( 'PCLZIP_ERR_DIR_CREATE_FAIL', -8 );
-  define( 'PCLZIP_ERR_BAD_EXTENSION', -9 );
-  define( 'PCLZIP_ERR_BAD_FORMAT', -10 );
-  define( 'PCLZIP_ERR_DELETE_FILE_FAIL', -11 );
-  define( 'PCLZIP_ERR_RENAME_FILE_FAIL', -12 );
-  define( 'PCLZIP_ERR_BAD_CHECKSUM', -13 );
-  define( 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14 );
-  define( 'PCLZIP_ERR_MISSING_OPTION_VALUE', -15 );
-  define( 'PCLZIP_ERR_INVALID_OPTION_VALUE', -16 );
-  define( 'PCLZIP_ERR_ALREADY_A_DIRECTORY', -17 );
-  define( 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18 );
-  define( 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19 );
-  define( 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20 );
-  define( 'PCLZIP_ERR_DIRECTORY_RESTRICTION', -21 );
-
-  // ----- Options values
-  define( 'PCLZIP_OPT_PATH', 77001 );
-  define( 'PCLZIP_OPT_ADD_PATH', 77002 );
-  define( 'PCLZIP_OPT_REMOVE_PATH', 77003 );
-  define( 'PCLZIP_OPT_REMOVE_ALL_PATH', 77004 );
-  define( 'PCLZIP_OPT_SET_CHMOD', 77005 );
-  define( 'PCLZIP_OPT_EXTRACT_AS_STRING', 77006 );
-  define( 'PCLZIP_OPT_NO_COMPRESSION', 77007 );
-  define( 'PCLZIP_OPT_BY_NAME', 77008 );
-  define( 'PCLZIP_OPT_BY_INDEX', 77009 );
-  define( 'PCLZIP_OPT_BY_EREG', 77010 );
-  define( 'PCLZIP_OPT_BY_PREG', 77011 );
-  define( 'PCLZIP_OPT_COMMENT', 77012 );
-  define( 'PCLZIP_OPT_ADD_COMMENT', 77013 );
-  define( 'PCLZIP_OPT_PREPEND_COMMENT', 77014 );
-  define( 'PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015 );
-  define( 'PCLZIP_OPT_REPLACE_NEWER', 77016 );
-  define( 'PCLZIP_OPT_STOP_ON_ERROR', 77017 );
-  // Having big trouble with crypt. Need to multiply 2 long int
-  // which is not correctly supported by PHP ...
-  //define( 'PCLZIP_OPT_CRYPT', 77018 );
-  define( 'PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019 );
-  define( 'PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020 ); // alias
-  define( 'PCLZIP_OPT_TEMP_FILE_ON', 77021 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021 ); // alias
-  define( 'PCLZIP_OPT_TEMP_FILE_OFF', 77022 );
-  define( 'PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022 ); // alias
-  
-  // ----- File description attributes
-  define( 'PCLZIP_ATT_FILE_NAME', 79001 );
-  define( 'PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002 );
-  define( 'PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003 );
-  define( 'PCLZIP_ATT_FILE_MTIME', 79004 );
-  define( 'PCLZIP_ATT_FILE_CONTENT', 79005 );
-  define( 'PCLZIP_ATT_FILE_COMMENT', 79006 );
-
-  // ----- Call backs values
-  define( 'PCLZIP_CB_PRE_EXTRACT', 78001 );
-  define( 'PCLZIP_CB_POST_EXTRACT', 78002 );
-  define( 'PCLZIP_CB_PRE_ADD', 78003 );
-  define( 'PCLZIP_CB_POST_ADD', 78004 );
-  /* For futur use
-  define( 'PCLZIP_CB_PRE_LIST', 78005 );
-  define( 'PCLZIP_CB_POST_LIST', 78006 );
-  define( 'PCLZIP_CB_PRE_DELETE', 78007 );
-  define( 'PCLZIP_CB_POST_DELETE', 78008 );
-  */
-
-  // --------------------------------------------------------------------------------
-  // Class : PclZip
-  // Description :
-  //   PclZip is the class that represent a Zip archive.
-  //   The public methods allow the manipulation of the archive.
-  // Attributes :
-  //   Attributes must not be accessed directly.
-  // Methods :
-  //   PclZip() : Object creator
-  //   create() : Creates the Zip archive
-  //   listContent() : List the content of the Zip archive
-  //   extract() : Extract the content of the archive
-  //   properties() : List the properties of the archive
-  // --------------------------------------------------------------------------------
-  class PclZip
-  {
-    // ----- Filename of the zip file
-    var $zipname = '';
-
-    // ----- File descriptor of the zip file
-    var $zip_fd = 0;
-
-    // ----- Current position in the zip file
-    var $zip_ftell = 0;
-
-    // ----- Internal error handling
-    var $error_code = 1;
-    var $error_string = '';
-    
-    // ----- Current status of the magic_quotes_runtime
-    // This value store the php configuration for magic_quotes
-    // The class can then disable the magic_quotes and reset it after
-    var $magic_quotes_status;
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZip()
-  // Description :
-  //   Creates a PclZip object and set the name of the associated Zip archive
-  //   filename.
-  //   Note that no real action is taken, if the archive does not exist it is not
-  //   created. Use create() for that.
-  // --------------------------------------------------------------------------------
-  function __construct($p_zipname)
-  {
-
-    // ----- Tests the zlib
-    if (!function_exists('gzopen') && !function_exists('gzopen64'))
-    {
-      die('Abort '.basename(__FILE__).' : Missing zlib extensions');
-    }
-
-    // ----- Set the attributes
-    $this->zipname = $p_zipname;
-    $this->zip_fd = 0;
-    $this->zip_ftell = 0;
-    $this->magic_quotes_status = -1;
-
-    // ----- Return
-    return;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   create($p_filelist, $p_add_dir="", $p_remove_dir="")
-  //   create($p_filelist, $p_option, $p_option_value, ...)
-  // Description :
-  //   This method supports two different synopsis. The first one is historical.
-  //   This method creates a Zip Archive. The Zip file is created in the
-  //   filesystem. The files and directories indicated in $p_filelist
-  //   are added in the archive. See the parameters description for the
-  //   supported format of $p_filelist.
-  //   When a directory is in the list, the directory and its content is added
-  //   in the archive.
-  //   In this synopsis, the function takes an optional variable list of
-  //   options. See bellow the supported options.
-  // Parameters :
-  //   $p_filelist : An array containing file or directory names, or
-  //                 a string containing one filename or one directory name, or
-  //                 a string containing a list of filenames and/or directory
-  //                 names separated by spaces.
-  //   $p_add_dir : A path to add before the real path of the archived file,
-  //                in order to have it memorized in the archive.
-  //   $p_remove_dir : A path to remove from the real path of the file to archive,
-  //                   in order to have a shorter path memorized in the archive.
-  //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
-  //                   is removed first, before $p_add_dir is added.
-  // Options :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_OPT_COMMENT :
-  //   PCLZIP_CB_PRE_ADD :
-  //   PCLZIP_CB_POST_ADD :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the added files, with a status of the add action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function create($p_filelist)
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Set default values
-    $v_options = array();
-    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove from the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_ADD => 'optional',
-                                                   PCLZIP_CB_POST_ADD => 'optional',
-                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
-                                                   PCLZIP_OPT_COMMENT => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                                                   //, PCLZIP_OPT_CRYPT => 'optional'
-                                             ));
-        if ($v_result != 1) {
-          return 0;
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_options[PCLZIP_OPT_ADD_PATH] = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                       "Invalid number / type of arguments");
-          return 0;
-        }
-      }
-    }
-    
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Init
-    $v_string_list = array();
-    $v_att_list = array();
-    $v_filedescr_list = array();
-    $p_result_list = array();
-    
-    // ----- Look if the $p_filelist is really an array
-    if (is_array($p_filelist)) {
-    
-      // ----- Look if the first element is also an array
-      //       This will mean that this is a file description entry
-      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
-        $v_att_list = $p_filelist;
-      }
-      
-      // ----- The list is a list of string names
-      else {
-        $v_string_list = $p_filelist;
-      }
-    }
-
-    // ----- Look if the $p_filelist is a string
-    else if (is_string($p_filelist)) {
-      // ----- Create a list from the string
-      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
-    }
-
-    // ----- Invalid variable type for $p_filelist
-    else {
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");
-      return 0;
-    }
-    
-    // ----- Reformat the string list
-    if (sizeof($v_string_list) != 0) {
-      foreach ($v_string_list as $v_string) {
-        if ($v_string != '') {
-          $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-        }
-        else {
-        }
-      }
-    }
-    
-    // ----- For each file in the list check the attributes
-    $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
-             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_MTIME => 'optional'
-             ,PCLZIP_ATT_FILE_CONTENT => 'optional'
-             ,PCLZIP_ATT_FILE_COMMENT => 'optional'
-						);
-    foreach ($v_att_list as $v_entry) {
-      $v_result = $this->privFileDescrParseAtt($v_entry,
-                                               $v_filedescr_list[],
-                                               $v_options,
-                                               $v_supported_attributes);
-      if ($v_result != 1) {
-        return 0;
-      }
-    }
-
-    // ----- Expand the filelist (expand directories)
-    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Call the create fct
-    $v_result = $this->privCreate($v_filedescr_list, $p_result_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Return
-    return $p_result_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   add($p_filelist, $p_add_dir="", $p_remove_dir="")
-  //   add($p_filelist, $p_option, $p_option_value, ...)
-  // Description :
-  //   This method supports two synopsis. The first one is historical.
-  //   This methods add the list of files in an existing archive.
-  //   If a file with the same name already exists, it is added at the end of the
-  //   archive, the first one is still present.
-  //   If the archive does not exist, it is created.
-  // Parameters :
-  //   $p_filelist : An array containing file or directory names, or
-  //                 a string containing one filename or one directory name, or
-  //                 a string containing a list of filenames and/or directory
-  //                 names separated by spaces.
-  //   $p_add_dir : A path to add before the real path of the archived file,
-  //                in order to have it memorized in the archive.
-  //   $p_remove_dir : A path to remove from the real path of the file to archive,
-  //                   in order to have a shorter path memorized in the archive.
-  //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
-  //                   is removed first, before $p_add_dir is added.
-  // Options :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_OPT_COMMENT :
-  //   PCLZIP_OPT_ADD_COMMENT :
-  //   PCLZIP_OPT_PREPEND_COMMENT :
-  //   PCLZIP_CB_PRE_ADD :
-  //   PCLZIP_CB_POST_ADD :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the added files, with a status of the add action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function add($p_filelist)
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Set default values
-    $v_options = array();
-    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove form the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_ADD => 'optional',
-                                                   PCLZIP_CB_POST_ADD => 'optional',
-                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
-                                                   PCLZIP_OPT_COMMENT => 'optional',
-                                                   PCLZIP_OPT_ADD_COMMENT => 'optional',
-                                                   PCLZIP_OPT_PREPEND_COMMENT => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-                                                   //, PCLZIP_OPT_CRYPT => 'optional'
-												   ));
-        if ($v_result != 1) {
-          return 0;
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_options[PCLZIP_OPT_ADD_PATH] = $v_add_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
-
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Init
-    $v_string_list = array();
-    $v_att_list = array();
-    $v_filedescr_list = array();
-    $p_result_list = array();
-    
-    // ----- Look if the $p_filelist is really an array
-    if (is_array($p_filelist)) {
-    
-      // ----- Look if the first element is also an array
-      //       This will mean that this is a file description entry
-      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
-        $v_att_list = $p_filelist;
-      }
-      
-      // ----- The list is a list of string names
-      else {
-        $v_string_list = $p_filelist;
-      }
-    }
-
-    // ----- Look if the $p_filelist is a string
-    else if (is_string($p_filelist)) {
-      // ----- Create a list from the string
-      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
-    }
-
-    // ----- Invalid variable type for $p_filelist
-    else {
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '".gettype($p_filelist)."' for p_filelist");
-      return 0;
-    }
-    
-    // ----- Reformat the string list
-    if (sizeof($v_string_list) != 0) {
-      foreach ($v_string_list as $v_string) {
-        $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
-      }
-    }
-    
-    // ----- For each file in the list check the attributes
-    $v_supported_attributes
-    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
-             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
-             ,PCLZIP_ATT_FILE_MTIME => 'optional'
-             ,PCLZIP_ATT_FILE_CONTENT => 'optional'
-             ,PCLZIP_ATT_FILE_COMMENT => 'optional'
-						);
-    foreach ($v_att_list as $v_entry) {
-      $v_result = $this->privFileDescrParseAtt($v_entry,
-                                               $v_filedescr_list[],
-                                               $v_options,
-                                               $v_supported_attributes);
-      if ($v_result != 1) {
-        return 0;
-      }
-    }
-
-    // ----- Expand the filelist (expand directories)
-    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Call the create fct
-    $v_result = $this->privAdd($v_filedescr_list, $p_result_list, $v_options);
-    if ($v_result != 1) {
-      return 0;
-    }
-
-    // ----- Return
-    return $p_result_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : listContent()
-  // Description :
-  //   This public method, gives the list of the files and directories, with their
-  //   properties.
-  //   The properties of each entries in the list are (used also in other functions) :
-  //     filename : Name of the file. For a create or add action it is the filename
-  //                given by the user. For an extract function it is the filename
-  //                of the extracted file.
-  //     stored_filename : Name of the file / directory stored in the archive.
-  //     size : Size of the stored file.
-  //     compressed_size : Size of the file's data compressed in the archive
-  //                       (without the headers overhead)
-  //     mtime : Last known modification date of the file (UNIX timestamp)
-  //     comment : Comment associated with the file
-  //     folder : true | false
-  //     index : index of the file in the archive
-  //     status : status of the action (depending of the action) :
-  //              Values are :
-  //                ok : OK !
-  //                filtered : the file / dir is not extracted (filtered by user)
-  //                already_a_directory : the file can not be extracted because a
-  //                                      directory with the same name already exists
-  //                write_protected : the file can not be extracted because a file
-  //                                  with the same name already exists and is
-  //                                  write protected
-  //                newer_exist : the file was not extracted because a newer file exists
-  //                path_creation_fail : the file is not extracted because the folder
-  //                                     does not exist and can not be created
-  //                write_error : the file was not extracted because there was a
-  //                              error while writing the file
-  //                read_error : the file was not extracted because there was a error
-  //                             while reading the file
-  //                invalid_header : the file was not extracted because of an archive
-  //                                 format error (bad file header)
-  //   Note that each time a method can continue operating when there
-  //   is an action error on a file, the error is only logged in the file status.
-  // Return Values :
-  //   0 on an unrecoverable failure,
-  //   The list of the files in the archive.
-  // --------------------------------------------------------------------------------
-  function listContent()
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Call the extracting fct
-    $p_list = array();
-    if (($v_result = $this->privList($p_list)) != 1)
-    {
-      unset($p_list);
-      return(0);
-    }
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   extract($p_path="./", $p_remove_path="")
-  //   extract([$p_option, $p_option_value, ...])
-  // Description :
-  //   This method supports two synopsis. The first one is historical.
-  //   This method extract all the files / directories from the archive to the
-  //   folder indicated in $p_path.
-  //   If you want to ignore the 'root' part of path of the memorized files
-  //   you can indicate this in the optional $p_remove_path parameter.
-  //   By default, if a newer file with the same name already exists, the
-  //   file is not extracted.
-  //
-  //   If both PCLZIP_OPT_PATH and PCLZIP_OPT_ADD_PATH aoptions
-  //   are used, the path indicated in PCLZIP_OPT_ADD_PATH is append
-  //   at the end of the path value of PCLZIP_OPT_PATH.
-  // Parameters :
-  //   $p_path : Path where the files and directories are to be extracted
-  //   $p_remove_path : First part ('root' part) of the memorized path
-  //                    (if any similar) to remove while extracting.
-  // Options :
-  //   PCLZIP_OPT_PATH :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_CB_PRE_EXTRACT :
-  //   PCLZIP_CB_POST_EXTRACT :
-  // Return Values :
-  //   0 or a negative value on failure,
-  //   The list of the extracted files, with a status of the action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function extract()
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Set default values
-    $v_options = array();
-//    $v_path = "./";
-    $v_path = '';
-    $v_remove_path = "";
-    $v_remove_all_path = false;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Default values for option
-    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-
-    // ----- Look for arguments
-    if ($v_size > 0) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
-                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
-                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
-                                                   PCLZIP_OPT_BY_NAME => 'optional',
-                                                   PCLZIP_OPT_BY_EREG => 'optional',
-                                                   PCLZIP_OPT_BY_PREG => 'optional',
-                                                   PCLZIP_OPT_BY_INDEX => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
-                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
-                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
-                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-												    ));
-        if ($v_result != 1) {
-          return 0;
-        }
-
-        // ----- Set the arguments
-        if (isset($v_options[PCLZIP_OPT_PATH])) {
-          $v_path = $v_options[PCLZIP_OPT_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
-          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
-          // ----- Check for '/' in last path char
-          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
-            $v_path .= '/';
-          }
-          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
-
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Trace
-
-    // ----- Call the extracting fct
-    $p_list = array();
-    $v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path,
-	                                     $v_remove_all_path, $v_options);
-    if ($v_result < 1) {
-      unset($p_list);
-      return(0);
-    }
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   extractByIndex($p_index, $p_path="./", $p_remove_path="")
-  //   extractByIndex($p_index, [$p_option, $p_option_value, ...])
-  // Description :
-  //   This method supports two synopsis. The first one is historical.
-  //   This method is doing a partial extract of the archive.
-  //   The extracted files or folders are identified by their index in the
-  //   archive (from 0 to n).
-  //   Note that if the index identify a folder, only the folder entry is
-  //   extracted, not all the files included in the archive.
-  // Parameters :
-  //   $p_index : A single index (integer) or a string of indexes of files to
-  //              extract. The form of the string is "0,4-6,8-12" with only numbers
-  //              and '-' for range or ',' to separate ranges. No spaces or ';'
-  //              are allowed.
-  //   $p_path : Path where the files and directories are to be extracted
-  //   $p_remove_path : First part ('root' part) of the memorized path
-  //                    (if any similar) to remove while extracting.
-  // Options :
-  //   PCLZIP_OPT_PATH :
-  //   PCLZIP_OPT_ADD_PATH :
-  //   PCLZIP_OPT_REMOVE_PATH :
-  //   PCLZIP_OPT_REMOVE_ALL_PATH :
-  //   PCLZIP_OPT_EXTRACT_AS_STRING : The files are extracted as strings and
-  //     not as files.
-  //     The resulting content is in a new field 'content' in the file
-  //     structure.
-  //     This option must be used alone (any other options are ignored).
-  //   PCLZIP_CB_PRE_EXTRACT :
-  //   PCLZIP_CB_POST_EXTRACT :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the extracted files, with a status of the action.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  //function extractByIndex($p_index, options...)
-  function extractByIndex($p_index)
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Set default values
-    $v_options = array();
-//    $v_path = "./";
-    $v_path = '';
-    $v_remove_path = "";
-    $v_remove_all_path = false;
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Default values for option
-    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-
-    // ----- Look for arguments
-    if ($v_size > 1) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Remove form the options list the first argument
-      array_shift($v_arg_list);
-      $v_size--;
-
-      // ----- Look for first arg
-      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
-
-        // ----- Parse the options
-        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                            array (PCLZIP_OPT_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
-                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
-                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
-                                                   PCLZIP_OPT_ADD_PATH => 'optional',
-                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
-                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
-                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
-                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
-                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
-                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
-                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
-												   ));
-        if ($v_result != 1) {
-          return 0;
-        }
-
-        // ----- Set the arguments
-        if (isset($v_options[PCLZIP_OPT_PATH])) {
-          $v_path = $v_options[PCLZIP_OPT_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
-          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-        }
-        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
-          // ----- Check for '/' in last path char
-          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
-            $v_path .= '/';
-          }
-          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
-        }
-        if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
-          $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
-        }
-        else {
-        }
-      }
-
-      // ----- Look for 2 args
-      // Here we need to support the first historic synopsis of the
-      // method.
-      else {
-
-        // ----- Get the first argument
-        $v_path = $v_arg_list[0];
-
-        // ----- Look for the optional second argument
-        if ($v_size == 2) {
-          $v_remove_path = $v_arg_list[1];
-        }
-        else if ($v_size > 2) {
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
-
-          // ----- Return
-          return 0;
-        }
-      }
-    }
-
-    // ----- Trace
-
-    // ----- Trick
-    // Here I want to reuse extractByRule(), so I need to parse the $p_index
-    // with privParseOptions()
-    $v_arg_trick = array (PCLZIP_OPT_BY_INDEX, $p_index);
-    $v_options_trick = array();
-    $v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick,
-                                        array (PCLZIP_OPT_BY_INDEX => 'optional' ));
-    if ($v_result != 1) {
-        return 0;
-    }
-    $v_options[PCLZIP_OPT_BY_INDEX] = $v_options_trick[PCLZIP_OPT_BY_INDEX];
-
-    // ----- Look for default option values
-    $this->privOptionDefaultThreshold($v_options);
-
-    // ----- Call the extracting fct
-    if (($v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options)) < 1) {
-        return(0);
-    }
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function :
-  //   delete([$p_option, $p_option_value, ...])
-  // Description :
-  //   This method removes files from the archive.
-  //   If no parameters are given, then all the archive is emptied.
-  // Parameters :
-  //   None or optional arguments.
-  // Options :
-  //   PCLZIP_OPT_BY_INDEX :
-  //   PCLZIP_OPT_BY_NAME :
-  //   PCLZIP_OPT_BY_EREG : 
-  //   PCLZIP_OPT_BY_PREG :
-  // Return Values :
-  //   0 on failure,
-  //   The list of the files which are still present in the archive.
-  //   (see PclZip::listContent() for list entry format)
-  // --------------------------------------------------------------------------------
-  function delete()
-  {
-    $v_result=1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Set default values
-    $v_options = array();
-
-    // ----- Look for variable options arguments
-    $v_size = func_num_args();
-
-    // ----- Look for arguments
-    if ($v_size > 0) {
-      // ----- Get the arguments
-      $v_arg_list = func_get_args();
-
-      // ----- Parse the options
-      $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
-                                        array (PCLZIP_OPT_BY_NAME => 'optional',
-                                               PCLZIP_OPT_BY_EREG => 'optional',
-                                               PCLZIP_OPT_BY_PREG => 'optional',
-                                               PCLZIP_OPT_BY_INDEX => 'optional' ));
-      if ($v_result != 1) {
-          return 0;
-      }
-    }
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Call the delete fct
-    $v_list = array();
-    if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) {
-      $this->privSwapBackMagicQuotes();
-      unset($v_list);
-      return(0);
-    }
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : deleteByIndex()
-  // Description :
-  //   ***** Deprecated *****
-  //   delete(PCLZIP_OPT_BY_INDEX, $p_index) should be prefered.
-  // --------------------------------------------------------------------------------
-  function deleteByIndex($p_index)
-  {
-    
-    $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
-
-    // ----- Return
-    return $p_list;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : properties()
-  // Description :
-  //   This method gives the properties of the archive.
-  //   The properties are :
-  //     nb : Number of files in the archive
-  //     comment : Comment associated with the archive file
-  //     status : not_exist, ok
-  // Parameters :
-  //   None
-  // Return Values :
-  //   0 on failure,
-  //   An array with the archive properties.
-  // --------------------------------------------------------------------------------
-  function properties()
-  {
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      $this->privSwapBackMagicQuotes();
-      return(0);
-    }
-
-    // ----- Default properties
-    $v_prop = array();
-    $v_prop['comment'] = '';
-    $v_prop['nb'] = 0;
-    $v_prop['status'] = 'not_exist';
-
-    // ----- Look if file exists
-    if (@is_file($this->zipname))
-    {
-      // ----- Open the zip file
-      $this->zip_ftell = 0;
-      if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
-      {
-        $this->privSwapBackMagicQuotes();
-        
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
-
-        // ----- Return
-        return 0;
-      }
-
-      // ----- Read the central directory informations
-      $v_central_dir = array();
-      if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-      {
-        $this->privSwapBackMagicQuotes();
-        return 0;
-      }
-
-      // ----- Close the zip file
-      $this->privCloseFd();
-
-      // ----- Set the user attributes
-      $v_prop['comment'] = $v_central_dir['comment'];
-      $v_prop['nb'] = $v_central_dir['entries'];
-      $v_prop['status'] = 'ok';
-    }
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_prop;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : duplicate()
-  // Description :
-  //   This method creates an archive by copying the content of an other one. If
-  //   the archive already exist, it is replaced by the new one without any warning.
-  // Parameters :
-  //   $p_archive : The filename of a valid archive, or
-  //                a valid PclZip object.
-  // Return Values :
-  //   1 on success.
-  //   0 or a negative value on error (error code).
-  // --------------------------------------------------------------------------------
-  function duplicate($p_archive)
-  {
-    $v_result = 1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Look if the $p_archive is a PclZip object
-    if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip'))
-    {
-
-      // ----- Duplicate the archive
-      $v_result = $this->privDuplicate($p_archive->zipname);
-    }
-
-    // ----- Look if the $p_archive is a string (so a filename)
-    else if (is_string($p_archive))
-    {
-
-      // ----- Check that $p_archive is a valid zip file
-      // TBC : Should also check the archive format
-      if (!is_file($p_archive)) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
-        $v_result = PCLZIP_ERR_MISSING_FILE;
-      }
-      else {
-        // ----- Duplicate the archive
-        $v_result = $this->privDuplicate($p_archive);
-      }
-    }
-
-    // ----- Invalid variable
-    else
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
-      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : merge()
-  // Description :
-  //   This method merge the $p_archive_to_add archive at the end of the current
-  //   one ($this).
-  //   If the archive ($this) does not exist, the merge becomes a duplicate.
-  //   If the $p_archive_to_add archive does not exist, the merge is a success.
-  // Parameters :
-  //   $p_archive_to_add : It can be directly the filename of a valid zip archive,
-  //                       or a PclZip object archive.
-  // Return Values :
-  //   1 on success,
-  //   0 or negative values on error (see below).
-  // --------------------------------------------------------------------------------
-  function merge($p_archive_to_add)
-  {
-    $v_result = 1;
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Check archive
-    if (!$this->privCheckFormat()) {
-      return(0);
-    }
-
-    // ----- Look if the $p_archive_to_add is a PclZip object
-    if ((is_object($p_archive_to_add)) && (get_class($p_archive_to_add) == 'pclzip'))
-    {
-
-      // ----- Merge the archive
-      $v_result = $this->privMerge($p_archive_to_add);
-    }
-
-    // ----- Look if the $p_archive_to_add is a string (so a filename)
-    else if (is_string($p_archive_to_add))
-    {
-
-      // ----- Create a temporary archive
-      $v_object_archive = new PclZip($p_archive_to_add);
-
-      // ----- Merge the archive
-      $v_result = $this->privMerge($v_object_archive);
-    }
-
-    // ----- Invalid variable
-    else
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
-      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-
-
-  // --------------------------------------------------------------------------------
-  // Function : errorCode()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function errorCode()
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      return(PclErrorCode());
-    }
-    else {
-      return($this->error_code);
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : errorName()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function errorName($p_with_code=false)
-  {
-    $v_name = array ( PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
-                      PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
-                      PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
-                      PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
-                      PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE',
-                      PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG',
-                      PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP',
-                      PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE',
-                      PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL',
-                      PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION',
-                      PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT',
-                      PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL',
-                      PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL',
-                      PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM',
-                      PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP',
-                      PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE',
-                      PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE',
-                      PCLZIP_ERR_UNSUPPORTED_COMPRESSION => 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION',
-                      PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION'
-                      ,PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE'
-                      ,PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION'
-                    );
-
-    if (isset($v_name[$this->error_code])) {
-      $v_value = $v_name[$this->error_code];
-    }
-    else {
-      $v_value = 'NoName';
-    }
-
-    if ($p_with_code) {
-      return($v_value.' ('.$this->error_code.')');
-    }
-    else {
-      return($v_value);
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : errorInfo()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function errorInfo($p_full=false)
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      return(PclErrorString());
-    }
-    else {
-      if ($p_full) {
-        return($this->errorName(true)." : ".$this->error_string);
-      }
-      else {
-        return($this->error_string." [code ".$this->error_code."]");
-      }
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-
-// --------------------------------------------------------------------------------
-// ***** UNDER THIS LINE ARE DEFINED PRIVATE INTERNAL FUNCTIONS *****
-// *****                                                        *****
-// *****       THESES FUNCTIONS MUST NOT BE USED DIRECTLY       *****
-// --------------------------------------------------------------------------------
-
-
-
-  // --------------------------------------------------------------------------------
-  // Function : privCheckFormat()
-  // Description :
-  //   This method check that the archive exists and is a valid zip archive.
-  //   Several level of check exists. (futur)
-  // Parameters :
-  //   $p_level : Level of check. Default 0.
-  //              0 : Check the first bytes (magic codes) (default value))
-  //              1 : 0 + Check the central directory (futur)
-  //              2 : 1 + Check each file header (futur)
-  // Return Values :
-  //   true on success,
-  //   false on error, the error code is set.
-  // --------------------------------------------------------------------------------
-  function privCheckFormat($p_level=0)
-  {
-    $v_result = true;
-
-	// ----- Reset the file system cache
-    clearstatcache();
-
-    // ----- Reset the error handler
-    $this->privErrorReset();
-
-    // ----- Look if the file exits
-    if (!is_file($this->zipname)) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'");
-      return(false);
-    }
-
-    // ----- Check that the file is readeable
-    if (!is_readable($this->zipname)) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");
-      return(false);
-    }
-
-    // ----- Check the magic code
-    // TBC
-
-    // ----- Check the central header
-    // TBC
-
-    // ----- Check each file header
-    // TBC
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privParseOptions()
-  // Description :
-  //   This internal methods reads the variable list of arguments ($p_options_list,
-  //   $p_size) and generate an array with the options and values ($v_result_list).
-  //   $v_requested_options contains the options that can be present and those that
-  //   must be present.
-  //   $v_requested_options is an array, with the option value as key, and 'optional',
-  //   or 'mandatory' as value.
-  // Parameters :
-  //   See above.
-  // Return Values :
-  //   1 on success.
-  //   0 on failure.
-  // --------------------------------------------------------------------------------
-  function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options=false)
-  {
-    $v_result=1;
-    
-    // ----- Read the options
-    $i=0;
-    while ($i<$p_size) {
-
-      // ----- Check if the option is supported
-      if (!isset($v_requested_options[$p_options_list[$i]])) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '".$p_options_list[$i]."' for this method");
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Look for next option
-      switch ($p_options_list[$i]) {
-        // ----- Look for options that request a path value
-        case PCLZIP_OPT_PATH :
-        case PCLZIP_OPT_REMOVE_PATH :
-        case PCLZIP_OPT_ADD_PATH :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
-          $i++;
-        break;
-
-        case PCLZIP_OPT_TEMP_FILE_THRESHOLD :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-            return PclZip::errorCode();
-          }
-          
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
-            return PclZip::errorCode();
-          }
-          
-          // ----- Check the value
-          $v_value = $p_options_list[$i+1];
-          if ((!is_integer($v_value)) || ($v_value<0)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value (and convert it in bytes)
-          $v_result_list[$p_options_list[$i]] = $v_value*1048576;
-          $i++;
-        break;
-
-        case PCLZIP_OPT_TEMP_FILE_ON :
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
-            return PclZip::errorCode();
-          }
-          
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
-
-        case PCLZIP_OPT_TEMP_FILE_OFF :
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_ON])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");
-            return PclZip::errorCode();
-          }
-          // ----- Check for incompatible options
-          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
-            return PclZip::errorCode();
-          }
-          
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
-
-        case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (   is_string($p_options_list[$i+1])
-              && ($p_options_list[$i+1] != '')) {
-            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
-            $i++;
-          }
-          else {
-          }
-        break;
-
-        // ----- Look for options that request an array of string for value
-        case PCLZIP_OPT_BY_NAME :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];
-          }
-          else if (is_array($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that request an EREG or PREG expression
-        case PCLZIP_OPT_BY_EREG :
-          // ereg() is deprecated starting with PHP 5.3. Move PCLZIP_OPT_BY_EREG
-          // to PCLZIP_OPT_BY_PREG
-          $p_options_list[$i] = PCLZIP_OPT_BY_PREG;
-        case PCLZIP_OPT_BY_PREG :
-        //case PCLZIP_OPT_CRYPT :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that takes a string
-        case PCLZIP_OPT_COMMENT :
-        case PCLZIP_OPT_ADD_COMMENT :
-        case PCLZIP_OPT_PREPEND_COMMENT :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE,
-			                     "Missing parameter value for option '"
-								 .PclZipUtilOptionText($p_options_list[$i])
-								 ."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          if (is_string($p_options_list[$i+1])) {
-              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE,
-			                     "Wrong parameter value for option '"
-								 .PclZipUtilOptionText($p_options_list[$i])
-								 ."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          $i++;
-        break;
-
-        // ----- Look for options that request an array of index
-        case PCLZIP_OPT_BY_INDEX :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_work_list = array();
-          if (is_string($p_options_list[$i+1])) {
-
-              // ----- Remove spaces
-              $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');
-
-              // ----- Parse items
-              $v_work_list = explode(",", $p_options_list[$i+1]);
-          }
-          else if (is_integer($p_options_list[$i+1])) {
-              $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1];
-          }
-          else if (is_array($p_options_list[$i+1])) {
-              $v_work_list = $p_options_list[$i+1];
-          }
-          else {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-          
-          // ----- Reduce the index list
-          // each index item in the list must be a couple with a start and
-          // an end value : [0,3], [5-5], [8-10], ...
-          // ----- Check the format of each item
-          $v_sort_flag=false;
-          $v_sort_value=0;
-          for ($j=0; $j<sizeof($v_work_list); $j++) {
-              // ----- Explode the item
-              $v_item_list = explode("-", $v_work_list[$j]);
-              $v_size_item_list = sizeof($v_item_list);
-              
-              // ----- TBC : Here we might check that each item is a
-              // real integer ...
-              
-              // ----- Look for single value
-              if ($v_size_item_list == 1) {
-                  // ----- Set the option value
-                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
-                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[0];
-              }
-              elseif ($v_size_item_list == 2) {
-                  // ----- Set the option value
-                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
-                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[1];
-              }
-              else {
-                  // ----- Error log
-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-                  // ----- Return
-                  return PclZip::errorCode();
-              }
-
-
-              // ----- Look for list sort
-              if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
-                  $v_sort_flag=true;
-
-                  // ----- TBC : An automatic sort should be writen ...
-                  // ----- Error log
-                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-                  // ----- Return
-                  return PclZip::errorCode();
-              }
-              $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
-          }
-          
-          // ----- Sort the items
-          if ($v_sort_flag) {
-              // TBC : To Be Completed
-          }
-
-          // ----- Next option
-          $i++;
-        break;
-
-        // ----- Look for options that request no value
-        case PCLZIP_OPT_REMOVE_ALL_PATH :
-        case PCLZIP_OPT_EXTRACT_AS_STRING :
-        case PCLZIP_OPT_NO_COMPRESSION :
-        case PCLZIP_OPT_EXTRACT_IN_OUTPUT :
-        case PCLZIP_OPT_REPLACE_NEWER :
-        case PCLZIP_OPT_STOP_ON_ERROR :
-          $v_result_list[$p_options_list[$i]] = true;
-        break;
-
-        // ----- Look for options that request an octal value
-        case PCLZIP_OPT_SET_CHMOD :
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
-          $i++;
-        break;
-
-        // ----- Look for options that request a call-back
-        case PCLZIP_CB_PRE_EXTRACT :
-        case PCLZIP_CB_POST_EXTRACT :
-        case PCLZIP_CB_PRE_ADD :
-        case PCLZIP_CB_POST_ADD :
-        /* for futur use
-        case PCLZIP_CB_PRE_DELETE :
-        case PCLZIP_CB_POST_DELETE :
-        case PCLZIP_CB_PRE_LIST :
-        case PCLZIP_CB_POST_LIST :
-        */
-          // ----- Check the number of parameters
-          if (($i+1) >= $p_size) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Get the value
-          $v_function_name = $p_options_list[$i+1];
-
-          // ----- Check that the value is a valid existing function
-          if (!function_exists($v_function_name)) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '".$v_function_name."()' is not an existing function for option '".PclZipUtilOptionText($p_options_list[$i])."'");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-
-          // ----- Set the attribute
-          $v_result_list[$p_options_list[$i]] = $v_function_name;
-          $i++;
-        break;
-
-        default :
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                       "Unknown parameter '"
-							   .$p_options_list[$i]."'");
-
-          // ----- Return
-          return PclZip::errorCode();
-      }
-
-      // ----- Next options
-      $i++;
-    }
-
-    // ----- Look for mandatory options
-    if ($v_requested_options !== false) {
-      for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
-        // ----- Look for mandatory option
-        if ($v_requested_options[$key] == 'mandatory') {
-          // ----- Look if present
-          if (!isset($v_result_list[$key])) {
-            // ----- Error log
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
-
-            // ----- Return
-            return PclZip::errorCode();
-          }
-        }
-      }
-    }
-    
-    // ----- Look for default values
-    if (!isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
-      
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privOptionDefaultThreshold()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privOptionDefaultThreshold(&$p_options)
-  {
-    $v_result=1;
-    
-    if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-        || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
-      return $v_result;
-    }
-    
-    // ----- Get 'memory_limit' configuration value
-    $v_memory_limit = ini_get('memory_limit');
-    $v_memory_limit = trim($v_memory_limit);
-    $last = strtolower(substr($v_memory_limit, -1));
- 
-    if($last == 'g')
-        //$v_memory_limit = $v_memory_limit*1024*1024*1024;
-        $v_memory_limit = $v_memory_limit*1073741824;
-    if($last == 'm')
-        //$v_memory_limit = $v_memory_limit*1024*1024;
-        $v_memory_limit = $v_memory_limit*1048576;
-    if($last == 'k')
-        $v_memory_limit = $v_memory_limit*1024;
-            
-    $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit*PCLZIP_TEMPORARY_FILE_RATIO);
-    
-
-    // ----- Sanity check : No threshold if value lower than 1M
-    if ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] < 1048576) {
-      unset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]);
-    }
-          
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privFileDescrParseAtt()
-  // Description :
-  // Parameters :
-  // Return Values :
-  //   1 on success.
-  //   0 on failure.
-  // --------------------------------------------------------------------------------
-  function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options=false)
-  {
-    $v_result=1;
-    
-    // ----- For each file in the list check the attributes
-    foreach ($p_file_list as $v_key => $v_value) {
-    
-      // ----- Check if the option is supported
-      if (!isset($v_requested_options[$v_key])) {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '".$v_key."' for this file");
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-
-      // ----- Look for attribute
-      switch ($v_key) {
-        case PCLZIP_ATT_FILE_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
-          
-          if ($p_filedescr['filename'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-        break;
-
-        case PCLZIP_ATT_FILE_NEW_SHORT_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
-
-          if ($p_filedescr['new_short_name'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-        break;
-
-        case PCLZIP_ATT_FILE_NEW_FULL_NAME :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
-
-          if ($p_filedescr['new_full_name'] == '') {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-        break;
-
-        // ----- Look for options that takes a string
-        case PCLZIP_ATT_FILE_COMMENT :
-          if (!is_string($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['comment'] = $v_value;
-        break;
-
-        case PCLZIP_ATT_FILE_MTIME :
-          if (!is_integer($v_value)) {
-            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". Integer expected for attribute '".PclZipUtilOptionText($v_key)."'");
-            return PclZip::errorCode();
-          }
-
-          $p_filedescr['mtime'] = $v_value;
-        break;
-
-        case PCLZIP_ATT_FILE_CONTENT :
-          $p_filedescr['content'] = $v_value;
-        break;
-
-        default :
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
-		                           "Unknown parameter '".$v_key."'");
-
-          // ----- Return
-          return PclZip::errorCode();
-      }
-
-      // ----- Look for mandatory options
-      if ($v_requested_options !== false) {
-        for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
-          // ----- Look for mandatory option
-          if ($v_requested_options[$key] == 'mandatory') {
-            // ----- Look if present
-            if (!isset($p_file_list[$key])) {
-              PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
-              return PclZip::errorCode();
-            }
-          }
-        }
-      }
-    
-    // end foreach
-    }
-    
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privFileDescrExpand()
-  // Description :
-  //   This method look for each item of the list to see if its a file, a folder
-  //   or a string to be added as file. For any other type of files (link, other)
-  //   just ignore the item.
-  //   Then prepare the information that will be stored for that file.
-  //   When its a folder, expand the folder with all the files that are in that 
-  //   folder (recursively).
-  // Parameters :
-  // Return Values :
-  //   1 on success.
-  //   0 on failure.
-  // --------------------------------------------------------------------------------
-  function privFileDescrExpand(&$p_filedescr_list, &$p_options)
-  {
-    $v_result=1;
-    
-    // ----- Create a result list
-    $v_result_list = array();
-    
-    // ----- Look each entry
-    for ($i=0; $i<sizeof($p_filedescr_list); $i++) {
-      
-      // ----- Get filedescr
-      $v_descr = $p_filedescr_list[$i];
-      
-      // ----- Reduce the filename
-      $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename'], false);
-      $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
-      
-      // ----- Look for real file or folder
-      if (file_exists($v_descr['filename'])) {
-        if (@is_file($v_descr['filename'])) {
-          $v_descr['type'] = 'file';
-        }
-        else if (@is_dir($v_descr['filename'])) {
-          $v_descr['type'] = 'folder';
-        }
-        else if (@is_link($v_descr['filename'])) {
-          // skip
-          continue;
-        }
-        else {
-          // skip
-          continue;
-        }
-      }
-      
-      // ----- Look for string added as file
-      else if (isset($v_descr['content'])) {
-        $v_descr['type'] = 'virtual_file';
-      }
-      
-      // ----- Missing file
-      else {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$v_descr['filename']."' does not exist");
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-      
-      // ----- Calculate the stored filename
-      $this->privCalculateStoredFilename($v_descr, $p_options);
-      
-      // ----- Add the descriptor in result list
-      $v_result_list[sizeof($v_result_list)] = $v_descr;
-      
-      // ----- Look for folder
-      if ($v_descr['type'] == 'folder') {
-        // ----- List of items in folder
-        $v_dirlist_descr = array();
-        $v_dirlist_nb = 0;
-        if ($v_folder_handler = @opendir($v_descr['filename'])) {
-          while (($v_item_handler = @readdir($v_folder_handler)) !== false) {
-
-            // ----- Skip '.' and '..'
-            if (($v_item_handler == '.') || ($v_item_handler == '..')) {
-                continue;
-            }
-            
-            // ----- Compose the full filename
-            $v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'].'/'.$v_item_handler;
-            
-            // ----- Look for different stored filename
-            // Because the name of the folder was changed, the name of the
-            // files/sub-folders also change
-            if (($v_descr['stored_filename'] != $v_descr['filename'])
-                 && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
-              if ($v_descr['stored_filename'] != '') {
-                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'].'/'.$v_item_handler;
-              }
-              else {
-                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
-              }
-            }
-      
-            $v_dirlist_nb++;
-          }
-          
-          @closedir($v_folder_handler);
-        }
-        else {
-          // TBC : unable to open folder in read mode
-        }
-        
-        // ----- Expand each element of the list
-        if ($v_dirlist_nb != 0) {
-          // ----- Expand
-          if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, $p_options)) != 1) {
-            return $v_result;
-          }
-          
-          // ----- Concat the resulting list
-          $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
-        }
-        else {
-        }
-          
-        // ----- Free local array
-        unset($v_dirlist_descr);
-      }
-    }
-    
-    // ----- Get the result list
-    $p_filedescr_list = $v_result_list;
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCreate()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_list_detail = array();
-    
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Open the file in write mode
-    if (($v_result = $this->privOpenFd('wb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Add the list of files
-    $v_result = $this->privAddList($p_filedescr_list, $p_result_list, $p_options);
-
-    // ----- Close
-    $this->privCloseFd();
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAdd()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_list_detail = array();
-
-    // ----- Look if the archive exists or is empty
-    if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0))
-    {
-
-      // ----- Do a create
-      $v_result = $this->privCreate($p_filedescr_list, $p_result_list, $p_options);
-
-      // ----- Return
-      return $v_result;
-    }
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Magic quotes trick
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
-    $this->zip_ftell = 0;
-
-    // ----- Creates a temporay file
-    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
-
-    // ----- Open the temporary file in write mode
-    $v_zip_temp_ftell = 0;
-    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
-    {
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
-
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = $v_central_dir['offset'];
-    $this->zip_ftell += $v_size;
-    $v_zip_temp_ftell += $v_size;
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Swap the file descriptor
-    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
-    // the following methods on the temporary fil and not the real archive
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-    $v_swap = $this->zip_ftell;
-    $this->zip_ftell = $v_zip_temp_ftell;
-    $v_zip_temp_ftell = $v_swap;
-
-    // ----- Add the files
-    $v_header_list = array();
-    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
-    {
-      fclose($v_zip_temp_fd);
-      $this->privCloseFd();
-      @unlink($v_zip_temp_name);
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Store the offset of the central dir
-    $v_offset = $this->zip_ftell;
-
-    // ----- Copy the block of file headers from the old archive
-    $v_size = $v_central_dir['size'];
-    $this->zip_ftell += $v_size;
-    $v_zip_temp_ftell += $v_size;
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_zip_temp_fd, $v_read_size);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Create the Central Dir files header
-    for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++)
-    {
-      // ----- Create the file header
-      if ($v_header_list[$i]['status'] == 'ok') {
-        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-          fclose($v_zip_temp_fd);
-          $this->privCloseFd();
-          @unlink($v_zip_temp_name);
-          $this->privSwapBackMagicQuotes();
-
-          // ----- Return
-          return $v_result;
-        }
-        $v_count++;
-      }
-
-      // ----- Transform the header to a 'usable' info
-      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-    }
-
-    // ----- Zip file comment
-    $v_comment = $v_central_dir['comment'];
-    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-    }
-    if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) {
-      $v_comment = $v_comment.$p_options[PCLZIP_OPT_ADD_COMMENT];
-    }
-    if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT].$v_comment;
-    }
-
-    // ----- Calculate the size of the central header
-    $v_size = $this->zip_ftell-$v_offset;
-
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_count+$v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)
-    {
-      // ----- Reset the file list
-      unset($v_header_list);
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Swap back the file descriptor
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-    $v_swap = $this->zip_ftell;
-    $this->zip_ftell = $v_zip_temp_ftell;
-    $v_zip_temp_ftell = $v_swap;
-    
-    // ----- Close
-    $this->privCloseFd();
-
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Delete the zip file
-    // TBC : I should test the result ...
-    @unlink($this->zipname);
-
-    // ----- Rename the temporary file
-    // TBC : I should test the result ...
-    //@rename($v_zip_temp_name, $this->zipname);
-    PclZipUtilRename($v_zip_temp_name, $this->zipname);
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privOpenFd()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privOpenFd($p_mode)
-  {
-    $v_result=1;
-
-    // ----- Look if already open
-    if ($this->zip_fd != 0)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \''.$this->zipname.'\' already open');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Open the zip file
-    $this->zip_ftell = 0;
-    if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0)
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in '.$p_mode.' mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCloseFd()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privCloseFd()
-  {
-    $v_result=1;
-
-    if ($this->zip_fd != 0)
-      @fclose($this->zip_fd);
-    $this->zip_fd = 0;
-    $this->zip_ftell = 0;
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddList()
-  // Description :
-  //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
-  //   different from the real path of the file. This is usefull if you want to have PclTar
-  //   running in any directory, and memorize relative path from an other directory.
-  // Parameters :
-  //   $p_list : An array containing the file or directory names to add in the tar
-  //   $p_result_list : list of added files with their properties (specially the status field)
-  //   $p_add_dir : Path to add in the filename path archived
-  //   $p_remove_dir : Path to remove in the filename path archived
-  // Return Values :
-  // --------------------------------------------------------------------------------
-//  function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
-  function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Add the files
-    $v_header_list = array();
-    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Store the offset of the central dir
-    $v_offset = $this->zip_ftell;
-
-    // ----- Create the Central Dir files header
-    for ($i=0,$v_count=0; $i<sizeof($v_header_list); $i++)
-    {
-      // ----- Create the file header
-      if ($v_header_list[$i]['status'] == 'ok') {
-        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-          // ----- Return
-          return $v_result;
-        }
-        $v_count++;
-      }
-
-      // ----- Transform the header to a 'usable' info
-      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-    }
-
-    // ----- Zip file comment
-    $v_comment = '';
-    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-    }
-
-    // ----- Calculate the size of the central header
-    $v_size = $this->zip_ftell-$v_offset;
-
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1)
-    {
-      // ----- Reset the file list
-      unset($v_header_list);
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddFileList()
-  // Description :
-  // Parameters :
-  //   $p_filedescr_list : An array containing the file description 
-  //                      or directory names to add in the zip
-  //   $p_result_list : list of added files with their properties (specially the status field)
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_header = array();
-
-    // ----- Recuperate the current number of elt in list
-    $v_nb = sizeof($p_result_list);
-
-    // ----- Loop on the files
-    for ($j=0; ($j<sizeof($p_filedescr_list)) && ($v_result==1); $j++) {
-      // ----- Format the filename
-      $p_filedescr_list[$j]['filename']
-      = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
-      
-
-      // ----- Skip empty file names
-      // TBC : Can this be possible ? not checked in DescrParseAtt ?
-      if ($p_filedescr_list[$j]['filename'] == "") {
-        continue;
-      }
-
-      // ----- Check the filename
-      if (   ($p_filedescr_list[$j]['type'] != 'virtual_file')
-          && (!file_exists($p_filedescr_list[$j]['filename']))) {
-        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$p_filedescr_list[$j]['filename']."' does not exist");
-        return PclZip::errorCode();
-      }
-
-      // ----- Look if it is a file or a dir with no all path remove option
-      // or a dir with all its path removed
-//      if (   (is_file($p_filedescr_list[$j]['filename']))
-//          || (   is_dir($p_filedescr_list[$j]['filename'])
-      if (   ($p_filedescr_list[$j]['type'] == 'file')
-          || ($p_filedescr_list[$j]['type'] == 'virtual_file')
-          || (   ($p_filedescr_list[$j]['type'] == 'folder')
-              && (   !isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])
-                  || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))
-          ) {
-
-        // ----- Add the file
-        $v_result = $this->privAddFile($p_filedescr_list[$j], $v_header,
-                                       $p_options);
-        if ($v_result != 1) {
-          return $v_result;
-        }
-
-        // ----- Store the file infos
-        $p_result_list[$v_nb++] = $v_header;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAddFile($p_filedescr, &$p_header, &$p_options)
-  {
-    $v_result=1;
-    
-    // ----- Working variable
-    $p_filename = $p_filedescr['filename'];
-
-    // TBC : Already done in the fileAtt check ... ?
-    if ($p_filename == "") {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-  
-    // ----- Look for a stored different filename 
-    /* TBC : Removed
-    if (isset($p_filedescr['stored_filename'])) {
-      $v_stored_filename = $p_filedescr['stored_filename'];
-    }
-    else {
-      $v_stored_filename = $p_filedescr['stored_filename'];
-    }
-    */
-
-    // ----- Set the file properties
-    clearstatcache();
-    $p_header['version'] = 20;
-    $p_header['version_extracted'] = 10;
-    $p_header['flag'] = 0;
-    $p_header['compression'] = 0;
-    $p_header['crc'] = 0;
-    $p_header['compressed_size'] = 0;
-    $p_header['filename_len'] = strlen($p_filename);
-    $p_header['extra_len'] = 0;
-    $p_header['disk'] = 0;
-    $p_header['internal'] = 0;
-    $p_header['offset'] = 0;
-    $p_header['filename'] = $p_filename;
-// TBC : Removed    $p_header['stored_filename'] = $v_stored_filename;
-    $p_header['stored_filename'] = $p_filedescr['stored_filename'];
-    $p_header['extra'] = '';
-    $p_header['status'] = 'ok';
-    $p_header['index'] = -1;
-
-    // ----- Look for regular file
-    if ($p_filedescr['type']=='file') {
-      $p_header['external'] = 0x00000000;
-      $p_header['size'] = filesize($p_filename);
-    }
-    
-    // ----- Look for regular folder
-    else if ($p_filedescr['type']=='folder') {
-      $p_header['external'] = 0x00000010;
-      $p_header['mtime'] = filemtime($p_filename);
-      $p_header['size'] = filesize($p_filename);
-    }
-    
-    // ----- Look for virtual file
-    else if ($p_filedescr['type'] == 'virtual_file') {
-      $p_header['external'] = 0x00000000;
-      $p_header['size'] = strlen($p_filedescr['content']);
-    }
-    
-
-    // ----- Look for filetime
-    if (isset($p_filedescr['mtime'])) {
-      $p_header['mtime'] = $p_filedescr['mtime'];
-    }
-    else if ($p_filedescr['type'] == 'virtual_file') {
-      $p_header['mtime'] = time();
-    }
-    else {
-      $p_header['mtime'] = filemtime($p_filename);
-    }
-
-    // ------ Look for file comment
-    if (isset($p_filedescr['comment'])) {
-      $p_header['comment_len'] = strlen($p_filedescr['comment']);
-      $p_header['comment'] = $p_filedescr['comment'];
-    }
-    else {
-      $p_header['comment_len'] = 0;
-      $p_header['comment'] = '';
-    }
-
-    // ----- Look for pre-add callback
-    if (isset($p_options[PCLZIP_CB_PRE_ADD])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_ADD].'(PCLZIP_CB_PRE_ADD, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_ADD](PCLZIP_CB_PRE_ADD, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_header['status'] = "skipped";
-        $v_result = 1;
-      }
-
-      // ----- Update the informations
-      // Only some fields can be modified
-      if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
-        $p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
-      }
-    }
-
-    // ----- Look for empty stored filename
-    if ($p_header['stored_filename'] == "") {
-      $p_header['status'] = "filtered";
-    }
-    
-    // ----- Check the path length
-    if (strlen($p_header['stored_filename']) > 0xFF) {
-      $p_header['status'] = 'filename_too_long';
-    }
-
-    // ----- Look if no error, or file not skipped
-    if ($p_header['status'] == 'ok') {
-
-      // ----- Look for a file
-      if ($p_filedescr['type'] == 'file') {
-        // ----- Look for using temporary file to zip
-        if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) 
-            && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
-                || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                    && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])) ) ) {
-          $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);
-          if ($v_result < PCLZIP_ERR_NO_ERROR) {
-            return $v_result;
-          }
-        }
-        
-        // ----- Use "in memory" zip algo
-        else {
-
-        // ----- Open the source file
-        if (($v_file = @fopen($p_filename, "rb")) == 0) {
-          PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
-          return PclZip::errorCode();
-        }
-
-        // ----- Read the file content
-        $v_content = @fread($v_file, $p_header['size']);
-
-        // ----- Close the file
-        @fclose($v_file);
-
-        // ----- Calculate the CRC
-        $p_header['crc'] = @crc32($v_content);
-        
-        // ----- Look for no compression
-        if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
-          // ----- Set header parameters
-          $p_header['compressed_size'] = $p_header['size'];
-          $p_header['compression'] = 0;
-        }
-        
-        // ----- Look for normal compression
-        else {
-          // ----- Compress the content
-          $v_content = @gzdeflate($v_content);
-
-          // ----- Set header parameters
-          $p_header['compressed_size'] = strlen($v_content);
-          $p_header['compression'] = 8;
-        }
-        
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-          @fclose($v_file);
-          return $v_result;
-        }
-
-        // ----- Write the compressed (or not) content
-        @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
-        $this->zip_ftell += $p_header['compressed_size'];
-
-        }
-
-      }
-
-      // ----- Look for a virtual file (a file from string)
-      else if ($p_filedescr['type'] == 'virtual_file') {
-          
-        $v_content = $p_filedescr['content'];
-
-        // ----- Calculate the CRC
-        $p_header['crc'] = @crc32($v_content);
-        
-        // ----- Look for no compression
-        if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
-          // ----- Set header parameters
-          $p_header['compressed_size'] = $p_header['size'];
-          $p_header['compression'] = 0;
-        }
-        
-        // ----- Look for normal compression
-        else {
-          // ----- Compress the content
-          $v_content = @gzdeflate($v_content);
-
-          // ----- Set header parameters
-          $p_header['compressed_size'] = strlen($v_content);
-          $p_header['compression'] = 8;
-        }
-        
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-          @fclose($v_file);
-          return $v_result;
-        }
-
-        // ----- Write the compressed (or not) content
-        @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
-        $this->zip_ftell += $p_header['compressed_size'];
-      }
-
-      // ----- Look for a directory
-      else if ($p_filedescr['type'] == 'folder') {
-        // ----- Look for directory last '/'
-        if (@substr($p_header['stored_filename'], -1) != '/') {
-          $p_header['stored_filename'] .= '/';
-        }
-
-        // ----- Set the file properties
-        $p_header['size'] = 0;
-        //$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
-        $p_header['external'] = 0x00000010;   // Value for a folder : to be checked
-
-        // ----- Call the header generation
-        if (($v_result = $this->privWriteFileHeader($p_header)) != 1)
-        {
-          return $v_result;
-        }
-      }
-    }
-
-    // ----- Look for post-add callback
-    if (isset($p_options[PCLZIP_CB_POST_ADD])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_ADD].'(PCLZIP_CB_POST_ADD, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_ADD](PCLZIP_CB_POST_ADD, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Ignored
-        $v_result = 1;
-      }
-
-      // ----- Update the informations
-      // Nothing can be modified
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privAddFileUsingTempFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
-  {
-    $v_result=PCLZIP_ERR_NO_ERROR;
-    
-    // ----- Working variable
-    $p_filename = $p_filedescr['filename'];
-
-
-    // ----- Open the source file
-    if (($v_file = @fopen($p_filename, "rb")) == 0) {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
-      return PclZip::errorCode();
-    }
-
-    // ----- Creates a compressed temporary file
-    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
-      if(function_exists('gzopen64')){
-          $v_file_compressed = @gzopen64($v_gzip_temp_name, "wb");
-      }else{
-          $v_file_compressed = @gzopen($v_gzip_temp_name, "wb");
-      }
-    if ($v_file_compressed == 0) {
-      fclose($v_file);
-      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = filesize($p_filename);
-    while ($v_size != 0) {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_file, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @gzputs($v_file_compressed, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Close the file
-    @fclose($v_file);
-    @gzclose($v_file_compressed);
-
-    // ----- Check the minimum file size
-    if (filesize($v_gzip_temp_name) < 18) {
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \''.$v_gzip_temp_name.'\' has invalid filesize - should be minimum 18 bytes');
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the compressed attributes
-    if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the gzip file header
-    $v_binary_data = @fread($v_file_compressed, 10);
-    $v_data_header = unpack('a1id1/a1id2/a1cm/a1flag/Vmtime/a1xfl/a1os', $v_binary_data);
-
-    // ----- Check some parameters
-    $v_data_header['os'] = bin2hex($v_data_header['os']);
-
-    // ----- Read the gzip file footer
-    @fseek($v_file_compressed, filesize($v_gzip_temp_name)-8);
-    $v_binary_data = @fread($v_file_compressed, 8);
-    $v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);
-
-    // ----- Set the attributes
-    $p_header['compression'] = ord($v_data_header['cm']);
-    //$p_header['mtime'] = $v_data_header['mtime'];
-    $p_header['crc'] = $v_data_footer['crc'];
-    $p_header['compressed_size'] = filesize($v_gzip_temp_name)-18;
-
-    // ----- Close the file
-    @fclose($v_file_compressed);
-
-    // ----- Call the header generation
-    if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
-      return $v_result;
-    }
-
-    // ----- Add the compressed data
-    if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0)
-    {
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    fseek($v_file_compressed, 10);
-    $v_size = $p_header['compressed_size'];
-    $this->zip_ftell += $v_size;
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_file_compressed, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Close the file
-    @fclose($v_file_compressed);
-
-    // ----- Unlink the temporary file
-    @unlink($v_gzip_temp_name);
-    
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCalculateStoredFilename()
-  // Description :
-  //   Based on file descriptor properties and global options, this method
-  //   calculate the filename that will be stored in the archive.
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privCalculateStoredFilename(&$p_filedescr, &$p_options)
-  {
-    $v_result=1;
-    
-    // ----- Working variables
-    $p_filename = $p_filedescr['filename'];
-    if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
-      $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
-    }
-    else {
-      $p_add_dir = '';
-    }
-    if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
-      $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
-    }
-    else {
-      $p_remove_dir = '';
-    }
-    if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
-      $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
-    }
-    else {
-      $p_remove_all_dir = 0;
-    }
-
-
-    // ----- Look for full name change
-    if (isset($p_filedescr['new_full_name'])) {
-      // ----- Remove drive letter if any
-      $v_stored_filename = PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);
-    }
-    
-    // ----- Look for path and/or short name change
-    else {
-
-      // ----- Look for short name change
-      // Its when we cahnge just the filename but not the path
-      if (isset($p_filedescr['new_short_name'])) {
-        $v_path_info = pathinfo($p_filename);
-        $v_dir = '';
-        if ($v_path_info['dirname'] != '') {
-          $v_dir = $v_path_info['dirname'].'/';
-        }
-        $v_stored_filename = $v_dir.$p_filedescr['new_short_name'];
-      }
-      else {
-        // ----- Calculate the stored filename
-        $v_stored_filename = $p_filename;
-      }
-
-      // ----- Look for all path to remove
-      if ($p_remove_all_dir) {
-        $v_stored_filename = basename($p_filename);
-      }
-      // ----- Look for partial path remove
-      else if ($p_remove_dir != "") {
-        if (substr($p_remove_dir, -1) != '/')
-          $p_remove_dir .= "/";
-
-        if (   (substr($p_filename, 0, 2) == "./")
-            || (substr($p_remove_dir, 0, 2) == "./")) {
-            
-          if (   (substr($p_filename, 0, 2) == "./")
-              && (substr($p_remove_dir, 0, 2) != "./")) {
-            $p_remove_dir = "./".$p_remove_dir;
-          }
-          if (   (substr($p_filename, 0, 2) != "./")
-              && (substr($p_remove_dir, 0, 2) == "./")) {
-            $p_remove_dir = substr($p_remove_dir, 2);
-          }
-        }
-
-        $v_compare = PclZipUtilPathInclusion($p_remove_dir,
-                                             $v_stored_filename);
-        if ($v_compare > 0) {
-          if ($v_compare == 2) {
-            $v_stored_filename = "";
-          }
-          else {
-            $v_stored_filename = substr($v_stored_filename,
-                                        strlen($p_remove_dir));
-          }
-        }
-      }
-      
-      // ----- Remove drive letter if any
-      $v_stored_filename = PclZipUtilTranslateWinPath($v_stored_filename);
-      
-      // ----- Look for path to add
-      if ($p_add_dir != "") {
-        if (substr($p_add_dir, -1) == "/")
-          $v_stored_filename = $p_add_dir.$v_stored_filename;
-        else
-          $v_stored_filename = $p_add_dir."/".$v_stored_filename;
-      }
-    }
-
-    // ----- Filename (reduce the path of stored name)
-    $v_stored_filename = PclZipUtilPathReduction($v_stored_filename);
-    $p_filedescr['stored_filename'] = $v_stored_filename;
-    
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privWriteFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privWriteFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // ----- Store the offset position of the file
-    $p_header['offset'] = $this->zip_ftell;
-
-    // ----- Transform UNIX mtime to DOS format mdate/mtime
-    $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
-
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50,
-	                      $p_header['version_extracted'], $p_header['flag'],
-                          $p_header['compression'], $v_mtime, $v_mdate,
-                          $p_header['crc'], $p_header['compressed_size'],
-						  $p_header['size'],
-                          strlen($p_header['stored_filename']),
-						  $p_header['extra_len']);
-
-    // ----- Write the first 148 bytes of the header in the archive
-    fputs($this->zip_fd, $v_binary_data, 30);
-    $this->zip_ftell += 30;
-
-    // ----- Write the variable fields
-    if (strlen($p_header['stored_filename']) != 0)
-    {
-      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
-      $this->zip_ftell += strlen($p_header['stored_filename']);
-    }
-    if ($p_header['extra_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
-      $this->zip_ftell += $p_header['extra_len'];
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privWriteCentralFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privWriteCentralFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // TBC
-    //for(reset($p_header); $key = key($p_header); next($p_header)) {
-    //}
-
-    // ----- Transform UNIX mtime to DOS format mdate/mtime
-    $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
-
-
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50,
-	                      $p_header['version'], $p_header['version_extracted'],
-                          $p_header['flag'], $p_header['compression'],
-						  $v_mtime, $v_mdate, $p_header['crc'],
-                          $p_header['compressed_size'], $p_header['size'],
-                          strlen($p_header['stored_filename']),
-						  $p_header['extra_len'], $p_header['comment_len'],
-                          $p_header['disk'], $p_header['internal'],
-						  $p_header['external'], $p_header['offset']);
-
-    // ----- Write the 42 bytes of the header in the zip file
-    fputs($this->zip_fd, $v_binary_data, 46);
-    $this->zip_ftell += 46;
-
-    // ----- Write the variable fields
-    if (strlen($p_header['stored_filename']) != 0)
-    {
-      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
-      $this->zip_ftell += strlen($p_header['stored_filename']);
-    }
-    if ($p_header['extra_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
-      $this->zip_ftell += $p_header['extra_len'];
-    }
-    if ($p_header['comment_len'] != 0)
-    {
-      fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']);
-      $this->zip_ftell += $p_header['comment_len'];
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privWriteCentralHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
-  {
-    $v_result=1;
-
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries,
-	                      $p_nb_entries, $p_size,
-						  $p_offset, strlen($p_comment));
-
-    // ----- Write the 22 bytes of the header in the zip file
-    fputs($this->zip_fd, $v_binary_data, 22);
-    $this->zip_ftell += 22;
-
-    // ----- Write the variable fields
-    if (strlen($p_comment) != 0)
-    {
-      fputs($this->zip_fd, $p_comment, strlen($p_comment));
-      $this->zip_ftell += strlen($p_comment);
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privList()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privList(&$p_list)
-  {
-    $v_result=1;
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Open the zip file
-    $this->zip_ftell = 0;
-    if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
-    {
-      // ----- Magic quotes trick
-      $this->privSwapBackMagicQuotes();
-      
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of Central Dir
-    @rewind($this->zip_fd);
-    $this->zip_ftell = 0;
-    if (@fseek($this->zip_fd, $v_central_dir['offset']))
-    {
-      $this->privSwapBackMagicQuotes();
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-    $this->zip_ftell = $v_central_dir['offset'];
-
-    // ----- Read each entry
-    for ($i=0; $i<$v_central_dir['entries']; $i++)
-    {
-      // ----- Read the file header
-      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
-      {
-        $this->privSwapBackMagicQuotes();
-        return $v_result;
-      }
-      $v_header['index'] = $i;
-
-      // ----- Get the only interesting attributes
-      $this->privConvertHeader2FileInfo($v_header, $p_list[$i]);
-      unset($v_header);
-    }
-
-    // ----- Close the zip file
-    $this->privCloseFd();
-
-    // ----- Magic quotes trick
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privConvertHeader2FileInfo()
-  // Description :
-  //   This function takes the file informations from the central directory
-  //   entries and extract the interesting parameters that will be given back.
-  //   The resulting file infos are set in the array $p_info
-  //     $p_info['filename'] : Filename with full path. Given by user (add),
-  //                           extracted in the filesystem (extract).
-  //     $p_info['stored_filename'] : Stored filename in the archive.
-  //     $p_info['size'] = Size of the file.
-  //     $p_info['compressed_size'] = Compressed size of the file.
-  //     $p_info['mtime'] = Last modification date of the file.
-  //     $p_info['comment'] = Comment associated with the file.
-  //     $p_info['folder'] = true/false : indicates if the entry is a folder or not.
-  //     $p_info['status'] = status of the action on the file.
-  //     $p_info['crc'] = CRC of the file content.
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privConvertHeader2FileInfo($p_header, &$p_info)
-  {
-    $v_result=1;
-
-    // ----- Get the interesting attributes
-    $v_temp_path = PclZipUtilPathReduction($p_header['filename']);
-    $p_info['filename'] = $v_temp_path;
-    $v_temp_path = PclZipUtilPathReduction($p_header['stored_filename']);
-    $p_info['stored_filename'] = $v_temp_path;
-    $p_info['size'] = $p_header['size'];
-    $p_info['compressed_size'] = $p_header['compressed_size'];
-    $p_info['mtime'] = $p_header['mtime'];
-    $p_info['comment'] = $p_header['comment'];
-    $p_info['folder'] = (($p_header['external']&0x00000010)==0x00000010);
-    $p_info['index'] = $p_header['index'];
-    $p_info['status'] = $p_header['status'];
-    $p_info['crc'] = $p_header['crc'];
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractByRule()
-  // Description :
-  //   Extract a file or directory depending of rules (by index, by name, ...)
-  // Parameters :
-  //   $p_file_list : An array where will be placed the properties of each
-  //                  extracted file
-  //   $p_path : Path to add while writing the extracted files
-  //   $p_remove_path : Path to remove (from the file memorized path) while writing the
-  //                    extracted files. If the path does not match the file path,
-  //                    the file is extracted with its memorized path.
-  //                    $p_remove_path does not apply to 'list' mode.
-  //                    $p_path and $p_remove_path are commulative.
-  // Return Values :
-  //   1 on success,0 or less on error (see error code list)
-  // --------------------------------------------------------------------------------
-  function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Magic quotes trick
-    $this->privDisableMagicQuotes();
-
-    // ----- Check the path
-    if (   ($p_path == "")
-	    || (   (substr($p_path, 0, 1) != "/")
-		    && (substr($p_path, 0, 3) != "../")
-			&& (substr($p_path,1,2)!=":/")))
-      $p_path = "./".$p_path;
-
-    // ----- Reduce the path last (and duplicated) '/'
-    if (($p_path != "./") && ($p_path != "/"))
-    {
-      // ----- Look for the path end '/'
-      while (substr($p_path, -1) == "/")
-      {
-        $p_path = substr($p_path, 0, strlen($p_path)-1);
-      }
-    }
-
-    // ----- Look for path to remove format (should end by /)
-    if (($p_remove_path != "") && (substr($p_remove_path, -1) != '/'))
-    {
-      $p_remove_path .= '/';
-    }
-    $p_remove_path_size = strlen($p_remove_path);
-
-    // ----- Open the zip file
-    if (($v_result = $this->privOpenFd('rb')) != 1)
-    {
-      $this->privSwapBackMagicQuotes();
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      // ----- Close the zip file
-      $this->privCloseFd();
-      $this->privSwapBackMagicQuotes();
-
-      return $v_result;
-    }
-
-    // ----- Start at beginning of Central Dir
-    $v_pos_entry = $v_central_dir['offset'];
-
-    // ----- Read each entry
-    $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
-    {
-
-      // ----- Read next Central dir entry
-      @rewind($this->zip_fd);
-      $this->zip_ftell = 0;
-      if (@fseek($this->zip_fd, $v_pos_entry))
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-        $this->privSwapBackMagicQuotes();
-
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-      $this->zip_ftell = $v_pos_entry;
-
-      // ----- Read the file header
-      $v_header = array();
-      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-        $this->privSwapBackMagicQuotes();
-
-        return $v_result;
-      }
-
-      // ----- Store the index
-      $v_header['index'] = $i;
-
-      // ----- Store the file position
-      $v_pos_entry = $this->zip_ftell;
-
-      // ----- Look for the specific extract rules
-      $v_extract = false;
-
-      // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
-          && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
-
-          // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
-
-              // ----- Look for a directory
-              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
-
-                  // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
-                      && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_extract = true;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
-                  $v_extract = true;
-              }
-          }
-      }
-
-      // ----- Look for extract by ereg rule
-      // ereg() is deprecated with PHP 5.3
-      /* 
-      else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
-               && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
-
-          if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header['stored_filename'])) {
-              $v_extract = true;
-          }
-      }
-      */
-
-      // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
-               && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
-
-          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
-              $v_extract = true;
-          }
-      }
-
-      // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
-               && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
-          
-          // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
-
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
-                  $v_extract = true;
-              }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
-              }
-
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
-                  break;
-              }
-          }
-      }
-
-      // ----- Look for no rule, which means extract all the archive
-      else {
-          $v_extract = true;
-      }
-
-	  // ----- Check compression method
-	  if (   ($v_extract)
-	      && (   ($v_header['compression'] != 8)
-		      && ($v_header['compression'] != 0))) {
-          $v_header['status'] = 'unsupported_compression';
-
-          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-              $this->privSwapBackMagicQuotes();
-              
-              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION,
-			                       "Filename '".$v_header['stored_filename']."' is "
-				  	    	  	   ."compressed by an unsupported compression "
-				  	    	  	   ."method (".$v_header['compression'].") ");
-
-              return PclZip::errorCode();
-		  }
-	  }
-	  
-	  // ----- Check encrypted files
-	  if (($v_extract) && (($v_header['flag'] & 1) == 1)) {
-          $v_header['status'] = 'unsupported_encryption';
-
-          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-              $this->privSwapBackMagicQuotes();
-
-              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION,
-			                       "Unsupported encryption for "
-				  	    	  	   ." filename '".$v_header['stored_filename']
-								   ."'");
-
-              return PclZip::errorCode();
-		  }
-    }
-
-      // ----- Look for real extraction
-      if (($v_extract) && ($v_header['status'] != 'ok')) {
-          $v_result = $this->privConvertHeader2FileInfo($v_header,
-		                                        $p_file_list[$v_nb_extracted++]);
-          if ($v_result != 1) {
-              $this->privCloseFd();
-              $this->privSwapBackMagicQuotes();
-              return $v_result;
-          }
-
-          $v_extract = false;
-      }
-      
-      // ----- Look for real extraction
-      if ($v_extract)
-      {
-
-        // ----- Go to the file position
-        @rewind($this->zip_fd);
-        $this->zip_ftell = 0;
-        if (@fseek($this->zip_fd, $v_header['offset']))
-        {
-          // ----- Close the zip file
-          $this->privCloseFd();
-
-          $this->privSwapBackMagicQuotes();
-
-          // ----- Error log
-          PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-          // ----- Return
-          return PclZip::errorCode();
-        }
-        $this->zip_ftell = $v_header['offset'];
-
-        // ----- Look for extraction as string
-        if ($p_options[PCLZIP_OPT_EXTRACT_AS_STRING]) {
-
-          $v_string = '';
-
-          // ----- Extracting the file
-          $v_result1 = $this->privExtractFileAsString($v_header, $v_string, $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
-
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1)
-          {
-            // ----- Close the zip file
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-
-            return $v_result;
-          }
-
-          // ----- Set the file content
-          $p_file_list[$v_nb_extracted]['content'] = $v_string;
-
-          // ----- Next extracted file
-          $v_nb_extracted++;
-          
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-          	break;
-          }
-        }
-        // ----- Look for extraction in standard output
-        elseif (   (isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))
-		        && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
-          // ----- Extracting the file in standard output
-          $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
-
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result;
-          }
-
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-          	break;
-          }
-        }
-        // ----- Look for normal extraction
-        else {
-          // ----- Extracting the file
-          $v_result1 = $this->privExtractFile($v_header,
-		                                      $p_path, $p_remove_path,
-											  $p_remove_all_path,
-											  $p_options);
-          if ($v_result1 < 1) {
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-            return $v_result1;
-          }
-
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1)
-          {
-            // ----- Close the zip file
-            $this->privCloseFd();
-            $this->privSwapBackMagicQuotes();
-
-            return $v_result;
-          }
-
-          // ----- Look for user callback abort
-          if ($v_result1 == 2) {
-          	break;
-          }
-        }
-      }
-    }
-
-    // ----- Close the zip file
-    $this->privCloseFd();
-    $this->privSwapBackMagicQuotes();
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  //
-  // 1 : ... ?
-  // PCLZIP_ERR_USER_ABORTED(2) : User ask for extraction stop in callback
-  // --------------------------------------------------------------------------------
-  function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Read the file header
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
-
-    // ----- Look for all path to remove
-    if ($p_remove_all_path == true) {
-        // ----- Look for folder entry that not need to be extracted
-        if (($p_entry['external']&0x00000010)==0x00000010) {
-
-            $p_entry['status'] = "filtered";
-
-            return $v_result;
-        }
-
-        // ----- Get the basename of the path
-        $p_entry['filename'] = basename($p_entry['filename']);
-    }
-
-    // ----- Look for path to remove
-    else if ($p_remove_path != "")
-    {
-      if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2)
-      {
-
-        // ----- Change the file status
-        $p_entry['status'] = "filtered";
-
-        // ----- Return
-        return $v_result;
-      }
-
-      $p_remove_path_size = strlen($p_remove_path);
-      if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path)
-      {
-
-        // ----- Remove the path
-        $p_entry['filename'] = substr($p_entry['filename'], $p_remove_path_size);
-
-      }
-    }
-
-    // ----- Add the path
-    if ($p_path != '') {
-      $p_entry['filename'] = $p_path."/".$p_entry['filename'];
-    }
-    
-    // ----- Check a base_dir_restriction
-    if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
-      $v_inclusion
-      = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION],
-                                $p_entry['filename']); 
-      if ($v_inclusion == 0) {
-
-        PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION,
-			                     "Filename '".$p_entry['filename']."' is "
-								 ."outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
-
-        return PclZip::errorCode();
-      }
-    }
-
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
-        $v_result = 1;
-      }
-      
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
-
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-    // ----- Look for specific actions while the file exist
-    if (file_exists($p_entry['filename']))
-    {
-
-      // ----- Look if file is a directory
-      if (is_dir($p_entry['filename']))
-      {
-
-        // ----- Change the file status
-        $p_entry['status'] = "already_a_directory";
-        
-        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-        // For historical reason first PclZip implementation does not stop
-        // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-            PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY,
-			                     "Filename '".$p_entry['filename']."' is "
-								 ."already used by an existing directory");
-
-            return PclZip::errorCode();
-		    }
-      }
-      // ----- Look if file is write protected
-      else if (!is_writeable($p_entry['filename']))
-      {
-
-        // ----- Change the file status
-        $p_entry['status'] = "write_protected";
-
-        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-        // For historical reason first PclZip implementation does not stop
-        // when this kind of error occurs.
-        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
-			                     "Filename '".$p_entry['filename']."' exists "
-								 ."and is write protected");
-
-            return PclZip::errorCode();
-		    }
-      }
-
-      // ----- Look if the extracted file is older
-      else if (filemtime($p_entry['filename']) > $p_entry['mtime'])
-      {
-        // ----- Change the file status
-        if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
-		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {
-	  	  }
-		    else {
-            $p_entry['status'] = "newer_exist";
-
-            // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
-            // For historical reason first PclZip implementation does not stop
-            // when this kind of error occurs.
-            if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
-		        && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
-
-                PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
-			             "Newer version of '".$p_entry['filename']."' exists "
-					    ."and option PCLZIP_OPT_REPLACE_NEWER is not selected");
-
-                return PclZip::errorCode();
-		      }
-		    }
-      }
-      else {
-      }
-    }
-
-    // ----- Check the directory availability and create it if necessary
-    else {
-      if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/'))
-        $v_dir_to_check = $p_entry['filename'];
-      else if (!strstr($p_entry['filename'], "/"))
-        $v_dir_to_check = "";
-      else
-        $v_dir_to_check = dirname($p_entry['filename']);
-
-        if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
-  
-          // ----- Change the file status
-          $p_entry['status'] = "path_creation_fail";
-  
-          // ----- Return
-          //return $v_result;
-          $v_result = 1;
-        }
-      }
-    }
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010))
-      {
-        // ----- Look for not compressed file
-        if ($p_entry['compression'] == 0) {
-
-    		  // ----- Opening destination file
-          if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0)
-          {
-
-            // ----- Change the file status
-            $p_entry['status'] = "write_error";
-
-            // ----- Return
-            return $v_result;
-          }
-
-
-          // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-          $v_size = $p_entry['compressed_size'];
-          $this->zip_ftell += $v_size;
-          while ($v_size != 0)
-          {
-            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-            $v_buffer = @fread($this->zip_fd, $v_read_size);
-            /* Try to speed up the code
-            $v_binary_data = pack('a'.$v_read_size, $v_buffer);
-            @fwrite($v_dest_file, $v_binary_data, $v_read_size);
-            */
-            @fwrite($v_dest_file, $v_buffer, $v_read_size);            
-            $v_size -= $v_read_size;
-          }
-
-          // ----- Closing the destination file
-          fclose($v_dest_file);
-
-          // ----- Change the file mtime
-          touch($p_entry['filename'], $p_entry['mtime']);
-          
-
-        }
-        else {
-          // ----- TBC
-          // Need to be finished
-          if (($p_entry['flag'] & 1) == 1) {
-            PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \''.$p_entry['filename'].'\' is encrypted. Encrypted files are not supported.');
-            return PclZip::errorCode();
-          }
-
-
-          // ----- Look for using temporary file to unzip
-          if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) 
-              && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
-                  || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
-                      && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])) ) ) {
-            $v_result = $this->privExtractFileUsingTempFile($p_entry, $p_options);
-            if ($v_result < PCLZIP_ERR_NO_ERROR) {
-              return $v_result;
-            }
-          }
-          
-          // ----- Look for extract in memory
-          else {
-
-          
-            // ----- Read the compressed file in a buffer (one shot)
-            $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-            $this->zip_ftell += $p_entry['compressed_size'];
-            
-            // ----- Decompress the file
-            $v_file_content = @gzinflate($v_buffer);
-            unset($v_buffer);
-            if ($v_file_content === FALSE) {
-  
-              // ----- Change the file status
-              // TBC
-              $p_entry['status'] = "error";
-              
-              return $v_result;
-            }
-            
-            // ----- Opening destination file
-            if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
-  
-              // ----- Change the file status
-              $p_entry['status'] = "write_error";
-  
-              return $v_result;
-            }
-  
-            // ----- Write the uncompressed data
-            @fwrite($v_dest_file, $v_file_content, $p_entry['size']);
-            unset($v_file_content);
-  
-            // ----- Closing the destination file
-            @fclose($v_dest_file);
-            
-          }
-
-          // ----- Change the file mtime
-          @touch($p_entry['filename'], $p_entry['mtime']);
-        }
-
-        // ----- Look for chmod option
-        if (isset($p_options[PCLZIP_OPT_SET_CHMOD])) {
-
-          // ----- Change the mode of the file
-          @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);
-        }
-
-      }
-    }
-
-  	// ----- Change abort status
-  	if ($p_entry['status'] == "aborted") {
-        $p_entry['status'] = "skipped";
-  	}
-	
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFileUsingTempFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privExtractFileUsingTempFile(&$p_entry, &$p_options)
-  {
-    $v_result=1;
-        
-    // ----- Creates a temporary file
-    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
-    if (($v_dest_file = @fopen($v_gzip_temp_name, "wb")) == 0) {
-      fclose($v_file);
-      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
-      return PclZip::errorCode();
-    }
-
-
-    // ----- Write gz file format header
-    $v_binary_data = pack('va1a1Va1a1', 0x8b1f, Chr($p_entry['compression']), Chr(0x00), time(), Chr(0x00), Chr(3));
-    @fwrite($v_dest_file, $v_binary_data, 10);
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = $p_entry['compressed_size'];
-    $this->zip_ftell += $v_size;
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($this->zip_fd, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($v_dest_file, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Write gz file format footer
-    $v_binary_data = pack('VV', $p_entry['crc'], $p_entry['size']);
-    @fwrite($v_dest_file, $v_binary_data, 8);
-
-    // ----- Close the temporary file
-    @fclose($v_dest_file);
-
-    // ----- Opening destination file
-    if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
-      $p_entry['status'] = "write_error";
-      return $v_result;
-    }
-
-    // ----- Open the temporary gz file
-      if(function_exists('gzopen64')){
-          $v_src_file = @gzopen64($v_gzip_temp_name, 'rb');
-      }else{
-          $v_src_file = @gzopen($v_gzip_temp_name, 'rb');
-      }
-    if ($v_src_file == 0) {
-      @fclose($v_dest_file);
-      $p_entry['status'] = "read_error";
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
-      return PclZip::errorCode();
-    }
-
-
-    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
-    $v_size = $p_entry['size'];
-    while ($v_size != 0) {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @gzread($v_src_file, $v_read_size);
-      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
-      @fwrite($v_dest_file, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-    @fclose($v_dest_file);
-    @gzclose($v_src_file);
-
-    // ----- Delete the temporary file
-    @unlink($v_gzip_temp_name);
-    
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFileInOutput()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privExtractFileInOutput(&$p_entry, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Read the file header
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
-      return $v_result;
-    }
-
-
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
-
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
-        $v_result = 1;
-      }
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
-
-    // ----- Trace
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
-        // ----- Look for not compressed file
-        if ($p_entry['compressed_size'] == $p_entry['size']) {
-
-          // ----- Read the file in a buffer (one shot)
-          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-          $this->zip_ftell += $p_entry['compressed_size'];
-
-          // ----- Send the file to the output
-          echo $v_buffer;
-          unset($v_buffer);
-        }
-        else {
-
-          // ----- Read the compressed file in a buffer (one shot)
-          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-          $this->zip_ftell += $p_entry['compressed_size'];
-          
-          // ----- Decompress the file
-          $v_file_content = gzinflate($v_buffer);
-          unset($v_buffer);
-
-          // ----- Send the file to the output
-          echo $v_file_content;
-          unset($v_file_content);
-        }
-      }
-    }
-
-	// ----- Change abort status
-	if ($p_entry['status'] == "aborted") {
-      $p_entry['status'] = "skipped";
-	}
-
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
-
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privExtractFileAsString()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
-  {
-    $v_result=1;
-
-    // ----- Read the file header
-    $v_header = array();
-    if (($v_result = $this->privReadFileHeader($v_header)) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-
-    // ----- Check that the file header is coherent with $p_entry info
-    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
-        // TBC
-    }
-
-    // ----- Look for pre-extract callback
-    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
-        $v_result = 1;
-      }
-      
-      // ----- Look for abort result
-      if ($v_result == 2) {
-        // ----- This status is internal and will be changed in 'skipped'
-        $p_entry['status'] = "aborted";
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
-
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
-        // ----- Look for not compressed file
-  //      if ($p_entry['compressed_size'] == $p_entry['size'])
-        if ($p_entry['compression'] == 0) {
-  
-          // ----- Reading the file
-          $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
-          $this->zip_ftell += $p_entry['compressed_size'];
-        }
-        else {
-  
-          // ----- Reading the file
-          $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
-          $this->zip_ftell += $p_entry['compressed_size'];
-          
-          // ----- Decompress the file
-          if (($p_string = @gzinflate($v_data)) === FALSE) {
-              // TBC
-          }
-        }
-  
-        // ----- Trace
-      }
-      else {
-          // TBC : error : can not extract a folder in a string
-      }
-      
-    }
-
-  	// ----- Change abort status
-  	if ($p_entry['status'] == "aborted") {
-        $p_entry['status'] = "skipped";
-  	}
-	
-    // ----- Look for post-extract callback
-    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
-      
-      // ----- Swap the content to header
-      $v_local_header['content'] = $p_string;
-      $p_string = '';
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
-      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
-
-      // ----- Swap back the content to header
-      $p_string = $v_local_header['content'];
-      unset($v_local_header['content']);
-
-      // ----- Look for abort result
-      if ($v_result == 2) {
-      	$v_result = PCLZIP_ERR_USER_ABORTED;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privReadFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privReadFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // ----- Read the 4 bytes signature
-    $v_binary_data = @fread($this->zip_fd, 4);
-    $this->zip_ftell += 4;
-    $v_data = unpack('Vid', $v_binary_data);
-
-    // ----- Check signature
-    if ($v_data['id'] != 0x04034b50)
-    {
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the first 42 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 26);
-    $this->zip_ftell += 26;
-
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 26)
-    {
-      $p_header['filename'] = "";
-      $p_header['status'] = "invalid_header";
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the values
-    $v_data = unpack('vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $v_binary_data);
-
-    // ----- Get filename
-    $p_header['filename'] = fread($this->zip_fd, $v_data['filename_len']);
-    $this->zip_ftell += $v_data['filename_len'];
-
-    // ----- Get extra_fields
-    if ($v_data['extra_len'] != 0) {
-      $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
-      $this->zip_ftell += $v_data['extra_len'];
-    }
-    else {
-      $p_header['extra'] = '';
-    }
-
-    // ----- Extract properties
-    $p_header['version_extracted'] = $v_data['version'];
-    $p_header['compression'] = $v_data['compression'];
-    $p_header['size'] = $v_data['size'];
-    $p_header['compressed_size'] = $v_data['compressed_size'];
-    $p_header['crc'] = $v_data['crc'];
-    $p_header['flag'] = $v_data['flag'];
-    $p_header['filename_len'] = $v_data['filename_len'];
-
-    // ----- Recuperate date in UNIX format
-    $p_header['mdate'] = $v_data['mdate'];
-    $p_header['mtime'] = $v_data['mtime'];
-    if ($p_header['mdate'] && $p_header['mtime'])
-    {
-      // ----- Extract time
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
-
-      // ----- Extract date
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
-      $v_day = $p_header['mdate'] & 0x001F;
-
-      // ----- Get UNIX date format
-      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
-
-    }
-    else
-    {
-      $p_header['mtime'] = time();
-    }
-
-    // TBC
-    //for(reset($v_data); $key = key($v_data); next($v_data)) {
-    //}
-
-    // ----- Set the stored filename
-    $p_header['stored_filename'] = $p_header['filename'];
-
-    // ----- Set the status field
-    $p_header['status'] = "ok";
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privReadCentralFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privReadCentralFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // ----- Read the 4 bytes signature
-    $v_binary_data = @fread($this->zip_fd, 4);
-    $this->zip_ftell += 4;
-    $v_data = unpack('Vid', $v_binary_data);
-
-    // ----- Check signature
-    if ($v_data['id'] != 0x02014b50)
-    {
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Read the first 42 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 42);
-    $this->zip_ftell += 42;
-
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 42)
-    {
-      $p_header['filename'] = "";
-      $p_header['status'] = "invalid_header";
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the values
-    $p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data);
-
-    // ----- Get filename
-    if ($p_header['filename_len'] != 0) {
-      $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
-      $this->zip_ftell += $p_header['filename_len'];
-    } else {
-      $p_header['filename'] = '';
-    }
-
-    // ----- Get extra
-    if ($p_header['extra_len'] != 0) {
-      $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
-      $this->zip_ftell += $p_header['extra_len'];
-    } else {
-      $p_header['extra'] = '';
-    }
-
-    // ----- Get comment
-    if ($p_header['comment_len'] != 0) {
-      $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
-      $this->zip_ftell += $p_header['comment_len'];
-    } else {
-      $p_header['comment'] = '';
-    }
-
-    // ----- Extract properties
-
-    // ----- Recuperate date in UNIX format
-    //if ($p_header['mdate'] && $p_header['mtime'])
-    // TBC : bug : this was ignoring time with 0/0/0
-    if (1)
-    {
-      // ----- Extract time
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
-
-      // ----- Extract date
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
-      $v_day = $p_header['mdate'] & 0x001F;
-
-      // ----- Get UNIX date format
-      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
-
-    }
-    else
-    {
-      $p_header['mtime'] = time();
-    }
-
-    // ----- Set the stored filename
-    $p_header['stored_filename'] = $p_header['filename'];
-
-    // ----- Set default status to ok
-    $p_header['status'] = 'ok';
-
-    // ----- Look if it is a directory
-    if (substr($p_header['filename'], -1) == '/') {
-      //$p_header['external'] = 0x41FF0010;
-      $p_header['external'] = 0x00000010;
-    }
-
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privCheckFileHeaders()
-  // Description :
-  // Parameters :
-  // Return Values :
-  //   1 on success,
-  //   0 on error;
-  // --------------------------------------------------------------------------------
-  function privCheckFileHeaders(&$p_local_header, &$p_central_header)
-  {
-    $v_result=1;
-
-  	// ----- Check the static values
-  	// TBC
-  	if ($p_local_header['filename'] != $p_central_header['filename']) {
-  	}
-  	if ($p_local_header['version_extracted'] != $p_central_header['version_extracted']) {
-  	}
-  	if ($p_local_header['flag'] != $p_central_header['flag']) {
-  	}
-  	if ($p_local_header['compression'] != $p_central_header['compression']) {
-  	}
-  	if ($p_local_header['mtime'] != $p_central_header['mtime']) {
-  	}
-  	if ($p_local_header['filename_len'] != $p_central_header['filename_len']) {
-  	}
-  
-  	// ----- Look for flag bit 3
-  	if (($p_local_header['flag'] & 8) == 8) {
-          $p_local_header['size'] = $p_central_header['size'];
-          $p_local_header['compressed_size'] = $p_central_header['compressed_size'];
-          $p_local_header['crc'] = $p_central_header['crc'];
-  	}
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privReadEndCentralDir()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privReadEndCentralDir(&$p_central_dir)
-  {
-    $v_result=1;
-
-    // ----- Go to the end of the zip file
-    $v_size = filesize($this->zipname);
-    if (@fseek($this->zip_fd, $v_size))
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \''.$this->zipname.'\'');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-    $this->zip_ftell = $v_size;
-
-    // ----- First try : look if this is an archive with no commentaries (most of the time)
-    // in this case the end of central dir is at 22 bytes of the file end
-    $v_found = 0;
-    if ($v_size > 26) {
-      if (@fseek($this->zip_fd, $v_size-22))
-      {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-      $this->zip_ftell = $v_size-22;
-      $v_pos = $this->zip_ftell;
-
-      // ----- Read for bytes
-      $v_binary_data = @fread($this->zip_fd, 4);
-      $this->zip_ftell += 4;
-      $v_data = @unpack('Vid', $v_binary_data);
-
-      // ----- Check signature
-      if ($v_data['id'] == 0x06054b50) {
-        $v_found = 1;
-      }
-
-      $v_pos = $this->zip_ftell;
-    }
-
-    // ----- Go back to the maximum possible size of the Central Dir End Record
-    if (!$v_found) {
-      $v_maximum_size = 65557; // 0xFFFF + 22;
-      if ($v_maximum_size > $v_size)
-        $v_maximum_size = $v_size;
-      if (@fseek($this->zip_fd, $v_size-$v_maximum_size))
-      {
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-      $this->zip_ftell = $v_size-$v_maximum_size;
-
-      // ----- Read byte per byte in order to find the signature
-      $v_pos = $this->zip_ftell;
-      $v_bytes = 0x00000000;
-      while ($v_pos < $v_size)
-      {
-        // ----- Read a byte
-        $v_byte = @fread($this->zip_fd, 1);
-        $this->zip_ftell += 1;
-
-        // -----  Add the byte
-        //$v_bytes = ($v_bytes << 8) | Ord($v_byte);
-        // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number 
-        // Otherwise on systems where we have 64bit integers the check below for the magic number will fail. 
-        $v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte); 
-
-        // ----- Compare the bytes
-        if ($v_bytes == 0x504b0506)
-        {
-          $v_pos++;
-          break;
-        }
-
-        $v_pos++;
-      }
-
-      // ----- Look if not found end of central dir
-      if ($v_pos == $v_size)
-      {
-
-        // ----- Error log
-        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Unable to find End of Central Dir Record signature");
-
-        // ----- Return
-        return PclZip::errorCode();
-      }
-    }
-
-    // ----- Read the first 18 bytes of the header
-    $v_binary_data = fread($this->zip_fd, 18);
-    $this->zip_ftell += 18;
-
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 18)
-    {
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : ".strlen($v_binary_data));
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Extract the values
-    $v_data = unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size', $v_binary_data);
-
-    // ----- Check the global size
-    if (($v_pos + $v_data['comment_size'] + 18) != $v_size) {
-
-	  // ----- Removed in release 2.2 see readme file
-	  // The check of the file size is a little too strict.
-	  // Some bugs where found when a zip is encrypted/decrypted with 'crypt'.
-	  // While decrypted, zip has training 0 bytes
-	  if (0) {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT,
-	                       'The central dir is not at the end of the archive.'
-						   .' Some trailing bytes exists after the archive.');
-
-      // ----- Return
-      return PclZip::errorCode();
-	  }
-    }
-
-    // ----- Get comment
-    if ($v_data['comment_size'] != 0) {
-      $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);
-      $this->zip_ftell += $v_data['comment_size'];
-    }
-    else
-      $p_central_dir['comment'] = '';
-
-    $p_central_dir['entries'] = $v_data['entries'];
-    $p_central_dir['disk_entries'] = $v_data['disk_entries'];
-    $p_central_dir['offset'] = $v_data['offset'];
-    $p_central_dir['size'] = $v_data['size'];
-    $p_central_dir['disk'] = $v_data['disk'];
-    $p_central_dir['disk_start'] = $v_data['disk_start'];
-
-    // TBC
-    //for(reset($p_central_dir); $key = key($p_central_dir); next($p_central_dir)) {
-    //}
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDeleteByRule()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privDeleteByRule(&$p_result_list, &$p_options)
-  {
-    $v_result=1;
-    $v_list_detail = array();
-
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    // ----- Scan all the files
-    // ----- Start at beginning of Central Dir
-    $v_pos_entry = $v_central_dir['offset'];
-    @rewind($this->zip_fd);
-    $this->zip_ftell = 0;
-    if (@fseek($this->zip_fd, $v_pos_entry))
-    {
-      // ----- Close the zip file
-      $this->privCloseFd();
-
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-    $this->zip_ftell = $v_pos_entry;
-
-    // ----- Read each entry
-    $v_header_list = array();
-    $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
-    {
-
-      // ----- Read the file header
-      $v_header_list[$v_nb_extracted] = array();
-      if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1)
-      {
-        // ----- Close the zip file
-        $this->privCloseFd();
-
-        return $v_result;
-      }
-
-
-      // ----- Store the index
-      $v_header_list[$v_nb_extracted]['index'] = $i;
-
-      // ----- Look for the specific extract rules
-      $v_found = false;
-
-      // ----- Look for extract by name rule
-      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
-          && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
-
-          // ----- Look if the filename is in the list
-          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
-
-              // ----- Look for a directory
-              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
-
-                  // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
-                      && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_found = true;
-                  }
-                  elseif (   (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */
-                          && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
-                      $v_found = true;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
-                  $v_found = true;
-              }
-          }
-      }
-
-      // ----- Look for extract by ereg rule
-      // ereg() is deprecated with PHP 5.3
-      /*
-      else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
-               && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
-
-          if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
-              $v_found = true;
-          }
-      }
-      */
-
-      // ----- Look for extract by preg rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
-               && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
-
-          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
-              $v_found = true;
-          }
-      }
-
-      // ----- Look for extract by index rule
-      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
-               && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
-
-          // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
-
-              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
-                  $v_found = true;
-              }
-              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
-              }
-
-              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
-                  break;
-              }
-          }
-      }
-      else {
-      	$v_found = true;
-      }
-
-      // ----- Look for deletion
-      if ($v_found)
-      {
-        unset($v_header_list[$v_nb_extracted]);
-      }
-      else
-      {
-        $v_nb_extracted++;
-      }
-    }
-
-    // ----- Look if something need to be deleted
-    if ($v_nb_extracted > 0) {
-
-        // ----- Creates a temporay file
-        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
-
-        // ----- Creates a temporary zip archive
-        $v_temp_zip = new PclZip($v_zip_temp_name);
-
-        // ----- Open the temporary zip file in write mode
-        if (($v_result = $v_temp_zip->privOpenFd('wb')) != 1) {
-            $this->privCloseFd();
-
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Look which file need to be kept
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
-
-            // ----- Calculate the position of the header
-            @rewind($this->zip_fd);
-            $this->zip_ftell = 0;
-            if (@fseek($this->zip_fd,  $v_header_list[$i]['offset'])) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Error log
-                PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-                // ----- Return
-                return PclZip::errorCode();
-            }
-            $this->zip_ftell = $v_header_list[$i]['offset'];
-
-            // ----- Read the file header
-            $v_local_header = array();
-            if (($v_result = $this->privReadFileHeader($v_local_header)) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                return $v_result;
-            }
-            
-            // ----- Check that local file header is same as central file header
-            if ($this->privCheckFileHeaders($v_local_header,
-			                                $v_header_list[$i]) != 1) {
-                // TBC
-            }
-            unset($v_local_header);
-
-            // ----- Write the file header
-            if (($v_result = $v_temp_zip->privWriteFileHeader($v_header_list[$i])) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                return $v_result;
-            }
-
-            // ----- Read/write the data block
-            $this->zip_ftell += $v_header_list[$i]['compressed_size'];
-            $v_temp_zip->zip_fd += $v_header_list[$i]['compressed_size'];
-            if (($v_result = PclZipUtilCopyBlock($this->zip_fd, $v_temp_zip->zip_fd, $v_header_list[$i]['compressed_size'])) != 1) {
-                // ----- Close the zip file
-                $this->privCloseFd();
-                $v_temp_zip->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                return $v_result;
-            }
-        }
-
-        // ----- Store the offset of the central dir
-        $v_offset = $v_temp_zip->zip_ftell;
-
-        // ----- Re-Create the Central Dir files header
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
-            // ----- Create the file header
-            if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
-                $v_temp_zip->privCloseFd();
-                $this->privCloseFd();
-                @unlink($v_zip_temp_name);
-
-                // ----- Return
-                return $v_result;
-            }
-
-            // ----- Transform the header to a 'usable' info
-            $v_temp_zip->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-        }
-
-
-        // ----- Zip file comment
-        $v_comment = '';
-        if (isset($p_options[PCLZIP_OPT_COMMENT])) {
-          $v_comment = $p_options[PCLZIP_OPT_COMMENT];
-        }
-
-        // ----- Calculate the size of the central header
-        $v_size = $v_temp_zip->zip_ftell-$v_offset;
-
-        // ----- Create the central dir footer
-        if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
-            // ----- Reset the file list
-            unset($v_header_list);
-            $v_temp_zip->privCloseFd();
-            $this->privCloseFd();
-            @unlink($v_zip_temp_name);
-
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Close
-        $v_temp_zip->privCloseFd();
-        $this->privCloseFd();
-
-        // ----- Delete the zip file
-        // TBC : I should test the result ...
-        @unlink($this->zipname);
-
-        // ----- Rename the temporary file
-        // TBC : I should test the result ...
-        //@rename($v_zip_temp_name, $this->zipname);
-        PclZipUtilRename($v_zip_temp_name, $this->zipname);
-    
-        // ----- Destroy the temporary archive
-        unset($v_temp_zip);
-    }
-    
-    // ----- Remove every files : reset the file
-    else if ($v_central_dir['entries'] != 0) {
-        $this->privCloseFd();
-
-        if (($v_result = $this->privOpenFd('wb')) != 1) {
-          return $v_result;
-        }
-
-        if (($v_result = $this->privWriteCentralHeader(0, 0, 0, '')) != 1) {
-          return $v_result;
-        }
-
-        $this->privCloseFd();
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDirCheck()
-  // Description :
-  //   Check if a directory exists, if not it creates it and all the parents directory
-  //   which may be useful.
-  // Parameters :
-  //   $p_dir : Directory path to check.
-  // Return Values :
-  //    1 : OK
-  //   -1 : Unable to create directory
-  // --------------------------------------------------------------------------------
-  function privDirCheck($p_dir, $p_is_dir=false)
-  {
-    $v_result = 1;
-
-
-    // ----- Remove the final '/'
-    if (($p_is_dir) && (substr($p_dir, -1)=='/'))
-    {
-      $p_dir = substr($p_dir, 0, strlen($p_dir)-1);
-    }
-
-    // ----- Check the directory availability
-    if ((is_dir($p_dir)) || ($p_dir == ""))
-    {
-      return 1;
-    }
-
-    // ----- Extract parent directory
-    $p_parent_dir = dirname($p_dir);
-
-    // ----- Just a check
-    if ($p_parent_dir != $p_dir)
-    {
-      // ----- Look for parent directory
-      if ($p_parent_dir != "")
-      {
-        if (($v_result = $this->privDirCheck($p_parent_dir)) != 1)
-        {
-          return $v_result;
-        }
-      }
-    }
-
-    // ----- Create the directory
-    if (!@mkdir($p_dir, 0777))
-    {
-      // ----- Error log
-      PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privMerge()
-  // Description :
-  //   If $p_archive_to_add does not exist, the function exit with a success result.
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privMerge(&$p_archive_to_add)
-  {
-    $v_result=1;
-
-    // ----- Look if the archive_to_add exists
-    if (!is_file($p_archive_to_add->zipname))
-    {
-
-      // ----- Nothing to merge, so merge is a success
-      $v_result = 1;
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Look if the archive exists
-    if (!is_file($this->zipname))
-    {
-
-      // ----- Do a duplicate
-      $v_result = $this->privDuplicate($p_archive_to_add->zipname);
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('rb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->privCloseFd();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($this->zip_fd);
-    $this->zip_ftell = 0;
-
-    // ----- Open the archive_to_add file
-    if (($v_result=$p_archive_to_add->privOpenFd('rb')) != 1)
-    {
-      $this->privCloseFd();
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir_to_add = array();
-    if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
-
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($p_archive_to_add->zip_fd);
-    $p_archive_to_add->zip_ftell = 0;
-
-    // ----- Creates a temporay file
-    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
-
-    // ----- Open the temporary file in write mode
-    $v_zip_temp_ftell = 0;
-    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
-
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = $v_central_dir['offset'];
-    $this->zip_ftell += $v_size;
-    $v_zip_temp_ftell += $v_size;
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Copy the files from the archive_to_add into the temporary file
-    $v_size = $v_central_dir_to_add['offset'];
-    $p_archive_to_add->zip_ftell += $v_size;
-    $v_zip_temp_ftell += $v_size;
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($p_archive_to_add->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Store the offset of the central dir
-    $v_offset = $v_zip_temp_ftell;
-
-    // ----- Copy the block of file headers from the old archive
-    $v_size = $v_central_dir['size'];
-    $this->zip_ftell += $v_size;
-    $v_zip_temp_ftell += $v_size;
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($this->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Copy the block of file headers from the archive_to_add
-    $v_size = $v_central_dir_to_add['size'];
-    $p_archive_to_add->zip_ftell += $v_size;
-    $v_zip_temp_ftell += $v_size;
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($p_archive_to_add->zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Merge the file comments
-    $v_comment = $v_central_dir['comment'].' '.$v_central_dir_to_add['comment'];
-
-    // ----- Calculate the size of the (new) central header
-    $v_size = $v_zip_temp_ftell-$v_offset;
-
-    // ----- Swap the file descriptor
-    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
-    // the following methods on the temporary fil and not the real archive fd
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-    $v_swap = $this->zip_ftell;
-    $this->zip_ftell = $v_zip_temp_ftell;
-    $v_zip_temp_ftell = $v_swap;
-    
-    // ----- Create the central dir footer
-    if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries']+$v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1)
-    {
-      $this->privCloseFd();
-      $p_archive_to_add->privCloseFd();
-      @fclose($v_zip_temp_fd);
-      $this->zip_fd = null;
-      $this->zip_ftell = 0;
-
-      // ----- Reset the file list
-      unset($v_header_list);
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Swap back the file descriptor
-    $v_swap = $this->zip_fd;
-    $this->zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-    $v_swap = $this->zip_ftell;
-    $this->zip_ftell = $v_zip_temp_ftell;
-    $v_zip_temp_ftell = $v_swap;
-    
-    // ----- Close
-    $this->privCloseFd();
-    $p_archive_to_add->privCloseFd();
-
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
-
-    // ----- Delete the zip file
-    // TBC : I should test the result ...
-    @unlink($this->zipname);
-
-    // ----- Rename the temporary file
-    // TBC : I should test the result ...
-    //@rename($v_zip_temp_name, $this->zipname);
-    PclZipUtilRename($v_zip_temp_name, $this->zipname);
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDuplicate()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privDuplicate($p_archive_filename)
-  {
-    $v_result=1;
-
-    // ----- Look if the $p_archive_filename exists
-    if (!is_file($p_archive_filename))
-    {
-
-      // ----- Nothing to duplicate, so duplicate is a success.
-      $v_result = 1;
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Open the zip file
-    if (($v_result=$this->privOpenFd('wb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0)
-    {
-      $this->privCloseFd();
-
-      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \''.$p_archive_filename.'\' in binary write mode');
-
-      // ----- Return
-      return PclZip::errorCode();
-    }
-
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the central dir
-    $v_size = filesize($p_archive_filename);
-    $this->zip_ftell += $v_size;
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($v_zip_temp_fd, $v_read_size);
-      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Close
-    $this->privCloseFd();
-
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privErrorLog()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privErrorLog($p_error_code=0, $p_error_string='')
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      PclError($p_error_code, $p_error_string);
-    }
-    else {
-      $this->error_code = $p_error_code;
-      $this->error_string = $p_error_string;
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privErrorReset()
-  // Description :
-  // Parameters :
-  // --------------------------------------------------------------------------------
-  function privErrorReset()
-  {
-    if (PCLZIP_ERROR_EXTERNAL == 1) {
-      PclErrorReset();
-    }
-    else {
-      $this->error_code = 0;
-      $this->error_string = '';
-    }
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privDisableMagicQuotes()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privDisableMagicQuotes()
-  {
-    $v_result=1;
-
-    // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
-	    || (!function_exists("set_magic_quotes_runtime"))) {
-      return $v_result;
-	}
-
-    // ----- Look if already done
-    if ($this->magic_quotes_status != -1) {
-      return $v_result;
-	}
-
-	// ----- Get and memorize the magic_quote value
-	$this->magic_quotes_status = @get_magic_quotes_runtime();
-
-	// ----- Disable magic_quotes
-	if ($this->magic_quotes_status == 1) {
-	  @set_magic_quotes_runtime(0);
-	}
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : privSwapBackMagicQuotes()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function privSwapBackMagicQuotes()
-  {
-    $v_result=1;
-
-    // ----- Look if function exists
-    if (   (!function_exists("get_magic_quotes_runtime"))
-	    || (!function_exists("set_magic_quotes_runtime"))) {
-      return $v_result;
-	}
-
-    // ----- Look if something to do
-    if ($this->magic_quotes_status != -1) {
-      return $v_result;
-	}
-
-	// ----- Swap back magic_quotes
-	if ($this->magic_quotes_status == 1) {
-  	  @set_magic_quotes_runtime($this->magic_quotes_status);
-	}
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  }
-  // End of class
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilPathReduction()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function PclZipUtilPathReduction($p_dir)
-  {
-    $v_result = "";
-    $scheme = parse_url($p_dir, PHP_URL_SCHEME) != null;
-
-    // ----- Look for not empty path
-    if ($p_dir != "") {
-      // ----- Explode path by directory names
-      $v_list = explode("/", $p_dir);
-
-      // ----- Study directories from last to first
-      $v_skip = 0;
-      for ($i=sizeof($v_list)-1; $i>=0; $i--) {
-        // ----- Look for current path
-        if ($v_list[$i] == ".") {
-          // ----- Ignore this directory
-          // Should be the first $i=0, but no check is done
-        }
-        else if ($v_list[$i] == "..") {
-		  $v_skip++;
-        }
-        else if ($v_list[$i] == "") {
-		  // ----- First '/' i.e. root slash
-		  if ($i == 0) {
-            $v_result = "/".$v_result;
-		    if ($v_skip > 0) {
-		        // ----- It is an invalid path, so the path is not modified
-		        // TBC
-		        $v_result = $p_dir;
-                $v_skip = 0;
-		    }
-		  }
-		  // ----- Last '/' i.e. indicates a directory
-		  else if ($i == (sizeof($v_list)-1)) {
-            $v_result = $v_list[$i];
-		  }
-		  // ----- Double '/' inside the path
-		  else {
-            // ----- Ignore only the double '//' in path,
-            // but not the first and last '/'
-		  }
-        }
-        else {
-		  // ----- Look for item to skip
-		  if ($v_skip > 0) {
-		    $v_skip--;
-		  }
-		  else {
-              if(stripos(PHP_OS, "win") === 0){
-                  if (substr($p_dir, 0, 3) == "smb") { 	  
-                      $v_result = (($i==0 && $scheme)? $v_list[$i]."/" : $v_list[$i]).($i!=(sizeof($v_list)-1)? "/".$v_result : "");
-                      } else { 
-                      $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)? "/".$v_result : "");
-                      } 
-              }else{
-                  $v_result = $v_list[$i].(( $i == 0 && $scheme)? "/" : "").($i!=(sizeof($v_list)-1)? "/".$v_result : "");
-              }
-		  }
-        }
-      }
-      
-      // ----- Look for skip
-      if ($v_skip > 0) {
-        while ($v_skip > 0) {
-            $v_result = '../'.$v_result;
-            $v_skip--;
-        }
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilPathInclusion()
-  // Description :
-  //   This function indicates if the path $p_path is under the $p_dir tree. Or,
-  //   said in an other way, if the file or sub-dir $p_path is inside the dir
-  //   $p_dir.
-  //   The function indicates also if the path is exactly the same as the dir.
-  //   This function supports path with duplicated '/' like '//', but does not
-  //   support '.' or '..' statements.
-  // Parameters :
-  // Return Values :
-  //   0 if $p_path is not inside directory $p_dir
-  //   1 if $p_path is inside directory $p_dir
-  //   2 if $p_path is exactly the same as $p_dir
-  // --------------------------------------------------------------------------------
-  function PclZipUtilPathInclusion($p_dir, $p_path)
-  {
-    $v_result = 1;
-    
-    // ----- Look for path beginning by ./
-    if (   ($p_dir == '.')
-        || ((strlen($p_dir) >=2) && (substr($p_dir, 0, 2) == './'))) {
-      $p_dir = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_dir, 1);
-    }
-    if (   ($p_path == '.')
-        || ((strlen($p_path) >=2) && (substr($p_path, 0, 2) == './'))) {
-      $p_path = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_path, 1);
-    }
-
-    // ----- Explode dir and path by directory separator
-    $v_list_dir = explode("/", $p_dir);
-    $v_list_dir_size = sizeof($v_list_dir);
-    $v_list_path = explode("/", $p_path);
-    $v_list_path_size = sizeof($v_list_path);
-
-    // ----- Study directories paths
-    $i = 0;
-    $j = 0;
-    while (($i < $v_list_dir_size) && ($j < $v_list_path_size) && ($v_result)) {
-
-      // ----- Look for empty dir (path reduction)
-      if ($v_list_dir[$i] == '') {
-        $i++;
-        continue;
-      }
-      if ($v_list_path[$j] == '') {
-        $j++;
-        continue;
-      }
-
-      // ----- Compare the items
-      if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ( $v_list_path[$j] != ''))  {
-        $v_result = 0;
-      }
-
-      // ----- Next items
-      $i++;
-      $j++;
-    }
-
-    // ----- Look if everything seems to be the same
-    if ($v_result) {
-      // ----- Skip all the empty items
-      while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) $j++;
-      while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) $i++;
-
-      if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {
-        // ----- There are exactly the same
-        $v_result = 2;
-      }
-      else if ($i < $v_list_dir_size) {
-        // ----- The path is shorter than the dir
-        $v_result = 0;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilCopyBlock()
-  // Description :
-  // Parameters :
-  //   $p_mode : read/write compression mode
-  //             0 : src & dest normal
-  //             1 : src gzip, dest normal
-  //             2 : src normal, dest gzip
-  //             3 : src & dest gzip
-  // Return Values :
-  // --------------------------------------------------------------------------------
-  function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
-  {
-    $v_result = 1;
-
-    if ($p_mode==0)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @fread($p_src, $v_read_size);
-        @fwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==1)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @gzread($p_src, $v_read_size);
-        @fwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==2)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @fread($p_src, $v_read_size);
-        @gzwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==3)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
-        $v_buffer = @gzread($p_src, $v_read_size);
-        @gzwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilRename()
-  // Description :
-  //   This function tries to do a simple rename() function. If it fails, it
-  //   tries to copy the $p_src file in a new $p_dest file and then unlink the
-  //   first one.
-  // Parameters :
-  //   $p_src : Old filename
-  //   $p_dest : New filename
-  // Return Values :
-  //   1 on success, 0 on failure.
-  // --------------------------------------------------------------------------------
-  function PclZipUtilRename($p_src, $p_dest)
-  {
-    $v_result = 1;
-
-    // ----- Try to rename the files
-    if (!@rename($p_src, $p_dest)) {
-
-      // ----- Try to copy & unlink the src
-      if (!@copy($p_src, $p_dest)) {
-        $v_result = 0;
-      }
-      else if (!@unlink($p_src)) {
-        $v_result = 0;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilOptionText()
-  // Description :
-  //   Translate option value in text. Mainly for debug purpose.
-  // Parameters :
-  //   $p_option : the option value.
-  // Return Values :
-  //   The option text value.
-  // --------------------------------------------------------------------------------
-  function PclZipUtilOptionText($p_option)
-  {
-    
-    $v_list = get_defined_constants();
-    for (reset($v_list); $v_key = key($v_list); next($v_list)) {
-	    $v_prefix = substr($v_key, 0, 10);
-	    if ((   ($v_prefix == 'PCLZIP_OPT')
-           || ($v_prefix == 'PCLZIP_CB_')
-           || ($v_prefix == 'PCLZIP_ATT'))
-	        && ($v_list[$v_key] == $p_option)) {
-        return $v_key;
-	    }
-    }
-    
-    $v_result = 'Unknown';
-
-    return $v_result;
-  }
-  // --------------------------------------------------------------------------------
-
-  // --------------------------------------------------------------------------------
-  // Function : PclZipUtilTranslateWinPath()
-  // Description :
-  //   Translate windows path by replacing '\' by '/' and optionally removing
-  //   drive letter.
-  // Parameters :
-  //   $p_path : path to translate.
-  //   $p_remove_disk_letter : true | false
-  // Return Values :
-  //   The path translated.
-  // --------------------------------------------------------------------------------
-  function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter=true)
-  {
-    if (stristr(php_uname(), 'windows')) {
-      // ----- Look for potential disk letter
-      if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
-          $p_path = substr($p_path, $v_position+1);
-      }
-      // ----- Change potential windows directory separator
-      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
-          $p_path = strtr($p_path, '\\', '/');
-      }
-    }
-    return $p_path;
-  }
-  // --------------------------------------------------------------------------------
-
-
-?>
+<?php
+// --------------------------------------------------------------------------------
+// PhpConcept Library - Zip Module 2.8.2
+// --------------------------------------------------------------------------------
+// License GNU/LGPL - Vincent Blavet - August 2009
+// http://www.phpconcept.net
+// --------------------------------------------------------------------------------
+//
+// Presentation :
+//   PclZip is a PHP library that manage ZIP archives.
+//   So far tests show that archives generated by PclZip are readable by
+//   WinZip application and other tools.
+//
+// Description :
+//   See readme.txt and http://www.phpconcept.net
+//
+// Warning :
+//   This library and the associated files are non commercial, non professional
+//   work.
+//   It should not have unexpected results. However if any damage is caused by
+//   this software the author can not be responsible.
+//   The use of this software is at the risk of the user.
+//
+// --------------------------------------------------------------------------------
+// $Id: pclzip.lib.php,v 1.60 2009/09/30 21:01:04 vblavet Exp $
+// --------------------------------------------------------------------------------
+
+  // ----- Constants
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Utils;
+
+if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
+    define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );
+  }
+  
+  // ----- File list separator
+  // In version 1.x of PclZip, the separator for file list is a space
+  // (which is not a very smart choice, specifically for windows paths !).
+  // A better separator should be a comma (,). This constant gives you the
+  // abilty to change that.
+  // However notice that changing this value, may have impact on existing
+  // scripts, using space separated filenames.
+  // Recommanded values for compatibility with older versions :
+  //define( 'PCLZIP_SEPARATOR', ' ' );
+  // Recommanded values for smart separation of filenames.
+  if (!defined('PCLZIP_SEPARATOR')) {
+    define( 'PCLZIP_SEPARATOR', ',' );
+  }
+
+  // ----- Error configuration
+  // 0 : PclZip Class integrated error handling
+  // 1 : PclError external library error handling. By enabling this
+  //     you must ensure that you have included PclError library.
+  // [2,...] : reserved for futur use
+  if (!defined('PCLZIP_ERROR_EXTERNAL')) {
+    define( 'PCLZIP_ERROR_EXTERNAL', 0 );
+  }
+
+  // ----- Optional static temporary directory
+  //       By default temporary files are generated in the script current
+  //       path.
+  //       If defined :
+  //       - MUST BE terminated by a '/'.
+  //       - MUST be a valid, already created directory
+  //       Samples :
+  // define( 'PCLZIP_TEMPORARY_DIR', '/temp/' );
+  // define( 'PCLZIP_TEMPORARY_DIR', 'C:/Temp/' );
+  if (!defined('PCLZIP_TEMPORARY_DIR')) {
+    define( 'PCLZIP_TEMPORARY_DIR', ApplicationState::getAjxpTmpDir() .DIRECTORY_SEPARATOR );
+  }
+
+  // ----- Optional threshold ratio for use of temporary files
+  //       Pclzip sense the size of the file to add/extract and decide to
+  //       use or not temporary file. The algorythm is looking for 
+  //       memory_limit of PHP and apply a ratio.
+  //       threshold = memory_limit * ratio.
+  //       Recommended values are under 0.5. Default 0.47.
+  //       Samples :
+  // define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.5 );
+  if (!defined('PCLZIP_TEMPORARY_FILE_RATIO')) {
+    define( 'PCLZIP_TEMPORARY_FILE_RATIO', 0.47 );
+  }
+
+// --------------------------------------------------------------------------------
+// ***** UNDER THIS LINE NOTHING NEEDS TO BE MODIFIED *****
+// --------------------------------------------------------------------------------
+
+  // ----- Global variables
+  $g_pclzip_version = "2.8.2";
+
+  // ----- Error codes
+  //   -1 : Unable to open file in binary write mode
+  //   -2 : Unable to open file in binary read mode
+  //   -3 : Invalid parameters
+  //   -4 : File does not exist
+  //   -5 : Filename is too long (max. 255)
+  //   -6 : Not a valid zip file
+  //   -7 : Invalid extracted file size
+  //   -8 : Unable to create directory
+  //   -9 : Invalid archive extension
+  //  -10 : Invalid archive format
+  //  -11 : Unable to delete file (unlink)
+  //  -12 : Unable to rename file (rename)
+  //  -13 : Invalid header checksum
+  //  -14 : Invalid archive size
+  define( 'PCLZIP_ERR_USER_ABORTED', 2 );
+  define( 'PCLZIP_ERR_NO_ERROR', 0 );
+  define( 'PCLZIP_ERR_WRITE_OPEN_FAIL', -1 );
+  define( 'PCLZIP_ERR_READ_OPEN_FAIL', -2 );
+  define( 'PCLZIP_ERR_INVALID_PARAMETER', -3 );
+  define( 'PCLZIP_ERR_MISSING_FILE', -4 );
+  define( 'PCLZIP_ERR_FILENAME_TOO_LONG', -5 );
+  define( 'PCLZIP_ERR_INVALID_ZIP', -6 );
+  define( 'PCLZIP_ERR_BAD_EXTRACTED_FILE', -7 );
+  define( 'PCLZIP_ERR_DIR_CREATE_FAIL', -8 );
+  define( 'PCLZIP_ERR_BAD_EXTENSION', -9 );
+  define( 'PCLZIP_ERR_BAD_FORMAT', -10 );
+  define( 'PCLZIP_ERR_DELETE_FILE_FAIL', -11 );
+  define( 'PCLZIP_ERR_RENAME_FILE_FAIL', -12 );
+  define( 'PCLZIP_ERR_BAD_CHECKSUM', -13 );
+  define( 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP', -14 );
+  define( 'PCLZIP_ERR_MISSING_OPTION_VALUE', -15 );
+  define( 'PCLZIP_ERR_INVALID_OPTION_VALUE', -16 );
+  define( 'PCLZIP_ERR_ALREADY_A_DIRECTORY', -17 );
+  define( 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION', -18 );
+  define( 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION', -19 );
+  define( 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE', -20 );
+  define( 'PCLZIP_ERR_DIRECTORY_RESTRICTION', -21 );
+
+  // ----- Options values
+  define( 'PCLZIP_OPT_PATH', 77001 );
+  define( 'PCLZIP_OPT_ADD_PATH', 77002 );
+  define( 'PCLZIP_OPT_REMOVE_PATH', 77003 );
+  define( 'PCLZIP_OPT_REMOVE_ALL_PATH', 77004 );
+  define( 'PCLZIP_OPT_SET_CHMOD', 77005 );
+  define( 'PCLZIP_OPT_EXTRACT_AS_STRING', 77006 );
+  define( 'PCLZIP_OPT_NO_COMPRESSION', 77007 );
+  define( 'PCLZIP_OPT_BY_NAME', 77008 );
+  define( 'PCLZIP_OPT_BY_INDEX', 77009 );
+  define( 'PCLZIP_OPT_BY_EREG', 77010 );
+  define( 'PCLZIP_OPT_BY_PREG', 77011 );
+  define( 'PCLZIP_OPT_COMMENT', 77012 );
+  define( 'PCLZIP_OPT_ADD_COMMENT', 77013 );
+  define( 'PCLZIP_OPT_PREPEND_COMMENT', 77014 );
+  define( 'PCLZIP_OPT_EXTRACT_IN_OUTPUT', 77015 );
+  define( 'PCLZIP_OPT_REPLACE_NEWER', 77016 );
+  define( 'PCLZIP_OPT_STOP_ON_ERROR', 77017 );
+  // Having big trouble with crypt. Need to multiply 2 long int
+  // which is not correctly supported by PHP ...
+  //define( 'PCLZIP_OPT_CRYPT', 77018 );
+  define( 'PCLZIP_OPT_EXTRACT_DIR_RESTRICTION', 77019 );
+  define( 'PCLZIP_OPT_TEMP_FILE_THRESHOLD', 77020 );
+  define( 'PCLZIP_OPT_ADD_TEMP_FILE_THRESHOLD', 77020 ); // alias
+  define( 'PCLZIP_OPT_TEMP_FILE_ON', 77021 );
+  define( 'PCLZIP_OPT_ADD_TEMP_FILE_ON', 77021 ); // alias
+  define( 'PCLZIP_OPT_TEMP_FILE_OFF', 77022 );
+  define( 'PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022 ); // alias
+  
+  // ----- File description attributes
+  define( 'PCLZIP_ATT_FILE_NAME', 79001 );
+  define( 'PCLZIP_ATT_FILE_NEW_SHORT_NAME', 79002 );
+  define( 'PCLZIP_ATT_FILE_NEW_FULL_NAME', 79003 );
+  define( 'PCLZIP_ATT_FILE_MTIME', 79004 );
+  define( 'PCLZIP_ATT_FILE_CONTENT', 79005 );
+  define( 'PCLZIP_ATT_FILE_COMMENT', 79006 );
+
+  // ----- Call backs values
+  define( 'PCLZIP_CB_PRE_EXTRACT', 78001 );
+  define( 'PCLZIP_CB_POST_EXTRACT', 78002 );
+  define( 'PCLZIP_CB_PRE_ADD', 78003 );
+  define( 'PCLZIP_CB_POST_ADD', 78004 );
+  /* For futur use
+  define( 'PCLZIP_CB_PRE_LIST', 78005 );
+  define( 'PCLZIP_CB_POST_LIST', 78006 );
+  define( 'PCLZIP_CB_PRE_DELETE', 78007 );
+  define( 'PCLZIP_CB_POST_DELETE', 78008 );
+  */
+
+  // --------------------------------------------------------------------------------
+  // Class : PclZip
+  // Description :
+  //   PclZip is the class that represent a Zip archive.
+  //   The public methods allow the manipulation of the archive.
+  // Attributes :
+  //   Attributes must not be accessed directly.
+  // Methods :
+  //   PclZip() : Object creator
+  //   create() : Creates the Zip archive
+  //   listContent() : List the content of the Zip archive
+  //   extract() : Extract the content of the archive
+  //   properties() : List the properties of the archive
+  // --------------------------------------------------------------------------------
+  class PclZip
+  {
+    // ----- Filename of the zip file
+    var $zipname = '';
+
+    // ----- File descriptor of the zip file
+    var $zip_fd = 0;
+
+    // ----- Internal error handling
+    var $error_code = 1;
+    var $error_string = '';
+    
+    // ----- Current status of the magic_quotes_runtime
+    // This value store the php configuration for magic_quotes
+    // The class can then disable the magic_quotes and reset it after
+    var $magic_quotes_status;
+
+  // --------------------------------------------------------------------------------
+  // Function : PclZip()
+  // Description :
+  //   Creates a PclZip object and set the name of the associated Zip archive
+  //   filename.
+  //   Note that no real action is taken, if the archive does not exist it is not
+  //   created. Use create() for that.
+  // --------------------------------------------------------------------------------
+  function __construct($p_zipname)
+  {
+
+    // ----- Tests the zlib
+    if (!function_exists('gzopen') && !function_exists('gzopen64'))
+    {
+      die('Abort '.basename(__FILE__).' : Missing zlib extensions');
+    }
+
+    // ----- Set the attributes
+    $this->zipname = $p_zipname;
+    $this->zip_fd = 0;
+    $this->magic_quotes_status = -1;
+
+    // ----- Return
+    return;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function :
+  //   create($p_filelist, $p_add_dir="", $p_remove_dir="")
+  //   create($p_filelist, $p_option, $p_option_value, ...)
+  // Description :
+  //   This method supports two different synopsis. The first one is historical.
+  //   This method creates a Zip Archive. The Zip file is created in the
+  //   filesystem. The files and directories indicated in $p_filelist
+  //   are added in the archive. See the parameters description for the
+  //   supported format of $p_filelist.
+  //   When a directory is in the list, the directory and its content is added
+  //   in the archive.
+  //   In this synopsis, the function takes an optional variable list of
+  //   options. See bellow the supported options.
+  // Parameters :
+  //   $p_filelist : An array containing file or directory names, or
+  //                 a string containing one filename or one directory name, or
+  //                 a string containing a list of filenames and/or directory
+  //                 names separated by spaces.
+  //   $p_add_dir : A path to add before the real path of the archived file,
+  //                in order to have it memorized in the archive.
+  //   $p_remove_dir : A path to remove from the real path of the file to archive,
+  //                   in order to have a shorter path memorized in the archive.
+  //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
+  //                   is removed first, before $p_add_dir is added.
+  // Options :
+  //   PCLZIP_OPT_ADD_PATH :
+  //   PCLZIP_OPT_REMOVE_PATH :
+  //   PCLZIP_OPT_REMOVE_ALL_PATH :
+  //   PCLZIP_OPT_COMMENT :
+  //   PCLZIP_CB_PRE_ADD :
+  //   PCLZIP_CB_POST_ADD :
+  // Return Values :
+  //   0 on failure,
+  //   The list of the added files, with a status of the add action.
+  //   (see PclZip::listContent() for list entry format)
+  // --------------------------------------------------------------------------------
+  function create($p_filelist)
+  {
+    $v_result=1;
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Set default values
+    $v_options = array();
+    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
+
+    // ----- Look for variable options arguments
+    $v_size = func_num_args();
+
+    // ----- Look for arguments
+    if ($v_size > 1) {
+      // ----- Get the arguments
+      $v_arg_list = func_get_args();
+
+      // ----- Remove from the options list the first argument
+      array_shift($v_arg_list);
+      $v_size--;
+
+      // ----- Look for first arg
+      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+        // ----- Parse the options
+        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
+                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                                                   PCLZIP_OPT_ADD_PATH => 'optional',
+                                                   PCLZIP_CB_PRE_ADD => 'optional',
+                                                   PCLZIP_CB_POST_ADD => 'optional',
+                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
+                                                   PCLZIP_OPT_COMMENT => 'optional',
+                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+                                                   //, PCLZIP_OPT_CRYPT => 'optional'
+                                             ));
+        if ($v_result != 1) {
+          return 0;
+        }
+      }
+
+      // ----- Look for 2 args
+      // Here we need to support the first historic synopsis of the
+      // method.
+      else {
+
+        // ----- Get the first argument
+        $v_options[PCLZIP_OPT_ADD_PATH] = $v_arg_list[0];
+
+        // ----- Look for the optional second argument
+        if ($v_size == 2) {
+          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
+        }
+        else if ($v_size > 2) {
+          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
+		                       "Invalid number / type of arguments");
+          return 0;
+        }
+      }
+    }
+    
+    // ----- Look for default option values
+    $this->privOptionDefaultThreshold($v_options);
+
+    // ----- Init
+    $v_string_list = array();
+    $v_att_list = array();
+    $v_filedescr_list = array();
+    $p_result_list = array();
+    
+    // ----- Look if the $p_filelist is really an array
+    if (is_array($p_filelist)) {
+    
+      // ----- Look if the first element is also an array
+      //       This will mean that this is a file description entry
+      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
+        $v_att_list = $p_filelist;
+      }
+      
+      // ----- The list is a list of string names
+      else {
+        $v_string_list = $p_filelist;
+      }
+    }
+
+    // ----- Look if the $p_filelist is a string
+    else if (is_string($p_filelist)) {
+      // ----- Create a list from the string
+      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
+    }
+
+    // ----- Invalid variable type for $p_filelist
+    else {
+      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_filelist");
+      return 0;
+    }
+    
+    // ----- Reformat the string list
+    if (sizeof($v_string_list) != 0) {
+      foreach ($v_string_list as $v_string) {
+        if ($v_string != '') {
+          $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
+        }
+        else {
+        }
+      }
+    }
+    
+    // ----- For each file in the list check the attributes
+    $v_supported_attributes
+    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
+             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
+             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
+             ,PCLZIP_ATT_FILE_MTIME => 'optional'
+             ,PCLZIP_ATT_FILE_CONTENT => 'optional'
+             ,PCLZIP_ATT_FILE_COMMENT => 'optional'
+						);
+    foreach ($v_att_list as $v_entry) {
+      $v_result = $this->privFileDescrParseAtt($v_entry,
+                                               $v_filedescr_list[],
+                                               $v_options,
+                                               $v_supported_attributes);
+      if ($v_result != 1) {
+        return 0;
+      }
+    }
+
+    // ----- Expand the filelist (expand directories)
+    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
+    if ($v_result != 1) {
+      return 0;
+    }
+
+    // ----- Call the create fct
+    $v_result = $this->privCreate($v_filedescr_list, $p_result_list, $v_options);
+    if ($v_result != 1) {
+      return 0;
+    }
+
+    // ----- Return
+    return $p_result_list;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function :
+  //   add($p_filelist, $p_add_dir="", $p_remove_dir="")
+  //   add($p_filelist, $p_option, $p_option_value, ...)
+  // Description :
+  //   This method supports two synopsis. The first one is historical.
+  //   This methods add the list of files in an existing archive.
+  //   If a file with the same name already exists, it is added at the end of the
+  //   archive, the first one is still present.
+  //   If the archive does not exist, it is created.
+  // Parameters :
+  //   $p_filelist : An array containing file or directory names, or
+  //                 a string containing one filename or one directory name, or
+  //                 a string containing a list of filenames and/or directory
+  //                 names separated by spaces.
+  //   $p_add_dir : A path to add before the real path of the archived file,
+  //                in order to have it memorized in the archive.
+  //   $p_remove_dir : A path to remove from the real path of the file to archive,
+  //                   in order to have a shorter path memorized in the archive.
+  //                   When $p_add_dir and $p_remove_dir are set, $p_remove_dir
+  //                   is removed first, before $p_add_dir is added.
+  // Options :
+  //   PCLZIP_OPT_ADD_PATH :
+  //   PCLZIP_OPT_REMOVE_PATH :
+  //   PCLZIP_OPT_REMOVE_ALL_PATH :
+  //   PCLZIP_OPT_COMMENT :
+  //   PCLZIP_OPT_ADD_COMMENT :
+  //   PCLZIP_OPT_PREPEND_COMMENT :
+  //   PCLZIP_CB_PRE_ADD :
+  //   PCLZIP_CB_POST_ADD :
+  // Return Values :
+  //   0 on failure,
+  //   The list of the added files, with a status of the add action.
+  //   (see PclZip::listContent() for list entry format)
+  // --------------------------------------------------------------------------------
+  function add($p_filelist)
+  {
+    $v_result=1;
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Set default values
+    $v_options = array();
+    $v_options[PCLZIP_OPT_NO_COMPRESSION] = FALSE;
+
+    // ----- Look for variable options arguments
+    $v_size = func_num_args();
+
+    // ----- Look for arguments
+    if ($v_size > 1) {
+      // ----- Get the arguments
+      $v_arg_list = func_get_args();
+
+      // ----- Remove form the options list the first argument
+      array_shift($v_arg_list);
+      $v_size--;
+
+      // ----- Look for first arg
+      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+        // ----- Parse the options
+        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+                                            array (PCLZIP_OPT_REMOVE_PATH => 'optional',
+                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                                                   PCLZIP_OPT_ADD_PATH => 'optional',
+                                                   PCLZIP_CB_PRE_ADD => 'optional',
+                                                   PCLZIP_CB_POST_ADD => 'optional',
+                                                   PCLZIP_OPT_NO_COMPRESSION => 'optional',
+                                                   PCLZIP_OPT_COMMENT => 'optional',
+                                                   PCLZIP_OPT_ADD_COMMENT => 'optional',
+                                                   PCLZIP_OPT_PREPEND_COMMENT => 'optional',
+                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+                                                   //, PCLZIP_OPT_CRYPT => 'optional'
+												   ));
+        if ($v_result != 1) {
+          return 0;
+        }
+      }
+
+      // ----- Look for 2 args
+      // Here we need to support the first historic synopsis of the
+      // method.
+      else {
+
+        // ----- Get the first argument
+        $v_options[PCLZIP_OPT_ADD_PATH] = $v_add_path = $v_arg_list[0];
+
+        // ----- Look for the optional second argument
+        if ($v_size == 2) {
+          $v_options[PCLZIP_OPT_REMOVE_PATH] = $v_arg_list[1];
+        }
+        else if ($v_size > 2) {
+          // ----- Error log
+          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+          // ----- Return
+          return 0;
+        }
+      }
+    }
+
+    // ----- Look for default option values
+    $this->privOptionDefaultThreshold($v_options);
+
+    // ----- Init
+    $v_string_list = array();
+    $v_att_list = array();
+    $v_filedescr_list = array();
+    $p_result_list = array();
+    
+    // ----- Look if the $p_filelist is really an array
+    if (is_array($p_filelist)) {
+    
+      // ----- Look if the first element is also an array
+      //       This will mean that this is a file description entry
+      if (isset($p_filelist[0]) && is_array($p_filelist[0])) {
+        $v_att_list = $p_filelist;
+      }
+      
+      // ----- The list is a list of string names
+      else {
+        $v_string_list = $p_filelist;
+      }
+    }
+
+    // ----- Look if the $p_filelist is a string
+    else if (is_string($p_filelist)) {
+      // ----- Create a list from the string
+      $v_string_list = explode(PCLZIP_SEPARATOR, $p_filelist);
+    }
+
+    // ----- Invalid variable type for $p_filelist
+    else {
+      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type '".gettype($p_filelist)."' for p_filelist");
+      return 0;
+    }
+    
+    // ----- Reformat the string list
+    if (sizeof($v_string_list) != 0) {
+      foreach ($v_string_list as $v_string) {
+        $v_att_list[][PCLZIP_ATT_FILE_NAME] = $v_string;
+      }
+    }
+    
+    // ----- For each file in the list check the attributes
+    $v_supported_attributes
+    = array ( PCLZIP_ATT_FILE_NAME => 'mandatory'
+             ,PCLZIP_ATT_FILE_NEW_SHORT_NAME => 'optional'
+             ,PCLZIP_ATT_FILE_NEW_FULL_NAME => 'optional'
+             ,PCLZIP_ATT_FILE_MTIME => 'optional'
+             ,PCLZIP_ATT_FILE_CONTENT => 'optional'
+             ,PCLZIP_ATT_FILE_COMMENT => 'optional'
+						);
+    foreach ($v_att_list as $v_entry) {
+      $v_result = $this->privFileDescrParseAtt($v_entry,
+                                               $v_filedescr_list[],
+                                               $v_options,
+                                               $v_supported_attributes);
+      if ($v_result != 1) {
+        return 0;
+      }
+    }
+
+    // ----- Expand the filelist (expand directories)
+    $v_result = $this->privFileDescrExpand($v_filedescr_list, $v_options);
+    if ($v_result != 1) {
+      return 0;
+    }
+
+    // ----- Call the create fct
+    $v_result = $this->privAdd($v_filedescr_list, $p_result_list, $v_options);
+    if ($v_result != 1) {
+      return 0;
+    }
+
+    // ----- Return
+    return $p_result_list;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : listContent()
+  // Description :
+  //   This public method, gives the list of the files and directories, with their
+  //   properties.
+  //   The properties of each entries in the list are (used also in other functions) :
+  //     filename : Name of the file. For a create or add action it is the filename
+  //                given by the user. For an extract function it is the filename
+  //                of the extracted file.
+  //     stored_filename : Name of the file / directory stored in the archive.
+  //     size : Size of the stored file.
+  //     compressed_size : Size of the file's data compressed in the archive
+  //                       (without the headers overhead)
+  //     mtime : Last known modification date of the file (UNIX timestamp)
+  //     comment : Comment associated with the file
+  //     folder : true | false
+  //     index : index of the file in the archive
+  //     status : status of the action (depending of the action) :
+  //              Values are :
+  //                ok : OK !
+  //                filtered : the file / dir is not extracted (filtered by user)
+  //                already_a_directory : the file can not be extracted because a
+  //                                      directory with the same name already exists
+  //                write_protected : the file can not be extracted because a file
+  //                                  with the same name already exists and is
+  //                                  write protected
+  //                newer_exist : the file was not extracted because a newer file exists
+  //                path_creation_fail : the file is not extracted because the folder
+  //                                     does not exist and can not be created
+  //                write_error : the file was not extracted because there was a
+  //                              error while writing the file
+  //                read_error : the file was not extracted because there was a error
+  //                             while reading the file
+  //                invalid_header : the file was not extracted because of an archive
+  //                                 format error (bad file header)
+  //   Note that each time a method can continue operating when there
+  //   is an action error on a file, the error is only logged in the file status.
+  // Return Values :
+  //   0 on an unrecoverable failure,
+  //   The list of the files in the archive.
+  // --------------------------------------------------------------------------------
+  function listContent()
+  {
+    $v_result=1;
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Check archive
+    if (!$this->privCheckFormat()) {
+      return(0);
+    }
+
+    // ----- Call the extracting fct
+    $p_list = array();
+    if (($v_result = $this->privList($p_list)) != 1)
+    {
+      unset($p_list);
+      return(0);
+    }
+
+    // ----- Return
+    return $p_list;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function :
+  //   extract($p_path="./", $p_remove_path="")
+  //   extract([$p_option, $p_option_value, ...])
+  // Description :
+  //   This method supports two synopsis. The first one is historical.
+  //   This method extract all the files / directories from the archive to the
+  //   folder indicated in $p_path.
+  //   If you want to ignore the 'root' part of path of the memorized files
+  //   you can indicate this in the optional $p_remove_path parameter.
+  //   By default, if a newer file with the same name already exists, the
+  //   file is not extracted.
+  //
+  //   If both PCLZIP_OPT_PATH and PCLZIP_OPT_ADD_PATH aoptions
+  //   are used, the path indicated in PCLZIP_OPT_ADD_PATH is append
+  //   at the end of the path value of PCLZIP_OPT_PATH.
+  // Parameters :
+  //   $p_path : Path where the files and directories are to be extracted
+  //   $p_remove_path : First part ('root' part) of the memorized path
+  //                    (if any similar) to remove while extracting.
+  // Options :
+  //   PCLZIP_OPT_PATH :
+  //   PCLZIP_OPT_ADD_PATH :
+  //   PCLZIP_OPT_REMOVE_PATH :
+  //   PCLZIP_OPT_REMOVE_ALL_PATH :
+  //   PCLZIP_CB_PRE_EXTRACT :
+  //   PCLZIP_CB_POST_EXTRACT :
+  // Return Values :
+  //   0 or a negative value on failure,
+  //   The list of the extracted files, with a status of the action.
+  //   (see PclZip::listContent() for list entry format)
+  // --------------------------------------------------------------------------------
+  function extract()
+  {
+    $v_result=1;
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Check archive
+    if (!$this->privCheckFormat()) {
+      return(0);
+    }
+
+    // ----- Set default values
+    $v_options = array();
+//    $v_path = "./";
+    $v_path = '';
+    $v_remove_path = "";
+    $v_remove_all_path = false;
+
+    // ----- Look for variable options arguments
+    $v_size = func_num_args();
+
+    // ----- Default values for option
+    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
+
+    // ----- Look for arguments
+    if ($v_size > 0) {
+      // ----- Get the arguments
+      $v_arg_list = func_get_args();
+
+      // ----- Look for first arg
+      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+        // ----- Parse the options
+        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+                                            array (PCLZIP_OPT_PATH => 'optional',
+                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
+                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                                                   PCLZIP_OPT_ADD_PATH => 'optional',
+                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
+                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
+                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
+                                                   PCLZIP_OPT_BY_NAME => 'optional',
+                                                   PCLZIP_OPT_BY_EREG => 'optional',
+                                                   PCLZIP_OPT_BY_PREG => 'optional',
+                                                   PCLZIP_OPT_BY_INDEX => 'optional',
+                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
+                                                   PCLZIP_OPT_EXTRACT_IN_OUTPUT => 'optional',
+                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
+                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
+                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
+                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+												    ));
+        if ($v_result != 1) {
+          return 0;
+        }
+
+        // ----- Set the arguments
+        if (isset($v_options[PCLZIP_OPT_PATH])) {
+          $v_path = $v_options[PCLZIP_OPT_PATH];
+        }
+        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
+          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
+        }
+        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+        }
+        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
+          // ----- Check for '/' in last path char
+          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
+            $v_path .= '/';
+          }
+          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
+        }
+      }
+
+      // ----- Look for 2 args
+      // Here we need to support the first historic synopsis of the
+      // method.
+      else {
+
+        // ----- Get the first argument
+        $v_path = $v_arg_list[0];
+
+        // ----- Look for the optional second argument
+        if ($v_size == 2) {
+          $v_remove_path = $v_arg_list[1];
+        }
+        else if ($v_size > 2) {
+          // ----- Error log
+          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+          // ----- Return
+          return 0;
+        }
+      }
+    }
+
+    // ----- Look for default option values
+    $this->privOptionDefaultThreshold($v_options);
+
+    // ----- Trace
+
+    // ----- Call the extracting fct
+    $p_list = array();
+    $v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path,
+	                                     $v_remove_all_path, $v_options);
+    if ($v_result < 1) {
+      unset($p_list);
+      return(0);
+    }
+
+    // ----- Return
+    return $p_list;
+  }
+  // --------------------------------------------------------------------------------
+
+
+  // --------------------------------------------------------------------------------
+  // Function :
+  //   extractByIndex($p_index, $p_path="./", $p_remove_path="")
+  //   extractByIndex($p_index, [$p_option, $p_option_value, ...])
+  // Description :
+  //   This method supports two synopsis. The first one is historical.
+  //   This method is doing a partial extract of the archive.
+  //   The extracted files or folders are identified by their index in the
+  //   archive (from 0 to n).
+  //   Note that if the index identify a folder, only the folder entry is
+  //   extracted, not all the files included in the archive.
+  // Parameters :
+  //   $p_index : A single index (integer) or a string of indexes of files to
+  //              extract. The form of the string is "0,4-6,8-12" with only numbers
+  //              and '-' for range or ',' to separate ranges. No spaces or ';'
+  //              are allowed.
+  //   $p_path : Path where the files and directories are to be extracted
+  //   $p_remove_path : First part ('root' part) of the memorized path
+  //                    (if any similar) to remove while extracting.
+  // Options :
+  //   PCLZIP_OPT_PATH :
+  //   PCLZIP_OPT_ADD_PATH :
+  //   PCLZIP_OPT_REMOVE_PATH :
+  //   PCLZIP_OPT_REMOVE_ALL_PATH :
+  //   PCLZIP_OPT_EXTRACT_AS_STRING : The files are extracted as strings and
+  //     not as files.
+  //     The resulting content is in a new field 'content' in the file
+  //     structure.
+  //     This option must be used alone (any other options are ignored).
+  //   PCLZIP_CB_PRE_EXTRACT :
+  //   PCLZIP_CB_POST_EXTRACT :
+  // Return Values :
+  //   0 on failure,
+  //   The list of the extracted files, with a status of the action.
+  //   (see PclZip::listContent() for list entry format)
+  // --------------------------------------------------------------------------------
+  //function extractByIndex($p_index, options...)
+  function extractByIndex($p_index)
+  {
+    $v_result=1;
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Check archive
+    if (!$this->privCheckFormat()) {
+      return(0);
+    }
+
+    // ----- Set default values
+    $v_options = array();
+//    $v_path = "./";
+    $v_path = '';
+    $v_remove_path = "";
+    $v_remove_all_path = false;
+
+    // ----- Look for variable options arguments
+    $v_size = func_num_args();
+
+    // ----- Default values for option
+    $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
+
+    // ----- Look for arguments
+    if ($v_size > 1) {
+      // ----- Get the arguments
+      $v_arg_list = func_get_args();
+
+      // ----- Remove form the options list the first argument
+      array_shift($v_arg_list);
+      $v_size--;
+
+      // ----- Look for first arg
+      if ((is_integer($v_arg_list[0])) && ($v_arg_list[0] > 77000)) {
+
+        // ----- Parse the options
+        $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+                                            array (PCLZIP_OPT_PATH => 'optional',
+                                                   PCLZIP_OPT_REMOVE_PATH => 'optional',
+                                                   PCLZIP_OPT_REMOVE_ALL_PATH => 'optional',
+                                                   PCLZIP_OPT_EXTRACT_AS_STRING => 'optional',
+                                                   PCLZIP_OPT_ADD_PATH => 'optional',
+                                                   PCLZIP_CB_PRE_EXTRACT => 'optional',
+                                                   PCLZIP_CB_POST_EXTRACT => 'optional',
+                                                   PCLZIP_OPT_SET_CHMOD => 'optional',
+                                                   PCLZIP_OPT_REPLACE_NEWER => 'optional'
+                                                   ,PCLZIP_OPT_STOP_ON_ERROR => 'optional'
+                                                   ,PCLZIP_OPT_EXTRACT_DIR_RESTRICTION => 'optional',
+                                                   PCLZIP_OPT_TEMP_FILE_THRESHOLD => 'optional',
+                                                   PCLZIP_OPT_TEMP_FILE_ON => 'optional',
+                                                   PCLZIP_OPT_TEMP_FILE_OFF => 'optional'
+												   ));
+        if ($v_result != 1) {
+          return 0;
+        }
+
+        // ----- Set the arguments
+        if (isset($v_options[PCLZIP_OPT_PATH])) {
+          $v_path = $v_options[PCLZIP_OPT_PATH];
+        }
+        if (isset($v_options[PCLZIP_OPT_REMOVE_PATH])) {
+          $v_remove_path = $v_options[PCLZIP_OPT_REMOVE_PATH];
+        }
+        if (isset($v_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+          $v_remove_all_path = $v_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+        }
+        if (isset($v_options[PCLZIP_OPT_ADD_PATH])) {
+          // ----- Check for '/' in last path char
+          if ((strlen($v_path) > 0) && (substr($v_path, -1) != '/')) {
+            $v_path .= '/';
+          }
+          $v_path .= $v_options[PCLZIP_OPT_ADD_PATH];
+        }
+        if (!isset($v_options[PCLZIP_OPT_EXTRACT_AS_STRING])) {
+          $v_options[PCLZIP_OPT_EXTRACT_AS_STRING] = FALSE;
+        }
+        else {
+        }
+      }
+
+      // ----- Look for 2 args
+      // Here we need to support the first historic synopsis of the
+      // method.
+      else {
+
+        // ----- Get the first argument
+        $v_path = $v_arg_list[0];
+
+        // ----- Look for the optional second argument
+        if ($v_size == 2) {
+          $v_remove_path = $v_arg_list[1];
+        }
+        else if ($v_size > 2) {
+          // ----- Error log
+          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid number / type of arguments");
+
+          // ----- Return
+          return 0;
+        }
+      }
+    }
+
+    // ----- Trace
+
+    // ----- Trick
+    // Here I want to reuse extractByRule(), so I need to parse the $p_index
+    // with privParseOptions()
+    $v_arg_trick = array (PCLZIP_OPT_BY_INDEX, $p_index);
+    $v_options_trick = array();
+    $v_result = $this->privParseOptions($v_arg_trick, sizeof($v_arg_trick), $v_options_trick,
+                                        array (PCLZIP_OPT_BY_INDEX => 'optional' ));
+    if ($v_result != 1) {
+        return 0;
+    }
+    $v_options[PCLZIP_OPT_BY_INDEX] = $v_options_trick[PCLZIP_OPT_BY_INDEX];
+
+    // ----- Look for default option values
+    $this->privOptionDefaultThreshold($v_options);
+
+    // ----- Call the extracting fct
+    if (($v_result = $this->privExtractByRule($p_list, $v_path, $v_remove_path, $v_remove_all_path, $v_options)) < 1) {
+        return(0);
+    }
+
+    // ----- Return
+    return $p_list;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function :
+  //   delete([$p_option, $p_option_value, ...])
+  // Description :
+  //   This method removes files from the archive.
+  //   If no parameters are given, then all the archive is emptied.
+  // Parameters :
+  //   None or optional arguments.
+  // Options :
+  //   PCLZIP_OPT_BY_INDEX :
+  //   PCLZIP_OPT_BY_NAME :
+  //   PCLZIP_OPT_BY_EREG : 
+  //   PCLZIP_OPT_BY_PREG :
+  // Return Values :
+  //   0 on failure,
+  //   The list of the files which are still present in the archive.
+  //   (see PclZip::listContent() for list entry format)
+  // --------------------------------------------------------------------------------
+  function delete()
+  {
+    $v_result=1;
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Check archive
+    if (!$this->privCheckFormat()) {
+      return(0);
+    }
+
+    // ----- Set default values
+    $v_options = array();
+
+    // ----- Look for variable options arguments
+    $v_size = func_num_args();
+
+    // ----- Look for arguments
+    if ($v_size > 0) {
+      // ----- Get the arguments
+      $v_arg_list = func_get_args();
+
+      // ----- Parse the options
+      $v_result = $this->privParseOptions($v_arg_list, $v_size, $v_options,
+                                        array (PCLZIP_OPT_BY_NAME => 'optional',
+                                               PCLZIP_OPT_BY_EREG => 'optional',
+                                               PCLZIP_OPT_BY_PREG => 'optional',
+                                               PCLZIP_OPT_BY_INDEX => 'optional' ));
+      if ($v_result != 1) {
+          return 0;
+      }
+    }
+
+    // ----- Magic quotes trick
+    $this->privDisableMagicQuotes();
+
+    // ----- Call the delete fct
+    $v_list = array();
+    if (($v_result = $this->privDeleteByRule($v_list, $v_options)) != 1) {
+      $this->privSwapBackMagicQuotes();
+      unset($v_list);
+      return(0);
+    }
+
+    // ----- Magic quotes trick
+    $this->privSwapBackMagicQuotes();
+
+    // ----- Return
+    return $v_list;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : deleteByIndex()
+  // Description :
+  //   ***** Deprecated *****
+  //   delete(PCLZIP_OPT_BY_INDEX, $p_index) should be prefered.
+  // --------------------------------------------------------------------------------
+  function deleteByIndex($p_index)
+  {
+    
+    $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
+
+    // ----- Return
+    return $p_list;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : properties()
+  // Description :
+  //   This method gives the properties of the archive.
+  //   The properties are :
+  //     nb : Number of files in the archive
+  //     comment : Comment associated with the archive file
+  //     status : not_exist, ok
+  // Parameters :
+  //   None
+  // Return Values :
+  //   0 on failure,
+  //   An array with the archive properties.
+  // --------------------------------------------------------------------------------
+  function properties()
+  {
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Magic quotes trick
+    $this->privDisableMagicQuotes();
+
+    // ----- Check archive
+    if (!$this->privCheckFormat()) {
+      $this->privSwapBackMagicQuotes();
+      return(0);
+    }
+
+    // ----- Default properties
+    $v_prop = array();
+    $v_prop['comment'] = '';
+    $v_prop['nb'] = 0;
+    $v_prop['status'] = 'not_exist';
+
+    // ----- Look if file exists
+    if (@is_file($this->zipname))
+    {
+      // ----- Open the zip file
+      if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
+      {
+        $this->privSwapBackMagicQuotes();
+        
+        // ----- Error log
+        PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
+
+        // ----- Return
+        return 0;
+      }
+
+      // ----- Read the central directory informations
+      $v_central_dir = array();
+      if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+      {
+        $this->privSwapBackMagicQuotes();
+        return 0;
+      }
+
+      // ----- Close the zip file
+      $this->privCloseFd();
+
+      // ----- Set the user attributes
+      $v_prop['comment'] = $v_central_dir['comment'];
+      $v_prop['nb'] = $v_central_dir['entries'];
+      $v_prop['status'] = 'ok';
+    }
+
+    // ----- Magic quotes trick
+    $this->privSwapBackMagicQuotes();
+
+    // ----- Return
+    return $v_prop;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : duplicate()
+  // Description :
+  //   This method creates an archive by copying the content of an other one. If
+  //   the archive already exist, it is replaced by the new one without any warning.
+  // Parameters :
+  //   $p_archive : The filename of a valid archive, or
+  //                a valid PclZip object.
+  // Return Values :
+  //   1 on success.
+  //   0 or a negative value on error (error code).
+  // --------------------------------------------------------------------------------
+  function duplicate($p_archive)
+  {
+    $v_result = 1;
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Look if the $p_archive is a PclZip object
+    if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip'))
+    {
+
+      // ----- Duplicate the archive
+      $v_result = $this->privDuplicate($p_archive->zipname);
+    }
+
+    // ----- Look if the $p_archive is a string (so a filename)
+    else if (is_string($p_archive))
+    {
+
+      // ----- Check that $p_archive is a valid zip file
+      // TBC : Should also check the archive format
+      if (!is_file($p_archive)) {
+        // ----- Error log
+        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "No file with filename '".$p_archive."'");
+        $v_result = PCLZIP_ERR_MISSING_FILE;
+      }
+      else {
+        // ----- Duplicate the archive
+        $v_result = $this->privDuplicate($p_archive);
+      }
+    }
+
+    // ----- Invalid variable
+    else
+    {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
+      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : merge()
+  // Description :
+  //   This method merge the $p_archive_to_add archive at the end of the current
+  //   one ($this).
+  //   If the archive ($this) does not exist, the merge becomes a duplicate.
+  //   If the $p_archive_to_add archive does not exist, the merge is a success.
+  // Parameters :
+  //   $p_archive_to_add : It can be directly the filename of a valid zip archive,
+  //                       or a PclZip object archive.
+  // Return Values :
+  //   1 on success,
+  //   0 or negative values on error (see below).
+  // --------------------------------------------------------------------------------
+  function merge($p_archive_to_add)
+  {
+    $v_result = 1;
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Check archive
+    if (!$this->privCheckFormat()) {
+      return(0);
+    }
+
+    // ----- Look if the $p_archive_to_add is a PclZip object
+    if ((is_object($p_archive_to_add)) && (get_class($p_archive_to_add) == 'pclzip'))
+    {
+
+      // ----- Merge the archive
+      $v_result = $this->privMerge($p_archive_to_add);
+    }
+
+    // ----- Look if the $p_archive_to_add is a string (so a filename)
+    else if (is_string($p_archive_to_add))
+    {
+
+      // ----- Create a temporary archive
+      $v_object_archive = new PclZip($p_archive_to_add);
+
+      // ----- Merge the archive
+      $v_result = $this->privMerge($v_object_archive);
+    }
+
+    // ----- Invalid variable
+    else
+    {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid variable type p_archive_to_add");
+      $v_result = PCLZIP_ERR_INVALID_PARAMETER;
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+
+
+  // --------------------------------------------------------------------------------
+  // Function : errorCode()
+  // Description :
+  // Parameters :
+  // --------------------------------------------------------------------------------
+  function errorCode()
+  {
+    if (PCLZIP_ERROR_EXTERNAL == 1) {
+      return(PclErrorCode());
+    }
+    else {
+      return($this->error_code);
+    }
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : errorName()
+  // Description :
+  // Parameters :
+  // --------------------------------------------------------------------------------
+  function errorName($p_with_code=false)
+  {
+    $v_name = array ( PCLZIP_ERR_NO_ERROR => 'PCLZIP_ERR_NO_ERROR',
+                      PCLZIP_ERR_WRITE_OPEN_FAIL => 'PCLZIP_ERR_WRITE_OPEN_FAIL',
+                      PCLZIP_ERR_READ_OPEN_FAIL => 'PCLZIP_ERR_READ_OPEN_FAIL',
+                      PCLZIP_ERR_INVALID_PARAMETER => 'PCLZIP_ERR_INVALID_PARAMETER',
+                      PCLZIP_ERR_MISSING_FILE => 'PCLZIP_ERR_MISSING_FILE',
+                      PCLZIP_ERR_FILENAME_TOO_LONG => 'PCLZIP_ERR_FILENAME_TOO_LONG',
+                      PCLZIP_ERR_INVALID_ZIP => 'PCLZIP_ERR_INVALID_ZIP',
+                      PCLZIP_ERR_BAD_EXTRACTED_FILE => 'PCLZIP_ERR_BAD_EXTRACTED_FILE',
+                      PCLZIP_ERR_DIR_CREATE_FAIL => 'PCLZIP_ERR_DIR_CREATE_FAIL',
+                      PCLZIP_ERR_BAD_EXTENSION => 'PCLZIP_ERR_BAD_EXTENSION',
+                      PCLZIP_ERR_BAD_FORMAT => 'PCLZIP_ERR_BAD_FORMAT',
+                      PCLZIP_ERR_DELETE_FILE_FAIL => 'PCLZIP_ERR_DELETE_FILE_FAIL',
+                      PCLZIP_ERR_RENAME_FILE_FAIL => 'PCLZIP_ERR_RENAME_FILE_FAIL',
+                      PCLZIP_ERR_BAD_CHECKSUM => 'PCLZIP_ERR_BAD_CHECKSUM',
+                      PCLZIP_ERR_INVALID_ARCHIVE_ZIP => 'PCLZIP_ERR_INVALID_ARCHIVE_ZIP',
+                      PCLZIP_ERR_MISSING_OPTION_VALUE => 'PCLZIP_ERR_MISSING_OPTION_VALUE',
+                      PCLZIP_ERR_INVALID_OPTION_VALUE => 'PCLZIP_ERR_INVALID_OPTION_VALUE',
+                      PCLZIP_ERR_UNSUPPORTED_COMPRESSION => 'PCLZIP_ERR_UNSUPPORTED_COMPRESSION',
+                      PCLZIP_ERR_UNSUPPORTED_ENCRYPTION => 'PCLZIP_ERR_UNSUPPORTED_ENCRYPTION'
+                      ,PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE => 'PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE'
+                      ,PCLZIP_ERR_DIRECTORY_RESTRICTION => 'PCLZIP_ERR_DIRECTORY_RESTRICTION'
+                    );
+
+    if (isset($v_name[$this->error_code])) {
+      $v_value = $v_name[$this->error_code];
+    }
+    else {
+      $v_value = 'NoName';
+    }
+
+    if ($p_with_code) {
+      return($v_value.' ('.$this->error_code.')');
+    }
+    else {
+      return($v_value);
+    }
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : errorInfo()
+  // Description :
+  // Parameters :
+  // --------------------------------------------------------------------------------
+  function errorInfo($p_full=false)
+  {
+    if (PCLZIP_ERROR_EXTERNAL == 1) {
+      return(PclErrorString());
+    }
+    else {
+      if ($p_full) {
+        return($this->errorName(true)." : ".$this->error_string);
+      }
+      else {
+        return($this->error_string." [code ".$this->error_code."]");
+      }
+    }
+  }
+  // --------------------------------------------------------------------------------
+
+
+// --------------------------------------------------------------------------------
+// ***** UNDER THIS LINE ARE DEFINED PRIVATE INTERNAL FUNCTIONS *****
+// *****                                                        *****
+// *****       THESES FUNCTIONS MUST NOT BE USED DIRECTLY       *****
+// --------------------------------------------------------------------------------
+
+
+
+  // --------------------------------------------------------------------------------
+  // Function : privCheckFormat()
+  // Description :
+  //   This method check that the archive exists and is a valid zip archive.
+  //   Several level of check exists. (futur)
+  // Parameters :
+  //   $p_level : Level of check. Default 0.
+  //              0 : Check the first bytes (magic codes) (default value))
+  //              1 : 0 + Check the central directory (futur)
+  //              2 : 1 + Check each file header (futur)
+  // Return Values :
+  //   true on success,
+  //   false on error, the error code is set.
+  // --------------------------------------------------------------------------------
+  function privCheckFormat($p_level=0)
+  {
+    $v_result = true;
+
+	// ----- Reset the file system cache
+    clearstatcache();
+
+    // ----- Reset the error handler
+    $this->privErrorReset();
+
+    // ----- Look if the file exits
+    if (!is_file($this->zipname)) {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "Missing archive file '".$this->zipname."'");
+      return(false);
+    }
+
+    // ----- Check that the file is readeable
+    if (!is_readable($this->zipname)) {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to read archive '".$this->zipname."'");
+      return(false);
+    }
+
+    // ----- Check the magic code
+    // TBC
+
+    // ----- Check the central header
+    // TBC
+
+    // ----- Check each file header
+    // TBC
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privParseOptions()
+  // Description :
+  //   This internal methods reads the variable list of arguments ($p_options_list,
+  //   $p_size) and generate an array with the options and values ($v_result_list).
+  //   $v_requested_options contains the options that can be present and those that
+  //   must be present.
+  //   $v_requested_options is an array, with the option value as key, and 'optional',
+  //   or 'mandatory' as value.
+  // Parameters :
+  //   See above.
+  // Return Values :
+  //   1 on success.
+  //   0 on failure.
+  // --------------------------------------------------------------------------------
+  function privParseOptions(&$p_options_list, $p_size, &$v_result_list, $v_requested_options=false)
+  {
+    $v_result=1;
+    
+    // ----- Read the options
+    $i=0;
+    while ($i<$p_size) {
+
+      // ----- Check if the option is supported
+      if (!isset($v_requested_options[$p_options_list[$i]])) {
+        // ----- Error log
+        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid optional parameter '".$p_options_list[$i]."' for this method");
+
+        // ----- Return
+        return PclZip::errorCode();
+      }
+
+      // ----- Look for next option
+      switch ($p_options_list[$i]) {
+        // ----- Look for options that request a path value
+        case PCLZIP_OPT_PATH :
+        case PCLZIP_OPT_REMOVE_PATH :
+        case PCLZIP_OPT_ADD_PATH :
+          // ----- Check the number of parameters
+          if (($i+1) >= $p_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+
+          // ----- Get the value
+          $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
+          $i++;
+        break;
+
+        case PCLZIP_OPT_TEMP_FILE_THRESHOLD :
+          // ----- Check the number of parameters
+          if (($i+1) >= $p_size) {
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+            return PclZip::errorCode();
+          }
+          
+          // ----- Check for incompatible options
+          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
+            return PclZip::errorCode();
+          }
+          
+          // ----- Check the value
+          $v_value = $p_options_list[$i+1];
+          if ((!is_integer($v_value)) || ($v_value<0)) {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Integer expected for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+            return PclZip::errorCode();
+          }
+
+          // ----- Get the value (and convert it in bytes)
+          $v_result_list[$p_options_list[$i]] = $v_value*1048576;
+          $i++;
+        break;
+
+        case PCLZIP_OPT_TEMP_FILE_ON :
+          // ----- Check for incompatible options
+          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_OFF'");
+            return PclZip::errorCode();
+          }
+          
+          $v_result_list[$p_options_list[$i]] = true;
+        break;
+
+        case PCLZIP_OPT_TEMP_FILE_OFF :
+          // ----- Check for incompatible options
+          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_ON])) {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_ON'");
+            return PclZip::errorCode();
+          }
+          // ----- Check for incompatible options
+          if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Option '".PclZipUtilOptionText($p_options_list[$i])."' can not be used with option 'PCLZIP_OPT_TEMP_FILE_THRESHOLD'");
+            return PclZip::errorCode();
+          }
+          
+          $v_result_list[$p_options_list[$i]] = true;
+        break;
+
+        case PCLZIP_OPT_EXTRACT_DIR_RESTRICTION :
+          // ----- Check the number of parameters
+          if (($i+1) >= $p_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+
+          // ----- Get the value
+          if (   is_string($p_options_list[$i+1])
+              && ($p_options_list[$i+1] != '')) {
+            $v_result_list[$p_options_list[$i]] = PclZipUtilTranslateWinPath($p_options_list[$i+1], FALSE);
+            $i++;
+          }
+          else {
+          }
+        break;
+
+        // ----- Look for options that request an array of string for value
+        case PCLZIP_OPT_BY_NAME :
+          // ----- Check the number of parameters
+          if (($i+1) >= $p_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+
+          // ----- Get the value
+          if (is_string($p_options_list[$i+1])) {
+              $v_result_list[$p_options_list[$i]][0] = $p_options_list[$i+1];
+          }
+          else if (is_array($p_options_list[$i+1])) {
+              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+          }
+          else {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+          $i++;
+        break;
+
+        // ----- Look for options that request an EREG or PREG expression
+        case PCLZIP_OPT_BY_EREG :
+          // ereg() is deprecated starting with PHP 5.3. Move PCLZIP_OPT_BY_EREG
+          // to PCLZIP_OPT_BY_PREG
+          $p_options_list[$i] = PCLZIP_OPT_BY_PREG;
+        case PCLZIP_OPT_BY_PREG :
+        //case PCLZIP_OPT_CRYPT :
+          // ----- Check the number of parameters
+          if (($i+1) >= $p_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+
+          // ----- Get the value
+          if (is_string($p_options_list[$i+1])) {
+              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+          }
+          else {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Wrong parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+          $i++;
+        break;
+
+        // ----- Look for options that takes a string
+        case PCLZIP_OPT_COMMENT :
+        case PCLZIP_OPT_ADD_COMMENT :
+        case PCLZIP_OPT_PREPEND_COMMENT :
+          // ----- Check the number of parameters
+          if (($i+1) >= $p_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE,
+			                     "Missing parameter value for option '"
+								 .PclZipUtilOptionText($p_options_list[$i])
+								 ."'");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+
+          // ----- Get the value
+          if (is_string($p_options_list[$i+1])) {
+              $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+          }
+          else {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE,
+			                     "Wrong parameter value for option '"
+								 .PclZipUtilOptionText($p_options_list[$i])
+								 ."'");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+          $i++;
+        break;
+
+        // ----- Look for options that request an array of index
+        case PCLZIP_OPT_BY_INDEX :
+          // ----- Check the number of parameters
+          if (($i+1) >= $p_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+
+          // ----- Get the value
+          $v_work_list = array();
+          if (is_string($p_options_list[$i+1])) {
+
+              // ----- Remove spaces
+              $p_options_list[$i+1] = strtr($p_options_list[$i+1], ' ', '');
+
+              // ----- Parse items
+              $v_work_list = explode(",", $p_options_list[$i+1]);
+          }
+          else if (is_integer($p_options_list[$i+1])) {
+              $v_work_list[0] = $p_options_list[$i+1].'-'.$p_options_list[$i+1];
+          }
+          else if (is_array($p_options_list[$i+1])) {
+              $v_work_list = $p_options_list[$i+1];
+          }
+          else {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Value must be integer, string or array for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+          
+          // ----- Reduce the index list
+          // each index item in the list must be a couple with a start and
+          // an end value : [0,3], [5-5], [8-10], ...
+          // ----- Check the format of each item
+          $v_sort_flag=false;
+          $v_sort_value=0;
+          for ($j=0; $j<sizeof($v_work_list); $j++) {
+              // ----- Explode the item
+              $v_item_list = explode("-", $v_work_list[$j]);
+              $v_size_item_list = sizeof($v_item_list);
+              
+              // ----- TBC : Here we might check that each item is a
+              // real integer ...
+              
+              // ----- Look for single value
+              if ($v_size_item_list == 1) {
+                  // ----- Set the option value
+                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
+                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[0];
+              }
+              elseif ($v_size_item_list == 2) {
+                  // ----- Set the option value
+                  $v_result_list[$p_options_list[$i]][$j]['start'] = $v_item_list[0];
+                  $v_result_list[$p_options_list[$i]][$j]['end'] = $v_item_list[1];
+              }
+              else {
+                  // ----- Error log
+                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Too many values in index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+                  // ----- Return
+                  return PclZip::errorCode();
+              }
+
+
+              // ----- Look for list sort
+              if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
+                  $v_sort_flag=true;
+
+                  // ----- TBC : An automatic sort should be writen ...
+                  // ----- Error log
+                  PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+                  // ----- Return
+                  return PclZip::errorCode();
+              }
+              $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
+          }
+          
+          // ----- Sort the items
+          if ($v_sort_flag) {
+              // TBC : To Be Completed
+          }
+
+          // ----- Next option
+          $i++;
+        break;
+
+        // ----- Look for options that request no value
+        case PCLZIP_OPT_REMOVE_ALL_PATH :
+        case PCLZIP_OPT_EXTRACT_AS_STRING :
+        case PCLZIP_OPT_NO_COMPRESSION :
+        case PCLZIP_OPT_EXTRACT_IN_OUTPUT :
+        case PCLZIP_OPT_REPLACE_NEWER :
+        case PCLZIP_OPT_STOP_ON_ERROR :
+          $v_result_list[$p_options_list[$i]] = true;
+        break;
+
+        // ----- Look for options that request an octal value
+        case PCLZIP_OPT_SET_CHMOD :
+          // ----- Check the number of parameters
+          if (($i+1) >= $p_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+
+          // ----- Get the value
+          $v_result_list[$p_options_list[$i]] = $p_options_list[$i+1];
+          $i++;
+        break;
+
+        // ----- Look for options that request a call-back
+        case PCLZIP_CB_PRE_EXTRACT :
+        case PCLZIP_CB_POST_EXTRACT :
+        case PCLZIP_CB_PRE_ADD :
+        case PCLZIP_CB_POST_ADD :
+        /* for futur use
+        case PCLZIP_CB_PRE_DELETE :
+        case PCLZIP_CB_POST_DELETE :
+        case PCLZIP_CB_PRE_LIST :
+        case PCLZIP_CB_POST_LIST :
+        */
+          // ----- Check the number of parameters
+          if (($i+1) >= $p_size) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_MISSING_OPTION_VALUE, "Missing parameter value for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+
+          // ----- Get the value
+          $v_function_name = $p_options_list[$i+1];
+
+          // ----- Check that the value is a valid existing function
+          if (!is_callable($v_function_name)) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Function '".$v_function_name."()' is not an existing function for option '".PclZipUtilOptionText($p_options_list[$i])."'");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+
+          // ----- Set the attribute
+          $v_result_list[$p_options_list[$i]] = $v_function_name;
+          $i++;
+        break;
+
+        default :
+          // ----- Error log
+          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
+		                       "Unknown parameter '"
+							   .$p_options_list[$i]."'");
+
+          // ----- Return
+          return PclZip::errorCode();
+      }
+
+      // ----- Next options
+      $i++;
+    }
+
+    // ----- Look for mandatory options
+    if ($v_requested_options !== false) {
+      for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
+        // ----- Look for mandatory option
+        if ($v_requested_options[$key] == 'mandatory') {
+          // ----- Look if present
+          if (!isset($v_result_list[$key])) {
+            // ----- Error log
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
+
+            // ----- Return
+            return PclZip::errorCode();
+          }
+        }
+      }
+    }
+    
+    // ----- Look for default values
+    if (!isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
+      
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privOptionDefaultThreshold()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privOptionDefaultThreshold(&$p_options)
+  {
+    $v_result=1;
+    
+    if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
+        || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
+      return $v_result;
+    }
+    
+    // ----- Get 'memory_limit' configuration value
+    $v_memory_limit = ini_get('memory_limit');
+    $v_memory_limit = trim($v_memory_limit);
+    $last = strtolower(substr($v_memory_limit, -1));
+ 
+    if($last == 'g')
+        //$v_memory_limit = $v_memory_limit*1024*1024*1024;
+        $v_memory_limit = $v_memory_limit*1073741824;
+    if($last == 'm')
+        //$v_memory_limit = $v_memory_limit*1024*1024;
+        $v_memory_limit = $v_memory_limit*1048576;
+    if($last == 'k')
+        $v_memory_limit = $v_memory_limit*1024;
+            
+    $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit*PCLZIP_TEMPORARY_FILE_RATIO);
+    
+
+    // ----- Sanity check : No threshold if value lower than 1M
+    if ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] < 1048576) {
+      unset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]);
+    }
+          
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privFileDescrParseAtt()
+  // Description :
+  // Parameters :
+  // Return Values :
+  //   1 on success.
+  //   0 on failure.
+  // --------------------------------------------------------------------------------
+  function privFileDescrParseAtt(&$p_file_list, &$p_filedescr, $v_options, $v_requested_options=false)
+  {
+    $v_result=1;
+    
+    // ----- For each file in the list check the attributes
+    foreach ($p_file_list as $v_key => $v_value) {
+    
+      // ----- Check if the option is supported
+      if (!isset($v_requested_options[$v_key])) {
+        // ----- Error log
+        PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file attribute '".$v_key."' for this file");
+
+        // ----- Return
+        return PclZip::errorCode();
+      }
+
+      // ----- Look for attribute
+      switch ($v_key) {
+        case PCLZIP_ATT_FILE_NAME :
+          if (!is_string($v_value)) {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+            return PclZip::errorCode();
+          }
+
+          $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
+          
+          if ($p_filedescr['filename'] == '') {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '".PclZipUtilOptionText($v_key)."'");
+            return PclZip::errorCode();
+          }
+
+        break;
+
+        case PCLZIP_ATT_FILE_NEW_SHORT_NAME :
+          if (!is_string($v_value)) {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+            return PclZip::errorCode();
+          }
+
+          $p_filedescr['new_short_name'] = PclZipUtilPathReduction($v_value);
+
+          if ($p_filedescr['new_short_name'] == '') {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty short filename for attribute '".PclZipUtilOptionText($v_key)."'");
+            return PclZip::errorCode();
+          }
+        break;
+
+        case PCLZIP_ATT_FILE_NEW_FULL_NAME :
+          if (!is_string($v_value)) {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+            return PclZip::errorCode();
+          }
+
+          $p_filedescr['new_full_name'] = PclZipUtilPathReduction($v_value);
+
+          if ($p_filedescr['new_full_name'] == '') {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty full filename for attribute '".PclZipUtilOptionText($v_key)."'");
+            return PclZip::errorCode();
+          }
+        break;
+
+        // ----- Look for options that takes a string
+        case PCLZIP_ATT_FILE_COMMENT :
+          if (!is_string($v_value)) {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". String expected for attribute '".PclZipUtilOptionText($v_key)."'");
+            return PclZip::errorCode();
+          }
+
+          $p_filedescr['comment'] = $v_value;
+        break;
+
+        case PCLZIP_ATT_FILE_MTIME :
+          if (!is_integer($v_value)) {
+            PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid type ".gettype($v_value).". Integer expected for attribute '".PclZipUtilOptionText($v_key)."'");
+            return PclZip::errorCode();
+          }
+
+          $p_filedescr['mtime'] = $v_value;
+        break;
+
+        case PCLZIP_ATT_FILE_CONTENT :
+          $p_filedescr['content'] = $v_value;
+        break;
+
+        default :
+          // ----- Error log
+          PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER,
+		                           "Unknown parameter '".$v_key."'");
+
+          // ----- Return
+          return PclZip::errorCode();
+      }
+
+      // ----- Look for mandatory options
+      if ($v_requested_options !== false) {
+        for ($key=reset($v_requested_options); $key=key($v_requested_options); $key=next($v_requested_options)) {
+          // ----- Look for mandatory option
+          if ($v_requested_options[$key] == 'mandatory') {
+            // ----- Look if present
+            if (!isset($p_file_list[$key])) {
+              PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Missing mandatory parameter ".PclZipUtilOptionText($key)."(".$key.")");
+              return PclZip::errorCode();
+            }
+          }
+        }
+      }
+    
+    // end foreach
+    }
+    
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privFileDescrExpand()
+  // Description :
+  //   This method look for each item of the list to see if its a file, a folder
+  //   or a string to be added as file. For any other type of files (link, other)
+  //   just ignore the item.
+  //   Then prepare the information that will be stored for that file.
+  //   When its a folder, expand the folder with all the files that are in that 
+  //   folder (recursively).
+  // Parameters :
+  // Return Values :
+  //   1 on success.
+  //   0 on failure.
+  // --------------------------------------------------------------------------------
+  function privFileDescrExpand(&$p_filedescr_list, &$p_options)
+  {
+    $v_result=1;
+    
+    // ----- Create a result list
+    $v_result_list = array();
+    
+    // ----- Look each entry
+    for ($i=0; $i<sizeof($p_filedescr_list); $i++) {
+      
+      // ----- Get filedescr
+      $v_descr = $p_filedescr_list[$i];
+      
+      // ----- Reduce the filename
+      $v_descr['filename'] = PclZipUtilTranslateWinPath($v_descr['filename'], false);
+      $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
+      
+      // ----- Look for real file or folder
+      if (file_exists($v_descr['filename'])) {
+        if (@is_file($v_descr['filename'])) {
+          $v_descr['type'] = 'file';
+        }
+        else if (@is_dir($v_descr['filename'])) {
+          $v_descr['type'] = 'folder';
+        }
+        else if (@is_link($v_descr['filename'])) {
+          // skip
+          continue;
+        }
+        else {
+          // skip
+          continue;
+        }
+      }
+      
+      // ----- Look for string added as file
+      else if (isset($v_descr['content'])) {
+        $v_descr['type'] = 'virtual_file';
+      }
+      
+      // ----- Missing file
+      else {
+        // ----- Error log
+        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$v_descr['filename']."' does not exist");
+
+        // ----- Return
+        return PclZip::errorCode();
+      }
+      
+      // ----- Calculate the stored filename
+      $this->privCalculateStoredFilename($v_descr, $p_options);
+      
+      // ----- Add the descriptor in result list
+      $v_result_list[sizeof($v_result_list)] = $v_descr;
+      
+      // ----- Look for folder
+      if ($v_descr['type'] == 'folder') {
+        // ----- List of items in folder
+        $v_dirlist_descr = array();
+        $v_dirlist_nb = 0;
+        if ($v_folder_handler = @opendir($v_descr['filename'])) {
+          while (($v_item_handler = @readdir($v_folder_handler)) !== false) {
+
+            // ----- Skip '.' and '..'
+            if (($v_item_handler == '.') || ($v_item_handler == '..')) {
+                continue;
+            }
+            
+            // ----- Compose the full filename
+            $v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'].'/'.$v_item_handler;
+            
+            // ----- Look for different stored filename
+            // Because the name of the folder was changed, the name of the
+            // files/sub-folders also change
+            if (($v_descr['stored_filename'] != $v_descr['filename'])
+                 && (!isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))) {
+              if ($v_descr['stored_filename'] != '') {
+                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_descr['stored_filename'].'/'.$v_item_handler;
+              }
+              else {
+                $v_dirlist_descr[$v_dirlist_nb]['new_full_name'] = $v_item_handler;
+              }
+            }
+      
+            $v_dirlist_nb++;
+          }
+          
+          @closedir($v_folder_handler);
+        }
+        else {
+          // TBC : unable to open folder in read mode
+        }
+        
+        // ----- Expand each element of the list
+        if ($v_dirlist_nb != 0) {
+          // ----- Expand
+          if (($v_result = $this->privFileDescrExpand($v_dirlist_descr, $p_options)) != 1) {
+            return $v_result;
+          }
+          
+          // ----- Concat the resulting list
+          $v_result_list = array_merge($v_result_list, $v_dirlist_descr);
+        }
+        else {
+        }
+          
+        // ----- Free local array
+        unset($v_dirlist_descr);
+      }
+    }
+    
+    // ----- Get the result list
+    $p_filedescr_list = $v_result_list;
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privCreate()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privCreate($p_filedescr_list, &$p_result_list, &$p_options)
+  {
+    $v_result=1;
+    $v_list_detail = array();
+    
+    // ----- Magic quotes trick
+    $this->privDisableMagicQuotes();
+
+    // ----- Open the file in write mode
+    if (($v_result = $this->privOpenFd('wb')) != 1)
+    {
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Add the list of files
+    $v_result = $this->privAddList($p_filedescr_list, $p_result_list, $p_options);
+
+    // ----- Close
+    $this->privCloseFd();
+
+    // ----- Magic quotes trick
+    $this->privSwapBackMagicQuotes();
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privAdd()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privAdd($p_filedescr_list, &$p_result_list, &$p_options)
+  {
+    $v_result=1;
+    $v_list_detail = array();
+
+    // ----- Look if the archive exists or is empty
+    if ((!is_file($this->zipname)) || (filesize($this->zipname) == 0))
+    {
+
+      // ----- Do a create
+      $v_result = $this->privCreate($p_filedescr_list, $p_result_list, $p_options);
+
+      // ----- Return
+      return $v_result;
+    }
+    // ----- Magic quotes trick
+    $this->privDisableMagicQuotes();
+
+    // ----- Open the zip file
+    if (($v_result=$this->privOpenFd('rb')) != 1)
+    {
+      // ----- Magic quotes trick
+      $this->privSwapBackMagicQuotes();
+
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Read the central directory informations
+    $v_central_dir = array();
+    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+    {
+      $this->privCloseFd();
+      $this->privSwapBackMagicQuotes();
+      return $v_result;
+    }
+
+    // ----- Go to beginning of File
+    @rewind($this->zip_fd);
+
+    // ----- Creates a temporay file
+    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
+
+    // ----- Open the temporary file in write mode
+    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
+    {
+      $this->privCloseFd();
+      $this->privSwapBackMagicQuotes();
+
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Copy the files from the archive to the temporary file
+    // TBC : Here I should better append the file and go back to erase the central dir
+    $v_size = $v_central_dir['offset'];
+    while ($v_size != 0)
+    {
+      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+      $v_buffer = fread($this->zip_fd, $v_read_size);
+      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+      $v_size -= $v_read_size;
+    }
+
+    // ----- Swap the file descriptor
+    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
+    // the following methods on the temporary fil and not the real archive
+    $v_swap = $this->zip_fd;
+    $this->zip_fd = $v_zip_temp_fd;
+    $v_zip_temp_fd = $v_swap;
+
+    // ----- Add the files
+    $v_header_list = array();
+    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
+    {
+      fclose($v_zip_temp_fd);
+      $this->privCloseFd();
+      @unlink($v_zip_temp_name);
+      $this->privSwapBackMagicQuotes();
+
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Store the offset of the central dir
+    $v_offset = @ftell($this->zip_fd);
+
+    // ----- Copy the block of file headers from the old archive
+    $v_size = $v_central_dir['size'];
+    while ($v_size != 0)
+    {
+      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+      $v_buffer = @fread($v_zip_temp_fd, $v_read_size);
+      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+      $v_size -= $v_read_size;
+    }
+
+    // ----- Create the Central Dir files header
+    for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++)
+    {
+      // ----- Create the file header
+      if ($v_header_list[$i]['status'] == 'ok') {
+        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+          fclose($v_zip_temp_fd);
+          $this->privCloseFd();
+          @unlink($v_zip_temp_name);
+          $this->privSwapBackMagicQuotes();
+
+          // ----- Return
+          return $v_result;
+        }
+        $v_count++;
+      }
+
+      // ----- Transform the header to a 'usable' info
+      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+    }
+
+    // ----- Zip file comment
+    $v_comment = $v_central_dir['comment'];
+    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+    }
+    if (isset($p_options[PCLZIP_OPT_ADD_COMMENT])) {
+      $v_comment = $v_comment.$p_options[PCLZIP_OPT_ADD_COMMENT];
+    }
+    if (isset($p_options[PCLZIP_OPT_PREPEND_COMMENT])) {
+      $v_comment = $p_options[PCLZIP_OPT_PREPEND_COMMENT].$v_comment;
+    }
+
+    // ----- Calculate the size of the central header
+    $v_size = @ftell($this->zip_fd)-$v_offset;
+
+    // ----- Create the central dir footer
+    if (($v_result = $this->privWriteCentralHeader($v_count+$v_central_dir['entries'], $v_size, $v_offset, $v_comment)) != 1)
+    {
+      // ----- Reset the file list
+      unset($v_header_list);
+      $this->privSwapBackMagicQuotes();
+
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Swap back the file descriptor
+    $v_swap = $this->zip_fd;
+    $this->zip_fd = $v_zip_temp_fd;
+    $v_zip_temp_fd = $v_swap;
+
+    // ----- Close
+    $this->privCloseFd();
+
+    // ----- Close the temporary file
+    @fclose($v_zip_temp_fd);
+
+    // ----- Magic quotes trick
+    $this->privSwapBackMagicQuotes();
+
+    // ----- Delete the zip file
+    // TBC : I should test the result ...
+    @unlink($this->zipname);
+
+    // ----- Rename the temporary file
+    // TBC : I should test the result ...
+    //@rename($v_zip_temp_name, $this->zipname);
+    PclZipUtilRename($v_zip_temp_name, $this->zipname);
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privOpenFd()
+  // Description :
+  // Parameters :
+  // --------------------------------------------------------------------------------
+  function privOpenFd($p_mode)
+  {
+    $v_result=1;
+
+    // ----- Look if already open
+    if ($this->zip_fd != 0)
+    {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Zip file \''.$this->zipname.'\' already open');
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Open the zip file
+    if (($this->zip_fd = @fopen($this->zipname, $p_mode)) == 0)
+    {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in '.$p_mode.' mode');
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privCloseFd()
+  // Description :
+  // Parameters :
+  // --------------------------------------------------------------------------------
+  function privCloseFd()
+  {
+    $v_result=1;
+
+    if ($this->zip_fd != 0)
+      @fclose($this->zip_fd);
+    $this->zip_fd = 0;
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privAddList()
+  // Description :
+  //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
+  //   different from the real path of the file. This is usefull if you want to have PclTar
+  //   running in any directory, and memorize relative path from an other directory.
+  // Parameters :
+  //   $p_list : An array containing the file or directory names to add in the tar
+  //   $p_result_list : list of added files with their properties (specially the status field)
+  //   $p_add_dir : Path to add in the filename path archived
+  //   $p_remove_dir : Path to remove in the filename path archived
+  // Return Values :
+  // --------------------------------------------------------------------------------
+//  function privAddList($p_list, &$p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_options)
+  function privAddList($p_filedescr_list, &$p_result_list, &$p_options)
+  {
+    $v_result=1;
+
+    // ----- Add the files
+    $v_header_list = array();
+    if (($v_result = $this->privAddFileList($p_filedescr_list, $v_header_list, $p_options)) != 1)
+    {
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Store the offset of the central dir
+    $v_offset = @ftell($this->zip_fd);
+
+    // ----- Create the Central Dir files header
+    for ($i=0,$v_count=0; $i<sizeof($v_header_list); $i++)
+    {
+      // ----- Create the file header
+      if ($v_header_list[$i]['status'] == 'ok') {
+        if (($v_result = $this->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+          // ----- Return
+          return $v_result;
+        }
+        $v_count++;
+      }
+
+      // ----- Transform the header to a 'usable' info
+      $this->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+    }
+
+    // ----- Zip file comment
+    $v_comment = '';
+    if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+      $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+    }
+
+    // ----- Calculate the size of the central header
+    $v_size = @ftell($this->zip_fd)-$v_offset;
+
+    // ----- Create the central dir footer
+    if (($v_result = $this->privWriteCentralHeader($v_count, $v_size, $v_offset, $v_comment)) != 1)
+    {
+      // ----- Reset the file list
+      unset($v_header_list);
+
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privAddFileList()
+  // Description :
+  // Parameters :
+  //   $p_filedescr_list : An array containing the file description 
+  //                      or directory names to add in the zip
+  //   $p_result_list : list of added files with their properties (specially the status field)
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privAddFileList($p_filedescr_list, &$p_result_list, &$p_options)
+  {
+    $v_result=1;
+    $v_header = array();
+
+    // ----- Recuperate the current number of elt in list
+    $v_nb = sizeof($p_result_list);
+
+    // ----- Loop on the files
+    for ($j=0; ($j<sizeof($p_filedescr_list)) && ($v_result==1); $j++) {
+      // ----- Format the filename
+      $p_filedescr_list[$j]['filename']
+      = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
+      
+
+      // ----- Skip empty file names
+      // TBC : Can this be possible ? not checked in DescrParseAtt ?
+      if ($p_filedescr_list[$j]['filename'] == "") {
+        continue;
+      }
+
+      // ----- Check the filename
+      if (   ($p_filedescr_list[$j]['type'] != 'virtual_file')
+          && (!file_exists($p_filedescr_list[$j]['filename']))) {
+        PclZip::privErrorLog(PCLZIP_ERR_MISSING_FILE, "File '".$p_filedescr_list[$j]['filename']."' does not exist");
+        return PclZip::errorCode();
+      }
+
+      // ----- Look if it is a file or a dir with no all path remove option
+      // or a dir with all its path removed
+//      if (   (is_file($p_filedescr_list[$j]['filename']))
+//          || (   is_dir($p_filedescr_list[$j]['filename'])
+      if (   ($p_filedescr_list[$j]['type'] == 'file')
+          || ($p_filedescr_list[$j]['type'] == 'virtual_file')
+          || (   ($p_filedescr_list[$j]['type'] == 'folder')
+              && (   !isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])
+                  || !$p_options[PCLZIP_OPT_REMOVE_ALL_PATH]))
+          ) {
+
+        // ----- Add the file
+        $v_result = $this->privAddFile($p_filedescr_list[$j], $v_header,
+                                       $p_options);
+        if ($v_result != 1) {
+          return $v_result;
+        }
+
+        // ----- Store the file infos
+        $p_result_list[$v_nb++] = $v_header;
+      }
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privAddFile()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privAddFile($p_filedescr, &$p_header, &$p_options)
+  {
+    $v_result=1;
+    
+    // ----- Working variable
+    $p_filename = $p_filedescr['filename'];
+
+    // TBC : Already done in the fileAtt check ... ?
+    if ($p_filename == "") {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+  
+    // ----- Look for a stored different filename 
+    /* TBC : Removed
+    if (isset($p_filedescr['stored_filename'])) {
+      $v_stored_filename = $p_filedescr['stored_filename'];
+    }
+    else {
+      $v_stored_filename = $p_filedescr['stored_filename'];
+    }
+    */
+
+    // ----- Set the file properties
+    clearstatcache();
+    $p_header['version'] = 20;
+    $p_header['version_extracted'] = 10;
+    $p_header['flag'] = 0;
+    $p_header['compression'] = 0;
+    $p_header['crc'] = 0;
+    $p_header['compressed_size'] = 0;
+    $p_header['filename_len'] = strlen($p_filename);
+    $p_header['extra_len'] = 0;
+    $p_header['disk'] = 0;
+    $p_header['internal'] = 0;
+    $p_header['offset'] = 0;
+    $p_header['filename'] = $p_filename;
+// TBC : Removed    $p_header['stored_filename'] = $v_stored_filename;
+    $p_header['stored_filename'] = $p_filedescr['stored_filename'];
+    $p_header['extra'] = '';
+    $p_header['status'] = 'ok';
+    $p_header['index'] = -1;
+
+    // ----- Look for regular file
+    if ($p_filedescr['type']=='file') {
+      $p_header['external'] = 0x00000000;
+      $p_header['size'] = filesize($p_filename);
+    }
+    
+    // ----- Look for regular folder
+    else if ($p_filedescr['type']=='folder') {
+      $p_header['external'] = 0x00000010;
+      $p_header['mtime'] = filemtime($p_filename);
+      $p_header['size'] = filesize($p_filename);
+    }
+    
+    // ----- Look for virtual file
+    else if ($p_filedescr['type'] == 'virtual_file') {
+      $p_header['external'] = 0x00000000;
+      $p_header['size'] = strlen($p_filedescr['content']);
+    }
+    
+
+    // ----- Look for filetime
+    if (isset($p_filedescr['mtime'])) {
+      $p_header['mtime'] = $p_filedescr['mtime'];
+    }
+    else if ($p_filedescr['type'] == 'virtual_file') {
+      $p_header['mtime'] = time();
+    }
+    else {
+      $p_header['mtime'] = filemtime($p_filename);
+    }
+
+    // ------ Look for file comment
+    if (isset($p_filedescr['comment'])) {
+      $p_header['comment_len'] = strlen($p_filedescr['comment']);
+      $p_header['comment'] = $p_filedescr['comment'];
+    }
+    else {
+      $p_header['comment_len'] = 0;
+      $p_header['comment'] = '';
+    }
+
+    // ----- Look for pre-add callback
+    if (isset($p_options[PCLZIP_CB_PRE_ADD])) {
+
+      // ----- Generate a local information
+      $v_local_header = array();
+      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
+
+      // ----- Call the callback
+      // Here I do not use call_user_func() because I need to send a reference to the
+      // header.
+//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_ADD].'(PCLZIP_CB_PRE_ADD, $v_local_header);');
+      $v_result = $p_options[PCLZIP_CB_PRE_ADD](PCLZIP_CB_PRE_ADD, $v_local_header);
+      if ($v_result == 0) {
+        // ----- Change the file status
+        $p_header['status'] = "skipped";
+        $v_result = 1;
+      }
+
+      // ----- Update the informations
+      // Only some fields can be modified
+      if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
+        $p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
+      }
+    }
+
+    // ----- Look for empty stored filename
+    if ($p_header['stored_filename'] == "") {
+      $p_header['status'] = "filtered";
+    }
+    
+    // ----- Check the path length
+    if (strlen($p_header['stored_filename']) > 0xFF) {
+      $p_header['status'] = 'filename_too_long';
+    }
+
+    // ----- Look if no error, or file not skipped
+    if ($p_header['status'] == 'ok') {
+
+      // ----- Look for a file
+      if ($p_filedescr['type'] == 'file') {
+        // ----- Look for using temporary file to zip
+        if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) 
+            && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
+                || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
+                    && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_header['size'])) ) ) {
+          $v_result = $this->privAddFileUsingTempFile($p_filedescr, $p_header, $p_options);
+          if ($v_result < PCLZIP_ERR_NO_ERROR) {
+            return $v_result;
+          }
+        }
+        
+        // ----- Use "in memory" zip algo
+        else {
+
+        // ----- Open the source file
+        if (($v_file = @fopen($p_filename, "rb")) == 0) {
+          PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
+          return PclZip::errorCode();
+        }
+
+        // ----- Read the file content
+        $v_content = @fread($v_file, $p_header['size']);
+
+        // ----- Close the file
+        @fclose($v_file);
+
+        // ----- Calculate the CRC
+        $p_header['crc'] = @crc32($v_content);
+        
+        // ----- Look for no compression
+        if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
+          // ----- Set header parameters
+          $p_header['compressed_size'] = $p_header['size'];
+          $p_header['compression'] = 0;
+        }
+        
+        // ----- Look for normal compression
+        else {
+          // ----- Compress the content
+          $v_content = @gzdeflate($v_content);
+
+          // ----- Set header parameters
+          $p_header['compressed_size'] = strlen($v_content);
+          $p_header['compression'] = 8;
+        }
+        
+        // ----- Call the header generation
+        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+          @fclose($v_file);
+          return $v_result;
+        }
+
+        // ----- Write the compressed (or not) content
+        @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
+
+        }
+
+      }
+
+      // ----- Look for a virtual file (a file from string)
+      else if ($p_filedescr['type'] == 'virtual_file') {
+          
+        $v_content = $p_filedescr['content'];
+
+        // ----- Calculate the CRC
+        $p_header['crc'] = @crc32($v_content);
+        
+        // ----- Look for no compression
+        if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
+          // ----- Set header parameters
+          $p_header['compressed_size'] = $p_header['size'];
+          $p_header['compression'] = 0;
+        }
+        
+        // ----- Look for normal compression
+        else {
+          // ----- Compress the content
+          $v_content = @gzdeflate($v_content);
+
+          // ----- Set header parameters
+          $p_header['compressed_size'] = strlen($v_content);
+          $p_header['compression'] = 8;
+        }
+        
+        // ----- Call the header generation
+        if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+          @fclose($v_file);
+          return $v_result;
+        }
+
+        // ----- Write the compressed (or not) content
+        @fwrite($this->zip_fd, $v_content, $p_header['compressed_size']);
+      }
+
+      // ----- Look for a directory
+      else if ($p_filedescr['type'] == 'folder') {
+        // ----- Look for directory last '/'
+        if (@substr($p_header['stored_filename'], -1) != '/') {
+          $p_header['stored_filename'] .= '/';
+        }
+
+        // ----- Set the file properties
+        $p_header['size'] = 0;
+        //$p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
+        $p_header['external'] = 0x00000010;   // Value for a folder : to be checked
+
+        // ----- Call the header generation
+        if (($v_result = $this->privWriteFileHeader($p_header)) != 1)
+        {
+          return $v_result;
+        }
+      }
+    }
+
+    // ----- Look for post-add callback
+    if (isset($p_options[PCLZIP_CB_POST_ADD])) {
+
+      // ----- Generate a local information
+      $v_local_header = array();
+      $this->privConvertHeader2FileInfo($p_header, $v_local_header);
+
+      // ----- Call the callback
+      // Here I do not use call_user_func() because I need to send a reference to the
+      // header.
+//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_ADD].'(PCLZIP_CB_POST_ADD, $v_local_header);');
+      $v_result = $p_options[PCLZIP_CB_POST_ADD](PCLZIP_CB_POST_ADD, $v_local_header);
+      if ($v_result == 0) {
+        // ----- Ignored
+        $v_result = 1;
+      }
+
+      // ----- Update the informations
+      // Nothing can be modified
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privAddFileUsingTempFile()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privAddFileUsingTempFile($p_filedescr, &$p_header, &$p_options)
+  {
+    $v_result=PCLZIP_ERR_NO_ERROR;
+    
+    // ----- Working variable
+    $p_filename = $p_filedescr['filename'];
+
+
+    // ----- Open the source file
+    if (($v_file = @fopen($p_filename, "rb")) == 0) {
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
+      return PclZip::errorCode();
+    }
+
+    // ----- Creates a compressed temporary file
+    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
+      if(function_exists('gzopen64')){
+          $v_file_compressed = @gzopen64($v_gzip_temp_name, "wb");
+      }else{
+          $v_file_compressed = @gzopen($v_gzip_temp_name, "wb");
+      }
+    if ($v_file_compressed == 0) {
+      fclose($v_file);
+      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
+      return PclZip::errorCode();
+    }
+
+    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+    $v_size = filesize($p_filename);
+    while ($v_size != 0) {
+      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+      $v_buffer = @fread($v_file, $v_read_size);
+      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+      @gzputs($v_file_compressed, $v_buffer, $v_read_size);
+      $v_size -= $v_read_size;
+    }
+
+    // ----- Close the file
+    @fclose($v_file);
+    @gzclose($v_file_compressed);
+
+    // ----- Check the minimum file size
+    if (filesize($v_gzip_temp_name) < 18) {
+      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'gzip temporary file \''.$v_gzip_temp_name.'\' has invalid filesize - should be minimum 18 bytes');
+      return PclZip::errorCode();
+    }
+
+    // ----- Extract the compressed attributes
+    if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0) {
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
+      return PclZip::errorCode();
+    }
+
+    // ----- Read the gzip file header
+    $v_binary_data = @fread($v_file_compressed, 10);
+    $v_data_header = unpack('a1id1/a1id2/a1cm/a1flag/Vmtime/a1xfl/a1os', $v_binary_data);
+
+    // ----- Check some parameters
+    $v_data_header['os'] = bin2hex($v_data_header['os']);
+
+    // ----- Read the gzip file footer
+    @fseek($v_file_compressed, filesize($v_gzip_temp_name)-8);
+    $v_binary_data = @fread($v_file_compressed, 8);
+    $v_data_footer = unpack('Vcrc/Vcompressed_size', $v_binary_data);
+
+    // ----- Set the attributes
+    $p_header['compression'] = ord($v_data_header['cm']);
+    //$p_header['mtime'] = $v_data_header['mtime'];
+    $p_header['crc'] = $v_data_footer['crc'];
+    $p_header['compressed_size'] = filesize($v_gzip_temp_name)-18;
+
+    // ----- Close the file
+    @fclose($v_file_compressed);
+
+    // ----- Call the header generation
+    if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
+      return $v_result;
+    }
+
+    // ----- Add the compressed data
+    if (($v_file_compressed = @fopen($v_gzip_temp_name, "rb")) == 0)
+    {
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
+      return PclZip::errorCode();
+    }
+
+    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+    fseek($v_file_compressed, 10);
+    $v_size = $p_header['compressed_size'];
+    while ($v_size != 0)
+    {
+      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+      $v_buffer = @fread($v_file_compressed, $v_read_size);
+      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+      $v_size -= $v_read_size;
+    }
+
+    // ----- Close the file
+    @fclose($v_file_compressed);
+
+    // ----- Unlink the temporary file
+    @unlink($v_gzip_temp_name);
+    
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privCalculateStoredFilename()
+  // Description :
+  //   Based on file descriptor properties and global options, this method
+  //   calculate the filename that will be stored in the archive.
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privCalculateStoredFilename(&$p_filedescr, &$p_options)
+  {
+    $v_result=1;
+    
+    // ----- Working variables
+    $p_filename = $p_filedescr['filename'];
+    if (isset($p_options[PCLZIP_OPT_ADD_PATH])) {
+      $p_add_dir = $p_options[PCLZIP_OPT_ADD_PATH];
+    }
+    else {
+      $p_add_dir = '';
+    }
+    if (isset($p_options[PCLZIP_OPT_REMOVE_PATH])) {
+      $p_remove_dir = $p_options[PCLZIP_OPT_REMOVE_PATH];
+    }
+    else {
+      $p_remove_dir = '';
+    }
+    if (isset($p_options[PCLZIP_OPT_REMOVE_ALL_PATH])) {
+      $p_remove_all_dir = $p_options[PCLZIP_OPT_REMOVE_ALL_PATH];
+    }
+    else {
+      $p_remove_all_dir = 0;
+    }
+
+
+    // ----- Look for full name change
+    if (isset($p_filedescr['new_full_name'])) {
+      // ----- Remove drive letter if any
+      $v_stored_filename = PclZipUtilTranslateWinPath($p_filedescr['new_full_name']);
+    }
+    
+    // ----- Look for path and/or short name change
+    else {
+
+      // ----- Look for short name change
+      // Its when we cahnge just the filename but not the path
+      if (isset($p_filedescr['new_short_name'])) {
+        $v_path_info = pathinfo($p_filename);
+        $v_dir = '';
+        if ($v_path_info['dirname'] != '') {
+          $v_dir = $v_path_info['dirname'].'/';
+        }
+        $v_stored_filename = $v_dir.$p_filedescr['new_short_name'];
+      }
+      else {
+        // ----- Calculate the stored filename
+        $v_stored_filename = $p_filename;
+      }
+
+      // ----- Look for all path to remove
+      if ($p_remove_all_dir) {
+        $v_stored_filename = basename($p_filename);
+      }
+      // ----- Look for partial path remove
+      else if ($p_remove_dir != "") {
+        if (substr($p_remove_dir, -1) != '/')
+          $p_remove_dir .= "/";
+
+        if (   (substr($p_filename, 0, 2) == "./")
+            || (substr($p_remove_dir, 0, 2) == "./")) {
+            
+          if (   (substr($p_filename, 0, 2) == "./")
+              && (substr($p_remove_dir, 0, 2) != "./")) {
+            $p_remove_dir = "./".$p_remove_dir;
+          }
+          if (   (substr($p_filename, 0, 2) != "./")
+              && (substr($p_remove_dir, 0, 2) == "./")) {
+            $p_remove_dir = substr($p_remove_dir, 2);
+          }
+        }
+
+        $v_compare = PclZipUtilPathInclusion($p_remove_dir,
+                                             $v_stored_filename);
+        if ($v_compare > 0) {
+          if ($v_compare == 2) {
+            $v_stored_filename = "";
+          }
+          else {
+            $v_stored_filename = substr($v_stored_filename,
+                                        strlen($p_remove_dir));
+          }
+        }
+      }
+      
+      // ----- Remove drive letter if any
+      $v_stored_filename = PclZipUtilTranslateWinPath($v_stored_filename);
+      
+      // ----- Look for path to add
+      if ($p_add_dir != "") {
+        if (substr($p_add_dir, -1) == "/")
+          $v_stored_filename = $p_add_dir.$v_stored_filename;
+        else
+          $v_stored_filename = $p_add_dir."/".$v_stored_filename;
+      }
+    }
+
+    // ----- Filename (reduce the path of stored name)
+    $v_stored_filename = PclZipUtilPathReduction($v_stored_filename);
+    $p_filedescr['stored_filename'] = $v_stored_filename;
+    
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privWriteFileHeader()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privWriteFileHeader(&$p_header)
+  {
+    $v_result=1;
+
+    // ----- Store the offset position of the file
+    $p_header['offset'] = ftell($this->zip_fd);
+
+    // ----- Transform UNIX mtime to DOS format mdate/mtime
+    $v_date = getdate($p_header['mtime']);
+    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
+    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+
+    // ----- Packed data
+    $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50,
+	                      $p_header['version_extracted'], $p_header['flag'],
+                          $p_header['compression'], $v_mtime, $v_mdate,
+                          $p_header['crc'], $p_header['compressed_size'],
+						  $p_header['size'],
+                          strlen($p_header['stored_filename']),
+						  $p_header['extra_len']);
+
+    // ----- Write the first 148 bytes of the header in the archive
+    fputs($this->zip_fd, $v_binary_data, 30);
+
+    // ----- Write the variable fields
+    if (strlen($p_header['stored_filename']) != 0)
+    {
+      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
+    }
+    if ($p_header['extra_len'] != 0)
+    {
+      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privWriteCentralFileHeader()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privWriteCentralFileHeader(&$p_header)
+  {
+    $v_result=1;
+
+    // TBC
+    //for(reset($p_header); $key = key($p_header); next($p_header)) {
+    //}
+
+    // ----- Transform UNIX mtime to DOS format mdate/mtime
+    $v_date = getdate($p_header['mtime']);
+    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
+    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
+
+
+    // ----- Packed data
+    $v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50,
+	                      $p_header['version'], $p_header['version_extracted'],
+                          $p_header['flag'], $p_header['compression'],
+						  $v_mtime, $v_mdate, $p_header['crc'],
+                          $p_header['compressed_size'], $p_header['size'],
+                          strlen($p_header['stored_filename']),
+						  $p_header['extra_len'], $p_header['comment_len'],
+                          $p_header['disk'], $p_header['internal'],
+						  $p_header['external'], $p_header['offset']);
+
+    // ----- Write the 42 bytes of the header in the zip file
+    fputs($this->zip_fd, $v_binary_data, 46);
+
+    // ----- Write the variable fields
+    if (strlen($p_header['stored_filename']) != 0)
+    {
+      fputs($this->zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
+    }
+    if ($p_header['extra_len'] != 0)
+    {
+      fputs($this->zip_fd, $p_header['extra'], $p_header['extra_len']);
+    }
+    if ($p_header['comment_len'] != 0)
+    {
+      fputs($this->zip_fd, $p_header['comment'], $p_header['comment_len']);
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privWriteCentralHeader()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privWriteCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
+  {
+    $v_result=1;
+
+    // ----- Packed data
+    $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries,
+	                      $p_nb_entries, $p_size,
+						  $p_offset, strlen($p_comment));
+
+    // ----- Write the 22 bytes of the header in the zip file
+    fputs($this->zip_fd, $v_binary_data, 22);
+
+    // ----- Write the variable fields
+    if (strlen($p_comment) != 0)
+    {
+      fputs($this->zip_fd, $p_comment, strlen($p_comment));
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privList()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privList(&$p_list)
+  {
+    $v_result=1;
+
+    // ----- Magic quotes trick
+    $this->privDisableMagicQuotes();
+
+    // ----- Open the zip file
+    if (($this->zip_fd = @fopen($this->zipname, 'rb')) == 0)
+    {
+      // ----- Magic quotes trick
+      $this->privSwapBackMagicQuotes();
+      
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Read the central directory informations
+    $v_central_dir = array();
+    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+    {
+      $this->privSwapBackMagicQuotes();
+      return $v_result;
+    }
+
+    // ----- Go to beginning of Central Dir
+    @rewind($this->zip_fd);
+    if (@fseek($this->zip_fd, $v_central_dir['offset']))
+    {
+      $this->privSwapBackMagicQuotes();
+
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Read each entry
+    for ($i=0; $i<$v_central_dir['entries']; $i++)
+    {
+      // ----- Read the file header
+      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
+      {
+        $this->privSwapBackMagicQuotes();
+        return $v_result;
+      }
+      $v_header['index'] = $i;
+
+      // ----- Get the only interesting attributes
+      $this->privConvertHeader2FileInfo($v_header, $p_list[$i]);
+      unset($v_header);
+    }
+
+    // ----- Close the zip file
+    $this->privCloseFd();
+
+    // ----- Magic quotes trick
+    $this->privSwapBackMagicQuotes();
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privConvertHeader2FileInfo()
+  // Description :
+  //   This function takes the file informations from the central directory
+  //   entries and extract the interesting parameters that will be given back.
+  //   The resulting file infos are set in the array $p_info
+  //     $p_info['filename'] : Filename with full path. Given by user (add),
+  //                           extracted in the filesystem (extract).
+  //     $p_info['stored_filename'] : Stored filename in the archive.
+  //     $p_info['size'] = Size of the file.
+  //     $p_info['compressed_size'] = Compressed size of the file.
+  //     $p_info['mtime'] = Last modification date of the file.
+  //     $p_info['comment'] = Comment associated with the file.
+  //     $p_info['folder'] = true/false : indicates if the entry is a folder or not.
+  //     $p_info['status'] = status of the action on the file.
+  //     $p_info['crc'] = CRC of the file content.
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privConvertHeader2FileInfo($p_header, &$p_info)
+  {
+    $v_result=1;
+
+    // ----- Get the interesting attributes
+    $v_temp_path = PclZipUtilPathReduction($p_header['filename']);
+    $p_info['filename'] = $v_temp_path;
+    $v_temp_path = PclZipUtilPathReduction($p_header['stored_filename']);
+    $p_info['stored_filename'] = $v_temp_path;
+    $p_info['size'] = $p_header['size'];
+    $p_info['compressed_size'] = $p_header['compressed_size'];
+    $p_info['mtime'] = $p_header['mtime'];
+    $p_info['comment'] = $p_header['comment'];
+    $p_info['folder'] = (($p_header['external']&0x00000010)==0x00000010);
+    $p_info['index'] = $p_header['index'];
+    $p_info['status'] = $p_header['status'];
+    $p_info['crc'] = $p_header['crc'];
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privExtractByRule()
+  // Description :
+  //   Extract a file or directory depending of rules (by index, by name, ...)
+  // Parameters :
+  //   $p_file_list : An array where will be placed the properties of each
+  //                  extracted file
+  //   $p_path : Path to add while writing the extracted files
+  //   $p_remove_path : Path to remove (from the file memorized path) while writing the
+  //                    extracted files. If the path does not match the file path,
+  //                    the file is extracted with its memorized path.
+  //                    $p_remove_path does not apply to 'list' mode.
+  //                    $p_path and $p_remove_path are commulative.
+  // Return Values :
+  //   1 on success,0 or less on error (see error code list)
+  // --------------------------------------------------------------------------------
+  function privExtractByRule(&$p_file_list, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
+  {
+    $v_result=1;
+
+    // ----- Magic quotes trick
+    $this->privDisableMagicQuotes();
+
+    // ----- Check the path
+    if (   ($p_path == "")
+	    || (   (substr($p_path, 0, 1) != "/")
+		    && (substr($p_path, 0, 3) != "../")
+			&& (substr($p_path,1,2)!=":/")))
+      $p_path = "./".$p_path;
+
+    // ----- Reduce the path last (and duplicated) '/'
+    if (($p_path != "./") && ($p_path != "/"))
+    {
+      // ----- Look for the path end '/'
+      while (substr($p_path, -1) == "/")
+      {
+        $p_path = substr($p_path, 0, strlen($p_path)-1);
+      }
+    }
+
+    // ----- Look for path to remove format (should end by /)
+    if (($p_remove_path != "") && (substr($p_remove_path, -1) != '/'))
+    {
+      $p_remove_path .= '/';
+    }
+    $p_remove_path_size = strlen($p_remove_path);
+
+    // ----- Open the zip file
+    if (($v_result = $this->privOpenFd('rb')) != 1)
+    {
+      $this->privSwapBackMagicQuotes();
+      return $v_result;
+    }
+
+    // ----- Read the central directory informations
+    $v_central_dir = array();
+    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+    {
+      // ----- Close the zip file
+      $this->privCloseFd();
+      $this->privSwapBackMagicQuotes();
+
+      return $v_result;
+    }
+
+    // ----- Start at beginning of Central Dir
+    $v_pos_entry = $v_central_dir['offset'];
+
+    // ----- Read each entry
+    $j_start = 0;
+    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
+    {
+
+      // ----- Read next Central dir entry
+      @rewind($this->zip_fd);
+      if (@fseek($this->zip_fd, $v_pos_entry))
+      {
+        // ----- Close the zip file
+        $this->privCloseFd();
+        $this->privSwapBackMagicQuotes();
+
+        // ----- Error log
+        PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+        // ----- Return
+        return PclZip::errorCode();
+      }
+
+      // ----- Read the file header
+      $v_header = array();
+      if (($v_result = $this->privReadCentralFileHeader($v_header)) != 1)
+      {
+        // ----- Close the zip file
+        $this->privCloseFd();
+        $this->privSwapBackMagicQuotes();
+
+        return $v_result;
+      }
+
+      // ----- Store the index
+      $v_header['index'] = $i;
+
+      // ----- Store the file position
+      $v_pos_entry = ftell($this->zip_fd);
+
+      // ----- Look for the specific extract rules
+      $v_extract = false;
+
+      // ----- Look for extract by name rule
+      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
+          && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
+
+          // ----- Look if the filename is in the list
+          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_extract); $j++) {
+
+              // ----- Look for a directory
+              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
+
+                  // ----- Look if the directory is in the filename path
+                  if (   (strlen($v_header['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
+                      && (substr($v_header['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+                      $v_extract = true;
+                  }
+              }
+              // ----- Look for a filename
+              elseif ($v_header['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
+                  $v_extract = true;
+              }
+          }
+      }
+
+      // ----- Look for extract by ereg rule
+      // ereg() is deprecated with PHP 5.3
+      /* 
+      else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
+               && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
+
+          if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header['stored_filename'])) {
+              $v_extract = true;
+          }
+      }
+      */
+
+      // ----- Look for extract by preg rule
+      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
+               && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
+
+          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header['stored_filename'])) {
+              $v_extract = true;
+          }
+      }
+
+      // ----- Look for extract by index rule
+      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
+               && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
+          
+          // ----- Look if the index is in the list
+          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
+
+              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+                  $v_extract = true;
+              }
+              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+                  $j_start = $j+1;
+              }
+
+              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
+                  break;
+              }
+          }
+      }
+
+      // ----- Look for no rule, which means extract all the archive
+      else {
+          $v_extract = true;
+      }
+
+	  // ----- Check compression method
+	  if (   ($v_extract)
+	      && (   ($v_header['compression'] != 8)
+		      && ($v_header['compression'] != 0))) {
+          $v_header['status'] = 'unsupported_compression';
+
+          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+
+              $this->privSwapBackMagicQuotes();
+              
+              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION,
+			                       "Filename '".$v_header['stored_filename']."' is "
+				  	    	  	   ."compressed by an unsupported compression "
+				  	    	  	   ."method (".$v_header['compression'].") ");
+
+              return PclZip::errorCode();
+		  }
+	  }
+	  
+	  // ----- Check encrypted files
+	  if (($v_extract) && (($v_header['flag'] & 1) == 1)) {
+          $v_header['status'] = 'unsupported_encryption';
+
+          // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+          if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		      && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+
+              $this->privSwapBackMagicQuotes();
+
+              PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION,
+			                       "Unsupported encryption for "
+				  	    	  	   ." filename '".$v_header['stored_filename']
+								   ."'");
+
+              return PclZip::errorCode();
+		  }
+    }
+
+      // ----- Look for real extraction
+      if (($v_extract) && ($v_header['status'] != 'ok')) {
+          $v_result = $this->privConvertHeader2FileInfo($v_header,
+		                                        $p_file_list[$v_nb_extracted++]);
+          if ($v_result != 1) {
+              $this->privCloseFd();
+              $this->privSwapBackMagicQuotes();
+              return $v_result;
+          }
+
+          $v_extract = false;
+      }
+      
+      // ----- Look for real extraction
+      if ($v_extract)
+      {
+
+        // ----- Go to the file position
+        @rewind($this->zip_fd);
+        if (@fseek($this->zip_fd, $v_header['offset']))
+        {
+          // ----- Close the zip file
+          $this->privCloseFd();
+
+          $this->privSwapBackMagicQuotes();
+
+          // ----- Error log
+          PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+          // ----- Return
+          return PclZip::errorCode();
+        }
+
+        // ----- Look for extraction as string
+        if ($p_options[PCLZIP_OPT_EXTRACT_AS_STRING]) {
+
+          $v_string = '';
+
+          // ----- Extracting the file
+          $v_result1 = $this->privExtractFileAsString($v_header, $v_string, $p_options);
+          if ($v_result1 < 1) {
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+            return $v_result1;
+          }
+
+          // ----- Get the only interesting attributes
+          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1)
+          {
+            // ----- Close the zip file
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+
+            return $v_result;
+          }
+
+          // ----- Set the file content
+          $p_file_list[$v_nb_extracted]['content'] = $v_string;
+
+          // ----- Next extracted file
+          $v_nb_extracted++;
+          
+          // ----- Look for user callback abort
+          if ($v_result1 == 2) {
+          	break;
+          }
+        }
+        // ----- Look for extraction in standard output
+        elseif (   (isset($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT]))
+		        && ($p_options[PCLZIP_OPT_EXTRACT_IN_OUTPUT])) {
+          // ----- Extracting the file in standard output
+          $v_result1 = $this->privExtractFileInOutput($v_header, $p_options);
+          if ($v_result1 < 1) {
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+            return $v_result1;
+          }
+
+          // ----- Get the only interesting attributes
+          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1) {
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+            return $v_result;
+          }
+
+          // ----- Look for user callback abort
+          if ($v_result1 == 2) {
+          	break;
+          }
+        }
+        // ----- Look for normal extraction
+        else {
+          // ----- Extracting the file
+          $v_result1 = $this->privExtractFile($v_header,
+		                                      $p_path, $p_remove_path,
+											  $p_remove_all_path,
+											  $p_options);
+          if ($v_result1 < 1) {
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+            return $v_result1;
+          }
+
+          // ----- Get the only interesting attributes
+          if (($v_result = $this->privConvertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1)
+          {
+            // ----- Close the zip file
+            $this->privCloseFd();
+            $this->privSwapBackMagicQuotes();
+
+            return $v_result;
+          }
+
+          // ----- Look for user callback abort
+          if ($v_result1 == 2) {
+          	break;
+          }
+        }
+      }
+    }
+
+    // ----- Close the zip file
+    $this->privCloseFd();
+    $this->privSwapBackMagicQuotes();
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privExtractFile()
+  // Description :
+  // Parameters :
+  // Return Values :
+  //
+  // 1 : ... ?
+  // PCLZIP_ERR_USER_ABORTED(2) : User ask for extraction stop in callback
+  // --------------------------------------------------------------------------------
+  function privExtractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_options)
+  {
+    $v_result=1;
+
+    // ----- Read the file header
+    if (($v_result = $this->privReadFileHeader($v_header)) != 1)
+    {
+      // ----- Return
+      return $v_result;
+    }
+
+
+    // ----- Check that the file header is coherent with $p_entry info
+    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+        // TBC
+    }
+
+    // ----- Look for all path to remove
+    if ($p_remove_all_path == true) {
+        // ----- Look for folder entry that not need to be extracted
+        if (($p_entry['external']&0x00000010)==0x00000010) {
+
+            $p_entry['status'] = "filtered";
+
+            return $v_result;
+        }
+
+        // ----- Get the basename of the path
+        $p_entry['filename'] = basename($p_entry['filename']);
+    }
+
+    // ----- Look for path to remove
+    else if ($p_remove_path != "")
+    {
+      if (PclZipUtilPathInclusion($p_remove_path, $p_entry['filename']) == 2)
+      {
+
+        // ----- Change the file status
+        $p_entry['status'] = "filtered";
+
+        // ----- Return
+        return $v_result;
+      }
+
+      $p_remove_path_size = strlen($p_remove_path);
+      if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path)
+      {
+
+        // ----- Remove the path
+        $p_entry['filename'] = substr($p_entry['filename'], $p_remove_path_size);
+
+      }
+    }
+
+    // ----- Add the path
+    if ($p_path != '') {
+      $p_entry['filename'] = $p_path."/".$p_entry['filename'];
+    }
+    
+    // ----- Check a base_dir_restriction
+    if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
+      $v_inclusion
+      = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION],
+                                $p_entry['filename']); 
+      if ($v_inclusion == 0) {
+
+        PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION,
+			                     "Filename '".$p_entry['filename']."' is "
+								 ."outside PCLZIP_OPT_EXTRACT_DIR_RESTRICTION");
+
+        return PclZip::errorCode();
+      }
+    }
+
+    // ----- Look for pre-extract callback
+    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+
+      // ----- Generate a local information
+      $v_local_header = array();
+      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+      // ----- Call the callback
+      // Here I do not use call_user_func() because I need to send a reference to the
+      // header.
+//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
+      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+      if ($v_result == 0) {
+        // ----- Change the file status
+        $p_entry['status'] = "skipped";
+        $v_result = 1;
+      }
+      
+      // ----- Look for abort result
+      if ($v_result == 2) {
+        // ----- This status is internal and will be changed in 'skipped'
+        $p_entry['status'] = "aborted";
+      	$v_result = PCLZIP_ERR_USER_ABORTED;
+      }
+
+      // ----- Update the informations
+      // Only some fields can be modified
+      $p_entry['filename'] = $v_local_header['filename'];
+    }
+
+
+    // ----- Look if extraction should be done
+    if ($p_entry['status'] == 'ok') {
+
+    // ----- Look for specific actions while the file exist
+    if (file_exists($p_entry['filename']))
+    {
+
+      // ----- Look if file is a directory
+      if (is_dir($p_entry['filename']))
+      {
+
+        // ----- Change the file status
+        $p_entry['status'] = "already_a_directory";
+        
+        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+        // For historical reason first PclZip implementation does not stop
+        // when this kind of error occurs.
+        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+
+            PclZip::privErrorLog(PCLZIP_ERR_ALREADY_A_DIRECTORY,
+			                     "Filename '".$p_entry['filename']."' is "
+								 ."already used by an existing directory");
+
+            return PclZip::errorCode();
+		    }
+      }
+      // ----- Look if file is write protected
+      else if (!is_writeable($p_entry['filename']))
+      {
+
+        // ----- Change the file status
+        $p_entry['status'] = "write_protected";
+
+        // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+        // For historical reason first PclZip implementation does not stop
+        // when this kind of error occurs.
+        if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		    && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+
+            PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
+			                     "Filename '".$p_entry['filename']."' exists "
+								 ."and is write protected");
+
+            return PclZip::errorCode();
+		    }
+      }
+
+      // ----- Look if the extracted file is older
+      else if (filemtime($p_entry['filename']) > $p_entry['mtime'])
+      {
+        // ----- Change the file status
+        if (   (isset($p_options[PCLZIP_OPT_REPLACE_NEWER]))
+		    && ($p_options[PCLZIP_OPT_REPLACE_NEWER]===true)) {
+	  	  }
+		    else {
+            $p_entry['status'] = "newer_exist";
+
+            // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
+            // For historical reason first PclZip implementation does not stop
+            // when this kind of error occurs.
+            if (   (isset($p_options[PCLZIP_OPT_STOP_ON_ERROR]))
+		        && ($p_options[PCLZIP_OPT_STOP_ON_ERROR]===true)) {
+
+                PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL,
+			             "Newer version of '".$p_entry['filename']."' exists "
+					    ."and option PCLZIP_OPT_REPLACE_NEWER is not selected");
+
+                return PclZip::errorCode();
+		      }
+		    }
+      }
+      else {
+      }
+    }
+
+    // ----- Check the directory availability and create it if necessary
+    else {
+      if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/'))
+        $v_dir_to_check = $p_entry['filename'];
+      else if (!strstr($p_entry['filename'], "/"))
+        $v_dir_to_check = "";
+      else
+        $v_dir_to_check = dirname($p_entry['filename']);
+
+        if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
+  
+          // ----- Change the file status
+          $p_entry['status'] = "path_creation_fail";
+  
+          // ----- Return
+          //return $v_result;
+          $v_result = 1;
+        }
+      }
+    }
+
+    // ----- Look if extraction should be done
+    if ($p_entry['status'] == 'ok') {
+
+      // ----- Do the extraction (if not a folder)
+      if (!(($p_entry['external']&0x00000010)==0x00000010))
+      {
+        // ----- Look for not compressed file
+        if ($p_entry['compression'] == 0) {
+
+    		  // ----- Opening destination file
+          if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0)
+          {
+
+            // ----- Change the file status
+            $p_entry['status'] = "write_error";
+
+            // ----- Return
+            return $v_result;
+          }
+
+
+          // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+          $v_size = $p_entry['compressed_size'];
+          while ($v_size != 0)
+          {
+            $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+            $v_buffer = @fread($this->zip_fd, $v_read_size);
+            /* Try to speed up the code
+            $v_binary_data = pack('a'.$v_read_size, $v_buffer);
+            @fwrite($v_dest_file, $v_binary_data, $v_read_size);
+            */
+            @fwrite($v_dest_file, $v_buffer, $v_read_size);            
+            $v_size -= $v_read_size;
+          }
+
+          // ----- Closing the destination file
+          fclose($v_dest_file);
+
+          // ----- Change the file mtime
+          touch($p_entry['filename'], $p_entry['mtime']);
+          
+
+        }
+        else {
+          // ----- TBC
+          // Need to be finished
+          if (($p_entry['flag'] & 1) == 1) {
+            PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, 'File \''.$p_entry['filename'].'\' is encrypted. Encrypted files are not supported.');
+            return PclZip::errorCode();
+          }
+
+
+          // ----- Look for using temporary file to unzip
+          if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) 
+              && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
+                  || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
+                      && ($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] <= $p_entry['size'])) ) ) {
+            $v_result = $this->privExtractFileUsingTempFile($p_entry, $p_options);
+            if ($v_result < PCLZIP_ERR_NO_ERROR) {
+              return $v_result;
+            }
+          }
+          
+          // ----- Look for extract in memory
+          else {
+
+          
+            // ----- Read the compressed file in a buffer (one shot)
+            $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+            
+            // ----- Decompress the file
+            $v_file_content = @gzinflate($v_buffer);
+            unset($v_buffer);
+            if ($v_file_content === FALSE) {
+  
+              // ----- Change the file status
+              // TBC
+              $p_entry['status'] = "error";
+              
+              return $v_result;
+            }
+            
+            // ----- Opening destination file
+            if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+  
+              // ----- Change the file status
+              $p_entry['status'] = "write_error";
+  
+              return $v_result;
+            }
+  
+            // ----- Write the uncompressed data
+            @fwrite($v_dest_file, $v_file_content, $p_entry['size']);
+            unset($v_file_content);
+  
+            // ----- Closing the destination file
+            @fclose($v_dest_file);
+            
+          }
+
+          // ----- Change the file mtime
+          @touch($p_entry['filename'], $p_entry['mtime']);
+        }
+
+        // ----- Look for chmod option
+        if (isset($p_options[PCLZIP_OPT_SET_CHMOD])) {
+
+          // ----- Change the mode of the file
+          @chmod($p_entry['filename'], $p_options[PCLZIP_OPT_SET_CHMOD]);
+        }
+
+      }
+    }
+
+  	// ----- Change abort status
+  	if ($p_entry['status'] == "aborted") {
+        $p_entry['status'] = "skipped";
+  	}
+	
+    // ----- Look for post-extract callback
+    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+
+      // ----- Generate a local information
+      $v_local_header = array();
+      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+      // ----- Call the callback
+      // Here I do not use call_user_func() because I need to send a reference to the
+      // header.
+//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
+      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+
+      // ----- Look for abort result
+      if ($v_result == 2) {
+      	$v_result = PCLZIP_ERR_USER_ABORTED;
+      }
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privExtractFileUsingTempFile()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privExtractFileUsingTempFile(&$p_entry, &$p_options)
+  {
+    $v_result=1;
+        
+    // ----- Creates a temporary file
+    $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
+    if (($v_dest_file = @fopen($v_gzip_temp_name, "wb")) == 0) {
+      fclose($v_file);
+      PclZip::privErrorLog(PCLZIP_ERR_WRITE_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary write mode');
+      return PclZip::errorCode();
+    }
+
+
+    // ----- Write gz file format header
+    $v_binary_data = pack('va1a1Va1a1', 0x8b1f, Chr($p_entry['compression']), Chr(0x00), time(), Chr(0x00), Chr(3));
+    @fwrite($v_dest_file, $v_binary_data, 10);
+
+    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+    $v_size = $p_entry['compressed_size'];
+    while ($v_size != 0)
+    {
+      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+      $v_buffer = @fread($this->zip_fd, $v_read_size);
+      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+      @fwrite($v_dest_file, $v_buffer, $v_read_size);
+      $v_size -= $v_read_size;
+    }
+
+    // ----- Write gz file format footer
+    $v_binary_data = pack('VV', $p_entry['crc'], $p_entry['size']);
+    @fwrite($v_dest_file, $v_binary_data, 8);
+
+    // ----- Close the temporary file
+    @fclose($v_dest_file);
+
+    // ----- Opening destination file
+    if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
+      $p_entry['status'] = "write_error";
+      return $v_result;
+    }
+
+    // ----- Open the temporary gz file
+      if(function_exists('gzopen64')){
+          $v_src_file = @gzopen64($v_gzip_temp_name, 'rb');
+      }else{
+          $v_src_file = @gzopen($v_gzip_temp_name, 'rb');
+      }
+    if ($v_src_file == 0) {
+      @fclose($v_dest_file);
+      $p_entry['status'] = "read_error";
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_gzip_temp_name.'\' in binary read mode');
+      return PclZip::errorCode();
+    }
+
+
+    // ----- Read the file by PCLZIP_READ_BLOCK_SIZE octets blocks
+    $v_size = $p_entry['size'];
+    while ($v_size != 0) {
+      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+      $v_buffer = @gzread($v_src_file, $v_read_size);
+      //$v_binary_data = pack('a'.$v_read_size, $v_buffer);
+      @fwrite($v_dest_file, $v_buffer, $v_read_size);
+      $v_size -= $v_read_size;
+    }
+    @fclose($v_dest_file);
+    @gzclose($v_src_file);
+
+    // ----- Delete the temporary file
+    @unlink($v_gzip_temp_name);
+    
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privExtractFileInOutput()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privExtractFileInOutput(&$p_entry, &$p_options)
+  {
+    $v_result=1;
+
+    // ----- Read the file header
+    if (($v_result = $this->privReadFileHeader($v_header)) != 1) {
+      return $v_result;
+    }
+
+
+    // ----- Check that the file header is coherent with $p_entry info
+    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+        // TBC
+    }
+
+    // ----- Look for pre-extract callback
+    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+
+      // ----- Generate a local information
+      $v_local_header = array();
+      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+      // ----- Call the callback
+      // Here I do not use call_user_func() because I need to send a reference to the
+      // header.
+//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
+      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+      if ($v_result == 0) {
+        // ----- Change the file status
+        $p_entry['status'] = "skipped";
+        $v_result = 1;
+      }
+
+      // ----- Look for abort result
+      if ($v_result == 2) {
+        // ----- This status is internal and will be changed in 'skipped'
+        $p_entry['status'] = "aborted";
+      	$v_result = PCLZIP_ERR_USER_ABORTED;
+      }
+
+      // ----- Update the informations
+      // Only some fields can be modified
+      $p_entry['filename'] = $v_local_header['filename'];
+    }
+
+    // ----- Trace
+
+    // ----- Look if extraction should be done
+    if ($p_entry['status'] == 'ok') {
+
+      // ----- Do the extraction (if not a folder)
+      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+        // ----- Look for not compressed file
+        if ($p_entry['compressed_size'] == $p_entry['size']) {
+
+          // ----- Read the file in a buffer (one shot)
+          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+
+          // ----- Send the file to the output
+          echo $v_buffer;
+          unset($v_buffer);
+        }
+        else {
+
+          // ----- Read the compressed file in a buffer (one shot)
+          $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
+          
+          // ----- Decompress the file
+          $v_file_content = gzinflate($v_buffer);
+          unset($v_buffer);
+
+          // ----- Send the file to the output
+          echo $v_file_content;
+          unset($v_file_content);
+        }
+      }
+    }
+
+	// ----- Change abort status
+	if ($p_entry['status'] == "aborted") {
+      $p_entry['status'] = "skipped";
+	}
+
+    // ----- Look for post-extract callback
+    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+
+      // ----- Generate a local information
+      $v_local_header = array();
+      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+      // ----- Call the callback
+      // Here I do not use call_user_func() because I need to send a reference to the
+      // header.
+//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
+      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+
+      // ----- Look for abort result
+      if ($v_result == 2) {
+      	$v_result = PCLZIP_ERR_USER_ABORTED;
+      }
+    }
+
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privExtractFileAsString()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privExtractFileAsString(&$p_entry, &$p_string, &$p_options)
+  {
+    $v_result=1;
+
+    // ----- Read the file header
+    $v_header = array();
+    if (($v_result = $this->privReadFileHeader($v_header)) != 1)
+    {
+      // ----- Return
+      return $v_result;
+    }
+
+
+    // ----- Check that the file header is coherent with $p_entry info
+    if ($this->privCheckFileHeaders($v_header, $p_entry) != 1) {
+        // TBC
+    }
+
+    // ----- Look for pre-extract callback
+    if (isset($p_options[PCLZIP_CB_PRE_EXTRACT])) {
+
+      // ----- Generate a local information
+      $v_local_header = array();
+      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+
+      // ----- Call the callback
+      // Here I do not use call_user_func() because I need to send a reference to the
+      // header.
+//      eval('$v_result = '.$p_options[PCLZIP_CB_PRE_EXTRACT].'(PCLZIP_CB_PRE_EXTRACT, $v_local_header);');
+      $v_result = $p_options[PCLZIP_CB_PRE_EXTRACT](PCLZIP_CB_PRE_EXTRACT, $v_local_header);
+      if ($v_result == 0) {
+        // ----- Change the file status
+        $p_entry['status'] = "skipped";
+        $v_result = 1;
+      }
+      
+      // ----- Look for abort result
+      if ($v_result == 2) {
+        // ----- This status is internal and will be changed in 'skipped'
+        $p_entry['status'] = "aborted";
+      	$v_result = PCLZIP_ERR_USER_ABORTED;
+      }
+
+      // ----- Update the informations
+      // Only some fields can be modified
+      $p_entry['filename'] = $v_local_header['filename'];
+    }
+
+
+    // ----- Look if extraction should be done
+    if ($p_entry['status'] == 'ok') {
+
+      // ----- Do the extraction (if not a folder)
+      if (!(($p_entry['external']&0x00000010)==0x00000010)) {
+        // ----- Look for not compressed file
+  //      if ($p_entry['compressed_size'] == $p_entry['size'])
+        if ($p_entry['compression'] == 0) {
+  
+          // ----- Reading the file
+          $p_string = @fread($this->zip_fd, $p_entry['compressed_size']);
+        }
+        else {
+  
+          // ----- Reading the file
+          $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
+          
+          // ----- Decompress the file
+          if (($p_string = @gzinflate($v_data)) === FALSE) {
+              // TBC
+          }
+        }
+  
+        // ----- Trace
+      }
+      else {
+          // TBC : error : can not extract a folder in a string
+      }
+      
+    }
+
+  	// ----- Change abort status
+  	if ($p_entry['status'] == "aborted") {
+        $p_entry['status'] = "skipped";
+  	}
+	
+    // ----- Look for post-extract callback
+    elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
+
+      // ----- Generate a local information
+      $v_local_header = array();
+      $this->privConvertHeader2FileInfo($p_entry, $v_local_header);
+      
+      // ----- Swap the content to header
+      $v_local_header['content'] = $p_string;
+      $p_string = '';
+
+      // ----- Call the callback
+      // Here I do not use call_user_func() because I need to send a reference to the
+      // header.
+//      eval('$v_result = '.$p_options[PCLZIP_CB_POST_EXTRACT].'(PCLZIP_CB_POST_EXTRACT, $v_local_header);');
+      $v_result = $p_options[PCLZIP_CB_POST_EXTRACT](PCLZIP_CB_POST_EXTRACT, $v_local_header);
+
+      // ----- Swap back the content to header
+      $p_string = $v_local_header['content'];
+      unset($v_local_header['content']);
+
+      // ----- Look for abort result
+      if ($v_result == 2) {
+      	$v_result = PCLZIP_ERR_USER_ABORTED;
+      }
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privReadFileHeader()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privReadFileHeader(&$p_header)
+  {
+    $v_result=1;
+
+    // ----- Read the 4 bytes signature
+    $v_binary_data = @fread($this->zip_fd, 4);
+    $v_data = unpack('Vid', $v_binary_data);
+
+    // ----- Check signature
+    if ($v_data['id'] != 0x04034b50)
+    {
+
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Read the first 42 bytes of the header
+    $v_binary_data = fread($this->zip_fd, 26);
+
+    // ----- Look for invalid block size
+    if (strlen($v_binary_data) != 26)
+    {
+      $p_header['filename'] = "";
+      $p_header['status'] = "invalid_header";
+
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Extract the values
+    $v_data = unpack('vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $v_binary_data);
+
+    // ----- Get filename
+    $p_header['filename'] = fread($this->zip_fd, $v_data['filename_len']);
+
+    // ----- Get extra_fields
+    if ($v_data['extra_len'] != 0) {
+      $p_header['extra'] = fread($this->zip_fd, $v_data['extra_len']);
+    }
+    else {
+      $p_header['extra'] = '';
+    }
+
+    // ----- Extract properties
+    $p_header['version_extracted'] = $v_data['version'];
+    $p_header['compression'] = $v_data['compression'];
+    $p_header['size'] = $v_data['size'];
+    $p_header['compressed_size'] = $v_data['compressed_size'];
+    $p_header['crc'] = $v_data['crc'];
+    $p_header['flag'] = $v_data['flag'];
+    $p_header['filename_len'] = $v_data['filename_len'];
+
+    // ----- Recuperate date in UNIX format
+    $p_header['mdate'] = $v_data['mdate'];
+    $p_header['mtime'] = $v_data['mtime'];
+    if ($p_header['mdate'] && $p_header['mtime'])
+    {
+      // ----- Extract time
+      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
+      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
+      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+
+      // ----- Extract date
+      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
+      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
+      $v_day = $p_header['mdate'] & 0x001F;
+
+      // ----- Get UNIX date format
+      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
+
+    }
+    else
+    {
+      $p_header['mtime'] = time();
+    }
+
+    // TBC
+    //for(reset($v_data); $key = key($v_data); next($v_data)) {
+    //}
+
+    // ----- Set the stored filename
+    $p_header['stored_filename'] = $p_header['filename'];
+
+    // ----- Set the status field
+    $p_header['status'] = "ok";
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privReadCentralFileHeader()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privReadCentralFileHeader(&$p_header)
+  {
+    $v_result=1;
+
+    // ----- Read the 4 bytes signature
+    $v_binary_data = @fread($this->zip_fd, 4);
+    $v_data = unpack('Vid', $v_binary_data);
+
+    // ----- Check signature
+    if ($v_data['id'] != 0x02014b50)
+    {
+
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Read the first 42 bytes of the header
+    $v_binary_data = fread($this->zip_fd, 42);
+
+    // ----- Look for invalid block size
+    if (strlen($v_binary_data) != 42)
+    {
+      $p_header['filename'] = "";
+      $p_header['status'] = "invalid_header";
+
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Extract the values
+    $p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data);
+
+    // ----- Get filename
+    if ($p_header['filename_len'] != 0)
+      $p_header['filename'] = fread($this->zip_fd, $p_header['filename_len']);
+    else
+      $p_header['filename'] = '';
+
+    // ----- Get extra
+    if ($p_header['extra_len'] != 0)
+      $p_header['extra'] = fread($this->zip_fd, $p_header['extra_len']);
+    else
+      $p_header['extra'] = '';
+
+    // ----- Get comment
+    if ($p_header['comment_len'] != 0)
+      $p_header['comment'] = fread($this->zip_fd, $p_header['comment_len']);
+    else
+      $p_header['comment'] = '';
+
+    // ----- Extract properties
+
+    // ----- Recuperate date in UNIX format
+    //if ($p_header['mdate'] && $p_header['mtime'])
+    // TBC : bug : this was ignoring time with 0/0/0
+    if (1)
+    {
+      // ----- Extract time
+      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
+      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
+      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
+
+      // ----- Extract date
+      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
+      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
+      $v_day = $p_header['mdate'] & 0x001F;
+
+      // ----- Get UNIX date format
+      $p_header['mtime'] = @mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
+
+    }
+    else
+    {
+      $p_header['mtime'] = time();
+    }
+
+    // ----- Set the stored filename
+    $p_header['stored_filename'] = $p_header['filename'];
+
+    // ----- Set default status to ok
+    $p_header['status'] = 'ok';
+
+    // ----- Look if it is a directory
+    if (substr($p_header['filename'], -1) == '/') {
+      //$p_header['external'] = 0x41FF0010;
+      $p_header['external'] = 0x00000010;
+    }
+
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privCheckFileHeaders()
+  // Description :
+  // Parameters :
+  // Return Values :
+  //   1 on success,
+  //   0 on error;
+  // --------------------------------------------------------------------------------
+  function privCheckFileHeaders(&$p_local_header, &$p_central_header)
+  {
+    $v_result=1;
+
+  	// ----- Check the static values
+  	// TBC
+  	if ($p_local_header['filename'] != $p_central_header['filename']) {
+  	}
+  	if ($p_local_header['version_extracted'] != $p_central_header['version_extracted']) {
+  	}
+  	if ($p_local_header['flag'] != $p_central_header['flag']) {
+  	}
+  	if ($p_local_header['compression'] != $p_central_header['compression']) {
+  	}
+  	if ($p_local_header['mtime'] != $p_central_header['mtime']) {
+  	}
+  	if ($p_local_header['filename_len'] != $p_central_header['filename_len']) {
+  	}
+  
+  	// ----- Look for flag bit 3
+  	if (($p_local_header['flag'] & 8) == 8) {
+          $p_local_header['size'] = $p_central_header['size'];
+          $p_local_header['compressed_size'] = $p_central_header['compressed_size'];
+          $p_local_header['crc'] = $p_central_header['crc'];
+  	}
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privReadEndCentralDir()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privReadEndCentralDir(&$p_central_dir)
+  {
+    $v_result=1;
+
+    // ----- Go to the end of the zip file
+    $v_size = filesize($this->zipname);
+    @fseek($this->zip_fd, $v_size);
+    if (@ftell($this->zip_fd) != $v_size)
+    {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to go to the end of the archive \''.$this->zipname.'\'');
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- First try : look if this is an archive with no commentaries (most of the time)
+    // in this case the end of central dir is at 22 bytes of the file end
+    $v_found = 0;
+    if ($v_size > 26) {
+      @fseek($this->zip_fd, $v_size-22);
+      if (($v_pos = @ftell($this->zip_fd)) != ($v_size-22))
+      {
+        // ----- Error log
+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
+
+        // ----- Return
+        return PclZip::errorCode();
+      }
+
+      // ----- Read for bytes
+      $v_binary_data = @fread($this->zip_fd, 4);
+      $v_data = @unpack('Vid', $v_binary_data);
+
+      // ----- Check signature
+      if ($v_data['id'] == 0x06054b50) {
+        $v_found = 1;
+      }
+
+      $v_pos = ftell($this->zip_fd);
+    }
+
+    // ----- Go back to the maximum possible size of the Central Dir End Record
+    if (!$v_found) {
+      $v_maximum_size = 65557; // 0xFFFF + 22;
+      if ($v_maximum_size > $v_size)
+        $v_maximum_size = $v_size;
+      @fseek($this->zip_fd, $v_size-$v_maximum_size);
+      if (@ftell($this->zip_fd) != ($v_size-$v_maximum_size))
+      {
+        // ----- Error log
+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, 'Unable to seek back to the middle of the archive \''.$this->zipname.'\'');
+
+        // ----- Return
+        return PclZip::errorCode();
+      }
+
+      // ----- Read byte per byte in order to find the signature
+      $v_pos = ftell($this->zip_fd);
+      $v_bytes = 0x00000000;
+      while ($v_pos < $v_size)
+      {
+        // ----- Read a byte
+        $v_byte = @fread($this->zip_fd, 1);
+
+        // -----  Add the byte
+        //$v_bytes = ($v_bytes << 8) | Ord($v_byte);
+        // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number 
+        // Otherwise on systems where we have 64bit integers the check below for the magic number will fail. 
+        $v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte); 
+
+        // ----- Compare the bytes
+        if ($v_bytes == 0x504b0506)
+        {
+          $v_pos++;
+          break;
+        }
+
+        $v_pos++;
+      }
+
+      // ----- Look if not found end of central dir
+      if ($v_pos == $v_size)
+      {
+
+        // ----- Error log
+        PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Unable to find End of Central Dir Record signature");
+
+        // ----- Return
+        return PclZip::errorCode();
+      }
+    }
+
+    // ----- Read the first 18 bytes of the header
+    $v_binary_data = fread($this->zip_fd, 18);
+
+    // ----- Look for invalid block size
+    if (strlen($v_binary_data) != 18)
+    {
+
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT, "Invalid End of Central Dir Record size : ".strlen($v_binary_data));
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Extract the values
+    $v_data = unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size', $v_binary_data);
+
+    // ----- Check the global size
+    if (($v_pos + $v_data['comment_size'] + 18) != $v_size) {
+
+	  // ----- Removed in release 2.2 see readme file
+	  // The check of the file size is a little too strict.
+	  // Some bugs where found when a zip is encrypted/decrypted with 'crypt'.
+	  // While decrypted, zip has training 0 bytes
+	  if (0) {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_BAD_FORMAT,
+	                       'The central dir is not at the end of the archive.'
+						   .' Some trailing bytes exists after the archive.');
+
+      // ----- Return
+      return PclZip::errorCode();
+	  }
+    }
+
+    // ----- Get comment
+    if ($v_data['comment_size'] != 0) {
+      $p_central_dir['comment'] = fread($this->zip_fd, $v_data['comment_size']);
+    }
+    else
+      $p_central_dir['comment'] = '';
+
+    $p_central_dir['entries'] = $v_data['entries'];
+    $p_central_dir['disk_entries'] = $v_data['disk_entries'];
+    $p_central_dir['offset'] = $v_data['offset'];
+    $p_central_dir['size'] = $v_data['size'];
+    $p_central_dir['disk'] = $v_data['disk'];
+    $p_central_dir['disk_start'] = $v_data['disk_start'];
+
+    // TBC
+    //for(reset($p_central_dir); $key = key($p_central_dir); next($p_central_dir)) {
+    //}
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privDeleteByRule()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privDeleteByRule(&$p_result_list, &$p_options)
+  {
+    $v_result=1;
+    $v_list_detail = array();
+
+    // ----- Open the zip file
+    if (($v_result=$this->privOpenFd('rb')) != 1)
+    {
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Read the central directory informations
+    $v_central_dir = array();
+    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+    {
+      $this->privCloseFd();
+      return $v_result;
+    }
+
+    // ----- Go to beginning of File
+    @rewind($this->zip_fd);
+
+    // ----- Scan all the files
+    // ----- Start at beginning of Central Dir
+    $v_pos_entry = $v_central_dir['offset'];
+    @rewind($this->zip_fd);
+    if (@fseek($this->zip_fd, $v_pos_entry))
+    {
+      // ----- Close the zip file
+      $this->privCloseFd();
+
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Read each entry
+    $v_header_list = array();
+    $j_start = 0;
+    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++)
+    {
+
+      // ----- Read the file header
+      $v_header_list[$v_nb_extracted] = array();
+      if (($v_result = $this->privReadCentralFileHeader($v_header_list[$v_nb_extracted])) != 1)
+      {
+        // ----- Close the zip file
+        $this->privCloseFd();
+
+        return $v_result;
+      }
+
+
+      // ----- Store the index
+      $v_header_list[$v_nb_extracted]['index'] = $i;
+
+      // ----- Look for the specific extract rules
+      $v_found = false;
+
+      // ----- Look for extract by name rule
+      if (   (isset($p_options[PCLZIP_OPT_BY_NAME]))
+          && ($p_options[PCLZIP_OPT_BY_NAME] != 0)) {
+
+          // ----- Look if the filename is in the list
+          for ($j=0; ($j<sizeof($p_options[PCLZIP_OPT_BY_NAME])) && (!$v_found); $j++) {
+
+              // ----- Look for a directory
+              if (substr($p_options[PCLZIP_OPT_BY_NAME][$j], -1) == "/") {
+
+                  // ----- Look if the directory is in the filename path
+                  if (   (strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_options[PCLZIP_OPT_BY_NAME][$j]))
+                      && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_options[PCLZIP_OPT_BY_NAME][$j])) == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+                      $v_found = true;
+                  }
+                  elseif (   (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */
+                          && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_options[PCLZIP_OPT_BY_NAME][$j])) {
+                      $v_found = true;
+                  }
+              }
+              // ----- Look for a filename
+              elseif ($v_header_list[$v_nb_extracted]['stored_filename'] == $p_options[PCLZIP_OPT_BY_NAME][$j]) {
+                  $v_found = true;
+              }
+          }
+      }
+
+      // ----- Look for extract by ereg rule
+      // ereg() is deprecated with PHP 5.3
+      /*
+      else if (   (isset($p_options[PCLZIP_OPT_BY_EREG]))
+               && ($p_options[PCLZIP_OPT_BY_EREG] != "")) {
+
+          if (ereg($p_options[PCLZIP_OPT_BY_EREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
+              $v_found = true;
+          }
+      }
+      */
+
+      // ----- Look for extract by preg rule
+      else if (   (isset($p_options[PCLZIP_OPT_BY_PREG]))
+               && ($p_options[PCLZIP_OPT_BY_PREG] != "")) {
+
+          if (preg_match($p_options[PCLZIP_OPT_BY_PREG], $v_header_list[$v_nb_extracted]['stored_filename'])) {
+              $v_found = true;
+          }
+      }
+
+      // ----- Look for extract by index rule
+      else if (   (isset($p_options[PCLZIP_OPT_BY_INDEX]))
+               && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
+
+          // ----- Look if the index is in the list
+          for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_found); $j++) {
+
+              if (($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['start']) && ($i<=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end'])) {
+                  $v_found = true;
+              }
+              if ($i>=$p_options[PCLZIP_OPT_BY_INDEX][$j]['end']) {
+                  $j_start = $j+1;
+              }
+
+              if ($p_options[PCLZIP_OPT_BY_INDEX][$j]['start']>$i) {
+                  break;
+              }
+          }
+      }
+      else {
+      	$v_found = true;
+      }
+
+      // ----- Look for deletion
+      if ($v_found)
+      {
+        unset($v_header_list[$v_nb_extracted]);
+      }
+      else
+      {
+        $v_nb_extracted++;
+      }
+    }
+
+    // ----- Look if something need to be deleted
+    if ($v_nb_extracted > 0) {
+
+        // ----- Creates a temporay file
+        $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
+
+        // ----- Creates a temporary zip archive
+        $v_temp_zip = new PclZip($v_zip_temp_name);
+
+        // ----- Open the temporary zip file in write mode
+        if (($v_result = $v_temp_zip->privOpenFd('wb')) != 1) {
+            $this->privCloseFd();
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Look which file need to be kept
+        for ($i=0; $i<sizeof($v_header_list); $i++) {
+
+            // ----- Calculate the position of the header
+            @rewind($this->zip_fd);
+            if (@fseek($this->zip_fd,  $v_header_list[$i]['offset'])) {
+                // ----- Close the zip file
+                $this->privCloseFd();
+                $v_temp_zip->privCloseFd();
+                @unlink($v_zip_temp_name);
+
+                // ----- Error log
+                PclZip::privErrorLog(PCLZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
+
+                // ----- Return
+                return PclZip::errorCode();
+            }
+
+            // ----- Read the file header
+            $v_local_header = array();
+            if (($v_result = $this->privReadFileHeader($v_local_header)) != 1) {
+                // ----- Close the zip file
+                $this->privCloseFd();
+                $v_temp_zip->privCloseFd();
+                @unlink($v_zip_temp_name);
+
+                // ----- Return
+                return $v_result;
+            }
+            
+            // ----- Check that local file header is same as central file header
+            if ($this->privCheckFileHeaders($v_local_header,
+			                                $v_header_list[$i]) != 1) {
+                // TBC
+            }
+            unset($v_local_header);
+
+            // ----- Write the file header
+            if (($v_result = $v_temp_zip->privWriteFileHeader($v_header_list[$i])) != 1) {
+                // ----- Close the zip file
+                $this->privCloseFd();
+                $v_temp_zip->privCloseFd();
+                @unlink($v_zip_temp_name);
+
+                // ----- Return
+                return $v_result;
+            }
+
+            // ----- Read/write the data block
+            if (($v_result = PclZipUtilCopyBlock($this->zip_fd, $v_temp_zip->zip_fd, $v_header_list[$i]['compressed_size'])) != 1) {
+                // ----- Close the zip file
+                $this->privCloseFd();
+                $v_temp_zip->privCloseFd();
+                @unlink($v_zip_temp_name);
+
+                // ----- Return
+                return $v_result;
+            }
+        }
+
+        // ----- Store the offset of the central dir
+        $v_offset = @ftell($v_temp_zip->zip_fd);
+
+        // ----- Re-Create the Central Dir files header
+        for ($i=0; $i<sizeof($v_header_list); $i++) {
+            // ----- Create the file header
+            if (($v_result = $v_temp_zip->privWriteCentralFileHeader($v_header_list[$i])) != 1) {
+                $v_temp_zip->privCloseFd();
+                $this->privCloseFd();
+                @unlink($v_zip_temp_name);
+
+                // ----- Return
+                return $v_result;
+            }
+
+            // ----- Transform the header to a 'usable' info
+            $v_temp_zip->privConvertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
+        }
+
+
+        // ----- Zip file comment
+        $v_comment = '';
+        if (isset($p_options[PCLZIP_OPT_COMMENT])) {
+          $v_comment = $p_options[PCLZIP_OPT_COMMENT];
+        }
+
+        // ----- Calculate the size of the central header
+        $v_size = @ftell($v_temp_zip->zip_fd)-$v_offset;
+
+        // ----- Create the central dir footer
+        if (($v_result = $v_temp_zip->privWriteCentralHeader(sizeof($v_header_list), $v_size, $v_offset, $v_comment)) != 1) {
+            // ----- Reset the file list
+            unset($v_header_list);
+            $v_temp_zip->privCloseFd();
+            $this->privCloseFd();
+            @unlink($v_zip_temp_name);
+
+            // ----- Return
+            return $v_result;
+        }
+
+        // ----- Close
+        $v_temp_zip->privCloseFd();
+        $this->privCloseFd();
+
+        // ----- Delete the zip file
+        // TBC : I should test the result ...
+        @unlink($this->zipname);
+
+        // ----- Rename the temporary file
+        // TBC : I should test the result ...
+        //@rename($v_zip_temp_name, $this->zipname);
+        PclZipUtilRename($v_zip_temp_name, $this->zipname);
+    
+        // ----- Destroy the temporary archive
+        unset($v_temp_zip);
+    }
+    
+    // ----- Remove every files : reset the file
+    else if ($v_central_dir['entries'] != 0) {
+        $this->privCloseFd();
+
+        if (($v_result = $this->privOpenFd('wb')) != 1) {
+          return $v_result;
+        }
+
+        if (($v_result = $this->privWriteCentralHeader(0, 0, 0, '')) != 1) {
+          return $v_result;
+        }
+
+        $this->privCloseFd();
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privDirCheck()
+  // Description :
+  //   Check if a directory exists, if not it creates it and all the parents directory
+  //   which may be useful.
+  // Parameters :
+  //   $p_dir : Directory path to check.
+  // Return Values :
+  //    1 : OK
+  //   -1 : Unable to create directory
+  // --------------------------------------------------------------------------------
+  function privDirCheck($p_dir, $p_is_dir=false)
+  {
+    $v_result = 1;
+
+
+    // ----- Remove the final '/'
+    if (($p_is_dir) && (substr($p_dir, -1)=='/'))
+    {
+      $p_dir = substr($p_dir, 0, strlen($p_dir)-1);
+    }
+
+    // ----- Check the directory availability
+    if ((is_dir($p_dir)) || ($p_dir == ""))
+    {
+      return 1;
+    }
+
+    // ----- Extract parent directory
+    $p_parent_dir = dirname($p_dir);
+
+    // ----- Just a check
+    if ($p_parent_dir != $p_dir)
+    {
+      // ----- Look for parent directory
+      if ($p_parent_dir != "")
+      {
+        if (($v_result = $this->privDirCheck($p_parent_dir)) != 1)
+        {
+          return $v_result;
+        }
+      }
+    }
+
+    // ----- Create the directory
+    if (!@mkdir($p_dir, 0777))
+    {
+      // ----- Error log
+      PclZip::privErrorLog(PCLZIP_ERR_DIR_CREATE_FAIL, "Unable to create directory '$p_dir'");
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privMerge()
+  // Description :
+  //   If $p_archive_to_add does not exist, the function exit with a success result.
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privMerge(&$p_archive_to_add)
+  {
+    $v_result=1;
+
+    // ----- Look if the archive_to_add exists
+    if (!is_file($p_archive_to_add->zipname))
+    {
+
+      // ----- Nothing to merge, so merge is a success
+      $v_result = 1;
+
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Look if the archive exists
+    if (!is_file($this->zipname))
+    {
+
+      // ----- Do a duplicate
+      $v_result = $this->privDuplicate($p_archive_to_add->zipname);
+
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Open the zip file
+    if (($v_result=$this->privOpenFd('rb')) != 1)
+    {
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Read the central directory informations
+    $v_central_dir = array();
+    if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
+    {
+      $this->privCloseFd();
+      return $v_result;
+    }
+
+    // ----- Go to beginning of File
+    @rewind($this->zip_fd);
+
+    // ----- Open the archive_to_add file
+    if (($v_result=$p_archive_to_add->privOpenFd('rb')) != 1)
+    {
+      $this->privCloseFd();
+
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Read the central directory informations
+    $v_central_dir_to_add = array();
+    if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1)
+    {
+      $this->privCloseFd();
+      $p_archive_to_add->privCloseFd();
+
+      return $v_result;
+    }
+
+    // ----- Go to beginning of File
+    @rewind($p_archive_to_add->zip_fd);
+
+    // ----- Creates a temporay file
+    $v_zip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.tmp';
+
+    // ----- Open the temporary file in write mode
+    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
+    {
+      $this->privCloseFd();
+      $p_archive_to_add->privCloseFd();
+
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open temporary file \''.$v_zip_temp_name.'\' in binary write mode');
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Copy the files from the archive to the temporary file
+    // TBC : Here I should better append the file and go back to erase the central dir
+    $v_size = $v_central_dir['offset'];
+    while ($v_size != 0)
+    {
+      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+      $v_buffer = fread($this->zip_fd, $v_read_size);
+      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+      $v_size -= $v_read_size;
+    }
+
+    // ----- Copy the files from the archive_to_add into the temporary file
+    $v_size = $v_central_dir_to_add['offset'];
+    while ($v_size != 0)
+    {
+      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+      $v_buffer = fread($p_archive_to_add->zip_fd, $v_read_size);
+      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+      $v_size -= $v_read_size;
+    }
+
+    // ----- Store the offset of the central dir
+    $v_offset = @ftell($v_zip_temp_fd);
+
+    // ----- Copy the block of file headers from the old archive
+    $v_size = $v_central_dir['size'];
+    while ($v_size != 0)
+    {
+      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+      $v_buffer = @fread($this->zip_fd, $v_read_size);
+      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+      $v_size -= $v_read_size;
+    }
+
+    // ----- Copy the block of file headers from the archive_to_add
+    $v_size = $v_central_dir_to_add['size'];
+    while ($v_size != 0)
+    {
+      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+      $v_buffer = @fread($p_archive_to_add->zip_fd, $v_read_size);
+      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
+      $v_size -= $v_read_size;
+    }
+
+    // ----- Merge the file comments
+    $v_comment = $v_central_dir['comment'].' '.$v_central_dir_to_add['comment'];
+
+    // ----- Calculate the size of the (new) central header
+    $v_size = @ftell($v_zip_temp_fd)-$v_offset;
+
+    // ----- Swap the file descriptor
+    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
+    // the following methods on the temporary fil and not the real archive fd
+    $v_swap = $this->zip_fd;
+    $this->zip_fd = $v_zip_temp_fd;
+    $v_zip_temp_fd = $v_swap;
+
+    // ----- Create the central dir footer
+    if (($v_result = $this->privWriteCentralHeader($v_central_dir['entries']+$v_central_dir_to_add['entries'], $v_size, $v_offset, $v_comment)) != 1)
+    {
+      $this->privCloseFd();
+      $p_archive_to_add->privCloseFd();
+      @fclose($v_zip_temp_fd);
+      $this->zip_fd = null;
+
+      // ----- Reset the file list
+      unset($v_header_list);
+
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Swap back the file descriptor
+    $v_swap = $this->zip_fd;
+    $this->zip_fd = $v_zip_temp_fd;
+    $v_zip_temp_fd = $v_swap;
+
+    // ----- Close
+    $this->privCloseFd();
+    $p_archive_to_add->privCloseFd();
+
+    // ----- Close the temporary file
+    @fclose($v_zip_temp_fd);
+
+    // ----- Delete the zip file
+    // TBC : I should test the result ...
+    @unlink($this->zipname);
+
+    // ----- Rename the temporary file
+    // TBC : I should test the result ...
+    //@rename($v_zip_temp_name, $this->zipname);
+    PclZipUtilRename($v_zip_temp_name, $this->zipname);
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privDuplicate()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privDuplicate($p_archive_filename)
+  {
+    $v_result=1;
+
+    // ----- Look if the $p_archive_filename exists
+    if (!is_file($p_archive_filename))
+    {
+
+      // ----- Nothing to duplicate, so duplicate is a success.
+      $v_result = 1;
+
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Open the zip file
+    if (($v_result=$this->privOpenFd('wb')) != 1)
+    {
+      // ----- Return
+      return $v_result;
+    }
+
+    // ----- Open the temporary file in write mode
+    if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0)
+    {
+      $this->privCloseFd();
+
+      PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive file \''.$p_archive_filename.'\' in binary write mode');
+
+      // ----- Return
+      return PclZip::errorCode();
+    }
+
+    // ----- Copy the files from the archive to the temporary file
+    // TBC : Here I should better append the file and go back to erase the central dir
+    $v_size = filesize($p_archive_filename);
+    while ($v_size != 0)
+    {
+      $v_read_size = ($v_size < PCLZIP_READ_BLOCK_SIZE ? $v_size : PCLZIP_READ_BLOCK_SIZE);
+      $v_buffer = fread($v_zip_temp_fd, $v_read_size);
+      @fwrite($this->zip_fd, $v_buffer, $v_read_size);
+      $v_size -= $v_read_size;
+    }
+
+    // ----- Close
+    $this->privCloseFd();
+
+    // ----- Close the temporary file
+    @fclose($v_zip_temp_fd);
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privErrorLog()
+  // Description :
+  // Parameters :
+  // --------------------------------------------------------------------------------
+  function privErrorLog($p_error_code=0, $p_error_string='')
+  {
+    if (PCLZIP_ERROR_EXTERNAL == 1) {
+      PclError($p_error_code, $p_error_string);
+    }
+    else {
+      $this->error_code = $p_error_code;
+      $this->error_string = $p_error_string;
+    }
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privErrorReset()
+  // Description :
+  // Parameters :
+  // --------------------------------------------------------------------------------
+  function privErrorReset()
+  {
+    if (PCLZIP_ERROR_EXTERNAL == 1) {
+      PclErrorReset();
+    }
+    else {
+      $this->error_code = 0;
+      $this->error_string = '';
+    }
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privDisableMagicQuotes()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privDisableMagicQuotes()
+  {
+    $v_result=1;
+
+    // ----- Look if function exists
+    if (   (!function_exists("get_magic_quotes_runtime"))
+	    || (!function_exists("set_magic_quotes_runtime"))) {
+      return $v_result;
+	}
+
+    // ----- Look if already done
+    if ($this->magic_quotes_status != -1) {
+      return $v_result;
+	}
+
+	// ----- Get and memorize the magic_quote value
+	$this->magic_quotes_status = @get_magic_quotes_runtime();
+
+	// ----- Disable magic_quotes
+	if ($this->magic_quotes_status == 1) {
+	  @set_magic_quotes_runtime(0);
+	}
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : privSwapBackMagicQuotes()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function privSwapBackMagicQuotes()
+  {
+    $v_result=1;
+
+    // ----- Look if function exists
+    if (   (!function_exists("get_magic_quotes_runtime"))
+	    || (!function_exists("set_magic_quotes_runtime"))) {
+      return $v_result;
+	}
+
+    // ----- Look if something to do
+    if ($this->magic_quotes_status != -1) {
+      return $v_result;
+	}
+
+	// ----- Swap back magic_quotes
+	if ($this->magic_quotes_status == 1) {
+  	  @set_magic_quotes_runtime($this->magic_quotes_status);
+	}
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  }
+  // End of class
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : PclZipUtilPathReduction()
+  // Description :
+  // Parameters :
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function PclZipUtilPathReduction($p_dir)
+  {
+    $v_result = "";
+    $scheme = parse_url($p_dir, PHP_URL_SCHEME) != null;
+
+    // ----- Look for not empty path
+    if ($p_dir != "") {
+      // ----- Explode path by directory names
+      $v_list = explode("/", $p_dir);
+
+      // ----- Study directories from last to first
+      $v_skip = 0;
+      for ($i=sizeof($v_list)-1; $i>=0; $i--) {
+        // ----- Look for current path
+        if ($v_list[$i] == ".") {
+          // ----- Ignore this directory
+          // Should be the first $i=0, but no check is done
+        }
+        else if ($v_list[$i] == "..") {
+		  $v_skip++;
+        }
+        else if ($v_list[$i] == "") {
+		  // ----- First '/' i.e. root slash
+		  if ($i == 0) {
+            $v_result = "/".$v_result;
+		    if ($v_skip > 0) {
+		        // ----- It is an invalid path, so the path is not modified
+		        // TBC
+		        $v_result = $p_dir;
+                $v_skip = 0;
+		    }
+		  }
+		  // ----- Last '/' i.e. indicates a directory
+		  else if ($i == (sizeof($v_list)-1)) {
+            $v_result = $v_list[$i];
+		  }
+		  // ----- Double '/' inside the path
+		  else {
+            // ----- Ignore only the double '//' in path,
+            // but not the first and last '/'
+		  }
+        }
+        else {
+		  // ----- Look for item to skip
+		  if ($v_skip > 0) {
+		    $v_skip--;
+		  }
+		  else {
+              if(stripos(PHP_OS, "win") === 0){
+                  if (substr($p_dir, 0, 3) == "smb") { 	  
+                      $v_result = (($i==0 && $scheme)? $v_list[$i]."/" : $v_list[$i]).($i!=(sizeof($v_list)-1)? "/".$v_result : "");
+                      } else { 
+                      $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)? "/".$v_result : "");
+                      } 
+              }else{
+                  $v_result = $v_list[$i].(( $i == 0 && $scheme)? "/" : "").($i!=(sizeof($v_list)-1)? "/".$v_result : "");
+              }
+		  }
+        }
+      }
+      
+      // ----- Look for skip
+      if ($v_skip > 0) {
+        while ($v_skip > 0) {
+            $v_result = '../'.$v_result;
+            $v_skip--;
+        }
+      }
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : PclZipUtilPathInclusion()
+  // Description :
+  //   This function indicates if the path $p_path is under the $p_dir tree. Or,
+  //   said in an other way, if the file or sub-dir $p_path is inside the dir
+  //   $p_dir.
+  //   The function indicates also if the path is exactly the same as the dir.
+  //   This function supports path with duplicated '/' like '//', but does not
+  //   support '.' or '..' statements.
+  // Parameters :
+  // Return Values :
+  //   0 if $p_path is not inside directory $p_dir
+  //   1 if $p_path is inside directory $p_dir
+  //   2 if $p_path is exactly the same as $p_dir
+  // --------------------------------------------------------------------------------
+  function PclZipUtilPathInclusion($p_dir, $p_path)
+  {
+    $v_result = 1;
+    
+    // ----- Look for path beginning by ./
+    if (   ($p_dir == '.')
+        || ((strlen($p_dir) >=2) && (substr($p_dir, 0, 2) == './'))) {
+      $p_dir = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_dir, 1);
+    }
+    if (   ($p_path == '.')
+        || ((strlen($p_path) >=2) && (substr($p_path, 0, 2) == './'))) {
+      $p_path = PclZipUtilTranslateWinPath(getcwd(), FALSE).'/'.substr($p_path, 1);
+    }
+
+    // ----- Explode dir and path by directory separator
+    $v_list_dir = explode("/", $p_dir);
+    $v_list_dir_size = sizeof($v_list_dir);
+    $v_list_path = explode("/", $p_path);
+    $v_list_path_size = sizeof($v_list_path);
+
+    // ----- Study directories paths
+    $i = 0;
+    $j = 0;
+    while (($i < $v_list_dir_size) && ($j < $v_list_path_size) && ($v_result)) {
+
+      // ----- Look for empty dir (path reduction)
+      if ($v_list_dir[$i] == '') {
+        $i++;
+        continue;
+      }
+      if ($v_list_path[$j] == '') {
+        $j++;
+        continue;
+      }
+
+      // ----- Compare the items
+      if (($v_list_dir[$i] != $v_list_path[$j]) && ($v_list_dir[$i] != '') && ( $v_list_path[$j] != ''))  {
+        $v_result = 0;
+      }
+
+      // ----- Next items
+      $i++;
+      $j++;
+    }
+
+    // ----- Look if everything seems to be the same
+    if ($v_result) {
+      // ----- Skip all the empty items
+      while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) $j++;
+      while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) $i++;
+
+      if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {
+        // ----- There are exactly the same
+        $v_result = 2;
+      }
+      else if ($i < $v_list_dir_size) {
+        // ----- The path is shorter than the dir
+        $v_result = 0;
+      }
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : PclZipUtilCopyBlock()
+  // Description :
+  // Parameters :
+  //   $p_mode : read/write compression mode
+  //             0 : src & dest normal
+  //             1 : src gzip, dest normal
+  //             2 : src normal, dest gzip
+  //             3 : src & dest gzip
+  // Return Values :
+  // --------------------------------------------------------------------------------
+  function PclZipUtilCopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
+  {
+    $v_result = 1;
+
+    if ($p_mode==0)
+    {
+      while ($p_size != 0)
+      {
+        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+        $v_buffer = @fread($p_src, $v_read_size);
+        @fwrite($p_dest, $v_buffer, $v_read_size);
+        $p_size -= $v_read_size;
+      }
+    }
+    else if ($p_mode==1)
+    {
+      while ($p_size != 0)
+      {
+        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+        $v_buffer = @gzread($p_src, $v_read_size);
+        @fwrite($p_dest, $v_buffer, $v_read_size);
+        $p_size -= $v_read_size;
+      }
+    }
+    else if ($p_mode==2)
+    {
+      while ($p_size != 0)
+      {
+        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+        $v_buffer = @fread($p_src, $v_read_size);
+        @gzwrite($p_dest, $v_buffer, $v_read_size);
+        $p_size -= $v_read_size;
+      }
+    }
+    else if ($p_mode==3)
+    {
+      while ($p_size != 0)
+      {
+        $v_read_size = ($p_size < PCLZIP_READ_BLOCK_SIZE ? $p_size : PCLZIP_READ_BLOCK_SIZE);
+        $v_buffer = @gzread($p_src, $v_read_size);
+        @gzwrite($p_dest, $v_buffer, $v_read_size);
+        $p_size -= $v_read_size;
+      }
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : PclZipUtilRename()
+  // Description :
+  //   This function tries to do a simple rename() function. If it fails, it
+  //   tries to copy the $p_src file in a new $p_dest file and then unlink the
+  //   first one.
+  // Parameters :
+  //   $p_src : Old filename
+  //   $p_dest : New filename
+  // Return Values :
+  //   1 on success, 0 on failure.
+  // --------------------------------------------------------------------------------
+  function PclZipUtilRename($p_src, $p_dest)
+  {
+    $v_result = 1;
+
+    // ----- Try to rename the files
+    if (!@rename($p_src, $p_dest)) {
+
+      // ----- Try to copy & unlink the src
+      if (!@copy($p_src, $p_dest)) {
+        $v_result = 0;
+      }
+      else if (!@unlink($p_src)) {
+        $v_result = 0;
+      }
+    }
+
+    // ----- Return
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : PclZipUtilOptionText()
+  // Description :
+  //   Translate option value in text. Mainly for debug purpose.
+  // Parameters :
+  //   $p_option : the option value.
+  // Return Values :
+  //   The option text value.
+  // --------------------------------------------------------------------------------
+  function PclZipUtilOptionText($p_option)
+  {
+    
+    $v_list = get_defined_constants();
+    for (reset($v_list); $v_key = key($v_list); next($v_list)) {
+	    $v_prefix = substr($v_key, 0, 10);
+	    if ((   ($v_prefix == 'PCLZIP_OPT')
+           || ($v_prefix == 'PCLZIP_CB_')
+           || ($v_prefix == 'PCLZIP_ATT'))
+	        && ($v_list[$v_key] == $p_option)) {
+        return $v_key;
+	    }
+    }
+    
+    $v_result = 'Unknown';
+
+    return $v_result;
+  }
+  // --------------------------------------------------------------------------------
+
+  // --------------------------------------------------------------------------------
+  // Function : PclZipUtilTranslateWinPath()
+  // Description :
+  //   Translate windows path by replacing '\' by '/' and optionally removing
+  //   drive letter.
+  // Parameters :
+  //   $p_path : path to translate.
+  //   $p_remove_disk_letter : true | false
+  // Return Values :
+  //   The path translated.
+  // --------------------------------------------------------------------------------
+  function PclZipUtilTranslateWinPath($p_path, $p_remove_disk_letter=true)
+  {
+    if (stristr(php_uname(), 'windows')) {
+      // ----- Look for potential disk letter
+      if (($p_remove_disk_letter) && (($v_position = strpos($p_path, ':')) != false)) {
+          $p_path = substr($p_path, $v_position+1);
+      }
+      // ----- Change potential windows directory separator
+      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
+          $p_path = strtr($p_path, '\\', '/');
+      }
+    }
+    return $p_path;
+  }
+  // --------------------------------------------------------------------------------
+
+
+?>
diff --git a/core/src/core/src/phpunit/HOWTO b/core/src/core/src/phpunit/HOWTO
new file mode 100644
index 0000000000..4a6b807a0b
--- /dev/null
+++ b/core/src/core/src/phpunit/HOWTO
@@ -0,0 +1,4 @@
+We pass the base.conf.php file as the PHPUnit "bootstrap" file. For example, running a given
+test suite, knowing Pydio is installed at /var/www/pydio :
+
+> phpunit --bootstrap /var/www/pydio/base.conf.php Pydio_Tests_Suite_Atomics
diff --git a/core/src/core/src/phpunit/Pydio/Tests/Atomics/CryptoTests.php b/core/src/core/src/phpunit/Pydio/Tests/Atomics/CryptoTests.php
new file mode 100644
index 0000000000..73f0f3d1cf
--- /dev/null
+++ b/core/src/core/src/phpunit/Pydio/Tests/Atomics/CryptoTests.php
@@ -0,0 +1,40 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Tests\Atomics;
+
+use Pydio\Core\Utils\Crypto;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class Crypto
+ * @package Pydio\Tests\Atomics
+ */
+class CryptoTests extends \PHPUnit_Framework_TestCase
+{
+    public function testEncryptDecrypt(){
+        $key = "test";
+        $data = "toto";
+        $encoded = Crypto::encrypt($data, Crypto::buildKey($key, Crypto::getApplicationSecret()));
+        $decoded = Crypto::decrypt($encoded, Crypto::buildKey($key, Crypto::getApplicationSecret()));
+        $this->assertTrue($data === $decoded);
+    }
+}
\ No newline at end of file
diff --git a/core/src/phpunit/AJXP/Tests/Atomics/FiltersTest.php b/core/src/core/src/phpunit/Pydio/Tests/Atomics/FiltersTest.php
similarity index 88%
rename from core/src/phpunit/AJXP/Tests/Atomics/FiltersTest.php
rename to core/src/core/src/phpunit/Pydio/Tests/Atomics/FiltersTest.php
index c6ed84f5f9..2718d4d1f4 100644
--- a/core/src/phpunit/AJXP/Tests/Atomics/FiltersTest.php
+++ b/core/src/core/src/phpunit/Pydio/Tests/Atomics/FiltersTest.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
  * This file is part of Pydio.
  *
  * Pydio is free software: you can redistribute it and/or modify
@@ -16,9 +16,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
-namespace AJXP\Tests\Atomics;
+namespace Pydio\Tests\Atomics;
 
 class FiltersTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/core/src/phpunit/AJXP/Tests/Atomics/MemStoresTest.php b/core/src/core/src/phpunit/Pydio/Tests/Atomics/MemStoresTest.php
similarity index 85%
rename from core/src/phpunit/AJXP/Tests/Atomics/MemStoresTest.php
rename to core/src/core/src/phpunit/Pydio/Tests/Atomics/MemStoresTest.php
index 774d7b7307..1be3e91085 100644
--- a/core/src/phpunit/AJXP/Tests/Atomics/MemStoresTest.php
+++ b/core/src/core/src/phpunit/Pydio/Tests/Atomics/MemStoresTest.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
  * This file is part of Pydio.
  *
  * Pydio is free software: you can redistribute it and/or modify
@@ -16,9 +16,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
-namespace AJXP\Tests\Atomics;
+namespace Pydio\Tests\Atomics;
 
 class MemStoresTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/core/src/core/src/phpunit/Pydio/Tests/Atomics/PermissionMaskTest.php b/core/src/core/src/phpunit/Pydio/Tests/Atomics/PermissionMaskTest.php
new file mode 100644
index 0000000000..4de7d3a545
--- /dev/null
+++ b/core/src/core/src/phpunit/Pydio/Tests/Atomics/PermissionMaskTest.php
@@ -0,0 +1,193 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: charles
+ * Date: 12/09/2015
+ * Time: 10:42
+ */
+
+namespace Pydio\Tests\Atomics;
+
+
+use Pydio\Access\Core\Filter\AJXP_Permission;
+use Pydio\Access\Core\Filter\AJXP_PermissionMask;
+use Pydio\Access\Core\FilterAJXP_Permission;
+
+class AJXP_PermissionMaskTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @param AJXP_Permission $permission
+     */
+    protected function isRW($permission){
+        $this->assertTrue($permission->canRead());
+        $this->assertTrue($permission->canWrite());
+        $this->assertFalse($permission->denies());
+    }
+
+    /**
+     * @param AJXP_Permission $permission
+     */
+    protected function isReadonly($permission){
+        $this->assertTrue($permission->canRead());
+        $this->assertFalse($permission->canWrite());
+        $this->assertFalse($permission->denies());
+    }
+
+    /**
+     * @param AJXP_Permission $permission
+     */
+    protected function isWriteonly($permission){
+
+        $this->assertFalse($permission->canRead());
+        $this->assertTrue($permission->canWrite());
+        $this->assertFalse($permission->denies());
+
+    }
+
+    /**
+     * @param AJXP_Permission $permission
+     */
+    protected function isDenied($permission){
+
+        $this->assertTrue($permission->denies());
+        $this->assertFalse($permission->canRead());
+        $this->assertFalse($permission->canWrite());
+
+    }
+
+
+    public function testSimplePermission(){
+
+        $perm = new AJXP_Permission();
+        $this->isDenied($perm);
+
+        $perm->setRead();
+        $this->isReadonly($perm);
+        $perm->setWrite();
+        $this->isRW($perm);
+        $perm->setDeny();
+        $this->isDenied($perm);
+
+        $perm->setDeny(false);
+
+        // When perm is empty, => denied by default
+        $this->isDenied($perm);
+        $perm->setRead();
+        $perm->setRead(false);
+        $this->isDenied($perm);
+        $perm->setWrite();
+        $perm->setWrite(false);
+        $this->isDenied($perm);
+
+    }
+
+
+    public function testPermissionOverride(){
+
+        $readonly = new AJXP_Permission("r");
+        $writeonly = new AJXP_Permission("w");
+        $readwrite = new AJXP_Permission("rw");
+        $deny = new AJXP_Permission("d");
+        $empty = new AJXP_Permission();
+
+        $this->isRW($writeonly->override($readonly));
+        $this->isRW($readonly->override($writeonly));
+        $this->isRW($readwrite->override($readonly));
+        $this->isRW($readwrite->override($writeonly));
+        $this->isRW($readonly->override($readwrite));
+        $this->isRW($writeonly->override($readwrite));
+
+        $this->isDenied($deny->override($readonly));
+        $this->isDenied($deny->override($writeonly));
+        $this->isDenied($deny->override($readwrite));
+
+        $this->isDenied($empty->override($readonly));
+        $this->isDenied($empty->override($writeonly));
+        $this->isDenied($empty->override($readwrite));
+        $this->isRW($writeonly->override($readonly));
+    }
+
+    /**
+     * @parra
+     *
+     */
+    public function testPermissionMask(){
+        $mask = new AJXP_PermissionMask();
+        $mask->updateBranch("/a1/b1/c1", new AJXP_Permission("r"));
+        echo "\n";
+        $level = 1;
+        $mask->toStr($mask->getTree(), $level);
+        $mask->updateBranch("/a1/b1/c2", new AJXP_Permission("rw"));
+        $mask->updateBranch("/a1/b1/c3", new AJXP_Permission());
+        echo "\n";
+        $mask->toStr($mask->getTree(), $level);
+        $mask->updateBranch("/a1/b2", new AJXP_Permission("rw"));
+        echo "\n";
+        $mask->toStr($mask->getTree(), $level);
+
+        $mask->updateBranch("/a1/b3", new AJXP_Permission());
+
+        $mask->updateBranch("a2/b1", new AJXP_Permission());
+
+        $this->assertFalse($mask->match("/", AJXP_Permission::WRITE));
+        $this->assertTrue($mask->match("/", AJXP_Permission::READ));
+        $this->assertTrue($mask->match("/a1/b1/c1", AJXP_Permission::READ));
+        $this->assertTrue($mask->match("/a1/b1", AJXP_Permission::READ));
+        $this->assertFalse($mask->match("/a1/b1", AJXP_Permission::WRITE));
+
+        $this->assertFalse($mask->match("/a1/b1/c3", AJXP_Permission::READ));
+        $this->assertTrue($mask->match("/a1/b1/c1/d1/e1/f1", AJXP_Permission::READ));
+        $this->assertFalse($mask->match("/a1/b1/c1/d1/e1/f1", AJXP_Permission::WRITE));
+
+        // This overrides the whole /a1/b1 branch >> do we want that?
+        $mask2 = new AJXP_PermissionMask();
+        $mask2->updateBranch("/a1/b1", new AJXP_Permission("d"));
+        //$mask->override($mask2);
+
+        echo "mask 2\n";
+        $level = 0;
+        $mask2->toStr($mask2->getTree(), $level);
+        echo "mask 1\n";
+        $mask->toStr($mask->getTree(), $level);
+        echo "Mask 2 override mask 1\n";
+        $mask->override($mask2);
+        $mask->toStr($mask->getTree(), $level);
+
+        //$this->assertTrue($mask->match("/a1/b1", AJXP_Permission::WRITE));
+        // Todo write more tests
+
+        $mask->updateBranch("/a1/b1/c1", new AJXP_Permission("w"));
+
+        //$this->assertFalse($mask->match("/a1/b1/c1", AJXP_Permission::READ));
+        $this->assertTrue($mask->match("/a1/b1/c1", AJXP_Permission::WRITE));
+
+       //
+       //
+       // $this->assertTrue($mask->match("/a1/b1/c2", AJXP_Permission::READ));
+        //$this->assertTrue($mask->match("/a1/b1/c2", AJXP_Permission::WRITE));
+
+        //$this->assertTrue($mask->match("/a1", AJXP_Permission::DENY));
+
+        // Test that a deny is cutting the sub branches
+        $mask1 = new AJXP_PermissionMask();
+        $mask1->updateBranch("/a1/b1", new AJXP_Permission("rw"));
+        $mask1->updateBranch("/a1/b2", new AJXP_Permission("rw"));
+        $mask1->updateBranch("/a1/b3/c1", new AJXP_Permission("rw"));
+        $mask1->updateBranch("/a1/b3/c2", new AJXP_Permission("rw"));
+
+        $mask2 = new AJXP_PermissionMask();
+        $mask2->updateBranch("/a1", new AJXP_Permission("d"));
+
+        $result = $mask1->override($mask2);
+        $this->assertFalse($result->match("/a1", AJXP_Permission::READ));
+        $this->assertFalse($result->match("/a1/b2", AJXP_Permission::READ));
+        $this->assertFalse($result->match("/a1/b3", AJXP_Permission::READ));
+        $this->assertFalse($result->match("/a1/b3/c1", AJXP_Permission::READ));
+        $this->assertFalse($result->match("/a1/any", AJXP_Permission::READ));
+
+    }
+
+}
+
+
+
diff --git a/core/src/phpunit/AJXP/Tests/Atomics/RolesTest.php b/core/src/core/src/phpunit/Pydio/Tests/Atomics/RolesTest.php
similarity index 86%
rename from core/src/phpunit/AJXP/Tests/Atomics/RolesTest.php
rename to core/src/core/src/phpunit/Pydio/Tests/Atomics/RolesTest.php
index 6bb1a266e0..ddfa0554df 100644
--- a/core/src/phpunit/AJXP/Tests/Atomics/RolesTest.php
+++ b/core/src/core/src/phpunit/Pydio/Tests/Atomics/RolesTest.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
  * This file is part of Pydio.
  *
  * Pydio is free software: you can redistribute it and/or modify
@@ -16,18 +16,20 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
-namespace AJXP\Tests\Atomics;
+namespace Pydio\Tests\Atomics;
+
+use Pydio\Conf\Core\AJXP_Role;
 
 class RolesTest extends \PHPUnit_Framework_TestCase
 {
 
     public function testRolesNumericKeys()
     {
-        $r1 = new \AJXP_Role("role1");
-        $r2 = new \AJXP_Role("role2");
+        $r1 = new AJXP_Role("role1");
+        $r2 = new AJXP_Role("role2");
 
         $r1->setAcl(1, "rw");
         $r3 = $r2->override($r1);
@@ -37,8 +39,8 @@ public function testRolesNumericKeys()
 
     public function testRolesAclAdditivity()
     {
-        $r1 = new \AJXP_Role("role1");
-        $r2 = new \AJXP_Role("role2");
+        $r1 = new AJXP_Role("role1");
+        $r2 = new AJXP_Role("role2");
 
         $r1->setAcl("repository_id", "");
         $r2->setAcl("repository_id", "w");
@@ -58,14 +60,14 @@ public function testRolesAclAdditivity()
         $r1->setAcl("repository_id", "r");
         $r2->setAcl("repository_id", AJXP_VALUE_CLEAR);
         $r3 = $r2->override($r1);
-        $this->assertEquals("", $r3->getAcl("repository_id"));
+        $this->assertEquals(AJXP_VALUE_CLEAR, $r3->getAcl("repository_id"));
 
     }
 
     public function testRolesParametersAdditivity()
     {
-        $r1 = new \AJXP_Role("role1");
-        $r2 = new \AJXP_Role("role2");
+        $r1 = new AJXP_Role("role1");
+        $r2 = new AJXP_Role("role2");
 
         $r1->setParameterValue("type.id", "param_name", "param_value1", "repository_id");
         $this->assertEquals("param_value1", $r1->filterParameterValue("type.id", "param_name", "repository_id", "anyvalue1"));
@@ -88,8 +90,8 @@ public function testRolesParametersAdditivity()
 
     public function testRolesActionsAdditivity()
     {
-        $r1 = new \AJXP_Role("role1");
-        $r2 = new \AJXP_Role("role2");
+        $r1 = new AJXP_Role("role1");
+        $r2 = new AJXP_Role("role2");
 
         $r1->setActionState("type.id", "action_name", "repository_id", "disabled");
         $this->assertFalse($r1->actionEnabled("type.id", "action_name", "repository_id", true));
diff --git a/core/src/phpunit/AJXP/Tests/Atomics/UtilsTest.php b/core/src/core/src/phpunit/Pydio/Tests/Atomics/UtilsTest.php
similarity index 77%
rename from core/src/phpunit/AJXP/Tests/Atomics/UtilsTest.php
rename to core/src/core/src/phpunit/Pydio/Tests/Atomics/UtilsTest.php
index 84f937e1cc..5d2ecc1f48 100644
--- a/core/src/phpunit/AJXP/Tests/Atomics/UtilsTest.php
+++ b/core/src/core/src/phpunit/Pydio/Tests/Atomics/UtilsTest.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
  * This file is part of Pydio.
  *
  * Pydio is free software: you can redistribute it and/or modify
@@ -16,9 +16,11 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
-namespace AJXP\Tests\Atomics;
+namespace Pydio\Tests\Atomics;
+
+use Pydio\Core\Utils\Vars\StatHelper;
 
 class UtilsTest extends \PHPUnit_Framework_TestCase
 {
@@ -29,7 +31,7 @@ public function testPHPUnitIsWorking()
 
     public function testFrameworkLoads()
     {
-        $this->assertEquals(\AJXP_Utils::convertBytes("2M"), 2097152);
+        $this->assertEquals(StatHelper::convertBytes("2M"), 2097152);
     }
 
 }
diff --git a/core/src/phpunit/AJXP/Tests/Core/StoragesTest.php b/core/src/core/src/phpunit/Pydio/Tests/Core/StoragesTest.php
similarity index 93%
rename from core/src/phpunit/AJXP/Tests/Core/StoragesTest.php
rename to core/src/core/src/phpunit/Pydio/Tests/Core/StoragesTest.php
index 435a2ba04a..b06991fe34 100644
--- a/core/src/phpunit/AJXP/Tests/Core/StoragesTest.php
+++ b/core/src/core/src/phpunit/Pydio/Tests/Core/StoragesTest.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
  * This file is part of Pydio.
  *
  * Pydio is free software: you can redistribute it and/or modify
@@ -16,9 +16,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
-namespace AJXP\Tests\Core;
+namespace Pydio\Tests\Core;
 
 class StoragesTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/core/src/phpunit/AJXP/Tests/Core/UsersTests.php b/core/src/core/src/phpunit/Pydio/Tests/Core/UsersTests.php
similarity index 89%
rename from core/src/phpunit/AJXP/Tests/Core/UsersTests.php
rename to core/src/core/src/phpunit/Pydio/Tests/Core/UsersTests.php
index 106b61ce97..8a69a3cb54 100644
--- a/core/src/phpunit/AJXP/Tests/Core/UsersTests.php
+++ b/core/src/core/src/phpunit/Pydio/Tests/Core/UsersTests.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
  * This file is part of Pydio.
  *
  * Pydio is free software: you can redistribute it and/or modify
@@ -16,9 +16,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
-namespace AJXP\Tests\Core;
+namespace Pydio\Tests\Core;
 
 class UsersTests extends \PHPUnit_Framework_TestCase
 {
diff --git a/core/src/core/src/phpunit/Pydio/Tests/Suite/Atomics.php b/core/src/core/src/phpunit/Pydio/Tests/Suite/Atomics.php
new file mode 100644
index 0000000000..558de51393
--- /dev/null
+++ b/core/src/core/src/phpunit/Pydio/Tests/Suite/Atomics.php
@@ -0,0 +1,43 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tests\Suite;
+
+class Atomics extends \PHPUnit_Framework_TestSuite
+{
+    public static function suite()
+    {
+        $s =  new Atomics();
+        $s->addTestFile("Pydio/Tests/Atomics/RolesTest.php");
+        $s->addTestFile("Pydio/Tests/Atomics/UtilsTest.php");
+        $s->addTestFile("Pydio/Tests/Atomics/PermissionMaskTest.php");
+        return $s;
+
+    }
+
+    protected function setUp()
+    {
+    }
+
+    protected function tearDown()
+    {
+    }
+
+}
diff --git a/core/src/phpunit/AJXP/Tests/Suite/CoreStorages.php b/core/src/core/src/phpunit/Pydio/Tests/Suite/CoreStorages.php
similarity index 83%
rename from core/src/phpunit/AJXP/Tests/Suite/CoreStorages.php
rename to core/src/core/src/phpunit/Pydio/Tests/Suite/CoreStorages.php
index b9cddfa41a..b39d9aba90 100644
--- a/core/src/phpunit/AJXP/Tests/Suite/CoreStorages.php
+++ b/core/src/core/src/phpunit/Pydio/Tests/Suite/CoreStorages.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
  * This file is part of Pydio.
  *
  * Pydio is free software: you can redistribute it and/or modify
@@ -16,16 +16,16 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
-namespace AJXP\Tests\Suite;
+namespace Pydio\Tests\Suite;
 
 class AJXP_Suite_CoreStorages extends PHPUnit_Framework_TestSuite
 {
     public static function suite()
     {
         $s =  new AJXP_Suite_CoreStorages();
-        $s->addTestFile("AJXP/Core/Conf/StoragesTest.php");
+        $s->addTestFile("Pydio/Core/Conf/StoragesTest.php");
         return $s;
     }
 
diff --git a/core/src/core/src/pydio/Core/Controller/CliRunner.php b/core/src/core/src/pydio/Core/Controller/CliRunner.php
new file mode 100644
index 0000000000..88f6719e6c
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Controller/CliRunner.php
@@ -0,0 +1,151 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Controller;
+
+use Pydio\Auth\Core\MemorySafe;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Utils\Crypto;
+use Pydio\Log\Core\Logger;
+use Pydio\Tasks\Task;
+use Pydio\Tasks\TaskService;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class CliRunner
+ * @package Pydio\Core\Controller
+ */
+class CliRunner
+{
+
+    /**
+     * Apply a Task in background
+     *
+     * @param Task $task
+     */
+    public static function applyTaskInBackground(Task $task)
+    {
+
+        $parameters = $task->getParameters();
+        $task->setStatus(Task::STATUS_RUNNING);
+        TaskService::getInstance()->updateTask($task);
+        self::applyActionInBackground($task->getContext(), $task->getAction(), $parameters, "", $task->getId(), $task->getImpersonateUsers());
+
+    }
+
+    /**
+     * Launch a command-line version of the framework by passing the actionName & parameters as arguments.
+     * @static
+     * @param ContextInterface $ctx
+     * @param String $actionName
+     * @param array $parameters
+     * @param string $statusFile
+     * @param string $taskId
+     * @param string $impersonateUsers
+     * @return null|UnixProcess
+     */
+    public static function applyActionInBackground(ContextInterface $ctx, $actionName, $parameters, $statusFile = "", $taskId = null, $impersonateUsers = null)
+    {
+        $repositoryId = $ctx->getRepositoryId();
+        $user = $ctx->hasUser() ? $ctx->getUser()->getId() : "shared";
+
+        $token = md5(time());
+        $logDir = AJXP_CACHE_DIR . "/cmd_outputs";
+        if (!is_dir($logDir)) mkdir($logDir, 0755);
+        $logFile = $logDir . "/" . $token . ".out";
+
+        if (UsersService::usersEnabled()) {
+            $user = Crypto::encrypt($user, Crypto::buildKey($token , Crypto::getCliSecret()));
+        }
+        $robustInstallPath = str_replace("/", DIRECTORY_SEPARATOR, AJXP_INSTALL_PATH);
+        $cmd = ConfService::getGlobalConf("CLI_PHP") . " " . $robustInstallPath . DIRECTORY_SEPARATOR . "cmd.php -u=$user -t=$token -a=$actionName -r=$repositoryId";
+        if($impersonateUsers !== null){
+            $cmd .= " -i=".$impersonateUsers;
+        }
+        /* Inserted next 3 lines to quote the command if in windows - rmeske*/
+        if (PHP_OS == "WIN32" || PHP_OS == "WINNT" || PHP_OS == "Windows") {
+            $cmd = ConfService::getGlobalConf("CLI_PHP") . " " . chr(34) . $robustInstallPath . DIRECTORY_SEPARATOR . "cmd.php" . chr(34) . " -u=$user -t=$token -a=$actionName -r=$repositoryId";
+        }
+        if (!empty($statusFile)) {
+            $cmd .= " -s=" . $statusFile;
+        }
+        if (!empty($taskId)) {
+            $cmd .= " -k=" . $taskId;
+        }
+        foreach ($parameters as $key => $value) {
+            if ($key == "action" || $key == "get_action") continue;
+            if (is_array($value)) {
+                $index = 0;
+                foreach ($value as $v) {
+                    $cmd .= " --file_" . $index . "=" . escapeshellarg($v);
+                    $index++;
+                }
+            } else {
+                $cmd .= " --$key=" . escapeshellarg($value);
+            }
+        }
+        $envSet = false;
+        if ($ctx->getRepository()->getContextOption($ctx, "USE_SESSION_CREDENTIALS")) {
+            $envSet = MemorySafe::setEnv();
+        }
+
+        // NOW RUN COMMAND
+        $res = self::runCommandInBackground($cmd, $logFile);
+
+        if($envSet){
+            MemorySafe::clearEnv();
+        }
+        return $res;
+    }
+
+    /**
+     * @param $cmd
+     * @param $logFile
+     * @param $forceLog
+     * @return UnixProcess|null
+     */
+    public static function runCommandInBackground($cmd, $logFile, $forceLog = false)
+    {
+        if (PHP_OS == "WIN32" || PHP_OS == "WINNT" || PHP_OS == "Windows") {
+            if (AJXP_SERVER_DEBUG || $forceLog) $cmd .= " > " . $logFile;
+            if (class_exists("COM") && ConfService::getGlobalConf("CLI_USE_COM")) {
+                $WshShell = new \COM("WScript.Shell");
+                $WshShell->Run("cmd /C $cmd", 0, false);
+            } else {
+                $basePath = str_replace("/", DIRECTORY_SEPARATOR, AJXP_INSTALL_PATH);
+                $tmpBat = implode(DIRECTORY_SEPARATOR, array($basePath, "data", "tmp", md5(time()) . ".bat"));
+                $cmd = "@chcp 1252 > nul \r\n" . $cmd;
+                $cmd .= "\n DEL " . chr(34) . $tmpBat . chr(34);
+                Logger::debug("Writing file $cmd to $tmpBat");
+                file_put_contents($tmpBat, $cmd);
+                pclose(popen('start /b "CLI" "' . $tmpBat . '"', 'r'));
+            }
+            return null;
+        } else {
+            $process = new UnixProcess($cmd, (AJXP_SERVER_DEBUG || $forceLog ? $logFile : null));
+            Logger::debug("Starting process and sending output dev null");
+            return $process;
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Controller/Controller.php b/core/src/core/src/pydio/Core/Controller/Controller.php
new file mode 100644
index 0000000000..ff657c2f0e
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Controller/Controller.php
@@ -0,0 +1,553 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Controller;
+
+use Pydio\Core\Utils\XMLHelper;
+use Zend\Diactoros\Response;
+use Zend\Diactoros\ServerRequestFactory;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Model\ContextProviderInterface;
+
+use Pydio\Core\Services;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Log\Core\Logger;
+
+use Pydio\Core\Exception\ActionNotFoundException;
+use Pydio\Core\Exception\AuthRequiredException;
+use Pydio\Core\Exception\PydioException;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+/**
+ * Core controller for dispatching the actions.
+ * It uses the XML Registry (simple version, not extended) to search all the <action> tags and find the action.
+ * @package Pydio
+ * @subpackage Core
+ */
+class Controller
+{
+    /**
+     * @var \DOMXPath[]
+     */
+    private static $xPathes = [];
+    /**
+     * @var array
+     */
+    private static $includeHooks = [];
+    /**
+     * @var array
+     */
+    private static $hooksCaches = [];
+
+    /**
+     * Initialize the queryable xPath object, pointing to the registry associated
+     * with the current context
+     * @static
+     * @param ContextInterface $ctx
+     * @param bool $useCache Whether to cache the registry version in a memory cache.
+     * @return \DOMXPath
+     */
+    private static function initXPath($ctx, $useCache = false)
+    {
+        $ctxId = $ctx->getStringIdentifier();
+        if (!isSet(self::$xPathes[$ctxId])) {
+            $registry = PluginsService::getInstance($ctx)->getFilteredXMLRegistry(false, false, $useCache);
+            self::$xPathes[$ctxId] = new \DOMXPath($registry);
+        }
+        return self::$xPathes[$ctxId];
+    }
+
+    /**
+     * API V1 : parse parameters based on the URL and their definitions in the manifest.
+     * @param ServerRequestInterface $request
+     * @return bool|\DOMElement
+     * @throws ActionNotFoundException
+     */
+    public static function parseRestParameters(ServerRequestInterface &$request){
+
+        $actionName = $request->getAttribute("action");
+        $path = $request->getAttribute("rest_path");
+        $ctx = $request->getAttribute("ctx");
+        $reqParameters = $request->getParsedBody();
+
+        $xPath = self::initXPath($ctx, true);
+        $actions = $xPath->query("actions/action[@name='$actionName']");
+        if (!$actions->length) {
+            throw new ActionNotFoundException($actionName);
+        }
+        $action = $actions->item(0);
+        $restPathList = $xPath->query("processing/serverCallback/@restParams", $action);
+        if (!$restPathList->length) {
+            throw new ActionNotFoundException($actionName);
+        }
+        $restPath = $restPathList->item(0)->nodeValue;
+        $paramNames = explode("/", trim($restPath, "/"));
+        $exploded = explode("?", $path);
+        $path = array_shift($exploded);
+        $paramValues = array_map("urldecode", explode("/", trim($path, "/"), count($paramNames)));
+        foreach ($paramNames as $i => $pName) {
+            if (strpos($pName, "+") !== false) {
+                $paramNames[$i] = str_replace("+", "", $pName);
+                $paramValues[$i] = "/" . $paramValues[$i];
+            }
+        }
+        if (count($paramValues) < count($paramNames)) {
+            $paramNames = array_slice($paramNames, 0, count($paramValues));
+        }
+        $paramValues = array_map(array("Pydio\\Core\\Utils\\TextEncoder", "toUTF8"), $paramValues);
+
+        $reqParameters = array_merge($reqParameters, array_combine($paramNames, $paramValues));
+        $request = $request->withParsedBody($reqParameters);
+        return $action;
+
+    }
+
+    /**
+     * Middleware entry point
+     *
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @param callable|null $nextCallable
+     * @return ResponseInterface
+     * @throws AuthRequiredException
+     */
+    public static function registryActionMiddleware(ServerRequestInterface $request, ResponseInterface $response, callable $nextCallable = null){
+        $action = null;
+        if($request->getAttribute("api") == "v1"){
+            $action = Controller::parseRestParameters($request);
+        }
+        $response = Controller::run($request, $action);
+        if($nextCallable != null){
+            $response = call_user_func_array($nextCallable, array(&$request, &$response));
+        }
+        return $response;
+    }
+
+    /**
+     * Check if mandatory parameters as defined in the manifests are correct.
+     *
+     * @static
+     * @param array $parameters
+     * @param \DOMNode $callbackNode
+     * @param \DOMXPath $xPath
+     * @throws \Exception
+     */
+    public static function checkParams(&$parameters, $callbackNode, $xPath)
+    {
+        if (!$callbackNode->attributes->getNamedItem('checkParams') || $callbackNode->attributes->getNamedItem('checkParams')->nodeValue != "true") {
+            return;
+        }
+        $inputParams = $xPath->query("input_param", $callbackNode);
+        $declaredParams = array();
+        foreach ($inputParams as $param) {
+            $name = $param->attributes->getNamedItem("name")->nodeValue;
+            $type = $param->attributes->getNamedItem("type")->nodeValue;
+            $defaultNode = $param->attributes->getNamedItem("default");
+            $mandatory = ($param->attributes->getNamedItem("mandatory")->nodeValue == "true");
+            if ($mandatory && !isSet($parameters[$name])) {
+                throw new \Exception("Missing parameter '".$name."' of type '$type'");
+            }
+            if ($defaultNode != null && !isSet($parameters[$name])) {
+                $parameters[$name] = $defaultNode->nodeValue;
+            }
+            $declaredParams[] = $name;
+        }
+        foreach ($parameters as $k => $n) {
+            if(!in_array($k, $declaredParams)) unset($parameters[$k]);
+        }
+    }
+
+    /**
+     * Main method for querying the XML registry, find an action and all its associated processors,
+     * and apply all the callbacks.
+     *
+     * @static
+     * @param ServerRequestInterface $request
+     * @param \DOMNode $actionNode
+     * @return ResponseInterface
+     * @throws \Exception
+     */
+    public static function run(ServerRequestInterface $request, &$actionNode = null)
+    {
+        $actionName = $request->getAttribute("action");
+        /** @var ContextInterface $ctx */
+        $ctx = $request->getAttribute("ctx");
+
+        $xPath = self::initXPath($ctx, true);
+        if ($actionNode == null) {
+            $actions = $xPath->query("actions/action[@name='$actionName']");
+            if (!$actions->length) {
+                throw new ActionNotFoundException($actionName);
+            }
+            $actionNode = $actions->item(0);
+        }
+        //Check Rights
+        if (UsersService::usersEnabled()) {
+            $loggedUser = $ctx->getUser();
+            if( $actionName != "logout" && Controller::actionNeedsRight($actionNode, $xPath, "userLogged", "only") && $loggedUser == null){
+                    throw new AuthRequiredException();
+                }
+            if( Controller::actionNeedsRight($actionNode, $xPath, "adminOnly") &&
+                ($loggedUser == null || !$loggedUser->isAdmin())){
+                    throw new AuthRequiredException("207");
+                }
+            if( Controller::actionNeedsRight($actionNode, $xPath, "read") &&
+                ($loggedUser == null || !$loggedUser->canRead($ctx->getRepositoryId().""))){
+                    if($actionName == "ls" & $loggedUser!=null
+                        && $loggedUser->canWrite($ctx->getRepositoryId()."")){
+                        // Special case of "write only" right : return empty listing, no auth error.
+                        $response = new Response();
+                        $response->getBody()->write(XMLHelper::wrapDocument(""));
+                        return $response;
+                    }else{
+                        throw new AuthRequiredException("208");
+                    }
+                }
+            if( Controller::actionNeedsRight($actionNode, $xPath, "write") &&
+                ($loggedUser == null || !$loggedUser->canWrite($ctx->getRepositoryId().""))){
+                    throw new AuthRequiredException("207");
+                }
+        }
+
+        $queries = [
+            'pre_processing/serverCallback' => true,
+            'processing/serverCallback' => false,
+            'post_processing/serverCallback[not(@capture="true")]' => true,
+            'post_processing/serverCallback[@capture="true"]' => true
+        ];
+
+        $response = new Response();
+
+        foreach ($queries as $cbQuery => $multiple){
+            $calls = self::getCallbackNode($xPath, $actionNode, $cbQuery, $actionName, $request->getParsedBody(), $_FILES, $multiple);
+            if(!$multiple && count($calls)){
+                self::checkParams($httpVars, $calls[0], $xPath);
+            }
+            foreach ($calls as $call){
+                self::handleRequest($call, $request, $response);
+            }
+        }
+
+        self::applyHook("response.send", array($ctx, &$response));
+
+        return $response;
+    }
+
+    /**
+     * @param ContextInterface $context
+     * @param string $action
+     * @param array $parameters
+     * @return ServerRequestInterface
+     */
+    public static function executableRequest(ContextInterface $context, $action, $parameters = []){
+        $request = ServerRequestFactory::fromGlobals();
+        $request = $request
+            ->withAttribute("ctx", $context)
+            ->withAttribute("action", $action)
+            ->withParsedBody($parameters);
+        return $request;
+    }
+
+
+    /**
+     * Find a callback node by its xpath query, filtering with the applyCondition if the xml attribute exists.
+     * @static
+     * @param \DOMXPath $xPath
+     * @param \DOMNode $actionNode
+     * @param string $query
+     * @param string $actionName
+     * @param array $httpVars
+     * @param array $fileVars
+     * @param bool $multiple
+     * @return \DOMElement[]
+     */
+    private static function getCallbackNode($xPath, $actionNode, $query ,$actionName, $httpVars, $fileVars, $multiple = true)
+    {
+        $callbacks = $xPath->query($query, $actionNode);
+        if(!$callbacks->length) return [];
+        if ($multiple) {
+            $cbArray = array();
+            foreach ($callbacks as $callback) {
+                if (self::appliesCondition($callback, $actionName, $httpVars, $fileVars)) {
+                    $cbArray[] = $callback;
+                }
+            }
+            if(!count($cbArray)) return [];
+            return $cbArray;
+        } else {
+            $callback=$callbacks->item(0);
+            if(!self::appliesCondition($callback, $actionName, $httpVars, $fileVars)) return [];
+            return [$callback];
+        }
+    }
+
+    /**
+     * Check in the callback node if an applyCondition XML attribute exists, and eval its content.
+     * The content must set an $apply boolean as result
+     * @static
+     * @param \DOMElement|\DOMNode $callback
+     * @param string $actionName
+     * @param array $httpVars
+     * @param array $fileVars
+     * @return bool
+     */
+    private static function appliesCondition($callback, $actionName, $httpVars, $fileVars)
+    {
+        if ($callback->getAttribute("applyCondition")!="") {
+            $apply = false;
+            eval($callback->getAttribute("applyCondition"));
+            if(!$apply) return false;
+        }
+        return true;
+    }
+
+    /**
+     * Applies a callback node
+     * @static
+     * @param ContextInterface $context
+     * @param \DOMElement|array $callback The DOM Node or directly an array of attributes
+     * @param null $variableArgs
+     * @param bool $defer
+     * @throws PydioException
+     * @return mixed
+     */
+    private static function applyCallback($context, $callback, &$variableArgs, $defer = false)
+    {
+        //Processing
+        if(is_array($callback)){
+            $plugId = $callback["pluginId"];
+            $methodName = $callback["methodName"];
+        }else{
+            $plugId = $callback->getAttribute("pluginId");
+            $methodName = $callback->getAttribute("methodName");
+        }
+        $plugInstance = PluginsService::getInstance($context)->getPluginById($plugId);
+        //return call_user_func(array($plugInstance, $methodName), $actionName, $httpVars, $fileVars);
+        // Do not use call_user_func, it cannot pass parameters by reference.
+        if (method_exists($plugInstance, $methodName)) {
+            if ($defer == true) {
+                ShutdownScheduler::getInstance()->registerShutdownEventArray(array($plugInstance, $methodName), $variableArgs);
+            } else {
+                call_user_func_array(array($plugInstance, $methodName), $variableArgs);
+            }
+        } else {
+            throw new PydioException("Cannot find method $methodName for plugin $plugId!");
+        }
+        return null;
+    }
+
+    /**
+     * @param $callback
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @throws PydioException
+     */
+    private static function handleRequest($callback, ServerRequestInterface &$request, ResponseInterface &$response){
+
+        list($plugInstance, $methodName) = self::parseCallback($request->getAttribute("ctx"), $callback);
+
+        $reflectMethod = new \ReflectionMethod($plugInstance, $methodName);
+        $reflectParams = $reflectMethod->getParameters();
+        $supportPSR = false;
+        foreach ($reflectParams as $reflectParam){
+            if($reflectParam->getClass() !== null && $reflectParam->getClass()->getName() == "Psr\\Http\\Message\\ServerRequestInterface"){
+                $supportPSR = true;
+                break;
+            }
+        }
+        if($supportPSR){
+
+            $plugInstance->$methodName($request, $response);
+
+        }else{
+
+            $httpVars = $request->getParsedBody();
+            $result = $plugInstance->$methodName($request->getAttribute("action"), $httpVars, $_FILES, $request->getAttribute("ctx"));
+            // May have been modified
+            $request = $request->withParsedBody($httpVars);
+
+            if(!empty($result)){
+                $response->getBody()->write(XMLHelper::wrapDocument($result));
+                $response = $response->withHeader("Content-type", "text/xml; charset=UTF-8");
+            }
+        }
+
+    }
+
+    /**
+     * @param \DOMElement|array $callback
+     * @throws PydioException
+     * @return array
+     */
+    private static function parseCallback(ContextInterface $ctx, $callback){
+        if(is_array($callback)){
+            $plugId = $callback["pluginId"];
+            $methodName = $callback["methodName"];
+        }else{
+            $plugId = $callback->getAttribute("pluginId");
+            $methodName = $callback->getAttribute("methodName");
+        }
+        $plugInstance = PluginsService::getInstance($ctx)->getPluginById($plugId);
+        if(empty($plugInstance) || !method_exists($plugInstance, $methodName)){
+            throw new PydioException("Cannot find method $methodName for plugin $plugId!");
+        }
+        return [$plugInstance, $methodName];
+    }
+
+    /**
+     * Find all callbacks registered for a given hook and apply them. Caches the hooks locally, on a
+     * per-context basis
+     *
+     * @static
+     * @param string $hookName
+     * @param array $args
+     * @param bool $forceNonDefer
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public static function applyHook($hookName, $args, $forceNonDefer = false)
+    {
+        $findContext = null;
+        foreach ($args as $arg){
+            if($arg instanceof ContextInterface) {
+                $findContext = $arg;
+                break;
+            }else if($arg instanceof ContextProviderInterface){
+                $findContext = $arg->getContext();
+                break;
+            }
+        }
+        if($findContext == null){
+            Logger::error("Controller", "applyHook", "Applying hook $hookName without context");
+            throw new \Exception("No context found for hook $hookName: please make sure to pass at list one ContextInterface or Context Provider object");
+        }
+
+        $contextId = $findContext->getStringIdentifier();
+        if(isSet(self::$hooksCaches[$contextId][$hookName])){
+            $hooks = self::$hooksCaches[$contextId][$hookName];
+            foreach($hooks as $hook){
+                if (isSet($hook["applyCondition"]) && $hook["applyCondition"]!="") {
+                    $apply = false;
+                    eval($hook["applyCondition"]);
+                    if(!$apply) continue;
+                }
+                $defer = $hook["defer"];
+                if($defer && $forceNonDefer) $defer = false;
+                self::applyCallback($findContext, $hook, $args, $defer);
+            }
+            return;
+        }
+        $xPath = self::initXPath($findContext, true);
+        $callbacks = $xPath->query("hooks/serverCallback[@hookName='$hookName']");
+        if(!$callbacks->length) return ;
+        if(!isSet(self::$hooksCaches[$contextId])){
+            self::$hooksCaches[$contextId] = [];
+        }
+        self::$hooksCaches[$contextId][$hookName] = [];
+        /**
+         * @var $callback \DOMElement
+         */
+        foreach ($callbacks as $callback) {
+            $defer = ($callback->getAttribute("defer") === "true");
+            $applyCondition = $callback->getAttribute("applyCondition");
+            $plugId = $callback->getAttribute("pluginId");
+            $methodName = $callback->getAttribute("methodName");
+            $dontBreakOnExceptionAtt = $callback->getAttribute("dontBreakOnException");
+            $dontBreakOnException = !empty($dontBreakOnExceptionAtt) && $dontBreakOnExceptionAtt == "true";
+            $hookCallback = array(
+                "defer" => $defer,
+                "applyCondition" => $applyCondition,
+                "pluginId"    => $plugId,
+                "methodName"    => $methodName
+            );
+            self::$hooksCaches[$contextId][$hookName][] = $hookCallback;
+            if (!empty($applyCondition)) {
+                $apply = false;
+                eval($applyCondition);
+                if(!$apply) continue;
+            }
+            if($defer && $forceNonDefer) $defer = false;
+            if($dontBreakOnException){
+                try{
+                    self::applyCallback($findContext, $hookCallback, $args, $defer);
+                }catch(\Exception $e){
+                    Logger::error("[Hook $hookName]", "[Callback ".$plugId.".".$methodName."]", $e->getMessage());
+                }
+            }else{
+                self::applyCallback($findContext, $hookCallback, $args, $defer);
+            }
+        }
+    }
+
+    /**
+     * Find the statically defined callbacks for a given hook and apply them
+     * @static
+     * @param $hookName
+     * @param $args
+     * @return void
+     */
+    public static function applyIncludeHook($hookName, &$args)
+    {
+        if(!isSet(self::$includeHooks[$hookName])) return;
+        foreach (self::$includeHooks[$hookName] as $callback) {
+            call_user_func_array($callback, $args);
+        }
+    }
+
+    /**
+     * Register a hook statically when it must be defined before the XML registry construction.
+     * @static
+     * @param $hookName
+     * @param $callback
+     * @return void
+     */
+    public static function registerIncludeHook($hookName, $callback)
+    {
+        if (!isSet(self::$includeHooks[$hookName])) {
+            self::$includeHooks[$hookName] = array();
+        }
+        self::$includeHooks[$hookName][] = $callback;
+    }
+
+    /**
+     * Check the rightsContext node of an action.
+     * @static
+     * @param \DOMNode $actionNode
+     * @param \DOMXPath $xPath
+     * @param string $right
+     * @return bool
+     */
+    public static function actionNeedsRight($actionNode, $xPath, $right, $expectedValue="true")
+    {
+        $rights = $xPath->query("rightsContext", $actionNode);
+        if(!$rights->length) return false;
+        $rightNode =  $rights->item(0);
+        $rightAttr = $xPath->query("@".$right, $rightNode);
+        if ($rightAttr->length && $rightAttr->item(0)->value == $expectedValue) {
+            return true;
+        }
+        return false;
+    }
+
+}
diff --git a/core/src/core/src/pydio/Core/Controller/HTMLWriter.php b/core/src/core/src/pydio/Core/Controller/HTMLWriter.php
new file mode 100644
index 0000000000..43b6eb82ca
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Controller/HTMLWriter.php
@@ -0,0 +1,268 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Controller;
+
+use Psr\Http\Message\ResponseInterface;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Utils\TextEncoder;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Static functions for generating HTML.
+ * @package Pydio
+ * @subpackage Core
+ */
+class HTMLWriter
+{
+
+    /**
+     * Replace the doc files keywords
+     * @static
+     * @param string $docFileName
+     * @return string
+     */
+    public static function getDocFile($docFileName)
+    {
+        $realName = AJXP_DOCS_FOLDER."/".$docFileName.".txt";
+        if (is_file($realName)) {
+            $content = implode("<br>", file($realName));
+            $content = preg_replace("(http:\/\/[a-z|.|\/|\-|0-9]*)", "<a target=\"_blank\" href=\"$0\">$0</a>", $content);
+            $content = preg_replace("(\[(.*)\])", "<div class=\"title\">$1</div>", $content);
+            $content = preg_replace("(\+\+ (.*) \+\+)", "<div class=\"subtitle\">$1</div>", $content);
+            $content = str_replace("__AJXP_VERSION__", AJXP_VERSION, $content);
+            $content = str_replace("__AJXP_VERSION_DATE__", AJXP_VERSION_DATE, $content);
+            return $content;
+        }
+        return "File not found : ".$docFileName;
+    }
+
+    /**
+     * Send a simple Content-type header
+     * @static
+     */
+    public static function internetExplorerMainDocumentHeader(ResponseInterface &$response = null)
+    {
+        if (strstr($_SERVER["HTTP_USER_AGENT"], "MSIE 9.")) {
+            if(isSet($response)){
+                $response = $response->withHeader("X-UA-Compatible", "IE=9");
+            }else{
+                header("X-UA-Compatible: IE=9");
+            }
+        } else if (strstr($_SERVER["HTTP_USER_AGENT"], "MSIE 10.")) {
+            if(isSet($response)){
+                $response = $response->withHeader("X-UA-Compatible", "IE=Edge, chrome=1");
+            }else{
+                header("X-UA-Compatible: IE=Edge,chrome=1");
+            }
+        }
+        if(isSet($response)){
+            $response = $response->withHeader("Content-type", "text/html; charset=utf-8");
+        }
+    }
+
+    /**
+     * Send a simple Content-type header
+     * @static
+     * @param string $type
+     * @param string $charset
+     * @return void
+     */
+    public static function charsetHeader($type = 'text/html', $charset='UTF-8')
+    {
+        header("Content-type:$type; charset=$charset");
+    }
+
+    /**
+     * Write directly an error as a javascript instruction
+     * @static
+     * @param $errorType
+     * @param $errorMessage
+     */
+    public static function javascriptErrorHandler($errorType, $errorMessage)
+    {
+        // Handle "@" case!
+        if(error_reporting() == 0) return ;
+        restore_error_handler();
+        die("<script language='javascript'>parent.ajaxplorer.displayMessage('ERROR', '".str_replace("'", "\'", $errorMessage)."');</script>");
+    }
+
+
+    /**
+     * @param ResponseInterface $response
+     * @param $attachName
+     * @param $fileSize
+     * @param $mimeType
+     * @return ResponseInterface
+     */
+    public static function responseWithInlineHeaders(ResponseInterface $response, $attachName, $fileSize, $mimeType){
+        return self::generateInlineHeaders($attachName, $fileSize, $mimeType, $response);
+    }
+
+    /**
+     * @param ResponseInterface $response
+     * @param $attachmentName
+     * @param $dataSize
+     * @param bool $isFile
+     * @param bool $gzip
+     * @return null|ResponseInterface
+     */
+    public static function responseWithAttachmentsHeaders(ResponseInterface $response, &$attachmentName, $dataSize, $isFile=true, $gzip=false){
+        return self::generateAttachmentsHeader($attachmentName, $dataSize, $isFile, $gzip, $response);
+    }
+
+
+    /**
+     * @param $attachName
+     * @param $fileSize
+     * @param $mimeType
+     */
+    public static function emitInlineHeaders($attachName, $fileSize, $mimeType){
+        self::generateInlineHeaders($attachName, $fileSize, $mimeType);
+    }
+
+    /**
+     * @param $attachmentName
+     * @param $dataSize
+     * @param bool $isFile
+     * @param bool $gzip
+     */
+    public static function emitAttachmentsHeaders(&$attachmentName, $dataSize, $isFile=true, $gzip=false){
+        self::generateAttachmentsHeader($attachmentName, $dataSize, $isFile, $gzip);
+    }
+
+
+
+    /**
+     * Correctly encode name for attachment header
+     * @param string $name
+     * @return string
+     */
+    private static function encodeAttachmentName($name){
+        if (preg_match('/ MSIE /',$_SERVER['HTTP_USER_AGENT'])
+            || preg_match('/ WebKit /',$_SERVER['HTTP_USER_AGENT'])
+            || preg_match('/ Trident/',$_SERVER['HTTP_USER_AGENT'])) {
+            $name = str_replace("+", " ", urlencode(TextEncoder::toUTF8($name)));
+        }
+        return $name;
+    }
+
+    /**
+     * @static
+     * @param string $attachmentName
+     * @param int $dataSize
+     * @param bool $isFile
+     * @param bool $gzip If true, make sure the $dataSize is the size of the ENCODED data.
+     * @param ResponseInterface $response Response to update instead of generating headers
+     * @return ResponseInterface|null Update response interface if passed by argument
+     */
+    private static function generateAttachmentsHeader(&$attachmentName, $dataSize, $isFile=true, $gzip=false, ResponseInterface $response = null)
+    {
+        $attachmentName = self::encodeAttachmentName($attachmentName);
+
+        $headers = [];
+        $headers["Content-Type"] = "application/force-download; name=\"".$attachmentName."\"";
+        $headers["Content-Transfer-Encoding"] = "binary";
+        if ($gzip) {
+            $headers["Content-Encoding"]  = "gzip";
+        }
+        $headers["Content-Length"] = $dataSize;
+        if ($isFile && ($dataSize != 0)) {
+            $headers["Content-Range"] = "bytes 0-" . ($dataSize- 1) . "/" . $dataSize . ";";
+        }
+        $headers["Content-Disposition"] = "attachment; filename=\"".$attachmentName."\"";
+        $headers["Expires"] = "0";
+        $headers["Cache-Control"] = "no-cache, must-revalidate";
+        $headers["Pragma"] = "no-cache";
+
+        if (preg_match('/ MSIE /',$_SERVER['HTTP_USER_AGENT'])) {
+            $headers["Pragma"] = "public";
+            $headers["Cache-Control"] = "max_age=0";
+        }
+
+        // IE8 is dumb
+        if (preg_match('/ MSIE /',$_SERVER['HTTP_USER_AGENT'])) {
+            $headers["Pragma"] = "public";
+            $headers["Cache-Control"] = "private, must-revalidate, post-check=0, pre-check=0";
+        }
+
+        // For SSL websites there is a bug with IE see article KB 323308
+        // therefore we must reset the Cache-Control and Pragma Header
+        if (ConfService::getConf("USE_HTTPS")==1 && preg_match('/ MSIE /',$_SERVER['HTTP_USER_AGENT'])) {
+            $headers["Pragma"] = "";
+            $headers["Cache-Control"] = "";
+        }
+
+        foreach($headers as $headerName => $headerValue){
+            if($response !== null){
+                $response = $response->withHeader($headerName, (string) $headerValue);
+            }else{
+                header($headerName.": ".$headerValue);
+            }
+        }
+
+        return $response;
+    }
+
+    /**
+     * Generate correct headers
+     * @param string $attachName
+     * @param int $fileSize
+     * @param string $mimeType
+     * @param ResponseInterface $response
+     * @return ResponseInterface
+     */
+    private static function generateInlineHeaders($attachName, $fileSize, $mimeType, ResponseInterface $response = null)
+    {
+        $attachName = self::encodeAttachmentName($attachName);
+
+        $headers = [];
+        $headers["Content-Type"] =  $mimeType . "; name=\"" . $attachName . "\"";
+        $headers["Content-Disposition"] = "inline; filename=\"" . $attachName . "\"";
+        // changed header for IE 7 & 8
+        if (preg_match('/ MSIE /',$_SERVER['HTTP_USER_AGENT'])) {
+            $headers["Expires"] = "0";
+            $headers["Pragma"] = "public";
+            $headers["Cache-Control"] = "private, must-revalidate, post-check=0, pre-check=0";
+        } else {
+            $headers["Cache-Control"] = "public";
+        }
+        $headers["Content-Length"] = $fileSize;
+
+        // Neccessary for IE 8 and xx
+        if (ConfService::getConf("USE_HTTPS")==1 && preg_match('/ MSIE /',$_SERVER['HTTP_USER_AGENT'])) {
+            $headers["Pragma"] = "";
+            $headers["Cache-Control"] = "";
+        }
+
+        foreach($headers as $headerName => $headerValue){
+            if($response !== null){
+                $response = $response->withHeader($headerName, (string) $headerValue);
+            }else{
+                header($headerName.": ".$headerValue);
+            }
+        }
+
+        return $response;
+
+    }
+
+}
diff --git a/core/src/core/src/pydio/Core/Controller/ProgressBarCLI.php b/core/src/core/src/pydio/Core/Controller/ProgressBarCLI.php
new file mode 100644
index 0000000000..e2fbcbd23b
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Controller/ProgressBarCLI.php
@@ -0,0 +1,175 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Controller;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Class AJXP_ProgressBarCLI
+ * Simple object to print a progress bar on the command-line.
+ *
+ * @package Pydio
+ * @subpackage Core
+ */
+class ProgressBarCLI {
+    private $strProgress = "";
+    private $strLength = 25; // 50 '='
+    private $strName   = "";
+    private $strNameLengthMax = 20;
+    private $total       = 0;
+    private $isFinish     = false;
+    private $lastPercent = -1;
+    private $barSign     = "=";
+    private $startPoint ;
+    private $lastsecond = 0;
+
+    public function init($currentValue = 0, $total, $name){
+        if(!(php_sapi_name() == "cli")) return;
+        $this->total        = $total;
+        $this->strName      = $name;
+        $this->startPoint   = time();
+        $this->barSign = "=";
+        //echo "\nobjects: ". $this->total."\n";
+        $str = '';
+        $str .= $this->convertNumToStrBlank($this->strNameLengthMax)."[==";
+        $str .= "Total: ".$total." objects";
+        $str .= $this->convertNumToStr($this->strLength - strlen($str) + 21);
+        $str .= "]";
+        echo "\n";
+        echo $str;
+        echo "\n";
+    }
+
+    public function update($currentValue = 0){
+        if(!(php_sapi_name() == "cli")) return;
+        if($this->isFinish) return;
+        $percentage = $this->convertToPercent($currentValue, $this->total);
+        if (($percentage != $this->lastPercent) || ((time() - $this->lastsecond) > 0.9)){
+            $this->lastPercent = $percentage;
+            $this->lastsecond = time();
+        }
+        else{
+            return;
+        }
+        $strDone = $this->convertNumToStr((int) $percentage/4);
+        $this->strProgress .= $strDone;
+        $this->strProgress .= $this->convertNumToStrBlank($this->strLength - strlen($strDone));
+        $this->addStartString();
+        $this->strProgress = $this->formatName($this->strName).$this->strProgress;
+        $this->addEndString();
+        $this->strProgress .= " ";
+
+        if($percentage < 10){
+            $this->strProgress .= "  ";
+        }elseif($percentage > 10 && $percentage < 100){
+            $this->strProgress .= " ";
+        }
+        $this->strProgress .= "".$percentage." %  " . $this->ago($this->startPoint);
+        $this->clearLine(strlen($this->strProgress) + 2);
+        echo $this->strProgress;
+        $this->strProgress = "";
+        if($percentage == 100){
+            echo "\n";
+            $this->isFinish = true;
+            return ;
+        }
+    }
+
+    private function addStartString(){
+        $this->strProgress = "[".$this->strProgress;
+    }
+
+    private function addEndString(){
+        $this->strProgress = $this->strProgress."]";
+    }
+
+    private function convertToPercent($currentValue = 0, $maxValue){
+        if($maxValue > 0 && $currentValue > 0){
+            $percent = ( int ) ((100*$currentValue) / $maxValue);
+            return $percent;
+        }
+        elseif($maxValue === $currentValue){
+            return 100;
+        }
+        return 0;
+    }
+
+    private function convertNumToStr($num){
+        if ($num >= 0 && $num <= $this->strLength){
+            $str = "";
+            for($i = 0; $i < $num; $i++){
+                $str .= $this->barSign;
+            }
+            return $str;
+        }else{
+            return "";
+        }
+    }
+
+    private function formatName($name){
+        if(strlen($name) > $this->strNameLengthMax){
+            return substr($name, 0, $this->strNameLengthMax);
+        }else{
+            $str = $name . $this->convertNumToStrBlank($this->strNameLengthMax - strlen($name));
+            return $str;
+        }
+    }
+
+    public function convertNumToStrBlank($num){
+        if($num > 0){
+            $str = "";
+            for($i = 0; $i < $num; $i++){
+                $str .= " ";
+            }
+            return $str;
+        }
+        return "";
+    }
+
+    public function clearLine($lineLength = 80){
+        for($i = 0; $i < $lineLength ;$i ++){
+            echo "\010";
+        }
+    }
+
+    public function setName($name){
+        $this->strName = $name;
+    }
+
+    public function ago($time) {
+        $timediff=time()-$time;
+
+        $days=intval($timediff/86400);
+        $remain=$timediff%86400;
+        $hours=intval($remain/3600);
+        $remain=$remain%3600;
+        $mins=intval($remain/60);
+        $secs=$remain%60;
+        $timestring = "-";
+
+        if ($secs>=0) $timestring = "0m".$secs."s";
+        if ($mins>0) $timestring = $mins."m".$secs."s";
+        if ($hours>0) $timestring = $hours."u".$mins."m";
+        if ($days>0) $timestring = $days."d".$hours."u";
+
+        return $timestring;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Controller/ShutdownScheduler.php b/core/src/core/src/pydio/Core/Controller/ShutdownScheduler.php
new file mode 100644
index 0000000000..b1798f914c
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Controller/ShutdownScheduler.php
@@ -0,0 +1,131 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Controller;
+
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+/**
+ *
+ * Registry for callbacks that must be triggered after the script is finished.
+ *
+ * @package Pydio
+ * @subpackage Core
+ *
+ */
+class ShutdownScheduler
+{
+    private static $instance;
+
+    private $callbacks; // array to store user callbacks
+
+    /**
+     * @static
+     * @return ShutdownScheduler
+     */
+    public static function getInstance()
+    {
+        if(self::$instance == null) self::$instance = new ShutdownScheduler();
+        return self::$instance;
+    }
+
+    /**
+     * ShutdownScheduler constructor.
+     */
+    public function __construct()
+    {
+        $this->callbacks = array();
+        register_shutdown_function(array($this, 'callRegisteredShutdown'));
+        ob_start();
+    }
+
+    /**
+     * @return bool
+     * @throws \Exception
+     */
+    public function registerShutdownEventArray()
+    {
+        $callback = func_get_args();
+
+        if (empty($callback)) {
+            throw new \Exception('No callback passed to '.__FUNCTION__.' method');
+        }
+        if (!is_callable($callback[0])) {
+            throw new \Exception('Invalid callback ('.$callback[0].') passed to the '.__FUNCTION__.' method');
+        }
+        $flattenArray = array();
+        $flattenArray[0] = $callback[0];
+        if (is_array($callback[1])) {
+            foreach($callback[1] as $argument) $flattenArray[] = $argument;
+        }
+        $this->callbacks[] = $flattenArray;
+        return true;
+    }
+
+    /**
+     * @return bool
+     * @throws \Exception
+     */
+    public function registerShutdownEvent()
+    {
+        $callback = func_get_args();
+
+        if (empty($callback)) {
+            throw new \Exception('No callback passed to '.__FUNCTION__.' method');
+        }
+        if (!is_callable($callback[0])) {
+            throw new \Exception('Invalid callback ('.$callback[0].') passed to the '.__FUNCTION__.' method');
+        }
+        $this->callbacks[] = $callback;
+        return true;
+    }
+
+    /**
+     * Trigger the schedulers
+     */
+    public function callRegisteredShutdown()
+    {
+        session_write_close();
+        if (!headers_sent()) {
+            $size = ob_get_length();
+            header("Connection: close\r\n");
+            //header("Content-Encoding: none\r\n");
+            header("Content-Length: $size");
+        }
+        ob_end_flush();
+        flush();
+        $index = 0;
+        while (count($this->callbacks)) {
+            $arguments = array_shift($this->callbacks);
+            $callback = array_shift($arguments);
+            try {
+                call_user_func_array($callback, $arguments);
+            } catch (\Exception $e) {
+                Logger::error(__CLASS__, __FUNCTION__, array("context" => "Applying hook " . get_class($callback[0]) . "::" . $callback[1], "message" => $e->getMessage()));
+            }
+            $index++;
+            if($index > 100000) {
+                Logger::error(__CLASS__, __FUNCTION__, "Breaking ShutdownScheduler loop, seems too big (100000)");
+                break;
+            }
+        }
+    }
+}
diff --git a/core/src/core/src/pydio/Core/Controller/UnixProcess.php b/core/src/core/src/pydio/Core/Controller/UnixProcess.php
new file mode 100644
index 0000000000..6a4cb98cbb
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Controller/UnixProcess.php
@@ -0,0 +1,121 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>, Cyril Russo
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Controller;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+/**
+ * Utilitary to launch a process and keep track of it
+ * @package Pydio
+ * @subpackage Core
+ */
+class UnixProcess
+{
+    /**
+     * @var string
+     */
+    private $pid;
+    /**
+     * @var string
+     */
+    private $command;
+    /**
+     * @var string
+     */
+    private $output;
+
+    /**
+     * @param bool|string $cl Command to execute
+     * @param bool|string $output A file in which to redirect the output. Send to /dev/null if false.
+     */
+    public function __construct($cl=false, $output=false)
+    {
+        if ($output != false) {
+              $this->output = $output;
+        } else {
+               $this->output = "/dev/null";
+        }
+        if ($cl != false) {
+            $this->command = $cl;
+            $this->runCom();
+        }
+    }
+    /**
+     * Run the command
+     * @return void
+     */
+    private function runCom()
+    {
+        $command = $this->command.' > '.$this->output.' 2>&1 & echo $!';
+        exec($command ,$op);
+        $this->pid = (int) $op[0];
+        $this->command = $command;
+    }
+    /**
+     * Processid setter
+     * @param $pid
+     * @return void
+     */
+    public function setPid($pid)
+    {
+        $this->pid = $pid;
+    }
+
+    /**
+     * Processid getter
+     * @return string
+     */
+    public function getPid()
+    {
+        return $this->pid;
+    }
+
+    /**
+     * Try to get status from command line by running "ps -p PID"
+     * @return bool
+     */
+    public function status()
+    {
+        $command = 'ps -p '.$this->pid;
+        exec($command,$op);
+        if (!isset($op[1]))return false;
+        else return true;
+    }
+    /**
+     * Start the command
+     * @return bool
+     */
+    public function start()
+    {
+        if ($this->command != '') $this->runCom();
+        return true;
+    }
+    /**
+     * Try to kill the process via command line.
+     * @return bool
+     */
+    public function stop()
+    {
+        $command = 'kill '.$this->pid;
+        exec($command);
+        if ($this->status() == false)return true;
+        else return false;
+    }
+}
diff --git a/core/src/core/src/pydio/Core/Exception/ActionNotFoundException.php b/core/src/core/src/pydio/Core/Exception/ActionNotFoundException.php
new file mode 100644
index 0000000000..caa9cdd708
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Exception/ActionNotFoundException.php
@@ -0,0 +1,40 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Exception;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class ActionNotFoundException
+ * Exception thrown when a requests is calling an unknown (or disabled) action.
+ * @package Pydio\Core\Exception
+ */
+class ActionNotFoundException extends PydioException
+{
+    /**
+     * ActionNotFoundException constructor.
+     * @param string $action
+     */
+    public function __construct($action)
+    {
+        parent::__construct("Could not find action ".$action, null);
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Exception/AuthRequiredException.php b/core/src/core/src/pydio/Core/Exception/AuthRequiredException.php
new file mode 100644
index 0000000000..208345d267
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Exception/AuthRequiredException.php
@@ -0,0 +1,91 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Exception;
+
+use Pydio\Core\Http\Message\LoggingResult;
+use Pydio\Core\Http\Message\UserMessage;
+use Pydio\Core\Http\Response\JSONSerializableResponseChunk;
+use Pydio\Core\Http\Response\XMLSerializableResponseChunk;
+
+use Pydio\Core\Services\LocaleService;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class AuthRequiredException
+ * @package Pydio\Core\Exception
+ */
+class AuthRequiredException extends PydioException implements XMLSerializableResponseChunk, JSONSerializableResponseChunk
+{
+    private $loginResult;
+
+    /**
+     * AuthRequiredException constructor.
+     * @param string $messageId
+     * @param string $messageString
+     * @param null $loginResult
+     */
+    public function __construct($messageId = "", $messageString = "", $loginResult = null)
+    {
+        if(!empty($messageId)){
+            $mess = LocaleService::getMessages();
+            if(isSet($mess[$messageId])) $messageString = $mess[$messageId];
+        }
+        if(!empty($loginResult)){
+            $this->loginResult = $loginResult;
+        }
+        parent::__construct($messageString, $messageId);
+    }
+
+    /**
+     * @return mixed
+     */
+    public function jsonSerializableData()
+    {
+        return ["message" => $this->getMessage()];
+    }
+
+    /**
+     * @return string
+     */
+    public function jsonSerializableKey()
+    {
+        return "authRequired";
+    }
+
+    /**
+     * @return string
+     */
+    public function toXML()
+    {
+        if(!empty($this->loginResult)){
+            $res = new LoggingResult($this->loginResult, "", "", "");
+            $xml = $res->toXML();
+        }else{
+            $xml = "<require_auth/>";
+            if($this->getMessage()){
+                $error = new UserMessage($this->getMessage(), LOG_LEVEL_ERROR);
+                $xml.= $error->toXML();
+            }
+        }
+        return $xml;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Exception/DBConnectionException.php b/core/src/core/src/pydio/Core/Exception/DBConnectionException.php
new file mode 100644
index 0000000000..4fe5832308
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Exception/DBConnectionException.php
@@ -0,0 +1,39 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Exception;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class DBConnectionException
+ * @package Pydio\Core\Exception
+ */
+class DBConnectionException extends PydioException
+{
+    /**
+     * DBConnectionException constructor.
+     */
+    public function __construct()
+    {
+        $messageString = "There was an error trying to connect to your database! Did you change any configuration for the core connection? Or maybe your database is down?";
+        parent::__construct($messageString);
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Exception/ForbiddenCharacterException.php b/core/src/core/src/pydio/Core/Exception/ForbiddenCharacterException.php
new file mode 100644
index 0000000000..0f54b0c19e
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Exception/ForbiddenCharacterException.php
@@ -0,0 +1,39 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Exception;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class ForbiddenCharacterException
+ * @package Pydio\Core\Exception
+ */
+class ForbiddenCharacterException extends PydioException
+{
+    /**
+     * ForbiddenCharacterException constructor.
+     * @param string $originalString
+     */
+    public function __construct($originalString)
+    {
+        parent::__construct("$originalString contains forbbiden characters", null, 5012);
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Exception/LoginException.php b/core/src/core/src/pydio/Core/Exception/LoginException.php
new file mode 100644
index 0000000000..178fcf862f
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Exception/LoginException.php
@@ -0,0 +1,50 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Exception;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class LoginException
+ * @package Pydio\Core\Exception
+ */
+class LoginException extends PydioException
+{
+    private $loginError;
+
+    /**
+     * LoginException constructor.
+     * @param integer $errorCode
+     */
+    public function __construct($errorCode)
+    {
+        $this->loginError = $errorCode;
+        parent::__construct("Error while trying to log user", null, $errorCode);
+    }
+
+    /**
+     * @return int
+     */
+    public function getLoginError(){
+        return $this->loginError;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Exception/NoActiveWorkspaceException.php b/core/src/core/src/pydio/Core/Exception/NoActiveWorkspaceException.php
new file mode 100644
index 0000000000..1a2632b8c4
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Exception/NoActiveWorkspaceException.php
@@ -0,0 +1,39 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Exception;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class NoActiveWorkspaceException
+ * @package Pydio\Core\Exception
+ */
+class NoActiveWorkspaceException extends PydioException
+{
+    /**
+     * NoActiveWorkspaceException constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct("No active workspace found for user!", false, 423);
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Exception/PydioException.php b/core/src/core/src/pydio/Core/Exception/PydioException.php
new file mode 100644
index 0000000000..f7570f1979
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Exception/PydioException.php
@@ -0,0 +1,119 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Exception;
+
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\LocaleService;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Class PydioException
+ * @package Pydio\Core\Exception
+ */
+class PydioException extends \Exception
+{
+    private $errorCode;
+
+    /**
+     * PydioException constructor.
+     * @param string $messageString
+     * @param bool $messageId
+     * @param null $errorCode
+     */
+    public function __construct($messageString, $messageId = false, $errorCode = null)
+    {
+        if ($messageId !== false && class_exists("ConfService")) {
+            $messages = LocaleService::getMessages();
+            if (array_key_exists($messageId, $messages)) {
+                $messageString = $messages[$messageId];
+            } else {
+                $messageString = $messageId;
+            }
+        }
+        if(isSet($errorCode)){
+            $this->errorCode = $errorCode;
+        }
+        parent::__construct($messageString);
+    }
+
+    /**
+     * @param $mixed
+     * @throws PydioException
+     */
+    public function errorToXml($mixed)
+    {
+        if ($mixed instanceof \Exception) {
+            throw $this;
+        } else {
+            throw new PydioException($mixed);
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasErrorCode(){
+        return isSet($this->errorCode);
+    }
+
+    /**
+     * @return null
+     */
+    public function getErrorCode(){
+        return $this->errorCode;
+    }
+
+    /**
+     * @return string
+     */
+    public static function buildDebugBackTrace(){
+
+        $message = "";
+
+        if (ConfService::getConf("SERVER_DEBUG")) {
+            $stack = debug_backtrace();
+            $stackLen = count($stack);
+            for ($i = 1; $i < $stackLen; $i++) {
+                $entry = $stack[$i];
+
+                $func = $entry['function'] . '(';
+                $argsLen = count($entry['args']);
+                for ($j = 0; $j < $argsLen; $j++) {
+                    $s = $entry['args'][$j];
+                    if(is_string($s)){
+                        $func .= $s;
+                    }else if (is_object($s)){
+                        $func .= get_class($s);
+                    }
+                    if ($j < $argsLen - 1) $func .= ', ';
+                }
+                $func .= ')';
+
+                $message .= "\n". str_replace(dirname(__FILE__), '', $entry['file']) . ':' . $entry['line'] . ' - ' . $func . PHP_EOL;
+            }
+        }
+
+        return $message;
+
+    }
+
+}
diff --git a/core/src/core/src/pydio/Core/Exception/PydioPromptException.php b/core/src/core/src/pydio/Core/Exception/PydioPromptException.php
new file mode 100644
index 0000000000..3659ea520d
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Exception/PydioPromptException.php
@@ -0,0 +1,139 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Exception;
+
+use Pydio\Core\Http\Response\JSONSerializableResponseChunk;
+use Pydio\Core\Http\Response\XMLSerializableResponseChunk;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+define('AJXP_PROMPT_EXCEPTION_PROMPT', 'AJXP_PROMPT_EXCEPTION_PROMPT');
+define('AJXP_PROMPT_EXCEPTION_CONFIRM', 'AJXP_PROMPT_EXCEPTION_CONFIRM');
+define('AJXP_PROMPT_EXCEPTION_ALERT', 'AJXP_PROMPT_EXCEPTION_ALERT');
+
+/**
+ * Class AJXP_PromptException
+ * Specific exception that triggers a prompt in the UI instead of displaying an error message.
+ *
+ * @package Pydio
+ * @subpackage Core
+ */
+class PydioPromptException extends PydioException implements XMLSerializableResponseChunk, JSONSerializableResponseChunk
+{
+
+    private $promptType = "prompt";
+    /**
+     * @var array
+     */
+    private $promptData = array();
+
+    /**
+     * @return array
+     */
+    public function getPromptData()
+    {
+        return $this->promptData;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPromptType()
+    {
+        return $this->promptType;
+    }
+
+    /**
+     * @param $promptType
+     * @param array $data
+     * @param String $messageString
+     * @param string|bool $messageId
+     */
+    public function __construct($promptType, $data, $messageString, $messageId = false)
+    {
+        $this->promptType = $promptType;
+        $this->promptData = $data;
+        parent::__construct($messageString, $messageId);
+    }
+
+    /**
+     * Prompt user for credentials
+     * @param $sessionVariable
+     * @param $switchToRepositoryId
+     * @throws PydioPromptException
+     */
+    public static function testOrPromptForCredentials($sessionVariable, $switchToRepositoryId){
+        if(isSet($_GET["prompt_passed_data"]) && isSet($_GET["variable_name"]) && $_GET["variable_name"] == $sessionVariable){
+            $_SESSION[$sessionVariable] = true;
+        }
+        if(!isSet($_SESSION[$sessionVariable])){
+            throw new PydioPromptException(
+                "confirm",
+                array(
+                    "DIALOG" => "Please enter your credentials for this workspace
+                                <input type='hidden' name='get_action' value='switch_repository'>
+                                <input type='hidden' name='repository_id' value='".$switchToRepositoryId."'>
+                                <input type='hidden' name='prompt_passed_data' value='true'>
+                                <input type='hidden' name='variable_name' value='".$sessionVariable."'>
+                                ",
+                    "OK"        => array(
+                        "GET_FIELDS" => array("get_action", "repository_id", "prompt_passed_data", "variable_name"),
+                        "EVAL" => "ajaxplorer.loadXmlRegistry();"
+                    ),
+                    "CANCEL"    => array(
+                        "EVAL" => "ajaxplorer.loadXmlRegistry();"
+                    )
+                ),
+                "Credentials Needed");
+        }
+
+    }
+
+    /**
+     * @return mixed
+     */
+    public function jsonSerializableData()
+    {
+        return [
+            "promptType" => $this->promptType,
+            "promptMessage" => $this->getMessage(),
+            "promptData" => $this->promptData
+        ];
+    }
+
+    /**
+     * @return string
+     */
+    public function jsonSerializableKey()
+    {
+        return "userPrompt";
+    }
+
+    /**
+     * @return string
+     */
+    public function toXML()
+    {
+        return "<prompt type=\"".$this->promptType."\"><message>".$this->getMessage()."</message><data><![CDATA[".json_encode($this->promptData)."]]></data></prompt>";
+    }
+
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Exception/PydioUserAlertException.php b/core/src/core/src/pydio/Core/Exception/PydioUserAlertException.php
new file mode 100644
index 0000000000..b5d60894a1
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Exception/PydioUserAlertException.php
@@ -0,0 +1,31 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Exception;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class PydioUserAlertException
+ * @package Pydio\Core\Exception
+ */
+class PydioUserAlertException extends  PydioException{
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Exception/RepositoryLoadException.php b/core/src/core/src/pydio/Core/Exception/RepositoryLoadException.php
new file mode 100644
index 0000000000..40add21d70
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Exception/RepositoryLoadException.php
@@ -0,0 +1,59 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Exception;
+
+use Pydio\Core\Model\RepositoryInterface;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class RepositoryLoadException
+ * @package Pydio\Core\Exception
+ */
+class RepositoryLoadException extends PydioException
+{
+    /**
+     * @var RepositoryInterface
+     */
+    private $repository;
+    /**
+     * RepositoryLoadException constructor.
+     * @param RepositoryInterface|String $repository
+     * @param array $errors
+     */
+    public function __construct($repository, $errors)
+    {
+        if($repository instanceof RepositoryInterface){
+            $message = "Error while loading workspace ".$repository->getDisplay()." : ".implode("\n-", $errors);
+            $this->repository = $repository;
+        }else{
+            $message = "Error while loading workspace ".$repository." : ".implode("\n-", $errors);
+        }
+        parent::__construct($message, false, 5000);
+    }
+
+    /**
+     * @return RepositoryInterface|String
+     */
+    public function getRepository(){
+        return $this->repository;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Exception/RouteNotFoundException.php b/core/src/core/src/pydio/Core/Exception/RouteNotFoundException.php
new file mode 100644
index 0000000000..fe4e9b9caf
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Exception/RouteNotFoundException.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: ghecquet
+ * Date: 21/09/16
+ * Time: 14:01
+ */
+
+namespace Pydio\Core\Exception;
+
+
+class RouteNotFoundException extends PydioException
+{
+    public function __construct()
+    {
+        parent::__construct("Could not find route", null);
+
+        $this->code = 404;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Exception/UserNotFoundException.php b/core/src/core/src/pydio/Core/Exception/UserNotFoundException.php
new file mode 100644
index 0000000000..4ae5971a96
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Exception/UserNotFoundException.php
@@ -0,0 +1,39 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Exception;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class UserNotFoundException
+ * @package Pydio\Core\Exception
+ */
+class UserNotFoundException extends PydioException
+{
+    /**
+     * UserNotFoundException constructor.
+     * @param string $userId
+     */
+    public function __construct($userId)
+    {
+        parent::__construct("Cannot find user ".$userId, false, 50014);
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Exception/WorkspaceForbiddenException.php b/core/src/core/src/pydio/Core/Exception/WorkspaceForbiddenException.php
new file mode 100644
index 0000000000..f756c98467
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Exception/WorkspaceForbiddenException.php
@@ -0,0 +1,39 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Exception;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class WorkspaceForbiddenException
+ * @package Pydio\Core\Exception
+ */
+class WorkspaceForbiddenException extends PydioException
+{
+    /**
+     * WorkspaceForbiddenException constructor.
+     * @param string $wsId
+     */
+    public function __construct($wsId)
+    {
+        parent::__construct("Cannot access to workspace with id/alias ".$wsId, null);
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Exception/WorkspaceNotFoundException.php b/core/src/core/src/pydio/Core/Exception/WorkspaceNotFoundException.php
new file mode 100644
index 0000000000..bf60e07360
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Exception/WorkspaceNotFoundException.php
@@ -0,0 +1,39 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Exception;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class WorkspaceNotFoundException
+ * @package Pydio\Core\Exception
+ */
+class WorkspaceNotFoundException extends PydioException
+{
+    /**
+     * WorkspaceNotFoundException constructor.
+     * @param string $wsId
+     */
+    public function __construct($wsId)
+    {
+        parent::__construct("Could not find workspace with id/alias ".$wsId, null);
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Base.php b/core/src/core/src/pydio/Core/Http/Base.php
new file mode 100644
index 0000000000..381f21c80c
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Base.php
@@ -0,0 +1,64 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http;
+
+use Pydio\Core\Services\ConfService;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Very Top Level Routing
+ * @package Pydio\Core\Http
+ */
+class Base
+{
+
+    /**
+     * @param string $base
+     * @param string $route
+     * @param array $additionalAttributes
+     */
+    public static function handleRoute($base, $route, $additionalAttributes = []){
+
+        if ($route === "/api") {
+            $server = new Rest\RestApiServer($base.$route, $additionalAttributes);
+        } else if ($route == "/wopi") {
+            $server = new Wopi\Server($base.$route, $additionalAttributes);
+        } else if ($route === "/user") {
+            $_GET["get_action"] = "user_access_point";
+            $_GET["key"] = $additionalAttributes["key"];
+            $server = new Server($base, $additionalAttributes);
+        } else if ($route == "/favicon"){
+            $_GET["get_action"] = "serve_favicon";
+            $server = new Server($base, $additionalAttributes);
+        } else {
+            $server = new Server($base, $additionalAttributes);
+        }
+
+        $server->registerCatchAll();
+
+        ConfService::init();
+        ConfService::start();
+        
+        $server->listen();
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Cli/AuthCliMiddleware.php b/core/src/core/src/pydio/Core/Http/Cli/AuthCliMiddleware.php
new file mode 100644
index 0000000000..0cee2ddc80
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Cli/AuthCliMiddleware.php
@@ -0,0 +1,245 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Cli;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Auth\Core\MemorySafe;
+
+use Pydio\Core\Exception\AuthRequiredException;
+use Pydio\Core\Exception\LoginException;
+use Pydio\Core\Http\Response\SerializableResponseStream;
+use Pydio\Core\Http\Server;
+use Pydio\Core\Model\Context;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\AuthService;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\RolesService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Crypto;
+use Pydio\Core\Utils\TextEncoder;
+use Pydio\Log\Core\Logger;
+use Pydio\Tasks\Task;
+use Pydio\Tasks\TaskService;
+use Symfony\Component\Console\Output\OutputInterface;
+use Zend\Diactoros\Response;
+use Zend\Diactoros\Stream;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Authenticatino middleware used in Command Line context
+ * @package Pydio\Core\Http\Cli
+ */
+class AuthCliMiddleware
+{
+
+    /**
+     * @param $options
+     * @return \Pydio\Core\Model\UserInterface
+     * @throws AuthRequiredException
+     */
+    protected static function authenticateFromCliParameters($options){
+
+        $optUser = $options["u"];
+        $optPass = $options["p"];
+
+        if (!empty($options["p"])) {
+
+            $optPass = $options["p"];
+
+        } else {
+            // Consider "u" is a crypted version of u:p
+            $optToken = $options["t"];
+            $key = Crypto::buildKey($optToken, Crypto::getCliSecret());
+            $optUser = Crypto::decrypt($optUser, $key);
+            $envPass = MemorySafe::loadPasswordStringFromEnvironment($optUser);
+            if($envPass !== false){
+                unset($optToken);
+                $optPass = $envPass;
+            }
+        }
+
+
+        if (UsersService::usersEnabled() && !empty($optUser)) {
+            try{
+                $loggedUser = AuthService::logUser($optUser, $optPass, isSet($optToken), false);
+            }catch (LoginException $l){
+                throw new AuthRequiredException();
+            }
+
+        } else {
+            throw new AuthRequiredException();
+        }
+
+        return $loggedUser;
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @param callable|null $next
+     * @return ResponseInterface
+     * @throws AuthRequiredException
+     */
+    public static function handleRequest(ServerRequestInterface $requestInterface, ResponseInterface $responseInterface, callable $next = null){
+
+        $driverImpl = ConfService::getAuthDriverImpl();
+        PluginsService::getInstance(Context::emptyContext())->setPluginUniqueActiveForType("auth", $driverImpl->getName(), $driverImpl);
+
+        /** @var OutputInterface $output */
+        $output = $requestInterface->getAttribute("cli-output");
+        $options = $requestInterface->getAttribute("cli-options");
+        $optRepoId = $options["r"];
+
+        $impersonateUsers = false;
+        $loggedUser = self::authenticateFromCliParameters($options);
+
+        $requestInterface = $requestInterface->withAttribute("action", $options["a"]);
+
+        if(UsersService::usersEnabled() && ApplicationState::detectApplicationFirstRun()){
+
+            RolesService::bootSequence();
+
+        }
+
+        // Output directly to STDOUT
+        $responseInterface = $responseInterface->withBody(new Stream(STDOUT, "w"));
+
+        $applyCallback = function ($userId, $baseGroup, $index, $total) use ($optRepoId, $requestInterface, $output, $next){
+
+            $actionName = $requestInterface->getAttribute("action");
+            $taskId     = $requestInterface->getAttribute("pydio-task-id");
+            $output->writeln("<info>*****************************</info>");
+            $output->writeln("<info>Current User is '".$userId."'</info>");
+            $output->writeln("<info>*****************************</info>");
+            try{
+                $user = UsersService::getUserById($userId);
+
+                if(is_array($optRepoId)){
+                    $repos = [];
+                    foreach($optRepoId as $repoId){
+                        $repoObj = UsersService::getRepositoryWithPermission($user, $repoId);
+                        $repos[$repoObj->getId()] = $repoObj;
+                    }
+                }else if($optRepoId === "*"){
+
+                    $repos = UsersService::getRepositoriesForUser($user, false); // Do not include shared
+                    // Exclude "ajxp_*" repositories and "inbox"
+                    foreach($repos as $id=>$object){
+                        if($id === "inbox" || strpos($id, "ajxp_") === 0) unset($repos[$id]);
+                    }
+
+                }else{
+                    $repoObject = UsersService::getRepositoryWithPermission($user, $optRepoId);
+                    $repos = [$repoObject->getId() => $repoObject];
+                }
+
+                foreach( $repos as $repoId => $repositoryInterface ){
+
+                    try{
+                        $output->writeln("<comment>Applying action '$actionName' on workspace ".$repositoryInterface->getDisplay()." (".$repoId.")</comment>");
+                        $subResponse = new Response();
+                        $ctx = Context::contextWithObjects($user, $repositoryInterface);
+                        $requestInterface = $requestInterface->withAttribute("ctx", $ctx);
+                        Logger::updateContext($ctx);
+                        TextEncoder::updateContext($ctx);
+
+                        $subResponse = Server::callNextMiddleWareAndRewind(function($middleware){
+                            return (is_array($middleware) && $middleware["0"] == "Pydio\\Core\\Http\\Cli\\AuthCliMiddleware" && $middleware[1] == "handleRequest");
+                        },
+                            $requestInterface,
+                            $subResponse,
+                            $next
+                        );
+
+                        $body = $subResponse->getBody();
+                        if($body instanceof SerializableResponseStream){
+                            if($requestInterface->getParsedBody()["format"] == "json"){
+                                $body->setSerializer(SerializableResponseStream::SERIALIZER_TYPE_JSON, ["pretty" => true]);
+                            }else if($requestInterface->getParsedBody()["format"] == "xml"){
+                                $body->setSerializer(SerializableResponseStream::SERIALIZER_TYPE_XML, ["pretty" => true]);
+                            }else if($body->supportsSerializer(SerializableResponseStream::SERIALIZER_TYPE_CLI)){
+                                $body->setSerializer(SerializableResponseStream::SERIALIZER_TYPE_CLI, ["output" => $output]);
+                            }
+                        }
+                        $output->writeln( $body->getContents() );
+
+                    }catch (\Exception $repoEx){
+
+                        $output->writeln("<error>$taskId: ".$repoEx->getMessage()."</error>");
+                        if(!empty($taskId)){
+                            TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_FAILED, $repoEx->getMessage());
+                        }
+
+                    }
+
+                }
+
+            }catch (\Exception $userEx){
+
+                $output->writeln("<error>USER: ".$userEx->getMessage()."</error>");
+                if(!empty($taskId)){
+                    TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_FAILED, $userEx->getMessage());
+                }
+
+            }
+
+        };
+
+
+        if(!empty($options["i"])){
+            if(!is_array($options["i"]) && strpos($options["i"], "*") === false){
+                $options["i"] = [$options["i"]];
+            }
+            $impersonateUsers = $options["i"];
+        }
+
+        if ($impersonateUsers !== false && $loggedUser->isAdmin()) {
+
+            if(is_array($impersonateUsers)){
+                // Apply to a predefined list of users
+                foreach ($impersonateUsers as $index => $impersonateUser) {
+                    $applyCallback($impersonateUser, "/", $index, count($impersonateUsers));
+                }
+
+            }else if($impersonateUsers === "*"){
+                // Apply to all users of current group
+                UsersService::browseUsersGroupsWithCallback($loggedUser->getGroupPath(), $applyCallback, false);
+
+            }else if($impersonateUsers === "**/*"){
+                // Apply to all users recursively
+                UsersService::browseUsersGroupsWithCallback($loggedUser->getGroupPath(), $applyCallback, true);
+
+            }
+
+        }else{
+
+            $applyCallback($loggedUser->getId(), "/", 1, 1);
+
+        }
+
+        return $responseInterface;
+
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Cli/CliMiddleware.php b/core/src/core/src/pydio/Core/Http/Cli/CliMiddleware.php
new file mode 100644
index 0000000000..f1709d2126
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Cli/CliMiddleware.php
@@ -0,0 +1,123 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Cli;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Core\Exception\AuthRequiredException;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Exception\WorkspaceNotFoundException;
+use Pydio\Core\Http\Middleware\ITopLevelMiddleware;
+use Pydio\Core\Http\Response\SerializableResponseStream;
+use Pydio\Core\Http\Server;
+use Pydio\Tasks\Task;
+use Pydio\Tasks\TaskService;
+use Symfony\Component\Console\Output\OutputInterface;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class CliMiddleware
+ * Dedicated Middleware for interacting with Symfony Command
+ * @package Pydio\Core\Http\Cli
+ */
+class CliMiddleware implements ITopLevelMiddleware
+{
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @return \Psr\Http\Message\ResponseInterface
+     * @param callable|null $next
+     * @throws WorkspaceNotFoundException
+     */
+    public function handleRequest(ServerRequestInterface $requestInterface, ResponseInterface $responseInterface, callable $next = null){
+
+        /**
+         * @var OutputInterface
+         */
+        $output = $requestInterface->getAttribute("cli-output");
+        $options = $requestInterface->getAttribute("cli-options");
+        $statusFile = (!empty($options["s"]) ? $options["s"] : false);
+        $taskId = $requestInterface->getAttribute("pydio-task-id");
+
+        try {
+
+            $responseInterface = Server::callNextMiddleWare($requestInterface, $responseInterface, $next);
+
+            $this->emitResponse($requestInterface, $responseInterface);
+
+        } catch (AuthRequiredException $e){
+
+            $output->writeln("<error>Authentication Failed</error>");
+            if($statusFile !== false){
+                file_put_contents($statusFile, "ERROR:Authentication Failed.");
+            }
+            if(!empty($taskId)){
+                TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_FAILED, "Authentication Failed");
+            }
+
+        } catch (PydioException $e){
+
+            $output->writeln("<error>".$e->getMessage()."</error>");
+            if($statusFile !== false){
+                file_put_contents($statusFile, "ERROR:".$e->getMessage());
+            }
+            if(!empty($taskId)){
+                TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_FAILED, $e->getMessage());
+            }
+
+        } catch (\Exception $e){
+
+            $output->writeln("<error>".$e->getMessage()."</error>");
+            if($statusFile !== false){
+                file_put_contents($statusFile, "ERROR:".$e->getMessage());
+            }
+            if(!empty($taskId)){
+                TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_FAILED, $e->getMessage());
+            }
+
+        }
+
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @return void
+     */
+    public function emitResponse(ServerRequestInterface $requestInterface, ResponseInterface $responseInterface){
+
+        if($responseInterface !== false && $responseInterface->getBody() && $responseInterface->getBody() instanceof SerializableResponseStream){
+            // For the moment, use XML by default
+            // Todo: Create A CLI Serializer for pretty printing?
+            if($requestInterface->getParsedBody()["format"] == "json"){
+                $responseInterface->getBody()->setSerializer(SerializableResponseStream::SERIALIZER_TYPE_JSON);
+            }
+        }
+        $output = $requestInterface->getAttribute("cli-output");
+        if(!empty($output)){
+            $output->writeln("".$responseInterface->getBody());
+        }else{
+            echo "".$responseInterface->getBody();
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Cli/CliServer.php b/core/src/core/src/pydio/Core/Http/Cli/CliServer.php
new file mode 100644
index 0000000000..b5101df55f
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Cli/CliServer.php
@@ -0,0 +1,39 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Core\Http\Cli;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class CliServer
+ * @package Pydio\Core\Http\Cli
+ */
+class CliServer extends \Pydio\Core\Http\Server
+{
+    protected function stackMiddleWares()
+    {
+        $this->middleWares->push(array("Pydio\\Core\\Controller\\Controller", "registryActionMiddleware"));
+        $this->middleWares->push(array("Pydio\\Core\\Http\\Cli\\AuthCliMiddleware", "handleRequest"));
+        $this->topMiddleware = new CliMiddleware();
+        $this->middleWares->push(array($this->topMiddleware, "handleRequest"));
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Cli/Command.php b/core/src/core/src/pydio/Core/Http/Cli/Command.php
new file mode 100644
index 0000000000..2f4b2481b2
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Cli/Command.php
@@ -0,0 +1,155 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Cli;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+use Pydio\Core\PluginFramework\PluginsService;
+use Symfony;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\Question;
+
+/**
+ * Class Command
+ * Pydio implementation of Symfony command
+ * @package Pydio\Core\Http\Cli
+ */
+class Command extends Symfony\Component\Console\Command\Command
+{
+    protected function configure()
+    {
+        $this->setDefinition(new FreeDefOptions());
+        $this
+            ->setName('pydio')
+            ->setDescription('Pydio Command Line Tool. This tool can load any action defined in the framework. Should be used to run time-consuming task in background without hogging the webserver.')
+            ->addOption(
+                'cli_username',
+                'u',
+                InputOption::VALUE_REQUIRED,
+                '[Mandatory] User id or user token'
+            )->addOption(
+                'cli_repository_id',
+                'r',
+                InputOption::VALUE_REQUIRED,
+                '[Mandatory] Repository id or alias, can be a comma-separated list of identifier, or "*" for all repositories of the current user.'
+            )->addOption(
+                'cli_action_name',
+                'a',
+                InputOption::VALUE_REQUIRED,
+                '[Mandatory] Action name to apply. If not passed, command will interactively ask for the action, with autocompletion feature.'
+            )->addOption(
+                'cli_password',
+                'p',
+                InputOption::VALUE_OPTIONAL,
+                'User Password. You can pass either a passowrd (p) or a token (t). If none of them passed, command will ask for password interactively.'
+            )->addOption(
+                'cli_token',
+                't',
+                InputOption::VALUE_OPTIONAL,
+                'Encrypted Token used to replace password'
+            )->addOption(
+                'cli_impersonate',
+                'i',
+                InputOption::VALUE_OPTIONAL,
+                'If authenticated user has administrative role, apply action under a different user name. Possible values are: a comma-separated list of users login, "*" means all users in the current group, "**/*" means all users from all groups recursively.'
+            )->addOption(
+                'cli_status_file',
+                's',
+                InputOption::VALUE_OPTIONAL,
+                'Path to a file to write status information about the running task.'
+            )->addOption(
+                'cli_task_uuid',
+                'k',
+                InputOption::VALUE_OPTIONAL,
+                'Task uuid: command will store status information in the corresponding task.'
+            )
+        ;
+    }
+
+    /**
+     * Execture the command
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int|null|void
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $server = new CliServer("/");
+        $server->registerCatchAll();
+
+        $definitionsKeys = array_keys($this->getDefinition()->getOptions());
+        $actionParameters = [];
+        $pydioCliOptions = [];
+        foreach ($input->getOptions() as $key => $option){
+            if(in_array($key, $definitionsKeys)){
+                if(strpos($key, "cli_") === 0) {
+                    $shortcut = $this->getDefinition()->getOption($key)->getShortcut();
+                    $pydioCliOptions[$shortcut] = FreeArgvOptions::removeEqualsSign($option);
+                }
+            }else{
+                $actionParameters[$key] = $option;
+            }
+        }
+
+        $helper = $this->getHelper("question");
+        if(empty($pydioCliOptions["p"]) && empty($pydioCliOptions["t"])){
+            // Ask password interactively
+            $question = new Question('Please enter the password: ');
+            $question->setHidden(true);
+            $question->setHiddenFallback(false);
+            $password = $helper->ask($input, $output, $question);
+            $pydioCliOptions["p"] = $password;
+        }
+        if(empty($pydioCliOptions["a"])){
+            $actions = PluginsService::searchManifestsWithCache("//actions/action", function($resultNodes){
+                $output = [];
+                /** @var \DOMElement[] $resultNodes */
+                foreach($resultNodes as $node){
+                    $output[] = $node->getAttribute("name");
+                }
+                return $output;
+            });
+            $question = new Question('Please type in an action to apply: ', '');
+            $question->setAutocompleterValues($actions);
+            $pydioCliOptions["a"] = $helper->ask($input, $output, $question);
+        }
+
+        $taskUid = $pydioCliOptions["k"];
+        $request = $server->getRequest();
+
+        $request = $request
+            ->withParsedBody($actionParameters)
+            ->withAttribute("api", "cli")
+            ->withAttribute("cli-options", $pydioCliOptions)
+            ->withAttribute("cli-output", $output)
+            ->withAttribute("cli-input", $input)
+            ->withAttribute("cli-command", $this);
+
+        if(!empty($taskUid)){
+            $request = $request->withAttribute("pydio-task-id", $taskUid);
+        }
+
+        $server->updateRequest($request);
+        $server->listen();
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Cli/FreeArgvOptions.php b/core/src/core/src/pydio/Core/Http/Cli/FreeArgvOptions.php
new file mode 100644
index 0000000000..2f731e592f
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Cli/FreeArgvOptions.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * This file is part of the ApiGen (http://apigen.org)
+ *
+ * For the full copyright and license information, please view
+ * the file license.md that was distributed with this source code.
+ *
+ * The MIT License
+
+- Copyright (c) 2014 [Tomáš Votruba](http://tomasvotruba.cz)
+- Copyright (c) 2012 [Olivier Laviale](https://github.com/olvlvl)
+- Copyright (c) 2011 [Ondřej Nešpor](https://github.com/Andrewsville)
+- Copyright (c) 2011 [Jaroslav Hanslík](https://github.com/kukulich)
+- Copyright (c) 2010 [David Grudl](http://davidgrudl.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 Pydio\Core\Http\Cli;
+use Symfony\Component\Console\Input\ArgvInput;
+
+/**
+ * Class FreeArgvOptions
+ * Options parser for Pydio
+ * @package Pydio\Core\Http\Cli
+ */
+class FreeArgvOptions extends ArgvInput
+{
+    private $freeParsed;
+
+    /**
+     * FreeArgvOptions constructor.
+     * @param array $argv
+     */
+    public function __construct($argv = array()){
+        $arr = $_SERVER["argv"];
+        $script = array_shift($arr);
+        $_SERVER["argv"] = array_merge([$script, "pydio"], $arr);
+        parent::__construct($_SERVER["argv"]);
+    }
+
+    /**
+     * @return array
+     */
+    public function getOptions()
+    {
+        if(!isSet($this->freeParsed)){
+            $options = parent::getOptions();
+            foreach ($options as $key => $value) {
+                $options[$key] = self::removeEqualsSign($value);
+                $options[$key] = $this->splitByComma($value);
+            }
+            $this->freeParsed = $options;
+        }
+        return $this->freeParsed;
+    }
+    /**
+     * @param string $name
+     * @return mixed
+     */
+    public function getOption($name)
+    {
+        $this->options = $this->getOptions();
+        return parent::getOption($name);
+    }
+    /**
+     * @param array|string $value
+     * @return array|string
+     */
+    public static function removeEqualsSign($value)
+    {
+        if (is_array($value)) {
+            array_walk($value, function (&$singleValue) {
+                $singleValue = ltrim($singleValue, '=');
+            });
+        } else {
+            $value = ltrim($value, '=');
+        }
+        return $value;
+    }
+    /**
+     * @param mixed $value
+     * @return mixed
+     */
+    private function splitByComma($value)
+    {
+        if (is_array($value) && count($value) === 1) {
+            array_walk($value, function (&$singleValue) {
+                if ($this->containsComma($singleValue)) {
+                    $singleValue = explode(',', $singleValue);
+                }
+            });
+            if (is_array($value[0])) {
+                return $value[0];
+            }
+        }
+        if ($this->containsComma($value)) {
+            $value = explode(',', $value);
+        }
+        return $value;
+    }
+    /**
+     * @param string $value
+     * @return bool
+     */
+    private function containsComma($value)
+    {
+        return strpos($value, ',') !== FALSE;
+    }
+}
diff --git a/core/src/core/src/pydio/Core/Http/Cli/FreeDefOptions.php b/core/src/core/src/pydio/Core/Http/Cli/FreeDefOptions.php
new file mode 100644
index 0000000000..afb34b40c0
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Cli/FreeDefOptions.php
@@ -0,0 +1,53 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Cli;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+use Symfony\Component\Console\Input\InputDefinition;
+use Symfony\Component\Console\Input\InputOption;
+
+/**
+ * Class FreeDefOptions
+ * @package Pydio\Core\Http\Cli
+ */
+class FreeDefOptions extends InputDefinition
+{
+    /**
+     * @param string $optionName
+     * @return bool
+     */
+    public function hasOption($optionName){
+        return true;
+    }
+
+    /**
+     * @param string $optionName
+     * @return InputOption
+     */
+    public function getOption($optionName){
+        if(!parent::hasOption($optionName)){
+            return new InputOption($optionName, null, InputOption::VALUE_OPTIONAL);
+        }else{
+            return parent::getOption($optionName);
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Dav/AuthBackendBasic.php b/core/src/core/src/pydio/Core/Http/Dav/AuthBackendBasic.php
new file mode 100644
index 0000000000..2bf765f7b2
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Dav/AuthBackendBasic.php
@@ -0,0 +1,204 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu <contact (at) cdujeu.me>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Core\Http\Dav;
+
+use Pydio\Auth\Core\MemorySafe;
+use Pydio\Core\Exception\LoginException;
+use Pydio\Core\Exception\RepositoryLoadException;
+use Pydio\Core\Exception\UserNotFoundException;
+use Pydio\Core\Exception\WorkspaceForbiddenException;
+use Pydio\Core\Exception\WorkspaceNotFoundException;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Model\UserInterface;
+
+use Pydio\Core\Services\AuthService;
+use Pydio\Core\Services\ConfService;
+
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Utils\TextEncoder;
+use Pydio\Log\Core\Logger;
+use \Sabre;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+
+/**
+ * Class AuthBackendBasic
+ * @package Pydio\Core\Http\Dav
+ */
+class AuthBackendBasic extends Sabre\DAV\Auth\Backend\AbstractBasic
+{
+    /**
+     * @var ContextInterface
+     */
+    private $context;
+
+    /**
+     * Utilitary method to detect basic header.
+     * @return bool
+     */
+    public static function detectBasicHeader()
+    {
+        if(isSet($_SERVER["PHP_AUTH_USER"])) return true;
+        if(isSet($_SERVER["HTTP_AUTHORIZATION"])) $value = $_SERVER["HTTP_AUTHORIZATION"];
+        if(!isSet($value) && isSet($_SERVER["REDIRECT_HTTP_AUTHORIZATION"])) $value = $_SERVER["REDIRECT_HTTP_AUTHORIZATION"];
+        if(!isSet($value)) return false;
+        return  (strpos(strtolower($value),'basic') ===0) ;
+    }
+
+    /**
+     * AuthBackendBasic constructor.
+     * @param ContextInterface $ctx
+     */
+    public function __construct(ContextInterface $ctx)
+    {
+        $this->context = $ctx;
+    }
+
+
+    /**
+     * @param string $username
+     * @param string $password
+     * @return bool|void
+     */
+    protected function validateUserPass($username, $password)
+    {
+        return UsersService::checkPassword($username, $password, false);
+    }
+
+    /**
+     * @param Sabre\DAV\Server $server
+     * @param string $realm
+     * @return bool
+     * @throws Sabre\DAV\Exception\NotAuthenticated
+     */
+    public function authenticate(Sabre\DAV\Server $server, $realm)
+    {
+        $auth = new Sabre\HTTP\BasicAuth();
+        $auth->setHTTPRequest($server->httpRequest);
+        $auth->setHTTPResponse($server->httpResponse);
+        $auth->setRealm($realm);
+        $userpass = $auth->getUserPass();
+        if (!$userpass) {
+            $auth->requireLogin();
+            throw new Sabre\DAV\Exception\NotAuthenticated('No basic authentication headers were found');
+        }
+
+        // Authenticates the user
+        //AJXP_Logger::info(__CLASS__,"authenticate",$userpass[0]);
+
+        try{
+            $userObject = UsersService::getUserById($userpass[0]);
+        }catch (UserNotFoundException $e){
+            throw new Sabre\DAV\Exception\NotAuthenticated();
+        }
+        
+        $webdavData = $userObject->getPref("AJXP_WEBDAV_DATA");
+        $active = ConfService::getGlobalConf("WEBDAV_ACTIVE_ALL");
+        if(!empty($webdavData) && isSet($webdavData["ACTIVE"]) && $webdavData["ACTIVE"] === false){
+            $active = false;
+        }
+        if (!$active) {
+            Logger::warning(__CLASS__, "Login failed", array("user" => $userpass[0], "error" => "WebDAV user not found or disabled"));
+            throw new Sabre\DAV\Exception\NotAuthenticated();
+        }
+        // check if there are cached credentials. prevents excessive authentication calls to external
+        // auth mechanism.
+        $cachedPasswordValid = 0;
+        $secret = (defined("AJXP_SECRET_KEY")? AJXP_SECRET_KEY:"\1CDAFx¨op#");
+        $encryptedPass = md5($userpass[1].$secret.date('YmdHi'));
+        if (isSet($webdavData["TMP_PASS"]) && ($encryptedPass == $webdavData["TMP_PASS"])) {
+            $cachedPasswordValid = true;
+            //AJXP_Logger::debug("Using Cached Password");
+        }
+
+        if (!$cachedPasswordValid && (!$this->validateUserPass($userpass[0],$userpass[1]))) {
+            Logger::warning(__CLASS__, "Login failed", array("user" => $userpass[0], "error" => "Invalid WebDAV user or password"));
+            $auth->requireLogin();
+            throw new Sabre\DAV\Exception\NotAuthenticated('Username or password does not match');
+        }
+        $this->currentUser = $userpass[0];
+
+        try{
+            $loggedUser = AuthService::logUser($this->currentUser, $userpass[1], true);
+        }catch (LoginException $l){
+            throw new Sabre\DAV\Exception\NotAuthenticated();
+        }
+        $this->updateCurrentUserRights($loggedUser);
+        if($this->context->hasRepository()){
+            $repoId = $this->context->getRepositoryId();
+            try{
+                $repoObject = UsersService::getRepositoryWithPermission($loggedUser, $repoId);
+            }catch (WorkspaceForbiddenException $e){
+                throw new Sabre\DAV\Exception\NotAuthenticated('You are not allowed to access this workspace');
+            }catch (WorkspaceNotFoundException $e){
+                throw new Sabre\DAV\Exception\NotAuthenticated('Could not find workspace!');
+            }catch (RepositoryLoadException $e){
+                throw new Sabre\DAV\Exception\NotAuthenticated('Error while loading workspace');
+            }catch (\Exception $e){
+                throw new Sabre\DAV\Exception\NotAuthenticated('Error while loading workspace');
+            }
+            if($repoObject->getContextOption($this->context, "AJXP_WEBDAV_DISABLED", false)){
+                throw new Sabre\DAV\Exception\NotAuthenticated('WebDAV access is disabled for this workspace');
+            }
+            $this->context->setRepositoryObject($repoObject);
+        }
+
+        // NOW UPDATE CONTEXT
+        $this->context->setUserId($this->currentUser);
+        if (ConfService::getContextConf($this->context, "SESSION_SET_CREDENTIALS", "auth")) {
+            MemorySafe::storeCredentials($this->currentUser, $userpass[1]);
+        }
+        //PluginsService::getInstance($this->context);
+        Logger::updateContext($this->context);
+        TextEncoder::updateContext($this->context);
+
+        // the method used here will invalidate the cached password every minute on the minute
+        if (!$cachedPasswordValid) {
+            $webdavData["TMP_PASS"] = $encryptedPass;
+            $userObject->setPref("AJXP_WEBDAV_DATA", $webdavData);
+            $userObject->save("user");
+            AuthService::updateSessionUser($userObject);
+        }
+
+        return true;
+    }
+
+
+    /**
+     * @param UserInterface $user
+     * @return bool
+     * @throws Sabre\DAV\Exception\NotAuthenticated
+     */
+    protected function updateCurrentUserRights($user)
+    {
+        if (!$this->context->hasRepository()) {
+            return true;
+        }
+        if (!$user->canSwitchTo($this->context->getRepositoryId())) {
+            throw new Sabre\DAV\Exception\NotAuthenticated();
+        }
+        return true;
+    }
+
+
+}
diff --git a/core/src/core/src/pydio/Core/Http/Dav/AuthBackendDigest.php b/core/src/core/src/pydio/Core/Http/Dav/AuthBackendDigest.php
new file mode 100644
index 0000000000..182e6504bc
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Dav/AuthBackendDigest.php
@@ -0,0 +1,191 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Dav;
+
+use Pydio\Core\Exception\LoginException;
+use Pydio\Core\Exception\RepositoryLoadException;
+use Pydio\Core\Exception\UserNotFoundException;
+use Pydio\Core\Exception\WorkspaceForbiddenException;
+use Pydio\Core\Exception\WorkspaceNotFoundException;
+
+
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Utils\Crypto;
+use Pydio\Core\Utils\TextEncoder;
+use \Sabre;
+use Pydio\Auth\Core\MemorySafe;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\AuthService;
+use Pydio\Core\Services\ConfService;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * @package Pydio
+ * @subpackage SabreDav
+ */
+class AuthBackendDigest extends Sabre\DAV\Auth\Backend\AbstractDigest
+{
+    private $secretKey;
+    private $repositoryId;
+    /**
+     * @var ContextInterface
+     */
+    private $context;
+
+    /**
+     * AuthBackendDigest constructor.
+     * @param $context
+     */
+    public function __construct($context)
+    {
+        $this->context = $context;
+        $this->secretKey = Crypto::getApplicationSecret();
+    }
+
+    /**
+     * @param string $realm
+     * @param string $username
+     * @return bool|string
+     * @throws Sabre\DAV\Exception\NotAuthenticated
+     */
+    public function getDigestHash($realm, $username)
+    {
+        try{
+            $user = UsersService::getUserById($username);
+        }catch (UserNotFoundException $e){
+            throw new Sabre\DAV\Exception\NotAuthenticated();
+        }
+        $webdavData = $user->getPref("AJXP_WEBDAV_DATA");
+        $active = ConfService::getGlobalConf("WEBDAV_ACTIVE_ALL");
+        if(!empty($webdavData) && isSet($webdavData["ACTIVE"]) && $webdavData["ACTIVE"] === false){
+            $active = false;
+        }
+        if (!$active || (!isSet($webdavData["PASS"]) && !isset($webdavData["HA1"]) ) ) {
+            return false;
+        }
+        if (isSet($webdavData["HA1"])) {
+            return $webdavData["HA1"];
+        } else {
+            $pass = $this->_decodePassword($webdavData["PASS"], $username);
+            return md5("{$username}:{$realm}:{$pass}");
+        }
+
+    }
+
+    /**
+     * @param Sabre\DAV\Server $server
+     * @param string $realm
+     * @return bool
+     * @throws Sabre\DAV\Exception\NotAuthenticated
+     */
+    public function authenticate(Sabre\DAV\Server $server, $realm)
+    {
+        //AJXP_Logger::debug("Try authentication on $realm", $server);
+        $errmsg = "";
+        try {
+
+          $success = parent::authenticate($server, $realm);
+
+        } catch(\Exception $e) {
+          $success = 0;
+          $errmsg = $e->getMessage();
+          if ($errmsg != "No digest authentication headers were found")
+            $success = false;
+        }
+
+        if ($success) {
+
+            try{
+                $loggedUser = AuthService::logUser($this->currentUser, null, true);
+            }catch (LoginException $l){
+                throw new Sabre\DAV\Exception\NotAuthenticated();
+            }
+            $this->updateCurrentUserRights($loggedUser);
+        } else {
+          if ($success === false) {
+            Logger::warning(__CLASS__, "Login failed", array("user" => $this->currentUser, "error" => "Invalid WebDAV user or password"));
+          }
+          throw new Sabre\DAV\Exception\NotAuthenticated($errmsg);
+        }
+
+        if($this->context->hasRepository()){
+            $repoId = $this->context->getRepositoryId();
+            try{
+                $repoObject = UsersService::getRepositoryWithPermission($loggedUser, $repoId);
+            }catch (WorkspaceForbiddenException $e){
+                throw new Sabre\DAV\Exception\NotAuthenticated('You are not allowed to access this workspace');
+            }catch (WorkspaceNotFoundException $e){
+                throw new Sabre\DAV\Exception\NotAuthenticated('Could not find workspace!');
+            }catch (RepositoryLoadException $e){
+                throw new Sabre\DAV\Exception\NotAuthenticated('Error while loading workspace');
+            }catch (\Exception $e){
+                throw new Sabre\DAV\Exception\NotAuthenticated('Error while loading workspace');
+            }
+            if($repoObject->getContextOption($this->context, "AJXP_WEBDAV_DISABLED", false)){
+                throw new Sabre\DAV\Exception\NotAuthenticated('WebDAV access is disabled for this workspace');
+            }
+            $this->context->setRepositoryObject($repoObject);
+        }
+        if (ConfService::getContextConf($this->context, "SESSION_SET_CREDENTIALS", "auth")) {
+            $webdavData = $loggedUser->getPref("AJXP_WEBDAV_DATA");
+            MemorySafe::storeCredentials($this->currentUser, $this->_decodePassword($webdavData["PASS"], $this->currentUser));
+        }
+
+        // NOW UPDATE CONTEXT
+        $this->context->setUserObject($loggedUser);
+        Logger::updateContext($this->context);
+        TextEncoder::updateContext($this->context);
+
+        return true;
+    }
+
+    /**
+     * @param \Pydio\Core\Model\UserInterface $user
+     * @return bool
+     * @throws \Sabre\DAV\Exception\NotAuthenticated
+     */
+    protected function updateCurrentUserRights($user)
+    {
+        if ($this->repositoryId == null) {
+            return true;
+        }
+        if (!$user->canSwitchTo($this->repositoryId)) {
+            throw new Sabre\DAV\Exception\NotAuthenticated();
+        }
+        return true;
+    }
+
+    /**
+     * @param $encoded
+     * @param $user
+     * @return string
+     */
+    private function _decodePassword($encoded, $user)
+    {
+        $key = Crypto::buildKey($user, Crypto::getApplicationSecret(), $encoded);
+        return Crypto::decrypt($encoded, $key);
+    }
+
+
+
+}
diff --git a/core/src/core/src/pydio/Core/Http/Dav/BrowserPlugin.php b/core/src/core/src/pydio/Core/Http/Dav/BrowserPlugin.php
new file mode 100644
index 0000000000..7b006c4eee
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Dav/BrowserPlugin.php
@@ -0,0 +1,84 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Dav;
+
+use \Sabre;
+use Pydio\Core\Services\ConfService;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * @package Pydio
+ * @subpackage SabreDav
+ */
+class BrowserPlugin extends Sabre\DAV\Browser\Plugin
+{
+
+    protected $repositoryLabel;
+
+    /**
+     * BrowserPlugin constructor.
+     * @param null $currentRepositoryLabel
+     */
+    public function __construct($currentRepositoryLabel = null)
+    {
+        parent::__construct(false, true);
+        $this->repositoryLabel = $currentRepositoryLabel;
+    }
+
+    /**
+     * @param string $path
+     * @return mixed|string
+     */
+    public function generateDirectoryIndex($path)
+    {
+        $html = parent::generateDirectoryIndex($path);
+        $html = str_replace("image/vnd.microsoft.icon", "image/png", $html);
+
+        $title = ConfService::getGlobalConf("APPLICATION_TITLE");
+        $html = preg_replace("/<title>(.*)<\/title>/i", '<title>'.$title.'</title>', $html);
+
+        $repoString = "</h1>";
+        if (!empty($this->repositoryLabel)) {
+            $repoString = " - ".$this->repositoryLabel."</h1><h2>Index of ".$this->escapeHTML($path)."/</h2>";
+        }
+        $html = preg_replace("/<h1>(.*)<\/h1>/i", "<h1>".$title.$repoString, $html);
+
+        $html = str_replace("h1 { font-size: 150% }", "h1 { font-size: 150% } \n h2 { font-size: 115% }", $html);
+
+        return $html;
+
+    }
+
+    /**
+     * @param string $name
+     * @return string
+     * @throws Sabre\DAV\Exception\Forbidden
+     */
+    public function getLocalAssetPath($name)
+    {
+        if ($name != "favicon.ico") {
+            return parent::getLocalAssetPath($name);
+        }
+        return AJXP_INSTALL_PATH."/plugins/gui.ajax/res/themes/orbit/images/html-folder.png";
+    }
+
+}
diff --git a/core/src/core/src/pydio/Core/Http/Dav/Collection.php b/core/src/core/src/pydio/Core/Http/Dav/Collection.php
new file mode 100644
index 0000000000..6a742b430d
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Dav/Collection.php
@@ -0,0 +1,214 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Dav;
+
+use \Sabre;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Core\Controller\Controller;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * @package Pydio
+ * @subpackage SabreDav
+ */
+class Collection extends Node implements Sabre\DAV\ICollection
+{
+
+    protected $children;
+
+    /**
+     * Creates a new file in the directory
+     *
+     * Data will either be supplied as a stream resource, or in certain cases
+     * as a string. Keep in mind that you may have to support either.
+     *
+     * After succesful creation of the file, you may choose to return the ETag
+     * of the new file here.
+     *
+     * The returned ETag must be surrounded by double-quotes (The quotes should
+     * be part of the actual string).
+     *
+     * If you cannot accurately determine the ETag, you should not return it.
+     * If you don't store the file exactly as-is (you're transforming it
+     * somehow) you should also not return an ETag.
+     *
+     * This means that if a subsequent GET to this new file does not exactly
+     * return the same contents of what was submitted here, you are strongly
+     * recommended to omit the ETag.
+     *
+     * @param string $name Name of the file
+     * @param resource|string $data Initial payload
+     * @return null|string
+     */
+    public function createFile($name, $data = null)
+    {
+        try {
+            $name = ltrim($name, "/");
+            Logger::debug("CREATE FILE $name");
+
+            $request = new \Zend\Diactoros\ServerRequest();
+            $request = $request
+                ->withParsedBody([
+                    "dir" => $this->path,
+                    "filename" => $name
+                ])
+                ->withAttribute("action", "mkfile")
+                ->withAttribute("api", "session")
+                ->withAttribute("ctx", $this->context)
+            ;
+            Controller::run($request);
+
+            if ( $data != null && is_file($this->getUrl()."/".$name)) {
+
+                $p = $this->path."/".$name;
+                $newNode = new AJXP_Node($this->getUrl().$p);
+                Controller::applyHook("node.before_change", array($newNode, $_SERVER["CONTENT_LENGTH"]));
+                //AJXP_Logger::debug("Should now copy stream or string in ".$this->getUrl()."/".$name);
+                if (is_resource($data)) {
+                    $stream = fopen($this->getUrl()."/".$name, "w");
+                    stream_copy_to_stream($data, $stream);
+                    fclose($stream);
+                } else if (is_string($data)) {
+                    file_put_contents($data, $this->getUrl()."/".$name);
+                }
+
+                $toto = null;
+                Controller::applyHook("node.change", array(null, $newNode, false));
+
+            }
+            $node = new NodeLeaf($this->path."/".$name, $this->context);
+            if (isSet($this->children)) {
+                $this->children = null;
+            }
+            return $node->getETag();
+
+        } catch (\Exception $e) {
+            Logger::debug("Error ".$e->getMessage(), $e->getTraceAsString());
+            return null;
+        }
+
+
+    }
+
+    /**
+     * Creates a new subdirectory
+     *
+     * @param string $name
+     * @return void
+     */
+    public function createDirectory($name)
+    {
+        if (isSet($this->children)) {
+            $this->children = null;
+        }
+        $request = new \Zend\Diactoros\ServerRequest();
+        $request = $request
+            ->withParsedBody([
+                "dir" => $this->path,
+                "dirname" => $name
+            ])
+            ->withAttribute("action", "mkdir")
+            ->withAttribute("api", "session")
+            ->withAttribute("ctx", $this->context)
+        ;
+        Controller::run($request);
+        
+    }
+
+    /**
+     * Returns a specific child node, referenced by its name
+     *
+     * @param string $name
+     * @throws Sabre\DAV\Exception\NotFound
+     * @return Sabre\DAV\INode
+     */
+    public function getChild($name)
+    {
+        foreach ($this->getChildren() as $child) {
+
+            if ($child->getName()==$name) return $child;
+
+        }
+        throw new Sabre\DAV\Exception\NotFound('File not found: ' . $name);
+
+    }
+
+    /**
+     * Returns an array with all the child nodes
+     *
+     * @return Sabre\DAV\INode[]
+     */
+    public function getChildren()
+    {
+        if (isSet($this->children)) {
+            return $this->children;
+        }
+
+
+        $contents = array();
+
+        $nodes = scandir($this->getUrl());
+
+        foreach ($nodes as $file) {
+            if ($file == "." || $file == "..") {
+                continue;
+            }
+            // This function will perform the is_dir() call and update $isLeaf variable.
+            $isLeaf = "";
+            if (!$this->getAccessDriver()->filterNodeName($this->context, $this->getUrl(), $file, $isLeaf, array("d"=>true, "f"=>true, "z"=>true))){
+                continue;
+            }
+            if ( !$isLeaf ) {
+                // Add collection without any children
+                $contents[] = new Collection($this->path."/".$file, $this->context);
+            } else {
+                // Add files without content
+                $contents[] = new NodeLeaf($this->path."/".$file, $this->context);
+            }
+        }
+        $this->children = $contents;
+
+        $ajxpNode = new AJXP_Node($this->getUrl());
+        Controller::applyHook("node.read", array(&$ajxpNode));
+
+        return $contents;
+
+    }
+
+    /**
+     * Checks if a child-node with the specified name exists
+     *
+     * @param string $name
+     * @return bool
+     */
+    public function childExists($name)
+    {
+        foreach ($this->getChildren() as $child) {
+
+            if ($child->getName()==$name) return true;
+
+        }
+        return false;
+
+    }
+}
diff --git a/core/src/core/src/pydio/Core/Http/Dav/DAVServer.php b/core/src/core/src/pydio/Core/Http/Dav/DAVServer.php
new file mode 100644
index 0000000000..e586447273
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Dav/DAVServer.php
@@ -0,0 +1,134 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Dav;
+
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Log\Core\Logger;
+use Sabre\DAV as DAV;
+use Sabre\DAV\Exception\Forbidden;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class DAVServer
+ * @package Pydio\Core\Http\Dav
+ */
+class DAVServer
+{
+    /**
+     * @var ContextInterface
+     */
+    private static $context;
+
+
+    /**
+     * @param $baseURI
+     * @param $davRoute
+     * @throws Forbidden
+     */
+    public static function handleRoute($baseURI, $davRoute){
+
+        ConfService::init();
+        ConfService::start();
+        self::$context = Context::emptyContext();
+
+        if (!ConfService::getGlobalConf("WEBDAV_ENABLE")) {
+            throw new Forbidden('You are not allowed to access this service');
+        }
+
+        PluginsService::getInstance(self::$context)->initActivePlugins();
+
+        $baseURI = $baseURI . $davRoute;
+        $requestUri = $_SERVER["REQUEST_URI"];
+        if (substr($requestUri, 0, strlen($baseURI)) != $baseURI)
+        {
+            $baseURI = substr($requestUri, 0, stripos($requestUri, $baseURI)) . $baseURI;
+        }
+        $end = trim(substr($requestUri, strlen($baseURI."/")));
+        $rId = null;
+        if ((!empty($end) || $end ==="0") && $end[0] != "?") {
+
+            $parts = explode("/", $end);
+            $pathBase = $parts[0];
+            $repositoryId = $pathBase;
+
+            $repository = RepositoryService::getRepositoryById($repositoryId);
+            if ($repository == null) {
+                $repository = RepositoryService::getRepositoryByAlias($repositoryId);
+                if ($repository != null) {
+                    $repositoryId = $repository->getId();
+                }
+            }
+            if ($repository == null) {
+                throw new Forbidden('You are not allowed to access this service');
+            }
+
+            self::$context->setRepositoryId($repositoryId);
+            $rootDir =  new Collection("/", self::$context);
+            $server = new DAV\Server($rootDir);
+            $server->setBaseUri($baseURI."/".$pathBase);
+
+
+        } else {
+
+            $rootDir = new RootCollection("root");
+            $rootDir->setContext(self::$context);
+            $server = new DAV\Server($rootDir);
+            $server->setBaseUri($baseURI);
+
+        }
+
+        if((AuthBackendBasic::detectBasicHeader() || ConfService::getGlobalConf("WEBDAV_FORCE_BASIC"))){
+            $authBackend = new AuthBackendBasic(self::$context);
+        } else {
+            $authBackend = new AuthBackendDigest(self::$context);
+        }
+        $authPlugin = new DAV\Auth\Plugin($authBackend, ConfService::getGlobalConf("WEBDAV_DIGESTREALM"));
+        $server->addPlugin($authPlugin);
+
+        if (!is_dir(AJXP_DATA_PATH."/plugins/server.sabredav")) {
+            mkdir(AJXP_DATA_PATH."/plugins/server.sabredav", 0755);
+            $fp = fopen(AJXP_DATA_PATH."/plugins/server.sabredav/locks", "w");
+            fwrite($fp, "");
+            fclose($fp);
+        }
+
+        $lockBackend = new DAV\Locks\Backend\File(AJXP_DATA_PATH."/plugins/server.sabredav/locks");
+        $lockPlugin = new DAV\Locks\Plugin($lockBackend);
+        $server->addPlugin($lockPlugin);
+
+        if (ConfService::getGlobalConf("WEBDAV_BROWSER_LISTING")) {
+            $browerPlugin = new BrowserPlugin((isSet($repository)?$repository->getDisplay():null));
+            $extPlugin = new DAV\Browser\GuessContentType();
+            $server->addPlugin($browerPlugin);
+            $server->addPlugin($extPlugin);
+        }
+        try {
+            $server->exec();
+        } catch ( \Exception $e ) {
+            Logger::error(__CLASS__,"Exception",$e->getMessage());
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Dav/Node.php b/core/src/core/src/pydio/Core/Http/Dav/Node.php
new file mode 100644
index 0000000000..65ce3b4a53
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Dav/Node.php
@@ -0,0 +1,281 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Dav;
+
+use \Sabre;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\IAjxpWrapperProvider;
+use Pydio\Access\Core\Model\Repository;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Access\Metastore\Core\IMetaStoreProvider;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * @package Pydio
+ * @subpackage SabreDav
+ */
+class Node implements Sabre\DAV\INode, Sabre\DAV\IProperties
+{
+
+    /** @var  ContextInterface */
+    protected $context;
+
+
+    /**
+     * @var IAjxpWrapperProvider
+     */
+    protected $accessDriver;
+
+    /**
+     * @var String
+     */
+    protected $url;
+    protected $path;
+
+    /**
+     * Node constructor.
+     * @param $path
+     * @param ContextInterface $context
+     */
+    public function __construct($path, $context)
+    {
+        $this->context = $context;
+        $this->path = $path;
+    }
+
+    /**
+     * @return ContextInterface
+     */
+    public function getContext(){
+        return $this->context;
+    }
+
+    /**
+     * @param Repository $repository
+     */
+    public function updateRepository($repository){
+        $this->repository = $repository;
+    }
+
+    /**
+     * @return IAjxpWrapperProvider
+     * @throws \Sabre\DAV\Exception\NotFound
+     */
+    public function getAccessDriver()
+    {
+        $driver = $this->context->getRepository()->getDriverInstance($this->context);
+        if(empty($driver)){
+            $n = new AJXP_Node($this->getUrl());
+            return $n->getDriver();
+        }else{
+            return $driver;
+        }
+    }
+
+    /**
+     * @return String
+     */
+    public function getUrl()
+    {
+        if (!isSet($this->url)) {
+            $this->url = $this->context->getUrlBase().$this->path;
+        }
+        return $this->url;
+    }
+
+    /**
+     * Deleted the current node
+     *
+     * @return void
+     */
+    public function delete()
+    {
+        ob_start();
+        try {
+            $request = new \Zend\Diactoros\ServerRequest();
+            $request = $request
+                ->withParsedBody([
+                    "dir"       => dirname($this->path),
+                    "file_0"    => $this->path
+                ])
+                ->withAttribute("action", "delete")
+                ->withAttribute("api", "session")
+                ->withAttribute("ctx", $this->context);
+            Controller::run($request);
+        } catch (\Exception $e) {
+
+        }
+        ob_get_flush();
+        $this->putResourceData(array());
+
+    }
+
+    /**
+     * Returns the name of the node.
+     *
+     * This is used to generate the url.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return basename($this->getUrl());
+    }
+
+    /**
+     * Renames the node
+     *
+     * @param string $name The new name
+     * @return void
+     */
+    public function setName($name)
+    {
+        $data = $this->getResourceData();
+        ob_start();
+        $request = new \Zend\Diactoros\ServerRequest();
+        $request = $request
+            ->withParsedBody([
+                "filename_new"      => $name,
+                "dir"               => dirname($this->path),
+                "file"              => $this->path
+            ])
+            ->withAttribute("action", "rename")
+            ->withAttribute("api", "session")
+            ->withAttribute("ctx", $this->context)
+        ;
+        Controller::run($request);
+        ob_get_flush();
+        $this->putResourceData(array());
+        $this->putResourceData($data, dirname($this->getUrl())."/".$name);
+    }
+
+    /**
+     * Returns the last modification time, as a unix timestamp
+     *
+     * @return int
+     */
+    public function getLastModified()
+    {
+        return filemtime($this->getUrl());
+    }
+
+
+    /**
+     * Updates properties on this node,
+     *
+     * @param array $properties
+     * @see Sabre\DAV\IProperties::updateProperties
+     * @return bool|array
+     */
+    public function updateProperties($properties)
+    {
+        $resourceData = $this->getResourceData();
+
+        foreach ($properties as $propertyName=>$propertyValue) {
+
+            // If it was null, we need to delete the property
+            if (is_null($propertyValue)) {
+                if (isset($resourceData['properties'][$propertyName])) {
+                    unset($resourceData['properties'][$propertyName]);
+                }
+            } else {
+                $resourceData['properties'][$propertyName] = $propertyValue;
+            }
+
+        }
+
+        //AJXP_Logger::debug("Saving Data", $resourceData);
+        $this->putResourceData($resourceData);
+        return true;
+    }
+
+    /**
+     * Returns a list of properties for this nodes.;
+     *
+     * The properties list is a list of propertynames the client requested, encoded as xmlnamespace#tagName, for example: http://www.example.org/namespace#author
+     * If the array is empty, all properties should be returned
+     *
+     * @param array $properties
+     * @return array
+     */
+    public function getProperties($properties)
+    {
+        $resourceData = $this->getResourceData();
+
+        // if the array was empty, we need to return everything
+        if (!$properties) return $resourceData['properties'];
+
+        $props = array();
+        foreach ($properties as $property) {
+            if (isset($resourceData['properties'][$property])) $props[$property] = $resourceData['properties'][$property];
+        }
+
+        return $props;
+
+    }
+
+    /**
+     * Metadata manager
+     * @param $array
+     * @param null $newURL
+     */
+    protected function putResourceData($array, $newURL = null)
+    {
+        $metaStore = $this->getMetastore();
+        if ($metaStore != false) {
+            $metaStore->setMetadata(new AJXP_Node(($newURL!=null?$newURL:$this->getUrl())), "SABRE_DAV", $array, false, AJXP_METADATA_SCOPE_GLOBAL);
+        }
+
+    }
+    
+    /**
+     * Metadata manager
+     * @return array
+     */
+    protected function getResourceData()
+    {
+        $metaStore = $this->getMetastore();
+        $data = array();
+        if ($metaStore != false) {
+            $data = $metaStore->retrieveMetadata(new AJXP_Node($this->getUrl()), "SABRE_DAV", false, AJXP_METADATA_SCOPE_GLOBAL);
+        }
+        if (!isset($data['properties'])) $data['properties'] = array();
+        return $data;
+    }
+
+
+    /**
+     * @return IMetaStoreProvider|bool
+     */
+    protected function getMetastore()
+    {
+        /** @var IMetaStoreProvider $metaStore */
+        $metaStore = PluginsService::getInstance($this->context)->getUniqueActivePluginForType("metastore");
+        if($metaStore === false) return false;
+        $metaStore->initMeta($this->context, $this->getAccessDriver());
+        return $metaStore;
+    }
+
+
+}
diff --git a/core/src/core/src/pydio/Core/Http/Dav/NodeLeaf.php b/core/src/core/src/pydio/Core/Http/Dav/NodeLeaf.php
new file mode 100644
index 0000000000..8cc4fab084
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Dav/NodeLeaf.php
@@ -0,0 +1,182 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Dav;
+
+use \Sabre;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Core\Controller\Controller;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * @package AjaXplorer
+ * @subpackage SabreDav
+ */
+class NodeLeaf extends Node implements Sabre\DAV\IFile
+{
+
+    /**
+     * Updates the data
+     *
+     * The data argument is a readable stream resource.
+     *
+     * After a succesful put operation, you may choose to return an ETag. The
+     * etag must always be surrounded by double-quotes. These quotes must
+     * appear in the actual string you're returning.
+     *
+     * Clients may use the ETag from a PUT request to later on make sure that
+     * when they update the file, the contents haven't changed in the mean
+     * time.
+     *
+     * If you don't plan to store the file byte-by-byte, and you return a
+     * different object on a subsequent GET you are strongly recommended to not
+     * return an ETag, and just return null.
+     *
+     * @param resource $data
+     * @return null|string
+     * @throws \Sabre\DAV\Exception\Forbidden
+     */
+    public function put($data)
+    {
+        // Warning, passed by ref
+        $p = $this->path;
+
+        if (!$this->context->getUser()->canWrite($this->context->getRepositoryId())) {
+            throw new Sabre\DAV\Exception\Forbidden() ;
+        }
+        $newNode = new AJXP_Node($this->getUrl().$p);
+        Controller::applyHook("node.before_change", array($newNode, $_SERVER["CONTENT_LENGTH"]));
+
+        $stream = fopen($this->getUrl(), "w");
+        stream_copy_to_stream($data, $stream);
+        fclose($stream);
+
+        $toto = null;
+        Controller::applyHook("node.change", array(null, $newNode, false));
+
+        return $this->getETag();
+    }
+
+    /**
+     * Returns the data
+     *
+     * This method may either return a string or a readable stream resource
+     *
+     * @return mixed
+     */
+    public function get()
+    {
+        $ajxpNode = new AJXP_Node($this->getUrl());
+        Controller::applyHook("node.read", array(&$ajxpNode));
+        return fopen($this->getUrl(), "r");
+    }
+
+    /**
+     * Returns the mime-type for a file
+     *
+     * If null is returned, we'll assume application/octet-stream
+     *
+     * @return void|string
+     */
+    public function getContentType()
+    {
+         //Get mimetype with fileinfo PECL extension
+        $fp = fopen($this->getUrl(), "r");
+        $fileMime = null;
+        if (class_exists("finfo")) {
+            $finfo = new \finfo(FILEINFO_MIME);
+            $fileMime = $finfo->buffer(fread($fp, 100));
+        } elseif (function_exists("mime_content_type")) {
+            $fileMime = @mime_content_type($fp);
+        } else {
+            $fileExt = substr(strrchr(basename($this->getUrl()), '.'), 1);
+            if(empty($fileExt))
+                $fileMime = "application/octet-stream";
+            else {
+                $regex = "/^([\w\+\-\.\/]+)\s+(\w+\s)*($fileExt\s)/i";
+                $lines = file( AJXP_CONF_PATH ."/mime.types");
+                foreach ($lines as $line) {
+                    if(substr($line, 0, 1) == '#')
+                        continue; // skip comments
+                    $line = rtrim($line) . " ";
+                    if(!preg_match($regex, $line, $matches))
+                        continue; // no match to the extension
+                    $fileMime = $matches[1];
+                }
+            }
+        }
+        fclose($fp);
+        return $fileMime;
+        /*
+        if ( $this->options->useMimeExts && ezcBaseFeatures::hasExtensionSupport( 'fileinfo' ) ) {
+            $fInfo = new fInfo( FILEINFO_MIME );
+            $mimeType = $fInfo->file( $this->getUrl() );
+
+            // The documentation tells to do this, but it does not work with a
+            // current version of pecl/fileinfo
+            // $fInfo->close();
+
+            return $mimeType;
+        }
+
+        // Check if extension ext/mime-magic is usable.
+        if ( $this->options->useMimeExts &&
+            ezcBaseFeatures::hasExtensionSupport( 'mime_magic' ) &&
+            ( $mimeType = mime_content_type( $this->getUrl() ) ) !== false )
+        {
+            return $mimeType;
+        }
+        */
+    }
+
+    /**
+     * Returns the ETag for a file
+     *
+     * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
+     *
+     * Return null if the ETag can not effectively be determined
+     *
+     * @return String|null
+     */
+    public function getETag()
+    {
+        clearstatcache();
+        return '"'.md5(
+            $this->path
+                . $this->getSize()
+                . date( 'c', $this->getLastModified() )
+        ).'"';
+    }
+
+    /**
+     * Returns the size of the node, in bytes
+     *
+     * @return int
+     */
+    public function getSize()
+    {
+        return filesize($this->getUrl());
+    }
+
+
+
+
+}
diff --git a/core/src/core/src/pydio/Core/Http/Dav/RootCollection.php b/core/src/core/src/pydio/Core/Http/Dav/RootCollection.php
new file mode 100644
index 0000000000..62fe411007
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Dav/RootCollection.php
@@ -0,0 +1,96 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Dav;
+
+use Pydio\Core\Model\FilteredRepositoriesList;
+use \Sabre;
+use Pydio\Core\Model\ContextInterface;
+
+use Pydio\Core\PluginFramework\PluginsService;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Class RootCollection
+ * @package Pydio\Core\Http\Dav
+ */
+class RootCollection extends Sabre\DAV\SimpleCollection
+{
+    /** @var  ContextInterface */
+    protected $context;
+
+    /**
+     * @return ContextInterface
+     */
+    public function getContext(){
+        return $this->context;
+    }
+
+    /**
+     * @return ContextInterface
+     */
+    public function setContext($context){
+        return $this->context = $context;
+    }
+
+    /**
+     * @return Node[]
+     */
+    public function getChildren()
+    {
+        $this->children = array();
+        if($this->context == null || !$this->context->hasUser()){
+            return $this->children;
+        }
+        $filteredList = new FilteredRepositoriesList($this->context->getUser());
+        $repos = $filteredList->load();
+        // Refilter to make sure the driver is an AjxpWebdavProvider
+        foreach ($repos as $repository) {
+            $accessType = $repository->getAccessType();
+            $driver = PluginsService::getInstance($this->context)->getPluginByTypeName("access", $accessType);
+            if ($driver instanceof \Pydio\Access\Core\IAjxpWrapperProvider && $repository->getContextOption($this->context, "AJXP_WEBDAV_DISABLED") !== true) {
+                $this->children[$repository->getSlug()] = new Sabre\DAV\SimpleCollection($repository->getSlug());
+            }
+        }
+        return $this->children;
+    }
+
+    /**
+     * @param string $name
+     * @return bool
+     */
+    public function childExists($name)
+    {
+        $c = $this->getChildren();
+        return array_key_exists($name, $c);
+    }
+
+    /**
+     * @param string $name
+     * @return Node
+     */
+    public function getChild($name)
+    {
+        $c = $this->getChildren();
+        return $c[$name];
+    }
+
+}
diff --git a/core/src/core/src/pydio/Core/Http/Message/ExternalUploadedFile.php b/core/src/core/src/pydio/Core/Http/Message/ExternalUploadedFile.php
new file mode 100644
index 0000000000..1d80f667a3
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Message/ExternalUploadedFile.php
@@ -0,0 +1,73 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Http\Message;
+
+use Zend\Diactoros\UploadedFile;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class ExternalUploadedFile
+ * @package Pydio\Core\Http\Message
+ */
+class ExternalUploadedFile extends UploadedFile
+{
+    const STATUS_REQUEST_OPTIONS    = "request-options";
+    const STATUS_UPLOAD_FINISHED    = "upload-finished";
+    const STATUS_UPLOAD_ERROR       = "upload-error";
+
+    private $status;
+
+    /**
+     * ExternalUploadedFile constructor.
+     * @param string $status self::STATUS_REQUEST_OPTIONS, UPLOAD_FINISHED, UPLOAD_ERROR
+     * @param int $size
+     * @param int $clientFilename
+     */
+    public function __construct($status, $size, $clientFilename)
+    {
+        parent::__construct(
+            "fake-tmp-file",
+            $size,
+            $status === self::STATUS_UPLOAD_ERROR ? UPLOAD_ERR_NO_FILE : UPLOAD_ERR_OK,
+            $clientFilename,
+            null
+        );
+        $this->status = $status;
+    }
+
+    /**
+     * @return string One of the ExternalUploadedFile::STATUS_XXX constant value
+     */
+    public function getStatus(){
+        return $this->status;
+    }
+
+    /**
+     * Check if status has a valid value
+     * @param $status
+     * @return bool
+     */
+    public static function isValidStatus($status){
+        return in_array($status, [self::STATUS_REQUEST_OPTIONS, self::STATUS_UPLOAD_ERROR, self::STATUS_UPLOAD_FINISHED]);
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Message/JsActionTrigger.php b/core/src/core/src/pydio/Core/Http/Message/JsActionTrigger.php
new file mode 100644
index 0000000000..bca1370cdf
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Message/JsActionTrigger.php
@@ -0,0 +1,57 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Message;
+
+use Pydio\Core\Http\Response\XMLSerializableResponseChunk;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class BgActionTrigger
+ * An XML response triggering a background action in Pydio UI.
+ * @package Pydio\Core\Http\Message
+ */
+class JsActionTrigger implements XMLSerializableResponseChunk
+{
+    private $delay;
+    private $javascriptCode;
+
+    /**
+     * @param string $jsCode
+     * @param int $delay
+     */
+    public function __construct($jsCode, $delay = 0)
+    {
+        $this->javascriptCode = $jsCode;
+        $this->delay = $delay;
+    }
+
+    /**
+     * @return string
+     */
+    public function toXML()
+    {
+        $data = "<trigger_bg_action name=\"javascript_instruction\" delay=\"".$this->delay."\">";
+        $data .= "<clientCallback><![CDATA[".$this->javascriptCode."]]></clientCallback>";
+        $data .= "</trigger_bg_action>";
+        return $data;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Message/LoggingResult.php b/core/src/core/src/pydio/Core/Http/Message/LoggingResult.php
new file mode 100644
index 0000000000..1278b44134
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Message/LoggingResult.php
@@ -0,0 +1,88 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Message;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+use Pydio\Core\Http\Response\XMLSerializableResponseChunk;
+
+/**
+ * XML result sent after successful or failed login.
+ * @package Pydio\Core\Http\Message
+ */
+class LoggingResult implements XMLSerializableResponseChunk
+{
+    /**
+     * @var int
+     */
+    private $result;
+    /**
+     * @var string
+     */
+    private $rememberLogin;
+    /**
+     * @var string
+     */
+    private $rememberPass;
+    /**
+     * @var string
+     */
+    private $secureToken;
+
+    /**
+     * LoggingResult constructor.
+     * @param $result
+     * @param string $rememberLogin
+     * @param string $rememberPass
+     * @param string $secureToken
+     */
+    public function __construct($result, $rememberLogin="", $rememberPass = "", $secureToken="")
+    {
+        $this->result = $result;
+        $this->rememberLogin = $rememberLogin;
+        $this->rememberPass = $rememberPass;
+        $this->secureToken = $secureToken;
+    }
+
+    /**
+     * @return int
+     */
+    public function getResult(){
+        return $this->result;
+    }
+
+    /**
+     * @return string
+     */
+    public function toXML()
+    {
+        $remString = "";
+        if ($this->rememberPass != "" && $this->rememberLogin!= "") {
+            $remString = " remember_login=\"$this->rememberLogin\" remember_pass=\"$this->rememberPass\"";
+        }
+        if ($this->secureToken != "") {
+            $remString .= " secure_token=\"$this->secureToken\"";
+        }
+        return "<logging_result value=\"$this->result\"$remString/>";
+
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Message/Message.php b/core/src/core/src/pydio/Core/Http/Message/Message.php
new file mode 100644
index 0000000000..68e03bc578
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Message/Message.php
@@ -0,0 +1,78 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Message;
+
+use Pydio\Core\Http\Response\JSONSerializableResponseChunk;
+use Pydio\Core\Http\Response\XMLSerializableResponseChunk;
+use Pydio\Core\Utils\Vars\StringHelper;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class Message
+ * Generic user message serialized either as XML or JSON.
+ * @package Pydio\Core\Http\Message
+ */
+class Message implements XMLSerializableResponseChunk, JSONSerializableResponseChunk
+{
+    /**
+     * @var string
+     */
+    private $message;
+
+    /**
+     * Message constructor.
+     * @param string $message
+     */
+    public function __construct($message)
+    {
+        $this->message = $message;
+    }
+
+    /**
+     * @return string
+     */
+    public function toXML()
+    {
+        if(is_string($this->message)){
+            $m = $this->message;
+        }else{
+            $m = json_encode($this->message);
+        }
+        return "<message>".StringHelper::xmlContentEntities($m)."</message>";
+    }
+
+    /**
+     * @return string
+     */
+    public function jsonSerializableData()
+    {
+        return $this->message;
+    }
+
+    /**
+     * @return string
+     */
+    public function jsonSerializableKey()
+    {
+        return 'message';
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Message/RegistryMessage.php b/core/src/core/src/pydio/Core/Http/Message/RegistryMessage.php
new file mode 100644
index 0000000000..d535329dd3
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Message/RegistryMessage.php
@@ -0,0 +1,139 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Http\Message;
+
+use Pydio\Core\Utils\Vars\XMLFilter;
+use Pydio\Core\Http\Response\JSONSerializableResponseChunk;
+use Pydio\Core\Http\Response\XMLDocSerializableResponseChunk;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\XMLHelper;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class RegistryMessage
+ * Send a piece or a full registry as XML or JSON
+ * @package Pydio\Core\Http\Message
+ */
+class RegistryMessage implements XMLDocSerializableResponseChunk, JSONSerializableResponseChunk
+{
+    /**
+     * @var \DOMDocument
+     */
+    protected $registry;
+
+    /**
+     * @var string|null
+     */
+    protected $xPath;
+
+    /**
+     * @var \DOMXPath|null
+     */
+    protected $xPathObject;
+
+    /**
+     * @var String
+     */
+    protected $renderedXML;
+
+    /**
+     * RegistryMessage constructor.
+     * @param $registry
+     * @param null $xPath
+     * @param null $xPathObject
+     */
+    public function __construct($registry, $xPath = null, $xPathObject = null)
+    {
+        $this->registry = $registry;
+        $this->xPath = $xPath;
+        $this->xPathObject = $xPathObject;
+    }
+
+
+    /**
+     * @return string
+     */
+    public function getCharset()
+    {
+        return "UTF-8";
+    }
+
+    /**
+     * @return string
+     */
+    public function toXML()
+    {
+        if(!empty($this->renderedXML)){
+            return $this->renderedXML;
+        }
+        if (!empty($this->xPath)) {
+
+            // Warning dirty hack for legacy iOS application : leave the space
+            // after the xPath value (before closing >).
+            $xml = "<ajxp_registry_part xPath=\"".$this->xPath."\" >";
+            if(empty($this->xPathObject)){
+                $this->xPathObject = new \DOMXPath($this->registry);
+            }
+            $nodes = $this->xPathObject->query($this->xPath);
+            if ($nodes->length) {
+                $xml .= XMLFilter::resolveKeywords($this->registry->saveXML($nodes->item(0)));
+            }
+            $xml .= "</ajxp_registry_part>";
+
+        } else {
+
+            ApplicationState::safeIniSet("zlib.output_compression", "4096");
+            $xml = XMLFilter::resolveKeywords($this->registry->saveXML());
+
+        }
+        $this->renderedXML = $xml;
+        return $xml;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function jsonSerializableData()
+    {
+        if(!empty($this->xPath)){
+            if(empty($this->xPathObject)){
+                $this->xPathObject = new \DOMXPath($this->registry);
+            }
+            $nodes = $this->xPathObject->query($this->xPath);
+            $data = [];
+            if($nodes->length){
+                $data = XMLHelper::xmlToArray($nodes->item(0));
+            }
+            return $data;
+        }else{
+            return XMLHelper::xmlToArray($this->registry);
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function jsonSerializableKey()
+    {
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Message/ReloadMessage.php b/core/src/core/src/pydio/Core/Http/Message/ReloadMessage.php
new file mode 100644
index 0000000000..d726c36c3e
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Message/ReloadMessage.php
@@ -0,0 +1,75 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Message;
+
+use Pydio\Core\Http\Response\JSONSerializableResponseChunk;
+use Pydio\Core\Http\Response\XMLSerializableResponseChunk;
+use Pydio\Core\Utils\Vars\StringHelper;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class ReloadMessage
+ * Sends a Reload instruction to the UI
+ * @package Pydio\Core\Http\Message
+ */
+class ReloadMessage implements XMLSerializableResponseChunk, JSONSerializableResponseChunk
+{
+    private $dataNode = '';
+    private $pendingSelection = '';
+
+    /**
+     * ReloadMessage constructor.
+     * @param string $dataNode
+     * @param string $pendingSelection
+     */
+    public function __construct($dataNode = "", $pendingSelection = ""){
+        $this->dataNode = $dataNode;
+        $this->pendingSelection = $pendingSelection;
+    }
+
+
+    /**
+     * @return array
+     */
+    public function jsonSerializableData()
+    {
+        return ['node'=> $this->dataNode, 'pendingSelection' => $this->pendingSelection];
+    }
+
+    /**
+     * @return string
+     */
+    public function jsonSerializableKey()
+    {
+        return 'reload';
+    }
+
+    /**
+     * @return string
+     */
+    public function toXML()
+    {
+        $nodePath = StringHelper::xmlEntities($this->dataNode, true);
+        $pendingSelection = StringHelper::xmlEntities($this->pendingSelection, true);
+        return "<reload_instruction object=\"data\" node=\"$nodePath\" file=\"$pendingSelection\"/>";
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Message/ReloadRepoListMessage.php b/core/src/core/src/pydio/Core/Http/Message/ReloadRepoListMessage.php
new file mode 100644
index 0000000000..8248a91381
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Message/ReloadRepoListMessage.php
@@ -0,0 +1,55 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Http\Message;
+
+use Pydio\Core\Http\Response\XMLSerializableResponseChunk;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class ReloadRepoListMessage Encapsulate XML message for reloading repositories list
+ * @package Pydio\Core\Http\Message
+ */
+class ReloadRepoListMessage extends Message implements XMLSerializableResponseChunk
+{
+    /**
+     * ReloadRepoListMessage constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct("reload_repositories");
+    }
+
+    /**
+     * Serialize as XML
+     * @return string
+     */
+    public function toXML()
+    {
+        return "<reload_instruction object=\"repository_list\"/>";
+    }
+
+    public static function XML(){
+        $m = new ReloadRepoListMessage();
+        return $m->toXML();
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Message/UserMessage.php b/core/src/core/src/pydio/Core/Http/Message/UserMessage.php
new file mode 100644
index 0000000000..464f0a3703
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Message/UserMessage.php
@@ -0,0 +1,80 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Message;
+
+use Pydio\Core\Http\Response\JSONSerializableResponseChunk;
+use Pydio\Core\Http\Response\XMLSerializableResponseChunk;
+use Pydio\Core\Utils\Vars\StringHelper;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class UserMessage
+ * User message displayed on the UI
+ * @package Pydio\Core\Http\Message
+ */
+class UserMessage implements XMLSerializableResponseChunk, JSONSerializableResponseChunk
+{
+
+    private $level;
+    private $message;
+
+    /**
+     * UserMessage constructor.
+     * @param $message
+     * @param string $level
+     */
+    public function __construct($message, $level=LOG_LEVEL_INFO)
+    {
+        $this->message = $message;
+        $this->level = $level;
+    }
+
+    /**
+     * @return string
+     */
+    public function toXML()
+    {
+        if ($this->level === LOG_LEVEL_INFO) {
+            $messageType = "SUCCESS";
+        } else {
+            $messageType = strtoupper($this->level);
+        }
+        $message = StringHelper::xmlContentEntities($this->message);
+        return "<message type=\"$messageType\">".$message."</message>";
+    }
+
+    /**
+     * @return array
+     */
+    public function jsonSerializableData()
+    {
+        return ['level'=>$this->level, 'message' => $this->message];
+    }
+
+    /**
+     * @return string
+     */
+    public function jsonSerializableKey()
+    {
+        return 'message';
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Message/XMLDocMessage.php b/core/src/core/src/pydio/Core/Http/Message/XMLDocMessage.php
new file mode 100644
index 0000000000..dc96fb40ae
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Message/XMLDocMessage.php
@@ -0,0 +1,61 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Http\Message;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+use Pydio\Core\Http\Response\XMLDocSerializableResponseChunk;
+
+/**
+ * Class XMLDocMessage
+ * XML Message, represented as a whole XML Document
+ * @package Pydio\Core\Http\Message
+ */
+class XMLDocMessage extends \DOMDocument implements XMLDocSerializableResponseChunk
+{
+    /**
+     * XMLDocMessage constructor.
+     * @param string $xmlString
+     */
+    public function __construct($xmlString = null)
+    {
+        parent::__construct("1.0", "UTF-8");
+        if(!empty($xmlString)){
+            $this->loadXML($xmlString);
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function getCharset()
+    {
+        return  'UTF-8';
+    }
+
+    /**
+     * @return string
+     */
+    public function toXML()
+    {
+        return $this->saveXML();
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Message/XMLMessage.php b/core/src/core/src/pydio/Core/Http/Message/XMLMessage.php
new file mode 100644
index 0000000000..d6655685b7
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Message/XMLMessage.php
@@ -0,0 +1,54 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Message;
+
+use Pydio\Core\Http\Response\XMLSerializableResponseChunk;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class XMLMessage serialized as a piece of XML
+ * @package Pydio\Core\Http\Message
+ */
+class XMLMessage implements XMLSerializableResponseChunk
+{
+    /**
+     * @var string
+     */
+    private $inner;
+
+    /**
+     * XMLMessage constructor.
+     * @param string $xmlString
+     */
+    public function __construct($xmlString)
+    {
+        $this->inner = $xmlString;
+    }
+
+    /**
+     * @return string
+     */
+    public function toXML()
+    {
+        return $this->inner;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Middleware/AuthMiddleware.php b/core/src/core/src/pydio/Core/Http/Middleware/AuthMiddleware.php
new file mode 100644
index 0000000000..aef50ca133
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Middleware/AuthMiddleware.php
@@ -0,0 +1,86 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Middleware;
+
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Auth\Frontend\Core\FrontendsLoader;
+use Pydio\Core\Exception\ActionNotFoundException;
+use Pydio\Core\Exception\AuthRequiredException;
+use Pydio\Core\Exception\NoActiveWorkspaceException;
+use Pydio\Core\Exception\PydioException;
+
+use Pydio\Core\Http\Server;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\PluginFramework\PluginsService;
+
+use Pydio\Core\Services\ConfService;
+use Zend\Diactoros\Response\EmptyResponse;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class AuthMiddleware
+ * PSR7 Middleware that encapsulates the call to pydio authfront plugins
+ * @package Pydio\Core\Http\Middleware
+ */
+class AuthMiddleware
+{
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @return \Psr\Http\Message\ResponseInterface
+     * @param callable|null $next
+     * @throws PydioException
+     */
+    public static function handleRequest(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface $responseInterface, callable $next = null){
+
+        $driverImpl = ConfService::getAuthDriverImpl();
+        PluginsService::getInstance(Context::emptyContext())->setPluginUniqueActiveForType("auth", $driverImpl->getName(), $driverImpl);
+
+        $response = FrontendsLoader::frontendsAsAuthMiddlewares($requestInterface, $responseInterface);
+        if($response != null){
+            return $response;
+        }
+
+        try{
+
+            return Server::callNextMiddleWare($requestInterface, $responseInterface, $next);
+
+        } catch (NoActiveWorkspaceException $ex){
+
+            throw new AuthRequiredException();
+
+        } catch(ActionNotFoundException $a){
+
+            /** @var ContextInterface $ctx */
+            $ctx = $requestInterface->getAttribute("ctx");
+            if(!$ctx->hasUser()){
+                throw new AuthRequiredException();
+            }else{
+                return new EmptyResponse();
+            }
+        }
+        
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Middleware/ITopLevelMiddleware.php b/core/src/core/src/pydio/Core/Http/Middleware/ITopLevelMiddleware.php
new file mode 100644
index 0000000000..77fccbd8dd
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Middleware/ITopLevelMiddleware.php
@@ -0,0 +1,51 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Middleware;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Core\Exception\WorkspaceNotFoundException;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Interface ITopLevelMiddleware
+ * @package Pydio\Core\Http\Middleware
+ */
+interface ITopLevelMiddleware
+{
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @return mixed
+     */
+    public function emitResponse(ServerRequestInterface $requestInterface, ResponseInterface $responseInterface);
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @return \Psr\Http\Message\ResponseInterface
+     * @param callable|null $next
+     * @throws WorkspaceNotFoundException
+     */
+    public function handleRequest(ServerRequestInterface $requestInterface, ResponseInterface $responseInterface, callable $next = null);
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Middleware/SapiMiddleware.php b/core/src/core/src/pydio/Core/Http/Middleware/SapiMiddleware.php
new file mode 100644
index 0000000000..5a88501cf5
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Middleware/SapiMiddleware.php
@@ -0,0 +1,132 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Middleware;
+
+use \Psr\Http\Message\ServerRequestInterface;
+use \Psr\Http\Message\ResponseInterface;
+use Pydio\Core\Exception\PydioException;
+
+use Pydio\Core\Http\Response\SerializableResponseStream;
+use Pydio\Core\Http\Server;
+use Pydio\Core\Utils\Vars\InputFilter;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class SapiMiddleware
+ * Main Middleware for Http requests
+ * @package Pydio\Core\Http\Middleware
+ */
+class SapiMiddleware implements ITopLevelMiddleware
+{
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @param callable|null $next
+     * @return ResponseInterface
+     * @throws PydioException
+     */
+    public function handleRequest(ServerRequestInterface $request, ResponseInterface $response, callable $next = null){
+
+        $params = $request->getQueryParams();
+        $postParams = $request->getParsedBody();
+        if(is_array($postParams)){
+            $params = array_merge($params, $postParams);
+        }
+        $request = $request->withParsedBody($params);
+
+        if(in_array("application/json", $request->getHeader("Content-Type"))){
+            $body = "".$request->getBody();
+            $body = json_decode($body, true);
+            if(is_array($body)){
+                $request = $request->withParsedBody(array_merge($request->getParsedBody(), ["request_body" => $body]));
+            }
+        }
+
+        $this->parseRequestRouteAndParams($request, $response);
+
+        $response = Server::callNextMiddleWare($request, $response, $next);
+
+        if(headers_sent()){
+            return;
+        }
+        
+        $this->emitResponse($request, $response);
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $responseInterface
+     */
+    protected function parseRequestRouteAndParams(ServerRequestInterface &$request, ResponseInterface &$responseInterface){
+
+        $serverData = $request->getServerParams();
+        $params = $request->getParsedBody();
+        if(isSet($params["get_action"])){
+            $action = $params["get_action"];
+        }else if(isSet($params["action"])){
+            $action = $params["action"];
+        }else if (preg_match('/MSIE 7/',$serverData['HTTP_USER_AGENT']) || preg_match('/MSIE 8/',$serverData['HTTP_USER_AGENT'])) {
+            $action = "get_boot_gui";
+        } else {
+            $action = (strpos($serverData["HTTP_ACCEPT"], "text/html") !== false ? "get_boot_gui" : "ping");
+        }
+        $request = $request
+            ->withAttribute("action", InputFilter::sanitize($action, InputFilter::SANITIZE_EMAILCHARS))
+            ->withAttribute("api", "session")
+        ;
+
+    }
+
+    /**
+     * Output the response to the browser, if no headers were already sent.
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @return void
+     */
+    public function emitResponse(ServerRequestInterface $request, ResponseInterface $response){
+        if($response !== false && $response->getBody() && $response->getBody() instanceof SerializableResponseStream){
+            /**
+             * @var SerializableResponseStream $body;
+             */
+            $body = &$response->getBody();
+            $params = $request->getParsedBody();
+            $forceJson = false;
+            if(isSet($params["format"]) && $params["format"] == "json"){
+                $forceJson = true;
+            }
+            if(($request->hasHeader("Accept") && $request->getHeader("Accept")[0] == "application/json") || $forceJson){
+                $body->setSerializer(SerializableResponseStream::SERIALIZER_TYPE_JSON);
+                $response = $response->withHeader("Content-type", "application/json; charset=UTF-8");
+            }else{
+                $body->setSerializer(SerializableResponseStream::SERIALIZER_TYPE_XML);
+                $response = $response->withHeader("Content-type", "text/xml; charset=UTF-8");
+            }
+        }
+
+        if($response !== false && ($response->getBody()->getSize() || $response instanceof \Zend\Diactoros\Response\EmptyResponse) || $response->getStatusCode() != 200) {
+            $emitter = new \Zend\Diactoros\Response\SapiEmitter();
+            $emitter->emit($response);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Middleware/SecureTokenMiddleware.php b/core/src/core/src/pydio/Core/Http/Middleware/SecureTokenMiddleware.php
new file mode 100644
index 0000000000..1a9be956a5
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Middleware/SecureTokenMiddleware.php
@@ -0,0 +1,112 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Middleware;
+
+
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Http\Server;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\SessionService;
+use Pydio\Core\Utils\Vars\StringHelper;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class SecureTokenMiddleware
+ * CSRF Prevention
+ * @package Pydio\Core\Http\Middleware
+ */
+class SecureTokenMiddleware
+{
+
+    const SECURE_TOKENS_KEY = "PYDIO_SECURE_TOKENS";
+
+    /**
+     *
+     * @param ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @return \Psr\Http\Message\ResponseInterface
+     * @param callable|null $next
+     * @throws PydioException
+     */
+    public static function handleRequest(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface $responseInterface, callable $next = null){
+
+        $pluginsUnSecureActions = PluginsService::searchManifestsWithCache("//action[@skipSecureToken]", function($nodes){
+            $res = array();
+            /** @var \DOMElement $node */
+            foreach ($nodes as $node) {
+                $res[] = $node->getAttribute("name");
+            }
+            return $res;
+        });
+
+        $pluginsUnSecureActions[] = "get_secure_token";
+        if (!in_array($requestInterface->getAttribute("action"), $pluginsUnSecureActions) && self::hasSecureToken()) {
+            $params = $requestInterface->getParsedBody();
+            if(array_key_exists("secure_token", $params)){
+                $token = $params["secure_token"];
+            }
+            if ( !isSet($token) || !self::checkSecureToken($token)) {
+                throw new PydioException("You are not allowed to access this resource.");
+            }
+        }
+        return Server::callNextMiddleWare($requestInterface, $responseInterface, $next);
+
+    }
+
+    /**
+     * Put a secure token in the session
+     * @static
+     * @return string
+     */
+    public static function generateSecureToken()
+    {
+        $arr = SessionService::fetch(self::SECURE_TOKENS_KEY) OR [];
+        $newToken = StringHelper::generateRandomString(32);
+        $arr[] = $newToken;
+        SessionService::save(self::SECURE_TOKENS_KEY, $arr);
+        return $newToken;
+    }
+    /**
+     * Get the secure token from the session
+     * @static
+     * @return string|bool
+     */
+    protected static function hasSecureToken()
+    {
+        $arr = SessionService::fetch(self::SECURE_TOKENS_KEY);
+        return ($arr !== null && is_array($arr) && count($arr));
+    }
+    /**
+     * Verify a secure token value from the session
+     * @static
+     * @param string $token
+     * @return bool
+     */
+    public static function checkSecureToken($token)
+    {
+        $arr = SessionService::fetch(self::SECURE_TOKENS_KEY);
+        return ($arr !== null && is_array($arr) && in_array($token, $arr));
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Middleware/SessionMiddleware.php b/core/src/core/src/pydio/Core/Http/Middleware/SessionMiddleware.php
new file mode 100644
index 0000000000..dfd47e6afa
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Middleware/SessionMiddleware.php
@@ -0,0 +1,95 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Middleware;
+
+use Pydio\Core\Http\Server;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\SessionService;
+use Pydio\Core\Services\ApplicationState;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * SessionMiddleware launches a working session
+ * @package Pydio\Core\Http\Middleware
+ */
+class SessionMiddleware
+{
+    /**
+     * @var \Pydio\Enterprise\Session\PydioSessionHandler $sessionHandler
+     */ 
+    private static $sessionHandler;
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @param callable|null $next
+     * @return \Psr\Http\Message\ResponseInterface
+     */
+    public static function handleRequest(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface $responseInterface, callable $next = null){
+
+        $getParams = $requestInterface->getQueryParams();
+        $sessionName = SessionService::getSessionName();
+
+        if (isSet($getParams[PYDIO_SESSION_QUERY_PARAM])) {
+            $cookies = $requestInterface->getCookieParams();
+            if (!isSet($cookies[$sessionName])) {
+                $cookies[$sessionName] = $getParams[PYDIO_SESSION_QUERY_PARAM];
+                $_COOKIE[$sessionName] = $getParams[PYDIO_SESSION_QUERY_PARAM];
+                $requestInterface = $requestInterface->withCookieParams($cookies);
+            }
+        }
+
+        if(defined("AJXP_SESSION_HANDLER_PATH") && defined("AJXP_SESSION_HANDLER_CLASSNAME") && file_exists(AJXP_SESSION_HANDLER_PATH)){
+            require_once(AJXP_SESSION_HANDLER_PATH);
+            if(class_exists(AJXP_SESSION_HANDLER_CLASSNAME, false)){
+                $sessionHandlerClass = AJXP_SESSION_HANDLER_CLASSNAME;
+                /** @var \Pydio\Enterprise\Session\PydioSessionHandler $sessionHandler */
+                $sessionHandler = new $sessionHandlerClass();
+                self::$sessionHandler = $sessionHandler;
+                $sessionHandler->updateContext($requestInterface->getAttribute("ctx"));
+                session_set_save_handler($sessionHandler, false);
+            }
+        }
+        session_name($sessionName);
+        session_start();
+
+        register_shutdown_function(function(){
+            SessionService::close();
+        });
+
+        if(SessionService::has(SessionService::CTX_MINISITE_HASH)){
+            ApplicationState::setStateMinisite(SessionService::fetch(SessionService::CTX_MINISITE_HASH));
+        }
+
+        return Server::callNextMiddleWare($requestInterface, $responseInterface, $next);
+
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     */
+    public static function updateContext($ctx){
+        if(self::$sessionHandler){
+            self::$sessionHandler->updateContext($ctx);
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Middleware/SessionRepositoryMiddleware.php b/core/src/core/src/pydio/Core/Http/Middleware/SessionRepositoryMiddleware.php
new file mode 100644
index 0000000000..445cead22e
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Middleware/SessionRepositoryMiddleware.php
@@ -0,0 +1,174 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Http\Middleware;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Core\Exception\NoActiveWorkspaceException;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Exception\RepositoryLoadException;
+use Pydio\Core\Http\Server;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Model\RepositoryInterface;
+use Pydio\Core\Model\UserInterface;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\RolesService;
+use Pydio\Core\Services\SessionService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class SessionRepositoryMiddleware
+ * @package Pydio\Core\Http\Middleware
+ */
+class SessionRepositoryMiddleware
+{
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @return ResponseInterface
+     * @param callable|null $next
+     * @throws PydioException
+     */
+    public static function handleRequest(ServerRequestInterface $requestInterface, ResponseInterface $responseInterface, callable $next = null) {
+
+        /** @var ContextInterface $ctx */
+        $ctx = $requestInterface->getAttribute("ctx");
+        $repository = null;
+        if($ctx->hasUser()){
+            $loggedUser = $ctx->getUser();
+            try{
+
+                $repository = self::switchUserToRepository($loggedUser, $requestInterface);
+
+            } catch (RepositoryLoadException $r){
+
+                $previous = SessionService::getPreviousRepositoryId();
+                if($previous !== null){
+                    SessionService::saveRepositoryId($previous);
+                }
+                throw $r;
+
+            } catch (NoActiveWorkspaceException $nA) {
+
+                $lock = $loggedUser->getLock();
+                if(!empty($lock)){
+                    return Server::callNextMiddleWare($requestInterface, $responseInterface, $next);
+                }else{
+                    throw $nA;
+                }
+
+            }
+        }
+
+        if($repository !== null){
+            $ctx->setRepositoryObject($repository);
+            $requestInterface = $requestInterface->withAttribute("ctx", $ctx);
+        }
+
+        SessionMiddleware::updateContext($ctx);
+        Logger::updateContext($ctx);
+
+        //Set language
+        if($ctx->hasUser() && $ctx->getUser()->getPref("lang") != "") {
+            LocaleService::setLanguage($ctx->getUser()->getPref("lang"));
+        } else if(isSet($requestInterface->getCookieParams()["AJXP_lang"])) {
+            LocaleService::setLanguage($requestInterface->getCookieParams()["AJXP_lang"]);
+        } else if(SessionService::getLanguage() !== null){
+            LocaleService::setLanguage(SessionService::getLanguage());
+        }
+
+        if(UsersService::usersEnabled()){
+            try{
+                RolesService::bootSequence();
+            }catch (PydioException $e){
+                if($requestInterface->getAttribute("action") == "get_boot_gui"){
+                    $requestInterface = $requestInterface->withAttribute("flash", $e->getMessage());
+                }else{
+                    throw $e;
+                }
+            }
+        }
+
+        return Server::callNextMiddleWare($requestInterface, $responseInterface, $next);
+
+    }
+
+
+    /**
+     * @param UserInterface $user
+     * @param ServerRequestInterface $requestInterface
+     * @return RepositoryInterface
+     * @throws NoActiveWorkspaceException
+     * @throws PydioException
+     * @throws \Pydio\Core\Exception\WorkspaceNotFoundException
+     */
+    public static function switchUserToRepository(UserInterface $user, ServerRequestInterface $requestInterface) {
+
+        $parameters         = $requestInterface->getParsedBody();
+        $restRepositoryId   = isSet($parameters["tmp_repository_id"]) ? $parameters["tmp_repository_id"] : null;
+        $repoObject         = null;
+
+        if($restRepositoryId !== null){
+
+            $repoObject = UsersService::getRepositoryWithPermission($user, $restRepositoryId);
+
+        }else{
+
+            $repoId = SessionService::getSessionRepositoryId();
+            if($repoId !== null){
+                try{
+                    $repoObject = UsersService::getRepositoryWithPermission($user, $repoId);
+                }catch (\Exception $e){
+                    $previous = SessionService::getPreviousRepositoryId();
+                    if($previous !== null){
+                        $repoObject = UsersService::getRepositoryWithPermission($user, $previous);
+                    }
+                }
+            }else{
+                $userRepositories = UsersService::getRepositoriesForUser($user);
+                if(empty($userRepositories)){
+                    throw new NoActiveWorkspaceException();
+                }
+                $default = $user->getMergedRole()->filterParameterValue("core.conf", "DEFAULT_START_REPOSITORY", AJXP_REPO_SCOPE_ALL, -1);
+                $lastVisited = $user->getArrayPref("history", "last_repository");
+                if($default !== -1 && array_key_exists($default, $userRepositories)){
+                    $repoObject = $userRepositories[$default];
+                }else if($lastVisited !== "" && array_key_exists($lastVisited, $userRepositories)){
+                    $repoObject = $userRepositories[$lastVisited];
+                }else{
+                    $repoObject = array_shift($userRepositories);
+                }
+            }
+
+            if($repoObject !== null){
+                SessionService::saveRepositoryId($repoObject->getId());
+                $user->setArrayPref("history", "last_repository", $repoObject->getId());
+            }
+        }
+        
+        return $repoObject;
+
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Response/AsyncResponseStream.php b/core/src/core/src/pydio/Core/Http/Response/AsyncResponseStream.php
new file mode 100644
index 0000000000..cc32340e59
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Response/AsyncResponseStream.php
@@ -0,0 +1,246 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Response;
+
+use Psr\Http\Message\StreamInterface;
+use Zend\Diactoros\Response;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class AsyncResponseStream
+ * Response Stream built with a callable that will be called when the stream is read. 
+ * @package Pydio\Core\Http\Response
+ */
+class AsyncResponseStream implements StreamInterface
+{
+    /**
+     * @var callable
+     */
+    private $callback;
+
+    /**
+     * @var bool
+     */
+    private $callbackExecuted = false;
+
+    /**
+     * AsyncResponseStream constructor.
+     * @param callable $callable
+     */
+    public function __construct($callable){
+        $this->callback = $callable;
+    }
+
+    /**
+     * Reads all data from the stream into a string, from the beginning to end.
+     *
+     * This method MUST attempt to seek to the beginning of the stream before
+     * reading data and read the stream until the end is reached.
+     *
+     * Warning: This could attempt to load a large amount of data into memory.
+     *
+     * This method MUST NOT raise an exception in order to conform with PHP's
+     * string casting operations.
+     *
+     * @see http://php.net/manual/en/language.oop5.magic.php#object.tostring
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->getContents();
+    }
+
+    /**
+     * Closes the stream and any underlying resources.
+     *
+     * @return void
+     */
+    public function close()
+    {
+        $this->callback = null;
+        $this->callbackExecuted = false;
+    }
+
+    /**
+     * Separates any underlying resources from the stream.
+     *
+     * After the stream has been detached, the stream is in an unusable state.
+     *
+     * @return resource|null Underlying PHP stream, if any
+     */
+    public function detach()
+    {
+        return null;
+    }
+
+    /**
+     * Get the size of the stream if known.
+     *
+     * @return int|null Returns the size in bytes if known, or null if unknown.
+     */
+    public function getSize()
+    {
+        // Return a non-null size if there's a pending callback.
+        return (isSet($this->callback) && !$this->callbackExecuted ? 1 : null);
+    }
+
+    /**
+     * Returns the current position of the file read/write pointer
+     *
+     * @return int Position of the file pointer
+     * @throws \RuntimeException on error.
+     */
+    public function tell()
+    {
+        throw new \RuntimeException();
+    }
+
+    /**
+     * Returns true if the stream is at the end of the stream.
+     *
+     * @return bool
+     */
+    public function eof()
+    {
+        return $this->callbackExecuted;
+    }
+
+    /**
+     * Returns whether or not the stream is seekable.
+     *
+     * @return bool
+     */
+    public function isSeekable()
+    {
+        return false;
+    }
+
+    /**
+     * Seek to a position in the stream.
+     *
+     * @link http://www.php.net/manual/en/function.fseek.php
+     * @param int $offset Stream offset
+     * @param int $whence Specifies how the cursor position will be calculated
+     *     based on the seek offset. Valid values are identical to the built-in
+     *     PHP $whence values for `fseek()`.  SEEK_SET: Set position equal to
+     *     offset bytes SEEK_CUR: Set position to current location plus offset
+     *     SEEK_END: Set position to end-of-stream plus offset.
+     * @throws \RuntimeException on failure.
+     */
+    public function seek($offset, $whence = SEEK_SET)
+    {
+        throw new \RuntimeException();
+    }
+
+    /**
+     * Seek to the beginning of the stream.
+     *
+     * If the stream is not seekable, this method will raise an exception;
+     * otherwise, it will perform a seek(0).
+     *
+     * @see seek()
+     * @link http://www.php.net/manual/en/function.fseek.php
+     * @throws \RuntimeException on failure.
+     */
+    public function rewind()
+    {
+        throw new \RuntimeException();
+    }
+
+    /**
+     * Returns whether or not the stream is writable.
+     *
+     * @return bool
+     */
+    public function isWritable()
+    {
+        return false;
+    }
+
+    /**
+     * Write data to the stream.
+     *
+     * @param string $string The string that is to be written.
+     * @return int Returns the number of bytes written to the stream.
+     * @throws \RuntimeException on failure.
+     */
+    public function write($string)
+    {
+        throw new \RuntimeException();
+    }
+
+    /**
+     * Returns whether or not the stream is readable.
+     *
+     * @return bool
+     */
+    public function isReadable()
+    {
+        return true;
+    }
+
+    /**
+     * Read data from the stream.
+     *
+     * @param int $length Read up to $length bytes from the object and return
+     *     them. Fewer than $length bytes may be returned if underlying stream
+     *     call returns fewer bytes.
+     * @return string Returns the data read from the stream, or an empty string
+     *     if no bytes are available.
+     * @throws \RuntimeException if an error occurs.
+     */
+    public function read($length)
+    {
+        call_user_func($this->callback);
+        $this->callbackExecuted = true;
+        return "";
+    }
+
+    /**
+     * Returns the remaining contents in a string
+     *
+     * @return string
+     * @throws \RuntimeException if unable to read or an error occurs while
+     *     reading.
+     */
+    public function getContents()
+    {
+        return $this->read(0);
+    }
+
+    /**
+     * Get stream metadata as an associative array or retrieve a specific key.
+     *
+     * The keys returned are identical to the keys returned from PHP's
+     * stream_get_meta_data() function.
+     *
+     * @link http://php.net/manual/en/function.stream-get-meta-data.php
+     * @param string $key Specific metadata to retrieve.
+     * @return array|mixed|null Returns an associative array if no key is
+     *     provided. Returns a specific key value if a key is provided and the
+     *     value is found, or null if the key is not found.
+     */
+    public function getMetadata($key = null)
+    {
+        return [];
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Response/CLISerializableResponseChunk.php b/core/src/core/src/pydio/Core/Http/Response/CLISerializableResponseChunk.php
new file mode 100644
index 0000000000..a23d0e2a66
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Response/CLISerializableResponseChunk.php
@@ -0,0 +1,39 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Response;
+
+use Symfony\Component\Console\Output\OutputInterface;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Interface CLISerializableResponseChunk
+ * @package Pydio\Core\Http\Response
+ */
+interface CLISerializableResponseChunk extends SerializableResponseChunk
+{
+    /**
+     * @param OutputInterface $output
+     * @return mixed
+     */
+    public function render($output);
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Response/FileReaderResponse.php b/core/src/core/src/pydio/Core/Http/Response/FileReaderResponse.php
new file mode 100644
index 0000000000..c5ee2839e5
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Response/FileReaderResponse.php
@@ -0,0 +1,474 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Http\Response;
+
+use Pydio\Access\Core\MetaStreamWrapper;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Core\Controller\HTMLWriter;
+use Pydio\Core\Services\ApiKeysService;
+use Pydio\Core\Services\AuthService;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\FileHelper;
+use Pydio\Core\Utils\Vars\PathUtils;
+use Pydio\Core\Utils\Vars\StatHelper;
+use Pydio\Core\Utils\TextEncoder;
+use Pydio\Log\Core\Logger;
+use Zend\Diactoros\ServerRequestFactory;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class FileReaderResponse
+ * Async class that can be used as a Body for a ResponseInterface. Will read the file or data
+ * when the reponse is emitted.
+ *
+ * @package Pydio\Core\Http\Response
+ */
+class FileReaderResponse extends AsyncResponseStream
+{
+    /** @var  AJXP_Node */
+    private $node;
+
+    /** @var  string */
+    private $file;
+
+    /** @var string */
+    private $data;
+
+    /** @var  string */
+    private $localName = "";
+
+    /** @var  string */
+    private $headerType = "force-download";
+
+    /** @var  integer */
+    private $offset = -1;
+
+    /** @var  integer */
+    private $length = -1;
+
+    /** @var  callable */
+    private $preRead;
+
+    /** @var  callable */
+    private $postRead;
+
+    /** @var  boolean */
+    private $unlinkAfterRead;
+
+    /**
+     * FileReaderResponse constructor.
+     * @param AJXP_Node|string $nodeOrFile
+     * @param string $data
+     */
+    public function __construct($nodeOrFile = null, $data = null)
+    {
+        $callable = array($this, "readData");
+        if($nodeOrFile instanceof  AJXP_Node){
+            $this->node = $nodeOrFile;
+        }else{
+            $this->file = $nodeOrFile;
+        }
+        if($data !== null){
+            $this->data = $data;
+        }
+        parent::__construct($callable);
+    }
+
+    /**
+     * Simple debug instruction
+     * @param $message
+     * @param array $params
+     */
+    protected function logDebug($message, $params = []){
+        Logger::getInstance()->logDebug("FileReader", $message, $params);
+    }
+
+    /**
+     * Set a possible header type "plain", "image" if it's force attachement.
+     * @param $headerType
+     */
+    public function setHeaderType($headerType){
+        $this->headerType = $headerType;
+    }
+
+    /**
+     * Set the name as it should appear in the download window,
+     * if it's not the file basename
+     * @param $localName
+     */
+    public function setLocalName($localName){
+        $this->localName = $localName;
+    }
+
+    /**
+     * @param integer $offset
+     * @param integer $length
+     */
+    public function setPartial($offset, $length){
+        $this->offset = $offset;
+        $this->length = $length;
+    }
+
+    /**
+     * Callback to be triggered just before reading the file
+     * @param callable $pre
+     */
+    public function setPreReadCallback(callable $pre){
+        $this->preRead = $pre;
+    }
+
+    /**
+     * Callback to be triggered at the end of the file read operation
+     * @param callable $post
+     */
+    public function setPostReadCallback(callable $post){
+        $this->postRead = $post;
+    }
+
+    /**
+     * Set a flag to trigger an unlink after reading the file.
+     */
+    public function setUnlinkAfterRead(){
+        $this->unlinkAfterRead = true;
+    }
+
+    /**
+     * Actually read the data to the output
+     * @throws \Exception
+     */
+    protected function readData(){
+        if($this->preRead){
+            call_user_func($this->preRead);
+        }
+
+        $this->readFile($this->node, $this->file, $this->data, $this->headerType, $this->localName, $this->offset, $this->length);
+
+        if($this->postRead){
+            call_user_func($this->postRead);
+        }
+    }
+
+    /**
+     * @param AJXP_Node|null $node
+     * @param string $filePath
+     * @param string|bool $data
+     * @param string $headerType
+     * @param string $localName
+     * @param int $byteOffset
+     * @param int $byteLength
+     * @throws \Exception
+     */
+    public function readFile($node = null, $filePath = null, $data = null, $headerType="plain", $localName="", $byteOffset=-1, $byteLength=-1)
+    {
+        if($node !== null){
+            $filePathOrData = $node->getUrl();
+        }else{
+            $filePathOrData = $filePath;
+        }
+
+        if(!$data === null && !file_exists($filePathOrData)){
+            throw new \Exception("File $filePathOrData not found!");
+        }
+        $confGzip               = ConfService::getGlobalConf("GZIP_COMPRESSION");
+        $confGzipLimit          = ConfService::getGlobalConf("GZIP_LIMIT");
+        $confUseAccelerator     = ConfService::getGlobalConf("USE_DOWNLOAD_ACCELERATOR");
+        if($this->unlinkAfterRead && $filePathOrData !== null && empty($confUseAccelerator)){
+            register_shutdown_function(function () use ($filePathOrData){
+                FileHelper::silentUnlink($filePathOrData);
+            });
+        }
+
+        $fakeReq = ServerRequestFactory::fromGlobals();
+        $serverParams = $fakeReq->getServerParams();
+
+        if ($node !== null  && !$node->wrapperIsRemote()) {
+            $originalFilePath = $filePathOrData;
+            $filePathOrData = PathUtils::patchPathForBaseDir($filePathOrData);
+        }
+        session_write_close();
+
+        restore_error_handler();
+        restore_exception_handler();
+
+        set_exception_handler('Pydio\Access\Driver\StreamProvider\FS\download_exception_handler');
+        set_error_handler('Pydio\Access\Driver\StreamProvider\FS\download_exception_handler');
+        // required for IE, otherwise Content-disposition is ignored
+        if (ini_get('zlib.output_compression')) {
+            ApplicationState::safeIniSet('zlib.output_compression', 'Off');
+        }
+
+        $isFile = ($data !== null) && !$confGzip;
+        if ($byteLength == -1) {
+            if ($data !== null) {
+                $size = strlen($data);
+            } else if ($node === null) {
+                $size = sprintf("%u", filesize($filePathOrData));
+            } else {
+                $size = filesize($filePathOrData);
+            }
+        } else {
+            $size = $byteLength;
+        }
+        if ($confGzip && ($size > $confGzipLimit || !function_exists("gzencode") || (isSet($serverParams['HTTP_ACCEPT_ENCODING']) && strpos($serverParams['HTTP_ACCEPT_ENCODING'], 'gzip') === FALSE))) {
+            $confGzip = false;
+        }
+
+        $localName = ($localName =="" ? basename((isSet($originalFilePath)?$originalFilePath:$filePathOrData)) : $localName);
+
+        if ($headerType == "plain") {
+
+            header("Content-type:text/plain");
+            header("Content-Length: ".$size);
+
+        } else if ($headerType == "image") {
+
+            header("Content-Type: ". StatHelper::getImageMimeType(basename($filePathOrData)) ."; name=\"".$localName."\"");
+            header("Content-Length: ".$size);
+            header('Cache-Control: public');
+
+        } else {
+
+            if ($isFile) {
+                header("Accept-Ranges: 0-$size");
+                $this->logDebug("Sending accept range 0-$size");
+            }
+
+            // Check if we have a range header (we are resuming a transfer)
+            if ( isset($serverParams['HTTP_RANGE']) && $isFile && $size != 0 ) {
+
+                if ($headerType == "stream_content") {
+
+                    if (extension_loaded('fileinfo')  && (( $node !== null && !$node->wrapperIsRemote()) || $filePath !== null)) {
+                        $fInfo = new \fInfo( FILEINFO_MIME );
+                        if($node !== null){
+                            $realfile = $node->getRealFile();
+                        }else{
+                            $realfile = $filePathOrData;
+                        }
+                        $mimeType = $fInfo->file($realfile);
+                        $splitChar = explode(";", $mimeType);
+                        $mimeType = trim($splitChar[0]);
+                        $this->logDebug("Detected mime $mimeType for $realfile");
+                    } else {
+                        $mimeType = StatHelper::getStreamingMimeType(basename($filePathOrData));
+                    }
+                    header('Content-type: '.$mimeType);
+                }
+                // multiple ranges, which can become pretty complex, so ignore it for now
+                $ranges = explode('=', $_SERVER['HTTP_RANGE']);
+                $offsets = explode('-', $ranges[1]);
+                $offset = floatval($offsets[0]);
+
+                $length = floatval($offsets[1]) - $offset;
+                if (!$length) $length = $size - $offset;
+                if ($length + $offset > $size || $length < 0) $length = $size - $offset;
+                $this->logDebug('Content-Range: bytes ' . $offset . '-' . $length . '/' . $size);
+                header('HTTP/1.1 206 Partial Content');
+                header('Content-Range: bytes ' . $offset . '-' . ($offset + $length) . '/' . $size);
+
+                header("Content-Length: ". $length);
+                $file = fopen($filePathOrData, 'rb');
+                if(!is_resource($file)){
+                    throw new \Exception("Failed opening file ".$filePathOrData);
+                }
+                fseek($file, 0);
+                $relOffset = $offset;
+                while ($relOffset > 2.0E9) {
+                    // seek to the requested offset, this is 0 if it's not a partial content request
+                    fseek($file, 2000000000, SEEK_CUR);
+                    $relOffset -= 2000000000;
+                    // This works because we never overcome the PHP 32 bit limit
+                }
+                fseek($file, $relOffset, SEEK_CUR);
+
+                while(ob_get_level()) ob_end_flush();
+                $readSize = 0.0;
+                $bufferSize = 1024 * 8;
+                while (!feof($file) && $readSize < $length && connection_status() == 0) {
+                    $this->logDebug("dl reading $readSize to $length", ["httpRange" => $serverParams["HTTP_RANGE"]]);
+                    echo fread($file, $bufferSize);
+                    $readSize += $bufferSize;
+                    flush();
+                }
+
+                fclose($file);
+                return;
+
+            } else {
+
+                if ($confGzip) {
+
+                    $gzippedData = ($data?gzencode($filePathOrData,9):gzencode(file_get_contents($filePathOrData), 9));
+                    $size = strlen($gzippedData);
+
+                }
+
+                HTMLWriter::emitAttachmentsHeaders($localName, $size, $isFile, $confGzip);
+
+                if ($confGzip && isSet($gzippedData)) {
+                    print $gzippedData;
+                    return;
+                }
+            }
+        }
+
+        if ($data !== null) {
+
+            print($data);
+
+        } else {
+
+            if ( !empty($confUseAccelerator)){
+                $requestSent = $this->sendToAccelerator($confUseAccelerator, ($node !== null ? $node : $filePath), $serverParams);
+                if($requestSent){
+                    return;
+                }
+            }
+
+            $stream = fopen("php://output", "a");
+
+            if ($node == null) {
+
+                $this->logDebug("realFS!", array("file"=>$filePathOrData));
+                $fp = fopen($filePathOrData, "rb");
+                if(!is_resource($fp)){
+                    throw new \Exception("Failed opening file ".$filePathOrData);
+                }
+                if ($byteOffset != -1) {
+                    fseek($fp, $byteOffset);
+                }
+                $sentSize = 0;
+                $readChunk = 4096;
+                while (!feof($fp)) {
+                    if ( $byteLength != -1 &&  ($sentSize + $readChunk) >= $byteLength) {
+                        // compute last chunk and break after
+                        $readChunk = $byteLength - $sentSize;
+                        $break = true;
+                    }
+                    $data = fread($fp, $readChunk);
+                    $dataSize = strlen($data);
+                    fwrite($stream, $data, $dataSize);
+                    $sentSize += $dataSize;
+                    if (isSet($break)) {
+                        break;
+                    }
+                }
+                fclose($fp);
+            } else {
+
+                MetaStreamWrapper::copyFileInStream($filePathOrData, $stream);
+
+            }
+            fflush($stream);
+            fclose($stream);
+
+        }
+    }
+
+    /**
+     * @param string $accelConfiguration
+     * @param string|AJXP_Node $localPathOrNode
+     * @param array $serverParams
+     * @return bool Wether headers were sent and we should interrupt DL now or not.
+     */
+    protected function sendToAccelerator($accelConfiguration, $localPathOrNode, $serverParams){
+
+        $remoteNode = false;
+        if($localPathOrNode instanceof AJXP_Node) {
+            $filePathOrData = $localPathOrNode->getRealFile();
+            $remoteNode = $localPathOrNode->wrapperIsRemote();
+        }else{
+            $filePathOrData = $localPathOrNode;
+        }
+
+        // TRY XSendFile for local FS nodes or local file
+        if (!$remoteNode && $accelConfiguration === "xsendfile") {
+
+            $filePathOrData = str_replace("\\", "/", $filePathOrData);
+            $server_name = $serverParams["SERVER_SOFTWARE"];
+            $regex = '/^(lighttpd\/1.4).([0-9]{2}$|[0-9]{3}$|[0-9]{4}$)+/';
+            if(preg_match($regex, $server_name))
+                $header_sendfile = "X-LIGHTTPD-send-file";
+            else
+                $header_sendfile = "X-Sendfile";
+
+
+            header($header_sendfile.": ".TextEncoder::toUTF8($filePathOrData));
+            header("Content-type: application/octet-stream");
+            header('Content-Disposition: attachment; filename="' . basename($filePathOrData) . '"');
+            return true;
+
+        }
+
+        // TRY XAccelRedirect for local FS nodes or local file
+        if (!$remoteNode && $accelConfiguration === "xaccelredirect" && array_key_exists("HTTP_X_ACCEL_MAPPING", $serverParams)) {
+
+            $filePathOrData = str_replace("\\", "/", $filePathOrData);
+            $filePathOrData = TextEncoder::toUTF8($filePathOrData);
+            $mapping = explode('=',$serverParams['X-Accel-Mapping']);
+            $replacecount = 0;
+            $accelfile = str_replace($mapping[0],$mapping[1],$filePathOrData,$replacecount);
+            if ($replacecount == 1) {
+                header("X-Accel-Redirect: $accelfile");
+                header("Content-type: application/octet-stream");
+                header('Content-Disposition: attachment; filename="' . basename($accelfile) . '"');
+                return true;
+            } else {
+                $this->logDebug("X-Accel-Redirect: Problem with X-Accel-Mapping for file $filePathOrData");
+                return false;
+            }
+
+        }
+
+        // Pydio Agent acceleration - We make sure that request was really proxied by Agent, by checking a specific header.
+        if($accelConfiguration === "pydio" && array_key_exists("HTTP_X_PYDIO_DOWNLOAD_SUPPORTED", $serverParams)
+            && ApiKeysService::requestHasValidHeadersForAdminTask($serverParams, PYDIO_BOOSTER_TASK_IDENTIFIER)) {
+            
+            if ($localPathOrNode instanceof AJXP_Node) {
+                $options = MetaStreamWrapper::getResolvedOptionsForNode($localPathOrNode);
+                if($options["TYPE"] === "php"){
+                    // Not implemented
+                    return false;
+                }
+                $path = $localPathOrNode->getPath();
+            }else{
+                $options = ["TYPE" => "local"];
+                $path = $localPathOrNode;
+            }
+            $data = [
+                "OPTIONS"   => $options,
+                "PATH"      => $path
+            ];
+            if($this->unlinkAfterRead){
+                $data["UNLINK_AFTER_READ"] = true;
+            }
+            header("X-Pydio-Download-Redirect: ".json_encode($data));
+            header("Content-type: application/octet-stream");
+            header('Content-Disposition: attachment; filename="' . basename($path) . '"');
+            return true;
+        }
+
+        return false;
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Response/JSONSerializableResponseChunk.php b/core/src/core/src/pydio/Core/Http/Response/JSONSerializableResponseChunk.php
new file mode 100644
index 0000000000..b82c007415
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Response/JSONSerializableResponseChunk.php
@@ -0,0 +1,43 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Response;
+
+
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Interface JSONSerializableResponseChunk
+ * Piece of response that can be serialized into JSON. Must return a "key" and additional data to be serialized.
+ * @package Pydio\Core\Http\Response
+ */
+interface JSONSerializableResponseChunk extends SerializableResponseChunk
+{
+    /**
+     * @return mixed
+     */
+    public function jsonSerializableData();
+
+    /**
+     * @return string
+     */
+    public function jsonSerializableKey();
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Response/SerializableResponseChunk.php b/core/src/core/src/pydio/Core/Http/Response/SerializableResponseChunk.php
new file mode 100644
index 0000000000..88b40b519c
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Response/SerializableResponseChunk.php
@@ -0,0 +1,33 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Response;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Interface SerializableResponseChunk
+ * Generic piece of response that can be serialized.
+ * @package Pydio\Core\Http\Response
+ */
+interface SerializableResponseChunk
+{
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Response/SerializableResponseStream.php b/core/src/core/src/pydio/Core/Http/Response/SerializableResponseStream.php
new file mode 100644
index 0000000000..70c0ac468d
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Response/SerializableResponseStream.php
@@ -0,0 +1,398 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Response;
+
+
+use Psr\Http\Message\StreamInterface;
+use Pydio\Core\Utils\Vars\XMLFilter;
+use Pydio\Core\Http\Message\UserMessage;
+use Pydio\Core\Utils\XMLHelper;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class SerializableResponseStream
+ * Transport stream for various data types that can be serialized to various formats
+ * @package Pydio\Core\Http\Response
+ */
+class SerializableResponseStream implements StreamInterface
+{
+    const SERIALIZER_TYPE_XML = 'xml';
+    const SERIALIZER_TYPE_JSON = 'json';
+    const SERIALIZER_TYPE_CLI = 'cli';
+
+    /**
+     * @var string
+     */
+    protected $serializer = self::SERIALIZER_TYPE_XML;
+
+    /**
+     * @var array Additional context variable depending on serializer
+     */
+    protected $serializerContext;
+    /**
+     * @var SerializableResponseChunk[]
+     */
+    protected $data = [];
+    /**
+     * @var string SerializedContent
+     */
+    protected $serializedContent;
+
+    private $streamStatus = 'open';
+
+    /**
+     * SerializableResponseStream constructor.
+     * @param SerializableResponseChunk[]|SerializableResponseChunk $chunks
+     */
+    public function __construct($chunks = [])
+    {
+        if(is_object($chunks) && $chunks instanceof SerializableResponseChunk){
+            $chunks = [$chunks];
+        }
+        if(count($chunks)){
+            $this->data = $chunks;
+        }
+    }
+
+    /**
+     * @param string $serializer SERIALIZER_TYPE_XML|SERIALIZER_TYPE_JSON|SERIALIZER_TYPE_CLI
+     * @param array $context Additional data for serializer
+     */
+    public function setSerializer($serializer, $context = null){
+        $this->serializer = $serializer;
+        if($context !== null){
+            $this->serializerContext = $context;
+        }
+    }
+
+    /**
+     * Test if at least one chunk of data can be serialized using this format
+     * @param $serializer
+     * @return bool
+     */
+    public function supportsSerializer($serializer){
+        // We can always JSON serialize output
+        if($serializer === self::SERIALIZER_TYPE_JSON){
+            return true;
+        }
+        foreach($this->data as $chunk){
+            if($serializer === self::SERIALIZER_TYPE_XML && $chunk instanceof XMLSerializableResponseChunk){
+                return true;
+            }else if($serializer === self::SERIALIZER_TYPE_CLI && $chunk instanceof CLISerializableResponseChunk){
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @param SerializableResponseChunk $chunk
+     */
+    public function addChunk($chunk){
+        array_push($this->data, $chunk);
+    }
+
+    /**
+     * @return SerializableResponseChunk[]
+     */
+    public function getChunks(){
+        return $this->data;
+    }
+
+    /**
+     * @return string
+     */
+    public function getContents()
+    {
+        if(isSet($this->serializedContent)){
+            return $this->serializedContent;
+        }
+        return $this->serializeData($this->data, $this->serializer);
+    }
+
+
+    /**
+     * @param SerializableResponseChunk[] $data
+     * @param string $serializer
+     * @return string
+     * @throws \RuntimeException
+     */
+    protected function serializeData($data, $serializer){
+
+        if($serializer === self::SERIALIZER_TYPE_JSON){
+            $buffer = [];
+            foreach ($data as $serializableItem){
+                if($serializableItem instanceof JSONSerializableResponseChunk){
+                    $key = $serializableItem->jsonSerializableKey();
+                    if($key != null){
+                        $buffer[$key] = $serializableItem->jsonSerializableData();
+                    }else{
+                        $buffer[] = $serializableItem->jsonSerializableData();
+                    }
+                }else{
+                    $buffer[] = $serializableItem;
+                }
+            }
+            $pretty = 0;
+            if(isSet($this->serializerContext) && isSet($this->serializerContext["pretty"]) && $this->serializerContext["pretty"] === true){
+                $pretty = JSON_PRETTY_PRINT;
+            }
+            if(count($buffer) == 1) {
+                $json = json_encode(array_shift($buffer), $pretty);
+            }else {
+                $json = json_encode($buffer, $pretty);
+            }
+            if($json === null){
+                $msg = json_last_error_msg();
+                $error = json_last_error();
+                $message = new UserMessage($msg. " ($error)", LOG_LEVEL_ERROR);
+                return json_encode($message->jsonSerializableData(), $pretty);
+            }else{
+                return $json;
+            }
+        }else if($serializer === self::SERIALIZER_TYPE_XML){
+            $wrap = true;
+            $buffer = "";
+            $charset = null;
+            /** @var XMLDocSerializableResponseChunk[] $xmlDocs */
+            $xmlDocs = array_filter($data, function($serial){
+                return $serial instanceof XMLDocSerializableResponseChunk;
+            });
+            if(count($xmlDocs)){
+                $buffer = $xmlDocs[0]->toXML();
+                $charset = $xmlDocs[0]->getCharset();
+                $wrap = false;
+            }else{
+                foreach ($data as $serializableItem){
+                    if(!$serializableItem instanceof XMLSerializableResponseChunk){
+                        continue;
+                    }
+                    $buffer .= $serializableItem->toXML();
+                }
+            }
+
+            if($wrap){
+                $output = XMLHelper::wrapDocument($buffer);
+            }else{
+                if(substr($buffer, 0, 5) !== "<?xml"){
+                    $buffer = "<?xml version=\"1.0\" encoding=\"".$charset."\"?>".$buffer;
+                }
+                $output = $buffer;
+            }
+            if(isSet($this->serializerContext) && isSet($this->serializerContext["pretty"]) && $this->serializerContext["pretty"] === true){
+                // Rewrite Doc with pretty printing
+                $doc = new \DOMDocument("1.0", $charset);
+                $doc->loadXML($output);
+                $doc->preserveWhiteSpace = false;
+                $doc->formatOutput = true;
+                $output = $doc->saveXML();
+            }
+            return $output;
+
+        }else if($serializer === self::SERIALIZER_TYPE_CLI){
+            $buffer = "";
+            $output = $this->serializerContext["output"];
+            foreach($data as $serializableItem){
+                if($serializableItem instanceof CLISerializableResponseChunk){
+                    $buffer .= $serializableItem->render($output);
+                }else{
+                    // Default to JSON
+                    $buffer .= json_encode($serializableItem);
+                }
+            }
+
+        }
+        return "";
+    }
+
+    /**
+     * Reads all data from the stream into a string, from the beginning to end.
+     *
+     * This method MUST attempt to seek to the beginning of the stream before
+     * reading data and read the stream until the end is reached.
+     *
+     * Warning: This could attempt to load a large amount of data into memory.
+     *
+     * This method MUST NOT raise an exception in order to conform with PHP's
+     * string casting operations.
+     *
+     * @see http://php.net/manual/en/language.oop5.magic.php#object.tostring
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->getContents();
+    }
+
+    /**
+     * Closes the stream and any underlying resources.
+     *
+     * @return void
+     */
+    public function close()
+    {
+        $this->streamStatus = 'closed';
+    }
+
+    /**
+     * Separates any underlying resources from the stream.
+     *
+     * After the stream has been detached, the stream is in an unusable state.
+     *
+     * @return resource|null Underlying PHP stream, if any
+     */
+    public function detach()
+    {
+        return null;
+    }
+
+    /**
+     * Get the size of the stream if known.
+     *
+     * @return int|null Returns the size in bytes if known, or null if unknown.
+     */
+    public function getSize()
+    {
+        if(!empty($this->data)){
+            $this->serializedContent = $this->getContents();
+            return strlen($this->serializedContent);
+        }else{
+            return 0;
+        }
+    }
+
+    /**
+     * Returns the current position of the file read/write pointer
+     *
+     * @return int Position of the file pointer
+     * @throws \RuntimeException on error.
+     */
+    public function tell()
+    {
+        return -1;
+    }
+
+    /**
+     * Returns true if the stream is at the end of the stream.
+     *
+     * @return bool
+     */
+    public function eof()
+    {
+        return false;
+    }
+
+    /**
+     * Returns whether or not the stream is seekable.
+     *
+     * @return bool
+     */
+    public function isSeekable()
+    {
+        return false;
+    }
+
+    /**
+     * Seek to a position in the stream.
+     *
+     * @link http://www.php.net/manual/en/function.fseek.php
+     * @param int $offset Stream offset
+     * @param int $whence Specifies how the cursor position will be calculated
+     *     based on the seek offset. Valid values are identical to the built-in
+     *     PHP $whence values for `fseek()`.  SEEK_SET: Set position equal to
+     *     offset bytes SEEK_CUR: Set position to current location plus offset
+     *     SEEK_END: Set position to end-of-stream plus offset.
+     * @throws \RuntimeException on failure.
+     */
+    public function seek($offset, $whence = SEEK_SET){}
+
+    /**
+     * Seek to the beginning of the stream.
+     *
+     * If the stream is not seekable, this method will raise an exception;
+     * otherwise, it will perform a seek(0).
+     *
+     * @see seek()
+     * @link http://www.php.net/manual/en/function.fseek.php
+     * @throws \RuntimeException on failure.
+     */
+    public function rewind(){}
+
+    /**
+     * Returns whether or not the stream is writable.
+     *
+     * @return bool
+     */
+    public function isWritable(){
+        return true;
+    }
+
+    /**
+     * Write data to the stream.
+     *
+     * @param string $string The string that is to be written.
+     * @return int Returns the number of bytes written to the stream.
+     * @throws \RuntimeException on failure.
+     */
+    public function write($string){
+        return strlen($string);
+    }
+
+    /**
+     * Returns whether or not the stream is readable.
+     *
+     * @return bool
+     */
+    public function isReadable(){
+        return true;
+    }
+
+    /**
+     * Read data from the stream.
+     *
+     * @param int $length Read up to $length bytes from the object and return
+     *     them. Fewer than $length bytes may be returned if underlying stream
+     *     call returns fewer bytes.
+     * @return string Returns the data read from the stream, or an empty string
+     *     if no bytes are available.
+     * @throws \RuntimeException if an error occurs.
+     */
+    public function read($length){
+        return '';
+    }
+
+    /**
+     * Get stream metadata as an associative array or retrieve a specific key.
+     *
+     * The keys returned are identical to the keys returned from PHP's
+     * stream_get_meta_data() function.
+     *
+     * @link http://php.net/manual/en/function.stream-get-meta-data.php
+     * @param string $key Specific metadata to retrieve.
+     * @return array|mixed|null Returns an associative array if no key is
+     *     provided. Returns a specific key value if a key is provided and the
+     *     value is found, or null if the key is not found.
+     */
+    public function getMetadata($key = null){
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Response/XMLDocSerializableResponseChunk.php b/core/src/core/src/pydio/Core/Http/Response/XMLDocSerializableResponseChunk.php
new file mode 100644
index 0000000000..2c1f652d8d
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Response/XMLDocSerializableResponseChunk.php
@@ -0,0 +1,37 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Response;
+
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Interface XMLDocSerializableResponseChunk
+ * Piece of response that will be serialized as a whole XML document
+ * @package Pydio\Core\Http\Response
+ */
+interface XMLDocSerializableResponseChunk extends XMLSerializableResponseChunk
+{
+    /**
+     * @return string
+     */
+    public function getCharset();
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Response/XMLSerializableResponseChunk.php b/core/src/core/src/pydio/Core/Http/Response/XMLSerializableResponseChunk.php
new file mode 100644
index 0000000000..1911182ee2
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Response/XMLSerializableResponseChunk.php
@@ -0,0 +1,36 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Response;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Interface XMLSerializableResponseChunk
+ * Piece of response serialized as XML.
+ * @package Pydio\Core\Http\Response
+ */
+interface XMLSerializableResponseChunk extends SerializableResponseChunk
+{
+    /**
+     * @return string
+     */
+    public function toXML();
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Rest/ApiRouter.php b/core/src/core/src/pydio/Core/Http/Rest/ApiRouter.php
new file mode 100644
index 0000000000..41bbf255b4
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Rest/ApiRouter.php
@@ -0,0 +1,183 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Rest;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class ApiRouter
+ * Router used for REST API v1 and REST API v2.
+ * Based on fast-route, creates route for api/v1 using XML declaration, and routes for api/v2 using
+ * swagger file.
+ * @package Pydio\Core\Http\Rest
+ */
+class ApiRouter
+{
+    /**
+     * @var array
+     */
+    private $base;
+    /**
+     * @var array
+     *       "cacheOptions"  => ["cacheFile" => "path", "cacheDisabled" => true],
+     */
+    private $cacheOptions;
+
+    private $v2Base = "/v2";
+    private $v1Base = "";
+
+    /**
+     * ApiRouter constructor.
+     * @param string $base
+     * @param array $cacheOptions
+     */
+    public function __construct($base, $cacheOptions = []){
+        $this->base = $base;
+        $this->cacheOptions = array_merge([
+            "cacheDisabled" => AJXP_SKIP_CACHE,
+            "cacheFile" => AJXP_DATA_PATH."/cache/plugins_api2routes.php"
+        ], $cacheOptions);
+    }
+
+
+    /**
+     * @param \FastRoute\RouteCollector $r
+     */
+    public function configureRoutes(\FastRoute\RouteCollector &$r){
+        
+        $configObject = json_decode(file_get_contents(AJXP_INSTALL_PATH . "/" . AJXP_DOCS_FOLDER . "/api2.json"), true);
+        foreach ($configObject["paths"] as $path => $methods){
+            foreach($methods as $method => $apiData){
+                if(preg_match('/\{path\}/', $path)){
+                    if(isset($apiData["parameters"]["0"]['$ref']) &&  preg_match('/Optional$/', $apiData["parameters"]["0"]['$ref'])){
+                        $path = str_replace("{path}", "{path:.*}", $path);
+                    }else{
+                        $path = str_replace("{path}", "{path:.+}", $path);
+                    }
+                }
+                $path = str_replace("{roleId}", "{roleId:.+}", $path);
+                $r->addRoute(strtoupper($method), $this->base . $this->v2Base . $path , $apiData);
+            }
+        }
+        // Legacy V1 API
+        $r->addRoute("GET", $this->base . $this->v1Base."/{repository_id}/{action}[{optional:.+}]", ["api-v1" => true]);
+        $r->addRoute("POST", $this->base . $this->v1Base."/{repository_id}/{action}[{optional:.+}]", ["api-v1" => true]);
+
+    }
+
+    /**
+     * Get Path component of the URI, without query parameters
+     * @param ServerRequestInterface $request
+     * @return string
+     */
+    public function getURIForRequest(ServerRequestInterface $request){
+
+        $uri = $request->getServerParams()['REQUEST_URI'];
+        // Strip query string (?foo=bar) and decode URI
+        if (false !== $pos = strpos($uri, '?')) {
+            $uri = substr($uri, 0, $pos);
+        }
+        return rawurldecode($uri);
+    }
+
+    /**
+     * Find a route in api definitions
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @return bool
+     */
+    public function route(ServerRequestInterface &$request, ResponseInterface &$response){
+
+        $dispatcher = \FastRoute\cachedDispatcher(function(\FastRoute\RouteCollector $r) {
+
+            $this->configureRoutes($r);
+
+        }, $this->cacheOptions);
+
+        $httpMethod = $request->getServerParams()['REQUEST_METHOD'];
+        $uri = $this->getURIForRequest($request);
+        $routeInfo = $dispatcher->dispatch($httpMethod, $uri);
+
+        switch ($routeInfo[0]) {
+            case \FastRoute\Dispatcher::NOT_FOUND:
+                //$response = $response->withStatus(404);
+                break;
+            case \FastRoute\Dispatcher::METHOD_NOT_ALLOWED:
+                //$allowedMethods = $routeInfo[1];
+                //$response = $response->withStatus(405);
+                break;
+            case \FastRoute\Dispatcher::FOUND:
+                $apiData = $routeInfo[1];
+                $vars = $routeInfo[2];
+                if(isSet($apiData["api-v1"])){
+                    $apiUri = preg_replace('/^'.preg_quote($this->base.$this->v1Base, '/').'/', '', $uri);
+                    $request = $request
+                        ->withAttribute("action", $vars["action"])
+                        ->withAttribute("repository_id", $vars["repository_id"])
+                        ->withAttribute("rest_base", $this->base.$this->v1Base)
+                        ->withAttribute("rest_path", $vars["optional"])
+                        ->withAttribute("api", "v1")
+                        ->withAttribute("api_uri", $apiUri)
+                    ;
+                }else{
+                    $apiUri = preg_replace('/^'.preg_quote($this->base.$this->v2Base, '/').'/', '', $uri);
+                    $request = $request->withAttribute("api_uri", $apiUri);
+                    $repoId = $this->findRepositoryInParameters($request, $vars);
+                    $request = $request
+                        ->withAttribute("action", $apiData["x-pydio-action"])
+                        ->withAttribute("repository_id", $repoId)
+                        ->withAttribute("rest_base", $this->base.$this->v2Base)
+                        ->withAttribute("api", "v2")
+                        ->withParsedBody(array_merge($request->getParsedBody(), $vars));
+                }
+                return true;
+            default:
+                break;
+        }
+
+        return false;
+    }
+
+    /**
+     * Analyze URI and parameters to guess the current workspace
+     *
+     * @param ServerRequestInterface $request
+     * @param array $pathVars
+     * @return mixed|string
+     */
+    protected function findRepositoryInParameters(ServerRequestInterface $request, array $pathVars){
+        $params = array_merge($request->getParsedBody(), $pathVars);
+        if (preg_match('/^\/admin\//', $request->getAttribute("api_uri"))) {
+            return "ajxp_conf";
+        }else if(isSet($params["workspaceId"])){
+            return $params["workspaceId"];
+        }else if(isSet($params["path"]) && strpos($params["path"], "/") !== false){
+            return array_shift(explode("/", ltrim($params["path"], "/")));
+        }
+        // If no repo ID was found, return default repo id "pydio".
+        return "pydio";
+    }
+
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Rest/RestApiMiddleware.php b/core/src/core/src/pydio/Core/Http/Rest/RestApiMiddleware.php
new file mode 100644
index 0000000000..dca05374d6
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Rest/RestApiMiddleware.php
@@ -0,0 +1,62 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Rest;
+
+use \Psr\Http\Message\ServerRequestInterface;
+use \Psr\Http\Message\ResponseInterface;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Http\Middleware\SapiMiddleware;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class RestApiMiddleware
+ * Main middleware for routing REST API.
+ * @package Pydio\Core\Http\Rest
+ */
+class RestApiMiddleware extends SapiMiddleware
+{
+    protected $base;
+
+    /**
+     * RestApiMiddleware constructor.
+     * @param string $base
+     */
+    public function __construct($base)
+    {
+        $this->base = $base;
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @throws PydioException
+     */
+    protected function parseRequestRouteAndParams(ServerRequestInterface &$request, ResponseInterface &$response){
+
+        $router = new ApiRouter($this->base);
+        if(!$router->route($request, $response)){
+            throw new PydioException("Could not find any endpoint for this URI");
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Rest/RestApiServer.php b/core/src/core/src/pydio/Core/Http/Rest/RestApiServer.php
new file mode 100644
index 0000000000..e82b91da09
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Rest/RestApiServer.php
@@ -0,0 +1,54 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Core\Http\Rest;
+
+use Pydio\Core\Http\Server;
+use Pydio\Core\Services\ApplicationState;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class RestApiServer
+ * REST API listener
+ * @package Pydio\Core\Http\Rest
+ */
+class RestApiServer extends Server
+{
+    /**
+     * RestApiServer constructor.
+     * @param $base
+     * @param array $requestAttributes
+     */
+    public function __construct($base, $requestAttributes = [])
+    {
+        parent::__construct($base, $requestAttributes);
+        ApplicationState::setSapiRestBase($base);
+    }
+
+    protected function stackMiddleWares()
+    {
+        $this->middleWares->push(array("Pydio\\Core\\Controller\\Controller", "registryActionMiddleware"));
+        $this->middleWares->push(array("Pydio\\Core\\Http\\Rest\\RestAuthMiddleware", "handleRequest"));
+        $this->topMiddleware = new RestApiMiddleware($this->base);
+        $this->middleWares->push(array($this->topMiddleware, "handleRequest"));
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Rest/RestAuthMiddleware.php b/core/src/core/src/pydio/Core/Http/Rest/RestAuthMiddleware.php
new file mode 100644
index 0000000000..5bea7b877a
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Rest/RestAuthMiddleware.php
@@ -0,0 +1,107 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Rest;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Auth\Frontend\Core\FrontendsLoader;
+use Pydio\Core\Exception\NoActiveWorkspaceException;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Exception\WorkspaceForbiddenException;
+
+use Pydio\Core\Http\Server;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\ConfService;
+
+use Pydio\Core\Services\RolesService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Authentication middleware used in Rest context
+ * @package Pydio\Core\Http\Rest
+ */
+class RestAuthMiddleware
+{
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @return \Psr\Http\Message\ResponseInterface
+     * @param callable|null $next
+     * @throws PydioException
+     */
+    public static function handleRequest(ServerRequestInterface $requestInterface, ResponseInterface $responseInterface, callable $next = null){
+
+        $driverImpl = ConfService::getAuthDriverImpl();
+        PluginsService::getInstance(Context::emptyContext())->setPluginUniqueActiveForType("auth", $driverImpl->getName(), $driverImpl);
+
+        $response = FrontendsLoader::frontendsAsAuthMiddlewares($requestInterface, $responseInterface);
+        if($response != null){
+            return $response;
+        }
+        /** @var ContextInterface $ctx */
+        $ctx = $requestInterface->getAttribute("ctx");
+
+        if(!$ctx->hasUser()){
+            $responseInterface = $responseInterface->withStatus(401);
+            $responseInterface->getBody()->write('You are not authorized to access this API.');
+            return $responseInterface;
+        }
+
+        $repoID = $requestInterface->getAttribute("repository_id");
+        if($repoID == 'pydio'){
+            $userRepositories = UsersService::getRepositoriesForUser($ctx->getUser());
+            if(empty($userRepositories)){
+                throw new NoActiveWorkspaceException();
+            }
+            $repo = array_shift($userRepositories);
+        }else{
+            try{
+                $repo = UsersService::getRepositoryWithPermission($ctx->getUser(), $repoID);
+            }catch (WorkspaceForbiddenException $w){
+                $responseInterface = $responseInterface->withStatus(401);
+                $responseInterface->getBody()->write('You are not authorized to access this API.');
+                return $responseInterface;
+            }
+        }
+
+        $ctx->setRepositoryObject($repo);
+        $requestInterface = $requestInterface->withAttribute("ctx", $ctx);
+
+        Logger::updateContext($ctx);
+
+        if(UsersService::usersEnabled() && ApplicationState::detectApplicationFirstRun()){
+            RolesService::bootSequence();
+        }
+
+        return Server::callNextMiddleWare($requestInterface, $responseInterface, $next);
+
+    }
+
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Server.php b/core/src/core/src/pydio/Core/Http/Server.php
new file mode 100644
index 0000000000..1ea80a894e
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Server.php
@@ -0,0 +1,279 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Core\Exception\PydioException;
+
+use Pydio\Core\Http\Message\UserMessage;
+use Pydio\Core\Http\Middleware\ITopLevelMiddleware;
+use Pydio\Core\Http\Middleware\SapiMiddleware;
+use Pydio\Core\Http\Response\SerializableResponseChunk;
+use Pydio\Core\Http\Response\SerializableResponseStream;
+use Pydio\Core\Model\Context;
+use Pydio\Log\Core\Logger;
+use Zend\Diactoros\Response;
+use Zend\Diactoros\ServerRequestFactory;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Pydio HTTP Server
+ * @package Pydio\Core\Http
+ */
+class Server
+{
+    /**
+     * @var ServerRequestInterface
+     */
+    protected $request;
+
+    /**
+     * @var \SplStack
+     */
+    protected $middleWares;
+
+    /**
+     * @var ITopLevelMiddleware
+     */
+    protected $topMiddleware;
+
+    /**
+     * @var string
+     */
+    protected $base;
+
+    /**
+     * @var \SplStack
+     */
+    protected static $middleWareInstance;
+
+    /**
+     * @var array Additional attributes will be added to the initial Request object
+     */
+    private $requestAttributes;
+
+    /**
+     * Server constructor.
+     * @param $base
+     * @param $requestAttributes
+     */
+    public function __construct($base, $requestAttributes = []){
+
+        $this->middleWares = new \SplStack();
+        $this->middleWares->setIteratorMode(\SplDoublyLinkedList::IT_MODE_LIFO | \SplDoublyLinkedList::IT_MODE_KEEP);
+
+        $this->base = $base;
+
+        $this->stackMiddleWares();
+
+        self::$middleWareInstance = &$this->middleWares;
+
+        $this->requestAttributes = $requestAttributes;
+    }
+
+    protected function stackMiddleWares(){
+
+        $this->middleWares->push(array("Pydio\\Core\\Controller\\Controller", "registryActionMiddleware"));
+        $this->middleWares->push(array("Pydio\\Core\\Http\\Middleware\\SessionRepositoryMiddleware", "handleRequest"));
+        $this->middleWares->push(array("Pydio\\Core\\Http\\Middleware\\AuthMiddleware", "handleRequest"));
+        $this->middleWares->push(array("Pydio\\Core\\Http\\Middleware\\SecureTokenMiddleware", "handleRequest"));
+        $this->middleWares->push(array("Pydio\\Core\\Http\\Middleware\\SessionMiddleware", "handleRequest"));
+
+        $topMiddleware = new SapiMiddleware();
+        $this->topMiddleware = $topMiddleware;
+        $this->middleWares->push(array($topMiddleware, "handleRequest"));
+
+    }
+
+    public function registerCatchAll(){
+        if (is_file(TESTS_RESULT_FILE) || is_file(TESTS_RESULT_FILE_LEGACY)) {
+            set_error_handler(array($this, "catchError"), E_ALL & ~E_NOTICE & ~E_STRICT );
+            set_exception_handler(array($this, "catchException"));
+        }
+    }
+
+    /**
+     * @return ServerRequestInterface
+     */
+    public function getRequest(){
+        if(!isSet($this->request)){
+            $this->request = $this->initServerRequest();
+        }
+        return $this->request;
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     */
+    public function updateRequest(ServerRequestInterface $request){
+        $this->request = $request;
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @return ResponseInterface
+     */
+    protected function nextCallable(&$request, &$response){
+        if($this->middleWares->valid()){
+            $callable = $this->middleWares->current();
+            $this->middleWares->next();
+            $response = call_user_func_array($callable, array($request, $response, function($req, $res){
+                return $this->nextCallable($req, $res);
+            }));
+        }
+        return $response;
+    }
+
+    
+
+    /**
+     * To be used by middlewares
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @param callable|null $next
+     * @return ResponseInterface
+     */
+    public static function callNextMiddleWare(ServerRequestInterface $requestInterface, ResponseInterface $responseInterface, callable $next = null){
+        if($next !== null){
+            $responseInterface = call_user_func_array($next, array($requestInterface, $responseInterface));
+        }
+        return $responseInterface;
+    }
+
+    /**
+     * @param callable $comparisonFunction
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @param callable|null $next
+     * @return ResponseInterface
+     */
+    public static function callNextMiddleWareAndRewind(callable $comparisonFunction, ServerRequestInterface $requestInterface, ResponseInterface $responseInterface, callable $next = null){
+        if($next !== null){
+            $responseInterface = call_user_func_array($next, array($requestInterface, $responseInterface));
+        }
+        self::$middleWareInstance->rewind();
+        while(!$comparisonFunction(self::$middleWareInstance->current())){
+            self::$middleWareInstance->next();
+        }
+        self::$middleWareInstance->next();
+        return $responseInterface;
+    }
+
+    /**
+     * @param callable $middleWareCallable
+     */
+    public function addMiddleware(callable $middleWareCallable){
+        $this->middleWares->push($middleWareCallable);
+        self::$middleWareInstance = $this->middleWares;
+    }
+
+    public function listen(){
+
+        $response = new Response();
+        $this->middleWares->rewind();
+        $this->nextCallable($this->getRequest(), $response);
+
+    }
+
+    /**
+     * @param bool $rest
+     * @return ServerRequestInterface
+     */
+    protected function initServerRequest($rest = false){
+
+        $request = ServerRequestFactory::fromGlobals();
+        $request = $request->withAttribute("ctx", Context::emptyContext());
+        if(!empty($this->requestAttributes) && count($this->requestAttributes)){
+            foreach($this->requestAttributes as $attName => $attValue){
+                $request = $request->withAttribute($attName, $attValue);
+            }
+        }
+        return $request;
+
+    }
+
+    /**
+     * Error Catcher for PHP errors. Depending on the SERVER_DEBUG config
+     * shows the file/line info or not.
+     * @static
+     * @param $code
+     * @param $message
+     * @param $fichier
+     * @param $ligne
+     * @param $context
+     */
+    public function catchError($code, $message, $fichier, $ligne, $context)
+    {
+        if(error_reporting() == 0) {
+            return ;
+        }
+        Logger::error(basename($fichier), "error l.$ligne", array("message" => $message));
+        if(AJXP_SERVER_DEBUG){
+            if($context instanceof  \Exception){
+                $message .= $context->getTraceAsString();
+            }else{
+                $message .= PydioException::buildDebugBackTrace();
+            }
+        }
+        $req = $this->getRequest();
+        $resp = new Response();
+        $x = new SerializableResponseStream();
+        if($code > 100 && $code < 599){
+            $resp = $resp->withStatus($code);
+        }
+        $resp = $resp->withBody($x);
+        $x->addChunk(new UserMessage($message, LOG_LEVEL_ERROR));
+        $this->topMiddleware->emitResponse($req, $resp);
+        
+    }
+
+    /**
+     * Catch exceptions, @see catchError
+     * @param \Exception $exception
+     */
+    public function catchException($exception)
+    {
+        if($exception instanceof SerializableResponseChunk){
+
+            $req = $this->getRequest();
+            $resp = new Response();
+            $x = new SerializableResponseStream();
+            $resp = $resp->withBody($x);
+            $x->addChunk($exception);
+            $this->topMiddleware->emitResponse($req, $resp);
+            return;
+        }
+
+        try {
+            $this->catchError($exception->getCode(), $exception->getMessage(), $exception->getFile(), $exception->getLine(), $exception);
+        } catch (\Exception $innerEx) {
+            error_log(get_class($innerEx)." thrown within the exception handler!");
+            error_log("Original exception was: ".$innerEx->getMessage()." in ".$innerEx->getFile()." on line ".$innerEx->getLine());
+            error_log("New exception is: ".$innerEx->getMessage()." in ".$innerEx->getFile()." on line ".$innerEx->getLine()." ".$innerEx->getTraceAsString());
+            print("Error");
+        }
+    }
+
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/SimpleRestResourceRouter.php b/core/src/core/src/pydio/Core/Http/SimpleRestResourceRouter.php
new file mode 100644
index 0000000000..1975160ed4
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/SimpleRestResourceRouter.php
@@ -0,0 +1,254 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class SimpleRestResourceRouter
+ * FastRoute encapsuler that can be used to make a simple CRUD Rest API on an existing 
+ * route of the application.
+ * @package Pydio\Core\Http
+ */
+class SimpleRestResourceRouter
+{
+    /**
+     * @var array
+     *      ["resourceName" => "name",
+     *       "parameterName" => "object_id"
+     *       "crudCallbacks" => ["CREATE" => methodName,
+     *                            "RETRIEVE_MANY"=> methodName,
+     *                            "RETRIEVE_ONE"=> methodName,
+     *                            "UPDATE" => methodName,
+     *                            "DELETE" => methodName],
+     *       "linkedResources" => [NESTED CONFIG ARRAY]
+     *       "additionalRoutes" => [[method=>"GET", uri=>"/path/to/route", callable]]
+     *      ]
+     */
+    private $config;
+    /**
+     * @var array
+     *       "cacheOptions"  => ["cacheFile" => "path", "cacheDisabled" => true],
+     */
+    private $cacheOptions;
+    /**
+     * @var object Will be used as '$this' for triggering the callbacks
+     */
+    private $callbacksContext;
+
+    private $base = "/api/{repository_id}";
+
+    /**
+     * SimpleRestResourceRouter constructor.
+     * @param object $callbacksContext
+     * @param array $config
+     * @param array $cacheOptions
+     */
+    public function __construct($callbacksContext, $config, $cacheOptions){
+        $this->config = $config;
+        $this->cacheOptions = $cacheOptions;
+        $this->callbacksContext = $callbacksContext;
+    }
+
+    /**
+     * @param $method
+     * @param $uri
+     * @param $callable
+     */
+    public function addRoute($method, $uri, $callable){
+        $this->config["additional_routes"][] = ["method" => $method, "uri" => $uri, "callable" => $callable];
+    }
+
+    /**
+     * @param array $configObject
+     * @param \FastRoute\RouteCollector $r
+     */
+    public function configureRoutes($base, $configObject, \FastRoute\RouteCollector &$r){
+
+        $parameterName = $configObject["parameterName"];
+        $resName = $configObject["resourceName"];
+        $callbacks = $configObject["crudCallbacks"];
+        if(isSet($callbacks["RETRIEVE_MANY"])){
+            $r->addRoute('GET', $base."/".$resName, ['simpleHandler', $callbacks["RETRIEVE_MANY"]]);
+        }
+        if(isset($callbacks["RETRIEVE_ONE"])){
+            $r->addRoute('GET', $base."/".$resName.'/{'.$parameterName.'}', ['simpleHandler', $callbacks["RETRIEVE_ONE"]]);
+        }
+        if(isSet($callbacks["CREATE"])){
+            $r->addRoute('POST', $base."/".$resName, ['bodyHandler', $callbacks["CREATE"]]);
+        }
+        if(isSet($callbacks["UPDATE"])){
+            $r->addRoute('PUT', $base."/".$resName.'/{'.$parameterName.'}', ['bodyHandler', $callbacks["UPDATE"]]);
+            $r->addRoute('PATCH', $base."/".$resName.'/{'.$parameterName.'}', ['bodyHandler', $callbacks["UPDATE"]]);
+        }
+        if(isSet($callbacks["DELETE"])){
+            $r->addRoute('DELETE', $base."/".$resName.'/{'.$parameterName.'}', ['simpleHandler', $callbacks["DELETE"]]);
+        }
+
+        if(is_array($configObject["additionalRoutes"])){
+            foreach ($configObject["additionalRoutes"] as $additional_route){
+                if(in_array($additional_route["method"], ["GET", "DELETE", "HEAD"])){
+                    $r->addRoute($additional_route["method"], $base.$additional_route["route"], ['simpleHandler', $additional_route["callback"]]);
+                }else if(in_array($additional_route["method"], ["POST", "PUT", "PATCH"])){
+                    $r->addRoute($additional_route["method"], $base.$additional_route["route"], ['bodyHandler', $additional_route["callback"]]);
+                }
+            }
+        }
+
+        if(is_array($configObject["linkedResources"])){
+            foreach ($configObject["linkedResources"] as $linkedResource){
+                $this->configureRoutes($base."/".$resName."/{".$parameterName."}", $linkedResource, $r);
+            }
+        }
+
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     * @return string
+     */
+    public function getURIForRequest(ServerRequestInterface $request){
+
+        $uri = $request->getServerParams()['REQUEST_URI'];
+        // Strip query string (?foo=bar) and decode URI
+        if (false !== $pos = strpos($uri, '?')) {
+            $uri = substr($uri, 0, $pos);
+        }
+        return rawurldecode($uri);
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @return bool
+     */
+    public function route(ServerRequestInterface &$request, ResponseInterface &$response){
+
+        $dispatcher = \FastRoute\cachedDispatcher(function(\FastRoute\RouteCollector $r) {
+
+            $this->configureRoutes($this->base, $this->config, $r);
+
+        }, $this->cacheOptions);
+
+        $httpMethod = $request->getServerParams()['REQUEST_METHOD'];
+        $uri = $this->getURIForRequest($request);
+        $routeInfo = $dispatcher->dispatch($httpMethod, $uri);
+
+        switch ($routeInfo[0]) {
+            case \FastRoute\Dispatcher::NOT_FOUND:
+                //$response = $response->withStatus(404);
+                break;
+            case \FastRoute\Dispatcher::METHOD_NOT_ALLOWED:
+                //$allowedMethods = $routeInfo[1];
+                //$response = $response->withStatus(405);
+                break;
+            case \FastRoute\Dispatcher::FOUND:
+                $handler = $routeInfo[1][0];
+                $callback = $routeInfo[1][1];
+                $vars = $routeInfo[2];
+
+                $request = $request->withParsedBody(array_merge($request->getParsedBody(), $vars));
+                $this->$handler($callback, $request, $response);
+                return true;
+            default:
+                break;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param callable $callback
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     */
+    protected function simpleHandler($callback, ServerRequestInterface &$requestInterface, ResponseInterface &$responseInterface){
+
+        $data = $this->callbacksContext->$callback($requestInterface, $responseInterface);
+
+        $responseInterface = $responseInterface->withHeader("Content-type", "application/json");
+        $responseInterface->getBody()->write(json_encode($data));
+    }
+
+    /**
+     * @param callable $callback
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     */
+    protected function bodyHandler($callback, ServerRequestInterface &$request, ResponseInterface &$response){
+
+        $postedObject = json_decode($request->getBody()->getContents());
+        $request = $request->withParsedBody(array_merge($request->getParsedBody(), ["postedObject" => $postedObject]));
+        $data = $this->callbacksContext->$callback($request, $response);
+
+        $response = $response->withHeader("Content-Type", "application/json");
+        $response->getBody()->write(json_encode($data));
+
+    }
+
+
+    /**
+     * Class casting
+     *
+     * @param string|object $destination
+     * @param object $sourceObject
+     * @return mixed
+     */
+    public static function cast($destination, $sourceObject)
+    {
+        if (is_string($destination)) {
+            $destination = new $destination();
+        }
+        $destinationReflection = new \ReflectionObject($destination);
+        if(is_object($sourceObject)){
+            $sourceReflection = new \ReflectionObject($sourceObject);
+            $sourceProperties = $sourceReflection->getProperties();
+            foreach ($sourceProperties as $sourceProperty) {
+                $sourceProperty->setAccessible(true);
+                $name = $sourceProperty->getName();
+                $value = $sourceProperty->getValue($sourceObject);
+                if ($destinationReflection->hasProperty($name)) {
+                    $propDest = $destinationReflection->getProperty($name);
+                    $propDest->setAccessible(true);
+                    $propDest->setValue($destination,$value);
+                } else {
+                    $destination->$name = $value;
+                }
+            }
+        }else{
+            foreach($sourceObject as $name => $value){
+                if ($destinationReflection->hasProperty($name)) {
+                    $propDest = $destinationReflection->getProperty($name);
+                    $propDest->setAccessible(true);
+                    $propDest->setValue($destination,$value);
+                } else {
+                    $destination->$name = $value;
+                }
+            }
+        }
+        return $destination;
+    }
+
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/TopLevelRouter.php b/core/src/core/src/pydio/Core/Http/TopLevelRouter.php
new file mode 100644
index 0000000000..880843f490
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/TopLevelRouter.php
@@ -0,0 +1,136 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http;
+
+use FastRoute\Dispatcher;
+use FastRoute\RouteCollector;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Core\Exception\PydioException;
+
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Utils\Vars\PathUtils;
+use Zend\Diactoros\ServerRequestFactory;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class TopLevelRouter
+ * Creates a simple router for top level segments. Will replace the RewriteRules and others.
+ *
+ * @package Pydio\Core\Http
+ */
+class TopLevelRouter
+{
+    /**
+     * @var array
+     *       "cacheOptions"  => ["cacheFile" => "path", "cacheDisabled" => true],
+     */
+    private $cacheOptions;
+
+    private $base = "";
+
+    const ROUTE_CACHE_FILENAME = "plugins_toplevel_routes.php";
+
+    /**
+     * TopLevelRouter constructor.
+     * @param array $cacheOptions
+     */
+    public function __construct($cacheOptions = []){
+        $this->cacheOptions = array_merge([
+            "cacheDisabled" => AJXP_SKIP_CACHE,
+            "cacheFile" => AJXP_CACHE_DIR."/".TopLevelRouter::ROUTE_CACHE_FILENAME
+        ], $cacheOptions);
+    }
+
+
+    /**
+     * @param string $base Base URI (empty string if "/").
+     * @param \FastRoute\RouteCollector $r
+     */
+    public function configureRoutes($base, RouteCollector &$r){
+        
+        $allMethods = ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'TRACE', 'OPTIONS', 'CONNECT', 'PATCH', 'PROPFIND', 'PROPPATCH', 'MKCOL', 'COPY', 'MOVE', 'LOCK', 'UNLOCK'];
+        $file = AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/core.ajaxplorer/routes.json";
+        $textContent = file_get_contents($file);
+        $textContent = str_replace("%PUBLIC_BASEURI%", ConfService::getGlobalConf("PUBLIC_BASEURI"), $textContent);
+        $textContent = str_replace("%WEBDAV_BASEURI%", ConfService::getGlobalConf("WEBDAV_BASEURI"), $textContent);
+        $routes = json_decode($textContent, true);
+        foreach ($routes as $short => $data){
+            $methods = $data["methods"] == "*" ? $allMethods : $data["methods"];
+            foreach($data["routes"] as $route){
+                $data["short"] = $short;
+                $r->addRoute($methods, $this->base.$route, $data);
+            }
+        }
+
+    }
+
+    /**
+     * Simple parser to get URI
+     * @param ServerRequestInterface $request
+     * @return string
+     */
+    public function getURIForRequest(ServerRequestInterface $request){
+
+        $uri = $request->getServerParams()['REQUEST_URI'];
+        // Strip query string (?foo=bar) and decode URI
+        if (false !== $pos = strpos($uri, '?')) {
+            $uri = substr($uri, 0, $pos);
+        }
+        return rawurldecode($uri);
+    }
+
+    /**
+     * @throws PydioException
+     */
+    public function route(){
+
+        $request = ServerRequestFactory::fromGlobals();
+        $this->base = rtrim(PathUtils::forwardSlashDirname($request->getServerParams()["SCRIPT_NAME"]), "/");
+
+        $dispatcher = \FastRoute\cachedDispatcher(function(RouteCollector $r) {
+            $this->configureRoutes($this->base, $r);
+        }, $this->cacheOptions);
+
+        $httpMethod = $request->getServerParams()['REQUEST_METHOD'];
+        $uri = $this->getURIForRequest($request);
+        $routeInfo = $dispatcher->dispatch($httpMethod, $uri);
+
+        switch ($routeInfo[0]) {
+            case Dispatcher::FOUND:
+                $data = $routeInfo[1];
+                if(isSet($data["path"])){
+                    require_once (AJXP_INSTALL_PATH."/".$data["path"]);
+                }
+                call_user_func(array($data["class"], $data["method"]), $this->base, $data["short"], $routeInfo[2]);
+                break;
+            case Dispatcher::NOT_FOUND:
+            default:
+                //throw new PydioException("Oups, could not find any valid route for ".$uri.", method was was ".$httpMethod);
+                header("HTTP/1.0 404 Not Found");
+                echo file_get_contents(AJXP_INSTALL_PATH . "/plugins/gui.ajax/res/html/404.html");
+                die();
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Wopi/AuthFrontend.php b/core/src/core/src/pydio/Core/Http/Wopi/AuthFrontend.php
new file mode 100644
index 0000000000..401ea95d23
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Wopi/AuthFrontend.php
@@ -0,0 +1,162 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <http://pyd.io/>.
+ */
+namespace Pydio\Core\Http\Wopi;
+
+use JWT;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\ApiKeysService;
+use Pydio\Auth\Frontend\Core\AbstractAuthFrontend;
+use Pydio\Conf\Sql\SqlConfDriver;
+use Pydio\Log\Core\Logger;
+use Zend\Diactoros\UploadedFile;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class Pydio\Core\Http\Wopi\WopiJWTAuthFrontend;
+ */
+class AuthFrontend extends AbstractAuthFrontend
+{
+    const NOT_FOUND = "";
+
+    /**
+     * @var SqlConfDriver $storage
+     */
+    var $storage;
+
+    /**
+     * @param $httpVars
+     * @param $varName
+     * @return string
+     */
+    function detectVar(&$httpVars, $varName)
+    {
+        if (isSet($httpVars[$varName])) return $httpVars[$varName];
+        if (isSet($_SERVER["HTTP_PYDIO_" . strtoupper($varName)])) return $_SERVER["HTTP_" . strtoupper($varName)];
+        return "";
+    }
+
+    function retrieveParams(ServerRequestInterface &$request, ResponseInterface &$response) {
+
+        /** @var ContextInterface $context */
+        $action = $request->getAttribute("action");
+
+        $httpVars = $request->getParsedBody();
+
+        $jwt = $this->detectVar($httpVars, "access_token");
+        if (empty($jwt)) {
+            return false;
+        }
+
+        // We have an access token - decode
+        $payload = JWT::decode($jwt);
+
+        $httpVars["auth_token"] = $payload->token;
+        $httpVars["auth_hash"] = $payload->hash;
+
+        // NOT GREAT - WE REMOVE /contents from the uri to ensure that the auth_hash works fine
+        $uri = $request->getUri();
+        $path = str_replace("/contents", "", $uri->getPath());
+        $uri = $uri->withPath($path);
+
+        $_SERVER["REQUEST_URI"] = $uri->getPath() . '?' . $uri->getQuery();
+
+        // Handle upload case
+        if ($action == "upload") {
+            $stream = $request->getBody();
+
+            $size = (int)$request->getHeader("Content-Length")[0];
+
+            $uploadedFile = new UploadedFile(
+                $stream,
+                $size,
+                0,
+                basename($path)
+            );
+
+            $request = $request->withUploadedFiles(["userfile_0" => $uploadedFile]);
+        }
+
+        $request = $request
+            ->withUri($uri)
+            ->withParsedBody($httpVars);
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @param bool $isLast
+     * @return bool
+     */
+    function tryToLogUser(ServerRequestInterface &$request, ResponseInterface &$response, $isLast = false) {
+
+        // This plugin is depending on other authfront having found the current user
+        /** @var ContextInterface $context */
+        $context = $request->getAttribute("ctx");
+        if (!$context->hasUser()) {
+            return false;
+        }
+
+        $currentUser = $context->getUser();
+
+        $httpVars = $request->getParsedBody();
+        $jwt = $this->detectVar($httpVars, "access_token");
+        if (empty($jwt)) {
+            return false;
+        }
+
+        // We have an access token - decode
+        $payload = JWT::decode($jwt);
+
+        if (!isset($payload->token) || !isset($payload->task)) {
+            return false;
+        }
+
+        // We have a token - retrieve private signature
+        $token = $payload->token;
+        $task = $payload->task;
+
+        $key = ApiKeysService::findPairForAdminTask($task, $currentUser->getId());
+
+        if ($key["t"] !== $token) {
+            return false;
+        }
+
+        $signature = $key["p"];
+
+        if ($signature == self::NOT_FOUND) {
+            return false;
+        }
+
+        // We have a signature - verify the payload
+        try {
+            JWT::decode($jwt, $signature, ['HS256']);
+        } catch (\Exception $e) {
+            return false;
+        }
+
+        // We're through
+        return true;
+    }
+} 
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Wopi/AuthMiddleware.php b/core/src/core/src/pydio/Core/Http/Wopi/AuthMiddleware.php
new file mode 100644
index 0000000000..d3ed121eed
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Wopi/AuthMiddleware.php
@@ -0,0 +1,116 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Wopi;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Auth\Frontend\Core\FrontendsLoader;
+use Pydio\Core\Exception\NoActiveWorkspaceException;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Exception\WorkspaceForbiddenException;
+
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\ConfService;
+
+use Pydio\Core\Services\RolesService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Authentication middleware used in Rest context
+ * @package Pydio\Core\Http\Rest
+ */
+class AuthMiddleware
+{
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @return \Psr\Http\Message\ResponseInterface
+     * @param callable|null $next
+     * @throws PydioException
+     */
+    public static function handleRequest(ServerRequestInterface $requestInterface, ResponseInterface $responseInterface, callable $next = null){
+
+        $driverImpl = ConfService::getAuthDriverImpl();
+        PluginsService::getInstance(Context::emptyContext())->setPluginUniqueActiveForType("auth", $driverImpl->getName(), $driverImpl);
+
+        $jwtFrontend = new AuthFrontend("jwt-auth-frontend", "");
+        $jwtFrontend->retrieveParams($requestInterface, $responseInterface);
+
+        $response = FrontendsLoader::frontendsAsAuthMiddlewares($requestInterface, $responseInterface);
+        if($response != null) {
+            return $response;
+        }
+
+        $response = $jwtFrontend->tryToLogUser($requestInterface, $responseInterface);
+        if(!$response != null) {
+            $responseInterface = $responseInterface->withStatus(401);
+            $responseInterface->getBody()->write('You are not authorized to access this API.');
+            return $responseInterface;
+        }
+        
+        /** @var ContextInterface $ctx */
+        $ctx = $requestInterface->getAttribute("ctx");
+
+        if(!$ctx->hasUser()){
+            $responseInterface = $responseInterface->withStatus(401);
+            $responseInterface->getBody()->write('You are not authorized to access this API.');
+            return $responseInterface;
+        }
+
+        $repoID = $requestInterface->getAttribute("repository_id");
+        if($repoID == 'pydio'){
+            $userRepositories = UsersService::getRepositoriesForUser($ctx->getUser());
+            if(empty($userRepositories)){
+                throw new NoActiveWorkspaceException();
+            }
+            $repo = array_shift($userRepositories);
+        }else{
+            try{
+                $repo = UsersService::getRepositoryWithPermission($ctx->getUser(), $repoID);
+            }catch (WorkspaceForbiddenException $w){
+                $responseInterface = $responseInterface->withStatus(401);
+                $responseInterface->getBody()->write('You are not authorized to access this API.');
+                return $responseInterface;
+            }
+        }
+
+        $ctx->setRepositoryObject($repo);
+        $requestInterface = $requestInterface->withAttribute("ctx", $ctx);
+
+        Logger::updateContext($ctx);
+
+        if(UsersService::usersEnabled() && ApplicationState::detectApplicationFirstRun()){
+            RolesService::bootSequence();
+        }
+
+        return Server::callNextMiddleWare($requestInterface, $responseInterface, $next);
+    }
+
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Wopi/Middleware.php b/core/src/core/src/pydio/Core/Http/Wopi/Middleware.php
new file mode 100644
index 0000000000..2944244bc8
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Wopi/Middleware.php
@@ -0,0 +1,133 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Wopi;
+
+use \Psr\Http\Message\ServerRequestInterface;
+use \Psr\Http\Message\ResponseInterface;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\NodesList;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Exception\RouteNotFoundException;
+use Pydio\Core\Http\Message\Message;
+use Pydio\Core\Http\Middleware\SapiMiddleware;
+use Pydio\Core\Http\Response\SerializableResponseStream;
+use Zend\Diactoros\Response\SapiEmitter;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class RestWopiMiddleware
+ * Specific middleware to handle Wopi actions
+ * @package Pydio\Core\Http\Wopi
+ */
+class Middleware extends SapiMiddleware
+{
+    protected $base;
+
+    /**
+     * RestWopiMiddleware constructor.
+     * @param $base
+     */
+    public function __construct($base)
+    {
+        $this->base = $base;
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @throws PydioException
+     */
+    protected function parseRequestRouteAndParams(ServerRequestInterface &$request, ResponseInterface &$response){
+
+        $router = new Router($this->base);
+        if(!$router->route($request, $response)) {
+            throw new RouteNotFoundException();
+        }
+    }
+
+    /**
+     * Output the response to the browser, if no headers were already sent.
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @return void
+     */
+    public function emitResponse(ServerRequestInterface $request, ResponseInterface $response) {
+
+        if($response !== false && $response->getBody() && $response->getBody() instanceof SerializableResponseStream){
+
+            /**
+             * @var SerializableResponseStream $body;
+             */
+            $status = &$response->getStatusCode();
+
+            // Modifying the results
+            if ($status == 200) {
+                $body = &$response->getBody();
+
+                /** @var NodesList $originalData */
+                $originalData = $body->getChunks()[0];
+
+                /** @var AJXP_Node $node */
+                $node = $originalData->getChildren()[0];
+
+                // We modify the result to have the correct format required by the api
+                $x = new SerializableResponseStream();
+                $meta = $node->getNodeInfoMeta();
+                $userId = $node->getUser()->getId();
+                $data = [
+                    "BaseFileName" => $node->getLabel(),
+                    "OwnerId" => $userId,
+                    "Size" => $meta["bytesize"],
+                    "UserId" => $userId,
+                    "Version" => "" . $meta["ajxp_modiftime"]
+                ];
+
+                $x->addChunk(new Message($data));
+                $response = $response->withBody($x);
+
+            }
+
+            $body = &$response->getBody();
+
+            $params = $request->getParsedBody();
+            $forceXML = false;
+
+            if(isSet($params["format"]) && $params["format"] == "xml"){
+                $forceXML = true;
+            }
+
+            if(($request->hasHeader("Accept") && $request->getHeader("Accept")[0] == "text/xml" ) || $forceXML){
+                $body->setSerializer(SerializableResponseStream::SERIALIZER_TYPE_XML);
+                $response = $response->withHeader("Content-type", "text/xml; charset=UTF-8");
+            } else {
+                $body->setSerializer(SerializableResponseStream::SERIALIZER_TYPE_JSON);
+                $response = $response->withHeader("Content-type", "application/json; charset=UTF-8");
+            }
+        }
+
+        if($response !== false && ($response->getBody()->getSize() || $response instanceof EmptyResponse) || $response->getStatusCode() != 200) {
+            $emitter = new SapiEmitter();
+            $emitter->emit($response);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Wopi/Router.php b/core/src/core/src/pydio/Core/Http/Wopi/Router.php
new file mode 100644
index 0000000000..c343ed8394
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Wopi/Router.php
@@ -0,0 +1,170 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Http\Wopi;
+
+use FastRoute\Dispatcher;
+use FastRoute\RouteCollector;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class WopiRouter
+ * Simple router for /wopi/ endpoints
+ * @package Pydio\Core\Http\Wopi
+ */
+class Router
+{
+    /**
+     * @var array
+     */
+    private $base;
+
+    /**
+     * @var array
+     *       "cacheOptions"  => ["cacheFile" => "path", "cacheDisabled" => true],
+     */
+    private $cacheOptions;
+
+    /**
+     * ApiRouter constructor.
+     * @param string $base
+     * @param array $cacheOptions
+     */
+    public function __construct($base, $cacheOptions = []){
+        $this->base = $base;
+        $this->cacheOptions = array_merge([
+            "cacheDisabled" => AJXP_SKIP_CACHE,
+            "cacheFile" => AJXP_DATA_PATH."/cache/plugins_wopiroutes.php"
+        ], $cacheOptions);
+    }
+
+
+    /**
+     * @param RouteCollector $r
+     */
+    public function configureRoutes(RouteCollector &$r){
+        
+        $configObject = json_decode(file_get_contents(AJXP_INSTALL_PATH . "/" . AJXP_DOCS_FOLDER . "/wopi.json"), true);
+
+        foreach ($configObject["paths"] as $path => $methods){
+            foreach($methods as $method => $apiData){
+                if(preg_match('/\{path\}/', $path)){
+                    if(isset($apiData["parameters"]["0"]['$ref']) &&  preg_match('/Optional$/', $apiData["parameters"]["0"]['$ref'])){
+                        $path = str_replace("{path}", "{path:.*}", $path);
+                    }else{
+                        $path = str_replace("{path}", "{path:.+}", $path);
+                    }
+                }
+                $path = str_replace("{roleId}", "{roleId:.+}", $path);
+                $r->addRoute(strtoupper($method), $this->base . $path , $apiData);
+            }
+        }
+    }
+
+    /**
+     * Get Path component of the URI, without query parameters
+     * @param ServerRequestInterface $request
+     * @return string
+     */
+    public function getURIForRequest(ServerRequestInterface $request){
+
+        $uri = $request->getServerParams()['REQUEST_URI'];
+        // Strip query string (?foo=bar) and decode URI
+        if (false !== $pos = strpos($uri, '?')) {
+            $uri = substr($uri, 0, $pos);
+        }
+        return rawurldecode($uri);
+    }
+
+    /**
+     * Find a route in api definitions
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @return bool
+     */
+    public function route(ServerRequestInterface &$request, ResponseInterface &$response){
+
+        $dispatcher = \FastRoute\cachedDispatcher(function(RouteCollector $r) {
+
+            $this->configureRoutes($r);
+
+        }, $this->cacheOptions);
+
+        $httpMethod = $request->getServerParams()['REQUEST_METHOD'];
+        $uri = $this->getURIForRequest($request);
+        $routeInfo = $dispatcher->dispatch($httpMethod, $uri);
+
+        switch ($routeInfo[0]) {
+            case Dispatcher::NOT_FOUND:
+                $response = $response->withStatus(404);
+                break;
+            case Dispatcher::METHOD_NOT_ALLOWED:
+                //$allowedMethods = $routeInfo[1];
+                //$response = $response->withStatus(405);
+                break;
+            case Dispatcher::FOUND:
+                $apiData = $routeInfo[1];
+                $vars = $routeInfo[2];
+
+                $apiUri = preg_replace('/^'.preg_quote($this->base, '/').'/', '', $uri);
+
+                $request = $request->withAttribute("api_uri", $apiUri);
+                $repoId = $this->findRepositoryInParameters($request, $vars);
+
+                $request = $request
+                    ->withAttribute("action", $apiData["x-pydio-action"])
+                    ->withAttribute("repository_id", $repoId)
+                    ->withAttribute("rest_base", $this->base)
+                    ->withAttribute("api", "v2") // We want the same behaviour as for the v2 api
+                    ->withParsedBody(array_merge($request->getParsedBody(), $vars));
+
+                return true;
+            default:
+                break;
+        }
+
+        return false;
+    }
+
+    /**
+     * Analyze URI and parameters to guess the current workspace
+     *
+     * @param ServerRequestInterface $request
+     * @param array $pathVars
+     * @return mixed|string
+     */
+    protected function findRepositoryInParameters(ServerRequestInterface $request, array $pathVars){
+        $params = array_merge($request->getParsedBody(), $pathVars);
+        if (preg_match('/^\/admin\//', $request->getAttribute("api_uri"))) {
+            return "ajxp_conf";
+        }else if(isSet($params["workspaceId"])){
+            return $params["workspaceId"];
+        }else if(isSet($params["path"]) && strpos($params["path"], "/") !== false){
+            return array_shift(explode("/", ltrim($params["path"], "/")));
+        }
+        // If no repo ID was found, return default repo id "pydio".
+        return "pydio";
+    }
+
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Http/Wopi/Server.php b/core/src/core/src/pydio/Core/Http/Wopi/Server.php
new file mode 100644
index 0000000000..98dbb05824
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Http/Wopi/Server.php
@@ -0,0 +1,54 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Core\Http\Wopi;
+
+use Pydio\Core\Http\Server as HttpServer;
+use Pydio\Core\Services\ApplicationState;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class RestWopiServer
+ * Dedicated server for Wopi implementation (must start with /wopi).
+ * @package Pydio\Core\Http\Wopi
+ */
+class Server extends HttpServer
+{
+    /**
+     * RestWopiServer constructor.
+     * @param $base
+     * @param array $additionalAttributes
+     */
+    public function __construct($base, $additionalAttributes = [])
+    {
+        parent::__construct($base, $additionalAttributes);
+        ApplicationState::setSapiRestBase($base);
+    }
+
+    protected function stackMiddleWares()
+    {
+        $this->middleWares->push(array("Pydio\\Core\\Controller\\Controller", "registryActionMiddleware"));
+        $this->middleWares->push(array("Pydio\\Core\\Http\\Wopi\\AuthMiddleware", "handleRequest"));
+        $this->topMiddleware = new Middleware($this->base);
+        $this->middleWares->push(array($this->topMiddleware, "handleRequest"));
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Model/Context.php b/core/src/core/src/pydio/Core/Model/Context.php
new file mode 100644
index 0000000000..ff5f28a575
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Model/Context.php
@@ -0,0 +1,247 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Model;
+
+
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Services\UsersService;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class Context
+ * Main implementation of ContextInterface, propagating a user and a repository all along the application
+ * @package Pydio\Core\Model
+ */
+class Context implements ContextInterface
+{
+
+    /**
+     * @var string
+     */
+    private $userId;
+
+    /**
+     * @var
+     */
+    private $userObject;
+
+    /**
+     * @var
+     */
+    private $repositoryId;
+
+    /**
+     * @var
+     */
+    private $repositoryObject;
+
+    /**
+     * Context constructor.
+     * @param string $userId
+     * @param string $repositoryId
+     */
+    public function __construct($userId = null, $repositoryId = null)
+    {
+        if($userId !== null) {
+            $this->userId = $userId;
+        }
+        if($repositoryId !== null){
+            $this->repositoryId = $repositoryId;
+        }
+    }
+
+    /**
+     * @param $userObject
+     * @param $repositoryObject
+     * @return Context
+     */
+    public static function contextWithObjects($userObject, $repositoryObject){
+        $ctx = new Context();
+        $ctx->setUserObject($userObject);
+        $ctx->setRepositoryObject($repositoryObject);
+        return $ctx;
+    }
+
+    /**
+     * @return Context
+     */
+    public static function emptyContext(){
+        return new Context();
+    }
+
+    /**
+     * @param $userId
+     * @return ContextInterface
+     */
+    public function withUserId($userId){
+        return new Context($userId, $this->repositoryId);
+    }
+
+    /**
+     * @param $repositoryId
+     * @return ContextInterface
+     */
+    public function withRepositoryId($repositoryId){
+        return new Context($this->userId, $repositoryId);
+    }
+
+
+    /**
+     * @return boolean
+     */
+    public function hasUser()
+    {
+        return !empty($this->userId);
+    }
+
+    /**
+     * @return UserInterface|null
+     */
+    public function getUser()
+    {
+        if(isSet($this->userObject)){
+            return $this->userObject;
+        }
+        if(isSet($this->userId)){
+            $this->userObject = UsersService::getUserById($this->userId, false);
+            return $this->userObject;
+        }
+        return null;
+    }
+
+    /**
+     * @param string $userId
+     */
+    public function setUserId($userId)
+    {
+        $this->userId = $userId;
+    }
+
+    /**
+     * @param UserInterface $user
+     */
+    public function setUserObject($user)
+    {
+        $this->userObject = $user;
+        if($user !== null){
+            $this->userId = $user->getId();
+        }
+    }
+
+    /**
+     * Set userId and userObject to null
+     */
+    public function resetUser(){
+        $this->userId = null;
+        $this->userObject = null;
+    }
+
+    /**
+     * Builds pydio://user@repository url
+     * @return string
+     */
+    public function getUrlBase()
+    {
+        $uId = $this->hasUser() ? $this->getUser()->getId() : null;
+        return "pydio://".$uId."@".$this->getRepositoryId();
+    }
+
+    /**
+     * @return boolean
+     */
+    public function hasRepository()
+    {
+        return ($this->repositoryId !== null);
+    }
+
+    /**
+     * @return RepositoryInterface|null
+     */
+    public function getRepository()
+    {
+        if(isSet($this->repositoryId)){
+            if(!isSet($this->repositoryObject)){
+                $this->repositoryObject = RepositoryService::getRepositoryById($this->repositoryId);
+            }
+            return $this->repositoryObject;
+        }
+        return null;
+    }
+
+    /**
+     * @param string $repositoryId
+     */
+    public function setRepositoryId($repositoryId)
+    {
+        $this->repositoryId = $repositoryId;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getRepositoryId()
+    {
+        return $this->repositoryId;
+    }
+
+    /**
+     * @param RepositoryInterface $repository
+     */
+    public function setRepositoryObject($repository)
+    {
+        $this->repositoryObject = $repository;
+        if($repository !== null){
+            $this->repositoryId = $repository->getId();
+        }
+    }
+
+    /**
+     * Set repositoryId and repositoryObject to null
+     */
+    public function resetRepository()
+    {
+        $this->repositoryId = $this->repositoryObject = null;
+    }
+
+    /**
+     * Build a unique string identifier for this context
+     * @return string
+     */
+    public function getStringIdentifier()
+    {
+        $u = $this->userId == null ? "shared" : $this->userId;
+        $a = "norepository";
+        $r = $this->getRepository();
+        if($r !== null){
+            $a = $r->getSlug();
+        }
+        return $u.":".$a;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isEmpty()
+    {
+        return !$this->hasRepository() && !$this->hasUser();
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Model/ContextInterface.php b/core/src/core/src/pydio/Core/Model/ContextInterface.php
new file mode 100644
index 0000000000..50186d32f9
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Model/ContextInterface.php
@@ -0,0 +1,110 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Model;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Interface ContextInterface
+ * @package Pydio\Core\Model
+ */
+interface ContextInterface
+{
+    /**
+     * @return bool
+     */
+    public function isEmpty();
+
+    /**
+     * @return boolean
+     */
+    public function hasUser();
+
+    /**
+     * @return UserInterface|null
+     */
+    public function getUser();
+
+    /**
+     * @param string $userId
+     */
+    public function setUserId($userId);
+
+    /**
+     * @param UserInterface $user
+     */
+    public function setUserObject($user);
+
+    public function resetUser();
+
+    /**
+     * Build Url base pydio:://user'@'repoId
+     * @return string
+     */
+    public function getUrlBase();
+
+    /**
+     * @return boolean
+     */
+    public function hasRepository();
+
+    /**
+     * @return RepositoryInterface|null
+     */
+    public function getRepository();
+
+    /**
+     * @param string $repositoryId
+     */
+    public function setRepositoryId($repositoryId);
+
+    /**
+     * @return string|null
+     */
+    public function getRepositoryId();
+
+    /**
+     * @param RepositoryInterface $repository
+     */
+    public function setRepositoryObject($repository);
+
+    /**
+     * @return mixed
+     */
+    public function resetRepository();
+
+    /**
+     * @return string
+     */
+    public function getStringIdentifier();
+
+    /**
+     * @param $userId
+     * @return ContextInterface
+     */
+    public function withUserId($userId);
+
+    /**
+     * @param $repositoryId
+     * @return ContextInterface
+     */
+    public function withRepositoryId($repositoryId);
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Model/ContextProviderInterface.php b/core/src/core/src/pydio/Core/Model/ContextProviderInterface.php
new file mode 100644
index 0000000000..ec0bdf45fa
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Model/ContextProviderInterface.php
@@ -0,0 +1,37 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Model;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Interface ContextProviderInterface
+ * Objects that implement this interface can provide a valid context
+ * @package Pydio\Core\Model
+ */
+interface ContextProviderInterface
+{
+    /**
+     * Returns a valid context
+     * @return ContextInterface
+     */
+    public function getContext();
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Model/FilteredRepositoriesList.php b/core/src/core/src/pydio/Core/Model/FilteredRepositoriesList.php
new file mode 100644
index 0000000000..f85d1f1b74
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Model/FilteredRepositoriesList.php
@@ -0,0 +1,159 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Model;
+
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class FilteredRepositoriesList
+ * Set of repositories filtered on a specific scope
+ * @package Pydio\Core\Model
+ */
+class FilteredRepositoriesList
+{
+
+    /** @var  string */
+    private $scope;
+    /** @var  bool */
+    private $includeShared = true;
+    /** @var  UserInterface */
+    private $user;
+    /** @var bool  */
+    private $details = false;
+
+    /**
+     * FilteredRepositoriesList constructor.
+     * @param UserInterface $userInterface
+     */
+    public function __construct(UserInterface $userInterface = null) {
+        if(!empty($userInterface)){
+            $this->user = $userInterface;
+            $this->scope = "user";
+        }else{
+            $this->scope = "all";
+        }
+    }
+
+    /**
+     * @param $bool
+     */
+    public function setDetails($bool){
+        $this->details = $bool;
+    }
+
+    /**
+     * @param $bool
+     */
+    public function setIncludeShared($bool){
+        $this->includeShared = $bool;
+    }
+
+    /**
+     * @return RepositoryInterface[]
+     */
+    public function load()
+    {
+        // APPEND CONF FILE REPOSITORIES
+        $objList = array();
+        if($this->user != null){
+            $l = $this->user->getLock();
+            if( !empty($l)) return $objList;
+        }
+        $statics = RepositoryService::getStaticRepositories();
+        foreach ($statics as $index=>$repository) {
+            if(!empty($this->user)
+                && !RepositoryService::repositoryIsAccessible($repository, $this->user, $this->details, $this->includeShared)){
+                continue;
+            }
+            $objList["".$repository->getId()] = $repository;
+        }
+        // LOAD FROM DRIVER
+        $confDriver = ConfService::getConfStorageImpl();
+        if($this->scope == "user"){
+            $acls = array();
+            if($this->user != null){
+                $acls = $this->user->getMergedRole()->listAcls(true);
+            }
+            if(!count($acls)) {
+                $drvList = array();
+            }else{
+                $criteria = array(
+                    "uuid" => array_keys($acls)
+                );
+                $drvList = RepositoryService::listRepositoriesWithCriteria($criteria, $count);
+            }
+        }else{
+            if($this->includeShared){
+                $drvList = $confDriver->listRepositories();
+            }else{
+                $drvList = RepositoryService::listRepositoriesWithCriteria(array(
+                    "owner_user_id" => AJXP_FILTER_EMPTY
+                ), $count);
+            }
+        }
+        if (is_array($drvList)) {
+            /**
+             * @var $drvList \Pydio\Access\Core\Model\Repository[]
+             */
+            foreach ($drvList as $repoId=>$repoObject) {
+                $driver = PluginsService::getInstance(Context::emptyContext())->getPluginByTypeName("access", $repoObject->getAccessType());
+                if (!is_object($driver) || !$driver->isEnabled()) {
+                    unset($drvList[$repoId]);
+                } else {
+                    $repoObject->setId($repoId);
+                    $drvList[$repoId] = $repoObject;
+                }
+                if($repoObject->hasParent() && !RepositoryService::findRepositoryByIdOrAlias($repoObject->getParentId())){
+                    Logger::error(__CLASS__, __FUNCTION__, "Disabling repository ".$repoObject->getSlug()." as parent cannot be correctly loaded.");
+                    unset($drvList[$repoId]);
+                }
+            }
+            foreach($drvList as $key => $value){
+                
+                // Refilter with internal options
+                if(isSet($this->user) && !RepositoryService::repositoryIsAccessible($value, $this->user, $this->details, $this->includeShared)){
+                    continue;
+                }
+                
+                $objList[$key] = $value;
+            }
+        }
+        $args = array(&$objList, $this->scope, $this->user, $this->includeShared);
+        Controller::applyIncludeHook("repository.list", $args);
+        return $objList;
+    }
+
+    /** @return array */
+    public function loadLabels(){
+        $repos = $this->load();
+        $result = [];
+        foreach($repos as $repo){
+             $result[$repo->getId()] = $repo->getDisplay();
+        }
+        return $result;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Model/RepositoryInterface.php b/core/src/core/src/pydio/Core/Model/RepositoryInterface.php
new file mode 100644
index 0000000000..f1369cbed7
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Model/RepositoryInterface.php
@@ -0,0 +1,297 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Model;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Access\Core\Filter\ContentFilter;
+use Pydio\Conf\Core\IGroupPathProvider;
+use Pydio\Core\Exception\RepositoryLoadException;
+
+
+/**
+ * The basic abstraction of a data store. Can map a FileSystem, but can also map data from a totally
+ * different source, like the application configurations, a mailbox, etc.
+ * @package Pydio
+ * @subpackage Core
+ */
+interface RepositoryInterface extends IGroupPathProvider
+{
+
+    /**
+     * @param ContextInterface $ctx
+     * @return AbstractAccessDriver
+     * @throws RepositoryLoadException
+     */
+    public function getDriverInstance(ContextInterface $ctx);
+
+    /**
+     * @param AbstractAccessDriver $driverInstance
+     */
+    public function setDriverInstance($driverInstance);
+
+    /**
+     * @param ContentFilter $contentFilter
+     */
+    public function setContentFilter($contentFilter);
+
+    /**
+     * Check if a ContentFilter is set or not
+     * @return bool
+     */
+    public function hasContentFilter();
+
+    /**
+     * @return ContentFilter
+     */
+    public function getContentFilter();
+
+    /**
+     * Create a shared version of this repository
+     * @param string $newLabel
+     * @param array $newOptions
+     * @param string $parentId
+     * @param string $owner
+     * @param string $uniqueUser
+     * @return RepositoryInterface
+     */
+    public function createSharedChild($newLabel, $newOptions, $parentId, $owner, $uniqueUser = null);
+
+    /**
+     * Create a child from this repository if it's a template
+     * @param string $newLabel
+     * @param array $newOptions
+     * @param string $creator
+     * @param string $uniqueUser
+     * @return RepositoryInterface
+     */
+    public function createTemplateChild($newLabel, $newOptions, $creator = null, $uniqueUser = null);
+
+    /**
+     * Recompute uuid
+     * @return bool
+     */
+    public function upgradeId();
+
+    /**
+     * Get a uuid
+     * @param bool $serial
+     * @return string
+     */
+    public function getUniqueId($serial = false);
+
+    /**
+     * Alias for this repository
+     * @return string
+     */
+    public function getSlug();
+
+    /**
+     * Use the slugify function to generate an alias from the label
+     * @param string $slug
+     * @return void
+     */
+    public function setSlug($slug = null);
+
+    /**
+     * Add options
+     * @param $oName
+     * @param $oValue
+     * @return void
+     */
+    public function addOption($oName, $oValue);
+
+    /**
+     * @param ContextInterface $ctx
+     * @param string $oName
+     * @param null $default
+     * @return mixed
+     */
+    public function getContextOption(ContextInterface $ctx, $oName, $default=null);
+
+    /**
+     * @param string $oName
+     * @return mixed|string
+     * @throws \Exception
+     */
+    public function getSafeOption($oName);
+
+    /**
+     * Get the options that already have a value
+     * @return array
+     */
+    public function getOptionsDefined();
+
+    /**
+     * Get the DEFAULT_RIGHTS option
+     * @return string
+     */
+    public function getDefaultRight();
+
+    /**
+     * The the access driver type
+     * @return String
+     */
+    public function getAccessType();
+
+    /**
+     * The label of this repository
+     * @return String
+     */
+    public function getDisplay();
+
+    /**
+     * @return string
+     */
+    public function getId();
+
+    /**
+     * @return boolean
+     */
+    public function getCreate();
+
+    /**
+     * @param boolean $create
+     */
+    public function setCreate($create);
+
+    /**
+     * @param String $accessType
+     */
+    public function setAccessType($accessType);
+
+    /**
+     * @param String $display
+     */
+    public function setDisplay($display);
+
+    /**
+     * @param int $id
+     */
+    public function setId($id);
+
+    /**
+     * @return bool
+     */
+    public function isWriteable();
+
+    /**
+     * @param bool $w
+     */
+    public function setWriteable($w);
+
+    /**
+     * @param string $id
+     */
+    public function setDisplayStringId($id);
+
+    /**
+     * @param string $repoParentId
+     * @param string|null $ownerUserId
+     * @param string|null $childUserId
+     */
+    public function setOwnerData($repoParentId, $ownerUserId = null, $childUserId = null);
+
+    /**
+     * @return string|null
+     */
+    public function getOwner();
+
+    /**
+     * @return string|null
+     */
+    public function getParentId();
+
+    /**
+     * @return null|RepositoryInterface
+     */
+    public function getParentRepository();
+
+    /**
+     * @return string|null
+     */
+    public function getUniqueUser();
+
+    /**
+     * @return bool
+     */
+    public function hasOwner();
+
+    /**
+     * @return bool
+     */
+    public function hasParent();
+
+    /**
+     * @return bool
+     */
+    public function isTemplate();
+
+    /**
+     * @param $bool
+     */
+    public function setInferOptionsFromParent($bool);
+
+    /**
+     * @return bool
+     */
+    public function getInferOptionsFromParent();
+
+    /**
+     * @param String $descriptionText
+     */
+    public function setDescription($descriptionText);
+
+    /**
+     * @return string
+     */
+    public function getAccessStatus();
+
+    /**
+     * @param string $accessStatus
+     */
+    public function setAccessStatus($accessStatus);
+
+    /**
+     * @return string
+     */
+    public function getRepositoryType();
+
+    /**
+     * @param string $repositoryType
+     */
+    public function setRepositoryType($repositoryType);
+
+    /**
+     * @param bool $public
+     * @param null $ownerLabel
+     * @return String
+     */
+    public function getDescription($public = false, $ownerLabel = null);
+
+    /**
+     * Infer a security scope for this repository. Will determine to whome the messages
+     * will be broadcasted.
+     * @return bool|string
+     */
+    public function securityScope();
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Model/UserInterface.php b/core/src/core/src/pydio/Core/Model/UserInterface.php
new file mode 100644
index 0000000000..62f72ef317
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Model/UserInterface.php
@@ -0,0 +1,290 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Model;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+use Pydio\Conf\Core\AJXP_Role;
+use Pydio\Conf\Core\IGroupPathProvider;
+
+/**
+ * User abstraction, the "conf" driver must provides its own implementation
+ */
+interface UserInterface extends IGroupPathProvider
+{
+    /**
+     * @param bool $hidden
+     */
+    public function setHidden($hidden);
+
+    /**
+     * @return bool
+     */
+    public function isHidden();
+
+    /**
+     * @return string
+     */
+    public function getId();
+
+    /**
+     * @param string $id
+     */
+    public function setId($id);
+
+    /**
+     * @return bool
+     */
+    public function storageExists();
+
+    /**
+     * @param AJXP_Role $roleObject
+     */
+    public function addRole($roleObject);
+
+    /**
+     * @param string $roleId
+     * @throws \Exception
+     */
+    public function removeRole($roleId);
+
+    /**
+     * @param $orderedRolesIds array of roles ids
+     */
+    public function updateRolesOrder($orderedRolesIds);
+
+    /**
+     * @return AJXP_Role[]
+     */
+    public function getRoles();
+
+    /**
+     * @return string
+     */
+    public function getProfile();
+
+    /**
+     * @param string $profile
+     */
+    public function setProfile($profile);
+
+    /**
+     * @param string $lockAction
+     * @throws \Exception
+     */
+    public function setLock($lockAction);
+
+    /**
+     * @throws \Exception
+     */
+    public function removeLock($lockAction);
+
+    /**
+     * @param $lockAction
+     * @return string|false
+     */
+    public function hasLockByName($lockAction);
+
+    /**
+     * @return string|false
+     */
+    public function getLock();
+
+    /**
+     * @return bool
+     */
+    public function isAdmin();
+
+    /**
+     * @param bool $boolean
+     */
+    public function setAdmin($boolean);
+
+    /**
+     * @return bool Whether the user has a parent or not
+     */
+    public function hasParent();
+
+    /**
+     * @param string $user A user ID
+     */
+    public function setParent($user);
+
+    /**
+     * @return string Returns the ID of the parent user
+     */
+    public function getParent();
+
+    /**
+     * @param string $repositoryId
+     * @return bool
+     */
+    public function canRead($repositoryId);
+
+    /**
+     * @param string $repositoryId
+     * @return bool
+     */
+    public function canWrite($repositoryId);
+
+    /**
+     * @param RepositoryInterface|string $idOrObject
+     * @return boolean
+     */
+    public function canAccessRepository($idOrObject);
+
+    /**
+     * Test if user can switch to this repository
+     *
+     * @param integer $repositoryId
+     * @return boolean
+     */
+    public function canSwitchTo($repositoryId);
+
+    /**
+     * @param $prefName
+     * @return mixed|string
+     */
+    public function getPref($prefName);
+
+    /**
+     * @param $prefName
+     * @param $prefValue
+     */
+    public function setPref($prefName, $prefValue);
+
+    /**
+     * @param string $prefName
+     * @param string $prefPath
+     * @param mixed $prefValue
+     */
+    public function setArrayPref($prefName, $prefPath, $prefValue);
+
+    /**
+     * @param $prefName
+     * @param $prefPath
+     * @return mixed|string
+     */
+    public function getArrayPref($prefName, $prefPath);
+
+    /**
+     * @param $repositoryId
+     * @param string $path
+     * @param string $title
+     * @return
+     */
+    public function addBookmark($repositoryId, $path, $title);
+
+    /**
+     * @param string $repositoryId
+     * @param string $path
+     */
+    public function removeBookmark($repositoryId, $path);
+
+    /**
+     * @param string $repositoryId
+     * @param string $path
+     * @param string $title
+     */
+    public function renameBookmark($repositoryId, $path, $title);
+
+    /**
+     * @return array
+     */
+    public function getBookmarks($repositoryId);
+
+    /**
+     * Check if the current user can administrate the GroupPathProvider object
+     * @param IGroupPathProvider $provider
+     * @return bool
+     */
+    public function canAdministrate(IGroupPathProvider $provider);
+
+    /**
+     * Check if the current user can assign administration for the GroupPathProvider object
+     * @param IGroupPathProvider $provider
+     * @return bool
+     */
+    public function canSee(IGroupPathProvider $provider);
+
+    /**
+     * Automatically set the group to the current user base
+     * @param $baseGroup
+     * @return string
+     */
+    public function getRealGroupPath($baseGroup);
+
+    /**
+     * @return mixed
+     */
+    public function load();
+
+    /**
+     * @param string $context
+     */
+    public function save($context = "superuser");
+
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    public function getTemporaryData($key);
+
+    /**
+     * @param string $key
+     * @param mixed $value
+     * @return mixed
+     */
+    public function saveTemporaryData($key, $value);
+
+    /**
+     * Rebuild the current merged role
+     * @throws \Exception
+     */
+    public function recomputeMergedRole();
+
+    /**
+     * @return AJXP_Role
+     */
+    public function getMergedRole();
+
+    /**
+     * @return AJXP_Role
+     */
+    public function getPersonalRole();
+
+    /**
+     * @param AJXP_Role $role
+     */
+    public function updatePersonalRole(AJXP_Role $role);
+
+    /**
+     * @return bool
+     * @throws \Exception
+     */
+    public function reloadRolesIfRequired();
+
+    /**
+     * @return array
+     */
+    public function getRolesKeys();
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/PluginFramework/CoreInstanceProvider.php b/core/src/core/src/pydio/Core/PluginFramework/CoreInstanceProvider.php
new file mode 100644
index 0000000000..f49bd2a044
--- /dev/null
+++ b/core/src/core/src/pydio/Core/PluginFramework/CoreInstanceProvider.php
@@ -0,0 +1,36 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\PluginFramework;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Interface CoreInstanceProvider
+ * @package Pydio\Core\PluginFramework
+ */
+interface CoreInstanceProvider
+{
+    /**
+     * @param PluginsService|null $pluginServiceInstance
+     * @return Plugin
+     */
+    public function getImplementation($pluginServiceInstance = null);
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/PluginFramework/Plugin.php b/core/src/core/src/pydio/Core/PluginFramework/Plugin.php
new file mode 100644
index 0000000000..df3f5f3fe0
--- /dev/null
+++ b/core/src/core/src/pydio/Core/PluginFramework/Plugin.php
@@ -0,0 +1,1114 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\PluginFramework;
+
+use Pydio\Access\Core\MetaStreamWrapper;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+
+
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Utils\Vars\XMLFilter;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+if (!defined('LOG_LEVEL_DEBUG')) {
+    define("LOG_LEVEL_DEBUG", "Debug");
+    define("LOG_LEVEL_INFO", "Info");
+    define("LOG_LEVEL_NOTICE", "Notice");
+    define("LOG_LEVEL_WARNING", "Warning");
+    define("LOG_LEVEL_ERROR", "Error");
+}
+
+/**
+ * The basic concept of plugin. Only needs a manifest.xml file.
+ * @package Pydio
+ * @subpackage Core
+ */
+class Plugin implements \Serializable
+{
+    protected $baseDir;
+    protected $id;
+    protected $name;
+    protected $type;
+    /**
+     * XPath query
+     *
+     * @var \DOMXPath
+     */
+    private $xPath;
+    protected $manifestLoaded = false;
+    protected $externalFilesAppended = false;
+    protected $enabled;
+    protected $registryContributions = [];
+    protected $contributionsLoaded = false;
+    /**
+     * @var array
+     */
+    protected $options; // can be passed at init time
+    protected $pluginConf; // can be passed at load time
+    protected $pluginConfDefinition;
+    protected $dependencies;
+    protected $extensionsDependencies;
+    protected $streamData;
+    protected $mixins = [];
+    protected $cachedXPathResults = [];
+    public $loadingState = "";
+    /**
+     * The manifest.xml loaded
+     *
+     * @var \DOMDocument
+     */
+    protected $manifestDoc;
+
+    /**
+     * Internally store XML during serialization state.
+     *
+     * @var string
+     */
+    private $manifestXML;
+
+    private $serializableAttributes = [
+        "baseDir",
+        "id",
+        "name",
+        "type",
+        "manifestLoaded",
+        "externalFilesAppended",
+        "enabled",
+        "registryContributions",
+        "contributionsLoaded",
+        "mixins",
+        "streamData",
+        "options", "pluginConf", "pluginConfDefinition", "dependencies", "extensionsDependencies", "loadingState", "manifestXML", "cachedXPathResults"];
+
+    /**
+     * Construction method
+     *
+     * @param string $id
+     * @param string $baseDir
+     */
+    public function __construct($id, $baseDir)
+    {
+        $this->baseDir = $baseDir;
+        $this->id = $id;
+        $split = explode(".", $id);
+        $this->type = $split[0];
+        $this->name = $split[1];
+        $this->dependencies = [];
+        $this->extensionsDependencies = [];
+    }
+
+    /**
+     * Make sure to clone the XML manifest document, otherwise if the plugin
+     * changes it dynamically, it can mess up things.
+     * @inheritdoc
+     */
+    public function __clone()
+    {
+        if($this->manifestDoc !== null){
+            $this->manifestDoc = clone $this->manifestDoc;
+            $this->reloadXPath();
+        }
+    }
+
+    /**
+     * @param $pluginId
+     * @return string
+     */
+    public static function getWorkDirForPluginId($pluginId) {
+        return AJXP_DATA_PATH.DIRECTORY_SEPARATOR."plugins".DIRECTORY_SEPARATOR.$pluginId;
+    }
+
+    /**
+     * @param bool $check
+     * @return string
+     * @throws \Exception
+     */
+    protected function getPluginWorkDir($check = false)
+    {
+        $d = self::getWorkDirForPluginId($this->getId());
+        if(!$check) return $d;
+        if (!is_dir($d)) {
+            $res = @mkdir($d, 0755, true);
+            if(!$res) throw new \Exception("Error while creating plugin directory for ".$this->getId());
+        }
+        return $d;
+    }
+
+    /**
+     * @param bool $shared
+     * @param bool $check
+     * @return string
+     * @throws \Exception
+     */
+    protected function getPluginCacheDir($shared = false, $check = false)
+    {
+        $d = ($shared ? AJXP_SHARED_CACHE_DIR : AJXP_CACHE_DIR).DIRECTORY_SEPARATOR."plugins".DIRECTORY_SEPARATOR.$this->getId();
+        if(!$check) return $d;
+        if (!is_dir($d)) {
+            $res = @mkdir($d, 0755, true);
+            if(!$res) throw new \Exception("Error while creating plugin cache directory for ".$this->getId());
+        }
+        return $d;
+    }
+
+    /**
+     * @return \DOMXPath
+     */
+    protected function getXPath(){
+        $this->unserializeManifest();
+        return $this->xPath;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     * @return void
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        $this->options = array_merge($this->loadOptionsDefaults(), $options);
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $optionName
+     * @return mixed|null
+     */
+    protected function getContextualOption(ContextInterface $ctx, $optionName){
+
+        if(!is_array($this->options)) $this->options = [];
+        $merged = $this->options;
+        if(is_array($this->pluginConf)) $merged = array_merge($merged, $this->pluginConf);
+
+        if ($ctx->hasUser()) {
+
+            $loggedUser = $ctx->getUser();
+            if($ctx->hasRepository()){
+                $repository = $ctx->getRepository();
+                $repositoryScope = $ctx->getRepositoryId();
+            }else{
+                $repositoryScope = AJXP_REPO_SCOPE_ALL;
+            }
+
+            $test = $loggedUser->getMergedRole()->filterParameterValue(
+                $this->getId(),
+                $optionName,
+                $repositoryScope,
+                isSet($merged[$optionName]) ? $merged[$optionName] : null
+            );
+
+            if (isSet($repository) && $repository->hasParent()) {
+                $retest = $loggedUser->getMergedRole()->filterParameterValue(
+                    $this->getId(),
+                    $optionName,
+                    $repository->getParentId(),
+                    null
+                );
+                if($retest !== null) {
+                    $test = $retest;
+
+                }else if($repository->hasOwner()) {
+                    // Test shared scope
+                    $retest = $loggedUser->getMergedRole()->filterParameterValue(
+                        $this->getId(),
+                        $optionName,
+                        AJXP_REPO_SCOPE_SHARED,
+                        null
+                    );
+                    if($retest !== null) {
+                        $test = $retest;
+                    }
+                }
+            }
+            return $test;
+        } else {
+            return isSet($merged[$optionName]) ? $merged[$optionName] : null;
+        }
+    }
+    /**
+     * Perform initialization checks, and throw exception if problems found.
+     * @throws \Exception
+     */
+    public function performChecks()
+    {
+    }
+    /**
+     * @return bool
+     */
+    public function isEnabled()
+    {
+        if(isSet($this->enabled)) return $this->enabled;
+        $this->enabled = true;
+        if(isSet($this->cachedXPathResults["@enabled"])){
+            $value = $this->cachedXPathResults["@enabled"];
+            if($value === "false"){
+                $this->enabled = false;
+            }
+            return $this->enabled;
+        }
+        if ($this->manifestLoaded) {
+            if($this->manifestXML != null) $this->unserializeManifest();
+            $l = $this->xPath->query("@enabled", $this->manifestDoc->documentElement);
+            if ($l->length && $l->item(0)->nodeValue === "false") {
+                $this->enabled = false;
+            }
+        }
+        return $this->enabled;
+    }
+
+    /**
+     * Main function for loading all the nodes under registry_contributions.
+     * @param ContextInterface $ctx
+     * @param bool $dry
+     */
+    protected function loadRegistryContributions(ContextInterface $ctx, $dry = false)
+    {
+        if($this->manifestXML != null) $this->unserializeManifest();
+        $regNodes = $this->xPath->query("registry_contributions/*");
+        for ($i=0;$i<$regNodes->length;$i++) {
+            $regNode = $regNodes->item($i);
+            if($regNode->nodeType != XML_ELEMENT_NODE) continue;
+            if ($regNode->nodeName == "external_file" && !$this->externalFilesAppended) {
+                $data = $this->nodeAttrToHash($regNode);
+                $filename = $data["filename"] OR "";
+                $include = $data["include"] OR "*";
+                $exclude = $data["exclude"] OR "";
+                if(!is_file(AJXP_INSTALL_PATH."/".$filename)) continue;
+                if ($include != "*") {
+                    $include = explode(",", $include);
+                } else {
+                    $include = ["*"];
+                }
+                if ($exclude != "") {
+                    $exclude = explode(",", $exclude);
+                } else {
+                    $exclude = [];
+                }
+                $this->initXmlContributionFile($ctx, $filename, $include, $exclude, $dry);
+            } else {
+                if (!$dry) {
+                    $this->registryContributions[]=$regNode;
+                    $this->parseSpecificContributions($ctx, $regNode);
+                }
+            }
+        }
+        // add manifest as a "plugins" (remove parsed contrib)
+        $pluginContrib = new \DOMDocument();
+        $pluginContrib->loadXML("<plugins uuidAttr='name'></plugins>");
+        $manifestNode = $pluginContrib->importNode($this->manifestDoc->documentElement, true);
+        $pluginContrib->documentElement->appendChild($manifestNode);
+        $xP=new \DOMXPath($pluginContrib);
+        $regNodeParent = $xP->query("registry_contributions", $manifestNode);
+        if ($regNodeParent->length) {
+            $manifestNode->removeChild($regNodeParent->item(0));
+        }
+        if (!$dry) {
+            $this->registryContributions[]=$pluginContrib->documentElement;
+            $this->parseSpecificContributions($ctx, $pluginContrib->documentElement);
+            $this->contributionsLoaded = true;
+        }
+    }
+
+    /**
+     * Load an external XML file and include/exclude its nodes as contributions.
+     * @param ContextInterface $ctx
+     * @param string $xmlFile Path to the file from the base install path
+     * @param array $include XPath query for XML Nodes to include
+     * @param array $exclude XPath query for XML Nodes to exclude from the included ones.
+     * @param bool $dry Dry-run of the inclusion
+     */
+    protected function initXmlContributionFile(ContextInterface $ctx, $xmlFile, $include= ["*"], $exclude= [], $dry = false)
+    {
+        $contribDoc = new \DOMDocument();
+        $contribDoc->load(AJXP_INSTALL_PATH."/".$xmlFile);
+        if (!is_array($include) && !is_array($exclude)) {
+            if (!$dry) {
+                $this->registryContributions[] = $contribDoc->documentElement;
+                $this->parseSpecificContributions($ctx, $contribDoc->documentElement);
+            }
+            return;
+        }
+        $xPath = new \DOMXPath($contribDoc);
+        $excluded = [];
+        foreach ($exclude as $excludePath) {
+            $children = $xPath->query($excludePath);
+            foreach ($children as $child) {
+                $excluded[] = $child;
+            }
+        }
+        $selected = [];
+        foreach ($include as $includePath) {
+            $incChildren = $xPath->query($includePath);
+            if(!$incChildren->length) continue;
+            $parentNode = $incChildren->item(0)->parentNode;
+            if (!isSet($selected[$parentNode->nodeName])) {
+                $selected[$parentNode->nodeName]= ["parent"=>$parentNode, "nodes"=> []];
+            }
+            foreach ($incChildren as $incChild) {
+                $foundEx = false;
+                foreach ($excluded as $exChild) {
+                    if ($this->nodesEqual($exChild, $incChild)) {
+                        $foundEx = true;break;
+                    }
+                }
+                if($foundEx) continue;
+                $selected[$parentNode->nodeName]["nodes"][] = $incChild;
+            }
+            if (!count($selected[$parentNode->nodeName]["nodes"])) {
+                unset($selected[$parentNode->nodeName]);
+            }
+        }
+        if(!count($selected)) return;
+        $originalRegContrib = $this->xPath->query("registry_contributions")->item(0);
+        $localRegParent = null;
+        foreach ($selected as $parentNodeName => $data) {
+            $node = $data["parent"]->cloneNode(false);
+            //$newNode = $originalRegContrib->ownerDocument->importNode($node, false);
+            if ($dry) {
+                $localRegParent = $this->xPath->query("registry_contributions/".$parentNodeName);
+                if ($localRegParent->length) {
+                    $localRegParent = $localRegParent->item(0);
+                } else {
+                    $localRegParent = $originalRegContrib->ownerDocument->createElement($parentNodeName);
+                    $originalRegContrib->appendChild($localRegParent);
+                }
+            }
+            foreach ($data["nodes"] as $childNode) {
+                $node->appendChild($childNode);
+                if($dry) $localRegParent->appendChild($localRegParent->ownerDocument->importNode($childNode, true));
+            }
+            if (!$dry) {
+                $this->registryContributions[] = $node;
+                $this->parseSpecificContributions($ctx, $node);
+            } else {
+                $this->reloadXPath();
+            }
+        }
+    }
+    /**
+     * Dynamically modify some registry contributions nodes. Can be easily derivated to enable/disable
+     * some features dynamically during plugin initialization.
+     * @param ContextInterface $ctx
+     * @param \DOMNode $contribNode
+     * @return void
+     */
+    protected function parseSpecificContributions(ContextInterface $ctx, \DOMNode &$contribNode)
+    {
+        //Append plugin id to callback tags
+        $callbacks = $contribNode->getElementsByTagName("serverCallback");
+        foreach ($callbacks as $callback) {
+            $attr = $callback->ownerDocument->createAttribute("pluginId");
+            $attr->value = $this->id;
+            $callback->appendChild($attr);
+        }
+    }
+
+    /**
+     * Load the main manifest.xml file of the plugni
+     * @throws \Exception
+     * @return void
+     */
+    public function loadManifest()
+    {
+        $file = $this->baseDir."/manifest.xml";
+        if (!is_file($file)) {
+            return;
+        }
+        $this->manifestDoc = new \DOMDocument();
+        try {
+            $this->manifestDoc->load($file);
+        } catch (\Exception $e) {
+            throw $e;
+        }
+        $id = $this->manifestDoc->documentElement->getAttribute("id");
+        if (empty($id) || $id != $this->getId()) {
+            $this->manifestDoc->documentElement->setAttribute("id", $this->getId());
+        }
+        $this->xPath = new \DOMXPath($this->manifestDoc);
+        $this->loadMixins();
+        $this->detectStreamWrapper();
+        $this->manifestLoaded = true;
+        $this->loadDependencies();
+    }
+
+    /**
+     * Get the plugin label as defined in the manifest file (label attribute)
+     * @return mixed|string
+     */
+    public function getManifestLabel()
+    {
+        if($this->manifestXML != null) $this->unserializeManifest();
+        $l = $this->xPath->query("@label", $this->manifestDoc->documentElement);
+        if($l->length) return XMLFilter::resolveKeywords($l->item(0)->nodeValue);
+        else return $this->id;
+    }
+    /**
+     * Get the plugin description as defined in the manifest file (description attribute)
+     * @return mixed|string
+     */
+    public function getManifestDescription()
+    {
+        if($this->manifestXML != null) $this->unserializeManifest();
+        $l = $this->xPath->query("@description", $this->manifestDoc->documentElement);
+        if($l->length) return XMLFilter::resolveKeywords($l->item(0)->nodeValue);
+        else return "";
+    }
+
+    /**
+     * Serialized all declared attributes and return a serialized representation of this plugin.
+     * The XML Manifest is base64 encoded before serialization.
+     * @return string
+     */
+    public function serialize()
+    {
+        if ($this->manifestDoc != null) {
+            $this->manifestXML = serialize(base64_encode($this->manifestDoc->saveXML()));
+        }
+        $serialArray = [];
+        foreach ($this->serializableAttributes as $attr) {
+            $serialArray[$attr] = $this->$attr;
+        }
+        return serialize($serialArray);
+    }
+
+    /**
+     * Load this plugin from its serialized reprensation. The manifest XML is base64 decoded.
+     * @param $string
+     * @return void
+     */
+    public function unserialize($string)
+    {
+        $serialArray = unserialize($string);
+        foreach ($serialArray as $key => $value) {
+            $this->$key = $value;
+        }
+        /*
+        if ($this->manifestXML != NULL) {
+            $this->manifestDoc = new DOMDocument(1.0, "UTF-8");
+            $this->manifestDoc->loadXML(base64_decode(unserialize($this->manifestXML)));
+            $this->reloadXPath();
+            unset($this->manifestXML);
+        }
+        */
+    }
+
+    /**
+     * Load DOMDocument from serialized value. Must be called after checking
+     * that property $this->manifestXML is not null.
+     */
+    protected function unserializeManifest(){
+        if($this->manifestXML !== null){
+            $this->manifestDoc = new \DOMDocument(1.0, "UTF-8");
+            $this->manifestDoc->loadXML(base64_decode(unserialize($this->manifestXML)));
+            $this->reloadXPath();
+            unset($this->manifestXML);
+        }
+    }
+
+    /**
+     * Legacy function, should better be used to return XML Nodes than string. Perform a query
+     * on the manifest.
+     * @param string $xmlNodeName
+     * @param string $format
+     * @param bool $externalFiles
+     * @return \DOMElement|\DOMNodeList|string
+     */
+    public function getManifestRawContent($xmlNodeName = "", $format = "string", $externalFiles = false)
+    {
+        if ($externalFiles && !$this->externalFilesAppended) {
+            $this->loadRegistryContributions(Context::emptyContext(), true);
+            $this->externalFilesAppended = true;
+        }
+        if($this->manifestXML != null) $this->unserializeManifest();
+        if ($xmlNodeName == "") {
+            if ($format == "string") {
+                return $this->manifestDoc->saveXML($this->manifestDoc->documentElement);
+            } else {
+                return $this->manifestDoc->documentElement;
+            }
+        } else {
+            $nodes = $this->xPath->query($xmlNodeName);
+            if ($format == "string") {
+                $buffer = "";
+                foreach ($nodes as $node) {
+                    $buffer .= $this->manifestDoc->saveXML($node);
+                }
+                return $buffer;
+            } else {
+                return $nodes;
+            }
+        }
+    }
+    /**
+     * Return the registry contributions. The parameter can be used by subclasses to optimize the size of the XML returned :
+     * the extended version is called when sending to the client, whereas the "small" version is loaded to find and apply actions.
+     * @param ContextInterface $ctx
+     * @param bool $extendedVersion Can be used by subclasses to optimize the size of the XML returned.
+     * @return \DOMElement[]
+     */
+    public function getRegistryContributions(ContextInterface $ctx, $extendedVersion = true)
+    {
+        if (!$this->contributionsLoaded) {
+            $this->loadRegistryContributions($ctx);
+        }
+        return $this->registryContributions;
+    }
+    /**
+     * Load the declared dependant plugins
+     * @return void
+     */
+    protected function loadDependencies()
+    {
+        $depPaths = "dependencies/*/@pluginName";
+        $nodes = $this->xPath->query($depPaths);
+        foreach ($nodes as $attr) {
+            $value = $attr->value;
+            $this->dependencies = array_merge($this->dependencies, explode("|", $value));
+        }
+        $extPaths = "dependencies/phpExtension/@name";
+        $nodes = $this->xPath->query($extPaths);
+        foreach ($nodes as $attr) {
+            $this->extensionsDependencies[] = $attr->value;
+        }
+        $this->cachedNodesFromManifest("dependencies/activePlugin");
+        $this->cachedNodesFromManifest("//server_settings/param[@default]");
+        $this->cachedNodesFromManifest("//server_settings/global_param|//server_settings/param");
+        $l = $this->xPath->query("@enabled", $this->manifestDoc->documentElement);
+        if ($l->length) {
+            $this->cachedXPathResults["@enabled"] = $l->item(0)->nodeValue;
+        }else{
+            $this->cachedXPathResults["@enabled"] = "not_set";
+        }
+
+    }
+    /**
+     * Update dependencies dynamically
+     * @param PluginsService $pluginService
+     * @return void
+     */
+    public function updateDependencies($pluginService)
+    {
+        $append = false;
+        foreach ($this->dependencies as $index => $dependency) {
+            if ($dependency == "access.AJXP_STREAM_PROVIDER") {
+                unset($this->dependencies[$index]);
+                $append = true;
+            }
+        }
+        if ($append) {
+            $this->dependencies = array_merge($this->dependencies, $pluginService->getStreamWrapperPlugins());
+        }
+    }
+    /**
+     * Check if this plugin depends on another one.
+     * @param string $pluginName
+     * @return bool
+     */
+    public function dependsOn($pluginName)
+    {
+        return (in_array($pluginName, $this->dependencies)
+            || in_array(substr($pluginName, 0, strpos($pluginName, "."))."+", $this->dependencies));
+    }
+
+    /**
+     * @param $query
+     * @return array|mixed
+     */
+    protected function cachedNodesFromManifest($query){
+        if(isSet($this->cachedXPathResults[$query])){
+            return $this->cachedXPathResults[$query];
+        }
+        if(!$this->manifestLoaded) return [];
+        if($this->manifestXML != null) $this->unserializeManifest();
+        $nodes = $this->xPath->query($query);
+        $res = [];
+        foreach($nodes as $xmlNode){
+            $arrayNode = $this->nodeAttrToHash($xmlNode);
+            $arrayNode["__NODE_NAME__"] = $xmlNode->nodeName;
+            $res[] = $arrayNode;
+        }
+        $this->cachedXPathResults[$query] = $res;
+        return $res;
+    }
+
+    /**
+     * Get dependencies
+     *
+     * @param PluginsService $pluginService
+     * @return array
+     */
+    public function getActiveDependencies($pluginService)
+    {
+        $deps = [];
+        $nodes = $this->cachedNodesFromManifest("dependencies/activePlugin");
+        foreach ($nodes as $arrayNode) {
+            $value = $arrayNode["pluginName"];
+            $parts = explode("|", $value);
+            foreach ($parts as $depName) {
+                if ($depName == "access.AJXP_STREAM_PROVIDER") {
+                    $deps = array_merge($deps, $pluginService->getStreamWrapperPlugins());
+                } else if (strpos($depName, "+") !== false) {
+                    $typed = $pluginService->getPluginsByType(substr($depName, 0, strlen($depName)-1));
+                    foreach($typed as $typPlug) $deps[] = $typPlug->getId();
+                } else {
+                    $deps[] = $depName;// array_merge($deps, explode("|", $value));
+                }
+            }
+        }
+        return $deps;
+    }
+    /**
+     * Load the global parameters for this plugin
+     * @return void
+     */
+    protected function loadConfigsDefinitions()
+    {
+        $params = $this->cachedNodesFromManifest("//server_settings/global_param|//server_settings/param");
+        $this->pluginConf = [];
+        foreach ($params as $paramNode) {
+            $global = ($paramNode['__NODE_NAME__'] == "global_param");
+            $this->pluginConfDefinition[$paramNode["name"]] = $paramNode;
+            if ($global && isset($paramNode["default"])) {
+                if ($paramNode["type"] == "boolean") {
+                    $paramNode["default"] = ($paramNode["default"] === "true" ? true: false);
+                } else if ($paramNode["type"] == "integer") {
+                    $paramNode["default"] = intval($paramNode["default"]);
+                }
+                $this->pluginConf[$paramNode["name"]] = $paramNode["default"];
+            }
+        }
+    }
+    /**
+     * Load the default values for this plugin options
+     * @return array
+     */
+    protected function loadOptionsDefaults()
+    {
+        $optionsDefaults = [];
+        $params = $this->cachedNodesFromManifest("//server_settings/param[@default]");
+        foreach ($params as $node) {
+            $default = $node["default"];
+            if ($node["type"] == "boolean") {
+                $default = ($default === "true" ? true: false);
+            } else if ($node["type"] == "integer") {
+                $default = intval($default);
+            }
+            $optionsDefaults[$node["name"]] = $default;
+        }
+        return $optionsDefaults;
+    }
+    /**
+     * @return array
+     */
+    public function getConfigsDefinitions()
+    {
+        return $this->pluginConfDefinition;
+    }
+    /**
+     * Load the configs passed as parameter. This method will
+     * + Parse the config definitions and load the default values
+     * + Merge these values with the $configData parameter
+     * + Publish their value in the manifest if the global_param is "exposed" to the client.
+     * @param array $configData
+     * @return void
+     */
+    public function loadConfigs($configData)
+    {
+        // PARSE DEFINITIONS AND LOAD DEFAULT VALUES
+        if (!isSet($this->pluginConf)) {
+            $this->loadConfigsDefinitions();
+        }
+        // MERGE WITH PASSED CONFIGS
+        $this->pluginConf = array_merge($this->pluginConf, $configData);
+
+        // PUBLISH IF NECESSARY
+        foreach ($this->pluginConf as $key => $value) {
+            if (isSet($this->pluginConfDefinition[$key]) && isSet($this->pluginConfDefinition[$key]["expose"]) && $this->pluginConfDefinition[$key]["expose"] == "true") {
+                $this->exposeConfigInManifest($key, $value);
+            }
+        }
+
+        // ASSIGN SPECIFIC OPTIONS TO PLUGIN KEY
+        if (isSet($this->pluginConf["AJXP_PLUGIN_ENABLED"])) {
+            $this->enabled = $this->pluginConf["AJXP_PLUGIN_ENABLED"];
+        }
+    }
+    /**
+     * Return this plugin configs, merged with its associated "core" configs.
+     * @return array
+     */
+    public function getConfigs()
+    {
+        $core = PluginsService::getInstance()->getPluginByTypeName("core", $this->type);
+        if (!empty($core)) {
+            $coreConfs = $core->getConfigs();
+            return array_merge($coreConfs, $this->pluginConf);
+        } else {
+            return $this->pluginConf;
+        }
+    }
+    /**
+     * Return the file path of the specific class to load
+     * @return array|bool
+     */
+    public function getClassFile()
+    {
+        if($this->manifestXML != null) $this->unserializeManifest();
+        $files = $this->xPath->query("class_definition");
+        if(!$files->length) return false;
+        return $this->nodeAttrToHash($files->item(0));
+    }
+
+    /**
+     * @return array
+     */
+    public function missingExtensions(){
+        $missing = [];
+        if(count($this->extensionsDependencies)){
+            foreach($this->extensionsDependencies as $ext){
+                if (!extension_loaded($ext)) {
+                    $missing[] = $ext;
+                }
+            }
+        }
+        return $missing;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasMissingExtensions(){
+        return count($this->missingExtensions()) > 0;
+    }
+
+    /**
+     * @return bool
+     */
+    public function manifestLoaded()
+    {
+        return $this->manifestLoaded;
+    }
+    /**
+     * @return string
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+    /**
+     * @return string
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+    /**
+     * @return string
+     */
+    public function getBaseDir()
+    {
+        return $this->baseDir;
+    }
+    /**
+     * @return array
+     */
+    public function getDependencies()
+    {
+        return $this->dependencies;
+    }
+    /**
+     * Write a debug log with the plugin id as source
+     * @param string $prefix  A quick description or action
+     * @param array|string $message Variable number of message args (string or array)
+     * @return void
+     */
+    public function logDebug($prefix, $message = "")
+    {
+        if(!class_exists("ConfService")) return ;
+        if(!ConfService::getConf("SERVER_DEBUG")) return ;
+        $args = func_get_args();
+        array_shift($args);
+        Logger::log2(LOG_LEVEL_DEBUG, $this->getId(), $prefix, $args);
+    }
+
+    /**
+     * Write an info log with the plugin id as source
+     * @param string $prefix  A quick description or action
+     * @param array|string $message Variable number of message args (string or array)
+     * @return void
+     */
+    public function logInfo($prefix, $message)
+    {
+        $args = func_get_args();
+        array_shift($args);
+        Logger::log2(LOG_LEVEL_INFO, $this->getId(), $prefix, $args);
+    }
+
+    /**
+     * Write a notice log with the plugin id as source
+     * @param string $prefix  A quick description or action
+     * @param array|string $message Variable number of message args (string or array)
+     * @return void
+     */
+    public function logNotice($prefix, $message)
+    {
+        $args = func_get_args();
+        array_shift($args);
+        Logger::log2(LOG_LEVEL_NOTICE, $this->getId(), $prefix, $args);
+    }
+
+    /**
+     * Write a warning log with the plugin id as source
+     * @param string $prefix  A quick description or action
+     * @param array|string $message Variable number of message args (string or array)
+     * @return void
+     */
+    public function logWarning($prefix, $message)
+    {
+        $args = func_get_args();
+        array_shift($args);
+        Logger::log2(LOG_LEVEL_WARNING, $this->getId(), $prefix, $args);
+    }
+
+    /**
+     * Write an error log with the plugin id as source
+     * @param string $prefix  A quick description or action
+     * @param array|string $message Variable number of message args (string or array)
+     * @return void
+     */
+    public function logError($prefix, $message)
+    {
+        $args = func_get_args();
+        array_shift($args);
+        Logger::log2(LOG_LEVEL_ERROR, $this->getId(), $prefix, $args);
+    }
+
+    /**
+     * Detect if this plugin declares a StreamWrapper, and if yes loads it and register the stream.
+     * @param bool $register
+     * @return array|bool
+     */
+    public function detectStreamWrapper($register = false, ContextInterface $ctx = null)
+    {
+        if (isSet($this->streamData)) {
+            if($this->streamData === false) return false;
+            $streamData = $this->streamData;
+            // include wrapper, no other checks needed.
+            include_once(AJXP_INSTALL_PATH."/".$streamData["filename"]);
+        } else {
+            if($this->manifestXML != null) $this->unserializeManifest();
+            $files = $this->xPath->query("class_stream_wrapper");
+            if (!$files->length) {
+                $this->streamData = false;
+                return false;
+            }
+            $streamData = $this->nodeAttrToHash($files->item(0));
+            if (!is_file(AJXP_INSTALL_PATH."/".$streamData["filename"])) {
+                $this->streamData = false;
+                return false;
+            }
+            include_once(AJXP_INSTALL_PATH."/".$streamData["filename"]);
+            if (!class_exists($streamData["classname"])) {
+                $this->streamData = false;
+                return false;
+            }
+            $this->streamData = $streamData;
+        }
+        if ($register) {
+            $pServ = PluginsService::getInstance($ctx);
+            $wrappers = stream_get_wrappers();
+            if (!in_array($streamData["protocol"], $wrappers)) {
+                stream_wrapper_register($streamData["protocol"], $streamData["classname"]);
+                $pServ->registerWrapperClass($streamData["protocol"], $streamData["classname"]);
+            }
+            MetaStreamWrapper::register($wrappers);
+        }
+        return $streamData;
+    }
+    /**
+     * Add a name/value pair in the manifest to be published to the world.
+     * @param $configName
+     * @param $configValue
+     * @return void
+     */
+    protected function exposeConfigInManifest($configName, $configValue)
+    {
+        if($this->manifestXML != null) $this->unserializeManifest();
+        $confBranch = $this->xPath->query("plugin_configs");
+        if (!$confBranch->length) {
+            $configNode = $this->manifestDoc->importNode(new \DOMElement("plugin_configs", ""));
+            $this->manifestDoc->documentElement->appendChild($configNode);
+        } else {
+            $configNode = $confBranch->item(0);
+        }
+        $prop = $this->manifestDoc->createElement("property");
+        $propValue = $this->manifestDoc->createCDATASection(json_encode($configValue));
+        $prop->appendChild($propValue);
+        $attName = $this->manifestDoc->createAttribute("name");
+        $attValue = $this->manifestDoc->createTextNode($configName);
+        $attName->appendChild($attValue);
+        $prop->appendChild($attName);
+        $configNode->appendChild($prop);
+        $this->reloadXPath();
+    }
+
+    /**
+     * @return array
+     */
+    public function getPluginInformation()
+    {
+        $info = [
+            "plugin_author" => "",
+            "plugin_uri"   => "",
+            "core_packaged" => true,
+            "plugin_version"=> "follow",
+            "core_version" => AJXP_VERSION,
+        ];
+        if($this->manifestXML != null) $this->unserializeManifest();
+        $infoBranch = $this->xPath->query("plugin_info");
+        if ($infoBranch->length) {
+            /** @var \DOMElement $child */
+            foreach ($infoBranch->item(0)->childNodes as $child) {
+                if($child->nodeType != 1) continue;
+                if ($child->nodeName != "core_relation") {
+                    $info[$child->nodeName] = $child->nodeValue;
+                } else {
+                    if($child->getAttribute("packaged") == "false") $info["core_packaged"] = false;
+                    $coreV = $child->getAttribute("tested_version");
+                    if($coreV == "follow") $coreV = AJXP_VERSION;
+                    $info["core_version"] = $coreV;
+                }
+            }
+        }
+        return $info;
+    }
+
+    /**
+     * @param $defaultAuthor
+     * @param $defaultUriBase
+     * @return string
+     */
+    public function getPluginInformationHTML($defaultAuthor, $defaultUriBase)
+    {
+        $pInfo = $this->getPluginInformation();
+        $pInfoString = "";
+        if (empty($pInfo["plugin_uri"])) {
+            if($pInfo["core_packaged"]) $pInfo["plugin_uri"] = $defaultUriBase.$this->getType()."/".$this->getName()."/";
+            else $pInfo["plugin_uri"] = "N/A";
+        }
+        if ($pInfo["plugin_uri"] != "N/A") {
+            $pInfo["plugin_uri"] = "<a href='".$pInfo["plugin_uri"]."' title='".$pInfo["plugin_uri"]."' target='_blank'>".$pInfo["plugin_uri"]."</a>";
+        }
+        if ($pInfo["core_packaged"]) {
+            unset($pInfo["plugin_version"]);
+            unset($pInfo["core_version"]);
+        }
+        $pInfo["core_packaged"] = ($pInfo["core_packaged"] === true ? "Yes": "No");
+        $humanKeys = [
+            "plugin_author" => "Author",
+            "plugin_version" => "Version",
+            "plugin_uri"    => "Url",
+            "core_packaged" => "Core distrib.",
+            "core_version"   => "Core version"
+        ];
+        if(empty($pInfo["plugin_author"])) $pInfo["plugin_author"] = $defaultAuthor;
+        foreach ($pInfo as $k => $v) {
+            $pInfoString .= "<li><span class='pluginfo_key'>".$humanKeys[$k]."</span><span class='pluginfo_value'>$v</span></li>";
+        }
+        return "<ul class='pluginfo_list'>$pInfoString</ul>";
+    }
+
+    /**
+     * @return void
+     */
+    public function reloadXPath()
+    {
+        // Relaunch xpath
+        $this->xPath = new \DOMXPath($this->manifestDoc);
+    }
+    /**
+     * @param $mixinName
+     * @return bool
+     */
+    public function hasMixin($mixinName)
+    {
+        return (in_array($mixinName, $this->mixins));
+    }
+    /**
+     * Check if the plugin declares mixins, and load them using PluginsService::patchPluginWithMixin method
+     * @return void
+     */
+    protected function loadMixins()
+    {
+        $attr = $this->manifestDoc->documentElement->getAttribute("mixins");
+        if ($attr != "") {
+            $this->mixins = explode(",", $attr);
+            foreach ($this->mixins as $mixin) {
+                PluginsService::getInstance()->patchPluginWithMixin($this, $this->manifestDoc, $mixin);
+            }
+        }
+    }
+
+    /**
+     * Transform a simple node and its attributes to a HashTable
+     *
+     * @param \DOMNode $node
+     * @return array
+     */
+    protected function nodeAttrToHash($node)
+    {
+        $hash = [];
+        $attributes  = $node->attributes;
+        if ($attributes!=null) {
+            foreach ($attributes as $domAttr) {
+                $hash[$domAttr->name] = $domAttr->value;
+            }
+        }
+        return $hash;
+    }
+    /**
+     * Compare two nodes at first level (nodename and attributes)
+     *
+     * @param \DOMNode $node1
+     * @param \DOMNode $node2
+     * @return bool
+     */
+    protected function nodesEqual($node1, $node2)
+    {
+        if($node1->nodeName != $node2->nodeName) return false;
+        $hash1 = $this->nodeAttrToHash($node1);
+        $hash2 = $this->nodeAttrToHash($node2);
+        foreach ($hash1 as $name=>$value) {
+            if(!isSet($hash2[$name]) || $hash2[$name] != $value) return false;
+        }
+        return true;
+    }
+}
diff --git a/core/src/core/src/pydio/Core/PluginFramework/PluginsService.php b/core/src/core/src/pydio/Core/PluginFramework/PluginsService.php
new file mode 100644
index 0000000000..3a6b658c0c
--- /dev/null
+++ b/core/src/core/src/pydio/Core/PluginFramework/PluginsService.php
@@ -0,0 +1,1379 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\PluginFramework;
+
+use DOMXPath;
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Access\Core\Model\Repository;
+use Pydio\Cache\Core\AbstractCacheDriver;
+use Pydio\Conf\Core\AbstractConfDriver;
+use Pydio\Conf\Core\CoreConfLoader;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Exception\PydioUserAlertException;
+use Pydio\Core\Exception\RepositoryLoadException;
+use Pydio\Core\Http\TopLevelRouter;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+
+
+use Pydio\Core\Model\RepositoryInterface;
+use Pydio\Core\Services\CacheService;
+
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\FileHelper;
+use Pydio\Log\Core\Logger;
+use Pydio\Access\Meta\Core\AbstractMetaSource;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Core parser for loading / serving plugins
+ * @package Pydio
+ * @subpackage Core
+ */
+class PluginsService
+{
+    /**
+     * @var PluginsService[]
+     */
+    private static $instances = [];
+
+    /**
+     * All detected plugins
+     * @var array
+     */
+    private $detectedPlugins = [];
+
+    /**
+     * @var ContextInterface
+     */
+    private $context;
+
+    /**
+     * @var string
+     */
+    private $pluginsDir;
+
+    private $required_files = [];
+    private $activePlugins = [];
+    private $streamWrapperPlugins = [];
+    private $registeredWrappers = [];
+    private $xmlRegistry;
+    private $registryVersion;
+    private $tmpDeferRegistryBuild = false;
+
+    private $mixinsDoc;
+    private $mixinsXPath;
+
+    /*********************************/
+    /*         STATIC FUNCTIONS      */
+    /*********************************/
+
+    /**
+     * Load registry either from cache or from plugins folder.
+     * @throws PydioException
+     */
+    public static function initCoreRegistry(){
+
+        $coreInstance = self::getInstance(Context::emptyContext());
+        $coreInstance->getDetectedPlugins();
+
+    }
+
+    /**
+     * Clear the cached files with the plugins
+     */
+    public static function clearPluginsCache(){
+        @unlink(AJXP_PLUGINS_CACHE_FILE);
+        @unlink(AJXP_PLUGINS_REQUIRES_FILE);
+        @unlink(AJXP_PLUGINS_QUERIES_CACHE);
+        @unlink(AJXP_PLUGINS_BOOTSTRAP_CACHE);
+        @unlink(AJXP_CACHE_DIR."/".TopLevelRouter::ROUTE_CACHE_FILENAME);
+        if(@unlink(AJXP_PLUGINS_REPOSITORIES_CACHE)){
+            $content = "<?php \n";
+            $boots = glob(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/*/repositories.php");
+            if($boots !== false){
+                foreach($boots as $b){
+                    $content .= 'require_once("'.$b.'");'."\n";
+                }
+            }
+            @file_put_contents(AJXP_PLUGINS_REPOSITORIES_CACHE, $content);
+        }
+    }
+
+    /**
+     * Clear the cached registries
+     */
+    public static function clearRegistryCaches(){
+        foreach(self::$instances as $instance){
+            CacheService::delete(AJXP_CACHE_SERVICE_NS_SHARED, $instance->getRegistryCacheKey(true));
+            CacheService::delete(AJXP_CACHE_SERVICE_NS_SHARED, $instance->getRegistryCacheKey(false));
+        }
+    }
+
+    /**
+     * @return AbstractConfDriver
+     */
+    public static function confPluginSoftLoad()
+    {
+        $ctx = Context::emptyContext();
+        /** @var AbstractConfDriver $booter */
+        $booter = PluginsService::getInstance($ctx)->softLoad("boot.conf", []);
+        $coreConfigs = $booter->loadPluginConfig("core", "conf");
+        $corePlug = PluginsService::getInstance($ctx)->softLoad("core.conf", []);
+        $corePlug->loadConfigs($coreConfigs);
+        return $corePlug->getImplementation();
+
+    }
+
+    /**
+     * @return AbstractCacheDriver
+     */
+    public static function cachePluginSoftLoad()
+    {
+        $ctx = Context::emptyContext();
+        $coreConfigs = [];
+        $corePlug = PluginsService::getInstance($ctx)->softLoad("core.cache", []);
+        /** @var CoreConfLoader $coreConf */
+        $coreConf = PluginsService::getInstance($ctx)->softLoad("core.conf", []);
+        $coreConf->loadBootstrapConfForPlugin("core.cache", $coreConfigs);
+        if (!empty($coreConfigs)) $corePlug->loadConfigs($coreConfigs);
+        return $corePlug->getImplementation();
+    }
+
+    /**
+     * Find a plugin by its type/name
+     * @param string $type
+     * @param string $name
+     * @return Plugin
+     */
+    public static function findPluginWithoutCtxt($type, $name)
+    {
+        return self::getInstance()->getPluginByTypeName($type, $name);
+    }
+
+    /**
+     * Singleton method
+     * @param ContextInterface|null $ctx
+     * @return PluginsService the service instance
+     */
+    public static function getInstance($ctx = null)
+    {
+        if(empty($ctx)){
+            $ctx = Context::emptyContext();
+        }
+        $identifier = $ctx->getStringIdentifier();
+        if (!isSet(self::$instances[$identifier])) {
+            $c = __CLASS__;
+            /**
+             * @var PluginsService $pServ
+             */
+            self::$instances[$identifier] = $pServ = new $c($ctx);
+            if(!$ctx->isEmpty()) {
+                $emptyInstance = self::getInstance(Context::contextWithObjects(null, null));
+                //$pServ->getDetectedPlugins();
+                $pServ->cloneDetectedPluginsFromCoreInstance($emptyInstance);
+                $pServ->copyCorePluginFromService($emptyInstance, "conf");
+                $pServ->copyCorePluginFromService($emptyInstance, "cache");
+                $pServ->copyCorePluginFromService($emptyInstance, "auth");
+                if($ctx->hasRepository()){
+                    $pServ->initRepositoryPlugins($ctx);
+                }
+                $pServ->initActivePlugins();
+            }else{
+                $pServ->getDetectedPlugins();
+            }
+        }
+        return self::$instances[$identifier];
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     */
+    public static function clearInstance($ctx){
+        $identifier = $ctx->getStringIdentifier();
+        if(isSet(self::$instances[$identifier])){
+            unset(self::$instances[$identifier]);
+            gc_collect_cycles();
+        }
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @throws RepositoryLoadException
+     * @throws PydioUserAlertException
+     */
+    private function initRepositoryPlugins($ctx){
+
+        $errors = [];
+        $repository = $ctx->getRepository();
+        if(empty($repository)){
+            throw new RepositoryLoadException($repository, []);
+        }
+        $accessType = $repository->getAccessType();
+        /** @var AbstractAccessDriver $plugInstance */
+        $plugInstance = $this->getPluginByTypeName("access", $accessType);
+        if(!$plugInstance instanceof AbstractAccessDriver){
+            throw new RepositoryLoadException($repository, ["Could not load plugin as an accessDriver"]);
+        }
+
+        // TRIGGER BEFORE INIT META
+        $metaSources = $repository->getContextOption($ctx, "META_SOURCES");
+        if (isSet($metaSources) && is_array($metaSources) && count($metaSources)) {
+            $keys = array_keys($metaSources);
+            foreach ($keys as $plugId) {
+                if($plugId == "") continue;
+                /** @var AbstractMetaSource $instance */
+                $instance = $this->getPluginById($plugId);
+                if (!is_object($instance)) {
+                    continue;
+                }
+                if (!method_exists($instance, "beforeInitMeta")) {
+                    continue;
+                }
+                try {
+                    $options = $metaSources[$plugId];
+                    if($ctx->hasUser()) {
+                        $options = $ctx->getUser()->getMergedRole()->filterPluginConfigs($plugId, $options, $repository->getId());
+                    }
+                    $instance->init($ctx, $options);
+                    $instance->beforeInitMeta($ctx, $plugInstance);
+                } catch (\Exception $e) {
+                    Logger::error(__CLASS__, 'Meta plugin', 'Cannot instanciate Meta plugin, reason : '.$e->getMessage());
+                    $errors[] = $e->getMessage();
+                }
+            }
+        }
+
+        // INIT MAIN DRIVER
+        try {
+            $plugInstance->init($ctx);
+        }catch (PydioUserAlertException $ua){
+            throw $ua;
+        }catch (\Exception $e){
+            new RepositoryLoadException($repository, [$e->getMessage()]);
+        }
+        $repository->setDriverInstance($plugInstance);
+
+        $this->deferBuildingRegistry();
+        $this->setPluginUniqueActiveForType("access", $accessType);
+
+        // TRIGGER INIT META
+        $metaSources = $repository->getContextOption($ctx, "META_SOURCES");
+        if (isSet($metaSources) && is_array($metaSources) && count($metaSources)) {
+            $keys = array_keys($metaSources);
+            foreach ($keys as $plugId) {
+                if($plugId == "") continue;
+                $split = explode(".", $plugId);
+                /** @var AbstractMetaSource $instance */
+                $instance = $this->getPluginById($plugId);
+                if (!is_object($instance)) {
+                    continue;
+                }
+                try {
+                    $options = $metaSources[$plugId];
+                    if($ctx->hasUser()) {
+                        $options = $ctx->getUser()->getMergedRole()->filterPluginConfigs($plugId, $options, $repository->getId());
+                    }
+                    $instance->init($ctx, $options);
+                    if(!method_exists($instance, "initMeta")) {
+                        throw new \Exception("Meta Source $plugId does not implement the initMeta method.");
+                    }
+                    $instance->initMeta($ctx, $plugInstance);
+                } catch (\Exception $e) {
+                    Logger::error(__CLASS__, 'Meta plugin', 'Cannot instanciate Meta plugin, reason : '.$e->getMessage());
+                    $errors[] = $e->getMessage();
+                }
+                $this->setPluginActive($split[0], $split[1]);
+            }
+        }
+        $this->flushDeferredRegistryBuilding();
+        if(count($errors)){
+            throw new RepositoryLoadException($repository, $errors);
+        }
+
+    }
+
+    /**
+     * @param PluginsService $source
+     * @param string $type
+     */
+    private function copyCorePluginFromService($source, $type){
+
+        /**
+         * @var CoreInstanceProvider $corePlugin
+         */
+        $corePlugin = $source->getPluginByTypeName("core", $type);
+        $this->setPluginActive("core", $corePlugin->getName(), true, $corePlugin);
+        $implementation = $corePlugin->getImplementation();
+        if(!empty($implementation)){
+            $this->setPluginUniqueActiveForType($type, $implementation->getName(), $implementation);
+        }
+
+    }
+
+    /**
+     * Search in all plugins (enabled / active or not) and store result in cache
+     * @param string $query
+     * @param callable $typeChecker
+     * @param callable $callback
+     * @return mixed
+     */
+    public static function searchManifestsWithCache($query, $callback, $typeChecker = null){
+        $coreInstance = self::getInstance(Context::emptyContext());
+        $result = $coreInstance->loadFromPluginQueriesCache($query);
+        if(empty($typeChecker)){
+            $typeChecker = function($test){
+                return ($test !== null && is_array($test));
+            };
+        }
+        if($typeChecker($result)){
+            return $result;
+        }
+        $nodes = $coreInstance->searchAllManifests($query, "node", false, false, true);
+        $result = $callback($nodes);
+        $coreInstance->storeToPluginQueriesCache($query, $result);
+        return $result;
+    }
+
+    /**
+     * Search all plugins manifest with an XPath query, and return either the Nodes, or directly an XML string.
+     * @param string $query
+     * @param string $stringOrNodeFormat
+     * @param boolean $limitToActivePlugins Whether to search only in active plugins or in all plugins
+     * @param bool $limitToEnabledPlugins
+     * @param bool $loadExternalFiles
+     * @return \DOMNode[]
+     */
+    public function searchAllManifests($query, $stringOrNodeFormat = "string", $limitToActivePlugins = false, $limitToEnabledPlugins = false, $loadExternalFiles = false)
+    {
+        $buffer = "";
+        $nodes = [];
+        $detectedPlugins = $this->getDetectedPlugins();
+        foreach ($detectedPlugins as $plugType) {
+            /** @var Plugin $plugObject */
+            foreach ($plugType as $plugName => $plugObject) {
+                if ($limitToActivePlugins) {
+                    $plugId = $plugObject->getId();
+                    if ($limitToActivePlugins && (!isSet($this->activePlugins[$plugId]) || $this->activePlugins[$plugId] === false)) {
+                        continue;
+                    }
+                }
+                if ($limitToEnabledPlugins) {
+                    if(!$plugObject->isEnabled()) continue;
+                }
+                $res = $plugObject->getManifestRawContent($query, $stringOrNodeFormat, $loadExternalFiles);
+                if ($stringOrNodeFormat == "string") {
+                    $buffer .= $res;
+                } else {
+                    foreach ($res as $node) {
+                        $nodes[] = $node;
+                    }
+                }
+            }
+        }
+        if($stringOrNodeFormat == "string") return $buffer;
+        else return $nodes;
+    }
+
+
+    /**
+     * Gather stream data from repositories driver, without loading the whole context.
+     *
+     * @param RepositoryInterface[] $repositories
+     * @return array
+     */
+    public static function detectRepositoriesStreams($repositories){
+        $streams = [];
+        foreach ($repositories as $repository) {
+            $accessType = $repository->getAccessType();
+            // Find access driver from base plugins
+            $plugin = self::findPluginWithoutCtxt("access", $accessType);
+            if($plugin instanceof AbstractAccessDriver){
+                $streamData = $plugin->detectStreamWrapper(false);
+                if($streamData !== false) $streams[$streamData["protocol"]] = $accessType;
+            }
+        }
+        return $streams;
+    }
+
+    /*********************************/
+    /*        PUBLIC FUNCTIONS       */
+    /*********************************/
+
+    /**
+     * Get publicable XML Registry, filtered by roles
+     * @param bool $extendedVersion
+     * @param bool $clone
+     * @param bool $useCache
+     * @return \DOMDocument|\DOMNode
+     */
+    public function getFilteredXMLRegistry($extendedVersion = true, $clone = false, $useCache = false)
+    {
+        if ($useCache) {
+            $cacheKey = $this->getRegistryCacheKey($extendedVersion);
+            $tStamps = [];
+            if($this->context->hasUser()) $tStamps[] = "pydio:user:".$this->context->getUser()->getId();
+            if($this->context->hasRepository()) $tStamps[] = "pydio:repository:".$this->context->getRepositoryId();
+            $cachedXml = CacheService::fetchWithTimestamps(AJXP_CACHE_SERVICE_NS_SHARED, $cacheKey, $tStamps);
+            if ($cachedXml !== false) {
+                $registry = new \DOMDocument("1.0", "utf-8");
+                $registry->loadXML($cachedXml);
+                $this->updateXmlRegistry($registry, $extendedVersion);
+                if ($clone) {
+                    return $registry->cloneNode(true);
+                } else {
+                    return $registry;
+                }
+            }
+        }
+
+        $registry = $this->getXmlRegistry($extendedVersion);
+        if(UsersService::usersEnabled()){
+            $changes = $this->filterRegistryFromRole($registry, $this->context);
+            if ($changes) {
+                $this->updateXmlRegistry($registry, $extendedVersion);
+            }
+        }
+
+        if ($useCache && isSet($cacheKey)) {
+            CacheService::saveWithTimestamp(AJXP_CACHE_SERVICE_NS_SHARED, $cacheKey, $registry->saveXML());
+        }
+
+        if ($clone) {
+            $cloneDoc = $registry->cloneNode(true);
+            $registry = $cloneDoc;
+        }
+        return $registry;
+
+    }
+
+    /**
+     * @param string $plugType
+     * @param string $plugName
+     * @return Plugin
+     */
+    public function getPluginByTypeName($plugType, $plugName)
+    {
+        if (isSet($this->detectedPlugins[$plugType]) && isSet($this->detectedPlugins[$plugType][$plugName])) {
+            return $this->detectedPlugins[$plugType][$plugName];
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Loads the full registry, from the cache only
+     * @param AbstractCacheDriver
+     * @return bool
+     */
+    private function loadPluginsFromCache($cacheStorage) {
+
+        if(!empty($this->detectedPlugins)){
+            return true;
+        }
+        if(!empty($cacheStorage) && $this->_loadDetectedPluginsFromCache($cacheStorage)){
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Loads the full registry, from the cache or not
+     * @param String $pluginFolder
+     * @param AbstractConfDriver $confStorage
+     * @param AbstractCacheDriver|null $cacheStorage
+     */
+    private function loadPlugins($pluginFolder, $confStorage, $cacheStorage)
+    {
+        if (!empty($cacheStorage) && $this->loadPluginsFromCache($cacheStorage)) {
+            return;
+        }
+
+        if (is_string($pluginFolder)) {
+            $pluginFolder = [$pluginFolder];
+        }
+
+        $pluginsPool = [];
+        foreach ($pluginFolder as $sourceFolder) {
+            $handler = @opendir($sourceFolder);
+            if ($handler) {
+                while ( ($item = readdir($handler)) !==false) {
+                    if($item == "." || $item == ".." || !@is_dir($sourceFolder."/".$item) || strstr($item,".")===false) continue ;
+                    $plugin = new Plugin($item, $sourceFolder."/".$item);
+                    $plugin->loadManifest();
+                    if ($plugin->manifestLoaded()) {
+                        $pluginsPool[$plugin->getId()] = $plugin;
+                        if (method_exists($plugin, "detectStreamWrapper") && $plugin->detectStreamWrapper(false) !== false) {
+                            $this->streamWrapperPlugins[] = $plugin->getId();
+                        }
+                    }
+                }
+                closedir($handler);
+            }
+        }
+        if (count($pluginsPool)) {
+            $this->checkDependencies($pluginsPool);
+            foreach ($pluginsPool as $plugin) {
+                $this->recursiveLoadPlugin($confStorage, $plugin, $pluginsPool);
+            }
+        }
+
+        if (!defined("AJXP_SKIP_CACHE") || AJXP_SKIP_CACHE === false) {
+            FileHelper::saveSerialFile(AJXP_PLUGINS_REQUIRES_FILE, $this->required_files, false, false);
+            FileHelper::saveSerialFile(AJXP_PLUGINS_CACHE_FILE, $this->detectedPlugins, false, false);
+            if (is_file(AJXP_PLUGINS_QUERIES_CACHE)) {
+                @unlink(AJXP_PLUGINS_QUERIES_CACHE);
+            }
+
+            $this->savePluginsRegistryToCache($cacheStorage);
+        }
+    }
+
+    /**
+     * Simply load a plugin class, without the whole dependencies et.all
+     * @param string $pluginId
+     * @param array $pluginOptions
+     * @return Plugin|CoreInstanceProvider
+     */
+    public function softLoad($pluginId, $pluginOptions)
+    {
+        // Try to get from cache
+        list($type, $name) = explode(".", $pluginId);
+        if(!empty($this->detectedPlugins) && isSet($this->detectedPlugins[$type][$name])) {
+            /**
+             * @var Plugin $plugin
+             */
+            $plugin = $this->detectedPlugins[$type][$name];
+            $plugin->init($this->context, $pluginOptions);
+            return clone $plugin;
+        }
+
+
+        $plugin = new Plugin($pluginId, AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/".$pluginId);
+        $plugin->loadManifest();
+        $plugin = $this->instanciatePluginClass($plugin);
+        $plugin->loadConfigs([]); // Load default
+        $plugin->init($this->context, $pluginOptions);
+        return $plugin;
+    }
+
+    /**
+     * All the plugins of a given type
+     * @param string $type
+     * @return Plugin[]
+     */
+    public function getPluginsByType($type)
+    {
+        if(isSet($this->detectedPlugins[$type])) return $this->detectedPlugins[$type];
+        else return [];
+    }
+
+    /**
+     * Get a plugin instance
+     *
+     * @param string $pluginId
+     * @return Plugin
+     */
+    public function getPluginById($pluginId)
+    {
+        $split = explode(".", $pluginId);
+        return $this->getPluginByTypeName($split[0], $split[1]);
+    }
+
+    /**
+     * Load data from cache
+     * @param $key
+     * @return mixed|null
+     */
+    public function loadFromPluginQueriesCache($key)
+    {
+        if(AJXP_SKIP_CACHE) return null;
+        $test = FileHelper::loadSerialFile(AJXP_PLUGINS_QUERIES_CACHE);
+        if (!empty($test) && is_array($test) && isset($test[$key])) {
+            return $test[$key];
+        }
+        return null;
+    }
+
+    /**
+     * Copy data to cache
+     * @param $key
+     * @param $value
+     * @throws \Exception
+     */
+    public function storeToPluginQueriesCache($key, $value)
+    {
+        if(AJXP_SKIP_CACHE) return;
+        $test = FileHelper::loadSerialFile(AJXP_PLUGINS_QUERIES_CACHE);
+        if(!is_array($test)) $test = [];
+        $test[$key] = $value;
+        FileHelper::saveSerialFile(AJXP_PLUGINS_QUERIES_CACHE, $test);
+    }
+
+    /*********************************/
+    /*    PUBLIC: ACTIVE PLUGINS     */
+    /*********************************/
+
+    /**
+     * Set the service in defer mode : do not rebuild
+     * registry on each plugin activation
+     */
+    public function deferBuildingRegistry(){
+        $this->tmpDeferRegistryBuild = true;
+    }
+
+    /**
+     * If service was in defer mode, now build the registry
+     */
+    public function flushDeferredRegistryBuilding(){
+        $this->tmpDeferRegistryBuild = false;
+        if (isSet($this->xmlRegistry)) {
+            $this->buildXmlRegistry(($this->registryVersion == "extended"));
+        }
+    }
+
+    /**
+     * Load the plugins list, and set active the plugins automatically,
+     * except for the specific types that declare a "core.*" plugin. In that case,
+     * either the core class has an AUTO_LOAD_TYPE property and all plugins are activated,
+     * or it's the task of the core class to load the necessary plugin(s) of this type.
+     * @return void
+     */
+    public function initActivePlugins()
+    {
+        $detected = $this->getDetectedPlugins();
+        $this->deferBuildingRegistry();
+        /**
+         * @var Plugin $pObject
+         */
+        $toActivate = [];
+        foreach ($detected as $pType => $pObjects) {
+            $coreP = $this->getPluginByTypeName("core", $pType);
+            if($coreP !== false && !isSet($coreP->AUTO_LOAD_TYPE)) continue;
+            foreach ($pObjects as $pName => $pObject) {
+                $toActivate[$pObject->getId()] = $pObject ;
+            }
+        }
+        $o = $this->getOrderByDependency($toActivate, false);
+        foreach ($o as $id) {
+            $pObject = $toActivate[$id];
+            $pObject->init($this->context, []);
+            try {
+                $pObject->performChecks();
+                if(!$pObject->isEnabled() || $pObject->hasMissingExtensions()) continue;
+                $this->setPluginActive($pObject->getType(), $pObject->getName(), true);
+            } catch (\Exception $e) {
+                //$this->errors[$pName] = "[$pName] ".$e->getMessage();
+            }
+
+        }
+        $this->flushDeferredRegistryBuilding();
+    }
+
+    /**
+     * Add a plugin to the list of active plugins
+     * @param $type
+     * @param $name
+     * @param bool $active
+     * @param Plugin $updateInstance
+     * @return void
+     */
+    public function setPluginActive($type, $name, $active=true, $updateInstance = null)
+    {
+        if ($active) {
+            // Check active plugin dependencies
+            $plug = $this->getPluginById($type.".".$name);
+            if(!$plug || !$plug->isEnabled()) return;
+            $deps = $plug->getActiveDependencies($this);
+            if (count($deps)) {
+                $found = false;
+                foreach ($deps as $dep) {
+                    if (isSet($this->activePlugins[$dep]) && $this->activePlugins[$dep] !== false) {
+                        $found = true; break;
+                    }
+                }
+                if (!$found) {
+                    $this->activePlugins[$type.".".$name] = false;
+                    return ;
+                }
+            }
+        }
+        if(isSet($this->activePlugins[$type.".".$name])){
+            unset($this->activePlugins[$type.".".$name]);
+        }
+        $this->activePlugins[$type.".".$name] = $active;
+        if (isSet($updateInstance) && isSet($this->detectedPlugins[$type][$name])) {
+            $this->detectedPlugins[$type][$name] = $updateInstance;
+        }
+        if (isSet($this->xmlRegistry) && !$this->tmpDeferRegistryBuild) {
+            $this->buildXmlRegistry(($this->registryVersion == "extended"));
+        }
+    }
+
+    /**
+     * Some type require only one active plugin at a time
+     * @param $type
+     * @param $name
+     * @param Plugin $updateInstance
+     * @return void
+     */
+    public function setPluginUniqueActiveForType($type, $name, $updateInstance = null)
+    {
+        $typePlugs = $this->getPluginsByType($type);
+        $originalValue = $this->tmpDeferRegistryBuild;
+        $this->tmpDeferRegistryBuild = true;
+        foreach ($typePlugs as $plugName => $plugObject) {
+            $this->setPluginActive($type, $plugName, false);
+        }
+        $this->tmpDeferRegistryBuild = $originalValue;
+        $this->setPluginActive($type, $name, true, $updateInstance);
+    }
+
+    /**
+     * Retrieve the whole active plugins list
+     * @return array
+     */
+    public function getActivePlugins()
+    {
+        return $this->activePlugins;
+    }
+
+    /**
+     * Retrieve an array of active plugins for type
+     * @param string $type
+     * @param bool $unique
+     * @return Plugin[]
+     */
+    public function getActivePluginsForType($type, $unique = false)
+    {
+        $detectedPlugins = $this->getDetectedPlugins();
+        $acts = [];
+        foreach ($this->activePlugins as $plugId => $active) {
+            if(!$active) continue;
+            list($pT,$pN) = explode(".", $plugId);
+            if ($pT == $type && isset($detectedPlugins[$pT][$pN])) {
+                if ($unique) {
+                    return $detectedPlugins[$pT][$pN];
+                    break;
+                }
+                $acts[$pN] = $detectedPlugins[$pT][$pN];
+            }
+        }
+        if($unique && !count($acts)) return false;
+        return $acts;
+    }
+
+    /**
+     * Return only one of getActivePluginsForType
+     * @param $type
+     * @return Plugin
+     */
+    public function getUniqueActivePluginForType($type)
+    {
+        return $this->getActivePluginsForType($type, true);
+    }
+
+    /**
+     * All the plugins registry, active or not
+     * @param AbstractConfDriver $confPlugin
+     * @param AbstractCacheDriver $cachePlugin
+     * @return array
+     * @throws PydioException
+     */
+    public function getDetectedPlugins($confPlugin = null, $cachePlugin = null)
+    {
+        if(empty($this->detectedPlugins)){
+
+            if($cachePlugin === null){
+                $cachePlugin = self::cachePluginSoftLoad();
+            }
+            if (!$this->loadPluginsFromCache($cachePlugin)) {
+                // Load from conf
+                try {
+                    if($confPlugin === null){
+                        $confPlugin = self::confPluginSoftLoad();
+                    }
+                    $this->loadPlugins($this->pluginsDir, $confPlugin, $cachePlugin);
+                } catch (\Exception $e) {
+                    throw new PydioException("Severe error while loading plugins registry : ".$e->getMessage());
+                }
+            }
+        }
+        return $this->detectedPlugins;
+    }
+
+    /**
+     * @param $emptyInstance PluginsService
+     */
+    public function cloneDetectedPluginsFromCoreInstance($emptyInstance){
+        $detected = $emptyInstance->getDetectedPlugins();
+        $this->detectedPlugins = [];
+        $this->streamWrapperPlugins = $emptyInstance->streamWrapperPlugins;
+        foreach($detected as $type => $plugins){
+            $this->detectedPlugins[$type] = [];
+            /**
+             * @var string $name
+             * @var Plugin $plugin
+             */
+            foreach($plugins as $name => $plugin){
+                $cloned = clone $plugin;
+                $this->detectedPlugins[$type][$name] = $cloned;
+            }
+        }
+    }
+
+    /*********************************/
+    /*    PUBLIC: WRAPPERS METHODS   */
+    /*********************************/
+    /**
+     * All the plugins that declare a stream wrapper
+     * @return array
+     */
+    public function getStreamWrapperPlugins()
+    {
+        return $this->streamWrapperPlugins;
+    }
+
+    /**
+     * Add the $protocol/$wrapper to an internal cache
+     * @param string $protocol
+     * @param string $wrapperClassName
+     * @return void
+     */
+    public function registerWrapperClass($protocol, $wrapperClassName)
+    {
+        $this->registeredWrappers[$protocol] = $wrapperClassName;
+    }
+
+    /**
+     * Find a classname for a given protocol
+     * @param $protocol
+     * @return string
+     */
+    public function getWrapperClassName($protocol, $register = false)
+    {
+        if(isSet($this->registeredWrappers[$protocol])){
+            return $this->registeredWrappers[$protocol];
+        }
+        /** @var AbstractAccessDriver $access */
+        $access = $this->getActivePluginsForType("access", true);
+        $data = $access->detectStreamWrapper($register);
+        if($data !== null && $data["protocol"] == $protocol){
+            return $data["classname"];
+        }
+        return null;
+    }
+
+    /**
+     * The protocol/classnames table
+     * @return array
+     */
+    public function getRegisteredWrappers()
+    {
+        return $this->registeredWrappers;
+    }
+
+    /**
+     * Append some predefined XML to a plugin instance
+     * @param Plugin $plugin
+     * @param \DOMDocument $manifestDoc
+     * @param String $mixinName
+     */
+    public function patchPluginWithMixin(&$plugin, &$manifestDoc, $mixinName)
+    {
+        // Load behaviours if not already
+        if (!isSet($this->mixinsDoc)) {
+            $this->mixinsDoc = new \DOMDocument();
+            $this->mixinsDoc->load(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/core.ajaxplorer/ajxp_mixins.xml");
+            $this->mixinsXPath = new \DOMXPath($this->mixinsDoc);
+        }
+        // Merge into manifestDoc
+        $nodeList = $this->mixinsXPath->query($mixinName);
+        if(!$nodeList->length) return;
+        $mixinNode = $nodeList->item(0);
+        /** @var \DOMElement $child */
+        foreach ($mixinNode->childNodes as $child) {
+            if($child->nodeType != XML_ELEMENT_NODE) continue;
+            $uuidAttr = $child->getAttribute("uuidAttr") OR "name";
+            $this->mergeNodes($manifestDoc, $child->nodeName, $uuidAttr, $child->childNodes, true);
+        }
+
+        // Reload plugin XPath
+        $plugin->reloadXPath();
+    }
+
+
+    /*********************************/
+    /*         PRIVATE FUNCTIONS     */
+    /*********************************/
+    /**
+     * Save plugin registry to cache
+     * @param AbstractCacheDriver|null $cacheStorage
+     */
+    private function savePluginsRegistryToCache($cacheStorage) {
+        if (!empty ($cacheStorage)) {
+            $cacheStorage->save(AJXP_CACHE_SERVICE_NS_SHARED, "plugins_registry", $this->detectedPlugins);
+        }
+    }
+
+    /**
+     * Go through all plugins and call their getRegistryContributions() method.
+     * Add all these contributions to the main XML ajxp_registry document.
+     * @param bool $extendedVersion Will be passed to the plugin, for optimization purpose.
+     * @return void
+     */
+    private function buildXmlRegistry($extendedVersion = true)
+    {
+        $actives = $this->getActivePlugins();
+        $reg = new \DOMDocument();
+        $reg->loadXML("<ajxp_registry></ajxp_registry>");
+        foreach ($actives as $activeName=>$status) {
+            if($status === false) continue;
+            $plug = $this->getPluginById($activeName);
+            $contribs = $plug->getRegistryContributions($this->context, $extendedVersion);
+            foreach ($contribs as $contrib) {
+                $parent = $contrib->nodeName;
+                $nodes = $contrib->childNodes;
+                if(!$nodes->length) continue;
+                $uuidAttr = $contrib->getAttribute("uuidAttr");
+                if($uuidAttr == "") $uuidAttr = "name";
+                $this->mergeNodes($reg, $parent, $uuidAttr, $nodes);
+            }
+        }
+        $this->xmlRegistry = $reg;
+    }
+
+    /**
+     * Load plugin class with dependencies first
+     *
+     * @param AbstractConfDriver $confStorage
+     * @param Plugin $plugin
+     * @param array $pluginsPool
+     */
+    private function recursiveLoadPlugin(AbstractConfDriver $confStorage, $plugin, $pluginsPool)
+    {
+        if ($plugin->loadingState!="") {
+            return ;
+        }
+        $dependencies = $plugin->getDependencies();
+        $plugin->loadingState = "lock";
+        foreach ($dependencies as $dependencyId) {
+            if (isSet($pluginsPool[$dependencyId])) {
+                $this->recursiveLoadPlugin($confStorage, $pluginsPool[$dependencyId], $pluginsPool);
+            } else if (strpos($dependencyId, "+") !== false) {
+                foreach (array_keys($pluginsPool) as $pId) {
+                    if (strpos($pId, str_replace("+", "", $dependencyId)) === 0) {
+                        $this->recursiveLoadPlugin($confStorage, $pluginsPool[$pId], $pluginsPool);
+                    }
+                }
+            }
+        }
+        $plugType = $plugin->getType();
+        if (!isSet($this->detectedPlugins[$plugType])) {
+            $this->detectedPlugins[$plugType] = [];
+        }
+        $options = $confStorage->loadPluginConfig($plugType, $plugin->getName());
+        if($plugin->isEnabled() || (isSet($options["AJXP_PLUGIN_ENABLED"]) && $options["AJXP_PLUGIN_ENABLED"] === true)){
+            $plugin = $this->instanciatePluginClass($plugin);
+        }
+        $plugin->loadConfigs($options);
+        $this->detectedPlugins[$plugType][$plugin->getName()] = $plugin;
+        $plugin->loadingState = "loaded";
+    }
+
+    /**
+     * @param AbstractCacheDriver $cacheStorage
+     * @return bool
+     */
+    private function _loadDetectedPluginsFromCache($cacheStorage){
+
+        if((!defined("AJXP_SKIP_CACHE") || AJXP_SKIP_CACHE === false)){
+            $reqs = FileHelper::loadSerialFile(AJXP_PLUGINS_REQUIRES_FILE);
+            if (count($reqs)) {
+                foreach ($reqs as $fileName) {
+                    if (!is_file($fileName)) {
+                        // Cache is out of sync
+                        return false;
+                    }
+                    require_once($fileName);
+                }
+
+                $res = null;
+
+                // Retrieving Registry from Server Cache
+                if (!empty($cacheStorage)) {
+                    $res = $cacheStorage->fetch(AJXP_CACHE_SERVICE_NS_SHARED, 'plugins_registry');
+                    if(is_array($res)){
+                        $this->detectedPlugins=$res;
+                    }
+                }
+
+                // Retrieving Registry from files cache
+                if (empty($res)) {
+                    $res = FileHelper::loadSerialFile(AJXP_PLUGINS_CACHE_FILE);
+                    $this->detectedPlugins=$res;
+                    $this->savePluginsRegistryToCache($cacheStorage);
+                }
+
+                // Refresh streamWrapperPlugins
+                foreach ($this->detectedPlugins as $plugs) {
+                    /** @var Plugin $plugin */
+                    foreach ($plugs as $plugin) {
+                        if (method_exists($plugin, "detectStreamWrapper") && $plugin->detectStreamWrapper(false) !== false) {
+                            $this->streamWrapperPlugins[] = $plugin->getId();
+                        }
+                    }
+                }
+
+                return true;
+            }else{
+                return false;
+            }
+        }else{
+            return false;
+        }
+
+    }
+
+    /**
+     * Find a PHP class and instanciate it to replace the empty Plugin
+     *
+     * @param Plugin $plugin
+     * @return Plugin
+     */
+    private function instanciatePluginClass($plugin)
+    {
+        $definition = $plugin->getClassFile();
+        if(!$definition) return $plugin;
+        $filename = AJXP_INSTALL_PATH."/".$definition["filename"];
+        $className = $definition["classname"];
+        if (is_file($filename)) {
+            /**
+             * @var Plugin $newPlugin
+             */
+            require_once($filename);
+            $newPlugin = new $className($plugin->getId(), $plugin->getBaseDir());
+            $newPlugin->loadManifest();
+            $this->required_files[$filename] = $filename;
+            return $newPlugin;
+        } else {
+            return $plugin;
+        }
+    }
+
+    /**
+     * Check that a plugin dependencies are loaded, disable it otherwise.
+     * @param Plugin[] $arrayToSort
+     */
+    private function checkDependencies(&$arrayToSort)
+    {
+        // First make sure that the given dependencies are present
+        foreach ($arrayToSort as $plugId => $plugObject) {
+            $plugObject->updateDependencies($this);
+            if($plugObject->hasMissingExtensions()){
+                unset($arrayToSort[$plugId]);
+                continue;
+            }
+            $dependencies = $plugObject->getDependencies();
+            if(!count($dependencies)) continue;// return ;
+            $found = false;
+            foreach ($dependencies as $requiredPlugId) {
+                if ( strpos($requiredPlugId, "+") !== false || isSet($arrayToSort[$requiredPlugId])) {
+                    $found = true; break;
+                }
+            }
+            if (!$found) {
+                unset($arrayToSort[$plugId]);
+            }
+        }
+    }
+
+    /**
+     * @param $plugins
+     * @param bool $withStatus
+     * @return array
+     */
+    private function getOrderByDependency($plugins, $withStatus = true)
+    {
+        $keys = [];
+        $unkowns = [];
+        if ($withStatus) {
+            foreach ($plugins as $pid => $status) {
+                if($status) $keys[] = $pid;
+            }
+        } else {
+            $keys = array_keys($plugins);
+        }
+        $result = [];
+        while (count($keys) > 0) {
+            $test = array_shift($keys);
+            $testObject = $this->getPluginById($test);
+            $deps = $testObject->getActiveDependencies($this);
+            if (!count($deps)) {
+                $result[] = $test;
+                continue;
+            }
+            $found = false;
+            $inOriginalPlugins = false;
+            foreach ($deps as $depId) {
+                if (in_array($depId, $result)) {
+                    $found = true;
+                    break;
+                }
+                if (!$inOriginalPlugins && array_key_exists($depId, $plugins) && (!$withStatus || $plugins[$depId] == true)) {
+                    $inOriginalPlugins = true;
+                }
+            }
+            if ($found) {
+                $result[] = $test;
+            } else {
+                if($inOriginalPlugins) $keys[] = $test;
+                else {
+                    unset($plugins[$test]);
+                    $unkowns[] = $test;
+                }
+            }
+        }
+        return array_merge($result, $unkowns);
+    }
+
+    /**
+     * Check the current user "specificActionsRights" and filter the full registry actions with these.
+     * @static
+     * @param \DOMDocument $registry
+     * @param ContextInterface $ctx
+     * @return bool
+     */
+    private function filterRegistryFromRole(&$registry, ContextInterface $ctx)
+    {
+        $loggedUser = $ctx->getUser();
+        if ($loggedUser == null) return false;
+        $crtRepo = $ctx->getRepository();
+        $crtRepoId = AJXP_REPO_SCOPE_ALL; // "ajxp.all";
+        if ($crtRepo != null && $crtRepo instanceof Repository) {
+            $crtRepoId = $crtRepo->getId();
+        }
+        $actionRights = $loggedUser->getMergedRole()->listActionsStatesFor($crtRepo);
+        $changes = false;
+        $xPath = new DOMXPath($registry);
+        foreach ($actionRights as $pluginName => $actions) {
+            foreach ($actions as $actionName => $enabled) {
+                if ($enabled !== false) continue;
+                $actions = $xPath->query("actions/action[@name='$actionName']");
+                if (!$actions->length) {
+                    continue;
+                }
+                $action = $actions->item(0);
+                $action->parentNode->removeChild($action);
+                $changes = true;
+            }
+        }
+        $parameters = $loggedUser->getMergedRole()->listParameters();
+        foreach ($parameters as $scope => $paramsPlugs) {
+            if ($scope === AJXP_REPO_SCOPE_ALL || $scope === $crtRepoId || ($crtRepo != null && $crtRepo->hasParent() && $scope === AJXP_REPO_SCOPE_SHARED)) {
+                foreach ($paramsPlugs as $plugId => $params) {
+                    foreach ($params as $name => $value) {
+                        // Search exposed plugin_configs, replace if necessary.
+                        $searchparams = $xPath->query("plugins/*[@id='$plugId']/plugin_configs/property[@name='$name']");
+                        if (!$searchparams->length) continue;
+                        $param = $searchparams->item(0);
+                        $newCdata = $registry->createCDATASection(json_encode($value));
+                        $param->removeChild($param->firstChild);
+                        $param->appendChild($newCdata);
+                    }
+                }
+            }
+        }
+        return $changes;
+    }
+
+    /**
+     * Build the XML Registry if not already built, and return it.
+     * @static
+     * @param bool $extendedVersion
+     * @return \DOMDocument The registry
+     */
+    private function getXmlRegistry($extendedVersion = true)
+    {
+        if (!isSet($this->xmlRegistry) || ($this->registryVersion == "light" && $extendedVersion)) {
+            $this->buildXmlRegistry( $extendedVersion );
+            $this->registryVersion = ($extendedVersion ? "extended":"light");
+        }
+        return $this->xmlRegistry;
+    }
+
+    /**
+     * Replace the current xml registry
+     * @static
+     * @param $registry
+     * @param bool $extendedVersion
+     */
+    private function updateXmlRegistry($registry, $extendedVersion = true)
+    {
+        $this->xmlRegistry = $registry;
+        $this->registryVersion = ($extendedVersion? "extended" : "light");
+    }
+
+    /**
+     * Get a unique string identifier for caching purpose
+     * @param bool $extendedVersion
+     * @return string
+     */
+    private function getRegistryCacheKey($extendedVersion = true)
+    {
+        $phpContext = 'session';
+        if(ApplicationState::getSapiRestBase() !== null){
+            $phpContext = 'rest';
+        }else if(ApplicationState::sapiIsCli()){
+            $phpContext = 'cli';
+        }
+        $v = $extendedVersion ? "extended" : "light";
+        return "xml_registry:". $phpContext . ":" . $v . ":" . $this->context->getStringIdentifier();
+    }
+
+    /**
+     * Central function of the registry construction, merges some nodes into the existing registry.
+     * @param \DOMDocument $original
+     * @param $parentName
+     * @param $uuidAttr
+     * @param $childrenNodes
+     * @param bool $doNotOverrideChildren
+     * @return void
+     */
+    private function mergeNodes(&$original, $parentName, $uuidAttr, $childrenNodes, $doNotOverrideChildren = false)
+    {
+        // find or create parent
+        $parentSelection = $original->getElementsByTagName($parentName);
+        if ($parentSelection->length) {
+            $parentNode = $parentSelection->item(0);
+            $xPath = new \DOMXPath($original);
+            /** @var \DOMElement $child */
+            foreach ($childrenNodes as $child) {
+                if($child->nodeType != XML_ELEMENT_NODE) continue;
+                if ($child->getAttribute($uuidAttr) == "*") {
+                    $query = $parentName.'/'.$child->nodeName;
+                } else {
+                    $query = $parentName.'/'.$child->nodeName.'[@'.$uuidAttr.' = "'.$child->getAttribute($uuidAttr).'"]';
+                }
+                $childrenSel = $xPath->query($query);
+                if ($childrenSel->length) {
+                    if($doNotOverrideChildren) continue;
+                    /** @var \DOMElement $existingNode */
+                    foreach ($childrenSel as $existingNode) {
+                        if($existingNode->getAttribute("forbidOverride") == "true"){
+                            continue;
+                        }
+                        // Clone as many as needed
+                        $clone = $original->importNode($child, true);
+                        $this->mergeChildByTagName($clone, $existingNode);
+                    }
+                } else {
+                    $clone = $original->importNode($child, true);
+                    $parentNode->appendChild($clone);
+                }
+            }
+        } else {
+            //create parentNode and append children
+            if ($childrenNodes->length) {
+                $parentNode = $original->importNode($childrenNodes->item(0)->parentNode, true);
+                $original->documentElement->appendChild($parentNode);
+            } else {
+                $parentNode = $original->createElement($parentName);
+                $original->documentElement->appendChild($parentNode);
+            }
+        }
+    }
+
+    /**
+     * Utilitary function
+     * @param \DOMNode $new
+     * @param \DOMNode $old
+     */
+    private function mergeChildByTagName($new, &$old)
+    {
+        if (!$this->hasElementChild($new) || !$this->hasElementChild($old)) {
+            $old->parentNode->replaceChild($new, $old);
+            return;
+        }
+        /** @var \DOMElement $newChild */
+        foreach ($new->childNodes as $newChild) {
+            if($newChild->nodeType != XML_ELEMENT_NODE) continue;
+
+            $found = null;
+            /** @var \DOMElement $oldChild */
+            foreach ($old->childNodes as $oldChild) {
+                if($oldChild->nodeType != XML_ELEMENT_NODE) continue;
+                if ($oldChild->nodeName == $newChild->nodeName) {
+                    $found = $oldChild;
+                }
+            }
+            if ($found != null) {
+                if ($newChild->nodeName == "post_processing" || $newChild->nodeName == "pre_processing") {
+                    $old->appendChild($newChild->cloneNode(true));
+                } else {
+                    if($found->getAttribute("forbidOverride") == "true") {
+                        continue;
+                    }
+                    $this->mergeChildByTagName($newChild->cloneNode(true), $found);
+                }
+            } else {
+                // CloneNode or it's messing with the current foreach loop.
+                $old->appendChild($newChild->cloneNode(true));
+            }
+        }
+    }
+
+    /**
+     * Utilitary
+     * @param \DOMNode $node
+     * @return bool
+     */
+    private function hasElementChild($node)
+    {
+        if(!$node->hasChildNodes()) return false;
+        foreach ($node->childNodes as $child) {
+            if($child->nodeType == XML_ELEMENT_NODE) return true;
+        }
+        return false;
+    }
+
+    /**
+     * PluginsService constructor.
+     * @param ContextInterface|null $ctx
+     * @param string|null $pluginsDir
+     */
+    private function __construct($ctx = null, $pluginsDir = null)
+    {
+        $this->context = $ctx;
+        if(empty($pluginsDir)){
+            $pluginsDir = AJXP_INSTALL_PATH.DIRECTORY_SEPARATOR.AJXP_PLUGINS_FOLDER;
+        }
+        $this->pluginsDir = $pluginsDir;
+    }
+
+    public function __clone()
+    {
+        trigger_error("Cannot clone me, i'm a singleton!", E_USER_ERROR);
+    }
+}
diff --git a/core/src/core/src/pydio/Core/PluginFramework/SqlTableProvider.php b/core/src/core/src/pydio/Core/PluginFramework/SqlTableProvider.php
new file mode 100644
index 0000000000..f32bba6938
--- /dev/null
+++ b/core/src/core/src/pydio/Core/PluginFramework/SqlTableProvider.php
@@ -0,0 +1,42 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\PluginFramework;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Interface SqlTableProvider
+ * Plugins that need to have their SQL tables installed at startup
+ * must implement this interface.
+ * @package Pydio
+ * @subpackage Core
+ * @interface SqlTableProvider
+ */
+interface SqlTableProvider{
+
+    /**
+     * Install SQL table using a dibi driver data
+     * @param $param array("SQL_DRIVER" => $dibiDriverData)
+     * @return mixed
+     */
+    public function installSQLTables($param);
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Serializer/NodeXML.php b/core/src/core/src/pydio/Core/Serializer/NodeXML.php
new file mode 100644
index 0000000000..93443d10ca
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Serializer/NodeXML.php
@@ -0,0 +1,82 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Serializer;
+
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\StringHelper;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * XML Serializer for AJXP_Node objects
+ * @package Pydio\Core\Serializer
+ */
+class NodeXML
+{
+
+    /**
+     * The basic node
+     * @static
+     * @param string $nodeName
+     * @param string $nodeLabel
+     * @param bool $isLeaf
+     * @param array $metaData
+     * @param bool $close
+     * @return string|void
+     * @internal param bool $print
+     */
+    public static function toNode($nodeName, $nodeLabel, $isLeaf, $metaData = array(), $close = true)
+    {
+        $string = "<tree";
+        $metaData["filename"] = $nodeName;
+        if (InputFilter::detectXSS($nodeName)) $metaData["filename"] = "/XSS Detected - Please contact your admin";
+        if (!isSet($metaData["text"])) {
+            if (InputFilter::detectXSS($nodeLabel)) $nodeLabel = "XSS Detected - Please contact your admin";
+            $metaData["text"] = $nodeLabel;
+        } else {
+            if (InputFilter::detectXSS($metaData["text"])) $metaData["text"] = "XSS Detected - Please contact your admin";
+        }
+        $metaData["is_file"] = ($isLeaf ? "true" : "false");
+        $metaData["ajxp_im_time"] = time();
+        foreach ($metaData as $key => $value) {
+            if (InputFilter::detectXSS($value)) $value = "XSS Detected!";
+            $value = StringHelper::xmlEntities($value, true);
+            $string .= " $key=\"$value\"";
+        }
+        if ($close) {
+            $string .= "/>";
+        } else {
+            $string .= ">";
+        }
+        return $string;
+    }
+
+    /**
+     * @static
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     * @param bool $close
+     * @return string|void
+     */
+    public static function toXML($node, $close = true)
+    {
+        return NodeXML::toNode($node->getPath(), $node->getLabel(), $node->isLeaf(), $node->getNodeInfoMeta(), $close);
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Serializer/RepositoryXML.php b/core/src/core/src/pydio/Core/Serializer/RepositoryXML.php
new file mode 100644
index 0000000000..e5a04a396e
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Serializer/RepositoryXML.php
@@ -0,0 +1,203 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Serializer;
+
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Model\RepositoryInterface;
+use Pydio\Core\Model\UserInterface;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Vars\StringHelper;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class RepositoryXML
+ * @package Pydio\Core\Serializer
+ */
+class RepositoryXML
+{
+    /**
+     * @var array
+     */
+    protected $exposed;
+
+    /**
+     * @var array
+     */
+    protected $streams;
+
+    /**
+     * @var UserInterface
+     */
+    protected $loggedUser;
+
+    /**
+     * RepositoryXML constructor.
+     * @param array $exposed
+     * @param array $streams
+     * @param UserInterface $loggedUser
+     */
+    public function __construct($exposed, $streams, $loggedUser = null)
+    {
+        $this->exposed = $exposed;
+        $this->streams = $streams;
+        $this->loggedUser = $loggedUser;
+    }
+
+    /**
+     * @param RepositoryInterface $repository
+     * @param $isActive
+     * @param $accessStatus
+     * @return string
+     */
+    public function serialize(RepositoryInterface $repository, $isActive, $accessStatus){
+        return $this->repositoryToXML($repository, $isActive, $this->exposed, $this->streams, $this->loggedUser, $accessStatus);
+    }
+
+
+    /**
+     * @param RepositoryInterface $repoObject
+     * @param bool $isActive
+     * @param array $exposed
+     * @param array $streams
+     * @param UserInterface $loggedUser
+     * @param string $accessStatus
+     * @return string
+     * @throws \Exception
+     */
+    protected function repositoryToXML($repoObject, $isActive, $exposed, $streams, $loggedUser, $accessStatus = ""){
+
+        $repoId = $repoObject->getId();
+        $statusString = " repository_type=\"".$repoObject->getRepositoryType()."\"";
+        if(empty($accessStatus)){
+            $accessStatus = $repoObject->getAccessStatus();
+        }
+        if(!empty($accessStatus)){
+            $statusString .= " access_status=\"$accessStatus\" ";
+        }else if($loggedUser != null){
+            $lastConnected = $loggedUser->getArrayPref("repository_last_connected", $repoId);
+            if(!empty($lastConnected)) $statusString .= " last_connection=\"$lastConnected\" ";
+        }
+
+        $streamString = "";
+        if (in_array($repoObject->getAccessType(), $streams)) {
+            $streamString = "allowCrossRepositoryCopy=\"true\"";
+        }
+        if ($repoObject->getUniqueUser()) {
+            $streamString .= " user_editable_repository=\"true\" ";
+        }
+        if ($repoObject->hasContentFilter()){
+            $streamString .= " hasContentFilter=\"true\"";
+        }
+        $slugString = "";
+        $slug = $repoObject->getSlug();
+        if (!empty($slug)) {
+            $slugString = "repositorySlug=\"$slug\"";
+        }
+        $isSharedString = "";
+        $currentUserIsOwner = false;
+        $ownerLabel = null;
+        if ($repoObject->hasOwner()) {
+            $uId = $repoObject->getOwner();
+            if($loggedUser != null && $loggedUser->getId() == $uId){
+                $currentUserIsOwner = true;
+            }
+            $label = UsersService::getUserPersonalParameter("USER_DISPLAY_NAME", $uId, "core.conf", $uId);
+            $ownerLabel = $label;
+            $isSharedString =  'owner="'. StringHelper::xmlEntities($label) .'"';
+        }
+        if ($repoObject->securityScope() == "USER" || $currentUserIsOwner){
+            $streamString .= " userScope=\"true\"";
+        }
+
+        $descTag = "";
+        $description = $repoObject->getDescription(ApplicationState::hasMinisiteHash(), $ownerLabel);
+        if (!empty($description)) {
+            $descTag = '<description>'. StringHelper::xmlEntities($description, true) .'</description>';
+        }
+        $ctx = Context::contextWithObjects($loggedUser, $repoObject);
+        $roleString="";
+        if($loggedUser != null){
+            $merged = $loggedUser->getMergedRole();
+            $params = array();
+            foreach($exposed as $exposed_prop){
+                $metaOptions = $repoObject->getContextOption($ctx, "META_SOURCES");
+                if(!isSet($metaOptions[$exposed_prop["PLUGIN_ID"]])){
+                    continue;
+                }
+                $value = $exposed_prop["DEFAULT"];
+                if(isSet($metaOptions[$exposed_prop["PLUGIN_ID"]][$exposed_prop["NAME"]])){
+                    $value = $metaOptions[$exposed_prop["PLUGIN_ID"]][$exposed_prop["NAME"]];
+                }
+                $value = $merged->filterParameterValue($exposed_prop["PLUGIN_ID"], $exposed_prop["NAME"], $repoId, $value);
+                if($value !== null){
+                    if($value === true  || $value === false) $value = ($value === true ?"true":"false");
+                    $params[] = '<repository_plugin_param plugin_id="'.$exposed_prop["PLUGIN_ID"].'" name="'.$exposed_prop["NAME"].'" value="'. StringHelper::xmlEntities($value) .'"/>';
+                    $roleString .= str_replace(".", "_",$exposed_prop["PLUGIN_ID"])."_".$exposed_prop["NAME"].'="'. StringHelper::xmlEntities($value) .'" ';
+                }
+            }
+            $roleString.='acl="'.$merged->getAcl($repoId).'"';
+            if($merged->hasMask($repoId)){
+                $roleString.= ' hasMask="true" ';
+            }
+        }
+        $clientSettings = (!$isActive ? "" : $this->repositoryClientSettings($repoObject, $ctx));
+        return "<repo access_type=\"".$repoObject->getAccessType()."\" id=\"".$repoId."\"$statusString $streamString $slugString $isSharedString $roleString><label>".StringHelper::xmlEntities($repoObject->getDisplay())."</label>".$descTag.$clientSettings."</repo>";
+
+    }
+
+    /**
+     * @param RepositoryInterface $repoObject
+     * @param ContextInterface $ctx
+     * @return string
+     */
+    protected function repositoryClientSettings($repoObject, $ctx){
+
+        $plugin = $repoObject->getDriverInstance($ctx);
+        if(empty($plugin)){
+            $plugin = PluginsService::getInstance($ctx)->getPluginByTypeName("access", $repoObject->getAccessType());
+        }
+        if(empty($plugin)){
+            return "";
+        }
+        if ($repoObject->hasParent()) {
+            $parentObject = $repoObject->getParentRepository();
+            if ($parentObject != null && $parentObject->isTemplate()) {
+                $ic = $parentObject->getContextOption($ctx, "TPL_ICON_SMALL");
+                $settings = $plugin->getManifestRawContent("//client_settings", "node");
+                if (!empty($ic) && $settings->length) {
+                    $newAttr = $settings->item(0)->ownerDocument->createAttribute("icon_tpl_id");
+                    $newAttr->nodeValue = $repoObject->getParentId();
+                    $settings->item(0)->appendChild($newAttr);
+                    return $settings->item(0)->ownerDocument->saveXML($settings->item(0));
+                }
+            }
+        }
+        return $plugin->getManifestRawContent("//client_settings", "string");
+
+    }
+
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Serializer/UserXML.php b/core/src/core/src/pydio/Core/Serializer/UserXML.php
new file mode 100644
index 0000000000..5f83320280
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Serializer/UserXML.php
@@ -0,0 +1,198 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Serializer;
+
+use Pydio\Access\Core\IAjxpWrapperProvider;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Core\Utils\Vars\XMLFilter;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Vars\StringHelper;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class UserXML
+ * @package Pydio\Core\Serializer
+ */
+class UserXML
+{
+    /**
+     * List all bookmmarks as XML
+     * @static
+     * @param $allBookmarks
+     * @param ContextInterface $context
+     * @param bool $print
+     * @param string $format legacy|node_list
+     * @return string
+     */
+    public static function writeBookmarks($allBookmarks, $context, $print = true, $format = "legacy")
+    {
+        $driver = false;
+        $repository = $context->getRepository();
+        if ($format == "node_list") {
+            $driver = $repository->getDriverInstance($context);
+            if (!($driver instanceof IAjxpWrapperProvider)) {
+                $driver = false;
+            }
+        }
+        $buffer = "";
+        foreach ($allBookmarks as $bookmark) {
+            $path = "";
+            $title = "";
+            if (is_array($bookmark)) {
+                $path = $bookmark["PATH"];
+                $title = $bookmark["TITLE"];
+            } else if (is_string($bookmark)) {
+                $path = $bookmark;
+                $title = basename($bookmark);
+            }
+            if ($format == "node_list") {
+                if ($driver) {
+                    $node = new AJXP_Node($context->getUrlBase() . $path);
+                    $buffer .= NodeXML::toXML($node, true);
+                } else {
+                    $buffer .= NodeXML::toNode($path, $title, false, array('icon' => "mime_empty.png"), true);
+                }
+            } else {
+                $buffer .= "<bookmark path=\"" . StringHelper::xmlEntities($path, true) . "\" title=\"" . StringHelper::xmlEntities($title, true) . "\"/>";
+            }
+        }
+        if ($print) {
+            print $buffer;
+            return null;
+        } else {
+            return $buffer;
+        }
+    }
+
+    /**
+     * Extract all the user data and put it in XML
+     * @param ContextInterface $ctx
+     * @return string
+     */
+    public function serialize(ContextInterface $ctx)
+    {
+        $buffer = "";
+        $loggedUser = $ctx->getUser();
+        $currentRepoId = $ctx->getRepositoryId();
+        $confDriver = ConfService::getConfStorageImpl();
+
+        if (!UsersService::usersEnabled()) {
+            $buffer.="<user id=\"shared\">";
+            $buffer.="<active_repo id=\"".$currentRepoId."\" write=\"1\" read=\"1\"/>";
+            $buffer.= $this->writeRepositoriesData($ctx);
+            $buffer.="</user>";
+        } else if ($loggedUser !== null) {
+            $lock = $loggedUser->getLock();
+            $buffer.="<user id=\"".$loggedUser->getId()."\">";
+            $buffer.="<active_repo id=\"".$currentRepoId."\" write=\"".($loggedUser->canWrite($currentRepoId)?"1":"0")."\" read=\"".($loggedUser->canRead($currentRepoId)?"1":"0")."\"/>";
+            $buffer.= $this->writeRepositoriesData($ctx);
+            $buffer.="<preferences>";
+            $preferences = $confDriver->getExposedPreferences($loggedUser);
+            foreach ($preferences as $prefName => $prefData) {
+                $atts = "";
+                if (isSet($prefData["exposed"]) && $prefData["exposed"] == true) {
+                    foreach ($prefData as $k => $v) {
+                        if($k=="name") continue;
+                        if($k == "value") $k = "default";
+                        $atts .= "$k='$v' ";
+                    }
+                }
+                if (isset($prefData["pluginId"])) {
+                    $atts .=  "pluginId='".$prefData["pluginId"]."' ";
+                }
+                if ($prefData["type"] == "string") {
+                    $buffer.="<pref name=\"$prefName\" value=\"".$prefData["value"]."\" $atts/>";
+                } else if ($prefData["type"] == "json") {
+                    $buffer.="<pref name=\"$prefName\" $atts><![CDATA[".$prefData["value"]."]]></pref>";
+                }
+            }
+            $buffer.="</preferences>";
+            $buffer.="<special_rights is_admin=\"".($loggedUser->isAdmin()?"1":"0")."\"  ".($lock!==false?"lock=\"$lock\"":"")."/>";
+            $buffer.="</user>";
+        }
+        return $buffer;
+    }
+
+    /**
+     * Write the repositories access rights in XML format
+     * @static
+     * @param ContextInterface $ctx
+     * @return string
+     */
+    protected function writeRepositoriesData(ContextInterface $ctx)
+    {
+        $loggedUser = $ctx->getUser();
+        $accessible = UsersService::getRepositoriesForUser($loggedUser);
+        $streams = PluginsService::detectRepositoriesStreams($accessible);
+        $exposed = PluginsService::searchManifestsWithCache("//server_settings/param[contains(@scope,'repository') and @expose='true']", function($nodes){
+            $exposedNodes = [];
+            /** @var \DOMElement $exposed_prop */
+            foreach($nodes as $exposed_prop){
+                $pluginId = $exposed_prop->parentNode->parentNode->getAttribute("id");
+                $paramName = $exposed_prop->getAttribute("name");
+                $paramDefault = $exposed_prop->getAttribute("default");
+                $exposedNodes[] = array("PLUGIN_ID" => $pluginId, "NAME" => $paramName, "DEFAULT" => $paramDefault);
+            }
+            return $exposedNodes;
+        });
+        $repoSerializer = new RepositoryXML($exposed, $streams, $loggedUser);
+
+
+        $st = "<repositories>";
+        $inboxStatus = 0;
+        foreach($accessible as $repoId => $repoObject){
+            if(!$repoObject->hasContentFilter()) {
+                continue;
+            }
+            $accessStatus = $repoObject->getAccessStatus();
+            if(empty($accessStatus) && $loggedUser != null){
+                $lastConnected = $loggedUser->getArrayPref("repository_last_connected", $repoId);
+                if(empty($lastConnected)){
+                    $accessStatus = 1;
+                }
+            }
+            if(!empty($accessStatus)){
+                $inboxStatus ++;
+            }
+        }
+
+        foreach ($accessible as $repoId => $repoObject) {
+            if(!ApplicationState::hasMinisiteHash() && $repoObject->hasContentFilter()){
+                continue;
+            }
+            $accessStatus = '';
+            if($repoObject->getAccessType() == "inbox"){
+                $accessStatus = $inboxStatus;
+            }
+            $xmlString = $repoSerializer->serialize($repoObject, $repoId === $ctx->getRepositoryId(), $accessStatus);
+            $st .= $xmlString;
+        }
+
+        $st .= "</repositories>";
+        return $st;
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Services/ApiKeysService.php b/core/src/core/src/pydio/Core/Services/ApiKeysService.php
new file mode 100644
index 0000000000..bfc915de4d
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Services/ApiKeysService.php
@@ -0,0 +1,235 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Services;
+
+use Pydio\Conf\Sql\SqlConfDriver;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Utils\Http\UserAgent;
+use Pydio\Core\Utils\Vars\StringHelper;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class ApiKeysService
+ * @package Pydio\Core\Services
+ */
+class ApiKeysService
+{
+    /**
+     * @return SqlConfDriver
+     * @throws PydioException
+     */
+    private static function getStore(){
+        $store = ConfService::getConfStorageImpl();
+        if (!($store instanceof SqlConfDriver)){
+            throw new PydioException("Wrong configuration driver, please use Sql");
+        }
+        return $store;
+    }
+
+    /**
+     * @param $userId
+     * @param string $deviceId
+     * @param string $deviceUA
+     * @param string $deviceIP
+     * @return array
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public static function generatePairForAuthfront($userId, $deviceId = "", $deviceUA = "", $deviceIP = ""){
+
+        $store = self::getStore();
+        $token = StringHelper::generateRandomString();
+        $private = StringHelper::generateRandomString();
+        $data = array("USER_ID" => $userId, "PRIVATE" => $private);
+        if (!empty($deviceId)) {
+            // Revoke previous tokens for this device
+            $cursor = null;
+            $keys = $store->simpleStoreList("keystore", $cursor, "", "serial", '%"DEVICE_ID";s:' . strlen($deviceId) . ':"' . $deviceId . '"%');
+            foreach ($keys as $keyId => $keyData) {
+                if ($keyData["USER_ID"] != $userId) continue;
+                $store->simpleStoreClear("keystore", $keyId);
+            }
+            $data["DEVICE_ID"] = $deviceId;
+        }
+        $data["DEVICE_UA"] = $deviceUA;
+        $data["DEVICE_IP"] = $deviceIP;
+        $store->simpleStoreSet("keystore", $token, $data, "serial");
+        return ["t" => $token, "p" => $private];
+
+    }
+
+    /**
+     * @param $userId
+     * @param $adminTaskId
+     * @param string $restrictToIP
+     * @return array
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public static function generatePairForAdminTask($adminTaskId, $userId = "", $restrictToIP = ""){
+
+        $store = self::getStore();
+        $token = StringHelper::generateRandomString();
+        $private = StringHelper::generateRandomString();
+        $data = [
+            "PRIVATE"       => $private,
+            "ADMIN_TASK_ID" => $adminTaskId
+        ];
+        if(!empty($userId)){
+            $data["USER_ID"] = $userId;
+        }
+        if(!empty($restrictToIP)){
+            $data["RESTRICT_TO_IP"] = $restrictToIP;
+        }
+        $store->simpleStoreSet("keystore", $token, $data, "serial");
+        return ["t" => $token, "p" => $private];
+
+    }
+
+    /**
+     * @param $adminTaskId
+     * @param $userId
+     * @return array|null
+     * @throws PydioException
+     */
+    public static function findPairForAdminTask($adminTaskId, $userId = ""){
+
+        $keys = self::getStore()->simpleStoreList("keystore", $cursor, "", "serial", '%"ADMIN_TASK_ID";s:' . strlen($adminTaskId) . ':"' . $adminTaskId . '"%');
+        foreach($keys as $kId => $kData){
+            if(empty($userId) || $kData["USER_ID"] === $userId){
+                return ["t" => $kId, "p" => $kData["PRIVATE"]];
+            }
+        }
+        return null;
+
+    }
+
+    /**
+     * @param string $adminTaskId
+     * @param string $userId
+     * @return integer number of deleted keys
+     * @throws PydioException
+     */
+    public static function revokePairForAdminTask($adminTaskId, $userId = ""){
+
+        $keys = self::getStore()->simpleStoreList("keystore", $cursor, "", "serial", '%"ADMIN_TASK_ID";s:' . strlen($adminTaskId) . ':"' . $adminTaskId . '"%');
+        $c = 0;
+        foreach($keys as $kId => $kData){
+            if(empty($userId) || $kData["USER_ID"] === $userId){
+                self::getStore()->simpleStoreClear("keystore", $kId);
+                $c++;
+            }
+        }
+        return $c;
+
+    }
+
+    /**
+     * @param $serverData
+     * @param $adminTaskId
+     * @param $userId
+     * @return bool
+     */
+    public static function requestHasValidHeadersForAdminTask($serverData, $adminTaskId, $userId = ""){
+        if(!isSet($serverData['HTTP_X_PYDIO_ADMIN_AUTH'])){
+            Logger::error(__CLASS__, __FUNCTION__,"Invalid tokens for admin task $adminTaskId");
+            return false;
+        }
+        list($t, $p) = explode(":", trim($serverData['HTTP_X_PYDIO_ADMIN_AUTH']));
+        $existingKey = self::findPairForAdminTask(PYDIO_BOOSTER_TASK_IDENTIFIER);
+        if($existingKey === null || $existingKey['p'] !== $p || $existingKey['t'] !== $t){
+            Logger::error(__CLASS__, __FUNCTION__, "Invalid tokens for admin task $adminTaskId");
+            return false;
+        }
+        Logger::debug(__CLASS__, "Valid tokens for admin task $adminTaskId");
+        return true;
+    }
+
+    /**
+     * @param $token
+     * @param string $checkPrivate
+     * @return bool
+     * @throws PydioException
+     */
+    public static function loadDataForPair($token, $checkPrivate = ""){
+        $data = null;
+        self::getStore()->simpleStoreGet("keystore", $token, "serial", $data);
+        if (empty($data)) {
+            return false;
+        }
+        if(!empty($checkPrivate)){
+            $p = $data["PRIVATE"];
+            unset($data["PRIVATE"]);
+            return $checkPrivate === $p ? $data : false;
+        }
+        return $data;
+    }
+
+    /**
+     * @param $userId
+     * @param $token
+     * @return int
+     * @throws PydioException
+     */
+    public static function revokeTokens($userId, $token = ""){
+        $keys = self::getStore()->simpleStoreList("keystore", $cursor, $token, "serial", '%"USER_ID";s:' . strlen($userId) . ':"' . $userId . '"%');
+        $c = 0;
+        foreach ($keys as $keyId => $keyData) {
+            $c ++;
+            self::getStore()->simpleStoreClear("keystore", $keyId);
+        }
+        return $c;
+    }
+
+    /**
+     * @param $userId
+     * @return array
+     * @throws PydioException
+     */
+    public static function listPairsForUser($userId){
+        $cursor = null;
+        $keys = self::getStore()->simpleStoreList("keystore", $cursor, "", "serial", '%"USER_ID";s:' . strlen($userId) . ':"' . $userId . '"%');
+        foreach ($keys as $keyId => &$keyData) {
+            unset($keyData["PRIVATE"]);
+            unset($keyData["USER_ID"]);
+            $deviceDesc = "Web Browser";
+            $deviceOS = "Unkown";
+            if (isSet($keyData["DEVICE_UA"])) {
+                $agent = $keyData["DEVICE_UA"];
+                if (strpos($agent, "python-requests") !== false) {
+                    $deviceDesc = "PydioSync";
+                    if (strpos($agent, "Darwin") !== false) $deviceOS = "Mac OS X";
+                    else if (strpos($agent, "Windows/7") !== false) $deviceOS = "Windows 7";
+                    else if (strpos($agent, "Windows/8") !== false) $deviceOS = "Windows 8";
+                    else if (strpos($agent, "Linux") !== false) $deviceOS = "Linux";
+                } else {
+                    $deviceOS = UserAgent::osFromUserAgent($agent);
+                }
+            }
+            $keyData["DEVICE_DESC"] = $deviceDesc;
+            $keyData["DEVICE_OS"] = $deviceOS;
+        }
+        return $keys;
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Services/ApplicationState.php b/core/src/core/src/pydio/Core/Services/ApplicationState.php
new file mode 100644
index 0000000000..a881179d99
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Services/ApplicationState.php
@@ -0,0 +1,258 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Services;
+
+use Pydio\Core\Model\RepositoryInterface;
+use Pydio\Core\Utils\Vars\PathUtils;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Various helpers to get application state, global folders, etc.
+ * @package Pydio\Core\Utils
+ */
+class ApplicationState
+{
+    /**
+     * @var null|string
+     */
+    private static $restBase = null;
+
+    /**
+     * @var string
+     */
+    private static $sapiType = "session";
+
+    /**
+     * @var string
+     */
+    private static $minisiteHash = null;
+
+    /**
+     * @param string $restBase
+     */
+    public static function setSapiRestBase($restBase){
+        self::$sapiType = "rest";
+        self::$restBase = $restBase;
+    }
+
+    public static function setSapiTypeCLI(){
+        self::$sapiType = "cli";
+    }
+
+    /**
+     * @return bool
+     */
+    public static function sapiIsCli(){
+        return php_sapi_name() === "cli" || self::$sapiType === "cli";
+    }
+
+    /**
+     * @return null|string
+     */
+    public static function getSapiRestBase(){
+        return self::$restBase;
+    }
+
+    /**
+     * @return bool
+     */
+    public static function sapiUsesSession(){
+        return !self::sapiIsCli() && self::$restBase === null;
+    }
+
+    /**
+     * @param $hash
+     */
+    public static function setStateMinisite($hash){
+        self::$minisiteHash = $hash;
+    }
+
+    /**
+     * @return bool
+     */
+    public static function hasMinisiteHash(){
+        return self::$minisiteHash !== null;
+    }
+
+    /**
+     * @return string
+     */
+    public static function getMinisiteHash(){
+        return self::$minisiteHash;
+    }
+
+    /**
+     * Check if data/cache/first_run_passed file exists or not
+     * @return bool
+     */
+    public static function detectApplicationFirstRun()
+    {
+        return !file_exists(AJXP_CACHE_DIR . "/first_run_passed") &&  !file_exists(AJXP_DATA_PATH . "/plugins/boot.conf/first_run_passed");
+    }
+
+    /**
+     * Touch data/cache/first_run_passed file
+     */
+    public static function setApplicationFirstRunPassed()
+    {
+        if(!is_file(AJXP_DATA_PATH . "/plugins/boot.conf")){
+            @mkdir(AJXP_DATA_PATH . "/plugins/boot.conf", 0666, true);
+        }
+        @file_put_contents(AJXP_DATA_PATH . "/plugins/boot.conf/first_run_passed", "true");
+    }
+
+    /**
+     * Search include path for a given file
+     * @static
+     * @param string $file
+     * @return bool
+     */
+    public static function searchIncludePath($file)
+    {
+        $ps = explode(PATH_SEPARATOR, ini_get('include_path'));
+        foreach ($ps as $path) {
+            if (@file_exists($path . DIRECTORY_SEPARATOR . $file)) return true;
+        }
+        if (@file_exists($file)) return true;
+        return false;
+    }
+
+    /**
+     * @static
+     * @param $from
+     * @param $to
+     * @return string
+     */
+    public static function getTravelPath($from, $to)
+    {
+        $from = explode('/', $from);
+        $to = explode('/', $to);
+        $relPath = $to;
+
+        foreach ($from as $depth => $dir) {
+            // find first non-matching dir
+            if ($dir === $to[$depth]) {
+                // ignore this directory
+                array_shift($relPath);
+            } else {
+                // get number of remaining dirs to $from
+                $remaining = count($from) - $depth;
+                if ($remaining > 1) {
+                    // add traversals up to first matching dir
+                    $padLength = (count($relPath) + $remaining - 1) * -1;
+                    $relPath = array_pad($relPath, $padLength, '..');
+                    break;
+                } else {
+                    $relPath[0] = './' . $relPath[0];
+                }
+            }
+        }
+        return implode('/', $relPath);
+    }
+
+    /**
+     * Build the current server URL
+     * @param bool $withURI Wether to return the "path" part in scheme://host[/path]
+     * @param bool $forceInternal Wether to force server local IP detection, or to use external URL if it is set in the configuration
+     * @static
+     * @return string
+     */
+    public static function detectServerURL($withURI = false, $forceInternal = false)
+    {
+        $setUrl = ConfService::getGlobalConf("SERVER_URL");
+        if (!empty($setUrl) && !$forceInternal) {
+            return (string)$setUrl;
+        }
+        if (self::sapiIsCli()) {
+            Logger::debug("WARNING, THE SERVER_URL IS NOT SET, WE CANNOT BUILD IT WHEN WORKING IN CLI");
+            return "";
+        }
+        $protocol = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on' ? 'https' : 'http');
+        $port = (($protocol === 'http' && $_SERVER['SERVER_PORT'] == 80 || $protocol === 'https' && $_SERVER['SERVER_PORT'] == 443)
+            ? "" : ":" . $_SERVER['SERVER_PORT']);
+        $name = $_SERVER["SERVER_NAME"];
+        if (!$withURI) {
+            return "$protocol://$name$port";
+        } else {
+            $uri = dirname($_SERVER["REQUEST_URI"]);
+            $apiBase = self::getSapiRestBase();
+            if (!empty($apiBase)) {
+                // apiBase must be /path/to/pydio/endpoint => remove endpoint
+                $uri = PathUtils::forwardSlashDirname(rtrim($apiBase));
+                if(empty($uri)) $uri = "/";
+            }
+            return "$protocol://$name$port" . $uri;
+        }
+    }
+
+    /**
+     * @param RepositoryInterface $repository
+     * @return string
+     */
+    public static function getWorkspaceShortcutURL($repository)
+    {
+        if (empty($repository)) {
+            return "";
+        }
+        $repoSlug = $repository->getSlug();
+        $skipHistory = ConfService::getGlobalConf("SKIP_USER_HISTORY", "conf");
+        if ($skipHistory) {
+            $prefix = "/ws-";
+        } else {
+            $prefix = "?goto=";
+        }
+        return trim(self::detectServerURL(true), "/") . $prefix . $repoSlug;
+    }
+
+    /**
+     * Try to load the tmp dir from the CoreConf AJXP_TMP_DIR, or the constant AJXP_TMP_DIR,
+     * or the sys_get_temp_dir
+     * @static
+     * @return mixed|null|string
+     */
+    public static function getAjxpTmpDir()
+    {
+        $conf = ConfService::getGlobalConf("AJXP_TMP_DIR");
+        if (!empty($conf)) {
+            return $conf;
+        }
+        if (defined("AJXP_TMP_DIR") && AJXP_TMP_DIR != "") {
+            return AJXP_TMP_DIR;
+        }
+        return realpath(sys_get_temp_dir());
+    }
+
+    /**
+     * Try to set an ini config, without errors
+     * @static
+     * @param string $paramName
+     * @param string $paramValue
+     * @return void
+     */
+    public static function safeIniSet($paramName, $paramValue)
+    {
+        $current = ini_get($paramName);
+        if ($current == $paramValue) return;
+        @ini_set($paramName, $paramValue);
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Services/AuthService.php b/core/src/core/src/pydio/Core/Services/AuthService.php
new file mode 100644
index 0000000000..a62a02efd9
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Services/AuthService.php
@@ -0,0 +1,173 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Services;
+use Pydio\Auth\Core\MemorySafe;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Exception\LoginException;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\UserInterface;
+use Pydio\Core\Utils\Http\BruteForceHelper;
+use Pydio\Core\Utils\Http\CookiesHelper;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Static access to the authentication mechanism. Encapsulates the authDriver implementation
+ * @package Pydio
+ * @subpackage Core
+ */
+class AuthService
+{
+
+    public static $bufferedMessage = null;
+
+    /**
+     * Log the user from its credentials
+     * @static
+     * @param string $user_id The user id
+     * @param string $pwd The password
+     * @param bool $bypass_pwd Ignore password or not
+     * @param bool $cookieLogin Is it a logging from the remember me cookie?
+     * @return UserInterface
+     * @throws LoginException
+     * @throws \Exception
+     * @throws \Pydio\Core\Exception\UserNotFoundException
+     */
+    public static function logUser($user_id, $pwd, $bypass_pwd = false, $cookieLogin = false)
+    {
+        $user_id = UsersService::filterUserSensitivity($user_id);
+        $authDriver = ConfService::getAuthDriverImpl();
+        // CHECK USER PASSWORD HERE!
+        $loginAttempt = BruteForceHelper::getBruteForceLoginArray();
+        $bruteForceLogin = BruteForceHelper::checkBruteForceLogin($loginAttempt);
+        BruteForceHelper::setBruteForceLoginArray($loginAttempt);
+
+        if (!$authDriver->userExists($user_id)) {
+            Logger::warning(__CLASS__, "Login failed", array("user" => InputFilter::sanitize($user_id, InputFilter::SANITIZE_EMAILCHARS), "error" => "Invalid user"));
+            if ($bruteForceLogin === FALSE) {
+                throw new LoginException(-4);
+            } else {
+                throw new LoginException(-1);
+            }
+        }
+        if (!$bypass_pwd) {
+            if (!UsersService::checkPassword($user_id, $pwd, $cookieLogin)) {
+                Logger::warning(__CLASS__, "Login failed", array("user" => InputFilter::sanitize($user_id, InputFilter::SANITIZE_EMAILCHARS), "error" => "Invalid password"));
+                if ($bruteForceLogin === FALSE) {
+                    throw new LoginException(-4);
+                } else {
+                    if($cookieLogin) throw new LoginException(-5);
+                    throw new LoginException(-1);
+                }
+            }
+        }
+        // Successful login attempt
+        BruteForceHelper::setBruteForceLoginArray($loginAttempt, true);
+
+        $user = UsersService::getUserById($user_id, false);
+
+        $tempContext = Context::contextWithObjects($user, null);
+        Controller::applyHook("user.before_login", [$tempContext, &$user]);
+
+        // Setting session credentials if asked in config
+        if (ConfService::getContextConf($tempContext, "SESSION_SET_CREDENTIALS", "auth")) {
+            list($authId, $authPwd) = $authDriver->filterCredentials($user_id, $pwd);
+            MemorySafe::storeCredentials($authId, $authPwd);
+        }
+
+
+        if ($user->hasLockByName("logout")) {
+            Logger::warning(__CLASS__, "Login failed", array("user" => InputFilter::sanitize($user_id, InputFilter::SANITIZE_EMAILCHARS), "error" => "Locked user"));
+            throw new LoginException(-1);
+        }
+
+        if ($authDriver->isAjxpAdmin($user_id)) {
+            $user->setAdmin(true);
+        }
+
+        if ($user->isAdmin()) {
+            $user = RolesService::updateAdminRights($user);
+        }
+
+        if ($authDriver->autoCreateUser() && !$user->storageExists()) {
+            $user->save("superuser"); // make sure update rights now
+        }
+
+        //self::updateSessionUser($user);
+        Controller::applyHook("user.after_login", [$tempContext, $user]);
+
+        Logger::info(__CLASS__, "Log In", array("context"=> ApplicationState::sapiUsesSession() ?"WebUI":"API"));
+        return $user;
+    }
+
+    /**
+     * Store the object in the session
+     * @static
+     * @param $userObject
+     * @return void
+     */
+    public static function updateSessionUser($userObject) {
+        SessionService::save(SessionService::USER_KEY, $userObject);
+    }
+
+    /**
+     * Force an acl change for the current session user
+     * @param $repositoryId
+     * @param $acl
+     */
+    public static function updateSessionUserAcl($repositoryId, $acl){
+        /**
+         * @var $u UserInterface
+         */
+        $u = SessionService::fetch(SessionService::USER_KEY);
+        if($u instanceof UserInterface){
+            $u->getPersonalRole()->setAcl($repositoryId, $acl);
+            $u->recomputeMergedRole();
+            self::updateSessionUser($u);
+        }
+    }
+
+
+    /**
+     * Clear the session
+     * @static
+     * @return void
+     */
+    public static function disconnect()
+    {
+        $user = SessionService::fetch(SessionService::USER_KEY);
+        if(empty($user) || !$user instanceof UserInterface){
+            return;
+        }
+        $userId = $user->getId();
+        Controller::applyHook("user.before_disconnect", array(Context::emptyContext(), $user));
+        CookiesHelper::clearRememberCookie($user);
+        Logger::info(__CLASS__, "Log Out", "");
+        SessionService::delete(SessionService::USER_KEY);
+        if (ConfService::getContextConf(Context::contextWithObjects($user, null), "SESSION_SET_CREDENTIALS", "auth")) {
+            MemorySafe::clearCredentials();
+        }
+        Controller::applyHook("user.after_disconnect", array(Context::emptyContext(), $userId));
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Services/CacheService.php b/core/src/core/src/pydio/Core/Services/CacheService.php
new file mode 100644
index 0000000000..62d40af5e2
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Services/CacheService.php
@@ -0,0 +1,168 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Services;
+
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Static access to the caching mechanism. Encapsulates the cacheDriver implementation
+ * @package Pydio
+ * @subpackage Core
+ */
+class CacheService
+{
+    /**
+     * @param $namespace
+     * @param $id
+     * @return bool
+     */
+    public static function contains($namespace, $id) {
+        $cacheDriver = ConfService::getCacheDriverImpl();
+
+        if ($cacheDriver) {
+            return $cacheDriver->contains($namespace, $id);
+        }
+
+        return false;
+    }
+
+    /**
+     * @param $namespace
+     * @param $id
+     * @param $object
+     * @param int $timelimit
+     * @return bool
+     */
+    public static function save($namespace, $id, $object, $timelimit = 0) {
+        $cacheDriver = ConfService::getCacheDriverImpl();
+
+        if ($cacheDriver) {
+            //if($namespace === AJXP_CACHE_SERVICE_NS_SHARED) error_log("Saving data for $id");
+            return $cacheDriver->save($namespace, $id, $object, $timelimit);
+        }
+
+        return false;
+    }
+
+    /**
+     * @param $namespace
+     * @param $id
+     * @param $object
+     * @param int $timelimit
+     * @return bool
+     */
+    public static function saveWithTimestamp($namespace, $id, $object, $timelimit = 0){
+        $cacheDriver = ConfService::getCacheDriverImpl();
+
+        if ($cacheDriver) {
+            //if($namespace === AJXP_CACHE_SERVICE_NS_SHARED) error_log("Saving data for $id with timestamp");
+            return $cacheDriver->saveWithTimestamp($namespace, $id, $object, $timelimit);
+        }
+
+        return false;
+        
+    }
+    
+    /**
+     * @param $namespace
+     * @param $id
+     * @return bool|mixed
+     */
+    public static function fetch($namespace, $id) {
+        $cacheDriver = ConfService::getCacheDriverImpl();
+
+        if ($cacheDriver) {
+            $data = $cacheDriver->fetch($namespace, $id);
+            if($data !== false && $namespace === AJXP_CACHE_SERVICE_NS_SHARED){
+                //error_log("Found data for $id");
+            }
+            return $data;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param $namespace
+     * @param array $ids
+     * @return bool|mixed
+     */
+    public static function fetchMultiple($namespace, $ids) {
+        $cacheDriver = ConfService::getCacheDriverImpl();
+
+        if ($cacheDriver) {
+            return $cacheDriver->fetchMultiple($namespace, $ids);
+        }
+
+        return false;
+    }
+
+    /**
+     * @param $namespace
+     * @param $id
+     * @param array $idsToCheck
+     * @return bool|false|mixed
+     */
+    public static function fetchWithTimestamps($namespace, $id, $idsToCheck){
+        $cacheDriver = ConfService::getCacheDriverImpl();
+
+        if ($cacheDriver) {
+            $data = $cacheDriver->fetchWithTimestamps($namespace, $id, $idsToCheck);
+            if($data !== false && $namespace === AJXP_CACHE_SERVICE_NS_SHARED){
+                //error_log("Found data for $id after checking timestamps for ".implode(",", $idsToCheck));
+            }
+            return $data;
+        }
+
+        return false;
+
+    }
+    
+    /**
+     * @param $namespace
+     * @param $id
+     * @return bool
+     */
+    public static function delete($namespace, $id) {
+        $cacheDriver = ConfService::getCacheDriverImpl();
+
+        if ($cacheDriver) {
+            return $cacheDriver->delete($namespace, $id);
+        }
+
+        return false;
+    }
+
+    /**
+     * @param $namespace
+     * @return bool
+     */
+    public static function deleteAll($namespace) {
+        $cacheDriver = ConfService::getCacheDriverImpl();
+
+        if ($cacheDriver) {
+            return $cacheDriver->deleteAll($namespace);
+        }
+
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Services/ConfService.php b/core/src/core/src/pydio/Core/Services/ConfService.php
new file mode 100644
index 0000000000..6245eaa7d2
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Services/ConfService.php
@@ -0,0 +1,408 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Services;
+
+
+use Pydio\Auth\Core\AbstractAuthDriver;
+use Pydio\Cache\Core\AbstractCacheDriver;
+use Pydio\Conf\Core\AbstractConfDriver;
+
+use Pydio\Core\Model\Context;
+
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\PluginFramework\CoreInstanceProvider;
+use Pydio\Core\Utils\Vars\VarsFilter;
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\PluginFramework\PluginsService;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Configuration holder. Singleton class accessed statically, encapsulates the confDriver implementation.
+ * @package Pydio
+ * @subpackage Core
+ */
+class ConfService
+{
+    private static $instance;
+
+    private $errors = array();
+    private $configs = array();
+    
+
+    /**
+     * @return AbstractConfDriver
+     */
+    public static function getBootConfStorageImpl()
+    {
+        $inst = PluginsService::getInstance(Context::emptyContext())->getPluginById("boot.conf");
+        if (empty($inst)) {
+            $inst = PluginsService::getInstance(Context::emptyContext())->softLoad("boot.conf", array());
+        }
+        return $inst;
+    }
+
+    /**
+     * Initialize singleton
+     * @static
+     * @param string $installPath
+     * @param string $pluginDir
+     */
+    public static function init($installPath=AJXP_INSTALL_PATH, $pluginDir="plugins")
+    {
+        $inst = self::getInstance();
+        $inst->initInst();
+    }
+
+    /**
+     * Load the boostrap_* files and their configs
+     * @return void
+     */
+    private function initInst()
+    {
+        // INIT AS GLOBAL
+        if (isSet($_SERVER["HTTPS"]) && strtolower($_SERVER["HTTPS"]) == "on") {
+            $this->configs["USE_HTTPS"] = true;
+        }
+        if (isSet($this->configs["USE_HTTPS"])) {
+            ApplicationState::safeIniSet("session.cookie_secure", true);
+        }
+        $this->configs["JS_DEBUG"] = AJXP_CLIENT_DEBUG;
+        $this->configs["SERVER_DEBUG"] = AJXP_SERVER_DEBUG;
+
+    }
+
+    /**
+     * Start the singleton
+     * @static
+     * @return void
+     */
+    public static function start()
+    {
+        $inst = self::getInstance();
+        $inst->startInst();
+        $confStorageDriver = self::getConfStorageImpl();
+        $userFile = $confStorageDriver->getUserClassFileName();
+        if(!empty($userFile)){
+            require_once($userFile);
+        }
+    }
+    /**
+     * Init CONF, AUTH drivers
+     * Init Repositories
+     * @return void
+     */
+    public function startInst()
+    {
+        PluginsService::getInstance(Context::emptyContext())->setPluginUniqueActiveForType("conf", self::getConfStorageImpl()->getName());
+    }
+    /**
+     * Get errors generated by the boot sequence (init/start)
+     * @static
+     * @return array
+     */
+    public static function getErrors()
+    {
+        return self::getInstance()->errors;
+    }
+
+    public static function clearAllCaches(){
+        PluginsService::clearPluginsCache();
+        LocaleService::clearMessagesCache();
+        CacheService::deleteAll(AJXP_CACHE_SERVICE_NS_SHARED);
+        if(function_exists('opcache_reset')){
+            opcache_reset();
+        }
+    }
+
+    /**
+     * @static
+     * @param $globalsArray
+     * @param string $interfaceCheck
+     * @param PluginsService|null $pService
+     * @return Plugin|null
+     */
+    public static function instanciatePluginFromGlobalParams($globalsArray, $interfaceCheck = "", $pService = null)
+    {
+        $plugin = false;
+        if($pService === null){
+            $pService = PluginsService::getInstance(Context::emptyContext());
+        }
+
+        if (is_string($globalsArray)) {
+            $globalsArray = array("instance_name" => $globalsArray);
+        }
+
+        if (is_array($globalsArray) &&  !isSet($globalsArray["instance_name"]) && isSet($globalsArray["group_switch_value"])){
+            $globalsArray["instance_name"] = $globalsArray["group_switch_value"];
+        }
+
+        if (isSet($globalsArray["instance_name"])) {
+            $pName = $globalsArray["instance_name"];
+            unset($globalsArray["instance_name"]);
+
+            $plugin = $pService->softLoad($pName, $globalsArray);
+            $plugin->performChecks();
+        }
+
+        if ($plugin != false && !empty($interfaceCheck)) {
+            if (!is_a($plugin, $interfaceCheck)) {
+                $plugin = false;
+            }
+        }
+        return $plugin;
+
+    }
+    
+    /**
+     * Check the presence of mcrypt and option CMDLINE_ACTIVE
+     * @static
+     * @return bool
+     */
+    public static function backgroundActionsSupported()
+    {
+        return ConfService::getGlobalConf("CMDLINE_ACTIVE");
+    }
+
+    /**
+     * @var AbstractConfDriver
+     */
+    private static $tmpConfStorageImpl;
+    /**
+     * @var AbstractAuthDriver
+     */
+    private static $tmpAuthStorageImpl;
+    /**
+     * @var AbstractCacheDriver
+     */
+    private static $tmpCacheStorageImpl;
+
+    /**
+     * @param $confStorage AbstractConfDriver
+     * @param $authStorage AbstractAuthDriver
+     * @param $cacheStorage AbstractCacheDriver
+     */
+    public static function setTmpStorageImplementations($confStorage, $authStorage, $cacheStorage)
+    {
+        self::$tmpConfStorageImpl = $confStorage;
+        self::$tmpAuthStorageImpl = $authStorage;
+        self::$tmpCacheStorageImpl = $cacheStorage;
+    }
+
+    /**
+     * Get conf driver implementation
+     *
+     * @return AbstractConfDriver
+     */
+    public static function getConfStorageImpl()
+    {
+        if(isSet(self::$tmpConfStorageImpl)) return self::$tmpConfStorageImpl;
+        /** @var CoreInstanceProvider $p */
+        $p = PluginsService::getInstance(Context::emptyContext())->getPluginById("core.conf");
+        return $p->getImplementation();
+    }
+
+    /**
+     * Get auth driver implementation
+     *
+     * @return AbstractAuthDriver
+     */
+    public static function getAuthDriverImpl()
+    {
+        if(isSet(self::$tmpAuthStorageImpl)) return self::$tmpAuthStorageImpl;
+        /** @var CoreInstanceProvider $p */
+        $p = PluginsService::getInstance(Context::emptyContext())->getPluginById("core.auth");
+        return $p->getImplementation();
+    }
+
+    /**
+     * Return info about auth plugins
+     * @return string
+     */
+    public static function getInfo(){
+        return "&a=".self::getAuthDriverImpl()->getStats();
+    }
+
+    /**
+     * Get auth driver implementation
+     *
+     * @return AbstractCacheDriver
+     */
+    public static function getCacheDriverImpl()
+    {
+        if(isSet(self::$tmpCacheStorageImpl)) return self::$tmpCacheStorageImpl;
+        /**
+         * Get CacheService implementation, directly from the "empty" plugin registry
+         * @var CoreInstanceProvider $p
+         */
+        $p = PluginsService::getInstance(Context::emptyContext())->getPluginById("core.cache");
+        return $p->getImplementation();
+    }
+
+
+    public function invalidateLoadedRepositories()
+    {
+        UsersService::invalidateCache();
+        PluginsService::clearRegistryCaches();
+    }
+    
+    
+    /**
+     *  ZIP FEATURES
+     */
+
+    /**
+     * Check if the gzopen function exists
+     * @static
+     * @return bool
+     */
+    public static function zipEnabled()
+    {
+        return (function_exists("gzopen") || function_exists("gzopen64"));
+    }
+
+    /**
+     * Check if users are allowed to browse ZIP content
+     * @static
+     * @return bool
+     */
+    public static function zipBrowsingEnabled()
+    {
+        if(!self::zipEnabled()) return false;
+        return !ConfService::getGlobalConf("DISABLE_ZIP_BROWSING");
+    }
+
+    /**
+     * Check if users are allowed to create ZIP archive
+     * @static
+     * @return bool
+     */
+    public static function zipCreationEnabled()
+    {
+        if(!self::zipEnabled()) return false;
+        return ConfService::getGlobalConf("ZIP_CREATION");
+    }
+    
+    /**
+     * Get a config by its name
+     * @static
+     * @param string $varName
+     * @return mixed
+     */
+    public static function getConf($varName)
+    {
+        return self::getInstance()->getConfInst($varName);
+    }
+    /**
+     * Set a config by its name
+     * @static
+     * @param string $varName
+     * @param mixed $varValue
+     * @return void
+     */
+    public static function setConf($varName, $varValue)
+    {
+        self::getInstance()->setConfInst($varName, $varValue);
+    }
+    /**
+     * See static method
+     * @param $varName
+     * @return mixed
+     */
+    protected function getConfInst($varName)
+    {
+        if (isSet($this->configs[$varName])) {
+            return $this->configs[$varName];
+        }
+        if (defined("AJXP_".$varName)) {
+            return constant("AJXP_".$varName);
+        }
+        return null;
+    }
+    /**
+     * See static method
+     * @param $varName
+     * @param $varValue
+     * @return void
+     */
+    protected function setConfInst($varName, $varValue)
+    {
+        $this->configs[$varName] = $varValue;
+    }
+    
+    /**
+     * Get config from the core.$coreType plugin without context
+     * @static
+     * @param string $varName
+     * @param string $coreType
+     * @return mixed|null|string
+     */
+    public static function getGlobalConf($varName, $coreType = "ajaxplorer")
+    {
+        $ctx = Context::emptyContext();
+        $coreP = PluginsService::getInstance($ctx)->getPluginByTypeName("core", $coreType);
+        if($coreP === false) return null;
+        $confs = $coreP->getConfigs();
+        return (isSet($confs[$varName]) ? VarsFilter::filter($confs[$varName], $ctx) : null);
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $varName
+     * @param string $coreType
+     * @return mixed
+     */
+    public static function getContextConf(ContextInterface $ctx, $varName, $coreType = "ajaxplorer"){
+
+        $coreP = PluginsService::getInstance($ctx)->getPluginByTypeName("core", $coreType);
+        if($coreP === false) return null;
+        $confs = $coreP->getConfigs();
+        if($ctx->hasUser()){
+            $confs = $ctx->getUser()->getMergedRole()->filterPluginConfigs("core".$coreType, $confs, $ctx->getRepositoryId());
+        }
+        return (isSet($confs[$varName]) ? VarsFilter::filter($confs[$varName], $ctx) : null);
+
+    }
+
+    /**
+      * Singleton method
+      *
+      * @return ConfService the service instance
+      */
+     public static function getInstance()
+     {
+         if (!isSet(self::$instance)) {
+             $c = __CLASS__;
+             self::$instance = new $c;
+         }
+         return self::$instance;
+     }
+
+    /**
+     * ConfService constructor.
+     */
+    private function __construct(){}
+    public function __clone()
+    {
+        trigger_error("Cannot clone me, i'm a singleton!", E_USER_ERROR);
+    }
+
+}
diff --git a/core/src/core/src/pydio/Core/Services/LocalCache.php b/core/src/core/src/pydio/Core/Services/LocalCache.php
new file mode 100644
index 0000000000..0680acef5e
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Services/LocalCache.php
@@ -0,0 +1,177 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Services;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+/**
+ * Generic caching system that can be used by the plugins. Use the static factory getItem() to generate
+ * a actual cached instance.
+ * @package Pydio
+ * @subpackage Core
+ */
+class LocalCache
+{
+    protected $cacheDir;
+    protected $cacheId;
+    protected $masterFile;
+    protected $dataCallback;
+    protected $idComputerCallback;
+
+    /**
+     * Create an LocalCache instance
+     * @param string $pluginId
+     * @param string $filepath
+     * @param callable $dataCallback A function to generate the data cache. If no callback provided, will simply use the content of the master item as the cache data
+     * @param string $idComputerCallback A function to generate the ID of the cache. If not provided, will generate a random hash
+     * @return LocalCache
+     */
+    public static function getItem($pluginId, $filepath, $dataCallback=null, $idComputerCallback = null)
+    {
+        if ($dataCallback == null) {
+            $dataCallback = array("Pydio\\Core\\Services\\LocalCache", "simpleCopy");
+        }
+        return new LocalCache($pluginId,$filepath, $dataCallback, $idComputerCallback);
+    }
+
+    /**
+     * The default dataCallback
+     * @static
+     * @param string $master
+     * @param string $target
+     * @return void
+     */
+    public static function simpleCopy($master, $target)
+    {
+        file_put_contents($target, file_get_contents($master));
+    }
+
+    /**
+     * Clear a cache item associated with the master filepath
+     * @static
+     * @param String $pluginId
+     * @param String $filepath
+     * @return void
+     */
+    public static function clearItem($pluginId, $filepath)
+    {
+        $inst = new LocalCache($pluginId,$filepath, false);
+        if (file_exists($inst->getId())) {
+            @unlink($inst->getId());
+        }
+    }
+
+    /**
+     * Actual Cache object. Should not be used directly, but via the factory static method getItem()
+     * @param $pluginId
+     * @param $filepath
+     * @param $dataCallback
+     * @param null $idComputerCallback
+     */
+    function __construct($pluginId, $filepath, $dataCallback, $idComputerCallback = NULL) {
+        $this->cacheDir = (defined('AJXP_SHARED_CACHE_DIR')?AJXP_SHARED_CACHE_DIR:AJXP_CACHE_DIR);
+        $this->masterFile = $filepath;
+        $this->dataCallback = $dataCallback;
+        if ($idComputerCallback != null) {
+            $this->idComputerCallback = $idComputerCallback;
+        }
+        $this->cacheId = $this->buildCacheId($pluginId, $filepath);
+    }
+
+    /**
+     * Load the actual data, either from the cache or from the master, and save it in the cache if necessary.
+     * @return string
+     */
+    public function getData()
+    {
+        if (!$this->hasCachedVersion()) {
+            $result = call_user_func($this->dataCallback, $this->masterFile, $this->cacheId);
+            if ($result !== false) {
+                $this->touch();
+            }
+        } else {
+
+        }
+        return file_get_contents($this->cacheId);
+    }
+
+    /**
+     * Check if the cache dir is writeable
+     * @return bool
+     */
+    public function writeable()
+    {
+        return is_dir($this->cacheDir) && is_writeable($this->cacheDir);
+    }
+
+    /**
+     * The unique ID of the item
+     * @return string
+     */
+    public function getId()
+    {
+        return $this->cacheId;
+    }
+
+    /**
+     * Check whether a cached version of the master file exists or not
+     * @return bool
+     */
+    public function hasCachedVersion()
+    {
+        $modifTime = filemtime($this->masterFile);
+        if (file_exists($this->cacheId) && filemtime($this->cacheId) >= $modifTime) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Refresh the cached version modif date to the master modif date
+     * @return void
+     */
+    public function touch()
+    {
+        @touch($this->cacheId, filemtime($this->masterFile));
+    }
+
+    /**
+     * Generate an ID for the cached file, either using the idComputerCallback, or a simple hash function.
+     * @param $pluginId
+     * @param $filePath
+     * @return string
+     */
+    protected function buildCacheId($pluginId, $filePath)
+    {
+        if (!is_dir($this->cacheDir."/".$pluginId)) {
+            mkdir($this->cacheDir."/".$pluginId, 0755);
+        }
+        $root =  $this->cacheDir ."/".$pluginId."/";
+        if (isSet($this->idComputerCallback)) {
+            $hash = call_user_func($this->idComputerCallback, $filePath);
+        } else {
+            $info = pathinfo($filePath);
+            $hash = md5($filePath).(!empty($info["extension"])?".".$info["extension"]:"");
+        }
+        return $root.$hash;
+    }
+
+
+}
diff --git a/core/src/core/src/pydio/Core/Services/LocaleService.php b/core/src/core/src/pydio/Core/Services/LocaleService.php
new file mode 100644
index 0000000000..fab8ff03ae
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Services/LocaleService.php
@@ -0,0 +1,246 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Services;
+
+use Pydio\Core\Model\Context;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Utils\Vars\VarsFilter;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class LocaleService
+ * @package Pydio\Core\Services
+ */
+class LocaleService
+{
+    /**
+     * @var LocaleService
+     */
+    private static $instance;
+
+    private $cache = [];
+
+    private $currentLanguage;
+
+    /**
+     * Singleton method
+     *
+     * @return LocaleService the service instance
+     */
+    public static function getInstance()
+    {
+        if (!isSet(self::$instance)) {
+            $c = __CLASS__;
+            self::$instance = new $c;
+        }
+        return self::$instance;
+    }
+
+    /**
+     * LocaleService constructor.
+     */
+    private function __construct(){
+        $this->cache["AVAILABLE_LANG"] = LocaleService::listAvailableLanguages();
+    }
+    
+    /**
+     * PUBLIC STATIC METHODS
+     */
+    /**
+     * Set the language in the session
+     * @static
+     * @param string $lang
+     * @return void
+     */
+    public static function setLanguage($lang)
+    {
+        $inst = self::getInstance();
+        if (array_key_exists($lang, $inst->cache["AVAILABLE_LANG"])) {
+            if($lang !== $inst->currentLanguage && isSet($inst->cache["MESSAGES"])){
+                $inst->cache["MESSAGES"] = null;
+            }
+            $inst->currentLanguage = $lang;
+            SessionService::setLanguage($lang);
+        }
+    }
+
+    /**
+     * Get the language from the session
+     * @static
+     * @return string
+     */
+    public static function getLanguage()
+    {
+        $lang = self::getInstance()->currentLanguage;
+        if ($lang == null) {
+            $lang = ConfService::getInstance()->getGlobalConf("DEFAULT_LANGUAGE");
+        }
+        if (empty($lang)) return "en";
+        return $lang;
+    }
+
+    /**
+     * Get the list of all "conf" messages
+     * @static
+     * @param bool $forceRefresh Refresh the list
+     * @return array
+     */
+    public static function getConfigMessages($forceRefresh = false)
+    {
+        return self::getInstance()->getMessagesInstConf($forceRefresh);
+    }
+
+    /**
+     * Get all i18n message
+     * @static
+     * @param bool $forceRefresh
+     * @return array
+     */
+    public static function getMessages($forceRefresh = false)
+    {
+        return self::getInstance()->getMessagesInst($forceRefresh);
+    }
+
+    /**
+     * Detect available languages from the core i18n library
+     * @static
+     * @return array
+     */
+    public static function listAvailableLanguages()
+    {
+        // Cache in session!
+        if (SessionService::has(SessionService::LANGUAGES_KEY) && !isSet($_GET["refresh_langs"])) {
+            return SessionService::fetch(SessionService::LANGUAGES_KEY);
+        }
+        $langDir = AJXP_COREI18N_FOLDER;
+        $languages = array();
+        if (($dh = opendir($langDir)) !== FALSE) {
+            while (($file = readdir($dh)) !== false) {
+                $matches = array();
+                if (preg_match("/(.*)\.php/", $file, $matches) == 1) {
+                    $fRadical = $matches[1];
+                    include($langDir . "/" . $fRadical . ".php");
+                    $langName = isSet($mess["languageLabel"]) ? $mess["languageLabel"] : "Not Found";
+                    $languages[$fRadical] = $langName;
+                }
+            }
+            closedir($dh);
+        }
+        if (count($languages)) {
+            SessionService::save(SessionService::LANGUAGES_KEY, $languages);
+        }
+        return $languages;
+    }
+
+    /**
+     * Clear the messages cache
+     */
+    public static function clearMessagesCache()
+    {
+        $i18nFiles = glob(dirname(AJXP_PLUGINS_MESSAGES_FILE) . "/i18n/*.ser");
+        if (is_array($i18nFiles)) {
+            foreach ($i18nFiles as $file) {
+                @unlink($file);
+            }
+        }
+    }
+
+
+
+    /**
+     * PRIVATE INSTANCE METHODS
+     */
+    /**
+     * See static method
+     * @param bool $forceRefresh
+     * @return array
+     */
+    private function getMessagesInstConf($forceRefresh = false)
+    {
+        // make sure they are loaded
+        $this->getMessagesInst($forceRefresh);
+        return $this->cache["CONF_MESSAGES"];
+    }
+
+    /**
+     * Get i18n messages
+     * @param bool $forceRefresh
+     * @return
+     */
+    private function getMessagesInst($forceRefresh = false)
+    {
+        $crtLang = self::getLanguage();
+        $messageCacheDir = dirname(AJXP_PLUGINS_MESSAGES_FILE)."/i18n";
+        $messageFile = $messageCacheDir."/".$crtLang."_".basename(AJXP_PLUGINS_MESSAGES_FILE);
+        if (isSet($this->cache["MESSAGES"]) && !$forceRefresh) {
+            return $this->cache["MESSAGES"];
+        }
+        if (!isset($this->cache["MESSAGES"]) && is_file($messageFile)) {
+            include($messageFile);
+            if (isSet($MESSAGES)) {
+                $this->cache["MESSAGES"] = $MESSAGES;
+            }
+            if (isSet($CONF_MESSAGES)) {
+                $this->cache["CONF_MESSAGES"] = $CONF_MESSAGES;
+            }
+        } else {
+            $this->cache["MESSAGES"] = array();
+            $this->cache["CONF_MESSAGES"] = array();
+            $nodes = PluginsService::getInstance(Context::emptyContext())->searchAllManifests("//i18n", "nodes");
+            /** @var \DOMElement $node */
+            foreach ($nodes as $node) {
+                $nameSpace = $node->getAttribute("namespace");
+                $path = AJXP_INSTALL_PATH."/".$node->getAttribute("path");
+                $lang = $crtLang;
+                if (!is_file($path."/".$crtLang.".php")) {
+                    $lang = "en"; // Default language, minimum required.
+                }
+                if (is_file($path."/".$lang.".php")) {
+                    require($path."/".$lang.".php");
+                    if (isSet($mess)) {
+                        foreach ($mess as $key => $message) {
+                            $this->cache["MESSAGES"][(empty($nameSpace)?"":$nameSpace.".").$key] = $message;
+                        }
+                    }
+                }
+                $lang = $crtLang;
+                if (!is_file($path."/conf/".$crtLang.".php")) {
+                    $lang = "en";
+                }
+                if (is_file($path."/conf/".$lang.".php")) {
+                    $mess = array();
+                    require($path."/conf/".$lang.".php");
+                    $this->cache["CONF_MESSAGES"] = array_merge($this->cache["CONF_MESSAGES"], $mess);
+                }
+            }
+            if(!is_dir($messageCacheDir)) mkdir($messageCacheDir);
+            VarsFilter::filterI18nStrings($this->cache["MESSAGES"]);
+            VarsFilter::filterI18nStrings($this->cache["CONF_MESSAGES"]);
+            @file_put_contents($messageFile, "<?php \$MESSAGES = ".var_export($this->cache["MESSAGES"], true) ." ; \$CONF_MESSAGES = ".var_export($this->cache["CONF_MESSAGES"], true) ." ; ");
+        }
+
+        return $this->cache["MESSAGES"];
+    }
+
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Services/RepositoriesCache.php b/core/src/core/src/pydio/Core/Services/RepositoriesCache.php
new file mode 100644
index 0000000000..3da67b8de8
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Services/RepositoriesCache.php
@@ -0,0 +1,49 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Services;
+
+use Pydio\Core\Model\RepositoryInterface;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Interface RepositoriesCache
+ * @package Pydio\Core\Services
+ */
+interface RepositoriesCache
+{
+    /**
+     * @return RepositoryInterface[]|null
+     */
+    public static function getLoadedRepositories();
+
+    /**
+     * @param RepositoryInterface[] $repositories
+     * @return mixed
+     */
+    public static function updateLoadedRepositories($repositories);
+
+    /**
+     * @return boolean
+     */
+    public static function invalidateLoadedRepositories();
+    
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Services/RepositoryService.php b/core/src/core/src/pydio/Core/Services/RepositoryService.php
new file mode 100644
index 0000000000..825bd1b44a
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Services/RepositoryService.php
@@ -0,0 +1,513 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Services;
+
+use Pydio\Access\Core\Model\Repository;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\FilteredRepositoriesList;
+use Pydio\Core\Model\RepositoryInterface;
+use Pydio\Core\Model\UserInterface;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class RepositoryService
+ * @package Pydio\Core\Services
+ */
+class RepositoryService
+{
+    private $cache = [];
+    /**
+     * @var RepositoryService
+     */
+    private static $instance;
+    
+    /**
+     * Singleton method
+     *
+     * @return RepositoryService The service instance
+     */
+    public static function getInstance()
+    {
+        if (!isSet(self::$instance)) {
+            $c = __CLASS__;
+            self::$instance = new $c;
+        }
+        return self::$instance;
+    }
+
+    /**
+     * RepositoryService constructor.
+     */
+    private function __construct(){
+
+        if (is_file(AJXP_CONF_PATH."/bootstrap_repositories.php")) {
+            $REPOSITORIES = array();
+            include(AJXP_CONF_PATH."/bootstrap_repositories.php");
+            $this->cache["DEFAULT_REPOSITORIES"] = $REPOSITORIES;
+        } else {
+            $this->cache["DEFAULT_REPOSITORIES"] = array();
+        }
+
+    }
+
+    /**
+     * @param RepositoryInterface $repositoryObject
+     * @param UserInterface $userObject
+     * @param bool $details
+     * @param bool $includeShared
+     * @return bool
+     */
+    public static function repositoryIsAccessible($repositoryObject, $userObject, $details=false, $includeShared=true)
+    {
+        if ($userObject === null && UsersService::usersEnabled()) {
+            return false;
+        }
+        if (!$userObject->canSee($repositoryObject)) {
+            return false;
+        }
+        if ($repositoryObject->isTemplate()) {
+            return false;
+        }
+        if (($repositoryObject->getAccessType()=="ajxp_conf" || $repositoryObject->getAccessType()=="ajxp_admin") && $userObject != null) {
+            if (UsersService::usersEnabled() && !$userObject->isAdmin()) {
+                return false;
+            }
+        }
+        $repositoryId = $repositoryObject->getId();
+        if ($repositoryObject->getAccessType()=="ajxp_user" && $userObject != null) {
+            return ($userObject->canRead($repositoryId) || $userObject->canWrite($repositoryId)) ;
+        }
+        if ($repositoryObject->getAccessType() == "ajxp_shared" && !UsersService::usersEnabled()) {
+            return false;
+        }
+        if ($repositoryObject->getUniqueUser() && (!UsersService::usersEnabled() || $userObject == null  || $userObject->getId() == "shared" || $userObject->getId() != $repositoryObject->getUniqueUser() )) {
+            return false;
+        }
+        if ( $userObject != null && !($userObject->canRead($repositoryId) || $userObject->canWrite($repositoryId)) && !$details) {
+            return false;
+        }
+        if ($userObject == null || $userObject->canRead($repositoryId) || $userObject->canWrite($repositoryId) || $details) {
+            // Do not display standard repositories even in details mode for "sub"users
+            if ($userObject != null && $userObject->hasParent() && !($userObject->canRead($repositoryId) || $userObject->canWrite($repositoryId) )) {
+                return false;
+            }
+            // Do not display shared repositories otherwise.
+            if ($repositoryObject->hasOwner() && !$includeShared && ($userObject == null || $userObject->getParent() != $repositoryObject->getOwner())) {
+                return false;
+            }
+            if ($userObject != null && $repositoryObject->hasOwner() && !$userObject->hasParent()) {
+                // Display the repositories if allow_crossusers is ok
+                $fakeCtx = Context::contextWithObjects($userObject, $repositoryObject);
+                if(ConfService::getContextConf($fakeCtx, "ALLOW_CROSSUSERS_SHARING", "conf") === false
+                    || ConfService::getContextConf($fakeCtx, "ALLOW_CROSSUSERS_SHARING", "conf") === 0) {
+                    return false;
+                }
+                // But still do not display its own shared repositories!
+                if ($repositoryObject->getOwner() == $userObject->getId()) {
+                    return false;
+                }
+            }
+            if ($repositoryObject->hasOwner() && $userObject != null &&  $details && !($userObject->canRead($repositoryId) || $userObject->canWrite($repositoryId) ) ) {
+                return false;
+            }
+        }
+        $res = null;
+        $args = array($repositoryId, $repositoryObject, $userObject, &$res);
+        Controller::applyIncludeHook("repository.test_access", $args);
+        if($res === false){
+            return false;
+        }
+        return true;
+    }
+    
+    
+    /**
+     * PUBLIC STATIC METHODS
+     */
+
+    /**
+     * @return RepositoryInterface[]
+     */
+    public static function getStaticRepositories(){
+        $self = self::getInstance();
+        if(!isSet($self->cache["STATIC"])){
+            $self->cache["STATIC"] = [];
+            foreach ($self->cache["DEFAULT_REPOSITORIES"] as $index=>$repository) {
+                $repoObject = self::createRepositoryFromArray($index, $repository);
+                $repoObject->setWriteable(false);
+                $self->cache["STATIC"][$repoObject->getId()] = $repoObject;
+            }
+        }
+        return $self->cache["STATIC"];
+    }
+
+    /**
+     * @param bool $includeShared
+     * @return \Pydio\Core\Model\RepositoryInterface[]
+     */
+    public static function listAllRepositories($includeShared = false){
+        $filtered = new FilteredRepositoriesList();
+        $filtered->setIncludeShared($includeShared);
+        return $filtered->load();
+    }
+
+    /**
+     * @param RepositoryInterface[] $repoList
+     * @param array $criteria
+     * @return RepositoryInterface[] array
+     */
+    public static function filterRepositoryListWithCriteria($repoList, $criteria)
+    {
+        $repositories = array();
+        $searchableKeys = array("uuid", "parent_uuid", "owner_user_id", "display", "accessType", "isTemplate", "slug", "groupPath");
+        foreach ($repoList as $repoId => $repoObject) {
+            $failOneCriteria = false;
+            foreach ($criteria as $key => $value) {
+                if (!in_array($key, $searchableKeys)) continue;
+                $criteriumOk = false;
+                $comp = null;
+                if ($key == "uuid") $comp = $repoObject->getId();
+                else if ($key == "parent_uuid") $comp = $repoObject->getParentId();
+                else if ($key == "owner_user_id") $comp = $repoObject->getUniqueUser();
+                else if ($key == "display") $comp = $repoObject->getDisplay();
+                else if ($key == "accessType") $comp = $repoObject->getAccessType();
+                else if ($key == "isTemplate") $comp = $repoObject->isTemplate();
+                else if ($key == "slug") $comp = $repoObject->getSlug();
+                else if ($key == "groupPath") $comp = $repoObject->getGroupPath();
+                if (is_array($value) && in_array($comp, $value)) {
+                    //$repositories[$repoId] = $repoObject;
+                    $criteriumOk = true;
+                } else if ($value == AJXP_FILTER_EMPTY && empty($comp)) {
+                    //$repositories[$repoId] = $repoObject;
+                    $criteriumOk = true;
+                } else if ($value == AJXP_FILTER_NOT_EMPTY && !empty($comp)) {
+                    //$repositories[$repoId] = $repoObject;
+                    $criteriumOk = true;
+                } else if (is_string($value) && strpos($value, "regexp:") === 0 && preg_match(str_replace("regexp:", "", $value), $comp)) {
+                    //$repositories[$repoId] = $repoObject;
+                    $criteriumOk = true;
+                } else if ($value == $comp) {
+                    //$repositories[$repoId] = $repoObject;
+                    $criteriumOk = true;
+                }
+                if (!$criteriumOk) {
+                    $failOneCriteria = true;
+                    break;
+                }
+            }
+            if (!$failOneCriteria) {
+                $repositories[$repoId] = $repoObject;
+            }
+        }
+        return $repositories;
+    }
+
+    /**
+     * @param array $criteria
+     * @param $count
+     * @return \Pydio\Access\Core\Model\Repository[]
+     */
+    public static function listRepositoriesWithCriteria($criteria, &$count)
+    {
+
+        $statics = self::getStaticRepositories();
+        $statics = self::filterRepositoryListWithCriteria($statics, $criteria);
+        $dyna = ConfService::getConfStorageImpl()->listRepositoriesWithCriteria($criteria, $count);
+        $count += count($statics);
+        return $statics + $dyna;
+
+    }
+
+    /**
+     * Create a repository object from a config options array
+     *
+     * @param integer $index
+     * @param array $repository
+     * @return Repository
+     */
+    public static function createRepositoryFromArray($index, $repository)
+    {
+        return self::getInstance()->createRepositoryFromArrayInst($index, $repository);
+    }
+
+    /**
+     * Add dynamically created repository
+     *
+     * @param \Pydio\Core\Model\RepositoryInterface $oRepository
+     * @return -1|null if error
+     */
+    public static function addRepository($oRepository)
+    {
+        return self::getInstance()->addRepositoryInst($oRepository);
+    }
+
+    /**
+     * @param $idOrAlias
+     * @return null|\Pydio\Access\Core\Model\Repository
+     */
+    public static function findRepositoryByIdOrAlias($idOrAlias)
+    {
+        $repository = RepositoryService::getRepositoryById($idOrAlias);
+        if ($repository != null) return $repository;
+        $repository = RepositoryService::getRepositoryByAlias($idOrAlias);
+        if ($repository != null) return $repository;
+        return null;
+    }
+
+    /**
+     * Get the reserved slugs used for config defined repositories
+     * @return array
+     */
+    public static function reservedSlugsFromConfig()
+    {
+        $slugs = array();
+        $statics = self::getStaticRepositories();
+        foreach ($statics as $repo) {
+            $slugs[] = $repo->getSlug();
+        }
+        return $slugs;
+    }
+
+    /**
+     * Retrieve a repository object
+     *
+     * @param String $repoId
+     * @return RepositoryInterface
+     */
+    public static function getRepositoryById($repoId)
+    {
+        return self::getInstance()->getRepositoryByIdInst($repoId);
+    }
+
+    /**
+     * Retrieve a repository object by its slug
+     *
+     * @param String $repoAlias
+     * @return RepositoryInterface
+     */
+    public static function getRepositoryByAlias($repoAlias)
+    {
+        $repo = ConfService::getConfStorageImpl()->getRepositoryByAlias($repoAlias);
+        if ($repo !== null) return $repo;
+        // check default repositories
+        return self::getInstance()->getRepositoryByAliasInstDefaults($repoAlias);
+    }
+
+    /**
+     * Replace a repository by an update one.
+     *
+     * @param String $oldId
+     * @param RepositoryInterface $oRepositoryObject
+     * @return mixed
+     */
+    public static function replaceRepository($oldId, $oRepositoryObject)
+    {
+        return self::getInstance()->replaceRepositoryInst($oldId, $oRepositoryObject);
+    }
+
+    /**
+     * Remove a repository using the conf driver implementation
+     * @static
+     * @param $repoId
+     * @return int
+     */
+    public static function deleteRepository($repoId)
+    {
+        return self::getInstance()->deleteRepositoryInst($repoId);
+    }
+
+    public function __clone()
+    {
+        trigger_error("Cannot clone me, i'm a singleton!", E_USER_ERROR);
+    }
+
+
+
+
+
+    /**
+     * PRIVATE INSTANCE IMPLEMENTATIONS
+     */
+    /**
+     * See static method
+     * @param $repoId
+     * @return Repository|null
+     */
+    private function getRepositoryByIdInst($repoId)
+    {
+        if (isSet($this->cache["REPOSITORIES"]) && isSet($this->cache["REPOSITORIES"][$repoId])) {
+            return $this->cache["REPOSITORIES"][$repoId];
+        }
+        $test = CacheService::fetch(AJXP_CACHE_SERVICE_NS_SHARED, "pydio:repository:" . $repoId);
+        if($test !== false){
+            $this->cache["REPOSITORIES"][$repoId] = $test;
+            return $test;
+        }
+        $test =  ConfService::getConfStorageImpl()->getRepositoryById($repoId);
+        if($test != null) {
+            $this->cache["REPOSITORIES"][$repoId] = $test;
+            CacheService::saveWithTimestamp(AJXP_CACHE_SERVICE_NS_SHARED, "pydio:repository:" . $repoId, $test);
+            return $test;
+        }
+        // Finally try to search in default repositories
+        $statics = self::getStaticRepositories();
+        if (isSet($statics[$repoId])) {
+            $repo = $statics[$repoId];
+            $this->cache["REPOSITORIES"][$repoId] = $test;
+            CacheService::saveWithTimestamp(AJXP_CACHE_SERVICE_NS_SHARED, "pydio:repository:" . $repoId, $repo);
+            return $repo;
+        }
+        $hookedRepo = null;
+        $args = array($repoId, &$hookedRepo);
+        Controller::applyIncludeHook("repository.search", $args);
+        if($hookedRepo !== null){
+            return $hookedRepo;
+        }
+        return null;
+    }
+
+
+
+    /**
+     * See static method
+     * @param string $index
+     * @param array $repository
+     * @return Repository
+     */
+    private function createRepositoryFromArrayInst($index, $repository)
+    {
+        $repo = new Repository($index, $repository["DISPLAY"], $repository["DRIVER"]);
+        if (isSet($repository["DISPLAY_ID"])) {
+            $repo->setDisplayStringId($repository["DISPLAY_ID"]);
+        }
+        if (isSet($repository["DESCRIPTION_ID"])) {
+            $repo->setDescription($repository["DESCRIPTION_ID"]);
+        }
+        if (isSet($repository["AJXP_SLUG"])) {
+            $repo->setSlug($repository["AJXP_SLUG"]);
+        }
+        if (isSet($repository["IS_TEMPLATE"]) && $repository["IS_TEMPLATE"]) {
+            $repo->isTemplate = true;
+            $repo->uuid = $index;
+        }
+        if (array_key_exists("DRIVER_OPTIONS", $repository) && is_array($repository["DRIVER_OPTIONS"])) {
+            foreach ($repository["DRIVER_OPTIONS"] as $oName=>$oValue) {
+                $repo->addOption($oName, $oValue);
+            }
+        }
+        // BACKWARD COMPATIBILITY!
+        if (array_key_exists("PATH", $repository)) {
+            $repo->addOption("PATH", $repository["PATH"]);
+            $repo->addOption("CREATE", intval($repository["CREATE"]));
+            $repo->addOption("RECYCLE_BIN", $repository["RECYCLE_BIN"]);
+        }
+        return $repo;
+    }
+
+    /**
+     * @param Repository|\Pydio\Core\Model\RepositoryInterface $oRepository
+     * @return -1|null on error
+     */
+    private function addRepositoryInst($oRepository)
+    {
+        Controller::applyHook("workspace.before_create", array(Context::emptyContext(), $oRepository));
+        $confStorage = ConfService::getConfStorageImpl();
+        $res = $confStorage->saveRepository($oRepository);
+        if ($res == -1) {
+            return $res;
+        }
+        Controller::applyHook("workspace.after_create", array(Context::emptyContext(), $oRepository));
+        Logger::info(__CLASS__,"Create Repository", array("repo_name"=>$oRepository->getDisplay()));
+        CacheService::saveWithTimestamp(AJXP_CACHE_SERVICE_NS_SHARED, "pydio:repository:".$oRepository->getId(), $oRepository);
+        return null;
+    }
+
+    /**
+     * See static method
+     * @param $repoAlias
+     * @return RepositoryInterface|null
+     */
+    private function getRepositoryByAliasInstDefaults($repoAlias)
+    {
+        $conf = self::getStaticRepositories();
+        foreach ($conf as $repoId => $repo) {
+            if ($repo->getSlug() === $repoAlias) {
+                return $repo;
+            }
+        }
+        return null;
+    }
+
+
+    /**
+     * See static method
+     * @param string $oldId
+     * @param RepositoryInterface $oRepositoryObject
+     * @return int
+     */
+    private function replaceRepositoryInst($oldId, $oRepositoryObject)
+    {
+        Controller::applyHook("workspace.before_update", array(Context::emptyContext(), $oRepositoryObject));
+        $confStorage = ConfService::getConfStorageImpl();
+        $res = $confStorage->saveRepository($oRepositoryObject, true);
+        if ($res == -1) {
+            return -1;
+        }
+        Controller::applyHook("workspace.after_update", array(Context::emptyContext(), $oRepositoryObject));
+        Logger::info(__CLASS__,"Edit Repository", array("repo_name"=>$oRepositoryObject->getDisplay()));
+        CacheService::saveWithTimestamp(AJXP_CACHE_SERVICE_NS_SHARED, "pydio:repository:" . $oRepositoryObject->getId(), $oRepositoryObject);
+        return 0;
+    }
+
+    /**
+     * See static method
+     * @param $repoId
+     * @return int
+     */
+    private function deleteRepositoryInst($repoId)
+    {
+        Controller::applyHook("workspace.before_delete", array(Context::emptyContext(), $repoId));
+        $confStorage = ConfService::getConfStorageImpl();
+        $shares = $confStorage->listRepositoriesWithCriteria(array("parent_uuid" => $repoId));
+        $toDelete = array();
+        foreach($shares as $share){
+            $toDelete[] = $share->getId();
+        }
+        $res = $confStorage->deleteRepository($repoId);
+        if ($res == -1) {
+            return $res;
+        }
+        foreach($toDelete as $deleteId){
+            $this->deleteRepositoryInst($deleteId);
+        }
+        Controller::applyHook("workspace.after_delete", array(Context::emptyContext(), $repoId));
+        Logger::info(__CLASS__,"Delete Repository", array("repo_id"=>$repoId));
+        CacheService::delete(AJXP_CACHE_SERVICE_NS_SHARED, "pydio:repository:".$repoId);
+        return 0;
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Services/RolesService.php b/core/src/core/src/pydio/Core/Services/RolesService.php
new file mode 100644
index 0000000000..bde7b27a86
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Services/RolesService.php
@@ -0,0 +1,393 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Services;
+
+use Pydio\Conf\Core\AJXP_Role;
+use Pydio\Conf\Core\AjxpRole;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Http\Message\ReloadRepoListMessage;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\UserInterface;
+use Pydio\Core\PluginFramework\PluginsService;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class RolesService
+ * @package Pydio\Core\Services
+ */
+class RolesService
+{
+
+    /**
+     * Update a user with admin rights and return it
+    * @param UserInterface $adminUser
+     * @return UserInterface
+    */
+    public static function updateAdminRights($adminUser)
+    {
+        if ($adminUser->getPersonalRole()->getAcl('ajxp_conf') != "rw") {
+            $adminUser->getPersonalRole()->setAcl('ajxp_conf', 'rw');
+            $adminUser->recomputeMergedRole();
+            $adminUser->save("superuser");
+        }
+        return $adminUser;
+    }
+
+    /**
+     * Update a user object with the default repositories rights
+     *
+     * @param UserInterface $userObject
+     */
+    public static function updateDefaultRights(&$userObject)
+    {
+        if (!$userObject->hasParent()) {
+            $rolesList = self::getRolesList(array(), true);
+            foreach ($rolesList as $roleId => $roleObject) {
+                if (!$userObject->canSee($roleObject)) continue;
+                if ($userObject->getProfile() == "shared" && $roleObject->autoAppliesTo("shared")) {
+                    $userObject->addRole($roleObject);
+                } else if ($roleObject->autoAppliesTo("standard")) {
+                    $userObject->addRole($roleObject);
+                }
+            }
+        }
+    }
+
+    /**
+     * @static
+     * @param UserInterface $userObject
+     */
+    public static function updateAutoApplyRole(&$userObject)
+    {
+        $roles = self::getRolesList(array(), true);
+        foreach ($roles as $roleObject) {
+            if (!$userObject->canSee($roleObject)) continue;
+            if ($roleObject->autoAppliesTo($userObject->getProfile()) || $roleObject->autoAppliesTo("all")) {
+                $userObject->addRole($roleObject);
+            }
+        }
+    }
+
+    /**
+     * @param UserInterface $userObject
+     */
+    public static function updateAuthProvidedData(&$userObject)
+    {
+        ConfService::getAuthDriverImpl()->updateUserObject($userObject);
+    }
+
+    /**
+     * Retrieve the current users who have either read or write access to a repository
+     * @param $repositoryId
+     * @param string $rolePrefix
+     * @param bool $splitByType
+     * @return array
+     */
+    public static function getRolesForRepository($repositoryId, $rolePrefix = '', $splitByType = false)
+    {
+        return ConfService::getConfStorageImpl()->getRolesForRepository($repositoryId, $rolePrefix, $splitByType);
+    }
+
+    /**
+     * Get Role by Id
+     *
+     * @param string $roleId
+     * @return AJXP_Role
+     */
+    public static function getRole($roleId)
+    {
+        $roles = self::getRolesList(array($roleId));
+        if (isSet($roles[$roleId])) return $roles[$roleId];
+        return false;
+    }
+
+    /**
+     * @param string $roleId Id of the role
+     * @param string $groupPath GroupPath to be applied
+     * @return AJXP_Role
+     */
+    public static function getOrCreateRole($roleId, $groupPath = "/")
+    {
+        $roles = self::getRolesList(array($roleId));
+        if (isSet($roles[$roleId])) return $roles[$roleId];
+        $role = new AJXP_Role($roleId);
+        $role->setGroupPath($groupPath);
+        self::updateRole($role);
+        return $role;
+    }
+
+    /**
+     * Create or update role
+     *
+     * @param AJXP_Role $roleObject
+     * @param UserInterface|null $userObject
+     */
+    public static function updateRole($roleObject, $userObject = null)
+    {
+        ConfService::getConfStorageImpl()->updateRole($roleObject, $userObject);
+        CacheService::saveWithTimestamp(AJXP_CACHE_SERVICE_NS_SHARED, "pydio:role:".$roleObject->getId(), $roleObject);
+        ConfService::getInstance()->invalidateLoadedRepositories();
+        $roleId = $roleObject->getId();
+        if(strpos($roleId, "AJXP_GRP_/") === 0){
+            $groupPath = substr($roleId, strlen("AJXP_GRP_"));
+            Controller::applyHook("msg.instant", array(Context::contextWithObjects(null, null), ReloadRepoListMessage::XML(), null, $groupPath));
+        }
+    }
+
+    /**
+     * Delete a role by its id
+     * @static
+     * @param string $roleId
+     * @return void
+     */
+    public static function deleteRole($roleId)
+    {
+        ConfService::getConfStorageImpl()->deleteRole($roleId);
+        CacheService::delete(AJXP_CACHE_SERVICE_NS_SHARED, "pydio:role:".$roleId);
+        ConfService::getInstance()->invalidateLoadedRepositories();
+    }
+
+    /**
+     * @param string $parentUserId
+     * @return AJXP_Role
+     */
+    public static function limitedRoleFromParent($parentUserId)
+    {
+        $parentRole = self::getRole("AJXP_USR_/" . $parentUserId);
+        if ($parentRole === false) return null;
+
+        $inheritActions = PluginsService::searchManifestsWithCache("//server_settings/param[@inherit='true']", function ($nodes) {
+            $result = [];
+            if (is_array($nodes) && count($nodes)) {
+                foreach ($nodes as $node) {
+                    $paramName = $node->getAttribute("name");
+                    $pluginId = $node->parentNode->parentNode->getAttribute("id");
+                    if (isSet($result[$pluginId])) $result[$pluginId] = array();
+                    $result[$pluginId][] = $paramName;
+                }
+            }
+            return $result;
+        });
+
+        // Clear ACL, Keep disabled actions, keep 'inherit' parameters.
+        $childRole = new AJXP_Role("AJXP_PARENT_USR_/");
+        $childRole->bunchUpdate(array(
+            "ACL" => array(),
+            "ACTIONS" => $parentRole->listAllActionsStates(),
+            "APPLIES" => array(),
+            "PARAMETERS" => array()));
+        $params = $parentRole->listParameters();
+
+        foreach ($params as $scope => $plugData) {
+            foreach ($plugData as $pId => $paramData) {
+                if (!isSet($inheritActions[$pId])) continue;
+                foreach ($paramData as $pName => $pValue) {
+                    $childRole->setParameterValue($pId, $pName, $pValue, $scope);
+                }
+            }
+        }
+
+        return $childRole;
+    }
+
+    /**
+     * @param boolean $status
+     */
+    public static function enableRolesCache($status){
+        self::$useCache = $status;
+        if($status){
+            self::$rolesCache = null;
+        }
+    }
+
+    /** @var  boolean */
+    private static $useCache;
+
+    /** @var  array */
+    private static $rolesCache;
+
+    /**
+     * Get all defined roles
+     * @static
+     * @param array $roleIds
+     * @param boolean $excludeReserved,
+     * @return AJXP_Role[]
+     */
+    public static function getRolesList($roleIds = array(), $excludeReserved = false)
+    {
+        if (self::$useCache && !count($roleIds) && $excludeReserved == true && self::$rolesCache != null) {
+            return self::$rolesCache;
+        }
+        $searches = array_map(function($k){return "pydio:role:".$k;}, $roleIds);
+        $fetches = CacheService::fetchMultiple(AJXP_CACHE_SERVICE_NS_SHARED, $searches);
+        $missing = [];
+        if(count($fetches)){
+            $found = [];
+            foreach($searches as $cacheKey){
+                $okKey = preg_replace('/^pydio:role:/', "", $cacheKey);
+                if(isSet($fetches[$cacheKey]) && $fetches[$cacheKey] instanceof AJXP_Role){
+                    $found[$okKey] = $fetches[$cacheKey];
+                }else{
+                    $missing[] = $okKey;
+                }
+            }
+            if(!count($missing)){
+                return $found;
+            }else{
+                $roleIds = $missing;
+            }
+        }
+
+        $confDriver = ConfService::getConfStorageImpl();
+        $roles = $confDriver->listRoles($roleIds, $excludeReserved);
+        $repoList = null;
+        foreach ($roles as $roleId => $roleObject) {
+            if ($roleObject instanceof AjxpRole) {
+                if ($repoList == null) $repoList = RepositoryService::listAllRepositories(true);
+                $newRole = new AJXP_Role($roleId);
+                $newRole->migrateDeprecated($repoList, $roleObject);
+                $roles[$roleId] = $newRole;
+                self::updateRole($newRole);
+            }
+            if(count($roleIds)){
+                CacheService::saveWithTimestamp(AJXP_CACHE_SERVICE_NS_SHARED, "pydio:role:".$roleId, $roleObject);
+            }
+        }
+        if(isSet($found) && count($found)){
+            // Add the ones loaded from cache
+            $roles = array_merge($roles, $found);
+        }
+        if (self::$useCache && !count($roleIds) && $excludeReserved == true) {
+            self::$rolesCache = $roles;
+        }
+        return $roles;
+    }
+
+    /**
+     * Specific operations to perform at boot time
+     * @static
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public static function bootSequence()
+    {
+        $bootConfDir = AJXP_DATA_PATH. "/plugins/boot.conf";
+        if (file_exists(AJXP_CACHE_DIR . "/admin_counted") || file_exists($bootConfDir."/admin_counted")) return;
+        $rootRole = RolesService::getRole("AJXP_GRP_/");
+        if ($rootRole === false) {
+            $rootRole = new AJXP_Role("AJXP_GRP_/");
+            $rootRole->setLabel("Root Group");
+            //$rootRole->setAutoApplies(array("standard", "admin"));
+            //$dashId = "";
+            $allRepos = RepositoryService::listAllRepositories();
+            foreach ($allRepos as $repositoryId => $repoObject) {
+                if ($repoObject->isTemplate) continue;
+                //if($repoObject->getAccessType() == "ajxp_user") $dashId = $repositoryId;
+                $gp = $repoObject->getGroupPath();
+                if (empty($gp) || $gp == "/") {
+                    if ($repoObject->getDefaultRight() != "") {
+                        $rootRole->setAcl($repositoryId, $repoObject->getDefaultRight());
+                    }
+                }
+            }
+            //if(!empty($dashId)) $rootRole->setParameterValue("core.conf", "DEFAULT_START_REPOSITORY", $dashId);
+            $parameters = PluginsService::searchManifestsWithCache("//server_settings/param[@scope]", function ($paramNodes) {
+                $result = [];
+                /** @var \DOMElement $xmlNode */
+                foreach ($paramNodes as $xmlNode) {
+                    $default = $xmlNode->getAttribute("default");
+                    if (empty($default)) continue;
+                    $parentNode = $xmlNode->parentNode->parentNode;
+                    $pluginId = $parentNode->getAttribute("id");
+                    if (empty($pluginId)) {
+                        $pluginId = $parentNode->nodeName . "." . $parentNode->getAttribute("name");
+                    }
+                    $result[] = ["pluginId" => $pluginId, "name" => $xmlNode->getAttribute("name"), "default" => $default];
+                }
+                return $result;
+            });
+            foreach ($parameters as $parameter) {
+                $rootRole->setParameterValue($parameter["pluginId"], $parameter["name"], $parameter["default"]);
+            }
+            RolesService::updateRole($rootRole);
+        }
+        $miniRole = RolesService::getRole("MINISITE");
+        if ($miniRole === false) {
+            $rootRole = new AJXP_Role("MINISITE");
+            $rootRole->setLabel("Minisite Users");
+            $actions = array(
+                "access.fs" => array("ajxp_link", "chmod", "purge"),
+                "meta.watch" => array("toggle_watch"),
+                "conf.serial" => array("get_bookmarks"),
+                "conf.sql" => array("get_bookmarks"),
+                "index.lucene" => array("index"),
+                "action.share" => array("share", "share-edit-shared", "share-folder-workspace", "share-file-minisite", "share-selection-minisite", "share-folder-minisite-public"),
+                "gui.ajax" => array("bookmark"),
+                "auth.serial" => array("pass_change"),
+                "auth.sql" => array("pass_change"),
+            );
+            foreach ($actions as $pluginId => $acts) {
+                foreach ($acts as $act) {
+                    $rootRole->setActionState($pluginId, $act, AJXP_REPO_SCOPE_SHARED, false);
+                }
+            }
+            RolesService::updateRole($rootRole);
+        }
+        $miniRole = RolesService::getRole("MINISITE_NODOWNLOAD");
+        if ($miniRole === false) {
+            $rootRole = new AJXP_Role("MINISITE_NODOWNLOAD");
+            $rootRole->setLabel("Minisite Users - No Download");
+            $actions = array(
+                "access.fs" => array("download", "download_chunk", "prepare_chunk_dl", "download_all")
+            );
+            foreach ($actions as $pluginId => $acts) {
+                foreach ($acts as $act) {
+                    $rootRole->setActionState($pluginId, $act, AJXP_REPO_SCOPE_SHARED, false);
+                }
+            }
+            RolesService::updateRole($rootRole);
+        }
+        $miniRole = RolesService::getRole("GUEST");
+        if ($miniRole === false) {
+            $rootRole = new AJXP_Role("GUEST");
+            $rootRole->setLabel("Guest user role");
+            $actions = array(
+                "access.fs" => array("purge"),
+                "meta.watch" => array("toggle_watch"),
+                "index.lucene" => array("index"),
+            );
+            $rootRole->setAutoApplies(array("guest"));
+            foreach ($actions as $pluginId => $acts) {
+                foreach ($acts as $act) {
+                    $rootRole->setActionState($pluginId, $act, AJXP_REPO_SCOPE_ALL);
+                }
+            }
+            RolesService::updateRole($rootRole);
+        }
+        if(!file_exists($bootConfDir)){
+            mkdir($bootConfDir, 0666, true);
+        }
+        file_put_contents($bootConfDir . "/admin_counted", "true");
+
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Services/SessionService.php b/core/src/core/src/pydio/Core/Services/SessionService.php
new file mode 100644
index 0000000000..5fbecd6164
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Services/SessionService.php
@@ -0,0 +1,267 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Services;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Core\Model\RepositoryInterface;
+use Pydio\Core\Model\UserInterface;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+define('PYDIO_SESSION_NAME', 'AjaXplorer');
+define('PYDIO_SESSION_QUERY_PARAM', 'ajxp_sessid');
+
+/**
+ * Class SessionService
+ * @package Pydio\Core\Services
+ */
+class SessionService implements RepositoriesCache
+{
+    const USER_KEY = "PYDIO_USER";
+    const LANGUAGES_KEY = "PYDIO_LANGUAGES";
+    const CTX_LANGUAGE_KEY = "PYDIO_CTX_LANGUAGE";
+    const CTX_CHARSET_KEY = "PYDIO_CTX_CHARSET";
+    const CTX_MINISITE_HASH = "PYDIO_CTX_MINISITE";
+
+    const LOADED_REPOSITORIES = "PYDIO_REPOSITORIES";
+    const PREVIOUS_REPOSITORY = "PYDIO_PREVIOUS_REPO_ID";
+    const CTX_REPOSITORY_ID = "PYDIO_REPO_ID";
+    const PENDING_REPOSITORY_ID = "PYDIO_PENDING_REPO_ID";
+    const PENDING_FOLDER = "PYDIO_PENDING_FOLDER";
+
+    private static $sessionName = PYDIO_SESSION_NAME;
+
+    /**
+     * @param $sessionName
+     */
+    public static function setSessionName($sessionName){
+        self::$sessionName = $sessionName;
+    }
+
+    /**
+     * @return string
+     */
+    public static function getSessionName(){
+        return self::$sessionName;
+    }
+
+    /**
+     * @param $id
+     * @return null
+     */
+    public static function fetch($id){
+        if(!is_array($_SESSION) || !ApplicationState::sapiUsesSession()) return null;
+        if(isSet($_SESSION[$id]) && !$_SESSION[$id] instanceof \__PHP_Incomplete_Class){
+            return $_SESSION[$id];
+        }
+        return null;
+    }
+
+    /**
+     * @param $id
+     * @param $data
+     * @return bool
+     */
+    public static function save($id, $data){
+        if(!is_array($_SESSION) || !ApplicationState::sapiUsesSession()) return false;
+        $_SESSION[$id] = $data;
+        return true;
+    }
+
+    /**
+     * @param $id string
+     */
+    public static function delete($id){
+        if(!is_array($_SESSION) || !ApplicationState::sapiUsesSession()) return;
+        if(array_key_exists($id, $_SESSION)){
+            unset($_SESSION[$id]);
+        }
+    }
+
+    /**
+     * @param $id
+     * @return bool
+     */
+    public static function has($id){
+        return(is_array($_SESSION) && array_key_exists($id, $_SESSION));
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @param callable|null $next
+     * @return mixed|ResponseInterface
+     */
+    public static function handleRequest(ServerRequestInterface $request, ResponseInterface $response, callable $next = null){
+
+        $getParams = $request->getQueryParams();
+        if (isSet($getParams[PYDIO_SESSION_QUERY_PARAM])) {
+            $cookies = $request->getCookieParams();
+            if (!isSet($cookies[self::$sessionName])) {
+                $cookies[self::$sessionName] = $getParams[PYDIO_SESSION_QUERY_PARAM];
+                $request = $request->withCookieParams($cookies);
+            }
+        }
+
+        if(defined("AJXP_SESSION_HANDLER_PATH") && defined("AJXP_SESSION_HANDLER_CLASSNAME") && file_exists(AJXP_SESSION_HANDLER_PATH)){
+            require_once(AJXP_SESSION_HANDLER_PATH);
+            if(class_exists(AJXP_SESSION_HANDLER_CLASSNAME, false)){
+                $sessionHandlerClass = AJXP_SESSION_HANDLER_CLASSNAME;
+                $sessionHandler = new $sessionHandlerClass();
+                session_set_save_handler($sessionHandler, false);
+            }
+        }
+        session_name(self::$sessionName);
+        session_start();
+
+        if($next !== null){
+            $response = call_user_func_array($next, array(&$request, &$response));
+        }
+
+        register_shutdown_function(function(){
+            SessionService::close();
+        });
+
+        return $response;
+
+    }
+
+    public static function close(){
+        session_write_close();
+    }
+
+    /**
+     * @param UserInterface $ctxUser
+     */
+    public static function checkPendingRepository($ctxUser){
+        if (self::has(self::PENDING_REPOSITORY_ID) && self::has(self::PENDING_FOLDER)) {
+            $ctxUser->setArrayPref("history", "last_repository", self::fetch(self::PENDING_REPOSITORY_ID));
+            $ctxUser->setPref("pending_folder", self::fetch(self::PENDING_FOLDER));
+            self::delete(self::PENDING_REPOSITORY_ID);
+            self::delete(self::PENDING_FOLDER);
+        }
+    }
+
+    /**
+     * @return null
+     */
+    public static function getSessionRepositoryId(){
+        return self::fetch(self::CTX_REPOSITORY_ID);
+    }
+
+    /**
+     * @param $repoId
+     */
+    public static function saveRepositoryId($repoId){
+        self::save(self::CTX_REPOSITORY_ID, $repoId);
+    }
+
+    /**
+     * @param $repoId
+     */
+    public static function switchSessionRepositoriId($repoId){
+        if(self::has(self::CTX_REPOSITORY_ID)) {
+            self::save(self::PREVIOUS_REPOSITORY, self::fetch(self::CTX_REPOSITORY_ID));
+        }
+        self::save(self::CTX_REPOSITORY_ID, $repoId);
+    }
+
+    /**
+     * @return null
+     */
+    public static function getPreviousRepositoryId(){
+        return self::fetch(self::PREVIOUS_REPOSITORY);
+    }
+
+    /**
+     * @return RepositoryInterface[]|null
+     */
+    public static function getLoadedRepositories()
+    {
+        $arr = self::fetch(self::LOADED_REPOSITORIES);
+        if (is_array($arr)) {
+            $sessionNotCorrupted = array_reduce($arr, function($carry, $item){ return $carry && is_object($item) && ($item instanceof RepositoryInterface); }, true);
+            if($sessionNotCorrupted){
+                return $arr;
+            } else {
+                self::delete(self::LOADED_REPOSITORIES);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @param RepositoryInterface[] $repositories
+     * @return mixed
+     */
+    public static function updateLoadedRepositories($repositories)
+    {
+        self::save(self::LOADED_REPOSITORIES, $repositories);
+    }
+
+    /**
+     * @return boolean
+     */
+    public static function invalidateLoadedRepositories()
+    {
+        self::delete(self::LOADED_REPOSITORIES);
+    }
+
+    /**
+     * @param $repositoryId
+     * @return null
+     */
+    public static function getContextCharset($repositoryId)
+    {
+        $arr = self::fetch(self::CTX_CHARSET_KEY);
+        if(!empty($arr) && isSet($arr[$repositoryId])){
+            return $arr[$repositoryId];
+        }
+        return null;
+    }
+
+    /**
+     * @param $repositoryId
+     * @param $value
+     */
+    public static function setContextCharset($repositoryId, $value)
+    {
+        $arr = self::fetch(self::CTX_CHARSET_KEY) OR [];
+        $arr[$repositoryId] = $value;
+        self::save(self::CTX_CHARSET_KEY, $arr);
+    }
+
+    /**
+     * @param string $lang
+     */
+    public static function setLanguage($lang){
+        self::save(self::CTX_LANGUAGE_KEY, $lang);
+    }
+
+    /**
+     * @return string|null
+     */
+    public static function getLanguage(){
+        return self::fetch(self::CTX_LANGUAGE_KEY);
+    }
+    
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Services/UsersService.php b/core/src/core/src/pydio/Core/Services/UsersService.php
new file mode 100644
index 0000000000..06873f7697
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Services/UsersService.php
@@ -0,0 +1,754 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Services;
+
+use Pydio\Conf\Core\AbstractUser;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Exception\UserNotFoundException;
+use Pydio\Core\Exception\WorkspaceForbiddenException;
+use Pydio\Core\Exception\WorkspaceNotFoundException;
+use Pydio\Core\Http\Message\ReloadRepoListMessage;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Model\FilteredRepositoriesList;
+use Pydio\Core\Model\RepositoryInterface;
+use Pydio\Core\Model\UserInterface;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Utils\Http\CookiesHelper;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class UsersService
+ * @package Pydio\Core\Services
+ */
+class UsersService
+{
+    /**
+     * @var UsersService
+     */
+    private static $_instance;
+    /**
+     * @var array
+     */
+    private $repositoriesCache = [];
+    /**
+     * @var array
+     */
+    private $usersCache = [];
+
+    /**
+     * @var array
+     */
+    private $userParametersCache = [];
+
+    /**
+     * @return UsersService
+     */
+    public static function instance(){
+        if(empty(self::$_instance)) self::$_instance = new UsersService();
+        return self::$_instance;
+    }
+
+    /**
+     * @param string $userId
+     * @param bool $checkExists
+     * @return UserInterface
+     * @throws UserNotFoundException
+     */
+    public static function getUserById($userId, $checkExists = true){
+
+        $self = self::instance();
+        // Try to get from memory
+        if(isSet($self->usersCache[$userId])){
+            return $self->usersCache[$userId];
+        }
+        // Try to get from cache
+        $test = CacheService::fetch(AJXP_CACHE_SERVICE_NS_SHARED, "pydio:user:" . $userId);
+        if($test !== false && $test instanceof UserInterface){
+            // Second check : if roles were updated in cache
+            $roleCacheIds = array_map(function($k){ return "pydio:role:".$k; }, $test->getRolesKeys());
+            $test = CacheService::fetchWithTimestamps(AJXP_CACHE_SERVICE_NS_SHARED, "pydio:user:".$userId, $roleCacheIds);
+            if($test !== false){
+                if($test->getPersonalRole() === null){
+                    $test->updatePersonalRole($test->getRoles()["AJXP_USR_/".$userId]);
+                }
+                $test->recomputeMergedRole();
+                $self->usersCache[$userId] = $test;
+                return $test;
+            }
+        }
+        if($checkExists && !self::userExists($userId)){
+            throw new UserNotFoundException($userId);
+        }
+        // Try to get from conf
+        $userObject = ConfService::getConfStorageImpl()->createUserObject($userId);
+        if($userObject instanceof UserInterface){
+            // Save in memory
+            $self->usersCache[$userId] = $userObject;
+            // Save in cache
+            CacheService::saveWithTimestamp(AJXP_CACHE_SERVICE_NS_SHARED, "pydio:user:" . $userId, $userObject);
+        }
+        return $userObject;
+
+    }
+
+    /**
+     * @param $userObject UserInterface
+     * @param string $scope
+     */
+    public static function updateUser($userObject, $scope = "user"){
+        $self = self::instance();
+        $userId = $userObject->getId();
+        $self->usersCache[$userId] = $userObject;
+        if($scope === "user"){
+            CacheService::save(AJXP_CACHE_SERVICE_NS_SHARED, "pydio:user:" . $userId, $userObject);
+        }else{
+            CacheService::saveWithTimestamp(AJXP_CACHE_SERVICE_NS_SHARED, "pydio:user:" . $userId, $userObject);
+            Controller::applyHook("msg.instant", array(Context::contextWithObjects($userObject, null), ReloadRepoListMessage::XML(), $userObject->getId()));
+        }
+    }
+
+    /**
+     * @param UserInterface $user
+     * @param string $repositoryId
+     * @return null|RepositoryInterface
+     * @throws WorkspaceNotFoundException
+     * @throws WorkspaceForbiddenException
+     */
+    public static function getRepositoryWithPermission($user, $repositoryId){
+        $repo = RepositoryService::findRepositoryByIdOrAlias($repositoryId);
+        if($repo == null){
+            throw new WorkspaceNotFoundException($repositoryId);
+        }
+        if(!RepositoryService::repositoryIsAccessible($repo, $user)){
+            throw new WorkspaceForbiddenException($repositoryId);
+        }
+        return $repo;
+    }
+
+    /**
+     * @param UserInterface $user
+     * @param bool $includeShared
+     * @param bool $details
+     * @param bool $labelsOnly
+     * @return \Pydio\Core\Model\RepositoryInterface[]
+     */
+    public static function getRepositoriesForUser($user, $includeShared = true, $details = false, $labelsOnly = false){
+
+        $self = self::instance();
+        $repos = $self->getFromCaches($user->getId());
+        if($repos !== null) {
+            $userRepos =  $repos;
+        } else{
+            $list = new FilteredRepositoriesList($user);
+            $repos = $list->load();
+            $self->setInCache($user->getId(), $repos);
+            $userRepos = $repos;
+        }
+        if($includeShared && !$details && !$labelsOnly) {
+            return $userRepos;
+        }
+        $output = [];
+        foreach ($userRepos as $repoId => $repoObject){
+            if(!RepositoryService::repositoryIsAccessible($repoObject, $user, $details, $includeShared)){
+                continue;
+            }
+            if($labelsOnly) $output[$repoId] = $repoObject->getDisplay();
+            else $output[$repoId] = $repoObject;
+        }
+        return $output;
+
+    }
+
+    /**
+     * @param $userId
+     * @return mixed|null|\Pydio\Core\Model\RepositoryInterface[]
+     */
+    private function getFromCaches($userId){
+
+        $fromSesssion = SessionService::getLoadedRepositories();
+        if($fromSesssion !== null){
+            $this->repositoriesCache[$userId] = $fromSesssion;
+            return $fromSesssion;
+        }
+        if(isSet($this->repositoriesCache[$userId])) {
+            $configsNotCorrupted = array_reduce($this->repositoriesCache[$userId], function($carry, $item){ return $carry && is_object($item) && ($item instanceof RepositoryInterface); }, true);
+            if($configsNotCorrupted){
+                return $this->repositoriesCache[$userId];
+            }else{
+                $this->repositoriesCache = [];
+            }
+        }
+        return null;
+
+    }
+
+    /**
+     * @param string $userId
+     * @param RepositoryInterface[] $repoList
+     */
+    private function setInCache($userId, $repoList){
+
+        $this->repositoriesCache[$userId] = $repoList;
+        SessionService::updateLoadedRepositories($repoList);
+
+    }
+
+    public static function invalidateCache(){
+
+        self::instance()->repositoriesCache = [];
+        self::instance()->usersCache = [];
+        SessionService::invalidateLoadedRepositories();
+
+    }
+
+    
+
+    /**
+     * Whether the whole users management system is enabled or not.
+     * @static
+     * @return bool
+     */
+    public static function usersEnabled()
+    {
+        return ConfService::getGlobalConf("ENABLE_USERS", "auth");
+    }
+
+    /**
+     * Whether the current auth driver supports password update or not
+     * @static
+     * @return bool
+     */
+    public static function changePasswordEnabled()
+    {
+        $authDriver = ConfService::getAuthDriverImpl();
+        return $authDriver->passwordsEditable();
+    }
+
+    /**
+     * Return user to lower case if ignoreUserCase
+     * @param $user
+     * @return string
+     */
+    public static function filterUserSensitivity($user)
+    {
+        if (!ConfService::getGlobalConf("CASE_SENSITIVE", "auth")) {
+            return strtolower($user);
+        } else {
+            return $user;
+        }
+    }
+
+    /**
+     * Get config to knwo whether we should ignore user case
+     * @return bool
+     */
+    public static function ignoreUserCase()
+    {
+        return !ConfService::getGlobalConf("CASE_SENSITIVE", "auth");
+    }
+
+    /**
+     * If the auth driver implementation has a logout redirect URL.
+     * @static
+     * @return string
+     */
+    public static function getLogoutAddress()
+    {
+        $authDriver = ConfService::getAuthDriverImpl();
+        $logout = $authDriver->getLogoutRedirect();
+        return $logout;
+    }
+
+    /**
+     * Use driver implementation to check whether the user exists or not.
+     * @static
+     * @param String $userId
+     * @param String $mode "r" or "w"
+     * @return bool
+     */
+    public static function userExists($userId, $mode = "r")
+    {
+        if ($userId == "guest" && !ConfService::getGlobalConf("ALLOW_GUEST_BROWSING", "auth")) {
+            return false;
+        }
+        $userId = self::filterUserSensitivity($userId);
+        $authDriver = ConfService::getAuthDriverImpl();
+        if ($mode == "w") {
+            return $authDriver->userExistsWrite($userId);
+        }
+        return $authDriver->userExists($userId);
+    }
+
+    /**
+     * Make sure a user id is not reserved for low-level tasks (currently "guest" and "shared").
+     * @static
+     * @param String $username
+     * @return bool
+     */
+    public static function isReservedUserId($username)
+    {
+        $username = self::filterUserSensitivity($username);
+        return in_array($username, array("guest", "shared"));
+    }
+
+    /**
+     * Check a password
+     * @static
+     * @param $userId
+     * @param $userPass
+     * @param bool $cookieString
+     * @return bool|void
+     * @throws UserNotFoundException
+     */
+    public static function checkPassword($userId, $userPass, $cookieString = false)
+    {
+        if (ConfService::getGlobalConf("ALLOW_GUEST_BROWSING", "auth") && $userId == "guest") return true;
+        $userId = self::filterUserSensitivity($userId);
+        $authDriver = ConfService::getAuthDriverImpl();
+        if ($cookieString) {
+            $userObject = self::getUserById($userId);
+            $res = CookiesHelper::checkCookieString($userObject, $userPass);
+            return $res;
+        }
+        return $authDriver->checkPassword($userId, $userPass);
+    }
+
+    /**
+     * Update the password in the auth driver implementation.
+     * @static
+     * @throws \Exception
+     * @param $userId
+     * @param $userPass
+     * @return bool
+     */
+    public static function updatePassword($userId, $userPass)
+    {
+        if (strlen($userPass) < ConfService::getGlobalConf("PASSWORD_MINLENGTH", "auth")) {
+            $messages = LocaleService::getMessages();
+            throw new \Exception($messages[378]);
+        }
+        $userId = self::filterUserSensitivity($userId);
+        $authDriver = ConfService::getAuthDriverImpl();
+        $ctx = Context::emptyContext();
+        Controller::applyHook("user.before_password_change", array($ctx, $userId));
+        $authDriver->changePassword($userId, $userPass);
+        Controller::applyHook("user.after_password_change", array($ctx, $userId));
+
+        self::storeWebdavDigestForUser(self::getUserById($userId), $userPass);
+
+        Logger::info(__CLASS__, "Update Password", array("user_id" => $userId));
+        return true;
+    }
+
+    /**
+     * Create a user
+     * @static
+     * @throws \Exception
+     * @param $userId
+     * @param $userPass
+     * @param bool $isAdmin
+     * @param bool $isHidden
+     * @return UserInterface
+     */
+    public static function createUser($userId, $userPass, $isAdmin = false, $isHidden = false)
+    {
+        $userId = self::filterUserSensitivity($userId);
+        $localContext = new Context($userId, null);
+        Controller::applyHook("user.before_create", array($localContext, $userId, $userPass, $isAdmin, $isHidden));
+        if (!ConfService::getGlobalConf("ALLOW_GUEST_BROWSING", "auth") && $userId == "guest") {
+            throw new \Exception("Reserved user id");
+        }
+        $authDriver = ConfService::getAuthDriverImpl();
+        $authDriver->createUser($userId, $userPass);
+        $user = self::getUserById($userId, false);
+        if ($isAdmin) {
+            $user->setAdmin(true);
+            $user->save("superuser");
+        }
+        if ($isHidden) {
+            $user->setHidden(true);
+            $user->save("superuser");
+        }
+
+        self::storeWebdavDigestForUser($user, $userPass);
+
+        Controller::applyHook("user.after_create", array($localContext, $user));
+        Logger::info(__CLASS__, "Create User", array("user_id" => $userId));
+        return $user;
+    }
+
+    /**
+     * Store the HA1 digest for Digest Authentication in WebDAV
+     * @param UserInterface $userObject
+     * @param string $password
+     * @throws UserNotFoundException
+     */
+    private static function storeWebdavDigestForUser($userObject, $password){
+
+        $realm = ConfService::getGlobalConf("WEBDAV_DIGESTREALM");
+        $ha1 = md5("{$userObject->getId()}:{$realm}:{$password}");
+        $wData = $userObject->getPref("AJXP_WEBDAV_DATA");
+        if (!is_array($wData)) $wData = array();
+        $wData["HA1"] = $ha1;
+        $userObject->setPref("AJXP_WEBDAV_DATA", $wData);
+        $userObject->save();
+
+    }
+
+    /**
+     * Detect the number of admin users
+     * @static
+     * @return int|void
+     */
+    public static function countAdminUsers()
+    {
+        $confDriver = ConfService::getConfStorageImpl();
+        $auth = ConfService::getAuthDriverImpl();
+        $count = $confDriver->countAdminUsers();
+        if (!$count && $auth->userExists("admin") && $confDriver->getName() == "serial") {
+            return -1;
+        }
+        return $count;
+    }
+
+    /**
+     * Delete a user in the auth/conf driver impl
+     * @static
+     * @param $userId
+     * @return bool
+     */
+    public static function deleteUser($userId)
+    {
+        $ctx = Context::emptyContext();
+        Controller::applyHook("user.before_delete", array($ctx, $userId));
+        $userId = self::filterUserSensitivity($userId);
+        $authDriver = ConfService::getAuthDriverImpl();
+        $authDriver->deleteUser($userId);
+        $subUsers = array();
+        ConfService::getConfStorageImpl()->deleteUser($userId, $subUsers);
+        foreach ($subUsers as $deletedUser) {
+            $authDriver->deleteUser($deletedUser);
+        }
+        Controller::applyHook("user.after_delete", array($ctx, $userId));
+        Logger::info(__CLASS__, "Delete User", array("user_id" => $userId, "sub_user" => implode(",", $subUsers)));
+        return true;
+    }
+
+    /**
+     * List children groups of current base
+     * @param string $baseGroup
+     * @return string[]
+     */
+    public static function listChildrenGroups($baseGroup = "/")
+    {
+        return ConfService::getAuthDriverImpl()->listChildrenGroups($baseGroup);
+
+    }
+
+    /**
+     * Create a new group at the given path
+     *
+     * @param $baseGroup
+     * @param $groupName
+     * @param $groupLabel
+     * @throws \Exception
+     */
+    public static function createGroup($baseGroup, $groupName, $groupLabel)
+    {
+        if (empty($groupName)) throw new \Exception("Please provide a name for this new group!");
+        $fullGroupPath = rtrim($baseGroup, "/") . "/" . $groupName;
+        $exists = ConfService::getConfStorageImpl()->groupExists($fullGroupPath);
+        if ($exists) {
+            throw new \Exception("Group with this name already exists, please pick another name!");
+        }
+        if (empty($groupLabel)) $groupLabel = $groupName;
+        ConfService::getConfStorageImpl()->createGroup(rtrim($baseGroup, "/") . "/" . $groupName, $groupLabel);
+    }
+
+    /**
+     * Delete group by name
+     * @param $baseGroup
+     * @param $groupName
+     */
+    public static function deleteGroup($baseGroup, $groupName)
+    {
+        ConfService::getConfStorageImpl()->deleteGroup(rtrim($baseGroup, "/") . "/" . $groupName);
+    }
+
+    /**
+     * Count the number of children a given user has already created
+     * @param $parentUserId
+     * @return AbstractUser[]
+     */
+    public static function getChildrenUsers($parentUserId)
+    {
+        return ConfService::getConfStorageImpl()->getUserChildren($parentUserId);
+    }
+
+    /**
+     * Count the number of users who have either read or write access to a repository
+     * @param ContextInterface $ctx
+     * @param $repositoryId
+     * @param bool $details
+     * @param bool $admin True if called in an admin context
+     * @return array|int
+     */
+    public static function countUsersForRepository(ContextInterface $ctx, $repositoryId, $details = false, $admin = false)
+    {
+        return ConfService::getConfStorageImpl()->countUsersForRepository($ctx, $repositoryId, $details, $admin);
+    }
+
+    /**
+     * List users with a specific filter
+     * @param string $baseGroup
+     * @param null $regexp
+     * @param $offset
+     * @param $limit
+     * @param bool $cleanLosts
+     * @param bool $recursive
+     * @param null $countCallback
+     * @param null $loopCallback
+     * @return UserInterface[]
+     */
+    public static function listUsers($baseGroup = "/", $regexp = null, $offset = -1, $limit = -1, $cleanLosts = true, $recursive = true, $countCallback = null, $loopCallback = null)
+    {
+        $authDriver = ConfService::getAuthDriverImpl();
+        $confDriver = ConfService::getConfStorageImpl();
+        /**
+         * @var $allUsers AbstractUser[]
+         */
+        $allUsers = array();
+        $paginated = false;
+        if (($regexp != null || $offset != -1 || $limit != -1) && $authDriver->supportsUsersPagination()) {
+            $users = $authDriver->listUsersPaginated($baseGroup, $regexp, $offset, $limit, $recursive);
+            $paginated = ($offset != -1 || $limit != -1);
+        } else {
+            $users = $authDriver->listUsers($baseGroup);
+        }
+        $index = 0;
+
+        // Callback func for display progression on cli mode
+        if ($countCallback != null) {
+            call_user_func($countCallback, $index, count($users), "Update users");
+        }
+
+        RolesService::enableRolesCache(true);
+        foreach (array_keys($users) as $userId) {
+            if (($userId == "guest" && !ConfService::getGlobalConf("ALLOW_GUEST_BROWSING", "auth")) || $userId == "ajxp.admin.users" || $userId == "") continue;
+            if ($regexp != null && !$authDriver->supportsUsersPagination() && !preg_match("/$regexp/i", $userId)) continue;
+            $allUsers[$userId] = self::getUserById($userId);
+            $index++;
+
+            // Callback func for display progression on cli mode
+            if ($countCallback != null) {
+                call_user_func($loopCallback, $index);
+            }
+
+            if (empty($regexp) && $paginated) {
+                // Make sure to reload all children objects
+                foreach ($confDriver->getUserChildren($userId) as $childObject) {
+                    $allUsers[$childObject->getId()] = $childObject;
+                }
+            }
+        }
+        RolesService::enableRolesCache(false);
+
+        if (empty($regexp) && $paginated && $cleanLosts) {
+            // Remove 'lost' items (children without parents).
+            foreach ($allUsers as $id => $object) {
+                if ($object->hasParent() && !array_key_exists($object->getParent(), $allUsers)) {
+                    unset($allUsers[$id]);
+                }
+            }
+        }
+        return $allUsers;
+    }
+
+    /**
+     * Scroll every registered users and apply a callback
+     *
+     * @param string $baseGroup Where to start from
+     * @param bool $recursive Browse all subgroups and their children
+     * @param callable $userCallback Apply this callback to every user found. Parameters are (userId, userGroup, index, total) where index/total are relative in the current group.
+     * @param callable $groupCallback Apply this callback to every group found. Parameters are (groupPath, groupLabel). Generally for logging purpose.
+     * @param string $baseGroupLabel Pass label of the current group, used by groupCallback.
+     */
+    public static function browseUsersGroupsWithCallback($baseGroup, $userCallback, $recursive = false, $groupCallback = null, $baseGroupLabel = null){
+
+        $authDriver = ConfService::getAuthDriverImpl();
+        $pairs = $authDriver->listUsers($baseGroup, false);
+        if($groupCallback !== null){
+            $groupCallback($baseGroup, $baseGroupLabel);
+        }
+        $currentUsers = array_keys($pairs);
+        $total = count($currentUsers);
+        foreach($currentUsers as $index => $userId){
+            $userCallback($userId, $baseGroup, $index, $total);
+        }
+        if($recursive){
+            $childrenGroups = $authDriver->listChildrenGroups($baseGroup);
+            foreach($childrenGroups as $relativePath => $groupLabel){
+                self::browseUsersGroupsWithCallback(rtrim($baseGroup, "/")."/".$relativePath, $userCallback, true, $groupCallback, $groupLabel);
+            }
+        }
+
+    }
+
+    /**
+     * Depending on the plugin, tried to compute the actual page where a given user can be located
+     *
+     * @param $baseGroup
+     * @param $userLogin
+     * @param $usersPerPage
+     * @param int $offset
+     * @return int
+     */
+    public static function findUserPage($baseGroup, $userLogin, $usersPerPage, $offset = 0)
+    {
+        if (ConfService::getAuthDriverImpl()->supportsUsersPagination()) {
+            return ConfService::getAuthDriverImpl()->findUserPage($baseGroup, $userLogin, $usersPerPage, $offset);
+        } else {
+            return -1;
+        }
+    }
+
+    /**
+     * Whether the current auth driver supports paginated listing
+     *
+     * @return bool
+     */
+    public static function authSupportsPagination()
+    {
+        $authDriver = ConfService::getAuthDriverImpl();
+        return $authDriver->supportsUsersPagination();
+    }
+
+    /**
+     * Count the total number of users inside a group (recursive).
+     * Regexp can be used to limit the users IDs with a specific expression
+     * Property can be used for basic filtering, either on "parent" or "admin".
+     *
+     * @param string $baseGroup
+     * @param string $regexp
+     * @param null $filterProperty Can be "parent" or "admin"
+     * @param null $filterValue Can be a string, or constants AJXP_FILTER_EMPTY / AJXP_FILTER_NOT_EMPTY
+     * @param bool $recursive
+     * @return int
+     */
+    public static function authCountUsers($baseGroup = "/", $regexp = "", $filterProperty = null, $filterValue = null, $recursive = true)
+    {
+        $authDriver = ConfService::getAuthDriverImpl();
+        return $authDriver->getUsersCount($baseGroup, $regexp, $filterProperty, $filterValue, $recursive);
+    }
+
+    /**
+     * Makes a correspondance between a user and its auth scheme, for multi auth
+     * @param $userName
+     * @return String
+     */
+    public static function getAuthScheme($userName)
+    {
+        $authDriver = ConfService::getAuthDriverImpl();
+        return $authDriver->getAuthScheme($userName);
+    }
+
+    /**
+     * Check if auth implementation supports schemes detection
+     * @return bool
+     */
+    public static function driverSupportsAuthSchemes()
+    {
+        $authDriver = ConfService::getAuthDriverImpl();
+        return $authDriver->supportsAuthSchemes();
+    }
+
+    /**
+     * Get parameters with scope='user' expose='true' attributes.
+     * Cached in plugin service.
+     *
+     * @return array Array of [PLUGIN_ID=>id, NAME=>name] objects.
+     */
+    public static function getUsersExposedParameters(){
+        $exposed = PluginsService::searchManifestsWithCache("//server_settings/param[contains(@scope,'user') and @expose='true']", function($nodes){
+            $result = [];
+            /** @var \DOMElement $exposed_prop */
+            foreach($nodes as $exposed_prop){
+                $parentNode = $exposed_prop->parentNode->parentNode;
+                $pluginId = $parentNode->getAttribute("id");
+                if (empty($pluginId)) {
+                    $pluginId = $parentNode->nodeName.".".$parentNode->getAttribute("name");
+                }
+                $paramName = $exposed_prop->getAttribute("name");
+                $result[] = ["PLUGIN_ID" => $pluginId, "NAME" => $paramName];
+            }
+            return $result;
+        });
+        return $exposed;
+    }
+
+    /**
+     * @param string $parameterName Plugin parameter name
+     * @param UserInterface|string $userIdOrObject
+     * @param string $pluginId Plugin name, core.conf by default
+     * @param null $defaultValue
+     * @return mixed
+     */
+    public static function getUserPersonalParameter($parameterName, $userIdOrObject, $pluginId = "core.conf", $defaultValue = null)
+    {
+        $self = self::instance();
+
+        $cacheId = $pluginId . "-" . $parameterName;
+        if (!isSet($self->userParametersCache[$cacheId])) {
+            $self->userParametersCache[$cacheId] = [];
+        }
+        // Passed an already loaded object
+        if ($userIdOrObject instanceof UserInterface) {
+            $value = $userIdOrObject->getPersonalRole()->filterParameterValue($pluginId, $parameterName, AJXP_REPO_SCOPE_ALL, $defaultValue);
+            $self->userParametersCache[$cacheId][$userIdOrObject->getId()] = $value;
+            if (empty($value) && !empty($defaultValue)) $value = $defaultValue;
+            return $value;
+        }
+        // Already in memory cache
+        if (isSet($self->userParametersCache[$cacheId][$userIdOrObject])) {
+            return $self->userParametersCache[$cacheId][$userIdOrObject];
+        }
+
+        // Try to load personal role if it was already loaded.
+        $uRole = RolesService::getRole("AJXP_USR_/" . $userIdOrObject);
+        if ($uRole === false && UsersService::userExists($userIdOrObject)) {
+            $uObject = self::getUserById($userIdOrObject, false);
+            $uRole = $uObject->getPersonalRole();
+        }
+        if (empty($uRole)) {
+            return $defaultValue;
+        }
+        $value = $uRole->filterParameterValue($pluginId, $parameterName, AJXP_REPO_SCOPE_ALL, $defaultValue);
+        if (empty($value) && !empty($defaultValue)) {
+            $value = $userIdOrObject;
+        }
+        $self->userParametersCache[$cacheId][$userIdOrObject] = $value;
+        return $value;
+
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Utils/Crypto.php b/core/src/core/src/pydio/Core/Utils/Crypto.php
new file mode 100644
index 0000000000..46e6c25dfa
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Utils/Crypto.php
@@ -0,0 +1,175 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Utils;
+
+use phpseclib\Crypt\Rijndael;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Utils\Crypto\Key;
+use Pydio\Core\Utils\Crypto\ZeroPaddingRijndael;
+use Pydio\Core\Utils\Vars\StringHelper;
+
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Simple encrypt / decrypt utils for small strings
+ * Legacy is using mcrypt Rijndael_256, will be replaced by openssl or libsodium with standard cypher
+ * @package Pydio\Core\Utils
+ */
+class Crypto
+{
+    const HEADER_CBC_128 = 'cbc-128';
+
+    /**
+     * @return string
+     */
+    public static function getApplicationSecret(){
+        if (defined('AJXP_SAFE_SECRET_KEY')) {
+            return AJXP_SAFE_SECRET_KEY;
+        } else {
+            return "\1CDAFx¨op#";
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public static function getCliSecret(){
+        $cKey = ConfService::getGlobalConf("AJXP_CLI_SECRET_KEY", "conf");
+        if (empty($cKey)) {
+            $cKey = "\1CDAFx¨op#";
+        }
+        return $cKey;
+    }
+
+    /**
+     * @param bool $base64encode
+     * @return string
+     */
+    public static function getRandomSalt($base64encode = true, $size = 32){
+        if(function_exists('openssl_random_pseudo_bytes')){
+            $salt = openssl_random_pseudo_bytes($size);
+        }else if (function_exists('mcrypt_create_iv')){
+            $salt = mcrypt_create_iv(PBKDF2_SALT_BYTE_SIZE, MCRYPT_DEV_URANDOM);
+        }else{
+            $salt = StringHelper::generateRandomString($size, true);
+        }
+        return ($base64encode ? base64_encode($salt) : $salt);
+    }
+
+    /**
+     * @return string
+     */
+    protected static function getDataHeader(){
+        return substr(md5(self::HEADER_CBC_128), 0, 16);
+    }
+
+    /**
+     * @param $data
+     * @return bool
+     */
+    public static function hasCBCEnctypeHeader($data){
+        $h = self::getDataHeader();
+        return (strpos($data, $h) === 0);
+    }
+
+    /**
+     * @param $data
+     * @return bool
+     */
+    private static function removeCBCEnctypeHeader(&$data){
+        $h = self::getDataHeader();
+        if(strpos($data, $h) === 0){
+            $data = substr($data, strlen($h));
+            return true;
+        }else{
+            return false;
+        }
+    }
+
+    /**
+     * Builds a key using various methods depending on legacy status or not
+     * @param string $userKey
+     * @param string $secret
+     * @param null $encodedData
+     * @return array|bool|string
+     */
+    public static function buildKey($userKey, $secret, $encodedData = null){
+        if($encodedData === null){
+            // new encryption, use new method
+            return Key::create($userKey.$secret);
+        }else if(self::hasCBCEnctypeHeader($encodedData)){
+            // New method detected
+            return Key::create($userKey . $secret, Key::STRENGTH_MEDIUM);
+        }else{
+            // Legacy
+            return Key::createLegacy($userKey . $secret);
+        }
+    }
+
+    /**
+     * @param mixed $data
+     * @param string $key
+     * @param bool $base64encode
+     * @return mixed
+     */
+    public static function encrypt($data, $key, $base64encode = true){
+        // Encrypt in new mode, prepending a fixed header to the encoded data.
+        $r = new ZeroPaddingRijndael(Rijndael::MODE_CBC);
+        $r->setKey($key);
+        $r->setBlockLength(128);
+        $iv = self::getRandomSalt(false, 16);
+        $r->setIV($iv);
+        $encoded = $iv . $r->encrypt($data);
+        if($base64encode) {
+            return self::getDataHeader().base64_encode($encoded);
+        } else {
+            return self::getDataHeader().$encoded;
+        }
+    }
+
+    /**
+     * @param string $data
+     * @param string $key
+     * @param bool $base64encoded
+     * @return mixed
+     */
+    public static function decrypt($data, $key, $base64encoded = true){
+        $test = self::removeCBCEnctypeHeader($data);
+        if($base64encoded){
+            $data = base64_decode($data);
+        }
+        if($test){
+            $iv = substr($data, 0, 16);
+            $data = substr($data, 16);
+            $r = new ZeroPaddingRijndael(Rijndael::MODE_CBC);
+            $r->setIV($iv);
+            $r->setBlockLength(128);
+        }else{
+            // Legacy encoding
+            $r = new ZeroPaddingRijndael(Rijndael::MODE_ECB);
+            $r->setBlockLength(256);
+        }
+        $r->setKey($key);
+        return $r->decrypt($data);
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Utils/Crypto/Key.php b/core/src/core/src/pydio/Core/Utils/Crypto/Key.php
new file mode 100644
index 0000000000..cc79145a46
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Utils/Crypto/Key.php
@@ -0,0 +1,100 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Utils\Crypto;
+
+use Pydio\Core\Utils\Crypto;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class Key
+ * @package Pydio\Core\Utils\Crypto
+ */
+class Key
+{
+    const STRENGTH_LOW = 0;
+    const STRENGTH_MEDIUM = 1;
+    const STRENGTH_HIGH = 2;
+
+    const SIZE_128 = 16;
+    const SIZE_256 = 32;
+
+    /**
+     * @param $password
+     * @param int $strength
+     * @param null $options
+     * @return array|bool|string
+     */
+    public static function create($password, $strength = Key::STRENGTH_MEDIUM, $options = null){
+
+        if(!$options){
+            $options = array(
+                "strength" => self::STRENGTH_MEDIUM,
+                "size" => self::SIZE_256,
+                "iterations" => 20000,
+                "salt" => md5(Crypto::getApplicationSecret()),
+                "hash_function" => "SHA512"
+            );
+        }
+
+        if($strength == self::STRENGTH_HIGH && function_exists('openssl_random_pseudo_bytes')){
+
+            $aes_key = self::create($password);
+            $method = "aes-" . strlen($options["size"]) . "-cbc";
+            
+            $key = openssl_random_pseudo_bytes($options["size"]);
+            $rsa = openssl_pkey_new(array(
+                "digest_algo" => "sha512",
+                "private_key_bits" => "4096",
+                "private_key_type" => OPENSSL_KEYTYPE_RSA
+            ));
+            openssl_pkey_export($rsa, $private);
+
+            $iv = openssl_random_pseudo_bytes(16);
+            $private = openssl_encrypt($private, $method, $aes_key, OPENSSL_RAW_DATA, $iv);
+            $public = openssl_pkey_get_details($rsa)["key"];
+
+            $options["public"] = $public;
+            $options["private"] = $private;
+            $options["iv"] = $iv;
+            openssl_public_encrypt($key, $options["key"], $public);
+
+            return array(
+                $key,
+                $options
+            );
+
+        } else if($strength == self::STRENGTH_LOW){
+            return substr(hash($options["hash_function"], $password), 0, $options["size"]);
+        } else {
+            return openssl_pbkdf2($password, $options["salt"], $options["size"], $options["iterations"], $options["hash_function"]);
+        }
+    }
+
+    /**
+     * @param $password
+     * @return string
+     */
+    public static function createLegacy($password){
+        return md5($password);
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Utils/Crypto/ZeroPaddingRijndael.php b/core/src/core/src/pydio/Core/Utils/Crypto/ZeroPaddingRijndael.php
new file mode 100644
index 0000000000..4889e7c33e
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Utils/Crypto/ZeroPaddingRijndael.php
@@ -0,0 +1,79 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+
+namespace Pydio\Core\Utils\Crypto;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+use \phpseclib\Crypt\Rijndael;
+
+/**
+ * Class ZeroPaddingRijndael
+ * @package Pydio\Core\Utils\Crypto
+ */
+class ZeroPaddingRijndael extends Rijndael {
+    /**
+     * Pads a string
+     *
+     * Pads a string using the RSA PKCS padding standards so that its length is a multiple of the blocksize.
+     * $this->block_size - (strlen($text) % $this->block_size) bytes are added, each of which is equal to
+     * chr($this->block_size - (strlen($text) % $this->block_size)
+     *
+     * If padding is disabled and $text is not a multiple of the blocksize, the string will be padded regardless
+     * and padding will, hence forth, be enabled.
+     *
+     * @see self::_unpad()
+     * @param string $text
+     * @throws \LengthException if padding is disabled and the plaintext's length is not a multiple of the block size
+     * @access private
+     * @return string
+     */
+    function _pad($text)
+    {
+        $length = strlen($text);
+
+        if (!$this->padding) {
+            if ($length % $this->block_size == 0) {
+                return $text;
+            } else {
+                throw new \LengthException("The plaintext's length ($length) is not a multiple of the block size ({$this->block_size}). Try enabling padding.");
+            }
+        }
+
+        $pad = $this->block_size - ($length % $this->block_size);
+        return str_pad($text, $length + $pad, "\0");
+    }
+    /**
+     * Unpads a string.
+     *
+     * If padding is enabled and the reported padding length is invalid the encryption key will be assumed to be wrong
+     * and false will be returned.
+     *
+     * @see self::_pad()
+     * @param string $text
+     * @throws \LengthException if the ciphertext's length is not a multiple of the block size
+     * @access private
+     * @return string
+     */
+    function _unpad($text)   {
+        return trim($text, "\0");
+    }
+}
diff --git a/core/src/core/src/pydio/Core/Utils/DBHelper.php b/core/src/core/src/pydio/Core/Utils/DBHelper.php
new file mode 100644
index 0000000000..89c5aea815
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Utils/DBHelper.php
@@ -0,0 +1,105 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Utils;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Generic SQL utils
+ * @package Pydio\Core\Utils
+ */
+class DBHelper
+{
+
+    /**
+     * @param $p
+     * @param $file
+     * @return string
+     */
+    public static function runCreateTablesQuery($p, $file)
+    {
+
+        switch ($p["driver"]) {
+            case "sqlite":
+            case "sqlite3":
+                if (!file_exists(dirname($p["database"]))) {
+                    @mkdir(dirname($p["database"]), 0755, true);
+                }
+                $ext = ".sqlite";
+                break;
+            case "mysql":
+                $ext = ".mysql";
+                break;
+            case "postgre":
+                $ext = ".pgsql";
+                break;
+            default:
+                return "ERROR!, DB driver " . $p["driver"] . " not supported yet in __FUNCTION__";
+        }
+
+        $result = array();
+        $file = dirname($file) . "/" . str_replace(".sql", $ext, basename($file));
+        $sql = file_get_contents($file);
+        $separators = explode("/** SEPARATOR **/", $sql);
+
+        $allParts = array();
+
+        foreach ($separators as $sep) {
+            $explode = explode("\n", trim($sep));
+            $firstLine = array_shift($explode);
+            if ($firstLine == "/** BLOCK **/") {
+                $allParts[] = $sep;
+            } else {
+                $parts = explode(";", $sep);
+                $remove = array();
+                $count = count($parts);
+                for ($i = 0; $i < $count; $i++) {
+                    $part = $parts[$i];
+                    if (strpos($part, "BEGIN") && isSet($parts[$i + 1])) {
+                        $parts[$i] .= ';' . $parts[$i + 1];
+                        $remove[] = $i + 1;
+                    }
+                }
+                foreach ($remove as $rk) unset($parts[$rk]);
+                $allParts = array_merge($allParts, $parts);
+            }
+        }
+        \dibi::connect($p);
+        \dibi::begin();
+        foreach ($allParts as $createPart) {
+            $sqlPart = trim($createPart);
+            if (empty($sqlPart)) continue;
+            try {
+                \dibi::nativeQuery($sqlPart);
+                $resKey = str_replace("\n", "", substr($sqlPart, 0, 50)) . "...";
+                $result[] = "OK: $resKey executed successfully";
+            } catch (\DibiException $e) {
+                $result[] = "ERROR! $sqlPart failed";
+            }
+        }
+        \dibi::commit();
+        \dibi::disconnect();
+        $message = implode("\n", $result);
+        if (strpos($message, "ERROR!")) return $message;
+        else return "SUCCESS:" . $message;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Utils/FileHelper.php b/core/src/core/src/pydio/Core/Utils/FileHelper.php
new file mode 100644
index 0000000000..15df8fd851
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Utils/FileHelper.php
@@ -0,0 +1,146 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Utils;
+
+use HttpClient;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Utils\Vars\StringHelper;
+use Pydio\Core\Utils\Vars\VarsFilter;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class FileHelper
+ * @package Pydio\Core\Utils
+ */
+class FileHelper
+{
+
+    /**
+     * Load an array stored serialized inside a file.
+     * Warning : currently does not take a context, filtering will be applied only based on global configs
+     * (AJXP_DATA_PATH, etc...). Make sure to filter the path if required (e.g. AJXP_USER) before passing it to the function.
+     *
+     * @param String $filePath Full path to the file
+     * @param Boolean $skipCheck do not test for file existence before opening
+     * @param string $format
+     * @return array
+     */
+    public static function loadSerialFile($filePath, $skipCheck = false, $format = "ser")
+    {
+        $filePath = VarsFilter::filter($filePath, Context::emptyContext());
+        $result = array();
+        if ($skipCheck) {
+            $fileLines = @file($filePath);
+            if ($fileLines !== false) {
+                if ($format == "ser") $result = unserialize(implode("", $fileLines));
+                else if ($format == "json") $result = json_decode(implode("", $fileLines), true);
+            }
+            return $result;
+        }
+        if (is_file($filePath)) {
+            $fileLines = file($filePath);
+            if ($format == "ser") $result = unserialize(implode("", $fileLines));
+            else if ($format == "json") $result = json_decode(implode("", $fileLines), true);
+        }
+        return $result;
+    }
+
+    /**
+     * Stores an Array as a serialized string inside a file.
+     * @see loadSerialFile regarding path filtering.
+     *
+     * @param String $filePath Full path to the file
+     * @param array|object $value The value to store
+     * @param Boolean $createDir Whether to create the parent folder or not, if it does not exist.
+     * @param bool $silent Silently write the file, are throw an exception on problem.
+     * @param string $format "ser" or "json"
+     * @param bool $jsonPrettyPrint If json, use pretty printing
+     * @throws \Exception
+     */
+    public static function saveSerialFile($filePath, $value, $createDir = true, $silent = false, $format = "ser", $jsonPrettyPrint = false)
+    {
+        if (!in_array($format, array("ser", "json"))) {
+            throw new \Exception("Unsupported serialization format: " . $format);
+        }
+        $filePath = VarsFilter::filter($filePath, Context::emptyContext());
+        if ($createDir && !is_dir(dirname($filePath))) {
+            @mkdir(dirname($filePath), 0755, true);
+            if (!is_dir(dirname($filePath))) {
+                // Creation failed
+                if ($silent) return;
+                else throw new \Exception("[AJXP_Utils::saveSerialFile] Cannot write into " . dirname(dirname($filePath)));
+            }
+        }
+        try {
+            $fp = fopen($filePath, "w");
+            if ($format == "ser") {
+                $content = serialize($value);
+            } else {
+                $content = json_encode($value);
+                if ($jsonPrettyPrint) $content = StringHelper::prettyPrintJSON($content);
+            }
+            fwrite($fp, $content);
+            fclose($fp);
+        } catch (\Exception $e) {
+            if ($silent) return;
+            else throw $e;
+        }
+    }
+
+    /**
+     * Try to remove a file without errors
+     * @static
+     * @param $file
+     * @return void
+     */
+    public static function silentUnlink($file)
+    {
+        @unlink($file);
+    }
+
+    /**
+     * @static
+     * @param string $url
+     * @return bool|mixed|string
+     */
+    public static function getRemoteContent($url)
+    {
+        if (ini_get("allow_url_fopen")) {
+            return file_get_contents($url);
+        } else if (function_exists("curl_init")) {
+            $ch = curl_init();
+            $timeout = 30; // set to zero for no timeout
+            curl_setopt($ch, CURLOPT_URL, $url);
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
+            $return = curl_exec($ch);
+            curl_close($ch);
+            return $return;
+        } else {
+            $i = parse_url($url);
+            require_once AJXP_BIN_FOLDER."/lib/HttpClient.php";
+            $httpClient = new HttpClient($i["host"]);
+            $httpClient->timeout = 30;
+            return $httpClient->quickGet($url);
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Utils/Http/BruteForceHelper.php b/core/src/core/src/pydio/Core/Utils/Http/BruteForceHelper.php
new file mode 100644
index 0000000000..5d2c4f27ef
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Utils/Http/BruteForceHelper.php
@@ -0,0 +1,116 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Utils\Http;
+
+
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class BruteForceHelper
+ * @package Pydio\Core\Utils
+ */
+class BruteForceHelper
+{
+
+    /**
+     * The array is located in the AjxpTmpDir/failedAJXP.log
+     * @static
+     * @return array
+     */
+    public static function getBruteForceLoginArray()
+    {
+        $failedLog = ApplicationState::getAjxpTmpDir() . "/failedAJXP.log";
+        $loginAttempt = @file_get_contents($failedLog);
+        $loginArray = unserialize($loginAttempt);
+        $ret = array();
+        $curTime = time();
+        if (is_array($loginArray)) {
+            // Filter the array (all old time are cleaned)
+            foreach ($loginArray as $key => $login) {
+                if (($curTime - $login["time"]) <= 60 * 60 * 24) $ret[$key] = $login;
+            }
+        }
+        return $ret;
+    }
+
+    /**
+     * Store the array
+     * @static
+     * @param $loginArray
+     * @return void
+     */
+    public static function setBruteForceLoginArray($loginArray, $validCurrent = false)
+    {
+        if($validCurrent && isSet($loginArray[$_SERVER["REMOTE_ADDR"]])){
+            unset($loginArray[$_SERVER["REMOTE_ADDR"]]);
+        }
+        $failedLog = ApplicationState::getAjxpTmpDir() . "/failedAJXP.log";
+        @file_put_contents($failedLog, serialize($loginArray));
+    }
+
+    /**
+     * Determines whether the user is try to make many attemps
+     * @static
+     * @param $loginArray
+     * @return bool
+     */
+    public static function checkBruteForceLogin(&$loginArray)
+    {
+        if (isSet($_SERVER['REMOTE_ADDR'])) {
+            $serverAddress = $_SERVER['REMOTE_ADDR'];
+        } else if (isSet($_SERVER['SERVER_ADDR'])) {
+            $serverAddress = $_SERVER['SERVER_ADDR'];
+        } else {
+            return TRUE;
+        }
+        $login = null;
+        if (isSet($loginArray[$serverAddress])) {
+            $login = $loginArray[$serverAddress];
+        }
+        if (is_array($login)) {
+            $login["count"]++;
+        } else $login = array("count" => 1, "time" => time());
+        $loginArray[$serverAddress] = $login;
+        if ($login["count"] > 3) {
+            if (AJXP_SERVER_DEBUG || ConfService::getGlobalConf("DISABLE_BRUTE_FORCE_CHECK", "auth") === true) {
+                Logger::debug("Warning: failed login 3 time from address $serverAddress, but ignored because captcha is disabled.");
+                return true;
+            }
+            return FALSE;
+        }
+        return TRUE;
+    }
+
+    /**
+     * Is there a brute force login attempt?
+     * @static
+     * @return bool
+     */
+    public static function suspectBruteForceLogin()
+    {
+        $loginAttempt = self::getBruteForceLoginArray();
+        return !self::checkBruteForceLogin($loginAttempt);
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Utils/Http/CaptchaProvider.php b/core/src/core/src/pydio/Core/Utils/Http/CaptchaProvider.php
new file mode 100644
index 0000000000..5c87dad69f
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Utils/Http/CaptchaProvider.php
@@ -0,0 +1,80 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Utils\Http;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Encapsulation of the securimage external library, to generate a Captcha Image on brute force login attempt.
+ */
+class CaptchaProvider
+{
+    /**
+     * Print out a Captcha image
+     * @static
+     * @return void
+     */
+    public static function sendCaptcha()
+    {
+        $img = new \Securimage();
+
+        $img->wordlist_file = dirname(__FILE__).DIRECTORY_SEPARATOR.'captcha_words.txt';
+        $img->image_height = 80;
+        $img->image_width = 170;
+        $img->perturbation = 0.85;
+        $img->image_bg_color = new \Securimage_Color("#f6f6f6");
+        $img->multi_text_color = array(new \Securimage_Color("#3399ff"),
+                                       new \Securimage_Color("#3300cc"),
+                                       new \Securimage_Color("#3333cc"),
+                                       new \Securimage_Color("#6666ff"),
+                                       new \Securimage_Color("#99cccc")
+                                       );
+        $img->use_multi_text = true;
+        $img->text_angle_minimum = -5;
+        $img->text_angle_maximum = 5;
+        $img->use_transparent_text = true;
+        $img->text_transparency_percentage = 30; // 100 = completely transparent
+        $img->num_lines = 5;
+        $img->line_color = new \Securimage_Color("#eaeaea");
+        $img->signature_color = new \Securimage_Color(rand(0, 64), rand(64, 128), rand(128, 255));
+        $img->use_wordlist = true;
+        if (!function_exists('imagettftext')) {
+            $img->use_gd_font = true;
+            $img->use_transparent_text = false;
+            $img->use_multi_text = false;
+        }
+        $img->show();
+    }
+
+    /**
+     * Verify the code against the current image.
+     * @static
+     * @param $code
+     * @return bool
+     */
+    public static function checkCaptchaResult($code)
+    {
+        $img = new \Securimage();
+        return $img->check($code);
+
+    }
+
+}
diff --git a/core/src/core/src/pydio/Core/Utils/Http/CookiesHelper.php b/core/src/core/src/pydio/Core/Utils/Http/CookiesHelper.php
new file mode 100644
index 0000000000..49171287d0
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Utils/Http/CookiesHelper.php
@@ -0,0 +1,124 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Utils\Http;
+
+use Pydio\Core\Model\UserInterface;
+use Pydio\Core\Utils\Vars\StringHelper;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class CookiesHelper - Helper for http cookies
+ * @package Pydio\Core\Utils
+ */
+class CookiesHelper
+{
+
+    /**
+     * @static
+     * @param UserInterface $user
+     */
+    public static function refreshRememberCookie($user)
+    {
+        $current = $_COOKIE["AjaXplorer-remember"];
+        if (!empty($current)) {
+            CookiesHelper::invalidateCookieString($user, substr($current, strpos($current, ":")+1));
+        }
+        $rememberPass = CookiesHelper::getCookieString($user);
+        setcookie("AjaXplorer-remember", $user->getId().":".$rememberPass, time()+3600*24*10, null, null, (isSet($_SERVER["HTTPS"]) && strtolower($_SERVER["HTTPS"]) == "on"), true);
+    }
+
+    /**
+     * @static
+     * @return bool
+     */
+    public static function hasRememberCookie()
+    {
+        return (isSet($_COOKIE["AjaXplorer-remember"]) && !empty($_COOKIE["AjaXplorer-remember"]));
+    }
+
+    /**
+     * 
+     * @return array [fakeuser,fakepass]
+     */
+    public static function getRememberCookieData(){
+        return explode(":", $_COOKIE["AjaXplorer-remember"]);
+    }
+
+    /**
+     * @static
+     * Warning, must be called before sending other headers!
+     * @param $user
+     */
+    public static function clearRememberCookie($user)
+    {
+        $current = $_COOKIE["AjaXplorer-remember"];
+        if (!empty($current) && $user != null) {
+            CookiesHelper::invalidateCookieString($user, substr($current, strpos($current, ":")+1));
+        }
+        setcookie("AjaXplorer-remember", "", time()-3600, null, null, (isSet($_SERVER["HTTPS"]) && strtolower($_SERVER["HTTPS"]) == "on"), true);
+    }
+
+    /**
+     * @param UserInterface $user
+     * @param string $cookieString
+     * @return bool
+     */
+    public static function checkCookieString(UserInterface $user, $cookieString)
+    {
+        if($user->getPref("cookie_hash") == "") return false;
+        $hashes = explode(",", $user->getPref("cookie_hash"));
+        return in_array($cookieString, $hashes);
+    }
+
+    /**
+     * @param UserInterface $user
+     * @param string $cookieString
+     */
+    public static function invalidateCookieString(UserInterface $user, $cookieString = "")
+    {
+        if($user->getPref("cookie_hash") == "") return;
+        $hashes = explode(",", $user->getPref("cookie_hash"));
+        if(in_array($cookieString, $hashes)) $hashes = array_diff($hashes, array($cookieString));
+        $user->setPref("cookie_hash", implode(",", $hashes));
+        $user->save("user");
+    }
+
+    /**
+     * @param UserInterface $user
+     * @return string
+     */
+    public static function getCookieString(UserInterface $user)
+    {
+        $hashes = $user->getPref("cookie_hash");
+        if ($hashes == "") {
+            $hashes = array();
+        } else {
+            $hashes = explode(",", $hashes);
+        }
+        $newHash = md5($user->getId().":". StringHelper::generateRandomString());
+        array_push($hashes, $newHash);
+        $user->setPref("cookie_hash", implode(",",$hashes));
+        $user->save("user");
+        return $newHash;
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Utils/Http/UserAgent.php b/core/src/core/src/pydio/Core/Utils/Http/UserAgent.php
new file mode 100644
index 0000000000..fe6d5b8e65
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Utils/Http/UserAgent.php
@@ -0,0 +1,212 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Utils\Http;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Helpers to detect current User-Agent values
+ * @package Pydio\Core\Utils
+ */
+class UserAgent
+{
+
+    /**
+     * Detect mobile browsers
+     * @static
+     * @return bool
+     */
+    public static function userAgentIsMobile()
+    {
+        $op = strtolower($_SERVER['HTTP_X_OPERAMINI_PHONE'] OR "");
+        $ua = strtolower($_SERVER['HTTP_USER_AGENT']);
+        $ac = strtolower($_SERVER['HTTP_ACCEPT']);
+        $isMobile = strpos($ac, 'application/vnd.wap.xhtml+xml') !== false
+            || $op != ''
+            || strpos($ua, 'sony') !== false
+            || strpos($ua, 'symbian') !== false
+            || strpos($ua, 'nokia') !== false
+            || strpos($ua, 'samsung') !== false
+            || strpos($ua, 'mobile') !== false
+            || strpos($ua, 'android') !== false
+            || strpos($ua, 'windows ce') !== false
+            || strpos($ua, 'epoc') !== false
+            || strpos($ua, 'opera mini') !== false
+            || strpos($ua, 'nitro') !== false
+            || strpos($ua, 'j2me') !== false
+            || strpos($ua, 'midp-') !== false
+            || strpos($ua, 'cldc-') !== false
+            || strpos($ua, 'netfront') !== false
+            || strpos($ua, 'mot') !== false
+            || strpos($ua, 'up.browser') !== false
+            || strpos($ua, 'up.link') !== false
+            || strpos($ua, 'audiovox') !== false
+            || strpos($ua, 'blackberry') !== false
+            || strpos($ua, 'ericsson,') !== false
+            || strpos($ua, 'panasonic') !== false
+            || strpos($ua, 'philips') !== false
+            || strpos($ua, 'sanyo') !== false
+            || strpos($ua, 'sharp') !== false
+            || strpos($ua, 'sie-') !== false
+            || strpos($ua, 'portalmmm') !== false
+            || strpos($ua, 'blazer') !== false
+            || strpos($ua, 'avantgo') !== false
+            || strpos($ua, 'danger') !== false
+            || strpos($ua, 'palm') !== false
+            || strpos($ua, 'series60') !== false
+            || strpos($ua, 'palmsource') !== false
+            || strpos($ua, 'pocketpc') !== false
+            || strpos($ua, 'smartphone') !== false
+            || strpos($ua, 'rover') !== false
+            || strpos($ua, 'ipaq') !== false
+            || strpos($ua, 'au-mic,') !== false
+            || strpos($ua, 'alcatel') !== false
+            || strpos($ua, 'ericy') !== false
+            || strpos($ua, 'up.link') !== false
+            || strpos($ua, 'vodafone/') !== false
+            || strpos($ua, 'wap1.') !== false
+            || strpos($ua, 'wap2.') !== false;
+        return $isMobile;
+    }
+
+    /**
+     * Detect iOS browser
+     * @static
+     * @return bool
+     */
+    public static function userAgentIsIOS()
+    {
+        if (stripos($_SERVER["HTTP_USER_AGENT"], "iphone") !== false) return true;
+        if (stripos($_SERVER["HTTP_USER_AGENT"], "ipad") !== false) return true;
+        if (stripos($_SERVER["HTTP_USER_AGENT"], "ipod") !== false) return true;
+        return false;
+    }
+
+    /**
+     * Detect Windows Phone
+     * @static
+     * @return bool
+     */
+    public static function userAgentIsWindowsPhone()
+    {
+        if (stripos($_SERVER["HTTP_USER_AGENT"], "IEMobile") !== false) return true;
+        return false;
+    }
+
+    /**
+     * Detect Android UA
+     * @static
+     * @return bool
+     */
+    public static function userAgentIsAndroid()
+    {
+        return (stripos($_SERVER["HTTP_USER_AGENT"], "android") !== false);
+    }
+
+    /**
+     * Detect native apps user agent values (io, android, python)
+     * @return bool
+     */
+    public static function userAgentIsNativePydioApp()
+    {
+
+        return (
+            stripos($_SERVER["HTTP_USER_AGENT"], "ajaxplorer-ios-client") !== false
+            || stripos($_SERVER["HTTP_USER_AGENT"], "Apache-HttpClient") !== false
+            || stripos($_SERVER["HTTP_USER_AGENT"], "python-requests") !== false
+            || stripos($_SERVER["HTTP_USER_AGENT"], "Pydio-Native") !== false
+        );
+    }
+
+    /**
+     *
+     * @param null $useragent
+     * @return int|string
+     */
+    public static function osFromUserAgent($useragent = null)
+    {
+
+        $osList = array
+        (
+            'Windows 10' => 'windows nt 10.0',
+            'Windows 8.1' => 'windows nt 6.3',
+            'Windows 8' => 'windows nt 6.2',
+            'Windows 7' => 'windows nt 6.1',
+            'Windows Vista' => 'windows nt 6.0',
+            'Windows Server 2003' => 'windows nt 5.2',
+            'Windows XP' => 'windows nt 5.1',
+            'Windows 2000 sp1' => 'windows nt 5.01',
+            'Windows 2000' => 'windows nt 5.0',
+            'Windows NT 4.0' => 'windows nt 4.0',
+            'Windows Me' => 'win 9x 4.9',
+            'Windows 98' => 'windows 98',
+            'Windows 95' => 'windows 95',
+            'Windows CE' => 'windows ce',
+            'Windows (version unknown)' => 'windows',
+            'OpenBSD' => 'openbsd',
+            'SunOS' => 'sunos',
+            'Ubuntu' => 'ubuntu',
+            'Linux' => '(linux)|(x11)',
+            'Mac OSX Beta (Kodiak)' => 'mac os x beta',
+            'Mac OSX Cheetah' => 'mac os x 10.0',
+            'Mac OSX Jaguar' => 'mac os x 10.2',
+            'Mac OSX Panther' => 'mac os x 10.3',
+            'Mac OSX Tiger' => 'mac os x 10.4',
+            'Mac OSX Leopard' => 'mac os x 10.5',
+            'Mac OSX Snow Leopard' => 'mac os x 10.6',
+            'Mac OSX Lion' => 'mac os x 10.7',
+            'Mac OSX Mountain Lion' => 'mac os x 10.8',
+            'Mac OSX Mavericks' => 'mac os x 10.9',
+            'Mac OSX Yosemite' => 'mac os x 10.10',
+            'Mac OSX El Capitan' => 'mac os x 10.11',
+            'Mac OSX Puma' => 'mac os x 10.1',
+            'Mac OS (classic)' => '(mac_powerpc)|(macintosh)',
+            'QNX' => 'QNX',
+            'BeOS' => 'beos',
+            'Apple iPad' => 'iPad',
+            'Apple iPhone' => 'iPhone',
+            'OS2' => 'os\/2',
+            'SearchBot' => '(nuhk)|(googlebot)|(yammybot)|(openbot)|(slurp)|(msnbot)|(ask jeeves\/teoma)|(ia_archiver)',
+            'Pydio iOS Native Application' => 'ajaxplorer-ios',
+            'PydioPro iOS Native Application' => 'Pydio-Native-iOS',
+            'Pydio Android Native Application' => 'Apache-HttpClient',
+            'PydioPro Android Native Application' => 'Pydio-Native-Android',
+            'Pydio Sync Client' => 'python-requests'
+        );
+
+        if ($useragent == null) {
+            $useragent = $_SERVER['HTTP_USER_AGENT'];
+            $useragent = strtolower($useragent);
+        }
+
+        $found = "Not automatically detected.$useragent";
+        foreach ($osList as $os => $match) {
+            if (preg_match('/' . $match . '/i', $useragent)) {
+                $found = $os;
+                break;
+            }
+        }
+
+        return $found;
+
+
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/classes/securimage/words/words.txt b/core/src/core/src/pydio/Core/Utils/Http/captcha_words.txt
similarity index 100%
rename from core/src/core/classes/securimage/words/words.txt
rename to core/src/core/src/pydio/Core/Utils/Http/captcha_words.txt
diff --git a/core/src/core/src/pydio/Core/Utils/Reflection/DiagnosticRunner.php b/core/src/core/src/pydio/Core/Utils/Reflection/DiagnosticRunner.php
new file mode 100644
index 0000000000..57489f75a5
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Utils/Reflection/DiagnosticRunner.php
@@ -0,0 +1,181 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Utils\Reflection;
+
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Tests\AbstractTest;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class DiagnosticRunner: run startup tests and output them in different formats
+ * @package Pydio\Core\Utils
+ */
+class DiagnosticRunner
+{
+
+    /**
+     * Generate an HTML table for the tests results. We should use a template somewhere...
+     * @static
+     * @param $outputArray
+     * @param $testedParams
+     * @param bool $showSkipLink
+     * @return string
+     */
+    public static function testResultsToTable($outputArray, $testedParams, $showSkipLink = true)
+    {
+        $dumpRows = "";
+        $passedRows = array();
+        $warnRows = "";
+        $errRows = "";
+        $errs = $warns = 0;
+        $ALL_ROWS = array(
+            "error" => array(),
+            "warning" => array(),
+            "dump" => array(),
+            "passed" => array(),
+        );
+        $TITLES = array(
+            "error" => "Failed Tests",
+            "warning" => "Warnings",
+            "dump" => "Server Information",
+            "passed" => "Other tests passed",
+        );
+        foreach ($outputArray as $item) {
+
+            // A test is output only if it hasn't succeeded (doText returned FALSE)
+            $result = $item["result"] ? "passed" : ($item["level"] == "info" ? "dump" : ($item["level"] == "warning"
+                ? "warning" : "error"));
+            $success = $result == "passed";
+            if ($result == "dump") $result = "passed";
+            $ALL_ROWS[$result][$item["name"]] = $item["info"];
+        }
+        ob_start();
+        include(AJXP_TESTS_FOLDER . "/startup.phtml");
+        return ob_get_flush();
+    }
+
+    /**
+     * @static
+     * @param $outputArray
+     * @param $testedParams
+     * @return bool
+     */
+    public static function runTests(&$outputArray, &$testedParams)
+    {
+        // At first, list folder in the tests subfolder
+        chdir(AJXP_TESTS_FOLDER);
+        $files = glob('*.php');
+
+        $outputArray = array();
+        $testedParams = array();
+        $passed = true;
+        foreach ($files as $file) {
+            require_once($file);
+            // Then create the test class
+            $testName = "Pydio\\Tests\\" . str_replace(".php", "", $file);
+            if (!class_exists($testName) || $testName == "Pydio\\Tests\\AbstractTest") continue;
+            $class = new $testName();
+            if (!($class instanceof AbstractTest)) continue;
+
+            $result = $class->doTest();
+            if (!$result && $class->failedLevel != "info") $passed = false;
+            $outputArray[] = array(
+                "name" => $class->name,
+                "result" => $result,
+                "level" => $class->failedLevel,
+                "info" => $class->failedInfo);
+            if (count($class->testedParams)) {
+                $testedParams = array_merge($testedParams, $class->testedParams);
+            }
+        }
+        // PREPARE REPOSITORY LISTS
+        $repoList = array();
+        $REPOSITORIES = array();
+        //require_once("../classes/class.ConfService.php");
+        //require_once("../classes/class.Repository.php");
+        include(AJXP_CONF_PATH . "/bootstrap_repositories.php");
+        foreach ($REPOSITORIES as $index => $repo) {
+            $repoList[] = RepositoryService::createRepositoryFromArray($index, $repo);
+        }
+        // Try with the serialized repositories
+        if (is_file(AJXP_DATA_PATH . "/plugins/conf.serial/repo.ser")) {
+            $fileLines = file(AJXP_DATA_PATH . "/plugins/conf.serial/repo.ser");
+            $repos = unserialize($fileLines[0]);
+            $repoList = array_merge($repoList, $repos);
+        }
+
+        // NOW TRY THE PLUGIN TESTS
+        chdir(AJXP_INSTALL_PATH . "/" . AJXP_PLUGINS_FOLDER);
+        $files = glob('access.*/test.*.php');
+        foreach ($files as $file) {
+            require_once($file);
+            // Then create the test class
+            list($accessFolder, $testFileName) = explode("/", $file);
+            $testName = "Pydio\\Tests\\" . str_replace(".php", "", substr($testFileName, 5) . "Test");
+            $class = new $testName();
+            foreach ($repoList as $repository) {
+                if ($repository->isTemplate || $repository->getParentId() != null) continue;
+                if (!($class instanceof AbstractTest)) continue;
+                $result = $class->doRepositoryTest($repository);
+                if ($result === false || $result === true) {
+                    if (!$result && $class->failedLevel != "info") {
+                        $passed = false;
+                    }
+                    $outputArray[] = array(
+                        "name" => $class->name . "\n Testing repository : " . $repository->getDisplay(),
+                        "result" => $result,
+                        "level" => $class->failedLevel,
+                        "info" => $class->failedInfo);
+                    if (count($class->testedParams)) {
+                        $testedParams = array_merge($testedParams, $class->testedParams);
+                    }
+                }
+            }
+        }
+
+        return $passed;
+    }
+
+    /**
+     * @static
+     * @param $outputArray
+     * @param $testedParams
+     * @return void
+     */
+    public static function testResultsToFile($outputArray, $testedParams)
+    {
+        ob_start();
+        echo '$diagResults = ';
+        var_export($testedParams);
+        echo ';';
+        echo '$outputArray = ';
+        var_export($outputArray);
+        echo ';';
+        $content = '<?php ' . ob_get_contents() . ' ?>';
+        ob_end_clean();
+        if(!file_exists(dirname(TESTS_RESULT_FILE))){
+            mkdir(dirname(TESTS_RESULT_FILE), 0666, true);
+        }
+        file_put_contents(TESTS_RESULT_FILE, $content);
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Utils/Reflection/DocsParser.php b/core/src/core/src/pydio/Core/Utils/Reflection/DocsParser.php
new file mode 100644
index 0000000000..de9ec73207
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Utils/Reflection/DocsParser.php
@@ -0,0 +1,138 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Utils\Reflection;
+
+use Pydio\Core\Model\Context;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Utils\Vars\StringHelper;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Helper methods to parse Pydio methods / hooks and generate documentation
+ * @package Pydio\Core\Utils
+ */
+class DocsParser
+{
+    /**
+     * File where to store JSON
+     * @return string
+     */
+    public static function getHooksFile()
+    {
+        return AJXP_INSTALL_PATH . "/" . AJXP_DOCS_FOLDER . "/hooks.json";
+    }
+
+    /**
+     * Browse application registered hooks and send their definition to Hooks File.
+     */
+    public static function extractHooksToDoc()
+    {
+        $docFile = self::getHooksFile();
+        if (is_file($docFile)) {
+            copy($docFile, $docFile . ".bak");
+            $existingHooks = json_decode(file_get_contents($docFile), true);
+        } else {
+            $existingHooks = array();
+        }
+        $allPhpFiles1 = self::glob_recursive(AJXP_BIN_FOLDER . "/*.php");
+        $allPhpFiles2 = self::glob_recursive(AJXP_INSTALL_PATH . "/plugins/*.php");
+        $allPhpFiles3 = self::glob_recursive(AJXP_INSTALL_PATH . "/conf/*.php");
+        $allPhpFiles = array_merge(array_merge($allPhpFiles1, $allPhpFiles2), $allPhpFiles3);
+        $hooks = array();
+        foreach ($allPhpFiles as $phpFile) {
+            $fileContent = file($phpFile);
+            foreach ($fileContent as $lineNumber => $line) {
+                if (preg_match_all('/Controller::applyHook\("([^"]+)", (.*)\)/', $line, $matches)) {
+                    $names = $matches[1];
+                    $params = $matches[2];
+                    foreach ($names as $index => $hookName) {
+                        if (!isSet($hooks[$hookName])) $hooks[$hookName] = array("TRIGGERS" => array(), "LISTENERS" => array());
+                        $filename = substr($phpFile, strlen(AJXP_INSTALL_PATH));
+                        if (strpos($filename, "/plugins") === 0) {
+                            $source = explode("/", $filename)[2];
+                        } else {
+                            $parts = explode("/", $filename);
+                            $source = str_replace(array("class.", ".php"), "", array_pop($parts));
+                        }
+                        if (!isSet($hooks[$hookName]["TRIGGERS"][$source])) {
+                            $hooks[$hookName]["TRIGGERS"][$source] = array();
+                        }
+                        $hooks[$hookName]["TRIGGERS"][$source][] = array(
+                            "FILE" => $filename,
+                            "LINE" => $lineNumber
+                        );
+                        $hooks[$hookName]["PARAMETER_SAMPLE"] = $params[$index];
+                    }
+                }
+
+            }
+        }
+        $registryHooks = PluginsService::getInstance(Context::emptyContext())->searchAllManifests("//hooks/serverCallback", "xml", false, false, true);
+        $regHooks = array();
+        /** @var \DOMElement $xmlHook */
+        foreach ($registryHooks as $xmlHook) {
+            $name = $xmlHook->getAttribute("hookName");
+            $method = $xmlHook->getAttribute("methodName");
+            $pluginId = $xmlHook->getAttribute("pluginId");
+            $deferred = $xmlHook->getAttribute("defer") === "true";
+            if ($pluginId == "") $pluginId = $xmlHook->parentNode->parentNode->parentNode->getAttribute("id");
+            if (!isSet($regHooks[$name])) $regHooks[$name] = array();
+            $data = array("PLUGIN_ID" => $pluginId, "METHOD" => $method);
+            if ($deferred) $data["DEFERRED"] = true;
+            $regHooks[$name][] = $data;
+        }
+
+        foreach ($hooks as $h => $data) {
+
+            if (isSet($regHooks[$h])) {
+                $data["LISTENERS"] = $regHooks[$h];
+            }
+            if (isSet($existingHooks[$h])) {
+                $existingHooks[$h]["TRIGGERS"] = $data["TRIGGERS"];
+                $existingHooks[$h]["LISTENERS"] = $data["LISTENERS"];
+                $existingHooks[$h]["PARAMETER_SAMPLE"] = $data["PARAMETER_SAMPLE"];
+            } else {
+                $existingHooks[$h] = $data;
+            }
+        }
+        file_put_contents($docFile, StringHelper::prettyPrintJSON(json_encode($existingHooks)));
+
+    }
+
+    /**
+     * Does not support flag GLOB_BRACE
+     * @param $pattern
+     * @param int $flags
+     * @return array
+     */
+    private static function glob_recursive($pattern, $flags = 0)
+    {
+        $files = glob($pattern, $flags);
+        foreach (glob(dirname($pattern).'/*', GLOB_ONLYDIR|GLOB_NOSORT) as $dir) {
+            $files = array_merge($files, self::glob_recursive($dir.'/'.basename($pattern), $flags));
+        }
+        return $files;
+    }
+
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Utils/Reflection/JSPacker.php b/core/src/core/src/pydio/Core/Utils/Reflection/JSPacker.php
new file mode 100644
index 0000000000..fd097fd316
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Utils/Reflection/JSPacker.php
@@ -0,0 +1,125 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Utils\Reflection;
+use Pydio\Core\Model\Context;
+use Pydio\Core\PluginFramework\PluginsService;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Encapsulation of the javascript/css packing library
+ * @package Pydio
+ * @subpackage Core
+ */
+class JSPacker
+{
+    /**
+     * Static function for packing all js and css into big files
+     * Auto detect /js/*_list.txt files and /css/*_list.txt files and pack them.
+     */
+    public static function pack()
+    {
+        // Make sure that the gui.* plugin is loaded
+        PluginsService::getInstance(Context::emptyContext())->getPluginsByType("gui");
+
+        $sList = glob(CLIENT_RESOURCES_FOLDER."/js/*_list.txt");
+        foreach ($sList as $list) {
+            $scriptName = str_replace("_list.txt", ".js", $list);
+            JSPacker::concatListAndPack($list,
+                                             $scriptName,
+                                            "Normal");
+            if(isSet($_GET["separate"])){
+                self::compactEach($list, "Normal");
+            }
+        }
+    }
+
+    /**
+     * Perform actual compression
+     * @param $src
+     * @param $out
+     * @param $mode
+     * @return bool
+     */
+    public static function concatListAndPack($src, $out, $mode)
+    {
+        if (!is_file($src) || !is_readable($src)) {
+            return false;
+        }
+
+        // Concat List into one big string
+        $jscode = '' ;
+        $noMiniCode = '';
+        $lines = file($src);
+        foreach($lines as $jsline){
+            if(trim($jsline) == '') continue;
+            $noMini = false;
+            if(strpos($jsline, "#NO_MINI") !== FALSE){
+                $jsline = str_replace("#NO_MINI", "", $jsline);
+                $noMini = true;
+            }
+            $code = file_get_contents(AJXP_INSTALL_PATH."/".CLIENT_RESOURCES_FOLDER."/".rtrim($jsline,"\n\r")) ;
+            if ($code) {
+                if($noMini) $noMiniCode .= $code;
+                else $jscode .= $code ;
+            }
+
+        }
+
+        $packer = new \JavaScriptPacker($jscode, $mode , true, false);
+        $packed = $packer->pack();
+        if ($mode == "None") { // css case, hack for I.E.
+            $packed = str_replace("solid#", "solid #", $packed);
+        }
+        if(!empty($noMiniCode)){
+            $packed.="\n".$noMiniCode;
+        }
+        @file_put_contents($out, $packed);
+
+        return true;
+    }
+
+    /**
+     * @param $list
+     * @param $mode
+     */
+    private function compactEach($list, $mode){
+        $lines = file($list);
+        $fullcode = '';
+        foreach($lines as $line){
+            $in = AJXP_INSTALL_PATH."/".CLIENT_RESOURCES_FOLDER."/".rtrim($line,"\n\r");
+            $out = str_replace("/js/", "/js/min/", $in);
+            $outfull = str_replace(".js", ".full.js", $out);
+            $jscode = file_get_contents($in);
+            $fullcode .= $jscode;
+            // Pack and write to file
+            $packer = new \JavaScriptPacker($jscode, $mode , true, false);
+            $packed = $packer->pack();
+            file_put_contents($out, $packed);
+
+            // Pack and write to file
+            $packer = new \JavaScriptPacker($fullcode, $mode , true, false);
+            $packed = $packer->pack();
+            file_put_contents($outfull, $packed);
+        }
+    }
+
+}
diff --git a/core/src/core/src/pydio/Core/Utils/Reflection/LocaleExtractor.php b/core/src/core/src/pydio/Core/Utils/Reflection/LocaleExtractor.php
new file mode 100644
index 0000000000..29e5e1cea8
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Utils/Reflection/LocaleExtractor.php
@@ -0,0 +1,184 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Utils\Reflection;
+
+use Pydio\Core\Model\Context;
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\LocaleService;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class LocaleExtractor
+ * @package Pydio\Core\Utils
+ */
+class LocaleExtractor
+{
+
+    /**
+     * i18n utilitary for extracting the CONF_MESSAGE[] strings out of the XML files
+     * @static
+     * @return void
+     */
+    public static function extractConfStringsFromManifests()
+    {
+        $plugins = PluginsService::getInstance(Context::emptyContext())->getDetectedPlugins();
+        /**
+         * @var Plugin $plug
+         */
+        foreach ($plugins as $pType => $plugs) {
+            foreach ($plugs as $plug) {
+                $lib = $plug->getManifestRawContent("//i18n", "nodes");
+                if (!$lib->length) continue;
+                /** @var \DOMElement $library */
+                $library = $lib->item(0);
+                $namespace = $library->getAttribute("namespace");
+                $path = $library->getAttribute("path");
+                $xml = $plug->getManifestRawContent();
+                // for core, also load mixins
+                $refFile = AJXP_INSTALL_PATH . "/" . $path . "/conf/en.php";
+                $reference = array();
+                if (preg_match_all("/CONF_MESSAGE(\[.*?\])/", $xml, $matches, PREG_SET_ORDER)) {
+                    foreach ($matches as $match) {
+                        $match[1] = str_replace(array("[", "]"), "", $match[1]);
+                        $reference[$match[1]] = $match[1];
+                    }
+                }
+                if ($namespace == "") {
+                    $mixXml = file_get_contents(AJXP_INSTALL_PATH . "/" . AJXP_PLUGINS_FOLDER . "/core.ajaxplorer/ajxp_mixins.xml");
+                    if (preg_match_all("/MIXIN_MESSAGE(\[.*?\])/", $mixXml, $matches, PREG_SET_ORDER)) {
+                        foreach ($matches as $match) {
+                            $match[1] = str_replace(array("[", "]"), "", $match[1]);
+                            $reference[$match[1]] = $match[1];
+                        }
+                    }
+                }
+                if (count($reference)) {
+                    self::updateI18nFromRef($refFile, $reference);
+                }
+            }
+        }
+    }
+
+    /**
+     * Browse the i18n libraries and update the languages with the strings missing
+     * @static
+     * @param string $createLanguage
+     * @param string $pluginId
+     * @return void
+     */
+    public static function updateAllI18nLibraries($createLanguage = "", $pluginId = "")
+    {
+        // UPDATE EN => OTHER LANGUAGES
+        $nodes = PluginsService::getInstance(Context::emptyContext())->searchAllManifests("//i18n", "nodes");
+        /** @var \DOMElement $node */
+        foreach ($nodes as $node) {
+            $nameSpace = $node->getAttribute("namespace");
+            if(!empty($pluginId)){
+                $plug = $node->parentNode->parentNode->parentNode->getAttribute("id");
+                if($plug !== $pluginId) continue;
+            }
+            $path = AJXP_INSTALL_PATH . "/" . $node->getAttribute("path");
+            if ($nameSpace == "") {
+                self::updateI18nFiles($path, false, $createLanguage);
+                self::updateI18nFiles($path . "/conf", true, $createLanguage);
+            } else {
+                self::updateI18nFiles($path, true, $createLanguage);
+                self::updateI18nFiles($path . "/conf", true, $createLanguage);
+            }
+        }
+    }
+
+    /**
+     * Patch the languages files of an i18n library with the references strings from the "en" file.
+     * @static
+     * @param $baseDir
+     * @param bool $detectLanguages
+     * @param string $createLanguage
+     */
+    public static function updateI18nFiles($baseDir, $detectLanguages = true, $createLanguage = "")
+    {
+        if (!is_dir($baseDir) || !is_file($baseDir . "/en.php")) return;
+        if ($createLanguage != "" && !is_file($baseDir . "/$createLanguage.php")) {
+            @copy(AJXP_INSTALL_PATH . "/plugins/core.ajaxplorer/i18n-template.php", $baseDir . "/$createLanguage.php");
+        }
+        if (!$detectLanguages) {
+            $languages = LocaleService::listAvailableLanguages();
+            $filenames = array();
+            foreach ($languages as $key => $value) {
+                $filenames[] = $baseDir . "/" . $key . ".php";
+            }
+        } else {
+            $filenames = glob($baseDir . "/*.php");
+        }
+
+        $mess = array();
+        include($baseDir . "/en.php");
+        $reference = $mess;
+
+        foreach ($filenames as $filename) {
+            self::updateI18nFromRef($filename, $reference);
+        }
+    }
+
+    /**
+     * i18n Utilitary
+     * @static
+     * @param $filename
+     * @param $reference
+     */
+    public static function updateI18nFromRef($filename, $reference)
+    {
+        if (!is_file($filename)) return;
+        $mess = array();
+        include($filename);
+        $missing = array();
+        foreach ($reference as $messKey => $message) {
+            if (!array_key_exists($messKey, $mess)) {
+                $missing[] = "\"$messKey\" => \"$message\",";
+            }
+        }
+        //print_r($missing);
+        if (count($missing)) {
+            $header = array();
+            $currentMessages = array();
+            $footer = array();
+            $fileLines = file($filename);
+            $insideArray = false;
+            foreach ($fileLines as $line) {
+                if (strstr($line, "\"") !== false) {
+                    $currentMessages[] = trim($line);
+                    $insideArray = true;
+                } else {
+                    if (!$insideArray && strstr($line, ");") !== false) $insideArray = true;
+                    if (!$insideArray) {
+                        $header[] = trim($line);
+                    } else {
+                        $footer[] = trim($line);
+                    }
+                }
+            }
+            $currentMessages = array_merge($header, $currentMessages, $missing, $footer);
+            file_put_contents($filename, join("\n", $currentMessages));
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Utils/Reflection/PydioSdkGenerator.php b/core/src/core/src/pydio/Core/Utils/Reflection/PydioSdkGenerator.php
new file mode 100644
index 0000000000..535ce7157c
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Utils/Reflection/PydioSdkGenerator.php
@@ -0,0 +1,237 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pyd.io/>.
+ *
+ *
+ */
+
+namespace Pydio\Core\Utils\Reflection;
+
+//define("JSON_DIR", AJXP_INSTALL_PATH."/core/doc/api");
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\PluginFramework\PluginsService;
+
+define("JSON_DIR", AJXP_INSTALL_PATH."/../api");
+define("JSON_URL", "https://pydio.com/static-docs/api");
+define("API_DOC_PAGE", "https://pydio.com/en/docs/references/pydio-api#!/");
+
+/**
+ * Class PydioSdkGenerator
+ * Generate a Swagger file for Rest APIs v1 documentation
+ * @package Pydio\Core\Utils\Reflection
+ */
+class PydioSdkGenerator
+{
+    static $apiGroups = [
+        "fs" => ["access.fs", "index.*", "meta.*", "editor.*", "action.share", "action.powerfs"],
+        "conf" => ["access.ajxp_conf", "action.scheduler", "action.updater"],
+        "lifecycle" => ["conf.*", "auth.*", "gui.*", "core.*", "action.avatar"],
+        "nonfs" => ["access.*"],
+        "misc" => ["*"]
+    ];
+
+    static $apiGroupsLabels = [
+        "fs" => "Most current operations on files and folders, their metadata, and additional sharing features.",
+        "conf" => "Administration task : users/groups/workspaces provisionning, maintenance tasks, etc... Generally performed using /settings/ as workspace alias.",
+        "lifecycle" => "Application objects lifecycle, like current user access rights and preferences, authentication utils, etc. As they are generally not linked to a specific workspace, these actions can be performed using /pydio/ instead of a workspace alias.",
+        "nonfs" => "Non-standard drivers accessing to structured data like IMAP, MySQL, Apis, etc.",
+        "misc" => "Other plugins actions."
+    ];
+
+    /**
+     * @param $pluginId
+     * @return int|string
+     */
+    private static function findApiGroupForPlugin($pluginId){
+        list($pType, $pName) = explode(".", $pluginId);
+        foreach(self::$apiGroups as $groupName => $pluginPatterns){
+            foreach($pluginPatterns as $pattern){
+                if($pattern == "*" || $pattern == "$pType.*" || $pattern == "$pType.$pName"){
+                    return $groupName;
+                }
+            }
+        }
+        return "misc";
+    }
+
+    /**
+     * @param string $versionString
+     */
+    public static function analyzeRegistry($versionString)
+    {
+        if(!AJXP_SERVER_DEBUG) {
+            echo "Please switch the server to debug mode to use this API.";
+            return;
+        }
+
+        $pServ = PluginsService::getInstance();
+        $nodes = $pServ->searchAllManifests('//actions/*/processing/serverCallback[@developerComment]', 'node', false, false, true);
+        $jsFile = AJXP_DATA_PATH."/public/sdkMethods.js";
+        $swaggerJsonDir = JSON_DIR."/".$versionString;
+        $swaggerAPIs = array();
+        $methods = array();
+        $alreadyParsed = array();
+        foreach ($nodes as $callbackNode) {
+            $params = array();
+            $swaggerParams = array();
+            $pluginName = $callbackNode->parentNode->parentNode->parentNode->parentNode->parentNode->getAttribute("id");
+            $actionName = $callbackNode->parentNode->parentNode->getAttribute("name");
+            $methodName = $callbackNode->getAttribute("sdkMethodName");
+            if(empty($methodName)){
+                $methodName = $actionName;
+            }
+            $outputType = 'xml';
+            /*
+            if(in_array($actionName, $alreadyParsed)){
+                continue;
+            }
+            $alreadyParsed[] = $actionName;
+            */
+            if(!isset($swaggerAPIs[$pluginName])) $swaggerAPIs[$pluginName] = array();
+
+            foreach ($callbackNode->childNodes as $child) {
+                if($child->nodeType != XML_ELEMENT_NODE)continue;
+                if ($child->nodeName == "input_param") {
+                    $params[$child->getAttribute("name")] = array(
+                        "name" => $child->getAttribute("name"),
+                        "type" => $child->getAttribute("type"),
+                        "mandatory" => $child->getAttribute("mandatory") === "true",
+                        "default" => $child->getAttribute("default"),
+                    );
+                    $default = $child->getAttribute("default");
+                    $swaggerParams[] = array(
+                        "name" => $child->getAttribute("name"),
+                        "description" => $child->getAttribute("description"). "<br>".(!empty($default) ? "Default: $default" : ""),
+                        "required" => ($child->getAttribute("mandatory") === "true"),
+                        "allowMultiple" => (strpos($child->getAttribute("type"), "[]") !== false),
+                        "dataType" => (strpos($child->getAttribute("type"), "[]") !== false) ? "array":$child->getAttribute("type"),
+                        "paramType" => "query"
+                    );
+
+                } else if ($child->nodeName=="output") {
+                    $outputType = $child->getAttribute("type");
+                }
+            }
+            $methods[$methodName] = array(
+                "action" => $actionName,
+                "params" => $params,
+                "output" => $outputType
+            );
+            $comment = $callbackNode->getAttribute("developerComment");
+            $http = $callbackNode->getAttribute("preferredHttp");
+            $restParams = $callbackNode->getAttribute("restParams");
+            $prefix = "/workspace_alias";
+            $apiGroup = self::findApiGroupForPlugin($pluginName);
+            if($apiGroup == "conf"){
+                $prefix = "/settings";
+            }else if($apiGroup == "lifecycle"){
+                $prefix = "/pydio";
+            }
+            $api = array(
+                "path"  => $prefix."/".$actionName . (empty($restParams) ? "" : $restParams),
+                "operations" => array(
+                    array(
+                        "method"        => empty($http) ? "POST" : strtoupper($http),
+                        "summary"       => substr($comment, 0, 80) . (strlen($comment) > 80 ? "..." : ""),
+                        "notes"         => $comment,
+                        "responseClass" => $outputType,
+                        "nickname"      => $methodName,
+                        "parameters"    => $swaggerParams
+                    )
+                )
+            );
+            $swaggerAPIs[$pluginName][] = $api;
+        }
+
+        file_put_contents($jsFile, "window.sdkMethods = ".json_encode($methods, JSON_PRETTY_PRINT));
+
+        $apidocs = array(
+            "apiVersion" => $versionString,
+            "swaggerVersion" => "1.2",
+            "apis" => array()
+        );
+        $allDocs = array();
+        $markdowns = array();
+
+        foreach($swaggerAPIs as $pluginName => $apis){
+
+            echo("Writing file for $pluginName");
+
+            $swaggerJson = array(
+                "apiVersion" => $versionString,
+                "swaggerVersion" => 1.2,
+                "basePath" => JSON_URL."/$versionString",
+                "resourcePath" => "/api",
+                "produces" => array("application/xml"),
+                "apis" => $apis
+            );
+            file_put_contents($swaggerJsonDir."/".$pluginName, json_encode($swaggerJson, JSON_PRETTY_PRINT));
+            $p = $pServ->getPluginById($pluginName);
+            $apiGroup = self::findApiGroupForPlugin($pluginName);
+            if(!isset($allDocs[$apiGroup])) {
+                $allDocs[$apiGroup] = array();
+                $markdowns[$apiGroup] = array();
+            }
+            $markdowns[$apiGroup][] = self::makeMarkdown($p, $apis);
+            $allDocs[$apiGroup][] = array(
+                "path" => JSON_URL."/$versionString/".$pluginName,
+                "description" => $p->getManifestDescription()
+            );
+            $apidocs["apis"][] = array(
+                "path" => JSON_URL."/$versionString/".$pluginName,
+                "description" => $p->getManifestDescription()
+            );
+
+        }
+        foreach($allDocs as $apiGroupName => $groupApis){
+            $groupApiDocs = array(
+                "apiVersion" => $versionString,
+                "swaggerVersion" => "1.2",
+                "apis" => $groupApis
+            );
+            file_put_contents($swaggerJsonDir."/api-docs-".$apiGroupName, json_encode($groupApiDocs, JSON_PRETTY_PRINT));
+            file_put_contents($swaggerJsonDir."/api-md-".$apiGroupName, self::$apiGroupsLabels[$apiGroupName]."\n\n".implode("", $markdowns[$apiGroupName]));
+        }
+        // Store file with all apis.
+        file_put_contents($swaggerJsonDir."/api-docs", json_encode($apidocs, JSON_PRETTY_PRINT));
+    }
+
+    /**
+     * @param Plugin $plugin
+     * @param array $apis
+     * @return string
+     */
+    private static function makeMarkdown($plugin, $apis){
+
+        $md = "\n\n";
+        $md .= "## ".$plugin->getManifestLabel()."  ";
+        $md .= "\n".$plugin->getManifestDescription()."\n\n";
+        $id = $plugin->getId();
+        foreach($apis as $index => $api) {
+            $md .= "\n";
+            $md .= "- **".$api["path"]."**  \n";
+            $md .= "  ".$api["operations"][0]["notes"]."  \n";
+            $md .= "  [Details](".API_DOC_PAGE."".$id."/".$api["operations"][0]["nickname"]."_".strtolower($api["operations"][0]["method"])."_".$index.")";
+        }
+
+        return $md;
+
+    }
+
+}
diff --git a/core/src/core/src/pydio/Core/Utils/TextEncoder.php b/core/src/core/src/pydio/Core/Utils/TextEncoder.php
new file mode 100644
index 0000000000..4b500b7168
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Utils/TextEncoder.php
@@ -0,0 +1,199 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>, Cyril Russo
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Utils;
+
+use Pydio\Core\Model\ContextInterface;
+
+use Pydio\Core\Services\SessionService;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+/**
+ * Static utilitaries to encode/decode charset to/from utf8
+ * @package Pydio
+ * @subpackage Core
+ */
+class TextEncoder
+{
+    /** @var  ContextInterface */
+    private static $context;
+
+    /**
+     * @param ContextInterface $ctx
+     */
+    public static function updateContext($ctx){
+        self::$context = $ctx;
+    }
+
+    /**
+     * Change the charset of a string from input to output
+     * @static
+     * @param string $inputCharset
+     * @param string $outputCharset
+     * @param string $text
+     * @return string
+     */
+    public static function changeCharset($inputCharset, $outputCharset, $text)
+    {
+        if ($inputCharset == $outputCharset) return $text;
+        // Due to iconv bug when dealing with text with non ASCII encoding for last char, we use this workaround http://fr.php.net/manual/fr/function.iconv.php#81494
+        if (function_exists("iconv")) {
+
+            return iconv($inputCharset, $outputCharset, $text);
+        } else {
+            $content = @htmlentities($text, ENT_QUOTES, $inputCharset);
+            return @html_entity_decode($content, ENT_QUOTES , $outputCharset);
+        }
+    }
+
+    public static $currentCharsetValue;
+    /**
+     * Detect the current charset from the current locale
+     * @static
+     * @param string $locale
+     * @return string
+     */
+    public static function parseCharset($locale)
+    {
+        $test = explode("@", $locale);
+        $locale = $test[0];
+        $encoding = substr(strrchr($locale, "."), 1);
+        if (is_numeric($encoding)) {
+            if (substr($encoding, 0, 2) == "12") // CP12xx are changed to Windows-12xx to allow PHP4 conversion
+                  $encoding = "windows-".$encoding;
+              else $encoding = "CP".$encoding; // In other cases, PHP4 won't work anyway, so use CPxxxx encoding (that iconv supports)
+        } else if ($locale == "C") {   // Locale not set correctly, most probable error cause is /etc/init.d/apache having "LANG=C" defined
+            // In any case, "C" is ASCII-7 bit so it's safe to use the extra bit as if it was UTF-8
+            $encoding = "UTF-8";
+        }
+        if (!strlen($encoding)) $encoding = "UTF-8";
+        return $encoding;
+    }
+    /**
+     * Try to detect the current encoding (cached in session)
+     * @static
+     * @return string
+     */
+    public static function getEncoding()
+    {
+        if (self::$currentCharsetValue == null) {
+            $charset = null;
+            if (!empty(self::$context) && self::$context->hasRepository()) {
+                $charset = self::$context->getRepository()->getSafeOption("CHARSET");
+                if(empty($charset) && SessionService::getContextCharset(self::$context->getRepositoryId()) !== null){
+                    $charset = SessionService::getContextCharset(self::$context->getRepositoryId());
+                }
+            }
+            if (!empty($charset)) {
+                // Check if the session get an assigned charset encoding (it's the case for remote SSH for example)
+                self::$currentCharsetValue = $charset;
+            } else {
+                // Get the current locale (expecting the filesystem is in the same locale, as the standard says)
+                self::$currentCharsetValue = self::parseCharset(setlocale(LC_CTYPE, 0));
+                if(!empty(self::$context) && self::$context->hasRepository()){
+                    self::$context->getRepository()->addOption("CHARSET", $charset);
+                    SessionService::setContextCharset(self::$context->getRepositoryId(), $charset);
+                }
+            }
+        }
+        return self::$currentCharsetValue;
+    }
+    /**
+     * Decode a string from UTF8 to current Charset
+     * @static
+     * @param string $filesystemElement
+     * @param bool $test Try to detect if it's really utf8 or not
+     * @return string
+     */
+    public static function fromUTF8($filesystemElement, $test = false)
+    {
+        if ($test && !TextEncoder::isUtf8($filesystemElement)) {
+            return $filesystemElement;
+        }
+        $enc = TextEncoder::getEncoding();
+        return TextEncoder::changeCharset("UTF-8", $enc, $filesystemElement);
+    }
+
+
+    /**
+     * Transform a string from current charset to utf8
+     * @static
+     * @param string $filesystemElement
+     * @param bool $test Test if it's already UTF8 or not, to avoid double-encoding
+     * @return string
+     */
+    public static function toUTF8($filesystemElement, $test = true)
+    {
+        if ($test && TextEncoder::isUtf8($filesystemElement)) {
+            return $filesystemElement;
+        }
+        $enc = TextEncoder::getEncoding();
+        return TextEncoder::changeCharset($enc, "UTF-8", $filesystemElement);
+    }
+    /**
+     * Test if a string seem to be already UTF8-encoded
+     * @static
+     * @param string $string
+     * @return bool
+     */
+    public static function isUtf8($string)
+    {
+        return preg_match('%^(?:
+          [\x09\x0A\x0D\x20-\x7E]            # ASCII
+        | [\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
+            )*$%xs', $string);
+    }
+    /**
+     * Transform a string from current Storage charset to utf8
+     * @static
+     * @param string $filesystemElement
+     * @param bool $test Test if it's already UTF8 or not, to avoid double-encoding
+     * @return string
+     */
+    public static function fromStorageEncoding($filesystemElement, $test = true)
+    {
+        if ($test && TextEncoder::isUtf8($filesystemElement)) {
+            return $filesystemElement;
+        }
+        $enc = TextEncoder::getEncoding();
+        return TextEncoder::changeCharset($enc, "UTF-8", $filesystemElement);
+    }
+    /**
+     * Decode a string from UTF8 to current Storage Charset
+     * @static
+     * @param string $filesystemElement
+     * @param bool $test Try to detect if it's really utf8 or not
+     * @return string
+     */
+    public static function toStorageEncoding($filesystemElement, $test = false)
+    {
+        if ($test && !TextEncoder::isUtf8($filesystemElement)) {
+            return $filesystemElement;
+        }
+        $enc = TextEncoder::getEncoding();
+        return TextEncoder::changeCharset("UTF-8", $enc, $filesystemElement);
+    }	
+}
diff --git a/core/src/core/src/pydio/Core/Utils/Vars/InputFilter.php b/core/src/core/src/pydio/Core/Utils/Vars/InputFilter.php
new file mode 100644
index 0000000000..c1b0aa62a5
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Utils/Vars/InputFilter.php
@@ -0,0 +1,336 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Utils\Vars;
+
+use Psr\Http\Message\UploadedFileInterface;
+use Pydio\Core\Exception\ForbiddenCharacterException;
+use Pydio\Core\Services\LocaleService;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Tools to clean inputs
+ * @package Pydio\Core\Utils
+ */
+class InputFilter
+{
+
+    const SANITIZE_HTML = 1;
+    const SANITIZE_HTML_STRICT = 2;
+    const SANITIZE_ALPHANUM = 3;
+    const SANITIZE_EMAILCHARS = 4;
+    const SANITIZE_FILENAME = 5;
+    const SANITIZE_DIRNAME = 6;
+
+    /**
+     * Remove all "../../" tentatives, replace double slashes
+     * @static
+     * @param string $path
+     * @return string
+     */
+    public static function securePath($path)
+    {
+        if ($path == null) {
+            return "";
+        }
+        //
+        // REMOVE ALL "../" TENTATIVES
+        //
+        $path = str_replace(chr(0), "", $path);
+        $dirs = self::safeExplode($path);
+        $count = count($dirs);
+        for ($i = 0; $i < $count; $i++) {
+            if ($dirs[$i] == '.' or $dirs[$i] == '..') {
+                $dirs[$i] = '';
+            }
+        }
+        // rebuild safe directory string
+        $path = implode('/', $dirs);
+
+        //
+        // REPLACE DOUBLE SLASHES
+        //
+        while (preg_match('/\/\//', $path)) {
+            $path = str_replace('//', '/', $path);
+        }
+        return $path;
+    }
+
+    /**
+     * @param $path
+     * @return array
+     */
+    public static function safeExplode($path) {
+        return (DIRECTORY_SEPARATOR === "\\" ? preg_split('/(\\\|\\/)/', $path) : explode('/', $path));
+    }
+
+
+    /**
+     * Given a string, this function will determine if it potentially an
+     * XSS attack and return boolean.
+     *
+     * @param string $string
+     *  The string to run XSS detection logic on
+     * @return boolean
+     *  True if the given `$string` contains XSS, false otherwise.
+     */
+    public static function detectXSS($string)
+    {
+        $contains_xss = FALSE;
+
+        // Skip any null or non string values
+        if (is_null($string) || !is_string($string)) {
+            return $contains_xss;
+        }
+
+        // Keep a copy of the original string before cleaning up
+        $orig = $string;
+
+        // Set the patterns we'll test against
+        $patterns = array(
+            // Match any attribute starting with "on" or xmlns
+            '#(<[^>]+[\x00-\x20\"\'\/])(on|xmlns)[^>]*>?#iUu',
+
+            // Match javascript:, livescript:, vbscript: and mocha: protocols
+            '!((java|live|vb)script|mocha|feed|data):(\w)*!iUu',
+            '#-moz-binding[\x00-\x20]*:#u',
+
+            // Match style attributes
+            '#(<[^>]+[\x00-\x20\"\'\/])style=[^>]*>?#iUu',
+
+            // Match unneeded tags
+            '#</*(applet|meta|xml|blink|link|style|script|embed|object|iframe|frame|frameset|ilayer|layer|bgsound|title|base|svg)[^>]*>?#i'
+        );
+
+        foreach ($patterns as $pattern) {
+            // Test both the original string and clean string
+            if (preg_match($pattern, $string) || preg_match($pattern, $orig)) {
+                $contains_xss = TRUE;
+            }
+            if ($contains_xss === TRUE) return TRUE;
+        }
+
+        return FALSE;
+    }
+
+    /**
+     * Function to clean a string from specific characters
+     *
+     * @static
+     * @param string $s
+     * @param int $level Can be InputFilter::SANITIZE_ALPHANUM, InputFilter::SANITIZE_EMAILCHARS, InputFilter::SANITIZE_HTML, InputFilter::SANITIZE_HTML_STRICT
+     * @param string $expand
+     * @param bool $throwException
+     * @return mixed|string
+     * @throws ForbiddenCharacterException
+     */
+    public static function sanitize($s, $level = InputFilter::SANITIZE_HTML, $throwException = false, $expand = 'script|style|noframes|select|option')
+    {
+        $original = $s;
+        if ($level == InputFilter::SANITIZE_ALPHANUM) {
+            $s =  preg_replace("/[^a-zA-Z0-9_\-\.]/", "", $s);
+            if($throwException && $original !== $s){
+                throw new ForbiddenCharacterException($original);
+            }
+            return $s;
+        } else if ($level == InputFilter::SANITIZE_EMAILCHARS) {
+            $s = preg_replace("/[^a-zA-Z0-9_\-\.@!%\+=|~\?]/", "", $s);
+            if($throwException && $original !== $s){
+                throw new ForbiddenCharacterException($original);
+            }
+            return $s;
+        } else if ($level == InputFilter::SANITIZE_FILENAME || $level == InputFilter::SANITIZE_DIRNAME) {
+            // Convert Hexadecimals
+            $s = preg_replace_callback('!(&#|\\\)[xX]([0-9a-fA-F]+);?!', function($array){
+                return chr(hexdec($array[1]));
+            }, $s);
+            // Clean up entities
+            $s = preg_replace('!(&#0+[0-9]+)!', '$1;', $s);
+            // Decode entities
+            $s = html_entity_decode($s, ENT_NOQUOTES, 'UTF-8');
+            // Strip whitespace characters
+            $s = ltrim($s);
+            $s = str_replace(chr(0), "", $s);
+            if ($level == InputFilter::SANITIZE_FILENAME) {
+                $s = preg_replace("/[\"\/\|\?\\\]/", "", $s);
+            } else {
+                $s = preg_replace("/[\"\|\?\\\]/", "", $s);
+            }
+            if (self::detectXSS($s)) {
+                if (strpos($s, "/") === 0) $s = "/XSS Detected - Rename Me";
+                else $s = "XSS Detected - Rename Me";
+            }
+            if($throwException && $original !== $s){
+                throw new ForbiddenCharacterException($original);
+            }
+            return $s;
+        }
+
+        /**/ //prep the string
+        $s = ' ' . $s;
+
+        //begin removal
+        //remove comment blocks
+        $pos = []; $len = [];
+        while (stripos($s, '<!--') > 0) {
+            $pos[1] = stripos($s, '<!--');
+            $pos[2] = stripos($s, '-->', $pos[1]);
+            $len[1] = $pos[2] - $pos[1] + 3;
+            $x = substr($s, $pos[1], $len[1]);
+            $s = str_replace($x, '', $s);
+        }
+
+        //remove tags with content between them
+        if (strlen($expand) > 0) {
+            $e = explode('|', $expand);
+            $pos = []; $len = [];
+            $eLength = count($e);
+            for ($i = 0; $i < $eLength; $i++) {
+                while (stripos($s, '<' . $e[$i]) > 0) {
+                    $len[1] = strlen('<' . $e[$i]);
+                    $pos[1] = stripos($s, '<' . $e[$i]);
+                    $pos[2] = stripos($s, $e[$i] . '>', $pos[1] + $len[1]);
+                    $len[2] = $pos[2] - $pos[1] + $len[1];
+                    $x = substr($s, $pos[1], $len[2]);
+                    $s = str_replace($x, '', $s);
+                }
+            }
+        }
+
+        $s = strip_tags($s);
+        if ($level == InputFilter::SANITIZE_HTML_STRICT) {
+            $s = preg_replace("/[\",;\/`<>:\*\|\?!\^\\\]/", "", $s);
+        } else {
+            $s = str_replace(array("<", ">"), array("&lt;", "&gt;"), $s);
+        }
+        if($throwException && $original !== $s){
+            throw new ForbiddenCharacterException($original);
+        }
+        return ltrim($s);
+    }
+
+    /**
+     * Perform standard urldecode, sanitization and securepath
+     * @static
+     * @param $data
+     * @param int $sanitizeLevel
+     * @return string
+     * @throws ForbiddenCharacterException
+     */
+    public static function decodeSecureMagic($data, $sanitizeLevel = InputFilter::SANITIZE_DIRNAME)
+    {
+        return InputFilter::sanitize(InputFilter::securePath($data), $sanitizeLevel, true);
+    }
+
+    /**
+     * Parse the $fileVars[] PHP errors
+     * @static
+     * @param array|UploadedFileInterface $boxData
+     * @param bool $throwException
+     * @return array|null
+     * @throws \Exception
+     */
+    public static function parseFileDataErrors($boxData, $throwException = false)
+    {
+        $mess = LocaleService::getMessages();
+        if (is_array($boxData)) {
+            $userfile_error = $boxData["error"];
+            $userfile_tmp_name = $boxData["tmp_name"];
+            $userfile_size = $boxData["size"];
+        } else {
+            $userfile_error = $boxData->getError();
+            $userfile_size = $boxData->getSize();
+            $userfile_tmp_name = "";
+        }
+        if ($userfile_error != UPLOAD_ERR_OK) {
+            $errorsArray = array();
+            $errorsArray[UPLOAD_ERR_FORM_SIZE] = $errorsArray[UPLOAD_ERR_INI_SIZE] = array(409, str_replace("%i", ini_get("upload_max_filesize"), $mess["537"]));
+            $errorsArray[UPLOAD_ERR_NO_FILE] = array(410, $mess[538]);
+            $errorsArray[UPLOAD_ERR_PARTIAL] = array(410, $mess[539]);
+            $errorsArray[UPLOAD_ERR_NO_TMP_DIR] = array(410, $mess[540]);
+            $errorsArray[UPLOAD_ERR_CANT_WRITE] = array(411, $mess[541]);
+            $errorsArray[UPLOAD_ERR_EXTENSION] = array(410, $mess[542]);
+            if ($userfile_error == UPLOAD_ERR_NO_FILE) {
+                // OPERA HACK, do not display "no file found error"
+                if (strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') === false) {
+                    $data = $errorsArray[$userfile_error];
+                    if ($throwException) throw new \Exception($data[1], $data[0]);
+                    return $data;
+                }
+            } else {
+                $data = $errorsArray[$userfile_error];
+                if ($throwException) throw new \Exception($data[1], $data[0]);
+                return $data;
+            }
+        }
+        if ($userfile_tmp_name == "none" || $userfile_size == 0) {
+            if ($throwException) throw new \Exception($mess[31], 410);
+            return array(410, $mess[31]);
+        }
+        return null;
+    }
+
+    /**
+     * Parse a Comma-Separated-Line value
+     * @static
+     * @param $string
+     * @param bool $hash
+     * @return array
+     */
+    public static function parseCSL($string, $hash = false)
+    {
+        $exp = array_map("trim", explode(",", $string));
+        if (!$hash) return $exp;
+        $assoc = array();
+        foreach ($exp as $explVal) {
+            $reExp = explode("|", $explVal);
+            if (count($reExp) == 1) $assoc[$reExp[0]] = $reExp[0];
+            else $assoc[$reExp[0]] = $reExp[1];
+        }
+        return $assoc;
+    }
+
+    /**
+     * This function is used when the server's PHP configuration is using magic quote
+     * @param string $text
+     * @return string
+     */
+    public static function magicDequote($text)
+    {
+        // If the PHP server enables magic quotes, remove them
+        if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc())
+            return stripslashes($text);
+        return $text;
+    }
+
+    /**
+     * call fromUTF8
+     * @static
+     * @param string $filesystemElement
+     * @return string
+     */
+    public static function fromPostedFileName($filesystemElement)
+    {
+        return InputFilter::magicDequote($filesystemElement);
+    }
+
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Utils/Vars/OptionsHelper.php b/core/src/core/src/pydio/Core/Utils/Vars/OptionsHelper.php
new file mode 100644
index 0000000000..9f5ddc8390
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Utils/Vars/OptionsHelper.php
@@ -0,0 +1,244 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Utils\Vars;
+
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Crypto;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class FormHelper: manipulate "standard" form submission
+ * @package Pydio\Core\Utils
+ */
+class OptionsHelper
+{
+
+    /**
+     * 
+     * @param $userId
+     * @param $password
+     * @return string
+     */
+    public static function decypherStandardFormPassword($userId, $password)
+    {
+        if(Crypto::hasCBCEnctypeHeader($password)){
+            return Crypto::decrypt($password, Crypto::buildKey($userId, Crypto::getApplicationSecret()));
+        }else{
+            // Legacy encryption
+            return Crypto::decrypt($password, md5($userId . "\1CDAFx¨op#"));
+        }
+    }
+
+    /**
+     * @param $metadata
+     * @param $nestedData
+     * @param null $userId
+     * @param null $binariesContext
+     * @param string $cypheredPassPrefix
+     */
+    public static function filterFormElementsFromMeta(ContextInterface $ctx, $metadata, &$nestedData, $userId = null, $binariesContext = null, $cypheredPassPrefix = "")
+    {
+        foreach ($metadata as $key => $level) {
+            if (!array_key_exists($key, $nestedData)) continue;
+            if (!is_array($level)) continue;
+            if (isSet($level["ajxp_form_element"])) {
+                // filter now
+                $type = $level["type"];
+                if ($type == "binary" && $binariesContext != null) {
+                    $value = $nestedData[$key];
+                    if ($value == "ajxp-remove-original") {
+                        if (!empty($level["original_binary"])) {
+                            ConfService::getConfStorageImpl()->deleteBinary($binariesContext, $level["original_binary"]);
+                        }
+                        $value = "";
+                    } else {
+                        $file = ApplicationState::getAjxpTmpDir() . "/" . $value;
+                        if (file_exists($file)) {
+                            $id = !empty($level["original_binary"]) ? $level["original_binary"] : null;
+                            $id = ConfService::getConfStorageImpl()->saveBinary($binariesContext, $file, $id);
+                            $value = $id;
+                        }
+                    }
+                    $nestedData[$key] = $value;
+                }else if($type === "password" && !empty($cypheredPassPrefix) && $ctx->hasUser()){
+                    $value = $nestedData[$key];
+                    if(trim($value) !== '' && $value !== '__AJXP_VALUE_SET__'){
+                        $nestedData[$key] = $cypheredPassPrefix . Crypto::encrypt($value, Crypto::buildKey($ctx->getUser()->getId(), Crypto::getApplicationSecret()));
+                    }
+                }
+            } else {
+                self::filterFormElementsFromMeta($ctx, $level, $nestedData[$key], $userId, $binariesContext, $cypheredPassPrefix);
+            }
+        }
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $repDef
+     * @param $options
+     * @param string $prefix
+     * @param null $binariesContext
+     * @param string $cypheredPassPrefix
+     */
+    public static function parseStandardFormParameters(ContextInterface $ctx, &$repDef, &$options, $prefix = "DRIVER_OPTION_", $binariesContext = null, $cypheredPassPrefix = "")
+    {
+        if ($binariesContext === null) {
+            $binariesContext = array("USER" => ($ctx->hasUser()) ? $ctx->getUser()->getId() : "shared");
+        }
+        $replicationGroups = array();
+        $switchesGroups = array();
+        foreach ($repDef as $key => $value) {
+            if (((!empty($prefix) && strpos($key, $prefix) !== false && strpos($key, $prefix) == 0) || empty($prefix))
+                && strpos($key, "ajxptype") === false
+                && strpos($key, "_original_binary") === false
+                && strpos($key, "_replication") === false
+                && strpos($key, "_checkbox") === false
+            ) {
+                if (isSet($repDef[$key . "_ajxptype"])) {
+                    $type = $repDef[$key . "_ajxptype"];
+                    if ($type == "boolean") {
+                        $value = ($value == "true" ? true : false);
+                    } else if ($type == "integer") {
+                        $value = intval($value);
+                    } else if ($type == "array") {
+                        $value = explode(",", $value);
+                    } else if ($type == "password" && $ctx->hasUser() && !empty($cypheredPassPrefix)) {
+                        if (trim($value) != "" && $value != "__AJXP_VALUE_SET__") {
+                            $value = $cypheredPassPrefix . Crypto::encrypt($value, Crypto::buildKey($ctx->getUser()->getId(), Crypto::getApplicationSecret()));
+                        }
+                    } else if ($type == "binary" && $binariesContext !== null) {
+                        if (!empty($value)) {
+                            if ($value == "ajxp-remove-original") {
+                                if (!empty($repDef[$key . "_original_binary"])) {
+                                    ConfService::getConfStorageImpl()->deleteBinary($binariesContext, $repDef[$key . "_original_binary"]);
+                                }
+                                $value = "";
+                            } else {
+                                $file = ApplicationState::getAjxpTmpDir() . "/" . $value;
+                                if (file_exists($file)) {
+                                    $id = !empty($repDef[$key . "_original_binary"]) ? $repDef[$key . "_original_binary"] : null;
+                                    $id = ConfService::getConfStorageImpl()->saveBinary($binariesContext, $file, $id);
+                                    $value = $id;
+                                }
+                            }
+                        } else if (!empty($repDef[$key . "_original_binary"])) {
+                            $value = $repDef[$key . "_original_binary"];
+                        }
+                    } else if (strpos($type, "group_switch:") === 0) {
+                        $tmp = explode(":", $type);
+                        $gSwitchName = $tmp[1];
+                        $switchesGroups[substr($key, strlen($prefix))] = $gSwitchName;
+                    } else if ($type == "text/json") {
+                        $value = json_decode($value, true);
+                    }
+                    if (!in_array($type, array("textarea", "boolean", "text/json", "password"))) {
+                        $value = InputFilter::sanitize($value, InputFilter::SANITIZE_HTML);
+                    }
+                    unset($repDef[$key . "_ajxptype"]);
+                }
+                if (isSet($repDef[$key . "_checkbox"])) {
+                    $checked = $repDef[$key . "_checkbox"] == "checked";
+                    unset($repDef[$key . "_checkbox"]);
+                    if (!$checked) continue;
+                }
+                if (isSet($repDef[$key . "_replication"])) {
+                    $repKey = $repDef[$key . "_replication"];
+                    if (!is_array($replicationGroups[$repKey])) $replicationGroups[$repKey] = array();
+                    $replicationGroups[$repKey][] = $key;
+                }
+                $options[substr($key, strlen($prefix))] = $value;
+                unset($repDef[$key]);
+            } else {
+                $repDef[$key] = $value;
+            }
+        }
+        // DO SOMETHING WITH REPLICATED PARAMETERS?
+        if (count($switchesGroups)) {
+            $gValues = array();
+            foreach ($switchesGroups as $fieldName => $groupName) {
+                if (isSet($options[$fieldName])) {
+                    $gValues = array();
+                    $radic = $groupName . "_" . $options[$fieldName] . "_";
+                    foreach ($options as $optN => $optV) {
+                        if (strpos($optN, $radic) === 0) {
+                            $newName = substr($optN, strlen($radic));
+                            $gValues[$newName] = $optV;
+                        }
+                    }
+                }
+                $options[$fieldName . "_group_switch"] = $options[$fieldName];
+                $options[$fieldName] = $gValues;
+            }
+        }
+
+    }
+
+    private static $_dibiParamClean = array();
+
+
+    /**
+     * @param $params
+     * @return array|mixed
+     * @throws \Exception
+     * @throws \Pydio\Core\Exception\PydioException
+     */
+    public static function cleanDibiDriverParameters($params)
+    {
+        if (!is_array($params)) return $params;
+        $value = $params["group_switch_value"];
+        if (isSet($value)) {
+            if (isSet(self::$_dibiParamClean[$value])) {
+                return self::$_dibiParamClean[$value];
+            }
+            if ($value == "core") {
+                $bootStorage = ConfService::getBootConfStorageImpl();
+                $configs = $bootStorage->loadPluginConfig("core", "conf");
+                $params = $configs["DIBI_PRECONFIGURATION"];
+                if (!is_array($params)) {
+                    throw new \Exception("Empty SQL default connexion, there is something wrong with your setup! You may have switch to an SQL-based plugin without defining a connexion.");
+                }
+            } else {
+                unset($params["group_switch_value"]);
+            }
+            foreach ($params as $k => $v) {
+                $explode = explode("_", $k, 2);
+                $params[array_pop($explode)] = VarsFilter::filter($v, Context::emptyContext());
+                unset($params[$k]);
+            }
+        }
+        switch ($params["driver"]) {
+            case "sqlite":
+            case "sqlite3":
+                $params["formatDateTime"] = "'Y-m-d H:i:s'";
+                $params["formatDate"] = "'Y-m-d'";
+                break;
+        }
+        if (isSet($value)) {
+            self::$_dibiParamClean[$value] = $params;
+        }
+        return $params;
+    }
+}
diff --git a/core/src/core/src/pydio/Core/Utils/Vars/PasswordEncoder.php b/core/src/core/src/pydio/Core/Utils/Vars/PasswordEncoder.php
new file mode 100644
index 0000000000..9180c5e4e0
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Utils/Vars/PasswordEncoder.php
@@ -0,0 +1,177 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Utils\Vars;
+
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Utils\Crypto;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+// THESE ARE DEFINED IN bootstrap_context.php
+// REPEAT HERE FOR BACKWARD COMPATIBILITY.
+if (!defined('PBKDF2_HASH_ALGORITHM')) {
+
+    define("PBKDF2_HASH_ALGORITHM", "sha256");
+    define("PBKDF2_ITERATIONS", 1000);
+    define("PBKDF2_SALT_BYTE_SIZE", 24);
+    define("PBKDF2_HASH_BYTE_SIZE", 24);
+
+    define("HASH_SECTIONS", 4);
+    define("HASH_ALGORITHM_INDEX", 0);
+    define("HASH_ITERATION_INDEX", 1);
+    define("HASH_SALT_INDEX", 2);
+    define("HASH_PBKDF2_INDEX", 3);
+
+    define("USE_OPENSSL_RANDOM", false);
+
+}
+
+/**
+ * Class PasswordEncoder
+ * @package Pydio\Core\Utils
+ */
+class PasswordEncoder
+{
+
+    /**
+     * PBKDF2 key derivation function as defined by RSA's PKCS #5: https://www.ietf.org/rfc/rfc2898.txt
+     * $algorithm - The hash algorithm to use. Recommended: SHA256
+     * $password - The password.
+     * $salt - A salt that is unique to the password.
+     * $count - Iteration count. Higher is better, but slower. Recommended: At least 1000.
+     * $key_length - The length of the derived key in bytes.
+     * $raw_output - If true, the key is returned in raw binary format. Hex encoded otherwise.
+     * Returns: A $key_length-byte key derived from the password and salt.
+     *
+     * 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
+     * @param $algorithm
+     * @param $password
+     * @param $salt
+     * @param $count
+     * @param $key_length
+     * @param bool $raw_output
+     * @return string
+     * @throws PydioException
+     */
+    public static function pbkdf2_apply($algorithm, $password, $salt, $count, $key_length, $raw_output = false)
+    {
+        $algorithm = strtolower($algorithm);
+
+        if (!in_array($algorithm, hash_algos(), true))
+            throw new PydioException('PBKDF2 ERROR: Invalid hash algorithm.');
+        if ($count <= 0 || $key_length <= 0)
+            throw new PydioException('PBKDF2 ERROR: Invalid parameters.');
+
+        $hash_length = strlen(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
+            $last = $xorsum = hash_hmac($algorithm, $last, $password, true);
+
+            // perform the other $count - 1 iterations
+            for ($j = 1; $j < $count; $j++) {
+                $xorsum ^= ($last = hash_hmac($algorithm, $last, $password, true));
+            }
+
+            $output .= $xorsum;
+        }
+
+        if ($raw_output)
+            return substr($output, 0, $key_length);
+        else
+            return bin2hex(substr($output, 0, $key_length));
+    }
+
+    /**
+     * Compares two strings $a and $b in length-constant time.
+     * @param $a
+     * @param $b
+     * @return bool
+     */
+    public static function pbkdf2_slow_equals($a, $b)
+    {
+        $diff = strlen($a) ^ strlen($b);
+        for ($i = 0; $i < strlen($a) && $i < strlen($b); $i++) {
+            $diff |= ord($a[$i]) ^ ord($b[$i]);
+        }
+
+        return $diff === 0;
+    }
+
+    /**
+     * @param $password
+     * @param $correct_hash
+     * @return bool
+     * @throws PydioException
+     */
+    public static function pbkdf2_validate_password($password, $correct_hash)
+    {
+        $params = explode(":", $correct_hash);
+
+        if (count($params) < HASH_SECTIONS) {
+            if (strlen($correct_hash) == 32 && count($params) == 1) {
+                return md5($password) == $correct_hash;
+            }
+            return false;
+        }
+
+        $pbkdf2 = base64_decode($params[HASH_PBKDF2_INDEX]);
+        return self::pbkdf2_slow_equals(
+            $pbkdf2,
+            self::pbkdf2_apply(
+                $params[HASH_ALGORITHM_INDEX],
+                $password,
+                $params[HASH_SALT_INDEX],
+                (int)$params[HASH_ITERATION_INDEX],
+                strlen($pbkdf2),
+                true
+            )
+        );
+    }
+
+    /**
+     * @param $password
+     * @return string
+     * @throws PydioException
+     */
+    public static function pbkdf2_create_hash($password)
+    {
+        // format: algorithm:iterations:salt:hash
+        $salt = Crypto::getRandomSalt();
+        return PBKDF2_HASH_ALGORITHM . ":" . PBKDF2_ITERATIONS . ":" . $salt . ":" .
+        base64_encode(self::pbkdf2_apply(
+            PBKDF2_HASH_ALGORITHM,
+            $password,
+            $salt,
+            PBKDF2_ITERATIONS,
+            PBKDF2_HASH_BYTE_SIZE,
+            true
+        ));
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Utils/Vars/PathUtils.php b/core/src/core/src/pydio/Core/Utils/Vars/PathUtils.php
new file mode 100644
index 0000000000..92acea1103
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Utils/Vars/PathUtils.php
@@ -0,0 +1,77 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Utils\Vars;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Helpers to manipulate file paths
+ * @package Pydio\Core\Utils
+ */
+class PathUtils
+{
+
+    /**
+     * Parse file and replace \ by /
+     * @param $path
+     * @return mixed|string
+     */
+    public static function forwardSlashDirname($path)
+    {
+        return (DIRECTORY_SEPARATOR === "\\" ? str_replace("\\", "/", dirname($path)) : dirname($path));
+    }
+
+    /**
+     * Parse file and replace \ by /
+     * @param $path
+     * @return mixed|string
+     */
+    public static function forwardSlashBasename($path)
+    {
+        return (DIRECTORY_SEPARATOR === "\\" ? str_replace("\\", "/", basename($path)) : basename($path));
+    }
+
+    /**
+     * Fix openbasedir issue when browsing zip content as a normal folder
+     * @param string $dirPath
+     * @return string
+     */
+    public static function patchPathForBaseDir($dirPath)
+    {
+        if (!ini_get("open_basedir") || !preg_match('/\.zip/i', $dirPath)) return $dirPath;
+        return str_replace(".zip", "__ZIP_EXTENSION__", $dirPath);
+
+    }
+
+    /**
+     * Fix openbasedir issue when browsing zip content as a normal folder
+     * @param string $dirPath
+     * @return string
+     */
+    public static function unPatchPathForBaseDir($dirPath)
+    {
+        if (!ini_get("open_basedir")) return $dirPath;
+        return str_replace("__ZIP_EXTENSION__", ".zip", $dirPath);
+    }
+
+
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Utils/Vars/StatHelper.php b/core/src/core/src/pydio/Core/Utils/Vars/StatHelper.php
new file mode 100644
index 0000000000..6e705d4b47
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Utils/Vars/StatHelper.php
@@ -0,0 +1,361 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Utils\Vars;
+
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\LocaleService;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class MimesHelper
+ * Various utils functions for file mimetypes
+ * @package Pydio\Core\Utils
+ */
+class StatHelper
+{
+    public static $sizeUnit;
+
+    /**
+     * @param AJXP_Node $ajxpNode
+     * @param bool|null $isDir
+     * @return array
+     */
+    public static function getMimeInfo($ajxpNode, $isDir = null)
+    {
+        if ($isDir === null) {
+            $isDir = !$ajxpNode->isLeaf();
+        }
+        $fileName = strtolower($ajxpNode->getPath());
+        $registeredExtensions = self::getRegisteredExtensions($ajxpNode->getContext());
+
+        if ($isDir) {
+            $mime = $registeredExtensions["ajxp_folder"];
+        } else {
+            $pos = strrpos($fileName, ".");
+            if ($pos !== false) {
+                $fileExt = substr($fileName, $pos + 1);
+                if (!empty($fileExt) && array_key_exists($fileExt, $registeredExtensions) && $fileExt != "ajxp_folder" && $fileExt != "ajxp_empty") {
+                    $mime = $registeredExtensions[$fileExt];
+                }
+            }
+        }
+        if (!isSet($mime)) {
+            $mime = $registeredExtensions["ajxp_empty"];
+        }
+        return array($mime[3], $mime[1], $mime[2]);
+
+    }
+
+    /**
+     * MISC CONFS
+     */
+    private static $extensionsCache;
+    /**
+     * Get all registered extensions, from both the conf/extensions.conf.php and from the plugins
+     * @static
+     * @param ContextInterface $ctx
+     * @return array
+     */
+    private static function getRegisteredExtensions(ContextInterface $ctx)
+    {
+        if (!is_array(self::$extensionsCache) || !array_key_exists($ctx->getStringIdentifier(), self::$extensionsCache)) {
+            $EXTENSIONS = array();
+            $RESERVED_EXTENSIONS = array();
+            include_once(AJXP_CONF_PATH."/extensions.conf.php");
+            $EXTENSIONS = array_merge($RESERVED_EXTENSIONS, $EXTENSIONS);
+            foreach ($EXTENSIONS as $key => $value) {
+                unset($EXTENSIONS[$key]);
+                $EXTENSIONS[$value[0]] = $value;
+            }
+            $nodes = PluginsService::getInstance($ctx)->searchAllManifests("//extensions/extension", "nodes", true);
+            $res = array();
+            /** @var \DOMElement $node */
+            foreach ($nodes as $node) {
+                $res[$node->getAttribute("mime")] = array(
+                    $node->getAttribute("mime"),
+                    $node->getAttribute("icon"),
+                    $node->getAttribute("font"),
+                    $node->getAttribute("messageId")
+                );
+            }
+            if (count($res)) {
+                $EXTENSIONS = array_merge($EXTENSIONS, $res);
+            }
+            if(!is_array(self::$extensionsCache)){
+                self::$extensionsCache = [];
+            }
+            self::$extensionsCache[$ctx->getStringIdentifier()] = $EXTENSIONS;
+        }
+        return self::$extensionsCache[$ctx->getStringIdentifier()];
+    }
+
+
+    /**
+     * Gather a list of mime that must be treated specially. Used for dynamic replacement in XML mainly.
+     * @static
+     * @param string $keyword "editable", "image", "audio", "zip"
+     * @return string
+     */
+    public static function getAjxpMimes($keyword)
+    {
+        if ($keyword == "editable") {
+            // Gather editors!
+            $pServ = PluginsService::getInstance(Context::emptyContext());
+            $plugs = $pServ->getPluginsByType("editor");
+            //$plugin = new Plugin();
+            $mimes = array();
+            foreach ($plugs as $plugin) {
+                $node = $plugin->getManifestRawContent("/editor/@mimes", "node");
+                $openable = $plugin->getManifestRawContent("/editor/@openable", "node");
+                if ($openable->item(0) && $openable->item(0)->value == "true" && $node->item(0)) {
+                    $mimestring = $node->item(0)->value;
+                    $mimesplit = explode(",", $mimestring);
+                    foreach ($mimesplit as $value) {
+                        $mimes[$value] = $value;
+                    }
+                }
+            }
+            return implode(",", array_values($mimes));
+        } else if ($keyword == "image") {
+            return "png,bmp,jpg,jpeg,gif";
+        } else if ($keyword == "audio") {
+            return "mp3";
+        } else if ($keyword == "zip") {
+            if (ConfService::zipBrowsingEnabled()) {
+                return "zip,ajxp_browsable_archive";
+            } else {
+                return "none_allowed";
+            }
+        }
+        return "";
+    }
+
+    /**
+     * Whether a file is to be considered as an image or not
+     * @static
+     * @param $fileName
+     * @return bool
+     */
+    public static function basenameIsImage($fileName)
+    {
+        return (preg_match("/\.png$|\.bmp$|\.jpg$|\.jpeg$|\.gif$/i", $fileName) ? true : false);
+    }
+
+    /**
+     * Static image mime type headers
+     * @static
+     * @param $fileName
+     * @return string
+     */
+    public static function getImageMimeType($fileName)
+    {
+        if (preg_match("/\.jpg$|\.jpeg$/i", $fileName)) {
+            return "image/jpeg";
+        } else if (preg_match("/\.png$/i", $fileName)) {
+            return "image/png";
+        } else if (preg_match("/\.bmp$/i", $fileName)) {
+            return "image/bmp";
+        } else if (preg_match("/\.gif$/i", $fileName)) {
+            return "image/gif";
+        }
+        return "";
+    }
+
+    /**
+     * Headers to send when streaming
+     * @static
+     * @param $fileName
+     * @return bool|string
+     */
+    public static function getStreamingMimeType($fileName)
+    {
+        if (preg_match("/\.mp3$/i", $fileName)) {
+            return "audio/mp3";
+        } else if (preg_match("/\.wav$/i", $fileName)) {
+            return "audio/wav";
+        } else if (preg_match("/\.aac$/i", $fileName)) {
+            return "audio/aac";
+        } else if (preg_match("/\.m4a$/i", $fileName)) {
+            return "audio/m4a";
+        } else if (preg_match("/\.aiff$/i", $fileName)) {
+            return "audio/aiff";
+        } else if (preg_match("/\.mp4$/i", $fileName)) {
+            return "video/mp4";
+        } else if (preg_match("/\.mov$/i", $fileName)) {
+            return "video/quicktime";
+        } else if (preg_match("/\.m4v$/i", $fileName)) {
+            return "video/x-m4v";
+        } else if (preg_match("/\.3gp$/i", $fileName)) {
+            return "video/3gpp";
+        } else if (preg_match("/\.3g2$/i", $fileName)) {
+            return "video/3gpp2";
+        } else return false;
+    }
+
+    /**
+     * Display a human readable string for a bytesize (1MB, 2,3Go, etc)
+     * @static
+     * @param $filesize
+     * @param bool $phpConfig
+     * @return string
+     */
+    public static function roundSize($filesize, $phpConfig = false)
+    {
+        if (self::$sizeUnit == null) {
+            $mess = LocaleService::getMessages();
+            self::$sizeUnit = $mess["byte_unit_symbol"];
+        }
+        if ($filesize < 0) {
+            $filesize = sprintf("%u", $filesize);
+        }
+        if ($filesize >= 1073741824) {
+            $filesize = round($filesize / 1073741824 * 100) / 100 . ($phpConfig ? "G" : " G" . self::$sizeUnit);
+        } elseif ($filesize >= 1048576) {
+            $filesize = round($filesize / 1048576 * 100) / 100 . ($phpConfig ? "M" : " M" . self::$sizeUnit);
+        } elseif ($filesize >= 1024) {
+            $filesize = round($filesize / 1024 * 100) / 100 . ($phpConfig ? "K" : " K" . self::$sizeUnit);
+        } else {
+            $filesize = $filesize . " " . self::$sizeUnit;
+        }
+        if ($filesize == 0) {
+            $filesize = "-";
+        }
+        return $filesize;
+    }
+
+    /**
+     * Hidden files start with dot
+     * @static
+     * @param string $fileName
+     * @return bool
+     */
+    public static function isHidden($fileName)
+    {
+        return (substr($fileName, 0, 1) == ".");
+    }
+
+    /**
+     * Whether a file is a browsable archive
+     * @static
+     * @param string $fileName
+     * @return int
+     */
+    public static function isBrowsableArchive($fileName)
+    {
+        return preg_match("/\.zip$/i", $fileName);
+    }
+
+    /**
+     * Convert a shorthand byte value from a PHP configuration directive to an integer value
+     * @param    string   $value
+     * @return   int
+     */
+    public static function convertBytes($value)
+    {
+        if (is_numeric($value)) {
+            return intval($value);
+        } else {
+            $value_length = strlen($value);
+            $value = str_replace(",", ".", $value);
+            $qty = floatval(substr($value, 0, $value_length - 1));
+            $unit = strtolower(substr($value, $value_length - 1));
+            switch ($unit) {
+                case 'k':
+                    $qty *= 1024;
+                    break;
+                case 'm':
+                    $qty *= 1048576;
+                    break;
+                case 'g':
+                    $qty *= 1073741824;
+                    break;
+            }
+            return $qty;
+        }
+    }
+
+    /**
+     * Build a relative date string, using pydio messages library
+     * @param $time
+     * @param $messages
+     * @param bool $shortestForm
+     * @return bool|mixed|string
+     */
+    public static function relativeDate($time, $messages, $shortestForm = false)
+    {
+        $crtYear = date('Y');
+        $today = strtotime(date('M j, Y'));
+        $reldays = ($time - $today) / 86400;
+        $relTime = date($messages['date_relative_time_format'], $time);
+
+        if ($reldays >= 0 && $reldays < 1) {
+            return str_replace("TIME", $relTime, $messages['date_relative_today']);
+        } else if ($reldays >= 1 && $reldays < 2) {
+            return str_replace("TIME", $relTime, $messages['date_relative_tomorrow']);
+        } else if ($reldays >= -1 && $reldays < 0) {
+            return str_replace("TIME", $relTime, $messages['date_relative_yesterday']);
+        }
+
+        if (abs($reldays) < 7) {
+
+            if ($reldays > 0) {
+                $reldays = floor($reldays);
+                return str_replace("%s", $reldays, $messages['date_relative_days_ahead']);
+                //return 'In ' . $reldays . ' day' . ($reldays != 1 ? 's' : '');
+            } else {
+                $reldays = abs(floor($reldays));
+                return str_replace("%s", $reldays, $messages['date_relative_days_ago']);
+                //return $reldays . ' day' . ($reldays != 1 ? 's' : '') . ' ago';
+            }
+
+        }
+        $finalDate = date($messages["date_relative_date_format"], $time ? $time : time());
+        if (strpos($messages["date_relative_date_format"], "F") !== false && isSet($messages["date_intl_locale"]) && extension_loaded("intl")) {
+            $intl = \IntlDateFormatter::create($messages["date_intl_locale"], \IntlDateFormatter::FULL, \IntlDateFormatter::FULL, null, null, "MMMM");
+            $localizedMonth = $intl->format($time ? $time : time());
+            $dateFuncMonth = date("F", $time ? $time : time());
+            $finalDate = str_replace($dateFuncMonth, $localizedMonth, $finalDate);
+        }
+        if (!$shortestForm || strpos($finalDate, $crtYear) !== false) {
+            $finalDate = str_replace($crtYear, '', $finalDate);
+            return str_replace("DATE", $finalDate, $messages["date_relative_date"]);
+        } else {
+            return $finalDate = date("M Y", $time ? $time : time());
+        }
+
+    }
+
+    /**
+     * Hide file or folder for Windows OS
+     * @static
+     * @param $file
+     */
+    public static function winSetHidden($file)
+    {
+        @shell_exec("attrib +H " . escapeshellarg($file));
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Utils/Vars/StringHelper.php b/core/src/core/src/pydio/Core/Utils/Vars/StringHelper.php
new file mode 100644
index 0000000000..c58bea851a
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Utils/Vars/StringHelper.php
@@ -0,0 +1,320 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Utils\Vars;
+
+use Pydio\Core\Utils\TextEncoder;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class StringHelper
+ * @package Pydio\Core\Utils
+ */
+class StringHelper
+{
+
+    /**
+     * Performs a natural sort on the array keys.
+     * Behaves the same as ksort() with natural sorting added.
+     *
+     * @param array $array The array to sort
+     * @return boolean
+     */
+    public static function natksort(&$array)
+    {
+        uksort($array, 'strnatcasecmp');
+        return true;
+    }
+
+    /**
+     * Performs a reverse natural sort on the array keys
+     * Behaves the same as krsort() with natural sorting added.
+     *
+     * @param array $array The array to sort
+     * @return boolean
+     */
+    public static function natkrsort(&$array)
+    {
+        StringHelper::natksort($array);
+        $array = array_reverse($array, TRUE);
+        return true;
+    }
+
+    /**
+     * Replace specific chars by their XML Entities, for use inside attributes value
+     * @static
+     * @param $string
+     * @param bool $toUtf8
+     * @return mixed|string
+     */
+    public static function xmlEntities($string, $toUtf8 = false)
+    {
+        $xmlSafe = str_replace(array("&", "<", ">", "\"", "\n", "\r"), array("&amp;", "&lt;", "&gt;", "&quot;", "&#13;", "&#10;"), $string);
+        if ($toUtf8 && TextEncoder::getEncoding() != "UTF-8") {
+            return TextEncoder::toUTF8($xmlSafe);
+        } else {
+            return $xmlSafe;
+        }
+    }
+
+    /**
+     * Replace specific chars by their XML Entities, for use inside attributes value
+     * @static
+     * @param $string
+     * @param bool $toUtf8
+     * @return mixed|string
+     */
+    public static function xmlContentEntities($string, $toUtf8 = false)
+    {
+        $xmlSafe = str_replace(array("&", "<", ">", "\""), array("&amp;", "&lt;", "&gt;", "&quot;"), $string);
+        if ($toUtf8) {
+            return TextEncoder::toUTF8($xmlSafe);
+        } else {
+            return $xmlSafe;
+        }
+    }
+
+    /**
+     * Modifies a string to remove all non ASCII characters and spaces.
+     * @param string $text
+     * @return string
+     */
+    public static function slugify($text)
+    {
+        if (empty($text)) return "";
+        // replace non letter or digits by -
+        $text = preg_replace('~[^\\pL\d]+~u', '-', $text);
+
+        // trim
+        $text = trim($text, '-');
+
+        // transliterate
+        if (function_exists('iconv')) {
+            $text = iconv('utf-8', 'us-ascii//TRANSLIT', $text);
+        }
+
+        // lowercase
+        $text = strtolower($text);
+
+        // remove unwanted characters
+        $text = preg_replace('~[^-\w]+~', '', $text);
+
+        if (empty($text)) {
+            return 'n-a';
+        }
+
+        return $text;
+    }
+
+    /**
+     * Indents a flat JSON string to make it more human-readable.
+     *
+     * @param string $json The original JSON string to process.
+     *
+     * @return string Indented version of the original JSON string.
+     */
+    public static function prettyPrintJSON($json)
+    {
+        $result = '';
+        $pos = 0;
+        $strLen = strlen($json);
+        $indentStr = '  ';
+        $newLine = "\n";
+        $prevChar = '';
+        $outOfQuotes = true;
+
+        for ($i = 0; $i <= $strLen; $i++) {
+
+            // Grab the next character in the string.
+            $char = substr($json, $i, 1);
+
+            // Are we inside a quoted string?
+            if ($char == '"' && $prevChar != '\\') {
+                $outOfQuotes = !$outOfQuotes;
+
+                // If this character is the end of an element,
+                // output a new line and indent the next line.
+            } else if (($char == '}' || $char == ']') && $outOfQuotes) {
+                $result .= $newLine;
+                $pos--;
+                for ($j = 0; $j < $pos; $j++) {
+                    $result .= $indentStr;
+                }
+            }
+
+            // Add the character to the result string.
+            $result .= $char;
+
+            // If the last character was the beginning of an element,
+            // output a new line and indent the next line.
+            if (($char == ',' || $char == '{' || $char == '[') && $outOfQuotes) {
+                $result .= $newLine;
+                if ($char == '{' || $char == '[') {
+                    $pos++;
+                }
+
+                for ($j = 0; $j < $pos; $j++) {
+                    $result .= $indentStr;
+                }
+            }
+
+            $prevChar = $char;
+        }
+
+        return $result;
+    }
+
+    /**
+     * generates a random password, uses base64: 0-9a-zA-Z
+     * @param int [optional] $length length of password, default 24 (144 Bit)
+     * @param bool $complexChars
+     * @return string password
+     */
+    public static function generateRandomString($length = 24, $complexChars = false)
+    {
+        if (function_exists('openssl_random_pseudo_bytes') && USE_OPENSSL_RANDOM && !$complexChars) {
+            $password = base64_encode(openssl_random_pseudo_bytes($length, $strong));
+            if ($strong == TRUE)
+                return substr(str_replace(array("/", "+", "="), "", $password), 0, $length); //base64 is about 33% longer, so we need to truncate the result
+        }
+
+        //fallback to mt_rand if php < 5.3 or no openssl available
+        $characters = '0123456789';
+        $characters .= 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+        if ($complexChars) {
+            $characters .= "!@#$%&*?";
+        }
+        $charactersLength = strlen($characters) - 1;
+        $password = '';
+
+        //select some random characters
+        for ($i = 0; $i < $length; $i++) {
+            $password .= $characters[mt_rand(0, $charactersLength)];
+        }
+
+        return $password;
+    }
+
+    /**
+     * @param $regexp
+     * @return string
+     */
+    public static function regexpToLike($regexp)
+    {
+        $regexp = trim($regexp, '/');
+        $left = "~";
+        $right = "~";
+        if ($regexp[0] == "^") {
+            $left = "";
+        }
+        if ($regexp[strlen($regexp) - 1] == "$") {
+            $right = "";
+        }
+        if ($left == "" && $right == "") {
+            return "= %s";
+        }
+        return "LIKE %" . $left . "like" . $right;
+    }
+
+    /**
+     * @param $regexp
+     * @return string
+     */
+    public static function cleanRegexp($regexp)
+    {
+        $regexp = str_replace("\/", "/", trim($regexp, '/'));
+        return ltrim(rtrim($regexp, "$"), "^");
+    }
+
+    /**
+     * @param $regexp
+     * @return string
+     */
+    public static function likeToLike($regexp)
+    {
+        $left = "";
+        $right = "";
+        if ($regexp[0] == "%") {
+            $left = "~";
+        }
+        if ($regexp[strlen($regexp) - 1] == "%") {
+            $right = "~";
+        }
+        if ($left == "" && $right == "") {
+            return "= %s";
+        }
+        return "LIKE %" . $left . "like" . $right;
+    }
+
+    /**
+     * @param $regexp
+     * @return string
+     */
+    public static function cleanLike($regexp)
+    {
+        return ltrim(rtrim($regexp, "%"), "%");
+    }
+
+    /**
+     * @param $regexp
+     * @return null|string
+     */
+    public static function regexpToLdap($regexp)
+    {
+        if (empty($regexp))
+            return null;
+
+        $left = "*";
+        $right = "*";
+        if ($regexp[0] == "^") {
+            $regexp = ltrim($regexp, "^");
+            $left = "";
+        }
+        if ($regexp[strlen($regexp) - 1] == "$") {
+            $regexp = rtrim($regexp, "$");
+            $right = "";
+        }
+        return $left . $regexp . $right;
+    }
+
+    /**
+     * Create a unique UID
+     * @return string
+     */
+    public static function createGUID()
+    {
+        if (function_exists('com_create_guid')) {
+            return com_create_guid();
+        } else {
+            mt_srand((double)microtime() * 10000);//optional for php 4.2.0 and up.
+            $charid = strtoupper(md5(uniqid(rand(), true)));
+            $hyphen = chr(45);// "-"
+            $uuid = ""//chr(123)// "{"
+                . substr($charid, 0, 8) . $hyphen
+                . substr($charid, 8, 4) . $hyphen
+                . substr($charid, 12, 4) . $hyphen
+                . substr($charid, 16, 4) . $hyphen
+                . substr($charid, 20, 12);
+            //.chr(125);// "}"
+            return $uuid;
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Utils/Vars/UrlUtils.php b/core/src/core/src/pydio/Core/Utils/Vars/UrlUtils.php
new file mode 100644
index 0000000000..6a1b8c836d
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Utils/Vars/UrlUtils.php
@@ -0,0 +1,44 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Utils\Vars;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Various Helpers for URL and Path parsing
+ * @package Pydio\Core\Utils
+ */
+class UrlUtils
+{
+
+    /**
+     * Parse URL ignoring # and ?
+     * @param $path
+     * @return array
+     */
+    public static function safeParseUrl($path)
+    {
+        $parts = parse_url(str_replace(array("#", "?"), array("__AJXP_FRAGMENT__", "__AJXP_MARK__"), $path));
+        $parts["path"] = str_replace(array("__AJXP_FRAGMENT__", "__AJXP_MARK__"), array("#", "?"), $parts["path"]);
+        return $parts;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Core/Utils/Vars/VarsFilter.php b/core/src/core/src/pydio/Core/Utils/Vars/VarsFilter.php
new file mode 100644
index 0000000000..974e457a27
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Utils/Vars/VarsFilter.php
@@ -0,0 +1,116 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Utils\Vars;
+
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services;
+
+
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\UsersService;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Standard values filtering used in the core.
+ * @static
+ * @package Pydio
+ * @subpackage Core
+ */
+class VarsFilter
+{
+    /**
+     * Filter the very basic keywords from the XML  : AJXP_USER, AJXP_INSTALL_PATH, AJXP_DATA_PATH
+     * Calls the vars.filter hooks.
+     * @static
+     * @param mixed $value
+     * @param ContextInterface $ctx
+     * @return mixed|string
+     * @throws PydioException
+     */
+    public static function filter($value, ContextInterface $ctx)
+    {
+        if (is_string($value) && strpos($value, "AJXP_USER")!==false) {
+            if (UsersService::usersEnabled()) {
+                if(!$ctx->hasUser()){
+                    throw new PydioException("Cannot resolve AJXP_USER without user passed in context");
+                }
+                $value = str_replace("AJXP_USER", $ctx->getUser()->getId(), $value);
+            } else {
+                $value = str_replace("AJXP_USER", "shared", $value);
+            }
+        }
+        if (is_string($value) && strpos($value, "AJXP_GROUP_PATH")!==false) {
+            if (UsersService::usersEnabled()) {
+                if(!$ctx->hasUser()){
+                    throw new PydioException("Cannot resolve path AJXP_GROUP_PATH without user passed in context");
+                }
+                $gPath = $ctx->getUser()->getGroupPath();
+                $value = str_replace("AJXP_GROUP_PATH_FLAT", str_replace("/", "_", trim($gPath, "/")), $value);
+                $value = str_replace("AJXP_GROUP_PATH", $gPath, $value);
+            } else {
+                $value = str_replace(array("AJXP_GROUP_PATH", "AJXP_GROUP_PATH_FLAT"), "shared", $value);
+            }
+        }
+        if (is_string($value) && strpos($value, "AJXP_INSTALL_PATH") !== false) {
+            $value = str_replace("AJXP_INSTALL_PATH", AJXP_INSTALL_PATH, $value);
+        }
+        if (is_string($value) && strpos($value, "AJXP_DATA_PATH") !== false) {
+            $value = str_replace("AJXP_DATA_PATH", AJXP_DATA_PATH, $value);
+        }
+        if (is_string($value) && strstr($value, "AJXP_WORKSPACE_UUID") !== false) {
+            $value = rtrim(str_replace("AJXP_WORKSPACE_UUID", $ctx->getRepository()->getUniqueId(), $value), "/");
+        }
+        if (is_string($value) && strstr($value, "AJXP_WORKSPACE_SLUG") !== false) {
+            $value = rtrim(str_replace("AJXP_WORKSPACE_SLUG", $ctx->getRepository()->getSlug(), $value), "/");
+        }
+        if(is_string($value) && preg_match("/AJXP_PARENT_OPTION:([\w_-]*):/", $value, $matches)){
+            $repoObject = $ctx->getRepository();
+            $parentRepository = $repoObject->getParentRepository();
+            if(empty($parentRepository)){
+                throw new PydioException("Cannot resolve ".$matches[0]." without parent workspace");
+            }
+            $parentOwner = $ctx->getRepository()->getOwner();
+            $parentContext = Context::contextWithObjects(null, $parentRepository);
+            $parentContext->setUserId($parentOwner);
+            $parentPath = rtrim($parentRepository->getContextOption($parentContext, $matches[1]), "/");
+            $value = str_replace($matches[0], $parentPath, $value);
+        }
+
+        $tab = array(&$value, $ctx);
+        Controller::applyIncludeHook("vars.filter", $tab);
+        return $value;
+    }
+
+    /**
+     * @param $array
+     */
+    public static function filterI18nStrings(&$array){
+        if(!is_array($array)) return;
+        $appTitle = ConfService::getGlobalConf("APPLICATION_TITLE");
+        foreach($array as &$value){
+            $value = str_replace("APPLICATION_TITLE", $appTitle, $value);
+        }
+    }
+}
diff --git a/core/src/core/src/pydio/Core/Utils/Vars/XMLFilter.php b/core/src/core/src/pydio/Core/Utils/Vars/XMLFilter.php
new file mode 100644
index 0000000000..6c9ca1f13c
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Utils/Vars/XMLFilter.php
@@ -0,0 +1,111 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Core\Utils\Vars;
+
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\IAjxpWrapperProvider;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Serializer\NodeXML;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\StatHelper;
+use Pydio\Core\Utils\Vars\StringHelper;
+use Pydio\Core\Services;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Utils\XMLHelper;
+
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Filters XML data with pydio specific keywords
+ * @package Pydio
+ * @subpackage Core
+ */
+class XMLFilter
+{
+    
+    /**
+     * Dynamically replace XML keywords with their live values.
+     * AJXP_SERVER_ACCESS, AJXP_MIMES_*,AJXP_ALL_MESSAGES, etc.
+     * @static
+     * @param string $xml
+     * @param bool $stripSpaces
+     * @return mixed
+     */
+    public static function resolveKeywords($xml, $stripSpaces = false)
+    {
+        $messages = LocaleService::getMessages();
+        $confMessages = LocaleService::getConfigMessages();
+        $matches = array();
+        $xml = str_replace("AJXP_APPLICATION_TITLE", ConfService::getGlobalConf("APPLICATION_TITLE"), $xml);
+        $xml = str_replace("AJXP_MIMES_EDITABLE", StatHelper::getAjxpMimes("editable"), $xml);
+        $xml = str_replace("AJXP_MIMES_IMAGE", StatHelper::getAjxpMimes("image"), $xml);
+        $xml = str_replace("AJXP_MIMES_AUDIO", StatHelper::getAjxpMimes("audio"), $xml);
+        $xml = str_replace("AJXP_MIMES_ZIP", StatHelper::getAjxpMimes("zip"), $xml);
+        $authDriver = ConfService::getAuthDriverImpl();
+        if ($authDriver != NULL) {
+            $loginRedirect = $authDriver->getLoginRedirect();
+            $xml = str_replace("AJXP_LOGIN_REDIRECT", ($loginRedirect!==false?"'".$loginRedirect."'":"false"), $xml);
+        }
+        $xml = str_replace("AJXP_REMOTE_AUTH", "false", $xml);
+        $xml = str_replace("AJXP_NOT_REMOTE_AUTH", "true", $xml);
+        $xml = str_replace("AJXP_ALL_MESSAGES", "MessageHash=".json_encode(LocaleService::getMessages()).";", $xml);
+
+        if (preg_match_all("/AJXP_MESSAGE(\[.*?\])/", $xml, $matches, PREG_SET_ORDER)) {
+            foreach ($matches as $match) {
+                $messId = str_replace("]", "", str_replace("[", "", $match[1]));
+                $xml = str_replace("AJXP_MESSAGE[$messId]", $messages[$messId], $xml);
+            }
+        }
+        if (preg_match_all("/CONF_MESSAGE(\[.*?\])/", $xml, $matches, PREG_SET_ORDER)) {
+            foreach ($matches as $match) {
+                $messId = str_replace(array("[", "]"), "", $match[1]);
+                $message = $messId;
+                if (array_key_exists($messId, $confMessages)) {
+                    $message = $confMessages[$messId];
+                }
+                $xml = str_replace("CONF_MESSAGE[$messId]", StringHelper::xmlEntities($message), $xml);
+            }
+        }
+        if (preg_match_all("/MIXIN_MESSAGE(\[.*?\])/", $xml, $matches, PREG_SET_ORDER)) {
+            foreach ($matches as $match) {
+                $messId = str_replace(array("[", "]"), "", $match[1]);
+                $message = $messId;
+                if (array_key_exists($messId, $confMessages)) {
+                    $message = $confMessages[$messId];
+                }
+                $xml = str_replace("MIXIN_MESSAGE[$messId]", StringHelper::xmlEntities($message), $xml);
+            }
+        }
+        if ($stripSpaces) {
+            $xml = preg_replace("/[\n\r]?/", "", $xml);
+            $xml = preg_replace("/\t/", " ", $xml);
+        }
+        $xml = str_replace(array('xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"','xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd"'), "", $xml);
+        $tab = array(&$xml);
+        Controller::applyIncludeHook("xml.filter", $tab);
+        return $xml;
+    }
+    
+}
diff --git a/core/src/core/src/pydio/Core/Utils/XMLHelper.php b/core/src/core/src/pydio/Core/Utils/XMLHelper.php
new file mode 100644
index 0000000000..c13fe327c1
--- /dev/null
+++ b/core/src/core/src/pydio/Core/Utils/XMLHelper.php
@@ -0,0 +1,183 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Core\Utils;
+
+use Pydio\Core\Utils\Vars\XMLFilter;
+use Pydio\Core\Utils\Vars\StringHelper;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Static methods to help handling XML
+ * @package Pydio\Core\Utils
+ */
+class XMLHelper
+{
+    /**
+     * @var bool|string
+     */
+    private static $headerSent = false;
+
+    /**
+     * Simple XML element build from associative array. Can pass specific $children for nested elements.
+     * @param string $tagName
+     * @param array $attributes
+     * @param string $xmlChildren
+     * @return string
+     */
+    public static function toXmlElement($tagName, $attributes, $xmlChildren = "")
+    {
+        $buffer = "<$tagName ";
+        foreach ($attributes as $attName => $attValue) {
+            $buffer .= "$attName=\"" . StringHelper::xmlEntities($attValue) . "\" ";
+        }
+        if (!strlen($xmlChildren)) {
+            $buffer .= "/>";
+        } else {
+            $buffer .= ">" . $xmlChildren . "</$tagName>";
+        }
+        return $buffer;
+    }
+
+    /**
+     * Create plain PHP associative array from XML.
+     *
+     * Example usage:
+     *   $xmlNode = simplexml_load_file('example.xml');
+     *   $arrayData = xmlToArray($xmlNode);
+     *   echo json_encode($arrayData);
+     *
+     * @param \DOMNode $domXml The dom node to load
+     * @param array $options Associative array of options
+     * @return array
+     * @link http://outlandishideas.co.uk/blog/2012/08/xml-to-json/ More info
+     * @author Tamlyn Rhodes <http://tamlyn.org>
+     * @license http://creativecommons.org/publicdomain/mark/1.0/ Public Domain
+     */
+    public static function xmlToArray($domXml, $options = array())
+    {
+        $xml = simplexml_import_dom($domXml);
+        $defaults = array(
+            'namespaceSeparator' => ':',//you may want this to be something other than a colon
+            'attributePrefix' => '@',   //to distinguish between attributes and nodes with the same name
+            'alwaysArray' => array(),   //array of xml tag names which should always become arrays
+            'autoArray' => true,        //only create arrays for tags which appear more than once
+            'textContent' => '$',       //key used for the text content of elements
+            'autoText' => true,         //skip textContent key if node has no attributes or child nodes
+            'keySearch' => false,       //optional search and replace on tag and attribute names
+            'keyReplace' => false       //replace values for above search values (as passed to str_replace())
+        );
+        $options = array_merge($defaults, $options);
+        $namespaces = $xml->getDocNamespaces();
+        $namespaces[''] = null; //add base (empty) namespace
+
+        //get attributes from all namespaces
+        $attributesArray = array();
+        foreach ($namespaces as $prefix => $namespace) {
+            foreach ($xml->attributes($namespace) as $attributeName => $attribute) {
+                //replace characters in attribute name
+                if ($options['keySearch']) $attributeName =
+                    str_replace($options['keySearch'], $options['keyReplace'], $attributeName);
+                $attributeKey = $options['attributePrefix']
+                    . ($prefix ? $prefix . $options['namespaceSeparator'] : '')
+                    . $attributeName;
+                $attributesArray[$attributeKey] = (string)$attribute;
+            }
+        }
+
+        //get child nodes from all namespaces
+        $tagsArray = array();
+        foreach ($namespaces as $prefix => $namespace) {
+            foreach ($xml->children($namespace) as $childXml) {
+                //recurse into child nodes
+                $childArray = self::xmlToArray($childXml, $options);
+                list($childTagName, $childProperties) = each($childArray);
+
+                //replace characters in tag name
+                if ($options['keySearch']) $childTagName =
+                    str_replace($options['keySearch'], $options['keyReplace'], $childTagName);
+                //add namespace prefix, if any
+                if ($prefix) $childTagName = $prefix . $options['namespaceSeparator'] . $childTagName;
+
+                if (!isset($tagsArray[$childTagName])) {
+                    //only entry with this key
+                    //test if tags of this type should always be arrays, no matter the element count
+                    $tagsArray[$childTagName] =
+                        in_array($childTagName, $options['alwaysArray']) || !$options['autoArray']
+                            ? array($childProperties) : $childProperties;
+                } elseif (
+                    is_array($tagsArray[$childTagName]) && array_keys($tagsArray[$childTagName])
+                    === range(0, count($tagsArray[$childTagName]) - 1)
+                ) {
+                    //key already exists and is integer indexed array
+                    $tagsArray[$childTagName][] = $childProperties;
+                } else {
+                    //key exists so convert to integer indexed array with previous value in position 0
+                    $tagsArray[$childTagName] = array($tagsArray[$childTagName], $childProperties);
+                }
+            }
+        }
+
+        //get text content of node
+        $textContentArray = array();
+        $plainText = trim((string)$xml);
+        if ($plainText !== '') $textContentArray[$options['textContent']] = $plainText;
+
+        //stick it all together
+        $propertiesArray = !$options['autoText'] || $attributesArray || $tagsArray || ($plainText === '')
+            ? array_merge($attributesArray, $tagsArray, $textContentArray) : $plainText;
+
+        //return node as array
+        return array(
+            $xml->getName() => $propertiesArray
+        );
+    }
+
+    /**
+     * Wrap xml inside a <tree>...</tree> document, including <?xml> declaration.
+     * @param $content
+     * @param string $docNode
+     * @param array $attributes
+     * @return string
+     */
+    public static function wrapDocument($content, $docNode = "tree", $attributes = array())
+    {
+
+        if (self::$headerSent !== false && self::$headerSent == $docNode) {
+            return $content;
+        }
+        //header('Content-Type: text/xml; charset=UTF-8');
+        //header('Cache-Control: no-cache');
+        $buffer = '<?xml version="1.0" encoding="UTF-8"?>';
+        $attString = "";
+        if (count($attributes)) {
+            foreach ($attributes as $name => $value) {
+                $attString .= "$name=\"$value\" ";
+            }
+        }
+        self::$headerSent = $docNode;
+        $buffer .= "<$docNode $attString>";
+        $buffer .= $content;
+        $buffer .= "</$docNode>";
+        return $buffer;
+
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Tests/AbstractTest.php b/core/src/core/src/pydio/Tests/AbstractTest.php
new file mode 100644
index 0000000000..52404e3965
--- /dev/null
+++ b/core/src/core/src/pydio/Tests/AbstractTest.php
@@ -0,0 +1,110 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tests;
+
+use Pydio\Access\Core\Model\Repository;
+use Pydio\Core\Model\RepositoryInterface;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+global $MAIN_testsArray;
+/**
+ * Abstract test class
+ * Abstract class for diagnostic tests. These tests are run at the first application start up, and their
+ * results are displayed in the Diagnostic page. It's possible to re-run the full diagnostic by calling
+ * the runTests.php script (first line needs to be commented first).
+ * @package Pydio
+ * @subpackage Core
+ */
+abstract class AbstractTest
+{
+    /** The test name */
+    public $name;
+    /** The test information when failed */
+    public $failedInfo;
+    /** The test results output (used for report) */
+    public $resultOutput;
+    /** Tested params - When used as a diagnostic tool, can store variables used by the test*/
+    public $testedParas;
+    /** The test level when failed (warning, info or error, default to error) */
+    public $failedLevel;
+    /** The test parameters */
+    public $params;
+
+    /**
+     * AbstractTest constructor.
+     * @param $name
+     * @param $failedInfo
+     * @param null $params
+     */
+    public function __construct($name, $failedInfo, $params = NULL)
+    {
+        $this->name = $name;
+        $this->failedInfo = $failedInfo;
+        $this->params = $params;
+        $this->failedLevel = "error";
+        $this->testedParams = array();
+        global $MAIN_testsArray;
+        $MAIN_testsArray[] = $this;
+    }
+
+    /**
+     * Perform the test, should be overwritten in concrete classes
+     * @abstract
+     * @return Boolean
+     */
+    public function doTest() { return FALSE; }
+
+    /**
+     * Perform the test on a given repository object, should be overwritten in concrete classes
+     * @param Repository|RepositoryInterface $repository
+     * @return Boolean
+     */
+    public function doRepositoryTest($repository) { return FALSE; }
+
+    /**
+     * Utilitary to convert php config to numerical values.
+     *
+     * @param String $val
+     * @return Integer
+     */
+    public function returnBytes($val)
+    {
+        $val = trim($val);
+        $last = strtolower($val[strlen($val)-1]);
+        switch ($last) {
+            // Le modifieur 'G' est disponible depuis PHP 5.1.0
+            case 'g':
+                $val *= 1024 * 1024 * 1024;
+                break;
+            case 'm':
+                $val *= 1024 * 1024;
+                break;
+            case 'k':
+                $val *= 1024;
+                break;
+            default:
+                break;
+        }
+
+        return $val;
+    }
+};
diff --git a/core/src/core/src/pydio/Tests/Client.php b/core/src/core/src/pydio/Tests/Client.php
new file mode 100644
index 0000000000..0946a58e37
--- /dev/null
+++ b/core/src/core/src/pydio/Tests/Client.php
@@ -0,0 +1,46 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tests;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Class Client
+ * Display Client Browser User Agent
+ * @package Pydio\Tests
+ */
+class Client extends AbstractTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function __construct() { parent::__construct("Client Browser", "Current client ".$_SERVER['HTTP_USER_AGENT']); }
+
+    /**
+     * @inheritdoc
+     */
+    public function doTest()
+    {
+        $this->testedParams["Client"] = $_SERVER['HTTP_USER_AGENT'];
+        $this->failedLevel = "info";
+        return FALSE;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Tests/PHPCLI.php b/core/src/core/src/pydio/Tests/PHPCLI.php
new file mode 100644
index 0000000000..76adf2a7a7
--- /dev/null
+++ b/core/src/core/src/pydio/Tests/PHPCLI.php
@@ -0,0 +1,147 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tests;
+
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Controller\UnixProcess;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Check current PHP Version
+ * @package AjaXplorer
+ * @subpackage Tests
+ */
+class PHPCLI extends AbstractTest
+{
+    /**
+     * PHPCLI constructor.
+     */
+    public function __construct() { parent::__construct("PHP Command Line", "Testing PHP command line (default is php)"); }
+
+    /**
+     * @return bool
+     */
+    public function doTest()
+    {
+        if (!is_writable(AJXP_CACHE_DIR)) {
+            $this->testedParams["Command Line Available"] = "No";
+            $this->failedLevel = "warning";
+            $this->failedInfo = "Php command line not detected (cache directory not writeable), this is NOT BLOCKING, but enabling it could allow to send some long tasks in background. If you do not have the ability to tweak your server, you can safely ignore this warning.";
+            return FALSE;
+        }
+        $windows = (PHP_OS == "WIN32" || PHP_OS == "WINNT" || PHP_OS == "Windows");
+
+        $sModeExecDir = ini_get("safe_mode_exec_dir") ;
+        $safeEnabled = ini_get("safe_mode") || !empty($sModeExecDir);
+
+        $disabled_functions=explode(',',ini_get('disable_functions'));
+        $fName = ($windows ? "popen" : "exec");
+        $notFoundFunction = in_array($fName, $disabled_functions) || !function_exists($fName) || !is_callable($fName);
+
+        $comEnabled = class_exists("COM");
+        $useCOM = false;
+
+        if ( ( $safeEnabled ||  $notFoundFunction )) {
+            if ($comEnabled) {
+                $useCOM = true;
+            } else {
+                $this->testedParams["Command Line Available"] = "No";
+                $this->failedLevel = "warning";
+                $this->failedInfo = "Php command line not detected (there seem to be some safe_mode or a-like restriction), this is NOT BLOCKING, but enabling it could allow to send some long tasks in background. If you do not have the ability to tweak your server, you can safely ignore this warning.";
+                return FALSE;
+            }
+        }
+
+        $defaultCli = ConfService::getGlobalConf("CLI_PHP");
+        if($defaultCli == null) $defaultCli = "php";
+
+        $token = md5(time());
+        $robustCacheDir = str_replace("/", DIRECTORY_SEPARATOR, AJXP_CACHE_DIR);
+        $logDir = $robustCacheDir.DIRECTORY_SEPARATOR."cmd_outputs";
+        if(!is_dir($logDir)) mkdir($logDir, 0755);
+        $logFile = $logDir."/".$token.".out";
+
+        $testScript = AJXP_CACHE_DIR."/cli_test.php";
+        file_put_contents($testScript, "<?php file_put_contents('".$robustCacheDir.DIRECTORY_SEPARATOR."cli_result.php', 'cli'); ?>");
+
+        $cmd = $defaultCli." ". $robustCacheDir .DIRECTORY_SEPARATOR."cli_test.php";
+
+        if ($windows) {
+            /* Next 2 lines modified by rmeske: Need to wrap the folder and file paths in double quotes.  */
+            $cmd = $defaultCli." ". chr(34).$robustCacheDir .DIRECTORY_SEPARATOR."cli_test.php".chr(34);
+            $cmd .= " > ".chr(34).$logFile.chr(34);
+
+            $comCommand = $cmd;
+            if ($useCOM) {
+                $WshShell   = new \COM("WScript.Shell");
+                $res = $WshShell->Run("cmd /C $comCommand", 0, false);
+            } else {
+                $tmpBat = implode(DIRECTORY_SEPARATOR, array(str_replace("/", DIRECTORY_SEPARATOR, AJXP_INSTALL_PATH), "data","tmp", md5(time()).".bat"));
+                $cmd .= "\n DEL ".chr(34).$tmpBat.chr(34);
+                file_put_contents($tmpBat, $cmd);
+                /* Following 1 line modified by rmeske: The windows Start command identifies the first parameter in quotes as a title for the window.  Therefore, when enclosing a command with double quotes you must include a window title first
+                START	["title"] [/Dpath] [/I] [/MIN] [/MAX] [/SEPARATE | /SHARED] [/LOW | /NORMAL | /HIGH | /REALTIME] [/WAIT] [/B] [command / program] [parameters]
+                */
+                @pclose(@popen('start /b "CLI" "'.$tmpBat.'"', 'r'));
+                sleep(1);
+                // Failed, but we can try with COM
+                if ( ! is_file(AJXP_CACHE_DIR."/cli_result.php") && $comEnabled ) {
+                    $useCOM = true;
+                    $WshShell   = new \COM("WScript.Shell");
+                    $res = $WshShell->Run("cmd /C $comCommand", 0, false);
+                }
+            }
+        } else {
+            new UnixProcess($cmd, $logFile);
+        }
+
+        sleep(1);
+        $availability = true;
+        if (is_file(AJXP_CACHE_DIR."/cli_result.php")) {
+            $this->testedParams["Command Line Available"] = "Yes";
+            unlink(AJXP_CACHE_DIR."/cli_result.php");
+            if ($useCOM) {
+                $this->failedLevel = "warning";
+                $availability = true;
+                $this->failedInfo = "Php command line detected, but using the windows COM extension. Just make sure to <b>enable COM</b> in the Pydio Core Options";
+            } else {
+                $this->failedInfo = "Php command line detected, this will allow to send some tasks in background. Enable it in the Pydio Core Options";
+            }
+        } else {
+            $log = "";
+            if (is_file($logFile)) {
+                $log = file_get_contents($logFile);
+                unlink($logFile);
+            }
+            $this->testedParams["Command Line Available"] = "No : $log";
+            $this->failedLevel = "warning";
+            $this->failedInfo = "Php command line not detected, this is NOT BLOCKING, but enabling it could allow to send some long tasks in background. If you do not have the ability to tweak your server, you can safely ignore this warning.";
+            if ($windows) {
+                $this->failedInfo .= "<br> On Windows, try to activate the php COM extension, and set correct rights to the cmd exectuble to make it runnable by the web server, this should solve the problem.";
+            }
+            $availability = false;
+        }
+        unlink(AJXP_CACHE_DIR."/cli_test.php");
+
+        return $availability;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Tests/PHPDomXML.php b/core/src/core/src/pydio/Tests/PHPDomXML.php
new file mode 100644
index 0000000000..568791f31f
--- /dev/null
+++ b/core/src/core/src/pydio/Tests/PHPDomXML.php
@@ -0,0 +1,50 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tests;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Check that DOMXml is enabled
+ * @package Pydio\Tests
+ */
+class PHPDomXML extends AbstractTest
+{
+
+    /**
+     * @inheritdoc
+     */
+    public function __construct() { parent::__construct("DOM Xml enabled", "Dom XML is required, you may have to install the php-xml extension."); }
+
+    /**
+     * @inheritdoc
+     */
+    public function doTest()
+    {
+        $this->failedLevel = "error";
+        if (!class_exists("DOMDocument")) {
+            $this->testedParams["DOM Enabled"] = "No";
+            return FALSE;
+        }
+        $this->testedParams["DOM Enabled"] = "Yes";
+        return TRUE;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Tests/PHPErrorLevel.php b/core/src/core/src/pydio/Tests/PHPErrorLevel.php
new file mode 100644
index 0000000000..1ed8cf0bb8
--- /dev/null
+++ b/core/src/core/src/pydio/Tests/PHPErrorLevel.php
@@ -0,0 +1,73 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tests;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Check current php error level
+ * @package Pydio\Tests
+ */
+class PHPErrorLevel extends AbstractTest
+{
+
+    /**
+     * @inheritdoc
+     */
+    public function __construct() { parent::__construct("PHP error level", PHPErrorLevel::error2string(error_reporting())); }
+
+    /**
+     * @inheritdoc
+     */
+    public function doTest()
+    {
+        if (error_reporting() & E_NOTICE) {
+            $this->failedLevel = "error";
+            $this->failedInfo = "You must lower your PHP error level in php.ini NOT TO INCLUDE E_NOTICE (you have:".$this->failedInfo.")";
+            return false;
+        }
+        $this->failedLevel = "info";
+        return FALSE;
+    }
+    
+    /**
+     * @inheritdoc
+     */
+    public function error2string($value)
+    {
+        $level_names = array(
+            E_ERROR => 'E_ERROR', E_WARNING => 'E_WARNING',
+            E_PARSE => 'E_PARSE', E_NOTICE => 'E_NOTICE',
+            E_CORE_ERROR => 'E_CORE_ERROR', E_CORE_WARNING => 'E_CORE_WARNING',
+            E_COMPILE_ERROR => 'E_COMPILE_ERROR', E_COMPILE_WARNING => 'E_COMPILE_WARNING',
+            E_USER_ERROR => 'E_USER_ERROR', E_USER_WARNING => 'E_USER_WARNING',
+            E_USER_NOTICE => 'E_USER_NOTICE' );
+        if(defined('E_STRICT')) $level_names[E_STRICT]='E_STRICT';
+        $levels=array();
+        if (($value&E_ALL)==E_ALL) {
+            $levels[]='E_ALL';
+            $value&=~E_ALL;
+        }
+        foreach($level_names as $level=>$name)
+            if(($value&$level)==$level) $levels[]=$name;
+        return implode(' | ',$levels);
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Tests/PHPExif.php b/core/src/core/src/pydio/Tests/PHPExif.php
new file mode 100644
index 0000000000..52de193452
--- /dev/null
+++ b/core/src/core/src/pydio/Tests/PHPExif.php
@@ -0,0 +1,52 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tests;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Check that Exif extension is enabled
+ * @package Pydio\Tests
+ */
+class PHPExif extends AbstractTest
+{
+
+    /**
+     * @inheritdoc
+     */
+    public function __construct() {
+        parent::__construct("Exif Extension enabled", "Installing php-exif extension is recommended if you plan to handle images");
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function doTest()
+    {
+        $this->failedLevel = "warning";
+        if (!function_exists("exif_read_data")) {
+            $this->testedParams["Exif Enabled"] = "No";
+            return FALSE;
+        }
+        $this->testedParams["Exif Enabled"] = "Yes";
+        return TRUE;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Tests/PHPGDVersion.php b/core/src/core/src/pydio/Tests/PHPGDVersion.php
new file mode 100644
index 0000000000..b2a35fff13
--- /dev/null
+++ b/core/src/core/src/pydio/Tests/PHPGDVersion.php
@@ -0,0 +1,50 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tests;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Check whether GD is installed or not
+ * @package Pydio\Tests
+ */
+class PHPGDVersion extends AbstractTest
+{
+
+    /**
+     * @inheritdoc
+     */
+    public function __construct() { parent::__construct("PHP GD version", "GD is required for generating thumbnails"); }
+
+    /**
+     * @inheritdoc
+     */
+    public function doTest()
+    {
+        $this->failedLevel = "warning";
+        if (!function_exists("gd_info") || !function_exists("imagecopyresized") || !function_exists("imagecopyresampled")) {
+            $this->testedParams["GD Enabled"] = "No";
+            return FALSE;
+        }
+        $this->testedParams["GD Enabled"] = "Yes";
+        return TRUE;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Tests/PHPLimits.php b/core/src/core/src/pydio/Tests/PHPLimits.php
new file mode 100644
index 0000000000..2fa1dc53d1
--- /dev/null
+++ b/core/src/core/src/pydio/Tests/PHPLimits.php
@@ -0,0 +1,54 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tests;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Gather various php configurations that will limit the application
+ * @package Pydio\Tests
+ */
+class PHPLimits extends AbstractTest
+{
+
+    /**
+     * @inheritdoc
+     */
+    public function __construct() { parent::__construct("PHP Limits variables", "<b>Testing configs</b>"); }
+
+    /**
+     * @inheritdoc
+     */
+    public function doTest()
+    {
+        $this->testedParams["Upload Max Size"] = ini_get("upload_max_filesize");
+        $this->testedParams["Memory Limit"] = ((ini_get("memory_limit")!="")?ini_get("memory_limit"):get_cfg_var("memory_limit"));
+        $this->testedParams["Max execution time"] = ini_get("max_execution_time");
+        $this->testedParams["Safe Mode"] = (ini_get("safe_mode")?"1":"0");
+        $this->testedParams["Safe Mode GID"] = (ini_get("safe_mode_gid")?"1":"0");
+        $this->testedParams["Xml parser enabled"] = (function_exists("xml_parser_create")?"1":"0");
+        foreach ($this->testedParams as $paramName => $paramValue) {
+            $this->failedInfo .= "\n$paramName=$paramValue";
+        }
+        $this->failedLevel = "info";
+        return FALSE;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Tests/PHPMCrypt.php b/core/src/core/src/pydio/Tests/PHPMCrypt.php
new file mode 100644
index 0000000000..b6d7eb5a4c
--- /dev/null
+++ b/core/src/core/src/pydio/Tests/PHPMCrypt.php
@@ -0,0 +1,50 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tests;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Check whether mcrypt is enabled
+ * @package Pydio\Tests
+ */
+class PHPMCrypt extends AbstractTest
+{
+
+    /**
+     * @inheritdoc
+     */
+    public function __construct() { parent::__construct("MCrypt enabled", "MCrypt is required by all security functions."); }
+
+    /**
+     * @inheritdoc
+     */
+    public function doTest()
+    {
+        $this->failedLevel = "error";
+        if (!function_exists("mcrypt_create_iv")) {
+            $this->testedParams["MCrypt Enabled"] = "No";
+            return FALSE;
+        }
+        $this->testedParams["MCrypt Enabled"] = "Yes";
+        return TRUE;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Tests/PHPOS.php b/core/src/core/src/pydio/Tests/PHPOS.php
new file mode 100644
index 0000000000..5c43bb083a
--- /dev/null
+++ b/core/src/core/src/pydio/Tests/PHPOS.php
@@ -0,0 +1,46 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tests;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Check server OS
+ * @package Pydio\Tests
+ */
+class PHPOS extends AbstractTest
+{
+
+    /**
+     * @inheritdoc
+     */
+    public function __construct() { parent::__construct("PHP operating system", "Current operating system ".PHP_OS); }
+
+    /**
+     * @inheritdoc
+     */
+    public function doTest()
+    {
+        $this->testedParams["Server OS"] = PHP_OS;
+        $this->failedLevel = "info";
+        return FALSE;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Tests/PHPSession.php b/core/src/core/src/pydio/Tests/PHPSession.php
new file mode 100644
index 0000000000..01e5912500
--- /dev/null
+++ b/core/src/core/src/pydio/Tests/PHPSession.php
@@ -0,0 +1,65 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tests;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Check php session writeability
+ * @package Pydio\Tests
+ */
+class PHPSession extends AbstractTest
+{
+
+    /**
+     * @inheritdoc
+     */
+    public function __construct() { parent::__construct("PHP Session", "<b>Testing configs</b>"); }
+
+    /**
+     * @inheritdoc
+     */
+    public function doTest()
+    {
+        $handler = ini_get("session.save_handler");
+        if ($handler != "files") {
+            $this->testedParams["Session Save Path"] = "Handler is not file based";
+            return TRUE;
+        }
+        $tmpDir = session_save_path();
+        $this->testedParams["Session Save Path"] = $tmpDir;
+        if ($tmpDir != "") {
+            $this->testedParams["Session Save Path Writeable"] = @is_writable($tmpDir);
+            if (!$this->testedParams["Session Save Path Writeable"]) {
+                $this->failedLevel = "error";
+                $this->failedInfo = "The temporary folder used by PHP to save the session data is either incorrect or not writeable! Please check : ".session_save_path();
+                $this->failedInfo .= "<p class='suggestion'><b>Suggestion</b> : create your own temporary folder for sessions and set the session.save_path parameter in the conf/bootstrap_conf.php</p>";
+                return FALSE;
+            }
+        } else {
+            $this->failedLevel = "warning";
+            $this->failedInfo = "Warning, it seems that your temporary folder used to save session data is not set. If you are encountering troubles with logging and sessions, please check session.save_path in your php.ini. Otherwise you can ignore this.";
+            return FALSE;
+        }
+        $this->failedLevel = "info";
+        return FALSE;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Tests/PHPVersion.php b/core/src/core/src/pydio/Tests/PHPVersion.php
new file mode 100644
index 0000000000..97d3f95758
--- /dev/null
+++ b/core/src/core/src/pydio/Tests/PHPVersion.php
@@ -0,0 +1,51 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tests;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Check current PHP Version
+ * @package Pydio\Tests
+ */
+class PHPVersion extends AbstractTest
+{
+
+    /**
+     * @inheritdoc
+     */
+    public function __construct() { parent::__construct("PHP version", "Minimum required version is PHP 5.5.9"); }
+
+    /**
+     * @inheritdoc
+     */
+    public function doTest()
+    {
+        $version = phpversion();
+        $this->testedParams["PHP Version"] = $version;
+        if (version_compare($version, '5.5.9')  < 0 ) return FALSE;
+        $locale = setlocale(LC_CTYPE, 0);
+        $dirSep = DIRECTORY_SEPARATOR;
+        $this->testedParams["Locale"] = $locale;
+        $this->testedParams["Directory Separator"] = $dirSep;
+        return TRUE;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Tests/PHP_APC.php b/core/src/core/src/pydio/Tests/PHP_APC.php
new file mode 100644
index 0000000000..5798410a36
--- /dev/null
+++ b/core/src/core/src/pydio/Tests/PHP_APC.php
@@ -0,0 +1,57 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tests;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Check that DOMXml is enabled
+ * @package Pydio\Tests
+ */
+class PHP_APC extends AbstractTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function __construct() { parent::__construct("PHP Opcode Cache extension", "Pydio framework loads a lot of PHP files at each query, and using a PHP accelerator is greatly recommanded."); }
+
+    /**
+     * @inheritdoc
+     */
+    public function doTest()
+    {
+        $this->failedLevel = "warning";
+        $v = @extension_loaded('apc');
+        if (isSet($v) && (is_numeric($v) || strtolower($v) == "on")) {
+            $this->testedParams["PHP APC extension loaded"] = "No";
+            $v = false;
+        } else if (!isSet($v)) {
+            $v = false;
+        }
+        if(!$v && !@extension_loaded("Zend OPcache")){
+            $this->failedInfo = "Pydio framework loads a lot of PHP files at each query, and using a PHP accelerator is greatly recommanded.";
+            return FALSE;
+        }
+        $this->failedInfo = "PHP accelerator extension detected, this is good for performances";
+        $this->testedParams["PHP Opcode Cache extension loaded"] = "Yes";
+        return TRUE;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Tests/PHP_INTL.php b/core/src/core/src/pydio/Tests/PHP_INTL.php
new file mode 100644
index 0000000000..da0d4e83c7
--- /dev/null
+++ b/core/src/core/src/pydio/Tests/PHP_INTL.php
@@ -0,0 +1,55 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <http://pyd.io/>.
+ */
+namespace Pydio\Tests;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Check that intl is enabled
+ * @package AjaXplorer
+ * @subpackage Tests
+ */
+class PHP_INTL extends AbstractTest
+{
+    /**
+     * PHP_INTL constructor.
+     * @inheritdoc
+     */
+    public function __construct() { parent::__construct("PHP INTL extension", "Pydio used intl to localize month names."); }
+
+    /**
+     * @inheritdoc
+     */
+    public function doTest()
+    {
+        $this->failedLevel = "warning";
+
+        if (extension_loaded('intl')) {
+            $this->failedInfo = "PHP INTL extension detected. Month names can be localized depending on the users language.";
+            $this->testedParams["PHP INTL extension loaded"] = "Yes";
+            return TRUE;
+        } else {
+            $this->failedInfo = "PHP INTL extension missing. English month names will be used for all languages.";
+            $this->testedParams["PHP INTL extension loaded"] = "No";
+            return FALSE;
+        }
+    }
+}
diff --git a/core/src/core/src/pydio/Tests/PHP_OB.php b/core/src/core/src/pydio/Tests/PHP_OB.php
new file mode 100644
index 0000000000..799e522cef
--- /dev/null
+++ b/core/src/core/src/pydio/Tests/PHP_OB.php
@@ -0,0 +1,55 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tests;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Check that output buffering is enabled
+ * @package Pydio\Tests
+ */
+class PHP_OB extends AbstractTest
+{
+
+    /**
+     * @inheritdoc
+     */
+    public function __construct() { parent::__construct("PHP Output Buffer disabled", "You should disable php output_buffering parameter for better performances with Pydio."); }
+
+    /**
+     * @inheritdoc
+     */
+    public function doTest()
+    {
+        $this->failedLevel = "warning";
+        $v = @ini_get("output_buffering");
+        if (isSet($v) && (is_numeric($v) || strtolower($v) == "on")) {
+            $this->testedParams["PHP Output Buffer disabled"] = "No";
+            return FALSE;
+        } else if (!isSet($v)) {
+            $this->failedInfo = "Unable to detect the output_buffering value, please make sure that it is disabled (Off) in your php.ini or your virtual host.";
+            return FALSE;
+        }
+        $this->failedInfo = "PHP Output Buffering is disabled, this is good for better performances";
+        $this->testedParams["PHP Output Buffer disabled"] = "Yes";
+        return TRUE;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Tests/PHP_file_uploads.php b/core/src/core/src/pydio/Tests/PHP_file_uploads.php
new file mode 100644
index 0000000000..7771fddd80
--- /dev/null
+++ b/core/src/core/src/pydio/Tests/PHP_file_uploads.php
@@ -0,0 +1,57 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tests;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Check that file uploads is enabled
+ * @package Pydio\Tests
+ */
+class PHP_file_uploads extends AbstractTest
+{
+    protected static $testKey = 'PHP File Uploads enabled';
+
+    /**
+     * @inheritdoc
+     */
+    public function __construct() { parent::__construct(self::$testKey, "You should enable php file_uploads parameter for uploading files with Pydio."); }
+
+    /**
+     * @inheritdoc
+     */
+    public function doTest()
+    {
+        $this->failedLevel = "warning";
+        $v = @ini_get("file_uploads");
+        if (isSet($v) && (is_numeric($v) || strtolower($v) == "on")) {
+            $this->failedInfo = "PHP File Uploads is enabled";
+            $this->testedParams[self::$testKey] = "Yes";
+            return TRUE;
+        } else if (!isSet($v)) {
+            $this->failedInfo = "Unable to detect the file_uploads value, please make sure that it is disabled (Off) in your php.ini or your virtual host.";
+            return FALSE;
+        }
+        $this->failedInfo = "PHP File Uploads is disabled";
+        $this->testedParams[self::$testKey] = "Yes";
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Tests/PHP_magic_quotes.php b/core/src/core/src/pydio/Tests/PHP_magic_quotes.php
new file mode 100644
index 0000000000..04bb35b947
--- /dev/null
+++ b/core/src/core/src/pydio/Tests/PHP_magic_quotes.php
@@ -0,0 +1,50 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tests;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Check whether mcrypt is enabled
+ * @package Pydio\Tests
+ */
+class PHP_magic_quotes extends AbstractTest
+{
+
+    /**
+     * @inheritdoc
+     */
+    public function __construct() { parent::__construct("Magic quotes disabled", "Magic quotes need to be disabled, only relevent for php 5.3"); }
+
+    /**
+     * @inheritdoc
+     */
+    public function doTest()
+    {
+        $this->failedLevel = "error";
+        if (get_magic_quotes_gpc()) {
+            $this->testedParams["Magic quotes disabled"] = "No";
+            return FALSE;
+        }
+        $this->testedParams["Magic quotes disabled"] = "Yes";
+        return TRUE;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Tests/PydioVersion.php b/core/src/core/src/pydio/Tests/PydioVersion.php
new file mode 100644
index 0000000000..e82ce3bc4c
--- /dev/null
+++ b/core/src/core/src/pydio/Tests/PydioVersion.php
@@ -0,0 +1,45 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tests;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Class AJXPVersion
+ * Get the current ajaxplorer version
+ * @package Pydio\Tests
+ */
+class PydioVersion extends AbstractTest
+{
+    /**
+     * @inheritdoc
+     */
+    public function __construct() { parent::__construct("Pydio version", "Version : ".AJXP_VERSION); }
+
+    /**
+     * @inheritdoc
+     */
+    public function doTest()
+    {
+        $this->failedLevel = "info";
+        return FALSE;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Tests/SSLEncryption.php b/core/src/core/src/pydio/Tests/SSLEncryption.php
new file mode 100644
index 0000000000..479854fd06
--- /dev/null
+++ b/core/src/core/src/pydio/Tests/SSLEncryption.php
@@ -0,0 +1,57 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tests;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Detect HTTPS protocol
+ * @package Pydio
+ * @subpackage Tests
+ */
+class SSLEncryption extends AbstractTest
+{
+
+    /**
+     * @inheritdoc
+     */
+    public function __construct() { parent::__construct("SSL Encryption", "You are not using SSL encryption, or it was not detected by the server. Be aware that it is strongly recommended to secure all communication of data over the network."); }
+
+    /**
+     * @inheritdoc
+     */
+    public function doTest()
+    {
+        // Get the locale
+        $ssl = false;
+        if (isSet($_SERVER["HTTPS"]) && strtolower($_SERVER["HTTPS"]) == "on") {
+            $ssl = true;
+        }
+        if (!$ssl) {
+            $this->failedLevel = "warning";
+            $this->failedInfo .= "<p class='suggestion'><b>Suggestion</b> : if your server supports HTTPS, make sure to configure the automatic redirection from http to https.</p>";
+            return FALSE;
+        } else {
+            $this->failedInfo .= "Https protocol detected";
+            return TRUE;
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Tests/ServerEncoding.php b/core/src/core/src/pydio/Tests/ServerEncoding.php
new file mode 100644
index 0000000000..82dc102fe9
--- /dev/null
+++ b/core/src/core/src/pydio/Tests/ServerEncoding.php
@@ -0,0 +1,69 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tests;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Test Server Encoding
+ * @package Pydio\Tests
+ */
+class ServerEncoding extends AbstractTest
+{
+
+    /**
+     * @inheritdoc
+     */
+    public function __construct() { parent::__construct("Server charset encoding", "You must set a correct charset encoding
+        in your locale definition in the form: en_us.UTF-8. Please refer to setlocale man page.
+        If your detected locale is C, simply type echo \$LANG on your server command line to read the correct value."); }
+
+    /**
+     * @inheritdoc
+     */
+    public function doTest()
+    {
+        // Get the locale
+        $locale = setlocale(LC_CTYPE, 0);
+        if ($locale == 'C') {
+            $this->failedLevel = "warning";
+            $this->failedInfo .= "Detected locale: $locale (using UTF-8)";
+            $this->failedInfo .= "<p class='suggestion'><b>Suggestion</b> : Set the AJXP_LOCALE parameter to the correct value in the <i>conf/bootstrap_conf.php</i> file. You can also set this value using the installer form (next step).</p>";
+            return FALSE;
+        }
+        if (strpos($locale, '.') === FALSE) {
+            $this->failedLevel = "warning";
+            $this->failedInfo .= "Locale doesn't contain encoding: $locale (so using UTF-8)";
+            $this->failedInfo .= "<p class='suggestion'><b>Suggestion</b> : Set the AJXP_LOCALE parameter to the correct value in the <i>conf/bootstrap_conf.php</i> file.  You can also set this value using the installer form (next step).</p>";
+            return FALSE;
+        }
+        // Check if we have iconv
+        if (!function_exists("iconv") && floatval(phpversion()) > 5.0) { $this->failedInfo .= "Couldn't find iconv. Please use a PHP version with iconv support"; return FALSE; }
+        if (floatval(phpversion()) > 5.0) {
+            // Try converting from a known UTF-8 string to ISO8859-1 string and back to make sure it works.
+            $string = "aéàç";
+            $iso = iconv("UTF-8", "ISO-8859-1", $string);
+            $back = iconv("ISO-8859-1", "UTF-8", $iso);
+            if (strlen($iso) != 4 || ord($iso[1]) != 233 || $back != $string) { $this->failedInfo .= "iconv doesn't work on your system: $string $iso $back"; return FALSE; }
+        }
+        return TRUE;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Tests/Upload.php b/core/src/core/src/pydio/Tests/Upload.php
new file mode 100644
index 0000000000..46a5ed5c10
--- /dev/null
+++ b/core/src/core/src/pydio/Tests/Upload.php
@@ -0,0 +1,68 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tests;
+
+use Pydio\Core\Services\ConfService;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Test upload tmp dir
+ * @package Pydio
+ * @subpackage Tests
+ */
+class Upload extends AbstractTest
+{
+    /**
+     * Upload constructor.
+     */
+    public function __construct() { parent::__construct("Upload particularities", "<b>Testing configs</b>"); }
+
+    /**
+     * @return bool
+     */
+    public function doTest()
+    {
+        $tmpDir = ini_get("upload_tmp_dir");
+        if (!$tmpDir) $tmpDir = realpath(sys_get_temp_dir());
+        if (ConfService::getGlobalConf("AJXP_TMP_DIR") != "") {
+            $tmpDir = ConfService::getGlobalConf("AJXP_TMP_DIR");
+        }
+        if (defined("AJXP_TMP_DIR") && AJXP_TMP_DIR !="") {
+            $tmpDir = AJXP_TMP_DIR;
+        }
+        $this->testedParams["Upload Tmp Dir Writeable"] = @is_writable($tmpDir);
+        $this->testedParams["PHP Upload Max Size"] = $this->returnBytes(ini_get("upload_max_filesize"));
+        $this->testedParams["PHP Post Max Size"] = $this->returnBytes(ini_get("post_max_size"));
+        foreach ($this->testedParams as $paramName => $paramValue) {
+            $this->failedInfo .= "\n$paramName=$paramValue";
+        }
+        if (!$this->testedParams["Upload Tmp Dir Writeable"]) {
+            $this->failedLevel = "error";
+            $this->failedInfo = "The temporary folder used by PHP to upload files is either incorrect or not writeable! Upload will not work. Please check : ".ini_get("upload_tmp_dir");
+            $this->failedInfo .= "<p class='suggestion'><b>Suggestion</b> : Set the AJXP_TMP_DIR parameter in the <i>conf/bootstrap_conf.php</i> file</p>";
+            return FALSE;
+        }
+
+        $this->failedLevel = "info";
+        return FALSE;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Tests/UsersConfig.php b/core/src/core/src/pydio/Tests/UsersConfig.php
new file mode 100644
index 0000000000..7c742e2557
--- /dev/null
+++ b/core/src/core/src/pydio/Tests/UsersConfig.php
@@ -0,0 +1,52 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tests;
+
+
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\UsersService;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Class UsersConfig
+ * @package Pydio\Tests
+ */
+class UsersConfig extends AbstractTest
+{
+    /**
+     * UsersConfig constructor.
+     */
+    public function __construct() { parent::__construct("Users Configuration", "Current config for users"); }
+
+    /**
+     * Perform the test, should be overwritten in concrete classes
+     * @abstract
+     * @return Boolean
+     */
+    public function doTest()
+    {
+        $this->testedParams["Users enabled"] = UsersService::usersEnabled();
+        $this->testedParams["Guest enabled"] = ConfService::getGlobalConf("ALLOW_GUEST_BROWSING", "auth");
+        $this->failedLevel = "info";
+        return FALSE;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Tests/Writeability.php b/core/src/core/src/pydio/Tests/Writeability.php
new file mode 100644
index 0000000000..e4def5adcc
--- /dev/null
+++ b/core/src/core/src/pydio/Tests/Writeability.php
@@ -0,0 +1,70 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tests;
+
+use Pydio\Core\Model\Context;
+use Pydio\Core\Utils\Vars\VarsFilter;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Check the various plugins folders writeability
+ * @package Pydio
+ * @subpackage Tests
+ */
+class Writeability extends AbstractTest
+{
+
+    /**
+     * @inheritdoc
+     */
+    public function __construct() { parent::__construct("Required writeable folder", "One of the following folder should be writeable and is not : "); }
+
+    /**
+     * @inheritdoc
+     */
+    public function doTest()
+    {
+        $checks = array();
+        $checks[] = AJXP_CACHE_DIR;
+        $checks[] = AJXP_DATA_PATH;
+        $checked = array();
+        $success = true;
+        foreach ($checks as $check) {
+            $w = false;
+            $check = VarsFilter::filter($check, Context::emptyContext());
+            if (!is_dir($check)) {// Check parent
+                $check = dirname($check);
+            }
+            $w = is_writable($check);
+            $checked[basename($check)] = "<b>".basename($check)."</b>:".($w?'true':'false');
+            $success = $success & $w;
+        }
+        $this->testedParams["Writeable Folders"] = "[".implode(',<br> ', array_values($checked))."]";
+        if (!$success) {
+            $this->failedInfo .= implode(",", $checks);
+            return FALSE;
+        }
+        $this->failedLevel = "info";
+        $this->failedInfo = "[".implode(',<br>', array_values($checked))."]";
+        return FALSE;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/src/pydio/Tests/Zlib.php b/core/src/core/src/pydio/Tests/Zlib.php
new file mode 100644
index 0000000000..c5cbbc8165
--- /dev/null
+++ b/core/src/core/src/pydio/Tests/Zlib.php
@@ -0,0 +1,47 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tests;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Check that Zlib is enabled
+ * @package Pydio
+ * @subpackage Tests
+ */
+class Zlib extends AbstractTest
+{
+
+    /**
+     * @inheritdoc
+     */
+    public function __construct() { parent::__construct("Zlib extension (ZIP)", "Extension enabled : ".((function_exists('gzopen')||function_exists('gzopen64'))?"1":"0")); }
+
+    /**
+     * @inheritdoc
+     */
+    public function doTest()
+    {
+        $this->testedParams["Zlib Enabled"] = ((function_exists('gzopen')||function_exists('gzopen64'))?"Yes":"No");
+        $this->failedLevel = "info";
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/core/src/core/tests/api_test.phtml b/core/src/core/src/pydio/Tests/api_test.phtml
similarity index 100%
rename from core/src/core/tests/api_test.phtml
rename to core/src/core/src/pydio/Tests/api_test.phtml
diff --git a/core/src/core/tests/startup.phtml b/core/src/core/src/pydio/Tests/startup.phtml
similarity index 96%
rename from core/src/core/tests/startup.phtml
rename to core/src/core/src/pydio/Tests/startup.phtml
index 92af0aefef..cfe6e437c9 100644
--- a/core/src/core/tests/startup.phtml
+++ b/core/src/core/src/pydio/Tests/startup.phtml
@@ -1,201 +1,201 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<title>Pydio</title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
-		<link rel="icon" type="image/x-png" href="AJXP_THEME_FOLDER/images/html-folder.png">
-		<script src="plugins/gui.ajax/res/js/vendor/prototype/prototype.js" type="text/javascript"></script>
-        <style>
-            * {
-                font-family: Open Sans, sans-serif;
-            }
-            body {
-                background-color: #F5F5F5;
-                margin: 0;
-                padding: 20px;
-                overflow: hidden;
-            }
-            h1 {
-                font-size: 30px;
-                font-weight: normal;
-                color: #555;
-                height: 20px;
-                text-align: center;
-                margin: 10px auto;
-            }
-
-            div.mainContainer{
-                position: relative;
-                display: block;
-                border-radius: 4px;
-                margin: 36px auto;
-                width: 660px;
-                height: 80%;
-                padding: 7px 11px;
-                color: #535353;
-            }
-
-            p.status{
-                margin-top: 0;
-                font-size: 15px;
-                line-height: 20px;
-                text-align: justify;
-                height: 60px;
-                padding: 0 5px;
-            }
-            p.status a{
-                display: inline-block;
-                background-color: #555555;
-                color: white;
-                text-transform: uppercase;
-                padding: 5px 10px;
-                text-decoration: none;
-                border-radius: 3px;
-                margin: 9px 1px;
-            }
-            p.status strong{
-                font-weight: normal;
-                font-style: italic;
-            }
-
-            div.testList{
-                font-size: 15px;
-                margin: 0 auto;
-                overflow-y: scroll;
-                background-color: #ffffff;
-                border-radius: 3px;
-                box-shadow: 0 0 8px rgba(0,0,0,0.25);
-            }
-
-            div.testLine {
-                text-align: left;
-                padding: 15px 15px 9px;
-                border-bottom: 1px solid #E7E7E7;
-            }
-            div.testClear{
-                clear:both;
-                height: 8px;
-            }
-            div.testName{
-                float: left;
-                width: 80%;
-                cursor: pointer;
-                font-size: 20px;
-                color: #555;
-            }
-            div.testName span{
-                display: none;
-            }
-            div.testStatus{
-                float: right;
-                width: 20%;
-                text-transform: uppercase;
-                text-align: right;
-                color: #090;
-                margin-top: 3px;
-            }
-            div.testLine.error .testStatus{
-                color : #933;
-            }
-            div.testLine.warning .testStatus{
-                color: #f90;
-            }
-            div.testDescription{
-                display:none;
-                font-size: 0.8em;
-                color: #999;
-                clear: both;
-                padding: 20px 0 5px;
-            }
-            div.testDescription.visible
-            {
-                display: block;
-            }
-            p.suggestion{
-                font-size:0.9em;
-                margin:5px 0 0;
-            }
-
-        </style>
-
-	</head>
-	<body bgcolor="#FFFFFF" text="#000000" marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"  style="">
-
-        <h1>Pydio Diagnostic Tool</h1>
-
-        <div class="mainContainer">
-            <?php
-                if ($showSkipLink) {
-                    if (count($ALL_ROWS["warning"]) && !count($ALL_ROWS["error"])) {
-                        echo "<p class='status statusWarning'><strong>Status</strong> : You have some warnings, but no fatal error detected, Pydio should run ok. <br/>Please review the warnings, and <a href='?ignore_tests=true'>click here to continue to Pydio</a>.</p>";
-                    } else if(count($ALL_ROWS["error"])) {
-                        echo "<p class='status statusError'><strong>Status</strong> : <b>You have some errors</b> that may prevent Pydio from running. Please review the error lines to check what action you should do. If you want to skip this step, simply <a href='?ignore_tests=true'>click here to continue to Pydio</a>.</p>";
-                    }else{
-                        echo "<p class='status'><strong>Status</strong> : <b>No specific errors</b> were detected, your Pydio installation should run smoothly! <br/><a href='?ignore_tests=true'>Click there to continue to Pydio</a></p>";
-                    }
-                }
-            ?>
-
-            <div class="testList">
-            <?php
-
-                foreach ($ALL_ROWS as $testsType => $allTests){
-
-                    foreach($allTests as $testKey => $testInfo){
-
-                        $status = ($testsType == "passed"?"ok":$testsType);
-                        echo "<div class='testLine $testsType'>
-                            <div class='testName'><span>".($testsType != "passed"?"-":"+")."</span> $testKey</div>
-                            <div class='testStatus'>$status</div>
-                            <div class='testDescription ".($testsType != "passed"?" visible":"")."'>$testInfo</div>
-                            <div class='testClear'></div>
-                        </div>";
-
-                    }
-
-                }
-
-            ?>
-            </div>
-
-            <script type="text/javascript">
-                var testRewrite = new Ajax.Request('data/cache/index.html', {
-                    method : 'get',
-                    onComplete : function(response){
-                        if(200 == response.status){
-                            var html = '<div class="testLine error">\
-                                <div class="testName"><span>-</span>Security Breach</div>\
-                                <div class="testStatus">error</div>\
-                                <div class="testDescription  visible">It seems that your <b>data/</b> folder is not correctly protected, and that subfolders (like the data/cache/ folder) are web-accessible. If you are using <b>Apache</b>, make sure the AllowOverride All option is active for your current directory. If you are running <b>Windows IIS</b>, you must manually add a RequestFiltering/HiddenSegments configuration to prevent web access to these folders. If you have defined a different AJXP_DATA_PATH pointing outside the webfolder, you can ignore this warning.</div>\
-                                <div class="testClear"></div>\
-                            </div>';
-                            $$('div.testList')[0].insert({top:html});
-                        }
-                    }
-                });
-
-                $$('div.testName').invoke("observe", "click", function(event){
-                    var target = event.target;
-                    if(target.tagName.toLowerCase() == "span") target = target.up("div.testName");
-                    target.next("div.testDescription").toggleClassName("visible");
-                    if(target.next("div.testDescription").hasClassName("visible")){
-                        target.down("span").update("-");
-                    }else{
-                        target.down("span").update("+");
-                    }
-                });
-                var resize = function(){
-                    var h1 = document.viewport.getHeight() - 120 ;
-                    var h = h1 - 80;
-                    $$("div.mainContainer")[0].setStyle({height:h1+'px'});
-                    $$("div.testList")[0].setStyle({height:h + 'px'});
-                };
-                Event.observe(window, "resize", resize);
-                resize();
-            </script>
-        </div>
-
-        <!-- <h1 style="text-align: right">Continue to Pydio &gt;&gt; </h1>-->
-    </body>
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>Pydio</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+		<link rel="icon" type="image/x-png" href="AJXP_THEME_FOLDER/images/html-folder.png">
+		<script src="plugins/gui.ajax/res/js/vendor/prototype/prototype.js" type="text/javascript"></script>
+        <style>
+            * {
+                font-family: Roboto, sans-serif;
+            }
+            body {
+                background-color: #F5F5F5;
+                margin: 0;
+                padding: 20px;
+                overflow: hidden;
+            }
+            h1 {
+                font-size: 30px;
+                font-weight: normal;
+                color: #555;
+                height: 20px;
+                text-align: center;
+                margin: 10px auto;
+            }
+
+            div.mainContainer{
+                position: relative;
+                display: block;
+                border-radius: 4px;
+                margin: 36px auto;
+                width: 660px;
+                height: 80%;
+                padding: 7px 11px;
+                color: #535353;
+            }
+
+            p.status{
+                margin-top: 0;
+                font-size: 15px;
+                line-height: 20px;
+                text-align: justify;
+                height: 60px;
+                padding: 0 5px;
+            }
+            p.status a{
+                display: inline-block;
+                background-color: #555555;
+                color: white;
+                text-transform: uppercase;
+                padding: 5px 10px;
+                text-decoration: none;
+                border-radius: 3px;
+                margin: 9px 1px;
+            }
+            p.status strong{
+                font-weight: normal;
+                font-style: italic;
+            }
+
+            div.testList{
+                font-size: 15px;
+                margin: 0 auto;
+                overflow-y: scroll;
+                background-color: #ffffff;
+                border-radius: 3px;
+                box-shadow: 0 0 8px rgba(0,0,0,0.25);
+            }
+
+            div.testLine {
+                text-align: left;
+                padding: 15px 15px 9px;
+                border-bottom: 1px solid #E7E7E7;
+            }
+            div.testClear{
+                clear:both;
+                height: 8px;
+            }
+            div.testName{
+                float: left;
+                width: 80%;
+                cursor: pointer;
+                font-size: 20px;
+                color: #555;
+            }
+            div.testName span{
+                display: none;
+            }
+            div.testStatus{
+                float: right;
+                width: 20%;
+                text-transform: uppercase;
+                text-align: right;
+                color: #090;
+                margin-top: 3px;
+            }
+            div.testLine.error .testStatus{
+                color : #933;
+            }
+            div.testLine.warning .testStatus{
+                color: #f90;
+            }
+            div.testDescription{
+                display:none;
+                font-size: 0.8em;
+                color: #999;
+                clear: both;
+                padding: 20px 0 5px;
+            }
+            div.testDescription.visible
+            {
+                display: block;
+            }
+            p.suggestion{
+                font-size:0.9em;
+                margin:5px 0 0;
+            }
+
+        </style>
+
+	</head>
+	<body bgcolor="#FFFFFF" text="#000000" marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"  style="">
+
+        <h1>Pydio Diagnostic Tool</h1>
+
+        <div class="mainContainer">
+            <?php
+                if ($showSkipLink) {
+                    if (count($ALL_ROWS["warning"]) && !count($ALL_ROWS["error"])) {
+                        echo "<p class='status statusWarning'><strong>Status</strong> : You have some warnings, but no fatal error detected, Pydio should run ok. <br/>Please review the warnings, and <a href='?ignore_tests=true'>click here to continue to Pydio</a>.</p>";
+                    } else if(count($ALL_ROWS["error"])) {
+                        echo "<p class='status statusError'><strong>Status</strong> : <b>You have some errors</b> that may prevent Pydio from running. Please review the error lines to check what action you should do. If you want to skip this step, simply <a href='?ignore_tests=true'>click here to continue to Pydio</a>.</p>";
+                    }else{
+                        echo "<p class='status'><strong>Status</strong> : <b>No specific errors</b> were detected, your Pydio installation should run smoothly! <br/><a href='?ignore_tests=true'>Click there to continue to Pydio</a></p>";
+                    }
+                }
+            ?>
+
+            <div class="testList">
+            <?php
+
+                foreach ($ALL_ROWS as $testsType => $allTests){
+
+                    foreach($allTests as $testKey => $testInfo){
+
+                        $status = ($testsType == "passed"?"ok":$testsType);
+                        echo "<div class='testLine $testsType'>
+                            <div class='testName'><span>".($testsType != "passed"?"-":"+")."</span> $testKey</div>
+                            <div class='testStatus'>$status</div>
+                            <div class='testDescription ".($testsType != "passed"?" visible":"")."'>$testInfo</div>
+                            <div class='testClear'></div>
+                        </div>";
+
+                    }
+
+                }
+
+            ?>
+            </div>
+
+            <script type="text/javascript">
+                var testRewrite = new Ajax.Request('data/cache/index.html', {
+                    method : 'get',
+                    onComplete : function(response){
+                        if(200 == response.status){
+                            var html = '<div class="testLine error">\
+                                <div class="testName"><span>-</span>Security Breach</div>\
+                                <div class="testStatus">error</div>\
+                                <div class="testDescription  visible">It seems that your <b>data/</b> folder is not correctly protected, and that subfolders (like the data/cache/ folder) are web-accessible. If you are using <b>Apache</b>, make sure the AllowOverride All option is active for your current directory. If you are running <b>Windows IIS</b>, you must manually add a RequestFiltering/HiddenSegments configuration to prevent web access to these folders. If you have defined a different AJXP_DATA_PATH pointing outside the webfolder, you can ignore this warning.</div>\
+                                <div class="testClear"></div>\
+                            </div>';
+                            $$('div.testList')[0].insert({top:html});
+                        }
+                    }
+                });
+
+                $$('div.testName').invoke("observe", "click", function(event){
+                    var target = event.target;
+                    if(target.tagName.toLowerCase() == "span") target = target.up("div.testName");
+                    target.next("div.testDescription").toggleClassName("visible");
+                    if(target.next("div.testDescription").hasClassName("visible")){
+                        target.down("span").update("-");
+                    }else{
+                        target.down("span").update("+");
+                    }
+                });
+                var resize = function(){
+                    var h1 = document.viewport.getHeight() - 120 ;
+                    var h = h1 - 80;
+                    $$("div.mainContainer")[0].setStyle({height:h1+'px'});
+                    $$("div.testList")[0].setStyle({height:h + 'px'});
+                };
+                Event.observe(window, "resize", resize);
+                resize();
+            </script>
+        </div>
+
+        <!-- <h1 style="text-align: right">Continue to Pydio &gt;&gt; </h1>-->
+    </body>
 </html>
\ No newline at end of file
diff --git a/core/src/core/tests/index.html b/core/src/core/tests/index.html
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/core/src/core/tests/test.AJXPVersion.php b/core/src/core/tests/test.AJXPVersion.php
deleted file mode 100644
index c01376d799..0000000000
--- a/core/src/core/tests/test.AJXPVersion.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
-
-/**
- * @package AjaXplorer
- * @subpackage Tests
- * @class AJXPVersion
- * Get the current ajaxplorer version
- */
-class AJXPVersion extends AbstractTest
-{
-    public function __construct() { parent::__construct("Pydio version", "Version : ".AJXP_VERSION); }
-    public function doTest()
-    {
-        $this->failedLevel = "info";
-        return FALSE;
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/tests/test.Client.php b/core/src/core/tests/test.Client.php
deleted file mode 100644
index c8c25c576d..0000000000
--- a/core/src/core/tests/test.Client.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
-
-/**
- * @package Pydio
- * @subpackage Tests
- * @class Client
- * Test client browser
- */
-class Client extends AbstractTest
-{
-    public function __construct() { parent::__construct("Client Browser", "Current client ".$_SERVER['HTTP_USER_AGENT']); }
-    public function doTest()
-    {
-        $this->testedParams["Client"] = $_SERVER['HTTP_USER_AGENT'];
-        $this->failedLevel = "info";
-        return FALSE;
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/tests/test.PHPCLI.php b/core/src/core/tests/test.PHPCLI.php
deleted file mode 100644
index f36276d7a0..0000000000
--- a/core/src/core/tests/test.PHPCLI.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
-
-/**
- * Check current PHP Version
- * @package AjaXplorer
- * @subpackage Tests
- */
-class PHPCLI extends AbstractTest
-{
-    public function __construct() { parent::__construct("PHP Command Line", "Testing PHP command line (default is php)"); }
-    public function doTest()
-    {
-        if (!is_writable(AJXP_CACHE_DIR)) {
-            $this->testedParams["Command Line Available"] = "No";
-            $this->failedLevel = "warning";
-            $this->failedInfo = "Php command line not detected (cache directory not writeable), this is NOT BLOCKING, but enabling it could allow to send some long tasks in background. If you do not have the ability to tweak your server, you can safely ignore this warning.";
-            return FALSE;
-        }
-        $windows = (PHP_OS == "WIN32" || PHP_OS == "WINNT" || PHP_OS == "Windows");
-
-        $sModeExecDir = ini_get("safe_mode_exec_dir") ;
-        $safeEnabled = ini_get("safe_mode") || !empty($sModeExecDir);
-
-        $disabled_functions=explode(',',ini_get('disable_functions'));
-        $fName = ($windows ? "popen" : "exec");
-        $notFoundFunction = in_array($fName, $disabled_functions) || !function_exists($fName) || !is_callable($fName);
-
-        $comEnabled = class_exists("COM");
-        $useCOM = false;
-
-        if ( ( $safeEnabled ||  $notFoundFunction )) {
-            if ($comEnabled) {
-                $useCOM = true;
-            } else {
-                $this->testedParams["Command Line Available"] = "No";
-                $this->failedLevel = "warning";
-                $this->failedInfo = "Php command line not detected (there seem to be some safe_mode or a-like restriction), this is NOT BLOCKING, but enabling it could allow to send some long tasks in background. If you do not have the ability to tweak your server, you can safely ignore this warning.";
-                return FALSE;
-            }
-        }
-
-        $defaultCli = ConfService::getCoreConf("CLI_PHP");
-        if($defaultCli == null) $defaultCli = "php";
-
-        $token = md5(time());
-        $robustCacheDir = str_replace("/", DIRECTORY_SEPARATOR, AJXP_CACHE_DIR);
-        $logDir = $robustCacheDir.DIRECTORY_SEPARATOR."cmd_outputs";
-        if(!is_dir($logDir)) mkdir($logDir, 0755);
-        $logFile = $logDir."/".$token.".out";
-
-        $testScript = AJXP_CACHE_DIR."/cli_test.php";
-        file_put_contents($testScript, "<?php file_put_contents('".$robustCacheDir.DIRECTORY_SEPARATOR."cli_result.php', 'cli'); ?>");
-
-        $cmd = $defaultCli." ". $robustCacheDir .DIRECTORY_SEPARATOR."cli_test.php";
-
-        if ($windows) {
-            /* Next 2 lines modified by rmeske: Need to wrap the folder and file paths in double quotes.  */
-            $cmd = $defaultCli." ". chr(34).$robustCacheDir .DIRECTORY_SEPARATOR."cli_test.php".chr(34);
-            $cmd .= " > ".chr(34).$logFile.chr(34);
-
-            $comCommand = $cmd;
-            if ($useCOM) {
-                $WshShell   = new COM("WScript.Shell");
-                $res = $WshShell->Run("cmd /C $comCommand", 0, false);
-            } else {
-                $tmpBat = implode(DIRECTORY_SEPARATOR, array(str_replace("/", DIRECTORY_SEPARATOR, AJXP_INSTALL_PATH), "data","tmp", md5(time()).".bat"));
-                $cmd .= "\n DEL ".chr(34).$tmpBat.chr(34);
-                file_put_contents($tmpBat, $cmd);
-                /* Following 1 line modified by rmeske: The windows Start command identifies the first parameter in quotes as a title for the window.  Therefore, when enclosing a command with double quotes you must include a window title first
-                START	["title"] [/Dpath] [/I] [/MIN] [/MAX] [/SEPARATE | /SHARED] [/LOW | /NORMAL | /HIGH | /REALTIME] [/WAIT] [/B] [command / program] [parameters]
-                */
-                @pclose(@popen('start /b "CLI" "'.$tmpBat.'"', 'r'));
-                sleep(1);
-                // Failed, but we can try with COM
-                if ( ! is_file(AJXP_CACHE_DIR."/cli_result.php") && $comEnabled ) {
-                    $useCOM = true;
-                    $WshShell   = new COM("WScript.Shell");
-                    $res = $WshShell->Run("cmd /C $comCommand", 0, false);
-                }
-            }
-        } else {
-            new UnixProcess($cmd, $logFile);
-        }
-
-        sleep(1);
-        $availability = true;
-        if (is_file(AJXP_CACHE_DIR."/cli_result.php")) {
-            $this->testedParams["Command Line Available"] = "Yes";
-            unlink(AJXP_CACHE_DIR."/cli_result.php");
-            if ($useCOM) {
-                $this->failedLevel = "warning";
-                $availability = true;
-                $this->failedInfo = "Php command line detected, but using the windows COM extension. Just make sure to <b>enable COM</b> in the Pydio Core Options";
-            } else {
-                $this->failedInfo = "Php command line detected, this will allow to send some tasks in background. Enable it in the Pydio Core Options";
-            }
-        } else {
-            if (is_file($logFile)) {
-                $log = file_get_contents($logFile);
-                unlink($logFile);
-            }
-            $this->testedParams["Command Line Available"] = "No : $log";
-            $this->failedLevel = "warning";
-            $this->failedInfo = "Php command line not detected, this is NOT BLOCKING, but enabling it could allow to send some long tasks in background. If you do not have the ability to tweak your server, you can safely ignore this warning.";
-            if ($windows) {
-                $this->failedInfo .= "<br> On Windows, try to activate the php COM extension, and set correct rights to the cmd exectuble to make it runnable by the web server, this should solve the problem.";
-            }
-            $availability = false;
-        }
-        unlink(AJXP_CACHE_DIR."/cli_test.php");
-
-        return $availability;
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/tests/test.PHPDomXML.php b/core/src/core/tests/test.PHPDomXML.php
deleted file mode 100644
index 2ca9e0fed1..0000000000
--- a/core/src/core/tests/test.PHPDomXML.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
-
-/**
- * Check that DOMXml is enabled
- * @package Pydio
- * @subpackage Tests
- */
-class PHPDomXML extends AbstractTest
-{
-    public function __construct() { parent::__construct("DOM Xml enabled", "Dom XML is required, you may have to install the php-xml extension."); }
-    public function doTest()
-    {
-        $this->failedLevel = "error";
-        if (!class_exists("DOMDocument")) {
-            $this->testedParams["DOM Enabled"] = "No";
-            return FALSE;
-        }
-        $this->testedParams["DOM Enabled"] = "Yes";
-        return TRUE;
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/tests/test.PHPErrorLevel.php b/core/src/core/tests/test.PHPErrorLevel.php
deleted file mode 100644
index 5367ff63e5..0000000000
--- a/core/src/core/tests/test.PHPErrorLevel.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
-
-/**
- * Check current php error level
- * @package Pydio
- * @subpackage Tests
- */
-class PHPErrorLevel extends AbstractTest
-{
-    public function __construct() { parent::__construct("PHP error level", PHPErrorLevel::error2string(error_reporting())); }
-    public function doTest()
-    {
-        if (error_reporting() & E_NOTICE) {
-            $this->failedLevel = "error";
-            $this->failedInfo = "You must lower your PHP error level in php.ini NOT TO INCLUDE E_NOTICE (you have:".$this->failedInfo.")";
-            return false;
-        }
-        $this->failedLevel = "info";
-        return FALSE;
-    }
-
-    public function error2string($value)
-    {
-        $level_names = array(
-            E_ERROR => 'E_ERROR', E_WARNING => 'E_WARNING',
-            E_PARSE => 'E_PARSE', E_NOTICE => 'E_NOTICE',
-            E_CORE_ERROR => 'E_CORE_ERROR', E_CORE_WARNING => 'E_CORE_WARNING',
-            E_COMPILE_ERROR => 'E_COMPILE_ERROR', E_COMPILE_WARNING => 'E_COMPILE_WARNING',
-            E_USER_ERROR => 'E_USER_ERROR', E_USER_WARNING => 'E_USER_WARNING',
-            E_USER_NOTICE => 'E_USER_NOTICE' );
-        if(defined('E_STRICT')) $level_names[E_STRICT]='E_STRICT';
-        $levels=array();
-        if (($value&E_ALL)==E_ALL) {
-            $levels[]='E_ALL';
-            $value&=~E_ALL;
-        }
-        foreach($level_names as $level=>$name)
-            if(($value&$level)==$level) $levels[]=$name;
-        return implode(' | ',$levels);
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/tests/test.PHPExif.php b/core/src/core/tests/test.PHPExif.php
deleted file mode 100644
index bea215976c..0000000000
--- a/core/src/core/tests/test.PHPExif.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
-
-/**
- * Check that Exif extension is enabled
- * @package Pydio
- * @subpackage Tests
- */
-class PHPExif extends AbstractTest
-{
-    public function __construct() {
-        parent::__construct("Exif Extension enabled", "Installing php-exif extension is recommended if you plan to handle images");
-    }
-    public function doTest()
-    {
-        $this->failedLevel = "warning";
-        if (!function_exists("exif_read_data")) {
-            $this->testedParams["Exif Enabled"] = "No";
-            return FALSE;
-        }
-        $this->testedParams["Exif Enabled"] = "Yes";
-        return TRUE;
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/tests/test.PHPGDVersion.php b/core/src/core/tests/test.PHPGDVersion.php
deleted file mode 100644
index d7db74e82a..0000000000
--- a/core/src/core/tests/test.PHPGDVersion.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
-
-/**
- * Check whether GD is installed or not
- * @package Pydio
- * @subpackage Tests
- */
-class PHPGDVersion extends AbstractTest
-{
-    public function __construct() { parent::__construct("PHP GD version", "GD is required for generating thumbnails"); }
-    public function doTest()
-    {
-        $this->failedLevel = "warning";
-        if (!function_exists("gd_info") || !function_exists("imagecopyresized") || !function_exists("imagecopyresampled")) {
-            $this->testedParams["GD Enabled"] = "No";
-            return FALSE;
-        }
-        $this->testedParams["GD Enabled"] = "Yes";
-        return TRUE;
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/tests/test.PHPLimits.php b/core/src/core/tests/test.PHPLimits.php
deleted file mode 100644
index 36674347e7..0000000000
--- a/core/src/core/tests/test.PHPLimits.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
-
-/**
- * Gather various php configurations that will limit the application
- * @package Pydio
- * @subpackage Tests
- */
-class PHPLimits extends AbstractTest
-{
-    public function __construct() { parent::__construct("PHP Limits variables", "<b>Testing configs</b>"); }
-    public function doTest()
-    {
-        $this->testedParams["Upload Max Size"] = ini_get("upload_max_filesize");
-        $this->testedParams["Memory Limit"] = ((ini_get("memory_limit")!="")?ini_get("memory_limit"):get_cfg_var("memory_limit"));
-        $this->testedParams["Max execution time"] = ini_get("max_execution_time");
-        $this->testedParams["Safe Mode"] = (ini_get("safe_mode")?"1":"0");
-        $this->testedParams["Safe Mode GID"] = (ini_get("safe_mode_gid")?"1":"0");
-        $this->testedParams["Xml parser enabled"] = (function_exists("xml_parser_create")?"1":"0");
-        foreach ($this->testedParams as $paramName => $paramValue) {
-            $this->failedInfo .= "\n$paramName=$paramValue";
-        }
-        $this->failedLevel = "info";
-        return FALSE;
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/tests/test.PHPMCrypt.php b/core/src/core/tests/test.PHPMCrypt.php
deleted file mode 100644
index 2dca6118f8..0000000000
--- a/core/src/core/tests/test.PHPMCrypt.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
-
-/**
- * Check whether mcrypt is enabled
- * @package Pydio
- * @subpackage Tests
- */
-class PHPMCrypt extends AbstractTest
-{
-    public function __construct() { parent::__construct("MCrypt enabled", "MCrypt is required by all security functions."); }
-    public function doTest()
-    {
-        $this->failedLevel = "error";
-        if (!function_exists("mcrypt_create_iv")) {
-            $this->testedParams["MCrypt Enabled"] = "No";
-            return FALSE;
-        }
-        $this->testedParams["MCrypt Enabled"] = "Yes";
-        return TRUE;
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/tests/test.PHPOS.php b/core/src/core/tests/test.PHPOS.php
deleted file mode 100644
index de08f0ec70..0000000000
--- a/core/src/core/tests/test.PHPOS.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
-
-/**
- * Check server OS
- * @package Pydio
- * @subpackage Tests
- */
-class PHPOS extends AbstractTest
-{
-    public function __construct() { parent::__construct("PHP operating system", "Current operating system ".PHP_OS); }
-    public function doTest()
-    {
-        $this->testedParams["Server OS"] = PHP_OS;
-        $this->failedLevel = "info";
-        return FALSE;
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/tests/test.PHPSession.php b/core/src/core/tests/test.PHPSession.php
deleted file mode 100644
index 5e665ca4a6..0000000000
--- a/core/src/core/tests/test.PHPSession.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
-
-/**
- * Check php session writeability
- * @package Pydio
- * @subpackage Tests
- */
-class PHPSession extends AbstractTest
-{
-    public function __construct() { parent::__construct("PHP Session", "<b>Testing configs</b>"); }
-    public function doTest()
-    {
-        $handler = ini_get("session.save_handler");
-        if ($handler != "files") {
-            $this->testedParams["Session Save Path"] = "Handler is not file based";
-            return TRUE;
-        }
-        $tmpDir = session_save_path();
-        $this->testedParams["Session Save Path"] = $tmpDir;
-        if ($tmpDir != "") {
-            $this->testedParams["Session Save Path Writeable"] = @is_writable($tmpDir);
-            if (!$this->testedParams["Session Save Path Writeable"]) {
-                $this->failedLevel = "error";
-                $this->failedInfo = "The temporary folder used by PHP to save the session data is either incorrect or not writeable! Please check : ".session_save_path();
-                $this->failedInfo .= "<p class='suggestion'><b>Suggestion</b> : create your own temporary folder for sessions and set the session.save_path parameter in the conf/bootstrap_conf.php</p>";
-                return FALSE;
-            }
-        } else {
-            $this->failedLevel = "warning";
-            $this->failedInfo = "Warning, it seems that your temporary folder used to save session data is not set. If you are encountering troubles with logging and sessions, please check session.save_path in your php.ini. Otherwise you can ignore this.";
-            return FALSE;
-        }
-        $this->failedLevel = "info";
-        return FALSE;
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/tests/test.PHPVersion.php b/core/src/core/tests/test.PHPVersion.php
deleted file mode 100644
index 198c439a59..0000000000
--- a/core/src/core/tests/test.PHPVersion.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
-
-/**
- * Check current PHP Version
- * @package Pydio
- * @subpackage Tests
- */
-class PHPVersion extends AbstractTest
-{
-    public function __construct() { parent::__construct("PHP version", "Minimum required version is PHP 5.4.0"); }
-    public function doTest()
-    {
-        $version = phpversion();
-        $this->testedParams["PHP Version"] = $version;
-        //return false;
-        if (floatval($version) < 5.4) return FALSE;
-        $locale = setlocale(LC_CTYPE, 0);
-        $dirSep = DIRECTORY_SEPARATOR;
-        $this->testedParams["Locale"] = $locale;
-        $this->testedParams["Directory Separator"] = $dirSep;
-        if (floatval($version) < 5.4 && $locale != "C" && $dirSep != '\\') { $this->failedLevel = "warning"; return FALSE; } // PHP4 doesn't work well with foreign encoding
-        return TRUE;
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/tests/test.PHP_APC.php b/core/src/core/tests/test.PHP_APC.php
deleted file mode 100644
index 4533ea1447..0000000000
--- a/core/src/core/tests/test.PHP_APC.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
-
-/**
- * Check that DOMXml is enabled
- * @package AjaXplorer
- * @subpackage Tests
- */
-class PHP_APC extends AbstractTest
-{
-    public function __construct() { parent::__construct("PHP APC extension", "Pydio framework loads a lot of PHP files at each query, and using a PHP accelerator is greatly recommanded."); }
-    public function doTest()
-    {
-        $this->failedLevel = "warning";
-
-        if (extension_loaded('apc')) {
-            $this->failedInfo = "PHP APC extension detected, this is good for better performances";
-            $this->testedParams["PHP APC extension loaded"] = "Yes";
-            return TRUE;
-        } else {
-            $this->testedParams["PHP APC extension loaded"] = "No";
-            $this->failedInfo = "Pydio framework loads a lot of PHP files at each query, and using a PHP accelerator is greatly recommanded.";
-            return FALSE;
-        }
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/tests/test.PHP_INTL.php b/core/src/core/tests/test.PHP_INTL.php
deleted file mode 100644
index 6125b631cc..0000000000
--- a/core/src/core/tests/test.PHP_INTL.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/*
- * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
-
-/**
- * Check that intl is enabled
- * @package AjaXplorer
- * @subpackage Tests
- */
-class PHP_INTL extends AbstractTest
-{
-    public function __construct() { parent::__construct("PHP INTL extension", "Pydio used intl to localize month names."); }
-    public function doTest()
-    {
-        $this->failedLevel = "warning";
-
-        if (extension_loaded('intl')) {
-            $this->failedInfo = "PHP INTL extension detected. Month names can be localized depending on the users language.";
-            $this->testedParams["PHP INTL extension loaded"] = "Yes";
-            return TRUE;
-        } else {
-            $this->failedInfo = "PHP INTL extension missing. English month names will be used for all languages.";
-            $this->testedParams["PHP INTL extension loaded"] = "No";
-            return FALSE;
-        }
-    }
-}
diff --git a/core/src/core/tests/test.PHP_OB.php b/core/src/core/tests/test.PHP_OB.php
deleted file mode 100644
index 63afbfab7c..0000000000
--- a/core/src/core/tests/test.PHP_OB.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
-
-/**
- * Check that output buffering is enabled
- * @package AjaXplorer
- * @subpackage Tests
- */
-class PHP_OB extends AbstractTest
-{
-    public function __construct() { parent::__construct("PHP Output Buffer disabled", "You should disable php output_buffering parameter for better performances with Pydio."); }
-    public function doTest()
-    {
-        $this->failedLevel = "warning";
-        $v = @ini_get("output_buffering");
-        if (isSet($v) && (is_numeric($v) || strtolower($v) == "on")) {
-            $this->testedParams["PHP Output Buffer disabled"] = "No";
-            return FALSE;
-        } else if (!isSet($v)) {
-            $this->failedInfo = "Unable to detect the output_buffering value, please make sure that it is disabled (Off) in your php.ini or your virtual host.";
-            return FALSE;
-        }
-        $this->failedInfo = "PHP Output Buffering is disabled, this is good for better performances";
-        $this->testedParams["PHP Output Buffer disabled"] = "Yes";
-        return TRUE;
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/tests/test.PHP_file_uploads.php b/core/src/core/tests/test.PHP_file_uploads.php
deleted file mode 100644
index 532279ddc9..0000000000
--- a/core/src/core/tests/test.PHP_file_uploads.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
-
-/**
- * Check that file uploads is enabled
- * @package AjaXplorer
- * @subpackage Tests
- */
-class PHP_file_uploads extends AbstractTest
-{
-    protected static $testKey = 'PHP File Uploads enabled';
-    
-    public function __construct() { parent::__construct(self::$testKey, "You should enable php file_uploads parameter for uploading files with Pydio."); }
-    public function doTest()
-    {
-        $this->failedLevel = "warning";
-        $v = @ini_get("file_uploads");
-        if (isSet($v) && (is_numeric($v) || strtolower($v) == "on")) {
-            $this->failedInfo = "PHP File Uploads is enabled";
-            $this->testedParams[self::$testKey] = "Yes";
-            return TRUE;
-        } else if (!isSet($v)) {
-            $this->failedInfo = "Unable to detect the file_uploads value, please make sure that it is disabled (Off) in your php.ini or your virtual host.";
-            return FALSE;
-        }
-        $this->failedInfo = "PHP File Uploads is disabled";
-        $this->testedParams[self::$testKey] = "Yes";
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/tests/test.PHP_magic_quotes.php b/core/src/core/tests/test.PHP_magic_quotes.php
deleted file mode 100644
index 5320a2090e..0000000000
--- a/core/src/core/tests/test.PHP_magic_quotes.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
-
-/**
- * Check whether mcrypt is enabled
- * @package Pydio
- * @subpackage Tests
- */
-class PHP_magic_quotes extends AbstractTest
-{
-    public function __construct() { parent::__construct("Magic quotes disabled", "Magic quotes need to be disabled, only relevent for php 5.3"); }
-    public function doTest()
-    {
-        $this->failedLevel = "error";
-        if (get_magic_quotes_gpc()) {
-            $this->testedParams["Magic quotes disabled"] = "No";
-            return FALSE;
-        }
-        $this->testedParams["Magic quotes disabled"] = "Yes";
-        return TRUE;
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/tests/test.SSLEncryption.php b/core/src/core/tests/test.SSLEncryption.php
deleted file mode 100644
index e2a6514fac..0000000000
--- a/core/src/core/tests/test.SSLEncryption.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
-
-/**
- * Detect HTTPS protocol
- * @package Pydio
- * @subpackage Tests
- */
-class SSLEncryption extends AbstractTest
-{
-    public function __construct() { parent::__construct("SSL Encryption", "You are not using SSL encryption, or it was not detected by the server. Be aware that it is strongly recommended to secure all communication of data over the network."); }
-    public function doTest()
-    {
-        // Get the locale
-        $ssl = false;
-        if (isSet($_SERVER["HTTPS"]) && strtolower($_SERVER["HTTPS"]) == "on") {
-            $ssl = true;
-        }
-        if (!$ssl) {
-            $this->failedLevel = "warning";
-            $this->failedInfo .= "<p class='suggestion'><b>Suggestion</b> : if your server supports HTTPS, set the AJXP_FORCE_SSL_REDIRECT parameter in the <i>conf/bootstrap_conf.php</i> file.</p>";
-            return FALSE;
-        } else {
-            $this->failedInfo .= "Https protocol detected";
-            return TRUE;
-        }
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/tests/test.ServerEncoding.php b/core/src/core/tests/test.ServerEncoding.php
deleted file mode 100644
index 6de7c0c8e1..0000000000
--- a/core/src/core/tests/test.ServerEncoding.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
-
-/**
- * Test Server Encoding
- * @package Pydio
- * @subpackage Tests
- */
-class ServerEncoding extends AbstractTest
-{
-    public function __construct() { parent::__construct("Server charset encoding", "You must set a correct charset encoding
-        in your locale definition in the form: en_us.UTF-8. Please refer to setlocale man page.
-        If your detected locale is C, simply type echo \$LANG on your server command line to read the correct value."); }
-    public function doTest()
-    {
-        // Get the locale
-        $locale = setlocale(LC_CTYPE, 0);
-        if ($locale == 'C') {
-            $this->failedLevel = "warning";
-            $this->failedInfo .= "Detected locale: $locale (using UTF-8)";
-            $this->failedInfo .= "<p class='suggestion'><b>Suggestion</b> : Set the AJXP_LOCALE parameter to the correct value in the <i>conf/bootstrap_conf.php</i> file. You can also set this value using the installer form (next step).</p>";
-            return FALSE;
-        }
-        if (strpos($locale, '.') === FALSE) {
-            $this->failedLevel = "warning";
-            $this->failedInfo .= "Locale doesn't contain encoding: $locale (so using UTF-8)";
-            $this->failedInfo .= "<p class='suggestion'><b>Suggestion</b> : Set the AJXP_LOCALE parameter to the correct value in the <i>conf/bootstrap_conf.php</i> file.  You can also set this value using the installer form (next step).</p>";
-            return FALSE;
-        }
-        // Check if we have iconv
-        if (!function_exists("iconv") && floatval(phpversion()) > 5.0) { $this->failedInfo .= "Couldn't find iconv. Please use a PHP version with iconv support"; return FALSE; }
-        if (floatval(phpversion()) > 5.0) {
-            // Try converting from a known UTF-8 string to ISO8859-1 string and back to make sure it works.
-            $string = "aéàç";
-            $iso = iconv("UTF-8", "ISO-8859-1", $string);
-            $back = iconv("ISO-8859-1", "UTF-8", $iso);
-            if (strlen($iso) != 4 || ord($iso[1]) != 233 || $back != $string) { $this->failedInfo .= "iconv doesn't work on your system: $string $iso $back"; return FALSE; }
-        }
-        return TRUE;
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/tests/test.Upload.php b/core/src/core/tests/test.Upload.php
deleted file mode 100644
index 8ae92fd904..0000000000
--- a/core/src/core/tests/test.Upload.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
-
-/**
- * Test upload tmp dir
- * @package Pydio
- * @subpackage Tests
- */
-class Upload extends AbstractTest
-{
-    public function __construct() { parent::__construct("Upload particularities", "<b>Testing configs</b>"); }
-    public function doTest()
-    {
-        $tmpDir = ini_get("upload_tmp_dir");
-        if (!$tmpDir) $tmpDir = realpath(sys_get_temp_dir());
-        if (ConfService::getCoreConf("AJXP_TMP_DIR") != "") {
-            $tmpDir = ConfService::getCoreConf("AJXP_TMP_DIR");
-        }
-        if (defined("AJXP_TMP_DIR") && AJXP_TMP_DIR !="") {
-            $tmpDir = AJXP_TMP_DIR;
-        }
-        $this->testedParams["Upload Tmp Dir Writeable"] = @is_writable($tmpDir);
-        $this->testedParams["PHP Upload Max Size"] = $this->returnBytes(ini_get("upload_max_filesize"));
-        $this->testedParams["PHP Post Max Size"] = $this->returnBytes(ini_get("post_max_size"));
-        foreach ($this->testedParams as $paramName => $paramValue) {
-            $this->failedInfo .= "\n$paramName=$paramValue";
-        }
-        if (!$this->testedParams["Upload Tmp Dir Writeable"]) {
-            $this->failedLevel = "error";
-            $this->failedInfo = "The temporary folder used by PHP to upload files is either incorrect or not writeable! Upload will not work. Please check : ".ini_get("upload_tmp_dir");
-            $this->failedInfo .= "<p class='suggestion'><b>Suggestion</b> : Set the AJXP_TMP_DIR parameter in the <i>conf/bootstrap_conf.php</i> file</p>";
-            return FALSE;
-        }
-
-        $this->failedLevel = "info";
-        return FALSE;
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/tests/test.UsersConfig.php b/core/src/core/tests/test.UsersConfig.php
deleted file mode 100644
index 7d0eb8459c..0000000000
--- a/core/src/core/tests/test.UsersConfig.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
-
-/**
- * Gather the users configuration
- * @package Pydio
- * @subpackage Tests
- */
-class UsersConfig extends AbstractTest
-{
-    public function __construct() { parent::__construct("Users Configuration", "Current config for users"); }
-    public function doTest()
-    {
-        $this->testedParams["Users enabled"] = AuthService::usersEnabled();
-        $this->testedParams["Guest enabled"] = ConfService::getCoreConf("ALLOW_GUEST_BROWSING", "auth");
-        $this->failedLevel = "info";
-        return FALSE;
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/tests/test.Writeability.php b/core/src/core/tests/test.Writeability.php
deleted file mode 100644
index 154c19b0f4..0000000000
--- a/core/src/core/tests/test.Writeability.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
-
-/**
- * Check the various plugins folders writeability
- * @package Pydio
- * @subpackage Tests
- */
-class Writeability extends AbstractTest
-{
-    public function __construct() { parent::__construct("Required writeable folder", "One of the following folder should be writeable and is not : "); }
-    public function doTest()
-    {
-        $checks = array();
-        $checks[] = AJXP_CACHE_DIR;
-        $checks[] = AJXP_DATA_PATH;
-        $checked = array();
-        $success = true;
-        foreach ($checks as $check) {
-            $w = false;
-            $check = AJXP_VarsFilter::filter($check);
-            if (!is_dir($check)) {// Check parent
-                $check = dirname($check);
-            }
-            $w = is_writable($check);
-            $checked[basename($check)] = "<b>".basename($check)."</b>:".($w?'true':'false');
-            $success = $success & $w;
-        }
-        $this->testedParams["Writeable Folders"] = "[".implode(',<br> ', array_values($checked))."]";
-        if (!$success) {
-            $this->failedInfo .= implode(",", $checks);
-            return FALSE;
-        }
-        $this->failedLevel = "info";
-        $this->failedInfo = "[".implode(',<br>', array_values($checked))."]";
-        return FALSE;
-    }
-}
\ No newline at end of file
diff --git a/core/src/core/tests/test.Zlib.php b/core/src/core/tests/test.Zlib.php
deleted file mode 100644
index 8df48ee272..0000000000
--- a/core/src/core/tests/test.Zlib.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once('../classes/class.AbstractTest.php');
-
-/**
- * Check that Zlib is enabled
- * @package Pydio
- * @subpackage Tests
- */
-class Zlib extends AbstractTest
-{
-    public function __construct() { parent::__construct("Zlib extension (ZIP)", "Extension enabled : ".((function_exists('gzopen')||function_exists('gzopen64'))?"1":"0")); }
-    public function doTest()
-    {
-        $this->testedParams["Zlib Enabled"] = ((function_exists('gzopen')||function_exists('gzopen64'))?"Yes":"No");
-        $this->failedLevel = "info";
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/core/src/data/cache/.htaccess b/core/src/data/cache/.htaccess
deleted file mode 100644
index 3418e55a68..0000000000
--- a/core/src/data/cache/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-deny from all
\ No newline at end of file
diff --git a/core/src/data/plugins/.htaccess b/core/src/data/plugins/.htaccess
deleted file mode 100644
index 3418e55a68..0000000000
--- a/core/src/data/plugins/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-deny from all
\ No newline at end of file
diff --git a/core/src/data/plugins/auth.serial/.htaccess b/core/src/data/plugins/auth.serial/.htaccess
deleted file mode 100644
index 3418e55a68..0000000000
--- a/core/src/data/plugins/auth.serial/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-deny from all
\ No newline at end of file
diff --git a/core/src/data/plugins/conf.serial/.htaccess b/core/src/data/plugins/conf.serial/.htaccess
deleted file mode 100644
index 3418e55a68..0000000000
--- a/core/src/data/plugins/conf.serial/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-deny from all
\ No newline at end of file
diff --git a/core/src/data/web.config b/core/src/data/web.config
new file mode 100644
index 0000000000..5381d13aa6
--- /dev/null
+++ b/core/src/data/web.config
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <system.webServer>
+        <security>
+            <requestFiltering>
+                <hiddenSegments>
+                    <add segment="data" />
+                </hiddenSegments>
+            </requestFiltering>
+        </security>
+    </system.webServer>
+</configuration>
diff --git a/core/src/dav.php b/core/src/dav.php
deleted file mode 100644
index 630f289611..0000000000
--- a/core/src/dav.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- * Description : Command line access of the framework.
- * DAV controller, loads the ezComponent webDav Server
- */
-include_once("base.conf.php");
-
-//set_error_handler(array("AJXP_XMLWriter", "catchError"), E_ALL & ~E_NOTICE );
-//set_exception_handler(array("AJXP_XMLWriter", "catchException"));
-$pServ = AJXP_PluginsService::getInstance();
-
-ConfService::init();
-ConfService::start();
-
-if (!ConfService::getCoreConf("WEBDAV_ENABLE")) {
-    die('You are not allowed to access this service');
-}
-
-$confStorageDriver = ConfService::getConfStorageImpl();
-require_once($confStorageDriver->getUserClassFileName());
-
-AJXP_PluginsService::getInstance()->initActivePlugins();
-
-/**
- * @param string $className
- * @return void
- */
-function AJXP_Sabre_autoload($className)
-{
-    if (strpos($className,'AJXP_Sabre_')===0) {
-        include AJXP_BIN_FOLDER. '/sabredav/ajaxplorer/class.' . $className . '.php';
-    }
-}
-spl_autoload_register('AJXP_Sabre_autoload');
-
-
-
-include 'core/classes/sabredav/lib/Sabre/autoload.php';
-
-if (ConfService::getCoreConf("WEBDAV_BASEHOST") != "") {
-    $baseURL = ConfService::getCoreConf("WEBDAV_BASEHOST");
-} else {
-    $baseURL = AJXP_Utils::detectServerURL();
-}
-$baseURI = ConfService::getCoreConf("WEBDAV_BASEURI");
-
-$requestUri = $_SERVER["REQUEST_URI"];
-if (substr($requestUri, 0, strlen($baseURI)) != $baseURI) 
-{
-    $baseURI = substr($requestUri, 0, stripos($requestUri, $baseURI)) . $baseURI;
-}
-$end = trim(substr($requestUri, strlen($baseURI."/")));
-$rId = null;
-if ((!empty($end) || $end ==="0") && $end[0] != "?") {
-
-    $parts = explode("/", $end);
-    $pathBase = $parts[0];
-    $repositoryId = $pathBase;
-
-    $repository = ConfService::getRepositoryById($repositoryId);
-    if ($repository == null) {
-        $repository = ConfService::getRepositoryByAlias($repositoryId);
-        if ($repository != null) {
-            $repositoryId = $repository->getId();
-        }
-    }
-    if ($repository == null) {
-        AJXP_Logger::debug("not found, dying $repositoryId");
-        die('You are not allowed to access this service');
-    }
-
-    $rId = $repositoryId;
-    $rootDir =  new AJXP_Sabre_Collection("/", $repository, null);
-    $server = new Sabre\DAV\Server($rootDir);
-    $server->setBaseUri($baseURI."/".$pathBase);
-
-
-} else {
-
-    $rootDir = new AJXP_Sabre_RootCollection("root");
-    $server = new Sabre\DAV\Server($rootDir);
-    $server->setBaseUri($baseURI);
-
-}
-
-if((AJXP_Sabre_AuthBackendBasic::detectBasicHeader() || ConfService::getCoreConf("WEBDAV_FORCE_BASIC"))
-    && ConfService::getAuthDriverImpl()->getOptionAsBool("TRANSMIT_CLEAR_PASS")){
-    $authBackend = new AJXP_Sabre_AuthBackendBasic($rId);
-} else {
-    $authBackend = new AJXP_Sabre_AuthBackendDigest($rId);
-}
-$authPlugin = new Sabre\DAV\Auth\Plugin($authBackend, ConfService::getCoreConf("WEBDAV_DIGESTREALM"));
-$server->addPlugin($authPlugin);
-
-if (!is_dir(AJXP_DATA_PATH."/plugins/server.sabredav")) {
-    mkdir(AJXP_DATA_PATH."/plugins/server.sabredav", 0755);
-    $fp = fopen(AJXP_DATA_PATH."/plugins/server.sabredav/locks", "w");
-    fwrite($fp, "");
-    fclose($fp);
-}
-
-$lockBackend = new Sabre\DAV\Locks\Backend\File(AJXP_DATA_PATH."/plugins/server.sabredav/locks");
-$lockPlugin = new Sabre\DAV\Locks\Plugin($lockBackend);
-$server->addPlugin($lockPlugin);
-
-if (ConfService::getCoreConf("WEBDAV_BROWSER_LISTING")) {
-    $browerPlugin = new AJXP_Sabre_BrowserPlugin((isSet($repository)?$repository->getDisplay():null));
-    $extPlugin = new Sabre\DAV\Browser\GuessContentType();
-    $server->addPlugin($browerPlugin);
-    $server->addPlugin($extPlugin);
-}
-try {
-    $server->exec();
-} catch ( Exception $e ) {
-    AJXP_Logger::error(__CLASS__,"Exception",$e->getMessage());
-}
diff --git a/core/src/index.php b/core/src/index.php
index ec5ee0467d..133994c9f0 100644
--- a/core/src/index.php
+++ b/core/src/index.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
  * This file is part of Pydio.
  *
  * Pydio is free software: you can redistribute it and/or modify
@@ -16,152 +16,15 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  *
  * Description : main access point of the application, this script is called by any Ajax query.
  * Will dispatch the actions on the plugins.
  */
-include_once("base.conf.php");
-
-if( !isSet($_GET["action"]) && !isSet($_GET["get_action"])
-    && !isSet($_POST["action"]) && !isSet($_POST["get_action"])
-    && defined("AJXP_FORCE_SSL_REDIRECT") && AJXP_FORCE_SSL_REDIRECT === true
-    && $_SERVER['HTTPS'] != "on") {
-    header("HTTP/1.1 301 Moved Permanently");
-    header("Location: https://".$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
-    exit();
-}
-
-if (isSet($_GET["ajxp_sessid"])) {
-    // Don't overwrite cookie
-    if (!isSet($_COOKIE["AjaXplorer"]))
-        $_COOKIE["AjaXplorer"] = $_GET["ajxp_sessid"];
-}
-header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-header("Cache-Control: no-cache, must-revalidate");
-header("Pragma: no-cache");
-
-if (is_file(TESTS_RESULT_FILE)) {
-    set_error_handler(array("AJXP_XMLWriter", "catchError"), E_ALL & ~E_NOTICE & ~E_STRICT );
-    set_exception_handler(array("AJXP_XMLWriter", "catchException"));
-}
-
-ConfService::init();
-ConfService::start();
-
-$confStorageDriver = ConfService::getConfStorageImpl();
-require_once($confStorageDriver->getUserClassFileName());
-
-// Custom Session Handler
-if(defined("AJXP_SESSION_HANDLER_PATH") && defined("AJXP_SESSION_HANDLER_CLASSNAME") && file_exists(AJXP_SESSION_HANDLER_PATH)){
-    require_once(AJXP_SESSION_HANDLER_PATH);
-    if(class_exists(AJXP_SESSION_HANDLER_CLASSNAME, false)){
-        $sessionHandlerClass = AJXP_SESSION_HANDLER_CLASSNAME;
-        $sessionHandler = new $sessionHandlerClass();
-        session_set_save_handler($sessionHandler, false);
-    }
-}
 
-if (!isSet($OVERRIDE_SESSION)) {
-    session_name("AjaXplorer");
-}
-session_start();
+use Pydio\Core\Http\TopLevelRouter;
 
-if (isSet($_GET["tmp_repository_id"]) || isSet($_POST["tmp_repository_id"])) {
-    try{
-        ConfService::switchRootDir(isset($_GET["tmp_repository_id"])?$_GET["tmp_repository_id"]:$_POST["tmp_repository_id"], true);
-    }catch(AJXP_Exception $e){
-        //$requireAuth = true;
-    }
-} else if (isSet($_SESSION["SWITCH_BACK_REPO_ID"])) {
-    ConfService::switchRootDir($_SESSION["SWITCH_BACK_REPO_ID"]);
-    unset($_SESSION["SWITCH_BACK_REPO_ID"]);
-}
-$action = "ping";
-if (preg_match('/MSIE 7/',$_SERVER['HTTP_USER_AGENT']) || preg_match('/MSIE 8/',$_SERVER['HTTP_USER_AGENT'])) {
-    $action = "get_boot_gui";
-} else {
-    $action = (strpos($_SERVER["HTTP_ACCEPT"], "text/html") !== false ? "get_boot_gui" : "ping");
-}
-if(isSet($_GET["action"]) || isSet($_GET["get_action"])) $action = (isset($_GET["get_action"])?$_GET["get_action"]:$_GET["action"]);
-else if(isSet($_POST["action"]) || isSet($_POST["get_action"])) $action = (isset($_POST["get_action"])?$_POST["get_action"]:$_POST["action"]);
-
-$pluginsUnSecureActions = ConfService::getDeclaredUnsecureActions();
-$unSecureActions = array_merge($pluginsUnSecureActions, array("get_secure_token"));
-if (!in_array($action, $unSecureActions) && AuthService::getSecureToken()) {
-    $token = "";
-    if(isSet($_GET["secure_token"])) $token = $_GET["secure_token"];
-    else if(isSet($_POST["secure_token"])) $token = $_POST["secure_token"];
-    if ( $token == "" || !AuthService::checkSecureToken($token)) {
-        throw new Exception("You are not allowed to access this resource.");
-    }
-}
-
-if (AuthService::usersEnabled()) {
-    $httpVars = array_merge($_GET, $_POST);
-
-    AuthService::logUser(null, null);
-    // Check that current user can access current repository, try to switch otherwise.
-    $loggedUser = AuthService::getLoggedUser();
-    if ($loggedUser == null || $loggedUser->getId() == "guest") {
-        // Try prelogging user if the session expired but the logging data is in fact still present
-        // For example, for basic_http auth.
-        AJXP_PluginsService::getInstance()->initActivePlugins();
-        AuthService::preLogUser($httpVars);
-        $loggedUser = AuthService::getLoggedUser();
-        if($loggedUser == null) $requireAuth = true;
-    }
-    if ($loggedUser != null) {
-           $res = ConfService::switchUserToActiveRepository($loggedUser, (isSet($httpVars["tmp_repository_id"])?$httpVars["tmp_repository_id"]:"-1"));
-           if (!$res) {
-               AuthService::disconnect();
-               $requireAuth = true;
-           }
-       }
-
-} else {
-    AJXP_Logger::debug(ConfService::getCurrentRepositoryId());
-}
-
-//Set language
-$loggedUser = AuthService::getLoggedUser();
-if($loggedUser != null && $loggedUser->getPref("lang") != "") ConfService::setLanguage($loggedUser->getPref("lang"));
-else if(isSet($_COOKIE["AJXP_lang"])) ConfService::setLanguage($_COOKIE["AJXP_lang"]);
-
-//------------------------------------------------------------
-// SPECIAL HANDLING FOR FANCY UPLOADER RIGHTS FOR THIS ACTION
-//------------------------------------------------------------
-if (AuthService::usersEnabled()) {
-    $loggedUser = AuthService::getLoggedUser();
-    if ($action == "upload" && ($loggedUser == null || !$loggedUser->canWrite(ConfService::getCurrentRepositoryId()."")) && isSet($_FILES['Filedata'])) {
-        header('HTTP/1.0 ' . '410 Not authorized');
-        die('Error 410 Not authorized!');
-    }
-}
+include_once("base.conf.php");
 
-// THIS FIRST DRIVERS DO NOT NEED ID CHECK
-//$ajxpDriver = AJXP_PluginsService::findPlugin("gui", "ajax");
-$authDriver = ConfService::getAuthDriverImpl();
-// DRIVERS BELOW NEED IDENTIFICATION CHECK
-if (!AuthService::usersEnabled() || ConfService::getCoreConf("ALLOW_GUEST_BROWSING", "auth") || AuthService::getLoggedUser()!=null) {
-    $confDriver = ConfService::getConfStorageImpl();
-    try{
-        $Driver = ConfService::loadRepositoryDriver();
-    }catch(Exception $e){
-        //AuthService::disconnect();
-    }
-}
-AJXP_PluginsService::getInstance()->initActivePlugins();
-require_once(AJXP_BIN_FOLDER."/class.AJXP_Controller.php");
-$xmlResult = AJXP_Controller::findActionAndApply($action, array_merge($_GET, $_POST), $_FILES);
-if ($xmlResult !== false && $xmlResult != "") {
-    AJXP_XMLWriter::header();
-    print($xmlResult);
-    AJXP_XMLWriter::close();
-} else if (isset($requireAuth) && AJXP_Controller::$lastActionNeedsAuth) {
-    AJXP_XMLWriter::header();
-    AJXP_XMLWriter::requireAuth();
-    AJXP_XMLWriter::close();
-}
-session_write_close();
+$router = new TopLevelRouter();
+$router->route();
\ No newline at end of file
diff --git a/core/src/index_shared.php b/core/src/index_shared.php
deleted file mode 100644
index 6e37553617..0000000000
--- a/core/src/index_shared.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-$OVERRIDE_SESSION = true;
-$h = '';
-if(isSet($_GET['minisite_session'])){
-    $h = $_GET['minisite_session'];
-}
-
-session_name("AjaXplorer_Shared".str_replace(".","_",$h));
-include("index.php");
diff --git a/core/src/opencollab.php b/core/src/opencollab.php
deleted file mode 100644
index 95ae2054f5..0000000000
--- a/core/src/opencollab.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/*
- * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-define('AJXP_EXEC', true);
-include_once("base.conf.php");
-
-$pServ = AJXP_PluginsService::getInstance();
-ConfService::$useSession = false;
-AuthService::$useSession = false;
-
-ConfService::init();
-ConfService::start();
-
-$confStorageDriver = ConfService::getConfStorageImpl();
-require_once($confStorageDriver->getUserClassFileName());
-
-$pServ->initActivePlugins();
-
-/**
- * @var Pydio\OCS\OCSPlugin $coreLoader
- */
-$coreLoader = $pServ->getPluginById("core.ocs");
-$configs = $coreLoader->getConfigs();
-
-$uri = $_SERVER["REQUEST_URI"];
-$parts = explode("/", trim(parse_url($uri, PHP_URL_PATH), "/"));
-$baseUri = array();
-$root = array_shift($parts);
-while(!in_array($root, array("ocs-provider", "ocs")) && count($parts)){
-    $baseUri[] = $root;
-    $root = array_shift($parts);
-}
-if( $root == "ocs-provider"){
-
-    $services = array();
-    $coreLoader->publishServices();
-
-}else if($root == "ocs"){
-
-    if(count($parts) < 2){
-        $d = new \Pydio\OCS\Server\Dummy();
-        $response = $d->buildResponse("fail", "400", "Wrong URI");
-        $d->sendResponse($response);
-        return;
-    }
-
-    $version = array_shift($parts);
-    if($version != "v2"){
-        $d = new \Pydio\OCS\Server\Dummy();
-        $response = $d->buildResponse("fail", "400", "Api version not supported - Please switch to v2.");
-        $d->sendResponse($response);
-        return;
-    }
-    $endpoint = array_shift($parts);
-    if(count($baseUri)){
-        $baseUriStr = "/".implode("/", $baseUri);
-    }else{
-        $baseUriStr = "";
-    }
-    $coreLoader->route($baseUriStr, $endpoint, $parts, array_merge($_GET, $_POST));
-
-}
\ No newline at end of file
diff --git a/core/src/phpdoc.dist.xml b/core/src/phpdoc.dist.xml
new file mode 100644
index 0000000000..d10390505b
--- /dev/null
+++ b/core/src/phpdoc.dist.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<phpdoc>
+    <parser>
+        <target>core/doc/php</target>
+    </parser>
+    <transformer>
+        <target>core/doc/php</target>
+    </transformer>
+    <files>
+        <directory>core/src/pydio</directory>
+        <directory>plugins</directory>
+        <ignore>*phpseclib*</ignore>
+        <ignore>*vendor*</ignore>
+        <ignore>*vendor/phpmailer*</ignore>
+        <ignore>*lib/class.phpmailer-lite.php</ignore>
+        <ignore>*openstack-sdk-php*</ignore>
+        <ignore>*CAS*</ignore>
+        <ignore>*duo_php*</ignore>
+        <ignore>*Elastica*</ignore>
+        <ignore>*Zend*</ignore>
+        <ignore>*i18n*</ignore>
+        <ignore>*dropbox-php*</ignore>
+        <ignore>*dibi*</ignore>
+        <ignore>*phpws*</ignore>
+        <ignore>*etherpad-client*</ignore>
+        <ignore>*SFTPPSL_StreamWrapper*</ignore>
+    </files>
+</phpdoc>
diff --git a/core/src/phpunit/AJXP/Tests/Atomics/PermissionMaskTest.php b/core/src/phpunit/AJXP/Tests/Atomics/PermissionMaskTest.php
deleted file mode 100755
index 4c5f71c3ff..0000000000
--- a/core/src/phpunit/AJXP/Tests/Atomics/PermissionMaskTest.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: charles
- * Date: 12/09/2015
- * Time: 10:42
- */
-
-namespace AJXP\Tests\Atomics;
-
-
-class AJXP_PermissionMaskTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @param \AJXP_Permission $permission
-     */
-    protected function isRW($permission){
-        $this->assertTrue($permission->canRead());
-        $this->assertTrue($permission->canWrite());
-        $this->assertFalse($permission->denies());
-    }
-
-    /**
-     * @param \AJXP_Permission $permission
-     */
-    protected function isReadonly($permission){
-        $this->assertTrue($permission->canRead());
-        $this->assertFalse($permission->canWrite());
-        $this->assertFalse($permission->denies());
-    }
-
-    /**
-     * @param \AJXP_Permission $permission
-     */
-    protected function isWriteonly($permission){
-
-        $this->assertFalse($permission->canRead());
-        $this->assertTrue($permission->canWrite());
-        $this->assertFalse($permission->denies());
-
-    }
-
-    /**
-     * @param \AJXP_Permission $permission
-     */
-    protected function isDenied($permission){
-
-        $this->assertTrue($permission->denies());
-        $this->assertFalse($permission->canRead());
-        $this->assertFalse($permission->canWrite());
-
-    }
-
-
-    public function testSimplePermission(){
-
-        $perm = new \AJXP_Permission();
-        $this->isDenied($perm);
-
-        $perm->setRead();
-        $this->isReadonly($perm);
-        $perm->setWrite();
-        $this->isRW($perm);
-        $perm->setDeny();
-        $this->isDenied($perm);
-
-        $perm->setDeny(false);
-
-        // When perm is empty, => denied by default
-        $this->isDenied($perm);
-        $perm->setRead();
-        $perm->setRead(false);
-        $this->isDenied($perm);
-        $perm->setWrite();
-        $perm->setWrite(false);
-        $this->isDenied($perm);
-
-    }
-
-
-    public function testPermissionOverride(){
-
-        $readonly = new \AJXP_Permission("r");
-        $writeonly = new \AJXP_Permission("w");
-        $readwrite = new \AJXP_Permission("rw");
-        $deny = new \AJXP_Permission("d");
-        $empty = new \AJXP_Permission();
-
-        $this->isRW($writeonly->override($readonly));
-        $this->isRW($readonly->override($writeonly));
-        $this->isRW($readwrite->override($readonly));
-        $this->isRW($readwrite->override($writeonly));
-        $this->isRW($readonly->override($readwrite));
-        $this->isRW($writeonly->override($readwrite));
-
-        $this->isDenied($deny->override($readonly));
-        $this->isDenied($deny->override($writeonly));
-        $this->isDenied($deny->override($readwrite));
-
-        $this->isDenied($empty->override($readonly));
-        $this->isDenied($empty->override($writeonly));
-        $this->isDenied($empty->override($readwrite));
-        $this->isRW($writeonly->override($readonly));
-    }
-
-    /**
-     * @parra
-     *
-     */
-    public function testPermissionMask(){
-        $mask = new \AJXP_PermissionMask();
-        $mask->updateBranch("/a1/b1/c1", new \AJXP_Permission("r"));
-        echo "\n";
-        $mask->toStr($mask->getTree(), 1);
-        $mask->updateBranch("/a1/b1/c2", new \AJXP_Permission("rw"));
-        $mask->updateBranch("/a1/b1/c3", new \AJXP_Permission());
-        echo "\n";
-        $mask->toStr($mask->getTree(), 1);
-        $mask->updateBranch("/a1/b2", new \AJXP_Permission("rw"));
-        echo "\n";
-        $mask->toStr($mask->getTree(), 1);
-
-        $mask->updateBranch("/a1/b3", new \AJXP_Permission());
-
-        $mask->updateBranch("a2/b1", new \AJXP_Permission());
-
-        $this->assertFalse($mask->match("/", \AJXP_Permission::WRITE));
-        $this->assertTrue($mask->match("/", \AJXP_Permission::READ));
-        $this->assertTrue($mask->match("/a1/b1/c1", \AJXP_Permission::READ));
-        $this->assertTrue($mask->match("/a1/b1", \AJXP_Permission::READ));
-        $this->assertFalse($mask->match("/a1/b1", \AJXP_Permission::WRITE));
-
-        $this->assertFalse($mask->match("/a1/b1/c3", \AJXP_Permission::READ));
-        $this->assertTrue($mask->match("/a1/b1/c1/d1/e1/f1", \AJXP_Permission::READ));
-        $this->assertFalse($mask->match("/a1/b1/c1/d1/e1/f1", \AJXP_Permission::WRITE));
-
-        // This overrides the whole /a1/b1 branch >> do we want that?
-        $mask2 = new \AJXP_PermissionMask();
-        $mask2->updateBranch("/a1/b1", new \AJXP_Permission("d"));
-        //$mask->override($mask2);
-
-        echo "mask 2\n";
-        $mask2->toStr($mask2->getTree(), 0);
-        echo "mask 1\n";
-        $mask->toStr($mask->getTree(), 0);
-        echo "Mask 2 override mask 1\n";
-        $mask->override($mask2);
-        $mask->toStr($mask->getTree(), 0);
-
-        //$this->assertTrue($mask->match("/a1/b1", \AJXP_Permission::WRITE));
-        // Todo write more tests
-
-        $mask->updateBranch("/a1/b1/c1", new \AJXP_Permission("w"));
-
-        //$this->assertFalse($mask->match("/a1/b1/c1", \AJXP_Permission::READ));
-        $this->assertTrue($mask->match("/a1/b1/c1", \AJXP_Permission::WRITE));
-
-       //
-       //
-       // $this->assertTrue($mask->match("/a1/b1/c2", \AJXP_Permission::READ));
-        //$this->assertTrue($mask->match("/a1/b1/c2", \AJXP_Permission::WRITE));
-
-        //$this->assertTrue($mask->match("/a1", \AJXP_Permission::DENY));
-
-        // Test that a deny is cutting the sub branches
-        $mask1 = new \AJXP_PermissionMask();
-        $mask1->updateBranch("/a1/b1", new \AJXP_Permission("rw"));
-        $mask1->updateBranch("/a1/b2", new \AJXP_Permission("rw"));
-        $mask1->updateBranch("/a1/b3/c1", new \AJXP_Permission("rw"));
-        $mask1->updateBranch("/a1/b3/c2", new \AJXP_Permission("rw"));
-
-        $mask2 = new \AJXP_PermissionMask();
-        $mask2->updateBranch("/a1", new \AJXP_Permission("d"));
-
-        $result = $mask1->override($mask2);
-        $this->assertFalse($result->match("/a1", \AJXP_Permission::READ));
-        $this->assertFalse($result->match("/a1/b2", \AJXP_Permission::READ));
-        $this->assertFalse($result->match("/a1/b3", \AJXP_Permission::READ));
-        $this->assertFalse($result->match("/a1/b3/c1", \AJXP_Permission::READ));
-        $this->assertFalse($result->match("/a1/any", \AJXP_Permission::READ));
-
-    }
-
-}
-
-
-
diff --git a/core/src/phpunit/AJXP/Tests/Suite/Atomics.php b/core/src/phpunit/AJXP/Tests/Suite/Atomics.php
deleted file mode 100644
index 6ab2b2e20a..0000000000
--- a/core/src/phpunit/AJXP/Tests/Suite/Atomics.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-namespace AJXP\Tests\Suite;
-
-class Atomics extends \PHPUnit_Framework_TestSuite
-{
-    public static function suite()
-    {
-        $s =  new Atomics();
-        $s->addTestFile("AJXP/Tests/Atomics/RolesTest.php");
-        $s->addTestFile("AJXP/Tests/Atomics/UtilsTest.php");
-        $s->addTestFile("AJXP/Tests/Atomics/PermissionMaskTest.php");
-        return $s;
-
-    }
-
-    protected function setUp()
-    {
-    }
-
-    protected function tearDown()
-    {
-    }
-
-}
diff --git a/core/src/phpunit/HOWTO b/core/src/phpunit/HOWTO
deleted file mode 100644
index 00cc4beace..0000000000
--- a/core/src/phpunit/HOWTO
+++ /dev/null
@@ -1,4 +0,0 @@
-We pass the base.conf.php file as the PHPUnit "bootstrap" file. For example, running a given
-test suite, knowing AjaXplorer is installed at /var/www/ajaxplorer :
-
-> phpunit --bootstrap /var/www/ajaxplorer/base.conf.php AJXP_Suite_Atomics
diff --git a/core/src/plugins/access.ajxp_conf/ajxp_confActions.xml b/core/src/plugins/access.ajxp_conf/ajxp_confActions.xml
index d39f980e23..b5825f1960 100644
--- a/core/src/plugins/access.ajxp_conf/ajxp_confActions.xml
+++ b/core/src/plugins/access.ajxp_conf/ajxp_confActions.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <registry_contributions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
 	<actions>
-		<action name="ls" dirDefault="true">
-			<gui text="32" title="32" src="fileopen.png"
-				accessKey="folder_access_key" iconClass="icon-folder-open-alt">
-				<context selection="true" dir="" recycle="false"
-					actionBar="false" actionBarGroup="get" contextMenu="true" infoPanel="false"/>
-				<selectionContext dir="true" file="false" recycle="false"
-					unique="true" allowedMimes="*">
-				</selectionContext>
-			</gui>
-			<rightsContext noUser="true" userLogged="only" read="true"
-				write="false" adminOnly="false">
-			</rightsContext>
-			<processing>
-				<clientCallback prepareModal="true"><![CDATA[
+
+        <!-- SHARED ACTIONS -->
+        <action name="ls" dirDefault="true">
+            <gui text="32" title="32" src="fileopen.png"
+                 accessKey="folder_access_key" iconClass="icon-folder-open-alt">
+                <context selection="true" dir="" recycle="false"
+                         actionBar="false" actionBarGroup="get" contextMenu="true" infoPanel="false"/>
+                <selectionContext dir="true" file="false" recycle="false"
+                                  unique="true" allowedMimes="*">
+                </selectionContext>
+            </gui>
+            <rightsContext noUser="true" userLogged="only" read="true"
+                           write="false" adminOnly="false">
+            </rightsContext>
+            <processing>
+                <clientCallback prepareModal="true"><![CDATA[
 					var path;
 					if(window.actionArguments && window.actionArguments.length>0){
 						path = window.actionArguments[0];
@@ -29,76 +31,276 @@
 						ajaxplorer.updateContextData(path);
 					}
 					]]></clientCallback>
-				<serverCallback methodName="switchAction" restParams="/dir+" developerComment="List the content of the config. Depending on the path, will return users, workspaces, roles, etc..">
+                <serverCallback methodName="listAction" restParams="/dir+" developerComment="List the content of the config. Depending on the path, will return users, workspaces, roles, etc..">
                     <input_param name="dir" type="path" description="Path to config data to list. See URIs in webapp to guess the correct path."/>
-				</serverCallback>
-			</processing>
-		</action>
-		<action name="admin_search">
-			<processing>
-				<serverCallback methodName="searchAction" restParams="/query/dir+" developerComment="Remote search implementation, currently only supporting users search."/>
-			</processing>
-		</action>
-		<action name="stat">
-			<processing>
-				<serverCallback methodName="switchAction" developerComment="To comply with GUI client, always returns true."/>
-			</processing>
-		</action>
-        <action name="list_all_plugins_actions">
-            <processing>
-                <serverCallback methodName="listAllActions" restParams="/" developerComment="Returns a structured JSON object of all plugins and all their available actions"/>
+                </serverCallback>
             </processing>
         </action>
-        <action name="list_all_plugins_parameters">
+        <action name="stat">
             <processing>
-                <serverCallback methodName="listAllActions" restParams="/" developerComment="Returns a structured JSON object of all plugins and all their available parameter"/>
+                <serverCallback methodName="listAction" developerComment="To comply with GUI client, always returns true."/>
             </processing>
         </action>
-        <action name="parameters_to_form_definitions">
+        <action name="edit" fileDefault="true">
+            <gui text="ajxp_conf.93" title="301" iconClass="icon-edit" src="edit.png" accessKey="edit_access_key" hasAccessKey="true">
+                <context selection="true" dir="" recycle="hidden"
+                         actionBar="true" contextMenu="true" infoPanel="true"
+                         actionBarGroup="get" inZip="false">
+                </context>
+                <selectionContext dir="true" file="true" recycle="false" unique="true" allowedMimes="user,user_editable,repository,repository_editable,role,group,ajxp_plugin,ajxp_role,ajxp_graphs,datagrid" behaviour="hidden"/>
+            </gui>
+            <rightsContext noUser="true" userLogged="only" read="true" write="true" adminOnly=""/>
             <processing>
-                <serverCallback methodName="listAllActions" restParams="/" developerComment="Takes in input a list of plugin parameters and builds the corresponding XML to create a standard form."/>
+                <clientCallback prepareModal="false"><![CDATA[
+                    var editorData = window.actionArguments[0];
+                    pydio.UI.openCurrentSelectionInEditor(editorData);
+                ]]></clientCallback>
+                <serverCallback methodName="editAction" restParams="/sub_action" developerComment="Shortcut for various actions, calling edit with subaction parameter."/>
             </processing>
         </action>
-        <action name="list_all_repositories_json">
+        <action name="delete">
+            <gui text="7" title="161" src="editdelete.png" iconClass="icon-trash" accessKey="delete_access_key" hasAccessKey="true" specialAccessKey="delete">
+                <context selection="true" dir="" recycle="false"
+                         actionBar="true" contextMenu="true" infoPanel="false"
+                         actionBarGroup="get" inZip="false">
+                </context>
+                <selectionContext dir="true" file="true" recycle="false" unique="false"  allowedMimes="user_editable,repository_editable,role,group" image="false" editable="false" behaviour="hidden"/></gui>
+            <rightsContext noUser="true" userLogged="only" read="true" write="true" adminOnly=""/>
             <processing>
-                <serverCallback methodName="listAllActions" restParams="/" developerComment="Returns all repository (output format is JSON)"/>
+                <clientCallback prepareModal="true"><![CDATA[
+				    var userSelection;
+				    if(window.actionArguments && window.actionArguments.length){
+				        userSelection = window.actionArguments[0];
+                    }else{
+                        userSelection =  ajaxplorer.getUserSelection();
+				    }
+				    var node = userSelection.getUniqueNode();
+					var meta = node.getMetadata();
+					var deleteMessage, fieldName, fieldValue;
+					if(meta.get("ajxp_mime") == "user_editable"){
+						deleteMessage = MessageHash['ajxp_conf.34'];
+						fieldName = "user_id";
+						fieldValue = getBaseName(meta.get("filename"));
+					}else if(meta.get("ajxp_mime") == "role"){
+						deleteMessage = MessageHash['ajxp_conf.126'];
+						fieldName = "role_id";
+						fieldValue = getBaseName(meta.get("filename"));
+					}else if(meta.get("ajxp_mime") == "group"){
+						deleteMessage = MessageHash['ajxp_conf.126'];
+						fieldName = "group";
+						fieldValue = meta.get("filename");
+					}else{
+						deleteMessage = MessageHash['ajxp_conf.35'];
+						fieldName = "repository_id";
+						fieldValue = meta.get("repository_id");
+					}
+					var onLoad = function(oForm){
+		   		    	$(oForm).select('span[id="delete_message"]')[0].update(deleteMessage);
+		   		    	var hidden = $(oForm).select('input[type="hidden"]')[0];
+		   		    	hidden.setAttribute("name", fieldName);
+		   		    	hidden.setAttribute("value", fieldValue);
+					};
+					modal.showDialogForm('Delete', 'delete_config_form', onLoad, function(){
+						var oForm = modal.getForm();
+						PydioApi.getClient().submitForm(oForm);
+                        if (userSelection.isMultiple()) {
+                           var i = 1;
+	   		    	       var hidden = $(oForm).select('input[type="hidden"]')[0];
+                           while (true) {
+                              try {
+                                  var node = userSelection.getNode(i);
+                                  var meta = node.getMetadata();
+                                  var value;
+                                  if(meta.get("ajxp_mime") == "user_editable"){
+                                  	value = meta.get("text");
+                                  }else{
+                                  	value = meta.get("text");
+                                  }
+                                  hidden.setAttribute("value", value);
+            					  PydioApi.getClient().submitForm(oForm);
+                                  i++;
+                              } catch (e)
+                              {
+                                  break;
+                              }
+                           }
+                        }
+						hideLightBox(true);
+						return false;
+					});
+					]]></clientCallback>
+                <clientForm id="delete_config_form"><![CDATA[
+				<div id="delete_config_form" action="delete" box_width="280">
+					<span id="delete_message"></span>
+					<input type="hidden" name="" value=""/>
+				</div>
+				]]></clientForm>
+                <serverCallback methodName="deleteAction" restParams="/data_type/data_id+" developerComment="Generic delete action for config driver, used to delete users, workspaces, roles, etc.">
+                    <input_param description="Type of the data to delete. Can be : user, group, role, repository" name="data_type" type="String"/>
+                    <input_param description="Id of the data to delete. For groups, full group path." name="data_id"
+                                 type="string"/>
+                </serverCallback>
             </processing>
         </action>
-        <action name="generate_api_docs">
+
+        <!-- REPOSITORIES ACTIONS -->
+		<action name="create_repository">
+			<gui text="ajxp_conf.90" title="300" iconClass="icon-sitemap" src="hdd_external_unmount.png" accessKey="ajxp_conf.repository_access_key" hasAccessKey="false">
+				<context selection="false" dir="false" recycle="hidden"  behaviour="hidden" allowedMimes="workspaces_zone"
+					actionBar="true" contextMenu="false" infoPanel="false"
+					actionBarGroup="put" inZip="false">
+				</context>
+			</gui>
+			<rightsContext noUser="true" userLogged="only" read="true" write="true" adminOnly="true"/>
+			<processing>
+				<clientCallback prepareModal="true"><![CDATA[
+					var loadFunc = function(oForm){
+						ajaxplorer.getUserSelection().updateFormOrUrl(oForm);
+						if(!pydio.getController().configEditor){
+							pydio.getController().configEditor = new ConfigEditor(oForm);
+						}
+						pydio.getController().configEditor.setForm(oForm);
+						pydio.getController().configEditor.initCreateRepoWizard('repository');
+					};
+					modal.showDialogForm('Create Repository', 'create_repository_box', loadFunc, null, null, false, true);
+					]]></clientCallback>
+				<clientForm id="create_repository_box"><![CDATA[
+					<div id="create_repository_box" action="create_repository" box_width="380">
+					    <div id="creation_form" style="padding:5px;padding-top:0px;">
+                            <div class="dialogLegend repoCreationString">AJXP_MESSAGE[ajxp_conf.95]</div>
+                            <div class="dialogLegend tplCreationString">AJXP_MESSAGE[ajxp_conf.96]</div>
+                            <div class="SF_element">
+                                <div class="SF_label repoCreationString" ajxp_message_id="ajxp_conf.8">AJXP_MESSAGE[ajxp_conf.8]* : </div>
+                                <div class="SF_label tplCreationString" ajxp_message_id="ajxp_conf.116">AJXP_MESSAGE[ajxp_conf.116]* : </div>
+                                <input name="new_user_login" type="text" class="SF_input dialogFocus"/>
+                            </div>
+                            <div class="SF_element">
+                                <div class="SF_label repoCreationString" ajxp_message_id="ajxp_conf.32">AJXP_MESSAGE[ajxp_conf.32]* : </div>
+                                <div class="SF_label tplCreationString" ajxp_message_id="ajxp_conf.117">AJXP_MESSAGE[ajxp_conf.117]* : </div>
+                                <select class="SF_input"><option>AJXP_MESSAGE[ajxp_conf.33]</option></select>
+                            </div>
+						</div>
+						<div id="driver_form" style="margin-top:32px;"></div>
+						<div class="dialogButtons" style="direction:rtl;">
+							<input type="submit" class="dialogButton" id="submit_create_repo" value="Next" class="button" onclick="return false;">
+							<input type="button" class="dialogButton" value="Cancel" class="button" onclick="hideLightBox();return false;">
+						</div>
+					</div>
+				]]></clientForm>
+				<serverCallback methodName="repositoriesAction" restParams="/json_data" developerComment="Create a workspace ( = repository, it's the same ) by passing a structured JSON object.">
+                    <input_param description="A JSON object containing the following mandatory keys : DISPLAY (string), DRIVER (string), DRIVER_OPTIONS (array of options) and optional keys : DISPLAY_ID (string), DESCRIPTION_ID (string), AJXP_SLUG (string), IS_TEMPLATE (boolean). &lt;br&gt;&lt;br&gt; The expected DRIVER value can be either an access type plugin name (fs, ftp, etc), or a template id by using the ajxp_template_ prefix (ajxp_template_TEMPLATE_ID). The DRIVER_OPTIONS array may depend on the used access type." name="json_data" type="JSON"/>
+				</serverCallback>
+				</processing>
+		</action>
+		<action name="create_repository_template">
+			<gui text="ajxp_conf.91" title="ajxp_conf.92" iconClass="icon-th" src="hdd_external_unmount.png" hasAccessKey="false">
+				<context selection="false" dir="false" recycle="hidden"  behaviour="hidden" allowedMimes="workspaces_zone"
+					actionBar="true" contextMenu="false" infoPanel="false"
+					actionBarGroup="put" inZip="false">
+				</context>
+			</gui>
+			<rightsContext noUser="true" userLogged="only" read="true" write="true" adminOnly="true"/>
+			<processing>
+				<clientCallback prepareModal="true"><![CDATA[
+					var loadFunc = function(oForm){
+						ajaxplorer.getUserSelection().updateFormOrUrl(oForm);
+						if(!pydio.getController().configEditor){
+							pydio.getController().configEditor = new ConfigEditor(oForm);
+						}
+						pydio.getController().configEditor.setForm(oForm);
+						pydio.getController().configEditor.initCreateRepoWizard('template');
+					};
+					modal.showDialogForm('Create Repository', 'create_repository_box', loadFunc, null, null, false, true);
+                ]]></clientCallback>
+            </processing>
+		</action>
+        <action name="edit_repository_label">
+            <gui text="6" title="158" src="applix.png" iconClass="icon-pencil" accessKey="rename_access_key" hasAccessKey="true">
+                <context selection="true" dir="" recycle="hidden" allowedMimes="workspaces_zone"
+                         actionBar="true" contextMenu="true" infoPanel="false"
+                         actionBarGroup="get" inZip="false">
+                </context>
+                <selectionContext dir="false" file="true" recycle="false" unique="true" allowedMimes="repository_editable" behaviour="hidden"/>
+            </gui>
+            <rightsContext noUser="true" userLogged="only" read="true" write="true" adminOnly=""/>
             <processing>
-                <serverCallback methodName="switchAction" restParams="/version" developerComment="Generate API docs">
-                    <input_param name="version" type="string" description="A two-digits version string, like 5.4, 6.2"/>
+                <clientCallback prepareModal="false"><![CDATA[
+					var callback = function(node, newValue){
+						var conn = new Connexion();
+						conn.addParameter('get_action', 'edit');
+						conn.addParameter('sub_action', 'edit_repository_label');
+						conn.addParameter('repository_id', node.getMetadata().get('repository_id'));
+						conn.addParameter('newLabel', newValue);
+						conn.onComplete = function(transport){
+							PydioApi.getClient().parseXmlMessage(transport.responseXML);
+						};
+						conn.sendSync();
+					};
+
+					if(ajaxplorer.getUserSelection() && ajaxplorer.getUserSelection().getSelectionSource() && ajaxplorer.getUserSelection().getSelectionSource().switchCurrentLabelToEdition) {ajaxplorer.getUserSelection().getSelectionSource().switchCurrentLabelToEdition(callback);}
+					]]></clientCallback>
+                <serverCallback methodName="repositoriesAction" restParams="/repository_id/newLabel" developerComment="Update a workspace label">
+                    <input_param description="Repository Identifier" name="repository_id" type="string"/>
+                    <input_param description="New Label" name="newLabel" type="string"/>
                 </serverCallback>
             </processing>
         </action>
-		<action name="get_plugin_manifest">
+		<action name="edit_repository">
 			<processing>
-				<serverCallback methodName="switchAction" restParams="/plugin_id" developerComment="Send a plugin Manifest file.">
-                    <input_param description="Plugin identifier (like type.name)" name="plugin_id" type="string"/>
-                    <output type="XML" description="Manifest content"/>
+				<serverCallback methodName="repositoriesAction" developerComment="Load Repository." restParams="/repository_id"/>
+			</processing>
+		</action>
+		<action name="meta_source_edit">
+			<processing>
+				<serverCallback methodName="repositoriesAction" developerComment="Edit an existing meta source parameters." restParams="/repository_id/plugId/json_data">
+                    <input_param description="Id of the repository" name="repository_id" type="string"/>
+                    <input_param description="Id of the plugin" name="plugId" type="string"/>
+                    <input_param description="JSON Representation of the plugin necessary options" name="json_data"
+                                 type="JSON"/>
 				</serverCallback>
 			</processing>
 		</action>
-		<action name="run_plugin_action">
+		<action name="meta_source_add">
 			<processing>
-				<serverCallback methodName="switchAction" restParams="/action_plugin_id/action_plugin_method" developerComment="Execute a class method on a plugin. Used for example for testing a DB connexion.">
-                    <input_param name="action_plugin_id" type="string" description="A plugin id, in the form type.name"/>
-                    <input_param name="action_plugin_method" type="string" description="A plugin method"/>
-                    <input_param name="form_data" type="FORM_DATA"
-                                 description="A set of parameters complying to the standard form parser"/>
+				<serverCallback methodName="repositoriesAction" developerComment="Add a meta source to a repository, setting its parameters." restParams="/repository_id/plugId/json_data">
+                    <input_param description="Id of the repository" name="repository_id" type="string"/>
+                    <input_param description="Id of the plugin" name="plugId" type="string"/>
+                    <input_param description="JSON Representation of the plugin necessary options" name="json_data"
+                                 type="JSON"/>
 				</serverCallback>
 			</processing>
 		</action>
-		<action name="create_user">
-			<gui text="297" title="298" src="yast_user_add.png" iconClass="icon-user" accessKey="create_user_accesskey" hasAccessKey="true">
-				<context selection="false" dir="false" recycle="hidden" allowedMimes="users_zone,group" behaviour="hidden"
-					actionBar="true" contextMenu="true" infoPanel="false"
-					actionBarGroup="put" inZip="false">
-				</context>
-			</gui>
-			<rightsContext noUser="true" userLogged="only" read="true" write="true" adminOnly="true"/>
+		<action name="meta_source_delete">
 			<processing>
-				<clientCallback prepareModal="true"><![CDATA[
+				<serverCallback methodName="repositoriesAction" developerComment="Remove a given meta source from a repository." restParams="/repository_id/plugId">
+                    <input_param description="Id of the repository" name="repository_id" type="string"/>
+                    <input_param description="Id of the plugin" name="plugId" type="string"/>
+				</serverCallback>
+			</processing>
+		</action>
+        <action name="patch_repository">
+            <processing><serverCallback methodName="repositoriesAction"/></processing>
+        </action>
+        <action name="post_repository">
+            <processing><serverCallback methodName="repositoriesAction"/></processing>
+        </action>
+        <action name="list_all_repositories_json">
+            <processing>
+                <serverCallback methodName="repositoriesAction" restParams="/" developerComment="Returns all repository (output format is JSON)"/>
+            </processing>
+        </action>
+
+        <!-- USERS ACTIONS -->
+        <action name="create_user">
+            <gui text="297" title="298" src="yast_user_add.png" iconClass="icon-user" accessKey="create_user_accesskey" hasAccessKey="true">
+                <context selection="false" dir="false" recycle="hidden" allowedMimes="users_zone,group" behaviour="hidden"
+                         actionBar="true" contextMenu="true" infoPanel="false"
+                         actionBarGroup="put" inZip="false">
+                </context>
+            </gui>
+            <rightsContext noUser="true" userLogged="only" read="true" write="true" adminOnly="true"/>
+            <processing>
+                <clientCallback prepareModal="true"><![CDATA[
 					var completeFunc = function(){
 						var oForm = modal.getForm();
 						if(!pydio.getController().configEditor){
@@ -123,7 +325,7 @@
 					};
 					modal.showDialogForm('Create User', 'create_user_box', loadFunc, completeFunc, null, null, null, true);
 					]]></clientCallback>
-				<clientForm id="create_user_box"><![CDATA[
+                <clientForm id="create_user_box"><![CDATA[
 					<div id="create_user_box" action="create_user" box_width="210">
 						<div class="SF_element">
 							<div class="SF_label" ajxp_message_id="94">AJXP_MESSAGE[94] : </div><input name="new_user_login" type="text" class="dialogFocus SF_input"/>
@@ -141,52 +343,28 @@
 						</div>
 					</div>
 				]]></clientForm>
-				<serverCallback methodName="switchAction"
+                <serverCallback methodName="usersAction"
                                 developerComment="Create a user with login and password in the AUTH directory."
                                 restParams="/new_user_login/new_user_pwd"
-                        >
+                >
                     <input_param description="User login, must be alphanumerical, no special chars" name="new_user_login" type="string"/>
                     <input_param description="User password, must be alphanumerical, no special chars" name="new_user_pwd" type="string"/>
-				</serverCallback>
-				</processing>
-		</action>
-		<action name="create_role">
-			<gui text="ajxp_conf.75" title="ajxp_conf.75" iconClass="icon-th" src="user_group_new.png" accessKey="ajxp_conf.role_access" hasAccessKey="true">
-				<context selection="false" dir="false" recycle="hidden" allowedMimes="roles_zone"  behaviour="hidden"
-					actionBar="true" contextMenu="false" infoPanel="false"
-					actionBarGroup="put" inZip="false">
-				</context>
-			</gui>
-			<rightsContext noUser="true" userLogged="only" read="true" write="true" adminOnly="true"/>
-			<processing>
-				<clientCallback prepareModal="true"><![CDATA[
-					modal.showDialogForm('Create Role', 'create_role_box');
-					]]></clientCallback>
-				<clientForm id="create_role_box"><![CDATA[
-					<div id="create_role_box" action="create_role" box_width="210">
-						<div class="SF_element">
-							<div class="SF_label" ajxp_message_id="ajxp_conf.76">AJXP_MESSAGE[ajxp_conf.76] : </div><input name="role_id" type="text" class="dialogFocus SF_input"/>
-						</div>
-					</div>
-				]]></clientForm>
-				<serverCallback methodName="switchAction" developerComment="Create an empty role" restParams="/role_id">
-                    <input_param description="Role identifier" name="role_id" type="string"/>
-				</serverCallback>
-			</processing>
-		</action>
-		<action name="create_group">
-			<gui text="ajxp_conf.118" title="ajxp_conf.118" iconClass="icon-group" src="user_group_new.png" accessKey="ajxp_conf.group_access" hasAccessKey="true">
-				<context selection="false" dir="false" recycle="hidden" allowedMimes="users_zone,group"  behaviour="hidden"
-					actionBar="true" contextMenu="false" infoPanel="false"
-					actionBarGroup="put" inZip="false">
-				</context>
-			</gui>
-			<rightsContext noUser="true" userLogged="only" read="true" write="true" adminOnly="true"/>
-			<processing>
-				<clientCallback prepareModal="true"><![CDATA[
+                </serverCallback>
+            </processing>
+        </action>
+        <action name="create_group">
+            <gui text="ajxp_conf.118" title="ajxp_conf.118" iconClass="icon-group" src="user_group_new.png" accessKey="ajxp_conf.group_access" hasAccessKey="true">
+                <context selection="false" dir="false" recycle="hidden" allowedMimes="users_zone,group"  behaviour="hidden"
+                         actionBar="true" contextMenu="false" infoPanel="false"
+                         actionBarGroup="put" inZip="false">
+                </context>
+            </gui>
+            <rightsContext noUser="true" userLogged="only" read="true" write="true" adminOnly="true"/>
+            <processing>
+                <clientCallback prepareModal="true"><![CDATA[
 					modal.showDialogForm('Create Role', 'create_group_box');
 					]]></clientCallback>
-				<clientForm id="create_group_box"><![CDATA[
+                <clientForm id="create_group_box"><![CDATA[
 					<div id="create_group_box" action="create_group" box_width="210">
 						<div class="SF_element">
 							<div class="SF_label" ajxp_message_id="ajxp_conf.76">Group ID : </div><input name="group_name" type="text" class="dialogFocus SF_input"/>
@@ -196,107 +374,37 @@
 						</div>
 					</div>
 				]]></clientForm>
-				<serverCallback methodName="switchAction" developerComment="Create a new group of users" restParams="/group_label/group_path+">
+                <serverCallback methodName="usersAction" developerComment="Create a new group of users" restParams="/group_label/group_path+">
                     <input_param description="Full group path, must be in the form /group/path/name" name="group_path" type="String"/>
                     <input_param description="Group Label" name="group_label" type="String"/>
-				</serverCallback>
-			</processing>
-		</action>
-		<action name="user_update_group" dragndropDefault="true">
-			<gui text="ajxp_conf.119" title="ajxp_conf.119" src="user_group_new.png" accessKey="ajxp_conf.role_access" hasAccessKey="true">
-				<context selection="false" dir="false" recycle="hidden"  behaviour="hidden"
-					actionBar="false" contextMenu="false" infoPanel="false"
-					actionBarGroup="put" inZip="false">
-				</context>
-			</gui>
-			<rightsContext noUser="true" userLogged="only" read="true" write="true" adminOnly="true"/>
-            <processing>
-                <serverCallback methodName="switchAction" developerComment="Move an existing user to an existing group" restParams="/file/group_path+">
-                    <input_param description="User identifier" name="file" type="String"/>
-                    <input_param description="Target group path, must be /group/path" name="group_path" type="String"/>
                 </serverCallback>
             </processing>
-		</action>
-		<action name="create_repository">
-			<gui text="ajxp_conf.90" title="300" iconClass="icon-sitemap" src="hdd_external_unmount.png" accessKey="ajxp_conf.repository_access_key" hasAccessKey="false">
-				<context selection="false" dir="false" recycle="hidden"  behaviour="hidden" allowedMimes="workspaces_zone"
-					actionBar="true" contextMenu="false" infoPanel="false"
-					actionBarGroup="put" inZip="false">
-				</context>
-			</gui>
-			<rightsContext noUser="true" userLogged="only" read="true" write="true" adminOnly="true"/>
-			<processing>
-				<clientCallback prepareModal="true"><![CDATA[
-					var loadFunc = function(oForm){
-						ajaxplorer.getUserSelection().updateFormOrUrl(oForm);
-						if(!pydio.getController().configEditor){
-							pydio.getController().configEditor = new ConfigEditor(oForm);
-						}
-						pydio.getController().configEditor.setForm(oForm);
-						pydio.getController().configEditor.initCreateRepoWizard('repository');
-					};
-					modal.showDialogForm('Create Repository', 'create_repository_box', loadFunc, null, null, false, true);
-					]]></clientCallback>
-				<clientForm id="create_repository_box"><![CDATA[
-					<div id="create_repository_box" action="create_repository" box_width="380">
-					    <div id="creation_form" style="padding:5px;padding-top:0px;">
-                            <div class="dialogLegend repoCreationString">AJXP_MESSAGE[ajxp_conf.95]</div>
-                            <div class="dialogLegend tplCreationString">AJXP_MESSAGE[ajxp_conf.96]</div>
-                            <div class="SF_element">
-                                <div class="SF_label repoCreationString" ajxp_message_id="ajxp_conf.8">AJXP_MESSAGE[ajxp_conf.8]* : </div>
-                                <div class="SF_label tplCreationString" ajxp_message_id="ajxp_conf.116">AJXP_MESSAGE[ajxp_conf.116]* : </div>
-                                <input name="new_user_login" type="text" class="SF_input dialogFocus"/>
-                            </div>
-                            <div class="SF_element">
-                                <div class="SF_label repoCreationString" ajxp_message_id="ajxp_conf.32">AJXP_MESSAGE[ajxp_conf.32]* : </div>
-                                <div class="SF_label tplCreationString" ajxp_message_id="ajxp_conf.117">AJXP_MESSAGE[ajxp_conf.117]* : </div>
-                                <select class="SF_input"><option>AJXP_MESSAGE[ajxp_conf.33]</option></select>
-                            </div>
-						</div>
-						<div id="driver_form" style="margin-top:32px;"></div>
-						<div class="dialogButtons" style="direction:rtl;">
-							<input type="submit" class="dialogButton" id="submit_create_repo" value="Next" class="button" onclick="return false;">
-							<input type="button" class="dialogButton" value="Cancel" class="button" onclick="hideLightBox();return false;">
-						</div>
-					</div>
-				]]></clientForm>
-				<serverCallback methodName="switchAction" restParams="/json_data" developerComment="Create a workspace ( = repository, it's the same ) by passing a structured JSON object.">
-                    <input_param description="A JSON object containing the following mandatory keys : DISPLAY (string), DRIVER (string), DRIVER_OPTIONS (array of options) and optional keys : DISPLAY_ID (string), DESCRIPTION_ID (string), AJXP_SLUG (string), IS_TEMPLATE (boolean). &lt;br&gt;&lt;br&gt; The expected DRIVER value can be either an access type plugin name (fs, ftp, etc), or a template id by using the ajxp_template_ prefix (ajxp_template_TEMPLATE_ID). The DRIVER_OPTIONS array may depend on the used access type." name="json_data" type="JSON"/>
-				</serverCallback>
-				</processing>
-		</action>
-		<action name="create_repository_template">
-			<gui text="ajxp_conf.91" title="ajxp_conf.92" iconClass="icon-th" src="hdd_external_unmount.png" hasAccessKey="false">
-				<context selection="false" dir="false" recycle="hidden"  behaviour="hidden" allowedMimes="workspaces_zone"
-					actionBar="true" contextMenu="false" infoPanel="false"
-					actionBarGroup="put" inZip="false">
-				</context>
-			</gui>
-			<rightsContext noUser="true" userLogged="only" read="true" write="true" adminOnly="true"/>
-			<processing>
-				<clientCallback prepareModal="true"><![CDATA[
-					var loadFunc = function(oForm){
-						ajaxplorer.getUserSelection().updateFormOrUrl(oForm);
-						if(!pydio.getController().configEditor){
-							pydio.getController().configEditor = new ConfigEditor(oForm);
-						}
-						pydio.getController().configEditor.setForm(oForm);
-						pydio.getController().configEditor.initCreateRepoWizard('template');
-					};
-					modal.showDialogForm('Create Repository', 'create_repository_box', loadFunc, null, null, false, true);
-                ]]></clientCallback>
+        </action>
+        <action name="user_update_group" dragndropDefault="true">
+            <gui text="ajxp_conf.119" title="ajxp_conf.119" src="user_group_new.png" accessKey="ajxp_conf.role_access" hasAccessKey="true">
+                <context selection="false" dir="false" recycle="hidden"  behaviour="hidden"
+                         actionBar="false" contextMenu="false" infoPanel="false"
+                         actionBarGroup="put" inZip="false">
+                </context>
+            </gui>
+            <rightsContext noUser="true" userLogged="only" read="true" write="true" adminOnly="true"/>
+            <processing>
+                <serverCallback methodName="usersAction" developerComment="Move an existing user to an existing group" restParams="/file/group_path+">
+                    <input_param description="User identifier" name="file" type="String"/>
+                    <input_param description="Target group path, must be /group/path" name="group_path" type="String"/>
+                </serverCallback>
             </processing>
-		</action>
-		<action name="user_update_role" fileDefault="false">
-			<gui text="ajxp_conf.94" title="ajxp_conf.82" src="edit.png" accessKey="edit_access_key" hasAccessKey="true">
-				<context selection="true" dir="" recycle="hidden"  behaviour="hidden"
-					actionBar="true" contextMenu="true" infoPanel="true"
-					actionBarGroup="get" inZip="false">
-				</context>
-				<selectionContext dir="false" file="true" recycle="false" unique="false" multipleOnly="true" allowedMimes="user,user_editable" behaviour="hidden"/></gui>
-			<rightsContext noUser="true" userLogged="only" read="true" write="true" adminOnly=""/>
-			<processing>
-				<clientCallback prepareModal="true"><![CDATA[
+        </action>
+        <action name="user_update_role" fileDefault="false">
+            <gui text="ajxp_conf.94" title="ajxp_conf.82" src="edit.png" accessKey="edit_access_key" hasAccessKey="true">
+                <context selection="true" dir="" recycle="hidden"  behaviour="hidden"
+                         actionBar="true" contextMenu="true" infoPanel="true"
+                         actionBarGroup="get" inZip="false">
+                </context>
+                <selectionContext dir="false" file="true" recycle="false" unique="false" multipleOnly="true" allowedMimes="user,user_editable" behaviour="hidden"/></gui>
+            <rightsContext noUser="true" userLogged="only" read="true" write="true" adminOnly=""/>
+            <processing>
+                <clientCallback prepareModal="true"><![CDATA[
 					var userSelection =  ajaxplorer.getUserSelection();
 					var loadFunc = function(oForm){
 						ajaxplorer.getUserSelection().updateFormOrUrl(oForm);
@@ -322,7 +430,7 @@
                         </div>
                     </div>
                 ]]></clientForm>
-				<clientListener name="selectionChange"><![CDATA[
+                <clientListener name="selectionChange"><![CDATA[
 				if(ajaxplorer){
 					var userSelection = ajaxplorer.getUserSelection();
 					var action = pydio.getController().getActionByName("user_update_role");
@@ -337,220 +445,97 @@
 					}
 				}
 				]]></clientListener>
-				<serverCallback methodName="switchAction" developerComment="Add or remove a given role to a set of users. The rest access can only handle one user at a time, using the file parameter." restParams="/file/update_role_action/role_id">
+                <serverCallback methodName="usersAction" developerComment="Add or remove a given role to a set of users. The rest access can only handle one user at a time, using the file parameter." restParams="/file/update_role_action/role_id">
                     <input_param description="Users selection" name="file_0...N" type="string"/>
                     <input_param description="Role identifier" name="role_id" type="string"/>
                     <input_param description="Action : add or remove role?" name="update_role_action" type="string"/>
-				</serverCallback>
-			</processing>
-		</action>
-		<action name="edit" fileDefault="true">
-			<gui text="ajxp_conf.93" title="301" iconClass="icon-edit" src="edit.png" accessKey="edit_access_key" hasAccessKey="true">
-				<context selection="true" dir="" recycle="hidden"
-					actionBar="true" contextMenu="true" infoPanel="true"
-					actionBarGroup="get" inZip="false">
-				</context>
-				<selectionContext dir="true" file="true" recycle="false" unique="true" allowedMimes="user,user_editable,repository,repository_editable,role,group,ajxp_plugin,ajxp_role,ajxp_graphs,datagrid" behaviour="hidden"/>
-            </gui>
-			<rightsContext noUser="true" userLogged="only" read="true" write="true" adminOnly=""/>
-            <processing>
-                <clientCallback prepareModal="false"><![CDATA[
-                    var editorData = window.actionArguments[0];
-                    pydio.UI.openCurrentSelectionInEditor(editorData);
-                ]]></clientCallback>
-                <serverCallback methodName="switchAction" restParams="/sub_action" developerComment="Shortcut for various actions, calling edit with subaction parameter."/>
-            </processing>
-        </action>
-        <action name="edit_repository_label">
-            <gui text="6" title="158" src="applix.png" iconClass="icon-pencil" accessKey="rename_access_key" hasAccessKey="true">
-                <context selection="true" dir="" recycle="hidden" allowedMimes="workspaces_zone"
-                         actionBar="true" contextMenu="true" infoPanel="false"
-                         actionBarGroup="get" inZip="false">
-                </context>
-                <selectionContext dir="false" file="true" recycle="false" unique="true" allowedMimes="repository_editable" behaviour="hidden"/>
-            </gui>
-            <rightsContext noUser="true" userLogged="only" read="true" write="true" adminOnly=""/>
-            <processing>
-                <clientCallback prepareModal="false"><![CDATA[
-					var callback = function(node, newValue){
-						var conn = new Connexion();
-						conn.addParameter('get_action', 'edit');
-						conn.addParameter('sub_action', 'edit_repository_label');
-						conn.addParameter('repository_id', node.getMetadata().get('repository_id'));
-						conn.addParameter('newLabel', newValue);
-						conn.onComplete = function(transport){
-							PydioApi.getClient().parseXmlMessage(transport.responseXML);
-						};
-						conn.sendSync();
-					};
-
-					if(ajaxplorer.getUserSelection() && ajaxplorer.getUserSelection().getSelectionSource() && ajaxplorer.getUserSelection().getSelectionSource().switchCurrentLabelToEdition) {ajaxplorer.getUserSelection().getSelectionSource().switchCurrentLabelToEdition(callback);}
-					]]></clientCallback>
-                <serverCallback methodName="switchAction" restParams="/repository_id/newLabel" developerComment="Update a workspace label">
-                    <input_param description="Repository Identifier" name="repository_id" type="string"/>
-                    <input_param description="New Label" name="newLabel" type="string"/>
                 </serverCallback>
             </processing>
         </action>
-		<action name="save_user_preference">
-			<processing>
-				<serverCallback methodName="switchAction" developerComment="Sets a user preference value. Rest can only take one value, but CLI or http GET can pass many preferences, using _1, _2, _3, etc." restParams="/user_id/pref_name_0/pref_value_0">
+        <action name="save_user_preference">
+            <processing>
+                <serverCallback methodName="usersAction" developerComment="Sets a user preference value. Rest can only take one value, but CLI or http GET can pass many preferences, using _1, _2, _3, etc." restParams="/user_id/pref_name_0/pref_value_0">
                     <input_param description="User login" name="user_id" type="string"/>
                     <input_param description="Preference name" name="pref_name_0" type="string"/>
                     <input_param description="Preference value" name="pref_value_0" type="string"/>
-				</serverCallback>
-			</processing>
-		</action>
-		<action name="meta_source_edit">
-			<processing>
-				<serverCallback methodName="switchAction" developerComment="Edit an existing meta source parameters." restParams="/repository_id/plugId/json_data">
-                    <input_param description="Id of the repository" name="repository_id" type="string"/>
-                    <input_param description="Id of the plugin" name="plugId" type="string"/>
-                    <input_param description="JSON Representation of the plugin necessary options" name="json_data"
-                                 type="JSON"/>
-				</serverCallback>
-			</processing>
-		</action>
-		<action name="meta_source_add">
-			<processing>
-				<serverCallback methodName="switchAction" developerComment="Add a meta source to a repository, setting its parameters." restParams="/repository_id/plugId/json_data">
-                    <input_param description="Id of the repository" name="repository_id" type="string"/>
-                    <input_param description="Id of the plugin" name="plugId" type="string"/>
-                    <input_param description="JSON Representation of the plugin necessary options" name="json_data"
-                                 type="JSON"/>
-				</serverCallback>
-			</processing>
-		</action>
-		<action name="meta_source_delete">
-			<processing>
-				<serverCallback methodName="switchAction" developerComment="Remove a given meta source from a repository." restParams="/repository_id/plugId">
-                    <input_param description="Id of the repository" name="repository_id" type="string"/>
-                    <input_param description="Id of the plugin" name="plugId" type="string"/>
-				</serverCallback>
-			</processing>
-		</action>
-		<action name="delete">
-			<gui text="7" title="161" src="editdelete.png" iconClass="icon-trash" accessKey="delete_access_key" hasAccessKey="true" specialAccessKey="delete">
-				<context selection="true" dir="" recycle="false"
-					actionBar="true" contextMenu="true" infoPanel="false"
-					actionBarGroup="get" inZip="false">
-				</context>
-				<selectionContext dir="true" file="true" recycle="false" unique="false"  allowedMimes="user_editable,repository_editable,role,group" image="false" editable="false" behaviour="hidden"/></gui>
-			<rightsContext noUser="true" userLogged="only" read="true" write="true" adminOnly=""/>
-			<processing>
-				<clientCallback prepareModal="true"><![CDATA[
-				    var userSelection;
-				    if(window.actionArguments && window.actionArguments.length){
-				        userSelection = window.actionArguments[0];
-                    }else{
-                        userSelection =  ajaxplorer.getUserSelection();
-				    }
-				    var node = userSelection.getUniqueNode();
-					var meta = node.getMetadata();
-					var deleteMessage, fieldName, fieldValue;
-					if(meta.get("ajxp_mime") == "user_editable"){
-						deleteMessage = MessageHash['ajxp_conf.34'];
-						fieldName = "user_id";
-						fieldValue = getBaseName(meta.get("filename"));
-					}else if(meta.get("ajxp_mime") == "role"){
-						deleteMessage = MessageHash['ajxp_conf.126'];
-						fieldName = "role_id";
-						fieldValue = getBaseName(meta.get("filename"));
-					}else if(meta.get("ajxp_mime") == "group"){
-						deleteMessage = MessageHash['ajxp_conf.126'];
-						fieldName = "group";
-						fieldValue = meta.get("filename");
-					}else{
-						deleteMessage = MessageHash['ajxp_conf.35'];
-						fieldName = "repository_id";
-						fieldValue = meta.get("repository_id");
-					}
-					var onLoad = function(oForm){
-		   		    	$(oForm).select('span[id="delete_message"]')[0].update(deleteMessage);
-		   		    	var hidden = $(oForm).select('input[type="hidden"]')[0];
-		   		    	hidden.setAttribute("name", fieldName);
-		   		    	hidden.setAttribute("value", fieldValue);
-					};
-					modal.showDialogForm('Delete', 'delete_config_form', onLoad, function(){
-						var oForm = modal.getForm();
-						PydioApi.getClient().submitForm(oForm);
-                        if (userSelection.isMultiple()) {
-                           var i = 1;
-	   		    	       var hidden = $(oForm).select('input[type="hidden"]')[0];
-                           while (true) {
-                              try {
-                                  var node = userSelection.getNode(i);
-                                  var meta = node.getMetadata();
-                                  var value;
-                                  if(meta.get("ajxp_mime") == "user_editable"){
-                                  	value = meta.get("text");
-                                  }else{
-                                  	value = meta.get("text");
-                                  }
-                                  hidden.setAttribute("value", value);
-            					  PydioApi.getClient().submitForm(oForm);
-                                  i++;
-                              } catch (e)
-                              {
-                                  break;
-                              }
-                           }
-                        }
-						hideLightBox(true);
-						return false;
-					});
-					]]></clientCallback>
-				<clientForm id="delete_config_form"><![CDATA[
-				<div id="delete_config_form" action="delete" box_width="280">
-					<span id="delete_message"></span>
-					<input type="hidden" name="" value=""/>
-				</div>
-				]]></clientForm>
-				<serverCallback methodName="switchAction" restParams="/data_type/data_id+" developerComment="Generic delete action for config driver, used to delete users, workspaces, roles, etc.">
-                    <input_param description="Type of the data to delete. Can be : user, group, role, repository" name="data_type" type="String"/>
-                    <input_param description="Id of the data to delete. For groups, full group path." name="data_id"
-                                 type="string"/>
-				</serverCallback>
-				</processing>
-		</action>
+                </serverCallback>
+            </processing>
+        </action>
 	    <action name="user_update_right">
             <processing>
-                <serverCallback methodName="switchAction" restParams="/repository_id/user_id/right" checkParams="true" developerComment="Update a user access right on a given workspace.">
+                <serverCallback methodName="usersAction" restParams="/repository_id/user_id/right" checkParams="true" developerComment="Update a user access right on a given workspace.">
                     <input_param name="user_id" type="AJXP_USER" mandatory="true" description="ID of the user"/>
                     <input_param name="repository_id" type="AJXP_REPOSITORY" mandatory="true" description="Repository ID"/>
                     <input_param name="right" type="string" mandatory="true" description="Must be r (read), w (write) or n (none)"/>
                 </serverCallback>
             </processing>
+        </action>
+        <action name="cli_update_user_list">
+            <processing>
+                <serverCallback methodName="usersAction"/>
+            </processing>
+        </action>
+        <action name="admin_search_users">
+            <processing>
+                <serverCallback methodName="searchUsersAction" restParams="/query/dir+" developerComment="Remote search implementation, currently only supporting users search."/>
+            </processing>
+        </action>
+        <action name="people-create-resource">
+            <processing><serverCallback methodName="usersAction"/></processing>
+        </action>
+        <action name="people-delete-resource">
+            <processing><serverCallback methodName="usersAction"/></processing>
+        </action>
+        <action name="people-patch-resource">
+            <processing><serverCallback methodName="usersAction"/></processing>
+        </action>
+
+        <!-- ROLES ACTIONS -->
+        <action name="create_role">
+            <gui text="ajxp_conf.75" title="ajxp_conf.75" iconClass="icon-th" src="user_group_new.png" accessKey="ajxp_conf.role_access" hasAccessKey="true">
+                <context selection="false" dir="false" recycle="hidden" allowedMimes="roles_zone"  behaviour="hidden"
+                         actionBar="true" contextMenu="false" infoPanel="false"
+                         actionBarGroup="put" inZip="false">
+                </context>
+            </gui>
+            <rightsContext noUser="true" userLogged="only" read="true" write="true" adminOnly="true"/>
+            <processing>
+                <clientCallback prepareModal="true"><![CDATA[
+					modal.showDialogForm('Create Role', 'create_role_box');
+					]]></clientCallback>
+                <clientForm id="create_role_box"><![CDATA[
+					<div id="create_role_box" action="create_role" box_width="210">
+						<div class="SF_element">
+							<div class="SF_label" ajxp_message_id="ajxp_conf.76">AJXP_MESSAGE[ajxp_conf.76] : </div><input name="role_id" type="text" class="dialogFocus SF_input"/>
+						</div>
+					</div>
+				]]></clientForm>
+                <serverCallback methodName="rolesAction" developerComment="Create an empty role" restParams="/role_id">
+                    <input_param description="Role identifier" name="role_id" type="string"/>
+                </serverCallback>
+            </processing>
         </action>
 	    <action name="role_update_right">
             <processing>
-                <serverCallback methodName="switchAction" restParams="/repository_id/role_id/right" checkParams="true" developerComment="Update a role access right on a given workspace.">
+                <serverCallback methodName="rolesAction" restParams="/repository_id/role_id/right" checkParams="true" developerComment="Update a role access right on a given workspace.">
                     <input_param name="role_id" type="AJXP_ROLE" mandatory="true" description="ID of the role"/>
                     <input_param name="repository_id" type="AJXP_REPOSITORY" mandatory="true" description="Repository ID"/>
                     <input_param name="right" type="string" mandatory="true" description="Must be r (read), w (write) or n (none)"/>
                 </serverCallback>
             </processing>
         </action>
-        <action name="get_bookmarks">
-            <pre_processing>
-                <serverCallback methodName="preProcessBookmarkAction"/>
-            </pre_processing>
-        </action>
-        <action name="pydio-go-pro">
-            <gui src="gopro" text="ajxp_conf.120" title="ajxp_conf.121" iconClass="icon-rocket">
-                <context dir="true" recycle="true" selection="false" actionBar="true" actionBarGroup="admin"/>
-            </gui>
+        <action name="edit_role">
             <processing>
-                <clientCallback><![CDATA[
-                    var win = window.open('https://pydio.com/en/go-pro?referrer=settings');
-                ]]></clientCallback>
+                <serverCallback methodName="rolesAction"/>
             </processing>
         </action>
-        <action name="cli_update_user_list">
+        <action name="post_json_role">
             <processing>
-                <serverCallback methodName="switchAction"/>
+                <serverCallback methodName="rolesAction"/>
             </processing>
         </action>
+
+        <!-- PLUGINS ACTIONS -->
         <action name="clear_plugins_cache">
             <gui src="edit.png" text="ajxp_conf.129" title="ajxp_conf.130">
                 <context dir="true" recycle="true" allowedMimes="plugins_zone" selection="false" actionBar="true" actionBarGroup="get"/>
@@ -561,10 +546,68 @@
                     conn.setParameters($H({get_action:'clear_plugins_cache'}));
                     conn.sendAsync();
                 ]]></clientCallback>
-                <serverCallback methodName="switchAction"/>
+                <serverCallback methodName="pluginsAction"/>
+            </processing>
+        </action>
+        <action name="get_plugin_manifest">
+            <processing>
+                <serverCallback methodName="pluginsAction" restParams="/plugin_id" developerComment="Send a plugin Manifest file.">
+                    <input_param description="Plugin identifier (like type.name)" name="plugin_id" type="string"/>
+                    <output type="XML" description="Manifest content"/>
+                </serverCallback>
+            </processing>
+        </action>
+        <action name="run_plugin_action">
+            <processing>
+                <serverCallback methodName="pluginsAction" restParams="/action_plugin_id/action_plugin_method" developerComment="Execute a class method on a plugin. Used for example for testing a DB connexion.">
+                    <input_param name="action_plugin_id" type="string" description="A plugin id, in the form type.name"/>
+                    <input_param name="action_plugin_method" type="string" description="A plugin method"/>
+                    <input_param name="form_data" type="FORM_DATA"
+                                 description="A set of parameters complying to the standard form parser"/>
+                </serverCallback>
+            </processing>
+        </action>
+        <action name="list_all_plugins_actions">
+            <processing>
+                <serverCallback methodName="pluginsAction" restParams="/" developerComment="Returns a structured JSON object of all plugins and all their available actions"/>
+            </processing>
+        </action>
+        <action name="list_all_plugins_parameters">
+            <processing>
+                <serverCallback methodName="pluginsAction" restParams="/" developerComment="Returns a structured JSON object of all plugins and all their available parameter"/>
+            </processing>
+        </action>
+        <action name="parameters_to_form_definitions">
+            <processing>
+                <serverCallback methodName="pluginsAction" restParams="/" developerComment="Takes in input a list of plugin parameters and builds the corresponding XML to create a standard form."/>
+            </processing>
+        </action>
+
+        <!-- DOCUMENTATION ACTIONS -->
+        <action name="generate_api_docs">
+            <processing>
+                <serverCallback methodName="documentationAction" restParams="/version" developerComment="Generate API docs">
+                    <input_param name="version" type="string" description="A two-digits version string, like 5.4, 6.2"/>
+                </serverCallback>
+            </processing>
+        </action>
+
+        <!-- OTHER ACTIONS -->
+        <action name="get_bookmarks">
+            <pre_processing>
+                <serverCallback methodName="preProcessBookmarkAction"/>
+            </pre_processing>
+        </action>
+        <action name="pydio-go-pro">
+            <gui src="gopro" text="ajxp_conf.120" title="ajxp_conf.121" iconClass="icon-rocket">
+                <context dir="true" recycle="true" selection="false" actionBar="true" actionBarGroup="admin"/>
+            </gui>
+            <processing>
+                <clientCallback><![CDATA[
+                    var win = window.open('https://pydio.com/en/go-pro?referrer=settings');
+                ]]></clientCallback>
             </processing>
         </action>
-        <action name="share_react" forbidOverride="true"></action>
         <action name="display_enterprise">
             <gui text="ajxp_conf.120" title="ajxp_conf.121" iconClass="icon-lightbulb" src="download_manager.png" hasAccessKey="false">
                 <context selection="false" dir="false" recycle="hidden"  behaviour="hidden"
@@ -608,6 +651,8 @@
                 <serverCallback methodName="displayEnterprise"/>
             </processing>
         </action>
+        <action name="share_react" forbidOverride="true"></action>
+
 	</actions>
 	<client_configs>
 		<component_config className="InfoPanel">
diff --git a/core/src/plugins/access.ajxp_conf/class.ConfigEditor.js b/core/src/plugins/access.ajxp_conf/class.ConfigEditor.js
index b2a5affd93..ba05195e89 100644
--- a/core/src/plugins/access.ajxp_conf/class.ConfigEditor.js
+++ b/core/src/plugins/access.ajxp_conf/class.ConfigEditor.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
diff --git a/core/src/plugins/access.ajxp_conf/class.ajxp_confAccessDriver.php b/core/src/plugins/access.ajxp_conf/class.ajxp_confAccessDriver.php
deleted file mode 100644
index 0d77bc2ca6..0000000000
--- a/core/src/plugins/access.ajxp_conf/class.ajxp_confAccessDriver.php
+++ /dev/null
@@ -1,2938 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * @package AjaXplorer_Plugins
- * @subpackage Access
- * @class ajxp_confAccessDriver
- * AJXP_Plugin to access the configurations data
- */
-class ajxp_confAccessDriver extends AbstractAccessDriver
-{
-
-    protected $listSpecialRoles = AJXP_SERVER_DEBUG;
-    protected $currentBookmarks = array();
-
-    protected $rootNodes = array(
-        "data" => array(
-            "LABEL" => "ajxp_conf.110",
-            "ICON" => "user.png",
-            "DESCRIPTION" => "ajxp_conf.137",
-            "CHILDREN" => array(
-                "repositories" => array(
-                    "AJXP_MIME" => "workspaces_zone",
-                    "LABEL" => "ajxp_conf.3",
-                    "DESCRIPTION" => "ajxp_conf.138",
-                    "ICON" => "hdd_external_unmount.png",
-                    "LIST" => "listRepositories"),
-                "users" => array(
-                    "AJXP_MIME" => "users_zone",
-                    "LABEL" => "ajxp_conf.2",
-                    "DESCRIPTION" => "ajxp_conf.139",
-                    "ICON" => "users-folder.png",
-                    "LIST" => "listUsers"
-                ),
-                "roles" => array(
-                    "AJXP_MIME" => "roles_zone",
-                    "LABEL" => "ajxp_conf.69",
-                    "DESCRIPTION" => "ajxp_conf.140",
-                    "ICON" => "user-acl.png",
-                    "LIST" => "listRoles"),
-            )
-        ),
-        "config" => array(
-            "AJXP_MIME" => "plugins_zone",
-            "LABEL" => "ajxp_conf.109",
-            "ICON" => "preferences_desktop.png",
-            "DESCRIPTION" => "ajxp_conf.136",
-            "CHILDREN" => array(
-                "core"	   	   => array(
-                    "AJXP_MIME" => "plugins_zone",
-                    "LABEL" => "ajxp_conf.98",
-                    "DESCRIPTION" => "ajxp_conf.133",
-                    "ICON" => "preferences_desktop.png",
-                    "LIST" => "listPlugins"),
-                "plugins"	   => array(
-                    "AJXP_MIME" => "plugins_zone",
-                    "LABEL" => "ajxp_conf.99",
-                    "DESCRIPTION" => "ajxp_conf.134",
-                    "ICON" => "folder_development.png",
-                    "LIST" => "listPlugins"),
-                "core_plugins" => array(
-                    "AJXP_MIME" => "plugins_zone",
-                    "LABEL" => "ajxp_conf.123",
-                    "DESCRIPTION" => "ajxp_conf.135",
-                    "ICON" => "folder_development.png",
-                    "LIST" => "listPlugins"),
-            )
-        ),
-        "admin" => array(
-            "LABEL" => "ajxp_conf.111",
-            "ICON" => "toggle_log.png",
-            "DESCRIPTION" => "ajxp_conf.141",
-            "CHILDREN" => array(
-                "logs" => array(
-                    "LABEL" => "ajxp_conf.4",
-                    "DESCRIPTION" => "ajxp_conf.142",
-                    "ICON" => "toggle_log.png",
-                    "LIST" => "listLogFiles"),
-                "diagnostic" => array(
-                    "LABEL" => "ajxp_conf.5",
-                    "DESCRIPTION" => "ajxp_conf.143",
-                    "ICON" => "susehelpcenter.png", "LIST" => "printDiagnostic")
-            )
-        ),
-        "developer" => array(
-            "LABEL" => "ajxp_conf.144",
-            "ICON" => "applications_engineering.png",
-            "DESCRIPTION" => "ajxp_conf.145",
-            "CHILDREN" => array(
-                "actions" => array(
-                    "LABEL" => "ajxp_conf.146",
-                    "DESCRIPTION" => "ajxp_conf.147",
-                    "ICON" => "book.png",
-                    "LIST" => "listActions"),
-                "hooks" => array(
-                    "LABEL" => "ajxp_conf.148",
-                    "DESCRIPTION" => "ajxp_conf.149",
-                    "ICON" => "book.png",
-                    "LIST" => "listHooks")
-            )
-        )
-    );
-
-
-    protected function filterReservedRoles($key){
-        return (strpos($key, "AJXP_GRP_/") === FALSE && strpos($key, "AJXP_USR_/") === FALSE);
-    }
-
-    protected function getEditableParameters($withLabel = false){
-        $currentUserIsGroupAdmin = (AuthService::getLoggedUser() != null && AuthService::getLoggedUser()->getGroupPath() != "/");
-        $query = "//param|//global_param";
-        if($currentUserIsGroupAdmin){
-            $query = "//param[@scope]|//global_param[@scope]";
-        }
-
-        $nodes = AJXP_PluginsService::getInstance()->searchAllManifests($query, "node", false, true, true);
-        $actions = array();
-        foreach ($nodes as $node) {
-            if($node->parentNode->nodeName != "server_settings") continue;
-            $parentPlugin = $node->parentNode->parentNode;
-            $pId = $parentPlugin->attributes->getNamedItem("id")->nodeValue;
-            if (empty($pId)) {
-                $pId = $parentPlugin->nodeName .".";
-                if($pId == "ajxpdriver.") $pId = "access.";
-                $pId .= $parentPlugin->attributes->getNamedItem("name")->nodeValue;
-            }
-            if(!is_array($actions[$pId])) $actions[$pId] = array();
-            $actionName = $node->attributes->getNamedItem("name")->nodeValue;
-            $attributes = array();
-            for( $i = 0; $i < $node->attributes->length; $i ++){
-                $att = $node->attributes->item($i);
-                $value = $att->nodeValue;
-                if(in_array($att->nodeName, array("choices", "description", "group", "label"))) {
-                    $value = AJXP_XMLWriter::replaceAjxpXmlKeywords($value);
-                }
-                $attributes[$att->nodeName] = $value;
-            }
-            if($withLabel){
-                $actions[$pId][$actionName] = array(
-                    "parameter" => $actionName ,
-                    "label" => $attributes["label"],
-                    "attributes" => $attributes
-                );
-            }else{
-                $actions[$pId][] = $actionName;
-            }
-
-        }
-        foreach ($actions as $actPid => $actionGroup) {
-            ksort($actionGroup, SORT_STRING);
-            $actions[$actPid] = array();
-            foreach ($actionGroup as $v) {
-                $actions[$actPid][] = $v;
-            }
-        }
-        return $actions;
-    }
-
-    public function listAllActions($action, $httpVars, $fileVars)
-    {
-        parent::accessPreprocess($action, $httpVars, $fileVars);
-        $loggedUser = AuthService::getLoggedUser();
-        if(AuthService::usersEnabled() && !$loggedUser->isAdmin()) return ;
-        switch ($action) {
-            //------------------------------------
-            //	BASIC LISTING
-            //------------------------------------
-            case "list_all_repositories_json":
-
-                $repositories = ConfService::getRepositoriesList("all", false);
-                $repoOut = array();
-                foreach ($repositories as $repoObject) {
-                    $repoOut[$repoObject->getId()] = $repoObject->getDisplay();
-                }
-                HTMLWriter::charsetHeader("application/json");
-                $mess = ConfService::getMessages();
-                echo json_encode(array("LEGEND" => $mess["ajxp_conf.150"], "LIST" => $repoOut));
-
-            break;
-
-            case "list_all_plugins_actions":
-
-                $currentUserIsGroupAdmin = (AuthService::getLoggedUser() != null && AuthService::getLoggedUser()->getGroupPath() != "/");
-                if($currentUserIsGroupAdmin){
-                    // Group admin : do not allow actions edition
-                    HTMLWriter::charsetHeader("application/json");
-                    echo json_encode(array("LIST" => array(), "HAS_GROUPS" => true));
-                    return;
-                }
-                if(isSet($_SESSION["ALL_ACTIONS_CACHE"])){
-                    $actions = $_SESSION["ALL_ACTIONS_CACHE"];
-                }else{
-
-                    $nodes = AJXP_PluginsService::getInstance()->searchAllManifests("//action", "node", false, true, true);
-                    $actions = array();
-                    foreach ($nodes as $node) {
-                        $xPath = new DOMXPath($node->ownerDocument);
-                        $proc = $xPath->query("processing", $node);
-                        if(!$proc->length) continue;
-                        $txt = $xPath->query("gui/@text", $node);
-                        if ($txt->length) {
-                            $messId = $txt->item(0)->nodeValue;
-                        } else {
-                            $messId = "";
-                        }
-                        $parentPlugin = $node->parentNode->parentNode->parentNode;
-                        $pId = $parentPlugin->attributes->getNamedItem("id")->nodeValue;
-                        if (empty($pId)) {
-                            $pId = $parentPlugin->nodeName .".";
-                            if($pId == "ajxpdriver.") $pId = "access.";
-                            $pId .= $parentPlugin->attributes->getNamedItem("name")->nodeValue;
-                        }
-                        //echo($pId." : ". $node->attributes->getNamedItem("name")->nodeValue . " (".$messId.")<br>");
-                        if(!is_array($actions[$pId])) $actions[$pId] = array();
-                        $actionName = $node->attributes->getNamedItem("name")->nodeValue;
-                        $actions[$pId][$actionName] = array( "action" => $actionName , "label" => $messId);
-
-                    }
-                    ksort($actions, SORT_STRING);
-                    foreach ($actions as $actPid => $actionGroup) {
-                        ksort($actionGroup, SORT_STRING);
-                        $actions[$actPid] = array();
-                        foreach ($actionGroup as $v) {
-                            $actions[$actPid][] = $v;
-                        }
-                    }
-                    $_SESSION["ALL_ACTIONS_CACHE"] = $actions;
-                }
-                HTMLWriter::charsetHeader("application/json");
-                echo json_encode(array("LIST" => $actions, "HAS_GROUPS" => true));
-                break;
-
-            case "list_all_plugins_parameters":
-
-                if(isSet($_SESSION["ALL_PARAMS_CACHE"])){
-                    $actions = $_SESSION["ALL_PARAMS_CACHE"];
-                }else{
-                    $actions = $this->getEditableParameters(true);
-                    $_SESSION["ALL_PARAMS_CACHE"] = $actions;
-                }
-                HTMLWriter::charsetHeader("application/json");
-                echo json_encode(array("LIST" => $actions, "HAS_GROUPS" => true));
-                break;
-
-            case "parameters_to_form_definitions" :
-
-                $data = json_decode(SystemTextEncoding::magicDequote($httpVars["json_parameters"]), true);
-                AJXP_XMLWriter::header("standard_form");
-                foreach ($data as $repoScope => $pluginsData) {
-                    echo("<repoScope id='$repoScope'>");
-                    foreach ($pluginsData as $pluginId => $paramData) {
-                        foreach ($paramData as $paramId => $paramValue) {
-                            $query = "//param[@name='$paramId']|//global_param[@name='$paramId']";
-                            $nodes = AJXP_PluginsService::getInstance()->searchAllManifests($query, "node", false, true, true);
-                            if(!count($nodes)) continue;
-                            $n = $nodes[0];
-                            if ($n->attributes->getNamedItem("group") != null) {
-                                $n->attributes->getNamedItem("group")->nodeValue = "$pluginId";
-                            } else {
-                                $n->appendChild($n->ownerDocument->createAttribute("group"));
-                                $n->attributes->getNamedItem("group")->nodeValue = "$pluginId";
-                            }
-                            if(is_bool($paramValue)) $paramValue = ($paramValue ? "true" : "false");
-                            if ($n->attributes->getNamedItem("default") != null) {
-                                $n->attributes->getNamedItem("default")->nodeValue = $paramValue;
-                            } else {
-                                $n->appendChild($n->ownerDocument->createAttribute("default"));
-                                $n->attributes->getNamedItem("default")->nodeValue = $paramValue;
-                            }
-                            echo(AJXP_XMLWriter::replaceAjxpXmlKeywords($n->ownerDocument->saveXML($n)));
-                        }
-                    }
-                    echo("</repoScope>");
-                }
-                AJXP_XMLWriter::close("standard_form");
-                break;
-
-            default:
-                break;
-        }
-    }
-
-    public function parseSpecificContributions(&$contribNode)
-    {
-        parent::parseSpecificContributions($contribNode);
-        if($contribNode->nodeName != "actions") return;
-        $currentUserIsGroupAdmin = (AuthService::getLoggedUser() != null && AuthService::getLoggedUser()->getGroupPath() != "/");
-        if(!$currentUserIsGroupAdmin) return;
-        $actionXpath=new DOMXPath($contribNode->ownerDocument);
-        $publicUrlNodeList = $actionXpath->query('action[@name="create_repository"]/subMenu', $contribNode);
-        if ($publicUrlNodeList->length) {
-            $publicUrlNode = $publicUrlNodeList->item(0);
-            $publicUrlNode->parentNode->removeChild($publicUrlNode);
-        }
-    }
-
-    public function preProcessBookmarkAction($action, &$httpVars, $fileVars)
-    {
-        if (isSet($httpVars["bm_action"]) && $httpVars["bm_action"] == "add_bookmark" && AuthService::usersEnabled()) {
-            $bmUser = AuthService::getLoggedUser();
-            $bookmarks = $bmUser->getBookmarks();
-            foreach ($bookmarks as $bm) {
-                if ($bm["PATH"] == $httpVars["bm_path"]) {
-                    $httpVars["bm_action"] = "delete_bookmark";
-                    break;
-                }
-            }
-        }
-
-    }
-
-    public function recursiveSearchGroups($baseGroup, $term, $offset=-1, $limit=-1)
-    {
-        $groups = AuthService::listChildrenGroups($baseGroup);
-        foreach ($groups as $groupId => $groupLabel) {
-
-            if (preg_match("/$term/i", $groupLabel) == TRUE ) {
-                $trimmedG = trim($baseGroup, "/");
-                if(!empty($trimmedG)) $trimmedG .= "/";
-                $nodeKey = "/data/users/".$trimmedG.ltrim($groupId,"/");
-                $meta = array(
-                    "icon" => "users-folder.png",
-                    "ajxp_mime" => "group_editable"
-                );
-                if(in_array($nodeKey, $this->currentBookmarks)) $meta = array_merge($meta, array("ajxp_bookmarked" => "true", "overlay_icon" => "bookmark.png"));
-                echo AJXP_XMLWriter::renderNode($nodeKey, $groupLabel, false, $meta, true, false);
-            }
-            $this->recursiveSearchGroups(rtrim($baseGroup, "/")."/".ltrim($groupId, "/"), $term);
-
-        }
-
-        $users = AuthService::listUsers($baseGroup, $term, $offset, $limit);
-        foreach ($users as $userId => $userObject) {
-            $gPath = $userObject->getGroupPath();
-            $realGroup = AuthService::filterBaseGroup(AuthService::getLoggedUser()->getGroupPath());
-            if(strlen($realGroup) > 1 && strpos($gPath, $realGroup) === 0){
-                $gPath = substr($gPath, strlen($realGroup));
-            }
-            $trimmedG = trim($gPath, "/");
-            if(!empty($trimmedG)) $trimmedG .= "/";
-
-            $nodeKey = "/data/users/".$trimmedG.$userId;
-            $meta = array(
-                "icon" => "user.png",
-                "ajxp_mime" => "user_editable"
-            );
-            if(in_array($nodeKey, $this->currentBookmarks)) $meta = array_merge($meta, array("ajxp_bookmarked" => "true", "overlay_icon" => "bookmark.png"));
-            $userDisplayName = ConfService::getUserPersonalParameter("USER_DISPLAY_NAME", $userObject, "core.conf", $userId);
-            echo AJXP_XMLWriter::renderNode($nodeKey, $userDisplayName, true, $meta, true, false);
-        }
-
-    }
-
-
-    public function searchAction($action, $httpVars, $fileVars)
-    {
-        if(! AJXP_Utils::decodeSecureMagic($httpVars["dir"]) == "/data/users") return;
-        $query = AJXP_Utils::decodeSecureMagic($httpVars["query"]);
-        $limit = $offset = -1;
-        if(isSet($httpVars["limit"])) $limit = intval(AJXP_Utils::sanitize($httpVars["limit"], AJXP_SANITIZE_ALPHANUM));
-        if(isSet($httpVars["offset"])) $offset = intval(AJXP_Utils::sanitize($httpVars["offset"], AJXP_SANITIZE_ALPHANUM));
-        AJXP_XMLWriter::header();
-        $this->recursiveSearchGroups("/", $query, $offset, $limit);
-        AJXP_XMLWriter::close();
-
-    }
-
-    protected function getMainTree(){
-        $rootNodes = $this->rootNodes;
-        if (AuthService::getLoggedUser() != null && AuthService::getLoggedUser()->getGroupPath() != "/") {
-            // Group Admin
-            unset($rootNodes["config"]);
-            unset($rootNodes["admin"]);
-            unset($rootNodes["developer"]);
-        }
-        AJXP_Controller::applyHook("ajxp_conf.list_config_nodes", array(&$rootNodes));
-        return $rootNodes;
-    }
-
-    protected function renderNode($path, $data, $messages){
-        if(isSet($messages[$data["LABEL"]])) $data["LABEL"] = $messages[$data["LABEL"]];
-        if(isSet($messages[$data["DESCRIPTION"]])) $data["DESCRIPTION"] = $messages[$data["DESCRIPTION"]];
-        $nodeLabel = $data["LABEL"];
-        $attributes = array(
-            "description" => $data["DESCRIPTION"],
-            "icon"        => $data["ICON"]
-        );
-        if(in_array($path, $this->currentBookmarks)) {
-            $attributes["ajxp_bookmarked"]="true";
-            $attributes["overlay_icon"] = "bookmark.png";
-        }
-        if(basename($path) == "users") {
-            $attributes["remote_indexation"] = "admin_search";
-        }
-        if(isSet($data["AJXP_MIME"])) {
-            $attributes["ajxp_mime"] = $data["AJXP_MIME"];
-        }
-        if(isSet($data["METADATA"]) && is_array($data["METADATA"])){
-            $attributes = array_merge($attributes, $data["METADATA"]);
-        }
-        $hasChildren = isSet($data["CHILDREN"]);
-        AJXP_XMLWriter::renderNode($path, $nodeLabel, false, $attributes, false);
-        if($hasChildren){
-            foreach($data["CHILDREN"] as $cKey => $cData){
-                $this->renderNode($path."/".$cKey, $cData, $messages);
-            }
-        }
-        AJXP_XMLWriter::close();
-    }
-
-    public function switchAction($action, $httpVars, $fileVars)
-    {
-        parent::accessPreprocess($action, $httpVars, $fileVars);
-        $loggedUser = AuthService::getLoggedUser();
-        if(AuthService::usersEnabled() && !$loggedUser->isAdmin()) return ;
-        if (AuthService::usersEnabled()) {
-            $currentBookmarks = AuthService::getLoggedUser()->getBookmarks();
-            // FLATTEN
-            foreach ($currentBookmarks as $bm) {
-                $this->currentBookmarks[] = $bm["PATH"];
-            }
-        }
-
-        if ($action == "edit") {
-            if (isSet($httpVars["sub_action"])) {
-                $action = $httpVars["sub_action"];
-            }
-        }
-        $mess = ConfService::getMessages();
-        $currentUserIsGroupAdmin = (AuthService::getLoggedUser() != null && AuthService::getLoggedUser()->getGroupPath() != "/");
-        if ($currentUserIsGroupAdmin && ConfService::getAuthDriverImpl()->isAjxpAdmin(AuthService::getLoggedUser()->getId())) {
-            $currentUserIsGroupAdmin = false;
-        }
-        $currentAdminBasePath = "/";
-        if (AuthService::getLoggedUser()!=null && AuthService::getLoggedUser()->getGroupPath()!=null) {
-            $currentAdminBasePath = AuthService::getLoggedUser()->getGroupPath();
-        }
-
-
-        switch ($action) {
-            //------------------------------------
-            //	BASIC LISTING
-            //------------------------------------
-            case "ls":
-
-                $rootNodes = $this->getMainTree();
-                $rootAttributes = array();
-                if(isSet($rootNodes["__metadata__"])){
-                    $rootAttributes = $rootNodes["__metadata__"];
-                    unset($rootNodes["__metadata__"]);
-                }
-                $parentName = "";
-                $dir = trim(AJXP_Utils::decodeSecureMagic((isset($httpVars["dir"])?$httpVars["dir"]:"")), " /");
-                if ($dir != "") {
-                    $hash = null;
-                    if (strstr(urldecode($dir), "#") !== false) {
-                        list($dir, $hash) = explode("#", urldecode($dir));
-                    }
-                    $splits = explode("/", $dir);
-                    $root = array_shift($splits);
-                    if (count($splits)) {
-                        $returnNodes = false;
-                        if (isSet($httpVars["file"])) {
-                            $returnNodes = true;
-                        }
-                        $child = $splits[0];
-                        if (isSet($rootNodes[$root]["CHILDREN"][$child])) {
-                            $atts = array();
-                            if ($child == "users") {
-                                $atts["remote_indexation"] = "admin_search";
-                            }
-                            $childData = $rootNodes[$root]["CHILDREN"][$child];
-                            $callback = $childData["LIST"];
-                            if(isSet($childData["ALIAS"])){
-                                $reSplits = explode("/", ltrim($childData["ALIAS"], "/"));
-                                $root = array_shift($reSplits);
-                                // additional part?
-                                array_shift($splits);
-                                foreach($splits as $vS) $reSplits[] = $vS;
-                                $splits = $reSplits;
-                            }
-                            if (is_string($callback) && method_exists($this, $callback)) {
-                                if(!$returnNodes) AJXP_XMLWriter::header("tree", $atts);
-                                $res = call_user_func(array($this, $callback), implode("/", $splits), $root, $hash, $returnNodes, isSet($httpVars["file"])?$httpVars["file"]:'', "/".$dir, $httpVars);
-                                if(!$returnNodes) AJXP_XMLWriter::close();
-                            } else if (is_array($callback)) {
-                                $res = call_user_func($callback, implode("/", $splits), $root, $hash, $returnNodes, isSet($httpVars["file"])?$httpVars["file"]:'', "/".$dir, $httpVars);
-                            }
-                            if ($returnNodes) {
-                                AJXP_XMLWriter::header("tree", $atts);
-                                if (isSet($res["/".$dir."/".$httpVars["file"]])) {
-                                    print $res["/".$dir."/".$httpVars["file"]];
-                                }
-                                AJXP_XMLWriter::close();
-                            }
-                            return;
-                        }
-                    } else {
-                        $parentName = "/".$root."/";
-                        $nodes = $rootNodes[$root]["CHILDREN"];
-                    }
-                } else {
-                    $parentName = "/";
-                    $nodes = $rootNodes;
-                    if($currentUserIsGroupAdmin){
-                        $rootAttributes["group_admin"]  = "1";
-                    }
-                }
-                if (isSet($httpVars["file"])) {
-                    $parentName = $httpVars["dir"]."/";
-                    $nodes = array(basename($httpVars["file"]) =>  array("LABEL" => basename($httpVars["file"])));
-                }
-                if (isSet($nodes)) {
-                    AJXP_XMLWriter::header("tree", $rootAttributes);
-                    if(!isSet($httpVars["file"])) AJXP_XMLWriter::sendFilesListComponentConfig('<columns switchDisplayMode="detail"><column messageId="ajxp_conf.1" attributeName="ajxp_label" sortType="String"/><column messageId="ajxp_conf.102" attributeName="description" sortType="String"/></columns>');
-                    foreach ($nodes as $key => $data) {
-                        $this->renderNode($parentName.$key, $data, $mess);
-                    }
-                    AJXP_XMLWriter::close();
-
-                }
-
-            break;
-
-            case "stat" :
-
-                header("Content-type:application/json");
-                print '{"mode":true}';
-                return;
-
-            break;
-
-            case "clear_plugins_cache":
-                AJXP_XMLWriter::header();
-                ConfService::clearAllCaches();
-                AJXP_XMLWriter::sendMessage($mess["ajxp_conf.".(AJXP_SKIP_CACHE?"132":"131")], null);
-                AJXP_XMLWriter::reloadDataNode();
-                AJXP_XMLWriter::close();
-                break;
-
-
-            case "create_group":
-
-                if (isSet($httpVars["group_path"])) {
-                    $basePath = AJXP_Utils::forwardSlashDirname($httpVars["group_path"]);
-                    if(empty($basePath)) $basePath = "/";
-                    $gName = AJXP_Utils::sanitize(AJXP_Utils::decodeSecureMagic(basename($httpVars["group_path"])), AJXP_SANITIZE_ALPHANUM);
-                } else {
-                    $basePath = substr($httpVars["dir"], strlen("/data/users"));
-                    $gName    = AJXP_Utils::sanitize(SystemTextEncoding::magicDequote($httpVars["group_name"]), AJXP_SANITIZE_ALPHANUM);
-                }
-                $gLabel   = AJXP_Utils::decodeSecureMagic($httpVars["group_label"]);
-                AuthService::createGroup($basePath, $gName, $gLabel);
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::sendMessage($mess["ajxp_conf.160"], null);
-                AJXP_XMLWriter::reloadDataNode();
-                AJXP_XMLWriter::close();
-
-            break;
-
-            case "create_role":
-                $roleId = AJXP_Utils::sanitize(SystemTextEncoding::magicDequote($httpVars["role_id"]), AJXP_SANITIZE_HTML_STRICT);
-                if (!strlen($roleId)) {
-                    throw new Exception($mess[349]);
-                }
-                if (AuthService::getRole($roleId) !== false) {
-                    throw new Exception($mess["ajxp_conf.65"]);
-                }
-                $r = new AJXP_Role($roleId);
-                if (AuthService::getLoggedUser()!=null && AuthService::getLoggedUser()->getGroupPath()!=null) {
-                    $r->setGroupPath(AuthService::getLoggedUser()->getGroupPath());
-                }
-                AuthService::updateRole($r);
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::sendMessage($mess["ajxp_conf.66"], null);
-                AJXP_XMLWriter::reloadDataNode("", $httpVars["role_id"]);
-                AJXP_XMLWriter::close();
-            break;
-
-            case "edit_role" :
-                $roleId = SystemTextEncoding::magicDequote($httpVars["role_id"]);
-                $roleGroup = false;
-                $userObject = null;
-                $groupLabel = null;
-                if (strpos($roleId, "AJXP_GRP_") === 0) {
-                    $groupPath = substr($roleId, strlen("AJXP_GRP_"));
-                    $filteredGroupPath = AuthService::filterBaseGroup($groupPath);
-                    if($filteredGroupPath == "/"){
-                        $roleId = "AJXP_GRP_/";
-                        $groupLabel = $mess["ajxp_conf.151"];
-                        $roleGroup = true;
-                    }else{
-                        $groups = AuthService::listChildrenGroups(AJXP_Utils::forwardSlashDirname($groupPath));
-                        $key = "/".basename($groupPath);
-                        if (!array_key_exists($key, $groups)) {
-                            throw new Exception("Cannot find group with this id!");
-                        }
-                        $roleId = "AJXP_GRP_".$filteredGroupPath;
-                        $groupLabel = $groups[$key];
-                        $roleGroup = true;
-                    }
-                }
-                if (strpos($roleId, "AJXP_USR_") === 0) {
-                    $usrId = str_replace("AJXP_USR_/", "", $roleId);
-                    $userObject = ConfService::getConfStorageImpl()->createUserObject($usrId);
-                    if(!AuthService::canAdministrate($userObject)){
-                        throw new Exception("Cant find user!");
-                    }
-                    $role = $userObject->personalRole;
-                } else {
-                    $role = AuthService::getRole($roleId, $roleGroup);
-                }
-                if ($role === false) {
-                    throw new Exception("Cant find role! ");
-                }
-                if (isSet($httpVars["format"]) && $httpVars["format"] == "json") {
-                    HTMLWriter::charsetHeader("application/json");
-                    $roleData = $role->getDataArray(true);
-                    $allReps = ConfService::getRepositoriesList("all", false);
-                    $sharedRepos = array();
-                    if(isSet($userObject)){
-                        // Add User shared Repositories as well
-                        $acls = $userObject->mergedRole->listAcls();
-                        if(count($acls)) {
-                            $sharedRepos = ConfService::getConfStorageImpl()->listRepositoriesWithCriteria(array(
-                                "uuid" => array_keys($acls),
-                                "parent_uuid" => AJXP_FILTER_NOT_EMPTY,
-                                "owner_user_id" => AJXP_FILTER_NOT_EMPTY
-                                ));
-                            $allReps = array_merge($allReps, $sharedRepos);
-                        }
-                    }
-
-                    $repos = array();
-                    $repoDetailed = array();
-                    // USER
-                    foreach ($allReps as $repositoryId => $repositoryObject) {
-                        if (!empty($userObject) &&
-                            (
-                                !AuthService::canAssign($repositoryObject, $userObject) || $repositoryObject->isTemplate
-                                || ($repositoryObject->getAccessType()=="ajxp_conf" && !$userObject->isAdmin())
-                                || ($repositoryObject->getUniqueUser() != null && $repositoryObject->getUniqueUser() != $userObject->getId())
-                            )
-                        ){
-                            continue;
-                        }else if(empty($userObject) &&
-                            (
-                                !AuthService::canAdministrate($repositoryObject) || $repositoryObject->isTemplate
-                            )){
-                            continue;
-                        }
-                        $meta = array();
-                        try{
-                            if($repositoryObject->getOption("META_SOURCES") != null){
-                                $meta = array_keys($repositoryObject->getOption("META_SOURCES"));
-                            }
-                        }catch(Exception $e){
-                            if(isSet($sharedRepos[$repositoryId])) unset($sharedRepos[$repositoryId]);
-                            $this->logError("Invalid Share", "Repository $repositoryId has no more parent. Should be deleted.");
-                            continue;
-                        }
-                        $repoDetailed[$repositoryId] = array(
-                            "label"  => SystemTextEncoding::toUTF8($repositoryObject->getDisplay()),
-                            "driver" => $repositoryObject->getAccessType(),
-                            "scope"  => $repositoryObject->securityScope(),
-                            "meta"   => $meta
-                        );
-
-                        if(array_key_exists($repositoryId, $sharedRepos)){
-                            $sharedRepos[$repositoryId] = SystemTextEncoding::toUTF8($repositoryObject->getDisplay());
-                            $repoParentLabel = $repoParentId = $repositoryObject->getParentId();
-                            $repoOwnerId = $repositoryObject->getOwner();
-                            if(isSet($allReps[$repoParentId])){
-                                $repoParentLabel = SystemTextEncoding::toUTF8($allReps[$repoParentId]->getDisplay());
-                            }
-                            $repoOwnerLabel = ConfService::getUserPersonalParameter("USER_DISPLAY_NAME", $repoOwnerId, "core.conf", $repoOwnerId);
-                            $repoDetailed[$repositoryId]["share"] = array(
-                                "parent_user" => $repoOwnerId,
-                                "parent_user_label" => $repoOwnerLabel,
-                                "parent_repository" => $repoParentId,
-                                "parent_repository_label" => $repoParentLabel
-                            );
-                        }else{
-                            $repos[$repositoryId] = SystemTextEncoding::toUTF8($repositoryObject->getDisplay());
-                        }
-
-                    }
-                    // Make sure it's utf8
-                    $data = array(
-                        "ROLE" => $roleData,
-                        "ALL"  => array(
-                            "PLUGINS_SCOPES" => array(
-                                "GLOBAL_TYPES" => array("conf", "auth", "authfront", "log", "mq", "notifications", "gui", "sec"),
-                                "GLOBAL_PLUGINS" => array("action.avatar", "action.disclaimer", "action.scheduler", "action.skeleton", "action.updater")
-                            ),
-                            "REPOSITORIES" => $repos,
-                            "SHARED_REPOSITORIES" => $sharedRepos,
-                            "REPOSITORIES_DETAILS" => $repoDetailed,
-                            "PROFILES" => array("standard|".$mess["ajxp_conf.156"],"admin|".$mess["ajxp_conf.157"],"shared|".$mess["ajxp_conf.158"],"guest|".$mess["ajxp_conf.159"])
-                        )
-                    );
-                    if (isSet($userObject)) {
-                        $data["USER"] = array();
-                        $data["USER"]["LOCK"] = $userObject->getLock();
-                        $data["USER"]["PROFILE"] = $userObject->getProfile();
-                        $data["USER"]["ROLES"] = array_keys($userObject->getRoles());
-                        $rolesList = AuthService::getRolesList(array(), true);
-                        $data["ALL"]["ROLES"] = array_keys($rolesList);
-                        $data["ALL"]["ROLES_DETAILS"] = array();
-                        foreach($rolesList as $rId => $rObj){
-                            $data["ALL"]["ROLES_DETAILS"][$rId] = array("label" => $rObj->getLabel(), "sticky" => $rObj->alwaysOverrides());
-                        }
-                        if (isSet($userObject->parentRole)) {
-                            $data["PARENT_ROLE"] = $userObject->parentRole->getDataArray();
-                        }
-                    } else if (isSet($groupPath)) {
-                        $data["GROUP"] = array("PATH" => $groupPath, "LABEL" => $groupLabel);
-                        if($roleId != "AJXP_GRP_/"){
-                            $parentGroupRoles = array();
-                            $parentPath = AJXP_Utils::forwardSlashDirname($roleId);
-                            while($parentPath != "AJXP_GRP_"){
-                                $parentRole = AuthService::getRole($parentPath);
-                                if($parentRole != null) {
-                                    array_unshift($parentGroupRoles, $parentRole);
-                                }
-                                $parentPath = AJXP_Utils::forwardSlashDirname($parentPath);
-                            }
-                            $rootGroup = AuthService::getRole("AJXP_GRP_/");
-                            if($rootGroup != null) array_unshift($parentGroupRoles, $rootGroup);
-                            if(count($parentGroupRoles)){
-                                $parentRole = clone array_shift($parentGroupRoles);
-                                foreach($parentGroupRoles as $pgRole){
-                                    $parentRole = $pgRole->override($parentRole);
-                                }
-                                $data["PARENT_ROLE"] = $parentRole->getDataArray();
-                            }
-                        }
-                    }
-
-
-                    $scope = "role";
-                    if($roleGroup) {
-                        $scope = "group";
-                        if($roleId == "AJXP_GRP_/") $scope = "role";
-                    }
-                    else if(isSet($userObject)) $scope = "user";
-                    $data["SCOPE_PARAMS"] = array();
-                    $nodes = AJXP_PluginsService::getInstance()->searchAllManifests("//param[contains(@scope,'".$scope."')]|//global_param[contains(@scope,'".$scope."')]", "node", false, true, true);
-                    foreach ($nodes as $node) {
-                        $pId = $node->parentNode->parentNode->attributes->getNamedItem("id")->nodeValue;
-                        $origName = $node->attributes->getNamedItem("name")->nodeValue;
-                        if($roleId == "AJXP_GRP_/" && strpos($origName, "ROLE_") ===0 ) continue;
-                        $node->attributes->getNamedItem("name")->nodeValue = "AJXP_REPO_SCOPE_ALL/".$pId."/".$origName;
-                        $nArr = array();
-                        foreach ($node->attributes as $attrib) {
-                            $nArr[$attrib->nodeName] = AJXP_XMLWriter::replaceAjxpXmlKeywords($attrib->nodeValue);
-                        }
-                        $data["SCOPE_PARAMS"][] = $nArr;
-                    }
-
-                    echo json_encode($data);
-                }
-            break;
-
-            case "post_json_role" :
-
-                $roleId = SystemTextEncoding::magicDequote($httpVars["role_id"]);
-                $roleGroup = false;
-                $userObject = $usrId = $filteredGroupPath = null;
-                if (strpos($roleId, "AJXP_GRP_") === 0) {
-                    $groupPath = substr($roleId, strlen("AJXP_GRP_"));
-                    $filteredGroupPath = AuthService::filterBaseGroup($groupPath);
-                    $roleId = "AJXP_GRP_".$filteredGroupPath;
-                    if($roleId != "AJXP_GRP_/"){
-                        $groups = AuthService::listChildrenGroups(AJXP_Utils::forwardSlashDirname($groupPath));
-                        $key = "/".basename($groupPath);
-                        if (!array_key_exists($key, $groups)) {
-                            throw new Exception("Cannot find group with this id!");
-                        }
-                        $groupLabel = $groups[$key];
-                    }else{
-                        $groupLabel = $mess["ajxp_conf.151"];
-                    }
-                    $roleGroup = true;
-                }
-                if (strpos($roleId, "AJXP_USR_") === 0) {
-                    $usrId = str_replace("AJXP_USR_/", "", $roleId);
-                    $userObject = ConfService::getConfStorageImpl()->createUserObject($usrId);
-                    if(!AuthService::canAdministrate($userObject)){
-                        throw new Exception("Cannot post role for user ".$usrId);
-                    }
-                    $originalRole = $userObject->personalRole;
-                } else {
-                    // second param = create if not exists.
-                    $originalRole = AuthService::getRole($roleId, $roleGroup);
-                }
-                if ($originalRole === false) {
-                    throw new Exception("Cant find role! ");
-                }
-
-                $jsonData = SystemTextEncoding::magicDequote($httpVars["json_data"]);
-                $data = json_decode($jsonData, true);
-                $roleData = $data["ROLE"];
-                $binariesContext = array();
-                if (isset($userObject)) {
-                    $binariesContext = array("USER" => $userObject->getId());
-                }
-                if(isSet($data["FORMS"])){
-                    $forms = $data["FORMS"];
-                    foreach ($forms as $repoScope => $plugData) {
-                        foreach ($plugData as $plugId => $formsData) {
-                            $parsed = array();
-                            AJXP_Utils::parseStandardFormParameters(
-                                $formsData,
-                                $parsed,
-                                ($userObject!=null?$usrId:null),
-                                "ROLE_PARAM_",
-                                $binariesContext,
-                                AJXP_Role::$cypheredPassPrefix
-                            );
-                            $roleData["PARAMETERS"][$repoScope][$plugId] = $parsed;
-                        }
-                    }
-                }else{
-                    AJXP_Utils::filterFormElementsFromMeta(
-                        $data["METADATA"],
-                        $roleData,
-                        ($userObject!=null?$usrId:null),
-                        $binariesContext,
-                        AJXP_Role::$cypheredPassPrefix
-                    );
-                }
-                $existingParameters = $originalRole->listParameters(true);
-                $this->mergeExistingParameters($roleData["PARAMETERS"], $existingParameters);
-                if (isSet($userObject) && isSet($data["USER"]) && isSet($data["USER"]["PROFILE"])) {
-                    $userObject->setAdmin(($data["USER"]["PROFILE"] == "admin"));
-                    $userObject->setProfile($data["USER"]["PROFILE"]);
-                }
-                if (isSet($data["GROUP_LABEL"]) && isSet($groupLabel) && $groupLabel != $data["GROUP_LABEL"]) {
-                    ConfService::getConfStorageImpl()->relabelGroup($filteredGroupPath, $data["GROUP_LABEL"]);
-                }
-
-                if($currentUserIsGroupAdmin){
-                    // FILTER DATA FOR GROUP ADMINS
-                    $params = $this->getEditableParameters(false);
-                    foreach($roleData["PARAMETERS"] as $scope => &$plugsParameters){
-                        foreach($plugsParameters as $paramPlugin => &$parameters){
-                            foreach($parameters as $pName => $pValue){
-                                if(!isSet($params[$paramPlugin]) || !in_array($pName, $params[$paramPlugin])){
-                                    unset($parameters[$pName]);
-                                }
-                            }
-                            if(!count($parameters)){
-                                unset($plugsParameters[$paramPlugin]);
-                            }
-                        }
-                        if(!count($plugsParameters)){
-                            unset($roleData["PARAMETERS"][$scope]);
-                        }
-                    }
-                    // Remerge from parent
-                    $roleData["PARAMETERS"] = $originalRole->array_merge_recursive2($originalRole->listParameters(), $roleData["PARAMETERS"]);
-                    // Changing Actions is not allowed
-                    $roleData["ACTIONS"] = $originalRole->listActionsStates();
-                }
-
-                if(isSet($roleData["MASKS"])){
-                    foreach($roleData["MASKS"] as $repoId => $serialMask){
-                        $roleData["MASKS"][$repoId] = new AJXP_PermissionMask($serialMask);
-                    }
-                }
-
-                try {
-                    $originalRole->bunchUpdate($roleData);
-                    if (isSet($userObject)) {
-                        $userObject->personalRole = $originalRole;
-                        $userObject->save("superuser");
-                    } else {
-                        AuthService::updateRole($originalRole);
-                    }
-                    // Reload Role
-                    $savedValue = AuthService::getRole($originalRole->getId());
-                    $output = array("ROLE" => $savedValue->getDataArray(true), "SUCCESS" => true);
-                } catch (Exception $e) {
-                    $output = array("ERROR" => $e->getMessage());
-                }
-                HTMLWriter::charsetHeader("application/json");
-                echo(json_encode($output));
-
-            break;
-
-
-            case "user_set_lock" :
-
-                $userId = AJXP_Utils::decodeSecureMagic($httpVars["user_id"]);
-                $lock = ($httpVars["lock"] == "true" ? true : false);
-                $lockType = $httpVars["lock_type"];
-                if (AuthService::userExists($userId)) {
-                    $userObject = ConfService::getConfStorageImpl()->createUserObject($userId);
-                    if(!AuthService::canAdministrate($userObject)){
-                        throw new Exception("Cannot update user data for ".$userId);
-                    }
-                    if ($lock) {
-                        $userObject->setLock($lockType);
-                        AJXP_XMLWriter::header();
-                        AJXP_XMLWriter::sendMessage("Successfully set lock on user ($lockType)", null);
-                        AJXP_XMLWriter::close();
-                    } else {
-                        $userObject->removeLock();
-                        AJXP_XMLWriter::header();
-                        AJXP_XMLWriter::sendMessage("Successfully unlocked user", null);
-                        AJXP_XMLWriter::close();
-                    }
-                    $userObject->save("superuser");
-                }
-
-            break;
-
-            case "create_user" :
-
-                if (!isset($httpVars["new_user_login"]) || $httpVars["new_user_login"] == "" ||!isset($httpVars["new_user_pwd"]) || $httpVars["new_user_pwd"] == "") {
-                    AJXP_XMLWriter::header();
-                    AJXP_XMLWriter::sendMessage(null, $mess["ajxp_conf.61"]);
-                    AJXP_XMLWriter::close();
-                    return;
-                }
-                $original_login = SystemTextEncoding::magicDequote($httpVars["new_user_login"]);
-                $new_user_login = AJXP_Utils::sanitize($original_login, AJXP_SANITIZE_EMAILCHARS);
-                if($original_login != $new_user_login){
-                    throw new Exception(str_replace("%s", $new_user_login, $mess["ajxp_conf.127"]));
-                }
-                if (AuthService::userExists($new_user_login, "w") || AuthService::isReservedUserId($new_user_login)) {
-                    throw new Exception($mess["ajxp_conf.43"]);
-                }
-
-                AuthService::createUser($new_user_login, $httpVars["new_user_pwd"]);
-                $confStorage = ConfService::getConfStorageImpl();
-                $newUser = $confStorage->createUserObject($new_user_login);
-                if (!empty($httpVars["group_path"])) {
-                    $newUser->setGroupPath(rtrim($currentAdminBasePath, "/")."/".ltrim($httpVars["group_path"], "/"));
-                } else {
-                    $newUser->setGroupPath($currentAdminBasePath);
-                }
-
-                $newUser->save("superuser");
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::sendMessage($mess["ajxp_conf.44"], null);
-                AJXP_XMLWriter::reloadDataNode("", $new_user_login);
-                AJXP_XMLWriter::close();
-
-            break;
-
-            case "change_admin_right" :
-                $userId = $httpVars["user_id"];
-                if (!AuthService::userExists($userId)) {
-                    throw new Exception("Invalid user id!");
-                }
-                $confStorage = ConfService::getConfStorageImpl();
-                $user = $confStorage->createUserObject($userId);
-                if(!AuthService::canAdministrate($user)){
-                    throw new Exception("Cannot update user with id ".$userId);
-                }
-                $user->setAdmin(($httpVars["right_value"]=="1"?true:false));
-                $user->save("superuser");
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::sendMessage($mess["ajxp_conf.45"].$httpVars["user_id"], null);
-                AJXP_XMLWriter::reloadDataNode();
-                AJXP_XMLWriter::close();
-
-            break;
-
-            case "role_update_right" :
-                if(!isSet($httpVars["role_id"])
-                    || !isSet($httpVars["repository_id"])
-                    || !isSet($httpVars["right"]))
-                {
-                    AJXP_XMLWriter::header();
-                    AJXP_XMLWriter::sendMessage(null, $mess["ajxp_conf.61"]);
-                    AJXP_XMLWriter::close();
-                    break;
-                }
-                $rId = AJXP_Utils::sanitize($httpVars["role_id"]);
-                $role = AuthService::getRole($rId);
-                if($role === false){
-                    AJXP_XMLWriter::header();
-                    AJXP_XMLWriter::sendMessage(null, $mess["ajxp_conf.61"]."(".$rId.")");
-                    AJXP_XMLWriter::close();
-                    break;
-                }
-                $role->setAcl(AJXP_Utils::sanitize($httpVars["repository_id"], AJXP_SANITIZE_ALPHANUM), AJXP_Utils::sanitize($httpVars["right"], AJXP_SANITIZE_ALPHANUM));
-                AuthService::updateRole($role);
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::sendMessage($mess["ajxp_conf.46"].$httpVars["role_id"], null);
-                AJXP_XMLWriter::close();
-
-            break;
-
-            case "user_update_right" :
-                if(!isSet($httpVars["user_id"])
-                    || !isSet($httpVars["repository_id"])
-                    || !isSet($httpVars["right"])
-                    || !AuthService::userExists($httpVars["user_id"]))
-                {
-                    AJXP_XMLWriter::header();
-                    AJXP_XMLWriter::sendMessage(null, $mess["ajxp_conf.61"]);
-                    print("<update_checkboxes user_id=\"".$httpVars["user_id"]."\" repository_id=\"".$httpVars["repository_id"]."\" read=\"old\" write=\"old\"/>");
-                    AJXP_XMLWriter::close();
-                    return;
-                }
-                $confStorage = ConfService::getConfStorageImpl();
-                $userId = AJXP_Utils::sanitize($httpVars["user_id"], AJXP_SANITIZE_EMAILCHARS);
-                $user = $confStorage->createUserObject($userId);
-                if(!AuthService::canAdministrate($user)){
-                    throw new Exception("Cannot update user with id ".$userId);
-                }
-                $user->personalRole->setAcl(AJXP_Utils::sanitize($httpVars["repository_id"], AJXP_SANITIZE_ALPHANUM), AJXP_Utils::sanitize($httpVars["right"], AJXP_SANITIZE_ALPHANUM));
-                $user->save();
-                $loggedUser = AuthService::getLoggedUser();
-                if ($loggedUser->getId() == $user->getId()) {
-                    AuthService::updateUser($user);
-                }
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::sendMessage($mess["ajxp_conf.46"].$httpVars["user_id"], null);
-                print("<update_checkboxes user_id=\"".$httpVars["user_id"]."\" repository_id=\"".$httpVars["repository_id"]."\" read=\"".$user->canRead($httpVars["repository_id"])."\" write=\"".$user->canWrite($httpVars["repository_id"])."\"/>");
-                AJXP_XMLWriter::reloadRepositoryList();
-                AJXP_XMLWriter::close();
-                return ;
-            break;
-
-            case "user_update_group":
-
-                $userSelection = new UserSelection();
-                $userSelection->initFromHttpVars($httpVars);
-                $dir = $httpVars["dir"];
-                $dest = $httpVars["dest"];
-                if (isSet($httpVars["group_path"])) {
-                    // API Case
-                    $groupPath = $httpVars["group_path"];
-                } else {
-                    if (strpos($dir, "/data/users",0)!==0 || strpos($dest, "/data/users",0)!==0) {
-                        break;
-                    }
-                    $groupPath = substr($dest, strlen("/data/users"));
-                }
-
-                $confStorage = ConfService::getConfStorageImpl();
-                $userId = null;
-                $usersMoved = array();
-
-                if (!empty($groupPath)) {
-                    $targetPath = rtrim($currentAdminBasePath, "/")."/".ltrim($groupPath, "/");
-                } else {
-                    $targetPath = $currentAdminBasePath;
-                }
-
-                foreach ($userSelection->getFiles() as $selectedUser) {
-                    $userId = basename($selectedUser);
-                    if (!AuthService::userExists($userId)) {
-                        continue;
-                    }
-                    $user = $confStorage->createUserObject($userId);
-                    if( ! AuthService::canAdministrate($user) ){
-                        continue;
-                    }
-                    $user->setGroupPath($targetPath, true);
-                    $user->save("superuser");
-                    $usersMoved[] = $user->getId();
-                }
-                AJXP_XMLWriter::header();
-                if(count($usersMoved)){
-                    AJXP_XMLWriter::sendMessage(count($usersMoved)." user(s) successfully moved to ".$targetPath, null);
-                    AJXP_XMLWriter::reloadDataNode($dest, $userId);
-                    AJXP_XMLWriter::reloadDataNode();
-                }else{
-                    AJXP_XMLWriter::sendMessage(null, "No users moved, there must have been something wrong.");
-                }
-                AJXP_XMLWriter::close();
-
-                break;
-
-            case "user_add_role" :
-            case "user_delete_role":
-
-                if (!isSet($httpVars["user_id"]) || !isSet($httpVars["role_id"]) || !AuthService::userExists($httpVars["user_id"]) || !AuthService::getRole($httpVars["role_id"])) {
-                    throw new Exception($mess["ajxp_conf.61"]);
-                }
-                if ($action == "user_add_role") {
-                    $act = "add";
-                    $messId = "73";
-                } else {
-                    $act = "remove";
-                    $messId = "74";
-                }
-                $this->updateUserRole(AJXP_Utils::sanitize($httpVars["user_id"], AJXP_SANITIZE_EMAILCHARS), $httpVars["role_id"], $act);
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::sendMessage($mess["ajxp_conf.".$messId].$httpVars["user_id"], null);
-                AJXP_XMLWriter::close();
-
-            break;
-
-            case "user_reorder_roles":
-
-                if (!isSet($httpVars["user_id"]) || !AuthService::userExists($httpVars["user_id"]) || !isSet($httpVars["roles"])) {
-                    throw new Exception($mess["ajxp_conf.61"]);
-                }
-                $roles = json_decode($httpVars["roles"], true);
-                $userId = AJXP_Utils::sanitize($httpVars["user_id"], AJXP_SANITIZE_EMAILCHARS);
-                $confStorage = ConfService::getConfStorageImpl();
-                $user = $confStorage->createUserObject($userId);
-                if(!AuthService::canAdministrate($user)){
-                    throw new Exception("Cannot update user data for ".$userId);
-                }
-                $user->updateRolesOrder($roles);
-                $user->save("superuser");
-                $loggedUser = AuthService::getLoggedUser();
-                if ($loggedUser->getId() == $user->getId()) {
-                    AuthService::updateUser($user);
-                }
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::sendMessage("Roles reordered for user ".$httpVars["user_id"], null);
-                AJXP_XMLWriter::close();
-
-            break;
-
-            case "users_bulk_update_roles":
-
-                $data = json_decode($httpVars["json_data"], true);
-                $userIds = $data["users"];
-                $rolesOperations = $data["roles"];
-                foreach($userIds as $userId){
-                    $userId = AJXP_Utils::sanitize($userId, AJXP_SANITIZE_EMAILCHARS);
-                    if(!AuthService::userExists($userId)) continue;
-                    $userObject = ConfService::getConfStorageImpl()->createUserObject($userId);
-                    if(!AuthService::canAdministrate($userObject)) continue;
-                    foreach($rolesOperations as $addOrRemove => $roles){
-                        if(!in_array($addOrRemove, array("add", "remove"))) {
-                            continue;
-                        }
-                        foreach($roles as $roleId){
-                            if(strpos($roleId, "AJXP_USR_/") === 0 || strpos($roleId,"AJXP_GRP_/") === 0){
-                                continue;
-                            }
-                            $roleId = AJXP_Utils::sanitize($roleId, AJXP_SANITIZE_FILENAME);
-                            if ($addOrRemove == "add") {
-                                $roleObject = AuthService::getRole($roleId);
-                                $userObject->addRole($roleObject);
-                            } else {
-                                $userObject->removeRole($roleId);
-                            }
-                        }
-                    }
-                    $userObject->save("superuser");
-                    $loggedUser = AuthService::getLoggedUser();
-                    if ($loggedUser->getId() == $userObject->getId()) {
-                        AuthService::updateUser($userObject);
-                    }
-                }
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::sendMessage("Successfully updated roles", null);
-                AJXP_XMLWriter::close();
-
-            break;
-
-            case "user_update_role" :
-
-                $confStorage = ConfService::getConfStorageImpl();
-                $selection = new UserSelection();
-                $selection->initFromHttpVars($httpVars);
-                $files = $selection->getFiles();
-                $detectedRoles = array();
-                $roleId = null;
-
-                if (isSet($httpVars["role_id"]) && isset($httpVars["update_role_action"])) {
-                    $update = $httpVars["update_role_action"];
-                    $roleId = $httpVars["role_id"];
-                    if (AuthService::getRole($roleId) === false) {
-                        throw new Exception("Invalid role id");
-                    }
-                }
-                foreach ($files as $index => $file) {
-                    $userId = basename($file);
-                    if (isSet($update)) {
-                        $userObject = $this->updateUserRole($userId, $roleId, $update);
-                    } else {
-                        $userObject = $confStorage->createUserObject($userId);
-                        if(!AuthService::canAdministrate($userObject)){
-                            continue;
-                        }
-                    }
-                    if ($userObject->hasParent()) {
-                        unset($files[$index]);
-                        continue;
-                    }
-                    $userRoles = $userObject->getRoles();
-                    foreach ($userRoles as $roleIndex => $bool) {
-                        if(!isSet($detectedRoles[$roleIndex])) $detectedRoles[$roleIndex] = 0;
-                        if($bool === true) $detectedRoles[$roleIndex] ++;
-                    }
-                }
-                $count = count($files);
-                AJXP_XMLWriter::header("admin_data");
-                print("<user><ajxp_roles>");
-                foreach ($detectedRoles as $roleId => $roleCount) {
-                    if($roleCount < $count) continue;
-                    print("<role id=\"$roleId\"/>");
-                }
-                print("</ajxp_roles></user>");
-                print("<ajxp_roles>");
-                foreach (AuthService::getRolesList(array(), !$this->listSpecialRoles) as $roleId => $roleObject) {
-                    print("<role id=\"$roleId\"/>");
-                }
-                print("</ajxp_roles>");
-                AJXP_XMLWriter::close("admin_data");
-
-            break;
-
-            case "save_custom_user_params" :
-                $userId = AJXP_Utils::sanitize($httpVars["user_id"], AJXP_SANITIZE_EMAILCHARS);
-                if ($userId == $loggedUser->getId()) {
-                    $user = $loggedUser;
-                } else {
-                    $confStorage = ConfService::getConfStorageImpl();
-                    $user = $confStorage->createUserObject($userId);
-                }
-                if(!AuthService::canAdministrate($user)){
-                    throw new Exception("Cannot update user with id ".$userId);
-                }
-
-                $custom = $user->getPref("CUSTOM_PARAMS");
-                if(!is_array($custom)) $custom = array();
-
-                $options = $custom;
-                $this->parseParameters($httpVars, $options, $userId, false, $custom);
-                $custom = $options;
-                $user->setPref("CUSTOM_PARAMS", $custom);
-                $user->save();
-
-                if ($loggedUser->getId() == $user->getId()) {
-                    AuthService::updateUser($user);
-                }
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::sendMessage($mess["ajxp_conf.47"].$httpVars["user_id"], null);
-                AJXP_XMLWriter::close();
-
-            break;
-
-            case "save_repository_user_params" :
-                $userId = AJXP_Utils::sanitize($httpVars["user_id"], AJXP_SANITIZE_EMAILCHARS);
-                if ($userId == $loggedUser->getId()) {
-                    $user = $loggedUser;
-                } else {
-                    $confStorage = ConfService::getConfStorageImpl();
-                    $user = $confStorage->createUserObject($userId);
-                }
-                if(!AuthService::canAdministrate($user)){
-                    throw new Exception("Cannot update user with id ".$userId);
-                }
-
-                $wallet = $user->getPref("AJXP_WALLET");
-                if(!is_array($wallet)) $wallet = array();
-                $repoID = $httpVars["repository_id"];
-                if (!array_key_exists($repoID, $wallet)) {
-                    $wallet[$repoID] = array();
-                }
-                $options = $wallet[$repoID];
-                $existing = $options;
-                $this->parseParameters($httpVars, $options, $userId, false, $existing);
-                $wallet[$repoID] = $options;
-                $user->setPref("AJXP_WALLET", $wallet);
-                $user->save();
-
-                if ($loggedUser->getId() == $user->getId()) {
-                    AuthService::updateUser($user);
-                }
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::sendMessage($mess["ajxp_conf.47"].$httpVars["user_id"], null);
-                AJXP_XMLWriter::close();
-
-            break;
-
-            case "update_user_pwd" :
-                if (!isSet($httpVars["user_id"]) || !isSet($httpVars["user_pwd"]) || !AuthService::userExists($httpVars["user_id"]) || trim($httpVars["user_pwd"]) == "") {
-                    AJXP_XMLWriter::header();
-                    AJXP_XMLWriter::sendMessage(null, $mess["ajxp_conf.61"]);
-                    AJXP_XMLWriter::close();
-                    return;
-                }
-                $userId = AJXP_Utils::sanitize($httpVars["user_id"], AJXP_SANITIZE_EMAILCHARS);
-                $user = ConfService::getConfStorageImpl()->createUserObject($userId);
-                if(!AuthService::canAdministrate($user)){
-                    throw new Exception("Cannot update user data for ".$userId);
-                }
-                $res = AuthService::updatePassword($userId, $httpVars["user_pwd"]);
-                AJXP_XMLWriter::header();
-                if ($res === true) {
-                    AJXP_XMLWriter::sendMessage($mess["ajxp_conf.48"].$userId, null);
-                } else {
-                    AJXP_XMLWriter::sendMessage(null, $mess["ajxp_conf.49"]." : $res");
-                }
-                AJXP_XMLWriter::close();
-
-            break;
-
-            case "save_user_preference":
-
-                if (!isSet($httpVars["user_id"]) || !AuthService::userExists($httpVars["user_id"]) ) {
-                    throw new Exception($mess["ajxp_conf.61"]);
-                }
-                $userId = AJXP_Utils::sanitize($httpVars["user_id"], AJXP_SANITIZE_EMAILCHARS);
-                if ($userId == $loggedUser->getId()) {
-                    $userObject = $loggedUser;
-                } else {
-                    $confStorage = ConfService::getConfStorageImpl();
-                    $userObject = $confStorage->createUserObject($userId);
-                }
-                if(!AuthService::canAdministrate($userObject)){
-                    throw new Exception("Cannot update user data for ".$userId);
-                }
-
-                $i = 0;
-                while (isSet($httpVars["pref_name_".$i]) && isSet($httpVars["pref_value_".$i])) {
-                    $prefName = AJXP_Utils::sanitize($httpVars["pref_name_".$i], AJXP_SANITIZE_ALPHANUM);
-                    $prefValue = AJXP_Utils::sanitize(SystemTextEncoding::magicDequote($httpVars["pref_value_".$i]));
-                    if($prefName == "password") continue;
-                    if ($prefName != "pending_folder" && $userObject == null) {
-                        $i++;
-                        continue;
-                    }
-                    $userObject->setPref($prefName, $prefValue);
-                    $userObject->save("user");
-                    $i++;
-                }
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::sendMessage("Succesfully saved user preference", null);
-                AJXP_XMLWriter::close();
-
-            break;
-
-            case  "get_drivers_definition":
-
-                AJXP_XMLWriter::header("drivers", array("allowed" => $currentUserIsGroupAdmin ? "false" : "true"));
-                print(AJXP_XMLWriter::replaceAjxpXmlKeywords(ConfService::availableDriversToXML("param", "", true)));
-                AJXP_XMLWriter::close("drivers");
-
-
-            break;
-
-            case  "get_templates_definition":
-
-                AJXP_XMLWriter::header("repository_templates");
-                $count = 0;
-                $repositories = ConfService::listRepositoriesWithCriteria(array(
-                    "isTemplate" => '1'
-                ), $count);
-                foreach ($repositories as $repo) {
-                    if(!$repo->isTemplate) continue;
-                    $repoId = $repo->getUniqueId();
-                    $repoLabel = SystemTextEncoding::toUTF8($repo->getDisplay());
-                    $repoType = $repo->getAccessType();
-                    print("<template repository_id=\"$repoId\" repository_label=\"$repoLabel\" repository_type=\"$repoType\">");
-                    foreach ($repo->getOptionsDefined() as $optionName) {
-                        print("<option name=\"$optionName\"/>");
-                    }
-                    print("</template>");
-                }
-                AJXP_XMLWriter::close("repository_templates");
-
-
-            break;
-
-            case "create_repository" :
-
-                $repDef = $httpVars;
-                $isTemplate = isSet($httpVars["sf_checkboxes_active"]);
-                unset($repDef["get_action"]);
-                unset($repDef["sf_checkboxes_active"]);
-                if (isSet($httpVars["json_data"])) {
-                    $repDef = json_decode(SystemTextEncoding::magicDequote($httpVars["json_data"]), true);
-                    $options = $repDef["DRIVER_OPTIONS"];
-                } else {
-                    $options = array();
-                    $this->parseParameters($repDef, $options, null, true);
-                }
-                if (count($options)) {
-                    $repDef["DRIVER_OPTIONS"] = $options;
-                    unset($repDef["DRIVER_OPTIONS"]["AJXP_GROUP_PATH_PARAMETER"]);
-                    if(isSet($options["AJXP_SLUG"])){
-                        $repDef["AJXP_SLUG"] = $options["AJXP_SLUG"];
-                        unset($repDef["DRIVER_OPTIONS"]["AJXP_SLUG"]);
-                    }
-                }
-                if (strstr($repDef["DRIVER"], "ajxp_template_") !== false) {
-                    $templateId = substr($repDef["DRIVER"], 14);
-                    $templateRepo = ConfService::getRepositoryById($templateId);
-                    $newRep = $templateRepo->createTemplateChild($repDef["DISPLAY"], $repDef["DRIVER_OPTIONS"]);
-                    if(isSet($repDef["AJXP_SLUG"])){
-                        $newRep->setSlug($repDef["AJXP_SLUG"]);
-                    }
-                } else {
-                    if ($currentUserIsGroupAdmin) {
-                        throw new Exception("You are not allowed to create a workspace from a driver. Use a template instead.");
-                    }
-                    $pServ = AJXP_PluginsService::getInstance();
-                    $driver = $pServ->getPluginByTypeName("access", $repDef["DRIVER"]);
-
-                    $newRep = ConfService::createRepositoryFromArray(0, $repDef);
-                    $testFile = $driver->getBaseDir()."/test.".$newRep->getAccessType()."Access.php";
-                    if (!$isTemplate && is_file($testFile)) {
-                        //chdir(AJXP_TESTS_FOLDER."/plugins");
-                        $className = $newRep->getAccessType()."AccessTest";
-                        if (!class_exists($className))
-                            include($testFile);
-                        $class = new $className();
-                        $result = $class->doRepositoryTest($newRep);
-                        if (!$result) {
-                            AJXP_XMLWriter::header();
-                            AJXP_XMLWriter::sendMessage(null, $class->failedInfo);
-                            AJXP_XMLWriter::close();
-                            return;
-                        }
-                    }
-                    // Apply default metasource if any
-                    if ($driver != null && $driver->getConfigs()!=null ) {
-                        $confs = $driver->getConfigs();
-                        if (!empty($confs["DEFAULT_METASOURCES"])) {
-                            $metaIds = AJXP_Utils::parseCSL($confs["DEFAULT_METASOURCES"]);
-                            $metaSourceOptions = array();
-                            foreach ($metaIds as $metaID) {
-                                $metaPlug = $pServ->getPluginById($metaID);
-                                if($metaPlug == null) continue;
-                                $pNodes = $metaPlug->getManifestRawContent("//param[@default]", "nodes");
-                                $defaultParams = array();
-                                foreach ($pNodes as $domNode) {
-                                    $defaultParams[$domNode->getAttribute("name")] = $domNode->getAttribute("default");
-                                }
-                                $metaSourceOptions[$metaID] = $defaultParams;
-                            }
-                            $newRep->addOption("META_SOURCES", $metaSourceOptions);
-                        }
-                    }
-                }
-
-                if ($this->repositoryExists($newRep->getDisplay())) {
-                    AJXP_XMLWriter::header();
-                    AJXP_XMLWriter::sendMessage(null, $mess["ajxp_conf.50"]);
-                    AJXP_XMLWriter::close();
-                    return;
-                }
-                if ($isTemplate) {
-                    $newRep->isTemplate = true;
-                }
-                if ($currentUserIsGroupAdmin) {
-                    $newRep->setGroupPath(AuthService::getLoggedUser()->getGroupPath());
-                } else if (!empty($options["AJXP_GROUP_PATH_PARAMETER"])) {
-                    $value =  AJXP_Utils::securePath(rtrim($currentAdminBasePath, "/")."/".ltrim($options["AJXP_GROUP_PATH_PARAMETER"], "/"));
-                    $newRep->setGroupPath($value);
-                }
-
-                $res = ConfService::addRepository($newRep);
-                AJXP_XMLWriter::header();
-                if ($res == -1) {
-                    AJXP_XMLWriter::sendMessage(null, $mess["ajxp_conf.51"]);
-                } else {
-                    $defaultRights = $newRep->getDefaultRight();
-                    if(!empty($defaultRights)){
-                        $groupRole = AuthService::getRole("AJXP_GRP_".$currentAdminBasePath, true);
-                        $groupRole->setAcl($newRep->getId(), $defaultRights);
-                    }
-                    $loggedUser = AuthService::getLoggedUser();
-                    $loggedUser->personalRole->setAcl($newRep->getUniqueId(), "rw");
-                    $loggedUser->recomputeMergedRole();
-                    $loggedUser->save("superuser");
-                    AuthService::updateUser($loggedUser);
-
-                    AJXP_XMLWriter::sendMessage($mess["ajxp_conf.52"], null);
-                    AJXP_XMLWriter::reloadDataNode("", $newRep->getUniqueId());
-                    AJXP_XMLWriter::reloadRepositoryList();
-                }
-                AJXP_XMLWriter::close();
-
-
-
-            break;
-
-            case "edit_repository" :
-                $repId = $httpVars["repository_id"];
-                $repository = ConfService::getRepositoryById($repId);
-                if ($repository == null) {
-                    throw new Exception("Cannot find workspace with id $repId");
-                }
-                if (!AuthService::canAdministrate($repository)) {
-                    throw new Exception("You are not allowed to edit this workspace!");
-                }
-                $pServ = AJXP_PluginsService::getInstance();
-                $plug = $pServ->getPluginById("access.".$repository->accessType);
-                if ($plug == null) {
-                    throw new Exception("Cannot find access driver (".$repository->accessType.") for workspace!");
-                }
-                AJXP_XMLWriter::header("admin_data");
-                $slug = $repository->getSlug();
-                if ($slug == "" && $repository->isWriteable()) {
-                    $repository->setSlug();
-                    ConfService::replaceRepository($repId, $repository);
-                }
-                if (AuthService::getLoggedUser()!=null && AuthService::getLoggedUser()->getGroupPath() != null) {
-                    $rgp = $repository->getGroupPath();
-                    if($rgp == null) $rgp = "/";
-                    if (strlen($rgp) < strlen(AuthService::getLoggedUser()->getGroupPath())) {
-                        $repository->setWriteable(false);
-                    }
-                }
-                $nested = array();
-                $definitions = $plug->getConfigsDefinitions();
-                print("<repository index=\"$repId\" securityScope=\"".$repository->securityScope()."\"");
-                foreach ($repository as $name => $option) {
-                    if(strstr($name, " ")>-1) continue;
-                    if ($name == "driverInstance") continue;
-                    if (!is_array($option)) {
-                        if (is_bool($option)) {
-                            $option = ($option?"true":"false");
-                        }
-                        print(" $name=\"".SystemTextEncoding::toUTF8(AJXP_Utils::xmlEntities($option))."\" ");
-                    } else if (is_array($option)) {
-                        $nested[] = $option;
-                    }
-                }
-                if (count($nested)) {
-                    print(">");
-                    foreach ($nested as $option) {
-                        foreach ($option as $key => $optValue) {
-                            if (is_array($optValue) && count($optValue)) {
-                                print("<param name=\"$key\"><![CDATA[".json_encode($optValue)."]]></param>");
-                            } else if (is_object($optValue)){
-                                print("<param name=\"$key\"><![CDATA[".json_encode($optValue)."]]></param>");
-                            } else {
-                                if (is_bool($optValue)) {
-                                    $optValue = ($optValue?"true":"false");
-                                } else if(isSet($definitions[$key]) && $definitions[$key]["type"] == "password" && !empty($optValue)){
-                                    $optValue = "__AJXP_VALUE_SET__";
-                                }
-
-                                $optValue = AJXP_Utils::xmlEntities($optValue, true);
-                                print("<param name=\"$key\" value=\"$optValue\"/>");
-                            }
-                        }
-                    }
-                    // Add SLUG
-                    if(!$repository->isTemplate) print("<param name=\"AJXP_SLUG\" value=\"".$repository->getSlug()."\"/>");
-                    if ($repository->getGroupPath() != null) {
-                        $groupPath = $repository->getGroupPath();
-                        if($currentAdminBasePath != "/") $groupPath = substr($repository->getGroupPath(), strlen($currentAdminBasePath));
-                        print("<param name=\"AJXP_GROUP_PATH_PARAMETER\" value=\"".$groupPath."\"/>");
-                    }
-
-                    print("</repository>");
-                } else {
-                    print("/>");
-                }
-                if ($repository->hasParent()) {
-                    $parent = ConfService::getRepositoryById($repository->getParentId());
-                    if (isSet($parent) && $parent->isTemplate) {
-                        $parentLabel = $parent->getDisplay();
-                        $parentType = $parent->getAccessType();
-                        print("<template repository_id=\"".$repository->getParentId()."\" repository_label=\"$parentLabel\" repository_type=\"$parentType\">");
-                        foreach ($parent->getOptionsDefined() as $parentOptionName) {
-                            print("<option name=\"$parentOptionName\"/>");
-                        }
-                        print("</template>");
-                    }
-                }
-                $manifest = $plug->getManifestRawContent("server_settings/param");
-                $manifest = AJXP_XMLWriter::replaceAjxpXmlKeywords($manifest);
-                $clientSettings = $plug->getManifestRawContent("client_settings", "xml");
-                $iconClass = "";$descriptionTemplate = "";
-                if($clientSettings->length){
-                    $iconClass = $clientSettings->item(0)->getAttribute("iconClass");
-                    $descriptionTemplate = $clientSettings->item(0)->getAttribute("description_template");
-                }
-                print("<ajxpdriver name=\"".$repository->accessType."\" label=\"".AJXP_Utils::xmlEntities($plug->getManifestLabel())."\" iconClass=\"$iconClass\" description_template=\"$descriptionTemplate\" description=\"".AJXP_Utils::xmlEntities($plug->getManifestDescription())."\">$manifest</ajxpdriver>");
-                print("<metasources>");
-                $metas = $pServ->getPluginsByType("metastore");
-                $metas = array_merge($metas, $pServ->getPluginsByType("meta"));
-                $metas = array_merge($metas, $pServ->getPluginsByType("index"));
-                foreach ($metas as $metaPlug) {
-                    print("<meta id=\"".$metaPlug->getId()."\" label=\"".AJXP_Utils::xmlEntities($metaPlug->getManifestLabel())."\" description=\"".AJXP_Utils::xmlEntities($metaPlug->getManifestDescription())."\">");
-                    $manifest = $metaPlug->getManifestRawContent("server_settings/param");
-                    $manifest = AJXP_XMLWriter::replaceAjxpXmlKeywords($manifest);
-                    print($manifest);
-                    print("</meta>");
-                }
-                print("</metasources>");
-                if(!$repository->isTemplate){
-                    print "<additional_info>";
-                    $users = AuthService::countUsersForRepository($repId, false, true);
-                    $shares = ConfService::getConfStorageImpl()->simpleStoreList("share", null, "", "serial", '', $repId);
-                    print('<users total="'.$users.'"/>');
-                    print('<shares total="'.count($shares).'"/>');
-                    $rootGroup = AuthService::getRole("AJXP_GRP_/");
-                    if($rootGroup !== false && $rootGroup->hasMask($repId)){
-                        print("<mask><![CDATA[".json_encode($rootGroup->getMask($repId))."]]></mask>");
-                    }
-                    print "</additional_info>";
-                }
-                AJXP_XMLWriter::close("admin_data");
-
-            break;
-
-            case "edit_repository_label" :
-            case "edit_repository_data" :
-                $repId = $httpVars["repository_id"];
-                $repo = ConfService::getRepositoryById($repId);
-                $initialDefaultRights = $repo->getDefaultRight();
-                if(!$repo->isWriteable()){
-                    if (isSet($httpVars["permission_mask"]) && !empty($httpVars["permission_mask"])){
-                        $mask = json_decode($httpVars["permission_mask"], true);
-                        $rootGroup = AuthService::getRole("AJXP_GRP_/");
-                        if(count($mask)){
-                            $perm = new AJXP_PermissionMask($mask);
-                            $rootGroup->setMask($repId, $perm);
-                        }else{
-                            $rootGroup->clearMask($repId);
-                        }
-                        AuthService::updateRole($rootGroup);
-                        AJXP_XMLWriter::header();
-                        AJXP_XMLWriter::sendMessage("The permission mask was updated for this workspace", null);
-                        AJXP_XMLWriter::close();
-                        break;
-                    }else{
-                        throw new Exception("This workspace is not writeable. Please edit directly the conf/bootstrap_repositories.php file.");
-                    }
-                }
-                $res = 0;
-                if (isSet($httpVars["newLabel"])) {
-                    $newLabel = AJXP_Utils::sanitize(AJXP_Utils::securePath($httpVars["newLabel"]), AJXP_SANITIZE_HTML);
-                    if ($this->repositoryExists($newLabel)) {
-                         AJXP_XMLWriter::header();
-                        AJXP_XMLWriter::sendMessage(null, $mess["ajxp_conf.50"]);
-                        AJXP_XMLWriter::close();
-                        return;
-                    }
-                    $repo->setDisplay($newLabel);
-                    $res = ConfService::replaceRepository($repId, $repo);
-                } else {
-                    $options = array();
-                    $existing = $repo->getOptionsDefined();
-                    $existingValues = array();
-                    if(!$repo->isTemplate){
-                        foreach($existing as $exK) $existingValues[$exK] = $repo->getOption($exK, true);
-                    }
-                    $this->parseParameters($httpVars, $options, null, true, $existingValues);
-                    if (count($options)) {
-                        foreach ($options as $key=>$value) {
-                            if ($key == "AJXP_SLUG") {
-                                $repo->setSlug($value);
-                                continue;
-                            } else if ($key == "WORKSPACE_LABEL" || $key == "TEMPLATE_LABEL"){
-                                $newLabel = AJXP_Utils::sanitize($value, AJXP_SANITIZE_HTML);
-                                if($repo->getDisplay() != $newLabel){
-                                    if ($this->repositoryExists($newLabel)) {
-                                        throw new Exception($mess["ajxp_conf.50"]);
-                                    }else{
-                                        $repo->setDisplay($newLabel);
-                                    }
-                                }
-                            } elseif ($key == "AJXP_GROUP_PATH_PARAMETER") {
-                                $value =  AJXP_Utils::securePath(rtrim($currentAdminBasePath, "/")."/".ltrim($value, "/"));
-                                $repo->setGroupPath($value);
-                                continue;
-                            }
-                            $repo->addOption($key, $value);
-                        }
-                    }
-                    if($repo->isTemplate){
-                        foreach($existing as $definedOption){
-                            if($definedOption == "META_SOURCES" || $definedOption == "CREATION_TIME" || $definedOption == "CREATION_USER"){
-                                continue;
-                            }
-                            if(!isSet($options[$definedOption]) && isSet($repo->options[$definedOption])){
-                                unset($repo->options[$definedOption]);
-                            }
-                        }
-                    }
-                    if ($repo->getOption("DEFAULT_RIGHTS")) {
-                        $gp = $repo->getGroupPath();
-                        if (empty($gp) || $gp == "/") {
-                            $defRole = AuthService::getRole("AJXP_GRP_/");
-                        } else {
-                            $defRole = AuthService::getRole("AJXP_GRP_".$gp, true);
-                        }
-                        if ($defRole !== false) {
-                            $defRole->setAcl($repId, $repo->getOption("DEFAULT_RIGHTS"));
-                            AuthService::updateRole($defRole);
-                        }
-                    }
-                    if (is_file(AJXP_TESTS_FOLDER."/plugins/test.ajxp_".$repo->getAccessType().".php")) {
-                        chdir(AJXP_TESTS_FOLDER."/plugins");
-                        include(AJXP_TESTS_FOLDER."/plugins/test.ajxp_".$repo->getAccessType().".php");
-                        $className = "ajxp_".$repo->getAccessType();
-                        $class = new $className();
-                        $result = $class->doRepositoryTest($repo);
-                        if (!$result) {
-                            AJXP_XMLWriter::header();
-                            AJXP_XMLWriter::sendMessage(null, $class->failedInfo);
-                            AJXP_XMLWriter::close();
-                            return;
-                        }
-                    }
-
-                    $rootGroup = AuthService::getRole("AJXP_GRP_".$currentAdminBasePath, true);
-                    if (isSet($httpVars["permission_mask"]) && !empty($httpVars["permission_mask"])){
-                        $mask = json_decode($httpVars["permission_mask"], true);
-                        if(count($mask)){
-                            $perm = new AJXP_PermissionMask($mask);
-                            $rootGroup->setMask($repId, $perm);
-                        }else{
-                            $rootGroup->clearMask($repId);
-                        }
-                        AuthService::updateRole($rootGroup);
-                    }
-                    $defaultRights = $repo->getDefaultRight();
-                    if($defaultRights != $initialDefaultRights){
-                        $currentDefaultRights = $rootGroup->getAcl($repId);
-                        if(!empty($defaultRights) || !empty($currentDefaultRights)){
-                            $rootGroup->setAcl($repId, empty($defaultRights) ? "" : $defaultRights);
-                            AuthService::updateRole($rootGroup);
-                        }
-                    }
-                    ConfService::replaceRepository($repId, $repo);
-                }
-                AJXP_XMLWriter::header();
-                if ($res == -1) {
-                    AJXP_XMLWriter::sendMessage(null, $mess["ajxp_conf.53"]);
-                } else {
-                    AJXP_XMLWriter::sendMessage($mess["ajxp_conf.54"], null);
-                    if (isSet($httpVars["newLabel"])) {
-                        AJXP_XMLWriter::reloadDataNode("", $repId);
-                    }
-                    AJXP_XMLWriter::reloadRepositoryList();
-                }
-                AJXP_XMLWriter::close();
-
-            break;
-
-            case "meta_source_add" :
-                $repId = $httpVars["repository_id"];
-                $repo = ConfService::getRepositoryById($repId);
-                if (!is_object($repo)) {
-                    throw new Exception("Invalid workspace id! $repId");
-                }
-                $metaSourceType = AJXP_Utils::sanitize($httpVars["new_meta_source"], AJXP_SANITIZE_ALPHANUM);
-                if (isSet($httpVars["json_data"])) {
-                    $options = json_decode(SystemTextEncoding::magicDequote($httpVars["json_data"]), true);
-                } else {
-                    $options = array();
-                    $this->parseParameters($httpVars, $options, null, true);
-                }
-                $repoOptions = $repo->getOption("META_SOURCES");
-                if (is_array($repoOptions) && isSet($repoOptions[$metaSourceType])) {
-                    throw new Exception($mess["ajxp_conf.55"]);
-                }
-                if (!is_array($repoOptions)) {
-                    $repoOptions = array();
-                }
-                $repoOptions[$metaSourceType] = $options;
-                uksort($repoOptions, array($this,"metaSourceOrderingFunction"));
-                $repo->addOption("META_SOURCES", $repoOptions);
-                ConfService::replaceRepository($repId, $repo);
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::sendMessage($mess["ajxp_conf.56"],null);
-                AJXP_XMLWriter::close();
-            break;
-
-            case "meta_source_delete" :
-
-                $repId = $httpVars["repository_id"];
-                $repo = ConfService::getRepositoryById($repId);
-                if (!is_object($repo)) {
-                    throw new Exception("Invalid workspace id! $repId");
-                }
-                $metaSourceId = $httpVars["plugId"];
-                $repoOptions = $repo->getOption("META_SOURCES");
-                if (is_array($repoOptions) && array_key_exists($metaSourceId, $repoOptions)) {
-                    unset($repoOptions[$metaSourceId]);
-                    uksort($repoOptions, array($this,"metaSourceOrderingFunction"));
-                    $repo->addOption("META_SOURCES", $repoOptions);
-                    ConfService::replaceRepository($repId, $repo);
-                }else{
-                    throw new Exception("Cannot find meta source ".$metaSourceId);
-                }
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::sendMessage($mess["ajxp_conf.57"],null);
-                AJXP_XMLWriter::close();
-
-            break;
-
-            case "meta_source_edit" :
-                $repId = $httpVars["repository_id"];
-                $repo = ConfService::getRepositoryById($repId);
-                if (!is_object($repo)) {
-                    throw new Exception("Invalid workspace id! $repId");
-                }
-                if(isSet($httpVars["plugId"])){
-                    $metaSourceId = $httpVars["plugId"];
-                    $repoOptions = $repo->getOption("META_SOURCES");
-                    if (!is_array($repoOptions)) {
-                        $repoOptions = array();
-                    }
-                    if (isSet($httpVars["json_data"])) {
-                        $options = json_decode(SystemTextEncoding::magicDequote($httpVars["json_data"]), true);
-                    } else {
-                        $options = array();
-                        $this->parseParameters($httpVars, $options, null, true);
-                    }
-                    if(isset($repoOptions[$metaSourceId])){
-                        $this->mergeExistingParameters($options, $repoOptions[$metaSourceId]);
-                    }
-                    $repoOptions[$metaSourceId] = $options;
-                }else if(isSet($httpVars["bulk_data"])){
-                    $bulkData = json_decode(SystemTextEncoding::magicDequote($httpVars["bulk_data"]), true);
-                    $repoOptions = $repo->getOption("META_SOURCES");
-                    if (!is_array($repoOptions)) {
-                        $repoOptions = array();
-                    }
-                    if(isSet($bulkData["delete"]) && count($bulkData["delete"])){
-                        foreach($bulkData["delete"] as $key){
-                            if(isSet($repoOptions[$key])) unset($repoOptions[$key]);
-                        }
-                    }
-                    if(isSet($bulkData["add"]) && count($bulkData["add"])){
-                        foreach($bulkData["add"] as $key => $value){
-                            if(isSet($repoOptions[$key])) $this->mergeExistingParameters($value, $repoOptions[$key]);
-                            $repoOptions[$key] = $value;
-                        }
-                    }
-                    if(isSet($bulkData["edit"]) && count($bulkData["edit"])){
-                        foreach($bulkData["edit"] as $key => $value){
-                            if(isSet($repoOptions[$key])) $this->mergeExistingParameters($value, $repoOptions[$key]);
-                            $repoOptions[$key] = $value;
-                        }
-                    }
-                }
-                uksort($repoOptions, array($this,"metaSourceOrderingFunction"));
-                $repo->addOption("META_SOURCES", $repoOptions);
-                ConfService::replaceRepository($repId, $repo);
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::sendMessage($mess["ajxp_conf.58"],null);
-                AJXP_XMLWriter::close();
-            break;
-
-
-            case "delete" :
-                // REST API mapping
-                if (isSet($httpVars["data_type"])) {
-                    switch ($httpVars["data_type"]) {
-                        case "repository":
-                            $httpVars["repository_id"] = basename($httpVars["data_id"]);
-                            break;
-                        case "role":
-                            $httpVars["role_id"] = basename($httpVars["data_id"]);
-                            break;
-                        case "user":
-                            $httpVars["user_id"] = basename($httpVars["data_id"]);
-                            break;
-                        case "group":
-                            $httpVars["group"] = "/data/users".$httpVars["data_id"];
-                            break;
-                        default:
-                            break;
-                    }
-                    unset($httpVars["data_type"]);
-                    unset($httpVars["data_id"]);
-                }
-                if (isSet($httpVars["repository_id"])) {
-                    $repId = $httpVars["repository_id"];
-                    $repo = ConfService::getRepositoryById($repId);
-                    if(!is_object($repo)){
-                        $res = -1;
-                    }else{
-                        $res = ConfService::deleteRepository($repId);
-                    }
-                    AJXP_XMLWriter::header();
-                    if ($res == -1) {
-                        AJXP_XMLWriter::sendMessage(null, $mess[427]);
-                    } else {
-                        AJXP_XMLWriter::sendMessage($mess["ajxp_conf.59"], null);
-                        AJXP_XMLWriter::reloadDataNode();
-                        AJXP_XMLWriter::reloadRepositoryList();
-                    }
-                    AJXP_XMLWriter::close();
-                    return;
-                } else if (isSet($httpVars["role_id"])) {
-                    $roleId = $httpVars["role_id"];
-                    if (AuthService::getRole($roleId) === false) {
-                        throw new Exception($mess["ajxp_conf.67"]);
-                    }
-                    AuthService::deleteRole($roleId);
-                    AJXP_XMLWriter::header();
-                    AJXP_XMLWriter::sendMessage($mess["ajxp_conf.68"], null);
-                    AJXP_XMLWriter::reloadDataNode();
-                    AJXP_XMLWriter::close();
-                } else if (isSet($httpVars["group"])) {
-                    $groupPath = $httpVars["group"];
-                    $basePath = substr(AJXP_Utils::forwardSlashDirname($groupPath), strlen("/data/users"));
-                    $gName = basename($groupPath);
-                    AuthService::deleteGroup($basePath, $gName);
-                    AJXP_XMLWriter::header();
-                    AJXP_XMLWriter::sendMessage($mess["ajxp_conf.128"], null);
-                    AJXP_XMLWriter::reloadDataNode();
-                    AJXP_XMLWriter::close();
-                } else {
-                    if(!isset($httpVars["user_id"]) || $httpVars["user_id"]==""
-                        || AuthService::isReservedUserId($httpVars["user_id"])
-                        || $loggedUser->getId() == $httpVars["user_id"])
-                    {
-                        AJXP_XMLWriter::header();
-                        AJXP_XMLWriter::sendMessage(null, $mess["ajxp_conf.61"]);
-                        AJXP_XMLWriter::close();
-                    }
-                    AuthService::deleteUser($httpVars["user_id"]);
-                    AJXP_XMLWriter::header();
-                    AJXP_XMLWriter::sendMessage($mess["ajxp_conf.60"], null);
-                    AJXP_XMLWriter::reloadDataNode();
-                    AJXP_XMLWriter::close();
-
-                }
-            break;
-
-            case "get_plugin_manifest" :
-
-                $ajxpPlugin = AJXP_PluginsService::getInstance()->getPluginById($httpVars["plugin_id"]);
-                AJXP_XMLWriter::header("admin_data");
-
-                $fullManifest = $ajxpPlugin->getManifestRawContent("", "xml");
-                $xPath = new DOMXPath($fullManifest->ownerDocument);
-                $addParams = "";
-                $instancesDefinitions = array();
-                $pInstNodes = $xPath->query("server_settings/global_param[contains(@type, 'plugin_instance:')]");
-                foreach ($pInstNodes as $pInstNode) {
-                    $type = $pInstNode->getAttribute("type");
-                    $instType = str_replace("plugin_instance:", "", $type);
-                    $fieldName = $pInstNode->getAttribute("name");
-                    $pInstNode->setAttribute("type", "group_switch:".$fieldName);
-                    $typePlugs = AJXP_PluginsService::getInstance()->getPluginsByType($instType);
-                    foreach ($typePlugs as $typePlug) {
-                        if(!$typePlug->isEnabled()) continue;
-                        if($typePlug->getId() == "auth.multi") continue;
-                        $checkErrorMessage = "";
-                        try {
-                            $typePlug->performChecks();
-                        } catch (Exception $e) {
-                            $checkErrorMessage = " (Warning : ".$e->getMessage().")";
-                        }
-                        $tParams = AJXP_XMLWriter::replaceAjxpXmlKeywords($typePlug->getManifestRawContent("server_settings/param[not(@group_switch_name)]"));
-                        $addParams .= '<global_param group_switch_name="'.$fieldName.'" name="instance_name" group_switch_label="'.$typePlug->getManifestLabel().$checkErrorMessage.'" group_switch_value="'.$typePlug->getId().'" default="'.$typePlug->getId().'" type="hidden"/>';
-                        $addParams .= str_replace("<param", "<global_param group_switch_name=\"${fieldName}\" group_switch_label=\"".$typePlug->getManifestLabel().$checkErrorMessage."\" group_switch_value=\"".$typePlug->getId()."\" ", $tParams);
-                        $addParams .= str_replace("<param", "<global_param", AJXP_XMLWriter::replaceAjxpXmlKeywords($typePlug->getManifestRawContent("server_settings/param[@group_switch_name]")));
-                        $addParams .= AJXP_XMLWriter::replaceAjxpXmlKeywords($typePlug->getManifestRawContent("server_settings/global_param"));
-                        $instancesDefs = $typePlug->getConfigsDefinitions();
-                        if(!empty($instancesDefs) && is_array($instancesDefs)) {
-                            foreach($instancesDefs as $defKey => $defData){
-                                $instancesDefinitions[$fieldName."/".$defKey] = $defData;
-                            }
-                        }
-                    }
-                }
-                $allParams = AJXP_XMLWriter::replaceAjxpXmlKeywords($fullManifest->ownerDocument->saveXML($fullManifest));
-                $allParams = str_replace('type="plugin_instance:', 'type="group_switch:', $allParams);
-                $allParams = str_replace("</server_settings>", $addParams."</server_settings>", $allParams);
-
-                echo($allParams);
-                $definitions = $instancesDefinitions;
-                $configsDefs = $ajxpPlugin->getConfigsDefinitions();
-                if(is_array($configsDefs)){
-                    $definitions = array_merge($configsDefs, $instancesDefinitions);
-                }
-                $values = $ajxpPlugin->getConfigs();
-                if(!is_array($values)) $values = array();
-                echo("<plugin_settings_values>");
-                // First flatten keys
-                $flattenedKeys = array();
-                foreach ($values as $key => $value){
-                    $type = $definitions[$key]["type"];
-                    if ((strpos($type, "group_switch:") === 0 || strpos($type, "plugin_instance:") === 0 ) && is_array($value)) {
-                        $res = array();
-                        $this->flattenKeyValues($res, $definitions, $value, $key);
-                        $flattenedKeys += $res;
-                        // Replace parent key by new flat value
-                        $values[$key] = $flattenedKeys[$key];
-                    }
-                }
-                $values += $flattenedKeys;
-
-                foreach ($values as $key => $value) {
-                    $attribute = true;
-                    $type = $definitions[$key]["type"];
-                    if ($type == "array" && is_array($value)) {
-                        $value = implode(",", $value);
-                    } else if ($type == "boolean") {
-                        $value = ($value === true || $value === "true" || $value == 1?"true":"false");
-                    } else if ($type == "textarea") {
-                        $attribute = false;
-                    } else if ($type == "password" && !empty($value)){
-                        $value = "__AJXP_VALUE_SET__";
-                    }
-                    if ($attribute) {
-                        echo("<param name=\"$key\" value=\"".AJXP_Utils::xmlEntities($value)."\"/>");
-                    } else {
-                        echo("<param name=\"$key\" cdatavalue=\"true\"><![CDATA[".$value."]]></param>");
-                    }
-                }
-                if ($ajxpPlugin->getType() != "core") {
-                    echo("<param name=\"AJXP_PLUGIN_ENABLED\" value=\"".($ajxpPlugin->isEnabled()?"true":"false")."\"/>");
-                }
-                echo("</plugin_settings_values>");
-                echo("<plugin_doc><![CDATA[<p>".$ajxpPlugin->getPluginInformationHTML("Charles du Jeu", "https://pydio.com/en/docs/references/plugins/")."</p>");
-                if (file_exists($ajxpPlugin->getBaseDir()."/plugin_doc.html")) {
-                    echo(file_get_contents($ajxpPlugin->getBaseDir()."/plugin_doc.html"));
-                }
-                echo("]]></plugin_doc>");
-                AJXP_XMLWriter::close("admin_data");
-
-            break;
-
-            case "run_plugin_action":
-
-                $options = array();
-                $this->parseParameters($httpVars, $options, null, true);
-                $pluginId = $httpVars["action_plugin_id"];
-                if (isSet($httpVars["button_key"])) {
-                    $options = $options[$httpVars["button_key"]];
-                }
-                $plugin = AJXP_PluginsService::getInstance()->softLoad($pluginId, $options);
-                if (method_exists($plugin, $httpVars["action_plugin_method"])) {
-                    try {
-                        $res = call_user_func(array($plugin, $httpVars["action_plugin_method"]), $options);
-                    } catch (Exception $e) {
-                        echo("ERROR:" . $e->getMessage());
-                        break;
-                    }
-                    echo($res);
-                } else {
-                    echo 'ERROR: Plugin '.$httpVars["action_plugin_id"].' does not implement '.$httpVars["action_plugin_method"].' method!';
-                }
-
-            break;
-
-            case "edit_plugin_options":
-
-                $options = array();
-                $this->parseParameters($httpVars, $options, null, true);
-                $confStorage = ConfService::getConfStorageImpl();
-                $pluginId = AJXP_Utils::sanitize($httpVars["plugin_id"], AJXP_SANITIZE_ALPHANUM);
-                list($pType, $pName) = explode(".", $pluginId);
-                $existing = $confStorage->loadPluginConfig($pType, $pName);
-                $this->mergeExistingParameters($options, $existing);
-                $confStorage->savePluginConfig($pluginId, $options);
-                ConfService::clearAllCaches();
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::sendMessage($mess["ajxp_conf.97"], null);
-                AJXP_XMLWriter::close();
-
-
-            break;
-
-            case "generate_api_docs":
-
-                PydioSdkGenerator::analyzeRegistry(isSet($httpVars["version"])?$httpVars["version"]:AJXP_VERSION);
-
-            break;
-
-
-            // Action for update all Pydio's user from ldap in CLI mode
-            case "cli_update_user_list":
-                if((php_sapi_name() == "cli")){
-                    $progressBar = new AJXP_ProgressBarCLI();
-                    $countCallback  = array($progressBar, "init");
-                    $loopCallback   = array($progressBar, "update");
-                    AuthService::listUsers("/", null, -1 , -1, true, true, $countCallback, $loopCallback);
-                }
-                break;
-
-            default:
-                break;
-        }
-
-        return;
-    }
-
-    /**
-     * @param $actionName
-     * @param $httpVars
-     * @param $fileVars
-     * @throws Exception
-     */
-    public function displayEnterprise($actionName, $httpVars, $fileVars){
-
-        $touchFile = $this->getPluginWorkDir(true).DIRECTORY_SEPARATOR."enterprise-display";
-        HTMLWriter::charsetHeader("application/json");
-        if(file_exists($touchFile)){
-            $lastDisplay = intval(file_get_contents($touchFile));
-            if(time() - $lastDisplay > 60 * 60 * 24 * 15){
-                echo json_encode(["display" => true]);
-                file_put_contents($touchFile, time());
-            }else{
-                echo json_encode(["display" => false]);
-            }
-        }else{
-            echo json_encode(["display" => true]);
-            file_put_contents($touchFile, time());
-        }
-    }
-
-    /**
-     * @param $dir
-     * @param null $root
-     * @param null $hash
-     * @param bool $returnNodes
-     * @param string $file
-     * @param null $aliasedDir
-     * @return array
-     */
-    public function listPlugins($dir, $root = NULL, $hash = null, $returnNodes = false, $file="", $aliasedDir=null)
-    {
-        $dir = "/$dir";
-        if($aliasedDir != null && $aliasedDir != "/".$root.$dir){
-            $baseDir = $aliasedDir;
-        }else{
-            $baseDir = "/".$root.$dir;
-        }
-        $allNodes = array();
-        $this->logInfo("Listing plugins",""); // make sure that the logger is started!
-        $pServ = AJXP_PluginsService::getInstance();
-        $types = $pServ->getDetectedPlugins();
-        $mess = ConfService::getMessages();
-        $uniqTypes = array("core");
-        $coreTypes = array("auth", "conf", "boot", "feed", "log", "mailer", "mq");
-        if ($dir == "/plugins" || $dir == "/core_plugins" || $dir=="/all") {
-            if($dir == "/core_plugins") $uniqTypes = $coreTypes;
-            else if($dir == "/plugins") $uniqTypes = array_diff(array_keys($types), $coreTypes);
-            else if($dir == "/all") $uniqTypes = array_keys($types);
-            if(!$returnNodes) AJXP_XMLWriter::sendFilesListComponentConfig('<columns switchGridMode="filelist" switchDisplayMode="detail"  template_name="ajxp_conf.plugins_folder">
-            <column messageId="ajxp_conf.101" attributeName="ajxp_label" sortType="String"/>
-            <column messageId="ajxp_conf.103" attributeName="plugin_description" sortType="String"/>
-            <column messageId="ajxp_conf.102" attributeName="plugin_id" sortType="String"/>
-            </columns>');
-            ksort($types);
-            foreach ($types as $t => $tPlugs) {
-                if(!in_array($t, $uniqTypes))continue;
-                if($t == "core") continue;
-                $nodeKey = $baseDir."/".$t;
-                $meta = array(
-                    "icon" 		=> "folder_development.png",
-                    "plugin_id" => $t,
-                    "text" => $mess["plugtype.title.".$t],
-                    "plugin_description" => $mess["plugtype.desc.".$t]
-                );
-                if(in_array($nodeKey, $this->currentBookmarks)) $meta = array_merge($meta, array("ajxp_bookmarked" => "true", "overlay_icon" => "bookmark.png"));
-                $xml = AJXP_XMLWriter::renderNode($nodeKey, ucfirst($t), false, $meta, true, false);
-                if($returnNodes) $allNodes[$nodeKey] = $xml;
-                else print($xml);
-            }
-        } else if ($dir == "/core") {
-            if(!$returnNodes) AJXP_XMLWriter::sendFilesListComponentConfig('<columns switchGridMode="filelist" switchDisplayMode="detail"  template_name="ajxp_conf.plugins">
-            <column messageId="ajxp_conf.101" attributeName="ajxp_label" sortType="String"/>
-            <column messageId="ajxp_conf.102" attributeName="plugin_id" sortType="String"/>
-            <column messageId="ajxp_conf.103" attributeName="plugin_description" sortType="String"/>
-            </columns>');
-            $all =  $first = "";
-            foreach ($uniqTypes as $type) {
-                if(!isset($types[$type])) continue;
-                foreach ($types[$type] as $pObject) {
-                    $isMain = ($pObject->getId() == "core.ajaxplorer");
-                    $meta = array(
-                        "icon" 		=> ($isMain?"preferences_desktop.png":"desktop.png"),
-                        "ajxp_mime" => "ajxp_plugin",
-                        "plugin_id" => $pObject->getId(),
-                        "plugin_description" => $pObject->getManifestDescription()
-                    );
-                    // Check if there are actually any parameters to display!
-                    if($pObject->getManifestRawContent("server_settings", "xml")->length == 0) continue;
-                    $label =  $pObject->getManifestLabel();
-                    $nodeKey = $baseDir."/".$pObject->getId();
-                    if(in_array($nodeKey, $this->currentBookmarks)) $meta = array_merge($meta, array("ajxp_bookmarked" => "true", "overlay_icon" => "bookmark.png"));
-                    $nodeString =AJXP_XMLWriter::renderNode($nodeKey, $label, true, $meta, true, false);
-                    if($returnNodes) $allNodes[$nodeKey] = $nodeString;
-                    if ($isMain) {
-                        $first = $nodeString;
-                    } else {
-                        $all .= $nodeString;
-                    }
-                }
-            }
-            if(!$returnNodes) print($first.$all);
-        } else {
-            $split = explode("/", $dir);
-            if(empty($split[0])) array_shift($split);
-            $type = $split[1];
-            if(!$returnNodes) AJXP_XMLWriter::sendFilesListComponentConfig('<columns switchGridMode="filelist" switchDisplayMode="full" template_name="ajxp_conf.plugin_detail">
-            <column messageId="ajxp_conf.101" attributeName="ajxp_label" sortType="String" defaultWidth="10%"/>
-            <column messageId="ajxp_conf.102" attributeName="plugin_id" sortType="String" defaultWidth="10%"/>
-            <column messageId="ajxp_conf.103" attributeName="plugin_description" sortType="String" defaultWidth="60%"/>
-            <column messageId="ajxp_conf.104" attributeName="enabled" sortType="String" defaultWidth="10%"/>
-            <column messageId="ajxp_conf.105" attributeName="can_active" sortType="String" defaultWidth="10%"/>
-            </columns>');
-            $mess = ConfService::getMessages();
-            foreach ($types[$type] as $pObject) {
-                $errors = "OK";
-                try {
-                    $pObject->performChecks();
-                } catch (Exception $e) {
-                    $errors = "ERROR : ".$e->getMessage();
-                }
-                $meta = array(
-                    "icon" 		=> "preferences_plugin.png",
-                    "ajxp_mime" => "ajxp_plugin",
-                    "can_active"	=> $errors,
-                    "enabled"	=> ($pObject->isEnabled()?$mess[440]:$mess[441]),
-                    "plugin_id" => $pObject->getId(),
-                    "plugin_description" => $pObject->getManifestDescription()
-                );
-                $nodeKey = $baseDir."/".$pObject->getId();
-                if(in_array($nodeKey, $this->currentBookmarks)) $meta = array_merge($meta, array("ajxp_bookmarked" => "true", "overlay_icon" => "bookmark.png"));
-                $xml = AJXP_XMLWriter::renderNode($nodeKey, $pObject->getManifestLabel(), true, $meta, true, false);
-                if($returnNodes) $allNodes[$nodeKey] = $xml;
-                else print $xml;
-            }
-        }
-        return $allNodes;
-    }
-
-    public function listUsers($root, $child, $hashValue = null, $returnNodes = false, $findNodePosition=null)
-    {
-        $USER_PER_PAGE = 50;
-        if($root == "users") $baseGroup = "/";
-        else $baseGroup = substr($root, strlen("users"));
-
-        if ($findNodePosition != null && $hashValue == null) {
-
-            // Add groups offset
-            $groups = AuthService::listChildrenGroups($baseGroup);
-            $offset = 0;
-            if(count($groups)){
-                $offset = count($groups);
-            }
-            $position = AuthService::findUserPage($baseGroup, $findNodePosition, $USER_PER_PAGE);
-            if($position != -1){
-
-                $key = "/data/".$root."/".$findNodePosition;
-                $data =  array($key => AJXP_XMLWriter::renderNode($key, $findNodePosition, true, array(
-                        "page_position" => $position
-                    ), true, false));
-                return $data;
-
-            }else{
-                // Loop on each page to find the correct page.
-                $count = AuthService::authCountUsers($baseGroup);
-                $pages = ceil($count / $USER_PER_PAGE);
-                for ($i = 0; $i < $pages ; $i ++) {
-
-                    $tests = $this->listUsers($root, $child, $i+1, true, $findNodePosition);
-                    if (is_array($tests) && isSet($tests["/data/".$root."/".$findNodePosition])) {
-                        return array("/data/".$root."/".$findNodePosition => str_replace("ajxp_mime", "page_position='".($i+1)."' ajxp_mime", $tests["/data/".$root."/".$findNodePosition]));
-                    }
-
-                }
-            }
-
-
-            return array();
-
-        }
-
-        $allNodes = array();
-        $columns = '<columns switchDisplayMode="list" switchGridMode="filelist" template_name="ajxp_conf.users">
-                    <column messageId="ajxp_conf.6" attributeName="ajxp_label" sortType="String" defaultWidth="40%"/>
-                    <column messageId="ajxp_conf.102" attributeName="object_id" sortType="String" defaultWidth="10%"/>
-                    <column messageId="ajxp_conf.7" attributeName="isAdmin" sortType="String" defaultWidth="10%"/>
-                    <column messageId="ajxp_conf.70" attributeName="ajxp_roles" sortType="String" defaultWidth="15%"/>
-                    <column messageId="ajxp_conf.62" attributeName="rights_summary" sortType="String" defaultWidth="15%"/>
-                    </columns>';
-        if (AuthService::driverSupportsAuthSchemes()) {
-            $columns = '<columns switchDisplayMode="list" switchGridMode="filelist" template_name="ajxp_conf.users_authscheme">
-                        <column messageId="ajxp_conf.6" attributeName="ajxp_label" sortType="String" defaultWidth="40%"/>
-                        <column messageId="ajxp_conf.102" attributeName="object_id" sortType="String" defaultWidth="10%"/>
-                        <column messageId="ajxp_conf.115" attributeName="auth_scheme" sortType="String" defaultWidth="5%"/>
-                        <column messageId="ajxp_conf.7" attributeName="isAdmin" sortType="String" defaultWidth="5%"/>
-                        <column messageId="ajxp_conf.70" attributeName="ajxp_roles" sortType="String" defaultWidth="15%"/>
-                        <column messageId="ajxp_conf.62" attributeName="rights_summary" sortType="String" defaultWidth="15%"/>
-            </columns>';
-        }
-        if(!$returnNodes) AJXP_XMLWriter::sendFilesListComponentConfig($columns);
-        if(!AuthService::usersEnabled()) return array();
-        if(empty($hashValue)) $hashValue = 1;
-
-        $count = AuthService::authCountUsers($baseGroup, "", null, null, false);
-        if (AuthService::authSupportsPagination() && $count >= $USER_PER_PAGE) {
-            $offset = ($hashValue - 1) * $USER_PER_PAGE;
-            if(!$returnNodes) AJXP_XMLWriter::renderPaginationData($count, $hashValue, ceil($count/$USER_PER_PAGE));
-            $users = AuthService::listUsers($baseGroup, "", $offset, $USER_PER_PAGE, true, false);
-            if ($hashValue == 1) {
-                $groups = AuthService::listChildrenGroups($baseGroup);
-            } else {
-                $groups = array();
-            }
-        } else {
-            $users = AuthService::listUsers($baseGroup, "", -1, -1, true, false);
-            $groups = AuthService::listChildrenGroups($baseGroup);
-        }
-        $groupAdmin = (AuthService::getLoggedUser() != null && AuthService::getLoggedUser()->getGroupPath() != "/");
-        if($this->getName() == "ajxp_admin" && $baseGroup == "/" && $hashValue == 1 && !$groupAdmin){
-            $nodeKey = "/data/".$root."/";
-            $meta = array(
-                "icon" => "users-folder.png",
-                "icon_class" => "icon-home",
-                "ajxp_mime" => "group",
-                "object_id" => "/"
-            );
-            $mess = ConfService::getMessages();
-            $xml = AJXP_XMLWriter::renderNode($nodeKey, $mess["ajxp_conf.151"], true, $meta, true, false);
-            if(!$returnNodes) print($xml);
-            else $allNodes[$nodeKey] = $xml;
-        }
-
-        foreach ($groups as $groupId => $groupLabel) {
-
-            $nodeKey = "/data/".$root."/".ltrim($groupId,"/");
-            $meta = array(
-                "icon" => "users-folder.png",
-                "icon_class" => "icon-folder-close",
-                "ajxp_mime" => "group",
-                "object_id" => $groupId
-            );
-            if(in_array($nodeKey, $this->currentBookmarks)) $meta = array_merge($meta, array("ajxp_bookmarked" => "true", "overlay_icon" => "bookmark.png"));
-            $xml = AJXP_XMLWriter::renderNode($nodeKey,
-                $groupLabel, false, $meta, true, false);
-            if(!$returnNodes) print($xml);
-            else $allNodes[$nodeKey] = $xml;
-
-        }
-        $mess = ConfService::getMessages();
-        $loggedUser = AuthService::getLoggedUser();
-        $userArray = array();
-        $logger = AJXP_Logger::getInstance();
-        if(method_exists($logger, "usersLastConnection")){
-            $allUserIds = array();
-        }
-        foreach ($users as $userObject) {
-            $label = $userObject->getId();
-            if(isSet($allUserIds)) $allUserIds[] = $label;
-            if ($userObject->hasParent()) {
-                $label = $userObject->getParent()."000".$label;
-            }else{
-                $children = ConfService::getConfStorageImpl()->getUserChildren($label);
-                foreach($children as $addChild){
-                    $userArray[$label."000".$addChild->getId()] = $addChild;
-                }
-            }
-            $userArray[$label] = $userObject;
-        }
-        if(isSet($allUserIds) && count($allUserIds)){
-            $connections = $logger->usersLastConnection($allUserIds);
-        }
-        ksort($userArray);
-        foreach ($userArray as $userObject) {
-            $repos = ConfService::getConfStorageImpl()->listRepositories($userObject);
-            $isAdmin = $userObject->isAdmin();
-            $userId = $userObject->getId();
-            $icon = "user".($userId=="guest"?"_guest":($isAdmin?"_admin":""));
-            $iconClass = "icon-user";
-            if ($userObject->hasParent()) {
-                $icon = "user_child";
-                $iconClass = "icon-angle-right";
-            }
-            if ($isAdmin) {
-                $rightsString = $mess["ajxp_conf.63"];
-            } else {
-                $r = array();
-                foreach ($repos as $repoId => $repository) {
-                    if($repository->getAccessType() == "ajxp_shared") continue;
-                    if(!$userObject->canRead($repoId) && !$userObject->canWrite($repoId)) continue;
-                    $rs = ($userObject->canRead($repoId) ? "r" : "");
-                    $rs .= ($userObject->canWrite($repoId) ? "w" : "");
-                    $r[] = $repository->getDisplay()." (".$rs.")";
-                }
-                $rightsString = implode(", ", $r);
-            }
-            $nodeLabel = ConfService::getUserPersonalParameter("USER_DISPLAY_NAME", $userObject, "core.conf", $userId);
-            $scheme = AuthService::getAuthScheme($userId);
-            $nodeKey = "/data/$root/".$userId;
-            $roles = array_filter(array_keys($userObject->getRoles()), array($this, "filterReservedRoles"));
-            $meta = array(
-                "isAdmin" => $mess[($isAdmin?"ajxp_conf.14":"ajxp_conf.15")],
-                "icon" => $icon.".png",
-                "icon_class" => $iconClass,
-                "object_id" => $userId,
-                "auth_scheme" => ($scheme != null? $scheme : ""),
-                "rights_summary" => $rightsString,
-                "ajxp_roles" => implode(", ", $roles),
-                "ajxp_mime" => "user".(($userId!="guest"&&$userId!=$loggedUser->getId())?"_editable":""),
-                "json_merged_role" => json_encode($userObject->mergedRole->getDataArray(true))
-            );
-            if($userObject->hasParent()) $meta["shared_user"] = "true";
-            if(isSet($connections) && isSet($connections[$userObject->getId()]) && !empty($connections[$userObject->getId()])) {
-                $meta["last_connection"] = strtotime($connections[$userObject->getId()]);
-                $meta["last_connection_readable"] = AJXP_Utils::relativeDate($meta["last_connection"], $mess);
-            }
-            if(in_array($nodeKey, $this->currentBookmarks)) $meta = array_merge($meta, array("ajxp_bookmarked" => "true", "overlay_icon" => "bookmark.png"));
-            $xml = AJXP_XMLWriter::renderNode($nodeKey, $nodeLabel, true, $meta, true, false);
-            if(!$returnNodes) print($xml);
-            else $allNodes[$nodeKey] = $xml;
-        }
-        return $allNodes;
-    }
-
-    public function listRoles($root, $child, $hashValue = null, $returnNodes = false)
-    {
-        $allNodes = array();
-        if(!$returnNodes) AJXP_XMLWriter::sendFilesListComponentConfig('<columns switchGridMode="filelist" template_name="ajxp_conf.roles">
-            <column messageId="ajxp_conf.6" attributeName="ajxp_label" sortType="String"/>
-            <column messageId="ajxp_conf.114" attributeName="is_default" sortType="String"/>
-            <column messageId="ajxp_conf.62" attributeName="rights_summary" sortType="String"/>
-            </columns>');
-        if(!AuthService::usersEnabled()) return array();
-        $currentUserIsGroupAdmin = (AuthService::getLoggedUser() != null && AuthService::getLoggedUser()->getGroupPath() != "/");
-        $roles = AuthService::getRolesList(array(), !$this->listSpecialRoles);
-        ksort($roles);
-        $mess = ConfService::getMessages();
-        if(!$this->listSpecialRoles && $this->getName() != "ajxp_admin" && !$currentUserIsGroupAdmin){
-            $rootGroupRole = AuthService::getRole("AJXP_GRP_/", true);
-            if($rootGroupRole->getLabel() == "AJXP_GRP_/"){
-                $rootGroupRole->setLabel($mess["ajxp_conf.151"]);
-                AuthService::updateRole($rootGroupRole);
-            }
-            array_unshift($roles, $rootGroupRole);
-        }
-        foreach ($roles as $roleObject) {
-            //if(strpos($roleId, "AJXP_GRP_") === 0 && !$this->listSpecialRoles) continue;
-            $r = array();
-            if(!AuthService::canAdministrate($roleObject)) continue;
-            $count = 0;
-            $repos = ConfService::listRepositoriesWithCriteria(array("role" => $roleObject), $count);
-            foreach ($repos as $repoId => $repository) {
-                if($repository->getAccessType() == "ajxp_shared") continue;
-                if(!$roleObject->canRead($repoId) && !$roleObject->canWrite($repoId)) continue;
-                $rs = ($roleObject->canRead($repoId) ? "r" : "");
-                $rs .= ($roleObject->canWrite($repoId) ? "w" : "");
-                $r[] = $repository->getDisplay()." (".$rs.")";
-            }
-            $rightsString = implode(", ", $r);
-            $nodeKey = "/data/roles/".$roleObject->getId();
-            $appliesToDefault = implode(",", $roleObject->listAutoApplies());
-            if($roleObject->getId() == "AJXP_GRP_/"){
-                $appliesToDefault = $mess["ajxp_conf.153"];
-            }
-            $meta = array(
-                "icon" => "user-acl.png",
-                "rights_summary" => $rightsString,
-                "is_default"    => $appliesToDefault, //($roleObject->autoAppliesTo("standard") ? $mess[440]:$mess[441]),
-                "ajxp_mime" => "role",
-                "role_id"   => $roleObject->getId(),
-                "text"      => $roleObject->getLabel()
-            );
-            if(in_array($nodeKey, $this->currentBookmarks)) $meta = array_merge($meta, array("ajxp_bookmarked" => "true", "overlay_icon" => "bookmark.png"));
-            $xml = AJXP_XMLWriter::renderNode($nodeKey, $roleObject->getId(), true, $meta, true, false);
-            if(!$returnNodes) echo $xml;
-            else $allNodes[$nodeKey] = $xml;
-        }
-        return $allNodes;
-    }
-
-    public function repositoryExists($name)
-    {
-        $repos = ConfService::getRepositoriesList();
-        foreach ($repos as $obj)
-            if ($obj->getDisplay() == $name) return true;
-
-        return false;
-    }
-
-    /**
-     * @param Repository $a
-     * @param Repository $b
-     * @return integer
-     */
-    public function sortReposByLabel($a, $b)
-    {
-        return strcasecmp($a->getDisplay(), $b->getDisplay());
-    }
-
-    protected function getDriverLabel($pluginId, &$labels){
-        if(isSet($labels[$pluginId])){
-            return $labels[$pluginId];
-        }
-        $plugin = AJXP_PluginsService::findPluginById("access.".$pluginId);
-        if(!is_object($plugin)) {
-            $label = "access.$plugin (plugin disabled!)";
-        }else{
-            $label = $plugin->getManifestLabel();
-        }
-        $labels[$pluginId] = $label;
-        return $label;
-    }
-
-
-    public function listRepositories($root, $child, $hashValue = null, $returnNodes = false, $file="", $aliasedDir=null, $httpVars){
-        $REPOS_PER_PAGE = 50;
-        $allNodes = array();
-        if($hashValue == null) $hashValue = 1;
-        $offset = ($hashValue - 1) * $REPOS_PER_PAGE;
-
-        $count = null;
-        // Load all repositories = normal, templates, and templates children
-        $criteria = array(
-            "ORDERBY"       => array("KEY" => "display", "DIR"=>"ASC"),
-            "CURSOR"        => array("OFFSET" => $offset, "LIMIT" => $REPOS_PER_PAGE)
-        );
-        $currentUserIsGroupAdmin = (AuthService::getLoggedUser() != null && AuthService::getLoggedUser()->getGroupPath() != "/");
-        if($currentUserIsGroupAdmin){
-            $criteria = array_merge($criteria, array(
-                    "owner_user_id" => AJXP_FILTER_EMPTY,
-                    "groupPath"     => "regexp:/^".str_replace("/", "\/", AuthService::getLoggedUser()->getGroupPath()).'/',
-                ));
-        }else{
-            $criteria["parent_uuid"] = AJXP_FILTER_EMPTY;
-        }
-        if(isSet($httpVars) && is_array($httpVars) && isSet($httpVars["template_children_id"])){
-            $criteria["parent_uuid"] = AJXP_Utils::sanitize($httpVars["template_children_id"], AJXP_SANITIZE_ALPHANUM);
-        }
-        $repos = ConfService::listRepositoriesWithCriteria($criteria, $count);
-        if(!$returnNodes){
-            AJXP_XMLWriter::renderPaginationData($count, $hashValue, ceil($count/$REPOS_PER_PAGE));
-            AJXP_XMLWriter::sendFilesListComponentConfig('<columns switchDisplayMode="list" switchGridMode="filelist" template_name="ajxp_conf.repositories">
-                <column messageId="ajxp_conf.8" attributeName="ajxp_label" sortType="String"/>
-                <column messageId="ajxp_conf.9" attributeName="accessType" sortType="String"/>
-                <column messageId="ajxp_conf.125" attributeName="slug" sortType="String"/>
-            </columns>');
-        }
-
-        $driverLabels = array();
-
-        foreach ($repos as $repoIndex => $repoObject) {
-
-            if($repoObject->getAccessType() == "ajxp_conf" || $repoObject->getAccessType() == "ajxp_shared") continue;
-            if (!AuthService::canAdministrate($repoObject))continue;
-            if(is_numeric($repoIndex)) $repoIndex = "".$repoIndex;
-
-            $icon = "hdd_external_unmount.png";
-            $editable = $repoObject->isWriteable();
-            if ($repoObject->isTemplate) {
-                $icon = "hdd_external_mount.png";
-                if (AuthService::getLoggedUser() != null && AuthService::getLoggedUser()->getGroupPath() != "/") {
-                    $editable = false;
-                }
-            }
-            $accessType = $repoObject->getAccessType();
-            $accessLabel = $this->getDriverLabel($accessType, $driverLabels);
-            $meta = array(
-                "repository_id" => $repoIndex,
-                "accessType"	=> ($repoObject->isTemplate?"Template for ":"").$repoObject->getAccessType(),
-                "accessLabel"	=> $accessLabel,
-                "icon"			=> $icon,
-                "owner"			=> ($repoObject->hasOwner()?$repoObject->getOwner():""),
-                "openicon"		=> $icon,
-                "slug"          => $repoObject->getSlug(),
-                "parentname"	=> "/repositories",
-                "ajxp_mime" 	=> "repository".($editable?"_editable":""),
-                "is_template"   => ($repoObject->isTemplate?"true":"false")
-            );
-
-            $nodeKey = "/data/repositories/$repoIndex";
-            $label = $repoObject->getDisplay();
-            if(in_array($nodeKey, $this->currentBookmarks)) $meta = array_merge($meta, array("ajxp_bookmarked" => "true", "overlay_icon" => "bookmark.png"));
-            $xml = AJXP_XMLWriter::renderNode(
-                $nodeKey,
-                AJXP_Utils::xmlEntities(SystemTextEncoding::toUTF8($label)),
-                true,
-                $meta,
-                true,
-                false
-            );
-            if($returnNodes) $allNodes[$nodeKey] = $xml;
-            else print($xml);
-
-            if ($repoObject->isTemplate) {
-                // Now Load children for template repositories
-                $children = ConfService::listRepositoriesWithCriteria(array("parent_uuid" => $repoIndex.""), $count);
-                foreach($children as $childId => $childObject){
-                    if (!AuthService::canAdministrate($childObject))continue;
-                    if(is_numeric($childId)) $childId = "".$childId;
-                    $meta = array(
-                        "repository_id" => $childId,
-                        "accessType"	=> $childObject->getAccessType(),
-                        "accessLabel"	=> $this->getDriverLabel($childObject->getAccessType(), $driverLabels),
-                        "icon"			=> "repo_child.png",
-                        "slug"          => $childObject->getSlug(),
-                        "owner"			=> ($childObject->hasOwner()?$childObject->getOwner():""),
-                        "openicon"		=> "repo_child.png",
-                        "parentname"	=> "/repositories",
-                        "ajxp_mime" 	=> "repository_editable",
-                        "template_name" => $label
-                    );
-                    $cNodeKey = "/data/repositories/$childId";
-                    if(in_array($cNodeKey, $this->currentBookmarks)) $meta = array_merge($meta, array("ajxp_bookmarked" => "true", "overlay_icon" => "bookmark.png"));
-                    $xml = AJXP_XMLWriter::renderNode(
-                        $cNodeKey,
-                        AJXP_Utils::xmlEntities(SystemTextEncoding::toUTF8($childObject->getDisplay())),
-                        true,
-                        $meta,
-                        true,
-                        false
-                    );
-                    if($returnNodes) $allNodes[$cNodeKey] = $xml;
-                    else print($xml);
-                }
-            }
-        }
-
-    }
-
-
-    public function listActions($dir, $root = NULL, $hash = null, $returnNodes = false)
-    {
-        $allNodes = array();
-        $parts = explode("/",$dir);
-        $pServ = AJXP_PluginsService::getInstance();
-        //$activePlugins = $pServ->getActivePlugins();
-        $types = $pServ->getDetectedPlugins();
-        if (count($parts) == 1) {
-            // list all types
-            if(!$returnNodes) AJXP_XMLWriter::sendFilesListComponentConfig('<columns switchGridMode="filelist" template_name="ajxp_conf.plugins_folder">
-            <column messageId="ajxp_conf.101" attributeName="ajxp_label" sortType="String"/>
-            </columns>');
-            ksort($types);
-            foreach ($types as $t => $tPlugs) {
-                $meta = array(
-                    "icon" 		=> "folder_development.png",
-                    "plugin_id" => $t
-                );
-                $nodeKey = "/$root/actions/".$t;
-                if(in_array($nodeKey, $this->currentBookmarks)) $meta = array_merge($meta, array("ajxp_bookmarked" => "true", "overlay_icon" => "bookmark.png"));
-                $xml = AJXP_XMLWriter::renderNode($nodeKey, ucfirst($t), false, $meta, true, false);
-                if($returnNodes) $allNodes[$nodeKey] = $xml;
-                else print($xml);
-            }
-
-        } else if (count($parts) == 2) {
-            // list plugs
-            $type = $parts[1];
-            if(!$returnNodes) AJXP_XMLWriter::sendFilesListComponentConfig('<columns switchDisplayMode="detail" template_name="ajxp_conf.plugins_folder">
-                <column messageId="ajxp_conf.101" attributeName="ajxp_label" sortType="String"/>
-                <column messageId="ajxp_conf.103" attributeName="actions" sortType="String"/>
-            </columns>');
-            foreach ($types[$type] as $pObject) {
-                $actions = $pObject->getManifestRawContent("//action/@name", "xml", true);
-                $actLabel = array();
-                if ($actions->length) {
-                    foreach ($actions as $node) {
-                        $actLabel[] = $node->nodeValue;
-                    }
-                }
-                $meta = array(
-                    "icon" 		=> "preferences_plugin.png",
-                    "plugin_id" => $pObject->getId(),
-                    "actions"   => implode(", ", $actLabel)
-                );
-                $nodeKey = "/$root/actions/$type/".$pObject->getName();
-                if(in_array($nodeKey, $this->currentBookmarks)) $meta = array_merge($meta, array("ajxp_bookmarked" => "true", "overlay_icon" => "bookmark.png"));
-                $xml = AJXP_XMLWriter::renderNode($nodeKey, $pObject->getManifestLabel(), false, $meta, true, false);
-                if($returnNodes) $allNodes[$nodeKey] = $xml;
-                else print($xml);
-
-            }
-
-        } else if (count($parts) == 3) {
-            // list actions
-            $type = $parts[1];
-            $name = $parts[2];
-            $mess = ConfService::getMessages();
-            if(!$returnNodes) AJXP_XMLWriter::sendFilesListComponentConfig('<columns switchDisplayMode="full" template_name="ajxp_conf.plugins_folder">
-                <column messageId="ajxp_conf.101" attributeName="ajxp_label" sortType="String" defaultWidth="10%"/>
-                <column messageId="ajxp_conf.103" attributeName="parameters" sortType="String" fixedWidth="30%"/>
-            </columns>');
-            $pObject = $types[$type][$name];
-
-            $actions = $pObject->getManifestRawContent("//action", "xml", true);
-            $allNodesAcc = array();
-            if ($actions->length) {
-                foreach ($actions as $node) {
-                    $xPath = new DOMXPath($node->ownerDocument);
-                    $callbacks = $xPath->query("processing/serverCallback", $node);
-                    if(!$callbacks->length) continue;
-                    $callback = $callbacks->item(0);
-
-                    $actName = $actLabel = $node->attributes->getNamedItem("name")->nodeValue;
-                    $text = $xPath->query("gui/@text", $node);
-                    if ($text->length) {
-                        $actLabel = $actName ." (" . $mess[$text->item(0)->nodeValue].")";
-                    }
-                    $params = $xPath->query("processing/serverCallback/input_param", $node);
-                    $paramLabel = array();
-                    if ($callback->getAttribute("developerComment") != "") {
-                        $paramLabel[] = "<span class='developerComment'>".$callback->getAttribute("developerComment")."</span>";
-                    }
-                    $restPath = "";
-                    if ($callback->getAttribute("restParams")) {
-                        $restPath = "/api/$actName/". ltrim($callback->getAttribute("restParams"), "/");
-                    }
-                    if ($restPath != null) {
-                        $paramLabel[] = "<span class='developerApiAccess'>"."API Access : ".$restPath."</span>";
-                    }
-                    if ($params->length) {
-                        $paramLabel[] = "Expected Parameters :";
-                        foreach ($params as $param) {
-                            $paramLabel[]= '. ['.$param->getAttribute("type").'] <b>'.$param->getAttribute("name").($param->getAttribute("mandatory") == "true" ? '*':'').'</b> : '.$param->getAttribute("description");
-                        }
-                    }
-                    $meta = array(
-                        "icon" 		=> "preferences_plugin.png",
-                        "action_id" => $actName,
-                        "parameters"=> '<div class="developerDoc">'.implode("<br/>", $paramLabel).'</div>',
-                        "rest_params"=> $restPath
-                    );
-                    $nodeKey = "/$root/actions/$type/".$pObject->getName()."/$actName";
-                    if(in_array($nodeKey, $this->currentBookmarks)) $meta = array_merge($meta, array("ajxp_bookmarked" => "true", "overlay_icon" => "bookmark.png"));
-                    $allNodes[$nodeKey] = $allNodesAcc[$actName] = AJXP_XMLWriter::renderNode(
-                        $nodeKey,
-                        $actLabel,
-                        true,
-                        $meta,
-                        true,
-                        false
-                    );
-                }
-                ksort($allNodesAcc);
-                if(!$returnNodes) print(implode("", array_values($allNodesAcc)));
-            }
-
-        }
-        return $allNodes;
-    }
-
-    public function listHooks($dir, $root = NULL, $hash = null, $returnNodes = false)
-    {
-        $jsonContent = json_decode(file_get_contents(AJXP_Utils::getHooksFile()), true);
-        $config = '<columns switchDisplayMode="full" template_name="hooks.list">
-                <column messageId="ajxp_conf.17" attributeName="ajxp_label" sortType="String" defaultWidth="20%"/>
-                <column messageId="ajxp_conf.18" attributeName="description" sortType="String" defaultWidth="20%"/>
-                <column messageId="ajxp_conf.19" attributeName="triggers" sortType="String" defaultWidth="25%"/>
-                <column messageId="ajxp_conf.20" attributeName="listeners" sortType="String" defaultWidth="25%"/>
-                <column messageId="ajxp_conf.21" attributeName="sample" sortType="String" defaultWidth="10%"/>
-            </columns>';
-        if(!$returnNodes) AJXP_XMLWriter::sendFilesListComponentConfig($config);
-        $allNodes = array();
-        foreach ($jsonContent as $hookName => $hookData) {
-            $metadata = array(
-                "icon"          => "preferences_plugin.png",
-                "description"   => $hookData["DESCRIPTION"],
-                "sample"        => $hookData["PARAMETER_SAMPLE"],
-            );
-            $trigs = array();
-            foreach ($hookData["TRIGGERS"] as $trigger) {
-                $trigs[] = "<span>".$trigger["FILE"]." (".$trigger["LINE"].")</span>";
-            }
-            $metadata["triggers"] = implode("<br/>", $trigs);
-            $listeners = array();
-            foreach ($hookData["LISTENERS"] as $listener) {
-                $listeners[] = "<span>Plugin ".$listener["PLUGIN_ID"].", in method ".$listener["METHOD"]."</span>";
-            }
-            $metadata["listeners"] = implode("<br/>", $listeners);
-            $nodeKey = "/$root/hooks/$hookName/$hookName";
-            if(in_array($nodeKey, $this->currentBookmarks)) $metadata = array_merge($metadata, array("ajxp_bookmarked" => "true", "overlay_icon" => "bookmark.png"));
-            $xml = AJXP_XMLWriter::renderNode($nodeKey, $hookName, true, $metadata, true, false);
-            if($returnNodes) $allNodes[$nodeKey] = $xml;
-            else print($xml);
-        }
-        return $allNodes;
-    }
-
-    public function listLogFiles($dir, $root = NULL, $hash = null, $returnNodes = false)
-    {
-        $dir = "/$dir";
-        $allNodes = array();
-        $logger = AJXP_Logger::getInstance();
-        $parts = explode("/", $dir);
-        if (count($parts)>4) {
-            $config = '<columns switchDisplayMode="list" switchGridMode="list" template_name="ajxp_conf.logs">
-                <column messageId="ajxp_conf.17" attributeName="date" sortType="MyDate" defaultWidth="18%"/>
-                <column messageId="ajxp_conf.18" attributeName="ip" sortType="String" defaultWidth="5%"/>
-                <column messageId="ajxp_conf.19" attributeName="level" sortType="String" defaultWidth="10%"/>
-                <column messageId="ajxp_conf.20" attributeName="user" sortType="String" defaultWidth="5%"/>
-                <column messageId="ajxp_conf.124" attributeName="source" sortType="String" defaultWidth="5%"/>
-                <column messageId="ajxp_conf.21" attributeName="action" sortType="String" defaultWidth="7%"/>
-                <column messageId="ajxp_conf.22" attributeName="params" sortType="String" defaultWidth="50%"/>
-            </columns>';
-            if(!$returnNodes) AJXP_XMLWriter::sendFilesListComponentConfig($config);
-            $date = $parts[count($parts)-1];
-            $logger->xmlLogs($dir, $date, "tree", "/".$root."/logs", isSet($_POST["cursor"])?intval($_POST["cursor"]):-1);
-        } else {
-            if(!$returnNodes) AJXP_XMLWriter::sendFilesListComponentConfig('<columns switchGridMode="filelist"><column messageId="ajxp_conf.16" attributeName="ajxp_label" sortType="String"/></columns>');
-            $nodes = $logger->xmlListLogFiles("tree", (count($parts)>2?$parts[2]:null), (count($parts)>3?$parts[3]:null), "/".$root."/logs", false);
-            foreach ($nodes as $last => $nodeXML) {
-                if(is_numeric($last) && $last < 10) $last = "0".$last;
-                $key = "/$root$dir/$last";
-                if (in_array($key, $this->currentBookmarks)) {
-                    $nodeXML = str_replace("/>", ' ajxp_bookmarked="true" overlay_icon="bookmark.png"/>', $nodeXML);
-                }
-                $allNodes[$key] = $nodeXML;
-                if (!$returnNodes) {
-                    print($nodeXML);
-                }
-            }
-        }
-        return $allNodes;
-    }
-
-    public function printDiagnostic($dir, $root = NULL, $hash = null, $returnNodes = false)
-    {
-        $outputArray = array();
-        $testedParams = array();
-        $allNodes = array();
-        AJXP_Utils::runTests($outputArray, $testedParams);
-        AJXP_Utils::testResultsToFile($outputArray, $testedParams);
-        if(!$returnNodes) AJXP_XMLWriter::sendFilesListComponentConfig('<columns switchDisplayMode="list" switchGridMode="fileList" template_name="ajxp_conf.diagnostic" defaultWidth="20%"><column messageId="ajxp_conf.23" attributeName="ajxp_label" sortType="String"/><column messageId="ajxp_conf.24" attributeName="data" sortType="String"/></columns>');
-        if (is_file(TESTS_RESULT_FILE)) {
-            include_once(TESTS_RESULT_FILE);
-            if (isset($diagResults)) {
-                foreach ($diagResults as $id => $value) {
-                    $value = AJXP_Utils::xmlEntities($value);
-                    $xml =  "<tree icon=\"susehelpcenter.png\" is_file=\"1\" filename=\"/$dir/$id\" text=\"$id\" data=\"$value\" ajxp_mime=\"testResult\"/>";
-                    if(!$returnNodes) print($xml);
-                    else $allNodes["/$dir/$id"] = $xml;
-                }
-            }
-        }
-        return $allNodes;
-    }
-
-    public function metaSourceOrderingFunction($key1, $key2)
-    {
-        $a1 = explode(".", $key1);
-        $t1 = array_shift($a1);
-        $a2 = explode(".", $key2);
-        $t2 = array_shift($a2);
-        if($t1 == "index") return 1;
-        if($t1 == "metastore") return -1;
-        if($t2 == "index") return -1;
-        if($t2 == "metastore") return 1;
-        if($key1 == "meta.git" || $key1 == "meta.svn") return 1;
-        if($key2 == "meta.git" || $key2 == "meta.svn") return -1;
-        return strcmp($key1, $key2);
-    }
-
-    public function updateUserRole($userId, $roleId, $addOrRemove, $updateSubUsers = false)
-    {
-        $confStorage = ConfService::getConfStorageImpl();
-        $user = $confStorage->createUserObject($userId);
-        if(!AuthService::canAdministrate($user)){
-            throw new Exception("Cannot update user data for ".$userId);
-        }
-        if ($addOrRemove == "add") {
-            $roleObject = AuthService::getRole($roleId);
-            $user->addRole($roleObject);
-        } else {
-            $user->removeRole($roleId);
-        }
-        $user->save("superuser");
-        $loggedUser = AuthService::getLoggedUser();
-        if ($loggedUser->getId() == $user->getId()) {
-            AuthService::updateUser($user);
-        }
-        return $user;
-
-    }
-
-
-    protected function parseParameters(&$repDef, &$options, $userId = null, $globalBinaries = false, $existingValues = array())
-    {
-        AJXP_Utils::parseStandardFormParameters($repDef, $options, $userId, "DRIVER_OPTION_", ($globalBinaries?array():null));
-        if(!count($existingValues)){
-            return;
-        }
-        $this->mergeExistingParameters($options, $existingValues);
-    }
-
-    protected function mergeExistingParameters(&$parsed, $existing){
-        foreach($parsed as $k => &$v){
-            if($v === "__AJXP_VALUE_SET__" && isSet($existing[$k])){
-                $parsed[$k] = $existing[$k];
-            }else if(is_array($v) && is_array($existing[$k])){
-                $this->mergeExistingParameters($v, $existing[$k]);
-            }
-        }
-    }
-
-    public function flattenKeyValues(&$result, &$definitions, $values, $parent = "")
-    {
-        foreach ($values as $key => $value) {
-            if (is_array($value)) {
-                $this->flattenKeyValues($result, $definitions, $value, $parent."/".$key);
-            } else {
-                if ($key == "instance_name") {
-                    $result[$parent] = $value;
-                }
-                if ($key == "group_switch_value") {
-                    $result[$parent] = $value;
-                } else {
-                    $result[$parent.'/'.$key] = $value;
-                    if(isSet($definitions[$key])){
-                        $definitions[$parent.'/'.$key] = $definitions[$key];
-                    }else if(isSet($definitions[dirname($parent)."/".$key])){
-                        $definitions[$parent.'/'.$key] = $definitions[dirname($parent)."/".$key];
-                    }
-                }
-            }
-        }
-    }
-
-}
diff --git a/core/src/plugins/access.ajxp_conf/composer.json b/core/src/plugins/access.ajxp_conf/composer.json
new file mode 100644
index 0000000000..c4be4c3902
--- /dev/null
+++ b/core/src/plugins/access.ajxp_conf/composer.json
@@ -0,0 +1,11 @@
+{
+  "name": "Configurations Features",
+  "description": "Provisioning of users, workspaces, etc... ",
+  "homepage": "https://pydio.com/",
+  "license":"AGPL-3.0",
+  "autoload": {
+    "psr-4": {
+      "Pydio\\Access\\Driver\\DataProvider\\Provisioning\\": "./src"
+    }
+  }
+}
diff --git a/core/src/plugins/access.ajxp_conf/i18n/conf/de.php b/core/src/plugins/access.ajxp_conf/i18n/conf/de.php
index 94ac27e154..48a5dba00f 100644
--- a/core/src/plugins/access.ajxp_conf/i18n/conf/de.php
+++ b/core/src/plugins/access.ajxp_conf/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 //	german translation: Axel Otterstätter <axel.otterstaetter@googlemail.com>
 
diff --git a/core/src/plugins/access.ajxp_conf/i18n/conf/en.php b/core/src/plugins/access.ajxp_conf/i18n/conf/en.php
index 1e3e751445..429d1f2a15 100644
--- a/core/src/plugins/access.ajxp_conf/i18n/conf/en.php
+++ b/core/src/plugins/access.ajxp_conf/i18n/conf/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "Admin Driver" => "Admin Driver",
diff --git a/core/src/plugins/access.ajxp_conf/i18n/conf/it.php b/core/src/plugins/access.ajxp_conf/i18n/conf/it.php
index 463cab80d5..171036dd14 100644
--- a/core/src/plugins/access.ajxp_conf/i18n/conf/it.php
+++ b/core/src/plugins/access.ajxp_conf/i18n/conf/it.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "Admin Driver" => "Driver Amministratore",
diff --git a/core/src/plugins/access.ajxp_conf/i18n/de.php b/core/src/plugins/access.ajxp_conf/i18n/de.php
index 2941b679f3..d4d4f104c3 100644
--- a/core/src/plugins/access.ajxp_conf/i18n/de.php
+++ b/core/src/plugins/access.ajxp_conf/i18n/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 $mess=array(
diff --git a/core/src/plugins/access.ajxp_conf/i18n/en.php b/core/src/plugins/access.ajxp_conf/i18n/en.php
index 96b9fcb56b..57588ddd37 100644
--- a/core/src/plugins/access.ajxp_conf/i18n/en.php
+++ b/core/src/plugins/access.ajxp_conf/i18n/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "Configuration Data",
diff --git a/core/src/plugins/access.ajxp_conf/i18n/es.php b/core/src/plugins/access.ajxp_conf/i18n/es.php
index 0cf63c5d36..1e2d00be2e 100644
--- a/core/src/plugins/access.ajxp_conf/i18n/es.php
+++ b/core/src/plugins/access.ajxp_conf/i18n/es.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Datos de Configuración",
diff --git a/core/src/plugins/access.ajxp_conf/i18n/fi.php b/core/src/plugins/access.ajxp_conf/i18n/fi.php
index 2843a509ed..e11b203d91 100644
--- a/core/src/plugins/access.ajxp_conf/i18n/fi.php
+++ b/core/src/plugins/access.ajxp_conf/i18n/fi.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 //	Finnish translation by Aleksi Postari
 //	aleksi (at) postari.net
diff --git a/core/src/plugins/access.ajxp_conf/i18n/fr.php b/core/src/plugins/access.ajxp_conf/i18n/fr.php
index 578bcc0900..82e7d5c883 100644
--- a/core/src/plugins/access.ajxp_conf/i18n/fr.php
+++ b/core/src/plugins/access.ajxp_conf/i18n/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Données de configuration",
diff --git a/core/src/plugins/access.ajxp_conf/i18n/hu.php b/core/src/plugins/access.ajxp_conf/i18n/hu.php
index 4c8d07b682..9a0a6dab48 100644
--- a/core/src/plugins/access.ajxp_conf/i18n/hu.php
+++ b/core/src/plugins/access.ajxp_conf/i18n/hu.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 // hungarian translation: Gyarmati Balázs <gyarmati.balazs@gmail.com>
 // fixes, additions: Levente Huszkó <levente.huszko@gmail.com>
diff --git a/core/src/plugins/access.ajxp_conf/i18n/it.php b/core/src/plugins/access.ajxp_conf/i18n/it.php
index 2d370e6c6a..cc9fb06e77 100644
--- a/core/src/plugins/access.ajxp_conf/i18n/it.php
+++ b/core/src/plugins/access.ajxp_conf/i18n/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Configurazioni",
diff --git a/core/src/plugins/access.ajxp_conf/i18n/nl.php b/core/src/plugins/access.ajxp_conf/i18n/nl.php
index 50e3cc082c..daf633c996 100644
--- a/core/src/plugins/access.ajxp_conf/i18n/nl.php
+++ b/core/src/plugins/access.ajxp_conf/i18n/nl.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "Configuratie Gegevens",
diff --git a/core/src/plugins/access.ajxp_conf/i18n/pt.php b/core/src/plugins/access.ajxp_conf/i18n/pt.php
index fb1abae340..5e21e92d02 100644
--- a/core/src/plugins/access.ajxp_conf/i18n/pt.php
+++ b/core/src/plugins/access.ajxp_conf/i18n/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Dados de Configuração",
diff --git a/core/src/plugins/access.ajxp_conf/i18n/ru.php b/core/src/plugins/access.ajxp_conf/i18n/ru.php
index c72ebff8f5..9840bdd0de 100644
--- a/core/src/plugins/access.ajxp_conf/i18n/ru.php
+++ b/core/src/plugins/access.ajxp_conf/i18n/ru.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "Данные конфигурации",
diff --git a/core/src/plugins/access.ajxp_conf/i18n/si.php b/core/src/plugins/access.ajxp_conf/i18n/si.php
index 3e3ddac713..f73142e787 100644
--- a/core/src/plugins/access.ajxp_conf/i18n/si.php
+++ b/core/src/plugins/access.ajxp_conf/i18n/si.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 // Slovenian translation: April 21 2011 by Vladimir Bohinc (vladimir.bohinc@gmail.com)
 $mess=array(
diff --git a/core/src/plugins/access.ajxp_conf/manifest.xml b/core/src/plugins/access.ajxp_conf/manifest.xml
index 55434810a0..5f8bf372c2 100644
--- a/core/src/plugins/access.ajxp_conf/manifest.xml
+++ b/core/src/plugins/access.ajxp_conf/manifest.xml
@@ -14,78 +14,9 @@
 	</client_settings>
 	<registry_contributions>
 		<client_configs>
-            <template_part theme="umbra" ajxpId="sidebar_splitter" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'><![CDATA[
-                <div id="folderPane" ajxpClass="FoldersTree" ajxpOptions='{"display":"dz","replaceScroller":true}' ajxpPaneHeader="165" ajxpPaneIcon="view_tree.png" style="margin:20px;"></div>
-                <style>
-                    #sidebar_splitter{padding-bottom:20px;background-color:#EFD585;}
-                    .webfx-tree-item:first-of-type{
-                        display:none;
-                    }
-                    .webfx-tree-container>.webfx-tree-item:first-of-type{
-                        display:block;
-                    }
-                    .webfx-tree-container.first_container{
-                        margin-left: -19px;
-                    }
-                    .webfx-tree-container > .webfx-tree-item {
-                        font-weight: bold;
-                    }
-                    .webfx-tree-container > .webfx-tree-container > .webfx-tree-item {
-                        font-weight: normal;
-                    }
-                </style>
-            ]]></template_part>
-            <template_part ajxpClass="AjxpPane" ajxpId="workspace_toolbar" ajxpOptions='{"fit":"none"}' theme="vision"><![CDATA[
-                <style>
-                #workspace_toolbar{display:none;}
-                #global_toolbar{background-color: #30383A;}
-                #browser {padding: 10px 5px 0 0;background-color: #30383A;}
-                .action_bar.editor_action_bar {right: 7px;}
-                .action_bar a{margin-top:4px}
-                </style>
-            ]]></template_part>
-            <template_part ajxpId="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop", "fakeOption":"true"}' theme="vision"><![CDATA[
-                <div id="vertical_splitter" class="settings_main_pane" ajxpClass="Splitter" ajxpOptions='{"direction": "vertical", "invisibleBar":true, "initA": "20%", "minA":28, "maxA":380, "fit":"height","fitParent":"browser", "minSize":0, "foldingButton":"A"}'>
-                    <div ajxpClass="AjxpTabulator" id="leftTabulator" ajxpOptions='{"defaultTabId": "folders","tabInfos" : [{"id":"folders","label":"ajxp_conf.122","iconClass":"icon-cogs","element":"leftPane"},{"id":"flagged","label":"147","iconClass":"icon-bookmark","element":"flagged_elements"}],"headerToolbarOptions":{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["vertical_splitter-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}}'>
-                        <div id="flagged_elements" ajxpClass="FetchedResultPane" ajxpOptions='{"nodeProviderProperties":{"get_action":"get_bookmarks", "format":"node_list"},"reloadOnServerMessage":"tree/reload_bookmarks"}'></div>
-                        <div id="leftPane" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
-                            <div id="search_container_settings" class="settings_search_container" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "fitMarginBottom":10, "groupByData":false}'></div>
-                            <div id="settings_pane" class="flat_tree_pane" ajxpClass="FoldersTree" ajxpOptions='{"display":"dz","replaceScroller":true,"fit":"height", "fitParent":"leftPane"}' ></div>
-                        </div>
-                    </div>
-                    <div id="rightPane" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height", "messageBoxReference":true}'>
-                        <div id="editor_tabs" ajxpClass="AjxpTabulator" class="flat_tabulator" ajxpOptions='{"fit":"height", "fitMarginBottom":0, "registerAsEditorOpener":true, "saveState":false,"events":{"ajaxplorer:context_changed":"this.switchToFirstIfPathDiffers(arguments[0]);"}, "defaultTabId": "info","tabInfos" : [{"id":"info","label":"","iconClass":"icon-list-alt", "element":"files_list_pane"}]}'>
-                            <div id="files_list_pane" ajxpClass="AjxpPane">
-                                <div id="breadcrumb_container"><div id="breadcrumb" ajxpClass="Breadcrumb" ajxpOptions=''></div><div ajxpClass="BookmarksBar" ajxpOptions='{}' id="bm_bar"></div></div>
-                                <div id="actions" class="buttons_bar_container">
-                                    <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["put", "get", "remote"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
-                                </div>
-                                <div id="content_pane" ajxpClass="FilesList" ajxpOptions='{"displayMode":"detail","replaceScroller":true, "fit":"height", "fitParent":"editor_tabs", "fitMarginBottom":0, "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px"}'></div>
-                            </div>
-                        </div>
-                    </div>
-                    <style>
-                        #get_my_feed_button{
-                            display:none !important;
-                        }
-                    </style>
-                </div>
-                <script>
-                    if($("browser")) $("browser").ajxpPaneObject.resize();
-                    document.observeOnce("ajaxplorer:context_changed", function(){
-                        try{
-                            $A($("settings_pane").ajxpPaneObject.tree.childNodes).each(function(c){
-                                c._webfxtree_expand();
-                                $(c._loadingItem).remove();
-                            })
-                        }catch(e){}
-                        if($("browser")) $("browser").ajxpPaneObject.resize();
-                    });
-                </script>
-			]]></template_part>
             <template_part ajxpId="orbit_content" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop", "fitMinOffsetTop":"$(\"global_toolbar\").getHeight();", "fakeOption":"true"}' theme="orbit"><![CDATA[
                 <div id="vertical_splitter" style="opacity:0;" class="settings_main_pane" ajxpClass="Splitter" ajxpOptions='{"direction": "vertical", "invisibleBar":true, "initA": 280, "minA":28, "maxA":380, "fit":"height","fitParent":"browser", "minSize":0, "foldingButton":"A"}'>
-                    <div ajxpClass="AjxpTabulator" id="leftTabulator" ajxpOptions='{"defaultTabId": "folders","tabInfos" : [{"id":"folders","label":"ajxp_conf.122","iconClass":"icon-cogs","element":"leftPane"},{"id":"flagged","label":"147","iconClass":"icon-bookmark","element":"flagged_elements"}],"headerToolbarOptions":{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["vertical_splitter-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}}'>
+                    <div ajxpClass="AjxpTabulator" id="leftTabulator" ajxpOptions='{"defaultTabId": "folders","tabInfos" : [{"id":"folders","label":"ajxp_conf.122","iconClass":"icon-cogs","element":"leftPane"},{"id":"flagged","label":"147","iconClass":"icon-bookmark","element":"flagged_elements"}],"headerToolbarOptions":{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["vertical_splitter-actions"],"submenuOffsetTop":2}}'>
                         <div id="flagged_elements" ajxpClass="FetchedResultPane" ajxpOptions='{"nodeProviderProperties":{"get_action":"get_bookmarks", "format":"node_list"},"reloadOnServerMessage":"tree/reload_bookmarks"}'></div>
                         <div id="leftPane" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}' class="vertical_layout">
                             <div id="search_container_settings" class="settings_search_container" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "fitMarginBottom":10, "groupByData":false, "leavesOpenOnSelect": true}'></div>
@@ -97,7 +28,7 @@
                             <div id="files_list_pane" ajxpClass="AjxpPane" style="overflow-x:hidden;">
                                 <div id="breadcrumb_container"><div id="breadcrumb" ajxpClass="Breadcrumb" ajxpOptions=''></div><div ajxpClass="BookmarksBar" ajxpOptions='{}' id="bm_bar"></div></div>
                                 <div id="actions" class="buttons_bar_container">
-                                    <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["put", "get", "remote"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
+                                    <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["put", "get", "remote"],"submenuOffsetTop":2}'></div>
                                 </div>
                                 <div id="content_pane" ajxpClass="FilesList" ajxpOptions='{"displayMode":"detail","replaceScroller":true, "fit":"height", "fitParent":"editor_tabs", "fitMarginBottom":0, "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px"}'></div>
                             </div>
@@ -121,5 +52,5 @@
 		<external_file filename="plugins/access.ajxp_conf/ajxp_confActions.xml" include="actions/*"/>
 		<external_file filename="plugins/access.ajxp_conf/ajxp_confActions.xml" include="client_configs/*"/>
 	</registry_contributions>
-	<class_definition filename="plugins/access.ajxp_conf/class.ajxp_confAccessDriver.php" classname="ajxp_confAccessDriver"/>
+	<class_definition filename="plugins/access.ajxp_conf/src/ConfAccessDriver.php" classname="Pydio\Access\Driver\DataProvider\Provisioning\ConfAccessDriver"/>
 </ajxpdriver>
diff --git a/core/src/plugins/access.ajxp_conf/src/AbstractManager.php b/core/src/plugins/access.ajxp_conf/src/AbstractManager.php
new file mode 100644
index 0000000000..72e942898d
--- /dev/null
+++ b/core/src/plugins/access.ajxp_conf/src/AbstractManager.php
@@ -0,0 +1,202 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Access\Driver\DataProvider\Provisioning;
+
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\Model\NodesList;
+use Pydio\Core\Utils\Vars\XMLFilter;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Utils\Vars\OptionsHelper;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Parent Class for CRUD operation of application objects.
+ * @package Pydio\Access\Driver\DataProvider\Provisioning
+ */
+abstract class AbstractManager
+{
+    /** @var  ContextInterface */
+    protected $context;
+
+    /** @var  array */
+    protected $bookmarks;
+
+    /** @var  string */
+    protected $pluginName;
+
+    /** @var bool */
+    protected $listSpecialRoles = AJXP_SERVER_DEBUG;
+
+    /**
+     * Manager constructor.
+     * @param ContextInterface $ctx
+     * @param string $pluginName
+     */
+    public function __construct(ContextInterface $ctx, $pluginName){
+        $this->context = $ctx;
+        $this->pluginName = $pluginName;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function currentUserIsGroupAdmin(){
+        if(ConfService::getAuthDriverImpl()->isAjxpAdmin($this->context->getUser()->getId())){
+            return false;
+        }
+        return (UsersService::usersEnabled() && $this->context->getUser()->getGroupPath() !== "/");
+    }
+
+    /**
+     * @return array
+     */
+    protected function getBookmarks(){
+        if(!isSet($this->bookmarks)){
+            $this->bookmarks = [];
+            if(UsersService::usersEnabled()) {
+                $bookmarks = $this->context->getUser()->getBookmarks($this->context->getRepositoryId());
+                foreach ($bookmarks as $bm) {
+                    $this->bookmarks[] = $bm["PATH"];
+                }
+            }
+        }
+        return $this->bookmarks;
+    }
+
+    /**
+     * @param string $nodePath
+     * @param array $meta
+     */
+    protected function appendBookmarkMeta($nodePath, &$meta){
+        if(in_array($nodePath, $this->getBookmarks())) {
+            $meta = array_merge($meta, array(
+                "ajxp_bookmarked" => "true",
+                "overlay_icon" => "bookmark.png"
+            ));
+        }
+    }
+
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $repDef
+     * @param $options
+     * @param bool $globalBinaries
+     * @param array $existingValues
+     */
+    protected function parseParameters(ContextInterface $ctx, &$repDef, &$options, $globalBinaries = false, $existingValues = array())
+    {
+        OptionsHelper::parseStandardFormParameters($ctx, $repDef, $options, "DRIVER_OPTION_", ($globalBinaries ? array() : null));
+        if(!count($existingValues)){
+            return;
+        }
+        $this->mergeExistingParameters($options, $existingValues);
+    }
+
+    /**
+     * @param array $parsed
+     * @param array $existing
+     */
+    protected function mergeExistingParameters(&$parsed, $existing){
+        foreach($parsed as $k => &$v){
+            if($v === "__AJXP_VALUE_SET__" && isSet($existing[$k])){
+                $parsed[$k] = $existing[$k];
+            }else if(is_array($v) && is_array($existing[$k])){
+                $this->mergeExistingParameters($v, $existing[$k]);
+            }
+        }
+    }
+
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $currentUserIsGroupAdmin
+     * @param bool $withLabel
+     * @return array
+     */
+    protected function getEditableParameters($ctx, $currentUserIsGroupAdmin, $withLabel = false){
+
+        $query = "//param|//global_param";
+        if($currentUserIsGroupAdmin){
+            $query = "//param[@scope]|//global_param[@scope]";
+        }
+
+        $nodes = PluginsService::getInstance($ctx)->searchAllManifests($query, "node", false, true, true);
+        $actions = array();
+        foreach ($nodes as $node) {
+            if($node->parentNode->nodeName != "server_settings") continue;
+            $parentPlugin = $node->parentNode->parentNode;
+            $pId = $parentPlugin->attributes->getNamedItem("id")->nodeValue;
+            if (empty($pId)) {
+                $pId = $parentPlugin->nodeName .".";
+                if($pId == "ajxpdriver.") $pId = "access.";
+                $pId .= $parentPlugin->attributes->getNamedItem("name")->nodeValue;
+            }
+            if(!is_array($actions[$pId])) $actions[$pId] = array();
+            $actionName = $node->attributes->getNamedItem("name")->nodeValue;
+            $attributes = array();
+            for( $i = 0; $i < $node->attributes->length; $i ++){
+                $att = $node->attributes->item($i);
+                $value = $att->nodeValue;
+                if(in_array($att->nodeName, array("choices", "description", "group", "label"))) {
+                    $value = XMLFilter::resolveKeywords($value);
+                }
+                $attributes[$att->nodeName] = $value;
+            }
+            if($withLabel){
+                $actions[$pId][$actionName] = array(
+                    "parameter" => $actionName ,
+                    "label" => $attributes["label"],
+                    "attributes" => $attributes
+                );
+            }else{
+                $actions[$pId][] = $actionName;
+            }
+
+        }
+        foreach ($actions as $actPid => $actionGroup) {
+            ksort($actionGroup, SORT_STRING);
+            $actions[$actPid] = array();
+            foreach ($actionGroup as $v) {
+                $actions[$actPid][] = $v;
+            }
+        }
+        return $actions;
+    }
+
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param string $rootPath Path to prepend to the resulting nodes
+     * @param string $relativePath Specific path part for this function
+     * @param string $paginationHash Number added to url#2 for pagination purpose.
+     * @param string $findNodePosition Path to a given node to try to find it
+     * @param string $aliasedDir Aliased path used for alternative url
+     * @return NodesList A populated NodesList object, eventually recursive.
+     */
+    public abstract function listNodes(ServerRequestInterface $requestInterface, $rootPath, $relativePath, $paginationHash = null, $findNodePosition=null, $aliasedDir=null);
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/access.ajxp_conf/src/ActionsManager.php b/core/src/plugins/access.ajxp_conf/src/ActionsManager.php
new file mode 100644
index 0000000000..c77c79da51
--- /dev/null
+++ b/core/src/plugins/access.ajxp_conf/src/ActionsManager.php
@@ -0,0 +1,176 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Access\Driver\DataProvider\Provisioning;
+
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\NodesList;
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\LocaleService;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class ActionsManager
+ * @package Pydio\Access\Driver\DataProvider\Provisioning
+ */
+class ActionsManager extends AbstractManager
+{
+
+    /**
+     * @param ServerRequestInterface $requestInterface Full set of query parameters
+     * @param string $rootPath Path to prepend to the resulting nodes
+     * @param string $relativePath Specific path part for this function
+     * @param string $paginationHash Number added to url#2 for pagination purpose.
+     * @param string $findNodePosition Path to a given node to try to find it
+     * @param string $aliasedDir Aliased path used for alternative url
+     * @return NodesList A populated NodesList object, eventually recursive.
+     * @throws \Pydio\Core\Exception\PydioException
+     */
+    public function listNodes(ServerRequestInterface $requestInterface, $rootPath, $relativePath, $paginationHash = null, $findNodePosition = null, $aliasedDir = null)
+    {
+        $nodesList  = new NodesList("/$rootPath/$relativePath");
+        $parts      = explode("/",$relativePath);
+        $pServ      = PluginsService::getInstance($this->context);
+        $types      = $pServ->getDetectedPlugins();
+
+        if (count($parts) == 1) {
+
+            $nodesList->initColumnsData("filelist", "list", "ajxp_conf.actions_list");
+            $nodesList->appendColumn("ajxp_conf.101", "ajxp_label");
+            ksort($types);
+            foreach ($types as $t => $tPlugs) {
+                if(!empty($findNodePosition) && $t !== $findNodePosition) continue;
+
+                $meta = array(
+                    "icon" 		=> "folder_development.png",
+                    "plugin_id" => $t,
+                    "text"      => $t,
+                    "is_file"   => false
+                );
+                $nodeKey = "/$rootPath/actions/".$t;
+                $this->appendBookmarkMeta($nodeKey, $meta);
+                $nodesList->addBranch(new AJXP_Node($nodeKey, $meta));
+            }
+
+        } else if (count($parts) == 2) {
+            // list plugs
+            $type = $parts[1];
+            $nodesList->initColumnsData("filelist", "detail", "ajxp_conf.actions_list_plug");
+            $nodesList->appendColumn("ajxp_conf.101", "ajxp_label");
+            $nodesList->appendColumn("ajxp_conf.103", "actions");
+            /** @var Plugin $pObject */
+            foreach ($types[$type] as $pObject) {
+                if(!empty($findNodePosition) && $pObject->getName() !== $findNodePosition) continue;
+
+                $actions = $pObject->getManifestRawContent("//action/@name", "xml", true);
+                $actLabel = array();
+                if ($actions->length) {
+                    foreach ($actions as $node) {
+                        $actLabel[] = $node->nodeValue;
+                    }
+                }
+                $meta = array(
+                    "icon" 		=> "preferences_plugin.png",
+                    "text"      => $pObject->getManifestLabel(),
+                    "plugin_id" => $pObject->getId(),
+                    "is_file"   => false,
+                    "actions"   => implode(", ", $actLabel)
+                );
+                $nodeKey = "/$rootPath/actions/$type/".$pObject->getName();
+                $this->appendBookmarkMeta($nodeKey, $meta);
+                $nodesList->addBranch(new AJXP_Node($nodeKey, $meta));
+            }
+
+        } else if (count($parts) == 3) {
+            // list actions
+            $type = $parts[1];
+            $name = $parts[2];
+            $mess = LocaleService::getMessages();
+
+            $nodesList->initColumnsData("full", "full", "ajxp_conf.actions_list_plugs");
+            $nodesList->appendColumn("ajxp_conf.101", "ajxp_label", "String", "10%");
+            $nodesList->appendColumn("ajxp_conf.103", "parameters", "String", "30%");
+            $nodesList->appendColumn("Rest API", "rest_params", "String", "30%");
+
+            /** @var Plugin $pObject */
+            $pObject = $types[$type][$name];
+
+            $actions = $pObject->getManifestRawContent("//action", "xml", true);
+            $allNodesAcc = array();
+            if ($actions->length) {
+                foreach ($actions as $node) {
+                    $xPath = new \DOMXPath($node->ownerDocument);
+                    $callbacks = $xPath->query("processing/serverCallback", $node);
+                    if(!$callbacks->length) continue;
+                    /** @var \DOMElement $callback */
+                    $callback = $callbacks->item(0);
+
+                    $actName = $actLabel = $node->attributes->getNamedItem("name")->nodeValue;
+                    if(!empty($findNodePosition) && $actName !== $findNodePosition) continue;
+
+                    $text = $xPath->query("gui/@text", $node);
+                    if ($text->length) {
+                        $actLabel = $actName ." (" . $mess[$text->item(0)->nodeValue].")";
+                    }
+                    $params = $xPath->query("processing/serverCallback/input_param", $node);
+                    $paramLabel = array();
+                    if ($callback->getAttribute("developerComment") != "") {
+                        $paramLabel[] = "<span class='developerComment'>".$callback->getAttribute("developerComment")."</span>";
+                    }
+                    $restPath = "";
+                    if ($callback->getAttribute("restParams")) {
+                        $restPath = "/api/$actName/". ltrim($callback->getAttribute("restParams"), "/");
+                    }
+                    if ($restPath != null) {
+                        $paramLabel[] = "<span class='developerApiAccess'>"."API Access : ".$restPath."</span>";
+                    }
+                    if ($params->length) {
+                        $paramLabel[] = "Expected Parameters :";
+                        /** @var \DOMElement $param */
+                        foreach ($params as $param) {
+                            $paramLabel[]= '. ['.$param->getAttribute("type").'] <b>'.$param->getAttribute("name").($param->getAttribute("mandatory") == "true" ? '*':'').'</b> : '.$param->getAttribute("description");
+                        }
+                    }
+                    $meta = array(
+                        "icon" 		    => "preferences_plugin.png",
+                        "text"          => $actLabel,
+                        "action_id"     => $actName,
+                        "parameters"    => '<div class="developerDoc">'.implode("<br/>", $paramLabel).'</div>',
+                        "rest_params"   => $restPath
+                    );
+                    $nodeKey = "/$rootPath/actions/$type/".$pObject->getName()."/$actName";
+                    $this->appendBookmarkMeta($nodeKey, $meta);
+                    $node = new AJXP_Node($nodeKey, $meta);
+                    $allNodesAcc[$actName] = $node;
+                }
+                ksort($allNodesAcc);
+                foreach($allNodesAcc as $path => $node){
+                    $nodesList->addBranch($node);
+                }
+            }
+
+        }
+        return $nodesList;
+
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/access.ajxp_conf/src/ConfAccessDriver.php b/core/src/plugins/access.ajxp_conf/src/ConfAccessDriver.php
new file mode 100644
index 0000000000..883f4a9b19
--- /dev/null
+++ b/core/src/plugins/access.ajxp_conf/src/ConfAccessDriver.php
@@ -0,0 +1,468 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ *
+ */
+namespace Pydio\Access\Driver\DataProvider\Provisioning;
+
+require_once(dirname(__FILE__)."/../vendor/autoload.php");
+
+use DOMXPath;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Core\Http\Response\SerializableResponseStream;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Services\UsersService;
+use Zend\Diactoros\Response\JsonResponse;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Plugin to access the configurations data
+ * Class ConfAccessDriver
+ * @package Pydio\Access\Driver\DataProvider
+ */
+class ConfAccessDriver extends AbstractAccessDriver
+{
+
+    protected $rootNodes = array(
+        "data" => array(
+            "LABEL" => "ajxp_conf.110",
+            "ICON" => "user.png",
+            "DESCRIPTION" => "ajxp_conf.137",
+            "CHILDREN" => array(
+                "repositories" => array(
+                    "AJXP_MIME" => "workspaces_zone",
+                    "LABEL" => "ajxp_conf.3",
+                    "DESCRIPTION" => "ajxp_conf.138",
+                    "ICON" => "hdd_external_unmount.png",
+                    "MANAGER" => "Pydio\\Access\\Driver\\DataProvider\\Provisioning\\RepositoriesManager"
+                ),
+                "users" => array(
+                    "AJXP_MIME" => "users_zone",
+                    "LABEL" => "ajxp_conf.2",
+                    "DESCRIPTION" => "ajxp_conf.139",
+                    "ICON" => "users-folder.png",
+                    "MANAGER" => "Pydio\\Access\\Driver\\DataProvider\\Provisioning\\UsersManager"
+                ),
+                "roles" => array(
+                    "AJXP_MIME" => "roles_zone",
+                    "LABEL" => "ajxp_conf.69",
+                    "DESCRIPTION" => "ajxp_conf.140",
+                    "ICON" => "user-acl.png",
+                    "MANAGER" => "Pydio\\Access\\Driver\\DataProvider\\Provisioning\\RolesManager"
+                ),
+            )
+        ),
+        "config" => array(
+            "AJXP_MIME" => "plugins_zone",
+            "LABEL" => "ajxp_conf.109",
+            "ICON" => "preferences_desktop.png",
+            "DESCRIPTION" => "ajxp_conf.136",
+            "CHILDREN" => array(
+                "core"	   	   => array(
+                    "AJXP_MIME" => "plugins_zone",
+                    "LABEL" => "ajxp_conf.98",
+                    "DESCRIPTION" => "ajxp_conf.133",
+                    "ICON" => "preferences_desktop.png",
+                    "MANAGER" => "Pydio\\Access\\Driver\\DataProvider\\Provisioning\\PluginsManager"
+                ),
+                "plugins"	   => array(
+                    "AJXP_MIME" => "plugins_zone",
+                    "LABEL" => "ajxp_conf.99",
+                    "DESCRIPTION" => "ajxp_conf.134",
+                    "ICON" => "folder_development.png",
+                    "MANAGER" => "Pydio\\Access\\Driver\\DataProvider\\Provisioning\\PluginsManager"
+                ),
+                "core_plugins" => array(
+                    "AJXP_MIME" => "plugins_zone",
+                    "LABEL" => "ajxp_conf.123",
+                    "DESCRIPTION" => "ajxp_conf.135",
+                    "ICON" => "folder_development.png",
+                    "MANAGER" => "Pydio\\Access\\Driver\\DataProvider\\Provisioning\\PluginsManager"
+                ),
+            )
+        ),
+        "admin" => array(
+            "LABEL" => "ajxp_conf.111",
+            "ICON" => "toggle_log.png",
+            "DESCRIPTION" => "ajxp_conf.141",
+            "CHILDREN" => array(
+                "logs" => array(
+                    "LABEL" => "ajxp_conf.4",
+                    "DESCRIPTION" => "ajxp_conf.142",
+                    "ICON" => "toggle_log.png",
+                    "MANAGER" => "Pydio\\Access\\Driver\\DataProvider\\Provisioning\\LogsManager"
+                ),
+                "diagnostic" => array(
+                    "LABEL" => "ajxp_conf.5",
+                    "DESCRIPTION" => "ajxp_conf.143",
+                    "ICON" => "susehelpcenter.png",
+                    "MANAGER" => "Pydio\\Access\\Driver\\DataProvider\\Provisioning\\DiagnosticManager"
+                )
+            )
+        ),
+        "developer" => array(
+            "LABEL" => "ajxp_conf.144",
+            "ICON" => "applications_engineering.png",
+            "DESCRIPTION" => "ajxp_conf.145",
+            "CHILDREN" => array(
+                "actions" => array(
+                    "LABEL" => "ajxp_conf.146",
+                    "DESCRIPTION" => "ajxp_conf.147",
+                    "ICON" => "book.png",
+                    "MANAGER" => "Pydio\\Access\\Driver\\DataProvider\\Provisioning\\ActionsManager"
+                ),
+                "hooks" => array(
+                    "LABEL" => "ajxp_conf.148",
+                    "DESCRIPTION" => "ajxp_conf.149",
+                    "ICON" => "book.png",
+                    "MANAGER" => "Pydio\\Access\\Driver\\DataProvider\\Provisioning\\DocumentationManager"
+                )
+            )
+        )
+    );
+
+    /**
+     * Called internally to populate left menu
+     * @param ContextInterface $ctx
+     * @return array
+     * @throws \Exception
+     */
+    protected function getMainTree(ContextInterface $ctx){
+        $rootNodes = $this->rootNodes;
+        $user = $ctx->getUser();
+        if ($user != null && $user->getGroupPath() != "/") {
+            // Group Admin
+            unset($rootNodes["config"]);
+            unset($rootNodes["admin"]);
+            unset($rootNodes["developer"]);
+        }
+        Controller::applyHook("ajxp_conf.list_config_nodes", array($ctx, &$rootNodes));
+        return $rootNodes;
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @return bool
+     */
+    public function preprocessLsApi2(ServerRequestInterface &$requestInterface, ResponseInterface &$responseInterface){
+
+        $uri = $requestInterface->getAttribute("api_uri");
+        $vars = $requestInterface->getParsedBody();
+        if($uri === "/admin/roles") {
+            
+            $vars["dir"] = "/data/roles";
+            $requestInterface = $requestInterface->withParsedBody($vars);
+
+        }else if(strpos($uri, "/admin/people") === 0){
+
+            $crtPath = "";
+            if(isSet($vars["path"]) && !empty($vars["path"]) && $vars["path"] !== "/"){
+                $crtPath = $vars["path"];
+            }
+            $vars["dir"] = "/data/users".$crtPath;
+            $requestInterface = $requestInterface->withParsedBody($vars);
+
+        }
+        
+        
+    }
+    
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     */
+    public function listAction(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface){
+
+        if($requestInterface->getAttribute("action") === "stat"){
+            $responseInterface = new JsonResponse(["mode" => true]);
+            return;
+        }
+
+        if($requestInterface->getAttribute("api") === "v2"){
+            
+            $uri = $requestInterface->getAttribute("api_uri");
+            $vars = $requestInterface->getParsedBody();
+            if($uri === "/admin/roles") {
+
+                $vars["dir"] = "/data/roles";
+                $requestInterface = $requestInterface->withParsedBody($vars);
+                
+            }else if($uri === "/admin/workspaces") {
+
+                $vars["dir"] = "/data/repositories";
+                $requestInterface = $requestInterface->withParsedBody($vars);
+
+            }else if(strpos($uri, "/admin/people") === 0){
+                
+                $crtPath = "";
+                if(isSet($vars["path"]) && !empty($vars["path"]) && $vars["path"] !== "/"){
+                    $crtPath = $vars["path"];
+                }
+                $vars["dir"] = "/data/users/".ltrim($crtPath, "/");
+                $requestInterface = $requestInterface->withParsedBody($vars);
+                
+            }
+        }
+
+        /** @var ContextInterface $ctx */
+        $ctx = $requestInterface->getAttribute("ctx");
+        $treeManager = new TreeManager($ctx, $this->getName(), $this->getMainTree($ctx));
+        $nodesList = $treeManager->dispatchList($requestInterface);
+        $responseInterface = $responseInterface->withBody(new SerializableResponseStream($nodesList));
+
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     */
+    public function pluginsAction(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface){
+        $pluginManager = new PluginsManager($requestInterface->getAttribute("ctx"), $this->getName());
+        $responseInterface = $pluginManager->pluginsActions($requestInterface, $responseInterface);
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     */
+    public function rolesAction(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface){
+        $pluginManager = new RolesManager($requestInterface->getAttribute("ctx"), $this->getName());
+        $responseInterface = $pluginManager->rolesActions($requestInterface, $responseInterface);
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     */
+    public function usersAction(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface){
+        $pluginManager = new UsersManager($requestInterface->getAttribute("ctx"), $this->getName());
+        $action = $requestInterface->getAttribute("action");
+        if(strpos($action, "people-") === 0){
+            $responseInterface = $pluginManager->peopleApiActions($requestInterface, $responseInterface);
+        }else{
+            $responseInterface = $pluginManager->usersActions($requestInterface, $responseInterface);
+        }
+    }
+
+    /**
+     * Search users
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     */
+    public function searchUsersAction(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface) {
+        $pluginManager = new UsersManager($requestInterface->getAttribute("ctx"), $this->getName());
+        $responseInterface = $pluginManager->search($requestInterface, $responseInterface);
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     */
+    public function repositoriesAction(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface){
+        $pluginManager = new RepositoriesManager($requestInterface->getAttribute("ctx"), $this->getName());
+        $responseInterface = $pluginManager->repositoriesActions($requestInterface, $responseInterface);
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     */
+    public function editAction(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface){
+
+        $subAction = $requestInterface->getParsedBody()["sub_action"];
+        $requestInterface = $requestInterface->withAttribute("action", $subAction);
+
+        switch($subAction){
+            case "edit_plugin_options":
+                $this->pluginsAction($requestInterface, $responseInterface);
+                break;
+            case "edit_role":
+            case "post_json_role":
+                $this->rolesAction($requestInterface, $responseInterface);
+                break;
+            case "user_set_lock":
+            case "change_admin_right":
+            case "user_add_role":
+            case "create_user":
+            case "user_delete_role":
+            case "user_reorder_roles":
+            case "users_bulk_update_roles":
+            case "save_custom_user_params":
+            case "save_repository_user_params":
+            case "update_user_pwd":
+                $this->usersAction($requestInterface, $responseInterface);
+                break;
+            case "edit_repository":
+            case "create_repository":
+            case "edit_repository_label":
+            case "edit_repository_data":
+            case "get_drivers_definition":
+            case "get_templates_definition":
+            case "meta_source_add":
+            case "meta_source_edit":
+            case "meta_source_delete":
+                $this->repositoriesAction($requestInterface, $responseInterface);
+                break;
+            default:
+                break;
+        }
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     */
+    public function deleteAction(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface){
+
+        $httpVars = $requestInterface->getParsedBody();
+        // REST API V1 mapping
+        if (isSet($httpVars["data_type"])) {
+            switch ($httpVars["data_type"]) {
+                case "repository":
+                    $httpVars["repository_id"] = basename($httpVars["data_id"]);
+                    break;
+                case "role":
+                    $httpVars["role_id"] = basename($httpVars["data_id"]);
+                    break;
+                case "user":
+                    $httpVars["user_id"] = basename($httpVars["data_id"]);
+                    break;
+                case "group":
+                    $httpVars["group"] = "/data/users".$httpVars["data_id"];
+                    break;
+                default:
+                    break;
+            }
+            unset($httpVars["data_type"]);
+            unset($httpVars["data_id"]);
+            $requestInterface = $requestInterface->withParsedBody($httpVars);
+
+        }
+
+        /** @var ContextInterface $ctx */
+        $ctx = $requestInterface->getAttribute("ctx");
+
+        if (isSet($httpVars["repository_id"]) || isSet($httpVars["workspaceId"])) {
+
+            $manager = new RepositoriesManager($ctx, $this->getName());
+
+        } else if (isSet($httpVars["role_id"]) || isSet($httpVars["roleId"])) {
+
+            $manager = new RolesManager($ctx, $this->getName());
+
+        } else {
+
+            $manager = new UsersManager($ctx, $this->getName());
+        }
+
+        $responseInterface = $manager->delete($requestInterface, $responseInterface);
+
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     */
+    public function documentationAction(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface) {
+        $docManager = new DocumentationManager($requestInterface->getAttribute("ctx"), $this->getName());
+        return $docManager->docActions($requestInterface, $responseInterface);
+
+    }
+
+        /**
+     * Bookmark any page for the admin interface
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     */
+    public function preProcessBookmarkAction(ServerRequestInterface &$request, ResponseInterface $response)
+    {
+
+        $httpVars = $request->getParsedBody();
+        /** @var ContextInterface $ctx */
+        $ctx = $request->getAttribute("ctx");
+        if (isSet($httpVars["bm_action"]) && $httpVars["bm_action"] == "add_bookmark" && UsersService::usersEnabled()) {
+            $bmUser = $ctx->getUser();
+            $repositoryId = $ctx->getRepositoryId();
+            $bookmarks = $bmUser->getBookmarks($repositoryId);
+            foreach ($bookmarks as $bm) {
+                if ($bm["PATH"] == $httpVars["bm_path"]) {
+                    $httpVars["bm_action"] = "delete_bookmark";
+                    $request = $request->withParsedBody($httpVars);
+                    break;
+                }
+            }
+        }
+
+    }
+
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     */
+    public function displayEnterprise(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface){
+        $touchFile = $this->getPluginWorkDir(true).DIRECTORY_SEPARATOR."enterprise-display";
+        if(file_exists($touchFile)){
+            $lastDisplay = intval(file_get_contents($touchFile));
+            if(time() - $lastDisplay > 60 * 60 * 24 * 15){
+                $responseInterface = new JsonResponse(["display" => true]);
+                file_put_contents($touchFile, time());
+            }else{
+                $responseInterface = new JsonResponse(["display" => false]);
+                echo json_encode(["display" => false]);
+            }
+        }else{
+            $responseInterface = new JsonResponse(["display" => true]);
+            file_put_contents($touchFile, time());
+        }
+    }
+
+
+    /********************/
+    /* PLUGIN LIFECYCLE
+    /********************/
+    /**
+     * @inheritdoc
+     */
+    public function parseSpecificContributions(ContextInterface $ctx, \DOMNode &$contribNode)
+    {
+        parent::parseSpecificContributions($ctx, $contribNode);
+        if($contribNode->nodeName != "actions") return;
+        $currentUserIsGroupAdmin = ($ctx->hasUser() && $ctx->getUser()->getGroupPath() != "/");
+        if(!$currentUserIsGroupAdmin) return;
+        $actionXpath=new DOMXPath($contribNode->ownerDocument);
+        $publicUrlNodeList = $actionXpath->query('action[@name="create_repository"]/subMenu', $contribNode);
+        if ($publicUrlNodeList->length) {
+            $publicUrlNode = $publicUrlNodeList->item(0);
+            $publicUrlNode->parentNode->removeChild($publicUrlNode);
+        }
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     */
+    protected function initRepository(ContextInterface $ctx){
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/access.ajxp_conf/src/DiagnosticManager.php b/core/src/plugins/access.ajxp_conf/src/DiagnosticManager.php
new file mode 100644
index 0000000000..835d96a782
--- /dev/null
+++ b/core/src/plugins/access.ajxp_conf/src/DiagnosticManager.php
@@ -0,0 +1,83 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Access\Driver\DataProvider\Provisioning;
+
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\NodesList;
+use Pydio\Core\Utils\Reflection\DiagnosticRunner;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class DiagnosticManager
+ * @package Pydio\Access\Driver\DataProvider\Provisioning
+ */
+class DiagnosticManager extends AbstractManager
+{
+
+    /**
+     * @param ServerRequestInterface $requestInterface Full set of query parameters
+     * @param string $rootPath Path to prepend to the resulting nodes
+     * @param string $relativePath Specific path part for this function
+     * @param string $paginationHash Number added to url#2 for pagination purpose.
+     * @param string $findNodePosition Path to a given node to try to find it
+     * @param string $aliasedDir Aliased path used for alternative url
+     * @return NodesList A populated NodesList object, eventually recursive.
+     */
+    public function listNodes(ServerRequestInterface $requestInterface, $rootPath, $relativePath, $paginationHash = null, $findNodePosition = null, $aliasedDir = null)
+    {
+        $outputArray    = array();
+        $testedParams   = array();
+        $path           = "/$rootPath/$relativePath";
+        $nodesList      = new NodesList($path);
+
+        DiagnosticRunner::runTests($outputArray, $testedParams);
+        DiagnosticRunner::testResultsToFile($outputArray, $testedParams);
+
+        $nodesList->initColumnsData("filelist", "list", "ajxp_conf.diagnostic");
+        $nodesList->appendColumn("ajxp_conf.23", "ajxp_label");
+        $nodesList->appendColumn("ajxp_conf.24", "data");
+
+        if (is_file(TESTS_RESULT_FILE) || is_file(TESTS_RESULT_FILE_LEGACY)) {
+            if(is_file(TESTS_RESULT_FILE_LEGACY)){
+                include_once(TESTS_RESULT_FILE_LEGACY);
+            }else{
+                include_once(TESTS_RESULT_FILE);
+            }
+            if (isset($diagResults)) {
+                foreach ($diagResults as $id => $value) {
+                    $nodeKey = $path."/".$id;
+                    $meta = [
+                        "icon"      => "susehelpcenter.png",
+                        "text"      => $id,
+                        "data"      => $value,
+                        "ajxp_mime" => "testResult"
+                    ];
+                    $nodesList->addBranch(new AJXP_Node($nodeKey, $meta));
+                }
+            }
+        }
+        return $nodesList;
+
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/access.ajxp_conf/src/DocumentationManager.php b/core/src/plugins/access.ajxp_conf/src/DocumentationManager.php
new file mode 100644
index 0000000000..0a17a4032d
--- /dev/null
+++ b/core/src/plugins/access.ajxp_conf/src/DocumentationManager.php
@@ -0,0 +1,98 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Access\Driver\DataProvider\Provisioning;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\NodesList;
+use Pydio\Core\Utils\Reflection\DocsParser;
+use Pydio\Core\Utils\Reflection\PydioSdkGenerator;
+use Zend\Diactoros\Response\JsonResponse;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class HooksManager
+ * @package Pydio\Access\Driver\DataProvider\Provisioning
+ */
+class DocumentationManager extends AbstractManager
+{
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @return ResponseInterface
+     */
+    public function docActions(ServerRequestInterface $requestInterface, ResponseInterface $responseInterface){
+
+        PydioSdkGenerator::analyzeRegistry(isSet($httpVars["version"])?$httpVars["version"]:AJXP_VERSION);
+
+        return new JsonResponse(["result"=>"ok"]);
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface Full set of query parameters
+     * @param string $rootPath Path to prepend to the resulting nodes
+     * @param string $relativePath Specific path part for this function
+     * @param string $paginationHash Number added to url#2 for pagination purpose.
+     * @param string $findNodePosition Path to a given node to try to find it
+     * @param string $aliasedDir Aliased path used for alternative url
+     * @return NodesList A populated NodesList object, eventually recursive.
+     */
+    public function listNodes(ServerRequestInterface $requestInterface, $rootPath, $relativePath, $paginationHash = null, $findNodePosition = null, $aliasedDir = null)
+    {
+        $nodesList      = new NodesList("/$rootPath/$relativePath");
+        $jsonContent    = json_decode(file_get_contents(DocsParser::getHooksFile()), true);
+        $nodesList->initColumnsData("full", "full", "hooks.list");
+        $nodesList->appendColumn("ajxp_conf.17", "ajxp_label", "String", "20%");
+        $nodesList->appendColumn("ajxp_conf.18", "description", "String", "20%");
+        $nodesList->appendColumn("ajxp_conf.19", "triggers", "String", "25%");
+        $nodesList->appendColumn("ajxp_conf.20", "listeners", "String", "25%");
+        $nodesList->appendColumn("ajxp_conf.21", "sample", "String", "10%");
+
+        foreach ($jsonContent as $hookName => $hookData) {
+            $metadata = array(
+                "icon"          => "preferences_plugin.png",
+                "text"          => $hookName,
+                "description"   => $hookData["DESCRIPTION"],
+                "sample"        => $hookData["PARAMETER_SAMPLE"],
+            );
+            $trigs = array();
+            foreach ($hookData["TRIGGERS"] as $trigger) {
+                $trigs[] = "<span>".$trigger["FILE"]." (".$trigger["LINE"].")</span>";
+            }
+            $metadata["triggers"] = implode("<br/>", $trigs);
+            $listeners = array();
+            foreach ($hookData["LISTENERS"] as $listener) {
+                $listeners[] = "<span>Plugin ".$listener["PLUGIN_ID"].", in method ".$listener["METHOD"]."</span>";
+            }
+            $metadata["listeners"] = implode("<br/>", $listeners);
+            $nodeKey = "/$rootPath/hooks/$hookName/$hookName";
+            $this->appendBookmarkMeta($nodeKey, $meta);
+            $nodesList->addBranch(new AJXP_Node($nodeKey, $meta));
+        }
+
+        return $nodesList;
+
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/access.ajxp_conf/src/LogsManager.php b/core/src/plugins/access.ajxp_conf/src/LogsManager.php
new file mode 100644
index 0000000000..ef615ac22c
--- /dev/null
+++ b/core/src/plugins/access.ajxp_conf/src/LogsManager.php
@@ -0,0 +1,92 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Access\Driver\DataProvider\Provisioning;
+
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\NodesList;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class LogsManager
+ * @package Pydio\Access\Driver\DataProvider\Provisioning
+ */
+class LogsManager extends AbstractManager
+{
+
+    /**
+     * @param ServerRequestInterface $requestInterface Full set of query parameters
+     * @param string $rootPath Path to prepend to the resulting nodes
+     * @param string $relativePath Specific path part for this function
+     * @param string $paginationHash Number added to url#2 for pagination purpose.
+     * @param string $findNodePosition Path to a given node to try to find it
+     * @param string $aliasedDir Aliased path used for alternative url
+     * @return NodesList A populated NodesList object, eventually recursive.
+     */
+    public function listNodes(ServerRequestInterface $requestInterface, $rootPath, $relativePath, $paginationHash = null, $findNodePosition = null, $aliasedDir = null)
+    {
+        $relativePath   = "/$relativePath";
+        $nodesList      = new NodesList("/".$rootPath.$relativePath);
+        $logger         = Logger::getInstance();
+        $parts          = explode("/", $relativePath);
+        $leaf           = false;
+
+        if (count($parts)>4) {
+
+            $nodesList->initColumnsData("filelist", "list", "ajxp_conf.logs");
+            $nodesList->appendColumn("ajxp_conf.17", "date", "MyDate", "18%");
+            $nodesList->appendColumn("ajxp_conf.18", "ip", "String", "5%");
+            $nodesList->appendColumn("ajxp_conf.19", "level", "String", "10%");
+            $nodesList->appendColumn("ajxp_conf.20", "user", "String", "5%");
+            $nodesList->appendColumn("ajxp_conf.124", "source", "String", "5%");
+            $nodesList->appendColumn("ajxp_conf.21", "action", "String", "7%");
+            $nodesList->appendColumn("ajxp_conf.22", "params", "String", "50%");
+
+            $leaf = true;
+            $date = $parts[count($parts)-1];
+            $logs = $logger->listLogs($relativePath, $date, "tree", "/" . $rootPath . "/logs", isSet($_POST["cursor"]) ? intval($_POST["cursor"]) : -1);
+
+        } else {
+
+            $nodesList->initColumnsData("filelist", "list", "ajxp_conf.logs");
+            $nodesList->appendColumn("ajxp_conf.16", "ajxp_label");
+            if(count($parts) > 3) $leaf = true;
+            $logs = $logger->listLogFiles("tree", (count($parts) > 2 ? $parts[2] : null), (count($parts) > 3 ? $parts[3] : null), "/" . $rootPath . "/logs");
+
+        }
+
+        foreach($logs as $path => $meta){
+
+            if(!empty($findNodePosition)  && basename($path) !== $findNodePosition){
+                continue;
+            }
+            if($leaf) $meta["is_file"] = true;
+            $this->appendBookmarkMeta($path, $meta);
+            $nodesList->addBranch(new AJXP_Node($path, $meta));
+
+        }
+
+        return $nodesList;
+
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/access.ajxp_conf/src/PluginsManager.php b/core/src/plugins/access.ajxp_conf/src/PluginsManager.php
new file mode 100644
index 0000000000..8e52b7c765
--- /dev/null
+++ b/core/src/plugins/access.ajxp_conf/src/PluginsManager.php
@@ -0,0 +1,502 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Access\Driver\DataProvider\Provisioning;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\NodesList;
+use Pydio\Core\Utils\Vars\XMLFilter;
+use Pydio\Core\Http\Message\ReloadMessage;
+use Pydio\Core\Http\Message\UserMessage;
+use Pydio\Core\Http\Message\XMLDocMessage;
+use Pydio\Core\Http\Response\SerializableResponseStream;
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\CacheService;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\StringHelper;
+use Zend\Diactoros\Response\JsonResponse;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class PluginsManager
+ * @package Pydio\Access\Driver\DataProvider\Provisioning
+ */
+class PluginsManager extends AbstractManager
+{
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @return ResponseInterface
+     */
+    public function pluginsActions(ServerRequestInterface $requestInterface, ResponseInterface $responseInterface){
+
+        $action     = $requestInterface->getAttribute("action");
+        $ctx        = $requestInterface->getAttribute("ctx");
+        $httpVars   = $requestInterface->getParsedBody();
+        $mess       = LocaleService::getMessages();
+
+        switch ($action){
+            // PLUGINS
+            case "clear_plugins_cache":
+
+                ConfService::clearAllCaches();
+                $userMessage = new UserMessage($mess["ajxp_conf." . (AJXP_SKIP_CACHE ? "132" : "131")]);
+                $reloadMessage = new ReloadMessage();
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream([$userMessage, $reloadMessage]));
+
+                break;
+
+            case "get_plugin_manifest" :
+
+                $pluginId       = InputFilter::sanitize($httpVars["plugin_id"], InputFilter::SANITIZE_ALPHANUM);
+                if($pluginId === "core") {
+                    $pluginId = "core.ajaxplorer";
+                }
+                $ajxpPlugin     = PluginsService::getInstance($ctx)->getPluginById($pluginId);
+                $buffer = "<admin_data>";
+
+                $fullManifest = $ajxpPlugin->getManifestRawContent("", "xml");
+                $xPath = new \DOMXPath($fullManifest->ownerDocument);
+                $addParams = "";
+                $instancesDefinitions = array();
+                $pInstNodes = $xPath->query("server_settings/global_param[contains(@type, 'plugin_instance:')]");
+                /** @var \DOMElement $pInstNode */
+                foreach ($pInstNodes as $pInstNode) {
+                    $type = $pInstNode->getAttribute("type");
+                    $instType = str_replace("plugin_instance:", "", $type);
+                    $fieldName = $pInstNode->getAttribute("name");
+                    $pInstNode->setAttribute("type", "group_switch:" . $fieldName);
+                    $typePlugs = PluginsService::getInstance($ctx)->getPluginsByType($instType);
+                    foreach ($typePlugs as $typePlug) {
+                        if (!$typePlug->isEnabled()) continue;
+                        if ($typePlug->getId() == "auth.multi") continue;
+                        $checkErrorMessage = "";
+                        try {
+                            $typePlug->performChecks();
+                        } catch (\Exception $e) {
+                            $checkErrorMessage = " (Warning : " . $e->getMessage() . ")";
+                        }
+                        $tParams = XMLFilter::resolveKeywords($typePlug->getManifestRawContent("server_settings/param[not(@group_switch_name)]"));
+                        $addParams .= '<global_param group_switch_name="' . $fieldName . '" name="instance_name" group_switch_label="' . $typePlug->getManifestLabel() . $checkErrorMessage . '" group_switch_value="' . $typePlug->getId() . '" default="' . $typePlug->getId() . '" type="hidden"/>';
+                        $addParams .= str_replace("<param", "<global_param group_switch_name=\"${fieldName}\" group_switch_label=\"" . $typePlug->getManifestLabel() . $checkErrorMessage . "\" group_switch_value=\"" . $typePlug->getId() . "\" ", $tParams);
+                        $addParams .= str_replace("<param", "<global_param", XMLFilter::resolveKeywords($typePlug->getManifestRawContent("server_settings/param[@group_switch_name]")));
+                        $addParams .= XMLFilter::resolveKeywords($typePlug->getManifestRawContent("server_settings/global_param"));
+                        $instancesDefs = $typePlug->getConfigsDefinitions();
+                        if (!empty($instancesDefs) && is_array($instancesDefs)) {
+                            foreach ($instancesDefs as $defKey => $defData) {
+                                $instancesDefinitions[$fieldName . "/" . $defKey] = $defData;
+                            }
+                        }
+                    }
+                }
+                $allParams = XMLFilter::resolveKeywords($fullManifest->ownerDocument->saveXML($fullManifest));
+                $allParams = str_replace('type="plugin_instance:', 'type="group_switch:', $allParams);
+                $allParams = str_replace("</server_settings>", $addParams . "</server_settings>", $allParams);
+
+                $buffer .= $allParams ;
+                $definitions = $instancesDefinitions;
+                $configsDefs = $ajxpPlugin->getConfigsDefinitions();
+                if (is_array($configsDefs)) {
+                    $definitions = array_merge($configsDefs, $instancesDefinitions);
+                }
+                $values = $ajxpPlugin->getConfigs();
+                if (!is_array($values)) $values = array();
+                $buffer .= "<plugin_settings_values>";
+                // First flatten keys
+                $flattenedKeys = array();
+                foreach ($values as $key => $value) {
+                    $type = $definitions[$key]["type"];
+                    if ((strpos($type, "group_switch:") === 0 || strpos($type, "plugin_instance:") === 0) && is_array($value)) {
+                        $res = array();
+                        $this->flattenKeyValues($res, $definitions, $value, $key);
+                        $flattenedKeys += $res;
+                        // Replace parent key by new flat value
+                        $values[$key] = $flattenedKeys[$key];
+                    }
+                }
+                $values += $flattenedKeys;
+
+                foreach ($values as $key => $value) {
+                    $attribute = true;
+                    $type = $definitions[$key]["type"];
+                    if ($type == "array" && is_array($value)) {
+                        $value = implode(",", $value);
+                    } else if ($type == "boolean") {
+                        $value = ($value === true || $value === "true" || $value == 1 ? "true" : "false");
+                    } else if ($type == "textarea") {
+                        $attribute = false;
+                    } else if ($type == "password" && !empty($value)) {
+                        $value = "__AJXP_VALUE_SET__";
+                    }
+                    if ($attribute) {
+                        $buffer .= "<param name=\"$key\" value=\"" . StringHelper::xmlEntities($value) . "\"/>";
+                    } else {
+                        $buffer .= "<param name=\"$key\" cdatavalue=\"true\"><![CDATA[" . $value . "]]></param>";
+                    }
+                }
+                if ($ajxpPlugin->getType() != "core") {
+                    $buffer .= "<param name=\"AJXP_PLUGIN_ENABLED\" value=\"" . ($ajxpPlugin->isEnabled() ? "true" : "false") . "\"/>";
+                }
+                $buffer .= "</plugin_settings_values>";
+                $buffer .= "<plugin_doc><![CDATA[<p>" . $ajxpPlugin->getPluginInformationHTML("Charles du Jeu", "https://pydio.com/en/docs/references/plugins/") . "</p>";
+                if (file_exists($ajxpPlugin->getBaseDir() . "/plugin_doc.html")) {
+                    $buffer .= file_get_contents($ajxpPlugin->getBaseDir() . "/plugin_doc.html");
+                }
+                $buffer .= "]]></plugin_doc>";
+                $buffer .= "</admin_data>";
+
+                $responseInterface = $responseInterface->withHeader("Content-type", "text/xml");
+                $responseInterface->getBody()->write($buffer);
+
+                break;
+
+            case "run_plugin_action":
+
+                $options = array();
+                $responseInterface = $responseInterface->withHeader("Content-type", "text/plain");
+                $this->parseParameters($ctx, $httpVars, $options, true);
+                $pluginId = $httpVars["action_plugin_id"];
+                if (isSet($httpVars["button_key"])) {
+                    $options = $options[$httpVars["button_key"]];
+                }
+                $plugin = PluginsService::getInstance($ctx)->softLoad($pluginId, $options);
+                if (method_exists($plugin, $httpVars["action_plugin_method"])) {
+                    try {
+                        $res = call_user_func(array($plugin, $httpVars["action_plugin_method"]), $options, $ctx);
+                        $response = $res;
+                    } catch (\Exception $e) {
+                        $response = "ERROR:" . $e->getMessage();
+                    }
+                } else {
+                    $response = 'ERROR: Plugin ' . $httpVars["action_plugin_id"] . ' does not implement ' . $httpVars["action_plugin_method"] . ' method!';
+                }
+                $responseInterface->getBody()->write($response);
+
+                break;
+
+            case "edit_plugin_options":
+
+                $options = array();
+                $this->parseParameters($ctx, $httpVars, $options, true);
+                $confStorage = ConfService::getConfStorageImpl();
+                $pluginId = InputFilter::sanitize($httpVars["plugin_id"], InputFilter::SANITIZE_ALPHANUM);
+                if($pluginId === "core") {
+                    $pluginId = "core.ajaxplorer";
+                }
+                list($pType, $pName) = explode(".", $pluginId);
+                $existing = $confStorage->loadPluginConfig($pType, $pName);
+                $this->mergeExistingParameters($options, $existing);
+                $confStorage->savePluginConfig($pluginId, $options);
+                ConfService::clearAllCaches();
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream([new UserMessage($mess["ajxp_conf.97"])]));
+
+                break;
+
+            case "list_all_plugins_actions":
+
+                if($this->currentUserIsGroupAdmin()){
+                    // Group admin : do not allow actions edition
+                    return new JsonResponse(["LIST" => array(), "HAS_GROUPS" => true]);
+                }
+
+                if(CacheService::contains(AJXP_CACHE_SERVICE_NS_SHARED, "ALL_ACTIONS_CACHE")){
+
+                    $actions = CacheService::fetch(AJXP_CACHE_SERVICE_NS_SHARED, "ALL_ACTIONS_CACHE");
+
+                }else{
+
+                    $nodes = PluginsService::getInstance($ctx)->searchAllManifests("//action", "node", false, true, true);
+                    $actions = array();
+                    foreach ($nodes as $node) {
+                        $xPath = new \DOMXPath($node->ownerDocument);
+                        $proc = $xPath->query("processing", $node);
+                        if(!$proc->length) continue;
+                        $txt = $xPath->query("gui/@text", $node);
+                        if ($txt->length) {
+                            $messId = $txt->item(0)->nodeValue;
+                        } else {
+                            $messId = "";
+                        }
+                        $parentPlugin = $node->parentNode->parentNode->parentNode;
+                        $pId = $parentPlugin->attributes->getNamedItem("id")->nodeValue;
+                        if (empty($pId)) {
+                            $pId = $parentPlugin->nodeName .".";
+                            if($pId == "ajxpdriver.") $pId = "access.";
+                            $pId .= $parentPlugin->attributes->getNamedItem("name")->nodeValue;
+                        }
+                        if(!is_array($actions[$pId])) $actions[$pId] = array();
+                        $actionName = $node->attributes->getNamedItem("name")->nodeValue;
+                        $actionData = [
+                            "action" => $actionName ,
+                            "label" => $messId,
+                            "server_processing" => $xPath->query("processing/serverCallback", $node)->length ? true : false
+                        ];
+                        // Parse parameters if they are defined
+                        $params = $xPath->query("processing/serverCallback/input_param", $node);
+                        if($params->length){
+                            $actionParameters = [];
+                            /** @var \DOMElement $pNode */
+                            foreach($params as $pNode){
+                                $actionParameters[] = [
+                                    "type" => $pNode->getAttribute("type"),
+                                    "name" => $pNode->getAttribute("name"),
+                                    "description" => $pNode->getAttribute("description")
+                                ];
+                            }
+                            $actionData["parameters"] = $actionParameters;
+                        }
+                        $actions[$pId][$actionName] = $actionData;
+                    }
+                    ksort($actions, SORT_STRING);
+                    foreach ($actions as $actPid => $actionGroup) {
+                        ksort($actionGroup, SORT_STRING);
+                        $actions[$actPid] = array();
+                        foreach ($actionGroup as $v) {
+                            $actions[$actPid][] = $v;
+                        }
+                    }
+                    CacheService::save(AJXP_CACHE_SERVICE_NS_SHARED, "ALL_ACTIONS_CACHE", $actions);
+                }
+                $responseInterface = new JsonResponse(["LIST" => $actions, "HAS_GROUPS" => true]);
+                break;
+
+            case "list_all_plugins_parameters":
+
+                if(CacheService::contains(AJXP_CACHE_SERVICE_NS_SHARED, "ALL_PARAMS_CACHE")){
+                    $parameters = CacheService::fetch(AJXP_CACHE_SERVICE_NS_SHARED, "ALL_PARAMS_CACHE");
+                }else{
+                    $currentUserIsGroupAdmin = ($ctx->hasUser() && $ctx->getUser()->getGroupPath() != "/");
+                    $parameters = $this->getEditableParameters($ctx, $currentUserIsGroupAdmin, true);
+                    CacheService::save(AJXP_CACHE_SERVICE_NS_SHARED, "ALL_PARAMS_CACHE", $parameters);
+                }
+                $responseInterface = new JsonResponse(["LIST" => $parameters, "HAS_GROUPS" => true]);
+                break;
+
+            case "parameters_to_form_definitions" :
+
+                $data = json_decode(InputFilter::magicDequote($httpVars["json_parameters"]), true);
+                $buffer = "<standard_form>";
+                foreach ($data as $repoScope => $pluginsData) {
+                    $buffer .= "<repoScope id='$repoScope'>";
+                    foreach ($pluginsData as $pluginId => $paramData) {
+                        foreach ($paramData as $paramId => $paramValue) {
+                            $query = "//param[@name='$paramId']|//global_param[@name='$paramId']";
+                            $nodes = PluginsService::getInstance($ctx)->searchAllManifests($query, "node", false, true, true);
+                            if(!count($nodes)) continue;
+                            $n = $nodes[0];
+                            if ($n->attributes->getNamedItem("group") != null) {
+                                $n->attributes->getNamedItem("group")->nodeValue = "$pluginId";
+                            } else {
+                                $n->appendChild($n->ownerDocument->createAttribute("group"));
+                                $n->attributes->getNamedItem("group")->nodeValue = "$pluginId";
+                            }
+                            if(is_bool($paramValue)) $paramValue = ($paramValue ? "true" : "false");
+                            if ($n->attributes->getNamedItem("default") != null) {
+                                $n->attributes->getNamedItem("default")->nodeValue = $paramValue;
+                            } else {
+                                $n->appendChild($n->ownerDocument->createAttribute("default"));
+                                $n->attributes->getNamedItem("default")->nodeValue = $paramValue;
+                            }
+                            $buffer .= XMLFilter::resolveKeywords($n->ownerDocument->saveXML($n));
+                        }
+                    }
+                    $buffer .= "</repoScope>";
+                }
+                $buffer .= "</standard_form>";
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream(new XMLDocMessage($buffer)));
+                break;
+
+            default:
+                break;
+        }
+
+        return $responseInterface;
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface Full set of query parameters
+     * @param string $rootPath Path to prepend to the resulting nodes
+     * @param string $relativePath Specific path part for this function
+     * @param string $paginationHash Number added to url#2 for pagination purpose.
+     * @param string $findNodePosition Path to a given node to try to find it
+     * @param string $aliasedDir Aliased path used for alternative url
+     * @return NodesList A populated NodesList object, eventually recursive.
+     * @throws \Pydio\Core\Exception\PydioException
+     */
+    public function listNodes(ServerRequestInterface $requestInterface, $rootPath, $relativePath, $paginationHash = null, $findNodePosition = null, $aliasedDir = null)
+    {
+
+        $relativePath   = "/$relativePath";
+        if($aliasedDir != null && $aliasedDir != "/".$rootPath.$relativePath){
+            $baseDir = $aliasedDir;
+        }else{
+            $baseDir = "/".$rootPath.$relativePath;
+        }
+        $nodesList      = new NodesList($baseDir);
+        $pServ          = PluginsService::getInstance($this->context);
+        $types          = $pServ->getDetectedPlugins();
+        $mess           = LocaleService::getMessages();
+        $uniqTypes      = array("core");
+        $coreTypes      = array("auth", "conf", "boot", "feed", "log", "mailer", "mq");
+
+        if ($relativePath == "/plugins" || $relativePath == "/core_plugins" || $relativePath=="/all") {
+
+            if($relativePath == "/core_plugins") $uniqTypes = $coreTypes;
+            else if($relativePath == "/plugins") $uniqTypes = array_diff(array_keys($types), $coreTypes);
+            else if($relativePath == "/all") $uniqTypes = array_keys($types);
+            $nodesList->initColumnsData("filelist", "detail", "ajxp_conf.plugins_folder");
+            $nodesList->appendColumn("ajxp_conf.101", "ajxp_label");
+            $nodesList->appendColumn("ajxp_conf.103", "plugin_description");
+            $nodesList->appendColumn("ajxp_conf.102", "plugin_id");
+            ksort($types);
+
+            foreach ($types as $t => $tPlugs) {
+                if(!empty($findNodePosition) && $t !== $findNodePosition) continue;
+                if(!in_array($t, $uniqTypes))continue;
+                if($t == "core") continue;
+                $nodeKey = $baseDir."/".$t;
+                $meta = array(
+                    "icon" 		         => "folder_development.png",
+                    "plugin_id"          => $t,
+                    "text"               => $mess["plugtype.title.".$t],
+                    "plugin_description" => $mess["plugtype.desc.".$t],
+                    "is_file"            => false
+                );
+                $this->appendBookmarkMeta($nodeKey, $meta);
+                $nodesList->addBranch(new AJXP_Node($nodeKey, $meta));
+            }
+
+        } else if ($relativePath == "/core") {
+
+            $nodesList->initColumnsData("filelist", "detail", "ajxp_conf.plugins");
+            $nodesList->appendColumn("ajxp_conf.101", "ajxp_label");
+            $nodesList->appendColumn("ajxp_conf.102", "plugin_id");
+            $nodesList->appendColumn("ajxp_conf.103", "plugin_description");
+
+            $all = []; $first = null;
+            foreach ($uniqTypes as $type) {
+                if(!isset($types[$type])) continue;
+                /** @var Plugin $pObject */
+                foreach ($types[$type] as $pObject) {
+                    if(!empty($findNodePosition) && $pObject->getId() !== $findNodePosition) continue;
+
+                    $isMain = ($pObject->getId() == "core.ajaxplorer");
+                    $meta = array(
+                        "icon" 		         => ($isMain?"preferences_desktop.png":"desktop.png"),
+                        "ajxp_mime"          => "ajxp_plugin",
+                        "plugin_id"          => $pObject->getId(),
+                        "plugin_description" => $pObject->getManifestDescription(),
+                        "text"               => $pObject->getManifestLabel()
+                    );
+                    // Check if there are actually any parameters to display!
+                    if($pObject->getManifestRawContent("server_settings", "xml")->length == 0) {
+                        continue;
+                    }
+                    $nodeKey = $baseDir."/".$pObject->getId();
+                    $this->appendBookmarkMeta($nodeKey, $meta);
+                    $plugNode = new AJXP_Node($nodeKey, $meta);
+                    if ($isMain) {
+                        $first = $plugNode;
+                    } else {
+                        $all[] = $plugNode;
+                    }
+                }
+            }
+
+            if($first !== null) $nodesList->addBranch($first);
+            foreach($all as $node) $nodesList->addBranch($node);
+
+        } else {
+            $split = explode("/", $relativePath);
+            if(empty($split[0])) array_shift($split);
+            $type = $split[1];
+
+            $nodesList->initColumnsData("filelist", "full", "ajxp_conf.plugin_detail");
+            $nodesList->appendColumn("ajxp_conf.101", "ajxp_label", "String", "10%");
+            $nodesList->appendColumn("ajxp_conf.102", "plugin_id", "String", "10%");
+            $nodesList->appendColumn("ajxp_conf.103", "plugin_description", "String", "60%");
+            $nodesList->appendColumn("ajxp_conf.104", "enabled", "String", "10%");
+            $nodesList->appendColumn("ajxp_conf.105", "can_active", "String", "10%");
+
+            $mess = LocaleService::getMessages();
+            /** @var Plugin $pObject */
+            foreach ($types[$type] as $pObject) {
+                if(!empty($findNodePosition) && $pObject->getId() !== $findNodePosition) continue;
+                $errors = "OK";
+                try {
+                    $pObject->performChecks();
+                } catch (\Exception $e) {
+                    $errors = "ERROR : ".$e->getMessage();
+                }
+                $meta = array(
+                    "icon" 		    => "preferences_plugin.png",
+                    "text"          => $pObject->getManifestLabel(),
+                    "ajxp_mime"     => "ajxp_plugin",
+                    "can_active"	=> $errors,
+                    "enabled"	    => ($pObject->isEnabled()?$mess[440]:$mess[441]),
+                    "plugin_id"     => $pObject->getId(),
+                    "plugin_description" => $pObject->getManifestDescription()
+                );
+                $nodeKey = $baseDir."/".$pObject->getId();
+                $this->appendBookmarkMeta($nodeKey, $meta);
+                $nodesList->addBranch(new AJXP_Node($nodeKey, $meta));
+            }
+        }
+        return $nodesList;
+
+    }
+
+    /**
+     * @param $result
+     * @param $definitions
+     * @param $values
+     * @param string $parent
+     */
+    protected function flattenKeyValues(&$result, &$definitions, $values, $parent = "")
+    {
+        foreach ($values as $key => $value) {
+            if (is_array($value)) {
+                $this->flattenKeyValues($result, $definitions, $value, $parent."/".$key);
+            } else {
+                if ($key == "instance_name") {
+                    $result[$parent] = $value;
+                }
+                if ($key == "group_switch_value") {
+                    $result[$parent] = $value;
+                } else {
+                    $result[$parent.'/'.$key] = $value;
+                    if(isSet($definitions[$key])){
+                        $definitions[$parent.'/'.$key] = $definitions[$key];
+                    }else if(isSet($definitions[dirname($parent)."/".$key])){
+                        $definitions[$parent.'/'.$key] = $definitions[dirname($parent)."/".$key];
+                    }
+                }
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/access.ajxp_conf/src/RepositoriesManager.php b/core/src/plugins/access.ajxp_conf/src/RepositoriesManager.php
new file mode 100644
index 0000000000..dce6aa7990
--- /dev/null
+++ b/core/src/plugins/access.ajxp_conf/src/RepositoriesManager.php
@@ -0,0 +1,1187 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Access\Driver\DataProvider\Provisioning;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Access\Core\Filter\AJXP_PermissionMask;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\NodesList;
+use Pydio\Access\Core\Model\Repository;
+use Pydio\Core\Utils\Vars\XMLFilter;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Http\Message\ReloadMessage;
+use Pydio\Core\Http\Message\UserMessage;
+use Pydio\Core\Http\Message\XMLDocMessage;
+use Pydio\Core\Http\Response\SerializableResponseStream;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Model\RepositoryInterface;
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\AuthService;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Services\RolesService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\StringHelper;
+use Pydio\Core\Utils\XMLHelper;
+use Pydio\Tests\AbstractTest;
+use Zend\Diactoros\Response\JsonResponse;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class RepositoriesManager
+ * @package Pydio\Access\Driver\DataProvider\Provisioning
+ */
+class RepositoriesManager extends AbstractManager
+{
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @return ResponseInterface
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public function repositoriesActions(ServerRequestInterface $requestInterface, ResponseInterface $responseInterface){
+
+        $action     = $requestInterface->getAttribute("action");
+        /** @var ContextInterface $ctx */
+        $ctx        = $requestInterface->getAttribute("ctx");
+        $httpVars   = $requestInterface->getParsedBody();
+        $mess       = LocaleService::getMessages();
+        $currentAdminBasePath = "/";
+        $loggedUser = $ctx->getUser();
+        if ($loggedUser!=null && $loggedUser->getGroupPath()!=null) {
+            $currentAdminBasePath = $loggedUser->getGroupPath();
+        }
+
+        switch ($action){
+
+            // REPOSITORIES
+            case "get_drivers_definition":
+
+                $buffer = "<drivers allowed='".($this->currentUserIsGroupAdmin() ? "false" : "true")."'>";
+                $buffer .= XMLFilter::resolveKeywords(self::availableDriversToXML("param", "", true));
+                $buffer .= "</drivers>";
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream(new XMLDocMessage($buffer)));
+
+                break;
+
+            case "get_templates_definition":
+
+                $buffer = "<repository_templates>";
+                $count = 0;
+                $repositories = RepositoryService::listRepositoriesWithCriteria(array(
+                    "isTemplate" => '1'
+                ), $count);
+                foreach ($repositories as $repo) {
+                    if(!$repo->isTemplate()) continue;
+                    $repoId = $repo->getUniqueId();
+                    $repoLabel = $repo->getDisplay();
+                    $repoType = $repo->getAccessType();
+                    $buffer .= "<template repository_id=\"$repoId\" repository_label=\"$repoLabel\" repository_type=\"$repoType\">";
+                    foreach ($repo->getOptionsDefined() as $optionName) {
+                        $buffer .= "<option name=\"$optionName\"/>";
+                    }
+                    $buffer .= "</template>";
+                }
+                $buffer .= "</repository_templates>";
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream(new XMLDocMessage($buffer)));
+
+                break;
+
+            case "create_repository" :
+
+                $repDef = $httpVars;
+                $isTemplate = isSet($httpVars["sf_checkboxes_active"]);
+                unset($repDef["get_action"]);
+                unset($repDef["sf_checkboxes_active"]);
+                if (isSet($httpVars["json_data"])) {
+                    $repDef = json_decode(InputFilter::magicDequote($httpVars["json_data"]), true);
+                    $options = $repDef["DRIVER_OPTIONS"];
+                } else {
+                    $options = array();
+                    $this->parseParameters($ctx, $repDef, $options, true);
+                }
+                if (count($options)) {
+                    $repDef["DRIVER_OPTIONS"] = $options;
+                    unset($repDef["DRIVER_OPTIONS"]["AJXP_GROUP_PATH_PARAMETER"]);
+                    if(isSet($options["AJXP_SLUG"])){
+                        $repDef["AJXP_SLUG"] = $options["AJXP_SLUG"];
+                        unset($repDef["DRIVER_OPTIONS"]["AJXP_SLUG"]);
+                    }
+                }
+                if (strstr($repDef["DRIVER"], "ajxp_template_") !== false) {
+                    $templateId = substr($repDef["DRIVER"], 14);
+                    $templateRepo = RepositoryService::getRepositoryById($templateId);
+                    $newRep = $templateRepo->createTemplateChild($repDef["DISPLAY"], $repDef["DRIVER_OPTIONS"], $ctx->getUser()->getId());
+                    if(isSet($repDef["AJXP_SLUG"])){
+                        $newRep->setSlug($repDef["AJXP_SLUG"]);
+                    }
+                } else {
+                    if ($this->currentUserIsGroupAdmin()) {
+                        throw new \Exception("You are not allowed to create a workspace from a driver. Use a template instead.");
+                    }
+                    $pServ = PluginsService::getInstance($ctx);
+                    $driver = $pServ->getPluginByTypeName("access", $repDef["DRIVER"]);
+
+                    $newRep = RepositoryService::createRepositoryFromArray(0, $repDef);
+                    $testFile = $driver->getBaseDir()."/test.".$newRep->getAccessType()."Access.php";
+                    if (!$isTemplate && is_file($testFile)) {
+                        //chdir(AJXP_TESTS_FOLDER."/plugins");
+                        $className = "\\Pydio\\Tests\\".$newRep->getAccessType()."AccessTest";
+                        if (!class_exists($className))
+                            include($testFile);
+                        $class = new $className();
+                        $result = $class->doRepositoryTest($newRep);
+                        if (!$result) {
+                            throw new PydioException($class->failedInfo);
+                        }
+                    }
+                    // Apply default metasource if any
+                    if ($driver != null && $driver->getConfigs()!=null ) {
+                        $confs = $driver->getConfigs();
+                        if (!empty($confs["DEFAULT_METASOURCES"])) {
+                            $metaIds = InputFilter::parseCSL($confs["DEFAULT_METASOURCES"]);
+                            $metaSourceOptions = array();
+                            foreach ($metaIds as $metaID) {
+                                $metaPlug = $pServ->getPluginById($metaID);
+                                if($metaPlug == null) continue;
+                                $pNodes = $metaPlug->getManifestRawContent("//param[@default]", "nodes");
+                                $defaultParams = array();
+                                /** @var \DOMElement $domNode */
+                                foreach ($pNodes as $domNode) {
+                                    $defaultParams[$domNode->getAttribute("name")] = $domNode->getAttribute("default");
+                                }
+                                $metaSourceOptions[$metaID] = $defaultParams;
+                            }
+                            $newRep->addOption("META_SOURCES", $metaSourceOptions);
+                        }
+                    }
+                }
+
+                if ($this->repositoryExists($newRep->getDisplay())) {
+                    throw new PydioException($mess["ajxp_conf.50"]);
+                }
+                if ($isTemplate) {
+                    $newRep->isTemplate = true;
+                }
+                if ($this->currentUserIsGroupAdmin()) {
+                    $newRep->setGroupPath($ctx->getUser()->getGroupPath());
+                } else if (!empty($options["AJXP_GROUP_PATH_PARAMETER"])) {
+                    $value = InputFilter::securePath(rtrim($currentAdminBasePath, "/") . "/" . ltrim($options["AJXP_GROUP_PATH_PARAMETER"], "/"));
+                    $newRep->setGroupPath($value);
+                }
+
+                $res = RepositoryService::addRepository($newRep);
+
+                if ($res == -1) {
+                    throw new PydioException($mess["ajxp_conf.51"]);
+
+                }
+
+                $defaultRights = $newRep->getDefaultRight();
+                if(!empty($defaultRights)){
+                    $groupRole = RolesService::getOrCreateRole("AJXP_GRP_" . $currentAdminBasePath, $currentAdminBasePath);
+                    $groupRole->setAcl($newRep->getId(), $defaultRights);
+                }
+                $loggedUser = $ctx->getUser();
+                $loggedUser->getPersonalRole()->setAcl($newRep->getUniqueId(), "rw");
+                $loggedUser->recomputeMergedRole();
+                $loggedUser->save("superuser");
+                AuthService::updateSessionUser($loggedUser);
+
+                $message = new UserMessage($mess["ajxp_conf.52"]);
+                $reload = new ReloadMessage("", $newRep->getUniqueId());
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream([$message, $reload]));
+
+                break;
+
+            case "post_repository":
+                $jsonDataCreateWorkspace = json_decode($httpVars["payload"], true);
+                if ($jsonDataCreateWorkspace === null) {
+                    throw new PydioException("Invalid JSON !!");
+                }
+                if(!isSet($jsonDataCreateWorkspace["isTemplate"])) {
+                    $jsonDataCreateWorkspace["isTemplate"] = false;
+                }
+                if(!isSet($jsonDataCreateWorkspace["id"])) {
+                    $jsonDataCreateWorkspace["id"] = 0;
+                }
+                if(!isSet($jsonDataCreateWorkspace["parameters"]["CREATE"])) {
+                    $jsonDataCreateWorkspace["parameters"]["CREATE"] = true;
+                }
+                $repo = new Repository($jsonDataCreateWorkspace["id"], $jsonDataCreateWorkspace["display"], $jsonDataCreateWorkspace["accessType"]);
+                foreach($jsonDataCreateWorkspace["parameters"] as $name => $value) {
+                    $repo->addOption($name, $value);
+                }
+                $pluginService = PluginsService::getInstance($ctx);
+                $driver = $pluginService->getPluginByTypeName("access", $jsonDataCreateWorkspace["accessType"]);
+                $testFile = $driver->getBaseDir()."/test.".$repo->getAccessType()."Access.php";
+                if (!$jsonDataCreateWorkspace["isTemplate"] && is_file($testFile)) {
+                    $className = "\\Pydio\\Tests\\".$repo->getAccessType()."AccessTest";
+                    if (!class_exists($className))
+                        include($testFile);
+                    /** @var AbstractTest $class */
+                    $class = new $className();
+                    $result = $class->doRepositoryTest($repo);
+                    if (!$result) {
+                        throw new PydioException($class->failedInfo);
+                    }
+                }
+                if ($driver != null && $driver->getConfigs() != null) {
+                    $arrayDefaultMetasources = array();
+                    $arrayPluginToOverWrite = array();
+                    $metaSourceOptions = array();
+                    $configsDriver = $driver->getConfigs();
+                    if (!empty($configsDriver["DEFAULT_METASOURCES"])) {
+                        $arrayDefaultMetasources = InputFilter::parseCSL($configsDriver["DEFAULT_METASOURCES"]);
+                        foreach ($arrayDefaultMetasources as $metaID) {
+                            $metaPlug = $pluginService->getPluginById($metaID);
+                            if($metaPlug == null) continue;
+                            $pNodes = $metaPlug->getManifestRawContent("//param[@default]", "nodes");
+                            $defaultParams = array();
+                            /** @var \DOMElement $domNode */
+                            foreach ($pNodes as $domNode) {
+                                $defaultParams[$domNode->getAttribute("name")] = $domNode->getAttribute("default");
+                            }
+                            $metaSourceOptions[$metaID] = $defaultParams;
+                        }
+                    }
+                    if(isSet($jsonDataCreateWorkspace["features"])) {
+                        foreach($arrayDefaultMetasources as $defaultPluginName) {
+                            foreach($jsonDataCreateWorkspace["features"] as $pluginName => $arrayPluginValue) {
+                                if ($defaultPluginName === $pluginName) {
+                                    $arrayPluginToOverWrite[$pluginName] = $arrayPluginValue;
+                                    unset($jsonDataCreateWorkspace["features"][$pluginName]);
+                                }
+                            }
+                        }
+                        $arrayPluginToAdd = $jsonDataCreateWorkspace["features"];
+                        foreach($arrayPluginToOverWrite as $pluginName => $arrayPlugin) {
+                            if(!empty($arrayPlugin)) {
+                                foreach($arrayPlugin as $name => $value) {
+                                    $metaSourceOptions[$pluginName][$name] = $value;
+                                }
+                            }
+                        }
+                        $metaSourceOptions = array_merge($metaSourceOptions, $arrayPluginToAdd);
+                    }
+                    $repo->addOption("META_SOURCES", $metaSourceOptions);
+                }
+                if ($this->repositoryExists($repo->getDisplay())) {
+                    throw new PydioException($mess["ajxp_conf.50"]);
+                }
+                if ($jsonDataCreateWorkspace["isTemplate"]) {
+                    $repo->isTemplate = true;
+                }
+                if ($this->currentUserIsGroupAdmin()) {
+                    $repo->setGroupPath($ctx->getUser()->getGroupPath());
+                } else if (!empty($options["AJXP_GROUP_PATH_PARAMETER"])) {
+                    $value = InputFilter::securePath(rtrim($currentAdminBasePath, "/") . "/" . ltrim($options["AJXP_GROUP_PATH_PARAMETER"], "/"));
+                    $repo->setGroupPath($value);
+                }
+                $res = RepositoryService::addRepository($repo);
+                if ($res == -1) {
+                    throw new PydioException($mess["ajxp_conf.51"]);
+                }
+                $defaultRights = $repo->getDefaultRight();
+                if(!empty($defaultRights)){
+                    $groupRole = RolesService::getOrCreateRole("AJXP_GRP_" . $currentAdminBasePath, $currentAdminBasePath);
+                    $groupRole->setAcl($repo->getId(), $defaultRights);
+                }
+                $loggedUser = $ctx->getUser();
+                $loggedUser->getPersonalRole()->setAcl($repo->getUniqueId(), "rw");
+                $loggedUser->recomputeMergedRole();
+                $loggedUser->save("superuser");
+                AuthService::updateSessionUser($loggedUser);
+                #@TODO: create different message because this action is doing via API
+                $message = new UserMessage($mess["ajxp_conf.52"]);
+                $reload = new ReloadMessage("", $repo->getUniqueId());
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream([$message, $reload]));
+                break;
+
+            case "patch_repository":
+                $jsonDataEditWorkspace = json_decode($httpVars["payload"], true);
+                if ($jsonDataEditWorkspace === null) {
+                    throw new PydioException("Invalid JSON !!");
+                }
+                $workspaceId = $httpVars["workspaceId"];
+                $repo = RepositoryService::findRepositoryByIdOrAlias($workspaceId);
+                if ($repo === null) {
+                    throw new PydioException("Workspace not found !!");
+                }
+                foreach ($jsonDataEditWorkspace as $name => $value) {
+                    if($name !== "parameters" && $name !== "features") {
+                        $repo->$name = $value;
+                    }
+                }
+                foreach($jsonDataEditWorkspace["parameters"] as $name => $value) {
+                    $repo->addOption($name, $value);
+                }
+                $pluginService = PluginsService::getInstance($ctx);
+                $driver = $pluginService->getPluginByTypeName("access", $repo->getAccessType());
+                if ($driver != null && $driver->getConfigs() != null) {
+                    $arrayPluginToOverWrite = array();
+                    $arrayWorkspaceMetasources = $repo->getSafeOption("META_SOURCES");
+                    if(isSet($jsonDataEditWorkspace["features"])) {
+                        foreach($arrayWorkspaceMetasources as $metaSourcePluginName => $metaSourcePluginArray) {
+                            foreach($jsonDataEditWorkspace["features"] as $pluginName => $arrayPluginValue) {
+                                if ($metaSourcePluginName === $pluginName) {
+                                    $arrayPluginToOverWrite[$pluginName] = $arrayPluginValue;
+                                    unset($jsonDataEditWorkspace["features"][$pluginName]);
+                                }
+                            }
+                        }
+                        $arrayPluginToAdd = $jsonDataEditWorkspace["features"];
+                        foreach($arrayPluginToOverWrite as $pluginName => $arrayPlugin) {
+                            if(!empty($arrayPlugin)) {
+                                foreach($arrayPlugin as $name => $value) {
+                                    $arrayWorkspaceMetasources[$pluginName][$name] = $value;
+                                }
+                            }
+                        }
+                        $arrayWorkspaceMetasources = array_merge($arrayWorkspaceMetasources, $arrayPluginToAdd);
+                    }
+                    $repo->addOption("META_SOURCES", $arrayWorkspaceMetasources);
+                }
+                RepositoryService::replaceRepository($workspaceId, $repo);
+                $message = new UserMessage("Workspace successfully edited !!");
+                $reload = new ReloadMessage("", $repo->getUniqueId());
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream([$message, $reload]));
+                break;
+
+            case "edit_repository_label" :
+            case "edit_repository_data" :
+
+                $repId                  = $httpVars["repository_id"];
+                $repo                   = RepositoryService::getRepositoryById($repId);
+                $initialDefaultRights   = $repo->getDefaultRight();
+
+                if(!$repo->isWriteable()){
+
+                    if (isSet($httpVars["permission_mask"]) && !empty($httpVars["permission_mask"])){
+
+                        $mask = json_decode($httpVars["permission_mask"], true);
+                        $rootGroup = RolesService::getRole("AJXP_GRP_/");
+                        if(count($mask)){
+                            $perm = new AJXP_PermissionMask($mask);
+                            $rootGroup->setMask($repId, $perm);
+                        }else{
+                            $rootGroup->clearMask($repId);
+                        }
+                        RolesService::updateRole($rootGroup);
+
+                        $responseInterface = $responseInterface->withBody(new SerializableResponseStream(new UserMessage("The permission mask was updated for this workspace")));
+                        break;
+
+                    }else{
+
+                        throw new PydioException("This workspace is not writeable. Please edit directly the conf/bootstrap_repositories.php file.");
+
+                    }
+                }
+
+                $res = 0;
+                if (isSet($httpVars["newLabel"])) {
+                    $newLabel = InputFilter::sanitize(InputFilter::securePath($httpVars["newLabel"]), InputFilter::SANITIZE_HTML);
+                    if ($this->repositoryExists($newLabel)) {
+                        throw new PydioException($mess["ajxp_conf.50"]);
+                    }
+                    $repo->setDisplay($newLabel);
+                    $res = RepositoryService::replaceRepository($repId, $repo);
+                } else {
+                    $options = array();
+                    $existing = $repo->getOptionsDefined();
+                    $existingValues = array();
+                    if(!$repo->isTemplate()){
+                        foreach($existing as $exK) {
+                            $existingValues[$exK] = $repo->getSafeOption($exK);
+                        }
+                    }
+                    $this->parseParameters($ctx, $httpVars, $options, true, $existingValues);
+                    if (count($options)) {
+                        foreach ($options as $key=>$value) {
+                            if ($key == "AJXP_SLUG") {
+                                $repo->setSlug($value);
+                                continue;
+                            } else if ($key == "WORKSPACE_LABEL" || $key == "TEMPLATE_LABEL"){
+                                $newLabel = InputFilter::sanitize($value, InputFilter::SANITIZE_HTML);
+                                if($repo->getDisplay() != $newLabel){
+                                    if ($this->repositoryExists($newLabel)) {
+                                        throw new \Exception($mess["ajxp_conf.50"]);
+                                    }else{
+                                        $repo->setDisplay($newLabel);
+                                    }
+                                }
+                            } elseif ($key == "AJXP_GROUP_PATH_PARAMETER") {
+                                $value = InputFilter::securePath(rtrim($currentAdminBasePath, "/") . "/" . ltrim($value, "/"));
+                                $repo->setGroupPath($value);
+                                continue;
+                            }
+                            $repo->addOption($key, $value);
+                        }
+                    }
+                    if($repo->isTemplate()){
+                        foreach($existing as $definedOption){
+                            if($definedOption == "META_SOURCES" || $definedOption == "CREATION_TIME" || $definedOption == "CREATION_USER"){
+                                continue;
+                            }
+                            if(!isSet($options[$definedOption]) && isSet($repo->options[$definedOption])){
+                                unset($repo->options[$definedOption]);
+                            }
+                        }
+                    }
+                    /*
+                     * THIS SEEM TO BE DUPLICATED LOWER IN THE CODE!
+                    if ($repo->getContextOption($ctx, "DEFAULT_RIGHTS")) {
+                        $gp = $repo->getGroupPath();
+                        if (empty($gp) || $gp == "/") {
+                            $defRole = RolesService::getRole("AJXP_GRP_/");
+                        } else {
+                            $defRole = RolesService::getOrCreateRole("AJXP_GRP_" . $gp, $currentAdminBasePath);
+                        }
+                        if ($defRole !== false) {
+                            $defRole->setAcl($repId, $repo->getContextOption($ctx, "DEFAULT_RIGHTS"));
+                            RolesService::updateRole($defRole);
+                        }
+                    }
+                    */
+                    if (is_file(AJXP_TESTS_FOLDER."/plugins/test.ajxp_".$repo->getAccessType().".php")) {
+                        chdir(AJXP_TESTS_FOLDER."/plugins");
+                        include(AJXP_TESTS_FOLDER."/plugins/test.ajxp_".$repo->getAccessType().".php");
+                        $className = "ajxp_".$repo->getAccessType();
+                        /** @var AbstractTest $class */
+                        $class = new $className();
+                        $result = $class->doRepositoryTest($repo);
+                        if (!$result) {
+                            throw new PydioException($class->failedInfo);
+                        }
+                    }
+
+                    $rootGroup = RolesService::getOrCreateRole("AJXP_GRP_" . $currentAdminBasePath, $currentAdminBasePath);
+                    if (isSet($httpVars["permission_mask"]) && !empty($httpVars["permission_mask"])){
+                        $mask = json_decode($httpVars["permission_mask"], true);
+                        if(count($mask)){
+                            $perm = new AJXP_PermissionMask($mask);
+                            $rootGroup->setMask($repId, $perm);
+                        }else{
+                            $rootGroup->clearMask($repId);
+                        }
+                        RolesService::updateRole($rootGroup);
+                    }
+                    $defaultRights = $repo->getDefaultRight();
+                    if($defaultRights != $initialDefaultRights){
+                        $currentDefaultRights = $rootGroup->getAcl($repId);
+                        if(!empty($defaultRights) || !empty($currentDefaultRights)){
+                            $rootGroup->setAcl($repId, empty($defaultRights) ? "" : $defaultRights);
+                            RolesService::updateRole($rootGroup);
+                        }
+                    }
+                    RepositoryService::replaceRepository($repId, $repo);
+                }
+                if ($res == -1) {
+                    throw new PydioException($mess["ajxp_conf.53"]);
+                }
+
+                $chunks = [];
+                $chunks[] = new UserMessage($mess["ajxp_conf.54"]);
+                if (isSet($httpVars["newLabel"])) {
+                    $chunks[] = new ReloadMessage("", $repId);
+                }
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream($chunks));
+
+                break;
+
+            case "edit_repository" :
+
+                if(isSet($httpVars["workspaceId"])){
+                    $repId = $httpVars["workspaceId"];
+                }else{
+                    $repId = $httpVars["repository_id"];
+                }
+                $format = isSet($httpVars["format"]) && $httpVars["format"] == "json" ? "json" : "xml";
+
+                $repository = RepositoryService::findRepositoryByIdOrAlias($repId);
+                if ($repository == null) {
+                    throw new \Exception("Cannot find workspace with id $repId");
+                }
+                if ($ctx->hasUser() && !$ctx->getUser()->canAdministrate($repository)) {
+                    throw new \Exception("You are not allowed to edit this workspace!");
+                }
+                $pServ = PluginsService::getInstance($ctx);
+                /** @var AbstractAccessDriver $plug */
+                $plug = $pServ->getPluginById("access.".$repository->getAccessType());
+                if ($plug == null) {
+                    throw new \Exception("Cannot find access driver (".$repository->getAccessType().") for workspace!");
+                }
+                $slug = $repository->getSlug();
+                if ($slug == "" && $repository->isWriteable()) {
+                    $repository->setSlug();
+                    RepositoryService::replaceRepository($repId, $repository);
+                }
+                $ctxUser = $ctx->getUser();
+                if ($ctxUser!=null && $ctxUser->getGroupPath() != null) {
+                    $rgp = $repository->getGroupPath();
+                    if($rgp == null) $rgp = "/";
+                    if (strlen($rgp) < strlen($ctxUser->getGroupPath())) {
+                        $repository->setWriteable(false);
+                    }
+                }
+
+                $definitions = $plug->getConfigsDefinitions();
+                if($format === "json"){
+                    $data = $this->serializeRepositoryToJSON($ctx, $repository, $definitions, $currentAdminBasePath);
+                    if(isSet($httpVars["load_fill_values"]) && $httpVars["load_fill_values"] === "true"){
+                        $data["PARAMETERS_INFO"] = $this->serializeRepositoryDriverInfos($pServ, $format, $plug, $repository);
+                    }
+                    $responseInterface = new JsonResponse($data);
+                }else{
+                    $buffer = "<admin_data>";
+                    $buffer .= $this->serializeRepositoryToXML($ctx, $repository, $definitions, $currentAdminBasePath);
+                    $buffer .= $this->serializeRepositoryDriverInfos($pServ, $format, $plug, $repository);
+                    $buffer .= "</admin_data>";
+                    $responseInterface = $responseInterface->withBody(new SerializableResponseStream(new XMLDocMessage($buffer)));
+                }
+
+                break;
+
+            case "meta_source_add" :
+
+                $repId      = InputFilter::sanitize(isSet($httpVars["workspaceId"]) ? $httpVars["workspaceId"] : $httpVars["repository_id"]);
+                $metaId     = InputFilter::sanitize(isSet($httpVars["metaId"]) ? $httpVars["metaId"] : $httpVars["new_meta_source"]);
+                $repo       = RepositoryService::findRepositoryByIdOrAlias($repId);
+
+                if (!is_object($repo)) {
+                    throw new PydioException("Invalid workspace id! $repId");
+                }
+                list($type, $name) = explode(".", $metaId);
+                if(PluginsService::findPluginWithoutCtxt($type, $name) === false){
+                    throw new PydioException("Cannot find plugin with id $metaId");
+                }
+                if(isSet($httpVars["request_body"])){
+                    $options = $httpVars["request_body"];
+                }else if (isSet($httpVars["json_data"])) {
+                    $options = json_decode(InputFilter::magicDequote($httpVars["json_data"]), true);
+                } else {
+                    $options = array();
+                    $this->parseParameters($ctx, $httpVars, $options, true);
+                }
+
+                $repoOptions = $repo->getContextOption($ctx, "META_SOURCES");
+                if (is_array($repoOptions) && isSet($repoOptions[$metaId])) {
+                    throw new PydioException($mess["ajxp_conf.55"]);
+                }
+                if (!is_array($repoOptions)) {
+                    $repoOptions = array();
+                }
+                $repoOptions[$metaId] = $options;
+                uksort($repoOptions, array($this,"metaSourceOrderingFunction"));
+                $repo->addOption("META_SOURCES", $repoOptions);
+                RepositoryService::replaceRepository($repId, $repo);
+
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream(new UserMessage($mess["ajxp_conf.56"])));
+
+                break;
+
+            case "meta_source_delete" :
+
+                $repId        = InputFilter::sanitize(isSet($httpVars["workspaceId"]) ? $httpVars["workspaceId"] : $httpVars["repository_id"]);
+                $metaSourceId = InputFilter::sanitize(isSet($httpVars["metaId"]) ? $httpVars["metaId"] : $httpVars["plugId"]);
+                $repo         = RepositoryService::findRepositoryByIdOrAlias($repId);
+                if (!is_object($repo)) {
+                    throw new PydioException("Invalid workspace id! $repId");
+                }
+
+                $repoOptions = $repo->getContextOption($ctx, "META_SOURCES");
+                if (is_array($repoOptions) && array_key_exists($metaSourceId, $repoOptions)) {
+                    unset($repoOptions[$metaSourceId]);
+                    uksort($repoOptions, array($this,"metaSourceOrderingFunction"));
+                    $repo->addOption("META_SOURCES", $repoOptions);
+                    RepositoryService::replaceRepository($repId, $repo);
+                }else{
+                    throw new PydioException("Cannot find meta source ".$metaSourceId);
+                }
+
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream(new UserMessage($mess["ajxp_conf.57"])));
+
+                break;
+
+            case "meta_source_edit" :
+
+                $repId        = InputFilter::sanitize(isSet($httpVars["workspaceId"]) ? $httpVars["workspaceId"] : $httpVars["repository_id"]);
+                $repo         = RepositoryService::findRepositoryByIdOrAlias($repId);
+                if (!is_object($repo)) {
+                    throw new PydioException("Invalid workspace id! $repId");
+                }
+                if (isSet($httpVars["bulk_data"])) {
+                    $bulkData = json_decode(InputFilter::magicDequote($httpVars["bulk_data"]), true);
+                    $repoOptions = $repo->getContextOption($ctx, "META_SOURCES");
+                    if (!is_array($repoOptions)) {
+                        $repoOptions = array();
+                    }
+                    if (isSet($bulkData["delete"]) && count($bulkData["delete"])) {
+                        foreach ($bulkData["delete"] as $key) {
+                            if (isSet($repoOptions[$key])) unset($repoOptions[$key]);
+                        }
+                    }
+                    if (isSet($bulkData["add"]) && count($bulkData["add"])) {
+                        foreach ($bulkData["add"] as $key => $value) {
+                            if (isSet($repoOptions[$key])) $this->mergeExistingParameters($value, $repoOptions[$key]);
+                            $repoOptions[$key] = $value;
+                        }
+                    }
+                    if (isSet($bulkData["edit"]) && count($bulkData["edit"])) {
+                        foreach ($bulkData["edit"] as $key => $value) {
+                            if (isSet($repoOptions[$key])) $this->mergeExistingParameters($value, $repoOptions[$key]);
+                            $repoOptions[$key] = $value;
+                        }
+                    }
+                } else {
+                    $metaSourceId = InputFilter::sanitize(isSet($httpVars["metaId"]) ? $httpVars["metaId"] : $httpVars["plugId"]);
+                    $repoOptions = $repo->getContextOption($ctx, "META_SOURCES");
+                    if (!is_array($repoOptions)) {
+                        $repoOptions = array();
+                    }
+                    if(isSet($httpVars["request_body"])){
+                        $options = $httpVars["request_body"];
+                    }else if (isSet($httpVars["json_data"])) {
+                        $options = json_decode(InputFilter::magicDequote($httpVars["json_data"]), true);
+                    } else {
+                        $options = array();
+                        $this->parseParameters($ctx, $httpVars, $options, true);
+                    }
+                    if (isset($repoOptions[$metaSourceId])) {
+                        $this->mergeExistingParameters($options, $repoOptions[$metaSourceId]);
+                    }
+                    $repoOptions[$metaSourceId] = $options;
+                }
+                uksort($repoOptions, array($this,"metaSourceOrderingFunction"));
+                $repo->addOption("META_SOURCES", $repoOptions);
+                RepositoryService::replaceRepository($repId, $repo);
+
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream(new UserMessage($mess["ajxp_conf.58"])));
+                break;
+
+            case "list_all_repositories_json":
+
+                $repositories = RepositoryService::listAllRepositories();
+                $repoOut = array();
+                foreach ($repositories as $repoObject) {
+                    $repoOut[$repoObject->getId()] = $repoObject->getDisplay();
+                }
+                $mess = LocaleService::getMessages();
+                $responseInterface = new JsonResponse(["LEGEND" => $mess["ajxp_conf.150"], "LIST" => $repoOut]);
+
+                break;
+
+            default:
+                break;
+
+        }
+
+        return $responseInterface;
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @return ResponseInterface
+     * @throws PydioException
+     */
+    public function delete(ServerRequestInterface $requestInterface, ResponseInterface $responseInterface){
+
+        $mess = LocaleService::getMessages();
+        $httpVars = $requestInterface->getParsedBody();
+
+        $repId        = InputFilter::sanitize(isSet($httpVars["workspaceId"]) ? $httpVars["workspaceId"] : $httpVars["repository_id"]);
+        $repo         = RepositoryService::findRepositoryByIdOrAlias($repId);
+        if(!is_object($repo)){
+            $res = -1;
+        }else{
+            $res = RepositoryService::deleteRepository($repId);
+        }
+        if ($res == -1) {
+            throw new PydioException($mess[427]);
+        }
+
+        $message = new UserMessage($mess["ajxp_conf.59"]);
+        $reload = new ReloadMessage();
+        return $responseInterface->withBody(new SerializableResponseStream([$message, $reload]));
+
+    }
+
+
+    /**
+     * @param ServerRequestInterface $requestInterface Full set of query parameters
+     * @param string $rootPath Path to prepend to the resulting nodes
+     * @param string $relativePath Specific path part for this function
+     * @param string $paginationHash Number added to url#2 for pagination purpose.
+     * @param string $findNodePosition Path to a given node to try to find it
+     * @param string $aliasedDir Aliased path used for alternative url
+     * @return NodesList A populated NodesList object, eventually recursive.
+     */
+    public function listNodes(ServerRequestInterface $requestInterface, $rootPath, $relativePath, $paginationHash = null, $findNodePosition = null, $aliasedDir = null)
+    {
+        $fullBasePath       = "/" . $rootPath . "/" . $relativePath;
+        $REPOS_PER_PAGE     = 50;
+        $paginationHash     = $paginationHash === null ? 1 : $paginationHash;
+        $offset             = ($paginationHash - 1) * $REPOS_PER_PAGE;
+        $count              = null;
+        $ctxUser            = $this->context->getUser();
+        $nodesList          = new NodesList($fullBasePath);
+        $v2Api              = $requestInterface->getAttribute("api") === "v2";
+
+        // Load all repositories = normal, templates, and templates children
+        $criteria = array(
+            "ORDERBY"       => array("KEY" => "display", "DIR"=>"ASC"),
+            "CURSOR"        => array("OFFSET" => $offset, "LIMIT" => $REPOS_PER_PAGE)
+        );
+        if($this->currentUserIsGroupAdmin()){
+            $criteria = array_merge($criteria, array(
+                "owner_user_id" => AJXP_FILTER_EMPTY,
+                "groupPath"     => "regexp:/^".str_replace("/", "\/", $ctxUser->getGroupPath()).'/',
+            ));
+        }else{
+            $criteria["parent_uuid"] = AJXP_FILTER_EMPTY;
+        }
+        if(isSet($requestInterface->getParsedBody()["template_children_id"])){
+            $criteria["parent_uuid"] = InputFilter::sanitize($requestInterface->getParsedBody()["template_children_id"], InputFilter::SANITIZE_ALPHANUM);
+        }
+
+        $repos = RepositoryService::listRepositoriesWithCriteria($criteria, $count);
+        $nodesList->initColumnsData("filelist", "list", "ajxp_conf.repositories");
+        $nodesList->setPaginationData($count, $paginationHash, ceil($count / $REPOS_PER_PAGE));
+        $nodesList->appendColumn("ajxp_conf.8", "ajxp_label");
+        $nodesList->appendColumn("ajxp_conf.9", "accessType");
+        $nodesList->appendColumn("ajxp_conf.125", "slug");
+
+        $driverLabels = array();
+
+        foreach ($repos as $repoIndex => $repoObject) {
+
+            if($repoObject->getAccessType() == "ajxp_conf" || $repoObject->getAccessType() == "ajxp_shared") continue;
+            if (!empty($ctxUser) && !$ctxUser->canAdministrate($repoObject))continue;
+            if(is_numeric($repoIndex)) $repoIndex = "".$repoIndex;
+
+            $icon           = "hdd_external_unmount.png";
+            $accessType     = $repoObject->getAccessType();
+            $accessLabel    = $this->getDriverLabel($accessType, $driverLabels);
+            $label          = $repoObject->getDisplay();
+            $editable       = $repoObject->isWriteable();
+            if ($repoObject->isTemplate) {
+                $icon = "hdd_external_mount.png";
+                if ($ctxUser != null && $ctxUser->getGroupPath() != "/") {
+                    $editable = false;
+                }
+            }
+
+            $meta = [
+                "text"          => $label,
+                "repository_id" => $repoIndex,
+                "accessType"	=> ($repoObject->isTemplate?"Template for ":"").$repoObject->getAccessType(),
+                "accessLabel"	=> $accessLabel,
+                "icon"			=> $icon,
+                "owner"			=> ($repoObject->hasOwner()?$repoObject->getOwner():""),
+                "openicon"		=> $icon,
+                "slug"          => $repoObject->getSlug(),
+                "parentname"	=> "/repositories",
+                "ajxp_mime" 	=> "repository".($editable?"_editable":""),
+                "is_template"   => ($repoObject->isTemplate?"true":"false")
+            ];
+
+            $nodeKey = "/data/repositories/$repoIndex";
+            $this->appendBookmarkMeta($nodeKey, $meta);
+            $repoNode = new AJXP_Node($v2Api ? (string)$repoIndex : $nodeKey, $meta);
+            $nodesList->addBranch($repoNode);
+
+            if ($repoObject->isTemplate) {
+                // Now Load children for template repositories
+                $children = RepositoryService::listRepositoriesWithCriteria(array("parent_uuid" => $repoIndex . ""), $count);
+                foreach($children as $childId => $childObject){
+                    if (!empty($ctxUser) && !$ctxUser->canAdministrate($childObject))continue;
+                    if(is_numeric($childId)) $childId = "".$childId;
+                    $meta = array(
+                        "text"          => $childObject->getDisplay(),
+                        "repository_id" => $childId,
+                        "accessType"	=> $childObject->getAccessType(),
+                        "accessLabel"	=> $this->getDriverLabel($childObject->getAccessType(), $driverLabels),
+                        "icon"			=> "repo_child.png",
+                        "slug"          => $childObject->getSlug(),
+                        "owner"			=> ($childObject->hasOwner()?$childObject->getOwner():""),
+                        "openicon"		=> "repo_child.png",
+                        "parentname"	=> "/repositories",
+                        "ajxp_mime" 	=> "repository_editable",
+                        "template_name" => $label
+                    );
+                    $cNodeKey = "/data/repositories/$childId";
+                    $this->appendBookmarkMeta($cNodeKey, $meta);
+                    $repoNode = new AJXP_Node($v2Api ? $childId : $cNodeKey, $meta);
+                    $nodesList->addBranch($repoNode);
+                }
+            }
+        }
+
+        return $nodesList;
+    }
+
+    /**
+     * Get label for an access.* plugin
+     * @param $pluginId
+     * @param $labels
+     * @return mixed|string
+     */
+    protected function getDriverLabel($pluginId, &$labels){
+        if(isSet($labels[$pluginId])){
+            return $labels[$pluginId];
+        }
+        $plugin = PluginsService::getInstance(Context::emptyContext())->getPluginById("access.".$pluginId);
+        if(!is_object($plugin)) {
+            $label = "access.$plugin (plugin disabled!)";
+        }else{
+            $label = $plugin->getManifestLabel();
+        }
+        $labels[$pluginId] = $label;
+        return $label;
+    }
+
+    /**
+     * @param $name
+     * @return bool
+     */
+    public function repositoryExists($name)
+    {
+        RepositoryService::listRepositoriesWithCriteria(array("display" => $name), $count);
+        return $count > 0;
+    }
+
+    /**
+     * Reorder meta sources
+     * @param $key1
+     * @param $key2
+     * @return int
+     */
+    public function metaSourceOrderingFunction($key1, $key2)
+    {
+        $a1 = explode(".", $key1);
+        $t1 = array_shift($a1);
+        $a2 = explode(".", $key2);
+        $t2 = array_shift($a2);
+        if($t1 == "index") return 1;
+        if($t1 == "metastore") return -1;
+        if($t2 == "index") return -1;
+        if($t2 == "metastore") return 1;
+        if($key1 == "meta.git" || $key1 == "meta.svn") return 1;
+        if($key2 == "meta.git" || $key2 == "meta.svn") return -1;
+        return strcmp($key1, $key2);
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param RepositoryInterface $repository
+     * @param array $definitions
+     * @param string $currentAdminBasePath
+     * @return array
+     */
+    protected function serializeRepositoryToJSON(ContextInterface $ctx, $repository, $definitions, $currentAdminBasePath){
+        $nested = [];
+        $buffer = [
+            "id"            => $repository->getId(),
+            "securityScope" => $repository->securityScope()
+        ];
+        if(!$repository->isTemplate()){
+            $buffer["slug"] = $repository->getSlug();
+        }
+        $groupPath = $repository->getGroupPath();
+        if ($groupPath != null) {
+            if($currentAdminBasePath != "/") {
+                $groupPath = substr($repository->getGroupPath(), strlen($currentAdminBasePath));
+            }
+            $buffer["groupPath"]= $groupPath;
+        }
+        foreach ($repository as $name => $option) {
+            if(strstr($name, " ")>-1) continue;
+            if (in_array($name, ["driverInstance", "id", "uuid", "path", "recycle", "create", "enabled"])) continue;
+            if(is_array($option)) {
+                $nested[] = $option;
+            } else{
+                $buffer[$name] = $option;
+            }
+        }
+        if (count($nested)) {
+            $buffer["parameters"]= [];
+
+            foreach ($nested as $option) {
+                foreach ($option as $key => $optValue) {
+                    if(isSet($definitions[$key]) && $definitions[$key]["type"] == "password" && !empty($optValue)){
+                        $optValue = "__AJXP_VALUE_SET__";
+                    }
+                    $buffer["parameters"][$key] = $optValue;
+                }
+            }
+            // Add SLUG?
+            /*
+            if(!empty($buffer["slug"])) {
+                $buffer["PARAMETERS"]["AJXP_SLUG"] = $buffer["slug"];
+            }
+            if(!empty($buffer["groupPath"])) {
+                $buffer["PARAMETERS"]["AJXP_GROUP_PATH_PARAMETER"] = $buffer["groupPath"];
+            }
+            */
+        }
+        if(isSet($buffer["parameters"]) && isSet($buffer["parameters"]["META_SOURCES"])){
+            $buffer["features"] = $buffer["parameters"]["META_SOURCES"];
+            unset($buffer["parameters"]["META_SOURCES"]);
+        }
+        if(!$repository->isTemplate()){
+            $buffer["info"]= [];
+            $users = UsersService::countUsersForRepository($ctx, $repository->getId(), false, true);
+            $cursor = ["count"];
+            $shares = ConfService::getConfStorageImpl()->simpleStoreList("share", $cursor, "", "serial", '', $repository->getId());
+            $buffer["info"] = [
+                "users" => $users,
+                "shares" => count($shares)
+            ];
+            $rootGroup = RolesService::getRole("AJXP_GRP_/");
+            if($rootGroup !== false && $rootGroup->hasMask($repository->getId())){
+                $buffer["mask"]= $rootGroup->getMask($repository->getId());
+            }
+        }
+        if ($repository->hasParent()) {
+            $parent = RepositoryService::getRepositoryById($repository->getParentId());
+            if (isSet($parent) && $parent->isTemplate()) {
+                $parentLabel = $parent->getDisplay();
+                $parentType = $parent->getAccessType();
+                $buffer["TEMPLATE"] = [
+                    "id"    => $repository->getParentId(),
+                    "label" => $parentLabel,
+                    "type"  => $parentType,
+                    "DEFINED_PARAMETERS" => []
+                ];
+                foreach ($parent->getOptionsDefined() as $parentOptionName) {
+                    $buffer["TEMPLATE"]["DEFINED_PARAMETERS"][] = $parentOptionName;
+                }
+            }
+        }
+        return $buffer;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param RepositoryInterface $repository
+     * @param array $definitions
+     * @param string $currentAdminBasePath
+     * @return string
+     */
+    protected function serializeRepositoryToXML(ContextInterface $ctx, $repository, $definitions, $currentAdminBasePath){
+        $nested = [];
+        $buffer = "<repository index=\"".$repository->getId()."\" securityScope=\"".$repository->securityScope()."\"";
+        foreach ($repository as $name => $option) {
+            if(strstr($name, " ")>-1) continue;
+            if ($name == "driverInstance") continue;
+            if (!is_array($option)) {
+                if (is_bool($option)) {
+                    $option = ($option?"true":"false");
+                }
+                $buffer .= " $name=\"".StringHelper::xmlEntities($option, true)."\" ";
+            } else if (is_array($option)) {
+                $nested[] = $option;
+            }
+        }
+        if (count($nested)) {
+            $buffer .= ">" ;
+            foreach ($nested as $option) {
+                foreach ($option as $key => $optValue) {
+                    if (is_array($optValue) && count($optValue)) {
+                        $buffer .= "<param name=\"$key\"><![CDATA[".json_encode($optValue)."]]></param>" ;
+                    } else if (is_object($optValue)){
+                        $buffer .= "<param name=\"$key\"><![CDATA[".json_encode($optValue)."]]></param>";
+                    } else {
+                        if (is_bool($optValue)) {
+                            $optValue = ($optValue?"true":"false");
+                        } else if(isSet($definitions[$key]) && $definitions[$key]["type"] == "password" && !empty($optValue)){
+                            $optValue = "__AJXP_VALUE_SET__";
+                        }
+
+                        $optValue = StringHelper::xmlEntities($optValue, true);
+                        $buffer .= "<param name=\"$key\" value=\"$optValue\"/>";
+                    }
+                }
+            }
+            // Add SLUG
+            if(!$repository->isTemplate()) {
+                $buffer .= "<param name=\"AJXP_SLUG\" value=\"".$repository->getSlug()."\"/>";
+            }
+            if ($repository->getGroupPath() != null) {
+                $groupPath = $repository->getGroupPath();
+                if($currentAdminBasePath != "/") $groupPath = substr($repository->getGroupPath(), strlen($currentAdminBasePath));
+                $buffer .= "<param name=\"AJXP_GROUP_PATH_PARAMETER\" value=\"".$groupPath."\"/>";
+            }
+
+            $buffer .= "</repository>";
+        } else {
+            $buffer .= "/>";
+        }
+        if ($repository->hasParent()) {
+            $parent = RepositoryService::getRepositoryById($repository->getParentId());
+            if (isSet($parent) && $parent->isTemplate()) {
+                $parentLabel = $parent->getDisplay();
+                $parentType = $parent->getAccessType();
+                $buffer .= "<template repository_id=\"".$repository->getParentId()."\" repository_label=\"$parentLabel\" repository_type=\"$parentType\">";
+                foreach ($parent->getOptionsDefined() as $parentOptionName) {
+                    $buffer .= "<option name=\"$parentOptionName\"/>";
+                }
+                $buffer .= "</template>";
+            }
+        }
+        if(!$repository->isTemplate()){
+            $buffer .= "<additional_info>";
+            $users = UsersService::countUsersForRepository($ctx, $repository->getId(), false, true);
+            $cursor = ["count"];
+            $shares = ConfService::getConfStorageImpl()->simpleStoreList("share", $cursor, "", "serial", '', $repository->getId());
+            $buffer .= '<users total="'.$users.'"/>';
+            $buffer .= '<shares total="'.count($shares).'"/>';
+            $rootGroup = RolesService::getRole("AJXP_GRP_/");
+            if($rootGroup !== false && $rootGroup->hasMask($repository->getId())){
+                $buffer .= "<mask><![CDATA[".json_encode($rootGroup->getMask($repository->getId()))."]]></mask>";
+            }
+            $buffer .= "</additional_info>";
+        }
+        return $buffer;
+    }
+
+    /**
+     * @param PluginsService $pServ
+     * @param string $format
+     * @param AbstractAccessDriver $plug
+     * @param RepositoryInterface $repository
+     * @return string|array
+     */
+    protected function serializeRepositoryDriverInfos(PluginsService $pServ, $format, $plug, $repository){
+        $manifest = $plug->getManifestRawContent("server_settings/param");
+        $manifest = XMLFilter::resolveKeywords($manifest);
+        $clientSettings = $plug->getManifestRawContent("client_settings", "xml");
+        $iconClass = "";$descriptionTemplate = "";
+        if($clientSettings->length){
+            $iconClass = $clientSettings->item(0)->getAttribute("iconClass");
+            $descriptionTemplate = $clientSettings->item(0)->getAttribute("description_template");
+        }
+        $metas = $pServ->getPluginsByType("metastore");
+        $metas = array_merge($metas, $pServ->getPluginsByType("meta"));
+        $metas = array_merge($metas, $pServ->getPluginsByType("index"));
+
+        if($format === "xml"){
+            $buffer = "<ajxpdriver name=\"".$repository->getAccessType()."\" label=\"". StringHelper::xmlEntities($plug->getManifestLabel()) ."\" 
+            iconClass=\"$iconClass\" description_template=\"$descriptionTemplate\" 
+            description=\"". StringHelper::xmlEntities($plug->getManifestDescription()) ."\">$manifest</ajxpdriver>";
+
+            $buffer .= "<metasources>";
+            /** @var Plugin $metaPlug */
+            foreach ($metas as $metaPlug) {
+                $buffer .= "<meta id=\"".$metaPlug->getId()."\" label=\"". StringHelper::xmlEntities($metaPlug->getManifestLabel()) ."\" description=\"". StringHelper::xmlEntities($metaPlug->getManifestDescription()) ."\">";
+                $manifest = $metaPlug->getManifestRawContent("server_settings/param");
+                $manifest = XMLFilter::resolveKeywords($manifest);
+                $buffer .= $manifest;
+                $buffer .= "</meta>";
+            }
+            $buffer .= "</metasources>";
+            return $buffer;
+        }else{
+            $dData = [
+                "name" => $repository->getAccessType(),
+                "label" => $plug->getManifestLabel(),
+                "description" => $plug->getManifestDescription(),
+                "iconClass" => $iconClass,
+                "descriptionTemplate" => $descriptionTemplate,
+                "parameters" => $this->xmlServerParamsToArray($manifest)
+            ];
+            $metaSources = [];
+            /** @var Plugin $metaPlug */
+            foreach($metas as $metaPlug){
+                $metaSources[$metaPlug->getId()] = [
+                    "id" => $metaPlug->getId(),
+                    "label" => $metaPlug->getManifestLabel(),
+                    "description" => $metaPlug->getManifestDescription(),
+                    "parameters" => $this->xmlServerParamsToArray(XMLFilter::resolveKeywords($metaPlug->getManifestRawContent("server_settings/param")))
+                ];
+            }
+            $data = ["driver" => $dData, "metasources" => $metaSources];
+            return $data;
+        }
+    }
+
+    /**
+     * @param string $xmlParamsString
+     * @return array
+     */
+    protected function xmlServerParamsToArray($xmlParamsString){
+        $doc = new \DOMDocument();
+        $doc->loadXML("<parameters>$xmlParamsString</parameters>");
+        $result = XMLHelper::xmlToArray($doc, ["attributePrefix" => ""]);
+        if(isSet($result["parameters"]["param"])){
+            return $result["parameters"]["param"];
+        }else{
+            return [];
+        }
+    }
+
+    /**
+     * Search the manifests declaring ajxpdriver as their root node. Remove ajxp_* drivers
+     * @static
+     * @param string $filterByTagName
+     * @param string $filterByDriverName
+     * @param bool $limitToEnabledPlugins
+     * @return string
+     */
+    protected function availableDriversToXML($filterByTagName = "", $filterByDriverName="", $limitToEnabledPlugins = false)
+    {
+        $nodeList = PluginsService::getInstance(Context::emptyContext())->searchAllManifests("//ajxpdriver", "node", false, $limitToEnabledPlugins);
+        $xmlBuffer = "";
+        /** @var \DOMElement $node */
+        foreach ($nodeList as $node) {
+            $dName = $node->getAttribute("name");
+            if($filterByDriverName != "" && $dName != $filterByDriverName) continue;
+            if(strpos($dName, "ajxp_") === 0) continue;
+            if ($filterByTagName == "") {
+                $xmlBuffer .= $node->ownerDocument->saveXML($node);
+                continue;
+            }
+            $q = new \DOMXPath($node->ownerDocument);
+            $cNodes = $q->query("//".$filterByTagName, $node);
+            $xmlBuffer .= "<ajxpdriver ";
+            foreach($node->attributes as $attr) $xmlBuffer.= " $attr->name=\"$attr->value\" ";
+            $xmlBuffer .=">";
+            foreach ($cNodes as $child) {
+                $xmlBuffer .= $child->ownerDocument->saveXML($child);
+            }
+            $xmlBuffer .= "</ajxpdriver>";
+        }
+        return $xmlBuffer;
+    }
+
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/access.ajxp_conf/src/RolesManager.php b/core/src/plugins/access.ajxp_conf/src/RolesManager.php
new file mode 100644
index 0000000000..8dae042bf6
--- /dev/null
+++ b/core/src/plugins/access.ajxp_conf/src/RolesManager.php
@@ -0,0 +1,598 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Access\Driver\DataProvider\Provisioning;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\Filter\AJXP_PermissionMask;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\NodesList;
+use Pydio\Conf\Core\AbstractUser;
+use Pydio\Conf\Core\AJXP_Role;
+use Pydio\Core\Utils\Vars\XMLFilter;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Http\Message\ReloadMessage;
+use Pydio\Core\Http\Message\UserMessage;
+use Pydio\Core\Http\Response\SerializableResponseStream;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Services\RolesService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\OptionsHelper;
+use Pydio\Core\Utils\Vars\PathUtils;
+use Pydio\Log\Core\Logger;
+use Zend\Diactoros\Response\JsonResponse;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class RolesManager
+ * @package Pydio\Access\Driver\DataProvider\Provisioning
+ */
+class RolesManager extends AbstractManager
+{
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @return ServerRequestInterface
+     */
+    public function preprocessApi2Actions(ServerRequestInterface $requestInterface){
+        $vars = $requestInterface->getParsedBody();
+        if(isSet($vars["roleId"])) $vars["role_id"] = $vars["roleId"];
+        return $requestInterface->withParsedBody($vars);
+
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @return ResponseInterface
+     * @throws \Exception
+     * @throws \Pydio\Core\Exception\UserNotFoundException
+     */
+    public function rolesActions(ServerRequestInterface $requestInterface, ResponseInterface $responseInterface){
+
+        if($requestInterface->getAttribute("api") === "v2"){
+            $requestInterface = $this->preprocessApi2Actions($requestInterface);
+        }
+
+        $action     = $requestInterface->getAttribute("action");
+        /** @var ContextInterface $ctx */
+        $ctx        = $requestInterface->getAttribute("ctx");
+        $httpVars   = $requestInterface->getParsedBody();
+        $mess       = LocaleService::getMessages();
+
+
+        switch ($action){
+
+            // ROLES
+            case "create_role":
+
+                $roleId = InputFilter::sanitize(InputFilter::magicDequote($httpVars["role_id"]), InputFilter::SANITIZE_HTML_STRICT);
+                if (!strlen($roleId)) {
+                    throw new \Exception($mess[349]);
+                }
+                if (RolesService::getRole($roleId) !== false) {
+                    throw new \Exception($mess["ajxp_conf.65"]);
+                }
+                $r = new AJXP_Role($roleId);
+                $user = $ctx->getUser();
+                if ($user !== null && $user->getGroupPath()!== null) {
+                    $r->setGroupPath($user->getGroupPath());
+                }
+                RolesService::updateRole($r);
+
+                $userMessage        = new UserMessage($mess["ajxp_conf.66"]);
+                $reloadMessage      = new ReloadMessage("", $httpVars["role_id"]);
+                $responseInterface  = $responseInterface->withBody(new SerializableResponseStream([$userMessage, $reloadMessage]));
+
+                break;
+
+            case "edit_role" :
+
+                $roleId = InputFilter::magicDequote($httpVars["role_id"]);
+                $roleGroup = false;
+                $userObject = null;
+                $groupLabel = null;
+                $currentMainUser = $ctx->getUser();
+
+                if (strpos($roleId, "AJXP_GRP_") === 0) {
+                    $groupPath = substr($roleId, strlen("AJXP_GRP_"));
+                    $filteredGroupPath = (!empty($currentMainUser) ? $currentMainUser->getRealGroupPath($groupPath) : $groupPath);
+                    if($filteredGroupPath == "/"){
+                        $roleId = "AJXP_GRP_/";
+                        $groupLabel = $mess["ajxp_conf.151"];
+                        $roleGroup = true;
+                    }else{
+                        $groups = UsersService::listChildrenGroups(PathUtils::forwardSlashDirname($filteredGroupPath));
+                        $key = "/".basename($groupPath);
+                        if (!array_key_exists($key, $groups)) {
+                            throw new \Exception("Cannot find group with this id!");
+                        }
+                        $roleId = "AJXP_GRP_".$filteredGroupPath;
+                        $groupLabel = $groups[$key];
+                        $roleGroup = true;
+                    }
+                }
+                if (strpos($roleId, "AJXP_USR_") === 0) {
+                    $usrId = str_replace("AJXP_USR_/", "", $roleId);
+                    $userObject = UsersService::getUserById($usrId);
+                    if(!empty($currentMainUser) && !$currentMainUser->canAdministrate($userObject)){
+                        throw new \Exception("Cant find user!");
+                    }
+                    $role = $userObject->getPersonalRole();
+                } else {
+                    if($roleGroup){
+                        $role = RolesService::getOrCreateRole($roleId, $ctx->hasUser() ? $ctx->getUser()->getGroupPath() : "/");
+                    }else{
+                        $role = RolesService::getRole($roleId);
+                    }
+                }
+                if ($role === false) {
+                    throw new \Exception("Cant find role! ");
+                }
+
+                $data = [
+                    "ROLE" => $role->getDataArray(true)
+                ];
+
+                if (isSet($userObject)) {
+
+                    $data["USER"] = array();
+                    $data["USER"]["LOCK"] = $userObject->getLock();
+                    $data["USER"]["PROFILE"] = $userObject->getProfile();
+                    $data["USER"]["ROLES"] = array_keys($userObject->getRoles());
+                    $rolesList = RolesService::getRolesList(array(), true);
+                    $data["ALL"]["ROLES"] = array_keys($rolesList);
+                    $data["ALL"]["ROLES_DETAILS"] = array();
+                    foreach($rolesList as $rId => $rObj){
+                        $data["ALL"]["ROLES_DETAILS"][$rId] = array("label" => $rObj->getLabel(), "sticky" => $rObj->alwaysOverrides());
+                    }
+                    if ($userObject instanceof AbstractUser && isSet($userObject->parentRole)) {
+                        $data["PARENT_ROLE"] = $userObject->parentRole->getDataArray();
+                    }
+
+                } else if (isSet($groupPath)) {
+
+                    $data["GROUP"] = array("PATH" => $groupPath, "LABEL" => $groupLabel);
+                    if($roleId != "AJXP_GRP_/"){
+                        $parentGroupRoles = array();
+                        $parentPath = PathUtils::forwardSlashDirname($roleId);
+                        while($parentPath != "AJXP_GRP_"){
+                            $parentRole = RolesService::getRole($parentPath);
+                            if($parentRole != null) {
+                                array_unshift($parentGroupRoles, $parentRole);
+                            }
+                            $parentPath = PathUtils::forwardSlashDirname($parentPath);
+                        }
+                        $rootGroup = RolesService::getRole("AJXP_GRP_/");
+                        if($rootGroup != null) array_unshift($parentGroupRoles, $rootGroup);
+                        if(count($parentGroupRoles)){
+                            $parentRole = clone array_shift($parentGroupRoles);
+                            foreach($parentGroupRoles as $pgRole){
+                                $parentRole = $pgRole->override($parentRole);
+                            }
+                            $data["PARENT_ROLE"] = $parentRole->getDataArray();
+                        }
+                    }
+
+                }
+
+                if($requestInterface->getAttribute("api") === "v2" && (empty($httpVars["load_fill_values"]) || $httpVars["load_fill_values"] !== "true")){
+                    $responseInterface = new JsonResponse($data["ROLE"]);
+                    break;
+                }
+
+                $allReps        = RepositoryService::listAllRepositories();
+                $repos          = array();
+                $repoDetailed   = array();
+                $sharedRepos    = array();
+                if(isSet($userObject)){
+                    // Add User shared Repositories as well
+                    $acls = $userObject->getMergedRole()->listAcls();
+                    if(count($acls)) {
+                        $sharedRepos = RepositoryService::listRepositoriesWithCriteria(array(
+                            "uuid" => array_keys($acls),
+                            "parent_uuid" => AJXP_FILTER_NOT_EMPTY,
+                            "owner_user_id" => AJXP_FILTER_NOT_EMPTY
+                        ), $count);
+                        $allReps = array_merge($allReps, $sharedRepos);
+                    }
+                }
+
+                // USER
+                foreach ($allReps as $repositoryId => $repositoryObject) {
+                    if (!empty($userObject) &&
+                        (
+                            !$userObject->canSee($repositoryObject) || $repositoryObject->isTemplate()
+                            || ($repositoryObject->getAccessType()=="ajxp_conf" && !$userObject->isAdmin())
+                            || ($repositoryObject->getUniqueUser() != null && $repositoryObject->getUniqueUser() != $userObject->getId())
+                        )
+                    ){
+                        continue;
+                    }else if(empty($userObject) && (
+                            (empty($currentMainUser) && !$currentMainUser->canAdministrate($repositoryObject)) || $repositoryObject->isTemplate()
+                        )){
+                        continue;
+                    }
+                    $meta = array();
+                    try{
+                        $metaSources = $repositoryObject->getContextOption($ctx, "META_SOURCES");
+                        if($metaSources !== null){
+                            $meta = array_keys($metaSources);
+                        }
+                    }catch(\Exception $e){
+                        if(isSet($sharedRepos[$repositoryId])) unset($sharedRepos[$repositoryId]);
+                        Logger::error("ConfDriver", "Invalid Share", "Repository $repositoryId has no more parent. Should be deleted.");
+                        continue;
+                    }
+                    $repoDetailed[$repositoryId] = array(
+                        "label"  => $repositoryObject->getDisplay(),
+                        "driver" => $repositoryObject->getAccessType(),
+                        "scope"  => $repositoryObject->securityScope(),
+                        "meta"   => $meta
+                    );
+
+                    if(array_key_exists($repositoryId, $sharedRepos)){
+                        $sharedRepos[$repositoryId] = $repositoryObject->getDisplay();
+                        $repoParentLabel = $repoParentId = $repositoryObject->getParentId();
+                        $repoOwnerId = $repositoryObject->getOwner();
+                        if(isSet($allReps[$repoParentId])){
+                            $repoParentLabel = $allReps[$repoParentId]->getDisplay();
+                        }
+                        $repoOwnerLabel = UsersService::getUserPersonalParameter("USER_DISPLAY_NAME", $repoOwnerId, "core.conf", $repoOwnerId);
+                        $repoDetailed[$repositoryId]["share"] = array(
+                            "parent_user" => $repoOwnerId,
+                            "parent_user_label" => $repoOwnerLabel,
+                            "parent_repository" => $repoParentId,
+                            "parent_repository_label" => $repoParentLabel
+                        );
+                    }else{
+                        $repos[$repositoryId] = $repositoryObject->getDisplay();
+                    }
+
+                }
+
+                // Make sure it's utf8
+                $data["ALL"] = array_merge((isSet($data["ALL"]) ? $data["ALL"]: []), [
+                    "PLUGINS_SCOPES"    => [
+                        "GLOBAL_TYPES"      => ["conf", "auth", "authfront", "log", "mq", "gui", "sec"],
+                        "GLOBAL_PLUGINS"    => ["action.avatar", "action.disclaimer", "action.scheduler", "action.skeleton", "action.updater"]
+                    ],
+                    "REPOSITORIES"          => $repos,
+                    "SHARED_REPOSITORIES"   => $sharedRepos,
+                    "REPOSITORIES_DETAILS"  => $repoDetailed,
+                    "PROFILES"              => [
+                        "standard|".$mess["ajxp_conf.156"],
+                        "admin|".$mess["ajxp_conf.157"],
+                        "shared|".$mess["ajxp_conf.158"],
+                        "guest|".$mess["ajxp_conf.159"]
+                    ]
+                ]);
+
+                $scope = "role";
+                if($roleGroup) {
+                    $scope = "group";
+                    if($roleId == "AJXP_GRP_/") {
+                        $scope = "role";
+                    }
+                }else if(isSet($userObject)) {
+                    $scope = "user";
+                }
+                $data["SCOPE_PARAMS"] = array();
+                $nodes = PluginsService::getInstance($ctx)->searchAllManifests("//param[contains(@scope,'".$scope."')]|//global_param[contains(@scope,'".$scope."')]", "node", false, true, true);
+                foreach ($nodes as $node) {
+                    $pId = $node->parentNode->parentNode->attributes->getNamedItem("id")->nodeValue;
+                    $origName = $node->attributes->getNamedItem("name")->nodeValue;
+                    if($roleId == "AJXP_GRP_/" && strpos($origName, "ROLE_") ===0 ) continue;
+                    $node->attributes->getNamedItem("name")->nodeValue = "AJXP_REPO_SCOPE_ALL/".$pId."/".$origName;
+                    $nArr = array();
+                    foreach ($node->attributes as $attrib) {
+                        $nArr[$attrib->nodeName] = XMLFilter::resolveKeywords($attrib->nodeValue);
+                    }
+                    $data["SCOPE_PARAMS"][] = $nArr;
+                }
+
+                $responseInterface = new JsonResponse($data);
+
+                break;
+
+            case "post_json_role" :
+
+                $roleId = InputFilter::magicDequote($httpVars["role_id"]);
+                $roleGroup = false;
+                $currentMainUser = $ctx->getUser();
+                $userObject = $usrId = $filteredGroupPath = null;
+                if (strpos($roleId, "AJXP_GRP_") === 0) {
+                    $groupPath = substr($roleId, strlen("AJXP_GRP_"));
+                    $filteredGroupPath = (!empty($currentMainUser) ? $currentMainUser->getRealGroupPath($groupPath) : $groupPath);
+                    $roleId = "AJXP_GRP_".$filteredGroupPath;
+                    if($roleId != "AJXP_GRP_/"){
+                        $groups = UsersService::listChildrenGroups(PathUtils::forwardSlashDirname($filteredGroupPath));
+                        $key = "/".basename($groupPath);
+                        if (!array_key_exists($key, $groups)) {
+                            throw new \Exception("Cannot find group with this id!");
+                        }
+                        $groupLabel = $groups[$key];
+                    }else{
+                        $groupLabel = $mess["ajxp_conf.151"];
+                    }
+                    $roleGroup = true;
+                }
+                if (strpos($roleId, "AJXP_USR_") === 0) {
+                    $usrId = str_replace("AJXP_USR_/", "", $roleId);
+                    $userObject = UsersService::getUserById($usrId);
+                    $ctxUser = $ctx->getUser();
+                    if(!empty($ctxUser) && !$ctxUser->canAdministrate($userObject)){
+                        throw new \Exception("Cannot post role for user ".$usrId);
+                    }
+                    $originalRole = $userObject->getPersonalRole();
+                } else {
+                    // second param = create if not exists.
+                    if($roleGroup){
+                        $originalRole = RolesService::getOrCreateRole($roleId, $ctx->hasUser() ? $ctx->getUser()->getGroupPath() : "/");
+                    }else{
+                        $originalRole = RolesService::getRole($roleId);
+                    }
+                }
+                if ($originalRole === false) {
+                    throw new \Exception("Cant find role! ");
+                }
+
+                if(isSet($httpVars["request_body"])){
+                    // This is API V2 : only the role is passed as json body
+                    $roleData = $httpVars["request_body"];
+                    $data = ["METADATA" => []];
+                    $outputRoleOnly = true;
+                }else{
+                    // Other apis: a more complex
+                    $jsonData = InputFilter::magicDequote($httpVars["json_data"]);
+                    $data = json_decode($jsonData, true);
+                    $roleData = $data["ROLE"];
+                    $outputRoleOnly = false;
+                }
+                $binariesContext = array();
+                $parseContext = $ctx;
+                if (isset($userObject)) {
+                    $parseContext = new Context(null, $ctx->getRepositoryId());
+                    $parseContext->setUserObject($userObject);
+                    $binariesContext = array("USER" => $userObject->getId());
+                }
+                if(isSet($data["FORMS"])){
+                    $forms = $data["FORMS"];
+                    foreach ($forms as $repoScope => $plugData) {
+                        foreach ($plugData as $plugId => $formsData) {
+                            $parsed = array();
+                            OptionsHelper::parseStandardFormParameters(
+                                $parseContext,
+                                $formsData,
+                                $parsed,
+                                "ROLE_PARAM_",
+                                $binariesContext,
+                                AJXP_Role::$cypheredPassPrefix
+                            );
+                            $roleData["PARAMETERS"][$repoScope][$plugId] = $parsed;
+                        }
+                    }
+                }else{
+                    OptionsHelper::filterFormElementsFromMeta(
+                        $parseContext,
+                        $data["METADATA"],
+                        $roleData,
+                        ($userObject != null ? $usrId : null),
+                        $binariesContext,
+                        AJXP_Role::$cypheredPassPrefix
+                    );
+                }
+                $existingParameters = $originalRole->listParameters(true);
+                $this->mergeExistingParameters($roleData["PARAMETERS"], $existingParameters);
+                if (isSet($userObject) && isSet($data["USER"]) && isSet($data["USER"]["PROFILE"])) {
+                    $userObject->setAdmin(($data["USER"]["PROFILE"] == "admin"));
+                    $userObject->setProfile($data["USER"]["PROFILE"]);
+                }
+                if (isSet($data["GROUP_LABEL"]) && isSet($groupLabel) && $groupLabel != $data["GROUP_LABEL"]) {
+                    ConfService::getConfStorageImpl()->relabelGroup($filteredGroupPath, $data["GROUP_LABEL"]);
+                }
+
+                if($this->currentUserIsGroupAdmin()){
+                    // FILTER DATA FOR GROUP ADMINS
+                    $params = $this->getEditableParameters($ctx, true, false);
+                    foreach($roleData["PARAMETERS"] as $scope => &$plugsParameters){
+                        foreach($plugsParameters as $paramPlugin => &$parameters){
+                            foreach($parameters as $pName => $pValue){
+                                if(!isSet($params[$paramPlugin]) || !in_array($pName, $params[$paramPlugin])){
+                                    unset($parameters[$pName]);
+                                }
+                            }
+                            if(!count($parameters)){
+                                unset($plugsParameters[$paramPlugin]);
+                            }
+                        }
+                        if(!count($plugsParameters)){
+                            unset($roleData["PARAMETERS"][$scope]);
+                        }
+                    }
+                    // Remerge from parent
+                    $roleData["PARAMETERS"] = $originalRole->array_merge_recursive2($originalRole->listParameters(), $roleData["PARAMETERS"]);
+                    // Changing Actions is not allowed
+                    $roleData["ACTIONS"] = $originalRole->listActionsStates();
+                }
+
+                if(isSet($roleData["MASKS"])){
+                    foreach($roleData["MASKS"] as $repoId => $serialMask){
+                        $roleData["MASKS"][$repoId] = new AJXP_PermissionMask($serialMask);
+                    }
+                }
+
+                try {
+                    $originalRole->bunchUpdate($roleData);
+                    if (isSet($userObject)) {
+                        $userObject->updatePersonalRole($originalRole);
+                        $userObject->save("superuser");
+                    } else {
+                        RolesService::updateRole($originalRole);
+                    }
+                    // Reload Role
+                    $savedValue = RolesService::getRole($originalRole->getId());
+                    if($outputRoleOnly){
+                        $output = $savedValue->getDataArray(true);
+                    }else{
+                        $output = array("ROLE" => $savedValue->getDataArray(true), "SUCCESS" => true);
+                    }
+                } catch (\Exception $e) {
+                    $output = array("ERROR" => $e->getMessage());
+                }
+
+                $responseInterface = new JsonResponse($output);
+
+                break;
+
+            case "role_update_right" :
+
+                if(!isSet($httpVars["role_id"]) || !isSet($httpVars["repository_id"]) || !isSet($httpVars["right"])) {
+                    throw new PydioException($mess["ajxp_conf.61"]);
+                }
+                $rId = InputFilter::sanitize($httpVars["role_id"]);
+                $role = RolesService::getRole($rId);
+                if($role === false){
+                    throw new PydioException($mess["ajxp_conf.61"]."($rId)");
+                }
+                $role->setAcl(InputFilter::sanitize($httpVars["repository_id"], InputFilter::SANITIZE_ALPHANUM), InputFilter::sanitize($httpVars["right"], InputFilter::SANITIZE_ALPHANUM));
+                RolesService::updateRole($role);
+
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream(new UserMessage($mess["ajxp_conf.46"].$httpVars["role_id"])));
+
+                break;
+
+            default:
+                break;
+
+        }
+
+        return $responseInterface;
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @return ResponseInterface
+     * @throws PydioException
+     */
+    public function delete(ServerRequestInterface $requestInterface, ResponseInterface $responseInterface){
+
+        $mess = LocaleService::getMessages();
+        $httpVars = $requestInterface->getParsedBody();
+
+        $roleId = InputFilter::sanitize(isSet($httpVars["roleId"]) ? $httpVars["roleId"] : $httpVars["role_id"], InputFilter::SANITIZE_DIRNAME);
+        if (RolesService::getRole($roleId) === false) {
+            throw new PydioException($mess["ajxp_conf.67"]);
+        }
+        RolesService::deleteRole($roleId);
+
+        $message = new UserMessage($mess["ajxp_conf.68"]);
+        $reload = new ReloadMessage();
+
+        return $responseInterface->withBody(new SerializableResponseStream([$message, $reload]));
+        
+    }
+
+
+    /**
+     * @param ServerRequestInterface $requestInterface Full set of query parameters
+     * @param string $rootPath Path to prepend to the resulting nodes
+     * @param string $relativePath Specific path part for this function
+     * @param string $paginationHash Number added to url#2 for pagination purpose.
+     * @param string $findNodePosition Path to a given node to try to find it
+     * @param string $aliasedDir Aliased path used for alternative url
+     * @return NodesList A populated NodesList object, eventually recursive.
+     */
+    public function listNodes(ServerRequestInterface $requestInterface, $rootPath, $relativePath, $paginationHash = null, $findNodePosition = null, $aliasedDir = null)
+    {
+        $nodesList = new NodesList("/$rootPath/$relativePath");
+        $nodesList->initColumnsData("filelist", "list", "ajxp_conf.roles");
+        $nodesList->appendColumn("ajxp_conf.76", "ajxp_label");
+        $nodesList->appendColumn("ajxp_conf.114", "is_default");
+        $nodesList->appendColumn("ajxp_conf.62", "rights_summary");
+
+        if(!UsersService::usersEnabled()) {
+            return $nodesList;
+        }
+
+        $mess       = LocaleService::getMessages();
+        $ctxUser    = $this->context->getUser();
+        $roles      = RolesService::getRolesList(array(), !$this->listSpecialRoles);
+        ksort($roles);
+
+        if(!$this->listSpecialRoles && $this->pluginName != "ajxp_admin" && !$this->currentUserIsGroupAdmin()){
+            $rootGroupRole = RolesService::getOrCreateRole("AJXP_GRP_/", empty($ctxUser) ? "/" : $ctxUser->getGroupPath());
+            if($rootGroupRole->getLabel() == "AJXP_GRP_/"){
+                $rootGroupRole->setLabel($mess["ajxp_conf.151"]);
+                RolesService::updateRole($rootGroupRole);
+            }
+            array_unshift($roles, $rootGroupRole);
+        }
+
+        foreach ($roles as $roleObject) {
+
+            $r = array();
+            if(!empty($ctxUser) && !$ctxUser->canAdministrate($roleObject)) {
+                continue;
+            }
+            $count = 0;
+            $repos = RepositoryService::listRepositoriesWithCriteria(array("role" => $roleObject), $count);
+            foreach ($repos as $repoId => $repository) {
+                if($repository->getAccessType() == "ajxp_shared") continue;
+                if(!$roleObject->canRead($repoId) && !$roleObject->canWrite($repoId)) continue;
+                $rs = ($roleObject->canRead($repoId) ? "r" : "");
+                $rs .= ($roleObject->canWrite($repoId) ? "w" : "");
+                $r[] = $repository->getDisplay()." (".$rs.")";
+            }
+            $rightsString = implode(", ", $r);
+            $nodeKey = "/".$rootPath."/".$relativePath."/".$roleObject->getId();
+            $appliesToDefault = implode(",", $roleObject->listAutoApplies());
+            if($roleObject->getId() == "AJXP_GRP_/"){
+                $appliesToDefault = $mess["ajxp_conf.153"];
+            }
+            $meta = array(
+                "icon"              => "user-acl.png",
+                "rights_summary"    => $rightsString,
+                "is_default"        => $appliesToDefault,
+                "ajxp_mime"         => "role",
+                "role_id"           => $roleObject->getId(),
+                "text"              => $roleObject->getLabel()
+            );
+            $this->appendBookmarkMeta($nodeKey, $meta);
+            if($requestInterface->getAttribute("api") === "v2"){
+                $nodeKey = $roleObject->getId();
+                $meta["role"] = $roleObject->getDataArray(true);
+            }
+            $nodesList->addBranch(new AJXP_Node($nodeKey, $meta));
+        }
+        return $nodesList;
+
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/access.ajxp_conf/src/TreeManager.php b/core/src/plugins/access.ajxp_conf/src/TreeManager.php
new file mode 100644
index 0000000000..315645776a
--- /dev/null
+++ b/core/src/plugins/access.ajxp_conf/src/TreeManager.php
@@ -0,0 +1,225 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Access\Driver\DataProvider\Provisioning;
+
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\NodesList;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Utils\Vars\InputFilter;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class TreeManager
+ * @package Pydio\Access\Driver\DataProvider\Provisioning
+ */
+class TreeManager extends AbstractManager
+{
+    /**
+     * @var array
+     */
+    protected $mainTree;
+
+    /**
+     * @var array
+     */
+    protected $currentBookmarks = [];
+
+    /**
+     * TreeManager constructor.
+     * @param ContextInterface $ctx
+     * @param string $pluginName
+     * @param array $mainTree
+     */
+    public function __construct(ContextInterface $ctx, $pluginName, $mainTree)
+    {
+        parent::__construct($ctx, $pluginName);
+        $this->mainTree = $mainTree;
+    }
+
+    /**
+     * Forward call to dedicated managers, must implement AbstractManager
+     * @param ServerRequestInterface $requestInterface
+     * @param $childData
+     * @param $initialPath
+     * @param $rootSegment
+     * @param $otherSegments
+     * @param $hashValue
+     * @return NodesList
+     */
+    protected function forwardToManagers(ServerRequestInterface $requestInterface, $childData, $initialPath, $rootSegment, $otherSegments, $hashValue){
+
+        if(!isSet($childData["LIST"]) && !isSet($childData["MANAGER"])){
+            return new NodesList($initialPath);
+        }
+
+        if(isSet($childData["ALIAS"])){
+            $reSplits = explode("/", ltrim($childData["ALIAS"], "/"));
+            $rootSegment = array_shift($reSplits);
+            // additional part?
+            array_shift($otherSegments);
+            foreach($otherSegments as $vS) $reSplits[] = $vS;
+            $otherSegments = $reSplits;
+        }
+
+        $httpVars = $requestInterface->getParsedBody();
+        if(!isSet($childData["MANAGER"]) && isSet($childData["LIST"]) && is_callable($childData["LIST"])){
+            return call_user_func($childData["LIST"], $httpVars, $rootSegment, implode("/", $otherSegments), $hashValue, isSet($httpVars["file"])?$httpVars["file"]:'', $initialPath);
+        }
+
+        $callback = $childData["MANAGER"];
+        /** @var AbstractManager $manager */
+        if($callback === "TreeManager") {
+            $manager = $this;
+        }else{
+            $manager = new $callback($this->context, $this->pluginName);
+        }
+
+        return $manager->listNodes($requestInterface, $rootSegment, implode("/", $otherSegments), $hashValue, isSet($httpVars["file"])?$httpVars["file"]:'', $initialPath);
+
+    }
+
+    /**
+     * Render a bookmark node
+     * @param NodesList $nodesList
+     * @param $path
+     * @param $data
+     * @param $messages
+     */
+    protected function appendNodeFromTree($nodesList, $path, $data, $messages){
+
+        if(!isSet($data["LABEL"])){
+            return;
+        }
+        if(isSet($messages[$data["LABEL"]])) $data["LABEL"] = $messages[$data["LABEL"]];
+        if(isSet($messages[$data["DESCRIPTION"]])) $data["DESCRIPTION"] = $messages[$data["DESCRIPTION"]];
+
+        $attributes = array(
+            "description" => $data["DESCRIPTION"],
+            "icon"        => $data["ICON"],
+            "text"        => $data["LABEL"],
+            "is_file"     => false
+        );
+        $this->appendBookmarkMeta($path, $attributes);
+        if(basename($path) == "users") {
+            $attributes["remote_indexation"] = "admin_search_users";
+        }
+        if(isSet($data["AJXP_MIME"])) {
+            $attributes["ajxp_mime"] = $data["AJXP_MIME"];
+        }
+        if(isSet($data["METADATA"]) && is_array($data["METADATA"])){
+            $attributes = array_merge($attributes, $data["METADATA"]);
+        }
+        $node = new AJXP_Node($path, $attributes);
+        $hasChildren = isSet($data["CHILDREN"]);
+        if($hasChildren){
+            $branch = new NodesList();
+            $branch->setParentNode($node);
+            foreach($data["CHILDREN"] as $cKey => $cData){
+                $this->appendNodeFromTree($branch, $path."/".$cKey, $cData, $messages);
+            }
+            $nodesList->addBranch($branch);
+        }else{
+            $nodesList->addBranch($node);
+        }
+
+    }
+
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @return NodesList
+     */
+    public function dispatchList(ServerRequestInterface $requestInterface){
+
+        $httpVars           = $requestInterface->getParsedBody();
+        $messages           = LocaleService::getMessages();
+        $rootAttributes     = array();
+        $rootNodes          = $this->mainTree;
+
+        if(isSet($rootNodes["__metadata__"])){
+            $rootAttributes = $rootNodes["__metadata__"];
+            unset($rootNodes["__metadata__"]);
+        }
+        $parentName = "";
+        $dir = trim(InputFilter::decodeSecureMagic((isset($httpVars["dir"]) ? $httpVars["dir"] : "")), " /");
+        if (!empty($dir)) {
+            $hash = null;
+            if (strstr(urldecode($dir), "#") !== false) {
+                list($dir, $hash) = explode("#", urldecode($dir));
+            }
+            $splits = explode("/", $dir);
+            $root = array_shift($splits);
+            if (count($splits)) {
+                $child = $splits[0];
+                if (isSet($rootNodes[$root]["CHILDREN"][$child])) {
+                    $childData = $rootNodes[$root]["CHILDREN"][$child];
+                    return $this->forwardToManagers($requestInterface, $childData, "/" . $dir, $root, $splits, $hash);
+                }
+            } else {
+                $parentName = "/".$root."/";
+                $nodes = $rootNodes[$root]["CHILDREN"];
+            }
+        } else {
+            $parentName = "/";
+            $nodes = $rootNodes;
+            if($this->currentUserIsGroupAdmin()){
+                $rootAttributes["group_admin"]  = "1";
+            }
+        }
+        if (isSet($httpVars["file"])) {
+            // = LS with Find Node Position
+            $parentName = $httpVars["dir"]."/";
+            $nodes = array(basename($httpVars["file"]) =>  array("LABEL" => basename($httpVars["file"])));
+        }
+        $nodesList = new NodesList();
+        if (isSet($nodes)) {
+            $nodesList->setParentNode(new AJXP_Node("/", $rootAttributes));
+            if(!isSet($httpVars["file"])){
+                $nodesList->initColumnsData("", "detail");
+                $nodesList->appendColumn("ajxp_conf.1", "ajxp_label");
+                $nodesList->appendColumn("ajxp_conf.102", "description");
+            }
+            foreach($nodes as $key => $data){
+                $this->appendNodeFromTree($nodesList, $parentName . $key, $data, $messages);
+            }
+        }
+        return $nodesList;
+
+    }
+
+
+    /**
+     * @param array|ServerRequestInterface $requestInterface Full set of query parameters
+     * @param string $rootPath Path to prepend to the resulting nodes
+     * @param string $relativePath Specific path part for this function
+     * @param string $paginationHash Number added to url#2 for pagination purpose.
+     * @param string $findNodePosition Path to a given node to try to find it
+     * @param string $aliasedDir Aliased path used for alternative url
+     * @return NodesList A populated NodesList object, eventually recursive.
+     */
+    public function listNodes(ServerRequestInterface $requestInterface, $rootPath, $relativePath, $paginationHash = null, $findNodePosition = null, $aliasedDir = null)
+    {
+        return new NodesList();
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/access.ajxp_conf/src/UsersManager.php b/core/src/plugins/access.ajxp_conf/src/UsersManager.php
new file mode 100644
index 0000000000..f11e527ad2
--- /dev/null
+++ b/core/src/plugins/access.ajxp_conf/src/UsersManager.php
@@ -0,0 +1,1115 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Access\Driver\DataProvider\Provisioning;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\NodesList;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Core\Controller\ProgressBarCLI;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Exception\UserNotFoundException;
+use Pydio\Core\Http\Message\ReloadMessage;
+use Pydio\Core\Http\Message\UserMessage;
+use Pydio\Core\Http\Message\XMLDocMessage;
+use Pydio\Core\Http\Message\XMLMessage;
+use Pydio\Core\Http\Response\SerializableResponseStream;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Model\UserInterface;
+use Pydio\Core\Services\AuthService;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\RolesService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\PathUtils;
+use Pydio\Core\Utils\Vars\StatHelper;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class UsersManager
+ * @package Pydio\Access\Driver\DataProvider\Provisioning
+ */
+class UsersManager extends AbstractManager
+{
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @return ResponseInterface
+     */
+    public function peopleApiActions(ServerRequestInterface $requestInterface, ResponseInterface $responseInterface){
+
+        $a = $requestInterface->getAttribute("action");
+        $vars = $requestInterface->getParsedBody();
+        $path = $vars["path"];
+        if($a === "people-create-resource"){
+            if($vars["resourceType"] === "user"){
+                // Create a user
+                $uLogin = basename($path);
+                $gPath  = dirname($path);
+                $requestInterface = $requestInterface
+                    ->withAttribute("action", "create_user")
+                    ->withParsedBody([
+                        "new_user_login" => $uLogin,
+                        "new_user_pwd"   => $vars["userPass"],
+                        "group_path"     => $gPath
+                    ]);
+            }else{
+                // Create a group
+                $requestInterface = $requestInterface
+                    ->withAttribute("action", "create_group")
+                    ->withParsedBody([
+                        "group_path"  => $path,
+                        "group_label" => $vars["groupLabel"]
+                    ]);
+            }
+            return $this->usersActions($requestInterface, $responseInterface);
+            
+        }else if($a === "people-delete-resource"){
+
+            $baseName = basename($path);
+            $vars = [];
+            if(UsersService::userExists($baseName)){
+                $vars["user_id"] = $baseName;
+            }else{
+                $vars["group"] = $path;
+            }
+            return $this->delete($requestInterface->withParsedBody($vars), $responseInterface);
+
+        }else if($a === "people-patch-resource"){
+
+            $path =  $vars["path"];
+            $resType = $vars["request_body"]["resourceType"];
+            $paramName = $vars["request_body"]["parameterName"];
+            $paramValue = $vars["request_body"]["parameterValue"];
+            if($resType === "group" && $paramName === "groupLabel"){
+
+                $requestInterface = $requestInterface
+                    ->withAttribute("action", "update_group_label")
+                    ->withParsedBody(["group_label" => $paramValue, "group_path" => $path])
+                ;
+
+            }else if($resType === "user"){
+
+                $newVars = ["user_id" => basename($path)];
+                switch($paramName){
+                    case "userPass":
+                        $newVars["user_pwd"] = $paramValue;
+                        $newAction = "update_user_pwd";
+                        break;
+                    case "userProfile":
+                        $newAction = "update_user_profile";
+                        $newVars["profile"] = $paramValue;
+                        break;
+                    case "userLock":
+                        list($lockType, $lockValue) = explode(":", $paramValue);
+                        $newVars["lock_type"] = $lockType;
+                        $newVars["lock"] = $lockValue;
+                        $newAction = "user_set_lock";
+                        break;
+                    case "userAddRole":
+                        $newVars["role_id"] = $paramValue;
+                        $newAction = "user_add_role";
+                        break;
+                    case "userRemoveRole":
+                        $newVars["role_id"] = $paramValue;
+                        $newAction = "user_delete_role";
+                        break;
+                    case "userRoles":
+                        $newVars["roles"] = json_encode($paramValue); // REENCODE JSON LIST OF ROLES
+                        $newAction = "user_reorder_roles";
+                        break;
+                    case "userPreferences":
+                        $newAction = "save_user_preference";
+                        $i = 0;
+                        foreach ($paramValue as $key => $val){
+                            $newVars["pref_name_".$i] = $key;
+                            $newVars["pref_value_".$i] = $val;
+                            $i++;
+                        }
+                        break;
+                    default:
+                        throw new PydioException("Arguments mismatch");
+                        break;
+                }
+                $requestInterface = $requestInterface
+                    ->withAttribute("action", $newAction)
+                    ->withParsedBody($newVars);
+
+            }else{
+
+                throw new PydioException("Arguments mismatch");
+
+            }
+            return $this->usersActions($requestInterface, $responseInterface);
+
+        }
+
+        return $responseInterface;
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @return ResponseInterface
+     * @throws \Exception
+     * @throws \Pydio\Core\Exception\UserNotFoundException
+     */
+    public function usersActions(ServerRequestInterface $requestInterface, ResponseInterface $responseInterface){
+
+        $action     = $requestInterface->getAttribute("action");
+        /** @var ContextInterface $ctx */
+        $ctx        = $requestInterface->getAttribute("ctx");
+        $httpVars   = $requestInterface->getParsedBody();
+        $mess       = LocaleService::getMessages();
+        $currentAdminBasePath = "/";
+        $loggedUser = $ctx->getUser();
+        if ($loggedUser!=null && $loggedUser->getGroupPath()!=null) {
+            $currentAdminBasePath = $loggedUser->getGroupPath();
+        }
+
+        switch ($action){
+
+            // USERS & GROUPS
+            case "create_user" :
+
+                if (!isset($httpVars["new_user_login"]) || $httpVars["new_user_login"] == ""
+                    || !isset($httpVars["new_user_pwd"]) || $httpVars["new_user_pwd"] == "") {
+
+                    throw new PydioException($mess["ajxp_conf.61"]);
+
+                }
+                $original_login = InputFilter::magicDequote($httpVars["new_user_login"]);
+                $new_user_login = InputFilter::sanitize($original_login, InputFilter::SANITIZE_EMAILCHARS);
+                if($original_login != $new_user_login){
+                    throw new \Exception(str_replace("%s", $new_user_login, $mess["ajxp_conf.127"]));
+                }
+                if (UsersService::userExists($new_user_login, "w") || UsersService::isReservedUserId($new_user_login)) {
+                    throw new \Exception($mess["ajxp_conf.43"]);
+                }
+
+                $newUser = UsersService::createUser($new_user_login, $httpVars["new_user_pwd"]);
+                if (!empty($httpVars["group_path"])) {
+                    $newUser->setGroupPath(rtrim($currentAdminBasePath, "/")."/".ltrim($httpVars["group_path"], "/"));
+                } else {
+                    $newUser->setGroupPath($currentAdminBasePath);
+                }
+
+                $newUser->save("superuser");
+
+                $reloadMessage  = new ReloadMessage("", $new_user_login);
+                $userMessage    = new UserMessage($mess["ajxp_conf.44"]);
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream([$reloadMessage, $userMessage]));
+
+                break;
+
+            case "create_group":
+
+                if (isSet($httpVars["group_path"])) {
+                    $basePath = PathUtils::forwardSlashDirname($httpVars["group_path"]);
+                    if(empty($basePath)) $basePath = "/";
+                    $gName = InputFilter::sanitize(InputFilter::decodeSecureMagic(basename($httpVars["group_path"])), InputFilter::SANITIZE_ALPHANUM);
+                } else {
+                    $basePath = substr($httpVars["dir"], strlen("/data/users"));
+                    $gName    = InputFilter::sanitize(InputFilter::magicDequote($httpVars["group_name"]), InputFilter::SANITIZE_ALPHANUM);
+                }
+                $gLabel   = InputFilter::decodeSecureMagic($httpVars["group_label"]);
+                $basePath = ($ctx->hasUser() ? $ctx->getUser()->getRealGroupPath($basePath) : $basePath);
+
+                UsersService::createGroup($basePath, $gName, $gLabel);
+
+                $reloadMessage  = new ReloadMessage();
+                $userMessage    = new UserMessage($mess["ajxp_conf.160"]);
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream([$reloadMessage, $userMessage]));
+
+                break;
+
+            case "update_group_label":
+
+                $currentMainUser = $ctx->getUser();
+                $groupPath = InputFilter::securePath(InputFilter::sanitize($httpVars["group_path"], InputFilter::SANITIZE_DIRNAME));
+                $filteredGroupPath = (!empty($currentMainUser) ? $currentMainUser->getRealGroupPath($groupPath) : $groupPath);
+                ConfService::getConfStorageImpl()->relabelGroup($filteredGroupPath, InputFilter::sanitize($httpVars["group_label"], InputFilter::SANITIZE_FILENAME));
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream(new UserMessage("Updated label for group ".$filteredGroupPath)));
+
+                break;
+
+            case "update_user_profile":
+
+                if (!isSet($httpVars["user_id"]) || !isSet($httpVars["profile"]) || !UsersService::userExists($httpVars["user_id"]) || trim($httpVars["profile"]) == "") {
+                    throw new PydioException($mess["ajxp_conf.61"]);
+                }
+                $profile = InputFilter::sanitize($httpVars["profile"], InputFilter::SANITIZE_ALPHANUM);
+                $userId = InputFilter::sanitize($httpVars["user_id"], InputFilter::SANITIZE_EMAILCHARS);
+                $user = UsersService::getUserById($userId);
+                if($ctx->hasUser() && !$ctx->getUser()->canAdministrate($user)){
+                    throw new PydioException("Cannot update user data for ".$userId);
+                }
+                $user->setProfile($profile);
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream(new UserMessage("Updated profile for user ".$userId)));
+
+                break;
+
+            case "user_set_lock" :
+
+                $userId = InputFilter::decodeSecureMagic($httpVars["user_id"]);
+                $lock = ($httpVars["lock"] == "true" ? true : false);
+                $lockType = $httpVars["lock_type"];
+                $ctxUser = $ctx->getUser();
+                if (UsersService::userExists($userId)) {
+                    $userObject = UsersService::getUserById($userId, false);
+                    if( !empty($ctxUser) && !$ctxUser->canAdministrate($userObject)){
+                        throw new \Exception("Cannot update user data for ".$userId);
+                    }
+                    if ($lock) {
+                        $userObject->setLock($lockType);
+                        $userMessage    = new UserMessage("Successfully set lock on user ($lockType)");
+                        $responseInterface = $responseInterface->withBody(new SerializableResponseStream([$userMessage]));
+                    } else {
+                        $userObject->removeLock($lockType);
+                        $userMessage    = new UserMessage("Successfully unlocked user");
+                        $responseInterface = $responseInterface->withBody(new SerializableResponseStream([$userMessage]));
+                    }
+                    $userObject->save("superuser");
+                }
+
+                break;
+
+            case "change_admin_right" :
+
+                $userId = $httpVars["user_id"];
+                $user = UsersService::getUserById($userId);
+                if($ctx->hasUser() && !$ctx->getUser()->canAdministrate($user)){
+                    throw new \Exception("Cannot update user with id ".$userId);
+                }
+                $user->setAdmin(($httpVars["right_value"]=="1"?true:false));
+                $user->save("superuser");
+
+                $reloadMessage  = new ReloadMessage();
+                $userMessage    = new UserMessage($mess["ajxp_conf.45"].$httpVars["user_id"]);
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream([$reloadMessage, $userMessage]));
+
+                break;
+
+            case "user_update_right" :
+
+                if(!isSet($httpVars["user_id"]) || !isSet($httpVars["repository_id"]) || !isSet($httpVars["right"]) || !UsersService::userExists($httpVars["user_id"])) {
+
+                    $userMessage    = new UserMessage($mess["ajxp_conf.61"], LOG_LEVEL_ERROR);
+                    $xmlMessage     = new XMLMessage("<update_checkboxes user_id=\"".$httpVars["user_id"]."\" repository_id=\"".$httpVars["repository_id"]."\" read=\"old\" write=\"old\"/>");
+                    $responseInterface = $responseInterface->withBody(new SerializableResponseStream([$userMessage, $xmlMessage]));
+
+                    break;
+                }
+                $userId = InputFilter::sanitize($httpVars["user_id"], InputFilter::SANITIZE_EMAILCHARS);
+                $user = UsersService::getUserById($userId);
+                if($ctx->hasUser() && !$ctx->getUser()->canAdministrate($user)){
+                    throw new \Exception("Cannot update user with id ".$userId);
+                }
+                $user->getPersonalRole()->setAcl(InputFilter::sanitize($httpVars["repository_id"], InputFilter::SANITIZE_ALPHANUM), InputFilter::sanitize($httpVars["right"], InputFilter::SANITIZE_ALPHANUM));
+                $user->save();
+                $loggedUser = $ctx->getUser();
+                if ($loggedUser->getId() == $user->getId()) {
+                    AuthService::updateSessionUser($user);
+                }
+
+                $userMessage    = new UserMessage($mess["ajxp_conf.46"].$httpVars["user_id"]);
+                $xmlMessage     = new XMLMessage("<update_checkboxes user_id=\"".$httpVars["user_id"]."\" repository_id=\"".$httpVars["repository_id"]."\" read=\"".$user->canRead($httpVars["repository_id"])."\" write=\"".$user->canWrite($httpVars["repository_id"])."\"/>");
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream([$userMessage, $xmlMessage]));
+
+                break;
+
+            case "user_update_group":
+
+                $userSelection = UserSelection::fromContext($ctx, $httpVars);
+                $dir = $httpVars["dir"];
+                $dest = $httpVars["dest"];
+                if (isSet($httpVars["group_path"])) {
+                    // API Case
+                    $groupPath = $httpVars["group_path"];
+                } else {
+                    if (strpos($dir, "/data/users",0)!==0 || strpos($dest, "/data/users",0)!==0) {
+                        break;
+                    }
+                    $groupPath = substr($dest, strlen("/data/users"));
+                }
+
+                $userId = null;
+                $usersMoved = array();
+
+                if (!empty($groupPath)) {
+                    $targetPath = rtrim($currentAdminBasePath, "/")."/".ltrim($groupPath, "/");
+                } else {
+                    $targetPath = $currentAdminBasePath;
+                }
+
+                foreach ($userSelection->getFiles() as $selectedUser) {
+                    $userId = basename($selectedUser);
+                    try{
+                        $user = UsersService::getUserById($userId);
+                        if($ctx->hasUser() && !$ctx->getUser()->canAdministrate($user)){
+                            continue;
+                        }
+                        $user->setGroupPath($targetPath, true);
+                        $user->save("superuser");
+                        $usersMoved[] = $user->getId();
+                    }catch (UserNotFoundException $u){
+                        continue;
+                    }
+                }
+                $chunks = [];
+                if(count($usersMoved)){
+                    $chunks[] = new UserMessage(count($usersMoved)." user(s) successfully moved to ".$targetPath);
+                    $chunks[] = new ReloadMessage($dest, $userId);
+                    $chunks[] = new ReloadMessage();
+                }else{
+                    $chunks[] = new UserMessage("No users moved, there must have been something wrong.", LOG_LEVEL_ERROR);
+                }
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream($chunks));
+
+                break;
+
+            case "user_add_role" :
+            case "user_delete_role":
+
+                if (!isSet($httpVars["user_id"]) || !isSet($httpVars["role_id"]) || !UsersService::userExists($httpVars["user_id"]) || !RolesService::getRole($httpVars["role_id"])) {
+                    throw new \Exception($mess["ajxp_conf.61"]);
+                }
+                if ($action == "user_add_role") {
+                    $act = "add";
+                    $messId = "73";
+                } else {
+                    $act = "remove";
+                    $messId = "74";
+                }
+                $this->updateUserRole($ctx->getUser(), InputFilter::sanitize($httpVars["user_id"], InputFilter::SANITIZE_EMAILCHARS), $httpVars["role_id"], $act);
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream(new UserMessage($mess["ajxp_conf.".$messId].$httpVars["user_id"])));
+
+                break;
+
+            case "user_reorder_roles":
+
+                if (!isSet($httpVars["user_id"]) || !UsersService::userExists($httpVars["user_id"]) || !isSet($httpVars["roles"])) {
+                    throw new \Exception($mess["ajxp_conf.61"]);
+                }
+                $roles = json_decode($httpVars["roles"], true);
+                $userId = InputFilter::sanitize($httpVars["user_id"], InputFilter::SANITIZE_EMAILCHARS);
+                $user = UsersService::getUserById($userId);
+                if($ctx->hasUser() && !$ctx->getUser()->canAdministrate($user)){
+                    throw new \Exception("Cannot update user data for ".$userId);
+                }
+
+
+                // UPDATE ROLES
+                $currentRoles = array_filter(array_keys($user->getRoles()), function($rId){return strpos($rId, "AJXP_GRP_/")!==0 && strpos($rId, "AJXP_USR_/")!==0;});
+                $newRoles = array_diff($roles, $currentRoles);
+                foreach($newRoles as $r) $user->addRole(RolesService::getRole($r));
+                $removeRoles = array_diff($currentRoles, $roles);
+                foreach($removeRoles as $r) {
+                    $user->removeRole($r);
+                }
+                // REORDER ROLES
+                $user->updateRolesOrder($roles);
+                $user->save("superuser");
+                $loggedUser = $ctx->getUser();
+                if ($loggedUser->getId() == $user->getId()) {
+                    AuthService::updateSessionUser($user);
+                }
+
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream(new UserMessage("Roles reordered for user ".$httpVars["user_id"])));
+                break;
+
+            case "users_bulk_update_roles":
+
+                $data = json_decode($httpVars["json_data"], true);
+                $userIds = $data["users"];
+                $rolesOperations = $data["roles"];
+                foreach($userIds as $userId){
+                    $userId = InputFilter::sanitize($userId, InputFilter::SANITIZE_EMAILCHARS);
+                    if(!UsersService::userExists($userId)) continue;
+                    $userObject = UsersService::getUserById($userId, false);
+                    if($ctx->hasUser() && !$ctx->getUser()->canAdministrate($userObject)) continue;
+                    foreach($rolesOperations as $addOrRemove => $roles){
+                        if(!in_array($addOrRemove, array("add", "remove"))) {
+                            continue;
+                        }
+                        foreach($roles as $roleId){
+                            if(strpos($roleId, "AJXP_USR_/") === 0 || strpos($roleId,"AJXP_GRP_/") === 0){
+                                continue;
+                            }
+                            $roleId = InputFilter::sanitize($roleId, InputFilter::SANITIZE_FILENAME);
+                            if ($addOrRemove == "add") {
+                                $roleObject = RolesService::getRole($roleId);
+                                $userObject->addRole($roleObject);
+                            } else {
+                                $userObject->removeRole($roleId);
+                            }
+                        }
+                    }
+                    $userObject->save("superuser");
+                    $loggedUser = $ctx->getUser();
+                    if ($loggedUser->getId() == $userObject->getId()) {
+                        AuthService::updateSessionUser($userObject);
+                    }
+                }
+
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream(new UserMessage("Successfully updated roles")));
+
+                break;
+
+            case "user_update_role" :
+
+                $selection = UserSelection::fromContext($ctx, $httpVars);
+                $files = $selection->getFiles();
+                $detectedRoles = array();
+                $roleId = null;
+
+                if (isSet($httpVars["role_id"]) && isset($httpVars["update_role_action"])) {
+                    $update = $httpVars["update_role_action"];
+                    $roleId = $httpVars["role_id"];
+                    if (RolesService::getRole($roleId) === false) {
+                        throw new \Exception("Invalid role id");
+                    }
+                }
+                foreach ($files as $index => $file) {
+                    $userId = basename($file);
+                    if (isSet($update)) {
+                        $userObject = $this->updateUserRole($ctx->getUser(), $userId, $roleId, $update);
+                    } else {
+                        try{
+                            $userObject = UsersService::getUserById($userId);
+                        }catch(UserNotFoundException $u){
+                            continue;
+                        }
+                        if($ctx->hasUser() && !$ctx->getUser()->canAdministrate($userObject)){
+                            continue;
+                        }
+                    }
+                    if ($userObject->hasParent()) {
+                        unset($files[$index]);
+                        continue;
+                    }
+                    $userRoles = $userObject->getRoles();
+                    foreach ($userRoles as $roleIndex => $bool) {
+                        if(!isSet($detectedRoles[$roleIndex])) $detectedRoles[$roleIndex] = 0;
+                        if($bool === true) $detectedRoles[$roleIndex] ++;
+                    }
+                }
+                $count = count($files);
+                $buffer = "<admin_data>";
+
+                $buffer .= "<user><ajxp_roles>";
+                foreach ($detectedRoles as $roleId => $roleCount) {
+                    if($roleCount < $count) continue;
+                    $buffer .= "<role id=\"$roleId\"/>";
+                }
+                $buffer .= "</ajxp_roles></user>";
+                $buffer .= "<ajxp_roles>";
+                foreach (RolesService::getRolesList(array(), !$this->listSpecialRoles) as $roleId => $roleObject) {
+                    $buffer .= "<role id=\"$roleId\"/>";
+                }
+                $buffer .= "</ajxp_roles>";
+                $buffer .= "</admin_data>";
+
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream(new XMLDocMessage($buffer)));
+                break;
+
+            case "save_custom_user_params" :
+
+                $userId = InputFilter::sanitize($httpVars["user_id"], InputFilter::SANITIZE_EMAILCHARS);
+                if ($userId == $loggedUser->getId()) {
+                    $user = $loggedUser;
+                } else {
+                    $user = UsersService::getUserById($userId);
+                }
+                if($ctx->hasUser() && !$ctx->getUser()->canAdministrate($user)){
+                    throw new \Exception("Cannot update user with id ".$userId);
+                }
+
+                $custom = $user->getPref("CUSTOM_PARAMS");
+                if(!is_array($custom)) $custom = array();
+
+                $options = $custom;
+                $newCtx = new Context($userId, $ctx->getRepositoryId());
+                $this->parseParameters($newCtx, $httpVars, $options, false, $custom);
+                $custom = $options;
+                $user->setPref("CUSTOM_PARAMS", $custom);
+                $user->save();
+
+                if ($loggedUser->getId() == $user->getId()) {
+                    AuthService::updateSessionUser($user);
+                }
+
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream(new UserMessage($mess["ajxp_conf.47"].$httpVars["user_id"])));
+
+                break;
+
+            case "save_repository_user_params" :
+
+                $userId = InputFilter::sanitize($httpVars["user_id"], InputFilter::SANITIZE_EMAILCHARS);
+                if ($userId == $loggedUser->getId()) {
+                    $user = $loggedUser;
+                } else {
+                    $user = UsersService::getUserById($userId);
+                }
+                if($ctx->hasUser() && !$ctx->getUser()->canAdministrate($user)){
+                    throw new \Exception("Cannot update user with id ".$userId);
+                }
+
+                $wallet = $user->getPref("AJXP_WALLET");
+                if(!is_array($wallet)) $wallet = array();
+                $repoID = $httpVars["repository_id"];
+                if (!array_key_exists($repoID, $wallet)) {
+                    $wallet[$repoID] = array();
+                }
+                $options = $wallet[$repoID];
+                $existing = $options;
+                $newCtx = new Context($userId, $ctx->getRepositoryId());
+                $this->parseParameters($newCtx, $httpVars, $options, false, $existing);
+                $wallet[$repoID] = $options;
+                $user->setPref("AJXP_WALLET", $wallet);
+                $user->save();
+
+                if ($loggedUser->getId() == $user->getId()) {
+                    AuthService::updateSessionUser($user);
+                }
+
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream(new UserMessage($mess["ajxp_conf.47"].$httpVars["user_id"])));
+
+                break;
+
+            case "update_user_pwd" :
+                
+                if (!isSet($httpVars["user_id"]) || !isSet($httpVars["user_pwd"]) || !UsersService::userExists($httpVars["user_id"]) || trim($httpVars["user_pwd"]) == "") {
+
+                    throw new PydioException($mess["ajxp_conf.61"]);
+
+                }
+                $userId = InputFilter::sanitize($httpVars["user_id"], InputFilter::SANITIZE_EMAILCHARS);
+                $user = UsersService::getUserById($userId);
+                if($ctx->hasUser() && !$ctx->getUser()->canAdministrate($user)){
+                    throw new PydioException("Cannot update user data for ".$userId);
+                }
+                $res = UsersService::updatePassword($userId, $httpVars["user_pwd"]);
+                if($res !== true){
+                    throw new PydioException($mess["ajxp_conf.49"].": $res");
+                }
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream(new UserMessage($mess["ajxp_conf.48"].$userId)));
+
+                break;
+
+            case "save_user_preference":
+
+                if (!isSet($httpVars["user_id"]) || !UsersService::userExists($httpVars["user_id"])) {
+                    throw new \Exception($mess["ajxp_conf.61"]);
+                }
+                $userId = InputFilter::sanitize($httpVars["user_id"], InputFilter::SANITIZE_EMAILCHARS);
+                if ($userId == $loggedUser->getId()) {
+                    $userObject = $loggedUser;
+                } else {
+                    $userObject = UsersService::getUserById($userId);
+                }
+                if($ctx->hasUser() && !$ctx->getUser()->canAdministrate($userObject)){
+                    throw new \Exception("Cannot update user data for ".$userId);
+                }
+
+                $i = 0;
+                while (isSet($httpVars["pref_name_".$i]) && isSet($httpVars["pref_value_".$i])) {
+                    $prefName = InputFilter::sanitize($httpVars["pref_name_" . $i], InputFilter::SANITIZE_ALPHANUM);
+                    $prefValue = InputFilter::sanitize(InputFilter::magicDequote($httpVars["pref_value_" . $i]));
+                    if($prefName == "password") continue;
+                    if ($prefName != "pending_folder" && $userObject == null) {
+                        $i++;
+                        continue;
+                    }
+                    $userObject->setPref($prefName, $prefValue);
+                    $userObject->save("user");
+                    $i++;
+                }
+
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream(new UserMessage("Succesfully saved user preference")));
+
+                break;
+
+            case "cli_update_user_list":
+                // Action for updating all Pydio's user from ldap in CLI mode
+                if((php_sapi_name() == "cli")){
+                    // TODO : UPGRADE THIS TO NEW CLI FORMAT
+                    $progressBar = new ProgressBarCLI();
+                    $countCallback  = array($progressBar, "init");
+                    $loopCallback   = array($progressBar, "update");
+                    $bGroup = "/";
+                    if($ctx->hasUser()) $bGroup = $ctx->getUser()->getGroupPath();
+                    // Todo: switch to UsersService::browserUserGroupWithCallback()
+                    UsersService::listUsers($bGroup, null, -1, -1, true, true, $countCallback, $loopCallback);
+                }
+
+                break;
+
+            default:
+                break;
+
+        }
+
+        return $responseInterface;
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @return ResponseInterface
+     * @throws PydioException
+     */
+    public function delete(ServerRequestInterface $requestInterface, ResponseInterface $responseInterface){
+
+        $mess = LocaleService::getMessages();
+        $httpVars = $requestInterface->getParsedBody();
+        /** @var ContextInterface $ctx */
+        $ctx = $requestInterface->getAttribute("ctx");
+
+        if (isSet($httpVars["group"])) {
+
+            $groupPath = $httpVars["group"];
+            $groupPath = preg_replace('/^\/data\/users/', '', $groupPath);
+            $basePath = PathUtils::forwardSlashDirname($groupPath);
+            $basePath = ($ctx->hasUser() ? $ctx->getUser()->getRealGroupPath($basePath) : $basePath);
+            $gName = basename($groupPath);
+            UsersService::deleteGroup($basePath, $gName);
+
+            $resultMessage = $mess["ajxp_conf.128"];
+
+        } else {
+            if(empty($httpVars["user_id"]) || UsersService::isReservedUserId($httpVars["user_id"])
+                || $ctx->getUser()->getId() === $httpVars["user_id"]) {
+                throw new PydioException($mess["ajxp_conf.61"]);
+            }
+            UsersService::deleteUser($httpVars["user_id"]);
+            $resultMessage = $mess["ajxp_conf.60"];
+        }
+
+        $message = new UserMessage($resultMessage);
+        $reload = new ReloadMessage();
+        return $responseInterface->withBody(new SerializableResponseStream([$message, $reload]));
+
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @return ResponseInterface
+     */
+    public function search(ServerRequestInterface $requestInterface, ResponseInterface $responseInterface){
+
+        $httpVars   = $requestInterface->getParsedBody();
+        $ctx        = $requestInterface->getAttribute("ctx");
+        $nodesList = new NodesList();
+
+        if(!InputFilter::decodeSecureMagic($httpVars["dir"]) == "/data/users") {
+            return $responseInterface->withBody(new SerializableResponseStream($nodesList));
+        }
+
+        $query = InputFilter::decodeSecureMagic($httpVars["query"]);
+        $limit = $offset = -1;
+        if(isSet($httpVars["limit"])) $limit = intval(InputFilter::sanitize($httpVars["limit"], InputFilter::SANITIZE_ALPHANUM));
+        if(isSet($httpVars["offset"])) $offset = intval(InputFilter::sanitize($httpVars["offset"], InputFilter::SANITIZE_ALPHANUM));
+        $this->recursiveSearchGroups($ctx, $nodesList, "/", $query, $offset, $limit);
+
+        return $responseInterface->withBody(new SerializableResponseStream($nodesList));
+
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface Full set of query parameters
+     * @param string $rootPath Path to prepend to the resulting nodes
+     * @param string $relativePath Specific path part for this function
+     * @param string $paginationHash Number added to url#2 for pagination purpose.
+     * @param string $findNodePosition Path to a given node to try to find it
+     * @param string $aliasedDir Aliased path used for alternative url
+     * @return NodesList A populated NodesList object, eventually recursive.
+     */
+    public function listNodes(ServerRequestInterface $requestInterface, $rootPath, $relativePath, $paginationHash = null, $findNodePosition = null, $aliasedDir = null)
+    {
+        $fullBasePath   = "/" . $rootPath . "/" . $relativePath;
+        $USER_PER_PAGE  = 50;
+        $messages       = LocaleService::getMessages();
+        $nodesList      = new NodesList();
+        $parentNode     = new AJXP_Node($fullBasePath, [
+            "remote_indexation" => "admin_search_users",
+            "is_file" => false,
+            "text" => ""
+        ]);
+        if(isSet($requestInterface->getParsedBody()["format"])){
+            $format = $requestInterface->getParsedBody()["format"];
+        }else if($requestInterface->getAttribute("api") === "v2"){
+            $format = "json";
+        }else{
+            $format = "xml";
+        }
+
+
+        $nodesList->setParentNode($parentNode);
+
+        $baseGroup      = ($relativePath === "users" ? "/" : substr($relativePath, strlen("users")));
+        if($this->context->hasUser()){
+            $baseGroup = $this->context->getUser()->getRealGroupPath($baseGroup);
+        }
+
+        if ($findNodePosition != null && $paginationHash == null) {
+
+            $findNodePositionPath = $fullBasePath."/".$findNodePosition;
+            $position = UsersService::findUserPage($baseGroup, $findNodePosition, $USER_PER_PAGE);
+
+            if($position != -1){
+                $nodesList->addBranch(new AJXP_Node($findNodePositionPath, [
+                    "text" => $findNodePosition,
+                    "page_position" => $position
+                ]));
+            }else{
+                // Loop on each page to find the correct page.
+                $count = UsersService::authCountUsers($baseGroup);
+                $pages = ceil($count / $USER_PER_PAGE);
+                for ($i = 0; $i < $pages ; $i ++) {
+
+                    $newList = $this->listNodes($requestInterface, $rootPath, $relativePath, $i+1, true, $findNodePosition);
+                    $foundNode = $newList->findChildByPath($findNodePositionPath);
+                    if ($foundNode !== null) {
+                        $foundNode->mergeMetadata(["page_position" => $i+1]);
+                        $nodesList->addBranch($foundNode);
+                        break;
+                    }
+                }
+            }
+            return $nodesList;
+
+        }
+
+        $nodesList->initColumnsData("filelist", "list", "ajxp_conf.users");
+        $nodesList->appendColumn("ajxp_conf.6", "ajxp_label", "String", "40%");
+        $nodesList->appendColumn("ajxp_conf.102", "object_id", "String", "10%");
+        if(UsersService::driverSupportsAuthSchemes()){
+            $nodesList->appendColumn("ajxp_conf.115", "auth_scheme", "String", "5%");
+            $nodesList->appendColumn("ajxp_conf.7", "isAdmin", "String", "5%");
+        }else{
+            $nodesList->appendColumn("ajxp_conf.7", "isAdmin", "String", "10%");
+        }
+        $nodesList->appendColumn("ajxp_conf.70", "ajxp_roles", "String", "15%");
+        $nodesList->appendColumn("ajxp_conf.62", "rights_summary", "String", "15%");
+
+        if(!UsersService::usersEnabled()) return $nodesList;
+
+        if(empty($paginationHash)) $paginationHash = 1;
+        $count = UsersService::authCountUsers($baseGroup, "", null, null, false);
+        if (UsersService::authSupportsPagination() && $count >= $USER_PER_PAGE) {
+
+            $offset = ($paginationHash - 1) * $USER_PER_PAGE;
+            $nodesList->setPaginationData($count, $paginationHash, ceil($count / $USER_PER_PAGE));
+            $users = UsersService::listUsers($baseGroup, "", $offset, $USER_PER_PAGE, true, false);
+            if ($paginationHash == 1) {
+                $groups = UsersService::listChildrenGroups($baseGroup);
+            } else {
+                $groups = array();
+            }
+
+        } else {
+
+            $users = UsersService::listUsers($baseGroup, "", -1, -1, true, false);
+            $groups = UsersService::listChildrenGroups($baseGroup);
+
+        }
+
+        if($format === "json" && $baseGroup !== "/"){
+
+            $siblingGroups = UsersService::listChildrenGroups(dirname($baseGroup));
+            $gKey = "/".basename($baseGroup);
+            $baseGroupLabel = isset($siblingGroups[$gKey]) ? $siblingGroups[$gKey] : null;
+            if(!count($users) && !count($groups) && $baseGroupLabel === null){
+                // Group does not seem to exist. Maybe we are getting info about a user here
+                try{
+                    $testUser = UsersService::getUserById(basename($baseGroup));
+                    if($testUser->getGroupPath() === dirname($baseGroup)){
+                        $userMeta = $this->serializeUserMetadata($testUser, $format, $messages);
+                        $nodesList->setParentNode(new AJXP_Node($testUser->getId(), $userMeta));
+                        return $nodesList;
+                    }
+                } catch (UserNotFoundException $unf){}
+            } else if($baseGroupLabel !== null) {
+                $parentNode = new AJXP_Node($baseGroup, $this->serializeGroupMetadata($baseGroup, $baseGroupLabel));
+                $nodesList->setParentNode($parentNode);
+            }
+
+        }
+
+
+        // Append Root Group
+        if($this->pluginName === "ajxp_admin" && $baseGroup == "/" && $paginationHash == 1 && !$this->currentUserIsGroupAdmin()){
+
+            $topMeta = $this->serializeGroupMetadata("/", $messages["ajxp_conf.151"]);
+            $topMeta["icon_class"] = "icon-home";
+            $rootGroupNode = new AJXP_Node($fullBasePath ."/", $topMeta);
+            $nodesList->addBranch($rootGroupNode);
+
+        }
+
+        // LIST GROUPS
+        foreach ($groups as $groupId => $groupLabel) {
+
+            $nodeKey = $fullBasePath ."/".ltrim($groupId,"/");
+            $meta = $this->serializeGroupMetadata($groupId, $groupLabel);
+            $this->appendBookmarkMeta($nodeKey, $meta);
+            if($requestInterface->getAttribute("api") === "v2"){
+                $meta["group_role_id"] = "/AJXP_GRP_".rtrim($baseGroup, "/")."/".ltrim($groupId, "/");
+                $nodeKey = InputFilter::securePath("/".$baseGroup.$groupId);
+            }
+            $nodesList->addBranch(new AJXP_Node($nodeKey, $meta));
+        }
+
+        // LIST USERS
+        $userArray  = array();
+        $logger     = Logger::getInstance();
+        if(method_exists($logger, "usersLastConnection")){
+            $allUserIds = array();
+        }
+        foreach ($users as $userObject) {
+            $label = $userObject->getId();
+            if(isSet($allUserIds)) $allUserIds[] = $label;
+            if ($userObject->hasParent()) {
+                $label = $userObject->getParent()."000".$label;
+            }else{
+                $children = ConfService::getConfStorageImpl()->getUserChildren($label);
+                foreach($children as $addChild){
+                    $userArray[$label."000".$addChild->getId()] = $addChild;
+                }
+            }
+            $userArray[$label] = $userObject;
+        }
+        if(isSet($allUserIds) && count($allUserIds)){
+            $connections = $logger->usersLastConnection($allUserIds);
+        }else{
+            $connections = [];
+        }
+
+        ksort($userArray);
+
+        /** @var UserInterface $userObject */
+        foreach ($userArray as $userObject) {
+
+            $userId  = $userObject->getId();
+            $bmKey   = $fullBasePath. "/" .$userId;
+            $nodeKey = $format === "json" ? $userId : $bmKey;
+            $meta = $this->serializeUserMetadata($userObject, $format, $messages, $connections);
+            $this->appendBookmarkMeta($bmKey, $meta);
+            $nodesList->addBranch(new AJXP_Node($nodeKey, $meta));
+
+        }
+        return $nodesList;
+    }
+
+    /**
+     * @param string $groupId
+     * @param string $groupLabel
+     * @return array
+     */
+    protected function serializeGroupMetadata($groupId, $groupLabel){
+        return [
+            "icon" => "users-folder.png",
+            "icon_class" => "icon-folder-close",
+            "ajxp_mime" => "group",
+            "object_id" => $groupId,
+            "text"      => $groupLabel,
+            "is_file"   => false
+        ];
+    }
+
+    /**
+     * @param UserInterface $userObject
+     * @param string $format
+     * @param array $messages
+     * @param array
+     * @return array
+     */
+    protected function serializeUserMetadata($userObject, $format, $messages, $connections = []){
+
+        $repos = ConfService::getConfStorageImpl()->listRepositories($userObject);
+        $isAdmin = $userObject->isAdmin();
+        $userId = $userObject->getId();
+        $icon = "user".($userId=="guest"?"_guest":($isAdmin?"_admin":""));
+        $iconClass = "icon-user";
+        if ($userObject->hasParent()) {
+            $icon = "user_child";
+            $iconClass = "icon-angle-right";
+        }
+        if ($isAdmin) {
+            $rightsString = $messages["ajxp_conf.63"];
+        } else {
+            $r = array();
+            foreach ($repos as $repoId => $repository) {
+                if($repository->getAccessType() == "ajxp_shared") continue;
+                if(!$userObject->canRead($repoId) && !$userObject->canWrite($repoId)) continue;
+                $rs = ($userObject->canRead($repoId) ? "r" : "");
+                $rs .= ($userObject->canWrite($repoId) ? "w" : "");
+                $r[] = $repository->getDisplay()." (".$rs.")";
+            }
+            $rightsString = implode(", ", $r);
+        }
+        $nodeLabel = UsersService::getUserPersonalParameter("USER_DISPLAY_NAME", $userObject, "core.conf", $userId);
+        $scheme = UsersService::getAuthScheme($userId);
+        $roles = array_filter(array_keys($userObject->getRoles()), array($this, "filterReservedRoles"));
+        $mergedRole = $userObject->getMergedRole()->getDataArray(true);
+        $meta = [];
+        if($format !== "json"){
+            $mergedRole = json_encode($mergedRole);
+            $currentRoles = implode(", ", $roles);
+        }else{
+            $currentRoles = $roles;
+            $meta["personal_role_id"] = "/AJXP_USR_/".$userId;
+            $meta["lock"] = $userObject->getLock();
+            $meta["profile"] = $userObject->getProfile();
+        }
+        $meta = array_merge($meta, [
+            "text" => $nodeLabel,
+            "is_file" => true,
+            "isAdmin" => ($format === "json" ? $isAdmin : $messages[($isAdmin?"ajxp_conf.14":"ajxp_conf.15")]),
+            "icon" => $icon.".png",
+            "icon_class" => $iconClass,
+            "object_id" => $userId,
+            "auth_scheme" => ($scheme != null? $scheme : ""),
+            "rights_summary" => $rightsString,
+            "ajxp_roles" => $currentRoles,
+            "ajxp_mime" => "user".(($userId!="guest"&&$userId!=$this->context->getUser()->getId())?"_editable":""),
+            "json_merged_role" => $mergedRole
+        ]);
+        if($userObject->hasParent()) {
+            $meta["shared_user"] = "true";
+        }
+        if(isSet($connections) && isSet($connections[$userObject->getId()]) && !empty($connections[$userObject->getId()])) {
+            $meta["last_connection"] = strtotime($connections[$userObject->getId()]);
+            $meta["last_connection_readable"] = StatHelper::relativeDate($meta["last_connection"], $messages);
+        }
+
+        return $meta;
+
+    }
+
+    /**
+     * Do not display AJXP_GRP_/ and AJXP_USR_/ roles if not in server debug mode
+     * @param $key
+     * @return bool
+     */
+    protected function filterReservedRoles($key){
+        return (strpos($key, "AJXP_GRP_/") === FALSE && strpos($key, "AJXP_USR_/") === FALSE);
+    }
+
+    /**
+     * @param UserInterface $ctxUser
+     * @param $userId
+     * @param $roleId
+     * @param $addOrRemove
+     * @param bool $updateSubUsers
+     * @return UserInterface
+     * @throws UserNotFoundException
+     * @throws PydioException
+     */
+    protected function updateUserRole(UserInterface $ctxUser, $userId, $roleId, $addOrRemove, $updateSubUsers = false)
+    {
+        $user = UsersService::getUserById($userId);
+        if(!empty($ctxUser) && !$ctxUser->canAdministrate($user)){
+            throw new PydioException("Cannot update user data for ".$userId);
+        }
+        if ($addOrRemove == "add") {
+            $roleObject = RolesService::getRole($roleId);
+            $user->addRole($roleObject);
+        } else {
+            $user->removeRole($roleId);
+        }
+        $user->save("superuser");
+        if ($ctxUser->getId() == $user->getId()) {
+            AuthService::updateSessionUser($user);
+        }
+        return $user;
+
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param NodesList $nodesList
+     * @param string $baseGroup
+     * @param string $term
+     * @param int $offset
+     * @param int $limit
+     */
+    public function recursiveSearchGroups(ContextInterface $ctx, &$nodesList, $baseGroup, $term, $offset=-1, $limit=-1)
+    {
+        if($ctx->hasUser()){
+            $baseGroup = $ctx->getUser()->getRealGroupPath($baseGroup);
+        }
+
+        $groups     = UsersService::listChildrenGroups($baseGroup);
+        foreach ($groups as $groupId => $groupLabel) {
+
+            if (preg_match("/$term/i", $groupLabel) == TRUE ) {
+                $trimmedG = trim($baseGroup, "/");
+                if(!empty($trimmedG)) $trimmedG .= "/";
+                $nodeKey = "/data/users/".$trimmedG.ltrim($groupId,"/");
+                $meta = array(
+                    "icon"          => "users-folder.png",
+                    "text"          => $groupLabel,
+                    "is_file"       => false,
+                    "ajxp_mime"     => "group_editable"
+                );
+                $this->appendBookmarkMeta($nodeKey, $meta);
+                $nodesList->addBranch(new AJXP_Node($nodeKey, $meta));
+            }
+            $this->recursiveSearchGroups($ctx, $nodesList, rtrim($baseGroup, "/")."/".ltrim($groupId, "/"), $term);
+
+        }
+
+        $users = UsersService::listUsers($baseGroup, $term, $offset, $limit);
+        foreach ($users as $userId => $userObject) {
+            $gPath = $userObject->getGroupPath();
+            $realGroup = $ctx->getUser()->getRealGroupPath($ctx->getUser()->getGroupPath());
+            if(strlen($realGroup) > 1 && strpos($gPath, $realGroup) === 0){
+                $gPath = substr($gPath, strlen($realGroup));
+            }
+            $trimmedG = trim($gPath, "/");
+            if(!empty($trimmedG)) $trimmedG .= "/";
+
+            $userDisplayName = UsersService::getUserPersonalParameter("USER_DISPLAY_NAME", $userObject, "core.conf", $userId);
+            $nodeKey = "/data/users/".$trimmedG.$userId;
+            $meta = array(
+                "icon"          => "user.png",
+                "text"          => $userDisplayName,
+                "is_file"       => true,
+                "ajxp_mime"     => "user_editable"
+            );
+            $this->appendBookmarkMeta($nodeKey, $meta);
+            $nodesList->addBranch(new AJXP_Node($nodeKey, $meta));
+
+        }
+
+    }
+
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/access.ajxp_home/HomePagePlugin.php b/core/src/plugins/access.ajxp_home/HomePagePlugin.php
new file mode 100644
index 0000000000..17949bf32e
--- /dev/null
+++ b/core/src/plugins/access.ajxp_home/HomePagePlugin.php
@@ -0,0 +1,71 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ *
+ */
+namespace Pydio\Access\Driver\DataProvider;
+use DOMXPath;
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Core\Model\ContextInterface;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+/**
+ * @package AjaXplorer_Plugins
+ * @subpackage Access
+ * @class userHome
+ * Plugin to access the shared elements of the current user
+ */
+class HomePagePlugin extends AbstractAccessDriver
+{
+
+    /**
+     * @param ContextInterface $ctx
+     * @param \DOMNode $contribNode
+     */
+    public function parseSpecificContributions(ContextInterface $ctx, \DOMNode &$contribNode){
+        parent::parseSpecificContributions($ctx, $contribNode);
+        if($contribNode->nodeName == "client_configs"){
+            $actionXpath=new DOMXPath($contribNode->ownerDocument);
+            $gettingStartedList = $actionXpath->query('template[@name="tutorial_pane"]', $contribNode);
+            if(!$gettingStartedList->length) return ;
+            if($this->getContextualOption($ctx, "ENABLE_GETTING_STARTED") === false){
+                $contribNode->removeChild($gettingStartedList->item(0));
+            }else{
+                $cdata = $gettingStartedList->item(0)->firstChild;
+                $keys = array("URL_APP_IOSAPPSTORE", "URL_APP_ANDROID", "URL_APP_SYNC_WIN", "URL_APP_SYNC_MAC");
+                $values = array();
+                foreach($keys as $k) $values[] = $this->getContextualOption($ctx, $k);
+                $newData = str_replace($keys, $values, $cdata->nodeValue);
+                $newCData = $contribNode->ownerDocument->createCDATASection($newData);
+                $gettingStartedList->item(0)->appendChild($newCData);
+                $gettingStartedList->item(0)->replaceChild($newCData, $cdata);
+            }
+        }else if($contribNode->nodeName == "actions" && $this->getContextualOption($ctx, "DISPLAY_SERVER_QRCODE_ACTION") === false){
+            $actionXpath = new DOMXPath($contribNode->ownerDocument);
+            $actionList = $actionXpath->query('action[@name="display-server-qrcode"]', $contribNode);
+            $contribNode->removeChild($actionList->item(0));
+        }
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     */
+    protected function initRepository(ContextInterface $ctx){
+    }
+}
diff --git a/core/src/plugins/access.ajxp_home/class.HomePagePlugin.php b/core/src/plugins/access.ajxp_home/class.HomePagePlugin.php
deleted file mode 100644
index 12e420e6d7..0000000000
--- a/core/src/plugins/access.ajxp_home/class.HomePagePlugin.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-/**
- * @package AjaXplorer_Plugins
- * @subpackage Access
- * @class userHome
- * AJXP_Plugin to access the shared elements of the current user
- */
-class HomePagePlugin extends AbstractAccessDriver
-{
-
-    public function initRepository()
-    {
-        //require_once AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/action.share/class.ShareCenter.php";
-    }
-
-    public function parseSpecificContributions(&$contribNode){
-        parent::parseSpecificContributions($contribNode);
-        if($contribNode->nodeName == "client_configs"){
-            $actionXpath=new DOMXPath($contribNode->ownerDocument);
-            $gettingStartedList = $actionXpath->query('template[@name="tutorial_pane"]', $contribNode);
-            if(!$gettingStartedList->length) return ;
-            if($this->getFilteredOption("ENABLE_GETTING_STARTED") === false){
-                $contribNode->removeChild($gettingStartedList->item(0));
-            }else{
-                $cdata = $gettingStartedList->item(0)->firstChild;
-                $keys = array("URL_APP_IOSAPPSTORE", "URL_APP_ANDROID", "URL_APP_SYNC_WIN", "URL_APP_SYNC_MAC");
-                $values = array();
-                foreach($keys as $k) $values[] = $this->getFilteredOption($k);
-                $newData = str_replace($keys, $values, $cdata->nodeValue);
-                $newCData = $contribNode->ownerDocument->createCDATASection($newData);
-                $gettingStartedList->item(0)->appendChild($newCData);
-                $gettingStartedList->item(0)->replaceChild($newCData, $cdata);
-            }
-        }else if($contribNode->nodeName == "actions" && $this->getFilteredOption("DISPLAY_SERVER_QRCODE_ACTION") === false){
-            $actionXpath = new DOMXPath($contribNode->ownerDocument);
-            $actionList = $actionXpath->query('action[@name="display-server-qrcode"]', $contribNode);
-            $contribNode->removeChild($actionList->item(0));
-        }
-    }
-
-}
diff --git a/core/src/plugins/access.ajxp_home/manifest.xml b/core/src/plugins/access.ajxp_home/manifest.xml
index 8624cb0f40..291fd789c1 100644
--- a/core/src/plugins/access.ajxp_home/manifest.xml
+++ b/core/src/plugins/access.ajxp_home/manifest.xml
@@ -13,6 +13,8 @@
                       description="CONF_MESSAGE[Open workspace by simple click instead of double click.]" default="true" expose="true"/>
         <global_param name="ENABLE_GETTING_STARTED" type="boolean"
                       label="CONF_MESSAGE[Enable Getting Started]" description="CONF_MESSAGE[Enable addition tabulation to access getting started videos]" default="true" expose="true"/>
+        <global_param name="ENABLE_GLOBAL_SEARCH" type="boolean"
+                      label="CONF_MESSAGE[Enable Global Search]" description="CONF_MESSAGE[Enable cross-workspaces search form on home page]" default="true" expose="true"/>
         <global_param name="URL_APP_IOSAPPSTORE" type="string" expose="true"
                       label="CONF_MESSAGE[iOS App URL]" description="CONF_MESSAGE[URL of the iOS application]" default="https://itunes.apple.com/us/app/pydio/id709275884?mt=8"/>
         <global_param name="URL_APP_ANDROID" type="string" expose="true"
@@ -27,7 +29,7 @@
 	<registry_contributions>
         <actions>
             <action name="display-server-qrcode">
-                <gui src="folder.png" iconClass="mdi mdi-qrcode-scan" text="user_home.72" title="user_home.73">
+                <gui src="folder.png" iconClass="mdi mdi-qrcode-scan" text="user_home.72" title="user_home.74">
                     <context actionBarGroup="utils" actionBar="true" dir="true" recycle="true" selection="false" ajxpWidgets="UserWidget::logging_string"/>
                 </gui>
                 <processing>
@@ -42,92 +44,10 @@
             </action>
         </actions>
 		<client_configs>
-            <template_part theme="umbra" ajxpId="sidebar_splitter" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fake":"option"}'><![CDATA[
-                <div id="folderPane" ajxpClass="FoldersTree" ajxpOptions='{"display":"dz","replaceScroller":true}' ajxpPaneHeader="363" ajxpPaneIcon="view_tree.png" style="margin:20px;"></div>
-                <style>#sidebar_splitter{padding-bottom:20px;background-color:#A0C0A4;}</style>
-            ]]></template_part>
-            <template_part ajxpClass="AjxpPane" ajxpId="workspace_toolbar" ajxpOptions='{"fit":"none"}' theme="vision"><![CDATA[
-                <div id="search_container_settings" class="settings_search_container" style="display:none;" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "fitMarginBottom":20}'></div>
-                <style>
-                #workspace_toolbar{
-                    display:none;
-                }
-                #browser{
-                    padding:0;
-                    background-color: #ACB2B9;
-                }
-                div.flat_tabulator span.toggleHeader{
-                    background-color: #e35d52;
-                }
-                .largeButton, .SF_input.SF_inlineButton{
-                    background-color: #e35d52;
-                }
-                .action_bar{
-                    background-color: #ebedf0;
-                    padding: 4px;
-                    border-left:1px solid #5C5C5C;
-                }
-                #user_profile_form, div.class-FetchedResultPane{
-                    border-left:1px solid #5C5C5C;
-                }
-                #account_pane .action_bar{
-                    text-align: right;
-                }
-                .action_bar a{
-                    background-color: #e35d52;
-                    margin-top:3px;
-                    cursor: pointer;
-                }
-                div.class-FetchedResultPane{
-                    background-color: #f8f8f8;
-                }
-                #buttons_bar{
-                    padding-bottom: 2px;
-                    text-align: right;
-                }
-                #buttons_bar a {
-                    padding-bottom: 0;
-                    height: 26px;
-                }
-                .action_bar span.actionbar_button_label{
-                    font-size: 11px;
-                }
-                .flat_tabulator div.panelHeader.tabulatorContainer{
-                    background-color: #30383A;
-                    padding-top: 10px;
-                }
-                .flat_tabulator span.toggleHeader:first-of-type {
-                    background-color: #e35d52 !important;
-                }
-                .flat_tabulator span.toggleHeader.toggleInactive {
-                    background-color: rgba(119, 119, 119, 0.35) !important;
-                }
-                </style>
-            ]]></template_part>
-            <template_part ajxpClass="AjxpPane" ajxpId="browser" ajxpOptions='{"fit":"height"}' theme="vision"><![CDATA[
-                <div id="home_account_pane" ajxpClass="UserDashboardHome" class="vertical_fit horizontal_layout">
-                    <div id="home_left_bar" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
-                        <div id="welcome"></div>
-                        <div id="workspaces_center" ajxpClass="AjxpPane"  ajxpOptions='{"fit":"height"}'>
-                            <div id="list_cont" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitMarginBottom":100}'>
-                                <ul id="workspaces_list"></ul>
-                            </div>
-                            <div id="workspaces_button">
-                                <input type="checkbox" name="save_ws_choice" id="save_ws_choice" class="disabled" disabled><label for="save_ws_choice">AJXP_MESSAGE[user_home.41]</label>
-                                <input type="button" name="go_to_ws" id="go_to_ws" value="AJXP_MESSAGE[user_home.42]" class="disabled">
-                            </div>
-                        </div>
-                    </div>
-                    <div id="home_center_panel" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","flexTo":"browser"}'>
-                        <div id="logo_div"><img src=""></div>
-                        <div id="ws_legend"></div>
-                    </div>
-                </div>
-            ]]></template_part>
             <template_part ajxpId="orbit_content" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop", "imageBackgroundFromConfigs":"access.ajxp_home/WELCOME_PAGE_BACKGROUND_","messageBoxReference":true}' theme="orbit"><![CDATA[
                 <div id="home_account_pane" style="opacity:0;" ajxpClass="AjxpReactComponent" ajxpOptions='{"fit":"height", "componentNamespace":"WelcomeComponents", "componentName":"UserDashboard"}' class="horizontal_layout"></div>
 			]]></template_part>
         </client_configs>
 	</registry_contributions>
-    <class_definition filename="plugins/access.ajxp_home/class.HomePagePlugin.php" classname="HomePagePlugin"/>
+    <class_definition filename="plugins/access.ajxp_home/HomePagePlugin.php" classname="Pydio\Access\Driver\DataProvider\HomePagePlugin"/>
 </ajxpdriver>
diff --git a/core/src/plugins/access.ajxp_home/package.json b/core/src/plugins/access.ajxp_home/package.json
index 3b93f080dd..ef7ce7498e 100644
--- a/core/src/plugins/access.ajxp_home/package.json
+++ b/core/src/plugins/access.ajxp_home/package.json
@@ -8,7 +8,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "Abstrium SAS",
-  "license": "proprietary",
+  "license": "AGPL",
   "devDependencies": {
     "grunt": "~0.4.5",
     "grunt-babel": "~5.0.3",
diff --git a/core/src/plugins/access.ajxp_home/res/home.css b/core/src/plugins/access.ajxp_home/res/home.css
index 5fc8e6683a..3ba8724c0d 100644
--- a/core/src/plugins/access.ajxp_home/res/home.css
+++ b/core/src/plugins/access.ajxp_home/res/home.css
@@ -97,7 +97,7 @@
 }
 #home_account_pane #home_left_bar #workspaces_center .workspaces .workspace-entry .workspace-label {
   padding: 0;
-  font-weight: 500;
+  font-weight: 400;
   font-size: 18px;
   margin: 0;
   line-height: 26px;
@@ -200,7 +200,7 @@
 }
 #home_account_pane #home_center_panel div#logo_div {
   transition: all 550ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;
-  margin-top: 20%;
+  margin-top: 17%;
   position: relative;
 }
 #home_account_pane #home_center_panel.legend_visible div#logo_div {
@@ -647,6 +647,96 @@ div#tutorial_dl_apps_pane div#dl_pydio_mac div {
 div#tutorial_dl_apps_pane div#dl_pydio_android a.icon-android {
   top: 30px;
 }
+div.home_search {
+  text-align: center;
+  position: relative;
+  top: 120px;
+  background-color: transparent;
+  width: 710px;
+  margin: 0 auto;
+  height: 40px;
+  overflow: visible;
+}
+div.home_search div.react-autosuggest {
+  position: absolute;
+}
+div.home_search div.react-autosuggest input.react-autosuggest__input {
+  width: 340px;
+  font-size: 16px;
+  padding: 8px 0;
+  position: relative;
+  border-width: 0 0 1px 0;
+  border-color: white;
+  border-radius: 0;
+  background-color: transparent;
+  color: white;
+}
+div.home_search div.react-autosuggest input.react-autosuggest__input::-webkit-input-placeholder {
+  color: rgba(255, 255, 255, 0.73);
+}
+div.home_search div.react-autosuggest input.react-autosuggest__input:-moz-placeholder {
+  /* Firefox 18- */
+  color: rgba(255, 255, 255, 0.73);
+}
+div.home_search div.react-autosuggest input.react-autosuggest__input::-moz-placeholder {
+  /* Firefox 19+ */
+  color: rgba(255, 255, 255, 0.73);
+}
+div.home_search div.react-autosuggest input.react-autosuggest__input:-ms-input-placeholder {
+  color: rgba(255, 255, 255, 0.73);
+}
+div.home_search div.react-autosuggest .react-autosuggest__suggestions {
+  width: 340px;
+  background-color: rgba(255, 255, 255, 0.98);
+  max-height: 235px;
+}
+div.home_search div.react-autosuggest .react-autosuggest__suggestions li.react-autosuggest__suggestion {
+  text-align: left;
+}
+div.home_search div.react-autosuggest .react-autosuggest__suggestions li.react-autosuggest__suggestion span.nodeSuggestion {
+  display: block;
+  padding: 16px 8px;
+  border-bottom: 1px solid #e0e0e0;
+  font-size: 14px;
+  color: rgba(0, 0, 0, 0.93);
+  cursor: pointer;
+}
+div.home_search div.react-autosuggest .react-autosuggest__suggestions li.react-autosuggest__suggestion span.nodeSuggestion span.highlight {
+  display: inline-block;
+  background-color: rgba(255, 255, 0, 0.26);
+}
+div.home_search div.react-autosuggest .react-autosuggest__suggestions li.react-autosuggest__suggestion span.nodeSuggestion span.icon {
+  font-size: 16px;
+  display: inline-block;
+  margin: 0 12px 0 5px;
+  color: rgba(0, 0, 0, 0.73);
+  text-align: center;
+  width: 25px;
+}
+div.home_search div.react-autosuggest .react-autosuggest__suggestions li.react-autosuggest__suggestion span.groupHeader {
+  display: block;
+  padding: 8px 8px;
+  border-bottom: 0px;
+  font-size: 13px;
+  color: white;
+  cursor: pointer;
+  background-color: #009688;
+}
+div.home_search div.react-autosuggest .react-autosuggest__suggestions li.react-autosuggest__suggestion span.groupHeader span.openicon {
+  display: none;
+  float: right;
+}
+div.home_search div.react-autosuggest .react-autosuggest__suggestions li.react-autosuggest__suggestion span.groupHeader:hover span.openicon {
+  margin-top: 3px;
+  display: inline-block;
+}
+div.home_search span.suggest-search {
+  font-size: 16px;
+  position: absolute;
+  color: white;
+  right: 380px;
+  top: 10px;
+}
 .form-qrcode_dialog_form {
   min-width: 296px;
 }
@@ -668,7 +758,10 @@ div#tutorial_dl_apps_pane div#dl_pydio_android a.icon-android {
     width: 100px;
   }
 }
-@media only screen and (max-width: 800px) {
+@media only screen and (max-width: 800px) and (min-width: 420px) {
+  #logo_div {
+    margin-top: 25% !important;
+  }
   #logo_div img {
     width: 210px;
   }
@@ -682,14 +775,26 @@ div#tutorial_dl_apps_pane div#dl_pydio_android a.icon-android {
     margin-right: 3%;
     margin-left: 3%;
   }
-  #dl_pydio_cont {
-    width: 400px !important;
+  div#dl_pydio_cont {
+    width: 650px !important;
+  }
+  div.home_search {
+    width: 650px !important;
+  }
+  div.home_search span.suggest-search {
+    right: 320px;
   }
   #dl_pydio_for {
     display: none;
   }
-  #home_left_bar {
-    width: 380px;
+  #home_account_pane #home_left_bar {
+    width: 300px;
+  }
+  #home_account_pane #home_left_bar .workspace-entry {
+    padding: 8px 10px 8px 23px !important;
+  }
+  #home_account_pane #home_left_bar .workspace-entry span.workspace-badge {
+    display: none !important;
   }
   #welcome {
     font-size: 1em;
@@ -703,9 +808,9 @@ div#tutorial_dl_apps_pane div#dl_pydio_android a.icon-android {
     padding: 0 30px;
   }
 }
-@media only screen and (max-width: 400px) {
+@media only screen and (max-width: 420px) {
   #home_left_bar {
-    width: 100%;
+    width: 100% !important;
     position: absolute;
     top: 0;
     height: 100%;
diff --git a/core/src/plugins/access.ajxp_home/res/home.less b/core/src/plugins/access.ajxp_home/res/home.less
index e3e9b8956d..b65f5a2fa9 100644
--- a/core/src/plugins/access.ajxp_home/res/home.less
+++ b/core/src/plugins/access.ajxp_home/res/home.less
@@ -101,7 +101,7 @@
 
           .workspace-label{
             padding: 0;
-            font-weight: 500;
+            font-weight: 400;
             font-size: 18px;
             margin: 0;
             line-height: 26px;
@@ -216,7 +216,7 @@
     height: 100%;
     div#logo_div{
       transition: @bezier_transition;
-      margin-top:20%;
+      margin-top:17%;
       position: relative;
     }
     &.legend_visible div#logo_div{
@@ -615,7 +615,8 @@ div#tutorial_dl_apps_pane{
   }
 
   div#dl_pydio_cont{
-    width: 750px; margin: 0 auto;
+    width: 750px;
+    margin: 0 auto;
     background-color: transparent;
   }
   div#dl_pydio_for{
@@ -679,6 +680,99 @@ div#tutorial_dl_apps_pane{
 
 }
 
+div.home_search{
+  text-align: center;
+  position: relative;
+  top: 120px;
+  background-color: transparent;
+  width: 710px;
+  margin: 0 auto;
+  height: 40px;
+  overflow: visible;
+
+  div.react-autosuggest{
+    position: absolute;
+    input.react-autosuggest__input {
+      width: 340px;
+      font-size:16px;
+      padding: 8px 0;
+      position: relative;
+      border-width:0 0 1px 0;
+      border-color: white;
+      border-radius: 0;
+      background-color: transparent;
+      color: white;
+      @placeholder: rgba(255, 255, 255, 0.73);
+      &::-webkit-input-placeholder {
+        color: @placeholder;
+      }
+      &:-moz-placeholder { /* Firefox 18- */
+        color: @placeholder;
+      }
+      &::-moz-placeholder {  /* Firefox 19+ */
+        color: @placeholder;
+      }
+      &:-ms-input-placeholder {
+        color: @placeholder;
+      }
+    }
+    .react-autosuggest__suggestions{
+      width: 340px;
+      background-color: rgba(255, 255, 255, 0.98);
+      max-height: 235px;
+      li.react-autosuggest__suggestion{
+        text-align: left;
+        span.nodeSuggestion{
+          display: block;
+          padding: 16px 8px;
+          border-bottom: 1px solid #e0e0e0;
+          font-size:14px;
+          color: rgba(0,0,0,0.93);
+          cursor: pointer;
+          span.highlight{
+            display: inline-block;
+            background-color: rgba(255, 255, 0, 0.26);
+          }
+          span.icon{
+            font-size:16px;
+            display: inline-block;
+            margin: 0 12px 0 5px;
+            color: rgba(0,0,0,0.73);
+            text-align: center;
+            width: 25px;
+          }
+        }
+        span.groupHeader{
+          display: block;;
+          padding: 8px 8px;
+          border-bottom: 0px;
+          font-size:13px;
+          color: white;
+          cursor: pointer;
+          background-color: #009688;
+          span.openicon{
+            display: none;
+            float: right;
+          }
+          &:hover{
+            span.openicon{
+              margin-top: 3px;
+              display: inline-block;
+            }
+          }
+        }
+      }
+    }
+  }
+  span.suggest-search{
+    font-size:16px;
+    position: absolute;
+    color: white;
+    right: 380px;
+    top: 10px
+  }
+
+}
 
 .form-qrcode_dialog_form{
   min-width: 296px;
@@ -705,10 +799,13 @@ and (max-width : 980px){
 }
 
 @media only screen
-and (max-width : 800px){
+and (max-width : 800px) and (min-width: 420px){
 
-    #logo_div img{
-        width: 210px;
+    #logo_div{
+      margin-top: 25% !important;
+      img{
+          width: 210px;
+      }
     }
 
     .tutorial_legend{
@@ -722,15 +819,30 @@ and (max-width : 800px){
         margin-right: 3%;
         margin-left: 3%;
     }
-    #dl_pydio_cont{
-        width: 400px !important;
+    div#dl_pydio_cont {
+      width: 650px !important;
+    }
+    div.home_search{
+      width: 650px !important;
+      span.suggest-search{
+        right:320px;
+      }
     }
+
     #dl_pydio_for{
         display: none;
     }
 
-    #home_left_bar{
-        width: 380px;
+    #home_account_pane{
+      #home_left_bar{
+        width: 300px;
+        .workspace-entry{
+          padding: 8px 10px 8px 23px !important;
+          span.workspace-badge{
+            display: none !important;
+          }
+        }
+      }
     }
 
     #welcome{
@@ -750,9 +862,9 @@ and (max-width : 800px){
 }
 
 @media only screen
-and (max-width : 400px){
+and (max-width : 420px){
   #home_left_bar{
-    width: 100%;
+    width: 100% !important;
     position: absolute;
     top:0;
     height: 100%;
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/ca.php b/core/src/plugins/access.ajxp_home/res/i18n/ca.php
index 874d5314ee..cfb180ec3b 100644
--- a/core/src/plugins/access.ajxp_home/res/i18n/ca.php
+++ b/core/src/plugins/access.ajxp_home/res/i18n/ca.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 // catalan translation: Salva Gómez <salva.gomez at gmail.com>, 2015
 
@@ -90,5 +90,7 @@
     "72" => "Server QRCode",
     "73" => "Easily connect your mobile applications",
     "74" => "Scan this QRCode with your mobile application to easily configure the connection",
-
+    "75"=> "Search all files...",
+    "76" => "Access the %1 through the top-right menu",
+    "77" => "admin dashboard",
 );
\ No newline at end of file
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/conf/de.php b/core/src/plugins/access.ajxp_home/res/i18n/conf/de.php
index 83cf385436..f66fa253b1 100644
--- a/core/src/plugins/access.ajxp_home/res/i18n/conf/de.php
+++ b/core/src/plugins/access.ajxp_home/res/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Welcome Page"=> "Willkommen-Seite",
@@ -26,11 +26,15 @@
 "Enable Getting Started" => "'Erste Schritte' anzeigen",
 "Enable addition tabulation to access getting started videos" => "Link auf Videos, welche die ersten Schritte mit Pydio zeigen",
 "iOS App URL" => "URL zur iOS-App",
-"URL of the iOS application" => "URL zur iOS-App",
+"URL of the iOS application" => "URL zur iOS-App (leave empty if you want to hide the block)",
 "Android App URL" => "URL zur Android-App",
-"URL of the Android application" => "URL zur Android-App",
+"URL of the Android application" => "URL zur Android-App (leave empty if you want to hide the block)",
 "Windows PydioSync URL" => "URL zum Windows-Sync-Client",
-"URL of the windows sync application" => "URL zum Windows-Sync-Client",
+"URL of the windows sync application" => "URL zum Windows-Sync-Client (leave empty if you want to hide the block)",
 "Mac PydioSync URL" => "URL zum Mac-Sync-Client",
-"URL of the mac sync application" => "URL zum Mac-Sync-Client",
+"URL of the mac sync application" => "URL zum Mac-Sync-Client (leave empty if you want to hide the block)",
+"Enable Global Search" => "Enable Global Search",
+"Enable cross-workspaces search form on home page" => "Enable cross-workspaces search form on home page",
+"Display Server QRCode"=>"Display Server QRCode",
+"Let users connect easily to the latest mobile applications by displaying a QRCode"=>"Let users connect easily to the latest mobile applications by displaying a QRCode",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/conf/en.php b/core/src/plugins/access.ajxp_home/res/i18n/conf/en.php
index 2ca329ec84..700871fd15 100644
--- a/core/src/plugins/access.ajxp_home/res/i18n/conf/en.php
+++ b/core/src/plugins/access.ajxp_home/res/i18n/conf/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "Welcome Page"=> "Welcome Page",
@@ -26,11 +26,15 @@
 "Enable Getting Started" => "Enable Getting Started",
 "Enable addition tabulation to access getting started videos" => "Enable addition tabulation to access getting started videos",
 "iOS App URL" => "URL to iOS App",
-"URL of the iOS application" => "URL to iOS App",
+"URL of the iOS application" => "URL to iOS App (leave empty if you want to hide the block)",
 "Android App URL" => "URL to Android App",
-"URL of the Android application" => "URL to Android App",
+"URL of the Android application" => "URL to Android App (leave empty if you want to hide the block)",
 "Windows PydioSync URL" => "Windows PydioSync URL",
-"URL of the windows sync application" => "URL to Windows sync application",
+"URL of the windows sync application" => "URL to Windows sync application (leave empty if you want to hide the block)",
 "Mac PydioSync URL" => "Mac PydioSync URL",
-"URL of the mac sync application" => "URL to Mac sync application",
+"URL of the mac sync application" => "URL to Mac sync application (leave empty if you want to hide the block)",
+"Enable Global Search" => "Enable Global Search",
+"Enable cross-workspaces search form on home page" => "Enable cross-workspaces search form on home page",
+"Display Server QRCode"=>"Display Server QRCode",    
+"Let users connect easily to the latest mobile applications by displaying a QRCode"=>"Let users connect easily to the latest mobile applications by displaying a QRCode",    
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/conf/fr.php b/core/src/plugins/access.ajxp_home/res/i18n/conf/fr.php
new file mode 100644
index 0000000000..4fc30f0fe5
--- /dev/null
+++ b/core/src/plugins/access.ajxp_home/res/i18n/conf/fr.php
@@ -0,0 +1,40 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+$mess=array(
+"Welcome Page"=> "Page d'accueil",
+"Welcome Page displaying a list of workspaces" => "Ecran d'accueil des utilisateurs après authentification.",
+"Open workspace by simple click" => "Ouvrir les workspaces par clic simple",
+"Open workspace by simple click instead of double click." => "Ouvrir les workspaces par clic simple plutôt que double-clic.",
+"Enable Getting Started" => "Activer 'Pour Débuter'",
+"Enable addition tabulation to access getting started videos" => "Activer le panneau d'information affichant des vidéos pour débuter avec la plateforme.",
+"iOS App URL" => "URL de l'application iOS",
+"URL of the iOS application" => "URL de l'application native iOS (laisser vide pour cacher le bloc)",
+"Android App URL" => "URL de l'application Android",
+"URL of the Android application" => "URL de l'application native Android (laisser vide pour cacher le bloc)",
+"Windows PydioSync URL" => "PydioSync Windows",
+"URL of the windows sync application" => "URL de l'application de synchronisation pour Windows Desktop (laisser vide pour cacher le bloc)",
+"Mac PydioSync URL" => "PydioSync Mac",
+"URL of the mac sync application" => "URL de l'application de synchronisation pour MacOS (laisser vide pour cacher le bloc)",
+"Enable Global Search" => "Activer la recherche globale",
+"Enable cross-workspaces search form on home page" => "Activer le formulaire de recherche inter-workspace sur la page d'accueil",
+"Display Server QRCode"=>"Afficher le QRCode du serveur",
+"Let users connect easily to the latest mobile applications by displaying a QRCode"=>"Simplifiez le processus de connection pour les utilisateurs par l'utilisation d'un QRCode.",
+);
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/conf/it.php b/core/src/plugins/access.ajxp_home/res/i18n/conf/it.php
index fa65141360..c2917d40f3 100644
--- a/core/src/plugins/access.ajxp_home/res/i18n/conf/it.php
+++ b/core/src/plugins/access.ajxp_home/res/i18n/conf/it.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "Welcome Page"=> "Pagina di Benvenuto",
@@ -26,11 +26,15 @@
 "Enable Getting Started" => "Abilita 'Getting Started'",
 "Enable addition tabulation to access getting started videos" => "Abilita tabulazione addizionale per accedere ai video 'getting started'",
 "iOS App URL" => "URL per App iOS",
-"URL of the iOS application" => "URL per App iOS",
+"URL of the iOS application" => "URL per App iOS (leave empty if you want to hide the block)",
 "Android App URL" => "URL per App Android",
-"URL of the Android application" => "URL per App Android",
+"URL of the Android application" => "URL per App Android (leave empty if you want to hide the block)",
 "Windows PydioSync URL" => "URL PydioSync Windows",
-"URL of the windows sync application" => "URL all'applicazione Windows per sincronizzazzione",
+"URL of the windows sync application" => "URL all'applicazione Windows per sincronizzazzione (leave empty if you want to hide the block)",
 "Mac PydioSync URL" => "URL PydioSync Mac",
-"URL of the mac sync application" => "URL all'applicazione Mac per sincronizzazzione",
+"URL of the mac sync application" => "URL all'applicazione Mac per sincronizzazzione (leave empty if you want to hide the block)",
+"Enable Global Search" => "Enable Global Search",
+"Enable cross-workspaces search form on home page" => "Enable cross-workspaces search form on home page",
+"Display Server QRCode"=>"Display Server QRCode",
+"Let users connect easily to the latest mobile applications by displaying a QRCode"=>"Let users connect easily to the latest mobile applications by displaying a QRCode",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/de.php b/core/src/plugins/access.ajxp_home/res/i18n/de.php
index ad2308f8c5..989502045b 100644
--- a/core/src/plugins/access.ajxp_home/res/i18n/de.php
+++ b/core/src/plugins/access.ajxp_home/res/i18n/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "title"=> "Home",
@@ -87,4 +87,7 @@
     "72" => "Server QRCode",
     "73" => "Easily connect your mobile applications",
     "74" => "Scan this QRCode with your mobile application to easily configure the connection",
+    "75"=> "Search all files...",
+    "76" => "Access the %1 through the top-right menu",
+    "77" => "admin dashboard",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/en.php b/core/src/plugins/access.ajxp_home/res/i18n/en.php
index 3aef108d7f..05661db03d 100644
--- a/core/src/plugins/access.ajxp_home/res/i18n/en.php
+++ b/core/src/plugins/access.ajxp_home/res/i18n/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "title"=> "Home",
@@ -86,5 +86,8 @@
 "71"=> "Native application for Android Devices",
 "72" => "Server QRCode",
 "73" => "Easily connect your mobile applications",
-"74" => "Scan this QRCode with your mobile application to easily configure the connection",
+"74" => "Scan this QRCode with your mobile application to easily configure the connection", 
+"75"=> "Search all files...",
+"76" => "Access the %1 through the top-right menu",
+"77" => "admin dashboard",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/es.php b/core/src/plugins/access.ajxp_home/res/i18n/es.php
index 568cec5a93..e2bbdb8257 100644
--- a/core/src/plugins/access.ajxp_home/res/i18n/es.php
+++ b/core/src/plugins/access.ajxp_home/res/i18n/es.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 // spanish translation: Ion Rey Bakaikoa <ionrei@gmail.com>, 2010
 // spanish corrections: Cristóbal Sabroe Yde <cristyde at gmail.com>, 2010
@@ -91,5 +91,7 @@
     "72" => "Server QRCode",
     "73" => "Easily connect your mobile applications",
     "74" => "Scan this QRCode with your mobile application to easily configure the connection",
-
+    "75"=> "Search all files...",
+    "76" => "Access the %1 through the top-right menu",
+    "77" => "admin dashboard",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/fr.php b/core/src/plugins/access.ajxp_home/res/i18n/fr.php
index f8e86218ef..dd65fc589c 100644
--- a/core/src/plugins/access.ajxp_home/res/i18n/fr.php
+++ b/core/src/plugins/access.ajxp_home/res/i18n/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "title" => "Page d'accueil",
@@ -86,4 +86,7 @@
     "72" => "QRCode du serveur",
     "73" => "Connexion aux applications mobiles",
     "74" => "Scannez ce QRCode avec votre application mobile pour configurer facilement la connexion.",
+    "75"=> "Chercher dans tous les fichiers...",
+    "76" => "Utilisez le menu en haut à droite pour acceder au %1.",
+    "77" => "panneau d'administration",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/hu.php b/core/src/plugins/access.ajxp_home/res/i18n/hu.php
index d13c8e0e3e..0230a1c79f 100644
--- a/core/src/plugins/access.ajxp_home/res/i18n/hu.php
+++ b/core/src/plugins/access.ajxp_home/res/i18n/hu.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 //  hungarian translation: Gyarmati Balázs <gyarmati.balazs@gmail.com>
 //  updates: Levente Huszkó <levente.huszko@gmail.com>
@@ -90,5 +90,7 @@
     "72" => "Server QRCode",
     "73" => "Easily connect your mobile applications",
     "74" => "Scan this QRCode with your mobile application to easily configure the connection",
-
+    "75"=> "Search all files...",
+    "76" => "Access the %1 through the top-right menu",
+    "77" => "admin dashboard",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/it.php b/core/src/plugins/access.ajxp_home/res/i18n/it.php
index 81e6c29e43..179b6d7b67 100644
--- a/core/src/plugins/access.ajxp_home/res/i18n/it.php
+++ b/core/src/plugins/access.ajxp_home/res/i18n/it.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "title"=> "Bacheca",
@@ -87,5 +87,7 @@
     "72" => "Server QRCode",
     "73" => "Easily connect your mobile applications",
     "74" => "Scan this QRCode with your mobile application to easily configure the connection",
-
+    "75"=> "Search all files...",
+    "76" => "Access the %1 through the top-right menu",
+    "77" => "admin dashboard",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/nl.php b/core/src/plugins/access.ajxp_home/res/i18n/nl.php
index bcfd5dd929..f47aca1fa6 100644
--- a/core/src/plugins/access.ajxp_home/res/i18n/nl.php
+++ b/core/src/plugins/access.ajxp_home/res/i18n/nl.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "title"=> "Home",
@@ -87,6 +87,8 @@
     "72" => "Server QRCode",
     "73" => "Easily connect your mobile applications",
     "74" => "Scan this QRCode with your mobile application to easily configure the connection",
-
+    "75"=> "Search all files...",
+    "76" => "Access the %1 through the top-right menu",
+    "77" => "admin dashboard",
 );
 
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/pt.php b/core/src/plugins/access.ajxp_home/res/i18n/pt.php
index 0f57def1e8..2f3fe9ed8b 100644
--- a/core/src/plugins/access.ajxp_home/res/i18n/pt.php
+++ b/core/src/plugins/access.ajxp_home/res/i18n/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
     "title"=> "Home",
@@ -87,4 +87,7 @@
     "72" => "Server QRCode",
     "73" => "Easily connect your mobile applications",
     "74" => "Scan this QRCode with your mobile application to easily configure the connection",
+    "75"=> "Search all files...",
+    "76" => "Access the %1 through the top-right menu",
+    "77" => "admin dashboard",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/ru.php b/core/src/plugins/access.ajxp_home/res/i18n/ru.php
index a71c7b7ce4..c9c5ac4e1d 100644
--- a/core/src/plugins/access.ajxp_home/res/i18n/ru.php
+++ b/core/src/plugins/access.ajxp_home/res/i18n/ru.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "title"=> "Начало",
@@ -87,5 +87,7 @@
     "72" => "Server QRCode",
     "73" => "Easily connect your mobile applications",
     "74" => "Scan this QRCode with your mobile application to easily configure the connection",
-
+    "75"=> "Search all files...",
+    "76" => "Access the %1 through the top-right menu",
+    "77" => "admin dashboard",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/si.php b/core/src/plugins/access.ajxp_home/res/i18n/si.php
index b50079a611..72f609acb6 100644
--- a/core/src/plugins/access.ajxp_home/res/i18n/si.php
+++ b/core/src/plugins/access.ajxp_home/res/i18n/si.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 // Slovenian translation: April 21 2011 by Vladimir Bohinc (vladimir.bohinc@gmail.com)
 $mess=array(
@@ -88,5 +88,7 @@
     "72" => "Server QRCode",
     "73" => "Easily connect your mobile applications",
     "74" => "Scan this QRCode with your mobile application to easily configure the connection",
-
+    "75"=> "Search all files...",
+    "76" => "Access the %1 through the top-right menu",
+    "77" => "admin dashboard",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/react/WelcomeComponents.js b/core/src/plugins/access.ajxp_home/res/react/WelcomeComponents.js
index 662143911c..9390b328e2 100644
--- a/core/src/plugins/access.ajxp_home/res/react/WelcomeComponents.js
+++ b/core/src/plugins/access.ajxp_home/res/react/WelcomeComponents.js
@@ -18,6 +18,117 @@
         }
     });
 
+    var HomeSearchEngine = React.createClass({
+
+        getInitialState:function(){
+            return {
+                loading : 0,
+                value   : ''
+            };
+        },
+
+        suggestionLoader:function(input, callback) {
+
+            let nodeProvider = new RemoteNodeProvider();
+            nodeProvider.initProvider({get_action:'multisearch', query:input});
+            let rootNode     = new AjxpNode('/', false);
+            this.setState({loading:true, value: input});
+            nodeProvider.loadNode(rootNode, function(){
+                let results = [];
+                let previousRepo = -1;
+                rootNode.getChildren().forEach(function(v){
+                    let repoId = v.getMetadata().get("repository_id");
+                    if(repoId != previousRepo){
+                        let node = new AjxpNode('/', false, v.getMetadata().get("repository_display"));
+                        node.setRoot();
+                        node.getMetadata().set("repository_id", repoId);
+                        results.push(node);
+                    }
+                    results.push(v);
+                    previousRepo = repoId;
+                });
+                // Hack : force suggestions display
+                if(this.refs.autosuggest.lastSuggestionsInputValue && this.refs.autosuggest.lastSuggestionsInputValue.indexOf(input) === 0){
+                    this.refs.autosuggest.lastSuggestionsInputValue = input;
+                }
+                callback(null, results);
+                this.setState({loading:false});
+            }.bind(this));
+        },
+
+        getSuggestions(input, callback){
+            if(input.length < 3){
+                callback(null, []);
+                return;
+            }
+            bufferCallback('suggestion-loader-search', 350, function(){
+                this.suggestionLoader(input, callback);
+            }.bind(this));
+        },
+
+        suggestionValue: function(suggestion){
+            return '';
+        },
+
+        onSuggestionSelected: function(resultNode, event){
+            if(typeof resultNode === "string"){
+                return ;
+            }
+            pydio.goTo(resultNode);
+        },
+
+        renderSuggestion(resultNode){
+            if(typeof resultNode === "string"){
+                return <span className="groupHeader">{resultNode}</span>;
+            }
+            if(resultNode.isRoot()){
+                return <span className="groupHeader">{resultNode.getLabel()}<span className="openicon icon-long-arrow-right"></span></span>;
+            }else{
+                let isLeaf = resultNode.isLeaf();
+                let label = resultNode.getLabel();
+                let value = this.state.value;
+                let r = new RegExp(value, 'gi');
+                label = label.replace(r, function(m){return '<span class="highlight">'+m+'</span>'});
+                let htmlFunc = function(){return {__html:label}};
+                return (
+                    <span className="nodeSuggestion">
+                        <span className={isLeaf ? "icon icon-file-alt" : "icon icon-folder-close-alt"}></span>
+                        <span dangerouslySetInnerHTML={htmlFunc()}/>
+                    </span>);
+            }
+        },
+
+        render: function(){
+
+            const inputAttributes = {
+                id: 'search-autosuggest',
+                name: 'search-autosuggest',
+                className: 'react-autosuggest__input',
+                placeholder: pydio.MessageHash['user_home.75'],
+                onBlur: event => pydio.UI.enableAllKeyBindings(),
+                onFocus: event => pydio.UI.disableAllKeyBindings(),
+                value: ''   // Initial value
+            };
+            return (
+                <div className={this.props.className + ' home_search'}>
+                    <span className={"suggest-search icon-" + (this.state.loading ? 'refresh rotating' : 'search')}/>
+                    <ReactAutoSuggest
+                        ref="autosuggest"
+                        cache={true}
+                        showWhen = {input => true }
+                        inputAttributes={inputAttributes}
+                        suggestions={this.getSuggestions}
+                        suggestionRenderer={this.renderSuggestion}
+                        suggestionValue={this.suggestionValue}
+                        onSuggestionSelected={this.onSuggestionSelected}
+                    />
+                </div>
+
+            );
+        }
+
+    });
+
     var ConfigLogo = React.createClass({
         render: function(){
             var logo = this.props.pydio.Registry.getPluginConfigs(this.props.pluginName).get(this.props.pluginParameter);
@@ -215,7 +326,8 @@
                 )
             }
 
-            var gettingStartedBlock = '';
+            let gettingStartedBlock = null;
+            let adminAccessBlock = null;
             var gettingStartedPanel;
             if(this.props.enableGettingStarted){
                 var dgs = function(){
@@ -229,7 +341,15 @@
                 }.bind(this);
                 gettingStartedPanel = <TutorialPane closePane={close} open={this.state.showGettingStarted}/>;
             }
-
+            let a = this.props.controller.getActionByName('switch_to_settings');
+            if(!a.deny){
+                let func = function(){
+                    this.props.controller.fireAction('switch_to_settings');
+                }.bind(this);
+                let sentenceParts = MessageHash['user_home.76'].split("%1");
+                let dashName = MessageHash['user_home.77'];
+                adminAccessBlock = <small> {sentenceParts[0]} <a onClick={func}>{dashName}</a> {sentenceParts.length > 1 ? sentenceParts[1] : null}</small>;
+            }
 
             return (
                 <div id="welcome">
@@ -238,6 +358,7 @@
                     <p>
                         {loginLink}
                         {gettingStartedBlock}
+                        {adminAccessBlock}
                     </p>
                 </div>
             )
@@ -311,12 +432,16 @@
             if(mobileBlocks.length && syncBlocks.length){
                 blocksSep = <div className="dl_blocks_sep"></div>;
             }
-
+            let searchBlock;
+            if(pydio.getPluginConfigs('access.ajxp_home').get("ENABLE_GLOBAL_SEARCH")){
+                searchBlock = <HomeSearchEngine className="react-mui-context"/>;
+            }
             return (
                 <div id="tutorial_dl_apps_pane">
                     <div id="dl_pydio_cont" className="react-mui-context">
                         {syncBlocks}{blocksSep}{mobileBlocks}
                     </div>
+                    {searchBlock}
                 </div>
             );
         }
@@ -548,7 +673,9 @@
         },
         onHoverLink:function(event, ws){
             bufferCallback('hoverWorkspaceTimer', 400, function(){
-                this.refs.legend.setWorkspace(ws);
+                if(this.refs && this.refs.legend){
+                    this.refs.legend.setWorkspace(ws);
+                }
             }.bind(this));
         },
         onOutLink:function(event, ws){
diff --git a/core/src/plugins/access.ajxp_user/Gruntfile.js b/core/src/plugins/access.ajxp_user/Gruntfile.js
new file mode 100644
index 0000000000..20d2438170
--- /dev/null
+++ b/core/src/plugins/access.ajxp_user/Gruntfile.js
@@ -0,0 +1,47 @@
+module.exports = function(grunt) {
+    grunt.initConfig({
+        babel: {
+            options: {},
+
+            dist: {
+                files: [
+                    {
+                        expand: true,
+                        cwd: 'react/',
+                        src: ['**/*.js'],
+                        dest: 'build/',
+                        ext: '.js'
+                    }
+                ]
+            }
+        },
+        less: {
+            development: {
+                options: {
+                    plugins: [
+                        new (require('less-plugin-autoprefix'))({browsers: ["last 2 versions, > 10%"]})
+                    ]
+                },
+                files: {
+                    "dashboard.css": "dashboard.less"
+                }
+            }
+        },
+        watch: {
+            js: {
+                files: [
+                    "react/**/*"
+                ],
+                tasks: ['babel'],
+                options: {
+                    spawn: false
+                }
+            }
+        }
+    });
+    grunt.loadNpmTasks('grunt-babel');
+    grunt.loadNpmTasks('grunt-contrib-watch');
+    /*grunt.loadNpmTasks('assemble-less');*/
+    grunt.registerTask('default', ['babel']);
+
+};
diff --git a/core/src/plugins/access.ajxp_user/UserDashboardDriver.php b/core/src/plugins/access.ajxp_user/UserDashboardDriver.php
new file mode 100644
index 0000000000..a227a6732c
--- /dev/null
+++ b/core/src/plugins/access.ajxp_user/UserDashboardDriver.php
@@ -0,0 +1,315 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ *
+ */
+namespace Pydio\Access\Driver\DataProvider;
+
+use DOMXPath;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\NodesList;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Core\Http\Message\ReloadMessage;
+use Pydio\Core\Http\Message\UserMessage;
+use Pydio\Core\Http\Response\SerializableResponseStream;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Share\ShareCenter;
+use Zend\Diactoros\Response\EmptyResponse;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+/**
+ * @package AjaXplorer_Plugins
+ * @subpackage Access
+ * @class ajxpSharedAccessDriver
+ * Plugin to access the shared elements of the current user
+ */
+class UserDashboardDriver extends AbstractAccessDriver
+{
+
+    /**
+     * @param ContextInterface $contextInterface
+     */
+    protected function initRepository(ContextInterface $contextInterface)
+    {
+        require_once AJXP_INSTALL_PATH . "/" . AJXP_PLUGINS_FOLDER . "/action.share/vendor/autoload.php";
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param \DOMNode $contribNode
+     */
+    public function parseSpecificContributions(ContextInterface $ctx, \DOMNode &$contribNode){
+        $disableAddressBook = $this->getContextualOption($ctx, "DASH_DISABLE_ADDRESS_BOOK") === true;
+        if($contribNode->nodeName == "client_configs" && $disableAddressBook){
+            // remove template_part for orbit_content
+            $xPath=new DOMXPath($contribNode->ownerDocument);
+            $tplNodeList = $xPath->query('component_config[@className="AjxpTabulator::userdashboard_main_tab"]', $contribNode);
+            if(!$tplNodeList->length) return ;
+            $contribNode->removeChild($tplNodeList->item(0));
+        }
+        parent::parseSpecificContributions($ctx, $contribNode);
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @throws \Exception
+     */
+    public function switchAction(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface)
+    {
+        parent::accessPreprocess($requestInterface);
+        if(!UsersService::usersEnabled()) return ;
+        $action     = $requestInterface->getAttribute("action");
+        $httpVars   = $requestInterface->getParsedBody();
+        $ctx        = $requestInterface->getAttribute("ctx");
+
+        if ($action == "edit") {
+            if (isSet($httpVars["sub_action"])) {
+                $action = $httpVars["sub_action"];
+            }
+        }
+        $mess = LocaleService::getMessages();
+
+        $x = new SerializableResponseStream();
+        $responseInterface = $responseInterface->withBody($x);
+
+        switch ($action) {
+            //------------------------------------
+            //	BASIC LISTING
+            //------------------------------------
+            case "ls":
+                $rootNodes = array(
+                    "settings" => array(
+                        "LABEL" => $mess["user_dash.36"],
+                        "ICON" => "user_shared.png",
+                        "ICON-CLASS" => "icon-cog",
+                        "DESCRIPTION" => $mess["user_dash.37"]
+                    ),
+                    "users" => array(
+                        "LABEL" => $mess["user_dash.1"],
+                        "ICON" => "user_shared.png",
+                        "ICON-CLASS" => "icon-book",
+                        "DESCRIPTION" => $mess["user_dash.30"]
+                    ),
+                    "teams" => array(
+                        "LABEL" => "Teams",
+                        "ICON" => "user_shared.png",
+                        "ICON-CLASS" => "icon-group",
+                        "DESCRIPTION" => "My Teams"
+                    )
+                );
+                $dir = (isset($httpVars["dir"])?$httpVars["dir"]:"");
+                $splits = explode("/", $dir);
+                if (count($splits)) {
+                    if($splits[0] == "") array_shift($splits);
+                    if(count($splits)) $strippedDir = strtolower(urldecode($splits[0]));
+                    else $strippedDir = "";
+                }
+                if (!empty($strippedDir) && array_key_exists($strippedDir, $rootNodes)) {
+                    if ($strippedDir == "users") {
+                        $x->addChunk($this->listUsers($ctx));
+                    } else if ($strippedDir == "teams") {
+                        $x->addChunk($this->listTeams($ctx));
+                    }
+                } else {
+                    $responseInterface  = new EmptyResponse();
+                }
+            break;
+
+            case "stat" :
+
+                header("Content-type:application/json");
+                print '{"mode":true}';
+
+            break;
+
+            case "delete" :
+                
+                $mime       = $httpVars["ajxp_mime"];
+                $selection  = UserSelection::fromContext($ctx, $httpVars);
+                $files      = $selection->getFiles();
+                $minisites  = $this->listMinisites($ctx);
+                
+                /**
+                 * @var ShareCenter $shareCenter
+                 */
+                $shareCenter = PluginsService::getInstance($ctx)->getPluginById("action.share");
+                foreach ($files as $index => $element) {
+                    $element = basename($element);
+                    $ar = explode("shared_", $mime);
+                    $mime = array_pop($ar);
+                    if($mime == "repository" && isSet($minisites[$element])){
+                        $mime = "minisite";
+                        $element = $minisites[$element];
+                    }
+                    
+                    $shareCenter->getShareStore($ctx)->deleteShare($mime, $element);
+                    $out = "";
+                    if($mime == "repository" || $mime == "minisite") $out = $mess["ajxp_conf.59"];
+                    else if($mime == "user") $out = $mess["ajxp_conf.60"];
+                    else if($mime == "file") $out = $mess["user_dash.13"];
+                    if(!empty($out)){
+                        $x->addChunk(new UserMessage($out, LOG_LEVEL_INFO));
+                    }
+                }
+                $x->addChunk(new ReloadMessage());
+            break;
+            
+            default:
+            break;
+        }
+
+        return;
+    }
+
+    /**
+     * @param $ctx ContextInterface
+     * @return array
+     */
+    public function listMinisites(ContextInterface $ctx)
+    {
+        /**
+         * @var ShareCenter $shareCenter
+         */
+        $shareCenter = PluginsService::getInstance($ctx)->getPluginById("action.share");
+        $publicLets = $shareCenter->getShareStore($ctx)->listShares($ctx->hasUser() ? $ctx->getUser()->getId() : "shared", "");
+        $minisites = array();
+        foreach ($publicLets as $hash => $publicletData) {
+            if(!isSet($publicletData["AJXP_APPLICATION_BASE"]) && !isSet($publicletData["TRAVEL_PATH_TO_ROOT"])) continue;
+            $minisites[$publicletData["REPOSITORY"]] = $hash;
+        }
+        return $minisites;
+    }
+
+    /**
+     * @param $metaIcon
+     * @return string
+     */
+    private function metaIcon($metaIcon)
+    {
+        return "<span class='icon-".$metaIcon." meta-icon'></span> ";
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @return NodesList
+     */
+    public function listTeams(ContextInterface $ctx)
+    {
+        $conf = ConfService::getConfStorageImpl();
+        $nodesList = new NodesList();
+        if(!method_exists($conf, "listUserTeams")) {
+            return $nodesList;
+        }
+
+        $nodesList->initColumnsData('fileList', 'detail');
+        $nodesList->appendColumn('ajxp_conf.6', 'ajxp_label');
+        $nodesList->appendColumn('user_dash.10', 'repo_accesses');
+
+        $teams = $conf->listUserTeams($ctx->getUser());
+        foreach ($teams as $teamId => $team) {
+            if(empty($team["LABEL"])) continue;
+            $team["USERS_LABELS"] = array();
+            foreach(array_values($team["USERS"]) as $userId){
+                $team["USERS_LABELS"][] = UsersService::getUserPersonalParameter("USER_DISPLAY_NAME", $userId, "core.conf", $userId);
+            }
+            $metaData = [
+                "text" => $team["LABEL"],
+                "icon" => "users-folder.png",
+                "fonticon" => "account-multiple",
+                "ajxp_mime" => "ajxp_team",
+                "users"     => "<span class='icon-groups'></span> ".implode(",", array_values($team["USERS"])),
+                "users_labels"     => "<span class='icon-groups'></span> ".implode(", ", $team["USERS_LABELS"])
+            ];
+            $n = new AJXP_Node("/teams/".$teamId, $metaData);
+            $nodesList->addBranch($n);
+        }
+        return $nodesList;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @return NodesList
+     */
+    public function listUsers(ContextInterface $ctx)
+    {
+        $nodesList = new NodesList();
+        $nodesList->initColumnsData('fileList');
+        $nodesList->appendColumn('ajxp_conf.6', 'ajxp_label');
+        $nodesList->appendColumn('user_dash.10', 'repo_accesses');
+
+        if(!UsersService::usersEnabled()) {
+            return $nodesList;
+        }
+        $loggedUser = $ctx->getUser();
+        $users = ConfService::getConfStorageImpl()->getUserChildren($loggedUser->getId()); // AuthService::listUsers();
+        $mess = LocaleService::getMessages();
+        $count = 0;
+        $repoList = RepositoryService::listRepositoriesWithCriteria(array(
+            "owner_user_id" => $loggedUser->getId()
+        ), $count);
+        $userArray = array();
+        foreach ($users as $userIndex => $userObject) {
+            $label = $userObject->getId();
+            if(!$userObject->hasParent() || $userObject->getParent() != $loggedUser->getId()) continue;
+            if ($userObject->hasParent()) {
+                $label = $userObject->getParent()."000".$label;
+            }
+            $userArray[$label] = $userObject;
+        }
+        ksort($userArray);
+        foreach ($userArray as $userObject) {
+            $label = UsersService::getUserPersonalParameter("USER_DISPLAY_NAME", $userObject);
+            $isAdmin = $userObject->isAdmin();
+            $userId = $userObject->getId();
+            $repoAccesses = array();
+            foreach ($repoList as $repoObject) {
+                if ($repoObject->hasOwner() && $repoObject->getOwner() == $loggedUser->getId()) {
+                    $acl = $userObject->mergedRole->getAcl($repoObject->getId());
+                    if(!empty($acl)) $repoAccesses[] = $repoObject->getDisplay()." ($acl)";
+                }
+            }
+            if(!empty($label)) $label .= " ($userId)";
+            else $label = $userId;
+            $metaData = [
+                "text"      => $label,
+                "isAdmin"   => $mess[($isAdmin?"ajxp_conf.14":"ajxp_conf.15")],
+                "icon"      => "user_shared.png",
+                "fonticon"  => "account-circle",
+                "openicon"  => "user_shared.png",
+                "repo_accesses" => count($repoAccesses) ? $this->metaIcon("share-sign"). implode(", ", $repoAccesses):"",
+                "parentname"    => "/users",
+                "is_file"       => "1",
+                "ajxp_mime"     => "shared_user"
+            ];
+            $node = new AJXP_Node("/users/".$userId, $metaData);
+            $nodesList->addBranch($node);
+        }
+        return $nodesList;
+    }
+    
+}
\ No newline at end of file
diff --git a/core/src/plugins/access.ajxp_user/class.UserDashboardDriver.php b/core/src/plugins/access.ajxp_user/class.UserDashboardDriver.php
deleted file mode 100644
index 6395fb9b7c..0000000000
--- a/core/src/plugins/access.ajxp_user/class.UserDashboardDriver.php
+++ /dev/null
@@ -1,399 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-/**
- * @package AjaXplorer_Plugins
- * @subpackage Access
- * @class ajxpSharedAccessDriver
- * AJXP_Plugin to access the shared elements of the current user
- */
-class UserDashboardDriver extends AbstractAccessDriver
-{
-
-    public function initRepository()
-    {
-        require_once AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/action.share/class.ShareCenter.php";
-    }
-
-    public function parseSpecificContributions(&$contribNode){
-        $disableAddressBook = $this->getFilteredOption("DASH_DISABLE_ADDRESS_BOOK") === true;
-        if($contribNode->nodeName == "client_configs" && $disableAddressBook){
-            // remove template_part for orbit_content
-            $xPath=new DOMXPath($contribNode->ownerDocument);
-            $tplNodeList = $xPath->query('component_config[@className="AjxpTabulator::userdashboard_main_tab"]', $contribNode);
-            if(!$tplNodeList->length) return ;
-            $contribNode->removeChild($tplNodeList->item(0));
-        }
-        parent::parseSpecificContributions($contribNode);
-    }
-
-    public function switchAction($action, $httpVars, $fileVars)
-    {
-        parent::accessPreprocess($action, $httpVars, $fileVars);
-        if(!AuthService::usersEnabled()) return ;
-
-        if ($action == "edit") {
-            if (isSet($httpVars["sub_action"])) {
-                $action = $httpVars["sub_action"];
-            }
-        }
-        $mess = ConfService::getMessages();
-
-        switch ($action) {
-            //------------------------------------
-            //	BASIC LISTING
-            //------------------------------------
-            case "ls":
-                $rootNodes = array(
-                    "users" => array(
-                        "LABEL" => $mess["user_dash.1"],
-                        "ICON" => "user_shared.png",
-                        "ICON-CLASS" => "icon-book",
-                        "DESCRIPTION" => $mess["user_dash.30"]
-                    ),
-                    "files" => array(
-                        "LABEL" => $mess["user_dash.34"],
-                        "ICON" => "user_shared.png",
-                        "ICON-CLASS" => "mdi mdi-share-variant",
-                        "DESCRIPTION" => $mess["user_dash.35"]
-                    ),
-                    "settings" => array(
-                        "LABEL" => $mess["user_dash.36"],
-                        "ICON" => "user_shared.png",
-                        "ICON-CLASS" => "icon-cog",
-                        "DESCRIPTION" => $mess["user_dash.37"]
-                    ),
-                    "repositories" => array(
-                        "LABEL" => $mess["user_dash.36"],
-                        "ICON" => "user_shared.png",
-                        "ICON-CLASS" => "icon-cog",
-                        "DESCRIPTION" => $mess["user_dash.37"]
-                    ),
-                    "teams" => array(
-                        "LABEL" => "Teams",
-                        "ICON" => "user_shared.png",
-                        "ICON-CLASS" => "icon-group",
-                        "DESCRIPTION" => "My Teams"
-                    )
-                );
-                $dir = (isset($httpVars["dir"])?$httpVars["dir"]:"");
-                $splits = explode("/", $dir);
-                if (count($splits)) {
-                    if($splits[0] == "") array_shift($splits);
-                    if(count($splits)) $strippedDir = strtolower(urldecode($splits[0]));
-                    else $strippedDir = "";
-                }
-                if (array_key_exists($strippedDir, $rootNodes)) {
-                    AJXP_XMLWriter::header();
-                    if ($strippedDir == "users") {
-                        $this->listUsers();
-                    } else if ($strippedDir == "teams") {
-                        $this->listTeams();
-                    } else if ($strippedDir == "repositories") {
-                        $this->listRepositories();
-                    } else if ($strippedDir == "files") {
-                        $this->listSharedFiles("files");
-                    }
-                    AJXP_XMLWriter::close();
-                } else {
-                    AJXP_XMLWriter::header();
-                    /*
-                    AJXP_XMLWriter::sendFilesListComponentConfig('<columns switchGridMode="filelist"><column messageId="user_dash.8" attributeName="ajxp_label" sortType="String"/><column messageId="user_dash.31" attributeName="description" sortType="String"/></columns>');
-                    foreach ($rootNodes as $key => $data) {
-                        $l = $data["LABEL"];
-                        print '<tree text="'.$l.'" icon="'.$data["ICON"].'" filename="/'.$key.'" parentname="/" description="'.$data["DESCRIPTION"].'" />';
-                    }
-                    */
-                    AJXP_XMLWriter::close();
-                }
-            break;
-
-            case "stat" :
-
-                header("Content-type:application/json");
-                print '{"mode":true}';
-
-            break;
-
-            case "delete" :
-                $mime = $httpVars["ajxp_mime"];
-                $selection = new UserSelection();
-                $selection->initFromHttpVars($httpVars);
-                $files = $selection->getFiles();
-                AJXP_XMLWriter::header();
-                $minisites = $this->listSharedFiles("minisites");
-                /**
-                 * @var ShareCenter $shareCenter
-                 */
-                $shareCenter = AJXP_PluginsService::findPluginById("action.share");
-                foreach ($files as $index => $element) {
-                    $element = basename($element);
-                    $ar = explode("shared_", $mime);
-                    $mime = array_pop($ar);
-                    if($mime == "repository" && isSet($minisites[$element])){
-                        $mime = "minisite";
-                        $element = $minisites[$element];
-                    }
-                    $shareCenter->getShareStore()->deleteShare($mime, $element);
-                    if($mime == "repository" || $mime == "minisite") $out = $mess["ajxp_conf.59"];
-                    else if($mime == "user") $out = $mess["ajxp_conf.60"];
-                    else if($mime == "file") $out = $mess["user_dash.13"];
-                }
-                AJXP_XMLWriter::sendMessage($out, null);
-                AJXP_XMLWriter::reloadDataNode();
-                AJXP_XMLWriter::close();
-            break;
-
-            case "clear_expired" :
-
-                /**
-                 * @var ShareCenter $shareCenter
-                 */
-                $shareCenter = AJXP_PluginsService::getInstance()->findPluginById("action.share");
-                $deleted = $shareCenter->getShareStore()->clearExpiredFiles(true);
-                AJXP_XMLWriter::header();
-                if (count($deleted)) {
-                    AJXP_XMLWriter::sendMessage(sprintf($mess["user_dash.23"], count($deleted).""), null);
-                    AJXP_XMLWriter::reloadDataNode();
-                } else {
-                    AJXP_XMLWriter::sendMessage($mess["user_dash.24"], null);
-                }
-                AJXP_XMLWriter::close();
-
-            break;
-
-            case "reset_download_counter" :
-
-                $selection = new UserSelection();
-                $selection->initFromHttpVars($httpVars);
-                $elements = $selection->getFiles();
-                foreach ($elements as $element) {
-                    PublicletCounter::reset(str_replace(".php", "", basename($element)));
-                }
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::reloadDataNode();
-                AJXP_XMLWriter::close();
-
-            break;
-
-            default:
-            break;
-        }
-
-        return;
-    }
-
-    /**
-     * @param string $mode
-     * @return array|void
-     */
-    public function listSharedFiles($mode = "files")
-    {
-        if($mode == "files"){
-            AJXP_XMLWriter::sendFilesListComponentConfig('<columns switchDisplayMode="list" switchGridMode="filelist">
-                <column messageId="user_dash.4" attributeName="ajxp_label" sortType="String" width="20%"/>
-                <column messageId="user_dash.17" attributeName="download_url" sortType="String" width="20%"/>
-                <column messageId="user_dash.20" attributeName="download_count" sortType="String" width="2%"/>
-                <column messageId="share_center.22" attributeName="download_limit" sortType="String" width="2%"/>
-                <column messageId="user_dash.6" attributeName="password" sortType="String" width="5%"/>
-                <column messageId="user_dash.7" attributeName="expiration" sortType="String" width="5%"/>
-            </columns>');
-        }
-
-        $mess = ConfService::getMessages();
-        $loggedUser = AuthService::getLoggedUser();
-        $userId = $loggedUser->getId();
-
-        $shareCenter = AJXP_PluginsService::getInstance()->findPluginById("action.share");
-        $downloadBase = $shareCenter->getPublicAccessManager()->buildPublicDlURL();
-        $publicLets = $shareCenter->listShares(true, null);
-
-        $minisites = array();
-        foreach ($publicLets as $hash => $publicletData) {
-            if($mode == "files"){
-                if(isSet($publicletData["AJXP_APPLICATION_BASE"]) || isSet($publicletData["TRAVEL_PATH_TO_ROOT"])
-                    ||  (isset($publicletData["OWNER_ID"]) && $publicletData["OWNER_ID"] != $userId)
-                    || empty($publicletData["FILE_PATH"])
-                    ){
-                    continue;
-                }
-                $expired = ($publicletData["EXPIRE_TIME"]!=0?($publicletData["EXPIRE_TIME"]<time()?true:false):false);
-                if(!is_a($publicletData["REPOSITORY"], "Repository")) continue;
-                AJXP_XMLWriter::renderNode($hash, "".SystemTextEncoding::toUTF8($publicletData["REPOSITORY"]->getDisplay()).":/".SystemTextEncoding::toUTF8($publicletData["FILE_PATH"]), true, array(
-                        "icon"		=> "html.png",
-                        "password" => ($publicletData["PASSWORD"]!=""?$this->metaIcon("key").$publicletData["PASSWORD"]:""),
-                        "expiration" => ($publicletData["EXPIRE_TIME"]!=0?($expired?$this->metaIcon("time"):"").date($mess["date_format"], $publicletData["EXPIRE_TIME"]):""),
-                        "download_count" => !empty($publicletData["DOWNLOAD_COUNT"])?$this->metaIcon("download-alt").$publicletData["DOWNLOAD_COUNT"]:"",
-                        "download_limit" => ($publicletData["DOWNLOAD_LIMIT"] == 0 ? "" : $this->metaIcon("cloud-download").$publicletData["DOWNLOAD_LIMIT"] ),
-                        "download_url" => $this->metaIcon("link").$downloadBase . "/".$hash,
-                        "ajxp_mime" => "shared_file")
-                );
-            }else if($mode == "minisites"){
-                if(!isSet($publicletData["AJXP_APPLICATION_BASE"]) && !isSet($publicletData["TRAVEL_PATH_TO_ROOT"])) continue;
-                $minisites[$publicletData["REPOSITORY"]] = $hash;
-            }
-        }
-        if($mode == "minisites"){
-            return $minisites;
-        }
-    }
-
-    private function metaIcon($metaIcon)
-    {
-        return "<span class='icon-".$metaIcon." meta-icon'></span> ";
-    }
-
-    public function listTeams()
-    {
-        $conf = ConfService::getConfStorageImpl();
-        if(!method_exists($conf, "listUserTeams")) return;
-        AJXP_XMLWriter::sendFilesListComponentConfig('<columns switchDisplayMode="detail" switchGridMode="filelist">
-            <column messageId="ajxp_conf.6" attributeName="ajxp_label" sortType="String"/>
-            <column messageId="user_dash.10" attributeName="users_labels" sortType="String"/>
-        </columns>');
-        $teams = $conf->listUserTeams();
-        foreach ($teams as $teamId => $team) {
-            if(empty($team["LABEL"])) continue;
-            $team["USERS_LABELS"] = array();
-            foreach(array_values($team["USERS"]) as $userId){
-                $team["USERS_LABELS"][] = ConfService::getUserPersonalParameter("USER_DISPLAY_NAME", $userId, "core.conf", $userId);
-            }
-            AJXP_XMLWriter::renderNode("/teams/".$teamId, $team["LABEL"], true, array(
-                    "icon"      => "users-folder.png",
-                    "ajxp_mime" => "ajxp_team",
-                    "users"     => "<span class='icon-groups'></span> ".implode(",", array_values($team["USERS"])),
-                    "users_labels"     => "<span class='icon-groups'></span> ".implode(", ", $team["USERS_LABELS"])
-                ), true, true);
-        }
-    }
-
-    public function listUsers()
-    {
-        AJXP_XMLWriter::sendFilesListComponentConfig('<columns switchGridMode="filelist"><column messageId="ajxp_conf.6" attributeName="ajxp_label" sortType="String"/><column messageId="user_dash.10" attributeName="repo_accesses" sortType="String"/></columns>');
-        if(!AuthService::usersEnabled()) return ;
-        $loggedUser = AuthService::getLoggedUser();
-        $users = ConfService::getConfStorageImpl()->getUserChildren($loggedUser->getId()); // AuthService::listUsers();
-        $mess = ConfService::getMessages();
-        $count = 0;
-        $repoList = ConfService::listRepositoriesWithCriteria(array(
-            "owner_user_id" => $loggedUser->getId()
-        ), $count);
-        $userArray = array();
-        foreach ($users as $userIndex => $userObject) {
-            $label = $userObject->getId();
-            if(!$userObject->hasParent() || $userObject->getParent() != $loggedUser->getId()) continue;
-            if ($userObject->hasParent()) {
-                $label = $userObject->getParent()."000".$label;
-            }
-            $userArray[$label] = $userObject;
-        }
-        ksort($userArray);
-        foreach ($userArray as $userObject) {
-            $label = ConfService::getUserPersonalParameter("USER_DISPLAY_NAME", $userObject);
-            $isAdmin = $userObject->isAdmin();
-            $userId = $userObject->getId();
-            $repoAccesses = array();
-            foreach ($repoList as $repoObject) {
-                if ($repoObject->hasOwner() && $repoObject->getOwner() == $loggedUser->getId()) {
-                    $acl = $userObject->mergedRole->getAcl($repoObject->getId());
-                    if(!empty($acl)) $repoAccesses[] = $repoObject->getDisplay()." ($acl)";
-                }
-            }
-            if(!empty($label)) $label .= " ($userId)";
-            else $label = $userId;
-            print '<tree
-                text="'.AJXP_Utils::xmlEntities($label).'"
-                isAdmin="'.AJXP_Utils::xmlEntities($mess[($isAdmin?"ajxp_conf.14":"ajxp_conf.15")]).'"
-                icon="user_shared.png"
-                openicon="user_shared.png"
-                filename="/users/'.AJXP_Utils::xmlEntities($userId).'"
-                repo_accesses="'.(count($repoAccesses) ? AJXP_Utils::xmlEntities($this->metaIcon("share-sign"). implode(", ", $repoAccesses)):"").'"
-                parentname="/users"
-                is_file="1"
-                ajxp_mime="shared_user"
-                />';
-        }
-    }
-
-    public function listRepositories()
-    {
-        AJXP_XMLWriter::sendFilesListComponentConfig('<columns switchGridMode="filelist"><column messageId="ajxp_conf.8" attributeName="ajxp_label" sortType="String"/><column messageId="user_dash.9" attributeName="parent_label" sortType="String"/><column messageId="user_dash.9" attributeName="repo_accesses" sortType="String"/></columns>');
-        $repoArray = array();
-        $loggedUser = AuthService::getLoggedUser();
-        $count = 0;
-        $repos = ConfService::listRepositoriesWithCriteria(array(
-            "owner_user_id" => $loggedUser->getId()
-        ), $count);
-
-        $searchAll = ConfService::getCoreConf("CROSSUSERS_ALLGROUPS", "conf");
-        $displayAll = ConfService::getCoreConf("CROSSUSERS_ALLGROUPS_DISPLAY", "conf");
-        if($searchAll || $displayAll){
-            $baseGroup = "/";
-        }else{
-            $baseGroup = AuthService::filterBaseGroup("/");
-        }
-        AuthService::setGroupFiltering(false);
-        $users = AuthService::listUsers($baseGroup);
-
-        $minisites = $this->listSharedFiles("minisites");
-
-        foreach ($repos as $repoIndex => $repoObject) {
-            if($repoObject->getAccessType() == "ajxp_conf") continue;
-            if (!$repoObject->hasOwner() || $repoObject->getOwner() != $loggedUser->getId()) {
-                continue;
-            }
-            if(is_numeric($repoIndex)) $repoIndex = "".$repoIndex;
-            $name = (isSet($minisites[$repoIndex]) ? "[Minisite] ":""). AJXP_Utils::xmlEntities(SystemTextEncoding::toUTF8($repoObject->getDisplay()));
-            $repoArray[$name] = $repoIndex;
-        }
-        // Sort the list now by name
-        ksort($repoArray);
-        foreach ($repoArray as $name => $repoIndex) {
-            $repoObject =& $repos[$repoIndex];
-            $repoAccesses = array();
-            foreach ($users as $userId => $userObject) {
-                if($userObject->getId() == $loggedUser->getId()) continue;
-                $label = ConfService::getUserPersonalParameter("USER_DISPLAY_NAME", $userObject, "core.conf", $userId);
-                $acl = $userObject->mergedRole->getAcl($repoObject->getId());
-                if(!empty($acl)) $repoAccesses[] = $label. " (".$acl.")";
-            }
-            $parent = $repoObject->getParentId();
-            $parentRepo =& $repos[$parent];
-            $parentLabel = $this->metaIcon("folder-open").$parentRepo->getDisplay();
-            $repoPath = $repoObject->getOption("PATH");
-            $parentPath = $parentRepo->getOption("PATH");
-            $parentLabel .= " (".str_replace($parentPath, "", $repoPath).")";
-
-            $metaData = array(
-                "repository_id" => $repoIndex,
-                "icon"			=> "document_open_remote.png",
-                "openicon"		=> "document_open_remote.png",
-                "parentname"	=> "/repositories",
-                "parent_label"   => $parentLabel,
-                "repo_accesses" => count($repoAccesses) ?  $this->metaIcon("share-sign").implode(", ", $repoAccesses) : "",
-                "ajxp_mime" 	=> "shared_repository"
-            );
-            AJXP_XMLWriter::renderNode("/repositories/$repoIndex", $name, true, $metaData);
-        }
-    }
-
-}
diff --git a/core/src/plugins/access.ajxp_user/class.UserProfileEditor.js b/core/src/plugins/access.ajxp_user/class.UserProfileEditor.js
index 5bdeb6dd61..43738ab293 100644
--- a/core/src/plugins/access.ajxp_user/class.UserProfileEditor.js
+++ b/core/src/plugins/access.ajxp_user/class.UserProfileEditor.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  *
  */
 Class.create("UserProfileEditor", AjxpPane, {
diff --git a/core/src/plugins/access.ajxp_user/class.WebDAVprefsEditor.js b/core/src/plugins/access.ajxp_user/class.WebDAVprefsEditor.js
index 2ca0aff911..ec620f5402 100644
--- a/core/src/plugins/access.ajxp_user/class.WebDAVprefsEditor.js
+++ b/core/src/plugins/access.ajxp_user/class.WebDAVprefsEditor.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  *
  */
 Class.create("WebDAVprefsEditor", AjxpPane, {
diff --git a/core/src/plugins/access.ajxp_user/dashboard.css b/core/src/plugins/access.ajxp_user/dashboard.css
index c52dcbea6c..e046b0df56 100644
--- a/core/src/plugins/access.ajxp_user/dashboard.css
+++ b/core/src/plugins/access.ajxp_user/dashboard.css
@@ -1,285 +1,312 @@
-#userdashboard_main_tab{
-    font-family: Roboto, sans-serif;
-    -webkit-font-smoothing: antialiased;
-}
-
-#userdashboard_main_tab h3{
-    font-weight: 500;
-}
-
-#userdashboard_main_tab #content_pane.droparea{
-    background: url("../../../../../../index.php?get_action=get_drop_bg") no-repeat scroll left bottom transparent;
-    background-position: 50%;
-    border: 5px dashed #5c5c5c !important;
-    border-radius: 5px !important;
-    margin: 5px !important;
-}
-
-#userdashboard_main_tab div.tabbed_editor{
-    border:0;
-}
-
-#userdashboard_main_tab div.header_resizer div.header_label {
-    padding-top: 7px;
-}
-
-#userdashboard_main_tab div.class-FetchedResultPane{
-    background-color: #ffffff;
-}
-#userdashboard_main_tab div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed{
-    padding: 8px 4px;
-    border-bottom: 1px solid rgba(0,0,0,0.03);
-}
-
-#userdashboard_main_tab div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbLabel{
-    padding-top: 7px;
-    font-size: 14px;
-}
-
-#userdashboard_main_tab div.class-FetchedResultPane div.thumbnail_selectable_cell.selected-focus{
-    background-color: #fb725c !important;
-}
-
-#userdashboard_main_tab #content_pane.dropareaHover{
-    border-color: #e35d52 !important;
-}
-
-#userdashboard_main_tab span.toggleHeader span[class^="icon-"],
-#userdashboard_main_tab span.toggleHeader span[class*=" icon-"]{
-    display: inline;
-}
-
-
-div#userdashboard_main_tab.horizontal_tabulator div.tabulatorContainer{
-    padding-top: 63px;
-    background-color: #444;
-}
-
-div#userdashboard_main_tab.horizontal_tabulator div.tabbed_editor{
-    background-color: #ffffff;
-    box-shadow:0 3px 6px rgba(0,0,0,.16),0 3px 6px rgba(0,0,0,.23);
-}
-
-div#userdashboard_myparams_title{
-    position: absolute;
-    color: #ffffff;
-    font-weight: 300;
-    padding: 25px 16px;
-    height: 63px;
-    font-size: 13px;
-    width: 100%;
-    border-bottom: 1px solid rgba(255,255,255,0.15);
-    box-sizing: border-box;
-}
-
-div#userdashboard_myparams_title span#dash_title{
+#userdashboard_main_tab {
+  font-family: Roboto, sans-serif;
+  -webkit-font-smoothing: antialiased;
+}
+#userdashboard_main_tab.horizontal_tabulator {
+  display: block;
+  position: relative;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorContainer {
+  position: absolute;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  width: 240px;
+  padding-top: 10px;
+  background-color: #444;
+  z-index: 1;
+  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
+  transition: all 550ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorContainer span.toggleHeader {
+  padding: 16px;
+  font-size: 13px;
+  color: #ff7043 !important;
+  background-color: transparent !important;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorContainer span.toggleHeader.toggleInactive {
+  color: white !important;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorContainer span.toggleHeader span[class^="icon-"],
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorContainer span.toggleHeader span[class*=" icon-"],
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorContainer span.toggleHeader span.mdi {
+  display: inline;
+  float: right;
+  font-size: 18px;
+  margin-right: 0;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer {
+  transition: all 550ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;
+  position: absolute;
+  left: 240px;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  padding: 16px;
+  background-color: #f4f4f4;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div {
+  position: relative;
+  background-color: #ffffff;
+  border-radius: 2px;
+  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div#account_pane,
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div#webdav_pane {
+  overflow-y: auto;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div .title-flex {
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div .title-flex h3 {
+  -webkit-flex: 1;
+      -ms-flex: 1;
+          flex: 1;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div .title-flex h3 .legend {
+  font-size: 12px;
+  font-weight: 300;
+  line-height: 1.3em;
+  margin-top: 3px;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div .title-flex h3.dashboard_panel_title {
+  margin-top: 16px;
+  padding-left: 20px;
+  font-size: 24px;
+  line-height: 32px;
+  font-weight: 400;
+  color: rgba(0, 0, 0, 0.87);
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div .title-flex div.actionBar,
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div .title-flex div.action_bar {
+  margin: 20px 20px 0 0;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div .action_bar,
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div #buttons_bar {
+  background-color: white !important;
+  padding-bottom: 20px;
+  border-bottom: 0;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div .action_bar a,
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div #buttons_bar a {
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.24), 0 1px 6px rgba(0, 0, 0, 0.12);
+  margin: 0 3px;
+  display: inline-block;
+  border-radius: 2px !important;
+  padding: 7px 16px;
+  height: auto;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div .action_bar a span.actionbar_button_label,
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div #buttons_bar a span.actionbar_button_label {
+  font-size: 14px;
+}
+@media only screen and (max-width: 720px) {
+  #userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div .action_bar a span.ajxp_icon_span,
+  #userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div #buttons_bar a span.ajxp_icon_span {
+    display: block !important;
+    margin: 0 0 10px;
+  }
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div div.class-FetchedResultPane {
+  border-top: 1px solid #fafafa;
+  background-color: #ffffff;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div div.class-FetchedResultPane#shared_files_list {
+  border-top: 1px solid #eaeaea;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed {
+  padding: 10px 5px;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.03);
+  transition: all 550ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.mimefont {
+  line-height: 28px;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbLabel {
+  padding-top: 7px;
+  font-size: 14px;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_selectable_cell {
+  padding-right: 11px;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div div.class-FetchedResultPane div.thumbnail_selectable_cell.selected-focus {
+  background-color: #ff6a3c !important;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div div.class-FetchedResultPane div.header_resizer div.header_label {
+  padding-left: 10px;
+  padding-top: 7px;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div div.class-FetchedResultPane .sort-table tr {
+  background-color: white !important;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div div.class-FetchedResultPane .sort-table tr td {
+  border-bottom: 1px solid #eaeaea;
+  padding: 10px 0;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div div.class-FetchedResultPane .sort-table tr td:first-of-type {
+  padding: 10px 5px;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div div.class-FetchedResultPane .sort-table tr td:first-of-type span.mimefont {
+  margin-right: 10px;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div div.class-FetchedResultPane .sort-table tr.selected-focus {
+  background-color: #ff6a3c !important;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div div.class-FetchedResultPane .sort-table tr.selected-focus td {
+  border-bottom: 0;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div div.class-FetchedResultPane .sort-table tr[data-groupByValue].selected-focus {
+  background-color: white !important;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div div.class-FetchedResultPane .sort-table tr[data-groupByValue].selected-focus td {
+  border-bottom: 1px solid #eaeaea;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div div.class-FetchedResultPane .sort-table tr[data-groupByValue] h3 {
+  padding: 5px 5px 10px;
+  font-size: 1em;
+  color: #00897B;
+  border-bottom: 0;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer div#webdav_pane div.dav-url {
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer div#webdav_pane div.dav-url div.mui-text-field {
+  -webkit-flex: 1;
+      -ms-flex: 1;
+          flex: 1;
+  width: auto;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer div#webdav_pane div.dav-url button.mui-icon-button {
+  margin-top: 30px;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer div#webdav_pane div.dav-url button.mui-icon-button span.mui-font-icon {
+  font-size: 16px;
+  color: rgba(0, 0, 0, 0.33);
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer div#webdav_pane div.dav-url button.mui-icon-button span.mui-font-icon:hover {
+  color: rgba(0, 0, 0, 0.73);
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer div#webdav_pane div.copy_legend {
+  color: #00897B;
+  margin-top: -10px;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer div#webdav_pane div.dav-password-legend {
+  color: rgba(0, 0, 0, 0.33);
+}
+@media only screen and (max-width: 800px) {
+  #userdashboard_main_tab.horizontal_tabulator div.tabulatorContainer {
+    width: 200px;
+  }
+  #userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer {
+    left: 200px;
+  }
+}
+@media only screen and (max-width: 630px) {
+  #userdashboard_main_tab.horizontal_tabulator div.tabulatorContainer {
+    width: 40px;
+  }
+  #userdashboard_main_tab.horizontal_tabulator div.tabulatorContainer span.toggleHeader {
+    padding-right: 11px !important;
+  }
+  #userdashboard_main_tab.horizontal_tabulator div.tabulatorContainer span.tab_label {
     display: none;
-}
-
-div#userdashboard_myparams_title a#dash_back_workspace{
+  }
+  #userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer {
+    left: 40px;
+  }
+  #userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer .title-flex {
+    display: block !important;
+  }
+  #userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer .title-flex h3 {
+    padding-right: 20px;
+  }
+  #userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer .title-flex .actionBar,
+  #userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer .title-flex .action_bar {
+    text-align: right !important;
+  }
+}
+div#userdashboard_myparams_title {
+  position: absolute;
+  color: #ffffff;
+  padding: 25px 16px;
+  height: 63px;
+  font-size: 12px;
+  width: 240px;
+  box-sizing: border-box;
+  bottom: 0;
+  z-index: 2;
+  letter-spacing: 1px;
+  font-weight: 500;
+  white-space: nowrap;
+  overflow-x: hidden;
+}
+div#userdashboard_myparams_title span#dash_title {
+  display: none;
+}
+div#userdashboard_myparams_title a#dash_back_workspace {
+  display: block;
+  cursor: pointer;
+}
+@media only screen and (max-width: 800px) {
+  div#userdashboard_myparams_title {
+    width: 200px !important;
+  }
+}
+@media only screen and (max-width: 630px) {
+  div#userdashboard_myparams_title {
+    width: 40px !important;
+  }
+  div#userdashboard_myparams_title a#dash_back_workspace {
     display: block;
-    cursor: pointer;
-}
-
-div#userdashboard_myparams_title a#dash_back_workspace:hover{
-    color:rgb(204, 204, 204);
-}
-
-div#userdashboard_main_tab div#team_pane,
-div#userdashboard_main_tab div#my-users-pane,
-div#userdashboard_main_tab div#account_pane,
-div#userdashboard_main_tab div#webdav_pane,
-div#userdashboard_main_tab div#shared_files_pane,
-div#userdashboard_main_tab div#shared_pane,
-div#userdashboard_main_tab div#shared_pane2,
-div#userdashboard_main_tab div#home_account_pane{
-    position: relative;
-}
-
-div#userdashboard_main_tab h3.dashboard_panel_title{
-    position: absolute;
-    top: 18px;
-    left: 16px;
-    font-size: 24px;
-    font-weight: 500;
-    margin: 0;
-    color: #444;
-}
-
-
-div#team_edit_container {
-    max-height: 200px;
-    overflow: auto;
-    background-color: white;
-    border: 1px solid #ccc;
-    border-radius: 2px;
-    z-index: 10;
-}
-
-#team_edit_container ul {
-    margin: 0;
-    padding: 0;
-}
-
-#team_edit_container ul li{
-    list-style: none;
-    padding: 8px;
-    color: rgba(0,0,0,0.87);
-}
-
-#team_edit_container ul li.selected{
-    background-color: #eee !important;
-}
-
-#team_edit_entries .user_entry{
-    padding: 8px;
-    border-bottom: 1px solid rgba(0,0,0,0.03);
-}
-#team_edit_entries .user_entry .delete_user_entry{
-    float: right;
-    cursor: pointer;
-}
-
-.wallet_pane{
-    /*
-       background-color:#EFEFEF;
-       border-left:1px solid;
-       */
-    margin-left:2px;
-    margin-right:2px;
-    padding:0 10px 0 0;
-}
-.wallet_pane div.driver_form{
-    width:215px;
-}
-.wallet_pane input.dialogButton{
-    float:right;
-    border: 1px solid #676965;
-}
-
-/****************************************/
-/* WEBDAV PREFERENCES                    */
-/****************************************/
-#webdav_main_access{
-    font-size: 20px;
-    padding: 5px;
-    text-align: center;
-    border-radius: 3px;
-    background-color: white;
-    width: 97%;
-    margin-bottom: 5px;
-    color: rgb(111, 121, 131);
-}
-
-#perworkspace-urls-toggle{
-    cursor: pointer;
-}
-#perworkspace-urls-toggle span{
-    font-size: 13px;
-    margin: 0 7px;
-    text-decoration: none;
-}
-
-#webdav_repo_list{
-    height: auto !important;
-    background-color: white;
-}
-
-#webdav_repo_list div{
-    padding: 7px;
-}
-
-#webdav_repo_list span{
+  }
+  div#userdashboard_myparams_title a#dash_back_workspace span.icon-chevron-left {
     display: inline-block;
-    width: 24%;
-}
-
-#webdav_repo_list input {
-    width: 92% !important;
-    margin-top: 11px;
-}
-
-input#webdav_password{
-    height: 22px !important;
-}
-
-
-@media only screen
-and (max-width : 980px){
-    #notifications_center div.notif_event_container{
-        width: 100px;
-    }
-}
-
-@media only screen
-and (max-width : 800px){
-
-    #notifications_center li{
-        text-align: center;
-    }
-
-    #notifications_center li > div:first-of-type{
-        float: none !important;
-        position: absolute;
-        bottom: 5px;
-        left: 45%;
-    }
-
-    #notifications_center li > img{
-        float: none !important;
-        margin: auto;
-    }
-
-    #notifications_center div.notif_event_container{
-        float: none;
-        margin-bottom: 2px;
-        width: 100%;
-        text-align: center;
-    }
-
-    #notifications_center div[data-is_loaded]{
-        margin: 0 auto;
-        float: none !important;
-        min-height: 70px;
-    }
-
-    #notifications_center div.notif_event_label{
-        font-size: 11px;
-    }
-
-    .tutorial_legend{
-        clear: left;
-        width: 97%;
-    }
-
-    .tutorial_video{
-        width: 94%;
-        height: 300px;
-        margin-right: 3%;
-        margin-left: 3%;
-    }
-    #dl_pydio_cont{
-        width: 400px !important;
-    }
-    #dl_pydio_for{
-        display: none;
-    }
-
-
-}
-
-@media only screen
-and (max-width : 400px){
-
-    #notifications_center li > div:first-of-type,
-    #notifications_center div.notif_event_repository,
-    #notifications_center div.notif_event_description,
-    #notifications_center div.notif_event_date{
-        display: none;
-    }
-
-    #logo_div img{
-        width: 100px;
-    }
-
+    margin-right: 20px;
+  }
+}
+div#team_edit_form span.user_entry_label {
+  color: rgba(0, 0, 0, 0.87);
+}
+div#team_edit_form span.user_entry_label::before {
+  content: "\f007";
+  font-family: FontAwesome;
+  display: inline-block;
+  margin-right: 5px;
+}
+div#team_edit_form div#team_edit_container {
+  max-height: 200px;
+  overflow: auto;
+  background-color: white;
+  border: 1px solid #ccc;
+  border-radius: 2px;
+  z-index: 10;
+}
+div#team_edit_form div#team_edit_container ul {
+  margin: 0;
+  padding-left: 0;
+}
+div#team_edit_form div#team_edit_container ul li {
+  list-style: none;
+  padding: 8px;
+  color: rgba(0, 0, 0, 0.87);
+}
+div#team_edit_form div#team_edit_container ul li.selected {
+  background-color: #eee !important;
+}
+div#team_edit_form #team_edit_entries .user_entry {
+  padding: 8px;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.03);
+}
+div#team_edit_form #team_edit_entries .user_entry .delete_user_entry {
+  float: right;
+  cursor: pointer;
+}
+@media only screen and (max-width: 400px) {
+  #logo_div img {
+    width: 100px;
+  }
 }
diff --git a/core/src/plugins/access.ajxp_user/dashboard.less b/core/src/plugins/access.ajxp_user/dashboard.less
new file mode 100644
index 0000000000..598302ec49
--- /dev/null
+++ b/core/src/plugins/access.ajxp_user/dashboard.less
@@ -0,0 +1,348 @@
+@bezier_transition:all 550ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;
+@break1: 40px;
+@break2: 200px;
+@break3: 240px;
+
+#userdashboard_main_tab{
+  font-family: Roboto, sans-serif;
+  -webkit-font-smoothing: antialiased;
+
+  &.horizontal_tabulator {
+    display: block;
+    position: relative;
+
+    div.tabulatorContainer{
+      position: absolute;
+      left: 0;
+      top: 0;
+      bottom: 0;
+      width: @break3;
+      padding-top: 10px;
+      background-color: #444;
+      z-index: 1;
+      box-shadow:0 3px 6px rgba(0,0,0,.16),0 3px 6px rgba(0,0,0,.23);
+      transition: @bezier_transition;
+      span.toggleHeader{
+
+        padding: 16px;
+        font-size: 13px;
+        color: #ff7043 !important;
+        background-color: transparent !important;
+        &.toggleInactive{
+          color: white !important;
+        }
+        span[class^="icon-"], span[class*=" icon-"], span.mdi{
+          display: inline;
+          float: right;
+          font-size: 18px;
+          margin-right: 0;
+        }
+      }
+    }
+
+    div.tabulatorPanelsContainer{
+      transition: @bezier_transition;
+
+      position: absolute;
+      left: @break3;
+      top: 0;
+      bottom: 0;
+      right:0;
+      padding:16px;
+      background-color: #f4f4f4;
+      > div{
+        position: relative;
+        background-color: #ffffff;
+        border-radius: 2px;
+        box-shadow:0 3px 6px rgba(0,0,0,.16),0 3px 6px rgba(0,0,0,.23);
+        &#account_pane, &#webdav_pane{
+          overflow-y: auto;
+        }
+        .title-flex{
+          display: flex;
+          h3{
+            flex: 1;
+            .legend{
+              font-size: 12px;
+              font-weight: 300;
+              line-height: 1.3em;
+              margin-top: 3px;
+            }
+            &.dashboard_panel_title{
+              margin-top: 16px;
+              padding-left: 20px;
+              font-size: 24px;
+              line-height: 32px;
+              font-weight: 400;
+              color: rgba(0, 0, 0, 0.87);
+            }
+          }
+          div.actionBar, div.action_bar{
+            margin: 20px 20px 0 0;
+          }
+        }
+        .action_bar, #buttons_bar{
+          background-color: white !important;
+          padding-bottom: 20px;
+          border-bottom: 0;
+          a{
+            box-shadow:0 1px 4px rgba(0, 0, 0, 0.24), 0 1px 6px rgba(0, 0, 0, 0.12);
+            margin: 0 3px;
+            display: inline-block;
+            border-radius: 2px !important;
+            padding: 7px 16px;
+            height: auto;
+            span.actionbar_button_label{
+              font-size: 14px;
+            }
+            @media only screen and (max-width: 720px){
+              span.ajxp_icon_span {
+                display: block !important;
+                margin: 0 0 10px;
+              }
+            }
+          }
+        }
+        div.class-FetchedResultPane{
+          border-top: 1px solid rgb(250,250,250);
+          &#shared_files_list{
+            border-top:1px solid #eaeaea;
+          }
+          background-color: #ffffff;
+          div.thumbnail_selectable_cell.detailed{
+            padding: 10px 5px;
+            border-bottom: 1px solid rgba(0,0,0,0.03);
+            transition: @bezier_transition;
+            div.mimefont{
+              line-height: 28px;
+            }
+            div.thumbLabel{
+              padding-top: 7px;
+              font-size: 14px;
+            }
+            div.thumbnail_selectable_cell{
+              padding-right: 11px;
+            }
+          }
+          div.thumbnail_selectable_cell.selected-focus{
+            background-color: lighten(#ff5722, 5) !important;
+          }
+
+          div.header_resizer div.header_label {
+            padding-left: 10px;
+            padding-top: 7px;
+          }
+          .sort-table tr{
+            background-color: white !important;
+            td{
+              border-bottom: 1px solid rgb(234,234,234);
+              padding: 10px 0;
+              &:first-of-type{
+                padding: 10px 5px;
+                span.mimefont{
+                  margin-right: 10px;
+                }
+              }
+            }
+            &.selected-focus{
+              background-color: lighten(#ff5722, 5) !important;
+              td{
+                border-bottom: 0;
+              }
+            }
+            &[data-groupByValue]{
+              &.selected-focus{
+                background-color: white !important;
+                td{
+                  border-bottom: 1px solid rgb(234,234,234);
+                }
+              }
+              h3 {
+                padding: 5px 5px 10px;
+                font-size: 1em;
+                color: #00897B;
+                border-bottom: 0;
+              }
+            }
+          }
+        }
+      }
+      div#webdav_pane{
+        div.dav-url{
+          display: flex;
+          div.mui-text-field{
+            flex: 1;
+            width: auto;
+          }
+          button.mui-icon-button{
+            margin-top: 30px;
+            span.mui-font-icon{
+              font-size: 16px;
+              color: rgba(0,0,0,0.33);
+              &:hover{
+                color: rgba(0,0,0,0.73);
+              }
+            }
+          }
+        }
+        div.copy_legend{
+          color: #00897B;
+          margin-top: -10px;
+        }
+        div.dav-password-legend{
+          color: rgba(0,0,0,0.33);
+        }
+      }
+    }
+
+    @media only screen
+    and (max-width : 800px){
+      div.tabulatorContainer{
+        width: @break2;
+      }
+      div.tabulatorPanelsContainer{
+        left: @break2;
+      }
+    }
+    @media only screen
+    and (max-width : 630px){
+      div.tabulatorContainer{
+        width: @break1;
+        span.toggleHeader{
+          padding-right: 11px !important;
+        }
+        span.tab_label{
+          display: none;
+        }
+      }
+      div.tabulatorPanelsContainer{
+        left: @break1;
+        .title-flex{
+          display: block !important;
+          h3{
+            padding-right: 20px;
+          }
+          .actionBar, .action_bar{
+            text-align: right !important;
+          }
+        }
+      }
+    }
+  }
+
+}
+
+
+div#userdashboard_myparams_title{
+
+  position: absolute;
+  color: #ffffff;
+  padding: 25px 16px;
+  height: 63px;
+  font-size: 12px;
+  width: @break3;
+  box-sizing: border-box;
+  bottom: 0;
+  z-index: 2;
+  letter-spacing: 1px;
+  font-weight: 500;
+
+  white-space: nowrap;
+  overflow-x: hidden;
+
+  span#dash_title{
+      display: none;
+  }
+
+  a#dash_back_workspace{
+      display: block;
+      cursor: pointer;
+  }
+
+  @media only screen
+  and (max-width : 800px){
+    &{
+      width: @break2 !important;
+    }
+  }
+  @media only screen
+  and (max-width : 630px){
+    &{
+      width: @break1 !important;
+    }
+    a#dash_back_workspace{
+      display: block;
+      span.icon-chevron-left{
+        display: inline-block;
+        margin-right: 20px;
+      }
+    }
+  }
+
+}
+
+div#team_edit_form{
+
+  span.user_entry_label{
+    color: rgba(0,0,0,0.87);
+    &::before {
+      content: "\f007";
+      font-family: FontAwesome;
+      display: inline-block;
+      margin-right: 5px;
+    }
+  }
+
+  div#team_edit_container {
+    max-height: 200px;
+    overflow: auto;
+    background-color: white;
+    border: 1px solid #ccc;
+    border-radius: 2px;
+    z-index: 10;
+    ul {
+      margin: 0;
+      padding-left: 0;
+      li{
+        list-style: none;
+        padding: 8px;
+        color: rgba(0,0,0,0.87);
+        &.selected{
+          background-color: #eee !important;
+        }
+      }
+    }
+
+  }
+
+
+
+  #team_edit_entries {
+
+    .user_entry{
+        padding: 8px;
+        border-bottom: 1px solid rgba(0,0,0,0.03);
+      .delete_user_entry{
+          float: right;
+          cursor: pointer;
+      }
+    }
+
+  }
+
+
+}
+
+@media only screen
+and (max-width : 630px){
+
+}
+
+@media only screen
+and (max-width : 400px){
+
+    #logo_div img{
+        width: 100px;
+    }
+
+}
diff --git a/core/src/plugins/access.ajxp_user/i18n/ca.php b/core/src/plugins/access.ajxp_user/i18n/ca.php
index 046388e1db..fecdbaf531 100644
--- a/core/src/plugins/access.ajxp_user/i18n/ca.php
+++ b/core/src/plugins/access.ajxp_user/i18n/ca.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 // catalan translation: Salva Gómez <salva.gomez at gmail.com>, 2015
 
diff --git a/core/src/plugins/access.ajxp_user/i18n/conf/de.php b/core/src/plugins/access.ajxp_user/i18n/conf/de.php
index 2e503f4be3..d4fd81f935 100644
--- a/core/src/plugins/access.ajxp_user/i18n/conf/de.php
+++ b/core/src/plugins/access.ajxp_user/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "User Dashboard"=> "Mein Dashboard",
diff --git a/core/src/plugins/access.ajxp_user/i18n/conf/en.php b/core/src/plugins/access.ajxp_user/i18n/conf/en.php
index 7a80772796..d62c658218 100644
--- a/core/src/plugins/access.ajxp_user/i18n/conf/en.php
+++ b/core/src/plugins/access.ajxp_user/i18n/conf/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "User Dashboard"=> "User Dashboard",
diff --git a/core/src/plugins/access.ajxp_user/i18n/conf/it.php b/core/src/plugins/access.ajxp_user/i18n/conf/it.php
index a1927f610c..3bd60f2866 100644
--- a/core/src/plugins/access.ajxp_user/i18n/conf/it.php
+++ b/core/src/plugins/access.ajxp_user/i18n/conf/it.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "User Dashboard"=> "Dashboard Utente",
diff --git a/core/src/plugins/access.ajxp_user/i18n/de.php b/core/src/plugins/access.ajxp_user/i18n/de.php
index 8a373ac4bb..74d270a9d5 100644
--- a/core/src/plugins/access.ajxp_user/i18n/de.php
+++ b/core/src/plugins/access.ajxp_user/i18n/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "title"=> "Mein Dashboard",
diff --git a/core/src/plugins/access.ajxp_user/i18n/en.php b/core/src/plugins/access.ajxp_user/i18n/en.php
index 3f02a2febc..178e059270 100644
--- a/core/src/plugins/access.ajxp_user/i18n/en.php
+++ b/core/src/plugins/access.ajxp_user/i18n/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "title"=> "My Account",
diff --git a/core/src/plugins/access.ajxp_user/i18n/es.php b/core/src/plugins/access.ajxp_user/i18n/es.php
index 811c644358..1eb48a8139 100644
--- a/core/src/plugins/access.ajxp_user/i18n/es.php
+++ b/core/src/plugins/access.ajxp_user/i18n/es.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 // spanish translation: Ion Rey Bakaikoa <ionrei@gmail.com>, 2010
 // spanish corrections: Cristóbal Sabroe Yde <cristyde at gmail.com>, 2010
diff --git a/core/src/plugins/access.ajxp_user/i18n/fr.php b/core/src/plugins/access.ajxp_user/i18n/fr.php
index f7320120de..7e530f2e56 100644
--- a/core/src/plugins/access.ajxp_user/i18n/fr.php
+++ b/core/src/plugins/access.ajxp_user/i18n/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "title" => "Mon Compte",
diff --git a/core/src/plugins/access.ajxp_user/i18n/hu.php b/core/src/plugins/access.ajxp_user/i18n/hu.php
index 1540433393..8adce4a5b2 100644
--- a/core/src/plugins/access.ajxp_user/i18n/hu.php
+++ b/core/src/plugins/access.ajxp_user/i18n/hu.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 //  hungarian translation: Gyarmati Balázs <gyarmati.balazs@gmail.com>
 //  updates: Levente Huszkó <levente.huszko@gmail.com>
diff --git a/core/src/plugins/access.ajxp_user/i18n/it.php b/core/src/plugins/access.ajxp_user/i18n/it.php
index 6a4cf6cd32..2b13caeccb 100644
--- a/core/src/plugins/access.ajxp_user/i18n/it.php
+++ b/core/src/plugins/access.ajxp_user/i18n/it.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "title"=> "Bacheca",
diff --git a/core/src/plugins/access.ajxp_user/i18n/pt.php b/core/src/plugins/access.ajxp_user/i18n/pt.php
index 798bb133c5..6c365e6c76 100644
--- a/core/src/plugins/access.ajxp_user/i18n/pt.php
+++ b/core/src/plugins/access.ajxp_user/i18n/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Utilizadores partilhados",
diff --git a/core/src/plugins/access.ajxp_user/i18n/ru.php b/core/src/plugins/access.ajxp_user/i18n/ru.php
index 008ddfafaf..b2f0d65a61 100644
--- a/core/src/plugins/access.ajxp_user/i18n/ru.php
+++ b/core/src/plugins/access.ajxp_user/i18n/ru.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "title"=> "Настройки",
diff --git a/core/src/plugins/access.ajxp_user/i18n/si.php b/core/src/plugins/access.ajxp_user/i18n/si.php
index b0399aa3f8..aad6aa7a4f 100644
--- a/core/src/plugins/access.ajxp_user/i18n/si.php
+++ b/core/src/plugins/access.ajxp_user/i18n/si.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 // Slovenian translation: April 21 2011 by Vladimir Bohinc (vladimir.bohinc@gmail.com)
 $mess=array(
diff --git a/core/src/plugins/access.ajxp_user/manifest.xml b/core/src/plugins/access.ajxp_user/manifest.xml
index 08dbb6e6d5..4002e4c377 100644
--- a/core/src/plugins/access.ajxp_user/manifest.xml
+++ b/core/src/plugins/access.ajxp_user/manifest.xml
@@ -6,6 +6,7 @@
             <css file="plugins/editor.ajxp_role/rolesEditor.css" />
             <js className="UserProfileEditor" file="plugins/access.ajxp_user/class.UserProfileEditor.js"/>
             <js className="WebDAVprefsEditor" file="plugins/access.ajxp_user/class.WebDAVprefsEditor.js"/>
+            <js className="UserAccount" file="plugins/access.ajxp_user/build/UserAccount.js" depends="React,PydioForm"/>
             <css file="plugins/access.ajxp_user/dashboard.css"/>
 		</resources>
         <node_provider ajxpClass="EmptyNodeProvider" ajxpOptions="{}"/>
@@ -15,140 +16,24 @@
     </server_settings>
 	<registry_contributions>
 		<client_configs>
-            <template_part theme="umbra" ajxpId="sidebar_splitter" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fake":"option"}'><![CDATA[
-                <div id="folderPane" ajxpClass="FoldersTree" ajxpOptions='{"display":"dz","replaceScroller":true}' ajxpPaneHeader="363" ajxpPaneIcon="view_tree.png" style="margin:20px;"></div>
-                <style>#sidebar_splitter{padding-bottom:20px;background-color:#A0C0A4;}</style>
-            ]]></template_part>
-            <template_part ajxpClass="AjxpPane" ajxpId="workspace_toolbar" ajxpOptions='{"fit":"none"}' theme="vision"><![CDATA[
-                <div id="search_container_settings" class="settings_search_container" style="display:none;" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "fitMarginBottom":20}'></div>
-                <style>
-                #workspace_toolbar, #global_toolbar{display:none;}
-                #browser{padding:0}
-                div.flat_tabulator span.toggleHeader{
-                    background-color: #e35d52;
-                }
-                .largeButton, .SF_input.SF_inlineButton{
-                    background-color: #e35d52;
-                }
-                .action_bar{
-                    background-color: #ebedf0;
-                    padding: 4px;
-                    border-left:1px solid #5C5C5C;
-                }
-                #user_profile_form, div.class-FetchedResultPane{
-                    border-left:1px solid #5C5C5C;
-                }
-                #account_pane .action_bar{
-                    text-align: right;
-                }
-                .action_bar a{
-                    background-color: #e35d52;
-                    margin-top:3px;
-                    cursor: pointer;
-                }
-                div.class-FetchedResultPane{
-                    background-color: #f8f8f8;
-                }
-                #buttons_bar{
-                    padding-bottom: 2px;
-                    text-align: right;
-                }
-                #buttons_bar a {
-                    padding-bottom: 0;
-                    height: 26px;
-                }
-                .action_bar span.actionbar_button_label{
-                    font-size: 11px;
-                }
-                .flat_tabulator div.panelHeader.tabulatorContainer{
-                    background-color: #30383A;
-                    padding-top: 10px;
-                }
-                .flat_tabulator span.toggleHeader:first-of-type {
-                    background-color: #e35d52 !important;
-                }
-                .flat_tabulator span.toggleHeader.toggleInactive {
-                    background-color: rgba(119, 119, 119, 0.35) !important;
-                }
-                </style>
-            ]]></template_part>
-            <template_part ajxpId="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop", "fakeOptionUser":"true", "messageBoxReference":true}' theme="vision"><![CDATA[
-                <div id="userdashboard_main_tab" ajxpClass="AjxpTabulator" class="dashboard_main_pane flat_tabulator" ajxpOptions='{"fit":"height", "fitMarginBottom":0, "registerAsEditorOpener":false, "saveState":false,"events":{}, "defaultTabId": "parameters","tabInfos" : [{"id":"parameters","label":"user_dash.43", "title":"user_dash.43t","iconClass":"icon-cog", "element":"account_pane"},{"id":"info","label":"user_dash.46", "title":"user_dash.47","iconClass":"icon-book", "element":"my-users-pane"}]}'>
-                    <div id="my-users-pane" ajxpClass="AjxpPane" class="tabbed_editor">
-                        <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["change","address_book"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
-                        <div id="address_book" ajxpClass="FetchedResultPane" ajxpOptions='{"updateGlobalContext":true,"nodeProviderProperties":{"get_action":"ls","dir":"users"}, "displayMode":"detail","replaceScroller":true, "fit":"height", "fitParent":"userdashboard_main_tab", "fitMarginBottom":0, "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px"}'></div>
-                    </div>
-                    <div id="account_pane" ajxpClass="UserProfileEditor" class="tabbed_editor">
-                        <div class="action_bar">
-                            <div class="toolbarGroup"></div>
-                        </div>
-                        <div id="user_profile_form"></div>
-                    </div>
-                </div>
-                <script>
-                    document.observeOnce("ajaxplorer:context_changed", function(){
-                        try{
-                            $("browser").ajxpPaneObject.resize();
-                        }catch(e){}
-                    });
-                    window.setTimeout(function(){
-                        try{ $("browser").ajxpPaneObject.resize(); }catch(e){}
-                    }, 100);
-                </script>
-			]]></template_part>
             <template_part ajxpId="orbit_content" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop", "fakeOptionUser":"true", "messageBoxReference":true}' theme="orbit"><![CDATA[
-                <style>
-                div.flat_tabulator span.toggleHeader{
-                    background-color: #fb725c;
-                }
-                .largeButton, .SF_input.SF_inlineButton{
-                    background-color: #fb725c;
-                }
-                #account_pane .action_bar{
-                    text-align: right;
-                }
-                .action_bar a{
-                    cursor: pointer;
-                }
-                div.class-FetchedResultPane{
-                    background-color: #f8f8f8;
-                }
-                .action_bar, #buttons_bar{
-                    background-color: #f8f8f8;
-                    height: 32px;
-                    border-bottom: 1px solid rgba(0,0,0,0.08);
-                    padding:18px 14px 12px;
-                    text-align: right;
-                }
-                .action_bar span.actionbar_button_label{
-                    font-size: 11px;
-                }
-                .flat_tabulator div.panelHeader.tabulatorContainer{
-                    background-color: #30383A;
-                    padding-top: 10px;
-                }
-                </style>
                 <div id="userdashboard_myparams_title" ajxp_message_id="user_dash.title">
                     <a id="dash_back_workspace" onclick="ajaxplorer.triggerRepositoryChange('ajxp_home'); return false;"><span class="icon-chevron-left"></span> AJXP_MESSAGE[user_dash.53]</a>
                     <span id="dash_title">AJXP_MESSAGE[user_dash.title]</span>
                 </div>
-                <div id="userdashboard_main_tab" ajxpClass="AjxpTabulator" class="dashboard_main_pane horizontal_tabulator left_tabulator" ajxpOptions='{"fit":"height", "fitMarginBottom":0, "fitParent":"orbit_content", "registerAsEditorOpener":false, "saveState":false,"events":{}, "tabsTips":"middle right", "defaultTabId": "parameters","tabInfos" : [{"id":"parameters","label":"user_dash.43", "title":"user_dash.43t","iconClass":"icon-cog", "element":"account_pane"}]}'>
-                    <div id="account_pane" ajxpClass="UserProfileEditor" class="tabbed_editor" ajxpOptions='{"fit":"height"}'>
-                        <div class="action_bar" id="buttons_bar">
-                            <div class="toolbarGroup"></div>
-                        </div>
-                        <h3 class="dashboard_panel_title">AJXP_MESSAGE[user_dash.43]</h3>
-                        <div id="user_profile_form"></div>
-                    </div>
+                <div id="userdashboard_main_tab" ajxpClass="AjxpTabulator" class="dashboard_main_pane horizontal_tabulator left_tabulator" ajxpOptions='{"fit":"height", "fitMarginBottom":0, "fitParent":"orbit_content", "registerAsEditorOpener":false, "saveState":false, "route":{"base":"/dashboard"}, "events":{}, "tabsTips":"middle right", "defaultTabId": "profile","tabInfos" : [{"id":"profile","label":"user_dash.43", "title":"user_dash.43t","iconClass":"icon-cog", "element":"account_pane"}]}'>
+                    <div id="account_pane" ajxpClass="AjxpReactComponent" class="tabbed_editor" ajxpOptions='{"componentNamespace":"UserAccount","componentName":"ProfilePane"}'></div>
                 </div>
 			]]></template_part>
             <component_config className="AjxpTabulator::userdashboard_main_tab">
                 <additional_tab id="my-users-pane"
-                                tabInfo='{"id":"info","label":"user_dash.46", "title":"user_dash.47","iconClass":"icon-book", "element":"my-users-pane", "position":2,"dontFocus":true}'
+                                tabInfo='{"id":"contacts","label":"user_dash.46", "title":"user_dash.47","iconClass":"icon-book", "element":"my-users-pane", "position":2,"dontFocus":true}'
                                 paneInfo='{"type":"widget"}'><![CDATA[
                     <div id="my-users-pane" ajxpClass="AjxpPane" class="tabbed_editor">
-                        <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"dataModelElementId":"address_book","toolbarsList":["change","address_book"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
-                        <h3 class="dashboard_panel_title">AJXP_MESSAGE[user_dash.46]</h3>
+                        <div class="title-flex">
+                            <h3 class="dashboard_panel_title">AJXP_MESSAGE[user_dash.46]<div class="legend">AJXP_MESSAGE[user_dash.49]</div></h3>
+                            <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"dataModelElementId":"address_book","toolbarsList":["change","address_book"],"submenuOffsetTop":2}'></div>
+                        </div>
                         <div id="address_book" ajxpClass="FetchedResultPane" ajxpOptions='{"updateGlobalContext":false,"nodeProviderProperties":{"get_action":"ls","dir":"users"}, "displayMode":"detail","replaceScroller":true, "fit":"height", "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px"}'></div>
                     </div>
                 ]]></additional_tab>
@@ -232,5 +117,5 @@
 			</action>
 		</actions>
 	</registry_contributions>
-	<class_definition filename="plugins/access.ajxp_user/class.UserDashboardDriver.php" classname="UserDashboardDriver"/>
+	<class_definition filename="plugins/access.ajxp_user/UserDashboardDriver.php" classname="Pydio\Access\Driver\DataProvider\UserDashboardDriver"/>
 </ajxpdriver>
diff --git a/core/src/plugins/access.ajxp_user/package.json b/core/src/plugins/access.ajxp_user/package.json
new file mode 100644
index 0000000000..9166966cac
--- /dev/null
+++ b/core/src/plugins/access.ajxp_user/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "access.ajxp_user",
+  "version": "6.5.1",
+  "description": "User account panels",
+  "source_path":"react",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "Abstrium SAS",
+  "license": "agpl",
+  "devDependencies": {
+    "grunt": "~0.4.5",
+    "grunt-babel": "~5.0.3",
+    "grunt-contrib-watch": "~0.6.1",
+    "assemble-less": "~0.7.0",
+    "less-plugin-autoprefix": "~1.5.1"
+  }
+}
diff --git a/core/src/plugins/access.ajxp_user/react/UserAccount.js b/core/src/plugins/access.ajxp_user/react/UserAccount.js
new file mode 100644
index 0000000000..fb2f7bd6dc
--- /dev/null
+++ b/core/src/plugins/access.ajxp_user/react/UserAccount.js
@@ -0,0 +1,293 @@
+(function(global){
+
+    var ProfilePane = React.createClass({
+
+        componentDidMount: function(){
+            this.props.pydio.UI.disableAllKeyBindings();
+        },
+        componentWillUnmount: function(){
+            this.props.pydio.UI.enableAllKeyBindings();
+        },
+
+        getInitialState: function(){
+            let objValues = {};
+            let pydio = this.props.pydio;
+            pydio.user.preferences.forEach(function(v, k){
+                if(k === 'gui_preferences') return;
+                objValues[k] = v;
+            });
+            return {
+                definitions:PydioForm.Manager.parseParameters(pydio.getXmlRegistry(), "user/preferences/pref[@exposed='true']|//param[contains(@scope,'user') and @expose='true']"),
+                values:objValues,
+                originalValues:LangUtils.deepCopy(objValues),
+                dirty: false
+            };
+        },
+
+        onFormChange: function(newValues, dirty, removeValues){
+            this.setState({dirty: dirty, values: newValues});
+        },
+
+        getButton: function(actionName, messageId){
+            let pydio = this.props.pydio;
+            if(!pydio.Controller.getActionByName(actionName)){
+                return null;
+            }
+            let func = function(){
+                pydio.Controller.fireAction(actionName);
+            };
+            return (
+                <ReactMUI.RaisedButton label={pydio.MessageHash[messageId]} onClick={func}/>
+            );
+        },
+
+        revert: function(){
+            this.setState({
+                values: LangUtils.deepCopy(this.state.originalValues)
+            });
+        },
+
+        saveForm: function(){
+            if(!this.state.dirty){
+                this.setState({dirty: false});
+                return;
+            }
+            let pydio = this.props.pydio;
+            let postValues = PydioForm.Manager.getValuesForPOST(this.state.definitions, this.state.values, 'PREFERENCES_');
+            postValues['get_action'] = 'custom_data_edit';
+            PydioApi.getClient().request(postValues, function(transport){
+                PydioApi.getClient().parseXmlMessage(transport.responseXML);
+                global.document.observeOnce("ajaxplorer:registry_part_loaded", function(event){
+                    if(event.memo != "user/preferences") return;
+                    pydio.Registry.logXmlUser(false);
+                });
+                pydio.loadXmlRegistry(false, "user/preferences");
+                this.setState({dirty: false});
+            });
+        },
+
+        render: function(){
+            let pydio = this.props.pydio;
+
+            let saveButton = <ReactMUI.RaisedButton disabled={!this.state.dirty} label={pydio.MessageHash[53]} onClick={this.saveForm}/>;
+            return (
+                <div className="react-mui-context">
+                    <div className="title-flex">
+                        <h3 style={{paddingLeft:20}}>
+                            {pydio.MessageHash['user_dash.43']}
+                            <div className="legend">{pydio.MessageHash['user_dash.43t']}</div>
+                        </h3>
+                        <div className="actionBar">
+                            {saveButton}&nbsp;&nbsp;
+                            {this.getButton('pass_change', 194)}
+                        </div>
+                    </div>
+                    <PydioForm.FormPanel
+                        parameters={this.state.definitions}
+                        values={this.state.values}
+                        depth={-1}
+                        binary_context={"user_id="+pydio.user.id}
+                        onChange={this.onFormChange}
+                    />
+                </div>
+            );
+        }
+
+    });
+
+    var WebDAVURL = React.createClass({
+
+        propTypes:{
+            url: React.PropTypes.string,
+            label: React.PropTypes.string,
+            getMessage: React.PropTypes.func
+        },
+
+        componentDidUpdate: function(prevProps, prevState){
+            this.attachClipboard();
+        },
+
+        componentDidMount: function(){
+            this.attachClipboard();
+        },
+
+        componentWillUnmount: function(){
+            this.detachClipboard();
+        },
+
+        detachClipboard: function(){
+            if(this._clip){
+                this._clip.destroy();
+            }
+        },
+
+        clearCopyMessage:function(){
+            global.setTimeout(function(){
+                this.setState({copyMessage:''});
+            }.bind(this), 5000);
+        },
+
+        attachClipboard: function(){
+            this.detachClipboard();
+            if(this.refs['copy-button']){
+                this._clip = new Clipboard(this.refs['copy-button'].getDOMNode(), {
+                    text: function(trigger) {
+                        return this.props.url;
+                    }.bind(this)
+                });
+                this._clip.on('success', function(){
+                    this.setState({copyMessage:this.props.getMessage('share_center.192')}, this.clearCopyMessage);
+                }.bind(this));
+                this._clip.on('error', function(){
+                    var copyMessage;
+                    if( global.navigator.platform.indexOf("Mac") === 0 ){
+                        copyMessage = this.props.getMessage('share_center.144');
+                    }else{
+                        copyMessage = this.props.getMessage('share_center.143');
+                    }
+                    this.setState({copyMessage:copyMessage}, this.clearCopyMessage);
+                }.bind(this));
+            }
+        },
+
+        render: function(){
+            let copy;
+            if(this.state && this.state.copyMessage){
+                copy = <div className="copy_legend">{this.state.copyMessage}</div>;
+            }
+            return (
+                <div>
+                    <div className="dav-url">
+                        <ReactMUI.TextField floatingLabelText={this.props.label} value={this.props.url}/>
+                        <ReactMUI.IconButton iconClassName="icon-paste" tooltip={this.props.getMessage('share_center.191')} ref="copy-button"/>
+                    </div>
+                    {copy}
+                </div>
+            );
+        }
+
+    });
+
+    var WebDAVPane = React.createClass({
+
+        componentDidMount: function(){
+            this.props.pydio.UI.disableAllKeyBindings();
+            this.loadPrefs();
+        },
+        componentWillUnmount: function(){
+            this.props.pydio.UI.enableAllKeyBindings();
+        },
+        getMessage: function(id){
+            return this.props.pydio.MessageHash[id];
+        },
+        onToggleChange: function(event, newValue){
+            PydioApi.getClient().request({
+                get_action : 'webdav_preferences',
+                activate   : newValue ? "true":"false"
+            }, function(t){
+                this.setState({preferences: t.responseJSON});
+                this.props.pydio.displayMessage("SUCCESS", this.props.pydio.MessageHash[newValue?408:409]);
+            }.bind(this));
+        },
+        savePassword: function(event){
+            PydioApi.getClient().request({
+                get_action : 'webdav_preferences',
+                webdav_pass: this.refs['passfield'].getValue()
+            }, function(t){
+                this.setState({preferences: t.responseJSON});
+                this.props.pydio.displayMessage("SUCCESS", this.props.pydio.MessageHash[410]);
+            }.bind(this));
+        },
+        loadPrefs: function(){
+            if(!this.isMounted()) return;
+            PydioApi.getClient().request({
+                get_action:'webdav_preferences'
+            }, function(t){
+                this.setState({preferences: t.responseJSON});
+            }.bind(this));
+        },
+
+        renderPasswordField: function(){
+
+            if(this.state.preferences.digest_set || !this.state.preferences.webdav_force_basic){
+                return null;
+            }
+            return (
+                <div>
+                    <ReactMUI.TextField
+                        type="password"
+                        floatingLabelText={this.getMessage(523)}
+                        ref="passfield"
+                    />&nbsp;&nbsp;&nbsp;
+                    <ReactMUI.RaisedButton
+                        label="Save"
+                        onClick={this.savePassword}
+                    />
+                    <div className="dav-password-legend">{this.getMessage(407)}</div>
+                </div>
+            );
+        },
+
+        renderURLList: function(){
+
+            let base = this.state.preferences.webdav_base_url;
+            let userRepos = this.props.pydio.user.getRepositoriesList();
+            let webdavRepos = this.state.preferences.webdav_repositories;
+            let otherUrls = [];
+            if(!!this.state.toggler){
+                userRepos.forEach(function(repo, key){
+                    if(!webdavRepos[key]) return;
+                    otherUrls.push(<WebDAVURL key={key} label={repo.getLabel()} url={webdavRepos[key]} getMessage={this.getMessage} />);
+                }.bind(this));
+            }
+
+            let toggler = function(){
+                this.setState({toggler: !this.state.toggler});
+            }.bind(this);
+
+            return (
+                <div>
+                    <h4>WebDAV shares adresses</h4>
+                    <div>{this.getMessage(405)}</div>
+                    <WebDAVURL label={this.getMessage(468)} url={base} getMessage={this.getMessage}/>
+                    <div style={{paddingTop: 20}}>
+                        <ReactMUI.Checkbox label={this.getMessage(465)} onCheck={toggler} checked={!!this.state.toggler}/>
+                    </div>
+                    {otherUrls}
+                </div>
+            );
+
+        },
+        render: function(){
+            let webdavActive = this.state && this.state.preferences.webdav_active;
+            return (
+                <div className="react-mui-context">
+                    <div className="title-flex">
+                        <h3 style={{paddingLeft:20}}>
+                            {this.getMessage(403)}
+                            <div className="legend">{this.getMessage(404)}</div>
+                        </h3>
+                    </div>
+                    <div style={{padding:20}}>
+                        <ReactMUI.Toggle
+                            label={this.getMessage(406)}
+                            toggled={webdavActive}
+                            onToggle={this.onToggleChange}/>
+                        <div style={{paddingTop: 20}}>
+                            {webdavActive ? this.renderPasswordField() : null}
+                            {webdavActive ? this.renderURLList() : null}
+                        </div>
+                    </div>
+                </div>
+            );
+        }
+
+    });
+
+    let ns = global.UserAccount || {};
+    ns.ProfilePane = ProfilePane;
+    ns.WebDAVPane = WebDAVPane;
+    global.UserAccount = ns;
+
+
+})(window);
\ No newline at end of file
diff --git a/core/src/plugins/access.demo/DemoAccessDriver.php b/core/src/plugins/access.demo/DemoAccessDriver.php
new file mode 100644
index 0000000000..27d28497b5
--- /dev/null
+++ b/core/src/plugins/access.demo/DemoAccessDriver.php
@@ -0,0 +1,88 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ *
+ */
+namespace Pydio\Access\Driver\StreamProvider\FS;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\Model\Repository;
+
+use Pydio\Core\Exception\PydioException;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * @package AjaXplorer_Plugins
+ * @subpackage Access
+ * @class demoAccessDriver
+ * Plugin to access a filesystem with all write actions disabled
+ */
+class DemoAccessDriver extends FsAccessDriver
+{
+    /**
+    * @var Repository
+    */
+    public $repository;
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @throws PydioException
+     * @throws \Exception
+     * @return array|void
+     */
+    public function switchAction(ServerRequestInterface &$request, ResponseInterface &$response)
+    {
+        $errorMessage = "This is a demo, all 'write' actions are disabled!";
+        switch ($request->getAttribute("action")) {
+            //------------------------------------
+            //	WRITE ACTIONS
+            //------------------------------------
+            case "put_content":
+            case "copy":
+            case "move":
+            case "rename":
+            case "delete":
+            case "mkdir":
+            case "mkfile":
+            case "chmod":
+            case "compress":
+                throw new PydioException($errorMessage);
+            break;
+
+            //------------------------------------
+            //	UPLOAD
+            //------------------------------------
+            case "upload":
+
+                return array("ERROR" => array("CODE" => "", "MESSAGE" => $errorMessage));
+
+            break;
+
+            default:
+            break;
+        }
+
+        return parent::switchAction($request, $response);
+
+    }
+
+}
diff --git a/core/src/plugins/access.demo/class.demoAccessDriver.php b/core/src/plugins/access.demo/class.demoAccessDriver.php
deleted file mode 100644
index 6f858c13cd..0000000000
--- a/core/src/plugins/access.demo/class.demoAccessDriver.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * @package AjaXplorer_Plugins
- * @subpackage Access
- * @class demoAccessDriver
- * AJXP_Plugin to access a filesystem with all write actions disabled
- */
-class demoAccessDriver extends fsAccessDriver
-{
-    /**
-    * @var Repository
-    */
-    public $repository;
-
-    public function switchAction($action, $httpVars, $fileVars)
-    {
-        $errorMessage = "This is a demo, all 'write' actions are disabled!";
-        switch ($action) {
-            //------------------------------------
-            //	WRITE ACTIONS
-            //------------------------------------
-            case "put_content":
-            case "copy":
-            case "move":
-            case "rename":
-            case "delete":
-            case "mkdir":
-            case "mkfile":
-            case "chmod":
-            case "compress":
-                return AJXP_XMLWriter::sendMessage(null, $errorMessage, false);
-            break;
-
-            //------------------------------------
-            //	UPLOAD
-            //------------------------------------
-            case "upload":
-
-                return array("ERROR" => array("CODE" => "", "MESSAGE" => $errorMessage));
-
-            break;
-
-            default:
-            break;
-        }
-
-        return parent::switchAction($action, $httpVars, $fileVars);
-
-    }
-
-}
diff --git a/core/src/plugins/access.demo/i18n/conf/cs.php b/core/src/plugins/access.demo/i18n/conf/cs.php
index c29ba37360..8cae5c1de3 100644
--- a/core/src/plugins/access.demo/i18n/conf/cs.php
+++ b/core/src/plugins/access.demo/i18n/conf/cs.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Demo (no write actions)" => "Demo (žádné akce zápisu)",
diff --git a/core/src/plugins/access.demo/i18n/conf/de.php b/core/src/plugins/access.demo/i18n/conf/de.php
index a6de32a923..d6d3f53c6e 100644
--- a/core/src/plugins/access.demo/i18n/conf/de.php
+++ b/core/src/plugins/access.demo/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Demo (no write actions)" => "Demo (ohne Schreibrechte)",
diff --git a/core/src/plugins/access.demo/i18n/conf/en.php b/core/src/plugins/access.demo/i18n/conf/en.php
index 1f7590de7f..e1f72698a0 100644
--- a/core/src/plugins/access.demo/i18n/conf/en.php
+++ b/core/src/plugins/access.demo/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Demo (no write actions)" => "Demo (no write actions)",
diff --git a/core/src/plugins/access.demo/i18n/conf/fr.php b/core/src/plugins/access.demo/i18n/conf/fr.php
index ac0354b625..8ef8fcbce3 100644
--- a/core/src/plugins/access.demo/i18n/conf/fr.php
+++ b/core/src/plugins/access.demo/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Demo (no write actions)" => "Demo (pas d'écriture)",
diff --git a/core/src/plugins/access.demo/i18n/conf/it.php b/core/src/plugins/access.demo/i18n/conf/it.php
index 5eb5f466f8..c66e4ca50f 100644
--- a/core/src/plugins/access.demo/i18n/conf/it.php
+++ b/core/src/plugins/access.demo/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Demo (no write actions)" => "Demo (nessuna azione di scrittura)",
diff --git a/core/src/plugins/access.demo/manifest.xml b/core/src/plugins/access.demo/manifest.xml
index a347853a2a..75892cb23c 100644
--- a/core/src/plugins/access.demo/manifest.xml
+++ b/core/src/plugins/access.demo/manifest.xml
@@ -14,7 +14,7 @@
 		<param name="CREATE" type="boolean" label="CONF_MESSAGE[Create]" description="CONF_MESSAGE[Create folder if it does not exists]" default="true" mandatory="true"/>
 		<param name="RECYCLE_BIN" type="string" label="CONF_MESSAGE[Recycle Bin Folder]" description="CONF_MESSAGE[Leave empty if you do not want to use a recycle bin.]" default="recycle_bin"/>
 	</server_settings>
-	<class_definition filename="plugins/access.demo/class.demoAccessDriver.php" classname="demoAccessDriver"/>
+	<class_definition filename="plugins/access.demo/DemoAccessDriver.php" classname="Pydio\Access\Driver\StreamProvider\FS\DemoAccessDriver"/>
 	<registry_contributions>
 		<external_file filename="plugins/access.fs/fsActions.xml" include="actions/*" exclude=""/>
 		<external_file filename="plugins/access.fs/fsActions.xml" include="client_configs/*" exclude=""/>
@@ -25,5 +25,5 @@
 	<dependencies>
 		<pluginClass pluginName="access.fs"/>
 	</dependencies>
-    <class_stream_wrapper filename="plugins/access.fs/class.fsAccessWrapper.php" classname="fsAccessWrapper" protocol="ajxp.demo"/>
+    <class_stream_wrapper filename="plugins/access.fs/FsAccessWrapper.php" classname="Pydio\Access\Driver\StreamProvider\FS\FsAccessWrapper" protocol="ajxp.demo"/>
 </ajxpdriver>
diff --git a/core/src/plugins/access.dropbox/class.dropboxAccessDriver.php b/core/src/plugins/access.dropbox/class.dropboxAccessDriver.php
deleted file mode 100644
index ede0b3d783..0000000000
--- a/core/src/plugins/access.dropbox/class.dropboxAccessDriver.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * AJXP_Plugin to access a dropbox account
- * @package AjaXplorer_Plugins
- * @subpackage Access
- */
-class dropboxAccessDriver extends fsAccessDriver
-{
-    /**
-    * @var Repository
-    */
-    public $repository;
-    public $driverConf;
-    protected $wrapperClassName;
-    protected $urlBase;
-
-    public function initRepository()
-    {
-        if (is_array($this->pluginConf)) {
-            $this->driverConf = $this->pluginConf;
-        } else {
-            $this->driverConf = array();
-        }
-
-        $this->detectStreamWrapper(true);
-        $this->urlBase = "pydio://".$this->repository->getId();
-
-        if (!AJXP_Utils::searchIncludePath('HTTP/OAuth/Consumer.php')) {
-            $this->logError("Dropbox", "The PEAR HTTP_OAuth package must be installed!");
-            return;
-        }
-
-        $consumerKey = $this->repository->getOption("CONSUMER_KEY");
-        $consumerSecret = $this->repository->getOption("CONSUMER_SECRET");
-        $oauth = new Dropbox_OAuth_PEAR($consumerKey, $consumerSecret);
-
-        // TOKENS IN SESSION?
-        if(!empty($_SESSION["OAUTH_DROPBOX_TOKENS"])) return;
-
-        // TOKENS IN FILE ?
-        $tokens = $this->getTokens();
-        if (!empty($tokens)) {
-            $_SESSION["OAUTH_DROPBOX_TOKENS"] = $tokens;
-            return;
-        }
-
-        // OAUTH NEGOCIATION
-        if (isset($_SESSION['DROPBOX_NEGOCIATION_STATE'])) {
-            $state = $_SESSION['DROPBOX_NEGOCIATION_STATE'];
-        } else {
-            $state = 1;
-        }
-        switch ($state) {
-
-            case 1 :
-                $tokens = $oauth->getRequestToken();
-                //print_r($tokens);
-
-                // Note that if you want the user to automatically redirect back, you can
-                // add the 'callback' argument to getAuthorizeUrl.
-                //echo "Step 2: You must now redirect the user to:\n";
-                $_SESSION['DROPBOX_NEGOCIATION_STATE'] = 2;
-                $_SESSION['oauth_tokens'] = $tokens;
-                throw new AJXP_UserAlertException("Please go to <a style=\"text-decoration:underline;\" target=\"_blank\" href=\"".$oauth->getAuthorizeUrl()."\">".$oauth->getAuthorizeUrl()."</a> to authorize the access to your dropbox. Then try again to switch to this workspace.");
-
-            case 2 :
-                $oauth->setToken($_SESSION['oauth_tokens']);
-                try{
-                    $tokens = $oauth->getAccessToken();
-                }catch(Exception $oauthEx){
-                    throw new AJXP_UserAlertException($oauthEx->getMessage() . ". Please go to <a style=\"text-decoration:underline;\" target=\"_blank\" href=\"".$oauth->getAuthorizeUrl()."\">".$oauth->getAuthorizeUrl()."</a> to authorize the access to your dropbox. Then try again to switch to this workspace.");
-                }
-                $_SESSION['DROPBOX_NEGOCIATION_STATE'] = 3;
-                $_SESSION['OAUTH_DROPBOX_TOKENS'] = $tokens;
-                $this->setTokens($tokens);
-                return;
-        }
-
-        throw new Exception("Impossible to find the dropbox tokens for accessing this workspace");
-
-    }
-
-    public function performChecks()
-    {
-        if (!AJXP_Utils::searchIncludePath('HTTP/OAuth/Consumer.php')) {
-            throw new Exception("The PEAR HTTP_OAuth package must be installed!");
-        }
-    }
-
-    public function isWriteable($dir, $type = "dir")
-    {
-        return true;
-    }
-
-    public function getTokens()
-    {
-        if($this->repository->getOption("DROPBOX_OAUTH_TOKENS") !== null && is_array($this->repository->getOption("DROPBOX_OAUTH_TOKENS"))){
-            return $this->repository->getOption("DROPBOX_OAUTH_TOKENS");
-        }
-        $repositoryId = $this->repository->getId();
-        if(AuthService::usersEnabled()) {
-            $u = AuthService::getLoggedUser();
-            $userId = $u->getId();
-            if($u->getResolveAsParent()){
-                $userId = $u->getParent();
-            }
-        }else {
-            $userId = "shared";
-        }
-        return AJXP_Utils::loadSerialFile(AJXP_DATA_PATH."/plugins/access.dropbox/".$repositoryId."_".$userId."_tokens");
-    }
-
-    public function setTokens($oauth_tokens)
-    {
-        $repositoryId = $this->repository->getId();
-        if(AuthService::usersEnabled()) $userId = AuthService::getLoggedUser()->getId();
-        else $userId = "shared";
-        return AJXP_Utils::saveSerialFile(AJXP_DATA_PATH."/plugins/access.dropbox/".$repositoryId."_".$userId."_tokens", $oauth_tokens, true);
-    }
-
-    public function makeSharedRepositoryOptions($httpVars, $repository)
-    {
-        $newOptions = parent::makeSharedRepositoryOptions($httpVars, $repository);
-        $newOptions["DROPBOX_OAUTH_TOKENS"] = $this->getTokens();
-        return $newOptions;
-    }
-
-
-}
diff --git a/core/src/plugins/access.dropbox/class.dropboxWrapper.php b/core/src/plugins/access.dropbox/class.dropboxWrapper.php
deleted file mode 100644
index 240d2a4781..0000000000
--- a/core/src/plugins/access.dropbox/class.dropboxWrapper.php
+++ /dev/null
@@ -1,301 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-
-require_once (AJXP_INSTALL_PATH.'/plugins/access.dropbox/dropbox-php/autoload.php');
-require_once (AJXP_BIN_FOLDER.'/interface.AjxpWrapper.php');
-
-/**
- * AjxpWrapper encapsulation the PHP Dropbox client
- * @package AjaXplorer_Plugins
- * @subpackage Access
- */
-class dropboxWrapper implements AjxpWrapper
-{
-    /**
-     *
-     * @var Dropbox_API
-     */
-    private static $dropbox;
-    private static $oauth;
-
-    private static $crtDirContent = array();
-    private static $crtDirIndex = 0;
-
-    private static $crtHandle;
-    private static $crtTmpFile;
-    private static $crtWritePath;
-
-    public function __construct()
-    {
-    }
-
-    public function initPath($ajxpPath)
-    {
-        $repo = ConfService::getRepository();
-        if (empty(self::$dropbox)) {
-            $consumerKey = $repo->getOption('CONSUMER_KEY');
-            $consumerSecret = $repo->getOption('CONSUMER_SECRET');
-
-            self::$oauth = new Dropbox_OAuth_PEAR($consumerKey, $consumerSecret);
-            self::$oauth->setToken($_SESSION["OAUTH_DROPBOX_TOKENS"]);
-            self::$dropbox = new Dropbox_API(self::$oauth);
-        }
-        $basePath = $repo->getOption("PATH");
-        if(empty($basePath)) $basePath = "";
-        $parts = AJXP_Utils::safeParseUrl($ajxpPath);
-        $path = $basePath."/".ltrim($parts["path"], "/");
-
-        if($path == "") return "/";
-        return $path;
-    }
-
-    public static function staticInitPath($ajxpPath)
-    {
-        $tmpObject = new dropboxWrapper();
-        return $tmpObject->initPath($ajxpPath);
-    }
-
-    protected function metadataToStat($metaEntry)
-    {
-        AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Stating ", $metaEntry);
-        $mode = 0666;
-        if(intval($metaEntry["is_dir"]) == 1) $mode += 0040000;
-        else $mode += 0100000;
-        $time = strtotime($metaEntry["modified"]);
-        $size = intval($metaEntry["bytes"]);
-        $keys = array(
-            'dev' => 0,
-            'ino' => 0,
-            'mode' => $mode,
-            'nlink' => 0,
-            'uid' => 0,
-            'gid' => 0,
-            'rdev' => 0,
-            'size' => $size,
-            'atime' => $time,
-            'mtime' => $time,
-            'ctime' => $time,
-            'blksize' => 0,
-            'blocks' => 0
-        );
-        AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Stat value", $keys);
-        return $keys;
-    }
-
-    public static function copyFileInStream($path, $stream)
-    {
-        $path = self::staticInitPath($path);
-        $data = self::$dropbox->getFile($path);
-        fwrite($stream, $data, strlen($data));
-    }
-
-    public static function isRemote()
-    {
-        return true;
-    }
-
-    public static function getRealFSReference($path, $persistent = false)
-    {
-        $tmpFile = AJXP_Utils::getAjxpTmpDir()."/".rand();
-        $path = self::staticInitPath($path);
-        file_put_contents($tmpFile, self::$dropbox->getFile($path));
-        return $tmpFile;
-    }
-
-    public static function changeMode($path, $chmodValue)
-    {
-    }
-
-
-    public function rename($path_from, $path_to)
-    {
-        $path1 = $this->initPath($path_from);
-        $path2 = $this->initPath($path_to);
-        self::$dropbox->copy($path1, $path2);
-        self::$dropbox->delete($path1);
-    }
-
-    public function mkdir($path, $mode, $options)
-    {
-        $path = $this->initPath($path);
-        try {
-            self::$dropbox->createFolder($path);
-        } catch (Dropbox_Exception $e) {
-            return false;
-        }
-        return true;
-    }
-
-    public function rmdir($path, $options)
-    {
-        $path = $this->initPath($path);
-        try {
-            self::$dropbox->delete($path);
-        } catch (Dropbox_Exception $e) {
-            return false;
-        }
-        return true;
-    }
-
-    public function unlink($path)
-    {
-        $path = $this->initPath($path);
-        try {
-            self::$dropbox->delete($path);
-        } catch (Dropbox_Exception $e) {
-            return false;
-        }
-        return true;
-    }
-
-    public function url_stat($path, $flags)
-    {
-        AJXP_Logger::debug(__CLASS__,__FUNCTION__,"STATING $path");
-        $path = $this->initPath($path);
-        $meta = null;
-        if (self::$crtDirContent != null) {
-            foreach (self::$crtDirContent as $metaEntry) {
-                if ($metaEntry["path"] == $path) {
-                    $metaEntry = $meta;
-                    break;
-                }
-            }
-        }
-        if (empty($meta)) {
-            try {
-                $meta = self::$dropbox->getMetaData($path);
-            } catch (Dropbox_Exception_NotFound $nf) {
-                return false;
-            }
-        }
-        return $this->metadataToStat($meta);
-    }
-
-    public function dir_opendir($path, $options)
-    {
-        $path = $this->initPath($path);
-        $metadata = self::$dropbox->getMetaData($path);
-        AJXP_Logger::debug(__CLASS__,__FUNCTION__,"CONTENT for $path", $metadata);
-        self::$crtDirContent = $metadata["contents"];
-        if (!is_array(self::$crtDirContent)) {
-            return false;
-        }
-        return true;
-    }
-
-    public function dir_readdir()
-    {
-        //return false;
-        if(self::$crtDirIndex == count(self::$crtDirContent)) return false;
-        $meta = self::$crtDirContent[self::$crtDirIndex];
-        self::$crtDirIndex ++;
-        return basename($meta["path"]);
-    }
-
-    public function dir_rewinddir()
-    {
-        self::$crtDirIndex = 0;
-    }
-
-    public function dir_closedir()
-    {
-        self::$crtDirContent = array();
-        self::$crtDirIndex = 0;
-    }
-
-
-    public function stream_flush()
-    {
-        return fflush(self::$crtHandle);
-    }
-
-    public function stream_read($count)
-    {
-        return fread(self::$crtHandle, $count);
-    }
-
-    public function stream_seek($offset, $whence = SEEK_SET)
-    {
-        return fseek(self::$crtHandle, $offset, $whence);
-    }
-
-    public function stream_write($data)
-    {
-        return fwrite(self::$crtHandle, $data);
-    }
-
-    public function stream_close()
-    {
-        $res = fclose(self::$crtHandle);
-        if (self::$crtWritePath != null) {
-            $path = $this->initPath(self::$crtWritePath);
-            try {
-                $postRes = self::$dropbox->putFile($path, self::$crtTmpFile);
-                AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Post to $path succeeded:");
-            } catch (Dropbox_Exception $dE) {
-                AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Post to $path failed :".$dE->getMessage());
-            }
-        }
-        unlink(self::$crtTmpFile);
-        return $res;
-    }
-
-    public function stream_tell()
-    {
-        return ftell(self::$crtHandle);
-    }
-
-    public function stream_eof()
-    {
-        return feof(self::$crtHandle);
-    }
-
-    public function stream_stat()
-    {
-        return true;
-    }
-
-    public function stream_open($path, $mode, $options, &$opened_path)
-    {
-        if (strstr($mode, "r") !== false) {
-            self::$crtTmpFile = self::getRealFSReference($path);
-            self::$crtWritePath = null;
-        } else {
-            self::$crtTmpFile = AJXP_Utils::getAjxpTmpDir()."/".rand();
-            self::$crtWritePath = $path;
-        }
-        self::$crtHandle = fopen(self::$crtTmpFile, $mode);
-        return true;
-    }
-
-    /**
-     * Describe whether the current wrapper can rewind a stream or not.
-     * @static
-     * @return boolean
-     */
-    public static function isSeekable($url)
-    {
-        return true;
-    }
-}
diff --git a/core/src/plugins/access.dropbox/composer.json b/core/src/plugins/access.dropbox/composer.json
new file mode 100644
index 0000000000..17e1019122
--- /dev/null
+++ b/core/src/plugins/access.dropbox/composer.json
@@ -0,0 +1,11 @@
+{
+    "name": "AccessDropBox",
+    "description": "Pydio DropBox access wrapper",
+    "homepage": "http://pydio.com/",
+    "autoload": {
+        "psr-4": {
+            "Pydio\\Access\\Core\\": "../core.access/src",
+            "Pydio\\Access\\DropBox\\": "./src/"
+        }
+    }
+}
diff --git a/core/src/plugins/access.dropbox/dropbox-php/API.php b/core/src/plugins/access.dropbox/dropbox-php/API.php
deleted file mode 100644
index e52f1a8306..0000000000
--- a/core/src/plugins/access.dropbox/dropbox-php/API.php
+++ /dev/null
@@ -1,346 +0,0 @@
-<?php
-
-/**
- * Dropbox API class 
- * 
- * @package Dropbox 
- * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/dropbox-php/wiki/License MIT
- */
-class Dropbox_API {
-
-    /**
-     * Sandbox root-path
-     */
-    const ROOT_SANDBOX = 'sandbox';
-
-    /**
-     * Dropbox root-path
-     */
-    const ROOT_DROPBOX = 'dropbox';
-    
-    /**
-     * API URl
-     */
-    protected $api_url = 'https://api.dropbox.com/1/';
-    
-    /**
-     * Content API URl
-     */
-    protected $api_content_url = 'https://api-content.dropbox.com/1/';
-
-    /**
-     * OAuth object 
-     * 
-     * @var Dropbox_OAuth
-     */
-    protected $oauth;
-    
-    /**
-     * Default root-path, this will most likely be 'sandbox' or 'dropbox' 
-     * 
-     * @var string 
-     */
-    protected $root;
-
-    /**
-     * Constructor 
-     * 
-     * @param Dropbox_OAuth Dropbox_Auth object
-     * @param string $root default root path (sandbox or dropbox) 
-     */
-    public function __construct(Dropbox_OAuth $oauth, $root = self::ROOT_DROPBOX, $useSSL = true) {
-
-        $this->oauth = $oauth;
-        $this->root = $root;
-        $this->useSSL = $useSSL;
-        if (!$this->useSSL)
-        {
-            throw new Dropbox_Exception('Dropbox REST API now requires that all requests use SSL');
-        }
-
-    }
-
-    /**
-     * Returns OAuth tokens based on an email address and passwords
-     *
-     * This can be used to bypass the regular oauth workflow.
-     *
-     * This method returns an array with 2 elements:
-     *   * token
-     *   * secret
-     *
-     * @param string $email 
-     * @param string $password 
-     * @deprecated This method is no longer supported
-     * @return array 
-     */
-    public function getToken($email, $password) {
-
-        throw new Dropbox_Exception('This API method is deprecated as of the version 1 API');
-
-    }
-
-    /**
-     * Returns information about the current dropbox account 
-     * 
-     * @return stdclass 
-     */
-    public function getAccountInfo() {
-
-        $data = $this->oauth->fetch($this->api_url . 'account/info');
-        return json_decode($data['body'],true);
-
-    }
-
-    /**
-     * Creates a new Dropbox account
-     *
-     * @param string $email 
-     * @param string $first_name 
-     * @param string $last_name 
-     * @param string $password 
-     * @deprecated This method is no longer supported
-     * @return bool 
-     */
-    public function createAccount($email, $first_name, $last_name, $password) {
-
-        throw new Dropbox_Exception('This API method is deprecated as of the version 1 API');
-
-    }
-
-
-    /**
-     * Returns a file's contents 
-     * 
-     * @param string $path path 
-     * @param string $root Use this to override the default root path (sandbox/dropbox) 
-     * @return string 
-     */
-    public function getFile($path = '', $root = null) {
-
-        if (is_null($root)) $root = $this->root;
-        $path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path));
-        $result = $this->oauth->fetch($this->api_content_url . 'files/' . $root . '/' . ltrim($path,'/'));
-        return $result['body'];
-
-    }
-
-    /**
-     * Uploads a new file
-     *
-     * @param string $path Target path (including filename) 
-     * @param string $file Either a path to a file or a stream resource 
-     * @param string $root Use this to override the default root path (sandbox/dropbox)  
-     * @return bool 
-     */
-    public function putFile($path, $file, $root = null) {
-
-        $directory = dirname($path);
-        $filename = basename($path);
-
-        if($directory==='.') $directory = '';
-        if (is_null($root)) $root = $this->root;
-
-        if (is_string($file)) {
-
-            $file = fopen($file,'r');
-
-        } elseif (!is_resource($file)) {
-            throw new Dropbox_Exception('File must be a file-resource or a string');
-        }
-        $result=$this->multipartFetch($this->api_content_url . 'files/' . 
-                $root . '/' . trim($directory,'/'), $file, $filename);
-        
-        if(!isset($result["httpStatus"]) || $result["httpStatus"] != 200) 
-            throw new Dropbox_Exception("Uploading file to Dropbox failed");
-
-        return true;
-    }
-
-
-    /**
-     * Copies a file or directory from one location to another 
-     *
-     * This method returns the file information of the newly created file.
-     *
-     * @param string $from source path 
-     * @param string $to destination path 
-     * @param string $root Use this to override the default root path (sandbox/dropbox)  
-     * @return stdclass 
-     */
-    public function copy($from, $to, $root = null) {
-
-        if (is_null($root)) $root = $this->root;
-        $response = $this->oauth->fetch($this->api_url . 'fileops/copy', array('from_path' => $from, 'to_path' => $to, 'root' => $root));
-
-        return json_decode($response['body'],true);
-
-    }
-
-    /**
-     * Creates a new folder 
-     *
-     * This method returns the information from the newly created directory
-     *
-     * @param string $path 
-     * @param string $root Use this to override the default root path (sandbox/dropbox)  
-     * @return stdclass 
-     */
-    public function createFolder($path, $root = null) {
-
-        if (is_null($root)) $root = $this->root;
-
-        // Making sure the path starts with a /
-        $path = '/' . ltrim($path,'/');
-
-        $response = $this->oauth->fetch($this->api_url . 'fileops/create_folder', array('path' => $path, 'root' => $root),'POST');
-        return json_decode($response['body'],true);
-
-    }
-
-    /**
-     * Deletes a file or folder.
-     *
-     * This method will return the metadata information from the deleted file or folder, if successful.
-     * 
-     * @param string $path Path to new folder 
-     * @param string $root Use this to override the default root path (sandbox/dropbox)  
-     * @return array 
-     */
-    public function delete($path, $root = null) {
-
-        if (is_null($root)) $root = $this->root;
-        $response = $this->oauth->fetch($this->api_url . 'fileops/delete', array('path' => $path, 'root' => $root));
-        return json_decode($response['body']);
-
-    }
-
-    /**
-     * Moves a file or directory to a new location 
-     *
-     * This method returns the information from the newly created directory
-     *
-     * @param mixed $from Source path 
-     * @param mixed $to destination path
-     * @param string $root Use this to override the default root path (sandbox/dropbox) 
-     * @return stdclass 
-     */
-    public function move($from, $to, $root = null) {
-
-        if (is_null($root)) $root = $this->root;
-        $response = $this->oauth->fetch($this->api_url . 'fileops/move', array('from_path' => rawurldecode($from), 'to_path' => rawurldecode($to), 'root' => $root));
-
-        return json_decode($response['body'],true);
-
-    }
-
-    /**
-     * Returns a list of links for a directory
-     *
-     * The links can be used to securely open files throug a browser. The links are cookie protected
-     * so a user is asked to login if there's no valid session cookie.
-     *
-     * @param string $path Path to directory or file
-     * @param string $root Use this to override the default root path (sandbox/dropbox)
-     * @deprecated This method is no longer supported
-     * @return array 
-     */
-    public function getLinks($path, $root = null) {
-
-        throw new Dropbox_Exception('This API method is currently broken, and dropbox documentation about this is no longer online. Please ask Dropbox support if you really need this.');
-
-        /*
-        if (is_null($root)) $root = $this->root;
-        
-        $response = $this->oauth->fetch($this->api_url . 'links/' . $root . '/' . ltrim($path,'/'));
-        return json_decode($response,true);
-        */ 
-
-    }
-
-    /**
-     * Returns file and directory information
-     * 
-     * @param string $path Path to receive information from 
-     * @param bool $list When set to true, this method returns information from all files in a directory. When set to false it will only return infromation from the specified directory.
-     * @param string $hash If a hash is supplied, this method simply returns true if nothing has changed since the last request. Good for caching.
-     * @param int $fileLimit Maximum number of file-information to receive 
-     * @param string $root Use this to override the default root path (sandbox/dropbox) 
-     * @return array|true 
-     */
-    public function getMetaData($path, $list = true, $hash = null, $fileLimit = null, $root = null) {
-
-        if (is_null($root)) $root = $this->root;
-
-        $args = array(
-            'list' => $list,
-        );
-
-        if (!is_null($hash)) $args['hash'] = $hash; 
-        if (!is_null($fileLimit)) $args['file_limit'] = $fileLimit; 
-
-        $path = str_replace(array('%2F','~'), array('/','%7E'), rawurlencode($path));
-        $response = $this->oauth->fetch($this->api_url . 'metadata/' . $root . '/' . ltrim($path,'/'), $args);
-
-        /* 304 is not modified */
-        if ($response['httpStatus']==304) {
-            return true; 
-        } else {
-            return json_decode($response['body'],true);
-        }
-
-    } 
-
-    /**
-     * Returns a thumbnail (as a string) for a file path. 
-     * 
-     * @param string $path Path to file 
-     * @param string $size small, medium or large 
-     * @param string $root Use this to override the default root path (sandbox/dropbox)  
-     * @return string 
-     */
-    public function getThumbnail($path, $size = 'small', $root = null) {
-
-        if (is_null($root)) $root = $this->root;
-        $response = $this->oauth->fetch($this->api_content_url . 'thumbnails/' . $root . '/' . ltrim($path,'/'),array('size' => $size));
-
-        return $response['body'];
-
-    }
-
-    /**
-     * This method is used to generate multipart POST requests for file upload 
-     * 
-     * @param string $uri 
-     * @param array $arguments 
-     * @return bool 
-     */
-    protected function multipartFetch($uri, $file, $filename) {
-
-        /* random string */
-        $boundary = 'R50hrfBj5JYyfR3vF3wR96GPCC9Fd2q2pVMERvEaOE3D8LZTgLLbRpNwXek3';
-
-        $headers = array(
-            'Content-Type' => 'multipart/form-data; boundary=' . $boundary,
-        );
-
-        $body="--" . $boundary . "\r\n";
-        $body.="Content-Disposition: form-data; name=file; filename=".rawurldecode($filename)."\r\n";
-        $body.="Content-type: application/octet-stream\r\n";
-        $body.="\r\n";
-        $body.=stream_get_contents($file);
-        $body.="\r\n";
-        $body.="--" . $boundary . "--";
-
-        // Dropbox requires the filename to also be part of the regular arguments, so it becomes
-        // part of the signature. 
-        $uri.='?file=' . $filename;
-
-        return $this->oauth->fetch($uri, $body, 'POST', $headers);
-
-    }
-
-
-}
diff --git a/core/src/plugins/access.dropbox/dropbox-php/Exception.php b/core/src/plugins/access.dropbox/dropbox-php/Exception.php
deleted file mode 100644
index 50cbc4c791..0000000000
--- a/core/src/plugins/access.dropbox/dropbox-php/Exception.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * Dropbox base exception 
- * 
- * @package Dropbox 
- * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/dropbox-php/wiki/License MIT
- */
-
-/**
- * Base exception class
- */
-class Dropbox_Exception extends Exception { }
diff --git a/core/src/plugins/access.dropbox/dropbox-php/Exception/Forbidden.php b/core/src/plugins/access.dropbox/dropbox-php/Exception/Forbidden.php
deleted file mode 100644
index 5f0378cfc7..0000000000
--- a/core/src/plugins/access.dropbox/dropbox-php/Exception/Forbidden.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * Dropbox Forbidden exception
- * 
- * @package Dropbox 
- * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/dropbox-php/wiki/License MIT
- */
-
-/**
- * This exception is thrown when we receive the 403 forbidden response
- */
-class Dropbox_Exception_Forbidden extends Dropbox_Exception {
-
-
-}
diff --git a/core/src/plugins/access.dropbox/dropbox-php/Exception/NotFound.php b/core/src/plugins/access.dropbox/dropbox-php/Exception/NotFound.php
deleted file mode 100644
index 3deaf90d76..0000000000
--- a/core/src/plugins/access.dropbox/dropbox-php/Exception/NotFound.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * Dropbox Not Found exception
- * 
- * @package Dropbox 
- * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/dropbox-php/wiki/License MIT
- */
-
-/**
- * This exception is thrown when a non-existant uri is accessed.
- * 
- * Basically, this exception is used when we get back a 404.
- */
-class Dropbox_Exception_NotFound extends Dropbox_Exception {
-
-
-}
diff --git a/core/src/plugins/access.dropbox/dropbox-php/Exception/OverQuota.php b/core/src/plugins/access.dropbox/dropbox-php/Exception/OverQuota.php
deleted file mode 100644
index 86e5425dbd..0000000000
--- a/core/src/plugins/access.dropbox/dropbox-php/Exception/OverQuota.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * Dropbox Over Quota exception
- * 
- * @package Dropbox 
- * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/dropbox-php/wiki/License MIT
- */
-
-/**
- * This exception is thrown when the operation required more space than the available quota.
- * 
- * Basically, this exception is used when we get back a 507.
- */
-class Dropbox_Exception_OverQuota extends Dropbox_Exception {
-
-
-}
diff --git a/core/src/plugins/access.dropbox/dropbox-php/Exception/RequestToken.php b/core/src/plugins/access.dropbox/dropbox-php/Exception/RequestToken.php
deleted file mode 100644
index 5b117f2c6b..0000000000
--- a/core/src/plugins/access.dropbox/dropbox-php/Exception/RequestToken.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * Dropbox RequestToken exception
- * 
- * @package Dropbox 
- * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/dropbox-php/wiki/License MIT
- */
-
-/**
- * This exception is thrown when an error occured during the request_token process.
- */
-class Dropbox_Exception_RequestToken extends Dropbox_Exception {
-
-
-}
diff --git a/core/src/plugins/access.dropbox/dropbox-php/LICENSE b/core/src/plugins/access.dropbox/dropbox-php/LICENSE
deleted file mode 100644
index cd3512acee..0000000000
--- a/core/src/plugins/access.dropbox/dropbox-php/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2010 Rooftop Solutions
-
-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/src/plugins/access.dropbox/dropbox-php/OAuth.php b/core/src/plugins/access.dropbox/dropbox-php/OAuth.php
deleted file mode 100644
index 905cc2da1c..0000000000
--- a/core/src/plugins/access.dropbox/dropbox-php/OAuth.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-/**
- * Dropbox OAuth
- * 
- * @package Dropbox 
- * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/dropbox-php/wiki/License MIT
- */
-
-
-/**
- * This class is an abstract OAuth class.
- *
- * It must be extended by classes who wish to provide OAuth functionality
- * using different libraries.
- */
-abstract class Dropbox_OAuth {
-
-    /**
-     * After a user has authorized access, dropbox can redirect the user back
-     * to this url.
-     * 
-     * @var string
-     */
-    public $authorizeCallbackUrl = null; 
-   
-    /**
-     * Uri used to fetch request tokens 
-     * 
-     * @var string
-     */
-    const URI_REQUEST_TOKEN = 'https://api.dropbox.com/1/oauth/request_token';
-
-    /**
-     * Uri used to redirect the user to for authorization.
-     * 
-     * @var string
-     */
-    const URI_AUTHORIZE = 'https://www.dropbox.com/1/oauth/authorize';
-
-    /**
-     * Uri used to 
-     * 
-     * @var string
-     */
-    const URI_ACCESS_TOKEN = 'https://api.dropbox.com/1/oauth/access_token';
-
-    /**
-     * An OAuth request token. 
-     * 
-     * @var string 
-     */
-    protected $oauth_token = null;
-
-    /**
-     * OAuth token secret 
-     * 
-     * @var string 
-     */
-    protected $oauth_token_secret = null;
-
-
-    /**
-     * Constructor
-     * 
-     * @param string $consumerKey 
-     * @param string $consumerSecret 
-     */
-    abstract public function __construct($consumerKey, $consumerSecret);
-
-    /**
-     * Sets the request token and secret.
-     *
-     * The tokens can also be passed as an array into the first argument.
-     * The array must have the elements token and token_secret.
-     * 
-     * @param string|array $token 
-     * @param string $token_secret 
-     * @return void
-     */
-    public function setToken($token, $token_secret = null) {
-
-        if (is_array($token)) {
-            $this->oauth_token = $token['token'];
-            $this->oauth_token_secret = $token['token_secret'];
-        } else {
-            $this->oauth_token = $token;
-            $this->oauth_token_secret = $token_secret;
-        }
-
-    }
-
-    /**
-     * Returns the oauth request tokens as an associative array.
-     *
-     * The array will contain the elements 'token' and 'token_secret'.
-     * 
-     * @return array 
-     */
-    public function getToken() {
-
-        return array(
-            'token' => $this->oauth_token,
-            'token_secret' => $this->oauth_token_secret,
-        );
-
-    }
-
-    /**
-     * Returns the authorization url
-     * 
-     * @param string $callBack Specify a callback url to automatically redirect the user back 
-     * @return string 
-     */
-    public function getAuthorizeUrl($callBack = null) {
-        
-        // Building the redirect uri
-        $token = $this->getToken();
-        $uri = self::URI_AUTHORIZE . '?oauth_token=' . $token['token'];
-        if ($callBack) $uri.='&oauth_callback=' . $callBack;
-        return $uri;
-    }
-
-    /**
-     * Fetches a secured oauth url and returns the response body. 
-     * 
-     * @param string $uri 
-     * @param mixed $arguments 
-     * @param string $method 
-     * @param array $httpHeaders 
-     * @return string 
-     */
-    public abstract function fetch($uri, $arguments = array(), $method = 'GET', $httpHeaders = array()); 
-
-    /**
-     * Requests the OAuth request token.
-     * 
-     * @return array 
-     */
-    abstract public function getRequestToken(); 
-
-    /**
-     * Requests the OAuth access tokens.
-     *
-     * @return array
-     */
-    abstract public function getAccessToken(); 
-
-}
diff --git a/core/src/plugins/access.dropbox/dropbox-php/OAuth/PEAR.php b/core/src/plugins/access.dropbox/dropbox-php/OAuth/PEAR.php
deleted file mode 100644
index a33f044a51..0000000000
--- a/core/src/plugins/access.dropbox/dropbox-php/OAuth/PEAR.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-
-/**
- * Dropbox OAuth
- * 
- * @package Dropbox 
- * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/dropbox-php/wiki/License MIT
- */
-
-if (!class_exists('HTTP_OAuth_Consumer')) {
-
-    // We're going to try to load in manually
-    include 'HTTP/OAuth/Consumer.php';
-
-}
-if (!class_exists('HTTP_OAuth_Consumer'))
-    throw new Dropbox_Exception('The HTTP_OAuth_Consumer class could not be found! Did you install the pear HTTP_OAUTH class?');
-
-/* fix ssl issues */
-class HTTP_OAuth_Consumer_Dropbox extends  HTTP_OAuth_Consumer
-{
-    public function getOAuthConsumerRequest()
-    {
-        if (!$this->consumerRequest instanceof HTTP_OAuth_Consumer_Request) {
-            $this->consumerRequest = new HTTP_OAuth_Consumer_Request;
-        }
-
-        $this->consumerRequest->setConfig(array(
-                    'ssl_verify_peer' => false,
-                    'ssl_verify_host' => false
-                ));
-
-        return $this->consumerRequest;
-    }
-}
-
-/**
- * This class is used to sign all requests to dropbox
- * 
- * This classes use the PEAR HTTP_OAuth package. Make sure this is installed.
- */
-class Dropbox_OAuth_PEAR extends Dropbox_OAuth {
-
-    /**
-     * OAuth object
-     *
-     * @var OAuth
-     */
-    protected $oAuth;
-
-    /**
-     * OAuth consumer key
-     * 
-     * We need to keep this around for later. 
-     * 
-     * @var string 
-     */
-    protected $consumerKey;
-
-    /**
-     * Constructor
-     * 
-     * @param string $consumerKey 
-     * @param string $consumerSecret 
-     */
-    public function __construct($consumerKey, $consumerSecret) {
-
-        $this->OAuth = new HTTP_OAuth_Consumer_Dropbox($consumerKey, $consumerSecret);
-        $this->consumerKey = $consumerKey;
-
-    }
-
-    /**
-     * Sets the request token and secret.
-     *
-     * The tokens can also be passed as an array into the first argument.
-     * The array must have the elements token and token_secret.
-     * 
-     * @param string|array $token 
-     * @param string $token_secret 
-     * @return void
-     */
-    public function setToken($token, $token_secret = null) {
-
-        parent::setToken($token,$token_secret);
-        $this->OAuth->setToken($this->oauth_token);
-        $this->OAuth->setTokenSecret($this->oauth_token_secret);
-
-    }
-
-    /**
-     * Fetches a secured oauth url and returns the response body. 
-     * 
-     * @param string $uri 
-     * @param mixed $arguments 
-     * @param string $method 
-     * @param array $httpHeaders 
-     * @return string 
-     */
-    public function fetch($uri, $arguments = array(), $method = 'GET', $httpHeaders = array())
-    {
-        $httpRequest = new HTTP_Request2(null, 
-                HTTP_Request2::METHOD_GET, 
-                array(
-                    'ssl_verify_peer' => false, 
-                    'ssl_verify_host' => false
-                )
-        );
-
-        $consumerRequest = new HTTP_OAuth_Consumer_Request();
-        $consumerRequest->accept($httpRequest);
-        $consumerRequest->setUrl($uri);
-        $consumerRequest->setMethod($method);
-        $consumerRequest->setSecrets($this->OAuth->getSecrets());
-     
-        $parameters = array(
-            'oauth_consumer_key'     => $this->consumerKey,
-            'oauth_signature_method' => 'HMAC-SHA1',
-            'oauth_token'            => $this->oauth_token,
-        );
-
-
-        if (is_array($arguments)) {
-            $parameters = array_merge($parameters,$arguments);
-        } elseif (is_string($arguments)) {
-            $consumerRequest->setBody($arguments);
-        }
-        $consumerRequest->setParameters($parameters);
-
-
-        if (count($httpHeaders)) {
-            foreach($httpHeaders as $k=>$v) {
-                $consumerRequest->setHeader($k, $v);
-            }
-        }
-
-        $response = $consumerRequest->send();
-
-        switch($response->getStatus()) {
-
-              // Not modified
-            case 304 :
-                return array(
-                    'httpStatus' => 304,
-                    'body'       => null,
-                );
-                break;
-            case 403 :
-                throw new Dropbox_Exception_Forbidden('Forbidden. This could mean a bad OAuth request, or a file or folder already existing at the target location.');
-            case 404 : 
-                throw new Dropbox_Exception_NotFound('Resource at uri: ' . $uri . ' could not be found');
-            case 507 : 
-                throw new Dropbox_Exception_OverQuota('This dropbox is full');
-            case 400 :
-                throw new Exception('Bad Request : '. $response->getBody());
-
-        }
-
-        return array(
-            'httpStatus' => $response->getStatus(),
-            'body' => $response->getBody()
-        );
-
-    }
-
-    /**
-     * Requests the OAuth request token.
-     * 
-     * @return void
-     */
-    public function getRequestToken() {
-        
-        $this->OAuth->getRequestToken(self::URI_REQUEST_TOKEN);
-        $this->setToken($this->OAuth->getToken(), $this->OAuth->getTokenSecret());
-        return $this->getToken();
-
-    }
-
-    /**
-     * Requests the OAuth access tokens.
-     *
-     * This method requires the 'unauthorized' request tokens
-     * and, if successful will set the authorized request tokens.
-     * 
-     * @return void 
-     */
-    public function getAccessToken() {
-
-        $this->OAuth->getAccessToken(self::URI_ACCESS_TOKEN);
-        $this->setToken($this->OAuth->getToken(), $this->OAuth->getTokenSecret());
-        return $this->getToken();
-
-    }
-
-
-}
diff --git a/core/src/plugins/access.dropbox/dropbox-php/OAuth/PHP.php b/core/src/plugins/access.dropbox/dropbox-php/OAuth/PHP.php
deleted file mode 100644
index 48ce66f103..0000000000
--- a/core/src/plugins/access.dropbox/dropbox-php/OAuth/PHP.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-
-/**
- * Dropbox OAuth
- * 
- * @package Dropbox 
- * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/dropbox-php/wiki/License MIT
- */
-
-
-/**
- * This class is used to sign all requests to dropbox.
- *
- * This specific class uses the PHP OAuth extension
- */
-class Dropbox_OAuth_PHP extends Dropbox_OAuth {
-
-    /**
-     * OAuth object
-     *
-     * @var OAuth
-     */
-    protected $oAuth;
-
-    /**
-     * Constructor
-     * 
-     * @param string $consumerKey 
-     * @param string $consumerSecret 
-     */
-    public function __construct($consumerKey, $consumerSecret) {
-
-        if (!class_exists('OAuth')) 
-            throw new Dropbox_Exception('The OAuth class could not be found! Did you install and enable the oauth extension?');
-
-        $this->OAuth = new OAuth($consumerKey, $consumerSecret,OAUTH_SIG_METHOD_HMACSHA1,OAUTH_AUTH_TYPE_URI);
-        $this->OAuth->enableDebug();
-
-    }
-
-    /**
-     * Sets the request token and secret.
-     *
-     * The tokens can also be passed as an array into the first argument.
-     * The array must have the elements token and token_secret.
-     * 
-     * @param string|array $token 
-     * @param string $token_secret 
-     * @return void
-     */
-    public function setToken($token, $token_secret = null) {
-
-        parent::setToken($token,$token_secret);
-        $this->OAuth->setToken($this->oauth_token, $this->oauth_token_secret);
-
-    }
-
-
-    /**
-     * Fetches a secured oauth url and returns the response body. 
-     * 
-     * @param string $uri 
-     * @param mixed $arguments 
-     * @param string $method 
-     * @param array $httpHeaders 
-     * @return string 
-     */
-    public function fetch($uri, $arguments = array(), $method = 'GET', $httpHeaders = array()) {
-
-        try { 
-            $this->OAuth->fetch($uri, $arguments, $method, $httpHeaders);
-            $result = $this->OAuth->getLastResponse();
-            $lastResponseInfo = $this->OAuth->getLastResponseInfo();
-            return array(
-                'httpStatus' => $lastResponseInfo['http_code'],
-                'body'       => $result,
-            );
-        } catch (OAuthException $e) {
-
-            $lastResponseInfo = $this->OAuth->getLastResponseInfo();
-            switch($lastResponseInfo['http_code']) {
-
-                  // Not modified
-                case 304 :
-                    return array(
-                        'httpStatus' => 304,
-                        'body'       => null,
-                    );
-                    break;
-                case 403 :
-                    throw new Dropbox_Exception_Forbidden('Forbidden. This could mean a bad OAuth request, or a file or folder already existing at the target location.');
-                case 404 : 
-                    throw new Dropbox_Exception_NotFound('Resource at uri: ' . $uri . ' could not be found');
-                case 507 : 
-                    throw new Dropbox_Exception_OverQuota('This dropbox is full');
-                default:
-                    // rethrowing
-                    throw $e;
-            }
-
-        }
-
-    }
-
-    /**
-     * Requests the OAuth request token.
-     *
-     * @return void 
-     */
-    public function getRequestToken() {
-        
-        try {
-
-            $tokens = $this->OAuth->getRequestToken(self::URI_REQUEST_TOKEN);
-            $this->setToken($tokens['oauth_token'], $tokens['oauth_token_secret']);
-            return $this->getToken();
-
-        } catch (OAuthException $e) {
-
-            throw new Dropbox_Exception_RequestToken('We were unable to fetch request tokens. This likely means that your consumer key and/or secret are incorrect.',0,$e);
-
-        }
-
-    }
-
-
-    /**
-     * Requests the OAuth access tokens.
-     *
-     * This method requires the 'unauthorized' request tokens
-     * and, if successful will set the authorized request tokens.
-     * 
-     * @return void 
-     */
-    public function getAccessToken() {
-
-        $uri = self::URI_ACCESS_TOKEN;
-        $tokens = $this->OAuth->getAccessToken($uri);
-        $this->setToken($tokens['oauth_token'], $tokens['oauth_token_secret']);
-        return $this->getToken();
-
-    }
-
-
-}
diff --git a/core/src/plugins/access.dropbox/dropbox-php/OAuth/Wordpress.php b/core/src/plugins/access.dropbox/dropbox-php/OAuth/Wordpress.php
deleted file mode 100644
index 66ee595fd9..0000000000
--- a/core/src/plugins/access.dropbox/dropbox-php/OAuth/Wordpress.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-
-/**
- * Dropbox OAuth
- * 
- * @package Dropbox 
- * @copyright Copyright (C) 2010 Stefan Motz
- * @author Stefan Motz (http://www.multimediamotz.de/)
- * @license MIT
- */
-
-/**
- * This class is used to sign all requests to dropbox.
- *
- * This specific class uses WordPress WP_Http to authenticate.
- */
-class Dropbox_OAuth_Wordpress extends Dropbox_OAuth {
-
-    /**
-     *
-     * @var string ConsumerKey
-     */
-    protected $consumerKey = null;
-    /**
-     *
-     * @var string ConsumerSecret
-     */
-    protected $consumerSecret = null;
-
-    /**
-     * Constructor
-     * 
-     * @param string $consumerKey 
-     * @param string $consumerSecret 
-     */
-    public function __construct($consumerKey, $consumerSecret) {
-        if (!(defined('ABSPATH') && defined('WPINC')))
-            throw new Dropbox_Exception('The Wordpress OAuth class is available within a wordpress context only!');
-        if (!class_exists('WP_Http')) {
-            include_once( ABSPATH . WPINC . '/class-http.php' );
-        }
-
-        $this->consumerKey = $consumerKey;
-        $this->consumerSecret = $consumerSecret;
-    }
-
-    /**
-     * Fetches a secured oauth url and returns the response body. 
-     * 
-     * @param string $uri 
-     * @param mixed $arguments 
-     * @param string $method 
-     * @param array $httpHeaders 
-     * @return string 
-     */
-    public function fetch($uri, $arguments = array(), $method = 'GET', $httpHeaders = array()) {
-
-        $requestParams = array();
-
-        $requestParams['method'] = $method;
-        $oAuthHeader = $this->getOAuthHeader($uri, $arguments, $method);
-        $requestParams['headers'] = array_merge($httpHeaders, $oAuthHeader);
-
-        // arguments will be passed to uri for GET, to body for POST etc.
-        if ($method == 'GET') {
-            $uri .= '?' . http_build_query($arguments);
-        } else {
-            if (count($arguments)) {
-                $requestParams['body'] = $arguments;
-            }
-        }
-
-        $request = new WP_Http;
-
-        //$uri = str_replace('api.dropbox.com', 'localhost:12346', $uri);
-
-        $result = $request->request($uri, $requestParams);
-
-        return array(
-            'httpStatus' => $result['response']['code'],
-            'body' => $result['body'],
-        );
-    }
-
-    /**
-     * Returns named array with oauth parameters for further use
-     * @return array Array with oauth_ parameters
-     */
-    private function getOAuthBaseParams() {
-        $params['oauth_version'] = '1.0';
-        $params['oauth_signature_method'] = 'HMAC-SHA1';
-
-        $params['oauth_consumer_key'] = $this->consumerKey;
-        $tokens = $this->getToken();
-        if (isset($tokens['token']) && $tokens['token']) {
-            $params['oauth_token'] = $tokens['token'];
-        }
-        $params['oauth_timestamp'] = time();
-        $params['oauth_nonce'] = md5(microtime() . mt_rand());
-        return $params;
-    }
-
-    /**
-     * Creates valid Authorization header for OAuth, based on URI and Params
-     *
-     * @param string $uri
-     * @param array $params
-     * @param string $method GET or POST, standard is GET
-     * @param array $oAuthParams optional, pass your own oauth_params here
-     * @return array Array for request's headers section like
-     * array('Authorization' => 'OAuth ...');
-     */
-    private function getOAuthHeader($uri, $params, $method = 'GET', $oAuthParams = null) {
-        $oAuthParams = $oAuthParams ? $oAuthParams : $this->getOAuthBaseParams();
-
-        // create baseString to encode for the sent parameters
-        $baseString = $method . '&';
-        $baseString .= $this->oauth_urlencode($uri) . "&";
-
-        // OAuth header does not include GET-Parameters
-        $signatureParams = array_merge($params, $oAuthParams);
-
-        // sorting the parameters
-        ksort($signatureParams);
-
-        $encodedParams = array();
-        foreach ($signatureParams as $key => $value) {
-            $encodedParams[] = $this->oauth_urlencode($key) . '=' . $this->oauth_urlencode($value);
-        }
-
-        $baseString .= $this->oauth_urlencode(implode('&', $encodedParams));
-
-        // encode the signature
-        $tokens = $this->getToken();
-        $hash = $this->hash_hmac_sha1($this->consumerSecret.'&'.$tokens['token_secret'], $baseString);
-        $signature = base64_encode($hash);
-
-        // add signature to oAuthParams
-        $oAuthParams['oauth_signature'] = $signature;
-
-        $oAuthEncoded = array();
-        foreach ($oAuthParams as $key => $value) {
-            $oAuthEncoded[] = $key . '="' . $this->oauth_urlencode($value) . '"';
-        }
-
-        return array('Authorization' => 'OAuth ' . implode(', ', $oAuthEncoded));
-    }
-
-    /**
-     * Requests the OAuth request token.
-     *
-     * @return void 
-     */
-    public function getRequestToken() {
-        $result = $this->fetch(self::URI_REQUEST_TOKEN, array(), 'POST');
-        if ($result['httpStatus'] == "200") {
-            $tokens = array();
-            parse_str($result['body'], $tokens);
-            $this->setToken($tokens['oauth_token'], $tokens['oauth_token_secret']);
-            return $this->getToken();
-        } else {
-            throw new Dropbox_Exception_RequestToken('We were unable to fetch request tokens. This likely means that your consumer key and/or secret are incorrect.');
-        }
-    }
-
-    /**
-     * Requests the OAuth access tokens.
-     *
-     * This method requires the 'unauthorized' request tokens
-     * and, if successful will set the authorized request tokens.
-     * 
-     * @return void 
-     */
-    public function getAccessToken() {
-        $result = $this->fetch(self::URI_ACCESS_TOKEN, array(), 'POST');
-        if ($result['httpStatus'] == "200") {
-            $tokens = array();
-            parse_str($result['body'], $tokens);
-            $this->setToken($tokens['oauth_token'], $tokens['oauth_token_secret']);
-            return $this->getToken();
-        } else {
-            throw new Dropbox_Exception_RequestToken('We were unable to fetch request tokens. This likely means that your consumer key and/or secret are incorrect.');
-        }
-    }
-
-    /**
-     * Helper function to properly urlencode parameters.
-     * See http://php.net/manual/en/function.oauth-urlencode.php
-     *
-     * @param string $string
-     * @return string
-     */
-    private function oauth_urlencode($string) {
-        return str_replace('%E7', '~', rawurlencode($string));
-    }
-
-    /**
-     * Hash function for hmac_sha1; uses native function if available.
-     *
-     * @param string $key
-     * @param string $data
-     * @return string
-     */
-    private function hash_hmac_sha1($key, $data) {
-        if (function_exists('hash_hmac') && in_array('sha1', hash_algos())) {
-            return hash_hmac('sha1', $data, $key, true);
-        } else {
-            $blocksize = 64;
-            $hashfunc = 'sha1';
-            if (strlen($key) > $blocksize) {
-                $key = pack('H*', $hashfunc($key));
-            }
-
-            $key = str_pad($key, $blocksize, chr(0x00));
-            $ipad = str_repeat(chr(0x36), $blocksize);
-            $opad = str_repeat(chr(0x5c), $blocksize);
-            $hash = pack('H*', $hashfunc(( $key ^ $opad ) . pack('H*', $hashfunc(($key ^ $ipad) . $data))));
-
-            return $hash;
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/core/src/plugins/access.dropbox/dropbox-php/OAuth/Zend.php b/core/src/plugins/access.dropbox/dropbox-php/OAuth/Zend.php
deleted file mode 100644
index 9cdf229f48..0000000000
--- a/core/src/plugins/access.dropbox/dropbox-php/OAuth/Zend.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-
-/**
- * Dropbox OAuth
- *
- * @package Dropbox
- * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
- * @author Michael Johansen <michael@taskcamp.com>
- * @license http://code.google.com/p/dropbox-php/wiki/License MIT
- */
-
-/**
- * This class is used to sign all requests to dropbox
- *
- * This classes use the Zend_Oauth package.
- */
-class Dropbox_OAuth_Zend extends Dropbox_OAuth {
-
-    /**
-     * OAuth object
-     *
-     * @var Zend_Oauth_Consumer
-     */
-    protected $oAuth;
-    /**
-     * OAuth consumer key
-     *
-     * We need to keep this around for later.
-     *
-     * @var string
-     */
-    protected $consumerKey;
-    /**
-     *
-     * @var Zend_Oauth_Token
-     */
-    protected $zend_oauth_token;
-
-    /**
-     * Constructor
-     *
-     * @param string $consumerKey
-     * @param string $consumerSecret
-     */
-    public function __construct($consumerKey, $consumerSecret) {
-        if (!class_exists('Zend_Oauth_Consumer')) {
-            // We're going to try to load in manually
-            include 'Zend/Oauth/Consumer.php';
-        }
-        if (!class_exists('Zend_Oauth_Consumer'))
-            throw new Dropbox_Exception('The Zend_Oauth_Consumer class could not be found!');
-        $this->OAuth = new Zend_Oauth_Consumer(array(
-                    "consumerKey" => $consumerKey,
-                    "consumerSecret" => $consumerSecret,
-                    "requestTokenUrl" => self::URI_REQUEST_TOKEN,
-                    "accessTokenUrl" => self::URI_ACCESS_TOKEN,
-                    "authorizeUrl" => self::URI_AUTHORIZE,
-                    "signatureMethod" => "HMAC-SHA1",
-                ));
-        $this->consumerKey = $consumerKey;
-    }
-
-    /**
-     * Sets the request token and secret.
-     *
-     * The tokens can also be passed as an array into the first argument.
-     * The array must have the elements token and token_secret.
-     *
-     * @param string|array $token
-     * @param string $token_secret
-     * @return void
-     */
-    public function setToken($token, $token_secret = null) {
-        if (is_a($token, "Zend_Oauth_Token")) {
-            if (is_a($token, "Zend_Oauth_Token_Access")) {
-                $this->OAuth->setToken($token);
-            }
-            $this->zend_oauth_token = $token;
-            return parent::setToken($token->getToken(), $token->getTokenSecret());
-        } elseif (is_string($token) && is_null($token_secret)) {
-            return $this->setToken(unserialize($token));
-        } elseif (isset($token['zend_oauth_token'])) {
-            return $this->setToken(unserialize($token['zend_oauth_token']));
-        } else {
-            parent::setToken($token, $token_secret);
-            return;
-        }
-    }
-
-    /**
-     * Fetches a secured oauth url and returns the response body.
-     *
-     * @param string $uri
-     * @param mixed $arguments
-     * @param string $method
-     * @param array $httpHeaders
-     * @return string
-     */
-    public function fetch($uri, $arguments = array(), $method = 'GET', $httpHeaders = array()) {
-        $token = $this->OAuth->getToken();
-        if (!is_a($token, "Zend_Oauth_Token")) {
-            if (is_a($this->zend_oauth_token, "Zend_Oauth_Token_Access")) {
-                $token = $this->zend_oauth_token;
-            } else {
-                $token = new Zend_Oauth_Token_Access();
-                $token->setToken($this->oauth_token);
-                $token->setTokenSecret($this->oauth_token_secret);
-            }
-        }
-        /* @var $token Zend_Oauth_Token_Access */
-        $oauthOptions = array(
-            'consumerKey' => $this->consumerKey,
-            'signatureMethod' => "HMAC-SHA1",
-            'consumerSecret' => $this->OAuth->getConsumerSecret(),
-        );
-        $config = array("timeout" => 15);
-
-        /* @var $consumerRequest Zend_Oauth_Client */
-        $consumerRequest = $token->getHttpClient($oauthOptions);
-        $consumerRequest->setMethod($method);
-        if (is_array($arguments)) {
-            $consumerRequest->setUri($uri);
-            if ($method == "GET") {
-                foreach ($arguments as $param => $value) {
-                    $consumerRequest->setParameterGet($param, $value);
-                }
-            } else {
-                foreach ($arguments as $param => $value) {
-                    $consumerRequest->setParameterPost($param, $value);
-                }
-            }
-        } elseif (is_string($arguments)) {
-            preg_match("/\?file=(.*)$/i", $uri, $matches);
-            if (isset($matches[1])) {
-                $uri = str_replace($matches[0], "", $uri);
-                $filename = $matches[1];
-                $uri = Zend_Uri::factory($uri);
-                $uri->addReplaceQueryParameters(array("file" => $filename));
-                $consumerRequest->setParameterGet("file", $filename);
-            }
-            $consumerRequest->setUri($uri);
-            $consumerRequest->setRawData($arguments);
-        } elseif (is_resource($arguments)) {
-            $consumerRequest->setUri($uri);
-            /** Placeholder for Oauth streaming support. */
-        }
-        if (count($httpHeaders)) {
-            foreach ($httpHeaders as $k => $v) {
-                $consumerRequest->setHeaders($k, $v);
-            }
-        }
-        $response = $consumerRequest->request();
-        $body = Zend_Json::decode($response->getBody());
-        switch ($response->getStatus()) {
-            // Not modified
-            case 304 :
-                return array(
-                    'httpStatus' => 304,
-                    'body' => null,
-                );
-                break;
-            case 403 :
-                throw new Dropbox_Exception_Forbidden('Forbidden.
-                    This could mean a bad OAuth request, or a file or folder already existing at the target location.
-                    ' . $body["error"] . "\n");
-            case 404 :
-                throw new Dropbox_Exception_NotFound('Resource at uri: ' . $uri . ' could not be found. ' .
-                        $body["error"] . "\n");
-            case 507 :
-                throw new Dropbox_Exception_OverQuota('This dropbox is full. ' .
-                        $body["error"] . "\n");
-        }
-
-        return array(
-            'httpStatus' => $response->getStatus(),
-            'body' => $response->getBody(),
-        );
-    }
-
-    /**
-     * Requests the OAuth request token.
-     *
-     * @return void
-     */
-    public function getRequestToken() {
-        $token = $this->OAuth->getRequestToken();
-        $this->setToken($token);
-        return $this->getToken();
-    }
-
-    /**
-     * Requests the OAuth access tokens.
-     *
-     * This method requires the 'unauthorized' request tokens
-     * and, if successful will set the authorized request tokens.
-     *
-     * @return void
-     */
-    public function getAccessToken() {
-        if (is_a($this->zend_oauth_token, "Zend_Oauth_Token_Request")) {
-            $requestToken = $this->zend_oauth_token;
-        } else {
-            $requestToken = new Zend_Oauth_Token_Request();
-            $requestToken->setToken($this->oauth_token);
-            $requestToken->setTokenSecret($this->oauth_token_secret);
-        }
-        $token = $this->OAuth->getAccessToken($_GET, $requestToken);
-        $this->setToken($token);
-        return $this->getToken();
-    }
-
-    /**
-     * Returns the oauth request tokens as an associative array.
-     *
-     * The array will contain the elements 'token' and 'token_secret' and the serialized
-     * Zend_Oauth_Token object.
-     *
-     * @return array
-     */
-    public function getToken() {
-        //$token = $this->OAuth->getToken();
-        //return serialize($token);
-        return array(
-            'token' => $this->oauth_token,
-            'token_secret' => $this->oauth_token_secret,
-            'zend_oauth_token' => serialize($this->zend_oauth_token),
-        );
-    }
-
-    /**
-     * Returns the authorization url
-     *
-     * Overloading Dropbox_OAuth to use the built in functions in Zend_Oauth
-     *
-     * @param string $callBack Specify a callback url to automatically redirect the user back
-     * @return string
-     */
-    public function getAuthorizeUrl($callBack = null) {
-        if ($callBack)
-            $this->OAuth->setCallbackUrl($callBack);
-        return $this->OAuth->getRedirectUrl();
-    }
-
-}
diff --git a/core/src/plugins/access.dropbox/dropbox-php/autoload.php b/core/src/plugins/access.dropbox/dropbox-php/autoload.php
deleted file mode 100644
index 5388ea6334..0000000000
--- a/core/src/plugins/access.dropbox/dropbox-php/autoload.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * This file registers a new autoload function using spl_autoload_register. 
- *
- * @package Dropbox 
- * @copyright Copyright (C) 2010 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/) 
- * @license http://code.google.com/p/dropbox-php/wiki/License MIT
- */
-
-/**
- * Autoloader function
- *
- * @param $className string
- * @return void
- */
-function Dropbox_autoload($className) {
-
-    if(strpos($className,'Dropbox_')===0) {
-
-        include dirname(__FILE__) . '/' . str_replace('_','/',substr($className,8)) . '.php';
-
-    }
-
-}
-
-spl_autoload_register('Dropbox_autoload');
-
diff --git a/core/src/plugins/access.dropbox/i18n/conf/cs.php b/core/src/plugins/access.dropbox/i18n/conf/cs.php
index d6d6f71b04..f6a9b38fc1 100644
--- a/core/src/plugins/access.dropbox/i18n/conf/cs.php
+++ b/core/src/plugins/access.dropbox/i18n/conf/cs.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Dropbox" => "Dropbox",
diff --git a/core/src/plugins/access.dropbox/i18n/conf/de.php b/core/src/plugins/access.dropbox/i18n/conf/de.php
index 921afe97fa..5766d1bcc7 100644
--- a/core/src/plugins/access.dropbox/i18n/conf/de.php
+++ b/core/src/plugins/access.dropbox/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Dropbox" => "Dropbox",
diff --git a/core/src/plugins/access.dropbox/i18n/conf/en.php b/core/src/plugins/access.dropbox/i18n/conf/en.php
index 7d7904ac20..db20e6c363 100644
--- a/core/src/plugins/access.dropbox/i18n/conf/en.php
+++ b/core/src/plugins/access.dropbox/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Dropbox" => "Dropbox",
diff --git a/core/src/plugins/access.dropbox/i18n/conf/fr.php b/core/src/plugins/access.dropbox/i18n/conf/fr.php
index 52c0da1c95..3b80b3c2c6 100644
--- a/core/src/plugins/access.dropbox/i18n/conf/fr.php
+++ b/core/src/plugins/access.dropbox/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Dropbox" => "Dropbox",
diff --git a/core/src/plugins/access.dropbox/i18n/conf/it.php b/core/src/plugins/access.dropbox/i18n/conf/it.php
index be340b1bf9..0ccd749483 100644
--- a/core/src/plugins/access.dropbox/i18n/conf/it.php
+++ b/core/src/plugins/access.dropbox/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Dropbox" => "Dropbox",
diff --git a/core/src/plugins/access.dropbox/i18n/conf/pt.php b/core/src/plugins/access.dropbox/i18n/conf/pt.php
index c2abe9750e..302781c5ee 100644
--- a/core/src/plugins/access.dropbox/i18n/conf/pt.php
+++ b/core/src/plugins/access.dropbox/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Dropbox" => "Dropbox",
diff --git a/core/src/plugins/access.dropbox/manifest.xml b/core/src/plugins/access.dropbox/manifest.xml
index 9c2e537a82..371761ee05 100644
--- a/core/src/plugins/access.dropbox/manifest.xml
+++ b/core/src/plugins/access.dropbox/manifest.xml
@@ -1,16 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ajxpdriver enabled="false" name="dropbox" label="CONF_MESSAGE[Dropbox]" description="CONF_MESSAGE[This plugin allows accessing a dropbox account. Still experimental, requires PEAR/HTTP_OAuth extension.]" mixins="filesystem_commons,slug_provider,template_provider"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
+<ajxpdriver enabled="false" name="dropbox" label="CONF_MESSAGE[Dropbox]" description="CONF_MESSAGE[This plugin allows accessing a dropbox account.]" mixins="oauth_commons,filesystem_commons,slug_provider,template_provider"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
 	<client_settings icon="plugins/access.dropbox/dropboxLogo.png" description_template="" iconClass="icon-dropbox">
         <resources>
             <i18n namespace="access_dropbox" path="plugins/access.dropbox/i18n"/>
         </resources>
     </client_settings>
 	<server_settings>
+		<param name="API_URL" type="string" label="CONF_MESSAGE[API URL]" description="CONF_MESSAGE[API URL]" mandatory="true" default="https://api.dropbox.com/2/"/>
 		<param name="CONSUMER_KEY" type="string" label="CONF_MESSAGE[Consumer Key]" description="CONF_MESSAGE[Key]" mandatory="true"/>
 		<param name="CONSUMER_SECRET" type="string" label="CONF_MESSAGE[Consumer Secret]" description="CONF_MESSAGE[Secret]" mandatory="true"/>
+		<param name="API_RESOURCES_FILE" type="string" label="CONF_MESSAGE[API File]" description="CONF_MESSAGE[File name of the api files]" default="" />
 	</server_settings>
-	<class_definition filename="plugins/access.dropbox/class.dropboxAccessDriver.php" classname="dropboxAccessDriver"/>
+	<class_definition filename="plugins/access.dropbox/vendor/autoload.php" classname="Pydio\Access\DropBox\Driver"/>
 	<registry_contributions>
+		<actions>
+			<action name="dropbox_oauth_authorize" skipSecureToken="true">
+				<processing>
+					<serverCallback methodName="switchAction"></serverCallback>
+				</processing>
+			</action>
+		</actions>
 		<external_file filename="plugins/access.fs/fsActions.xml" include="actions/*"/>
         <external_file filename="plugins/access.fs/fsTemplatePart.xml" include="client_configs/*" exclude=""/>
 		<external_file filename="plugins/access.fs/fsActions.xml" include="client_configs/*"/>
@@ -19,7 +28,6 @@
 	</registry_contributions>
 	<dependencies>
 		<pluginClass pluginName="access.fs"/>
-		<pluginClass pluginName="access.remote_fs"/>
 	</dependencies>
-    <class_stream_wrapper filename="plugins/access.dropbox/class.dropboxWrapper.php" classname="dropboxWrapper" protocol="ajxp.dropbox"/>
+    <class_stream_wrapper filename="plugins/core.access/vendor/autoload.php" classname="Pydio\Access\Core\Stream\StreamWrapper" protocol="access.dropbox"/>
 </ajxpdriver>
diff --git a/core/src/plugins/access.dropbox/src/Driver.php b/core/src/plugins/access.dropbox/src/Driver.php
new file mode 100644
index 0000000000..4dab5e2dc3
--- /dev/null
+++ b/core/src/plugins/access.dropbox/src/Driver.php
@@ -0,0 +1,126 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ *
+ */
+
+namespace Pydio\Access\DropBox;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+require_once(__DIR__ . '/../vendor/autoload.php');
+
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Stream\OAuthStream;
+use Pydio\Access\Core\Stream\Stream;
+use Pydio\Access\Driver\StreamProvider\FS\FsAccessDriver;
+use Pydio\Access\DropBox\Listener\DropBoxSubscriber;
+use Pydio\Core\Model\ContextInterface;
+
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface;
+
+/**
+ * AJXP_Plugin to access a DropBox enabled server
+ * @package AjaXplorer_Plugins
+ * @subpackage Access
+ */
+class Driver extends FsAccessDriver
+{
+    const PROTOCOL = "access.dropbox";
+    const RESOURCES_PATH = "Resources";
+    const RESOURCES_FILE = "dropbox.json";
+
+    public $driverType = "dropbox";
+    
+    /**
+     * Repository Initialization
+     * @param ContextInterface $context
+     * @return bool|void
+     * @internal param ContextInterface $contextInterface
+     */
+    protected function initRepository(ContextInterface $context)
+    {
+        $this->detectStreamWrapper(true);
+
+        $repository = $context->getRepository();
+        $resourcesFile = $repository->getContextOption($context, "API_RESOURCES_FILE", __DIR__ . "/" . self::RESOURCES_PATH . "/" . self::RESOURCES_FILE);
+
+        Stream::addContextOption($context, [
+            "resources"   => $resourcesFile,
+            "subscribers" => [
+                new DropBoxSubscriber()
+            ]
+        ]);
+
+        return true;
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @throws \Exception
+     * @throws \Pydio\Core\Exception\PydioException
+     */
+    public function switchAction(ServerRequestInterface &$request, ResponseInterface &$response) {
+        $httpVars = $request->getParsedBody();
+
+        if (isset($httpVars["code"])) {
+            $context = $request->getAttribute("ctx");
+
+            Stream::addContextOption($context, [
+                "oauth_code" => $httpVars["code"]
+            ]);
+
+            // Simulate the creation of a stream to ensure we store the oauth in the stream context
+            $stream = new OAuthStream(Stream::factory('php://memory'), $context);
+            $stream->close();
+        }
+
+        return parent::switchAction($request, $response);
+    }
+
+    /********************************************************
+     * Static functions used in the JSON service description
+     *******************************************************
+     * @param AJXP_Node $node
+     * @return string
+     */
+
+    public static function convertPath(AJXP_Node $node) {
+        $path = $node->getPath();
+
+        if (isset($path)) {
+            return $path;
+        }
+        return "";
+    }
+
+    /**
+     * @param $key
+     * @param $value
+     * @return string
+     */
+    public static function convertToJSON($key, $value) {
+        $key = '' . $key->getName();
+        $value = '' . $value;
+        $arr = [$key => $value];
+        return json_encode($arr);
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/access.dropbox/src/Listener/DropBoxSubscriber.php b/core/src/plugins/access.dropbox/src/Listener/DropBoxSubscriber.php
new file mode 100644
index 0000000000..0955db9e4b
--- /dev/null
+++ b/core/src/plugins/access.dropbox/src/Listener/DropBoxSubscriber.php
@@ -0,0 +1,141 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Access\DropBox\Listener;
+
+use GuzzleHttp\Event\BeforeEvent;
+use GuzzleHttp\Event\CompleteEvent;
+use GuzzleHttp\Event\ErrorEvent;
+use GuzzleHttp\Event\RequestEvents;
+use GuzzleHttp\Event\SubscriberInterface;
+use GuzzleHttp\Message\Response;
+use GuzzleHttp\Stream\Stream;
+
+/**
+ * Listener used to change the way the paths are given (no urlencode for the slash)
+ */
+class DropBoxSubscriber implements SubscriberInterface
+{
+
+    /**
+     * Get the list of events this subscriber is being triggered on
+     *
+     * @return array Events
+     */
+    public function getEvents()
+    {
+        return [
+            'before'   => ['onBefore'],
+            'complete' => ['onComplete'],
+            'error'    => ['onError', RequestEvents::EARLY],
+        ];
+    }
+
+    /**
+     * @param BeforeEvent $event
+     */
+    public function onBefore(BeforeEvent $event)
+    {
+        $request = $event->getRequest();
+        $host = $request->getHost();
+        $target = "content.dropboxapi.com";
+
+        $count = $event->getRetryCount();
+        $path = $request->getPath();
+        $found = strpos($path, "download");
+
+        if ( $host != $target && $found  && $count == 0) {
+            $request->setHost("content.dropboxapi.com");
+            $newResponse = $event->getClient()->send($request);
+            $event->intercept($newResponse);
+        }
+    }
+
+    /**
+     * @param CompleteEvent $event
+     */
+    public function onComplete(CompleteEvent $event, $name)
+    {
+        $response = $event->getResponse();
+
+        $contentType = $response->getHeader('Content-Type');
+
+        if (!isset($contentType) || $contentType != "application/json") {
+            return;
+        }
+
+        $json = $response->json();
+
+        if (isset($json["entries"])) {
+            $json = $json["entries"];
+
+            $message = json_encode($json);
+            $stream = Stream::factory(fopen("php://memory", 'w'));
+            $stream->write($message);
+
+            $event->intercept(new Response(200, $response->getHeaders(), $stream));
+        }
+    }
+
+    /**
+     * Handle the before trigger
+     *
+     * @param ErrorEvent $event
+     * @internal param ErrorEvent $e
+     */
+    public function onError(ErrorEvent $event)
+    {
+        $response = $event->getResponse();
+
+        if ($response && 400 == $response->getStatusCode()) {
+            $body = $response->getBody();
+
+            $reason = $body->getContents();
+
+            if (strpos($reason, "The root folder is unsupported.")) {
+                $msg = '{".tag": "folder", "size": 1}';
+
+                $stream = Stream::factory(fopen("php://memory", 'w'));
+                $stream->write($msg);
+
+                $response = new Response("200",[
+                    "Content-Length" => 10
+                ], $stream);
+
+                $event->intercept($response);
+            }
+        } elseif ($response && 409 == $response->getStatusCode()) {
+            $body = $response->getBody();
+
+            $result = json_decode($body->getContents());
+
+            $summary = $result->error_summary;
+
+            if (isset($summary) && strpos($summary, "path/not_found") == 0) {
+                $response = new Response("404",[
+                    "Content-Length" => 0
+                ], null);
+
+                $event->intercept($response);
+            }
+        }
+    }
+}
diff --git a/core/src/plugins/access.dropbox/src/Resources/dropbox.json b/core/src/plugins/access.dropbox/src/Resources/dropbox.json
new file mode 100644
index 0000000000..b2f80cbdff
--- /dev/null
+++ b/core/src/plugins/access.dropbox/src/Resources/dropbox.json
@@ -0,0 +1,192 @@
+{
+  "name" : "DropBox Client",
+  "description" : "DropBox REST API client",
+  "operations" : {
+    "Ls" : {
+      "httpMethod" : "POST",
+      "uri" : "files/list_folder",
+      "summary" : "Open the object as a stream for the StreamWrapper to access",
+      "responseClass" : "Directory",
+      "parameters" : {
+        "path" : {
+          "required" : true,
+          "type" : "object",
+          "location" : "json",
+          "sentAs": "path",
+          "filters": [{
+            "method": "\\Pydio\\Access\\DropBox\\Driver::convertPath",
+            "args": [ "@value" ]
+          }]
+        }
+      }
+    },
+    "Get" : {
+      "httpMethod" : "POST",
+      "uri" : "files/download",
+      "summary" : "Open the object as a stream for the StreamWrapper to access",
+      "responseClass" : "File",
+      "parameters" : {
+        "path" : {
+          "required" : true,
+          "type" : "object",
+          "location" : "header",
+          "sentAs": "Dropbox-API-Arg",
+          "filters": [{
+            "method": "\\Pydio\\Access\\DropBox\\Driver::convertToJSON",
+            "args": [ "@api", "@value" ]
+          }]
+        }
+      }
+    },
+    "Stat" : {
+      "httpMethod" : "POST",
+      "uri" : "files/get_metadata",
+      "summary" : "Returns the stat of a specific object",
+      "responseClass" : "Stat",
+      "exceptions" : false,
+      "parameters" : {
+        "path" : {
+          "required" : true,
+          "type" : "object",
+          "location" : "json",
+          "sentAs": "path",
+          "filters": [{
+            "method": "\\Pydio\\Access\\DropBox\\Driver::convertPath",
+            "args": [ "@value" ]
+          }]
+        }
+      }
+    },
+    "Mkdir" : {
+      "httpMethod" : "POST",
+      "uri" : "files/create_folder",
+      "parameters" : {
+        "path" : {
+          "required" : true,
+          "type" : "object",
+          "location" : "json",
+          "sentAs": "path",
+          "filters": [{
+            "method": "\\Pydio\\Access\\DropBox\\Driver::convertPath",
+            "args": [ "@value" ]
+          }]
+        }
+      }
+    },
+    "Rmdir" : {
+      "httpMethod" : "POST",
+      "uri" : "files/delete",
+      "parameters" : {
+        "path" : {
+          "required" : true,
+          "type" : "object",
+          "location" : "json",
+          "sentAs": "path",
+          "filters": [{
+            "method": "\\Pydio\\Access\\DropBox\\Driver::convertPath",
+            "args": [ "@value" ]
+          }]
+        }
+      }
+    },
+    "Rename" : {
+      "httpMethod" : "POST",
+      "uri" : "files/move",
+      "parameters" : {
+        "frompath/fullpath" : {
+          "required" : true,
+          "type" : "string",
+          "location" : "json",
+          "sentAs": "from_path"
+        },
+        "topath/fullpath" : {
+          "required" : true,
+          "type" : "string",
+          "location" : "json",
+          "sentAs": "to_path"
+        }
+      }
+    },
+    "Put" : {
+      "httpMethod" : "POST",
+      "uri": "files/upload",
+      "parameters" : {
+        "path/fullpath": {
+          "required": true,
+          "type": "string",
+          "location": "query",
+          "sentAs": "path"
+        },
+        "body" : {
+          "location" : "body"
+        }
+      }
+    },
+    "Delete" : {
+      "httpMethod" : "POST",
+      "uri" : "files/delete",
+      "parameters" : {
+        "path/fullpath" : {
+          "required" : true,
+          "type" : "string",
+          "location" : "json",
+          "sentAs": "path"
+        }
+      }
+    }
+  },
+  "models" : {
+    "Directory" : {
+      "type" : "array",
+      "location" : "json",
+      "items": {
+        "type" : "object",
+        "location" : "json",
+        "properties" : {
+          "type": {
+            "type": "string",
+            "sentAs": ".tag"
+          },
+          "name": {
+            "type": "string"
+          },
+          "lastModified": {
+            "type": "string",
+            "sentAs": "client_modified"
+          },
+          "size": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "File" : {
+      "type": "object",
+      "properties" : {
+        "body" : {
+          "location" : "body"
+        }
+      }
+    },
+    "Stat" : {
+      "type" : "object",
+      "location" : "json",
+      "properties" : {
+        "type": {
+          "type": "string",
+          "sentAs": ".tag"
+        },
+        "name": {
+          "type": "string"
+        },
+        "lastModified": {
+          "type": "string",
+          "sentAs": "client_modified"
+        },
+        "size": {
+          "type": "string"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/core/src/plugins/access.fs/FsAccessDriver.php b/core/src/plugins/access.fs/FsAccessDriver.php
new file mode 100644
index 0000000000..130c1f0311
--- /dev/null
+++ b/core/src/plugins/access.fs/FsAccessDriver.php
@@ -0,0 +1,2520 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ *
+ */
+namespace Pydio\Access\Driver\StreamProvider\FS;
+
+use DOMNode;
+use DOMXPath;
+use Normalizer;
+use PclZip;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\UploadedFileInterface;
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Access\Core\Exception\FileNotWriteableException;
+use Pydio\Access\Core\MetaStreamWrapper;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\IAjxpWrapperProvider;
+use Pydio\Access\Core\Model\NodesDiff;
+use Pydio\Access\Core\Model\NodesList;
+use Pydio\Access\Core\RecycleBinManager;
+use Pydio\Access\Core\Model\Repository;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Auth\Core\MemorySafe;
+use Pydio\Core\Http\Message\ExternalUploadedFile;
+use Pydio\Core\Http\Response\FileReaderResponse;
+use Pydio\Core\Http\Response\SerializableResponseStream;
+use Pydio\Core\Http\Message\UserMessage;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\SessionService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\PathUtils;
+use Pydio\Core\Utils\Vars\StatHelper;
+use Pydio\Core\Utils\Http\UserAgent;
+use Pydio\Core\Controller\HTMLWriter;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Utils\TextEncoder;
+use Pydio\Tasks\Schedule;
+use Pydio\Tasks\Task;
+use Pydio\Tasks\TaskService;
+use Zend\Diactoros\Response;
+use Zend\Diactoros\Response\JsonResponse;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+
+// This is used to catch exception while downloading
+if (!function_exists('download_exception_handler')) {
+    /**
+     * @param $exception
+     */
+    function download_exception_handler($exception){}
+}
+/**
+ * Plugin to access a filesystem. Most "FS" like driver (even remote ones)
+ * extend this one.
+ * @package AjaXplorer_Plugins
+ * @subpackage Access
+ */
+class FsAccessDriver extends AbstractAccessDriver implements IAjxpWrapperProvider
+{
+    /**
+    * @var Repository
+    */
+    public $repository;
+    public $driverConf;
+    protected $wrapperClassName;
+    protected $urlBase;
+
+    /**
+     * @param ContextInterface $contextInterface
+     * @throws PydioException
+     * @throws \Exception
+     */
+    protected function initRepository(ContextInterface $contextInterface)
+    {
+        if (is_array($this->pluginConf)) {
+            $this->driverConf = $this->pluginConf;
+        } else {
+            $this->driverConf = [];
+        }
+        if ( $this->getContextualOption($contextInterface, "PROBE_REAL_SIZE") == true ) {
+            // PASS IT TO THE WRAPPER
+            ConfService::setConf("PROBE_REAL_SIZE", true);
+        }
+        $repository = $contextInterface->getRepository();
+        $create = $repository->getContextOption($contextInterface, "CREATE");
+        $path = $repository->getContextOption($contextInterface, "PATH");
+        $storagePath = TextEncoder::toStorageEncoding($path);
+        $recycle = $repository->getContextOption($contextInterface, "RECYCLE_BIN");
+        $chmod = $repository->getContextOption($contextInterface, "CHMOD_VALUE");
+        $this->urlBase = $contextInterface->getUrlBase();
+
+        MetaStreamWrapper::appendMetaWrapper("pydio.encoding", "Pydio\\Access\\Core\\EncodingWrapper", 100);
+
+        if ($create == true) {
+            if(!is_dir($storagePath)) @mkdir($storagePath, 0755, true);
+            if (!is_dir($storagePath)) {
+                throw new PydioException("Cannot create root path for repository (".$repository->getDisplay()."). Please check repository configuration or that your folder is writeable!");
+            }
+            if ($recycle!= "" && !is_dir($storagePath."/".$recycle)) {
+                @mkdir($storagePath."/".$recycle);
+                if (!is_dir($storagePath."/".$recycle)) {
+                    throw new PydioException("Cannot create recycle bin folder. Please check repository configuration or that your folder is writeable!");
+                } else {
+                    $this->setHiddenAttribute(new AJXP_Node($contextInterface->getUrlBase() ."/".$recycle));
+                }
+            }
+            $dataTemplate = TextEncoder::toStorageEncoding($repository->getContextOption($contextInterface, "DATA_TEMPLATE"));
+            if (!empty($dataTemplate) && is_dir($dataTemplate) && !is_file($storagePath."/.ajxp_template")) {
+                $errs = [];$succ = [];
+                $repoData = ['base_url' => $contextInterface->getUrlBase(), 'chmod' => $chmod, 'recycle' => $recycle];
+                $this->dircopy($dataTemplate, $storagePath, $succ, $errs, false, false, $repoData, $repoData);
+                touch($storagePath."/.ajxp_template");
+            }
+        } else {
+            if (!is_dir($storagePath)) {
+                throw new PydioException("Cannot find base path for your repository! Please check the configuration!");
+            }
+        }
+        if ($recycle != "") {
+            RecycleBinManager::init($contextInterface->getUrlBase(), "/".$recycle);
+        }
+    }
+
+    /**
+     * @param String $path
+     * @return string
+     */
+    public function getResourceUrl($path)
+    {
+        return $this->urlBase.$path;
+    }
+
+    /**
+     * @param AJXP_Node $node
+     * @return int
+     */
+    public function directoryUsage(AJXP_Node $node){
+
+        if(MetaStreamWrapper::wrapperIsRemote($node->getUrl())){
+            return $this->recursiveDirUsageByListing($node->getUrl());
+        }
+        $dir = $node->getRealFile();
+        $size = -1;
+        if ( ( PHP_OS == "WIN32" || PHP_OS == "WINNT" || PHP_OS == "Windows") && class_exists("COM") ) {
+            $obj = new \COM ( 'scripting.filesystemobject' );
+            if ( is_object ( $obj ) ) {
+                $ref = $obj->getfolder ( $dir );
+                $size = floatval($ref->size);
+                $obj = null;
+            }
+        } else {
+            if((PHP_OS == "Darwin") || (PHP_OS == "FreeBSD")) $option = "-sk";
+            else $option = "-sb";
+            $cmd = '/usr/bin/du '.$option.' ' . escapeshellarg($dir);
+            $io = popen ( $cmd , 'r' );
+            $size = fgets ( $io, 4096);
+            $size = trim(str_replace($dir, "", $size));
+            $size =  floatval($size);
+            if((PHP_OS == "Darwin") || (PHP_OS == "FreeBSD")) $size = $size * 1024;
+            pclose ( $io );
+        }
+        if($size != -1){
+            return $size;
+        }else{
+            return $this->recursiveDirUsageByListing($node->getUrl());
+        }
+
+    }
+
+    /**
+     * @param $path
+     * @return int|string
+     */
+    protected function recursiveDirUsageByListing($path){
+        $total_size = 0;
+        $files = scandir($path);
+
+        foreach ($files as $t) {
+            if (is_dir(rtrim($path, '/') . '/' . $t)) {
+                if ($t <> "." && $t <> "..") {
+                    $size = $this->recursiveDirUsageByListing(rtrim($path, '/') . '/' . $t);
+                    $total_size += $size;
+                }
+            } else {
+                $size = sprintf("%u", filesize(rtrim($path, '/') . '/' . $t));
+                $total_size += $size;
+            }
+        }
+        return $total_size;
+    }
+
+    /**
+     * @param $contribNode
+     * @param $arrayActions
+     * @param $targetMethod
+     */
+    public function redirectActionsToMethod(&$contribNode, $arrayActions, $targetMethod)
+    {
+        $actionXpath=new DOMXPath($contribNode->ownerDocument);
+        foreach ($arrayActions as $index => $value) {
+            $arrayActions[$index] = 'action[@name="'.$value.'"]/processing/serverCallback';
+        }
+        $procList = $actionXpath->query(implode(" | ", $arrayActions), $contribNode);
+        foreach ($procList as $node) {
+            $node->setAttribute("methodName", $targetMethod);
+        }
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     */
+    protected function filterByApi(&$request){
+        if($request->getAttribute("api") !== "v2") return;
+        $params = $request->getParsedBody();
+        $action = $request->getAttribute("action");
+        switch($action){
+            case "ls":
+                $children = $params["children"] OR null;
+                $meta     = $params["meta"] OR "standard";
+                if(!empty($children)){
+                    $options = $children;
+                } else {
+                    $options = "dzf";
+                }
+                if($meta !== "minimal") $options .= "l";
+                $params["options"] = $options;
+                $request = $request->withParsedBody($params);
+                break;
+            case "download":
+
+                break;
+
+            default:
+                break;
+        }
+    }
+
+    /**
+     * @param DOMNode $contribNode
+     */
+    public function disableArchiveBrowsingContributions(&$contribNode)
+    {
+        // Cannot use zip features on FTP !
+        // Remove "compress" action
+        $actionXpath=new DOMXPath($contribNode->ownerDocument);
+        $compressNodeList = $actionXpath->query('action[@name="compress"]|action[@name="compress_ui"]|action[@name="download_all"]', $contribNode);
+        if(!$compressNodeList->length) return ;
+        foreach($compressNodeList as $compressNodeAction){
+            $contribNode->removeChild($compressNodeAction);
+        }
+        // Disable "download" if selection is multiple
+        $nodeList = $actionXpath->query('action[@name="download"]/gui/selectionContext', $contribNode);
+        $selectionNode = $nodeList->item(0);
+        $values = ["dir" => "false", "unique" => "true"];
+        foreach ($selectionNode->attributes as $attribute) {
+            if (isSet($values[$attribute->name])) {
+                $attribute->value = $values[$attribute->name];
+            }
+        }
+        $nodeList = $actionXpath->query('action[@name="download"]/processing/clientListener[@name="selectionChange"]', $contribNode);
+        $listener = $nodeList->item(0);
+        $listener->parentNode->removeChild($listener);
+        // Disable "Explore" action on files
+        $nodeList = $actionXpath->query('action[@name="ls"]/gui/selectionContext', $contribNode);
+        $selectionNode = $nodeList->item(0);
+        $values = ["file" => "false", "allowedMimes" => ""];
+        foreach ($selectionNode->attributes as $attribute) {
+            if (isSet($values[$attribute->name])) {
+                $attribute->value = $values[$attribute->name];
+            }
+        }
+    }
+
+    /**
+     * @param $selection
+     * @return array|string
+     */
+    public function addSlugToPath($selection)
+    {
+        if (is_array($selection))
+            // As passed by Copy/Move
+            $orig_files = $selection;
+        elseif ((is_object($selection)) && (isset($selection->files)) && (is_array($selection->files)))
+            // As passed by Download
+            $orig_files = $selection->files;
+        elseif (is_string($selection))
+            // As passed by destination parameter
+            return $this->repository->slug.$selection;
+        else
+            // Unrecognized
+            return $selection;
+
+        $files = [];
+        foreach ($orig_files as $file)
+            $files[] = $this->repository->slug.$file;
+        return $files;
+    }
+
+    /**
+     * API V2, will get POST / PUT actions, will reroute to mkdir, mkfile, copy, move actions
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @throws \Exception
+     */
+    public function createResourceAction(ServerRequestInterface &$request, ResponseInterface &$response){
+
+        /** @var ContextInterface $ctx */
+        $ctx = $request->getAttribute("ctx");
+        $selection = UserSelection::fromContext($ctx, $request->getParsedBody());
+        if($selection->isEmpty()){
+            throw new PydioException("Empty resource");
+        }
+        $path = $selection->getUniqueFile();
+        $params = $request->getParsedBody();
+        $newAction = null;
+        $newVars = [];
+        if(isSet($params["copy_source"])){
+            $newVars["dest"] = PathUtils::forwardSlashDirname($path);
+            $newVars["targetBaseName"] = PathUtils::forwardSlashBasename($path);
+
+            $sourceParts = explode("/", trim($params["copy_source"], "/"));
+            $sourceRepo  = array_shift($sourceParts);
+            $newVars["file"] = "/".implode("/", $sourceParts);
+            $currentRepo = $ctx->getRepositoryId()."";
+            if($currentRepo !== $sourceRepo){
+                // Cross repo, invert parameters and forward to parent method!
+                throw new PydioException("Cross Repository copy is not implemented on this api.");
+            }
+            if(isSet($params["delete_source"]) && $params["delete_source"] == "true"){
+                $newAction = "move";
+            }else{
+                $newAction = "copy";
+            }
+        }else{
+            $qPath = $params["path"];
+            if(substr_compare($qPath, "/", strlen($qPath)-1, 1) === 0){
+                // Ends with slash => mkdir
+                $newAction = "mkdir";
+                $newVars["file"] = $path;
+                if(!empty($params["override"])) {
+                    $newVars["ignore_exists"] = $params["override"];
+                }
+                if(!empty($params["recursive"])) {
+                    $newVars["recursive"] = $params["recursive"];
+                }
+            }else{
+                $newAction = "mkfile";
+                $newVars["node"] = $path;
+                if(!empty($params["content"])) {
+                    $newVars["content"] = $params["content"];
+                }
+                if(!empty($params["override"])) {
+                    $newVars["force"] = $params["override"];
+                }
+            }
+        }
+        $request = $request->withParsedBody($newVars)->withAttribute("action", $newAction);
+        $this->switchAction($request, $response);
+
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @throws \Exception
+     */
+    public function uploadAction(ServerRequestInterface &$request, ResponseInterface &$response){
+
+        $httpVars = $request->getParsedBody();
+        $dir = InputFilter::sanitize($httpVars["dir"], InputFilter::SANITIZE_DIRNAME) OR "";
+        /** @var ContextInterface $ctx */
+        $ctx = $request->getAttribute("ctx");
+        if (MetaStreamWrapper::actualRepositoryWrapperClass(new AJXP_Node($ctx->getUrlBase())) === "Pydio\\Access\\Driver\\StreamProvider\\FS\\FsAccessWrapper") {
+            $dir = PathUtils::patchPathForBaseDir($dir);
+        }
+        $dir = InputFilter::securePath($dir);
+        $selection = UserSelection::fromContext($ctx, $httpVars);
+        if (!$selection->isEmpty()) {
+            $this->filterUserSelectionToHidden($selection->getContext(), $selection->getFiles());
+            if(empty($dir) && $selection->isUnique()){
+                $dir = PathUtils::forwardSlashDirname($selection->getUniqueFile());
+            }
+        }
+        $mess = LocaleService::getMessages();
+
+        $repoData = [
+            'chmod'     => $ctx->getRepository()->getContextOption($ctx, 'CHMOD_VALUE'),
+            'recycle'   => $ctx->getRepository()->getContextOption($ctx, 'RECYCLE_BIN')
+        ];
+        $this->logDebug("Upload Files Data", $request->getUploadedFiles());
+
+        $destNode = $selection->nodeForPath(InputFilter::decodeSecureMagic($dir));
+        $destination = $destNode->getUrl();
+        $this->logDebug("Upload inside", ["destination"=>$this->addSlugToPath($destNode->getUrl())]);
+        if (!$this->isWriteable($destNode)) {
+            $errorCode = 412;
+            $errorMessage = "$mess[38] ".$dir." $mess[99].";
+            $this->logDebug("Upload error 412", ["destination"=>$this->addSlugToPath($destination)]);
+            $this->writeUploadError($request, $errorMessage, $errorCode);
+            return;
+        }
+
+        $partialUpload = false;
+        $partialTargetSize = -1;
+        $originalAppendTo = "";
+        $createdNode = null;
+
+        /** @var UploadedFileInterface[] $uploadedFiles */
+        $uploadedFiles = $request->getUploadedFiles();
+        if(!count($uploadedFiles)){
+            $this->writeUploadError($request, "Could not find any uploaded file", 411);
+            return;
+        }
+        $uploadedFile = array_shift($uploadedFiles);
+
+        try{
+            // CHECK PHP UPLOAD ERRORS
+            InputFilter::parseFileDataErrors($uploadedFile, true);
+
+            // FIND PROPER FILE NAME / FILTER IF NECESSARY
+            if (isSet($httpVars["urlencoded_filename"])) {
+                $userfile_name = InputFilter::sanitize(urldecode($httpVars["urlencoded_filename"]), InputFilter::SANITIZE_FILENAME, true);
+            }else{
+                $userfile_name= InputFilter::sanitize(InputFilter::fromPostedFileName($uploadedFile->getClientFileName()), InputFilter::SANITIZE_FILENAME, true);
+            }
+            $userfile_name = substr($userfile_name, 0, ConfService::getContextConf($ctx, "NODENAME_MAX_LENGTH"));
+            $this->logDebug("User filename ".$userfile_name);
+            if(class_exists("Normalizer")){
+                $userfile_name = Normalizer::normalize($userfile_name, Normalizer::FORM_C);
+            }
+            // Chec if it's forbidden
+            $this->filterUserSelectionToHidden($selection->getContext(), [$userfile_name]);
+
+            if($uploadedFile instanceof ExternalUploadedFile && $uploadedFile->getStatus() == ExternalUploadedFile::STATUS_UPLOAD_FINISHED){
+                // GO DIRECTLY TO POST_PROCESSING AND RETURN.
+                $createdNode = new AJXP_Node($destination."/".$userfile_name);
+                $this->uploadPostProcess($request, $createdNode, false, (isset($httpVars["exists"]) && $httpVars["exists"] === "true"), $repoData["chmod"]);
+                return;
+            }
+
+            // MODIFY TARGET IF AUTO RENAME
+            if (isSet($httpVars["auto_rename"])) {
+                $userfile_name = self::autoRenameForDest($destination, $userfile_name);
+            }
+
+            // APPLY PRE-UPLOAD HOOKS
+            $already_existed = false;
+            try {
+                $newFileSize = $uploadedFile->getSize();
+                $targetUrl = $destination."/".$userfile_name;
+                $targetNode = new AJXP_Node($targetUrl);
+                if (file_exists($targetUrl)) {
+                    $already_existed = true;
+                    Controller::applyHook("node.before_change", [$targetNode, $newFileSize]);
+                } else {
+                    Controller::applyHook("node.before_create", [$targetNode, $newFileSize]);
+                }
+                Controller::applyHook("node.before_change", [new AJXP_Node($destination)]);
+            } catch (\Exception $e) {
+                throw new \Exception($e->getMessage(), 507);
+            }
+
+            // PARTIAL UPLOAD CASE - PREPPEND .dlpart extension
+            if(isSet($httpVars["partial_upload"]) && $httpVars["partial_upload"] == 'true' && isSet($httpVars["partial_target_bytesize"])) {
+                $partialUpload = true;
+                $partialTargetSize = intval($httpVars["partial_target_bytesize"]);
+                if(!isSet($httpVars["appendto_urlencoded_part"])) {
+                    $userfile_name .= ".dlpart";
+                    $targetUrl = $destination."/".$userfile_name;
+                }
+            }
+
+            if($uploadedFile instanceof ExternalUploadedFile && $uploadedFile->getStatus() == ExternalUploadedFile::STATUS_REQUEST_OPTIONS){
+                // Now build options and send that as a reponse
+                // Add Callback data : exists=true
+                $createdNode = new AJXP_Node($targetUrl);
+                $options = MetaStreamWrapper::getResolvedOptionsForNode($createdNode);
+                $response = new JsonResponse([
+                    "CONTEXT"               => $createdNode->getContext()->getStringIdentifier(),
+                    "OPTIONS"               => $options,
+                    "PATH"                  => $createdNode->getPath(),
+                    "CALLBACK_PARAMETERS"   => ["exists" => $already_existed]
+                ]);
+                return;
+            }
+
+            // NOW DO THE ACTUAL COPY
+            $this->copyUploadedData($uploadedFile, $targetUrl, $mess);
+
+            // PARTIAL UPLOAD - PART II: APPEND DATA TO EXISTING PART
+            if (isSet($httpVars["appendto_urlencoded_part"])) {
+                $appendTo = InputFilter::sanitize(urldecode($httpVars["appendto_urlencoded_part"]), InputFilter::SANITIZE_FILENAME);
+                if(isSet($httpVars["partial_upload"]) && $httpVars["partial_upload"] == 'true'){
+                    $originalAppendTo = $appendTo;
+                    $appendTo .= ".dlpart";
+                }
+                $this->logDebug("AppendTo FILE".$appendTo);
+                $already_existed = $this->appendUploadedData($destination, $userfile_name, $appendTo);
+                $userfile_name = $appendTo;
+                $targetAppended = new AJXP_Node($destination."/".$userfile_name);
+                clearstatcache(true, $targetAppended->getUrl());
+                $targetAppended->loadNodeInfo(true);
+                if($partialUpload && $partialTargetSize == filesize($destination."/".$userfile_name)){
+                    // This was the last part. We can now rename to the original name.
+                    if(is_file($destination."/".$originalAppendTo)){
+                        unlink($destination."/".$originalAppendTo);
+                    }
+                    $result = @rename($destination."/".$userfile_name, $destination."/".$originalAppendTo);
+                    if($result === false){
+                        throw new \Exception("Error renaming ".$destination."/".$userfile_name." to ".$destination."/".$originalAppendTo);
+                    }
+                    $userfile_name = $originalAppendTo;
+                    $partialUpload = false;
+                    // Send a create event!
+                    $already_existed = false;
+                    $lastPartAppended = true;
+                }
+            }
+
+            $createdNode = new AJXP_Node($destination."/".$userfile_name);
+            $this->uploadPostProcess($request, $createdNode, $partialUpload, $already_existed, $repoData["chmod"]);
+
+        }catch(\Exception $e){
+            $errorCode = $e->getCode();
+            if(empty($errorCode)) $errorCode = 411;
+            $this->writeUploadError($request, $e->getMessage(), $errorCode);
+        }
+
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param AJXP_Node $createdNode
+     * @param $partialUpload
+     * @param $nodeOverriden
+     * @param string $chmodValue
+     */
+    protected function uploadPostProcess(&$request, $createdNode, $partialUpload = false, $nodeOverriden = false, $chmodValue = ""){
+
+        // NOW PREPARE POST-UPLOAD EVENTS
+        $this->changeMode($createdNode->getUrl(),["chmod" => $chmodValue]);
+        clearstatcache(true, $createdNode->getUrl());
+        $createdNode->loadNodeInfo(true);
+        $logFile = $this->addSlugToPath($createdNode->getParent()->getPath())."/".$createdNode->getLabel();
+        $this->logInfo("Upload File", ["file"=>$logFile, "files"=> $logFile]);
+
+        if($partialUpload){
+            $this->logDebug("Return Partial Upload: SUCESS but no event yet");
+            // Make sure to clear cache for parent
+            $createdNode->getParent()->loadNodeInfo(true);
+            $this->writeUploadSuccess($request, ["PARTIAL_NODE" => $createdNode]);
+        } else {
+            $this->logDebug("Return success");
+            $createdNode->loadHash();
+            if($nodeOverriden){
+                $this->writeUploadSuccess($request, ["UPDATED_NODE" => $createdNode]);
+            }else{
+                $this->writeUploadSuccess($request, ["CREATED_NODE" => $createdNode]);
+            }
+        }
+
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param $message
+     * @param $code
+     */
+    protected function writeUploadError(ServerRequestInterface &$request, $message, $code){
+        $request = $request->withAttribute("upload_process_result", ["ERROR" => ["CODE" => $code, "MESSAGE" => $message]]);
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param $nodeData
+     */
+    protected function writeUploadSuccess(ServerRequestInterface &$request, $nodeData){
+        $arr = array_merge(["SUCCESS" => true], $nodeData);
+        $request = $request->withAttribute("upload_process_result", $arr);
+    }
+
+
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public function downloadAction(ServerRequestInterface &$request, ResponseInterface &$response){
+
+        /** @var ContextInterface $ctx */
+        $ctx = $request->getAttribute("ctx");
+        $httpVars = $request->getParsedBody();
+        $selection = UserSelection::fromContext($ctx, $httpVars);
+        if (!$selection->isEmpty()) {
+            $this->filterUserSelectionToHidden($ctx, $selection->getFiles());
+        }
+
+        $action = $request->getAttribute("action");
+
+        switch ($action){
+
+            case "download":
+
+                $this->logInfo("Download", ["files"=>$this->addSlugToPath($selection)]);
+                @set_error_handler(["Pydio\\Core\\Controller\\HTMLWriter", "javascriptErrorHandler"], E_ALL & ~ E_NOTICE);
+                @register_shutdown_function("restore_error_handler");
+                $zip = false;
+                $dir = "";
+                if ($selection->isUnique()) {
+                    if (is_dir($selection->getUniqueNode()->getUrl())) {
+                        $zip = true;
+                        $base = basename($selection->getUniqueFile());
+                        $uniqDir = PathUtils::forwardSlashDirname($selection->getUniqueFile());
+                        if(!empty($uniqDir) && $uniqDir != "/"){
+                            $dir = PathUtils::forwardSlashDirname($selection->getUniqueFile());
+                        }
+                    } else {
+                        if (!file_exists($selection->getUniqueNode()->getUrl())) {
+                            throw new \Exception("Cannot find file!");
+                        }
+                    }
+                    $node = $selection->getUniqueNode();
+                } else {
+                    if(isset($httpVars["dir"])){
+                        $dir = InputFilter::decodeSecureMagic($httpVars["dir"], InputFilter::SANITIZE_DIRNAME);
+                    }
+                    $base = basename(PathUtils::forwardSlashDirname($selection->getUniqueFile()));
+                    $zip = true;
+                }
+                if ($zip) {
+                    // Make a temp zip and send it as download
+                    $loggedUser = $ctx->getUser();
+                    $file = ApplicationState::getAjxpTmpDir() ."/".($loggedUser?$loggedUser->getId():"shared")."_".time()."tmpDownload.zip";
+                    $zipFile = $this->makeZip($selection, $file, empty($dir)?"/":$dir);
+                    if(!$zipFile) throw new PydioException("Error while compressing");
+                    $localName = (empty($base)?"Files":$base).".zip";
+                    if(isSet($httpVars["archive_name"])){
+                        $localName = InputFilter::decodeSecureMagic($httpVars["archive_name"]);
+                    }
+                    $fileReader = new FileReaderResponse($file);
+                    $fileReader->setUnlinkAfterRead();
+                    $fileReader->setLocalName($localName);
+                    $response = $response->withBody($fileReader);
+                } else {
+                    $localName = "";
+                    Controller::applyHook("dl.localname", [$selection->getUniqueNode(), &$localName]);
+                    $fileReader = new FileReaderResponse($selection->getUniqueNode());
+                    $fileReader->setLocalName($localName);
+                    $response = $response->withBody($fileReader);
+                }
+                if (isSet($node)) {
+                    Controller::applyHook("node.read", [&$node]);
+                }
+
+                break;
+
+            case "get_content":
+
+                $node = $selection->getUniqueNode();
+                $dlFile = $node->getUrl();
+                if(!is_readable($dlFile)){
+                    throw new \Exception("Cannot access file!");
+                }
+                $this->logInfo("Get_content", ["files"=>$this->addSlugToPath($selection)]);
+
+                if (StatHelper::getStreamingMimeType(basename($dlFile)) !==false) {
+                    $readMode  = "stream_content";
+                } else {
+                    $readMode  = "plain";
+                }
+                $fileReader = new FileReaderResponse($node);
+                $fileReader->setHeaderType($readMode);
+                $response = $response->withBody($fileReader);
+                Controller::applyHook("node.read", [&$node]);
+
+                break;
+
+            case "prepare_chunk_dl" :
+
+                $chunkCount = intval($httpVars["chunk_count"]);
+                $node = $selection->getUniqueNode();
+
+                $fileId = $node->getUrl();
+                $sessionKey = "chunk_file_".md5($fileId.time());
+                $totalSize = filesize($fileId);
+                $chunkSize = intval ( $totalSize / $chunkCount );
+                $realFile  = MetaStreamWrapper::getRealFSReference($fileId, true);
+                $chunkData = [
+                    "localname"	  => basename($fileId),
+                    "chunk_count" => $chunkCount,
+                    "chunk_size"  => $chunkSize,
+                    "total_size"  => $totalSize,
+                    "file_id"	  => $sessionKey
+                ];
+                SessionService::save($sessionKey, array_merge($chunkData, ["file" => $realFile]));
+                $response = $response->withHeader("Content-type", "application/json; charset=UTF-8");
+                $response->getBody()->write(json_encode($chunkData));
+
+                Controller::applyHook("node.read", [&$node]);
+
+                break;
+
+            case "download_chunk" :
+
+                $chunkIndex = intval($httpVars["chunk_index"]);
+                $chunkKey = $httpVars["file_id"];
+                $sessData = SessionService::fetch($chunkKey);
+                $realFile = $sessData["file"];
+                $chunkSize = $sessData["chunk_size"];
+                $offset = $chunkSize * $chunkIndex;
+                if ($chunkIndex == $sessData["chunk_count"]-1) {
+                    // Compute the last chunk real length
+                    $chunkSize = $sessData["total_size"] - ($chunkSize * ($sessData["chunk_count"]-1));
+                    if ($selection->nodeForPath("/")->wrapperIsRemote()) {
+                        register_shutdown_function("unlink", $realFile);
+                    }
+                }
+                $fileReader = new FileReaderResponse($realFile);
+                $fileReader->setLocalName($sessData["localname"].".".sprintf("%03d", $chunkIndex+1));
+                $fileReader->setPartial($offset, $chunkSize);
+                $response = $response->withBody($fileReader);
+
+                break;
+
+            default:
+                break;
+        }
+
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public function switchAction(ServerRequestInterface &$request, ResponseInterface &$response)
+    {
+        parent::accessPreprocess($request);
+        $this->filterByApi($request);
+
+        /** @var ContextInterface $ctx */
+        $ctx = $request->getAttribute("ctx");
+        $action = $request->getAttribute("action");
+        $httpVars = $request->getParsedBody();
+
+        $selection = UserSelection::fromContext($ctx, $httpVars);
+        if (!$selection->isEmpty()) {
+            $this->filterUserSelectionToHidden($ctx, $selection->getFiles());
+            RecycleBinManager::filterActions($action, $selection, $httpVars);
+        }
+        $mess = LocaleService::getMessages();
+        $nodesDiffs = new NodesDiff();
+
+        switch ($action) {
+
+            case "compress" :
+
+                $taskId = $request->getAttribute("pydio-task-id");
+                if($request->getAttribute("pydio-task-id") === null){
+                    $task = TaskService::actionAsTask($ctx, $action, $httpVars);
+                    $task->setActionLabel($mess, '313');
+                    $task->setFlags(Task::FLAG_STOPPABLE);
+                    $response = TaskService::getInstance()->enqueueTask($task, $request, $response);
+                    break;
+                }
+
+                if($taskId !== null){
+                    TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_RUNNING, "Starting compression in background");
+                }
+                $dir = InputFilter::decodeSecureMagic($httpVars["dir"], InputFilter::SANITIZE_DIRNAME);
+                $currentDirNode = $selection->nodeForPath($dir);
+                // Make a temp zip
+                $loggedUser = $ctx->getUser();
+                if (isSet($httpVars["archive_name"])) {
+                    $localName = InputFilter::decodeSecureMagic($httpVars["archive_name"]);
+                    $this->filterUserSelectionToHidden($ctx, [$localName]);
+                } else {
+                    $localName = (basename($dir)==""?"Files":basename($dir)).".zip";
+                }
+                $file = ApplicationState::getAjxpTmpDir() ."/".($loggedUser?$loggedUser->getId():"shared")."_".time()."tmpCompression.zip";
+                if(isSet($httpVars["compress_flat"])) $baseDir = "__AJXP_ZIP_FLAT__/";
+                else $baseDir = $dir;
+                $zipFile = $this->makeZip($selection, $file, $baseDir, $taskId);
+                if(!$zipFile) throw new PydioException("Error while compressing file $localName");
+                register_shutdown_function("unlink", $file);
+                $urlBase = $selection->currentBaseUrl();
+                $tmpFNAME = $urlBase.$dir."/".str_replace(".zip", ".tmp", $localName);
+                copy($file, $tmpFNAME);
+                try {
+                    Controller::applyHook("node.before_create", [new AJXP_Node($tmpFNAME), filesize($tmpFNAME)]);
+                } catch (\Exception $e) {
+                    @unlink($tmpFNAME);
+                    throw $e;
+                }
+                @rename($tmpFNAME, $urlBase.$dir."/".$localName);
+                $newArchiveNode = $currentDirNode->createChildNode($localName);
+                Controller::applyHook("node.change", [null, $newArchiveNode, false], true);
+                if($taskId !== null){
+                    TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_COMPLETE, "Finished compression in background");
+                }
+
+            break;
+
+            case "stat" :
+
+                clearstatcache();
+                $jsonData = new \stdClass;
+                if($selection->isUnique()){
+                    $stat = @stat($selection->getUniqueNode()->getUrl());
+                    if ($stat !== false && is_readable($selection->getUniqueNode()->getUrl())) {
+                        $jsonData = $stat;
+                    }
+                }else{
+                    $nodes = $selection->buildNodes();
+                    foreach($nodes as $node){
+                        $stat = @stat($node->getUrl());
+                        if(!$stat || !is_readable($node->getUrl())) {
+                            $stat = new \stdClass();
+                        }
+                        $path = $node->getPath();
+                        $jsonData->$path = $stat;
+                    }
+                }
+                $response = new JsonResponse($jsonData);
+
+            break;
+
+
+            //------------------------------------
+            //	ONLINE EDIT
+            //------------------------------------
+            case "put_content":
+
+                if(!isset($httpVars["content"])) break;
+                // Load "code" variable directly from POST array, do not "securePath" or "sanitize"...
+                $code = $httpVars["content"];
+                $currentNode = $selection->getUniqueNode();
+                $fileName = $currentNode->getUrl();
+                $this->logInfo("Online Edition", ["files"=> $this->addSlugToPath($fileName)]);
+                if (isSet($httpVars["encode"]) && $httpVars["encode"] == "base64") {
+                    $code = base64_decode($code);
+                } else {
+                    $code=str_replace("&lt;","<", InputFilter::magicDequote($code));
+                }
+                Controller::applyHook("node.before_change", [&$currentNode, strlen($code)]);
+                if (!is_file($fileName) || !$this->isWriteable($currentNode)) {
+                    throw new FileNotWriteableException($currentNode);
+                }
+                $fp=fopen($fileName,"w");
+                fputs ($fp,$code);
+                fclose($fp);
+                clearstatcache(true, $fileName);
+                Controller::applyHook("node.change", [$currentNode, $currentNode, false]);
+                $logMessage = new UserMessage($mess[115]);
+                $nodesDiffs->update([$currentNode]);
+
+            break;
+
+            //------------------------------------
+            //	DELETE
+            //  Warning, must be kept BEFORE copy/move
+            //  as recyclebin filtering can transform
+            //  it move action.
+            //------------------------------------
+            case "delete":
+
+                if ($selection->isEmpty()) {
+                    throw new PydioException("", 113);
+                }
+                $size = 0;
+                $nodes = $selection->buildNodes();
+                $bgSizeThreshold = 10*1024*1024;
+                $bgWorkerThreshold = 80*1024*1024;
+                if(!MetaStreamWrapper::wrapperIsRemote($selection->currentBaseUrl())){
+                    foreach($nodes as $node){
+                        $size += $node->getSizeRecursive();
+                    }
+                }else if(!$selection->isUnique() || !$selection->getUniqueNode()->isLeaf()){
+                    $size = -1;
+                }
+                $taskId = $request->getAttribute("pydio-task-id");
+                if($taskId === null && ($size === -1 || $size > $bgSizeThreshold)){
+                    $task = TaskService::actionAsTask($ctx, $action, $httpVars);
+                    $task->setActionLabel($mess, '7');
+                    if($size === -1 || $size > $bgWorkerThreshold){
+                        $task->setSchedule(new Schedule(Schedule::TYPE_ONCE_DEFER));
+                    }
+                    $response = TaskService::getInstance()->enqueueTask($task, $request, $response);
+                    break;
+                }
+
+                $logMessages = [];
+                $errorMessage = $this->delete($selection, $logMessages, $taskId);
+                if (count($logMessages)) {
+                    $logMessage = new UserMessage(join("\n", $logMessages));
+                }
+                if($errorMessage) {
+                    throw new PydioException($errorMessage);
+                }
+                $this->logInfo("Delete", ["files"=>$this->addSlugToPath($selection)]);
+                $nodesDiffs->remove($selection->getFiles());
+
+            break;
+
+            case "empty_recycle":
+
+                $taskId = $request->getAttribute("pydio-task-id");
+                if($taskId === null && !ApplicationState::sapiIsCli()){
+                    $task = TaskService::actionAsTask($ctx, $action, $httpVars);
+                    $task->setActionLabel($mess, '221');
+                    $response = TaskService::getInstance()->enqueueTask($task, $request, $response);
+                    break;
+                }
+                // List recycle content
+                $fakeResp = new Response();
+                $recycleBin = RecycleBinManager::getRelativeRecycle();
+                $newRequest = $request->withAttribute("action", "ls");
+                $newRequest = $newRequest->withParsedBody(["dir" => $recycleBin]);
+                $this->switchAction($newRequest, $fakeResp);
+                $b = $fakeResp->getBody();
+                if($b instanceof SerializableResponseStream){
+                    foreach($b->getChunks() as $chunk){
+                        if($chunk instanceof NodesList){
+                            $list = $chunk;
+                        }
+                    }
+                }
+                if(!isSet($list)){
+                    throw new PydioException("Could not retrieve recycle bin content");
+                }
+                $selection = UserSelection::fromContext($ctx, []);
+                $selection->initFromNodes($list->getChildren());
+                $logMessages = [];
+                $errorMessage = $this->delete($selection, $logMessages, $taskId);
+                if (count($logMessages)) {
+                    $logMessage = new UserMessage(join("\n", $logMessages));
+                }
+                if($errorMessage) {
+                    throw new PydioException($errorMessage);
+                }
+                $this->logInfo("Delete", ["files"=>$this->addSlugToPath($selection)]);
+                $nodesDiffs->remove($selection->getFiles());
+
+                break;
+
+            //------------------------------------
+            //	COPY / MOVE
+            //------------------------------------
+            case "copy":
+            case "move":
+
+                if ($selection->isEmpty()) {
+                    throw new PydioException("", 113);
+                }
+                $taskId = $request->getAttribute("pydio-task-id");
+                // Compute copy size
+                $size = 0;
+                $nodes = $selection->buildNodes();
+                $bgSizeThreshold = 10*1024*1024;
+                $bgWorkerThreshold = 80*1024*1024;
+                if(!MetaStreamWrapper::wrapperIsRemote($selection->currentBaseUrl())){
+                    foreach($nodes as $node){
+                        $size += $node->getSizeRecursive();
+                    }
+                }else if(!$selection->isUnique() || !$selection->getUniqueNode()->isLeaf()){
+                    $size = -1;
+                }
+                if($taskId === null && ($size === -1 || $size > $bgSizeThreshold)){
+                    $task = TaskService::actionAsTask($ctx, $action, $httpVars);
+                    $task->setActionLabel($mess, $action === 'copy' ? '66' : '70');
+                    $task->setFlags(Task::FLAG_STOPPABLE);
+                    if($size === -1 || $size > $bgWorkerThreshold){
+                        $task->setSchedule(new Schedule(Schedule::TYPE_ONCE_DEFER));
+                    }
+                    $response = TaskService::getInstance()->enqueueTask($task, $request, $response);
+                    break;
+                }
+                if(!empty($taskId)){
+                    TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_RUNNING, "Starting operation in background");
+                }
+                $loggedUser = $ctx->getUser();
+                if($loggedUser != null && !$loggedUser->canWrite($ctx->getRepositoryId())){
+                    throw new PydioException("You are not allowed to write", 207);
+                }
+                $success = $error = [];
+                $destPath = InputFilter::decodeSecureMagic($httpVars["dest"]);
+                $targetBaseName = null;
+                if($selection->isUnique() && isSet($httpVars["targetBaseName"])){
+                    $targetBaseName = $httpVars["targetBaseName"];
+                }
+                if(!file_exists($destPath) && isSet($httpVars["recycle_restore"])){
+                    $this->mkDir($selection->nodeForPath(PathUtils::forwardSlashDirname($destPath)), basename($destPath), false, true);
+                }
+                $this->filterUserSelectionToHidden($ctx, [$httpVars["dest"]]);
+                if ($selection->inZip()) {
+                    // Set action to copy anycase (cannot move from the zip).
+                    $action = "copy";
+                    $this->extractArchive($destPath, $selection, $error, $success, $taskId);
+                } else {
+                    $move = ($action == "move" ? true : false);
+                    if ($move && isSet($httpVars["force_copy_delete"])) {
+                        $move = false;
+                    }
+                    $this->copyOrMove($destPath, $selection, $error, $success, $move, $targetBaseName, $taskId);
+
+                }
+
+                if (count($error)) {
+                    if(!empty($taskId)) TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_FAILED, "Error while copy/move: ".join("\n", $error));
+                    throw new PydioException(join("\n", $error));
+                } else {
+                    if (isSet($httpVars["force_copy_delete"])) {
+                        $errorMessage = $this->delete($selection, $logMessages, $taskId);
+                        if($errorMessage) {
+                            if(!empty($taskId)) {
+                                TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_FAILED, "Error while deleting data: ".$errorMessage);
+                            }
+                            throw new PydioException($errorMessage);
+                        }
+                        $this->logInfo("Copy/Delete", ["files"=>$this->addSlugToPath($selection), "destination" => $this->addSlugToPath($destPath)]);
+                    } else {
+                        $this->logInfo(($action=="move"?"Move":"Copy"), ["files"=>$this->addSlugToPath($selection), "destination"=>$this->addSlugToPath($destPath)]);
+                    }
+                    $logMessage = new UserMessage(join("\n", $success));
+                }
+                // Assume new nodes are correctly created
+                $destNode = $selection->nodeForPath($destPath);
+                foreach ($nodes as $selectedNode) {
+                    $newNode = $destNode->createChildNode((isSet($targetBaseName)?$targetBaseName : $selectedNode->getLabel()));
+                    if($action == "move"){
+                        $nodesDiffs->update($newNode, $selectedNode->getPath());
+                    }else{
+                        $nodesDiffs->add($newNode);
+                    }
+                }
+
+                if(!empty($taskId)) {
+                    TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_COMPLETE, "");
+                    Controller::applyHook("msg.instant", [$ctx, $nodesDiffs->toXML()]);
+                }
+
+                break;
+
+
+            case "purge" :
+
+
+                $hardPurgeTime = intval($ctx->getRepository()->getContextOption($ctx, "PURGE_AFTER"))*3600*24;
+                $softPurgeTime = intval($ctx->getRepository()->getContextOption($ctx, "PURGE_AFTER_SOFT"))*3600*24;
+                $shareCenter = PluginsService::getInstance($ctx)->getPluginById('action.share');
+                if( !($shareCenter && $shareCenter->isEnabled()) ) {
+                    //action.share is disabled, don't look at the softPurgeTime
+                    $softPurgeTime = 0;
+                }
+                if ($hardPurgeTime > 0 || $softPurgeTime > 0) {
+                    $this->recursivePurge($selection->currentBaseUrl(), $hardPurgeTime, $softPurgeTime);
+                }
+
+            break;
+
+            //------------------------------------
+            //	RENAME
+            //------------------------------------
+            case "rename":
+
+                $originalNode = $selection->getUniqueNode();
+                $destNode = null;
+                $filename_new = "";
+                if (isSet($httpVars["dest"])) {
+                    $dest = InputFilter::decodeSecureMagic($httpVars["dest"]);
+                    $destNode = $selection->nodeForPath($dest);
+                    $this->filterUserSelectionToHidden($ctx, [$destNode->getLabel()]);
+                }else if(isSet($httpVars["filename_new"])){
+                    $filename_new = InputFilter::decodeSecureMagic($httpVars["filename_new"]);
+                    $this->filterUserSelectionToHidden($ctx, [$filename_new]);
+                }
+                $renamedNode = $this->rename($originalNode, $destNode, $filename_new);
+
+                $logMessage = new UserMessage($originalNode->getLabel()." $mess[41] ".$renamedNode->getLabel());
+                $nodesDiffs->update($renamedNode, $originalNode->getPath());
+                $this->logInfo("Rename", [
+                    "files"     => $this->addSlugToPath($originalNode->getUrl()),
+                    "original"  => $this->addSlugToPath($originalNode->getUrl()),
+                    "new"       => $this->addSlugToPath($renamedNode->getUrl())
+                ]);
+
+            break;
+
+            //------------------------------------
+            //	CREER UN REPERTOIRE / CREATE DIR
+            //------------------------------------
+            case "mkdir":
+
+                $messtmp="";
+                $files = $selection->getFiles();
+                if(isSet($httpVars["dir"]) && isSet($httpVars["dirname"])){
+                    $files[] =
+                        rtrim(InputFilter::decodeSecureMagic($httpVars["dir"], InputFilter::SANITIZE_DIRNAME), "/")
+                        ."/".
+                        InputFilter::decodeSecureMagic($httpVars["dirname"], InputFilter::SANITIZE_FILENAME);
+                }
+                $messages = [];
+                $errors = [];
+                $max_length = ConfService::getContextConf($ctx, "NODENAME_MAX_LENGTH");
+                foreach($files as $newDirPath){
+                    $parentDir = PathUtils::forwardSlashDirname($newDirPath);
+                    $basename = PathUtils::forwardSlashBasename($newDirPath);
+                    $basename = substr($basename, 0, $max_length);
+                    $this->filterUserSelectionToHidden($ctx, [$basename]);
+                    $parentNode = $selection->nodeForPath($parentDir);
+                    try{
+                        Controller::applyHook("node.before_create", [$parentNode->createChildNode($basename), -2]);
+                    }catch (PydioException $e){
+                        $errors[] = $e->getMessage();
+                        continue;
+                    }
+                    try{
+                        $newNode = $this->mkDir(
+                            $parentNode,
+                            $basename,
+                            (isSet($httpVars["ignore_exists"]) && $httpVars["ignore_exists"] === "true"),
+                            (isSet($httpVars["recursive"]) && $httpVars["recursive"] === "true")
+                        );
+                    }catch(PydioException $ex){
+                        $errors[] = $ex->getMessage();
+                        continue;
+                    }
+                    if(empty($newNode)){
+                        continue;
+                    }
+                    $messtmp.="$mess[38] ".$basename." $mess[39] ";
+                    if ($parentDir=="") {$messtmp.="/";} else {$messtmp.= $parentDir;}
+                    $messages[] = $messtmp;
+                    $nodesDiffs->add($newNode);
+                    $this->logInfo("Create Dir", ["dir"=>$this->addSlugToPath($parentDir)."/".$basename, "files"=>$this->addSlugToPath($parentDir)."/".$basename]);
+                }
+                if(count($errors)){
+                    if(!count($messages)){
+                        throw new PydioException(implode('', $errors));
+                    }else{
+                        $messages = array_merge($messages, $errors);
+                    }
+                }
+                $logMessage = new UserMessage(implode("<br>", $messages));
+
+
+            break;
+
+            //------------------------------------
+            //	CREER UN FICHIER / CREATE FILE
+            //------------------------------------
+            case "mkfile":
+
+                if(empty($httpVars["filename"]) && isSet($httpVars["node"])){
+                    $filename= InputFilter::decodeSecureMagic($httpVars["node"]);
+                }else{
+                    $parent = rtrim(InputFilter::decodeSecureMagic($httpVars["dir"], InputFilter::SANITIZE_DIRNAME), "/");
+                    $filename = $parent ."/" . InputFilter::decodeSecureMagic($httpVars["filename"], InputFilter::SANITIZE_FILENAME);
+                }
+                $filename = substr($filename, 0, ConfService::getContextConf($ctx, "NODENAME_MAX_LENGTH"));
+                $this->filterUserSelectionToHidden($ctx, [$filename]);
+                $node = $selection->nodeForPath($filename);
+                $content = "";
+                if (isSet($httpVars["content"])) {
+                    $content = $httpVars["content"];
+                }
+                $forceCreation = false;
+                if (isSet($httpVars["force"]) && $httpVars["force"] == "true"){
+                    $forceCreation = true;
+                }
+                $this->createEmptyFile($node, $content, $forceCreation);
+                $logMessage = new UserMessage($mess[34]." ".$node->getLabel()." ".$mess[39]." ". $node->getParent()->getPath());
+                $this->logInfo("Create File", ["files"=>$this->addSlugToPath($node->getPath())]);
+                $node->loadNodeInfo();
+                $nodesDiffs->add($node);
+
+            break;
+
+            //------------------------------------
+            //	CHANGE FILE PERMISSION
+            //------------------------------------
+            case "chmod":
+
+                $nodes = $selection->buildNodes();
+                $changedFiles = [];
+                $chmod_value = $httpVars["chmod_value"];
+                $recursive = $httpVars["recursive"];
+                $recur_apply_to = $httpVars["recur_apply_to"];
+                foreach ($nodes as $node) {
+                    $this->chmod($node, $chmod_value, ($recursive=="on"), ($recursive=="on"?$recur_apply_to:"both"), $changedFiles);
+                }
+                $logMessage= new UserMessage("Successfully changed permission to ".$chmod_value." for ".count($changedFiles)." files or folders");
+                $this->logInfo("Chmod", [
+                    "files"         => array_map([$this, "addSlugToPath"], $selection->getFiles()),
+                    "filesCount"    =>count($changedFiles)
+                ]);
+                $nodesDiffs->update($nodes);
+
+            break;
+
+            case "lsync" :
+
+                $fromNode = null;
+                $toNode = null;
+                $copyOrMove = false;
+                if (isSet($httpVars["from"])) {
+                    $fromNode = $selection->nodeForPath(InputFilter::decodeSecureMagic($httpVars["from"]));
+                }
+                if (isSet($httpVars["to"])) {
+                    $toNode = $selection->nodeForPath(InputFilter::decodeSecureMagic($httpVars["to"]));
+                }
+                if (isSet($httpVars["copy"]) && $httpVars["copy"] == "true") {
+                    $copyOrMove = true;
+                }
+                Controller::applyHook("node.change", [$fromNode, $toNode, $copyOrMove]);
+
+            break;
+
+            //------------------------------------
+            //	XML LISTING
+            //------------------------------------
+            case "ls":
+
+                $nodesList = new NodesList();
+
+                if($selection->isUnique() && $request->getAttribute("api") == "v2" && !empty($httpVars["children"])){
+                    $dir = $selection->getUniqueFile();
+                    $selection->setFiles([]);
+                }else{
+                    $dir = InputFilter::sanitize($httpVars["dir"], InputFilter::SANITIZE_DIRNAME) OR "";
+                }
+                $patch = false;
+                if (MetaStreamWrapper::actualRepositoryWrapperClass(new AJXP_Node($selection->currentBaseUrl())) === "Pydio\\Access\\Driver\\StreamProvider\\FS\\FsAccessWrapper") {
+                    $dir = PathUtils::patchPathForBaseDir($dir);
+                    $patch = true;
+                }
+                $dir = InputFilter::securePath($dir);
+
+                // FILTER DIR PAGINATION ANCHOR
+                $page = null;
+                if (isSet($dir) && strstr($dir, "%23")!==false) {
+                    $parts = explode("%23", $dir);
+                    $dir = $parts[0];
+                    $page = $parts[1];
+                }
+
+                if(!isSet($dir) || $dir == "/") $dir = "";
+                $lsOptions = $this->parseLsOptions((isSet($httpVars["options"])?$httpVars["options"]:"a"));
+
+                $startTime = microtime();
+                $path = $selection->nodeForPath(($dir!= ""?($dir[0]=="/"?"":"/").$dir:""))->getUrl();
+                $nonPatchedPath = $path;
+                if ($patch) {
+                    $nonPatchedPath = PathUtils::unPatchPathForBaseDir($path);
+                }
+                $testPath = @stat($path);
+                if($testPath === null || $testPath === false){
+                    throw new \Exception("There was a problem trying to open folder ". $path. ", please check your Administrator");
+                }
+                if(!is_readable($path) && !is_writeable($path)){
+                    throw new \Exception("You are not allowed to access folder " . $path);
+                }
+                // Backward compat
+                if($selection->isUnique() && strpos($selection->getUniqueFile(), "/") !== 0){
+                    $selection->setFiles([$dir . "/" . $selection->getUniqueFile()]);
+                }
+                
+                $orderField = $orderDirection = null;
+                $threshold          = 500;
+                $limitPerPage       = 200;
+                $defaultOrder       = $ctx->getRepository()->getContextOption($ctx, "REMOTE_SORTING_DEFAULT_COLUMN");
+                $defaultDirection   = $ctx->getRepository()->getContextOption($ctx, "REMOTE_SORTING_DEFAULT_DIRECTION");
+                if ($ctx->getRepository()->getContextOption($ctx, "REMOTE_SORTING")) {
+                    $orderDirection = isSet($httpVars["order_direction"])?strtolower($httpVars["order_direction"]):$defaultDirection;
+                    $orderField = isSet($httpVars["order_column"])?$httpVars["order_column"]:$defaultOrder;
+                    if ($orderField != null && !in_array($orderField, ["ajxp_label", "filesize", "ajxp_modiftime", "mimestring"])) {
+                        $orderField = $defaultOrder;
+                    }
+                }
+                if(!isSet($httpVars["recursive"]) || $httpVars["recursive"] != "true"){
+                    $threshold = $ctx->getRepository()->getContextOption($ctx, "PAGINATION_THRESHOLD");
+                    if(!isSet($threshold) || intval($threshold) == 0) $threshold = 500;
+                    $limitPerPage = $ctx->getRepository()->getContextOption($ctx, "PAGINATION_NUMBER");
+                    if(!isset($limitPerPage) || intval($limitPerPage) == 0) $limitPerPage = 200;
+                }
+
+                if(!$selection->isEmpty()){
+                    $uniqueNodes = $selection->buildNodes();
+                    $parentAjxpNode = $selection->nodeForPath("/");
+                    Controller::applyHook("node.read", [&$parentAjxpNode]);
+                    $nodesList->setParentNode($parentAjxpNode);
+                    foreach($uniqueNodes as $node){
+                        if(!file_exists($node->getUrl()) || (!is_readable($node->getUrl()) && !is_writable($node->getUrl()))) continue;
+                        $nodeName = $node->getLabel();
+                        if (!$this->filterNodeName($ctx, $node->getPath(), $nodeName, $isLeaf, $lsOptions)) {
+                            continue;
+                        }
+                        if (RecycleBinManager::recycleEnabled() && $node->getPath() == RecycleBinManager::getRecyclePath()) {
+                            continue;
+                        }
+                        $node->loadNodeInfo(false, false, ($lsOptions["l"]?"all":"minimal"));
+                        if (!empty($node->metaData["nodeName"]) && $node->metaData["nodeName"] != $nodeName) {
+                            $node->setUrl(PathUtils::forwardSlashDirname($node->getUrl())."/".$node->metaData["nodeName"]);
+                        }
+                        if (!empty($node->metaData["hidden"]) && $node->metaData["hidden"] === true) {
+                            continue;
+                        }
+                        if (!empty($node->metaData["mimestring_id"]) && array_key_exists($node->metaData["mimestring_id"], $mess)) {
+                            $node->mergeMetadata(["mimestring" =>  $mess[$node->metaData["mimestring_id"]]]);
+                        }
+                        if(isSet($httpVars["page_position"]) && $httpVars["page_position"] == "true"){
+                            // Detect page position: we have to loading "siblings"
+                            $parentPath = PathUtils::forwardSlashDirname($node->getPath());
+                            $siblings = scandir($selection->currentBaseUrl().$parentPath);
+                            foreach($siblings as $i => $s){
+                                if($this->filterFile($ctx, $s, true)) unset($siblings[$i]);
+                                if($this->filterFolder($ctx, $s)) unset($siblings[$i]);
+                            }
+                            if(count($siblings) > $threshold){
+                                //usort($siblings, "strcasecmp");
+                                $siblings = $this->orderNodes($siblings, $selection->currentBaseUrl().$parentPath, $orderField, $orderDirection);
+                                $index = array_search($node->getLabel(), $siblings);
+                                $node->mergeMetadata(["page_position" => floor($index / $limitPerPage) +1]);
+                            }
+                        }
+                        $nodesList->addBranch($node);
+                    }
+                    break;
+                }
+
+                $metaData = [];
+                if (RecycleBinManager::recycleEnabled() && $dir == "") {
+                    $metaData["repo_has_recycle"] = RecycleBinManager::getRelativeRecycle();
+                }
+                $parentAjxpNode = new AJXP_Node($nonPatchedPath, $metaData);
+                $parentAjxpNode->loadNodeInfo(false, true, ($lsOptions["l"]?"all":"minimal"));
+                Controller::applyHook("node.read", [&$parentAjxpNode]);
+
+                $streamIsSeekable = MetaStreamWrapper::wrapperIsSeekable($path);
+
+                $sharedHandle = null; $handle = null;
+                if($streamIsSeekable){
+                    $handle = opendir($path);
+                    $sharedHandle = $handle;
+                }
+                $countFiles = $this->countChildren($parentAjxpNode, !$lsOptions["f"], false, $sharedHandle);
+                if(isSet($sharedHandle)){
+                    rewind($handle);
+                }
+                $totalPages = $crtPage = 1;
+                if (isSet($threshold) && isSet($limitPerPage) && $countFiles > $threshold) {
+                    $offset = 0;
+                    $crtPage = 1;
+                    if (isSet($page)) {
+                        $offset = (intval($page)-1)*$limitPerPage;
+                        $crtPage = $page;
+                    }
+                    $totalPages = floor($countFiles / $limitPerPage) + 1;
+                } else {
+                    $offset = $limitPerPage = 0;
+                }
+
+                $nodesList->setParentNode($parentAjxpNode);
+                if (isSet($totalPages) && isSet($crtPage) && ($totalPages > 1 || !UserAgent::userAgentIsNativePydioApp())) {
+                    $remoteOptions = null;
+                    if ($this->getContextualOption($ctx, "REMOTE_SORTING")) {
+                        $remoteOptions = [
+                            "remote_order" => "true",
+                            "currentOrderCol" => isSet($orderField)?$orderField:$defaultOrder,
+                            "currentOrderDir"=> isSet($orderDirection)?$orderDirection:$defaultDirection
+                        ];
+                    }
+                    $foldersCounts = $this->countChildren($parentAjxpNode, TRUE, false, $sharedHandle);
+                    if(isSet($sharedHandle)) {
+                        rewind($sharedHandle);
+                    }
+                    $nodesList->setPaginationData($countFiles, $crtPage, $totalPages, $foldersCounts, $remoteOptions);
+                    if ($totalPages > 1 && !$lsOptions["f"]) {
+                        if(isSet($sharedHandle)) {
+                            closedir($sharedHandle);
+                        }
+                        break;
+                    }
+                }
+
+                $cursor = 0;
+                if(isSet($sharedHandle)){
+                    $handle = $sharedHandle;
+                }else{
+                    $handle = opendir($path);
+                }
+                if (!$handle) {
+                    throw new PydioException("Cannot open dir ".$nonPatchedPath);
+                }
+                $nodes = [];
+                while(false !== ($file = readdir($handle))){
+                    $nodes[] = $file;
+                }
+                closedir($handle);
+                $fullList = ["d" => [], "z" => [], "f" => []];
+
+                //$nodes = scandir($path);
+                $nodes = $this->orderNodes($nodes, $nonPatchedPath, $orderField, $orderDirection);
+
+                foreach ($nodes as $nodeName) {
+                    if($nodeName == "." || $nodeName == "..") {
+                        continue;
+                    }
+                    $isLeaf = "";
+                    if (!$this->filterNodeName($ctx, $path, $nodeName, $isLeaf, $lsOptions)) {
+                        continue;
+                    }
+                    if (RecycleBinManager::recycleEnabled() && $dir == "" && "/".$nodeName == RecycleBinManager::getRecyclePath()) {
+                        continue;
+                    }
+                    if ($offset > 0 && $cursor < $offset) {
+                        $cursor ++;
+                        continue;
+                    }
+
+                    if ($limitPerPage > 0 && ($cursor - $offset) >= $limitPerPage) {
+                        break;
+                    }
+
+                    $currentFile = $nonPatchedPath."/".$nodeName;
+                    $meta = [];
+                    if($isLeaf != "") $meta = ["is_file" => ($isLeaf?"1":"0")];
+                    $node = new AJXP_Node($currentFile, $meta);
+                    $node->setLabel($nodeName);
+                    $node->loadNodeInfo(false, false, ($lsOptions["l"]?"all":"minimal"));
+                    if (!empty($node->metaData["nodeName"]) && $node->metaData["nodeName"] != $nodeName) {
+                        $node->setUrl($nonPatchedPath."/".$node->metaData["nodeName"]);
+                    }
+                    if (!empty($node->metaData["hidden"]) && $node->metaData["hidden"] === true) {
+                           continue;
+                       }
+                    if (!empty($node->metaData["mimestring_id"]) && array_key_exists($node->metaData["mimestring_id"], $mess)) {
+                        $node->mergeMetadata(["mimestring" =>  $mess[$node->metaData["mimestring_id"]]]);
+                    }
+                    if (isSet($originalLimitPerPage) && $cursor > $originalLimitPerPage) {
+                        $node->mergeMetadata(["page_position" => floor($cursor / $originalLimitPerPage) +1]);
+                    }
+
+                    $nodeType = "d";
+                    if ($node->isLeaf()) {
+                        if (StatHelper::isBrowsableArchive($nodeName)) {
+                            if ($lsOptions["f"] && $lsOptions["z"]) {
+                                $nodeType = "f";
+                            } else {
+                                $nodeType = "z";
+                            }
+                        } else $nodeType = "f";
+                    }
+                    // There is a special sorting, cancel the reordering of files & folders.
+                    if(isSet($orderField) && $orderField != "ajxp_label" && !(isSet($httpVars["recursive"]) && $httpVars["recursive"] == "true" )) {
+                        $nodeType = "f";
+                    }
+                    $fullList[$nodeType][$nodeName] = $node;
+                    $cursor ++;
+                }
+                if (isSet($httpVars["recursive"]) && $httpVars["recursive"] == "true") {
+
+                    $max_depth = (isSet($httpVars["max_depth"])?intval($httpVars["max_depth"]):0);
+                    $max_nodes = (isSet($httpVars["max_nodes"])?intval($httpVars["max_nodes"]):0);
+                    $crt_depth = (isSet($httpVars["crt_depth"])?intval($httpVars["crt_depth"])+1:1);
+                    $crt_nodes = (isSet($httpVars["crt_nodes"])?intval($httpVars["crt_nodes"]):0);
+                    $crt_nodes += $countFiles;
+
+                    $breakNow = false;
+                    if(isSet($max_depth) && $max_depth > 0 && $crt_depth >= $max_depth) $breakNow = true;
+                    if(isSet($max_nodes) && $max_nodes > 0 && $crt_nodes >= $max_nodes) $breakNow = true;
+                    /**
+                     * @var $nodeDir AJXP_Node
+                     */
+                    foreach ($fullList["d"] as &$nodeDir) {
+                        if($breakNow){
+                            $nodeDir->mergeMetadata(["ajxp_has_children" => $this->countChildren($nodeDir, false, true)?"true":"false"]);
+                            $nodesList->addBranch($nodeDir);
+                            continue;
+                        }
+                        $newBody = [
+                            "dir" => $nodeDir->getPath(),
+                            "options"=> $httpVars["options"],
+                            "recursive" => "true",
+                            "max_depth"=> $max_depth,
+                            "max_nodes"=> $max_nodes,
+                            "crt_depth"=> $crt_depth,
+                            "crt_nodes"=> $crt_nodes,
+                        ];
+                        $fakeRequest = Controller::executableRequest($request->getAttribute("ctx"), "ls", $newBody);
+                        $fakeRequest = $fakeRequest->withAttribute("parent_node_list", $nodesList);
+                        $this->switchAction($fakeRequest, new Response());
+                    }
+
+                } else {
+
+                    array_map([$nodesList, "addBranch"], $fullList["d"]);
+
+                }
+                array_map([$nodesList, "addBranch"], $fullList["z"]);
+                array_map([$nodesList, "addBranch"], $fullList["f"]);
+
+                // ADD RECYCLE BIN TO THE LIST
+                if ($dir == ""  && $lsOptions["d"] && RecycleBinManager::recycleEnabled() && $this->getContextualOption($ctx, "HIDE_RECYCLE") !== true) {
+                    $recycleBinOption = RecycleBinManager::getRelativeRecycle();
+                    $recycleNode = $selection->nodeForPath("/".$recycleBinOption);
+                    if (file_exists($recycleNode->getUrl())) {
+                        $recycleNode->loadNodeInfo();
+                        $nodesList->addBranch($recycleNode);
+                    }
+                }
+
+                $this->logDebug("LS Time : ".intval((microtime()-$startTime)*1000)."ms");
+
+                $parentList = $request->getAttribute("parent_node_list", null);
+                if($parentList !== null){
+                    $parentList->addBranch($nodesList);
+                }
+
+            break;
+        }
+
+
+        if(isSet($logMessage) || !$nodesDiffs->isEmpty() || isSet($nodesList)){
+            $body = new SerializableResponseStream();
+            if(isSet($logMessage)) {
+                $body->addChunk($logMessage);
+            }
+            if(!$nodesDiffs->isEmpty()) {
+                $body->addChunk($nodesDiffs);
+            }
+            if(isSet($nodesList)) {
+                $body->addChunk($nodesList);
+            }
+            $response = $response->withBody($body);
+        }
+
+    }
+
+    /**
+     * @param $nodes
+     * @param $path
+     * @param $orderField
+     * @param $orderDirection
+     * @return array
+     */
+    protected function orderNodes($nodes, $path, $orderField, $orderDirection){
+
+        usort($nodes, "strcasecmp");
+        if (!empty($orderField) && !empty($orderDirection) && $orderField == "ajxp_label" && $orderDirection == "desc") {
+            $nodes = array_reverse($nodes);
+        }
+        if (!empty($this->driverConf["SCANDIR_RESULT_SORTFONC"])) {
+            usort($nodes, $this->driverConf["SCANDIR_RESULT_SORTFONC"]);
+        }
+        if (!empty($orderField) && !empty($orderDirection) && $orderField != "ajxp_label") {
+            $toSort = [];
+            foreach ($nodes as $node) {
+                if($orderField == "filesize") $toSort[$node] = is_file($path."/".$node) ? filesize($path."/".$node) : 0;
+                else if($orderField == "ajxp_modiftime") $toSort[$node] = filemtime($path."/".$node);
+                else if($orderField == "mimestring") $toSort[$node] = pathinfo($node, PATHINFO_EXTENSION);
+            }
+            if($orderDirection == "asc") asort($toSort);
+            else arsort($toSort);
+            $nodes = array_keys($toSort);
+        }
+        return $nodes;
+
+    }
+
+    /**
+     * @param $optionString
+     * @return array
+     */
+    public function parseLsOptions($optionString)
+    {
+        // LS OPTIONS : dz , a, d, z, all of these with or without l
+        // d : directories
+        // z : archives
+        // f : files
+        // => a : all, alias to dzf
+        // l : list metadata
+        $allowed = ["a", "d", "z", "f", "l"];
+        $lsOptions = [];
+        foreach ($allowed as $key) {
+            if (strchr($optionString, $key)!==false) {
+                $lsOptions[$key] = true;
+            } else {
+                $lsOptions[$key] = false;
+            }
+        }
+        if ($lsOptions["a"]) {
+            $lsOptions["d"] = $lsOptions["z"] = $lsOptions["f"] = true;
+        }
+        return $lsOptions;
+    }
+
+    /**
+     * Update node metadata with core FS metadata.
+     * @param \Pydio\Access\Core\Model\AJXP_Node $ajxpNode
+     * @param bool $parentNode
+     * @param bool $details
+     * @return void
+     */
+    public function loadNodeInfo(&$ajxpNode, $parentNode = false, $details = false)
+    {
+        $nodeName = basename($ajxpNode->getPath());
+        $metaData = $ajxpNode->metadata;
+        if (!isSet($metaData["is_file"])) {
+            $isLeaf = is_file($ajxpNode->getUrl()) || StatHelper::isBrowsableArchive($nodeName);
+            $metaData["is_file"] = ($isLeaf?"1":"0");
+        } else {
+            $isLeaf = $metaData["is_file"] == "1" ? true : false;
+        }
+        $metaData["filename"] = $ajxpNode->getPath();
+
+        if (RecycleBinManager::recycleEnabled() && $ajxpNode->getPath() == RecycleBinManager::getRelativeRecycle()) {
+            $recycleIcon = ($this->countChildren($ajxpNode, false, true)>0?"trashcan_full.png":"trashcan.png");
+            $metaData["icon"] = $recycleIcon;
+            $metaData["fonticon"] = "delete";
+            $metaData["mimestring_id"] = 122;
+            //$ajxpNode->setLabel($mess[122]);
+            $metaData["ajxp_mime"] = "ajxp_recycle";
+        } else {
+            $mimeData = StatHelper::getMimeInfo($ajxpNode, !$isLeaf);
+            $metaData["mimestring_id"] = $mimeData[0];
+            $metaData["icon"] = $mimeData[1];
+            if(!empty($mimeData[2])){
+                $metaData["fonticon"] = $mimeData[2];
+            }
+            if ($metaData["icon"] == "folder.png") {
+                $metaData["openicon"] = "folder_open.png";
+            }
+            if (!$isLeaf) {
+                $metaData["ajxp_mime"] = "ajxp_folder";
+            }
+        }
+
+        $metaData["file_group"] = @filegroup($ajxpNode->getUrl()) || "unknown";
+        $metaData["file_owner"] = @fileowner($ajxpNode->getUrl()) || "unknown";
+        $metaData["ajxp_readonly"] = "false";
+        if (!@$this->isWriteable($ajxpNode)) {
+           $metaData["ajxp_readonly"] = "true";
+        }
+        $fPerms = @fileperms($ajxpNode->getUrl());
+        if ($fPerms !== false) {
+            $fPerms = substr(decoct( $fPerms ), ($isLeaf?2:1));
+        } else {
+            $fPerms = '0000';
+        }
+        $metaData["file_perms"] = $fPerms;
+        $datemodif = $this->date_modif($ajxpNode->getUrl());
+        $metaData["ajxp_modiftime"] = ($datemodif ? $datemodif : "0");
+        //$metaData["ajxp_description"] =$metaData["ajxp_relativetime"] = $mess[4]." ". StatHelper::relativeDate($datemodif, $mess);
+        $metaData["bytesize"] = 0;
+        if ($isLeaf) {
+            $metaData["bytesize"] = filesize($ajxpNode->getUrl());
+        }
+        //$metaData["filesize"] = StatHelper::roundSize($metaData["bytesize"]);
+        if (StatHelper::isBrowsableArchive($nodeName)) {
+            $metaData["ajxp_mime"] = "ajxp_browsable_archive";
+        }
+
+        if ($details == "minimal") {
+            $miniMeta = [
+                "is_file" => $metaData["is_file"],
+                "filename" => $metaData["filename"],
+                "bytesize" => $metaData["bytesize"],
+                "ajxp_modiftime" => $metaData["ajxp_modiftime"],
+            ];
+            $ajxpNode->mergeMetadata($miniMeta);
+        } else {
+            $ajxpNode->mergeMetadata($metaData);
+        }
+
+    }
+
+    /**
+     * Update nodes metadata with localized info (will NOT be cached)
+     * Hooked to node.info.nocache
+     * @param AJXP_Node $ajxpNode
+     * @param bool $parentNode
+     * @param bool $details
+     */
+    public function localizeNodeInfo(&$ajxpNode, $parentNode = false, $details = false){
+
+        $messages = LocaleService::getMessages();
+        $localMeta = [];
+
+        // Recompute "Modifed on ... " string
+        $currentMeta = $ajxpNode->getNodeInfoMeta();
+        if(!empty($currentMeta["ajxp_modiftime"])){
+            $dateModif = $currentMeta["ajxp_modiftime"];
+            $localMeta["ajxp_description"] = $localMeta["ajxp_relativetime"] = $messages[4]." ". StatHelper::relativeDate($dateModif, $messages);
+        }
+
+        // Recompute human readable size
+        if(!empty($currentMeta["bytesize"])){
+            $localMeta["filesize"] = StatHelper::roundSize($currentMeta["bytesize"]);
+        }
+
+        // Update Recycle Bin label
+        if ($currentMeta["ajxp_mime"] === "ajxp_recycle"){
+            $ajxpNode->setLabel($messages[122]);
+        }
+
+        // Now remerge in node
+        if(count($localMeta)){
+            $ajxpNode->mergeMetadata($localMeta);
+        }
+
+    }
+
+    /**
+     * @param array|UploadedFileInterface $uploadData Php-upload array
+     * @param String $destination Full path to destination file, including stream data
+     * @param array $messages Application messages table
+     * @return bool
+     * @throws \Exception
+     */
+    protected function copyUploadedData($uploadData, $destination, $messages){
+        if(is_array($uploadData)){
+            $isInputStream = isSet($uploadData["input_upload"]);
+            $newFileSize = $uploadData["size"];
+        }else{
+            $isInputStream = $uploadData->getStream() !== null;
+            $newFileSize = $uploadData->getSize();
+        }
+
+        if ($isInputStream) {
+            try {
+                $this->logDebug("Begining reading INPUT stream");
+                if(is_array($uploadData)){
+                    $input = fopen("php://input", "r");
+                }else{
+                    $input = $uploadData->getStream()->detach();
+                }
+                $output = fopen($destination, "w");
+                $sizeRead = 0;
+                while ($sizeRead < intval($newFileSize)) {
+                    $chunk = fread($input, 4096);
+                    $sizeRead += strlen($chunk);
+                    fwrite($output, $chunk, strlen($chunk));
+                }
+                fclose($input);
+                fclose($output);
+                $this->logDebug("End reading INPUT stream");
+            } catch (\Exception $e) {
+                throw new \Exception($e->getMessage(), 411);
+            }
+        } else {
+            if(is_array($uploadData)){
+                $result = @move_uploaded_file($uploadData["tmp_name"], $destination);
+                if (!$result) {
+                    $realPath = MetaStreamWrapper::getRealFSReference($destination);
+                    $result = move_uploaded_file($uploadData["tmp_name"], $realPath);
+                }
+            }else{
+                $clone = clone $uploadData;
+                try{
+                    $uploadData->moveTo($destination);
+                    $result = true;
+                }catch(\Exception $e){
+                    // Can be blocked by open_basedir, try to perform the move again, with the
+                    // real FS reference.
+                    $realPath = MetaStreamWrapper::getRealFSReference($destination);
+                    try{
+                        $clone->moveTo($realPath);
+                        $result = true;
+                    }catch(\Exception $e){
+                        $result = false;
+                    }
+                }
+            }
+            if (!$result) {
+                $errorMessage="$messages[33] ". PathUtils::forwardSlashBasename($destination);
+                throw new \Exception($errorMessage, 411);
+            }
+        }
+        return true;
+    }
+
+    /**
+     * @param String $folder Folder destination
+     * @param String $source Maybe updated by the function
+     * @param String $target Existing part to append data
+     * @return bool If the target file already existed or not.
+     * @throws \Exception
+     */
+    protected function appendUploadedData($folder, $source, $target){
+
+        $already_existed = false;
+        if($source == $target){
+            throw new \Exception("Something nasty happened: trying to copy $source into itself, it will create a loop!");
+        }
+        if (file_exists($folder ."/" . $target)) {
+            $already_existed = true;
+            $this->logDebug("Should copy stream from $source to $target");
+            $partO = fopen($folder."/".$source, "r");
+            $appendF = fopen($folder ."/". $target, "a+");
+            while (!feof($partO)) {
+                $buf = fread($partO, 1024);
+                fwrite($appendF, $buf, strlen($buf));
+            }
+            fclose($partO);
+            fclose($appendF);
+            $this->logDebug("Done, closing streams!");
+        }
+        @unlink($folder."/".$source);
+        return $already_existed;
+
+    }
+
+    /**
+     * @param AJXP_Node $dirNode
+     * @param bool $foldersOnly
+     * @param bool $nonEmptyCheckOnly
+     * @param null $dirHANDLE
+     * @return int
+     * @throws \Exception
+     */
+    public function countChildren(AJXP_Node $dirNode, $foldersOnly = false, $nonEmptyCheckOnly = false, $dirHANDLE = null)
+    {
+        $dirName = $dirNode->getUrl();
+        if(is_resource($dirHANDLE)){
+            $handle = $dirHANDLE;
+        }else{
+            $handle=@opendir($dirName);
+        }
+        if ($handle === false) {
+            throw new \Exception("Error while trying to open directory ".$dirName);
+        }
+        if ($foldersOnly && !$dirNode->wrapperIsRemote()) {
+            if($dirHANDLE == null || !is_resource($dirHANDLE)){
+                closedir($handle);
+            }
+            $path = $dirNode->getRealFile();
+            $dirs = glob($path."/*", GLOB_ONLYDIR|GLOB_NOSORT);
+            if($dirs === false) return 0;
+            return count($dirs);
+        }
+        $count = 0;
+        $showHiddenFiles = $this->getContextualOption($dirNode->getContext(), "SHOW_HIDDEN_FILES");
+        while (false !== ($file = readdir($handle))) {
+            if($file != "." && $file !=".."
+                && !(StatHelper::isHidden($file) && !$showHiddenFiles)){
+                if($foldersOnly && is_file($dirName."/".$file)) continue;
+                $count++;
+                if($nonEmptyCheckOnly) break;
+            }
+        }
+        if($dirHANDLE == null || !is_resource($dirHANDLE)){
+            closedir($handle);
+        }
+        return $count;
+    }
+
+    /**
+     * @param $file
+     * @return int
+     */
+    public function date_modif($file)
+    {
+        $tmp = @filemtime($file) or 0;
+        return $tmp;// date("d,m L Y H:i:s",$tmp);
+    }
+
+    /**
+     * @param $crtUrlBase
+     * @param $status
+     * @param $data
+     * @param null $taskId
+     * @return int
+     * @throws \Exception
+     */
+    public function extractArchiveItemPreCallback($crtUrlBase, $status, $data, $taskId = null){
+        $fullname = $data['filename'];
+        $size = $data['size'];
+        $realBase = MetaStreamWrapper::getRealFSReference($crtUrlBase);
+        $realBase = str_replace("\\", "/", $realBase);
+        $repoName = $crtUrlBase.str_replace($realBase, "", $fullname);
+
+        $toNode = new AJXP_Node($repoName);
+        $toNode->setLeaf($data['folder'] ? false:true);
+        if(file_exists($toNode->getUrl())){
+            Controller::applyHook("node.before_change", [$toNode, $size]);
+        }else{
+            Controller::applyHook("node.before_create", [$toNode, $size]);
+        }
+        return 1;
+    }
+
+    /**
+     * @param $crtUrlBase
+     * @param $status
+     * @param $data
+     * @param null $taskId
+     * @return int
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public function extractArchiveItemPostCallback($crtUrlBase, $status, $data, $taskId = null){
+        $fullname = $data['filename'];
+        $realBase = MetaStreamWrapper::getRealFSReference($crtUrlBase);
+        $repoName = str_replace($realBase, "", $fullname);
+        try{
+            $this->filterUserSelectionToHidden(AJXP_Node::contextFromUrl($crtUrlBase), [$repoName]);
+        }catch(\Exception $e){
+            @unlink($this->urlBase.$repoName);
+            return 1;
+        }
+        if($taskId !== null){
+            TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_RUNNING, "Extracted file ".$repoName);
+        }
+        $toNode = new AJXP_Node($crtUrlBase.$repoName);
+        $toNode->setLeaf($data['folder'] ? false:true);
+        Controller::applyHook("node.change", [null, $toNode, false]);
+        return 1;
+    }
+
+    /**
+     * Extract an archive directly inside the dest directory.
+     *
+     * @param string $destDir
+     * @param UserSelection $selection
+     * @param array $error
+     * @param array $success
+     * @param string $taskId
+     */
+    public function extractArchive($destDir, $selection, &$error, &$success, $taskId = null)
+    {
+        require_once(AJXP_BIN_FOLDER."/lib/pclzip.lib.php");
+        $zipPath = $selection->getZipPath(true);
+        $zipLocalPath = $selection->getZipLocalPath(true);
+        if(strlen($zipLocalPath)>1 && $zipLocalPath[0] == "/") $zipLocalPath = substr($zipLocalPath, 1)."/";
+        $files = $selection->getFiles();
+        $currentUrlBase = $selection->currentBaseUrl();
+
+        $realZipFile = MetaStreamWrapper::getRealFSReference($currentUrlBase.$zipPath);
+        $archive = new PclZip($realZipFile);
+        $content = $archive->listContent();
+        foreach ($files as $key => $item) {// Remove path
+            $item = substr($item, strlen($zipPath));
+            if($item[0] == "/") $item = substr($item, 1);
+            foreach ($content as $zipItem) {
+                if ($zipItem["stored_filename"] == $item || $zipItem["stored_filename"] == $item."/") {
+                    $files[$key] = $zipItem["stored_filename"];
+                    break;
+                } else {
+                    unset($files[$key]);
+                }
+            }
+        }
+        $this->logDebug("Archive", $this->addSlugToPath($files));
+        $realDestination = MetaStreamWrapper::getRealFSReference($currentUrlBase.$destDir);
+        $this->logDebug("Extract", [$realDestination, $realZipFile, $this->addSlugToPath($files), $zipLocalPath]);
+
+        $result = $archive->extract(PCLZIP_OPT_BY_NAME,     $files,
+                                    PCLZIP_OPT_PATH,        $realDestination,
+                                    PCLZIP_OPT_REMOVE_PATH, $zipLocalPath,
+                                    PCLZIP_CB_PRE_EXTRACT,  function($status, $data) use ($currentUrlBase, $taskId) { return $this->extractArchiveItemPreCallback($currentUrlBase, $status, $data, $taskId); },
+                                    PCLZIP_CB_POST_EXTRACT, function($status, $data) use ($currentUrlBase, $taskId) { return $this->extractArchiveItemPostCallback($currentUrlBase, $status, $data, $taskId); },
+                                    PCLZIP_OPT_STOP_ON_ERROR
+        );
+
+        if ($result <= 0) {
+            $error[] = $archive->errorInfo(true);
+        } else {
+            $mess = LocaleService::getMessages();
+            $success[] = sprintf($mess[368], basename($zipPath), $destDir);
+        }
+    }
+
+    /**
+     * @param string $destDir
+     * @param UserSelection $selection
+     * @param array $error
+     * @param array $success
+     * @param bool $move
+     * @param string|null $targetBaseName
+     * @param string|null $taskId
+     * @throws \Exception
+     */
+    public function copyOrMove($destDir, $selection, &$error, &$success, $move = false, $targetBaseName = null, $taskId = null)
+    {
+        $selectedNodes = $selection->buildNodes();
+        $selectedFiles = $selection->getFiles();
+        $this->logDebug("CopyMove", ["dest"=>$this->addSlugToPath($destDir), "selection" => $this->addSlugToPath($selectedFiles)]);
+        $mess = LocaleService::getMessages();
+        if (!$this->isWriteable($selection->nodeForPath($destDir))) {
+            $error[] = $mess[38]." ".$destDir." ".$mess[99];
+            return ;
+        }
+        $repoData = [
+            'base_url'      => $selection->currentBaseUrl(),
+            'chmod'         => $selection->getContext()->getRepository()->getContextOption($selection->getContext(), 'CHMOD_VALUE'),
+            'recycle'       => $selection->getContext()->getRepository()->getContextOption($selection->getContext(), 'RECYCLE_BIN')
+        ];
+        foreach ($selectedNodes as $selectedNode) {
+            $selectedFile = $selectedNode->getPath();
+            if ($move && !$this->isWriteable($selection->nodeForPath(PathUtils::forwardSlashDirname($selectedFile)))) {
+                $error[] = "\n".$mess[38]." ".PathUtils::forwardSlashDirname($selectedFile)." ".$mess[99];
+                continue;
+            }
+            if( !empty ($targetBaseName)){
+                $destFile = $destDir ."/" . $targetBaseName;
+            }else{
+                $bName = basename($selectedFile);
+                $localName = '';
+                Controller::applyHook("dl.localname", [$selectedNode, &$localName]);
+                if(!empty($localName)) $bName = $localName;
+                $destFile = $destDir ."/". $bName;
+            }
+            $this->copyOrMoveFile($destFile, $selectedFile, $error, $success, $move, $repoData, $repoData, $taskId);
+        }
+    }
+
+    /**
+     * @param AJXP_Node $originalNode
+     * @param AJXP_Node $dest
+     * @param string $filename_new
+     * @return AJXP_Node
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public function rename($originalNode, $dest = null, $filename_new = null)
+    {
+        $mess = LocaleService::getMessages();
+
+        if(!empty($filename_new)){
+            $filename_new= InputFilter::sanitize(InputFilter::magicDequote($filename_new), InputFilter::SANITIZE_FILENAME, true);
+            $filename_new = substr($filename_new, 0, ConfService::getContextConf($originalNode->getContext(), "NODENAME_MAX_LENGTH"));
+        }
+
+        if (empty($filename_new) && empty($dest)) {
+            throw new PydioException("$mess[37]");
+        }
+
+        if (!$this->isWriteable($originalNode)) {
+            throw new PydioException($mess[34]." ".$originalNode->getLabel()." ".$mess[99]);
+        }
+
+        if($dest == null) {
+            $newNode = $originalNode->getParent()->createChildNode($filename_new);
+        } else {
+            $newNode = $dest;
+        }
+        if (file_exists($newNode->getUrl())) {
+            throw new PydioException($newNode->getPath()." $mess[43]");
+        }
+        if (!file_exists($originalNode->getUrl())) {
+            throw new PydioException($mess[100]." ".$originalNode->getPath());
+        }
+        Controller::applyHook("node.before_path_change", [&$originalNode]);
+        $test = @rename($originalNode->getUrl(),$newNode->getUrl());
+        if($test === false){
+            throw new \Exception("Error while renaming ".$originalNode->getPath()." to ".$newNode->getPath());
+        }
+        Controller::applyHook("node.change", [$originalNode, $newNode, false]);
+        return $newNode;
+
+    }
+
+    /**
+     * @param $destination
+     * @param $fileName
+     * @return string
+     */
+    public static function autoRenameForDest($destination, $fileName)
+    {
+        if(!is_file($destination."/".$fileName)) return $fileName;
+        $i = 1;
+        $ext = "";
+        $split = explode(".", $fileName);
+        if (count($split) > 1) {
+            $ext = ".".$split[count($split)-1];
+            array_pop($split);
+            $name = join(".", $split);
+        } else {
+            $name = $fileName;
+        }
+        while (is_file($destination."/".$name."-$i".$ext)) {
+            $i++; // increment i until finding a non existing file.
+        }
+        return $name."-$i".$ext;
+    }
+
+    /**
+     * @param AJXP_Node $parentNode
+     * @param String $newDirName
+     * @param bool $ignoreExists
+     * @param bool $createRecursive
+     * @return AJXP_Node
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public function mkDir($parentNode, $newDirName, $ignoreExists = false, $createRecursive = false)
+    {
+        if(!file_exists($parentNode->getUrl()) && $createRecursive){
+            $this->mkDir($parentNode->getParent(), basename($parentNode->getUrl()), $ignoreExists, true);
+        }
+        Controller::applyHook("node.before_change", [&$parentNode]);
+
+        $mess = LocaleService::getMessages();
+        if ($newDirName=="") {
+            throw new PydioException($mess[37]);
+        }
+        if (file_exists($parentNode->getUrl()."/".$newDirName)) {
+            if($ignoreExists) {
+                return $parentNode->createChildNode($newDirName);
+            }
+            throw new PydioException($mess[40]);
+        }
+        if (!file_exists($parentNode->getUrl())){
+            throw new PydioException($mess[103]." ".$parentNode->getPath());
+        }
+        if (!$this->isWriteable($parentNode)) {
+            throw new PydioException($mess[38]." ".$parentNode->getPath()." ".$mess[99]);
+        }
+
+        $dirMode = 0775;
+        $ctx = $parentNode->getContext();
+        $chmodValue = $ctx->getRepository()->getContextOption($ctx, "CHMOD_VALUE");
+        if (isSet($chmodValue) && $chmodValue != "") {
+            $dirMode = octdec(ltrim($chmodValue, "0"));
+            if ($dirMode & 0400) $dirMode |= 0100; // User is allowed to read, allow to list the directory
+            if ($dirMode & 0040) $dirMode |= 0010; // Group is allowed to read, allow to list the directory
+            if ($dirMode & 0004) $dirMode |= 0001; // Other are allowed to read, allow to list the directory
+        }
+        $old = umask(0);
+        mkdir($parentNode->getUrl()."/".$newDirName, $dirMode);
+        umask($old);
+        $newNode =  $parentNode->createChildNode($newDirName);
+        $newNode->setLeaf(false);
+        Controller::applyHook("node.change", [null, $newNode, false]);
+        return $newNode;
+
+    }
+
+    /**
+     * @param AJXP_Node $node
+     * @param string $content
+     * @param bool $force
+     * @throws \Exception
+     */
+    public function createEmptyFile(AJXP_Node $node, $content = "", $force = false)
+    {
+        Controller::applyHook("node.before_change", [$node->getParent()]);
+        $mess = LocaleService::getMessages();
+
+        if (!$force && file_exists($node->getUrl())) {
+            throw new PydioException($mess[71], 71);
+        }
+        if (!$this->isWriteable($node->getParent())) {
+            throw new PydioException("$mess[38] ".$node->getParent()->getPath()." $mess[99]", 71);
+        }
+        $ctx = $node->getContext();
+        $repoData = [
+            'chmod'     => $ctx->getRepository()->getContextOption($ctx, 'CHMOD_VALUE'),
+            'recycle'   => $ctx->getRepository()->getContextOption($ctx, 'RECYCLE_BIN')
+        ];
+        $fp=fopen($node->getUrl(),"w");
+        if ($fp) {
+            if ($content != "") {
+                fputs($fp, $content);
+            }
+            $this->changeMode($node->getUrl(), $repoData);
+            fclose($fp);
+            $node->loadNodeInfo();
+            Controller::applyHook("node.change", [null, $node, false]);
+        } else {
+            throw new PydioException("$mess[102] ".$node->getPath()." (".$fp.")");
+        }
+    }
+
+
+    /**
+     * @param UserSelection $selection
+     * @param $logMessages
+     * @param null $taskId
+     * @return null
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public function delete(UserSelection $selection, &$logMessages, $taskId = null)
+    {
+        $ctx = $selection->getContext();
+        $repoData = [
+            'chmod'         => $ctx->getRepository()->getContextOption($ctx, 'CHMOD_VALUE'),
+            'recycle'       => $ctx->getRepository()->getContextOption($ctx, 'RECYCLE_BIN')
+        ];
+        $mess = LocaleService::getMessages();
+        $selectedNodes = $selection->buildNodes();
+        foreach ($selectedNodes as $selectedNode) {
+
+            $selectedNode->loadNodeInfo();
+            $fileUrl = $selectedNode->getUrl();
+            $filePath = $selectedNode->getPath();
+
+            if (!file_exists($fileUrl)) {
+                $logMessages[]=$mess[100]." ".$filePath;
+                continue;
+            }
+            $this->deldir($fileUrl, $repoData, $taskId);
+            if ($selectedNode->isLeaf()) {
+                $logMessages[]="$mess[38] ".$filePath." $mess[44].";
+            } else {
+                $logMessages[]="$mess[34] ".$filePath." $mess[44].";
+            }
+            Controller::applyHook("node.change", [$selectedNode]);
+        }
+        if($taskId != null){
+            TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_COMPLETE, "Done");
+            $nodesDiff = new NodesDiff();
+            $nodesDiff->remove($selection->getFiles());
+            $t = TaskService::getInstance()->getTaskById($taskId);
+            Controller::applyHook("msg.instant", [$t->getContext(), $nodesDiff->toXML()]);
+        }
+        return null;
+    }
+
+    /**
+     * @param $origFile
+     * @param $destFile
+     * @return bool
+     */
+    public function simpleCopy($origFile, $destFile)
+    {
+        return copy($origFile, $destFile);
+    }
+
+    /**
+     * @param AJXP_Node $node
+     * @return bool
+     */
+    public function isWriteable(AJXP_Node $node)
+    {
+        if ( $this->getContextualOption($node->getContext(), "USE_POSIX") == true && extension_loaded('posix')) {
+            $real = $node->getRealFile();
+            return posix_access($real, POSIX_W_OK);
+        }
+        //clearstatcache();
+        return is_writable($node->getUrl());
+    }
+
+    /**
+     * Change file permissions
+     *
+     * @param AJXP_Node $node
+     * @param String $chmodValue
+     * @param Boolean $recursive
+     * @param String $nodeType "both", "file", "dir"
+     * @param $changedFiles
+     * @return void
+     */
+    public function chmod(AJXP_Node $node, $chmodValue, $recursive, $nodeType, &$changedFiles)
+    {
+        $realValue = octdec(ltrim($chmodValue, "0"));
+        $nodeUrl = $node->getUrl();
+        if (is_file($nodeUrl)) {
+            if ($nodeType=="both" || $nodeType=="file") {
+                MetaStreamWrapper::changeMode($nodeUrl, $realValue);
+                $changedFiles[] = $node->getPath();
+            }
+        } else {
+            if ($nodeType=="both" || $nodeType=="dir") {
+                MetaStreamWrapper::changeMode($nodeUrl, $realValue);
+                $changedFiles[] = $node->getPath();
+            }
+            if ($recursive) {
+                $handler = opendir($nodeUrl);
+                while ($child=readdir($handler)) {
+                    if($child == "." || $child == "..") continue;
+                    // do not pass realValue or it will be re-decoded.
+                    $this->chmod($node->createChildNode($child), $chmodValue, $recursive, $nodeType, $changedFiles);
+                }
+                closedir($handler);
+            }
+        }
+    }
+
+    /**
+     * @param AJXP_Node $fromNode
+     * @param AJXP_Node $toNode
+     * @param Boolean $copy
+     */
+    public function nodeChanged(&$fromNode = null, &$toNode = null, $copy = false)
+    {
+        Controller::applyHook("node.change", [$fromNode, $toNode, $copy]);
+    }
+
+    /**
+     * @param AJXP_Node $node
+     * @param null $newSize
+     */
+    public function nodeWillChange($node, $newSize = null)
+    {
+        if ($newSize != null) {
+            Controller::applyHook("node.before_change", [$node, $newSize]);
+        } else {
+            Controller::applyHook("node.before_path_change", [$node]);
+        }
+    }
+
+
+    /**
+     * @param UserSelection $selection
+     * @param string $dest
+     * @param string $basedir
+     * @param string $taskId
+     * @throws \Exception
+     * @return PclZip
+     */
+    public function makeZip (UserSelection $selection, $dest, $basedir, $taskId = null)
+    {
+        $zipEncoding = ConfService::getContextConf($selection->getContext(), "ZIP_ENCODING");
+
+        @set_time_limit(0);
+        require_once(AJXP_BIN_FOLDER."/lib/pclzip.lib.php");
+        $filePaths = [];
+        $selectedNodes = $selection->buildNodes();
+        foreach ($selectedNodes as $node) {
+            $realFile = $node->getRealFile();
+            if (basename($node->getPath()) == "") {
+                $filePaths[] = [PCLZIP_ATT_FILE_NAME => $realFile];
+            } else {
+                $shortName = $node->getLabel();
+                if(!empty($zipEncoding)){
+                    $test = iconv(TextEncoder::getEncoding(), $zipEncoding, $shortName);
+                    if($test !== false) $shortName = $test;
+                }
+                $filePaths[] = [PCLZIP_ATT_FILE_NAME => $realFile,
+                                    PCLZIP_ATT_FILE_NEW_SHORT_NAME => $shortName];
+            }
+        }
+        $this->logDebug("Pathes", $filePaths);
+        $archive = new PclZip($dest);
+        $zipEncoding = ConfService::getContextConf($selection->getContext(), "ZIP_ENCODING");
+        $fsEncoding = TextEncoder::getEncoding();
+        $ctx = $selection->getContext();
+
+        $preAddCallback = function($value, &$header) use ($ctx, $taskId, $zipEncoding, $fsEncoding){
+            if($taskId !== null){
+                TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_RUNNING, "Adding ".$header["stored_filename"]." to archive");
+            }
+            $search = $header["filename"];
+            if(!empty($zipEncoding)){
+                $test = iconv($fsEncoding, $zipEncoding, $header["stored_filename"]);
+                if($test !== false){
+                    $header["stored_filename"] = $test;
+                }
+            }
+            return !($this->filterFile($ctx, $search, true) || $this->filterFolder($ctx, $search, "contains"));
+        };
+
+        if($basedir == "__AJXP_ZIP_FLAT__/"){
+            $vList = $archive->create($filePaths, PCLZIP_OPT_REMOVE_ALL_PATH, PCLZIP_OPT_NO_COMPRESSION, PCLZIP_OPT_ADD_TEMP_FILE_ON, PCLZIP_CB_PRE_ADD, $preAddCallback);
+        }else{
+            $basedir = MetaStreamWrapper::getRealFSReference($selection->currentBaseUrl()).trim($basedir);
+            $this->logDebug("Basedir", [$basedir]);
+            $vList = $archive->create($filePaths, PCLZIP_OPT_REMOVE_PATH, $basedir, PCLZIP_OPT_NO_COMPRESSION, PCLZIP_OPT_ADD_TEMP_FILE_ON, PCLZIP_CB_PRE_ADD, $preAddCallback);
+        }
+
+        if (!$vList) {
+            if($taskId !== null){
+                TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_FAILED, "Zip creation error : ($dest) ".$archive->errorInfo(true));
+            }
+            throw new \Exception("Zip creation error : ($dest) ".$archive->errorInfo(true));
+        }
+        return $vList;
+    }
+
+
+    /**
+     * @param $dirName
+     * @param $hardPurgeTime
+     * @param int $softPurgeTime
+     */
+    public function recursivePurge($dirName, $hardPurgeTime, $softPurgeTime = 0)
+    {
+        $handle=opendir($dirName);
+        $shareCenter = false;
+        if(class_exists("\\Pydio\\Share\\ShareCenter")){
+            $shareCenter = \Pydio\Share\ShareCenter::getShareCenter(AJXP_Node::contextFromUrl($dirName));
+        }
+        if($handle === false){
+            $this->logError(__FUNCTION__, "Cannot open folder ".$dirName);
+            return;
+        }
+        while (false !== ($entry = readdir($handle))) {
+            if ($entry == "" || $entry == ".."  || StatHelper::isHidden($entry)) {
+                continue;
+            }
+            $fileName = $dirName."/".$entry;
+            if (is_file($fileName)) {
+                $docAge = time() - filemtime($fileName);
+                if ($hardPurgeTime > 0 && $docAge > $hardPurgeTime) {
+                    $this->purge($fileName);
+                } elseif ($softPurgeTime > 0 && $docAge > $softPurgeTime) {
+                    if($shareCenter !== false && $shareCenter->isShared(new AJXP_Node($fileName))) {
+                        $this->purge($fileName);
+                    }
+                }
+            } else {
+                $this->recursivePurge($fileName, $hardPurgeTime, $softPurgeTime);
+            }
+        }
+        closedir($handle);
+    }
+
+    /**
+     * Apply specific operation to set a node as hidden.
+     * Can be overwritten, or will probably do nothing.
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     */
+    public function setHiddenAttribute($node){
+        if(MetaStreamWrapper::actualRepositoryWrapperClass($node) === "Pydio\\Access\\Driver\\StreamProvider\\FS\\FsAccessWrapper" && strtoupper(substr(PHP_OS, 0, 3)) === 'WIN'){
+            $realPath =  MetaStreamWrapper::getRealFSReference($node->getUrl());
+            @shell_exec("attrib +H " . escapeshellarg($realPath));
+        }
+    }
+
+    /**
+     * @param $fileName
+     * @throws \Exception
+     */
+    private function purge($fileName)
+    {
+        $node = new AJXP_Node($fileName);
+        Controller::applyHook("node.before_path_change", [$node]);
+        unlink($fileName);
+        Controller::applyHook("node.change", [$node]);
+        $this->logInfo("Purge", ["file" => $fileName, "files" => $fileName]);
+        print(" - Purging document : ".$fileName."\n");
+    }
+
+    /** The publiclet URL making */
+    public function makePublicletOptions($filePath, $password, $expire, $downloadlimit, $repository)
+    {
+        $data = [
+            "DRIVER"=>$repository->getAccessType(),
+            "OPTIONS"=>NULL,
+            "FILE_PATH"=>$filePath,
+            "ACTION"=>"download",
+            "EXPIRE_TIME"=>$expire ? (time() + $expire * 86400) : 0,
+            "DOWNLOAD_LIMIT"=>$downloadlimit ? $downloadlimit : 0,
+            "PASSWORD"=>$password
+        ];
+        return $data;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $httpVars
+     * @return array
+     * @throws \Exception
+     */
+    public function makeSharedRepositoryOptions(ContextInterface $ctx, $httpVars)
+    {
+        $repository = $ctx->getRepository();
+        $newOptions = [
+            "PATH"           => "AJXP_PARENT_OPTION:PATH:". InputFilter::decodeSecureMagic($httpVars["file"]),
+            "CREATE"         => $repository->getContextOption($ctx, "CREATE"),
+            "RECYCLE_BIN"    => isSet($httpVars["inherit_recycle"])? $repository->getContextOption($ctx, "RECYCLE_BIN") : "",
+            "DEFAULT_RIGHTS" => "",
+            "DATA_TEMPLATE"  => ""
+        ];
+        if ($repository->getContextOption($ctx, "USE_SESSION_CREDENTIALS") === true) {
+            $newOptions["ENCODED_CREDENTIALS"] = MemorySafe::getEncodedCredentialString();
+        }
+        $customData = [];
+        foreach ($httpVars as $key => $value) {
+            if (substr($key, 0, strlen("PLUGINS_DATA_")) == "PLUGINS_DATA_") {
+                $customData[substr($key, strlen("PLUGINS_DATA_"))] = $value;
+            }
+        }
+        if (count($customData)) {
+            $newOptions["PLUGINS_DATA"] = $customData;
+        }
+        if ($repository->getContextOption($ctx, "META_SOURCES")) {
+            $newOptions["META_SOURCES"] = $repository->getContextOption($ctx, "META_SOURCES");
+            foreach ($newOptions["META_SOURCES"] as $index => &$data) {
+                if (isSet($data["USE_SESSION_CREDENTIALS"]) && $data["USE_SESSION_CREDENTIALS"] === true) {
+                    $newOptions["META_SOURCES"][$index]["ENCODED_CREDENTIALS"] = MemorySafe::getEncodedCredentialString();
+                }
+            }
+            Controller::applyHook("workspace.share_metasources", [$ctx, &$newOptions["META_SOURCES"]]);
+        }
+        return $newOptions;
+    }
+
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/access.fs/FsAccessWrapper.php b/core/src/plugins/access.fs/FsAccessWrapper.php
new file mode 100644
index 0000000000..75463ad436
--- /dev/null
+++ b/core/src/plugins/access.fs/FsAccessWrapper.php
@@ -0,0 +1,627 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ *
+ */
+namespace Pydio\Access\Driver\StreamProvider\FS;
+
+use PclZip;
+
+use Pydio\Access\Core\IAjxpWrapper;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\UserSelection;
+
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\PathUtils;
+use Pydio\Core\Utils\Vars\UrlUtils;
+use Pydio\Core\Utils\TextEncoder;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Wrapper for a local filesystem
+ * @package AjaXplorer_Plugins
+ * @subpackage Access
+ */
+class FsAccessWrapper implements IAjxpWrapper
+{
+    /**
+     * FileHandle resource
+     *
+     * @var resource
+     */
+    protected $fp;
+    /**
+     * DirHandle resource
+     *
+     * @var resource
+     */
+    protected $dH;
+
+    /**
+     * If dH is not used but an array containing the listing
+     * instead. dH == -1 in that case.
+     *
+     * @var array()
+     */
+    protected static $currentListing;
+    protected static $currentListingKeys;
+    protected static $currentListingIndex;
+    protected static $currentFileKey;
+    protected static $crtZip;
+    protected $realPath;
+    protected static $lastRealSize;
+
+    /**
+     * Initialize the stream from the given path.
+     *
+     * @param string $path
+     * @param $streamType
+     * @param bool $storeOpenContext
+     * @param bool $skipZip
+     * @return mixed Real path or -1 if currentListing contains the listing : original path converted to real path
+     * @throws \Pydio\Core\Exception\PydioException
+     * @throws \Exception
+     */
+    protected static function initPath($path, $streamType, $storeOpenContext = false, $skipZip = false)
+    {
+        $path       = PathUtils::unPatchPathForBaseDir($path);
+        $url        = UrlUtils::safeParseUrl($path);
+        $node       = new AJXP_Node($path);
+        $repoObject = $node->getRepository();
+        $repoId     = $node->getRepositoryId();
+
+        if(!isSet($repoObject)) {
+            throw new \Exception("Cannot find repository with id ".$repoId);
+        }
+        $split = UserSelection::detectZip($url["path"]);
+        $insideZip = false;
+        if($split && $streamType == "file" && $split[1] != "/") $insideZip = true;
+        if($split && $streamType == "dir") $insideZip = true;
+        if($skipZip) $insideZip = false;
+
+        $resolvedOptions = self::getResolvedOptionsForNode($node);
+        $resolvedPath = realpath(TextEncoder::toStorageEncoding($resolvedOptions["PATH"]));
+
+        //var_dump($path);
+        //var_dump($skipZip);
+        // Inside a zip : copy the file to a tmp file and return a reference to it
+        if ($insideZip) {
+            $zipPath = $split[0];
+            $localPath = $split[1];
+            require_once(AJXP_BIN_FOLDER."/lib/pclzip.lib.php");
+            //print($streamType.$path);
+               if ($streamType == "file") {
+                   if (self::$crtZip == null ||  !is_array(self::$currentListingKeys)) {
+                       $tmpDir = ApplicationState::getAjxpTmpDir() . DIRECTORY_SEPARATOR . md5(time()-rand());
+                       mkdir($tmpDir);
+                       $tmpFileName = $tmpDir.DIRECTORY_SEPARATOR.basename($localPath);
+                       Logger::debug(__CLASS__,__FUNCTION__,"Tmp file $tmpFileName");
+                       register_shutdown_function(function () use($tmpDir, $tmpFileName){
+                           if(is_file($tmpFileName)) unlink($tmpFileName);
+                           if(is_dir($tmpDir)) rmdir($tmpDir);
+                       });
+                        $crtZip = new PclZip(InputFilter::securePath($resolvedPath . $zipPath));
+                        $content = $crtZip->listContent();
+                        if(is_array($content)){
+                            foreach ($content as $item) {
+                                $fName = InputFilter::securePath($item["stored_filename"]);
+                                if ($fName == $localPath || "/".$fName == $localPath) {
+                                    $localPath = $fName;
+                                    break;
+                                }
+                            }
+                        }
+                        $crtZip->extract(PCLZIP_OPT_BY_NAME, $localPath, PCLZIP_OPT_PATH, $tmpDir, PCLZIP_OPT_REMOVE_ALL_PATH);
+                        Logger::debug(__CLASS__,__FUNCTION__,"Extracted ".$path." to ".dirname($localPath));
+                        if($storeOpenContext) self::$crtZip = $crtZip;
+                        return $tmpFileName;
+                   } else {
+                       $key = basename($localPath);
+                       if (array_key_exists($key, self::$currentListing)) {
+                           self::$currentFileKey = $key;
+                           return -1;
+                       } else {
+                           throw new PydioException("Cannot find key");
+                       }
+                   }
+               } else {
+                $crtZip = new PclZip(InputFilter::securePath($resolvedPath . $zipPath));
+                $liste = $crtZip->listContent();
+                   if(!is_array($liste)) $liste = array();
+                if($storeOpenContext) self::$crtZip = $crtZip;
+                $folders = array(); $files = array();$builtFolders = array();
+                if($localPath[strlen($localPath)-1] != "/") $localPath.="/";
+                foreach ($liste as $item) {
+                    $stored = $item["stored_filename"];
+                    if($stored[0] != "/") $stored = "/".$stored;
+                    $pathPos = strpos($stored, $localPath);
+                    if ($pathPos !== false) {
+                        $afterPath = substr($stored, $pathPos+strlen($localPath));
+                        if ($afterPath != "" && substr_count($afterPath, "/") < 2) {
+                            $statValue = array();
+                            if (substr_count($afterPath, "/") == 0) {
+                                $statValue[2] = $statValue["mode"] = ($item["folder"]?00040555:0100555);
+                                $statValue[7] = $statValue["size"] = $item["size"];
+                                $statValue[8] = $statValue["atime"] = $item["mtime"];
+                                $statValue[9] = $statValue["mtime"] = $item["mtime"];
+                                $statValue[10] = $statValue["ctime"] = $item["mtime"];
+                                if (strpos($afterPath, "/") == strlen($afterPath)-1) {
+                                    $afterPath = substr($afterPath, 0, strlen($afterPath)-1);
+                                }
+                                //$statValue["filename"] = $zipPath.$localPath.$afterPath;
+                                if ($item["folder"]) {
+                                    $folders[$afterPath] = $statValue;
+                                } else {
+                                    $files[$afterPath] = $statValue;
+                                }
+                            } else {
+                                $arr = explode("/", $afterPath);
+                                $afterPath = array_shift($arr);
+                                if(isSet($folders[$afterPath]) || isSet($builtFolders[$afterPath])) continue;
+                                $statValue[2] = $statValue["mode"] = 00040555;
+                                $statValue[7] = $statValue["size"] = 0;
+                                $statValue[8] = $statValue["atime"] = $item["mtime"];
+                                $statValue[9] = $statValue["mtime"] = $item["mtime"];
+                                $statValue[10] = $statValue["ctime"] = $item["mtime"];
+                                $builtFolders[$afterPath] = $statValue;
+                            }
+                        }
+                    }
+                }
+                self::$currentListing = array_merge($folders, $builtFolders, $files);
+                self::$currentListingKeys = array_keys(self::$currentListing);
+                self::$currentListingIndex = 0;
+                return -1;
+               }
+        } else {
+            return $resolvedPath.$url["path"];
+        }
+    }
+
+    /**
+     * @param AJXP_Node $node
+     * @return array
+     */
+    public static function getResolvedOptionsForNode($node)
+    {
+        return [
+            "TYPE"      => "fs",
+            "PATH"      => $node->getRepository()->getContextOption($node->getContext(), "PATH"),
+            "CHARSET"   => TextEncoder::getEncoding()
+        ];
+    }
+
+    /**
+     * @param string $tmpDir
+     * @param string $tmpFile
+     */
+    public static function removeTmpFile($tmpDir, $tmpFile)
+    {
+        if(is_file($tmpFile)) unlink($tmpFile);
+        if(is_dir($tmpDir)) rmdir($tmpDir);
+    }
+
+    protected static function closeWrapper()
+    {
+        if (self::$crtZip != null) {
+            self::$crtZip = null;
+            self::$currentListing  = null;
+            self::$currentListingKeys = null;
+            self::$currentListingIndex = null;
+            self::$currentFileKey = null;
+        }
+    }
+
+    /**
+     * @param string $path
+     * @param bool $persistent
+     * @return mixed
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public static function getRealFSReference($path, $persistent = false)
+    {
+        if (self::$crtZip != null) {
+            $crtZip = self::$crtZip;
+            self::$crtZip = null;
+        }
+        $realPath = self::initPath($path, "file");
+        if (isSet($crtZip)) {
+            self::$crtZip = $crtZip;
+        } else {
+            self::closeWrapper();
+        }
+        return $realPath;
+    }
+
+    /**
+     * @return bool
+     */
+    public static function isRemote()
+    {
+        return false;
+    }
+
+    /**
+     * @param String $url
+     * @return bool
+     */
+    public static function isSeekable($url)
+    {
+        if(strpos($url, ".zip/") !== false) return false;
+        return true;
+    }
+
+    /**
+     * @param string $path
+     * @param resource $stream
+     */
+    public static function copyFileInStream($path, $stream)
+    {
+        $fp = fopen(self::getRealFSReference($path), "rb");
+        if(!is_resource($fp)) return;
+        while (!feof($fp)) {
+            if(!ini_get("safe_mode")) @set_time_limit(60);
+             $data = fread($fp, 4096);
+             fwrite($stream, $data, strlen($data));
+        }
+        fclose($fp);
+    }
+
+    /**
+     * @param string $path
+     * @param number $chmodValue
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public static function changeMode($path, $chmodValue)
+    {
+        $realPath = self::initPath($path, "file");
+        @chmod($realPath, $chmodValue);
+    }
+
+    /**
+     * Opens the strem
+     *
+     * @param String $path Maybe in the form "ajxp.fs://repositoryId/pathToFile"
+     * @param String $mode
+     * @param string $options
+     * @param resource $context
+     * @return bool
+     */
+    public function stream_open($path, $mode, $options, &$context)
+    {
+        try {
+            $this->realPath = InputFilter::securePath(self::initPath($path, "file"));
+        } catch (\Exception $e) {
+            Logger::error(__CLASS__,"stream_open", "Error while opening stream $path (".$e->getMessage().")");
+            return false;
+        }
+        if ($this->realPath == -1) {
+            $this->fp = -1;
+            return true;
+        } else {
+            $this->fp = fopen($this->realPath, $mode, $options);
+            return ($this->fp !== false);
+        }
+    }
+
+    /**
+     * @param int $offset
+     * @param int $whence
+     * @return bool
+     */
+    public function stream_seek($offset , $whence = SEEK_SET)
+    {
+        return fseek($this->fp, $offset, $whence);
+    }
+
+    /**
+     * @return int
+     */
+    public function stream_tell()
+    {
+        return ftell($this->fp);
+    }
+
+    /**
+     * @return array|mixed|null
+     */
+    public function stream_stat()
+    {
+        $PROBE_REAL_SIZE = ConfService::getConf("PROBE_REAL_SIZE");
+        if (is_resource($this->fp)) {
+            $statValue = fstat($this->fp);
+            FsAccessWrapper::$lastRealSize = false;
+            if ($statValue[2] > 0 && $PROBE_REAL_SIZE && !ini_get("safe_mode")) {
+                FsAccessWrapper::$lastRealSize = floatval(trim($this->getTrueSizeOnFileSystem($this->realPath)));
+            }
+            return $statValue;
+        }
+        if (is_resource($this->dH)) {
+            return fstat($this->dH);
+        }
+        if ($this->fp == -1) {
+            return self::$currentListing[self::$currentFileKey];
+        }
+        return null;
+    }
+
+    /**
+     * @param string $path
+     * @param int $flags
+     * @return array|null
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public function url_stat($path, $flags)
+    {
+        // File and zip case
+        $patchedPath = PathUtils::patchPathForBaseDir($path);
+        if (ini_get("open_basedir") && preg_match('/__ZIP_EXTENSION__/', $patchedPath)) {
+            // Zip Folder case
+            self::$lastRealSize = false;
+            $search = basename($path);
+            $realBase = $this->initPath(dirname($path), "dir");
+            if ($realBase == -1) {
+                if (array_key_exists($search, self::$currentListing)) {
+                    return self::$currentListing[$search];
+                }
+            }
+        }
+        if ($fp = @fopen($path, "r")) {
+            $stat = fstat($fp);
+            fclose($fp);
+            return $stat;
+        }
+        // Folder case
+        $real = $this->initPath($path, "dir", false, true);
+        if ($real!=-1 && is_dir($real)) {
+            return stat($real);
+        }
+        // Zip Folder case
+        $search = basename($path);
+        $realBase = $this->initPath(dirname($path), "dir");
+        if ($realBase == -1) {
+            if (array_key_exists($search, self::$currentListing)) {
+                return self::$currentListing[$search];
+            }
+        }
+        // 000 permission file
+        if ($real != -1 && is_file($real)) {
+            return stat($real);
+        }
+        // Handle symlinks!
+        if ($real != -1 && is_link($real)) {
+               $realFile = @readlink($real);
+               if (is_file($realFile) || is_dir($realFile)) {
+                   return stat($realFile);
+               } else {
+                // symlink is broken, delete it.
+                   @unlink($real);
+                   return null;
+               }
+           }
+
+        // Non existing file
+           return null;
+    }
+
+    /**
+     * @param string $from
+     * @param string $to
+     * @return bool
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public function rename($from, $to)
+    {
+        return rename($this->initPath($from, "file", false, true), $this->initPath($to, "file", false, true));
+    }
+
+    /**
+     * @param int $count
+     * @return string
+     */
+    public function stream_read($count)
+    {
+        return fread($this->fp, $count);
+    }
+
+    /**
+     * @param string $data
+     * @return int
+     */
+    public function stream_write($data)
+    {
+        fwrite($this->fp, $data, strlen($data));
+        return strlen($data);
+    }
+
+    /**
+     * @return bool
+     */
+    public function stream_eof()
+    {
+        return feof($this->fp);
+    }
+
+    public function stream_close()
+    {
+        if (isSet($this->fp) && $this->fp!=-1 && $this->fp!==false) {
+            fclose($this->fp);
+        }
+    }
+
+    /**
+     * 
+     */
+    public function stream_flush()
+    {
+        if (isSet($this->fp) && $this->fp!=-1 && $this->fp!==false) {
+            fflush($this->fp);
+        }
+    }
+
+    /**
+     * @param string $path
+     * @return bool
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public function unlink($path)
+    {
+        $this->realPath = $this->initPath($path, "file", false, true);
+        return unlink($this->realPath);
+    }
+
+    /**
+     * @param string $path
+     * @param int $options
+     * @return bool
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public function rmdir($path, $options)
+    {
+        $this->realPath = $this->initPath($path, "file", false, true);
+        return rmdir($this->realPath);
+    }
+
+    /**
+     * @param string $path
+     * @param int $mode
+     * @param int $options
+     * @return bool
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public function mkdir($path, $mode, $options)
+    {
+        return mkdir($this->initPath($path, "file"), $mode);
+    }
+
+    /**
+     * Readdir functions
+     *
+     * @param string $path
+     * @param int $options
+     * @return bool
+     */
+    public function dir_opendir ($path , $options )
+    {
+        $this->realPath = $this->initPath($path, "dir", true);
+        if (is_string($this->realPath)) {
+            $this->dH = @opendir($this->realPath);
+        } else if ($this->realPath == -1) {
+            $this->dH = -1;
+        }
+        return $this->dH !== false;
+    }
+
+    /**
+     * Close dir handle
+     */
+    public function dir_closedir  ()
+    {
+        $this->closeWrapper();
+        if ($this->dH == -1) {
+            return;
+        } else {
+            closedir($this->dH);
+        }
+    }
+
+    /**
+     * @return bool|string
+     */
+    public function dir_readdir ()
+    {
+        if ($this->dH == -1) {
+            if (isSet(self::$currentListingKeys[self::$currentListingIndex])) {
+                self::$currentListingIndex++;
+                return self::$currentListingKeys[self::$currentListingIndex - 1];
+            } else {
+                return false;
+            }
+        } else {
+            return readdir($this->dH);
+        }
+    }
+
+    /**
+     * 
+     */
+    public function dir_rewinddir ()
+    {
+        if ($this->dH == -1) {
+            self::$currentListingIndex = 0;
+        } else {
+            rewinddir($this->dH);
+        }
+    }
+
+    /**
+     * @return bool|float
+     */
+    public static function getLastRealSize()
+    {
+        if(empty(self::$lastRealSize)) return false;
+        return self::$lastRealSize;
+    }
+
+    /**
+     * @param $file
+     * @return float|string
+     */
+    protected function getTrueSizeOnFileSystem($file)
+    {
+        if (!(strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')) {
+            $cmd = "stat -L -c%s ".escapeshellarg($file);
+            $val = trim(`$cmd`);
+            if (!is_numeric($val) || $val == -1) {
+                // No stat on system
+                $cmd = "ls -1s --block-size=1 ".escapeshellarg($file);
+                $val = trim(`$cmd`);
+                if (strlen($val) == 0 || floatval($val) == 0) {
+                    // No block-size on system (probably busybox), try long output
+                    $cmd = "ls -l ".escapeshellarg($file)."";
+                    $arr = explode("/[\s]+/", `$cmd`);
+                    $val = trim($arr[4]);
+                    if (strlen($val) == 0 || floatval($val) == 0) {
+                        // Still not working, get a value at least, not 0...
+                        $val = sprintf("%u", filesize($file));
+                    }
+                }
+            }
+            return floatval($val);
+        } else if (class_exists("COM")) {
+            $fsobj = new \COM("Scripting.FileSystemObject");
+            $f = $fsobj->GetFile($file);
+            return floatval($f->Size);
+        } else if (is_file($file)) {
+            return exec('FOR %A IN ("'.$file.'") DO @ECHO %~zA');
+        } else return sprintf("%u", filesize($file));
+    }
+}
diff --git a/core/src/plugins/access.fs/class.fsAccessDriver.php b/core/src/plugins/access.fs/class.fsAccessDriver.php
deleted file mode 100644
index c8f5b91a0b..0000000000
--- a/core/src/plugins/access.fs/class.fsAccessDriver.php
+++ /dev/null
@@ -1,2145 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-
-// This is used to catch exception while downloading
-if (!function_exists('download_exception_handler')) {
-    function download_exception_handler($exception){}
-}
-/**
- * AJXP_Plugin to access a filesystem. Most "FS" like driver (even remote ones)
- * extend this one.
- * @package AjaXplorer_Plugins
- * @subpackage Access
- */
-class fsAccessDriver extends AbstractAccessDriver implements AjxpWrapperProvider
-{
-    /**
-    * @var Repository
-    */
-    public $repository;
-    public $driverConf;
-    protected $wrapperClassName;
-    protected $urlBase;
-
-    public function initRepository()
-    {
-        if (is_array($this->pluginConf)) {
-            $this->driverConf = $this->pluginConf;
-        } else {
-            $this->driverConf = array();
-        }
-        if ( $this->getFilteredOption("PROBE_REAL_SIZE", $this->repository) == true ) {
-            // PASS IT TO THE WRAPPER
-            ConfService::setConf("PROBE_REAL_SIZE", $this->getFilteredOption("PROBE_REAL_SIZE", $this->repository));
-        }
-        $create = $this->repository->getOption("CREATE");
-        $path = SystemTextEncoding::toStorageEncoding($this->repository->getOption("PATH"));
-        $recycle = $this->repository->getOption("RECYCLE_BIN");
-        $chmod = $this->repository->getOption("CHMOD_VALUE");
-        $this->detectStreamWrapper(true);
-        $this->urlBase = "pydio://".$this->repository->getId();
-
-
-        if ($create == true) {
-            if(!is_dir($path)) @mkdir($path, 0755, true);
-            if (!is_dir($path)) {
-                throw new AJXP_Exception("Cannot create root path for repository (".$this->repository->getDisplay()."). Please check repository configuration or that your folder is writeable!");
-            }
-            if ($recycle!= "" && !is_dir($path."/".$recycle)) {
-                @mkdir($path."/".$recycle);
-                if (!is_dir($path."/".$recycle)) {
-                    throw new AJXP_Exception("Cannot create recycle bin folder. Please check repository configuration or that your folder is writeable!");
-                } else {
-                    $this->setHiddenAttribute(new AJXP_Node($this->urlBase ."/".$recycle));
-                }
-            }
-            $dataTemplate = $this->repository->getOption("DATA_TEMPLATE");
-            if (!empty($dataTemplate) && is_dir($dataTemplate) && !is_file($path."/.ajxp_template")) {
-                $errs = array();$succ = array();
-                $repoData = array('base_url' => $this->urlBase, 'chmod' => $chmod, 'recycle' => $recycle);
-                $this->dircopy($dataTemplate, $path, $succ, $errs, false, false, $repoData, $repoData);
-                touch($path."/.ajxp_template");
-            }
-        } else {
-            if (!is_dir($path)) {
-                throw new AJXP_Exception("Cannot find base path for your repository! Please check the configuration!");
-            }
-        }
-        if ($recycle != "") {
-            RecycleBinManager::init($this->urlBase, "/".$recycle);
-        }
-    }
-
-    public function getResourceUrl($path)
-    {
-        return $this->urlBase.$path;
-    }
-
-    /**
-     * @param String $directoryPath
-     * @param Repository $repositoryResolvedOptions
-     * @return int
-     */
-    public function directoryUsage($directoryPath, $repositoryResolvedOptions){
-
-        $dir = $repositoryResolvedOptions["PATH"].$directoryPath;
-        $size = -1;
-        if ( ( PHP_OS == "WIN32" || PHP_OS == "WINNT" || PHP_OS == "Windows") && class_exists("COM") ) {
-            $obj = new COM ( 'scripting.filesystemobject' );
-            if ( is_object ( $obj ) ) {
-                $ref = $obj->getfolder ( $dir );
-                $size = floatval($ref->size);
-                $obj = null;
-            }
-        } else {
-            if((PHP_OS == "Darwin") || (PHP_OS == "FreeBSD")) $option = "-sk";
-            else $option = "-sb";
-            $cmd = '/usr/bin/du '.$option.' ' . escapeshellarg($dir);
-            $io = popen ( $cmd , 'r' );
-            $size = fgets ( $io, 4096);
-            $size = trim(str_replace($dir, "", $size));
-            $size =  floatval($size);
-            if((PHP_OS == "Darwin") || (PHP_OS == "FreeBSD")) $size = $size * 1024;
-            pclose ( $io );
-        }
-        if($size != -1){
-            return $size;
-        }else{
-            return $this->recursiveDirUsageByListing($directoryPath);
-        }
-
-    }
-
-    protected function recursiveDirUsageByListing($path){
-        $total_size = 0;
-        $files = scandir($path);
-
-        foreach ($files as $t) {
-            if (is_dir(rtrim($path, '/') . '/' . $t)) {
-                if ($t <> "." && $t <> "..") {
-                    $size = $this->recursiveDirUsageByListing(rtrim($path, '/') . '/' . $t);
-                    $total_size += $size;
-                }
-            } else {
-                $size = sprintf("%u", filesize(rtrim($path, '/') . '/' . $t));
-                $total_size += $size;
-            }
-        }
-        return $total_size;
-    }
-
-    public function redirectActionsToMethod(&$contribNode, $arrayActions, $targetMethod)
-    {
-        $actionXpath=new DOMXPath($contribNode->ownerDocument);
-        foreach ($arrayActions as $index => $value) {
-            $arrayActions[$index] = 'action[@name="'.$value.'"]/processing/serverCallback';
-        }
-        $procList = $actionXpath->query(implode(" | ", $arrayActions), $contribNode);
-        foreach ($procList as $node) {
-            $node->setAttribute("methodName", $targetMethod);
-        }
-    }
-
-    /**
-     * @param DOMNode $contribNode
-     */
-    public function disableArchiveBrowsingContributions(&$contribNode)
-    {
-        // Cannot use zip features on FTP !
-        // Remove "compress" action
-        $actionXpath=new DOMXPath($contribNode->ownerDocument);
-        $compressNodeList = $actionXpath->query('action[@name="compress"]|action[@name="compress_ui"]|action[@name="download_all"]', $contribNode);
-        if(!$compressNodeList->length) return ;
-        foreach($compressNodeList as $compressNodeAction){
-            $contribNode->removeChild($compressNodeAction);
-        }
-        // Disable "download" if selection is multiple
-        $nodeList = $actionXpath->query('action[@name="download"]/gui/selectionContext', $contribNode);
-        $selectionNode = $nodeList->item(0);
-        $values = array("dir" => "false", "unique" => "true");
-        foreach ($selectionNode->attributes as $attribute) {
-            if (isSet($values[$attribute->name])) {
-                $attribute->value = $values[$attribute->name];
-            }
-        }
-        $nodeList = $actionXpath->query('action[@name="download"]/processing/clientListener[@name="selectionChange"]', $contribNode);
-        $listener = $nodeList->item(0);
-        $listener->parentNode->removeChild($listener);
-        // Disable "Explore" action on files
-        $nodeList = $actionXpath->query('action[@name="ls"]/gui/selectionContext', $contribNode);
-        $selectionNode = $nodeList->item(0);
-        $values = array("file" => "false", "allowedMimes" => "");
-        foreach ($selectionNode->attributes as $attribute) {
-            if (isSet($values[$attribute->name])) {
-                $attribute->value = $values[$attribute->name];
-            }
-        }
-    }
-
-    protected function getNodesDiffArray()
-    {
-        return array("REMOVE" => array(), "ADD" => array(), "UPDATE" => array());
-    }
-
-    public function addSlugToPath($selection)
-    {
-        if (is_array($selection))
-            // As passed by Copy/Move
-            $orig_files = $selection;
-        elseif ((is_object($selection)) && (isset($selection->files)) && (is_array($selection->files)))
-            // As passed by Download
-            $orig_files = $selection->files;
-        elseif (is_string($selection))
-            // As passed by destination parameter
-            return $this->repository->slug.$selection;
-        else
-            // Unrecognized
-            return $selection;
-
-        $files = array();
-        foreach ($orig_files as $file)
-            $files[] = $this->repository->slug.$file;
-        return $files;
-    }
-
-    public function switchAction($action, $httpVars, $fileVars)
-    {
-        parent::accessPreprocess($action, $httpVars, $fileVars);
-        $selection = new UserSelection($this->repository);
-        $dir = AJXP_Utils::sanitize($httpVars["dir"], AJXP_SANITIZE_DIRNAME) OR "";
-        if (AJXP_MetaStreamWrapper::actualRepositoryWrapperClass($this->repository->getId()) == "fsAccessWrapper") {
-            $dir = fsAccessWrapper::patchPathForBaseDir($dir);
-        }
-        $dir = AJXP_Utils::securePath($dir);
-        if ($action != "upload") {
-            $dir = AJXP_Utils::decodeSecureMagic($dir);
-        }
-        $selection->initFromHttpVars($httpVars);
-        if (!$selection->isEmpty()) {
-            $this->filterUserSelectionToHidden($selection->getFiles());
-        }
-        $mess = ConfService::getMessages();
-
-        $newArgs = RecycleBinManager::filterActions($action, $selection, $dir, $httpVars);
-        if(isSet($newArgs["action"])) $action = $newArgs["action"];
-        if(isSet($newArgs["dest"])) $httpVars["dest"] = SystemTextEncoding::toUTF8($newArgs["dest"]);//Re-encode!
-         // FILTER DIR PAGINATION ANCHOR
-        $page = null;
-        if (isSet($dir) && strstr($dir, "%23")!==false) {
-            $parts = explode("%23", $dir);
-            $dir = $parts[0];
-            $page = $parts[1];
-        }
-
-        $pendingSelection = "";
-        $logMessage = null;
-        $reloadContextNode = false;
-
-        switch ($action) {
-            //------------------------------------
-            //	DOWNLOAD
-            //------------------------------------
-            case "download":
-                $this->logInfo("Download", array("files"=>$this->addSlugToPath($selection)));
-                @set_error_handler(array("HTMLWriter", "javascriptErrorHandler"), E_ALL & ~ E_NOTICE);
-                @register_shutdown_function("restore_error_handler");
-                $zip = false;
-                if ($selection->isUnique()) {
-                    if (is_dir($this->urlBase.$selection->getUniqueFile())) {
-                        $zip = true;
-                        $base = basename($selection->getUniqueFile());
-                        $uniqDir = dirname($selection->getUniqueFile());
-                        if(!empty($uniqDir) && $uniqDir != "/"){
-                            $dir = dirname($selection->getUniqueFile());
-                        }
-                    } else {
-                        if (!file_exists($this->urlBase.$selection->getUniqueFile())) {
-                            throw new Exception("Cannot find file!");
-                        }
-                    }
-                    $node = $selection->getUniqueNode();
-                } else {
-                    $zip = true;
-                    $base = basename(dirname($selection->getUniqueFile()));
-                }
-                if ($zip) {
-                    $localName = (empty($base)?"Files":$base).".zip";
-                    if(isSet($httpVars["archive_name"])){
-                       	$localName = AJXP_Utils::decodeSecureMagic($httpVars["archive_name"]);
-                    }
-                    if ($this->getFilteredOption("ZIP_ON_THE_FLY", $this->repository)) {
-                        // Make a zip on the fly and send stream as download
-                        $this->prepareReadStream("force-download", $localName);
-                        $zipFile = $this->makeZip($selection->getFiles(), "php://output", empty($dir)?"/":$dir);
-                        if(!$zipFile) throw new AJXP_Exception("Error while compressing");
-                    } else {
-                        // Make a temp zip and send it as download
-                        $loggedUser = AuthService::getLoggedUser();
-                        $file = AJXP_Utils::getAjxpTmpDir()."/".($loggedUser?$loggedUser->getId():"shared")."_".time()."tmpDownload.zip";
-                        $zipFile = $this->makeZip($selection->getFiles(), $file, empty($dir)?"/":$dir);
-                        if(!$zipFile) throw new AJXP_Exception("Error while compressing");
-                        if(!$this->getFilteredOption("USE_XSENDFILE", $this->repository)
-                            && !$this->getFilteredOption("USE_XACCELREDIRECT", $this->repository)){
-                            register_shutdown_function("unlink", $file);
-                        }
-                        $this->readFile($file, "force-download", $localName, false, false, true);
-                    }
-                } else {
-                    $localName = "";
-                    AJXP_Controller::applyHook("dl.localname", array($this->urlBase.$selection->getUniqueFile(), &$localName));
-                    $this->readFile($this->urlBase.$selection->getUniqueFile(), "force-download", $localName);
-                }
-                if (isSet($node)) {
-                    AJXP_Controller::applyHook("node.read", array(&$node));
-                }
-
-
-                break;
-
-            case "prepare_chunk_dl" :
-
-                $chunkCount = intval($httpVars["chunk_count"]);
-                $node = $selection->getUniqueNode();
-
-                $fileId = $node->getUrl();
-                $sessionKey = "chunk_file_".md5($fileId.time());
-                $totalSize = filesize($fileId);
-                $chunkSize = intval ( $totalSize / $chunkCount );
-                $realFile  = AJXP_MetaStreamWrapper::getRealFSReference($fileId, true);
-                $chunkData = array(
-                    "localname"	  => basename($fileId),
-                    "chunk_count" => $chunkCount,
-                    "chunk_size"  => $chunkSize,
-                    "total_size"  => $totalSize,
-                    "file_id"	  => $sessionKey
-                );
-
-                $_SESSION[$sessionKey] = array_merge($chunkData, array("file"=>$realFile));
-                HTMLWriter::charsetHeader("application/json");
-                print(json_encode($chunkData));
-
-                AJXP_Controller::applyHook("node.read", array(&$node));
-
-                break;
-
-            case "download_chunk" :
-
-                $chunkIndex = intval($httpVars["chunk_index"]);
-                $chunkKey = $httpVars["file_id"];
-                $sessData = $_SESSION[$chunkKey];
-                $realFile = $sessData["file"];
-                $chunkSize = $sessData["chunk_size"];
-                $offset = $chunkSize * $chunkIndex;
-                if ($chunkIndex == $sessData["chunk_count"]-1) {
-                    // Compute the last chunk real length
-                    $chunkSize = $sessData["total_size"] - ($chunkSize * ($sessData["chunk_count"]-1));
-                    if (AJXP_MetaStreamWrapper::wrapperIsRemote($this->urlBase)) {
-                        register_shutdown_function("unlink", $realFile);
-                    }
-                }
-                $this->readFile($realFile, "force-download", $sessData["localname"].".".sprintf("%03d", $chunkIndex+1), false, false, true, $offset, $chunkSize);
-
-
-            break;
-
-            case "compress" :
-                    // Make a temp zip and send it as download
-                    $loggedUser = AuthService::getLoggedUser();
-                    if (isSet($httpVars["archive_name"])) {
-                        $localName = AJXP_Utils::decodeSecureMagic($httpVars["archive_name"]);
-                        $this->filterUserSelectionToHidden(array($localName));
-                    } else {
-                        $localName = (basename($dir)==""?"Files":basename($dir)).".zip";
-                    }
-                    $file = AJXP_Utils::getAjxpTmpDir()."/".($loggedUser?$loggedUser->getId():"shared")."_".time()."tmpCompression.zip";
-                    if(isSet($httpVars["compress_flat"])) $baseDir = "__AJXP_ZIP_FLAT__/";
-                    else $baseDir = $dir;
-                    $zipFile = $this->makeZip($selection->getFiles(), $file, $baseDir);
-                    if(!$zipFile) throw new AJXP_Exception("Error while compressing file $localName");
-                    register_shutdown_function("unlink", $file);
-                    $tmpFNAME = $this->urlBase.$dir."/".str_replace(".zip", ".tmp", $localName);
-                    copy($file, $tmpFNAME);
-                    try {
-                        AJXP_Controller::applyHook("node.before_create", array(new AJXP_Node($tmpFNAME), filesize($tmpFNAME)));
-                    } catch (Exception $e) {
-                        @unlink($tmpFNAME);
-                        throw $e;
-                    }
-                    @rename($tmpFNAME, $this->urlBase.$dir."/".$localName);
-                    AJXP_Controller::applyHook("node.change", array(null, new AJXP_Node($this->urlBase.$dir."/".$localName), false));
-                    //$reloadContextNode = true;
-                    //$pendingSelection = $localName;
-                    $newNode = new AJXP_Node($this->urlBase.$dir."/".$localName);
-                    if(!isset($nodesDiffs)) $nodesDiffs = $this->getNodesDiffArray();
-                    $nodesDiffs["ADD"][] = $newNode;
-            break;
-
-            case "stat" :
-                clearstatcache();
-                header("Content-type:application/json");
-                if($selection->isUnique()){
-                    $stat = @stat($this->urlBase.$selection->getUniqueFile());
-                    if (!$stat || !is_readable($selection->getUniqueNode()->getUrl())) {
-                        print '{}';
-                    } else {
-                        print json_encode($stat);
-                    }
-                }else{
-                    $files = $selection->getFiles();
-                    print '{';
-                    foreach($files as $index => $path){
-                        $stat = @stat($this->urlBase.$path);
-                        if(!$stat || !is_readable($this->urlBase.$path)) $stat = '{}';
-                        else $stat = json_encode($stat);
-                        print json_encode($path).':'.$stat . (($index < count($files) -1) ? "," : "");
-                    }
-                    print '}';
-                }
-
-            break;
-
-
-            //------------------------------------
-            //	ONLINE EDIT
-            //------------------------------------
-            case "get_content":
-
-                $node = $selection->getUniqueNode();
-                $dlFile = $node->getUrl();
-                if(!is_readable($dlFile)){
-                    throw new Exception("Cannot access file!");
-                }
-                $this->logInfo("Get_content", array("files"=>$this->addSlugToPath($selection)));
-                if (AJXP_Utils::getStreamingMimeType(basename($dlFile))!==false) {
-                    $this->readFile($node->getUrl(), "stream_content");
-                } else {
-                    $this->readFile($node->getUrl(), "plain");
-                }
-                AJXP_Controller::applyHook("node.read", array(&$node));
-
-                break;
-
-            case "put_content":
-                if(!isset($httpVars["content"])) break;
-                // Load "code" variable directly from POST array, do not "securePath" or "sanitize"...
-                $code = $httpVars["content"];
-                $currentNode = $selection->getUniqueNode();
-                $fileName = $currentNode->getUrl();
-                $this->logInfo("Online Edition", array("files"=> $this->addSlugToPath($fileName)));
-                if (isSet($httpVars["encode"]) && $httpVars["encode"] == "base64") {
-                    $code = base64_decode($code);
-                } else {
-                    $code=str_replace("&lt;","<",SystemTextEncoding::magicDequote($code));
-                }
-                try {
-                    AJXP_Controller::applyHook("node.before_change", array(&$currentNode, strlen($code)));
-                } catch (Exception $e) {
-                    header("Content-Type:text/plain");
-                    print $e->getMessage();
-                    break;
-                }
-                if (!is_file($fileName) || !$this->isWriteable($fileName, "file")) {
-                    header("Content-Type:text/plain");
-                    print((!$this->isWriteable($fileName, "file")?"1001":"1002"));
-                    break;
-                }
-                $fp=fopen($fileName,"w");
-                fputs ($fp,$code);
-                fclose($fp);
-                clearstatcache(true, $fileName);
-                AJXP_Controller::applyHook("node.change", array($currentNode, $currentNode, false));
-                header("Content-Type:text/plain");
-                print($mess[115]);
-
-            break;
-
-            //------------------------------------
-            //	COPY / MOVE
-            //------------------------------------
-            case "copy":
-            case "move":
-
-                if ($selection->isEmpty()) {
-                    throw new AJXP_Exception("", 113);
-                }
-                $loggedUser = AuthService::getLoggedUser();
-                if($loggedUser != null && !$loggedUser->canWrite(ConfService::getCurrentRepositoryId())){
-                    throw new AJXP_Exception("You are not allowed to write", 207);
-                }
-                $success = $error = array();
-                $dest = AJXP_Utils::decodeSecureMagic($httpVars["dest"]);
-                $this->filterUserSelectionToHidden(array($httpVars["dest"]));
-                if ($selection->inZip()) {
-                    // Set action to copy anycase (cannot move from the zip).
-                    $action = "copy";
-                    $this->extractArchive($dest, $selection, $error, $success);
-                } else {
-                    $move = ($action == "move" ? true : false);
-                    if ($move && isSet($httpVars["force_copy_delete"])) {
-                        $move = false;
-                    }
-                    $this->copyOrMove($dest, $selection->getFiles(), $error, $success, $move);
-
-                }
-
-                if (count($error)) {
-                    throw new AJXP_Exception(SystemTextEncoding::toUTF8(join("\n", $error)));
-                } else {
-                    if (isSet($httpVars["force_copy_delete"])) {
-                        $errorMessage = $this->delete($selection->getFiles(), $logMessages);
-                        if($errorMessage) throw new AJXP_Exception(SystemTextEncoding::toUTF8($errorMessage));
-                        $this->logInfo("Copy/Delete", array("files"=>$this->addSlugToPath($selection), "destination" => $this->addSlugToPath($dest)));
-                    } else {
-                        $this->logInfo(($action=="move"?"Move":"Copy"), array("files"=>$this->addSlugToPath($selection), "destination"=>$this->addSlugToPath($dest)));
-                    }
-                    $logMessage = join("\n", $success);
-                }
-                if(!isSet($nodesDiffs)) $nodesDiffs = $this->getNodesDiffArray();
-                // Assume new nodes are correctly created
-                $selectedItems = $selection->getFiles();
-                foreach ($selectedItems as $selectedPath) {
-                    $newPath = $this->urlBase.$dest ."/". basename($selectedPath);
-                    $newNode = new AJXP_Node($newPath);
-                    $nodesDiffs["ADD"][] = $newNode;
-                    if($action == "move") $nodesDiffs["REMOVE"][] = $selectedPath;
-                }
-                if (!(RecycleBinManager::getRelativeRecycle() ==$dest && $this->getFilteredOption("HIDE_RECYCLE", $this->repository) == true)) {
-                    //$reloadDataNode = $dest;
-                }
-
-            break;
-
-            //------------------------------------
-            //	DELETE
-            //------------------------------------
-            case "delete":
-
-                if ($selection->isEmpty()) {
-                    throw new AJXP_Exception("", 113);
-                }
-                $logMessages = array();
-                $errorMessage = $this->delete($selection->getFiles(), $logMessages);
-                if (count($logMessages)) {
-                    $logMessage = join("\n", $logMessages);
-                }
-                if($errorMessage) throw new AJXP_Exception(SystemTextEncoding::toUTF8($errorMessage));
-                $this->logInfo("Delete", array("files"=>$this->addSlugToPath($selection)));
-                if(!isSet($nodesDiffs)) $nodesDiffs = $this->getNodesDiffArray();
-                $nodesDiffs["REMOVE"] = array_merge($nodesDiffs["REMOVE"], $selection->getFiles());
-
-            break;
-
-
-            case "purge" :
-
-
-                $hardPurgeTime = intval($this->repository->getOption("PURGE_AFTER"))*3600*24;
-                $softPurgeTime = intval($this->repository->getOption("PURGE_AFTER_SOFT"))*3600*24;
-                $shareCenter = AJXP_PluginsService::findPluginById('action.share');
-                if( !($shareCenter && $shareCenter->isEnabled()) ) {
-                    //action.share is disabled, don't look at the softPurgeTime
-                    $softPurgeTime = 0;
-                }
-                if ($hardPurgeTime > 0 || $softPurgeTime > 0) {
-                    $this->recursivePurge($this->urlBase, $hardPurgeTime, $softPurgeTime);
-                }
-
-            break;
-
-            //------------------------------------
-            //	RENAME
-            //------------------------------------
-            case "rename":
-
-                $file = $selection->getUniqueFile();
-                $filename_new = AJXP_Utils::decodeSecureMagic($httpVars["filename_new"]);
-                $dest = null;
-                if (isSet($httpVars["dest"])) {
-                    $dest = AJXP_Utils::decodeSecureMagic($httpVars["dest"]);
-                    $filename_new = "";
-                }
-                $this->filterUserSelectionToHidden(array($filename_new));
-                $this->rename($file, $filename_new, $dest);
-                $logMessage= SystemTextEncoding::toUTF8($file)." $mess[41] ".SystemTextEncoding::toUTF8($filename_new);
-                //$reloadContextNode = true;
-                //$pendingSelection = $filename_new;
-                if(!isSet($nodesDiffs)) $nodesDiffs = $this->getNodesDiffArray();
-                if($dest == null) $dest = AJXP_Utils::safeDirname($file);
-                $nodesDiffs["UPDATE"][$file] = new AJXP_Node($this->urlBase.$dest."/".$filename_new);
-                $this->logInfo("Rename", array("files"=>$this->addSlugToPath($file), "original"=>$this->addSlugToPath($file), "new"=>$filename_new));
-
-            break;
-
-            //------------------------------------
-            //	CREER UN REPERTOIRE / CREATE DIR
-            //------------------------------------
-            case "mkdir":
-
-                $messtmp="";
-                $files = $selection->getFiles();
-                if(isSet($httpVars["dirname"])){
-                    $files[] = $dir ."/". AJXP_Utils::decodeSecureMagic($httpVars["dirname"], AJXP_SANITIZE_FILENAME);
-                }
-                if(!isSet($nodesDiffs)) $nodesDiffs = $this->getNodesDiffArray();
-                $messages = array();
-                $errors = array();
-                $max_length = ConfService::getCoreConf("NODENAME_MAX_LENGTH");
-                foreach($files as $newDirPath){
-                    $parentDir = AJXP_Utils::safeDirname($newDirPath);
-                    $basename = AJXP_Utils::safeBasename($newDirPath);
-                    $basename = substr($basename, 0, $max_length);
-                    $this->filterUserSelectionToHidden(array($basename));
-                    try{
-                        AJXP_Controller::applyHook("node.before_create", array(new AJXP_Node($parentDir."/".$basename), -2));
-                    }catch (AJXP_Exception $e){
-                        $errors[] = $e->getMessage();
-                        continue;
-                    }
-                    $error = $this->mkDir($parentDir, $basename, isSet($httpVars["ignore_exists"])?true:false);
-                    if (isSet($error)) {
-                        //throw new AJXP_Exception($error);
-                        $errors[] = $error;
-                        continue;
-                    }
-                    $messtmp.="$mess[38] ".SystemTextEncoding::toUTF8($basename)." $mess[39] ";
-                    if ($parentDir=="") {$messtmp.="/";} else {$messtmp.= SystemTextEncoding::toUTF8($parentDir);}
-                    $messages[] = $messtmp;
-                    $newNode = new AJXP_Node($this->urlBase.$parentDir."/".$basename);
-                    array_push($nodesDiffs["ADD"], $newNode);
-                    $this->logInfo("Create Dir", array("dir"=>$this->addSlugToPath($parentDir)."/".$basename, "files"=>$this->addSlugToPath($parentDir)."/".$basename));
-                }
-                if(count($errors)){
-                    if(!count($messages)){
-                        throw new AJXP_Exception(implode('', $errors));
-                    }else{
-                        $errorMessage = implode("<br>", $errors);
-                    }
-                }
-                $logMessage = implode("<br>", $messages);
-
-
-            break;
-
-            //------------------------------------
-            //	CREER UN FICHIER / CREATE FILE
-            //------------------------------------
-            case "mkfile":
-
-                $messtmp="";
-                if(empty($httpVars["filename"]) && isSet($httpVars["node"])){
-                    $filename=AJXP_Utils::decodeSecureMagic($httpVars["node"]);
-                }else{
-                    $filename=AJXP_Utils::decodeSecureMagic($httpVars["filename"], AJXP_SANITIZE_FILENAME);
-                }
-                $filename = substr($filename, 0, ConfService::getCoreConf("NODENAME_MAX_LENGTH"));
-                $this->filterUserSelectionToHidden(array($filename));
-                $content = "";
-                if (isSet($httpVars["content"])) {
-                    $content = $httpVars["content"];
-                }
-                $forceCreation = false;
-                if (isSet($httpVars["force"]) && $httpVars["force"] == "true"){
-                    $forceCreation = true;
-                }
-                $error = $this->createEmptyFile($dir, $filename, $content, $forceCreation);
-                if (isSet($error)) {
-                    throw new AJXP_Exception($error);
-                }
-                $messtmp.="$mess[34] ".SystemTextEncoding::toUTF8($filename)." $mess[39] ";
-                if ($dir=="") {$messtmp.="/";} else {$messtmp.=SystemTextEncoding::toUTF8($dir);}
-                $logMessage = $messtmp;
-                //$reloadContextNode = true;
-                //$pendingSelection = $dir."/".$filename;
-                $this->logInfo("Create File", array("files"=>$this->addSlugToPath($dir)."/".$filename));
-                $newNode = new AJXP_Node($this->urlBase.$dir."/".$filename);
-                if(!isSet($nodesDiffs)) $nodesDiffs = $this->getNodesDiffArray();
-                array_push($nodesDiffs["ADD"], $newNode);
-
-            break;
-
-            //------------------------------------
-            //	CHANGE FILE PERMISSION
-            //------------------------------------
-            case "chmod":
-
-                $files = $selection->getFiles();
-                $changedFiles = array();
-                $chmod_value = $httpVars["chmod_value"];
-                $recursive = $httpVars["recursive"];
-                $recur_apply_to = $httpVars["recur_apply_to"];
-                foreach ($files as $fileName) {
-                    $this->chmod($fileName, $chmod_value, ($recursive=="on"), ($recursive=="on"?$recur_apply_to:"both"), $changedFiles);
-                }
-                $logMessage="Successfully changed permission to ".$chmod_value." for ".count($changedFiles)." files or folders";
-                $this->logInfo("Chmod", array("dir"=>$this->addSlugToPath($dir), "files"=>$this->addSlugToPath($dir), "filesCount"=>count($changedFiles)));
-                if(!isSet($nodesDiffs)) $nodesDiffs = $this->getNodesDiffArray();
-                $nodesDiffs["UPDATE"] = array_merge($nodesDiffs["UPDATE"], $selection->buildNodes());
-
-            break;
-
-            //------------------------------------
-            //	UPLOAD
-            //------------------------------------
-            case "upload":
-
-                $repoData = array(
-                    'base_url' => $this->urlBase,
-                    'chmod'     => $this->repository->getOption('CHMOD_VALUE'),
-                    'recycle'     => $this->repository->getOption('RECYCLE_BIN')
-                );
-                $this->logDebug("Upload Files Data", $fileVars);
-                $destination=$this->urlBase.AJXP_Utils::decodeSecureMagic($dir);
-                $this->logDebug("Upload inside", array("destination"=>$this->addSlugToPath($destination)));
-                if (!$this->isWriteable($destination)) {
-                    $errorCode = 412;
-                    $errorMessage = "$mess[38] ".SystemTextEncoding::toUTF8($dir)." $mess[99].";
-                    $this->logDebug("Upload error 412", array("destination"=>$this->addSlugToPath($destination)));
-                    return array("ERROR" => array("CODE" => $errorCode, "MESSAGE" => $errorMessage));
-                }
-
-                $partialUpload = false;
-                $partialTargetSize = -1;
-                $originalAppendTo = "";
-                $createdNode = null;
-
-                foreach ($fileVars as $boxName => $boxData) {
-                    if(substr($boxName, 0, 9) != "userfile_") continue;
-
-                    try{
-                        // CHECK PHP UPLOAD ERRORS
-                        AJXP_Utils::parseFileDataErrors($boxData, true);
-
-                        // FIND PROPER FILE NAME
-                        $userfile_name=AJXP_Utils::sanitize(SystemTextEncoding::fromPostedFileName($boxData["name"]), AJXP_SANITIZE_FILENAME);
-                        if (isSet($httpVars["urlencoded_filename"])) {
-                            $userfile_name = AJXP_Utils::sanitize(SystemTextEncoding::fromUTF8(urldecode($httpVars["urlencoded_filename"])), AJXP_SANITIZE_FILENAME);
-                        }
-                        $userfile_name = substr($userfile_name, 0, ConfService::getCoreConf("NODENAME_MAX_LENGTH"));
-                        if (isSet($httpVars["auto_rename"])) {
-                            $userfile_name = self::autoRenameForDest($destination, $userfile_name);
-                        }
-                        $this->logDebug("User filename ".$userfile_name);
-                        if(class_exists("Normalizer")){
-                            $userfile_name = Normalizer::normalize($userfile_name, Normalizer::FORM_C);
-                        }
-
-                        // CHECK IF THIS IS A FORBIDDEN FILENAME
-                        $this->filterUserSelectionToHidden(array($userfile_name));
-
-                        // APPLY PRE-UPLOAD HOOKS
-                        $already_existed = false;
-                        try {
-                            if (file_exists($destination."/".$userfile_name)) {
-                                $already_existed = true;
-                                AJXP_Controller::applyHook("node.before_change", array(new AJXP_Node($destination."/".$userfile_name), $boxData["size"]));
-                            } else {
-                                AJXP_Controller::applyHook("node.before_create", array(new AJXP_Node($destination."/".$userfile_name), $boxData["size"]));
-                            }
-                            AJXP_Controller::applyHook("node.before_change", array(new AJXP_Node($destination)));
-                        } catch (Exception $e) {
-                            throw new Exception($e->getMessage(), 507);
-                        }
-
-                        // PARTIAL UPLOAD CASE - PREPPEND .dlpart extension
-                        if(isSet($httpVars["partial_upload"]) && $httpVars["partial_upload"] == 'true' && isSet($httpVars["partial_target_bytesize"])){
-                            $partialUpload = true;
-                            $partialTargetSize = intval($httpVars["partial_target_bytesize"]);
-                            if(!isSet($httpVars["appendto_urlencoded_part"])){
-                                $userfile_name .= ".dlpart";
-                            }
-                        }
-
-                        // NOW DO THE ACTUAL COPY
-                        $this->copyUploadedData($boxData, $destination, $userfile_name, $mess);
-
-                        // PARTIAL UPLOAD - PART II: APPEND DATA TO EXISTING PART
-                        if (isSet($httpVars["appendto_urlencoded_part"])) {
-                            $appendTo = AJXP_Utils::sanitize(SystemTextEncoding::fromUTF8(urldecode($httpVars["appendto_urlencoded_part"])), AJXP_SANITIZE_FILENAME);
-                            if(isSet($httpVars["partial_upload"]) && $httpVars["partial_upload"] == 'true'){
-                                $originalAppendTo = $appendTo;
-                                $appendTo .= ".dlpart";
-                            }
-                            $this->logDebug("AppendTo FILE".$appendTo);
-                            $already_existed = $this->appendUploadedData($destination, $userfile_name, $appendTo);
-                            $userfile_name = $appendTo;
-                            if($partialUpload && $partialTargetSize == filesize($destination."/".$userfile_name)){
-                                // This was the last part. We can now rename to the original name.
-                                if(is_file($destination."/".$originalAppendTo)){
-                                    unlink($destination."/".$originalAppendTo);
-                                }
-                                $result = @rename($destination."/".$userfile_name, $destination."/".$originalAppendTo);
-                                if($result === false){
-                                    throw new Exception("Error renaming ".$destination."/".$userfile_name." to ".$destination."/".$originalAppendTo);
-                                }
-                                $userfile_name = $originalAppendTo;
-                                $partialUpload = false;
-                                // Send a create event!
-                                $already_existed = false;
-                            }
-                        }
-
-                        // NOW PREPARE POST-UPLOAD EVENTS
-                        $this->changeMode($destination."/".$userfile_name,$repoData);
-                        $createdNode = new AJXP_Node($destination."/".$userfile_name);
-                        clearstatcache(true, $createdNode->getUrl());
-                        $createdNode->loadNodeInfo(true);
-                        $logMessage.="$mess[34] ".SystemTextEncoding::toUTF8($userfile_name)." $mess[35] $dir";
-                        $logFile = $this->addSlugToPath(SystemTextEncoding::fromUTF8($dir))."/".$userfile_name;
-                        $this->logInfo("Upload File", array("file"=>$logFile, "files"=> $logFile ) );
-
-                        if($partialUpload){
-                            $this->logDebug("Return Partial Upload: SUCESS but no event yet");
-                            if(isSet($already_existed) && $already_existed === true){
-                                return array("SUCCESS" => true, "PARTIAL_NODE" => $createdNode);
-                            }
-                        } else {
-                            $this->logDebug("Return success");
-                            if(isSet($already_existed) && $already_existed === true){
-                                return array("SUCCESS" => true, "UPDATED_NODE" => $createdNode);
-                            }else{
-                                return array("SUCCESS" => true, "CREATED_NODE" => $createdNode);
-                            }
-                        }
-
-                    }catch(Exception $e){
-                        $errorCode = $e->getCode();
-                        if(empty($errorCode)) $errorCode = 411;
-                        return array("ERROR" => array("CODE" => $errorCode, "MESSAGE" => $e->getMessage()));
-                    }
-
-                }
-
-
-            break;
-
-            case "lsync" :
-
-                if (!ConfService::currentContextIsCommandLine()) {
-                    //die("This command must be accessed via CLI only.");
-                }
-                $fromNode = null;
-                $toNode = null;
-                $copyOrMove = false;
-                if (isSet($httpVars["from"])) {
-                    $fromNode = new AJXP_Node($this->urlBase.AJXP_Utils::decodeSecureMagic($httpVars["from"]));
-                }
-                if (isSet($httpVars["to"])) {
-                    $toNode = new AJXP_Node($this->urlBase.AJXP_Utils::decodeSecureMagic($httpVars["to"]));
-                }
-                if (isSet($httpVars["copy"]) && $httpVars["copy"] == "true") {
-                    $copyOrMove = true;
-                }
-                AJXP_Controller::applyHook("node.change", array($fromNode, $toNode, $copyOrMove));
-
-            break;
-
-            //------------------------------------
-            //	XML LISTING
-            //------------------------------------
-            case "ls":
-
-                if(!isSet($dir) || $dir == "/") $dir = "";
-                $lsOptions = $this->parseLsOptions((isSet($httpVars["options"])?$httpVars["options"]:"a"));
-
-                $startTime = microtime();
-                $dir = AJXP_Utils::securePath($dir);
-                $path = $this->urlBase.($dir!= ""?($dir[0]=="/"?"":"/").$dir:"");
-                $nonPatchedPath = $path;
-                if (AJXP_MetaStreamWrapper::actualRepositoryWrapperClass($this->repository->getId()) == "fsAccessWrapper") {
-                    $nonPatchedPath = fsAccessWrapper::unPatchPathForBaseDir($path);
-                }
-                $testPath = @stat($path);
-                if($testPath === null || $testPath === false){
-                    throw new Exception("There was a problem trying to open folder ". $path. ", please check your Administrator");
-                }
-                if(!is_readable($path) && !is_writeable($path)){
-                    throw new Exception("You are not allowed to access folder " . $path);
-                }
-                // Backward compat
-                if($selection->isUnique() && strpos($selection->getUniqueFile(), "/") !== 0){
-                    $selection->setFiles(array($dir . "/" . $selection->getUniqueFile()));
-                }
-
-                $orderField = $orderDirection = null;
-                $threshold = 500; $limitPerPage = 200;
-                $defaultOrder = $this->repository->getOption("REMOTE_SORTING_DEFAULT_COLUMN");
-                $defaultDirection = $this->repository->getOption("REMOTE_SORTING_DEFAULT_DIRECTION");
-                if ($this->repository->getOption("REMOTE_SORTING")) {
-                    $orderDirection = isSet($httpVars["order_direction"])?strtolower($httpVars["order_direction"]):$defaultDirection;
-                    $orderField = isSet($httpVars["order_column"])?$httpVars["order_column"]:$defaultOrder;
-                    if ($orderField != null && !in_array($orderField, array("ajxp_label", "filesize", "ajxp_modiftime", "mimestring"))) {
-                        $orderField = $defaultOrder;
-                    }
-                }
-                if(isSet($httpVars["recursive"]) && $httpVars["recursive"] == "true"){
-                    $max_depth = (isSet($httpVars["max_depth"])?intval($httpVars["max_depth"]):0);
-                    $max_nodes = (isSet($httpVars["max_nodes"])?intval($httpVars["max_nodes"]):0);
-                    $crt_depth = (isSet($httpVars["crt_depth"])?intval($httpVars["crt_depth"])+1:1);
-                    $crt_nodes = (isSet($httpVars["crt_nodes"])?intval($httpVars["crt_nodes"]):0);
-                }else{
-                    $threshold = $this->repository->getOption("PAGINATION_THRESHOLD");
-                    if(!isSet($threshold) || intval($threshold) == 0) $threshold = 500;
-                    $limitPerPage = $this->repository->getOption("PAGINATION_NUMBER");
-                    if(!isset($limitPerPage) || intval($limitPerPage) == 0) $limitPerPage = 200;
-                }
-
-                if(!$selection->isEmpty()){
-                    $uniqueNodes = $selection->buildNodes();
-                    $parentAjxpNode = new AJXP_Node($this->urlBase."/", array());
-                    AJXP_Controller::applyHook("node.read", array(&$parentAjxpNode));
-                    if (AJXP_XMLWriter::$headerSent == "tree") {
-                        AJXP_XMLWriter::renderAjxpNode($parentAjxpNode, false);
-                    } else {
-                        AJXP_XMLWriter::renderAjxpHeaderNode($parentAjxpNode);
-                    }
-                    foreach($uniqueNodes as $node){
-                        if(!file_exists($node->getUrl()) || (!is_readable($node->getUrl()) && !is_writable($node->getUrl()))) continue;
-                        $nodeName = $node->getLabel();
-                        if (!$this->filterNodeName($node->getPath(), $nodeName, $isLeaf, $lsOptions)) {
-                            continue;
-                        }
-                        if (RecycleBinManager::recycleEnabled() && $node->getPath() == RecycleBinManager::getRecyclePath()) {
-                            continue;
-                        }
-                        $node->loadNodeInfo(false, false, ($lsOptions["l"]?"all":"minimal"));
-                        if (!empty($node->metaData["nodeName"]) && $node->metaData["nodeName"] != $nodeName) {
-                            $node->setUrl(dirname($node->getUrl())."/".$node->metaData["nodeName"]);
-                        }
-                        if (!empty($node->metaData["hidden"]) && $node->metaData["hidden"] === true) {
-                            continue;
-                        }
-                        if (!empty($node->metaData["mimestring_id"]) && array_key_exists($node->metaData["mimestring_id"], $mess)) {
-                            $node->mergeMetadata(array("mimestring" =>  $mess[$node->metaData["mimestring_id"]]));
-                        }
-                        if(isSet($httpVars["page_position"]) && $httpVars["page_position"] == "true"){
-                            // Detect page position: we have to loading "siblings"
-                            $parentPath = AJXP_Utils::safeDirname($node->getPath());
-                            $siblings = scandir($this->urlBase.$parentPath);
-                            foreach($siblings as $i => $s){
-                                if($this->filterFile($s, true)) unset($siblings[$i]);
-                                if($this->filterFolder($s)) unset($siblings[$i]);
-                            }
-                            if(count($siblings) > $threshold){
-                                //usort($siblings, "strcasecmp");
-                                $siblings = $this->orderNodes($siblings, $this->urlBase.$parentPath, $orderField, $orderDirection);
-                                $index = array_search($node->getLabel(), $siblings);
-                                $node->mergeMetadata(array("page_position" => floor($index / $limitPerPage) +1));
-                            }
-                        }
-                        AJXP_XMLWriter::renderAjxpNode($node);
-                    }
-                    AJXP_XMLWriter::close();
-                    break;
-                }
-
-                $streamIsSeekable = AJXP_MetaStreamWrapper::wrapperIsSeekable($path);
-
-                $sharedHandle = null; $handle = null;
-                if($streamIsSeekable){
-                    $handle = opendir($path);
-                    $sharedHandle = $handle;
-                }
-                $countFiles = $this->countFiles($path, !$lsOptions["f"], false, $sharedHandle);
-                if(isSet($sharedHandle)){
-                    rewind($handle);
-                }
-                if(isSet($crt_nodes)){
-                    $crt_nodes += $countFiles;
-                }
-                $totalPages = $crtPage = 1;
-                if (isSet($threshold) && isSet($limitPerPage) && $countFiles > $threshold) {
-                    $offset = 0;
-                    $crtPage = 1;
-                    if (isSet($page)) {
-                        $offset = (intval($page)-1)*$limitPerPage;
-                        $crtPage = $page;
-                    }
-                    $totalPages = floor($countFiles / $limitPerPage) + 1;
-                } else {
-                    $offset = $limitPerPage = 0;
-                }
-
-                $metaData = array();
-                if (RecycleBinManager::recycleEnabled() && $dir == "") {
-                    $metaData["repo_has_recycle"] = "true";
-                }
-                $parentAjxpNode = new AJXP_Node($nonPatchedPath, $metaData);
-                $parentAjxpNode->loadNodeInfo(false, true, ($lsOptions["l"]?"all":"minimal"));
-                AJXP_Controller::applyHook("node.read", array(&$parentAjxpNode));
-                if (AJXP_XMLWriter::$headerSent == "tree") {
-                    AJXP_XMLWriter::renderAjxpNode($parentAjxpNode, false);
-                } else {
-                    AJXP_XMLWriter::renderAjxpHeaderNode($parentAjxpNode);
-                }
-                if (isSet($totalPages) && isSet($crtPage) && ($totalPages > 1 || ! AJXP_Utils::userAgentIsNativePydioApp())) {
-                    $remoteOptions = null;
-                    if ($this->getFilteredOption("REMOTE_SORTING")) {
-                        $remoteOptions = array(
-                            "remote_order" => "true",
-                            "currentOrderCol" => isSet($orderField)?$orderField:$defaultOrder,
-                            "currentOrderDir"=> isSet($orderDirection)?$orderDirection:$defaultDirection
-                        );
-                    }
-                    $foldersCounts = $this->countFiles($path, TRUE, false, $sharedHandle);
-                    if(isSet($sharedHandle)) {
-                        rewind($sharedHandle);
-                    }
-                    AJXP_XMLWriter::renderPaginationData(
-                        $countFiles,
-                        $crtPage,
-                        $totalPages,
-                        $foldersCounts,
-                        $remoteOptions
-                    );
-                    if (!$lsOptions["f"]) {
-                        AJXP_XMLWriter::close();
-                        if(isSet($sharedHandle)) {
-                            closedir($sharedHandle);
-                        }
-                        break;
-                    }
-                }
-
-                $cursor = 0;
-                if(isSet($sharedHandle)){
-                    $handle = $sharedHandle;
-                }else{
-                    $handle = opendir($path);
-                }
-                if (!$handle) {
-                    throw new AJXP_Exception("Cannot open dir ".$nonPatchedPath);
-                }
-                $nodes = array();
-                while(false !== ($file = readdir($handle))){
-                    $nodes[] = $file;
-                }
-                closedir($handle);
-                $fullList = array("d" => array(), "z" => array(), "f" => array());
-
-                //$nodes = scandir($path);
-                $nodes = $this->orderNodes($nodes, $nonPatchedPath, $orderField, $orderDirection);
-
-                foreach ($nodes as $nodeName) {
-                    if($nodeName == "." || $nodeName == "..") {
-                        continue;
-                    }
-                    $isLeaf = "";
-                    if (!$this->filterNodeName($path, $nodeName, $isLeaf, $lsOptions)) {
-                        continue;
-                    }
-                    if (RecycleBinManager::recycleEnabled() && $dir == "" && "/".$nodeName == RecycleBinManager::getRecyclePath()) {
-                        continue;
-                    }
-                    if ($offset > 0 && $cursor < $offset) {
-                        $cursor ++;
-                        continue;
-                    }
-
-                    if ($limitPerPage > 0 && ($cursor - $offset) >= $limitPerPage) {
-                        break;
-                    }
-
-                    $currentFile = $nonPatchedPath."/".$nodeName;
-                    $meta = array();
-                    if($isLeaf != "") $meta = array("is_file" => ($isLeaf?"1":"0"));
-                    $node = new AJXP_Node($currentFile, $meta);
-                    $node->setLabel($nodeName);
-                    $node->loadNodeInfo(false, false, ($lsOptions["l"]?"all":"minimal"));
-                    if (!empty($node->metaData["nodeName"]) && $node->metaData["nodeName"] != $nodeName) {
-                        $node->setUrl($nonPatchedPath."/".$node->metaData["nodeName"]);
-                    }
-                    if (!empty($node->metaData["hidden"]) && $node->metaData["hidden"] === true) {
-                           continue;
-                       }
-                    if (!empty($node->metaData["mimestring_id"]) && array_key_exists($node->metaData["mimestring_id"], $mess)) {
-                        $node->mergeMetadata(array("mimestring" =>  $mess[$node->metaData["mimestring_id"]]));
-                    }
-                    if (isSet($originalLimitPerPage) && $cursor > $originalLimitPerPage) {
-                        $node->mergeMetadata(array("page_position" => floor($cursor / $originalLimitPerPage) +1));
-                    }
-
-                    $nodeType = "d";
-                    if ($node->isLeaf()) {
-                        if (AJXP_Utils::isBrowsableArchive($nodeName)) {
-                            if ($lsOptions["f"] && $lsOptions["z"]) {
-                                $nodeType = "f";
-                            } else {
-                                $nodeType = "z";
-                            }
-                        } else $nodeType = "f";
-                    }
-                    // There is a special sorting, cancel the reordering of files & folders.
-                    if(isSet($orderField) && $orderField != "ajxp_label" && !(isSet($httpVars["recursive"]) && $httpVars["recursive"] == "true" )) {
-                        $nodeType = "f";
-                    }
-                    $fullList[$nodeType][$nodeName] = $node;
-                    $cursor ++;
-                }
-                if (isSet($httpVars["recursive"]) && $httpVars["recursive"] == "true") {
-                    $breakNow = false;
-                    if(isSet($max_depth) && $max_depth > 0 && $crt_depth >= $max_depth) $breakNow = true;
-                    if(isSet($max_nodes) && $max_nodes > 0 && $crt_nodes >= $max_nodes) $breakNow = true;
-                    /**
-                     * @var $nodeDir AJXP_Node
-                     */
-                    foreach ($fullList["d"] as &$nodeDir) {
-                        if($breakNow){
-                            $nodeDir->mergeMetadata(array("ajxp_has_children" => $this->countFiles($nodeDir->getUrl(), false, true)?"true":"false"));
-                            AJXP_XMLWriter::renderAjxpNode($nodeDir, true);
-                            continue;
-                        }
-                        $this->switchAction("ls", array(
-                            "dir" => SystemTextEncoding::toUTF8($nodeDir->getPath()),
-                            "options"=> $httpVars["options"],
-                            "recursive" => "true",
-                            "max_depth"=> $max_depth,
-                            "max_nodes"=> $max_nodes,
-                            "crt_depth"=> $crt_depth,
-                            "crt_nodes"=> $crt_nodes,
-                        ), array());
-                    }
-                } else {
-                    array_map(array("AJXP_XMLWriter", "renderAjxpNode"), $fullList["d"]);
-                }
-                array_map(array("AJXP_XMLWriter", "renderAjxpNode"), $fullList["z"]);
-                array_map(array("AJXP_XMLWriter", "renderAjxpNode"), $fullList["f"]);
-
-                // ADD RECYCLE BIN TO THE LIST
-                if ($dir == ""  && RecycleBinManager::recycleEnabled() && $this->getFilteredOption("HIDE_RECYCLE", $this->repository) !== true) {
-                    $recycleBinOption = RecycleBinManager::getRelativeRecycle();
-                    if (file_exists($this->urlBase.$recycleBinOption)) {
-                        $recycleNode = new AJXP_Node($this->urlBase.$recycleBinOption);
-                        $recycleNode->loadNodeInfo();
-                        AJXP_XMLWriter::renderAjxpNode($recycleNode);
-                    }
-                }
-
-                $this->logDebug("LS Time : ".intval((microtime()-$startTime)*1000)."ms");
-
-                AJXP_XMLWriter::close();
-
-            break;
-        }
-
-
-        $xmlBuffer = "";
-        if (isset($logMessage) || isset($errorMessage)) {
-            $xmlBuffer .= AJXP_XMLWriter::sendMessage((isSet($logMessage)?$logMessage:null), (isSet($errorMessage)?$errorMessage:null), false);
-        }
-        if ($reloadContextNode) {
-            if(!isSet($pendingSelection)) $pendingSelection = "";
-            $xmlBuffer .= AJXP_XMLWriter::reloadDataNode("", $pendingSelection, false);
-        }
-        if (isSet($reloadDataNode)) {
-            $xmlBuffer .= AJXP_XMLWriter::reloadDataNode($reloadDataNode, "", false);
-        }
-        if (isSet($nodesDiffs)) {
-            $xmlBuffer .= AJXP_XMLWriter::writeNodesDiff($nodesDiffs, false);
-        }
-
-        return $xmlBuffer;
-    }
-
-    protected function orderNodes($nodes, $path, $orderField, $orderDirection){
-
-        usort($nodes, "strcasecmp");
-        if (!empty($orderField) && !empty($orderDirection) && $orderField == "ajxp_label" && $orderDirection == "desc") {
-            $nodes = array_reverse($nodes);
-        }
-        if (!empty($this->driverConf["SCANDIR_RESULT_SORTFONC"])) {
-            usort($nodes, $this->driverConf["SCANDIR_RESULT_SORTFONC"]);
-        }
-        if (!empty($orderField) && !empty($orderDirection) && $orderField != "ajxp_label") {
-            $toSort = array();
-            foreach ($nodes as $node) {
-                if($orderField == "filesize") $toSort[$node] = is_file($path."/".$node) ? filesize($path."/".$node) : 0;
-                else if($orderField == "ajxp_modiftime") $toSort[$node] = filemtime($path."/".$node);
-                else if($orderField == "mimestring") $toSort[$node] = pathinfo($node, PATHINFO_EXTENSION);
-            }
-            if($orderDirection == "asc") asort($toSort);
-            else arsort($toSort);
-            $nodes = array_keys($toSort);
-        }
-        return $nodes;
-
-    }
-
-    public function parseLsOptions($optionString)
-    {
-        // LS OPTIONS : dz , a, d, z, all of these with or without l
-        // d : directories
-        // z : archives
-        // f : files
-        // => a : all, alias to dzf
-        // l : list metadata
-        $allowed = array("a", "d", "z", "f", "l");
-        $lsOptions = array();
-        foreach ($allowed as $key) {
-            if (strchr($optionString, $key)!==false) {
-                $lsOptions[$key] = true;
-            } else {
-                $lsOptions[$key] = false;
-            }
-        }
-        if ($lsOptions["a"]) {
-            $lsOptions["d"] = $lsOptions["z"] = $lsOptions["f"] = true;
-        }
-        return $lsOptions;
-    }
-
-    /**
-     * @param AJXP_Node $ajxpNode
-     * @param bool $parentNode
-     * @param bool $details
-     * @return void
-     */
-    public function loadNodeInfo(&$ajxpNode, $parentNode = false, $details = false)
-    {
-        $mess = ConfService::getMessages();
-
-        $nodeName = basename($ajxpNode->getPath());
-        $metaData = $ajxpNode->metadata;
-        if (!isSet($metaData["is_file"])) {
-            $isLeaf = is_file($ajxpNode->getUrl()) || AJXP_Utils::isBrowsableArchive($nodeName);
-            $metaData["is_file"] = ($isLeaf?"1":"0");
-        } else {
-            $isLeaf = $metaData["is_file"] == "1" ? true : false;
-        }
-        $metaData["filename"] = $ajxpNode->getPath();
-
-        if (RecycleBinManager::recycleEnabled() && $ajxpNode->getPath() == RecycleBinManager::getRelativeRecycle()) {
-            $recycleIcon = ($this->countFiles($ajxpNode->getUrl(), false, true)>0?"trashcan_full.png":"trashcan.png");
-            $metaData["icon"] = $recycleIcon;
-            $metaData["fonticon"] = "delete";
-            $metaData["mimestring"] = $mess[122];
-            $ajxpNode->setLabel($mess[122]);
-            $metaData["ajxp_mime"] = "ajxp_recycle";
-        } else {
-            $mimeData = AJXP_Utils::mimeData($ajxpNode->getUrl(), !$isLeaf);
-            $metaData["mimestring_id"] = $mimeData[0]; //AJXP_Utils::mimetype($ajxpNode->getUrl(), "type", !$isLeaf);
-            $metaData["icon"] = $mimeData[1]; //AJXP_Utils::mimetype($nodeName, "image", !$isLeaf);
-            if(!empty($mimeData[2])){
-                $metaData["fonticon"] = $mimeData[2];
-            }
-            if ($metaData["icon"] == "folder.png") {
-                $metaData["openicon"] = "folder_open.png";
-            }
-            if (!$isLeaf) {
-                $metaData["ajxp_mime"] = "ajxp_folder";
-            }
-        }
-        //if ($lsOptions["l"]) {
-
-        $metaData["file_group"] = @filegroup($ajxpNode->getUrl()) || "unknown";
-        $metaData["file_owner"] = @fileowner($ajxpNode->getUrl()) || "unknown";
-        $crtPath = $ajxpNode->getPath();
-        $vRoots = $this->repository->listVirtualRoots();
-        $metaData["ajxp_readonly"] = "false";
-        if (!@$this->isWriteable($ajxpNode->getUrl())) {
-           $metaData["ajxp_readonly"] = "true";
-        }
-        if (!empty($crtPath)) {
-            if (isSet($vRoots[ltrim($crtPath, "/")])) {
-                $metaData["ajxp_readonly"] = $vRoots[ltrim($crtPath, "/")]["right"] == "r" ? "true" : "false";
-            }
-        } else {
-            if (count($vRoots)) {
-                $metaData["ajxp_readonly"] = "true";
-            }
-        }
-        $fPerms = @fileperms($ajxpNode->getUrl());
-        if ($fPerms !== false) {
-            $fPerms = substr(decoct( $fPerms ), ($isLeaf?2:1));
-        } else {
-            $fPerms = '0000';
-        }
-        $metaData["file_perms"] = $fPerms;
-        $datemodif = $this->date_modif($ajxpNode->getUrl());
-        $metaData["ajxp_modiftime"] = ($datemodif ? $datemodif : "0");
-        $metaData["ajxp_description"] =$metaData["ajxp_relativetime"] = $mess[4]." ".AJXP_Utils::relativeDate($datemodif, $mess);
-        $metaData["bytesize"] = 0;
-        if ($isLeaf) {
-            $metaData["bytesize"] = filesize($ajxpNode->getUrl());
-        }
-        $metaData["filesize"] = AJXP_Utils::roundSize($metaData["bytesize"]);
-        if (AJXP_Utils::isBrowsableArchive($nodeName)) {
-            $metaData["ajxp_mime"] = "ajxp_browsable_archive";
-        }
-
-        if ($details == "minimal") {
-            $miniMeta = array(
-                "is_file" => $metaData["is_file"],
-                "filename" => $metaData["filename"],
-                "bytesize" => $metaData["bytesize"],
-                "ajxp_modiftime" => $metaData["ajxp_modiftime"],
-            );
-            $ajxpNode->mergeMetadata($miniMeta);
-        } else {
-            $ajxpNode->mergeMetadata($metaData);
-        }
-
-    }
-
-    /**
-     * @param array $uploadData Php-upload array
-     * @param String $destination Destination folder, including stream data
-     * @param String $filename Destination filename
-     * @param array $messages Application messages table
-     * @return bool
-     * @throws Exception
-     */
-    protected function copyUploadedData($uploadData, $destination, $filename, $messages){
-        if (isSet($uploadData["input_upload"])) {
-            try {
-                $this->logDebug("Begining reading INPUT stream");
-                $input = fopen("php://input", "r");
-                $output = fopen("$destination/".$filename, "w");
-                $sizeRead = 0;
-                while ($sizeRead < intval($uploadData["size"])) {
-                    $chunk = fread($input, 4096);
-                    $sizeRead += strlen($chunk);
-                    fwrite($output, $chunk, strlen($chunk));
-                }
-                fclose($input);
-                fclose($output);
-                $this->logDebug("End reading INPUT stream");
-            } catch (Exception $e) {
-                throw new Exception($e->getMessage(), 411);
-            }
-        } else {
-            $result = @move_uploaded_file($uploadData["tmp_name"], "$destination/".$filename);
-            if (!$result) {
-                $realPath = AJXP_MetaStreamWrapper::getRealFSReference("$destination/".$filename);
-                $result = move_uploaded_file($uploadData["tmp_name"], $realPath);
-            }
-            if (!$result) {
-                $errorMessage="$messages[33] ".$filename;
-                throw new Exception($errorMessage, 411);
-            }
-        }
-        return true;
-    }
-
-    /**
-     * @param String $folder Folder destination
-     * @param String $target Existing part to append data
-     * @param String $source Maybe updated by the function
-     * @return bool If the target file already existed or not.
-     */
-    protected function appendUploadedData($folder, $source, $target){
-
-        $already_existed = false;
-        if($source == $target){
-            throw new Exception("Something nasty happened: trying to copy $source into itself, it will create a loop!");
-        }
-        if (file_exists($folder ."/" . $target)) {
-            $already_existed = true;
-            $this->logDebug("Should copy stream from $source to $target");
-            $partO = fopen($folder."/".$source, "r");
-            $appendF = fopen($folder ."/". $target, "a+");
-            while (!feof($partO)) {
-                $buf = fread($partO, 1024);
-                fwrite($appendF, $buf, strlen($buf));
-            }
-            fclose($partO);
-            fclose($appendF);
-            $this->logDebug("Done, closing streams!");
-        }
-        @unlink($folder."/".$source);
-        return $already_existed;
-
-    }
-
-    public function prepareReadStream($headerType, $localName)
-    {
-        session_write_close();
-
-        restore_error_handler();
-        restore_exception_handler();
-
-        set_exception_handler('download_exception_handler');
-        set_error_handler('download_exception_handler');
-        // required for IE, otherwise Content-disposition is ignored
-        if (ini_get('zlib.output_compression')) {
-            AJXP_Utils::safeIniSet('zlib.output_compression', 'Off');
-        }
-
-        if ($headerType == "plain") {
-            header("Content-type:text/plain");
-        } else if ($headerType == "image") {
-            header("Content-Type: ".AJXP_Utils::getImageMimeType(basename($localName))."; name=\"".$localName."\"");
-            header('Cache-Control: public');
-        } else {
-            HTMLWriter::generateAttachmentsHeader($localName, -1, false, false);
-        }
-    }
-
-    public function readFile($filePathOrData, $headerType="plain", $localName="", $data=false, $gzip=null, $realfileSystem=false, $byteOffset=-1, $byteLength=-1)
-    {
-        if(!$data && !$gzip && !file_exists($filePathOrData)){
-            throw new Exception("File $filePathOrData not found!");
-        }
-        if ($gzip === null) {
-            $gzip = ConfService::getCoreConf("GZIP_COMPRESSION");
-        }
-        if (!$realfileSystem && AJXP_MetaStreamWrapper::actualRepositoryWrapperClass($this->repository->getId()) == "fsAccessWrapper") {
-            $originalFilePath = $filePathOrData;
-            $filePathOrData = fsAccessWrapper::patchPathForBaseDir($filePathOrData);
-        }
-        session_write_close();
-
-        restore_error_handler();
-        restore_exception_handler();
-
-        set_exception_handler('download_exception_handler');
-        set_error_handler('download_exception_handler');
-        // required for IE, otherwise Content-disposition is ignored
-        if (ini_get('zlib.output_compression')) {
-         AJXP_Utils::safeIniSet('zlib.output_compression', 'Off');
-        }
-
-        $isFile = !$data && !$gzip;
-        if ($byteLength == -1) {
-            if ($data) {
-                $size = strlen($filePathOrData);
-            } else if ($realfileSystem) {
-                $size = sprintf("%u", filesize($filePathOrData));
-            } else {
-                $size = filesize($filePathOrData);
-            }
-        } else {
-            $size = $byteLength;
-        }
-        if ($gzip && ($size > ConfService::getCoreConf("GZIP_LIMIT") || !function_exists("gzencode") || @strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') === FALSE)) {
-            $gzip = false; // disable gzip
-        }
-
-        $localName = ($localName=="" ? basename((isSet($originalFilePath)?$originalFilePath:$filePathOrData)) : $localName);
-        if ($headerType == "plain") {
-            header("Content-type:text/plain");
-        } else if ($headerType == "image") {
-            header("Content-Type: ".AJXP_Utils::getImageMimeType(basename($filePathOrData))."; name=\"".$localName."\"");
-            header("Content-Length: ".$size);
-            header('Cache-Control: public');
-        } else {
-            if ($isFile) {
-                header("Accept-Ranges: 0-$size");
-                $this->logDebug("Sending accept range 0-$size");
-            }
-
-            // Check if we have a range header (we are resuming a transfer)
-            if ( isset($_SERVER['HTTP_RANGE']) && $isFile && $size != 0 ) {
-                if ($headerType == "stream_content") {
-                    if (extension_loaded('fileinfo')  && AJXP_MetaStreamWrapper::actualRepositoryWrapperClass($this->repository->getId()) == "fsAccessWrapper") {
-                        $fInfo = new fInfo( FILEINFO_MIME );
-                        $realfile = AJXP_MetaStreamWrapper::getRealFSReference($filePathOrData);
-                        $mimeType = $fInfo->file( $realfile);
-                        $splitChar = explode(";", $mimeType);
-                        $mimeType = trim($splitChar[0]);
-                        $this->logDebug("Detected mime $mimeType for $realfile");
-                    } else {
-                        $mimeType = AJXP_Utils::getStreamingMimeType(basename($filePathOrData));
-                    }
-                    header('Content-type: '.$mimeType);
-                }
-                // multiple ranges, which can become pretty complex, so ignore it for now
-                $ranges = explode('=', $_SERVER['HTTP_RANGE']);
-                $offsets = explode('-', $ranges[1]);
-                $offset = floatval($offsets[0]);
-
-                $length = floatval($offsets[1]) - $offset;
-                if (!$length) $length = $size - $offset;
-                if ($length + $offset > $size || $length < 0) $length = $size - $offset;
-                $this->logDebug('Content-Range: bytes ' . $offset . '-' . $length . '/' . $size);
-                header('HTTP/1.1 206 Partial Content');
-                header('Content-Range: bytes ' . $offset . '-' . ($offset + $length) . '/' . $size);
-
-                header("Content-Length: ". $length);
-                $file = fopen($filePathOrData, 'rb');
-                if(!is_resource($file)){
-                    throw new Exception("Failed opening file ".$filePathOrData);
-                }
-                fseek($file, 0);
-                $relOffset = $offset;
-                while ($relOffset > 2.0E9) {
-                    // seek to the requested offset, this is 0 if it's not a partial content request
-                    fseek($file, 2000000000, SEEK_CUR);
-                    $relOffset -= 2000000000;
-                    // This works because we never overcome the PHP 32 bit limit
-                }
-                fseek($file, $relOffset, SEEK_CUR);
-
-                while(ob_get_level()) ob_end_flush();
-                $readSize = 0.0;
-                $bufferSize = 1024 * 8;
-                while (!feof($file) && $readSize < $length && connection_status() == 0) {
-                    $this->logDebug("dl reading $readSize to $length", $_SERVER["HTTP_RANGE"]);
-                    echo fread($file, $bufferSize);
-                    $readSize += $bufferSize;
-                    flush();
-                }
-
-                fclose($file);
-                return;
-            } else {
-                if ($gzip) {
-                    $gzippedData = ($data?gzencode($filePathOrData,9):gzencode(file_get_contents($filePathOrData), 9));
-                    $size = strlen($gzippedData);
-                }
-                HTMLWriter::generateAttachmentsHeader($localName, $size, $isFile, $gzip);
-                if ($gzip && isSet($gzippedData)) {
-                    print $gzippedData;
-                    return;
-                }
-            }
-        }
-
-        if ($data) {
-            print($filePathOrData);
-        } else {
-            if ($this->getFilteredOption("USE_XSENDFILE", $this->repository) && AJXP_MetaStreamWrapper::actualRepositoryWrapperClass($this->repository->getId()) == "fsAccessWrapper") {
-                if(!$realfileSystem) $filePathOrData = AJXP_MetaStreamWrapper::getRealFSReference($filePathOrData);
-                $filePathOrData = str_replace("\\", "/", $filePathOrData);
-                $server_name = $_SERVER["SERVER_SOFTWARE"];
-                $regex = '/^(lighttpd\/1.4).([0-9]{2}$|[0-9]{3}$|[0-9]{4}$)+/';
-                if(preg_match($regex, $server_name))
-                    $header_sendfile = "X-LIGHTTPD-send-file";
-                else
-                    $header_sendfile = "X-Sendfile";
-
-
-                header($header_sendfile.": ".SystemTextEncoding::toUTF8($filePathOrData));
-                header("Content-type: application/octet-stream");
-                header('Content-Disposition: attachment; filename="' . basename($filePathOrData) . '"');
-                return;
-            }
-    if ($this->getFilteredOption("USE_XACCELREDIRECT", $this->repository->getId()) && AJXP_MetaStreamWrapper::actualRepositoryWrapperClass($this->repository->getId()) == "fsAccessWrapper" && array_key_exists("X-Accel-Mapping",$_SERVER)) {
-        if(!$realfileSystem) $filePathOrData = AJXP_MetaStreamWrapper::getRealFSReference($filePathOrData);
-        $filePathOrData = str_replace("\\", "/", $filePathOrData);
-        $filePathOrData = SystemTextEncoding::toUTF8($filePathOrData);
-        $mapping = explode('=',$_SERVER['X-Accel-Mapping']);
-        $replacecount = 0;
-        $accelfile = str_replace($mapping[0],$mapping[1],$filePathOrData,$replacecount);
-        if ($replacecount == 1) {
-            header("X-Accel-Redirect: $accelfile");
-            header("Content-type: application/octet-stream");
-            header('Content-Disposition: attachment; filename="' . basename($accelfile) . '"');
-            return;
-        } else {
-            $this->logError("X-Accel-Redirect","Problem with X-Accel-Mapping for file $filePathOrData");
-        }
-    }
-            $stream = fopen("php://output", "a");
-            if ($realfileSystem) {
-                $this->logDebug("realFS!", array("file"=>$filePathOrData));
-                $fp = fopen($filePathOrData, "rb");
-                if(!is_resource($fp)){
-                    throw new Exception("Failed opening file ".$filePathOrData);
-                }
-                if ($byteOffset != -1) {
-                    fseek($fp, $byteOffset);
-                }
-                $sentSize = 0;
-                $readChunk = 4096;
-                while (!feof($fp)) {
-                    if ( $byteLength != -1 &&  ($sentSize + $readChunk) >= $byteLength) {
-                        // compute last chunk and break after
-                        $readChunk = $byteLength - $sentSize;
-                        $break = true;
-                    }
-                     $data = fread($fp, $readChunk);
-                     $dataSize = strlen($data);
-                     fwrite($stream, $data, $dataSize);
-                     $sentSize += $dataSize;
-                     if (isSet($break)) {
-                         break;
-                     }
-                }
-                fclose($fp);
-            } else {
-                AJXP_MetaStreamWrapper::copyFileInStream($filePathOrData, $stream);
-            }
-            fflush($stream);
-            fclose($stream);
-        }
-    }
-
-    public function countFiles($dirName, $foldersOnly = false, $nonEmptyCheckOnly = false, $dirHANDLE = null)
-    {
-        if(is_resource($dirHANDLE)){
-            $handle = $dirHANDLE;
-        }else{
-            $handle=@opendir($dirName);
-        }
-        if ($handle === false) {
-            throw new Exception("Error while trying to open directory ".$dirName);
-        }
-        if ($foldersOnly && !AJXP_MetaStreamWrapper::wrapperIsRemote($dirName)) {
-            if($dirHANDLE == null || !is_resource($dirHANDLE)){
-                closedir($handle);
-            }
-            $path = AJXP_MetaStreamWrapper::getRealFSReference($dirName, true);
-            $dirs = glob($path."/*", GLOB_ONLYDIR|GLOB_NOSORT);
-            if($dirs === false) return 0;
-            return count($dirs);
-        }
-        $count = 0;
-        $showHiddenFiles = $this->getFilteredOption("SHOW_HIDDEN_FILES", $this->repository);
-        while (false !== ($file = readdir($handle))) {
-            if($file != "." && $file !=".."
-                && !(AJXP_Utils::isHidden($file) && !$showHiddenFiles)){
-                if($foldersOnly && is_file($dirName."/".$file)) continue;
-                $count++;
-                if($nonEmptyCheckOnly) break;
-            }
-        }
-        if($dirHANDLE == null || !is_resource($dirHANDLE)){
-            closedir($handle);
-        }
-        return $count;
-    }
-
-    public function date_modif($file)
-    {
-        $tmp = @filemtime($file) or 0;
-        return $tmp;// date("d,m L Y H:i:s",$tmp);
-    }
-
-    public static $currentZipOperationHandler;
-    public function extractArchiveItemPreCallback($status, $data){
-        $fullname = $data['filename'];
-        $size = $data['size'];
-        $realBase = AJXP_MetaStreamWrapper::getRealFSReference($this->urlBase);
-        $realBase = str_replace("\\", "/", $realBase);
-        $repoName = $this->urlBase.str_replace($realBase, "", $fullname);
-        $toNode = new AJXP_Node($repoName);
-        $toNode->setLeaf($data['folder'] ? false:true);
-        if(file_exists($toNode->getUrl())){
-            AJXP_Controller::applyHook("node.before_change", array($toNode, $size));
-        }else{
-            AJXP_Controller::applyHook("node.before_create", array($toNode, $size));
-        }
-        return 1;
-    }
-
-    public function extractArchiveItemPostCallback($status, $data){
-        $fullname = $data['filename'];
-        $realBase = AJXP_MetaStreamWrapper::getRealFSReference($this->urlBase);
-        $repoName = str_replace($realBase, "", $fullname);
-        try{
-            $this->filterUserSelectionToHidden([$repoName]);
-        }catch(Exception $e){
-            @unlink($this->urlBase.$repoName);
-            return 1;
-        }
-        $toNode = new AJXP_Node($this->urlBase.$repoName);
-        $toNode->setLeaf($data['folder'] ? false:true);
-        AJXP_Controller::applyHook("node.change", array(null, $toNode, false));
-        return 1;
-    }
-
-    /**
-     * Extract an archive directly inside the dest directory.
-     *
-     * @param string $destDir
-     * @param UserSelection $selection
-     * @param array $error
-     * @param array $success
-     */
-    public function extractArchive($destDir, $selection, &$error, &$success)
-    {
-        require_once(AJXP_BIN_FOLDER."/pclzip.lib.php");
-        $zipPath = $selection->getZipPath(true);
-        $zipLocalPath = $selection->getZipLocalPath(true);
-        if(strlen($zipLocalPath)>1 && $zipLocalPath[0] == "/") $zipLocalPath = substr($zipLocalPath, 1)."/";
-        $files = $selection->getFiles();
-
-        $realZipFile = AJXP_MetaStreamWrapper::getRealFSReference($this->urlBase.$zipPath);
-        $archive = new PclZip($realZipFile);
-        $content = $archive->listContent();
-        foreach ($files as $key => $item) {// Remove path
-            $item = substr($item, strlen($zipPath));
-            if($item[0] == "/") $item = substr($item, 1);
-            foreach ($content as $zipItem) {
-                if ($zipItem["stored_filename"] == $item || $zipItem["stored_filename"] == $item."/") {
-                    $files[$key] = $zipItem["stored_filename"];
-                    break;
-                } else {
-                    unset($files[$key]);
-                }
-            }
-        }
-        $this->logDebug("Archive", $this->addSlugToPath($files));
-        $realDestination = AJXP_MetaStreamWrapper::getRealFSReference($this->urlBase.$destDir);
-        $this->logDebug("Extract", array($realDestination, $realZipFile, $this->addSlugToPath($files), $zipLocalPath));
-        self::$currentZipOperationHandler = &$this;
-        $result = $archive->extract(PCLZIP_OPT_BY_NAME,     $files,
-                                    PCLZIP_OPT_PATH,        $realDestination,
-                                    PCLZIP_OPT_REMOVE_PATH, $zipLocalPath,
-                                    PCLZIP_CB_PRE_EXTRACT,  "staticExtractArchiveItemPreCallback",
-                                    PCLZIP_CB_POST_EXTRACT, "staticExtractArchiveItemPostCallback",
-                                    PCLZIP_OPT_STOP_ON_ERROR
-        );
-        self::$currentZipOperationHandler = null;
-        if ($result <= 0) {
-            $error[] = $archive->errorInfo(true);
-        } else {
-            $mess = ConfService::getMessages();
-            $success[] = sprintf($mess[368], basename($zipPath), $destDir);
-        }
-    }
-
-    public function copyOrMove($destDir, $selectedFiles, &$error, &$success, $move = false)
-    {
-        $this->logDebug("CopyMove", array("dest"=>$this->addSlugToPath($destDir), "selection" => $this->addSlugToPath($selectedFiles)));
-        $mess = ConfService::getMessages();
-        if (!$this->isWriteable($this->urlBase.$destDir)) {
-            $error[] = $mess[38]." ".$destDir." ".$mess[99];
-            return ;
-        }
-        $repoData = array(
-            'base_url' => $this->urlBase,
-            'chmod'     => $this->repository->getOption('CHMOD_VALUE'),
-            'recycle'     => $this->repository->getOption('RECYCLE_BIN')
-        );
-
-        foreach ($selectedFiles as $selectedFile) {
-            if ($move && !$this->isWriteable(dirname($this->urlBase.$selectedFile))) {
-                $error[] = "\n".$mess[38]." ".dirname($selectedFile)." ".$mess[99];
-                continue;
-            }
-            $this->copyOrMoveFile($destDir, $selectedFile, $error, $success, $move, $repoData, $repoData);
-        }
-    }
-
-    public function rename($filePath, $filename_new, $dest = null)
-    {
-        $nom_fic=basename($filePath);
-        $mess = ConfService::getMessages();
-        $filename_new=AJXP_Utils::sanitize(SystemTextEncoding::magicDequote($filename_new), AJXP_SANITIZE_FILENAME);
-        $filename_new = substr($filename_new, 0, ConfService::getCoreConf("NODENAME_MAX_LENGTH"));
-        $old=$this->urlBase.$filePath;
-        if (!$this->isWriteable($old)) {
-            throw new AJXP_Exception($mess[34]." ".$nom_fic." ".$mess[99]);
-        }
-        if($dest == null) $new=dirname($old)."/".$filename_new;
-        else $new = $this->urlBase.$dest;
-        if ($filename_new=="" && $dest == null) {
-            throw new AJXP_Exception("$mess[37]");
-        }
-        if (file_exists($new)) {
-            throw new AJXP_Exception("$filename_new $mess[43]");
-        }
-        if (!file_exists($old)) {
-            throw new AJXP_Exception($mess[100]." $nom_fic");
-        }
-        $oldNode = new AJXP_Node($old);
-        AJXP_Controller::applyHook("node.before_path_change", array(&$oldNode));
-        $test = @rename($old,$new);
-        if($test === false){
-            throw new Exception("Error while renaming ".$old." to ".$new);
-        }
-        AJXP_Controller::applyHook("node.change", array($oldNode, new AJXP_Node($new), false));
-    }
-
-    public static function autoRenameForDest($destination, $fileName)
-    {
-        if(!is_file($destination."/".$fileName)) return $fileName;
-        $i = 1;
-        $ext = "";
-        $split = explode(".", $fileName);
-        if (count($split) > 1) {
-            $ext = ".".$split[count($split)-1];
-            array_pop($split);
-            $name = join(".", $split);
-        } else {
-            $name = $fileName;
-        }
-        while (is_file($destination."/".$name."-$i".$ext)) {
-            $i++; // increment i until finding a non existing file.
-        }
-        return $name."-$i".$ext;
-    }
-
-    public function mkDir($crtDir, $newDirName, $ignoreExists = false)
-    {
-        $currentNodeDir = new AJXP_Node($this->urlBase.$crtDir);
-        AJXP_Controller::applyHook("node.before_change", array(&$currentNodeDir));
-
-        $mess = ConfService::getMessages();
-        if ($newDirName=="") {
-            return "$mess[37]";
-        }
-        if (file_exists($this->urlBase."$crtDir/$newDirName")) {
-            if($ignoreExists) return null;
-            return "$mess[40]";
-        }
-        if (!$this->isWriteable($this->urlBase."$crtDir")) {
-            return $mess[38]." $crtDir ".$mess[99];
-        }
-
-        $dirMode = 0775;
-        $chmodValue = $this->repository->getOption("CHMOD_VALUE");
-        if (isSet($chmodValue) && $chmodValue != "") {
-            $dirMode = octdec(ltrim($chmodValue, "0"));
-            if ($dirMode & 0400) $dirMode |= 0100; // User is allowed to read, allow to list the directory
-            if ($dirMode & 0040) $dirMode |= 0010; // Group is allowed to read, allow to list the directory
-            if ($dirMode & 0004) $dirMode |= 0001; // Other are allowed to read, allow to list the directory
-        }
-        $old = umask(0);
-        mkdir($this->urlBase."$crtDir/$newDirName", $dirMode);
-        umask($old);
-        $newNode = new AJXP_Node($this->urlBase.$crtDir."/".$newDirName);
-        $newNode->setLeaf(false);
-        AJXP_Controller::applyHook("node.change", array(null, $newNode, false));
-        return null;
-    }
-
-    public function createEmptyFile($crtDir, $newFileName, $content = "", $force = false)
-    {
-        AJXP_Controller::applyHook("node.before_change", array(new AJXP_Node($this->urlBase.$crtDir)));
-        $mess = ConfService::getMessages();
-        if ($newFileName=="") {
-            return "$mess[37]";
-        }
-        if (!$force && file_exists($this->urlBase."$crtDir/$newFileName")) {
-            return "$mess[71]";
-        }
-        if (!$this->isWriteable($this->urlBase."$crtDir")) {
-            return "$mess[38] $crtDir $mess[99]";
-        }
-        $repoData = array(
-            'base_url' => $this->urlBase,
-            'chmod'     => $this->repository->getOption('CHMOD_VALUE'),
-            'recycle'     => $this->repository->getOption('RECYCLE_BIN')
-        );
-        $fp=fopen($this->urlBase."$crtDir/$newFileName","w");
-        if ($fp) {
-            if ($content != "") {
-                fputs($fp, $content);
-            }
-            $this->changeMode($this->urlBase."$crtDir/$newFileName", $repoData);
-            fclose($fp);
-            $newNode = new AJXP_Node($this->urlBase."$crtDir/$newFileName");
-            AJXP_Controller::applyHook("node.change", array(null, $newNode, false));
-            return null;
-        } else {
-            return "$mess[102] $crtDir/$newFileName (".$fp.")";
-        }
-    }
-
-
-    public function delete($selectedFiles, &$logMessages)
-    {
-        $repoData = array(
-            'base_url' => $this->urlBase,
-            'chmod'     => $this->repository->getOption('CHMOD_VALUE'),
-            'recycle'     => $this->repository->getOption('RECYCLE_BIN')
-        );
-        $mess = ConfService::getMessages();
-        foreach ($selectedFiles as $selectedFile) {
-            if ($selectedFile == "" || $selectedFile == DIRECTORY_SEPARATOR) {
-                return $mess[120];
-            }
-            $fileToDelete=$this->urlBase.$selectedFile;
-
-            if (!file_exists($fileToDelete)) {
-                $logMessages[]=$mess[100]." ".SystemTextEncoding::toUTF8($selectedFile);
-                continue;
-            }
-
-            $node = new AJXP_Node($fileToDelete);
-            $node->setLeaf(!is_dir($fileToDelete));
-
-            $this->deldir($fileToDelete, $repoData);
-
-            if ($node->isLeaf()) {
-                $logMessages[]="$mess[38] ".SystemTextEncoding::toUTF8($selectedFile)." $mess[44].";
-            } else {
-                $logMessages[]="$mess[34] ".SystemTextEncoding::toUTF8($selectedFile)." $mess[44].";
-            }
-            AJXP_Controller::applyHook("node.change", [$node]);
-        }
-        return null;
-    }
-
-    public function simpleCopy($origFile, $destFile)
-    {
-        return copy($origFile, $destFile);
-    }
-
-    public function isWriteable($dir, $type="dir")
-    {
-        if ( $this->getFilteredOption("USE_POSIX", $this->repository) == true && extension_loaded('posix')) {
-            $real = AJXP_MetaStreamWrapper::getRealFSReference($dir);
-            return posix_access($real, POSIX_W_OK);
-        }
-        //clearstatcache();
-        return is_writable($dir);
-    }
-
-    /**
-     * Change file permissions
-     *
-     * @param String $path
-     * @param String $chmodValue
-     * @param Boolean $recursive
-     * @param String $nodeType "both", "file", "dir"
-     * @param $changedFiles
-     * @return void
-     */
-    public function chmod($path, $chmodValue, $recursive, $nodeType, &$changedFiles)
-    {
-        $realValue = octdec(ltrim($chmodValue, "0"));
-        if (is_file($this->urlBase.$path)) {
-            if ($nodeType=="both" || $nodeType=="file") {
-                AJXP_MetaStreamWrapper::changeMode($this->urlBase.$path, $realValue);
-                $changedFiles[] = $path;
-            }
-        } else {
-            if ($nodeType=="both" || $nodeType=="dir") {
-                AJXP_MetaStreamWrapper::changeMode($this->urlBase.$path, $realValue);
-                $changedFiles[] = $path;
-            }
-            if ($recursive) {
-                $handler = opendir($this->urlBase.$path);
-                while ($child=readdir($handler)) {
-                    if($child == "." || $child == "..") continue;
-                    // do not pass realValue or it will be re-decoded.
-                    $this->chmod($path."/".$child, $chmodValue, $recursive, $nodeType, $changedFiles);
-                }
-                closedir($handler);
-            }
-        }
-    }
-
-    /**
-     * @param String $from
-     * @param String $to
-     * @param Boolean $copy
-     */
-    public function nodeChanged(&$from, &$to, $copy = false)
-    {
-        $fromNode = $toNode = null;
-        if($from != null) $fromNode = new AJXP_Node($this->urlBase.$from);
-        if($to != null) $toNode = new AJXP_Node($this->urlBase.$to);
-        AJXP_Controller::applyHook("node.change", array($fromNode, $toNode, $copy));
-    }
-
-    /**
-     * @param String $node
-     * @param null $newSize
-     */
-    public function nodeWillChange($node, $newSize = null)
-    {
-        if ($newSize != null) {
-            AJXP_Controller::applyHook("node.before_change", array(new AJXP_Node($this->urlBase.$node), $newSize));
-        } else {
-            AJXP_Controller::applyHook("node.before_path_change", array(new AJXP_Node($this->urlBase.$node)));
-        }
-    }
-
-
-    /**
-     * @var fsAccessDriver
-     */
-    public static $filteringDriverInstance;
-
-    /**
-     * @param $src
-     * @param $dest
-     * @param $basedir
-     * @throws Exception
-     * @return PclZip
-     */
-    public function makeZip ($src, $dest, $basedir)
-    {
-        $zipEncoding = ConfService::getCoreConf("ZIP_ENCODING");
-
-        @set_time_limit(0);
-        require_once(AJXP_BIN_FOLDER."/pclzip.lib.php");
-        $filePaths = array();
-        foreach ($src as $item) {
-            $realFile = AJXP_MetaStreamWrapper::getRealFSReference($this->urlBase."/".$item);
-            $realFile = AJXP_Utils::securePath($realFile);
-            if (basename($item) == "") {
-                $filePaths[] = array(PCLZIP_ATT_FILE_NAME => $realFile);
-            } else {
-                $shortName = basename($item);
-                if(!empty($zipEncoding)){
-                    $test = iconv(SystemTextEncoding::getEncoding(), $zipEncoding, $shortName);
-                    if($test !== false) $shortName = $test;
-                }
-                $filePaths[] = array(PCLZIP_ATT_FILE_NAME => $realFile,
-                                    PCLZIP_ATT_FILE_NEW_SHORT_NAME => $shortName);
-            }
-        }
-        $this->logDebug("Pathes", $filePaths);
-        self::$filteringDriverInstance = $this;
-        $archive = new PclZip($dest);
-
-        if($basedir == "__AJXP_ZIP_FLAT__/"){
-            $vList = $archive->create($filePaths, PCLZIP_OPT_REMOVE_ALL_PATH, PCLZIP_OPT_NO_COMPRESSION, PCLZIP_OPT_ADD_TEMP_FILE_ON, PCLZIP_CB_PRE_ADD, 'zipPreAddCallback');
-        }else{
-            $basedir = AJXP_MetaStreamWrapper::getRealFSReference($this->urlBase).trim($basedir);
-            $this->logDebug("Basedir", array($basedir));
-            $vList = $archive->create($filePaths, PCLZIP_OPT_REMOVE_PATH, $basedir, PCLZIP_OPT_NO_COMPRESSION, PCLZIP_OPT_ADD_TEMP_FILE_ON, PCLZIP_CB_PRE_ADD, 'zipPreAddCallback');
-        }
-
-        if (!$vList) {
-            throw new Exception("Zip creation error : ($dest) ".$archive->errorInfo(true));
-        }
-        self::$filteringDriverInstance = null;
-        return $vList;
-    }
-
-
-    public function recursivePurge($dirName, $hardPurgeTime, $softPurgeTime = 0)
-    {
-        $handle=opendir($dirName);
-        $shareCenter = false;
-        if(class_exists("ShareCenter")){
-            $shareCenter = ShareCenter::getShareCenter();
-        }
-        if($handle === false){
-            $this->logError(__FUNCTION__, "Cannot open folder ".$dirName);
-            return;
-        }
-        while (false !== ($entry = readdir($handle))) {
-            if ($entry == "" || $entry == ".."  || AJXP_Utils::isHidden($entry) ) {
-                continue;
-            }
-            $fileName = $dirName."/".$entry;
-            if (is_file($fileName)) {
-                $docAge = time() - filemtime($fileName);
-                if ($hardPurgeTime > 0 && $docAge > $hardPurgeTime) {
-                    $this->purge($fileName);
-                } elseif ($softPurgeTime > 0 && $docAge > $softPurgeTime) {
-                    if($shareCenter !== false && $shareCenter->isShared(new AJXP_Node($fileName))) {
-                        $this->purge($fileName);
-                    }
-                }
-            } else {
-                $this->recursivePurge($fileName, $hardPurgeTime, $softPurgeTime);
-            }
-        }
-        closedir($handle);
-    }
-
-    /**
-     * Apply specific operation to set a node as hidden.
-     * Can be overwritten, or will probably do nothing.
-     * @param AJXP_Node $node
-     */
-    public function setHiddenAttribute($node){
-        if(AJXP_MetaStreamWrapper::actualRepositoryWrapperClass($node->getRepositoryId()) == "fsAccessWrapper" && strtoupper(substr(PHP_OS, 0, 3)) === 'WIN'){
-            $realPath =  AJXP_MetaStreamWrapper::getRealFSReference($node->getUrl());
-            @shell_exec("attrib +H " . escapeshellarg($realPath));
-        }
-    }
-
-    private function purge($fileName)
-    {
-        $node = new AJXP_Node($fileName);
-        AJXP_Controller::applyHook("node.before_path_change", array($node));
-        unlink($fileName);
-        AJXP_Controller::applyHook("node.change", array($node));
-        $this->logInfo("Purge", array("file" => $fileName, "files" => $fileName));
-        print(" - Purging document : ".$fileName."\n");
-    }
-
-    /** The publiclet URL making */
-    public function makePublicletOptions($filePath, $password, $expire, $downloadlimit, $repository)
-    {
-        $data = array(
-            "DRIVER"=>$repository->getAccessType(),
-            "OPTIONS"=>NULL,
-            "FILE_PATH"=>$filePath,
-            "ACTION"=>"download",
-            "EXPIRE_TIME"=>$expire ? (time() + $expire * 86400) : 0,
-            "DOWNLOAD_LIMIT"=>$downloadlimit ? $downloadlimit : 0,
-            "PASSWORD"=>$password
-        );
-        return $data;
-    }
-
-    public function makeSharedRepositoryOptions($httpVars, $repository)
-    {
-        $newOptions = array(
-            "PATH" => SystemTextEncoding::toStorageEncoding($repository->getOption("PATH")).AJXP_Utils::decodeSecureMagic($httpVars["file"]),
-            "CREATE" => $repository->getOption("CREATE"),
-            "RECYCLE_BIN" => isSet($httpVars["inherit_recycle"])? $repository->getOption("RECYCLE_BIN") : "",
-            "DEFAULT_RIGHTS" => "",
-            "DATA_TEMPLATE" => ""
-        );
-        if ($repository->getOption("USE_SESSION_CREDENTIALS")===true) {
-            $newOptions["ENCODED_CREDENTIALS"] = AJXP_Safe::getEncodedCredentialString();
-        }
-        $customData = array();
-        foreach ($httpVars as $key => $value) {
-            if (substr($key, 0, strlen("PLUGINS_DATA_")) == "PLUGINS_DATA_") {
-                $customData[substr($key, strlen("PLUGINS_DATA_"))] = $value;
-            }
-        }
-        if (count($customData)) {
-            $newOptions["PLUGINS_DATA"] = $customData;
-        }
-        if ($repository->getOption("META_SOURCES")) {
-            $newOptions["META_SOURCES"] = $repository->getOption("META_SOURCES");
-            foreach ($newOptions["META_SOURCES"] as $index => &$data) {
-                if (isSet($data["USE_SESSION_CREDENTIALS"]) && $data["USE_SESSION_CREDENTIALS"] === true) {
-                    $newOptions["META_SOURCES"][$index]["ENCODED_CREDENTIALS"] = AJXP_Safe::getEncodedCredentialString();
-                }
-            }
-            AJXP_Controller::applyHook("workspace.share_metasources", array(&$newOptions["META_SOURCES"]));
-        }
-        return $newOptions;
-    }
-
-
-}
-
-function zipPreAddCallback($value, &$header)
-{
-    if(fsAccessDriver::$filteringDriverInstance == null) return true;
-    $search = $header["filename"];
-    $zipEncoding = ConfService::getCoreConf("ZIP_ENCODING");
-    if(!empty($zipEncoding)){
-        $test = iconv(SystemTextEncoding::getEncoding(), $zipEncoding, $header["stored_filename"]);
-        if($test !== false){
-            $header["stored_filename"] = $test;
-        }
-    }
-    return !(fsAccessDriver::$filteringDriverInstance->filterFile($search, true)
-        || fsAccessDriver::$filteringDriverInstance->filterFolder($search, "contains"));
-}
-
-if (!function_exists('staticExtractArchiveItemCallback')){
-    function staticExtractArchiveItemPostCallback($status, $data){
-        return fsAccessDriver::$currentZipOperationHandler->extractArchiveItemPostCallback($status, $data);
-    }
-    function staticExtractArchiveItemPreCallback($status, $data){
-        return fsAccessDriver::$currentZipOperationHandler->extractArchiveItemPreCallback($status, $data);
-    }
-}
diff --git a/core/src/plugins/access.fs/class.fsAccessWrapper.php b/core/src/plugins/access.fs/class.fsAccessWrapper.php
deleted file mode 100644
index 3653eb4098..0000000000
--- a/core/src/plugins/access.fs/class.fsAccessWrapper.php
+++ /dev/null
@@ -1,519 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Wrapper for a local filesystem
- * @package AjaXplorer_Plugins
- * @subpackage Access
- */
-class fsAccessWrapper implements AjxpWrapper
-{
-    /**
-     * FileHandle resource
-     *
-     * @var resource
-     */
-    protected $fp;
-    /**
-     * DirHandle resource
-     *
-     * @var resource
-     */
-    protected $dH;
-
-    /**
-     * If dH is not used but an array containing the listing
-     * instead. dH == -1 in that case.
-     *
-     * @var array()
-     */
-    protected static $currentListing;
-    protected static $currentListingKeys;
-    protected static $currentListingIndex;
-    protected static $currentFileKey;
-    protected static $crtZip;
-    protected $realPath;
-    protected static $lastRealSize;
-
-    /**
-     * Initialize the stream from the given path.
-     *
-     * @param string $path
-     * @param $streamType
-     * @param bool $storeOpenContext
-     * @param bool $skipZip
-     * @return mixed Real path or -1 if currentListing contains the listing : original path converted to real path
-     * @throws AJXP_Exception
-     * @throws Exception
-     */
-    protected static function initPath($path, $streamType, $storeOpenContext = false, $skipZip = false)
-    {
-        $path = self::unPatchPathForBaseDir($path);
-        $url = AJXP_Utils::safeParseUrl($path);
-        $repoId = $url["host"];
-        $test = trim($url["path"], "/");
-        $atRoot = empty($test);
-        $repoObject = ConfService::getRepositoryById($repoId);
-        if(!isSet($repoObject)) throw new Exception("Cannot find repository with id ".$repoId);
-        $split = UserSelection::detectZip($url["path"]);
-        $insideZip = false;
-        if($split && $streamType == "file" && $split[1] != "/") $insideZip = true;
-        if($split && $streamType == "dir") $insideZip = true;
-        if($skipZip) $insideZip = false;
-
-        $resolveUser = null;
-        if(isSet($url["user"]) && AuthService::usersEnabled()){
-            $resolveUser = ConfService::getConfStorageImpl()->createUserObject($url["user"]);
-        }
-        $resolvedPath = realpath(SystemTextEncoding::toStorageEncoding($repoObject->getOption("PATH", false, $resolveUser)));
-
-        //var_dump($path);
-        //var_dump($skipZip);
-        // Inside a zip : copy the file to a tmp file and return a reference to it
-        if ($insideZip) {
-            $zipPath = $split[0];
-            $localPath = $split[1];
-            require_once(AJXP_BIN_FOLDER."/pclzip.lib.php");
-            //print($streamType.$path);
-               if ($streamType == "file") {
-                   if (self::$crtZip == null ||  !is_array(self::$currentListingKeys)) {
-                       $tmpDir = AJXP_Utils::getAjxpTmpDir() . DIRECTORY_SEPARATOR . md5(time()-rand());
-                       mkdir($tmpDir);
-                       $tmpFileName = $tmpDir.DIRECTORY_SEPARATOR.basename($localPath);
-                       AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Tmp file $tmpFileName");
-                       register_shutdown_function(array("fsAccessWrapper", "removeTmpFile"), $tmpDir, $tmpFileName);
-                        $crtZip = new PclZip(AJXP_Utils::securePath($resolvedPath.$repoObject->resolveVirtualRoots($zipPath)));
-                        $content = $crtZip->listContent();
-                        if(is_array($content)){
-                            foreach ($content as $item) {
-                                $fName = AJXP_Utils::securePath($item["stored_filename"]);
-                                if ($fName == $localPath || "/".$fName == $localPath) {
-                                    $localPath = $fName;
-                                    break;
-                                }
-                            }
-                        }
-                        $crtZip->extract(PCLZIP_OPT_BY_NAME, $localPath, PCLZIP_OPT_PATH, $tmpDir, PCLZIP_OPT_REMOVE_ALL_PATH);
-                        AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Extracted ".$path." to ".dirname($localPath));
-                        if($storeOpenContext) self::$crtZip = $crtZip;
-                        return $tmpFileName;
-                   } else {
-                       $key = basename($localPath);
-                       if (array_key_exists($key, self::$currentListing)) {
-                           self::$currentFileKey = $key;
-                           return -1;
-                       } else {
-                           throw new AJXP_Exception("Cannot find key");
-                       }
-                   }
-               } else {
-                $crtZip = new PclZip(AJXP_Utils::securePath($resolvedPath.$repoObject->resolveVirtualRoots($zipPath)));
-                $liste = $crtZip->listContent();
-                   if(!is_array($liste)) $liste = array();
-                if($storeOpenContext) self::$crtZip = $crtZip;
-                $folders = array(); $files = array();$builtFolders = array();
-                if($localPath[strlen($localPath)-1] != "/") $localPath.="/";
-                foreach ($liste as $item) {
-                    $stored = $item["stored_filename"];
-                    if($stored[0] != "/") $stored = "/".$stored;
-                    $pathPos = strpos($stored, $localPath);
-                    if ($pathPos !== false) {
-                        $afterPath = substr($stored, $pathPos+strlen($localPath));
-                        if ($afterPath != "" && substr_count($afterPath, "/") < 2) {
-                            $statValue = array();
-                            if (substr_count($afterPath, "/") == 0) {
-                                $statValue[2] = $statValue["mode"] = ($item["folder"]?00040555:0100555);
-                                $statValue[7] = $statValue["size"] = $item["size"];
-                                $statValue[8] = $statValue["atime"] = $item["mtime"];
-                                $statValue[9] = $statValue["mtime"] = $item["mtime"];
-                                $statValue[10] = $statValue["ctime"] = $item["mtime"];
-                                if (strpos($afterPath, "/") == strlen($afterPath)-1) {
-                                    $afterPath = substr($afterPath, 0, strlen($afterPath)-1);
-                                }
-                                //$statValue["filename"] = $zipPath.$localPath.$afterPath;
-                                if ($item["folder"]) {
-                                    $folders[$afterPath] = $statValue;
-                                } else {
-                                    $files[$afterPath] = $statValue;
-                                }
-                            } else {
-                                $arr = explode("/", $afterPath);
-                                $afterPath = array_shift($arr);
-                                if(isSet($folders[$afterPath]) || isSet($builtFolders[$afterPath])) continue;
-                                $statValue[2] = $statValue["mode"] = 00040555;
-                                $statValue[7] = $statValue["size"] = 0;
-                                $statValue[8] = $statValue["atime"] = $item["mtime"];
-                                $statValue[9] = $statValue["mtime"] = $item["mtime"];
-                                $statValue[10] = $statValue["ctime"] = $item["mtime"];
-                                $builtFolders[$afterPath] = $statValue;
-                            }
-                        }
-                    }
-                }
-                self::$currentListing = array_merge($folders, $builtFolders, $files);
-                self::$currentListingKeys = array_keys(self::$currentListing);
-                self::$currentListingIndex = 0;
-                return -1;
-               }
-        } else {
-            if ($atRoot) {
-                $virtual = $repoObject->listVirtualRoots();
-                if (count($virtual)) {
-                    self::$currentListing = array();
-                    foreach ($virtual as $rootKey => $rootValue) {
-                        $statValue = array();
-                        $statValue[2] = $statValue["mode"] = 00040000;//($rootValue["right"] == "rw" ? "00040000" : "00070000");
-                        self::$currentListing[$rootKey] = $statValue;
-                    }
-                    self::$currentListingKeys = array_keys(self::$currentListing);
-                    self::$currentListingIndex = 0;
-                    return -1;
-                }
-            }
-            return $resolvedPath.$repoObject->resolveVirtualRoots($url["path"]);
-        }
-    }
-
-    public static function patchPathForBaseDir($dirPath)
-    {
-        if(!ini_get("open_basedir") || !preg_match('/\.zip/i', $dirPath)) return $dirPath;
-        return str_replace(".zip", "__ZIP_EXTENSION__", $dirPath);
-
-    }
-
-    public static function unPatchPathForBaseDir($dirPath)
-    {
-        if(!ini_get("open_basedir")) return $dirPath;
-        return str_replace("__ZIP_EXTENSION__", ".zip", $dirPath);
-    }
-
-    public static function removeTmpFile($tmpDir, $tmpFile)
-    {
-        if(is_file($tmpFile)) unlink($tmpFile);
-        if(is_dir($tmpDir)) rmdir($tmpDir);
-    }
-
-    protected static function closeWrapper()
-    {
-        if (self::$crtZip != null) {
-            self::$crtZip = null;
-            self::$currentListing  = null;
-            self::$currentListingKeys = null;
-            self::$currentListingIndex = null;
-            self::$currentFileKey = null;
-        }
-    }
-
-    public static function getRealFSReference($path, $persistent = false)
-    {
-        $contextOpened =false;
-        if (self::$crtZip != null) {
-            $contextOpened = true;
-            $crtZip = self::$crtZip;
-            self::$crtZip = null;
-        }
-        $realPath = self::initPath($path, "file");
-        if (!$contextOpened) {
-            self::closeWrapper();
-        } else {
-            self::$crtZip = $crtZip;
-        }
-        return $realPath;
-    }
-
-    public static function isRemote()
-    {
-        return false;
-    }
-
-    public static function isSeekable($url)
-    {
-        if(strpos($url, ".zip/") !== false) return false;
-        return true;
-    }
-
-    public static function copyFileInStream($path, $stream)
-    {
-        $fp = fopen(self::getRealFSReference($path), "rb");
-        if(!is_resource($fp)) return;
-        while (!feof($fp)) {
-            if(!ini_get("safe_mode")) @set_time_limit(60);
-             $data = fread($fp, 4096);
-             fwrite($stream, $data, strlen($data));
-        }
-        fclose($fp);
-    }
-
-    public static function changeMode($path, $chmodValue)
-    {
-        $realPath = self::initPath($path, "file");
-        @chmod($realPath, $chmodValue);
-    }
-
-    /**
-     * Opens the strem
-     *
-     * @param String $path Maybe in the form "ajxp.fs://repositoryId/pathToFile"
-     * @param String $mode
-     * @param string $options
-     * @param resource $context
-     * @return bool
-     */
-    public function stream_open($path, $mode, $options, &$context)
-    {
-        try {
-            $this->realPath = AJXP_Utils::securePath(self::initPath($path, "file"));
-        } catch (Exception $e) {
-            AJXP_Logger::error(__CLASS__,"stream_open", "Error while opening stream $path (".$e->getMessage().")");
-            return false;
-        }
-        if ($this->realPath == -1) {
-            $this->fp = -1;
-            return true;
-        } else {
-            $this->fp = fopen($this->realPath, $mode, $options);
-            return ($this->fp !== false);
-        }
-    }
-
-    public function stream_seek($offset , $whence = SEEK_SET)
-    {
-        fseek($this->fp, $offset, $whence);
-    }
-
-    public function stream_tell()
-    {
-        return ftell($this->fp);
-    }
-
-    public function stream_stat()
-    {
-        $PROBE_REAL_SIZE = ConfService::getConf("PROBE_REAL_SIZE");
-        if (is_resource($this->fp)) {
-            $statValue = fstat($this->fp);
-            fsAccessWrapper::$lastRealSize = false;
-            if ($statValue[2] > 0 && $PROBE_REAL_SIZE && !ini_get("safe_mode")) {
-                fsAccessWrapper::$lastRealSize = floatval(trim($this->getTrueSizeOnFileSystem($this->realPath)));
-            }
-            return $statValue;
-        }
-        if (is_resource($this->dH)) {
-            return fstat($this->dH);
-        }
-        if ($this->fp == -1) {
-            return self::$currentListing[self::$currentFileKey];
-        }
-        return null;
-    }
-
-    public function url_stat($path, $flags)
-    {
-        // File and zip case
-        $patchedPath = self::patchPathForBaseDir($path);
-        if (ini_get("open_basedir") && preg_match('/__ZIP_EXTENSION__/', $patchedPath)) {
-            // Zip Folder case
-            self::$lastRealSize = false;
-            $search = basename($path);
-            $realBase = $this->initPath(dirname($path), "dir");
-            if ($realBase == -1) {
-                if (array_key_exists($search, self::$currentListing)) {
-                    return self::$currentListing[$search];
-                }
-            }
-        }
-        if ($fp = @fopen($path, "r")) {
-            $stat = fstat($fp);
-            fclose($fp);
-            return $stat;
-        }
-        // Folder case
-        $real = $this->initPath($path, "dir", false, true);
-        if ($real!=-1 && is_dir($real)) {
-            return stat($real);
-        }
-        // Zip Folder case
-        $search = basename($path);
-        $realBase = $this->initPath(dirname($path), "dir");
-        if ($realBase == -1) {
-            if (array_key_exists($search, self::$currentListing)) {
-                return self::$currentListing[$search];
-            }
-        }
-        // 000 permission file
-        if ($real != -1 && is_file($real)) {
-            return stat($real);
-        }
-        // Handle symlinks!
-        if ($real != -1 && is_link($real)) {
-               $realFile = @readlink($real);
-               if (is_file($realFile) || is_dir($realFile)) {
-                   return stat($realFile);
-               } else {
-                // symlink is broken, delete it.
-                   @unlink($real);
-                   return null;
-               }
-           }
-
-        // Non existing file
-           return null;
-    }
-
-    public function rename($from, $to)
-    {
-        return rename($this->initPath($from, "file", false, true), $this->initPath($to, "file", false, true));
-    }
-
-    public function stream_read($count)
-    {
-        return fread($this->fp, $count);
-    }
-
-    public function stream_write($data)
-    {
-        fwrite($this->fp, $data, strlen($data));
-        return strlen($data);
-    }
-
-    public function stream_eof()
-    {
-        return feof($this->fp);
-    }
-
-    public function stream_close()
-    {
-        if (isSet($this->fp) && $this->fp!=-1 && $this->fp!==false) {
-            fclose($this->fp);
-        }
-    }
-
-    public function stream_flush()
-    {
-        if (isSet($this->fp) && $this->fp!=-1 && $this->fp!==false) {
-            fflush($this->fp);
-        }
-    }
-
-    public function unlink($path)
-    {
-        $this->realPath = $this->initPath($path, "file", false, true);
-        return unlink($this->realPath);
-    }
-
-    public function rmdir($path, $options)
-    {
-        $this->realPath = $this->initPath($path, "file", false, true);
-        return rmdir($this->realPath);
-    }
-
-    public function mkdir($path, $mode, $options)
-    {
-        return mkdir($this->initPath($path, "file"), $mode);
-    }
-
-    /**
-     * Readdir functions
-     *
-     * @param string $path
-     * @param int $options
-     */
-    public function dir_opendir ($path , $options )
-    {
-        $this->realPath = $this->initPath($path, "dir", true);
-        if (is_string($this->realPath)) {
-            $this->dH = @opendir($this->realPath);
-        } else if ($this->realPath == -1) {
-            $this->dH = -1;
-        }
-        return $this->dH !== false;
-    }
-    public function dir_closedir  ()
-    {
-        $this->closeWrapper();
-        if ($this->dH == -1) {
-            return;
-        } else {
-            closedir($this->dH);
-        }
-    }
-    public function dir_readdir ()
-    {
-        if ($this->dH == -1) {
-            if (isSet(self::$currentListingKeys[self::$currentListingIndex])) {
-                self::$currentListingIndex++;
-                return self::$currentListingKeys[self::$currentListingIndex - 1];
-            } else {
-                return false;
-            }
-        } else {
-            return readdir($this->dH);
-        }
-    }
-    public function dir_rewinddir ()
-    {
-        if ($this->dH == -1) {
-            self::$currentListingIndex = 0;
-        } else {
-            rewinddir($this->dH);
-        }
-    }
-
-    /**
-     * @return bool|float
-     */
-    public static function getLastRealSize()
-    {
-        if(empty(self::$lastRealSize)) return false;
-        return self::$lastRealSize;
-    }
-
-    protected function getTrueSizeOnFileSystem($file)
-    {
-        if (!(strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')) {
-            $cmd = "stat -L -c%s ".escapeshellarg($file);
-            $val = trim(`$cmd`);
-            if (!is_numeric($val) || $val == -1) {
-                // No stat on system
-                $cmd = "ls -1s --block-size=1 ".escapeshellarg($file);
-                $val = trim(`$cmd`);
-                if (strlen($val) == 0 || floatval($val) == 0) {
-                    // No block-size on system (probably busybox), try long output
-                    $cmd = "ls -l ".escapeshellarg($file)."";
-                    $arr = explode("/[\s]+/", `$cmd`);
-                    $val = trim($arr[4]);
-                    if (strlen($val) == 0 || floatval($val) == 0) {
-                        // Still not working, get a value at least, not 0...
-                        $val = sprintf("%u", filesize($file));
-                    }
-                }
-            }
-            return floatval($val);
-        } else if (class_exists("COM")) {
-            $fsobj = new COM("Scripting.FileSystemObject");
-            $f = $fsobj->GetFile($file);
-            return floatval($f->Size);
-        } else if (is_file($file)) {
-            return exec('FOR %A IN ("'.$file.'") DO @ECHO %~zA');
-        } else return sprintf("%u", filesize($file));
-    }
-}
diff --git a/core/src/plugins/access.fs/fsActions.xml b/core/src/plugins/access.fs/fsActions.xml
index 61e0415e80..84534af0f4 100644
--- a/core/src/plugins/access.fs/fsActions.xml
+++ b/core/src/plugins/access.fs/fsActions.xml
@@ -46,6 +46,12 @@
 				</serverCallback>
 			</processing>
 		</action>
+        <action name="fs_create_resource">
+            <rightsContext adminOnly="false" noUser="false" read="true" userLogged="true" write="true"/>
+            <processing>
+                <serverCallback methodName="createResourceAction"/>
+            </processing>
+        </action>
         <action name="mkdir">
             <gui text="154" title="155" src="folder_new.png" iconClass="mdi mdi-folder-plus" accessKey="folder_access_key" hasAccessKey="true">
                 <context selection="false" dir="true" recycle="hidden" actionBar="true"
@@ -140,10 +146,8 @@
                         }
 						if(pydio.getController().getActionByName("trigger_remote_copy")){
                             modal.setCloseAction(function(){
-                                ajaxplorer.fireContextRefresh();
-                                var bgManager = pydio.getController().getBackgroundTasksManager();
-                                bgManager.queueAction("trigger_remote_copy", {}, "Copying files to server");
-                                bgManager.next();
+                                pydio.fireContextRefresh();
+                                PydioApi.getClient().request({get_action:'trigger_remote_copy'});
                             });
 						}
 						if(uploader.dialogOnOpen){
@@ -153,6 +157,7 @@
 						if(uploader.dialogOnComplete){
 							uploader.resourcesManager.load();
 							var dialogOnComplete = new Function("oForm", uploader.dialogOnComplete);
+							modal.setCloseAction(dialogOnComplete);
 						}
 						var dialogOpen = function(form){
 						    if (form.down('#uploader_chooser')) form.down('#uploader_chooser').remove();
@@ -178,7 +183,7 @@
 						modal.showDialogForm('Upload', uploader.formId, dialogOpen, null, dialogOnComplete, true, true);
 					}
 				]]></clientCallback>
-				<serverCallback methodName="switchAction" restParams="/input_stream/dir+" preferredHttp="PUT" sdkMethodName="upload" developerComment="Post a file content for upload, by default as x-www-form-urlencoded, but can be passed as input stream as well." checkParams="false">
+				<serverCallback methodName="uploadAction" restParams="/input_stream/dir+" preferredHttp="PUT" sdkMethodName="upload" developerComment="Post a file content for upload, by default as x-www-form-urlencoded, but can be passed as input stream as well." checkParams="false">
                     <input_param description="Target path in the workspace of the file to upload" name="node" type="string" mandatory="true"/>
                     <input_param description="Flag that the file content is passed via the php://input stream instead of standard $_FILES data" name="input_upload" type="boolean" default="false"/>
                     <input_param description="Automatically detect if there is an existing file with that name, and add a number suffix to the new file." name="auto_rename" type="boolean"/>
@@ -189,18 +194,28 @@
 		</action>
 		<action name="empty_recycle">
 			<gui text="220" title="221" src="trashcan_empty.png" iconClass="icon-ban-circle" accessKey="empty_recycle_access_key" hasAccessKey="true">
-				<context selection="false" dir="true" recycle="only" actionBar="true"
+				<context selection="true" dir="true" recycle="only" actionBar="true"
                          contextMenu="true" infoPanel="false" actionBarGroup="change_main"/>
+                <selectionContext dir="false" file="false" recycle="true" unique="true"/>
 			</gui>
 			<rightsContext noUser="true" userLogged="" read="true" write="true" adminOnly=""/>
 			<processing>
+                <serverCallback methodName="switchAction" restParams="/"/>
 				<clientCallback prepareModal="false"><![CDATA[
-				    ajaxplorer.getContextHolder().selectAll();
-					window.setTimeout(function(){
-						pydio.getController().fireAction('delete');
-					}, 200);
-					]]></clientCallback>
-				</processing>
+					modal.showDialogForm('EmptyRecycle', 'empty_recycle_form', null, function(){
+						PydioApi.getClient().request({get_action:'empty_recycle'}, function(transport){
+						    PydioApi.getClient().parseXmlMessage(transport.responseXML);
+						});
+						hideLightBox(true);
+						return false;
+					});
+                ]]></clientCallback>
+                <clientForm id="empty_recycle_form"><![CDATA[
+                    <div id="empty_recycle_form" action="empty_recycle" box_width="200">
+                        <span ajxp_message_id="177">AJXP_MESSAGE[177]</span>
+                    </div>
+				]]></clientForm>
+            </processing>
 		</action>
 		<action name="download" fileDefault="false">
 			<gui text="88" title="88" src="download_manager.png" iconClass="mdi mdi-download" accessKey="download_access_key" hasAccessKey="true">
@@ -272,7 +287,7 @@
 						}
 					}
 					]]></clientListener>
-				<serverCallback methodName="switchAction" restParams="/file+" checkParams="false" sdkMethodName="download" developerComment="Download one or many files at once. If multiple files (or a folder path) passed, they are sent back as an archive.">
+				<serverCallback methodName="downloadAction" restParams="/file+" checkParams="false" sdkMethodName="download" developerComment="Download one or many files at once. If multiple files (or a folder path) passed, they are sent back as an archive.">
                     <input_param description="User selection" name="nodes" type="AJXP_NODE[]" mandatory="true"/>
                     <output type="stream"/>
 				</serverCallback>
@@ -519,7 +534,7 @@
 		<action name="get_content">
             <rightsContext noUser="true" userLogged="only" read="true" write="false" adminOnly="false"/>
 			<processing>
-				<serverCallback methodName="switchAction" restParams="/node+" developerComment="Alternative to Download, without attachment headers but more in a stream-like format, depending on file type (image, audio, video, plain text).">
+				<serverCallback methodName="downloadAction" restParams="/node+" developerComment="Alternative to Download, without attachment headers but more in a stream-like format, depending on file type (image, audio, video, plain text).">
                     <input_param description="Path of the node" name="node" type="path" mandatory="true"/>
 				</serverCallback>
 			</processing>
@@ -607,6 +622,11 @@
                 </serverCallback>
 				</processing>
 		</action>
+        <action name="cross_copy">
+            <processing>
+                <serverCallback methodName="crossRepositoryCopy"/>
+            </processing>
+        </action>
 		<action name="copy" ctrlDragndropDefault="true">
 			<gui text="66" title="159" src="editcopy.png" iconClass="icon-copy" hasAccessKey="false">
 				<context selection="true" dir="" recycle="hidden"
@@ -652,7 +672,7 @@
 							if(user.canWrite()) this.treeSelector.appendFilterValue(activeRepository, "&lt;"+MessageHash[372]+"&gt;", 'top');
 							this.treeSelector.setFilterSelectedIndex(0);
 							this.treeSelector.setFilterChangeCallback(function(e){
-								externalRepo = this.filterSelector.getValue();
+								var externalRepo = this.filterSelector.getValue();
 								var nodeProvider = new RemoteNodeProvider();
 								nodeProvider.initProvider({tmp_repository_id:externalRepo});
 								this.resetAjxpRootNode(new AjxpNode("/", false, MessageHash[373], "folder.png", nodeProvider));
@@ -688,6 +708,7 @@
 							<div id="treeCopy" style="height:194px; padding: 3px 2px; overflow:auto; text-align:left;" class="treeCopyContainer"></div>
 						</div>
 						<input type="text" name="dest" value="/" readonly  style="width:248px; border: 1px solid #ccc; margin-top:7px; margin-bottom:2px;background-image:none;"/>
+						<a id="selector_create_folder"><span class="mdi mdi-folder-plus"></span></a>
 					</div>
 				]]></clientForm>
 				<clientListener name="contextChange"><![CDATA[
@@ -814,8 +835,8 @@
 				<clientCallback prepareModal="true"><![CDATA[
 					var onLoad = function(oForm){
 				    	var message = MessageHash[177];
-				    	var repoHasRecycle = ajaxplorer.getContextHolder().getRootNode().getMetadata().get("repo_has_recycle");
-				    	if(repoHasRecycle && repoHasRecycle == "true" && ajaxplorer.getContextNode().getAjxpMime() != "ajxp_recycle"){
+				    	var repoHasRecycle = pydio.getContextHolder().getRootNode().getMetadata().get("repo_has_recycle");
+				    	if(repoHasRecycle && pydio.getContextNode().getAjxpMime() != "ajxp_recycle"){
 				    		message = MessageHash[176];
 				    	}
 		   		    	$(oForm).getElementsBySelector('span[id="delete_message"]')[0].innerHTML = message;
@@ -880,7 +901,7 @@
         <action name="prepare_chunk_dl">
             <rightsContext noUser="true" userLogged="only" read="true" write="false" adminOnly="false"/>
             <processing>
-                <serverCallback methodName="switchAction" restParams="/chunk_count/node+" developerComment="Use the filesize of the file to generate an list of pieces to be downloaded using {download_chunk} action. Will generate a unique file_id to be used later.">
+                <serverCallback methodName="downloadAction" restParams="/chunk_count/node+" developerComment="Use the filesize of the file to generate an list of pieces to be downloaded using {download_chunk} action. Will generate a unique file_id to be used later.">
                     <input_param description="Selected node" name="node" type="path" mandatory="true"/>
                     <input_param description="Number of pieces to create for the file" name="chunk_count" type="integer"/>
                     <output type="application/json"/>
@@ -907,7 +928,7 @@
 						dObject.insert({before:'\
 							<div id="chunk_dl_form" style="height:36px;"> \
 								<span style="display:inline-block;float:left;margin-top: 11px;margin-left: 4px;margin-right: 4px;">'+MessageHash[400]+'</span> <input type="text" style="float:left;margin-top:5px; text-align:right; width:30px;height:24px;" name="chunk_count" id="chunk_count" value="4"> \
-								<input type="image" style="float:left;" id="dl_form_submit" src="AJXP_THEME_FOLDER/images/actions/22/dialog_ok_apply.png" height="22" width="22" title="OK" class="dialogButton dialogFocus">\
+								<a id="dl_form_submit" class="dialogButton dialogFocus">OK</a>\
 							</div> \
 						'});
 						$("dl_form_submit").observe("click", function(e){
@@ -948,7 +969,7 @@
 					<iframe id="download_iframe" name="download_iframe" style="display:none"></iframe>
 					</div>]]>
                 </clientForm>
-                <serverCallback methodName="switchAction" restParams="/chunk_index/file_id" developerComment="Chunk file into pieces before downloading the pieces. Can be handy for problematic and limited servers.">
+                <serverCallback methodName="downloadAction" restParams="/chunk_index/file_id" developerComment="Chunk file into pieces before downloading the pieces. Can be handy for problematic and limited servers.">
                     <input_param description="Unique key generated during the {prepare_chunk_dl} action." name="file_id" type="string"/>
                     <input_param description="Position of the file to download" name="chunk_index" type="integer"/>
                 </serverCallback>
@@ -993,43 +1014,6 @@
 					</div>
 				]]></html>
 			</infoPanel>
-			<infoPanel mime="generic_file" attributes="basename,preview_rich,filesize,mimestring,formated_date" theme="oxygen,umbra,vision">
-				<messages>
-					<message key="name_string" id="133"/>
-					<message key="size_string" id="127"/>
-					<message key="type_string" id="134"/>
-					<message key="modif_string" id="138"/>
-					<message key="header_string" id="341"/>
-				</messages>
-				<html><![CDATA[
-                <div class="infoPanelImagePreview">
-                    #{preview_rich}
-                </div>
-				<div class="infoPanelAllMetadata">
-				    <div>
-                        <div class="panelHeader infoPanelGroup"><span class="icon-info" data-ajxpAction="no-action"></span> #{header_string}</div>
-                        <table class="infoPanelTable" cellspacing="0" border="0" cellpadding="0">
-                            <tr>
-                                <td class="infoPanelLabel">#{name_string}</td>
-                                <td class="infoPanelValue">#{basename}</td>
-                            </tr>
-                            <tr class="even">
-                                <td class="infoPanelLabel">#{size_string}</td>
-                                <td class="infoPanelValue">#{filesize}</td>
-                            </tr>
-                            <tr>
-                                <td class="infoPanelLabel">#{modif_string}</td>
-                                <td class="infoPanelValue">#{formated_date}</td>
-                            </tr>
-                            <tr class="even">
-                                <td class="infoPanelLabel">#{type_string}</td>
-                                <td class="infoPanelValue">#{mimestring}</td>
-                            </tr>
-                        </table>
-                    </div>
-				</div>
-				]]></html>
-			</infoPanel>
 			<infoPanel mime="generic_file" attributes="basename,preview_rich,filesize,mimestring,formated_date,ajxp_description" theme="orbit" primary="true">
 				<messages>
 					<message key="name_string" id="133"/>
@@ -1067,33 +1051,6 @@
 				</div>
 				]]></html>
 			</infoPanel>
-			<infoPanel mime="generic_dir" attributes="basename,icon,formated_date" theme="oxygen,umbra,vision">
-				<messages>
-					<message key="name_string" id="133"/>
-					<message key="modif_string" id="138"/>
-					<message key="header_string" id="342"/>
-				</messages>
-				<html><![CDATA[
-                    <div class="folderImage infoPanelImagePreview">
-                        <img src="AJXP_THEME_FOLDER/images/mimes/64/#{icon}" height="64" width="64">
-                    </div>
-					<div class="infoPanelAllMetadata">
-					    <div>
-                            <div class="panelHeader infoPanelGroup"><span class="icon-info" data-ajxpAction="no-action"></span> #{header_string}</div>
-                            <table class="infoPanelTable" cellspacing="0" border="0" cellpadding="0">
-                                <tr>
-                                    <td class="infoPanelLabel">#{name_string}</td>
-                                    <td class="infoPanelValue">#{basename}</td>
-                                </tr>
-                                <tr class="even">
-                                    <td class="infoPanelLabel">#{modif_string}</td>
-                                    <td class="infoPanelValue">#{formated_date}</td>
-                                </tr>
-                            </table>
-						</div>
-					</div>
-				]]></html>
-			</infoPanel>
 			<infoPanel mime="generic_dir" attributes="basename,icon,fonticon,formated_date,ajxp_description" theme="orbit">
 				<messages>
 					<message key="name_string" id="133"/>
diff --git a/core/src/plugins/access.fs/fsTemplatePart.xml b/core/src/plugins/access.fs/fsTemplatePart.xml
index bca9a8ad64..1f12363275 100644
--- a/core/src/plugins/access.fs/fsTemplatePart.xml
+++ b/core/src/plugins/access.fs/fsTemplatePart.xml
@@ -6,7 +6,7 @@
                 <span id="left_navigator" ajxpClass="AjxpReactComponent" ajxpOptions='{"componentNamespace":"LeftNavigation","componentName":"Panel"}'></span>
                 <div id="breadcrumb" class="breadcrumbs-one" ajxpClass="Breadcrumb" ajxpOptions='{"use_ul":true, "always_show_root":true, "hide_home_icon":true, "flexTo":"workspace_toolbar", "flexToMargin":80, "checkSiblings":true, "resize_events":["actions_refreshed"]}'></div>
                 <div style="float:right;margin-top:14px;" ajxpClass="AjxpPane" ajxpOptions='{}' id="search_engine_cont">
-                    <div id="buttons_bar_top" style="float:right;" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["put"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
+                    <div id="buttons_bar_top" style="float:right;" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["put"],"submenuOffsetTop":2}'></div>
                 </div>
                 <div id="search_container" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "openSearchInput":"true", "openSearchStickLeftTo":"topPane", "searchChooserAsResultsHeader":true, "toggleResultsFitTo":"cpane_tabs", "fitMarginBottom":0, "toggleResultsOffsetRight":0, "toggleResultsOffsetTop":0, "detailThumbSize":24}'></div>
                 <div style="clear:both;" class="skipSibling"></div>
@@ -29,9 +29,9 @@
                     <div id="cpane_tabs" ajxpClass="AjxpTabulator" ajxpOptions='{"fit":"height", "fitParent":"browser", "refireResize":0.5, "registerAsEditorOpener":true, "saveState":false,"events":{"ajaxplorer:context_changed":"this.switchToFirstIfPathDiffers(arguments[0]);"}, "defaultTabId": "files","tabInfos" : [{"id":"files","label":"","iconClass":"icon-folder-open", "element":"files_list_pane"}]}'>
                         <div id="files_list_pane" ajxpClass="AjxpPane" ajxpOptions='{"classNamesOn":{"infoPanelFolded":{"event":"vertical_splitter-fold-status","memoKey":"folded"}}}'>
                             <div id="files_list_header" ajxpClass="AjxpPane">
-                                <div id="display_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["content_pane-actions","vertical_splitter-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":5}'></div>
+                                <div id="display_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["content_pane-actions","vertical_splitter-actions"],"submenuOffsetTop":5}'></div>
                                 <div style="float:left;position:fixed;" ajxpClass="AjxpPane"  id="buttons_bar_cont" ajxpOptions='{"flexTo":"files_list_header", "flexToMargin":30, "resize_events":["switchDisplayMode-FilesList-content_pane"]}'>
-                                    <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["navigation", "info_panel","info_panel_share", "change_main"],"groupOtherToolbars":["more", "change", "remote"], "groupOtherLabel":"More","skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
+                                    <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["navigation", "info_panel","info_panel_share", "change_main"],"groupOtherToolbars":["more", "change", "remote"], "groupOtherLabel":"More","submenuOffsetTop":2}'></div>
                                 </div>
                             </div>
                             <div id="vertical_splitter" ajxpClass="Splitter" class="forceComputeFit" ajxpOptions='{"direction": "vertical", "initB":250, "minB":250,"fit":"height","fitParent":"browser", "minSize":250, "invisibleBar": true, "foldingButton":"B", "foldingButtonText":341, "foldingMinSize":0}'>
diff --git a/core/src/plugins/access.fs/i18n/conf/de.php b/core/src/plugins/access.fs/i18n/conf/de.php
index 120b9010f8..bd25eb8e8a 100644
--- a/core/src/plugins/access.fs/i18n/conf/de.php
+++ b/core/src/plugins/access.fs/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "File System (Standard)" => "Dateisystem (Standard)",
@@ -45,4 +45,4 @@
 "Delegates all download operations to nginx using the X-Accel-Redirect header. Warning, you have to add some configuration in nginx, like X-Accel-Mapping" => "Überträgt alle Download-Operationen über den X-Accel-Redirect Header an nginx. Warnung: Sie müssen Ihre nginx-Konfiguration erweitern, etwa X-Accel-Mapping",
 "Zip downloading files on the fly" => "Zip downloading files on the fly",
 "Directly write the zip file to an output stream which is connected to the user's browser." => "Directly write the zip file to an output stream which is connected to the user's browser.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/access.fs/i18n/conf/en.php b/core/src/plugins/access.fs/i18n/conf/en.php
index f42d1abdf8..67fde69ce2 100644
--- a/core/src/plugins/access.fs/i18n/conf/en.php
+++ b/core/src/plugins/access.fs/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "File System (Standard)" => "File System (Standard)",
diff --git a/core/src/plugins/access.fs/i18n/conf/fr.php b/core/src/plugins/access.fs/i18n/conf/fr.php
index 6aed623899..d664af968a 100644
--- a/core/src/plugins/access.fs/i18n/conf/fr.php
+++ b/core/src/plugins/access.fs/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "File System (Standard)" => "Fichiers locaux (Standard)",
@@ -45,4 +45,4 @@
 "Delegates all download operations to nginx using the X-Accel-Redirect header. Warning, you have to add some configuration in nginx, like X-Accel-Mapping" => "Déléguer l'ensemble des opérations de téléchargement à nginx en utilisant l'entête X-SendFile. Attention, il faut ajouter une configuration à nginx, par exemple X-Accel-Mapping",
 "Zip downloading files on the fly" => "Télécharger les zips à la construction",
 "Directly write the zip file to an output stream which is connected to the user's browser." => "Ecrire directement l'archive Zip dans le flux de sortie, sans passer par un fichier temporaire.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/access.fs/i18n/conf/it.php b/core/src/plugins/access.fs/i18n/conf/it.php
index 48d530e119..b437c7aba2 100644
--- a/core/src/plugins/access.fs/i18n/conf/it.php
+++ b/core/src/plugins/access.fs/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "File System (Standard)" => "File System (Standard)",
@@ -45,4 +45,4 @@
 "Delegates all download operations to nginx using the X-Accel-Redirect header. Warning, you have to add some configuration in nginx, like X-Accel-Mapping" => "Delega tutte le operazioni di download a nginx, usando l'header X-Accel-Redirect. Attenzione: devi aggiungere manualmente qualche configurazione a nginx, come l'X-Accel Mapping.",
 "Zip downloading files on the fly" => "Zip downloading files on the fly",
 "Directly write the zip file to an output stream which is connected to the user's browser." => "Directly write the zip file to an output stream which is connected to the user's browser.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/access.fs/i18n/conf/pt.php b/core/src/plugins/access.fs/i18n/conf/pt.php
index 7abca83aef..b1f1574b9c 100644
--- a/core/src/plugins/access.fs/i18n/conf/pt.php
+++ b/core/src/plugins/access.fs/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "File System (Standard)" => "Sistema de Ficheiros (padrão)",
@@ -45,4 +45,4 @@
 "Delegates all download operations to nginx using the X-Accel-Redirect header. Warning, you have to add some configuration in nginx, like X-Accel-Mapping" => "Delegates all download operations to nginx using the X-Accel-Redirect header. Warning, you have to add some configuration in nginx, like X-Accel-Mapping",
 "Zip downloading files on the fly" => "Zip downloading files on the fly",
 "Directly write the zip file to an output stream which is connected to the user's browser." => "Directly write the zip file to an output stream which is connected to the user's browser.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/access.fs/i18n/conf/ru.php b/core/src/plugins/access.fs/i18n/conf/ru.php
index c55b056c0e..c76cd9a00e 100644
--- a/core/src/plugins/access.fs/i18n/conf/ru.php
+++ b/core/src/plugins/access.fs/i18n/conf/ru.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "File System (Standard)" => "Файловая система (Стандарт)",
@@ -45,4 +45,4 @@
 "Delegates all download operations to nginx using the X-Accel-Redirect header. Warning, you have to add some configuration in nginx, like X-Accel-Mapping" => "Делегировать все операции скачивания для nginx с использованием заголовка X-Accel-Redirect. Необходима настройка nginx, например X-Accel-Mapping",
 "Zip downloading files on the fly" => "Zip downloading files on the fly",
 "Directly write the zip file to an output stream which is connected to the user's browser." => "Directly write the zip file to an output stream which is connected to the user's browser.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/access.fs/manifest.xml b/core/src/plugins/access.fs/manifest.xml
index 2f02122873..dae6fcea75 100644
--- a/core/src/plugins/access.fs/manifest.xml
+++ b/core/src/plugins/access.fs/manifest.xml
@@ -6,7 +6,7 @@
         </resources>
     </client_settings>
 	<server_settings>
-		<param name="PATH" type="string" label="CONF_MESSAGE[Path]" description="CONF_MESSAGE[Real path to the root folder on the server]" mandatory="true"/>
+		<param name="PATH" type="string" label="CONF_MESSAGE[Path]" description="CONF_MESSAGE[Absolute path to the folder on the server. You can use AJXP_DATA_PATH and AJXP_INSTALL_PATH to point to Pydio default data path and root install path.]" mandatory="true"/>
 		<param name="CREATE" type="boolean" label="CONF_MESSAGE[Create]" description="CONF_MESSAGE[Create folder if it does not exists]" default="true" mandatory="true"/>
         <param name="CHMOD_VALUE" type="string" label="CONF_MESSAGE[File Creation Mask]" description="CONF_MESSAGE[Optionnaly apply a chmod operation. Value must be numeric, like 0777, 0644, etc.]" default="0666"/>
         <param name="PURGE_AFTER" type="integer" label="CONF_MESSAGE[Purge Days (Hard limit)]" description="CONF_MESSAGE[Option to purge documents after a given number of days (even if shared). This require a manual set up of a CRON task. Leave to 0 if you don't wan't to use this feature.]" default="0"/>
@@ -14,12 +14,9 @@
         <param name="DATA_TEMPLATE" type="string" label="CONF_MESSAGE[Data template]" description="CONF_MESSAGE[Path to a directory on the filesystem whose content will be copied to the repository the first time it is loaded.]" default=""/>
         <global_param name="PROBE_REAL_SIZE" type="boolean" label="CONF_MESSAGE[Real Size Probing]" description="CONF_MESSAGE[Use system command line to get the filesize instead of php built-in function (fixes the 2Go limitation)]" default="false"/>
         <global_param name="USE_POSIX" type="boolean" label="CONF_MESSAGE[Use POSIX]" description="CONF_MESSAGE[Use php POSIX extension to read files permissions. Only works on *nix systems.]" default="false"/>
-        <global_param name="USE_XSENDFILE" type="boolean" label="CONF_MESSAGE[X-SendFile Active]" description="CONF_MESSAGE[Delegates all download operations to the webserver using the X-SendFile header. Warning, this is an external module to install for Apache. Module is active by default in Lighttpd. Warning, you have to manually add the folders where files will be downloaded in the module configuration (XSendFilePath directive)]" default="false"/>
-        <global_param name="USE_XACCELREDIRECT" type="boolean" label="CONF_MESSAGE[X-Accel-Redirect Active]" description="CONF_MESSAGE[Delegates all download operations to nginx using the X-Accel-Redirect header. Warning, you have to add some configuration in nginx, like X-Accel-Mapping]" default="false"/>
-        <global_param name="ZIP_ON_THE_FLY" type="boolean" label="CONF_MESSAGE[Zip downloading files on the fly]" description="CONF_MESSAGE[Directly write the zip file to an output stream which is connected to the user's browser.]" default="false"/>
         <global_param group="MIXIN_MESSAGE[Metadata and indexation]" name="DEFAULT_METASOURCES" type="string" label="MIXIN_MESSAGE[Default Metasources]" description="MIXIN_MESSAGE[Comma separated list of metastore and meta plugins, that will be automatically applied to all repositories created with this driver]" mandatory="false" default="metastore.serial,meta.watch,meta.syncable,meta.filehasher,index.lucene"/>
 	</server_settings>
-	<class_definition filename="plugins/access.fs/class.fsAccessDriver.php" classname="fsAccessDriver"/>
+	<class_definition filename="plugins/access.fs/FsAccessDriver.php" classname="Pydio\Access\Driver\StreamProvider\FS\FsAccessDriver"/>
 	<registry_contributions>
 		<external_file filename="plugins/access.fs/fsActions.xml" include="actions/*" exclude=""/>
 		<external_file filename="plugins/access.fs/fsTemplatePart.xml" include="client_configs/*" exclude=""/>
@@ -39,7 +36,8 @@
 		<external_file filename="plugins/access.fs/fsActions.xml" include="client_configs/*" exclude=""/>
         <hooks>
             <serverCallback hookName="node.info" methodName="loadNodeInfo"/>
+            <serverCallback hookName="node.info.nocache" methodName="localizeNodeInfo"/>
         </hooks>
 	</registry_contributions>
-    <class_stream_wrapper filename="plugins/access.fs/class.fsAccessWrapper.php" classname="fsAccessWrapper" protocol="ajxp.fs"/>
+    <class_stream_wrapper filename="plugins/access.fs/FsAccessWrapper.php" classname="Pydio\Access\Driver\StreamProvider\FS\FsAccessWrapper" protocol="ajxp.fs"/>
 </ajxpdriver>
diff --git a/core/src/plugins/access.fs/test.fsAccess.php b/core/src/plugins/access.fs/test.fsAccess.php
index b8412b02fa..e7aa8a2384 100644
--- a/core/src/plugins/access.fs/test.fsAccess.php
+++ b/core/src/plugins/access.fs/test.fsAccess.php
@@ -16,11 +16,15 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
-defined('AJXP_EXEC') or die( 'Access not allowed');
+namespace Pydio\Tests;
+
+
+use Pydio\Core\Model\Context;
+use Pydio\Core\Utils\TextEncoder;
 
-require_once(AJXP_BIN_FOLDER . '/class.AbstractTest.php');
+defined('AJXP_EXEC') or die( 'Access not allowed');
 
 /**
  * @package AjaXplorer_Plugins
@@ -28,12 +32,15 @@
  */
 class fsAccessTest extends AbstractTest
 {
+    /**
+     * fsAccessTest constructor.
+     */
     public function __construct() { parent::__construct("Filesystem Plugin", ""); }
 
     /**
      * Test Repository
      *
-     * @param Repository $repo
+     * @param \Pydio\Access\Core\Model\Repository $repo
      * @return Boolean
      */
     public function doRepositoryTest($repo)
@@ -41,17 +48,17 @@ public function doRepositoryTest($repo)
         if ($repo->accessType != 'fs' ) return -1;
         // Check the destination path
         $this->failedInfo = "";
-        $safePath = $repo->getOption("PATH", true);
-        if(strstr($safePath, "AJXP_USER")!==false) return TRUE; // CANNOT TEST THIS CASE!
-        $path = $repo->getOption("PATH", false);
-        $createOpt = $repo->getOption("CREATE");
-        $create = (($createOpt=="true"||$createOpt===true)?true:false);
-        if (!$create && !@is_dir($path)) {
+        $safePath = $repo->getSafeOption("PATH");
+        if(strstr($safePath, "AJXP_USER")!==false) {
+            return TRUE;
+        } // CANNOT TEST THIS CASE!
+        $ctx = Context::emptyContext();
+        $path       = $repo->getContextOption($ctx, "PATH");
+        $createOpt  = $repo->getContextOption($ctx, "CREATE");
+        $create     = (($createOpt=="true"||$createOpt===true)?true:false);
+        if (!$create && !is_dir(TextEncoder::toStorageEncoding($path))) {
             $this->failedInfo .= "Selected repository path ".$path." doesn't exist, and the CREATE option is false"; return FALSE;
-        }/* else if ($create && !is_writeable($path)) {
-            $this->failedInfo .= "Selected repository path ".$path." isn't writeable"; return FALSE;
-        }*/
-        // Do more tests here
+        }
         return TRUE;
     }
 
diff --git a/core/src/plugins/access.ftp/FtpAccessDriver.php b/core/src/plugins/access.ftp/FtpAccessDriver.php
new file mode 100644
index 0000000000..db5f1581d2
--- /dev/null
+++ b/core/src/plugins/access.ftp/FtpAccessDriver.php
@@ -0,0 +1,382 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ *
+ */
+namespace Pydio\Access\Driver\StreamProvider\FTP;
+
+use DOMNode;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\UploadedFileInterface;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\RecycleBinManager;
+use Pydio\Access\Driver\StreamProvider\FS\FsAccessDriver;
+use Pydio\Core\Http\Response\SerializableResponseStream;
+use Pydio\Core\Model\ContextInterface;
+
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\XMLFilter;
+use Pydio\Tasks\Task;
+use Pydio\Tasks\TaskService;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Plugin to access a remote server using the File Transfer Protocol
+ * @package AjaXplorer_Plugins
+ * @subpackage Access
+ */
+class FtpAccessDriver extends FsAccessDriver
+{
+    /**
+     * Load manifest
+     * @throws \Exception
+     */
+    public function loadManifest()
+    {
+        parent::loadManifest();
+        // BACKWARD COMPATIBILITY!
+        $res = $this->getXPath()->query('//param[@name="USER"] | //param[@name="PASS"] | //user_param[@name="USER"] | //user_param[@name="PASS"]');
+        /** @var \DOMElement $node */
+        foreach ($res as $node) {
+            if ($node->getAttribute("name") == "USER") {
+                $node->setAttribute("name", "FTP_USER");
+            } else if ($node->getAttribute("name") == "PASS") {
+                $node->setAttribute("name", "FTP_PASS");
+            }
+        }
+        $this->reloadXPath();
+    }
+
+    /**
+     * Parse
+     * @param ContextInterface $ctx
+     * @param DOMNode $contribNode
+     */
+    protected function parseSpecificContributions(ContextInterface $ctx, \DOMNode &$contribNode)
+    {
+        parent::parseSpecificContributions($ctx, $contribNode);
+        if($contribNode->nodeName != "actions") return ;
+        $this->disableArchiveBrowsingContributions($contribNode);
+        $this->redirectActionsToMethod($contribNode, array("upload", "next_to_remote", "trigger_remote_copy"), "uploadActions");
+    }
+
+    /**
+     * @param ContextInterface $contextInterface
+     * @throws PydioException
+     * @throws \Exception
+     */
+    protected function initRepository(ContextInterface $contextInterface)
+    {
+
+        if (is_array($this->pluginConf)) {
+            $this->driverConf = $this->pluginConf;
+        } else {
+            $this->driverConf = array();
+        }
+        $this->urlBase = $contextInterface->getUrlBase();
+        $recycle = $contextInterface->getRepository()->getContextOption($contextInterface, "RECYCLE_BIN");
+        if ($recycle != "") {
+            RecycleBinManager::init($contextInterface->getUrlBase(), "/".$recycle);
+        }
+
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @return null
+     * @throws PydioException
+     */
+    public function uploadActions(ServerRequestInterface &$request, ResponseInterface &$response)
+    {
+        /** @var ContextInterface $ctx */
+        $ctx = $request->getAttribute("ctx");
+
+        switch ($request->getAttribute("action")) {
+
+            case "next_to_remote":
+                $taskId = $request->getAttribute("pydio-task-id");
+                if(!$this->hasFilesToCopy($ctx)) {
+                    TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_COMPLETE, "");
+                    break;
+                }
+
+                $fData = $this->getNextFileToCopy($ctx);
+                $nextFile = '';
+                if ($this->hasFilesToCopy($ctx)) {
+                    $nextFile = $this->getFileNameToCopy($ctx);
+                }
+                $this->logDebug("Base64 : ", array("from"=>$fData["destination"], "to"=>base64_decode($fData['destination'])));
+                $destPath = $ctx->getUrlBase().base64_decode($fData['destination'])."/".$fData['name'];
+                //$destPath = AJXP_Utils::decodeSecureMagic($destPath);
+                // DO NOT "SANITIZE", THE URL IS ALREADY IN THE FORM ajxp.ftp://repoId/filename
+                $destPath = InputFilter::fromPostedFileName($destPath);
+                $node = new AJXP_Node($destPath);
+                $this->logDebug("Copying file to server", array("from"=>$fData["tmp_name"], "to"=>$destPath, "name"=>$fData["name"]));
+                TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_RUNNING, "Uploading file ".$fData["name"]);
+                try {
+                    Controller::applyHook("node.before_create", array(&$node));
+                    $fp = fopen($destPath, "w");
+                    $fSource = fopen($fData["tmp_name"], "r");
+                    while (!feof($fSource)) {
+                        fwrite($fp, fread($fSource, 4096));
+                    }
+                    fclose($fSource);
+                    $this->logDebug("Closing target : begin ftp copy");
+                    // Make sur the script does not time out!
+                    @set_time_limit(240);
+                    fclose($fp);
+                    $this->logDebug("FTP Upload : end of ftp copy");
+                    @unlink($fData["tmp_name"]);
+                    Controller::applyHook("node.change", array(null, &$node));
+
+                } catch (\Exception $e) {
+                    TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_FAILED, "");
+                    $this->logDebug("Error during ftp copy", array($e->getMessage(), $e->getTrace()));
+                }
+                $this->logDebug("FTP Upload : shoud trigger next or reload nextFile=$nextFile");
+                $x = new SerializableResponseStream();
+                $response = $response->withBody($x);
+                if ($nextFile!='') {
+                    //$x->addChunk(new BgActionTrigger("next_to_remote", array(), "Copying file ".TextEncoder::toUTF8($nextFile)." to remote server"));
+                    $newTask = TaskService::actionAsTask($ctx, "next_to_remote", []);
+                    $newTask->setLabel("Copying file " . $nextFile . " to remote server");
+                    $response = TaskService::getInstance()->enqueueTask($newTask, $request, $response);
+                } else {
+                    //$x->addChunk(new BgActionTrigger("reload_node", array(), "Upload done, reloading client."));
+                    TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_COMPLETE, "");
+                }
+            break;
+
+            case "upload":
+                $httpVars = $request->getParsedBody();
+                $destinationFolder = InputFilter::securePath("/" . $httpVars['dir']);
+
+                /** @var UploadedFileInterface[] $uploadedFiles */
+                $uploadedFiles = $request->getUploadedFiles();
+                if(!count($uploadedFiles)){
+                    $this->writeUploadError($request, "Could not find any uploaded file", 411);
+                }
+                foreach ($uploadedFiles as $parameterName => $uploadedFile) {
+
+                    if (substr($parameterName, 0, 9) != "userfile_") continue;
+                    try {
+
+                        $this->logDebug("Upload : rep_source ", array($destinationFolder));
+                        $err = InputFilter::parseFileDataErrors($uploadedFile, true);
+                        if ($err != null) {
+                            $errorCode = $err[0];
+                            $errorMessage = $err[1];
+                            throw new \Exception($errorMessage, $errorCode);
+                        }
+                        $fileName = $uploadedFile->getClientFilename();
+
+                        if (isSet($httpVars["auto_rename"])) {
+                            $destination = $ctx->getUrlBase() . $destinationFolder;
+                            $fileName = FsAccessDriver::autoRenameForDest($destination, $fileName);
+                        }
+                        $boxData = [
+                            "name" => $fileName,
+                            "destination" => base64_encode($destinationFolder)
+                        ];
+
+                        $destCopy = XMLFilter::resolveKeywords($ctx->getRepository()->getContextOption($ctx, "TMP_UPLOAD"));
+                        $this->logDebug("Upload : tmp upload folder", array($destCopy));
+                        if (!is_dir($destCopy)) {
+                            if (!@mkdir($destCopy)) {
+                                $this->logDebug("Upload error : cannot create temporary folder", array($destCopy));
+                                throw new PydioException("Warning, cannot create folder for temporary copy", false, 413);
+                            }
+                        }
+                        if (!is_writable($destCopy)) {
+                            $this->logDebug("Upload error: cannot write into temporary folder");
+                            throw new PydioException("Warning, cannot write into temporary folder", false, 414);
+                            break;
+                        }
+                        $this->logDebug("Upload : tmp upload folder", array($destCopy));
+
+                        $mess = LocaleService::getMessages();
+                        $destName = tempnam($destCopy, "");
+                        $boxData["tmp_name"] = $destName;
+                        $this->copyUploadedData($uploadedFile, $destName, $mess);
+                        $this->storeFileToCopy($ctx, $boxData);
+                        $this->writeUploadSuccess($request, ["PREVENT_NOTIF" => true]);
+
+                        $task = TaskService::actionAsTask($ctx, "next_to_remote", []);
+                        $task->setLabel("Copying file to remote server");
+                        TaskService::getInstance()->enqueueTask($task, $request, $response);
+
+                    } catch (\Exception $e) {
+                        $errorCode = $e->getCode();
+                        if(empty($errorCode)) $errorCode = 411;
+                        $this->writeUploadError($request, $e->getMessage(), $errorCode);
+                    }
+                }
+            break;
+
+            default:
+            break;
+        }
+        return null;
+    }
+
+    /**
+     * Specific isWriteable implementation
+     * @param AJXP_Node $node
+     * @return bool
+     */
+    public function isWriteable(AJXP_Node $node)
+    {
+        if ($node->isRoot()) { // ROOT, WE ARE NOT SURE TO BE ABLE TO READ THE PARENT
+            return true;
+        } else {
+            return is_writable($node->getUrl());
+        }
+
+    }
+
+    /**
+     * Recursive del dir
+     * @param string $location
+     * @param array $repoData
+     * @throws \Exception
+     */
+    public function deldir($location, $repoData, $taskId = NULL)
+    {
+        if (is_dir($location)) {
+            $dirsToRecurse = array();
+            $all=opendir($location);
+            while ($file=readdir($all)) {
+                if (is_dir("$location/$file") && $file !=".." && $file!=".") {
+                    $dirsToRecurse[] = "$location/$file";
+                } elseif (!is_dir("$location/$file")) {
+                    if (file_exists("$location/$file")) {
+                        unlink("$location/$file");
+                    }
+                    unset($file);
+                }
+            }
+            closedir($all);
+            foreach ($dirsToRecurse as $recurse) {
+                $this->deldir($recurse, $repoData);
+            }
+            rmdir($location);
+        } else {
+            if (file_exists("$location")) {
+                $test = @unlink("$location");
+                if(!$test) throw new \Exception("Cannot delete file ".$location);
+            }
+        }
+        if (isSet($repoData["recycle"]) && basename(dirname($location)) == $repoData["recycle"]) {
+            // DELETING FROM RECYCLE
+            RecycleBinManager::deleteFromRecycle($location);
+        }
+    }
+
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $fileData
+     */
+    public function storeFileToCopy(ContextInterface $ctx, $fileData)
+    {
+        $user = $ctx->getUser();
+        $files = $user->getTemporaryData("tmp_upload");
+        $this->logDebug("Saving user temporary data", array($fileData));
+        $files[] = $fileData;
+        $user->saveTemporaryData("tmp_upload", $files);
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @return mixed
+     */
+    public function getFileNameToCopy(ContextInterface $ctx)
+    {
+            $user = $ctx->getUser();
+            $files = $user->getTemporaryData("tmp_upload");
+            return $files[0]["name"];
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @return string
+     */
+    public function getNextFileToCopy(ContextInterface $ctx)
+    {
+            if(!$this->hasFilesToCopy($ctx)) return "";
+            $user = $ctx->getUser();
+            $files = $user->getTemporaryData("tmp_upload");
+            $fData = $files[0];
+            array_shift($files);
+            $user->saveTemporaryData("tmp_upload", $files);
+            return $fData;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @return bool
+     */
+    public function hasFilesToCopy(ContextInterface $ctx)
+    {
+            $user = $ctx->getUser();
+            $files = $user->getTemporaryData("tmp_upload");
+            return (count($files)?true:false);
+    }
+
+    /**
+     * @param $params
+     * @return string
+     * @throws PydioException
+     */
+    public function testParameters($params)
+    {
+        if (empty($params["FTP_USER"])) {
+            throw new PydioException("Even if you intend to use the credentials stored in the session, temporarily set a user and password to perform the connexion test.");
+        }
+        if ($params["FTP_SECURE"]) {
+            $link = @ftp_ssl_connect($params["FTP_HOST"], $params["FTP_PORT"]);
+        } else {
+            $link = @ftp_connect($params["FTP_HOST"], $params["FTP_PORT"]);
+        }
+        if (!$link) {
+            throw new PydioException("Cannot connect to FTP server (".$params["FTP_HOST"].",". $params["FTP_PORT"].")");
+        }
+        @ftp_set_option($link, FTP_TIMEOUT_SEC, 10);
+        if (!@ftp_login($link,$params["FTP_USER"],$params["FTP_PASS"])) {
+            ftp_close($link);
+            throw new PydioException("Cannot login to FTP server with user ".$params["FTP_USER"]);
+        }
+        if (!$params["FTP_DIRECT"]) {
+            @ftp_pasv($link, true);
+            global $_SESSION;
+            $_SESSION["ftpPasv"]="true";
+        }
+        ftp_close($link);
+
+        return "SUCCESS: Could succesfully connect to the FTP server with user '".$params["FTP_USER"]."'.";
+    }
+
+
+}
diff --git a/core/src/plugins/access.ftp/FtpAccessWrapper.php b/core/src/plugins/access.ftp/FtpAccessWrapper.php
new file mode 100644
index 0000000000..1bd2f2160b
--- /dev/null
+++ b/core/src/plugins/access.ftp/FtpAccessWrapper.php
@@ -0,0 +1,794 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ *
+ */
+namespace Pydio\Access\Driver\StreamProvider\FTP;
+
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Access\Core\IAjxpWrapper;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Auth\Core\MemorySafe;
+use Pydio\Core\Model\ContextInterface;
+
+
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Services\SessionService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\FileHelper;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\PathUtils;
+use Pydio\Core\Utils\Vars\UrlUtils;
+
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+
+/**
+ * Wrapper for encapsulation FTP accesses
+ * @package AjaXplorer_Plugins
+ * @subpackage Access
+ */
+class FtpAccessWrapper implements IAjxpWrapper
+{
+    // Instance vars $this->
+    protected $host;
+    protected $port;
+    protected $secure;
+    protected $path;
+    protected $user;
+    protected $password;
+    protected $ftpActive;
+    protected $repoCharset;
+    protected $repositoryId;
+    protected $fp;
+
+    protected $crtMode;
+    protected $crtLink;
+    protected $crtTarget;
+
+    // Shared vars self::
+    private static $dirContentLoopPath = array();
+    private static $dirContent = array();
+    private static $dirContentKeys = array();
+    private static $dirContentIndex = array();
+
+    private $monthes = array("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Juil", "Aug", "Sep", "Oct", "Nov", "Dec");
+
+    /**
+     * @param string $path
+     * @param bool $persistent
+     * @return string
+     */
+    public static function getRealFSReference($path, $persistent = false)
+    {
+        $tmpFile = ApplicationState::getAjxpTmpDir() ."/".md5(time());
+        $tmpHandle = fopen($tmpFile, "wb");
+        self::copyFileInStream($path, $tmpHandle);
+        fclose($tmpHandle);
+        if (!$persistent) {
+            register_shutdown_function(function() use($tmpFile){
+                FileHelper::silentUnlink($tmpFile);
+            });
+        }
+        return $tmpFile;
+    }
+
+    /**
+     * @return bool
+     */
+    public static function isRemote()
+    {
+        return true;
+    }
+
+    /**
+     * @param String $url
+     * @return bool
+     */
+    public static function isSeekable($url)
+    {
+        return true;
+    }
+
+    /**
+     * @param string $path
+     * @param resource $stream
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public static function copyFileInStream($path, $stream)
+    {
+        $fake = new FtpAccessWrapper();
+        $parts = $fake->parseUrl($path);
+        $link = $fake->createFTPLink();
+        $serverPath = InputFilter::securePath($fake->path . "/" . $parts["path"]);
+        Logger::debug($serverPath);
+        ftp_fget($link, $stream, $serverPath, FTP_BINARY);
+    }
+
+    /**
+     * @param string $path
+     * @param number $chmodValue
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public static function changeMode($path, $chmodValue)
+    {
+        $fake = new FtpAccessWrapper();
+        $parts = $fake->parseUrl($path);
+        $link = $fake->createFTPLink();
+        $serverPath = InputFilter::securePath($fake->path . "/" . $parts["path"]);
+        ftp_chmod($link, $chmodValue, $serverPath);
+    }
+
+    /**
+     * @param string $url
+     * @param string $mode
+     * @param int $options
+     * @param string $context
+     * @return bool
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public function stream_open($url, $mode, $options, &$context)
+    {
+        if (stripos($mode, "w") !== false) {
+            $this->crtMode = 'write';
+            $parts = $this->parseUrl($url);
+            $this->crtTarget = InputFilter::securePath($this->path . "/" . $parts["path"]);
+            $this->crtLink = $this->createFTPLink();
+            $this->fp = tmpfile();
+        } else {
+            $this->crtMode = 'read';
+            $this->fp = tmpfile();
+            $this->copyFileInStream($url, $this->fp);
+            rewind($this->fp);
+        }
+        /*
+        if ($context) {
+            $this->fp = @fopen($this->buildRealUrl($url), $mode, $options, $context);
+        } else {
+            $this->fp = @fopen($this->buildRealUrl($url), $mode);
+        }
+        */
+        return ($this->fp !== false);
+    }
+
+    /**
+     * @return array
+     */
+    public function stream_stat()
+    {
+        return fstat($this->fp);
+    }
+
+    /**
+     * @param int $offset
+     * @param int $whence
+     */
+    public function stream_seek($offset , $whence = SEEK_SET)
+    {
+        fseek($this->fp, $offset, SEEK_SET);
+    }
+
+    /**
+     * @return int
+     */
+    public function stream_tell()
+    {
+        return ftell($this->fp);
+    }
+
+    /**
+     * @param int $count
+     * @return string
+     */
+    public function stream_read($count)
+    {
+        return fread($this->fp, $count);
+    }
+
+    /**
+     * @param string $data
+     * @return int
+     */
+    public function stream_write($data)
+    {
+        fwrite($this->fp, $data, strlen($data));
+        return strlen($data);
+    }
+
+    /**
+     * @return bool
+     */
+    public function stream_eof()
+    {
+        return feof($this->fp);
+    }
+
+    public function stream_close()
+    {
+        if (isSet($this->fp) && $this->fp!=-1 && $this->fp!==false) {
+            fclose($this->fp);
+        }
+    }
+
+    // PHP bug #62035
+    /**
+     * @param $errno
+     * @param $errstr
+     * @param $errfile
+     * @param $errline
+     * @param $errcontext
+     * @throws PydioException
+     */
+    public static function fput_quota_hack($errno, $errstr, $errfile, $errline, $errcontext)
+    {
+      if (strpos($errstr, "Opening BINARY mode data connection") !== false)
+        $errstr = "Transfer failed. Please check available disk space (quota)";
+        throw new PydioException("$errno - $errstr");
+    }
+
+    /**
+     *
+     */
+    public function stream_flush()
+    {
+        if (isSet($this->fp) && $this->fp!=-1 && $this->fp!==false) {
+            if ($this->crtMode == 'write') {
+                rewind($this->fp);
+                Logger::debug(__CLASS__,__FUNCTION__,"Ftp_fput", array("target"=>$this->crtTarget));
+                set_error_handler(array("\\Pydio\\Access\\Driver\\StreamProvider\\FTP\\FtpAccessWrapper", "fput_quota_hack"), E_ALL & ~E_NOTICE );
+                ftp_fput($this->crtLink, $this->crtTarget, $this->fp, FTP_BINARY);
+                restore_error_handler();
+                Logger::debug(__CLASS__,__FUNCTION__,"Ftp_fput end", array("target"=>$this->crtTarget));
+            } else {
+                fflush($this->fp);
+            }
+        }
+    }
+
+    /**
+     * @param string $url
+     * @return bool
+     */
+    public function unlink($url)
+    {
+        return unlink($this->buildRealUrl($url));
+    }
+
+    /**
+     * @param string $url
+     * @param int $options
+     * @return bool
+     */
+    public function rmdir($url, $options)
+    {
+        return rmdir($this->buildRealUrl($url));
+    }
+
+    /**
+     * @param string $url
+     * @param int $mode
+     * @param int $options
+     * @return bool
+     */
+    public function mkdir($url, $mode, $options)
+    {
+        return mkdir($this->buildRealUrl($url), $mode);
+    }
+
+    /**
+     * @param string $from
+     * @param string $to
+     * @return bool
+     */
+    public function rename($from, $to)
+    {
+        return rename($this->buildRealUrl($from), $this->buildRealUrl($to));
+    }
+
+    /**
+     * @param string $path
+     * @param int $flags
+     * @return array|mixed|null
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public function url_stat($path, $flags)
+    {
+        // We are in an opendir loop
+        Logger::debug(__CLASS__,__FUNCTION__,"URL_STAT", $path);
+        $node = new AJXP_Node($path);
+        $testLoopPath = PathUtils::forwardSlashDirname($path);
+        if (is_array(self::$dirContent[$testLoopPath])) {
+            $search = PathUtils::forwardSlashBasename($path);
+            //if($search == "") $search = ".";
+            if (array_key_exists($search, self::$dirContent[$testLoopPath])) {
+                return self::$dirContent[$testLoopPath][$search];
+            }
+        }
+        $parts = $this->parseUrl($path);
+        $link = $this->createFTPLink();
+        $serverPath = InputFilter::securePath($this->path . "/" . $parts["path"]);
+        if(empty($parts["path"])) $parts["path"] = "/";
+        if ($parts["path"] == "/") {
+            $basename = ".";
+        } else {
+            $basename = PathUtils::forwardSlashBasename($serverPath);
+        }
+
+        $serverParent = PathUtils::forwardSlashDirname($parts["path"]);
+        $serverParent = InputFilter::securePath($this->path . "/" . $serverParent);
+
+        $testCd = @ftp_chdir($link, $serverPath);
+        if ($testCd === true) {
+            // DIR
+            $contents = $this->rawList($link, $serverParent, 'd');
+            foreach ($contents as $entry) {
+                $res = $this->rawListEntryToStat($entry);
+                Logger::debug(__CLASS__,__FUNCTION__,"RAWLISTENTRY ".$res["name"]. " (searching ".$basename.")", $res["stat"]);
+                if ($res["name"] == $basename) {
+                    AbstractAccessDriver::fixPermissions($node, $res["stat"], array($this, "getRemoteUserId"));
+                    $statValue = $res["stat"];
+                    return $statValue;
+                }
+            }
+            // Not found : is it the "."
+            if($basename == "."){
+                // Make at least a readable fake stat
+                $fakeStat = stat(AJXP_DATA_PATH);
+                return $fakeStat;
+            }
+        } else {
+            // FILE
+            $contents = $this->rawList($link, $serverPath, 'f');
+            if (count($contents) == 1) {
+                $res = $this->rawListEntryToStat($contents[0]);
+                AbstractAccessDriver::fixPermissions($node, $res["stat"], array($this, "getRemoteUserId"));
+                $statValue = $res["stat"];
+                Logger::debug(__CLASS__,__FUNCTION__,"STAT FILE $serverPath", $statValue);
+                return $statValue;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @param string $url
+     * @param int $options
+     * @return bool
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public function dir_opendir ($url , $options )
+    {
+        if(isSet(self::$dirContent[$url])){
+            array_push(self::$dirContentLoopPath, $url);
+            return true;
+        }
+        $parts = $this->parseUrl($url);
+        $link = $this->createFTPLink();
+        $serverPath = InputFilter::securePath($this->path . "/" . $parts["path"]);
+        $contents = $this->rawList($link, $serverPath);
+        $folders = $files = array();
+        foreach ($contents as $entry) {
+            $result = $this->rawListEntryToStat($entry);
+            AbstractAccessDriver::fixPermissions(new AJXP_Node($url), $result["stat"], array($this, "getRemoteUserId"));
+            $isDir = $result["dir"];
+            $statValue = $result["stat"];
+            $file = $result["name"];
+            if ($isDir) {
+                $folders[$file] = $statValue;
+            } else {
+                $files[$file] = $statValue;
+            }
+        }
+        // Append all files keys to folders. Do not use array_merge.
+        foreach ($files as $key => $value) {
+            $folders[$key] = $value;
+        }
+        Logger::debug(__CLASS__, __FUNCTION__, "OPENDIR ", $folders);
+        array_push(self::$dirContentLoopPath, $url);
+        self::$dirContent[$url] = $folders;
+        self::$dirContentKeys[$url] = array_keys($folders);
+        self::$dirContentIndex[$url] = 0;
+        return true;
+    }
+
+    /**
+     *
+     */
+    public function dir_closedir  ()
+    {
+        Logger::debug(__CLASS__,__FUNCTION__,"CLOSEDIR");
+        $loopPath = array_pop(self::$dirContentLoopPath);
+        self::$dirContentIndex[$loopPath] = 0;
+        //Make a simple rewind, keep in cache
+        //self::$dirContent[$loopPath] = null;
+        //self::$dirContentKeys[$loopPath] = null;
+    }
+
+    /**
+     * @return bool
+     */
+    public function dir_readdir ()
+    {
+        $loopPath = self::$dirContentLoopPath[count(self::$dirContentLoopPath)-1];
+        $index = self::$dirContentIndex[$loopPath];
+        self::$dirContentIndex[$loopPath] ++;
+        if (isSet(self::$dirContentKeys[$loopPath][$index])) {
+            return self::$dirContentKeys[$loopPath][$index];
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     *
+     */
+    public function dir_rewinddir ()
+    {
+        $loopPath = self::$dirContentLoopPath[count(self::$dirContentLoopPath)-1];
+        self::$dirContentIndex[$loopPath] = 0;
+    }
+
+    /**
+     * @param $link
+     * @param $serverPath
+     * @param string $target
+     * @param bool $retry
+     * @return array
+     */
+    protected function rawList($link, $serverPath, $target = 'd', $retry = true)
+    {
+        if ($target == 'f') {
+            $parentDir = PathUtils::forwardSlashDirname($serverPath);
+            $fileName = PathUtils::forwardSlashBasename($serverPath);
+            ftp_chdir($link, $parentDir);
+            $rl_dirlist = @ftp_rawlist($link, "-a .");
+            //AJXP_Logger::debug(__CLASS__,__FUNCTION__,"FILE RAWLIST FROM ".$parentDir);
+            if (is_array($rl_dirlist)) {
+                $escaped = preg_quote($fileName);
+                foreach ($rl_dirlist as $rl_index => $rl_entry) {
+                    if (preg_match("/ $escaped$/" , $rl_entry)) {
+                        $contents = array($rl_dirlist[$rl_index]);
+                    }
+                }
+            }
+        } else {
+            ftp_chdir($link, $serverPath);
+            $contents = ftp_rawlist($link, "-a .");
+            //AJXP_Logger::debug(__CLASS__,__FUNCTION__,"RAW LIST RESULT ".print_r($contents, true));
+        }
+
+        if (!is_array($contents) && !$this->ftpActive) {
+            if ($retry == false) {
+                return array();
+            }
+            // We might have timed out, so let's go passive if not done yet
+            global $_SESSION;
+            if ($_SESSION["ftpPasv"] == "true") {
+                return array();
+            }
+            @ftp_pasv($link, TRUE);
+            $_SESSION["ftpPasv"]="true";
+               // RETRY!
+            return $this->rawList($link, $serverPath, $target, FALSE);
+        }
+        if (!is_array($contents)) {
+            return array();
+        }
+        return $contents;
+    }
+
+    /**
+     * @param $entry
+     * @param bool $filterStatPerms
+     * @return array
+     */
+    protected function rawListEntryToStat($entry, $filterStatPerms = false)
+    {
+        $info = array();
+        $monthes = array_flip( $this->monthes );
+        $vinfo = preg_split("/[\s]+/", $entry);
+        Logger::debug(__CLASS__,__FUNCTION__,"RAW LIST", $entry);
+        $statValue = array();
+        $fileperms = '';
+        if ($vinfo[0] !== "total") {
+            $fileperms = $vinfo[0];
+            $info['num']   = $vinfo[1];
+            $info['owner'] = $vinfo[2];
+            $info['groups'] = array();
+            $i = 3;
+            while (true) {
+                $info['groups'][] = $vinfo[$i];
+                $i++;
+                // Detect "Size" and "Month"
+                if(is_numeric($vinfo[$i]) && !is_numeric($vinfo[$i+1])) break;
+            }
+            $info['group'] = implode(" ", $info["groups"]);
+            $info['size']  = $vinfo[$i]; $i++;
+            $info['month'] = $vinfo[$i]; $i++;
+              $info['day']   = $vinfo[$i]; $i++;
+              $info['timeOrYear']  = $vinfo[$i]; $i++;
+              //$info['name']  = $vinfo[$i]; $i++;
+         }
+         $resplit = preg_split("/[\s]+/", $entry, 8 + count($info["groups"]));
+         $file = trim(array_pop($resplit));
+         $statValue[7] = $statValue["size"] = trim($info['size']);
+         if (strstr($info["timeOrYear"], ":")) {
+             $info["time"] = $info["timeOrYear"];
+            $monthKey = $monthes[$info['month']] + 1;
+             if (intval(date('m')) < $monthKey) {
+                 $info['year'] = date("Y") -1;
+             } else {
+                 $info["year"] = date("Y");
+             }
+         } else {
+             $info["time"] = '09:00';
+             $info["year"] = $info["timeOrYear"];
+         }
+         $statValue[4] = $statValue["uid"] = $info["owner"];
+         $statValue[5] = $statValue["gid"] = $info["group"];
+         $filedate  = trim($info['day'])." ".trim($info['month'])." ".trim($info['year'])." ".trim($info['time']);
+         $statValue[9] = $statValue["mtime"]  = strtotime($filedate);
+
+         $isDir = false;
+         if (strpos($fileperms,"d")!==FALSE || strpos($fileperms,"l")!==FALSE) {
+             if (strpos($fileperms,"l")!==FALSE) {
+                $test=explode(" ->", $file);
+                $file=$test[0];
+              }
+              $isDir = true;
+        }
+        $boolIsDir = $isDir;
+        $statValue[2] = $statValue["mode"] = $this->convertingChmod($fileperms);
+        $statValue["ftp_perms"] = $fileperms;
+        return array("name"=>$file, "stat"=>$statValue, "dir"=>$isDir);
+    }
+
+    /**
+     * @param $url
+     * @param bool $forceLogin
+     * @return array
+     * @throws PydioException
+     * @throws \Exception
+     */
+    protected function parseUrl($url, $forceLogin = false)
+    {
+        // URL MAY BE ajxp.ftp://username:password@host/path
+        $urlParts = UrlUtils::safeParseUrl($url);
+        $node = new AJXP_Node($url);
+        $this->repositoryId = $node->getRepositoryId();
+        $repository = $node->getRepository();
+        if ($repository == null) {
+            throw new \Exception("Cannot find repository for dynamic ftp authentication.");
+        }
+        $ctx = $node->getContext();
+        $credentials = MemorySafe::tryLoadingCredentialsFromSources($node->getContext());
+        $this->user = $credentials["user"];
+        $this->password = $credentials["password"];
+        if ($this->user=="") {
+            throw new PydioException("Cannot find user/pass for FTP access!");
+        }
+        if ($repository->getContextOption($node->getContext(), "DYNAMIC_FTP") == "TRUE" && isSet($_SESSION["AJXP_DYNAMIC_FTP_DATA"])) {
+            $data               = $_SESSION["AJXP_DYNAMIC_FTP_DATA"];
+            $this->host         = $data["FTP_HOST"];
+            $this->path         = $data["PATH"];
+            $this->secure       = ($data["FTP_SECURE"] == "TRUE"?true:false);
+            $this->port         = ($data["FTP_PORT"]!=""?intval($data["FTP_PORT"]):($this->secure?22:21));
+            $this->ftpActive    = ($data["FTP_DIRECT"] == "TRUE"?true:false);
+            $this->repoCharset  = $data["CHARSET"];
+        } else {
+            $this->host         = $ctx->getRepository()->getContextOption($ctx, "FTP_HOST");
+            $this->path         = $ctx->getRepository()->getContextOption($ctx, "PATH");
+            $this->secure       = ($ctx->getRepository()->getContextOption($ctx, "FTP_SECURE") == "TRUE"?true:false);
+            $this->port         = ($ctx->getRepository()->getContextOption($ctx, "FTP_PORT")!=null?intval($ctx->getRepository()->getContextOption($ctx, "FTP_PORT")):($this->secure?22:21));
+            $this->ftpActive    = ($ctx->getRepository()->getContextOption($ctx, "FTP_DIRECT") == "TRUE"?true:false);
+            $this->repoCharset  = $ctx->getRepository()->getContextOption($ctx, "CHARSET") OR "";
+        }
+
+        // Test Connexion and server features
+        global $_SESSION;
+        $cacheKey = $repository->getId()."_ftpCharset";
+        if (!isset($_SESSION[$cacheKey]) || !strlen($_SESSION[$cacheKey]) || $forceLogin) {
+            $features = $this->getServerFeatures($node->getContext());
+            $ctxCharset = SessionService::getContextCharset($node->getRepositoryId());
+            if(empty($ctxCharset)) {
+                SessionService::setContextCharset($node->getRepositoryId(), $features["charset"]);
+                $_SESSION[$cacheKey] = $features["charset"];
+            }else{
+                $_SESSION[$cacheKey] = $ctxCharset;
+            }
+        }
+        return $urlParts;
+    }
+
+    /**
+     * @param AJXP_Node $node
+     * @return array
+     */
+    public static function getResolvedOptionsForNode($node){
+        return ["TYPE" => "php"];
+    }
+
+
+
+    /**
+     * @param AJXP_Node $node
+     * @return array Array(UID, GID) to be used to compute permission
+     */
+    public function getRemoteUserId($node)
+    {
+        $repoUid = $node->getRepository()->getContextOption($node->getContext(), "UID");
+        if (!empty($repoUid)) {
+            return array($repoUid, "-1");
+        }
+        return array($this->user, "-1");
+    }
+
+    /**
+     * @param $url
+     * @return string
+     * @throws PydioException
+     * @throws \Exception
+     */
+    protected function buildRealUrl($url)
+    {
+        if (!isSet($this->user)) {
+            $parts = $this->parseUrl($url);
+        } else {
+            // parseUrl already called before (rename case).
+            $parts = UrlUtils::safeParseUrl($url);
+        }
+        $serverPath = InputFilter::securePath("/$this->path/" . $parts["path"]);
+        if($this->secure){
+            $protocol = 'ftps';
+        }
+        else{
+            $protocol = 'ftp';
+        }
+        $url = $protocol.'://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.':'.$this->port.$serverPath;
+        return $url;
+    }
+
+    /**
+     * This method retrieves the FTP server features as described in RFC2389
+     *    A decent FTP server support MLST command to list file using UTF-8 encoding
+     * @param ContextInterface $ctx
+     * @return array of features (see code)
+     * @throws PydioException
+     * @throws \Exception
+     */
+    protected function getServerFeatures(ContextInterface $ctx)
+    {
+        $link = $this->createFTPLink();
+
+        if ($ctx->getRepository()->getContextOption($ctx, "CREATE") == true) {
+            // Test if root exists and create it otherwise
+            $serverPath = InputFilter::securePath($this->path . "/");
+            $testCd = @ftp_chdir($link, $serverPath);
+            if ($testCd !== true) {
+                $res = @ftp_mkdir($link, $serverPath);
+                if(!$res) throw new \Exception("Cannot create path on remote server!");
+            }
+        }
+
+        $features = @ftp_raw($link, "FEAT");
+        // Check the answer code
+        if (isSet($features[0]) && $features[0][0] != "2") {
+            //ftp_close($link);
+            return array("list"=>"LIST", "charset"=>$this->repoCharset);
+        }
+        $retArray = array("list"=>"LIST", "charset"=>$this->repoCharset);
+        // Ok, find out the encoding used
+        foreach ($features as $feature) {
+            if (strstr($feature, "UTF8") !== FALSE) {   // See http://wiki.filezilla-project.org/Character_Set for an explaination
+                @ftp_raw($link, "OPTS UTF-8 ON");
+                $retArray['charset'] = "UTF-8";
+                //ftp_close($link);
+                return $retArray;
+            }
+        }
+        // In the future version, we should also use MLST as it standardize the listing format
+        return $retArray;
+    }
+
+    /**
+     * @return bool|resource
+     * @throws PydioException
+     */
+    protected function createFTPLink()
+    {
+        // If connexion exist and is still connected
+        if(is_array($_SESSION["FTP_CONNEXIONS"])
+            && array_key_exists($this->repositoryId, $_SESSION["FTP_CONNEXIONS"])
+            && @ftp_systype($_SESSION["FTP_CONNEXIONS"][$this->repositoryId])){
+                Logger::debug(__CLASS__,__FUNCTION__,"Using stored FTP Session");
+                return $_SESSION["FTP_CONNEXIONS"][$this->repositoryId];
+            }
+        Logger::debug(__CLASS__,__FUNCTION__,"Creating new FTP Session");
+        $link = FALSE;
+           //Connects to the FTP.
+           if ($this->secure) {
+               $link = @ftp_ssl_connect($this->host, $this->port);
+           } else {
+            $link = @ftp_connect($this->host, $this->port);
+           }
+        if (!$link) {
+            throw new PydioException("Cannot connect to FTP server ($this->host, $this->port)");
+         }
+        //register_shutdown_function('ftp_close', $link);
+        @ftp_set_option($link, FTP_TIMEOUT_SEC, 10);
+        if (!@ftp_login($link,$this->user,$this->password)) {
+            throw new PydioException("Cannot login to FTP server with user $this->user");
+        }
+        if (!$this->ftpActive) {
+            @ftp_pasv($link, true);
+            global $_SESSION;
+            $_SESSION["ftpPasv"]="true";
+        }
+        if (!is_array($_SESSION["FTP_CONNEXIONS"])) {
+            $_SESSION["FTP_CONNEXIONS"] = array();
+        }
+        $_SESSION["FTP_CONNEXIONS"][$this->repositoryId] = $link;
+        return $link;
+    }
+
+    /**
+     * @param $permissions
+     * @param bool $filterForStat
+     * @return int
+     */
+    protected function convertingChmod($permissions, $filterForStat = false)
+    {
+        $mode = 0;
+
+        if ($permissions[1] == 'r') $mode += 0400;
+        if ($permissions[2] == 'w') $mode += 0200;
+        if ($permissions[3] == 'x') $mode += 0100;
+         else if ($permissions[3] == 's') $mode += 04100;
+         else if ($permissions[3] == 'S') $mode += 04000;
+
+         if ($permissions[4] == 'r') $mode += 040;
+         if ($permissions[5] == 'w' || ($filterForStat && $permissions[2] == 'w')) $mode += 020;
+         if ($permissions[6] == 'x' || ($filterForStat && $permissions[3] == 'x')) $mode += 010;
+         else if ($permissions[6] == 's') $mode += 02010;
+         else if ($permissions[6] == 'S') $mode += 02000;
+
+         if ($permissions[7] == 'r') $mode += 04;
+         if ($permissions[8] == 'w' || ($filterForStat && $permissions[2] == 'w')) $mode += 02;
+         if ($permissions[9] == 'x' || ($filterForStat && $permissions[3] == 'x')) $mode += 01;
+         else if ($permissions[9] == 't') $mode += 01001;
+         else if ($permissions[9] == 'T') $mode += 01000;
+
+        if ($permissions[0] != "d") {
+            $mode += 0100000;
+        } else {
+            $mode += 0040000;
+        }
+
+        $mode = (string) ("0".$mode);
+        return  $mode;
+    }
+
+}
diff --git a/core/src/plugins/access.ftp/class.ftpAccessDriver.php b/core/src/plugins/access.ftp/class.ftpAccessDriver.php
deleted file mode 100644
index a1c24fc004..0000000000
--- a/core/src/plugins/access.ftp/class.ftpAccessDriver.php
+++ /dev/null
@@ -1,328 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * AJXP_Plugin to access a remote server using the File Transfer Protocol
- * @package AjaXplorer_Plugins
- * @subpackage Access
- */
-class ftpAccessDriver extends fsAccessDriver
-{
-    public function loadManifest()
-    {
-        parent::loadManifest();
-        // BACKWARD COMPATIBILITY!
-        $res = $this->getXPath()->query('//param[@name="USER"] | //param[@name="PASS"] | //user_param[@name="USER"] | //user_param[@name="PASS"]');
-        foreach ($res as $node) {
-            if ($node->getAttribute("name") == "USER") {
-                $node->setAttribute("name", "FTP_USER");
-            } else if ($node->getAttribute("name") == "PASS") {
-                $node->setAttribute("name", "FTP_PASS");
-            }
-        }
-        $this->reloadXPath();
-    }
-
-    /**
-     * Parse
-     * @param DOMNode $contribNode
-     */
-    protected function parseSpecificContributions(&$contribNode)
-    {
-        parent::parseSpecificContributions($contribNode);
-        if($contribNode->nodeName != "actions") return ;
-        $this->disableArchiveBrowsingContributions($contribNode);
-        $this->redirectActionsToMethod($contribNode, array("upload", "next_to_remote", "trigger_remote_copy"), "uploadActions");
-    }
-
-    public function initRepository()
-    {
-        if (is_array($this->pluginConf)) {
-            $this->driverConf = $this->pluginConf;
-        } else {
-            $this->driverConf = array();
-        }
-        $this->detectStreamWrapper(true);
-        $this->urlBase = "pydio://".$this->repository->getId();
-        $recycle = $this->repository->getOption("RECYCLE_BIN");
-        if ($recycle != "") {
-            RecycleBinManager::init($this->urlBase, "/".$recycle);
-        }
-        //AJXP_PromptException::testOrPromptForCredentials("ftp_ws_credentials", $this->repository->getId());
-    }
-
-    public function uploadActions($action, $httpVars, $filesVars)
-    {
-        switch ($action) {
-            case "trigger_remote_copy":
-                if(!$this->hasFilesToCopy()) break;
-                $toCopy = $this->getFileNameToCopy();
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::triggerBgAction("next_to_remote", array(), "Copying file ".$toCopy." to ftp server");
-                AJXP_XMLWriter::close();
-                exit(1);
-            break;
-            case "next_to_remote":
-                if(!$this->hasFilesToCopy()) break;
-                $fData = $this->getNextFileToCopy();
-                $nextFile = '';
-                if ($this->hasFilesToCopy()) {
-                    $nextFile = $this->getFileNameToCopy();
-                }
-                $this->logDebug("Base64 : ", array("from"=>$fData["destination"], "to"=>base64_decode($fData['destination'])));
-                $destPath = $this->urlBase.base64_decode($fData['destination'])."/".$fData['name'];
-                //$destPath = AJXP_Utils::decodeSecureMagic($destPath);
-                // DO NOT "SANITIZE", THE URL IS ALREADY IN THE FORM ajxp.ftp://repoId/filename
-                $destPath = SystemTextEncoding::fromPostedFileName($destPath);
-                $node = new AJXP_Node($destPath);
-                $this->logDebug("Copying file to server", array("from"=>$fData["tmp_name"], "to"=>$destPath, "name"=>$fData["name"]));
-                try {
-                    AJXP_Controller::applyHook("node.before_create", array(&$node));
-                    $fp = fopen($destPath, "w");
-                    $fSource = fopen($fData["tmp_name"], "r");
-                    while (!feof($fSource)) {
-                        fwrite($fp, fread($fSource, 4096));
-                    }
-                    fclose($fSource);
-                    $this->logDebug("Closing target : begin ftp copy");
-                    // Make sur the script does not time out!
-                    @set_time_limit(240);
-                    fclose($fp);
-                    $this->logDebug("FTP Upload : end of ftp copy");
-                    @unlink($fData["tmp_name"]);
-                    AJXP_Controller::applyHook("node.change", array(null, &$node));
-
-                } catch (Exception $e) {
-                    $this->logDebug("Error during ftp copy", array($e->getMessage(), $e->getTrace()));
-                }
-                $this->logDebug("FTP Upload : shoud trigger next or reload nextFile=$nextFile");
-                AJXP_XMLWriter::header();
-                if ($nextFile!='') {
-                    AJXP_XMLWriter::triggerBgAction("next_to_remote", array(), "Copying file ".SystemTextEncoding::toUTF8($nextFile)." to remote server");
-                } else {
-                    AJXP_XMLWriter::triggerBgAction("reload_node", array(), "Upload done, reloading client.");
-                }
-                AJXP_XMLWriter::close();
-                exit(1);
-            break;
-            case "upload":
-                $rep_source = AJXP_Utils::securePath("/".$httpVars['dir']);
-                $this->logDebug("Upload : rep_source ", array($rep_source));
-                $logMessage = "";
-                foreach ($filesVars as $boxName => $boxData) {
-                    if(substr($boxName, 0, 9) != "userfile_")     continue;
-                    $this->logDebug("Upload : rep_source ", array($rep_source));
-                    $err = AJXP_Utils::parseFileDataErrors($boxData);
-                    if ($err != null) {
-                        $errorCode = $err[0];
-                        $errorMessage = $err[1];
-                        break;
-                    }
-                    if (isSet($httpVars["auto_rename"])) {
-                        $destination = $this->urlBase.$rep_source;
-                        $boxData["name"] = fsAccessDriver::autoRenameForDest($destination, $boxData["name"]);
-                    }
-                    $boxData["destination"] = base64_encode($rep_source);
-                    $destCopy = AJXP_XMLWriter::replaceAjxpXmlKeywords($this->repository->getOption("TMP_UPLOAD"));
-                    $this->logDebug("Upload : tmp upload folder", array($destCopy));
-                    if (!is_dir($destCopy)) {
-                        if (! @mkdir($destCopy)) {
-                            $this->logDebug("Upload error : cannot create temporary folder", array($destCopy));
-                            $errorCode = 413;
-                            $errorMessage = "Warning, cannot create folder for temporary copy.";
-                            break;
-                        }
-                    }
-                    if (!$this->isWriteable($destCopy)) {
-                        $this->logDebug("Upload error: cannot write into temporary folder");
-                        $errorCode = 414;
-                        $errorMessage = "Warning, cannot write into temporary folder.";
-                        break;
-                    }
-                    $this->logDebug("Upload : tmp upload folder", array($destCopy));
-                    if (isSet($boxData["input_upload"])) {
-                        try {
-                            $destName = tempnam($destCopy, "");
-                            $this->logDebug("Begining reading INPUT stream");
-                            $input = fopen("php://input", "r");
-                            $output = fopen($destName, "w");
-                            $sizeRead = 0;
-                            while ($sizeRead < intval($boxData["size"])) {
-                                $chunk = fread($input, 4096);
-                                $sizeRead += strlen($chunk);
-                                fwrite($output, $chunk, strlen($chunk));
-                            }
-                            fclose($input);
-                            fclose($output);
-                            $boxData["tmp_name"] = $destName;
-                            $this->storeFileToCopy($boxData);
-                            $this->logDebug("End reading INPUT stream");
-                        } catch (Exception $e) {
-                            $errorCode=411;
-                            $errorMessage = $e->getMessage();
-                            break;
-                        }
-                    } else {
-                        $destName = $destCopy."/".basename($boxData["tmp_name"]);
-                        if ($destName == $boxData["tmp_name"]) $destName .= "1";
-                        if (move_uploaded_file($boxData["tmp_name"], $destName)) {
-                            $boxData["tmp_name"] = $destName;
-                            $this->storeFileToCopy($boxData);
-                        } else {
-                            $mess = ConfService::getMessages();
-                            $errorCode = 411;
-                            $errorMessage="$mess[33] ".$boxData["name"];
-                            break;
-                        }
-                    }
-                }
-                if (isSet($errorMessage)) {
-                    $this->logDebug("Return error $errorCode $errorMessage");
-                    return array("ERROR" => array("CODE" => $errorCode, "MESSAGE" => $errorMessage));
-                } else {
-                    $this->logDebug("Return success");
-                    return array("SUCCESS" => true, "PREVENT_NOTIF" => true);
-                }
-
-            break;
-            default:
-            break;
-        }
-        session_write_close();
-        exit;
-
-    }
-
-    public function isWriteable($path, $type="dir")
-    {
-        $parts = parse_url($path);
-        $dir = $parts["path"];
-        if ($type == "dir" && ($dir == "" || $dir == "/" || $dir == "\\")) { // ROOT, WE ARE NOT SURE TO BE ABLE TO READ THE PARENT
-            return true;
-        } else {
-            return is_writable($path);
-        }
-
-    }
-
-    public function deldir($location, $repoData)
-    {
-        if (is_dir($location)) {
-            $dirsToRecurse = array();
-            $all=opendir($location);
-            while ($file=readdir($all)) {
-                if (is_dir("$location/$file") && $file !=".." && $file!=".") {
-                    $dirsToRecurse[] = "$location/$file";
-                } elseif (!is_dir("$location/$file")) {
-                    if (file_exists("$location/$file")) {
-                        unlink("$location/$file");
-                    }
-                    unset($file);
-                }
-            }
-            closedir($all);
-            foreach ($dirsToRecurse as $recurse) {
-                $this->deldir($recurse, $repoData);
-            }
-            rmdir($location);
-        } else {
-            if (file_exists("$location")) {
-                $test = @unlink("$location");
-                if(!$test) throw new Exception("Cannot delete file ".$location);
-            }
-        }
-        if (isSet($repoData["recycle"]) && basename(dirname($location)) == $repoData["recycle"]) {
-            // DELETING FROM RECYCLE
-            RecycleBinManager::deleteFromRecycle($location);
-        }
-    }
-
-
-    public function storeFileToCopy($fileData)
-    {
-        $user = AuthService::getLoggedUser();
-        $files = $user->getTemporaryData("tmp_upload");
-        $this->logDebug("Saving user temporary data", array($fileData));
-        $files[] = $fileData;
-        $user->saveTemporaryData("tmp_upload", $files);
-        if(AJXP_Utils::userAgentIsNativePydioApp()){
-            $this->logInfo("Up from",$_SERVER["HTTP_USER_AGENT"]." - direct triger of next to remote");
-            $this->uploadActions("next_to_remote", array(), array());
-        }
-    }
-
-    public function getFileNameToCopy()
-    {
-            $user = AuthService::getLoggedUser();
-            $files = $user->getTemporaryData("tmp_upload");
-            return $files[0]["name"];
-    }
-
-    public function getNextFileToCopy()
-    {
-            if(!$this->hasFilesToCopy()) return "";
-            $user = AuthService::getLoggedUser();
-            $files = $user->getTemporaryData("tmp_upload");
-            $fData = $files[0];
-            array_shift($files);
-            $user->saveTemporaryData("tmp_upload", $files);
-            return $fData;
-    }
-
-    public function hasFilesToCopy()
-    {
-            $user = AuthService::getLoggedUser();
-            $files = $user->getTemporaryData("tmp_upload");
-            return (count($files)?true:false);
-    }
-
-    public function testParameters($params)
-    {
-        if (empty($params["FTP_USER"])) {
-            throw new AJXP_Exception("Even if you intend to use the credentials stored in the session, temporarily set a user and password to perform the connexion test.");
-        }
-        if ($params["FTP_SECURE"]) {
-            $link = @ftp_ssl_connect($params["FTP_HOST"], $params["FTP_PORT"]);
-        } else {
-            $link = @ftp_connect($params["FTP_HOST"], $params["FTP_PORT"]);
-        }
-        if (!$link) {
-            throw new AJXP_Exception("Cannot connect to FTP server (".$params["FTP_HOST"].",". $params["FTP_PORT"].")");
-        }
-        @ftp_set_option($link, FTP_TIMEOUT_SEC, 10);
-        if (!@ftp_login($link,$params["FTP_USER"],$params["FTP_PASS"])) {
-            ftp_close($link);
-            throw new AJXP_Exception("Cannot login to FTP server with user ".$params["FTP_USER"]);
-        }
-        if (!$params["FTP_DIRECT"]) {
-            @ftp_pasv($link, true);
-            global $_SESSION;
-            $_SESSION["ftpPasv"]="true";
-        }
-        ftp_close($link);
-
-        return "SUCCESS: Could succesfully connect to the FTP server with user '".$params["FTP_USER"]."'.";
-    }
-
-
-}
diff --git a/core/src/plugins/access.ftp/class.ftpAccessWrapper.php b/core/src/plugins/access.ftp/class.ftpAccessWrapper.php
deleted file mode 100644
index b5ac79f211..0000000000
--- a/core/src/plugins/access.ftp/class.ftpAccessWrapper.php
+++ /dev/null
@@ -1,606 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-
-require_once(AJXP_BIN_FOLDER."/interface.AjxpWrapper.php");
-/**
- * Wrapper for encapsulation FTP accesses
- * @package AjaXplorer_Plugins
- * @subpackage Access
- */
-class ftpAccessWrapper implements AjxpWrapper
-{
-    // Instance vars $this->
-    protected $host;
-    protected $port;
-    protected $secure;
-    protected $path;
-    protected $user;
-    protected $password;
-    protected $ftpActive;
-    protected $repoCharset;
-    protected $repositoryId;
-    protected $fp;
-
-    protected $crtMode;
-    protected $crtLink;
-    protected $crtTarget;
-
-    // Shared vars self::
-    private static $dirContentLoopPath = array();
-    private static $dirContent = array();
-    private static $dirContentKeys = array();
-    private static $dirContentIndex = array();
-
-    private $monthes = array("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Juil", "Aug", "Sep", "Oct", "Nov", "Dec");
-
-    public static function getRealFSReference($path, $persistent = false)
-    {
-        $tmpFile = AJXP_Utils::getAjxpTmpDir()."/".md5(time());
-        $tmpHandle = fopen($tmpFile, "wb");
-        self::copyFileInStream($path, $tmpHandle);
-        fclose($tmpHandle);
-        if (!$persistent) {
-            register_shutdown_function(array("AJXP_Utils", "silentUnlink"), $tmpFile);
-        }
-        return $tmpFile;
-    }
-
-    public static function isRemote()
-    {
-        return true;
-    }
-
-    public static function isSeekable($url)
-    {
-        return true;
-    }
-
-    public static function copyFileInStream($path, $stream)
-    {
-        $fake = new ftpAccessWrapper();
-        $parts = $fake->parseUrl($path);
-        $link = $fake->createFTPLink();
-        $serverPath = AJXP_Utils::securePath($fake->path."/".$parts["path"]);
-        AJXP_Logger::debug($serverPath);
-        ftp_fget($link, $stream, $serverPath, FTP_BINARY);
-    }
-
-    public static function changeMode($path, $chmodValue)
-    {
-        $fake = new ftpAccessWrapper();
-        $parts = $fake->parseUrl($path);
-        $link = $fake->createFTPLink();
-        $serverPath = AJXP_Utils::securePath($fake->path."/".$parts["path"]);
-        ftp_chmod($link, $chmodValue, $serverPath);
-    }
-
-    public function stream_open($url, $mode, $options, &$context)
-    {
-        if (stripos($mode, "w") !== false) {
-            $this->crtMode = 'write';
-            $parts = $this->parseUrl($url);
-            $this->crtTarget = AJXP_Utils::securePath($this->path."/".$parts["path"]);
-            $this->crtLink = $this->createFTPLink();
-            $this->fp = tmpfile();
-        } else {
-            $this->crtMode = 'read';
-            $this->fp = tmpfile();
-            $this->copyFileInStream($url, $this->fp);
-            rewind($this->fp);
-        }
-        /*
-        if ($context) {
-            $this->fp = @fopen($this->buildRealUrl($url), $mode, $options, $context);
-        } else {
-            $this->fp = @fopen($this->buildRealUrl($url), $mode);
-        }
-        */
-        return ($this->fp !== false);
-    }
-
-    public function stream_stat()
-    {
-        return fstat($this->fp);
-    }
-
-    public function stream_seek($offset , $whence = SEEK_SET)
-    {
-        fseek($this->fp, $offset, SEEK_SET);
-    }
-
-    public function stream_tell()
-    {
-        return ftell($this->fp);
-    }
-
-    public function stream_read($count)
-    {
-        return fread($this->fp, $count);
-    }
-
-    public function stream_write($data)
-    {
-        fwrite($this->fp, $data, strlen($data));
-        return strlen($data);
-    }
-
-    public function stream_eof()
-    {
-        return feof($this->fp);
-    }
-
-    public function stream_close()
-    {
-        if (isSet($this->fp) && $this->fp!=-1 && $this->fp!==false) {
-            fclose($this->fp);
-        }
-    }
-
-    // PHP bug #62035
-    public static function fput_quota_hack($errno, $errstr, $errfile, $errline, $errcontext)
-    {
-      if (strpos($errstr, "Opening BINARY mode data connection") !== false)
-        $errstr = "Transfer failed. Please check available disk space (quota)";
-      AJXP_XMLWriter::catchError($errno, $errstr, $errfile, $errline, $errcontext);
-    }
-
-    public function stream_flush()
-    {
-        if (isSet($this->fp) && $this->fp!=-1 && $this->fp!==false) {
-            if ($this->crtMode == 'write') {
-                rewind($this->fp);
-                AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Ftp_fput", array("target"=>$this->crtTarget));
-                set_error_handler(array("ftpAccessWrapper", "fput_quota_hack"), E_ALL & ~E_NOTICE );
-                ftp_fput($this->crtLink, $this->crtTarget, $this->fp, FTP_BINARY);
-                restore_error_handler();
-                AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Ftp_fput end", array("target"=>$this->crtTarget));
-            } else {
-                fflush($this->fp);
-            }
-        }
-    }
-
-    public function unlink($url)
-    {
-        return unlink($this->buildRealUrl($url));
-    }
-
-    public function rmdir($url, $options)
-    {
-        return rmdir($this->buildRealUrl($url));
-    }
-
-    public function mkdir($url, $mode, $options)
-    {
-        return mkdir($this->buildRealUrl($url), $mode);
-    }
-
-    public function rename($from, $to)
-    {
-        return rename($this->buildRealUrl($from), $this->buildRealUrl($to));
-    }
-
-    public function url_stat($path, $flags)
-    {
-        // We are in an opendir loop
-        AJXP_Logger::debug(__CLASS__,__FUNCTION__,"URL_STAT", $path);
-        $testLoopPath = AJXP_Utils::safeDirname($path);
-        if (is_array(self::$dirContent[$testLoopPath])) {
-            $search = AJXP_Utils::safeBasename($path);
-            //if($search == "") $search = ".";
-            if (array_key_exists($search, self::$dirContent[$testLoopPath])) {
-                return self::$dirContent[$testLoopPath][$search];
-            }
-        }
-        $parts = $this->parseUrl($path);
-        $link = $this->createFTPLink();
-        $serverPath = AJXP_Utils::securePath($this->path."/".$parts["path"]);
-        if(empty($parts["path"])) $parts["path"] = "/";
-        if ($parts["path"] == "/") {
-            $basename = ".";
-        } else {
-            $basename = AJXP_Utils::safeBasename($serverPath);
-        }
-
-        $serverParent = AJXP_Utils::safeDirname($parts["path"]);
-        $serverParent = AJXP_Utils::securePath($this->path."/".$serverParent);
-
-        $testCd = @ftp_chdir($link, $serverPath);
-        if ($testCd === true) {
-            // DIR
-            $contents = $this->rawList($link, $serverParent, 'd');
-            foreach ($contents as $entry) {
-                $res = $this->rawListEntryToStat($entry);
-                AJXP_Logger::debug(__CLASS__,__FUNCTION__,"RAWLISTENTRY ".$res["name"]. " (searching ".$basename.")", $res["stat"]);
-                if ($res["name"] == $basename) {
-                    AbstractAccessDriver::fixPermissions($res["stat"], ConfService::getRepositoryById($this->repositoryId), array($this, "getRemoteUserId"));
-                    $statValue = $res["stat"];
-                    return $statValue;
-                }
-            }
-            // Not found : is it the "."
-            if($basename == "."){
-                // Make at least a readable fake stat
-                $fakeStat = stat(AJXP_DATA_PATH);
-                return $fakeStat;
-            }
-        } else {
-            // FILE
-            $contents = $this->rawList($link, $serverPath, 'f');
-            if (count($contents) == 1) {
-                $res = $this->rawListEntryToStat($contents[0]);
-                AbstractAccessDriver::fixPermissions($res["stat"], ConfService::getRepositoryById($this->repositoryId), array($this, "getRemoteUserId"));
-                $statValue = $res["stat"];
-                AJXP_Logger::debug(__CLASS__,__FUNCTION__,"STAT FILE $serverPath", $statValue);
-                return $statValue;
-            }
-        }
-        return null;
-    }
-
-    public function dir_opendir ($url , $options )
-    {
-        if(isSet(self::$dirContent[$url])){
-            array_push(self::$dirContentLoopPath, $url);
-            return true;
-        }
-        $parts = $this->parseUrl($url);
-        $link = $this->createFTPLink();
-        $serverPath = AJXP_Utils::securePath($this->path."/".$parts["path"]);
-        $contents = $this->rawList($link, $serverPath);
-        $folders = $files = array();
-        foreach ($contents as $entry) {
-            $result = $this->rawListEntryToStat($entry);
-            AbstractAccessDriver::fixPermissions($result["stat"], ConfService::getRepositoryById($this->repositoryId), array($this, "getRemoteUserId"));
-            $isDir = $result["dir"];
-            $statValue = $result["stat"];
-            $file = $result["name"];
-            if ($isDir) {
-                $folders[$file] = $statValue;
-            } else {
-                $files[$file] = $statValue;
-            }
-        }
-        // Append all files keys to folders. Do not use array_merge.
-        foreach ($files as $key => $value) {
-            $folders[$key] = $value;
-        }
-        AJXP_Logger::debug(__CLASS__, __FUNCTION__, "OPENDIR ", $folders);
-        array_push(self::$dirContentLoopPath, $url);
-        self::$dirContent[$url] = $folders;
-        self::$dirContentKeys[$url] = array_keys($folders);
-        self::$dirContentIndex[$url] = 0;
-        return true;
-    }
-
-    public function dir_closedir  ()
-    {
-        AJXP_Logger::debug(__CLASS__,__FUNCTION__,"CLOSEDIR");
-        $loopPath = array_pop(self::$dirContentLoopPath);
-        self::$dirContentIndex[$loopPath] = 0;
-        //Make a simple rewind, keep in cache
-        //self::$dirContent[$loopPath] = null;
-        //self::$dirContentKeys[$loopPath] = null;
-    }
-
-    public function dir_readdir ()
-    {
-        $loopPath = self::$dirContentLoopPath[count(self::$dirContentLoopPath)-1];
-        $index = self::$dirContentIndex[$loopPath];
-        self::$dirContentIndex[$loopPath] ++;
-        if (isSet(self::$dirContentKeys[$loopPath][$index])) {
-            return self::$dirContentKeys[$loopPath][$index];
-        } else {
-            return false;
-        }
-    }
-
-    public function dir_rewinddir ()
-    {
-        $loopPath = self::$dirContentLoopPath[count(self::$dirContentLoopPath)-1];
-        self::$dirContentIndex[$loopPath] = 0;
-    }
-
-    protected function rawList($link, $serverPath, $target = 'd', $retry = true)
-    {
-        if ($target == 'f') {
-            $parentDir = AJXP_Utils::safeDirname($serverPath);
-            $fileName = AJXP_Utils::safeBasename($serverPath);
-            ftp_chdir($link, $parentDir);
-            $rl_dirlist = @ftp_rawlist($link, "-a .");
-            //AJXP_Logger::debug(__CLASS__,__FUNCTION__,"FILE RAWLIST FROM ".$parentDir);
-            if (is_array($rl_dirlist)) {
-                $escaped = preg_quote($fileName);
-                foreach ($rl_dirlist as $rl_index => $rl_entry) {
-                    if (preg_match("/ $escaped$/" , $rl_entry)) {
-                        $contents = array($rl_dirlist[$rl_index]);
-                    }
-                }
-            }
-        } else {
-            ftp_chdir($link, $serverPath);
-            $contents = ftp_rawlist($link, "-a .");
-            //AJXP_Logger::debug(__CLASS__,__FUNCTION__,"RAW LIST RESULT ".print_r($contents, true));
-        }
-
-        if (!is_array($contents) && !$this->ftpActive) {
-            if ($retry == false) {
-                return array();
-            }
-            // We might have timed out, so let's go passive if not done yet
-            global $_SESSION;
-            if ($_SESSION["ftpPasv"] == "true") {
-                return array();
-            }
-            @ftp_pasv($link, TRUE);
-            $_SESSION["ftpPasv"]="true";
-               // RETRY!
-            return $this->rawList($link, $serverPath, $target, FALSE);
-        }
-        if (!is_array($contents)) {
-            return array();
-        }
-        return $contents;
-    }
-
-    protected function rawListEntryToStat($entry, $filterStatPerms = false)
-    {
-        $info = array();
-        $monthes = array_flip( $this->monthes );
-        $vinfo = preg_split("/[\s]+/", $entry);
-        AJXP_Logger::debug(__CLASS__,__FUNCTION__,"RAW LIST", $entry);
-        $statValue = array();
-        if ($vinfo[0] !== "total") {
-            $fileperms = $vinfo[0];
-            $info['num']   = $vinfo[1];
-            $info['owner'] = $vinfo[2];
-            $info['groups'] = array();
-            $i = 3;
-            while (true) {
-                $info['groups'][] = $vinfo[$i];
-                $i++;
-                // Detect "Size" and "Month"
-                if(is_numeric($vinfo[$i]) && !is_numeric($vinfo[$i+1])) break;
-            }
-            $info['group'] = implode(" ", $info["groups"]);
-            $info['size']  = $vinfo[$i]; $i++;
-            $info['month'] = $vinfo[$i]; $i++;
-              $info['day']   = $vinfo[$i]; $i++;
-              $info['timeOrYear']  = $vinfo[$i]; $i++;
-              //$info['name']  = $vinfo[$i]; $i++;
-         }
-         $resplit = preg_split("/[\s]+/", $entry, 8 + count($info["groups"]));
-         $file = trim(array_pop($resplit));
-         $statValue[7] = $statValue["size"] = trim($info['size']);
-         if (strstr($info["timeOrYear"], ":")) {
-             $info["time"] = $info["timeOrYear"];
-            $monthKey = $monthes[$info['month']] + 1;
-             if (intval(date('m')) < $monthKey) {
-                 $info['year'] = date("Y") -1;
-             } else {
-                 $info["year"] = date("Y");
-             }
-         } else {
-             $info["time"] = '09:00';
-             $info["year"] = $info["timeOrYear"];
-         }
-         $statValue[4] = $statValue["uid"] = $info["owner"];
-         $statValue[5] = $statValue["gid"] = $info["group"];
-         $filedate  = trim($info['day'])." ".trim($info['month'])." ".trim($info['year'])." ".trim($info['time']);
-         $statValue[9] = $statValue["mtime"]  = strtotime($filedate);
-
-         $isDir = false;
-         if (strpos($fileperms,"d")!==FALSE || strpos($fileperms,"l")!==FALSE) {
-             if (strpos($fileperms,"l")!==FALSE) {
-                $test=explode(" ->", $file);
-                $file=$test[0];
-              }
-              $isDir = true;
-        }
-        $boolIsDir = $isDir;
-        $statValue[2] = $statValue["mode"] = $this->convertingChmod($fileperms);
-        $statValue["ftp_perms"] = $fileperms;
-        return array("name"=>$file, "stat"=>$statValue, "dir"=>$isDir);
-    }
-
-    protected function parseUrl($url, $forceLogin = false)
-    {
-        // URL MAY BE ajxp.ftp://username:password@host/path
-        $urlParts = AJXP_Utils::safeParseUrl($url);
-        $this->repositoryId = $urlParts["host"];
-        $repository = ConfService::getRepositoryById($this->repositoryId);
-        if ($repository == null) {
-            throw new Exception("Cannot find repository for dynamic ftp authentication.");
-        }
-        $credentials = AJXP_Safe::tryLoadingCredentialsFromSources($urlParts, $repository);
-        $this->user = $credentials["user"];
-        $this->password = $credentials["password"];
-        if ($this->user=="") {
-            throw new AJXP_Exception("Cannot find user/pass for FTP access!");
-        }
-        if ($repository->getOption("DYNAMIC_FTP") == "TRUE" && isSet($_SESSION["AJXP_DYNAMIC_FTP_DATA"])) {
-            $data = $_SESSION["AJXP_DYNAMIC_FTP_DATA"];
-            $this->host = $data["FTP_HOST"];
-            $this->path = $data["PATH"];
-            $this->secure = ($data["FTP_SECURE"] == "TRUE"?true:false);
-            $this->port = ($data["FTP_PORT"]!=""?intval($data["FTP_PORT"]):($this->secure?22:21));
-            $this->ftpActive = ($data["FTP_DIRECT"] == "TRUE"?true:false);
-            $this->repoCharset = $data["CHARSET"];
-        } else {
-            $this->host = $repository->getOption("FTP_HOST");
-            $this->path = $repository->getOption("PATH");
-            $this->secure = ($repository->getOption("FTP_SECURE") == "TRUE"?true:false);
-            $this->port = ($repository->getOption("FTP_PORT")!=""?intval($repository->getOption("FTP_PORT")):($this->secure?22:21));
-            $this->ftpActive = ($repository->getOption("FTP_DIRECT") == "TRUE"?true:false);
-            $this->repoCharset = $repository->getOption("CHARSET");
-        }
-
-        // Test Connexion and server features
-        global $_SESSION;
-        $cacheKey = $repository->getId()."_ftpCharset";
-        if (!isset($_SESSION[$cacheKey]) || !strlen($_SESSION[$cacheKey]) || $forceLogin) {
-            $features = $this->getServerFeatures();
-            $ctxCharset = ConfService::getContextCharset();
-            if(empty($ctxCharset)) {
-                ConfService::setContextCharset($features["charset"]);
-                $_SESSION[$cacheKey] = $features["charset"];
-            }else{
-                $_SESSION[$cacheKey] = $ctxCharset;
-            }
-        }
-        return $urlParts;
-    }
-
-    /**
-     * @return array Array(UID, GID) to be used to compute permission
-     */
-    public function getRemoteUserId()
-    {
-        $repoUid = ConfService::getRepository()->getOption("UID");
-        if (!empty($repoUid)) {
-            return array($repoUid, "-1");
-        }
-        return array($this->user, "-1");
-    }
-
-    protected function buildRealUrl($url)
-    {
-        if (!isSet($this->user)) {
-            $parts = $this->parseUrl($url);
-        } else {
-            // parseUrl already called before (rename case).
-            $parts = AJXP_Utils::safeParseUrl($url);
-        }
-        $serverPath = AJXP_Utils::securePath("/$this->path/".$parts["path"]);
-        return "ftp".($this->secure?"s":"")."://$this->user:$this->password@$this->host:$this->port".$serverPath;
-    }
-
-    /** This method retrieves the FTP server features as described in RFC2389
-     *	A decent FTP server support MLST command to list file using UTF-8 encoding
-     *  @return an array of features (see code)
-     */
-    protected function getServerFeatures()
-    {
-        $link = $this->createFTPLink();
-
-        if (ConfService::getRepositoryById($this->repositoryId)->getOption("CREATE") == true) {
-            // Test if root exists and create it otherwise
-            $serverPath = AJXP_Utils::securePath($this->path."/");
-            $testCd = @ftp_chdir($link, $serverPath);
-            if ($testCd !== true) {
-                $res = @ftp_mkdir($link, $serverPath);
-                if(!$res) throw new Exception("Cannot create path on remote server!");
-            }
-        }
-
-        $features = @ftp_raw($link, "FEAT");
-        // Check the answer code
-        if (isSet($features[0]) && $features[0][0] != "2") {
-            //ftp_close($link);
-            return array("list"=>"LIST", "charset"=>$this->repoCharset);
-        }
-        $retArray = array("list"=>"LIST", "charset"=>$this->repoCharset);
-        // Ok, find out the encoding used
-        foreach ($features as $feature) {
-            if (strstr($feature, "UTF8") !== FALSE) {   // See http://wiki.filezilla-project.org/Character_Set for an explaination
-                @ftp_raw($link, "OPTS UTF-8 ON");
-                $retArray['charset'] = "UTF-8";
-                //ftp_close($link);
-                return $retArray;
-            }
-        }
-        // In the future version, we should also use MLST as it standardize the listing format
-        return $retArray;
-    }
-
-    protected function createFTPLink()
-    {
-        // If connexion exist and is still connected
-        if(is_array($_SESSION["FTP_CONNEXIONS"])
-            && array_key_exists($this->repositoryId, $_SESSION["FTP_CONNEXIONS"])
-            && @ftp_systype($_SESSION["FTP_CONNEXIONS"][$this->repositoryId])){
-                AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Using stored FTP Session");
-                return $_SESSION["FTP_CONNEXIONS"][$this->repositoryId];
-            }
-        AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Creating new FTP Session");
-        $link = FALSE;
-           //Connects to the FTP.
-           if ($this->secure) {
-               $link = @ftp_ssl_connect($this->host, $this->port);
-           } else {
-            $link = @ftp_connect($this->host, $this->port);
-           }
-        if (!$link) {
-            throw new AJXP_Exception("Cannot connect to FTP server ($this->host, $this->port)");
-         }
-        //register_shutdown_function('ftp_close', $link);
-        @ftp_set_option($link, FTP_TIMEOUT_SEC, 10);
-        if (!@ftp_login($link,$this->user,$this->password)) {
-            throw new AJXP_Exception("Cannot login to FTP server with user $this->user");
-        }
-        if (!$this->ftpActive) {
-            @ftp_pasv($link, true);
-            global $_SESSION;
-            $_SESSION["ftpPasv"]="true";
-        }
-        if (!is_array($_SESSION["FTP_CONNEXIONS"])) {
-            $_SESSION["FTP_CONNEXIONS"] = array();
-        }
-        $_SESSION["FTP_CONNEXIONS"][$this->repositoryId] = $link;
-        return $link;
-    }
-
-    protected function convertingChmod($permissions, $filterForStat = false)
-    {
-        $mode = 0;
-
-        if ($permissions[1] == 'r') $mode += 0400;
-        if ($permissions[2] == 'w') $mode += 0200;
-        if ($permissions[3] == 'x') $mode += 0100;
-         else if ($permissions[3] == 's') $mode += 04100;
-         else if ($permissions[3] == 'S') $mode += 04000;
-
-         if ($permissions[4] == 'r') $mode += 040;
-         if ($permissions[5] == 'w' || ($filterForStat && $permissions[2] == 'w')) $mode += 020;
-         if ($permissions[6] == 'x' || ($filterForStat && $permissions[3] == 'x')) $mode += 010;
-         else if ($permissions[6] == 's') $mode += 02010;
-         else if ($permissions[6] == 'S') $mode += 02000;
-
-         if ($permissions[7] == 'r') $mode += 04;
-         if ($permissions[8] == 'w' || ($filterForStat && $permissions[2] == 'w')) $mode += 02;
-         if ($permissions[9] == 'x' || ($filterForStat && $permissions[3] == 'x')) $mode += 01;
-         else if ($permissions[9] == 't') $mode += 01001;
-         else if ($permissions[9] == 'T') $mode += 01000;
-
-        if ($permissions[0] != "d") {
-            $mode += 0100000;
-        } else {
-            $mode += 0040000;
-        }
-
-        $mode = (string) ("0".$mode);
-        return  $mode;
-    }
-
-}
diff --git a/core/src/plugins/access.ftp/i18n/conf/de.php b/core/src/plugins/access.ftp/i18n/conf/de.php
index f64901cdcd..9796d80adf 100644
--- a/core/src/plugins/access.ftp/i18n/conf/de.php
+++ b/core/src/plugins/access.ftp/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FTP Server" => "FTP-Server",
diff --git a/core/src/plugins/access.ftp/i18n/conf/en.php b/core/src/plugins/access.ftp/i18n/conf/en.php
index bbaf7d48d8..2b26c9cc49 100644
--- a/core/src/plugins/access.ftp/i18n/conf/en.php
+++ b/core/src/plugins/access.ftp/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FTP Server" => "FTP Server",
diff --git a/core/src/plugins/access.ftp/i18n/conf/fr.php b/core/src/plugins/access.ftp/i18n/conf/fr.php
index 8348f622fb..32ca77f14e 100644
--- a/core/src/plugins/access.ftp/i18n/conf/fr.php
+++ b/core/src/plugins/access.ftp/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FTP Server" => "Serveur FTP",
diff --git a/core/src/plugins/access.ftp/i18n/conf/it.php b/core/src/plugins/access.ftp/i18n/conf/it.php
index 7874d4df89..ab2e657411 100644
--- a/core/src/plugins/access.ftp/i18n/conf/it.php
+++ b/core/src/plugins/access.ftp/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FTP Server" => "Server FTP",
diff --git a/core/src/plugins/access.ftp/i18n/conf/pt.php b/core/src/plugins/access.ftp/i18n/conf/pt.php
index 9984778654..008c58017b 100644
--- a/core/src/plugins/access.ftp/i18n/conf/pt.php
+++ b/core/src/plugins/access.ftp/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FTP Server" => "Servidor FTP",
diff --git a/core/src/plugins/access.ftp/manifest.xml b/core/src/plugins/access.ftp/manifest.xml
index 65e80518e9..fccff3d335 100644
--- a/core/src/plugins/access.ftp/manifest.xml
+++ b/core/src/plugins/access.ftp/manifest.xml
@@ -22,8 +22,6 @@
     </server_settings>
 	<registry_contributions>
 		<client_configs>
-			<template_part ajxpId="search_container" ajxpClass="SearchEngine" ajxpOptions="{}"/>
-            <template_part ajxpId="search_container" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "fitMarginBottom":20}' theme="vision"/>
             <template_part ajxpId="search_container" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "openSearchInput":"true", "openSearchStickLeftTo":"topPane", "searchChooserAsResultsHeader":true, "toggleResultsFitTo":"cpane_tabs", "fitMarginBottom":0, "toggleResultsOffsetRight":0, "toggleResultsOffsetTop":0, "detailThumbSize":24}' theme="orbit"/>
             <component_config className="FilesList">
 				<columns switchGridMode="filelist">
@@ -40,13 +38,16 @@
         <external_file filename="plugins/access.fs/fsTemplatePart.xml" include="client_configs/*" exclude=""/>
 		<external_file filename="plugins/access.fs/fsActions.xml" include="actions/*" exclude=""/>
 		<external_file filename="plugins/access.fs/fsActions.xml" include="client_configs/*"/>
-		<external_file filename="plugins/access.remote_fs/additionalActions.xml" include="actions/*"/>
         <external_file filename="plugins/access.fs/manifest.xml" include="registry_contributions/hooks/*" exclude=""/>
+        <actions>
+            <action name="next_to_remote">
+                <processing><serverCallback methodName="uploadActions"/></processing>
+            </action>
+        </actions>
 	</registry_contributions>
-	<class_definition filename="plugins/access.ftp/class.ftpAccessDriver.php" classname="ftpAccessDriver"/>
+	<class_definition filename="plugins/access.ftp/FtpAccessDriver.php" classname="Pydio\Access\Driver\StreamProvider\FTP\FtpAccessDriver"/>
 	<dependencies>
 		<pluginClass pluginName="access.fs"/>
-		<pluginClass pluginName="access.remote_fs"/>
 	</dependencies>
-    <class_stream_wrapper filename="plugins/access.ftp/class.ftpAccessWrapper.php" classname="ftpAccessWrapper" protocol="ajxp.ftp"/>
+    <class_stream_wrapper filename="plugins/access.ftp/FtpAccessWrapper.php" classname="Pydio\Access\Driver\StreamProvider\FTP\FtpAccessWrapper" protocol="ajxp.ftp"/>
 </ajxpdriver>
diff --git a/core/src/plugins/access.ftp/test.ftpAccess.php b/core/src/plugins/access.ftp/test.ftpAccess.php
index acc5105736..f0b442c0ed 100644
--- a/core/src/plugins/access.ftp/test.ftpAccess.php
+++ b/core/src/plugins/access.ftp/test.ftpAccess.php
@@ -16,11 +16,11 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
-defined('AJXP_EXEC') or die( 'Access not allowed');
+namespace Pydio\Tests;
 
-require_once(AJXP_BIN_FOLDER . '/class.AbstractTest.php');
+defined('AJXP_EXEC') or die( 'Access not allowed');
 
 /**
  * @package AjaXplorer_Plugins
@@ -28,17 +28,24 @@
  */
 class ftpAccessTest extends AbstractTest
 {
+    /**
+     * ftpAccessTest constructor.
+     */
     public function __construct() { parent::__construct("Remote FTP Filesystem Plugin", ""); }
 
+    /**
+     * @param \Pydio\Access\Core\Model\Repository $repo
+     * @return bool|int
+     */
     public function doRepositoryTest($repo)
     {
         if($repo->accessType != "ftp") return -1;
 
         $basePath = AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/access.ftp/" ;
         // Check file exists
-        if (!file_exists($basePath."class.ftpAccessDriver.php")
+        if (!file_exists($basePath."FtpAccessDriver.php")
          || !file_exists($basePath."manifest.xml"))
-        { $this->failedInfo .= "Missing at least one of the plugin files (class.ftpAccessDriver.php, manifest.xml, ftpActions.xml).\nPlease reinstall from lastest release."; return FALSE; }
+        { $this->failedInfo .= "Missing at least one of the plugin files (FtpAccessDriver.php, manifest.xml, ftpActions.xml).\nPlease reinstall from lastest release."; return FALSE; }
 
         return TRUE;
     }
diff --git a/core/src/plugins/access.imap/ImapAccessDriver.php b/core/src/plugins/access.imap/ImapAccessDriver.php
new file mode 100644
index 0000000000..e978280e94
--- /dev/null
+++ b/core/src/plugins/access.imap/ImapAccessDriver.php
@@ -0,0 +1,212 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Driver\StreamProvider\Imap;
+
+use DOMNode;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Driver\StreamProvider\FS\FsAccessDriver;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Utils\Vars\StatHelper;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Plugin to browse a mailbox content (IMAP OR POP)
+ * @package AjaXplorer_Plugins
+ * @subpackage Access
+ */
+class ImapAccessDriver extends FsAccessDriver
+{
+    /**
+    * @var \Pydio\Access\Core\Model\Repository
+    */
+    public $repository;
+    public $driverConf;
+    protected $wrapperClassName;
+    protected $urlBase;
+
+    /**
+     * @param ContextInterface $contextInterface
+     * @throws PydioException
+     * @throws \Exception
+     */
+    protected function initRepository(ContextInterface $contextInterface)
+    {
+        if (is_array($this->pluginConf)) {
+            $this->driverConf = $this->pluginConf;
+        } else {
+            $this->driverConf = array();
+        }
+
+        $this->urlBase = $contextInterface->getUrlBase();
+
+    }
+
+    public function performChecks()
+    {
+        if (!function_exists("imap_createmailbox")) {
+            throw new \Exception("PHP Imap extension must be loaded to use this driver!");
+        }
+    }
+
+    public static function inverseSort($st1, $st2)
+    {
+        return strnatcasecmp($st2, $st1);
+    }
+
+    public static function sortInboxFirst($st1, $st2)
+    {
+        if($st1 == "INBOX") return -1;
+        if($st2 == "INBOX") return  1;
+        return strcmp($st1, $st2);
+    }
+
+    public function switchAction(ServerRequestInterface &$request, ResponseInterface &$response)
+    {
+        if ($request->getAttribute("action") ==  "ls") {
+            $dir = $request->getParsedBody()["dir"];
+            if ($dir == "/" || empty($dir)) {
+                // MAILBOXES CASE
+                $this->repository->addOption("PAGINATION_THRESHOLD", 500);
+                $this->driverConf["SCANDIR_RESULT_SORTFONC"] = array("Pydio\\Access\\Driver\\StreamProvider\\Imap\\imapAccessDriver", "sortInboxFirst");
+            } else {
+                // MAILS LISTING CASE
+                $this->driverConf["SCANDIR_RESULT_SORTFONC"] = array("Pydio\\Access\\Driver\\StreamProvider\\Imap\\imapAccessDriver", "inverseSort");
+            }
+        }
+        parent::switchAction($request, $response);
+    }
+
+    /**
+     *
+     * @param \Pydio\Access\Core\Model\AJXP_Node $ajxpNode
+     */
+    public function enrichMetadata(&$ajxpNode)//, &$metadata, $wrapperClassName, &$realFile)
+    {
+        $currentNode = $ajxpNode->getUrl();
+        $baseUrl = $ajxpNode->getContext()->getUrlBase();
+        $metadata = $ajxpNode->metadata;
+        $parsed = parse_url($currentNode);
+        if ( isSet($parsed["fragment"]) && strpos($parsed["fragment"], "attachments") === 0) {
+            list(, $attachmentId) = explode("/", $parsed["fragment"]);
+            $meta = ImapAccessWrapper::getCurrentAttachmentsMetadata();
+            if ($meta != null) {
+                foreach ($meta as $attach) {
+                    if ($attach["x-attachment-id"] == $attachmentId) {
+                        $metadata["text"] = $attach["filename"];
+                        $fakeNode = new AJXP_Node($baseUrl."/".ltrim($attach["filename"], "/"));
+                        $mimeData = StatHelper::getMimeInfo($fakeNode, false);
+                        $metadata["mimestring_id"] = $mimeData[0];
+                        $metadata["icon"] = $mimeData[1];
+                    }
+                }
+            }
+        }
+
+        if (!$metadata["is_file"] && $currentNode != "") {
+            $metadata["icon"] = "imap_images/ICON_SIZE/mail_folder_sent.png";
+        }
+        if (basename($currentNode) == "INBOX") {
+            $metadata["text"] = "Incoming Mails";
+        }
+        if (strstr($currentNode, "__delim__")!==false) {
+            $parts = explode("/", $currentNode);
+            $metadata["text"] = str_replace("__delim__", "/", array_pop($parts));
+        }
+        $ajxpNode->metadata = $metadata;
+    }
+
+    /**
+     * @param AJXP_Node $currentNode
+     * @param string $localName
+     * @param string $wrapperClassName
+     */
+    public function attachmentDLName($currentNode, &$localName, $wrapperClassName)
+    {
+        $parsed = parse_url($currentNode->getUrl());
+        if ( isSet($parsed["fragment"]) && strpos($parsed["fragment"], "attachments") === 0) {
+            list(, $attachmentId) = explode("/", $parsed["fragment"]);
+            $meta = ImapAccessWrapper::getCurrentAttachmentsMetadata();
+            if ($meta == null) {
+                stat($currentNode);
+                $meta = ImapAccessWrapper::getCurrentAttachmentsMetadata();
+            }
+            if ($meta != null) {
+                foreach ($meta as $attach) {
+                    if ($attach["x-attachment-id"] == $attachmentId) {
+                        $localName = $attach["filename"];
+                    }
+                }
+            }
+        } else {
+            $localName = basename($currentNode).".eml";
+        }
+    }
+
+    /**
+     * Parse
+     * @inheritdoc
+     */
+    protected function parseSpecificContributions(ContextInterface $ctx, \DOMNode &$contribNode)
+    {
+        parent::parseSpecificContributions($ctx, $contribNode);
+        if($contribNode->nodeName != "actions") return ;
+        $this->disableArchiveBrowsingContributions($contribNode);
+    }
+
+    /**
+     * @param ContextInterface $contextInterface
+     * @param $nodePath
+     * @param $nodeName
+     * @param $isLeaf
+     * @param $lsOptions
+     * @return bool
+     */
+    public function filterNodeName(ContextInterface $contextInterface, $nodePath, $nodeName, &$isLeaf, $lsOptions)
+    {
+        return true;
+    }
+
+    /**
+     * @param AJXP_Node $dirNode
+     * @param bool $foldersOnly
+     * @param bool $nonEmptyCheckOnly
+     * @param null $dirHANDLE
+     * @return int
+     * @throws \Exception
+     */
+    public function countChildren(AJXP_Node $dirNode, $foldersOnly = false, $nonEmptyCheckOnly = false, $dirHANDLE = null)
+    {
+        if($foldersOnly) return 0;
+        $count = 0;
+        if($tmpHandle = opendir($dirNode->getUrl())){
+            // WILL USE IMAP FUNCTIONS TO COUNT;
+            $this->logDebug("COUNT : ".ImapAccessWrapper::getCurrentDirCount());
+            $count = ImapAccessWrapper::getCurrentDirCount();
+            closedir($tmpHandle);
+        }
+        return $count;
+    }
+
+}
diff --git a/core/src/plugins/access.imap/ImapAccessWrapper.php b/core/src/plugins/access.imap/ImapAccessWrapper.php
new file mode 100644
index 0000000000..c3c5243978
--- /dev/null
+++ b/core/src/plugins/access.imap/ImapAccessWrapper.php
@@ -0,0 +1,555 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Driver\StreamProvider\Imap;
+
+use EmlParser;
+use Pydio\Access\Core\IAjxpWrapper;
+use Pydio\Access\Core\Model\AJXP_Node;
+
+use Pydio\Core\Utils\Vars\UrlUtils;
+use Pydio\Core\Utils\TextEncoder;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+function rejectEmpty($element){return !empty($element);}
+
+/**
+ * Plugin to browse a mailbox content (IMAP OR POP)
+ * @package AjaXplorer_Plugins
+ * @subpackage Access
+ */
+class ImapAccessWrapper implements IAjxpWrapper
+{
+    public $ih;
+    public $host;
+    public $port;
+    public $username;
+    public $password;
+    public $path;
+    public $pop3;
+    // stuff for dir reading
+    public $dir;
+    public $pos;
+    // stuff for file reading
+    public $data;
+    public $gotbody;
+    public $size;
+    public $time;
+
+    public $fragment;
+    public $mailbox;
+
+    public $mailboxes;
+    public $currentAttachmentData;
+
+    protected $repositoryId;
+
+    private static $currentStream;
+    private static $currentRef;
+    private static $currentCount;
+    private static $delimiter;
+    private static $attachmentsMetadata;
+
+    public static function closeStreamFunc()
+    {
+        if (self::$currentStream) {
+            Logger::debug("Closing stream now!");
+            imap_close(self::$currentStream);
+        }
+    }
+
+    public static function getCurrentDirCount()
+    {
+        return self::$currentCount;
+    }
+
+    public static function getCurrentAttachmentsMetadata()
+    {
+        return self::$attachmentsMetadata;
+    }
+
+    public function stream_open($path, $mode, $options, &$opened_path)
+    {
+        // parse URL
+        $node = new AJXP_Node($path);
+        $parts = UrlUtils::safeParseUrl($path);
+        $this->repositoryId = $node->getRepositoryId();
+
+        $mainCacheDir = (defined('AJXP_SHARED_CACHE_DIR')?AJXP_SHARED_CACHE_DIR:AJXP_CACHE_DIR);
+        if (!isset(self::$delimiter) && file_exists($mainCacheDir."/access.imap/mailbox_delim_".$this->repositoryId)) {
+            self::$delimiter = file_get_contents($mainCacheDir."/access.imap/mailbox_delim_".$this->repositoryId);
+        }
+
+        $this->path = substr($parts["path"], 1);
+        //$this->mailbox = "INBOX";
+        $pathParts = explode("/", $this->path);
+        $pathParts = array_filter($pathParts, "rejectEmpty");
+        if (count($pathParts) > 1) {
+            $this->path = array_pop($pathParts);
+            $this->mailbox = implode("/", $pathParts);
+        } else if (count($pathParts) == 1) {
+            $this->mailbox = implode("/", $pathParts);
+            $this->path = "";
+        } else {
+            $this->mailbox = "";
+            $this->path = "";
+        }
+        $this->fragment = $parts["fragment"];
+        if (empty ( $this->path ) && $mode !== 'np') {
+            return false;
+        }
+        if (!empty($this->mailbox)) {
+            $this->mailbox = mb_convert_encoding($this->mailbox, "UTF7-IMAP", TextEncoder::getEncoding());
+            $this->mailbox = str_replace("__delim__", (isSet(self::$delimiter)?self::$delimiter:"/"), $this->mailbox);
+        }
+        if (!empty($this->fragment) && strpos($this->fragment, "attachments") === 0 && strpos($this->fragment, "/")!== false) {
+            // remove fragment
+            $ar = explode("#", $path);
+            $mailPath = array_shift($ar);
+            $ar = explode("/", $this->fragment);
+            $attachmentId = array_pop($ar);
+            $this->currentAttachmentData = array("realPath" => $mailPath, "attachmentId" => $attachmentId);
+            // EXTRACT ATTACHMENT AND RETURN
+            require_once AJXP_INSTALL_PATH."/plugins/editor.eml/class.EmlParser.php";
+            $emlParser = new EmlParser("", "");
+            $attachMeta = array();
+            $this->data = $emlParser->getAttachmentBody(
+                $this->currentAttachmentData["realPath"],
+                $this->currentAttachmentData["attachmentId"],
+                true,
+                $attachMeta
+            );
+            if (self::$attachmentsMetadata == null) {
+                self::$attachmentsMetadata = array($attachMeta);
+            }
+
+            $this->currentAttachmentData["size"] = strlen($this->data);
+            $this->pos = 0;
+            $this->size = strlen($this->data);
+            return true;
+        }
+
+        // open IMAP connection
+        if (self::$currentStream != null) {
+            Logger::debug(__CLASS__,__FUNCTION__,"Using currently opened stream! ".print_r(self::$currentStream, true));
+            $this->ih = self::$currentStream;
+            // Rewind everything
+            $this->dir_rewinddir();
+            $this->stream_seek(0);
+        } else {
+            $ctx = $node->getContext();
+            $ssl            = $ctx->getRepository()->getContextOption($ctx, "SSL") == "true" ? true: false ;
+            $this->pop3     = $ctx->getRepository()->getContextOption($ctx, "BOX_TYPE") == "pop3" ? true : false;
+            $this->host     = $ctx->getRepository()->getContextOption($ctx, "HOST");
+            $this->port     = $ctx->getRepository()->getContextOption($ctx, "PORT");
+            $this->username = $ctx->getRepository()->getContextOption($ctx, "USER");
+            $this->password = $ctx->getRepository()->getContextOption($ctx, "PASS");
+            $server = "{". $this->host . ":" . $this->port . "/".($this->pop3?"pop3/":"").($ssl?"ssl/novalidate-cert":"novalidate-cert")."}";
+            self::$currentRef = $server;
+            Logger::debug(__CLASS__,__FUNCTION__,"Opening a new stream ".$server." with mailbox '".$this->mailbox."'");
+            try {
+                $this->ih = imap_open ( $server.$this->mailbox , $this->username, $this->password, (!$this->pop3 && empty($this->mailbox)?OP_HALFOPEN:NULL), 1);
+            } catch (\Exception $e) {
+                throw new \Exception($e->getMessage()." - imap errors  : ".print_r(imap_errors(), true), $e->getCode());
+            }
+            self::$currentStream = $this->ih;
+            register_shutdown_function(function(){
+                ImapAccessWrapper::closeStreamFunc();
+            });
+        }
+        if ($this->ih) {
+            if (! empty ( $this->path )) {
+                list ( $stats, ) = imap_fetch_overview ( $this->ih, $this->path );
+                $this->size = $stats->size;
+                $this->time = strtotime ( $stats->date );
+            }
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public function stream_close()
+    {
+        if (empty($this->mailbox)) {
+            //self::$currentStream = null;
+            //imap_close ( $this->ih );
+        }
+        if (!empty($this->currentAttachmentData)) {
+            $this->currentAttachmentBody = null;
+        }
+    }
+
+    /* Smart reader, at first it only downloads the header to memory, but if a read request is made
+       beyond the header, we download the rest of the body */
+    public function stream_read($count)
+    {
+        //AJXP_Logger::debug(__CLASS__,__FUNCTION__,"READING $count FROM $this->path", $this->currentAttachmentData);
+        if (!empty($this->currentAttachmentData)) {
+            if (empty($this->data)) {
+                Logger::debug(__CLASS__,__FUNCTION__,"Attachement", $this->currentAttachmentData);
+                // EXTRACT ATTACHMENT AND RETURN
+                require_once AJXP_INSTALL_PATH."/plugins/editor.eml/class.EmlParser.php";
+                $emlParser = new EmlParser("", "");
+                $attachMeta = array();
+                $this->data = $emlParser->getAttachmentBody(
+                    $this->currentAttachmentData["realPath"],
+                    $this->currentAttachmentData["attachmentId"],
+                    true,
+                    $attachMeta
+                );
+                $this->pos = 0;
+                $this->size = strlen($this->data);
+            }
+        } else {
+            // smart... only download the header WHEN data is requested
+            if (empty ( $this->data )) {
+                $this->pos = 0;
+                $this->gotbody = false;
+                $this->data = imap_fetchheader ( $this->ih, $this->path );
+            }
+            // only download the body once we read past the header
+            if ($this->gotbody == false && ($this->pos + $count > strlen ( $this->data )) && $this->fragment != "header") {
+                $this->gotbody = true;
+                $this->data .= imap_body ( $this->ih, $this->path );
+                $this->size = strlen ( $this->data );
+            }
+        }
+        if ($this->pos >= $this->size) {
+            return false;
+        } else {
+            $d = substr ( $this->data, $this->pos, $count );
+            if ($this->pos + $count > strlen ( $this->data )) {
+                $this->pos = strlen ( $this->data );
+            } else {
+                $this->pos = $this->pos + $count;
+            }
+            return $d;
+        }
+    }
+
+    /* Can't write to POP3 */
+    public function stream_write($data)
+    {
+        return false;
+    }
+
+    public function stream_eof()
+    {
+        if ($this->pos >= $this->size) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public function stream_tell()
+    {
+        return $this->pos;
+    }
+
+    public function stream_seek($offset , $whence = SEEK_SET)
+    {
+        switch ($whence) {
+            case SEEK_SET :
+                $this->pos = $offset;
+                break;
+            case SEEK_CUR :
+                $this->pos = $this->pos + $offset;
+                break;
+            case SEEK_END :
+                $this->pos = $this->size + $offset;
+                break;
+        }
+    }
+
+    public function stream_stat()
+    {
+        $keys = array('dev' => 0, 'ino' => 0, 'mode' => 33216, 'nlink' => 0, 'uid' => 0, 'gid' => 0, 'rdev' => 0, 'size' => $this->size, 'atime' => $this->time, 'mtime' => $this->time, 'ctime' => $this->time, 'blksize' => 0, 'blocks' => 0 );
+        return $keys;
+    }
+
+    public function dir_opendir($path, $options)
+    {
+        // Reset
+        self::$attachmentsMetadata = null;
+
+        $st = '';
+        $stream = $this->stream_open ( $path, 'np', $options, $st );
+        if (!$stream) {
+            return false;
+        }
+        if (empty($this->mailbox)) {
+            // We are browsing root, we want the list of mailboxes
+            $this->mailboxes = imap_getmailboxes($this->ih, self::$currentRef, "*");
+            $this->dir = count($this->mailboxes);
+            self::$currentCount = count($this->mailboxes);
+            $this->pos = $this->dir - 1;
+        } else if ($this->fragment == "attachments") {
+            require_once AJXP_INSTALL_PATH.'/plugins/editor.eml/class.EmlParser.php';
+            $parser = new EmlParser("", "");
+            $ar = explode("#", $path);
+            $path = array_shift($ar);// remove fragment
+            self::$attachmentsMetadata = array();
+            $parser->listAttachments($path, true, self::$attachmentsMetadata);
+            $this->dir = count(self::$attachmentsMetadata);
+            $this->pos = $this->dir - 1;
+            self::$currentCount = $this->dir;
+
+        } else {
+            // We are in a mailbox, we want the messages number
+            $this->dir = imap_num_msg ( $this->ih );
+            self::$currentCount = $this->dir;
+            $this->pos = $this->dir;
+        }
+        $this->stream_close ();
+        return true;
+    }
+
+    public function dir_closedir()
+    {
+        // do nothing.
+        // $this->stream_close();
+        $this->mailboxes = null;
+    }
+
+    public function dir_readdir()
+    {
+        if ($this->mailboxes) {
+            if($this->pos < 0) return false;
+            else{
+                $obj = $this->mailboxes[$this->pos];
+                $this->pos --;
+                $x = $obj->name;
+                $x = mb_convert_encoding( $x, "UTF-8", "UTF7-IMAP" );
+                $x = str_replace(self::$currentRef, "", $x);
+                $mainCacheDir = (defined('AJXP_SHARED_CACHE_DIR')?AJXP_SHARED_CACHE_DIR:AJXP_CACHE_DIR);
+                if (!isSet(self::$delimiter) && !file_exists($mainCacheDir."/access.imap/mailbox_delim_".$this->repositoryId)) {
+                    if(!is_dir($mainCacheDir ."/access.imap")) mkdir($mainCacheDir."/access.imap");
+                    file_put_contents($mainCacheDir."/access.imap/mailbox_delim_".$this->repositoryId, $obj->delimiter);
+                    self::$delimiter = $obj->delimiter;
+                }
+                $x = str_replace($obj->delimiter, "__delim__", $x);
+            }
+        } else if (self::$attachmentsMetadata != null) {
+            if($this->pos < 0) return false;
+            $x = self::$attachmentsMetadata[$this->pos]["x-attachment-id"];
+            $this->pos--;
+        } else {
+            if ($this->pos < 1) {
+                return false;
+            } else {
+                $x = $this->pos;
+                $this->pos --;
+                //$x .= "#header";
+            }
+        }
+        return $x;
+    }
+
+    public function dir_rewinddir()
+    {
+        if (empty($this->mailbox)) {
+            $this->pos = $this->dir;
+        } else {
+            $this->pos = count($this->mailboxes) - 1;
+        }
+    }
+
+    public function url_stat($path, $flags)
+    {
+        $emptyString = '';
+        if ($this->stream_open ( $path, 'np', $flags, $emptyString)) {
+            if (!empty($this->path) && empty($this->currentAttachmentData)) {
+                // Mail
+                //$stats = array();
+                if (empty($this->size) && empty($this->time)) {
+                    list ( $stats, ) = imap_fetch_overview ( $this->ih, $this->path );
+                    $this->size = $stats->size;
+                    $this->time = strtotime ( $stats->date );
+                }
+                $keys = array(
+                    'dev' => 0,
+                    'ino' => 0,
+                    'mode' => 33279,
+                    'nlink' => 0,
+                    'uid' => 0,
+                    'gid' => 0,
+                    'rdev' => 0,
+                    'size' => $this->size,
+                    'atime' => $this->time,
+                    'mtime' => $this->time,
+                    'ctime' => $this->time,
+                    'blksize' => 0,
+                    'blocks' => 0 );
+            } else {
+                // BOX
+                if (empty($this->currentAttachmentData) && !empty($this->mailbox) && !$this->pop3) {
+                    // GET LAST MESSAGE
+                    imap_reopen($this->ih, self::$currentRef.$this->mailbox);
+                    $last = imap_num_msg($this->ih);
+                    //AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Should get mailbox data ".self::$currentRef.$this->mailbox . $last);
+                    list ( $stats, ) = imap_fetch_overview ( $this->ih, $last );
+                    $this->size = $stats->size;
+                    $this->time = strtotime ( $stats->date );
+                }
+                $keys = array(
+                    'dev' => 0,
+                    'ino' => 0,
+                    'mode' => (empty($this->currentAttachmentData)?(33279 | 0040000):33216),
+                    'nlink' => 0,
+                    'uid' => 0,
+                    'gid' => 0,
+                    'rdev' => 0,
+                    'size' => (!empty($this->currentAttachmentData)?$this->currentAttachmentData["size"]:0),
+                    'atime' => (!empty($this->time)?$this->time:0),
+                    'mtime' => (!empty($this->time)?$this->time:0),
+                    'ctime' => (!empty($this->time)?$this->time:0),
+                    'blksize' => 0,
+                    'blocks' => 0
+                );
+            }
+            $this->stream_close ();
+            return $keys;
+        } else {
+            return false;
+        }
+    }
+
+    /* Delete an email from the mailbox */
+    public function unlink($path)
+    {
+        $st='';
+        if ($this->stream_open ( $path, '', '', $st )) {
+            imap_delete ( $this->ih, $this->path );
+            $this->stream_close ();
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+
+    public static function getRealFSReference($path, $persistent = false)
+    {
+        return $path;
+    }
+
+    /**
+     * Read a file (by chunks) and copy the data directly inside the given stream.
+     *
+     * @param string $path
+     * @param resource $stream
+     */
+    public static function copyFileInStream($path, $stream)
+    {
+        //return $path;
+        $fp = fopen($path, 'r');
+        $bufferSize = 4096 * 8;
+        if ($fp) {
+            while (!feof($fp)) {
+                $data = fread($fp, $bufferSize);
+                fwrite($stream, $data, strlen($data));
+            }
+            fclose($fp);
+        }
+    }
+
+    public static function isRemote()
+    {
+        return true;
+    }
+
+    /**
+     * Chmod implementation for this type of access.
+     *
+     * @param string $path
+     * @param mixed $chmodValue
+     */
+    public static function changeMode($path, $chmodValue)
+    {
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path
+     * @param int $mode
+     * @param int $options
+     * @return bool
+     */
+    public function mkdir($path , $mode , $options)
+    {
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path_from
+     * @param string $path_to
+     * @return bool
+     */
+    public function rename($path_from , $path_to)
+    {
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path
+     * @param int $options
+     * @return bool
+     */
+    public function rmdir($path , $options)
+    {
+    }
+
+
+    /**
+     * Enter description here...
+     *
+     * @return bool
+     */
+    public function stream_flush()
+    {
+    }
+
+
+    /**
+     * Describe whether the current wrapper can rewind a stream or not.
+     * @static
+     * @return boolean
+     */
+    public static function isSeekable($url)
+    {
+        return false;
+    }
+
+    /**
+     * @param AJXP_Node $node
+     * @return array
+     */
+    public static function getResolvedOptionsForNode($node)
+    {
+        return ["TYPE" => "php"];
+    }
+}
diff --git a/core/src/plugins/access.imap/class.imapAccessDriver.php b/core/src/plugins/access.imap/class.imapAccessDriver.php
deleted file mode 100644
index 6352aca7ba..0000000000
--- a/core/src/plugins/access.imap/class.imapAccessDriver.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * AJXP_Plugin to browse a mailbox content (IMAP OR POP)
- * @package AjaXplorer_Plugins
- * @subpackage Access
- */
-class imapAccessDriver extends fsAccessDriver
-{
-    /**
-    * @var Repository
-    */
-    public $repository;
-    public $driverConf;
-    protected $wrapperClassName;
-    protected $urlBase;
-
-    public function initRepository()
-    {
-        if (is_array($this->pluginConf)) {
-            $this->driverConf = $this->pluginConf;
-        } else {
-            $this->driverConf = array();
-        }
-
-        $this->detectStreamWrapper(true);
-        $this->urlBase = "pydio://".$this->repository->getId();
-        if ($this->repository->getOption("MAILBOX") != "") {
-            //$this->urlBase .= "/INBOX";
-        }
-        /*
-        if (!file_exists($this->urlBase)) {
-            throw new AJXP_Exception("Cannot find base path for your repository! Please check the configuration!");
-        }
-        */
-    }
-
-    public function performChecks()
-    {
-        if (!function_exists("imap_createmailbox")) {
-            throw new Exception("PHP Imap extension must be loaded to use this driver!");
-        }
-    }
-
-    public static function inverseSort($st1, $st2)
-    {
-        return strnatcasecmp($st2, $st1);
-    }
-
-    public static function sortInboxFirst($st1, $st2)
-    {
-        if($st1 == "INBOX") return -1;
-        if($st2 == "INBOX") return  1;
-        return strcmp($st1, $st2);
-    }
-
-    public function switchAction($action, $httpVars, $fileVars)
-    {
-        if ($action == "ls") {
-            $dir = $httpVars["dir"];
-            if ($dir == "/" || empty($dir)) {
-                // MAILBOXES CASE
-                $this->repository->addOption("PAGINATION_THRESHOLD", 500);
-                $this->driverConf["SCANDIR_RESULT_SORTFONC"] = array("imapAccessDriver", "sortInboxFirst");
-            } else {
-                // MAILS LISTING CASE
-                //$httpVars["dir"] = mb_convert_encoding($httpVars["dir"], "UTF7-IMAP", SystemTextEncoding::getEncoding());
-                $this->driverConf["SCANDIR_RESULT_SORTFONC"] = array("imapAccessDriver", "inverseSort");
-            }
-        }
-        parent::switchAction($action, $httpVars, $fileVars);
-    }
-
-    /**
-     *
-     * @param AJXP_Node $ajxpNode
-     */
-    public function enrichMetadata(&$ajxpNode)//, &$metadata, $wrapperClassName, &$realFile)
-    {
-        $currentNode = $ajxpNode->getUrl();
-        $metadata = $ajxpNode->metadata;
-        $parsed = parse_url($currentNode);
-        if ( isSet($parsed["fragment"]) && strpos($parsed["fragment"], "attachments") === 0) {
-            list(, $attachmentId) = explode("/", $parsed["fragment"]);
-            $meta = imapAccessWrapper::getCurrentAttachmentsMetadata();
-            if ($meta != null) {
-                foreach ($meta as $attach) {
-                    if ($attach["x-attachment-id"] == $attachmentId) {
-                        $metadata["text"] = $attach["filename"];
-                        $metadata["icon"] = AJXP_Utils::mimetype($attach["filename"], "image", false);
-                        $metadata["mimestring"] = AJXP_Utils::mimetype($attach["filename"], "text", false);
-                    }
-                }
-            }
-        }
-
-        if (!$metadata["is_file"] && $currentNode != "") {
-            $metadata["icon"] = "imap_images/ICON_SIZE/mail_folder_sent.png";
-        }
-        if (basename($currentNode) == "INBOX") {
-            $metadata["text"] = "Incoming Mails";
-        }
-        if (strstr($currentNode, "__delim__")!==false) {
-            $parts = explode("/", $currentNode);
-            $metadata["text"] = str_replace("__delim__", "/", array_pop($parts));
-        }
-        $ajxpNode->metadata = $metadata;
-    }
-
-    public function attachmentDLName($currentNode, &$localName, $wrapperClassName)
-    {
-        $parsed = parse_url($currentNode);
-        if ( isSet($parsed["fragment"]) && strpos($parsed["fragment"], "attachments") === 0) {
-            list(, $attachmentId) = explode("/", $parsed["fragment"]);
-            $meta = imapAccessWrapper::getCurrentAttachmentsMetadata();
-            if ($meta == null) {
-                stat($currentNode);
-                $meta = imapAccessWrapper::getCurrentAttachmentsMetadata();
-            }
-            if ($meta != null) {
-                foreach ($meta as $attach) {
-                    if ($attach["x-attachment-id"] == $attachmentId) {
-                        $localName = $attach["filename"];
-                    }
-                }
-            }
-        } else {
-            $localName = basename($currentNode).".eml";
-        }
-    }
-
-    /**
-     * Parse
-     * @param DOMNode $contribNode
-     */
-    protected function parseSpecificContributions(&$contribNode)
-    {
-        parent::parseSpecificContributions($contribNode);
-        if($contribNode->nodeName != "actions") return ;
-        $this->disableArchiveBrowsingContributions($contribNode);
-    }
-
-    public function filterNodeName($nodePath, $nodeName, &$isLeaf, $lsOptions)
-    {
-        return true;
-    }
-
-    public function countFiles($dirName,  $foldersOnly = false, $nonEmptyCheckOnly = false, $dirHandle = null)
-    {
-        if($foldersOnly) return 0;
-        // WILL USE IMAP FUNCTIONS TO COUNT;
-        $tmpHandle = opendir($dirName);
-        $this->logDebug("COUNT : ".imapAccessWrapper::getCurrentDirCount());
-        return imapAccessWrapper::getCurrentDirCount();
-    }
-
-}
diff --git a/core/src/plugins/access.imap/class.imapAccessWrapper.php b/core/src/plugins/access.imap/class.imapAccessWrapper.php
deleted file mode 100755
index e2b9281353..0000000000
--- a/core/src/plugins/access.imap/class.imapAccessWrapper.php
+++ /dev/null
@@ -1,534 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-function rejectEmpty($element){return !empty($element);}
-
-/**
- * AJXP_Plugin to browse a mailbox content (IMAP OR POP)
- * @package AjaXplorer_Plugins
- * @subpackage Access
- */
-class imapAccessWrapper implements AjxpWrapper
-{
-    public $ih;
-    public $host;
-    public $port;
-    public $username;
-    public $password;
-    public $path;
-    public $pop3;
-    // stuff for dir reading
-    public $dir;
-    public $pos;
-    // stuff for file reading
-    public $data;
-    public $gotbody;
-    public $size;
-    public $time;
-
-    public $fragment;
-    public $mailbox;
-
-    public $mailboxes;
-    public $currentAttachmentData;
-
-
-    private static $currentStream;
-    private static $currentRef;
-    private static $currentCount;
-    private static $delimiter;
-    private static $attachmentsMetadata;
-
-    public static function closeStreamFunc()
-    {
-        if (self::$currentStream) {
-            AJXP_Logger::debug("Closing stream now!");
-            imap_close(self::$currentStream);
-        }
-    }
-
-    public static function getCurrentDirCount()
-    {
-        return self::$currentCount;
-    }
-
-    public static function getCurrentAttachmentsMetadata()
-    {
-        return self::$attachmentsMetadata;
-    }
-
-    public function stream_open($path, $mode, $options, &$opened_path)
-    {
-        // parse URL
-        $parts = AJXP_Utils::safeParseUrl($path);
-        $this->repositoryId = $parts["host"];
-        $mainCacheDir = (defined('AJXP_SHARED_CACHE_DIR')?AJXP_SHARED_CACHE_DIR:AJXP_CACHE_DIR);
-        if (!isset(self::$delimiter) && file_exists($mainCacheDir."/access.imap/mailbox_delim_".$this->repositoryId)) {
-            self::$delimiter = file_get_contents($mainCacheDir."/access.imap/mailbox_delim_".$this->repositoryId);
-        }
-
-        $this->path = substr($parts["path"], 1);
-        //$this->mailbox = "INBOX";
-        $pathParts = explode("/", $this->path);
-        $pathParts = array_filter($pathParts, "rejectEmpty");
-        if (count($pathParts) > 1) {
-            $this->path = array_pop($pathParts);
-            $this->mailbox = implode("/", $pathParts);
-        } else if (count($pathParts) == 1) {
-            $this->mailbox = implode("/", $pathParts);
-            $this->path = "";
-        } else {
-            $this->mailbox = "";
-            $this->path = "";
-        }
-        $this->fragment = $parts["fragment"];
-        if (empty ( $this->path ) && $mode !== 'np') {
-            return false;
-        }
-        if (!empty($this->mailbox)) {
-            $this->mailbox = mb_convert_encoding($this->mailbox, "UTF7-IMAP", SystemTextEncoding::getEncoding());
-            $this->mailbox = str_replace("__delim__", (isSet(self::$delimiter)?self::$delimiter:"/"), $this->mailbox);
-        }
-        if (!empty($this->fragment) && strpos($this->fragment, "attachments") === 0 && strpos($this->fragment, "/")!== false) {
-            // remove fragment
-            $ar = explode("#", $path);
-            $mailPath = array_shift($ar);
-            $ar = explode("/", $this->fragment);
-            $attachmentId = array_pop($ar);
-            $this->currentAttachmentData = array("realPath" => $mailPath, "attachmentId" => $attachmentId);
-            // EXTRACT ATTACHMENT AND RETURN
-            require_once AJXP_INSTALL_PATH."/plugins/editor.eml/class.EmlParser.php";
-            $emlParser = new EmlParser("", "");
-            $attachMeta = array();
-            $this->data = $emlParser->getAttachmentBody(
-                $this->currentAttachmentData["realPath"],
-                $this->currentAttachmentData["attachmentId"],
-                true,
-                $attachMeta
-            );
-            if (self::$attachmentsMetadata == null) {
-                self::$attachmentsMetadata = array($attachMeta);
-            }
-
-            $this->currentAttachmentData["size"] = strlen($this->data);
-            $this->pos = 0;
-            $this->size = strlen($this->data);
-            return true;
-        }
-
-        // open IMAP connection
-        if (self::$currentStream != null) {
-            AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Using currently opened stream! ".print_r(self::$currentStream, true));
-            $this->ih = self::$currentStream;
-            // Rewind everything
-            $this->dir_rewinddir();
-            $this->stream_seek(0);
-        } else {
-            $repository = ConfService::getRepositoryById($this->repositoryId);
-            $ssl = $repository->getOption("SSL") == "true" ? true: false ;
-            $this->pop3 = $repository->getOption("BOX_TYPE") == "pop3" ? true : false;
-            $this->host = $repository->getOption("HOST");
-            $this->port = $repository->getOption("PORT");
-            $this->username = $repository->getOption("USER");
-            $this->password = $repository->getOption("PASS");
-            $server = "{". $this->host . ":" . $this->port . "/".($this->pop3?"pop3/":"").($ssl?"ssl/novalidate-cert":"novalidate-cert")."}";
-            self::$currentRef = $server;
-            AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Opening a new stream ".$server." with mailbox '".$this->mailbox."'");
-            try {
-                $this->ih = imap_open ( $server.$this->mailbox , $this->username, $this->password, (!$this->pop3 && empty($this->mailbox)?OP_HALFOPEN:NULL), 1);
-            } catch (Exception $e) {
-                throw new Exception($e->getMessage()." - imap errors  : ".print_r(imap_errors(), true), $e->getCode());
-            }
-            self::$currentStream = $this->ih;
-            register_shutdown_function(array("imapAccessWrapper", "closeStreamFunc"));
-        }
-        if ($this->ih) {
-            if (! empty ( $this->path )) {
-                list ( $stats, ) = imap_fetch_overview ( $this->ih, $this->path );
-                $this->size = $stats->size;
-                $this->time = strtotime ( $stats->date );
-            }
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public function stream_close()
-    {
-        if (empty($this->mailbox)) {
-            //self::$currentStream = null;
-            //imap_close ( $this->ih );
-        }
-        if (!empty($this->currentAttachmentData)) {
-            $this->currentAttachmentBody = null;
-        }
-    }
-
-    /* Smart reader, at first it only downloads the header to memory, but if a read request is made
-       beyond the header, we download the rest of the body */
-    public function stream_read($count)
-    {
-        //AJXP_Logger::debug(__CLASS__,__FUNCTION__,"READING $count FROM $this->path", $this->currentAttachmentData);
-        if (!empty($this->currentAttachmentData)) {
-            if (empty($this->data)) {
-                AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Attachement", $this->currentAttachmentData);
-                // EXTRACT ATTACHMENT AND RETURN
-                require_once AJXP_INSTALL_PATH."/plugins/editor.eml/class.EmlParser.php";
-                $emlParser = new EmlParser("", "");
-                $attachMeta = array();
-                $this->data = $emlParser->getAttachmentBody(
-                    $this->currentAttachmentData["realPath"],
-                    $this->currentAttachmentData["attachmentId"],
-                    true,
-                    $attachMeta
-                );
-                $this->pos = 0;
-                $this->size = strlen($this->data);
-            }
-        } else {
-            // smart... only download the header WHEN data is requested
-            if (empty ( $this->data )) {
-                $this->pos = 0;
-                $this->gotbody = false;
-                $this->data = imap_fetchheader ( $this->ih, $this->path );
-            }
-            // only download the body once we read past the header
-            if ($this->gotbody == false && ($this->pos + $count > strlen ( $this->data )) && $this->fragment != "header") {
-                $this->gotbody = true;
-                $this->data .= imap_body ( $this->ih, $this->path );
-                $this->size = strlen ( $this->data );
-            }
-        }
-        if ($this->pos >= $this->size) {
-            return false;
-        } else {
-            $d = substr ( $this->data, $this->pos, $count );
-            if ($this->pos + $count > strlen ( $this->data )) {
-                $this->pos = strlen ( $this->data );
-            } else {
-                $this->pos = $this->pos + $count;
-            }
-            return $d;
-        }
-    }
-
-    /* Can't write to POP3 */
-    public function stream_write($data)
-    {
-        return false;
-    }
-
-    public function stream_eof()
-    {
-        if ($this->pos >= $this->size) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public function stream_tell()
-    {
-        return $this->pos;
-    }
-
-    public function stream_seek($offset , $whence = SEEK_SET)
-    {
-        switch ($whence) {
-            case SEEK_SET :
-                $this->pos = $offset;
-                break;
-            case SEEK_CUR :
-                $this->pos = $this->pos + $offset;
-                break;
-            case SEEK_END :
-                $this->pos = $this->size + $offset;
-                break;
-        }
-    }
-
-    public function stream_stat()
-    {
-        $keys = array('dev' => 0, 'ino' => 0, 'mode' => 33216, 'nlink' => 0, 'uid' => 0, 'gid' => 0, 'rdev' => 0, 'size' => $this->size, 'atime' => $this->time, 'mtime' => $this->time, 'ctime' => $this->time, 'blksize' => 0, 'blocks' => 0 );
-        return $keys;
-    }
-
-    public function dir_opendir($path, $options)
-    {
-        // Reset
-        self::$attachmentsMetadata = null;
-
-        $st = '';
-        $stream = $this->stream_open ( $path, 'np', $options, $st );
-        if (!$stream) {
-            return false;
-        }
-        if (empty($this->mailbox)) {
-            // We are browsing root, we want the list of mailboxes
-            $this->mailboxes = imap_getmailboxes($this->ih, self::$currentRef, "*");
-            $this->dir = count($this->mailboxes);
-            self::$currentCount = count($this->mailboxes);
-            $this->pos = $this->dir - 1;
-        } else if ($this->fragment == "attachments") {
-            require_once AJXP_INSTALL_PATH.'/plugins/editor.eml/class.EmlParser.php';
-            $parser = new EmlParser("", "");
-            $ar = explode("#", $path);
-            $path = array_shift($ar);// remove fragment
-            self::$attachmentsMetadata = array();
-            $parser->listAttachments($path, true, self::$attachmentsMetadata);
-            $this->dir = count(self::$attachmentsMetadata);
-            $this->pos = $this->dir - 1;
-            self::$currentCount = $this->dir;
-
-        } else {
-            // We are in a mailbox, we want the messages number
-            $this->dir = imap_num_msg ( $this->ih );
-            self::$currentCount = $this->dir;
-            $this->pos = $this->dir;
-        }
-        $this->stream_close ();
-        return true;
-    }
-
-    public function dir_closedir()
-    {
-        // do nothing.
-        // $this->stream_close();
-        $this->mailboxes = null;
-    }
-
-    public function dir_readdir()
-    {
-        if ($this->mailboxes) {
-            if($this->pos < 0) return false;
-            else{
-                $obj = $this->mailboxes[$this->pos];
-                $this->pos --;
-                $x = $obj->name;
-                $x = mb_convert_encoding( $x, "UTF-8", "UTF7-IMAP" );
-                $x = str_replace(self::$currentRef, "", $x);
-                $mainCacheDir = (defined('AJXP_SHARED_CACHE_DIR')?AJXP_SHARED_CACHE_DIR:AJXP_CACHE_DIR);
-                if (!isSet(self::$delimiter) && !file_exists($mainCacheDir."/access.imap/mailbox_delim_".$this->repositoryId)) {
-                    if(!is_dir($mainCacheDir ."/access.imap")) mkdir($mainCacheDir."/access.imap");
-                    file_put_contents($mainCacheDir."/access.imap/mailbox_delim_".$this->repositoryId, $obj->delimiter);
-                    self::$delimiter = $obj->delimiter;
-                }
-                $x = str_replace($obj->delimiter, "__delim__", $x);
-            }
-        } else if (self::$attachmentsMetadata != null) {
-            if($this->pos < 0) return false;
-            $x = self::$attachmentsMetadata[$this->pos]["x-attachment-id"];
-            $this->pos--;
-        } else {
-            if ($this->pos < 1) {
-                return false;
-            } else {
-                $x = $this->pos;
-                $this->pos --;
-                //$x .= "#header";
-            }
-        }
-        return $x;
-    }
-
-    public function dir_rewinddir()
-    {
-        if (empty($this->mailbox)) {
-            $this->pos = $this->dir;
-        } else {
-            $this->pos = count($this->mailboxes) - 1;
-        }
-    }
-
-    public function url_stat($path, $flags)
-    {
-        $emptyString = '';
-        if ($this->stream_open ( $path, 'np', $flags, $emptyString)) {
-            if (!empty($this->path) && empty($this->currentAttachmentData)) {
-                // Mail
-                //$stats = array();
-                if (empty($this->size) && empty($this->time)) {
-                    list ( $stats, ) = imap_fetch_overview ( $this->ih, $this->path );
-                    $this->size = $stats->size;
-                    $this->time = strtotime ( $stats->date );
-                }
-                $keys = array(
-                    'dev' => 0,
-                    'ino' => 0,
-                    'mode' => 33279,
-                    'nlink' => 0,
-                    'uid' => 0,
-                    'gid' => 0,
-                    'rdev' => 0,
-                    'size' => $this->size,
-                    'atime' => $this->time,
-                    'mtime' => $this->time,
-                    'ctime' => $this->time,
-                    'blksize' => 0,
-                    'blocks' => 0 );
-            } else {
-                // BOX
-                if (empty($this->currentAttachmentData) && !empty($this->mailbox) && !$this->pop3) {
-                    // GET LAST MESSAGE
-                    imap_reopen($this->ih, self::$currentRef.$this->mailbox);
-                    $last = imap_num_msg($this->ih);
-                    //AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Should get mailbox data ".self::$currentRef.$this->mailbox . $last);
-                    list ( $stats, ) = imap_fetch_overview ( $this->ih, $last );
-                    $this->size = $stats->size;
-                    $this->time = strtotime ( $stats->date );
-                }
-                $keys = array(
-                    'dev' => 0,
-                    'ino' => 0,
-                    'mode' => (empty($this->currentAttachmentData)?(33279 | 0040000):33216),
-                    'nlink' => 0,
-                    'uid' => 0,
-                    'gid' => 0,
-                    'rdev' => 0,
-                    'size' => (!empty($this->currentAttachmentData)?$this->currentAttachmentData["size"]:0),
-                    'atime' => (!empty($this->time)?$this->time:0),
-                    'mtime' => (!empty($this->time)?$this->time:0),
-                    'ctime' => (!empty($this->time)?$this->time:0),
-                    'blksize' => 0,
-                    'blocks' => 0
-                );
-            }
-            $this->stream_close ();
-            return $keys;
-        } else {
-            return false;
-        }
-    }
-
-    /* Delete an email from the mailbox */
-    public function unlink($path)
-    {
-        $st='';
-        if ($this->stream_open ( $path, '', '', $st )) {
-            imap_delete ( $this->ih, $this->path );
-            $this->stream_close ();
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-
-    public static function getRealFSReference($path, $persistent = false)
-    {
-        return $path;
-    }
-
-    /**
-     * Read a file (by chunks) and copy the data directly inside the given stream.
-     *
-     * @param unknown_type $path
-     * @param unknown_type $stream
-     */
-    public static function copyFileInStream($path, $stream)
-    {
-        //return $path;
-        $fp = fopen($path, 'r');
-        $bufferSize = 4096 * 8;
-        if ($fp) {
-            $i = 0;
-            while (!feof($fp)) {
-                $data = fread($fp, $bufferSize);
-                fwrite($stream, $data, strlen($data));
-                //if($i > 10) break;
-                //$i++;
-            }
-            fclose($fp);
-        }
-    }
-
-    public static function isRemote()
-    {
-        return true;
-    }
-
-    /**
-     * Chmod implementation for this type of access.
-     *
-     * @param unknown_type $path
-     * @param unknown_type $chmodValue
-     */
-    public static function changeMode($path, $chmodValue)
-    {
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path
-     * @param int $mode
-     * @param int $options
-     * @return bool
-     */
-    public function mkdir($path , $mode , $options)
-    {
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path_from
-     * @param string $path_to
-     * @return bool
-     */
-    public function rename($path_from , $path_to)
-    {
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path
-     * @param int $options
-     * @return bool
-     */
-    public function rmdir($path , $options)
-    {
-    }
-
-
-    /**
-     * Enter description here...
-     *
-     * @return bool
-     */
-    public function stream_flush()
-    {
-    }
-
-
-    /**
-     * Describe whether the current wrapper can rewind a stream or not.
-     * @static
-     * @return boolean
-     */
-    public static function isSeekable($url)
-    {
-        return false;
-    }
-}
diff --git a/core/src/plugins/access.imap/manifest.xml b/core/src/plugins/access.imap/manifest.xml
index 316531fd5c..2e3b7015e2 100755
--- a/core/src/plugins/access.imap/manifest.xml
+++ b/core/src/plugins/access.imap/manifest.xml
@@ -19,7 +19,7 @@
 		<param name="PAGINATION_THRESHOLD" group="CONF_MESSAGE[Repository Options]" type="integer" label="CONF_MESSAGE[Pagination Threshold]" description="CONF_MESSAGE[When a folder will contain more items than this number, display will switch to pagination mode, for better performances.]" default="20"/>
 		<param name="PAGINATION_NUMBER" group="CONF_MESSAGE[Repository Options]" type="integer" label="CONF_MESSAGE[#Items per page]" description="CONF_MESSAGE[Once in pagination mode, number of items to display per page.]" default="20"/>
 	</server_settings>
-	<class_definition filename="plugins/access.imap/class.imapAccessDriver.php" classname="imapAccessDriver"/>
+	<class_definition filename="plugins/access.imap/ImapAccessDriver.php" classname="Pydio\Access\Driver\StreamProvider\Imap\ImapAccessDriver"/>
 	<registry_contributions>
         <external_file filename="plugins/access.fs/fsTemplatePart.xml" include="client_configs/*" exclude=""/>
 		<external_file filename="plugins/access.fs/fsActions.xml" include="actions/action[@name='ls'] | actions/action[@name='download'] | actions/action[@name='open_with'] | actions/action[@name='stat'] | actions/action[@name='get_content'] | actions/action[@name='copy']" exclude=""/>
@@ -27,12 +27,12 @@
 		<external_file filename="plugins/access.fs/fsActions.xml" include="client_configs/*" exclude=""/>
         <external_file filename="plugins/access.fs/manifest.xml" include="registry_contributions/hooks/*" exclude=""/>
 		<hooks>
-			<serverCallback hookName="node.info" methodName="enrichMetadata"></serverCallback>
-			<serverCallback hookName="dl.localname" methodName="attachmentDLName"></serverCallback>
+			<serverCallback hookName="node.info" methodName="enrichMetadata"/>
+			<serverCallback hookName="dl.localname" methodName="attachmentDLName"/>
 		</hooks>
 	</registry_contributions>
     <dependencies>
         <pluginClass pluginName="access.fs"/>
     </dependencies>
-    <class_stream_wrapper filename="plugins/access.imap/class.imapAccessWrapper.php" classname="imapAccessWrapper" protocol="ajxp.mailbox"/>
+    <class_stream_wrapper filename="plugins/access.imap/ImapAccessWrapper.php" classname="Pydio\Access\Driver\StreamProvider\Imap\ImapAccessWrapper" protocol="ajxp.mailbox"/>
 </ajxpdriver>
diff --git a/core/src/plugins/access.imap/resources/i18n/conf/cs.php b/core/src/plugins/access.imap/resources/i18n/conf/cs.php
index 598b321ba9..6749082328 100644
--- a/core/src/plugins/access.imap/resources/i18n/conf/cs.php
+++ b/core/src/plugins/access.imap/resources/i18n/conf/cs.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Mailbox (Imap or POP)" => "Mailbox (IMAP nebo POP)",
diff --git a/core/src/plugins/access.imap/resources/i18n/conf/de.php b/core/src/plugins/access.imap/resources/i18n/conf/de.php
index 69a2b4aaae..16ff533ded 100644
--- a/core/src/plugins/access.imap/resources/i18n/conf/de.php
+++ b/core/src/plugins/access.imap/resources/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Mailbox (Imap or POP)" => "Mailbox (Imap oder POP)",
diff --git a/core/src/plugins/access.imap/resources/i18n/conf/en.php b/core/src/plugins/access.imap/resources/i18n/conf/en.php
index e25c14c7ec..9f5059e919 100644
--- a/core/src/plugins/access.imap/resources/i18n/conf/en.php
+++ b/core/src/plugins/access.imap/resources/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Mailbox (Imap or POP)" => "Mailbox (Imap or POP)",
diff --git a/core/src/plugins/access.imap/resources/i18n/conf/fr.php b/core/src/plugins/access.imap/resources/i18n/conf/fr.php
index af939b63cc..8faa4590e4 100644
--- a/core/src/plugins/access.imap/resources/i18n/conf/fr.php
+++ b/core/src/plugins/access.imap/resources/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Mailbox (Imap or POP)" => "Boîte courriel (Imap ou POP)",
diff --git a/core/src/plugins/access.imap/resources/i18n/conf/it.php b/core/src/plugins/access.imap/resources/i18n/conf/it.php
index a1874cc201..0ca7ca3174 100644
--- a/core/src/plugins/access.imap/resources/i18n/conf/it.php
+++ b/core/src/plugins/access.imap/resources/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Mailbox (Imap or POP)" => "Mailbox (IMAP o POP)",
diff --git a/core/src/plugins/access.imap/resources/i18n/conf/pt.php b/core/src/plugins/access.imap/resources/i18n/conf/pt.php
index 2b36a0a872..be80b73d9a 100644
--- a/core/src/plugins/access.imap/resources/i18n/conf/pt.php
+++ b/core/src/plugins/access.imap/resources/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Mailbox (Imap or POP)" => "Caixa de Correio (Imap ou POP)",
diff --git a/core/src/plugins/access.inbox/InboxAccessDriver.php b/core/src/plugins/access.inbox/InboxAccessDriver.php
new file mode 100644
index 0000000000..523d3f05ba
--- /dev/null
+++ b/core/src/plugins/access.inbox/InboxAccessDriver.php
@@ -0,0 +1,284 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Driver\StreamProvider\Inbox;
+
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Filter\ContentFilter;
+use Pydio\Access\Driver\StreamProvider\FS\FsAccessDriver;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Model\ContextInterface;
+
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Vars\StatHelper;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Driver for inbox repository
+ * Class inboxAccessDriver
+ * @package Pydio\Access\Driver\StreamProvider\Inbox
+ */
+class InboxAccessDriver extends FsAccessDriver
+{
+    private static $output;
+
+    /**
+     * @param ContextInterface $contextInterface
+     * @throws PydioException
+     * @throws \Exception
+     */
+    protected function initRepository(ContextInterface $contextInterface)
+    {
+        $this->urlBase = $contextInterface->getUrlBase();
+    }
+
+    /**
+     * Hook to node.info event
+     * @param AJXP_Node $ajxpNode
+     * @param bool $parentNode
+     * @param bool $details
+     */
+    public function loadNodeInfo(&$ajxpNode, $parentNode = false, $details = false)
+    {
+        parent::loadNodeInfo($ajxpNode, $parentNode, $details);
+        if(!$ajxpNode->isRoot()){
+
+            // Retrieving stored details
+            $originalNode = self::$output[$ajxpNode->getLabel()];
+            if(isSet($originalNode["meta"])){
+                $meta = $originalNode["meta"];
+            }else{
+                $meta = [];
+            }
+            $label = $originalNode["label"];
+
+            if(!$ajxpNode->isLeaf()){
+                $meta["icon"] = "mime_empty.png";
+            }
+
+            // Overriding display name with repository name
+            $ajxpNode->setLabel($label);
+            $ajxpNode->mergeMetadata($meta);
+        }
+    }
+
+    /**
+     * Hook for load_repository_info event
+     * @param ContextInterface $ctx
+     * @param $data
+     */
+    public function loadRepositoryInfo(ContextInterface $ctx, &$data){
+        $allNodes = self::getNodes($ctx, false, false);
+        $data['access.inbox'] = [
+            'files' => count($allNodes)
+        ];
+    }
+
+    /**
+     * @param string $nodePath Url of a node
+     * @return array|mixed
+     */
+    public static function getNodeData($nodePath){
+        $nodeObject = new AJXP_Node($nodePath);
+        $basename = $nodeObject->getLabel();
+        if($nodeObject->isRoot()){
+            return ['stat' => stat(ApplicationState::getAjxpTmpDir())];
+        }
+        $allNodes = self::getNodes($nodeObject->getContext(), false);
+        $nodeData = $allNodes[$basename];
+        if(!isSet($nodeData["stat"])){
+            if(in_array(pathinfo($basename, PATHINFO_EXTENSION), ["error", "invitation"])){
+                $stat = stat(ApplicationState::getAjxpTmpDir());
+            }else{
+                $url = $nodeData["url"];
+                $node = new AJXP_Node($url);
+                try{
+                    $node->getDriver()->detectStreamWrapper(true);
+                    if($node->getRepository()->hasContentFilter()){
+                        $node->setLeaf(true);
+                    }
+                    Controller::applyHook("node.read", [&$node]);
+                    $stat = stat($url);
+                }catch (\Exception $e){
+                    $stat = stat(ApplicationState::getAjxpTmpDir());
+                }
+                if(is_array($stat) && $nodeObject->getContext()->hasUser()){
+                    $acl = $nodeObject->getContext()->getUser()->getMergedRole()->getAcl($nodeData["meta"]["shared_repository_id"]);
+                    if($acl == "r"){
+                        self::disableWriteInStat($stat);
+                    }
+                }
+                self::$output[$basename]["stat"] = $stat;
+            }
+            $nodeData["stat"] = $stat;
+        }
+        return $nodeData;
+    }
+
+    /**
+     * @param ContextInterface $parentContext
+     * @param bool $checkStats
+     * @param bool $touch
+     * @return array
+     */
+    public static function getNodes(ContextInterface $parentContext, $checkStats = false, $touch = true){
+
+        if(isSet(self::$output)){
+            return self::$output;
+        }
+
+        $mess = LocaleService::getMessages();
+        $repos = UsersService::getRepositoriesForUser($parentContext->getUser());
+        $userId = $parentContext->getUser()->getId();
+
+        $output = [];
+        $touchReposIds = [];
+        foreach($repos as $repo) {
+            if (!$repo->hasOwner() || !$repo->hasContentFilter()) {
+                continue;
+            }
+            $repoId = $repo->getId();
+
+//            DISABLE REMOTE SHARE FOR TESTING
+            /*if(strpos($repoId, "ocs_remote_share_") === 0){
+                continue;
+            }*/
+
+            if(strpos($repoId, "ocs_remote_share_") !== 0){
+                $touchReposIds[] = $repoId;
+            }
+
+            $url = "pydio://".$userId . "@" . $repoId . "/";
+            $meta = [
+                "shared_repository_id" => $repoId,
+                "ajxp_description" => "File shared by ".$repo->getOwner(). " ". StatHelper::relativeDate($repo->getSafeOption("CREATION_TIME"), $mess),
+                "share_meta_type" => 1
+            ];
+
+            $cFilter = $repo->getContentFilter();
+            $filter = ($cFilter instanceof ContentFilter) ? array_keys($cFilter->filters)[0] : $cFilter;
+            if (!is_array($filter)) {
+                $label = basename($filter);
+            }else{
+                $label = $repo->getDisplay();
+            }
+            if(strpos($repoId, "ocs_remote_share") !== 0){
+                // FOR REMOTE SHARES, DO NOT APPEND THE DOCUMENTNAME, WE STAT THE ROOT DIRECTLY
+                $url .= $label;
+            }
+
+            $status = null;
+            $remoteShare = null;
+            $name = pathinfo($label, PATHINFO_FILENAME);
+            $ext = pathinfo($label, PATHINFO_EXTENSION);
+
+            $node = new AJXP_Node($url);
+            $node->setLabel($label);
+
+            if($checkStats){
+
+                try{
+                    $node->getDriver()->detectStreamWrapper(true);
+                }catch (\Exception $e){
+                    $ext = "error";
+                    $meta["ajxp_mime"] = "error";
+                }
+
+                $stat = @stat($url);
+                if($stat === false){
+                    $ext = "error";
+                    $meta["ajxp_mime"] = "error";
+                    $meta["share_meta_type"] = 2;
+                }else if(strpos($repoId, "ocs_remote_share_") === 0){
+                    // Check Status
+                    $linkId = str_replace("ocs_remote_share_", "", $repoId);
+                    $ocsStore = new \Pydio\OCS\Model\SQLStore();
+                    $remoteShare = $ocsStore->remoteShareById($linkId);
+                    $status = $remoteShare->getStatus();
+                    if($status == OCS_INVITATION_STATUS_PENDING){
+                        $stat = stat(ApplicationState::getAjxpTmpDir());
+                        $ext = "invitation";
+                        $meta["ajxp_mime"] = "invitation";
+                        $meta["share_meta_type"] = 0;
+                    } else {
+                        $meta["remote_share_accepted"] = "true";
+                    }
+                    $meta["remote_share_id"] = $remoteShare->getId();
+                }
+                if($ext == "invitation"){
+                    $label .= " (".$mess["inbox_driver.4"].")";
+                }else if($ext == "error"){
+                    $label .= " (".$mess["inbox_driver.5"].")";
+                }
+                if(is_array($stat) && $parentContext->hasUser()){
+                    $acl = $parentContext->getUser()->getMergedRole()->getAcl($repoId);
+                    if($acl == "r"){
+                        self::disableWriteInStat($stat);
+                    }
+
+                }
+
+            }
+
+            $index = 0;$suffix = "";
+            while(isSet($output[$name.$suffix.".".$ext])){
+                $index ++;
+                $suffix = " ($index)";
+            }
+            $output[$name.$suffix.".".$ext] = [
+                "label" => $label,
+                "url" => $url,
+                "remote_share" => $remoteShare,
+                "meta" => $meta
+            ];
+            if(isset($stat)){
+                $output[$name.$suffix.".".$ext]['stat'] = $stat;
+            }
+        }
+        self::$output = $output;
+
+        if ($touch) {
+            if (count($touchReposIds) && $parentContext->hasUser()) {
+                $uPref = $parentContext->getUser()->getPref("repository_last_connected");
+                if (empty($uPref)) $uPref = [];
+                foreach ($touchReposIds as $rId) {
+                    $uPref[$rId] = time();
+                }
+                $parentContext->getUser()->setPref("repository_last_connected", $uPref);
+            }
+        }
+        return $output;
+    }
+
+    /**
+     * @param array $stat
+     */
+    protected static function disableWriteInStat(&$stat){
+        $octRights = decoct($stat["mode"]);
+        $last = (strlen($octRights)) - 1;
+        $octRights[$last] = $octRights[$last-1] = $octRights[$last-2] = 5;
+        $stat["mode"] = $stat[2] = octdec($octRights);
+    }
+
+}
diff --git a/core/src/plugins/access.inbox/InboxAccessWrapper.php b/core/src/plugins/access.inbox/InboxAccessWrapper.php
new file mode 100644
index 0000000000..213fa29b7d
--- /dev/null
+++ b/core/src/plugins/access.inbox/InboxAccessWrapper.php
@@ -0,0 +1,438 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Driver\StreamProvider\Inbox;
+
+use ArrayIterator;
+use Pydio\Access\Core\MetaStreamWrapper;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\IAjxpWrapper;
+
+use Pydio\Core\Services\ApplicationState;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class inboxAccessWrapper
+ * Stream wrapper for Inbox repository
+ * @package Pydio\Access\Driver\StreamProvider\Inbox
+ */
+class InboxAccessWrapper implements IAjxpWrapper
+{
+    /**
+     * @var ArrayIterator
+     */
+    private $nodesIterator;
+
+    /**
+     * @var Resource
+     */
+    private $fp;
+    /**
+     * @var AJXP_Node
+     */
+    private static $linkNode;
+
+
+    /**
+     * Support for opendir().
+     *
+     * @param string $path    The path to the directory
+     * @param string $options Whether or not to enforce safe_mode (0x04). Unused.
+     *
+     * @return bool true on success
+     * @see http://www.php.net/manual/en/function.opendir.php
+     */
+    public function dir_opendir($path, $options)
+    {
+        $node = new AJXP_Node($path);
+        if($node->isRoot()){
+            $this->nodesIterator = new ArrayIterator(InboxAccessDriver::getNodes($node->getContext(), true));
+        }else{
+            $this->nodesIterator = new ArrayIterator([]);
+        }
+
+
+        return true;
+    }
+
+    /**
+     * Close the directory listing handles
+     *
+     * @return bool true on success
+     */
+    public function dir_closedir()
+    {
+        $this->nodesIterator = null;
+
+        return true;
+    }
+
+    /**
+     * This method is called in response to rewinddir()
+     *
+     * @return boolean true on success
+     */
+    public function dir_rewinddir()
+    {
+        $this->nodesIterator->rewind();
+
+        return true;
+    }
+
+    /**
+     * This method is called in response to readdir()
+     *
+     * @return string Should return a string representing the next filename, or false if there is no next file.
+     *
+     * @link http://www.php.net/manual/en/function.readdir.php
+     */
+    public function dir_readdir()
+    {
+        // Skip empty result keys
+        if (!$this->nodesIterator->valid()) {
+            return false;
+        }
+
+        $key = $this->nodesIterator->key();
+        $current = $this->nodesIterator->current();
+
+        $this->nodesIterator->next();
+
+        return $key;
+    }
+
+    /**
+     * @param $path
+     * @return mixed|null|string
+     * @throws \Exception
+     */
+    public static function translateURL($path){
+
+        $pydioScheme = false;
+        self::$linkNode = null;
+        $initialNode = new AJXP_Node($path);
+
+        $nodes = InboxAccessDriver::getNodes($initialNode->getContext(), false);
+        $nodePath = basename($initialNode->getPath());
+        $node = $nodes[ltrim($nodePath, '/')];
+
+        if (empty($node) || ! isset($node['url'])) {
+            return ApplicationState::getAjxpTmpDir();
+        }
+
+        $url = $node['url'];
+        $label = $node['label'];
+
+        $scheme = parse_url($url, PHP_URL_SCHEME);
+        if($scheme == "pydio"){
+            self::$linkNode = new AJXP_Node($path);
+            $pydioScheme = true;
+        }
+
+        if(empty($nodePath)){
+            return ApplicationState::getAjxpTmpDir();
+        }
+
+        if($pydioScheme){
+            $node = new AJXP_Node($url);
+            $node->setLabel($label);
+            $node->getRepository()->driverInstance = null;
+            try{
+                $node->getDriver();
+            }catch (\Exception $e){
+
+            }
+            MetaStreamWrapper::detectWrapperForNode($node, true);
+        }
+        return $url;
+    }
+
+    /**
+     * Get a "usable" reference to a file : the real file or a tmp copy.
+     *
+     * @param string $path
+     * @param bool $persistent
+     * @return string
+     */
+    public static function getRealFSReference($path, $persistent = false)
+    {
+        $url = self::translateURL($path);
+        if(self::$linkNode !== null){
+            $isRemote = MetaStreamWrapper::wrapperIsRemote($url);
+            $realFilePointer = MetaStreamWrapper::getRealFSReference($url, true);
+            if(!$isRemote){
+                $ext = pathinfo(parse_url($url, PHP_URL_PATH), PATHINFO_EXTENSION);
+                $tmpname = tempnam(ApplicationState::getAjxpTmpDir(), "real-file-inbox-pointer").".".$ext;
+                copy($realFilePointer, $tmpname);
+                $realFilePointer = $tmpname;
+            }
+            self::$linkNode->getDriver();
+            return $realFilePointer;
+        }else{
+            $tmpname = tempnam(ApplicationState::getAjxpTmpDir(), "real-file-inbox-pointer");
+            $source = fopen($url, "r");
+            $dest = fopen($tmpname, "w");
+            stream_copy_to_stream($source, $dest);
+            return $tmpname;
+        }
+
+    }
+
+    /**
+     * Read a file (by chunks) and copy the data directly inside the given stream.
+     *
+     * @param string $path
+     * @param resource $stream
+     */
+    public static function copyFileInStream($path, $stream)
+    {
+        $url = self::translateURL($path);
+        MetaStreamWrapper::copyFileInStream($url, $stream);
+        if(self::$linkNode !== null){
+            self::$linkNode->getDriver();
+        }
+    }
+
+    /**
+     * Chmod implementation for this type of access.
+     *
+     * @param string $path
+     * @param number $chmodValue
+     */
+    public static function changeMode($path, $chmodValue){
+        
+    }
+
+    /**
+     * Describe whether the current wrapper operates on a remote server or not.
+     * @static
+     * @return boolean
+     */
+    public static function isRemote()
+    {
+        return true;
+    }
+
+    /**
+     * Describe whether the current wrapper can rewind a stream or not.
+     * @param String $url Url of the resource
+     * @static
+     * @return boolean
+     */
+    public static function isSeekable($url)
+    {
+        return true;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path
+     * @param int $mode
+     * @param int $options
+     * @return bool
+     */
+    public function mkdir($path, $mode, $options)
+    {
+        return false;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path_from
+     * @param string $path_to
+     * @return bool
+     */
+    public function rename($path_from, $path_to)
+    {
+        return false;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path
+     * @param int $options
+     * @return bool
+     */
+    public function rmdir($path, $options)
+    {
+        return false;
+    }
+
+    /**
+     * Enter description here...
+     *
+     */
+    public function stream_close()
+    {
+        if($this->fp !== null){
+            fclose($this->fp);
+            if(self::$linkNode !== null){
+                self::$linkNode->getDriver();
+            }
+        }
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return bool
+     */
+    public function stream_eof()
+    {
+        if(is_resource($this->fp)){
+            return feof($this->fp);
+        }
+        return false;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return bool
+     */
+    public function stream_flush()
+    {
+        if($this->fp !== null){
+            return fflush($this->fp);
+        }
+        return null;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path
+     * @param string $mode
+     * @param int $options
+     * @param string &$opened_path
+     * @return bool
+     */
+    public function stream_open($path, $mode, $options, &$opened_path)
+    {
+        $this->fp = fopen(self::translateURL($path), $mode, $options);
+        return true;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param int $count
+     * @return string
+     */
+    public function stream_read($count)
+    {
+        if($this->fp !== null){
+            return fread($this->fp, $count);
+        }
+        return null;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param int $offset
+     * @param int $whence = SEEK_SET
+     * @return bool
+     */
+    public function stream_seek($offset, $whence = SEEK_SET)
+    {
+        if($this->fp !== null){
+            return fseek($this->fp, $offset, $whence);
+        }
+        return null;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return array
+     */
+    public function stream_stat()
+    {
+        if($this->fp !== null){
+            return fstat($this->fp);
+        }
+        return false;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return int
+     */
+    public function stream_tell()
+    {
+        if($this->fp !== null){
+            return ftell($this->fp);
+        }
+        return null;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param string $data
+     * @return int
+     */
+    public function stream_write($data)
+    {
+        if($this->fp !== null){
+            return fwrite($this->fp, $data);
+        }
+        return 0;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function unlink($path)
+    {
+        // Do nothing
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path
+     * @param int $flags
+     * @return array
+     */
+    public function url_stat($path, $flags)
+    {
+        $nodeData = InboxAccessDriver::getNodeData($path);
+        return $nodeData["stat"];
+    }
+
+    /**
+     * @param AJXP_Node $node
+     * @return array
+     */
+    public static function getResolvedOptionsForNode($node){
+        return ["TYPE" => "php"];
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/access.inbox/class.inboxAccessDriver.php b/core/src/plugins/access.inbox/class.inboxAccessDriver.php
deleted file mode 100644
index 99de9295d1..0000000000
--- a/core/src/plugins/access.inbox/class.inboxAccessDriver.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-/*
- * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-class inboxAccessDriver extends fsAccessDriver
-{
-    private static $output;
-    private static $stats;
-
-    public function initRepository()
-    {
-        $this->detectStreamWrapper(true);
-        $this->urlBase = "pydio://".$this->repository->getId();
-    }
-
-    public function loadNodeInfo(&$ajxpNode, $parentNode = false, $details = false)
-    {
-        parent::loadNodeInfo($ajxpNode, $parentNode, $details);
-        if(!$ajxpNode->isRoot()){
-
-            // Retrieving stored details
-            $originalNode = self::$output[$ajxpNode->getLabel()];
-            if(isSet($originalNode["meta"])){
-                $meta = $originalNode["meta"];
-            }else{
-                $meta = array();
-            }
-            $label = $originalNode["label"];
-
-            if(!$ajxpNode->isLeaf()){
-                $meta["icon"] = "mime_empty.png";
-            }
-
-            // Overriding display name with repository name
-            $ajxpNode->setLabel($label);
-            $ajxpNode->mergeMetadata($meta);
-        }
-    }
-
-    public function loadRepositoryInfo(&$data){
-        $allNodes = self::getNodes(false, false);
-        $data['access.inbox'] = array(
-            'files' => count($allNodes)
-        );
-    }
-
-    public static function getNodeData($nodePath){
-        $basename = basename(parse_url($nodePath, PHP_URL_PATH));
-        if(empty($basename)){
-            return ['stat' => stat(AJXP_Utils::getAjxpTmpDir())];
-        }
-        $allNodes = self::getNodes(false);
-        $nodeData = $allNodes[$basename];
-        if(!isSet($nodeData["stat"])){
-            if(in_array(pathinfo($basename, PATHINFO_EXTENSION), array("error", "invitation"))){
-                $stat = stat(AJXP_Utils::getAjxpTmpDir());
-            }else{
-                $url = $nodeData["url"];
-                $node = new AJXP_Node($nodeData["url"]);
-                $node->getRepository()->driverInstance = null;
-                try{
-                    ConfService::loadDriverForRepository($node->getRepository());
-                    $node->getRepository()->detectStreamWrapper(true);
-                    if($node->getRepository()->hasContentFilter()){
-                        $node->setLeaf(true);
-                    }
-                    AJXP_Controller::applyHook("node.read", array(&$node));
-                    $stat = stat($url);
-                }catch (Exception $e){
-                    $stat = stat(AJXP_Utils::getAjxpTmpDir());
-                }
-                if(is_array($stat) && AuthService::getLoggedUser() != null){
-                    $acl = AuthService::getLoggedUser()->mergedRole->getAcl($nodeData["meta"]["shared_repository_id"]);
-                    if($acl == "r"){
-                        self::disableWriteInStat($stat);
-                    }
-                }
-                self::$output[$basename]["stat"] = $stat;
-            }
-            $nodeData["stat"] = $stat;
-        }
-        return $nodeData;
-    }
-
-    public static function getNodes($checkStats = false, $touch = true){
-
-        if(isSet(self::$output)){
-            return self::$output;
-        }
-
-        $mess = ConfService::getMessages();
-        $repos = ConfService::getAccessibleRepositories();
-
-        $output = array();
-        $touchReposIds = array();
-        foreach($repos as $repo) {
-            if (!$repo->hasOwner() || !$repo->hasContentFilter()) {
-                continue;
-            }
-            $repoId = $repo->getId();
-
-            if(strpos("ocs_remote_share_", $repoId) !== 0){
-                $touchReposIds[] = $repoId;
-            }
-
-            $url = "pydio://" . $repoId . "/";
-            $meta = array(
-                "shared_repository_id" => $repoId,
-                "ajxp_description" => "File shared by ".$repo->getOwner(). " ". AJXP_Utils::relativeDate($repo->getOption("CREATION_TIME"), $mess),
-                "share_meta_type" => 1
-            );
-
-            $cFilter = $repo->getContentFilter();
-            $filter = ($cFilter instanceof ContentFilter) ? array_keys($cFilter->filters)[0] : $cFilter;
-            if (!is_array($filter)) {
-                $label = basename($filter);
-            }else{
-                $label = $repo->getDisplay();
-            }
-            if(strpos($repoId, "ocs_remote_share") !== 0){
-                // FOR REMOTE SHARES, DO NOT APPEND THE DOCUMENTNAME, WE STAT THE ROOT DIRECTLY
-                $url .= $label;
-            }
-
-            $status = null;
-            $remoteShare = null;
-            $name = pathinfo($label, PATHINFO_FILENAME);
-            $ext = pathinfo($label, PATHINFO_EXTENSION);
-
-            $node = new AJXP_Node($url);
-            $node->setLabel($label);
-
-            if($checkStats){
-
-                $node->getRepository()->driverInstance = null;
-                try{
-                    ConfService::loadDriverForRepository($node->getRepository());
-                }catch (Exception $e){
-                    $ext = "error";
-                    $meta["ajxp_mime"] = "error";
-                }
-                $node->getRepository()->detectStreamWrapper(true);
-
-                $stat = @stat($url);
-                if($stat === false){
-                    $ext = "error";
-                    $meta["ajxp_mime"] = "error";
-                    $meta["share_meta_type"] = 2;
-                }else if(strpos($repoId, "ocs_remote_share_") === 0){
-                    // Check Status
-                    $linkId = str_replace("ocs_remote_share_", "", $repoId);
-                    $ocsStore = new \Pydio\OCS\Model\SQLStore();
-                    $remoteShare = $ocsStore->remoteShareById($linkId);
-                    $status = $remoteShare->getStatus();
-                    if($status == OCS_INVITATION_STATUS_PENDING){
-                        $stat = stat(AJXP_Utils::getAjxpTmpDir());
-                        $ext = "invitation";
-                        $meta["ajxp_mime"] = "invitation";
-                        $meta["share_meta_type"] = 0;
-                    } else {
-                        $meta["remote_share_accepted"] = "true";
-                    }
-                    $meta["remote_share_id"] = $remoteShare->getId();
-                }
-                if($ext == "invitation"){
-                    $label .= " (".$mess["inbox_driver.4"].")";
-                }else if($ext == "error"){
-                    $label .= " (".$mess["inbox_driver.5"].")";
-                }
-                if(is_array($stat) && AuthService::getLoggedUser() != null){
-                    $acl = AuthService::getLoggedUser()->mergedRole->getAcl($repoId);
-                    if($acl == "r"){
-                        self::disableWriteInStat($stat);
-                    }
-
-                }
-
-            }
-
-            $index = 0;$suffix = "";
-            while(isSet($output[$name.$suffix.".".$ext])){
-                $index ++;
-                $suffix = " ($index)";
-            }
-            $output[$name.$suffix.".".$ext] = [
-                "label" => $label,
-                "url" => $url,
-                "remote_share" => $remoteShare,
-                "meta" => $meta
-            ];
-            if(isset($stat)){
-                $output[$name.$suffix.".".$ext]['stat'] = $stat;
-            }
-        }
-        ConfService::loadDriverForRepository(ConfService::getRepository());
-        self::$output = $output;
-
-        if ($touch) {
-            if (count($touchReposIds) && AuthService::getLoggedUser() != null) {
-                $uPref = AuthService::getLoggedUser()->getPref("repository_last_connected");
-                if (empty($uPref)) $uPref = array();
-                foreach ($touchReposIds as $rId) {
-                    $uPref[$rId] = time();
-                }
-                AuthService::getLoggedUser()->setPref("repository_last_connected", $uPref);
-            }
-        }
-        return $output;
-    }
-
-    /**
-     * @param array $stat
-     */
-    protected static function disableWriteInStat(&$stat){
-        $octRights = decoct($stat["mode"]);
-        $last = (strlen($octRights)) - 1;
-        $octRights[$last] = $octRights[$last-1] = $octRights[$last-2] = 5;
-        $stat["mode"] = $stat[2] = octdec($octRights);
-    }
-
-}
diff --git a/core/src/plugins/access.inbox/class.inboxAccessWrapper.php b/core/src/plugins/access.inbox/class.inboxAccessWrapper.php
deleted file mode 100644
index 11db543ccf..0000000000
--- a/core/src/plugins/access.inbox/class.inboxAccessWrapper.php
+++ /dev/null
@@ -1,413 +0,0 @@
-<?php
-/*
- * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-
-class inboxAccessWrapper implements AjxpWrapper
-{
-    private $nodesIterator;
-
-    /**
-     * @var Resource
-     */
-    private $fp;
-    /**
-     * @var AJXP_Node
-     */
-    private static $linkNode;
-
-
-    /**
-     * Support for opendir().
-     *
-     * @param string $path    The path to the directory
-     * @param string $options Whether or not to enforce safe_mode (0x04). Unused.
-     *
-     * @return bool true on success
-     * @see http://www.php.net/manual/en/function.opendir.php
-     */
-    public function dir_opendir($path, $options)
-    {
-        if(trim(parse_url($path, PHP_URL_PATH), "/") == ""){
-            $this->nodesIterator = new ArrayIterator(inboxAccessDriver::getNodes(true));
-        }else{
-            $this->nodesIterator = new ArrayIterator([]);
-        }
-
-
-        return true;
-    }
-
-    /**
-     * Close the directory listing handles
-     *
-     * @return bool true on success
-     */
-    public function dir_closedir()
-    {
-        $this->nodesIterator = null;
-
-        return true;
-    }
-
-    /**
-     * This method is called in response to rewinddir()
-     *
-     * @return boolean true on success
-     */
-    public function dir_rewinddir()
-    {
-        $this->nodesIterator->rewind();
-
-        return true;
-    }
-
-    /**
-     * This method is called in response to readdir()
-     *
-     * @return string Should return a string representing the next filename, or false if there is no next file.
-     *
-     * @link http://www.php.net/manual/en/function.readdir.php
-     */
-    public function dir_readdir()
-    {
-        // Skip empty result keys
-        if (!$this->nodesIterator->valid()) {
-            return false;
-        }
-
-        $key = $this->nodesIterator->key();
-        $current = $this->nodesIterator->current();
-
-        $this->nodesIterator->next();
-
-        return $key;
-    }
-
-    public static function translateURL($path){
-
-        $pydioScheme = false;
-        self::$linkNode = null;
-
-        $nodes = inboxAccessDriver::getNodes(false);
-        $nodePath = basename(parse_url($path, PHP_URL_PATH));
-        $node = $nodes[ltrim($nodePath, '/')];
-
-        if (empty($node) || ! isset($node['url'])) {
-            return AJXP_Utils::getAjxpTmpDir();
-        }
-
-        $url = $node['url'];
-        $label = $node['label'];
-
-        $scheme = parse_url($url, PHP_URL_SCHEME);
-        if($scheme == "pydio"){
-            self::$linkNode = new AJXP_Node($path);
-            $pydioScheme = true;
-        }
-
-        if(empty($nodePath)){
-            return AJXP_Utils::getAjxpTmpDir();
-        }
-
-        if($pydioScheme){
-            $node = new AJXP_Node($url);
-            $node->setLabel($label);
-            $node->getRepository()->driverInstance = null;
-            try{
-                ConfService::loadDriverForRepository($node->getRepository());
-            }catch (Exception $e){
-
-            }
-            $node->getRepository()->detectStreamWrapper(true);
-        }
-        return $url;
-    }
-
-    /**
-     * Get a "usable" reference to a file : the real file or a tmp copy.
-     *
-     * @param string $path
-     * @param bool $persistent
-     * @return string
-     */
-    public static function getRealFSReference($path, $persistent = false)
-    {
-        $url = self::translateURL($path);
-        if(self::$linkNode !== null){
-            $isRemote = AJXP_MetaStreamWrapper::wrapperIsRemote($url);
-            $realFilePointer = AJXP_MetaStreamWrapper::getRealFSReference($url, true);
-            if(!$isRemote){
-                $ext = pathinfo(parse_url($url, PHP_URL_PATH), PATHINFO_EXTENSION);
-                $tmpname = tempnam(AJXP_Utils::getAjxpTmpDir(), "real-file-inbox-pointer").".".$ext;
-                copy($realFilePointer, $tmpname);
-                $realFilePointer = $tmpname;
-            }
-            ConfService::loadDriverForRepository(self::$linkNode->getRepository());
-            return $realFilePointer;
-        }else{
-            $tmpname = tempnam(AJXP_Utils::getAjxpTmpDir(), "real-file-inbox-pointer");
-            $source = fopen($url, "r");
-            $dest = fopen($tmpname, "w");
-            stream_copy_to_stream($source, $dest);
-            return $tmpname;
-        }
-
-    }
-
-    /**
-     * Read a file (by chunks) and copy the data directly inside the given stream.
-     *
-     * @param string $path
-     * @param resource $stream
-     */
-    public static function copyFileInStream($path, $stream)
-    {
-        $url = self::translateURL($path);
-        AJXP_MetaStreamWrapper::copyFileInStream($url, $stream);
-        /*
-        $wrapperClass = AJXP_MetaStreamWrapper::actualRepositoryWrapperClass(parse_url($url, PHP_URL_HOST));
-        call_user_func(array($wrapperClass, "copyFileInStream"), $url, $stream);
-        */
-        if(self::$linkNode !== null){
-            ConfService::loadDriverForRepository(self::$linkNode->getRepository());
-        }
-    }
-
-    /**
-     * Chmod implementation for this type of access.
-     *
-     * @param string $path
-     * @param number $chmodValue
-     */
-    public static function changeMode($path, $chmodValue)
-    {
-        // TODO: Implement changeMode() method.
-    }
-
-    /**
-     * Describe whether the current wrapper operates on a remote server or not.
-     * @static
-     * @return boolean
-     */
-    public static function isRemote()
-    {
-        return true;
-    }
-
-    /**
-     * Describe whether the current wrapper can rewind a stream or not.
-     * @param String $url Url of the resource
-     * @static
-     * @return boolean
-     */
-    public static function isSeekable($url)
-    {
-        return true;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path
-     * @param int $mode
-     * @param int $options
-     * @return bool
-     */
-    public function mkdir($path, $mode, $options)
-    {
-        return false;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path_from
-     * @param string $path_to
-     * @return bool
-     */
-    public function rename($path_from, $path_to)
-    {
-        return false;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path
-     * @param int $options
-     * @return bool
-     */
-    public function rmdir($path, $options)
-    {
-        return false;
-    }
-
-    /**
-     * Enter description here...
-     *
-     */
-    public function stream_close()
-    {
-        if($this->fp !== null){
-            fclose($this->fp);
-            if(self::$linkNode !== null){
-                ConfService::loadDriverForRepository(self::$linkNode->getRepository());
-            }
-        }
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @return bool
-     */
-    public function stream_eof()
-    {
-        if(is_resource($this->fp)){
-            return feof($this->fp);
-        }
-        return false;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @return bool
-     */
-    public function stream_flush()
-    {
-        if($this->fp !== null){
-            return fflush($this->fp);
-        }
-        return null;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path
-     * @param string $mode
-     * @param int $options
-     * @param string &$opened_path
-     * @return bool
-     */
-    public function stream_open($path, $mode, $options, &$opened_path)
-    {
-        $this->fp = fopen(self::translateURL($path), $mode, $options);
-        return true;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param int $count
-     * @return string
-     */
-    public function stream_read($count)
-    {
-        if($this->fp !== null){
-            return fread($this->fp, $count);
-        }
-        return null;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param int $offset
-     * @param int $whence = SEEK_SET
-     * @return bool
-     */
-    public function stream_seek($offset, $whence = SEEK_SET)
-    {
-        if($this->fp !== null){
-            return fseek($this->fp, $offset, $whence);
-        }
-        return null;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @return array
-     */
-    public function stream_stat()
-    {
-        if($this->fp !== null){
-            return fstat($this->fp);
-        }
-        return false;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @return int
-     */
-    public function stream_tell()
-    {
-        if($this->fp !== null){
-            return ftell($this->fp);
-        }
-        return null;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $data
-     * @return int
-     */
-    public function stream_write($data)
-    {
-        if($this->fp !== null){
-            return fwrite($this->fp, $data);
-        }
-        return 0;
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path
-     * @return bool
-     */
-    public function unlink($path)
-    {
-        // TODO: Implement unlink() method.
-    }
-
-    /**
-     * Enter description here...
-     *
-     * @param string $path
-     * @param int $flags
-     * @return array
-     */
-    public function url_stat($path, $flags)
-    {
-        $nodeData = inboxAccessDriver::getNodeData($path);
-        return $nodeData["stat"];
-    }
-
-}
\ No newline at end of file
diff --git a/core/src/plugins/access.inbox/manifest.xml b/core/src/plugins/access.inbox/manifest.xml
index 976274c7ce..9780775fef 100644
--- a/core/src/plugins/access.inbox/manifest.xml
+++ b/core/src/plugins/access.inbox/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ajxpdriver name="inbox" label="CONF_MESSAGE[Inbox Workspace]" description="CONF_MESSAGE[Received Files]" mixins="filesystem_commons,slug_provider,template_provider" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <class_definition filename="plugins/access.inbox/class.inboxAccessDriver.php" classname="inboxAccessDriver"/>
+    <class_definition filename="plugins/access.inbox/InboxAccessDriver.php" classname="Pydio\Access\Driver\StreamProvider\Inbox\InboxAccessDriver"/>
     <client_settings>
         <resources>
             <js file="plugins/access.inbox/res/build/InboxWidgets.js" className="InboxWidgets"/>
@@ -223,5 +223,5 @@
         <pluginClass pluginName="access.fs"/>
         <pluginResources pluginName="access.fs"/>
     </dependencies>
-    <class_stream_wrapper filename="plugins/access.inbox/class.inboxAccessWrapper.php" classname="inboxAccessWrapper" protocol="ajxp.inbox"/>
+    <class_stream_wrapper filename="plugins/access.inbox/InboxAccessWrapper.php" classname="Pydio\Access\Driver\StreamProvider\Inbox\InboxAccessWrapper" protocol="ajxp.inbox"/>
 </ajxpdriver>
diff --git a/core/src/plugins/access.inbox/package.json b/core/src/plugins/access.inbox/package.json
index 4471b0274c..8f88997329 100644
--- a/core/src/plugins/access.inbox/package.json
+++ b/core/src/plugins/access.inbox/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "action.share",
-  "version": "6.2.3",
+  "name": "access.inbox",
+  "version": "6.5.1",
   "description": "",
   "source_path":"res/react",
   "main": "index.js",
diff --git a/core/src/plugins/access.jsapi/JsapiAccessDriver.php b/core/src/plugins/access.jsapi/JsapiAccessDriver.php
new file mode 100644
index 0000000000..65cee1e5d4
--- /dev/null
+++ b/core/src/plugins/access.jsapi/JsapiAccessDriver.php
@@ -0,0 +1,94 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Driver\DataProvider;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Utils\Vars\InputFilter;
+
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Plugin to send a javascript source to the browser
+ */
+class JsapiAccessDriver extends AbstractAccessDriver
+{
+    /**
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     */
+    public function switchAction(ServerRequestInterface &$request, ResponseInterface &$response)
+    {
+        if($request->getAttribute("action") !== "get_js_source"){
+            return;
+        }
+
+        $jsName = InputFilter::decodeSecureMagic($request->getParsedBody()["object_name"]);
+        $jsType = $request->getParsedBody()["object_type"]; // class or interface?
+        $fName = "class.".strtolower($jsName).".js";
+        if ($jsName == "Splitter") {
+            $fName = "splitter.js";
+        }
+        if (!defined("CLIENT_RESOURCES_FOLDER")) {
+            define("CLIENT_RESOURCES_FOLDER", AJXP_PLUGINS_FOLDER."/gui.ajax/res");
+        }
+        $searchLocations = [];
+        // Locate the file class.ClassName.js
+        if ($jsType == "class") {
+            $searchLocations = array(
+                CLIENT_RESOURCES_FOLDER."/js/ajaxplorer",
+                CLIENT_RESOURCES_FOLDER."/js/lib",
+                AJXP_INSTALL_PATH."/plugins/"
+            );
+        } else if ($jsType == "interface") {
+            $searchLocations = array(
+                CLIENT_RESOURCES_FOLDER."/js/ajaxplorer/interfaces",
+            );
+        }
+        foreach ($searchLocations as $location) {
+            $dir_iterator = new RecursiveDirectoryIterator($location);
+            $iterator = new RecursiveIteratorIterator($dir_iterator, RecursiveIteratorIterator::SELF_FIRST);
+            // could use CHILD_FIRST if you so wish
+            $break = false;
+            foreach ($iterator as $file) {
+                if (strtolower(basename($file->getPathname())) == $fName) {
+                    $response = $response->withHeader("Content-Type", "text/plain");
+                    $response->getBody()->write(file_get_contents($file->getPathname()));
+                    $break = true;
+                    break;
+                }
+            }
+            if($break) break;
+        }
+
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     */
+    protected function initRepository(ContextInterface $ctx) {
+    }
+}
diff --git a/core/src/plugins/access.jsapi/class.JsSourceViewer.js b/core/src/plugins/access.jsapi/class.JsSourceViewer.js
index 67957a97c5..a9ddbdb3cf 100644
--- a/core/src/plugins/access.jsapi/class.JsSourceViewer.js
+++ b/core/src/plugins/access.jsapi/class.JsSourceViewer.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  * Description : A dynamic panel displaying details on the current selection. Works with Templates.
  */
 Class.create("JsSourceViewer", AjxpPane, {
diff --git a/core/src/plugins/access.jsapi/class.LocalAPINodeProvider.js b/core/src/plugins/access.jsapi/class.LocalAPINodeProvider.js
index df60ecc989..43d47b6f36 100644
--- a/core/src/plugins/access.jsapi/class.LocalAPINodeProvider.js
+++ b/core/src/plugins/access.jsapi/class.LocalAPINodeProvider.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 /**
  * A local implementation that explore currently defined
diff --git a/core/src/plugins/access.jsapi/class.jsapiAccessDriver.php b/core/src/plugins/access.jsapi/class.jsapiAccessDriver.php
deleted file mode 100644
index f9e808dde7..0000000000
--- a/core/src/plugins/access.jsapi/class.jsapiAccessDriver.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * AJXP_Plugin to send a javascript source to the browser
- * @package AjaXplorer_Plugins
- * @subpackage Access
- */
-class jsapiAccessDriver extends AbstractAccessDriver
-{
-    public function switchAction($action, $httpVars, $fileVars)
-    {
-        switch ($action) {
-            case "get_js_source" :
-                $jsName = AJXP_Utils::decodeSecureMagic($httpVars["object_name"]);
-                $jsType = $httpVars["object_type"]; // class or interface?
-                $fName = "class.".strtolower($jsName).".js";
-                if ($jsName == "Splitter") {
-                    $fName = "splitter.js";
-                }
-                if (!defined("CLIENT_RESOURCES_FOLDER")) {
-                    define("CLIENT_RESOURCES_FOLDER", AJXP_PLUGINS_FOLDER."/gui.ajax/res");
-                }
-                    // Locate the file class.ClassName.js
-                if ($jsType == "class") {
-                    $searchLocations = array(
-                        CLIENT_RESOURCES_FOLDER."/js/ajaxplorer",
-                        CLIENT_RESOURCES_FOLDER."/js/lib",
-                        AJXP_INSTALL_PATH."/plugins/"
-                    );
-                } else if ($jsType == "interface") {
-                    $searchLocations = array(
-                        CLIENT_RESOURCES_FOLDER."/js/ajaxplorer/interfaces",
-                    );
-                }
-                foreach ($searchLocations as $location) {
-                    $dir_iterator = new RecursiveDirectoryIterator($location);
-                    $iterator = new RecursiveIteratorIterator($dir_iterator, RecursiveIteratorIterator::SELF_FIRST);
-                    // could use CHILD_FIRST if you so wish
-                    $break = false;
-                    foreach ($iterator as $file) {
-                        if (strtolower(basename($file->getPathname())) == $fName) {
-                            HTMLWriter::charsetHeader("text/plain", "utf-8");
-                            echo(file_get_contents($file->getPathname()));
-                            $break = true;
-                            break;
-                        }
-                    }
-                    if($break) break;
-                }
-            break;
-        }
-
-    }
-
-}
diff --git a/core/src/plugins/access.jsapi/i18n/conf/cs.php b/core/src/plugins/access.jsapi/i18n/conf/cs.php
index 802050e514..923f0c3198 100644
--- a/core/src/plugins/access.jsapi/i18n/conf/cs.php
+++ b/core/src/plugins/access.jsapi/i18n/conf/cs.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Javascript Api Browser" => "Javascript API prohlížeč",
diff --git a/core/src/plugins/access.jsapi/i18n/conf/de.php b/core/src/plugins/access.jsapi/i18n/conf/de.php
index 0830899d72..bdc3827d6d 100644
--- a/core/src/plugins/access.jsapi/i18n/conf/de.php
+++ b/core/src/plugins/access.jsapi/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Javascript Api Browser" => "Javascript-Api Browser",
diff --git a/core/src/plugins/access.jsapi/i18n/conf/en.php b/core/src/plugins/access.jsapi/i18n/conf/en.php
index 93af1e9895..fab3d95c92 100644
--- a/core/src/plugins/access.jsapi/i18n/conf/en.php
+++ b/core/src/plugins/access.jsapi/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Javascript Api Browser" => "Javascript Api Browser",
diff --git a/core/src/plugins/access.jsapi/i18n/conf/fr.php b/core/src/plugins/access.jsapi/i18n/conf/fr.php
index eb2dfa80ed..394159d908 100644
--- a/core/src/plugins/access.jsapi/i18n/conf/fr.php
+++ b/core/src/plugins/access.jsapi/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Javascript Api Browser" => "Navigateur d'Api Javascript",
diff --git a/core/src/plugins/access.jsapi/i18n/conf/it.php b/core/src/plugins/access.jsapi/i18n/conf/it.php
index 74240175d0..fbdf235d9a 100644
--- a/core/src/plugins/access.jsapi/i18n/conf/it.php
+++ b/core/src/plugins/access.jsapi/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Javascript Api Browser" => "Javascript Api Browser",
diff --git a/core/src/plugins/access.jsapi/i18n/fr.php b/core/src/plugins/access.jsapi/i18n/fr.php
index 93ff396f06..a417e3cee6 100644
--- a/core/src/plugins/access.jsapi/i18n/fr.php
+++ b/core/src/plugins/access.jsapi/i18n/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Classes et Interfaces",
diff --git a/core/src/plugins/access.jsapi/i18n/si.php b/core/src/plugins/access.jsapi/i18n/si.php
index ffdb86064f..1e3abc85c4 100644
--- a/core/src/plugins/access.jsapi/i18n/si.php
+++ b/core/src/plugins/access.jsapi/i18n/si.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
  // Slovenian translation: April 21 2011 by Vladimir Bohinc (vladimir.bohinc@gmail.com)
 $mess = array(
diff --git a/core/src/plugins/access.jsapi/jsapi_styles.css b/core/src/plugins/access.jsapi/jsapi_styles.css
index 6d2c008a02..119dfa2878 100644
--- a/core/src/plugins/access.jsapi/jsapi_styles.css
+++ b/core/src/plugins/access.jsapi/jsapi_styles.css
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 span.jsapi_member{
 	font-weight: bold;
diff --git a/core/src/plugins/access.jsapi/manifest.xml b/core/src/plugins/access.jsapi/manifest.xml
index dbf3ee81fb..c0aa84baad 100644
--- a/core/src/plugins/access.jsapi/manifest.xml
+++ b/core/src/plugins/access.jsapi/manifest.xml
@@ -16,7 +16,7 @@
 		</resources>
 		<node_provider ajxpClass="LocalAPINodeProvider" ajxpOptions="{}"/>
 	</client_settings>
-	<class_definition filename="plugins/access.jsapi/class.jsapiAccessDriver.php" classname="jsapiAccessDriver"/>
+	<class_definition filename="plugins/access.jsapi/JsapiAccessDriver.php" classname="Pydio\Access\Driver\DataProvider\JsapiAccessDriver"/>
 	<registry_contributions>
 		<actions>
 			<action name="ls" dirDefault="true">
@@ -58,7 +58,7 @@
 			</action>
 		</actions>
 		<client_configs>
-			<template theme="umbra" name="api_viewer" element="ajxp_api_desktop" position="top"><![CDATA[
+			<template theme="orbit" name="api_viewer" element="ajxp_api_desktop" position="top"><![CDATA[
 				<div id="toolbars">
 					<div id="action_bar">
 						<div id="locationbar_cont">
diff --git a/core/src/plugins/access.mysql/MysqlAccessDriver.php b/core/src/plugins/access.mysql/MysqlAccessDriver.php
new file mode 100644
index 0000000000..380f475c31
--- /dev/null
+++ b/core/src/plugins/access.mysql/MysqlAccessDriver.php
@@ -0,0 +1,692 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Driver\DataProvider;
+
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Core\Exception\AuthRequiredException;
+use Pydio\Core\Http\Message\ReloadMessage;
+use Pydio\Core\Http\Message\UserMessage;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Exception\PydioException;
+
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\StatHelper;
+use Pydio\Core\Utils\Vars\StringHelper;
+use Pydio\Core\Utils\Vars\XMLFilter;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * @package AjaXplorer_Plugins
+ * @subpackage Access
+ */
+class MysqlAccessDriver extends AbstractAccessDriver
+{
+    /** The user name */
+    public $user;
+    /** The user password */
+    public $password;
+
+    /**
+     * @param ContextInterface $contextInterface
+     * @throws PydioException
+     * @throws \Exception
+     */
+    protected function initRepository(ContextInterface $contextInterface)
+    {
+        $this->user     = $contextInterface->getRepository()->getContextOption($contextInterface, "DB_USER");
+        $this->password = $contextInterface->getRepository()->getContextOption($contextInterface, "DB_PASS");
+        $link           = $this->createDbLink($contextInterface);
+        $this->closeDbLink($link);
+    }
+
+
+    public function createDbLink(ContextInterface $ctx)
+    {
+        $link = FALSE;
+        //Connects to the MySQL Database.
+        $host   = $ctx->getRepository()->getContextOption($ctx, "DB_HOST");
+        $dbname = $ctx->getRepository()->getContextOption($ctx, "DB_NAME");
+        $link = @mysql_connect($host, $this->user, $this->password);
+        if (!$link) {
+            throw new PydioException("Cannot connect to server!");
+        }
+        if (!@mysql_select_db($dbname, $link)) {
+            throw new PydioException("Cannot find database!");
+        }
+        return $link;
+    }
+
+    public function closeDbLink($link)
+    {
+        if (!mysql_close($link)) {
+            throw new PydioException("Cannot close connection!");
+        }
+    }
+
+    /**
+     * @param $action
+     * @param $httpVars
+     * @param $fileVars
+     * @param ContextInterface $ctx
+     * @return null|string
+     * @throws PydioException
+     */
+    public function switchAction($action, $httpVars, $fileVars, ContextInterface $ctx)
+    {
+        $xmlBuffer = "";
+        foreach ($httpVars as $getName=>$getValue) {
+            $$getName = InputFilter::securePath($getValue);
+        }
+        $selection = UserSelection::fromContext($ctx, $httpVars);
+        // FILTER DIR PAGINATION ANCHOR
+        if (isSet($dir) && strstr($dir, "%23")!==false) {
+            $parts = explode("%23", $dir);
+            $dir = $parts[0];
+            $page = $parts[1];
+        }
+
+        // Sanitize all httpVars entries
+        foreach($httpVars as $k=>&$value){
+            $value = InputFilter::sanitize($value, InputFilter::SANITIZE_FILENAME);
+        }
+
+        switch ($action) {
+
+            //------------------------------------
+            //	ONLINE EDIT
+            //------------------------------------
+            case "edit_record";
+                $isNew = false;
+                if(isSet($record_is_new) && $record_is_new == "true") $isNew = true;
+                $tableName = $_POST["table_name"];
+                $pkName = $_POST["pk_name"];
+                $query = "";
+                $arrValues = array();
+                foreach ($_POST as $key=>$value) {
+                    if (substr($key, 0, strlen("ajxp_mysql_")) == "ajxp_mysql_") {
+                        $newKey = substr($key, strlen("ajxp_mysql_"));
+                        $arrValues[$newKey] = $value;
+                    }
+                }
+                if ($isNew) {
+                    $string = "";
+                    $index = 0;
+                    foreach ($arrValues as $k=>$v) {
+                        // CHECK IF AUTO KEY!!!
+                        $string .= "'".addslashes($v)."'";
+                        if($index < count($arrValues)-1) $string.=",";
+                        $index++;
+                    }
+                    $query = "INSERT INTO $tableName VALUES ($string)";
+                } else {
+                    $string = "";
+                    $index = 0;
+                    foreach ($arrValues as $k=>$v) {
+                        if ($k == $pkName) {
+                            $pkValue = $v;
+                        } else {
+                            $string .= $k."='".addslashes($v)."'";
+                            if($index<count($arrValues)-1) $string.=",";
+                        }
+                        $index++;
+                    }
+                    $query = "UPDATE $tableName SET $string WHERE $pkName='$pkValue'";
+                }
+                $link = $this->createDbLink($ctx);
+                $res = $this->execQuery($query);
+                $this->closeDbLink($link);
+
+                if (is_a($res, "Pydio\Core\Exception\PydioException")) {
+                    $errorMessage = $res->messageId;
+                } else {
+                    $logMessage = $query;
+                    $reload_file_list = true;
+                }
+            break;
+
+            //------------------------------------
+            //	CHANGE COLUMNS OR CREATE TABLE
+            //------------------------------------
+            case "edit_table":
+                $link = $this->createDbLink($ctx);
+                if (isSet($httpVars["current_table"])) {
+                    if (isSet($httpVars["delete_column"])) {
+                        $query = "ALTER TABLE ".$httpVars["current_table"]." DROP COLUMN ".$httpVars["delete_column"];
+                        $res = $this->execQuery($query);
+                        if (is_a($res, "Pydio\Core\Exception\PydioException")) {
+                            $errorMessage = $res->messageId;
+                        } else {
+                            $logMessage = $query;
+                            $reload_file_list = true;
+                        }
+                        $this->closeDbLink($link);
+                        break;
+                    }
+                    if (isSet($httpVars["add_column"])) {
+                        $defString = $this->makeColumnDef($httpVars, "add_field_");
+                        $query = "ALTER TABLE ".$httpVars["current_table"]." ADD COLUMN ($defString)";
+                        if (isSet($httpVars["add_field_pk"]) && $httpVars["add_field_pk"]=="1") {
+                            $query.= ", ADD PRIMARY KEY (".$httpVars["add_field_name"].")";
+                        }
+                        if (isSet($httpVars["add_field_index"]) && $httpVars["add_field_index"]=="1") {
+                            $query.= ", ADD INDEX (".$httpVars["add_field_name"].")";
+                        }
+                        if (isSet($httpVars["add_field_uniq"]) && $httpVars["add_field_uniq"]=="1") {
+                            $query.= ", ADD UNIQUE (".$httpVars["add_field_name"].")";
+                        }
+                        $res = $this->execQuery($query);
+                        if (is_a($res, "Pydio\Core\Exception\PydioException")) {
+                            $errorMessage = $res->messageId;
+                        } else {
+                            $logMessage = $query;
+                            $reload_file_list = true;
+                        }
+                        $this->closeDbLink($link);
+                        break;
+                    }
+                }
+
+                $fields = array("origname","name", "default", "null", "size", "type", "flags", "pk", "index", "uniq");
+                $rows = array();
+                foreach ($httpVars as $k=>$val) {
+                    $split = explode("_", $k);
+                    if (count($split) == 3 && $split[0]=="field" && is_numeric($split[2]) && in_array($split[1], $fields)) {
+                        if(!isSet($rows[intval($split[2])])) $rows[intval($split[2])] = array();
+                        $rows[intval($split[2])][$split[1]] = $val;
+                    } else if (count($split) == 2 && $split[0] == "field" && in_array($split[1], $fields)) {
+                        if(!isSet($rows[0])) $rows[0] = array();
+                        $rows[0][$split[1]] = $val;
+                    }
+                }
+                if (isSet($current_table)) {
+                    $qMessage = '';
+                    foreach ($rows as $row) {
+                        $sizeString = ($row["size"]!=""?"(".$row["size"].")":"");
+                        $defString = ($row["default"]!=""?" DEFAULT ".$row["default"]."":"");
+                        $query = "ALTER TABLE $current_table CHANGE ".$row["origname"]." ".$row["name"]." ".$row["type"].$sizeString.$defString." ".$row["null"];
+                        $res = $this->execQuery(trim($query));
+                        if (is_a($res, "Pydio\Core\Exception\PydioException")) {
+                            $errorMessage = $res->messageId;
+                            $this->closeDbLink($link);
+                            break;
+                        } else {
+                            $qMessage .= $query;
+                            $reload_file_list = true;
+                        }
+                    }
+                    $logMessage = $qMessage;
+                } else if (isSet($new_table)) {
+                    $fieldsDef = array();
+                    $pks = array();
+                    $indexes = array();
+                    $uniqs = array();
+                    foreach ($rows as $index=>$row) {
+                        $fieldsDef[]= $this->makeColumnDef($row);
+                        // Analyse keys
+                        if($row["pk"] == "1")$pks[] = $row["name"];
+                        if($row["index"]=="1") $indexes[] = $row["name"];
+                        if($row["uniq"]=="1") $uniqs[] = $row["name"];
+
+                    }
+                    $fieldsDef = implode(",", $fieldsDef);
+                    if (count($pks)) {
+                        $fieldsDef.= ",PRIMARY KEY (".implode(",", $pks).")";
+                    }
+                    if (count($indexes)) {
+                        $fieldsDef.=",INDEX (".implode(",", $indexes).")";
+                    }
+                    if (count($uniqs)) {
+                        $fieldsDef.=",UNIQUE (".implode(",", $uniqs).")";
+                    }
+                    $query = "CREATE TABLE $new_table ($fieldsDef)";
+                    $res = $this->execQuery((trim($query)));
+                    if (is_a($res, "Pydio\Core\Exception\PydioException")) {
+                        $errorMessage = $res->messageId;
+                    } else {
+                        $logMessage = $query;
+                        $reload_file_list = true;
+                        $reload_current_node = true;
+                    }
+                }
+                $this->closeDbLink($link);
+            break;
+
+            //------------------------------------
+            //	SUPPRIMER / DELETE
+            //------------------------------------
+            case "delete_table":
+            case "delete_record":
+                $dir = basename($dir);
+                $link = $this->createDbLink($ctx);
+                if (trim($dir) == "") {
+                    // ROOT NODE => DROP TABLES
+                    $tables = $selection->getFiles();
+                    $query = "DROP TABLE";
+                    foreach ($tables as $index => $tableName) {
+                        $tables[$index] = basename($tableName);
+                    }
+                    $query.= " ".implode(",", $tables);
+                    $res = $this->execQuery($query);
+                    $reload_current_node = true;
+                } else {
+                    // TABLE NODE => DELETE RECORDS
+                    $tableName = $dir;
+                    $pks = $selection->getFiles();
+                    foreach ($pks as $key => $pkString) {
+                        $parts = explode(".", $pkString);
+                        array_pop($parts); // remove .pk extension
+                        array_shift($parts); // remove record prefix
+                        foreach ($parts as $index => $pkPart) {
+                            $parts[$index] = str_replace("__", "='", $pkPart)."'";
+                        }
+                        $pks[$key] = "(".implode(" AND ", $parts).")";
+                    }
+                    $query = "DELETE FROM $tableName WHERE ". implode(" OR ", $pks);
+                    $res = $this->execQuery($query);
+                }
+                //AJXP_Exception::errorToXml($res);
+                if (is_a($res, "Pydio\Core\Exception\PydioException")) {
+                    $errorMessage = $res->messageId;
+                } else {
+                    $logMessage = $query;
+                    $reload_file_list = true;
+                }
+                $this->closeDbLink($link);
+            break;
+
+            //------------------------------------
+            //	RENOMMER / RENAME
+            //------------------------------------
+            case "set_query":
+                $query = $httpVars["query"];
+                $_SESSION["LAST_SQL_QUERY"] = $query;
+                print("<tree store=\"true\"></tree>");
+            break;
+
+            //------------------------------------
+            //	XML LISTING
+            //------------------------------------
+            case "ls":
+
+                if(!isSet($dir) || $dir == "/") $dir = "";
+                $searchMode = $fileListMode = $completeMode = false;
+                if (isSet($mode)) {
+                    if($mode == "search") $searchMode = true;
+                    else if($mode == "file_list") $fileListMode = true;
+                    else if($mode == "complete") $completeMode = true;
+                }
+                $link = $this->createDbLink($ctx);
+                //AJXP_Exception::errorToXml($link);
+                if ($dir == "") {
+                    XMLFilter::header();
+                    $tables = $this->listTables($ctx);
+                    XMLFilter::sendFilesListComponentConfig('<columns switchDisplayMode="list" switchGridMode="filelist"><column messageString="Table Name" attributeName="ajxp_label" sortType="String"/><column messageString="Byte Size" attributeName="bytesize" sortType="NumberKo"/><column messageString="Count" attributeName="count" sortType="Number"/></columns>');
+                    $icon = ($mode == "file_list"?"sql_images/mimes/ICON_SIZE/table_empty.png":"sql_images/mimes/ICON_SIZE/table_empty_tree.png");
+                    foreach ($tables as $tableName) {
+                        if(InputFilter::detectXSS($tableName)) {
+                            $tableName = "XSS Detected!";
+                            $size = 'N/A';
+                            $count = 'N/A';
+                        }else{
+                            $size = $this->getSize($ctx, $tableName);
+                            $count = $this->getCount($tableName);
+                        }
+                        print "<tree is_file=\"0\" text=\"$tableName\" filename=\"/$tableName\" bytesize=\"$size\" count=\"$count\" icon=\"$icon\" ajxp_mime=\"table\" />";
+                    }
+                    print "<tree is_file=\"0\" text=\"Search Results\" ajxp_node=\"true\" filename=\"/ajxpmysqldriver_searchresults\" bytesize=\"-\" count=\"-\" icon=\"search.png\"/>";
+                    XMLFilter::close();
+                } else {
+                    $tableName = basename($dir);
+                    if(isSet($page))$currentPage = $page;
+                    else $currentPage = 1;
+                    $query = "SELECT * FROM $tableName";
+                    $searchQuery = false;
+                    if ($tableName == "ajxpmysqldriver_searchresults") {
+                        if (isSet($_SESSION["LAST_SQL_QUERY"])) {
+                            $query = $_SESSION["LAST_SQL_QUERY"];
+                            $matches = array();
+                            if (preg_match("/SELECT [\S, ]* FROM (\S*).*/i", $query, $matches)!==false) {
+                                $tableName = $matches[1];
+                                $searchQuery = true;
+                            } else {
+                                break;
+                            }
+                        } else {
+                            break;
+                        }
+                    }
+                    if (isSet($order_column) && isSet($order_direction)) {
+                        $query .= " ORDER BY $order_column ".strtoupper($order_direction);
+                        if (!isSet($_SESSION["AJXP_ORDER_DATA"])) {
+                            $_SESSION["AJXP_ORDER_DATA"] = array();
+                        }
+                        $_SESSION["AJXP_ORDER_DATA"][$this->repository->getUniqueId()."_".$tableName] = array("column" => $order_column, "dir" => $order_direction);
+                    } else if (isSet($_SESSION["AJXP_ORDER_DATA"])) {
+                        if (isSet($_SESSION["AJXP_ORDER_DATA"][$this->repository->getUniqueId()."_".$tableName])) {
+                            $order_column = $_SESSION["AJXP_ORDER_DATA"][$this->repository->getUniqueId()."_".$tableName]["column"];
+                            $order_direction = $_SESSION["AJXP_ORDER_DATA"][$this->repository->getUniqueId()."_".$tableName]["dir"];
+                            $query .= " ORDER BY $order_column ".strtoupper($order_direction);
+                        }
+                    }
+                    try {
+                        $result = $this->showRecords($ctx, $query, $tableName, $currentPage);
+                        $count = count($result);
+                    } catch (PydioException $ex) {
+                        unset($_SESSION["LAST_SQL_QUERY"]);
+                        throw $ex;
+                    }
+                    XMLFilter::header();
+                    $blobCols = array();
+                    $columnsString = '<columns switchDisplayMode="list" switchGridMode="grid">';
+                    foreach ($result["COLUMNS"] as $col) {
+                        $columnsString .= "<column messageString=\"".$col["NAME"]."\" attributeName=\"".$col["NAME"]."\" field_name=\"".$col["NAME"]."\" field_type=\"".$col["TYPE"]."\" field_size=\"".$col["LENGTH"]."\" field_flags=\"".$this->cleanFlagString($col["FLAGS"])."\" field_pk=\"".(preg_match("/primary/", $col["FLAGS"])?"1":"0")."\" field_null=\"".(preg_match("/not_null/", $col["FLAGS"])?"NOT_NULL":"NULL")."\" sortType=\"".$this->sqlTypeToSortType($col["TYPE"])."\" field_default=\"".$col["DEFAULT"]."\"/>";
+                        if (stristr($col["TYPE"],"blob")!==false && ($col["FLAGS"]!="" && stristr($col["FLAGS"], "binary"))) {
+                            $blobCols[]=$col["NAME"];
+                        }
+                    }
+
+                    $columnsString .= '</columns>';
+                    XMLFilter::sendFilesListComponentConfig($columnsString);
+                    //print '<pagination total="'.$result["TOTAL_PAGES"].'" current="'.$currentPage.'" remote_order="true" currentOrderCol="'.$order_column.'" currentOrderDir="'.$order_direction.'"/>';
+                    if ($result["TOTAL_PAGES"] > 1) {
+                        XMLFilter::renderPaginationData($count, $currentPage, $result["TOTAL_PAGES"]);
+                    }
+                    foreach ($result["ROWS"] as $arbitIndex => $row) {
+                        print '<tree ';
+                        $pkString = "";
+                        foreach ($row as $key=>$value) {
+                            if (in_array($key, $blobCols)) {
+                                $sizeStr = " - NULL";
+                                if(strlen($value)) $sizeStr = " - ". StatHelper::roundSize(strlen($value));
+                                print "$key=\"BLOB$sizeStr\" ";
+                            } else {
+                                $value = str_replace("\"", "", $value);
+                                if(InputFilter::detectXSS($value)) $value = "Possible XSS Detected - Cannot display value!";
+                                $value = StringHelper::xmlEntities($value);
+                                print $key.'="'.$value.'" ';
+                                if ($result["HAS_PK"]>0) {
+                                    if (in_array($key, $result["PK_FIELDS"])) {
+                                        $pkString .= $key."__".$value.".";
+                                    }
+                                }
+                            }
+                        }
+                        if ($result["HAS_PK"] > 0) {
+                            print 'filename="record.'.$pkString.'pk" ';
+                            print 'is_file="1" ajxp_mime="pk"/>';
+                        } else {
+                            print 'filename="record_'.$arbitIndex.'.no_pk" ';
+                            print 'is_file="1" ajxp_mime="row"/>';
+                        }
+
+                    }
+                    XMLFilter::close();
+                }
+                $this->closeDbLink($link);
+                return null;
+
+            break;
+        }
+
+        if (isset($logMessage) || isset($errorMessage)) {
+            if(InputFilter::detectXSS($logMessage) || InputFilter::detectXSS($errorMessage)){
+                $errorMessage = "XSS detected!";
+            }
+        }
+        $uMessage = new UserMessage(isSet($logMessage)?$logMessage:$errorMessage, isset($logMessage) ? LOG_LEVEL_ERROR: LOG_LEVEL_INFO);
+        $xmlBuffer = $uMessage->toXML();
+
+        if (isset($requireAuth)) {
+            throw new AuthRequiredException();
+        }
+
+        if (( isset($reload_current_node) && $reload_current_node == "true") || (isset($reload_file_list)) ) {
+            $relo = new ReloadMessage();
+            $xmlBuffer .= $relo->toXML();
+        }
+
+        return $xmlBuffer;
+    }
+
+    public function getSize(ContextInterface $ctx, $tablename)
+    {
+        $dbname = $ctx->getRepository()->getContextOption($ctx, "DB_NAME");
+        $like="";
+        $total="";
+        $t=0;
+        if ($tablename !="") {
+            $like=" like '$tablename'";
+        }
+        $sql= "SHOW TABLE STATUS FROM `$dbname` $like";
+        $result=$this->execQuery($sql);
+        if ($result) {
+
+            while ($rec = mysql_fetch_array($result)) {
+                $t+=($rec['Data_length'] + $rec['Index_length']);
+            }
+            $total = StatHelper::roundSize($t);
+        } else {
+            $total="Unknown";
+        }
+        return($total);
+    }
+
+    public function getCount($tableName)
+    {
+        $sql = "SELECT count(*) FROM $tableName";
+        $result = $this->execQuery($sql);
+        $t = 0;
+        if ($result) {
+            while ($res = mysql_fetch_array($result)) {
+                $t+=$res[0];
+            }
+        }
+        return $t;
+    }
+
+    public function getColumnData($tableName, $columnName)
+    {
+        $sql = "SHOW COLUMNS FROM $tableName LIKE '$columnName'";
+        $res = $this->execQuery($sql);
+        if ($res) {
+            return mysql_fetch_array($res);
+            // ["Field", "Type", "Null", "Key", "Default", "Extra"] => Type is like "enum('a', 'b', 'c')"
+        }
+        return [];
+    }
+
+    public function makeColumnDef($row, $prefix="", $suffix="")
+    {
+        $defString = "";
+        if (isSet($row[$prefix."default".$suffix]) && trim($row[$prefix."default".$suffix]) != "") {
+            $defString = " DEFAULT ".$row[$prefix."default".$suffix];
+        }
+        $sizeString = ($row[$prefix."size".$suffix]!=""?"(".$row[$prefix."size".$suffix].")":"");
+        $fieldsDef = $row[$prefix."name".$suffix]." ".$row[$prefix."type".$suffix].$sizeString.$defString." ".$row[$prefix."null".$suffix]." ".$row[$prefix."flags".$suffix];
+        return trim($fieldsDef);
+    }
+
+    public function cleanFlagString($flagString)
+    {
+        $arr = explode(" ", $flagString);
+        $newFlags = array();
+        foreach ($arr as $flag) {
+            if ($flag == "primary_key" || $flag == "null" || $flag == "not_null") {
+                continue;
+            }
+            $newFlags[] = $flag;
+        }
+        return implode(" ", $newFlags);
+    }
+
+    public function sqlTypeToSortType($fieldType)
+    {
+        switch ($fieldType) {
+            case "int":
+                return "Number";
+            case "string":
+            case "datetime":
+            case "timestamp":
+                return "String";
+            case "blob":
+                return "NumberKo";
+            default:
+                return "String";
+        }
+    }
+    /*	<--- add a slash at the beggining of this line to switch between the 2 functions
+    public function listTables()
+    {
+        $repo = ConfService::getRepository();
+        $result = mysql_list_tables($repo->getOption("DB_NAME"));
+        $numtab = mysql_num_rows ($result);
+        $allTables = array();
+        for ($i =0; $i < $numtab; $i++) {
+            $table = trim(mysql_tablename($result, $i));
+            $allTables[] = $table;
+        }
+        return $allTables;
+    }
+    /*/
+    public function listTables(ContextInterface $ctx)
+    {
+        $result = mysql_query("SHOW TABLES FROM `".$ctx->getRepository()->getContextOption($ctx, "DB_NAME")."` LIKE '".$ctx->getRepository()->getContextOption($ctx, "DB_PTRN")."%'");
+        $allTables = array();
+        while ($row = mysql_fetch_row($result)) {
+           $allTables[] = $row[0];
+        }
+        return $allTables;
+    }
+    //*/
+
+    public function showRecords(ContextInterface $ctx, $query, $tablename, $currentPage=1, $rpp=50, $searchval='' )
+    {
+        $dbname = $ctx->getRepository()->getContextOption($ctx, "DB_NAME");
+        $result = $this->execQuery($query);
+
+        $columns = array();
+        $rows = array();
+
+        $num_rows = mysql_num_rows($result);
+        $pg=$currentPage-1;
+        if (isset($_POST['first'])) {
+            $pg=0;
+        } else if (isset($_POST['back'])) {
+            $pg=$pg-1;
+        } else if (isset($_POST['next'])) {
+            $pg++;
+        } else if (isset($_POST['last'])) {
+            $pgs = $num_rows/$rpp;
+            $pg=ceil($pgs)-1;
+        }
+        if ($pg < 0) {
+            $pg=0;
+        }
+        if ($pg > $num_rows/$rpp) {
+            $pg=ceil($num_rows/$rpp)-1;
+        }
+        $totalPages = ceil($num_rows/$rpp);
+        $beg = $pg * $rpp;
+
+        $flds = mysql_num_fields($result);
+        $fields = @mysql_list_fields( $dbname, $tablename);
+        if (!$fields) {
+            throw new PydioException("Non matching fields for table '$tablename'");
+        }
+        $z=0;
+        $x=0;
+        $pkfield=array();
+
+        // MAKE COLUMNS HEADER
+        for ($i = 0; $i < $flds; $i++) {
+            $c=$i+1;
+            $title=mysql_field_name($fields, $i);
+            $type=mysql_field_type($fields, $i);
+            $size=mysql_field_len($fields, $i);
+            $flagstring = mysql_field_flags ($fields, $i);
+            $colData = $this->getColumnData($tablename, $title);
+            $colDataType = $colData["Type"];
+            if (preg_match("/(.*)\((.*)\)/", $colDataType, $matches)) {
+                $type = $matches[1];
+                $size = $matches[2];
+            }
+            $columns[] = array("NAME" => $title, "TYPE"=>$type, "LENGTH"=>$size, "FLAGS"=>$flagstring, "DEFAULT"=>$colData["Default"]);
+
+            //Find the primary key
+            $flagstring = mysql_field_flags ($result, $i);
+            if (preg_match("/primary/",$flagstring )) {
+                $pk[$z] = $i;
+                $pkfield[$z]= mysql_field_name($fields, $i);
+                $z++;
+            }
+        }
+        $v=$flds+1;
+
+        if ($z > 0) {
+            $cpk=count($pk);
+        } else {
+            $cpk=0;
+        }
+
+        // MAKE ROWS RESULT
+        for ($s=$beg; $s < $beg + $rpp; $s++) {
+            if ($s < $num_rows) {
+                if (!mysql_data_seek ($result, $s)) {
+                    continue;
+                }
+                $row=mysql_fetch_array($result);
+                if (!isset($pk)) {
+                    $pk=' ';
+                    $pkfield= array();
+                }
+                $values = array();
+                for ($col = 0; $col < $flds; $col ++) {
+                    $values[mysql_field_name($fields, $col)] = stripslashes($row[$col]);
+                }
+                $rows[] = $values;
+            }
+        }
+
+        return array("COLUMNS" => $columns, "ROWS" => $rows, "HAS_PK"=>$cpk, "TOTAL_PAGES"=>$totalPages, "PK_FIELDS"=>$pkfield);
+    }
+
+
+    public function execQuery($sql ='')
+    {
+        $output='';
+        if ($sql !='') {
+            //$sql=mysql_real_escape_string($sql);
+            $result= @mysql_query(stripslashes($sql));
+            if ($result) {
+                $this->logInfo("exec", array($sql));
+                return $result;
+            } else {
+                throw new PydioException($sql.":".mysql_error());
+            }
+        } else {
+            throw new PydioException('Empty Query');
+        }
+    }
+
+
+}
diff --git a/core/src/plugins/access.mysql/class.mysqlAccessDriver.php b/core/src/plugins/access.mysql/class.mysqlAccessDriver.php
deleted file mode 100644
index 2f127bfdfd..0000000000
--- a/core/src/plugins/access.mysql/class.mysqlAccessDriver.php
+++ /dev/null
@@ -1,675 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * @package AjaXplorer_Plugins
- * @subpackage Access
- */
-class mysqlAccessDriver extends AbstractAccessDriver
-{
-    /** The user name */
-    public $user;
-    /** The user password */
-    public $password;
-
-    public function initRepository()
-    {
-        $this->user = $this->repository->getOption("DB_USER");
-        $this->password = $this->repository->getOption("DB_PASS");
-        $link = $this->createDbLink();
-        $this->closeDbLink($link);
-    }
-
-
-    public function createDbLink()
-    {
-        $link = FALSE;
-        //Connects to the MySQL Database.
-        $host = $this->repository->getOption("DB_HOST");
-        $dbname = $this->repository->getOption("DB_NAME");
-        $link = @mysql_connect($host, $this->user, $this->password);
-        if (!$link) {
-            throw new AJXP_Exception("Cannot connect to server!");
-        }
-        if (!@mysql_select_db($dbname, $link)) {
-            throw new AJXP_Exception("Cannot find database!");
-        }
-        return $link;
-    }
-
-    public function closeDbLink($link)
-    {
-        if (!mysql_close($link)) {
-            throw new AJXP_Exception("Cannot close connection!");
-        }
-    }
-
-    public function switchAction($action, $httpVars, $fileVars)
-    {
-        parent::accessPreprocess($action, $httpVars, $fileVars);
-        $xmlBuffer = "";
-        foreach ($httpVars as $getName=>$getValue) {
-            $$getName = AJXP_Utils::securePath($getValue);
-        }
-        $selection = new UserSelection();
-        $selection->initFromHttpVars($httpVars);
-        if (isSet($dir) && $action != "upload") {
-            $safeDir = $dir;
-            $dir = SystemTextEncoding::fromUTF8($dir);
-        }
-        // FILTER DIR PAGINATION ANCHOR
-        if (isSet($dir) && strstr($dir, "%23")!==false) {
-            $parts = explode("%23", $dir);
-            $dir = $parts[0];
-            $page = $parts[1];
-        }
-        if (isSet($dest)) {
-            $dest = SystemTextEncoding::fromUTF8($dest);
-        }
-        $mess = ConfService::getMessages();
-
-        // Sanitize all httpVars entries
-        foreach($httpVars as $k=>&$value){
-            $value = AJXP_Utils::sanitize($value, AJXP_SANITIZE_FILENAME);
-        }
-
-        switch ($action) {
-
-            //------------------------------------
-            //	ONLINE EDIT
-            //------------------------------------
-            case "edit_record";
-                $isNew = false;
-                if(isSet($record_is_new) && $record_is_new == "true") $isNew = true;
-                $tableName = $_POST["table_name"];
-                $pkName = $_POST["pk_name"];
-                $query = "";
-                $arrValues = array();
-                foreach ($_POST as $key=>$value) {
-                    if (substr($key, 0, strlen("ajxp_mysql_")) == "ajxp_mysql_") {
-                        $newKey = substr($key, strlen("ajxp_mysql_"));
-                        $arrValues[$newKey] = $value;
-                    }
-                }
-                if ($isNew) {
-                    $string = "";
-                    $index = 0;
-                    foreach ($arrValues as $k=>$v) {
-                        // CHECK IF AUTO KEY!!!
-                        $string .= "'".addslashes(SystemTextEncoding::fromUTF8($v))."'";
-                        if($index < count($arrValues)-1) $string.=",";
-                        $index++;
-                    }
-                    $query = "INSERT INTO $tableName VALUES ($string)";
-                } else {
-                    $string = "";
-                    $index = 0;
-                    foreach ($arrValues as $k=>$v) {
-                        if ($k == $pkName) {
-                            $pkValue = $v;
-                        } else {
-                            $string .= $k."='".addslashes(SystemTextEncoding::fromUTF8($v))."'";
-                            if($index<count($arrValues)-1) $string.=",";
-                        }
-                        $index++;
-                    }
-                    $query = "UPDATE $tableName SET $string WHERE $pkName='$pkValue'";
-                }
-                $link = $this->createDbLink();
-                $res = $this->execQuery($query);
-                $this->closeDbLink($link);
-
-                if (is_a($res, "AJXP_Exception")) {
-                    $errorMessage = $res->messageId;
-                } else {
-                    $logMessage = $query;
-                    $reload_file_list = true;
-                }
-            break;
-
-            //------------------------------------
-            //	CHANGE COLUMNS OR CREATE TABLE
-            //------------------------------------
-            case "edit_table":
-                $link = $this->createDbLink();
-                if (isSet($httpVars["current_table"])) {
-                    if (isSet($httpVars["delete_column"])) {
-                        $query = "ALTER TABLE ".$httpVars["current_table"]." DROP COLUMN ".$httpVars["delete_column"];
-                        $res = $this->execQuery($query);
-                        if (is_a($res, "AJXP_Exception")) {
-                            $errorMessage = $res->messageId;
-                        } else {
-                            $logMessage = $query;
-                            $reload_file_list = true;
-                        }
-                        $this->closeDbLink($link);
-                        break;
-                    }
-                    if (isSet($httpVars["add_column"])) {
-                        $defString = $this->makeColumnDef($httpVars, "add_field_");
-                        $query = "ALTER TABLE ".$httpVars["current_table"]." ADD COLUMN ($defString)";
-                        if (isSet($httpVars["add_field_pk"]) && $httpVars["add_field_pk"]=="1") {
-                            $query.= ", ADD PRIMARY KEY (".$httpVars["add_field_name"].")";
-                        }
-                        if (isSet($httpVars["add_field_index"]) && $httpVars["add_field_index"]=="1") {
-                            $query.= ", ADD INDEX (".$httpVars["add_field_name"].")";
-                        }
-                        if (isSet($httpVars["add_field_uniq"]) && $httpVars["add_field_uniq"]=="1") {
-                            $query.= ", ADD UNIQUE (".$httpVars["add_field_name"].")";
-                        }
-                        $res = $this->execQuery($query);
-                        if (is_a($res, "AJXP_Exception")) {
-                            $errorMessage = $res->messageId;
-                        } else {
-                            $logMessage = $query;
-                            $reload_file_list = true;
-                        }
-                        $this->closeDbLink($link);
-                        break;
-                    }
-                }
-
-                $fields = array("origname","name", "default", "null", "size", "type", "flags", "pk", "index", "uniq");
-                $rows = array();
-                foreach ($httpVars as $k=>$val) {
-                    $split = explode("_", $k);
-                    if (count($split) == 3 && $split[0]=="field" && is_numeric($split[2]) && in_array($split[1], $fields)) {
-                        if(!isSet($rows[intval($split[2])])) $rows[intval($split[2])] = array();
-                        $rows[intval($split[2])][$split[1]] = $val;
-                    } else if (count($split) == 2 && $split[0] == "field" && in_array($split[1], $fields)) {
-                        if(!isSet($rows[0])) $rows[0] = array();
-                        $rows[0][$split[1]] = $val;
-                    }
-                }
-                if (isSet($current_table)) {
-                    $qMessage = '';
-                    foreach ($rows as $row) {
-                        $sizeString = ($row["size"]!=""?"(".$row["size"].")":"");
-                        $defString = ($row["default"]!=""?" DEFAULT ".$row["default"]."":"");
-                        $query = "ALTER TABLE $current_table CHANGE ".$row["origname"]." ".$row["name"]." ".$row["type"].$sizeString.$defString." ".$row["null"];
-                        $res = $this->execQuery(trim($query));
-                        if (is_a($res, "AJXP_Exception")) {
-                            $errorMessage = $res->messageId;
-                            $this->closeDbLink($link);
-                            break;
-                        } else {
-                            $qMessage .= $query;
-                            $reload_file_list = true;
-                        }
-                    }
-                    $logMessage = $qMessage;
-                } else if (isSet($new_table)) {
-                    $fieldsDef = array();
-                    $pks = array();
-                    $indexes = array();
-                    $uniqs = array();
-                    foreach ($rows as $index=>$row) {
-                        $fieldsDef[]= $this->makeColumnDef($row);
-                        // Analyse keys
-                        if($row["pk"] == "1")$pks[] = $row["name"];
-                        if($row["index"]=="1") $indexes[] = $row["name"];
-                        if($row["uniq"]=="1") $uniqs[] = $row["name"];
-
-                    }
-                    $fieldsDef = implode(",", $fieldsDef);
-                    if (count($pks)) {
-                        $fieldsDef.= ",PRIMARY KEY (".implode(",", $pks).")";
-                    }
-                    if (count($indexes)) {
-                        $fieldsDef.=",INDEX (".implode(",", $indexes).")";
-                    }
-                    if (count($uniqs)) {
-                        $fieldsDef.=",UNIQUE (".implode(",", $uniqs).")";
-                    }
-                    $query = "CREATE TABLE $new_table ($fieldsDef)";
-                    $res = $this->execQuery((trim($query)));
-                    if (is_a($res, "AJXP_Exception")) {
-                        $errorMessage = $res->messageId;
-                    } else {
-                        $logMessage = $query;
-                        $reload_file_list = true;
-                        $reload_current_node = true;
-                    }
-                }
-                $this->closeDbLink($link);
-            break;
-
-            //------------------------------------
-            //	SUPPRIMER / DELETE
-            //------------------------------------
-            case "delete_table":
-            case "delete_record":
-                $dir = basename($dir);
-                $link = $this->createDbLink();
-                if (trim($dir) == "") {
-                    // ROOT NODE => DROP TABLES
-                    $tables = $selection->getFiles();
-                    $query = "DROP TABLE";
-                    foreach ($tables as $index => $tableName) {
-                        $tables[$index] = basename($tableName);
-                    }
-                    $query.= " ".implode(",", $tables);
-                    $res = $this->execQuery($query);
-                    $reload_current_node = true;
-                } else {
-                    // TABLE NODE => DELETE RECORDS
-                    $tableName = $dir;
-                    $pks = $selection->getFiles();
-                    foreach ($pks as $key => $pkString) {
-                        $parts = explode(".", $pkString);
-                        array_pop($parts); // remove .pk extension
-                        array_shift($parts); // remove record prefix
-                        foreach ($parts as $index => $pkPart) {
-                            $parts[$index] = str_replace("__", "='", $pkPart)."'";
-                        }
-                        $pks[$key] = "(".implode(" AND ", $parts).")";
-                    }
-                    $query = "DELETE FROM $tableName WHERE ". implode(" OR ", $pks);
-                    $res = $this->execQuery($query);
-                }
-                //AJXP_Exception::errorToXml($res);
-                if (is_a($res, "AJXP_Exception")) {
-                    $errorMessage = $res->messageId;
-                } else {
-                    $logMessage = $query;
-                    $reload_file_list = true;
-                }
-                $this->closeDbLink($link);
-            break;
-
-            //------------------------------------
-            //	RENOMMER / RENAME
-            //------------------------------------
-            case "set_query":
-                $query = $httpVars["query"];
-                $_SESSION["LAST_SQL_QUERY"] = $query;
-                print("<tree store=\"true\"></tree>");
-            break;
-
-            //------------------------------------
-            //	XML LISTING
-            //------------------------------------
-            case "ls":
-
-                if(!isSet($dir) || $dir == "/") $dir = "";
-                $searchMode = $fileListMode = $completeMode = false;
-                if (isSet($mode)) {
-                    if($mode == "search") $searchMode = true;
-                    else if($mode == "file_list") $fileListMode = true;
-                    else if($mode == "complete") $completeMode = true;
-                }
-                $link = $this->createDbLink();
-                //AJXP_Exception::errorToXml($link);
-                if ($dir == "") {
-                    AJXP_XMLWriter::header();
-                    $tables = $this->listTables();
-                    AJXP_XMLWriter::sendFilesListComponentConfig('<columns switchDisplayMode="list" switchGridMode="filelist"><column messageString="Table Name" attributeName="ajxp_label" sortType="String"/><column messageString="Byte Size" attributeName="bytesize" sortType="NumberKo"/><column messageString="Count" attributeName="count" sortType="Number"/></columns>');
-                    $icon = ($mode == "file_list"?"sql_images/mimes/ICON_SIZE/table_empty.png":"sql_images/mimes/ICON_SIZE/table_empty_tree.png");
-                    foreach ($tables as $tableName) {
-                        if(AJXP_Utils::detectXSS($tableName)) {
-                            $tableName = "XSS Detected!";
-                            $size = 'N/A';
-                            $count = 'N/A';
-                        }else{
-                            $size = $this->getSize($tableName);
-                            $count = $this->getCount($tableName);
-                        }
-                        print "<tree is_file=\"0\" text=\"$tableName\" filename=\"/$tableName\" bytesize=\"$size\" count=\"$count\" icon=\"$icon\" ajxp_mime=\"table\" />";
-                    }
-                    print "<tree is_file=\"0\" text=\"Search Results\" ajxp_node=\"true\" filename=\"/ajxpmysqldriver_searchresults\" bytesize=\"-\" count=\"-\" icon=\"search.png\"/>";
-                    AJXP_XMLWriter::close();
-                } else {
-                    $tableName = basename($dir);
-                    if(isSet($page))$currentPage = $page;
-                    else $currentPage = 1;
-                    $query = "SELECT * FROM $tableName";
-                    $searchQuery = false;
-                    if ($tableName == "ajxpmysqldriver_searchresults") {
-                        if (isSet($_SESSION["LAST_SQL_QUERY"])) {
-                            $query = $_SESSION["LAST_SQL_QUERY"];
-                            $matches = array();
-                            if (preg_match("/SELECT [\S, ]* FROM (\S*).*/i", $query, $matches)!==false) {
-                                $tableName = $matches[1];
-                                $searchQuery = true;
-                            } else {
-                                break;
-                            }
-                        } else {
-                            break;
-                        }
-                    }
-                    if (isSet($order_column)) {
-                        $query .= " ORDER BY $order_column ".strtoupper($order_direction);
-                        if (!isSet($_SESSION["AJXP_ORDER_DATA"])) {
-                            $_SESSION["AJXP_ORDER_DATA"] = array();
-                        }
-                        $_SESSION["AJXP_ORDER_DATA"][$this->repository->getUniqueId()."_".$tableName] = array("column" => $order_column, "dir" => $order_direction);
-                    } else if (isSet($_SESSION["AJXP_ORDER_DATA"])) {
-                        if (isSet($_SESSION["AJXP_ORDER_DATA"][$this->repository->getUniqueId()."_".$tableName])) {
-                            $order_column = $_SESSION["AJXP_ORDER_DATA"][$this->repository->getUniqueId()."_".$tableName]["column"];
-                            $order_direction = $_SESSION["AJXP_ORDER_DATA"][$this->repository->getUniqueId()."_".$tableName]["dir"];
-                            $query .= " ORDER BY $order_column ".strtoupper($order_direction);
-                        }
-                    }
-                    try {
-                        $result = $this->showRecords($query, $tableName, $currentPage);
-                    } catch (AJXP_Exception $ex) {
-                        unset($_SESSION["LAST_SQL_QUERY"]);
-                        throw $ex;
-                    }
-                    AJXP_XMLWriter::header();
-                    $blobCols = array();
-                    $columnsString = '<columns switchDisplayMode="list" switchGridMode="grid">';
-                    foreach ($result["COLUMNS"] as $col) {
-                        $columnsString .= "<column messageString=\"".$col["NAME"]."\" attributeName=\"".$col["NAME"]."\" field_name=\"".$col["NAME"]."\" field_type=\"".$col["TYPE"]."\" field_size=\"".$col["LENGTH"]."\" field_flags=\"".$this->cleanFlagString($col["FLAGS"])."\" field_pk=\"".(preg_match("/primary/", $col["FLAGS"])?"1":"0")."\" field_null=\"".(preg_match("/not_null/", $col["FLAGS"])?"NOT_NULL":"NULL")."\" sortType=\"".$this->sqlTypeToSortType($col["TYPE"])."\" field_default=\"".$col["DEFAULT"]."\"/>";
-                        if (stristr($col["TYPE"],"blob")!==false && ($col["FLAGS"]!="" && stristr($col["FLAGS"], "binary"))) {
-                            $blobCols[]=$col["NAME"];
-                        }
-                    }
-
-                    $columnsString .= '</columns>';
-                    AJXP_XMLWriter::sendFilesListComponentConfig($columnsString);
-                    //print '<pagination total="'.$result["TOTAL_PAGES"].'" current="'.$currentPage.'" remote_order="true" currentOrderCol="'.$order_column.'" currentOrderDir="'.$order_direction.'"/>';
-                    if ($result["TOTAL_PAGES"] > 1) {
-                        AJXP_XMLWriter::renderPaginationData($count, $currentPage,$result["TOTAL_PAGES"]);
-                    }
-                    foreach ($result["ROWS"] as $arbitIndex => $row) {
-                        print '<tree ';
-                        $pkString = "";
-                        foreach ($row as $key=>$value) {
-                            if (in_array($key, $blobCols)) {
-                                $sizeStr = " - NULL";
-                                if(strlen($value)) $sizeStr = " - ".AJXP_Utils::roundSize(strlen($value));
-                                print "$key=\"BLOB$sizeStr\" ";
-                            } else {
-                                $value = str_replace("\"", "", $value);
-                                if(AJXP_Utils::detectXSS($value)) $value = "Possible XSS Detected - Cannot display value!";
-                                $value = AJXP_Utils::xmlEntities($value);
-                                print $key.'="'.SystemTextEncoding::toUTF8($value).'" ';
-                                if ($result["HAS_PK"]>0) {
-                                    if (in_array($key, $result["PK_FIELDS"])) {
-                                        $pkString .= $key."__".$value.".";
-                                    }
-                                }
-                            }
-                        }
-                        if ($result["HAS_PK"] > 0) {
-                            print 'filename="record.'.$pkString.'pk" ';
-                            print 'is_file="1" ajxp_mime="pk"/>';
-                        } else {
-                            print 'filename="record_'.$arbitIndex.'.no_pk" ';
-                            print 'is_file="1" ajxp_mime="row"/>';
-                        }
-
-                    }
-                    AJXP_XMLWriter::close();
-                }
-                $this->closeDbLink($link);
-                exit(1);
-
-            break;
-        }
-
-        if (isset($logMessage) || isset($errorMessage)) {
-            if(AJXP_Utils::detectXSS($logMessage) || AJXP_Utils::detectXSS($errorMessage)){
-                $xmlBuffer = AJXP_XMLWriter::sendMessage(null, "XSS Detected!", false);
-            }
-            $xmlBuffer .= AJXP_XMLWriter::sendMessage((isSet($logMessage)?$logMessage:null), (isSet($errorMessage)?$errorMessage:null), false);
-        }
-
-        if (isset($requireAuth)) {
-            $xmlBuffer .= AJXP_XMLWriter::requireAuth(false);
-        }
-
-        if (( isset($reload_current_node) && $reload_current_node == "true") || (isset($reload_file_list)) ) {
-            $xmlBuffer .= AJXP_XMLWriter::reloadDataNode("", "", false);
-        }
-
-        return $xmlBuffer;
-    }
-
-    public function getSize($tablename)
-    {
-        $repo = ConfService::getRepository();
-        $dbname = $repo->getOption("DB_NAME");
-        $like="";
-        $total="";
-        $t=0;
-        if ($tablename !="") {
-            $like=" like '$tablename'";
-        }
-        $sql= "SHOW TABLE STATUS FROM `$dbname` $like";
-        $result=$this->execQuery($sql);
-        if ($result) {
-
-            while ($rec = mysql_fetch_array($result)) {
-                $t+=($rec['Data_length'] + $rec['Index_length']);
-            }
-            $total = AJXP_Utils::roundSize($t);
-        } else {
-            $total="Unknown";
-        }
-        return($total);
-    }
-
-    public function getCount($tableName)
-    {
-        $sql = "SELECT count(*) FROM $tableName";
-        $result = $this->execQuery($sql);
-        $t = 0;
-        if ($result) {
-            while ($res = mysql_fetch_array($result)) {
-                $t+=$res[0];
-            }
-        }
-        return $t;
-    }
-
-    public function getColumnData($tableName, $columnName)
-    {
-        $sql = "SHOW COLUMNS FROM $tableName LIKE '$columnName'";
-        $res = $this->execQuery($sql);
-        if ($res) {
-            return mysql_fetch_array($res);
-            // ["Field", "Type", "Null", "Key", "Default", "Extra"] => Type is like "enum('a', 'b', 'c')"
-        }
-    }
-
-    public function makeColumnDef($row, $prefix="", $suffix="")
-    {
-        $defString = "";
-        if (isSet($row[$prefix."default".$suffix]) && trim($row[$prefix."default".$suffix]) != "") {
-            $defString = " DEFAULT ".$row[$prefix."default".$suffix];
-        }
-        $sizeString = ($row[$prefix."size".$suffix]!=""?"(".$row[$prefix."size".$suffix].")":"");
-        $fieldsDef = $row[$prefix."name".$suffix]." ".$row[$prefix."type".$suffix].$sizeString.$defString." ".$row[$prefix."null".$suffix]." ".$row[$prefix."flags".$suffix];
-        return trim($fieldsDef);
-    }
-
-    public function cleanFlagString($flagString)
-    {
-        $arr = explode(" ", $flagString);
-        $newFlags = array();
-        foreach ($arr as $flag) {
-            if ($flag == "primary_key" || $flag == "null" || $flag == "not_null") {
-                continue;
-            }
-            $newFlags[] = $flag;
-        }
-        return implode(" ", $newFlags);
-    }
-
-    public function sqlTypeToSortType($fieldType)
-    {
-        switch ($fieldType) {
-            case "int":
-                return "Number";
-            case "string":
-            case "datetime":
-            case "timestamp":
-                return "String";
-            case "blob":
-                return "NumberKo";
-            default:
-                return "String";
-        }
-    }
-    /*	<--- add a slash at the beggining of this line to switch between the 2 functions
-    public function listTables()
-    {
-        $repo = ConfService::getRepository();
-        $result = mysql_list_tables($repo->getOption("DB_NAME"));
-        $numtab = mysql_num_rows ($result);
-        $allTables = array();
-        for ($i =0; $i < $numtab; $i++) {
-            $table = trim(mysql_tablename($result, $i));
-            $allTables[] = $table;
-        }
-        return $allTables;
-    }
-    /*/
-    public function listTables()
-    {
-        $repo = ConfService::getRepository();
-        $result = mysql_query("SHOW TABLES FROM `".$repo->getOption("DB_NAME")."` LIKE '".$repo->getOption("DB_PTRN")."%'");
-        $allTables = array();
-        while ($row = mysql_fetch_row($result)) {
-           $allTables[] = $row[0];
-        }
-        return $allTables;
-    }
-    //*/
-
-    public function showRecords($query, $tablename, $currentPage=1, $rpp=50, $searchval='' )
-    {
-        $repo = ConfService::getRepository();
-        $dbname=$repo->getOption("DB_NAME");
-        $result=$this->execQuery($query);
-
-        $columns = array();
-        $rows = array();
-
-        //if(is_a($result, "AJXP_Exception")) return $result;
-
-        $num_rows = mysql_num_rows($result);
-        $pg=$currentPage-1;
-        if (isset($_POST['first'])) {
-            $pg=0;
-        } else if (isset($_POST['back'])) {
-            $pg=$pg-1;
-        } else if (isset($_POST['next'])) {
-            $pg++;
-        } else if (isset($_POST['last'])) {
-            $pgs = $num_rows/$rpp;
-            $pg=ceil($pgs)-1;
-        }
-        if ($pg < 0) {
-            $pg=0;
-        }
-        if ($pg > $num_rows/$rpp) {
-            $pg=ceil($num_rows/$rpp)-1;
-        }
-        $totalPages = ceil($num_rows/$rpp);
-        $beg = $pg * $rpp;
-
-        $flds = mysql_num_fields($result);
-        $fields = @mysql_list_fields( $dbname, $tablename);
-        if (!$fields) {
-            throw new AJXP_Exception("Non matching fields for table '$tablename'");
-        }
-        $z=0;
-        $x=0;
-        $pkfield=array();
-
-        // MAKE COLUMNS HEADER
-        for ($i = 0; $i < $flds; $i++) {
-            $c=$i+1;
-            $title=mysql_field_name($fields, $i);
-            $type=mysql_field_type($fields, $i);
-            $size=mysql_field_len($fields, $i);
-            $flagstring = mysql_field_flags ($fields, $i);
-            $colData = $this->getColumnData($tablename, $title);
-            $colDataType = $colData["Type"];
-            if (preg_match("/(.*)\((.*)\)/", $colDataType, $matches)) {
-                $type = $matches[1];
-                $size = $matches[2];
-            }
-            $columns[] = array("NAME" => $title, "TYPE"=>$type, "LENGTH"=>$size, "FLAGS"=>$flagstring, "DEFAULT"=>$colData["Default"]);
-
-            //Find the primary key
-            $flagstring = mysql_field_flags ($result, $i);
-            if (preg_match("/primary/",$flagstring )) {
-                $pk[$z] = $i;
-                $pkfield[$z]= mysql_field_name($fields, $i);
-                $z++;
-            }
-        }
-        $v=$flds+1;
-
-        if ($z > 0) {
-            $cpk=count($pk);
-        } else {
-            $cpk=0;
-        }
-
-        // MAKE ROWS RESULT
-        for ($s=$beg; $s < $beg + $rpp; $s++) {
-            if ($s < $num_rows) {
-                if (!mysql_data_seek ($result, $s)) {
-                    continue;
-                }
-                $row=mysql_fetch_array($result);
-                if (!isset($pk)) {
-                    $pk=' ';
-                    $pkfield= array();
-                }
-                $values = array();
-                for ($col = 0; $col < $flds; $col ++) {
-                    $values[mysql_field_name($fields, $col)] = stripslashes($row[$col]);
-                }
-                $rows[] = $values;
-            }
-        }
-
-        return array("COLUMNS" => $columns, "ROWS" => $rows, "HAS_PK"=>$cpk, "TOTAL_PAGES"=>$totalPages, "PK_FIELDS"=>$pkfield);
-    }
-
-
-    public function execQuery($sql ='')
-    {
-        $output='';
-        if ($sql !='') {
-            //$sql=mysql_real_escape_string($sql);
-            $result= @mysql_query(stripslashes($sql));
-            if ($result) {
-                $this->logInfo("exec", array($sql));
-                return $result;
-            } else {
-                throw new AJXP_Exception($sql.":".mysql_error());
-            }
-        } else {
-            throw new AJXP_Exception('Empty Query');
-        }
-    }
-
-
-}
diff --git a/core/src/plugins/access.mysql/manifest.xml b/core/src/plugins/access.mysql/manifest.xml
index ae9930cb1b..82d37dec45 100644
--- a/core/src/plugins/access.mysql/manifest.xml
+++ b/core/src/plugins/access.mysql/manifest.xml
@@ -22,7 +22,6 @@
         <external_file filename="plugins/access.fs/fsTemplatePart.xml" include="client_configs/*" exclude=""/>
 		<client_configs>
 			<template_part ajxpId="search_container" ajxpClass="SQLSearchEngine" ajxpOptions="{}"/>
-            <template_part ajxpId="search_container" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "fitMarginBottom":20}' theme="vision"/>
             <component_config className="InfoPanel">
 				<infoPanel mime="no_selection" attributes="">
 					<messages>
@@ -53,5 +52,5 @@
 			</component_config>
 		</client_configs>
 	</registry_contributions>
-	<class_definition filename="plugins/access.mysql/class.mysqlAccessDriver.php" classname="mysqlAccessDriver"/>
+	<class_definition filename="plugins/access.mysql/MysqlAccessDriver.php" classname="Pydio\Access\Driver\DataProvider\MysqlAccessDriver"/>
 </ajxpdriver>
diff --git a/core/src/plugins/access.mysql/resources/css/sqlEditor.css b/core/src/plugins/access.mysql/resources/css/sqlEditor.css
index 0fbccf291f..f49e5b10a6 100644
--- a/core/src/plugins/access.mysql/resources/css/sqlEditor.css
+++ b/core/src/plugins/access.mysql/resources/css/sqlEditor.css
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 .sqlForm input{
    width: 108px !important;
diff --git a/core/src/plugins/access.mysql/resources/i18n/conf/cs.php b/core/src/plugins/access.mysql/resources/i18n/conf/cs.php
index 3625cf8733..42d115e708 100644
--- a/core/src/plugins/access.mysql/resources/i18n/conf/cs.php
+++ b/core/src/plugins/access.mysql/resources/i18n/conf/cs.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Mysql Database" => "Databáze mysql",
diff --git a/core/src/plugins/access.mysql/resources/i18n/conf/de.php b/core/src/plugins/access.mysql/resources/i18n/conf/de.php
index 0b645ccace..c370a430b4 100644
--- a/core/src/plugins/access.mysql/resources/i18n/conf/de.php
+++ b/core/src/plugins/access.mysql/resources/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Mysql Database" => "Mysql-Datenbank",
diff --git a/core/src/plugins/access.mysql/resources/i18n/conf/en.php b/core/src/plugins/access.mysql/resources/i18n/conf/en.php
index 9af12df328..b93e625991 100644
--- a/core/src/plugins/access.mysql/resources/i18n/conf/en.php
+++ b/core/src/plugins/access.mysql/resources/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Mysql Database" => "Mysql Database",
diff --git a/core/src/plugins/access.mysql/resources/i18n/conf/fr.php b/core/src/plugins/access.mysql/resources/i18n/conf/fr.php
index 918abbbb14..6199b6006a 100644
--- a/core/src/plugins/access.mysql/resources/i18n/conf/fr.php
+++ b/core/src/plugins/access.mysql/resources/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Mysql Database" => "Base de données MySQL",
diff --git a/core/src/plugins/access.mysql/resources/i18n/conf/it.php b/core/src/plugins/access.mysql/resources/i18n/conf/it.php
index 49088e6dc0..f8af04a91c 100644
--- a/core/src/plugins/access.mysql/resources/i18n/conf/it.php
+++ b/core/src/plugins/access.mysql/resources/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Mysql Database" => "Mysql Database",
diff --git a/core/src/plugins/access.mysql/resources/i18n/conf/pt.php b/core/src/plugins/access.mysql/resources/i18n/conf/pt.php
index 61119fe882..64f37ae58c 100644
--- a/core/src/plugins/access.mysql/resources/i18n/conf/pt.php
+++ b/core/src/plugins/access.mysql/resources/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Mysql Database" => "Base de DadosMysql",
diff --git a/core/src/plugins/access.mysql/resources/i18n/cs.php b/core/src/plugins/access.mysql/resources/i18n/cs.php
index 277421c893..38e97a01fa 100644
--- a/core/src/plugins/access.mysql/resources/i18n/cs.php
+++ b/core/src/plugins/access.mysql/resources/i18n/cs.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "Vytvořit tabulku",
diff --git a/core/src/plugins/access.mysql/resources/i18n/de.php b/core/src/plugins/access.mysql/resources/i18n/de.php
index 1952b3eb7b..53f630e165 100644
--- a/core/src/plugins/access.mysql/resources/i18n/de.php
+++ b/core/src/plugins/access.mysql/resources/i18n/de.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "Tabelle erstellen",
diff --git a/core/src/plugins/access.mysql/resources/i18n/en.php b/core/src/plugins/access.mysql/resources/i18n/en.php
index efc5c4d279..4726d2f1a5 100644
--- a/core/src/plugins/access.mysql/resources/i18n/en.php
+++ b/core/src/plugins/access.mysql/resources/i18n/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "Create Table",
diff --git a/core/src/plugins/access.mysql/resources/i18n/es.php b/core/src/plugins/access.mysql/resources/i18n/es.php
index 7ceb6bd5d8..9b26bf108e 100644
--- a/core/src/plugins/access.mysql/resources/i18n/es.php
+++ b/core/src/plugins/access.mysql/resources/i18n/es.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "Crear Tabla",
diff --git a/core/src/plugins/access.mysql/resources/i18n/fi.php b/core/src/plugins/access.mysql/resources/i18n/fi.php
index 84895b779a..5688cbeb11 100644
--- a/core/src/plugins/access.mysql/resources/i18n/fi.php
+++ b/core/src/plugins/access.mysql/resources/i18n/fi.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
  //	Finnish translation by Aleksi Postari
 //	aleksi (at) postari.net
diff --git a/core/src/plugins/access.mysql/resources/i18n/fr.php b/core/src/plugins/access.mysql/resources/i18n/fr.php
index 4cec40456a..bbcb1e7225 100644
--- a/core/src/plugins/access.mysql/resources/i18n/fr.php
+++ b/core/src/plugins/access.mysql/resources/i18n/fr.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "Créer une table",
diff --git a/core/src/plugins/access.mysql/resources/i18n/it.php b/core/src/plugins/access.mysql/resources/i18n/it.php
index e65e8c06ca..fce0f7f8a2 100644
--- a/core/src/plugins/access.mysql/resources/i18n/it.php
+++ b/core/src/plugins/access.mysql/resources/i18n/it.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "Crea Tabella",
diff --git a/core/src/plugins/access.mysql/resources/i18n/pt.php b/core/src/plugins/access.mysql/resources/i18n/pt.php
index ae26253999..18991bbe6a 100644
--- a/core/src/plugins/access.mysql/resources/i18n/pt.php
+++ b/core/src/plugins/access.mysql/resources/i18n/pt.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "Criar Tabela",
diff --git a/core/src/plugins/access.mysql/resources/i18n/si.php b/core/src/plugins/access.mysql/resources/i18n/si.php
index d161bf4d13..0b9018bfcb 100644
--- a/core/src/plugins/access.mysql/resources/i18n/si.php
+++ b/core/src/plugins/access.mysql/resources/i18n/si.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 // Slovenian translation: April 21 2011 by Vladimir Bohinc (vladimir.bohinc@gmail.com)
 $mess=array(
diff --git a/core/src/plugins/access.mysql/resources/js/class.SQLEditor.js b/core/src/plugins/access.mysql/resources/js/class.SQLEditor.js
index 4e04d3df46..e676c6bd83 100644
--- a/core/src/plugins/access.mysql/resources/js/class.SQLEditor.js
+++ b/core/src/plugins/access.mysql/resources/js/class.SQLEditor.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 Class.create("SQLEditor", {
 
diff --git a/core/src/plugins/access.mysql/resources/js/class.SQLSearchEngine.js b/core/src/plugins/access.mysql/resources/js/class.SQLSearchEngine.js
index 1c2de129c9..0d8163e563 100644
--- a/core/src/plugins/access.mysql/resources/js/class.SQLSearchEngine.js
+++ b/core/src/plugins/access.mysql/resources/js/class.SQLSearchEngine.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  * Description : Extension of the SearchEngine class for SQL search.
  */
 Class.create("SQLSearchEngine", SearchEngine, {
diff --git a/core/src/plugins/access.remote_fs/additionalActions.xml b/core/src/plugins/access.remote_fs/additionalActions.xml
deleted file mode 100644
index 3343796b85..0000000000
--- a/core/src/plugins/access.remote_fs/additionalActions.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<driver name="remote_fs">
-	<actions uuidAttr="name">
-		<action name="next_to_remote">
-			<processing>
-				<serverCallback methodName="switchAction"></serverCallback>
-			</processing>
-		</action>
-		<action name="trigger_remote_copy">
-			<processing>
-				<serverCallback methodName="switchAction"></serverCallback>
-			</processing>
-		</action>
-	</actions>
-</driver>
diff --git a/core/src/plugins/access.remote_fs/class.remote_fsAccessDriver.php b/core/src/plugins/access.remote_fs/class.remote_fsAccessDriver.php
deleted file mode 100644
index 326cb02a29..0000000000
--- a/core/src/plugins/access.remote_fs/class.remote_fsAccessDriver.php
+++ /dev/null
@@ -1,393 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * AJXP_Plugin to access a remote server that implements Pydio API
- * @package AjaXplorer_Plugins
- * @subpackage Access
- */
-class remote_fsAccessDriver extends AbstractAccessDriver
-{
-    private $plugCapabilities = array();
-
-    public function init($repository, $options = array())
-    {
-        $repoCapabilities = $repository->getOption("API_CAPABILITIES");
-        if ($repoCapabilities != "") {
-            $this->plugCapabilities = explode(",", $repoCapabilities);
-            // Register one preprocessor per capability.
-            foreach ($this->plugCapabilities as $capability) {
-                $xml = '<action name="'.$capability.'"><pre_processing><serverCallback methodName="switchAction"/></pre_processing></action>';
-                $tmpDoc = new DOMDocument();
-                $tmpDoc->loadXML($xml);
-                $newNode = $this->manifestDoc->importNode($tmpDoc->documentElement, true);
-                $this->getXPath()->query("registry_contributions/actions")->item(0)->appendChild($newNode);
-            }
-        }
-        parent::init($repository, $options);
-    }
-
-    public function redirectActionsToMethod(&$contribNode, $arrayActions, $targetMethod)
-    {
-        $actionXpath=new DOMXPath($contribNode->ownerDocument);
-        foreach ($arrayActions as $index => $value) {
-            $arrayActions[$index] = 'action[@name="'.$value.'"]/processing/serverCallback';
-        }
-        $procList = $actionXpath->query(implode(" | ", $arrayActions), $contribNode);
-        foreach ($procList as $node) {
-            $node->setAttribute("methodName", $targetMethod);
-        }
-    }
-
-    /**
-     * Parse
-     * @param DOMNode $contribNode
-     */
-    protected function parseSpecificContributions(&$contribNode)
-    {
-        parent::parseSpecificContributions($contribNode);
-        if($contribNode->nodeName != "actions") return ;
-        $this->redirectActionsToMethod($contribNode, array("upload", "next_to_remote", "trigger_remote_copy"), "uploadActions");
-    }
-
-
-    public function switchAction($action, $httpVars, $filesVars)
-    {
-        $secureToken = "";
-        $crtRep = ConfService::getRepository();
-        $httpClient = $this->getRemoteConnexion($secureToken);
-        //$httpClient->setDebug(true);
-        $method = "get";
-        if($action == "put_content") $method = "post";
-        $httpVars["secure_token"] = $secureToken;
-        if ($method == "get") {
-            if ($action == "download") {
-                $httpClient->directForwarding = true;
-            }
-            $result = $httpClient->get($crtRep->getOption("URI"), $httpVars);
-        } else {
-            $result = $httpClient->post($crtRep->getOption("URI"), $httpVars);
-        }
-        // check if session is expired
-        if (strpos($httpClient->getHeader("content-type"), "text/xml") !== false && strpos($httpClient->getContent(), "require_auth") != false) {
-            $httpClient = $this->getRemoteConnexion($secureToken, true);
-            $httpVars["secure_token"] = $secureToken;
-            $method = "get";
-            if ($method == "get") {
-                if ($action == "download") {
-                    $httpClient->directForwarding = true;
-                }
-                $result = $httpClient->get($crtRep->getOption("URI"), $httpVars);
-            } else {
-                $result = $httpClient->post($crtRep->getOption("URI"), $httpVars);
-            }
-        }
-
-        if ($result === false && isSet($httpClient->errormsg)) {
-            throw new Exception(SystemTextEncoding::toUTF8($httpClient->errormsg));
-        }
-
-        switch ($action) {
-            case "download":
-                session_write_close();
-                exit();
-            break;
-            case "get_content":
-                header("Content-type:text/plain");
-            break;
-            case "stat":
-                header("Content-type:application/json");
-            break;
-            default:
-                $contentType = $httpClient->getHeader("content-type");
-                if (!isSet($contentType) || strlen($contentType) == 0) {
-                    $contentType = "text/xml";
-                }
-                header("Content-type: ".$contentType);
-            break;
-        }
-        print $httpClient->getContent();
-        session_write_close();
-        exit();
-    }
-
-    public function resetConnexionRepository($action, $httpVars, $params)
-    {
-        if ($action == "switch_repository") {
-            if (isSet($_SESSION["AJXP_REMOTE_SESSION"])) {
-                unset($_SESSION["AJXP_REMOTE_SESSION"]);
-            }
-        }
-    }
-
-    public function uploadActions($action, $httpVars, $filesVars)
-    {
-        switch ($action) {
-            case "trigger_remote_copy":
-                if(!$this->hasFilesToCopy()) break;
-                $toCopy = $this->getFileNameToCopy();
-                $this->logDebug("trigger_remote", $toCopy);
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::triggerBgAction("next_to_remote", array(), "Copying file ".$toCopy." to remote server");
-                AJXP_XMLWriter::close();
-                exit(1);
-            break;
-            case "next_to_remote":
-                if(!$this->hasFilesToCopy()) break;
-                $fData = $this->getNextFileToCopy();
-                $nextFile = '';
-                if ($this->hasFilesToCopy()) {
-                    $nextFile = $this->getFileNameToCopy();
-                }
-                $crtRep = ConfService::getRepository();
-                session_write_close();
-
-                $secureToken = "";
-                $httpClient = $this->getRemoteConnexion($secureToken);
-                //$httpClient->setDebug(true);
-                $postData = array(
-                    "get_action"=>"upload",
-                    "dir"=>base64_encode($fData["destination"]),
-                    "secure_token" => $secureToken
-                );
-
-                $httpClient->postFile($crtRep->getOption("URI")."?", $postData, "Filedata", $fData);
-                if (strpos($httpClient->getHeader("content-type"), "text/xml") !== false && strpos($httpClient->getContent(), "require_auth") != false) {
-                    $httpClient = $this->getRemoteConnexion($secureToken, true);
-                    $postData["secure_token"] = $secureToken;
-                    $httpClient->postFile($crtRep->getOption("URI"), $postData, "Filedata", $fData);
-                }
-                unlink($fData["tmp_name"]);
-                $response = $httpClient->getContent();
-                AJXP_XMLWriter::header();
-                $this->logDebug("next_to_remote", $nextFile);
-                if (intval($response)>=400) {
-                    AJXP_XMLWriter::sendMessage(null, "Error : ".intval($response));
-                } else {
-                    if ($nextFile!='') {
-                        AJXP_XMLWriter::triggerBgAction("next_to_remote", array(), "Copying file ".SystemTextEncoding::toUTF8($nextFile)." to remote server");
-                    } else {
-                        AJXP_XMLWriter::triggerBgAction("reload_node", array(), "Upload done, reloading client.");
-                    }
-                }
-                AJXP_XMLWriter::close();
-                exit(1);
-            break;
-            case "upload":
-
-                $rep_source = AJXP_Utils::securePath("/".$httpVars['dir']);
-                $this->logDebug("Upload : rep_source ", array($rep_source));
-                $logMessage = "";
-                foreach ($filesVars as $boxName => $boxData) {
-                    if(substr($boxName, 0, 9) != "userfile_")     continue;
-                    $this->logDebug("Upload : rep_source ", array($rep_source));
-                    $err = AJXP_Utils::parseFileDataErrors($boxData);
-                    if ($err != null) {
-                        $errorCode = $err[0];
-                        $errorMessage = $err[1];
-                        break;
-                    }
-                    $boxData["destination"] = $rep_source;
-                    $destCopy = AJXP_XMLWriter::replaceAjxpXmlKeywords($this->repository->getOption("TMP_UPLOAD"));
-                    $this->logDebug("Upload : tmp upload folder", array($destCopy));
-                    if (!is_dir($destCopy)) {
-                        if (! @mkdir($destCopy)) {
-                            $this->logDebug("Upload error : cannot create temporary folder", array($destCopy));
-                            $errorCode = 413;
-                            $errorMessage = "Warning, cannot create folder for temporary copy.";
-                            break;
-                        }
-                    }
-                    if (!is_writeable($destCopy)) {
-                        $this->logDebug("Upload error: cannot write into temporary folder");
-                        $errorCode = 414;
-                        $errorMessage = "Warning, cannot write into temporary folder.";
-                        break;
-                    }
-                    $this->logDebug("Upload : tmp upload folder", array($destCopy));
-                    if (isSet($boxData["input_upload"])) {
-                        try {
-                            $destName = tempnam($destCopy, "");
-                            $this->logDebug("Begining reading INPUT stream");
-                            $input = fopen("php://input", "r");
-                            $output = fopen($destName, "w");
-                            $sizeRead = 0;
-                            while ($sizeRead < intval($boxData["size"])) {
-                                $chunk = fread($input, 4096);
-                                $sizeRead += strlen($chunk);
-                                fwrite($output, $chunk, strlen($chunk));
-                            }
-                            fclose($input);
-                            fclose($output);
-                            $boxData["tmp_name"] = $destName;
-                            $this->storeFileToCopy($boxData);
-                            $this->logDebug("End reading INPUT stream");
-                        } catch (Exception $e) {
-                            $errorCode=411;
-                            $errorMessage = $e->getMessage();
-                            break;
-                        }
-                    } else {
-                        $destName = $destCopy."/".basename($boxData["tmp_name"]);
-                        if ($destName == $boxData["tmp_name"]) $destName .= "1";
-                        if (move_uploaded_file($boxData["tmp_name"], $destName)) {
-                            $boxData["tmp_name"] = $destName;
-                            $this->storeFileToCopy($boxData);
-                        } else {
-                            $mess = ConfService::getMessages();
-                            $errorCode = 411;
-                            $errorMessage="$mess[33] ".$boxData["name"];
-                            break;
-                        }
-                    }
-                }
-                if (isSet($errorMessage)) {
-                    $this->logDebug("Return error $errorCode $errorMessage");
-                    return array("ERROR" => array("CODE" => $errorCode, "MESSAGE" => $errorMessage));
-                } else {
-                    $this->logDebug("Return success");
-                    return array("SUCCESS" => true);
-                }
-
-                session_write_close();
-            break;
-            default:
-            break;
-        }
-
-    }
-
-    /**
-    * @return HttpClient
-    */
-    public function getRemoteConnexion(&$remoteSecureToken, $refreshSessId=false, $repository = null)
-    {
-        require_once(AJXP_BIN_FOLDER."/class.HttpClient.php");
-        if ($repository != null) {
-            $crtRep = $repository;
-        } else {
-            $crtRep = ConfService::getRepository();
-        }
-        $httpClient = new HttpClient($crtRep->getOption("HOST"));
-        $httpClient->cookie_host = $crtRep->getOption("HOST");
-        $httpClient->timeout = 10;
-        if (isSet($_SESSION["AJXP_REMOTE_SESSION"]) && is_array($_SESSION["AJXP_REMOTE_SESSION"])) {
-            $httpClient->setCookies($_SESSION["AJXP_REMOTE_SESSION"]);
-        }
-
-        //$httpClient->setDebug(true);
-        if (!isSet($_SESSION["AJXP_REMOTE_SECURE_TOKEN"])) {
-            $httpClient->get($crtRep->getOption("URI")."?get_action=get_secure_token");
-            $remoteSecureToken = $httpClient->getContent();
-            $_SESSION["AJXP_REMOTE_SECURE_TOKEN"] = $remoteSecureToken;
-        } else {
-            $remoteSecureToken = $_SESSION["AJXP_REMOTE_SECURE_TOKEN"];
-        }
-
-        if (!$crtRep->getOption("USE_AUTH")) {
-            return $httpClient;
-        }
-        $uri = "";
-        if ($crtRep->getOption("AUTH_URI") != "") {
-            $httpClient->setAuthorization($crtRep->getOption("AUTH_USER"), $crtRep->getOption("AUTH_PASS"));
-            $uri = $crtRep->getOption("AUTH_URI")."?secure_token=$remoteSecureToken";
-        }
-        if (!isSet($_SESSION["AJXP_REMOTE_SESSION"]) || !is_array($_SESSION["AJXP_REMOTE_SESSION"]) || $refreshSessId) {
-            if ($uri == "") {
-                $this->logDebug("Remote_fs : relog necessary");
-                // Retrieve a seed!
-                $httpClient->get($crtRep->getOption("URI")."?get_action=get_seed&secure_token=$remoteSecureToken");
-                $seed = $httpClient->getContent();
-                $cookies = $httpClient->getCookies();
-                if (isSet($cookies["AjaXplorer"])) {
-                    $_SESSION["AJXP_REMOTE_SESSION"] = $cookies;
-                }
-                $user = $crtRep->getOption("AUTH_USER");
-                $pass = $crtRep->getOption("AUTH_PASS");
-                $pass = md5(md5($pass).$seed);
-                $uri = $crtRep->getOption("URI")."?get_action=login&userid=".$user."&password=".$pass."&login_seed=$seed&secure_token=$remoteSecureToken";
-                $httpClient->get($uri);
-                $content = $httpClient->getContent();
-                $matches = array();
-                if (preg_match_all('#.*?secure_token="(.*?)".*?#s', $content, $matches)) {
-                    $remoteSecureToken = $matches[1][0];
-                    $_SESSION["AJXP_REMOTE_SECURE_TOKEN"] = $remoteSecureToken;
-                }
-                $httpClient->setHeadersOnly(false);
-            } else {
-                $httpClient->setHeadersOnly(true);
-                $httpClient->get($uri);
-                $httpClient->setHeadersOnly(false);
-            }
-            $cookies = $httpClient->getCookies();
-            $_SESSION["AJXP_REMOTE_SESSION"] = $httpClient->getCookies();
-        } else {
-            $httpClient->setCookies($_SESSION["AJXP_REMOTE_SESSION"]);
-        }
-        return $httpClient;
-    }
-
-    public static function isWriteable($path, $type="dir")
-    {
-        return is_writable($path);
-    }
-
-    public function storeFileToCopy($fileData)
-    {
-        $user = AuthService::getLoggedUser();
-        $files = $user->getTemporaryData("tmp_upload");
-        $files[] = $fileData;
-        $this->logDebug("Storing data", $fileData);
-        $user->saveTemporaryData("tmp_upload", $files);
-        if(AJXP_Utils::userAgentIsNativePydioApp()){
-            $this->logInfo("Up from", $_SERVER["HTTP_USER_AGENT"] ." - direct triger of next to remote");
-            $this->uploadActions("next_to_remote", array(), array());
-        }
-
-    }
-
-    public function getFileNameToCopy()
-    {
-        $user = AuthService::getLoggedUser();
-        $files = $user->getTemporaryData("tmp_upload");
-        return $files[0]["name"];
-    }
-
-    public function getNextFileToCopy()
-    {
-        if(!$this->hasFilesToCopy()) return "";
-        $user = AuthService::getLoggedUser();
-        $files = $user->getTemporaryData("tmp_upload");
-        $fData = $files[0];
-        array_shift($files);
-        $user->saveTemporaryData("tmp_upload", $files);
-        return $fData;
-    }
-
-    public function hasFilesToCopy()
-    {
-        $user = AuthService::getLoggedUser();
-        $files = $user->getTemporaryData("tmp_upload");
-        return (count($files)?true:false);
-    }
-
-}
diff --git a/core/src/plugins/access.remote_fs/class.remote_fsAccessWrapper.php b/core/src/plugins/access.remote_fs/class.remote_fsAccessWrapper.php
deleted file mode 100644
index 9267c04f0a..0000000000
--- a/core/src/plugins/access.remote_fs/class.remote_fsAccessWrapper.php
+++ /dev/null
@@ -1,297 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * AJXP_Plugin to access a remote server that implements Pydio API
- * @package AjaXplorer_Plugins
- * @subpackage Access
- */
-class remote_fsAccessWrapper implements AjxpWrapper
-{
-    // Instance vars $this->
-    protected $host;
-    protected $port;
-    protected $secure;
-    protected $path;
-    protected $user;
-    protected $password;
-    protected $repositoryId;
-    protected $fp;
-
-    protected $crtMode;
-    protected $crtParameters;
-    protected $postFileData;
-
-    public static function getRealFSReference($path, $persistent = FALSE)
-    {
-        $tmpFile = AJXP_Utils::getAjxpTmpDir()."/".md5(time());
-        $tmpHandle = fopen($tmpFile, "wb");
-        self::copyFileInStream($path, $tmpHandle);
-        fclose($tmpHandle);
-        if (!$persistent) {
-            register_shutdown_function(array("AJXP_Utils", "silentUnlink"), $tmpFile);
-        }
-        return $tmpFile;
-    }
-
-    public static function isRemote()
-    {
-        return true;
-    }
-
-    public static function copyFileInStream($path, $stream)
-    {
-        $fake = new remote_fsAccessWrapper();
-        $parts = $fake->parseUrl($path);
-        $client = $fake->createHttpClient();
-        $client->writeContentToStream($stream);
-        $client->get($fake->path."?get_action=get_content&file=".AJXP_Utils::securePath($parts["path"]));
-        $client->clearContentDestStream();
-    }
-
-    public function stream_open($url, $mode, $options, &$context)
-    {
-        if ($mode == "w" || $mode == "rw") {
-            $this->crtMode = 'write';
-            $parts = $this->parseUrl($url);
-            $this->crtParameters = array(
-                "get_action"=>"put_content",
-                "encode"	=> "base64",
-                "file" => urldecode(AJXP_Utils::securePath($parts["path"]))
-            );
-            $tmpFileBuffer = realpath(AJXP_Utils::getAjxpTmpDir()).md5(time());
-            $this->postFileData = $tmpFileBuffer;
-            $this->fp = fopen($tmpFileBuffer, "w");
-        } else {
-            $this->crtMode = 'read';
-            $this->fp = tmpfile();
-            $this->copyFileInStream($url, $this->fp);
-            rewind($this->fp);
-        }
-        return ($this->fp !== false);
-    }
-
-    public function stream_stat()
-    {
-        return fstat($this->fp);
-    }
-
-    public function stream_seek($offset , $whence = SEEK_SET)
-    {
-        fseek($this->fp, $offset, SEEK_SET);
-    }
-
-    public function stream_tell()
-    {
-        return ftell($this->fp);
-    }
-
-    public function stream_read($count)
-    {
-        return fread($this->fp, $count);
-    }
-
-    public function stream_write($data)
-    {
-        fwrite($this->fp, $data, strlen($data));
-        return strlen($data);
-    }
-
-    public function stream_eof()
-    {
-        return feof($this->fp);
-    }
-
-    public function stream_close()
-    {
-        if (isSet($this->fp) && $this->fp!=-1 && $this->fp!==false) {
-            fclose($this->fp);
-        }
-    }
-
-    public function stream_flush()
-    {
-        if (isSet($this->fp) && $this->fp!=-1 && $this->fp!==false) {
-            if ($this->crtMode == 'write') {
-                rewind($this->fp);
-                AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Http_fput", array("target"=>$this->path));
-                $link = $this->createHttpClient();
-                $this->crtParameters["content"] = base64_encode(implode("", file($this->postFileData)));
-                $link->post($this->path, $this->crtParameters);
-            } else {
-                fflush($this->fp);
-            }
-        }
-    }
-
-    public function url_stat($path, $flags)
-    {
-        $parts = $this->parseUrl($path);
-        $client = $this->createHttpClient();
-        $client->get($this->path."?get_action=stat&file=".AJXP_Utils::securePath($parts["path"]));
-        $json = $client->getContent();
-        $decode = json_decode($json, true);
-        return $decode;
-    }
-
-
-    // NOT IMPLEMENTED
-    public static function changeMode($path, $chmodValue)
-    {
-    }
-
-    public function unlink($url)
-    {
-    }
-
-    public function rmdir($url, $options)
-    {
-    }
-
-    public function mkdir($url, $mode, $options)
-    {
-    }
-
-    public function rename($from, $to)
-    {
-    }
-
-
-    public function dir_opendir ($url , $options )
-    {
-    }
-
-    public function dir_closedir  ()
-    {
-    }
-
-    public function dir_readdir ()
-    {
-    }
-
-    public function dir_rewinddir ()
-    {
-    }
-
-
-
-    protected function parseUrl($url)
-    {
-        // URL MAY BE ajxp.ftp://username:password@host/path
-        $urlParts = parse_url($url);
-        $this->repositoryId = $urlParts["host"];
-        $repository = ConfService::getRepositoryById($this->repositoryId);
-        // Get USER/PASS
-        // 1. Try from URL
-        if (isSet($urlParts["user"]) && isset($urlParts["pass"])) {
-            $this->user = $urlParts["user"];
-            $this->password = $urlParts["pass"];
-        }
-        // 2. Try from user wallet
-        if (!isSet($this->user) || $this->user=="") {
-            $loggedUser = AuthService::getLoggedUser();
-            if ($loggedUser != null) {
-                $wallet = $loggedUser->getPref("AJXP_WALLET");
-                if (is_array($wallet) && isSet($wallet[$this->repositoryId]["AUTH_USER"])) {
-                    $this->user = $wallet[$this->repositoryId]["AUTH_USER"];
-                    $this->password = AJXP_Utils::decypherStandardFormPassword($loggedUser->getId(), $wallet[$this->repositoryId]["AUTH_PASS"]);
-                }
-            }
-        }
-        // 3. Try from repository config
-        if (!isSet($this->user) || $this->user=="") {
-            $this->user = $repository->getOption("AUTH_USER");
-            $this->password = $repository->getOption("AUTH_PASS");
-        }
-        if (!isSet($this->user) || $this->user=="") {
-            throw new AJXP_Exception("Cannot find user/pass for Http access!");
-        }
-
-        $this->host = $repository->getOption("HOST");
-        $this->path = $repository->getOption("URI");
-        $this->auth_path = $repository->getOption("AUTH_URI");
-        $this->use_auth = $repository->getOption("USE_AUTH");
-
-        $urlParts["path"] = urlencode($urlParts["path"]);
-
-        return $urlParts;
-    }
-
-    /**
-     * Initialize and return the HttpClient
-     *
-     * @return HttpClient
-     */
-    protected function createHttpClient()
-    {
-        require_once(AJXP_BIN_FOLDER."/class.HttpClient.php");
-        $httpClient = new HttpClient($this->host);
-        $httpClient->cookie_host = $this->host;
-        $httpClient->timeout = 50;
-        AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Creating Http client", array());
-        //$httpClient->setDebug(true);
-        if (!$this->use_auth) {
-            return $httpClient;
-        }
-
-        $uri = "";
-        if ($this->auth_path != "") {
-            $httpClient->setAuthorization($this->user, $this->password);
-            $uri = $this->auth_path;
-        }
-        if (!isSet($_SESSION["AJXP_REMOTE_SESSION"])) {
-            if ($uri == "") {
-                // Retrieve a seed!
-                $httpClient->get($this->path."?get_action=get_seed");
-                $seed = $httpClient->getContent();
-                $user = $this->user;
-                $pass = $this->password;
-                $pass = md5(md5($pass).$seed);
-                $uri = $this->path."?get_action=login&userid=".$user."&password=".$pass."&login_seed=$seed";
-            }
-            $httpClient->setHeadersOnly(true);
-            $httpClient->get($uri);
-            $httpClient->setHeadersOnly(false);
-            $cookies = $httpClient->getCookies();
-            if (isSet($cookies["AjaXplorer"])) {
-                $_SESSION["AJXP_REMOTE_SESSION"] = $cookies["AjaXplorer"];
-                $remoteSessionId = $cookies["AjaXplorer"];
-            }
-        } else {
-            $remoteSessionId = $_SESSION["AJXP_REMOTE_SESSION"];
-            $httpClient->setCookies(array("AjaXplorer"=>$remoteSessionId));
-        }
-        AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Http Client created", array());
-        return $httpClient;
-    }
-
-
-    /**
-     * Describe whether the current wrapper can rewind a stream or not.
-     * @static
-     * @return boolean
-     */
-    public static function isSeekable($url)
-    {
-        return false;
-    }
-}
diff --git a/core/src/plugins/access.remote_fs/i18n/conf/de.php b/core/src/plugins/access.remote_fs/i18n/conf/de.php
deleted file mode 100644
index 0fee6c44a9..0000000000
--- a/core/src/plugins/access.remote_fs/i18n/conf/de.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Remote Server (via API)" => "Entfernter Server (via API)",
-"Access a remote server implementing the Pydio API (most commonly a remote server with another Pydio installed)" => "Über die Pydio-API auf einen entfernten Server zugreifen. (Idr. ein entfernter Server mit einer weiteren Pydio-Installation)",
-"Host" => "Host",
-"Domain name or IP to the remote server, without http" => "Domain-Name oder IP ohne http.",
-"Uri" => "Uri",
-"Path of the API implementor on the remote server." => "Pfad zur API-Implementierung.",
-"Remote Authentication" => "Authentifizierung nötig",
-"Whether we should authenticate to the remote server or not. If yes, will try to login as an Pydio user, or with standard http auth if Http Auth URI is set." => "Wird auf dem entfernten Server Authentifizierung verwendet. Wenn ja wird der Login mit einem Pydio-Benutzer oder über HTTP-Authentifizierung (wenn die HTTP-Authentifizierungs-URI gesetzt ist) versucht.",
-"Login" => "Benutzername",
-"Login for http authentication" => "Benutzername für HTTP-Authentifizierung",
-"Password" => "Passwort wählen",
-"Password for http authentication" => "Passwort für HTTP-Authentifizierung",
-"Http Auth URI" => "HTTP-Authentifizierungs-URI",
-"Path to the authentication script, e.g. /ajaxplorer/index.php (only if you are using basic http auth)" => "Pfad zum Authentifizierungs-Script z.B. /pydio/index.php (nur mit Standard-HTTP-Authentifizierung nötig)",
-"Temporary Folder" => "Temporäres Verzeichnis",
-"Temporary folder on the local server used for file uploads. For the moment, it must be placed under your ajaxplorer folder and you must create it and set it writeable by Apache." => "Temporäres Verzeichnis auf dem lokalen Server, das für Dateiuploads genutzt wird. Zurzeit muss es im Pydio-Verzeichnis auf dem lokalen Server erstellt und für Apache beschreibbar eingerichtet werden",
-"Api Capabilities" => "Api-Fähigkeiten",
-"Pydio plugins actions supported by remote server, thus forwarded directly instead of executed locally." => "Pydio-Erweiterungs-Aktionen, die der Server unterstützt. Diese Aktionen werden direkt weitergeleitet und nicht lokal ausgeführt.",
-);
diff --git a/core/src/plugins/access.remote_fs/i18n/conf/en.php b/core/src/plugins/access.remote_fs/i18n/conf/en.php
deleted file mode 100644
index 7cfe588ee8..0000000000
--- a/core/src/plugins/access.remote_fs/i18n/conf/en.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Remote Server (via API)" => "Remote Server (via API)",
-"Access a remote server implementing the Pydio API (most commonly a remote server with another Pydio installed)" => "Access a remote server implementing the Pydio API (most commonly a remote server with another Pydio installed)",
-"Host" => "Host",
-"Domain name or IP to the remote server, without http" => "Domain name or IP to the remote server, without http",
-"Uri" => "Uri",
-"Path of the API implementor on the remote server." => "Path of the API implementor on the remote server.",
-"Remote Authentication" => "Remote Authentication",
-"Whether we should authenticate to the remote server or not. If yes, will try to login as an Pydio user, or with standard http auth if Http Auth URI is set." => "Whether we should authenticate to the remote server or not. If yes, will try to login as an Pydio user, or with standard http auth if Http Auth URI is set.",
-"Login" => "Login",
-"Login for http authentication" => "Login for http authentication",
-"Password" => "Password",
-"Password for http authentication" => "Password for http authentication",
-"Http Auth URI" => "Http Auth URI",
-"Path to the authentication script, e.g. /ajaxplorer/index.php (only if you are using basic http auth)" => "Path to the authentication script, e.g. /ajaxplorer/index.php (only if you are using basic http auth)",
-"Temporary Folder" => "Temporary Folder",
-"Temporary folder on the local server used for file uploads. For the moment, it must be placed under your ajaxplorer folder and you must create it and set it writeable by Apache." => "Temporary folder on the local server used for file uploads. For the moment, it must be placed under your ajaxplorer folder and you must create it and set it writeable by Apache.",
-"Api Capabilities" => "Api Capabilities",
-"Pydio plugins actions supported by remote server, thus forwarded directly instead of executed locally." => "Pydio plugins actions supported by remote server, thus forwarded directly instead of executed locally.",
-);
diff --git a/core/src/plugins/access.remote_fs/i18n/conf/fr.php b/core/src/plugins/access.remote_fs/i18n/conf/fr.php
deleted file mode 100644
index 62ea67f4ab..0000000000
--- a/core/src/plugins/access.remote_fs/i18n/conf/fr.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Remote Server (via API)" => "Serveur distant (via API)",
-"Access a remote server implementing the Pydio API (most commonly a remote server with another Pydio installed)" => "Se connecter à un serveur distant implémentant l'API de Pydio (Généralement un serveur distant avec un autre Pydio installé)",
-"Host" => "Hôte",
-"Domain name or IP to the remote server, without http" => "Nom de domaine ou IP du serveur distant, sans http",
-"Uri" => "Uri",
-"Path of the API implementor on the remote server." => "Chemin relatif de l'installation sur le serveur distant.",
-"Remote Authentication" => "Authentification distante",
-"Whether we should authenticate to the remote server or not. If yes, will try to login as an Pydio user, or with standard http auth if Http Auth URI is set." => "Faut-il s'authentifier sur le serveur distant ? Si oui, tentative de connexion en tant qu'utilisateur Pydio, ou avec une authentification standard http si Http Auth est actif.",
-"Login" => "Identifiant",
-"Login for http authentication" => "Identifiant pour l'authentification http.",
-"Password" => "Mot de passe",
-"Password for http authentication" => "Mot de passe pour l'authentification http.",
-"Http Auth URI" => "URI Http Auth",
-"Path to the authentication script, e.g. /ajaxplorer/index.php (only if you are using basic http auth)" => "Chemin du script d'authentification, tel /pydio/index.php (uniquement si vous utilisez l'authentification basique http)",
-"Temporary Folder" => "Répertoire temporaire",
-"Temporary folder on the local server used for file uploads. For the moment, it must be placed under your ajaxplorer folder and you must create it and set it writeable by Apache." => "Répertoire local utilisé pour l'envoi des fichiers. Actuellement, il doit-être placé dans le répertoire de Pydio, vous devez le créer et autoriser Apache à y écrire.",
-"Api Capabilities" => "Capacités de l'Api",
-"Pydio plugins actions supported by remote server, thus forwarded directly instead of executed locally." => "Liste des actions (plugins Pydio) supportées par le serveur distant, auquel elles seront transférées directement au lieu d'être exécutées localement.",
-);
diff --git a/core/src/plugins/access.remote_fs/i18n/conf/it.php b/core/src/plugins/access.remote_fs/i18n/conf/it.php
deleted file mode 100644
index da2ce93312..0000000000
--- a/core/src/plugins/access.remote_fs/i18n/conf/it.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Remote Server (via API)" => "Server Remoto (con API)",
-"Access a remote server implementing the Pydio API (most commonly a remote server with another Pydio installed)" => "Accedi ad un server remoto usando le API Pydio (molto comunemente un server remoto con un altro Pydio installato)",
-"Host" => "Host",
-"Domain name or IP to the remote server, without http" => "Nome del dominio o IP del server remoto, senza 'http'",
-"Uri" => "Uri",
-"Path of the API implementor on the remote server." => "Percorso dell'implementatore delle API sul server remoto.",
-"Remote Authentication" => "Autenticazione Remota",
-"Whether we should authenticate to the remote server or not. If yes, will try to login as an Pydio user, or with standard http auth if Http Auth URI is set." => "È necessario autenticarsi sul server remoto o no? Se SI, verrà tentata un'autenticazione come utente Pydio o tramite autenticazione HTTP di base, se l'AUTH URI è specificato.",
-"Login" => "Login",
-"Login for http authentication" => "Login per autenticazione HTTP",
-"Password" => "Password",
-"Password for http authentication" => "Password per autenticazione HTTP",
-"Http Auth URI" => "Http Auth URI",
-"Path to the authentication script, e.g. /ajaxplorer/index.php (only if you are using basic http auth)" => "Percorso dello script di autenticazione. Per esempio, /ajaxplorer/index.php (solo se si sta utilizzando l'autenticazione di base HTTP)",
-"Temporary Folder" => "Cartella Temporanea",
-"Temporary folder on the local server used for file uploads. For the moment, it must be placed under your ajaxplorer folder and you must create it and set it writeable by Apache." => "Cartella temporanea sul server locale usata per l'upload dei file. Al momento, deve trovarsi all'interno della cartella di Pydio ed è necessario crearla e renderla accessibile da Apache.",
-"Api Capabilities" => "Funzionalità API",
-"Pydio plugins actions supported by remote server, thus forwarded directly instead of executed locally." => "Azioni dei plugins Pydio supportate dal server remoto, quindi trasmesse direttamente al posto di essere eseguite localmente.",
-);
diff --git a/core/src/plugins/access.remote_fs/i18n/conf/pt.php b/core/src/plugins/access.remote_fs/i18n/conf/pt.php
deleted file mode 100644
index ab7659bff7..0000000000
--- a/core/src/plugins/access.remote_fs/i18n/conf/pt.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Remote Server (via API)" => "Servidor Remoto (com API)",
-"Access a remote server implementing the Pydio API (most commonly a remote server with another Pydio installed)" => "Acesso a um servidor Remoto usando a API do AjaxPlorer (Mais comummente um servidor remoto com Pydio instalado)",
-"Host" => "Anfitrião",
-"Domain name or IP to the remote server, without http" => "Nome do Domínio ou IP do servidor remoto, sem http",
-"Uri" => "Uri",
-"Path of the API implementor on the remote server." => "Caminho para o implementador de API do servidor remoto.",
-"Remote Authentication" => "Autenticação Remota",
-"Whether we should authenticate to the remote server or not. If yes, will try to login as an Pydio user, or with standard http auth if Http Auth URI is set." => "Caso devamos ou não autenticar-nos no servidor remoto. Caso sim, iremos tentar fazer login utilizando o utilizador Pydio ou simplesmente com o método de autenticação padrão http caso a URI esteja definida.",
-"Login" => "Login",
-"Login for http authentication" => "Login a ser usado para a autenticação http",
-"Password" => "Palavra-Chave",
-"Password for http authentication" => "Palavra-Chave para a Autenticação http",
-"Http Auth URI" => "URI de autenticação http",
-"Path to the authentication script, e.g. /ajaxplorer/index.php (only if you are using basic http auth)" => "Caminho para o script de autenticação, ex.: /ajaxplorer/index.php (apenas se estiver a usar autenticação http básica)",
-"Temporary Folder" => "Pasta Temporária",
-"Temporary folder on the local server used for file uploads. For the moment, it must be placed under your ajaxplorer folder and you must create it and set it writeable by Apache." => "Pasta Temporária no servidor Local usada para o envio de ficheiros. De momento, esta deverá ser colocada dentro da pasta do Pydio, e ter as respectivas permissões de escrita por parte do Apache.",
-"Api Capabilities" => "Capacidades da API",
-"Pydio plugins actions supported by remote server, thus forwarded directly instead of executed locally." => "As acções dos plugins Pydio suportadas pelo servidor remoto, sendo estas redireccionadas directamente para o servidor remoto em vez de tratadas localmente.",
-);
diff --git a/core/src/plugins/access.remote_fs/manifest.xml b/core/src/plugins/access.remote_fs/manifest.xml
deleted file mode 100644
index 00e4230a7b..0000000000
--- a/core/src/plugins/access.remote_fs/manifest.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ajxpdriver name="remote_fs" enabled="false" label="CONF_MESSAGE[Remote Server (via API)]" description="CONF_MESSAGE[Access a remote server implementing the Pydio API (most commonly a remote server with another Pydio installed)]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-	<client_settings icon="plugins/access.remote_fs/remote_fs_icon.png" description_template="{HOST}{URI}" iconClass="icon-sitemap">
-        <resources>
-            <i18n namespace="remote_fs_access" path="plugins/access.remote_fs/i18n"/>
-        </resources>
-    </client_settings>
-
-	<server_settings>
-		<param name="HOST" type="string" label="CONF_MESSAGE[Host]" description="CONF_MESSAGE[Domain name or IP to the remote server, without http]" mandatory="true"/>
-		<param name="URI" type="string" label="CONF_MESSAGE[Uri]" description="CONF_MESSAGE[Path of the API implementor on the remote server.]" default="/ajaxplorer/content.php" mandatory="true"/>
-		<param name="USE_AUTH" type="boolean" label="CONF_MESSAGE[Remote Authentication]" description="CONF_MESSAGE[Whether we should authenticate to the remote server or not. If yes, will try to login as an Pydio user, or with standard http auth if Http Auth URI is set.]" default="true" mandatory="true"/>
-		<param name="AUTH_USER" type="string" label="CONF_MESSAGE[Login]" description="CONF_MESSAGE[Login for http authentication]" mandatory="false"/>
-		<param name="AUTH_PASS" type="string" label="CONF_MESSAGE[Password]" description="CONF_MESSAGE[Password for http authentication]" mandatory="false"/>
-		<param name="AUTH_URI" type="string" label="CONF_MESSAGE[Http Auth URI]" description="CONF_MESSAGE[Path to the authentication script, e.g. /ajaxplorer/index.php (only if you are using basic http auth)]" default="" mandatory="false"/>
-		<param name="TMP_UPLOAD" type="string" label="CONF_MESSAGE[Temporary Folder]" description="CONF_MESSAGE[Temporary folder on the local server used for file uploads. For the moment, it must be placed under your ajaxplorer folder and you must create it and set it writeable by Apache.]" default="tmp" mandatory="true"/>
-		<param name="API_CAPABILITIES" type="string" label="CONF_MESSAGE[Api Capabilities]" description="CONF_MESSAGE[Pydio plugins actions supported by remote server, thus forwarded directly instead of executed locally.]" default="" mandatory="false"/>
-	</server_settings>
-	<registry_contributions>
-        <external_file filename="plugins/access.fs/fsTemplatePart.xml" include="client_configs/*" exclude=""/>
-		<client_configs>
-			<template_part ajxpId="search_container" ajxpClass="SearchEngine" ajxpOptions="{}"/>
-            <template_part ajxpId="search_container" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "fitMarginBottom":20}' theme="vision"/>
-            <template_part ajxpId="search_container" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "openSearchInput":"true", "openSearchStickLeftTo":"topPane", "searchChooserAsResultsHeader":true, "toggleResultsFitTo":"cpane_tabs", "fitMarginBottom":0, "toggleResultsOffsetRight":0, "toggleResultsOffsetTop":0, "detailThumbSize":24}' theme="orbit"/>
-            <component_config className="FilesList">
-				<columns switchGridMode="filelist">
-					<column messageId="1" attributeName="ajxp_label"/>
-					<column messageId="2" attributeName="filesize"/>
-					<column messageId="3" attributeName="mimestring"/>
-					<column messageId="4" attributeName="ajxp_modiftime"/>
-				</columns>
-			</component_config>
-		</client_configs>
-		<external_file filename="plugins/access.fs/fsActions.xml" include="actions/*" exclude=""/>
-		<external_file filename="plugins/access.fs/fsActions.xml" include="client_configs/*"/>
-        <external_file filename="plugins/access.fs/manifest.xml" include="registry_contributions/hooks/*" exclude=""/>
-		<external_file filename="plugins/access.remote_fs/additionalActions.xml" include="actions/*"/>
-		<actions uuidAttr="name">
-			<action name="switch_repository">
-				<post_processing>
-					<serverCallback methodName="resetConnexionRepository"></serverCallback>
-				</post_processing>
-			</action>
-		</actions>
-	</registry_contributions>
-	<class_definition filename="plugins/access.remote_fs/class.remote_fsAccessDriver.php" classname="remote_fsAccessDriver"/>
-	<dependencies>
-		<pluginClass pluginName="access.fs"/>
-	</dependencies>
-    <class_stream_wrapper filename="plugins/access.remote_fs/class.remote_fsAccessWrapper.php" classname="remote_fsAccessWrapper" protocol="ajxp.remotefs"/>
-</ajxpdriver>
diff --git a/core/src/plugins/access.remote_fs/plugin_doc.html b/core/src/plugins/access.remote_fs/plugin_doc.html
deleted file mode 100644
index 745b24e60a..0000000000
--- a/core/src/plugins/access.remote_fs/plugin_doc.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<p>This plugin makes Pydio act as a simple proxy to himself, and can be in someway faster than the remote_ftp, if you want to manage various repositories located on various server that all have an web access. In a standard installation, Pydio is always composed of a client part (the AjaX interface) and a server part accessing the files (via the access.fs plugin generally). The idea here is to install the " server part " on the remote server, and " a proxy " and " client part " on the local server, the proxy being in fact a server configured with remote_fs. Except for installation and users management ease, you could in fact remove the whole " client " folder of the remote server Pydio installation. The server part can even be something totally different that is simply implementing Pydio API.</p>
-
-<p>The " client " can authenticate to the " server " via two ways : either by transmitting an Pydio user, or by using http authentication. See the parameters description for more detail.</p>
\ No newline at end of file
diff --git a/core/src/plugins/access.remote_fs/remote_fs_icon.png b/core/src/plugins/access.remote_fs/remote_fs_icon.png
deleted file mode 100644
index 1cda508fc4..0000000000
Binary files a/core/src/plugins/access.remote_fs/remote_fs_icon.png and /dev/null differ
diff --git a/core/src/plugins/access.s3/ForcePathStyleListener.php b/core/src/plugins/access.s3/ForcePathStyleListener.php
index 1fba1391ec..cf9e3b119a 100644
--- a/core/src/plugins/access.s3/ForcePathStyleListener.php
+++ b/core/src/plugins/access.s3/ForcePathStyleListener.php
@@ -25,8 +25,9 @@
  *
  * Original Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  */
-namespace Aws\S3;
+namespace Pydio\Access\Driver\StreamProvider\S3;
 
+use \Aws\S3\S3Client;
 use Guzzle\Common\Event;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
@@ -37,6 +38,9 @@ class ForcePathStyleStyleListener implements EventSubscriberInterface
 {
     private static $exclusions = array('GetBucketLocation' => true);
 
+    /**
+     * @return array
+     */
     public static function getSubscribedEvents()
     {
         return array('command.after_prepare' => array('onCommandAfterPrepare', -255));
diff --git a/core/src/plugins/access.s3/S3AccessDriver.php b/core/src/plugins/access.s3/S3AccessDriver.php
new file mode 100644
index 0000000000..c723873ce9
--- /dev/null
+++ b/core/src/plugins/access.s3/S3AccessDriver.php
@@ -0,0 +1,209 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ *
+ */
+namespace Pydio\Access\Driver\StreamProvider\S3;
+
+use DOMNode;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\RecycleBinManager;
+
+use Pydio\Access\Driver\StreamProvider\FS\FsAccessDriver;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Exception\PydioException;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Plugin to access a webdav enabled server
+ * @package AjaXplorer_Plugins
+ * @subpackage Access
+ */
+class S3AccessDriver extends FsAccessDriver
+{
+    /**
+    * @var \Pydio\Access\Core\Model\Repository
+    */
+    public $repository;
+    public $driverConf;
+    protected $wrapperClassName;
+    protected $urlBase;
+    protected $s3Client;
+
+    public function performChecks()
+    {
+        // Check CURL, OPENSSL & AWS LIBRARY
+        if(!extension_loaded("curl")) throw new \Exception("Cannot find php_curl extension!");
+        if(!file_exists($this->getBaseDir()."/aws.phar")) throw new \Exception("Cannot find AWS PHP SDK v2. Make sure the aws.phar package is installed inside access.s3 plugin.");
+    }
+
+    /**
+     * @param ContextInterface $contextInterface
+     * @throws PydioException
+     * @throws \Exception
+     */
+    protected function initRepository(ContextInterface $contextInterface)
+    {
+
+        if (is_array($this->pluginConf)) {
+            $this->driverConf = $this->pluginConf;
+        } else {
+            $this->driverConf = array();
+        }
+
+        $recycle = $contextInterface->getRepository()->getContextOption($contextInterface, "RECYCLE_BIN");
+        ConfService::setConf("PROBE_REAL_SIZE", false);
+        $this->urlBase = $contextInterface->getUrlBase();
+
+        if ($recycle!= "" && !is_dir($contextInterface->getUrlBase(). "/" . $recycle . "/")) {
+            @mkdir($contextInterface->getUrlBase(). "/" . $recycle . "/", 0777, true);
+            if(!is_dir($contextInterface->getUrlBase(). "/" . $recycle . "/")) {
+                throw new PydioException("Cannot create recycle bin folder. Please check repository configuration or that your folder is writeable!");
+            } else {
+                $this->setHiddenAttribute(new AJXP_Node($contextInterface->getUrlBase(). "/" . $recycle . "/"));
+            }
+        }
+
+        if ($recycle != "") {
+            RecycleBinManager::init($contextInterface->getUrlBase(), "/".$recycle);
+        }
+    }
+
+    /**
+     * @return Aws\Common\Client\AbstractClient
+     */
+    public function getS3Service(){
+        return $this->s3Client;
+    }
+
+    /**
+     * @param AJXP_Node $node
+     * @return int
+     */
+    public function directoryUsage(AJXP_Node $node){
+        $client = $this->getS3Service();
+        $bucket = $node->getRepository()->getContextOption($node->getContext(), "CONTAINER"); //(isSet($repositoryResolvedOptions["CONTAINER"])?$repositoryResolvedOptions["CONTAINER"]:$this->repository->getOption("CONTAINER"));
+        $path   = rtrim($node->getRepository()->getContextOption($node->getContext(), "PATH"), "/").$node->getPath(); //(isSet($repositoryResolvedOptions["PATH"])?$repositoryResolvedOptions["PATH"]:"");
+        $objects = $client->getIterator('ListObjects', array(
+            'Bucket' => $bucket,
+            'Prefix' => $path
+        ));
+
+        $usage = 0;
+        foreach ($objects as $object) {
+            $usage += (double)$object['Size'];
+        }
+        return $usage;
+
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function parseSpecificContributions(ContextInterface $ctx, \DOMNode &$contribNode)
+    {
+        parent::parseSpecificContributions($ctx, $contribNode);
+        if($contribNode->nodeName != "actions") return ;
+        $this->disableArchiveBrowsingContributions($contribNode);
+    }
+
+    /**
+     * We have to overwrite original FS function as S3 wrapper does not support "a+" open mode.
+     *
+     * @param String $folder Folder destination
+     * @param String $source Maybe updated by the function
+     * @param String $target Existing part to append data
+     * @return bool If the target file already existed or not.
+     * @throws \Exception
+     */
+    protected function appendUploadedData($folder, $source, $target){
+
+        $already_existed = false;
+        if($source == $target){
+            throw new \Exception("Something nasty happened: trying to copy $source into itself, it will create a loop!");
+        }
+        // S3 does not really support append. Let's grab the remote target first.
+        if (file_exists($folder ."/" . $target)) {
+            $already_existed = true;
+            $this->logDebug("Should copy stream from $source to $target - folder is ($folder)");
+            $partO = fopen($folder."/".$source, "r");
+            $appendF = fopen($folder ."/". $target, 'a');
+            while (!feof($partO)) {
+                $buf = fread($partO, 1024);
+                fwrite($appendF, $buf);
+            }
+            fclose($partO);
+            fclose($appendF);
+            $this->logDebug("Done, closing streams!");
+        }
+        @unlink($folder."/".$source);
+        return $already_existed;
+
+    }
+
+
+    /**
+     * @param AJXP_Node $dir
+     * @param string $type
+     * @return bool
+     */
+    public function isWriteable(AJXP_Node $node)
+    {
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public static function isRemote()
+    {
+        return true;
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $ajxpNode
+     * @param bool $parentNode
+     * @param bool $details
+     * @return void
+     */
+    public function loadNodeInfo(&$node, $parentNode = false, $details = false)
+    {
+        parent::loadNodeInfo($node, $parentNode, $details);
+        if (!$node->isLeaf()) {
+            $node->setLabel(rtrim($node->getLabel(), "/"));
+        }
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $httpVars
+     * @return array
+     * @throws \Exception
+     */
+    public function makeSharedRepositoryOptions(ContextInterface $ctx, $httpVars)
+    {
+        $newOptions                 = parent::makeSharedRepositoryOptions($ctx, $httpVars);
+        $newOptions["CONTAINER"]    = "AJXP_PARENT_OPTION:CONTAINER"; //$ctx->getRepository()->getContextOption($ctx, "CONTAINER");
+        
+        return $newOptions;
+    }
+
+}
diff --git a/core/src/plugins/access.s3/S3AccessWrapper.php b/core/src/plugins/access.s3/S3AccessWrapper.php
new file mode 100644
index 0000000000..522314deff
--- /dev/null
+++ b/core/src/plugins/access.s3/S3AccessWrapper.php
@@ -0,0 +1,415 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ *
+ */
+namespace Pydio\Access\Driver\StreamProvider\S3;
+
+use Pydio\Access\Core\Model\AJXP_Node;
+
+use Pydio\Access\Driver\StreamProvider\FS\FsAccessWrapper;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\FileHelper;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+require_once(AJXP_INSTALL_PATH . "/plugins/access.fs/FsAccessWrapper.php");
+
+
+/**
+ * Encapsulation of the PEAR webDAV client
+ * @package AjaXplorer_Plugins
+ * @subpackage Access
+ */
+class S3AccessWrapper extends FsAccessWrapper
+{
+    public static $lastException;
+    protected static $clients = [];
+
+    /**
+     * @param AJXP_Node $node
+     * @return array
+     */
+    public static function getResolvedOptionsForNode($node)
+    {
+        $context = $node->getContext();
+        $repository = $node->getRepository();
+
+        $options = [
+            "TYPE" => "s3"
+        ];
+        $optKeys = ["API_KEY", "SECRET_KEY", "CONTAINER", "SIGNATURE_VERSION", "STORAGE_URL", "REGION", "PROXY", "API_VERSION", "VHOST_NOT_SUPPORTED"];
+        foreach($optKeys as $key){
+            $options[$key] = $repository->getContextOption($context, $key);
+        }
+        if(empty($options["API_VERSION"])) {
+            $options["API_VERSION"] = "latest";
+        }
+        return $options;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param boolean $registerStream
+     * @return S3Client
+     */
+    protected static function getClientForContext(ContextInterface $ctx, $registerStream = true)
+    {
+        $repoObject = $ctx->getRepository();
+        if (!isSet(self::$clients[$repoObject->getId()])) {
+            // Get a client
+            $options = array(
+                'key'       => $repoObject->getContextOption($ctx, "API_KEY"),
+                'secret'    => $repoObject->getContextOption($ctx, "SECRET_KEY")
+            );
+            $signatureVersion = $repoObject->getContextOption($ctx, "SIGNATURE_VERSION");
+            if (!empty($signatureVersion)) {
+                $options['signature'] = $signatureVersion;
+            }
+            $apiVersion = $repoObject->getContextOption($ctx, "API_VERSION");
+            if ($apiVersion === "") {
+                $apiVersion = "latest";
+            }
+            $config = [
+                "version" => $apiVersion,
+                "credentials" => $options
+            ];
+            $region = $repoObject->getContextOption($ctx, "REGION");
+            if (!empty($region)) {
+                $config["region"] = $region;
+            }
+            $proxy = $repoObject->getContextOption($ctx, "PROXY");
+            if (!empty($proxy)) {
+                $config['http'] = array('proxy' => $proxy);
+            }
+            $baseURL = $repoObject->getContextOption($ctx, "STORAGE_URL");
+            if (!empty($baseURL)) {
+                $config["endpoint"] = $baseURL;
+            }
+            require_once("S3Client.php");
+            $s3Client = new S3Client($config);
+            $s3Client->registerStreamWrapper($repoObject->getId());
+            self::$clients[$repoObject->getId()] = $s3Client;
+        }
+        return self::$clients[$repoObject->getId()];
+    }
+
+    /**
+     * Initialize the stream from the given path.
+     * Concretely, transform ajxp.s3:// into s3://
+     *
+     * @param string $path
+     * @param $streamType
+     * @param bool $storeOpenContext
+     * @param bool $skipZip
+     * @return mixed Real path or -1 if currentListing contains the listing : original path converted to real path
+     * @throws \Exception
+     */
+    protected static function initPath($path, $streamType, $storeOpenContext = false, $skipZip = false)
+    {
+        $url        = parse_url($path);
+        $node       = new AJXP_Node($path);
+        $repoId     = $node->getRepositoryId();
+        $repoObject = $node->getRepository();
+        if (!isSet($repoObject)) {
+            $e = new \Exception("Cannot find repository with id " . $repoId);
+            self::$lastException = $e;
+            throw $e;
+        }
+        // Make sure to register s3:// wrapper
+        $client = self::getClientForContext($node->getContext(), true);
+        $protocol = "s3://";
+        if ($client instanceof S3Client) {
+            $protocol = "s3." . $repoId . "://";
+        }
+        $basePath       = $repoObject->getContextOption($node->getContext(), "PATH");
+        $baseContainer  = $repoObject->getContextOption($node->getContext(), "CONTAINER");
+        if (!empty($basePath)) {
+            $baseContainer .= rtrim($basePath, "/");
+        }
+        $p = $protocol . $baseContainer . str_replace("//", "/", $url["path"]);
+        return $p;
+    }
+
+    /**
+     * Opens the stream
+     * Diff with parent class : do not "securePath", as it removes double slash
+     *
+     * @param String $path Maybe in the form "ajxp.fs://repositoryId/pathToFile"
+     * @param String $mode
+     * @param string $options
+     * @param resource $context
+     * @return resource
+     * @internal param string $opened_path
+     */
+    public function stream_open($path, $mode, $options, &$context)
+    {
+        try {
+            $this->realPath = $this->initPath($path, "file");
+        } catch (\Exception $e) {
+            Logger::error(__CLASS__, "stream_open", "Error while opening stream $path");
+            return false;
+        }
+        if ($this->realPath == -1) {
+            $this->fp = -1;
+            return true;
+        } else {
+            $this->fp = fopen($this->realPath, $mode, $options);
+            return ($this->fp !== false);
+        }
+    }
+
+    /**
+     * Stats the given path.
+     * Fix PEAR by adding S_ISREG mask when file case.
+     *
+     * @param string $path
+     * @param integer $flags
+     * @return array
+     */
+    public function url_stat($path, $flags)
+    {
+        // File and zip case
+        // AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Stating $path");
+        $stat = @stat($this->initPath($path, "file"));
+        if ($stat == null) return null;
+        if ($stat["mode"] == 0666) {
+            $stat[2] = $stat["mode"] |= 0100000; // S_ISREG
+        }
+        if($stat["mode"] === 0040777){
+            $node       = new AJXP_Node($path);
+            $ctx = $node->getContext();
+            $repoObject = $node->getRepository();
+            $result = $this->getClientForContext($ctx)->listObjects([
+                'Bucket'  => $repoObject->getContextOption($ctx, "CONTAINER"),
+                'Prefix'  => ltrim($node->getPath(), "/"). '/',
+                'MaxKeys' => 1
+            ]);
+            if (isSet($result['Contents']) && isSet($result['Contents'][0]['LastModified'])) {
+                $stat = $this->statForDir($result['Contents'][0]['LastModified']);
+            }
+
+        }
+        return $stat;
+    }
+
+    /**
+     * @param $lastModified
+     * @return array
+     */
+    protected function statForDir($lastModified){
+        $time = strtotime($lastModified);
+        return [
+            0  => 0,  'dev'     => 0,
+            1  => 0,  'ino'     => 0,
+            2  => 0040777,  'mode'    => 0040777,
+            3  => 0,  'nlink'   => 0,
+            4  => 0,  'uid'     => 0,
+            5  => 0,  'gid'     => 0,
+            6  => -1, 'rdev'    => -1,
+            7  => 0,  'size'    => 0,
+            8  => $time,  'atime'   => $time,
+            9  => $time,  'mtime'   => $time,
+            10 => $time,  'ctime'   => $time,
+            11 => -1, 'blksize' => -1,
+            12 => -1, 'blocks'  => -1,
+        ];
+
+    }
+
+    /**
+     * Opens a handle to the dir
+     * Fix PEAR by being sure it ends up with "/", to avoid
+     * adding the current dir to the children list.
+     *
+     * @param string $path
+     * @param string $options
+     * @return resource
+     */
+    public function dir_opendir($path, $options)
+    {
+        $this->realPath = $this->initPath($path, "dir", true);
+        if ($this->realPath[strlen($this->realPath) - 1] != "/") {
+            $this->realPath .= "/";
+        }
+        if (is_string($this->realPath)) {
+            $this->dH = @opendir($this->realPath);
+        } else if ($this->realPath == -1) {
+            $this->dH = -1;
+        }
+        return $this->dH !== false;
+    }
+
+
+    /**
+     * DUPLICATE STATIC FUNCTIONS TO BE SURE
+     * NOT TO MESS WITH self:: CALLS
+     * @param $tmpDir
+     * @param $tmpFile
+     */
+    public static function removeTmpFile($tmpDir, $tmpFile)
+    {
+        if (is_file($tmpFile)) unlink($tmpFile);
+        if (is_dir($tmpDir)) rmdir($tmpDir);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getRealFSReference($path, $persistent = false)
+    {
+        $tmpFile = ApplicationState::getAjxpTmpDir() . "/" . md5(time()) . "." . pathinfo($path, PATHINFO_EXTENSION);
+        $tmpHandle = fopen($tmpFile, "wb");
+        self::copyFileInStream($path, $tmpHandle);
+        fclose($tmpHandle);
+        if (!$persistent) {
+            register_shutdown_function(function () use ($tmpFile) {
+                FileHelper::silentUnlink($tmpFile);
+            });
+        }
+        return $tmpFile;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function isRemote()
+    {
+        return true;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function copyFileInStream($path, $stream)
+    {
+        Logger::debug(__CLASS__, __FUNCTION__, "Should load " . $path);
+        $fp = fopen($path, "r");
+        if (!is_resource($fp)) return;
+        while (!feof($fp)) {
+            $data = fread($fp, 4096);
+            fwrite($stream, $data, strlen($data));
+        }
+        fclose($fp);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function changeMode($path, $chmodValue)
+    {
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rename($from, $to)
+    {
+
+        $node = new AJXP_Node($from);
+        $ctx = $node->getContext();
+        $repoObject = $node->getRepository();
+        if (!isSet($repoObject)) {
+            $e = new \Exception("Cannot find repository with id " . $node->getRepositoryId());
+            self::$lastException = $e;
+            throw $e;
+        }
+
+        $isViPR = $repoObject->getContextOption($ctx, "IS_VIPR");
+        $isDir = false;
+        if ($isViPR === true) {
+            if (is_dir($from . "/")) {
+                $from .= '/';
+                $to .= '/';
+                $isDir = true;
+            }
+        }
+
+        if ($isDir === true || is_dir($from)) {
+            Logger::debug(__CLASS__, __FUNCTION__, "S3 Renaming dir $from to $to");
+            $s3Client = self::getClientForContext($node->getContext(), false);
+            $bucket = $repoObject->getContextOption($ctx, "CONTAINER");
+            $basePath = $repoObject->getContextOption($ctx, "PATH");
+            $fromKeyname = trim(str_replace("//", "/", $basePath . parse_url($from, PHP_URL_PATH)), '/');
+            $toKeyname = trim(str_replace("//", "/", $basePath . parse_url($to, PHP_URL_PATH)), '/');
+            if ($isViPR) {
+                $toKeyname .= '/';
+                $parts = explode('/', $bucket);
+                $bucket = $parts[0];
+                if (isset($parts[1])) {
+                    $fromKeyname = $parts[1] . "/" . $fromKeyname;
+                }
+            }
+
+            // Perform a batch of CopyObject operations.
+            $batch = array();
+            $failed = array();
+            $iterator = $s3Client->getIterator('ListObjects', array(
+                'Bucket' => $bucket,
+                'Prefix' => $fromKeyname . "/"
+            ));
+            $toDelete = array();
+            Logger::debug(__CLASS__, __FUNCTION__, "S3 Got iterator looking for prefix " . $fromKeyname . "/ , and toKeyName=" . $toKeyname);
+            foreach ($iterator as $object) {
+
+                $currentFrom = $object['Key'];
+                $currentTo = $toKeyname . substr($currentFrom, strlen($fromKeyname));
+                if ($isViPR) {
+                    if (isset($parts[1])) {
+                        $currentTo = $parts[1] . "/" . $currentTo;
+                    }
+                }
+                Logger::debug(__CLASS__, __FUNCTION__, "S3 Should move one object " . $currentFrom . " to  new key :" . $currentTo);
+                $batch[] = $s3Client->getCommand('CopyObject', array(
+                    'Bucket' => $bucket,
+                    'Key' => "{$currentTo}",
+                    'CopySource' => "{$bucket}/" . rawurlencode($currentFrom),
+                ));
+                $toDelete[] = $currentFrom;
+            }
+            Logger::debug(__CLASS__, __FUNCTION__, "S3 Execute batch on " . count($batch) . " objects");
+            foreach ($batch as $command) {
+                $successful = $s3Client->execute($command);
+            }
+            //We must delete the "/" in $fromKeyname because we want to delete the folder
+            $clear = \Aws\S3\BatchDelete::fromIterator($s3Client, $bucket, $s3Client->getIterator('ListObjects', array(
+                'Bucket' => $bucket,
+                'Prefix' => $fromKeyname
+            )));
+            $clear->delete();
+
+            if (count($failed)) {
+                foreach ($failed as $c) {
+                    // $c is a Aws\S3\Command\S3Command
+                    Logger::error("S3Wrapper", __FUNCTION__, "Error while copying: " . $c->getOperation()->getServiceDescription());
+                }
+                self::$lastException = new \Exception("Failed moving folder: " . count($failed));
+                return false;
+            }
+            return true;
+        } else {
+            Logger::debug(__CLASS__, __FUNCTION__, "S3 Execute standard rename on " . $from . " to " . $to);
+            return parent::rename($from, $to);
+        }
+    }
+
+}
diff --git a/core/src/plugins/access.s3/S3CacheService.php b/core/src/plugins/access.s3/S3CacheService.php
new file mode 100644
index 0000000000..4086bc3d7f
--- /dev/null
+++ b/core/src/plugins/access.s3/S3CacheService.php
@@ -0,0 +1,66 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ *
+ */
+namespace Pydio\Access\Driver\StreamProvider\S3;
+
+use Pydio\Core\Services\CacheService;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Class S3CacheService
+ * Pydio Connector between AWS Cache and pydio CacheService
+ * @package Pydio\Access\Driver\StreamProvider\S3
+ */
+class S3CacheService implements \Aws\CacheInterface
+{
+    /**
+     * Get a cache item by key.
+     *
+     * @param string $key Key to retrieve.
+     *
+     * @return mixed|null Returns the value or null if not found.
+     */
+    public function get($key) {
+        return  CacheService::fetch(AJXP_CACHE_SERVICE_NS_NODES, $key);
+    }
+
+    /**
+     * Set a cache key value.
+     *
+     * @param string $key   Key to set
+     * @param mixed  $value Value to set.
+     * @param int    $ttl   Number of seconds the item is allowed to live. Set
+     *                      to 0 to allow an unlimited lifetime.
+     */
+    public function set($key, $value, $ttl = 0) {
+        CacheService::save(AJXP_CACHE_SERVICE_NS_NODES, $key, $value, $ttl);
+    }
+
+    /**
+     * Remove a cache key.
+     *
+     * @param string $key Key to remove.
+     */
+    public function remove($key) {
+        CacheService::delete(AJXP_CACHE_SERVICE_NS_NODES, $key);
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/access.s3/S3Client.php b/core/src/plugins/access.s3/S3Client.php
new file mode 100755
index 0000000000..cc1fae96b7
--- /dev/null
+++ b/core/src/plugins/access.s3/S3Client.php
@@ -0,0 +1,44 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ *
+ */
+namespace Pydio\Access\Driver\StreamProvider\S3;
+use Aws\S3\S3Client as AwsS3Client;
+use Aws\S3\StreamWrapper;
+
+require_once __DIR__ . DIRECTORY_SEPARATOR . "S3CacheService.php";
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Class S3Client
+ * @package Pydio\Access\Driver\StreamProvider\S3
+ */
+class S3Client extends AwsS3Client
+{
+    /**
+     * Register a new stream wrapper who overwrite the Amazon S3 stream wrapper with this client instance.
+     * @param string $repositoryId
+     * @return $this|void
+     */
+    public function registerStreamWrapper($repositoryId)
+    {
+        StreamWrapper::register($this, "s3.".$repositoryId, new S3CacheService());
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/access.s3/class.pydioS3Client.php b/core/src/plugins/access.s3/class.pydioS3Client.php
deleted file mode 100755
index 5219fa76b3..0000000000
--- a/core/src/plugins/access.s3/class.pydioS3Client.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/*
- * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- */
-namespace AccessS3;
-use Aws\S3\S3Client as AwsS3Client;
-use Aws\S3\StreamWrapper;
-require_once __DIR__ . DIRECTORY_SEPARATOR . "class.s3CacheService.php";
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Class S3Client
- * @package AccessS3
- */
-class S3Client extends AwsS3Client
-{
-    /**
-     * Register a new stream wrapper who overwrite the Amazon S3 stream wrapper with this client instance.
-     * @param string $repositoryId
-     * @return $this|void
-     */
-    public function registerStreamWrapper($repositoryId)
-    {
-        /* S3Client + s3 protocol +  cacheInterface */
-        StreamWrapper::register($this, "s3.".$repositoryId, new s3CacheService());
-    }
-}
\ No newline at end of file
diff --git a/core/src/plugins/access.s3/class.s3AccessDriver.php b/core/src/plugins/access.s3/class.s3AccessDriver.php
deleted file mode 100755
index 9d31e6f8cf..0000000000
--- a/core/src/plugins/access.s3/class.s3AccessDriver.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-require_once(AJXP_BIN_FOLDER . '/guzzle/vendor/autoload.php');
-
-/**
- * AJXP_Plugin to access a webdav enabled server
- * @package AjaXplorer_Plugins
- * @subpackage Access
- */
-class s3AccessDriver extends fsAccessDriver
-{
-    /**
-    * @var Repository
-    */
-    public $repository;
-    public $driverConf;
-    protected $wrapperClassName;
-    protected $urlBase;
-    protected $s3Client;
-
-    public function performChecks()
-    {
-        // Check CURL, OPENSSL & AWS LIBRARY
-        if(!extension_loaded("curl")) throw new Exception("Cannot find php_curl extension!");
-        if(!file_exists($this->getBaseDir()."/aws.phar")) throw new Exception("Cannot find AWS PHP SDK v2. Make sure the aws.phar package is installed inside access.s3 plugin.");
-    }
-
-    /**
-     * @param bool $register
-     * @return array|bool|void
-     * Override parent to register underlying wrapper (s3) as well
-     */
-    public function detectStreamWrapper($register = false){
-        /*
-        if(isSet($this->repository)){
-            require_once("aws.phar");
-            $options = array(
-                'key'    => $this->repository->getOption("API_KEY"),
-                'secret' => $this->repository->getOption("SECRET_KEY"),
-            );
-            $signatureVersion = $this->repository->getOption("SIGNATURE_VERSION");
-            if(!empty($signatureVersion) && $signatureVersion != "-1"){
-                $options['signature'] = $signatureVersion;
-            }
-            $baseURL = $this->repository->getOption("STORAGE_URL");
-            if(!empty($baseURL)){
-                $options["base_url"] = $baseURL;
-            }
-            $region = $this->repository->getOption("REGION");
-            if(!empty($region)){
-                $options["region"] = $region;
-            }
-            $proxy = $this->repository->getOption("PROXY");
-            if(!empty($proxy)){
-                $options['request.options'] = array('proxy' => $proxy);
-            }
-            $apiVersion = $this->repository->getOption("API_VERSION");
-            if ($apiVersion === "") {
-                $apiVersion = "latest";
-            }
-            $sdkVersion = $this->getFilteredOption("SDK_VERSION");
-            if ($sdkVersion === "v3") {
-                require_once ("class.pydioS3Client.php");
-                $this->s3Client = new AccessS3\S3Client([
-                    "version" => $apiVersion,
-                    "region"  => $region,
-                    "credentials" => $options
-                ]);
-            } else {
-                $this->s3Client = Aws\S3\S3Client::factory($options);
-                if($this->repository->getOption("VHOST_NOT_SUPPORTED")){
-                    // Use virtual hosted buckets when possible
-                    require_once("ForcePathStyleListener.php");
-                    $this->s3Client->addSubscriber(new \Aws\S3\ForcePathStyleStyleListener());
-                }
-            }
-
-
-            $this->s3Client->registerStreamWrapper();
-        }
-        */
-        return parent::detectStreamWrapper($register);
-    }
-
-    public function initRepository()
-    {
-        $this->detectStreamWrapper(true);
-
-        if (is_array($this->pluginConf)) {
-            $this->driverConf = $this->pluginConf;
-        } else {
-            $this->driverConf = array();
-        }
-
-        $recycle = $this->repository->getOption("RECYCLE_BIN");
-        ConfService::setConf("PROBE_REAL_SIZE", false);
-        $this->urlBase = "pydio://".$this->repository->getId();
-
-        if ($recycle!= "" && !is_dir($this->urlBase. "/" . $recycle . "/")) {
-            @mkdir($this->urlBase. "/" . $recycle . "/", 0777, true);
-            if(!is_dir($this->urlBase. "/" . $recycle . "/")) {
-                throw new AJXP_Exception("Cannot create recycle bin folder. Please check repository configuration or that your folder is writeable!");
-            } else {
-                $this->setHiddenAttribute(new AJXP_Node($this->urlBase. "/" . $recycle . "/"));
-            }
-        }
-
-        if ($recycle != "") {
-            RecycleBinManager::init($this->urlBase, "/".$recycle);
-        }
-    }
-
-    /**
-     * @return Aws\Common\Client\AbstractClient
-     */
-    public function getS3Service(){
-        return $this->s3Client;
-    }
-
-    /**
-     * @param String $directoryPath
-     * @param Repository $repositoryResolvedOptions
-     * @return int
-     */
-    public function directoryUsage($directoryPath, $repositoryResolvedOptions){
-        $client = $this->getS3Service();
-        $bucket = (isSet($repositoryResolvedOptions["CONTAINER"])?$repositoryResolvedOptions["CONTAINER"]:$this->repository->getOption("CONTAINER"));
-        $path   = (isSet($repositoryResolvedOptions["PATH"])?$repositoryResolvedOptions["PATH"]:"");
-        $objects = $client->getIterator('ListObjects', array(
-            'Bucket' => $bucket,
-            'Prefix' => $path
-        ));
-
-        $usage = 0;
-        foreach ($objects as $object) {
-            $usage += (double)$object['Size'];
-        }
-        return $usage;
-
-    }
-
-        /**
-     * Parse
-     * @param DOMNode $contribNode
-     */
-    protected function parseSpecificContributions(&$contribNode)
-    {
-        parent::parseSpecificContributions($contribNode);
-        if($contribNode->nodeName != "actions") return ;
-        $this->disableArchiveBrowsingContributions($contribNode);
-    }
-
-    /**
-     * We have to overwrite original FS function as S3 wrapper does not support "a+" open mode.
-     *
-     * @param String $folder Folder destination
-     * @param String $source Maybe updated by the function
-     * @param String $target Existing part to append data
-     * @return bool If the target file already existed or not.
-     * @throws Exception
-     */
-    protected function appendUploadedData($folder, $source, $target){
-
-        $already_existed = false;
-        if($source == $target){
-            throw new Exception("Something nasty happened: trying to copy $source into itself, it will create a loop!");
-        }
-        // S3 does not really support append. Let's grab the remote target first.
-        if (file_exists($folder ."/" . $target)) {
-            $already_existed = true;
-            $this->logDebug("Should copy stream from $source to $target - folder is ($folder)");
-            $partO = fopen($folder."/".$source, "r");
-            $appendF = fopen($folder ."/". $target, 'a');
-            while (!feof($partO)) {
-                $buf = fread($partO, 1024);
-                fwrite($appendF, $buf);
-            }
-            fclose($partO);
-            fclose($appendF);
-            $this->logDebug("Done, closing streams!");
-        }
-        @unlink($folder."/".$source);
-        return $already_existed;
-
-    }
-
-
-    public function isWriteable($dir, $type="dir")
-    {
-        return true;
-    }
-
-    public static function isRemote()
-    {
-        return true;
-    }
-
-    public function loadNodeInfo(&$node, $parentNode = false, $details = false)
-    {
-        parent::loadNodeInfo($node, $parentNode, $details);
-        if (!$node->isLeaf()) {
-            $node->setLabel(rtrim($node->getLabel(), "/"));
-        }
-    }
-
-    public function makeSharedRepositoryOptions($httpVars, $repository)
-    {
-        $newOptions = parent::makeSharedRepositoryOptions($httpVars, $repository);
-        $newOptions["CONTAINER"] = $this->repository->getOption("CONTAINER");
-        return $newOptions;
-    }
-
-}
diff --git a/core/src/plugins/access.s3/class.s3AccessWrapper.php b/core/src/plugins/access.s3/class.s3AccessWrapper.php
deleted file mode 100755
index 1b44ac8ab2..0000000000
--- a/core/src/plugins/access.s3/class.s3AccessWrapper.php
+++ /dev/null
@@ -1,378 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-require_once(AJXP_INSTALL_PATH."/plugins/access.fs/class.fsAccessWrapper.php");
-
-/**
- * Encapsulation of the PEAR webDAV client
- * @package AjaXplorer_Plugins
- * @subpackage Access
- */
-class s3AccessWrapper extends fsAccessWrapper
-{
-    public static $lastException;
-    protected static $clients = [];
-
-    /**
-     * @param Repository $repoObject
-     * @param boolean $registerStream
-     * @return \AccessS3\S3Client
-     */
-    protected static function getClientForRepository($repoObject, $registerStream = true)
-    {
-        require_once("aws.phar");
-        if (!isSet(self::$clients[$repoObject->getId()])) {
-            // Get a client
-            $options = array(
-                'key' => $repoObject->getOption("API_KEY"),
-                'secret' => $repoObject->getOption("SECRET_KEY")
-            );
-            $signatureVersion = $repoObject->getOption("SIGNATURE_VERSION");
-            if (!empty($signatureVersion)) {
-                $options['signature'] = $signatureVersion;
-            }
-            $baseURL = $repoObject->getOption("STORAGE_URL");
-            if (!empty($baseURL)) {
-                $options["base_url"] = $baseURL;
-            }
-            $region = $repoObject->getOption("REGION");
-            if (!empty($region)) {
-                $options["region"] = $region;
-            }
-            $proxy = $repoObject->getOption("PROXY");
-            if (!empty($proxy)) {
-                $options['request.options'] = array('proxy' => $proxy);
-            }
-            $apiVersion = $repoObject->getOption("API_VERSION");
-            if ($apiVersion === "") {
-                $apiVersion = "latest";
-            }
-            //SDK_VERSION IS A GLOBAL PARAM
-            ConfService::getConfStorageImpl()->_loadPluginConfig("access.s3", $globalOptions);
-            $sdkVersion = $globalOptions["SDK_VERSION"]; //$repoObject->driverInstance->driverConf['SDK_VERSION'];
-            if ($sdkVersion !== "v2" && $sdkVersion !== "v3") {
-                $sdkVersion = "v2";
-            }
-            if ($sdkVersion === "v3") {
-                require_once(__DIR__ . DIRECTORY_SEPARATOR . "class.pydioS3Client.php");
-                $s3Client = new \AccessS3\S3Client([
-                    "version" => $apiVersion,
-                    "region" => $region,
-                    "credentials" => $options
-                ]);
-                $s3Client->registerStreamWrapper($repoObject->getId());
-            } else {
-                $s3Client = Aws\S3\S3Client::factory($options);
-                if ($repoObject->getOption("VHOST_NOT_SUPPORTED")) {
-                    // Use virtual hosted buckets when possible
-                    require_once("ForcePathStyleListener.php");
-                    $s3Client->addSubscriber(new \Aws\S3\ForcePathStyleStyleListener());
-                }
-                $s3Client->registerStreamWrapper();
-            }
-            self::$clients[$repoObject->getId()] = $s3Client;
-        }
-        return self::$clients[$repoObject->getId()];
-    }
-
-    /**
-     * Initialize the stream from the given path.
-     * Concretely, transform ajxp.s3:// into s3://
-     *
-     * @param string $path
-     * @param $streamType
-     * @param bool $storeOpenContext
-     * @param bool $skipZip
-     * @return mixed Real path or -1 if currentListing contains the listing : original path converted to real path
-     * @throws Exception
-     */
-    protected static function initPath($path, $streamType, $storeOpenContext = false, $skipZip = false)
-    {
-        $url = parse_url($path);
-        $repoId = $url["host"];
-        $repoObject = ConfService::getRepositoryById($repoId);
-        if (!isSet($repoObject)) {
-            $e = new Exception("Cannot find repository with id ".$repoId);
-            self::$lastException = $e;
-            throw $e;
-        }
-        // Make sure to register s3:// wrapper
-        $client = self::getClientForRepository($repoObject, true);
-        $protocol = "s3://";
-        if ($client instanceof \AccessS3\S3Client) {
-            $protocol = "s3." . $repoId . "://";
-        }
-        $basePath = $repoObject->getOption("PATH");
-        $baseContainer = $repoObject->getOption("CONTAINER");
-        if(!empty($basePath)){
-            $baseContainer.=rtrim($basePath, "/");
-        }
-        $p = $protocol . $baseContainer . str_replace("//", "/", $url["path"]);
-        return $p;
-    }
-
-    /**
-     * Opens the stream
-     * Diff with parent class : do not "securePath", as it removes double slash
-     *
-     * @param String $path Maybe in the form "ajxp.fs://repositoryId/pathToFile"
-     * @param String $mode
-     * @param string $options
-     * @param resource $context
-     * @return resource
-     * @internal param string $opened_path
-     */
-    public function stream_open($path, $mode, $options, &$context)
-    {
-        try {
-            $this->realPath = $this->initPath($path, "file");
-        } catch (Exception $e) {
-            AJXP_Logger::error(__CLASS__,"stream_open", "Error while opening stream $path");
-            return false;
-        }
-        if ($this->realPath == -1) {
-            $this->fp = -1;
-            return true;
-        } else {
-            $this->fp = fopen($this->realPath, $mode, $options);
-            return ($this->fp !== false);
-        }
-    }
-
-    /**
-     * Stats the given path.
-     * Fix PEAR by adding S_ISREG mask when file case.
-     *
-     * @param string $path
-     * @param integer $flags
-     * @return array
-     */
-    public function url_stat($path, $flags)
-    {
-        // File and zip case
-        // AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Stating $path");
-        $stat = @stat($this->initPath($path, "file"));
-        if($stat == null) return null;
-        if ($stat["mode"] == 0666) {
-            $stat[2] = $stat["mode"] |= 0100000; // S_ISREG
-        }
-
-        $parsed = parse_url($path);
-        if ($stat["mtime"] == $stat["ctime"]  && $stat["ctime"] == $stat["atime"] && $stat["atime"] == 0 && $parsed["path"] != "/") {
-            //AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Nullifying stats");
-            //return null;
-        }
-        return $stat;
-    }
-
-    /**
-     * Opens a handle to the dir
-     * Fix PEAR by being sure it ends up with "/", to avoid
-     * adding the current dir to the children list.
-     *
-     * @param string $path
-     * @param string $options
-     * @return resource
-     */
-    public function dir_opendir ($path , $options )
-    {
-        $this->realPath = $this->initPath($path, "dir", true);
-        if ($this->realPath[strlen($this->realPath)-1] != "/") {
-            $this->realPath.="/";
-        }
-        if (is_string($this->realPath)) {
-            $this->dH = @opendir($this->realPath);
-        } else if ($this->realPath == -1) {
-            $this->dH = -1;
-        }
-        return $this->dH !== false;
-    }
-
-
-    // DUPBLICATE STATIC FUNCTIONS TO BE SURE
-    // NOT TO MESS WITH self:: CALLS
-
-    public static function removeTmpFile($tmpDir, $tmpFile)
-    {
-        if(is_file($tmpFile)) unlink($tmpFile);
-        if(is_dir($tmpDir)) rmdir($tmpDir);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public static function getRealFSReference($path, $persistent = false)
-    {
-        $tmpFile = AJXP_Utils::getAjxpTmpDir()."/".md5(time()).".".pathinfo($path, PATHINFO_EXTENSION);
-           $tmpHandle = fopen($tmpFile, "wb");
-           self::copyFileInStream($path, $tmpHandle);
-           fclose($tmpHandle);
-           if (!$persistent) {
-               register_shutdown_function(array("AJXP_Utils", "silentUnlink"), $tmpFile);
-           }
-           return $tmpFile;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public static function isRemote()
-    {
-        return true;
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public static function copyFileInStream($path, $stream)
-    {
-        AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Should load ".$path);
-        $fp = fopen($path, "r");
-        if(!is_resource($fp)) return;
-        while (!feof($fp)) {
-            $data = fread($fp, 4096);
-            fwrite($stream, $data, strlen($data));
-        }
-        fclose($fp);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public static function changeMode($path, $chmodValue)
-    {
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function rename($from, $to)
-    {
-
-        $fromUrl = parse_url($from);
-        $repoId = $fromUrl["host"]; 
-        $repoObject = ConfService::getRepositoryById($repoId);
-        $isViPR = $repoObject->getOption("IS_VIPR");
-        $isDir = false;
-        if($isViPR === true) {
-            if(is_dir($from . "/")) {
-                $from .= '/';
-                $to .= '/';
-                $isDir = true;
-            }
-        }
-
-        if($isDir === true || is_dir($from)){
-            AJXP_Logger::debug(__CLASS__, __FUNCTION__, "S3 Renaming dir $from to $to");
-            require_once("aws-v2.phar");
-
-            $fromUrl = parse_url($from);
-            $repoId = $fromUrl["host"];
-            $repoObject = ConfService::getRepositoryById($repoId);
-            if (!isSet($repoObject)) {
-                $e = new Exception("Cannot find repository with id ".$repoId);
-                self::$lastException = $e;
-                throw $e;
-            }
-            $s3Client = self::getClientForRepository($repoObject, false);
-            $bucket = $repoObject->getOption("CONTAINER");
-            $basePath = $repoObject->getOption("PATH");
-            $fromKeyname   = trim(str_replace("//", "/", $basePath.parse_url($from, PHP_URL_PATH)),'/');
-            $toKeyname   = trim(str_replace("//", "/", $basePath.parse_url($to, PHP_URL_PATH)), '/');
-            if($isViPR) {
-                $toKeyname .= '/';
-                $parts = explode('/', $bucket);
-                $bucket = $parts[0];
-                if(isset($parts[1])) {
-                    $fromKeyname = $parts[1] . "/" . $fromKeyname;
-                }
-            }
-
-            // Perform a batch of CopyObject operations.
-            $batch = array();
-            $failed = array();
-            $iterator = $s3Client->getIterator('ListObjects', array(
-                'Bucket'     => $bucket,
-                'Prefix'     => $fromKeyname."/"
-            ));
-            $toDelete = array();
-            AJXP_Logger::debug(__CLASS__, __FUNCTION__, "S3 Got iterator looking for prefix ".$fromKeyname."/ , and toKeyName=".$toKeyname);
-            foreach ($iterator as $object) {
-
-                $currentFrom = $object['Key'];
-                $currentTo = $toKeyname.substr($currentFrom, strlen($fromKeyname));
-                if($isViPR) {
-                    if(isset($parts[1])) {
-                        $currentTo = $parts[1] . "/" . $currentTo;
-                    }
-                }
-                AJXP_Logger::debug(__CLASS__, __FUNCTION__, "S3 Should move one object ".$currentFrom. " to  new key :".$currentTo);
-                $batch[] = $s3Client->getCommand('CopyObject', array(
-                    'Bucket'     => $bucket,
-                    'Key'        => "{$currentTo}",
-                    'CopySource' => "{$bucket}/".rawurlencode($currentFrom),
-                ));
-                $toDelete[] = $currentFrom;
-            }
-            AJXP_Logger::debug(__CLASS__, __FUNCTION__, "S3 Execute batch on ".count($batch)." objects");
-            ConfService::getConfStorageImpl()->_loadPluginConfig("access.s3", $globalOptions);
-            $sdkVersion = $globalOptions["SDK_VERSION"];
-            if ($sdkVersion === "v3") {
-                foreach ($batch as $command) {
-                    $successful = $s3Client->execute($command);
-                }
-                //We must delete the "/" in $fromKeyname because we want to delete the folder
-                $clear = \Aws\S3\BatchDelete::fromIterator($s3Client, $bucket, $s3Client->getIterator('ListObjects', array(
-                    'Bucket'     => $bucket,
-                    'Prefix'     => $fromKeyname
-                )));
-                $clear->delete();
-            } else {
-                try {
-                    $successful = $s3Client->execute($batch);
-                    $clear = new \Aws\S3\Model\ClearBucket($s3Client, $bucket);
-                    $iterator->rewind();
-                    $clear->setIterator($iterator);
-                    $clear->clear();
-                    $failed = array();
-                } catch (\Guzzle\Service\Exception\CommandTransferException $e) {
-                    $successful = $e->getSuccessfulCommands();
-                    $failed = $e->getFailedCommands();
-                }
-            }
-            if(count($failed)){
-                foreach($failed as $c){
-                    // $c is a Aws\S3\Command\S3Command
-                    AJXP_Logger::error("S3Wrapper", __FUNCTION__, "Error while copying: ".$c->getOperation()->getServiceDescription());
-                }
-                self::$lastException = new Exception("Failed moving folder: ".count($failed));
-                return false;
-            }
-            return true;
-        }else{
-            AJXP_Logger::debug(__CLASS__, __FUNCTION__, "S3 Execute standard rename on ".$from." to ".$to);
-            return parent::rename($from, $to);
-        }
-    }
-
-}
diff --git a/core/src/plugins/access.s3/class.s3CacheService.php b/core/src/plugins/access.s3/class.s3CacheService.php
deleted file mode 100644
index d3aeca0ad1..0000000000
--- a/core/src/plugins/access.s3/class.s3CacheService.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/*
- * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- */
-namespace AccessS3;
-defined('AJXP_EXEC') or die( 'Access not allowed');
-class s3CacheService implements \Aws\CacheInterface
-{
-    /**
-     * Get a cache item by key.
-     *
-     * @param string $key Key to retrieve.
-     *
-     * @return mixed|null Returns the value or null if not found.
-     */
-    public function get($key) {
-        return  \CacheService::fetch(AJXP_CACHE_SERVICE_NS_NODES, $key);
-    }
-
-    /**
-     * Set a cache key value.
-     *
-     * @param string $key   Key to set
-     * @param mixed  $value Value to set.
-     * @param int    $ttl   Number of seconds the item is allowed to live. Set
-     *                      to 0 to allow an unlimited lifetime.
-     */
-    public function set($key, $value, $ttl = 0) {
-        \CacheService::save(AJXP_CACHE_SERVICE_NS_NODES, $key, $value, $ttl);
-    }
-
-    /**
-     * Remove a cache key.
-     *
-     * @param string $key Key to remove.
-     */
-    public function remove($key) {
-        \CacheService::delete(AJXP_CACHE_SERVICE_NS_NODES, $key);
-    }
-}
\ No newline at end of file
diff --git a/core/src/plugins/access.s3/i18n/conf/de.php b/core/src/plugins/access.s3/i18n/conf/de.php
index 77907d28d0..8076969a94 100755
--- a/core/src/plugins/access.s3/i18n/conf/de.php
+++ b/core/src/plugins/access.s3/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "S3 (Amazon Web Service)" => "S3 (Amazon Web Service)",
@@ -47,4 +47,4 @@
 "Location" => "Location",
 "API" => "API",
 "Custom Storage" => "Custom Storage",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/access.s3/i18n/conf/en.php b/core/src/plugins/access.s3/i18n/conf/en.php
index f3bd157a45..e2b9f472fb 100755
--- a/core/src/plugins/access.s3/i18n/conf/en.php
+++ b/core/src/plugins/access.s3/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "S3 (Amazon Web Service)" => "S3 (Amazon Web Service)",
@@ -47,4 +47,4 @@
 "Location" => "Location",
 "API" => "API",
 "Custom Storage" => "Custom Storage",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/access.s3/i18n/conf/fr.php b/core/src/plugins/access.s3/i18n/conf/fr.php
index a8412ff332..0368f3e9c5 100755
--- a/core/src/plugins/access.s3/i18n/conf/fr.php
+++ b/core/src/plugins/access.s3/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "S3 (Amazon Web Service)" => "S3 (Amazon Web Service)",
@@ -48,4 +48,4 @@
 "Location" => "Emplacement",
 "API" => "API",
 "Custom Storage" => "Stockage Personnalisé",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/access.s3/i18n/conf/it.php b/core/src/plugins/access.s3/i18n/conf/it.php
index 941e6b2461..8522bb4134 100755
--- a/core/src/plugins/access.s3/i18n/conf/it.php
+++ b/core/src/plugins/access.s3/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "S3 (Amazon Web Service)" => "S3 (Amazon Web Service)",
@@ -48,4 +48,4 @@
 "Location" => "Location",
 "API" => "API",
 "Custom Storage" => "Custom Storage",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/access.s3/i18n/conf/pt.php b/core/src/plugins/access.s3/i18n/conf/pt.php
index c55edac0bd..56c6fd4ded 100644
--- a/core/src/plugins/access.s3/i18n/conf/pt.php
+++ b/core/src/plugins/access.s3/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "S3 (Amazon Web Service)" => "S3 (Serviço Amazon Web)",
@@ -48,4 +48,4 @@
 "Location" => "Location",
 "API" => "API",
 "Custom Storage" => "Custom Storage",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/access.s3/manifest.xml b/core/src/plugins/access.s3/manifest.xml
index 1638fc5d69..d168936f7c 100755
--- a/core/src/plugins/access.s3/manifest.xml
+++ b/core/src/plugins/access.s3/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ajxpdriver name="s3" label="CONF_MESSAGE[S3 (Amazon Web Service)]" description="CONF_MESSAGE[Access an AWS server. Requires AWS-SDK v2 for PHP]" mixins="filesystem_commons,slug_provider,template_provider" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <class_definition filename="plugins/access.s3/class.s3AccessDriver.php" classname="s3AccessDriver"/>
+    <class_definition filename="plugins/access.s3/S3AccessDriver.php" classname="Pydio\Access\Driver\StreamProvider\S3\S3AccessDriver"/>
     <client_settings icon="plugins/access.fs/icon.png" description_template="{REGION}{STORAGE_URL}/{CONTAINER}" iconClass="icon-sitemap">
         <resources>
             <i18n namespace="s3_access" path="plugins/access.s3/i18n"/>
@@ -16,9 +16,7 @@
 		<param name="API_VERSION" group="CONF_MESSAGE[API]" type="string" label="CONF_MESSAGE[API Version]" description="CONF_MESSAGE[The API Version of AS3 is a date (like 2006-03-01). If not sure, put latest ]" mandatory="true" default="latest"/>
         <param name="PROXY" group="CONF_MESSAGE[Custom Storage]" type="string" label="CONF_MESSAGE[Proxy]" description="CONF_MESSAGE[If you are using a proxy, for example:  127.0.0.1:80 or username:password@127.0.0.1:8080]" mandatory="false"/>
         <param name="STORAGE_URL" group="CONF_MESSAGE[Custom Storage]" type="string" label="CONF_MESSAGE[Storage URL]" description="CONF_MESSAGE[Replace default AWS access points (built from region). Set a full URL, including protocol]" mandatory="false"/>
-        <param name="VHOST_NOT_SUPPORTED" group="CONF_MESSAGE[Custom Storage]" type="boolean" label="CONF_MESSAGE[Disable Virtual Host Syntax]" description="CONF_MESSAGE[S3 backends can be queried using protocol://bucket.host/. Some backend do not support this, use this option to force using protocol://host/bucket instead]" mandatory="false"/>
         <param name="IS_VIPR" group="CONF_MESSAGE[Custom Storage]" type="boolean" label="CONF_MESSAGE[Is ViPR]" description="CONF_MESSAGE[If the backend storage is an EMC ViPR storage]" mandatory="false"/>
-        <global_param name="SDK_VERSION" type="select" choices="v2|SDK Version 2,v3|SDK Version 3" label="CONF_MESSAGE[SDK Version]" description="CONF_MESSAGE[The AWS SDK version]" mandatory="true" default="v2" />
 	</server_settings>
 	<registry_contributions>
         <external_file filename="plugins/access.fs/fsTemplatePart.xml" include="client_configs/*" exclude=""/>
@@ -30,5 +28,5 @@
     <dependencies>
         <pluginClass pluginName="access.fs"/>
     </dependencies>
-    <class_stream_wrapper filename="plugins/access.s3/class.s3AccessWrapper.php" classname="s3AccessWrapper" protocol="ajxp.s3"/>
+    <class_stream_wrapper filename="plugins/access.s3/S3AccessWrapper.php" classname="Pydio\Access\Driver\StreamProvider\S3\S3AccessWrapper" protocol="ajxp.s3"/>
 </ajxpdriver>
diff --git a/core/src/plugins/access.sftp/SFTPAccessDriver.php b/core/src/plugins/access.sftp/SFTPAccessDriver.php
new file mode 100644
index 0000000000..ca700685ec
--- /dev/null
+++ b/core/src/plugins/access.sftp/SFTPAccessDriver.php
@@ -0,0 +1,210 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ *
+ */
+namespace Pydio\Access\Driver\StreamProvider\SFTP;
+
+use DOMNode;
+use PclZip;
+use Pydio\Access\Core\MetaStreamWrapper;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Access\Core\RecycleBinManager;
+use Pydio\Access\Core\Model\Repository;
+use Pydio\Access\Driver\StreamProvider\FS\FsAccessDriver;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Utils\Vars\UrlUtils;
+
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Plugin to access an ftp server over SSH
+ * @package AjaXplorer_Plugins
+ * @subpackage Access
+ */
+class SFTPAccessDriver extends FsAccessDriver
+{
+    /**
+    * @var Repository
+    */
+    public $repository;
+    public $driverConf;
+    protected $wrapperClassName;
+    protected $urlBase;
+
+    /**
+     * @param ContextInterface $contextInterface
+     * @throws PydioException
+     * @throws \Exception
+     */
+    protected function initRepository(ContextInterface $contextInterface)
+    {
+        if (is_array($this->pluginConf)) {
+            $this->driverConf = $this->pluginConf;
+        } else {
+            $this->driverConf = array();
+        }
+
+        if (!function_exists('ssh2_connect')) {
+            throw new \Exception("You must have the php ssh2 extension active!");
+        }
+        ConfService::setConf("PROBE_REAL_SIZE", false);
+        $path       = $contextInterface->getRepository()->getContextOption($contextInterface, "PATH");
+        $recycle    = $contextInterface->getRepository()->getContextOption($contextInterface, "RECYCLE_BIN");
+        $this->urlBase = $contextInterface->getUrlBase();
+        restore_error_handler();
+        if (!file_exists($contextInterface->getUrlBase())) {
+            if ($contextInterface->getRepository()->getContextOption($contextInterface, "CREATE")) {
+                $test = @mkdir($contextInterface->getUrlBase());
+                if (!$test) {
+                    throw new PydioException("Cannot create path ($path) for your repository! Please check the configuration.");
+                }
+            } else {
+                throw new PydioException("Cannot find base path ($path) for your repository! Please check the configuration!");
+            }
+        }
+        if ($recycle != "") {
+            RecycleBinManager::init($contextInterface->getUrlBase(), "/".$recycle);
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function parseSpecificContributions(ContextInterface $ctx, \DOMNode &$contribNode)
+    {
+        parent::parseSpecificContributions($ctx, $contribNode);
+        if($contribNode->nodeName != "actions") return ;
+        $this->disableArchiveBrowsingContributions($contribNode);
+    }
+
+    /**
+     * @param String $srcFile url of source file
+     * @param String $destFile url of destination file
+     */
+    protected function filecopy($srcFile, $destFile)
+    {
+        if (MetaStreamWrapper::nodesUseSameWrappers($srcFile, $destFile)) {
+            $srcFilePath = UrlUtils::safeParseUrl($srcFile)["path"];
+            $destFilePath = UrlUtils::safeParseUrl($destFile)["path"];
+            $destDirPath = dirname($destFilePath);
+            list($connection, $remote_base_path) = SFTPAccessWrapper::getSshConnection(AJXP_Node::contextFromUrl($srcFile));
+            $remoteSrc = $remote_base_path.$srcFilePath;
+            $remoteDest = $remote_base_path.$destDirPath;
+            $this->logDebug("SSH2 CP", array("cmd" => 'cp '.$remoteSrc.' '.$remoteDest));
+            ssh2_exec($connection, 'cp '.$remoteSrc.' '.$remoteDest);
+            Controller::applyHook("node.change", array(new AJXP_Node($srcFile), new AJXP_Node($destFile), true));
+        } else {
+            parent::filecopy($srcFile, $destFile);
+        }
+    }
+
+
+    /**
+     * @param UserSelection $selection
+     * @param $dest
+     * @param $basedir
+     * @throws \Exception
+     * @return PclZip Zip Archive
+     */
+    public function makeZip (UserSelection $selection, $dest, $basedir, $taskId = null)
+    {
+        @set_time_limit(60);
+        require_once(AJXP_BIN_FOLDER."/lib/pclzip.lib.php");
+        $filePaths = array();
+
+        $uniqid = uniqid();
+        $uniqfolder = '/tmp/ajaxplorer-zip-'.$uniqid;
+        mkdir($uniqfolder);
+
+        $nodes = $selection->buildNodes();
+        foreach ($nodes as $node) {
+            $item = $node->getPath();
+            $basedir = trim(dirname($item));
+            $basename = basename($item);
+            $uniqpath = $uniqfolder.'/'.$basename;
+            $this->full_copy($node->getUrl(), $uniqpath);
+            $filePaths[] = array(PCLZIP_ATT_FILE_NAME => $uniqpath,
+                                 PCLZIP_ATT_FILE_NEW_SHORT_NAME => $basename);
+        }
+        $this->logDebug("Pathes", $filePaths);
+        $this->logDebug("Basedir", array($basedir));
+        $archive = new PclZip($dest);
+        $vList = $archive->create($filePaths, PCLZIP_OPT_REMOVE_PATH, $uniqfolder, PCLZIP_OPT_NO_COMPRESSION);
+        $this->recursiveRmdir($uniqfolder);
+        if (!$vList) {
+            throw new \Exception("Zip creation error : ($dest) ".$archive->errorInfo(true));
+        }
+        return $vList;
+    }
+
+    /**
+     * @param $source
+     * @param $destination
+     */
+    public function full_copy($source, $destination )
+    {
+        if ( is_dir( $source ) ) {
+            @mkdir( $destination );
+            $directory = dir( $source );
+            while ( FALSE !== ( $readdirectory = $directory->read() ) ) {
+                if ($readdirectory == '.' || $readdirectory == '..') {
+                    continue;
+                }
+                $PathDir = $source . '/' . $readdirectory;
+                if ( is_dir( $PathDir ) ) {
+                    $this->full_copy( $PathDir, $destination . '/' . $readdirectory );
+                    continue;
+                }
+                copy( $PathDir, $destination . '/' . $readdirectory );
+            }
+
+            $directory->close();
+        } else {
+            copy( $source, $destination );
+        }
+    }
+
+    /**
+     * @param $path
+     * @return bool
+     */
+    public function recursiveRmdir($path)
+    {
+        if (is_dir($path)) {
+            $path = rtrim($path, '/');
+            $subdir = dir($path);
+            while (($file = $subdir->read()) !== false) {
+                if ($file != '.' && $file != '..') {
+                (!is_link("$path/$file") && is_dir("$path/$file")) ? $this->recursiveRmdir("$path/$file") : unlink("$path/$file");
+                }
+            }
+            $subdir->close();
+            rmdir($path);
+            return true;
+        }
+        return false;
+    }
+
+}
diff --git a/core/src/plugins/access.sftp/SFTPAccessWrapper.php b/core/src/plugins/access.sftp/SFTPAccessWrapper.php
new file mode 100644
index 0000000000..4f63dabefe
--- /dev/null
+++ b/core/src/plugins/access.sftp/SFTPAccessWrapper.php
@@ -0,0 +1,392 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ *
+ */
+namespace Pydio\Access\Driver\StreamProvider\SFTP;
+
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Access\Core\Model\AJXP_Node;
+
+use Pydio\Access\Driver\StreamProvider\FS\FsAccessWrapper;
+use Pydio\Auth\Core\MemorySafe;
+use Pydio\Core\Model\ContextInterface;
+
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+
+require_once(AJXP_INSTALL_PATH . "/plugins/access.fs/FsAccessWrapper.php");
+
+/**
+ * Callback for ssh2_connect in case of disconnexion.
+ *
+ * @param integer $code
+ * @param String $message
+ * @param String $language
+ */
+function disconnectedSftp($code, $message, $language)
+{
+    Logger::info(__CLASS__,"SSH2.FTP.disconnected",$message);
+    throw new \Exception('SSH2.FTP : disconnected'.$message, $code);
+}
+
+/**
+ * @param $message
+ * @throws \Exception
+ */
+function ignoreSftp($message)
+{
+    Logger::info(__CLASS__,"SSH2.FTP.ignore",$message);
+    throw new \Exception('SSH2.FTP : ignore'.$message);
+}
+
+/**
+ * @param $message
+ * @param $language
+ * @param $always_display
+ * @throws \Exception
+ */
+function debugSftp($message, $language, $always_display)
+{
+    Logger::info(__CLASS__,"SSH2.FTP.debug",$message);
+    throw new \Exception('SSH2.FTP : debug'.$message);
+}
+
+/**
+ * @param $packet
+ * @throws \Exception
+ */
+function macerrorSftp($packet)
+{
+    Logger::info(__CLASS__,"SSH2.FTP.macerror","");
+    throw new \Exception('SSH2.FTP : macerror'.$packet);
+}
+
+
+
+/**
+ * Plugin to access an ftp server over SSH
+ * @package AjaXplorer_Plugins
+ * @subpackage Access
+ */
+class SFTPAccessWrapper extends FsAccessWrapper
+{
+    private static $sftpResource;
+    private static $resourceRepoId;
+
+    /**
+     * Initialize the stream from the given path.
+     * Concretely, transform ajxp.webdav:// into webdav://
+     *
+     * @param string $path
+     * @param string $streamType
+     * @param bool $sftpResource
+     * @param bool $skipZip
+     * @throws \Exception
+     * @return mixed Real path or -1 if currentListing contains the listing : original path converted to real path
+     */
+    protected static function initPath($path, $streamType="", $sftpResource = false, $skipZip = false)
+    {
+        $node = new AJXP_Node($path);
+        $repoObject = $node->getRepository();
+        if(!isSet($repoObject)) {
+            throw new \Exception("Cannot find repository with id ".$node->getRepositoryId());
+        }
+        $path = $node->getPath();
+        $ctx = $node->getContext();
+        // MAKE SURE THERE ARE NO // OR PROBLEMS LIKE THAT...
+        $basePath = $repoObject->getContextOption($ctx, "PATH");
+        if ($basePath[strlen($basePath)-1] == "/") {
+            $basePath = substr($basePath, 0, -1);
+        }
+        if ($basePath[0] != "/") {
+            $basePath = "/$basePath";
+        }
+        $path = InputFilter::securePath($path);
+        if ($path[0] == "/") {
+            $path = substr($path, 1);
+        }
+        // SHOULD RETURN ssh2.sftp://Resource #23/server/path/folder/path
+        return  "ssh2.sftp://".self::getSftpResource($ctx).$basePath."/".$path;
+    }
+
+    /**
+     * Get ssh2 connection
+     *
+     * @param ContextInterface $context
+     * @return Resource
+     */
+    protected static function getSftpResource($context)
+    {
+        $repoObject = $context->getRepository();
+        if (isSet(self::$sftpResource) && self::$resourceRepoId == $repoObject->getId()) {
+            return self::$sftpResource;
+        }
+        $callbacks = array('disconnect' => "disconnectedSftp",
+                            'ignore' 	=> "ignoreSftp",
+                            'debug' 	=> "debugSftp",
+                            'macerror'	=> "macerrorSftp");
+        $remote_serv = $repoObject->getContextOption($context, "SERV");
+        $remote_port = $repoObject->getContextOption($context, "PORT");
+        $credentials = MemorySafe::tryLoadingCredentialsFromSources($context);
+        $remote_user = $credentials["user"];
+        $remote_pass = $credentials["password"];
+
+        $connection = ssh2_connect($remote_serv, intval($remote_port), array(), $callbacks);
+        ssh2_auth_password($connection, $remote_user, $remote_pass);
+        self::$sftpResource = ssh2_sftp($connection);
+        self::$resourceRepoId = $repoObject->getId();
+        return self::$sftpResource;
+    }
+
+    /**
+     * @param AJXP_Node $node
+     * @return array
+     * @throws \Exception
+     */
+    public static function getResolvedOptionsForNode($node)
+    {
+        $options = [
+            "TYPE" => "sftp"
+        ];
+        $repoObject = $node->getRepository();
+        $context = $node->getContext();
+        $credentials = MemorySafe::tryLoadingCredentialsFromSources($context);
+        $options["USER"] = $credentials["user"];
+        $options["PASSWORD"] = $credentials["password"];
+        $options["SERVER"]  = $repoObject->getContextOption($context, "SERV");
+        $options["PORT"]  = intval($repoObject->getContextOption($context, "PORT"));
+        $options["PATH"]  = intval($repoObject->getContextOption($context, "PATH"));
+
+        return $options;
+    }
+
+    /**
+     * Opens the stream
+     * Diff with parent class : do not "securePath", as it removes double slash
+     *
+     * @param String $path Maybe in the form "ajxp.fs://repositoryId/pathToFile"
+     * @param String $mode
+     * @param array $options
+     * @param array $context
+     * @return resource
+     */
+    public function stream_open($path, $mode, $options, &$context)
+    {
+        try {
+            $this->realPath = $this->initPath($path);
+        } catch (\Exception $e) {
+            Logger::error(__CLASS__,"stream_open", "Error while opening stream $path");
+            return false;
+        }
+        $this->fp = fopen($this->realPath, $mode, $options);
+        return ($this->fp !== false);
+    }
+
+    /**
+     * Stats the given path.
+     *
+     * @param string $path
+     * @param mixed $flags
+     * @return array
+     */
+    public function url_stat($path, $flags)
+    {
+        $realPath = self::initPath($path);
+        $stat = @stat($realPath);
+        AbstractAccessDriver::fixPermissions(new AJXP_Node($path), $stat, array($this, "detectRemoteUserId"));
+        return $stat;
+    }
+
+    /**
+     * @param AJXP_Node $node
+     * @return array
+     */
+    public function detectRemoteUserId($node)
+    {
+        list($connection, $remote_base_path) = self::getSshConnection($node->getContext());
+        $stream = ssh2_exec($connection, "id");
+        if ($stream !== false) {
+            stream_set_blocking($stream, true);
+            $output = stream_get_contents($stream);
+            fclose($stream);
+
+            if (trim($output != "")) {
+                //$res = sscanf($output, "uid=%i(%s) gid=%i(%s) groups=%i(%s)");
+                preg_match_all("/(\w*)=(\w*)\(([\w-]*)\)/", $output, $matches);
+                if (count($matches[0]) == 3) {
+                    $uid = $matches[2][0];
+                    $gid = $matches[2][1];
+                    /*
+                    $groups = $matches[2][2];
+                    $uName = $matches[3][0];
+                    $gName = $matches[3][1];
+                    $groupsName = $matches[3][2];
+                    */
+                    return array($uid, $gid);
+                }
+            }
+        }
+        return array(null,null);
+    }
+
+    /**
+     * Opens a handle to the dir
+     * Fix PEAR by being sure it ends up with "/", to avoid
+     * adding the current dir to the children list.
+     *
+     * @param String $path
+     * @param array $options
+     * @return resource
+     */
+    public function dir_opendir ($path , $options )
+    {
+        $this->realPath = $this->initPath($path, true);
+        $this->dH = @opendir($this->realPath);
+        return $this->dH !== false;
+    }
+
+
+    // DUPBLICATE STATIC FUNCTIONS TO BE SURE
+    // NOT TO MESS WITH self:: CALLS
+    /**
+     * Remove a temporary file
+     *
+     * @param String $tmpDir
+     * @param String $tmpFile
+     */
+    public static function removeTmpFile($tmpDir, $tmpFile)
+    {
+        if(is_file($tmpFile)) unlink($tmpFile);
+        if(is_dir($tmpDir)) rmdir($tmpDir);
+    }
+
+    /**
+     * Implementation of AjxpStream
+     *
+     * @param String $path
+     * @return string
+     */
+    public static function getRealFSReference($path, $persistent = false)
+    {
+        if ($persistent) {
+            $tmpFile = ApplicationState::getAjxpTmpDir() ."/".md5(time());
+            $tmpHandle = fopen($tmpFile, "wb");
+            self::copyFileInStream($path, $tmpHandle);
+            fclose($tmpHandle);
+            return $tmpFile;
+        } else {
+            return self::initPath($path);
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    public static function isRemote()
+    {
+        return true;
+    }
+
+    /**
+     * @param String $url
+     * @return bool
+     */
+    public static function isSeekable($url)
+    {
+        return false;
+    }
+
+    /**
+     * Override parent function, testing feof() does not seem to work.
+     * We may have performance problems on big files here.
+     *
+     * @param String $path
+     * @param resource $stream
+     */
+    public static function copyFileInStream($path, $stream)
+    {
+        $src = fopen(self::initPath($path), "rb");
+        while ($content = fread($src, 5120)) {
+            fputs($stream, $content, strlen($content));
+            if(strlen($content) == 0) break;
+        }
+        fclose($src);
+    }
+
+
+    /**
+     * @param string $path
+     * @return bool
+     * @throws \Exception
+     */
+    public function unlink($path)
+    {
+        // Male sur to return true on success.
+        $this->realPath = $this->initPath($path, "file", false, true);
+        @unlink($this->realPath);
+        if (is_file($this->realPath)) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * Specific case for chmod : not supported natively by ssh2.sftp protocole
+     * we have to recreate an ssh2 connexion.
+     *
+     * @param string $path
+     * @param integer $chmodValue
+     */
+    public static function changeMode($path, $chmodValue)
+    {
+        $node = new AJXP_Node($path);
+        list($connection, $remote_base_path) = self::getSshConnection($node->getContext());
+        ssh2_exec($connection,'chmod '.decoct($chmodValue).' '.$remote_base_path.$node->getPath());
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @return array
+     */
+    public static function getSshConnection(ContextInterface $ctx)
+    {
+        $repoObject  = $ctx->getRepository();
+        $remote_serv = $repoObject->getContextOption($ctx, "SERV");
+        $remote_port = $repoObject->getContextOption($ctx, "PORT");
+        $credentials = MemorySafe::tryLoadingCredentialsFromSources($ctx);
+        $remote_user = $credentials["user"];
+        $remote_pass = $credentials["password"];
+        $remote_base_path = $repoObject->getContextOption($ctx, "PATH");
+
+        $callbacks = array('disconnect' => "disconnectedSftp",
+                            'ignore' 	=> "ignoreSftp",
+                            'debug' 	=> "debugSftp",
+                            'macerror'	=> "macerrorSftp");
+        $connection = ssh2_connect($remote_serv, intval($remote_port), array(), $callbacks);
+        ssh2_auth_password($connection, $remote_user, $remote_pass);
+        return array($connection, $remote_base_path);
+    }
+
+}
diff --git a/core/src/plugins/access.sftp/class.sftpAccessDriver.php b/core/src/plugins/access.sftp/class.sftpAccessDriver.php
deleted file mode 100644
index b2cda14185..0000000000
--- a/core/src/plugins/access.sftp/class.sftpAccessDriver.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * AJXP_Plugin to access an ftp server over SSH
- * @package AjaXplorer_Plugins
- * @subpackage Access
- */
-class sftpAccessDriver extends fsAccessDriver
-{
-    /**
-    * @var Repository
-    */
-    public $repository;
-    public $driverConf;
-    protected $wrapperClassName;
-    protected $urlBase;
-
-    public function initRepository()
-    {
-        if (is_array($this->pluginConf)) {
-            $this->driverConf = $this->pluginConf;
-        } else {
-            $this->driverConf = array();
-        }
-
-        if (!function_exists('ssh2_connect')) {
-            throw new Exception("You must have the php ssh2 extension active!");
-        }
-        ConfService::setConf("PROBE_REAL_SIZE", false);
-        $path = $this->repository->getOption("PATH");
-        $recycle = $this->repository->getOption("RECYCLE_BIN");
-        $this->detectStreamWrapper(true);
-        $this->urlBase = "pydio://".$this->repository->getId();
-        restore_error_handler();
-        if (!file_exists($this->urlBase)) {
-            if ($this->repository->getOption("CREATE")) {
-                $test = @mkdir($this->urlBase);
-                if (!$test) {
-                    throw new AJXP_Exception("Cannot create path ($path) for your repository! Please check the configuration.");
-                }
-            } else {
-                throw new AJXP_Exception("Cannot find base path ($path) for your repository! Please check the configuration!");
-            }
-        }
-        if ($recycle != "") {
-            RecycleBinManager::init($this->urlBase, "/".$recycle);
-        }
-    }
-
-    /**
-     * Parse
-     * @param DOMNode $contribNode
-     */
-    protected function parseSpecificContributions(&$contribNode)
-    {
-        parent::parseSpecificContributions($contribNode);
-        if($contribNode->nodeName != "actions") return ;
-        $this->disableArchiveBrowsingContributions($contribNode);
-    }
-
-
-    protected function filecopy($srcFile, $destFile)
-    {
-        if (AJXP_MetaStreamWrapper::nodesUseSameWrappers($srcFile, $destFile)) {
-            $srcFilePath = str_replace($this->urlBase, "", $srcFile);
-            $destFilePath = str_replace($this->urlBase, "", $destFile);
-            $destDirPath = dirname($destFilePath);
-            list($connection, $remote_base_path) = sftpAccessWrapper::getSshConnection($srcFile);
-            $remoteSrc = $remote_base_path.$srcFilePath;
-            $remoteDest = $remote_base_path.$destDirPath;
-            $this->logDebug("SSH2 CP", array("cmd" => 'cp '.$remoteSrc.' '.$remoteDest));
-            ssh2_exec($connection, 'cp '.$remoteSrc.' '.$remoteDest);
-            AJXP_Controller::applyHook("node.change", array(new AJXP_Node($srcFile), new AJXP_Node($destFile), true));
-        } else {
-            parent::filecopy($srcFile, $destFile);
-        }
-    }
-
-
-    /**
-     * @param $src
-     * @param $dest
-     * @param $basedir
-     * @throws Exception
-     * @return zipfile
-     */
-    public function makeZip ($src, $dest, $basedir)
-    {
-        @set_time_limit(60);
-        require_once(AJXP_BIN_FOLDER."/pclzip.lib.php");
-        $filePaths = array();
-
-        $uniqid = uniqid();
-        $uniqfolder = '/tmp/ajaxplorer-zip-'.$uniqid;
-        mkdir($uniqfolder);
-
-        foreach ($src as $item) {
-            $basedir = trim(dirname($item));
-            $basename = basename($item);
-            $uniqpath = $uniqfolder.'/'.$basename;
-            $this->full_copy($this->urlBase.$item, $uniqpath);
-            $filePaths[] = array(PCLZIP_ATT_FILE_NAME => $uniqpath,
-                                 PCLZIP_ATT_FILE_NEW_SHORT_NAME => $basename);
-        }
-        $this->logDebug("Pathes", $filePaths);
-        $this->logDebug("Basedir", array($basedir));
-        $archive = new PclZip($dest);
-        $vList = $archive->create($filePaths, PCLZIP_OPT_REMOVE_PATH, $uniqfolder, PCLZIP_OPT_NO_COMPRESSION);
-        $this->recursiveRmdir($uniqfolder);
-        if (!$vList) {
-            throw new Exception("Zip creation error : ($dest) ".$archive->errorInfo(true));
-        }
-        return $vList;
-    }
-
-    public function full_copy( $source, $destination )
-    {
-        if ( is_dir( $source ) ) {
-            @mkdir( $destination );
-            $directory = dir( $source );
-            while ( FALSE !== ( $readdirectory = $directory->read() ) ) {
-                if ($readdirectory == '.' || $readdirectory == '..') {
-                    continue;
-                }
-                $PathDir = $source . '/' . $readdirectory;
-                if ( is_dir( $PathDir ) ) {
-                    $this->full_copy( $PathDir, $destination . '/' . $readdirectory );
-                    continue;
-                }
-                copy( $PathDir, $destination . '/' . $readdirectory );
-            }
-
-            $directory->close();
-        } else {
-            copy( $source, $destination );
-        }
-    }
-
-    public function recursiveRmdir($path)
-    {
-        if (is_dir($path)) {
-            $path = rtrim($path, '/');
-            $subdir = dir($path);
-            while (($file = $subdir->read()) !== false) {
-                if ($file != '.' && $file != '..') {
-                (!is_link("$path/$file") && is_dir("$path/$file")) ? $this->recursiveRmdir("$path/$file") : unlink("$path/$file");
-                }
-            }
-            $subdir->close();
-            rmdir($path);
-            return true;
-        }
-        return false;
-    }
-
-}
diff --git a/core/src/plugins/access.sftp/class.sftpAccessWrapper.php b/core/src/plugins/access.sftp/class.sftpAccessWrapper.php
deleted file mode 100644
index 581485af66..0000000000
--- a/core/src/plugins/access.sftp/class.sftpAccessWrapper.php
+++ /dev/null
@@ -1,331 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-
-require_once(AJXP_INSTALL_PATH."/plugins/access.fs/class.fsAccessWrapper.php");
-
-/**
- * Callback for ssh2_connect in case of disconnexion.
- *
- * @param integer $code
- * @param String $message
- * @param String $language
- */
-function disconnectedSftp($code, $message, $language)
-{
-    AJXP_Logger::info(__CLASS__,"SSH2.FTP.disconnected",$message);
-    throw new Exception('SSH2.FTP : disconnected'.$message, $code);
-}
-
-function ignoreSftp($message)
-{
-    AJXP_Logger::info(__CLASS__,"SSH2.FTP.ignore",$message);
-    throw new Exception('SSH2.FTP : ignore'.$message);
-}
-
-function debugSftp($message, $language, $always_display)
-{
-    AJXP_Logger::info(__CLASS__,"SSH2.FTP.debug",$message);
-    throw new Exception('SSH2.FTP : debug'.$message);
-}
-
-function macerrorSftp($packet)
-{
-    AJXP_Logger::info(__CLASS__,"SSH2.FTP.macerror","");
-    throw new Exception('SSH2.FTP : macerror'.$packet);
-}
-
-
-
-/**
- * AJXP_Plugin to access an ftp server over SSH
- * @package AjaXplorer_Plugins
- * @subpackage Access
- */
-class sftpAccessWrapper extends fsAccessWrapper
-{
-    private static $sftpResource;
-    private static $resourceRepoId;
-
-    /**
-     * Initialize the stream from the given path.
-     * Concretely, transform ajxp.webdav:// into webdav://
-     *
-     * @param string $path
-     * @param string $streamType
-     * @param bool $sftpResource
-     * @param bool $skipZip
-     * @throws Exception
-     * @return mixed Real path or -1 if currentListing contains the listing : original path converted to real path
-     */
-    protected static function initPath($path, $streamType="", $sftpResource = false, $skipZip = false)
-    {
-        $url = AJXP_Utils::safeParseUrl($path);
-        $repoId = $url["host"];
-        $repoObject = ConfService::getRepositoryById($repoId);
-        if(!isSet($repoObject)) throw new Exception("Cannot find repository with id ".$repoId);
-        $path = $url["path"];
-        // MAKE SURE THERE ARE NO // OR PROBLEMS LIKE THAT...
-        $basePath = $repoObject->getOption("PATH");
-        if ($basePath[strlen($basePath)-1] == "/") {
-            $basePath = substr($basePath, 0, -1);
-        }
-        if ($basePath[0] != "/") {
-            $basePath = "/$basePath";
-        }
-        $path = AJXP_Utils::securePath($path);
-        if ($path[0] == "/") {
-            $path = substr($path, 1);
-        }
-        // SHOULD RETURN ssh2.sftp://Resource #23/server/path/folder/path
-        return  "ssh2.sftp://".self::getSftpResource($repoObject).$basePath."/".$path;
-    }
-
-    /**
-     * Get ssh2 connection
-     *
-     * @param Repository $repoObject
-     * @return Resource
-     */
-    protected static function getSftpResource($repoObject)
-    {
-        if (isSet(self::$sftpResource) && self::$resourceRepoId == $repoObject->getId()) {
-            return self::$sftpResource;
-        }
-        $callbacks = array('disconnect' => "disconnectedSftp",
-                            'ignore' 	=> "ignoreSftp",
-                            'debug' 	=> "debugSftp",
-                            'macerror'	=> "macerrorSftp");
-        $remote_serv = $repoObject->getOption("SERV");
-        $remote_port = $repoObject->getOption("PORT");
-        $credentials = AJXP_Safe::tryLoadingCredentialsFromSources(array(), $repoObject);
-        $remote_user = $credentials["user"];
-        $remote_pass = $credentials["password"];
-
-        $connection = ssh2_connect($remote_serv, intval($remote_port), array(), $callbacks);
-        ssh2_auth_password($connection, $remote_user, $remote_pass);
-        self::$sftpResource = ssh2_sftp($connection);
-        self::$resourceRepoId = $repoObject->getId();
-        return self::$sftpResource;
-    }
-
-    /**
-     * Opens the stream
-     * Diff with parent class : do not "securePath", as it removes double slash
-     *
-     * @param String $path Maybe in the form "ajxp.fs://repositoryId/pathToFile"
-     * @param String $mode
-     * @param array $options
-     * @param array $context
-     * @return unknown
-     */
-    public function stream_open($path, $mode, $options, &$context)
-    {
-        try {
-            $this->realPath = $this->initPath($path);
-        } catch (Exception $e) {
-            AJXP_Logger::error(__CLASS__,"stream_open", "Error while opening stream $path");
-            return false;
-        }
-        $this->fp = fopen($this->realPath, $mode, $options);
-        return ($this->fp !== false);
-    }
-
-    /**
-     * Stats the given path.
-     *
-     * @param string $path
-     * @param mixed $flags
-     * @return array
-     */
-    public function url_stat($path, $flags)
-    {
-        $realPath = self::initPath($path);
-        $stat = @stat($realPath);
-        $parts = AJXP_Utils::safeParseUrl($path);
-        $repoObject = ConfService::getRepositoryById($parts["host"]);
-
-        AbstractAccessDriver::fixPermissions($stat, $repoObject, array($this, "detectRemoteUserId"));
-
-        return $stat;
-    }
-
-    public function detectRemoteUserId($repository)
-    {
-        list($connection, $remote_base_path) = self::getSshConnection("/", $repository);
-        $stream = ssh2_exec($connection, "id");
-        if ($stream !== false) {
-            stream_set_blocking($stream, true);
-            $output = stream_get_contents($stream);
-            fclose($stream);
-
-            if (trim($output != "")) {
-                //$res = sscanf($output, "uid=%i(%s) gid=%i(%s) groups=%i(%s)");
-                preg_match_all("/(\w*)=(\w*)\(([\w-]*)\)/", $output, $matches);
-                if (count($matches[0]) == 3) {
-                    $uid = $matches[2][0];
-                    $gid = $matches[2][1];
-                    /*
-                    $groups = $matches[2][2];
-                    $uName = $matches[3][0];
-                    $gName = $matches[3][1];
-                    $groupsName = $matches[3][2];
-                    */
-                    return array($uid, $gid);
-                }
-            }
-        }
-        return array(null,null);
-    }
-
-    /**
-     * Opens a handle to the dir
-     * Fix PEAR by being sure it ends up with "/", to avoid
-     * adding the current dir to the children list.
-     *
-     * @param String $path
-     * @param array $options
-     * @return resource
-     */
-    public function dir_opendir ($path , $options )
-    {
-        $this->realPath = $this->initPath($path, true);
-        $this->dH = @opendir($this->realPath);
-        return $this->dH !== false;
-    }
-
-
-    // DUPBLICATE STATIC FUNCTIONS TO BE SURE
-    // NOT TO MESS WITH self:: CALLS
-    /**
-     * Remove a temporary file
-     *
-     * @param String $tmpDir
-     * @param String $tmpFile
-     */
-    public static function removeTmpFile($tmpDir, $tmpFile)
-    {
-        if(is_file($tmpFile)) unlink($tmpFile);
-        if(is_dir($tmpDir)) rmdir($tmpDir);
-    }
-
-    /**
-     * Implementation of AjxpStream
-     *
-     * @param String $path
-     * @return string
-     */
-    public static function getRealFSReference($path, $persistent = false)
-    {
-        if ($persistent) {
-            $tmpFile = AJXP_Utils::getAjxpTmpDir()."/".md5(time());
-            $tmpHandle = fopen($tmpFile, "wb");
-            self::copyFileInStream($path, $tmpHandle);
-            fclose($tmpHandle);
-            return $tmpFile;
-        } else {
-            return self::initPath($path);
-        }
-    }
-
-    public static function isRemote()
-    {
-        return true;
-    }
-
-    public static function isSeekable($url)
-    {
-        return false;
-    }
-
-    /**
-     * Override parent function, testing feof() does not seem to work.
-     * We may have performance problems on big files here.
-     *
-     * @param String $path
-     * @param Stream $stream
-     */
-    public static function copyFileInStream($path, $stream)
-    {
-        $src = fopen(self::initPath($path), "rb");
-        while ($content = fread($src, 5120)) {
-            fputs($stream, $content, strlen($content));
-            if(strlen($content) == 0) break;
-        }
-        fclose($src);
-    }
-
-
-    public function unlink($path)
-    {
-        // Male sur to return true on success.
-        $this->realPath = $this->initPath($path, "file", false, true);
-        @unlink($this->realPath);
-        if (is_file($this->realPath)) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * Specific case for chmod : not supported natively by ssh2.sftp protocole
-     * we have to recreate an ssh2 connexion.
-     *
-     * @param string $path
-     * @param long $chmodValue
-     */
-    public static function changeMode($path, $chmodValue)
-    {
-        $url = AJXP_Utils::safeParseUrl($path);
-        list($connection, $remote_base_path) = self::getSshConnection($path);
-        //var_dump('chmod '.decoct($chmodValue).' '.$remote_base_path.$url['path']);
-        ssh2_exec($connection,'chmod '.decoct($chmodValue).' '.$remote_base_path.$url['path']);
-    }
-
-    public static function getSshConnection($path, $repoObject = null)
-    {
-        if ($repoObject != null) {
-            $url = array();
-        } else {
-            $url = AJXP_Utils::safeParseUrl($path);
-            $repoId = $url["host"];
-            $repoObject = ConfService::getRepositoryById($repoId);
-        }
-        $remote_serv = $repoObject->getOption("SERV");
-        $remote_port = $repoObject->getOption("PORT");
-        $credentials = AJXP_Safe::tryLoadingCredentialsFromSources($url, $repoObject);
-        $remote_user = $credentials["user"];
-        $remote_pass = $credentials["password"];
-        $remote_base_path = $repoObject->getOption("PATH");
-
-        $callbacks = array('disconnect' => "disconnectedSftp",
-                            'ignore' 	=> "ignoreSftp",
-                            'debug' 	=> "debugSftp",
-                            'macerror'	=> "macerrorSftp");
-        $connection = ssh2_connect($remote_serv, intval($remote_port), array(), $callbacks);
-        ssh2_auth_password($connection, $remote_user, $remote_pass);
-        return array($connection, $remote_base_path);
-    }
-
-}
diff --git a/core/src/plugins/access.sftp/i18n/conf/cs.php b/core/src/plugins/access.sftp/i18n/conf/cs.php
index 72d55f83f8..04805d681e 100644
--- a/core/src/plugins/access.sftp/i18n/conf/cs.php
+++ b/core/src/plugins/access.sftp/i18n/conf/cs.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FTP over SSH" => "FTP přes SSH",
diff --git a/core/src/plugins/access.sftp/i18n/conf/de.php b/core/src/plugins/access.sftp/i18n/conf/de.php
index 55ac6c61d9..788335d179 100644
--- a/core/src/plugins/access.sftp/i18n/conf/de.php
+++ b/core/src/plugins/access.sftp/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FTP over SSH" => "FTP über SSH",
diff --git a/core/src/plugins/access.sftp/i18n/conf/en.php b/core/src/plugins/access.sftp/i18n/conf/en.php
index 8092e30b6c..4f0163bd60 100644
--- a/core/src/plugins/access.sftp/i18n/conf/en.php
+++ b/core/src/plugins/access.sftp/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FTP over SSH" => "FTP over SSH",
diff --git a/core/src/plugins/access.sftp/i18n/conf/fr.php b/core/src/plugins/access.sftp/i18n/conf/fr.php
index 41c22397b8..30a61639f4 100644
--- a/core/src/plugins/access.sftp/i18n/conf/fr.php
+++ b/core/src/plugins/access.sftp/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FTP over SSH" => "FTP sur SSH",
diff --git a/core/src/plugins/access.sftp/i18n/conf/it.php b/core/src/plugins/access.sftp/i18n/conf/it.php
index f138687045..d980c979bc 100644
--- a/core/src/plugins/access.sftp/i18n/conf/it.php
+++ b/core/src/plugins/access.sftp/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FTP over SSH" => "FTP tramite SSH",
diff --git a/core/src/plugins/access.sftp/i18n/conf/pt.php b/core/src/plugins/access.sftp/i18n/conf/pt.php
index ba8a8838ca..b8baf744f9 100644
--- a/core/src/plugins/access.sftp/i18n/conf/pt.php
+++ b/core/src/plugins/access.sftp/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FTP over SSH" => "FTP sobre SSH",
diff --git a/core/src/plugins/access.sftp/manifest.xml b/core/src/plugins/access.sftp/manifest.xml
index e3b68b2d8c..0f46887828 100644
--- a/core/src/plugins/access.sftp/manifest.xml
+++ b/core/src/plugins/access.sftp/manifest.xml
@@ -14,13 +14,11 @@
         <param name="CREATE" type="boolean" label="CONF_MESSAGE[Create]" description="CONF_MESSAGE[Create folder if it does not exists]" default="false" mandatory="false"/>
         <global_param group="MIXIN_MESSAGE[Metadata and indexation]" name="DEFAULT_METASOURCES" type="string" label="MIXIN_MESSAGE[Default Metasources]" description="MIXIN_MESSAGE[Comma separated list of metastore and meta plugins, that will be automatically applied to all repositories created with this driver]" mandatory="false" default="metastore.serial,meta.filehasher,index.lucene"/>
     </server_settings>
-	<class_definition filename="plugins/access.sftp/class.sftpAccessDriver.php" classname="sftpAccessDriver"/>
+	<class_definition filename="plugins/access.sftp/SFTPAccessDriver.php" classname="Pydio\Access\Driver\StreamProvider\SFTP\SFTPAccessDriver"/>
 	<registry_contributions>
         <external_file filename="plugins/access.fs/fsTemplatePart.xml" include="client_configs/*" exclude=""/>
 		<client_configs>
-			<template_part ajxpId="search_container" ajxpClass="SearchEngine" ajxpOptions="{}"/>
 			<template_part ajxpId="search_container" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "openSearchInput":"true", "openSearchStickLeftTo":"topPane", "searchChooserAsResultsHeader":true, "toggleResultsFitTo":"cpane_tabs", "fitMarginBottom":0, "toggleResultsOffsetRight":0, "toggleResultsOffsetTop":0, "detailThumbSize":24}' theme="orbit"/>
-            <template_part ajxpId="search_container" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "fitMarginBottom":20}' theme="vision"/>
             <component_config className="FilesList">
 				<columns switchGridMode="filelist">
 					<column messageId="1" attributeName="ajxp_label" sortType="StringDirFile"/>
@@ -40,5 +38,5 @@
 	<dependencies>
 		<pluginClass pluginName="access.fs"/>
 	</dependencies>
-    <class_stream_wrapper filename="plugins/access.sftp/class.sftpAccessWrapper.php" classname="sftpAccessWrapper" protocol="ajxp.sftp"/>
+    <class_stream_wrapper filename="plugins/access.sftp/SFTPAccessWrapper.php" classname="Pydio\Access\Driver\StreamProvider\SFTP\SFTPAccessWrapper" protocol="ajxp.sftp"/>
 </ajxpdriver>
diff --git a/core/src/plugins/access.sftp_psl/SftpPSLAccessDriver.php b/core/src/plugins/access.sftp_psl/SftpPSLAccessDriver.php
new file mode 100644
index 0000000000..8ce2231145
--- /dev/null
+++ b/core/src/plugins/access.sftp_psl/SftpPSLAccessDriver.php
@@ -0,0 +1,180 @@
+<?php
+/*
+ * Copyright 2013 Nikita ROUSSEAU <warhawk3407@gmail.com>
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Driver\StreamProvider\SFTP_PSL;
+
+
+use DOMNode;
+use PclZip;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Access\Driver\StreamProvider\FS\FsAccessDriver;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\ConfService;
+
+defined('AJXP_EXEC') or die( 'Access not allowed' );
+
+
+
+
+/**
+ * Plugin to access a remote server using SSH File Transfer Protocol (SFTP) with phpseclib ( http://phpseclib.sourceforge.net/ )
+ *
+ * @author	warhawk3407 <warhawk3407@gmail.com>
+ * @author	Charles du Jeu <contact (at) cdujeu.me>
+ * @version	Release: 1.0.2
+ */
+class SftpPSLAccessDriver extends FsAccessDriver
+{
+
+    /**
+    * @var \Pydio\Access\Core\Model\Repository
+    */
+    public $repository;
+    public $driverConf;
+    protected $wrapperClassName;
+    protected $urlBase;
+
+    /**
+     * @param ContextInterface $contextInterface
+     * @throws \Exception
+     */
+    protected function initRepository(ContextInterface $contextInterface)
+    {
+        if (is_array($this->pluginConf)) {
+            $this->driverConf = $this->pluginConf;
+        } else {
+            $this->driverConf = array();
+        }
+
+        ConfService::setConf("PROBE_REAL_SIZE", false);
+
+        require_once($this->getBaseDir()."/SFTPPSL_StreamWrapper.php");
+        
+        $this->urlBase = $contextInterface->getUrlBase();
+    }
+
+    /**
+     * @param bool $register
+     * @param ContextInterface|null $ctx
+     * @return array|bool
+     */
+    public function detectStreamWrapper($register = false, ContextInterface $ctx = null)
+    {
+        if ($register) {
+            require_once($this->getBaseDir()."/SFTPPSL_StreamWrapper.php");
+        }
+        return parent::detectStreamWrapper($register, $ctx);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function parseSpecificContributions(ContextInterface $ctx, \DOMNode &$contribNode)
+    {
+        parent::parseSpecificContributions($ctx, $contribNode);
+        if($contribNode->nodeName != "actions") return ;
+        $this->disableArchiveBrowsingContributions($contribNode);
+    }
+
+    /**
+     * @param UserSelection $selection
+     * @param string $dest
+     * @param string $basedir
+     * @param string $taskId
+     * @return PclZip zipfile
+     * @throws \Exception
+     */
+    public function makeZip (UserSelection $selection, $dest, $basedir, $taskId = null)
+    {
+        @set_time_limit(60);
+        require_once(AJXP_BIN_FOLDER."/lib/pclzip.lib.php");
+        $filePaths = array();
+
+        $uniqid = uniqid();
+        $uniqfolder = '/tmp/ajaxplorer-zip-'.$uniqid;
+        mkdir($uniqfolder);
+
+        $nodes = $selection->buildNodes();
+        foreach ($nodes as $node) {
+            $item = $node->getPath();
+            $basedir = trim(dirname($item));
+            $basename = basename($item);
+            $uniqpath = $uniqfolder.'/'.$basename;
+            $this->full_copy($node->getUrl(), $uniqpath);
+            $filePaths[] = array(PCLZIP_ATT_FILE_NAME => $uniqpath,
+                PCLZIP_ATT_FILE_NEW_SHORT_NAME => $basename);
+        }
+        $this->logDebug("Pathes", $filePaths);
+        $this->logDebug("Basedir", array($basedir));
+        $archive = new PclZip($dest);
+        $vList = $archive->create($filePaths, PCLZIP_OPT_REMOVE_PATH, $uniqfolder, PCLZIP_OPT_NO_COMPRESSION);
+        $this->recursiveRmdir($uniqfolder);
+        if (!$vList) {
+            throw new \Exception("Zip creation error : ($dest) ".$archive->errorInfo(true));
+        }
+        return $vList;
+    }
+
+    public function full_copy( $source, $destination )
+    {
+        if ( is_dir( $source ) ) {
+            @mkdir( $destination );
+            $directory = dir( $source );
+            while ( FALSE !== ( $readdirectory = $directory->read() ) ) {
+                if ($readdirectory == '.' || $readdirectory == '..') {
+                    continue;
+                }
+                $PathDir = $source . '/' . $readdirectory;
+                if ( is_dir( $PathDir ) ) {
+                    $this->full_copy( $PathDir, $destination . '/' . $readdirectory );
+                    continue;
+                }
+                copy( $PathDir, $destination . '/' . $readdirectory );
+            }
+
+            $directory->close();
+        } else {
+            copy( $source, $destination );
+        }
+    }
+
+    public function recursiveRmdir($path)
+    {
+        if (is_dir($path)) {
+            $path = rtrim($path, '/');
+            $subdir = dir($path);
+            while (($file = $subdir->read()) !== false) {
+                if ($file != '.' && $file != '..') {
+                    (!is_link("$path/$file") && is_dir("$path/$file")) ? $this->recursiveRmdir("$path/$file") : unlink("$path/$file");
+                }
+            }
+            $subdir->close();
+            rmdir($path);
+            return true;
+        }
+        return false;
+    }
+
+    public function isWriteable($dir, $type="dir")
+    {
+        return is_writable($dir);
+    }
+}
diff --git a/core/src/plugins/access.sftp_psl/SftpPSLAccessWrapper.php b/core/src/plugins/access.sftp_psl/SftpPSLAccessWrapper.php
new file mode 100644
index 0000000000..8b3144e6b2
--- /dev/null
+++ b/core/src/plugins/access.sftp_psl/SftpPSLAccessWrapper.php
@@ -0,0 +1,290 @@
+<?php
+/*
+ * Copyright 2013 Nikita ROUSSEAU <warhawk3407@gmail.com>
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Driver\StreamProvider\SFTP_PSL;
+
+use Net_SSH2;
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Access\Core\Model\AJXP_Node;
+
+use Pydio\Access\Driver\StreamProvider\FS\FsAccessWrapper;
+use Pydio\Auth\Core\MemorySafe;
+
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\UrlUtils;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die( 'Access not allowed' );
+
+require_once(AJXP_INSTALL_PATH . "/plugins/access.fs/FsAccessWrapper.php");
+require_once(AJXP_INSTALL_PATH."/plugins/access.sftp_psl/phpseclib/SSH2.php");
+
+/**
+ * Plugin to access a remote server using SSH File Transfer Protocol (SFTP) with phpseclib ( http://phpseclib.sourceforge.net/ )
+ *
+ * @author	warhawk3407 <warhawk3407@gmail.com>
+ * @author	Charles du Jeu <contact (at) cdujeu.me>
+ * @version	Release: 1.0.2
+ */
+class SftpPSLAccessWrapper extends FsAccessWrapper
+{
+
+    /**
+     * @return bool
+     */
+    public static function isRemote()
+    {
+        return true;
+    }
+
+    /**
+     * @param String $url
+     * @return bool
+     */
+    public static function isSeekable($url)
+    {
+        return false;
+    }
+
+    /**
+     * Initialize the stream from the given path.
+     */
+    protected static function initPath($path, $streamType = '', $storeOpenContext = false, $skipZip = true)
+    {
+        $url = UrlUtils::safeParseUrl($path);
+        $node = new AJXP_Node($url);
+        $ctx  = $node->getContext();
+        $repoObject = $node->getRepository();
+        if(empty($repoObject)) {
+            throw new \Exception("Cannot find repository with id ".$node->getRepositoryId());
+        }
+        $path = $node->getPath();
+
+        $basePath   = $repoObject->getContextOption($ctx, "PATH");
+        $host       = $repoObject->getContextOption($ctx, "SFTP_HOST");
+        $port       = $repoObject->getContextOption($ctx, "SFTP_PORT");
+
+        $credentials = MemorySafe::tryLoadingCredentialsFromSources($node->getContext());
+        $user = $credentials["user"];
+        $pass = $credentials["password"];
+
+        if ($basePath[strlen($basePath)-1] == "/") {
+            $basePath = substr($basePath, 0, -1);
+        }
+
+        if ($basePath[0] != "/") {
+            $basePath = "/$basePath";
+        }
+
+        $path = InputFilter::securePath($path);
+
+        if ($path[0] == "/") {
+            $path = substr($path, 1);
+        }
+
+        return  "sftp://".$user.':'.$pass.'@'.$host.':'.$port.$basePath."/".$path; // http://username:password@hostname:port/path/file.ext
+    }
+
+    /**
+     * Implementation of AjxpStream
+     *
+     * @param String $path
+     * @return string
+     */
+    public static function getRealFSReference($path, $persistent = false)
+    {
+        if ($persistent) {
+            $tmpFile = ApplicationState::getAjxpTmpDir() ."/".md5(time());
+            $tmpHandle = fopen($tmpFile, "wb");
+            self::copyFileInStream($path, $tmpHandle);
+            fclose($tmpHandle);
+            return $tmpFile;
+        } else {
+            return self::initPath($path);
+        }
+    }
+
+
+    /**
+     * @param AJXP_Node $node
+     * @return array
+     * @throws \Exception
+     */
+    public static function getResolvedOptionsForNode($node)
+    {
+        $options = [
+            "TYPE" => "sftp"
+        ];
+        $repoObject = $node->getRepository();
+        $context = $node->getContext();
+        $credentials = MemorySafe::tryLoadingCredentialsFromSources($context);
+        $options["USER"] = $credentials["user"];
+        $options["PASSWORD"] = $credentials["password"];
+        $options["SERVER"]  = $repoObject->getContextOption($context, "SFTP_HOST");
+        $options["PORT"]  = intval($repoObject->getContextOption($context, "SFTP_PORT"));
+        $options["PATH"]  = intval($repoObject->getContextOption($context, "PATH"));
+
+        return $options;
+    }
+    
+    
+    /**
+     * @inheritdoc
+     */
+    public function stream_open($path, $mode, $options, &$context)
+    {
+        try {
+            $this->realPath = $this->initPath($path);
+        } catch (\Exception $e) {
+            Logger::error(__CLASS__,"stream_open", "Error while opening stream $path");
+            return false;
+        }
+        if ($this->realPath == -1) {
+            $this->fp = -1;
+            return true;
+        } else {
+            $this->fp = fopen($this->realPath, $mode, $options);
+            return ($this->fp !== false);
+        }
+    }
+
+    /**
+     * Opens a handle to the dir
+     * Fix PEAR by being sure it ends up with "/", to avoid
+     * adding the current dir to the children list.
+     *
+     * @param string $path
+     * @param mixed $options
+     * @return bool
+     */
+    public function dir_opendir ($path , $options )
+    {
+        $this->realPath = $this->initPath($path);
+        if ($this->realPath[strlen($this->realPath)-1] != "/") {
+            $this->realPath.="/";
+        }
+        if (is_string($this->realPath)) {
+            $this->dH = opendir($this->realPath);
+        } else if ($this->realPath == -1) {
+            $this->dH = -1;
+        }
+        return $this->dH !== false;
+    }
+
+    /**
+     * @param string $path
+     * @return bool
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public function unlink($path)
+    {
+        $this->realPath = $this->initPath($path, "file", false, true);
+        @unlink($this->realPath);
+        if (is_file($this->realPath)) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * Stats the given path.
+     *
+     * @param string $path
+     * @param mixed $flags
+     * @return array
+     */
+    public function url_stat($path, $flags)
+    {
+        $realPath = self::initPath($path);
+        $stat = @stat($realPath);
+        AbstractAccessDriver::fixPermissions(new AJXP_Node($path), $stat, array($this, "detectRemoteUserId"));
+        return $stat;
+    }
+
+    /**
+     * @param AJXP_Node $node
+     * @return array
+     */
+    public function detectRemoteUserId($node)
+    {
+        $repoObject = $node->getRepository();
+        $ctx = $node->getContext();
+        $host = $repoObject->getContextOption($ctx, "SFTP_HOST");
+        $port = $repoObject->getContextOption($ctx, "SFTP_PORT");
+
+        $credentials = MemorySafe::tryLoadingCredentialsFromSources($node->getContext());
+        $user = $credentials["user"];
+        $pass = $credentials["password"];
+
+        $ssh2 = new Net_SSH2($host, $port);
+        if ($ssh2->login($user, $pass)) {
+            $output = $ssh2->exec( 'id' );
+
+            $ssh2->disconnect();
+
+            if (trim($output != "")) {
+                preg_match_all("/(\w*)=(\w*)\((\w*)\)/", $output, $matches);
+                if (count($matches[0]) == 3) {
+                    $uid = $matches[2][0];
+                    $gid = $matches[2][1];
+                    return array($uid, $gid);
+                }
+            }
+        }
+        unset($ssh2);
+
+        return array(null,null);
+    }
+
+    /**
+     * Override parent function.
+     * We may have performance problems on big files here.
+     *
+     * @param String $path
+     * @param resource $stream
+     */
+    public static function copyFileInStream($path, $stream)
+    {
+        $src = fopen(self::initPath($path), "rb");
+        while ($content = fread($src, 5120)) {
+            fputs($stream, $content, strlen($content));
+            if(strlen($content) == 0) break;
+        }
+        fclose($src);
+    }
+
+    /**
+     * Remove a temporary file
+     *
+     * @param String $tmpDir
+     * @param String $tmpFile
+     */
+    public static function removeTmpFile($tmpDir, $tmpFile)
+    {
+        if(is_file($tmpFile)) unlink($tmpFile);
+        if(is_dir($tmpDir)) rmdir($tmpDir);
+    }
+
+}
diff --git a/core/src/plugins/access.sftp_psl/class.sftpPSLAccessDriver.php b/core/src/plugins/access.sftp_psl/class.sftpPSLAccessDriver.php
deleted file mode 100644
index 68c0d94f5b..0000000000
--- a/core/src/plugins/access.sftp_psl/class.sftpPSLAccessDriver.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-/*
- * Copyright 2013 Nikita ROUSSEAU <warhawk3407@gmail.com>
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed' );
-
-
-
-
-/**
- * AJXP_Plugin to access a remote server using SSH File Transfer Protocol (SFTP) with phpseclib ( http://phpseclib.sourceforge.net/ )
- *
- * @author	warhawk3407 <warhawk3407@gmail.com>
- * @author	Charles du Jeu <contact (at) cdujeu.me>
- * @version	Release: 1.0.2
- */
-class sftpPSLAccessDriver extends fsAccessDriver
-{
-
-    /**
-    * @var Repository
-    */
-    public $repository;
-    public $driverConf;
-    protected $wrapperClassName;
-    protected $urlBase;
-
-    /**
-     * initRepository
-     */
-    public function initRepository()
-    {
-        if (is_array($this->pluginConf)) {
-            $this->driverConf = $this->pluginConf;
-        } else {
-            $this->driverConf = array();
-        }
-
-        ConfService::setConf("PROBE_REAL_SIZE", false);
-
-        require_once($this->getBaseDir()."/SFTPPSL_StreamWrapper.php");
-
-        $create = $this->repository->getOption("CREATE");
-        $path = $this->repository->getOption("PATH");
-
-        $this->detectStreamWrapper(true);
-        $this->urlBase = "pydio://".$this->repository->getId();
-    }
-
-    public function detectStreamWrapper($register = false)
-    {
-        if ($register) {
-            require_once($this->getBaseDir()."/SFTPPSL_StreamWrapper.php");
-        }
-        return parent::detectStreamWrapper($register);
-    }
-
-    /**
-     * Parse
-     * @param DOMNode $contribNode
-     */
-    protected function parseSpecificContributions(&$contribNode)
-    {
-        parent::parseSpecificContributions($contribNode);
-        if($contribNode->nodeName != "actions") return ;
-        $this->disableArchiveBrowsingContributions($contribNode);
-    }
-
-    /**
-     * @param $src
-     * @param $dest
-     * @param $basedir
-     * @return zipfile
-     */
-    public function makeZip ($src, $dest, $basedir)
-    {
-        @set_time_limit(60);
-        require_once(AJXP_BIN_FOLDER."/pclzip.lib.php");
-        $filePaths = array();
-
-        $uniqid = uniqid();
-        $uniqfolder = '/tmp/ajaxplorer-zip-'.$uniqid;
-        mkdir($uniqfolder);
-
-        foreach ($src as $item) {
-            $basedir = trim(dirname($item));
-            $basename = basename($item);
-            $uniqpath = $uniqfolder.'/'.$basename;
-            $this->full_copy($this->urlBase.$item, $uniqpath);
-            $filePaths[] = array(PCLZIP_ATT_FILE_NAME => $uniqpath,
-                                 PCLZIP_ATT_FILE_NEW_SHORT_NAME => $basename);
-        }
-        $this->logDebug("Pathes", $filePaths);
-        $this->logDebug("Basedir", array($basedir));
-        $archive = new PclZip($dest);
-        $vList = $archive->create($filePaths, PCLZIP_OPT_REMOVE_PATH, $uniqfolder, PCLZIP_OPT_NO_COMPRESSION);
-        $this->recursiveRmdir($uniqfolder);
-        if (!$vList) {
-            throw new Exception("Zip creation error : ($dest) ".$archive->errorInfo(true));
-        }
-        return $vList;
-    }
-
-    public function full_copy( $source, $destination )
-    {
-        if ( is_dir( $source ) ) {
-            @mkdir( $destination );
-            $directory = dir( $source );
-            while ( FALSE !== ( $readdirectory = $directory->read() ) ) {
-                if ($readdirectory == '.' || $readdirectory == '..') {
-                    continue;
-                }
-                $PathDir = $source . '/' . $readdirectory;
-                if ( is_dir( $PathDir ) ) {
-                    $this->full_copy( $PathDir, $destination . '/' . $readdirectory );
-                    continue;
-                }
-                copy( $PathDir, $destination . '/' . $readdirectory );
-            }
-
-            $directory->close();
-        } else {
-            copy( $source, $destination );
-        }
-    }
-
-    public function recursiveRmdir($path)
-    {
-        if (is_dir($path)) {
-            $path = rtrim($path, '/');
-            $subdir = dir($path);
-            while (($file = $subdir->read()) !== false) {
-                if ($file != '.' && $file != '..') {
-                    (!is_link("$path/$file") && is_dir("$path/$file")) ? $this->recursiveRmdir("$path/$file") : unlink("$path/$file");
-                }
-            }
-            $subdir->close();
-            rmdir($path);
-            return true;
-        }
-        return false;
-    }
-
-    public function isWriteable($dir, $type="dir")
-    {
-        return is_writable($dir);
-    }
-}
diff --git a/core/src/plugins/access.sftp_psl/class.sftpPSLAccessWrapper.php b/core/src/plugins/access.sftp_psl/class.sftpPSLAccessWrapper.php
deleted file mode 100644
index 3edc7fcaac..0000000000
--- a/core/src/plugins/access.sftp_psl/class.sftpPSLAccessWrapper.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-/*
- * Copyright 2013 Nikita ROUSSEAU <warhawk3407@gmail.com>
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed' );
-
-require_once(AJXP_INSTALL_PATH."/plugins/access.fs/class.fsAccessWrapper.php");
-require_once(AJXP_INSTALL_PATH."/plugins/access.sftp_psl/phpseclib/SSH2.php");
-
-/**
- * AJXP_Plugin to access a remote server using SSH File Transfer Protocol (SFTP) with phpseclib ( http://phpseclib.sourceforge.net/ )
- *
- * @author	warhawk3407 <warhawk3407@gmail.com>
- * @author	Charles du Jeu <contact (at) cdujeu.me>
- * @version	Release: 1.0.2
- */
-class sftpPSLAccessWrapper extends fsAccessWrapper
-{
-
-    public static function isRemote()
-    {
-        return true;
-    }
-
-    public static function isSeekable($url)
-    {
-        return false;
-    }
-
-    /**
-     * Initialize the stream from the given path.
-     */
-    protected static function initPath($path, $streamType = '', $storeOpenContext = false, $skipZip = true)
-    {
-        $url = AJXP_Utils::safeParseUrl($path);
-        $repoId = $url["host"];
-        $path = $url["path"];
-
-        $repoObject = ConfService::getRepositoryById($repoId);
-
-        if(!isSet($repoObject)) throw new Exception("Cannot find repository with id ".$repoId);
-
-        $basePath = $repoObject->getOption("PATH");
-        $host = $repoObject->getOption("SFTP_HOST");
-        $port = $repoObject->getOption("SFTP_PORT");
-
-        $credentials = AJXP_Safe::tryLoadingCredentialsFromSources($url, $repoObject);
-        $user = $credentials["user"];
-        $pass = $credentials["password"];
-
-        if ($basePath[strlen($basePath)-1] == "/") {
-            $basePath = substr($basePath, 0, -1);
-        }
-
-        if ($basePath[0] != "/") {
-            $basePath = "/$basePath";
-        }
-
-        $path = AJXP_Utils::securePath($path);
-
-        if ($path[0] == "/") {
-            $path = substr($path, 1);
-        }
-
-        return  "sftp://".$user.':'.$pass.'@'.$host.':'.$port.$basePath."/".$path; // http://username:password@hostname:port/path/file.ext
-    }
-
-    /**
-     * Implementation of AjxpStream
-     *
-     * @param String $path
-     * @return string
-     */
-    public static function getRealFSReference($path, $persistent = false)
-    {
-        if ($persistent) {
-            $tmpFile = AJXP_Utils::getAjxpTmpDir()."/".md5(time());
-            $tmpHandle = fopen($tmpFile, "wb");
-            self::copyFileInStream($path, $tmpHandle);
-            fclose($tmpHandle);
-            return $tmpFile;
-        } else {
-            return self::initPath($path);
-        }
-    }
-
-    /**
-     * Opens the stream
-     * Diff with parent class : do not "securePath", as it removes double slash
-     *
-     * @param String $path Maybe in the form "ajxp.fs://repositoryId/pathToFile"
-     * @param String $mode
-     * @param unknown_type $options
-     * @param unknown_type $opened_path
-     * @return unknown
-     */
-    public function stream_open($path, $mode, $options, &$context)
-    {
-        try {
-            $this->realPath = $this->initPath($path);
-        } catch (Exception $e) {
-            AJXP_Logger::error(__CLASS__,"stream_open", "Error while opening stream $path");
-            return false;
-        }
-        if ($this->realPath == -1) {
-            $this->fp = -1;
-            return true;
-        } else {
-            $this->fp = fopen($this->realPath, $mode, $options);
-            return ($this->fp !== false);
-        }
-    }
-
-    /**
-     * Opens a handle to the dir
-     * Fix PEAR by being sure it ends up with "/", to avoid
-     * adding the current dir to the children list.
-     *
-     * @param unknown_type $path
-     * @param unknown_type $options
-     * @return unknown
-     */
-    public function dir_opendir ($path , $options )
-    {
-        $this->realPath = $this->initPath($path);
-        if ($this->realPath[strlen($this->realPath)-1] != "/") {
-            $this->realPath.="/";
-        }
-        if (is_string($this->realPath)) {
-            $this->dH = opendir($this->realPath);
-        } else if ($this->realPath == -1) {
-            $this->dH = -1;
-        }
-        return $this->dH !== false;
-    }
-
-    public function unlink($path)
-    {
-        $this->realPath = $this->initPath($path, "file", false, true);
-        @unlink($this->realPath);
-        if (is_file($this->realPath)) {
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * Stats the given path.
-     *
-     * @param string $path
-     * @param mixed $flags
-     * @return array
-     */
-    public function url_stat($path, $flags)
-    {
-        $realPath = self::initPath($path);
-        $stat = @stat($realPath);
-        $parts = AJXP_Utils::safeParseUrl($path);
-        $repoObject = ConfService::getRepositoryById($parts["host"]);
-
-        AbstractAccessDriver::fixPermissions($stat, $repoObject, array($this, "detectRemoteUserId"));
-
-        return $stat;
-    }
-
-    public function detectRemoteUserId($repoObject)
-    {
-        $host = $repoObject->getOption("SFTP_HOST");
-        $port = $repoObject->getOption("SFTP_PORT");
-
-        $credentials = AJXP_Safe::tryLoadingCredentialsFromSources(NULL, $repoObject);
-        $user = $credentials["user"];
-        $pass = $credentials["password"];
-
-        $ssh2 = new Net_SSH2($host, $port);
-        if ($ssh2->login($user, $pass)) {
-            $output = $ssh2->exec( 'id' );
-
-            $ssh2->disconnect();
-
-            if (trim($output != "")) {
-                $res = sscanf($output, "uid=%i(%s) gid=%i(%s) groups=%i(%s)");
-                preg_match_all("/(\w*)=(\w*)\((\w*)\)/", $output, $matches);
-                if (count($matches[0]) == 3) {
-                    $uid = $matches[2][0];
-                    $gid = $matches[2][1];
-
-                    return array($uid, $gid);
-                }
-            }
-        }
-        unset($ssh2);
-
-        return array(null,null);
-    }
-
-    /**
-     * Override parent function.
-     * We may have performance problems on big files here.
-     *
-     * @param String $path
-     * @param Stream $stream
-     */
-    public static function copyFileInStream($path, $stream)
-    {
-        $src = fopen(self::initPath($path), "rb");
-        while ($content = fread($src, 5120)) {
-            fputs($stream, $content, strlen($content));
-            if(strlen($content) == 0) break;
-        }
-        fclose($src);
-    }
-
-    /**
-     * Remove a temporary file
-     *
-     * @param String $tmpDir
-     * @param String $tmpFile
-     */
-    public static function removeTmpFile($tmpDir, $tmpFile)
-    {
-        if(is_file($tmpFile)) unlink($tmpFile);
-        if(is_dir($tmpDir)) rmdir($tmpDir);
-    }
-
-}
diff --git a/core/src/plugins/access.sftp_psl/i18n/conf/de.php b/core/src/plugins/access.sftp_psl/i18n/conf/de.php
index 449b2d82db..378ed28611 100644
--- a/core/src/plugins/access.sftp_psl/i18n/conf/de.php
+++ b/core/src/plugins/access.sftp_psl/i18n/conf/de.php
@@ -1,23 +1,23 @@
 <?php
 /*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
 $mess=array(
 "SSH File Transfer Protocol (SFTP)" => "SSH File Transfer Protocol (SFTP)",
 "The SSH File Transfer Protocol is a network protocol that provides file access, file transfer, and file management functionalities over SSH2." => "Ein Netzwerk-Protokoll für Datei-Zugriff und Datei-Verwaltung über SSH2.",
@@ -28,7 +28,5 @@
 "Path" => "Pfad",
 "Real path to the root folder on the server" => "Absoluter Pfad zum Hauptordner auf dem Server",
 "Fix Permissions" => "Berechtigungen korrigieren",
-"How to handle remote permissions to be used by PHP as local permissions. See manual." => "Wie die Serverrechte durch PHP als lokale Rechte verwendet werden. Siehe Anleitung.",
-"Create" => "Create",
-"Create folder if it does not exists" => "Create folder if it does not exists",
-);
\ No newline at end of file
+"How to handle remote permissions to be used by PHP as local permissions. See manual." => "Wie die Serverrechte durch PHP als lokale Rechte verwendet werden. Siehe Anleitung."
+);
diff --git a/core/src/plugins/access.sftp_psl/i18n/conf/en.php b/core/src/plugins/access.sftp_psl/i18n/conf/en.php
index 7ac31708f3..6515859e12 100644
--- a/core/src/plugins/access.sftp_psl/i18n/conf/en.php
+++ b/core/src/plugins/access.sftp_psl/i18n/conf/en.php
@@ -1,23 +1,23 @@
 <?php
 /*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
 $mess=array(
 "SSH File Transfer Protocol (SFTP)" => "SSH File Transfer Protocol (SFTP)",
 "The SSH File Transfer Protocol is a network protocol that provides file access, file transfer, and file management functionalities over SSH2." => "The SSH File Transfer Protocol is a network protocol that provides file access, file transfer, and file management functionalities over SSH2.",
@@ -29,6 +29,4 @@
 "Real path to the root folder on the server" => "Real path to the root folder on the server",
 "Fix Permissions" => "Fix Permissions",
 "How to handle remote permissions to be used by PHP as local permissions. See manual." => "How to handle remote permissions to be used by PHP as local permissions. See manual.",
-"Create" => "Create",
-"Create folder if it does not exists" => "Create folder if it does not exists",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/access.sftp_psl/i18n/conf/fr.php b/core/src/plugins/access.sftp_psl/i18n/conf/fr.php
index b211980f89..b60da14823 100644
--- a/core/src/plugins/access.sftp_psl/i18n/conf/fr.php
+++ b/core/src/plugins/access.sftp_psl/i18n/conf/fr.php
@@ -1,23 +1,23 @@
 <?php
 /*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
 $mess=array(
 "SSH File Transfer Protocol (SFTP)" => "SSH File Transfer Protocol (SFTP)",
 "The SSH File Transfer Protocol is a network protocol that provides file access, file transfer, and file management functionalities over SSH2." => "SSH File Transfer Protocol est un protocle réseau permettant l'accès, le transfert et la gestion de fichiers, à travers SSH2.",
@@ -28,7 +28,5 @@
 "Path" => "Chemin",
 "Real path to the root folder on the server" => "Chemin du répertoire de base sur le serveur distant",
 "Fix Permissions" => "Corriger les permissions",
-"How to handle remote permissions to be used by PHP as local permissions. See manual." => "Considérer, par PHP, les permissions distantes comme des permissions locales. Consultez le manuel.",
-"Create" => "Créér",
-"Create folder if it does not exists" => "Créer le répertoire s'il n'existe pas",
-);
\ No newline at end of file
+"How to handle remote permissions to be used by PHP as local permissions. See manual." => "Considérer, par PHP, les permissions distantes comme des permissions locales. Consultez le manuel."
+);
diff --git a/core/src/plugins/access.sftp_psl/i18n/conf/it.php b/core/src/plugins/access.sftp_psl/i18n/conf/it.php
index 8a54fa6ede..42d3f4a649 100644
--- a/core/src/plugins/access.sftp_psl/i18n/conf/it.php
+++ b/core/src/plugins/access.sftp_psl/i18n/conf/it.php
@@ -1,23 +1,23 @@
 <?php
 /*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
 $mess=array(
 "SSH File Transfer Protocol (SFTP)" => "SSH File Transfer Protocol (SFTP)",
 "The SSH File Transfer Protocol is a network protocol that provides file access, file transfer, and file management functionalities over SSH2." => "Questo protocollo è un protocollo di rete che fornisce accesso ai file, il loro trasferimento e la loro gestione, attraverso l'SSH2.",
@@ -28,7 +28,5 @@
 "Path" => "Percorso",
 "Real path to the root folder on the server" => "Percorso reale alla cartella principale sul server",
 "Fix Permissions" => "Permessi",
-"How to handle remote permissions to be used by PHP as local permissions. See manual." => "Come gestire i permessi remoti per essere utilizzati dal PHP come permessi locali. Se veda il manuale.",
-"Create" => "Create",
-"Create folder if it does not exists" => "Create folder if it does not exists",
-);
\ No newline at end of file
+"How to handle remote permissions to be used by PHP as local permissions. See manual." => "Come gestire i permessi remoti per essere utilizzati dal PHP come permessi locali. Se veda il manuale."
+);
diff --git a/core/src/plugins/access.sftp_psl/manifest.xml b/core/src/plugins/access.sftp_psl/manifest.xml
index d9727b864c..9088db99fc 100644
--- a/core/src/plugins/access.sftp_psl/manifest.xml
+++ b/core/src/plugins/access.sftp_psl/manifest.xml
@@ -39,8 +39,6 @@
 
 	<registry_contributions>
 		<client_configs>
-			<template_part ajxpId="search_container" ajxpClass="SearchEngine" ajxpOptions="{}"/>
-			<template_part ajxpId="search_container" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "fitMarginBottom":20}' theme="vision"/>
             <template_part ajxpId="search_container" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "openSearchInput":"true", "openSearchStickLeftTo":"topPane", "searchChooserAsResultsHeader":true, "toggleResultsFitTo":"cpane_tabs", "fitMarginBottom":0, "toggleResultsOffsetRight":0, "toggleResultsOffsetTop":0, "detailThumbSize":24}' theme="orbit"/>
 			<component_config className="FilesList">
 				<columns switchGridMode="filelist">
@@ -64,7 +62,7 @@
 		<pluginClass pluginName="access.fs"/>
 	</dependencies>
 
-    <class_definition filename="plugins/access.sftp_psl/class.sftpPSLAccessDriver.php" classname="sftpPSLAccessDriver"/>
-    <class_stream_wrapper filename="plugins/access.sftp_psl/class.sftpPSLAccessWrapper.php" classname="sftpPSLAccessWrapper" protocol="ajxp.sftppsl"/>
+    <class_definition filename="plugins/access.sftp_psl/SftpPSLAccessDriver.php" classname="Pydio\Access\Driver\StreamProvider\SFTP_PSL\SftpPSLAccessDriver"/>
+    <class_stream_wrapper filename="plugins/access.sftp_psl/SftpPSLAccessWrapper.php" classname="Pydio\Access\Driver\StreamProvider\SFTP_PSL\SftpPSLAccessWrapper" protocol="ajxp.sftppsl"/>
 
 </ajxpdriver>
diff --git a/core/src/plugins/access.smb/SMBAccessDriver.php b/core/src/plugins/access.smb/SMBAccessDriver.php
new file mode 100644
index 0000000000..702523110f
--- /dev/null
+++ b/core/src/plugins/access.smb/SMBAccessDriver.php
@@ -0,0 +1,123 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ *
+ */
+namespace Pydio\Access\Driver\StreamProvider\SMB;
+
+use DOMNode;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\RecycleBinManager;
+use Pydio\Access\Core\Model\Repository;
+use Pydio\Access\Driver\StreamProvider\FS\FsAccessDriver;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Exception\PydioException;
+
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Plugin to access a samba server
+ * @package AjaXplorer_Plugins
+ * @subpackage Access
+ */
+class SMBAccessDriver extends FsAccessDriver
+{
+    /**
+    * @var Repository
+    */
+    public $repository;
+    public $driverConf;
+    protected $wrapperClassName;
+    protected $urlBase;
+
+    /**
+     * @param ContextInterface $contextInterface
+     * @throws PydioException
+     * @throws \Exception
+     */
+    protected function initRepository(ContextInterface $contextInterface)
+    {
+        if (is_array($this->pluginConf)) {
+            $this->driverConf = $this->pluginConf;
+        } else {
+            $this->driverConf = array();
+        }
+        $smbclientPath = $this->driverConf["SMBCLIENT"];
+        define ('SMB4PHP_SMBCLIENT', $smbclientPath);
+
+        $smbtmpPath = $this->driverConf["SMB_PATH_TMP"];
+        define ('SMB4PHP_SMBTMP', $smbtmpPath);
+		
+        require_once($this->getBaseDir()."/smb.php");
+
+        //$create = $this->repository->getOption("CREATE");
+        $recycle = $this->repository->getContextOption($contextInterface, "RECYCLE_BIN");
+
+        $this->urlBase = $contextInterface->getUrlBase();
+
+        if ($recycle!= "" && !is_dir($contextInterface->getUrlBase()."/".$recycle)) {
+            @mkdir($contextInterface->getUrlBase()."/".$recycle);
+            if (!is_dir($contextInterface->getUrlBase()."/".$recycle)) {
+                throw new PydioException("Cannot create recycle bin folder. Please check repository configuration or that your folder is writeable!");
+            }
+        }
+        if ($recycle != "") {
+            RecycleBinManager::init($contextInterface->getUrlBase(), "/".$recycle);
+        }
+
+    }
+
+    /**
+     * @param bool $register
+     * @param ContextInterface|null $ctx
+     * @return array|bool
+     */
+    public function detectStreamWrapper($register = false, ContextInterface $ctx = null)
+    {
+        if ($register) {
+            require_once($this->getBaseDir()."/smb.php");
+        }
+        return parent::detectStreamWrapper($register, $ctx);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function parseSpecificContributions(ContextInterface $ctx, \DOMNode &$contribNode)
+    {
+        parent::parseSpecificContributions($ctx, $contribNode);
+        if ($contribNode->nodeName != "actions" || (isSet($this->pluginConf["SMB_ENABLE_ZIP"]) && $this->pluginConf["SMB_ENABLE_ZIP"] == true)) {
+            return ;
+        }
+        $this->disableArchiveBrowsingContributions($contribNode);
+    }
+
+    /**
+     * @param AJXP_Node $node
+     * @return bool
+     */
+    public function isWriteable(AJXP_Node $node)
+    {
+        $dir = $node->getPath();
+        if(substr_count($dir, '/') <= 3) $rc = true;
+    	else $rc = is_writable($dir);
+    	return $rc;
+    }
+}
diff --git a/core/src/plugins/access.smb/SMBAccessWrapper.php b/core/src/plugins/access.smb/SMBAccessWrapper.php
new file mode 100644
index 0000000000..1f35f5ddc4
--- /dev/null
+++ b/core/src/plugins/access.smb/SMBAccessWrapper.php
@@ -0,0 +1,253 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ *
+ */
+namespace Pydio\Access\Driver\StreamProvider\SMB;
+
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Driver\StreamProvider\FS\FsAccessWrapper;
+use Pydio\Auth\Core\MemorySafe;
+
+
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Vars\VarsFilter;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+require_once(AJXP_INSTALL_PATH . "/plugins/access.fs/FsAccessWrapper.php");
+
+/**
+ * AJXP_Wrapper encapsulating calls to the smbclient command line tool
+ * @package AjaXplorer_Plugins
+ * @subpackage Access
+ */
+class SMBAccessWrapper extends FsAccessWrapper
+{
+    /**
+     * Initialize the stream from the given path.
+     * Concretely, transform ajxp.smb:// into smb://
+     *
+     * @param string $path
+     * @param $streamType
+     * @param bool $storeOpenContext
+     * @param bool $skipZip
+     * @return mixed Real path or -1 if currentListing contains the listing : original path converted to real path
+     * @throws \Exception
+     */
+    protected static function initPath($path, $streamType, $storeOpenContext = false, $skipZip = false)
+    {
+        $node = new AJXP_Node($path);
+        $repoObject = $node->getRepository();
+        if(!isSet($repoObject)) {
+            throw new \Exception("Cannot find repository with id ".$node->getRepositoryId());
+        }
+        $path = $node->getPath();
+        // Fix if the host is defined as //MY_HOST/path/to/folder
+        $user = $node->getUser();
+        if($user != null){
+            $hostOption = $user->getMergedRole()->filterParameterValue("access.smb", "HOST", $node->getRepositoryId(), null);
+            if(!empty($hostOption)) $hostOption = VarsFilter::filter($hostOption, $node->getContext());
+        }
+        if(empty($hostOption)) {
+            $hostOption = $repoObject->getContextOption($node->getContext(), "HOST");
+        }
+        $host = str_replace("//", "", $hostOption);
+        $credentials = "";
+        $safeCreds = MemorySafe::tryLoadingCredentialsFromSources($node->getContext());
+        if ($safeCreds["user"] != "" && $safeCreds["password"] != "") {
+            $login = $safeCreds["user"];
+            $pass = $safeCreds["password"];
+            $_SESSION["AJXP_SESSION_REMOTE_PASS"] = $pass;
+            $credentials = "$login:$pass@";
+            $domain = $repoObject->getContextOption($node->getContext(), "DOMAIN");
+            if($domain != "") {
+                if((strcmp(substr($domain, -1), "/") === 0) || (strcmp(substr($domain, -1), "\\") === 0)){
+                    $credentials = $domain.$credentials;
+                }else{
+                    $credentials = $domain."/".$credentials;
+                }
+            }
+        }
+        $basePath = $repoObject->getContextOption($node->getContext(), "PATH");
+        $fullPath = "smbclient://".$credentials.$host."/";//.$basePath."/".$path;
+        if ($basePath!="") {
+           $fullPath.=trim($basePath, "/\\" );
+           }
+           if ($path!="") {
+           $fullPath.= (($path[0] == "/")? "" : "/").$path;
+           }
+
+        return $fullPath;
+    }
+
+
+    /**
+     * @param AJXP_Node $node
+     * @return array
+     * @throws \Exception
+     */
+    public static function getResolvedOptionsForNode($node)
+    {
+        $options = [
+            "TYPE" => "smb"
+        ];
+        $repoObject = $node->getRepository();
+        $context = $node->getContext();
+        $credentials = MemorySafe::tryLoadingCredentialsFromSources($context);
+        $options["USER"] = $credentials["user"];
+        $options["PASSWORD"] = $credentials["password"];
+        // Fix if the host is defined as //MY_HOST/path/to/folder
+        $user = $node->getUser();
+        if($user != null){
+            $hostOption = $user->getMergedRole()->filterParameterValue("access.smb", "HOST", $node->getRepositoryId(), null);
+            if(!empty($hostOption)) $hostOption = VarsFilter::filter($hostOption, $node->getContext());
+        }
+        if(empty($hostOption)) {
+            $hostOption = $repoObject->getContextOption($node->getContext(), "HOST");
+        }
+        $options["HOST"]  = $hostOption;
+        $options["DOMAIN"]  = $repoObject->getContextOption($context, "DOMAIN");
+        $options["PATH"]  = $repoObject->getContextOption($context, "PATH");
+
+        return $options;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function stream_open($path, $mode, $options, &$context)
+    {
+        try {
+            $this->realPath = $this->initPath($path, "file");
+        } catch (\Exception $e) {
+            Logger::error(__CLASS__,"stream_open", "Error while opening stream $path");
+            return false;
+        }
+        if ($this->realPath == -1) {
+            $this->fp = -1;
+            return true;
+        } else {
+            $this->fp = fopen($this->realPath, $mode, $options);
+            //AJXP_Logger::debug(__CLASS__,__FUNCTION__,"I opened an smb stream.");
+            return ($this->fp !== false);
+        }
+    }
+
+    /**
+     * Opens a handle to the dir
+     * Fix PEAR by being sure it ends up with "/", to avoid
+     * adding the current dir to the children list.
+     *
+     * @param string $path
+     * @param mixed $options
+     * @return resource
+     */
+    public function dir_opendir ($path , $options )
+    {
+        $this->realPath = $this->initPath($path, "dir", true);
+        if ($this->realPath[strlen($this->realPath)-1] != "/") {
+            $this->realPath.="/";
+        }
+        if (is_string($this->realPath)) {
+            $this->dH = opendir($this->realPath);
+        } else if ($this->realPath == -1) {
+            $this->dH = -1;
+        }
+        return $this->dH !== false;
+    }
+
+
+    // DUPBLICATE STATIC FUNCTIONS TO BE SURE
+    // NOT TO MESS WITH self:: CALLS
+    /**
+     * @param string $tmpDir
+     * @param string $tmpFile
+     */
+    public static function removeTmpFile($tmpDir, $tmpFile)
+    {
+        if(is_file($tmpFile)) unlink($tmpFile);
+        if(is_dir($tmpDir)) rmdir($tmpDir);
+    }
+
+    /**
+     * Close wrapper
+     */
+    protected static function closeWrapper()
+    {
+        if (self::$crtZip != null) {
+            self::$crtZip = null;
+            self::$currentListing  = null;
+            self::$currentListingKeys = null;
+            self::$currentListingIndex = null;
+            self::$currentFileKey = null;
+        }
+    }
+
+    /**
+     * @param string $path
+     * @param bool $persistent
+     * @return mixed|string
+     * @throws \Exception
+     */
+    public static function getRealFSReference($path, $persistent = false)
+    {
+        if ($persistent) {
+            $tmpFile = ApplicationState::getAjxpTmpDir() ."/".md5(time());
+            $tmpHandle = fopen($tmpFile, "wb");
+            self::copyFileInStream($path, $tmpHandle);
+            fclose($tmpHandle);
+            return $tmpFile;
+        } else {
+            $realPath = self::initPath($path, "file");
+            return $realPath;
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    public static function isRemote()
+    {
+        return true;
+    }
+
+    /**
+     * @param string $path
+     * @param resource $stream
+     */
+    public static function copyFileInStream($path, $stream)
+    {
+        $fp = fopen(self::getRealFSReference($path), "rb");
+        if(!is_resource($fp)) return;
+        while (!feof($fp)) {
+            $data = fread($fp, 4096);
+            fwrite($stream, $data, strlen($data));
+        }
+        fclose($fp);
+    }
+
+    /**
+     * @param string $path
+     * @param number $chmodValue
+     */
+    public static function changeMode($path, $chmodValue){
+    }
+}
diff --git a/core/src/plugins/access.smb/class.smbAccessDriver.php b/core/src/plugins/access.smb/class.smbAccessDriver.php
deleted file mode 100644
index 00a1009ffe..0000000000
--- a/core/src/plugins/access.smb/class.smbAccessDriver.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * AJXP_Plugin to access a samba server
- * @package AjaXplorer_Plugins
- * @subpackage Access
- */
-class smbAccessDriver extends fsAccessDriver
-{
-    /**
-    * @var Repository
-    */
-    public $repository;
-    public $driverConf;
-    protected $wrapperClassName;
-    protected $urlBase;
-
-    public function initRepository()
-    {
-        if (is_array($this->pluginConf)) {
-            $this->driverConf = $this->pluginConf;
-        } else {
-            $this->driverConf = array();
-        }
-        $smbclientPath = $this->driverConf["SMBCLIENT"];
-        define ('SMB4PHP_SMBCLIENT', $smbclientPath);
-
-        $smbtmpPath = $this->driverConf["SMB_PATH_TMP"];
-        define ('SMB4PHP_SMBTMP', $smbtmpPath);
-		
-        require_once($this->getBaseDir()."/smb.php");
-
-        $create = $this->repository->getOption("CREATE");
-        $recycle = $this->repository->getOption("RECYCLE_BIN");
-
-        $this->detectStreamWrapper(true);
-        $this->urlBase = "pydio://".$this->repository->getId();
-
-        if ($recycle!= "" && !is_dir($this->urlBase."/".$recycle)) {
-            @mkdir($this->urlBase."/".$recycle);
-            if (!is_dir($this->urlBase."/".$recycle)) {
-                throw new AJXP_Exception("Cannot create recycle bin folder. Please check repository configuration or that your folder is writeable!");
-            }
-        }
-        if ($recycle != "") {
-            RecycleBinManager::init($this->urlBase, "/".$recycle);
-        }
-
-    }
-
-    public function detectStreamWrapper($register = false)
-    {
-        if ($register) {
-            require_once($this->getBaseDir()."/smb.php");
-        }
-        return parent::detectStreamWrapper($register);
-    }
-
-    /**
-     * Parse
-     * @param DOMNode $contribNode
-     */
-    protected function parseSpecificContributions(&$contribNode)
-    {
-        parent::parseSpecificContributions($contribNode);
-        if ($contribNode->nodeName != "actions" || (isSet($this->pluginConf["SMB_ENABLE_ZIP"]) && $this->pluginConf["SMB_ENABLE_ZIP"] == true)) {
-            return ;
-        }
-        $this->disableArchiveBrowsingContributions($contribNode);
-    }
-
-    public function makeZip ($src, $dest, $basedir)
-    {
-        @set_time_limit(0);
-        require_once(AJXP_BIN_FOLDER."/pclzip.lib.php");
-        $zipEncoding = ConfService::getCoreConf("ZIP_ENCODING");
-
-        $filePaths = array();
-        foreach ($src as $item) {
-            $url = $this->urlBase.(($item[0] == "/")? "" : "/").AJXP_Utils::securePath($item);
-            $realFile = AJXP_MetaStreamWrapper::getRealFSReference($url);
-            //$basedir = trim(dirname($realFile))."/";
-            if (basename($item) == "") {
-                $filePaths[] = array(PCLZIP_ATT_FILE_NAME => $realFile);
-            } else {
-                $shortName = basename($item);
-                if(!empty($zipEncoding)){
-                    $test = iconv(SystemTextEncoding::getEncoding(), $zipEncoding, $shortName);
-                    if($test !== false) $shortName = $test;
-                }
-                $filePaths[] = array(PCLZIP_ATT_FILE_NAME => $realFile,
-                    PCLZIP_ATT_FILE_NEW_SHORT_NAME => $shortName);
-            }
-        }
-        self::$filteringDriverInstance = $this;
-        $archive = new PclZip($dest);
-        if($basedir == "__AJXP_ZIP_FLAT__/"){
-            $vList = $archive->create($filePaths, PCLZIP_OPT_REMOVE_ALL_PATH, PCLZIP_OPT_NO_COMPRESSION, PCLZIP_OPT_ADD_TEMP_FILE_ON, PCLZIP_CB_PRE_ADD, 'zipPreAddCallback');
-        }else{
-            $basedir = AJXP_MetaStreamWrapper::getRealFSReference($this->urlBase).trim($basedir);
-            $this->logDebug("Basedir", array($basedir));
-            $vList = $archive->create($filePaths, PCLZIP_OPT_REMOVE_PATH, $basedir, PCLZIP_OPT_NO_COMPRESSION, PCLZIP_OPT_ADD_TEMP_FILE_ON, PCLZIP_CB_PRE_ADD, 'zipPreAddCallback');
-        }
-        if (!$vList) {
-            throw new Exception("Zip creation error : ($dest) ".$archive->errorInfo(true));
-        }
-        self::$filteringDriverInstance = null;
-        return $vList;
-    }
-
-    public function isWriteable($dir, $type="dir")
-    {
-        if(substr_count($dir, '/') <= 3) $rc = true;
-    	else $rc = is_writable($dir);
-    	return $rc;
-    }
-}
diff --git a/core/src/plugins/access.smb/class.smbAccessWrapper.php b/core/src/plugins/access.smb/class.smbAccessWrapper.php
deleted file mode 100644
index 121a45dc82..0000000000
--- a/core/src/plugins/access.smb/class.smbAccessWrapper.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-require_once(AJXP_INSTALL_PATH."/plugins/access.fs/class.fsAccessWrapper.php");
-
-/**
- * AJXP_Wrapper encapsulating calls to the smbclient command line tool
- * @package AjaXplorer_Plugins
- * @subpackage Access
- */
-class smbAccessWrapper extends fsAccessWrapper
-{
-    /**
-     * Initialize the stream from the given path.
-     * Concretely, transform ajxp.smb:// into smb://
-     *
-     * @param string $path
-     * @return mixed Real path or -1 if currentListing contains the listing : original path converted to real path
-     */
-    protected static function initPath($path, $streamType, $storeOpenContext = false, $skipZip = false)
-    {
-        $url = AJXP_Utils::safeParseUrl($path);
-        $repoId = $url["host"];
-        $repoObject = ConfService::getRepositoryById($repoId);
-        if(!isSet($repoObject)) throw new Exception("Cannot find repository with id ".$repoId);
-        $path = $url["path"];
-        // Fix if the host is defined as //MY_HOST/path/to/folder
-        $hostOption = AuthService::getFilteredRepositoryOption("access.smb", $repoObject, "HOST");
-        $host = str_replace("//", "", $hostOption);
-        $credentials = "";
-        $safeCreds = AJXP_Safe::tryLoadingCredentialsFromSources($url, $repoObject);
-        if ($safeCreds["user"] != "" && $safeCreds["password"] != "") {
-            $login = $safeCreds["user"];
-            $pass = $safeCreds["password"];
-            $_SESSION["AJXP_SESSION_REMOTE_PASS"] = $pass;
-            $credentials = "$login:$pass@";
-            $domain = $repoObject->getOption("DOMAIN");
-            if($domain != "") {
-                if((strcmp(substr($domain, -1), "/") === 0) || (strcmp(substr($domain, -1), "\\") === 0)){
-                    $credentials = $domain.$credentials;
-                }else{
-                    $credentials = $domain."/".$credentials;
-                }
-            }
-        }
-        $basePath = $repoObject->getOption("PATH");
-        $fullPath = "smbclient://".$credentials.$host."/";//.$basePath."/".$path;
-        if ($basePath!="") {
-           $fullPath.=trim($basePath, "/\\" );
-           }
-           if ($path!="") {
-           $fullPath.= (($path[0] == "/")? "" : "/").$path;
-           }
-
-        return $fullPath;
-    }
-
-    /**
-     * Opens the stream
-     * Diff with parent class : do not "securePath", as it removes double slash
-     *
-     * @param String $path Maybe in the form "ajxp.fs://repositoryId/pathToFile"
-     * @param String $mode
-     * @param unknown_type $options
-     * @param unknown_type $opened_path
-     * @return unknown
-     */
-    public function stream_open($path, $mode, $options, &$context)
-    {
-        try {
-            $this->realPath = $this->initPath($path, "file");
-        } catch (Exception $e) {
-            AJXP_Logger::error(__CLASS__,"stream_open", "Error while opening stream $path");
-            return false;
-        }
-        if ($this->realPath == -1) {
-            $this->fp = -1;
-            return true;
-        } else {
-            $this->fp = fopen($this->realPath, $mode, $options);
-            //AJXP_Logger::debug(__CLASS__,__FUNCTION__,"I opened an smb stream.");
-            return ($this->fp !== false);
-        }
-    }
-
-    /**
-     * Opens a handle to the dir
-     * Fix PEAR by being sure it ends up with "/", to avoid
-     * adding the current dir to the children list.
-     *
-     * @param unknown_type $path
-     * @param unknown_type $options
-     * @return unknown
-     */
-    public function dir_opendir ($path , $options )
-    {
-        $this->realPath = $this->initPath($path, "dir", true);
-        if ($this->realPath[strlen($this->realPath)-1] != "/") {
-            $this->realPath.="/";
-        }
-        if (is_string($this->realPath)) {
-            $this->dH = opendir($this->realPath);
-        } else if ($this->realPath == -1) {
-            $this->dH = -1;
-        }
-        return $this->dH !== false;
-    }
-
-
-    // DUPBLICATE STATIC FUNCTIONS TO BE SURE
-    // NOT TO MESS WITH self:: CALLS
-
-    public static function removeTmpFile($tmpDir, $tmpFile)
-    {
-        if(is_file($tmpFile)) unlink($tmpFile);
-        if(is_dir($tmpDir)) rmdir($tmpDir);
-    }
-
-    protected static function closeWrapper()
-    {
-        if (self::$crtZip != null) {
-            self::$crtZip = null;
-            self::$currentListing  = null;
-            self::$currentListingKeys = null;
-            self::$currentListingIndex = null;
-            self::$currentFileKey = null;
-        }
-    }
-
-    public static function getRealFSReference($path, $persistent = false)
-    {
-        if ($persistent) {
-            $tmpFile = AJXP_Utils::getAjxpTmpDir()."/".md5(time());
-            $tmpHandle = fopen($tmpFile, "wb");
-            self::copyFileInStream($path, $tmpHandle);
-            fclose($tmpHandle);
-            return $tmpFile;
-        } else {
-            $realPath = self::initPath($path, "file");
-            return $realPath;
-        }
-    }
-
-    public static function isRemote()
-    {
-        return true;
-    }
-
-    public static function copyFileInStream($path, $stream)
-    {
-        $fp = fopen(self::getRealFSReference($path), "rb");
-        if(!is_resource($fp)) return;
-        while (!feof($fp)) {
-            $data = fread($fp, 4096);
-            fwrite($stream, $data, strlen($data));
-        }
-        fclose($fp);
-    }
-
-    public static function changeMode($path, $chmodValue)
-    {
-        //$realPath = self::initPath($path, "file");
-        //chmod($realPath, $chmodValue);
-    }
-}
diff --git a/core/src/plugins/access.smb/i18n/conf/de.php b/core/src/plugins/access.smb/i18n/conf/de.php
index 9f4323b2ec..139bfee5fb 100644
--- a/core/src/plugins/access.smb/i18n/conf/de.php
+++ b/core/src/plugins/access.smb/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Samba" => "Samba",
diff --git a/core/src/plugins/access.smb/i18n/conf/en.php b/core/src/plugins/access.smb/i18n/conf/en.php
index 65bb6a4e4f..bc54928964 100644
--- a/core/src/plugins/access.smb/i18n/conf/en.php
+++ b/core/src/plugins/access.smb/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Samba" => "Samba",
diff --git a/core/src/plugins/access.smb/i18n/conf/fr.php b/core/src/plugins/access.smb/i18n/conf/fr.php
index e2eeb8bb2a..6dd878b965 100644
--- a/core/src/plugins/access.smb/i18n/conf/fr.php
+++ b/core/src/plugins/access.smb/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Samba" => "Samba",
diff --git a/core/src/plugins/access.smb/i18n/conf/it.php b/core/src/plugins/access.smb/i18n/conf/it.php
index 172b3f1a7f..242f2d5de7 100644
--- a/core/src/plugins/access.smb/i18n/conf/it.php
+++ b/core/src/plugins/access.smb/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Samba" => "Samba",
@@ -39,4 +39,4 @@
 "Enable zip creation for repositories using Samba access. Make sure that you are using a very fast network, otherwise it will be very long!" => "Enable zip creation for repositories using Samba access. Make sure that you are using a very fast network, otherwise it will be very long!",
 "Path Tmp" => "Path Tmp",
 "OS Path Temporary if not the default one" => "OS Path Temporary if not the default one",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/access.smb/i18n/conf/pt.php b/core/src/plugins/access.smb/i18n/conf/pt.php
index 7783a59b6d..2b6afcbc74 100644
--- a/core/src/plugins/access.smb/i18n/conf/pt.php
+++ b/core/src/plugins/access.smb/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Samba" => "Samba",
diff --git a/core/src/plugins/access.smb/manifest.xml b/core/src/plugins/access.smb/manifest.xml
index ab8f460930..ad1b11fa73 100644
--- a/core/src/plugins/access.smb/manifest.xml
+++ b/core/src/plugins/access.smb/manifest.xml
@@ -15,7 +15,6 @@
         <global_param name="SMB_ENABLE_ZIP" type="boolean" label="CONF_MESSAGE[Enable Zip]" description="CONF_MESSAGE[Enable zip creation for repositories using Samba access. Make sure that you are using a very fast network, otherwise it will be very long!]" mandatory="false" default="false"/>
         <global_param group="MIXIN_MESSAGE[Metadata and indexation]" name="DEFAULT_METASOURCES" type="string" label="MIXIN_MESSAGE[Default Metasources]" description="MIXIN_MESSAGE[Comma separated list of metastore and meta plugins, that will be automatically applied to all repositories created with this driver]" mandatory="false" default="metastore.serial,meta.filehasher,index.lucene"/>
     </server_settings>
-	<class_definition filename="plugins/access.smb/class.smbAccessDriver.php" classname="smbAccessDriver"/>
 	<registry_contributions>
         <external_file filename="plugins/access.fs/fsTemplatePart.xml" include="client_configs/*" exclude=""/>
 		<external_file filename="plugins/access.fs/fsActions.xml" include="actions/*" exclude=""/>
@@ -31,5 +30,6 @@
 	<dependencies>
 		<pluginClass pluginName="access.fs"/>
 	</dependencies>
-    <class_stream_wrapper filename="plugins/access.smb/class.smbAccessWrapper.php" classname="smbAccessWrapper" protocol="ajxp.smb"/>
+	<class_definition filename="plugins/access.smb/SMBAccessDriver.php" classname="Pydio\Access\Driver\StreamProvider\SMB\SMBAccessDriver"/>
+    <class_stream_wrapper filename="plugins/access.smb/SMBAccessWrapper.php" classname="Pydio\Access\Driver\StreamProvider\SMB\SMBAccessWrapper" protocol="ajxp.smb"/>
 </ajxpdriver>
diff --git a/core/src/plugins/access.smb/smb.php b/core/src/plugins/access.smb/smb.php
index e3847f11eb..06ebeabc52 100644
--- a/core/src/plugins/access.smb/smb.php
+++ b/core/src/plugins/access.smb/smb.php
@@ -20,6 +20,9 @@
 # GNU General Public License for more details.
 #
 ###################################################################
+namespace Pydio\Access\Driver\StreamProvider\SMB;
+
+use Pydio\Log\Core\Logger;
 
 define ('SMB4PHP_VERSION', '0.8');
 
@@ -106,7 +109,7 @@ public static function debug($str, $array = null)
                 }
             }
         }
-        AJXP_Logger::debug(__CLASS__,__FUNCTION__,$str, $array);
+        Logger::debug(__CLASS__,__FUNCTION__,$str, $array);
     }
 
 
@@ -195,97 +198,103 @@ public function client ($params, $purl)
             $env = array("LC_ALL" => AJXP_LOCALE);
         }
         $process = proc_open($cmd, $descriptorspec, $pipes, null, $env);
-        if (is_resource($process)) {
-            fclose($pipes[0]);
-            $error = stream_get_contents($pipes[2]);
-            fclose($pipes[2]);
-            if ($error != "") {
-                $error = strtolower($error);
-                // common error
-                if (strstr($error, "command not found")!==false) {
-                    fclose($pipes[1]);
-                    throw new Exception($error);
-                } else if (strstr($error, "domain")!==false && strstr($error, "os")!==false ) {
-                    self::debug("Smbclient alternate stream : ".$error);
-                } else {
-                    AJXP_Logger::error(__CLASS__,"Smbclient error",$error);
+        try {
+            if (is_resource($process)) {
+                fclose($pipes[0]);
+                $error = stream_get_contents($pipes[2]);
+                fclose($pipes[2]);
+                if ($error != "") {
+                    $error = strtolower($error);
+                    // common error
+                    if (strstr($error, "command not found")!==false) {
+                        fclose($pipes[1]);
+                        throw new \Exception($error);
+                    } else if (strstr($error, "domain")!==false && strstr($error, "os")!==false ) {
+                        self::debug("Smbclient alternate stream : ".$error);
+                    } else {
+                        Logger::error(__CLASS__,"Smbclient error",$error);
+                    }
                 }
+                $output = $pipes[1];
             }
-            $output = $pipes[1];
-        }
 
-        if (isset($output) && is_resource($output)) {
+            if (isset($output) && is_resource($output)) {
+
+                while ($line = fgets ($output, 4096)) {
 
-            while ($line = fgets ($output, 4096)) {
-			
-                if (PHP_OS == "WIN32" || PHP_OS == "WINNT" || PHP_OS == "Windows") {
-                    $line = SystemTextEncoding::fromUTF8($line);
+                    if (PHP_OS == "WIN32" || PHP_OS == "WINNT" || PHP_OS == "Windows") {
+                        //$line = \Pydio\Core\Utils\TextEncoder::fromUTF8($line);
                     }
 
-                list ($tag, $regs, $i) = array ('skip', array (), array ());
-                reset ($regexp);
-                foreach ($regexp as $r => $t) if (preg_match ('/'.$r.'/', $line, $regs)) {
-                    $tag = $t;
-                    break;
-                }
-                switch ($tag) {
-                    case 'skip':    continue;
-                    case 'shares':  $mode = 'shares';     break;
-                    case 'servers': $mode = 'servers';    break;
-                    case 'workg':   $mode = 'workgroups'; break;
-                    case 'share':
-                        list($name, $type) = array (
-                            trim(substr($line, 1, 15)),
-                            trim(strtolower(substr($line, 17, 10)))
-                        );
-                        $i = ($type <> 'disk' && preg_match('/^(.*) Disk/', $line, $regs))
-                            ? array(trim($regs[1]), 'disk')
-                            : array($name, 'disk');
-                        break;
-                    case 'srvorwg':
-                        list ($name, $master) = array (
-                            strtolower(trim(substr($line,1,21))),
-                            strtolower(trim(substr($line, 22)))
-                        );
-                        $i = ($mode == 'servers') ? array ($name, "server") : array ($name, "workgroup", $master);
+                    list ($tag, $regs, $i) = array ('skip', array (), array ());
+                    reset ($regexp);
+                    foreach ($regexp as $r => $t) if (preg_match ('/'.$r.'/', $line, $regs)) {
+                        $tag = $t;
                         break;
-                    case 'files':
-                        list ($attr, $name) = preg_match ("/^(.*)[ ]+([D|A|H|S|R|N]+)$/", trim ($regs[1]), $regs2)
-                            ? array (trim ($regs2[2]), trim ($regs2[1]))
-                            : array ('', trim ($regs[1]));
-                        list ($his, $im) = array (
-                        explode(':', $regs[6]), 1 + strpos("JanFebMarAprMayJunJulAugSepOctNovDec", $regs[4]) / 3);
-                        $i = ($name <> '.' && $name <> '..')
-                            ? array (
-                                $name,
-                                (strpos($attr,'D') === FALSE) ? 'file' : 'folder',
-                                'attr' => $attr,
-                                'size' => intval($regs[2]),
-                                'time' => mktime ($his[0], $his[1], $his[2], $im, $regs[5], $regs[7])
-                              )
-                            : array();
-                        break;
-                    case 'error':
-                        if (strstr($regs[1], "NO_SUCH_FILE") == 0) {
-                            return "NOT_FOUND";
-                        }
-                        trigger_error($regs[1], E_USER_ERROR);
-                }
-                if ($i) switch ($i[1]) {
-                    case 'file':
-                    case 'folder':    $info['info'][$i[0]] = $i;
-                    case 'disk':
-                    case 'server':
-                    case 'workgroup': $info[$i[1]][] = $i[0];
+                    }
+                    $mode = '';
+                    switch ($tag) {
+                        case 'skip':    continue;
+                        case 'shares':  $mode = 'shares';     break;
+                        case 'servers': $mode = 'servers';    break;
+                        case 'workg':   $mode = 'workgroups'; break;
+                        case 'share':
+                            list($name, $type) = array (
+                                trim(substr($line, 1, 15)),
+                                trim(strtolower(substr($line, 17, 10)))
+                            );
+                            $i = ($type <> 'disk' && preg_match('/^(.*) Disk/', $line, $regs))
+                                ? array(trim($regs[1]), 'disk')
+                                : array($name, 'disk');
+                            break;
+                        case 'srvorwg':
+                            list ($name, $master) = array (
+                                strtolower(trim(substr($line,1,21))),
+                                strtolower(trim(substr($line, 22)))
+                            );
+                            $i = ($mode == 'servers') ? array ($name, "server") : array ($name, "workgroup", $master);
+                            break;
+                        case 'files':
+                            list ($attr, $name) = preg_match ("/^(.*)[ ]+([D|A|H|S|R|N]+)$/", trim ($regs[1]), $regs2)
+                                ? array (trim ($regs2[2]), trim ($regs2[1]))
+                                : array ('', trim ($regs[1]));
+                            list ($his, $im) = array (
+                                explode(':', $regs[6]), 1 + strpos("JanFebMarAprMayJunJulAugSepOctNovDec", $regs[4]) / 3);
+                            $i = ($name <> '.' && $name <> '..')
+                                ? array (
+                                    $name,
+                                    (strpos($attr,'D') === FALSE) ? 'file' : 'folder',
+                                    'attr' => $attr,
+                                    'size' => intval($regs[2]),
+                                    'time' => mktime ($his[0], $his[1], $his[2], $im, $regs[5], $regs[7])
+                                )
+                                : array();
+                            break;
+                        case 'error':
+                            if (strstr($regs[1], "NO_SUCH_FILE") == 0) {
+                                return "NOT_FOUND";
+                            }
+                            trigger_error($regs[1], E_USER_ERROR);
+                    }
+                    if ($i) switch ($i[1]) {
+                        case 'file':
+                        case 'folder':    $info['info'][$i[0]] = $i;
+                        case 'disk':
+                        case 'server':
+                        case 'workgroup': $info[$i[1]][] = $i[0];
+                    }
                 }
-            }
-            //pclose($output);
-            fclose($output);
+                //pclose($output);
+                fclose($output);
 
+            }
+        } finally {
+            if (is_resource($process)){
+                proc_close($process);
+            }
         }
         //self::debug(print_r($info, true));
         return $info;
-        //return;
     }
 
 
@@ -304,10 +313,9 @@ public function url_stat ($url, $flags = STREAM_URL_STAT_LINK)
         switch ($pu['type']) {
             case 'host':
                 if ($o = smb::look ($pu))
-                //self::debug($_SESSION["AJXP_SESSION_REMOTE_USER"]);
                    $stat = stat (SMB4PHP_SMBTMP);
                 else
-                  trigger_error ("url_stat(): list failed for host '{$host}'", E_USER_WARNING);
+                  trigger_error ("url_stat(): list failed for host", E_USER_WARNING);
                 break;
             case 'share':
                 $id = "smb_".md5($pu["host"].$pu["user"]);
@@ -455,7 +463,7 @@ public function rename ($url_from, $url_to)
         smb::clearstatcache ($url_from);
         $res = smb::execute ('rename "'.$from['path'].'" "'.$to['path'].'"', $to);
         if(empty($res)) return true;
-        AJXP_Logger::info(__CLASS__, "SmbClient rename error: ".$res);
+        Logger::info(__CLASS__, "Smb Client", "SmbClient rename error: ".$res);
         return false;
     }
 
@@ -775,5 +783,5 @@ function ConvSmbParameterToWinOs($params)
 # Register 'smb' protocol !
 ###################################################################
 
-stream_wrapper_register('smbclient', 'smb_stream_wrapper')
+stream_wrapper_register('smbclient', 'Pydio\Access\Driver\StreamProvider\SMB\smb_stream_wrapper')
     or die ('Failed to register protocol');
diff --git a/core/src/plugins/access.swift/SwiftAccessDriver.php b/core/src/plugins/access.swift/SwiftAccessDriver.php
new file mode 100644
index 0000000000..5c3de1e8c9
--- /dev/null
+++ b/core/src/plugins/access.swift/SwiftAccessDriver.php
@@ -0,0 +1,148 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ *
+ */
+namespace Pydio\Access\Driver\StreamProvider\Swift;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+use DOMNode;
+use \OpenStack\Bootstrap;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\RecycleBinManager;
+use Pydio\Access\Core\Model\Repository;
+use Pydio\Access\Driver\StreamProvider\FS\FsAccessDriver;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\ConfService;
+
+/**
+ * Plugin to access a webdav enabled server
+ * @package AjaXplorer_Plugins
+ * @subpackage Access
+ */
+class SwiftAccessDriver extends FsAccessDriver
+{
+    /**
+    * @var Repository
+    */
+    public $repository;
+    public $driverConf;
+    protected $wrapperClassName;
+    protected $urlBase;
+
+    public function performChecks()
+    {
+        // Check CURL, OPENSSL & AWS LIBRARY & PHP5.3
+        if (version_compare(phpversion(), "5.3.0") < 0) {
+            throw new \Exception("Php version 5.3+ is required for this plugin (must support namespaces)");
+        }
+        if(!file_exists($this->getBaseDir()."/openstack-sdk-php/vendor/autoload.php")){
+            throw new \Exception("You must download the openstack-sdk-php and install it with Composer for this plugin");
+        }
+
+    }
+
+    /**
+     * @param ContextInterface $contextInterface
+     * @throws \Exception
+     */
+    protected function initRepository(ContextInterface $contextInterface)
+    {
+        if (is_array($this->pluginConf)) {
+            $this->driverConf = $this->pluginConf;
+        } else {
+            $this->driverConf = array();
+        }
+
+        require_once($this->getBaseDir()."/openstack-sdk-php/vendor/autoload.php");
+
+        Bootstrap::useStreamWrappers();
+
+        Bootstrap::setConfiguration(array(
+            'username'              => $this->repository->getContextOption($contextInterface, "USERNAME"),
+            'password'              => $this->repository->getContextOption($contextInterface, "PASSWORD"),
+            'tenantid'              => $this->repository->getContextOption($contextInterface, "TENANT_ID"),
+            'endpoint'              => $this->repository->getContextOption($contextInterface, "ENDPOINT"),
+            'openstack.swift.region'=> $this->repository->getContextOption($contextInterface, "REGION"),
+            'transport.ssl.verify'  => false
+        ));
+
+
+        $recycle    = $this->repository->getContextOption($contextInterface, "RECYCLE_BIN");
+        ConfService::setConf("PROBE_REAL_SIZE", false);
+        $this->urlBase = $contextInterface->getUrlBase();
+        if ($recycle != "") {
+            RecycleBinManager::init($contextInterface->getUrlBase(), "/".$recycle);
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function parseSpecificContributions(ContextInterface $ctx, \DOMNode &$contribNode)
+    {
+        parent::parseSpecificContributions($ctx, $contribNode);
+        if($contribNode->nodeName != "actions") return ;
+        $this->disableArchiveBrowsingContributions($contribNode);
+    }
+
+    /**
+     * @param AJXP_Node $node
+     * @return bool
+     */
+    public function isWriteable(AJXP_Node $node)
+    {
+        return true;
+    }
+
+    /**
+     * @param AJXP_Node $node See parent function
+     * @param bool|false $parentNode
+     * @param bool|false $details
+     */
+    public function loadNodeInfo(&$node, $parentNode = false, $details = false)
+    {
+        parent::loadNodeInfo($node, $parentNode, $details);
+        if (!$node->isLeaf()) {
+            $node->setLabel(rtrim($node->getLabel(), "/"));
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    public function isRemote()
+    {
+        return true;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $httpVars
+     * @return array
+     * @throws \Exception
+     */
+    public function makeSharedRepositoryOptions(ContextInterface $ctx, $httpVars)
+    {
+        $newOptions = parent::makeSharedRepositoryOptions($ctx, $httpVars);
+        $newOptions["CONTAINER"] = $this->repository->getContextOption($ctx, "CONTAINER");
+        return $newOptions;
+    }
+
+}
diff --git a/core/src/plugins/access.swift/SwiftAccessWrapper.php b/core/src/plugins/access.swift/SwiftAccessWrapper.php
new file mode 100644
index 0000000000..f8e09b80c9
--- /dev/null
+++ b/core/src/plugins/access.swift/SwiftAccessWrapper.php
@@ -0,0 +1,313 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ *
+ */
+namespace Pydio\Access\Driver\StreamProvider\Swift;
+
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Driver\StreamProvider\FS\FsAccessWrapper;
+
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\FileHelper;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+require_once(AJXP_INSTALL_PATH . "/plugins/access.fs/FsAccessWrapper.php");
+
+/**
+ * Encapsulation of the PEAR webDAV client
+ * @package AjaXplorer_Plugins
+ * @subpackage Access
+ */
+class SwiftAccessWrapper extends FsAccessWrapper
+{
+    public static $lastException;
+    private static $cloudContext;
+
+    /**
+     * Initialize the stream from the given path.
+     * Concretely, transform ajxp.webdav:// into webdav://
+     *
+     * @param string $path
+     * @return mixed Real path or -1 if currentListing contains the listing : original path converted to real path
+     */
+    protected static function initPath($path, $streamType, $storeOpenContext = false, $skipZip = false)
+    {
+        $node = new AJXP_Node($path);
+        $ctx = $node->getContext();
+        $repoObject = $node->getRepository();
+        if (!isSet($repoObject)) {
+            $e = new \Exception("Cannot find repository with id ".$node->getRepositoryId());
+            self::$lastException = $e;
+            throw $e;
+        }
+        if (self::$cloudContext == null) {
+            self::$cloudContext = stream_context_create(
+                array("swiftfs" =>
+                array(
+                    'username'                  => $repoObject->getContextOption($ctx, "USERNAME"),
+                    'password'                  => $repoObject->getContextOption($ctx, "PASSWORD"),
+                    'tenantid'                  => $repoObject->getContextOption($ctx, "TENANT_ID"),
+                    'endpoint'                  => $repoObject->getContextOption($ctx, "ENDPOINT"),
+                    'openstack.swift.region'    => $repoObject->getContextOption($ctx, "REGION")
+                ))
+            );
+        }
+
+        $baseContainer = $repoObject->getContextOption($node->getContext(), "CONTAINER");
+        $p = "swiftfs://".$baseContainer.str_replace("//", "/", $node->getPath());
+        return $p;
+    }
+
+
+    /**
+     * @param AJXP_Node $node
+     * @return array
+     */
+    public static function getResolvedOptionsForNode($node)
+    {
+        return [
+            "TYPE" => "php"
+        ];
+    }
+    /**
+     * Opens the stream
+     * Diff with parent class : do not "securePath", as it removes double slash
+     *
+     * @param String $path Maybe in the form "ajxp.fs://repositoryId/pathToFile"
+     * @param String $mode
+     * @param unknown_type $options
+     * @param unknown_type $opened_path
+     * @return unknown
+     */
+    public function stream_open($path, $mode, $options, &$context)
+    {
+        try {
+            $this->realPath = $this->initPath($path, "file");
+        } catch (\Exception $e) {
+            Logger::error(__CLASS__,"stream_open", "Error while opening stream $path");
+            return false;
+        }
+        if ($this->realPath == -1) {
+            $this->fp = -1;
+            return true;
+        } else {
+            $this->fp = fopen($this->realPath, $mode, $options, self::$cloudContext);
+            return ($this->fp !== false);
+        }
+    }
+
+    /**
+     * Stats the given path.
+     * Fix PEAR by adding S_ISREG mask when file case.
+     *
+     * @param unknown_type $path
+     * @param unknown_type $flags
+     * @return unknown
+     */
+    public function url_stat($path, $flags)
+    {
+        // File and zip case
+        // AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Stating $path");
+
+        $url = parse_url($path);
+        if(empty($url["path"])){
+            // This is root, return fake stat;
+            return $this->fakeStat(true);
+        }
+        //$handle = fopen($this->initPath($path, "file"), "r", null, self::$cloudContext);
+        $p = $this->initPath($path, "file");
+        $stat = @stat($p);
+        //fclose($handle);
+        if($stat == null || $stat === false) return null;
+        if ($stat["mode"] == 0666) {
+            $stat[2] = $stat["mode"] |= 0100000; // S_ISREG
+        }
+        $parsed = parse_url($path);
+        if ($stat["mtime"] == $stat["ctime"]  && $stat["ctime"] == $stat["atime"] && $stat["atime"] == 0 && $parsed["path"] != "/") {
+            //AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Nullifying stats");
+            return null;
+        }
+        return $stat;
+
+    }
+
+    /**
+     * Fake stat data.
+     *
+     * Under certain conditions we have to return totally trumped-up
+     * stats. This generates those.
+     */
+    protected function fakeStat($dir = false)
+    {
+        $request_time = time();
+
+        // Set inode type to directory or file.
+        $type = $dir ? 040000 : 0100000;
+        // Fake world-readable
+        $mode = $type + 0777;
+
+        $values = array(
+            'dev' => 0,
+            'ino' => 0,
+            'mode' => $mode,
+            'nlink' => 0,
+            'uid' => posix_getuid(),
+            'gid' => posix_getgid(),
+            'rdev' => 0,
+            'size' => 0,
+            'atime' => $request_time,
+            'mtime' => $request_time,
+            'ctime' => $request_time,
+            'blksize' => -1,
+            'blocks' => -1,
+        );
+
+        $final = array_values($values) + $values;
+
+        return $final;
+    }
+
+
+    /**
+     * Opens a handle to the dir
+     * Fix PEAR by being sure it ends up with "/", to avoid
+     * adding the current dir to the children list.
+     *
+     * @param unknown_type $path
+     * @param unknown_type $options
+     * @return unknown
+     */
+    public function dir_opendir ($path , $options )
+    {
+        $this->realPath = $this->initPath($path, "dir", true);
+        if ($this->realPath[strlen($this->realPath)-1] != "/") {
+            $this->realPath.="/";
+        }
+        if (is_string($this->realPath)) {
+            $this->dH = opendir($this->realPath, self::$cloudContext);
+        } else if ($this->realPath == -1) {
+            $this->dH = -1;
+        }
+        return $this->dH !== false;
+    }
+
+    /**
+     * @param string $path
+     * @param int $mode
+     * @param int $options
+     * @return bool
+     * @throws \Exception
+     */
+    public function mkdir($path, $mode, $options)
+    {
+        $this->realPath = $this->initPath($path, "dir", true);
+        file_put_contents($this->realPath."/.marker", "tmpdata");
+        return true;
+    }
+
+    // DUPBLICATE STATIC FUNCTIONS TO BE SURE
+    // NOT TO MESS WITH self:: CALLS
+
+    /**
+     * @param $tmpDir
+     * @param $tmpFile
+     */
+    public static function removeTmpFile($tmpDir, $tmpFile)
+    {
+        if(is_file($tmpFile)) unlink($tmpFile, self::$cloudContext);
+        if(is_dir($tmpDir)) rmdir($tmpDir, self::$cloudContext);
+    }
+
+    protected static function closeWrapper()
+    {
+        if (self::$crtZip != null) {
+            self::$crtZip = null;
+            self::$currentListing  = null;
+            self::$currentListingKeys = null;
+            self::$currentListingIndex = null;
+            self::$currentFileKey = null;
+        }
+    }
+
+    /**
+     * @param string $path
+     * @param bool $persistent
+     * @return string
+     */
+    public static function getRealFSReference($path, $persistent = false)
+    {
+        $tmpFile = ApplicationState::getAjxpTmpDir() ."/".md5(time()).".".pathinfo($path, PATHINFO_EXTENSION);
+           $tmpHandle = fopen($tmpFile, "wb", null, self::$cloudContext);
+           self::copyFileInStream($path, $tmpHandle);
+           fclose($tmpHandle);
+           if (!$persistent) {
+               register_shutdown_function(function() use($tmpFile){
+                   FileHelper::silentUnlink($tmpFile);
+               });
+           }
+           return $tmpFile;
+    }
+
+
+    /**
+     * @return bool
+     */
+    public static function isRemote()
+    {
+        return true;
+    }
+
+    /**
+     * @param String $url
+     * @return bool
+     */
+    public static function isSeekable($url)
+    {
+        return false;
+    }
+
+    /**
+     * @param string $path
+     * @param resource $stream
+     */
+    public static function copyFileInStream($path, $stream)
+    {
+        $fp = fopen($path, "r", null, self::$cloudContext);
+        if(!is_resource($fp)) return;
+        while (!feof($fp)) {
+            $data = fread($fp, 4096);
+            fwrite($stream, $data, strlen($data));
+        }
+        fclose($fp);
+    }
+
+    /**
+     * @param string $path
+     * @param number $chmodValue
+     */
+    public static function changeMode($path, $chmodValue)
+    {
+        // DO NOTHING!
+        //$realPath = self::initPath($path, "file");
+        //chmod($realPath, $chmodValue);
+    }
+}
diff --git a/core/src/plugins/access.swift/class.swiftAccessDriver.php b/core/src/plugins/access.swift/class.swiftAccessDriver.php
deleted file mode 100644
index 13799d2acc..0000000000
--- a/core/src/plugins/access.swift/class.swiftAccessDriver.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-use \OpenStack\Bootstrap;
-/**
- * AJXP_Plugin to access a webdav enabled server
- * @package AjaXplorer_Plugins
- * @subpackage Access
- */
-class swiftAccessDriver extends fsAccessDriver
-{
-    /**
-    * @var Repository
-    */
-    public $repository;
-    public $driverConf;
-    protected $wrapperClassName;
-    protected $urlBase;
-
-    public function performChecks()
-    {
-        // Check CURL, OPENSSL & AWS LIBRARY & PHP5.3
-        if (version_compare(phpversion(), "5.3.0") < 0) {
-            throw new Exception("Php version 5.3+ is required for this plugin (must support namespaces)");
-        }
-        if(!file_exists($this->getBaseDir()."/openstack-sdk-php/vendor/autoload.php")){
-            throw new Exception("You must download the openstack-sdk-php and install it with Composer for this plugin");
-        }
-
-    }
-
-
-    public function initRepository()
-    {
-        if (is_array($this->pluginConf)) {
-            $this->driverConf = $this->pluginConf;
-        } else {
-            $this->driverConf = array();
-        }
-
-        require_once($this->getBaseDir()."/openstack-sdk-php/vendor/autoload.php");
-
-        Bootstrap::useStreamWrappers();
-
-        Bootstrap::setConfiguration(array(
-            'username' => $this->repository->getOption("USERNAME"),
-            'password' => $this->repository->getOption("PASSWORD"),
-            'tenantid' => $this->repository->getOption("TENANT_ID"),
-            'endpoint' => $this->repository->getOption("ENDPOINT"),
-            'openstack.swift.region'   => $this->repository->getOption("REGION"),
-            'transport.ssl.verify' => false
-        ));
-
-
-        $path = $this->repository->getOption("PATH");
-        $recycle = $this->repository->getOption("RECYCLE_BIN");
-        ConfService::setConf("PROBE_REAL_SIZE", false);
-        $this->detectStreamWrapper(true);
-        $this->urlBase = "pydio://".$this->repository->getId();
-        if ($recycle != "") {
-            RecycleBinManager::init($this->urlBase, "/".$recycle);
-        }
-    }
-
-    /**
-     * Parse
-     * @param DOMNode $contribNode
-     */
-    protected function parseSpecificContributions(&$contribNode)
-    {
-        parent::parseSpecificContributions($contribNode);
-        if($contribNode->nodeName != "actions") return ;
-        $this->disableArchiveBrowsingContributions($contribNode);
-    }
-
-    public function isWriteable($dir, $type="dir")
-    {
-        return true;
-    }
-
-    /**
-     * @param AJXP_Node $node See parent function
-     * @param bool|false $parentNode
-     * @param bool|false $details
-     */
-    public function loadNodeInfo(&$node, $parentNode = false, $details = false)
-    {
-        parent::loadNodeInfo($node, $parentNode, $details);
-        if (!$node->isLeaf()) {
-            $node->setLabel(rtrim($node->getLabel(), "/"));
-        }
-    }
-
-    public function isRemote()
-    {
-        return true;
-    }
-
-    public function makeSharedRepositoryOptions($httpVars, $repository)
-    {
-        $newOptions = parent::makeSharedRepositoryOptions($httpVars, $repository);
-        $newOptions["CONTAINER"] = $this->repository->getOption("CONTAINER");
-        return $newOptions;
-    }
-
-}
diff --git a/core/src/plugins/access.swift/class.swiftAccessWrapper.php b/core/src/plugins/access.swift/class.swiftAccessWrapper.php
deleted file mode 100644
index 30b138c5ac..0000000000
--- a/core/src/plugins/access.swift/class.swiftAccessWrapper.php
+++ /dev/null
@@ -1,262 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-require_once(AJXP_INSTALL_PATH."/plugins/access.fs/class.fsAccessWrapper.php");
-
-/**
- * Encapsulation of the PEAR webDAV client
- * @package AjaXplorer_Plugins
- * @subpackage Access
- */
-class swiftAccessWrapper extends fsAccessWrapper
-{
-    public static $lastException;
-    private static $cloudContext;
-
-    /**
-     * Initialize the stream from the given path.
-     * Concretely, transform ajxp.webdav:// into webdav://
-     *
-     * @param string $path
-     * @return mixed Real path or -1 if currentListing contains the listing : original path converted to real path
-     */
-    protected static function initPath($path, $streamType, $storeOpenContext = false, $skipZip = false)
-    {
-        $url = AJXP_Utils::safeParseUrl($path);
-        $repoId = $url["host"];
-        $repoObject = ConfService::getRepositoryById($repoId);
-        if (!isSet($repoObject)) {
-            $e = new Exception("Cannot find repository with id ".$repoId);
-            self::$lastException = $e;
-            throw $e;
-        }
-        if (self::$cloudContext == null) {
-            self::$cloudContext = stream_context_create(
-                array("swiftfs" =>
-                array(
-                    'username' => $repoObject->getOption("USERNAME"),
-                    'password' => $repoObject->getOption("PASSWORD"),
-                    'tenantid' => $repoObject->getOption("TENANT_ID"),
-                    'endpoint' => $repoObject->getOption("ENDPOINT"),
-                    'openstack.swift.region'   => $repoObject->getOption("REGION")
-                ))
-            );
-        }
-
-        $baseContainer = $repoObject->getOption("CONTAINER");
-        $p = "swiftfs://".$baseContainer.str_replace("//", "/", $url["path"]);
-        return $p;
-    }
-
-    /**
-     * Opens the stream
-     * Diff with parent class : do not "securePath", as it removes double slash
-     *
-     * @param String $path Maybe in the form "ajxp.fs://repositoryId/pathToFile"
-     * @param String $mode
-     * @param unknown_type $options
-     * @param unknown_type $opened_path
-     * @return unknown
-     */
-    public function stream_open($path, $mode, $options, &$context)
-    {
-        try {
-            $this->realPath = $this->initPath($path, "file");
-        } catch (Exception $e) {
-            AJXP_Logger::error(__CLASS__,"stream_open", "Error while opening stream $path");
-            return false;
-        }
-        if ($this->realPath == -1) {
-            $this->fp = -1;
-            return true;
-        } else {
-            $this->fp = fopen($this->realPath, $mode, $options, self::$cloudContext);
-            return ($this->fp !== false);
-        }
-    }
-
-    /**
-     * Stats the given path.
-     * Fix PEAR by adding S_ISREG mask when file case.
-     *
-     * @param unknown_type $path
-     * @param unknown_type $flags
-     * @return unknown
-     */
-    public function url_stat($path, $flags)
-    {
-        // File and zip case
-        // AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Stating $path");
-
-        $url = parse_url($path);
-        if(empty($url["path"])){
-            // This is root, return fake stat;
-            return $this->fakeStat(true);
-        }
-        //$handle = fopen($this->initPath($path, "file"), "r", null, self::$cloudContext);
-        $p = $this->initPath($path, "file");
-        $stat = @stat($p);
-        //fclose($handle);
-        if($stat == null || $stat === false) return null;
-        if ($stat["mode"] == 0666) {
-            $stat[2] = $stat["mode"] |= 0100000; // S_ISREG
-        }
-        $parsed = parse_url($path);
-        if ($stat["mtime"] == $stat["ctime"]  && $stat["ctime"] == $stat["atime"] && $stat["atime"] == 0 && $parsed["path"] != "/") {
-            //AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Nullifying stats");
-            return null;
-        }
-        return $stat;
-
-        // Non existing file
-           return null;
-    }
-
-    /**
-     * Fake stat data.
-     *
-     * Under certain conditions we have to return totally trumped-up
-     * stats. This generates those.
-     */
-    protected function fakeStat($dir = false)
-    {
-        $request_time = time();
-
-        // Set inode type to directory or file.
-        $type = $dir ? 040000 : 0100000;
-        // Fake world-readable
-        $mode = $type + 0777;
-
-        $values = array(
-            'dev' => 0,
-            'ino' => 0,
-            'mode' => $mode,
-            'nlink' => 0,
-            'uid' => posix_getuid(),
-            'gid' => posix_getgid(),
-            'rdev' => 0,
-            'size' => 0,
-            'atime' => $request_time,
-            'mtime' => $request_time,
-            'ctime' => $request_time,
-            'blksize' => -1,
-            'blocks' => -1,
-        );
-
-        $final = array_values($values) + $values;
-
-        return $final;
-    }
-
-
-    /**
-     * Opens a handle to the dir
-     * Fix PEAR by being sure it ends up with "/", to avoid
-     * adding the current dir to the children list.
-     *
-     * @param unknown_type $path
-     * @param unknown_type $options
-     * @return unknown
-     */
-    public function dir_opendir ($path , $options )
-    {
-        $this->realPath = $this->initPath($path, "dir", true);
-        if ($this->realPath[strlen($this->realPath)-1] != "/") {
-            $this->realPath.="/";
-        }
-        if (is_string($this->realPath)) {
-            $this->dH = opendir($this->realPath, self::$cloudContext);
-        } else if ($this->realPath == -1) {
-            $this->dH = -1;
-        }
-        return $this->dH !== false;
-    }
-
-    public function mkdir($path, $mode, $options)
-    {
-        $this->realPath = $this->initPath($path, "dir", true);
-        file_put_contents($this->realPath."/.marker", "tmpdata");
-        return true;
-    }
-
-    // DUPBLICATE STATIC FUNCTIONS TO BE SURE
-    // NOT TO MESS WITH self:: CALLS
-
-    public static function removeTmpFile($tmpDir, $tmpFile)
-    {
-        if(is_file($tmpFile)) unlink($tmpFile, self::$cloudContext);
-        if(is_dir($tmpDir)) rmdir($tmpDir, self::$cloudContext);
-    }
-
-    protected static function closeWrapper()
-    {
-        if (self::$crtZip != null) {
-            self::$crtZip = null;
-            self::$currentListing  = null;
-            self::$currentListingKeys = null;
-            self::$currentListingIndex = null;
-            self::$currentFileKey = null;
-        }
-    }
-
-    public static function getRealFSReference($path, $persistent = false)
-    {
-        $tmpFile = AJXP_Utils::getAjxpTmpDir()."/".md5(time()).".".pathinfo($path, PATHINFO_EXTENSION);
-           $tmpHandle = fopen($tmpFile, "wb", null, self::$cloudContext);
-           self::copyFileInStream($path, $tmpHandle);
-           fclose($tmpHandle);
-           if (!$persistent) {
-               register_shutdown_function(array("AJXP_Utils", "silentUnlink"), $tmpFile);
-           }
-           return $tmpFile;
-    }
-
-
-    public static function isRemote()
-    {
-        return true;
-    }
-
-    public static function isSeekable($url)
-    {
-        return false;
-    }
-
-    public static function copyFileInStream($path, $stream)
-    {
-        $fp = fopen($path, "r", null, self::$cloudContext);
-        if(!is_resource($fp)) return;
-        while (!feof($fp)) {
-            $data = fread($fp, 4096);
-            fwrite($stream, $data, strlen($data));
-        }
-        fclose($fp);
-    }
-
-    public static function changeMode($path, $chmodValue)
-    {
-        // DO NOTHING!
-        //$realPath = self::initPath($path, "file");
-        //chmod($realPath, $chmodValue);
-    }
-}
diff --git a/core/src/plugins/access.swift/i18n/conf/de.php b/core/src/plugins/access.swift/i18n/conf/de.php
index c4b5a01ce8..738641ae35 100644
--- a/core/src/plugins/access.swift/i18n/conf/de.php
+++ b/core/src/plugins/access.swift/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Open Stack (Swift)" => "OpenStack (Swift)",
@@ -33,4 +33,4 @@
 "Container" => "Container",
 "Base Container" => "Der Basis-Container",
 "Console password" => "Console password",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/access.swift/i18n/conf/en.php b/core/src/plugins/access.swift/i18n/conf/en.php
index 6feb04c268..5621cb26f7 100644
--- a/core/src/plugins/access.swift/i18n/conf/en.php
+++ b/core/src/plugins/access.swift/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Open Stack (Swift)" => "Open Stack (Swift)",
@@ -33,4 +33,4 @@
 "Container" => "Container",
 "Base Container" => "Base Container",
 "Console password" => "Console password",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/access.swift/i18n/conf/fr.php b/core/src/plugins/access.swift/i18n/conf/fr.php
index 39fb36232f..de31bd8931 100644
--- a/core/src/plugins/access.swift/i18n/conf/fr.php
+++ b/core/src/plugins/access.swift/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "S3 (Amazon Web Service)" => "S3 (Amazon Web Service)",
@@ -41,4 +41,4 @@
 "Your region identifier" => "Your region identifier",
 "Base Container" => "Base Container",
 "Console password" => "Console password",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/access.swift/i18n/conf/it.php b/core/src/plugins/access.swift/i18n/conf/it.php
index cd8449dc2c..5cb034e759 100644
--- a/core/src/plugins/access.swift/i18n/conf/it.php
+++ b/core/src/plugins/access.swift/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "S3 (Amazon Web Service)" => "S3 (Amazon Web Service)",
@@ -41,4 +41,4 @@
 "Your region identifier" => "Your region identifier",
 "Base Container" => "Base Container",
 "Console password" => "Console password",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/access.swift/i18n/conf/pt.php b/core/src/plugins/access.swift/i18n/conf/pt.php
index 2b8e87cc05..8be7d8d281 100644
--- a/core/src/plugins/access.swift/i18n/conf/pt.php
+++ b/core/src/plugins/access.swift/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "S3 (Amazon Web Service)" => "S3 (Serviço Amazon Web)",
@@ -41,4 +41,4 @@
 "Your region identifier" => "Your region identifier",
 "Base Container" => "Base Container",
 "Console password" => "Console password",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/access.swift/manifest.xml b/core/src/plugins/access.swift/manifest.xml
index a6e7964952..03449eb0c5 100644
--- a/core/src/plugins/access.swift/manifest.xml
+++ b/core/src/plugins/access.swift/manifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ajxpdriver name="swift" enabled="false" label="CONF_MESSAGE[Open Stack (Swift)]" description="CONF_MESSAGE[Access Open Stack Object Storage via Swift API]" mixins="filesystem_commons,slug_provider,template_provider" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <class_definition filename="plugins/access.swift/class.swiftAccessDriver.php" classname="swiftAccessDriver"/>
     <client_settings icon="plugins/access.fs/icon.png" description_template="{ENDPOINT}{REGION}/{CONTAINER}" iconClass="icon-sitemap">
         <resources>
             <i18n namespace="swift_access" path="plugins/access.swift/i18n"/>
@@ -25,5 +24,6 @@
     <dependencies>
         <pluginClass pluginName="access.fs"/>
     </dependencies>
-    <class_stream_wrapper filename="plugins/access.swift/class.swiftAccessWrapper.php" classname="swiftAccessWrapper" protocol="ajxp.swift"/>
+    <class_definition filename="plugins/access.swift/SwiftAccessDriver.php" classname="Pydio\Access\Driver\StreamProvider\Swift\SwiftAccessDriver"/>
+    <class_stream_wrapper filename="plugins/access.swift/SwiftAccessWrapper.php" classname="Pydio\Access\Driver\StreamProvider\Swift\SwiftAccessWrapper" protocol="ajxp.swift"/>
 </ajxpdriver>
diff --git a/core/src/plugins/access.webdav/i18n/conf/de.php b/core/src/plugins/access.webdav/i18n/conf/de.php
index 2f5fa62807..737a45cfba 100644
--- a/core/src/plugins/access.webdav/i18n/conf/de.php
+++ b/core/src/plugins/access.webdav/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "WebDAV (PEAR)" => "WebDAV (PEAR)",
@@ -29,4 +29,4 @@
 "Optionnaly apply a chmod operation. Value must be numeric, like 0777, 0644, etc." => "Optional kann eine chmod-Operation durchführt werden. Die Werte müssen nummerisch sein (bsp. 0777, 0644, etc.).",
 "WebDAV" => "WebDAV",
 "Access WebDAV through Guzzle and SabreDAV" => "Access WebDAV through Guzzle and SabreDAV",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/access.webdav/i18n/conf/en.php b/core/src/plugins/access.webdav/i18n/conf/en.php
index cec2ee2062..962e481f61 100644
--- a/core/src/plugins/access.webdav/i18n/conf/en.php
+++ b/core/src/plugins/access.webdav/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "WebDAV (PEAR)" => "WebDAV (PEAR)",
@@ -29,4 +29,4 @@
 "Optionnaly apply a chmod operation. Value must be numeric, like 0777, 0644, etc." => "Optionnaly apply a chmod operation. Value must be numeric, like 0777, 0644, etc.",
 "WebDAV" => "WebDAV",
 "Access WebDAV through Guzzle and SabreDAV" => "Access WebDAV through Guzzle and SabreDAV",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/access.webdav/i18n/conf/fr.php b/core/src/plugins/access.webdav/i18n/conf/fr.php
index c1ab36e151..ceed80284c 100644
--- a/core/src/plugins/access.webdav/i18n/conf/fr.php
+++ b/core/src/plugins/access.webdav/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "WebDAV (PEAR)" => "WebDAV (PEAR)",
@@ -29,4 +29,4 @@
 "Optionnaly apply a chmod operation. Value must be numeric, like 0777, 0644, etc." => "Optionellement, appliquer un chmod operation. La valeur doit-être numérique, tel 0777, 0644, ...",
 "WebDAV" => "WebDAV",
 "Access WebDAV through Guzzle and SabreDAV" => "Accéder à WebDAV via Guzzle et SabreDAV",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/access.webdav/i18n/conf/it.php b/core/src/plugins/access.webdav/i18n/conf/it.php
index f4f7c76f3a..ab515cf69c 100644
--- a/core/src/plugins/access.webdav/i18n/conf/it.php
+++ b/core/src/plugins/access.webdav/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "WebDAV (PEAR)" => "WebDAV (PEAR)",
@@ -29,4 +29,4 @@
 "Optionnaly apply a chmod operation. Value must be numeric, like 0777, 0644, etc." => "Opzionalmente, verrà applicata un'operazione chmod. Il valore deve essere numerico, come ad esempio 0777, 0644, ecc.",
 "WebDAV" => "WebDAV",
 "Access WebDAV through Guzzle and SabreDAV" => "Access WebDAV through Guzzle and SabreDAV",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/access.webdav/i18n/conf/pt.php b/core/src/plugins/access.webdav/i18n/conf/pt.php
index 35d53fb338..dd8716f2df 100644
--- a/core/src/plugins/access.webdav/i18n/conf/pt.php
+++ b/core/src/plugins/access.webdav/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "WebDAV (PEAR)" => "WebDAV (PEAR)",
@@ -29,4 +29,4 @@
 "Optionnaly apply a chmod operation. Value must be numeric, like 0777, 0644, etc." => "Opcionalmente aplicar um 'chmod' para corrigir permissões. Os valores devem ser numéricos, do género: 0777, 0644, etc.",
 "WebDAV" => "WebDAV",
 "Access WebDAV through Guzzle and SabreDAV" => "Access WebDAV through Guzzle and SabreDAV",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/access.webdav/manifest.xml b/core/src/plugins/access.webdav/manifest.xml
index 4aa2c52a29..598a0794ae 100644
--- a/core/src/plugins/access.webdav/manifest.xml
+++ b/core/src/plugins/access.webdav/manifest.xml
@@ -11,6 +11,7 @@
         <param name="HOST" type="string" label="CONF_MESSAGE[Host]" description="CONF_MESSAGE[Host of the WebDAV server, with http/https and without trailing slash. Can contain user:password too.]" mandatory="true" default="http://webdav.host.com"/>
         <param name="PATH" type="string" label="CONF_MESSAGE[Uri]" description="CONF_MESSAGE[Path to the root folder on the server]" mandatory="true"/>
         <param name="CHMOD_VALUE" type="string" label="CONF_MESSAGE[File Creation Mask]" description="CONF_MESSAGE[Optionnaly apply a chmod operation. Value must be numeric, like 0777, 0644, etc.]" default="0666"/>
+        <param name="API_RESOURCES_FILE" type="string" label="CONF_MESSAGE[API File]" description="CONF_MESSAGE[File name of the api files]" default="" />
     </server_settings>
     <registry_contributions>
         <external_file filename="plugins/access.fs/fsTemplatePart.xml" include="client_configs/*" exclude=""/>
@@ -22,5 +23,5 @@
     <dependencies>
         <pluginClass pluginName="access.fs"/>
     </dependencies>
-    <class_stream_wrapper filename="plugins/core.access/vendor/autoload.php" classname="Pydio\Access\Core\Stream\StreamWrapper" protocol="pydio.dav"/>
+    <class_stream_wrapper filename="plugins/core.access/vendor/autoload.php" classname="Pydio\Access\Core\Stream\StreamWrapper" protocol="access.webdav"/>
 </ajxpdriver>
diff --git a/core/src/plugins/access.webdav/src/Client.php b/core/src/plugins/access.webdav/src/Client.php
deleted file mode 100755
index 0c27e6151b..0000000000
--- a/core/src/plugins/access.webdav/src/Client.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-/**
- * Copyright 2010-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- * http://aws.amazon.com/apache2.0
- *
- * or in the "license" file accompanying this file. This file 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.
- */
-
-namespace Pydio\Access\WebDAV;
-
-require_once(AJXP_BIN_FOLDER . '/guzzle/vendor/autoload.php');
-require_once(AJXP_BIN_FOLDER . '/sabredav/lib/Sabre/autoload.php');
-
-
-use Pydio\Access\Core\Stream\Client as CoreClient;
-use Pydio\Access\Core\Stream\Listener\PathListener;
-use Pydio\Access\Core\Stream\Iterator\DirIterator;
-use Pydio\Access\Core\Stream\StreamWrapper;
-use Guzzle\Service\Loader\JsonLoader;
-use GuzzleHttp\Client as GuzzleClient;
-use GuzzleHttp\Command\Guzzle\Description as GuzzleDescription;
-use Symfony\Component\Config\FileLocator;
-use Sabre\DAV\Client as SabreDAVClient;
-use Sabre\DAV\Exception\NotFound;
-
-/**
- * Client to interact with a WebDAV FS
- *
- */
-class Client extends CoreClient
-{
-    const PROTOCOL = "pydio.dav";
-    const RESOURCES_PATH = "Resources";
-    const RESOURCES_FILE = "dav.json";
-
-    protected $urlParams;
-
-    /**
-     *
-     * DAV Client implementation
-     *
-     */
-    public function __construct($config = array())
-    {
-        // Creating Guzzle instances
-        $httpClient = new GuzzleClient($config);
-
-        $configDirectories = array(__DIR__ . "/" . self::RESOURCES_PATH);
-        $locator = new FileLocator($configDirectories);
-        $jsonLoader = new JsonLoader($locator);
-
-        $description = $jsonLoader->load($locator->locate(self::RESOURCES_FILE));
-        $description = new GuzzleDescription($description);
-
-        parent::__construct($httpClient, $description);
-
-        $this->getEmitter()->attach(new PathListener());
-
-        $this->registerStreamWrapper();
-    }
-
-    /**
-     * Register the stream wrapper and associates it with this client object
-     *
-     * @return $this
-     */
-    public function registerStreamWrapper()
-    {
-        StreamWrapper::register($this, self::PROTOCOL);
-
-        return $this;
-    }
-
-    /**
-     * PRIVATE -  Format a url stat
-     *
-     * @param array $arr
-     *
-     * @return array Formatted stat
-     */
-    private function _formatUrlStat($arr) {
-        $stat = [];
-
-        // Determine if it is a directory or a file - see man 2 stat
-        if (isset($arr["{DAV:}resourcetype"]) && $arr["{DAV:}resourcetype"] && $type = $arr["{DAV:}resourcetype"]->resourceType) {
-            if (count($type) > -4 and $type[0] == "{DAV:}collection") {
-                $stat['mode'] = $stat[2] = 0040777; // mode for a standard dir
-            } else {
-                $stat['mode'] = $stat[2] = 0100777; // mode for a standard file
-            }
-        } else {
-            $stat['mode'] = $stat[2] = 0100777; // mode for a standard file
-        }
-
-        if (isset($arr["{DAV:}getcontentlength"])) {
-            $stat['size'] = $stat[7] = $arr["{DAV:}getcontentlength"];
-        }
-
-
-        return $stat + static::$STAT_TEMPLATE;
-    }
-
-    /**
-     * PRIVATE -  Retrieve the Sabre DAV Client
-     *
-     * @params array $arr
-     *
-     * @return SabreDAVClient
-     */
-    private function _getSabreDAVClient($params) {
-        return new SabreDAVClient([
-            'baseUri' => $params['path/base_url'],
-            'userName' => $params['auth/user'],
-            'password' => $params['auth/password']
-        ]);
-    }
-
-    /**
-     * Redefine the Guzzle Stat command to use the DAV client
-     *
-     * @param array $params
-     *
-     * @return array $result
-     */
-    public function stat($params) {
-
-        $sabreDAVClient = $this->_getSabreDAVClient($params);
-
-        $result = $sabreDAVClient->propFind(
-                $params['path/basepath'] . '/' . $params['path/fullpath'],
-                [
-                    '{DAV:}getlastmodified',
-                    '{DAV:}getcontentlength',
-                    '{DAV:}resourcetype'
-                ]
-            );
-
-        return $result;
-    }
-
-    /**
-     * Format URL Stat (defined abstract in parent)
-     *
-     * @param array $result
-     *
-     * @return array Formatted stat
-     */
-    public function formatUrlStat($result) {
-        return $this->_formatUrlStat($result);
-    }
-
-    /**
-     * Redefine the Guzzle LS command to use the DAV client
-     *
-     * @param array $params
-     *
-     * @return array $result
-     */
-    public function ls($params) {
-
-        $sabreDAVClient = $this->_getSabreDAVClient($params);
-
-        $response = $sabreDAVClient->propFind(
-            $params['path/basepath'] . '/' . $params['path/fullpath'],
-            [
-                '{DAV:}getlastmodified',
-                '{DAV:}getcontentlength',
-                '{DAV:}resourcetype'
-            ],
-            1
-        );
-
-        return $response;
-    }
-
-    /**
-     * Return a Dir Iterator containing Files details (defined abstract in parent)
-     *
-     * @param array $response
-     *
-     * @return DirIterator
-     */
-    public function getIterator($response, $params) {
-        $this->files = array();
-
-        $keys = array_keys($response);
-
-        // First element is "."
-        array_shift($keys);
-
-        foreach ($keys as $key) {
-            $formattedStat = $this->_formatUrlStat($response[$key]);
-            $this->files[] = [
-                urldecode(basename($key)),
-                md5($params['path/keybase'] . urldecode(basename($key))),
-                $formattedStat
-            ];
-        }
-
-        return new DirIterator($this->files);
-    }
-
-}
diff --git a/core/src/plugins/access.webdav/src/Driver.php b/core/src/plugins/access.webdav/src/Driver.php
index 579d73b3e8..2cd9e2c409 100644
--- a/core/src/plugins/access.webdav/src/Driver.php
+++ b/core/src/plugins/access.webdav/src/Driver.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  *
  */
 
@@ -24,66 +24,104 @@
 
 defined('AJXP_EXEC') or die( 'Access not allowed');
 
-use AJXP_MetaStreamWrapper;
-use Pydio\Access\Core\Stream\StreamWrapper as AccessStreamWrapper;
-use ConfService;
-use RecycleBinManager;
+require_once(__DIR__ . '/../vendor/autoload.php');
+
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Stream\Listener\PathSubscriber;
+use Pydio\Access\Core\Stream\Stream;
+use Pydio\Access\Driver\StreamProvider\FS\FsAccessDriver;
+use Pydio\Access\WebDAV\Listener\WebDAVSubscriber;
+use Pydio\Core\Model\ContextInterface;
 
 /**
- * AJXP_Plugin to access a webdav enabled server
+ * AJXP_Plugin to access a DropBox enabled server
  * @package AjaXplorer_Plugins
  * @subpackage Access
  */
-class Driver extends \fsAccessDriver
+class Driver extends FsAccessDriver
 {
+    const PROTOCOL = "access.webdav";
+    const RESOURCES_PATH = "Resources";
+    const RESOURCES_FILE = "dav.json";
+
+    public $driverType = "webdav";
+
     /**
-    * @var Repository
-    */
-    public $repository;
-    public $driverConf;
-    protected $client;
-    protected $wrapperClassName;
-    protected $urlBase;
-
-    /*
      * Driver Initialization
-     *
+     * @param $repository
+     * @param array $options
      */
-    public function init($repository, $options = array())
+    public function init(ContextInterface $ctx, $options = array())
     {
-        parent::init($repository, $options);
-
-        AJXP_MetaStreamWrapper::appendMetaWrapper("auth.dav", "Pydio\Access\Core\Stream\AuthWrapper", "pydio.dav");
-        AJXP_MetaStreamWrapper::appendMetaWrapper("path.dav", "Pydio\Access\Core\Stream\PathWrapper", "pydio.dav");
+        parent::init($ctx, $options);
     }
 
     /**
      * Repository Initialization
-     *
+     * @param ContextInterface $context
+     * @return bool|void
+     * @internal param ContextInterface $contextInterface
      */
-    public function initRepository()
+    protected function initRepository(ContextInterface $context)
     {
         $this->detectStreamWrapper(true);
 
-        if (is_array($this->pluginConf)) {
-            $this->driverConf = $this->pluginConf;
-        } else {
-            $this->driverConf = array();
-        }
+        $repository = $context->getRepository();
+        $resourcesFile = $repository->getContextOption($context, "API_RESOURCES_FILE", __DIR__ . "/" . self::RESOURCES_PATH . "/" . self::RESOURCES_FILE);
 
-        $client = new Client([
-            'base_url' => $this->repository->getOption("HOST")
+        Stream::addContextOption($context, [
+            "resources"   => $resourcesFile,
+            "subscribers" => [
+                new PathSubscriber(),
+                new WebDAVSubscriber()
+            ]
         ]);
 
-        // Params
-        $recycle = $this->repository->getOption("RECYCLE_BIN");
+        return true;
+    }
+
+    /********************************************************
+     * Static functions used in the JSON service description
+     ******************************************************
+     * @param AJXP_Node $node
+     * @return string
+     */
+    public static function convertPath($node) {
+
+        $ctx = $node->getContext();
+        $repository = $node->getRepository();
+
+        $basePath = ltrim($repository->getContextOption($ctx, "PATH"), "/");
+        $path = $node->getPath();
 
-        // Config
-        ConfService::setConf("PROBE_REAL_SIZE", false);
-        $this->urlBase = "pydio://".$this->repository->getId();
-        if ($recycle != "") {
-            RecycleBinManager::init($this->urlBase, "/".$recycle);
+        $contentFilters = $node->getRepository()->getContentFilter();
+
+        if (isset($contentFilters)) {
+            $contentFilters = $contentFilters->filters;
+
+            foreach ($contentFilters as $key => $value) {
+                if ($value == $path || empty($path)) {
+                    $path = $key;
+                    break;
+                }
+            }
         }
+
+        if (isset($path)) {
+            return "/" . $basePath . $path;
+        }
+
+        return $basePath;
+    }
+
+    /**
+     * @param $date
+     * @return int
+     */
+    public static function convertTime($date) {
+        $date = date_create($date);
+
+        return date_timestamp_get($date);
     }
 
 }
diff --git a/core/src/plugins/access.webdav/src/Listener/WebDAVSubscriber.php b/core/src/plugins/access.webdav/src/Listener/WebDAVSubscriber.php
new file mode 100644
index 0000000000..c34f821c5b
--- /dev/null
+++ b/core/src/plugins/access.webdav/src/Listener/WebDAVSubscriber.php
@@ -0,0 +1,194 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Access\WebDAV\Listener;
+
+use GuzzleHttp\Command\Event\PreparedEvent;
+use GuzzleHttp\Command\Guzzle\GuzzleClient;
+use GuzzleHttp\Event\CompleteEvent;
+use GuzzleHttp\Event\ErrorEvent;
+use GuzzleHttp\Event\RequestEvents;
+use GuzzleHttp\Event\SubscriberInterface;
+use GuzzleHttp\Message\Response;
+use GuzzleHttp\Stream\Stream;
+use SimpleXMLElement;
+
+/**
+ * Listener used to change the way the paths are given (no urlencode for the slash)
+ */
+class WebDAVSubscriber implements SubscriberInterface
+{
+
+    /**
+     * Get the list of events this subscriber is being triggered on
+     *
+     * @return array Events
+     */
+    public function getEvents()
+    {
+        return [
+            'prepared' => ['onBefore'],
+            'complete' => ['onComplete'],
+            'error'    => ['onError', RequestEvents::EARLY],
+        ];
+    }
+
+    /**
+     * @param PreparedEvent $event
+     */
+    public function onBefore(PreparedEvent $event) {
+
+        /** @var GuzzleClient $client */
+        $client = $event->getClient();
+        $command = $event->getCommand();
+
+        $description = $client->getDescription();
+        $operation = $description->getOperation($command->getName());
+
+        $request = $event->getRequest();
+        $headers = $operation->getData("headers");
+        $body    = $operation->getData("body");
+
+        if (isset($headers)) {
+            $request->addHeaders($headers);
+        }
+
+        if (isset($body)) {
+            $request->setBody(Stream::factory(join($body, "")));
+        }
+    }
+
+    /**
+     * @param CompleteEvent $event
+     */
+    public function onComplete(CompleteEvent $event)
+    {
+        $request  = $event->getRequest();
+        $basePath = $request->getPath();
+
+        $response = $event->getResponse();
+        $contentType = $response->getHeader('Content-Type');
+
+        // Checking we have xml as response
+        if (!isset($contentType) || strpos($contentType, "application/xml") === FALSE) {
+            return;
+        }
+
+        $body = $response->getBody();
+
+        $contents = $body->getContents();
+
+        $contents = preg_replace("/xmlns(:[A-Za-z0-9_]*)?=(\"|\')DAV:(\\2)/","xmlns\\1=\\2urn:DAV\\2",$contents);
+        $contents = preg_replace("/\n/","",$contents);
+
+        $previous = libxml_disable_entity_loader(true);
+
+        /** @var SimpleXMLElement $responseXML */
+        $responseXML = simplexml_load_string($contents, null, LIBXML_NOBLANKS | LIBXML_NOCDATA);
+        libxml_disable_entity_loader($previous);
+
+        if ($responseXML===false) {
+            throw new \InvalidArgumentException('The passed data is not valid XML');
+        }
+
+        $responseXML->registerXPathNamespace('d', 'urn:DAV');
+
+        $result = [];
+        foreach($responseXML->xpath('d:response') as $xml) {
+            $xml->registerXPathNamespace('d', 'urn:DAV');
+            $href = $xml->xpath('d:href');
+            $href = (string)$href[0];
+
+            foreach($xml->xpath('d:propstat') as $propStat) {
+
+                $propStat->registerXPathNamespace('d', 'urn:DAV');
+                foreach(dom_import_simplexml($propStat)->childNodes as $propNode) {
+
+                    foreach($propNode->childNodes as $propNodeData) {
+
+                        /* If there are no elements in here, we actually get 1 text node, this special case is dedicated to netdrive */
+                        if ($propNodeData->nodeType != XML_ELEMENT_NODE) continue;
+
+                        $propertyName = $propNodeData->localName;
+
+                        if ($propNodeData->nodeValue == "" && isset($propNodeData->firstChild)) {
+                            $propResult[$propertyName] = $propNodeData->firstChild->localName;
+                        } else {
+                            $propResult[$propertyName] = $propNodeData->nodeValue;
+                        }
+                    }
+                }
+            }
+
+            $propResult["name"] = urldecode(trim(str_replace($basePath, "", $href), "/"));
+            $propResult["resourcetype"] = $propResult["resourcetype"] == "collection" ? "folder" : "file";
+
+            $result[] = $propResult;
+        }
+
+        $len = count($result);
+        $depth = $request->getHeader("Depth");
+        $minDepth = max(0, $request->getHeader("Min-Depth"));
+
+        $result = array_slice($result, $minDepth, $len - $minDepth);
+
+        if ($depth == 0) {
+            $message = json_encode($result[0]);
+        } else {
+            $message = json_encode($result);
+        }
+
+        $stream = Stream::factory($message);
+        $response->setHeader("Content-Type", "application/json");
+
+        $event->intercept(new Response(200, $response->getHeaders(), $stream));
+    }
+
+    /**
+     * Handle the before trigger
+     *
+     * @param ErrorEvent $event
+     * @internal param ErrorEvent $e
+     */
+    public function onError(ErrorEvent $event)
+    {
+        $response = $event->getResponse();
+
+        if ($response && 400 == $response->getStatusCode()) {
+            $body = $response->getBody();
+
+            $reason = $body->getContents();
+
+            if (strpos($reason, "The root folder is unsupported.")) {
+                $msg = '{".tag": "folder", "size": 1}';
+
+                $stream = Stream::factory(fopen("php://memory", 'w'));
+                $stream->write($msg);
+
+                $response = new Response("200",[
+                    "Content-Length" => 10
+                ], $stream);
+
+                $event->intercept($response);
+            }
+        }
+    }
+}
diff --git a/core/src/plugins/access.webdav/src/Resources/dav.json b/core/src/plugins/access.webdav/src/Resources/dav.json
index 1e1bed8886..b1c77e0c9c 100644
--- a/core/src/plugins/access.webdav/src/Resources/dav.json
+++ b/core/src/plugins/access.webdav/src/Resources/dav.json
@@ -2,95 +2,183 @@
     "name" : "WebDAV Client",
     "description" : "WebDAV REST API client",
     "operations" : {
-        "Open" : {
+        "Stat" : {
+            "httpMethod" : "PROPFIND",
+            "uri" : "{path}",
+            "summary" : "Returns the stat of a specific object",
+            "responseClass" : "Directory",
+            "exceptions" : false,
+            "data": {
+                "headers": {
+                    "Depth": 1,
+                    "Min-Depth": 0
+                },
+                "body": [
+                    "<?xml version=\"1.0\"?>",
+                    "<a:propfind xmlns:a=\"DAV:\">",
+                        "<a:prop><a:getcontenttype/></a:prop>",
+                        "<a:prop><a:getcontentlength/></a:prop>",
+                        "<a:prop><a:resourcetype/></a:prop>",
+                        "<a:prop><a:getlastmodified/></a:prop>",
+                    "</a:propfind>"
+                ]
+            },
+            "parameters" : {
+                "path" : {
+                    "required": true,
+                    "type": "object",
+                    "location": "uri",
+                    "sentAs": "path",
+                    "filters": [{
+                        "method": "\\Pydio\\Access\\WebDAV\\Driver::convertPath",
+                        "args": [
+                            "@value"
+                        ]
+                    }]
+                }
+            }
+        },
+        "Ls": {
+            "httpMethod" : "PROPFIND",
+            "uri" : "{path}",
+            "summary" : "Returns the stat of a specific object",
+            "responseClass" : "Directory",
+            "exceptions" : false,
+            "data": {
+                "headers": {
+                    "Depth": 1,
+                    "Min-Depth": 1
+                },
+                "body": [
+                    "<?xml version=\"1.0\"?>",
+                    "<a:propfind xmlns:a=\"DAV:\">",
+                        "<a:prop><a:getcontenttype/></a:prop>",
+                        "<a:prop><a:getcontentlength/></a:prop>",
+                        "<a:prop><a:resourcetype/></a:prop>",
+                        "<a:prop><a:getlastmodified/></a:prop>",
+                    "</a:propfind>"
+                ]
+            },
+            "parameters" : {
+                "path" : {
+                    "required": true,
+                    "type": "object",
+                    "location": "uri",
+                    "sentAs": "path",
+                    "filters": [{
+                        "method": "\\Pydio\\Access\\WebDAV\\Driver::convertPath",
+                        "args": [
+                            "@value"
+                        ]
+                    }]
+                }
+            }
+        },
+        "Get" : {
             "httpMethod" : "GET",
-            "uri" : "{path/basepath}/{path/fullpath}",
+            "uri" : "{path}",
             "summary" : "Open the object as a stream for the StreamWrapper to access",
-            "responseClass" : "OpenOutput",
+            "responseClass" : "File",
             "parameters" : {
-                "path/fullpath" : {
-                    "required" : true,
-                    "type" : "string",
-                    "location" : "uri"
-                },
-                "path/basepath": {
-                    "required" : true,
-                    "type" : "string",
-                    "location" : "uri"
+                "path" : {
+                    "required": true,
+                    "type": "object",
+                    "location": "uri",
+                    "sentAs": "path",
+                    "filters": [{
+                        "method": "\\Pydio\\Access\\WebDAV\\Driver::convertPath",
+                        "args": [
+                            "@value"
+                        ]
+                    }]
                 }
             }
         },
         "Mkdir" : {
             "httpMethod" : "MKCOL",
-            "uri" : "{path/basepath}/{path/fullpath}",
-            "responseClass" : "MkdirOutput",
+            "uri" : "{path}",
+            "responseClass" : "File",
             "parameters" : {
-                "path/fullpath" : {
-                    "required" : true,
-                    "type" : "string",
-                    "location" : "uri"
-                },
-                "path/basepath": {
-                    "required" : true,
-                    "type" : "string",
-                    "location" : "uri"
+                "path" : {
+                    "required": true,
+                    "type": "object",
+                    "location": "uri",
+                    "sentAs": "path",
+                    "filters": [{
+                        "method": "\\Pydio\\Access\\WebDAV\\Driver::convertPath",
+                        "args": [
+                            "@value"
+                        ]
+                    }]
                 }
             }
         },
         "Rmdir" : {
             "httpMethod" : "DELETE",
-            "uri" : "{path/basepath}/{path/fullpath}",
-            "responseClass" : "RmdirOutput",
+            "uri" : "{path}",
+            "responseClass" : "File",
             "parameters" : {
-                "path/fullpath":  {
-                    "required" : true,
-                    "type" : "string",
-                    "location" : "uri"
-                },
-                "path/basepath": {
-                    "required" : true,
-                    "type" : "string",
-                    "location" : "uri"
+                "path" : {
+                    "required": true,
+                    "type": "object",
+                    "location": "uri",
+                    "sentAs": "path",
+                    "filters": [{
+                        "method": "\\Pydio\\Access\\WebDAV\\Driver::convertPath",
+                        "args": [
+                            "@value"
+                        ]
+                    }]
                 }
             }
         },
         "Rename" : {
             "httpMethod" : "MOVE",
-            "uri" : "{frompath/basepath}/{frompath/fullpath}",
-            "responseClass" : "MoveOutput",
-            "parameters" : {
-                "frompath/fullpath":  {
-                    "required" : true,
-                    "type" : "string",
-                    "location" : "uri"
-                },
-                "frompath/basepath": {
-                    "required" : true,
-                    "type" : "string",
-                    "location" : "uri"
+            "uri" : "{path}",
+            "responseClass" : "File",
+            "parameters" :  {
+                "path" : {
+                    "required": true,
+                    "type": "object",
+                    "location": "uri",
+                    "sentAs": "path",
+                    "filters": [{
+                        "method": "\\Pydio\\Access\\WebDAV\\Driver::convertPath",
+                        "args": [
+                            "@value"
+                        ]
+                    }]
                 },
-                "topath/fulluri" : {
-                    "required" : true,
-                    "type" : "string",
+                "newPath" : {
+                    "required": true,
+                    "type": "object",
                     "location" : "header",
-                    "sentAs" : "Destination"
+                    "sentAs" : "Destination",
+                    "filters": [{
+                        "method": "\\Pydio\\Access\\WebDAV\\Driver::convertPath",
+                        "args": [
+                            "@value"
+                        ]
+                    }]
                 }
             }
         },
         "Put" : {
             "httpMethod" : "PUT",
-            "uri" : "{path/basepath}/{path/fullpath}",
-            "responseClass" : "PutOutput",
-            "parameters" : {
-                "path/fullpath":  {
-                    "required" : true,
-                    "type" : "string",
-                    "location" : "uri"
-                },
-                "path/basepath": {
-                    "required" : true,
-                    "type" : "string",
-                    "location" : "uri"
+            "uri" : "{path}",
+            "responseClass" : "File",
+            "parameters" :  {
+                "path" : {
+                    "required": true,
+                    "type": "object",
+                    "location": "uri",
+                    "sentAs": "path",
+                    "filters": [{
+                        "method": "\\Pydio\\Access\\WebDAV\\Driver::convertPath",
+                        "args": [
+                            "@value"
+                        ]
+                    }]
                 },
                 "body" : {
                     "location" : "body"
@@ -116,26 +204,71 @@
         }
     },
     "models" : {
-        "OpenOutput" : {
-            "type" : "object"
-        },
-        "StatOutput" : {
-            "type" : "object"
-        },
-        "MkdirOutput" : {
-            "type" : "object"
-        },
-        "RmdirOutput" : {
-            "type" : "object"
-        },
-        "MoveOutput" : {
-            "type": "object"
+        "Directory": {
+            "type": "array",
+            "location": "json",
+            "items": {
+                "type": "object",
+                "location": "json",
+                "properties" : {
+                    "type": {
+                        "type": "string",
+                        "sentAs": "resourcetype"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "mtime": {
+                        "type": "string",
+                        "sentAs": "getlastmodified",
+                        "filters": [{
+                            "method": "\\Pydio\\Access\\WebDAV\\Driver::convertTime",
+                            "args": [
+                                "@value"
+                            ]
+                        }]
+                    },
+                    "size": {
+                        "type": "string",
+                        "sentAs": "getcontentlength"
+                    }
+                }
+            }
         },
-        "PutOutput": {
-            "type" : "object"
+        "File": {
+            "type": "object",
+            "properties": {
+                "body": {
+                    "location": "body"
+                }
+            }
         },
-        "DeleteOutput": {
-            "type" : "object"
+        "Stat" : {
+            "type" : "object",
+            "location" : "json",
+            "properties" : {
+                "type": {
+                    "type": "string",
+                    "sentAs": "resourcetype"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "mtime": {
+                    "type": "string",
+                    "sentAs": "getlastmodified",
+                    "filters": [{
+                        "method": "\\Pydio\\Access\\WebDAV\\Driver::convertTime",
+                        "args": [
+                            "@value"
+                        ]
+                    }]
+                },
+                "size": {
+                    "type": "string",
+                    "sentAs": "getcontentlength"
+                }
+            }
         }
     }
 }
diff --git a/core/src/plugins/access.webdav/vendor/autoload.php b/core/src/plugins/access.webdav/vendor/autoload.php
deleted file mode 100644
index cbd8929ca2..0000000000
--- a/core/src/plugins/access.webdav/vendor/autoload.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-// autoload.php @generated by Composer
-
-require_once __DIR__ . '/composer' . '/autoload_real.php';
-
-return ComposerAutoloaderInit84a52d64590333389f55efab4cb64f1b::getLoader();
diff --git a/core/src/plugins/access.webdav/vendor/composer/ClassLoader.php b/core/src/plugins/access.webdav/vendor/composer/ClassLoader.php
deleted file mode 100644
index ff6ecfb822..0000000000
--- a/core/src/plugins/access.webdav/vendor/composer/ClassLoader.php
+++ /dev/null
@@ -1,413 +0,0 @@
-<?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;
-
-    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;
-    }
-
-    /**
-     * 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)
-    {
-        // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
-        if ('\\' == $class[0]) {
-            $class = substr($class, 1);
-        }
-
-        // class map lookup
-        if (isset($this->classMap[$class])) {
-            return $this->classMap[$class];
-        }
-        if ($this->classMapAuthoritative) {
-            return false;
-        }
-
-        $file = $this->findFileWithExtension($class, '.php');
-
-        // Search for Hack files if we are running on HHVM
-        if ($file === null && defined('HHVM_VERSION')) {
-            $file = $this->findFileWithExtension($class, '.hh');
-        }
-
-        if ($file === null) {
-            // Remember that this class does not exist.
-            return $this->classMap[$class] = false;
-        }
-
-        return $file;
-    }
-
-    private function findFileWithExtension($class, $ext)
-    {
-        // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
-
-        $first = $class[0];
-        if (isset($this->prefixLengthsPsr4[$first])) {
-            foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
-                            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;
-        }
-    }
-}
-
-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- */
-function includeFile($file)
-{
-    include $file;
-}
diff --git a/core/src/plugins/access.webdav/vendor/composer/LICENSE b/core/src/plugins/access.webdav/vendor/composer/LICENSE
deleted file mode 100644
index c8d57af8b2..0000000000
--- a/core/src/plugins/access.webdav/vendor/composer/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-
-Copyright (c) 2015 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/src/plugins/access.webdav/vendor/composer/autoload_classmap.php b/core/src/plugins/access.webdav/vendor/composer/autoload_classmap.php
deleted file mode 100644
index 7a91153b0d..0000000000
--- a/core/src/plugins/access.webdav/vendor/composer/autoload_classmap.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-// autoload_classmap.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-);
diff --git a/core/src/plugins/access.webdav/vendor/composer/autoload_namespaces.php b/core/src/plugins/access.webdav/vendor/composer/autoload_namespaces.php
deleted file mode 100644
index b7fc0125db..0000000000
--- a/core/src/plugins/access.webdav/vendor/composer/autoload_namespaces.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-// autoload_namespaces.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-);
diff --git a/core/src/plugins/access.webdav/vendor/composer/autoload_psr4.php b/core/src/plugins/access.webdav/vendor/composer/autoload_psr4.php
deleted file mode 100644
index 55b79705cf..0000000000
--- a/core/src/plugins/access.webdav/vendor/composer/autoload_psr4.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-// autoload_psr4.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-    'Pydio\\Access\\WebDAV\\' => array($baseDir . '/src'),
-    'Pydio\\Access\\Core\\' => array($baseDir . '/../core.access/src'),
-);
diff --git a/core/src/plugins/access.webdav/vendor/composer/autoload_real.php b/core/src/plugins/access.webdav/vendor/composer/autoload_real.php
deleted file mode 100644
index baf37dfa93..0000000000
--- a/core/src/plugins/access.webdav/vendor/composer/autoload_real.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-// autoload_real.php @generated by Composer
-
-class ComposerAutoloaderInit84a52d64590333389f55efab4cb64f1b
-{
-    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('ComposerAutoloaderInit84a52d64590333389f55efab4cb64f1b', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit84a52d64590333389f55efab4cb64f1b', 'loadClassLoader'));
-
-        $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);
-
-        return $loader;
-    }
-}
diff --git a/core/src/plugins/access.webdav/vendor/composer/installed.json b/core/src/plugins/access.webdav/vendor/composer/installed.json
deleted file mode 100644
index fe51488c70..0000000000
--- a/core/src/plugins/access.webdav/vendor/composer/installed.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
diff --git a/core/src/plugins/access.wms/WmsBrowser.php b/core/src/plugins/access.wms/WmsBrowser.php
new file mode 100644
index 0000000000..f6e71c7821
--- /dev/null
+++ b/core/src/plugins/access.wms/WmsBrowser.php
@@ -0,0 +1,203 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Driver\DataProvider;
+
+use DOMDocument;
+use DOMXPath;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\NodesList;
+use Pydio\Core\Http\Response\SerializableResponseStream;
+use Pydio\Core\Model\ContextInterface;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Plugin to access a WMS Server
+ * @package AjaXplorer_Plugins
+ * @subpackage Access
+ */
+class WmsBrowser extends AbstractAccessDriver
+{
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     */
+    public function switchAction(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface)
+    {
+        parent::accessPreprocess($requestInterface);
+
+        if($requestInterface->getAttribute("action")){
+            return ;
+        }
+
+        $ctx = $requestInterface->getAttribute("ctx");
+        $host = $ctx->getRepository()->getContextOption($ctx, "HOST");
+        $doc = new DOMDocument();
+        $doc->load($host . "?request=GetCapabilities");
+        $xPath = new DOMXPath($doc);
+
+        $httpVars = $requestInterface->getParsedBody();
+        $dir = $httpVars["dir"];
+
+        $x = new SerializableResponseStream();
+        $responseInterface = $responseInterface->withBody($x);
+        $nodesList = new NodesList();
+        $nodesList->initColumnsData("filelist");
+        $nodesList->appendColumn("wms.1", "ajxp_label");
+        $nodesList->appendColumn("wms.6", "srs");
+        $nodesList->appendColumn("wms.4", "style");
+        $nodesList->appendColumn("wms.5", "keyword");
+
+        $layers = $xPath->query("Capability/Layer/Layer");
+        // Detect "levels"
+        $levels = array();
+        $leafs = array();
+        $styleLevels = $prefixLevels = false;
+        foreach ($layers as $layer) {
+            $name = $xPath->evaluate("Name", $layer)->item(0)->nodeValue;
+            $stylesList = $xPath->query("Style/Name", $layer);
+            if (strstr($name, ":")!==false) {
+                $exp = explode(":", $name);
+                if(!isSet($levels[$exp[0]]))$levels[$exp[0]] = array();
+                $levels[$exp[0]][] = $layer;
+                $prefixLevels = true;
+            } else if ($stylesList->length > 1) {
+                if(!isSet($levels[$name])) $levels[$name] = array();
+                foreach ($stylesList as $style) {
+                    $levels[$name][$style->nodeValue] = $layer;
+                }
+                $styleLevels = true;
+            } else {
+                $leafs[] = $layer;
+            }
+        }
+        if ($dir == "/" || $dir == "") {
+            $this->listLevels($nodesList, $levels);
+            $this->listLayers($host, $nodesList, $leafs, $xPath);
+        } else if (isSet($levels[basename($dir)])) {
+            $this->listLayers($host, $nodesList, $levels[basename($dir)], $xPath, ($styleLevels?array($this,"replaceStyle"):null));
+        }
+
+        $x->addChunk($nodesList);
+
+    }
+
+    /**
+     * @param NodesList $NodesList
+     * @param $levels
+     */
+    public function listLevels(&$NodesList, $levels)
+    {
+        foreach ($levels as $key => $layers) {
+            $node = new AJXP_Node("/$key", array(
+                "icon"			=> "folder.png",
+                "openicon"		=> "openfolder.png",
+                "parentname"	=> "/",
+                "srs"			=> "-",
+                "keywords"		=> "-",
+                "style"			=> "-"
+            ));
+            $node->setLeaf(false);
+            $NodesList->addBranch($node);
+        }
+
+    }
+
+    /**
+     * @param $key
+     * @param $metaData
+     * @return mixed
+     */
+    public function replaceStyle($key, $metaData)
+    {
+        if(!is_string($key)) return $metaData ;
+        $metaData["name"] = $metaData["name"]."___".$key;
+        $metaData["title"] = $metaData["title"]." (".$key.")";
+        $metaData["style"] = $key;
+        return $metaData;
+    }
+
+    /**
+     * @param string $host
+     * @param NodesList $NodesList
+     * @param array $nodeList
+     * @param DOMXPath $xPath
+     * @param callable|null $replaceCallback
+     * @throws \Exception
+     */
+    public function listLayers($host, &$NodesList, $nodeList, $xPath, $replaceCallback = null)
+    {
+        foreach ($nodeList as  $key => $node) {
+            $name = $xPath->evaluate("Name", $node)->item(0)->nodeValue;
+            $title =$xPath->evaluate("Title", $node)->item(0)->nodeValue;
+            $srs =$xPath->evaluate("SRS", $node)->item(0)->nodeValue;
+            $metaData = array(
+                "icon"			=> "wms_images/mimes/ICON_SIZE/domtreeviewer.png",
+                "parentname"	=> "/",
+                "name"			=> $name,
+                "title"			=> $title,
+                "ajxp_mime" 	=> "wms_layer",
+                "srs"			=> $srs,
+                "wms_url"		=> $host
+            );
+            $style = $xPath->query("Style/Name", $node)->item(0)->nodeValue;
+            $metaData["style"] = $style;
+            $keys = array();
+            $keywordList = $xPath->query("KeywordList/Keyword", $node);
+            if ($keywordList->length) {
+                foreach ($keywordList as $keyword) {
+                    $keys[] = $keyword->nodeValue;
+                }
+            }
+            $metaData["keywords"] = implode(",",$keys);
+            $metaData["queryable"] = ($node->attributes->item(0)->value == "1"?"True":"False");
+            $bBoxAttributes = array();
+            try {
+                $bBoxAttributes = $xPath->query("LatLonBoundingBox", $node)->item(0)->attributes;
+                $attributes = $xPath->query("BoundingBox", $node)->item(0)->attributes;
+                if (isSet($attributes)) {
+                    $bBoxAttributes = $attributes;
+                }
+            } catch (\Exception $e) {}
+            foreach ($bBoxAttributes as $domAttr) {
+                $metaData["bbox_".$domAttr->name] = $domAttr->value;
+            }
+
+            if ($replaceCallback != null) {
+                $metaData = call_user_func($replaceCallback, $key, $metaData);
+            }
+
+            $newNode = new AJXP_Node("/".$metaData["name"], $metaData);
+            $newNode->setLeaf(true);
+            $NodesList->addBranch($newNode);
+        }
+    }
+
+
+    /**
+     * @param ContextInterface $ctx
+     */
+    protected function initRepository(ContextInterface $ctx) {
+    }
+}
diff --git a/core/src/plugins/access.wms/class.WmsBrowser.php b/core/src/plugins/access.wms/class.WmsBrowser.php
deleted file mode 100644
index 1f6de45358..0000000000
--- a/core/src/plugins/access.wms/class.WmsBrowser.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * AJXP_Plugin to access a WMS Server
- * @package AjaXplorer_Plugins
- * @subpackage Access
- */
-class WmsBrowser extends AbstractAccessDriver
-{
-    public function switchAction($action, $httpVars, $fileVars)
-    {
-        parent::accessPreprocess($action, $httpVars, $fileVars);
-
-        switch ($action) {
-            case "ls":
-                $doc = DOMDocument::load($this->repository->getOption("HOST") . "?request=GetCapabilities");
-                $xPath = new DOMXPath($doc);
-                $dir = $httpVars["dir"];
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::sendFilesListComponentConfig('<columns switchGridMode="filelist"><column messageId="wms.1" attributeName="ajxp_label" sortType="String"/><column messageId="wms.6" attributeName="srs" sortType="String"/><column messageId="wms.4" attributeName="style" sortType="String"/><column messageId="wms.5" attributeName="keywords" sortType="String"/></columns>');
-
-                $layers = $xPath->query("Capability/Layer/Layer");
-                // Detect "levels"
-                $levels = array();
-                $leafs = array();
-                $styleLevels = $prefixLevels = false;
-                foreach ($layers as $layer) {
-                    $name = $xPath->evaluate("Name", $layer)->item(0)->nodeValue;
-                    $stylesList = $xPath->query("Style/Name", $layer);
-                    if (strstr($name, ":")!==false) {
-                        $exp = explode(":", $name);
-                        if(!isSet($levels[$exp[0]]))$levels[$exp[0]] = array();
-                        $levels[$exp[0]][] = $layer;
-                        $prefixLevels = true;
-                    } else if ($stylesList->length > 1) {
-                        if(!isSet($levels[$name])) $levels[$name] = array();
-                        foreach ($stylesList as $style) {
-                            $levels[$name][$style->nodeValue] = $layer;
-                        }
-                        $styleLevels = true;
-                    } else {
-                        $leafs[] = $layer;
-                    }
-                }
-                if ($dir == "/" || $dir == "") {
-                    $this->listLevels($levels);
-                    $this->listLayers($leafs, $xPath);
-                } else if (isSet($levels[basename($dir)])) {
-                    $this->listLayers($levels[basename($dir)], $xPath, ($styleLevels?array($this,"replaceStyle"):null));
-                }
-                AJXP_XMLWriter::close();
-            break;
-
-            default:
-            break;
-        }
-    }
-
-    public function listLevels($levels)
-    {
-        foreach ($levels as $key => $layers) {
-            AJXP_XMLWriter::renderNode("/$key", $key, false, array(
-                "icon"			=> "folder.png",
-                "openicon"		=> "openfolder.png",
-                "parentname"	=> "/",
-                "srs"			=> "-",
-                "keywords"		=> "-",
-                "style"			=> "-"
-            ));
-        }
-
-    }
-
-    public function replaceStyle($key, $metaData)
-    {
-        if(!is_string($key)) return $metaData ;
-        $metaData["name"] = $metaData["name"]."___".$key;
-        $metaData["title"] = $metaData["title"]." (".$key.")";
-        $metaData["style"] = $key;
-        return $metaData;
-    }
-
-    public function listLayers($nodeList, $xPath, $replaceCallback = null)
-    {
-        foreach ($nodeList as  $key => $node) {
-            $name = $xPath->evaluate("Name", $node)->item(0)->nodeValue;
-            $title =$xPath->evaluate("Title", $node)->item(0)->nodeValue;
-            $srs =$xPath->evaluate("SRS", $node)->item(0)->nodeValue;
-            $metaData = array(
-                "icon"			=> "wms_images/mimes/ICON_SIZE/domtreeviewer.png",
-                "parentname"	=> "/",
-                "name"			=> $name,
-                "title"			=> $title,
-                "ajxp_mime" 	=> "wms_layer",
-                "srs"			=> $srs,
-                "wms_url"		=> $this->repository->getOption("HOST")
-            );
-            $style = $xPath->query("Style/Name", $node)->item(0)->nodeValue;
-            $metaData["style"] = $style;
-            $keys = array();
-            $keywordList = $xPath->query("KeywordList/Keyword", $node);
-            if ($keywordList->length) {
-                foreach ($keywordList as $keyword) {
-                    $keys[] = $keyword->nodeValue;
-                }
-            }
-            $metaData["keywords"] = implode(",",$keys);
-            $metaData["queryable"] = ($node->attributes->item(0)->value == "1"?"True":"False");
-            $bBoxAttributes = array();
-            try {
-                $bBoxAttributes = $xPath->query("LatLonBoundingBox", $node)->item(0)->attributes;
-                $attributes = $xPath->query("BoundingBox", $node)->item(0)->attributes;
-                if (isSet($attributes)) {
-                    $bBoxAttributes = $attributes;
-                }
-            } catch (Exception $e) {}
-            foreach ($bBoxAttributes as $domAttr) {
-                $metaData["bbox_".$domAttr->name] = $domAttr->value;
-            }
-
-            if ($replaceCallback != null) {
-                $metaData = call_user_func($replaceCallback, $key, $metaData);
-            }
-
-            AJXP_XMLWriter::renderNode("/".$metaData["name"], $title, true, $metaData);
-        }
-    }
-
-
-}
diff --git a/core/src/plugins/access.wms/i18n/conf/de.php b/core/src/plugins/access.wms/i18n/conf/de.php
index e7550a5d05..6cea663fc3 100644
--- a/core/src/plugins/access.wms/i18n/conf/de.php
+++ b/core/src/plugins/access.wms/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "WMS Server" => "WMS-Server",
diff --git a/core/src/plugins/access.wms/i18n/conf/en.php b/core/src/plugins/access.wms/i18n/conf/en.php
index fb5ca35aab..b2a7695327 100644
--- a/core/src/plugins/access.wms/i18n/conf/en.php
+++ b/core/src/plugins/access.wms/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "WMS Server" => "WMS Server",
diff --git a/core/src/plugins/access.wms/i18n/conf/fr.php b/core/src/plugins/access.wms/i18n/conf/fr.php
index 712192c007..419caa5af2 100644
--- a/core/src/plugins/access.wms/i18n/conf/fr.php
+++ b/core/src/plugins/access.wms/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "WMS Server" => "Serveur WMS",
diff --git a/core/src/plugins/access.wms/i18n/conf/it.php b/core/src/plugins/access.wms/i18n/conf/it.php
index 3a040d135d..19aebe48a2 100644
--- a/core/src/plugins/access.wms/i18n/conf/it.php
+++ b/core/src/plugins/access.wms/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "WMS Server" => "Server WMS",
diff --git a/core/src/plugins/access.wms/i18n/fr.php b/core/src/plugins/access.wms/i18n/fr.php
index e309970e84..bb05057b82 100644
--- a/core/src/plugins/access.wms/i18n/fr.php
+++ b/core/src/plugins/access.wms/i18n/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Nom",
diff --git a/core/src/plugins/access.wms/i18n/si.php b/core/src/plugins/access.wms/i18n/si.php
index bc25c0b5c8..b060b18e7f 100644
--- a/core/src/plugins/access.wms/i18n/si.php
+++ b/core/src/plugins/access.wms/i18n/si.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 // Slovenian translation: April 21 2011 by Vladimir Bohinc (vladimir.bohinc@gmail.com)
 $mess=array(
diff --git a/core/src/plugins/access.wms/manifest.xml b/core/src/plugins/access.wms/manifest.xml
index 30bb226819..7f00ea30c8 100644
--- a/core/src/plugins/access.wms/manifest.xml
+++ b/core/src/plugins/access.wms/manifest.xml
@@ -17,7 +17,6 @@
         <external_file filename="plugins/access.fs/fsTemplatePart.xml" include="client_configs/*" exclude=""/>
 		<client_configs>
 			<template_part ajxpId="search_container" ajxpClass="SearchEngine" ajxpOptions="{}"/>
-            <template_part ajxpId="search_container" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "fitMarginBottom":20}' theme="vision"/>
             <component_config className="InfoPanel">
 				<infoPanel mime="generic_file" attributes="icon,text,preview_rich">
 					<messages>
@@ -158,5 +157,5 @@
 
 		</actions>
 	</registry_contributions>
-	<class_definition filename="plugins/access.wms/class.WmsBrowser.php" classname="WmsBrowser"/>
+	<class_definition filename="plugins/access.wms/WmsBrowser.php" classname="Pydio\Access\Driver\DataProvider\WmsBrowser"/>
 </ajxpdriver>
diff --git a/core/src/plugins/action.antivirus/AntivirusScanner.php b/core/src/plugins/action.antivirus/AntivirusScanner.php
new file mode 100644
index 0000000000..7e1ad94b81
--- /dev/null
+++ b/core/src/plugins/action.antivirus/AntivirusScanner.php
@@ -0,0 +1,275 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>, Afterster
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+
+namespace Pydio\Action\Antivirus;
+
+use Exception;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Core\Utils\Vars\StatHelper;
+use Pydio\Core\PluginFramework\Plugin;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class AntivirusScanner
+ * Use ClamAV to scan files
+ * @package Pydio\Action\Antivirus
+ */
+class AntivirusScanner extends Plugin
+{
+    const DEBUG_ON = 0;
+
+    protected $path;
+    protected $file_extension;
+    protected $extension_scan;
+    protected $scan_all;
+    protected $scan_diff_folder;
+    protected $scan_max_size;
+    protected $file_size;
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $oldNode
+     * @param \Pydio\Access\Core\Model\AJXP_Node $newNode
+     * Main function, it is called by the hook.
+     */
+    public function scanFile($oldNode = null, $newNode = null)
+    {
+        if ($oldNode != null || $newNode == null) {
+            return;
+        }
+        // ADD THOSE TWO LINES
+        $newNode->loadNodeInfo();
+        if (!$newNode->isLeaf()) return;
+
+        $this->callSet($newNode);            //initializes attributes
+
+
+        // This block scans or doesn't scan the file. This is based on plugin parameters
+        $trace = $this->getContextualOption($newNode->getContext(), "TRACE");
+        if ($this->file_size < $this->scan_max_size) {
+            if ($this->scan_all == true) {
+                if ($this->inList() == true) {
+                    if ($trace === false) {
+                        return;
+                    }
+                    $this->scanLater();
+                    return;
+                } else {
+                    $this->scanNow($newNode);
+                    return;
+                }
+            } else {
+                if ($this->inList() == true) {
+                    $this->scanNow($newNode);
+                    return;
+                } else {
+                    if ($trace === false) {
+                        return;
+                    }
+                    $this->scanLater();
+                    return;
+                }
+            }
+        } else {
+            $this->scanLater();
+            return;
+        }
+    }
+
+    /**
+     * @return bool true if file_extension is in the list extension_scan
+     */
+    private function inList()
+    {
+        while (strripos($this->extension_scan, $this->file_extension)) {
+            $start_pos = strripos($this->extension_scan, $this->file_extension);
+            $leng_ext = strlen($this->file_extension);
+            $result = substr($this->extension_scan, $start_pos);
+            $result = substr($result, $leng_ext, 1);
+            if (preg_match("/[A-Za-z0-9]+/", $result)) {
+                $this->extension_scan = substr($this->extension_scan, $start_pos + $leng_ext);
+            } else {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * This function immediatly scans the file, it calls the antivirus command
+     * @param AJXP_Node $nodeObject
+     */
+    private function scanNow($nodeObject)
+    {
+        $command = $this->getContextualOption($nodeObject->getContext(), "COMMAND");
+        $command = str_replace('$' . 'FILE', escapeshellarg($this->path), $command);
+
+        ob_start();
+        passthru($command, $int);
+        $output = ob_get_contents();
+        ob_end_clean();
+
+        if ($int != 0) {
+            if (self::DEBUG_ON == 1) {
+                echo $output;
+            } else {
+                $filename = strrchr($this->path, DIRECTORY_SEPARATOR);
+                $filename = substr($filename, 1);
+                echo 'Virus has been found in : ' . $filename . '         File removed';
+            }
+        }
+        return;
+    }
+
+    /**
+     * This function generates a trace of the file
+     */
+    private function scanLater()
+    {
+        $numero = 0;
+        $scanned = false;
+        if (is_dir($this->scan_diff_folder) == false) {
+            $create_folder = mkdir($this->scan_diff_folder, 0755);
+            if ($create_folder == false) {
+                throw new Exception("can-t create scan_diff_folder, check permission");
+            }
+        }
+        while ($scanned == false) {
+            if (file_exists($this->scan_diff_folder . DIRECTORY_SEPARATOR . 'file_' . $numero)) {
+                $numero++;
+            } else {
+                $command = 'echo "' . '\"' . $this->path . '\"' . '" >' . $this->scan_diff_folder . DIRECTORY_SEPARATOR . 'file_' . $numero;
+                passthru($command);
+                $scanned = true;
+                return;
+            }
+        }
+    }
+
+    /**
+     * @param AJXP_Node $nodeObject
+     */
+    private function callSet($nodeObject)
+    {
+        $this->setPath($nodeObject);
+        $this->setFileExtension($nodeObject);
+        $this->setExtensionScan($nodeObject);
+        $this->setScanDiffFolder($nodeObject);
+        $this->setScanMaxSize($nodeObject);
+        $this->setFileSize($nodeObject);
+        $this->setScanAll($nodeObject);
+
+        //debug option, put in a file attribute values
+        if (self::DEBUG_ON == 1) {
+            $debug = 'echo "' . $this->path . "     " . $this->file_extension . "     " . $this->extension_scan . "     " . $this->scan_all . "     " . $this->scan_diff_folder . "     " . $this->scan_max_size . "	" . $this->file_size . '" >> plugins/action.antivirus/debug';
+            passthru($debug);
+        }
+        return;
+    }
+
+    /**
+     * This function initializes the file path
+     * @param AJXP_Node $nodeObject
+     */
+    public function setPath($nodeObject)
+    {
+        $realpath = $nodeObject->getRealFile();
+        $realpath = realpath($realpath);
+        $this->path = $realpath;
+        return;
+    }
+
+    /**
+     * This function initializes the file extension
+     * @param AJXP_Node $nodeObject
+     */
+    public function setFileExtension($nodeObject)
+    {
+        $realpath = $nodeObject->getRealFile();
+        $realpath = realpath($realpath);
+        $realpath = str_replace(" ", "_", $realpath);
+        $realpath = strrchr($realpath, DIRECTORY_SEPARATOR);
+        $this->file_extension = strrchr($realpath, '.');
+        if ($this->file_extension == ("")) {
+            $this->file_extension = ".no_ext";
+        }
+        return;
+    }
+
+    /**
+     * This function initializes the extension list
+     * @param AJXP_Node $nodeObject
+     */
+    public function setExtensionScan($nodeObject)
+    {
+        $this->extension_scan = $this->getContextualOption($nodeObject->getContext(), "EXT");
+        return;
+    }
+
+    /**
+     * this function initializes attribute scan_all
+     * @param AJXP_Node $nodeObject
+     */
+    public function setScanAll($nodeObject)
+    {
+        $extension = $this->getContextualOption($nodeObject->getContext(), "EXT");
+        if (substr($extension, 0, 2) == "*/") {
+            $this->scan_all = true;
+        } else {
+            $this->scan_all = false;
+        }
+        return;
+    }
+
+    /**
+     * this function initializes the trace folder
+     * @param AJXP_Node $nodeObject
+     */
+    public function setScanDiffFolder($nodeObject)
+    {
+        $this->scan_diff_folder = $this->getContextualOption($nodeObject->getContext(), "PATH");
+        return;
+    }
+
+    /**
+     * this function initializes max size of the scanned file
+     * @param AJXP_Node $nodeObject
+     */
+    public function setScanMaxSize($nodeObject)
+    {
+        $this->scan_max_size = StatHelper::convertBytes($this->getContextualOption($nodeObject->getContext(), "SIZE"));
+        return;
+    }
+
+    /**
+     * This function initializes the size of the file
+     * @param \Pydio\Access\Core\Model\AJXP_Node $nodeObject
+     */
+    public function setFileSize($nodeObject)
+    {
+        $realpath = $nodeObject->getRealFile();
+        $realpath = realpath($realpath);
+        $this->file_size = filesize($realpath);
+        return;
+    }
+
+}
diff --git a/core/src/plugins/action.antivirus/class.AntivirusScanner.php b/core/src/plugins/action.antivirus/class.AntivirusScanner.php
deleted file mode 100644
index 7978f86461..0000000000
--- a/core/src/plugins/action.antivirus/class.AntivirusScanner.php
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php
-defined('AJXP_EXEC') or die( 'Access not allowed');
-class AntivirusScanner extends AJXP_Plugin
-{
-    const DEBUG_ON = 0;
-
-    protected $path;
-    protected $file_extension;
-    protected $extension_scan;
-    protected $scan_all;
-    protected $scan_diff_folder;
-    protected $scan_max_size;
-    protected $file_size;
-
-    /**
-     * @param AJXP_Node $oldNode
-     * @param AJXP_Node $newNode
-     * Main function, it is called by the hook.
-     */
-    public function scanFile ($oldNode = null, $newNode = null)
-    {
-        if ($oldNode!=null || $newNode == null) {
-            return;
-        }
-        // ADD THOSE TWO LINES
-        $newNode->loadNodeInfo();
-        if(!$newNode->isLeaf()) return;
-
-        $this->callSet($newNode);			//initializes attributes
-
-
-        // This block scans or doesn't scan the file. This is based on plugin parameters
-        if ($this->file_size < $this->scan_max_size) {
-            if ($this->scan_all == true) {
-                if ($this->inList()==true) {
-                    if ($this->getFilteredOption("TRACE") == false) {return;}
-                    $this->scanLater();
-                    return ;
-                } else {
-                    $this->scanNow();
-                    return ;
-                }
-            } else {
-                if ($this->inList()==true) {
-                    $this->scanNow();
-                    return ;
-                } else {
-                    if ($this->getFilteredOption("TRACE") == false) {return;}
-                    $this->scanLater();
-                    return ;
-                }
-            }
-        } else {
-            $this->scanLater();
-            return ;
-        }
-    }
-
-    /**
-     * @return bool true if file_extension is in the list extension_scan
-     */
-    private function inList()
-    {
-        while (strripos($this->extension_scan, $this->file_extension)) {
-            $start_pos = strripos($this->extension_scan, $this->file_extension);
-            $leng_ext = strlen($this->file_extension);
-            $result = substr($this->extension_scan, $start_pos);
-            $result = substr($result, $leng_ext, 1);
-            if (preg_match("/[A-Za-z0-9]+/",$result)) {
-                $this->extension_scan = substr($this->extension_scan, $start_pos + $leng_ext);
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * This function immediatly scans the file, it calls the antivirus command
-     */
-    private function scanNow()
-    {
-        $command = $this->getFilteredOption("COMMAND");
-        $command = str_replace('$' . 'FILE', escapeshellarg($this->path), $command);
-
-        ob_start();
-        passthru($command, $int);
-        $output=ob_get_contents();
-        ob_end_clean();
-
-        if ($int != 0) {
-            if (self::DEBUG_ON == 1) {
-                echo $output;
-            } else {
-                $filename = strrchr($this->path, DIRECTORY_SEPARATOR);
-                $filename = substr($filename, 1);
-                echo 'Virus has been found in : '  . $filename .  '         File removed';
-            }
-            //$this->logInfo("Upload Virus File" . $this->path, array("file"=>SystemTextEncoding::fromUTF8($dir).DIRECTORY_SEPARATOR.$realpath));
-        }
-        return;
-    }
-
-    /**
-     * This function generates a trace of the file
-     */
-    private function scanLater()
-    {
-        $numero=0;
-        $scanned=false;
-        if (is_dir($this->scan_diff_folder) == false) {
-            $create_folder = mkdir($this->scan_diff_folder, 0755);
-            if ($create_folder == false) {
-                throw new Exception("can-t create scan_diff_folder, check permission");
-                return;
-            }
-        }
-        while ($scanned == false) {
-            if (file_exists( $this->scan_diff_folder .DIRECTORY_SEPARATOR. 'file_' . $numero)) {
-                $numero++;
-            } else {
-                $command = 'echo "'. '\"' . $this->path . '\"' . '" >' . $this->scan_diff_folder .DIRECTORY_SEPARATOR. 'file_' . $numero;
-                passthru($command);
-                $scanned=true;
-                return;
-            }
-        }
-    }
-
-    /**
-     * @param AJXP_Node $nodeObject
-     */
-    private function callSet($nodeObject)
-    {
-        $this->setPath($nodeObject);
-        $this->setFileExtension($nodeObject);
-        $this->setExtensionScan();
-        $this->setScanDiffFolder ();
-        $this->setScanMaxSize ();
-        $this->setFileSize($nodeObject);
-        $this->setScanAll();
-
-        //debug option, put in a file attribute values
-        if (self::DEBUG_ON == 1) {
-            $debug = 'echo "' . $this->path . "     " . $this->file_extension . "     " . $this->extension_scan . "     " . $this->scan_all . "     " . $this->scan_diff_folder . "     " . $this->scan_max_size . "	" . $this->file_size . '" >> plugins/action.antivirus/debug';
-            passthru($debug);
-        }
-        return ;
-    }
-
-    /**
-     * This function initializes the file path
-     * @param $nodeObject
-     */
-    public function setPath($nodeObject)
-    {
-        $realpath = $nodeObject->getRealFile();
-        $realpath = realpath($realpath);
-        $this->path= $realpath;
-        return ;
-    }
-
-    /**
-     * This function initializes the file extension
-     * @param $nodeObject
-     */
-    public function setFileExtension ($nodeObject)
-    {
-        $realpath = $nodeObject->getRealFile();
-        $realpath = realpath($realpath);
-        $realpath = str_replace(" ", "_",$realpath );
-        $realpath = strrchr($realpath, DIRECTORY_SEPARATOR);
-        $this->file_extension=strrchr($realpath, '.');
-        if ($this->file_extension == ( "") ) {$this->file_extension = ".no_ext";}
-        return ;
-    }
-
-    /**
-     * This function initializes the extension list
-     */
-    public function setExtensionScan()
-    {
-        $this->extension_scan =  $this->getFilteredOption("EXT");
-        return ;
-    }
-
-    /**
-     * this function initializes attribute scan_all
-     */
-    public function setScanAll()
-    {
-        $extension = $this->getFilteredOption("EXT");
-        if (substr($extension, 0, 2) == "*/") {
-            $this->scan_all = true;
-        } else {
-            $this->scan_all = false;
-        }
-        return ;
-    }
-
-    /**
-     * this function initializes the trace folder
-     */
-    public function setScanDiffFolder ()
-    {
-        $this->scan_diff_folder = $this->getFilteredOption("PATH");
-        return ;
-    }
-
-    /**
-     * this function initializes max size of the scanned file
-     */
-    public function setScanMaxSize ()
-    {
-        $this->scan_max_size = AJXP_Utils::convertBytes($this->getFilteredOption("SIZE"));
-        return ;
-    }
-
-    /**
-     * This function initializes the size of the file
-     * @param AJXP_Node $nodeObject
-     */
-    public function setFileSize ($nodeObject)
-    {
-        $realpath = $nodeObject->getRealFile();
-        $realpath = realpath($realpath);
-        $this->file_size = filesize($realpath);
-        return ;
-    }
-
-}
diff --git a/core/src/plugins/action.antivirus/manifest.xml b/core/src/plugins/action.antivirus/manifest.xml
index e451310e28..528b75f1cc 100644
--- a/core/src/plugins/action.antivirus/manifest.xml
+++ b/core/src/plugins/action.antivirus/manifest.xml
@@ -2,7 +2,7 @@
 <ajxp_plugin enabled="false" id="antivirus" label="CONF_MESSAGE[Antivirus]" description="CONF_MESSAGE[antivirus plugin adaptor]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
 
 	<!-- class file -->
-	<class_definition filename="plugins/action.antivirus/class.AntivirusScanner.php" classname="AntivirusScanner"/>
+	<class_definition filename="plugins/action.antivirus/AntivirusScanner.php" classname="Pydio\Action\Antivirus\AntivirusScanner"/>
 
 	<!-- plugin information -->
 	<plugin_info>
diff --git a/core/src/plugins/action.avatar/AvatarProvider.php b/core/src/plugins/action.avatar/AvatarProvider.php
new file mode 100644
index 0000000000..71ef8dda02
--- /dev/null
+++ b/core/src/plugins/action.avatar/AvatarProvider.php
@@ -0,0 +1,83 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>, Afterster
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Action\Avatar;
+
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\Services\UsersService;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Simple implementation of Avatar for Gravatar / Libravatar
+ */
+class AvatarProvider extends Plugin
+{
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @throws \Pydio\Core\Exception\UserNotFoundException
+     */
+    public function receiveAction(\Psr\Http\Message\ServerRequestInterface &$requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface)
+    {
+        $ctx = $requestInterface->getAttribute("ctx");
+        $provider = $this->getContextualOption($ctx, "AVATAR_PROVIDER");
+        $type = $this->getContextualOption($ctx, "GRAVATAR_TYPE");
+        $httpVars = $requestInterface->getParsedBody();
+        if ($requestInterface->getAttribute("action") == "get_avatar_url") {
+            $suffix = "";
+            switch ($provider) {
+                case "gravatar":
+                default:
+                    if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') {
+                        $url = "https://secure.gravatar.com";
+                    } else {
+                        $url = "http://www.gravatar.com";
+                    }
+                    $url .= "/avatar/";
+                    $suffix .= "?s=80&r=g&d=" . $type;
+                    break;
+                case "libravatar":
+                    // Federated Servers are not supported here without libravatar.org. Should query DNS server first.
+                    if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') {
+                        $url = "https://seccdn.libravatar.org";
+                    } else {
+                        $url = "http://cdn.libravatar.org";
+                    }
+                    $url .= "/avatar/";
+                    $suffix = "?s=80&d=" . $type;
+                    break;
+            }
+
+            if (isSet($httpVars["userid"])) {
+                $userid = $httpVars["userid"];
+                if (UsersService::usersEnabled() && UsersService::userExists($userid)) {
+                    $user = UsersService::getUserById($userid, false);
+                    $userEmail = $user->getPersonalRole()->filterParameterValue("core.conf", "email", AJXP_REPO_SCOPE_ALL, "");
+                    if (!empty($userEmail)) {
+                        $url .= md5(strtolower(trim($userEmail)));
+                    }
+                }
+            }
+            $url .= $suffix;
+            $responseInterface->getBody()->write($url);
+        }
+    }
+}
diff --git a/core/src/plugins/action.avatar/class.AvatarProvider.php b/core/src/plugins/action.avatar/class.AvatarProvider.php
deleted file mode 100644
index dd1b9fa220..0000000000
--- a/core/src/plugins/action.avatar/class.AvatarProvider.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>, Afterster
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Simple implementation of Avatar for Gravatar / Libravatar
- * @package AjaXplorer_Plugins
- * @subpackage Avatar
- */
-class AvatarProvider extends AJXP_Plugin
-{
-    public function receiveAction($action, $httpVars, $filesVars)
-    {
-        $provider = $this->getFilteredOption("AVATAR_PROVIDER");
-        $type = $this->getFilteredOption("GRAVATAR_TYPE");
-
-        if ($action == "get_avatar_url") {
-            $url = "";
-            $suffix = "";
-            switch ($provider) {
-                case "gravatar":
-                default:
-                    if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') {
-                        $url = "https://secure.gravatar.com";
-                    } else {
-                        $url = "http://www.gravatar.com";
-                    }
-                    $url .= "/avatar/";
-                    $suffix .= "?s=80&r=g&d=".$type;
-                    break;
-                case "libravatar":
-                    $url = "";
-                    // Federated Servers are not supported here without libravatar.org. Should query DNS server first.
-                    if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') {
-                        $url = "https://seccdn.libravatar.org";
-                    } else {
-                        $url = "http://cdn.libravatar.org";
-                    }
-                    $url .= "/avatar/";
-                    $suffix = "?s=80&d=".$type;
-                    break;
-            }
-
-            if (isSet($httpVars["userid"])) {
-                $userid = $httpVars["userid"];
-                if (AuthService::usersEnabled() && AuthService::userExists($userid)) {
-                    $confDriver = ConfService::getConfStorageImpl();
-                    $user = $confDriver->createUserObject($userid);
-                    $userEmail = $user->personalRole->filterParameterValue("core.conf", "email", AJXP_REPO_SCOPE_ALL, "");
-                    if (!empty($userEmail)) {
-                        $url .= md5(strtolower(trim($userEmail)));
-                    }
-                }
-            }
-            $url .= $suffix;
-            print($url);
-        }
-    }
-}
diff --git a/core/src/plugins/action.avatar/manifest.xml b/core/src/plugins/action.avatar/manifest.xml
index 5a86f3baf1..f9f06539b3 100644
--- a/core/src/plugins/action.avatar/manifest.xml
+++ b/core/src/plugins/action.avatar/manifest.xml
@@ -23,5 +23,5 @@
             </action>
         </actions>
     </registry_contributions>
-    <class_definition filename="plugins/action.avatar/class.AvatarProvider.php" classname="AvatarProvider"/>
+    <class_definition filename="plugins/action.avatar/AvatarProvider.php" classname="Pydio\Action\Avatar\AvatarProvider"/>
 </ajxp_plugin>
diff --git a/core/src/plugins/action.cart/CartManager.php b/core/src/plugins/action.cart/CartManager.php
new file mode 100644
index 0000000000..22cf75f15f
--- /dev/null
+++ b/core/src/plugins/action.cart/CartManager.php
@@ -0,0 +1,78 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Action\Cart;
+
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\PluginFramework\PluginsService;
+
+/**
+ * Class CartManager
+ * @package Pydio\Action\Cart
+ */
+class CartManager extends Plugin
+{
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @throws \Pydio\Core\Exception\ActionNotFoundException
+     * @throws \Pydio\Core\Exception\AuthRequiredException
+     */
+    public function switchAction(\Psr\Http\Message\ServerRequestInterface &$requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface)
+    {
+        if ($requestInterface->getAttribute("action") != "search-cart-download") {
+            return;
+        }
+
+        // Pipe SEARCH + DOWNLOAD actions.
+        $ctx = $requestInterface->getAttribute("ctx");
+        $indexer = PluginsService::getInstance($ctx)->getUniqueActivePluginForType("index");
+        if ($indexer == false) return;
+        $httpVars = $requestInterface->getParsedBody();
+        unset($httpVars["get_action"]);
+        $requestInterface = $requestInterface->withAttribute("action", "search")->withParsedBody($httpVars);
+        $response = Controller::run($requestInterface);
+        $body = $response->getBody();
+        if ($body instanceof \Pydio\Core\Http\Response\SerializableResponseStream) {
+            $chunks = $body->getChunks();
+            foreach ($chunks as $chunk) {
+                if ($chunk instanceof \Pydio\Access\Core\Model\NodesList) {
+                    $res = $chunk->getChildren();
+                }
+            }
+        }
+
+
+        if (isSet($res) && is_array($res)) {
+            $newHttpVars = array(
+                "selection_nodes" => $res,
+                "dir" => "__AJXP_ZIP_FLAT__/",
+                "archive_name" => $httpVars["archive_name"]
+            );
+            $requestInterface = $requestInterface->withAttribute("action", "download")->withParsedBody($newHttpVars);
+            $responseInterface = Controller::run($requestInterface);
+        }
+
+
+    }
+
+}
diff --git a/core/src/plugins/action.cart/class.CartManager.js b/core/src/plugins/action.cart/class.CartManager.js
index 2c31d25baa..0673a893fd 100644
--- a/core/src/plugins/action.cart/class.CartManager.js
+++ b/core/src/plugins/action.cart/class.CartManager.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 Class.create("CartManager", FetchedResultPane, {
diff --git a/core/src/plugins/action.cart/class.CartManager.php b/core/src/plugins/action.cart/class.CartManager.php
deleted file mode 100644
index 47cbbebcf7..0000000000
--- a/core/src/plugins/action.cart/class.CartManager.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-class CartManager extends AJXP_Plugin
-{
-    public function switchAction ($actionName, $httpVars, $fileVars)
-    {
-        if ($actionName == "search-cart-download") {
-
-            // Pipe SEARCH + DOWNLOAD actions.
-
-            $indexer = AJXP_PluginsService::getInstance()->getUniqueActivePluginForType("index");
-            if($indexer == false) return;
-            $httpVars["return_selection"] = true;
-            unset($httpVars["get_action"]);
-            $res = AJXP_Controller::findActionAndApply("search", $httpVars, $fileVars);
-            if (isSet($res) && is_array($res)) {
-                $newHttpVars = array(
-                    "selection_nodes"   => $res,
-                    "dir"               => "__AJXP_ZIP_FLAT__/",
-                    "archive_name"      => $httpVars["archive_name"]
-                );
-                AJXP_Controller::findActionAndApply("download", $newHttpVars, array());
-            }
-
-        }
-
-    }
-
-}
diff --git a/core/src/plugins/action.cart/class.LocalCartNodeProvider.js b/core/src/plugins/action.cart/class.LocalCartNodeProvider.js
index 03ff59db2c..aec3f60d98 100644
--- a/core/src/plugins/action.cart/class.LocalCartNodeProvider.js
+++ b/core/src/plugins/action.cart/class.LocalCartNodeProvider.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 /**
  * A local implementation that explore currently defined
diff --git a/core/src/plugins/action.cart/i18n/conf/de.php b/core/src/plugins/action.cart/i18n/conf/de.php
index 2c41f7290b..f5ed4e0bf0 100644
--- a/core/src/plugins/action.cart/i18n/conf/de.php
+++ b/core/src/plugins/action.cart/i18n/conf/de.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/action.cart/i18n/conf/en.php b/core/src/plugins/action.cart/i18n/conf/en.php
index 0de16768a0..dbe255d531 100644
--- a/core/src/plugins/action.cart/i18n/conf/en.php
+++ b/core/src/plugins/action.cart/i18n/conf/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/action.cart/i18n/conf/it.php b/core/src/plugins/action.cart/i18n/conf/it.php
index 081330e8e4..f378e07991 100644
--- a/core/src/plugins/action.cart/i18n/conf/it.php
+++ b/core/src/plugins/action.cart/i18n/conf/it.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/action.cart/i18n/de.php b/core/src/plugins/action.cart/i18n/de.php
index 4314affb70..9ce087fa60 100644
--- a/core/src/plugins/action.cart/i18n/de.php
+++ b/core/src/plugins/action.cart/i18n/de.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/action.cart/i18n/en.php b/core/src/plugins/action.cart/i18n/en.php
index 55aca555cc..e54ef2be1b 100644
--- a/core/src/plugins/action.cart/i18n/en.php
+++ b/core/src/plugins/action.cart/i18n/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/action.cart/i18n/fr.php b/core/src/plugins/action.cart/i18n/fr.php
index 52b9221c9d..222620758e 100644
--- a/core/src/plugins/action.cart/i18n/fr.php
+++ b/core/src/plugins/action.cart/i18n/fr.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/action.cart/i18n/it.php b/core/src/plugins/action.cart/i18n/it.php
index b54f4915ac..aecff25218 100644
--- a/core/src/plugins/action.cart/i18n/it.php
+++ b/core/src/plugins/action.cart/i18n/it.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/action.cart/i18n/ru.php b/core/src/plugins/action.cart/i18n/ru.php
index b772b4feee..3c6a534a28 100644
--- a/core/src/plugins/action.cart/i18n/ru.php
+++ b/core/src/plugins/action.cart/i18n/ru.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/action.cart/manifest.xml b/core/src/plugins/action.cart/manifest.xml
index 673008aac2..52de61a7e4 100644
--- a/core/src/plugins/action.cart/manifest.xml
+++ b/core/src/plugins/action.cart/manifest.xml
@@ -25,7 +25,7 @@
                                 tabInfo='{"id":"cart-manager","iconClass":"icon-suitcase","element":"ajxp-cart-manager","closeable":false,"label":"action.cart.10","title":"action.cart.15","dontFocus":true}'
                                 paneInfo='{"type":"widget"}'><![CDATA[
                     <div id="ajxp-cart-manager" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
-                        <div id="cart-manager-header" class="innerTabulator" ajxpClass="AjxpTabulator" ajxpOptions='{"fit":"height", "saveState":true, "fitParent":"browser","defaultTabId": "default-cart","tabInfos": [{"id":"default-cart","label":"action.cart.9","iconClass":"icon-suitcase", "element":"default-cart"}], "headerToolbarOptions":{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["ajxp-cart-manager", "ajxp-cart-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}}'>
+                        <div id="cart-manager-header" class="innerTabulator" ajxpClass="AjxpTabulator" ajxpOptions='{"fit":"height", "saveState":true, "fitParent":"browser","defaultTabId": "default-cart","tabInfos": [{"id":"default-cart","label":"action.cart.9","iconClass":"icon-suitcase", "element":"default-cart"}], "headerToolbarOptions":{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["ajxp-cart-manager", "ajxp-cart-actions"],"submenuOffsetTop":2}}'>
                             <div id="default-cart" ajxpClass="CartManager" ajxpOptions='{"nodeProviderProperties":{}}'></div>
                         </div>
                     </div>
@@ -35,7 +35,7 @@
                 <additional_content id="action_cart"><![CDATA[
                         <div ajxp_position="9" id="action_cart">
                             <h3 style="color:#E2DECB;" ajxp_message_id="action.cart.10">AJXP_MESSAGE[action.cart.10]</h3>
-                            <div id="cart-manager-header" class="innerTabulator" style="height: 200px;" ajxpClass="AjxpTabulator" ajxpOptions='{"saveState":true, "defaultTabId": "default-cart","tabInfos": [{"id":"default-cart","label":"action.cart.9","iconClass":"icon-suitcase", "element":"default-cart"}], "headerToolbarOptions":{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["ajxp-cart-manager", "ajxp-cart-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}}'>
+                            <div id="cart-manager-header" class="innerTabulator" style="height: 200px;" ajxpClass="AjxpTabulator" ajxpOptions='{"saveState":true, "defaultTabId": "default-cart","tabInfos": [{"id":"default-cart","label":"action.cart.9","iconClass":"icon-suitcase", "element":"default-cart"}], "headerToolbarOptions":{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["ajxp-cart-manager", "ajxp-cart-actions"],"submenuOffsetTop":2}}'>
                                 <div id="default-cart" ajxpClass="CartManager" ajxpOptions='{"fit":"content", "nodeProviderProperties":{}}'></div>
                             </div>
                         </div>
@@ -290,5 +290,5 @@
         </actions>
     </registry_contributions>
 
-    <class_definition classname="CartManager" filename="plugins/action.cart/class.CartManager.php"/>
+    <class_definition classname="Pydio\Action\Cart\CartManager" filename="plugins/action.cart/CartManager.php"/>
 </ajxp_plugin>
diff --git a/core/src/plugins/action.compression/PluginCompression.php b/core/src/plugins/action.compression/PluginCompression.php
new file mode 100644
index 0000000000..9baa973992
--- /dev/null
+++ b/core/src/plugins/action.compression/PluginCompression.php
@@ -0,0 +1,294 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Action\Compression;
+
+use Exception;
+use Phar;
+use PharData;
+use Pydio\Access\Core\MetaStreamWrapper;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\UserSelection;
+
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\PathUtils;
+
+use Pydio\Core\PluginFramework\Plugin;
+
+use Pydio\Access\Core\Model\NodesDiff;
+use Pydio\Tasks\Task;
+use Pydio\Tasks\TaskService;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Plugin to compress to TAR or TAR.GZ or TAR.BZ2... He can also extract your archives
+ * @package AjaXplorer_Plugins
+ * @subpackage Action
+ */
+class PluginCompression extends Plugin
+{
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @throws Exception
+     * @throws PydioException
+     * @throws \Pydio\Core\Exception\ActionNotFoundException
+     * @throws \Pydio\Core\Exception\AuthRequiredException
+     */
+    public function receiveAction(\Psr\Http\Message\ServerRequestInterface &$requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface)
+    {
+        /** @var \Pydio\Core\Model\ContextInterface $ctx */
+        $ctx = $requestInterface->getAttribute("ctx");
+
+        $httpVars = $requestInterface->getParsedBody();
+        $messages = LocaleService::getMessages();
+
+        $userSelection = UserSelection::fromContext($ctx, $httpVars);
+        $nodes = $userSelection->buildNodes();
+        $currentDirPath = PathUtils::forwardSlashDirname($userSelection->getUniqueNode()->getPath());
+        $currentDirPath = rtrim($currentDirPath, "/") . "/";
+        $currentDirUrl = $userSelection->currentBaseUrl() . $currentDirPath;
+
+        $serializableStream = new \Pydio\Core\Http\Response\SerializableResponseStream();
+        $responseInterface = $responseInterface->withBody($serializableStream);
+
+        switch ($requestInterface->getAttribute("action")) {
+
+            case "compression":
+
+                $archiveName = InputFilter::decodeSecureMagic($httpVars["archive_name"], InputFilter::SANITIZE_FILENAME);
+                $archiveFormat = $httpVars["type_archive"];
+                $tabTypeArchive = array(".tar", ".tar.gz", ".tar.bz2");
+                $acceptedExtension = false;
+                foreach ($tabTypeArchive as $extensionArchive) {
+                    if ($extensionArchive == $archiveFormat) {
+                        $acceptedExtension = true;
+                        break;
+                    }
+                }
+                if (!$acceptedExtension) {
+                    throw new PydioException($messages["compression.16"]);
+                }
+                $typeArchive = $httpVars["type_archive"];
+                $taskId = $requestInterface->getAttribute("pydio-task-id");
+                // LAUNCH IN BACKGROUND AND EXIT
+                if (empty($taskId)) {
+                    $task = TaskService::actionAsTask($ctx, "compression", $httpVars, [], Task::FLAG_STOPPABLE | Task::FLAG_HAS_PROGRESS);
+                    $task->setLabel($messages["compression.5"]);
+                    $responseInterface = TaskService::getInstance()->enqueueTask($task, $requestInterface, $responseInterface);
+                    break;
+                }
+
+                $task = TaskService::getInstance()->getTaskById($taskId);
+                $postMessageStatus = function ($message, $taskStatus, $progress = null) use ($task) {
+                    $this->operationStatus($task, $message, $taskStatus, $progress);
+                };
+
+                $maxAuthorizedSize = 4294967296;
+                $currentDirUrlLength = strlen($currentDirUrl);
+                $tabFolders = array();
+                $tabAllRecursiveFiles = array();
+                $tabFilesNames = array();
+                foreach ($nodes as $node) {
+                    $nodeUrl = $node->getUrl();
+                    if (is_file($nodeUrl) && filesize($nodeUrl) < $maxAuthorizedSize) {
+                        array_push($tabAllRecursiveFiles, $nodeUrl);
+                        array_push($tabFilesNames, substr($nodeUrl, $currentDirUrlLength));
+                    }
+                    if (is_dir($nodeUrl)) {
+                        array_push($tabFolders, $nodeUrl);
+                    }
+                }
+                //DO A FOREACH OR IT'S GONNA HAVE SOME SAMES FILES NAMES
+                foreach ($tabFolders as $value) {
+                    $dossiers = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($value));
+                    foreach ($dossiers as $file) {
+                        if ($file->isDir()) {
+                            continue;
+                        }
+                        array_push($tabAllRecursiveFiles, $file->getPathname());
+                        array_push($tabFilesNames, substr($file->getPathname(), $currentDirUrlLength));
+                    }
+                }
+                //WE STOP IF IT'S JUST AN EMPTY FOLDER OR NO FILES
+                if (empty($tabFilesNames)) {
+                    $postMessageStatus($messages["compression.17"], Task::STATUS_FAILED);
+                    throw new PydioException($messages["compression.17"]);
+                }
+                try {
+                    $tmpArchiveName = tempnam(ApplicationState::getAjxpTmpDir(), "tar-compression") . ".tar";
+                    $archive = new PharData($tmpArchiveName);
+                } catch (Exception $e) {
+                    $postMessageStatus($e->getMessage(), Task::STATUS_FAILED);
+                    throw $e;
+                }
+                $counterCompression = 0;
+                //THE TWO ARRAY ARE MERGED FOR THE FOREACH LOOP
+                $tabAllFiles = array_combine($tabAllRecursiveFiles, $tabFilesNames);
+                foreach ($tabAllFiles as $fullPath => $fileName) {
+                    try {
+                        $archive->addFile(MetaStreamWrapper::getRealFSReference($fullPath), $fileName);
+                        $counterCompression++;
+                        $percent = round(($counterCompression / count($tabAllFiles)) * 100, 0, PHP_ROUND_HALF_DOWN);
+                        $postMessageStatus(sprintf($messages["compression.6"], $percent . " %"), Task::STATUS_RUNNING, $percent);
+                    } catch (Exception $e) {
+                        unlink($tmpArchiveName);
+                        $postMessageStatus($e->getMessage(), Task::STATUS_FAILED);
+                        throw $e;
+                    }
+                }
+                $finalArchive = $tmpArchiveName;
+                if ($typeArchive != ".tar") {
+                    $archiveTypeCompress = substr(strrchr($typeArchive, "."), 1);
+                    $postMessageStatus(sprintf($messages["compression.7"], strtoupper($archiveTypeCompress)), Task::STATUS_RUNNING);
+                    if ($archiveTypeCompress == "gz") {
+                        $archive->compress(Phar::GZ);
+                    } elseif ($archiveTypeCompress == "bz2") {
+                        $archive->compress(Phar::BZ2);
+                    }
+                    $finalArchive = $tmpArchiveName . "." . $archiveTypeCompress;
+                }
+
+                $newNode = new AJXP_Node($currentDirUrl . $archiveName);
+                $destArchive = $newNode->getRealFile();
+                rename($finalArchive, $destArchive);
+                Controller::applyHook("node.before_create", array($newNode, filesize($destArchive)));
+                if (file_exists($tmpArchiveName)) {
+                    unlink($tmpArchiveName);
+                    unlink(substr($tmpArchiveName, 0, -4));
+                }
+                Controller::applyHook("node.change", array(null, $newNode, false), true);
+                $postMessageStatus("Finished", Task::STATUS_COMPLETE);
+
+                break;
+
+            case "extraction":
+
+                $fileArchive = InputFilter::sanitize(InputFilter::decodeSecureMagic($httpVars["file"]), InputFilter::SANITIZE_DIRNAME);
+                $fileArchive = substr(strrchr($fileArchive, DIRECTORY_SEPARATOR), 1);
+                $authorizedExtension = array("tar" => 4, "gz" => 7, "bz2" => 8);
+                $acceptedArchive = false;
+                $extensionLength = 0;
+                $counterExtract = 0;
+                $currentAllPydioPath = $currentDirUrl . $fileArchive;
+                $pharCurrentAllPydioPath = "phar://" . MetaStreamWrapper::getRealFSReference($currentAllPydioPath);
+                $pathInfoCurrentAllPydioPath = pathinfo($currentAllPydioPath, PATHINFO_EXTENSION);
+                //WE TAKE ONLY TAR, TAR.GZ AND TAR.BZ2 ARCHIVES
+                foreach ($authorizedExtension as $extension => $strlenExtension) {
+                    if ($pathInfoCurrentAllPydioPath == $extension) {
+                        $acceptedArchive = true;
+                        $extensionLength = $strlenExtension;
+                        break;
+                    }
+                }
+                if ($acceptedArchive == false) {
+                    throw new PydioException($messages["compression.15"]);
+                }
+                $onlyFileName = substr($fileArchive, 0, -$extensionLength);
+                $lastPosOnlyFileName = strrpos($onlyFileName, "-");
+                $tmpOnlyFileName = substr($onlyFileName, 0, $lastPosOnlyFileName);
+                $counterDuplicate = substr($onlyFileName, $lastPosOnlyFileName + 1);
+                if (!is_int($lastPosOnlyFileName) || !is_int($counterDuplicate)) {
+                    $tmpOnlyFileName = $onlyFileName;
+                    $counterDuplicate = 1;
+                }
+                while (file_exists($currentDirUrl . $onlyFileName)) {
+                    $onlyFileName = $tmpOnlyFileName . "-" . $counterDuplicate;
+                    $counterDuplicate++;
+                }
+
+                // LAUNCHME IN BACKGROUND
+                $taskId = $requestInterface->getAttribute("pydio-task-id");
+                // LAUNCH IN BACKGROUND AND EXIT
+                if (empty($taskId)) {
+                    $task = TaskService::actionAsTask($ctx, "extraction", $httpVars, [], Task::FLAG_STOPPABLE | Task::FLAG_HAS_PROGRESS);
+                    $task->setLabel($messages["compression.12"]);
+                    $responseInterface = TaskService::getInstance()->enqueueTask($task, $requestInterface, $responseInterface);
+                    break;
+                }
+                $task = TaskService::getInstance()->getTaskById($taskId);
+                $postMessageStatus = function ($message, $taskStatus, $progress = null) use ($task) {
+                    $this->operationStatus($task, $message, $taskStatus, $progress);
+                };
+
+                mkdir($currentDirUrl . $onlyFileName, 0777, true);
+                chmod(MetaStreamWrapper::getRealFSReference($currentDirUrl . $onlyFileName), 0777);
+                try {
+                    $archive = new PharData(MetaStreamWrapper::getRealFSReference($currentAllPydioPath));
+                    $fichiersArchive = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($pharCurrentAllPydioPath));
+                    foreach ($fichiersArchive as $file) {
+                        $fileGetPathName = $file->getPathname();
+                        if ($file->isDir()) {
+                            continue;
+                        }
+                        $fileNameInArchive = substr(strstr($fileGetPathName, $fileArchive), strlen($fileArchive) + 1);
+                        try {
+                            $archive->extractTo(MetaStreamWrapper::getRealFSReference($currentDirUrl . $onlyFileName), $fileNameInArchive, false);
+                        } catch (Exception $e) {
+                            $postMessageStatus($e->getMessage(), Task::STATUS_FAILED);
+                            throw new PydioException($e);
+                        }
+                        $counterExtract++;
+                        $progress = round(($counterExtract / $archive->count()) * 100, 0, PHP_ROUND_HALF_DOWN);
+                        $postMessageStatus(sprintf($messages["compression.13"], $progress . "%"), Task::STATUS_RUNNING, $progress);
+                    }
+                } catch (Exception $e) {
+                    $postMessageStatus($e->getMessage(), Task::STATUS_FAILED);
+                    throw new PydioException($e);
+                }
+                $postMessageStatus("Done", Task::STATUS_COMPLETE, 100);
+                $newNode = new AJXP_Node($currentDirUrl . $onlyFileName);
+                $nodesDiff = new NodesDiff();
+                $nodesDiff->add($newNode);
+                Controller::applyHook("msg.instant", array($ctx, $nodesDiff->toXML()));
+                $indexRequest = Controller::executableRequest($requestInterface->getAttribute("ctx"), "index", ["file" => $newNode->getPath()]);
+                Controller::run($indexRequest);
+                break;
+
+            default:
+                break;
+        }
+
+    }
+
+    /**
+     * @param Task $task
+     * @param string $message
+     * @param integer $taskStatus
+     * @param null|integer $progress
+     */
+    private function operationStatus($task, $message, $taskStatus, $progress = null)
+    {
+        $task->setStatusMessage($message);
+        $task->setStatus($taskStatus);
+        if ($progress != null) {
+            $task->setProgress($progress);
+        }
+        TaskService::getInstance()->updateTask($task);
+    }
+}
diff --git a/core/src/plugins/action.compression/class.PluginCompression.php b/core/src/plugins/action.compression/class.PluginCompression.php
deleted file mode 100755
index 0d0943ec8a..0000000000
--- a/core/src/plugins/action.compression/class.PluginCompression.php
+++ /dev/null
@@ -1,407 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-/**
- * Plugin to compress to TAR or TAR.GZ or TAR.BZ2... He can also extract your archives
- * @package AjaXplorer_Plugins
- * @subpackage Action
- */
-class PluginCompression extends AJXP_Plugin
-{
-    /**
-     * @param String $action
-     * @param Array $httpVars
-     * @param Array $fileVars
-     * @throws Exception
-     */
-    public function receiveAction($action, $httpVars, $fileVars)
-    {
-        //VAR CREATION OUTSIDE OF ALL CONDITIONS, THEY ARE "MUST HAVE" VAR !!
-        $messages = ConfService::getMessages();
-        $repository = ConfService::getRepository();
-        $userSelection = new UserSelection($repository, $httpVars);
-        $nodes = $userSelection->buildNodes();
-        $currentDirPath = AJXP_Utils::safeDirname($userSelection->getUniqueNode()->getPath());
-        $currentDirPath = rtrim($currentDirPath, "/") . "/";
-        $currentDirUrl = $userSelection->currentBaseUrl().$currentDirPath;
-
-        // Multi-platform function taken from stackoverflow
-        // http://stackoverflow.com/questions/12424787/how-to-check-if-a-shell-command-exists-from-php
-        // Check that a command exists on the system for use with shell_exec
-        function command_exists ($command) {
-        $whereIsCommand = (PHP_OS == 'WINNT') ? 'where' : 'which';
-        $process = proc_open(
-            "$whereIsCommand $command",
-            array(
-            0 => array("pipe", "r"), //STDIN
-            1 => array("pipe", "w"), //STDOUT
-            2 => array("pipe", "w"), //STDERR
-            ),
-            $pipes
-        );
-        if ($process !== false) {
-            $stdout = stream_get_contents($pipes[1]);
-            $stderr = stream_get_contents($pipes[2]);
-            fclose($pipes[1]);
-            fclose($pipes[2]);
-            proc_close($process);
-            return $stdout != '';
-        }
-        return false;
-        }
-
-        if (empty($httpVars["compression_id"])) {
-            $compressionId = sha1(rand());
-            $httpVars["compression_id"] = $compressionId;
-        } else {
-            $compressionId = $httpVars["compression_id"];
-        }
-        $progressCompressionFileName = $this->getPluginCacheDir(false, true) . DIRECTORY_SEPARATOR . "progressCompressionID-" . $compressionId . ".txt";
-        if (empty($httpVars["extraction_id"])) {
-            $extractId = sha1(rand());
-            $httpVars["extraction_id"] = $extractId;
-        } else {
-            $extractId = $httpVars["extraction_id"];
-        }
-            $progressExtractFileName = $this->getPluginCacheDir(false, true) . DIRECTORY_SEPARATOR . "progressExtractID-" . $extractId . ".txt";
-        if ($action == "compression") {
-            $archiveName = AJXP_Utils::sanitize(AJXP_Utils::decodeSecureMagic($httpVars["archive_name"]), AJXP_SANITIZE_FILENAME);
-            $archiveFormat = $httpVars["type_archive"];
-            $tabTypeArchive = array(".tar", ".tar.gz", ".tar.bz2");
-            $acceptedExtension = false;
-            foreach ($tabTypeArchive as $extensionArchive) {
-                if ($extensionArchive == $archiveFormat) {
-                    $acceptedExtension = true;
-                    break;
-                }
-            }
-            if ($acceptedExtension == false) {
-                file_put_contents($progressCompressionFileName, "Error : " . $messages["compression.16"]);
-                throw new AJXP_Exception($messages["compression.16"]);
-            }
-            $typeArchive = $httpVars["type_archive"];
-            //if we can run in background we do it
-            if (ConfService::backgroundActionsSupported() && !ConfService::currentContextIsCommandLine()) {
-                $archivePath = $currentDirPath.$archiveName;
-                file_put_contents($progressCompressionFileName, $messages["compression.5"]);
-                AJXP_Controller::applyActionInBackground($repository->getId(), "compression", $httpVars);
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::triggerBgAction("check_compression_status", array(
-                    "repository_id" => $repository->getId(),
-                    "compression_id" => $compressionId,
-                    "archive_path" => SystemTextEncoding::toUTF8($archivePath)
-                ), $messages["compression.5"], true, 2);
-                AJXP_XMLWriter::close();
-                return null;
-            } else {
-                $maxAuthorizedSize = 4294967296;
-                $currentDirUrlLength = strlen($currentDirUrl);
-                $tabFolders = array();
-                $tabAllRecursiveFiles = array();
-                $tabFilesNames = array();
-                foreach ($nodes as $node) {
-                    $nodeUrl = $node->getUrl();
-                    if (is_file($nodeUrl) && filesize($nodeUrl) < $maxAuthorizedSize) {
-                        array_push($tabAllRecursiveFiles, $nodeUrl);
-                        array_push($tabFilesNames, substr($nodeUrl, $currentDirUrlLength));
-                    }
-                    if (is_dir($nodeUrl)) {
-                        array_push($tabFolders, $nodeUrl);
-                    }
-                }
-                //DO A FOREACH OR IT'S GONNA HAVE SOME SAMES FILES NAMES
-                foreach ($tabFolders as $value) {
-                    $dossiers = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($value));
-                    foreach ($dossiers as $file) {
-                        if ($file->isDir()) {
-                            continue;
-                        }
-                        array_push($tabAllRecursiveFiles, $file->getPathname());
-                        array_push($tabFilesNames, substr($file->getPathname(), $currentDirUrlLength));
-                    }
-                }
-                //WE STOP IF IT'S JUST AN EMPTY FOLDER OR NO FILES
-                if (empty($tabFilesNames)) {
-                    file_put_contents($progressCompressionFileName, "Error : " . $messages["compression.17"]);
-                    throw new AJXP_Exception($messages["compression.17"]);
-                }
-                // Builds a shell command that changes to the workspace location in the filesystem, and then 
-                // compresses with tar and any parallel compression utilities that are installed.
-                if (command_exists("tar")) {
-                    $FileNames = array();
-                    $FolderNames = array();
-                    foreach ($nodes as $node) {
-                        $nodeUrl = $node->getUrl();
-                        if (is_file($nodeUrl) && filesize($nodeUrl) < $maxAuthorizedSize) {
-                            array_push($FileNames, escapeshellarg(substr($nodeUrl, $currentDirUrlLength)));
-                        }
-                        if (is_dir($nodeUrl)) {
-                            array_push($FolderNames, escapeshellarg(substr($nodeUrl, $currentDirUrlLength)));
-                        }
-                    }
-                    if ($archiveFormat == ".tar.gz") {
-                        if (command_exists("pigz")) {
-                            $tarCommand = "tar -I pigz -cf ";
-                        } else {
-                            $tarCommand = "tar -czf ";
-                        }
-                    } elseif ($archiveFormat == ".tar.bz2") {
-                        if (command_exists("lbzip2")) {
-                            $tarCommand = "tar -I lbzip2 -cf ";
-                        } elseif (command_exists("pbzip2")) {
-                            $tarCommand = "tar -I pbzip2 -cf ";
-                        } else {
-                            $tarCommand = "tar -cjf ";
-                        }
-                    } elseif ($archiveFormat == ".tar") {
-                        $tarCommand = "tar -cf ";
-                    } else {
-                        file_put_contents($progressExtractFileName, "Error : " . $messages["compression.15"]);
-                        throw new AJXP_Exception($messages["compression.15"]);
-                    }
-                    $changeDirCommand = "cd " . AJXP_MetaStreamWrapper::getRealFSReference($currentDirUrl) . " && ";
-                    $compressCommand = $changeDirCommand . $tarCommand . escapeshellarg($archiveName) . " " . implode(" ", $FolderNames) . " " . implode(" ", $FileNames);
-                    shell_exec($compressCommand);
-                 } else {
-                    // If tar command is not found, compress with PHP Phar instead
-                    try {
-                        $tmpArchiveName = tempnam(AJXP_Utils::getAjxpTmpDir(), "tar-compression") . ".tar";
-                        $archive = new PharData($tmpArchiveName);
-                    } catch (Exception $e) {
-                        file_put_contents($progressCompressionFileName, "Error : " . $e->getMessage());
-                        throw $e;
-                    }
-                    $counterCompression = 0;
-                    //THE TWO ARRAY ARE MERGED FOR THE FOREACH LOOP
-                    $tabAllFiles = array_combine($tabAllRecursiveFiles, $tabFilesNames);
-                    foreach ($tabAllFiles as $fullPath => $fileName) {
-                        try {
-                            $archive->addFile(AJXP_MetaStreamWrapper::getRealFSReference($fullPath), $fileName);
-                            $counterCompression++;
-                            file_put_contents($progressCompressionFileName, sprintf($messages["compression.6"], round(($counterCompression / count($tabAllFiles)) * 100, 0, PHP_ROUND_HALF_DOWN) . " %"));
-                        } catch (Exception $e) {
-                            unlink($tmpArchiveName);
-                            file_put_contents($progressCompressionFileName, "Error : " . $e->getMessage());
-                            throw $e;
-                        }
-                    }
-                    $finalArchive = $tmpArchiveName;
-                    if ($typeArchive != ".tar") {
-                        $archiveTypeCompress = substr(strrchr($typeArchive, "."), 1);
-                        file_put_contents($progressCompressionFileName, sprintf($messages["compression.7"], strtoupper($archiveTypeCompress)));
-                        if ($archiveTypeCompress == "gz") {
-                            $archive->compress(Phar::GZ);
-                        } elseif ($archiveTypeCompress == "bz2") {
-                            $archive->compress(Phar::BZ2);
-                        }
-                        $finalArchive = $tmpArchiveName . "." . $archiveTypeCompress;
-                    }
-                    $destArchive = AJXP_MetaStreamWrapper::getRealFSReference($currentDirUrl . $archiveName);
-                    rename($finalArchive, $destArchive);
-                    AJXP_Controller::applyHook("node.before_create", array($destArchive, filesize($destArchive)));
-                    if (file_exists($tmpArchiveName)) {
-                        unlink($tmpArchiveName);
-                        unlink(substr($tmpArchiveName, 0, -4));
-                    }
-                // End of Phar compression section
-                }
-                $newNode = new AJXP_Node($currentDirUrl . $archiveName);
-                AJXP_Controller::applyHook("node.change", array(null, $newNode, false));
-                file_put_contents($progressCompressionFileName, "SUCCESS");
-            }
-        }
-    elseif ($action == "check_compression_status") {
-        $archivePath = AJXP_Utils::decodeSecureMagic($httpVars["archive_path"]);
-        $progressCompression = file_get_contents($progressCompressionFileName);
-        $substrProgressCompression = substr($progressCompression, 0, 5);
-        if ($progressCompression != "SUCCESS" && $substrProgressCompression != "Error") {
-            AJXP_XMLWriter::header();
-                AJXP_XMLWriter::triggerBgAction("check_compression_status", array(
-                    "repository_id" => $repository->getId(),
-                    "compression_id" => $compressionId,
-                    "archive_path" => SystemTextEncoding::toUTF8($archivePath)
-                ), $progressCompression, true, 5);
-                AJXP_XMLWriter::close();
-            } elseif ($progressCompression == "SUCCESS") {
-                $newNode = new AJXP_Node($userSelection->currentBaseUrl() . $archivePath);
-                $nodesDiffs = array("ADD" => array($newNode), "REMOVE" => array(), "UPDATE" => array());
-                AJXP_Controller::applyHook("node.change", array(null, $newNode, false));
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::sendMessage($messages["compression.8"], null);
-                AJXP_XMLWriter::writeNodesDiff($nodesDiffs, true);
-                AJXP_XMLWriter::close();
-                if (file_exists($progressCompressionFileName)) {
-                    unlink($progressCompressionFileName);
-                }
-            } elseif ($substrProgressCompression == "Error") {
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::sendMessage(null, $progressCompression);
-                AJXP_XMLWriter::close();
-                if (file_exists($progressCompressionFileName)) {
-                    unlink($progressCompressionFileName);
-                }
-            }
-    }
-        elseif ($action == "extraction") {
-            $fileArchive = AJXP_Utils::sanitize(AJXP_Utils::decodeSecureMagic($httpVars["file"]), AJXP_SANITIZE_DIRNAME);
-            $fileArchive = substr(strrchr($fileArchive, DIRECTORY_SEPARATOR), 1);
-            $authorizedExtension = array("tar" => 4, "gz" => 7, "bz2" => 8);
-            $acceptedArchive = false;
-            $extensionLength = 0;
-            $counterExtract = 0;
-            $currentAllPydioPath = $currentDirUrl . $fileArchive;
-            $pharCurrentAllPydioPath = "phar://" . AJXP_MetaStreamWrapper::getRealFSReference($currentAllPydioPath);
-            $pathInfoCurrentAllPydioPath = pathinfo($currentAllPydioPath, PATHINFO_EXTENSION);
-            //WE TAKE ONLY TAR, TAR.GZ AND TAR.BZ2 ARCHIVES
-            foreach ($authorizedExtension as $extension => $strlenExtension) {
-                if ($pathInfoCurrentAllPydioPath == $extension) {
-                    $acceptedArchive = true;
-                    $extensionLength = $strlenExtension;
-                    break;
-                }
-            }
-            if ($acceptedArchive == false) {
-                file_put_contents($progressExtractFileName, "Error : " . $messages["compression.15"]);
-                throw new AJXP_Exception($messages["compression.15"]);
-            }
-            $onlyFileName = substr($fileArchive, 0, -$extensionLength);
-            $lastPosOnlyFileName =  strrpos($onlyFileName, "-");
-            $tmpOnlyFileName = substr($onlyFileName, 0, $lastPosOnlyFileName);
-            $counterDuplicate = substr($onlyFileName, $lastPosOnlyFileName + 1);
-            if (!is_int($lastPosOnlyFileName) || !is_int($counterDuplicate)) {
-                $tmpOnlyFileName = $onlyFileName;
-                $counterDuplicate = 1;
-            }
-            while (file_exists($currentDirUrl . $onlyFileName)) {
-                $onlyFileName = $tmpOnlyFileName . "-" . $counterDuplicate;
-                $counterDuplicate++;
-            }
-            if (ConfService::backgroundActionsSupported() && !ConfService::currentContextIsCommandLine()) {
-                file_put_contents($progressExtractFileName, $messages["compression.12"]);
-                AJXP_Controller::applyActionInBackground($repository->getId(), "extraction", $httpVars);
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::triggerBgAction("check_extraction_status", array(
-                    "repository_id" => $repository->getId(),
-                    "extraction_id" => $extractId,
-                    "currentDirUrl" => $currentDirUrl,
-                    "onlyFileName" => $onlyFileName
-                ), $messages["compression.12"], true, 2);
-                AJXP_XMLWriter::close();
-                return null;
-            }
-            mkdir($currentDirUrl . $onlyFileName, 0777, true);
-            chmod(AJXP_MetaStreamWrapper::getRealFSReference($currentDirUrl . $onlyFileName), 0777);
-            // Builds a command that will use any parallel extraction utilities installed to extract an archive file though tar.
-            if (command_exists("tar")) {
-                if ($pathInfoCurrentAllPydioPath == "gz") {
-                    if (command_exists("pigz")) {
-                        $tarCommand = "tar -I pigz -xf ";
-                    } else {
-                        $tarCommand = "tar -xzf ";
-                    }
-                } elseif ($pathInfoCurrentAllPydioPath == "bz2") {
-                    if (command_exists("lbzip2")) {
-                        $tarCommand = "tar -I lbzip2 -xf ";
-                    } elseif (command_exists("pbzip2")) {
-                        $tarCommand = "tar -I pbzip2 -xf ";
-                    } else {
-                        $tarCommand = "tar -xjf ";
-                    }
-                } elseif ($pathInfoCurrentAllPydioPath == "tar") {
-                    $tarCommand = "tar -xf ";
-                } else {
-                    file_put_contents($progressExtractFileName, "Error : " . $messages["compression.15"]);
-                    throw new AJXP_Exception($messages["compression.15"]);
-                }
-                $extractCommand = $tarCommand . escapeshellarg(AJXP_MetaStreamWrapper::getRealFSReference($currentDirUrl . $fileArchive)) . " -C " . escapeshellarg(AJXP_MetaStreamWrapper::getRealFSReference($currentDirUrl . $onlyFileName));
-                shell_exec($extractCommand);
-            } else {
-                // If tar command is not found, extract using PHP Phar instead
-                try {
-                    $archive = new PharData(AJXP_MetaStreamWrapper::getRealFSReference($currentAllPydioPath));
-                    $fichiersArchive = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($pharCurrentAllPydioPath));
-                    foreach ($fichiersArchive as $file) {
-                        $fileGetPathName = $file->getPathname();
-                        if($file->isDir()) {
-                            continue;
-                        }
-                        $fileNameInArchive = substr(strstr($fileGetPathName, $fileArchive), strlen($fileArchive) + 1);
-                        try {
-                            $archive->extractTo(AJXP_MetaStreamWrapper::getRealFSReference($currentDirUrl . $onlyFileName), $fileNameInArchive, false);
-                        } catch (Exception $e) {
-                            file_put_contents($progressExtractFileName, "Error : " . $e->getMessage());
-                            throw new AJXP_Exception($e);
-                        }
-                        $counterExtract++;
-                        file_put_contents($progressExtractFileName, sprintf($messages["compression.13"], round(($counterExtract / $archive->count()) * 100, 0, PHP_ROUND_HALF_DOWN) . " %"));
-                    }
-                } catch (Exception $e) {
-                    file_put_contents($progressExtractFileName, "Error : " . $e->getMessage());
-                    throw new AJXP_Exception($e);
-                }
-            // End of Phar extraction section
-            }
-            file_put_contents($progressExtractFileName, "SUCCESS");
-            $newNode = new AJXP_Node($currentDirUrl . $onlyFileName);
-            AJXP_Controller::findActionAndApply("index", array("file" => $newNode->getPath()), array());
-        }
-    elseif ($action == "check_extraction_status") {
-            $currentDirUrl = $httpVars["currentDirUrl"];
-            $onlyFileName = $httpVars["onlyFileName"];
-            $progressExtract = file_get_contents($progressExtractFileName);
-            $substrProgressExtract = substr($progressExtract, 0, 5);
-            if ($progressExtract != "SUCCESS" && $progressExtract != "INDEX" && $substrProgressExtract != "Error") {
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::triggerBgAction("check_extraction_status", array(
-                    "repository_id" => $repository->getId(),
-                    "extraction_id" => $extractId,
-                    "currentDirUrl" => $currentDirUrl,
-                    "onlyFileName" => $onlyFileName
-                ), $progressExtract, true, 4);
-                AJXP_XMLWriter::close();
-            } elseif ($progressExtract == "SUCCESS") {
-                $newNode = new AJXP_Node($currentDirUrl . $onlyFileName);
-                $nodesDiffs = array("ADD" => array($newNode), "REMOVE" => array(), "UPDATE" => array());
-                AJXP_Controller::applyHook("node.change", array(null, $newNode, false));
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::sendMessage(sprintf($messages["compression.14"], $onlyFileName), null);
-                AJXP_XMLWriter::triggerBgAction("check_index_status", array(
-                    "repository_id" => $newNode->getRepositoryId()
-                ), "starting indexation", true, 5);
-                AJXP_XMLWriter::writeNodesDiff($nodesDiffs, true);
-                AJXP_XMLWriter::close();
-                if (file_exists($progressExtractFileName)) {
-                    unlink($progressExtractFileName);
-                }
-            } elseif ($substrProgressExtract == "Error") {
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::sendMessage(null, $progressExtract);
-                AJXP_XMLWriter::close();
-                if (file_exists($progressExtractFileName)) {
-                    unlink($progressExtractFileName);
-                }
-            }
-        }
-    }
-}
-
diff --git a/core/src/plugins/action.compression/manifest.xml b/core/src/plugins/action.compression/manifest.xml
index 1152beda0f..2fe3544f3b 100644
--- a/core/src/plugins/action.compression/manifest.xml
+++ b/core/src/plugins/action.compression/manifest.xml
@@ -42,6 +42,9 @@
                                     while(userSelection.fileNameExists(name + extension)){
                                         name = tmpFileName + "-" + compteurFileName;
                                         compteurFileName ++;
+                                        if(compteurFileName > 20){
+                                            break;
+                                        }
                                     }
                                     archive_nameInput.setValue(name + extension);
                                     return name;
@@ -107,11 +110,6 @@
 				]]></clientForm>
                 </processing>
             </action>
-            <action name="check_compression_status">
-                <processing>
-                    <serverCallback methodName="receiveAction"/>
-                </processing>
-            </action>
             <action name="extraction">
                 <gui text="compression.9" title="compression.10" src="archive_insert.png" iconClass="icon-briefcase" accessKey="" hasAccessKey="false">
                     <context selection="true" dir="true" recycle="hidden"
@@ -138,14 +136,9 @@
                     <serverCallback methodName="receiveAction" pluginId="action.compression" />
                 </processing>
             </action>
-            <action name="check_extraction_status">
-                <processing>
-                    <serverCallback methodName="receiveAction"/>
-                </processing>
-            </action>
         </actions>
 	</registry_contributions>
-	<class_definition filename="plugins/action.compression/class.PluginCompression.php" classname="PluginCompression"/>
+	<class_definition filename="plugins/action.compression/PluginCompression.php" classname="Pydio\Action\Compression\PluginCompression"/>
     <dependencies>
         <activePlugin pluginName="access.fs"/>
     </dependencies>
diff --git a/core/src/plugins/action.compression/res/i18n/conf/de.php b/core/src/plugins/action.compression/res/i18n/conf/de.php
index b0639fdf76..01f18c0267 100644
--- a/core/src/plugins/action.compression/res/i18n/conf/de.php
+++ b/core/src/plugins/action.compression/res/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Tar Archives Support" => "Komprimierung",
diff --git a/core/src/plugins/action.compression/res/i18n/conf/en.php b/core/src/plugins/action.compression/res/i18n/conf/en.php
index 0753e522a7..9fc9efea91 100644
--- a/core/src/plugins/action.compression/res/i18n/conf/en.php
+++ b/core/src/plugins/action.compression/res/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Tar Archives Support" => "Tar Archives Support",
diff --git a/core/src/plugins/action.compression/res/i18n/conf/fr.php b/core/src/plugins/action.compression/res/i18n/conf/fr.php
index 181e1a7697..15173bb8e5 100644
--- a/core/src/plugins/action.compression/res/i18n/conf/fr.php
+++ b/core/src/plugins/action.compression/res/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
     "Tar Archives Support" => "Tar Archives Support",
diff --git a/core/src/plugins/action.compression/res/i18n/conf/it.php b/core/src/plugins/action.compression/res/i18n/conf/it.php
index 812e44347e..bca2eb9716 100644
--- a/core/src/plugins/action.compression/res/i18n/conf/it.php
+++ b/core/src/plugins/action.compression/res/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
     "Tar Archives Support" => "Supporto Archivi Tar",
diff --git a/core/src/plugins/action.compression/res/i18n/conf/tr.php b/core/src/plugins/action.compression/res/i18n/conf/tr.php
index 41b4e8b7d2..cfc935e510 100644
--- a/core/src/plugins/action.compression/res/i18n/conf/tr.php
+++ b/core/src/plugins/action.compression/res/i18n/conf/tr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
     "Tar Archives Support" => "TAR arşiv biçimi desteklenen eklenti",
diff --git a/core/src/plugins/action.compression/res/i18n/de.php b/core/src/plugins/action.compression/res/i18n/de.php
index 5d20ae1863..8d6c54c03c 100755
--- a/core/src/plugins/action.compression/res/i18n/de.php
+++ b/core/src/plugins/action.compression/res/i18n/de.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 defined('AJXP_EXEC') or die( 'Access not allowed');
diff --git a/core/src/plugins/action.compression/res/i18n/en.php b/core/src/plugins/action.compression/res/i18n/en.php
index e051fef70b..b6c58b9527 100755
--- a/core/src/plugins/action.compression/res/i18n/en.php
+++ b/core/src/plugins/action.compression/res/i18n/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 defined('AJXP_EXEC') or die( 'Access not allowed');
diff --git a/core/src/plugins/action.compression/res/i18n/fr.php b/core/src/plugins/action.compression/res/i18n/fr.php
index adb6203238..96e3511139 100755
--- a/core/src/plugins/action.compression/res/i18n/fr.php
+++ b/core/src/plugins/action.compression/res/i18n/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
     "1" => "Archiver",
diff --git a/core/src/plugins/action.compression/res/i18n/it.php b/core/src/plugins/action.compression/res/i18n/it.php
index bc5c76fe02..c79fe610dc 100755
--- a/core/src/plugins/action.compression/res/i18n/it.php
+++ b/core/src/plugins/action.compression/res/i18n/it.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 defined('AJXP_EXEC') or die( 'Access not allowed');
diff --git a/core/src/plugins/action.compression/res/i18n/tr.php b/core/src/plugins/action.compression/res/i18n/tr.php
index b3a0e7b4a5..780a1e32b5 100644
--- a/core/src/plugins/action.compression/res/i18n/tr.php
+++ b/core/src/plugins/action.compression/res/i18n/tr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
     "1" => "Sıkıştır",
diff --git a/core/src/plugins/action.disclaimer/DisclaimerProvider.php b/core/src/plugins/action.disclaimer/DisclaimerProvider.php
new file mode 100644
index 0000000000..11f5d41806
--- /dev/null
+++ b/core/src/plugins/action.disclaimer/DisclaimerProvider.php
@@ -0,0 +1,147 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>, Afterster
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Action\Disclaimer;
+
+use Pydio\Core\Http\Middleware\SessionMiddleware;
+use Pydio\Core\Http\Middleware\SessionRepositoryMiddleware;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Model\UserInterface;
+use Pydio\Core\Services\AuthService;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\PluginFramework\Plugin;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Implementation for forcing using to accept a disclaimer
+ */
+class DisclaimerProvider extends Plugin
+{
+
+    /**
+     * Set disclaimer validation on/off
+     *
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @throws \Pydio\Core\Exception\AuthRequiredException
+     */
+    public function toggleDisclaimer(ServerRequestInterface &$request, ResponseInterface &$response)
+    {
+
+        $httpVars = $request->getParsedBody();
+        /** @var \Pydio\Core\Model\ContextInterface $ctx */
+        $ctx = $request->getAttribute("ctx");
+        $u = $ctx->getUser();
+        $u->getPersonalRole()->setParameterValue(
+            "action.disclaimer",
+            "DISCLAIMER_ACCEPTED",
+            $httpVars["validate"] == "true" ? "yes" : "no",
+            AJXP_REPO_SCOPE_ALL
+        );
+
+        if ($httpVars["validate"] == "true") {
+
+            $u->removeLock("validate_disclaimer");
+            $u->save("superuser");
+            AuthService::updateSessionUser($u);
+            $repo = SessionRepositoryMiddleware::switchUserToRepository($u, $request);
+            if (!$repo) {
+                AuthService::disconnect();
+                throw new \Pydio\Core\Exception\AuthRequiredException();
+            }
+            $ctx->setRepositoryObject($repo);
+            SessionMiddleware::updateContext($ctx);
+            Logger::updateContext($ctx);
+            ConfService::getInstance()->invalidateLoadedRepositories();
+
+        } else {
+
+            $u->setLock("validate_disclaimer");
+            $u->save("superuser");
+
+            AuthService::disconnect();
+            throw new \Pydio\Core\Exception\AuthRequiredException();
+
+        }
+    }
+
+    /**
+     * Serve the content of the Dicsclaimer.
+     *
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     */
+    public function loadDisclaimer(ServerRequestInterface &$request, ResponseInterface &$response)
+    {
+
+        $response = $response->withHeader("Content-Type", "text/plain");
+        $content = $this->getContextualOption($request->getAttribute("ctx"), "DISCLAIMER_CONTENT");
+        $state = $this->getContextualOption($request->getAttribute("ctx"), "DISCLAIMER_ACCEPTED");
+        if ($state == "true") $state = "yes";
+        $response->getBody()->write($state . ":" . nl2br($content));
+
+    }
+
+    /**
+     * Hooked to user.after_create
+     * Is disabled on shared links, this will automatically validate the disclaimer
+     * for any new shared user created .
+     *
+     * @param ContextInterface $ctx
+     * @param UserInterface $userObject
+     */
+    public function updateSharedUser(ContextInterface $ctx, UserInterface $userObject){
+        if($userObject->isHidden() && !$this->getContextualOption($ctx, "DISCLAIMER_ENABLE_SHARED")){
+            $userObject->removeLock("validate_disclaimer");
+            $userObject->getPersonalRole()->setParameterValue("action.disclaimer", "DISCLAIMER_ACCEPTED", "yes", AJXP_REPO_SCOPE_SHARED);
+            $userObject->save("superuser");
+        }
+    }
+
+    /**
+     * Hooked to user.after_login
+     * If enabled on shared links, this will always reset the validation to false just after login.
+     * Validation should be ok during the session, then disabled next time the link is loaded.
+     *
+     * @param ContextInterface $ctx
+     * @param UserInterface $userObject
+     */
+    public function updateSharedUserLogin(ContextInterface $ctx, UserInterface $userObject){
+        if(!$userObject->isHidden()){
+            $param = $userObject->getPersonalRole()->filterParameterValue("action.disclaimer", "DISCLAIMER_ACCEPTED", AJXP_REPO_SCOPE_ALL, "no");
+            if($param === "no"){
+                $userObject->setLock("validate_disclaimer");
+                $userObject->save("superuser");
+            }
+        }
+        if($userObject->isHidden() && $this->getContextualOption($ctx, "DISCLAIMER_ENABLE_SHARED")){
+            $userObject->setLock("validate_disclaimer");
+            $userObject->getPersonalRole()->setParameterValue("action.disclaimer", "DISCLAIMER_ACCEPTED", "no", AJXP_REPO_SCOPE_SHARED);
+            $userObject->save("superuser");
+        }
+    }    
+    
+}
+
diff --git a/core/src/plugins/action.disclaimer/class.DisclaimerProvider.php b/core/src/plugins/action.disclaimer/class.DisclaimerProvider.php
deleted file mode 100644
index 44b13872d9..0000000000
--- a/core/src/plugins/action.disclaimer/class.DisclaimerProvider.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>, Afterster
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Simple implementation for forcing using to accept a disclaimer
- * @package AjaXplorer_Plugins
- * @subpackage Disclaimer
- */
-class DisclaimerProvider extends AJXP_Plugin
-{
-
-    public function toggleDisclaimer($actionName, $httpVars, $fileVars){
-        $u = AuthService::getLoggedUser();
-        $u->personalRole->setParameterValue(
-            "action.disclaimer",
-            "DISCLAIMER_ACCEPTED",
-            $httpVars["validate"] == "true"  ? "yes" : "no",
-            AJXP_REPO_SCOPE_ALL
-        );
-
-        if($httpVars["validate"] == "true"){
-
-            $u->removeLock();
-            $u->save("superuser");
-            AuthService::updateUser($u);
-            ConfService::switchUserToActiveRepository($u);
-            $force = $u->mergedRole->filterParameterValue("core.conf", "DEFAULT_START_REPOSITORY", AJXP_REPO_SCOPE_ALL, -1);
-            $passId = -1;
-            if ($force != "" && $u->canSwitchTo($force) && !isSet($httpVars["tmp_repository_id"]) && !isSet($_SESSION["PENDING_REPOSITORY_ID"])) {
-                $passId = $force;
-            }
-            $res = ConfService::switchUserToActiveRepository($u, $passId);
-            if (!$res) {
-                AuthService::disconnect();
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::requireAuth(true);
-                AJXP_XMLWriter::close();
-            }
-            ConfService::getInstance()->invalidateLoadedRepositories();
-
-        }else{
-            $u->setLock("validate_disclaimer");
-            $u->save("superuser");
-
-            AuthService::disconnect();
-            AJXP_XMLWriter::header();
-            AJXP_XMLWriter::requireAuth(true);
-            AJXP_XMLWriter::close();
-        }
-    }
-
-    public function loadDisclaimer($actionName, $httpVars, $fileVars){
-
-        header("Content-Type:text/plain");
-        $content = $this->getFilteredOption("DISCLAIMER_CONTENT", AJXP_REPO_SCOPE_ALL);
-        $state = $this->getFilteredOption("DISCLAIMER_ACCEPTED", AJXP_REPO_SCOPE_ALL);
-        if($state == "true") $state = "yes";
-        echo($state .":" . nl2br($content));
-
-    }
-
-}
diff --git a/core/src/plugins/action.disclaimer/manifest.xml b/core/src/plugins/action.disclaimer/manifest.xml
index 260f5cfb61..89d698ab9c 100644
--- a/core/src/plugins/action.disclaimer/manifest.xml
+++ b/core/src/plugins/action.disclaimer/manifest.xml
@@ -13,6 +13,8 @@
         <param name="DISCLAIMER_ACCEPTED" type="select" group="CONF_MESSAGE[Disclaimer]" choices="yes|CONF_MESSAGE[Accepted],no|CONF_MESSAGE[Not Accepted]" label="CONF_MESSAGE[Validation]"
               scope="user,group,role"
               description="CONF_MESSAGE[Whether the user has accepted the disclaimer or not]" default="no"/>
+            <global_param name="DISCLAIMER_ENABLE_SHARED" type="boolean" label="CONF_MESSAGE[Enable for public links]"
+                      description="CONF_MESSAGE[Enable disclaimer for public links. if enabled, it will require disclaimer validation on each public link load, even if a user already accessed the link.]" default="false"/>
         <global_param name="DISCLAIMER_CONTENT" type="textarea" label="CONF_MESSAGE[Disclaimer Content]"
                description="CONF_MESSAGE[You can use HTML]" default=""/>
     </server_settings>
@@ -75,6 +77,10 @@
                 </processing>
             </action>
         </actions>
+        <hooks>
+            <serverCallback methodName="updateSharedUser" hookName="user.after_create"/>
+            <serverCallback methodName="updateSharedUserLogin" hookName="user.after_login"/>
+        </hooks>
     </registry_contributions>
-    <class_definition filename="plugins/action.disclaimer/class.DisclaimerProvider.php" classname="DisclaimerProvider"/>
+    <class_definition filename="plugins/action.disclaimer/DisclaimerProvider.php" classname="Pydio\Action\Disclaimer\DisclaimerProvider"/>
 </ajxp_plugin>
diff --git a/core/src/plugins/action.disclaimer/plugin_doc.html b/core/src/plugins/action.disclaimer/plugin_doc.html
index 2cd3116a5f..bfbaa1bf98 100644
--- a/core/src/plugins/action.disclaimer/plugin_doc.html
+++ b/core/src/plugins/action.disclaimer/plugin_doc.html
@@ -1 +1,13 @@
-<p>Get user avatar from Gravatar, based on email address.</p>
\ No newline at end of file
+<p>Disclaimer plugin allows you to force your users to validate any usage conditions of the platform before being able to access it.</p>
+
+<h4>Enabling Disclaimer</h4>
+<p>Once enable, you have to update the Root Group (or any sub group) by switching <b>"Disclaimer Validated"</b> to <em>"No"</em>, and
+    manually type in the following value in the <b>Users Lock</b> field : "validate_disclaimer" (without quotes). That setting will be propagated
+    to all users of the group, and then each user will have its lock/disclaimer parameter updated when they will sign it and accept it.
+</p>
+
+<h4>Shares Behaviour</h4>
+<ul>Regarding shared links, there are two options:
+    <li>. <b>Enable Shared Links</b>: disclaimer will be enabled and displayed <b>each time</b> a link is loaded, even if a user already accessed this link previously.</li>
+    <li>. <b>Disable Shared Links</b>: no disclaimer will be shown (shared users are automatically "validated" on creation).</li>
+</ul>
\ No newline at end of file
diff --git a/core/src/plugins/action.powerfs/PowerFSController.php b/core/src/plugins/action.powerfs/PowerFSController.php
new file mode 100644
index 0000000000..afe312353b
--- /dev/null
+++ b/core/src/plugins/action.powerfs/PowerFSController.php
@@ -0,0 +1,209 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Action\Compression;
+
+use Exception;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Access\Driver\StreamProvider\FS\FsAccessWrapper;
+
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\TextEncoder;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\PluginFramework\PluginsService;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Pydio\Core\Http\Message\JsActionTrigger;
+use Pydio\Tasks\Task;
+use Pydio\Tasks\TaskService;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * @package AjaXplorer_Plugins
+ * @subpackage Action
+ */
+class PowerFSController extends Plugin
+{
+
+    public function performChecks()
+    {
+        if(ApplicationState::hasMinisiteHash() && ApplicationState::getSapiRestBase() !== null){
+            throw new Exception("Disable during link download");
+        }
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @throws Exception
+     * @throws \Pydio\Core\Exception\PydioException
+     */
+    public function switchAction(ServerRequestInterface &$request, ResponseInterface &$response)
+    {
+        /** @var \Pydio\Core\Model\ContextInterface $ctx */
+        $ctx = $request->getAttribute("ctx");
+        $httpVars = $request->getParsedBody();
+        $dir = $httpVars["dir"] OR "";
+        $dir = InputFilter::decodeSecureMagic($dir);
+        if ($dir == "/") $dir = "";
+        $selection = UserSelection::fromContext($ctx, $httpVars);
+        $urlBase = $ctx->getUrlBase();
+        $mess = LocaleService::getMessages();
+
+        $bodyStream = new \Pydio\Core\Http\Response\SerializableResponseStream();
+        if ($request->getAttribute("action") != "postcompress_download") {
+            $response = $response->withBody($bodyStream);
+        }
+
+        switch ($request->getAttribute("action")) {
+
+            case "postcompress_download":
+
+                $archive = ApplicationState::getAjxpTmpDir() . DIRECTORY_SEPARATOR . $httpVars["ope_id"] . "_" . InputFilter::decodeSecureMagic($httpVars["archive_name"], InputFilter::SANITIZE_FILENAME);
+                // This is  a real filename on a local FS => toStorageEncoding
+                $archive = TextEncoder::toStorageEncoding($archive);
+                $archiveName = $httpVars["archive_name"];
+                if (is_file($archive)) {
+                    $fileReader = new \Pydio\Core\Http\Response\FileReaderResponse($archive);
+                    $fileReader->setLocalName($archiveName);
+                    $fileReader->setPreReadCallback(function () use ($archive) {
+                        register_shutdown_function("unlink", $archive);
+                    });
+                    $response = $response->withBody($fileReader);
+                } else {
+                    $response = $response->withHeader("Content-type", "text/html");
+                    $response->getBody()->write("<script>alert('Cannot find archive! Is ZIP correctly installed?');</script>");
+                }
+                break;
+
+            case "compress" :
+            case "precompress" :
+
+                $archiveName = InputFilter::decodeSecureMagic($httpVars["archive_name"], InputFilter::SANITIZE_FILENAME);
+                $taskId = $request->getAttribute("pydio-task-id");
+
+                if ($taskId === null) {
+                    $task = TaskService::actionAsTask($ctx, $request->getAttribute("action"), $httpVars);
+                    $task->setLabel($mess['powerfs.1']);
+                    $task->setFlags(Task::FLAG_STOPPABLE | Task::FLAG_HAS_PROGRESS);
+                    TaskService::getInstance()->enqueueTask($task, $request, $response);
+                    return;
+                }
+
+                $rootDir = FsAccessWrapper::getRealFSReference($urlBase) . $dir;
+                // List all files
+                $todo = array();
+                $args = array();
+                $replaceSearch = array($rootDir, "\\");
+                $replaceReplace = array("", "/");
+                foreach ($selection->getFiles() as $selectionFile) {
+                    $selectionFile = TextEncoder::toStorageEncoding($selectionFile);
+                    $baseFile = $selectionFile;
+                    $args[] = escapeshellarg(substr($selectionFile, strlen($dir) + ($dir == "/" ? 0 : 1)));
+                    $selectionFile = FsAccessWrapper::getRealFSReference($urlBase . $selectionFile);
+                    $todo[] = ltrim(str_replace($replaceSearch, $replaceReplace, $selectionFile), "/");
+                    if (is_dir($selectionFile)) {
+                        $objects = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($selectionFile), RecursiveIteratorIterator::SELF_FIRST);
+                        foreach ($objects as $name => $object) {
+                            $todo[] = str_replace($replaceSearch, $replaceReplace, $name);
+                        }
+                    }
+                    if (trim($baseFile, "/") == "") {
+                        // ROOT IS SELECTED, FIX IT
+                        $args = array(escapeshellarg(TextEncoder::toStorageEncoding(basename($rootDir))));
+                        $rootDir = TextEncoder::toStorageEncoding(dirname($rootDir));
+                        break;
+                    }
+                }
+                $cmdSeparator = ((PHP_OS == "WIN32" || PHP_OS == "WINNT" || PHP_OS == "Windows") ? "&" : ";");
+                $opeId = substr(md5(time()), 0, 10);
+                $originalArchiveParam = $archiveName;
+                if ($request->getAttribute("action") == "precompress") {
+                    $archiveName = ApplicationState::getAjxpTmpDir() . DIRECTORY_SEPARATOR . $opeId . "_" . $archiveName;
+                }
+                chdir($rootDir);
+                $cmd = $this->getContextualOption($ctx, "ZIP_PATH") . " -r " . escapeshellarg($archiveName) . " " . implode(" ", $args);
+                /** @var \Pydio\Access\Driver\StreamProvider\FS\FsAccessDriver $fsDriver */
+                $fsDriver = PluginsService::getInstance($ctx)->getUniqueActivePluginForType("access");
+                $c = $fsDriver->getConfigs();
+                if ((!isSet($c["SHOW_HIDDEN_FILES"]) || $c["SHOW_HIDDEN_FILES"] == false) && stripos(PHP_OS, "win") === false) {
+                    $cmd .= " -x .\*";
+                }
+                $cmd .= " " . $cmdSeparator . " echo ZIP_FINISHED";
+                $proc = popen($cmd, "r");
+                $toks = array();
+                $handled = array();
+                $finishedEchoed = false;
+                $percent = 0;
+                while (!feof($proc)) {
+                    set_time_limit(20);
+                    $results = fgets($proc, 256);
+                    if (strlen($results) == 0) {
+                    } else {
+                        $tok = strtok($results, "\n");
+                        while ($tok !== false) {
+                            $toks[] = $tok;
+                            if ($tok == "ZIP_FINISHED") {
+                                $finishedEchoed = true;
+                            } else {
+                                $test = preg_match('/(\w+): (.*) \(([^\(]+)\) \(([^\(]+)\)/', $tok, $matches);
+                                if ($test !== false) {
+                                    $handled[] = $matches[2];
+                                }
+                            }
+                            $tok = strtok("\n");
+                        }
+                        if ($finishedEchoed) $percent = 100;
+                        else $percent = min(round(count($handled) / count($todo) * 100), 100);
+                        TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_RUNNING, "Creating archive " . $percent . " %", null, $percent);
+                    }
+                    // avoid a busy wait
+                    if ($percent < 100) usleep(1);
+                }
+                pclose($proc);
+                TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_COMPLETE, "");
+                if ($request->getAttribute("action") === "compress") {
+                    $newNode = new \Pydio\Access\Core\Model\AJXP_Node($urlBase . $dir . "/" . $archiveName);
+                    $nodesDiff = new \Pydio\Access\Core\Model\NodesDiff();
+                    $nodesDiff->add($newNode);
+                    Controller::applyHook("msg.instant", array($ctx, $nodesDiff->toXML()));
+                } else {
+                    $archiveName = str_replace("'", "\'", $originalArchiveParam);
+                    $jsCode = " PydioApi.getClient().downloadSelection(null, $('download_form'), 'postcompress_download', {ope_id:'" . $opeId . "',archive_name:'" . $archiveName . "'}); ";
+                    $actionTrigger = new JsActionTrigger($jsCode, 0);
+                    Controller::applyHook("msg.instant", array($ctx, $actionTrigger->toXML()));
+
+                }
+
+                break;
+
+            default:
+                break;
+        }
+
+    }
+}
diff --git a/core/src/plugins/action.powerfs/class.PowerFSController.php b/core/src/plugins/action.powerfs/class.PowerFSController.php
deleted file mode 100644
index 01af818e22..0000000000
--- a/core/src/plugins/action.powerfs/class.PowerFSController.php
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-/**
- * @package AjaXplorer_Plugins
- * @subpackage Action
- */
-class PowerFSController extends AJXP_Plugin
-{
-
-    public function performChecks(){
-        if(ShareCenter::currentContextIsLinkDownload()) {
-            throw new Exception("Disable during link download");
-        }
-    }
-
-    public function switchAction($action, $httpVars, $fileVars)
-    {
-        $selection = new UserSelection();
-        $dir = $httpVars["dir"] OR "";
-        $dir = AJXP_Utils::decodeSecureMagic($dir);
-        if($dir == "/") $dir = "";
-        $selection->initFromHttpVars($httpVars);
-        if (!$selection->isEmpty()) {
-            //$this->filterUserSelectionToHidden($selection->getFiles());
-        }
-        $urlBase = "pydio://". ConfService::getRepository()->getId();
-        $mess = ConfService::getMessages();
-
-        switch ($action) {
-
-            case "monitor_compression" :
-
-                $percentFile = fsAccessWrapper::getRealFSReference($urlBase.$dir."/.zip_operation_".$httpVars["ope_id"]);
-                $percent = 0;
-                if (is_file($percentFile)) {
-                    $percent = intval(file_get_contents($percentFile));
-                }
-                if ($percent < 100) {
-                    AJXP_XMLWriter::header();
-                    AJXP_XMLWriter::triggerBgAction(
-                        "monitor_compression",
-                        $httpVars,
-                        $mess["powerfs.1"]." ($percent%)",
-                        true,
-                        1);
-                    AJXP_XMLWriter::close();
-                } else {
-                    @unlink($percentFile);
-                    AJXP_XMLWriter::header();
-                    if ($httpVars["on_end"] == "reload") {
-                        AJXP_XMLWriter::triggerBgAction("reload_node", array(), "powerfs.2", true, 2);
-                    } else {
-                        $archiveName = AJXP_Utils::sanitize($httpVars["archive_name"], AJXP_SANITIZE_FILENAME);
-                        $archiveName = str_replace("'", "\'", $archiveName);
-                        $jsCode = "
-                            PydioApi.getClient().downloadSelection(null, $('download_form'), 'postcompress_download', {ope_id:'".$httpVars["ope_id"]."',archive_name:'".$archiveName."'});
-                        ";
-                        AJXP_XMLWriter::triggerBgJsAction($jsCode, $mess["powerfs.3"], true);
-                        AJXP_XMLWriter::triggerBgAction("reload_node", array(), "powerfs.2", true, 2);
-                    }
-                    AJXP_XMLWriter::close();
-                }
-
-                break;
-
-            case "postcompress_download":
-
-                $archive = AJXP_Utils::getAjxpTmpDir().DIRECTORY_SEPARATOR.$httpVars["ope_id"]."_".AJXP_Utils::sanitize(AJXP_Utils::decodeSecureMagic($httpVars["archive_name"]), AJXP_SANITIZE_FILENAME);
-
-                $fsDriver = AJXP_PluginsService::getInstance()->getUniqueActivePluginForType("access");
-                if (is_file($archive)) {
-                    if(!$fsDriver->getFilteredOption("USE_XSENDFILE", ConfService::getRepository())
-                        && !$fsDriver->getFilteredOption("USE_XACCELREDIRECT", ConfService::getRepository())) {
-                        register_shutdown_function("unlink", $archive);
-                    }
-
-                    $fsDriver->readFile($archive, "force-download", $httpVars["archive_name"], false, null, true);
-                } else {
-                    echo("<script>alert('Cannot find archive! Is ZIP correctly installed?');</script>");
-                }
-                break;
-
-            case "compress" :
-            case "precompress" :
-
-                $archiveName = AJXP_Utils::sanitize(AJXP_Utils::decodeSecureMagic($httpVars["archive_name"]), AJXP_SANITIZE_FILENAME);
-                if (!ConfService::currentContextIsCommandLine() && ConfService::backgroundActionsSupported()) {
-                    $opeId = substr(md5(time()),0,10);
-                    $httpVars["ope_id"] = $opeId;
-                    AJXP_Controller::applyActionInBackground(ConfService::getRepository()->getId(), $action, $httpVars);
-                    AJXP_XMLWriter::header();
-                    $bgParameters = array(
-                        "dir" => SystemTextEncoding::toUTF8($dir),
-                        "archive_name"  => SystemTextEncoding::toUTF8($archiveName),
-                        "on_end" => (isSet($httpVars["on_end"])?$httpVars["on_end"]:"reload"),
-                        "ope_id" => $opeId
-                    );
-                    AJXP_XMLWriter::triggerBgAction(
-                        "monitor_compression",
-                        $bgParameters,
-                        $mess["powerfs.1"]." (0%)",
-                        true);
-                    AJXP_XMLWriter::close();
-                    session_write_close();
-                    exit();
-                }
-
-                $rootDir = fsAccessWrapper::getRealFSReference($urlBase) . $dir;
-                $percentFile = $rootDir."/.zip_operation_".$httpVars["ope_id"];
-                $compressLocally = ($action == "compress" ? true : false);
-                // List all files
-                $todo = array();
-                $args = array();
-                $replaceSearch = array($rootDir, "\\");
-                $replaceReplace = array("", "/");
-                foreach ($selection->getFiles() as $selectionFile) {
-                    $baseFile = $selectionFile;
-                    $args[] = escapeshellarg(substr($selectionFile, strlen($dir)+($dir=="/"?0:1)));
-                    $selectionFile = fsAccessWrapper::getRealFSReference($urlBase.$selectionFile);
-                    $todo[] = ltrim(str_replace($replaceSearch, $replaceReplace, $selectionFile), "/");
-                    if (is_dir($selectionFile)) {
-                        $objects = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($selectionFile), RecursiveIteratorIterator::SELF_FIRST);
-                        foreach ($objects as $name => $object) {
-                            $todo[] = str_replace($replaceSearch, $replaceReplace, $name);
-                        }
-                    }
-                    if(trim($baseFile, "/") == ""){
-                        // ROOT IS SELECTED, FIX IT
-                        $args = array(escapeshellarg(basename($rootDir)));
-                        $rootDir = dirname($rootDir);
-                        break;
-                    }
-                }
-                $cmdSeparator = ((PHP_OS == "WIN32" || PHP_OS == "WINNT" || PHP_OS == "Windows")? "&" : ";");
-                if (!$compressLocally) {
-                    $archiveName = AJXP_Utils::getAjxpTmpDir().DIRECTORY_SEPARATOR.$httpVars["ope_id"]."_".$archiveName;
-                }
-                chdir($rootDir);
-                $cmd = $this->getFilteredOption("ZIP_PATH")." -r ".escapeshellarg($archiveName)." ".implode(" ", $args);
-                $fsDriver = AJXP_PluginsService::getInstance()->getUniqueActivePluginForType("access");
-                $c = $fsDriver->getConfigs();
-                if ((!isSet($c["SHOW_HIDDEN_FILES"]) || $c["SHOW_HIDDEN_FILES"] == false) && stripos(PHP_OS, "win") === false) {
-                    $cmd .= " -x .\*";
-                }
-                $cmd .= " ".$cmdSeparator." echo ZIP_FINISHED";
-                $proc = popen($cmd, "r");
-                $toks = array();
-                $handled = array();
-                $finishedEchoed = false;
-                while (!feof($proc)) {
-                    set_time_limit (20);
-                    $results = fgets($proc, 256);
-                    if (strlen($results) == 0) {
-                    } else {
-                        $tok = strtok($results, "\n");
-                        while ($tok !== false) {
-                            $toks[] = $tok;
-                            if ($tok == "ZIP_FINISHED") {
-                                $finishedEchoed = true;
-                            } else {
-                                $test = preg_match('/(\w+): (.*) \(([^\(]+)\) \(([^\(]+)\)/', $tok, $matches);
-                                if ($test !== false) {
-                                    $handled[] = $matches[2];
-                                }
-                            }
-                            $tok = strtok("\n");
-                        }
-                        if($finishedEchoed) $percent = 100;
-                        else $percent = min( round(count($handled) / count($todo) * 100),  100);
-                        file_put_contents($percentFile, $percent);
-                    }
-                    // avoid a busy wait
-                    if($percent < 100) usleep(1);
-                }
-                pclose($proc);
-                file_put_contents($percentFile, 100);
-
-                break;
-            default:
-                break;
-        }
-
-    }
-}
diff --git a/core/src/plugins/action.powerfs/i18n/conf/cs.php b/core/src/plugins/action.powerfs/i18n/conf/cs.php
index a7cb18e865..08200d35c8 100644
--- a/core/src/plugins/action.powerfs/i18n/conf/cs.php
+++ b/core/src/plugins/action.powerfs/i18n/conf/cs.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess = array(
     // will be replaced by the application title
diff --git a/core/src/plugins/action.powerfs/i18n/conf/de.php b/core/src/plugins/action.powerfs/i18n/conf/de.php
index 5f169cd1a5..10ac625ae1 100644
--- a/core/src/plugins/action.powerfs/i18n/conf/de.php
+++ b/core/src/plugins/action.powerfs/i18n/conf/de.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess = array(
     // will be replaced by the application title
diff --git a/core/src/plugins/action.powerfs/i18n/conf/en.php b/core/src/plugins/action.powerfs/i18n/conf/en.php
index f0745d97c3..9a06e0d763 100644
--- a/core/src/plugins/action.powerfs/i18n/conf/en.php
+++ b/core/src/plugins/action.powerfs/i18n/conf/en.php
@@ -16,12 +16,12 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess = array(
     // will be replaced by the application title
-    "Power FS" => "Power FS",
-    "This set of extensions assume that you have an administration access to your server: ability to tweak the webserver and the php configuration, ability to access the command line, etc." => "This set of extensions assume that you have an administration access to your server: ability to tweak the webserver and the php configuration, ability to access the command line, etc.",
+    "Power FS" => "Zip Delegation",
+    "This set of extensions assume that you have an administration access to your server: ability to tweak the webserver and the php configuration, ability to access the command line, etc." => "This extension assumes you have an administration access to your server: ability to tweak the webserver and the php configuration, ability to access the command line, and to use the command line version of ZIP.",
     "Zip path" => "Zip path",
     "Path of the zip utilitary on the command line" => "Path of the zip utilitary on the command line",
 );
diff --git a/core/src/plugins/action.powerfs/i18n/conf/fr.php b/core/src/plugins/action.powerfs/i18n/conf/fr.php
index 94bfdb162e..2ea1321b8f 100644
--- a/core/src/plugins/action.powerfs/i18n/conf/fr.php
+++ b/core/src/plugins/action.powerfs/i18n/conf/fr.php
@@ -1,27 +1,25 @@
 <?php
 /*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
 $mess = array(
-// will be replaced by the application title
-"Power FS" => "Power FS",
-"This set of extensions assume that you have an administration access to your server: ability to tweak the webserver and the php configuration, ability to access the command line, etc." => "Ces extensions ne sont utiles que si vous disposez d'un accès d'administration au serveur : configuration du serveur web et de php, accès en ligne de commande, ...",
-"Zip path" => "Chemin de Zip",
-"Path of the zip utilitary on the command line" => "Chemin du binaire 'zip' sur le système",
-);
\ No newline at end of file
+    // will be replaced by the application title
+    "Power FS" => "Power FS",
+    "This set of extensions assume that you have an administration access to your server: ability to tweak the webserver and the php configuration, ability to access the command line, etc." => "Ces extensions ne sont utiles que si vous disposez d'un accès d'administration au serveur : configuration du serveur web et de php, accès en ligne de commande, ..."
+);
diff --git a/core/src/plugins/action.powerfs/i18n/conf/it.php b/core/src/plugins/action.powerfs/i18n/conf/it.php
index d1ccf72937..9fcfec539a 100644
--- a/core/src/plugins/action.powerfs/i18n/conf/it.php
+++ b/core/src/plugins/action.powerfs/i18n/conf/it.php
@@ -1,27 +1,25 @@
 <?php
 /*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
 $mess = array(
-// will be replaced by the application title
-"Power FS" => "Power FS",
-"This set of extensions assume that you have an administration access to your server: ability to tweak the webserver and the php configuration, ability to access the command line, etc." => "Questo set di estensione assume che tu abbia l'accesso come amministratore al proprio server: possibilità di modificare il webserver e la configurazione PHP, possibilità di accedere alla linea di comando ecc.",
-"Zip path" => "Zip path",
-"Path of the zip utilitary on the command line" => "Path of the zip utilitary on the command line",
-);
\ No newline at end of file
+    // will be replaced by the application title
+    "Power FS" => "Power FS",
+    "This set of extensions assume that you have an administration access to your server: ability to tweak the webserver and the php configuration, ability to access the command line, etc." => "Questo set di estensione assume che tu abbia l'accesso come amministratore al proprio server: possibilità di modificare il webserver e la configurazione PHP, possibilità di accedere alla linea di comando ecc."
+);
diff --git a/core/src/plugins/action.powerfs/i18n/conf/pt.php b/core/src/plugins/action.powerfs/i18n/conf/pt.php
index f5e4399f26..729e81feb0 100644
--- a/core/src/plugins/action.powerfs/i18n/conf/pt.php
+++ b/core/src/plugins/action.powerfs/i18n/conf/pt.php
@@ -1,27 +1,25 @@
 <?php
 /*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
 $mess = array(
-// will be replaced by the application title
-"Power FS" => "Power FS",
-"This set of extensions assume that you have an administration access to your server: ability to tweak the webserver and the php configuration, ability to access the command line, etc." => "Este conjunto de extensões assume que existe um administrador com acesso ao servidor com a habilidade de fazer alterações ao mesmo, configuração PHP, linha de comandos, etc.",
-"Zip path" => "Zip path",
-"Path of the zip utilitary on the command line" => "Path of the zip utilitary on the command line",
-);
\ No newline at end of file
+    // will be replaced by the application title
+    "Power FS" => "Power FS",
+    "This set of extensions assume that you have an administration access to your server: ability to tweak the webserver and the php configuration, ability to access the command line, etc." => "Este conjunto de extensões assume que existe um administrador com acesso ao servidor com a habilidade de fazer alterações ao mesmo, configuração PHP, linha de comandos, etc."
+);
diff --git a/core/src/plugins/action.powerfs/i18n/cs.php b/core/src/plugins/action.powerfs/i18n/cs.php
index ae4a83aa0e..be19f63103 100644
--- a/core/src/plugins/action.powerfs/i18n/cs.php
+++ b/core/src/plugins/action.powerfs/i18n/cs.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess = array(
     // will be replaced by the application title
diff --git a/core/src/plugins/action.powerfs/i18n/de.php b/core/src/plugins/action.powerfs/i18n/de.php
index b7c479ebff..ffcf8d557d 100644
--- a/core/src/plugins/action.powerfs/i18n/de.php
+++ b/core/src/plugins/action.powerfs/i18n/de.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess = array(
     // will be replaced by the application title
diff --git a/core/src/plugins/action.powerfs/i18n/en.php b/core/src/plugins/action.powerfs/i18n/en.php
index b310e64a72..4345dac471 100644
--- a/core/src/plugins/action.powerfs/i18n/en.php
+++ b/core/src/plugins/action.powerfs/i18n/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess = array(
     // will be replaced by the application title
diff --git a/core/src/plugins/action.powerfs/i18n/fr.php b/core/src/plugins/action.powerfs/i18n/fr.php
index 6df49add6b..6020c729a1 100644
--- a/core/src/plugins/action.powerfs/i18n/fr.php
+++ b/core/src/plugins/action.powerfs/i18n/fr.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess = array(
     // will be replaced by the application title
diff --git a/core/src/plugins/action.powerfs/i18n/it.php b/core/src/plugins/action.powerfs/i18n/it.php
index 1a70999bdc..eaa1491337 100644
--- a/core/src/plugins/action.powerfs/i18n/it.php
+++ b/core/src/plugins/action.powerfs/i18n/it.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess = array(
     // will be replaced by the application title
diff --git a/core/src/plugins/action.powerfs/i18n/pt.php b/core/src/plugins/action.powerfs/i18n/pt.php
index dc58fd9d3c..8fb0f852cf 100644
--- a/core/src/plugins/action.powerfs/i18n/pt.php
+++ b/core/src/plugins/action.powerfs/i18n/pt.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess = array(
     // will be replaced by the application title
diff --git a/core/src/plugins/action.powerfs/manifest.xml b/core/src/plugins/action.powerfs/manifest.xml
index bc8ff88396..cd50274dca 100644
--- a/core/src/plugins/action.powerfs/manifest.xml
+++ b/core/src/plugins/action.powerfs/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ajxp_plugin enabled="false" label="CONF_MESSAGE[Power FS]" description="CONF_MESSAGE[This set of extensions assume that you have an administration access to your server: ability to tweak the webserver and the php configuration, ability to access the command line, etc.]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <class_definition classname="PowerFSController" filename="plugins/action.powerfs/class.PowerFSController.php"/>
+    <class_definition classname="Pydio\Action\Compression\PowerFSController" filename="plugins/action.powerfs/PowerFSController.php"/>
     <client_settings>
         <resources>
             <i18n namespace="powerfs" path="plugins/action.powerfs/i18n"/>
@@ -16,10 +16,7 @@
             <!-- Override access.fs compression -->
             <action name="compress">
                 <processing>
-                    <serverCallback methodName="switchAction" restParams="/file+" checkParams="false" sdkMethodName="compress" developerComment="Compress one or many files into a Zip archive. May be disabled for remote-access workspaces (like FTP).">
-                        <input_param description="User selection" name="nodes" type="AJXP_NODE[]" mandatory="true"/>
-                        <input_param description="Force new archive name. If not set, the parent folder name is used" name="archive_name" type="string"/>
-                    </serverCallback>
+                    <serverCallback methodName="switchAction" restParams="/file+" checkParams="false" sdkMethodName="compress"/>
                 </processing>
             </action>
             <action name="precompress">
@@ -34,11 +31,6 @@
                     <serverCallback methodName="switchAction"/>
                 </processing>
             </action>
-            <action name="monitor_compression">
-                <processing>
-                    <serverCallback methodName="switchAction"/>
-                </processing>
-            </action>
             <!-- Override download client callback -->
             <action name="download">
                 <processing>
diff --git a/core/src/plugins/action.quicksend/class.QuicksendManager.js b/core/src/plugins/action.quicksend/class.QuicksendManager.js
index 6fefdcc522..a947a897e2 100644
--- a/core/src/plugins/action.quicksend/class.QuicksendManager.js
+++ b/core/src/plugins/action.quicksend/class.QuicksendManager.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  *
  */
 Class.create("QuicksendManager", AjxpPane, {
@@ -37,10 +37,8 @@ Class.create("QuicksendManager", AjxpPane, {
             var uploader = uploaders[0];
             if(pydio.getController().getActionByName("trigger_remote_copy")){
                 modal.setCloseAction(function(){
-                    ajaxplorer.fireContextRefresh();
-                    var bgManager = pydio.getController().getBackgroundTasksManager();
-                    bgManager.queueAction("trigger_remote_copy", {}, "Copying files to server");
-                    bgManager.next();
+                    pydio.fireContextRefresh();
+                    PydioApi.getClient().request({get_action:'trigger_remote_copy'});
                 });
             }
             if(uploader.dialogOnOpen){
diff --git a/core/src/plugins/action.quicksend/i18n/de.php b/core/src/plugins/action.quicksend/i18n/de.php
index 65e10f5f12..70161cb7b0 100644
--- a/core/src/plugins/action.quicksend/i18n/de.php
+++ b/core/src/plugins/action.quicksend/i18n/de.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/action.quicksend/i18n/en.php b/core/src/plugins/action.quicksend/i18n/en.php
index 7b92bbbe34..9eb81d172b 100644
--- a/core/src/plugins/action.quicksend/i18n/en.php
+++ b/core/src/plugins/action.quicksend/i18n/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/action.quicksend/i18n/fr.php b/core/src/plugins/action.quicksend/i18n/fr.php
index b8a9a7a741..94b4be5996 100644
--- a/core/src/plugins/action.quicksend/i18n/fr.php
+++ b/core/src/plugins/action.quicksend/i18n/fr.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/action.quicksend/i18n/it.php b/core/src/plugins/action.quicksend/i18n/it.php
index 01bbb18c6a..1f67135510 100644
--- a/core/src/plugins/action.quicksend/i18n/it.php
+++ b/core/src/plugins/action.quicksend/i18n/it.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/action.quicksend/manifest.xml b/core/src/plugins/action.quicksend/manifest.xml
index 2dde7242ba..15163261bc 100644
--- a/core/src/plugins/action.quicksend/manifest.xml
+++ b/core/src/plugins/action.quicksend/manifest.xml
@@ -37,7 +37,7 @@
                              actionBar="true" contextMenu="true" infoPanel="false"
                              actionBarGroup="put,minisite" inZip="false">
                     </context></gui>
-                <rightsContext noUser="true" userLogged="only" read="false" write="true" adminOnly=""></rightsContext>
+                <rightsContext noUser="true" userLogged="only" read="false" write="true" adminOnly=""/>
                 <processing>
                     <clientCallback prepareModal="true"><![CDATA[
                         if(!window.QuicksendManager.INSTANCE){
@@ -45,7 +45,7 @@
                         }
                         window.QuicksendManager.INSTANCE.applyUpload();
 				]]></clientCallback>
-                    <serverCallback methodName="switchAction" restParams="/input_stream/dir+" sdkMethodName="upload" checkParams="false">
+                    <serverCallback methodName="uploadAction" restParams="/input_stream/dir+" sdkMethodName="upload" checkParams="false">
                         <input_param description="filename" name="node" type="string"/>
                     </serverCallback>
                 </processing>
diff --git a/core/src/plugins/action.scheduler/Gruntfile.js b/core/src/plugins/action.scheduler/Gruntfile.js
deleted file mode 100644
index e6da577be9..0000000000
--- a/core/src/plugins/action.scheduler/Gruntfile.js
+++ /dev/null
@@ -1,34 +0,0 @@
-module.exports = function(grunt) {
-    grunt.initConfig({
-        babel: {
-            options: {},
-
-            dist: {
-                files: [
-                    {
-                        expand: true,
-                        cwd: 'react/',
-                        src: ['**/*.js'],
-                        dest: 'build/',
-                        ext: '.js'
-                    }
-                ]
-            }
-        },
-        watch: {
-            js: {
-                files: [
-                    "react/**/*"
-                ],
-                tasks: ['babel'],
-                options: {
-                    spawn: false
-                }
-            }
-        }
-    });
-    grunt.loadNpmTasks('grunt-babel');
-    grunt.loadNpmTasks('grunt-contrib-watch');
-    grunt.registerTask('default', ['babel']);
-
-};
\ No newline at end of file
diff --git a/core/src/plugins/action.scheduler/class.AjxpScheduler.php b/core/src/plugins/action.scheduler/class.AjxpScheduler.php
deleted file mode 100755
index c8c82385d5..0000000000
--- a/core/src/plugins/action.scheduler/class.AjxpScheduler.php
+++ /dev/null
@@ -1,684 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * @package AjaXplorer_Plugins
- * @subpackage Action
- */
-class AjxpScheduler extends AJXP_Plugin
-{
-    public $db;
-
-    public function __construct($id, $baseDir)
-    {
-        parent::__construct($id, $baseDir);
-
-    }
-
-    public function init($options)
-    {
-        parent::init($options);
-        $u = AuthService::getLoggedUser();
-        if($u == null) return;
-        if ($u->getGroupPath() != "/") {
-            $this->enabled = false;
-        }
-    }
-
-    public function getDbFile()
-    {
-        if (!isSet($this->db)) {
-            $this->db = $this->getPluginWorkDir(true). "/calendar.json" ;
-        }
-        return $this->db;
-    }
-
-    public function unserialize($serialized)
-    {
-        parent::unserialize($serialized);
-    }
-
-
-    public function performChecks()
-    {
-        if (!ConfService::backgroundActionsSupported()) {
-            throw new Exception("The command line must be supported. See 'Pydio Core Options'.");
-        }
-        if (!is_dir(dirname($this->getDbFile()))) {
-            throw new Exception("Could not create the db folder!");
-        }
-    }
-
-    public function parseSpecificContributions(&$contribNode)
-    {
-        parent::parseSpecificContributions($contribNode);
-        if($contribNode->nodeName != "actions") return;
-        $actionXpath=new DOMXPath($contribNode->ownerDocument);
-        $paramList = $actionXpath->query('action[@name="scheduler_addTask"]/processing/standardFormDefinition/param[@name="repository_id"]', $contribNode);
-        if(!$paramList->length) return;
-        $paramNode = $paramList->item(0);
-        $sVals = array();
-        $repos = ConfService::getRepositoriesList("all");
-        foreach ($repos as $repoId => $repoObject) {
-            $sVals[] = $repoId."|". AJXP_Utils::xmlEntities($repoObject->getDisplay());
-        }
-        $sVals[] = "*|All Repositories";
-        $paramNode->attributes->getNamedItem("choices")->nodeValue = implode(",", $sVals);
-
-        if(!AuthService::usersEnabled() || AuthService::getLoggedUser() == null) return;
-        $paramList = $actionXpath->query('action[@name="scheduler_addTask"]/processing/standardFormDefinition/param[@name="user_id"]', $contribNode);
-        if(!$paramList->length) return;
-        $paramNode = $paramList->item(0);
-        $paramNode->attributes->getNamedItem("default")->nodeValue = AuthService::getLoggedUser()->getId();
-    }
-
-    public function getTaskById($tId)
-    {
-        $tasks = AJXP_Utils::loadSerialFile($this->getDbFile(), false, "json");
-        foreach ($tasks as $task) {
-            if ( !empty($task["task_id"]) && $task["task_id"] == $tId) {
-                return $task;
-            }
-        }
-        throw new Exception("Cannot find task");
-    }
-
-    public function setTaskStatus($taskId, $status, $preserveModeDate =false)
-    {
-        $statusFile = AJXP_CACHE_DIR."/cmd_outputs/task_".$taskId.".status";
-        if($preserveModeDate) $mtime = filemtime($statusFile);
-        file_put_contents($statusFile, $status);
-        if($preserveModeDate) @touch($statusFile, $mtime);
-    }
-
-    public function getTaskStatus($taskId)
-    {
-        $statusFile = AJXP_CACHE_DIR."/cmd_outputs/task_".$taskId.".status";
-        if (file_exists($statusFile)) {
-            $c = explode(":", file_get_contents($statusFile));
-            if ($c[0] == "RUNNING" && isSet($c[1]) && is_numeric($c[1])) {
-                $process = new UnixProcess();
-                $process->setPid(intval($c[1]));
-                $s = $process->status();
-                if ($s === false) {
-                    // Process was probably killed!
-                    $this->setTaskStatus($taskId, "KILLED", true);
-                    return array("KILLED");
-                }
-            }
-            return $c;
-        }
-        return false;
-    }
-
-    public function countCurrentlyRunning()
-    {
-        $tasks = AJXP_Utils::loadSerialFile($this->getDbFile(), false, "json");
-        $count = 0;
-        foreach ($tasks as $task) {
-            $s = $this->getTaskStatus($task["task_id"]);
-            if ($s !== false && $s[0] == "RUNNING") {
-                $count++;
-            }
-        }
-        return $count;
-    }
-
-    public function runTask($taskId, $status = null, &$currentlyRunning = -1, $forceStart=false)
-    {
-        $data = $this->getTaskById($taskId);
-        $mess = ConfService::getMessages();
-        $timeArray = $this->getTimeArray($data["schedule"]);
-
-        // TODO : Set MasterInterval as config, or detect last execution?
-        $masterInterval = 1;
-        $maximumProcesses = 2;
-
-        $now = time();
-        $lastExec = time()-60*$masterInterval;
-        $res = $this->getNextExecutionTimeForScript($lastExec, $timeArray);
-        $test = date("Y-m-d H:i", $lastExec). " -- ".date("Y-m-d H:i", $res)." --  ".date("Y-m-d H:i", $now);
-
-        $alreadyRunning = false;
-        $queued = false;
-        if($status == null) $status = $this->getTaskStatus($taskId);
-        if ($status !== false) {
-            if ($status[0] == "RUNNING") {
-                $alreadyRunning = true;
-            } else if (in_array("QUEUED", $status)) {
-                $queued = true; // Run now !
-            }
-        }
-        if ($res >= $lastExec && $res < $now && !$alreadyRunning && $currentlyRunning >= $maximumProcesses) {
-            $this->setTaskStatus($taskId, "QUEUED", true);
-            $alreadyRunning = true;
-            $queued = false;
-        }
-        if ( ( $res >= $lastExec && $res < $now && !$alreadyRunning ) || $queued || $forceStart) {
-            if ($data["user_id"] == "*/*" || $data["user_id"] == "*") {
-                // Recurse all groups and put them into a queue file
-                $allUsers = array();
-                if($data["user_id"] == "*"){
-                    $allUsers = $this->listUsersIds();
-                }else{
-                    $this->gatherUsers($allUsers, "/");
-                }
-                $tmpQueue = AJXP_CACHE_DIR."/cmd_outputs/queue_".$taskId."";
-                echo "Queuing ".count($allUsers)." users in file ".$tmpQueue."\n";
-                file_put_contents($tmpQueue, implode(",", $allUsers));
-                $data["user_id"] = "queue:".$tmpQueue;
-            }
-            if ($data["repository_id"] == "*") {
-                $criteria = array();
-                $criteria["isTemplate"] = false;
-                $count = 0;
-                $listRepos = ConfService::listRepositoriesWithCriteria($criteria, $count);
-                $data["repository_id"] = implode(",", array_keys($listRepos));
-            }
-            $process = AJXP_Controller::applyActionInBackground(
-                $data["repository_id"],
-                $data["action_name"],
-                $data["PARAMS"],
-                $data["user_id"],
-                AJXP_CACHE_DIR."/cmd_outputs/task_".$taskId.".status");
-            if ($process != null && is_a($process, "UnixProcess")) {
-                $this->setTaskStatus($taskId, "RUNNING:".$process->getPid());
-            } else {
-                $this->setTaskStatus($taskId, "RUNNING");
-            }
-            $currentlyRunning ++;
-            return true;
-        }
-        return false;
-    }
-
-    protected function listUsersIds($baseGroup = "/"){
-        $authDriver = ConfService::getAuthDriverImpl();
-        $pairs = $authDriver->listUsers($baseGroup);
-        return array_keys($pairs);
-    }
-
-    protected function gatherUsers(&$users, $startGroup="/")
-    {
-        $u = $this->listUsersIds($startGroup);
-        $users = array_merge($users, $u);
-        $g = AuthService::listChildrenGroups($startGroup);
-        if (count($g)) {
-            foreach ($g as $gName => $gLabel) {
-                $this->gatherUsers($users, $startGroup.$gName);
-            }
-        }
-    }
-
-
-    public function sortTasksByPriorityStatus($data1, $data2)
-    {
-        if(is_array($data1["status"]) && in_array("QUEUED", $data1["status"])) return -1;
-        if(is_array($data2["status"]) && in_array("QUEUED", $data2["status"])) return 1;
-        return 0;
-    }
-
-    public function switchAction($action, $httpVars, $postProcessData)
-    {
-        switch ($action) {
-
-            //------------------------------------
-            // SHARING FILE OR FOLDER
-            //------------------------------------
-            case "scheduler_runAll":
-
-                $tasks = AJXP_Utils::loadSerialFile($this->getDbFile(), false, "json");
-                $message = "";
-                $startRunning = $this->countCurrentlyRunning();
-                $statuses = array();
-                foreach ($tasks as $index => $task) {
-                    $tasks[$index]["status"] = $this->getTaskStatus($task["task_id"]);
-                }
-                usort($tasks, array($this, "sortTasksByPriorityStatus"));
-                foreach ($tasks as $task) {
-                    if (isSet($task["task_id"])) {
-                        $res = $this->runTask($task["task_id"], $task["status"], $startRunning);
-                        if ($res) {
-                            $message .= "Running ".$task["label"]." \n ";
-                        }
-                    }
-                }
-                if(empty($message)) $message = "Nothing to do";
-
-                if (ConfService::currentContextIsCommandLine()) {
-                    print(date("Y-m-d H:i:s")."\t".$message."\n");
-                } else {
-                    AJXP_XMLWriter::header();
-                    AJXP_XMLWriter::sendMessage($message, null);
-                    AJXP_XMLWriter::reloadDataNode();
-                    AJXP_XMLWriter::close();
-                }
-
-                break;
-
-            case "scheduler_runTask":
-
-                $err = -1;
-                $this->runTask($httpVars["task_id"], null, $err, true);
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::reloadDataNode();
-                AJXP_XMLWriter::close();
-
-                break;
-
-            case "scheduler_generateCronExpression":
-
-                $phpCmd = ConfService::getCoreConf("CLI_PHP");
-                $rootInstall = AJXP_INSTALL_PATH.DIRECTORY_SEPARATOR."cmd.php" ;
-                $logFile = AJXP_CACHE_DIR.DIRECTORY_SEPARATOR."cmd_outputs".DIRECTORY_SEPARATOR."cron_commands.log";
-                $cronTiming = "*/5 * * * *";
-                HTMLWriter::charsetHeader("text/plain", "UTF-8");
-                print "$cronTiming $phpCmd $rootInstall -r=ajxp_conf -u=".AuthService::getLoggedUser()->getId()." -p=YOUR_PASSWORD_HERE -a=scheduler_runAll >> $logFile";
-
-                break;
-
-            default:
-                break;
-        }
-
-    }
-
-    public function placeConfigNode(&$configTree)
-    {
-        $mess = ConfService::getMessages();
-        if (isSet($configTree["parameters"])){
-
-            $configTree["parameters"]["CHILDREN"]["scheduler"] = array(
-                "AJXP_MIME" => "scheduler_zone",
-                "LABEL" => "action.scheduler.18",
-                "DESCRIPTION" => "action.scheduler.22",
-                "ICON" => "preferences_desktop.png",
-                "METADATA" => array(
-                    "icon_class" => "icon-time",
-                    "component"  => "Scheduler.Board"
-                ),
-                "LIST"          => array($this, "listTasks")
-            );
-
-        }else if (isSet($configTree["admin"])) {
-            $configTree["admin"]["CHILDREN"]["scheduler"] = array(
-                "LABEL"         => $mess["action.scheduler.18"],
-                "AJXP_MIME"     => "scheduler_zone",
-                "DESCRIPTION"   => $mess["action.scheduler.22"],
-                "ICON"          => "scheduler/ICON_SIZE/player_time.png",
-                "LIST"          => array($this, "listTasks"));
-        }
-    }
-
-    public function listTasks($nodeName, $baseDir)
-    {
-        $mess = ConfService::getMessages();
-        AJXP_XMLWriter::renderHeaderNode("/$baseDir/$nodeName", "Scheduler", false, array("icon" => "scheduler/ICON_SIZE/player_time.png"));
-        AJXP_XMLWriter::sendFilesListComponentConfig('<columns switchGridMode="filelist" switchDisplayMode="list"  template_name="action.scheduler_list">
-                 <column messageId="action.scheduler.12" attributeName="ajxp_label" sortType="String"/>
-                 <column messageId="action.scheduler.2" attributeName="schedule" sortType="String"/>
-                 <column messageId="action.scheduler.1" attributeName="action_name" sortType="String"/>
-                 <column messageId="action.scheduler.4s" attributeName="repository_id" sortType="String"/>
-                 <column messageId="action.scheduler.17" attributeName="user_id" sortType="String"/>
-                 <column messageId="action.scheduler.3" attributeName="NEXT_EXECUTION" sortType="String"/>
-                 <column messageId="action.scheduler.14" attributeName="LAST_EXECUTION" sortType="String"/>
-                 <column messageId="action.scheduler.13" attributeName="STATUS" sortType="String"/>
-        </columns>');
-        $tasks = AJXP_Utils::loadSerialFile($this->getDbFile(), false, "json");
-        foreach ($tasks as $task) {
-
-            $timeArray = $this->getTimeArray($task["schedule"]);
-            $res = $this->getNextExecutionTimeForScript(time(), $timeArray);
-            $task["NEXT_EXECUTION"] = date($mess["date_format"], $res);
-            $task["PARAMS"] = implode(", ", $task["PARAMS"]);
-            $task["icon"] = "scheduler/ICON_SIZE/task.png";
-            $task["ajxp_mime"] = "scheduler_task";
-            $sFile = AJXP_CACHE_DIR."/cmd_outputs/task_".$task["task_id"].".status";
-            if (is_file($sFile)) {
-                $s = $this->getTaskStatus($task["task_id"]);
-                $task["STATUS"] = implode(":", $s);
-                $task["LAST_EXECUTION"] = date($mess["date_format"], filemtime($sFile));
-            } else {
-                $task["STATUS"] = "n/a";
-                $task["LAST_EXECUTION"] = "n/a";
-            }
-
-            AJXP_XMLWriter::renderNode("/admin/scheduler/".$task["task_id"],
-                (isSet($task["label"])?$task["label"]:"Action ".$task["action_name"]),
-                true,
-                $task
-            );
-        }
-        AJXP_XMLWriter::close();
-
-    }
-
-    public function getTimeArray($schedule)
-    {
-        $parts = explode(" ", $schedule);
-        if(count($parts)!=5) throw new Exception("Invalid Schedule Format ($schedule)");
-        $timeArray['minutes'] = $parts[0];
-        $timeArray['hours'] = $parts[1];
-        $timeArray['days'] = $parts[2];
-        $timeArray['dayWeek'] = $parts[3];
-        $timeArray['months'] = $parts[4];
-        return $timeArray;
-    }
-
-
-    public function addOrUpdateTask($taskId, $label, $schedule, $actionName, $repositoryIds, $userId, $paramsArray)
-    {
-        $tasks = AJXP_Utils::loadSerialFile($this->getDbFile(), false, "json");
-        if (isSet($taskId)) {
-            foreach ($tasks as $index => $task) {
-                if ($task["task_id"] == $taskId) {
-                    $data = $task;
-                    $theIndex = $index;
-                }
-            }
-        }
-        if (!isSet($theIndex)) {
-            $data = array();
-            $data["task_id"] = substr(md5(time()), 0, 16);
-        }
-        $data["label"] = $label;
-        $data["schedule"] = $schedule;
-        $data["action_name"] = $actionName;
-        $data["repository_id"] = $repositoryIds;
-        $data["user_id"] = $userId;
-        $data["PARAMS"] = $paramsArray;
-        if(isSet($theIndex)) $tasks[$theIndex] = $data;
-        else $tasks[] = $data;
-        AJXP_Utils::saveSerialFile($this->getDbFile(), $tasks, true, false, "json");
-
-    }
-
-    public function removeTask($taskId)
-    {
-        $tasks = AJXP_Utils::loadSerialFile($this->getDbFile(), false, "json");
-        foreach ($tasks as $index => $task) {
-            if ($task["task_id"] == $taskId) {
-                unset($tasks[$index]);
-                break;
-            }
-        }
-        AJXP_Utils::saveSerialFile($this->getDbFile(), $tasks, true, false, "json");
-    }
-
-    public function handleTasks($action, $httpVars, $fileVars)
-    {
-        $tasks = AJXP_Utils::loadSerialFile($this->getDbFile(), false, "json");
-        switch ($action) {
-            case "scheduler_addTask":
-                if (isSet($httpVars["task_id"])) {
-                    foreach ($tasks as $index => $task) {
-                        if ($task["task_id"] == $httpVars["task_id"]) {
-                            $data = $task;
-                            $theIndex = $index;
-                        }
-                    }
-                }
-                if (!isSet($theIndex)) {
-                    $data = array();
-                    $data["task_id"] = substr(md5(time()), 0, 16);
-                }
-                $data["label"] = $httpVars["label"];
-                $data["schedule"] = $httpVars["schedule"];
-                $data["action_name"] = $httpVars["action_name"];
-                $data["repository_id"] =$httpVars["repository_id"];
-                $i = 1;
-                while (array_key_exists("repository_id_".$i, $httpVars)) {
-                    $data["repository_id"].=",".$httpVars["repository_id_".$i];
-                    $i++;
-                }
-                $data["user_id"] = $httpVars["user_id"];
-                $data["PARAMS"] = array();
-                if (!empty($httpVars["param_name"]) && !empty($httpVars["param_value"])) {
-                    $data["PARAMS"][$httpVars["param_name"]] = $httpVars["param_value"];
-                }
-                foreach ($httpVars as $key => $value) {
-                    if (preg_match('/^param_name_/', $key)) {
-                        $paramIndex = str_replace("param_name_", "", $key);
-                        if(preg_match('/ajxptype/', $paramIndex)) continue;
-                        if(preg_match('/replication/', $paramIndex)) continue;
-                        if (isSet($httpVars["param_value_".$paramIndex])) {
-                            $data["PARAMS"][$value] = $httpVars["param_value_".$paramIndex];
-                        }
-                    }
-                }
-                if(isSet($theIndex)) $tasks[$theIndex] = $data;
-                else $tasks[] = $data;
-                AJXP_Utils::saveSerialFile($this->getDbFile(), $tasks, true, false, "json");
-
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::sendMessage("Successfully added/edited task", null);
-                AJXP_XMLWriter::reloadDataNode();
-                AJXP_XMLWriter::close();
-
-                break;
-
-            case "scheduler_removeTask" :
-
-                $this->removeTask($httpVars["task_id"]);
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::sendMessage("Successfully removed task", null);
-                AJXP_XMLWriter::reloadDataNode();
-                AJXP_XMLWriter::close();
-
-                break;
-
-            case "scheduler_loadTask":
-
-                $found = false;
-                foreach ($tasks as $task) {
-                    if ($task["task_id"] == $httpVars["task_id"]) {
-                        $index = 0;
-                        $found = true;
-                        foreach ($task["PARAMS"] as $pName => $pValue) {
-                            if ($index == 0) {
-                                $task["param_name"] = $pName;
-                                $task["param_value"] = $pValue;
-                            } else {
-                                $task["param_name_".$index] = $pName;
-                                $task["param_value_".$index] = $pValue;
-                            }
-                            $index ++;
-                        }
-                        unset($task["PARAMS"]);
-                        if (strpos($task["repository_id"], ",") !== false) {
-                            $ids = explode(",", $task["repository_id"]);
-                            $task["repository_id"] = $ids[0];
-                            for ($i = 1; $i<count($ids);$i++) {
-                                $task["repository_id_".$i] = $ids[$i];
-                            }
-                        }
-                        break;
-                    }
-                }
-                if ($found) {
-                    HTMLWriter::charsetHeader("application/json");
-                    echo json_encode($task);
-                }
-
-                break;
-
-            default:
-                break;
-        }
-        //var_dump($tasks);
-
-    }
-
-    public function fakeLongTask($action, $httpVars, $fileVars)
-    {
-        $minutes = (isSet($httpVars["time_length"])?intval($httpVars["time_length"]):2);
-        $this->logInfo(__FUNCTION__, "Running Fake task on ".AuthService::getLoggedUser()->getId());
-        print('STARTING FAKE TASK');
-        sleep($minutes * 30);
-        print('ENDIND FAKE TASK');
-    }
-
-    public function getNextExecutionTimeForScript($referenceTime, $timeArray)
-    {
-        $a=null; $m=null; $j=null; $h=null; $min=null;
-
-        $aNow = date("Y", $referenceTime);
-        $mNow = date("m", $referenceTime);
-        $jNow = date("d", $referenceTime);
-        $hNow = date("H", $referenceTime);
-        $minNow = date("i", $referenceTime)+1;
-
-        $a = $aNow;
-        $m = $mNow - 1;
-
-        while ($this->nextMonth($timeArray, $a, $m, $j, $h, $min) != -1) {			/* on parcourt tous les mois de l'intervalle demandé */							/* jusqu'à trouver une réponse convanable */
-            if ($m != $mNow || $a != $aNow) {			/*si ce n'est pas ce mois ci */
-                $j = 0;
-                if ($this->nextDay($timeArray, $a, $m, $j, $h, $min) == -1) {	/* le premier jour trouvé sera le bon. */					/*  -1 si l'intersection entre jour de semaine */
-                    /* et jour du mois est nulle */
-                    continue;			/* ...auquel cas on passe au mois suivant */
-                } else {					/* s'il y a un jour */
-                    $h=-1;
-                    $this->nextHour($timeArray, $a, $m, $j, $h, $min);	/* la première heure et la première minute conviendront*/
-                    $min = -1;
-                    $this->nextMinute($timeArray, $a, $m, $j, $h, $min);
-                    return mktime($h, $min, 0, $m, $j, $a);
-                }
-            } else {						/* c'est ce mois ci */
-                $j = $jNow-1;
-                while ($this->nextDay($timeArray, $a, $m, $j, $h, $min) != -1) {	/* on cherche un jour à partir d'aujourd'hui compris */
-                    if ($j > $jNow) {			/* si ce n'est pas aujourd'hui */				/* on prend les premiers résultats */
-                        $h=-1;
-                        $this->nextHour($timeArray, $a, $m, $j, $h, $min);
-                        $min = -1;
-                        $this->nextMinute($timeArray, $a, $m, $j, $h, $min);
-                        return mktime($h, $min, 0, $m, $j, $a);
-                    }
-                    if ($j == $jNow) {		/* même algo pour les heures et les minutes */
-                        $h = $hNow - 1;
-                        while ($this->nextHour($timeArray, $a, $m, $j, $h, $min) != -1) {
-                            if ($h > $hNow) {
-                                $min = -1;
-                                $this->nextMinute($timeArray, $a, $m, $j, $h, $min);
-                                return mktime($h, $min, 0, $m, $j, $a);
-                            }
-                            if ($h == $hNow) {
-                                $min = $minNow - 1;
-                                while ($this->nextMinute($timeArray, $a, $m, $j, $h, $min) != -1) {
-                                    if ($min > $minNow) { return mktime($h, $min, 0, $m, $j, $a); }
-
-                                    /* si c'est maintenant, on l'éxécute directement */
-                                    if ($min == $minNow) {
-                                        return $referenceTime;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    public function parseFormat($min, $max, $intervalle)
-    {
-        $retour = Array();
-
-        if ($intervalle == '*') {
-            for($i=$min; $i<=$max; $i++) $retour[$i] = TRUE;
-            return $retour;
-        } else {
-            for($i=$min; $i<=$max; $i++) $retour[$i] = FALSE;
-        }
-        if ($intervalle[0] == "/") {
-            // Transform Repeat pattern into range
-            $repeat = intval(ltrim($intervalle, "/"));
-            $values= array();
-            for ($i=$min;$i<=$max;$i++) {
-                if(($i % $repeat) == 0) $values[] = $i;
-            }
-            $intervalle = implode(",", $values);
-        }
-
-        $intervalle = array_map("trim", explode(',', $intervalle));
-        foreach ($intervalle as $val) {
-            $val = array_map("trim", explode('-', $val));
-            if (isset($val[0]) && isset($val[1])) {
-                if ($val[0] <= $val[1]) {
-                    for($i=$val[0]; $i<=$val[1]; $i++) $retour[$i] = TRUE;	/* ex : 9-12 = 9, 10, 11, 12 */
-                } else {
-                    for($i=$val[0]; $i<=$max; $i++) $retour[$i] = TRUE;	/* ex : 10-4 = 10, 11, 12... */
-                    for($i=$min; $i<=$val[1]; $i++) $retour[$i] = TRUE;	/* ...et 1, 2, 3, 4 */
-                }
-            } else {
-                $retour[$val[0]] = TRUE;
-            }
-        }
-        return $retour;
-    }
-
-    public function nextMonth($timeArray, &$a, &$m, &$j, &$h, &$min)
-    {
-        $valeurs = $this->parseFormat(1, 12, $timeArray['months']);
-        do {
-            $m++;
-            if ($m == 13) {
-                $m=1;
-                $a++;		/*si on a fait le tour, on réessaye l'année suivante */
-            }
-        } while ($valeurs[$m] != TRUE);
-    }
-    public function nextDay($timeArray, &$a, &$m, &$j, &$h, &$min)
-    {
-        $valeurs = $this->parseFormat(1, 31, $timeArray['days']);
-        $valeurSemaine = $this->parseFormat(0, 6, $timeArray['dayWeek']);
-
-        do {
-            $j++;
-
-            /* si $j est égal au nombre de jours du mois + 1 */
-            if ($j == date('t', mktime(0, 0, 0, $m, 1, $a))+1) { return -1; }
-
-            $js = date('w', mktime(0, 0, 0, $m, $j, $a));
-        } while ($valeurs[$j] != TRUE || $valeurSemaine[$js] != TRUE);
-    }
-    public function nextHour($timeArray, &$a, &$m, &$j, &$h, &$min)
-    {
-        $valeurs = $this->parseFormat(0, 23, $timeArray['hours']);
-
-        do {
-            $h++;
-            if ($h == 24) { return -1; }
-        } while ($valeurs[$h] != TRUE);
-    }
-
-    public function nextMinute($timeArray, &$a, &$m, &$j, &$h, &$min)
-    {
-        $valeurs = $this->parseFormat(0, 59, $timeArray['minutes']);
-
-        do {
-            $min++;
-            if ($min == 60) { return -1; }
-        } while ($valeurs[$min] != TRUE);
-    }
-}
\ No newline at end of file
diff --git a/core/src/plugins/action.scheduler/composer.json b/core/src/plugins/action.scheduler/composer.json
new file mode 100644
index 0000000000..84bb194d70
--- /dev/null
+++ b/core/src/plugins/action.scheduler/composer.json
@@ -0,0 +1,11 @@
+{
+  "name": "Pydio Scheduler",
+  "description": "Perform some jobs on a regular basis (cron-based expression).",
+  "homepage": "https://pydio.com/",
+  "license":"AGPL-3.0",
+  "autoload": {
+    "psr-4": {
+      "Pydio\\Action\\Scheduler\\": "./src"
+    }
+  }
+}
diff --git a/core/src/plugins/action.scheduler/i18n/conf/de.php b/core/src/plugins/action.scheduler/i18n/conf/de.php
index 82bc68c829..5140360790 100644
--- a/core/src/plugins/action.scheduler/i18n/conf/de.php
+++ b/core/src/plugins/action.scheduler/i18n/conf/de.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess = array(
 "Tasks Scheduler" => "Aufgabenplanung",
diff --git a/core/src/plugins/action.scheduler/i18n/conf/en.php b/core/src/plugins/action.scheduler/i18n/conf/en.php
index f44e55e513..7b10759a05 100644
--- a/core/src/plugins/action.scheduler/i18n/conf/en.php
+++ b/core/src/plugins/action.scheduler/i18n/conf/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess = array(
 "Tasks Scheduler" => "Tasks Scheduler",
diff --git a/core/src/plugins/action.scheduler/i18n/de.php b/core/src/plugins/action.scheduler/i18n/de.php
index bf979fdc23..cccc72152a 100644
--- a/core/src/plugins/action.scheduler/i18n/de.php
+++ b/core/src/plugins/action.scheduler/i18n/de.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess = array(
     // will be replaced by the application title
@@ -50,6 +50,7 @@
     "17d" => "Kommagetrennte Liste mit Benutzern oder Wildcard * damit die Aufgabe für alle Benutzer ausgeführt wird.",
     "18"  => "Aufgabenplanung",
     "18d" => "Cron-ähnliche Aufgabenplanung",
+    "18e" => "Aufgabenplanung (disabled)",
     "19" => "Aufgabe löschen",
     "19d" => "Aufgabe nicht mehr ausführen und löschen",
     "20" => "Crontab-Eintrag generieren",
@@ -58,4 +59,6 @@
     "22" => "Aufgabenplanung, um bestimmte Aufgaben regelmäßig zu starten. Benötigt die PHP-Kommandozeile und Crontab oder ein ähnliches System.",
     "23" => "Grundeinstellungen",
     "24" => "Parameter",
+    "25" => "Stop Job",
+    "26" => "Stop running job",
 );
diff --git a/core/src/plugins/action.scheduler/i18n/en.php b/core/src/plugins/action.scheduler/i18n/en.php
index 8cc8dfee63..9d5abe7d77 100644
--- a/core/src/plugins/action.scheduler/i18n/en.php
+++ b/core/src/plugins/action.scheduler/i18n/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess = array(
     // will be replaced by the application title
@@ -50,6 +50,7 @@
     "17d" => "Enter a comma separated list of users, or wildcard * to recurse the task on all users.",
     "18"  => "Scheduler",
     "18d" => "Cron-like scheduler actions",
+    "18e" => "Scheduler (disabled)",
     "19" => "Delete Task",
     "19d" => "Unschedule and remove the selected task",
     "20" => "Cron Expression",
@@ -58,4 +59,6 @@
     "22" => "Generic scheduler to perform tasks on a regular basis. Requires CLI activation and a CRONTAB or similar system.",
     "23" => "Execution Context",
     "24" => "Parameters",
+    "25" => "Stop Job",
+    "26" => "Stop running job",
 );
diff --git a/core/src/plugins/action.scheduler/i18n/fr.php b/core/src/plugins/action.scheduler/i18n/fr.php
index 8dcbe29183..fcee703463 100644
--- a/core/src/plugins/action.scheduler/i18n/fr.php
+++ b/core/src/plugins/action.scheduler/i18n/fr.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess = array(
     "1" => "Action",
@@ -49,6 +49,7 @@
     "17d" => "Entrer une liste d'utilisateurs séparés par des virgules, ou un joker (*) pour lancer la tâche sur chaque utilisateur.",
     "18"  => "Planificateur",
     "18d" => "Actions du planificateur (type cron)",
+    "18e" => "Planificateur (inactif)",
     "19" => "Supprimer la tâche",
     "19d" => "Déplanifier et supprimer la tâche sélectionnée",
     "20" => "Expression Cron",
@@ -57,4 +58,6 @@
     "22" => "Planificateur permettant l'exécution récurrente de tâches. Nécessite l'activation de la ligne de commande et un système type CRONTAB.",
     "23" => "Execution Context",
     "24" => "Parameters",
+    "25" => "Stop Job",
+    "26" => "Stop running job",
 );
diff --git a/core/src/plugins/action.scheduler/i18n/it.php b/core/src/plugins/action.scheduler/i18n/it.php
index ad13841240..f3b6c27a9f 100644
--- a/core/src/plugins/action.scheduler/i18n/it.php
+++ b/core/src/plugins/action.scheduler/i18n/it.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess = array(
     // will be replaced by the application title
@@ -49,6 +49,7 @@
     "17" => "Utente(i)",
     "17d" => "Inserisci un elenco di utenti, separati dalla virgola, o il  wildcard * per eseguire l'azione per ogni utente.",
     "18"  => "Schedulatore",
+    "18e"  => "Schedulatore (disabled)",
     "18d" => "Azioni in stile 'Cron'",
     "19" => "Cancella Azione",
     "19d" => "De-Schedula e rimuovi l'azione selezionata",
@@ -56,6 +57,8 @@
     "20d" => "Genera espressione Crontab",
     "21" => "Aggiungi la linea al CRONTAB, sostituendo il valore reale della tua password, e la schedulazione che preferisci (adesso è configurato per essere eseguito ogni 5 minuti).",
     "22" => "Schedulatore generico per eseguire azioni su basi regolari. Richiede l'attivazione della CLI e del CRONTAB (o equivalente).",
-    "23" => "Contesto Esecuzione",
-    "24" => "Parametri",
+    "23" => "Execution Context",
+    "24" => "Parameters",
+    "25" => "Stop Job",
+    "26" => "Stop running job",
 );
diff --git a/core/src/plugins/action.scheduler/i18n/pt.php b/core/src/plugins/action.scheduler/i18n/pt.php
index 2486b6a769..5aa3390b82 100644
--- a/core/src/plugins/action.scheduler/i18n/pt.php
+++ b/core/src/plugins/action.scheduler/i18n/pt.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess = array(
     // will be replaced by the application title
@@ -49,6 +49,7 @@
     "17" => "Utilizador(es)",
     "17d" => "Introduza uma lista de utilizadores separados por virgulas, ou um Wildcard * Tarefa recursiva para todos os utilizadores.",
     "18"  => "Agenda",
+    "18e"  => "Agenda (disabled)",
     "18d" => "Agenda Cronológica de acções",
     "19" => "Apagar Tarefa",
     "19d" => "Remover entrada da agenda e remover as tarefas seleccionadas",
@@ -58,4 +59,6 @@
     "22" => "Agendamento Genérico para correr tarefas de forma regular. Requer a activação de CLI e de uma Tabela Cronológica ou de um sistema semelhante.",
     "23" => "Execution Context",
     "24" => "Parameters",
+    "25" => "Stop Job",
+    "26" => "Stop running job",
 );
diff --git a/core/src/plugins/action.scheduler/manifest.xml b/core/src/plugins/action.scheduler/manifest.xml
index 3a16484aa4..96b85fd488 100755
--- a/core/src/plugins/action.scheduler/manifest.xml
+++ b/core/src/plugins/action.scheduler/manifest.xml
@@ -1,22 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ajxp_plugin id="action.scheduler" enabled="false" label="CONF_MESSAGE[Tasks Scheduler]" description="CONF_MESSAGE[Register tasks to be run on a regular basis instead of writing them one by one in cron tab.]"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
+<ajxp_plugin id="action.scheduler" enabled="true" label="CONF_MESSAGE[Tasks Scheduler]" description="CONF_MESSAGE[Register tasks to be run on a regular basis instead of writing them one by one in cron tab.]"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
     <client_settings>
         <resources>
             <i18n namespace="action.scheduler" path="plugins/action.scheduler/i18n"/>
             <img_library alias="scheduler" path="plugins/action.scheduler/icons"/>
-            <js className="Scheduler" file="plugins/action.scheduler/build/Scheduler.js" depends="React"/>
         </resources>
     </client_settings>
     <registry_contributions>
-        <client_configs>
-            <template element="ajxp_desktop" name="scheduler_style" position="after"><![CDATA[
-            <style>
-                .scheduler-list .mui-toolbar-group.mui-left {
-                    width: 88% !important;
-                }
-            </style>
-            ]]></template>
-        </client_configs>
         <actions>
             <action name="scheduler_menu">
                 <gui text="action.scheduler.18" iconClass="icon-time" title="action.scheduler.18d" src="scheduler/ICON_SIZE/player_time.png" hasAccessKey="false">
@@ -55,7 +45,7 @@
                     <clientForm id="scheduler_cronExpression"><![CDATA[
                          <div id="scheduler_cronExpression" box_width="420">
                              <div class="dialogLegend" ajxp_message_id="action.scheduler.21">AJXP_MESSAGE[action.scheduler.21]</div>
-                             <textarea class="dialogFocus" style="width:400px;height:80px; margin-top: 5px;" id="cron_expression"></textarea>
+                             <textarea class="dialogFocus" style="width:350px;height:80px; margin-top: 5px;" id="cron_expression"></textarea>
                          </div>
                     ]]></clientForm>
                     <serverCallback methodName="switchAction" developerComment="Generate a correct expression to be inserted in Crontab, in order to trigger the {runAll} action on a regular basis."/>
@@ -76,7 +66,7 @@
                         };
                         connexion.sendAsync();
                     ]]></clientCallback>
-                    <serverCallback methodName="switchAction" developerComment="Run the scheduler: check if some tasks must be run now, and launch them. Generally launched from command line."/>
+                    <serverCallback methodName="switchAction" restParams="/" developerComment="Run the scheduler: check if some tasks must be run now, and launch them. Generally launched from command line."/>
                 </processing>
             </action>
             <action name="scheduler_loadTask">
@@ -263,7 +253,7 @@
                     <context selection="true" dir="" recycle="hidden" allowedMimes="scheduler_zone"
                              actionBar="true" contextMenu="true" infoPanel="true"
                              actionBarGroup="get"/>
-                    <selectionContext dir="false" file="true" behaviour="hidden" recycle="false" unique="true" allowedMimes="scheduler_task"/>
+                    <selectionContext dir="false" file="true" behaviour="hidden" recycle="false" unique="true" allowedMimes="scheduler_task,scheduler_error_task"/>
                 </gui>
                 <processing>
                     <clientCallback><![CDATA[
@@ -286,18 +276,45 @@
                     </serverCallback>
                 </processing>
             </action>
+            <action name="scheduler_stopRunningTask">
+                <gui text="action.scheduler.25" title="action.scheduler.26" iconClass="icon-stop" src="scheduler/ICON_SIZE/task.png" hasAccessKey="false">
+                    <context selection="true" dir="" recycle="hidden" allowedMimes="scheduler_zone"
+                             actionBar="true" contextMenu="true" infoPanel="true"
+                             actionBarGroup="get"/>
+                    <selectionContext dir="false" file="true" behaviour="hidden" recycle="false" unique="true" allowedMimes="scheduler_running_task"/>
+                </gui>
+                <processing>
+                    <clientCallback><![CDATA[
+                        var userSelection;
+                        if(window.actionArguments && window.actionArguments.length){
+                            userSelection = window.actionArguments[0];
+                        }else{
+                            userSelection =  pydio.getUserSelection();
+                        }
+                        var taskId = userSelection.getUniqueNode().getMetadata().get("task_id");
+                        var task = new PydioTasks.Task({id:taskId});
+                        task.stop();
+                    ]]></clientCallback>
+                </processing>
+            </action>
             <action name="scheduler_fakeLongTask">
                 <processing>
                     <serverCallback methodName="fakeLongTask" developerComment="Launch a fake long task."/>
                 </processing>
             </action>
+            <action name="scheduler_checkConfig">
+                <rightsContext adminOnly="true" noUser="false" read="true" userLogged="true" write="true"/>
+                <processing>
+                    <serverCallback methodName="switchAction" developerComment="Check scheduler configuration"/>
+                </processing>
+            </action>
         </actions>
         <hooks>
             <serverCallback methodName="placeConfigNode" hookName="ajxp_conf.list_config_nodes"/>
             <serverCallback methodName="placeConfigNode" hookName="admin.list_config_nodes"/>
         </hooks>
     </registry_contributions>
-    <class_definition filename="plugins/action.scheduler/class.AjxpScheduler.php" classname="AjxpScheduler"/>
+    <class_definition filename="plugins/action.scheduler/vendor/autoload.php" classname="Pydio\Action\Scheduler\Scheduler"/>
     <dependencies>
         <activePlugin pluginName="access.ajxp_conf|access.ajxp_admin"/>
     </dependencies>
diff --git a/core/src/plugins/action.scheduler/package.json b/core/src/plugins/action.scheduler/package.json
deleted file mode 100644
index 6f44bae2bb..0000000000
--- a/core/src/plugins/action.scheduler/package.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name": "action.scheduler",
-  "version": "6.2.1",
-  "description": "",
-  "source_path":"react",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "Abstrium SAS",
-  "license": "AGPL",
-  "devDependencies": {
-    "grunt": "~0.4.5",
-    "grunt-babel": "~5.0.3",
-    "grunt-contrib-watch": "~0.6.1"
-  }
-}
diff --git a/core/src/plugins/action.scheduler/react/Scheduler.js b/core/src/plugins/action.scheduler/react/Scheduler.js
deleted file mode 100644
index fafc4e82ef..0000000000
--- a/core/src/plugins/action.scheduler/react/Scheduler.js
+++ /dev/null
@@ -1,73 +0,0 @@
-(function(global) {
-
-    var MessagesConsumerMixin = AdminComponents.MessagesConsumerMixin;
-
-    var Board = React.createClass({
-
-        mixins:[MessagesConsumerMixin],
-
-        keys: {
-            'label':{label:'Label', message:'action.scheduler.12'},
-            'schedule':{label:'Schedule', message:'action.scheduler.2'},
-            'action_name':{label:'Action', message:'action.scheduler.1'},
-            'repository_id':{label:'Workspace', message:'action.scheduler.4s'},
-            'user_id':{label:'User(s)', message:'action.scheduler.17'},
-            'NEXT_EXECUTION':{label:'Next Execution', message:'action.scheduler.3'},
-            'LAST_EXECUTION':{label:'Last Execution', message:'action.scheduler.14'},
-            'STATUS':{label:'Status', message:'action.scheduler.13'}
-        },
-
-        showTaskCreator: function(){
-            global.pydio.Controller.fireAction("scheduler_addTask");
-        },
-
-        runAllTasks: function(){
-            global.pydio.Controller.fireAction("scheduler_runAll");
-        },
-
-        showCronExpression: function(){
-            global.pydio.Controller.fireAction("scheduler_generateCronExpression");
-        },
-
-        render: function(){
-
-            return (
-                <div className="main-layout-nav-to-stack workspaces-board">
-                    <div className="left-nav vertical-layout" style={{width:'100%', backgroundColor:'white'}}>
-                        <ReactMUI.Paper zDepth={0} className="vertical-layout layout-fill">
-                            <div className="vertical-layout workspaces-list layout-fill">
-                                <h1 className="hide-on-vertical-layout">{this.context.getMessage('18', 'action.scheduler')}</h1>
-                                <div className="button-container">
-                                    <ReactMUI.FlatButton primary={true} label={'+ ' + this.context.getMessage('8', 'action.scheduler')} onClick={this.showTaskCreator}/>
-                                    <ReactMUI.FlatButton secondary={true} label={this.context.getMessage('15', 'action.scheduler')} onClick={this.runAllTasks} />
-                                    <ReactMUI.FlatButton secondary={true} label={this.context.getMessage('20', 'action.scheduler')} onClick={this.showCronExpression} />
-                                </div>
-                                <ReactPydio.SimpleList
-                                    node={this.props.currentNode}
-                                    dataModel={this.props.dataModel}
-                                    className="scheduler-list layout-fill"
-                                    actionBarGroups={['get']}
-                                    infineSliceCount={1000}
-                                    tableKeys={this.keys}
-                                    elementHeight={{
-                                        "max-width:480px":201,
-                                        "(min-width:480px) and (max-width:760px)":80,
-                                        "min-width:760px":ReactPydio.SimpleList.HEIGHT_ONE_LINE
-                                    }}
-                                />
-
-                            </div>
-                        </ReactMUI.Paper>
-                    </div>
-                </div>
-            );
-
-        }
-
-    });
-
-    global.Scheduler = {
-        Board: Board
-    };
-
-})(window);
\ No newline at end of file
diff --git a/core/src/plugins/action.scheduler/src/Scheduler.php b/core/src/plugins/action.scheduler/src/Scheduler.php
new file mode 100644
index 0000000000..91a7e562de
--- /dev/null
+++ b/core/src/plugins/action.scheduler/src/Scheduler.php
@@ -0,0 +1,567 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Action\Scheduler;
+
+use DOMNode;
+use DOMXPath;
+use Exception;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\NodesList;
+use Pydio\Core\Controller\CliRunner;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Http\Message\ReloadMessage;
+use Pydio\Core\Http\Message\UserMessage;
+use Pydio\Core\Http\Response\SerializableResponseStream;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\ConfService;
+
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Utils\FileHelper;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\StringHelper;
+use Pydio\Core\Controller\HTMLWriter;
+use Pydio\Core\PluginFramework\Plugin;
+
+use Cron\CronExpression;
+use Pydio\Tasks\Schedule;
+use Pydio\Tasks\Task;
+use Pydio\Tasks\TaskService;
+use Zend\Diactoros\Response\JsonResponse;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class AjxpScheduler
+ * @package Pydio\Action\Scheduler
+ */
+class Scheduler extends Plugin
+{
+    public $db;
+
+    /**
+     * Construction method
+     *
+     * @param string $id
+     * @param string $baseDir
+     */
+    public function __construct($id, $baseDir)
+    {
+        parent::__construct($id, $baseDir);
+
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        parent::init($ctx, $options);
+        if (!$ctx->hasUser()) return;
+        if ($ctx->getUser()->getGroupPath() != "/") {
+            $this->enabled = false;
+        }
+    }
+
+    /**
+     * @return string
+     * @throws Exception
+     */
+    public function getDbFile()
+    {
+        if (!isSet($this->db)) {
+            $this->db = $this->getPluginWorkDir(true) . "/calendar.json";
+        }
+        return $this->db;
+    }
+
+
+    public function performChecks()
+    {
+        if (!ConfService::backgroundActionsSupported()) {
+            //throw new Exception("The command line must be supported. See 'Pydio Core Options'.");
+        }
+    }
+
+    /**
+     * @param \Pydio\Core\Model\ContextInterface $ctx
+     * @param DOMNode $contribNode
+     */
+    public function parseSpecificContributions(ContextInterface $ctx, \DOMNode &$contribNode)
+    {
+        parent::parseSpecificContributions($ctx, $contribNode);
+        if ($contribNode->nodeName != "actions") return;
+        $actionXpath = new DOMXPath($contribNode->ownerDocument);
+        $paramList = $actionXpath->query('action[@name="scheduler_addTask"]/processing/standardFormDefinition/param[@name="repository_id"]', $contribNode);
+        if (!$paramList->length) return;
+        $paramNode = $paramList->item(0);
+        $sVals = array();
+        $repos = RepositoryService::listAllRepositories(true);
+        foreach ($repos as $repoId => $repoObject) {
+            $sVals[] = $repoId . "|" . StringHelper::xmlEntities($repoObject->getDisplay());
+        }
+        $sVals[] = "*|All Repositories";
+        $paramNode->attributes->getNamedItem("choices")->nodeValue = implode(",", $sVals);
+
+        if (!UsersService::usersEnabled() || !$ctx->hasUser()) return;
+        $paramList = $actionXpath->query('action[@name="scheduler_addTask"]/processing/standardFormDefinition/param[@name="user_id"]', $contribNode);
+        if (!$paramList->length) return;
+        $paramNode = $paramList->item(0);
+        $paramNode->attributes->getNamedItem("default")->nodeValue = $ctx->getUser()->getId();
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $taskId
+     * @param null $status
+     * @param int $currentlyRunning
+     * @param bool $forceStart
+     * @return bool
+     * @throws Exception
+     */
+    public function runTask(ContextInterface $ctx, $taskId, $status = null, &$currentlyRunning = -1, $forceStart = false)
+    {
+        // TODO : Set MasterInterval as config, or detect last execution?
+        $masterInterval = 1;
+        $maximumProcesses = 2;
+
+        $task = TaskService::getInstance()->getTaskById($taskId);
+        $runningChildren = array_filter($task->getChildrenTasks(), function($child){
+            return ($child->getStatus() !== Task::STATUS_COMPLETE && $child->getStatus() !== Task::STATUS_FAILED);
+        });
+        $shouldRunNow = $task->getSchedule()->shouldRunNow($masterInterval);
+        $alreadyRunning = count($runningChildren) > 0;
+
+        if (($shouldRunNow && !$alreadyRunning) || $forceStart) {
+
+            $job = clone $task;
+            $job->setId(StringHelper::createGUID());
+            $job->setParentId($task->getId());
+            $job->setStatus(Task::STATUS_PENDING);
+            $job->setStatusMessage("Starting...");
+            TaskService::getInstance()->createTask($job, new Schedule(Schedule::TYPE_ONCE_NOW));
+            if($job->getUserId() !== $ctx->getUser()->getId()){
+                $uId = $job->getUserId();
+                $job->setUserId($ctx->getUser()->getId());
+                $job->setImpersonateUsers($uId);
+            }
+            CliRunner::applyTaskInBackground($job);
+
+            $currentlyRunning++;
+            return true;
+        }
+        return false;
+    }
+    
+    /**
+     * @param $data1
+     * @param $data2
+     * @return int
+     */
+    public function sortTasksByPriorityStatus($data1, $data2)
+    {
+        if (is_array($data1["status"]) && in_array("QUEUED", $data1["status"])) return -1;
+        if (is_array($data2["status"]) && in_array("QUEUED", $data2["status"])) return 1;
+        return 0;
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     */
+    public function switchAction(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface)
+    {
+        $action = $requestInterface->getAttribute("action");
+        /** @var ContextInterface $ctx */
+        $ctx    = $requestInterface->getAttribute("ctx");
+
+        switch ($action) {
+
+            //------------------------------------
+            // SHARING FILE OR FOLDER
+            //------------------------------------
+            case "scheduler_runAll":
+
+                $message = "";
+                $this->migrateLegacyTasks();
+                $tasks = TaskService::getInstance()->getScheduledTasks();
+                foreach($tasks as $task){
+                    $res = $this->runTask($ctx, $task->getId());
+                    if($res){
+                        $message .= "Launching " . $task->getLabel() . " \n ";
+                    }
+                }
+                if (empty($message)) $message = "Nothing to do";
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream([new UserMessage($message), new ReloadMessage()]));
+
+                break;
+
+            case "scheduler_runTask":
+
+                $err = -1;
+                $tId = InputFilter::sanitize($requestInterface->getParsedBody()["task_id"], InputFilter::SANITIZE_ALPHANUM);
+                $this->runTask($ctx, $tId, null, $err, true);
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream([new UserMessage("Launching task now"), new ReloadMessage()]));
+
+                break;
+
+            case "scheduler_generateCronExpression":
+
+                $phpCmd = ConfService::getGlobalConf("CLI_PHP");
+                $rootInstall = AJXP_INSTALL_PATH . DIRECTORY_SEPARATOR . "cmd.php";
+                $logFile = AJXP_CACHE_DIR . DIRECTORY_SEPARATOR . "cmd_outputs" . DIRECTORY_SEPARATOR . "cron_commands.log";
+                $cronTiming = "*/5 * * * *";
+                HTMLWriter::charsetHeader("text/plain", "UTF-8");
+                print "$cronTiming $phpCmd $rootInstall -r=ajxp_conf -u=" . $ctx->getUser()->getId() . " -p=YOUR_PASSWORD_HERE -a=scheduler_runAll >> $logFile";
+
+                break;
+
+            case "scheduler_checkConfig":
+
+                $responseInterface = new JsonResponse(["OK" => ConfService::backgroundActionsSupported()]);
+
+                break;
+
+            default:
+                break;
+        }
+
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @throws Exception
+     */
+    public function handleTasks(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface)
+    {
+        $action     = $requestInterface->getAttribute("action");
+        $ctx        = $requestInterface->getAttribute("ctx");
+        $httpVars   = $requestInterface->getParsedBody();
+
+        switch ($action) {
+
+            case "scheduler_addTask":
+
+                $taskLabel = $httpVars["label"];
+                $cronValue = $httpVars["schedule"];
+                // Should throw an error if cron format is invalid
+                CronExpression::factory($cronValue);
+                $actionName = $httpVars["action_name"];
+                $repositoryId = $httpVars["repository_id"];
+                $i = 1;
+                while (array_key_exists("repository_id_" . $i, $httpVars)) {
+                    $repositoryId .= "," . $httpVars["repository_id_" . $i];
+                    $i++;
+                }
+                $userId = $httpVars["user_id"];
+                $parameters = array();
+                if (!empty($httpVars["param_name"]) && !empty($httpVars["param_value"])) {
+                    $parameters[$httpVars["param_name"]] = $httpVars["param_value"];
+                }
+                foreach ($httpVars as $key => $value) {
+                    if (preg_match('/^param_name_/', $key)) {
+                        $paramIndex = str_replace("param_name_", "", $key);
+                        if (preg_match('/ajxptype/', $paramIndex)) continue;
+                        if (preg_match('/replication/', $paramIndex)) continue;
+                        if (isSet($httpVars["param_value_" . $paramIndex])) {
+                            $parameters[$value] = $httpVars["param_value_" . $paramIndex];
+                        }
+                    }
+                }
+
+                if(isSet($httpVars["task_id"])){
+                    $edit = true;
+                    $task = TaskService::getInstance()->getTaskById(InputFilter::sanitize($httpVars["task_id"], InputFilter::SANITIZE_ALPHANUM));
+                    $task->setAction($actionName);
+                    $task->setParameters($parameters);
+                }else{
+                    $edit = false;
+                    $task = new Task();
+                    $task->setId(StringHelper::createGUID());
+                    $task->setType(Task::TYPE_ADMIN);
+                }
+                $task->setStatus(Task::STATUS_TEMPLATE);
+                $task->setStatusMessage("Scheduled");
+                $task->setAction($actionName);
+                $task->setParameters($parameters);
+                $task->setLabel($taskLabel);
+                $task->setWsId($repositoryId);
+                $task->setUserId($userId);
+                $task->setSchedule(new Schedule(Schedule::TYPE_RECURRENT, $cronValue));
+                if($edit) {
+                    TaskService::getInstance()->updateTask($task);
+                }else{
+                    TaskService::getInstance()->createTask($task, $task->getSchedule());
+                }
+
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream([new UserMessage("Successfully added/edited task"), new ReloadMessage()]));
+                break;
+
+            case "scheduler_removeTask" :
+
+                $task = TaskService::getInstance()->getTaskById(InputFilter::sanitize($httpVars["task_id"], InputFilter::SANITIZE_ALPHANUM));
+                if($task !== null){
+                    $children = $task->getChildrenTasks();
+                    if(!empty($children)){
+                        throw new PydioException("This task has currently jobs running, please wait that they are finished");
+                    }
+                    TaskService::getInstance()->deleteTask($task->getId());
+                }
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream([new UserMessage("Successfully removed task"), new ReloadMessage()]));
+                break;
+
+            case "scheduler_loadTask":
+
+                $task = TaskService::getInstance()->getTaskById(InputFilter::sanitize($httpVars["task_id"], InputFilter::SANITIZE_ALPHANUM));
+                if(empty($task)){
+                    throw new PydioException("Cannot find task");
+                }
+                $tData = [
+                    "task_id"       => $task->getId(),
+                    "action_name"   => $task->getAction(),
+                    "label"         => $task->getLabel(),
+                    "schedule"      => $task->getSchedule()->getValue(),
+                    "user_id"       => $task->getUserId()
+                ];
+                $parameters = $task->getParameters();
+                $repoId = $task->getWsId();
+
+                $index = 0;
+                foreach ($parameters as $pName => $pValue) {
+                    if ($index == 0) {
+                        $tData["param_name"] = $pName;
+                        $tData["param_value"] = $pValue;
+                    } else {
+                        $tData["param_name_" . $index] = $pName;
+                        $tData["param_value_" . $index] = $pValue;
+                    }
+                    $index++;
+                }
+                if (strpos($repoId, ",") !== false) {
+                    $ids = explode(",", $repoId);
+                    $tData["repository_id"] = $ids[0];
+                    for ($i = 1; $i < count($ids); $i++) {
+                        $tData["repository_id_" . $i] = $ids[$i];
+                    }
+                }else{
+                    $tData["repository_id"] = $repoId;
+                }
+
+                $responseInterface = new JsonResponse($tData);
+
+                break;
+
+            default:
+                break;
+        }
+
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     */
+    public function fakeLongTask(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface)
+    {
+        $httpVars = $requestInterface->getParsedBody();
+        $taskId = $requestInterface->getAttribute("pydio-task-id");
+        $seconds = (isSet($httpVars["time_length"]) ? intval($httpVars["time_length"]) : 2);
+        $this->logInfo(__FUNCTION__, "Running Fake task on " . $requestInterface->getAttribute("ctx")->getRepositoryId());
+        $responseInterface->getBody()->write('STARTING FAKE TASK');
+        TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_RUNNING, "Currently waiting for $seconds seconds");
+        sleep($seconds);
+        TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_COMPLETE, "Finished waiting");
+        $responseInterface->getBody()->write('ENDIND FAKE TASK');
+    }
+
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $configTree
+     */
+    public function placeConfigNode(ContextInterface $ctx, &$configTree)
+    {
+        $mess = LocaleService::getMessages();
+        if (isSet($configTree["parameters"])) {
+            $configTree["parameters"]["CHILDREN"]["scheduler"] = array(
+                "AJXP_MIME" => "scheduler_zone",
+                "LABEL" => "action.scheduler.18".(ConfService::backgroundActionsSupported()?"":"e"),
+                "DESCRIPTION" => "action.scheduler.22",
+                "ICON" => "preferences_desktop.png",
+                "METADATA" => array(
+                    "icon_class" => "icon-time",
+                    "component" => "Scheduler.Board"
+                ),
+                "LIST" => array($this, "listTasks")
+            );
+
+        } else if (isSet($configTree["admin"])) {
+            $configTree["admin"]["CHILDREN"]["scheduler"] = array(
+                "LABEL" => $mess["action.scheduler.18".(ConfService::backgroundActionsSupported()?"":"e")],
+                "AJXP_MIME" => "scheduler_zone",
+                "DESCRIPTION" => $mess["action.scheduler.22"],
+                "ICON" => "scheduler/ICON_SIZE/player_time.png",
+                "LIST" => array($this, "listTasks"));
+        }
+    }
+
+    /**
+     * @param $httpVars
+     * @param $rootPath
+     * @param $relativePath
+     * @param null $paginationHash
+     * @param null $findNodePosition
+     * @param null $aliasedDir
+     * @return NodesList
+     * @throws Exception
+     */
+    public function listTasks($httpVars, $rootPath, $relativePath, $paginationHash = null, $findNodePosition=null, $aliasedDir=null)
+    {
+        $dateFormat = LocaleService::getMessages()["date_format"];
+        $nodesList = new NodesList("/$rootPath/$relativePath");
+        $nodesList->initColumnsData("filelist", "list", "action.scheduler_list")
+            ->appendColumn("action.scheduler.12", "ajxp_label")
+            ->appendColumn("action.scheduler.2", "schedule")
+            ->appendColumn("action.scheduler.1", "action_name")
+            ->appendColumn("action.scheduler.4s", "repository_id")
+            ->appendColumn("action.scheduler.17", "user_id")
+            ->appendColumn("action.scheduler.3", "NEXT_EXECUTION")
+            ->appendColumn("action.scheduler.14", "LAST_EXECUTION")
+            ->appendColumn("action.scheduler.13", "STATUS");
+
+        $basePath = "/$rootPath/$relativePath";
+        $this->migrateLegacyTasks();
+        $tasks = TaskService::getInstance()->getScheduledTasks();
+        foreach($tasks as $task){
+
+            $node = $this->taskToNode($task, $basePath, $dateFormat);
+            $children = $task->getChildrenTasks();
+            $running = [];
+            /** @var \DateTime $lastRunDate */
+            $lastRunDate = null;
+            foreach ($children as $child){
+                if($child->getStatus() !== Task::STATUS_COMPLETE){
+                    $running[] = $child;
+                }
+                $runDate = $child->getStatusChangeDate();
+                if($runDate !== null && $lastRunDate <= $runDate){
+                    $lastRunDate = $runDate;
+                }
+            }
+            if(count($running)){
+                $node->mergeMetadata(["LAST_EXECUTION" => "Jobs running"]);
+            }
+            $nodesList->addBranch($node);
+            if($lastRunDate !== null){
+                $node->mergeMetadata(["LAST_EXECUTION" => $lastRunDate->format($dateFormat)]);
+            }
+            foreach($running as $cTask){
+                $nodesList->addBranch($this->taskToNode($cTask, $basePath, $dateFormat, true));
+            }
+
+        }
+
+        return $nodesList;
+
+    }
+
+    /**
+     * @param Task $task
+     * @param $basePath
+     * @param $dateFormat
+     * @param bool $isChild
+     * @return AJXP_Node
+     */
+    protected function taskToNode(Task $task, $basePath, $dateFormat, $isChild = false){
+
+        if($isChild){
+            $label = ($task->getStatus() === Task::STATUS_FAILED ? "JOB ERROR" : "JOB RUNNING");
+            $mime = ($task->getStatus() === Task::STATUS_FAILED ? "scheduler_error_task" : "scheduler_running_task");
+            $meta = [
+                "task_id"       => $task->getId(),
+                "icon"          => "scheduler/ICON_SIZE/task.png",
+                "ajxp_mime"     => $mime,
+                "text"          => $label,
+                "label"         => $label,
+                "schedule"      => $task->getStatusMessage(),
+                "action_name"   => "",
+                "repository_id" => "",
+                "user_id"       => "",
+                "STATUS"        => "",
+                "NEXT_EXECUTION"     => "",
+                "LAST_EXECUTION"     => "Started on ". $task->getCreationDate()->format($dateFormat),
+            ];
+        }else{
+            $s = $task->getSchedule()->getValue();
+            $meta = [
+                "task_id"       => $task->getId(),
+                "icon"          => "scheduler/ICON_SIZE/task.png",
+                "ajxp_mime"     =>  "scheduler_task",
+                "schedule"      => $s,
+                "text"          => $task->getLabel(),
+                "label"         => $task->getLabel(),
+                "action_name"   => $task->getAction(),
+                "repository_id" => $task->getWsId(),
+                "user_id"       => $task->getUserId(),
+                "parameters"    => json_encode($task->getParameters()),
+                "STATUS"        => $task->getStatusMessage()
+            ];
+            $cron = CronExpression::factory($s);
+            $next = $cron->getNextRunDate();
+            $meta["NEXT_EXECUTION"] = $next->format($dateFormat);
+            $meta["LAST_EXECUTION"] = "-";
+        }
+
+        $key = $basePath."/".$task->getId();
+        return new AJXP_Node($key, $meta);
+    }
+
+    /**
+     * Migrate old JSON file format to TaskService
+     */
+    protected function migrateLegacyTasks(){
+        $dbFile = $this->getDbFile();
+        if(!file_exists($dbFile)) return;
+        $tasks = FileHelper::loadSerialFile($dbFile, false, "json");
+        foreach ($tasks as $tData){
+            $t = new Task();
+            $t->setId(StringHelper::createGUID());
+            $t->setLabel($tData["label"]);
+            $t->setAction($tData["action_name"]);
+            $t->setParameters($tData["PARAMS"]);
+            $t->setSchedule(new Schedule(Schedule::TYPE_RECURRENT, $tData["schedule"]));
+            $t->setUserId($tData["user_id"]);
+            $t->setWsId($tData["repository_id"]);
+            $t->setType(Task::TYPE_ADMIN);
+            $t->setStatus(Task::STATUS_TEMPLATE);
+            $t->setStatusMessage("Scheduled");
+            TaskService::getInstance()->createTask($t, $t->getSchedule());
+        }
+        @unlink($dbFile);
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/action.share/class.CompositeShare.php b/core/src/plugins/action.share/class.CompositeShare.php
deleted file mode 100644
index 92fe74fbcc..0000000000
--- a/core/src/plugins/action.share/class.CompositeShare.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-/*
- * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-
-class CompositeShare
-{
-    /**
-     * @var AJXP_Node
-     */
-    protected $node;
-
-    /**
-     * @var string
-     */
-    protected $repositoryId;
-
-    /**
-     * @var Repository
-     */
-    protected $repository;
-
-    /**
-     * @var ShareLink[]
-     */
-    protected $shareLinks = array();
-
-    public function __construct($node, $repositoryId)
-    {
-        $this->node = $node;
-        $this->repositoryId = $repositoryId;
-    }
-
-    /**
-     * @return Repository
-     */
-    public function getRepository(){
-        if(!isSet($this->repository)){
-            $this->repository = ConfService::getRepositoryById($this->repositoryId);
-        }
-        return $this->repository;
-    }
-
-    /**
-     * @param ShareLink $link
-     */
-    public function addLink($link){
-        $this->shareLinks[] = $link;
-    }
-
-    /**
-     * @return string
-     */
-    public function getRepositoryId(){
-        return $this->repositoryId;
-    }
-
-    /**
-     * @return string
-     */
-    public function getOwner(){
-        $repo = $this->getRepository();
-        return $repo->getOwner();
-    }
-
-    /**
-     * @return string
-     */
-    public function getVisibilityScope(){
-        $repo = $this->getRepository();
-        if($repo !== null && isSet($repo->options["SHARE_ACCESS"]) && $repo->options["SHARE_ACCESS"] == "public"){
-            return "public";
-        }else{
-            return "private";
-        }
-    }
-
-    /**
-     * @return bool
-     */
-    public function isInvalid(){
-        return $this->getRepository() == null;
-    }
-
-    /**
-     * @param MetaWatchRegister|false $watcher
-     * @param ShareRightsManager $rightsManager
-     * @param PublicAccessManager $publicAccessManager
-     * @param array $messages
-     * @return array|false
-     */
-    public function toJson($watcher, $rightsManager, $publicAccessManager, $messages){
-
-        $repoRootNode = new AJXP_Node("pydio://".$this->getRepositoryId()."/");
-        $elementWatch = false;
-        if ($watcher != false) {
-            $elementWatch = $watcher->hasWatchOnNode(
-                $repoRootNode,
-                AuthService::getLoggedUser()->getId(),
-                MetaWatchRegister::$META_WATCH_NAMESPACE
-            );
-        }
-        $sharedEntries = $rightsManager->computeSharedRepositoryAccessRights($this->getRepositoryId(), true, $repoRootNode);
-        if(empty($sharedEntries)){
-            return false;
-        }
-        $cFilter = $this->getRepository()->getContentFilter();
-        if(!empty($cFilter)){
-            $cFilter = $cFilter->toArray();
-        }
-        $jsonData = array(
-            "repositoryId"  => $this->getRepositoryId(),
-            "users_number"  => AuthService::countUsersForRepository($this->getRepositoryId()),
-            "label"         => $this->getRepository()->getDisplay(),
-            "description"   => $this->getRepository()->getDescription(),
-            "entries"       => $sharedEntries,
-            "element_watch" => $elementWatch,
-            "repository_url"=> AJXP_Utils::getWorkspaceShortcutURL($this->getRepository())."/",
-            "content_filter"=> $cFilter,
-            "share_owner"   => $this->getOwner(),
-            "share_scope"    => $this->getVisibilityScope()
-        );
-        $jsonData["links"]  = array();
-        foreach ($this->shareLinks as $shareLink) {
-            $uniqueUser = $shareLink->getUniqueUser();
-            $found = false;
-            foreach($sharedEntries as $entry){
-                if($entry["ID"] == $uniqueUser) $found = true;
-            }
-            if(!$found){
-                // STRANGE, THE ASSOCIATED USER IS MISSING
-                error_log("Found shareLink orphan with uniqueUser ".$uniqueUser);
-                continue;
-            }
-            $jsonData["links"][$shareLink->getHash()] = $shareLink->getJsonData($publicAccessManager, $messages);
-        }
-        return $jsonData;
-
-    }
-
-}
\ No newline at end of file
diff --git a/core/src/plugins/action.share/class.LegacyPubliclet.php b/core/src/plugins/action.share/class.LegacyPubliclet.php
deleted file mode 100644
index b1224da604..0000000000
--- a/core/src/plugins/action.share/class.LegacyPubliclet.php
+++ /dev/null
@@ -1,474 +0,0 @@
-<?php
-/*
- * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-
-class LegacyPubliclet
-{
-
-    private static function renderError($data, $hash, $message = null){
-        require_once("class.MinisiteRenderer.php");
-        MinisiteRenderer::renderError($data, $hash, $message);
-    }
-
-    /**
-     * @param array $data
-     * @param array $options
-     * @param ShareStore $shareStore
-     */
-    public static function render($data, $options, $shareStore){
-
-        if(isset($data["SECURITY_MODIFIED"]) && $data["SECURITY_MODIFIED"] === true){
-            self::renderError($data, "false");
-            return;
-        }
-        // create driver from $data
-        $className = $data["DRIVER"]."AccessDriver";
-        $u = parse_url($_SERVER["REQUEST_URI"]);
-        $shortHash = pathinfo(basename($u["path"]), PATHINFO_FILENAME);
-
-        // Load language messages
-        $language = ConfService::getLanguage();
-        if (isSet($_GET["lang"])) {
-            $language = basename($_GET["lang"]);
-        }
-        $messages = array();
-        if (is_file(dirname(__FILE__)."/res/i18n/".$language.".php")) {
-            include(dirname(__FILE__)."/res/i18n/".$language.".php");
-        } else {
-            include(dirname(__FILE__)."/res/i18n/en.php");
-        }
-        if(isSet($mess)) {
-            $messages = $mess;
-        }
-
-        $AJXP_LINK_HAS_PASSWORD = false;
-        $AJXP_LINK_BASENAME = SystemTextEncoding::toUTF8(basename($data["FILE_PATH"]));
-        AJXP_PluginsService::getInstance()->initActivePlugins();
-
-        ConfService::setLanguage($language);
-        $mess = ConfService::getMessages();
-        if ($shareStore->isShareExpired($shortHash, $data))
-        {
-            self::renderError(array(), $shortHash, $mess["share_center.165"]);
-            return;
-        }
-
-
-        $customs = array("title", "legend", "legend_pass", "background_attributes_1","text_color", "background_color", "textshadow_color");
-        $images = array("button", "background_1");
-        $confs = $options;
-        $confs["CUSTOM_SHAREPAGE_BACKGROUND_ATTRIBUTES_1"] = "background-repeat:repeat;background-position:50% 50%;";
-        $confs["CUSTOM_SHAREPAGE_BACKGROUND_1"] = "plugins/action.share/res/hi-res/02.jpg";
-        $confs["CUSTOM_SHAREPAGE_TEXT_COLOR"] = "#ffffff";
-        $confs["CUSTOM_SHAREPAGE_TEXTSHADOW_COLOR"] = "rgba(0,0,0,5)";
-        foreach ($customs as $custom) {
-            $varName = "CUSTOM_SHAREPAGE_".strtoupper($custom);
-            $$varName = $confs[$varName];
-        }
-        $dlFolder = realpath(ConfService::getCoreConf("PUBLIC_DOWNLOAD_FOLDER"));
-        foreach ($images as $custom) {
-            $varName = "CUSTOM_SHAREPAGE_".strtoupper($custom);
-            if (!empty($confs[$varName])) {
-                if (strpos($confs[$varName], "plugins/") === 0 && is_file(AJXP_INSTALL_PATH."/".$confs[$varName])) {
-                    $realFile = AJXP_INSTALL_PATH."/".$confs[$varName];
-                    copy($realFile, $dlFolder."/binary-".basename($realFile));
-                    $$varName = "binary-".basename($realFile);
-                } else {
-                    $$varName = "binary-".$confs[$varName];
-                    if(is_file($dlFolder."/binary-".$confs[$varName])) continue;
-                    $copiedImageName = $dlFolder."/binary-".$confs[$varName];
-                    $imgFile = fopen($copiedImageName, "wb");
-                    ConfService::getConfStorageImpl()->loadBinary(array(), $confs[$varName], $imgFile);
-                    fclose($imgFile);
-                }
-
-            }
-        }
-
-        HTMLWriter::charsetHeader();
-        // Check password
-        if (strlen($data["PASSWORD"])) {
-            if (!isSet($_POST['password']) || ($_POST['password'] != $data["PASSWORD"])) {
-                $AJXP_LINK_HAS_PASSWORD = true;
-                $AJXP_LINK_WRONG_PASSWORD = (isSet($_POST['password']) && ($_POST['password'] != $data["PASSWORD"]));
-                include (AJXP_INSTALL_PATH."/plugins/action.share/res/public_links.php");
-                $res = ('<div style="position: absolute;z-index: 10000; bottom: 0; right: 0; color: #666;font-family: HelveticaNeue-Light,Helvetica Neue Light,Helvetica Neue,Helvetica,Arial,Lucida Grande,sans-serif;font-size: 13px;text-align: right;padding: 6px; line-height: 20px;text-shadow: 0px 1px 0px white;" class="no_select_bg"><br>Build your own box with Pydio : <a style="color: #000000;" target="_blank" href="http://pyd.io/">http://pyd.io/</a><br/>Community - Free non supported version © C. du Jeu 2008-2014 </div>');
-                AJXP_Controller::applyHook("tpl.filter_html", array(&$res));
-                echo($res);
-                return;
-            }
-        } else {
-            if (!isSet($_GET["dl"])) {
-                include (AJXP_INSTALL_PATH."/plugins/action.share/res/public_links.php");
-                $res = '<div style="position: absolute;z-index: 10000; bottom: 0; right: 0; color: #666;font-family: HelveticaNeue-Light,Helvetica Neue Light,Helvetica Neue,Helvetica,Arial,Lucida Grande,sans-serif;font-size: 13px;text-align: right;padding: 6px; line-height: 20px;text-shadow: 0px 1px 0px white;" class="no_select_bg"><br>Build your own box with Pydio : <a style="color: #000000;" target="_blank" href="http://pyd.io/">http://pyd.io/</a><br/>Community - Free non supported version © C. du Jeu 2008-2014 </div>';
-                AJXP_Controller::applyHook("tpl.filter_html", array(&$res));
-                echo($res);
-                return;
-            }
-        }
-        $filePath = AJXP_INSTALL_PATH."/plugins/access.".$data["DRIVER"]."/class.".$className.".php";
-        if (!is_file($filePath)) {
-            die("Warning, cannot find driver for conf storage! ($className, $filePath)");
-        }
-        require_once($filePath);
-        $driver = new $className($data["PLUGIN_ID"], $data["BASE_DIR"]);
-        $driver->loadManifest();
-
-        //$hash = md5(serialize($data));
-        $shareStore->incrementDownloadCounter($shortHash);
-
-        //AuthService::logUser($data["OWNER_ID"], "", true);
-        AuthService::logTemporaryUser($data["OWNER_ID"], $shortHash);
-        if (isSet($data["SAFE_USER"]) && isSet($data["SAFE_PASS"])) {
-            // FORCE SESSION MODE
-            AJXP_Safe::getInstance()->forceSessionCredentialsUsage();
-            AJXP_Safe::storeCredentials($data["SAFE_USER"], $data["SAFE_PASS"]);
-        }
-
-        $repoObject = $data["REPOSITORY"];
-        ConfService::switchRootDir($repoObject->getId());
-        ConfService::loadRepositoryDriver();
-        AJXP_PluginsService::getInstance()->initActivePlugins();
-        try {
-            $params = array("file" => SystemTextEncoding::toUTF8($data["FILE_PATH"]));
-            if (isSet($data["PLUGINS_DATA"])) {
-                $params["PLUGINS_DATA"] = $data["PLUGINS_DATA"];
-            }
-            if (isset($_GET["ct"]) && $_GET["ct"] == "true") {
-                $mime = pathinfo($params["file"], PATHINFO_EXTENSION);
-                $editors = AJXP_PluginsService::searchAllManifests("//editor[contains(@mimes,'$mime') and @previewProvider='true']", "node", true, true, false);
-                if (count($editors)) {
-                    foreach ($editors as $editor) {
-                        $xPath = new DOMXPath($editor->ownerDocument);
-                        $callbacks = $xPath->query("//action[@contentTypedProvider]", $editor);
-                        if ($callbacks->length) {
-                            $data["ACTION"] = $callbacks->item(0)->getAttribute("name");
-                            if($data["ACTION"] == "audio_proxy") $params["file"] = base64_encode($params["file"]);
-                            break;
-                        }
-                    }
-                }
-            }
-            AJXP_Controller::findActionAndApply($data["ACTION"], $params, null);
-            register_shutdown_function(array("AuthService", "clearTemporaryUser"), $shortHash);
-        } catch (Exception $e) {
-            AuthService::clearTemporaryUser($shortHash);
-            die($e->getMessage());
-        }
-
-    }
-
-
-    /** Cypher the publiclet object data and write to disk.
-     * @param array $data The publiclet data array to write
-    * The data array must have the following keys:
-    * - DRIVER      The driver used to get the file's content
-    * - OPTIONS     The driver options to be successfully constructed (usually, the user and password)
-    * - FILE_PATH   The path to the file's content
-    * - PASSWORD    If set, the written publiclet will ask for this password before sending the content
-    * - ACTION      If set, action to perform
-    * - USER        If set, the AJXP user
-    * - EXPIRE_TIME If set, the publiclet will deny downloading after this time, and probably self destruct.
-     *               - AUTHOR_WATCH If set, will post notifications for the publiclet author each time the file is loaded
-     * @param AbstractAccessDriver $accessDriver
-     * @param Repository $repository
-     * @param ShareStore $shareStore
-     * @param PublicAccessManager $publicAccessManager
-     * @return string|array An array containing the hash (0) and the generated url (1)
-     */
-    public function writePubliclet(&$data, $accessDriver, $repository, $shareStore, $publicAccessManager)
-    {
-        $downloadFolder = $publicAccessManager->getPublicDownloadFolder();
-        $publicAccessManager->initFolder();
-        if (!is_dir($downloadFolder)) {
-            return "ERROR : Public URL folder does not exist!";
-        }
-        if (!function_exists("mcrypt_create_iv")) {
-            return "ERROR : MCrypt must be installed to use publiclets!";
-        }
-        $data["PLUGIN_ID"] = $accessDriver->getId();
-        $data["BASE_DIR"] = $accessDriver->getBaseDir();
-        //$data["REPOSITORY"] = $repository;
-        if (AuthService::usersEnabled()) {
-            $data["OWNER_ID"] = AuthService::getLoggedUser()->getId();
-        }
-        $shareStore->storeSafeCredentialsIfNeeded($data, $accessDriver, $repository);
-
-        // Force expanded path in publiclet
-        $copy = clone $repository;
-        $copy->addOption("PATH", $repository->getOption("PATH"));
-        $data["REPOSITORY"] = $copy;
-        if ($data["ACTION"] == "") $data["ACTION"] = "download";
-
-        try{
-            $hash = $shareStore->storeShare($repository->getId(), $data, "publiclet");
-        }catch(Exception $e){
-            return $e->getMessage();
-        }
-
-        $shareStore->resetDownloadCounter($hash, AuthService::getLoggedUser()->getId());
-        $url = $publicAccessManager->buildPublicLink($hash);
-        AJXP_Logger::log2(LOG_LEVEL_INFO, __CLASS__, "New Share", array(
-            "file" => "'".$copy->display.":/".$data['FILE_PATH']."'",
-            "files" => "'".$copy->display.":/".$data['FILE_PATH']."'",
-            "url" => $url,
-            "expiration" => $data['EXPIRE_TIME'],
-            "limit" => $data['DOWNLOAD_LIMIT'],
-            "repo_uuid" => $copy->uuid
-        ));
-        AJXP_Controller::applyHook("node.share.create", array(
-            'type' => 'file',
-            'repository' => &$copy,
-            'accessDriver' => &$accessDriver,
-            'data' => &$data,
-            'url' => $url,
-        ));
-        return array($hash, $url);
-    }
-
-    /**
-     * @param string $shareId
-     * @param ShareStore $shareStore
-     * @param PublicAccessManager $publicAccessManager
-     * @param MetaWatchRegister|null $watcher
-     * @return array|false
-     * @throws Exception
-     */
-    public static function publicletToJson($shareId, $shareMeta, $shareStore, $publicAccessManager, $watcher, $node){
-
-        $messages = ConfService::getMessages();
-        $elementWatch = false;
-
-        $pData = $shareStore->loadShare($shareId);
-        if (!count($pData)) {
-            return false;
-        }
-        foreach($shareStore->modifiableShareKeys as $key){
-            if(isSet($pData[$key])) $shareMeta[$key] = $pData[$key];
-        }
-        if ($pData["OWNER_ID"] != AuthService::getLoggedUser()->getId() && !AuthService::getLoggedUser()->isAdmin()) {
-            throw new Exception($messages["share_center.48"]);
-        }
-        if (isSet($shareMeta["short_form_url"])) {
-            $link = $shareMeta["short_form_url"];
-        } else {
-            $link = $publicAccessManager->buildPublicLink($shareId);
-        }
-        if ($watcher != false && $node != null) {
-            $result = array();
-            $elementWatch = $watcher->hasWatchOnNode(
-                $node,
-                AuthService::getLoggedUser()->getId(),
-                MetaWatchRegister::$META_WATCH_USERS_NAMESPACE,
-                $result
-            );
-            if ($elementWatch && !in_array($shareId, $result)) {
-                $elementWatch = false;
-            }
-        }
-        $jsonData = array_merge(array(
-            "element_id"       => $shareId,
-            "publiclet_link"   => $link,
-            "download_counter" => $shareStore->getCurrentDownloadCounter($shareId),
-            "download_limit"   => $pData["DOWNLOAD_LIMIT"],
-            "expire_time"      => ($pData["EXPIRE_TIME"]!=0?date($messages["date_format"], $pData["EXPIRE_TIME"]):0),
-            "has_password"     => (!empty($pData["PASSWORD"])),
-            "element_watch"    => $elementWatch,
-            "is_expired"       => $shareStore->isShareExpired($shareId, $pData)
-        ), $shareMeta);
-
-        return $jsonData;
-    }
-
-    /**
-     * @param ShareCenter $shareCenter
-     * @param ShareStore $shareStore
-     * @param ShareRightsManager $shareRightManager
-     */
-    public static function migrateLegacyMeta($shareCenter, $shareStore, $shareRightManager, $dryRun = true){
-        $metaStoreDir = AJXP_DATA_PATH."/plugins/metastore.serial";
-        $publicFolder = ConfService::getCoreConf("PUBLIC_DOWNLOAD_FOLDER");
-        $metastores = glob($metaStoreDir."/ajxp_meta_0");
-        if($dryRun){
-            print("RUNNING A DRY RUN FOR META MIGRATION");
-        }
-        foreach($metastores as $store){
-            if(strpos($store, ".bak") !== false) continue;
-            // Backup store
-            if(!$dryRun){
-                copy($store, $store.".bak");
-            }
-
-            $data = unserialize(file_get_contents($store));
-            foreach($data as $filePath => &$metadata){
-
-
-
-                foreach($metadata as $userName => &$meta){
-                    if(!AuthService::userExists($userName)){
-                        continue;
-                    }
-                    $userObject = ConfService::getConfStorageImpl()->createUserObject($userName);
-
-                    if(isSet($meta["ajxp_shared"]) && isSet($meta["ajxp_shared"]["element"])){
-                        print("\n\nItem $filePath requires upgrade :");
-                        $share = $meta["ajxp_shared"];
-                        $element = $meta["ajxp_shared"]["element"];
-                        if(is_array($element)) $element = array_shift(array_keys($element));// Take the first one only
-                        $legacyLinkFile = $publicFolder."/".$element.".php";
-                        if(file_exists($legacyLinkFile)){
-                            // Load file, move it to DB and move the meta
-                            $publiclet = $shareStore->loadShare($element);
-                            rename($legacyLinkFile, $legacyLinkFile.".migrated");
-                            if(isSet($share["minisite"])){
-                                print("\n--Migrate legacy minisite to new minisite?");
-                                try{
-                                    $sharedRepoId = $publiclet["REPOSITORY"];
-                                    $sharedRepo = ConfService::getRepositoryById($sharedRepoId);
-                                    if($sharedRepo == null){
-                                        print("\n--ERROR: Cannot find repository with id ".$sharedRepoId);
-                                        continue;
-                                    }
-                                    $shareLink = new ShareLink($shareStore, $publiclet);
-                                    $user = $shareLink->getUniqueUser();
-                                    if(AuthService::userExists($user)){
-                                        $userObject = ConfService::getConfStorageImpl()->createUserObject($user);
-                                        $userObject->setHidden(true);
-                                        print("\n--Should set existing user $user as hidden");
-                                        if(!$dryRun){
-                                            $userObject->save();
-                                        }
-                                    }
-                                    $shareLink->parseHttpVars(["custom_handle" => $element]);
-                                    $shareLink->setParentRepositoryId($sharedRepo->getParentId());
-                                    print("\n--Creating the following share object");
-                                    print_r($shareLink->getJsonData($shareCenter->getPublicAccessManager(), ConfService::getMessages()));
-                                    if(!$dryRun){
-                                        $shareLink->save();
-                                    }
-                                    $meta["ajxp_shared"] = ["shares" => [$element => ["type" => "minisite"], $sharedRepoId => ["type" => "repository"]]];
-                                }catch(Exception $e){
-                                    print("\n-- Error ".$e->getMessage());
-                                }
-
-                            }else{
-                                print("\n--Should migrate legacy link to new minisite with ContentFilter");
-
-                                try{
-                                    $link = new ShareLink($shareStore);
-                                    $link->setOwnerId($userName);
-                                    $parameters = array("custom_handle" => $element, "simple_right_download" => true);
-                                    if(isSet($publiclet["EXPIRE_TIME"])) $parameters["expiration"] = $publiclet["EXPIRE_TIME"];
-                                    if(isSet($publiclet["DOWNLOAD_LIMIT"])) $parameters["downloadlimit"] = $publiclet["DOWNLOAD_LIMIT"];
-                                    $link->parseHttpVars($parameters);
-                                    $parentRepositoryObject = $publiclet["REPOSITORY"];
-
-                                    $driverInstance = AJXP_PluginsService::findPlugin("access", $parentRepositoryObject->getAccessType());
-                                    if(empty($driverInstance)){
-                                        print("\n-- ERROR: Cannot find driver instance!");
-                                        continue;
-                                    }
-                                    $options = $driverInstance->makeSharedRepositoryOptions(["file" => "/"], $parentRepositoryObject);
-                                    $options["SHARE_ACCESS"] = "private";
-                                    $newRepo = $parentRepositoryObject->createSharedChild(
-                                        basename($filePath),
-                                        $options,
-                                        $parentRepositoryObject->getId(),
-                                        $userObject->getId(),
-                                        null
-                                    );
-                                    $gPath = $userObject->getGroupPath();
-                                    if (!empty($gPath) && !ConfService::getCoreConf("CROSSUSERS_ALLGROUPS", "conf")) {
-                                        $newRepo->setGroupPath($gPath);
-                                    }
-                                    $newRepo->setDescription("");
-                                    // Smells like dirty hack!
-                                    $newRepo->options["PATH"] = SystemTextEncoding::fromStorageEncoding($newRepo->options["PATH"]);
-
-                                    $newRepo->setContentFilter(new ContentFilter([new AJXP_Node("pydio://".$parentRepositoryObject->getId().$filePath)]));
-                                    if(!$dryRun){
-                                        ConfService::addRepository($newRepo);
-                                    }
-
-                                    $hiddenUserEntry = $shareRightManager->prepareSharedUserEntry(
-                                        ["simple_right_read" => true, "simple_right_download" => true],
-                                        $link, false, null);
-
-                                    $selection = new UserSelection($parentRepositoryObject, []);
-                                    $selection->addFile($filePath);
-                                    if(!$dryRun){
-                                        $shareRightManager->assignSharedRepositoryPermissions(
-                                            $parentRepositoryObject,
-                                            $newRepo,
-                                            false,
-                                            [$hiddenUserEntry["ID"] => $hiddenUserEntry], [],
-                                            $selection
-                                        );
-                                    }
-                                    $link->setParentRepositoryId($parentRepositoryObject->getId());
-                                    $link->attachToRepository($newRepo->getId());
-                                    print("\n-- Should save following LINK: ");
-                                    print_r($link->getJsonData($shareCenter->getPublicAccessManager(), ConfService::getMessages()));
-                                    if(!$dryRun){
-                                        $hash = $link->save();
-                                    }
-
-                                    // UPDATE METADATA
-                                    $meta["ajxp_shared"] = ["shares" => [$element => array("type" => "minisite")]];
-
-                                }catch(Exception $e){
-                                    print("\n-- ERROR: ".$e->getMessage());
-                                }
-
-
-                            }
-                            if($dryRun){
-                                rename($legacyLinkFile.".migrated", $legacyLinkFile);
-                            }
-                            continue;
-                        }else{
-                            //
-                            // File does not exists, remove meta
-                            //
-                            unset($meta["ajxp_shared"]);
-                        }
-
-
-                        $repo = ConfService::getRepositoryById($element);
-                        if($repo !== null){
-                            print("\n--Shared repository: just metadata");
-                            // Shared repo, migrating the meta should be enough
-                            $meta["ajxp_shared"] = array("shares" => [$element => array("type" => "repository")]);
-                        }
-                    }
-                }
-            }
-            print("\n\n SHOULD NOW UPDATE METADATA WITH FOLLOWING :");
-            print_r($data);
-            if(!$dryRun){
-                file_put_contents($store, serialize($data));
-            }
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/core/src/plugins/action.share/class.MinisiteRenderer.php b/core/src/plugins/action.share/class.MinisiteRenderer.php
deleted file mode 100644
index 2b0cd1e16e..0000000000
--- a/core/src/plugins/action.share/class.MinisiteRenderer.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-/*
- * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-
-class MinisiteRenderer
-{
-    public static function renderError($data, $hash = '', $error = null){
-        self::loadMinisite($data, $hash, $error);
-    }
-
-    public static function loadMinisite($data, $hash = '', $error = null)
-    {
-        if(isset($data["SECURITY_MODIFIED"]) && $data["SECURITY_MODIFIED"] === true){
-            $mess = ConfService::getMessages();
-            $error = $mess['share_center.164'];
-        }
-        $repository = $data["REPOSITORY"];
-        AJXP_PluginsService::getInstance()->initActivePlugins();
-        $shareCenter = AJXP_PluginsService::findPlugin("action", "share");
-        $confs = $shareCenter->getConfigs();
-        $minisiteLogo = "plugins/gui.ajax/PydioLogo250.png";
-        if(!empty($confs["CUSTOM_MINISITE_LOGO"])){
-            $logoPath = $confs["CUSTOM_MINISITE_LOGO"];
-            if (strpos($logoPath, "plugins/") === 0 && is_file(AJXP_INSTALL_PATH."/".$logoPath)) {
-                $minisiteLogo = $logoPath;
-            }else{
-                $minisiteLogo = "index_shared.php?get_action=get_global_binary_param&binary_id=". $logoPath;
-            }
-        }
-        // Default value
-        if(isSet($data["AJXP_TEMPLATE_NAME"])){
-            $templateName = $data["AJXP_TEMPLATE_NAME"];
-            if($templateName == "ajxp_film_strip" && AJXP_Utils::userAgentIsMobile()){
-                $templateName = "ajxp_shared_folder";
-            }
-        }
-        if(isSet($repository)){
-            $repoObject = ConfService::getRepositoryById($repository);
-            if(!is_object($repoObject)){
-                $mess = ConfService::getMessages();
-                $error = $mess["share_center.166"];
-                $templateName = "ajxp_unique_strip";
-                $repoObject = null;
-            }
-        }
-        if(!isSet($templateName) && isSet($repoObject)){
-            $filter = $repoObject->getContentFilter();
-            if(!empty($filter) && count($filter->virtualPaths) == 1){
-                $templateName = "ajxp_unique_strip";
-            }else{
-                $templateName = "ajxp_shared_folder";
-            }
-        }
-        if(!isSet($templateName) && isSet($error)){
-            $templateName = "ajxp_unique_strip";
-        }
-        // UPDATE TEMPLATE
-        $html = file_get_contents(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/action.share/res/minisite.php");
-        AJXP_Controller::applyHook("tpl.filter_html", array(&$html));
-        $html = AJXP_XMLWriter::replaceAjxpXmlKeywords($html);
-        $html = str_replace("AJXP_MINISITE_LOGO", $minisiteLogo, $html);
-        $html = str_replace("AJXP_APPLICATION_TITLE", ConfService::getCoreConf("APPLICATION_TITLE"), $html);
-        $html = str_replace("PYDIO_APP_TITLE", ConfService::getCoreConf("APPLICATION_TITLE"), $html);
-        if(isSet($repository) && isSet($repoObject)){
-            $html = str_replace("AJXP_START_REPOSITORY", $repository, $html);
-            $html = str_replace("AJXP_REPOSITORY_LABEL", ConfService::getRepositoryById($repository)->getDisplay(), $html);
-        }
-        $html = str_replace('AJXP_HASH_LOAD_ERROR', isSet($error)?$error:'', $html);
-        $html = str_replace("AJXP_TEMPLATE_NAME", $templateName, $html);
-        $html = str_replace("AJXP_LINK_HASH", $hash, $html);
-        $guiConfigs = AJXP_PluginsService::findPluginById("gui.ajax")->getConfigs();
-        $html = str_replace("AJXP_THEME", $guiConfigs["GUI_THEME"] , $html);
-
-        if(isSet($_GET["dl"]) && isSet($_GET["file"])){
-            AuthService::$useSession = false;
-        }else{
-            session_name("AjaXplorer_Shared".str_replace(".","_",$hash));
-            session_start();
-            AuthService::disconnect();
-        }
-
-        if (!empty($data["PRELOG_USER"])) {
-            AuthService::logUser($data["PRELOG_USER"], "", true);
-            $html = str_replace("AJXP_PRELOGED_USER", "ajxp_preloged_user", $html);
-        } else if(isSet($data["PRESET_LOGIN"])) {
-            $_SESSION["PENDING_REPOSITORY_ID"] = $repository;
-            $_SESSION["PENDING_FOLDER"] = "/";
-            $html = str_replace("AJXP_PRELOGED_USER", $data["PRESET_LOGIN"], $html);
-        } else{
-            $html = str_replace("AJXP_PRELOGED_USER", "ajxp_legacy_minisite", $html);
-        }
-        if(isSet($hash)){
-            $_SESSION["CURRENT_MINISITE"] = $hash;
-        }
-
-        if(isSet($_GET["dl"]) && isSet($_GET["file"]) && (!isSet($data["DOWNLOAD_DISABLED"]) || $data["DOWNLOAD_DISABLED"] === false)){
-            ConfService::switchRootDir($repository);
-            ConfService::loadRepositoryDriver();
-            AJXP_PluginsService::deferBuildingRegistry();
-            AJXP_PluginsService::getInstance()->initActivePlugins();
-            AJXP_PluginsService::flushDeferredRegistryBuilding();
-            $errMessage = null;
-            try {
-                $params = $_GET;
-                $ACTION = "download";
-                if(isset($_GET["ct"])){
-                    $mime = pathinfo($params["file"], PATHINFO_EXTENSION);
-                    $editors = AJXP_PluginsService::searchAllManifests("//editor[contains(@mimes,'$mime') and @previewProvider='true']", "node", true, true, false);
-                    if (count($editors)) {
-                        foreach ($editors as $editor) {
-                            $xPath = new DOMXPath($editor->ownerDocument);
-                            $callbacks = $xPath->query("//action[@contentTypedProvider]", $editor);
-                            if ($callbacks->length) {
-                                $ACTION = $callbacks->item(0)->getAttribute("name");
-                                if($ACTION == "audio_proxy") {
-                                    $params["file"] = "base64encoded:".base64_encode($params["file"]);
-                                }
-                                break;
-                            }
-                        }
-                    }
-                }
-                AJXP_Controller::registryReset();
-                AJXP_Controller::findActionAndApply($ACTION, $params, null);
-            } catch (Exception $e) {
-                $errMessage = $e->getMessage();
-            }
-            if($errMessage == null) return;
-            $html = str_replace('AJXP_HASH_LOAD_ERROR', $errMessage, $html);
-        }
-
-        if (isSet($_GET["lang"])) {
-            $loggedUser = &AuthService::getLoggedUser();
-            if ($loggedUser != null) {
-                $loggedUser->setPref("lang", $_GET["lang"]);
-            } else {
-                setcookie("AJXP_lang", $_GET["lang"]);
-            }
-        }
-
-        if (!empty($data["AJXP_APPLICATION_BASE"])) {
-            $tPath = $data["AJXP_APPLICATION_BASE"];
-        } else {
-            $tPath = (!empty($data["TRAVEL_PATH_TO_ROOT"]) ? $data["TRAVEL_PATH_TO_ROOT"] : "../..");
-        }
-
-        $serverBaseUrl = AJXP_Utils::detectServerURL(true);
-
-        // Update Host dynamically if it differ from registered one.
-        $registeredHost = parse_url($tPath, PHP_URL_HOST);
-        $currentHost = parse_url($serverBaseUrl, PHP_URL_HOST);
-        if($registeredHost != $currentHost){
-            $tPath = str_replace($registeredHost, $currentHost, $tPath);
-        }
-        // Update scheme dynamically if it differ from registered one.
-        $registeredScheme = parse_url($tPath, PHP_URL_SCHEME);
-        $currentScheme = parse_url($serverBaseUrl, PHP_URL_SCHEME);
-        if($registeredScheme != $currentScheme){
-            $tPath = str_replace($registeredScheme."://", $currentScheme."://", $tPath);
-        }
-
-        $html = str_replace("AJXP_PATH_TO_ROOT", rtrim($tPath, "/")."/", $html);
-        HTMLWriter::internetExplorerMainDocumentHeader();
-        HTMLWriter::charsetHeader();
-        echo($html);
-    }
-
-}
\ No newline at end of file
diff --git a/core/src/plugins/action.share/class.PublicAccessManager.php b/core/src/plugins/action.share/class.PublicAccessManager.php
deleted file mode 100644
index 9eea4c9cd6..0000000000
--- a/core/src/plugins/action.share/class.PublicAccessManager.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/*
- * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-
-class PublicAccessManager
-{
-    /**
-     * @var array
-     */
-    private $options;
-
-    /**
-     * PublicFolderManager constructor.
-     * @param array $options Key => value options, currently supports only USE_REWRITE_RULE = true / false
-     */
-    public function __construct($options){
-        $this->options = $options;
-    }
-
-    /**
-     * Initialize download folder if not already done
-     */
-    public function initFolder()
-    {
-        $downloadFolder = $this->getPublicDownloadFolder();
-        $downloadUrl = $this->getPublicDownloadUrl();
-        if (is_file($downloadFolder."/grid_t.png")) {
-            return;
-        }
-        $pDir = dirname(__FILE__);
-        $messages = ConfService::getMessages();
-        $sTitle = sprintf($messages["action.share.1"], ConfService::getCoreConf("APPLICATION_TITLE"));
-        $sLegend = $messages["action.share.20"];
-
-        @copy($pDir."/res/dl.png", $downloadFolder."/dl.png");
-        @copy($pDir."/res/favi.png", $downloadFolder."/favi.png");
-        @copy($pDir."/res/grid_t.png", $downloadFolder."/grid_t.png");
-        @copy($pDir."/res/button_cancel.png", $downloadFolder."/button_cancel.png");
-        @copy(AJXP_INSTALL_PATH."/server/index.html", $downloadFolder."/index.html");
-        $htaccessContent = "Order Deny,Allow\nAllow from all\n";
-        $htaccessContent .= "\n<Files \".ajxp_*\">\ndeny from all\n</Files>\n";
-        $path = parse_url($downloadUrl, PHP_URL_PATH);
-        $htaccessContent .= '
-        <IfModule mod_rewrite.c>
-        RewriteEngine on
-        RewriteBase '.$path.'
-        RewriteCond %{REQUEST_FILENAME} !-f
-        RewriteCond %{REQUEST_FILENAME} !-d
-        RewriteRule ^([.a-zA-Z0-9_-]+)\.php$ share.php?hash=$1 [QSA]
-        RewriteRule ^([.a-zA-Z0-9_-]+)--([a-z-]+)$ share.php?hash=$1&lang=$2 [QSA]
-        RewriteRule ^([.a-zA-Z0-9_-]+)$ share.php?hash=$1 [QSA]
-        </IfModule>
-        ';
-        file_put_contents($downloadFolder."/.htaccess", $htaccessContent);
-        $content404 = file_get_contents($pDir."/res/404.html");
-        $content404 = str_replace(array("AJXP_MESSAGE_TITLE", "AJXP_MESSAGE_LEGEND"), array($sTitle, $sLegend), $content404);
-        file_put_contents($downloadFolder."/404.html", $content404);
-
-    }
-
-    /**
-     * Compute external link from the given hash
-     * @param string $hash
-     * @return string
-     */
-    public function buildPublicLink($hash)
-    {
-        $addLang = ConfService::getLanguage() != ConfService::getCoreConf("DEFAULT_LANGUAGE");
-        if ($this->options["USE_REWRITE_RULE"]) {
-            if($addLang) return $this->buildPublicDlURL()."/".$hash."--".ConfService::getLanguage();
-            else return $this->buildPublicDlURL()."/".$hash;
-        } else {
-            if($addLang) return $this->buildPublicDlURL()."/".$hash.".php?lang=".ConfService::getLanguage();
-            else return $this->buildPublicDlURL()."/".$hash.".php";
-        }
-    }
-
-    /**
-     * Compute base URL for external links
-     * @return mixed|string
-     */
-    public function buildPublicDlURL()
-    {
-        $downloadFolder = ConfService::getCoreConf("PUBLIC_DOWNLOAD_FOLDER");
-        $dlURL = ConfService::getCoreConf("PUBLIC_DOWNLOAD_URL");
-        if (!empty($dlURL)) {
-            $parts = parse_url($dlURL);
-            if($parts['scheme']) {
-                return rtrim($dlURL, "/");
-            } else {
-                $host = AJXP_Utils::detectServerURL();
-                return rtrim($host, "/")."/".trim($dlURL, "/");
-            }
-        } else {
-            $fullUrl = AJXP_Utils::detectServerURL(true);
-            return str_replace("\\", "/", rtrim($fullUrl, "/").rtrim(str_replace(AJXP_INSTALL_PATH, "", $downloadFolder), "/"));
-        }
-    }
-
-    public function computeMinisiteToServerURL()
-    {
-        $minisite = parse_url($this->buildPublicDlURL(), PHP_URL_PATH) ."/a.php";
-        $server = rtrim(parse_url( AJXP_Utils::detectServerURL(true), PHP_URL_PATH), "/");
-        return AJXP_Utils::getTravelPath($minisite, $server);
-    }
-
-    /**
-     * Get download folder path from configuration
-     * @return string
-     */
-    public function getPublicDownloadFolder(){
-        return ConfService::getCoreConf("PUBLIC_DOWNLOAD_FOLDER");
-    }
-
-    /**
-     * Build download folder URL from configuration and current URL
-     * @return string|null
-     */
-    public function getPublicDownloadUrl(){
-        $downloadFolder = ConfService::getCoreConf("PUBLIC_DOWNLOAD_FOLDER");
-        $dlURL = ConfService::getCoreConf("PUBLIC_DOWNLOAD_URL");
-        if (!empty($dlURL)) {
-            $parts = parse_url($dlURL);
-            if($parts['scheme']) {
-                return rtrim($dlURL, "/");
-            } else {
-                $host = AJXP_Utils::detectServerURL();
-                return rtrim($host, "/")."/".trim($dlURL, "/");
-            }
-        } else {
-            $fullUrl = AJXP_Utils::detectServerURL(true);
-            return str_replace("\\", "/", rtrim($fullUrl, "/").rtrim(str_replace(AJXP_INSTALL_PATH, "", $downloadFolder), "/"));
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/core/src/plugins/action.share/class.PublicletCounter.php b/core/src/plugins/action.share/class.PublicletCounter.php
deleted file mode 100644
index 0508099ed5..0000000000
--- a/core/src/plugins/action.share/class.PublicletCounter.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Download counter for publiclets
- * @package AjaXplorer_Plugins
- * @subpackage Action
- */
-class PublicletCounter
-{
-    private static $counters;
-
-    public static function getCount($publiclet)
-    {
-        $counters = self::loadCounters();
-        if(isSet($counters[$publiclet])) return $counters[$publiclet];
-        return 0;
-    }
-
-    public static function increment($publiclet)
-    {
-        if(!self::isActive()) return -1 ;
-        $counters = self::loadCounters();
-        if (!isSet($counters[$publiclet])) {
-            $counters[$publiclet]  = 0;
-        }
-        $counters[$publiclet] ++;
-        self::saveCounters($counters);
-        return $counters[$publiclet];
-    }
-
-    public static function reset($publiclet)
-    {
-        if(!self::isActive()) return -1 ;
-        $counters = self::loadCounters();
-        $counters[$publiclet]  = 0;
-        self::saveCounters($counters);
-    }
-
-    public static function delete($publiclet)
-    {
-        if(!self::isActive()) return -1 ;
-        $counters = self::loadCounters();
-        if (isSet($counters[$publiclet])) {
-            unset($counters[$publiclet]);
-            self::saveCounters($counters);
-        }
-    }
-
-    private static function isActive()
-    {
-        return (is_dir(ConfService::getCoreConf("PUBLIC_DOWNLOAD_FOLDER")) && is_writable(ConfService::getCoreConf("PUBLIC_DOWNLOAD_FOLDER")));
-    }
-
-    private static function loadCounters()
-    {
-        if (!isSet(self::$counters)) {
-            self::$counters = AJXP_Utils::loadSerialFile(ConfService::getCoreConf("PUBLIC_DOWNLOAD_FOLDER")."/.ajxp_publiclet_counters.ser");
-        }
-        return self::$counters;
-    }
-
-    private static function saveCounters($counters)
-    {
-        self::$counters = $counters;
-        AJXP_Utils::saveSerialFile(ConfService::getCoreConf("PUBLIC_DOWNLOAD_FOLDER")."/.ajxp_publiclet_counters.ser", $counters, false);
-    }
-
-}
diff --git a/core/src/plugins/action.share/class.ShareCenter.php b/core/src/plugins/action.share/class.ShareCenter.php
deleted file mode 100644
index 49be5a1fb8..0000000000
--- a/core/src/plugins/action.share/class.ShareCenter.php
+++ /dev/null
@@ -1,1915 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-require_once("class.CompositeShare.php");
-
-/**
- * @package AjaXplorer_Plugins
- * @subpackage Action
- */
-class ShareCenter extends AJXP_Plugin
-{
-    /**
-     * @var AbstractAccessDriver
-     */
-    private $accessDriver;
-    /**
-     * @var Repository
-     */
-    private $repository;
-    private $urlBase;
-
-    /**
-     * @var ShareStore
-     */
-    private $shareStore;
-
-    /**
-     * @var PublicAccessManager
-     */
-    private $publicAccessManager;
-
-    /**
-     * @var MetaWatchRegister
-     */
-    private $watcher = false;
-
-    /**
-     * @var ShareRightsManager
-     */
-    private $rightsManager;
-
-    /**************************/
-    /* PLUGIN LIFECYCLE METHODS
-    /**************************/
-    /**
-     * AJXP_Plugin initializer
-     * @param array $options
-     */
-    public function init($options)
-    {
-        parent::init($options);
-        $this->repository = ConfService::getRepository();
-        if (!is_a($this->repository->driverInstance, "AjxpWrapperProvider")) {
-            return;
-        }
-        $this->accessDriver = $this->repository->driverInstance;
-        $this->urlBase = "pydio://". $this->repository->getId();
-        if (array_key_exists("meta.watch", AJXP_PluginsService::getInstance()->getActivePlugins())) {
-            $this->watcher = AJXP_PluginsService::getInstance()->getPluginById("meta.watch");
-        }
-    }
-
-    /**
-     * Extend parent
-     * @param DOMNode $contribNode
-     */
-    protected function parseSpecificContributions(&$contribNode)
-    {
-        parent::parseSpecificContributions($contribNode);
-        $disableSharing = false;
-        $downloadFolder = ConfService::getCoreConf("PUBLIC_DOWNLOAD_FOLDER");
-        if ( empty($downloadFolder) || (!is_dir($downloadFolder) || !is_writable($downloadFolder))) {
-            $this->logError("Warning on public links, $downloadFolder is not writeable!", array("folder" => $downloadFolder, "is_dir" => is_dir($downloadFolder),"is_writeable" => is_writable($downloadFolder)));
-        }
-
-        $xpathesToRemove = array();
-
-        if( strpos(ConfService::getRepository()->getAccessType(), "ajxp_") === 0){
-
-            $xpathesToRemove[] = 'action[@name="share-file-minisite"]';
-            $xpathesToRemove[] = 'action[@name="share-folder-minisite-public"]';
-            $xpathesToRemove[] = 'action[@name="share-edit-shared"]';
-
-        }else if (AuthService::usersEnabled()) {
-
-            $loggedUser = AuthService::getLoggedUser();
-            if ($loggedUser != null && AuthService::isReservedUserId($loggedUser->getId())) {
-                $disableSharing = true;
-            }
-
-        } else {
-
-            $disableSharing = true;
-
-        }
-        if ($disableSharing) {
-            // All share- actions
-            $xpathesToRemove[] = 'action[contains(@name, "share-")]';
-        }else{
-            $folderSharingAllowed = $this->getAuthorization("folder", "any");
-            $fileSharingAllowed = $this->getAuthorization("file", "any");
-            if($fileSharingAllowed === false){
-                // Share file button
-                $xpathesToRemove[] = 'action[@name="share-file-minisite"]';
-            }
-            if(!$folderSharingAllowed){
-                // Share folder button
-                $xpathesToRemove[] = 'action[@name="share-folder-minisite-public"]';
-            }
-        }
-
-        foreach($xpathesToRemove as $xpath){
-            $actionXpath=new DOMXPath($contribNode->ownerDocument);
-            $nodeList = $actionXpath->query($xpath, $contribNode);
-            foreach($nodeList as $shareActionNode){
-                $contribNode->removeChild($shareActionNode);
-            }
-        }
-    }
-
-    /**************************/
-    /* UTILS & ACCESSORS
-    /**************************/
-    /**
-     * Compute right to create shares based on plugin options
-     * @param string $nodeType "file"|"folder"
-     * @param string $shareType "any"|"minisite"|"workspace"
-     * @return bool
-     */
-    protected function getAuthorization($nodeType, $shareType = "any"){
-        $filesMini = $this->getFilteredOption("ENABLE_FILE_PUBLIC_LINK");
-        $filesInternal = $this->getFilteredOption("ENABLE_FILE_INTERNAL_SHARING");
-        $foldersMini = $this->getFilteredOption("ENABLE_FOLDER_PUBLIC_LINK");
-        $foldersInternal = $this->getFilteredOption("ENABLE_FOLDER_INTERNAL_SHARING");
-        if($shareType == "any"){
-            return ($nodeType == "file" ? $filesInternal || $filesMini : $foldersInternal || $foldersMini);
-        }else if($shareType == "minisite"){
-            return ($nodeType == "file" ? $filesMini : $foldersMini);
-        }else if($shareType == "workspace"){
-            return ($nodeType == "file" ? $filesInternal : $foldersInternal);
-        }
-        return false;
-        /*
-        if($nodeType == "file"){
-            return $this->getFilteredOption("ENABLE_FILE_PUBLIC_LINK") !== false;
-        }else{
-            $opt = $this->getFilteredOption("ENABLE_FOLDER_SHARING");
-            if($shareType == "minisite"){
-                return ($opt == "minisite" || $opt == "both");
-            }else if($shareType == "workspace"){
-                return ($opt == "workspace" || $opt == "both");
-            }else{
-                return ($opt !== "disable");
-            }
-        }
-        */
-    }
-
-    /**
-     * @return ShareCenter
-     */
-    public static function getShareCenter(){
-        return AJXP_PluginsService::findPluginById("action.share");
-    }
-
-    public static function currentContextIsLinkDownload(){
-        return (isSet($_GET["dl"]) && isSet($_GET["dl"]) == "true");
-    }
-
-    /**
-     * Check if the hash seems to correspond to the serialized data.
-     * Kept there only for backward compatibility
-     * @static
-     * @param String $outputData serialized data
-     * @param String $hash Id to check
-     * @return bool
-     */
-    public static function checkHash($outputData, $hash)
-    {
-        // Never return false, otherwise it can break listing due to hardcore exit() call;
-        // Rechecked later
-        return true;
-
-        //$full = md5($outputData);
-        //return (!empty($hash) && strpos($full, $hash."") === 0);
-    }
-
-
-    /**
-     * @return ShareStore
-     */
-    public function getShareStore(){
-        if(!isSet($this->shareStore)){
-            require_once("class.ShareStore.php");
-            $hMin = 32;
-            if(isSet($this->repository)){
-                $hMin = $this->getFilteredOption("HASH_MIN_LENGTH", $this->repository);
-            }
-            $this->shareStore = new ShareStore(
-                ConfService::getCoreConf("PUBLIC_DOWNLOAD_FOLDER"),
-                $hMin
-            );
-        }
-        return $this->shareStore;
-    }
-
-    /**
-     * @return PublicAccessManager
-     */
-    public function getPublicAccessManager(){
-
-        if(!isSet($this->publicAccessManager)){
-            require_once("class.PublicAccessManager.php");
-            $options = array(
-                "USE_REWRITE_RULE" => $this->getFilteredOption("USE_REWRITE_RULE", $this->repository) == true
-            );
-            $this->publicAccessManager = new PublicAccessManager($options);
-        }
-        return $this->publicAccessManager;
-
-    }
-
-    /**
-     * @param AJXP_Node $ajxpNode
-     * @return boolean
-     */
-    public function isShared($ajxpNode)
-    {
-        $shares = array();
-        $this->getShareStore()->getMetaManager()->getSharesFromMeta($ajxpNode, $shares, true);
-        return count($shares) > 0;
-    }
-
-    /**
-     * @return ShareRightsManager
-     */
-    protected function getRightsManager(){
-        if(!isSet($this->rightsManager)){
-            require_once("class.ShareRightsManager.php");
-            $options = array(
-                "SHARED_USERS_TMP_PREFIX" => $this->getFilteredOption("SHARED_USERS_TMP_PREFIX", $this->repository),
-                "SHARE_FORCE_PASSWORD" => $this->getFilteredOption("SHARE_FORCE_PASSWORD", $this->repository)
-            );
-            $this->rightsManager = new ShareRightsManager(
-                $options,
-                $this->getShareStore(),
-                $this->watcher);
-        }
-        return $this->rightsManager;
-    }
-
-    /**
-     * Update parameter value based on current max allowed option.
-     * @param array $httpVars
-     * @param string $parameterName
-     * @param string $optionName
-     */
-    protected function updateToMaxAllowedValue(&$httpVars, $parameterName, $optionName){
-
-        $maxvalue = abs(intval($this->getFilteredOption($optionName, $this->repository)));
-        $value = isset($httpVars[$parameterName]) ? abs(intval($httpVars[$parameterName])) : 0;
-        if ($maxvalue == 0) {
-            $httpVars[$parameterName] = $value;
-        } elseif ($maxvalue > 0 && $value == 0) {
-            $httpVars[$parameterName] = $maxvalue;
-        } else {
-            $httpVars[$parameterName] = min($value,$maxvalue);
-        }
-
-    }
-
-    /**
-     * @param $label
-     * @param Repository|null $editingRepo
-     * @return bool
-     */
-    protected function checkRepoWithSameLabel($label, $editingRepo = null){
-        if ( $this->getFilteredOption("AVOID_SHARED_FOLDER_SAME_LABEL", $this->repository) == true) {
-            $count = 0;
-            $similarLabelRepos = ConfService::listRepositoriesWithCriteria(array("display" => $label), $count);
-            if($count && !isSet($editingRepo)){
-                return true;
-            }
-            if($count && isSet($editingRepo)){
-                foreach($similarLabelRepos as $slr){
-                    if($slr->getUniqueId() != $editingRepo->getUniqueId()){
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    protected function toggleWatchOnSharedRepository($childRepoId, $userId, $toggle = true, $parentUserId = null){
-        if ($this->watcher === false || AuthService::getLoggedUser() == null) {
-            return;
-        }
-        $rootNode = new AJXP_Node("pydio://".$childRepoId."/");
-        // Register a watch on the current folder for shared user
-        if($parentUserId !== null){
-            if ($toggle) {
-                $this->watcher->setWatchOnFolder(
-                    $rootNode,
-                    $userId,
-                    MetaWatchRegister::$META_WATCH_USERS_CHANGE,
-                    array($parentUserId)
-                );
-            } else {
-                $this->watcher->removeWatchFromFolder(
-                    $rootNode,
-                    $userId,
-                    true
-                );
-            }
-        }else{
-            // Register a watch on the new repository root for current user
-            if ($toggle) {
-
-                $this->watcher->setWatchOnFolder(
-                    $rootNode,
-                    $userId,
-                    MetaWatchRegister::$META_WATCH_BOTH);
-
-            } else {
-
-                $this->watcher->removeWatchFromFolder(
-                    $rootNode,
-                    $userId);
-            }
-
-        }
-
-    }
-
-    /**************************/
-    /* CALLBACKS FOR ACTIONS
-    /**************************/
-    /**
-     * Added as preprocessor on Download action to handle download Counter.
-     * @param string $action
-     * @param array $httpVars
-     * @param array $fileVars
-     * @throws Exception
-     */
-    public function preProcessDownload($action, &$httpVars, &$fileVars){
-        if(isSet($_SESSION["CURRENT_MINISITE"])){
-            $this->logDebug(__FUNCTION__, "Do something here!");
-            $hash = $_SESSION["CURRENT_MINISITE"];
-            $share = $this->getShareStore()->loadShare($hash);
-            if(!empty($share)){
-                if($this->getShareStore()->isShareExpired($hash, $share)){
-                    throw new Exception('Link is expired');
-                }
-                if(!empty($share["DOWNLOAD_LIMIT"])){
-                    $this->getShareStore()->incrementDownloadCounter($hash);
-                }
-            }
-        }
-    }
-
-    public function migrateLegacyShares($action, $httpVars, $fileVars){
-        require_once("class.LegacyPubliclet.php");
-        LegacyPubliclet::migrateLegacyMeta($this, $this->getShareStore(), $this->getRightsManager(), $httpVars["dry_run"] !== "run");
-    }
-    
-    /**
-     * Main callback for all share- actions.
-     * @param string $action
-     * @param array $httpVars
-     * @param array $fileVars
-     * @return null
-     * @throws Exception
-     */
-    public function switchAction($action, $httpVars, $fileVars)
-    {
-        if (strpos($action, "sharelist") === false && !isSet($this->accessDriver)) {
-            throw new Exception("Cannot find access driver!");
-        }
-
-
-        if (strpos($action, "sharelist") === false && $this->accessDriver->getId() == "access.demo") {
-            $errorMessage = "This is a demo, all 'write' actions are disabled!";
-            if ($httpVars["sub_action"] == "delegate_repo") {
-                return AJXP_XMLWriter::sendMessage(null, $errorMessage, false);
-            } else {
-                print($errorMessage);
-            }
-            return null;
-        }
-
-
-        switch ($action) {
-
-            //------------------------------------
-            // SHARING FILE OR FOLDER
-            //------------------------------------
-            case "share":
-
-                $subAction = (isSet($httpVars["sub_action"])?$httpVars["sub_action"]:"");
-                // REST API COMPATIBILITY
-                if(empty($subAction) && isSet($httpVars["simple_share_type"])){
-                    $subAction = "create_minisite";
-                    if(!isSet($httpVars["simple_right_read"]) && !isSet($httpVars["simple_right_download"])){
-                        $httpVars["simple_right_read"] = $httpVars["simple_right_download"] = "true";
-                    }
-                    $httpVars["create_guest_user"] = "true";
-                    if($httpVars["simple_share_type"] == "private" && !isSet($httpVars["guest_user_pass"])){
-                        throw new Exception("Please provide a guest_user_pass for private link");
-                    }
-                }
-                $userSelection = new UserSelection(ConfService::getRepository(), $httpVars);
-                $ajxpNode = $userSelection->getUniqueNode();
-                if (!file_exists($ajxpNode->getUrl())) {
-                    throw new Exception("Cannot share a non-existing file: ".$ajxpNode->getUrl());
-                }
-
-                $this->updateToMaxAllowedValue($httpVars, "downloadlimit", "FILE_MAX_DOWNLOAD");
-                $this->updateToMaxAllowedValue($httpVars, "expiration", "FILE_MAX_EXPIRATION");
-
-                $httpHash = null;
-                $originalHash = null;
-
-                if(!isSet($httpVars["share_scope"]) || !in_array($httpVars["share_scope"], array("public", "private"))){
-                    $httpVars["share_scope"] = "private";
-                }
-                $shareScope = $httpVars["share_scope"];
-                $plainResult = 'unknown sub_action';
-
-                if ($subAction == "delegate_repo") {
-
-                    $auth = $this->getAuthorization("folder", "workspace");
-                    if(!$auth){
-                        $mess = ConfService::getMessages();
-                        throw new Exception($mess["351"]);
-                    }
-
-                    $users = array(); $groups = array();
-                    $this->getRightsManager()->createUsersFromParameters($httpVars, $users, $groups);
-
-                    $result = $this->createSharedRepository($httpVars, $isUpdate, $users, $groups);
-
-                    if (is_a($result, "Repository")) {
-
-                        if(!$isUpdate){
-                            $this->getShareStore()->storeShare($this->repository->getId(), array(
-                                "REPOSITORY" => $result->getUniqueId(),
-                                "OWNER_ID" => AuthService::getLoggedUser()->getId()), "repository");
-                        }
-
-                        AJXP_Controller::applyHook( ($isUpdate ? "node.share.update" : "node.share.create"), array(
-                            'type' => 'repository',
-                            'repository' => &$this->repository,
-                            'accessDriver' => &$this->accessDriver,
-                            'new_repository' => &$result
-                        ));
-
-                        if ($ajxpNode->hasMetaStore() && !$ajxpNode->isRoot()) {
-                            $this->getShareStore()->getMetaManager()->addShareInMeta(
-                                $ajxpNode,
-                                "repository",
-                                $result->getUniqueId(),
-                                ($shareScope == "public"),
-                                $originalHash
-                            );
-                        }
-
-                        $plainResult = 200;
-                    } else {
-                        $plainResult = $result;
-                    }
-
-                } else if ($subAction == "create_minisite") {
-
-                    if(isSet($httpVars["hash"]) && !empty($httpVars["hash"])) $httpHash = $httpVars["hash"];
-
-                    $result = $this->createSharedMinisite($httpVars, $isUpdate);
-
-                    if (!is_array($result)) {
-                        $url = $result;
-                    } else {
-                        list($hash, $url) = $result;
-                        if ($ajxpNode->hasMetaStore() && !$ajxpNode->isRoot()) {
-                            $this->getShareStore()->getMetaManager()->addShareInMeta(
-                                $ajxpNode,
-                                "minisite",
-                                $hash,
-                                ($shareScope == "public"),
-                                ($httpHash != null && $hash != $httpHash) ? $httpHash : null
-                            );
-                        }
-
-                    }
-                    $plainResult = $url;
-
-                } else if ($subAction == "share_node"){
-
-                    $httpVars["return_json"] = true;
-                    if(isSet($httpVars["hash"]) && !empty($httpVars["hash"])) $httpHash = $httpVars["hash"];
-                    $ajxpNode->loadNodeInfo();
-
-                    $results = $this->shareNode($ajxpNode, $httpVars, $isUpdate);
-                    if(is_array($results) && $ajxpNode->hasMetaStore() && !$ajxpNode->isRoot()){
-                        foreach($results as $shareObject){
-                            if($shareObject instanceof \Pydio\OCS\Model\TargettedLink){
-                                $hash = $shareObject->getHash();
-                                $this->getShareStore()->getMetaManager()->addShareInMeta(
-                                    $ajxpNode,
-                                    "ocs_remote",
-                                    $hash,
-                                    ($shareScope == "public"),
-                                    $hash
-                                );
-                            }else if(is_a($shareObject, "ShareLink")){
-                                $hash = $shareObject->getHash();
-                                $this->getShareStore()->getMetaManager()->addShareInMeta(
-                                    $ajxpNode,
-                                    "minisite",
-                                    $hash,
-                                    ($shareScope == "public"),
-                                    ($httpHash != null && $hash != $httpHash) ? $httpHash : null
-                                );
-                            }else if(is_a($shareObject, "Repository")){
-                                $this->getShareStore()->getMetaManager()->addShareInMeta(
-                                    $ajxpNode,
-                                    "repository",
-                                    $shareObject->getUniqueId(),
-                                    ($shareScope == "public"),
-                                    null
-                                );
-                            }
-                        }
-
-                    }
-                }
-
-
-                AJXP_Controller::applyHook("msg.instant", array("<reload_shared_elements/>", ConfService::getRepository()->getId()));
-                /*
-                 * Send IM to inform that node has been shared or unshared.
-                 * Should be done only if share scope is public.
-                 */
-                if($shareScope == "public"){
-                    $ajxpNode->loadNodeInfo();
-                    $content = AJXP_XMLWriter::writeNodesDiff(["UPDATE" => array($ajxpNode->getPath() => $ajxpNode)]);
-                    AJXP_Controller::applyHook("msg.instant", array($content, $ajxpNode->getRepositoryId(), null, null, [$ajxpNode->getPath()]));
-                }
-
-                if(!isSet($httpVars["return_json"])){
-                    header("Content-Type: text/plain");
-                    print($plainResult);
-                }else{
-                    $compositeShare = $this->getShareStore()->getMetaManager()->getCompositeShareForNode($ajxpNode);
-                    header("Content-type:application/json");
-                    if(!empty($compositeShare)){
-                        echo json_encode($this->compositeShareToJson($compositeShare));
-                    }else{
-                        echo json_encode(array());
-                    }
-                }
-                // as the result can be quite small (e.g error code), make sure it's output in case of OB active.
-                flush();
-
-                break;
-
-            case "toggle_link_watch":
-
-                $userSelection = new UserSelection($this->repository, $httpVars);
-                $shareNode = $selectedNode = $userSelection->getUniqueNode();
-                $watchValue = $httpVars["set_watch"] == "true" ? true : false;
-                $folder = false;
-                if (isSet($httpVars["element_type"]) && $httpVars["element_type"] == "folder") {
-                    $folder = true;
-                    $selectedNode = new AJXP_Node("pydio://". AJXP_Utils::sanitize($httpVars["repository_id"], AJXP_SANITIZE_ALPHANUM)."/");
-                }
-                $shares = array();
-                $this->getShareStore()->getMetaManager()->getSharesFromMeta($shareNode, $shares, false);
-                if(!count($shares)){
-                    break;
-                }
-
-                if(isSet($httpVars["element_id"]) && isSet($shares[$httpVars["element_id"]])){
-                    $elementId = $httpVars["element_id"];
-                }else{
-                    $sKeys = array_keys($shares);
-                    $elementId = $sKeys[0];
-                }
-
-                if ($this->watcher !== false) {
-                    if (!$folder) {
-                        if ($watchValue) {
-                            $this->watcher->setWatchOnFolder(
-                                $selectedNode,
-                                AuthService::getLoggedUser()->getId(),
-                                MetaWatchRegister::$META_WATCH_USERS_READ,
-                                array($elementId)
-                            );
-                        } else {
-                            $this->watcher->removeWatchFromFolder(
-                                $selectedNode,
-                                AuthService::getLoggedUser()->getId(),
-                                true,
-                                $elementId
-                            );
-                        }
-                    } else {
-                        if ($watchValue) {
-                            $this->watcher->setWatchOnFolder(
-                                $selectedNode,
-                                AuthService::getLoggedUser()->getId(),
-                                MetaWatchRegister::$META_WATCH_BOTH
-                            );
-                        } else {
-                            $this->watcher->removeWatchFromFolder(
-                                $selectedNode,
-                                AuthService::getLoggedUser()->getId());
-                        }
-                    }
-                }
-                $mess = ConfService::getMessages();
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::sendMessage($mess["share_center.47"], null);
-                AJXP_XMLWriter::close();
-
-            break;
-
-            case "load_shared_element_data":
-
-                $node = null;
-                if(isSet($httpVars["hash"]) && $httpVars["element_type"] == "file"){
-
-                    // LEGACY LINKS
-                    $parsedMeta = array($httpVars["hash"] => array("type" => "file"));
-                    $jsonData = array();
-                    foreach($parsedMeta as $shareId => $shareMeta){
-                        $jsonData[] = $this->shareToJson($shareId, $shareMeta, $node);
-                    }
-                    header("Content-type:application/json");
-                    echo json_encode($jsonData);
-
-                }else{
-
-                    $file = AJXP_Utils::decodeSecureMagic($httpVars["file"]);
-                    $node = new AJXP_Node($this->urlBase.$file);
-                    $loggedUser = AuthService::getLoggedUser();
-                    if(isSet($httpVars["owner"]) && $loggedUser->isAdmin()
-                        && $loggedUser->getGroupPath() == "/" && $loggedUser->getId() != AJXP_Utils::sanitize($httpVars["owner"], AJXP_SANITIZE_EMAILCHARS)){
-                        // Impersonate the current user
-                        $node->setUser(AJXP_Utils::sanitize($httpVars["owner"], AJXP_SANITIZE_EMAILCHARS));
-                    }
-                    if(!file_exists($node->getUrl())){
-                        $mess = ConfService::getMessages();
-                        throw new Exception(str_replace('%s', "Cannot find file ".$file, $mess["share_center.219"]));
-                    }
-                    if(isSet($httpVars["tmp_repository_id"]) && AuthService::getLoggedUser()->isAdmin()){
-                        $compositeShare = $this->getShareStore()->getMetaManager()->getCompositeShareForNode($node, true);
-                    }else{
-                        $compositeShare = $this->getShareStore()->getMetaManager()->getCompositeShareForNode($node);
-                    }
-                    if(empty($compositeShare)){
-                        $mess = ConfService::getMessages();
-                        throw new Exception(str_replace('%s', "Cannot find share for node ".$file, $mess["share_center.219"]));
-                    }
-                    header("Content-type:application/json");
-                    $json = $this->compositeShareToJson($compositeShare);
-                    echo json_encode($json);
-
-                }
-
-
-            break;
-
-            case "unshare":
-
-                $mess = ConfService::getMessages();
-                $userSelection = new UserSelection($this->repository, $httpVars);
-                if(isSet($httpVars["hash"])){
-                    $sanitizedHash = AJXP_Utils::sanitize($httpVars["hash"], AJXP_SANITIZE_ALPHANUM);
-                    $ajxpNode = ($userSelection->isEmpty() ? null : $userSelection->getUniqueNode());
-                    $result = $this->getShareStore()->deleteShare($httpVars["element_type"], $sanitizedHash, false, false, $ajxpNode);
-                    if($result !== false){
-                        AJXP_XMLWriter::header();
-                        AJXP_XMLWriter::sendMessage($mess["share_center.216"], null);
-                        AJXP_XMLWriter::close();
-                    }
-
-                }else{
-
-                    $userSelection = new UserSelection($this->repository, $httpVars);
-                    $ajxpNode = $userSelection->getUniqueNode();
-                    $shares = array();
-                    $this->getShareStore()->getMetaManager()->getSharesFromMeta($ajxpNode, $shares, false);
-                    if(isSet($httpVars["element_id"]) && isSet($shares[$httpVars["element_id"]])){
-                        $elementId = $httpVars["element_id"];
-                        if(isSet($shares[$elementId])){
-                            $shares = array($elementId => $shares[$elementId]);
-                        }
-                    }
-                    if(count($shares)){
-                        $res = true;
-                        foreach($shares as $shareId =>  $share){
-                            $t = isSet($share["type"]) ? $share["type"] : "file";
-                            try{
-                                $result = $this->getShareStore()->deleteShare($t, $shareId, false, true);
-                            }catch(Exception $e){
-                                if($e->getMessage() == "repo-not-found"){
-                                    $result = true;
-                                }else{
-                                    throw $e;
-                                }
-                            }
-                            $this->getShareStore()->getMetaManager()->removeShareFromMeta($ajxpNode, $shareId);
-                            $res = $result && $res;
-                        }
-                        if($res !== false){
-                            AJXP_XMLWriter::header();
-                            AJXP_XMLWriter::sendMessage($mess["share_center.216"], null);
-                            AJXP_XMLWriter::close();
-                            AJXP_Controller::applyHook("msg.instant", array("<reload_shared_elements/>", ConfService::getRepository()->getId()));
-
-                            if(isSet($httpVars["share_scope"]) &&  $httpVars["share_scope"] == "public"){
-                                $ajxpNode->loadNodeInfo();
-                                $content = AJXP_XMLWriter::writeNodesDiff(["UPDATE" => [$ajxpNode->getPath() => $ajxpNode]]);
-                                AJXP_Controller::applyHook("msg.instant", array($content, $ajxpNode->getRepositoryId(), null, null, [$ajxpNode->getPath()]));
-                            }
-
-                        }
-                    }
-
-                }
-                break;
-
-            case "reset_counter":
-
-                if(isSet($httpVars["hash"])){
-
-                    $userId = AuthService::getLoggedUser()->getId();
-                    if(isSet($httpVars["owner_id"]) && $httpVars["owner_id"] != $userId){
-                        if(!AuthService::getLoggedUser()->isAdmin()){
-                            throw new Exception("You are not allowed to access this resource");
-                        }
-                        $userId = $httpVars["owner_id"];
-                    }
-                    $this->getShareStore()->resetDownloadCounter($httpVars["hash"], $userId);
-
-                }else{
-
-                    $userSelection = new UserSelection($this->repository, $httpVars);
-                    $ajxpNode = $userSelection->getUniqueNode();
-                    $metadata = $this->getShareStore()->getMetaManager()->getNodeMeta($ajxpNode);
-                    if(!isSet($metadata["shares"]) || !is_array($metadata["shares"])){
-                        return null;
-                    }
-                    if ( isSet($httpVars["element_id"]) && isSet($metadata["shares"][$httpVars["element_id"]])) {
-                        $this->getShareStore()->resetDownloadCounter($httpVars["element_id"], $httpVars["owner_id"]);
-                    }else{
-                        $keys = array_keys($metadata["shares"]);
-                        foreach($keys as $key){
-                            $this->getShareStore()->resetDownloadCounter($key, null);
-                        }
-                    }
-
-                }
-
-            break;
-
-            case "update_shared_element_data":
-
-                if(!in_array($httpVars["p_name"], array("counter", "tags"))){
-                    return null;
-                }
-                $hash = AJXP_Utils::decodeSecureMagic($httpVars["element_id"]);
-                $userSelection = new UserSelection($this->repository, $httpVars);
-                $ajxpNode = $userSelection->getUniqueNode();
-                if($this->getShareStore()->shareIsLegacy($hash)){
-                    // Store in metadata
-                    $metadata = $this->getShareStore()->getMetaManager()->getNodeMeta($ajxpNode);
-                    if (isSet($metadata["shares"][$httpVars["element_id"]])) {
-                        if (!is_array($metadata["shares"][$httpVars["element_id"]])) {
-                            $metadata["shares"][$httpVars["element_id"]] = array();
-                        }
-                        $metadata["shares"][$httpVars["element_id"]][$httpVars["p_name"]] = $httpVars["p_value"];
-                        // Set Private=true by default.
-                        $this->getShareStore()->getMetaManager()->setNodeMeta($ajxpNode, $metadata, true);
-                    }
-                }else{
-                    // TODO: testUserCanEditShare ?
-                    $this->getShareStore()->updateShareProperty($hash, $httpVars["p_name"], $httpVars["p_value"]);
-                }
-
-
-                break;
-
-            case "sharelist-load":
-
-                $parentRepoId = isset($httpVars["parent_repository_id"]) ? $httpVars["parent_repository_id"] : "";
-                $userContext = $httpVars["user_context"];
-                $currentUser = true;
-                if($userContext == "global" && AuthService::getLoggedUser()->isAdmin()){
-                    $currentUser = false;
-                }else if($userContext == "user" && AuthService::getLoggedUser()->isAdmin() && !empty($httpVars["user_id"])){
-                    $currentUser = AJXP_Utils::sanitize($httpVars["user_id"], AJXP_SANITIZE_EMAILCHARS);
-                }
-                $nodes = $this->listSharesAsNodes("/data/repositories/$parentRepoId/shares", $currentUser, $parentRepoId);
-
-                AJXP_XMLWriter::header();
-                if($userContext == "current"){
-                    AJXP_XMLWriter::sendFilesListComponentConfig('<columns template_name="ajxp_user.shares">
-                    <column messageId="ajxp_conf.8" attributeName="ajxp_label" sortType="String"/>
-                    <column messageId="share_center.132" attributeName="shared_element_parent_repository_label" sortType="String"/>
-                    <column messageId="3" attributeName="share_type_readable" sortType="String"/>
-                    </columns>');
-                }else{
-                    AJXP_XMLWriter::sendFilesListComponentConfig('<columns switchDisplayMode="list" switchGridMode="filelist" template_name="ajxp_conf.repositories">
-                    <column messageId="ajxp_conf.8" attributeName="ajxp_label" sortType="String"/>
-                    <column messageId="share_center.159" attributeName="owner" sortType="String"/>
-                    <column messageId="3" attributeName="share_type_readable" sortType="String"/>
-                    <column messageId="share_center.52" attributeName="share_data" sortType="String"/>
-                    </columns>');
-                }
-
-                foreach($nodes as $node){
-                    AJXP_XMLWriter::renderAjxpNode($node);
-                }
-                AJXP_XMLWriter::close();
-
-            break;
-
-            case "sharelist-clearExpired":
-
-                $accessType = ConfService::getRepository()->getAccessType();
-                $currentUser  = ($accessType != "ajxp_conf" && $accessType != "ajxp_admin");
-                $count = $this->getShareStore()->clearExpiredFiles($currentUser);
-                AJXP_XMLWriter::header();
-                if($count){
-                    AJXP_XMLWriter::sendMessage("Removed ".count($count)." expired links", null);
-                }else{
-                    AJXP_XMLWriter::sendMessage("Nothing to do", null);
-                }
-                AJXP_XMLWriter::close();
-
-            break;
-
-            default:
-            break;
-        }
-
-        return null;
-
-    }
-
-    /**************************/
-    /* CALLBACKS FOR HOOKS
-    /**************************/
-    /**
-     * Hook node.info
-     * @param AJXP_Node $ajxpNode
-     * @return void
-     */
-    public function nodeSharedMetadata(&$ajxpNode)
-    {
-        if(empty($this->accessDriver) || $this->accessDriver->getId() == "access.imap") return;
-        $shares = array();
-        $this->getShareStore()->getMetaManager()->getSharesFromMeta($ajxpNode, $shares, false);
-        if(!empty($shares)){
-            $compositeShare = $this->getShareStore()->getMetaManager()->getCompositeShareForNode($ajxpNode);
-            if(empty($compositeShare) || $compositeShare->isInvalid()){
-                //$this->getShareStore()->getMetaManager()->clearNodeMeta($ajxpNode);
-                return;
-            }
-        }
-        if(!empty($shares) && count($shares)){
-            $merge = array(
-                "ajxp_shared"      => "true",
-                "overlay_icon"     => "shared.png",
-                "overlay_class"    => "mdi mdi-share-variant"
-            );
-            // Backward compat, until we rework client-side
-            $sKeys = array_keys($shares);
-            if($shares[$sKeys[0]]["type"] == "minisite"){
-                if($ajxpNode->isLeaf()){
-                    $merge["ajxp_shared_minisite"] = "file";
-                }else{
-                    $merge["ajxp_shared_minisite"] = "public";
-                }
-            }else if($shares[$sKeys[0]]["type"] == "file"){
-                $merge["ajxp_shared_publiclet"] = "true";
-            }
-            $ajxpNode->mergeMetadata($merge, true);
-        }
-        return;
-    }
-
-    /**
-     * Hook node.change
-     * @param AJXP_Node $oldNode
-     * @param AJXP_Node $newNode
-     * @param bool $copy
-     */
-    public function updateNodeSharedData($oldNode=null, $newNode=null, $copy = false){
-
-        if($oldNode == null || $copy){
-            // Create or copy, do nothing
-            return;
-        }
-        if($oldNode != null && $newNode != null && $oldNode->getUrl() == $newNode->getUrl()){
-            // Same path => must be a content update, do nothing
-            return;
-        }
-
-        $this->logDebug("Should update node");
-        $delete = false;
-        if($newNode == null) {
-            $delete = true;
-        }else{
-            $repo = $newNode->getRepository();
-            $recycle = $repo->getOption("RECYCLE_BIN");
-            if(!empty($recycle) && strpos($newNode->getPath(), $recycle) === 1){
-                $delete = true;
-            }
-        }
-        $shareStore = $this->getShareStore();
-        $modifiedNodes = $shareStore->moveSharesFromMetaRecursive($oldNode, $delete, $oldNode->getPath(), ($newNode != null ? $newNode->getPath() : null));
-        // Force switching back to correct driver!
-        if($modifiedNodes > 0){
-            $oldNode->getRepository()->driverInstance = null;
-            $oldNode->setDriver(null);
-            $oldNode->getDriver();
-        }
-        return;
-
-    }
-
-    /**
-     * Hook user.after_delete
-     * make sure to clear orphan shares
-     * @param String $userId
-     */
-    public function cleanUserShares($userId){
-        $shares = $this->getShareStore()->listShares($userId);
-        foreach($shares as $hash => $data){
-            $this->getShareStore()->deleteShare($data['SHARE_TYPE'], $hash, false, true);
-        }
-    }
-
-
-    /************************************/
-    /* EVENTS FORWARDING BETWEEN
-    /* PARENTS AND CHILDREN WORKSPACES
-    /************************************/
-    /**
-     * @param AJXP_Node $node
-     * @param String|null $direction "UP", "DOWN"
-     * @return array()
-     */
-    private function findMirrorNodesInShares($node, $direction){
-        $result = array();
-        if($direction !== "UP"){
-            $upmetas = array();
-            $this->getShareStore()->getMetaManager()->collectSharesInParent($node, $upmetas);
-            foreach($upmetas as $metadata){
-                if (is_array($metadata) && !empty($metadata["shares"])) {
-                    foreach($metadata["shares"] as $sId => $sData){
-                        $type = $sData["type"];
-                        if($type == "file") continue;
-                        $wsId = $sId;
-                        if($type == "minisite"){
-                            $minisiteData = $this->getShareStore()->loadShare($sId);
-                            if(empty($minisiteData) || !isset($minisiteData["REPOSITORY"])) continue;
-                            $wsId = $minisiteData["REPOSITORY"];
-                        }else if($type == "ocs_remote"){
-                            continue;
-                        }
-                        $sharedNode = $metadata["SOURCE_NODE"];
-                        $sharedPath = substr($node->getPath(), strlen($sharedNode->getPath()));
-                        $sharedNodeUrl = $node->getScheme() . "://".$wsId.$sharedPath;
-                        $result[$wsId] = array(new AJXP_Node($sharedNodeUrl), "DOWN");
-                        $this->logDebug('MIRROR NODES', 'Found shared in parent - register node '.$sharedNodeUrl);
-                    }
-                }
-            }
-        }
-        if($direction !== "DOWN"){
-            if($node->getRepository()->hasParent()){
-                $parentRepoId = $node->getRepository()->getParentId();
-                $parentRepository = ConfService::getRepositoryById($parentRepoId);
-                if(!empty($parentRepository) && !$parentRepository->isTemplate){
-                    $currentRoot = $node->getRepository()->getOption("PATH");
-                    $owner = $node->getRepository()->getOwner();
-                    $resolveUser = null;
-                    if($owner != null){
-                        $resolveUser = ConfService::getConfStorageImpl()->createUserObject($owner);
-                    }
-                    $parentRoot = $parentRepository->getOption("PATH", false, $resolveUser);
-                    $relative = substr($currentRoot, strlen($parentRoot));
-                    $relative = SystemTextEncoding::toStorageEncoding($relative);
-                    $parentNodeURL = $node->getScheme()."://".$parentRepoId.$relative.$node->getPath();
-                    $this->logDebug("action.share", "Should trigger on ".$parentNodeURL);
-                    $parentNode = new AJXP_Node($parentNodeURL);
-                    if($owner != null) $parentNode->setUser($owner);
-                    $result[$parentRepoId] = array($parentNode, "UP");
-                }
-            }
-        }
-        return $result;
-    }
-
-    private function applyForwardEvent($fromMirrors = null, $toMirrors = null, $copy = false, $direction = null){
-        if($fromMirrors === null){
-            // Create
-            foreach($toMirrors as $mirror){
-                list($node, $direction) = $mirror;
-                AJXP_Controller::applyHook("node.change", array(null, $node, false, $direction), true);
-            }
-        }else if($toMirrors === null){
-            foreach($fromMirrors as $mirror){
-                list($node, $direction) = $mirror;
-                AJXP_Controller::applyHook("node.change", array($node, null, false, $direction), true);
-            }
-        }else{
-            foreach($fromMirrors as $repoId => $mirror){
-                list($fNode, $fDirection) = $mirror;
-                if(isSet($toMirrors[$repoId])){
-                    list($tNode, $tDirection) = $toMirrors[$repoId];
-                    unset($toMirrors[$repoId]);
-                    try{
-                        AJXP_Controller::applyHook("node.change", array($fNode, $tNode, $copy, $fDirection), true);
-                    }catch(Exception $e){
-                        $this->logError(__FUNCTION__, "Error while applying node.change hook (".$e->getMessage().")");
-                    }
-                }else{
-                    try{
-                    AJXP_Controller::applyHook("node.change", array($fNode, null, $copy, $fDirection), true);
-                    }catch(Exception $e){
-                        $this->logError(__FUNCTION__, "Error while applying node.change hook (".$e->getMessage().")");
-                    }
-                }
-            }
-            foreach($toMirrors as $mirror){
-                list($tNode, $tDirection) = $mirror;
-                try{
-                AJXP_Controller::applyHook("node.change", array(null, $tNode, $copy, $tDirection), true);
-                }catch(Exception $e){
-                    $this->logError(__FUNCTION__, "Error while applying node.change hook (".$e->getMessage().")");
-                }
-            }
-        }
-
-    }
-
-    /**
-     * @param AJXP_Node $fromNode
-     * @param AJXP_Node $toNode
-     * @param bool $copy
-     * @param String $direction
-     */
-    public function forwardEventToShares($fromNode=null, $toNode=null, $copy = false, $direction=null){
-
-        if(empty($direction) && $this->getFilteredOption("FORK_EVENT_FORWARDING")){
-            AJXP_Controller::applyActionInBackground(
-                ConfService::getRepository()->getId(),
-                "forward_change_event",
-                array(
-                    "from" => $fromNode === null ? "" : $fromNode->getUrl(),
-                    "to" =>   $toNode === null ? "" : $toNode->getUrl(),
-                    "copy" => $copy ? "true" : "false",
-                    "direction" => $direction
-                ));
-            return;
-        }
-
-        $fromMirrors = null;
-        $toMirrors = null;
-        if($fromNode != null){
-            $fromMirrors = $this->findMirrorNodesInShares($fromNode, $direction);
-        }
-        if($toNode != null){
-            $toMirrors = $this->findMirrorNodesInShares($toNode, $direction);
-        }
-
-        $this->applyForwardEvent($fromMirrors, $toMirrors, $copy, $direction);
-        if(count($fromMirrors) || count($toMirrors)){
-            // Make sure to switch back to correct repository in memory
-            if($fromNode != null) {
-                $fromNode->getRepository()->driverInstance = null;
-                $fromNode->setDriver(null);
-                $fromNode->getDriver();
-            }else if($toNode != null){
-                $toNode->getRepository()->driverInstance = null;
-                $toNode->setDriver(null);
-                $toNode->getDriver();
-            }
-        }
-    }
-
-    public function forwardEventToSharesAction($actionName, $httpVars, $fileVars){
-
-        $fromMirrors = null;
-        $toMirrors = null;
-        $fromNode = $toNode = null;
-        if(!empty($httpVars["from"])){
-            $fromNode = new AJXP_Node($httpVars["from"]);
-            $fromMirrors = $this->findMirrorNodesInShares($fromNode, $httpVars["direction"]);
-        }
-        if(!empty($httpVars["to"])){
-            $toNode = new AJXP_Node($httpVars["to"]);
-            $toMirrors = $this->findMirrorNodesInShares($toNode, $httpVars["direction"]);
-        }
-        $this->applyForwardEvent($fromMirrors, $toMirrors, ($httpVars["copy"] === "true"), $httpVars["direction"]);
-        if(count($fromMirrors) || count($toMirrors)){
-            // Make sure to switch back to correct repository in memory
-            if($fromNode != null) {
-                $fromNode->getRepository()->driverInstance = null;
-                $fromNode->setDriver(null);
-                $fromNode->getDriver();
-            }else if($toNode != null){
-                $toNode->getRepository()->driverInstance = null;
-                $toNode->setDriver(null);
-                $toNode->getDriver();
-            }
-        }
-    }
-
-
-    /**************************/
-    /* BOOTLOADERS FOR LINKS
-    /**************************/
-    /**
-     * Loader for minisites
-     * @param array $data
-     * @param string $hash
-     * @param null $error
-     */
-    public static function loadMinisite($data, $hash = '', $error = null)
-    {
-        include_once("class.MinisiteRenderer.php");
-        MinisiteRenderer::loadMinisite($data, $hash, $error);
-    }
-
-    /**
-     * Loader used by the generic loader.
-     * @param string $hash
-     */
-    public static function loadShareByHash($hash){
-        AJXP_Logger::debug(__CLASS__, __FUNCTION__, "Do something");
-        AJXP_PluginsService::getInstance()->initActivePlugins();
-        if(isSet($_GET["lang"])){
-            ConfService::setLanguage($_GET["lang"]);
-        }
-        $shareCenter = self::getShareCenter();
-        $data = $shareCenter->getShareStore()->loadShare($hash);
-        $mess = ConfService::getMessages();
-        if($shareCenter->getShareStore()->isShareExpired($hash, $data)){
-            AuthService::disconnect();
-            self::loadMinisite($data, $hash, $mess["share_center.165"]);
-            return;
-        }
-        if(!empty($data) && is_array($data)){
-            if(isSet($data["SECURITY_MODIFIED"]) && $data["SECURITY_MODIFIED"] === true){
-                header("HTTP/1.0 401 Not allowed, script was modified");
-                exit();
-            }
-            if($data["SHARE_TYPE"] == "minisite"){
-                self::loadMinisite($data, $hash);
-            }else{
-                self::loadPubliclet($data);
-            }
-        }else{
-            $setUrl = ConfService::getCoreConf("SERVER_URL");
-            $data = array();
-            if (!empty($setUrl)) {
-                $data["AJXP_APPLICATION_BASE"] = $setUrl;
-            }
-            self::loadMinisite($data, $hash, $mess["share_center.166"]);
-        }
-
-    }
-
-    /**
-     * Loader for legacy publiclets
-     * @static
-     * @param array $data
-     * @return void
-     */
-    public static function loadPubliclet($data)
-    {
-        require_once("class.LegacyPubliclet.php");
-        $shareCenter = self::getShareCenter();
-        $options = $shareCenter->getConfigs();
-        $shareStore = $shareCenter->getShareStore();
-        LegacyPubliclet::render($data, $options, $shareStore);
-    }
-
-
-    /**************************/
-    /* CREATE / EDIT SHARES
-    /**************************/
-
-    /**
-     * @param array $httpVars
-     * @param UserSelection $userSelection
-     * @return int
-     * @throws Exception
-     */
-    public function filterHttpVarsForLeafPath(&$httpVars, $userSelection){
-        // ANALYSE SELECTION
-        // TO CREATE PROPER FILTER / PATH FOR SHARED REPO
-        $httpVars["minisite"] = true;
-        $httpVars["selection"] = true;
-        $setFilter = false;
-        if($userSelection->isUnique()){
-            $node = $userSelection->getUniqueNode();
-            $node->loadNodeInfo();
-            if($node->isLeaf()){
-                $setFilter = true;
-                $httpVars["file"] = "/";
-                $httpVars["nodes"] = array("/");
-            }
-        }else{
-            $setFilter = true;
-        }
-        $nodes = $userSelection->buildNodes();
-        $hasDir = false; $hasFile = false;
-        foreach($nodes as $n){
-            $n->loadNodeInfo();
-            if($n->isLeaf()) $hasFile = true;
-            else $hasDir = true;
-        }
-        if( ( $hasDir && !$this->getAuthorization("folder", "minisite") ) || ($hasFile && !$this->getAuthorization("file"))){
-            throw new Exception(103);
-        }
-        if($setFilter){ // Either it's a file, or many nodes are shared
-            $httpVars["filter_nodes"] = $nodes;
-        }
-        if(!isSet($httpVars["repo_label"])){
-            $first = $userSelection->getUniqueNode();
-            $httpVars["repo_label"] = SystemTextEncoding::toUTF8($first->getLabel());
-        }
-
-    }
-
-    /**
-     * @param array $httpVars
-     * @param AJXP_Node $ajxpNode
-     */
-    public function filterHttpVarsFromUniqueNode(&$httpVars, $ajxpNode){
-        $httpVars["minisite"] = true;
-        $httpVars["selection"] = true;
-        if($ajxpNode->isLeaf()){
-            $httpVars["filter_nodes"] = [$ajxpNode];
-            $httpVars["file"] = "/";
-            $httpVars["nodes"] = array("/");
-        }
-        if(!isSet($httpVars["repo_label"])){
-            $httpVars["repo_label"] = SystemTextEncoding::toUTF8($ajxpNode->getLabel());
-        }
-    }
-
-    /**
-     * @param array $httpVars
-     * @param bool $update
-     * @return Repository
-     * @throws Exception
-     */
-    protected function createOrLoadSharedRepository($httpVars, &$update){
-
-        if (!isSet($httpVars["repo_label"]) || $httpVars["repo_label"] == "") {
-            $mess = ConfService::getMessages();
-            throw new Exception($mess["349"]);
-        }
-
-        if (isSet($httpVars["repository_id"])) {
-            $editingRepo = ConfService::getRepositoryById($httpVars["repository_id"]);
-            $update = true;
-        }
-
-        // CHECK REPO DOES NOT ALREADY EXISTS WITH SAME LABEL
-        $label = AJXP_Utils::sanitize(AJXP_Utils::securePath($httpVars["repo_label"]), AJXP_SANITIZE_HTML);
-        $description = AJXP_Utils::sanitize(AJXP_Utils::securePath($httpVars["repo_description"]), AJXP_SANITIZE_HTML);
-        $exists = $this->checkRepoWithSameLabel($label, isSet($editingRepo)?$editingRepo:null);
-        if($exists){
-            $mess = ConfService::getMessages();
-            throw new Exception($mess["share_center.352"]);
-        }
-
-        $loggedUser = AuthService::getLoggedUser();
-
-        if (isSet($editingRepo)) {
-
-            $this->getShareStore()->testUserCanEditShare($editingRepo->getOwner(), $editingRepo->options);
-            $newRepo = $editingRepo;
-            $replace = false;
-            if ($editingRepo->getDisplay() != $label) {
-                $newRepo->setDisplay($label);
-                $replace = true;
-            }
-            if($editingRepo->getDescription() != $description){
-                $newRepo->setDescription($description);
-                $replace = true;
-            }
-            $newScope = ((isSet($httpVars["share_scope"]) && $httpVars["share_scope"] == "public") ? "public" : "private");
-            $oldScope = $editingRepo->getOption("SHARE_ACCESS");
-            $currentOwner = $editingRepo->getOwner();
-            if($newScope != $oldScope && $currentOwner != AuthService::getLoggedUser()->getId()){
-                $mess = ConfService::getMessages();
-                throw new Exception($mess["share_center.224"]);
-            }
-            if($newScope !== $oldScope){
-                $editingRepo->addOption("SHARE_ACCESS", $newScope);
-                $replace = true;
-            }
-            if(isSet($httpVars["transfer_owner"])){
-                $newOwner = $httpVars["transfer_owner"];
-                if($newOwner != $currentOwner && $currentOwner != AuthService::getLoggedUser()->getId()){
-                    $mess = ConfService::getMessages();
-                    throw new Exception($mess["share_center.224"]);
-                }
-                $editingRepo->setOwnerData($editingRepo->getParentId(), $newOwner, $editingRepo->getUniqueUser());
-                $replace = true;
-            }
-
-            if($replace) {
-                ConfService::replaceRepository($newRepo->getId(), $newRepo);
-            }
-
-        } else {
-
-            $options = $this->accessDriver->makeSharedRepositoryOptions($httpVars, $this->repository);
-            // TMP TESTS
-            $options["SHARE_ACCESS"] = $httpVars["share_scope"];
-            $newRepo = $this->repository->createSharedChild(
-                $label,
-                $options,
-                $this->repository->getId(),
-                $loggedUser->getId(),
-                null
-            );
-            $gPath = $loggedUser->getGroupPath();
-            if (!empty($gPath) && !ConfService::getCoreConf("CROSSUSERS_ALLGROUPS", "conf")) {
-                $newRepo->setGroupPath($gPath);
-            }
-            $newRepo->setDescription($description);
-            // Smells like dirty hack!
-            $newRepo->options["PATH"] = SystemTextEncoding::fromStorageEncoding($newRepo->options["PATH"]);
-
-            if(isSet($httpVars["filter_nodes"])){
-                $newRepo->setContentFilter(new ContentFilter($httpVars["filter_nodes"]));
-            }
-            ConfService::addRepository($newRepo);
-        }
-        return $newRepo;
-
-    }
-
-    /**
-     * @param array $httpVars
-     * @param bool $update
-     * @return mixed An array containing the hash (0) and the generated url (1)
-     * @throws Exception
-     */
-    public function createSharedMinisite($httpVars, &$update)
-    {
-        // PREPARE HIDDEN USER DATA
-        if(isSet($httpVars["hash"])){
-            $shareObject = $this->getShareStore()->loadShareObject($httpVars["hash"]);
-        }else{
-            $shareObject = $this->getShareStore()->createEmptyShareObject();
-        }
-        $shareObject->parseHttpVars($httpVars);
-        $hiddenUserEntry = $this->getRightsManager()->prepareSharedUserEntry(
-            $httpVars,
-            $shareObject,
-            isSet($httpVars["hash"]),
-            (isSet($httpVars["guest_user_pass"])?$httpVars["guest_user_pass"]:null)
-        );
-        $userSelection = new UserSelection($this->repository, $httpVars);
-        $this->filterHttpVarsForLeafPath($httpVars, $userSelection);
-
-        $users = array(); $groups = array();
-        $users[$hiddenUserEntry["ID"]] = $hiddenUserEntry;
-
-        $newRepo = $this->createSharedRepository($httpVars, $repoUpdate, $users, $groups);
-
-        $shareObject->setParentRepositoryId($this->repository->getId());
-        $shareObject->attachToRepository($newRepo->getId());
-        // STORE DATA & HASH IN SHARE STORE
-        $this->getPublicAccessManager()->initFolder();
-        $hash = $shareObject->save();
-        $url = $this->getPublicAccessManager()->buildPublicLink($hash);
-
-        // LOG AND PUBLISH EVENT
-        $update = isSet($httpVars["repository_id"]);
-        $data = $shareObject->getData();
-        $this->logInfo(($update?"Update":"New")." Share", array(
-            "file" => "'".$userSelection->getUniqueFile()."'",
-            "files" => $userSelection->getFiles(),
-            "url" => $url,
-            "expiration" => $data["EXPIRATE_TIME"],
-            "limit" => $data['DOWNLOAD_LIMIT'],
-            "repo_uuid" => $this->repository->getId()
-        ));
-        AJXP_Controller::applyHook("node.share.".($update?"update":"create"), array(
-            'type' => 'minisite',
-            'repository' => &$this->repository,
-            'accessDriver' => &$this->accessDriver,
-            'data' => &$data,
-            'url' => $url,
-            'new_repository' => &$newRepo
-        ));
-
-        return array($hash, $url);
-    }
-
-    /**
-     * @param array $httpVars
-     * @param bool $update
-     * @param array $users
-     * @param array $groups
-     * @return Repository
-     * @throws Exception
-     */
-    public function createSharedRepository($httpVars, &$update, $users=array(), $groups=array())
-    {
-        // ERRORS
-        // 100 : missing args
-        // 101 : repository label already exists
-        // 102 : user already exists
-        // 103 : current user is not allowed to share
-        // SUCCESS
-        // 200
-        $loggedUser = AuthService::getLoggedUser();
-        $actRights = $loggedUser->mergedRole->listActionsStatesFor($this->repository);
-        if (isSet($actRights["share"]) && $actRights["share"] === false) {
-            $mess = ConfService::getMessages();
-            throw new Exception($mess["351"]);
-        }
-
-        $newRepo = $this->createOrLoadSharedRepository($httpVars, $update);
-
-        $selection = new UserSelection($this->repository, $httpVars);
-        $this->getRightsManager()->assignSharedRepositoryPermissions($this->repository, $newRepo, $update, $users, $groups, $selection);
-
-        // HANDLE WATCHES ON CHILDREN AND PARENT
-        foreach($users as $userName => $userEntry){
-            $this->toggleWatchOnSharedRepository(
-                $newRepo->getId(),
-                $userName,
-                $userEntry["WATCH"],
-                AuthService::getLoggedUser()->getId()
-            );
-        }
-        $this->toggleWatchOnSharedRepository(
-            $newRepo->getId(),
-            AuthService::getLoggedUser()->getId(),
-            ($httpVars["self_watch_folder"] == "true")
-        );
-
-        $this->logInfo(($update?"Update":"New")." Share", array(
-            "file" => "'".$selection->getUniqueFile()."'",
-            "files" => $selection->getFiles(),
-            "repo_uuid" => $this->repository->getId(),
-            "shared_repo_uuid" => $newRepo->getId()
-        ));
-
-        return $newRepo;
-    }
-
-    /**
-     * @param array $linkData
-     * @param array $hiddenUserEntries
-     * @param array $shareObjects
-     * @param string $type
-     * @param string $invitationLabel
-     * @return ShareLink
-     * @throws Exception
-     */
-    protected function shareObjectFromParameters($linkData, &$hiddenUserEntries, &$shareObjects,  $type = "public", $invitationLabel = ""){
-        if(isSet($linkData["hash"])){
-            $link = $this->getShareStore()->loadShareObject($linkData["hash"]);
-        }else{
-            if($type == "public"){
-                $link = $this->getShareStore()->createEmptyShareObject();
-            }else{
-                $link = new Pydio\OCS\Model\TargettedLink($this->getShareStore());
-                if(AuthService::usersEnabled()) $link->setOwnerId(AuthService::getLoggedUser()->getId());
-                $link->prepareInvitation($linkData["HOST"], $linkData["USER"], $invitationLabel);
-            }
-        }
-        $link->parseHttpVars($linkData);
-        $hiddenUserEntries[] = $this->getRightsManager()->prepareSharedUserEntry(
-            $linkData,
-            $link,
-            isSet($linkData["hash"]),
-            (isSet($linkData["guest_user_pass"])?$linkData["guest_user_pass"]:null)
-        );
-        $shareObjects[] = $link;
-    }
-
-    /**
-     * @param AJXP_Node $ajxpNode
-     * @param array $httpVars
-     * @param bool $update
-     * @return Repository[]|ShareLink[]
-     * @throws Exception
-     */
-    public function shareNode($ajxpNode, $httpVars, &$update){
-
-        $hiddenUserEntries = array();
-        $originalHttpVars = $httpVars;
-        $ocsStore = new Pydio\OCS\Model\SQLStore();
-        $ocsClient = new Pydio\OCS\Client\OCSClient();
-        $userSelection = new UserSelection($this->repository, $httpVars);
-        $mess = ConfService::getMessages();
-
-        /**
-         * @var ShareLink[] $shareObjects
-         */
-        $shareObjects = array();
-
-        // PUBLIC LINK
-        if(isSet($httpVars["enable_public_link"])){
-            if(!$this->getAuthorization($ajxpNode->isLeaf() ? "file":"folder", "minisite")){
-                throw new Exception($mess["share_center." . ($ajxpNode->isLeaf() ? "225" : "226")]);
-            }
-            $this->shareObjectFromParameters($httpVars, $hiddenUserEntries, $shareObjects, "public");
-        }else if(isSet($httpVars["disable_public_link"])){
-            $this->getShareStore()->deleteShare("minisite", $httpVars["disable_public_link"], true);
-        }
-
-        if(isSet($httpVars["ocs_data"])){
-            $ocsData = json_decode($httpVars["ocs_data"], true);
-            $removeLinks = $ocsData["REMOVE"];
-            foreach($removeLinks as $linkHash){
-                // Delete Link, delete invitation(s)
-                $this->getShareStore()->deleteShare("minisite", $linkHash, true);
-                $invitations = $ocsStore->invitationsForLink($linkHash);
-                foreach($invitations as $invitation){
-                    $ocsStore->deleteInvitation($invitation);
-                    $ocsClient->cancelInvitation($invitation);
-                }
-            }
-            $newLinks = $ocsData["LINKS"];
-            foreach($newLinks as $linkData){
-                $this->shareObjectFromParameters($linkData, $hiddenUserEntries, $shareObjects, "targetted", $userSelection->getUniqueNode()->getLabel());
-            }
-        }
-
-        $this->filterHttpVarsFromUniqueNode($httpVars, $ajxpNode);
-
-        $users = array(); $groups = array();
-        $this->getRightsManager()->createUsersFromParameters($httpVars, $users, $groups);
-        if((count($users) || count($groups)) && !$this->getAuthorization($ajxpNode->isLeaf()?"file":"folder", "workspace")){
-            $users = $groups = array();
-        }
-        foreach($hiddenUserEntries as $entry){
-            $users[$entry["ID"]] = $entry;
-        }
-        if(!count($users) && !count($groups)){
-            ob_start();
-            unset($originalHttpVars["hash"]);
-            $this->switchAction("unshare", $originalHttpVars, array());
-            ob_end_clean();
-            return null;
-        }
-
-        $newRepo = $this->createSharedRepository($httpVars, $repoUpdate, $users, $groups);
-
-        foreach($shareObjects as $shareObject){
-
-            $shareObject->setParentRepositoryId($this->repository->getId());
-            $shareObject->attachToRepository($newRepo->getId());
-            $shareObject->save();
-            if($shareObject instanceof \Pydio\OCS\Model\TargettedLink){
-                $invitation = $shareObject->getPendingInvitation();
-                if(!empty($invitation)){
-                    $ocsStore->generateInvitationId($invitation);
-                    try{
-                        $ocsClient->sendInvitation($invitation);
-                    }catch (Exception $e){
-                        $this->getShareStore()->deleteShare("minisite", $shareObject->getHash(), true);
-                        $shareUserId = $shareObject->getUniqueUser();
-                        unset($users[$shareUserId]);
-                        if(!count($users) && !count($groups)){
-                            $this->getShareStore()->deleteShare("repository", $newRepo->getId());
-                        }
-                        throw $e;
-                    }
-                    $ocsStore->storeInvitation($invitation);
-                }
-            }else{
-                $this->getPublicAccessManager()->initFolder();
-                $url = $this->getPublicAccessManager()->buildPublicLink($shareObject->getHash());
-                $existingShortForm = $shareObject->getShortFormUrl();
-                if(empty($existingShortForm)){
-                    $shortForm = "";
-                    AJXP_Controller::applyHook("url.shorten", array($url, &$shortForm));
-                    if(!empty($shortForm)){
-                        $shareObject->setShortFormUrl($shortForm);
-                        $shareObject->save();
-                    }
-                }
-            }
-
-        }
-        $shareObjects[] = $newRepo;
-        return $shareObjects;
-
-    }
-
-    /**************************/
-    /* LISTING FUNCTIONS
-    /**************************/
-    /**
-     * @param bool|string $currentUser if true, currently logged user. if false all users. If string, user ID.
-     * @param string $parentRepositoryId
-     * @param null $cursor
-     * @return array
-     */
-    public function listShares($currentUser = true, $parentRepositoryId="", $cursor = null){
-        if($currentUser === false){
-            $crtUser = "";
-        }else if(AuthService::usersEnabled()){
-            if($currentUser === true){
-                $crtUser = AuthService::getLoggedUser()->getId();
-            }else{
-                $crtUser = $currentUser;
-            }
-        }else{
-            $crtUser = "shared";
-        }
-        return $this->getShareStore()->listShares($crtUser, $parentRepositoryId, $cursor);
-    }
-
-    /**
-     * @param $rootPath
-     * @param bool|string $currentUser if true, currently logged user. if false all users. If string, user ID.
-     * @param string $parentRepositoryId
-     * @param null $cursor
-     * @param bool $xmlPrint
-     * @return AJXP_Node[]
-     */
-    public function listSharesAsNodes($rootPath, $currentUser = true, $parentRepositoryId = "", $cursor = null, $xmlPrint = false){
-
-        $shares =  $this->listShares($currentUser, $parentRepositoryId, $cursor);
-        $nodes = array();
-        $parent = ConfService::getRepositoryById($parentRepositoryId);
-
-        foreach($shares as $hash => $shareData){
-
-            $icon = "folder";
-            $meta = array(
-                "icon"			=> $icon,
-                "openicon"		=> $icon,
-                "ajxp_mime" 	=> "repository_editable"
-            );
-
-            $shareType = $shareData["SHARE_TYPE"];
-            $meta["share_type"] = $shareType;
-            $meta["ajxp_shared"] = true;
-
-            if(!is_object($shareData["REPOSITORY"])){
-
-                $repoId = $shareData["REPOSITORY"];
-                $repoObject = ConfService::getRepositoryById($repoId);
-                if($repoObject == null){
-                    $meta["text"] = "Invalid link";
-                    continue;
-                }
-                $meta["text"] = $repoObject->getDisplay();
-                $permissions = $this->getRightsManager()->computeSharedRepositoryAccessRights($repoId, true, null);
-                $regularUsers = count(array_filter($permissions, function($a){
-                    return (!isSet($a["HIDDEN"]) || $a["HIDDEN"] == false);
-                })) > 0;
-                $hiddenUsers = count(array_filter($permissions, function($a){
-                    return (isSet($a["HIDDEN"]) && $a["HIDDEN"] == true);
-                })) > 0;
-                if($regularUsers && $hiddenUsers){
-                    $meta["share_type_readable"] = "Public Link & Internal Users";
-                }elseif($regularUsers){
-                    $meta["share_type_readable"] = "Internal Users";
-                }else if($hiddenUsers){
-                    $meta["share_type_readable"] = "Public Link";
-                }else{
-                    $meta["share_type_readable"] =  $repoObject->hasContentFilter() ? "Public Link" : ($shareType == "repository"? "Internal Users": "Public Link");
-                    if(isSet($shareData["LEGACY_REPO_OR_MINI"])){
-                        $meta["share_type_readable"] = "Internal Only";
-                    }
-                }
-                $meta["share_data"] = ($shareType == "repository" ? 'Shared as workspace: '.$repoObject->getDisplay() : $this->getPublicAccessManager()->buildPublicLink($hash));
-                $meta["shared_element_hash"] = $hash;
-                $meta["owner"] = $repoObject->getOwner();
-                $meta["shared_element_parent_repository"] = $repoObject->getParentId();
-                if(!empty($parent)) {
-                    $parentPath = $parent->getOption("PATH", false, $meta["owner"]);
-                    $meta["shared_element_parent_repository_label"] = $parent->getDisplay();
-                }else{
-                    $crtParent = ConfService::getRepositoryById($repoObject->getParentId());
-                    if(!empty($crtParent)){
-                        $parentPath = $crtParent->getOption("PATH", false, $meta["owner"]);
-                        $meta["shared_element_parent_repository_label"] = $crtParent->getDisplay();
-                    }else {
-                        $meta["shared_element_parent_repository_label"] = $repoObject->getParentId();
-                    }
-                }
-                if($repoObject->hasContentFilter()){
-                    $meta["ajxp_shared_minisite"] = "file";
-                    $meta["icon"] = "mime_empty.png";
-                    $meta["original_path"] = array_pop(array_keys($repoObject->getContentFilter()->filters));
-                }else{
-                    $meta["ajxp_shared_minisite"] = "public";
-                    $meta["icon"] = "folder.png";
-                    $meta["original_path"] = $repoObject->getOption("PATH");
-                }
-                if(!empty($parentPath) &&  strpos($meta["original_path"], $parentPath) === 0){
-                    $meta["original_path"] = substr($meta["original_path"], strlen($parentPath));
-                }
-
-            }else if(is_a($shareData["REPOSITORY"], "Repository") && !empty($shareData["FILE_PATH"])){
-
-                $meta["owner"] = $shareData["OWNER_ID"];
-                $meta["share_type_readable"] = "Publiclet (legacy)";
-                $meta["text"] = basename($shareData["FILE_PATH"]);
-                $meta["icon"] = "mime_empty.png";
-                $meta["share_data"] = $meta["copy_url"] = $this->getPublicAccessManager()->buildPublicLink($hash);
-                $meta["share_link"] = true;
-                $meta["shared_element_hash"] = $hash;
-                $meta["ajxp_shared_publiclet"] = $hash;
-
-            }else{
-
-                continue;
-
-            }
-
-            if($xmlPrint){
-                AJXP_XMLWriter::renderAjxpNode(new AJXP_Node($rootPath."/".$hash, $meta));
-            }else{
-                $nodes[] = new AJXP_Node($rootPath."/".$hash, $meta);
-            }
-        }
-
-        return $nodes;
-
-
-    }
-
-    /**
-     * @param CompositeShare $compositeShare
-     * @return array
-     */
-    public function compositeShareToJson($compositeShare){
-
-        $repoId = $compositeShare->getRepositoryId();
-        $repo = $compositeShare->getRepository();
-        $messages = ConfService::getMessages();
-
-        $notExistsData = array(
-            "error"         => true,
-            "repositoryId"  => $repoId,
-            "users_number"  => 0,
-            "label"         => "Error - Cannot find shared data",
-            "description"   => "Cannot find repository",
-            "entries"       => array(),
-            "element_watch" => false,
-            "repository_url"=> ""
-        );
-
-        if($repoId == null || $repo == null){
-            //CLEAR AND ASSOCIATED LINKS HERE ?
-            //$this->getShareStore()->getMetaManager()->removeShareFromMeta($node, $shareId);
-            return $notExistsData;
-        }
-        try{
-            $this->getShareStore()->testUserCanEditShare($compositeShare->getOwner(), array("SHARE_ACCESS" => $compositeShare->getVisibilityScope()));
-        }catch(Exception $e){
-            $notExistsData["label"] = $e->getMessage();
-            return $notExistsData;
-        }
-
-        $jsonData = $compositeShare->toJson($this->watcher, $this->getRightsManager(), $this->getPublicAccessManager(), $messages);
-        if($jsonData === false){
-            return $notExistsData;
-        }
-        return $jsonData;
-
-    }
-
-    /**
-     * @param String $shareId
-     * @param array $shareMeta
-     * @param AJXP_Node $node
-     * @throws Exception
-     * @return array|bool
-     */
-    public function shareToJson($shareId, $shareMeta, $node = null){
-
-        $messages = ConfService::getMessages();
-        $jsonData = array();
-        $elementWatch = false;
-        if($shareMeta["type"] == "file"){
-
-            require_once("class.LegacyPubliclet.php");
-            $jsonData = LegacyPubliclet::publicletToJson(
-                $shareId,
-                $shareMeta,
-                $this->getShareStore(),
-                $this->getPublicAccessManager(),
-                $this->watcher,
-                $node
-            );
-
-        }else if($shareMeta["type"] == "minisite" || $shareMeta["type"] == "repository"){
-
-            $repoId = $shareId;
-            if(strpos($repoId, "repo-") === 0){
-                // Legacy
-                $repoId = str_replace("repo-", "", $repoId);
-                $shareMeta["type"] = "repository";
-            }
-
-            $minisite = ($shareMeta["type"] == "minisite");
-            if ($minisite) {
-                $shareLink = $this->getShareStore()->loadShareObject($shareId);
-                $repoId = $shareLink->getRepositoryId();
-            }
-            $notExistsData = array(
-                "error"         => true,
-                "repositoryId"  => $repoId,
-                "users_number"  => 0,
-                "label"         => "Error - Cannot find shared data",
-                "description"   => "Cannot find repository",
-                "entries"       => array(),
-                "element_watch" => false,
-                "repository_url"=> ""
-            );
-
-            $repo = ConfService::getRepositoryById($repoId);
-            if($repoId == null || ($repo == null && $node != null)){
-                if($minisite){
-                    $this->getShareStore()->getMetaManager()->removeShareFromMeta($node, $shareId);
-                }
-                return $notExistsData;
-            }
-            try{
-                $this->getShareStore()->testUserCanEditShare($repo->getOwner(), $repo->options);
-            }catch(Exception $e){
-                $notExistsData["label"] = $e->getMessage();
-                return $notExistsData;
-            }
-
-            if ($this->watcher != false && $node != null) {
-                $elementWatch = $this->watcher->hasWatchOnNode(
-                    new AJXP_Node("pydio://".$repoId."/"),
-                    AuthService::getLoggedUser()->getId(),
-                    MetaWatchRegister::$META_WATCH_NAMESPACE
-                );
-            }
-            if($node != null){
-                $sharedEntries = $this->getRightsManager()->computeSharedRepositoryAccessRights($repoId, true, new AJXP_Node("pydio://".$repoId."/"));
-            }else{
-                $sharedEntries = $this->getRightsManager()->computeSharedRepositoryAccessRights($repoId, true, null);
-            }
-            if(empty($sharedEntries) && $minisite){
-                $this->getShareStore()->getMetaManager()->removeShareFromMeta($node, $shareId);
-                return $notExistsData;
-            }
-            $cFilter = $repo->getContentFilter();
-            if(!empty($cFilter)){
-                $cFilter = $cFilter->toArray();
-            }
-            $jsonData = array(
-                "repositoryId"  => $repoId,
-                "users_number"  => AuthService::countUsersForRepository($repoId),
-                "label"         => $repo->getDisplay(),
-                "description"   => $repo->getDescription(),
-                "entries"       => $sharedEntries,
-                "element_watch" => $elementWatch,
-                "repository_url"=> AJXP_Utils::getWorkspaceShortcutURL($repo)."/",
-                "content_filter"=> $cFilter,
-                "share_owner"   => $repo->getOwner(),
-                "share_scope"    => (isSet($repo->options["SHARE_ACCESS"]) ? $repo->options["SHARE_ACCESS"] : "private")
-            );
-            if($minisite && isSet($shareLink)){
-                $shareLink->setAdditionalMeta($shareMeta);
-                $jsonData["minisite"] = $shareLink->getJsonData($this->getPublicAccessManager(), $messages);
-            }
-
-        }
-
-
-        return $jsonData;
-
-    }
-
-
-}
diff --git a/core/src/plugins/action.share/class.ShareLink.php b/core/src/plugins/action.share/class.ShareLink.php
deleted file mode 100644
index 9fad09e06d..0000000000
--- a/core/src/plugins/action.share/class.ShareLink.php
+++ /dev/null
@@ -1,379 +0,0 @@
-<?php
-/*
- * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-/**
- * Class ShareLink
- * Model for a public link
- */
-class ShareLink
-{
-    /**
-     * @var string
-     */
-    protected $hash;
-
-    /**
-     * @var ShareStore
-     */
-    protected $store;
-
-    /**
-     * @var array
-     */
-    protected $internal;
-
-    /**
-     * @var string
-     */
-    protected $newHash;
-
-    /**
-     * @var array
-     */
-    protected $additionalMeta;
-
-    /**
-     * @var string
-     */
-    protected $parentRepositoryId;
-
-    /**
-     * @return string
-     */
-    public function getShortFormUrl()
-    {
-        return $this->internal["SHORT_FORM_URL"];
-    }
-
-    /**
-     * @param string $shortFormUrl
-     */
-    public function setShortFormUrl($shortFormUrl)
-    {
-        $this->internal["SHORT_FORM_URL"] = $shortFormUrl;
-    }
-
-
-    public function __construct($store, $storeData = array()){
-        $this->store = $store;
-        $this->internal = $storeData;
-    }
-
-    /**
-     * Persist the share to DB using the ShareStore
-     * @return string
-     * @throws Exception
-     */
-    public function save(){
-        $newHash = $this->store->storeShare(
-            $this->getParentRepositoryId(),
-            $this->internal,
-            "minisite",
-            $this->getHash(),
-            $this->getNewHash()
-        );
-        $this->setHash($newHash);
-        return $newHash;
-    }
-
-    /**
-     * @param string $hash
-     */
-    public function setHash($hash){
-        $this->hash = $hash;
-    }
-
-    /**
-     * @param string $repositoryId
-     */
-    public function attachToRepository($repositoryId){
-        $this->internal["REPOSITORY"] = $repositoryId;
-    }
-
-    public function isAttachedToRepository(){
-        return isSet($this->internal["REPOSITORY"]);
-    }
-
-    public function getRepositoryId(){
-        return $this->internal["REPOSITORY"];
-    }
-
-    /**
-     * @return array
-     */
-    public function getAdditionalMeta()
-    {
-        return $this->additionalMeta;
-    }
-
-    /**
-     * @param array $additionalMeta
-     */
-    public function setAdditionalMeta($additionalMeta)
-    {
-        $this->additionalMeta = $additionalMeta;
-    }
-
-    /**
-     * @return Repository
-     * @throws Exception
-     */
-    public function getRepository(){
-        if(isSet($this->internal["REPOSITORY"])){
-            return ConfService::getRepositoryById($this->internal["REPOSITORY"]);
-        }else{
-            $mess = ConfService::getMessages();
-            throw new Exception(str_replace('%s', 'No repository attached to link', $mess["share_center.219"]));
-        }
-    }
-
-    /**
-     * Update some internal configs from httpVars
-     * @param $httpVars
-     * @throws Exception
-     */
-    public function parseHttpVars($httpVars){
-
-        $data = &$this->internal;
-        $data["DOWNLOAD_DISABLED"] = (isSet($httpVars["simple_right_download"]) ? false : true);
-        $data["AJXP_APPLICATION_BASE"] = AJXP_Utils::detectServerURL(true);
-        if(isSet($httpVars["minisite_layout"])){
-            $data["AJXP_TEMPLATE_NAME"] = $httpVars["minisite_layout"];
-        }
-        if(isSet($httpVars["expiration"])){
-            if(intval($httpVars["expiration"]) > 0){
-                $data["EXPIRE_TIME"] = time() + intval($httpVars["expiration"]) * 86400;
-            }else if(isSet($data["EXPIRE_TIME"])) {
-                unset($data["EXPIRE_TIME"]);
-            }
-        }
-        if(isSet($httpVars["downloadlimit"])){
-            if(intval($httpVars["downloadlimit"]) > 0){
-                $data["DOWNLOAD_LIMIT"] = intval($httpVars["downloadlimit"]);
-            }else if(isSet($data["DOWNLOAD_LIMIT"])){
-                unset($data["DOWNLOAD_LIMIT"]);
-            }
-        }
-
-        if(isSet($httpVars["custom_handle"]) && !empty($httpVars["custom_handle"]) &&
-            (!isSet($this->hash) || $httpVars["custom_handle"] != $this->hash)){
-            // Existing already
-            $value = AJXP_Utils::sanitize($httpVars["custom_handle"], AJXP_SANITIZE_ALPHANUM);
-            $value = strtolower($value);
-            if(strlen($value) < $this->store->hashMinLength){
-                $mess = ConfService::getMessages();
-                throw new Exception(str_replace("%s", $this->store->hashMinLength, $mess["share_center.223"]));
-            }
-            $test = $this->store->loadShare($value);
-            $mess = ConfService::getMessages();
-            if(!empty($test)) {
-                throw new Exception($mess["share_center.172"]);
-            }
-            if(!isSet($this->hash)){
-                $this->hash = $value;
-            }else{
-                $this->newHash = $value;
-            }
-        }
-
-    }
-
-    /**
-     * @param PublicAccessManager $publicAccessManager
-     * @param array $messages
-     * @return mixed
-     * @throws Exception
-     */
-    public function getJsonData($publicAccessManager, $messages){
-
-        $storedData = $this->internal;
-        $minisiteIsPublic = isSet($storedData["PRELOG_USER"]);
-        $dlDisabled = isSet($storedData["DOWNLOAD_DISABLED"]) && $storedData["DOWNLOAD_DISABLED"] === true;
-        $shareMeta = isSet($this->additionalMeta) ? $this->additionalMeta : array();
-        $internalUserId = (isSet($storedData["PRELOG_USER"]) ? $storedData["PRELOG_USER"] : $storedData["PRESET_LOGIN"]);
-        if(empty($internalUserId)){
-            throw new Exception("Oups, link ".$this->getHash()." has no internal user id, this is not normal.");
-        }
-
-        $jsonData = array(
-            "public"            => $minisiteIsPublic?"true":"false",
-            "disable_download"  => $dlDisabled,
-            "hash"              => $this->getHash(),
-            "hash_is_shorten"   => isSet($shareMeta["short_form_url"]) || isSet($this->internal["SHORT_FORM_URL"]),
-            "internal_user_id"   => $internalUserId
-        );
-
-        if(!isSet($storedData["TARGET"]) || $storedData["TARGET"] == "public"){
-            if (isSet($shareMeta["short_form_url"])) {
-                $jsonData["public_link"] = $shareMeta["short_form_url"];
-            } else if(isSet($this->internal["SHORT_FORM_URL"])){
-                $jsonData["public_link"] = $this->getShortFormUrl();
-            } else {
-                $jsonData["public_link"] = $publicAccessManager->buildPublicLink($this->getHash());
-            }
-        }
-
-        if(!empty($storedData["DOWNLOAD_LIMIT"]) && !$dlDisabled){
-            $jsonData["download_counter"] = $this->store->getCurrentDownloadCounter($this->getHash());
-            $jsonData["download_limit"] = $storedData["DOWNLOAD_LIMIT"];
-        }
-        if(!empty($storedData["EXPIRE_TIME"])){
-            $delta = $storedData["EXPIRE_TIME"] - time();
-            $days = round($delta / (60*60*24));
-            $jsonData["expire_time"] = date($messages["date_format"], $storedData["EXPIRE_TIME"]);
-            $jsonData["expire_after"] = $days;
-        }else{
-            $jsonData["expire_after"] = 0;
-        }
-        $jsonData["is_expired"] = $this->store->isShareExpired($this->getHash(), $storedData);
-        if(isSet($storedData["AJXP_TEMPLATE_NAME"])){
-            $jsonData["minisite_layout"] = $storedData["AJXP_TEMPLATE_NAME"];
-        }
-        if(!$minisiteIsPublic){
-            $jsonData["has_password"] = true;
-        }
-        foreach($this->store->modifiableShareKeys as $key){
-            if(isSet($storedData[$key])) $jsonData[$key] = $storedData[$key];
-        }
-
-        return $jsonData;
-
-    }
-
-    /**
-     * @param string $ownerId
-     */
-    public function setOwnerId($ownerId){
-        if(!empty($ownerId)){
-            $this->internal["OWNER_ID"] = $ownerId;
-        }
-    }
-
-    public function getOwnerId(){
-        return $this->internal["OWNER_ID"];
-    }
-
-    /**
-     * Generate a random user ID. Set in PRELOG_USER or PRESET_LOGIN depending on the hasPassword value.
-     * @param string $prefix
-     * @param bool|false $hasPassword
-     */
-    public function createHiddenUserId($prefix = "", $hasPassword = false){
-        $userId = substr(md5(time()), 0, 12);
-        if (!empty($prefix)) {
-            $userId = $prefix.$userId;
-        }
-        $this->setUniqueUser($userId, $hasPassword);
-    }
-
-    /**
-     * Generate a random password
-     * @return string
-     */
-    public function createHiddenUserPassword(){
-        return $userPass = substr(md5(time()), 13, 24);
-    }
-
-    /**
-     * @return string
-     */
-    public function getUniqueUser(){
-        if(isSet($this->internal["PRELOG_USER"])) return $this->internal["PRELOG_USER"];
-        else return $this->internal["PRESET_LOGIN"];
-    }
-
-    /**
-     * @param string $userId
-     * @param bool|false $requirePassword
-     */
-    public function setUniqueUser($userId, $requirePassword = false){
-        if(isSet($this->internal["PRELOG_USER"])) unset($this->internal["PRELOG_USER"]);
-        if(isSet($this->internal["PRESET_LOGIN"])) unset($this->internal["PRESET_LOGIN"]);
-        if($requirePassword){
-            $this->internal["PRESET_LOGIN"] = $userId;
-        }else{
-            $this->internal["PRELOG_USER"] = $userId;
-        }
-    }
-
-    /**
-     * @return bool
-     */
-    public function shouldRequirePassword(){
-        return isSet($this->internal["PRESET_LOGIN"]);
-    }
-
-    /**
-     * @return bool
-     */
-    public function disableDownload(){
-        return $this->internal["DOWNLOAD_DISABLED"];
-    }
-
-    /**
-     * @return string
-     */
-    public function getApplicationBase(){
-        return $this->internal["AJXP_APPLICATION_BASE"];
-    }
-
-    /**
-     * @return array
-     */
-    public function getData(){
-        return $this->internal;
-    }
-
-    /**
-     * @return string
-     */
-    public function getHash()
-    {
-        return $this->hash;
-    }
-
-    /**
-     * @return string
-     */
-    public function getNewHash()
-    {
-        return $this->newHash;
-    }
-
-    /**
-     * @return string
-     */
-    public function getParentRepositoryId()
-    {
-        return $this->parentRepositoryId;
-    }
-
-    /**
-     * @param string $parentRepositoryId
-     */
-    public function setParentRepositoryId($parentRepositoryId)
-    {
-        $this->parentRepositoryId = $parentRepositoryId;
-    }
-
-}
\ No newline at end of file
diff --git a/core/src/plugins/action.share/class.ShareMetaManager.php b/core/src/plugins/action.share/class.ShareMetaManager.php
deleted file mode 100644
index d07498d7de..0000000000
--- a/core/src/plugins/action.share/class.ShareMetaManager.php
+++ /dev/null
@@ -1,270 +0,0 @@
-<?php
-/*
- * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-define('AJXP_SHARED_META_NAMESPACE', 'ajxp_shared');
-
-class ShareMetaManager
-{
-    /**
-     * @var ShareStore
-     */
-    var $shareStore;
-
-    /**
-     * ShareMetaManager constructor.
-     * @param ShareStore $shareStore
-     */
-    public function __construct($shareStore){
-        $this->shareStore = $shareStore;
-    }
-
-    /**
-     * @param AJXP_Node $node
-     * @return array mixed
-     */
-    public function getNodeMeta($node){
-        $private = $node->retrieveMetadata(AJXP_SHARED_META_NAMESPACE, true, AJXP_METADATA_SCOPE_REPOSITORY, true);
-        $shared  = $node->retrieveMetadata(AJXP_SHARED_META_NAMESPACE, false, AJXP_METADATA_SCOPE_REPOSITORY, true);
-        return array_merge_recursive($private, $shared);
-    }
-
-    /**
-     * @param AJXP_Node $node
-     * @param array $meta
-     * @param bool $private
-     */
-    public function setNodeMeta($node, $meta, $private = true){
-        $otherScope = ! $private;
-        $otherScopeMeta = $node->retrieveMetadata(AJXP_SHARED_META_NAMESPACE, $otherScope, AJXP_METADATA_SCOPE_REPOSITORY, true);
-        // The scope has changed. Let's clear the old value
-        if(count($otherScopeMeta)){
-            $node->removeMetadata(AJXP_SHARED_META_NAMESPACE, $otherScope, AJXP_METADATA_SCOPE_REPOSITORY, true);
-        }
-        $node->setMetadata(AJXP_SHARED_META_NAMESPACE, $meta, $private, AJXP_METADATA_SCOPE_REPOSITORY, true);
-    }
-
-    /**
-     * @param AJXP_Node $node
-     */
-    public function clearNodeMeta($node){
-        // Try to remove both scopes
-        $node->removeMetadata(AJXP_SHARED_META_NAMESPACE, true, AJXP_METADATA_SCOPE_REPOSITORY, true);
-        $node->removeMetadata(AJXP_SHARED_META_NAMESPACE, false, AJXP_METADATA_SCOPE_REPOSITORY, true);
-    }
-
-
-    /**
-     * @param AJXP_Node $node
-     * @param $shareType
-     * @param $shareId
-     * @param $publicScope
-     * @param string|null $originalShareId
-     */
-    public function addShareInMeta($node, $shareType, $shareId, $publicScope, $originalShareId=null){
-        $shares = array();
-        $this->shareStore->getMetaManager()->getSharesFromMeta($node, $shares, false);
-        if(empty($shares)){
-            $shares = array();
-        }
-        if(!empty($shares) && $originalShareId !== null && isSet($shares[$originalShareId])){
-            unset($shares[$originalShareId]);
-        }
-        $shares[$shareId] = array("type" => $shareType);
-        $this->setNodeMeta($node, array("shares" => $shares), !$publicScope);
-    }
-
-
-    /**
-     * @param AJXP_Node $node
-     * @param $shareId
-     */
-    public function removeShareFromMeta($node, $shareId){
-        $shares = array();
-        $this->shareStore->getMetaManager()->getSharesFromMeta($node, $shares);
-        if(!empty($shares) && isSet($shares[$shareId])){
-            unset($shares[$shareId]);
-            if(count($shares)){
-                $this->setNodeMeta($node, array("shares" => $shares));
-            }else{
-                $this->clearNodeMeta($node);
-            }
-        }
-
-    }
-
-    /**
-     * @param AJXP_Node $node
-     * @param $metas
-     */
-    public function collectSharesInParent($node, &$metas){
-        $node->collectMetadataInParents(AJXP_SHARED_META_NAMESPACE, AJXP_METADATA_ALLUSERS, AJXP_METADATA_SCOPE_REPOSITORY, false, $metas);
-    }
-
-    /**
-     * @param AJXP_Node $node
-     * @return array
-     */
-    public function collectSharesIncludingChildren($node){
-        return $node->collectRepositoryMetadatasInChildren(AJXP_SHARED_META_NAMESPACE, AJXP_METADATA_ALLUSERS);
-    }
-
-    /**
-     * @param AJXP_Node $node
-     * @param string $scope
-     * @return CompositeShare[]
-     */
-    protected function compositeShareFromMetaWithScope($node, $scope = "private"){
-
-        if($scope !== AJXP_METADATA_ALLUSERS){
-            $scope = ($scope == "private");
-        }
-        $meta = $node->retrieveMetadata(AJXP_SHARED_META_NAMESPACE, $scope, AJXP_METADATA_SCOPE_REPOSITORY, true);
-        $shares = array();
-        $composites = array();
-        if(!isSet($meta["shares"])){
-            return $shares;
-        }
-        foreach($meta["shares"] as $id => $shareData){
-            $type = $shareData["type"];
-            if($type == "repository"){
-                if(!isSet($shares[$id])) {
-                    $shares[$id] = array("repository" => $id, "links" => array());
-                }
-            }else if($type == "minisite" || $type == "ocs_remote"){
-                $link = $this->shareStore->loadShareObject($id);
-                if(!empty($link)){
-                    $link->setAdditionalMeta($shareData);
-                    $linkRepoId = $link->getRepositoryId();
-                    if(empty($linkRepoId)) {
-                        continue;
-                    }
-                    if(!isSet($shares[$linkRepoId])) {
-                        $shares[$linkRepoId] = array("repository" => $linkRepoId, "links" => array());
-                    }
-                    $shares[$linkRepoId]["links"][] = $link;
-                }
-            }
-        }
-        foreach($shares as $repoId => $repoData){
-            $composite = new CompositeShare($node, $repoId);
-            foreach($repoData["links"] as $link){
-                $composite->addLink($link);
-            }
-            $composites[] = $composite;
-        }
-        return $composites;
-
-    }
-
-
-    /**
-     * @param AJXP_Node $node
-     * @param bool $allUsersScope
-     * @return CompositeShare|null
-     */
-    public function getCompositeShareForNode($node, $allUsersScope = false){
-        if($allUsersScope){
-            $global = $this->compositeShareFromMetaWithScope($node, AJXP_METADATA_ALLUSERS);
-            if(count($global)) {
-                return $global[0];
-            }
-            return null;
-        }
-        $private = $this->compositeShareFromMetaWithScope($node, "private");
-        if(count($private)) {
-            return $private[0];
-        }else{
-            $public = $this->compositeShareFromMetaWithScope($node, "public");
-            if(count($public)){
-                return $public[0];
-            }
-        }
-        return null;
-    }
-
-    /**
-     * @param AJXP_Node $node
-     * @param array $shares
-     * @param bool $clearIfEmpty
-     */
-    public function getSharesFromMeta($node, &$shares, $clearIfEmpty = false){
-
-        $meta = $this->getNodeMeta($node);
-
-        // NEW FORMAT
-        if(isSet($meta["shares"])){
-            $shares = array();
-            $update = false;
-            foreach($meta["shares"] as $hashOrRepoId => $shareData){
-                $type = $shareData["type"];
-                if(is_array($type)) {
-                    $shareData["type"] = $type[0];
-                }
-                if(!$clearIfEmpty || $this->shareStore->shareExists($shareData["type"],$hashOrRepoId)){
-                    $shares[$hashOrRepoId] = $shareData;
-                }else{
-                    $update = true;
-                }
-            }
-            if($update && !count($shares)){
-                $this->clearNodeMeta($node);
-            }
-            return;
-        }
-
-        // OLD FORMAT
-        if(isSet($meta["minisite"])){
-            $type = "minisite";
-        }else{
-            $type = "detect";
-        }
-        $els = array();
-        if(is_string($meta["element"])) $els[] = $meta["element"];
-        else if (is_array($meta["element"])) $els = $meta["element"];
-        if($clearIfEmpty){
-            $update = false;
-            $shares = array();
-            foreach($els as $hashOrRepoId => $additionalData){
-                if(is_string($additionalData)) {
-                    $hashOrRepoId = $additionalData;
-                    $additionalData = array();
-                }
-                if($type == "detect"){
-                    if(ConfService::getRepositoryById($hashOrRepoId) != null) $type = "repository";
-                    else $type = "file";
-                }
-                if($this->shareStore->shareExists($type,$hashOrRepoId)){
-                    $shares[$hashOrRepoId] = array_merge($additionalData, array("type" => $type));
-                }else{
-                    $update = true;
-                }
-            }
-            if($update && !count($shares)){
-                $this->clearNodeMeta($node);
-            }
-        }else{
-            $shares = $els;
-        }
-
-    }
-
-}
\ No newline at end of file
diff --git a/core/src/plugins/action.share/class.ShareRightsManager.php b/core/src/plugins/action.share/class.ShareRightsManager.php
deleted file mode 100644
index da8ebc82e5..0000000000
--- a/core/src/plugins/action.share/class.ShareRightsManager.php
+++ /dev/null
@@ -1,608 +0,0 @@
-<?php
-/*
- * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-define('PARAM_USER_LOGIN_PREFIX', "user_");
-define('PARAM_USER_PASS_PREFIX', "user_pass_");
-define('PARAM_USER_RIGHT_WATCH_PREFIX', "right_watch_");
-define('PARAM_USER_RIGHT_READ_PREFIX', "right_read_");
-define('PARAM_USER_RIGHT_WRITE_PREFIX', "right_write_");
-define('PARAM_USER_ENTRY_TYPE', "entry_type_");
-
-class ShareRightsManager
-{
-    /**
-     * @var MetaWatchRegister|bool
-     */
-    var $watcher;
-    /**
-     * @var ShareStore $store
-     */
-    var $store;
-
-    /**
-     * @var array $options
-     */
-    var $options;
-
-    /**
-     * ShareRightsManager constructor.
-     * @param array $options
-     * @param ShareStore $store
-     * @param MetaWatchRegister|bool $watcher
-     */
-    public function __construct($options, $store, $watcher = false)
-    {
-        $this->options = $options;
-        $this->watcher = $watcher;
-        $this->store = $store;
-    }
-
-    /**
-     * @param array $httpVars
-     * @param ShareLink $shareObject
-     * @param bool $update
-     * @param null $guestUserPass
-     * @return array
-     * @throws Exception
-     */
-    public function prepareSharedUserEntry($httpVars, &$shareObject, $update, $guestUserPass = null){
-        $userPass = null;
-
-        $forcePassword = $this->options["SHARE_FORCE_PASSWORD"];
-        if($forcePassword && (
-                (isSet($httpVars["create_guest_user"]) && $httpVars["create_guest_user"] == "true" && empty($guestUserPass))
-                || (isSet($httpVars["guest_user_id"]) && isSet($guestUserPass) && strlen($guestUserPass) == 0)
-            )){
-            $mess = ConfService::getMessages();
-            throw new Exception($mess["share_center.175"]);
-        }
-
-        if($update){
-
-            // THIS IS AN EXISTING SHARE
-            // FIND SHARE AND EXISTING HIDDEN USER ID
-            if($shareObject->isAttachedToRepository()){
-                $existingRepo = $shareObject->getRepository();
-                $this->store->testUserCanEditShare($existingRepo->getOwner(), $existingRepo->options);
-            }
-            $uniqueUser = $shareObject->getUniqueUser();
-            if($guestUserPass !== null && strlen($guestUserPass)) {
-                $userPass = $guestUserPass;
-                $shareObject->setUniqueUser($uniqueUser, true);
-            }else if(!$shareObject->shouldRequirePassword() || ($guestUserPass !== null && $guestUserPass == "")){
-                $shareObject->setUniqueUser($uniqueUser, false);
-            }
-            if($update && $forcePassword && !($shareObject instanceof \Pydio\OCS\Model\TargettedLink) && !$shareObject->shouldRequirePassword() && empty($guestUserPass)){
-                $mess = ConfService::getMessages();
-                throw new Exception($mess["share_center.175"]);
-            }
-
-        } else {
-
-            $update = false;
-            $shareObject->createHiddenUserId(
-                $this->options["SHARED_USERS_TMP_PREFIX"],
-                !empty($guestUserPass)
-            );
-            if(!empty($guestUserPass)){
-                $userPass = $guestUserPass;
-            }else{
-                $userPass = $shareObject->createHiddenUserPassword();
-            }
-            $uniqueUser = $shareObject->getUniqueUser();
-        }
-
-        $hiddenUserEntry = $this->createHiddenUserEntry($httpVars, $uniqueUser, $userPass, $update);
-        if(empty($hiddenUserEntry["RIGHT"])){
-            $mess = ConfService::getMessages();
-            throw new Exception($mess["share_center.58"]);
-        }
-        $hiddenUserEntry["DISABLE_DOWNLOAD"] = $shareObject->disableDownload();
-        if($shareObject instanceof \Pydio\OCS\Model\TargettedLink){
-            $hiddenUserEntry["REMOTE"] = true;
-        }
-        return $hiddenUserEntry;
-    }
-
-
-    /**
-     * @param array $httpVars
-     * @param string $userId
-     * @param string|null $userPass
-     * @param bool|false $update
-     * @return array
-     */
-    public function createHiddenUserEntry($httpVars, $userId, $userPass = null, $update = false){
-
-        $entry = array("ID" => $userId, "TYPE" => "user", "HIDDEN" => true);
-        $read = isSet($httpVars["simple_right_read"]) ;
-        $write = isSet($httpVars["simple_right_write"]);
-        $disableDownload = !isSet($httpVars["simple_right_download"]);
-        if (!$read && !$disableDownload) {
-            $read = true;
-        }
-        $entry["RIGHT"] = ($read?"r":"").($write?"w":"");
-        $entry["WATCH"] = false;
-        if(isSet($userPass)){
-            if($update){
-                $entry["UPDATE_PASSWORD"] = $userPass;
-            }else{
-                $entry["PASSWORD"] = $userPass;
-            }
-        }
-        return $entry;
-
-    }
-
-    /**
-     * @param $httpVars
-     * @param array $users
-     * @param array $groups
-     * @throws Exception
-     */
-    public function createUsersFromParameters($httpVars, &$users = array(), &$groups = array()){
-
-        $index = 0;
-        $allowCrossUserSharing = ConfService::getCoreConf("ALLOW_CROSSUSERS_SHARING", "conf");
-        $allowSharedUsersCreation = ConfService::getCoreConf("USER_CREATE_USERS", "conf");
-        $loggedUser = AuthService::getLoggedUser();
-        $confDriver = ConfService::getConfStorageImpl();
-        $mess = ConfService::getMessages();
-
-        while (isSet($httpVars[PARAM_USER_LOGIN_PREFIX.$index])) {
-
-            $eType = $httpVars[PARAM_USER_ENTRY_TYPE.$index];
-            $rightString = ($httpVars[PARAM_USER_RIGHT_READ_PREFIX.$index]=="true"?"r":"").($httpVars[PARAM_USER_RIGHT_WRITE_PREFIX.$index]=="true"?"w":"");
-            $uWatch = false;
-            if($this->watcher !== false) {
-                $uWatch = $httpVars[PARAM_USER_RIGHT_WATCH_PREFIX.$index] == "true" ? true : false;
-            }
-            if (empty($rightString)) {
-                $index++;
-                continue;
-            }
-
-            if ($eType == "user") {
-
-                $u = AJXP_Utils::decodeSecureMagic($httpVars[PARAM_USER_LOGIN_PREFIX.$index], AJXP_SANITIZE_EMAILCHARS);
-                $userExistsRead = AuthService::userExists($u);
-                if (!$userExistsRead && !isSet($httpVars[PARAM_USER_PASS_PREFIX.$index])) {
-                    $index++;
-                    continue;
-                } else if (AuthService::userExists($u, "w") && isSet($httpVars[PARAM_USER_PASS_PREFIX.$index])) {
-                    throw new Exception( str_replace("%s", $u, $mess["share_center.222"]));
-                }
-                if($userExistsRead){
-                    $userObject = $confDriver->createUserObject($u);
-                    if ( $allowCrossUserSharing != true && ( !$userObject->hasParent() || $userObject->getParent() != $loggedUser->getId() ) ) {
-                        throw new Exception($mess["share_center.221"]);
-                    }
-                }else{
-                    if(!$allowSharedUsersCreation || AuthService::isReservedUserId($u)){
-                        throw new Exception($mess["share_center.220"]);
-                    }
-                    if(!empty($this->options["SHARED_USERS_TMP_PREFIX"]) && strpos($u, $this->options["SHARED_USERS_TMP_PREFIX"])!==0 ){
-                        $u = $this->options["SHARED_USERS_TMP_PREFIX"] . $u;
-                    }
-                }
-                $entry = array("ID" => $u, "TYPE" => "user");
-
-            } else {
-
-                $u = AJXP_Utils::decodeSecureMagic($httpVars[PARAM_USER_LOGIN_PREFIX.$index]);
-
-                if (strpos($u, "/AJXP_TEAM/") === 0) {
-
-                    if (method_exists($confDriver, "teamIdToUsers")) {
-                        $teamUsers = $confDriver->teamIdToUsers(str_replace("/AJXP_TEAM/", "", $u));
-                        foreach ($teamUsers as $userId) {
-                            $users[$userId] = array("ID" => $userId, "TYPE" => "user", "RIGHT" => $rightString);
-                            if ($this->watcher !== false) {
-                                $users[$userId]["WATCH"] = $uWatch;
-                            }
-                        }
-                    }
-                    $index++;
-                    continue;
-
-                }
-
-                $entry = array("ID" => $u, "TYPE" => "group");
-
-            }
-            $entry["RIGHT"] = $rightString;
-            $entry["PASSWORD"] = isSet($httpVars[PARAM_USER_PASS_PREFIX.$index])?$httpVars[PARAM_USER_PASS_PREFIX.$index]:"";
-            if ($this->watcher !== false) {
-                $entry["WATCH"] = $uWatch;
-            }
-            if($entry["TYPE"] == "user") {
-                $users[$entry["ID"]] = $entry;
-            }else{
-                if($entry["ID"] == "AJXP_GRP_/"){
-                    $entry["ID"] = "AJXP_GRP_".AuthService::filterBaseGroup("/");
-                }
-                $groups[$entry["ID"]] = $entry;
-
-            }
-            $index ++;
-
-        }
-
-    }
-
-    /**
-     * @param array $ocsData
-     * @param Pydio\OCS\Model\ShareInvitation[] $existingInvitations
-     * @param array $newOcsUsers
-     * @param array $unshareInvitations
-     * @return int
-     */
-    public function remoteUsersFromParameters($ocsData, $existingInvitations, &$newOcsUsers, &$unshareInvitations){
-        $totalInvitations = count($ocsData["invitations"]);
-        $newOcsUsers = array();
-        $unshareInvitations = array();
-
-        $resentIds = array();
-        foreach($ocsData["invitations"] as $invitationData){
-            if(isSet($invitationData["INVITATION_ID"])){
-                $resentIds[] = $invitationData["INVITATION_ID"];
-            }else{
-                $newOcsUsers[] = $invitationData;
-            }
-        }
-        foreach($existingInvitations as $invitation){
-            if(!in_array($invitation->getId(), $resentIds)){
-                $unshareInvitations[] = $invitation;
-            }
-        }
-        return $totalInvitations;
-    }
-
-    /**
-     * @param String $repoId
-     * @param bool $mixUsersAndGroups
-     * @param AJXP_Node|null $watcherNode
-     * @return array
-     */
-    public function computeSharedRepositoryAccessRights($repoId, $mixUsersAndGroups, $watcherNode = null)
-    {
-        $roles = AuthService::getRolesForRepository($repoId);
-        $sharedEntries = $sharedGroups = array();
-        $mess = ConfService::getMessages();
-        foreach($roles as $rId){
-            $role = AuthService::getRole($rId);
-            if ($role == null) continue;
-
-            $RIGHT = $role->getAcl($repoId);
-            if (empty($RIGHT)) continue;
-            $ID = $rId;
-            $WATCH = false;
-            $HIDDEN = false;
-            $AVATAR = false;
-            if(strpos($rId, "AJXP_USR_/") === 0){
-                $userId = substr($rId, strlen('AJXP_USR_/'));
-                $role = AuthService::getRole($rId);
-                $userObject = ConfService::getConfStorageImpl()->createUserObject($userId);
-                $LABEL = $role->filterParameterValue("core.conf", "USER_DISPLAY_NAME", AJXP_REPO_SCOPE_ALL, "");
-                $AVATAR = $role->filterParameterValue("core.conf", "avatar", AJXP_REPO_SCOPE_ALL, "");
-                if(empty($LABEL)) $LABEL = $userId;
-                $TYPE = $userObject->hasParent()?"tmp_user":"user";
-                $HIDDEN = $userObject->isHidden();
-                if ($this->watcher !== false && $watcherNode != null) {
-                    $WATCH = $this->watcher->hasWatchOnNode(
-                        $watcherNode,
-                        $userId,
-                        MetaWatchRegister::$META_WATCH_USERS_NAMESPACE
-                    );
-                }
-                $ID = $userId;
-            }else if($rId == "AJXP_GRP_".AuthService::filterBaseGroup("/")){
-                $TYPE = "group";
-                $LABEL = $mess["447"];
-            }else if(strpos($rId, "AJXP_GRP_/") === 0){
-                if(empty($loadedGroups)){
-                    $displayAll = ConfService::getCoreConf("CROSSUSERS_ALLGROUPS_DISPLAY", "conf");
-                    if($displayAll){
-                        AuthService::setGroupFiltering(false);
-                    }
-                    $loadedGroups = AuthService::listChildrenGroups();
-                    if($displayAll){
-                        AuthService::setGroupFiltering(true);
-                    }else{
-                        $baseGroup = AuthService::filterBaseGroup("/");
-                        foreach($loadedGroups as $loadedG => $loadedLabel){
-                            unset($loadedGroups[$loadedG]);
-                            $loadedGroups[rtrim($baseGroup, "/")."/".ltrim($loadedG, "/")] = $loadedLabel;
-                        }
-                    }
-                }
-                $groupId = substr($rId, strlen('AJXP_GRP_'));
-                if(isSet($loadedGroups[$groupId])) {
-                    $LABEL = $loadedGroups[$groupId];
-                }
-                /*
-                if($groupId == AuthService::filterBaseGroup("/")){
-                    $LABEL = $mess["447"];
-                }
-                */
-                if(empty($LABEL)) $LABEL = $groupId;
-                $TYPE = "group";
-            }else{
-                $role = AuthService::getRole($rId);
-                $LABEL = $role->getLabel();
-                $TYPE = 'group';
-            }
-
-            if(empty($LABEL)) $LABEL = $rId;
-            $entry = array(
-                "ID"    => $ID,
-                "TYPE"  => $TYPE,
-                "LABEL" => $LABEL,
-                "RIGHT" => $RIGHT
-            );
-            if($WATCH) $entry["WATCH"] = $WATCH;
-            if($HIDDEN) $entry["HIDDEN"] = true;
-            if($AVATAR !== false) $entry["AVATAR"] = $AVATAR;
-            if($TYPE == "group"){
-                $sharedGroups[$entry["ID"]] = $entry;
-            } else {
-                $sharedEntries[$entry["ID"]] = $entry;
-            }
-        }
-
-        if (!$mixUsersAndGroups) {
-            return array("USERS" => $sharedEntries, "GROUPS" => $sharedGroups);
-        }else{
-            return array_merge(array_values($sharedGroups), array_values($sharedEntries));
-
-        }
-    }
-
-    /**
-     * @param Repository $parentRepository
-     * @param Repository $childRepository
-     * @param bool $isUpdate
-     * @param array $users
-     * @param array $groups
-     * @param UserSelection $selection
-     * @param bool|false $disableDownload
-     * @throws Exception
-     */
-    public function assignSharedRepositoryPermissions($parentRepository, $childRepository, $isUpdate, $users, $groups, $selection){
-
-        $childRepoId = $childRepository->getId();
-        if($isUpdate){
-            $this->unregisterRemovedUsers($childRepoId, $users, $groups, $selection->getUniqueNode());
-        }
-        $confDriver = ConfService::getConfStorageImpl();
-        $loggedUser = AuthService::getLoggedUser();
-        foreach ($users as $userName => $userEntry) {
-
-            if (AuthService::userExists($userName, "r")) {
-                $userObject = $confDriver->createUserObject($userName);
-                if(isSet($userEntry["HIDDEN"]) && isSet($userEntry["UPDATE_PASSWORD"])){
-                    AuthService::updatePassword($userName, $userEntry["UPDATE_PASSWORD"]);
-                }
-            } else {
-                $mess = ConfService::getMessages();
-                $hiddenUserLabel = "[".$mess["share_center.109"]."] ". AJXP_Utils::sanitize($childRepository->getDisplay(), AJXP_SANITIZE_EMAILCHARS);
-                $userObject = $this->createNewUser($loggedUser, $userName, $userEntry["PASSWORD"], isset($userEntry["HIDDEN"]), $hiddenUserLabel);
-            }
-
-            // ASSIGN NEW REPO RIGHTS
-            $userObject->personalRole->setAcl($childRepoId, $userEntry["RIGHT"]);
-
-            // FORK MASK IF THERE IS ANY
-            $childMask = $this->forkMaskIfAny($loggedUser, $parentRepository->getId(), $selection->getUniqueNode());
-            if($childMask != null){
-                $userObject->personalRole->setMask($childRepoId, $childMask);
-            }
-
-            // CREATE A MINISITE-LIKE ROLE FOR THIS REPOSITORY
-            if (isSet($userEntry["HIDDEN"]) && !isSet($userEntry["REMOTE"])) {
-                $minisiteRole = $this->createRoleForMinisite($childRepoId, $userEntry["DISABLE_DOWNLOAD"], $isUpdate);
-                if($minisiteRole != null){
-                    $userObject->addRole($minisiteRole);
-                }
-            }
-            // ADD "my shared files" REPO OTHERWISE SOME USER CANNOT ACCESS
-            if( !isSet($userEntry["HIDDEN"]) && $childRepository->hasContentFilter()){
-                $inboxRepo = ConfService::getRepositoryById("inbox");
-                $currentAcl = $userObject->mergedRole->getAcl("inbox");
-                if($inboxRepo !== null && empty($currentAcl)){
-                    $userObject->personalRole->setAcl("inbox", "rw");
-                }
-            }
-
-            $userObject->save("superuser");
-        }
-
-        foreach ($groups as $group => $groupEntry) {
-            $r = $groupEntry["RIGHT"];
-            $grRole = AuthService::getRole($group, true);
-            $grRole->setAcl($childRepoId, $r);
-            AuthService::updateRole($grRole);
-        }
-
-    }
-
-    /**
-     * @param string $repoId
-     * @param array $newUsers
-     * @param array $newGroups
-     * @param AJXP_Node|null $watcherNode
-     */
-    public function unregisterRemovedUsers($repoId, $newUsers, $newGroups, $watcherNode = null){
-
-        $confDriver = ConfService::getConfStorageImpl();
-
-        $currentRights = $this->computeSharedRepositoryAccessRights(
-            $repoId,
-            false,
-            $watcherNode
-        );
-
-        $originalUsers = array_keys($currentRights["USERS"]);
-        $removeUsers = array_diff($originalUsers, array_keys($newUsers));
-        if (count($removeUsers)) {
-            foreach ($removeUsers as $user) {
-                if (AuthService::userExists($user)) {
-                    $userObject = $confDriver->createUserObject($user);
-                    $userObject->personalRole->setAcl($repoId, "");
-                    $userObject->save("superuser");
-                }
-                if($this->watcher !== false && $watcherNode !== null){
-                    $this->watcher->removeWatchFromFolder(
-                        $watcherNode,
-                        $user,
-                        true
-                    );
-                }
-            }
-        }
-        $originalGroups = array_keys($currentRights["GROUPS"]);
-        $removeGroups = array_diff($originalGroups, array_keys($newGroups));
-        if (count($removeGroups)) {
-            foreach ($removeGroups as $groupId) {
-                $role = AuthService::getRole($groupId);
-                if ($role !== false) {
-                    $role->setAcl($repoId, "");
-                    AuthService::updateRole($role);
-                }
-            }
-        }
-
-    }
-
-    /**
-     * @param AbstractAjxpUser $parentUser
-     * @param string $userName
-     * @param string $password
-     * @param bool $isHidden
-     * @param string $display
-     * @return AbstractAjxpUser
-     * @throws Exception
-     */
-    public function createNewUser($parentUser, $userName, $password, $isHidden, $display){
-
-        $confDriver = ConfService::getConfStorageImpl();
-        if (ConfService::getAuthDriverImpl()->getOptionAsBool("TRANSMIT_CLEAR_PASS")) {
-            $pass = $password;
-        } else {
-            $pass = md5($password);
-        }
-        if(!$isHidden){
-            // This is an explicit user creation - check possible limits
-            AJXP_Controller::applyHook("user.before_create", array($userName, null, false, false));
-            $limit = $parentUser->mergedRole->filterParameterValue("core.conf", "USER_SHARED_USERS_LIMIT", AJXP_REPO_SCOPE_ALL, "");
-            if (!empty($limit) && intval($limit) > 0) {
-                $count = count($confDriver->getUserChildren($parentUser->getId()));
-                if ($count >= $limit) {
-                    $mess = ConfService::getMessages();
-                    throw new Exception($mess['483']);
-                }
-            }
-        }
-        AuthService::createUser($userName, $pass, false, $isHidden);
-        $userObject = $confDriver->createUserObject($userName);
-        $userObject->personalRole->clearAcls();
-        $userObject->setParent($parentUser->getId());
-        $userObject->setGroupPath($parentUser->getGroupPath());
-        $userObject->setProfile("shared");
-        if($isHidden){
-            $userObject->setHidden(true);
-            $userObject->personalRole->setParameterValue("core.conf", "USER_DISPLAY_NAME", $display);
-        }
-        AJXP_Controller::applyHook("user.after_create", array($userObject));
-
-        return $userObject;
-
-    }
-
-
-    /**
-     * @param AbstractAjxpUser $parentUser
-     * @param string $parentRepoId
-     * @param AJXP_Node $ajxpNode
-     * @return AJXP_PermissionMask|null
-     */
-    public function forkMaskIfAny($parentUser, $parentRepoId, $ajxpNode){
-
-        $file = $ajxpNode->getPath();
-        if($file != "/" && $parentUser->mergedRole->hasMask($parentRepoId)){
-            $parentTree = $parentUser->mergedRole->getMask($parentRepoId)->getTree();
-            // Try to find a branch on the current selection
-            $parts = explode("/", trim($file, "/"));
-            while( ($next = array_shift($parts))  !== null){
-                if(is_array($parentTree) && isSet($parentTree[$next])) {
-                    $parentTree = $parentTree[$next];
-                }else{
-                    $parentTree = null;
-                    break;
-                }
-            }
-            if($parentTree != null){
-                $newMask = new AJXP_PermissionMask();
-                $newMask->updateTree($parentTree);
-            }
-            if(isset($newMask)){
-                return $newMask;//$childUser->personalRole->setMask($childRepoId, $newMask);
-            }
-        }
-        return null;
-
-    }
-
-    /**
-     * @param string $repositoryId
-     * @param bool $disableDownload
-     * @param bool $replace
-     * @return AJXP_Role|null
-     */
-    public function createRoleForMinisite($repositoryId, $disableDownload, $replace){
-        if($replace){
-            try{
-                AuthService::deleteRole("AJXP_SHARED-".$repositoryId);
-            }catch (Exception $e){}
-        }
-        $newRole = new AJXP_Role("AJXP_SHARED-".$repositoryId);
-        $r = AuthService::getRole("MINISITE");
-        if (is_a($r, "AJXP_Role")) {
-            if ($disableDownload) {
-                $f = AuthService::getRole("MINISITE_NODOWNLOAD");
-                if (is_a($f, "AJXP_Role")) {
-                    $r = $f->override($r);
-                }
-            }
-            $allData = $r->getDataArray();
-            $newData = $newRole->getDataArray();
-            if(isSet($allData["ACTIONS"][AJXP_REPO_SCOPE_SHARED])) $newData["ACTIONS"][$repositoryId] = $allData["ACTIONS"][AJXP_REPO_SCOPE_SHARED];
-            if(isSet($allData["PARAMETERS"][AJXP_REPO_SCOPE_SHARED])) $newData["PARAMETERS"][$repositoryId] = $allData["PARAMETERS"][AJXP_REPO_SCOPE_SHARED];
-            $newRole->bunchUpdate($newData);
-            AuthService::updateRole($newRole);
-            return $newRole;
-        }
-        return null;
-    }
-
-}
\ No newline at end of file
diff --git a/core/src/plugins/action.share/class.ShareStore.php b/core/src/plugins/action.share/class.ShareStore.php
deleted file mode 100644
index b72815e929..0000000000
--- a/core/src/plugins/action.share/class.ShareStore.php
+++ /dev/null
@@ -1,869 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-require_once("class.PublicletCounter.php");
-require_once("class.ShareLink.php");
-
-class ShareStore {
-
-    var $sqlSupported = false;
-    var $downloadFolder;
-    var $hashMinLength;
-    public $modifiableShareKeys = array("counter", "tags", "short_form_url");
-    /**
-     * @var sqlConfDriver
-     */
-    var $confStorage;
-
-    var $shareMetaManager;
-
-    public function __construct($downloadFolder, $hashMinLength = 32){
-        $this->downloadFolder = $downloadFolder;
-        $this->hashMinLength = $hashMinLength;
-        $storage = ConfService::getConfStorageImpl();
-        if($storage->getId() == "conf.sql") {
-            $this->sqlSupported = true;
-            $this->confStorage = $storage;
-        }
-    }
-
-    /**
-     * @return ShareMetaManager
-     */
-    public function getMetaManager(){
-        if(!isSet($this->shareMetaManager)){
-            require_once("class.ShareMetaManager.php");
-            $this->shareMetaManager = new ShareMetaManager($this);
-        }
-        return $this->shareMetaManager;
-    }
-
-    /**
-     * Create a share.php file in the download folder.
-     * @throws Exception
-     */
-    private function createGenericLoader(){
-        if(!is_file($this->downloadFolder."/share.php")){
-            $loader_content = '<'.'?'.'php
-                    define("AJXP_EXEC", true);
-                    require_once("'.str_replace("\\", "/", AJXP_INSTALL_PATH).'/core/classes/class.AJXP_Utils.php");
-                    $hash = AJXP_Utils::securePath(AJXP_Utils::sanitize($_GET["hash"], AJXP_SANITIZE_ALPHANUM));
-                    if(file_exists($hash.".php")){
-                        require_once($hash.".php");
-                    }else{
-                        require_once("'.str_replace("\\", "/", AJXP_INSTALL_PATH).'/publicLet.inc.php");
-                        ShareCenter::loadShareByHash($hash);
-                    }
-                ';
-            if (@file_put_contents($this->downloadFolder."/share.php", $loader_content) === FALSE) {
-                throw new Exception("Can't write to PUBLIC URL");
-            }
-        }
-    }
-
-    /**
-     * @param String $parentRepositoryId
-     * @param array $shareData
-     * @param string $type
-     * @param String $existingHash
-     * @param null $updateHash
-     * @throws Exception
-     * @return string $hash
-     */
-    public function storeShare($parentRepositoryId, $shareData, $type="minisite", $existingHash = null, $updateHash = null){
-
-        $data = serialize($shareData);
-        if($existingHash){
-            $hash = $existingHash;
-        }else{
-            $hash = $this->computeHash($data, $this->downloadFolder);
-        }
-        if($this->sqlSupported){
-            $this->createGenericLoader();
-            $shareData["SHARE_TYPE"] = $type;
-            if($updateHash != null){
-                $this->confStorage->simpleStoreClear("share", $existingHash);
-                $hash = $updateHash;
-            }
-            $this->confStorage->simpleStoreSet("share", $hash, $shareData, "serial", $parentRepositoryId);
-            return $hash;
-        }
-        if(!empty($existingHash)){
-            throw new Exception("Current storage method does not support parameters edition!");
-        }
-
-        $loader = 'ShareCenter::loadMinisite($data);';
-        if($type == "publiclet"){
-            $loader = 'ShareCenter::loadPubliclet($data);';
-        }
-
-        $outputData = base64_encode(mcrypt_encrypt(MCRYPT_RIJNDAEL_256, str_pad($hash, 16, "\0"), $data, MCRYPT_MODE_ECB));
-        $fileData = "<"."?"."php \n".
-            '   require_once("'.str_replace("\\", "/", AJXP_INSTALL_PATH).'/publicLet.inc.php"); '."\n".
-            '   $id = str_replace(".php", "", basename(__FILE__)); '."\n". // Not using "" as php would replace $ inside
-            '   $cypheredData = base64_decode("'.$outputData.'"); '."\n".
-            '   $inputData = trim(mcrypt_decrypt(MCRYPT_RIJNDAEL_256, str_pad($id, 16, "\0"), $cypheredData, MCRYPT_MODE_ECB), "\0");  '."\n".
-            '   // if (!ShareCenter::checkHash($inputData, $id)) { header("HTTP/1.0 401 Not allowed, script was modified"); exit(); } '."\n".
-            '   // Ok extract the data '."\n".
-            '   $data = unserialize($inputData); '.$loader;
-        if (@file_put_contents($this->downloadFolder."/".$hash.".php", $fileData) === FALSE) {
-            throw new Exception("Can't write to PUBLIC URL");
-        }
-        @chmod($this->downloadFolder."/".$hash.".php", 0755);
-        return $hash;
-
-    }
-
-    /**
-     * Initialize an empty ShareLink object.
-     * @return ShareLink
-     */
-    public function createEmptyShareObject(){
-        $shareObject = new ShareLink($this);
-        if(AuthService::usersEnabled()){
-            $shareObject->setOwnerId(AuthService::getLoggedUser()->getId());
-        }
-        return $shareObject;
-    }
-
-    /**
-     * Initialize a ShareLink from persisted data.
-     * @param string $hash
-     * @return ShareLink
-     * @throws Exception
-     */
-    public function loadShareObject($hash){
-        $data = $this->loadShare($hash);
-        if($data === false){
-            $mess = ConfService::getMessages();
-            throw new Exception(str_replace('%s', 'Cannot find share with hash '.$hash, $mess["share_center.219"]));
-        }
-        if(isSet($data["TARGET"]) && $data["TARGET"] == "remote"){
-            $shareObject = new Pydio\OCS\Model\TargettedLink($this, $data);
-        }else{
-            $shareObject = new ShareLink($this, $data);
-        }
-        $shareObject->setHash($hash);
-        return $shareObject;
-    }
-
-    /**
-     * Load data persisted on DB or on publiclet files.
-     * @param $hash
-     * @return array|bool|mixed
-     */
-    public function loadShare($hash){
-
-        $dlFolder = $this->downloadFolder;
-        $file = $dlFolder."/".$hash.".php";
-        if(!is_file($file)) {
-            if($this->sqlSupported){
-                $this->confStorage->simpleStoreGet("share", $hash, "serial", $data);
-                if(!empty($data)){
-                    $data["DOWNLOAD_COUNT"] = PublicletCounter::getCount($hash);
-                    $data["SECURITY_MODIFIED"] = false;
-                    return $data;
-                }
-            }
-            return array();
-        }
-        $lines = file($file);
-        $inputData = '';
-        // Necessary for the eval
-        $id = $hash;
-        // UPDATE LINK FOR PHP5.6
-        if(trim($lines[4]) == '$inputData = trim(mcrypt_decrypt(MCRYPT_RIJNDAEL_256, $id, $cypheredData, MCRYPT_MODE_ECB), "\0");' && is_writable($file)){
-            // Upgrade line
-            $lines[4] = '   $inputData = trim(mcrypt_decrypt(MCRYPT_RIJNDAEL_256, str_pad($id, 16, "\0"), $cypheredData, MCRYPT_MODE_ECB), "\0");'."\n";
-            $res = file_put_contents($file, implode('', $lines));
-        }
-        $code = $lines[3] . $lines[4] . $lines[5];
-        eval($code);
-        if(empty($inputData)) return false;
-        $dataModified = !$this->checkHash($inputData, $hash); //(md5($inputData) != $id);
-        $publicletData = unserialize($inputData);
-        $publicletData["SECURITY_MODIFIED"] = $dataModified;
-        if (!isSet($publicletData["REPOSITORY"])) {
-            $publicletData["DOWNLOAD_COUNT"] = PublicletCounter::getCount($hash);
-        }
-        $publicletData["PUBLICLET_PATH"] = $file;
-        /*
-        if($this->sqlSupported){
-            // Move old file to DB-storage
-            $type = (isset($publicletData["REPOSITORY"]) ? "minisite" : "publiclet");
-            $this->createGenericLoader();
-            $shareData["SHARE_TYPE"] = $type;
-            $this->confStorage->simpleStoreSet("share", $hash, $publicletData, "serial");
-            unlink($file);
-        }
-        */
-
-        return $publicletData;
-
-    }
-
-    /**
-     * Test if hash.php is a real file.
-     * @param string $hash
-     * @return bool
-     */
-    public function shareIsLegacy($hash){
-        $dlFolder = $this->downloadFolder;
-        $file = $dlFolder."/".$hash.".php";
-        return is_file($file);
-    }
-
-    /**
-     * Update a single share property
-     * @param string $hash
-     * @param string $pName
-     * @param string $pValue
-     * @return bool
-     * @throws Exception
-     */
-    public function updateShareProperty($hash, $pName, $pValue){
-        if(!$this->sqlSupported) return false;
-        $relatedObjectId = $this->confStorage->simpleStoreGet("share", $hash, "serial", $data);
-        if(is_array($data)){
-            $data[$pName] = $pValue;
-            $this->confStorage->simpleStoreSet("share", $hash, $data, "serial", $relatedObjectId);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * List shares based on child repository ID;
-     * @param $repositoryId
-     * @return array
-     */
-    public function findSharesForRepo($repositoryId){
-        if(!$this->sqlSupported) return array();
-        return $this->confStorage->simpleStoreList("share", null, "", "serial", '%"REPOSITORY";s:32:"'.$repositoryId.'"%');
-    }
-
-    /**
-     * Update share type from legacy values to new ones.
-     * @param $shareData
-     */
-    protected function updateShareType(&$shareData){
-        if ( isSet($shareData["SHARE_TYPE"]) && $shareData["SHARE_TYPE"] == "publiclet" ) {
-            $shareData["SHARE_TYPE"] = "file";
-        } else if ( isset($shareData["REPOSITORY"]) && is_a($shareData["REPOSITORY"], "Repository") ){
-            $shareData["SHARE_TYPE"] = "file";
-        } else if ( isSet($shareData["PUBLICLET_PATH"]) ){
-            $shareData["SHARE_TYPE"] = "minisite";
-        }
-    }
-
-    /**
-     * List all shares persisted in DB and on file.
-     * @param string $limitToUser
-     * @param string $parentRepository
-     * @param null $cursor
-     * @param null $shareType
-     * @return array
-     */
-    public function listShares($limitToUser = '', $parentRepository = '', $cursor = null, $shareType = null){
-
-        $dbLets = array();
-        if($this->sqlSupported){
-            // Get DB files
-            $dbLets = $this->confStorage->simpleStoreList(
-                "share",
-                $cursor,
-                "",
-                "serial",
-                (!empty($limitToUser)?'%"OWNER_ID";s:'.strlen($limitToUser).':"'.$limitToUser.'"%':''),
-                $parentRepository);
-        }
-
-        // Get hardcoded files
-        $files = glob(ConfService::getCoreConf("PUBLIC_DOWNLOAD_FOLDER")."/*.php");
-        if($files === false) return $dbLets;
-        foreach ($files as $file) {
-            if(basename($file) == "share.php") continue;
-            $ar = explode(".", basename($file));
-            $id = array_shift($ar);
-            $publicletData = $this->loadShare($id);
-            if($publicletData === false) continue;
-            if (!empty($limitToUser) && ( !isSet($publicletData["OWNER_ID"]) || $publicletData["OWNER_ID"] != $limitToUser )) {
-                continue;
-            }
-            if(!empty($parentRepository) && ( (is_string($publicletData["REPOSITORY"]) && $publicletData["REPOSITORY"] != $parentRepository)
-                    || (is_object($publicletData["REPOSITORY"]) && $publicletData["REPOSITORY"]->getUniqueId() != $parentRepository ) )){
-                continue;
-            }
-            $publicletData["SHARE_TYPE"] = "file";
-            $dbLets[$id] = $publicletData;
-        }
-
-        // Update share_type and filter if necessary
-        foreach($dbLets as $id => &$shareData){
-            if($shareData === false){
-                unset($dbLets[$id]);
-                continue;
-            }
-            $this->updateShareType($shareData);
-            if(!empty($shareType) && $shareData["SHARE_TYPE"] != $shareType){
-                unset($dbLets[$id]);
-            }
-        }
-
-        if(empty($shareType) || $shareType == "repository"){
-            // BACKWARD COMPATIBILITY: collect old-school shared repositories that are not yet stored in simpleStore
-            $storedIds = array();
-            foreach($dbLets as $share){
-                if(empty($limitToUser) || $limitToUser == $share["OWNER_ID"]) {
-                    if(is_string($share["REPOSITORY"])) $storedIds[] = $share["REPOSITORY"];
-                    else if (is_object($share["REPOSITORY"])) $storedIds[] = $share["REPOSITORY"]->getUniqueId();
-                }
-            }
-            // Find repositories that would have a parent
-            $criteria = array();
-            $criteria["parent_uuid"] = ($parentRepository == "" ? AJXP_FILTER_NOT_EMPTY : $parentRepository);
-            $criteria["owner_user_id"] = ($limitToUser == "" ? AJXP_FILTER_NOT_EMPTY : $limitToUser);
-            if(count($storedIds)){
-                $criteria["!uuid"] = $storedIds;
-            }
-            $oldRepos = ConfService::listRepositoriesWithCriteria($criteria, $count);
-            foreach($oldRepos as $sharedWorkspace){
-                $dbLets['repo-'.$sharedWorkspace->getId()] = array(
-                    "SHARE_TYPE"    => "repository",
-                    "OWNER_ID"      => $sharedWorkspace->getOwner(),
-                    "REPOSITORY"    => $sharedWorkspace->getUniqueId(),
-                    "LEGACY_REPO_OR_MINI"   => true
-                );
-            }
-        }
-
-        return $dbLets;
-    }
-
-    /**
-     * @param string $userId Share OWNER user ID / Will be compared to the currently logged user ID
-     * @param array|null $shareData Share Data
-     * @return bool Wether currently logged user can view/edit this share or not.
-     * @throws Exception
-     */
-    public function testUserCanEditShare($userId, $shareData){
-
-        if($shareData !== null && isSet($shareData["SHARE_ACCESS"]) && $shareData["SHARE_ACCESS"] == "public"){
-            return true;
-        }
-        if(empty($userId)){
-            $mess = ConfService::getMessages();
-            throw new Exception($mess["share_center.160"]);
-        }
-        $crtUser = AuthService::getLoggedUser();
-        if($crtUser->getId() == $userId) return true;
-        if($crtUser->isAdmin()) return true;
-        $user = ConfService::getConfStorageImpl()->createUserObject($userId);
-        if($user->hasParent() && $user->getParent() == $crtUser->getId()){
-            return true;
-        }
-        $mess = ConfService::getMessages();
-        throw new Exception($mess["share_center.160"]);
-    }
-
-    /**
-     * @param String $type
-     * @param String $element
-     * @param bool $keepRepository
-     * @param bool $ignoreRepoNotFound
-     * @param null $ajxpNode
-     * @return bool
-     * @throws Exception
-     */
-    public function deleteShare($type, $element, $keepRepository = false, $ignoreRepoNotFound = false, $ajxpNode = null)
-    {
-        $mess = ConfService::getMessages();
-        AJXP_Logger::debug(__CLASS__, __FILE__, "Deleting shared element ".$type."-".$element);
-
-        if ($type == "repository") {
-            if(strpos($element, "repo-") === 0) $element = str_replace("repo-", "", $element);
-            $repo = ConfService::getRepositoryById($element);
-            $share = $this->loadShare($element);
-            if($repo == null) {
-                // Maybe a share has
-                if(is_array($share) && isSet($share["REPOSITORY"])){
-                    $repo = ConfService::getRepositoryById($share["REPOSITORY"]);
-                }
-                if($repo == null && !$ignoreRepoNotFound){
-                    throw new Exception(str_replace('%s', 'Cannot find associated repository', $mess["share_center.219"]));
-                }
-            }
-            if($repo != null){
-                $this->testUserCanEditShare($repo->getOwner(), $repo->options);
-                $res = ConfService::deleteRepository($element);
-                if ($res == -1) {
-                    throw new Exception($mess[427]);
-                }
-            }
-            if($ajxpNode != null){
-                $this->getMetaManager()->removeShareFromMeta($ajxpNode, $element);
-            }
-            if($this->sqlSupported){
-                if(isSet($share) && count($share)){
-                    $this->confStorage->simpleStoreClear("share", $element);
-                }else{
-                    $shares = $this->findSharesForRepo($element);
-                    if(count($shares)){
-                        $keys = array_keys($shares);
-                        $this->confStorage->simpleStoreClear("share", $keys[0]);
-                        if($ajxpNode != null){
-                            $this->getMetaManager()->removeShareFromMeta($ajxpNode, $keys[0]);
-                        }
-                    }
-                }
-            }
-        } else if ($type == "minisite") {
-            $minisiteData = $this->loadShare($element);
-            $repoId = $minisiteData["REPOSITORY"];
-            $repo = ConfService::getRepositoryById($repoId);
-            if ($repo == null) {
-                if(!$ignoreRepoNotFound) {
-                    throw new Exception(str_replace('%s', 'Cannot find associated repository', $mess["share_center.219"]));
-                }
-            }else{
-                $this->testUserCanEditShare($repo->getOwner(), $repo->options);
-            }
-            if(!$keepRepository){
-                $res = ConfService::deleteRepository($repoId);
-                if ($res == -1) {
-                    throw new Exception($mess[427]);
-                }
-            }
-            // Silently delete corresponding role if it exists
-            AuthService::deleteRole("AJXP_SHARED-".$repoId);
-            // If guest user created, remove it now.
-            if (isSet($minisiteData["PRELOG_USER"]) && AuthService::userExists($minisiteData["PRELOG_USER"])) {
-                AuthService::deleteUser($minisiteData["PRELOG_USER"]);
-            }
-            // If guest user created, remove it now.
-            if (isSet($minisiteData["PRESET_LOGIN"]) && AuthService::userExists($minisiteData["PRESET_LOGIN"])) {
-                AuthService::deleteUser($minisiteData["PRESET_LOGIN"]);
-            }
-            if(isSet($minisiteData["PUBLICLET_PATH"]) && is_file($minisiteData["PUBLICLET_PATH"])){
-                unlink($minisiteData["PUBLICLET_PATH"]);
-            }else if($this->sqlSupported){
-                $this->confStorage->simpleStoreClear("share", $element);
-            }
-            if($ajxpNode !== null){
-                $this->getMetaManager()->removeShareFromMeta($ajxpNode, $element);
-                if(!$keepRepository){
-                    $this->getMetaManager()->removeShareFromMeta($ajxpNode, $repoId);
-                }
-            }
-        } else if ($type == "user") {
-            $this->testUserCanEditShare($element, array());
-            AuthService::deleteUser($element);
-        } else if ($type == "file") {
-            $publicletData = $this->loadShare($element);
-            if (isSet($publicletData["OWNER_ID"]) && $this->testUserCanEditShare($publicletData["OWNER_ID"], $publicletData)) {
-                PublicletCounter::delete($element);
-                if(isSet($publicletData["PUBLICLET_PATH"]) && is_file($publicletData["PUBLICLET_PATH"])){
-                    unlink($publicletData["PUBLICLET_PATH"]);
-                }else if($this->sqlSupported){
-                    $this->confStorage->simpleStoreClear("share", $element);
-                }
-            } else {
-                throw new Exception($mess["share_center.160"]);
-            }
-        }
-        return true;
-    }
-
-    /**
-     * @param AJXP_Node $baseNode
-     * @param bool $delete
-     * @param string $oldPath
-     * @param string $newPath
-     * @param string|null $parentRepositoryPath
-     * @return int Number of nodes modified in different repositories
-     */
-    public function moveSharesFromMetaRecursive($baseNode, $delete = false, $oldPath, $newPath, $parentRepositoryPath = null){
-
-        $modifiedDifferentNodes = 0;
-        // Find shares in children
-        try{
-            $result = $this->getMetaManager()->collectSharesIncludingChildren($baseNode);
-        }catch(Exception $e){
-            // Error while loading node, ignore
-            return $modifiedDifferentNodes;
-        }
-        $basePath = $baseNode->getPath();
-        foreach($result as $relativePath => $metadata){
-            if($relativePath == "/") {
-                $relativePath = "";
-            }
-            $modifiedDifferentNodes ++;
-            $changeOldNode = new AJXP_Node("pydio://".$baseNode->getRepositoryId().$oldPath.$relativePath);
-
-            foreach($metadata as $ownerId => $meta){
-                if(!isSet($meta["shares"])){
-                    continue;
-                }
-                $changeOldNode->setUser($ownerId);
-                /// do something
-                $changeNewNode = null;
-                if(!$delete){
-                    //$newPath = preg_replace('#^'.preg_quote($oldPath, '#').'#', $newPath, $path);
-                    $changeNewNode = new AJXP_Node("pydio://".$baseNode->getRepositoryId().$newPath.$relativePath);
-                    $changeNewNode->setUser($ownerId);
-                }
-                $collectedRepositories = array();
-                list($privateShares, $publicShares) = $this->moveSharesFromMeta($meta["shares"], $delete?"delete":"move", $changeOldNode, $changeNewNode, $collectedRepositories, $parentRepositoryPath);
-
-                if($basePath == "/"){
-                    // Just update target node!
-                    $changeMetaNode = new AJXP_Node("pydio://".$baseNode->getRepositoryId().$relativePath);
-                    $changeMetaNode->setUser($ownerId);
-                    $this->getMetaManager()->clearNodeMeta($changeMetaNode);
-                    if(count($privateShares)){
-                        $this->getMetaManager()->setNodeMeta($changeMetaNode, array("shares" => $privateShares), true);
-                    }
-                    if(count($publicShares)){
-                        $this->getMetaManager()->setNodeMeta($changeMetaNode, array("shares" => $privateShares), false);
-                    }
-                }else{
-                    $this->getMetaManager()->clearNodeMeta($changeOldNode);
-                    if(!$delete){
-                        if(count($privateShares)){
-                            $this->getMetaManager()->setNodeMeta($changeNewNode, array("shares" => $privateShares), true);
-                        }
-                        if(count($publicShares)){
-                            $this->getMetaManager()->setNodeMeta($changeNewNode, array("shares" => $privateShares), false);
-                        }
-                    }
-                }
-
-                foreach($collectedRepositories as $sharedRepoId => $parentRepositoryPath){
-                    $modifiedDifferentNodes += $this->moveSharesFromMetaRecursive(new AJXP_Node("pydio://".$sharedRepoId."/"), $delete, $changeOldNode->getPath(), $changeNewNode->getPath(), $parentRepositoryPath);
-                }
-
-            }
-        }
-
-        return $modifiedDifferentNodes;
-
-    }
-
-    /**
-     * @param array $shares
-     * @param String $operation
-     * @param AJXP_Node $oldNode
-     * @param AJXP_Node $newNode
-     * @param array $collectRepositories
-     * @param string|null $parentRepositoryPath
-     * @return array
-     * @throws Exception
-     */
-    public function moveSharesFromMeta($shares, $operation="move", $oldNode, $newNode=null, &$collectRepositories = array(), $parentRepositoryPath = null){
-
-        $privateShares = array();
-        $publicShares = array();
-        foreach($shares as $id => $data){
-            $type = $data["type"];
-            if($operation == "delete"){
-                $this->deleteShare($type, $id, false, true);
-                continue;
-            }
-
-            if($type == "minisite"){
-                $share = $this->loadShare($id);
-                $repo = ConfService::getRepositoryById($share["REPOSITORY"]);
-            }else if($type == "repository"){
-                $repo = ConfService::getRepositoryById($id);
-            }else if($type == "file"){
-                $publicLink = $this->loadShare($id);
-            }
-
-            if(isSet($repo)){
-                $oldNodeLabel = SystemTextEncoding::toUTF8($oldNode->getLabel());
-                $newNodeLabel = SystemTextEncoding::toUTF8($newNode->getLabel());
-                if($newNode != null && $newNodeLabel != $oldNodeLabel && $repo->getDisplay() == $oldNodeLabel){
-                    $repo->setDisplay($newNodeLabel);
-                }
-                $cFilter = $repo->getContentFilter();
-                $path = $repo->getOption("PATH", true);
-                $save = false;
-                if(isSet($cFilter)){
-                    if($parentRepositoryPath !== null){
-                        $repo->addOption("PATH", $parentRepositoryPath);
-                    }else{
-                        $cFilter->movePath($oldNode->getPath(), $newNode->getPath());
-                        $repo->setContentFilter($cFilter);
-                    }
-                    $save = true;
-                }else if(!empty($path)){
-
-                    $oldNodePath = SystemTextEncoding::toUTF8($oldNode->getPath());
-                    $newNodePath = SystemTextEncoding::toUTF8($newNode->getPath());
-
-                    $path = preg_replace("#".preg_quote($oldNodePath, "#")."$#", $newNodePath, $path);
-                    $repo->addOption("PATH", $path);
-                    $save = true;
-                    $collectRepositories[$repo->getId()] = $path;
-                }
-                if($save){
-                    //ConfService::getConfStorageImpl()->saveRepository($repo, true);
-                    ConfService::replaceRepository($repo->getId(), $repo);
-                }
-                $access = $repo->getOption("SHARE_ACCESS");
-                if(!empty($access) && $access == "PUBLIC"){
-                    $publicShares[$id] = $data;
-                }else{
-                    $privateShares[$id] = $data;
-                }
-
-            } else {
-
-                if(isset($publicLink) && is_array($publicLink) && isSet($publicLink["FILE_PATH"])){
-                    $oldNodePath = SystemTextEncoding::toUTF8($oldNode->getPath());
-                    $newNodePath = SystemTextEncoding::toUTF8($newNode->getPath());
-                    $publicLink["FILE_PATH"] = str_replace($oldNodePath, $newNodePath, $publicLink["FILE_PATH"]);
-                    $this->deleteShare("file", $id);
-                    $this->storeShare($newNode->getRepositoryId(), $publicLink, "file", $id);
-                    $privateShares[$id] = $data;
-                }
-            }
-        }
-        return array($privateShares, $publicShares);
-    }
-
-    /**
-     * @param String $type
-     * @param String $element
-     * @return bool
-     */
-    public function shareExists($type, $element)
-    {
-        if ($type == "repository") {
-            return (ConfService::getRepositoryById($element) != null);
-        } else if($type == "ocs_remote"){
-            return true;
-        } else if ($type == "file" || $type == "minisite") {
-            $fileExists = is_file($this->downloadFolder."/".$element.".php");
-            if($fileExists) {
-                return true;
-            }
-            if($this->sqlSupported) {
-                $this->confStorage->simpleStoreGet("share", $element, "serial", $data);
-                if(is_array($data)) return true;
-            }
-        }
-        return false;
-    }
-
-
-    /**
-     * Get download counter
-     * @param string $hash
-     * @return int
-     */
-    public function getCurrentDownloadCounter($hash){
-        return PublicletCounter::getCount($hash);
-    }
-
-    /**
-     * Add a unit to the current download counter value.
-     * @param $hash
-     */
-    public function incrementDownloadCounter($hash){
-        PublicletCounter::increment($hash);
-    }
-
-    /**
-     * Set the counter value to 0.
-     * @param string $hash
-     * @param string $userId
-     * @throws Exception
-     */
-    public function resetDownloadCounter($hash, $userId){
-        $data = $this->loadShare($hash);
-        $repoId = $data["REPOSITORY"];
-        $repo = ConfService::getRepositoryById($repoId);
-        if ($repo == null) {
-            $mess = ConfService::getMessages();
-            throw new Exception(str_replace('%s', 'Cannot find associated repository', $mess["share_center.219"]));
-        }
-        $this->testUserCanEditShare($repo->getOwner(), $repo->options);
-        PublicletCounter::reset($hash);
-    }
-
-    /**
-     * Check if share is expired
-     * @param string $hash
-     * @param array $data
-     * @return bool
-     */
-    public function isShareExpired($hash, $data){
-        return ($data["EXPIRE_TIME"] && time() > $data["EXPIRE_TIME"]) ||
-        ($data["DOWNLOAD_LIMIT"] && $data["DOWNLOAD_LIMIT"]> 0 && $data["DOWNLOAD_LIMIT"] <= $this->getCurrentDownloadCounter($hash));
-    }
-
-    /**
-     * Find all expired shares and remove them.
-     * @param bool|true $currentUser
-     * @return array
-     */
-    public function clearExpiredFiles($currentUser = true)
-    {
-        if($currentUser){
-            $loggedUser = AuthService::getLoggedUser();
-            $userId = $loggedUser->getId();
-            $originalUser = null;
-        }else{
-            $originalUser = AuthService::getLoggedUser()->getId();
-            $userId = null;
-        }
-        $deleted = array();
-        $switchBackToOriginal = false;
-
-        $publicLets = $this->listShares($currentUser? $userId: '');
-        foreach ($publicLets as $hash => $publicletData) {
-            if($publicletData === false) continue;
-            if ($currentUser && ( !isSet($publicletData["OWNER_ID"]) || $publicletData["OWNER_ID"] != $userId )) {
-                continue;
-            }
-            if( (isSet($publicletData["EXPIRE_TIME"]) && is_numeric($publicletData["EXPIRE_TIME"]) && $publicletData["EXPIRE_TIME"] > 0 && $publicletData["EXPIRE_TIME"] < time()) ||
-                (isSet($publicletData["DOWNLOAD_LIMIT"]) && $publicletData["DOWNLOAD_LIMIT"] > 0 && $publicletData["DOWNLOAD_LIMIT"] <= PublicletCounter::getCount($hash)) ) {
-                if(!$currentUser) $switchBackToOriginal = true;
-                $this->deleteExpiredPubliclet($hash, $publicletData);
-                $deleted[] = $publicletData["FILE_PATH"];
-
-            }
-        }
-        if($switchBackToOriginal){
-            AuthService::logUser($originalUser, "", true);
-        }
-        return $deleted;
-    }
-
-    /**
-     * Find all expired legacy publiclets and remove them.
-     * @param $elementId
-     * @param $data
-     * @throws Exception
-     */
-    private function deleteExpiredPubliclet($elementId, $data){
-
-        if(AuthService::getLoggedUser() == null ||  AuthService::getLoggedUser()->getId() != $data["OWNER_ID"]){
-            AuthService::logUser($data["OWNER_ID"], "", true);
-        }
-        $repoObject = $data["REPOSITORY"];
-        if(!is_a($repoObject, "Repository")) {
-            $repoObject = ConfService::getRepositoryById($data["REPOSITORY"]);
-        }
-        $repoLoaded = false;
-
-        if(!empty($repoObject)){
-            try{
-                ConfService::loadDriverForRepository($repoObject)->detectStreamWrapper(true);
-                $repoLoaded = true;
-            }catch (Exception $e){
-                // Cannot load this repository anymore.
-            }
-        }
-        if($repoLoaded && isSet($data["FILE_PATH"])){
-            AJXP_Controller::registryReset();
-            $ajxpNode = new AJXP_Node("pydio://".$repoObject->getId().$data["FILE_PATH"]);
-        }
-        $this->deleteShare($data['SHARE_TYPE'], $elementId, false, true);
-        if(isSet($ajxpNode)){
-            try{
-                $this->getMetaManager()->removeShareFromMeta($ajxpNode, $elementId);
-            }catch (Exception $e){
-
-            }
-            gc_collect_cycles();
-        }
-
-    }
-
-
-
-    /**
-     * @param array $data
-     * @param AbstractAccessDriver $accessDriver
-     * @param Repository $repository
-     */
-    public function storeSafeCredentialsIfNeeded(&$data, $accessDriver, $repository){
-        $storeCreds = false;
-        if ($repository->getOption("META_SOURCES")) {
-            $options["META_SOURCES"] = $repository->getOption("META_SOURCES");
-            foreach ($options["META_SOURCES"] as $metaSource) {
-                if (isSet($metaSource["USE_SESSION_CREDENTIALS"]) && $metaSource["USE_SESSION_CREDENTIALS"] === true) {
-                    $storeCreds = true;
-                    break;
-                }
-            }
-        }
-        if ($storeCreds || $accessDriver->hasMixin("credentials_consumer")) {
-            $cred = AJXP_Safe::tryLoadingCredentialsFromSources(array(), $repository);
-            if (isSet($cred["user"]) && isset($cred["password"])) {
-                $data["SAFE_USER"] = $cred["user"];
-                $data["SAFE_PASS"] = $cred["password"];
-            }
-        }
-    }
-
-
-    /**
-     * Computes a short form of the hash, checking if it already exists in the folder,
-     * in which case it increases the hashlength until there is no collision.
-     * @static
-     * @param String $outputData Serialized data
-     * @param String|null $checkInFolder Path to folder
-     * @return string
-     */
-    private function computeHash($outputData, $checkInFolder = null)
-    {
-        $length = $this->hashMinLength;
-        $full =  md5($outputData);
-        $starter = substr($full, 0, $length);
-        if ($checkInFolder != null) {
-            while (file_exists($checkInFolder.DIRECTORY_SEPARATOR.$starter.".php")) {
-                $length ++;
-                $starter = substr($full, 0, $length);
-            }
-        }
-        return $starter;
-    }
-
-    /**
-     * Check if the hash seems to correspond to the serialized data.
-     * @static
-     * @param String $outputData serialized data
-     * @param String $hash Id to check
-     * @return bool
-     */
-    private function checkHash($outputData, $hash)
-    {
-        $full = md5($outputData);
-        return (!empty($hash) && strpos($full, $hash."") === 0);
-    }
-
-
-}
\ No newline at end of file
diff --git a/core/src/plugins/action.share/composer.json b/core/src/plugins/action.share/composer.json
new file mode 100644
index 0000000000..557b77aa90
--- /dev/null
+++ b/core/src/plugins/action.share/composer.json
@@ -0,0 +1,11 @@
+{
+  "name": "Sharing Features",
+  "description": "Share files and folders with internal or external collaborators",
+  "homepage": "https://pydio.com/",
+  "license":"AGPL-3.0",
+  "autoload": {
+    "psr-4": {
+      "Pydio\\Share\\": "./src"
+    }
+  }
+}
diff --git a/core/src/plugins/action.share/manifest.xml b/core/src/plugins/action.share/manifest.xml
index 75ee3160ba..52db51313f 100644
--- a/core/src/plugins/action.share/manifest.xml
+++ b/core/src/plugins/action.share/manifest.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ajxp_plugin name="share" label="CONF_MESSAGE[Sharing Features]" description="CONF_MESSAGE[Share Center actions and hooks]"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
     <server_settings>
+        <global_param name="DISABLE_ALL_SHARING" group="CONF_MESSAGE[Authorizations]" description="CONF_MESSAGE[Disable all sharing on files or folders]" label="CONF_MESSAGE[Disable all sharing]" type="boolean" default="false" expose="false"/>
+        <global_param name="DISABLE_RESHARING" group="CONF_MESSAGE[Authorizations]" description="CONF_MESSAGE[Disallow all sharing for shared workspaces]" label="CONF_MESSAGE[Disable resharing]" type="boolean" default="false" expose="false"/>
         <global_param name="ENABLE_FILE_PUBLIC_LINK" group="CONF_MESSAGE[Authorizations]" description="CONF_MESSAGE[Allow users to generate public links on files]" label="CONF_MESSAGE[Files: enable public links]" type="boolean" default="true" expose="true"/>
         <global_param name="ENABLE_FILE_INTERNAL_SHARING" group="CONF_MESSAGE[Authorizations]" description="CONF_MESSAGE[Enable internal file sharing (sharing with users existing or temporary users)]" label="CONF_MESSAGE[Files: enable internal sharing]" type="boolean" mandatory="true" default="true" expose="true"/>
         <global_param name="ENABLE_FOLDER_PUBLIC_LINK" group="CONF_MESSAGE[Authorizations]" description="CONF_MESSAGE[Allow users to generate public links on folders]" label="CONF_MESSAGE[Folders: enable public links]" type="boolean" default="true" expose="true"/>
         <global_param name="ENABLE_FOLDER_INTERNAL_SHARING" group="CONF_MESSAGE[Authorizations]" description="CONF_MESSAGE[Enable internal folder sharing (sharing with users existing or temporary users)]" label="CONF_MESSAGE[Folders: enable internal sharing]" type="boolean" mandatory="true" default="true" expose="true"/>
-        <global_param name="USE_REWRITE_RULE" group="CONF_MESSAGE[Link Generation]" description="CONF_MESSAGE[Use web server RewriteEngine mechanism to generate prettier URLs]" label="CONF_MESSAGE[Use Rewrite Rule]" type="boolean" default="true"/>
         <global_param name="HASH_MIN_LENGTH" group="CONF_MESSAGE[Link Generation]" description="CONF_MESSAGE[Minimum length of the generated hash]" label="CONF_MESSAGE[Hash minimum length]" type="integer" default="6"/>
         <global_param name="HASH_USER_EDITABLE" group="CONF_MESSAGE[Link Generation]" description="CONF_MESSAGE[Allow users to manually choose a hash for the generated links]" label="CONF_MESSAGE[Hash user-editable]" type="boolean" default="true" expose="true"/>
         <global_param name="FILE_MAX_EXPIRATION" group="CONF_MESSAGE[Link Generation]" description="CONF_MESSAGE[Maximum share expiration limit for file, 0 = unlimited]" label="CONF_MESSAGE[Maximum file expiration limit]" type="integer" default="0" expose="true"/>
@@ -13,35 +14,26 @@
         <global_param name="SHARE_FORCE_PASSWORD" group="CONF_MESSAGE[Link Generation]" description="CONF_MESSAGE[Do not allow users to create public links, only private links (password-protected)]" label="CONF_MESSAGE[Set password mandatory]" type="boolean" default="false" expose="true"/>
         <global_param name="EMAIL_INVITE_EXTERNAL" group="CONF_MESSAGE[Link Generation]" description="CONF_MESSAGE[Use external mailer for invitations]" label="CONF_MESSAGE[Force External Mailer]" type="boolean" default="false" expose="true"/>
         <global_param name="CREATE_QRCODE" group="CONF_MESSAGE[Link Generation]" description="CONF_MESSAGE[Create and display QRCode for shared link]" label="CONF_MESSAGE[Create QRCode]" type="boolean" default="false" expose="true"/>
+        <global_param name="INFOPANEL_DISPLAY_HTML_EMBED" group="CONF_MESSAGE[Link Generation]" description="CONF_MESSAGE[Display pasteable HTML snippet in right-hand information panel]" label="CONF_MESSAGE[Display HTML Embed code]" type="boolean" default="false" expose="true"/>
+        <global_param name="INFOPANEL_DISPLAY_DIRECT_DOWNLOAD" group="CONF_MESSAGE[Link Generation]" description="CONF_MESSAGE[Display pasteable download link in right-hand information panel]" label="CONF_MESSAGE[Display Direct Download Link]" type="boolean" default="false" expose="true"/>
         <global_param name="AVOID_SHARED_FOLDER_SAME_LABEL" group="CONF_MESSAGE[Internal Sharing]" description="CONF_MESSAGE[Disallow users to create shared folders if a workspace already exists with the same label]" label="CONF_MESSAGE[Avoid labels duplication]" type="boolean" default="false"/>
         <global_param name="SHARED_USERS_TMP_PREFIX" group="CONF_MESSAGE[Internal Sharing]" description="CONF_MESSAGE[Mandatory prefix for users created temporary users login]" label="CONF_MESSAGE[Tmp users prefix]" type="string" expose="true"/>
         <global_param name="FORK_EVENT_FORWARDING" group="CONF_MESSAGE[Internal Sharing]" type="boolean" label="CONF_MESSAGE[Fork Events Forwarding]" description="CONF_MESSAGE[If you detect performances issues while modifiyng files under deep trees, try activating that one. Please be sure of what you do, this may trigger a whole lot of php processes on the server.]" default="false"/>
-        <global_param name="CUSTOM_SHAREPAGE_TITLE" group="CONF_MESSAGE[Weblink Page]" type="string" label="CONF_MESSAGE[Page Title]" description="CONF_MESSAGE[Share page title. Use AJXP_FILENAME keyword to display the file name.]" mandatory="false" default=""/>
-        <global_param name="CUSTOM_SHAREPAGE_LEGEND" group="CONF_MESSAGE[Weblink Page]" type="string" label="CONF_MESSAGE[Download text]" description="CONF_MESSAGE[Text displayed below the download button. Use AJXP_FILENAME keyword to display the file name, and PYDIO_APP_TITLE for the application title.]" mandatory="false" default=""/>
-        <global_param name="CUSTOM_SHAREPAGE_LEGEND_PASS" group="CONF_MESSAGE[Weblink Page]" type="string" label="CONF_MESSAGE[Download text w/ Pass]" description="CONF_MESSAGE[Text displayed below the download button when a password is mandatory. Use AJXP_FILENAME keyword to display the file name, and PYDIO_APP_TITLE for the application title.]" mandatory="false" default=""/>
-        <global_param name="CUSTOM_SHAREPAGE_BUTTON" group="CONF_MESSAGE[Weblink Page]" type="image" label="CONF_MESSAGE[Download Button]" description="CONF_MESSAGE[Image used as a button for downloading the file]" mandatory="false"
-                      editable="true"
-                      uploadAction="store_binary_temp"
-                      loadAction="get_global_binary_param"
-                      defaultImage="plugins/action.share/res/dl.png"
-                      expose="true"
-        />
-        <global_param name="CUSTOM_SHAREPAGE_BACKGROUND_COLOR" group="CONF_MESSAGE[Weblink Page]" type="string" label="CONF_MESSAGE[Background Color]" description="CONF_MESSAGE[Share page background color.]" mandatory="false" default="#FFFFFF"/>
-        <global_param name="CUSTOM_SHAREPAGE_TEXT_COLOR" group="CONF_MESSAGE[Weblink Page]" type="string" label="CONF_MESSAGE[Text Color]" description="CONF_MESSAGE[Share page text color.]" mandatory="false" default="#399c9b"/>
-        <global_param name="CUSTOM_SHAREPAGE_TEXTSHADOW_COLOR" group="CONF_MESSAGE[Weblink Page]" type="string" label="CONF_MESSAGE[Text Shadow]" description="CONF_MESSAGE[Share page text shadow color.]" mandatory="false" default="#FFFFFF"/>
+        <global_param name="WATCHER_SHARES_AUTO_OWNER" group="CONF_MESSAGE[Notifications]" type="boolean" label="CONF_MESSAGE[Shares Owner]" description="CONF_MESSAGE[When sharing with some internal users, choose whether the owner will be notified by default of any event happening on this share]" default="false" expose="true"/>
+        <global_param name="WATCHER_SHARES_AUTO_USERS" group="CONF_MESSAGE[Notifications]" type="boolean" label="CONF_MESSAGE[Shares Target users]" description="CONF_MESSAGE[When sharing with some internal users, choose whether these users will be notified by default of any event happening on this share]" default="false" expose="true"/>
     </server_settings>
     <client_settings>
         <resources>
             <i18n namespace="share_center" path="plugins/action.share/res/i18n"/>
             <css file="plugins/action.share/res/react-share-form.css" autoload="true"/>
             <js file="plugins/action.share/res/build/model/ShareModel.js" className="ReactModelShare"/>
+            <js file="plugins/action.share/res/build/ShareTemplates.js" className="ShareTemplates" depends="React"/>
             <js file="plugins/action.share/res/build/ShareInfoPanel.js" className="ShareInfoPanel" depends="React,ReactModelShare"/>
             <js file="plugins/action.share/res/build/ShareDialog.js" className="ShareDialog" depends="React,ReactModelShare,PydioForm,UsersCompleter"/>
         </resources>
     </client_settings>
     <registry_contributions>
         <actions>
-            <!-- TODO : handle action names and authorization (and disable sharing mask) -->
             <action name="share_react">
                 <gui text="292" title="292" src="share.png" iconClass="mdi mdi-share-variant" hasAccessKey="false">
                     <context selection="true" dir="true" recycle="hidden" actionBar="true" actionBarGroup="get,info_panel_share" contextMenu="true"/>
@@ -106,72 +98,6 @@
                     <serverCallback methodName="migrateLegacyShares" restParams="/dry_run"/>
                 </processing>
             </action>
-            <!--
-            <action name="share-edit-shared">
-                <gui src="share.png" iconClass="icon-share" text="share_center.125" title="share_center.126">
-                    <context dir="true" recycle="hidden" selection="true" actionBar="true" contextMenu="true" actionBarGroup="get,info_panel_share" behaviour="hidden"/>
-                    <selectionContext dir="true" file="true" evalMetadata="metadata.get('ajxp_shared')" recycle="false" unique="true" behaviour="hidden"/>
-                </gui>
-                <processing>
-                    <clientCallback prepareModal="true"><![CDATA[
-                        ResourcesManager.detectModuleToLoadAndApply('ShareCenter', function(){
-                            if(!pydio.getController().shareCenter) {
-                                pydio.getController().shareCenter = new ShareCenter();
-                            }
-                            pydio.getController().shareCenter.performShareAction();
-                        });
-                    ]]></clientCallback>
-                </processing>
-            </action>
-            <action name="share-file-minisite">
-                <gui src="share.png" iconClass="icon-share" text="292" title="292">
-                    <context dir="true" recycle="hidden" selection="true" actionBar="true" contextMenu="true" actionBarGroup="get,info_panel_share" />
-                    <selectionContext dir="false" file="true" recycle="false" unique="true" evalMetadata="!metadata.get('ajxp_shared')" />
-                </gui>
-                <processing>
-                    <clientCallback prepareModal="true"><![CDATA[
-                        ResourcesManager.detectModuleToLoadAndApply('ShareCenter', function(){
-                            if(!pydio.getController().shareCenter) {
-                                pydio.getController().shareCenter = new ShareCenter();
-                            }
-                            pydio.getController().shareCenter.performShare('minisite-public');
-                        });
-                    ]]></clientCallback>
-                </processing>
-            </action>
-            <action name="share-selection-minisite">
-                <gui src="share.png" iconClass="icon-share" text="share_center.123" title="share_center.124">
-                    <context dir="true" recycle="false" selection="true"/>
-                    <selectionContext dir="false" file="true" multipleOnly="true" recycle="false" unique="false"/>
-                </gui>
-                <processing>
-                    <clientCallback prepareModal="true"><![CDATA[
-                        ResourcesManager.detectModuleToLoadAndApply('ShareCenter', function(){
-                            if(!pydio.getController().shareCenter) {
-                                pydio.getController().shareCenter = new ShareCenter();
-                            }
-                            pydio.getController().shareCenter.performShare('minisite-public');
-                        });
-                    ]]></clientCallback>
-                </processing>
-            </action>
-            <action name="share-folder-minisite-public">
-                <gui src="share.png" iconClass="icon-share" text="292" title="292">
-                    <context dir="true" recycle="hidden" selection="true" actionBar="true" contextMenu="true" actionBarGroup="get,info_panel_share"/>
-                    <selectionContext dir="true" file="false" recycle="false" unique="true" evalMetadata="!metadata.get('ajxp_shared')" />
-                </gui>
-                <processing>
-                    <clientCallback prepareModal="true"><![CDATA[
-                        ResourcesManager.detectModuleToLoadAndApply('ShareCenter', function(){
-                            if(!pydio.getController().shareCenter) {
-                                pydio.getController().shareCenter = new ShareCenter();
-                            }
-                            pydio.getController().shareCenter.performShare('minisite-public');
-                        });
-                    ]]></clientCallback>
-                </processing>
-            </action>
-            -->
             <action name="load_shared_element_data">
                 <processing>
                     <serverCallback methodName="switchAction" restParams="/file+" developerComment="Loads all current sharing data for a given resource. Workspace must support metadata management (metastore).">
@@ -301,11 +227,11 @@
                                     if(staticClass.getRESTPreviewLinks){
                                         var links = staticClass.getRESTPreviewLinks(node);
                                         $H(links).each(function(pair){
-                                            modal.getForm().down("#additional_links").insert(tpl.evaluate({title:pair.key,link:document.location.href.split('?').shift() + "?dl=true&ct=true"+pair.value}));
+                                            modal.getForm().down("#additional_links").insert(tpl.evaluate({title:pair.key,link:document.location.href.split('?').shift() + "/dl"+node.getPath()+"?ct=true"+pair.value}));
                                         });
                                     }
                                 }
-                                var dlLink = document.location.href.split('?').shift() + "?dl=true&file=" + encodeURIComponent(node.getPath());
+                                var dlLink = document.location.href.split('?').shift() + "/dl" + node.getPath();
                                 modal.getForm().down("#additional_links").insert(tpl.evaluate({title:MessageHash['share_center.60'],link:dlLink}));
                             }
                         ]]></dialogOnOpen>
@@ -327,11 +253,165 @@
             </action>
             <action name="download">
                 <pre_processing>
-                    <serverCallback methodName="preProcessDownload" applyCondition="$apply=isSet($_SESSION['CURRENT_MINISITE']);"/>
+                    <serverCallback methodName="preProcessDownload" applyCondition="$apply=\Pydio\Core\Services\SessionService::has(\Pydio\Core\Services\SessionService::CTX_MINISITE_HASH);"/>
                 </pre_processing>
             </action>
         </actions>
         <client_configs>
+            <template name="minisite_orbit" element="ajxp_shared_folder" position="top" label="share_center.153"><![CDATA[
+				<div id="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
+                    <div id="logo_widget" class="widget_logo" ajxpClass="LogoWidget"  ajxpOptions='{"imageParameter":"gui.ajax/CUSTOM_MINISITE_LOGO"}'></div>
+                    <div id="widget_title" ajxpClass="RepositorySimpleLabel" ajxpOptions='{"displayLabelLegend":false,"displayWorkspaceDescription":true}'></div>
+                    <div id="breadcrumb" ajxpClass="Breadcrumb" ajxpOptions='{}'></div>
+                    <div id="files_list_header">
+                        <div id="display_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["content_pane-actions"],"submenuOffsetTop":2}'></div>
+                        <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["navigation","minisite", "inline"],"submenuOffsetTop":2}'></div>
+                    </div>
+                    <div id="cpane_container1" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"browser"}'>
+                        <div id="content_pane" ajxpClass="FilesList" ajxpOptions='{"displayMode":"detail", "detailThumbSize": 50 ,"replaceScroller":true, "messageBoxReference":true, "fit":"height", "fitParent":"cpane_container1", "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px", "invisibleSelection":false}' style="border: 1px solid #bbb; border-width:0 1px;"></div>
+                    </div>
+                    <div id="tasks_panel" class="react-mui-context" ajxpClass="AjxpReactComponent" ajxpOptions='{"componentNamespace":"PydioTasks","componentName":"Panel"}'></div>
+				</div>
+                <script>
+                document.observe("ajaxplorer:afterApply-login", function(){
+                    AjxpPane.prototype.staticApplyBackgroundFromConfigs($("overlay"), "gui.ajax/CUSTOM_SHAREPAGE_BACKGROUND_", "display:block;", true);
+                });
+                </script>
+			]]></template>
+            <template name="minisite_film_strip" element="ajxp_film_strip" position="top" label="share_center.154"><![CDATA[
+				<div id="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
+                    <div id="logo_widget" class="widget_logo" ajxpClass="LogoWidget" ajxpOptions='{"imageParameter":"gui.ajax/CUSTOM_MINISITE_LOGO"}'></div>
+                    <div id="widget_title" ajxpClass="RepositorySimpleLabel" ajxpOptions='{"displayLabelLegend":false,"displayWorkspaceDescription":true}'></div>
+                    <div id="cpane_container" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"browser", "fitMarginBottom":80}'>
+                        <div id="cpane_header" class="panelHeader">
+                            <div id="display_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["minisite", "inline"],"submenuOffsetTop":2}'></div>
+                            <div id="breadcrumb" ajxpClass="Breadcrumb" style="width:50%;" ajxpOptions='{"flexTo":"cpane_header", "flexToMargin":50, "resize_events":["actions_refreshed"]}'></div>
+                        </div>
+                        <div id="cpane_tabs" ajxpClass="AjxpTabulator" ajxpOptions='{"fit":"height", "fitParent":"cpane_container","registerAsEditorOpener":true, "saveState":false, "defaultTabId": "","tabInfos" : [], "uniqueTab":true}'></div>
+                        <div id="content_pane" ajxpClass="FilesList" ajxpOptions='{"displayMode":"thumb", "fixedDisplayMode":"thumb", "fixedThumbSize":60,"replaceScroller":false, "horizontalScroll":true, "messageBoxReference":true, "fit":"content", "fitParent":"cpane_container", "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px", "invisibleSelection":false}'></div>
+                    </div>
+				</div>
+				<script>
+                    document.observe("ajaxplorer:afterApply-login", function(){
+                        AjxpPane.prototype.staticApplyBackgroundFromConfigs($("overlay"), "gui.ajax/CUSTOM_SHAREPAGE_BACKGROUND_", "display:block;", true);
+                    });
+                    document.observe("ajaxplorer:selection_changed", function(e){
+                        try{
+                            var dm = ajaxplorer.getContextHolder();
+                            var nodes = dm.getSelectedNodes();
+                            if(nodes[0].isLeaf() && e.memo._selectionSource.__className == 'FilesList'){
+                                window.setTimeout(function(){pydio.getController().fireDefaultAction("file");}, 1);
+                            }
+                        }catch(e){}
+                    });
+                    var p;
+				    document.observe("ajaxplorer:user_logged", function(){
+                        if(p) return;
+                        try{
+                            p = new PeriodicalExecuter(function(){
+                                var dm = ajaxplorer.getContextHolder();
+                                if(dm.getSelectedNodes().length){
+                                    p.stop();
+                                    return;
+                                }
+                                var first = dm.getRootNode().getFirstChildIfExists();
+                                if(first){
+                                    dm.setSelectedNodes([first], "dataModel");
+                                    window.setTimeout(function(){pydio.getController().fireDefaultAction("file");}, 1);
+                                    p.stop();
+                                    return;
+                                }
+                            }, 1);
+                        }catch(e){}
+                    });
+				</script>
+			]]></template>
+            <template name="unique_preview_file" element="ajxp_unique_strip" position="top" label="Unique File Preview"><![CDATA[
+				<div id="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
+                    <div id="logo_widget" class="widget_logo" ajxpClass="LogoWidget" ajxpOptions='{"imageParameter":"gui.ajax/CUSTOM_MINISITE_LOGO"}'></div>
+                    <div id="display_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["inline", "minisite-share-actions"],"submenuOffsetTop":2}'></div>
+                    <div id="widget_title" style="padding: 28px 0 22px 20px;" ajxpClass="RepositorySimpleLabel" ajxpOptions='{"displayLabelLegend":false,"displayWorkspaceDescription":true}'></div>
+                    <div id="cpane_container" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"browser"}'>
+                        <div id="cpane_tabs" ajxpClass="AjxpTabulator" ajxpOptions='{"fit":"height", "fitParent":"cpane_container","registerAsEditorOpener":true, "saveState":false, "defaultTabId": "","tabInfos" : [], "uniqueTab":true}'></div>
+                    </div>
+				</div>
+				<script>
+                    document.observe("ajaxplorer:afterApply-login", function(){
+                        AjxpPane.prototype.staticApplyBackgroundFromConfigs($("overlay"), "gui.ajax/CUSTOM_SHAREPAGE_BACKGROUND_", "display:block;", true);
+                    });
+				    document.observe("ajaxplorer:user_logged", function(){
+                        try{
+
+                            var p = new PeriodicalExecuter(function(){
+                                var dm = ajaxplorer.getContextHolder();
+                                if(dm.getSelectedNodes().length){
+                                    p.stop();
+                                    return;
+                                }
+                                var root = dm.getRootNode();
+                                var first = root.getFirstChildIfExists();
+                                if(first){
+                                    if((first.getAjxpMime() == 'mp3' || first.getAjxpMime() == 'wav') && !(window.soundManager && window.soundManager.enabled)){
+                                        return;
+                                    }
+                                    dm.setSelectedNodes([first], "dataModel");
+                                    window.setTimeout(function(){pydio.getController().fireDefaultAction("file");}, 1);
+                                    p.stop();
+                                    return;
+                                }
+                            }, 1);
+                        }catch(e){
+                            if (console) console.log(e);
+                        }
+                    });
+				</script>
+			]]></template>
+            <template name="unique_preview_download" element="ajxp_unique_dl" position="top" label="Big download button"><![CDATA[
+				<div id="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
+                    <div id="background_container" ajxpClass="AjxpPane" ajxpOptions='{"imageBackgroundFromConfigs":"gui.ajax/CUSTOM_SHAREPAGE_BACKGROUND_"}'></div>
+                    <div id="cpane_container" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"browser"}'>
+                        <div id="logo_widget" class="widget_logo" ajxpClass="LogoWidget"  ajxpOptions='{"imageParameter":"gui.ajax/CUSTOM_MINISITE_LOGO"}'></div>
+                    </div>
+                    <div class="vertical-align">
+                        <div class="vertical-align-center">
+                            <div id="reactDLTemplate" ajxpClass="AjxpReactComponent" ajxpOptions='{"componentNamespace":"ShareTemplates","componentName":"DLTemplate"}'></div>
+                            <div id="share_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["minisite-share-actions"]}'></div>
+                        </div>
+                    </div>
+                </div>
+			]]></template>
+            <template name="minisite_bare" element="ajxp_embed_template" position="top" label="share_center.155"><![CDATA[
+				<div id="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
+                    <div id="cpane_header" class="panelHeader">
+                        <div id="display_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["navigation", "minisite", "inline", "content_pane-actions"],"submenuOffsetTop":2}'></div>
+                        <div id="breadcrumb" ajxpClass="Breadcrumb" style="width:50%;" ajxpOptions='{"flexTo":"cpane_header", "flexToMargin":30}'></div>
+                    </div>
+                    <div id="content_pane" ajxpClass="FilesList" ajxpOptions='{"displayMode":"detail", "detailThumbSize": 50 ,"replaceScroller":true, "messageBoxReference":true, "fit":"height", "fitParent":"cpane_container", "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px", "invisibleSelection":false}' style="border: 1px solid #bbb; border-width:0 1px;"></div>
+                    <div id="logo_widget" class="widget_logo" ajxpClass="LogoWidget"  ajxpOptions='{"imageParameter":"gui.ajax/CUSTOM_MINISITE_LOGO"}'></div>
+                    <div id="tasks_panel" class="react-mui-context" ajxpClass="AjxpReactComponent" ajxpOptions='{"componentNamespace":"PydioTasks","componentName":"Panel"}'></div>
+				</div>
+                <script>
+                    document.observe("ajaxplorer:afterApply-login", function(){
+                        AjxpPane.prototype.staticApplyBackgroundFromConfigs($("overlay"), "gui.ajax/CUSTOM_SHAREPAGE_BACKGROUND_", "display:block;", true);
+                    });
+                </script>
+			]]></template>
+            <template name="minisite_dropbox" element="ajxp_dropbox_template" position="top" label="share_center.163"><![CDATA[
+				<div id="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
+                    <div id="cpane_header" class="panelHeader">
+                        <div id="display_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["minisite", "inline","content_pane-actions"],"submenuOffsetTop":2}'></div>
+                        <div id="breadcrumb" ajxpClass="Breadcrumb" style="width:50%;" ajxpOptions='{"flexTo":"cpane_header", "flexToMargin":30}'></div>
+                    </div>
+                    <div id="content_pane" ajxpClass="FilesList" ajxpOptions='{"displayMode":"detail", "detailThumbSize": 50 ,"replaceScroller":true, "messageBoxReference":true, "fit":"height", "fitParent":"cpane_container", "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px", "invisibleSelection":false}' style="border: 1px solid #bbb; border-width:0 1px;"></div>
+                    <div id="logo_widget" class="widget_logo" ajxpClass="LogoWidget" ajxpOptions='{"imageParameter":"gui.ajax/CUSTOM_MINISITE_LOGO"}'></div>
+                    <div id="tasks_panel" class="react-mui-context" ajxpClass="AjxpReactComponent" ajxpOptions='{"componentNamespace":"PydioTasks","componentName":"Panel"}'></div>
+				</div>
+				<script>
+                    document.observe("ajaxplorer:afterApply-login", function(){
+                        AjxpPane.prototype.staticApplyBackgroundFromConfigs($("overlay"), "gui.ajax/CUSTOM_SHAREPAGE_BACKGROUND_", "display:block;", true);
+                    });
+                </script>
+			]]></template>
             <component_config className="InfoPanel">
                 <infoPanelExtension mime="meta:ajxp_shared" attributes="" modifier="ShareInfoPanel.loader">
                     <messages>
@@ -350,25 +430,28 @@
             </component_config>
             <component_config className="AjxpTabulator::userdashboard_main_tab">
                 <additional_tab id="shared_pane2"
-                                tabInfo='{"id":"my-shared2","iconClass":"icon-share","element":"shared_pane2","closeable":false,"label":"share_center.98","title":"share_center.99","dontFocus":true,"position":4}'
+                                tabInfo='{"id":"shares","iconClass":"mdi mdi-share-variant","element":"shared_pane2","closeable":false,"label":"share_center.98","title":"share_center.99","dontFocus":true,"position":4}'
                                 paneInfo='{"type":"widget"}'><![CDATA[
                     <div id="shared_pane2" ajxpClass="AjxpPane" class="tabbed_editor">
-                        <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"dataModelElementId":"shared_files_list","toolbarsList":["share_list_toolbar-selection", "share_list_toolbar"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
-                        <h3 class="dashboard_panel_title">AJXP_MESSAGE[share_center.98]</h3>
+                        <div class="title-flex">
+                            <h3 class="dashboard_panel_title">AJXP_MESSAGE[share_center.98]<div class="legend">AJXP_MESSAGE[share_center.99]</div></h3>
+                            <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"dataModelElementId":"shared_files_list","toolbarsList":["share_list_toolbar-selection", "share_list_toolbar"],"submenuOffsetTop":2}'></div>
+                        </div>
                         <div id="shared_files_list" ajxpClass="FetchedResultPane" ajxpOptions='{"displayMode":"list", "fixedDisplayMode":"list", "groupByData":"1", "fit":"height","selectionChangeCallback":false,"updateGlobalContext":false,"nodeProviderProperties":{"get_action":"sharelist-load","user_context":"current"}}'></div>
                     </div>
                 ]]></additional_tab>
             </component_config>
         </client_configs>
         <hooks>
-            <serverCallback hookName="node.info" methodName="nodeSharedMetadata"/>
+            <serverCallback hookName="node.info.nocache" methodName="nodeSharedMetadata"/>
             <serverCallback hookName="node.change" methodName="updateNodeSharedData"/>
             <serverCallback hookName="user.after_delete" methodName="cleanUserShares" defer="true"/>
+            <serverCallback hookName="workspace.after_delete" methodName="cleanWorkspaceShares" defer="true"/>
             <serverCallback methodName="forwardEventToShares" hookName="node.change" defer="true"/>
         </hooks>
     </registry_contributions>
-    <class_definition filename="plugins/action.share/class.ShareCenter.php" classname="ShareCenter"/>
+    <class_definition filename="plugins/action.share/src/ShareCenter.php" classname="Pydio\Share\ShareCenter"/>
     <dependencies>
-        <activePlugin pluginName="access.AJXP_STREAM_PROVIDER|access.ajxp_user|access.ajxp_conf|access.ajxp_admin"/>
+        <!--<activePlugin pluginName="access.AJXP_STREAM_PROVIDER|access.ajxp_user|access.ajxp_conf|access.ajxp_admin"/>-->
     </dependencies>
 </ajxp_plugin>
diff --git a/core/src/plugins/action.share/package.json b/core/src/plugins/action.share/package.json
index 4471b0274c..de412fe9d8 100644
--- a/core/src/plugins/action.share/package.json
+++ b/core/src/plugins/action.share/package.json
@@ -1,6 +1,6 @@
 {
   "name": "action.share",
-  "version": "6.2.3",
+  "version": "6.5.1",
   "description": "",
   "source_path":"res/react",
   "main": "index.js",
diff --git a/core/src/plugins/action.share/res/i18n/ca.php b/core/src/plugins/action.share/res/i18n/ca.php
index f1afd10cf1..d4a037af5b 100644
--- a/core/src/plugins/action.share/res/i18n/ca.php
+++ b/core/src/plugins/action.share/res/i18n/ca.php
@@ -194,57 +194,62 @@
 "175" => "Per favor establiu una contrasenya i assegureu-vos que és prou llarga!",
 "176" => "(Obligatori)",
 "177" => "Veure paràmetres",
-    "178" => "enabled",
-    "179" => "Revert",
-    "180" => "Clear list",
-    "181" => "Modify",
-    "182" => "Use the field above to pick a user from the internal directory or from your personal address book. If you want to create a new user, just type in a new identifier and hit Enter.",
-    "183" => "Notify on content change",
-    "184" => "Notify me when content is accessed or changed",
-    "185" => "Notify me when content is accessed",
-    "186" => "Notify me when content is changed",
-    "187" => "Do not notify me",
-    "188" => "Receive alerts whenever a user accesses or modifies the content of this share.",
-    "189" => "Enable Public Link",
-    "190" => "This file is not currently publicly accessible. Enabling a public link will create a unique access that you can send to anyone. If you want to share with existing Pydio users, use the \"Users\" tab.",
-    "191" => "Copy link to clipboard",
-    "192" => "Link has been copied to clipboard",
-    "193" => "Customize Link",
-    "194" => "For a prettier link, you can customize the last part",
-    "195" => "Warning, there is no embedded viewer for this file, except opening in a new tab of your browser: this may trigger a download automatically when user opens the link.",
-    "196" => "Secure Access",
-    "197" => "Use this field to send optional comments",
-    "198" => "You can select the appearance of the link as it will appear in the browser.",
-    "199" => "Share Visibility",
-    "200" => "Visible to other users",
-    "201" => "Other users who access to the current workspace can update the links parameters, but they cannot delete it. Only you can stop this share or toggle its visibility",
-    "202" => "Other users who access to the current workspace can update the links parameters. You are not the owner of the share so you cannot delete it or toggle its visibility",
-    "203" => "Transfer Ownership",
-    "203b"=> "Transfer",
-    "204" => "If the share is publicly visible and you want another user to manage this share, you can transfer its ownership.",
-    "205" => "Transfer to ... (user identifier)",
-    "206" => "Shares are 'private' by default: you only can see them. If you want other users who access the current workspace to see and edit this share, toggle the visibility.",
-    "207" => "Remote Users",
-    "208" => "Share with users from other filesharing platforms (compatible with Federated Sharing API).",
-    "209" => "Remote Address",
-    "210" => "User Identifier",
-    "211" => "pending",
-    "212" => "accepted",
-    "213" => "rejected",
-    "214" => "not sent",
-    "215" => "To enable a public link on a file or a folder, you first need to set up a password.",
-    "216" => "Successfully unshared element",
-    "217" => "Local Users",
-    "218" => "Notification",
-    "219" => "Error while loading share. Error was (%s).",
-    "220" => "You are not allowed to create users",
-    "221" => "You are not allowed to share with other users, only your own external users",
-    "222" => "User %s already exists, please choose another identifier",
-    "223" => "Custom link is too short, please use at least %s characters",
-    "224" => "You are not allowed to manage this share, please ask its owner to perform the changes, or to transfer you the ownership.",
-    "225" => "You are not allowed to create public links on files",
-    "226" => "You are not allowed to create public links on folders",
-    "227" => "You are not allowed to share files internally",
-    "228" => "You are not allowed to share folders internally",
-    "229" => "Please save before sending an invitation",
+"178" => "enabled",
+"179" => "Revert",
+"180" => "Clear list",
+"181" => "Modify",
+"182" => "Use the field above to pick a user from the internal directory or from your personal address book. If you want to create a new user, just type in a new identifier and hit Enter.",
+"183" => "Notify on content change",
+"184" => "Notify me when content is accessed or changed",
+"185" => "Notify me when content is accessed",
+"186" => "Notify me when content is changed",
+"187" => "Do not notify me",
+"188" => "Receive alerts whenever a user accesses or modifies the content of this share.",
+"189" => "Enable Public Link",
+"190" => "This file is not currently publicly accessible. Enabling a public link will create a unique access that you can send to anyone. If you want to share with existing Pydio users, use the \"Users\" tab.",
+"191" => "Copy link to clipboard",
+"192" => "Link has been copied to clipboard",
+"193" => "Customize Link",
+"194" => "For a prettier link, you can customize the last part",
+"195" => "Warning, there is no embedded viewer for this file, except opening in a new tab of your browser: this may trigger a download automatically when user opens the link.",
+"196" => "Secure Access",
+"197" => "Use this field to send optional comments",
+"198" => "You can select the appearance of the link as it will appear in the browser.",
+"199" => "Share Visibility",
+"200" => "Visible to other users",
+"201" => "Other users who access to the current workspace can update the links parameters, but they cannot delete it. Only you can stop this share or toggle its visibility",
+"202" => "Other users who access to the current workspace can update the links parameters. You are not the owner of the share so you cannot delete it or toggle its visibility",
+"203" => "Transfer Ownership",
+"203b"=> "Transfer",
+"204" => "If the share is publicly visible and you want another user to manage this share, you can transfer its ownership.",
+"205" => "Transfer to ... (user identifier)",
+"206" => "Shares are 'private' by default: you only can see them. If you want other users who access the current workspace to see and edit this share, toggle the visibility.",
+"207" => "Remote Users",
+"208" => "Share with users from other filesharing platforms (compatible with Federated Sharing API).",
+"209" => "Remote Address",
+"210" => "User Identifier",
+"211" => "pending",
+"212" => "accepted",
+"213" => "rejected",
+"214" => "not sent",
+"215" => "To enable a public link on a file or a folder, you first need to set up a password.",
+"216" => "Successfully unshared element",
+"217" => "Local Users",
+"218" => "Notification",
+"219" => "Error while loading share. Error was (%s).",
+"220" => "You are not allowed to create users",
+"221" => "You are not allowed to share with other users, only your own external users",
+"222" => "User %s already exists, please choose another identifier",
+"223" => "Custom link is too short, please use at least %s characters",
+"224" => "You are not allowed to manage this share, please ask its owner to perform the changes, or to transfer you the ownership.",
+"225" => "You are not allowed to create public links on files",
+"226" => "You are not allowed to create public links on folders",
+"227" => "You are not allowed to share files internally",
+"228" => "You are not allowed to share folders internally",
+"229" => "Insert a preview of the file by pasting this code inside an HTML page.",
+"230" => "Please save before sending an invitation",
+"231" => "Click to start downloading",
+"232" => "No entries found for share, did you maybe delete some users?",
+"233" => "Reset this share",
+"234" => "It has been added to your %s workspace.",
 );
\ No newline at end of file
diff --git a/core/src/plugins/action.share/res/i18n/conf/de.php b/core/src/plugins/action.share/res/i18n/conf/de.php
index 40fc65cb98..e0c2d98a61 100644
--- a/core/src/plugins/action.share/res/i18n/conf/de.php
+++ b/core/src/plugins/action.share/res/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Sharing Features" => "Freigaben",
@@ -80,4 +80,4 @@
 "Enable internal folder sharing (sharing with users existing or temporary users)" => "Enable internal folder sharing (sharing with users existing or temporary users)",
 "Folders: enable internal sharing" => "Folders: enable internal sharing",
 "Internal Sharing" => "Internal Sharing",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/action.share/res/i18n/conf/en.php b/core/src/plugins/action.share/res/i18n/conf/en.php
index e4b08ec829..1cff50d253 100644
--- a/core/src/plugins/action.share/res/i18n/conf/en.php
+++ b/core/src/plugins/action.share/res/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Sharing Features" => "Sharing Features",
diff --git a/core/src/plugins/action.share/res/i18n/conf/fr.php b/core/src/plugins/action.share/res/i18n/conf/fr.php
index a510d2a5ce..fd6af92569 100644
--- a/core/src/plugins/action.share/res/i18n/conf/fr.php
+++ b/core/src/plugins/action.share/res/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Sharing Features" => "Fonctions de partage",
diff --git a/core/src/plugins/action.share/res/i18n/conf/it.php b/core/src/plugins/action.share/res/i18n/conf/it.php
index 9fe068657a..8f567a373c 100644
--- a/core/src/plugins/action.share/res/i18n/conf/it.php
+++ b/core/src/plugins/action.share/res/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Sharing Features" => "Opzioni Condivisione",
@@ -99,4 +99,4 @@
 "Enable internal folder sharing (sharing with users existing or temporary users)" => "Enable internal folder sharing (sharing with users existing or temporary users)",
 "Folders: enable internal sharing" => "Folders: enable internal sharing",
 "Internal Sharing" => "Internal Sharing",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/action.share/res/i18n/conf/pt.php b/core/src/plugins/action.share/res/i18n/conf/pt.php
index 71ff785c26..5a2857f399 100644
--- a/core/src/plugins/action.share/res/i18n/conf/pt.php
+++ b/core/src/plugins/action.share/res/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Sharing Features" => "Funções de Partilha",
diff --git a/core/src/plugins/action.share/res/i18n/de.php b/core/src/plugins/action.share/res/i18n/de.php
index e7524756b9..cacb5e7e73 100644
--- a/core/src/plugins/action.share/res/i18n/de.php
+++ b/core/src/plugins/action.share/res/i18n/de.php
@@ -3,7 +3,6 @@
 $mess = array(
 // will be replaced by the application title
 "1" => "%s öffentlicher Download",
-// will be replaced by the filename to download
 "2" => "Klicken Sie auf das Bild, um <b>%s</b> auf Ihre Festplatte zu speichern",
 "3" => "falsches Passwort",
 "4" => "Geben Sie das erforderliche Passwort ein und klicken Sie auf das Bild um <b>%s</b> auf Ihre Festplatte zu speichern",
@@ -176,74 +175,80 @@
 "161" => "Veralteter Link",
 "162" => "Sie besitzen ein oder mehrere veralteter Links auf diese Datei. Bitte ersetzen Sie diesen mit einem neuen Link durch Löschen und Neuerstellung der Freigabe. Kopiere das Freigabe-Kürzel (der letzte Bestandteil der URL, z.B. https://.../data/public/<em style='color:red;'>206a51</em>.php) und nutze ihn als neues Kürzel beim Erstellen um sicherzugehen, dass der Link auch nach der Migration noch gültig ist.",
 "163" => "Drag'n'Drop (Für öffentliche Links mit aktivierten Upload)",
-    "138b" => "Sie haben diesen Ordner als einen öffentlichen Link freigegeben, welcher jedoch aktuell inaktiv ist (ausgelaufen).",
-    "139b" => "Sie haben diesen Ordner als Arbeitsumgebung mit Systemnutzern freigegeben, welche jedoch aktuell inaktiv ist (ausgelaufen).",
-    "140b" => "Sie haben diese Datei als einen öffentlichen Link freigegeben, welcher jedoch aktuell inaktiv ist (ausgelaufen).",
-    "164" => "Nicht erlaubt: Script wurde verändert!",
-    "165" => "Entschuldigung, dieser Link ist abgelaufen!",
-    "166" => "Kann angegebenen Link nicht finden!",
-    "167" => "Link ist ausgelaufen!",
-    "168" => "Die Anzahl an erlaubten Downloads wurde erreicht. Klicke um den Zähler zurückzusetzen und den Link zu reaktivieren.",
-    "169" => "Das Verfallsdatum wurde erreicht. Setze ein neues Datum um den Link zu reaktivieren.",
-    "170" => "Dieser Link ist durch ein Passwort geschützt.",
-    "171" => "Link-Kürzel",
-    "172" => "Dieser Link wird bereits genutzt. Wähle ein anderes Kürzel.",
-    "173" => "Wenn Sie ein dauerhaften und ansehlichen Link möchten (z.B. https://.../mein-kuerzel), können Sie dieses Feld nutzen. Ansonsten wird das Kürzel zufällig generiert.",
-    "174" => "Deaktiviere Passwort",
-    "175" => "Bitte ein ausreichend langes Passwort festlegen!",
-    "176" => "(Pflichtfeld)",
-    "177" => "Ansichts-Parameter",
-    "178" => "aktiv",
-    "179" => "Zurücksetzen",
-    "180" => "Liste leeren",
-    "181" => "Ändern",
-    "182" => "Einen bestehenden Benutzer auswählen oder einen neuen Benutzernamen eingeben und mit 'Enter' bestätigen, um einen weiteren Benutzer anzulegen.",
-    "183" => "Bei Änderungen benachrichtigen",
-    "184" => "Mich bei Zugriffen oder Änderungen benachrichtigen",
-    "185" => "Mich nur bei Zugriffen benachrichtigen",
-    "186" => "Mich nur bei Änderungen benachrichtigen",
-    "187" => "Mich nicht benachrichtigen",
-    "188" => "Benachrichtigen, sobald ein Benutzer auf den Inhalt der Freigabe zugreift, oder diesen ändert.",
-    "189" => "Als öffentlicher Link freigeben",
-    "190" => "Aktivieren Sie den Haken um eine öffentliche Freigabe zu erstellen. Im Tab \"Benutzerverwaltung\" kann die Datei für Pydio-Benutzer freigegeben werden.",
-    "191" => "Link in die Zwischenablage kopieren",
-    "192" => "Link wurde in die Zwischenablage kopiert",
-    "193" => "Link personalisieren",
-    "194" => "Für einen lesbareren Link kann der letzte Teil geändert werden",
-    "195" => "Diese Datei kann nur in einem Browser-Tab geöffnet werden, da es keinen eingebetteten Betrachter gibt. Dies bewirkt einen automatischen Download, sobald ein Benutzer den Link öffnet.",
-    "196" => "Sicherer Zugang",
-    "197" => "Eine optionale Beschreibung festlegen",
-    "198" => "Legt das Aussehen der öffentlichen Seite im Browser fest.",
-    "199" => "Sichtbarkeit der Freigabe",
-    "200" => "Sichtbarkeit der Freigabe für andere Benutzer",
-    "201" => "Andere Benutzer mit Zugriff auf diese Arbeitsumgebung können die Freigabe bearbeiten, nicht aber löschen oder beenden.",
-    "202" => "Andere Benutzer mit Zugriff auf diese Arbeitsumgebung können die Freigabe bearbeiten. Sie sind nicht der Eigentümer dieser Freigabe und können diese daher nicht löschen oder beenden.",
-    "203" => "Eigentümer ändern",
-    "203b"=> "Ändern",
-    "204" => "Den Eigentümer dieser Freigabe ändern, so dass diese durch einen anderen Benutzer verwaltet werden kann.",
-    "205" => "Ändern auf ... (Kennung)",
-    "206" => "Freigaben sind standardmäßig privat. Durch aktivieren dieser Checkbox kann die Freigabe auch duch Benutzer mit Zugriff auf diese Arbeitsumgebung eingesehen und geändert werden.",
-    "207" => "Benutzer eines Remote-Systems",
-    "208" => "Für Benutzer einer verbundenen Plattform freigeben (Aktuell werden nur Owncloud und Pydio unterstützt).",
-    "209" => "Adresse",
-    "210" => "Benutzerkennung",
-    "211" => "ausstehend",
-    "212" => "angenommen",
-    "213" => "abgelehnt",
-    "214" => "nicht gesendet",
-    "215" => "Um die Freigabe zu aktivieren muss zuerst ein Passwort eingegeben werden.",
-    "216" => "Die Freigabe wurde erfolgreich aufgehoben",
-    "217" => "Lokale Benutzer",
-    "218" => "Benachrichtigung",
-    "219" => "Die Freigabe konnte nicht geladen werden (%s).",
-    "220" => "Sie dürfen keine Benutzer erstellen",
-    "221" => "Sie dürfen Freigaben nur für die eigenen externen Benutzer erstellen.",
-    "222" => "Der Benutzer %s existiert bereits. Bitte wählen Sie einen anderen Benutzernamen.",
-    "223" => "Der Link ist zu kurz. Bitte geben Sie mindestens %s Zeichen ein.",
-    "224" => "Sie dürfen diese Freigabe nicht ändern. Bitte wenden Sie sich an den Eigentümer.",
-    "225" => "Sie dürfen keine öffentlichen Links auf Dateien erstellen.",
-    "226" => "Sie dürfen keine öffentlichen Links auf Ordner erstellen.",
-    "227" => "Sie dürfen keine internen Freigaben auf Dateien erstellen.",
-    "228" => "Sie dürfen keine internen Freigaben auf Ordner erstellen.",
-    "229" => "Please save before sending an invitation",
-);
+"138b" => "Sie haben diesen Ordner als einen öffentlichen Link freigegeben, welcher jedoch aktuell inaktiv ist (ausgelaufen).",
+"139b" => "Sie haben diesen Ordner als Arbeitsumgebung mit Systemnutzern freigegeben, welche jedoch aktuell inaktiv ist (ausgelaufen).",
+"140b" => "Sie haben diese Datei als einen öffentlichen Link freigegeben, welcher jedoch aktuell inaktiv ist (ausgelaufen).",
+"164" => "Nicht erlaubt: Script wurde verändert!",
+"165" => "Entschuldigung, dieser Link ist abgelaufen!",
+"166" => "Kann angegebenen Link nicht finden!",
+"167" => "Link ist ausgelaufen!",
+"168" => "Die Anzahl an erlaubten Downloads wurde erreicht. Klicke um den Zähler zurückzusetzen und den Link zu reaktivieren.",
+"169" => "Das Verfallsdatum wurde erreicht. Setze ein neues Datum um den Link zu reaktivieren.",
+"170" => "Dieser Link ist durch ein Passwort geschützt.",
+"171" => "Link-Kürzel",
+"172" => "Dieser Link wird bereits genutzt. Wähle ein anderes Kürzel.",
+"173" => "Wenn Sie ein dauerhaften und ansehlichen Link möchten (z.B. https://.../mein-kuerzel), können Sie dieses Feld nutzen. Ansonsten wird das Kürzel zufällig generiert.",
+"174" => "Deaktiviere Passwort",
+"175" => "Bitte ein ausreichend langes Passwort festlegen!",
+"176" => "(Pflichtfeld)",
+"177" => "Ansichts-Parameter",
+"178" => "aktiv",
+"179" => "Zurücksetzen",
+"180" => "Liste leeren",
+"181" => "Ändern",
+"182" => "Einen bestehenden Benutzer auswählen oder einen neuen Benutzernamen eingeben und mit 'Enter' bestätigen, um einen weiteren Benutzer anzulegen.",
+"183" => "Bei Änderungen benachrichtigen",
+"184" => "Mich bei Zugriffen oder Änderungen benachrichtigen",
+"185" => "Mich nur bei Zugriffen benachrichtigen",
+"186" => "Mich nur bei Änderungen benachrichtigen",
+"187" => "Mich nicht benachrichtigen",
+"188" => "Benachrichtigen, sobald ein Benutzer auf den Inhalt der Freigabe zugreift, oder diesen ändert.",
+"189" => "Als öffentlicher Link freigeben",
+"190" => "Aktivieren Sie den Haken um eine öffentliche Freigabe zu erstellen. Im Tab \"Benutzerverwaltung\" kann die Datei für Pydio-Benutzer freigegeben werden.",
+"191" => "Link in die Zwischenablage kopieren",
+"192" => "Link wurde in die Zwischenablage kopiert",
+"193" => "Link personalisieren",
+"194" => "Für einen lesbareren Link kann der letzte Teil geändert werden",
+"195" => "Diese Datei kann nur in einem Browser-Tab geöffnet werden, da es keinen eingebetteten Betrachter gibt. Dies bewirkt einen automatischen Download, sobald ein Benutzer den Link öffnet.",
+"196" => "Sicherer Zugang",
+"197" => "Eine optionale Beschreibung festlegen",
+"198" => "Legt das Aussehen der öffentlichen Seite im Browser fest.",
+"199" => "Sichtbarkeit der Freigabe",
+"200" => "Sichtbarkeit der Freigabe für andere Benutzer",
+"201" => "Andere Benutzer mit Zugriff auf diese Arbeitsumgebung können die Freigabe bearbeiten, nicht aber löschen oder beenden.",
+"202" => "Andere Benutzer mit Zugriff auf diese Arbeitsumgebung können die Freigabe bearbeiten. Sie sind nicht der Eigentümer dieser Freigabe und können diese daher nicht löschen oder beenden.",
+"203" => "Eigentümer ändern",
+"203b"=> "Ändern",
+"204" => "Den Eigentümer dieser Freigabe ändern, so dass diese durch einen anderen Benutzer verwaltet werden kann.",
+"205" => "Ändern auf ... (Kennung)",
+"206" => "Freigaben sind standardmäßig privat. Durch aktivieren dieser Checkbox kann die Freigabe auch duch Benutzer mit Zugriff auf diese Arbeitsumgebung eingesehen und geändert werden.",
+"207" => "Benutzer eines Remote-Systems",
+"208" => "Für Benutzer einer verbundenen Plattform freigeben (Aktuell werden nur Owncloud und Pydio unterstützt).",
+"209" => "Adresse",
+"210" => "Benutzerkennung",
+"211" => "ausstehend",
+"212" => "angenommen",
+"213" => "abgelehnt",
+"214" => "nicht gesendet",
+"215" => "Um die Freigabe zu aktivieren muss zuerst ein Passwort eingegeben werden.",
+"216" => "Die Freigabe wurde erfolgreich aufgehoben",
+"217" => "Lokale Benutzer",
+"218" => "Benachrichtigung",
+"219" => "Die Freigabe konnte nicht geladen werden (%s).",
+"220" => "Sie dürfen keine Benutzer erstellen",
+"221" => "Sie dürfen Freigaben nur für die eigenen externen Benutzer erstellen.",
+"222" => "Der Benutzer %s existiert bereits. Bitte wählen Sie einen anderen Benutzernamen.",
+"223" => "Der Link ist zu kurz. Bitte geben Sie mindestens %s Zeichen ein.",
+"224" => "Sie dürfen diese Freigabe nicht ändern. Bitte wenden Sie sich an den Eigentümer.",
+"225" => "Sie dürfen keine öffentlichen Links auf Dateien erstellen.",
+"226" => "Sie dürfen keine öffentlichen Links auf Ordner erstellen.",
+"227" => "Sie dürfen keine internen Freigaben auf Dateien erstellen.",
+"228" => "Sie dürfen keine internen Freigaben auf Ordner erstellen.",
+"229" => "Insert a preview of the file by pasting this code inside an HTML page.",
+"230" => "Please save before sending an invitation",
+"231" => "Click to start downloading",
+"232" => "No entries found for share, did you maybe delete some users?",
+"233" => "Reset this share",
+"234" => "It has been added to your %s workspace.",
+// will be replaced by the filename to download
+);
\ No newline at end of file
diff --git a/core/src/plugins/action.share/res/i18n/en.php b/core/src/plugins/action.share/res/i18n/en.php
index 27dbf8dc4d..2e97e2f2d5 100644
--- a/core/src/plugins/action.share/res/i18n/en.php
+++ b/core/src/plugins/action.share/res/i18n/en.php
@@ -245,5 +245,10 @@
     "226" => "You are not allowed to create public links on folders",
     "227" => "You are not allowed to share files internally",
     "228" => "You are not allowed to share folders internally",
-    "229" => "Please save before sending an invitation",
+    "229" => "Insert a preview of the file by pasting this code inside an HTML page.",
+    "230" => "Please save before sending an invitation",
+    "231" => "Click to start downloading",
+    "232" => "No entries found for share, did you maybe delete some users?",
+    "233" => "Reset this share",
+    "234" => "It has been added to your %s workspace.",
 );
diff --git a/core/src/plugins/action.share/res/i18n/es.php b/core/src/plugins/action.share/res/i18n/es.php
index 41e3530f4b..223fb46479 100644
--- a/core/src/plugins/action.share/res/i18n/es.php
+++ b/core/src/plugins/action.share/res/i18n/es.php
@@ -175,74 +175,79 @@
 "161" => "Enlace obsoleto",
 "162" => "Tiene uno o mas enlaces antiguos en este fichero. Por favor, reemplacelo con un nuevo enlace deteniendo esta compartición y recreando una nueva. Copie el 'hash' de la compartición(la útima parte del enlace, p.e. http://yourpydio.com/data/public/<em style='color:red;'>206a51</em>.php) y úselo en el nuevo diágolo de compartición para estar seguro de que el enlace seguirá activo tras la migración.",
 "163" => "Arrastre ficheros aquí (para minisitios con carga de archivos habilitada)",
-    "138b" => "Ha compartido esta carpeta como enlace público, pero está actualmente inactivo (expirado).",
-    "139b" => "Ha compartido esta carpeta como repositorio con usuarios de la aplicación, pero está actualmente inactivo (expirado).",
-    "140b" => "Ha compartido esta carpeta como enlace público, pero está actualmente inactivo (expirado).",
-	"164" => "¡No permitido: el script fue modificado!",
-    "165" => "¡Lo sentimos, este enlace ha expirado!",
-    "166" => "¡No se puede encontrar el enlace especificado!",
-    "167" => "¡El enlace ha expirado!",
-    "168" => "El número de descargas autorizadas ha sido alcanzado. Haga click para reiniciar el contador y reactivar el enlace.",
-    "169" => "Se ha alcanzado la fecha de expiración. Cambie los parámetros con una nueva fecha si desea reactivar el enlace.",
-    "170" => "Este enlace se ha protegido con una contraseña.",
-    "171" => "Manipulación del enlace",
-    "172" => "Lo sentimos pero este enlace ya está en uso, por favor seleccione otro nombre.",
-    "173" => "Si desea un enlace bonito y duradero (al estilo https://.../mi-enlace), puede usar este campo. Si no lo establece éste se generará automáticamente.",
-    "174" => "Deshabilitar contraseña",
-	"175" => "¡Por favor establezca una contraseña y asegúrese de que es suficientemente larga!",
-    "176" => "(Obligatorio)",
-    "177" => "Ver parámetros",
-    "178" => "enabled",
-    "179" => "Revert",
-    "180" => "Clear list",
-    "181" => "Modify",
-    "182" => "Use the field above to pick a user from the internal directory or from your personal address book. If you want to create a new user, just type in a new identifier and hit Enter.",
-    "183" => "Notify on content change",
-    "184" => "Notify me when content is accessed or changed",
-    "185" => "Notify me when content is accessed",
-    "186" => "Notify me when content is changed",
-    "187" => "Do not notify me",
-    "188" => "Receive alerts whenever a user accesses or modifies the content of this share.",
-    "189" => "Enable Public Link",
-    "190" => "This file is not currently publicly accessible. Enabling a public link will create a unique access that you can send to anyone. If you want to share with existing Pydio users, use the \"Users\" tab.",
-    "191" => "Copy link to clipboard",
-    "192" => "Link has been copied to clipboard",
-    "193" => "Customize Link",
-    "194" => "For a prettier link, you can customize the last part",
-    "195" => "Warning, there is no embedded viewer for this file, except opening in a new tab of your browser: this may trigger a download automatically when user opens the link.",
-    "196" => "Secure Access",
-    "197" => "Use this field to send optional comments",
-    "198" => "You can select the appearance of the link as it will appear in the browser.",
-    "199" => "Share Visibility",
-    "200" => "Visible to other users",
-    "201" => "Other users who access to the current workspace can update the links parameters, but they cannot delete it. Only you can stop this share or toggle its visibility",
-    "202" => "Other users who access to the current workspace can update the links parameters. You are not the owner of the share so you cannot delete it or toggle its visibility",
-    "203" => "Transfer Ownership",
-    "203b"=> "Transfer",
-    "204" => "If the share is publicly visible and you want another user to manage this share, you can transfer its ownership.",
-    "205" => "Transfer to ... (user identifier)",
-    "206" => "Shares are 'private' by default: you only can see them. If you want other users who access the current workspace to see and edit this share, toggle the visibility.",
-    "207" => "Remote Users",
-    "208" => "Share with users from other filesharing platforms (compatible with Federated Sharing API).",
-    "209" => "Remote Address",
-    "210" => "User Identifier",
-    "211" => "pending",
-    "212" => "accepted",
-    "213" => "rejected",
-    "214" => "not sent",
-    "215" => "To enable a public link on a file or a folder, you first need to set up a password.",
-    "216" => "Successfully unshared element",
-    "217" => "Local Users",
-    "218" => "Notification",
-    "219" => "Error while loading share. Error was (%s).",
-    "220" => "You are not allowed to create users",
-    "221" => "You are not allowed to share with other users, only your own external users",
-    "222" => "User %s already exists, please choose another identifier",
-    "223" => "Custom link is too short, please use at least %s characters",
-    "224" => "You are not allowed to manage this share, please ask its owner to perform the changes, or to transfer you the ownership.",
-    "225" => "You are not allowed to create public links on files",
-    "226" => "You are not allowed to create public links on folders",
-    "227" => "You are not allowed to share files internally",
-    "228" => "You are not allowed to share folders internally",
-    "229" => "Please save before sending an invitation",
+"138b" => "Ha compartido esta carpeta como enlace público, pero está actualmente inactivo (expirado).",
+"139b" => "Ha compartido esta carpeta como repositorio con usuarios de la aplicación, pero está actualmente inactivo (expirado).",
+"140b" => "Ha compartido esta carpeta como enlace público, pero está actualmente inactivo (expirado).",
+"164" => "¡No permitido: el script fue modificado!",
+"165" => "¡Lo sentimos, este enlace ha expirado!",
+"166" => "¡No se puede encontrar el enlace especificado!",
+"167" => "¡El enlace ha expirado!",
+"168" => "El número de descargas autorizadas ha sido alcanzado. Haga click para reiniciar el contador y reactivar el enlace.",
+"169" => "Se ha alcanzado la fecha de expiración. Cambie los parámetros con una nueva fecha si desea reactivar el enlace.",
+"170" => "Este enlace se ha protegido con una contraseña.",
+"171" => "Manipulación del enlace",
+"172" => "Lo sentimos pero este enlace ya está en uso, por favor seleccione otro nombre.",
+"173" => "Si desea un enlace bonito y duradero (al estilo https://.../mi-enlace), puede usar este campo. Si no lo establece éste se generará automáticamente.",
+"174" => "Deshabilitar contraseña",
+"175" => "¡Por favor establezca una contraseña y asegúrese de que es suficientemente larga!",
+"176" => "(Obligatorio)",
+"177" => "Ver parámetros",
+"178" => "enabled",
+"179" => "Revert",
+"180" => "Clear list",
+"181" => "Modify",
+"182" => "Use the field above to pick a user from the internal directory or from your personal address book. If you want to create a new user, just type in a new identifier and hit Enter.",
+"183" => "Notify on content change",
+"184" => "Notify me when content is accessed or changed",
+"185" => "Notify me when content is accessed",
+"186" => "Notify me when content is changed",
+"187" => "Do not notify me",
+"188" => "Receive alerts whenever a user accesses or modifies the content of this share.",
+"189" => "Enable Public Link",
+"190" => "This file is not currently publicly accessible. Enabling a public link will create a unique access that you can send to anyone. If you want to share with existing Pydio users, use the \"Users\" tab.",
+"191" => "Copy link to clipboard",
+"192" => "Link has been copied to clipboard",
+"193" => "Customize Link",
+"194" => "For a prettier link, you can customize the last part",
+"195" => "Warning, there is no embedded viewer for this file, except opening in a new tab of your browser: this may trigger a download automatically when user opens the link.",
+"196" => "Secure Access",
+"197" => "Use this field to send optional comments",
+"198" => "You can select the appearance of the link as it will appear in the browser.",
+"199" => "Share Visibility",
+"200" => "Visible to other users",
+"201" => "Other users who access to the current workspace can update the links parameters, but they cannot delete it. Only you can stop this share or toggle its visibility",
+"202" => "Other users who access to the current workspace can update the links parameters. You are not the owner of the share so you cannot delete it or toggle its visibility",
+"203" => "Transfer Ownership",
+"203b"=> "Transfer",
+"204" => "If the share is publicly visible and you want another user to manage this share, you can transfer its ownership.",
+"205" => "Transfer to ... (user identifier)",
+"206" => "Shares are 'private' by default: you only can see them. If you want other users who access the current workspace to see and edit this share, toggle the visibility.",
+"207" => "Remote Users",
+"208" => "Share with users from other filesharing platforms (compatible with Federated Sharing API).",
+"209" => "Remote Address",
+"210" => "User Identifier",
+"211" => "pending",
+"212" => "accepted",
+"213" => "rejected",
+"214" => "not sent",
+"215" => "To enable a public link on a file or a folder, you first need to set up a password.",
+"216" => "Successfully unshared element",
+"217" => "Local Users",
+"218" => "Notification",
+"219" => "Error while loading share. Error was (%s).",
+"220" => "You are not allowed to create users",
+"221" => "You are not allowed to share with other users, only your own external users",
+"222" => "User %s already exists, please choose another identifier",
+"223" => "Custom link is too short, please use at least %s characters",
+"224" => "You are not allowed to manage this share, please ask its owner to perform the changes, or to transfer you the ownership.",
+"225" => "You are not allowed to create public links on files",
+"226" => "You are not allowed to create public links on folders",
+"227" => "You are not allowed to share files internally",
+"228" => "You are not allowed to share folders internally",
+"229" => "Insert a preview of the file by pasting this code inside an HTML page.",
+"230" => "Please save before sending an invitation",
+"231" => "Click to start downloading",
+"232" => "No entries found for share, did you maybe delete some users?",
+"233" => "Reset this share",
+"234" => "It has been added to your %s workspace.",
 );
\ No newline at end of file
diff --git a/core/src/plugins/action.share/res/i18n/fr.php b/core/src/plugins/action.share/res/i18n/fr.php
index eeb710a135..4c13b89f71 100644
--- a/core/src/plugins/action.share/res/i18n/fr.php
+++ b/core/src/plugins/action.share/res/i18n/fr.php
@@ -172,77 +172,82 @@
 "158" => "Ce fichier est actuellement partagé. Si vous le supprimez, le partage associé sera désactivé.",
 "159" => "Propriétaire",
 "160" => "Vous n'êtes pas autorisé à supprimer cet élément partagé",
-    "161" => "Lien obsolète",
-    "162" => "Ce partage a été généré par une ancienne version de l'application. Veuillez le remplacer en le stoppant puis en le recréant. Vous pouvez copier le 'hash' (la dernière partie du lien, soit par exemple http://votrepydio.com/data/public/<em style='color:red;'>206a51</em>.php) et l'utiliser pour regénérer un nouveau partage qui aura donc toujours la même addresse.",
-    "163" => "Déposer vos fichiers ici (pour les minisites permetant l'envois)",
-    "138b" => "Vous avez partagé ce dossier via un lien public, mais il est actuellement inactif (expiré).",
-    "139b" => "Vous avez partagé ce dossier comme un dépôt, , mais il est actuellement inactif (expiré).",
-    "140b" => "Vous avez partagé ce fichier via un lien public, mais il est actuellement inactif (expiré).",
-    "164" => "Accès refusé: le script a été modifié!",
-    "165" => "Désolé, ce lien a expiré!",
-    "166" => "Impossible de trouver le lien!",
-    "167" => "Le lien est expiré!",
-    "168" => "Le nombre de téléchargements autorisés a été atteint. Cliquer pour remettre à zéro et réactiver le lien.",
-    "169" => "La date d'expiration est passée. Changez les paramètres du lien pour le réactiver.",
-    "170" => "Ce lien est sécurisé par un mot de passe.",
-    "171" => "Lien Personnalisé",
-    "172" => "Désolé ce lien est déjà utilisé, veuillez en choisir un autre.",
-    "173" => "Si vous voulez créer un lien durable, vous pouvez utiliser ce champ pour fixer la dernière partie du lien (e.g. https://.../mon-joli-lien). Laisser vide pour générer automatiquement.",
-    "174" => "Remettre à zéro",
-    "175" => "Veuillez mettre un mot de passe et vous assurer qu'il est assez long!",
-    "176" => "(Obligatoire)",
-    "177" => "Voir les paramètres",
-    "178" => "activé",
-    "179" => "Annuler",
-    "180" => "Vider la liste",
-    "181" => "Modification",
-    "182" => "Sélectionnez un utilisateur dans l'annuaire centralisé ou dans votre carnet d'adresse. Pour créer un nouvel utilisateur, tapez le nouvel identifiant et sélectionnez Créer l'utilisateur.",
-    "183" => "Notifier lors des changements",
-    "184" => "Me notifier lors de changements ou d'accès",
-    "185" => "Me notifier si le contenu est accédé",
-    "186" => "Me notifier lors de changements du contenu",
-    "187" => "Ne pas recevoir de notifications",
-    "188" => "Recevoir des alertes lorsque un utilisateur accède ou modifie le contenu du partage.",
-    "189" => "Activer le lien public",
-    "190" => "Ce fichier n'est pas accessible publiquement. Cochez pour créer un lien unique à envoyer à plusieurs personnes. Si vous voulez partager avec des utilisateurs de la plateforme, utilisez l'onglet 'Utilisateurs'.",
-    "191" => "Copier le lien dans le presse-papiers",
-    "192" => "Le lien a été copié!",
-    "193" => "Personnaliser le lien.",
-    "194" => "Vous pouvez modifier la dernière partie du lien.",
-    "195" => "Attention, il n'y a pas de visualisateur intégré pour ce type de fichier. L'ouverture du lien risque de déclencher un téléchargement automatique pour l'utilisateur.",
-    "196" => "Sécuriser l'accès",
-    "197" => "Utilisez ce champs pour passer un commentaire",
-    "198" => "Modifier l'apparence du lien public dans le navigateur.",
-    "199" => "Visibilité du Partage",
-    "200" => "Visible par les autres utilisateurs",
-    "201" => "Les utilisateurs qui accèdent au même workspace peuvent modifier les paramètres, mais il ne peuvent pas supprimer le partage. Vous seul pouvez supprimer le partage.",
-    "202" => "Les utilisateurs qui accèdent au même workspace peuvent modifier les paramètres. Vous n'êtes pas le propriétaire du partage donc vous ne pouvez pas le supprimer.",
-    "203" => "Transférer la propriété",
-    "203b"=> "Transférer",
-    "204" => "Si vous souhaitez qu'un autre utilisateur soit le propriétaire de ce partage, utilisez le champ ci-dessous.",
-    "205" => "Transférer à ... (identifiant utilisateur)",
-    "206" => "Par défaut les partages sont privés : vous seul pouvez les voir. Vous pouvez les rendre visible aux autres utilisateurs de la plateforme qui accèdent au workspace courant.",
-    "207" => "Utilisateurs Distants",
-    "208" => "Partagez avec des utilisateurs d'autres plateformes de partage de fichiers (compatibles avec l'API Federated Sharing).",
-    "209" => "Adresse de la plateforme",
-    "210" => "Identifiant",
-    "211" => "en attente",
-    "212" => "accepté",
-    "213" => "rejeté",
-    "214" => "pas envoyé",
-    "215" => "Pour activer un lien public sur un fichier ou un répertoire, vous devez lui assigner un mot de passe.",
-    "216" => "Le partage a été désactivé avec succès.",
-    "217" => "Utilisateurs Locaux",
-    "218" => "Notification",
-    "219" => "Erreur lors du chargement du partage (%s).",
-    "220" => "Vous n'êtes pas autorisé à créer des utilisateurs.",
-    "221" => "Vous n'êtes pas autorisé à partager avec des utilisateurs internes, seulement vos propres utilisateurs partagés.",
-    "222" => "L'utilisateur %s existe déjà, veuillez choisir un autre identifiant.",
-    "223" => "Le lien personnalisé est trop court, veuillez utiliser au moins %s caractères.",
-    "224" => "Vous n'êtes pas autorisé à gérer ce partage, veuillez demander au propriétaire du partage.",
-    "225" => "Vous n'êtes pas autorisé à créer des liens publics sur les fichiers",
-    "226" => "Vous n'êtes pas autorisé à créer des liens publics sur les répertoires",
-    "227" => "Vous n'êtes pas autorisé à partager des fichiers en interne",
-    "228" => "Vous n'êtes pas autorisé à partager des répertoires en interne",
-    "229" => "Veuillez sauver ce partage avant de pouvoir envoyer une invitation.",
+"161" => "Lien obsolète",
+"162" => "Ce partage a été généré par une ancienne version de l'application. Veuillez le remplacer en le stoppant puis en le recréant. Vous pouvez copier le 'hash' (la dernière partie du lien, soit par exemple http://votrepydio.com/data/public/<em style='color:red;'>206a51</em>.php) et l'utiliser pour regénérer un nouveau partage qui aura donc toujours la même addresse.",
+"163" => "Déposer vos fichiers ici (pour les minisites permetant l'envois)",
+"138b" => "Vous avez partagé ce dossier via un lien public, mais il est actuellement inactif (expiré).",
+"139b" => "Vous avez partagé ce dossier comme un dépôt, , mais il est actuellement inactif (expiré).",
+"140b" => "Vous avez partagé ce fichier via un lien public, mais il est actuellement inactif (expiré).",
+"164" => "Accès refusé: le script a été modifié!",
+"165" => "Désolé, ce lien a expiré!",
+"166" => "Impossible de trouver le lien!",
+"167" => "Le lien est expiré!",
+"168" => "Le nombre de téléchargements autorisés a été atteint. Cliquer pour remettre à zéro et réactiver le lien.",
+"169" => "La date d'expiration est passée. Changez les paramètres du lien pour le réactiver.",
+"170" => "Ce lien est sécurisé par un mot de passe.",
+"171" => "Lien Personnalisé",
+"172" => "Désolé ce lien est déjà utilisé, veuillez en choisir un autre.",
+"173" => "Si vous voulez créer un lien durable, vous pouvez utiliser ce champ pour fixer la dernière partie du lien (e.g. https://.../mon-joli-lien). Laisser vide pour générer automatiquement.",
+"174" => "Remettre à zéro",
+"175" => "Veuillez mettre un mot de passe et vous assurer qu'il est assez long!",
+"176" => "(Obligatoire)",
+"177" => "Voir les paramètres",
+"178" => "activé",
+"179" => "Annuler",
+"180" => "Vider la liste",
+"181" => "Modification",
+"182" => "Sélectionnez un utilisateur dans l'annuaire centralisé ou dans votre carnet d'adresse. Pour créer un nouvel utilisateur, tapez le nouvel identifiant et sélectionnez Créer l'utilisateur.",
+"183" => "Notifier lors des changements",
+"184" => "Me notifier lors de changements ou d'accès",
+"185" => "Me notifier si le contenu est accédé",
+"186" => "Me notifier lors de changements du contenu",
+"187" => "Ne pas recevoir de notifications",
+"188" => "Recevoir des alertes lorsque un utilisateur accède ou modifie le contenu du partage.",
+"189" => "Activer le lien public",
+"190" => "Ce fichier n'est pas accessible publiquement. Cochez pour créer un lien unique à envoyer à plusieurs personnes. Si vous voulez partager avec des utilisateurs de la plateforme, utilisez l'onglet 'Utilisateurs'.",
+"191" => "Copier le lien dans le presse-papiers",
+"192" => "Le lien a été copié!",
+"193" => "Personnaliser le lien.",
+"194" => "Vous pouvez modifier la dernière partie du lien.",
+"195" => "Attention, il n'y a pas de visualisateur intégré pour ce type de fichier. L'ouverture du lien risque de déclencher un téléchargement automatique pour l'utilisateur.",
+"196" => "Sécuriser l'accès",
+"197" => "Utilisez ce champs pour passer un commentaire",
+"198" => "Modifier l'apparence du lien public dans le navigateur.",
+"199" => "Visibilité du Partage",
+"200" => "Visible par les autres utilisateurs",
+"201" => "Les utilisateurs qui accèdent au même workspace peuvent modifier les paramètres, mais il ne peuvent pas supprimer le partage. Vous seul pouvez supprimer le partage.",
+"202" => "Les utilisateurs qui accèdent au même workspace peuvent modifier les paramètres. Vous n'êtes pas le propriétaire du partage donc vous ne pouvez pas le supprimer.",
+"203" => "Transférer la propriété",
+"203b"=> "Transférer",
+"204" => "Si vous souhaitez qu'un autre utilisateur soit le propriétaire de ce partage, utilisez le champ ci-dessous.",
+"205" => "Transférer à ... (identifiant utilisateur)",
+"206" => "Par défaut les partages sont privés : vous seul pouvez les voir. Vous pouvez les rendre visible aux autres utilisateurs de la plateforme qui accèdent au workspace courant.",
+"207" => "Utilisateurs Distants",
+"208" => "Partagez avec des utilisateurs d'autres plateformes de partage de fichiers (compatibles avec l'API Federated Sharing).",
+"209" => "Adresse de la plateforme",
+"210" => "Identifiant",
+"211" => "en attente",
+"212" => "accepté",
+"213" => "rejeté",
+"214" => "pas envoyé",
+"215" => "Pour activer un lien public sur un fichier ou un répertoire, vous devez lui assigner un mot de passe.",
+"216" => "Le partage a été désactivé avec succès.",
+"217" => "Utilisateurs Locaux",
+"218" => "Notification",
+"219" => "Erreur lors du chargement du partage (%s).",
+"220" => "Vous n'êtes pas autorisé à créer des utilisateurs.",
+"221" => "Vous n'êtes pas autorisé à partager avec des utilisateurs internes, seulement vos propres utilisateurs partagés.",
+"222" => "L'utilisateur %s existe déjà, veuillez choisir un autre identifiant.",
+"223" => "Le lien personnalisé est trop court, veuillez utiliser au moins %s caractères.",
+"224" => "Vous n'êtes pas autorisé à gérer ce partage, veuillez demander au propriétaire du partage.",
+"225" => "Vous n'êtes pas autorisé à créer des liens publics sur les fichiers",
+"226" => "Vous n'êtes pas autorisé à créer des liens publics sur les répertoires",
+"227" => "Vous n'êtes pas autorisé à partager des fichiers en interne",
+"228" => "Vous n'êtes pas autorisé à partager des répertoires en interne",
+"229" => "Collez ce code dans une page HTML pour insérer une prévisualisation du fichier.",
+"230" => "Veuillez sauver ce partage avant de pouvoir envoyer une invitation.",
+"231" => "Cliquez pour télécharger",
+"232" => "Pas d'entrées pour ce partage, peut-être avez-vous supprimé des utilisateurs?",
+"233" => "Réinitialiser le partage",
+"234" => "Le fichier a été ajouté à votre dépôt %s.",
 );
\ No newline at end of file
diff --git a/core/src/plugins/action.share/res/i18n/it.php b/core/src/plugins/action.share/res/i18n/it.php
index 0a5bb31c29..0ac303a830 100644
--- a/core/src/plugins/action.share/res/i18n/it.php
+++ b/core/src/plugins/action.share/res/i18n/it.php
@@ -242,8 +242,13 @@
 "226" => "Non sei autorizzato per la creazione di link pubblici alle cartelle",
 "227" => "Non sei autorizzato per la condivisione interna di file",
 "228" => "Non sei autorizzato per la condivisione interna delle cartelle",
-    "229" => "Please save before sending an invitation",
+"229" => "Insert a preview of the file by pasting this code inside an HTML page.",
+"230" => "Please save before sending an invitation",
+"231" => "Click to start downloading",
 "11" => "Expiration",
 "49" => "create user",
+"232" => "No entries found for share, did you maybe delete some users?",
+"233" => "Reset this share",
+"234" => "It has been added to your %s workspace.",
 // will be replaced by the filename to download
 );
\ No newline at end of file
diff --git a/core/src/plugins/action.share/res/i18n/pt.php b/core/src/plugins/action.share/res/i18n/pt.php
index a112283916..99cbaef27a 100644
--- a/core/src/plugins/action.share/res/i18n/pt.php
+++ b/core/src/plugins/action.share/res/i18n/pt.php
@@ -175,74 +175,79 @@
 "161" => "Deprecated Link",
 "162" => "You have one or more legacy link on this file. Please replace this with a new share link by stopping this share and recreating a new one. Copy the share 'hash' (the last part of the link, e.g. http://yourpydio.com/data/public/<em style='color:red;'>206a51</em>.php) and use it in the new sharing dialog to make sure the link will still be active after migration.",
 "163" => "Drop Files Here (for upload-enabled minisites)",
-    "138b" => "You have shared this folder as a public link, but it is currently inactive (expired).",
-    "139b" => "You have shared this folder as a workspace with application users, but it is currently inactive (expired).",
-    "140b" => "You have shared this file via a public link, but it is currently inactive (expired).",
-    "164" => "Not allowed: script was modified!",
-    "165" => "Sorry, this link is expired!",
-    "166" => "Cannot find specified link!",
-    "167" => "Link is expired!",
-    "168" => "The number of authorized downloads have been reached. Click to reset the counter and reactivate the link.",
-    "169" => "The expiration date was reached. Change the parameters with a new date if you want to reactivate the link.",
-    "170" => "This is link is secured with a password.",
-    "171" => "Link Handle",
-    "172" => "Sorry this link is already used, please pick another handle.",
-    "173" => "If you want a durable and pretty link (like https://.../my-share-link), you can use this field. Link handle will be generated if left empty.",
-    "174" => "Reset Password",
-    "175" => "Please set a password and make sure it's long enough!",
-    "176" => "(Mandatory)",
-    "177" => "View parameters",
-    "178" => "enabled",
-    "179" => "Revert",
-    "180" => "Clear list",
-    "181" => "Modify",
-    "182" => "Use the field above to pick a user from the internal directory or from your personal address book. If you want to create a new user, just type in a new identifier and hit Enter.",
-    "183" => "Notify on content change",
-    "184" => "Notify me when content is accessed or changed",
-    "185" => "Notify me when content is accessed",
-    "186" => "Notify me when content is changed",
-    "187" => "Do not notify me",
-    "188" => "Receive alerts whenever a user accesses or modifies the content of this share.",
-    "189" => "Enable Public Link",
-    "190" => "This file is not currently publicly accessible. Enabling a public link will create a unique access that you can send to anyone. If you want to share with existing Pydio users, use the \"Users\" tab.",
-    "191" => "Copy link to clipboard",
-    "192" => "Link has been copied to clipboard",
-    "193" => "Customize Link",
-    "194" => "For a prettier link, you can customize the last part",
-    "195" => "Warning, there is no embedded viewer for this file, except opening in a new tab of your browser: this may trigger a download automatically when user opens the link.",
-    "196" => "Secure Access",
-    "197" => "Use this field to send optional comments",
-    "198" => "You can select the appearance of the link as it will appear in the browser.",
-    "199" => "Share Visibility",
-    "200" => "Visible to other users",
-    "201" => "Other users who access to the current workspace can update the links parameters, but they cannot delete it. Only you can stop this share or toggle its visibility",
-    "202" => "Other users who access to the current workspace can update the links parameters. You are not the owner of the share so you cannot delete it or toggle its visibility",
-    "203" => "Transfer Ownership",
-    "203b"=> "Transfer",
-    "204" => "If the share is publicly visible and you want another user to manage this share, you can transfer its ownership.",
-    "205" => "Transfer to ... (user identifier)",
-    "206" => "Shares are 'private' by default: you only can see them. If you want other users who access the current workspace to see and edit this share, toggle the visibility.",
-    "207" => "Remote Users",
-    "208" => "Share with users from other filesharing platforms (compatible with Federated Sharing API).",
-    "209" => "Remote Address",
-    "210" => "User Identifier",
-    "211" => "pending",
-    "212" => "accepted",
-    "213" => "rejected",
-    "214" => "not sent",
-    "215" => "To enable a public link on a file or a folder, you first need to set up a password.",
-    "216" => "Successfully unshared element",
-    "217" => "Local Users",
-    "218" => "Notification",
-    "219" => "Error while loading share. Error was (%s).",
-    "220" => "You are not allowed to create users",
-    "221" => "You are not allowed to share with other users, only your own external users",
-    "222" => "User %s already exists, please choose another identifier",
-    "223" => "Custom link is too short, please use at least %s characters",
-    "224" => "You are not allowed to manage this share, please ask its owner to perform the changes, or to transfer you the ownership.",
-    "225" => "You are not allowed to create public links on files",
-    "226" => "You are not allowed to create public links on folders",
-    "227" => "You are not allowed to share files internally",
-    "228" => "You are not allowed to share folders internally",
-    "229" => "Please save before sending an invitation",
+"138b" => "You have shared this folder as a public link, but it is currently inactive (expired).",
+"139b" => "You have shared this folder as a workspace with application users, but it is currently inactive (expired).",
+"140b" => "You have shared this file via a public link, but it is currently inactive (expired).",
+"164" => "Not allowed: script was modified!",
+"165" => "Sorry, this link is expired!",
+"166" => "Cannot find specified link!",
+"167" => "Link is expired!",
+"168" => "The number of authorized downloads have been reached. Click to reset the counter and reactivate the link.",
+"169" => "The expiration date was reached. Change the parameters with a new date if you want to reactivate the link.",
+"170" => "This is link is secured with a password.",
+"171" => "Link Handle",
+"172" => "Sorry this link is already used, please pick another handle.",
+"173" => "If you want a durable and pretty link (like https://.../my-share-link), you can use this field. Link handle will be generated if left empty.",
+"174" => "Reset Password",
+"175" => "Please set a password and make sure it's long enough!",
+"176" => "(Mandatory)",
+"177" => "View parameters",
+"178" => "enabled",
+"179" => "Revert",
+"180" => "Clear list",
+"181" => "Modify",
+"182" => "Use the field above to pick a user from the internal directory or from your personal address book. If you want to create a new user, just type in a new identifier and hit Enter.",
+"183" => "Notify on content change",
+"184" => "Notify me when content is accessed or changed",
+"185" => "Notify me when content is accessed",
+"186" => "Notify me when content is changed",
+"187" => "Do not notify me",
+"188" => "Receive alerts whenever a user accesses or modifies the content of this share.",
+"189" => "Enable Public Link",
+"190" => "This file is not currently publicly accessible. Enabling a public link will create a unique access that you can send to anyone. If you want to share with existing Pydio users, use the \"Users\" tab.",
+"191" => "Copy link to clipboard",
+"192" => "Link has been copied to clipboard",
+"193" => "Customize Link",
+"194" => "For a prettier link, you can customize the last part",
+"195" => "Warning, there is no embedded viewer for this file, except opening in a new tab of your browser: this may trigger a download automatically when user opens the link.",
+"196" => "Secure Access",
+"197" => "Use this field to send optional comments",
+"198" => "You can select the appearance of the link as it will appear in the browser.",
+"199" => "Share Visibility",
+"200" => "Visible to other users",
+"201" => "Other users who access to the current workspace can update the links parameters, but they cannot delete it. Only you can stop this share or toggle its visibility",
+"202" => "Other users who access to the current workspace can update the links parameters. You are not the owner of the share so you cannot delete it or toggle its visibility",
+"203" => "Transfer Ownership",
+"203b"=> "Transfer",
+"204" => "If the share is publicly visible and you want another user to manage this share, you can transfer its ownership.",
+"205" => "Transfer to ... (user identifier)",
+"206" => "Shares are 'private' by default: you only can see them. If you want other users who access the current workspace to see and edit this share, toggle the visibility.",
+"207" => "Remote Users",
+"208" => "Share with users from other filesharing platforms (compatible with Federated Sharing API).",
+"209" => "Remote Address",
+"210" => "User Identifier",
+"211" => "pending",
+"212" => "accepted",
+"213" => "rejected",
+"214" => "not sent",
+"215" => "To enable a public link on a file or a folder, you first need to set up a password.",
+"216" => "Successfully unshared element",
+"217" => "Local Users",
+"218" => "Notification",
+"219" => "Error while loading share. Error was (%s).",
+"220" => "You are not allowed to create users",
+"221" => "You are not allowed to share with other users, only your own external users",
+"222" => "User %s already exists, please choose another identifier",
+"223" => "Custom link is too short, please use at least %s characters",
+"224" => "You are not allowed to manage this share, please ask its owner to perform the changes, or to transfer you the ownership.",
+"225" => "You are not allowed to create public links on files",
+"226" => "You are not allowed to create public links on folders",
+"227" => "You are not allowed to share files internally",
+"228" => "You are not allowed to share folders internally",
+"229" => "Insert a preview of the file by pasting this code inside an HTML page.",
+"230" => "Please save before sending an invitation",
+"231" => "Click to start downloading",
+"232" => "No entries found for share, did you maybe delete some users?",
+"233" => "Reset this share",
+"234" => "It has been added to your %s workspace.",
 );
\ No newline at end of file
diff --git a/core/src/plugins/action.share/res/i18n/ru.php b/core/src/plugins/action.share/res/i18n/ru.php
index 928b2abdce..62acd07497 100644
--- a/core/src/plugins/action.share/res/i18n/ru.php
+++ b/core/src/plugins/action.share/res/i18n/ru.php
@@ -239,11 +239,16 @@
 "226" => "You are not allowed to create public links on folders",
 "227" => "You are not allowed to share files internally",
 "228" => "You are not allowed to share folders internally",
-"229" => "Please save before sending an invitation",
+"229" => "Insert a preview of the file by pasting this code inside an HTML page.",
+"230" => "Please save before sending an invitation",
+"231" => "Click to start downloading",
 "159" => "Owner",
 "160" => "You are not allowed to delete this shared item",
 "161" => "Deprecated Link",
 "162" => "You have one or more legacy link on this file. Links are still active, but you can replace them with a new share link by stopping this share and recreating a new one. Copy the share 'hash' (the last part of the link, e.g. http://yourpydio.com/data/public/<em style='color:red;'>206a51</em>.php) and apply it to the new link using the 'Change Parameters' form.",
 "163" => "Drop Files Here (for upload-enabled minisites)",
+"232" => "No entries found for share, did you maybe delete some users?",
+"233" => "Reset this share",
+"234" => "It has been added to your %s workspace.",
 // will be replaced by the filename to download
 );
\ No newline at end of file
diff --git a/core/src/plugins/action.share/res/minisite.css b/core/src/plugins/action.share/res/minisite.css
index 947d68dc8d..1f82e9dc96 100644
--- a/core/src/plugins/action.share/res/minisite.css
+++ b/core/src/plugins/action.share/res/minisite.css
@@ -278,20 +278,6 @@ div#overlay.form-login_form_dynamic {
     padding: inherit !important;
   }
 }
-#ajxp_shared_folder {
-  width: 100%;
-  text-align: left;
-  /* THESE ONE ARE IMPORTANT */
-  overflow: hidden;
-  position: relative;
-}
-#ajxp_shared_folder .widget_logo {
-  height: 43px;
-  padding-top: 0 !important;
-}
-#ajxp_shared_folder #content_pane {
-  background-color: white;
-}
 #ajxp_unique_strip #browser {
   background-color: #345e79;
 }
@@ -321,6 +307,7 @@ div#overlay.form-login_form_dynamic {
   float: none;
   left: 0;
   width: 100%;
+  height: 100%;
 }
 #ajxp_unique_strip #cpane_header {
   padding-bottom: 7px;
@@ -374,73 +361,133 @@ div#overlay.form-login_form_dynamic {
 #ajxp_unique_dl div#overlay.form-login_form_dynamic {
   opacity: 1;
 }
-#ajxp_unique_dl #browser {
-  background-color: #000;
-  width: 102%;
-  -webkit-font-smoothing: antialiased;
-}
-#ajxp_unique_dl #cpane_container {
-  float: none;
-  left: 0;
-  position: absolute;
-  width: 100%;
-  top: 0;
-  overflow: hidden;
-}
 #ajxp_unique_dl #background_container {
   position: absolute;
-  width: 102%;
-  top: -5px;
-  left: -5px;
-  bottom: -5px;
-  right: -5px;
-}
-#ajxp_unique_dl div#dl_toolbar {
-  margin: 27% auto;
-  display: block;
-  width: 400px;
-  font-size: 52px;
-  text-align: center;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
 }
 #ajxp_unique_dl div.widget_logo {
   height: 90px;
   background-position: 86px 76px;
 }
-#ajxp_unique_dl div#widget_title {
-  color: rgba(255, 255, 255, 0.8);
+#ajxp_unique_dl div.widget_logo img.custom_logo_image {
+  right: 6px !important;
+  left: inherit !important;
+  height: 90px !important;
+  width: auto;
+}
+#ajxp_unique_dl div.vertical-align {
   position: absolute;
-  margin-top: 0px;
-  padding: 23px 30px 20px;
   width: 100%;
-  background-color: rgba(0, 0, 0, 0.7);
+  height: 100%;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
 }
-#ajxp_unique_dl div#inline_toolbar a {
-  display: none;
+#ajxp_unique_dl div.vertical-align div.vertical-align-center {
+  margin: 0 auto;
+}
+#ajxp_unique_dl div#share_toolbar {
+  margin-top: 10px;
+  text-align: center;
 }
-#ajxp_unique_dl a#download_button,
-#ajxp_unique_dl a#share_current_page_button {
+#ajxp_unique_dl div#share_toolbar a#share_current_page_button {
   display: block !important;
   text-align: center;
-  color: rgba(255, 255, 255, 0.8);
-  background-color: rgba(0, 0, 0, 0.5);
-  padding: 20px 10px;
-  border-radius: 5px;
+  color: #ffffff;
+  font-size: 12px;
+  font-weight: 500;
 }
-#ajxp_unique_dl a#download_button span.ajxp_icon {
-  display: inline-block;
-  margin-right: 10px;
+#ajxp_unique_dl div#share_toolbar a#share_current_page_button span.ajxp_icon_span {
+  display: none;
 }
-#ajxp_unique_dl div#share_toolbar {
+#ajxp_unique_dl #reactDLTemplate .download-block {
+  cursor: pointer;
+  width: auto;
+  max-width: 400px;
+  min-width: 220px;
+  margin: 0 auto;
+  text-align: center;
+  background: rgba(255, 255, 255, 0.91);
+  padding: 20px;
+  border-radius: 4px;
+  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
+}
+#ajxp_unique_dl #reactDLTemplate .download-block .dl-filename {
+  font-size: 22px;
+  line-height: 22px;
+  word-break: break-all;
+}
+#ajxp_unique_dl #reactDLTemplate .download-block .dl-owner {
+  font-size: 14px;
+}
+#ajxp_unique_dl #reactDLTemplate .download-block > span {
+  display: block;
+}
+#ajxp_unique_dl #reactDLTemplate .download-block div.dl-icon {
+  width: 220px;
+  margin: 0 auto;
+  position: relative;
+}
+#ajxp_unique_dl #reactDLTemplate .download-block div.dl-icon span.mdi.mdi-file {
+  font-size: 180px;
+  color: rgba(0, 0, 0, 0.33);
+  color: #009688;
+}
+#ajxp_unique_dl #reactDLTemplate .download-block div.dl-icon span.mdi.mdi-download {
   position: absolute;
-  right: 48px;
-  bottom: 37px;
-  font-size: 21px;
+  top: 90px;
+  left: 80px;
+  font-size: 60px;
+  color: #f4f4f4;
+  transition: all 1500ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;
 }
-#ajxp_unique_dl img.custom_logo_image {
-  right: 6px !important;
-  left: inherit !important;
-  height: 90px !important;
-  width: auto;
+#ajxp_unique_dl #reactDLTemplate .download-block div.dl-details {
+  font-size: 13px;
+  line-height: 18px;
+  color: rgba(0, 0, 0, 0.43);
+}
+#ajxp_unique_dl #reactDLTemplate .download-block div.dl-details .row {
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+}
+#ajxp_unique_dl #reactDLTemplate .download-block div.dl-details .row .label {
+  -webkit-flex: 1;
+      -ms-flex: 1;
+          flex: 1;
+  text-align: right;
+  padding-right: 6px;
+  color: rgba(0, 0, 0, 0.43);
+  font-weight: 500;
+}
+#ajxp_unique_dl #reactDLTemplate .download-block div.dl-details .row .value {
+  -webkit-flex: 1;
+      -ms-flex: 1;
+          flex: 1;
+  text-align: left;
+  color: rgba(0, 0, 0, 0.73);
+}
+#ajxp_unique_dl #reactDLTemplate .download-block div.dl-details div.click-legend {
+  font-size: 12px;
+  margin-top: 10px;
+}
+#ajxp_unique_dl #reactDLTemplate .download-block div#share_page_button {
+  position: absolute;
+  bottom: 0px;
+  width: 100%;
+  color: rgba(255, 255, 255, 0.73);
+  left: 0;
+  font-size: 13px;
+  font-weight: bold;
+}
+#ajxp_unique_dl #reactDLTemplate .download-block.dl-started span.mdi.mdi-download {
+  opacity: 0.3;
 }
 #ajxp_film_strip #minisite_toolbar span.actionbar_button_label,
 #ajxp_film_strip #inline_toolbar span.actionbar_button_label {
@@ -462,6 +509,7 @@ div#overlay.form-login_form_dynamic {
 #ajxp_film_strip #cpane_container {
   left: 0;
   width: 100%;
+  height: 100%;
   float: none;
 }
 #ajxp_film_strip div#breadcrumb {
@@ -557,6 +605,20 @@ div#overlay.form-login_form_dynamic {
 #ajxp_film_strip .fl-displayMode-thumb div.thumbnail_selectable_cell {
   background-color: transparent;
 }
+#ajxp_shared_folder {
+  width: 100%;
+  text-align: left;
+  /* THESE ONE ARE IMPORTANT */
+  overflow: hidden;
+  position: relative;
+}
+#ajxp_shared_folder .widget_logo {
+  height: 43px;
+  padding-top: 0 !important;
+}
+#ajxp_shared_folder #content_pane {
+  background-color: white;
+}
 #ajxp_shared_folder div#overlay.form-login_form_dynamic {
   opacity: 1;
 }
@@ -604,3 +666,7 @@ div#overlay.form-login_form_dynamic {
   top: 5px !important;
   left: inherit !important;
 }
+#ajxp_shared_folder div.thumbnail_selectable_cell.detailed .mimefont {
+  font-size: 38px !important;
+  line-height: 58px;
+}
diff --git a/core/src/plugins/action.share/res/minisite.less b/core/src/plugins/action.share/res/minisite.less
index 05f617abf2..7ab9a14c5f 100644
--- a/core/src/plugins/action.share/res/minisite.less
+++ b/core/src/plugins/action.share/res/minisite.less
@@ -232,21 +232,6 @@ div#overlay.form-login_form_dynamic {
 
 }
 
-#ajxp_shared_folder{
-  width:100%;
-  text-align:left;
-  /* THESE ONE ARE IMPORTANT */
-  overflow:hidden;
-  position:relative;
-  .widget_logo {
-    height: 43px;
-    padding-top: 0 !important;
-  }
-  #content_pane{
-    background-color: white;
-  }
-}
-
 #ajxp_unique_strip{
 
   #browser{
@@ -279,6 +264,7 @@ div#overlay.form-login_form_dynamic {
     float: none;
     left:0;
     width: 100%;
+    height: 100%;
   }
   #cpane_header{
     padding-bottom: 7px;
@@ -336,74 +322,133 @@ div#overlay.form-login_form_dynamic {
   div#overlay.form-login_form_dynamic {
     opacity: 1;
   }
-  #browser{
-    background-color: #000;
-    width:102%;
-    -webkit-font-smoothing: antialiased;
-  }
-  #cpane_container{
-    float:none;
-    left:0;
-    position: absolute;
-    width: 100%;
-    top:0;
-    overflow: hidden;
-  }
   #background_container{
     position: absolute;
-    width: 102%;
-    top:-5px;
-    left:-5px;
-    bottom:-5px;
-    right:-5px;
-  }
-  div#dl_toolbar {
-    margin: 27% auto;
-    display: block;
-    width: 400px;
-    font-size: 52px;
-    text-align: center;
+    top:0;
+    left:0;
+    bottom:0;
+    right:0;
   }
+
   div.widget_logo{
     height: 90px;
     background-position: 86px 76px;
+    img.custom_logo_image{
+      right: 6px !important;
+      left: inherit !important;
+      height: 90px !important;
+      width: auto;
+    }
   }
-  div#widget_title{
-    color: rgba(255,255,255,0.8);
+
+  div.vertical-align{
     position: absolute;
-    margin-top: 0px;
-    padding: 23px 30px 20px;
     width: 100%;
-    background-color: rgba(0,0,0,0.7);
-  }
-  div#inline_toolbar a{
-    display:none;
-  }
-  a#download_button, a#share_current_page_button{
-    display:block !important;
-    text-align: center;
-    color: rgba(255,255,255,0.8);
-    background-color: rgba(0,0,0,0.5);
-    padding: 20px 10px;
-    border-radius: 5px;
-  }
-  a#download_button span.ajxp_icon{
-    display: inline-block;
-    margin-right: 10px;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    div.vertical-align-center{
+      margin: 0 auto;
+    }
   }
+
   div#share_toolbar{
-    position: absolute;
-    right: 48px;
-    bottom: 37px;
-    font-size: 21px;
-  }
-  img.custom_logo_image{
-    right: 6px !important;
-    left: inherit !important;
-    height: 90px !important;
-    width: auto;
+    margin-top: 10px;
+    text-align: center;
+    a#share_current_page_button{
+      display:block !important;
+      text-align: center;
+      color: rgba(255,255,255,1);
+      font-size: 12px;
+      font-weight: 500;
+      span.ajxp_icon_span{
+        display: none;
+      }
+    }
   }
 
+
+  #reactDLTemplate{
+    .download-block{
+      cursor: pointer;
+      width: auto;
+      max-width: 400px;
+      min-width: 220px;
+      margin: 0 auto;
+      text-align: center;
+      background: rgba(255, 255, 255, 0.91);
+      padding: 20px;
+      border-radius: 4px;
+      box-shadow: 0 3px 6px rgba(0,0,0,.16),0 3px 6px rgba(0,0,0,.23);
+      .dl-filename{
+        font-size: 22px;
+        line-height: 22px;
+        word-break: break-all;
+      }
+      .dl-owner{
+        font-size: 14px;
+      }
+      > span{
+        display: block;
+      }
+      div.dl-icon{
+        width: 220px;
+        margin: 0 auto;
+        position: relative;
+        span.mdi.mdi-file{
+          font-size: 180px;
+          color: rgba(0,0,0,0.33);
+          color: #009688;
+        }
+        span.mdi.mdi-download{
+          position: absolute;
+          top: 90px;
+          left: 80px;
+          font-size: 60px;
+          color: #f4f4f4;
+          transition: all 1500ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;
+        }
+      }
+      div.dl-details{
+        font-size: 13px;
+        line-height: 18px;
+        color: rgba(0,0,0,0.43);
+        .row {
+          display: flex;
+          .label{
+            flex: 1;
+            text-align: right;
+            padding-right: 6px;
+            color: rgba(0,0,0,0.43);
+            font-weight: 500;
+          }
+          .value{
+            flex: 1;
+            text-align: left;
+            color: rgba(0,0,0,0.73);
+          }
+        }
+        div.click-legend{
+          font-size: 12px;
+          margin-top: 10px;
+        }
+      }
+      div#share_page_button {
+        position: absolute;
+        bottom: 0px;
+        width: 100%;
+        color: rgba(255,255,255,0.73);
+        left: 0;
+        font-size: 13px;
+        font-weight: bold;
+      }
+      &.dl-started{
+        span.mdi.mdi-download{
+          opacity: 0.3;
+        }
+      }
+    }
+  }
 }
 
 #ajxp_film_strip{
@@ -430,6 +475,7 @@ div#overlay.form-login_form_dynamic {
   #cpane_container{
     left:0;
     width:100%;
+    height: 100%;
     float: none;
   }
   div#breadcrumb {
@@ -530,6 +576,18 @@ div#overlay.form-login_form_dynamic {
 }
 
 #ajxp_shared_folder{
+  width:100%;
+  text-align:left;
+  /* THESE ONE ARE IMPORTANT */
+  overflow:hidden;
+  position:relative;
+  .widget_logo {
+    height: 43px;
+    padding-top: 0 !important;
+  }
+  #content_pane{
+    background-color: white;
+  }
   div#overlay.form-login_form_dynamic {
     opacity: 1;
   }
@@ -578,5 +636,11 @@ div#overlay.form-login_form_dynamic {
     top: 5px !important;
     left: inherit !important;
   }
+  div.thumbnail_selectable_cell.detailed{
+    .mimefont{
+      font-size: 38px !important;
+      line-height: 58px;
+    }
+  }
 
 }
\ No newline at end of file
diff --git a/core/src/plugins/action.share/res/minisite.php b/core/src/plugins/action.share/res/minisite.php
index cad5306e9c..8a75d87b61 100644
--- a/core/src/plugins/action.share/res/minisite.php
+++ b/core/src/plugins/action.share/res/minisite.php
@@ -16,7 +16,7 @@
         <script type="text/javascript">
             var ajaxplorer, MessageHash={};
             var startParameters = {
-                "BOOTER_URL":"index_shared.php?get_action=get_boot_conf&goto=AJXP_START_REPOSITORY&minisite_session=AJXP_LINK_HASH",
+                "BOOTER_URL":"public/?get_action=get_boot_conf&goto=AJXP_START_REPOSITORY&minisite_session=AJXP_LINK_HASH",
                 "EXT_REP":"\/",
                 "MAIN_ELEMENT":"AJXP_TEMPLATE_NAME",
                 "SERVER_PREFIX_URI": "",
diff --git a/core/src/plugins/action.share/res/public_links.php b/core/src/plugins/action.share/res/public_links.php
deleted file mode 100644
index 3c8c88070d..0000000000
--- a/core/src/plugins/action.share/res/public_links.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title><?php
-            if(!empty($CUSTOM_SHAREPAGE_TITLE)) echo(str_replace(array("AJXP_APPLICATION_TITLE","AJXP_FILENAME"), array(ConfService::getCoreConf("APPLICATION_TITLE"), $AJXP_LINK_BASENAME), $CUSTOM_SHAREPAGE_TITLE));
-            else echo sprintf($messages[1], ConfService::getCoreConf("APPLICATION_TITLE"))
-            ?></title>
-        <link rel="icon" type="image/x-png" href="favi.png">
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-        <style type="text/css">
-            * {
-                font-family: "HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;
-                text-shadow: 0 1px 0 white;
-                color: rgb(100, 119, 124);
-                <?php if(!empty($CUSTOM_SHAREPAGE_TEXT_COLOR)) echo "color:$CUSTOM_SHAREPAGE_TEXT_COLOR;";?>
-                <?php if(!empty($CUSTOM_SHAREPAGE_TEXTSHADOW_COLOR)) echo "text-shadow: 0 1px 0 $CUSTOM_SHAREPAGE_TEXTSHADOW_COLOR;";?>
-            }
-            body{
-                /*background-image: url("grid_t.png");*/
-                <?php if(!empty($CUSTOM_SHAREPAGE_BACKGROUND_COLOR)) echo "background-color:$CUSTOM_SHAREPAGE_BACKGROUND_COLOR;";?>
-            }
-            h1 {
-                margin-bottom: 0;
-            }
-            input{
-                width: 301px;
-                height: 46px;
-                font-size: 28px;
-                border-radius: 5px;
-                position: absolute;
-                top: 106px;
-                left: 68px;
-            }
-            .button_link{
-                position: absolute;
-                top: 0;left: 0;
-                border: 0px;
-                width: 226px;
-            }
-            .button_link img{
-                position: absolute;
-                top: 0;
-                left: -15px;
-                border: 0px;
-                width: 204px;
-            }
-            .link_w_pass{
-                position: absolute;
-                display: block;
-                height: 200px;
-                width: 128px;
-                right: 34px;
-            }
-            .link_w_pass img{
-                position: absolute;
-                top: 43px;
-                left: 0px;
-                height: 84px;
-                width: 84px;
-                border: 0px;
-            }
-            #main_dl_container{
-                width: 560px;
-                height: 400px;
-                margin: 8% auto;
-                text-align: center;
-                position: relative;
-            }
-            .legend{
-                font-weight: normal;font-size: 1.4em;width: 400px;margin: 28px auto;
-            }
-            .legend_w_pass{
-                font-weight: normal;position: absolute;top: 198px;left: 44px;font-size: 1.3em;
-            }
-            @media only screen
-            and (max-width : 420px) {
-                h1{
-                    font-size: 20px;
-                }
-                .button_link{
-                    height: 140px !important;
-                }
-                .button_link img {
-                    position: absolute;
-                    top: 0;
-                    left: 17%;
-                    border: 0px;
-                    width: 80%;
-                }
-                #main_dl_container{
-                    width: 100%;
-                    height: 400px;
-                    margin: 8% auto;
-                    text-align: center;
-                }
-                .legend, .legend_w_pass{
-                    font-size: 1.0em;
-                    width: 90%;
-                    left: 5%;
-                    top:108px;
-                }
-                input {
-                    width: 72%;
-                    height: 30px;
-                    font-size: 1em;
-                    top: 69px;
-                    left: 5%;
-                }
-                .link_w_pass{
-                    top: 10px;
-                    right: 0;
-                    width: 50px;
-                }
-                .link_w_pass img{
-                    width: 54px;
-                    height: 54px;
-                }
-            }
-        </style>
-    </head>
-    <body>
-    <?php if ($AJXP_LINK_HAS_PASSWORD) { ?>
-        <form action='' method='post' name="submit_password">
-            <div id="main_dl_container">
-                <h1><?php
-                    if(!empty($CUSTOM_SHAREPAGE_TITLE)) echo(str_replace(array("AJXP_APPLICATION_TITLE","AJXP_FILENAME"), array(ConfService::getCoreConf("APPLICATION_TITLE"), $AJXP_LINK_BASENAME), $CUSTOM_SHAREPAGE_TITLE));
-                else echo sprintf($messages[1], ConfService::getCoreConf("APPLICATION_TITLE"))
-                    ?></h1>
-                <?php if($AJXP_LINK_WRONG_PASSWORD): ?>
-                    <div style="color: hsl(0, 82%, 51%);width: 261px;position: absolute;top: 80px;left: 11px;"><?php echo $messages[3] ?></div>
-                <?php endif; ?>
-                <input type="password" name="password" placeholder="<?php echo $messages[5] ?>">
-                <a class="link_w_pass" href="#" onclick="document.forms['submit_password'].submit();">
-                    <img src="dl.png">
-                </a>
-                <h2 class="legend_w_pass"><?php
-                    if(!empty($CUSTOM_SHAREPAGE_LEGEND_PASS)) echo(str_replace(array("AJXP_APPLICATION_TITLE","AJXP_FILENAME"), array(ConfService::getCoreConf("APPLICATION_TITLE"), $AJXP_LINK_BASENAME), $CUSTOM_SHAREPAGE_LEGEND_PASS));
-                    else echo sprintf($messages[4], $AJXP_LINK_BASENAME) ?></h2>
-            </div>
-        </form>
-    <?php } else { ?>
-        <div id="main_dl_container">
-            <h1><?php
-                if(!empty($CUSTOM_SHAREPAGE_TITLE)) echo(str_replace(array("AJXP_APPLICATION_TITLE","AJXP_FILENAME"), array(ConfService::getCoreConf("APPLICATION_TITLE"), $AJXP_LINK_BASENAME), $CUSTOM_SHAREPAGE_TITLE));
-                else echo sprintf($messages[1], ConfService::getCoreConf("APPLICATION_TITLE"))
-                ?></h1>
-            <a class="button_link" href="?dl=true" style="position: relative;display: block;height: 200px;width: 203px;margin: 0 auto;">
-                <?php if (!empty($CUSTOM_SHAREPAGE_BUTTON)) {
-                echo('<img src="'.$CUSTOM_SHAREPAGE_BUTTON.'" >');
-            } else { ?>
-                <img src="dl.png">
-            <?php } ?>
-            </a>
-            <h2 class="legend"><?php
-                if(!empty($CUSTOM_SHAREPAGE_LEGEND)) echo(str_replace(array("AJXP_APPLICATION_TITLE","AJXP_FILENAME"), array(ConfService::getCoreConf("APPLICATION_TITLE"), $AJXP_LINK_BASENAME), $CUSTOM_SHAREPAGE_LEGEND));
-                else echo sprintf($messages[2], $AJXP_LINK_BASENAME) ?></h2>
-        </div>
-    <?php  } ?>
-
-    <script type="text/javascript">
-            var backgrounds = [];
-    <?php
-        $index = 1;
-        $varBase = "CUSTOM_SHAREPAGE_BACKGROUND_";
-        $bgName = $varBase . $index;
-        $bgAttName = $varBase . 'ATTRIBUTES_' .  $index;
-        $bgs = array();
-        while (isSet($$bgName) && !empty($$bgName)) {
-            $bgs[] = "background-image:url('".$$bgName."');" . (isSet($$bgAttName) ? $$bgAttName : '');
-            $index ++;
-            $bgName = $varBase . $index;
-            $bgAttName = $varBase . 'ATTRIBUTES_' .  $index;
-        }
-        echo 'backgrounds = ' . json_encode($bgs) . ';';
-        ?>
-    if (backgrounds.length) {
-        var i = Math.floor( Math.random() * backgrounds.length);
-        document.body.setAttribute("style", backgrounds[i]);
-    }
-    </script>
-    </body>
-</html>
diff --git a/core/src/plugins/action.share/res/react-share-form.css b/core/src/plugins/action.share/res/react-share-form.css
index e88980d0e8..ef110c6004 100644
--- a/core/src/plugins/action.share/res/react-share-form.css
+++ b/core/src/plugins/action.share/res/react-share-form.css
@@ -284,10 +284,8 @@ div#react_share_form div.user-badge .user-badge-label {
   -webkit-flex: 5;
       -ms-flex: 5;
           flex: 5;
-  padding: 13px 0;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
+  padding: 9px 0;
+  line-height: 25px;
 }
 div#react_share_form div.user-badge:last-of-type {
   border-bottom: 0;
@@ -424,7 +422,8 @@ div#ajxp_shared_info_panel .copy-button {
   cursor: pointer;
   background-color: rgba(255, 255, 255, 0.87);
   padding: 7px;
-  font-size: 14px;
+  font-size: 13px;
+  height: 12px;
   border-radius: 0 2px 2px 0;
 }
 div#ajxp_shared_info_panel .copy-message {
diff --git a/core/src/plugins/action.share/res/react-share-form.less b/core/src/plugins/action.share/res/react-share-form.less
index c82238f231..38e7a0c603 100644
--- a/core/src/plugins/action.share/res/react-share-form.less
+++ b/core/src/plugins/action.share/res/react-share-form.less
@@ -299,10 +299,8 @@ div#react_share_form {
     flex-direction: row;
     .user-badge-label {
       flex: 5;
-      padding: 13px 0;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
+      padding: 9px 0;
+      line-height: 25px;
     }
     &:last-of-type {
       border-bottom: 0;
@@ -448,7 +446,8 @@ div#ajxp_shared_info_panel{
     cursor: pointer;
     background-color: rgba(255, 255, 255, 0.87);
     padding: 7px;
-    font-size: 14px;
+    font-size: 13px;
+    height: 12px;
     border-radius: 0 2px 2px 0;
   }
   .copy-message{
diff --git a/core/src/plugins/action.share/res/react/ShareDialog.js b/core/src/plugins/action.share/res/react/ShareDialog.js
index e439da1737..e2fdd06d04 100644
--- a/core/src/plugins/action.share/res/react/ShareDialog.js
+++ b/core/src/plugins/action.share/res/react/ShareDialog.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 (function(global) {
 
@@ -188,9 +188,11 @@
         render: function(){
 
             let nodePath = this.props.shareModel.getNode().getPath();
+            /*
             if(this.props.shareModel.getNode().getMetadata().get("original_path")){
                 nodePath = this.props.shareModel.getNode().getMetadata().get("original_path");
             }
+            */
             return (
                 <div className="headerPanel">
                     <div
@@ -208,6 +210,23 @@
         propTypes: {
             onClick: React.PropTypes.func.isRequired
         },
+        getInitialState: function(){
+            return {disabled: false};
+        },
+        disableSave: function(){
+            this.setState({disabled: true});
+        },
+        enableSave: function(){
+            this.setState({disabled:false});
+        },
+        componentDidMount: function(){
+            this.props.shareModel.observe('saving', this.disableSave);
+            this.props.shareModel.observe('saved', this.enableSave);
+        },
+        componendWillUnmount: function(){
+            this.props.shareModel.stopObserving('saving', this.disableSave);
+            this.props.shareModel.stopObserving('saved', this.enableSave);
+        },
         triggerModelSave: function(){
             this.props.shareModel.save();
         },
@@ -222,14 +241,14 @@
                 return (
                     <div style={{padding:16,textAlign:'right'}}>
                         <a className="revert-button" onClick={this.triggerModelRevert}>{this.context.getMessage('179')}</a>
-                        <ReactMUI.FlatButton secondary={true} label={this.context.getMessage('53', '')} onClick={this.triggerModelSave}/>
+                        <ReactMUI.FlatButton secondary={true} disabled={this.state.disabled} label={this.context.getMessage('53', '')} onClick={this.triggerModelSave}/>
                         <ReactMUI.FlatButton secondary={false} label={this.context.getMessage('86', '')} onClick={this.props.onClick}/>
                     </div>
                 );
             }else{
                 var unshareButton;
-                if((this.props.shareModel.hasActiveShares() && (this.props.shareModel.currentIsOwner())) || this.props.shareModel.getStatus() === 'error'){
-                    unshareButton = (<ReactMUI.FlatButton secondary={true} label={this.context.getMessage('6')} onClick={this.disableAllShare}/>);
+                if((this.props.shareModel.hasActiveShares() && (this.props.shareModel.currentIsOwner())) || this.props.shareModel.getStatus() === 'error' || global.pydio.user.activeRepository === "ajxp_conf"){
+                    unshareButton = (<ReactMUI.FlatButton  disabled={this.state.disabled} secondary={true} label={this.context.getMessage('6')} onClick={this.disableAllShare}/>);
                 }
                 return (
                     <div style={{padding:16,textAlign:'right'}}>
@@ -691,8 +710,9 @@
 
         buildLabel: function(){
             var link = this.props.linkData;
-            var host = link.HOST || link.invitation.HOST;
-            var user = link.USER || link.invitation.USER;
+            var host = link.HOST || (link.invitation ? link.invitation.HOST : null);
+            var user = link.USER || (link.invitation ? link.invitation.USER : null);
+            if(!host || !user) return "Error";
             return user + " @ " + host ;
         },
 
@@ -757,6 +777,21 @@
             showMailer:React.PropTypes.func
         },
 
+        disableSave: function(){
+            this.setState({disabled: true});
+        },
+        enableSave: function(){
+            this.setState({disabled:false});
+        },
+        componentDidMount: function(){
+            this.props.shareModel.observe('saving', this.disableSave);
+            this.props.shareModel.observe('saved', this.enableSave);
+        },
+        componendWillUnmount: function(){
+            this.props.shareModel.stopObserving('saving', this.disableSave);
+            this.props.shareModel.stopObserving('saved', this.enableSave);
+        },
+
         toggleLink: function(){
             var publicLinks = this.props.shareModel.getPublicLinks();
             if(this.state.showTemporaryPassword){
@@ -769,7 +804,7 @@
         },
 
         getInitialState: function(){
-            return {showTemporaryPassword: false, temporaryPassword: null};
+            return {showTemporaryPassword: false, temporaryPassword: null, disabled: false};
         },
 
         updateTemporaryPassword: function(value, event){
@@ -837,7 +872,7 @@
             return (
                 <div style={{padding:16}} className="reset-pydio-forms ie_material_checkbox_fix">
                     <ReactMUI.Checkbox
-                        disabled={this.context.isReadonly() || disableForNotOwner}
+                        disabled={this.context.isReadonly() || disableForNotOwner || this.state.disabled}
                         onCheck={this.toggleLink}
                         checked={!!this.props.linkData || this.state.showTemporaryPassword}
                         label={this.context.getMessage('189')}
diff --git a/core/src/plugins/action.share/res/react/ShareInfoPanel.js b/core/src/plugins/action.share/res/react/ShareInfoPanel.js
index b67a7be074..7ec4e3525f 100644
--- a/core/src/plugins/action.share/res/react/ShareInfoPanel.js
+++ b/core/src/plugins/action.share/res/react/ShareInfoPanel.js
@@ -33,6 +33,10 @@
                 Loader.INSTANCE.hookAfterDelete();
             }
             var mainCont = container.querySelectorAll("#ajxp_shared_info_panel .infoPanelTable")[0];
+            mainCont.destroy = function(){
+                React.unmountComponentAtNode(mainCont);
+            };
+            mainCont.className += (mainCont.className ? ' ' : '') + 'infopanel-destroyable-pane';
             React.render(
                 React.createElement(InfoPanel, {pydio:global.pydio, node:node}),
                 mainCont
@@ -40,22 +44,21 @@
         }
     }
 
-    var InfoPanel = React.createClass({
+    var InfoPanelInputRow = React.createClass({
 
         propTypes: {
-            node:React.PropTypes.instanceOf(AjxpNode),
-            pydio:React.PropTypes.instanceOf(Pydio)
+            inputTitle: React.PropTypes.string,
+            inputValue: React.PropTypes.string,
+            inputClassName: React.PropTypes.string,
+            getMessage: React.PropTypes.func,
+            inputCopyMessage: React.PropTypes.object
         },
 
         getInitialState: function(){
-            return {
-                status:'loading',
-                copyMessage:null,
-                model : new ReactModel.Share(this.props.pydio, this.props.node)
-            };
+            return {copyMessage: null};
         },
+
         componentDidMount:function(){
-            this.state.model.observe("status_changed", this.modelUpdated);
             this.attachClipboard();
         },
         componentDidUpdate:function(){
@@ -71,30 +74,132 @@
             }
             this._clip = new Clipboard(this.refs['copy-button'].getDOMNode(), {
                 text: function(trigger) {
-                    var linkData = this.state.model.getPublicLinks()[0];
-                    return linkData['public_link'];
+                    return this.props.inputValue;
                 }.bind(this)
             });
             this._clip.on('success', function(){
-                this.setState({copyMessage:this.getMessage('192')}, this.clearCopyMessage);
+                this.setState({copyMessage:this.props.getMessage(this.props.inputCopyMessage)}, this.clearCopyMessage);
             }.bind(this));
             this._clip.on('error', function(){
                 var copyMessage;
                 if( global.navigator.platform.indexOf("Mac") === 0 ){
-                    copyMessage = this.getMessage('144');
+                    copyMessage = this.props.getMessage('144');
                 }else{
-                    copyMessage = this.getMessage('143');
+                    copyMessage = this.props.getMessage('143');
                 }
                 this.refs['input'].getDOMNode().focus();
                 this.setState({copyMessage:copyMessage}, this.clearCopyMessage);
             }.bind(this));
         },
+
         clearCopyMessage:function(){
             global.setTimeout(function(){
                 this.setState({copyMessage:''});
             }.bind(this), 3000);
         },
 
+        render: function(){
+
+            let select = function(e){
+                e.currentTarget.select();
+            };
+
+            let copyMessage = null;
+            if(this.state.copyMessage){
+                var setHtml = function(){
+                    return {__html:this.state.copyMessage};
+                }.bind(this);
+                copyMessage = <div className="copy-message" dangerouslySetInnerHTML={setHtml()}/>;
+            }
+            return (
+                <div className="infoPanelRow">
+                    <div className="infoPanelLabel">{this.props.getMessage(this.props.inputTitle)}</div>
+                    <div className="infoPanelValue" style={{position:'relative'}}>
+                        <input
+                            ref="input"
+                            type="text"
+                            className={this.props.inputClassName}
+                            readOnly={true}
+                            onClick={select}
+                            value={this.props.inputValue}
+                        />
+                        <span ref="copy-button" title={this.props.getMessage('191')} className="copy-button icon-paste"/>
+                        {copyMessage}
+                    </div>
+                </div>
+            );
+
+        }
+
+    });
+
+    var TemplatePanel = React.createClass({
+
+        propTypes: {
+            node:React.PropTypes.instanceOf(AjxpNode),
+            pydio:React.PropTypes.instanceOf(Pydio),
+            getMessage:React.PropTypes.func,
+            publicLink:React.PropTypes.string
+        },
+
+        getInitialState:function(){
+            return {show: false};
+        },
+
+        generateTplHTML: function(){
+
+            let editors = this.props.pydio.Registry.findEditorsForMime(this.props.node.getAjxpMime(), true);
+            if(!editors.length){
+                return null;
+            }
+
+            let tplString ;
+            let messKey = "61";
+            let newlink = ReactModel.Share.buildDirectDownloadUrl(this.props.node, this.props.publicLink, true);
+            let template = global.pydio.UI.getSharedPreviewTemplateForEditor(editors[0], this.props.node);
+            if(template){
+                tplString = template.evaluate({WIDTH:350, HEIGHT:350, DL_CT_LINK:newlink});
+            }else{
+                tplString = newlink;
+                messKey = "60";
+            }
+            return {messageKey:messKey, templateString:tplString};
+
+        },
+
+        render : function(){
+            let data = this.generateTplHTML();
+            if(!data){
+                return null;
+            }
+            return <InfoPanelInputRow
+                inputTitle={data.messageKey}
+                inputValue={data.templateString}
+                inputClassName="share_info_panel_link"
+                getMessage={this.props.getMessage}
+                inputCopyMessage="229"
+            />;
+        }
+
+    });
+
+    var InfoPanel = React.createClass({
+
+        propTypes: {
+            node:React.PropTypes.instanceOf(AjxpNode),
+            pydio:React.PropTypes.instanceOf(Pydio)
+        },
+
+        getInitialState: function(){
+            return {
+                status:'loading',
+                model : new ReactModel.Share(this.props.pydio, this.props.node)
+            };
+        },
+        componentDidMount:function(){
+            this.state.model.observe("status_changed", this.modelUpdated);
+        },
+
         modelUpdated: function(){
             if(this.isMounted()){
                 this.setState({status:this.state.model.getStatus()});
@@ -113,32 +218,33 @@
             if(this.state.model.hasPublicLink()){
                 var linkData = this.state.model.getPublicLinks()[0];
                 var isExpired = linkData["is_expired"];
-                var select = function(e){
-                    e.currentTarget.select();
-                };
-                if(this.state.copyMessage){
-                    var setHtml = function(){
-                        return {__html:this.state.copyMessage};
-                    }.bind(this);
-                    var copyMessage = <div className="copy-message" dangerouslySetInnerHTML={setHtml()}/>;
+
+                // Main Link Field
+                var linkField = (<InfoPanelInputRow
+                    inputTitle="121"
+                    inputValue={linkData['public_link']}
+                    inputClassName={"share_info_panel_link" + (isExpired?" share_info_panel_link_expired":"")}
+                    getMessage={this.getMessage}
+                    inputCopyMessage="192"
+                />);
+                if(this.props.node.isLeaf() && this.props.pydio.getPluginConfigs("action.share").get("INFOPANEL_DISPLAY_DIRECT_DOWNLOAD")){
+                    // Direct Download Field
+                    var downloadField = <InfoPanelInputRow
+                        inputTitle="60"
+                        inputValue={ReactModel.Share.buildDirectDownloadUrl(this.props.node, linkData['public_link'])}
+                        inputClassName="share_info_panel_link"
+                        getMessage={this.getMessage}
+                        inputCopyMessage="192"
+                    />;
+                }
+                if(this.props.node.isLeaf() && this.props.pydio.getPluginConfigs("action.share").get("INFOPANEL_DISPLAY_HTML_EMBED")){
+                    // HTML Code Snippet (may be empty)
+                    var templateField = <TemplatePanel
+                        {...this.props}
+                        getMessage={this.getMessage}
+                        publicLink={linkData.public_link}
+                    />;
                 }
-                var linkField = (
-                    <div className="infoPanelRow">
-                        <div className="infoPanelLabel">{this.getMessage('121')}</div>
-                        <div className="infoPanelValue" style={{position:'relative'}}>
-                            <input
-                                ref="input"
-                                type="text"
-                                className={"share_info_panel_link" + (isExpired?" share_info_panel_link_expired":"")}
-                                readOnly={true}
-                                onClick={select}
-                                value={linkData['public_link']}
-                            />
-                            <span ref="copy-button" title={this.getMessage('191')} className="copy-button icon-paste"/>
-                            {copyMessage}
-                        </div>
-                    </div>
-                );
             }
             var users = this.state.model.getSharedUsers();
             var sharedUsersEntries = [], remoteUsersEntries = [];
@@ -192,11 +298,25 @@
                     </div>
                 );
             }
+            if(this.state.model.getStatus() !== 'loading' && !sharedUsersEntries.length
+                && !remoteUsersEntries.length && !this.state.model.hasPublicLink()){
+                let func = function(){
+                    this.state.model.stopSharing();
+                }.bind(this);
+                var noEntriesFoundBlock = (
+                    <div className="infoPanelRow">
+                        <div className="infoPanelValue">{this.getMessage(232)} <a style={{textDecoration:'underline',cursor:'pointer'}} onClick={func}>{this.getMessage(233)}</a></div>
+                    </div>
+                );
+            }
 
             return (
                 <div>
                     {linkField}
+                    {downloadField}
+                    {templateField}
                     {sharedUsersBlock}
+                    {noEntriesFoundBlock}
                 </div>
             );
         }
diff --git a/core/src/plugins/action.share/res/react/ShareTemplates.js b/core/src/plugins/action.share/res/react/ShareTemplates.js
new file mode 100644
index 0000000000..7098b48cc7
--- /dev/null
+++ b/core/src/plugins/action.share/res/react/ShareTemplates.js
@@ -0,0 +1,104 @@
+(function(global){
+
+    var DLTemplate = React.createClass({
+
+        triggerDL: function(){
+
+            this.setState({downloadStarted: true});
+            global.setTimeout(function(){
+                this.props.pydio.Controller.fireAction("download");
+                    global.setTimeout(function(){
+                        this.setState({downloadStarted: false});
+                    }.bind(this), 1500);
+            }.bind(this), 100);
+
+        },
+
+        detectFirstNode: function(){
+            let dm = this.props.pydio.getContextHolder();
+            if(!dm.getSelectedNodes().length) {
+                let first = dm.getRootNode().getFirstChildIfExists();
+                if (first) {
+                    dm.setSelectedNodes([first], "dataModel");
+                    this.setState({node: first});
+                }else{
+                    global.setTimeout(this.detectFirstNode.bind(this), 1000);
+                }
+            }else{
+                if(!this.state || !this.state.node){
+                    this.setState({node: dm.getSelectedNodes()[0]});
+                }
+            }
+        },
+
+        componentDidMount: function(){
+            this.detectFirstNode();
+            let pydio = this.props.pydio;
+            if(pydio.user && pydio.user.activeRepository){
+                this.setState({
+                    repoObject:pydio.user.repositories.get(pydio.user.activeRepository)
+                });
+            }else{
+                global.document.observe("ajaxplorer:repository_list_refreshed", function(e){
+                    let repositoryList = e.memo.list;
+                    let repositoryId = e.memo.active;
+                    if(repositoryList && repositoryList.has(repositoryId)){
+                        var repoObject = repositoryList.get(repositoryId);
+                        this.setState({repoObject: repoObject});
+                    }
+                }.bind(this));
+            }
+        },
+
+        render: function(){
+
+            if(!this.props.pydio.user){
+                return <div></div>;
+            }
+            let name1, name2, name3, owner;
+            let classNames = ['download-block'];
+            if(this.state && this.state.repoObject){
+                owner = this.state.repoObject.getOwner();
+                name1 = '%1 shared'.replace('%1', owner);
+                name2 = this.state.repoObject.getLabel();
+                name3 = 'with you';
+            }
+            let click = null;
+            let fileDetails = <div className="dl-details">{this.props.pydio.MessageHash[466]}</div> ;
+            if(this.state && this.state.node){
+                click = this.triggerDL.bind(this);
+                fileDetails = (
+                    <div className="dl-details">
+                        <div className="row">
+                            <span className="label">{this.props.pydio.MessageHash[503]}</span>
+                            <span className="value">{this.state.node.getMetadata().get('filesize')}</span>
+                        </div>
+                        <div className="click-legend">{this.props.pydio.MessageHash['share_center.231']}</div>
+                    </div>
+                );
+            }else{
+                classNames.push('not-ready');
+            }
+            if(this.state && this.state.downloadStarted){
+                classNames.push('dl-started');
+            }
+            return (
+                <div className={classNames.join(' ')} onClick={click}>
+                    <span className="dl-filename">{name2}</span>
+                    <div className="dl-icon">
+                        <span className="mdi mdi-file"/>
+                        <span className="mdi mdi-download"/>
+                    </div>
+                    {fileDetails}
+                </div>
+            );
+
+        }
+
+    });
+
+    var ns = global.ShareTemplates || {};
+    ns.DLTemplate = DLTemplate;
+    global.ShareTemplates = ns;
+
+})(window);
\ No newline at end of file
diff --git a/core/src/plugins/action.share/res/react/model/ShareModel.js b/core/src/plugins/action.share/res/react/model/ShareModel.js
index 2197eb4902..5072484edd 100644
--- a/core/src/plugins/action.share/res/react/model/ShareModel.js
+++ b/core/src/plugins/action.share/res/react/model/ShareModel.js
@@ -171,6 +171,10 @@
             }
             var updatedData = [];
             if(operation == 'add'){
+                let pluginsConfig = pydio.getPluginConfigs("action.share");
+                if(pluginsConfig.get('WATCHER_SHARES_AUTO_USERS')){
+                    userData['WATCH'] = true;
+                }
                 this._pendingData['entries'].push(userData);
             }else if(operation == 'remove'){
                 this._pendingData['entries'].map(function(entry){
@@ -244,7 +248,12 @@
                 return this._pendingData[name];
             }
             if(name == 'watch') {
-                return this._data["element_watch"] == 'META_WATCH_BOTH';
+                if(this._data["element_watch"] !== undefined){
+                    return this._data["element_watch"] == 'META_WATCH_BOTH';
+                }else{
+                    let pluginConfigs = pydio.getPluginConfigs("action.share");
+                    return pluginConfigs.get('WATCHER_SHARES_AUTO_OWNER');
+                }
             }else{
                 return this._data[name];
             }
@@ -603,11 +612,14 @@
             });
         }
 
-        load(){
+        load(replaceCache = false){
             if(this._status == 'loading') return;
             this._setStatus('loading');
             let cacheService = MetaCacheService.getInstance();
             cacheService.registerMetaStream('action.share', MetaCacheService.EXPIRATION_LOCAL_NODE);
+            if(replaceCache){
+                cacheService.invalidateMetaForKeys('action.share', this._node.getPath());
+            }
 
             let remoteLoader = function(transport){
                 if(transport.responseJSON){
@@ -693,7 +705,7 @@
             if(!params['repo_label']){
                 params['repo_label'] = this._node.getLabel();
             }
-
+            this.notify('saving');
             var publicLinks = this.getPublicLinks();
             if(publicLinks.length){
                 var pLinkId = publicLinks[0]['hash'];
@@ -734,7 +746,10 @@
                     // There must have been an error, revert
                     this.load();
                 }
-            }.bind(this), null);
+                this.notify('saved');
+            }.bind(this), function(){
+                this.notify('saved');
+            }.bind(this));
         }
 
 
@@ -745,7 +760,7 @@
             };
             ShareModel.prepareShareActionParameters(this.getNode(), params);
             PydioApi.getClient().request(params, function(){
-                this.load();
+                this.load(true);
                 callback();
             }.bind(this));
         }
@@ -856,6 +871,12 @@
         static federatedSharingEnabled(){
             return global.pydio.getPluginConfigs("core.ocs").get("ENABLE_FEDERATED_SHARING");
         }
+        
+        static buildDirectDownloadUrl(node, publicLink, contentProvider = false){
+            let ctString = contentProvider ? '?ct=true' : '';
+            let link = publicLink.split('--').shift();
+            return link + (link.endsWith('/')? '' : '/') + 'dl/'+encodeURIComponent(node.getLabel()) + ctString;
+        }
 
         static qrcodeEnabled(){
             return global.pydio.getPluginConfigs("action.share").get("CREATE_QRCODE");
@@ -870,17 +891,41 @@
                 s = MessageHash["share_center.42"];
                 if(s) s = s.replace("%s", ApplicationTitle);
                 link = this.getPublicLink(linkId);
-                message = s + "\n\n " + "<a href=\""+link+"\">"+link+"</a>";
+                let additionalData = '';
+                let password = this.hasHiddenPassword(linkId);
+                if(password){
+                    additionalData += '\n - ' + MessageHash['share_center.170'];
+                }
+                let dlLimit = this.getExpirationFor(linkId, 'downloads');
+                if(dlLimit){
+                    additionalData += '\n - ' + MessageHash['share_center.22'] + ': ' + dlLimit;
+                }
+                let expirationDate = this.getExpirationFor(linkId, 'days');
+                if(expirationDate){
+                    let today = new Date();
+                    let expDate = new Date();
+                    expDate.setDate(today.getDate() + parseInt(expirationDate));
+                    additionalData += '\n - ' + MessageHash['share_center.21'] + ': ' + expDate.toLocaleDateString();
+                }
+                message = s + additionalData + "\n\n " + "<a href='"+link+"'>"+link+"</a>";
             }else{
                 if(!this._data['repository_url']){
-                    throw new Error(MessageHash['share_center.229']);
+                    throw new Error(MessageHash['share_center.230']);
                 }
                 s = MessageHash["share_center." + (this.getNode().isLeaf() ? "42" : "43")];
                 if(s) s = s.replace("%s", ApplicationTitle);
+                let linkMessage = '';
                 if(this._data['repository_url']){
-                    link = this._data['repository_url'];
+                    if(this.getNode().isLeaf()){
+                        link = this._data['repository_url'].split('/ws-').shift() + '/ws-inbox';
+                        let sharedFilesString = MessageHash["share_center.100"];
+                        linkMessage = MessageHash["share_center.234"].replace('%s', '<a href="'+link+'">'+ sharedFilesString +'</a>');
+                    }else{
+                        link = this._data['repository_url'];
+                        linkMessage = "<a href='" + link +"'>" + MessageHash["share_center.46"].replace("%s1", this.getGlobal("label")).replace("%s2", ApplicationTitle) + "</a>";
+                    }
                 }
-                message = s + "\n\n " + "<a href=\"" + link +"\">" + MessageHash["share_center.46"].replace("%s1", this.getGlobal("label")).replace("%s2", ajaxplorer.appTitle) + "</a>";
+                message = s + "\n\n " + linkMessage;
             }
             var usersList = null;
             if(this.shareFolderMode == 'workspace' && oForm) {
diff --git a/core/src/plugins/action.share/src/Http/MinisiteAuthMiddleware.php b/core/src/plugins/action.share/src/Http/MinisiteAuthMiddleware.php
new file mode 100644
index 0000000000..fecf15cc27
--- /dev/null
+++ b/core/src/plugins/action.share/src/Http/MinisiteAuthMiddleware.php
@@ -0,0 +1,163 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Share\Http;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Core\Http\Server;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\AuthService;
+use Pydio\Core\Services\SessionService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Services\ApplicationState;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class MinisiteAuthMiddleware
+ * @package Pydio\Share\Http
+ */
+class MinisiteAuthMiddleware
+{
+    /**
+     * Parse request parameters
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @return ResponseInterface
+     */
+    public static function handleRequest(ServerRequestInterface $requestInterface, ResponseInterface $responseInterface, callable $next = null){
+
+        $sessions = ApplicationState::sapiUsesSession();
+        $hash = $requestInterface->getAttribute("hash");
+        $shareData = $requestInterface->getAttribute("data");
+
+        if($sessions){
+            session_name("AjaXplorer_Shared".str_replace(".","_",$hash));
+            session_start();
+            AuthService::disconnect();
+        }
+
+        if (!empty($shareData["PRELOG_USER"])) {
+
+            $loggedUser = AuthService::logUser($shareData["PRELOG_USER"], "", true);
+            $requestInterface = $requestInterface->withAttribute("ctx", Context::contextWithObjects($loggedUser, null));
+            if($sessions){
+                AuthService::updateSessionUser($loggedUser);
+            }
+
+        } else if(isSet($shareData["PRESET_LOGIN"])) {
+
+            if($sessions) {
+
+                SessionService::save(SessionService::PENDING_REPOSITORY_ID, $shareData["REPOSITORY"]);
+                SessionService::save(SessionService::PENDING_FOLDER, "/");
+
+            } else {
+                $responseInterface = self::basicHttp($shareData["PRESET_LOGIN"], $requestInterface, $responseInterface);
+                if ($responseInterface->getStatusCode() === 401) {
+                    return $responseInterface;
+                }
+            }
+
+        }
+
+        /** @var ContextInterface $ctx */
+        $ctx = $requestInterface->getAttribute("ctx");
+
+        if (isSet($_GET["lang"])) {
+            if ($ctx->hasUser()) {
+                $ctx->getUser()->setPref("lang", $_GET["lang"]);
+            } else {
+                setcookie("AJXP_lang", $_GET["lang"]);
+            }
+        }
+
+        if($sessions){
+            SessionService::save(SessionService::CTX_MINISITE_HASH, $hash);
+            ApplicationState::setStateMinisite($hash);
+        }
+        if(!empty($ctx) && $ctx->hasUser() && isSet($shareData["REPOSITORY"])){
+            $repoObject = UsersService::getRepositoryWithPermission($ctx->getUser(), $shareData["REPOSITORY"]);
+            $ctx->setRepositoryObject($repoObject);
+            $requestInterface = $requestInterface->withAttribute("ctx", $ctx);
+        }
+
+        return Server::callNextMiddleWare($requestInterface, $responseInterface, $next);
+
+    }
+
+    /**
+     * Perform Basic HTTP Auth
+     * @param string $presetLogin
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @return ResponseInterface|static
+     * @throws \Pydio\Core\Exception\LoginException
+     */
+    public static function basicHttp($presetLogin, ServerRequestInterface &$requestInterface, ResponseInterface $responseInterface){
+
+        $serverData = $requestInterface->getServerParams();
+        $localHttpLogin = $serverData["PHP_AUTH_USER"];
+        $localHttpPassw = $serverData['PHP_AUTH_PW'];
+
+        // mod_php
+        if (isset($serverData['PHP_AUTH_USER'])) {
+            $localHttpLogin = $serverData['PHP_AUTH_USER'];
+            $localHttpPassw = $serverData['PHP_AUTH_PW'];
+
+            // most other servers
+        } elseif (isset($serverData['HTTP_AUTHORIZATION'])) {
+            if (strpos(strtolower($serverData['HTTP_AUTHORIZATION']), 'basic') === 0) {
+                list($localHttpLogin, $localHttpPassw) = explode(':', base64_decode(substr($serverData['HTTP_AUTHORIZATION'], 6)));
+            }
+            // Sometimes prepend a REDIRECT
+        } elseif (isset($serverData['REDIRECT_HTTP_AUTHORIZATION'])) {
+
+            if (strpos(strtolower($serverData['REDIRECT_HTTP_AUTHORIZATION']), 'basic') === 0) {
+                list($localHttpLogin, $localHttpPassw) = explode(':', base64_decode(substr($serverData['REDIRECT_HTTP_AUTHORIZATION'], 6)));
+            }
+
+        }
+
+        // Check that localHttpLogin == Hash ?
+
+        if (empty($localHttpPassw)) {
+            return $responseInterface->withHeader("WWW-Authenticate", "Basic realm=\"Please provide password\"")->withStatus(401);
+        }
+
+        try {
+
+            $loggedUser = AuthService::logUser($presetLogin, $localHttpPassw, false, false);
+            $requestInterface = $requestInterface->withAttribute("ctx", Context::contextWithObjects($loggedUser, null));
+            return $responseInterface;
+
+        } catch (\Pydio\Core\Exception\LoginException $l) {
+            if ($l->getLoginError() !== -4) {
+                return $responseInterface->withHeader("WWW-Authenticate", "Basic realm=\"Please provide a valid password\"")->withStatus(401);
+            }else{
+                throw $l;
+            }
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/action.share/src/Http/MinisiteRootMiddleware.php b/core/src/plugins/action.share/src/Http/MinisiteRootMiddleware.php
new file mode 100644
index 0000000000..3ac93e1a36
--- /dev/null
+++ b/core/src/plugins/action.share/src/Http/MinisiteRootMiddleware.php
@@ -0,0 +1,90 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Share\Http;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Http\Middleware\SapiMiddleware;
+use Pydio\Core\Http\Server;
+use Pydio\Core\Model\Context;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\AuthService;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Share\Model\ShareLink;
+use Pydio\Share\ShareCenter;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class MinisiteRootMiddleware
+ * @package Pydio\Share\Http
+ */
+class MinisiteRootMiddleware extends SapiMiddleware
+{
+
+    private $hash;
+
+    /**
+     * MinisiteRootMiddleware constructor.
+     * @param $hash
+     */
+    public function __construct($hash){
+        $this->hash = $hash;
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @param callable|null $next
+     * @return ResponseInterface|null
+     * @throws PydioException
+     */
+    public function handleRequest(ServerRequestInterface $request, ResponseInterface $response, callable $next = null){
+
+        PluginsService::getInstance()->initActivePlugins();
+        $shareCenter = ShareCenter::getShareCenter(Context::emptyContext());
+        $data = $shareCenter->getShareStore()->loadShare($this->hash);
+        $mess = LocaleService::getMessages();
+        if($data === false){
+            AuthService::disconnect();
+            throw new PydioException($mess["share_center.166"]);
+        }
+        if(ShareLink::isShareExpired($data)){
+            AuthService::disconnect();
+            throw new PydioException($mess["share_center.165"]);
+        }
+        if(!empty($data) && is_array($data)){
+            if($data["SHARE_TYPE"] !== "minisite"){
+                ShareCenter::loadPubliclet($data);
+                return;
+            }
+            $request = $request->withAttribute("hash", $this->hash);
+            $request = $request->withAttribute("data", $data);
+        }else{
+            throw new PydioException($mess["share_center.166"]);
+        }
+        $response = Server::callNextMiddleWare($request, $response, $next);
+        $this->emitResponse($request, $response);
+        return null;
+        
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/action.share/src/Http/MinisiteServer.php b/core/src/plugins/action.share/src/Http/MinisiteServer.php
new file mode 100644
index 0000000000..bc546f1fb4
--- /dev/null
+++ b/core/src/plugins/action.share/src/Http/MinisiteServer.php
@@ -0,0 +1,115 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Share\Http;
+
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Core\Http\Server;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Share\View\MinisiteRenderer;
+use Zend\Diactoros\Response;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class ShareServer
+ * @package Pydio\Share\Http
+ */
+class MinisiteServer extends Server
+{
+
+    /**
+     * @var string
+     */
+    private $crtLinkHash;
+
+    /**
+     * @var bool
+     */
+    private $rest = false;
+
+    /**
+     * MinisiteServer constructor.
+     * @param $base
+     * @param $linkHash
+     * @param bool $rest
+     */
+    public function __construct($base, $linkHash, $rest = false)
+    {
+        $this->crtLinkHash = $linkHash;
+        $this->rest = $rest;
+        parent::__construct($base, []);
+        if($rest){
+            ApplicationState::setSapiRestBase($base);
+        }
+    }
+
+    protected function stackMiddleWares()
+    {
+        $this->middleWares->push(array("Pydio\\Share\\View\\MinisiteRenderer", "handleRequest"));
+        $this->middleWares->push(array("Pydio\\Share\\Http\\MinisiteAuthMiddleware", "handleRequest"));
+        $topMiddleware = new MinisiteRootMiddleware($this->crtLinkHash);
+        $this->topMiddleware = $topMiddleware;
+        $this->middleWares->push(array($this->topMiddleware, "handleRequest"));
+    }
+
+    /**
+     * @param bool $rest
+     * @return ServerRequestInterface
+     */
+    protected function initServerRequest($rest = false){
+
+        $request = parent::initServerRequest();
+        $body = $request->getParsedBody();
+        if(is_array($_GET) && count($_GET)){
+            $body = array_merge($body, $_GET);
+            $request = $request->withParsedBody($body);
+        }
+        if($this->rest){
+            $request = $request->withAttribute("rest", true);
+        }
+        return $request;
+
+    }
+
+    /**
+     * @param $code
+     * @param $message
+     * @param $fichier
+     * @param $ligne
+     * @param $context
+     */
+    public function catchError($code, $message, $fichier, $ligne, $context)
+    {
+        $req = $this->getRequest();
+        $resp = new Response();
+
+        $setUrl = ConfService::getGlobalConf("SERVER_URL");
+        $data = array();
+        if (!empty($setUrl)) {
+            $data["AJXP_APPLICATION_BASE"] = $setUrl;
+        }
+        MinisiteRenderer::writeHtml($resp, Context::emptyContext(), $data, "", $message);
+        $this->topMiddleware->emitResponse($req, $resp);
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/action.share/src/Legacy/LegacyPubliclet.php b/core/src/plugins/action.share/src/Legacy/LegacyPubliclet.php
new file mode 100644
index 0000000000..6684f6e0ce
--- /dev/null
+++ b/core/src/plugins/action.share/src/Legacy/LegacyPubliclet.php
@@ -0,0 +1,319 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Share\Legacy;
+
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Access\Core\Filter\ContentFilter;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\Repository;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Access\Meta\Watch\WatchRegister;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+
+use Pydio\Core\Services\ConfService;
+
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Services\UsersService;
+
+use Pydio\Share\Model\ShareLink;
+use Pydio\Share\ShareCenter;
+use Pydio\Share\Store\ShareRightsManager;
+use Pydio\Share\Store\ShareStore;
+use Pydio\Share\View\MinisiteRenderer;
+use Pydio\Share\View\PublicAccessManager;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class LegacyPubliclet
+ * Model for links generated in old versions of Pydio when they
+ * were stored in small php files on disk instead of inside Database
+ *
+ * @package Pydio\Share\Legacy
+ */
+class LegacyPubliclet
+{
+
+    /**
+     * @param $data
+     * @param $hash
+     * @param null $message
+     */
+    private static function renderError($data, $hash, $message = null){
+        MinisiteRenderer::renderError($data, $hash, $message);
+    }
+
+    /**
+     * @param array $data
+     * @param array $options
+     * @param ShareStore $shareStore
+     */
+    public static function render($data, $options, $shareStore){
+
+        self::renderError($data, "false", "Link is deprecated and should be migrated to the new format.");
+        
+    }
+
+
+    /**
+     * @param ContextInterface $ctx
+     * @param string $shareId
+     * @param $shareMeta
+     * @param ShareStore $shareStore
+     * @param PublicAccessManager $publicAccessManager
+     * @param WatchRegister|null $watcher
+     * @param $node
+     * @return array|false
+     * @throws \Exception
+     */
+    public static function publicletToJson(ContextInterface $ctx, $shareId, $shareMeta, $shareStore, $publicAccessManager, $watcher, $node){
+
+        $messages = LocaleService::getMessages();
+        $elementWatch = false;
+
+        $pData = $shareStore->loadShare($shareId);
+        if (!count($pData)) {
+            return false;
+        }
+        foreach($shareStore->modifiableShareKeys as $key){
+            if(isSet($pData[$key])) $shareMeta[$key] = $pData[$key];
+        }
+        if ($pData["OWNER_ID"] != $ctx->getUser()->getId() && !$ctx->getUser()->isAdmin()) {
+            throw new \Exception($messages["share_center.48"]);
+        }
+        if (isSet($shareMeta["short_form_url"])) {
+            $link = $shareMeta["short_form_url"];
+        } else {
+            $link = $publicAccessManager->buildPublicLink($shareId);
+        }
+        if ($watcher != false && $node != null) {
+            $result = [];
+            $elementWatch = $watcher->hasWatchOnNode(
+                $node,
+                $ctx->getUser()->getId(),
+                WatchRegister::$META_WATCH_USERS_NAMESPACE,
+                $result
+            );
+            if ($elementWatch && !in_array($shareId, $result)) {
+                $elementWatch = false;
+            }
+        }
+        $jsonData = array_merge([
+            "element_id"       => $shareId,
+            "publiclet_link"   => $link,
+            "download_counter" => 0,
+            "download_limit"   => $pData["DOWNLOAD_LIMIT"],
+            "expire_time"      => ($pData["EXPIRE_TIME"]!=0?date($messages["date_format"], $pData["EXPIRE_TIME"]):0),
+            "has_password"     => (!empty($pData["PASSWORD"])),
+            "element_watch"    => $elementWatch,
+            "is_expired"       => ShareLink::isShareExpired($pData)
+        ], $shareMeta);
+
+        return $jsonData;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param ShareCenter $shareCenter
+     * @param ShareStore $shareStore
+     * @param ShareRightsManager $shareRightManager
+     * @param bool $dryRun
+     * @throws \Pydio\Core\Exception\UserNotFoundException
+     */
+    public static function migrateLegacyMeta(ContextInterface $ctx, $shareCenter, $shareStore, $shareRightManager, $dryRun = true){
+        $metaStoreDir = AJXP_DATA_PATH."/plugins/metastore.serial";
+        $publicFolder = ConfService::getGlobalConf("PUBLIC_DOWNLOAD_FOLDER");
+        $metastores = glob($metaStoreDir."/ajxp_meta_*");
+        if($dryRun){
+            print("RUNNING A DRY RUN FOR META MIGRATION");
+        }
+        foreach($metastores as $store){
+            if(strpos($store, ".bak") !== false) continue;
+            // Backup store
+            if(!$dryRun){
+                copy($store, $store.".bak");
+            }
+
+            $data = unserialize(file_get_contents($store));
+            foreach($data as $filePath => &$metadata){
+
+                foreach($metadata as $userName => &$meta){
+                    if(!UsersService::userExists($userName)){
+                        continue;
+                    }
+                    $userObject = UsersService::getUserById($userName, false);
+
+                    if(isSet($meta["ajxp_shared"]) && isSet($meta["ajxp_shared"]["element"])){
+                        print("\n\nItem $filePath requires upgrade :");
+                        $share = $meta["ajxp_shared"];
+                        $element = $meta["ajxp_shared"]["element"];
+                        if(is_array($element)) $element = array_shift(array_keys($element));// Take the first one only
+                        $legacyLinkFile = $publicFolder."/".$element.".php";
+                        if(file_exists($legacyLinkFile)){
+                            // Load file, move it to DB and move the meta
+                            $publiclet = $shareStore->loadShare($element);
+                            if($publiclet === false){
+                                print("\n--Could not load publiclet $element, skipping");
+                                continue;
+                            }
+                            rename($legacyLinkFile, $legacyLinkFile.".migrated");
+                            if(isSet($share["minisite"])){
+                                print("\n--Migrate legacy minisite to new minisite?");
+                                try{
+                                    $sharedRepoId = $publiclet["REPOSITORY"];
+                                    $sharedRepo = RepositoryService::getRepositoryById($sharedRepoId);
+                                    if($sharedRepo == null){
+                                        print("\n--ERROR: Cannot find repository with id ".$sharedRepoId);
+                                        continue;
+                                    }
+                                    $shareLink = new ShareLink($shareStore, $publiclet);
+                                    $user = $shareLink->getUniqueUser();
+                                    if(UsersService::userExists($user)){
+                                        $userObject = UsersService::getUserById($user, false);
+                                        $userObject->setHidden(true);
+                                        print("\n--Should set existing user $user as hidden");
+                                        if(!$dryRun){
+                                            $userObject->save();
+                                        }
+                                    }
+                                    $shareLink->parseHttpVars(["custom_handle" => $element]);
+                                    $shareLink->setParentRepositoryId($sharedRepo->getParentId());
+                                    print("\n--Creating the following share object");
+                                    print_r($shareLink->getJsonData($shareCenter->getPublicAccessManager(), LocaleService::getMessages()));
+                                    if(!$dryRun){
+                                        $shareLink->save();
+                                    }
+                                    $meta["ajxp_shared"] = ["shares" => [$element => ["type" => "minisite"], $sharedRepoId => ["type" => "repository"]]];
+                                }catch(\Exception $e){
+                                    print("\n-- Error ".$e->getMessage());
+                                }
+
+                            }else{
+                                print("\n--Should migrate legacy link to new minisite with ContentFilter");
+
+                                try{
+                                    $link = new ShareLink($shareStore);
+                                    $link->setOwnerId($userName);
+                                    $parameters = ["custom_handle" => $element, "simple_right_download" => true];
+                                    if(isSet($publiclet["EXPIRE_TIME"])) $parameters["expiration"] = $publiclet["EXPIRE_TIME"];
+                                    if(isSet($publiclet["DOWNLOAD_LIMIT"])) $parameters["downloadlimit"] = $publiclet["DOWNLOAD_LIMIT"];
+                                    $link->parseHttpVars($parameters);
+                                    /**
+                                     * @var Repository $parentRepositoryObject
+                                     */
+                                    $parentRepositoryObject = $publiclet["REPOSITORY"];
+
+                                    /**
+                                     * @var AbstractAccessDriver $driverInstance
+                                     */
+                                    $currentContext = new Context($userName);
+                                    $currentContext->setRepositoryObject($parentRepositoryObject);
+                                    $driverInstance = PluginsService::getInstance($currentContext)->getPluginByTypeName("access", $parentRepositoryObject->getAccessType());
+                                    if(empty($driverInstance)){
+                                        print("\n-- ERROR: Cannot find driver instance!");
+                                        continue;
+                                    }
+                                    $options = $driverInstance->makeSharedRepositoryOptions($currentContext, ["file" => "/"]);
+                                    $options["SHARE_ACCESS"] = "private";
+                                    $newRepo = $parentRepositoryObject->createSharedChild(
+                                        basename($filePath),
+                                        $options,
+                                        $parentRepositoryObject->getId(),
+                                        $userObject->getId(),
+                                        null
+                                    );
+                                    $gPath = $userObject->getGroupPath();
+                                    if (!empty($gPath) && !ConfService::getContextConf($ctx, "CROSSUSERS_ALLGROUPS", "conf")) {
+                                        $newRepo->setGroupPath($gPath);
+                                    }
+                                    $newRepo->setDescription("");
+                                    $newRepo->setContentFilter(new ContentFilter([new AJXP_Node("pydio://".$ctx->getUser()->getId()."@".$parentRepositoryObject->getId().$filePath)]));
+                                    if(!$dryRun){
+                                        RepositoryService::addRepository($newRepo);
+                                    }
+
+                                    $hiddenUserEntry = $shareRightManager->prepareSharedUserEntry(
+                                        ["simple_right_read" => true, "simple_right_download" => true],
+                                        $link, false, null);
+
+                                    $selection = new UserSelection($parentRepositoryObject, []);
+                                    $selection->addFile($filePath);
+                                    if(!$dryRun){
+                                        $shareRightManager->assignSharedRepositoryPermissions(
+                                            $parentRepositoryObject,
+                                            $newRepo,
+                                            false,
+                                            [$hiddenUserEntry["ID"] => $hiddenUserEntry], [],
+                                            $selection
+                                        );
+                                    }
+                                    $link->setParentRepositoryId($parentRepositoryObject->getId());
+                                    $link->attachToRepository($newRepo->getId());
+                                    print("\n-- Should save following LINK: ");
+                                    print_r($link->getJsonData($shareCenter->getPublicAccessManager(), LocaleService::getMessages()));
+                                    if(!$dryRun){
+                                        $link->save();
+                                    }
+
+                                    // UPDATE METADATA
+                                    $meta["ajxp_shared"] = ["shares" => [$element => ["type" => "minisite"]]];
+
+                                }catch(\Exception $e){
+                                    print("\n-- ERROR: ".$e->getMessage());
+                                }
+
+
+                            }
+                            if($dryRun){
+                                rename($legacyLinkFile.".migrated", $legacyLinkFile);
+                            }
+                            continue;
+                        }else{
+                            //
+                            // File does not exists, remove meta
+                            //
+                            unset($meta["ajxp_shared"]);
+                        }
+
+
+                        $repo = RepositoryService::getRepositoryById($element);
+                        if($repo !== null){
+                            print("\n--Shared repository: just metadata");
+                            // Shared repo, migrating the meta should be enough
+                            $meta["ajxp_shared"] = ["shares" => [$element => ["type" => "repository"]]];
+                        }
+                    }
+                }
+            }
+            print("\n\n SHOULD NOW UPDATE METADATA WITH FOLLOWING :");
+            print_r($data);
+            if(!$dryRun){
+                file_put_contents($store, serialize($data));
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/action.share/src/Model/CompositeShare.php b/core/src/plugins/action.share/src/Model/CompositeShare.php
new file mode 100644
index 0000000000..c7b2bb2931
--- /dev/null
+++ b/core/src/plugins/action.share/src/Model/CompositeShare.php
@@ -0,0 +1,183 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Share\Model;
+
+
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\Repository;
+use Pydio\Access\Meta\Watch\WatchRegister;
+use Pydio\Core\Model\ContextInterface;
+
+
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Share\Store\ShareRightsManager;
+use Pydio\Share\View\PublicAccessManager;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class CompositeShare
+ * Object containing a repository and one or many links
+ * @package Pydio\Share\Model
+ */
+class CompositeShare
+{
+    /**
+     * @var AJXP_Node
+     */
+    protected $node;
+
+    /**
+     * @var string
+     */
+    protected $repositoryId;
+
+    /**
+     * @var Repository
+     */
+    protected $repository;
+
+    /**
+     * @var ShareLink[]
+     */
+    protected $shareLinks = array();
+
+    /**
+     * CompositeShare constructor.
+     * @param $node
+     * @param $repositoryId
+     */
+    public function __construct($node, $repositoryId)
+    {
+        $this->node = $node;
+        $this->repositoryId = $repositoryId;
+    }
+
+    /**
+     * @return Repository
+     */
+    public function getRepository(){
+        if(!isSet($this->repository)){
+            $this->repository = RepositoryService::getRepositoryById($this->repositoryId);
+        }
+        return $this->repository;
+    }
+
+    /**
+     * @param ShareLink $link
+     */
+    public function addLink($link){
+        $this->shareLinks[] = $link;
+    }
+
+    /**
+     * @return string
+     */
+    public function getRepositoryId(){
+        return $this->repositoryId;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOwner(){
+        $repo = $this->getRepository();
+        return $repo->getOwner();
+    }
+
+    /**
+     * @return string
+     */
+    public function getVisibilityScope(){
+        $repo = $this->getRepository();
+        if($repo !== null && isSet($repo->options["SHARE_ACCESS"]) && $repo->options["SHARE_ACCESS"] == "public"){
+            return "public";
+        }else{
+            return "private";
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    public function isInvalid(){
+        return $this->getRepository() == null;
+    }
+
+    /**
+     * @param WatchRegister|false $watcher
+     * @param ShareRightsManager $rightsManager
+     * @param PublicAccessManager $publicAccessManager
+     * @param array $messages
+     * @return array|false
+     */
+    public function toJson(ContextInterface $ctx, $watcher, $rightsManager, $publicAccessManager, $messages){
+
+        $repoRootNode = new AJXP_Node("pydio://".$this->getOwner()."@".$this->getRepositoryId()."/");
+        $elementWatch = false;
+        if ($watcher != false) {
+            $elementWatch = $watcher->hasWatchOnNode(
+                $repoRootNode,
+                $ctx->getUser()->getId(),
+                WatchRegister::$META_WATCH_NAMESPACE
+            );
+        }
+        $sharedEntries = $rightsManager->computeSharedRepositoryAccessRights($this->getRepositoryId(), true, $repoRootNode);
+        if(empty($sharedEntries)){
+//            return false;
+        }
+        $cFilter = $this->getRepository()->getContentFilter();
+        if(!empty($cFilter)){
+            $cFilter = $cFilter->toArray();
+        }
+        $jsonData = array(
+            "repositoryId"  => $this->getRepositoryId(),
+            "users_number"  => UsersService::countUsersForRepository($ctx, $this->getRepositoryId()),
+            "label"         => $this->getRepository()->getDisplay(),
+            "description"   => $this->getRepository()->getDescription(),
+            "entries"       => $sharedEntries,
+            "element_watch" => $elementWatch,
+            "repository_url"=> ApplicationState::getWorkspaceShortcutURL($this->getRepository()) ."/",
+            "content_filter"=> $cFilter,
+            "share_owner"   => $this->getOwner(),
+            "share_scope"    => $this->getVisibilityScope()
+        );
+        $jsonData["links"]  = array();
+        foreach ($this->shareLinks as $shareLink) {
+            $uniqueUser = $shareLink->getUniqueUser();
+            $found = false;
+            foreach($sharedEntries as $entry){
+                if($entry["ID"] == $uniqueUser) $found = true;
+            }
+            if(!$found){
+                // STRANGE, THE ASSOCIATED USER IS MISSING
+                error_log("Found shareLink orphan with uniqueUser ".$uniqueUser);
+                continue;
+            }
+            $jsonData["links"][$shareLink->getHash()] = $shareLink->getJsonData($publicAccessManager, $messages);
+        }
+        return $jsonData;
+
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/action.share/src/Model/ShareLink.php b/core/src/plugins/action.share/src/Model/ShareLink.php
new file mode 100644
index 0000000000..5b9a822b97
--- /dev/null
+++ b/core/src/plugins/action.share/src/Model/ShareLink.php
@@ -0,0 +1,453 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Share\Model;
+
+
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Share\Store\ShareStore;
+use Pydio\Share\View\PublicAccessManager;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class ShareLink
+ * Model for a public link
+ */
+class ShareLink
+{
+    /**
+     * @var string
+     */
+    protected $hash;
+
+    /**
+     * @var ShareStore
+     */
+    protected $store;
+
+    /**
+     * @var array
+     */
+    protected $internal;
+
+    /**
+     * @var string
+     */
+    protected $newHash;
+
+    /**
+     * @var array
+     */
+    protected $additionalMeta;
+
+    /**
+     * @var string
+     */
+    protected $parentRepositoryId;
+
+    /**
+     * @return string
+     */
+    public function getShortFormUrl()
+    {
+        return $this->internal["SHORT_FORM_URL"];
+    }
+
+    /**
+     * @param string $shortFormUrl
+     */
+    public function setShortFormUrl($shortFormUrl)
+    {
+        $this->internal["SHORT_FORM_URL"] = $shortFormUrl;
+    }
+
+    /**
+     * ShareLink constructor.
+     * @param $store
+     * @param array $storeData
+     */
+    public function __construct($store, $storeData = array()){
+        $this->store = $store;
+        $this->internal = $storeData;
+    }
+
+    /**
+     * Persist the share to DB using the ShareStore
+     * @return string
+     * @throws \Exception
+     */
+    public function save(){
+        $newHash = $this->store->storeShare(
+            $this->getParentRepositoryId(),
+            $this->internal,
+            "minisite",
+            $this->getHash(),
+            $this->getNewHash()
+        );
+        $this->setHash($newHash);
+        return $newHash;
+    }
+
+    /**
+     * @param string $hash
+     */
+    public function setHash($hash){
+        $this->hash = $hash;
+    }
+
+    /**
+     * @param string $repositoryId
+     */
+    public function attachToRepository($repositoryId){
+        $this->internal["REPOSITORY"] = $repositoryId;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isAttachedToRepository(){
+        return isSet($this->internal["REPOSITORY"]);
+    }
+
+    /**
+     * @return string
+     */
+    public function getRepositoryId(){
+        return $this->internal["REPOSITORY"];
+    }
+
+    /**
+     * @return array
+     */
+    public function getAdditionalMeta()
+    {
+        return $this->additionalMeta;
+    }
+
+    /**
+     * @param array $additionalMeta
+     */
+    public function setAdditionalMeta($additionalMeta)
+    {
+        $this->additionalMeta = $additionalMeta;
+    }
+
+    /**
+     * @return \Pydio\Access\Core\Model\Repository
+     * @throws \Exception
+     */
+    public function getRepository(){
+        if(isSet($this->internal["REPOSITORY"])){
+            return RepositoryService::getRepositoryById($this->internal["REPOSITORY"]);
+        }else{
+            $mess = LocaleService::getMessages();
+            throw new \Exception(str_replace('%s', 'No repository attached to link', $mess["share_center.219"]));
+        }
+    }
+
+    /**
+     * Update some internal configs from httpVars
+     * @param $httpVars
+     * @throws \Exception
+     */
+    public function parseHttpVars($httpVars){
+
+        $data = &$this->internal;
+        $data["DOWNLOAD_DISABLED"] = (isSet($httpVars["simple_right_download"]) ? false : true);
+        $data["AJXP_APPLICATION_BASE"] = ApplicationState::detectServerURL(true);
+        if(isSet($httpVars["minisite_layout"])){
+            $data["AJXP_TEMPLATE_NAME"] = $httpVars["minisite_layout"];
+        }
+        if(isSet($httpVars["expiration"])){
+            if(intval($httpVars["expiration"]) > 0){
+                $data["EXPIRE_TIME"] = time() + intval($httpVars["expiration"]) * 86400;
+            }else if(isSet($data["EXPIRE_TIME"])) {
+                unset($data["EXPIRE_TIME"]);
+            }
+        }
+        if(isSet($httpVars["downloadlimit"])){
+            if(intval($httpVars["downloadlimit"]) > 0){
+                $data["DOWNLOAD_LIMIT"] = intval($httpVars["downloadlimit"]);
+            }else if(isSet($data["DOWNLOAD_LIMIT"])){
+                unset($data["DOWNLOAD_LIMIT"]);
+            }
+        }
+
+        if(isSet($httpVars["custom_handle"]) && !empty($httpVars["custom_handle"]) &&
+            (!isSet($this->hash) || $httpVars["custom_handle"] != $this->hash)){
+            // Existing already
+            $value = InputFilter::sanitize($httpVars["custom_handle"], InputFilter::SANITIZE_ALPHANUM);
+            $value = strtolower($value);
+            if(strlen($value) < $this->store->getHashMinLength()){
+                $mess = LocaleService::getMessages();
+                throw new \Exception(str_replace("%s", $this->store->getHashMinLength(), $mess["share_center.223"]));
+            }
+            $test = $this->store->loadShare($value);
+            $mess = LocaleService::getMessages();
+            if(!empty($test)) {
+                throw new \Exception($mess["share_center.172"]);
+            }
+            if(!isSet($this->hash)){
+                $this->hash = $value;
+            }else{
+                $this->newHash = $value;
+            }
+        }
+
+    }
+
+    /**
+     * @param PublicAccessManager $publicAccessManager
+     * @param array $messages
+     * @return mixed
+     * @throws \Exception
+     */
+    public function getJsonData($publicAccessManager, $messages){
+
+        $storedData = $this->internal;
+        $minisiteIsPublic = isSet($storedData["PRELOG_USER"]);
+        $dlDisabled = isSet($storedData["DOWNLOAD_DISABLED"]) && $storedData["DOWNLOAD_DISABLED"] === true;
+        $shareMeta = isSet($this->additionalMeta) ? $this->additionalMeta : array();
+        $internalUserId = (isSet($storedData["PRELOG_USER"]) ? $storedData["PRELOG_USER"] : $storedData["PRESET_LOGIN"]);
+        if(empty($internalUserId)){
+            throw new \Exception("Oups, link ".$this->getHash()." has no internal user id, this is not normal.");
+        }
+
+        $jsonData = array(
+            "public"            => $minisiteIsPublic?"true":"false",
+            "disable_download"  => $dlDisabled,
+            "hash"              => $this->getHash(),
+            "hash_is_shorten"   => isSet($shareMeta["short_form_url"]) || isSet($this->internal["SHORT_FORM_URL"]),
+            "internal_user_id"   => $internalUserId
+        );
+
+        if(!isSet($storedData["TARGET"]) || $storedData["TARGET"] == "public"){
+            if (isSet($shareMeta["short_form_url"])) {
+                $jsonData["public_link"] = $shareMeta["short_form_url"];
+            } else if(isSet($this->internal["SHORT_FORM_URL"])){
+                $jsonData["public_link"] = $this->getShortFormUrl();
+            } else {
+                $jsonData["public_link"] = $publicAccessManager->buildPublicLink($this->getHash());
+            }
+        }
+
+        if(!empty($storedData["DOWNLOAD_LIMIT"]) && !$dlDisabled){
+            $jsonData["download_counter"] = $this->getDownloadCount();
+            $jsonData["download_limit"] = $storedData["DOWNLOAD_LIMIT"];
+        }
+        if(!empty($storedData["EXPIRE_TIME"])){
+            $delta = $storedData["EXPIRE_TIME"] - time();
+            $days = round($delta / (60*60*24));
+            $jsonData["expire_time"] = date($messages["date_format"], $storedData["EXPIRE_TIME"]);
+            $jsonData["expire_after"] = $days;
+        }else{
+            $jsonData["expire_after"] = 0;
+        }
+        $jsonData["is_expired"] = $this->isExpired();
+        if(isSet($storedData["AJXP_TEMPLATE_NAME"])){
+            $jsonData["minisite_layout"] = $storedData["AJXP_TEMPLATE_NAME"];
+        }
+        if(!$minisiteIsPublic){
+            $jsonData["has_password"] = true;
+        }
+        foreach($this->store->modifiableShareKeys as $key){
+            if(isSet($storedData[$key])) $jsonData[$key] = $storedData[$key];
+        }
+
+        return $jsonData;
+
+    }
+
+    /**
+     * @param string $ownerId
+     */
+    public function setOwnerId($ownerId){
+        if(!empty($ownerId)){
+            $this->internal["OWNER_ID"] = $ownerId;
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function getOwnerId(){
+        return $this->internal["OWNER_ID"];
+    }
+
+    /**
+     * Generate a random user ID. Set in PRELOG_USER or PRESET_LOGIN depending on the hasPassword value.
+     * @param string $prefix
+     * @param bool|false $hasPassword
+     */
+    public function createHiddenUserId($prefix = "", $hasPassword = false){
+        $userId = substr(md5(time()), 0, 12);
+        if (!empty($prefix)) {
+            $userId = $prefix.$userId;
+        }
+        $this->setUniqueUser($userId, $hasPassword);
+    }
+
+    /**
+     * Generate a random password
+     * @return string
+     */
+    public function createHiddenUserPassword(){
+        return substr(md5(time()), 13, 24);
+    }
+
+    /**
+     * @return string
+     */
+    public function getUniqueUser(){
+        if(isSet($this->internal["PRELOG_USER"])) return $this->internal["PRELOG_USER"];
+        else return $this->internal["PRESET_LOGIN"];
+    }
+
+    /**
+     * @param string $userId
+     * @param bool|false $requirePassword
+     */
+    public function setUniqueUser($userId, $requirePassword = false){
+        if(isSet($this->internal["PRELOG_USER"])) unset($this->internal["PRELOG_USER"]);
+        if(isSet($this->internal["PRESET_LOGIN"])) unset($this->internal["PRESET_LOGIN"]);
+        if($requirePassword){
+            $this->internal["PRESET_LOGIN"] = $userId;
+        }else{
+            $this->internal["PRELOG_USER"] = $userId;
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    public function shouldRequirePassword(){
+        return isSet($this->internal["PRESET_LOGIN"]);
+    }
+
+    /**
+     * @return bool
+     */
+    public function disableDownload(){
+        return $this->internal["DOWNLOAD_DISABLED"];
+    }
+
+    /**
+     * @return string
+     */
+    public function getApplicationBase(){
+        return $this->internal["AJXP_APPLICATION_BASE"];
+    }
+
+    /**
+     * @return array
+     */
+    public function getData(){
+        return $this->internal;
+    }
+
+    /**
+     * @return string
+     */
+    public function getHash()
+    {
+        return $this->hash;
+    }
+
+    /**
+     * @return string
+     */
+    public function getNewHash()
+    {
+        return $this->newHash;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isExpired(){
+        return self::isShareExpired($this->internal);
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasDownloadLimit(){
+        return isSet($this->internal["DOWNLOAD_LIMIT"]) && $this->internal["DOWNLOAD_LIMIT"] > 0;
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getDownloadLimit(){
+        return $this->internal["DOWNLOAD_LIMIT"];
+    }
+
+    /**
+     * @param $data
+     * @return bool
+     */
+    public static function isShareExpired($data){
+        return (isSet($data["EXPIRE_TIME"]) && time() > $data["EXPIRE_TIME"]) ||
+            ($data["DOWNLOAD_LIMIT"] && $data["DOWNLOAD_LIMIT"]> 0 && isSet($data["DOWNLOAD_COUNT"]) &&  $data["DOWNLOAD_LIMIT"] <= $data["DOWNLOAD_COUNT"]);
+    }
+
+    /**
+     * Number of times the link has been download
+     * @return int|mixed
+     */
+    public function getDownloadCount(){
+        return isSet($this->internal["DOWNLOAD_COUNT"]) ? $this->internal["DOWNLOAD_COUNT"] : 0;
+    }
+
+    /**
+     * Increments internal counter
+     */
+    public function incrementDownloadCount(){
+        $this->internal["DOWNLOAD_COUNT"] = $this->getDownloadCount() + 1;
+    }
+
+    /**
+     * Set internal counter to 0
+     */
+    public function resetDownloadCount(){
+        $this->internal["DOWNLOAD_COUNT"] = 0;
+    }
+
+    /**
+     * @return string
+     */
+    public function getParentRepositoryId()
+    {
+        return $this->parentRepositoryId;
+    }
+
+    /**
+     * @param string $parentRepositoryId
+     */
+    public function setParentRepositoryId($parentRepositoryId)
+    {
+        $this->parentRepositoryId = $parentRepositoryId;
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/action.share/src/ShareCenter.php b/core/src/plugins/action.share/src/ShareCenter.php
new file mode 100644
index 0000000000..2b23dff716
--- /dev/null
+++ b/core/src/plugins/action.share/src/ShareCenter.php
@@ -0,0 +1,2120 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Share;
+
+use DOMNode;
+use DOMXPath;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Filter\ContentFilter;
+use Pydio\Access\Core\Model\NodesDiff;
+use Pydio\Access\Core\Model\NodesList;
+use Pydio\Access\Core\Model\Repository;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Access\Meta\Watch\WatchRegister;
+use Pydio\Core\Controller\CliRunner;
+use Pydio\Core\Http\Base;
+use Pydio\Core\Http\Message\UserMessage;
+use Pydio\Core\Http\Response\SerializableResponseStream;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Model\RepositoryInterface;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Services\SessionService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\XMLFilter;
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\OCS\Model\TargettedLink;
+use Pydio\Share\Http\MinisiteServer;
+use Pydio\Share\Legacy\LegacyPubliclet;
+use Pydio\Share\Model\CompositeShare;
+use Pydio\Share\Model\ShareLink;
+use Pydio\Share\Store\ShareRightsManager;
+use Pydio\Share\Store\ShareStore;
+use Pydio\Share\View\PublicAccessManager;
+use Pydio\OCS as OCS;
+use Zend\Diactoros\Response;
+use Zend\Diactoros\Response\JsonResponse;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+require_once(dirname(__FILE__)."/../vendor/autoload.php");
+
+/**
+ * @package AjaXplorer_Plugins
+ * @subpackage Action
+ */
+class ShareCenter extends Plugin
+{
+    /**
+     * @var AbstractAccessDriver
+     */
+    private $accessDriver;
+    /**
+     * @var RepositoryInterface
+     */
+    private $repository;
+    private $urlBase;
+
+    /**
+     * @var ShareStore
+     */
+    private $shareStore;
+
+    /**
+     * @var PublicAccessManager
+     */
+    private $publicAccessManager;
+
+    /**
+     * @var WatchRegister
+     */
+    private $watcher = false;
+
+    /**
+     * @var ShareRightsManager
+     */
+    private $rightsManager;
+
+    /**
+     * @var ContextInterface
+     */
+    private $currentContext;
+
+    /**************************/
+    /* PLUGIN LIFECYCLE METHODS
+    /**************************/
+    /**
+     * Plugin initializer
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        parent::init($ctx, $options);
+        if(!$ctx->hasRepository()){
+            return;
+        }
+        $this->repository = $ctx->getRepository();
+        if (!($this->repository->getDriverInstance($ctx) instanceof \Pydio\Access\Core\IAjxpWrapperProvider)) {
+            return;
+        }
+        $this->accessDriver = $this->repository->getDriverInstance($ctx);
+        $this->urlBase = $ctx->getUrlBase();
+        if (array_key_exists("meta.watch", PluginsService::getInstance($ctx)->getActivePlugins())) {
+            $this->watcher = PluginsService::getInstance($ctx)->getPluginById("meta.watch");
+        }
+        $this->currentContext = $ctx;
+    }
+
+    /**
+     * Extend parent
+     * @param DOMNode $contribNode
+     */
+    protected function parseSpecificContributions(ContextInterface $ctx, \DOMNode &$contribNode)
+    {
+        parent::parseSpecificContributions($ctx, $contribNode);
+        if(!$ctx->getRepository()){
+            return;
+        }
+
+        $disableSharing = false;
+        $xpathesToRemove = array();
+        $selectionContext = false;
+
+        if( strpos($ctx->getRepository()->getAccessType(), "ajxp_") === 0){
+
+            $disableSharing = true;
+
+        }else if (UsersService::usersEnabled()) {
+
+            $loggedUser = $ctx->getUser();
+            if ($loggedUser != null && UsersService::isReservedUserId($loggedUser->getId())) {
+                $disableSharing = true;
+            }
+
+        } else {
+
+            $disableSharing = true;
+
+        }
+        if ($disableSharing) {
+            // All share- actions
+            $xpathesToRemove[] = 'action[@name="share-edit-shared"]';
+            $xpathesToRemove[] = 'action[@name="share_react"]';
+
+        }else{
+            $folderSharingAllowed = $this->getAuthorization($ctx, "folder", "any");
+            $fileSharingAllowed   = $this->getAuthorization($ctx, "file", "any");
+            if($folderSharingAllowed && !$fileSharingAllowed){
+                $selectionContext = "dir";
+            }else if(!$folderSharingAllowed && $fileSharingAllowed){
+                $selectionContext = "file";
+            }else if(!$fileSharingAllowed && !$folderSharingAllowed){
+                // All share- actions
+                $xpathesToRemove[] = 'action[@name="share-edit-shared"]';
+                $xpathesToRemove[] = 'action[@name="share_react"]';
+            }
+        }
+
+        foreach($xpathesToRemove as $xpath){
+            $actionXpath=new DOMXPath($contribNode->ownerDocument);
+            $nodeList = $actionXpath->query($xpath, $contribNode);
+            foreach($nodeList as $shareActionNode){
+                $contribNode->removeChild($shareActionNode);
+            }
+        }
+        if(isSet($selectionContext)){
+            $actionXpath=new DOMXPath($contribNode->ownerDocument);
+            $nodeList = $actionXpath->query('action[@name="share_react"]/gui/selectionContext', $contribNode);
+            if(!$nodeList->length) return;
+            /** @var \DOMElement $selectionContextNode */
+            $selectionContextNode =  $nodeList->item(0);
+            if($selectionContext == "dir") $selectionContextNode->setAttribute("file", "false");
+            else if($selectionContext == "file") $selectionContextNode->setAttribute("dir", "false");
+        }
+
+    }
+
+
+    /**************************/
+    /* PUBLIC LINKS ROUTER
+    /**************************/
+    /**
+     * @param $serverBase
+     * @param $route
+     * @param $params
+     */
+    public static function publicRoute($serverBase, $route, $params){
+
+        if(isSet($_GET['minisite_session'])){
+
+            $base = new Base();
+            $h = $_GET['minisite_session'];
+            SessionService::setSessionName("AjaXplorer_Shared".str_replace(".","_",$h));
+            $base->handleRoute($serverBase, "/", ["minisite" => true]);
+
+        }else{
+
+            $hash = isSet($params["hash"])? $params["hash"] : "";
+            if(strpos($hash, "--") !== false){
+                list($hash, $lang) = explode("--", $hash);
+            }
+            if(strpos($hash, ".php") !== false){
+                $hash = array_shift(explode(".php", $hash));
+            }
+
+            ConfService::init();
+            ConfService::start();
+            if(isSet($lang)){
+                $_GET["lang"] = $lang;
+            }
+            if(isSet($params["optional"])){
+                $_GET["dl"] = true;
+                $_GET["file"] = "/".$params["optional"];
+            }
+            ConfService::getAuthDriverImpl();
+
+            $minisiteServer = new MinisiteServer($serverBase, $hash, isSet($params["optional"]));
+            $minisiteServer->registerCatchAll();
+            $minisiteServer->listen();
+
+        }
+    }
+
+    /**************************/
+    /* BOOTLOADERS FOR LINKS
+    /**************************/
+    /**
+     * Loader for minisites
+     * @param array $data
+     * @param string $hash
+     * @param null $error
+     */
+    public static function loadMinisite($data, $hash = '', $error = null)
+    {
+        $base = rtrim(dirname($_SERVER["SCRIPT_NAME"]), "/");
+        $id = pathinfo($_SERVER["SCRIPT_NAME"], PATHINFO_FILENAME);
+        self::publicRoute($base, "/proxy", ["hash" => $id]);
+    }
+
+    /**
+     * Loader for legacy publiclets
+     * @static
+     * @param array $data
+     * @return void
+     */
+    public static function loadPubliclet($data)
+    {
+        $shareCenter = self::getShareCenter(Context::emptyContext());
+        $options = $shareCenter->getConfigs();
+        $shareStore = $shareCenter->getShareStore();
+        LegacyPubliclet::render($data, $options, $shareStore);
+    }
+
+
+
+    /**************************/
+    /* UTILS & ACCESSORS
+    /**************************/
+    /**
+     * Compute right to create shares based on plugin options
+     * @param ContextInterface $ctx
+     * @param string $nodeType "file"|"folder"
+     * @param string $shareType "any"|"minisite"|"workspace"
+     * @return bool
+     */
+    protected function getAuthorization(ContextInterface $ctx, $nodeType, $shareType = "any"){
+
+        $all             = $this->getContextualOption($ctx, "DISABLE_ALL_SHARING");
+        if($all){
+            return false;
+        }
+        if($ctx->getRepository()->hasParent()){
+            $p = $ctx->getRepository()->getParentRepository();
+            if(!empty($p) && !$p->isTemplate()){
+                $pContext = new Context($ctx->getRepository()->getOwner(), $p->getId());
+                $all = $this->getContextualOption($pContext, "DISABLE_RESHARING");
+                if($all){
+                    return false;
+                }
+            }
+        }
+        
+        $filesMini       = $this->getContextualOption($ctx, "ENABLE_FILE_PUBLIC_LINK");
+        $filesInternal   = $this->getContextualOption($ctx, "ENABLE_FILE_INTERNAL_SHARING");
+        $foldersMini     = $this->getContextualOption($ctx, "ENABLE_FOLDER_PUBLIC_LINK");
+        $foldersInternal = $this->getContextualOption($ctx, "ENABLE_FOLDER_INTERNAL_SHARING");
+
+        if($shareType == "any"){
+            return ($nodeType == "file" ? $filesInternal || $filesMini : $foldersInternal || $foldersMini);
+        }else if($shareType == "minisite"){
+            return ($nodeType == "file" ? $filesMini : $foldersMini);
+        }else if($shareType == "workspace"){
+            return ($nodeType == "file" ? $filesInternal : $foldersInternal);
+        }
+        return false;
+
+    }
+
+    /**
+     * @return ShareCenter
+     */
+    public static function getShareCenter(ContextInterface $ctx = null){
+        if($ctx === null){
+            $ctx = Context::emptyContext();
+        }
+        /** @var ShareCenter $shareCenter */
+        $shareCenter = PluginsService::getInstance($ctx)->getPluginById("action.share");
+        if(empty($shareCenter->currentContext)){
+            $shareCenter->currentContext = $ctx;
+        }
+        return $shareCenter;
+    }
+
+    /**
+     * @return bool
+     */
+    public static function currentContextIsLinkDownload(){
+        return (isSet($_GET["dl"]) && isSet($_GET["dl"]) == "true");
+    }
+
+    /**
+     * Check if the hash seems to correspond to the serialized data.
+     * Kept there only for backward compatibility
+     * @static
+     * @param String $outputData serialized data
+     * @param String $hash Id to check
+     * @return bool
+     */
+    public static function checkHash($outputData, $hash)
+    {
+        // Never return false, otherwise it can break listing due to hardcore exit() call;
+        // Rechecked later
+        return true;
+
+        //$full = md5($outputData);
+        //return (!empty($hash) && strpos($full, $hash."") === 0);
+    }
+
+
+    /**
+     * @param ContextInterface $ctx
+     * @return ShareStore
+     */
+    public function getShareStore(ContextInterface $ctx = null){
+
+        if(!isSet($this->shareStore) || $ctx !== null){
+            $hMin = 32;
+            $context = $ctx !== null ? $ctx : $this->currentContext;
+            if(!empty($context)){
+                $hMin = $this->getContextualOption($context, "HASH_MIN_LENGTH");
+            }
+            $this->shareStore = new ShareStore(
+                $context,
+                ConfService::getGlobalConf("PUBLIC_DOWNLOAD_FOLDER"),
+                $hMin
+            );
+        }
+        return $this->shareStore;
+    }
+
+    /**
+     * @return View\PublicAccessManager
+     */
+    public function getPublicAccessManager(){
+
+        if(!isSet($this->publicAccessManager)){
+            $this->publicAccessManager = new PublicAccessManager([]);
+        }
+        return $this->publicAccessManager;
+
+    }
+
+    /**
+     * @param AJXP_Node $ajxpNode
+     * @return boolean
+     */
+    public function isShared($ajxpNode)
+    {
+        $shares = array();
+        $this->getShareStore()->getMetaManager()->getSharesFromMeta($ajxpNode, $shares, true);
+        return count($shares) > 0;
+    }
+
+    /**
+     * @return ShareRightsManager
+     */
+    protected function getRightsManager(){
+        if(!isSet($this->rightsManager)){
+            if(isSet($this->currentContext)){
+                $options = array(
+                    "SHARED_USERS_TMP_PREFIX" => $this->getContextualOption($this->currentContext, "SHARED_USERS_TMP_PREFIX"),
+                    "SHARE_FORCE_PASSWORD" => $this->getContextualOption($this->currentContext, "SHARE_FORCE_PASSWORD")
+                );
+            }else{
+                $options = array(
+                    "SHARED_USERS_TMP_PREFIX" => "ext_",
+                    "SHARE_FORCE_PASSWORD" => false
+                );
+            }
+            $this->rightsManager = new ShareRightsManager(
+                $this->currentContext,
+                $options,
+                $this->getShareStore(),
+                $this->watcher);
+        }
+        return $this->rightsManager;
+    }
+
+    /**
+     * Update parameter value based on current max allowed option.
+     * @param array $httpVars
+     * @param string $parameterName
+     * @param string $optionName
+     */
+    protected function updateToMaxAllowedValue(&$httpVars, $parameterName, $optionName){
+
+        $maxvalue = abs(intval($this->getContextualOption($this->currentContext, $optionName)));
+        $value = isset($httpVars[$parameterName]) ? abs(intval($httpVars[$parameterName])) : 0;
+        if ($maxvalue == 0) {
+            $httpVars[$parameterName] = $value;
+        } elseif ($maxvalue > 0 && $value == 0) {
+            $httpVars[$parameterName] = $maxvalue;
+        } else {
+            $httpVars[$parameterName] = min($value,$maxvalue);
+        }
+
+    }
+
+    /**
+     * @param $label
+     * @param Repository|null $editingRepo
+     * @return bool
+     */
+    protected function checkRepoWithSameLabel($label, $editingRepo = null){
+        if ( $this->getContextualOption($this->currentContext, "AVOID_SHARED_FOLDER_SAME_LABEL") == true) {
+            $count = 0;
+            $similarLabelRepos = RepositoryService::listRepositoriesWithCriteria(array("display" => $label), $count);
+            if($count && !isSet($editingRepo)){
+                return true;
+            }
+            if($count && isSet($editingRepo)){
+                foreach($similarLabelRepos as $slr){
+                    if($slr->getUniqueId() != $editingRepo->getUniqueId()){
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @param $childRepoId
+     * @param $userId
+     * @param bool $toggle
+     * @param null $parentUserId
+     */
+    protected function toggleWatchOnSharedRepository($childRepoId, $userId, $toggle = true, $parentUserId = null){
+        if ($this->watcher === false || !$this->currentContext->hasUser()) {
+            return;
+        }
+        $rootNode = new AJXP_Node("pydio://".$userId."@".$childRepoId."/");
+        // Register a watch on the current folder for shared user
+        if($parentUserId !== null){
+            if ($toggle) {
+                $this->watcher->setWatchOnFolder(
+                    $rootNode,
+                    $userId,
+                    WatchRegister::$META_WATCH_USERS_CHANGE,
+                    array($parentUserId)
+                );
+            } else {
+                $this->watcher->removeWatchFromFolder(
+                    $rootNode,
+                    $userId,
+                    true
+                );
+            }
+        }else{
+            // Register a watch on the new repository root for current user
+            if ($toggle) {
+
+                $this->watcher->setWatchOnFolder(
+                    $rootNode,
+                    $userId,
+                    WatchRegister::$META_WATCH_BOTH);
+
+            } else {
+
+                $this->watcher->removeWatchFromFolder(
+                    $rootNode,
+                    $userId);
+            }
+
+        }
+
+    }
+
+    /**************************/
+    /* CALLBACKS FOR ACTIONS
+    /**************************/
+    /**
+     * Added as preprocessor on Download action to handle download Counter.
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @throws \Exception
+     */
+    public function preProcessDownload(ServerRequestInterface &$requestInterface, ResponseInterface &$responseInterface){
+
+        if(!ApplicationState::hasMinisiteHash()) {
+            return;
+        }
+
+        $hash = ApplicationState::getMinisiteHash();
+        $share = $this->getShareStore()->loadShareObject($hash);
+        if(!empty($share)){
+            if($share->isExpired()){
+                throw new \Exception('Link is expired');
+            }
+            if($share->hasDownloadLimit()){
+                $share->incrementDownloadCount();
+                $share->save();
+            }
+        }
+
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     */
+    public function migrateLegacyShares(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface)
+    {
+        LegacyPubliclet::migrateLegacyMeta(
+            $requestInterface->getAttribute("ctx"),
+            $this,
+            $this->getShareStore(),
+            $this->getRightsManager(),
+            $requestInterface->getParsedBody()["dry_run"] !== "run"
+        );
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @return null
+     * @throws \Exception
+     * @throws \Pydio\Core\Exception\PydioException
+     */
+    public function switchAction(ServerRequestInterface &$requestInterface, ResponseInterface &$responseInterface)
+    {
+        $action = $requestInterface->getAttribute("action");
+        $httpVars = $requestInterface->getParsedBody();
+        /** @var ContextInterface $ctx */
+        $this->currentContext = $ctx = $requestInterface->getAttribute("ctx");
+
+        if (strpos($action, "sharelist") === false && !isSet($this->accessDriver)) {
+            //throw new \Exception("Cannot find access driver!");
+            $this->accessDriver = $ctx->getRepository()->getDriverInstance($ctx);
+        }
+
+
+        if (strpos($action, "sharelist") === false && $this->accessDriver->getId() == "access.demo") {
+            $errorMessage = "This is a demo, all 'write' actions are disabled!";
+            if ($httpVars["sub_action"] === "delegate_repo") {
+                $responseInterface = $responseInterface->withBody(new SerializableResponseStream([new UserMessage($errorMessage, LOG_LEVEL_ERROR)]));
+                return;
+            } else {
+                $responseInterface->getBody()->write($errorMessage);
+            }
+            return null;
+        }
+
+        switch ($action) {
+
+            //------------------------------------
+            // SHARING FILE OR FOLDER
+            //------------------------------------
+            case "share":
+
+                $subAction = (isSet($httpVars["sub_action"])?$httpVars["sub_action"]:"");
+                // REST API COMPATIBILITY
+                if(empty($subAction) && isSet($httpVars["simple_share_type"])){
+                    $subAction = "create_minisite";
+                    if(!isSet($httpVars["simple_right_read"]) && !isSet($httpVars["simple_right_download"])){
+                        $httpVars["simple_right_read"] = $httpVars["simple_right_download"] = "true";
+                    }else if(!isSet($httpVars["simple_right_read"]) && isSet($httpVars["simple_right_download"]) && !isSet($httpVars["simple_right_write"])){
+                        $httpVars["minisite_layout"] = "ajxp_unique_dl";
+                    }
+                    $httpVars["create_guest_user"] = "true";
+                    if($httpVars["simple_share_type"] == "private" && !isSet($httpVars["guest_user_pass"])){
+                        throw new \Exception("Please provide a guest_user_pass for private link");
+                    }
+                }
+                $userSelection = UserSelection::fromContext($ctx, $httpVars);
+                $ajxpNode = $userSelection->getUniqueNode();
+                if (!file_exists($ajxpNode->getUrl())) {
+                    throw new \Exception("Cannot share a non-existing file: ".$ajxpNode->getUrl());
+                }
+
+                $this->updateToMaxAllowedValue($httpVars, "downloadlimit", "FILE_MAX_DOWNLOAD");
+                $this->updateToMaxAllowedValue($httpVars, "expiration", "FILE_MAX_EXPIRATION");
+
+                $httpHash = null;
+                $originalHash = null;
+
+                if(!isSet($httpVars["share_scope"]) || !in_array($httpVars["share_scope"], array("public", "private"))){
+                    $httpVars["share_scope"] = "private";
+                }
+                $shareScope = $httpVars["share_scope"];
+                $plainResult = 'unknown sub_action';
+
+                if ($subAction == "delegate_repo") {
+
+                    $auth = $this->getAuthorization($ctx, "folder", "workspace");
+                    if(!$auth){
+                        $mess = LocaleService::getMessages();
+                        throw new \Exception($mess["351"]);
+                    }
+
+                    $users = array(); $groups = array();
+                    $this->getRightsManager()->createUsersFromParameters($httpVars, $users, $groups);
+
+                    $result = $this->createSharedRepository($httpVars, $isUpdate, $users, $groups);
+
+                    if (is_object($result) && $result instanceof Repository) {
+
+                        if(!$isUpdate){
+                            $this->getShareStore()->storeShare($this->repository->getId(), array(
+                                "REPOSITORY" => $result->getUniqueId(),
+                                "OWNER_ID" => $ctx->getUser()->getId()), "repository");
+                        }
+
+                        Controller::applyHook( ($isUpdate ? "node.share.update" : "node.share.create"), [$ajxpNode, array(
+                            'type' => 'repository',
+                            'repository' => &$this->repository,
+                            'accessDriver' => &$this->accessDriver,
+                            'new_repository' => &$result
+                        )]);
+
+                        if ($ajxpNode->hasMetaStore() && !$ajxpNode->isRoot()) {
+                            $this->getShareStore()->getMetaManager()->addShareInMeta(
+                                $ajxpNode,
+                                "repository",
+                                $result->getUniqueId(),
+                                ($shareScope == "public"),
+                                $originalHash
+                            );
+                        }
+
+                        $plainResult = 200;
+                    } else {
+                        $plainResult = $result;
+                    }
+
+                } else if ($subAction == "create_minisite") {
+
+                    if(isSet($httpVars["hash"]) && !empty($httpVars["hash"])) $httpHash = $httpVars["hash"];
+
+                    $result = $this->createSharedMinisite($httpVars, $isUpdate);
+                    
+                    if (!is_array($result)) {
+                        $url = $result;
+                    } else {
+                        list($hash, $url) = $result;
+                        if ($ajxpNode->hasMetaStore() && !$ajxpNode->isRoot()) {
+                            $this->getShareStore()->getMetaManager()->addShareInMeta(
+                                $ajxpNode,
+                                "minisite",
+                                $hash,
+                                ($shareScope == "public"),
+                                ($httpHash != null && $hash != $httpHash) ? $httpHash : null
+                            );
+                        }
+
+                    }
+                    $plainResult = $url;
+
+                } else if ($subAction == "share_node"){
+
+                    $httpVars["return_json"] = true;
+                    if(isSet($httpVars["hash"]) && !empty($httpVars["hash"])) $httpHash = $httpVars["hash"];
+                    $ajxpNode->loadNodeInfo();
+
+                    $results = $this->shareNode($ctx, $ajxpNode, $httpVars, $isUpdate);
+                    if(is_array($results) && $ajxpNode->hasMetaStore() && !$ajxpNode->isRoot()){
+                        $ajxpNode->startUpdatingMetadata();
+                        foreach($results as $shareObject){
+                            if($shareObject instanceof \Pydio\OCS\Model\TargettedLink){
+                                $hash = $shareObject->getHash();
+                                $this->getShareStore()->getMetaManager()->addShareInMeta(
+                                    $ajxpNode,
+                                    "ocs_remote",
+                                    $hash,
+                                    ($shareScope == "public"),
+                                    $hash
+                                );
+                            }else if($shareObject instanceof ShareLink){
+                                $hash = $shareObject->getHash();
+                                $this->getShareStore()->getMetaManager()->addShareInMeta(
+                                    $ajxpNode,
+                                    "minisite",
+                                    $hash,
+                                    ($shareScope == "public"),
+                                    ($httpHash != null && $hash != $httpHash) ? $httpHash : null
+                                );
+                            }else if($shareObject instanceof Repository){
+                                $this->getShareStore()->getMetaManager()->addShareInMeta(
+                                    $ajxpNode,
+                                    "repository",
+                                    $shareObject->getUniqueId(),
+                                    ($shareScope == "public"),
+                                    null
+                                );
+                            }
+                        }
+                        $ajxpNode->finishedUpdatingMetadata();
+                    }
+                }
+
+
+                Controller::applyHook("msg.instant", array( $ajxpNode->getContext(), "<reload_shared_elements/>"));
+                /*
+                 * Send IM to inform that node has been shared or unshared.
+                 * Should be done only if share scope is public.
+                 */
+                if($shareScope == "public"){
+                    $ajxpNode->loadNodeInfo();
+                    $diff = new NodesDiff();
+                    $diff->update($ajxpNode);
+                    $content = $diff->toXML();
+                    Controller::applyHook("msg.instant", array($ajxpNode->getContext(), $content, null, null, [$ajxpNode->getPath()]));
+                }
+
+                if(!isSet($httpVars["return_json"])){
+
+                    $responseInterface = $responseInterface->withHeader("Content-type", "text/plain");
+                    $responseInterface->getBody()->write($plainResult);
+
+                }else{
+
+                    $compositeShare = $this->getShareStore()->getMetaManager()->getCompositeShareForNode($ajxpNode);
+                    if(!empty($compositeShare)){
+                        $responseInterface = new JsonResponse($this->compositeShareToJson($ctx, $compositeShare));
+                    }else{
+                        $responseInterface = new JsonResponse([]);
+                    }
+
+                }
+
+                break;
+
+            case "toggle_link_watch":
+
+                $userSelection = UserSelection::fromContext($ctx, $httpVars);
+                $shareNode = $selectedNode = $userSelection->getUniqueNode();
+                $watchValue = $httpVars["set_watch"] == "true" ? true : false;
+                $folder = false;
+                if (isSet($httpVars["element_type"]) && $httpVars["element_type"] == "folder") {
+                    $folder = true;
+                    $selectedNode = new AJXP_Node("pydio://". $ctx->getUser()->getId() ."@". InputFilter::sanitize($httpVars["repository_id"], InputFilter::SANITIZE_ALPHANUM) ."/");
+                }
+                $shares = array();
+                $this->getShareStore()->getMetaManager()->getSharesFromMeta($shareNode, $shares, false);
+                if(!count($shares)){
+                    break;
+                }
+
+                if(isSet($httpVars["element_id"]) && isSet($shares[$httpVars["element_id"]])){
+                    $elementId = $httpVars["element_id"];
+                }else{
+                    $sKeys = array_keys($shares);
+                    $elementId = $sKeys[0];
+                }
+                $ctxUser = $ctx->getUser();
+                if ($this->watcher !== false) {
+                    if (!$folder) {
+                        if ($watchValue) {
+                            $this->watcher->setWatchOnFolder(
+                                $selectedNode,
+                                $ctxUser->getId(),
+                                WatchRegister::$META_WATCH_USERS_READ,
+                                array($elementId)
+                            );
+                        } else {
+                            $this->watcher->removeWatchFromFolder(
+                                $selectedNode,
+                                $ctxUser->getId(),
+                                true,
+                                $elementId
+                            );
+                        }
+                    } else {
+                        if ($watchValue) {
+                            $this->watcher->setWatchOnFolder(
+                                $selectedNode,
+                                $ctxUser->getId(),
+                                WatchRegister::$META_WATCH_BOTH
+                            );
+                        } else {
+                            $this->watcher->removeWatchFromFolder(
+                                $selectedNode,
+                                $ctxUser->getId());
+                        }
+                    }
+                }
+                $mess = LocaleService::getMessages();
+                $x = new SerializableResponseStream([new UserMessage($mess["share_center.47"])]);
+                $responseInterface = $responseInterface->withBody($x);
+
+            break;
+
+            case "load_shared_element_data":
+
+                $node = null;
+                if(isSet($httpVars["hash"]) && $httpVars["element_type"] == "file"){
+
+                    // LEGACY LINKS
+                    $parsedMeta = array($httpVars["hash"] => array("type" => "file"));
+                    $jsonData = array();
+                    foreach($parsedMeta as $shareId => $shareMeta){
+                        $jsonData[] = $this->shareToJson($ctx, $shareId, $shareMeta, $node);
+                    }
+                    $responseInterface = new JsonResponse($jsonData);
+
+                }else{
+
+                    $file = InputFilter::decodeSecureMagic($httpVars["file"]);
+                    $node = new AJXP_Node($ctx->getUrlBase().$file);
+                    $loggedUser = $ctx->getUser();
+                    if(isSet($httpVars["owner"]) && $loggedUser->isAdmin()
+                        && $loggedUser->getGroupPath() == "/" && $loggedUser->getId() != InputFilter::sanitize($httpVars["owner"], InputFilter::SANITIZE_EMAILCHARS)
+                    ){
+                        // Impersonate the current user
+                        $node->setUserId(InputFilter::sanitize($httpVars["owner"], InputFilter::SANITIZE_EMAILCHARS));
+                    }
+                    if(!file_exists($node->getUrl())){
+                        $mess = LocaleService::getMessages();
+                        throw new \Exception(str_replace('%s', "Cannot find file ".$file, $mess["share_center.219"]));
+                    }
+                    if(isSet($httpVars["tmp_repository_id"]) && $ctx->getUser()->isAdmin()){
+                        $compositeShare = $this->getShareStore()->getMetaManager()->getCompositeShareForNode($node, true);
+                    }else{
+                        $compositeShare = $this->getShareStore()->getMetaManager()->getCompositeShareForNode($node);
+                    }
+                    if(empty($compositeShare)){
+                        $mess = LocaleService::getMessages();
+                        throw new \Exception(str_replace('%s', "Cannot find share for node ".$file, $mess["share_center.219"]));
+                    }
+                    $responseInterface = new JsonResponse($this->compositeShareToJson($ctx, $compositeShare));
+
+                }
+
+
+            break;
+
+            case "unshare":
+
+                $mess = LocaleService::getMessages();
+                $userSelection = UserSelection::fromContext($ctx, $httpVars);
+                if(isSet($httpVars["hash"])){
+                    $sanitizedHash = InputFilter::sanitize($httpVars["hash"], InputFilter::SANITIZE_ALPHANUM);
+                    $ajxpNode = ($userSelection->isEmpty() ? null : $userSelection->getUniqueNode());
+                    $result = $this->getShareStore()->deleteShare($httpVars["element_type"], $sanitizedHash, false, false, $ajxpNode);
+                    if($result !== false){
+                        $x = new SerializableResponseStream([new UserMessage($mess["share_center.216"])]);
+                        $responseInterface = $responseInterface->withBody($x);
+                    }
+
+                }else{
+
+                    $userSelection = UserSelection::fromContext($ctx, $httpVars);
+                    $ajxpNode = $userSelection->getUniqueNode();
+                    $shares = array();
+                    $this->getShareStore()->getMetaManager()->getSharesFromMeta($ajxpNode, $shares, false);
+                    if(isSet($httpVars["element_id"]) && isSet($shares[$httpVars["element_id"]])){
+                        $elementId = $httpVars["element_id"];
+                        if(isSet($shares[$elementId])){
+                            $shares = array($elementId => $shares[$elementId]);
+                        }
+                    }
+                    if(count($shares)){
+                        $res = true;
+                        $ajxpNode->startUpdatingMetadata();
+                        foreach($shares as $shareId =>  $share){
+                            $t = isSet($share["type"]) ? $share["type"] : "file";
+                            try{
+                                $result = $this->getShareStore()->deleteShare($t, $shareId, false, true);
+                            }catch(\Exception $e){
+                                if($e->getMessage() == "repo-not-found"){
+                                    $result = true;
+                                }else{
+                                    $ajxpNode->finishedUpdatingMetadata();
+                                    throw $e;
+                                }
+                            }
+                            $this->getShareStore()->getMetaManager()->removeShareFromMeta($ajxpNode, $shareId);
+                            $res = $result && $res;
+                        }
+                        $ajxpNode->finishedUpdatingMetadata();
+                        if($res !== false){
+
+                            $x = new SerializableResponseStream([new UserMessage($mess["share_center.216"])]);
+                            $responseInterface = $responseInterface->withBody($x);
+
+                            Controller::applyHook("msg.instant", array($ajxpNode->getContext(), "<reload_shared_elements/>"));
+
+                            if(isSet($httpVars["share_scope"]) &&  $httpVars["share_scope"] == "public"){
+                                $ajxpNode->loadNodeInfo();
+                                $diff = new NodesDiff();
+                                $diff->update($ajxpNode);
+                                $content = $diff->toXML();
+                                Controller::applyHook("msg.instant", array($ajxpNode->getContext(), $content, null, null, [$ajxpNode->getPath()]));
+                            }
+
+                        }
+                    }
+
+                }
+                break;
+
+            case "reset_counter":
+
+                if(isSet($httpVars["hash"])){
+
+                    $userId = $ctx->getUser()->getId();
+                    if(isSet($httpVars["owner_id"]) && $httpVars["owner_id"] != $userId){
+                        if(!$ctx->getUser()->isAdmin()){
+                            throw new \Exception("You are not allowed to access this resource");
+                        }
+                        $userId = $httpVars["owner_id"];
+                    }
+                    $this->getShareStore()->resetDownloadCounter($httpVars["hash"], $userId);
+
+                }else{
+
+                    $userSelection = UserSelection::fromContext($ctx, $httpVars);
+                    $ajxpNode = $userSelection->getUniqueNode();
+                    $metadata = $this->getShareStore()->getMetaManager()->getNodeMeta($ajxpNode);
+                    if(!isSet($metadata["shares"]) || !is_array($metadata["shares"])){
+                        return null;
+                    }
+                    if ( isSet($httpVars["element_id"]) && isSet($metadata["shares"][$httpVars["element_id"]])) {
+                        $this->getShareStore()->resetDownloadCounter($httpVars["element_id"], $httpVars["owner_id"]);
+                    }else{
+                        $keys = array_keys($metadata["shares"]);
+                        foreach($keys as $key){
+                            $this->getShareStore()->resetDownloadCounter($key, null);
+                        }
+                    }
+
+                }
+
+            break;
+
+            case "update_shared_element_data":
+
+                if(!in_array($httpVars["p_name"], array("counter", "tags"))){
+                    return null;
+                }
+                $hash = InputFilter::decodeSecureMagic($httpVars["element_id"]);
+                $userSelection = UserSelection::fromContext($ctx, $httpVars);
+                $ajxpNode = $userSelection->getUniqueNode();
+                if($this->getShareStore()->shareIsLegacy($hash)){
+                    // Store in metadata
+                    $metadata = $this->getShareStore()->getMetaManager()->getNodeMeta($ajxpNode);
+                    if (isSet($metadata["shares"][$httpVars["element_id"]])) {
+                        if (!is_array($metadata["shares"][$httpVars["element_id"]])) {
+                            $metadata["shares"][$httpVars["element_id"]] = array();
+                        }
+                        $metadata["shares"][$httpVars["element_id"]][$httpVars["p_name"]] = $httpVars["p_value"];
+                        // Set Private=true by default.
+                        $this->getShareStore()->getMetaManager()->setNodeMeta($ajxpNode, $metadata, true);
+                    }
+                }else{
+                    $this->getShareStore()->testUserCanEditShare(($ctx->hasUser()?$ctx->getUser()->getId():null), $hash);
+                    $this->getShareStore()->updateShareProperty($hash, $httpVars["p_name"], $httpVars["p_value"]);
+                }
+
+
+                break;
+
+            case "sharelist-load":
+
+                $itemsPerPage   = 50;
+                $crtPage        = 1;
+                $crtOffset      = 0;
+                $parentRepoId   = isset($httpVars["parent_repository_id"]) ? $httpVars["parent_repository_id"] : "";
+                $userContext    = $httpVars["user_context"];
+                $currentUser    = $ctx->getUser()->getId();
+                $clearBroken    = (isSet($httpVars["clear_broken_links"]) && $httpVars["clear_broken_links"] === "true") ? 0 : -1;
+                if($userContext == "global" && $ctx->getUser()->isAdmin()){
+                    $currentUser = false;
+                }else if($userContext == "user" && $ctx->getUser()->isAdmin() && !empty($httpVars["user_id"])){
+                    $currentUser = InputFilter::sanitize($httpVars["user_id"], InputFilter::SANITIZE_EMAILCHARS);
+                }
+                if (isSet($httpVars["dir"]) && strstr($httpVars["dir"], "%23")!==false) {
+                    $parts = explode("%23", $httpVars["dir"]);
+                    $crtPage = intval($parts[1]);
+                    $crtOffset = ($crtPage - 1) * $itemsPerPage;
+                }
+                $cursor = [$crtOffset, $itemsPerPage];
+                if($clearBroken > -1) {
+                    $cursor = null;
+                }
+                $nodes = $this->listSharesAsNodes($ctx, "/data/repositories/$parentRepoId/shares", $currentUser, $parentRepoId, $cursor, $clearBroken);
+                if($clearBroken > -1){
+                    $responseInterface = new JsonResponse(["cleared_count" => $clearBroken]);
+                    break;
+                }
+                $total = $cursor["total"];
+
+                $nodesList = new NodesList();
+                if($total > $itemsPerPage){
+                    $nodesList->setPaginationData($total, $crtPage, round($total / $itemsPerPage));
+                }
+                if($userContext == "current"){
+                    $nodesList->initColumnsData("", "", "ajxp_user.shares");
+                    $nodesList->appendColumn("ajxp_conf.8", "ajxp_label");
+                    $nodesList->appendColumn("share_center.132", "shared_element_parent_repository_label");
+                    $nodesList->appendColumn("3", "share_type_readable");
+                }else{
+                    $nodesList->initColumnsData("filelist", "list", "ajxp_conf.repositories");
+                    $nodesList->appendColumn("ajxp_conf.8", "ajxp_label");
+                    $nodesList->appendColumn("share_center.159", "owner");
+                    $nodesList->appendColumn("3", "share_type_readable");
+                    $nodesList->appendColumn("share_center.52", "share_data");
+                }
+                foreach($nodes as $node){
+                    $nodesList->addBranch($node);
+                }
+                $x = new SerializableResponseStream([$nodesList]);
+                $responseInterface = $responseInterface->withBody($x);
+
+            break;
+
+            case "sharelist-clearExpired":
+
+                $accessType = $ctx->getRepository()->getAccessType();
+                $currentUser  = ($accessType != "ajxp_conf" && $accessType != "ajxp_admin");
+                $count = $this->getShareStore()->clearExpiredFiles($currentUser);
+                if($count){
+                    $message = "Removed ".count($count)." expired links";
+                }else{
+                    $message = "Nothing to do";
+                }
+                $x = new SerializableResponseStream([new UserMessage($message)]);
+                $responseInterface = $responseInterface->withBody($x);
+
+
+            break;
+
+            default:
+            break;
+        }
+
+        return null;
+
+    }
+
+    /**************************/
+    /* CALLBACKS FOR HOOKS
+    /**************************/
+    /**
+     * Hook node.info
+     * @param AJXP_Node $ajxpNode
+     * @return void
+     */
+    public function nodeSharedMetadata(&$ajxpNode)
+    {
+        if(empty($this->accessDriver) || $this->accessDriver->getId() == "access.imap") return;
+        $shares = array();
+        $this->getShareStore()->getMetaManager()->getSharesFromMeta($ajxpNode, $shares, false);
+        if(!empty($shares)){
+            $compositeShare = $this->getShareStore()->getMetaManager()->getCompositeShareForNode($ajxpNode);
+            if(empty($compositeShare) || $compositeShare->isInvalid()){
+                //$this->getShareStore()->getMetaManager()->clearNodeMeta($ajxpNode);
+                return;
+            }
+        }
+        if(!empty($shares) && count($shares)){
+            $merge = array(
+                "ajxp_shared"      => "true",
+                "overlay_icon"     => "shared.png",
+                "overlay_class"    => "mdi mdi-share-variant"
+            );
+            // Backward compat, until we rework client-side
+            $sKeys = array_keys($shares);
+            if($shares[$sKeys[0]]["type"] == "minisite"){
+                if($ajxpNode->isLeaf()){
+                    $merge["ajxp_shared_minisite"] = "file";
+                }else{
+                    $merge["ajxp_shared_minisite"] = "public";
+                }
+            }else if($shares[$sKeys[0]]["type"] == "file"){
+                $merge["ajxp_shared_publiclet"] = "true";
+            }
+            $ajxpNode->mergeMetadata($merge, true);
+        }
+        return;
+    }
+
+    /**
+     * Hook node.change
+     * @param AJXP_Node $oldNode
+     * @param AJXP_Node $newNode
+     * @param bool $copy
+     */
+    public function updateNodeSharedData($oldNode=null, $newNode=null, $copy = false){
+
+        if($oldNode == null || $copy){
+            // Create or copy, do nothing
+            return;
+        }
+        if($oldNode != null && $newNode != null && $oldNode->getUrl() == $newNode->getUrl()){
+            // Same path => must be a content update, do nothing
+            return;
+        }
+
+        $this->logDebug("Should update node");
+        $delete = false;
+        if($newNode == null) {
+            $delete = true;
+        }else{
+            $repo = $newNode->getRepository();
+            $recycle = $repo->getContextOption($newNode->getContext(), "RECYCLE_BIN");
+            if(!empty($recycle) && strpos($newNode->getPath(), $recycle) === 1){
+                $delete = true;
+            }
+        }
+        $shareStore = $this->getShareStore();
+        $modifiedNodes = $shareStore->moveSharesFromMetaRecursive($oldNode, $delete, $oldNode->getPath(), ($newNode != null ? $newNode->getPath() : null));
+        // Force switching back to correct driver!
+        if($modifiedNodes > 0){
+            /*
+            $oldNode->getRepository()->driverInstance = null;
+            $oldNode->setDriver(null);
+            $oldNode->getDriver();
+            */
+        }         
+        return;
+
+    }
+
+    /**
+     * Hook user.after_delete
+     * make sure to clear orphan shares
+     * @param ContextInterface $ctx
+     * @param String $userId
+     */
+    public function cleanUserShares($ctx, $userId){
+        $shares = $this->getShareStore()->listShares($userId);
+        foreach($shares as $hash => $data){
+            $this->getShareStore()->deleteShare($data['SHARE_TYPE'], $hash, false, true);
+        }
+    }
+
+    /**
+     * Hook workspace.delete
+     * make sure to clear shares
+     * @param ContextInterface $ctx
+     * @param String $workspaceId
+     */
+    public function cleanWorkspaceShares($ctx, $workspaceId){
+        $shares = $this->getShareStore($ctx)->listShares('', $workspaceId);
+        foreach($shares as $hash => $data){
+            $this->getShareStore($ctx)->deleteShare($data['SHARE_TYPE'], $hash, false, true);
+        }
+    }
+
+
+    /************************************/
+    /* EVENTS FORWARDING BETWEEN
+    /* PARENTS AND CHILDREN WORKSPACES
+    /************************************/
+    /**
+     * @param AJXP_Node $node
+     * @param String|null $direction "UP", "DOWN"
+     * @return array()
+     */
+    private function findMirrorNodesInShares($node, $direction){
+        $result = array();
+        $crtContext = $node->getContext();
+        if($direction !== "UP"){
+            $upmetas = array();
+            $this->getShareStore()->getMetaManager()->collectSharesInParent($node, $upmetas);
+            foreach($upmetas as $metadata){
+                if (is_array($metadata) && !empty($metadata["shares"])) {
+                    foreach($metadata["shares"] as $sId => $sData){
+                        $type = $sData["type"];
+                        if($type == "file") continue;
+                        $wsId = $sId;
+                        if($type == "minisite"){
+                            $minisiteData = $this->getShareStore()->loadShare($sId);
+                            if(empty($minisiteData) || !isset($minisiteData["REPOSITORY"])) continue;
+                            $wsId = $minisiteData["REPOSITORY"];
+                        }else if($type == "ocs_remote"){
+                            continue;
+                        }
+                        $sharedNode = $metadata["SOURCE_NODE"];
+                        $sharedPath = substr($node->getPath(), strlen($sharedNode->getPath()));
+                        $newContext = $crtContext->withRepositoryId($wsId);
+                        $sharedNodeUrl = $newContext->getUrlBase().$sharedPath;
+                        $result[$wsId] = array(new AJXP_Node($sharedNodeUrl), "DOWN");
+                        $this->logDebug('MIRROR NODES', 'Found shared in parent - register node '.$sharedNodeUrl);
+                    }
+                }
+            }
+        }
+        if($direction !== "DOWN"){
+            if($node->getRepository()->hasParent()){
+                $parentRepoId = $node->getRepository()->getParentId();
+                $parentRepository = RepositoryService::getRepositoryById($parentRepoId);
+                if(!empty($parentRepository) && !$parentRepository->isTemplate()){
+                    $currentRoot = $node->getRepository()->getContextOption($crtContext, "PATH");
+                    $newContext = $crtContext->withRepositoryId($parentRepoId);
+                    $owner = $node->getRepository()->getOwner();
+                    if($owner !== null){
+                        $newContext = $newContext->withUserId($owner);
+                    }
+                    $parentRoot = $parentRepository->getContextOption($newContext, "PATH");
+                    $relative = substr($currentRoot, strlen($parentRoot));
+                    $parentNodeURL = $newContext->getUrlBase().$relative.$node->getPath();
+                    $this->logDebug("action.share", "Should trigger on ".$parentNodeURL);
+                    $parentNode = new AJXP_Node($parentNodeURL);
+                    $result[$parentRepoId] = array($parentNode, "UP");
+                }
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * @param null $fromMirrors
+     * @param null $toMirrors
+     * @param bool $copy
+     * @param null $direction
+     * @throws \Exception
+     */
+    private function applyForwardEvent($fromMirrors = null, $toMirrors = null, $copy = false, $direction = null){
+        if($fromMirrors === null){
+            // Create
+            foreach($toMirrors as $mirror){
+                list($node, $direction) = $mirror;
+                Controller::applyHook("node.change", array(null, $node, false, $direction), true);
+            }
+        }else if($toMirrors === null){
+            foreach($fromMirrors as $mirror){
+                list($node, $direction) = $mirror;
+                Controller::applyHook("node.change", array($node, null, false, $direction), true);
+            }
+        }else{
+            foreach($fromMirrors as $repoId => $mirror){
+                list($fNode, $fDirection) = $mirror;
+                if(isSet($toMirrors[$repoId])){
+                    list($tNode, $tDirection) = $toMirrors[$repoId];
+                    unset($toMirrors[$repoId]);
+                    try{
+                        Controller::applyHook("node.change", array($fNode, $tNode, $copy, $fDirection), true);
+                    }catch(\Exception $e){
+                        $this->logError(__FUNCTION__, "Error while applying node.change hook (".$e->getMessage().")");
+                    }
+                }else{
+                    try{
+                    Controller::applyHook("node.change", array($fNode, null, $copy, $fDirection), true);
+                    }catch(\Exception $e){
+                        $this->logError(__FUNCTION__, "Error while applying node.change hook (".$e->getMessage().")");
+                    }
+                }
+            }
+            foreach($toMirrors as $mirror){
+                list($tNode, $tDirection) = $mirror;
+                try{
+                Controller::applyHook("node.change", array(null, $tNode, $copy, $tDirection), true);
+                }catch(\Exception $e){
+                    $this->logError(__FUNCTION__, "Error while applying node.change hook (".$e->getMessage().")");
+                }
+            }
+        }
+
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $fromNode
+     * @param AJXP_Node $toNode
+     * @param bool $copy
+     * @param String $direction
+     */
+    public function forwardEventToShares($fromNode=null, $toNode=null, $copy = false, $direction=null){
+
+        $refNode = ($fromNode != null ? $fromNode : $toNode);// cannot be both null
+        if(empty($direction) && $this->getContextualOption($refNode->getContext(), "FORK_EVENT_FORWARDING")){
+            CliRunner::applyActionInBackground(
+                $refNode->getContext(),
+                "forward_change_event",
+                array(
+                    "from" => $fromNode === null ? "" : $fromNode->getUrl(),
+                    "to" => $toNode === null ? "" : $toNode->getUrl(),
+                    "copy" => $copy ? "true" : "false",
+                    "direction" => $direction
+                ));
+            return;
+        }
+
+        $fromMirrors = null;
+        $toMirrors = null;
+        if($fromNode != null){
+            $fromMirrors = $this->findMirrorNodesInShares($fromNode, $direction);
+        }
+        if($toNode != null){
+            $toMirrors = $this->findMirrorNodesInShares($toNode, $direction);
+        }
+
+        $this->applyForwardEvent($fromMirrors, $toMirrors, $copy, $direction);
+        if(count($fromMirrors) || count($toMirrors)){
+            // Make sure to switch back to correct repository in memory
+            if($fromNode != null) {
+                $fromNode->getRepository()->driverInstance = null;
+                $fromNode->setDriver(null);
+                $fromNode->getDriver();
+            }else if($toNode != null){
+                $toNode->getRepository()->driverInstance = null;
+                $toNode->setDriver(null);
+                $toNode->getDriver();
+            }
+        }
+    }
+
+    /**
+     * @param $actionName
+     * @param $httpVars
+     * @param $fileVars
+     */
+    public function forwardEventToSharesAction($actionName, $httpVars, $fileVars){
+
+        $fromMirrors = null;
+        $toMirrors = null;
+        $fromNode = $toNode = null;
+        if(!empty($httpVars["from"])){
+            $fromNode = new AJXP_Node($httpVars["from"]);
+            $fromMirrors = $this->findMirrorNodesInShares($fromNode, $httpVars["direction"]);
+        }
+        if(!empty($httpVars["to"])){
+            $toNode = new AJXP_Node($httpVars["to"]);
+            $toMirrors = $this->findMirrorNodesInShares($toNode, $httpVars["direction"]);
+        }
+        $this->applyForwardEvent($fromMirrors, $toMirrors, ($httpVars["copy"] === "true"), $httpVars["direction"]);
+        if(count($fromMirrors) || count($toMirrors)){
+            // Make sure to switch back to correct repository in memory
+            if($fromNode != null) {
+                $fromNode->getRepository()->driverInstance = null;
+                $fromNode->setDriver(null);
+                $fromNode->getDriver();
+            }else if($toNode != null){
+                $toNode->getRepository()->driverInstance = null;
+                $toNode->setDriver(null);
+                $toNode->getDriver();
+            }
+        }
+    }
+
+    /**************************/
+    /* CREATE / EDIT SHARES
+    /**************************/
+
+    /**
+     * @param array $httpVars
+     * @param UserSelection $userSelection
+     * @return int
+     * @throws \Exception
+     */
+    public function filterHttpVarsForLeafPath(&$httpVars, $userSelection){
+        // ANALYSE SELECTION
+        // TO CREATE PROPER FILTER / PATH FOR SHARED REPO
+        $httpVars["minisite"] = true;
+        $httpVars["selection"] = true;
+        $setFilter = false;
+        if($userSelection->isUnique()){
+            $node = $userSelection->getUniqueNode();
+            $node->loadNodeInfo();
+            if($node->isLeaf()){
+                $setFilter = true;
+                $httpVars["file"] = "/";
+                $httpVars["nodes"] = array("/");
+            }
+        }else{
+            $setFilter = true;
+        }
+        $nodes = $userSelection->buildNodes();
+        $hasDir = false; $hasFile = false;
+        foreach($nodes as $n){
+            $n->loadNodeInfo();
+            if($n->isLeaf()) $hasFile = true;
+            else $hasDir = true;
+        }
+        if( ( $hasDir && !$this->getAuthorization($this->currentContext, "folder", "minisite") )
+            || ($hasFile && !$this->getAuthorization($this->currentContext, "file"))){
+            throw new \Exception(103);
+        }
+        if($setFilter){ // Either it's a file, or many nodes are shared
+            $httpVars["filter_nodes"] = $nodes;
+        }
+        if(!isSet($httpVars["repo_label"])){
+            $first = $userSelection->getUniqueNode();
+            $httpVars["repo_label"] = $first->getLabel();
+        }
+
+    }
+
+    /**
+     * @param array $httpVars
+     * @param AJXP_Node $ajxpNode
+     */
+    public function filterHttpVarsFromUniqueNode(&$httpVars, $ajxpNode){
+        $httpVars["minisite"] = true;
+        $httpVars["selection"] = true;
+        if($ajxpNode->isLeaf()){
+            $httpVars["filter_nodes"] = [$ajxpNode];
+            $httpVars["file"] = "/";
+            $httpVars["nodes"] = array("/");
+        }
+        if(!isSet($httpVars["repo_label"])){
+            $httpVars["repo_label"] = $ajxpNode->getLabel();
+        }
+    }
+
+    /**
+     * @param array $httpVars
+     * @param bool $update
+     * @return Repository
+     * @throws \Exception
+     */
+    protected function createOrLoadSharedRepository($httpVars, &$update){
+
+        if (!isSet($httpVars["repo_label"]) || $httpVars["repo_label"] == "") {
+            $mess = LocaleService::getMessages();
+            throw new \Exception($mess["349"]);
+        }
+
+        if (isSet($httpVars["repository_id"])) {
+            $editingRepo = RepositoryService::getRepositoryById($httpVars["repository_id"]);
+            $update = true;
+        }
+
+        // CHECK REPO DOES NOT ALREADY EXISTS WITH SAME LABEL
+        $label = InputFilter::sanitize(InputFilter::securePath($httpVars["repo_label"]), InputFilter::SANITIZE_HTML);
+        $description = InputFilter::sanitize(InputFilter::securePath($httpVars["repo_description"]), InputFilter::SANITIZE_HTML);
+        $exists = $this->checkRepoWithSameLabel($label, isSet($editingRepo)?$editingRepo:null);
+        if($exists){
+            $mess = LocaleService::getMessages();
+            throw new \Exception($mess["share_center.352"]);
+        }
+
+        $loggedUser = $this->currentContext->getUser();
+        $currentRepo = $this->currentContext->getRepository();
+
+        if (isSet($editingRepo)) {
+
+            $this->getShareStore()->testUserCanEditShare($editingRepo->getOwner(), $editingRepo->options);
+            $newRepo = $editingRepo;
+            $replace = false;
+            if ($editingRepo->getDisplay() != $label) {
+                $newRepo->setDisplay($label);
+                $replace = true;
+            }
+            if($editingRepo->getDescription() != $description){
+                $newRepo->setDescription($description);
+                $replace = true;
+            }
+            $newScope = ((isSet($httpVars["share_scope"]) && $httpVars["share_scope"] == "public") ? "public" : "private");
+            $oldScope = $editingRepo->getSafeOption("SHARE_ACCESS");
+            $currentOwner = $editingRepo->getOwner();
+            if($newScope != $oldScope && $currentOwner != $loggedUser->getId()){
+                $mess = LocaleService::getMessages();
+                throw new \Exception($mess["share_center.224"]);
+            }
+            if($newScope !== $oldScope){
+                $editingRepo->addOption("SHARE_ACCESS", $newScope);
+                $replace = true;
+            }
+            if(isSet($httpVars["transfer_owner"])){
+                $newOwner = $httpVars["transfer_owner"];
+                if($newOwner != $currentOwner && $currentOwner != $loggedUser->getId()){
+                    $mess = LocaleService::getMessages();
+                    throw new \Exception($mess["share_center.224"]);
+                }
+                $editingRepo->setOwnerData($editingRepo->getParentId(), $newOwner, $editingRepo->getUniqueUser());
+                $replace = true;
+            }
+
+            if($replace) {
+                RepositoryService::replaceRepository($newRepo->getId(), $newRepo);
+            }
+
+        } else {
+
+            $options = $this->accessDriver->makeSharedRepositoryOptions($this->currentContext, $httpVars);
+            // TMP TESTS
+            $options["SHARE_ACCESS"] = $httpVars["share_scope"];
+            $newRepo = $currentRepo->createSharedChild(
+                $label,
+                $options,
+                $currentRepo->getId(),
+                $loggedUser->getId(),
+                null
+            );
+            $gPath = $loggedUser->getGroupPath();
+            if (!empty($gPath) && !ConfService::getContextConf($this->currentContext, "CROSSUSERS_ALLGROUPS", "conf")) {
+                $newRepo->setGroupPath($gPath);
+            }
+            $newRepo->setDescription($description);
+            if(isSet($httpVars["filter_nodes"])){
+                $newRepo->setContentFilter(new ContentFilter($httpVars["filter_nodes"]));
+            }
+            RepositoryService::addRepository($newRepo);
+        }
+        return $newRepo;
+
+    }
+
+    /**
+     * @param array $httpVars
+     * @param bool $update
+     * @return mixed An array containing the hash (0) and the generated url (1)
+     * @throws \Exception
+     */
+    public function createSharedMinisite($httpVars, &$update)
+    {
+        // PREPARE HIDDEN USER DATA
+        if(isSet($httpVars["hash"])){
+            $shareObject = $this->getShareStore()->loadShareObject($httpVars["hash"]);
+        }else{
+            $shareObject = $this->getShareStore()->createEmptyShareObject();
+        }
+        $shareObject->parseHttpVars($httpVars);
+        $hiddenUserEntry = $this->getRightsManager()->prepareSharedUserEntry(
+            $httpVars,
+            $shareObject,
+            isSet($httpVars["hash"]),
+            (isSet($httpVars["guest_user_pass"])?$httpVars["guest_user_pass"]:null)
+        );
+        $userSelection = UserSelection::fromContext($this->currentContext, $httpVars);
+
+        $this->filterHttpVarsForLeafPath($httpVars, $userSelection);
+
+        $users = array(); $groups = array();
+        $users[$hiddenUserEntry["ID"]] = $hiddenUserEntry;
+
+        $newRepo = $this->createSharedRepository($httpVars, $repoUpdate, $users, $groups);
+
+        $shareObject->setParentRepositoryId($this->repository->getId());
+        $shareObject->attachToRepository($newRepo->getId());
+        // STORE DATA & HASH IN SHARE STORE
+        $hash = $shareObject->save();
+        $url = $this->getPublicAccessManager()->buildPublicLink($hash);
+        $existingShortForm = $shareObject->getShortFormUrl();
+        if(empty($existingShortForm)){
+            $shortForm = "";
+            Controller::applyHook("url.shorten", array($this->currentContext, $url, &$shortForm));
+            if(!empty($shortForm)){
+                $shareObject->setShortFormUrl($shortForm);
+                $shareObject->save();
+            }
+        }
+
+        // LOG AND PUBLISH EVENT
+        $update = isSet($httpVars["repository_id"]);
+        $data = $shareObject->getData();
+        
+        $this->logInfo(($update?"Update":"New")." Share", array(
+            "file" => "'".$userSelection->getUniqueFile()."'",
+            "files" => $userSelection->getFiles(),
+            "url" => $url,
+            "expiration" => $data["EXPIRATE_TIME"],
+            "limit" => $data['DOWNLOAD_LIMIT'],
+            "repo_uuid" => $this->repository->getId()
+        ));
+        Controller::applyHook("node.share.".($update?"update":"create"), [$userSelection->getUniqueNode(), array(
+            'type' => 'minisite',
+            'repository' => &$this->repository,
+            'accessDriver' => &$this->accessDriver,
+            'data' => &$data,
+            'url' => $url,
+            'new_repository' => &$newRepo
+        )]);
+
+        return array($hash, $url);
+    }
+
+    /**
+     * @param array $httpVars
+     * @param bool $update
+     * @param array $users
+     * @param array $groups
+     * @return Repository
+     * @throws \Exception
+     */
+    public function createSharedRepository($httpVars, &$update, $users=array(), $groups=array())
+    {
+        // ERRORS
+        // 100 : missing args
+        // 101 : repository label already exists
+        // 102 : user already exists
+        // 103 : current user is not allowed to share
+        // SUCCESS
+        // 200
+        $loggedUser = $this->currentContext->getUser();
+        $currentRepo = $this->currentContext->getRepository();
+        $actRights = $loggedUser->getMergedRole()->listActionsStatesFor($currentRepo);
+        if (isSet($actRights["share"]) && $actRights["share"] === false) {
+            $mess = LocaleService::getMessages();
+            throw new \Exception($mess["351"]);
+        }
+
+        $newRepo = $this->createOrLoadSharedRepository($httpVars, $update);
+
+        $selection = UserSelection::fromContext($this->currentContext, $httpVars);
+        $this->getRightsManager()->assignSharedRepositoryPermissions($currentRepo, $newRepo, $update, $users, $groups, $selection);
+
+        // HANDLE WATCHES ON CHILDREN AND PARENT
+        foreach($users as $userName => $userEntry){
+            $this->toggleWatchOnSharedRepository(
+                $newRepo->getId(),
+                $userName,
+                $userEntry["WATCH"],
+                $loggedUser->getId()
+            );
+        }
+        $this->toggleWatchOnSharedRepository(
+            $newRepo->getId(),
+            $loggedUser->getId(),
+            ($httpVars["self_watch_folder"] == "true")
+        );
+
+        $this->logInfo(($update?"Update":"New")." Share", array(
+            "file" => "'".$selection->getUniqueFile()."'",
+            "files" => $selection->getFiles(),
+            "repo_uuid" => $currentRepo->getId(),
+            "shared_repo_uuid" => $newRepo->getId()
+        ));
+
+        return $newRepo;
+    }
+
+    /**
+     * @param array $linkData
+     * @param array $hiddenUserEntries
+     * @param array $shareObjects
+     * @param string $type
+     * @param string $invitationLabel
+     * @return Model\ShareLink
+     * @throws \Exception
+     */
+    protected function shareObjectFromParameters($linkData, &$hiddenUserEntries, &$shareObjects,  $type = "public", $invitationLabel = ""){
+
+        if(isSet($linkData["hash"])){
+            $link = $this->getShareStore()->loadShareObject($linkData["hash"]);
+        }else{
+            if($type == "public"){
+                $link = $this->getShareStore()->createEmptyShareObject();
+            }else{
+                $link = new TargettedLink($this->getShareStore());
+                if(UsersService::usersEnabled()) {
+                    $link->setOwnerId($this->currentContext->getUser()->getId());
+                }
+                $link->prepareInvitation($linkData["HOST"], $linkData["USER"], $invitationLabel);
+            }
+        }
+        $link->parseHttpVars($linkData);
+        $hiddenUserEntries[] = $this->getRightsManager()->prepareSharedUserEntry(
+            $linkData,
+            $link,
+            isSet($linkData["hash"]),
+            (isSet($linkData["guest_user_pass"])?$linkData["guest_user_pass"]:null)
+        );
+        $shareObjects[] = $link;
+
+    }
+
+    /**
+     * @param AJXP_Node $ajxpNode
+     * @param array $httpVars
+     * @param bool $update
+     * @return Repository[]|ShareLink[]
+     * @throws \Exception
+     */
+    public function shareNode(ContextInterface $ctx, $ajxpNode, $httpVars, &$update){
+
+        $hiddenUserEntries = array();
+        $originalHttpVars = $httpVars;
+        $ocsStore = new OCS\Model\SQLStore();
+        $ocsClient = new OCS\Client\OCSClient();
+        $userSelection = UserSelection::fromContext($ctx, $httpVars);
+        $mess = LocaleService::getMessages();
+
+        /**
+         * @var ShareLink[] $shareObjects
+         */
+        $shareObjects = array();
+
+        // PUBLIC LINK
+        if(isSet($httpVars["enable_public_link"])){
+            if(!$this->getAuthorization($ctx, $ajxpNode->isLeaf() ? "file":"folder", "minisite")){
+                throw new \Exception($mess["share_center." . ($ajxpNode->isLeaf() ? "225" : "226")]);
+            }
+            $this->shareObjectFromParameters($httpVars, $hiddenUserEntries, $shareObjects, "public");
+        }else if(isSet($httpVars["disable_public_link"])){
+            $this->getShareStore()->deleteShare("minisite", $httpVars["disable_public_link"], true);
+        }
+
+        if(isSet($httpVars["ocs_data"])){
+            $ocsData = json_decode($httpVars["ocs_data"], true);
+            $removeLinks = $ocsData["REMOVE"];
+            foreach($removeLinks as $linkHash){
+                // Delete Link, delete invitation(s)
+                $this->getShareStore()->deleteShare("minisite", $linkHash, true);
+                $invitations = $ocsStore->invitationsForLink($linkHash);
+                foreach($invitations as $invitation){
+                    $ocsStore->deleteInvitation($invitation);
+                    $ocsClient->cancelInvitation($invitation);
+                }
+            }
+            $newLinks = $ocsData["LINKS"];
+            foreach($newLinks as $linkData){
+                $this->shareObjectFromParameters($linkData, $hiddenUserEntries, $shareObjects, "targetted", $userSelection->getUniqueNode()->getLabel());
+            }
+        }
+
+        $this->filterHttpVarsFromUniqueNode($httpVars, $ajxpNode);
+
+        $users = array(); $groups = array();
+        $this->getRightsManager()->createUsersFromParameters($httpVars, $users, $groups);
+        if((count($users) || count($groups)) && !$this->getAuthorization($ctx, $ajxpNode->isLeaf()?"file":"folder", "workspace")){
+            $users = $groups = array();
+        }
+        foreach($hiddenUserEntries as $entry){
+            $users[$entry["ID"]] = $entry;
+        }
+
+        if(!count($users) && !count($groups)){
+            ob_start();
+            unset($originalHttpVars["hash"]);
+            $request = Controller::executableRequest($ctx, "unshare", $originalHttpVars);
+            $this->switchAction($request, new Response());
+            ob_end_clean();
+            return null;
+        }
+
+        $newRepo = $this->createSharedRepository($httpVars, $update, $users, $groups);
+
+        foreach($shareObjects as $shareObject){
+
+            $shareObject->setParentRepositoryId($ctx->getRepositoryId());
+            $shareObject->attachToRepository($newRepo->getId());
+            $shareObject->save();
+            if($shareObject instanceof \Pydio\OCS\Model\TargettedLink){
+                $invitation = $shareObject->getPendingInvitation();
+                if(!empty($invitation)){
+                    $ocsStore->generateInvitationId($invitation);
+                    try{
+                        $ocsClient->sendInvitation($invitation);
+                    }catch (\Exception $e){
+                        $this->getShareStore()->deleteShare("minisite", $shareObject->getHash(), true);
+                        $shareUserId = $shareObject->getUniqueUser();
+                        unset($users[$shareUserId]);
+                        if(!count($users) && !count($groups)){
+                            $this->getShareStore()->deleteShare("repository", $newRepo->getId());
+                        }
+                        throw $e;
+                    }
+                    $ocsStore->storeInvitation($invitation);
+                }
+            }else{
+                $url = $this->getPublicAccessManager()->buildPublicLink($shareObject->getHash());
+                $existingShortForm = $shareObject->getShortFormUrl();
+                if(empty($existingShortForm)){
+                    $shortForm = "";
+                    Controller::applyHook("url.shorten", array($ctx, $url, &$shortForm));
+                    if(!empty($shortForm)){
+                        $shareObject->setShortFormUrl($shortForm);
+                        $shareObject->save();
+                    }
+                }
+            }
+
+        }
+        $shareObjects[] = $newRepo;
+        return $shareObjects;
+
+    }
+
+    /**************************/
+    /* LISTING FUNCTIONS
+    /**************************/
+    /**
+     * @param bool|string $currentUser if true, currently logged user. if false all users. If string, user ID.
+     * @param string $parentRepositoryId
+     * @param null $cursor
+     * @return array
+     */
+    public function listShares($currentUser, $parentRepositoryId="", &$cursor = null){
+        if($currentUser === false){
+            $crtUser = "";
+        }else {
+            $crtUser = $currentUser;
+        }
+        return $this->getShareStore()->listShares($crtUser, $parentRepositoryId, $cursor);
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $rootPath
+     * @param bool|string $currentUser if true, currently logged user. if false all users. If string, user ID.
+     * @param string $parentRepositoryId
+     * @param null $cursor
+     * @param int $clearBroken
+     * @return AJXP_Node[]
+     */
+    public function listSharesAsNodes(ContextInterface $ctx, $rootPath, $currentUser, $parentRepositoryId = "", &$cursor = null, &$clearBroken = -1){
+
+        $shares =  $this->listShares($currentUser, $parentRepositoryId, $cursor);
+        $nodes = array();
+        $parent = RepositoryService::getRepositoryById($parentRepositoryId);
+
+        foreach($shares as $hash => $shareData){
+
+            $icon = "folder";
+            $meta = array(
+                "icon"			=> $icon,
+                "openicon"		=> $icon,
+                "ajxp_mime" 	=> "repository_editable"
+            );
+
+            $shareType = $shareData["SHARE_TYPE"];
+            $meta["share_type"] = $shareType;
+            $meta["ajxp_shared"] = true;
+
+            if(!is_object($shareData["REPOSITORY"])){
+
+                $repoId = $shareData["REPOSITORY"];
+                $repoObject = RepositoryService::getRepositoryById($repoId);
+                if($repoObject == null){
+                    $meta["text"] = "Invalid link";
+                    if($clearBroken > -1){
+                        $this->getShareStore($ctx)->deleteShare($shareType, $hash, false, true);
+                        $clearBroken ++;
+                    }
+                    continue;
+                }
+                $meta["text"] = $repoObject->getDisplay();
+                $permissions = $this->getRightsManager()->computeSharedRepositoryAccessRights($repoId, true, null);
+                $regularUsers = count(array_filter($permissions, function($a){
+                    return (!isSet($a["HIDDEN"]) || $a["HIDDEN"] == false);
+                })) > 0;
+                $hiddenUsers = count(array_filter($permissions, function($a){
+                    return (isSet($a["HIDDEN"]) && $a["HIDDEN"] == true);
+                })) > 0;
+                if($regularUsers && $hiddenUsers){
+                    $meta["share_type_readable"] = "Public Link & Internal Users";
+                }elseif($regularUsers){
+                    $meta["share_type_readable"] = "Internal Users";
+                }else if($hiddenUsers){
+                    $meta["share_type_readable"] = "Public Link";
+                }else{
+                    $meta["share_type_readable"] =  $repoObject->hasContentFilter() ? "Public Link" : ($shareType == "repository"? "Internal Users": "Public Link");
+                    if(isSet($shareData["LEGACY_REPO_OR_MINI"])){
+                        $meta["share_type_readable"] = "Internal Only";
+                    }
+                }
+                $meta["share_data"] = ($shareType == "repository" ? 'Shared as workspace: '.$repoObject->getDisplay() : $this->getPublicAccessManager()->buildPublicLink($hash));
+                $meta["shared_element_hash"] = $hash;
+                $meta["owner"] = $repoObject->getOwner();
+                $meta["shared_element_parent_repository"] = $repoObject->getParentId();
+                if(!empty($parent)) {
+                    $ctx = new Context($meta["owner"], $parent->getId());
+                    $parentPath = $parent->getContextOption($ctx, "PATH");
+                    $meta["shared_element_parent_repository_label"] = $parent->getDisplay();
+                }else{
+                    $crtParent = RepositoryService::getRepositoryById($repoObject->getParentId());
+                    if(!empty($crtParent)){
+                        $ctx = new Context($meta["owner"], $repoObject->getParentId());
+                        $parentPath = $crtParent->getContextOption($ctx, "PATH");
+                        $meta["shared_element_parent_repository_label"] = $crtParent->getDisplay();
+                    }else {
+                        $meta["shared_element_parent_repository_label"] = $repoObject->getParentId();
+                    }
+                }
+                if($repoObject->hasContentFilter()){
+                    $meta["ajxp_shared_minisite"] = "file";
+                    $meta["icon"] = "mime_empty.png";
+                    $meta["fonticon"] = "file";
+                    $meta["original_path"] = array_pop(array_keys($repoObject->getContentFilter()->filters));
+                }else{
+                    $meta["ajxp_shared_minisite"] = "public";
+                    $meta["icon"] = "folder.png";
+                    $meta["fonticon"] = "folder";
+                    $ctx = $ctx->withRepositoryId($repoObject->getId());
+                    $meta["original_path"] = $repoObject->getContextOption($ctx, "PATH");
+                }
+                if(!empty($parentPath) &&  strpos($meta["original_path"], $parentPath) === 0){
+                    $meta["original_path"] = substr($meta["original_path"], strlen($parentPath));
+                }
+                try{
+                    // Test node really exists
+                    $originalNode = new AJXP_Node("pydio://".$meta["owner"]."@".$meta["shared_element_parent_repository"].$meta["original_path"]);
+                    $test = @file_exists($originalNode->getUrl());
+                    if(!$test){
+                        if($clearBroken > -1){
+                            $this->getShareStore($ctx)->deleteShare($shareType, $hash);
+                            $clearBroken ++;
+                        }else{
+                            $meta["broken_link"] = true;
+                            $meta["original_path"] .= " (BROKEN)";
+                        }
+                    }
+                }catch(\Exception $e){}
+
+            }else if($shareData["REPOSITORY"] instanceof Repository && !empty($shareData["FILE_PATH"])){
+
+                $meta["owner"] = $shareData["OWNER_ID"];
+                $meta["share_type_readable"] = "Publiclet (legacy)";
+                $meta["text"] = basename($shareData["FILE_PATH"]);
+                $meta["icon"] = "mime_empty.png";
+                $meta["fonticon"] = "file";
+                $meta["share_data"] = $meta["copy_url"] = $this->getPublicAccessManager()->buildPublicLink($hash);
+                $meta["share_link"] = true;
+                $meta["shared_element_hash"] = $hash;
+                $meta["ajxp_shared_publiclet"] = $hash;
+
+            }else{
+
+                continue;
+
+            }
+            $nodes[] = new AJXP_Node($rootPath."/".$hash, $meta);
+
+        }
+
+        return $nodes;
+
+
+    }
+
+    /**
+     * @param CompositeShare $compositeShare
+     * @return array
+     */
+    public function compositeShareToJson(ContextInterface $ctx, $compositeShare){
+
+        $repoId = $compositeShare->getRepositoryId();
+        $repo = $compositeShare->getRepository();
+        $messages = LocaleService::getMessages();
+
+        $notExistsData = array(
+            "error"         => true,
+            "repositoryId"  => $repoId,
+            "users_number"  => 0,
+            "label"         => "Error - Cannot find shared data",
+            "description"   => "Cannot find repository",
+            "entries"       => array(),
+            "element_watch" => false,
+            "repository_url"=> ""
+        );
+
+        if($repoId == null || $repo == null){
+            //CLEAR AND ASSOCIATED LINKS HERE ?
+            //$this->getShareStore()->getMetaManager()->removeShareFromMeta($node, $shareId);
+            return $notExistsData;
+        }
+        try{
+            $this->getShareStore()->testUserCanEditShare($compositeShare->getOwner(), array("SHARE_ACCESS" => $compositeShare->getVisibilityScope()));
+        }catch(\Exception $e){
+            $notExistsData["label"] = $e->getMessage();
+            return $notExistsData;
+        }
+
+        $jsonData = $compositeShare->toJson($ctx, $this->watcher, $this->getRightsManager(), $this->getPublicAccessManager(), $messages);
+        if($jsonData === false){
+            return $notExistsData;
+        }
+        return $jsonData;
+
+    }
+
+    /**
+     * @param String $shareId
+     * @param array $shareMeta
+     * @param AJXP_Node $node
+     * @throws \Exception
+     * @return array|bool
+     */
+    public function shareToJson(ContextInterface $ctx, $shareId, $shareMeta, $node = null){
+
+        $messages = LocaleService::getMessages();
+        $jsonData = array();
+        $elementWatch = false;
+        if($shareMeta["type"] == "file"){
+
+            $jsonData = LegacyPubliclet::publicletToJson(
+                $ctx,
+                $shareId,
+                $shareMeta,
+                $this->getShareStore(),
+                $this->getPublicAccessManager(),
+                $this->watcher,
+                $node
+            );
+
+        }else if($shareMeta["type"] == "minisite" || $shareMeta["type"] == "repository"){
+
+            $repoId = $shareId;
+            if(strpos($repoId, "repo-") === 0){
+                // Legacy
+                $repoId = str_replace("repo-", "", $repoId);
+                $shareMeta["type"] = "repository";
+            }
+
+            $minisite = ($shareMeta["type"] == "minisite");
+            if ($minisite) {
+                $shareLink = $this->getShareStore()->loadShareObject($shareId);
+                $repoId = $shareLink->getRepositoryId();
+            }
+            $notExistsData = array(
+                "error"         => true,
+                "repositoryId"  => $repoId,
+                "users_number"  => 0,
+                "label"         => "Error - Cannot find shared data",
+                "description"   => "Cannot find repository",
+                "entries"       => array(),
+                "element_watch" => false,
+                "repository_url"=> ""
+            );
+
+            $repo = RepositoryService::getRepositoryById($repoId);
+            if($repoId == null || ($repo == null && $node != null)){
+                if($minisite){
+                    $this->getShareStore()->getMetaManager()->removeShareFromMeta($node, $shareId);
+                }
+                return $notExistsData;
+            }
+            try{
+                $this->getShareStore()->testUserCanEditShare($repo->getOwner(), $repo->options);
+            }catch(\Exception $e){
+                $notExistsData["label"] = $e->getMessage();
+                return $notExistsData;
+            }
+            $watchNode = new AJXP_Node($ctx->withRepositoryId($repoId)->getUrlBase()."/");
+            if ($this->watcher != false && $node != null) {
+                $elementWatch = $this->watcher->hasWatchOnNode(
+                    $watchNode,
+                    $ctx->hasUser()?$ctx->getUser()->getId():"shared",
+                    WatchRegister::$META_WATCH_NAMESPACE
+                );
+            }
+            if($node != null){
+                $sharedEntries = $this->getRightsManager()->computeSharedRepositoryAccessRights($repoId, true, $watchNode);
+            }else{
+                $sharedEntries = $this->getRightsManager()->computeSharedRepositoryAccessRights($repoId, true, null);
+            }
+            if(empty($sharedEntries) && $minisite){
+                $this->getShareStore()->getMetaManager()->removeShareFromMeta($node, $shareId);
+                return $notExistsData;
+            }
+            $cFilter = $repo->getContentFilter();
+            if(!empty($cFilter)){
+                $cFilter = $cFilter->toArray();
+            }
+            $jsonData = array(
+                "repositoryId"  => $repoId,
+                "users_number"  => UsersService::countUsersForRepository($ctx, $repoId),
+                "label"         => $repo->getDisplay(),
+                "description"   => $repo->getDescription(),
+                "entries"       => $sharedEntries,
+                "element_watch" => $elementWatch,
+                "repository_url"=> ApplicationState::getWorkspaceShortcutURL($repo) ."/",
+                "content_filter"=> $cFilter,
+                "share_owner"   => $repo->getOwner(),
+                "share_scope"    => (isSet($repo->options["SHARE_ACCESS"]) ? $repo->options["SHARE_ACCESS"] : "private")
+            );
+            if($minisite && isSet($shareLink)){
+                $shareLink->setAdditionalMeta($shareMeta);
+                $jsonData["minisite"] = $shareLink->getJsonData($this->getPublicAccessManager(), $messages);
+            }
+
+        }
+
+
+        return $jsonData;
+
+    }
+
+
+}
diff --git a/core/src/plugins/action.share/src/Store/ShareMetaManager.php b/core/src/plugins/action.share/src/Store/ShareMetaManager.php
new file mode 100644
index 0000000000..7339ef7e15
--- /dev/null
+++ b/core/src/plugins/action.share/src/Store/ShareMetaManager.php
@@ -0,0 +1,291 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Share\Store;
+
+use Pydio\Access\Core\Model\AJXP_Node;
+
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Share\Model\CompositeShare;
+use Pydio\Share\Model\ShareLink;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+define('AJXP_SHARED_META_NAMESPACE', 'ajxp_shared');
+
+/**
+ * Class ShareMetaManager
+ * Metadata manager for shares data
+ * @package Pydio\Share\Store
+ */
+class ShareMetaManager
+{
+    /**
+     * @var ShareStore
+     */
+    var $shareStore;
+
+    /**
+     * ShareMetaManager constructor.
+     * @param ShareStore $shareStore
+     */
+    public function __construct($shareStore){
+        $this->shareStore = $shareStore;
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     * @return array mixed
+     */
+    public function getNodeMeta($node){
+        $private = $node->retrieveMetadata(AJXP_SHARED_META_NAMESPACE, true, AJXP_METADATA_SCOPE_REPOSITORY, true);
+        $shared  = $node->retrieveMetadata(AJXP_SHARED_META_NAMESPACE, false, AJXP_METADATA_SCOPE_REPOSITORY, true);
+        return array_merge_recursive($private, $shared);
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     * @param array $meta
+     * @param bool $private
+     */
+    public function setNodeMeta($node, $meta, $private = true){
+        $otherScope = ! $private;
+        $otherScopeMeta = $node->retrieveMetadata(AJXP_SHARED_META_NAMESPACE, $otherScope, AJXP_METADATA_SCOPE_REPOSITORY, true);
+        // The scope has changed. Let's clear the old value
+        if(count($otherScopeMeta)){
+            $node->removeMetadata(AJXP_SHARED_META_NAMESPACE, $otherScope, AJXP_METADATA_SCOPE_REPOSITORY, true);
+        }
+        $node->ajxp_shared = "true";
+        $node->setMetadata(AJXP_SHARED_META_NAMESPACE, $meta, $private, AJXP_METADATA_SCOPE_REPOSITORY, true);
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     */
+    public function clearNodeMeta($node){
+        // Try to remove both scopes
+        $node->removeMetadata(AJXP_SHARED_META_NAMESPACE, true, AJXP_METADATA_SCOPE_REPOSITORY, true);
+        $node->removeMetadata(AJXP_SHARED_META_NAMESPACE, false, AJXP_METADATA_SCOPE_REPOSITORY, true);
+    }
+
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     * @param $shareType
+     * @param $shareId
+     * @param $publicScope
+     * @param string|null $originalShareId
+     */
+    public function addShareInMeta($node, $shareType, $shareId, $publicScope, $originalShareId=null){
+        $shares = array();
+        $this->shareStore->getMetaManager()->getSharesFromMeta($node, $shares, false);
+        if(empty($shares)){
+            $shares = array();
+        }
+        if(!empty($shares) && $originalShareId !== null && isSet($shares[$originalShareId])){
+            unset($shares[$originalShareId]);
+        }
+        $shares[$shareId] = array("type" => $shareType);
+        $this->setNodeMeta($node, array("shares" => $shares), !$publicScope);
+    }
+
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     * @param $shareId
+     */
+    public function removeShareFromMeta($node, $shareId){
+        $shares = array();
+        $this->shareStore->getMetaManager()->getSharesFromMeta($node, $shares);
+        if(!empty($shares) && isSet($shares[$shareId])){
+            unset($shares[$shareId]);
+            if(count($shares)){
+                $this->setNodeMeta($node, array("shares" => $shares));
+            }else{
+                $this->clearNodeMeta($node);
+            }
+        }
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     * @param $metas
+     */
+    public function collectSharesInParent($node, &$metas){
+        $node->collectMetadataInParents(AJXP_SHARED_META_NAMESPACE, AJXP_METADATA_ALLUSERS, AJXP_METADATA_SCOPE_REPOSITORY, false, $metas);
+    }
+
+    /**
+     * @param AJXP_Node $node
+     * @return array
+     */
+    public function collectSharesIncludingChildren($node){
+        return $node->collectRepositoryMetadatasInChildren(AJXP_SHARED_META_NAMESPACE, AJXP_METADATA_ALLUSERS);
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     * @param string $scope
+     * @return CompositeShare[]
+     */
+    protected function compositeShareFromMetaWithScope($node, $scope = "private"){
+
+        if($scope !== AJXP_METADATA_ALLUSERS){
+            $scope = ($scope == "private");
+        }
+        $meta = $node->retrieveMetadata(AJXP_SHARED_META_NAMESPACE, $scope, AJXP_METADATA_SCOPE_REPOSITORY, true);
+        $shares = array();
+        $composites = array();
+        if(!isSet($meta["shares"])){
+            return $shares;
+        }
+        foreach($meta["shares"] as $id => $shareData){
+            $type = $shareData["type"];
+            if($type == "repository"){
+                if(!isSet($shares[$id])) {
+                    $shares[$id] = array("repository" => $id, "links" => array());
+                }
+            }else if($type == "minisite" || $type == "ocs_remote"){
+                $link = $this->shareStore->loadShareObject($id);
+                if(!empty($link)){
+                    $link->setAdditionalMeta($shareData);
+                    $linkRepoId = $link->getRepositoryId();
+                    if(empty($linkRepoId)) {
+                        continue;
+                    }
+                    if(!isSet($shares[$linkRepoId])) {
+                        $shares[$linkRepoId] = array("repository" => $linkRepoId, "links" => array());
+                    }
+                    $shares[$linkRepoId]["links"][] = $link;
+                }
+            }
+        }
+        foreach($shares as $repoId => $repoData){
+            $composite = new CompositeShare($node, $repoId);
+            foreach($repoData["links"] as $link){
+                $composite->addLink($link);
+            }
+            if($composite->isInvalid()){
+                // Clear meta and skip
+                $this->removeShareFromMeta($node, $repoId);
+                /** @var ShareLink[] $link */
+                foreach ($repoData['links'] as $link){
+                    $this->removeShareFromMeta($node, $link->getHash());
+                }
+                continue;
+            }
+            $composites[] = $composite;
+        }
+        return $composites;
+
+    }
+
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     * @param bool $allUsersScope
+     * @return CompositeShare|null
+     */
+    public function getCompositeShareForNode($node, $allUsersScope = false){
+        if($allUsersScope){
+            $global = $this->compositeShareFromMetaWithScope($node, AJXP_METADATA_ALLUSERS);
+            if(count($global)) {
+                return $global[0];
+            }
+            return null;
+        }
+        $private = $this->compositeShareFromMetaWithScope($node, "private");
+        if(count($private)) {
+            return $private[0];
+        }else{
+            $public = $this->compositeShareFromMetaWithScope($node, "public");
+            if(count($public)){
+                return $public[0];
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     * @param array $shares
+     * @param bool $clearIfEmpty
+     */
+    public function getSharesFromMeta($node, &$shares, $clearIfEmpty = false){
+
+        $meta = $this->getNodeMeta($node);
+
+        // NEW FORMAT
+        if(isSet($meta["shares"])){
+            $shares = array();
+            $update = false;
+            foreach($meta["shares"] as $hashOrRepoId => $shareData){
+                $type = $shareData["type"];
+                if(is_array($type)) {
+                    $shareData["type"] = $type[0];
+                }
+                if(!$clearIfEmpty || $this->shareStore->shareExists($shareData["type"],$hashOrRepoId)){
+                    $shares[$hashOrRepoId] = $shareData;
+                }else{
+                    $update = true;
+                }
+            }
+            if($update && !count($shares)){
+                $this->clearNodeMeta($node);
+            }
+            return;
+        }
+
+        // OLD FORMAT
+        if(isSet($meta["minisite"])){
+            $type = "minisite";
+        }else{
+            $type = "detect";
+        }
+        $els = array();
+        if(is_string($meta["element"])) $els[] = $meta["element"];
+        else if (is_array($meta["element"])) $els = $meta["element"];
+        if($clearIfEmpty){
+            $update = false;
+            $shares = array();
+            foreach($els as $hashOrRepoId => $additionalData){
+                if(is_string($additionalData)) {
+                    $hashOrRepoId = $additionalData;
+                    $additionalData = array();
+                }
+                if($type == "detect"){
+                    if(RepositoryService::getRepositoryById($hashOrRepoId) != null) $type = "repository";
+                    else $type = "file";
+                }
+                if($this->shareStore->shareExists($type,$hashOrRepoId)){
+                    $shares[$hashOrRepoId] = array_merge($additionalData, array("type" => $type));
+                }else{
+                    $update = true;
+                }
+            }
+            if($update && !count($shares)){
+                $this->clearNodeMeta($node);
+            }
+        }else{
+            $shares = $els;
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/action.share/src/Store/ShareRightsManager.php b/core/src/plugins/action.share/src/Store/ShareRightsManager.php
new file mode 100644
index 0000000000..b02108e8d8
--- /dev/null
+++ b/core/src/plugins/action.share/src/Store/ShareRightsManager.php
@@ -0,0 +1,624 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Share\Store;
+
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Filter\AJXP_PermissionMask;
+use Pydio\Access\Core\Model\Repository;
+use Pydio\Access\Meta\Watch\WatchRegister;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Model\UserInterface;
+
+use Pydio\Conf\Core\AJXP_Role;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Services\RolesService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\OCS\Model\TargettedLink;
+use Pydio\Share\Model\ShareLink;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+define('PARAM_USER_LOGIN_PREFIX', "user_");
+define('PARAM_USER_PASS_PREFIX', "user_pass_");
+define('PARAM_USER_RIGHT_WATCH_PREFIX', "right_watch_");
+define('PARAM_USER_RIGHT_READ_PREFIX', "right_read_");
+define('PARAM_USER_RIGHT_WRITE_PREFIX', "right_write_");
+define('PARAM_USER_ENTRY_TYPE', "entry_type_");
+
+/**
+ * Class ShareRightsManager
+ * @package Pydio\Share\Store
+ */
+class ShareRightsManager
+{
+    /**
+     * @var WatchRegister|bool
+     */
+    var $watcher;
+    /**
+     * @var ShareStore $store
+     */
+    var $store;
+
+    /**
+     * @var array $options
+     */
+    var $options;
+
+    /** @var  ContextInterface */
+    var $context;
+
+    /**
+     * ShareRightsManager constructor.
+     * @param ContextInterface $context
+     * @param array $options
+     * @param ShareStore $store
+     * @param WatchRegister|bool $watcher
+     */
+    public function __construct(ContextInterface $context, $options, $store, $watcher = false)
+    {
+        $this->context = $context;
+        $this->options = $options;
+        $this->watcher = $watcher;
+        $this->store = $store;
+    }
+
+    /**
+     * @param array $httpVars
+     * @param ShareLink $shareObject
+     * @param bool $update
+     * @param null $guestUserPass
+     * @return array
+     * @throws \Exception
+     */
+    public function prepareSharedUserEntry($httpVars, &$shareObject, $update, $guestUserPass = null){
+        $userPass = null;
+
+        $forcePassword = $this->options["SHARE_FORCE_PASSWORD"];
+        if($forcePassword && (
+                (isSet($httpVars["create_guest_user"]) && $httpVars["create_guest_user"] == "true" && empty($guestUserPass))
+                || (isSet($httpVars["guest_user_id"]) && isSet($guestUserPass) && strlen($guestUserPass) == 0)
+            )){
+            $mess = LocaleService::getMessages();
+            throw new \Exception($mess["share_center.175"]);
+        }
+
+        if($update){
+
+            // THIS IS AN EXISTING SHARE
+            // FIND SHARE AND EXISTING HIDDEN USER ID
+            if($shareObject->isAttachedToRepository()){
+                $existingRepo = $shareObject->getRepository();
+                $this->store->testUserCanEditShare($existingRepo->getOwner(), $existingRepo->options);
+            }
+            $uniqueUser = $shareObject->getUniqueUser();
+            if($guestUserPass !== null && strlen($guestUserPass)) {
+                $userPass = $guestUserPass;
+                $shareObject->setUniqueUser($uniqueUser, true);
+            }else if(!$shareObject->shouldRequirePassword() || ($guestUserPass !== null && $guestUserPass == "")){
+                $shareObject->setUniqueUser($uniqueUser, false);
+            }
+            if($update && $forcePassword && !($shareObject instanceof TargettedLink) && !$shareObject->shouldRequirePassword() && empty($guestUserPass)){
+                $mess = LocaleService::getMessages();
+                throw new \Exception($mess["share_center.175"]);
+            }
+
+        } else {
+
+            $update = false;
+            $shareObject->createHiddenUserId(
+                $this->options["SHARED_USERS_TMP_PREFIX"],
+                !empty($guestUserPass)
+            );
+            if(!empty($guestUserPass)){
+                $userPass = $guestUserPass;
+            }else{
+                $userPass = $shareObject->createHiddenUserPassword();
+            }
+            $uniqueUser = $shareObject->getUniqueUser();
+        }
+
+        $hiddenUserEntry = $this->createHiddenUserEntry($httpVars, $uniqueUser, $userPass, $update);
+        if(empty($hiddenUserEntry["RIGHT"])){
+            $mess = LocaleService::getMessages();
+            throw new \Exception($mess["share_center.58"]);
+        }
+        $hiddenUserEntry["DISABLE_DOWNLOAD"] = $shareObject->disableDownload();
+        if($shareObject instanceof TargettedLink){
+            $hiddenUserEntry["REMOTE"] = true;
+        }
+        return $hiddenUserEntry;
+    }
+
+
+    /**
+     * @param array $httpVars
+     * @param string $userId
+     * @param string|null $userPass
+     * @param bool|false $update
+     * @return array
+     */
+    public function createHiddenUserEntry($httpVars, $userId, $userPass = null, $update = false){
+
+        $entry = array("ID" => $userId, "TYPE" => "user", "HIDDEN" => true);
+        $read = isSet($httpVars["simple_right_read"]) ;
+        $write = isSet($httpVars["simple_right_write"]);
+        $disableDownload = !isSet($httpVars["simple_right_download"]);
+        if (!$read && !$disableDownload) {
+            $read = true;
+        }
+        $entry["RIGHT"] = ($read?"r":"").($write?"w":"");
+        $entry["WATCH"] = false;
+        if(isSet($userPass)){
+            if($update){
+                $entry["UPDATE_PASSWORD"] = $userPass;
+            }else{
+                $entry["PASSWORD"] = $userPass;
+            }
+        }
+        return $entry;
+
+    }
+
+    /**
+     * @param $httpVars
+     * @param array $users
+     * @param array $groups
+     * @throws \Exception
+     */
+    public function createUsersFromParameters($httpVars, &$users = array(), &$groups = array()){
+
+        $index = 0;
+        $allowCrossUserSharing = ConfService::getContextConf($this->context, "ALLOW_CROSSUSERS_SHARING", "conf");
+        $allowSharedUsersCreation = ConfService::getContextConf($this->context, "USER_CREATE_USERS", "conf");
+        $loggedUser = $this->context->getUser();
+        $confDriver = ConfService::getConfStorageImpl();
+        $mess = LocaleService::getMessages();
+
+        while (isSet($httpVars[PARAM_USER_LOGIN_PREFIX.$index])) {
+
+            $eType = $httpVars[PARAM_USER_ENTRY_TYPE.$index];
+            $rightString = ($httpVars[PARAM_USER_RIGHT_READ_PREFIX.$index]=="true"?"r":"").($httpVars[PARAM_USER_RIGHT_WRITE_PREFIX.$index]=="true"?"w":"");
+            $uWatch = false;
+            if($this->watcher !== false) {
+                $uWatch = $httpVars[PARAM_USER_RIGHT_WATCH_PREFIX.$index] == "true" ? true : false;
+            }
+            if (empty($rightString)) {
+                $index++;
+                continue;
+            }
+
+            if ($eType == "user") {
+
+                $u = InputFilter::decodeSecureMagic($httpVars[PARAM_USER_LOGIN_PREFIX . $index], InputFilter::SANITIZE_EMAILCHARS);
+                $userExistsRead = UsersService::userExists($u);
+                if (!$userExistsRead && !isSet($httpVars[PARAM_USER_PASS_PREFIX.$index])) {
+                    $index++;
+                    continue;
+                } else if (UsersService::userExists($u, "w") && isSet($httpVars[PARAM_USER_PASS_PREFIX.$index])) {
+                    throw new \Exception( str_replace("%s", $u, $mess["share_center.222"]));
+                }
+                if($userExistsRead){
+                    $userObject = UsersService::getUserById($u, false);
+                    if ( $allowCrossUserSharing != true && ( !$userObject->hasParent() || $userObject->getParent() != $loggedUser->getId() ) ) {
+                        throw new \Exception($mess["share_center.221"]);
+                    }
+                }else{
+                    if(!$allowSharedUsersCreation || UsersService::isReservedUserId($u)){
+                        throw new \Exception($mess["share_center.220"]);
+                    }
+                    if(!empty($this->options["SHARED_USERS_TMP_PREFIX"]) && strpos($u, $this->options["SHARED_USERS_TMP_PREFIX"])!==0 ){
+                        $u = $this->options["SHARED_USERS_TMP_PREFIX"] . $u;
+                    }
+                }
+                $entry = array("ID" => $u, "TYPE" => "user");
+
+            } else {
+
+                $u = InputFilter::decodeSecureMagic($httpVars[PARAM_USER_LOGIN_PREFIX . $index]);
+
+                if (strpos($u, "/AJXP_TEAM/") === 0) {
+
+                    if (method_exists($confDriver, "teamIdToUsers")) {
+                        $teamUsers = $confDriver->teamIdToUsers($this->context->getUser(), str_replace("/AJXP_TEAM/", "", $u));
+                        foreach ($teamUsers as $userId) {
+                            $users[$userId] = array("ID" => $userId, "TYPE" => "user", "RIGHT" => $rightString);
+                            if ($this->watcher !== false) {
+                                $users[$userId]["WATCH"] = $uWatch;
+                            }
+                        }
+                    }
+                    $index++;
+                    continue;
+
+                }
+
+                $entry = array("ID" => $u, "TYPE" => "group");
+
+            }
+            $entry["RIGHT"] = $rightString;
+            $entry["PASSWORD"] = isSet($httpVars[PARAM_USER_PASS_PREFIX.$index])?$httpVars[PARAM_USER_PASS_PREFIX.$index]:"";
+            if ($this->watcher !== false) {
+                $entry["WATCH"] = $uWatch;
+            }
+            if($entry["TYPE"] == "user") {
+                $users[$entry["ID"]] = $entry;
+            }else{
+                if($entry["ID"] == "AJXP_GRP_/"){
+                    $entry["ID"] = "AJXP_GRP_".($this->context->hasUser() ? $this->context->getUser()->getRealGroupPath("/") : "/");
+                }
+                $groups[$entry["ID"]] = $entry;
+
+            }
+            $index ++;
+
+        }
+
+    }
+
+    /**
+     * @param array $ocsData
+     * @param \Pydio\OCS\Model\ShareInvitation[] $existingInvitations
+     * @param array $newOcsUsers
+     * @param array $unshareInvitations
+     * @return int
+     */
+    public function remoteUsersFromParameters($ocsData, $existingInvitations, &$newOcsUsers, &$unshareInvitations){
+        $totalInvitations = count($ocsData["invitations"]);
+        $newOcsUsers = array();
+        $unshareInvitations = array();
+
+        $resentIds = array();
+        foreach($ocsData["invitations"] as $invitationData){
+            if(isSet($invitationData["INVITATION_ID"])){
+                $resentIds[] = $invitationData["INVITATION_ID"];
+            }else{
+                $newOcsUsers[] = $invitationData;
+            }
+        }
+        foreach($existingInvitations as $invitation){
+            if(!in_array($invitation->getId(), $resentIds)){
+                $unshareInvitations[] = $invitation;
+            }
+        }
+        return $totalInvitations;
+    }
+
+    /**
+     * @param String $repoId
+     * @param bool $mixUsersAndGroups
+     * @param \Pydio\Access\Core\Model\AJXP_Node|null $watcherNode
+     * @return array
+     */
+    public function computeSharedRepositoryAccessRights($repoId, $mixUsersAndGroups, $watcherNode = null)
+    {
+        $roles = RolesService::getRolesForRepository($repoId);
+        $sharedEntries = $sharedGroups = array();
+        $mess = LocaleService::getMessages();
+        foreach($roles as $rId){
+            $role = RolesService::getRole($rId);
+            if ($role == null) continue;
+
+            $RIGHT = $role->getAcl($repoId);
+            if (empty($RIGHT)) continue;
+            $ID = $rId;
+            $WATCH = false;
+            $HIDDEN = false;
+            $AVATAR = false;
+            if(strpos($rId, "AJXP_USR_/") === 0){
+                $userId = substr($rId, strlen('AJXP_USR_/'));
+                $role = RolesService::getRole($rId);
+                $userObject = UsersService::getUserById($userId);
+                $LABEL = $role->filterParameterValue("core.conf", "USER_DISPLAY_NAME", AJXP_REPO_SCOPE_ALL, "");
+                $AVATAR = $role->filterParameterValue("core.conf", "avatar", AJXP_REPO_SCOPE_ALL, "");
+                if(empty($LABEL)) $LABEL = $userId;
+                $TYPE = $userObject->hasParent()?"tmp_user":"user";
+                $HIDDEN = $userObject->isHidden();
+                if ($this->watcher !== false && $watcherNode != null) {
+                    $WATCH = $this->watcher->hasWatchOnNode(
+                        $watcherNode,
+                        $userId,
+                        WatchRegister::$META_WATCH_USERS_NAMESPACE
+                    );
+                }
+                $ID = $userId;
+            }else if($rId == "AJXP_GRP_".($this->context->hasUser() ? $this->context->getUser()->getRealGroupPath("/") : "/")){
+                $TYPE = "group";
+                $LABEL = $mess["447"];
+            }else if(strpos($rId, "AJXP_GRP_/") === 0){
+                $currentUserGroup = ($this->context->hasUser() ? $this->context->getUser()->getGroupPath() : "/");
+                $rootGroup = "/";
+                if(empty($loadedGroups)){
+                    $displayAll = ConfService::getContextConf($this->context, "CROSSUSERS_ALLGROUPS_DISPLAY", "conf");
+                    $loadedGroups = UsersService::listChildrenGroups($displayAll ? $rootGroup : $currentUserGroup);
+                    if(!$displayAll){
+                        foreach($loadedGroups as $loadedG => $loadedLabel){
+                            unset($loadedGroups[$loadedG]);
+                            $loadedGroups[rtrim($currentUserGroup, "/")."/".ltrim($loadedG, "/")] = $loadedLabel;
+                        }
+                    }
+                }
+                $groupId = substr($rId, strlen('AJXP_GRP_'));
+                if(isSet($loadedGroups[$groupId])) {
+                    $LABEL = $loadedGroups[$groupId];
+                }
+                /*
+                if($groupId == AuthService::filterBaseGroup("/")){
+                    $LABEL = $mess["447"];
+                }
+                */
+                if(empty($LABEL)) $LABEL = $groupId;
+                $TYPE = "group";
+            }else{
+                $role = RolesService::getRole($rId);
+                $LABEL = $role->getLabel();
+                $TYPE = 'group';
+            }
+
+            if(empty($LABEL)) $LABEL = $rId;
+            $entry = array(
+                "ID"    => $ID,
+                "TYPE"  => $TYPE,
+                "LABEL" => $LABEL,
+                "RIGHT" => $RIGHT
+            );
+            if($WATCH) $entry["WATCH"] = $WATCH;
+            if($HIDDEN) $entry["HIDDEN"] = true;
+            if($AVATAR !== false) $entry["AVATAR"] = $AVATAR;
+            if($TYPE == "group"){
+                $sharedGroups[$entry["ID"]] = $entry;
+            } else {
+                $sharedEntries[$entry["ID"]] = $entry;
+            }
+        }
+
+        if (!$mixUsersAndGroups) {
+            return array("USERS" => $sharedEntries, "GROUPS" => $sharedGroups);
+        }else{
+            return array_merge(array_values($sharedGroups), array_values($sharedEntries));
+
+        }
+    }
+
+    /**
+     * @param \Pydio\Core\Model\RepositoryInterface $parentRepository
+     * @param Repository $childRepository
+     * @param bool $isUpdate
+     * @param array $users
+     * @param array $groups
+     * @param \Pydio\Access\Core\Model\UserSelection $selection
+     * @throws \Exception
+     */
+    public function assignSharedRepositoryPermissions($parentRepository, $childRepository, $isUpdate, $users, $groups, $selection){
+
+        $childRepoId = $childRepository->getId();
+        if($isUpdate){
+            $this->unregisterRemovedUsers($childRepoId, $users, $groups, $selection->getUniqueNode());
+        }
+
+        $loggedUser = $this->context->getUser();
+        foreach ($users as $userName => $userEntry) {
+
+            if (UsersService::userExists($userName, "r")) {
+                $userObject = UsersService::getUserById($userName);
+                if(isSet($userEntry["HIDDEN"]) && isSet($userEntry["UPDATE_PASSWORD"])){
+                    UsersService::updatePassword($userName, $userEntry["UPDATE_PASSWORD"]);
+                }
+            } else {
+                $mess = LocaleService::getMessages();
+                $hiddenUserLabel = "[".$mess["share_center.109"]."] ". InputFilter::sanitize($childRepository->getDisplay(), InputFilter::SANITIZE_EMAILCHARS);
+                $userObject = $this->createNewUser($loggedUser, $userName, $userEntry["PASSWORD"], isset($userEntry["HIDDEN"]), $hiddenUserLabel);
+            }
+
+            // ASSIGN NEW REPO RIGHTS
+            $userObject->getPersonalRole()->setAcl($childRepoId, $userEntry["RIGHT"]);
+
+            // FORK MASK IF THERE IS ANY
+            $childMask = $this->forkMaskIfAny($loggedUser, $parentRepository->getId(), $selection->getUniqueNode());
+            if($childMask != null){
+                $userObject->getPersonalRole()->setMask($childRepoId, $childMask);
+            }
+
+            // CREATE A MINISITE-LIKE ROLE FOR THIS REPOSITORY
+            if (isSet($userEntry["HIDDEN"]) && !isSet($userEntry["REMOTE"])) {
+                $minisiteRole = $this->createRoleForMinisite($childRepoId, $userEntry["DISABLE_DOWNLOAD"], $isUpdate);
+                if($minisiteRole != null){
+                    $userObject->addRole($minisiteRole);
+                }
+            }
+            // ADD "my shared files" REPO OTHERWISE SOME USER CANNOT ACCESS
+            if( !isSet($userEntry["HIDDEN"]) && $childRepository->hasContentFilter()){
+                $inboxRepo = RepositoryService::getRepositoryById("inbox");
+                $currentAcl = $userObject->getMergedRole()->getAcl("inbox");
+                if($inboxRepo !== null && empty($currentAcl)){
+                    $userObject->getPersonalRole()->setAcl("inbox", "rw");
+                }
+            }
+
+            $userObject->save("superuser");
+        }
+
+        foreach ($groups as $group => $groupEntry) {
+            $r = $groupEntry["RIGHT"];
+            $grRole = RolesService::getOrCreateRole($group, $this->context->hasUser() ? $this->context->getUser()->getGroupPath() : "/");
+            $grRole->setAcl($childRepoId, $r);
+            RolesService::updateRole($grRole);
+        }
+
+    }
+
+    /**
+     * @param string $repoId
+     * @param array $newUsers
+     * @param array $newGroups
+     * @param AJXP_Node|null $watcherNode
+     */
+    public function unregisterRemovedUsers($repoId, $newUsers, $newGroups, $watcherNode = null){
+
+        $currentRights = $this->computeSharedRepositoryAccessRights(
+            $repoId,
+            false,
+            $watcherNode
+        );
+
+        $originalUsers = array_keys($currentRights["USERS"]);
+        $removeUsers = array_diff($originalUsers, array_keys($newUsers));
+        if (count($removeUsers)) {
+            foreach ($removeUsers as $user) {
+                if (UsersService::userExists($user)) {
+                    $userObject = UsersService::getUserById($user, false);
+                    $userObject->getPersonalRole()->setAcl($repoId, "");
+                    $userObject->save("superuser");
+                }
+                if($this->watcher !== false && $watcherNode !== null){
+                    $this->watcher->removeWatchFromFolder(
+                        $watcherNode,
+                        $user,
+                        true
+                    );
+                }
+            }
+        }
+        $originalGroups = array_keys($currentRights["GROUPS"]);
+        $removeGroups = array_diff($originalGroups, array_keys($newGroups));
+        if (count($removeGroups)) {
+            foreach ($removeGroups as $groupId) {
+                $role = RolesService::getRole($groupId);
+                if ($role !== false) {
+                    $role->setAcl($repoId, "");
+                    RolesService::updateRole($role);
+                }
+            }
+        }
+
+    }
+
+    /**
+     * @param UserInterface $parentUser
+     * @param string $userName
+     * @param string $password
+     * @param bool $isHidden
+     * @param string $display
+     * @return UserInterface
+     * @throws \Exception
+     */
+    public function createNewUser($parentUser, $userName, $password, $isHidden, $display){
+
+        $confDriver = ConfService::getConfStorageImpl();
+        if(!$isHidden){
+            // This is an explicit user creation - check possible limits
+            Controller::applyHook("user.before_create", array($this->context, $userName, null, false, false));
+            $limit = $parentUser->getMergedRole()->filterParameterValue("core.conf", "USER_SHARED_USERS_LIMIT", AJXP_REPO_SCOPE_ALL, "");
+            if (!empty($limit) && intval($limit) > 0) {
+                $count = count($confDriver->getUserChildren($parentUser->getId()));
+                if ($count >= $limit) {
+                    $mess = LocaleService::getMessages();
+                    throw new \Exception($mess['483']);
+                }
+            }
+        }
+
+        $userObject = UsersService::createUser($userName, $password, false, $isHidden);
+        $userObject->getPersonalRole()->clearAcls();
+        $userObject->setParent($parentUser->getId());
+        $userObject->setGroupPath($parentUser->getGroupPath());
+        $userObject->setProfile("shared");
+        if($isHidden){
+            $userObject->setHidden(true);
+            $userObject->getPersonalRole()->setParameterValue("core.conf", "USER_DISPLAY_NAME", $display);
+        }
+        Controller::applyHook("user.after_create", array($this->context, $userObject));
+
+        return $userObject;
+
+    }
+
+
+    /**
+     * @param UserInterface $parentUser
+     * @param string $parentRepoId
+     * @param AJXP_Node $ajxpNode
+     * @return AJXP_PermissionMask|null
+     */
+    public function forkMaskIfAny($parentUser, $parentRepoId, $ajxpNode){
+
+        $file = $ajxpNode->getPath();
+        if($file != "/" && $parentUser->getMergedRole()->hasMask($parentRepoId)){
+            $parentTree = $parentUser->getMergedRole()->getMask($parentRepoId)->getTree();
+            // Try to find a branch on the current selection
+            $parts = explode("/", trim($file, "/"));
+            while( ($next = array_shift($parts))  !== null){
+                if(is_array($parentTree) && isSet($parentTree[$next])) {
+                    $parentTree = $parentTree[$next];
+                }else{
+                    $parentTree = null;
+                    break;
+                }
+            }
+            if($parentTree != null){
+                $newMask = new AJXP_PermissionMask();
+                $newMask->updateTree($parentTree);
+            }
+            if(isset($newMask)){
+                return $newMask;//$childUser->personalRole->setMask($childRepoId, $newMask);
+            }
+        }
+        return null;
+
+    }
+
+    /**
+     * @param string $repositoryId
+     * @param bool $disableDownload
+     * @param bool $replace
+     * @return AJXP_Role|null
+     */
+    public function createRoleForMinisite($repositoryId, $disableDownload, $replace){
+        if($replace){
+            try{
+                RolesService::deleteRole("AJXP_SHARED-" . $repositoryId);
+            }catch (\Exception $e){}
+        }
+        $newRole = new AJXP_Role("AJXP_SHARED-".$repositoryId);
+        $r = RolesService::getRole("MINISITE");
+        if ($r instanceof AJXP_Role) {
+            if ($disableDownload) {
+                $f = RolesService::getRole("MINISITE_NODOWNLOAD");
+                if ($f instanceof AJXP_Role) {
+                    $r = $f->override($r);
+                }
+            }
+            $allData = $r->getDataArray();
+            $newData = $newRole->getDataArray();
+            if(isSet($allData["ACTIONS"][AJXP_REPO_SCOPE_SHARED])) $newData["ACTIONS"][$repositoryId] = $allData["ACTIONS"][AJXP_REPO_SCOPE_SHARED];
+            if(isSet($allData["PARAMETERS"][AJXP_REPO_SCOPE_SHARED])) $newData["PARAMETERS"][$repositoryId] = $allData["PARAMETERS"][AJXP_REPO_SCOPE_SHARED];
+            $newRole->bunchUpdate($newData);
+            RolesService::updateRole($newRole);
+            return $newRole;
+        }
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/action.share/src/Store/ShareStore.php b/core/src/plugins/action.share/src/Store/ShareStore.php
new file mode 100644
index 0000000000..decc08e11b
--- /dev/null
+++ b/core/src/plugins/action.share/src/Store/ShareStore.php
@@ -0,0 +1,803 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Share\Store;
+
+
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\Repository;
+
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\ConfService;
+use Pydio\Conf\Sql\SqlConfDriver;
+
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Services\RolesService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Utils\Crypto;
+use Pydio\Log\Core\Logger;
+use Pydio\OCS\Model\TargettedLink;
+use Pydio\Share\Model\ShareLink;
+use Pydio\Share\ShareCenter;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Class ShareStore
+ * @package Pydio\Share\Store
+ */
+class ShareStore {
+
+    var $sqlSupported = false;
+    var $legacyPublicFolder;
+    /**
+     * @var int
+     */
+    private $hashMinLength;
+
+    public $modifiableShareKeys = ["counter", "tags", "short_form_url"];
+    /**
+     * @var SqlConfDriver
+     */
+    var $confStorage;
+
+    var $shareMetaManager;
+
+    /** @var  ContextInterface */
+    private $context;
+
+    /**
+     * ShareStore constructor.
+     * @param ContextInterface $context
+     * @param string $downloadFolder
+     * @param int $hashMinLength
+     */
+    public function __construct(ContextInterface $context, $downloadFolder, $hashMinLength = 32){
+        $this->context = $context;
+        $this->legacyPublicFolder = $downloadFolder;
+        $this->hashMinLength = $hashMinLength;
+        $storage = ConfService::getConfStorageImpl();
+        if($storage->getId() == "conf.sql") {
+            $this->sqlSupported = true;
+            $this->confStorage = $storage;
+        }
+    }
+
+    /**
+     * @return int
+     */
+    public function getHashMinLength(){
+        return $this->hashMinLength;
+    }
+
+    /**
+     * @return ShareMetaManager
+     */
+    public function getMetaManager(){
+        if(!isSet($this->shareMetaManager)){
+            $this->shareMetaManager = new ShareMetaManager($this);
+        }
+        return $this->shareMetaManager;
+    }
+
+    /**
+     * @param String $parentRepositoryId
+     * @param array $shareData
+     * @param string $type
+     * @param String $existingHash
+     * @param null $updateHash
+     * @throws \Exception
+     * @return string $hash
+     */
+    public function storeShare($parentRepositoryId, $shareData, $type="minisite", $existingHash = null, $updateHash = null){
+
+        if(!$this->sqlSupported){
+            throw new \Pydio\Core\Exception\PydioException("Please setup an SQL connexion to use sharing features");
+        }
+        $data = serialize($shareData);
+        if($existingHash){
+            $hash = $existingHash;
+        }else{
+            $hash = $this->computeHash($data, $this->legacyPublicFolder);
+        }
+        
+        $shareData["SHARE_TYPE"] = $type;
+        if($updateHash != null){
+            $this->confStorage->simpleStoreClear("share", $existingHash);
+            $hash = $updateHash;
+        }
+        $this->confStorage->simpleStoreSet("share", $hash, $shareData, "serial", $parentRepositoryId);
+        return $hash;
+
+    }
+
+    /**
+     * Initialize an empty ShareLink object.
+     * @return ShareLink
+     */
+    public function createEmptyShareObject(){
+        $shareObject = new ShareLink($this);
+        if(UsersService::usersEnabled()){
+            $shareObject->setOwnerId($this->context->getUser()->getId());
+        }
+        return $shareObject;
+    }
+
+    /**
+     * Initialize a ShareLink from persisted data.
+     * @param string $hash
+     * @return ShareLink
+     * @throws \Exception
+     */
+    public function loadShareObject($hash){
+        $data = $this->loadShare($hash);
+        if($data === false){
+            $mess = LocaleService::getMessages();
+            throw new \Exception(str_replace('%s', 'Cannot find share with hash '.$hash, $mess["share_center.219"]));
+        }
+        if(isSet($data["TARGET"]) && $data["TARGET"] == "remote"){
+            $shareObject = new TargettedLink($this, $data);
+        }else{
+            $shareObject = new ShareLink($this, $data);
+        }
+        $shareObject->setHash($hash);
+        return $shareObject;
+    }
+
+    /**
+     * Load data persisted on DB or on publiclet files.
+     * @param $hash
+     * @return array|bool|mixed
+     */
+    public function loadShare($hash){
+
+        $dlFolder = $this->legacyPublicFolder;
+        $file = $dlFolder."/".$hash.".php";
+        if(!is_file($file)) {
+            if($this->sqlSupported){
+                $this->confStorage->simpleStoreGet("share", $hash, "serial", $data);
+                if(!empty($data)){
+                    return $data;
+                }
+            }
+            return [];
+        }
+        class_alias("Pydio\\Share\\ShareCenter", "ShareCenter");
+        $lines = file($file);
+
+        // Eval the existing line 3, should be like
+        //    $cypheredData = base64_decode("cMYIUkAcvOqGFLbT5j/jyP/VzYJqV03X2.....71gJsTtxw==");
+        $cypheredData = '';
+        eval($lines[3]);
+        if(!empty($cypheredData)) {
+            $key = str_pad($hash, 16, "\0");
+            $inputData = Crypto::decrypt($cypheredData, $key, false);
+            if(!empty($inputData)){
+                $publicletData = @unserialize($inputData);
+                $publicletData["PUBLICLET_PATH"] = $file;
+                return $publicletData;
+            }
+        }
+        return [];
+    }
+
+    /**
+     * Test if hash.php is a real file.
+     * @param string $hash
+     * @return bool
+     */
+    public function shareIsLegacy($hash){
+        $dlFolder = $this->legacyPublicFolder;
+        $file = $dlFolder."/".$hash.".php";
+        return is_file($file);
+    }
+
+    /**
+     * Update a single share property
+     * @param string $hash
+     * @param string $pName
+     * @param string $pValue
+     * @return bool
+     * @throws \Exception
+     */
+    public function updateShareProperty($hash, $pName, $pValue){
+        if(!$this->sqlSupported) return false;
+        $relatedObjectId = $this->confStorage->simpleStoreGet("share", $hash, "serial", $data);
+        if(is_array($data)){
+            $data[$pName] = $pValue;
+            $this->confStorage->simpleStoreSet("share", $hash, $data, "serial", $relatedObjectId);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * List shares based on child repository ID;
+     * @param $repositoryId
+     * @return array
+     */
+    public function findSharesForRepo($repositoryId){
+        if(!$this->sqlSupported) return [];
+        $cursor = null;
+        return $this->confStorage->simpleStoreList("share", $cursor, "", "serial", '%"REPOSITORY";s:32:"'.$repositoryId.'"%');
+    }
+
+    /**
+     * Update share type from legacy values to new ones.
+     * @param $shareData
+     */
+    protected function updateShareType(&$shareData){
+        if ( isSet($shareData["SHARE_TYPE"]) && $shareData["SHARE_TYPE"] == "publiclet" ) {
+            $shareData["SHARE_TYPE"] = "file";
+        } else if ( isset($shareData["REPOSITORY"]) && $shareData["REPOSITORY"] instanceof Repository ){
+            $shareData["SHARE_TYPE"] = "file";
+        } else if ( isSet($shareData["PUBLICLET_PATH"]) ){
+            $shareData["SHARE_TYPE"] = "minisite";
+        }
+    }
+
+    /**
+     * List all shares persisted in DB and on file.
+     * @param string $limitToUser
+     * @param string $parentRepository
+     * @param null $cursor
+     * @param null $shareType
+     * @return array
+     */
+    public function listShares($limitToUser = '', $parentRepository = '', &$cursor = null, $shareType = null){
+
+        $dbLets = [];
+        if($this->sqlSupported){
+            // Get DB files
+            $dbLets = $this->confStorage->simpleStoreList(
+                "share",
+                $cursor,
+                "",
+                "serial",
+                (!empty($limitToUser)?'%"OWNER_ID";s:'.strlen($limitToUser).':"'.$limitToUser.'"%':''),
+                $parentRepository);
+        }
+
+        // Update share_type and filter if necessary
+        foreach($dbLets as $id => &$shareData){
+            if($shareData === false){
+                unset($dbLets[$id]);
+                continue;
+            }
+            $this->updateShareType($shareData);
+            if(!empty($shareType) && $shareData["SHARE_TYPE"] != $shareType){
+                unset($dbLets[$id]);
+            }
+        }
+
+        if(empty($shareType) || $shareType == "repository"){
+            // BACKWARD COMPATIBILITY: collect old-school shared repositories that are not yet stored in simpleStore
+            $storedIds = [];
+            foreach($dbLets as $share){
+                if(empty($limitToUser) || $limitToUser == $share["OWNER_ID"]) {
+                    if(is_string($share["REPOSITORY"])) $storedIds[] = $share["REPOSITORY"];
+                    else if (is_object($share["REPOSITORY"])) $storedIds[] = $share["REPOSITORY"]->getUniqueId();
+                }
+            }
+            // Find repositories that would have a parent
+            $criteria = [];
+            $criteria["parent_uuid"] = ($parentRepository == "" ? AJXP_FILTER_NOT_EMPTY : $parentRepository);
+            $criteria["owner_user_id"] = ($limitToUser == "" ? AJXP_FILTER_NOT_EMPTY : $limitToUser);
+            if(count($storedIds)){
+                $criteria["!uuid"] = $storedIds;
+            }
+            $otherCountOnly = false;
+            if(isSet($cursor)){
+                $offset = $cursor[0];
+                $limit = $cursor[1];
+                $loadedDbLets = count($dbLets);
+                $totalDbLets = $cursor["total"];
+                $newPosition = max(0, $offset - $totalDbLets);
+                if($loadedDbLets >= $limit){
+                    //return $dbLets;
+                    $criteria["CURSOR"] = ["OFFSET" => 0, "LIMIT" => 1];
+                    $otherCountOnly = true;
+                }else{
+                    if($loadedDbLets > 0) $limit = $limit - $loadedDbLets;
+                    $criteria["CURSOR"] = ["OFFSET" => $newPosition, "LIMIT" => $limit];
+                }
+            }
+            $oldRepos = RepositoryService::listRepositoriesWithCriteria($criteria, $count);
+            if(!$otherCountOnly){
+                foreach($oldRepos as $sharedWorkspace){
+                    $dbLets['repo-'.$sharedWorkspace->getId()] = [
+                        "SHARE_TYPE"    => "repository",
+                        "OWNER_ID"      => $sharedWorkspace->getOwner(),
+                        "REPOSITORY"    => $sharedWorkspace->getUniqueId(),
+                        "LEGACY_REPO_OR_MINI"   => true
+                    ];
+                }
+            }
+            if(isSet($cursor)){
+                $cursor["total"] += $count;
+            }
+        }
+
+        return $dbLets;
+    }
+
+    /**
+     * @param string $userId Share OWNER user ID / Will be compared to the currently logged user ID
+     * @param array|null $shareData Share Data
+     * @return bool Wether currently logged user can view/edit this share or not.
+     * @throws \Exception
+     */
+    public function testUserCanEditShare($userId, $shareData){
+
+        if($shareData !== null && isSet($shareData["SHARE_ACCESS"]) && $shareData["SHARE_ACCESS"] == "public"){
+            return true;
+        }
+        if(empty($userId)){
+            $mess = LocaleService::getMessages();
+            throw new \Exception($mess["share_center.160"]);
+        }
+        $crtUser = $this->context->getUser();
+        if($crtUser->getId() == $userId) return true;
+        $user = UsersService::getUserById($userId);
+        if($crtUser->isAdmin() && $crtUser->canAdministrate($user)) {
+            return true;
+        }
+        if($user->hasParent() && $user->getParent() == $crtUser->getId()){
+            return true;
+        }
+        $mess = LocaleService::getMessages();
+        throw new \Exception($mess["share_center.160"]);
+    }
+
+    /**
+     * @param String $type
+     * @param String $element
+     * @param bool $keepRepository
+     * @param bool $ignoreRepoNotFound
+     * @param AJXP_Node $ajxpNode
+     * @return bool
+     * @throws \Exception
+     */
+    public function deleteShare($type, $element, $keepRepository = false, $ignoreRepoNotFound = false, $ajxpNode = null)
+    {
+        $mess = LocaleService::getMessages();
+        Logger::debug(__CLASS__, __FILE__, "Deleting shared element ".$type."-".$element);
+
+        if ($type == "repository") {
+            if(strpos($element, "repo-") === 0) $element = str_replace("repo-", "", $element);
+            $repo = RepositoryService::getRepositoryById($element);
+            $share = $this->loadShare($element);
+            if($repo == null) {
+                // Maybe a share has
+                if(is_array($share) && isSet($share["REPOSITORY"])){
+                    $repo = RepositoryService::getRepositoryById($share["REPOSITORY"]);
+                }
+                if(isSet($share["OWNER_ID"])) {
+                    $owner = $share["OWNER_ID"];
+                }
+                if($repo == null && !$ignoreRepoNotFound){
+                    throw new \Exception(str_replace('%s', 'Cannot find associated repository', $mess["share_center.219"]));
+                }
+            }
+            if($repo != null){
+                $owner = $repo->getOwner();
+                $this->testUserCanEditShare($repo->getOwner(), $repo->options);
+                $res = RepositoryService::deleteRepository($element);
+                if ($res == -1) {
+                    throw new \Exception($mess[427]);
+                }
+            }
+            if($ajxpNode != null){
+                if(isSet($owner) && $owner !== $this->context->getUser()->getId()){
+                    $ajxpNode->setUserId($owner);
+                }
+                $this->getMetaManager()->removeShareFromMeta($ajxpNode, $element);
+            }
+            if($this->sqlSupported){
+                if(isSet($share) && count($share)){
+                    $this->confStorage->simpleStoreClear("share", $element);
+                }else{
+                    $shares = $this->findSharesForRepo($element);
+                    if(count($shares)){
+                        $keys = array_keys($shares);
+                        $this->confStorage->simpleStoreClear("share", $keys[0]);
+                        if($ajxpNode != null){
+                            $this->getMetaManager()->removeShareFromMeta($ajxpNode, $keys[0]);
+                        }
+                    }
+                }
+            }
+        } else if ($type == "minisite") {
+            $minisiteData = $this->loadShare($element);
+            $repoId = $minisiteData["REPOSITORY"];
+            $repo = RepositoryService::getRepositoryById($repoId);
+            if ($repo == null) {
+                if(!$ignoreRepoNotFound) {
+                    throw new \Exception(str_replace('%s', 'Cannot find associated repository', $mess["share_center.219"]));
+                }
+            }else{
+                $owner = $repo->getOwner();
+                $this->testUserCanEditShare($repo->getOwner(), $repo->options);
+            }
+            if($repoId !== null && !$keepRepository){
+                $res = RepositoryService::deleteRepository($repoId);
+                if ($res == -1) {
+                    throw new \Exception($mess[427]);
+                }
+            }
+            // Silently delete corresponding role if it exists
+            RolesService::deleteRole("AJXP_SHARED-" . $repoId);
+            // If guest user created, remove it now.
+            if (isSet($minisiteData["PRELOG_USER"]) && UsersService::userExists($minisiteData["PRELOG_USER"])) {
+                UsersService::deleteUser($minisiteData["PRELOG_USER"]);
+            }
+            // If guest user created, remove it now.
+            if (isSet($minisiteData["PRESET_LOGIN"]) && UsersService::userExists($minisiteData["PRESET_LOGIN"])) {
+                UsersService::deleteUser($minisiteData["PRESET_LOGIN"]);
+            }
+            if(isSet($minisiteData["PUBLICLET_PATH"]) && is_file($minisiteData["PUBLICLET_PATH"])){
+                unlink($minisiteData["PUBLICLET_PATH"]);
+            }else if($this->sqlSupported){
+                $this->confStorage->simpleStoreClear("share", $element);
+            }
+            if($ajxpNode !== null){
+                if(isSet($owner) && $owner !== $this->context->getUser()->getId()){
+                    $ajxpNode->setUserId($owner);
+                }
+                $this->getMetaManager()->removeShareFromMeta($ajxpNode, $element);
+                if(!$keepRepository){
+                    $this->getMetaManager()->removeShareFromMeta($ajxpNode, $repoId);
+                }
+            }
+        } else if ($type == "user") {
+            $this->testUserCanEditShare($element, []);
+            UsersService::deleteUser($element);
+        } else if ($type == "file") {
+            $publicletData = $this->loadShare($element);
+            if ($publicletData!== false && isSet($publicletData["OWNER_ID"]) && $this->testUserCanEditShare($publicletData["OWNER_ID"], $publicletData)) {
+                if(isSet($publicletData["PUBLICLET_PATH"]) && is_file($publicletData["PUBLICLET_PATH"])){
+                    unlink($publicletData["PUBLICLET_PATH"]);
+                }else if($this->sqlSupported){
+                    $this->confStorage->simpleStoreClear("share", $element);
+                }
+            } else {
+                throw new \Exception($mess["share_center.160"]);
+            }
+        }
+        return true;
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $baseNode
+     * @param bool $delete
+     * @param string $oldPath
+     * @param string $newPath
+     * @param string|null $parentRepositoryPath
+     * @return int Number of nodes modified in different repositories
+     */
+    public function moveSharesFromMetaRecursive($baseNode, $delete = false, $oldPath, $newPath, $parentRepositoryPath = null){
+
+        $modifiedDifferentNodes = 0;
+        // Find shares in children
+        try{
+            $result = $this->getMetaManager()->collectSharesIncludingChildren($baseNode);
+        }catch(\Exception $e){
+            // Error while loading node, ignore
+            return $modifiedDifferentNodes;
+        }
+        $basePath = $baseNode->getPath();
+        foreach($result as $relativePath => $metadata){
+            if($relativePath == "/") {
+                $relativePath = "";
+            }
+            $modifiedDifferentNodes ++;
+            $changeOldNode = new AJXP_Node($baseNode->getContext()->getUrlBase().$oldPath.$relativePath);
+
+            foreach($metadata as $ownerId => $meta){
+                if(!isSet($meta["shares"])){
+                    continue;
+                }
+                $changeOldNode->setUserId($ownerId);
+                /// do something
+                $changeNewNode = null;
+                if(!$delete){
+                    //$newPath = preg_replace('#^'.preg_quote($oldPath, '#').'#', $newPath, $path);
+                    $changeNewNode = new AJXP_Node($baseNode->getContext()->getUrlBase().$newPath.$relativePath);
+                    $changeNewNode->setUserId($ownerId);
+                }
+                $collectedRepositories = [];
+                list($privateShares, $publicShares) = $this->moveSharesFromMeta($meta["shares"], $delete?"delete":"move", $changeOldNode, $changeNewNode, $collectedRepositories, $parentRepositoryPath);
+
+                if($basePath == "/"){
+                    // Just update target node!
+                    $changeMetaNode = new AJXP_Node($baseNode->getContext()->getUrlBase().$relativePath);
+                    $changeMetaNode->setUserId($ownerId);
+                    $this->getMetaManager()->clearNodeMeta($changeMetaNode);
+                    if(count($privateShares)){
+                        $this->getMetaManager()->setNodeMeta($changeMetaNode, ["shares" => $privateShares], true);
+                    }
+                    if(count($publicShares)){
+                        $this->getMetaManager()->setNodeMeta($changeMetaNode, ["shares" => $privateShares], false);
+                    }
+                }else{
+                    $this->getMetaManager()->clearNodeMeta($changeOldNode);
+                    if(!$delete){
+                        if(count($privateShares)){
+                            $this->getMetaManager()->setNodeMeta($changeNewNode, ["shares" => $privateShares], true);
+                        }
+                        if(count($publicShares)){
+                            $this->getMetaManager()->setNodeMeta($changeNewNode, ["shares" => $privateShares], false);
+                        }
+                    }
+                }
+
+                foreach($collectedRepositories as $sharedRepoId => $parentRepositoryPath){
+                    $ctx = new Context($ownerId, $sharedRepoId);
+                    $modifiedDifferentNodes += $this->moveSharesFromMetaRecursive(new AJXP_Node($ctx->getUrlBase()), $delete, $changeOldNode->getPath(), $changeNewNode->getPath(), $parentRepositoryPath);
+                }
+
+            }
+        }
+
+        return $modifiedDifferentNodes;
+
+    }
+
+    /**
+     * @param array $shares
+     * @param String $operation
+     * @param \Pydio\Access\Core\Model\AJXP_Node $oldNode
+     * @param \Pydio\Access\Core\Model\AJXP_Node $newNode
+     * @param array $collectRepositories
+     * @param string|null $parentRepositoryPath
+     * @return array
+     * @throws \Exception
+     */
+    public function moveSharesFromMeta($shares, $operation="move", $oldNode, $newNode=null, &$collectRepositories = [], $parentRepositoryPath = null){
+
+        $privateShares = [];
+        $publicShares = [];
+        foreach($shares as $id => $data){
+            $type = $data["type"];
+            if($operation == "delete"){
+                $this->deleteShare($type, $id, false, true);
+                continue;
+            }
+
+            if($type == "minisite"){
+                $share = $this->loadShare($id);
+                $repo = RepositoryService::getRepositoryById($share["REPOSITORY"]);
+            }else if($type == "repository"){
+                $repo = RepositoryService::getRepositoryById($id);
+            }else if($type == "file"){
+                $publicLink = $this->loadShare($id);
+            }
+
+            if(isSet($repo)){
+                $oldNodeLabel = $oldNode->getLabel();
+                $newNodeLabel = $newNode->getLabel();
+                if($newNode != null && $newNodeLabel != $oldNodeLabel && $repo->getDisplay() == $oldNodeLabel){
+                    $repo->setDisplay($newNodeLabel);
+                }
+                $cFilter = $repo->getContentFilter();
+                $path = $repo->getSafeOption("PATH");
+                $save = false;
+                if(isSet($cFilter)){
+                    if($parentRepositoryPath !== null){
+                        $repo->addOption("PATH", $parentRepositoryPath);
+                    }else{
+                        $cFilter->movePath($oldNode->getPath(), $newNode->getPath());
+                        $repo->setContentFilter($cFilter);
+                    }
+                    $save = true;
+                }else if(!empty($path)){
+
+                    $oldNodePath = $oldNode->getPath();
+                    $newNodePath = $newNode->getPath();
+
+                    $path = preg_replace("#".preg_quote($oldNodePath, "#")."$#", $newNodePath, $path);
+                    $repo->addOption("PATH", $path);
+                    $save = true;
+                    $collectRepositories[$repo->getId()] = $path;
+                }
+                if($save){
+                    //ConfService::getConfStorageImpl()->saveRepository($repo, true);
+                    RepositoryService::replaceRepository($repo->getId(), $repo);
+                }
+                $access = $repo->getSafeOption("SHARE_ACCESS");
+                if(!empty($access) && $access == "PUBLIC"){
+                    $publicShares[$id] = $data;
+                }else{
+                    $privateShares[$id] = $data;
+                }
+
+            } else {
+
+                if(isset($publicLink) && is_array($publicLink) && isSet($publicLink["FILE_PATH"])){
+                    $oldNodePath = $oldNode->getPath();
+                    $newNodePath = $newNode->getPath();
+                    $publicLink["FILE_PATH"] = str_replace($oldNodePath, $newNodePath, $publicLink["FILE_PATH"]);
+                    $this->deleteShare("file", $id);
+                    $this->storeShare($newNode->getRepositoryId(), $publicLink, "file", $id);
+                    $privateShares[$id] = $data;
+                }
+            }
+        }
+        return [$privateShares, $publicShares];
+    }
+
+    /**
+     * @param String $type
+     * @param String $element
+     * @return bool
+     */
+    public function shareExists($type, $element)
+    {
+        if ($type == "repository") {
+            return (RepositoryService::getRepositoryById($element) != null);
+        } else if($type == "ocs_remote"){
+            return true;
+        } else if ($type == "file" || $type == "minisite") {
+            $fileExists = is_file($this->legacyPublicFolder."/".$element.".php");
+            if($fileExists) {
+                return true;
+            }
+            if($this->sqlSupported) {
+                $this->confStorage->simpleStoreGet("share", $element, "serial", $data);
+                if(is_array($data)) return true;
+            }
+        }
+        return false;
+    }
+
+
+    /**
+     * Set the counter value to 0.
+     * @param string $hash
+     * @param string $userId
+     * @throws \Exception
+     */
+    public function resetDownloadCounter($hash, $userId){
+        $share = $this->loadShareObject($hash);
+        $repoId = $share->getRepositoryId();
+        $repo = RepositoryService::getRepositoryById($repoId);
+        if ($repo == null) {
+            $mess = LocaleService::getMessages();
+            throw new \Exception(str_replace('%s', 'Cannot find associated repository', $mess["share_center.219"]));
+        }
+        $this->testUserCanEditShare($repo->getOwner(), $repo->options);
+        $share->resetDownloadCount();
+        $share->save();
+    }
+    
+    /**
+     * Find all expired shares and remove them.
+     * @param bool|true $currentUser
+     * @return array
+     */
+    public function clearExpiredFiles($currentUser = true)
+    {
+        if($currentUser){
+            $loggedUser = $this->context->getUser();
+            $userId = $loggedUser->getId();
+        }else{
+            $userId = null;
+        }
+        $deleted = [];
+
+        $publicLets = $this->listShares($currentUser? $userId: '');
+        foreach ($publicLets as $hash => $publicletData) {
+            if($publicletData === false) continue;
+            if ($currentUser && ( !isSet($publicletData["OWNER_ID"]) || $publicletData["OWNER_ID"] != $userId )) {
+                continue;
+            }
+            if (ShareLink::isShareExpired($publicletData)){
+                $this->deleteExpiredPubliclet($hash, $publicletData);
+                $deleted[] = $publicletData["FILE_PATH"];
+
+            }
+        }
+        return $deleted;
+    }
+
+    /**
+     * Delete an expired publiclets.
+     * @param $elementId
+     * @param $data
+     * @throws \Exception
+     */
+    private function deleteExpiredPubliclet($elementId, $data){
+
+        /**
+        if(!$this->context->hasUser() ||  $this->context->getUser()->getId() !== $data["OWNER_ID"]){
+            AuthService::logUser($data["OWNER_ID"], "", true);
+        }
+         **/
+        $repoObject = $data["REPOSITORY"];
+        if(!($repoObject instanceof Repository)) {
+            $repoObject = RepositoryService::getRepositoryById($data["REPOSITORY"]);
+        }
+        $repoLoaded = false;
+
+        $node = new AJXP_Node("pydio://".$data["OWNER_ID"]."@".$repoObject->getId());
+        if(!empty($repoObject)){
+            try{
+                $node->getDriver()->detectStreamWrapper(true);
+                $repoLoaded = true;
+            }catch (\Exception $e){
+                // Cannot load this repository anymore.
+            }
+        }
+        $ajxpNode = null;
+        if($repoLoaded && $repoObject->hasParent()){
+            if(isSet($data["FILE_PATH"])){
+                $filePath = $data["FILE_PATH"];
+                $ajxpNode = new AJXP_Node("pydio://".$data["OWNER_ID"]."@".$repoObject->getParentId().$filePath);
+            }else if($repoObject->hasContentFilter()){
+                $filePath = $data["FILE_PATH"] = $repoObject->getContentFilter()->getUniquePath();
+                $ajxpNode = new AJXP_Node("pydio://".$data["OWNER_ID"]."@".$repoObject->getParentId().'/'.$filePath);
+            }
+        }
+        Logger::debug("sharestore", "Delete share now !");
+        $this->deleteShare($data['SHARE_TYPE'], $elementId, false, true, $ajxpNode);
+
+        gc_collect_cycles();
+
+    }
+
+    /**
+     * Computes a short form of the hash, checking if it already exists in the folder,
+     * in which case it increases the hashlength until there is no collision.
+     * @static
+     * @param String $outputData Serialized data
+     * @param String|null $checkInFolder Path to folder
+     * @return string
+     */
+    private function computeHash($outputData, $checkInFolder = null)
+    {
+        $length = $this->hashMinLength;
+        $full =  md5($outputData);
+        $starter = substr($full, 0, $length);
+        if ($checkInFolder != null) {
+            while (file_exists($checkInFolder.DIRECTORY_SEPARATOR.$starter.".php")) {
+                $length ++;
+                $starter = substr($full, 0, $length);
+            }
+        }
+        return $starter;
+    }
+
+    /**
+     * Check if the hash seems to correspond to the serialized data.
+     * @static
+     * @param String $outputData serialized data
+     * @param String $hash Id to check
+     * @return bool
+     */
+    private function checkHash($outputData, $hash)
+    {
+        $full = md5($outputData);
+        return (!empty($hash) && strpos($full, $hash."") === 0);
+    }
+
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/action.share/src/View/MinisiteRenderer.php b/core/src/plugins/action.share/src/View/MinisiteRenderer.php
new file mode 100644
index 0000000000..fd4ab5b588
--- /dev/null
+++ b/core/src/plugins/action.share/src/View/MinisiteRenderer.php
@@ -0,0 +1,275 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Share\View;
+
+
+use DOMXPath;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Http\Server;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Http\UserAgent;
+use Pydio\Core\Utils\Vars\XMLFilter;
+use Pydio\Core\Controller\HTMLWriter;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Share\ShareCenter;
+use Zend\Diactoros\Response;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class MinisiteRenderer
+ * View class to load a share and display it as a minisite
+ *
+ * @package Pydio\Share\View
+ */
+class MinisiteRenderer
+{
+    /**
+     * Called as a middleware
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @return ResponseInterface
+     */
+    public static function handleRequest(ServerRequestInterface $requestInterface, ResponseInterface $responseInterface, callable $next = null){
+
+        $hash       = $requestInterface->getAttribute("hash");
+        $data       = $requestInterface->getAttribute("data");
+        $params     = $requestInterface->getParsedBody();
+
+        if(isSet($params["dl"]) && isSet($params["file"])){
+            $responseInterface = self::triggerDownload($requestInterface, $responseInterface);
+        }else{
+            $responseInterface = self::writeHtml($responseInterface, $requestInterface->getAttribute("ctx"), $data, $hash);
+        }
+        return Server::callNextMiddleWare($requestInterface, $responseInterface, $next);
+
+    }
+
+    /**
+     * @param array $data
+     * @param null|string $error
+     * @return string
+     */
+    protected static function computeTemplateName($data, $error = null){
+        if($error !== null){
+            return "ajxp_unique_strip";
+        }
+
+    }
+
+    /**
+     * Render a simple error instead of the minisite
+     * @param $data
+     * @param string $hash
+     * @param null $error
+     */
+    public static function renderError($data, $hash = '', $error = null){
+        self::loadMinisite($data, $hash, $error);
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @return ResponseInterface
+     * @throws PydioException
+     * @throws \Pydio\Core\Exception\ActionNotFoundException
+     * @throws \Pydio\Core\Exception\AuthRequiredException
+     */
+    private static function triggerDownload(ServerRequestInterface $requestInterface, ResponseInterface $responseInterface){
+
+        /** @var ContextInterface $ctx */
+        $ctx        = $requestInterface->getAttribute("ctx");
+        $data       = $requestInterface->getAttribute("data");
+        $params     = $requestInterface->getParsedBody();
+        if(isSet($data["DOWNLOAD_DISABLED"]) && $data["DOWNLOAD_DISABLED"] === true){
+            throw new PydioException("You are not allowed to download this file");
+        }
+        if(!$ctx->hasRepository()){
+            throw new PydioException("No active repository");
+        }
+
+        $errMessage = null;
+        $ACTION = "download";
+        if(isset($params["ct"])){
+            $mime = pathinfo($params["file"], PATHINFO_EXTENSION);
+            $editors = PluginsService::getInstance($ctx)->searchAllManifests("//editor[contains(@mimes,'$mime') and @previewProvider='true']", "node", true, true, false);
+            if (count($editors)) {
+                foreach ($editors as $editor) {
+                    $xPath = new DOMXPath($editor->ownerDocument);
+                    $callbacks = $xPath->query("//action[@contentTypedProvider]", $editor);
+                    if ($callbacks->length) {
+                        $ACTION = $callbacks->item(0)->getAttribute("name");
+                        if($ACTION == "audio_proxy") {
+                            $params["file"] = "base64encoded:".base64_encode($params["file"]);
+                        }
+                        break;
+                    }
+                }
+            }
+        }
+        $req =  Controller::executableRequest($ctx, $ACTION, $params);
+        return Controller::run($req);
+
+    }
+
+    /**
+     * [LEGACY] Load the minisite
+     * @deprecated 
+     * @param $data
+     * @param string $hash
+     * @param null $error
+     * @throws \Exception
+     * @throws \Pydio\Core\Exception\LoginException
+     * @throws \Pydio\Core\Exception\WorkspaceNotFoundException
+     */
+    public static function loadMinisite($data, $hash = '', $error = null)
+    {
+        $resp = new Response();
+        $context = Context::emptyContext();
+        HTMLWriter::internetExplorerMainDocumentHeader();
+        HTMLWriter::charsetHeader();
+        $resp = self::writeHtml($resp, $context, $data, $hash, $error);
+        $b = $resp->getBody();
+        $b->rewind();
+        echo $b->getContents();
+    }
+
+
+    /**
+     * @param ResponseInterface $responseInterface
+     * @param ContextInterface $context
+     * @param $data
+     * @param string $hash
+     * @param null $error
+     * @return ResponseInterface
+     * @throws \Exception
+     */
+    public static function writeHtml(ResponseInterface $responseInterface, ContextInterface $context, $data, $hash = '', $error = null){
+
+        $confs = [];
+        $shareCenter = ShareCenter::getShareCenter($context);
+        if($shareCenter !== false){
+            $confs = $shareCenter->getConfigs();
+        }
+        $repoObject = $context->getRepository();
+        if($repoObject === null && isSet($data['PRESET_LOGIN']) && isSet($data["REPOSITORY"])){
+            $repoObject = RepositoryService::getRepositoryById($data["REPOSITORY"]);
+        }
+
+        $minisiteLogo = "plugins/gui.ajax/PydioLogo250.png";
+        if(!empty($confs["CUSTOM_MINISITE_LOGO"])){
+            $logoPath = $confs["CUSTOM_MINISITE_LOGO"];
+            if (strpos($logoPath, "plugins/") === 0 && is_file(AJXP_INSTALL_PATH."/".$logoPath)) {
+                $minisiteLogo = $logoPath;
+            }else{
+                $minisiteLogo = "public/?get_action=get_global_binary_param&binary_id=". $logoPath;
+            }
+        }
+        // Default value
+        if(isSet($data["AJXP_TEMPLATE_NAME"])){
+            $templateName = $data["AJXP_TEMPLATE_NAME"];
+            if($templateName == "ajxp_film_strip" && UserAgent::userAgentIsMobile()){
+                $templateName = "ajxp_shared_folder";
+            }
+        }
+        if(!isSet($templateName) && isSet($repoObject)){
+            $filter = $repoObject->getContentFilter();
+            if(!empty($filter) && count($filter->virtualPaths) == 1){
+                $templateName = "ajxp_unique_strip";
+            }else{
+                $templateName = "ajxp_shared_folder";
+            }
+        }
+        if(!isSet($templateName) || isSet($error)){
+            $templateName = "ajxp_unique_strip";
+        }
+        // UPDATE TEMPLATE
+        $html = file_get_contents(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/action.share/res/minisite.php");
+        Controller::applyHook("tpl.filter_html", [$context, &$html]);
+        $html = XMLFilter::resolveKeywords($html);
+        $html = str_replace("AJXP_MINISITE_LOGO", $minisiteLogo, $html);
+        $html = str_replace("AJXP_APPLICATION_TITLE", ConfService::getGlobalConf("APPLICATION_TITLE"), $html);
+        $html = str_replace("PYDIO_APP_TITLE", ConfService::getGlobalConf("APPLICATION_TITLE"), $html);
+        if(isSet($repoObject)){
+            $html = str_replace("AJXP_START_REPOSITORY", $repoObject->getId(), $html);
+            $html = str_replace("AJXP_REPOSITORY_LABEL", $repoObject->getDisplay(), $html);
+        }
+        $html = str_replace('AJXP_HASH_LOAD_ERROR', isSet($error)?$error:'', $html);
+        $html = str_replace("AJXP_TEMPLATE_NAME", $templateName, $html);
+        $html = str_replace("AJXP_LINK_HASH", $hash, $html);
+        $guiConfigs = PluginsService::getInstance($context)->getPluginById("gui.ajax")->getConfigs();
+        $html = str_replace("AJXP_THEME", $guiConfigs["GUI_THEME"] , $html);
+
+        if (!empty($data["PRELOG_USER"])) {
+            $html = str_replace("AJXP_PRELOGED_USER", "ajxp_preloged_user", $html);
+        } else if(isSet($data["PRESET_LOGIN"])) {
+            $html = str_replace("AJXP_PRELOGED_USER", $data["PRESET_LOGIN"], $html);
+        } else{
+            $html = str_replace("AJXP_PRELOGED_USER", "ajxp_legacy_minisite", $html);
+        }
+
+        if (!empty($data["AJXP_APPLICATION_BASE"])) {
+            $tPath = $data["AJXP_APPLICATION_BASE"];
+        } else {
+            // Replace base uri by .. : /path/to/uri should give ../../..
+            $defaultTPath = implode("/", array_map(function ($v) {
+                return "..";
+            }, explode("/", trim(ConfService::getGlobalConf("PUBLIC_BASEURI"), "/"))));
+            $tPath = (!empty($data["TRAVEL_PATH_TO_ROOT"]) ? $data["TRAVEL_PATH_TO_ROOT"] : $defaultTPath);
+        }
+
+        $serverBaseUrl = ApplicationState::detectServerURL(true);
+
+        // Update Host dynamically if it differ from registered one.
+        $registeredHost = parse_url($tPath, PHP_URL_HOST);
+        $currentHost = parse_url($serverBaseUrl, PHP_URL_HOST);
+        if($registeredHost != $currentHost){
+            $tPath = str_replace($registeredHost, $currentHost, $tPath);
+        }
+        // Update scheme dynamically if it differ from registered one.
+        $registeredScheme = parse_url($tPath, PHP_URL_SCHEME);
+        $currentScheme = parse_url($serverBaseUrl, PHP_URL_SCHEME);
+        if($registeredScheme != $currentScheme){
+            $tPath = str_replace($registeredScheme."://", $currentScheme."://", $tPath);
+        }
+        global $skipHtmlBase;
+        if(!empty($skipHtmlBase)){
+            $html = str_replace("<base href=\"AJXP_PATH_TO_ROOT\"/>", "", $html);
+        }else{
+            $html = str_replace("AJXP_PATH_TO_ROOT", rtrim($tPath, "/")."/", $html);
+        }
+
+        HTMLWriter::internetExplorerMainDocumentHeader($responseInterface);
+        $responseInterface = $responseInterface->withHeader("Content-type", "text/html; charset:UTF-8");
+        $responseInterface->getBody()->write($html);
+        return $responseInterface;
+
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/action.share/src/View/PublicAccessManager.php b/core/src/plugins/action.share/src/View/PublicAccessManager.php
new file mode 100644
index 0000000000..b755e010f3
--- /dev/null
+++ b/core/src/plugins/action.share/src/View/PublicAccessManager.php
@@ -0,0 +1,92 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Share\View;
+
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\ApplicationState;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class PublicAccessManager
+ * @package Pydio\Share\View
+ */
+class PublicAccessManager
+{
+    /**
+     * @var array
+     */
+    private $options;
+
+    /**
+     * PublicFolderManager constructor.
+     * @param array $options Key => value options
+     */
+    public function __construct($options){
+        $this->options = $options;
+    }
+    
+    /**
+     * Compute external link from the given hash
+     * @param string $hash
+     * @return string
+     */
+    public function buildPublicLink($hash)
+    {
+        $addLang = LocaleService::getLanguage() != ConfService::getGlobalConf("DEFAULT_LANGUAGE");
+        if($addLang) return $this->buildPublicDlURL()."/".$hash."--". LocaleService::getLanguage();
+        else return $this->buildPublicDlURL()."/".$hash;
+    }
+
+    /**
+     * Compute base URL for external links
+     * @return mixed|string
+     */
+    public function buildPublicDlURL()
+    {
+        $dlURL = ConfService::getGlobalConf("PUBLIC_DOWNLOAD_URL");
+        if (!empty($dlURL)) {
+            $parts = parse_url($dlURL);
+            if($parts['scheme']) {
+                return rtrim($dlURL, "/");
+            } else {
+                $host = ApplicationState::detectServerURL();
+                return rtrim($host, "/")."/".trim($dlURL, "/");
+            }
+        } else {
+            $fullUrl = ApplicationState::detectServerURL(true);
+            return str_replace("\\", "/", rtrim($fullUrl, "/")."/".trim(ConfService::getGlobalConf("PUBLIC_BASEURI"), "/"));
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function computeMinisiteToServerURL()
+    {
+        $minisite = parse_url($this->buildPublicDlURL(), PHP_URL_PATH) ."/a.php";
+        $server = rtrim(parse_url( ApplicationState::detectServerURL(true), PHP_URL_PATH), "/");
+        return ApplicationState::getTravelPath($minisite, $server);
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/action.skeleton/PluginSkeleton.php b/core/src/plugins/action.skeleton/PluginSkeleton.php
new file mode 100644
index 0000000000..cbaba84695
--- /dev/null
+++ b/core/src/plugins/action.skeleton/PluginSkeleton.php
@@ -0,0 +1,93 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Action\Skeleton;
+
+use DOMNode;
+use DOMXPath;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\PluginFramework\Plugin;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Simple non-fonctionnal plugin for demoing pre/post processes hooks
+ */
+class PluginSkeleton extends Plugin
+{
+    /**
+     * @param DOMNode $contribNode
+     * @return void
+     */
+    public function parseSpecificContributions(\Pydio\Core\Model\ContextInterface $ctx, \DOMNode &$contribNode)
+    {
+        if ($contribNode->nodeName != "client_configs") return;
+        // This demonstrate how the tight integration of XML, PHP and JS Client make plugins programming
+        // very flexible. Here if the plugin configuration SHOW_CUSTOM_FOOTER is set to false, we
+        // dynamically remove some XML from the manifest before it's sent to the client, thus disabling
+        // the custom footer. In the other case, we update the XML Node content with the CUSTOM_FOOTER_CONTENT
+        $actionXpath = new DOMXPath($contribNode->ownerDocument);
+        $footerTplNodeList = $actionXpath->query('template[@name="bottom"]', $contribNode);
+        $footerTplNode = $footerTplNodeList->item(0);
+        if (!$this->getContextualOption($ctx, "SHOW_CUSTOM_FOOTER")) {
+            $contribNode->removeChild($footerTplNode);
+        } else {
+            $content = $this->getContextualOption($ctx, "CUSTOM_FOOTER_CONTENT");
+            $content = str_replace("\\n", "<br>", $content);
+            $cdata = '<div id="optional_bottom_div" style="font-family:arial;padding:10px;">' . $content . '</div>';
+            $cdataSection = $contribNode->ownerDocument->createCDATASection($cdata);
+            foreach ($footerTplNode->childNodes as $child) $footerTplNode->removeChild($child);
+            $footerTplNode->appendChild($cdataSection);
+        }
+    }
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     */
+    public function receiveAction(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface $responseInterface)
+    {
+        if ($requestInterface->getAttribute("action") == "my_skeleton_button_frame") {
+            header("Content-type:text/html");
+            print("<p>This is a <b>dynamically</b> generated content. It is sent back to the client by the server, thus it can be the result of what you want : a query to a remote API, a constant string (like it is now), or any specific data stored by the application...</p>");
+            print("<p>Here the server sends back directly HTML that is displayed by the client, but other formats can be used when it comes to more structured data, allowing the server to stay focus on the data and the client to adapt the display : <ul><li>JSON : use <b>json_encode/json_decode</b> on the PHP side, and <b>transport.reponseJSON</b> on the client side</li><li>XML : print your own XML on the php side, and use <b>transport.responseXML</b> on the client side.</li><li>The advantage of HTML can also be used to send javascript instruction to the client.</li></ul></p>");
+        }
+    }
+
+    /**
+     * This is an example of filter that can be hooked to the AJXP_VarsFilter,
+     * for using your own custom variables in the repositories configurations.
+     * In this example, this variable does exactly what the current AJXP_USER variable do.
+     * Thus, once hooked, you can use CUSTOM_VARIABLE_USER in e.g. a repository PATH, and
+     * build this path dynamically depending on the current user logged.
+     * Contrary to other standards hooks like node.info, this cannot be added via XML manifest
+     * as it happen too early in the application, so it must be declared directly inside the conf.php
+     *
+     * @param String $value
+     * @param ContextInterface $context
+     */
+    public static function filterVars(&$value, $context)
+    {
+        if ($context->hasUser()) {
+            $value = str_replace("CUSTOM_VARIABLE_USER", $context->getUser()->getId(), $value);
+        }
+    }
+}
diff --git a/core/src/plugins/action.skeleton/class.PluginSkeleton.php b/core/src/plugins/action.skeleton/class.PluginSkeleton.php
deleted file mode 100644
index 114c14ee8b..0000000000
--- a/core/src/plugins/action.skeleton/class.PluginSkeleton.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Simple non-fonctionnal plugin for demoing pre/post processes hooks
- * @package AjaXplorer_Plugins
- * @subpackage Action
- */
-class PluginSkeleton extends AJXP_Plugin
-{
-    /**
-     * @param DOMNode $contribNode
-     * @return void
-     */
-    public function parseSpecificContributions(&$contribNode)
-    {
-        if($contribNode->nodeName != "client_configs") return;
-        // This demonstrate how the tight integration of XML, PHP and JS Client make plugins programming
-        // very flexible. Here if the plugin configuration SHOW_CUSTOM_FOOTER is set to false, we
-        // dynamically remove some XML from the manifest before it's sent to the client, thus disabling
-        // the custom footer. In the other case, we update the XML Node content with the CUSTOM_FOOTER_CONTENT
-        $actionXpath=new DOMXPath($contribNode->ownerDocument);
-        $footerTplNodeList = $actionXpath->query('template[@name="bottom"]', $contribNode);
-        $footerTplNode = $footerTplNodeList->item(0);
-        if (!$this->getFilteredOption("SHOW_CUSTOM_FOOTER")) {
-            $contribNode->removeChild($footerTplNode);
-        } else {
-            $content = $this->getFilteredOption("CUSTOM_FOOTER_CONTENT");
-            $content = str_replace("\\n", "<br>", $content);
-            $cdata = '<div id="optional_bottom_div" style="font-family:arial;padding:10px;">'.$content.'</div>';
-            $cdataSection = $contribNode->ownerDocument->createCDATASection($cdata);
-            foreach($footerTplNode->childNodes as $child) $footerTplNode->removeChild($child);
-            $footerTplNode->appendChild($cdataSection);
-        }
-    }
-
-    /**
-     * @param String $action
-     * @param Array $httpVars
-     * @param Array $fileVars
-     * @return void
-     */
-    public function receiveAction($action, $httpVars, $fileVars)
-    {
-        if ($action == "my_skeleton_button_frame") {
-            header("Content-type:text/html");
-            print("<p>This is a <b>dynamically</b> generated content. It is sent back to the client by the server, thus it can be the result of what you want : a query to a remote API, a constant string (like it is now), or any specific data stored by the application...</p>");
-            print("<p>Here the server sends back directly HTML that is displayed by the client, but other formats can be used when it comes to more structured data, allowing the server to stay focus on the data and the client to adapt the display : <ul><li>JSON : use <b>json_encode/json_decode</b> on the PHP side, and <b>transport.reponseJSON</b> on the client side</li><li>XML : print your own XML on the php side, and use <b>transport.responseXML</b> on the client side.</li><li>The advantage of HTML can also be used to send javascript instruction to the client.</li></ul></p>");
-        }
-    }
-
-    /**
-     * This is an example of filter that can be hooked to the AJXP_VarsFilter,
-     * for using your own custom variables in the repositories configurations.
-     * In this example, this variable does exactly what the current AJXP_USER variable do.
-     * Thus, once hooked, you can use CUSTOM_VARIABLE_USER in e.g. a repository PATH, and
-     * build this path dynamically depending on the current user logged.
-     * Contrary to other standards hooks like node.info, this cannot be added via XML manifest
-     * as it happen too early in the application, so it must be declared directly inside the conf.php
-     *
-     * @param String $value
-     */
-    public static function filterVars(&$value)
-    {
-        if (AuthService::getLoggedUser() != null) {
-            $value = str_replace("CUSTOM_VARIABLE_USER", AuthService::getLoggedUser()->getId(), $value);
-        }
-    }
-}
diff --git a/core/src/plugins/action.skeleton/manifest.xml b/core/src/plugins/action.skeleton/manifest.xml
index ce288b976d..f7ebc20fa3 100644
--- a/core/src/plugins/action.skeleton/manifest.xml
+++ b/core/src/plugins/action.skeleton/manifest.xml
@@ -64,5 +64,5 @@
             </action>
         </actions>
 	</registry_contributions>
-	<class_definition filename="plugins/action.skeleton/class.PluginSkeleton.php" classname="PluginSkeleton"/>
+	<class_definition filename="plugins/action.skeleton/PluginSkeleton.php" classname="Pydio\Action\Skeleton\PluginSkeleton"/>
 </ajxp_plugin>
diff --git a/core/src/plugins/action.skeleton/res/i18n/conf/de.php b/core/src/plugins/action.skeleton/res/i18n/conf/de.php
index 75f14e2491..3c31527877 100644
--- a/core/src/plugins/action.skeleton/res/i18n/conf/de.php
+++ b/core/src/plugins/action.skeleton/res/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Skeleton Plugin" => "Leere Erweiterung",
diff --git a/core/src/plugins/action.skeleton/res/i18n/conf/en.php b/core/src/plugins/action.skeleton/res/i18n/conf/en.php
index 0774439244..0fce9999df 100644
--- a/core/src/plugins/action.skeleton/res/i18n/conf/en.php
+++ b/core/src/plugins/action.skeleton/res/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Skeleton Plugin" => "Skeleton Plugin",
diff --git a/core/src/plugins/action.skeleton/res/i18n/conf/fr.php b/core/src/plugins/action.skeleton/res/i18n/conf/fr.php
index aab14cb3ab..9f2e7ae340 100644
--- a/core/src/plugins/action.skeleton/res/i18n/conf/fr.php
+++ b/core/src/plugins/action.skeleton/res/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Skeleton Plugin" => "Plugin Squelette",
diff --git a/core/src/plugins/action.skeleton/res/i18n/conf/it.php b/core/src/plugins/action.skeleton/res/i18n/conf/it.php
index 216e76d7cc..4148bc70ae 100644
--- a/core/src/plugins/action.skeleton/res/i18n/conf/it.php
+++ b/core/src/plugins/action.skeleton/res/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Skeleton Plugin" => "Skeleton Plugin",
diff --git a/core/src/plugins/action.skeleton/res/i18n/conf/pt.php b/core/src/plugins/action.skeleton/res/i18n/conf/pt.php
index bc6128236f..638ef77807 100644
--- a/core/src/plugins/action.skeleton/res/i18n/conf/pt.php
+++ b/core/src/plugins/action.skeleton/res/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Skeleton Plugin" => "Plugin Esqueleto",
diff --git a/core/src/plugins/action.skeleton/res/i18n/de.php b/core/src/plugins/action.skeleton/res/i18n/de.php
index d5431abe41..5083fb724f 100644
--- a/core/src/plugins/action.skeleton/res/i18n/de.php
+++ b/core/src/plugins/action.skeleton/res/i18n/de.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 defined('AJXP_EXEC') or die( 'Access not allowed');
diff --git a/core/src/plugins/action.skeleton/res/i18n/en.php b/core/src/plugins/action.skeleton/res/i18n/en.php
index 6e7a9ef474..c44e198163 100644
--- a/core/src/plugins/action.skeleton/res/i18n/en.php
+++ b/core/src/plugins/action.skeleton/res/i18n/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 defined('AJXP_EXEC') or die( 'Access not allowed');
diff --git a/core/src/plugins/action.skeleton/res/i18n/fr.php b/core/src/plugins/action.skeleton/res/i18n/fr.php
index 41b61e16e8..b603bc3f7e 100644
--- a/core/src/plugins/action.skeleton/res/i18n/fr.php
+++ b/core/src/plugins/action.skeleton/res/i18n/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Lien externe",
diff --git a/core/src/plugins/action.skeleton/res/i18n/it.php b/core/src/plugins/action.skeleton/res/i18n/it.php
index f4fb3b3d7d..cdd7921530 100644
--- a/core/src/plugins/action.skeleton/res/i18n/it.php
+++ b/core/src/plugins/action.skeleton/res/i18n/it.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 defined('AJXP_EXEC') or die( 'Accesso non consentito');
diff --git a/core/src/plugins/action.skeleton/res/i18n/pt.php b/core/src/plugins/action.skeleton/res/i18n/pt.php
index 1e1f392519..3eb064f184 100644
--- a/core/src/plugins/action.skeleton/res/i18n/pt.php
+++ b/core/src/plugins/action.skeleton/res/i18n/pt.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 defined('AJXP_EXEC') or die( 'Access not allowed');
diff --git a/core/src/plugins/action.timestamp/TimestampCreator.php b/core/src/plugins/action.timestamp/TimestampCreator.php
new file mode 100644
index 0000000000..054de4df7f
--- /dev/null
+++ b/core/src/plugins/action.timestamp/TimestampCreator.php
@@ -0,0 +1,124 @@
+<?php
+/*
+Timestamp plugin by Ffdecourt (fdecourt@gmail.com) for Pydio
+This plugin allows you to add a certified timestamp by Universign.eu on your documents.
+v0.1
+*/
+
+namespace Pydio\Action\Timestamp;
+
+use Pydio\Access\Core\MetaStreamWrapper;
+use Pydio\Access\Core\Model\UserSelection;
+
+use Pydio\Core\Exception\PydioException;
+
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\Services\LocaleService;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class TimestampCreator
+ * @package Pydio\Action\Timestamp
+ */
+class TimestampCreator extends Plugin
+{
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public function switchAction(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface $responseInterface)
+    {
+        $mess = LocaleService::getMessages();
+        $ctx = $requestInterface->getAttribute("ctx");
+
+        $timestamp_url = $this->getContextualOption($ctx, "TIMESTAMP_URL");
+        $timestamp_login = $this->getContextualOption($ctx, "USER");
+        $timestamp_password = $this->getContextualOption($ctx, "PASS");
+
+        //Check if the configuration has been initiated
+        if (empty($timestamp_url) || empty($timestamp_login) || !empty($timestamp_password)) {
+            $this->logError("Config", "TimeStamp : configuration is needed");
+            throw new PydioException($mess["timestamp.4"]);
+        }
+
+
+        //Check if after being initiated, conf. fields have some values
+        if (strlen($timestamp_url) < 2 || strlen($timestamp_login) < 2 || strlen($timestamp_password) < 2) {
+            $this->logError("Config", "TimeStamp : configuration is incorrect");
+            throw new PydioException($mess["timestamp.4"]);
+        }
+
+        //Get active repository
+        $ctx = $requestInterface->getAttribute("ctx");
+        $selection = UserSelection::fromContext($ctx, $requestInterface->getParsedBody());
+        $destStreamURL = $selection->currentBaseUrl();
+
+        $fileName = $selection->getUniqueFile();
+        $fileUrl = $destStreamURL . $fileName;
+        $file = MetaStreamWrapper::getRealFSReference($fileUrl, true);
+
+        //Hash the file, to send it to Universign
+        $hashedDataToTimestamp = hash_file('sha256', $file);
+
+        //Check that a tokken is not going to be timestamped !
+        if (substr("$file", -4) != '.ers') {
+            if (file_exists($file . '.ers')) {
+                throw new PydioException($mess["timestamp.1"]);
+            } else {
+                //Prepare the query that will be sent to Universign
+                $dataToSend = array('hashAlgo' => 'SHA256', 'withCert' => 'true', 'hashValue' => $hashedDataToTimestamp);
+                $dataQuery = http_build_query($dataToSend);
+
+                //Check if allow_url_fopen is allowed on the server. If not, it will use cUrl
+                if (ini_get('allow_url_fopen')) {
+                    $context_options = array(
+                        'http' => array(
+                            'method' => 'POST',
+                            'header' => "Content-type: application/x-www-form-urlencoded\r\n"
+                                . "Content-Length: " . strlen($dataQuery) . "\r\n"
+                                . "Authorization: Basic " . base64_encode($timestamp_login . ':' . $timestamp_password) . "\r\n",
+                            'content' => $dataQuery
+                        )
+                    );
+
+                    //Get the result from Universign
+                    $context = stream_context_create($context_options);
+                    $fp = fopen($timestamp_url, 'r', false, $context);
+                    $tsp = stream_get_contents($fp);
+                } //Use Curl if allow_url_fopen is not available
+                else {
+
+                    $timestamp_header = array("Content-type: application/x-www-form-urlencoded", "Content-Length: " . strlen($dataQuery), "Authorization: Basic " . base64_encode($timestamp_login . ':' . $timestamp_password));
+                    $timeout = 5;
+                    $ch = curl_init($timestamp_url);
+                    curl_setopt($ch, CURLOPT_POSTFIELDS, $dataQuery);
+                    curl_setopt($ch, CURLOPT_HTTPHEADER, $timestamp_header);
+                    curl_setopt($ch, CURLOPT_POST, 1);
+                    curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
+                    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+                    //Get the result from Universign
+                    $tsp = curl_exec($ch);
+                    curl_close($ch);
+                }
+
+                //Save the result to a file
+                file_put_contents($file . '.ers', $tsp);
+
+                //Send the succesful message
+                $this->logInfo("TimeStamp", array("files" => $file, "destination" => $file . '.ers'));
+
+                $bodyStream = new \Pydio\Core\Http\Response\SerializableResponseStream();
+                $nodesDiff = new \Pydio\Access\Core\Model\NodesDiff();
+                $nodesDiff->update($selection->getUniqueNode());
+                $bodyStream->addChunk($nodesDiff);
+                $bodyStream->addChunk(new \Pydio\Core\Http\Message\UserMessage($mess["timestamp.3"] . $fileName));
+            }
+
+        } else {
+            throw new PydioException($mess["timestamp.2"]);
+        }
+    }
+}
diff --git a/core/src/plugins/action.timestamp/class.TimestampCreator.php b/core/src/plugins/action.timestamp/class.TimestampCreator.php
deleted file mode 100644
index b5beb4a6af..0000000000
--- a/core/src/plugins/action.timestamp/class.TimestampCreator.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/*
-Timestamp plugin by Ffdecourt (fdecourt@gmail.com) for Pydio
-This plugin allows you to add a certified timestamp by Universign.eu on your documents.
-v0.1
-*/
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-class TimestampCreator extends AJXP_Plugin
-{
-    public function switchAction($action, $httpVars, $fileVars)
-    {
-        $mess = ConfService::getMessages();
-
-        $timestamp_url = $this->getFilteredOption("TIMESTAMP_URL");
-        $timestamp_login = $this->getFilteredOption("USER");
-        $timestamp_password = $this->getFilteredOption("PASS");
-
-        //Check if the configuration has been initiated
-        if (empty($timestamp_url) || empty($timestamp_login) || !empty($timestamp_password) ) {
-            throw new AJXP_Exception($mess["timestamp.4"]);
-            $this->logError("Config", "TimeStamp : configuration is needed");
-            return false;
-        }
-
-
-        //Check if after being initiated, conf. fields have some values
-        if (strlen($timestamp_url)<2 || strlen($timestamp_login)<2 || strlen($timestamp_password)<2 ) {
-            throw new AJXP_Exception($mess["timestamp.4"]);
-            $this->logError("Config", "TimeStamp : configuration is incorrect");
-            return false;
-        }
-
-        //Get active repository
-        $repository = ConfService::getRepository();
-        if (!$repository->detectStreamWrapper(true)) {
-            return false;
-        }
-        $selection = new UserSelection($repository, $httpVars);
-        $destStreamURL = $selection->currentBaseUrl();
-
-        $fileName = $selection->getUniqueFile();
-        $fileUrl = $destStreamURL.$fileName;
-        $file = AJXP_MetaStreamWrapper::getRealFSReference($fileUrl, true);
-
-        //Hash the file, to send it to Universign
-        $hashedDataToTimestamp = hash_file('sha256', $file);
-
-        //Check that a tokken is not going to be timestamped !
-        if (substr("$file", -4)!='.ers') {
-            if (file_exists($file.'.ers')) {
-                throw new AJXP_Exception($mess["timestamp.1"]);
-                return false;
-            } else {
-                //Prepare the query that will be sent to Universign
-                $dataToSend = array ('hashAlgo' => 'SHA256', 'withCert' => 'true', 'hashValue' => $hashedDataToTimestamp);
-                $dataQuery = http_build_query($dataToSend);
-
-                //Check if allow_url_fopen is allowed on the server. If not, it will use cUrl
-                if (ini_get('allow_url_fopen')) {
-                    $context_options = array (
-                        'http' => array (
-                            'method' => 'POST',
-                            'header'=> "Content-type: application/x-www-form-urlencoded\r\n"
-                            ."Content-Length: " . strlen($dataQuery) . "\r\n"
-                            ."Authorization: Basic ".base64_encode($timestamp_login.':'.$timestamp_password)."\r\n",
-                            'content' => $dataQuery
-                        )
-                    );
-
-                    //Get the result from Universign
-                    $context = stream_context_create($context_options);
-                    $fp = fopen($timestamp_url, 'r', false, $context);
-                    $tsp = stream_get_contents($fp);
-                }
-                //Use Curl if allow_url_fopen is not available
-                else {
-
-                    $timestamp_header = array ("Content-type: application/x-www-form-urlencoded", "Content-Length: " . strlen($dataQuery), "Authorization: Basic ".base64_encode($timestamp_login.':'.$timestamp_password));
-                    $timeout = 5;
-                    $ch = curl_init($timestamp_url);
-                    curl_setopt($ch, CURLOPT_POSTFIELDS, $dataQuery );
-                    curl_setopt($ch,CURLOPT_HTTPHEADER,$timestamp_header );
-                    curl_setopt($ch, CURLOPT_POST, 1);
-                    curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
-                    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-                                        //Get the result from Universign
-                    $tsp=curl_exec($ch);
-                    curl_close($ch);
-                }
-
-                //Save the result to a file
-                file_put_contents( $file.'.ers', $tsp);
-
-                //Send the succesful message
-                $this->logInfo("TimeStamp", array("files"=>$file, "destination"=>$file.'.ers'));
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::reloadDataNode();
-                AJXP_XMLWriter::sendMessage($mess["timestamp.3"].$fileName, null);
-                AJXP_XMLWriter::close();
-            }
-
-        } else {
-            throw new AJXP_Exception($mess["timestamp.2"]);
-            return false;
-        }
-    }
-}
diff --git a/core/src/plugins/action.timestamp/i18n/conf/de.php b/core/src/plugins/action.timestamp/i18n/conf/de.php
index 250c63b0d1..c909a373bf 100644
--- a/core/src/plugins/action.timestamp/i18n/conf/de.php
+++ b/core/src/plugins/action.timestamp/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "timestamp" => "Universign",
diff --git a/core/src/plugins/action.timestamp/i18n/conf/en.php b/core/src/plugins/action.timestamp/i18n/conf/en.php
index c73e72ba97..2ea915f5a1 100644
--- a/core/src/plugins/action.timestamp/i18n/conf/en.php
+++ b/core/src/plugins/action.timestamp/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "timestamp" => "timestamp",
diff --git a/core/src/plugins/action.timestamp/i18n/conf/fr.php b/core/src/plugins/action.timestamp/i18n/conf/fr.php
index b58fc36eb4..535518eb1f 100644
--- a/core/src/plugins/action.timestamp/i18n/conf/fr.php
+++ b/core/src/plugins/action.timestamp/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "timestamp" => "Horodatage",
diff --git a/core/src/plugins/action.timestamp/i18n/conf/it.php b/core/src/plugins/action.timestamp/i18n/conf/it.php
index b9fdbf4364..1033c9fe5a 100644
--- a/core/src/plugins/action.timestamp/i18n/conf/it.php
+++ b/core/src/plugins/action.timestamp/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Timestamp" => "Timestamp",
diff --git a/core/src/plugins/action.timestamp/manifest.xml b/core/src/plugins/action.timestamp/manifest.xml
index e5e17c8ece..6108890b60 100644
--- a/core/src/plugins/action.timestamp/manifest.xml
+++ b/core/src/plugins/action.timestamp/manifest.xml
@@ -5,7 +5,7 @@
         <plugin_author>FDecourt</plugin_author>
         <plugin_version>1.0</plugin_version>
     </plugin_info>
-	<class_definition filename="plugins/action.timestamp/class.TimestampCreator.php" classname="TimestampCreator"/>
+	<class_definition filename="plugins/action.timestamp/TimestampCreator.php" classname="Pydio\Action\Timestamp\TimestampCreator"/>
 	<client_settings>
         <resources>
             <img_library alias="timestamp_images" path="plugins/action.timestamp/images"/>
diff --git a/core/src/plugins/action.updater/UpdateController.php b/core/src/plugins/action.updater/UpdateController.php
new file mode 100644
index 0000000000..5d698df293
--- /dev/null
+++ b/core/src/plugins/action.updater/UpdateController.php
@@ -0,0 +1,198 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Action\Update;
+
+use DOMNode;
+use DOMXPath;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\PluginFramework\Plugin;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * @package AjaXplorer_Plugins
+ * @subpackage Action
+ */
+class UpdateController extends Plugin
+{
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        parent::init($ctx, $options);
+        if ($ctx->hasUser() && $ctx->getUser()->getGroupPath() !== "/") {
+            $this->enabled = false;
+        }
+    }
+
+    /**
+     * Parse
+     * @param DOMNode $contribNode
+     */
+    protected function parseSpecificContributions(\Pydio\Core\Model\ContextInterface $ctx, \DOMNode &$contribNode)
+    {
+        parent::parseSpecificContributions($ctx, $contribNode);
+        if ($this->pluginConf["ENABLE_324_IMPORT"] == true) return;
+
+        if ($contribNode->nodeName != "actions") return;
+        $actionXpath = new DOMXPath($contribNode->ownerDocument);
+        $compressNodeList = $actionXpath->query('action[@name="import_from_324"]', $contribNode);
+        if (!$compressNodeList->length) return;
+        $compressNode = $compressNodeList->item(0);
+        $contribNode->removeChild($compressNode);
+
+        $compressNodeList = $actionXpath->query('action[@name="migrate_metaserial"]', $contribNode);
+        if (!$compressNodeList->length) return;
+        $compressNode = $compressNodeList->item(0);
+        $contribNode->removeChild($compressNode);
+    }
+
+    /**
+     * @param $action
+     * @param $httpVars
+     * @param $fileVars
+     * @param ContextInterface $contextInterface
+     * @throws \Exception
+     * @throws \Pydio\Core\Exception\AuthRequiredException
+     */
+    public function switchAction($action, $httpVars, $fileVars, \Pydio\Core\Model\ContextInterface $contextInterface)
+    {
+        $loggedUser = $contextInterface->getUser();
+        if (UsersService::usersEnabled() && !$loggedUser->isAdmin()) {
+            throw new \Pydio\Core\Exception\AuthRequiredException();
+        }
+        require_once(AJXP_INSTALL_PATH . "/" . AJXP_PLUGINS_FOLDER . "/action.updater/UpgradeManager.php");
+        if (!empty($this->pluginConf["PROXY_HOST"]) || !empty($this->pluginConf["UPDATE_SITE_USER"])) {
+            UpgradeManager::configureProxy(
+                $this->pluginConf["PROXY_HOST"],
+                $this->pluginConf["PROXY_USER"],
+                $this->pluginConf["PROXY_PASS"],
+                $this->pluginConf["UPDATE_SITE_USER"],
+                $this->pluginConf["UPDATE_SITE_PASS"]
+            );
+        }
+
+        switch ($action) {
+
+            case "migrate_metaserial":
+
+                $dryRun = !isSet($httpVars["real_run"]);
+                UpgradeManager::migrateMetaSerialPlugin($contextInterface, $httpVars["repository_id"], $dryRun);
+
+                break;
+
+            case "get_upgrade_path":
+
+                header("Content-type: application/json");
+                print UpgradeManager::getUpgradePath($this->pluginConf["UPDATE_SITE"], "json", $this->pluginConf["UPDATE_CHANNEL"]);
+
+                break;
+
+            case "display_upgrade_note":
+
+                $url = $httpVars["url"];
+                $context = UpgradeManager::getContext();
+                if ($context != null) {
+                    $content = file_get_contents($url, null, $context);
+                } else {
+                    $content = file_get_contents($url);
+                }
+                echo $content;
+
+                break;
+
+            case "test_upgrade_scripts":
+
+                if (!AJXP_SERVER_DEBUG) {
+                    break;
+                }
+                $upgrader = new UpgradeManager("", "", "");
+                $upgrader->testUpgradeScripts();
+
+                break;
+
+            case "perform_upgrade" :
+
+                ApplicationState::safeIniSet("output_buffering", "Off");
+                if (AJXP_PACKAGING != "zip") {
+                    $lang = LocaleService::getLanguage();
+                    $file = $this->getBaseDir() . "/howto/linux_en.html";
+                    if ($lang != "en" && is_file($this->getBaseDir() . "/howto/linux_$lang.html")) {
+                        $file = $this->getBaseDir() . "/howto/linux_$lang.html";
+                    }
+                    $content = file_get_contents($file);
+                    print $content;
+                    break;
+                }
+                $res = UpgradeManager::getUpgradePath($this->pluginConf["UPDATE_SITE"], "php", $this->pluginConf["UPDATE_CHANNEL"]);
+                if (!count($res["packages"])) {
+                    print("No update is necessary!");
+                    break;
+                }
+                include(dirname(__FILE__) . "/output_head.html");
+                foreach ($res["packages"] as $index => $zipPackage) {
+                    print("<div class='main_step'>Applying upgrade " . basename($zipPackage) . "</div>");
+                    $u = new UpgradeManager(
+                        $zipPackage,
+                        $res["hashes"][$index],
+                        $res["hash_method"],
+                        explode(",", $this->pluginConf["PRESERVE_FILES"])
+                    );
+                    $errors = false;
+                    while ($u->hasNextStep()) {
+                        set_time_limit(180);
+                        print("<div class='upgrade_step'><div class='upgrade_title'>" . $u->currentStepTitle . "</div>");
+                        $u->execute();
+                        if ($u->error != null) {
+                            print("<div class='upgrade_result error'>- Error : " . $u->error . "</div>");
+                            $errors = true;
+                            break;
+                        } else {
+                            print("<div class='upgrade_result success'>- " . $u->result . "</div>");
+                        }
+                        print("</div>");
+                        // FLUSH OUTPUT, SCROLL DOWN
+                        print str_repeat(' ', 300);
+                        print('<script type="text/javascript">doScroll();</script>');
+                        flush();
+                        sleep(0.5);
+                    }
+                    if ($errors) break;
+                }
+                print('<script type="text/javascript">replaceTop();</script>');
+                print str_repeat(' ', 300);
+                flush();
+
+
+                break;
+
+
+        }
+
+    }
+
+}
diff --git a/core/src/plugins/action.updater/UpgradeManager.php b/core/src/plugins/action.updater/UpgradeManager.php
new file mode 100644
index 0000000000..62520ebd98
--- /dev/null
+++ b/core/src/plugins/action.updater/UpgradeManager.php
@@ -0,0 +1,605 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Action\Update;
+
+use dibi;
+use DibiException;
+use Exception;
+use PclZip;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Utils\FileHelper;
+use Pydio\Core\Utils\Vars\OptionsHelper;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * @package AjaXplorer_Plugins
+ * @subpackage Action
+ */
+class UpgradeManager
+{
+    private $archiveURL;
+    private $archiveHash;
+    private $archiveHashMethod;
+    private $markedFiles;
+
+    private $debugMode = FALSE;
+    private $cleanFile = "UPGRADE/CLEAN-FILES";
+    private $additionalScript = "UPGRADE/PHP-SCRIPT";
+    private $stepTriggerPrefix = "UPGRADE/PHP-";
+    private $releaseNote = "UPGRADE/NOTE";
+    private $htmlInstructions = "UPGRADE/NOTE-HTML";
+    private $dbUpgrade = "UPGRADE/DB-UPGRADE";
+    private $installPath;
+    private static $context = null;
+
+    private $archive;
+    private $workingFolder;
+    private $steps;
+    public $step = 0;
+
+    public $error = null;
+    public $result = "";
+    public $currentStepTitle;
+
+    /**
+     * UpgradeManager constructor.
+     * @param $archiveURL
+     * @param $hash
+     * @param $method
+     * @param array $backupFiles
+     */
+    public function __construct($archiveURL, $hash, $method, $backupFiles = array())
+    {
+        $this->archiveURL = $archiveURL;
+        $this->archiveHash = $hash;
+        $this->archiveHashMethod = $method;
+        $this->markedFiles = $backupFiles;
+
+        $this->installPath = AJXP_INSTALL_PATH;
+        if ($this->debugMode) {
+            @mkdir(AJXP_INSTALL_PATH . "/upgrade_test");
+            $this->installPath = AJXP_INSTALL_PATH . "/upgrade_test";
+        }
+
+        $this->workingFolder = AJXP_DATA_PATH . "/tmp/update";
+        $this->steps = array(
+            "checkDownloadFolder" => "Checking download permissions",
+            "downloadArchive" => "Downloading upgrade archive",
+            "checkArchiveIntegrity" => "Checking archive integrity",
+            "checkTargetFolder" => "Checking folders permissions",
+            "extractArchive" => "Extracting Archive",
+            "backupMarkedFiles" => "Backuping your modified files",
+            "copyCodeFiles" => "Copying core source files",
+            "restoreMarkedFiles" => "Restoring your modified files",
+            "duplicateConfFiles" => "Copying configuration files",
+            "cleanUnusedFiles" => "Deleting unused files",
+            "upgradeDB" => "Upgrading database",
+            "specificTask" => "Running specific upgrade task",
+            "updateVersion" => "Everything went ok, upgrading version!",
+            "clearCache" => "Clearing plugins cache",
+            "displayNote" => "Release note : ",
+            "displayUpgradeInstructions" => "Upgrade instructions",
+        );
+
+    }
+
+    /**
+     * @param $proxyHost
+     * @param $proxyUser
+     * @param $proxyPass
+     * @param string $siteUser
+     * @param string $sitePass
+     */
+    public static function configureProxy($proxyHost, $proxyUser, $proxyPass, $siteUser = "", $sitePass = "")
+    {
+        $contextData = array('http' => array());
+        if (!empty($proxyHost)) {
+            $contextData['http']['proxy'] = 'tcp://' . $proxyHost;// $proxy = array( 'http' => array( 'proxy' => 'tcp://'.$proxyHost, 'request_fulluri' => true ) );
+            $contextData['http']['request_fulluri'] = true;
+            $contextData['ssl']['SNI_enabled'] = false;
+            if (!empty($proxyUser) && !empty($proxyPass)) {
+                $auth = base64_encode($proxyUser . ":" . $proxyPass);
+                $contextData['http']['header'] = "Proxy-Authorization: Basic $auth";
+            }
+        }
+        if (!empty($siteUser) && !empty($sitePass)) {
+            $headerString = "Authorization: Basic " . base64_encode("$siteUser:$sitePass");
+            if (isSet($contextData['http']['header'])) {
+                $contextData['http']['header'] .= "; " . $headerString;
+            } else {
+                $contextData['http']['header'] = $headerString;
+            }
+        }
+
+        self::$context = stream_context_create($contextData);
+    }
+
+    /**
+     * @return null
+     */
+    public static function getContext()
+    {
+        return self::$context;
+    }
+
+    /**
+     * @param $url
+     * @param string $format
+     * @param string $channel
+     * @return bool|mixed|string
+     */
+    public static function getUpgradePath($url, $format = "php", $channel = "stable")
+    {
+        $packageName = "pydio-core";
+        if (defined('AJXP_PACKAGE_NAME')) {
+            $packageName = AJXP_PACKAGE_NAME;
+        }
+        if (isSet(self::$context)) {
+            $json = file_get_contents($url . "?channel=" . $channel . "&version=" . AJXP_VERSION . "&package=" . $packageName, null, self::$context);
+        } else {
+            $json = FileHelper::getRemoteContent($url . "?channel=" . $channel . "&version=" . AJXP_VERSION . "&package=" . $packageName);
+        }
+        if ($format == "php") return json_decode($json, true);
+        else return $json;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasNextStep()
+    {
+        if ($this->step < count($this->steps) && $this->error == NULL) {
+            $stepValues = array_values($this->steps);
+            $this->currentStepTitle = $stepValues[$this->step];
+            return true;
+        }
+        return false;
+    }
+
+    public function execute()
+    {
+        $stepKeys = array_keys($this->steps);
+        $stepName = $stepKeys[$this->step];
+        try {
+            $this->executeStepTrigger($stepName, "pre");
+            if (method_exists($this, $stepKeys[$this->step])) {
+                $this->result = call_user_func(array($this, $stepKeys[$this->step]));
+            } else {
+                $this->result = "Skipping step, method not found";
+            }
+            $this->executeStepTrigger($stepName, "post");
+        } catch (Exception $e) {
+            $this->error = $e->getMessage();
+        }
+        $this->step++;
+    }
+
+    public function testUpgradeScripts()
+    {
+        echo '<br>' . $this->upgradeDB();
+        echo '<br>' . $this->specificTask();
+    }
+
+    /**
+     * @return string
+     * @throws Exception
+     */
+    public function checkDownloadFolder()
+    {
+        if (!is_dir($this->workingFolder)) {
+            $t = @mkdir($this->workingFolder, 0755, true);
+            if ($t === false) throw new Exception("Cannot create target folder for downloading upgrade archive!");
+        }
+        return "OK";
+    }
+
+    /**
+     * @return string
+     * @throws Exception
+     */
+    public function checkTargetFolder()
+    {
+        if (!is_writable(AJXP_INSTALL_PATH)) {
+            throw new Exception("The root install path is not writeable, no file will be overriden!
+            <br>When performing upgrades, first change the ownership (using chown) of the Pydio root folder
+            to your web server account (e.g. www-data or apache) and propagate that ownership change to all
+            Pydio sub-folders. <br>Run the upgrade again then, post upgrade, change the ownership back
+            to the previous settings for all Pydio folders, <b>except for the data/ folder</b> that must stay
+            writeable by the web server.");
+        }
+        return "OK";
+    }
+
+    /**
+     * @return string
+     * @throws Exception
+     */
+    public function downloadArchive()
+    {
+        $this->archive = $this->workingFolder . "/" . basename($this->archiveURL);
+        if ($this->debugMode && is_file($this->archive)) {
+            return "Already downloaded";
+        }
+        if (self::$context) {
+            $content = file_get_contents($this->archiveURL, null, self::$context);
+        } else {
+            $content = FileHelper::getRemoteContent($this->archiveURL);
+        }
+        if ($content === false || strlen($content) == 0) {
+            throw new Exception("Error while downloading");
+        }
+        file_put_contents($this->archive, $content);
+        return "File saved in " . $this->archive;
+    }
+
+    /**
+     * @return string
+     * @throws Exception
+     */
+    public function extractArchive()
+    {
+        require_once(AJXP_BIN_FOLDER . "/lib/pclzip.lib.php");
+        $archive = new PclZip($this->archive);
+        $result = $archive->extract(PCLZIP_OPT_PATH, $this->workingFolder);
+        if ($result <= 0) {
+            throw new Exception($archive->errorInfo(true));
+        } else {
+            // Check that there is a new folder without zip extension
+            if (is_dir($this->workingFolder . "/" . substr(basename($this->archive), 0, -4))) {
+                $this->workingFolder = $this->workingFolder . "/" . substr(basename($this->archive), 0, -4);
+            }
+            return "Extracted folder " . $this->workingFolder;
+        }
+
+    }
+
+    /**
+     * @return string
+     * @throws Exception
+     */
+    public function checkArchiveIntegrity()
+    {
+        if (!is_file($this->archive)) {
+            throw new Exception("Cannot find archive file!");
+        }
+        $result = hash_file($this->archiveHashMethod, $this->archive);
+        if ($result != $this->archiveHash) {
+            throw new Exception("Warning the archive seems corrupted, you should re-download it!");
+        }
+        return "Hash is ok ($this->archiveHash)";
+    }
+
+    /**
+     * @return string
+     */
+    public function backupMarkedFiles()
+    {
+        $targetFolder = $this->installPath;
+        if (!is_array($this->markedFiles) || !count($this->markedFiles)) {
+            return "Nothing to do";
+        }
+        foreach ($this->markedFiles as $index => $file) {
+            $file = trim($file);
+            if (!empty($file) && is_file($targetFolder . "/" . $file)) {
+                $newName = $file . ".orig-" . date("Ymd");
+                copy($targetFolder . "/" . $file, $targetFolder . "/" . $newName);
+            } else {
+                unset($this->markedFiles[$index]);
+            }
+        }
+        if (!count($this->markedFiles)) {
+            return "Nothing to do";
+        }
+        return "Backup of " . count($this->markedFiles) . " file(s) marked as preserved.";
+    }
+
+    /**
+     * @return string
+     */
+    public function copyCodeFiles()
+    {
+        // CORE & PLUGINS
+        $targetFolder = $this->installPath;
+        self::copy_r($this->workingFolder . "/core", $targetFolder . "/core");
+        self::copy_r($this->workingFolder . "/plugins", $targetFolder . "/plugins");
+        $rootFiles = glob($this->workingFolder . "/*.php");
+        if ($rootFiles !== false) {
+            foreach ($rootFiles as $file) {
+                copy($file, $targetFolder . "/" . basename($file));
+            }
+            return "Upgraded core, plugins and base access points.";
+        } else {
+            return "Upgrade core and plugins. Nothing to do at the base";
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function restoreMarkedFiles()
+    {
+        if (!count($this->markedFiles)) {
+            return "Nothing to do";
+        }
+        $targetFolder = $this->installPath;
+        foreach ($this->markedFiles as $file) {
+            $bakupName = $file . ".orig-" . date("Ymd");
+            $newName = $file . ".new-" . date("Ymd");
+            if (is_file($targetFolder . "/" . $file) && is_file($targetFolder . "/" . $bakupName)) {
+                copy($targetFolder . "/" . $file, $targetFolder . "/" . $newName);
+                copy($targetFolder . "/" . $bakupName, $targetFolder . "/" . $file);
+                unlink($targetFolder . "/" . $bakupName);
+            }
+        }
+        return "Restoration of " . count($this->markedFiles) . " file(s) marked as preserved.";
+    }
+
+
+    /**
+     * @return string
+     */
+    public function duplicateConfFiles()
+    {
+        $confFiles = glob($this->workingFolder . "/conf/*.php");
+        if ($confFiles !== false) {
+            foreach ($confFiles as $file) {
+                $newFileName = $this->installPath . "/conf/" . basename($file) . ".new-" . date("Ymd");
+                copy($file, $newFileName);
+            }
+        }
+        return "Successfully copied " . count($confFiles) . " files inside config folder (not overriden, please review them)";
+    }
+
+
+    /**
+     * @return string
+     */
+    public function cleanUnusedFiles()
+    {
+        if (!is_file($this->workingFolder . "/" . $this->cleanFile)) return "Nothing to do.";
+        $deleted = array();
+        foreach (file($this->workingFolder . "/" . $this->cleanFile) as $file) {
+            $file = trim($file);
+            if (is_file($this->installPath . "/" . $file)) {
+                if (in_array($file, $this->markedFiles)) {
+                    rename($this->installPath . "/" . $file, $this->installPath . "/" . $file . ".unused");
+                } else {
+                    unlink($this->installPath . "/" . $file);
+                }
+                $deleted[] = $file;
+            }
+        }
+        return "Deleted (or backedup) following files : " . implode(", ", $deleted);
+
+    }
+
+    /**
+     * @return string
+     * @throws Exception
+     */
+    public function upgradeDB()
+    {
+        $confDriver = ConfService::getConfStorageImpl();
+        if (!$confDriver instanceof \Pydio\Conf\Sql\SqlConfDriver) {
+            return "";
+        }
+
+        $conf = OptionsHelper::cleanDibiDriverParameters($confDriver->getOption("SQL_DRIVER"));
+        if (!is_array($conf) || !isSet($conf["driver"])) return "Nothing to do";
+        switch ($conf["driver"]) {
+            case "sqlite":
+            case "sqlite3":
+                $ext = ".sqlite";
+                break;
+            case "postgre":
+                $ext = ".pgsql";
+                break;
+            case "mysql":
+                $ext = (is_file($this->workingFolder . "/" . $this->dbUpgrade . ".mysql")) ? ".mysql" : ".sql";
+                break;
+            default:
+                return "ERROR!, DB driver " . $conf["driver"] . " not supported yet in __FUNCTION__";
+        }
+
+        $file = $this->dbUpgrade . $ext;
+        if (!is_file($this->workingFolder . "/" . $file)) return "Nothing to do.";
+        $sqlInstructions = file_get_contents($this->workingFolder . "/" . $file);
+
+        $parts = array_map("trim", explode("/* SEPARATOR */", $sqlInstructions));
+        $results = array();
+        $errors = array();
+
+        dibi::connect($conf);
+        dibi::begin();
+        foreach ($parts as $sqlPart) {
+            if (empty($sqlPart)) continue;
+            try {
+                dibi::nativeQuery($sqlPart);
+                $results[] = $sqlPart;
+            } catch (DibiException $e) {
+                $errors[] = $sqlPart . " (" . $e->getMessage() . ")";
+            }
+        }
+        dibi::commit();
+        dibi::disconnect();
+
+        if (!count($errors)) {
+            return "Database successfully upgraded";
+        } else {
+            return "Database upgrade failed. <br>The following statements were executed : <br>" . implode("<br>", $results) . ",<br><br> The following statements failed : <br>" . implode("<br>", $errors) . "<br><br> You should manually upgrade your DB.";
+        }
+
+
+    }
+
+    /**
+     * @return string
+     */
+    public function specificTask()
+    {
+        if (!is_file($this->workingFolder . "/" . $this->additionalScript)) return "Nothing to do.";
+        include($this->workingFolder . "/" . $this->additionalScript);
+        return "Executed specific upgrade task.";
+
+    }
+
+    /**
+     * @param $stepName
+     * @param string $trigger
+     * @return string
+     */
+    protected function executeStepTrigger($stepName, $trigger = "pre")
+    {
+        $scriptName = $this->workingFolder . "/" . $this->stepTriggerPrefix . "-" . $trigger . "-" . $stepName . ".php";
+        if (!is_file($scriptName)) return "";
+        ob_start();
+        include($scriptName);
+        $output = ob_get_flush();
+        return "Executed specific task for " . $trigger . "-" . $stepName . ": " . $output;
+    }
+
+    /**
+     * @return string
+     */
+    public function updateVersion()
+    {
+        if (is_file($this->workingFolder . "/conf/VERSION.php")) {
+            copy($this->workingFolder . "/conf/VERSION.php", $this->installPath . "/conf/VERSION.php");
+        }
+        // Finally copy VERSION file
+        if (!is_file($this->workingFolder . "/conf/VERSION")) {
+            return "<b>No VERSION file in archive</b>";
+        }
+        copy($this->workingFolder . "/conf/VERSION", $this->installPath . "/conf/VERSION");
+        $vCont = file_get_contents($this->installPath . "/conf/VERSION");
+        list($v, $date) = explode("__", $vCont);
+        return "<b>Version upgraded to " . $v . " ($date)</b>";
+    }
+
+    /**
+     * @return string
+     */
+    public function clearCache()
+    {
+        ConfService::clearAllCaches();
+        return "Ok";
+    }
+
+    /**
+     * @return string
+     */
+    public function displayNote()
+    {
+        if (is_file($this->workingFolder . "/" . $this->releaseNote)) {
+            return nl2br(file_get_contents($this->workingFolder . "/" . $this->releaseNote));
+        }
+        return "";
+    }
+
+    /**
+     * @return string
+     */
+    public function displayUpgradeInstructions()
+    {
+        if (is_file($this->workingFolder . "/" . $this->htmlInstructions)) {
+            return "<div id='upgrade_last_html'>" . file_get_contents($this->workingFolder . "/" . $this->htmlInstructions) . "
+            <h1>Upgrade report</h1>
+            </div>";
+        }
+        return "";
+    }
+
+    /**
+     * @param \Pydio\Core\Model\ContextInterface $ctx
+     * @param string $repositoryId
+     * @param bool $dryRun
+     * @throws Exception
+     */
+    public static function migrateMetaSerialPlugin($ctx, $repositoryId, $dryRun)
+    {
+        $repo = RepositoryService::getRepositoryById($repositoryId);
+        if ($repo == null) throw new Exception("Cannot find repository!");
+        $sources = $repo->getContextOption($ctx, "META_SOURCES");
+        if (!isSet($sources["meta.serial"])) {
+            //throw new Exception("This repository does not have the meta.serial plugin!");
+            $sources["meta.serial"] = array(
+                "meta_file_name" => ".ajxp_meta",
+                "meta_fields" => "comment_field,css_label",
+                "meta_labels" => "Comment,Label"
+            );
+        }
+        if ($repo->hasParent()) {
+            throw new Exception("This repository is defined by a template or is shared, you should upgrade the parent instead!");
+        }
+        $oldMetaFileName = $sources["meta.serial"]["meta_file_name"];
+
+        $sources["metastore.serial"] = array("METADATA_FILE" => $oldMetaFileName, "UPGRADE_FROM_METASERIAL" => true);
+        $sources["meta.user"] = array(
+            "meta_fields" => $sources["meta.serial"]["meta_fields"],
+            "meta_labels" => $sources["meta.serial"]["meta_labels"],
+            "meta_visibility" => $sources["meta.serial"]["meta_visibility"]
+        );
+        unset($sources["meta.serial"]);
+        $oldId = $repo->getId();
+        $repo->addOption("META_SOURCES", $sources);
+        $log = print_r($sources, true);
+        if (!$dryRun) {
+            RepositoryService::replaceRepository($oldId, $repo);
+        }
+        print("Will replace the META_SOURCES options with the following : <br><pre>" . ($log) . "</pre>");
+
+    }
+
+    /**
+     * @param $path
+     * @param $dest
+     * @return bool
+     */
+    public static function copy_r($path, $dest)
+    {
+        if (is_dir($path)) {
+            @mkdir($dest);
+            $objects = scandir($path);
+            if (sizeof($objects) > 0) {
+                foreach ($objects as $file) {
+                    if ($file == "." || $file == "..")
+                        continue;
+                    // go on
+                    if (is_dir($path . DIRECTORY_SEPARATOR . $file)) {
+                        self::copy_r($path . DIRECTORY_SEPARATOR . $file, $dest . DIRECTORY_SEPARATOR . $file);
+                    } else {
+                        copy($path . DIRECTORY_SEPARATOR . $file, $dest . DIRECTORY_SEPARATOR . $file);
+                    }
+                }
+            }
+            return true;
+        } elseif (is_file($path)) {
+            return copy($path, $dest);
+        } else {
+            return false;
+        }
+    }
+
+}
diff --git a/core/src/plugins/action.updater/class.AjaXplorerUpgrader.php b/core/src/plugins/action.updater/class.AjaXplorerUpgrader.php
deleted file mode 100644
index c533dc528b..0000000000
--- a/core/src/plugins/action.updater/class.AjaXplorerUpgrader.php
+++ /dev/null
@@ -1,496 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-
-/**
- * @package AjaXplorer_Plugins
- * @subpackage Action
- */
-class AjaXplorerUpgrader
-{
-    private $archiveURL;
-    private $archiveHash;
-    private $archiveHashMethod;
-    private $markedFiles;
-
-    private $debugMode = FALSE;
-    private $cleanFile = "UPGRADE/CLEAN-FILES";
-    private $additionalScript = "UPGRADE/PHP-SCRIPT";
-    private $stepTriggerPrefix = "UPGRADE/PHP-";
-    private $releaseNote = "UPGRADE/NOTE";
-    private $htmlInstructions = "UPGRADE/NOTE-HTML";
-    private $dbUpgrade = "UPGRADE/DB-UPGRADE";
-    private $installPath;
-    private static $context = null;
-
-    private $archive;
-    private $workingFolder;
-    private $steps;
-    public $step = 0;
-
-    public $error = null;
-    public $result = "";
-    public $currentStepTitle;
-
-    public function __construct($archiveURL, $hash, $method, $backupFiles = array())
-    {
-        $this->archiveURL = $archiveURL;
-        $this->archiveHash = $hash;
-        $this->archiveHashMethod = $method;
-        $this->markedFiles = $backupFiles;
-
-        $this->installPath = AJXP_INSTALL_PATH;
-        if ($this->debugMode) {
-            @mkdir(AJXP_INSTALL_PATH."/upgrade_test");
-            $this->installPath = AJXP_INSTALL_PATH."/upgrade_test";
-        }
-
-        $this->workingFolder = AJXP_DATA_PATH."/tmp/update";
-        $this->steps = array(
-            "checkDownloadFolder"       => "Checking download permissions",
-            "downloadArchive"           => "Downloading upgrade archive",
-            "checkArchiveIntegrity"     => "Checking archive integrity",
-            "checkTargetFolder"         => "Checking folders permissions",
-            "extractArchive"            => "Extracting Archive",
-            "backupMarkedFiles"         => "Backuping your modified files",
-            "copyCodeFiles"             => "Copying core source files",
-            "restoreMarkedFiles"        => "Restoring your modified files",
-            "duplicateConfFiles"        => "Copying configuration files",
-            "cleanUnusedFiles"          => "Deleting unused files",
-            "upgradeDB"                 => "Upgrading database",
-            "specificTask"              => "Running specific upgrade task",
-            "updateVersion"             => "Everything went ok, upgrading version!",
-            "clearCache"                => "Clearing plugins cache",
-            "displayNote"               => "Release note : ",
-            "displayUpgradeInstructions"=> "Upgrade instructions",
-        );
-
-    }
-
-    public static function configureProxy($proxyHost, $proxyUser, $proxyPass, $siteUser = "", $sitePass = "")
-    {
-        $contextData = array('http' => array());
-        if(!empty($proxyHost)){
-            $contextData['http']['proxy'] = 'tcp://'.$proxyHost;// $proxy = array( 'http' => array( 'proxy' => 'tcp://'.$proxyHost, 'request_fulluri' => true ) );
-            $contextData['http']['request_fulluri'] = true;
-            $contextData['ssl']['SNI_enabled'] = false;
-            if (!empty($proxyUser) && !empty($proxyPass)) {
-                $auth = base64_encode($proxyUser.":".$proxyPass);
-                $contextData['http']['header'] = "Proxy-Authorization: Basic $auth";
-            }
-        }
-        if(!empty($siteUser) && !empty($sitePass)){
-            $headerString = "Authorization: Basic " . base64_encode("$siteUser:$sitePass");
-            if(isSet($contextData['http']['header'])){
-                $contextData['http']['header'] .= "; ".$headerString;
-            }else{
-                $contextData['http']['header'] = $headerString;
-            }
-        }
-
-        self::$context = stream_context_create($contextData);
-    }
-
-    public static function getContext(){
-        return self::$context;
-    }
-
-    public static function getUpgradePath($url, $format = "php", $channel="stable")
-    {
-        $packageName = "pydio-core";
-        if(defined('AJXP_PACKAGE_NAME')){
-            $packageName = AJXP_PACKAGE_NAME;
-        }
-        $packageName .= ConfService::getInfo();
-        if (isSet(self::$context)) {
-            $json = file_get_contents($url."?channel=".$channel."&version=".AJXP_VERSION."&package=".$packageName, null, self::$context);
-        } else {
-            $json = AJXP_Utils::getRemoteContent($url."?channel=".$channel."&version=".AJXP_VERSION."&package=".$packageName);
-        }
-        if($format == "php") return json_decode($json, true);
-        else return $json;
-    }
-
-    public function hasNextStep()
-    {
-        if ($this->step < count($this->steps) && $this->error == NULL) {
-            $stepValues = array_values($this->steps);
-            $this->currentStepTitle = $stepValues[$this->step];
-            return true;
-        }
-        return false;
-    }
-
-    public function execute()
-    {
-        $stepKeys = array_keys($this->steps);
-        $stepName = $stepKeys[$this->step];
-        try {
-            $this->executeStepTrigger($stepName, "pre");
-            if (method_exists($this, $stepKeys[$this->step])) {
-                $this->result = call_user_func(array($this, $stepKeys[$this->step]));
-            } else {
-                $this->result = "Skipping step, method not found";
-            }
-            $this->executeStepTrigger($stepName, "post");
-        } catch (Exception $e) {
-            $this->error = $e->getMessage();
-        }
-        $this->step ++;
-    }
-
-    public function testUpgradeScripts(){
-        echo '<br>'.$this->upgradeDB();
-        echo '<br>'.$this->specificTask();
-    }
-
-    public function checkDownloadFolder()
-    {
-        if (!is_dir($this->workingFolder)) {
-            $t = @mkdir($this->workingFolder, 0755, true);
-            if($t === false) throw new Exception("Cannot create target folder for downloading upgrade archive!");
-        }
-        return "OK";
-    }
-
-    public function checkTargetFolder()
-    {
-        if (!is_writable(AJXP_INSTALL_PATH)) {
-            throw new Exception("The root install path is not writeable, no file will be overriden!
-            <br>When performing upgrades, first change the ownership (using chown) of the Pydio root folder
-            to your web server account (e.g. www-data or apache) and propagate that ownership change to all
-            Pydio sub-folders. <br>Run the upgrade again then, post upgrade, change the ownership back
-            to the previous settings for all Pydio folders, <b>except for the data/ folder</b> that must stay
-            writeable by the web server.");
-        }
-        return "OK";
-    }
-
-    public function downloadArchive()
-    {
-        $this->archive = $this->workingFolder."/".basename($this->archiveURL);
-        if ($this->debugMode && is_file($this->archive)) {
-            return "Already downloaded";
-        }
-        if(self::$context){
-            $content = file_get_contents($this->archiveURL, null, self::$context);
-        }else{
-            $content = AJXP_Utils::getRemoteContent($this->archiveURL);
-        }
-        if ($content === false || strlen($content) == 0) {
-            throw new Exception("Error while downloading");
-        }
-        file_put_contents($this->archive, $content);
-        return "File saved in ".$this->archive;
-    }
-
-    public function extractArchive()
-    {
-        require_once(AJXP_BIN_FOLDER . "/pclzip.lib.php");
-        $archive = new PclZip($this->archive);
-        $result = $archive->extract(PCLZIP_OPT_PATH, $this->workingFolder);
-        if ($result <= 0) {
-            throw new Exception($archive->errorInfo(true));
-        } else {
-            // Check that there is a new folder without zip extension
-            if (is_dir($this->workingFolder."/".substr(basename($this->archive), 0, -4)) ) {
-                $this->workingFolder = $this->workingFolder."/".substr(basename($this->archive), 0, -4);
-            }
-            return "Extracted folder ".$this->workingFolder;
-        }
-
-    }
-
-    public function checkArchiveIntegrity()
-    {
-        if (!is_file($this->archive)) {
-            throw new Exception("Cannot find archive file!");
-        }
-        $result = hash_file($this->archiveHashMethod, $this->archive);
-        if ($result != $this->archiveHash) {
-            throw new Exception("Warning the archive seems corrupted, you should re-download it!");
-        }
-        return "Hash is ok ($this->archiveHash)";
-    }
-
-    public function backupMarkedFiles()
-    {
-        $targetFolder = $this->installPath;
-        if (!is_array($this->markedFiles) || !count($this->markedFiles)) {
-            return "Nothing to do";
-        }
-        foreach ($this->markedFiles as $index => $file) {
-            $file = trim($file);
-            if (!empty($file) && is_file($targetFolder."/".$file)) {
-                $newName = $file.".orig-".date("Ymd");
-                copy($targetFolder."/".$file, $targetFolder."/".$newName);
-            } else {
-                unset($this->markedFiles[$index]);
-            }
-        }
-        if (!count($this->markedFiles)) {
-            return "Nothing to do";
-        }
-        return "Backup of ".count($this->markedFiles)." file(s) marked as preserved.";
-    }
-
-    public function copyCodeFiles()
-    {
-        // CORE & PLUGINS
-        $targetFolder = $this->installPath;
-        self::copy_r($this->workingFolder."/core", $targetFolder."/core");
-        self::copy_r($this->workingFolder."/plugins", $targetFolder."/plugins");
-        $rootFiles = glob($this->workingFolder."/*.php");
-        if ($rootFiles !== false) {
-            foreach ($rootFiles as $file) {
-                copy($file, $targetFolder."/".basename($file));
-            }
-            return "Upgraded core, plugins and base access points.";
-        } else {
-            return "Upgrade core and plugins. Nothing to do at the base";
-        }
-    }
-
-    public function restoreMarkedFiles()
-    {
-        if (!count($this->markedFiles)) {
-            return "Nothing to do";
-        }
-        $targetFolder = $this->installPath;
-        foreach ($this->markedFiles as $file) {
-            $bakupName = $file.".orig-".date("Ymd");
-            $newName = $file.".new-".date("Ymd");
-            if (is_file($targetFolder."/".$file) && is_file($targetFolder."/".$bakupName)) {
-                copy($targetFolder."/".$file, $targetFolder."/".$newName);
-                copy($targetFolder."/".$bakupName, $targetFolder."/".$file);
-                unlink($targetFolder."/".$bakupName);
-            }
-        }
-        return "Restoration of ".count($this->markedFiles)." file(s) marked as preserved.";
-    }
-
-
-    public function duplicateConfFiles()
-    {
-        $confFiles = glob($this->workingFolder."/conf/*.php");
-        if ($confFiles !== false) {
-            foreach ($confFiles as $file) {
-                $newFileName = $this->installPath."/conf/".basename($file).".new-".date("Ymd");
-                copy($file, $newFileName);
-            }
-        }
-        return "Successfully copied ".count($confFiles)." files inside config folder (not overriden, please review them)";
-    }
-
-
-    public function cleanUnusedFiles()
-    {
-        if(!is_file($this->workingFolder."/".$this->cleanFile)) return "Nothing to do.";
-        $deleted = array();
-        foreach (file($this->workingFolder."/".$this->cleanFile) as $file) {
-            $file = trim($file);
-            if (is_file($this->installPath."/".$file)) {
-                if (in_array($file, $this->markedFiles)) {
-                    rename($this->installPath."/".$file, $this->installPath."/".$file.".unused");
-                } else {
-                    unlink($this->installPath."/".$file);
-                }
-                $deleted[] = $file;
-            }
-        }
-        return "Deleted (or backedup) following files : ".implode(", ",$deleted);
-
-    }
-
-    public function upgradeDB()
-    {
-        $confDriver = ConfService::getConfStorageImpl();
-        $authDriver = ConfService::getAuthDriverImpl();
-        $logger = AJXP_Logger::getInstance();
-        if (is_a($confDriver, "sqlConfDriver")) {
-            $conf = AJXP_Utils::cleanDibiDriverParameters($confDriver->getOption("SQL_DRIVER"));
-            if(!is_array($conf) || !isSet($conf["driver"])) return "Nothing to do";
-            switch ($conf["driver"]) {
-                case "sqlite":
-                case "sqlite3":
-                    $ext = ".sqlite";
-                    break;
-                case "postgre":
-                    $ext = ".pgsql";
-                    break;
-                case "mysql":
-                    $ext = (is_file($this->workingFolder."/".$this->dbUpgrade.".mysql")) ? ".mysql" : ".sql";
-                    break;
-                default:
-                    return "ERROR!, DB driver ". $conf["driver"] ." not supported yet in __FUNCTION__";
-            }
-
-            $file = $this->dbUpgrade.$ext;
-            if(!is_file($this->workingFolder."/".$file)) return "Nothing to do.";
-            $sqlInstructions = file_get_contents($this->workingFolder."/".$file);
-
-            $parts = array_map("trim", explode("/* SEPARATOR */", $sqlInstructions));
-            $results = array();
-            $errors = array();
-
-            dibi::connect($conf);
-            dibi::begin();
-            foreach ($parts as $sqlPart) {
-                if(empty($sqlPart)) continue;
-                try {
-                    dibi::nativeQuery($sqlPart);
-                    $results[] = $sqlPart;
-                } catch (DibiException $e) {
-                    $errors[] = $sqlPart. " (". $e->getMessage().")";
-                }
-            }
-            dibi::commit();
-            dibi::disconnect();
-
-            if (!count($errors)) {
-                return "Database successfully upgraded";
-            } else {
-                return "Database upgrade failed. <br>The following statements were executed : <br>".implode("<br>", $results).",<br><br> The following statements failed : <br>".implode("<br>", $errors)."<br><br> You should manually upgrade your DB.";
-            }
-
-        }
-
-    }
-
-    public function specificTask()
-    {
-        if(!is_file($this->workingFolder."/".$this->additionalScript)) return "Nothing to do.";
-        include($this->workingFolder."/".$this->additionalScript);
-        return "Executed specific upgrade task.";
-
-    }
-
-    protected function executeStepTrigger($stepName, $trigger = "pre")
-    {
-        $scriptName = $this->workingFolder."/".$this->stepTriggerPrefix."-".$trigger."-".$stepName.".php";
-        if(!is_file($scriptName)) return "";
-        ob_start();
-        include($scriptName);
-        $output = ob_get_flush();
-        return "Executed specific task for ".$trigger."-".$stepName.": ".$output;
-    }
-
-    public function updateVersion()
-    {
-        if(is_file($this->workingFolder."/conf/VERSION.php")){
-            copy($this->workingFolder."/conf/VERSION.php", $this->installPath."/conf/VERSION.php");
-        }
-        // Finally copy VERSION file
-        if (!is_file($this->workingFolder."/conf/VERSION")) {
-            return "<b>No VERSION file in archive</b>";
-        }
-        copy($this->workingFolder."/conf/VERSION", $this->installPath."/conf/VERSION");
-        $vCont = file_get_contents($this->installPath."/conf/VERSION");
-        list($v, $date) = explode("__", $vCont);
-        return "<b>Version upgraded to ".$v." ($date)</b>";
-    }
-
-    public function clearCache()
-    {
-        ConfService::clearAllCaches();
-        return "Ok";
-    }
-
-    public function displayNote()
-    {
-        if (is_file($this->workingFolder."/".$this->releaseNote)) {
-            return nl2br(file_get_contents($this->workingFolder."/".$this->releaseNote));
-        }
-        return "";
-    }
-
-    public function displayUpgradeInstructions()
-    {
-        if (is_file($this->workingFolder."/".$this->htmlInstructions)) {
-            return "<div id='upgrade_last_html'>".file_get_contents($this->workingFolder."/".$this->htmlInstructions)."
-            <h1>Upgrade report</h1>
-            </div>";
-        }
-    }
-
-    public static function migrateMetaSerialPlugin($repositoryId, $dryRun)
-    {
-        $repo = ConfService::getRepositoryById($repositoryId);
-        if($repo == null) throw new Exception("Cannot find repository!");
-        $sources = $repo->getOption("META_SOURCES");
-        if (!isSet($sources["meta.serial"])) {
-            //throw new Exception("This repository does not have the meta.serial plugin!");
-            $sources["meta.serial"] = array(
-                "meta_file_name" => ".ajxp_meta",
-                "meta_fields"   => "comment_field,css_label",
-                "meta_labels"   => "Comment,Label"
-            );
-        }
-        if ($repo->hasParent()) {
-            throw new Exception("This repository is defined by a template or is shared, you should upgrade the parent instead!");
-        }
-        $oldMetaFileName = $sources["meta.serial"]["meta_file_name"];
-
-        $sources["metastore.serial"] = array("METADATA_FILE" => $oldMetaFileName, "UPGRADE_FROM_METASERIAL" => true);
-        $sources["meta.user"] = array(
-            "meta_fields" => $sources["meta.serial"]["meta_fields"],
-            "meta_labels" => $sources["meta.serial"]["meta_labels"],
-            "meta_visibility" => $sources["meta.serial"]["meta_visibility"]
-        );
-        unset($sources["meta.serial"]);
-        $oldId = $repo->getId();
-        $repo->addOption("META_SOURCES", $sources);
-        $log = print_r($sources, true);
-        if (!$dryRun) {
-            ConfService::replaceRepository($oldId, $repo);
-        }
-        print("Will replace the META_SOURCES options with the following : <br><pre>".($log)."</pre>");
-
-    }
-
-    public static function copy_r( $path, $dest )
-    {
-        if ( is_dir($path) ) {
-            @mkdir( $dest );
-            $objects = scandir($path);
-            if ( sizeof($objects) > 0 ) {
-                foreach ($objects as $file) {
-                    if( $file == "." || $file == ".." )
-                        continue;
-                    // go on
-                    if ( is_dir( $path.DIRECTORY_SEPARATOR.$file ) ) {
-                        self::copy_r( $path.DIRECTORY_SEPARATOR.$file, $dest.DIRECTORY_SEPARATOR.$file );
-                    } else {
-                        copy( $path.DIRECTORY_SEPARATOR.$file, $dest.DIRECTORY_SEPARATOR.$file );
-                    }
-                }
-            }
-            return true;
-        } elseif ( is_file($path) ) {
-            return copy($path, $dest);
-        } else {
-            return false;
-        }
-    }
-
-}
diff --git a/core/src/plugins/action.updater/class.UpdateController.php b/core/src/plugins/action.updater/class.UpdateController.php
deleted file mode 100644
index d96192152f..0000000000
--- a/core/src/plugins/action.updater/class.UpdateController.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * @package AjaXplorer_Plugins
- * @subpackage Action
- */
-class UpdateController extends AJXP_Plugin
-{
-    public function init($options)
-    {
-        parent::init($options);
-        $u = AuthService::getLoggedUser();
-        if($u == null) return;
-        if ($u->getGroupPath() != "/") {
-            $this->enabled = false;
-        }
-    }
-
-    /**
-     * Parse
-     * @param DOMNode $contribNode
-     */
-    protected function parseSpecificContributions(&$contribNode)
-    {
-        parent::parseSpecificContributions($contribNode);
-        if($this->pluginConf["ENABLE_324_IMPORT"] == true) return;
-
-        if($contribNode->nodeName != "actions") return ;
-        $actionXpath=new DOMXPath($contribNode->ownerDocument);
-        $compressNodeList = $actionXpath->query('action[@name="import_from_324"]', $contribNode);
-        if(!$compressNodeList->length) return ;
-        $compressNode = $compressNodeList->item(0);
-        $contribNode->removeChild($compressNode);
-
-        $compressNodeList = $actionXpath->query('action[@name="migrate_metaserial"]', $contribNode);
-        if(!$compressNodeList->length) return ;
-        $compressNode = $compressNodeList->item(0);
-        $contribNode->removeChild($compressNode);
-    }
-
-    public function switchAction($action, $httpVars, $fileVars)
-    {
-        $loggedUser = AuthService::getLoggedUser();
-        if(AuthService::usersEnabled() && !$loggedUser->isAdmin()) return ;
-        require_once(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/action.updater/class.AjaXplorerUpgrader.php");
-        if (!empty($this->pluginConf["PROXY_HOST"]) || !empty($this->pluginConf["UPDATE_SITE_USER"])) {
-            AjaXplorerUpgrader::configureProxy(
-                $this->pluginConf["PROXY_HOST"],
-                $this->pluginConf["PROXY_USER"],
-                $this->pluginConf["PROXY_PASS"],
-                $this->pluginConf["UPDATE_SITE_USER"],
-                $this->pluginConf["UPDATE_SITE_PASS"]
-            );
-        }
-
-        switch ($action) {
-
-            case "migrate_metaserial":
-
-                $dryRun = !isSet($httpVars["real_run"]);
-                AjaXplorerUpgrader::migrateMetaSerialPlugin($httpVars["repository_id"], $dryRun);
-
-            break;
-
-            case "get_upgrade_path":
-
-                header("Content-type: application/json");
-                print AjaXplorerUpgrader::getUpgradePath($this->pluginConf["UPDATE_SITE"], "json", $this->pluginConf["UPDATE_CHANNEL"]);
-
-            break;
-
-            case "display_upgrade_note":
-
-                $url = $httpVars["url"];
-                $context = AjaXplorerUpgrader::getContext();
-                if($context != null){
-                    $content = file_get_contents($url, null, $context);
-                }else{
-                    $content = file_get_contents($url);
-                }
-                echo $content;
-
-            break;
-
-            case "test_upgrade_scripts":
-
-                if(!AJXP_SERVER_DEBUG
-                    || AuthService::getLoggedUser() == null
-                    || !AuthService::getLoggedUser()->isAdmin()){
-                    break;
-                }
-                $upgrader = new AjaXplorerUpgrader("", "", "");
-                $upgrader->testUpgradeScripts();
-
-            break;
-
-            case "perform_upgrade" :
-
-                AJXP_Utils::safeIniSet("output_buffering", "Off");
-                if (AJXP_PACKAGING != "zip") {
-                    $lang = ConfService::getLanguage();
-                    $file = $this->getBaseDir()."/howto/linux_en.html";
-                    if($lang != "en" && is_file($this->getBaseDir()."/howto/linux_$lang.html")){
-                        $file = $this->getBaseDir()."/howto/linux_$lang.html";
-                    }
-                    $content = file_get_contents($file);
-                    print $content;
-                    break;
-                }
-                $res = AjaXplorerUpgrader::getUpgradePath($this->pluginConf["UPDATE_SITE"], "php", $this->pluginConf["UPDATE_CHANNEL"]);
-                if (!count($res["packages"])) {
-                    print("No update is necessary!");
-                    break;
-                }
-                include(dirname(__FILE__)."/output_head.html");
-                foreach ($res["packages"] as $index => $zipPackage) {
-                    print("<div class='main_step'>Applying upgrade ".basename($zipPackage)."</div>");
-                    $u = new AjaXplorerUpgrader(
-                        $zipPackage,
-                        $res["hashes"][$index],
-                        $res["hash_method"],
-                        explode(",",$this->pluginConf["PRESERVE_FILES"])
-                    );
-                    $errors = false;
-                    while ($u->hasNextStep()) {
-                        set_time_limit(180);
-                        print("<div class='upgrade_step'><div class='upgrade_title'>".$u->currentStepTitle."</div>");
-                        $u->execute();
-                        if ($u->error != null) {
-                            print("<div class='upgrade_result error'>- Error : ".$u->error."</div>");
-                            $errors = true;
-                            break;
-                        } else {
-                            print("<div class='upgrade_result success'>- ".$u->result."</div>");
-                        }
-                        print("</div>");
-                        // FLUSH OUTPUT, SCROLL DOWN
-                        print str_repeat(' ',300);
-                        print('<script type="text/javascript">doScroll();</script>');
-                        flush();
-                        sleep(0.5);
-                    }
-                    if($errors) break;
-                }
-                print('<script type="text/javascript">replaceTop();</script>');
-                print str_repeat(' ',300);
-                flush();
-
-
-            break;
-
-
-        }
-
-    }
-
-}
diff --git a/core/src/plugins/action.updater/i18n/conf/de.php b/core/src/plugins/action.updater/i18n/conf/de.php
index 07fa702f80..1d0abccfaa 100644
--- a/core/src/plugins/action.updater/i18n/conf/de.php
+++ b/core/src/plugins/action.updater/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Update Engine" => "Versionsaktualisierung",
diff --git a/core/src/plugins/action.updater/i18n/conf/en.php b/core/src/plugins/action.updater/i18n/conf/en.php
index 039d14ec54..6dfbd1bbca 100644
--- a/core/src/plugins/action.updater/i18n/conf/en.php
+++ b/core/src/plugins/action.updater/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Update Engine" => "Update Engine",
diff --git a/core/src/plugins/action.updater/i18n/conf/fr.php b/core/src/plugins/action.updater/i18n/conf/fr.php
index 21bd0a73cb..d9165372eb 100644
--- a/core/src/plugins/action.updater/i18n/conf/fr.php
+++ b/core/src/plugins/action.updater/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Update Engine" => "Mise à jour",
diff --git a/core/src/plugins/action.updater/i18n/conf/it.php b/core/src/plugins/action.updater/i18n/conf/it.php
index 1a90dbc972..d0bc794605 100644
--- a/core/src/plugins/action.updater/i18n/conf/it.php
+++ b/core/src/plugins/action.updater/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Update Engine" => "Motore Aggiornamento",
diff --git a/core/src/plugins/action.updater/i18n/conf/pt.php b/core/src/plugins/action.updater/i18n/conf/pt.php
index c145e5e86a..b431fe86ac 100644
--- a/core/src/plugins/action.updater/i18n/conf/pt.php
+++ b/core/src/plugins/action.updater/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Update Engine" => "Actualizar Programa",
diff --git a/core/src/plugins/action.updater/i18n/de.php b/core/src/plugins/action.updater/i18n/de.php
index 6f05e360fc..7da4b58281 100644
--- a/core/src/plugins/action.updater/i18n/de.php
+++ b/core/src/plugins/action.updater/i18n/de.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 defined('AJXP_EXEC') or die( 'Access not allowed');
@@ -42,4 +42,6 @@
     "18" => "Keine Aktualisierungen gefunden. Klicken, um erneut zu prüfen.",
     "19" => "Klicken um auf Aktualisierungen zu prüfen",
     "20" => "Nun prüfen",
+    "21" => "Currently in development mode.",
+    "22" => "Current version is %1 (%2).",
 );
diff --git a/core/src/plugins/action.updater/i18n/en.php b/core/src/plugins/action.updater/i18n/en.php
index 4df4fdf81f..6ca5275d44 100644
--- a/core/src/plugins/action.updater/i18n/en.php
+++ b/core/src/plugins/action.updater/i18n/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 defined('AJXP_EXEC') or die( 'Access not allowed');
@@ -42,4 +42,6 @@
     "18" => "No necessary upgrade detected: click to perform a new check.",
     "19" => "Click to check for new upgrade",
     "20" => "Check now",
+    "21" => "Currently in development mode.",
+    "22" => "Current version is %1 (%2).",
 );
diff --git a/core/src/plugins/action.updater/i18n/fr.php b/core/src/plugins/action.updater/i18n/fr.php
index 44ddf2ced1..841aeb6225 100644
--- a/core/src/plugins/action.updater/i18n/fr.php
+++ b/core/src/plugins/action.updater/i18n/fr.php
@@ -16,8 +16,11 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
 $mess = array(
     "1" => "Mise à jour",
     "2" => "Mise à jour automatique",
@@ -38,5 +41,6 @@
     "18" => "Pas de mise à jour nécessaire, cliquez pour déclencher une nouvelle vérification.",
     "19" => "Cliquer pour vérifier si une mise à jour est nécessaire.",
     "20" => "Vérifier maintenant",
-    "11" => "Migrer meta.serial",
-);
\ No newline at end of file
+    "21" => "Currently in development mode.",
+    "22" => "Current version is %1 (%2).",
+);
diff --git a/core/src/plugins/action.updater/i18n/it.php b/core/src/plugins/action.updater/i18n/it.php
index 0c07e8c85a..2beba38f63 100644
--- a/core/src/plugins/action.updater/i18n/it.php
+++ b/core/src/plugins/action.updater/i18n/it.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 defined('AJXP_EXEC') or die( 'Access not allowed');
@@ -36,10 +36,12 @@
     "12"=> "I vecchi plugin  meta.serial sono stati rimossi e divisi in metastore.serial e meta.user",
     "13"=> "Simula migrazione",
     "14"=> "Avvia migrazione reale",
-    "15" => "Sicuro di voler procedere con l'aggiornamento?",
-    "16" => "I seguenti pacchetti saranno scaricati ed installati.",
-    "17" => "Verifica disponibilità aggiornamenti...",
-    "18" => "Nessun aggiornamento necessario: clicca per eseguire un nuovo controllo.",
-    "19" => "Clicca per cercare nuovi aggiornamenti",
-    "20" => "Controlla"
+    "15" => "Are you sure that you want to perform the upgrade?",
+    "16" => "The following packages will be downloaded and installed.",
+    "17" => "Checking for available upgrades...",
+    "18" => "No necessary upgrade detected: click to perform a new check.",
+    "19" => "Click to check for new upgrade",
+    "20" => "Check now",
+    "21" => "Currently in development mode.",
+    "22" => "Current version is %1 (%2).",
 );
diff --git a/core/src/plugins/action.updater/i18n/pt.php b/core/src/plugins/action.updater/i18n/pt.php
index ddae9881e9..40ce64e915 100644
--- a/core/src/plugins/action.updater/i18n/pt.php
+++ b/core/src/plugins/action.updater/i18n/pt.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 defined('AJXP_EXEC') or die( 'Access not allowed');
@@ -41,5 +41,7 @@
     "17" => "Checking for available upgrades...",
     "18" => "No necessary upgrade detected: click to perform a new check.",
     "19" => "Click to check for new upgrade",
-    "20" => "Check now"
+    "20" => "Check now",
+    "21" => "Currently in development mode.",
+    "22" => "Current version is %1 (%2).",
 );
diff --git a/core/src/plugins/action.updater/manifest.xml b/core/src/plugins/action.updater/manifest.xml
index 745120f5d2..d956ded217 100644
--- a/core/src/plugins/action.updater/manifest.xml
+++ b/core/src/plugins/action.updater/manifest.xml
@@ -160,7 +160,7 @@
             </action>
         </actions>
 	</registry_contributions>
-	<class_definition filename="plugins/action.updater/class.UpdateController.php" classname="UpdateController"/>
+	<class_definition filename="plugins/action.updater/UpdateController.php" classname="Pydio\Action\Update\UpdateController"/>
     <dependencies>
         <!-- Image proxy must be implemented -->
         <activePlugin pluginName="access.ajxp_conf|access.ajxp_admin"/>
diff --git a/core/src/plugins/auth.basic_http/class.basic_httpAuthDriver.php b/core/src/plugins/auth.basic_http/class.basic_httpAuthDriver.php
deleted file mode 100644
index 1d93ad69cd..0000000000
--- a/core/src/plugins/auth.basic_http/class.basic_httpAuthDriver.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * AJXP_Plugin to authenticate users against the Basic-HTTP mechanism
- * @package AjaXplorer_Plugins
- * @subpackage Auth
- */
-class basic_httpAuthDriver extends serialAuthDriver
-{
-    public function usersEditable()
-    {
-        return false;
-    }
-    public function passwordsEditable()
-    {
-        return false;
-    }
-
-    public function preLogUser($sessionId)
-    {
-        $localHttpLogin = $_SERVER["REMOTE_USER"];
-        if(!isSet($localHttpLogin)) return ;
-        $localHttpPassw = (isset($_SERVER['PHP_AUTH_PW'])) ? $_SERVER['PHP_AUTH_PW'] : md5(microtime(true)) ;
-        if ($this->autoCreateUser()) {
-            if (!$this->userExists($localHttpLogin)) {
-                $this->createUser($localHttpLogin, $localHttpPassw);
-            }
-            AuthService::logUser($localHttpLogin, $localHttpPassw, true);
-        } else {
-            // If not auto-create but the user exists, log him.
-            if ($this->userExists($localHttpLogin)) {
-                AuthService::logUser($localHttpLogin, "", true);
-            }
-        }
-
-
-    }
-    public function getLogoutRedirect()
-    {
-        return AJXP_VarsFilter::filter($this->getOption("LOGOUT_URL"));
-    }
-
-}
diff --git a/core/src/plugins/auth.basic_http/i18n/conf/cs.php b/core/src/plugins/auth.basic_http/i18n/conf/cs.php
deleted file mode 100644
index 78b20b423f..0000000000
--- a/core/src/plugins/auth.basic_http/i18n/conf/cs.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Basic HTTP" => "Základní HTTP",
-"Use the standard http authentication." => "Použít standartní http ověření.",
-"Users" => "Uživatelé",
-"The users list" => "Seznam uživatelů",
-"Logout URL" => "URL odhlášení",
-"Redirect to the given URL on loggin out" => "Po odhlášení přesměrovat na zadanou URL",
-);
diff --git a/core/src/plugins/auth.basic_http/i18n/conf/de.php b/core/src/plugins/auth.basic_http/i18n/conf/de.php
deleted file mode 100644
index 86f1a80e9a..0000000000
--- a/core/src/plugins/auth.basic_http/i18n/conf/de.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Basic HTTP" => "Standard-HTTP",
-"Use the standard http authentication." => "Versendet Standard-HTTP Authentifizierung.",
-"Users" => "Benutzer",
-"The users list" => "Eine Liste mit Benutzern",
-"Logout URL" => "Logout-URL",
-"Redirect to the given URL on loggin out" => "Nach dem Logout auf folgende URL weiterleiten.",
-);
diff --git a/core/src/plugins/auth.basic_http/i18n/conf/en.php b/core/src/plugins/auth.basic_http/i18n/conf/en.php
deleted file mode 100644
index ce984744e9..0000000000
--- a/core/src/plugins/auth.basic_http/i18n/conf/en.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Basic HTTP" => "Basic HTTP",
-"Use the standard http authentication." => "Use the standard http authentication.",
-"Users" => "Users",
-"The users list" => "The users list",
-"Logout URL" => "Logout URL",
-"Redirect to the given URL on loggin out" => "Redirect to the given URL on loggin out",
-);
\ No newline at end of file
diff --git a/core/src/plugins/auth.basic_http/i18n/conf/fr.php b/core/src/plugins/auth.basic_http/i18n/conf/fr.php
deleted file mode 100644
index eeec36c886..0000000000
--- a/core/src/plugins/auth.basic_http/i18n/conf/fr.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Basic HTTP" => "Basic-HTTP",
-"Use the standard http authentication." => "Utiliser l'authentification http standard.",
-"Users" => "Utilisateurs",
-"The users list" => "Liste des utilisateurs",
-"Logout URL" => "URL de déconnexion",
-"Redirect to the given URL on loggin out" => "Rediriger vers l'URL donnée lors de la déconnexion",
-);
\ No newline at end of file
diff --git a/core/src/plugins/auth.basic_http/i18n/conf/it.php b/core/src/plugins/auth.basic_http/i18n/conf/it.php
deleted file mode 100644
index 97afa8214f..0000000000
--- a/core/src/plugins/auth.basic_http/i18n/conf/it.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Basic HTTP" => "HTTP Base",
-"Use the standard http authentication." => "Usa l'autenticazione HTTP di base.",
-"Users" => "Utenti",
-"The users list" => "Lista degli utenti",
-"Logout URL" => "URL Logout",
-"Redirect to the given URL on loggin out" => "Reindirizzamento all'URL specificato al logout",
-);
diff --git a/core/src/plugins/auth.basic_http/i18n/conf/pt.php b/core/src/plugins/auth.basic_http/i18n/conf/pt.php
deleted file mode 100644
index 290823f89c..0000000000
--- a/core/src/plugins/auth.basic_http/i18n/conf/pt.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Basic HTTP" => "HTTP Básico",
-"Use the standard http authentication." => "Utilizar autenticação básica HTTP.",
-"Users" => "Utilizadores",
-"The users list" => "Lista de Utilizadores",
-"Logout URL" => "Logout URL",
-"Redirect to the given URL on loggin out" => "Redirect to the given URL on loggin out",
-);
\ No newline at end of file
diff --git a/core/src/plugins/auth.basic_http/manifest.xml b/core/src/plugins/auth.basic_http/manifest.xml
deleted file mode 100644
index cc63e4b33c..0000000000
--- a/core/src/plugins/auth.basic_http/manifest.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<authdriver enabled="false" name="basic_http" label="CONF_MESSAGE[Basic HTTP]" description="CONF_MESSAGE[Use the standard http authentication.]" mixins="authdriver_commons" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <client_settings>
-        <resources>
-            <i18n namespace="basic_http_auth" path="plugins/auth.basic_http/i18n"/>
-        </resources>
-    </client_settings>
-    <server_settings>
-        <param name="USERS_FILEPATH" type="string" label="CONF_MESSAGE[Users]" description="CONF_MESSAGE[The users list]" mandatory="true"/>
-        <param name="LOGOUT_URL" type="string" label="CONF_MESSAGE[Logout URL]" description="CONF_MESSAGE[Redirect to the given URL on loggin out]" mandatory="false" />
-    </server_settings>
-	<class_definition filename="plugins/auth.basic_http/class.basic_httpAuthDriver.php" classname="basic_httpAuthDriver"/>
-	<registry_contributions>
-		<external_file filename="plugins/core.auth/standard_auth_actions.xml" include="actions/*"/>
-        <actions>
-            <action name="logout" expireDefault="true">
-                <gui text="164" title="169" src="decrypted.png" accessKey="" hasAccessKey="false" forbidOverride="true">
-                    <context selection="false" dir="" recycle="false"
-                            actionBar="true" contextMenu="false" infoPanel="false"
-                            actionBarGroup="user" ajxpWidgets="UserWidget::logging_string">
-                    </context>
-                </gui>
-                <rightsContext noUser="false" userLogged="only" guestLogged="show" read="false" write="false" adminOnly="" forbidOverride="true"/>
-                <processing forbidOverride="true">
-                    <clientCallback prepareModal="false"><![CDATA[
-                        clearRememberData();
-                        var connexion = new Connexion();
-                        connexion.addParameter('get_action', 'back');
-                        connexion.onComplete = function(transport){
-                                var child = transport.responseXML.documentElement.childNodes;
-                                try{
-                                    document.location.href = child[0].nodeValue;
-                                }catch(e){}
-                        };
-                        connexion.sendAsync();
-                        ]]></clientCallback>
-                    <serverCallback methodName="switchAction"/>
-                </processing>
-            </action>
-        </actions>
-
-	</registry_contributions>
-	<dependencies>
-		<pluginClass pluginName="auth.serial"/>
-	</dependencies>
-</authdriver>
diff --git a/core/src/plugins/auth.basic_http/plugin_doc.html b/core/src/plugins/auth.basic_http/plugin_doc.html
deleted file mode 100644
index e6f0eb899c..0000000000
--- a/core/src/plugins/auth.basic_http/plugin_doc.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>Can be used to interface ajxp to a standard http authentication. For Apache, place an htaccess/htpassword somewhere above the ajaxplorer installation directory, and users will be automatically logged to Pydio once they have passed the http login dialog.</p>
\ No newline at end of file
diff --git a/core/src/plugins/auth.cmsms/action.xml b/core/src/plugins/auth.cmsms/action.xml
deleted file mode 100644
index 80b9707152..0000000000
--- a/core/src/plugins/auth.cmsms/action.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<driver name="cmsmsAuth">
-	<actions>
-		<action name="login_cmsms">
-			<processing>
-				<serverCallback methodName="login_cmsms"></serverCallback>
-			</processing>
-		</action>
-	</actions>
-</driver>
diff --git a/core/src/plugins/auth.cmsms/class.cmsmsAuthDriver.php b/core/src/plugins/auth.cmsms/class.cmsmsAuthDriver.php
deleted file mode 100644
index 2ec783d308..0000000000
--- a/core/src/plugins/auth.cmsms/class.cmsmsAuthDriver.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-/*
- * Copyright 2007-2011 Jean-Christophe Ghio (jissey)
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-/**
- * Abstract representation of an access to FEU athentification module(CMS Made Simple).
- * like auth.remote:
- *   In slave mode, the login dialog is not displayed in AJXP.
- *   If the user directly go to the main page, (s)he's redirected to the LOGIN_URL.
- *   The logout button link to LOGOUT_URL.
- *   The user will log in on FEU, and the remote script will call us, as
- *   ajxpPath/content.php?get_action=login_cmsms&uid=usernam&sessionid=sessionid in FEU loggedin table
-
- * You must modify conf.php like this:
- * 	"AUTH_DRIVER" => array(
-        "NAME"		=> "cmsms",
-        "OPTIONS"	=> array(
-            "SQL_DRIVER" => Array(
-                                    'driver' => 'mysql',
-                                    'host' => 'localhost',
-                                    'username' => 'root',
-                                    'password' => '',
-                                    'database' => 'your_cmsms_db'
-                                    ),
-            "PREFIX_TABLE"          => 'your_prefix',
-            "LOGIN_URL"				=> 'http://url of FEU login form',
-            "LOGOUT_URL"			=> 'http://url you want with the logout button ',
-            "SECRET"				=> '1234' //the common secret code between the two application (store in cmsms database on the other side)
-            )
-
-    ),
- * @package AjaXplorer_Plugins
- * @subpackage Auth
- */
-class cmsmsAuthDriver extends AbstractAuthDriver
-{
-    public $sqlDriver;
-    public $driverName = "cmsms";
-    public $slaveMode;
-    public $secret;
-    public $secret_cmsms;
-    public $urls;
-    public $prefix;
-    public $groupid;
-
-
-    public function init($options)
-    {
-        parent::init($options);
-        $this->sqlDriver = $this->options["SQL_DRIVER"];
-        try {
-            dibi::connect($this->sqlDriver);
-        } catch (DibiException $e) {
-            echo get_class($e), ': ', $e->getMessage(), "\n";
-            exit(1);
-        }
-        $this->secret = $this->options["SECRET"];
-        $this->prefix = $this->options["PREFIX_TABLE"];
-        $this->urls = array($this->options["LOGIN_URL"], $this->options["LOGOUT_URL"]);
-        $this->slaveMode = true;
-        $res = dibi::query("SELECT sitepref_value FROM [".$this->prefix."siteprefs] WHERE sitepref_name = 'FEUajaxplorer_mapi_pref_ajxp_auth_group'");
-        $grp = $res->fetchSingle();
-        $this->groupid = $grp;
-        $res2 = dibi::query("SELECT sitepref_value FROM [".$this->prefix."siteprefs] WHERE sitepref_name = 'FEUajaxplorer_mapi_pref_ajxp_secret'");
-        $sec = $res2->fetchSingle();
-        $this->secret_cmsms = trim($sec);
-
-    }
-
-    public function listUsers($baseGroup = "/", $recursive = true)
-    {
-        $res = dibi::query("SELECT * FROM [".$this->prefix."module_feusers_users], [".$this->prefix."module_feusers_belongs] WHERE id = userid AND groupid=%s", $this->groupid);
-        $pairs = $res->fetchPairs('username', 'password');
-        return $pairs;
-    }
-
-    public function userExists($login)
-    {
-        $res = dibi::query("SELECT * FROM [".$this->prefix."module_feusers_users], [".$this->prefix."module_feusers_belongs] WHERE [username]=%s AND id = userid AND groupid=%s", $login, $this->groupid);
-        return($res->getRowCount());
-    }
-
-    public function userIsConnected($username, $sessionid)
-    {
-        $userid = $this->getUserId($username);
-        $res = dibi::query("SELECT * FROM [".$this->prefix."module_feusers_loggedin] WHERE [userid]=%s AND sessionid=%s", $userid, $sessionid);
-        return($res->getRowCount());
-    }
-
-    // Never call if used with the initial cmsms ajxp module.
-    // We don't check the password because we use sessionid and userid from FEU loggedin table.
-    public function checkPassword($login, $pass, $seed)
-    {
-        $userStoredPass = $this->getUserPass($login);
-        if(!$userStoredPass) return false;
-        if (md5($pass) === $userStoredPass) {
-        $loggedinData['sessionid']=session_id();
-        $loggedinData['lastused']=time();
-        $loggedinData['userid']=$this->getUserId($login);
-        dibi::query('INSERT INTO ['.$this->prefix.'module_feusers_loggedin]', $loggedinData);
-        }
-
-            return ($userStoredPass === md5($pass));
-    }
-
-    public function usersEditable()
-    {
-        return true;
-    }
-    public function passwordsEditable()
-    {
-        return true;
-    }
-
-    public function createUser($login, $passwd)
-    {
-        $users = $this->listUsers();
-        if(!is_array($users)) $users = array();
-        if(array_key_exists($login, $users)) return "exists";
-        $userData = array("username" => $login);
-        $userData["password"] = md5($passwd);
-        $userData["id"]=$this->getUserSeq()+1;
-        $userData["createdate"]=date("Y-m-d H:i:s");
-        dibi::query('INSERT INTO ['.$this->prefix.'module_feusers_users]', $userData);
-        $this->setUserSeq($userData["id"]);
-        $belongsData["userid"]=$userData["id"];
-        $belongsData["groupid"]=$this->groupid;
-        dibi::query('INSERT INTO ['.$this->prefix.'module_feusers_belongs]', $belongsData);
-    }
-    public function changePassword($login, $newPass)
-    {
-        $users = $this->listUsers();
-        if(!is_array($users) || !array_key_exists($login, $users)) return ;
-        $userData = array("username" => $login);
-        $userData["password"] = md5($newPass);
-        dibi::query("UPDATE [".$this->prefix."module_feusers_users] SET ", $userData, "WHERE [username]=%s", $login);
-    }
-    public function deleteUser($login)
-    {
-        $uid=$this->getUserId($login);
-        //suppress all references in CMSMS FEU tables
-        dibi::query("DELETE FROM [".$this->prefix."module_feusers_users] WHERE [username]=%s", $login);
-        dibi::query("DELETE FROM [".$this->prefix."module_feusers_belongs] WHERE [userid]=%s", $uid);
-        dibi::query("DELETE FROM [".$this->prefix."module_feusers_properties] WHERE [userid]=%s", $uid);
-    }
-
-    public function getUserPass($login)
-    {
-        $res = dibi::query("SELECT [password] FROM [".$this->prefix."module_feusers_users], [".$this->prefix."module_feusers_belongs] WHERE [username]=%s AND id = userid AND groupid= %s", $login, $this->groupid);
-        $pass = $res->fetchSingle();
-        return $pass;
-    }
-
-    public function getUserSeq()
-    {
-        $res = dibi::query("SELECT [id] FROM [".$this->prefix."module_feusers_users_seq]");
-        $seq = $res->fetchSingle();
-        return $seq;
-    }
-
-    public function setUserSeq($num)
-    {
-        $res = dibi::query("UPDATE [".$this->prefix."module_feusers_users_seq] SET [id]=%s", $num);
-    }
-
-    public function getUserId($login)
-    {
-        $res = dibi::query("SELECT id FROM [".$this->prefix."module_feusers_users], [".$this->prefix."module_feusers_belongs] WHERE [username]=%s AND id = userid AND groupid= %s", $login, $this->groupid);
-        $uid = $res->fetchSingle();
-        return $uid;
-    }
-    public function listUsersSerial()
-    {
-        return AJXP_Utils::loadSerialFile($this->usersSerFile);
-    }
-    public function getLoginRedirect()
-    {
-    if ($this->slaveMode) {
-        if (isset($_SESSION["AJXP_USER"])) return false;
-        return $this->urls[0];
-    }
-    return false;
-}
-
-    public function getLogoutRedirect()
-    {
-        if ($this->slaveMode) {
-            return $this->urls[1];
-        }
-        return false;
-        }
-// call by CMS Made Simple with the followings arguments:
-// username : username of the FEU user
-// sessionid : num. of session in the loggedin table for matching the logging the user here.
-    public function login_cmsms()
-    {
-    $username=strip_tags($_GET['username']);
-    $sessionid=strip_tags($_GET['sessionid']);
-    //verifying the CIA secret code...
-    if($this->secret != $this->secret_cmsms) exit( "secret");//return header("Location: ".$this->getLoginRedirect());
-    //verifying that the user exists (in the right group)
-    if(!$this->userExists($username)) exit( "exists");//return header("Location: ".$this->getLoginRedirect());
-    //verifying that the user is connected
-    if(!$this->userIsConnected($username, $sessionid)) exit( "connect");//return header("Location: ".$this->getLoginRedirect());
-    //all tests passed...we connect the user
-    if($log=AuthService::logUser($username,"",true)==1) return header("Location: index.php");
-    }
-}
diff --git a/core/src/plugins/auth.cmsms/i18n/conf/cs.php b/core/src/plugins/auth.cmsms/i18n/conf/cs.php
deleted file mode 100644
index a882230a96..0000000000
--- a/core/src/plugins/auth.cmsms/i18n/conf/cs.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"DB Storage" => "DB úložiště",
-"Login URL" => "Přihlašovací URL",
-"if direct access, redirect to the given URL" => "při přímém přístupu, přesměrovat na danou URL",
-"Logout URL" => "URL odhlášení",
-"Redirect to the given URL on loggin out" => "Po odhlášení přesměrovat na zadanou URL",
-"Secret key" => "Tajný klíč",
-"This key must only be known by remote end" => "Tento klíč musí být znám pouze vzdálenému konci",
-"Connexion" => "Připojení",
-"The Database Connexion" => "Databázové připojení",
-"Prefix tables" => "Předpona tabulek",
-"Prefix of CMSMS tables " => "Předpona CMSMS tabulek ",
-"CMSMS Authentication" => "CMSMS ověření",
-"Stores the Authentication data in CMSMS FEU" => "Ukládá ověřovací údaje v CMSMS FEU",
-);
diff --git a/core/src/plugins/auth.cmsms/i18n/conf/de.php b/core/src/plugins/auth.cmsms/i18n/conf/de.php
deleted file mode 100644
index 61de66e30b..0000000000
--- a/core/src/plugins/auth.cmsms/i18n/conf/de.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"DB Storage" => "DB-Speicher",
-"Login URL" => "Login-URL",
-"if direct access, redirect to the given URL" => "Bei Direktzugriff auf folgende URL weiterleiten",
-"Logout URL" => "Logout-URL",
-"Redirect to the given URL on loggin out" => "Nach dem Logout auf folgende URL weiterleiten.",
-"Secret key" => "Secret-Key",
-"This key must only be known by remote end" => "Secret-Key",
-"Connexion" => "Verbindung",
-"The Database Connexion" => "Die Datenbank-Verbindung",
-"Prefix tables" => "Tabellen-Präfix",
-"Prefix of CMSMS tables " => "Tabellen-Präfix der CMSMS Tabellen ",
-"CMSMS Authentication" => "CMS Made Simple Authentifizierung",
-"Stores the Authentication data in CMSMS FEU" => "Authentifizierung über einen CMS Made Simple Benutzer",
-);
diff --git a/core/src/plugins/auth.cmsms/i18n/conf/en.php b/core/src/plugins/auth.cmsms/i18n/conf/en.php
deleted file mode 100644
index b987098504..0000000000
--- a/core/src/plugins/auth.cmsms/i18n/conf/en.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"DB Storage" => "DB Storage",
-"Login URL" => "Login URL",
-"if direct access, redirect to the given URL" => "if direct access, redirect to the given URL",
-"Logout URL" => "Logout URL",
-"Redirect to the given URL on loggin out" => "Redirect to the given URL on loggin out",
-"Secret key" => "Secret key",
-"This key must only be known by remote end" => "This key must only be known by remote end",
-"Connexion" => "Connection",
-"The Database Connexion" => "The Database Connection",
-"Prefix tables" => "Prefix tables",
-"Prefix of CMSMS tables " => "Prefix of CMSMS tables ",
-"CMSMS Authentication" => "CMSMS Authentication",
-"Stores the Authentication data in CMSMS FEU" => "Stores the Authentication data in CMSMS FEU",
-);
diff --git a/core/src/plugins/auth.cmsms/i18n/conf/fr.php b/core/src/plugins/auth.cmsms/i18n/conf/fr.php
deleted file mode 100644
index 1c55c4a3e0..0000000000
--- a/core/src/plugins/auth.cmsms/i18n/conf/fr.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"DB Storage" => "Stockage en base de données",
-"Login URL" => "URL de connexion",
-"if direct access, redirect to the given URL" => "En cas d'accès direct, rediriger vers l'URL donnée",
-"Logout URL" => "URL de déconnexion",
-"Redirect to the given URL on loggin out" => "Rediriger vers l'URL donnée lors de la déconnexion",
-"Secret key" => "Clef secrète",
-"This key must only be known by remote end" => "Cette clef ne doit-être connue que par l'utilisateur final",
-"Connexion" => "Connexion",
-"The Database Connexion" => "Connexion à la base de données",
-"Prefix tables" => "Préfixe de tables",
-"Prefix of CMSMS tables " => "Préfixe des tables CMSMS",
-"CMSMS Authentication" => "Authentification CMSMS",
-"Stores the Authentication data in CMSMS FEU" => "Enregistrer les données d'authentification dans CMSMS FEU",
-);
\ No newline at end of file
diff --git a/core/src/plugins/auth.cmsms/i18n/conf/it.php b/core/src/plugins/auth.cmsms/i18n/conf/it.php
deleted file mode 100644
index b17b00340e..0000000000
--- a/core/src/plugins/auth.cmsms/i18n/conf/it.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"DB Storage" => "Database",
-"Login URL" => "URL di Login",
-"if direct access, redirect to the given URL" => "Se l'accesso è diretto, redirigi all'URL specificato",
-"Logout URL" => "URL di Logout",
-"Redirect to the given URL on loggin out" => "Reindirizzamento all'URL specificato al logout",
-"Secret key" => "Chiave segreta",
-"This key must only be known by remote end" => "Questa chiave deve essere nota solo al terminale remoto",
-"Connexion" => "Connessione",
-"The Database Connexion" => "La Connessione al Database",
-"Prefix tables" => "Prefisso Tabelle",
-"Prefix of CMSMS tables " => "Prefisso delle tabelle CMSMS ",
-"CMSMS Authentication" => "Autenticazione CMSMS",
-"Stores the Authentication data in CMSMS FEU" => "Immagazina i dati di Autenticazione in CMSMS FEU",
-);
diff --git a/core/src/plugins/auth.cmsms/manifest.xml b/core/src/plugins/auth.cmsms/manifest.xml
deleted file mode 100644
index 7c24cd2f50..0000000000
--- a/core/src/plugins/auth.cmsms/manifest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<authdriver name="cmsms" enabled="false" label="CONF_MESSAGE[CMSMS Authentication]"
-            description="CONF_MESSAGE[Stores the Authentication data in CMSMS FEU]"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <plugin_info>
-        <core_relation packaged="false" tested_version="3.5.0"/>
-    <plugin_author>Jean-Christophe Ghio</plugin_author>
-    </plugin_info>
-    <client_settings>
-        <resources>
-            <i18n namespace="cmsms" path="plugins/auth.cmsms/i18n"/>
-        </resources>
-    </client_settings>
-	<server_settings>
-		<param name="LOGIN_URL" type="string" label="CONF_MESSAGE[Login URL]" description="CONF_MESSAGE[if direct access, redirect to the given URL]" mandatory="true" />
-		<param name="LOGOUT_URL" type="string" label="CONF_MESSAGE[Logout URL]" description="CONF_MESSAGE[Redirect to the given URL on loggin out]" mandatory="true" />
-		<param name="SECRET" type="string" label="CONF_MESSAGE[Secret key]" description="CONF_MESSAGE[This key must only be known by remote end]" mandatory="true" />
-		<param name="SQL_DRIVER" type="group_switch:dibi_provider" label="CONF_MESSAGE[Connexion]" description="CONF_MESSAGE[The Database Connexion]" mandatory="true" default="core"/>
-		<param name="PREFIX_TABLE" type="string" label="CONF_MESSAGE[Prefix tables]" description="CONF_MESSAGE[Prefix of CMSMS tables ]" mandatory="true"/>
-	</server_settings>
-	<class_definition filename="plugins/auth.cmsms/class.cmsmsAuthDriver.php" classname="cmsmsAuthDriver"/>
-	<registry_contributions>
-		<external_file filename="plugins/core.auth/standard_auth_actions.xml" include="actions/*" exclude=""/>
-		<external_file filename="plugins/auth.cmsms/action.xml" include="actions/*"/>
-	</registry_contributions>
-</authdriver>
diff --git a/core/src/plugins/auth.cmsms/plugin_doc.html b/core/src/plugins/auth.cmsms/plugin_doc.html
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/core/src/plugins/auth.custom_db/CustomDbAuthDriver.php b/core/src/plugins/auth.custom_db/CustomDbAuthDriver.php
new file mode 100644
index 0000000000..0af41bbc42
--- /dev/null
+++ b/core/src/plugins/auth.custom_db/CustomDbAuthDriver.php
@@ -0,0 +1,285 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Auth\Backend;
+
+use dibi;
+use DibiException;
+use Exception;
+use Pydio\Auth\Core\AbstractAuthDriver;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Model\UserInterface;
+use Pydio\Core\Utils\Vars\OptionsHelper;
+use Pydio\Core\Utils\Vars\PasswordEncoder;
+use Pydio\Core\Utils\Vars\StringHelper;
+use Pydio\Core\Utils\Vars\VarsFilter;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Store authentication data in a custom SQL database with custom schema.
+ * Users and password are NOT editable.
+ * @package AjaXplorer_Plugins
+ * @subpackage Auth
+ */
+class CustomDbAuthDriver extends AbstractAuthDriver
+{
+    public $sqlDriver;
+    public $driverName = "custom_db";
+
+    protected $customTableName;
+    protected $customTableUid;
+    protected $customTablePwd;
+    protected $customTableHashing;
+
+    protected $coreSqlDriver;
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        parent::init($ctx, $options);
+        $this->sqlDriver = OptionsHelper::cleanDibiDriverParameters($options["SQL_CUSTOM_DRIVER"]);
+        $this->coreSqlDriver = OptionsHelper::cleanDibiDriverParameters(array("group_switch_value" => "core"));
+
+        $this->customTableName = $options["SQL_CUSTOM_TABLE"];
+        $this->customTableUid = $options["SQL_CUSTOM_TABLE_USER_FIELD"];
+        $this->customTablePwd = $options["SQL_CUSTOM_TABLE_PWD_FIELD"];
+        $this->customTableHashing = $options["SQL_CUSTOM_TABLE_PWD_HASH"];
+    }
+
+    private function connect()
+    {
+        try {
+            dibi::connect($this->sqlDriver);
+        } catch (DibiException $e) {
+            echo get_class($e), ': ', $e->getMessage(), "\n";
+            exit(1);
+        }
+    }
+
+    private function close()
+    {
+        dibi::disconnect();
+        dibi::connect($this->coreSqlDriver);
+    }
+
+    public function performChecks()
+    {
+        if (!isSet($this->options)) return;
+        $test = OptionsHelper::cleanDibiDriverParameters($this->options["SQL_CUSTOM_DRIVER"]);
+        if (!count($test)) {
+            throw new Exception("Could not find any driver definition for CustomDB plugin! To fix this issue you have to remove the file \"bootstrap.json\" and rename the backup file \"bootstrap.json.bak\" into \"bootsrap.json\" in data/plugins/boot.conf/");
+        }
+    }
+
+    /**
+     * Wether users can be listed using offset and limit
+     * @return bool
+     */
+    public function supportsUsersPagination()
+    {
+        return true;
+    }
+
+    // $baseGroup = "/"
+    /**
+     * List users using offsets
+     * @param string $baseGroup
+     * @param string $regexp
+     * @param int $offset
+     * @param int $limit
+     * @param bool $recursive
+     * @return UserInterface[]
+     */
+    public function listUsersPaginated($baseGroup, $regexp, $offset, $limit, $recursive = true)
+    {
+        $this->connect();
+        $orderBy = "ORDER BY [" . $this->customTableUid . "] ASC";
+        if ($this->sqlDriver["driver"] == "mssql") {
+            $orderBy = "";
+            $offset = $limit = -1;
+        }
+        if ($regexp != null) {
+            if ($offset != -1 && $limit != -1) {
+                $res = dibi::query("SELECT [" . $this->customTableUid . "],[" . $this->customTablePwd . "] FROM [" . $this->customTableName . "] WHERE [" . $this->customTableUid . "] " . StringHelper::regexpToLike($regexp) . " $orderBy %lmt %ofs", StringHelper::cleanRegexp($regexp), $limit, $offset);
+            } else {
+                $res = dibi::query("SELECT [" . $this->customTableUid . "],[" . $this->customTablePwd . "] FROM [" . $this->customTableName . "] WHERE [" . $this->customTableUid . "] " . StringHelper::regexpToLike($regexp) . " $orderBy", StringHelper::cleanRegexp($regexp));
+            }
+        } else if ($offset != -1 && $limit != -1) {
+            $res = dibi::query("SELECT [" . $this->customTableUid . "],[" . $this->customTablePwd . "] FROM [" . $this->customTableName . "] $orderBy %lmt %ofs", $limit, $offset);
+        } else {
+            $res = dibi::query("SELECT [" . $this->customTableUid . "],[" . $this->customTablePwd . "] FROM [" . $this->customTableName . "] $orderBy");
+        }
+        $pairs = $res->fetchPairs($this->customTableUid, $this->customTablePwd);
+        $this->close();
+        return $pairs;
+    }
+
+    /**
+     * Applicable if supportsUsersPagination(), try to detect at what page the user is
+     * @param string $baseGroup
+     * @param string $userLogin
+     * @param int $usersPerPage
+     * @param int $offset
+     * @return int
+     */
+    public function findUserPage($baseGroup, $userLogin, $usersPerPage, $offset = 0)
+    {
+        $this->connect();
+        $res = dibi::query("SELECT COUNT(*) FROM [" . $this->customTableName . "] WHERE [" . $this->customTableUid . "] <= %s", $userLogin);
+        $count = $res->fetchSingle();
+        $this->close();
+        return ceil(($count - $offset) / $usersPerPage) - 1;
+
+    }
+
+    /**
+     * @param string $baseGroup
+     * @param string $regexp
+     * @param null|string $filterProperty Can be "admin" or "parent"
+     * @param null|string $filterValue Can be a user Id, or AJXP_FILTER_EMPTY or AJXP_FILTER_NOT_EMPTY
+     * @param bool $recursive
+     * @return int
+     */
+    public function getUsersCount($baseGroup = "/", $regexp = "", $filterProperty = null, $filterValue = null, $recursive = true)
+    {
+        $this->connect();
+        $ands = array();
+
+        if (!empty($regexp)) {
+            $select = "SELECT COUNT(*) FROM [" . $this->customTableName . "] WHERE %and";
+            $ands[] = array("[" . $this->customTableUid . "] " . StringHelper::regexpToLike($regexp), StringHelper::cleanRegexp($regexp));
+            $res = dibi::query($select);
+        } else {
+            $select = "SELECT COUNT(*) FROM [" . $this->customTableName . "]";
+            $res = dibi::query($select, $ands);
+        }
+        $this->close();
+        return $res->fetchSingle();
+    }
+
+    /**
+     *
+     * @param string $baseGroup
+     * @param bool $recursive
+     * @return UserInterface[]
+     */
+    public function listUsers($baseGroup = "/", $recursive = true)
+    {
+        return $this->listUsersPaginated($baseGroup, null, 0, -1);
+    }
+
+    /**
+     * @param $login
+     * @return boolean
+     */
+    public function userExists($login)
+    {
+        $this->connect();
+        $res = dibi::query("SELECT COUNT(*) FROM [" . $this->customTableName . "] WHERE [" . $this->customTableUid . "]=%s", $login);
+        $this->close();
+        return (intval($res->fetchSingle()) > 0);
+    }
+
+    /**
+     * @param $login
+     * @return mixed
+     */
+    public function getUserPass($login)
+    {
+        $this->connect();
+        $res = dibi::query("SELECT [" . $this->customTablePwd . "] FROM [" . $this->customTableName . "] WHERE [" . $this->customTableUid . "]=%s", $login);
+        $pass = $res->fetchSingle();
+        $this->close();
+        return $pass;
+    }
+
+    /**
+     * @param string $login
+     * @param string $pass
+     * @return bool
+     */
+    public function checkPassword($login, $pass)
+    {
+        $userStoredPass = $this->getUserPass($login);
+        if (!$userStoredPass) return false;
+        $hashAlgo = $this->getOption("SQL_CUSTOM_TABLE_PWD_HASH");
+        if ($hashAlgo == "pbkdf2") {
+            return PasswordEncoder::pbkdf2_validate_password($pass, $userStoredPass);
+        } else if ($hashAlgo == "md5") {
+            return md5($pass) === $userStoredPass;
+        } else if ($hashAlgo == "clear") {
+            return $pass == $userStoredPass;
+        }
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    public function usersEditable()
+    {
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    public function passwordsEditable()
+    {
+        return false;
+    }
+
+
+    /**
+     * @param $httpVars
+     * @throws Exception
+     * @throws \Pydio\Core\Exception\PydioException
+     */
+    public function testSQLConnexion($httpVars)
+    {
+        $p = OptionsHelper::cleanDibiDriverParameters($httpVars["SQL_CUSTOM_DRIVER"]);
+        if ($p["driver"] == "sqlite3") {
+            $dbFile = VarsFilter::filter($p["database"], Context::emptyContext());
+            if (!file_exists(dirname($dbFile))) {
+                mkdir(dirname($dbFile), 0755, true);
+            }
+        }
+
+        // Should throw an exception if there was a problem.
+        dibi::connect($p);
+        $cTableName = $httpVars["SQL_CUSTOM_TABLE"];
+        $cUserField = $httpVars["SQL_CUSTOM_TABLE_USER_FIELD"];
+        $cUserValue = $httpVars["SQL_CUSTOM_TABLE_TEST_USER"];
+        $res = dibi::query("SELECT COUNT(*) FROM [" . $cTableName . "] WHERE [" . $cUserField . "]=%s", $cUserValue);
+        $found = (intval($res->fetchSingle()) > 0);
+        if (!$found) {
+            throw new Exception("Could connect to the DB but could not find user " . $cUserValue);
+        }
+        dibi::disconnect();
+        echo "SUCCESS:Connexion established and user $cUserValue found in DB";
+
+    }
+
+}
diff --git a/core/src/plugins/auth.custom_db/class.customDbAuthDriver.php b/core/src/plugins/auth.custom_db/class.customDbAuthDriver.php
deleted file mode 100644
index 906bd240ed..0000000000
--- a/core/src/plugins/auth.custom_db/class.customDbAuthDriver.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-/**
- * Store authentication data in a custom SQL database with custom schema.
- * Users and password are NOT editable.
- * @package AjaXplorer_Plugins
- * @subpackage Auth
- */
-class customDbAuthDriver extends AbstractAuthDriver
-{
-    public $sqlDriver;
-    public $driverName = "custom_db";
-
-    protected $customTableName;
-    protected $customTableUid;
-    protected $customTablePwd;
-    protected $customTableHashing;
-
-    protected $coreSqlDriver;
-
-    public function init($options)
-    {
-        parent::init($options);
-        $this->sqlDriver = AJXP_Utils::cleanDibiDriverParameters($options["SQL_CUSTOM_DRIVER"]);
-        $this->coreSqlDriver = AJXP_Utils::cleanDibiDriverParameters(array("group_switch_value" => "core"));
-
-        $this->customTableName = $options["SQL_CUSTOM_TABLE"];
-        $this->customTableUid = $options["SQL_CUSTOM_TABLE_USER_FIELD"];
-        $this->customTablePwd = $options["SQL_CUSTOM_TABLE_PWD_FIELD"];
-        $this->customTableHashing = $options["SQL_CUSTOM_TABLE_PWD_HASH"];
-    }
-
-    private function connect(){
-        try {
-            dibi::connect($this->sqlDriver);
-        } catch (DibiException $e) {
-            echo get_class($e), ': ', $e->getMessage(), "\n";
-            exit(1);
-        }
-    }
-
-    private function close(){
-        dibi::disconnect();
-        dibi::connect($this->coreSqlDriver);
-    }
-
-    public function performChecks()
-    {
-        if(!isSet($this->options)) return;
-        $test = AJXP_Utils::cleanDibiDriverParameters($this->options["SQL_CUSTOM_DRIVER"]);
-        if (!count($test)) {
-            throw new Exception("Could not find any driver definition for CustomDB plugin! To fix this issue you have to remove the file \"bootstrap.json\" and rename the backup file \"bootstrap.json.bak\" into \"bootsrap.json\" in data/plugins/boot.conf/");
-        }
-    }
-
-    public function supportsUsersPagination()
-    {
-        return true;
-    }
-
-    // $baseGroup = "/"
-    public function listUsersPaginated($baseGroup, $regexp, $offset, $limit, $recursive = true)
-    {
-        $this->connect();
-        $orderBy = "ORDER BY [".$this->customTableUid."] ASC";
-        if($this->sqlDriver["driver"] == "mssql"){
-            $orderBy = "";
-            $offset = $limit = -1;
-        }
-        if ($regexp != null) {
-            if($offset != -1 && $limit != -1){
-                $res = dibi::query("SELECT [".$this->customTableUid."],[".$this->customTablePwd."] FROM [".$this->customTableName."] WHERE [".$this->customTableUid."] ".AJXP_Utils::regexpToLike($regexp)." $orderBy %lmt %ofs", AJXP_Utils::cleanRegexp($regexp), $limit, $offset) ;
-            }else{
-                $res = dibi::query("SELECT [".$this->customTableUid."],[".$this->customTablePwd."] FROM [".$this->customTableName."] WHERE [".$this->customTableUid."] ".AJXP_Utils::regexpToLike($regexp)." $orderBy", AJXP_Utils::cleanRegexp($regexp)) ;
-            }
-        } else if ($offset != -1 && $limit != -1) {
-            $res = dibi::query("SELECT [".$this->customTableUid."],[".$this->customTablePwd."] FROM [".$this->customTableName."] $orderBy %lmt %ofs", $limit, $offset);
-        } else {
-            $res = dibi::query("SELECT [".$this->customTableUid."],[".$this->customTablePwd."] FROM [".$this->customTableName."] $orderBy");
-        }
-        $pairs = $res->fetchPairs($this->customTableUid, $this->customTablePwd);
-        $this->close();
-        return $pairs;
-    }
-
-    public function findUserPage($baseGroup, $userLogin, $usersPerPage, $offset){
-        $this->connect();
-        $res = dibi::query("SELECT COUNT(*) FROM [".$this->customTableName."] WHERE [".$this->customTableUid."] <= %s", $userLogin);
-        $count = $res->fetchSingle();
-        $this->close();
-        return ceil(($count - $offset) / $usersPerPage) - 1;
-
-    }
-
-    public function getUsersCount($baseGroup = "/", $regexp = "", $filterProperty = null, $filterValue = null, $recursive = true)
-    {
-        $this->connect();
-        $ands = array();
-
-        if(!empty($regexp)){
-            $select = "SELECT COUNT(*) FROM [".$this->customTableName."] WHERE %and";
-            $ands[] = array("[".$this->customTableUid."] ".AJXP_Utils::regexpToLike($regexp), AJXP_Utils::cleanRegexp($regexp));
-            $res = dibi::query($select);
-        }else{
-            $select = "SELECT COUNT(*) FROM [".$this->customTableName."]";
-            $res = dibi::query($select, $ands);
-        }
-        $this->close();
-        return $res->fetchSingle();
-    }
-
-    public function listUsers($baseGroup = "/", $recursive = true)
-    {
-        return $this->listUsersPaginated($baseGroup, null, 0, -1);
-    }
-
-    public function userExists($login)
-    {
-        $this->connect();
-        $res = dibi::query("SELECT COUNT(*) FROM [".$this->customTableName."] WHERE [".$this->customTableUid."]=%s", $login);
-        $this->close();
-        return (intval($res->fetchSingle()) > 0);
-    }
-
-    public function getUserPass($login)
-    {
-        $this->connect();
-        $res = dibi::query("SELECT [".$this->customTablePwd."] FROM [".$this->customTableName."] WHERE [".$this->customTableUid."]=%s", $login);
-        $pass = $res->fetchSingle();
-        $this->close();
-        return $pass;
-    }
-
-    public function checkPassword($login, $pass, $seed)
-    {
-        $userStoredPass = $this->getUserPass($login);
-        if(!$userStoredPass) return false;
-        $hashAlgo = $this->getOption("SQL_CUSTOM_TABLE_PWD_HASH");
-        if($hashAlgo == "pbkdf2"){
-            return AJXP_Utils::pbkdf2_validate_password($pass, $userStoredPass);
-        }else if($hashAlgo == "md5"){
-            return md5($pass) === $userStoredPass;
-        }else if($hashAlgo == "clear"){
-            return $pass == $userStoredPass;
-        }
-        return false;
-    }
-
-    public function usersEditable()
-    {
-        return false;
-    }
-    public function passwordsEditable()
-    {
-        return false;
-    }
-
-
-    public function testSQLConnexion($httpVars)
-    {
-        $p = AJXP_Utils::cleanDibiDriverParameters($httpVars["SQL_CUSTOM_DRIVER"]);
-        if ($p["driver"] == "sqlite3") {
-            $dbFile = AJXP_VarsFilter::filter($p["database"]);
-            if (!file_exists(dirname($dbFile))) {
-                mkdir(dirname($dbFile), 0755, true);
-            }
-        }
-
-        // Should throw an exception if there was a problem.
-        dibi::connect($p);
-        $cTableName = $httpVars["SQL_CUSTOM_TABLE"];
-        $cUserField= $httpVars["SQL_CUSTOM_TABLE_USER_FIELD"];
-        $cUserValue= $httpVars["SQL_CUSTOM_TABLE_TEST_USER"];
-        $res = dibi::query("SELECT COUNT(*) FROM [".$cTableName."] WHERE [".$cUserField."]=%s", $cUserValue);
-        $found = (intval($res->fetchSingle()) > 0);
-        if(!$found){
-            throw new Exception("Could connect to the DB but could not find user ".$cUserValue);
-        }
-        dibi::disconnect();
-        echo "SUCCESS:Connexion established and user $cUserValue found in DB";
-
-    }
-
-}
diff --git a/core/src/plugins/auth.custom_db/i18n/conf/de.php b/core/src/plugins/auth.custom_db/i18n/conf/de.php
index 8d90d99ab9..af85482a9c 100644
--- a/core/src/plugins/auth.custom_db/i18n/conf/de.php
+++ b/core/src/plugins/auth.custom_db/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Custom DB Auth Backend" => "Benutzerdefinierte Datenbank",
@@ -35,4 +35,4 @@
 "Test the SQL connexion" => "SQL-Verbindung testen",
 "Connexion" => "Connexion",
 "The Database Connexion" => "The Database Connexion",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/auth.custom_db/i18n/conf/en.php b/core/src/plugins/auth.custom_db/i18n/conf/en.php
index 0375f29cfc..665d044517 100644
--- a/core/src/plugins/auth.custom_db/i18n/conf/en.php
+++ b/core/src/plugins/auth.custom_db/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Custom DB Auth Backend" => "Custom DB Auth Backend",
@@ -35,4 +35,4 @@
 "Test the SQL connexion" => "Test the SQL connection",
 "Connexion" => "Connexion",
 "The Database Connexion" => "The Database Connexion",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/auth.custom_db/manifest.xml b/core/src/plugins/auth.custom_db/manifest.xml
index d539d49e5d..0dc6236f3e 100644
--- a/core/src/plugins/auth.custom_db/manifest.xml
+++ b/core/src/plugins/auth.custom_db/manifest.xml
@@ -19,7 +19,7 @@
         <param name="SQL_CUSTOM_TABLE_TEST_USER" type="string" label="CONF_MESSAGE[Test User]" description="CONF_MESSAGE[Use an existing user ID and click on Test Connexion to verify it is correctly found]" mandatory="false" />
         <param type="button" name="TEST_SQL" choices="run_plugin_action:auth.custom_db:testSQLConnexion" label="CONF_MESSAGE[Test Connexion]" description="CONF_MESSAGE[Test the SQL connexion]" mandatory="false"/>
     </server_settings>
-	<class_definition filename="plugins/auth.custom_db/class.customDbAuthDriver.php" classname="customDbAuthDriver"/>
+	<class_definition filename="plugins/auth.custom_db/CustomDbAuthDriver.php" classname="Pydio\Auth\Backend\CustomDbAuthDriver"/>
 	<registry_contributions>
 		<external_file filename="plugins/core.auth/standard_auth_actions.xml" include="actions/*" exclude=""/>
 	</registry_contributions>
diff --git a/core/src/plugins/auth.ftp/FtpAuthDriver.php b/core/src/plugins/auth.ftp/FtpAuthDriver.php
new file mode 100644
index 0000000000..60b9377427
--- /dev/null
+++ b/core/src/plugins/auth.ftp/FtpAuthDriver.php
@@ -0,0 +1,173 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Auth\Driver;
+
+use Exception;
+use Pydio\Auth\Core\AbstractAuthDriver;
+use Pydio\Auth\Core\MemorySafe;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\AuthService;
+use Pydio\Core\Services\ConfService;
+
+use Pydio\Core\PluginFramework\PluginsService;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Authenticate users against an FTP server
+ * @package AjaXplorer_Plugins
+ * @subpackage Auth
+ */
+class FtpAuthDriver extends AbstractAuthDriver
+{
+    public $driverName = "ftp";
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        parent::init($ctx, $options);
+        if (!isset($this->options["FTP_LOGIN_SCREEN"]) || $this->options["FTP_LOGIN_SCREEN"] != "TRUE" || $this->options["FTP_LOGIN_SCREEN"] === false) {
+            return;
+        }
+        // ENABLE WEBFTP LOGIN SCREEN
+        $this->logDebug(__FUNCTION__, "Enabling authfront.webftp");
+        PluginsService::getInstance($ctx)->getPluginById("authfront.webftp")->enabled = true;
+    }
+
+    public function listUsers($baseGroup = "/", $recursive = true)
+    {
+        $adminUser = $this->options["AJXP_ADMIN_LOGIN"];
+        if (isSet($this->options["ADMIN_USER"])) {
+            $adminUser = $this->options["AJXP_ADMIN_LOGIN"];
+        }
+        return array($adminUser => $adminUser);
+    }
+
+    public function userExists($login)
+    {
+        return true;
+    }
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     */
+    public function logoutCallback(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface)
+    {
+        $safeCredentials = MemorySafe::loadCredentials();
+        $crtUser = $safeCredentials["user"];
+        if (isSet($_SESSION["AJXP_DYNAMIC_FTP_DATA"])) {
+            unset($_SESSION["AJXP_DYNAMIC_FTP_DATA"]);
+        }
+        MemorySafe::clearCredentials();
+        $adminUser = $this->options["AJXP_ADMIN_LOGIN"];
+        if (isSet($this->options["ADMIN_USER"])) {
+            $adminUser = $this->options["AJXP_ADMIN_LOGIN"];
+        }
+        $subUsers = array();
+        if ($crtUser != $adminUser && $crtUser != "") {
+            ConfService::getConfStorageImpl()->deleteUser($crtUser, $subUsers);
+        }
+        AuthService::disconnect();
+        session_destroy();
+        session_write_close();
+
+        $x = new \Pydio\Core\Http\Response\SerializableResponseStream();
+        $x->addChunk(new \Pydio\Core\Http\Message\LoggingResult(2));
+        $responseInterface = $responseInterface->withBody($x);
+    }
+
+    public function setFtpDataCallback(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface)
+    {
+        $options = array("CHARSET", "FTP_DIRECT", "FTP_HOST", "FTP_PORT", "FTP_SECURE", "PATH");
+        $ftpOptions = array();
+        $httpVars = $requestInterface->getParsedBody();
+        foreach ($options as $option) {
+            if (isSet($httpVars[$option])) {
+                $ftpOptions[$option] = $httpVars[$option];
+            }
+        }
+        $_SESSION["AJXP_DYNAMIC_FTP_DATA"] = $ftpOptions;
+    }
+
+    public function testParameters($params)
+    {
+        $this->logDebug("TESTING", $params);
+        $repositoryId = $params["REPOSITORY_ID"];
+        require_once($this->getBaseDir() . "/FtpSonWrapper.php");
+        $wrapper = new \Pydio\Access\Driver\StreamProvider\FTP\FtpSonWrapper();
+        try {
+            $wrapper->initUrl("ajxp.ftp://fake:fake@$repositoryId/");
+        } catch (Exception $e) {
+            if ($e->getMessage() == "Cannot login to FTP server with user fake") {
+                return "SUCCESS: FTP server successfully contacted.";
+            } else {
+                return "ERROR: " . $e->getMessage();
+            }
+        }
+        return "SUCCESS: Could succesfully connect to the FTP server!";
+    }
+
+    public function checkPassword($login, $pass)
+    {
+        require_once($this->getBaseDir() . "/FtpSonWrapper.php");
+        $wrapper = new \Pydio\Access\Driver\StreamProvider\FTP\FtpSonWrapper();
+        $repoId = $this->options["REPOSITORY_ID"];
+        try {
+            $wrapper->initUrl("ajxp.ftp://" . rawurlencode($login) . ":" . rawurlencode($pass) . "@$repoId/");
+            MemorySafe::storeCredentials($login, $pass);
+        } catch (Exception $e) {
+            return false;
+        }
+        return true;
+    }
+
+    public function usersEditable()
+    {
+        return false;
+    }
+
+    public function passwordsEditable()
+    {
+        return false;
+    }
+
+    public function createUser($login, $passwd)
+    {
+    }
+
+    public function changePassword($login, $newPass)
+    {
+    }
+
+    public function deleteUser($login)
+    {
+    }
+
+    public function getUserPass($login)
+    {
+        return "";
+    }
+
+}
diff --git a/core/src/plugins/auth.ftp/FtpSonWrapper.php b/core/src/plugins/auth.ftp/FtpSonWrapper.php
new file mode 100644
index 0000000000..7bff95deb2
--- /dev/null
+++ b/core/src/plugins/auth.ftp/FtpSonWrapper.php
@@ -0,0 +1,42 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Access\Driver\StreamProvider\FTP;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+require_once(AJXP_INSTALL_PATH . "/" . AJXP_PLUGINS_FOLDER . "/access.ftp/FtpAccessWrapper.php");
+
+/**
+ * Class FtpSonWrapper
+ * @package Pydio\Access\Driver\StreamProvider\FTP
+ */
+class FtpSonWrapper extends FtpAccessWrapper
+{
+    /**
+     * @param $url
+     * @throws \Exception
+     * @throws \Pydio\Core\Exception\PydioException
+     */
+    public function initUrl($url)
+    {
+        $this->parseUrl($url, true);
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/auth.ftp/class.ftpAuthDriver.php b/core/src/plugins/auth.ftp/class.ftpAuthDriver.php
deleted file mode 100644
index d6e7eff3ce..0000000000
--- a/core/src/plugins/auth.ftp/class.ftpAuthDriver.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-require_once(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/access.ftp/class.ftpAccessWrapper.php");
-
-class ftpSonWrapper extends ftpAccessWrapper
-{
-    public function initUrl($url)
-    {
-        $this->parseUrl($url, true);
-    }
-}
-
-/**
- * Authenticate users against an FTP server
- * @package AjaXplorer_Plugins
- * @subpackage Auth
- */
-class ftpAuthDriver extends AbstractAuthDriver
-{
-    public $driverName = "ftp";
-
-    public function init($options){
-        parent::init($options);
-        if (!isset($this->options["FTP_LOGIN_SCREEN"]) || $this->options["FTP_LOGIN_SCREEN"] != "TRUE" || $this->options["FTP_LOGIN_SCREEN"] === false){
-            return;
-        }
-        // ENABLE WEBFTP LOGIN SCREEN
-        $this->logDebug(__FUNCTION__, "Enabling authfront.webftp");
-        AJXP_PluginsService::findPluginById("authfront.webftp")->enabled = true;
-    }
-
-    public function listUsers($baseGroup = "/", $recursive = true)
-    {
-        $adminUser = $this->options["AJXP_ADMIN_LOGIN"];
-        if (isSet($this->options["ADMIN_USER"])) {
-            $adminUser = $this->options["AJXP_ADMIN_LOGIN"];
-        }
-        return array($adminUser => $adminUser);
-    }
-
-    public function userExists($login)
-    {
-        return true ;
-    }
-
-    public function logoutCallback($actionName, $httpVars, $fileVars)
-    {
-        $safeCredentials = AJXP_Safe::loadCredentials();
-        $crtUser = $safeCredentials["user"];
-        if (isSet($_SESSION["AJXP_DYNAMIC_FTP_DATA"])) {
-            unset($_SESSION["AJXP_DYNAMIC_FTP_DATA"]);
-        }
-        AJXP_Safe::clearCredentials();
-        $adminUser = $this->options["AJXP_ADMIN_LOGIN"];
-        if (isSet($this->options["ADMIN_USER"])) {
-              $adminUser = $this->options["AJXP_ADMIN_LOGIN"];
-          }
-        $subUsers = array();
-        if ($crtUser != $adminUser && $crtUser!="") {
-            ConfService::getConfStorageImpl()->deleteUser($crtUser, $subUsers);
-        }
-        AuthService::disconnect();
-        session_destroy();
-        session_write_close();
-        AJXP_XMLWriter::header();
-        AJXP_XMLWriter::loggingResult(2);
-        AJXP_XMLWriter::close();
-    }
-
-    public function setFtpDataCallback($actionName, $httpVars, $fileVars)
-    {
-        $options = array("CHARSET", "FTP_DIRECT", "FTP_HOST", "FTP_PORT", "FTP_SECURE", "PATH");
-        $ftpOptions = array();
-        foreach ($options as $option) {
-            if (isSet($httpVars[$option])) {
-                $ftpOptions[$option] = $httpVars[$option];
-            }
-        }
-        $_SESSION["AJXP_DYNAMIC_FTP_DATA"] = $ftpOptions;
-    }
-
-    public function testParameters($params)
-    {
-        $this->logDebug("TESTING", $params);
-        $repositoryId = $params["REPOSITORY_ID"];
-        $wrapper = new ftpSonWrapper();
-        try {
-            $wrapper->initUrl("ajxp.ftp://fake:fake@$repositoryId/");
-        } catch (Exception $e) {
-            if ($e->getMessage() == "Cannot login to FTP server with user fake") {
-                return "SUCCESS: FTP server successfully contacted.";
-            } else {
-                return "ERROR: ".$e->getMessage();
-            }
-        }
-        return "SUCCESS: Could succesfully connect to the FTP server!";
-    }
-
-    public function checkPassword($login, $pass, $seed)
-    {
-        $wrapper = new ftpSonWrapper();
-        $repoId = $this->options["REPOSITORY_ID"];
-        try {
-            $wrapper->initUrl("ajxp.ftp://".rawurlencode($login).":".rawurlencode($pass)."@$repoId/");
-            AJXP_Safe::storeCredentials($login, $pass);
-        } catch (Exception $e) {
-            return false;
-        }
-        return true;
-    }
-
-    public function usersEditable()
-    {
-        return false;
-    }
-    public function passwordsEditable()
-    {
-        return false;
-    }
-
-    public function createUser($login, $passwd)
-    {
-    }
-    public function changePassword($login, $newPass)
-    {
-    }
-    public function deleteUser($login)
-    {
-    }
-
-    public function getUserPass($login)
-    {
-        return "";
-    }
-
-}
diff --git a/core/src/plugins/auth.ftp/i18n/conf/de.php b/core/src/plugins/auth.ftp/i18n/conf/de.php
index 97ffb9b073..a86822c19a 100644
--- a/core/src/plugins/auth.ftp/i18n/conf/de.php
+++ b/core/src/plugins/auth.ftp/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FTP authentication" => "FTP-Authentifizierung",
diff --git a/core/src/plugins/auth.ftp/i18n/conf/en.php b/core/src/plugins/auth.ftp/i18n/conf/en.php
index 345883d0c0..ee449cb438 100644
--- a/core/src/plugins/auth.ftp/i18n/conf/en.php
+++ b/core/src/plugins/auth.ftp/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FTP authentication" => "FTP authentication",
diff --git a/core/src/plugins/auth.ftp/i18n/conf/fr.php b/core/src/plugins/auth.ftp/i18n/conf/fr.php
index bd691eb5c8..6e74dc5087 100644
--- a/core/src/plugins/auth.ftp/i18n/conf/fr.php
+++ b/core/src/plugins/auth.ftp/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FTP authentication" => "Authentification FTP",
diff --git a/core/src/plugins/auth.ftp/i18n/conf/it.php b/core/src/plugins/auth.ftp/i18n/conf/it.php
index 5def82e403..200492478c 100644
--- a/core/src/plugins/auth.ftp/i18n/conf/it.php
+++ b/core/src/plugins/auth.ftp/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FTP Authentication" => "Autenticazione FTP",
@@ -36,4 +36,4 @@
 "ID of the workspace used to validate credentials" => "ID of the workspace used to validate credentials",
 "Test connection" => "Test connection",
 "Test connection to the FTP server" => "Test connection to the FTP server",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/auth.ftp/i18n/conf/pt.php b/core/src/plugins/auth.ftp/i18n/conf/pt.php
index 58f33649b2..fc06a4fa55 100644
--- a/core/src/plugins/auth.ftp/i18n/conf/pt.php
+++ b/core/src/plugins/auth.ftp/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FTP authentication" => "Autenticação FTP",
diff --git a/core/src/plugins/auth.ftp/i18n/de.php b/core/src/plugins/auth.ftp/i18n/de.php
index bbbd12fac0..a88c6a7060 100644
--- a/core/src/plugins/auth.ftp/i18n/de.php
+++ b/core/src/plugins/auth.ftp/i18n/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Verbindungsdaten",
diff --git a/core/src/plugins/auth.ftp/i18n/en.php b/core/src/plugins/auth.ftp/i18n/en.php
index 2724c77034..7ac0974e8e 100644
--- a/core/src/plugins/auth.ftp/i18n/en.php
+++ b/core/src/plugins/auth.ftp/i18n/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Enter connection data",
diff --git a/core/src/plugins/auth.ftp/i18n/et.php b/core/src/plugins/auth.ftp/i18n/et.php
index f31551af42..a156d72494 100644
--- a/core/src/plugins/auth.ftp/i18n/et.php
+++ b/core/src/plugins/auth.ftp/i18n/et.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 //  Estonian translation by Ardi Jürgens <ardi (at) zone.ee>
 //  + updates/fixes by Kain Väljaots <kain (at) zone.ee>
diff --git a/core/src/plugins/auth.ftp/i18n/fr.php b/core/src/plugins/auth.ftp/i18n/fr.php
index e15d5b5485..93850b5548 100644
--- a/core/src/plugins/auth.ftp/i18n/fr.php
+++ b/core/src/plugins/auth.ftp/i18n/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Données de connexion",
diff --git a/core/src/plugins/auth.ftp/i18n/it.php b/core/src/plugins/auth.ftp/i18n/it.php
index 3548ecfa83..ee9489c8ee 100644
--- a/core/src/plugins/auth.ftp/i18n/it.php
+++ b/core/src/plugins/auth.ftp/i18n/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Inserire parametri connessione",
diff --git a/core/src/plugins/auth.ftp/i18n/pt.php b/core/src/plugins/auth.ftp/i18n/pt.php
index 7a8ee1f19e..fbf3a02bd0 100644
--- a/core/src/plugins/auth.ftp/i18n/pt.php
+++ b/core/src/plugins/auth.ftp/i18n/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Introduza os dados de Ligação",
diff --git a/core/src/plugins/auth.ftp/manifest.xml b/core/src/plugins/auth.ftp/manifest.xml
index 896447d22b..4d3028f101 100644
--- a/core/src/plugins/auth.ftp/manifest.xml
+++ b/core/src/plugins/auth.ftp/manifest.xml
@@ -10,7 +10,7 @@
         <param name="FTP_LOGIN_SCREEN" type="boolean" label="CONF_MESSAGE[FTP Login Screen]" description="CONF_MESSAGE[Replace the default connection screen (username and password) by a screen allowing users to enter their own FTP connection data (server, port, etc.)]" mandatory="true" default="false"/>
         <param name="REPOSITORY_ID" type="select" choices="json_list:list_all_repositories_json" label="CONF_MESSAGE[Workspace]" description="CONF_MESSAGE[ID of the workspace used to validate credentials]" mandatory="true"/>
 	</server_settings>
-	<class_definition filename="plugins/auth.ftp/class.ftpAuthDriver.php" classname="ftpAuthDriver"/>
+	<class_definition filename="plugins/auth.ftp/FtpAuthDriver.php" classname="Pydio\Auth\Driver\FtpAuthDriver"/>
 	<registry_contributions>
 		<external_file filename="plugins/core.auth/standard_auth_actions.xml" include="actions/action[@name='back']" exclude=""/>
         <client_configs>
diff --git a/core/src/plugins/auth.ldap/LdapAuthDriver.php b/core/src/plugins/auth.ldap/LdapAuthDriver.php
new file mode 100644
index 0000000000..e1f5fca2a8
--- /dev/null
+++ b/core/src/plugins/auth.ldap/LdapAuthDriver.php
@@ -0,0 +1,1071 @@
+<?php
+/*
+ * Copyright 2007-2011 Pierre Wirtz
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Auth\Driver;
+
+use Pydio\Auth\Core\AbstractAuthDriver;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Controller\ProgressBarCLI;
+use Pydio\Core\Services\RolesService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\StringHelper;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Authenticate users against an LDAP server
+ * @package AjaXplorer_Plugins
+ * @subpackage Auth
+ */
+class LdapAuthDriver extends AbstractAuthDriver
+{
+    public $ldapUrl;
+    public $ldapPort = 389;
+    public $ldapAdminUsername;
+    public $ldapAdminPassword;
+    public $ldapDN;
+    public $ldapGDN;
+    public $ldapFilter;
+    public $ldapGFilter;
+    public $dynamicFilter;
+    public $dynamicExpected;
+    public $ldapUserAttr;
+    public $ldapGroupAttr;
+    public $fakeAttrMemberOf;
+    public $mappedRolePrefix;
+    public $pageSize;
+
+    public $ldapconn = null;
+    public $separateGroup = "";
+
+    public $hasGroupsMapping = false;
+    public $attrMemberInGroup = true;
+
+
+    /**
+     * Legacy way, defined through PHP array
+     * @var array
+     */
+    public $customParamsMapping = array();
+
+    /**
+     * New way, defined through GUI Options (PARAM_MAPPING replication group).
+     * @var array
+     */
+    public $paramsMapping = array();
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        parent::init($ctx, $options);
+        $options = $this->options;
+        $this->ldapUrl = $options["LDAP_URL"];
+        if (isSet($options["LDAP_PROTOCOL"]) && $options["LDAP_PROTOCOL"] == "ldaps") {
+            $this->ldapUrl = "ldaps://" . $this->ldapUrl;
+        }
+        if ($options["LDAP_PORT"]) $this->ldapPort = $options["LDAP_PORT"];
+        if ($options["LDAP_USER"]) $this->ldapAdminUsername = $options["LDAP_USER"];
+        if ($options["LDAP_PASSWORD"]) $this->ldapAdminPassword = $options["LDAP_PASSWORD"];
+        if (!empty($options["LDAP_FAKE_MEMBEROF"])) $this->fakeAttrMemberOf = $options["LDAP_FAKE_MEMBEROF"];
+        if (isset($options["LDAP_VALUE_MEMBERATTR_IN_GROUP"])) {
+            $this->attrMemberInGroup = $options["LDAP_VALUE_MEMBERATTR_IN_GROUP"];
+        } else {
+            $this->attrMemberInGroup = true;
+        }
+
+        if ($options["LDAP_PAGE_SIZE"]) $this->pageSize = $options["LDAP_PAGE_SIZE"];
+        if ($options["LDAP_GROUP_PREFIX"]) $this->mappedRolePrefix = $options["LDAP_GROUP_PREFIX"];
+        if ($options["LDAP_DN"]) $this->ldapDN = $this->parseReplicatedParams($options, array("LDAP_DN"));
+        if ($options["LDAP_GDN"]) $this->ldapGDN = $this->parseReplicatedParams($options, array("LDAP_GDN"));
+        if (is_array($options["CUSTOM_DATA_MAPPING"])) $this->customParamsMapping = $options["CUSTOM_DATA_MAPPING"];
+        $this->paramsMapping = $this->parseReplicatedParams($options, array("MAPPING_LDAP_PARAM", "MAPPING_LOCAL_TYPE", "MAPPING_LOCAL_PARAM"));
+        if (count($this->paramsMapping)) {
+            foreach ($this->paramsMapping as $param) {
+                if (strtolower($param["MAPPING_LOCAL_TYPE"]) == "group_path") {
+                    $this->hasGroupsMapping = $param["MAPPING_LDAP_PARAM"];
+                    break;
+                }
+            }
+        }
+        if (!empty($options["LDAP_FILTER"])) {
+            $this->ldapFilter = $options["LDAP_FILTER"];
+            if ($this->ldapFilter != "" && !preg_match("/^\(.*\)$/", $this->ldapFilter)) {
+                $this->ldapFilter = "(" . $this->ldapFilter . ")";
+            }
+        } else {
+            if (!empty($this->hasGroupsMapping) && !empty($this->ldapGFilter)) {
+                $this->ldapFilter = "!(" . $this->ldapGFilter . ")";
+            }
+        }
+        if (!empty($options["LDAP_GROUP_FILTER"])) {
+            $this->ldapGFilter = $options["LDAP_GROUP_FILTER"];
+            if ($this->ldapGFilter != "" && !preg_match("/^\(.*\)$/", $this->ldapGFilter)) {
+                $this->ldapGFilter = "(" . $this->ldapGFilter . ")";
+            }
+        } else {
+            $this->ldapGFilter = "(objectClass=group)";
+        }
+        if (!empty($options["LDAP_USERATTR"])) {
+            $this->ldapUserAttr = strtolower($options["LDAP_USERATTR"]);
+        } else {
+            $this->ldapUserAttr = 'uid';
+        }
+        if (!empty($options["LDAP_GROUPATTR"])) {
+            $this->ldapGroupAttr = strtolower($options["LDAP_GROUPATTR"]);
+        } else {
+            $this->ldapGroupAttr = 'cn';
+        }
+    }
+
+    /**
+     * @param array $options
+     * @param array $optionsNames
+     * @return array
+     */
+    public function parseReplicatedParams($options, $optionsNames)
+    {
+        $i = 0;
+        $data = array();
+        while (true) {
+            $ok = true;
+            $occurence = array();
+            $suffix = ($i == 0 ? "" : "_" . $i);
+            foreach ($optionsNames as $name) {
+                if (!isSet($options[$name . $suffix])) {
+                    $ok = false;
+                    break;
+                }
+                if (count($optionsNames) == 1) {
+                    $occurence = $options[$name . $suffix];
+                } else {
+                    $occurence[$name] = $options[$name . $suffix];
+                }
+            }
+            if (!$ok) break;
+            $data[] = $occurence;
+            $i++;
+        }
+        return $data;
+    }
+
+    public function testLDAPConnexion($options)
+    {
+        $this->ldapUrl = $options["LDAP_URL"];
+        if (isSet($options["LDAP_PROTOCOL"]) && $options["LDAP_PROTOCOL"] == "ldaps") {
+            $this->ldapUrl = "ldaps://" . $this->ldapUrl;
+        }
+        if ($options["LDAP_PORT"]) $this->ldapPort = $options["LDAP_PORT"];
+        if ($options["LDAP_USER"]) $this->ldapAdminUsername = $options["LDAP_USER"];
+        if ($options["LDAP_PASSWORD"]) $this->ldapAdminPassword = $options["LDAP_PASSWORD"];
+        if ($options["LDAP_DN"]) $this->ldapDN = $this->parseReplicatedParams($options, array("LDAP_DN"));
+        $this->startConnexion();
+        if ($this->ldapconn == null) {
+            return "ERROR: Cannot connect to the server";
+        } else {
+            if (!empty($options["TEST_USER"])) {
+                $entries = $this->getUserEntries($options["TEST_USER"]);
+                if (!is_array($entries)) return false;
+                if (UsersService::ignoreUserCase()) {
+                    $res = (strcasecmp($options["TEST_USER"], $entries[0][$this->ldapUserAttr][0]) == 0);
+                } else {
+                    $res = (strcmp($options["TEST_USER"], $entries[0][$this->ldapUserAttr][0]) == 0);
+                }
+                $this->logDebug(__FUNCTION__, 'checking if user ' . $options["TEST_USER"] . ' exists  : ' . $res);
+                if (!$res) {
+                    return "ERROR: Could <b>correctly connect</b> to the server, but could <b>not find the specified user</b> in the directory.";
+                } else {
+                    return "SUCCESS: Could connect to the server, and could find the specified user inside the directory.";
+                }
+            } else {
+                return "SUCCESS: Correctly connected to the server";
+            }
+        }
+
+    }
+
+    public function startConnexion()
+    {
+        $this->logDebug(__FUNCTION__, 'start connexion');
+        if ($this->ldapconn == null) {
+            $this->ldapconn = $this->LDAP_Connect();
+            if ($this->ldapconn == null) {
+                $this->logError(__FUNCTION__, 'LDAP Server connexion could NOT be established');
+            }
+        }
+        //return $this->ldapconn;
+    }
+
+    public function __deconstruct()
+    {
+        if ($this->ldapconn != null) {
+            ldap_close($this->ldapconn);
+        }
+    }
+
+    public function LDAP_Connect()
+    {
+        $ldapconn = ldap_connect($this->ldapUrl, $this->ldapPort);
+        //@todo : return error_code
+
+        if ($ldapconn) {
+            $this->logDebug(__FUNCTION__, 'ldap_connect(' . $this->ldapUrl . ',' . $this->ldapPort . ') OK');
+            ldap_set_option($ldapconn, LDAP_OPT_PROTOCOL_VERSION, 3);
+            //ldap_set_option( $ldapconn, LDAP_OPT_REFERRALS, 0 );
+
+            if ($this->ldapAdminUsername === null) {
+                //connecting anonymously
+                $this->logDebug(__FUNCTION__, 'Anonymous LDAP connexion');
+                $ldapbind = @ldap_bind($ldapconn);
+            } else {
+                $this->logDebug(__FUNCTION__, 'Standard LDAP connexion');
+                $ldapbind = @ldap_bind($ldapconn, $this->ldapAdminUsername, $this->ldapAdminPassword);
+            }
+
+            if ($ldapbind) {
+                $this->logDebug(__FUNCTION__, 'ldap_bind OK');
+                return $ldapconn;
+            } else {
+                $this->logError(__FUNCTION__, 'ldap_bind FAILED');
+                return null;
+            }
+
+        } else {
+            $this->logError(__FUNCTION__, 'ldap_connect(' . $this->ldapUrl . ',' . $this->ldapPort . ') FAILED');
+            die('Auth.ldap :: ldap_connect FAILED');
+        }
+
+    }
+
+
+    public function getUserEntries($login = null, $countOnly = false, $offset = -1, $limit = -1, $regexpOnSearchAttr = false)
+    {
+        if ($login == null) {
+            $filter = $this->ldapFilter;
+        } else {
+            if ($regexpOnSearchAttr && !empty($this->options["LDAP_SEARCHUSER_ATTR"])) {
+                $searchAttr = $this->options["LDAP_SEARCHUSER_ATTR"];
+                $searchAttrArray = explode(",", $searchAttr);
+            }
+
+            if (isset($searchAttrArray)) {
+                if (count($searchAttrArray) > 1) {
+                    $searchAttrFilter = "(|";
+                    foreach ($searchAttrArray as $attr) {
+                        $searchAttrFilter .= "(" . $attr . "=" . $login . ")";
+                    }
+                    $searchAttrFilter .= ")";
+                } else {
+                    $searchAttrFilter = "(" . $searchAttrArray[0] . "=" . $login . ")";
+                }
+
+            } else {
+                $searchAttrFilter = "(" . $this->ldapUserAttr . "=" . $login . ")";
+            }
+
+            if ($this->ldapFilter == "") $filter = $searchAttrFilter;
+            else  $filter = "(&" . $this->ldapFilter . $searchAttrFilter . ")";
+        }
+        if (empty($filter)) {
+            if (!empty($this->dynamicFilter)) $filter = $this->dynamicFilter;
+            else $filter = $this->ldapUserAttr . "=*";
+        } else {
+            if (!empty($this->dynamicFilter)) $filter = "(&(" . $this->dynamicFilter . ")" . $filter . ")";
+        }
+        if ($this->ldapconn == null) {
+            $this->startConnexion();
+        }
+        $conn = array();
+        if (is_array($this->ldapDN)) {
+            foreach ($this->ldapDN as $dn) {
+                $conn[] = $this->ldapconn;
+            }
+        } else {
+            $conn = array($this->ldapconn);
+        }
+        $expected = array($this->ldapUserAttr);
+        if ($login != null && (!empty($this->customParamsMapping) || !empty($this->paramsMapping))) {
+            if (!empty($this->customParamsMapping)) {
+                $expected = array_merge($expected, array_keys($this->customParamsMapping));
+            }
+            if (!empty($this->paramsMapping)) {
+                $keys = array();
+                foreach ($this->paramsMapping as $param) $keys[] = $param["MAPPING_LDAP_PARAM"];
+                $expected = array_merge($expected, $keys);
+            }
+        }
+        if (is_array($this->dynamicExpected)) {
+            $expected = array_merge($expected, $this->dynamicExpected);
+        }
+        foreach ($conn as $dn => $ldapc) {
+            if (!$ldapc) {
+                unset($conn[$dn]);
+            }
+        }
+        if (count($conn) < 1) {
+            return array("count" => 0);
+        }
+        //$ret = ldap_search($conn,$this->ldapDN,$filter, $expected);
+
+        $cookie = '';
+        if (empty($this->pageSize) || !is_numeric($this->pageSize)) {
+            $this->pageSize = 500;
+        }
+
+
+        $allEntries = array("count" => 0);
+        $isSupportPagedResult = function_exists("ldap_control_paged_result") && function_exists("ldap_control_paged_result_response");
+
+        $gotAllEntries = false;
+        $index = 0;
+
+        //Update progress bar in CLI mode
+        $isListAll = (($offset == -1) && ($limit == -1) && (is_null($login)) && $regexpOnSearchAttr && (php_sapi_name() == "cli"));
+        if ($isListAll) {
+            $total = $this->getCountFromCache();
+            $progressBar = new ProgressBarCLI();
+            $progressBar->init($index, $total["count"], "Get ldap users");
+        }
+
+        do {
+            if ($isSupportPagedResult)
+                ldap_control_paged_result($this->ldapconn, $this->pageSize, false, $cookie);
+
+            $ret = ldap_search($conn, $this->ldapDN, $filter, $expected, 0, 0);
+            if ($ret === false) break;
+            foreach ($ret as $i => $resourceResult) {
+                if ($resourceResult === false) continue;
+                if ($countOnly) {
+                    $allEntries["count"] += ldap_count_entries($conn[$i], $resourceResult);
+                    continue;
+                }
+                if ($limit != -1) {
+                    @ldap_sort($conn[$i], $resourceResult, $this->ldapUserAttr);
+                }
+                $entries = ldap_get_entries($conn[$i], $resourceResult);
+
+                // for better performance
+                if ((is_array($entries)) && ($offset != -1) && ($limit != -1) && (($index + $this->pageSize) < $offset)) {
+                    $index += $this->pageSize;
+                    continue;
+                }
+
+                if (!empty($entries["count"])) {
+                    $allEntries["count"] += $entries["count"];
+                    unset($entries["count"]);
+                    foreach ($entries as $entry) {
+                        if ($offset != -1 && $index < $offset) {
+                            $index++;
+                            continue;
+                        }
+
+                        // fake memberOf
+                        if (($this->fakeAttrMemberOf) && method_exists($this, "fakeMemberOf") && in_array(strtolower("memberof"), array_map("strtolower", $expected))) {
+                            if ($this->attrMemberInGroup) {
+                                $uid = $entry["dn"];
+                            } else {
+                                $uidWithEqual = explode(",", $entry["dn"]);
+                                $uidShort = explode("=", $uidWithEqual[0]);
+                                $uid = $uidShort[1];
+                            }
+
+                            $strldap = "(&" . $this->ldapGFilter . "(" . $this->fakeAttrMemberOf . "=" . $uid . "))";
+                            $this->fakeMemberOf($conn, $this->ldapGDN, $strldap, array("cn"), $entry);
+                        }
+
+                        $allEntries[] = $entry;
+                        $index++;
+
+                        //Update progress bar in CLI mode
+                        if (isset($progressBar))
+                            $progressBar->update($index);
+
+
+                        if (($offset != -1) && ($limit != -1) && $index > $offset + $limit)
+                            break;
+                    }
+
+                    if (($index > $offset + $limit) && ($limit != -1) && ($offset != -1))
+                        $gotAllEntries = true;
+                }
+            }
+            if ($isSupportPagedResult)
+                foreach ($ret as $element) {
+                    if (is_resource($element))
+                        @ldap_control_paged_result_response($this->ldapconn, $element, $cookie);
+                }
+        } while (($cookie !== null && $cookie != '') && ($isSupportPagedResult) && (!$gotAllEntries));
+
+        // reset paged_result for other activities (otherwise we will experience ldap error)
+        if ($isSupportPagedResult)
+            ldap_control_paged_result($this->ldapconn, 0);
+
+        return $allEntries;
+    }
+
+    private function userSortFunction($entryA, $entryB)
+    {
+        return strcasecmp($entryA[$this->ldapUserAttr][0], $entryB[$this->ldapUserAttr][0]);
+    }
+
+    public function supportsUsersPagination()
+    {
+        return true;
+    }
+
+    // $baseGroup = "/"
+    public function listUsersPaginated($baseGroup, $regexp, $offset, $limit, $recursive = true)
+    {
+        if (!empty($this->hasGroupsMapping)) {
+            if ($baseGroup == "/") {
+                $this->dynamicFilter = "!(" . $this->hasGroupsMapping . "=*)";
+            } else {
+                $this->dynamicFilter = $this->hasGroupsMapping . "=" . basename($baseGroup);
+            }
+
+        } else if (!empty($this->separateGroup) && $baseGroup != "/" . $this->separateGroup) {
+            return array();
+        }
+
+        $entries = $this->getUserEntries(StringHelper::regexpToLdap($regexp), false, $offset, $limit, true);
+        $this->dynamicFilter = null;
+        $persons = array();
+        unset($entries['count']); // remove 'count' entry
+        foreach ($entries as $id => $person) {
+            $login = $person[$this->ldapUserAttr][0];
+            if (UsersService::ignoreUserCase()) $login = strtolower($login);
+            $persons[$login] = "XXX";
+        }
+        return $persons;
+    }
+
+    public function getUsersCount($baseGroup = "/", $regexp = "", $filterProperty = null, $filterValue = null, $recursive = true)
+    {
+        $check_cache = $this->getCountFromCache();
+
+        if ((is_array($check_cache) && $check_cache["count"] > 0)) {
+            return $check_cache["count"];
+        }
+
+        if (!empty($this->hasGroupsMapping)) {
+            if ($baseGroup == "/") {
+                $this->dynamicFilter = "!(" . $this->hasGroupsMapping . "=*)";
+            } else {
+                $this->dynamicFilter = $this->hasGroupsMapping . "=" . basename($baseGroup);
+            }
+        }
+
+        $res = $this->getUserEntries(StringHelper::regexpToLdap($regexp), true, null);
+        $this->saveCountToCache($res);
+        $this->dynamicFilter = null;
+        return $res["count"];
+    }
+
+
+    /**
+     * List children groups of a given group. By default will report this on the CONF driver,
+     * but can be overriden to grab info directly from auth driver (ldap, etc).
+     * @param string $baseGroup
+     * @return string[]
+     */
+    public function listChildrenGroups($baseGroup = "/")
+    {
+        $arr = array();
+        if ($baseGroup == "/" && !empty($this->separateGroup)) {
+            $arr[$this->separateGroup] = "LDAP Annuary";
+            return $arr;
+        }
+        if (!empty($this->hasGroupsMapping)) {
+            $origUsersDN = $this->ldapDN;
+            $origUsersFilter = $this->ldapFilter;
+            $origUsersAttr = $this->ldapUserAttr;
+            $this->ldapDN = $this->ldapGDN;
+            $this->ldapFilter = $this->ldapGFilter;
+            $this->ldapUserAttr = $this->ldapGroupAttr;
+
+            if ($baseGroup != "/") {
+                $this->dynamicFilter = $this->hasGroupsMapping . "=" . basename($baseGroup);
+            } else {
+                //STRANGE, SHOULD WORK BUT CAN EXCLUDES ALL GROUPS
+                $this->dynamicFilter = "!(" . $this->hasGroupsMapping . "=*)";
+            }
+
+            $entries = $this->getUserEntries();
+            $this->dynamicFilter = null;
+            $persons = array();
+            unset($entries['count']); // remove 'count' entry
+            foreach ($entries as $id => $person) {
+                $login = $person[$this->ldapUserAttr][0];
+                //if(AuthService::ignoreUserCase()) $login = strtolower($login);
+                $dn = $person["dn"];
+                $persons["/" . $dn] = $login;
+
+                $branch = array();
+                $this->buildGroupBranch($login, $branch);
+                $parent = "/";
+                if (count($branch)) {
+                    $parent = "/" . implode("/", array_reverse($branch));
+                }
+                // TODO: REMOVE filterBaseGroup() instruction.
+                // MAYBE THIS WILL BREAK SOMEHTING
+                if (!ConfService::getConfStorageImpl()->groupExists(rtrim($parent, "/") . "/" . $dn)) {
+                    UsersService::createGroup($parent, $dn, $login);
+                }
+            }
+            $this->ldapDN = $origUsersDN;
+            $this->ldapFilter = $origUsersFilter;
+            $this->ldapUserAttr = $origUsersAttr;
+            return $persons;
+        }
+
+        return $arr;
+    }
+
+
+    public function listUsers($baseGroup = "/", $recursive = true)
+    {
+        return $this->listUsersPaginated($baseGroup, null, -1, -1);
+    }
+
+    public function userExists($login)
+    {
+        // Check if local storage exists for the user. If it does, assume the user
+        // exists. This prevents a barrage of ldap_connect/ldap_bind/ldap_search
+        // calls.
+        $confDriver = ConfService::getConfStorageImpl();
+        $userObject = $confDriver->instantiateAbstractUserImpl($login);
+        if ($userObject->storageExists()) {
+            //return true;
+        }
+        $entries = $this->getUserEntries($login);
+        if (!is_array($entries)) return false;
+        if (UsersService::ignoreUserCase()) {
+            $res = (strcasecmp($login, $entries[0][$this->ldapUserAttr][0]) == 0);
+        } else {
+            $res = (strcmp($login, $entries[0][$this->ldapUserAttr][0]) == 0);
+        }
+        $this->logDebug(__FUNCTION__, 'checking if user ' . $login . ' exists  : ' . $res);
+        return $res;
+    }
+
+    public function checkPassword($login, $pass)
+    {
+        if (empty($pass)) return false;
+        $entries = $this->getUserEntries($login);
+        if ($entries['count'] > 0) {
+            $this->logDebug(__FUNCTION__, 'Ldap Password Check: Got user ' . $login);
+            if (@ldap_bind($this->ldapconn, $entries[0]["dn"], $pass)) {
+                $this->logDebug(__FUNCTION__, 'Ldap Password Check: Got user ' . $entries[0]["cn"][0]);
+                return true;
+            }
+            $this->logDebug(__FUNCTION__, 'Password Check: failed for user ' . $login);
+            return false;
+        } else {
+            $this->logDebug(__FUNCTION__, "Ldap Password Check : No user $login found");
+            return false;
+        }
+    }
+
+    public function usersEditable()
+    {
+        return false;
+    }
+
+    public function passwordsEditable()
+    {
+        return false;
+    }
+
+    public function buildGroupBranch($groupAttrValue, &$branch = array())
+    {
+        // Load group data. Detect memberOf. Load parent group.
+        $origUsersDN = $this->ldapDN;
+        $origUsersFilter = $this->ldapFilter;
+        $origUsersAttr = $this->ldapUserAttr;
+        $this->ldapDN = $this->ldapGDN;
+        $this->ldapFilter = $this->ldapGFilter;
+        $this->ldapUserAttr = $this->ldapGroupAttr;
+
+        $this->dynamicFilter = $this->ldapGroupAttr . "=" . $groupAttrValue;
+        $this->dynamicExpected = array($this->hasGroupsMapping);
+
+        $entries = $this->getUserEntries();
+        $this->dynamicFilter = null;
+        $this->dynamicExpected = null;
+        $persons = array();
+        unset($entries['count']); // remove 'count' entry
+        $groupData = $entries[0];
+
+        /*
+         * memberOf could be a array because of a object(such as user) can be belong to multi-groups
+         * example: object w10S was belong to 04 groups
+         * [
+            {"memberof":
+                {
+                    "0":"CN=globalmarkettings,OU=MARKETING,OU=company,DC=vpydio,DC=fr",
+                    "1":"CN=algers,CN=Alger,OU=algeria,OU=Africe,OU=MARKETING,OU=company,DC=vpydio,DC=fr",
+                    "2":"CN=algerias,OU=algeria,OU=Africe,OU=MARKETING,OU=company,DC=vpydio,DC=fr",
+                    "3":"CN=africes,OU=Africe,OU=MARKETING,OU=company,DC=vpydio,DC=fr"
+                }
+                ,
+                "0":"memberof",
+                "samaccountname":
+                {
+                    "0":"w10s"
+                },
+                "1":"samaccountname",
+                "dn":"CN=w10s,CN=willaya10,CN=Alger,OU=algeria,OU=Africe,OU=MARKETING,OU=company,DC=vpydio,DC=fr"
+            }
+            ]
+         */
+        $memberOfs = $groupData[strtolower($this->hasGroupsMapping)];
+        //$memberOf = $groupData[strtolower($this->hasGroupsMapping)][0];
+
+
+        $this->ldapDN = $origUsersDN;
+        $this->ldapFilter = $origUsersFilter;
+        $this->ldapUserAttr = $origUsersAttr;
+
+        $this->logDebug(__FUNCTION__, "GroupData[]: " . json_encode($groupData));
+
+        if (!empty($memberOfs)) {
+
+            /*
+             * recursively build group branch for each memeber of $memberOfs
+             *
+             */
+            foreach ($memberOfs as $memberOf) {
+                if (!empty($memberOf)) {
+                    $this->logDebug(__FUNCTION__, "memberOf[]: " . json_encode($memberOf));
+                    $parts = explode(",", ltrim($memberOf, '/'));
+                    foreach ($parts as $part) {
+                        list($att, $attVal) = explode("=", $part);
+                        /*
+                         * In the example above, 1st CN indicates the name of group, from 2nd, CN indicate a container,
+                         * therefore, we just take the first "cn" element by breaking the for if we found.
+                         *
+                         */
+                        if (strtolower($att) == "cn") {
+                            $parentCN = $attVal;
+                            break;
+                        }
+                    }
+                    if (!empty($parentCN)) {
+                        $branch[] = $memberOf;
+                        $this->logDebug(__FUNCTION__, "branch[]: " . $branch);
+
+                        /*
+                         * recursive function call to look for more group deeply
+                         */
+                        $this->buildGroupBranch($parentCN, $branch);
+                    }
+                }
+            } // foreach
+        }
+
+    }
+
+    public function updateUserObject(&$userObject)
+    {
+
+        parent::updateUserObject($userObject);
+        if (!empty($this->separateGroup)) $userObject->setGroupPath("/" . $this->separateGroup);
+        // SHOULD BE DEPRECATED
+        if (!empty($this->customParamsMapping)) {
+            $checkValues = array_values($this->customParamsMapping);
+            $prefs = $userObject->getPref("CUSTOM_PARAMS");
+            if (!is_array($prefs)) {
+                $prefs = array();
+            }
+            // If one value exist, we consider the mapping has already been done.
+            foreach ($checkValues as $val) {
+                if (array_key_exists($val, $prefs)) return;
+            }
+            $changes = false;
+            $entries = $this->getUserEntries($userObject->getId());
+            if ($entries["count"]) {
+                $entry = $entries[0];
+                foreach ($this->customParamsMapping as $key => $value) {
+                    if (isSet($entry[$key])) {
+                        $prefs[$value] = $entry[$key][0];
+                        $changes = true;
+                    }
+                }
+            }
+            if ($changes) {
+                $userObject->setPref("CUSTOM_PARAMS", $prefs);
+                $userObject->save();
+            }
+        }
+        if (!empty($this->paramsMapping)) {
+
+            $changes = false;
+            $entries = $this->getUserEntries($userObject->getId());
+            if ($entries["count"]) {
+                $entry = $entries[0];
+                foreach ($this->paramsMapping as $params) {
+                    $key = strtolower($params['MAPPING_LDAP_PARAM']);
+                    if (isSet($entry[$key])) {
+                        $value = $entry[$key][0];
+
+                        $memberValues = array();
+
+                        if ($key == "memberof") {
+                            // get CN from value
+                            foreach ($entry[$key] as $possibleValue) {
+                                $hnParts = array();
+                                $parts = explode(",", ltrim($possibleValue, '/'));
+                                foreach ($parts as $part) {
+                                    list($att, $attVal) = explode("=", $part);
+
+                                    //if (strtolower($att) == "cn")  $hnParts[] = $attVal;
+
+                                    /*
+                                     * In the example above, 1st CN indicates the name of group, from 2nd, CN indicate a container,
+                                     * therefore, we just take the first "cn" element by breaking the for if we found.
+                                     *
+                                     */
+                                    if (strtolower($att) == "cn") {
+                                        $hnParts[] = $attVal;
+                                        break;
+                                    }
+                                }
+                                if (count($hnParts)) {
+                                    $memberValues[implode(",", $hnParts)] = $possibleValue;
+                                }
+                            }
+                        }
+                        switch ($params['MAPPING_LOCAL_TYPE']) {
+                            case "role_id":
+                                $valueFilters = null;
+                                $matchFilter = null;
+
+                                $filter = $params["MAPPING_LOCAL_PARAM"];
+                                if (strpos($filter, "preg:") !== false) {
+                                    $matchFilter = "/" . str_replace("preg:", "", $filter) . "/i";
+                                } else if (!empty($filter)) {
+                                    $valueFilters = array_map("trim", explode(",", $filter));
+                                }
+                                if ($key == "memberof") {
+                                    if (empty($valueFilters)) {
+                                        $valueFilters = $this->getLdapGroupListFromDN();
+                                    }
+                                    if ($this->mappedRolePrefix) {
+                                        $rolePrefix = $this->mappedRolePrefix;
+                                    } else {
+                                        $rolePrefix = "";
+                                    }
+
+                                    $userroles = $userObject->getRoles();
+                                    //remove all mapped roles before
+
+                                    $oldRoles = array();
+                                    $newRoles = array();
+
+                                    if (is_array($userroles)) {
+                                        foreach ($userroles as $rkey => $role) {
+                                            if ((AuthService::getRole($rkey)) && !(strpos($rkey, $this->mappedRolePrefix) === false)) {
+                                                if (isSet($matchFilter) && !preg_match($matchFilter, $rkey)) continue;
+                                                if (isSet($valueFilters) && !in_array($rkey, $valueFilters)) continue;
+                                                //$userObject->removeRole($key);
+                                                $oldRoles[$rkey] = $role;
+                                            }
+                                        }
+                                    }
+                                    //$userObject->recomputeMergedRole();
+
+                                    // Detect changes
+                                    foreach ($memberValues as $uniqValue => $fullDN) {
+                                        $uniqValueWithPrefix = $rolePrefix . $uniqValue;
+                                        if (isSet($matchFilter) && !preg_match($matchFilter, $uniqValueWithPrefix)) continue;
+                                        if (isSet($valueFilters) && !in_array($uniqValueWithPrefix, $valueFilters)) continue;
+                                        $roleToAdd = AuthService::getRole($uniqValueWithPrefix);
+                                        if($roleToAdd === false){
+                                            $roleToAdd = AuthService::getRole($uniqValueWithPrefix, true);
+                                            $roleToAdd->setLabel($uniqValue);
+                                            AuthService::updateRole($roleToAdd);
+                                        }
+                                        $newRoles[$roleToAdd->getId()] = $roleToAdd;
+                                        //$userObject->addRole($roleToAdd);
+                                    }
+
+                                    if((count(array_diff(array_keys($oldRoles), array_keys($newRoles))) > 0) ||
+                                        (count(array_diff(array_keys($newRoles), array_keys($oldRoles))) > 0) )
+                                    {
+                                        // remove old roles
+                                        foreach ($oldRoles as $rkey => $role) {
+                                            if ((AuthService::getRole($rkey)) && !(strpos($rkey, $this->mappedRolePrefix) === false)) {
+                                                $userObject->removeRole($rkey);
+                                            }
+                                        }
+
+                                        //Add new roles;
+                                        foreach($newRoles as $rkey => $role){
+                                            if ((AuthService::getRole($rkey)) && !(strpos($rkey, $this->mappedRolePrefix) === false)) {
+                                                $userObject->addRole($role);
+                                            }
+                                        }
+                                        $userObject->recomputeMergedRole();
+                                        $changes = true;
+                                    }
+
+                                } else {  // Others attributes mapping
+                                    $oldRoles = array();
+                                    $newRoles = array();
+                                    $userroles = $userObject->getRoles();
+
+                                    // Get old roles
+                                    if (is_array($userroles)) {
+                                        foreach ($userroles as $rkey => $role) {
+                                            if ((AuthService::getRole($rkey)) && (strpos($rkey, $this->mappedRolePrefix) === false)) {
+                                                if (isSet($matchFilter) && !preg_match($matchFilter, $rkey)) continue;
+                                                if (isSet($valueFilters) && !in_array($rkey, $valueFilters)) continue;
+                                                //$userObject->removeRole($key);
+                                                $oldRoles[$rkey] = $rkey;
+                                            }
+                                        }
+                                    }
+
+                                    // Get new roles
+                                    foreach ($entry[$key] as $uniqValue) {
+                                        if (isSet($matchFilter) && !preg_match($matchFilter, $uniqValue)) continue;
+                                        if (isSet($valueFilters) && !in_array($uniqValue, $valueFilters)) continue;
+                                        if (!empty($uniqValue)) {
+                                            $roleToAdd = AuthService::getRole($uniqValue);
+                                            if($roleToAdd === false){
+                                                $roleToAdd = AuthService::getRole($uniqValue, true);
+                                                $roleToAdd->setLabel($uniqValue);
+                                                AuthService::updateRole($roleToAdd);
+                                            }
+                                            //$userObject->addRole(AuthService::getRole($uniqValue, true));
+                                            //$changes = true;
+                                            $newRoles[$uniqValue]  = $roleToAdd;
+                                        }
+                                    }
+
+                                    // Do the sync if two sets of roles are different
+                                    if ( (count(array_diff(array_keys($oldRoles), array_keys($newRoles))) > 0) ||
+                                        (count(array_diff(array_keys($newRoles), array_keys($oldRoles))) > 0)){
+                                        // remove old roles
+                                        foreach ($oldRoles as $rkey => $role) {
+                                            if ((AuthService::getRole($rkey)) && (strpos($rkey, $this->mappedRolePrefix) === false)) {
+                                                $userObject->removeRole($rkey);
+                                            }
+                                        }
+                                        //Add new roles;
+                                        foreach($newRoles as $rkey => $role){
+                                            if ((AuthService::getRole($rkey)) && (strpos($rkey, $this->mappedRolePrefix) === false)) {
+                                                $userObject->addRole($role);
+                                            }
+                                        }
+                                        $userObject->recomputeMergedRole();
+                                        $changes = true;
+                                    }
+                                }
+                                break;
+                            case "group_path":
+                                if ($key == "memberof") {
+                                    $filter = $params["MAPPING_LOCAL_PARAM"];
+                                    if (strpos($filter, "preg:") !== false) {
+                                        $matchFilter = "/" . str_replace("preg:", "", $filter) . "/i";
+                                    } else if (!empty($filter)) {
+                                        $valueFilters = array_map("trim", explode(",", $filter));
+                                    }
+                                    foreach ($memberValues as $uniqValue => $fullDN) {
+                                        if (isSet($matchFilter) && !preg_match($matchFilter, $uniqValue)) continue;
+                                        if (isSet($valueFilters) && !in_array($uniqValue, $valueFilters)) continue;
+                                        if ($userObject->personalRole->filterParameterValue("auth.ldap", "MEMBER_OF", AJXP_REPO_SCOPE_ALL, "") == $fullDN) {
+                                            //break;
+                                        }
+                                        $humanName = $uniqValue;
+                                        $branch = array();
+                                        $this->buildGroupBranch($uniqValue, $branch);
+                                        $parent = "/";
+                                        if (count($branch)) {
+                                            $parent = "/" . implode("/", array_reverse($branch));
+                                        }
+                                        if (!ConfService::getConfStorageImpl()->groupExists(rtrim($userObject->getRealGroupPath($parent), "/") . "/" . $fullDN)) {
+                                            UsersService::createGroup($parent, $fullDN, $humanName);
+                                        }
+                                        $userObject->setGroupPath(rtrim($parent, "/") . "/" . $fullDN, true);
+                                        // Update Roles from groupPath
+                                        $b = array_reverse($branch);
+                                        $b[] = $fullDN;
+                                        for ($i = 1; $i <= count($b); $i++) {
+                                            $userObject->addRole(RolesService::getOrCreateRole("AJXP_GRP_/" . implode("/", array_slice($b, 0, $i)), $userObject->getGroupPath()));
+                                        }
+                                        $userObject->personalRole->setParameterValue("auth.ldap", "MEMBER_OF", $fullDN);
+                                        $userObject->recomputeMergedRole();
+                                        $changes = true;
+                                    }
+                                }
+                                break;
+                            case "profile":
+                                if ($userObject->getProfile() != $value) {
+                                    $changes = true;
+                                    $userObject->setProfile($value);
+                                    RolesService::updateAutoApplyRole($userObject);
+                                }
+                                break;
+                            case "plugin_param":
+                            default:
+                                if (strpos($params["MAPPING_LOCAL_PARAM"], "/") !== false) {
+                                    list($pId, $param) = explode("/", $params["MAPPING_LOCAL_PARAM"]);
+                                } else {
+                                    $pId = $this->getId();
+                                    $param = $params["MAPPING_LOCAL_PARAM"];
+                                }
+                                if ($userObject->personalRole->filterParameterValue($pId, $param, AJXP_REPO_SCOPE_ALL, "") != $value) {
+                                    $userObject->personalRole->setParameterValue($pId, $param, $value);
+                                    $userObject->recomputeMergedRole();
+                                    $changes = true;
+                                }
+                                break;
+                        }
+                    }
+                }
+            }
+            if ($changes) {
+                $userObject->save("superuser");
+            }
+        }
+    }
+
+    public function fakeMemberOf($conn, $groupDN, $filterString, $atts, &$entry)
+    {
+        if (!($conn) || !($groupDN)) return null;
+
+        $searchForGroups = ldap_search($conn, $groupDN, $filterString, $atts);
+        $memberOf = array();
+        foreach ($searchForGroups as $i => $resourceResult) {
+            if ($resourceResult === false) continue;
+            $res = ldap_get_entries($conn[$i], $resourceResult);
+            if (!empty($res)) {
+                $memberOf["count"] += $res["count"];
+                unset($res["count"]);
+                foreach ($res as $element) {
+                    $memberOf[] = $element["dn"];
+                }
+            }
+        }
+        if ($memberOf) {
+            $isMemberOf = false;
+            for ($i = 0; $i < $entry["count"]; $i++) {
+                if (strcmp("memberof", strtolower($entry[$i])) === 0) {
+                    $isMemberOf = true;
+                }
+            }
+            if (!$isMemberOf) {
+                $entry[$entry["count"]] = "memberof";
+                $entry["count"]++;
+            }
+            $entry["memberof"] = $memberOf;
+        }
+    }
+
+    public function getCountFromCache()
+    {
+        $ttl = $this->getOption("LDAP_COUNT_CACHE_TTL");
+        if (empty($ttl)) $ttl = 1;
+        $fileName = "ldap.ser";
+        if (file_exists($this->getPluginCacheDir() . DIRECTORY_SEPARATOR . $fileName)) {
+            $fileContent = unserialize(file_get_contents($this->getPluginCacheDir() . DIRECTORY_SEPARATOR . $fileName));
+            if (($fileContent) && ($fileContent["count"]) && ($fileContent["timestamp"]) && ((time() - $fileContent["timestamp"]) < 60 * 60 * $ttl)) {
+                return $fileContent;
+            }
+        }
+        return 0;
+    }
+
+    public function saveCountToCache($fileContent)
+    {
+        $fileName = "ldap.ser";
+        if (!is_dir($this->getPluginCacheDir(false, true))) return;
+        if (is_array($fileContent) && ($fileContent > 0)) {
+            $fileContent["timestamp"] = time();
+            if (file_exists($this->getPluginCacheDir() . DIRECTORY_SEPARATOR . $fileName)) {
+                unlink($this->getPluginCacheDir() . "/" . $fileName);
+            }
+            file_put_contents($this->getPluginCacheDir() . DIRECTORY_SEPARATOR . $fileName, serialize($fileContent));
+        }
+    }
+
+    public static $allowedGroupList;
+
+    /***
+     * @return array : list of groups according to ldap group filter string
+     */
+    public function getLdapGroupListFromDN()
+    {
+        if (isset(self::$allowedGroupList) && !(empty(self::$allowedGroupList)) && count(self::$allowedGroupList) > 0)
+            return self::$allowedGroupList;
+
+        $origUsersDN = $this->ldapDN;
+        $origUsersFilter = $this->ldapFilter;
+        $origUsersAttr = $this->ldapUserAttr;
+        $this->ldapDN = $this->ldapGDN;
+        $this->ldapFilter = $this->ldapGFilter;
+        $this->ldapUserAttr = $this->ldapGroupAttr;
+
+        $entries = $this->getUserEntries();
+        $returnArray = array();
+        if (is_array($entries) && $entries["count"] > 0) {
+            unset($entries["count"]);
+            foreach ($entries as $key => $entry) {
+                if (isset($this->mappedRolePrefix)) {
+                    $returnArray[$this->mappedRolePrefix . $entry[$this->ldapGroupAttr][0]] = $this->mappedRolePrefix . $entry[$this->ldapGroupAttr][0];
+                } else {
+                    $returnArray[$entry[$this->ldapGroupAttr][0]] = $entry[$this->ldapGroupAttr][0];
+                }
+            }
+        }
+
+        $this->dynamicFilter = null;
+        $this->ldapDN = $origUsersDN;
+        $this->ldapFilter = $origUsersFilter;
+        $this->ldapUserAttr = $origUsersAttr;
+
+        self::$allowedGroupList = $returnArray;
+        return $returnArray;
+    }
+
+    /**
+     * By pass sanitizing user id that make sure tha we can use utf8 user_id
+     *
+     * @param $s
+     * @param int $level
+     * @return mixed|string
+     */
+    public function sanitize($s, $level = InputFilter::SANITIZE_HTML)
+    {
+        $preg = '/[\\/<>\?\*\\\\|;:,+"\]\[]/';
+        /**
+         * These are illegal characters and can break ldap searching.
+         * when we create new user on Windows AD, these illegal characters will be replaced by '_'.
+         * Give a try by replacement of '_'
+         */
+        $newS = preg_replace($preg, '_', $s);
+        return $newS;
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/auth.ldap/class.ldapAuthDriver.php b/core/src/plugins/auth.ldap/class.ldapAuthDriver.php
deleted file mode 100644
index fce3f3b57a..0000000000
--- a/core/src/plugins/auth.ldap/class.ldapAuthDriver.php
+++ /dev/null
@@ -1,1033 +0,0 @@
-<?php
-/*
- * Copyright 2007-2011 Pierre Wirtz
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die('Access not allowed');
-
-/**
- * Authenticate users against an LDAP server
- * @package AjaXplorer_Plugins
- * @subpackage Auth
- */
-class ldapAuthDriver extends AbstractAuthDriver
-{
-    public $ldapUrl;
-    public $ldapPort = 389;
-    public $ldapAdminUsername;
-    public $ldapAdminPassword;
-    public $ldapDN;
-    public $ldapGDN;
-    public $ldapFilter;
-    public $ldapGFilter;
-    public $dynamicFilter;
-    public $dynamicExpected;
-    public $ldapUserAttr;
-    public $ldapGroupAttr;
-    public $fakeAttrMemberOf;
-    public $mappedRolePrefix;
-    public $pageSize;
-
-    public $ldapconn = null;
-    public $separateGroup = "";
-
-    public $hasGroupsMapping = false;
-    public $attrMemberInGroup = true;
-
-
-    /**
-     * Legacy way, defined through PHP array
-     * @var array
-     */
-    public $customParamsMapping = array();
-
-    /**
-     * New way, defined through GUI Options (PARAM_MAPPING replication group).
-     * @var array
-     */
-    public $paramsMapping = array();
-
-    public function init($options)
-    {
-        parent::init($options);
-        $options = $this->options;
-        $this->ldapUrl = $options["LDAP_URL"];
-        if (isSet($options["LDAP_PROTOCOL"]) && $options["LDAP_PROTOCOL"] == "ldaps") {
-            $this->ldapUrl = "ldaps://" . $this->ldapUrl;
-        }
-        if ($options["LDAP_PORT"]) $this->ldapPort = $options["LDAP_PORT"];
-        if ($options["LDAP_USER"]) $this->ldapAdminUsername = $options["LDAP_USER"];
-        if ($options["LDAP_PASSWORD"]) $this->ldapAdminPassword = $options["LDAP_PASSWORD"];
-        if (!empty($options["LDAP_FAKE_MEMBEROF"])) $this->fakeAttrMemberOf = $options["LDAP_FAKE_MEMBEROF"];
-        if (isset($options["LDAP_VALUE_MEMBERATTR_IN_GROUP"])) {
-            $this->attrMemberInGroup = $options["LDAP_VALUE_MEMBERATTR_IN_GROUP"];
-        }else{
-            $this->attrMemberInGroup = true;
-        }
-
-        if ($options["LDAP_PAGE_SIZE"]) $this->pageSize = $options["LDAP_PAGE_SIZE"];
-        if ($options["LDAP_GROUP_PREFIX"]) $this->mappedRolePrefix = $options["LDAP_GROUP_PREFIX"];
-        if ($options["LDAP_DN"]) $this->ldapDN = $this->parseReplicatedParams($options, array("LDAP_DN"));
-        if ($options["LDAP_GDN"]) $this->ldapGDN = $this->parseReplicatedParams($options, array("LDAP_GDN"));
-        if (is_array($options["CUSTOM_DATA_MAPPING"])) $this->customParamsMapping = $options["CUSTOM_DATA_MAPPING"];
-        $this->paramsMapping = $this->parseReplicatedParams($options, array("MAPPING_LDAP_PARAM", "MAPPING_LOCAL_TYPE", "MAPPING_LOCAL_PARAM"));
-        if (count($this->paramsMapping)) {
-            foreach ($this->paramsMapping as $param) {
-                if (strtolower($param["MAPPING_LOCAL_TYPE"]) == "group_path") {
-                    $this->hasGroupsMapping = $param["MAPPING_LDAP_PARAM"];
-                    break;
-                }
-            }
-        }
-        if (!empty($options["LDAP_FILTER"])) {
-            $this->ldapFilter = $options["LDAP_FILTER"];
-            if ($this->ldapFilter != "" && !preg_match("/^\(.*\)$/", $this->ldapFilter)) {
-                $this->ldapFilter = "(" . $this->ldapFilter . ")";
-            }
-        } else {
-            if (!empty($this->hasGroupsMapping) && !empty($this->ldapGFilter)) {
-                $this->ldapFilter = "!(" . $this->ldapGFilter . ")";
-            }
-        }
-        if (!empty($options["LDAP_GROUP_FILTER"])) {
-            $this->ldapGFilter = $options["LDAP_GROUP_FILTER"];
-            if ($this->ldapGFilter != "" && !preg_match("/^\(.*\)$/", $this->ldapGFilter)) {
-                $this->ldapGFilter = "(" . $this->ldapGFilter . ")";
-            }
-        } else {
-            $this->ldapGFilter = "(objectClass=group)";
-        }
-        if (!empty($options["LDAP_USERATTR"])) {
-            $this->ldapUserAttr = strtolower($options["LDAP_USERATTR"]);
-        } else {
-            $this->ldapUserAttr = 'uid';
-        }
-        if (!empty($options["LDAP_GROUPATTR"])) {
-            $this->ldapGroupAttr = strtolower($options["LDAP_GROUPATTR"]);
-        } else {
-            $this->ldapGroupAttr = 'cn';
-        }
-    }
-
-    public function parseReplicatedParams($options, $optionsNames)
-    {
-        $i = 0;
-        $data = array();
-        while (true) {
-            $ok = true;
-            $occurence = array();
-            $suffix = ($i == 0 ? "" : "_" . $i);
-            foreach ($optionsNames as $name) {
-                if (!isSet($options[$name . $suffix])) {
-                    $ok = false;
-                    break;
-                }
-                if (count($optionsNames) == 1) {
-                    $occurence = $options[$name . $suffix];
-                } else {
-                    $occurence[$name] = $options[$name . $suffix];
-                }
-            }
-            if (!$ok) break;
-            $data[] = $occurence;
-            $i++;
-        }
-        return $data;
-    }
-
-    public function testLDAPConnexion($options)
-    {
-        $this->ldapUrl = $options["LDAP_URL"];
-        if (isSet($options["LDAP_PROTOCOL"]) && $options["LDAP_PROTOCOL"] == "ldaps") {
-            $this->ldapUrl = "ldaps://" . $this->ldapUrl;
-        }
-        if ($options["LDAP_PORT"]) $this->ldapPort = $options["LDAP_PORT"];
-        if ($options["LDAP_USER"]) $this->ldapAdminUsername = $options["LDAP_USER"];
-        if ($options["LDAP_PASSWORD"]) $this->ldapAdminPassword = $options["LDAP_PASSWORD"];
-        if ($options["LDAP_DN"]) $this->ldapDN = $this->parseReplicatedParams($options, array("LDAP_DN"));
-        $this->startConnexion();
-        if ($this->ldapconn == null) {
-            return "ERROR: Cannot connect to the server";
-        } else {
-            if (!empty($options["TEST_USER"])) {
-                $entries = $this->getUserEntries($options["TEST_USER"]);
-                if (!is_array($entries)) return false;
-                if (AuthService::ignoreUserCase()) {
-                    $res = (strcasecmp($options["TEST_USER"], $entries[0][$this->ldapUserAttr][0]) == 0);
-                } else {
-                    $res = (strcmp($options["TEST_USER"], $entries[0][$this->ldapUserAttr][0]) == 0);
-                }
-                $this->logDebug(__FUNCTION__, 'checking if user ' . $options["TEST_USER"] . ' exists  : ' . $res);
-                if (!$res) {
-                    return "ERROR: Could <b>correctly connect</b> to the server, but could <b>not find the specified user</b> in the directory.";
-                } else {
-                    return "SUCCESS: Could connect to the server, and could find the specified user inside the directory.";
-                }
-            } else {
-                return "SUCCESS: Correctly connected to the server";
-            }
-        }
-
-    }
-
-    public function startConnexion()
-    {
-        $this->logDebug(__FUNCTION__, 'start connexion');
-        if ($this->ldapconn == null) {
-            $this->ldapconn = $this->LDAP_Connect();
-            if ($this->ldapconn == null) {
-                $this->logError(__FUNCTION__, 'LDAP Server connexion could NOT be established');
-            }
-        }
-        //return $this->ldapconn;
-    }
-
-    public function __deconstruct()
-    {
-        if ($this->ldapconn != null) {
-            ldap_close($this->ldapconn);
-        }
-    }
-
-    public function LDAP_Connect()
-    {
-        $ldapconn = ldap_connect($this->ldapUrl, $this->ldapPort);
-        //@todo : return error_code
-
-        if ($ldapconn) {
-            $this->logDebug(__FUNCTION__, 'ldap_connect(' . $this->ldapUrl . ',' . $this->ldapPort . ') OK');
-            ldap_set_option($ldapconn, LDAP_OPT_PROTOCOL_VERSION, 3);
-            //ldap_set_option( $ldapconn, LDAP_OPT_REFERRALS, 0 );
-
-            if ($this->ldapAdminUsername === null) {
-                //connecting anonymously
-                $this->logDebug(__FUNCTION__, 'Anonymous LDAP connexion');
-                $ldapbind = @ldap_bind($ldapconn);
-            } else {
-                $this->logDebug(__FUNCTION__, 'Standard LDAP connexion');
-                $ldapbind = @ldap_bind($ldapconn, $this->ldapAdminUsername, $this->ldapAdminPassword);
-            }
-
-            if ($ldapbind) {
-                $this->logDebug(__FUNCTION__, 'ldap_bind OK');
-                return $ldapconn;
-            } else {
-                $this->logError(__FUNCTION__, 'ldap_bind FAILED');
-                return null;
-            }
-
-        } else {
-            $this->logError(__FUNCTION__, 'ldap_connect(' . $this->ldapUrl . ',' . $this->ldapPort . ') FAILED');
-            die('Auth.ldap :: ldap_connect FAILED');
-        }
-
-    }
-
-
-    public function getUserEntries($login = null, $countOnly = false, $offset = -1, $limit = -1, $regexpOnSearchAttr = false)
-    {
-        if ($login == null) {
-            $filter = $this->ldapFilter;
-        } else {
-            if ($regexpOnSearchAttr && !empty($this->options["LDAP_SEARCHUSER_ATTR"])) {
-                $searchAttr = $this->options["LDAP_SEARCHUSER_ATTR"];
-                $searchAttrArray = explode(",", $searchAttr);
-            }
-
-            if(isset($searchAttrArray)){
-                if(count($searchAttrArray) > 1){
-                    $searchAttrFilter = "(|";
-                    foreach($searchAttrArray as $attr){
-                        $searchAttrFilter .= "(". $attr . "=" . $login . ")";
-                    }
-                    $searchAttrFilter .= ")";
-                }
-                else{
-                    $searchAttrFilter = "(" . $searchAttrArray[0] . "=" . $login . ")";
-                }
-
-            }
-            else{
-                $searchAttrFilter = "(" . $this->ldapUserAttr . "=" . $login . ")";
-            }
-
-            if ($this->ldapFilter == "") $filter = $searchAttrFilter;
-            else  $filter = "(&" . $this->ldapFilter . $searchAttrFilter . ")";
-        }
-        if (empty($filter)) {
-            if (!empty($this->dynamicFilter)) $filter = $this->dynamicFilter;
-            else $filter = $this->ldapUserAttr . "=*";
-        } else {
-            if (!empty($this->dynamicFilter)) $filter = "(&(" . $this->dynamicFilter . ")" . $filter . ")";
-        }
-        if ($this->ldapconn == null) {
-            $this->startConnexion();
-        }
-        $conn = array();
-        if (is_array($this->ldapDN)) {
-            foreach ($this->ldapDN as $dn) {
-                $conn[] = $this->ldapconn;
-            }
-        } else {
-            $conn = array($this->ldapconn);
-        }
-        $expected = array($this->ldapUserAttr);
-        if ($login != null && (!empty($this->customParamsMapping) || !empty($this->paramsMapping))) {
-            if (!empty($this->customParamsMapping)) {
-                $expected = array_merge($expected, array_keys($this->customParamsMapping));
-            }
-            if (!empty($this->paramsMapping)) {
-                $keys = array();
-                foreach ($this->paramsMapping as $param) $keys[] = $param["MAPPING_LDAP_PARAM"];
-                $expected = array_merge($expected, $keys);
-            }
-        }
-        if (is_array($this->dynamicExpected)) {
-            $expected = array_merge($expected, $this->dynamicExpected);
-        }
-        foreach ($conn as $dn => $ldapc) {
-            if (!$ldapc) {
-                unset($conn[$dn]);
-            }
-        }
-        if (count($conn) < 1) {
-            return array("count" => 0);
-        }
-        //$ret = ldap_search($conn,$this->ldapDN,$filter, $expected);
-
-        $cookie = '';
-        if (empty($this->pageSize) || !is_numeric($this->pageSize)) {
-            $this->pageSize = 500;
-        }
-
-
-        $allEntries = array("count" => 0);
-        $isSupportPagedResult = function_exists("ldap_control_paged_result") && function_exists("ldap_control_paged_result_response");
-
-        $gotAllEntries = false;
-        $index = 0;
-
-        //Update progress bar in CLI mode
-        $isListAll = (($offset == -1) && ($limit == -1) && (is_null($login)) && $regexpOnSearchAttr && (php_sapi_name() == "cli"));
-        if($isListAll){
-            $total = $this->getCountFromCache();
-            $progressBar = new AJXP_ProgressBarCLI();
-            $progressBar->init($index, $total["count"], "Get ldap users");
-        }
-
-        do {
-            if ($isSupportPagedResult)
-                ldap_control_paged_result($this->ldapconn, $this->pageSize, false, $cookie);
-
-            $ret = ldap_search($conn, $this->ldapDN, $filter, $expected, 0, 0);
-            if($ret === false) break;
-            foreach ($ret as $i => $resourceResult) {
-                if ($resourceResult === false) continue;
-                if ($countOnly) {
-                    $allEntries["count"] += ldap_count_entries($conn[$i], $resourceResult);
-                    continue;
-                }
-                if ($limit != -1) {
-                    @ldap_sort($conn[$i], $resourceResult, $this->ldapUserAttr);
-                }
-                $entries = ldap_get_entries($conn[$i], $resourceResult);
-
-                // for better performance
-                if ((is_array($entries)) && ($offset != -1) && ($limit != -1) && (($index + $this->pageSize) < $offset)) {
-                    $index += $this->pageSize;
-                    continue;
-                }
-
-                if (!empty($entries["count"])) {
-                    $allEntries["count"] += $entries["count"];
-                    unset($entries["count"]);
-                    foreach ($entries as $entry) {
-                        if ($offset != -1 && $index < $offset) {
-                            $index++;
-                            continue;
-                        }
-
-                        // fake memberOf
-                        if (($this->fakeAttrMemberOf) && method_exists($this, "fakeMemberOf") && in_array(strtolower("memberof"), array_map("strtolower", $expected))) {
-                            if($this->attrMemberInGroup){
-                                $uid = $entry["dn"];
-                            }else{
-                                $uidWithEqual = explode(",", $entry["dn"]);
-                                $uidShort = explode("=",$uidWithEqual[0]);
-                                $uid = $uidShort[1];
-                            }
-
-                            $strldap = "(&" . $this->ldapGFilter . "(" .$this->fakeAttrMemberOf. "=" . $uid . "))";
-                            $this->fakeMemberOf($conn, $this->ldapGDN, $strldap, array("cn"), $entry);
-                        }
-
-                        $allEntries[] = $entry;
-                        $index++;
-
-                        //Update progress bar in CLI mode
-                        if(isset($progressBar))
-                            $progressBar->update($index);
-
-
-                        if (($offset != -1) && ($limit != -1) && $index > $offset + $limit)
-                            break;
-                    }
-
-                    if (($index > $offset + $limit) && ($limit != -1) && ($offset != -1))
-                        $gotAllEntries = true;
-                }
-            }
-            if ($isSupportPagedResult)
-                foreach ($ret as $element) {
-                    if(is_resource($element))
-                        @ldap_control_paged_result_response($this->ldapconn, $element, $cookie);
-                }
-        } while (($cookie !== null && $cookie != '') && ($isSupportPagedResult) && (!$gotAllEntries));
-
-        // reset paged_result for other activities (otherwise we will experience ldap error)
-        if ($isSupportPagedResult)
-            ldap_control_paged_result($this->ldapconn, 0);
-
-        return $allEntries;
-    }
-
-    private function userSortFunction($entryA, $entryB)
-    {
-        return strcasecmp($entryA[$this->ldapUserAttr][0], $entryB[$this->ldapUserAttr][0]);
-    }
-
-    public function supportsUsersPagination()
-    {
-        return true;
-    }
-
-    // $baseGroup = "/"
-    public function listUsersPaginated($baseGroup, $regexp, $offset, $limit, $recursive = true)
-    {
-        if (!empty($this->hasGroupsMapping)) {
-            if ($baseGroup == "/") {
-                $this->dynamicFilter = "!(" . $this->hasGroupsMapping . "=*)";
-            } else {
-                $this->dynamicFilter = $this->hasGroupsMapping . "=" . basename($baseGroup);
-            }
-
-        } else if (!empty($this->separateGroup) && $baseGroup != "/" . $this->separateGroup) {
-            return array();
-        }
-
-        $entries = $this->getUserEntries(AJXP_Utils::regexpToLdap($regexp), false, $offset, $limit, true);
-        $this->dynamicFilter = null;
-        $persons = array();
-        unset($entries['count']); // remove 'count' entry
-        foreach ($entries as $id => $person) {
-            $login = $person[$this->ldapUserAttr][0];
-            if (AuthService::ignoreUserCase()) $login = strtolower($login);
-            $persons[$login] = "XXX";
-        }
-        return $persons;
-    }
-
-    public function getUsersCount($baseGroup = "/", $regexp = "", $filterProperty = null, $filterValue = null, $recursive = true)
-    {
-        $check_cache = $this->getCountFromCache();
-
-        if ((is_array($check_cache) && $check_cache["count"] > 0)) {
-            return $check_cache["count"];
-        }
-
-        if (!empty($this->hasGroupsMapping)) {
-            if ($baseGroup == "/") {
-                $this->dynamicFilter = "!(" . $this->hasGroupsMapping . "=*)";
-            } else {
-                $this->dynamicFilter = $this->hasGroupsMapping . "=" . basename($baseGroup);
-            }
-        }
-
-        $res = $this->getUserEntries(AJXP_Utils::regexpToLdap($regexp), true, null);
-        $this->saveCountToCache($res);
-        $this->dynamicFilter = null;
-        return $res["count"];
-    }
-
-
-    /**
-     * List children groups of a given group. By default will report this on the CONF driver,
-     * but can be overriden to grab info directly from auth driver (ldap, etc).
-     * @param string $baseGroup
-     * @return string[]
-     */
-    public function listChildrenGroups($baseGroup = "/")
-    {
-        $arr = array();
-        if ($baseGroup == "/" && !empty($this->separateGroup)) {
-            $arr[$this->separateGroup] = "LDAP Annuary";
-            return $arr;
-        }
-        if (!empty($this->hasGroupsMapping)) {
-            $origUsersDN = $this->ldapDN;
-            $origUsersFilter = $this->ldapFilter;
-            $origUsersAttr = $this->ldapUserAttr;
-            $this->ldapDN = $this->ldapGDN;
-            $this->ldapFilter = $this->ldapGFilter;
-            $this->ldapUserAttr = $this->ldapGroupAttr;
-
-            if ($baseGroup != "/") {
-                $this->dynamicFilter = $this->hasGroupsMapping . "=" . basename($baseGroup);
-            } else {
-                //STRANGE, SHOULD WORK BUT CAN EXCLUDES ALL GROUPS
-                $this->dynamicFilter = "!(" . $this->hasGroupsMapping . "=*)";
-            }
-
-            $entries = $this->getUserEntries();
-            $this->dynamicFilter = null;
-            $persons = array();
-            unset($entries['count']); // remove 'count' entry
-            foreach ($entries as $id => $person) {
-                $login = $person[$this->ldapUserAttr][0];
-                //if(AuthService::ignoreUserCase()) $login = strtolower($login);
-                $dn = $person["dn"];
-                $persons["/" . $dn] = $login;
-
-                $branch = array();
-                $this->buildGroupBranch($login, $branch);
-                $parent = "/";
-                if (count($branch)) {
-                    $parent = "/" . implode("/", array_reverse($branch));
-                }
-                if(!ConfService::getConfStorageImpl()->groupExists(rtrim(AuthService::filterBaseGroup($parent), "/")."/".$dn)) {
-                    AuthService::createGroup($parent, $dn, $login);
-                }
-            }
-            $this->ldapDN = $origUsersDN;
-            $this->ldapFilter = $origUsersFilter;
-            $this->ldapUserAttr = $origUsersAttr;
-            return $persons;
-        }
-
-        return $arr;
-    }
-
-
-    public function listUsers($baseGroup = "/", $recursive = true)
-    {
-        return $this->listUsersPaginated($baseGroup, null, -1, -1);
-    }
-
-    public function userExists($login)
-    {
-        // Check if local storage exists for the user. If it does, assume the user
-        // exists. This prevents a barrage of ldap_connect/ldap_bind/ldap_search
-        // calls.
-        $confDriver = ConfService::getConfStorageImpl();
-        $userObject = $confDriver->instantiateAbstractUserImpl($login);
-        if ($userObject->storageExists()) {
-            //return true;
-        }
-        $entries = $this->getUserEntries($login);
-        if (!is_array($entries)) return false;
-        if (AuthService::ignoreUserCase()) {
-            $res = (strcasecmp($login, $entries[0][$this->ldapUserAttr][0]) == 0);
-        } else {
-            $res = (strcmp($login, $entries[0][$this->ldapUserAttr][0]) == 0);
-        }
-        $this->logDebug(__FUNCTION__, 'checking if user ' . $login . ' exists  : ' . $res);
-        return $res;
-    }
-
-    public function checkPassword($login, $pass, $seed)
-    {
-        if (empty($pass)) return false;
-        $entries = $this->getUserEntries($login);
-        if ($entries['count'] > 0) {
-            $this->logDebug(__FUNCTION__, 'Ldap Password Check: Got user ' . $login);
-            if (@ldap_bind($this->ldapconn, $entries[0]["dn"], $pass)) {
-                $this->logDebug(__FUNCTION__, 'Ldap Password Check: Got user ' . $entries[0]["cn"][0]);
-                return true;
-            }
-            $this->logDebug(__FUNCTION__, 'Password Check: failed for user ' . $login);
-            return false;
-        } else {
-            $this->logDebug(__FUNCTION__, "Ldap Password Check : No user $login found");
-            return false;
-        }
-    }
-
-    public function usersEditable()
-    {
-        return false;
-    }
-
-    public function passwordsEditable()
-    {
-        return false;
-    }
-
-    public function buildGroupBranch($groupAttrValue, &$branch = array())
-    {
-        // Load group data. Detect memberOf. Load parent group.
-        $origUsersDN = $this->ldapDN;
-        $origUsersFilter = $this->ldapFilter;
-        $origUsersAttr = $this->ldapUserAttr;
-        $this->ldapDN = $this->ldapGDN;
-        $this->ldapFilter = $this->ldapGFilter;
-        $this->ldapUserAttr = $this->ldapGroupAttr;
-
-        $this->dynamicFilter = $this->ldapGroupAttr . "=" . $groupAttrValue;
-        $this->dynamicExpected = array($this->hasGroupsMapping);
-
-        $entries = $this->getUserEntries();
-        $this->dynamicFilter = null;
-        $this->dynamicExpected = null;
-        $persons = array();
-        unset($entries['count']); // remove 'count' entry
-        $groupData = $entries[0];
-
-        /*
-         * memberOf could be a array because of a object(such as user) can be belong to multi-groups
-         * example: object w10S was belong to 04 groups
-         * [
-            {"memberof":
-                {
-                    "0":"CN=globalmarkettings,OU=MARKETING,OU=company,DC=vpydio,DC=fr",
-                    "1":"CN=algers,CN=Alger,OU=algeria,OU=Africe,OU=MARKETING,OU=company,DC=vpydio,DC=fr",
-                    "2":"CN=algerias,OU=algeria,OU=Africe,OU=MARKETING,OU=company,DC=vpydio,DC=fr",
-                    "3":"CN=africes,OU=Africe,OU=MARKETING,OU=company,DC=vpydio,DC=fr"
-                }
-                ,
-                "0":"memberof",
-                "samaccountname":
-                {
-                    "0":"w10s"
-                },
-                "1":"samaccountname",
-                "dn":"CN=w10s,CN=willaya10,CN=Alger,OU=algeria,OU=Africe,OU=MARKETING,OU=company,DC=vpydio,DC=fr"
-            }
-            ]
-         */
-        $memberOfs = $groupData[strtolower($this->hasGroupsMapping)];
-        //$memberOf = $groupData[strtolower($this->hasGroupsMapping)][0];
-
-
-        $this->ldapDN = $origUsersDN;
-        $this->ldapFilter = $origUsersFilter;
-        $this->ldapUserAttr = $origUsersAttr;
-
-        $this->logDebug(__FUNCTION__, "GroupData[]: " . json_encode($groupData));
-
-        if (!empty($memberOfs)) {
-
-            /*
-             * recursively build group branch for each memeber of $memberOfs
-             *
-             */
-            foreach ($memberOfs as $memberOf) {
-                if (!empty($memberOf)) {
-                    $this->logDebug(__FUNCTION__, "memberOf[]: " . json_encode($memberOf));
-                    $parts = explode(",", ltrim($memberOf, '/'));
-                    foreach ($parts as $part) {
-                        list($att, $attVal) = explode("=", $part);
-                        /*
-                         * In the example above, 1st CN indicates the name of group, from 2nd, CN indicate a container,
-                         * therefore, we just take the first "cn" element by breaking the for if we found.
-                         *
-                         */
-                        if (strtolower($att) == "cn") {
-                            $parentCN = $attVal;
-                            break;
-                        }
-                    }
-                    if (!empty($parentCN)) {
-                        $branch[] = $memberOf;
-                        $this->logDebug(__FUNCTION__, "branch[]: " . $branch);
-
-                        /*
-                         * recursive function call to look for more group deeply
-                         */
-                        $this->buildGroupBranch($parentCN, $branch);
-                    }
-                }
-            } // foreach
-        }
-
-    }
-
-    public function updateUserObject(&$userObject)
-    {
-
-        parent::updateUserObject($userObject);
-        if (!empty($this->separateGroup)) $userObject->setGroupPath("/" . $this->separateGroup);
-        // SHOULD BE DEPRECATED
-        if (!empty($this->customParamsMapping)) {
-            $checkValues = array_values($this->customParamsMapping);
-            $prefs = $userObject->getPref("CUSTOM_PARAMS");
-            if (!is_array($prefs)) {
-                $prefs = array();
-            }
-            // If one value exist, we consider the mapping has already been done.
-            foreach ($checkValues as $val) {
-                if (array_key_exists($val, $prefs)) return;
-            }
-            $changes = false;
-            $entries = $this->getUserEntries($userObject->getId());
-            if ($entries["count"]) {
-                $entry = $entries[0];
-                foreach ($this->customParamsMapping as $key => $value) {
-                    if (isSet($entry[$key])) {
-                        $prefs[$value] = $entry[$key][0];
-                        $changes = true;
-                    }
-                }
-            }
-            if ($changes) {
-                $userObject->setPref("CUSTOM_PARAMS", $prefs);
-                $userObject->save();
-            }
-        }
-        if (!empty($this->paramsMapping)) {
-
-            $changes = false;
-            $entries = $this->getUserEntries($userObject->getId());
-            if ($entries["count"]) {
-                $entry = $entries[0];
-                foreach ($this->paramsMapping as $params) {
-                    $key = strtolower($params['MAPPING_LDAP_PARAM']);
-                    if (isSet($entry[$key])) {
-                        $value = $entry[$key][0];
-
-                        $memberValues = array();
-
-                        if ($key == "memberof") {
-                            // get CN from value
-                            foreach ($entry[$key] as $possibleValue) {
-                                $hnParts = array();
-                                $parts = explode(",", ltrim($possibleValue, '/'));
-                                foreach ($parts as $part) {
-                                    list($att, $attVal) = explode("=", $part);
-
-                                    //if (strtolower($att) == "cn")  $hnParts[] = $attVal;
-
-                                    /*
-                                     * In the example above, 1st CN indicates the name of group, from 2nd, CN indicate a container,
-                                     * therefore, we just take the first "cn" element by breaking the for if we found.
-                                     *
-                                     */
-                                    if (strtolower($att) == "cn") {
-                                        $hnParts[] = $attVal;
-                                        break;
-                                    }
-                                }
-                                if (count($hnParts)) {
-                                    $memberValues[implode(",", $hnParts)] = $possibleValue;
-                                }
-                            }
-                        }
-                        switch ($params['MAPPING_LOCAL_TYPE']) {
-                            case "role_id":
-                                $valueFilters = null;
-                                $matchFilter = null;
-
-                                $filter = $params["MAPPING_LOCAL_PARAM"];
-                                if (strpos($filter, "preg:") !== false) {
-                                    $matchFilter = "/" . str_replace("preg:", "", $filter) . "/i";
-                                } else if (!empty($filter)) {
-                                    $valueFilters = array_map("trim", explode(",", $filter));
-                                }
-                                if ($key == "memberof") {
-                                    if (empty($valueFilters)) {
-                                        $valueFilters = $this->getLdapGroupListFromDN();
-                                    }
-                                    if ($this->mappedRolePrefix) {
-                                        $rolePrefix = $this->mappedRolePrefix;
-                                    } else {
-                                        $rolePrefix = "";
-                                    }
-
-                                    $userroles = $userObject->getRoles();
-                                    //remove all mapped roles before
-
-                                    $oldRoles = array();
-                                    $newRoles = array();
-
-                                    if (is_array($userroles)) {
-                                        foreach ($userroles as $rkey => $role) {
-                                            if ((AuthService::getRole($rkey)) && !(strpos($rkey, $this->mappedRolePrefix) === false)) {
-                                                if (isSet($matchFilter) && !preg_match($matchFilter, $rkey)) continue;
-                                                if (isSet($valueFilters) && !in_array($rkey, $valueFilters)) continue;
-                                                //$userObject->removeRole($key);
-                                                $oldRoles[$rkey] = $role;
-                                            }
-                                        }
-                                    }
-                                    //$userObject->recomputeMergedRole();
-
-                                    // Detect changes
-                                    foreach ($memberValues as $uniqValue => $fullDN) {
-                                        $uniqValueWithPrefix = $rolePrefix . $uniqValue;
-                                        if (isSet($matchFilter) && !preg_match($matchFilter, $uniqValueWithPrefix)) continue;
-                                        if (isSet($valueFilters) && !in_array($uniqValueWithPrefix, $valueFilters)) continue;
-                                        $roleToAdd = AuthService::getRole($uniqValueWithPrefix);
-                                        if($roleToAdd === false){
-                                            $roleToAdd = AuthService::getRole($uniqValueWithPrefix, true);
-                                            $roleToAdd->setLabel($uniqValue);
-                                            AuthService::updateRole($roleToAdd);
-                                        }
-                                        $newRoles[$roleToAdd->getId()] = $roleToAdd;
-                                        //$userObject->addRole($roleToAdd);
-                                    }
-
-                                    if((count(array_diff(array_keys($oldRoles), array_keys($newRoles))) > 0) ||
-                                        (count(array_diff(array_keys($newRoles), array_keys($oldRoles))) > 0) )
-                                    {
-                                        // remove old roles
-                                        foreach ($oldRoles as $rkey => $role) {
-                                            if ((AuthService::getRole($rkey)) && !(strpos($rkey, $this->mappedRolePrefix) === false)) {
-                                                $userObject->removeRole($rkey);
-                                            }
-                                        }
-
-                                        //Add new roles;
-                                        foreach($newRoles as $rkey => $role){
-                                            if ((AuthService::getRole($rkey)) && !(strpos($rkey, $this->mappedRolePrefix) === false)) {
-                                                $userObject->addRole($role);
-                                            }
-                                        }
-                                        $userObject->recomputeMergedRole();
-                                        $changes = true;
-                                    }
-
-                                } else {  // Others attributes mapping
-                                    $oldRoles = array();
-                                    $newRoles = array();
-                                    $userroles = $userObject->getRoles();
-
-                                    // Get old roles
-                                    if (is_array($userroles)) {
-                                        foreach ($userroles as $rkey => $role) {
-                                            if ((AuthService::getRole($rkey)) && (strpos($rkey, $this->mappedRolePrefix) === false)) {
-                                                if (isSet($matchFilter) && !preg_match($matchFilter, $rkey)) continue;
-                                                if (isSet($valueFilters) && !in_array($rkey, $valueFilters)) continue;
-                                                //$userObject->removeRole($key);
-                                                $oldRoles[$rkey] = $rkey;
-                                            }
-                                        }
-                                    }
-
-                                    // Get new roles
-                                    foreach ($entry[$key] as $uniqValue) {
-                                        if (isSet($matchFilter) && !preg_match($matchFilter, $uniqValue)) continue;
-                                        if (isSet($valueFilters) && !in_array($uniqValue, $valueFilters)) continue;
-                                        if (!empty($uniqValue)) {
-                                            $roleToAdd = AuthService::getRole($uniqValue);
-                                            if($roleToAdd === false){
-                                                $roleToAdd = AuthService::getRole($uniqValue, true);
-                                                $roleToAdd->setLabel($uniqValue);
-                                                AuthService::updateRole($roleToAdd);
-                                            }
-                                            //$userObject->addRole(AuthService::getRole($uniqValue, true));
-                                            //$changes = true;
-                                            $newRoles[$uniqValue]  = $roleToAdd;
-                                        }
-                                    }
-
-                                    // Do the sync if two sets of roles are different
-                                    if ( (count(array_diff(array_keys($oldRoles), array_keys($newRoles))) > 0) ||
-                                        (count(array_diff(array_keys($newRoles), array_keys($oldRoles))) > 0)){
-                                        // remove old roles
-                                        foreach ($oldRoles as $rkey => $role) {
-                                            if ((AuthService::getRole($rkey)) && (strpos($rkey, $this->mappedRolePrefix) === false)) {
-                                                $userObject->removeRole($rkey);
-                                            }
-                                        }
-                                        //Add new roles;
-                                        foreach($newRoles as $rkey => $role){
-                                            if ((AuthService::getRole($rkey)) && (strpos($rkey, $this->mappedRolePrefix) === false)) {
-                                                $userObject->addRole($role);
-                                            }
-                                        }
-                                        $userObject->recomputeMergedRole();
-                                        $changes = true;
-                                    }
-                                }
-                                break;
-                            case "group_path":
-                                if ($key == "memberof") {
-                                    $filter = $params["MAPPING_LOCAL_PARAM"];
-                                    if (strpos($filter, "preg:") !== false) {
-                                        $matchFilter = "/" . str_replace("preg:", "", $filter) . "/i";
-                                    } else if (!empty($filter)) {
-                                        $valueFilters = array_map("trim", explode(",", $filter));
-                                    }
-                                    foreach ($memberValues as $uniqValue => $fullDN) {
-                                        if (isSet($matchFilter) && !preg_match($matchFilter, $uniqValue)) continue;
-                                        if (isSet($valueFilters) && !in_array($uniqValue, $valueFilters)) continue;
-                                        if ($userObject->personalRole->filterParameterValue("auth.ldap", "MEMBER_OF", AJXP_REPO_SCOPE_ALL, "") == $fullDN) {
-                                            //break;
-                                        }
-                                        $humanName = $uniqValue;
-                                        $branch = array();
-                                        $this->buildGroupBranch($uniqValue, $branch);
-                                        $parent = "/";
-                                        if (count($branch)) {
-                                            $parent = "/" . implode("/", array_reverse($branch));
-                                        }
-                                        if(!ConfService::getConfStorageImpl()->groupExists(rtrim(AuthService::filterBaseGroup($parent), "/")."/".$fullDN)) {
-                                            AuthService::createGroup($parent, $fullDN, $humanName);
-                                        }
-                                        $userObject->setGroupPath(rtrim($parent, "/") . "/" . $fullDN, true);
-                                        // Update Roles from groupPath
-                                        $b = array_reverse($branch);
-                                        $b[] = $fullDN;
-                                        for ($i = 1; $i <= count($b); $i++) {
-                                            $userObject->addRole(AuthService::getRole("AJXP_GRP_/" . implode("/", array_slice($b, 0, $i)), true));
-                                        }
-                                        $userObject->personalRole->setParameterValue("auth.ldap", "MEMBER_OF", $fullDN);
-                                        $userObject->recomputeMergedRole();
-                                        $changes = true;
-                                    }
-                                }
-                                break;
-                            case "profile":
-                                if ($userObject->getProfile() != $value) {
-                                    $changes = true;
-                                    $userObject->setProfile($value);
-                                    AuthService::updateAutoApplyRole($userObject);
-                                }
-                                break;
-                            case "plugin_param":
-                            default:
-                                if (strpos($params["MAPPING_LOCAL_PARAM"], "/") !== false) {
-                                    list($pId, $param) = explode("/", $params["MAPPING_LOCAL_PARAM"]);
-                                } else {
-                                    $pId = $this->getId();
-                                    $param = $params["MAPPING_LOCAL_PARAM"];
-                                }
-                                if ($userObject->personalRole->filterParameterValue($pId, $param, AJXP_REPO_SCOPE_ALL, "") != $value) {
-                                    $userObject->personalRole->setParameterValue($pId, $param, $value);
-                                    $userObject->recomputeMergedRole();
-                                    $changes = true;
-                                }
-                                break;
-                        }
-                    }
-                }
-            }
-            if ($changes) {
-                $userObject->save("superuser");
-            }
-        }
-    }
-
-    public function fakeMemberOf($conn, $groupDN, $filterString, $atts, &$entry)
-    {
-        if (!($conn) || !($groupDN)) return null;
-
-        $searchForGroups = ldap_search($conn, $groupDN, $filterString, $atts);
-        $memberOf = array();
-        foreach ($searchForGroups as $i => $resourceResult) {
-            if ($resourceResult === false) continue;
-            $res = ldap_get_entries($conn[$i], $resourceResult);
-            if (!empty($res)) {
-                $memberOf["count"] += $res["count"];
-                unset($res["count"]);
-                foreach ($res as $element) {
-                    $memberOf[] = $element["dn"];
-                }
-            }
-        }
-        if ($memberOf) {
-            $isMemberOf = false;
-            for ($i = 0; $i < $entry["count"]; $i++) {
-                if (strcmp("memberof", strtolower($entry[$i])) === 0) {
-                    $isMemberOf = true;
-                }
-            }
-            if (!$isMemberOf) {
-                $entry[$entry["count"]] = "memberof";
-                $entry["count"]++;
-            }
-            $entry["memberof"] = $memberOf;
-        }
-    }
-
-    public function getCountFromCache()
-    {
-        $ttl = $this->getOption("LDAP_COUNT_CACHE_TTL");
-        if(empty($ttl)) $ttl = 1;
-        $fileName = "ldap.ser";
-        if (file_exists($this->getPluginCacheDir() . DIRECTORY_SEPARATOR . $fileName)) {
-            $fileContent = unserialize(file_get_contents($this->getPluginCacheDir() . DIRECTORY_SEPARATOR . $fileName));
-            if (($fileContent) && ($fileContent["count"]) && ($fileContent["timestamp"]) && ((time() - $fileContent["timestamp"]) < 60 * 60 * $ttl)) {
-                return $fileContent;
-            }
-        }
-        return 0;
-    }
-
-    public function saveCountToCache($fileContent)
-    {
-        $fileName = "ldap.ser";
-        if (!is_dir($this->getPluginCacheDir(false, true))) return;
-        if (is_array($fileContent) && ($fileContent > 0)) {
-            $fileContent["timestamp"] = time();
-            if (file_exists($this->getPluginCacheDir() . DIRECTORY_SEPARATOR . $fileName)) {
-                unlink($this->getPluginCacheDir() . "/" . $fileName);
-            }
-            file_put_contents($this->getPluginCacheDir() . DIRECTORY_SEPARATOR . $fileName, serialize($fileContent));
-        }
-    }
-
-    public static $allowedGroupList;
-
-    /***
-     * @return array : list of groups according to ldap group filter string
-     */
-    public function getLdapGroupListFromDN()
-    {
-        if (isset(self::$allowedGroupList) && !(empty(self::$allowedGroupList)) && count(self::$allowedGroupList) > 0)
-            return self::$allowedGroupList;
-
-        $origUsersDN = $this->ldapDN;
-        $origUsersFilter = $this->ldapFilter;
-        $origUsersAttr = $this->ldapUserAttr;
-        $this->ldapDN = $this->ldapGDN;
-        $this->ldapFilter = $this->ldapGFilter;
-        $this->ldapUserAttr = $this->ldapGroupAttr;
-
-        $entries = $this->getUserEntries();
-        $returnArray = array();
-        if (is_array($entries) && $entries["count"] > 0) {
-            unset($entries["count"]);
-            foreach ($entries as $key => $entry) {
-                if(isset($this->mappedRolePrefix)){
-                    $returnArray[$this->mappedRolePrefix . $entry[$this->ldapGroupAttr][0]] = $this->mappedRolePrefix . $entry[$this->ldapGroupAttr][0];
-                }
-                else{
-                    $returnArray[$entry[$this->ldapGroupAttr][0]] = $entry[$this->ldapGroupAttr][0];
-                }
-            }
-        }
-
-        $this->dynamicFilter = null;
-        $this->ldapDN = $origUsersDN;
-        $this->ldapFilter = $origUsersFilter;
-        $this->ldapUserAttr = $origUsersAttr;
-
-        self::$allowedGroupList = $returnArray;
-        return $returnArray;
-    }
-}
\ No newline at end of file
diff --git a/core/src/plugins/auth.ldap/i18n/conf/de.php b/core/src/plugins/auth.ldap/i18n/conf/de.php
index 5beb43d903..e020af5db7 100644
--- a/core/src/plugins/auth.ldap/i18n/conf/de.php
+++ b/core/src/plugins/auth.ldap/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "LDAP Directory" => "LDAP Directory", /* not used anymore? */
@@ -78,4 +78,4 @@
 "value of member/memberUid attribute of group: can be user DN or user CN. Use with Fake memberOf enabled. YES use DN, otherwise CN" => "value of member/memberUid attribute of group: can be user DN or user CN. Use with Fake memberOf enabled. YES use DN, otherwise CN",
 "Cache User Count (hours)" => "Cache User Count (hours)",
 "Locally cache the total number of users during X hours. Can be handy for huge directories." => "Locally cache the total number of users during X hours. Can be handy for huge directories.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/auth.ldap/i18n/conf/en.php b/core/src/plugins/auth.ldap/i18n/conf/en.php
index c7908814bb..363d1ce112 100644
--- a/core/src/plugins/auth.ldap/i18n/conf/en.php
+++ b/core/src/plugins/auth.ldap/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "LDAP Directory" => "LDAP Directory",
@@ -78,4 +78,4 @@
 "value of member/memberUid attribute of group: can be user DN or user CN. Use with Fake memberOf enabled. YES use DN, otherwise CN" => "value of member/memberUid attribute of group: can be user DN or user CN. Use with Fake memberOf enabled. YES use DN, otherwise CN",
 "Cache User Count (hours)" => "Cache User Count (hours)",
 "Locally cache the total number of users during X hours. Can be handy for huge directories." => "Locally cache the total number of users during X hours. Can be handy for huge directories.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/auth.ldap/i18n/conf/fr.php b/core/src/plugins/auth.ldap/i18n/conf/fr.php
index 1923a91dcd..37a70907e6 100644
--- a/core/src/plugins/auth.ldap/i18n/conf/fr.php
+++ b/core/src/plugins/auth.ldap/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "LDAP Directory" => "Annuaire LDAP",
diff --git a/core/src/plugins/auth.ldap/i18n/conf/it.php b/core/src/plugins/auth.ldap/i18n/conf/it.php
index 1647405d09..b4df28c091 100644
--- a/core/src/plugins/auth.ldap/i18n/conf/it.php
+++ b/core/src/plugins/auth.ldap/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "LDAP Directory" => "LDAP Directory",
@@ -78,4 +78,4 @@
 "value of member/memberUid attribute of group: can be user DN or user CN. Use with Fake memberOf enabled. YES use DN, otherwise CN" => "value of member/memberUid attribute of group: can be user DN or user CN. Use with Fake memberOf enabled. YES use DN, otherwise CN",
 "Cache User Count (hours)" => "Cache User Count (hours)",
 "Locally cache the total number of users during X hours. Can be handy for huge directories." => "Locally cache the total number of users during X hours. Can be handy for huge directories.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/auth.ldap/i18n/conf/pt.php b/core/src/plugins/auth.ldap/i18n/conf/pt.php
index 2ed0ed3877..b136691d65 100644
--- a/core/src/plugins/auth.ldap/i18n/conf/pt.php
+++ b/core/src/plugins/auth.ldap/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "LDAP Directory" => "Directoria LDAP",
diff --git a/core/src/plugins/auth.ldap/manifest.xml b/core/src/plugins/auth.ldap/manifest.xml
index 09b79180dc..3a036e5263 100644
--- a/core/src/plugins/auth.ldap/manifest.xml
+++ b/core/src/plugins/auth.ldap/manifest.xml
@@ -48,7 +48,7 @@
         <param name="LDAP_COUNT_CACHE_TTL" group="CONF_MESSAGE[Advanced Parameters]" type="integer" label="CONF_MESSAGE[Cache User Count (hours)]" description="CONF_MESSAGE[Locally cache the total number of users during X hours. Can be handy for huge directories.]" mandatory="false" default="1"/>
 
     </server_settings>
-    <class_definition filename="plugins/auth.ldap/class.ldapAuthDriver.php" classname="ldapAuthDriver"/>
+    <class_definition filename="plugins/auth.ldap/LdapAuthDriver.php" classname="Pydio\Auth\Driver\LdapAuthDriver"/>
     <registry_contributions>
         <external_file filename="plugins/core.auth/standard_auth_actions.xml" include="actions/*" exclude=""/>
     </registry_contributions>
diff --git a/core/src/plugins/auth.multi/MultiAuthDriver.php b/core/src/plugins/auth.multi/MultiAuthDriver.php
new file mode 100644
index 0000000000..6b49f4c788
--- /dev/null
+++ b/core/src/plugins/auth.multi/MultiAuthDriver.php
@@ -0,0 +1,577 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Auth\Driver;
+
+use Exception;
+use Pydio\Auth\Core\AbstractAuthDriver;
+use Pydio\Core\Model\ContextInterface;
+
+use Pydio\Core\Model\UserInterface;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Utils\Vars\InputFilter;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Ability to encapsulate many auth drivers and choose the right one at login.
+ * @package AjaXplorer_Plugins
+ * @subpackage Auth
+ */
+class MultiAuthDriver extends AbstractAuthDriver
+{
+    public $driverName = "multi";
+    public $driversDef = array();
+    public $currentDriver;
+
+    public $masterSlaveMode = false;
+    public $masterName;
+    public $slaveName;
+    public $baseName;
+
+    public static $schemesCache = null;
+
+    /**
+     * @var $drivers AbstractAuthDriver[]
+     */
+    public $drivers = array();
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        $this->options = $options;
+        $this->driversDef = $this->getOption("DRIVERS");
+        $this->masterSlaveMode = ($this->getOption("MODE") == "MASTER_SLAVE");
+        $this->masterName = $this->getOption("MASTER_DRIVER");
+        $this->baseName = $this->getOption("USER_BASE_DRIVER");
+        foreach ($this->driversDef as $def) {
+            $name = $def["NAME"];
+            $options = $def["OPTIONS"];
+            $options["LOGIN_REDIRECT"] = $this->options["LOGIN_REDIRECT"];
+            $instance = PluginsService::getInstance($ctx)->getPluginByTypeName("auth", $name);
+            if (!is_object($instance)) {
+                throw new Exception("Cannot find plugin $name for type 'auth'");
+            }
+            if (!$instance->isEnabled()) {
+                throw new Exception("You have selected a disabled plugin ($name) for type 'auth'");
+            }
+            $instance->init($ctx, $options);
+            if ($name != $this->getOption("MASTER_DRIVER")) {
+                $this->slaveName = $name;
+            }
+            $this->drivers[$name] = $instance;
+        }
+        $multi = PluginsService::getInstance($ctx)->getPluginById("authfront.multi");
+        $multi->options = $this->options;
+        if (!$this->masterSlaveMode) {
+            // Enable Multiple choice login screen
+            PluginsService::getInstance($ctx)->setPluginActive("authfront", "multi", true, $multi);
+        } else {
+            PluginsService::getInstance($ctx)->setPluginActive("authfront", "multi", false, $multi);
+        }
+        // THE "LOAD REGISTRY CONTRIBUTIONS" METHOD
+        // WILL BE CALLED LATER, TO BE SURE THAT THE
+        // SESSION IS ALREADY STARTED.
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getRegistryContributions(\Pydio\Core\Model\ContextInterface $ctx, $extendedVersion = true)
+    {
+        $this->loadRegistryContributions($ctx);
+        $contribs = parent::getRegistryContributions($ctx, $extendedVersion);
+        if(count($this->drivers)){
+            foreach($this->drivers as $dPlugin){
+                $contribs = array_merge($contribs, $dPlugin->getRegistryContributions($ctx));
+            }
+        }
+        return $contribs; // parent::getRegistryContributions($ctx, $extendedVersion);
+    }
+
+    private function detectCurrentDriver()
+    {
+        //if(isSet($this->currentDriver)) return;
+        $authSource = $this->getOption("MASTER_DRIVER");
+        if (isSet($_POST["auth_source"])) {
+            $_SESSION["AJXP_MULTIAUTH_SOURCE"] = $_POST["auth_source"];
+            $authSource = $_POST["auth_source"];
+            $this->logDebug("Auth source from POST");
+        } else if (isSet($_SESSION["AJXP_MULTIAUTH_SOURCE"])) {
+            $authSource = $_SESSION["AJXP_MULTIAUTH_SOURCE"];
+            $this->logDebug("Auth source from SESSION");
+        } else {
+            $this->logDebug("Auth source from MASTER");
+        }
+        $this->setCurrentDriverName($authSource);
+    }
+
+    /**
+     * @param $name
+     */
+    protected function setCurrentDriverName($name)
+    {
+        $this->currentDriver = $name;
+    }
+
+    /**
+     * @return string
+     */
+    public function getStats()
+    {
+        return implode(",", array_keys($this->drivers));
+    }
+
+    /**
+     * @return bool|AbstractAuthDriver
+     */
+    protected function getCurrentDriver()
+    {
+        $this->detectCurrentDriver();
+        if (isSet($this->currentDriver) && isSet($this->drivers[$this->currentDriver])) {
+            return $this->drivers[$this->currentDriver];
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * @param $userId
+     * @return mixed
+     */
+    protected function extractRealId($userId)
+    {
+        $parts = explode($this->getOption("USER_ID_SEPARATOR"), $userId);
+        if (count($parts) == 2) {
+            return $parts[1];
+        }
+        return $userId;
+    }
+
+    public function performChecks()
+    {
+        foreach ($this->drivers as $driver) {
+            $driver->performChecks();
+        }
+    }
+
+    /**
+     * @param $login
+     * @return String
+     */
+    public function getAuthScheme($login)
+    {
+        if (!isSet(MultiAuthDriver::$schemesCache)) {
+            foreach ($this->drivers as $scheme => $d) {
+                if ($d->userExists($login)) return $scheme;
+            }
+        } else if (isSet(MultiAuthDriver::$schemesCache[$login])) {
+            return MultiAuthDriver::$schemesCache[$login];
+        }
+        return null;
+    }
+
+    /**
+     * @return bool
+     */
+    public function supportsAuthSchemes()
+    {
+        return true;
+    }
+
+    /**
+     * @param $usersList
+     * @param $scheme
+     */
+    public function addToCache($usersList, $scheme)
+    {
+        if (!isset(MultiAuthDriver::$schemesCache)) {
+            MultiAuthDriver::$schemesCache = array();
+        }
+        foreach ($usersList as $userName) {
+            MultiAuthDriver::$schemesCache[$userName] = $scheme;
+        }
+    }
+
+    /**
+     * Wether users can be listed using offset and limit
+     * @return bool
+     */
+    public function supportsUsersPagination()
+    {
+        if (!empty($this->baseName)) {
+            return $this->drivers[$this->baseName]->supportsUsersPagination();
+        } else {
+            return $this->drivers[$this->masterName]->supportsUsersPagination() && $this->drivers[$this->slaveName]->supportsUsersPagination();
+        }
+    }
+
+    // $baseGroup = "/"
+    /**
+     * List users using offsets
+     * @param string $baseGroup
+     * @param string $regexp
+     * @param int $offset
+     * @param int $limit
+     * @param bool $recursive
+     * @return UserInterface[]
+     */
+    public function listUsersPaginated($baseGroup, $regexp, $offset, $limit, $recursive = true)
+    {
+        if (!empty($this->baseName) && $regexp == null) {
+            $users = $this->drivers[$this->baseName]->listUsersPaginated($baseGroup, $regexp, $offset, $limit, $recursive);
+            $this->addToCache(array_keys($users), $this->baseName);
+            return $users;
+        } else {
+            $keys = array_keys($this->drivers);
+            $k0 = $keys[0];
+            $k1 = $keys[1];
+            $users0 = $this->drivers[$k0]->listUsersPaginated($baseGroup, $regexp, $offset, $limit, $recursive);
+            $users1 = $this->drivers[$k1]->listUsersPaginated($baseGroup, $regexp, $offset, $limit, $recursive);
+            $this->addToCache(array_keys($users0), $k0);
+            $this->addToCache(array_keys($users1), $k1);
+            return $users0 + $users1;
+        }
+    }
+
+    /**
+     * @param string $baseGroup
+     * @param string $regexp
+     * @param null|string $filterProperty Can be "admin" or "parent"
+     * @param null|string $filterValue Can be a user Id, or AJXP_FILTER_EMPTY or AJXP_FILTER_NOT_EMPTY
+     * @param bool $recursive
+     * @return int
+     */
+    public function getUsersCount($baseGroup = "/", $regexp = "", $filterProperty = null, $filterValue = null, $recursive = true)
+    {
+        if (empty($this->baseName)) {
+            if ($this->masterSlaveMode) {
+                return $this->drivers[$this->slaveName]->getUsersCount($baseGroup, $regexp, $filterProperty, $filterValue, $recursive) + $this->drivers[$this->masterName]->getUsersCount($baseGroup, $regexp, $filterProperty, $filterValue, $recursive);
+            } else {
+                $keys = array_keys($this->drivers);
+                return $this->drivers[$keys[0]]->getUsersCount($baseGroup, $regexp, $filterProperty, $filterValue, $recursive) + $this->drivers[$keys[1]]->getUsersCount($baseGroup, $regexp, $filterProperty, $filterValue, $recursive);
+            }
+        } else {
+            return $this->drivers[$this->baseName]->getUsersCount($baseGroup, $regexp, $filterProperty, $filterValue, $recursive);
+        }
+    }
+
+    /**
+     * @param $login
+     * @return bool
+     */
+    public function isAjxpAdmin($login)
+    {
+        $keys = array_keys($this->drivers);
+        return ($this->drivers[$keys[0]]->getOption("AJXP_ADMIN_LOGIN") === $login) || ($this->drivers[$keys[1]]->getOption("AJXP_ADMIN_LOGIN") === $login);
+    }
+
+    /**
+     *
+     * @param string $baseGroup
+     * @param bool $recursive
+     * @return UserInterface[]
+     */
+    public function listUsers($baseGroup = "/", $recursive = true)
+    {
+        if ($this->masterSlaveMode) {
+            if (!empty($this->baseName)) {
+                $users = $this->drivers[$this->baseName]->listUsers($baseGroup, $recursive);
+                $this->addToCache(array_keys($users), $this->baseName);
+                return $users;
+            }
+            $masterUsers = $this->drivers[$this->slaveName]->listUsers($baseGroup, $recursive);
+            $this->addToCache(array_keys($masterUsers), $this->slaveName);
+            $slaveUsers = $this->drivers[$this->masterName]->listUsers($baseGroup, $recursive);
+            $this->addToCache(array_keys($slaveUsers), $this->masterName);
+            return $masterUsers + $slaveUsers;
+        }
+        if ($this->getCurrentDriver()) {
+//			return $this->getCurrentDriver()->listUsers($baseGroup);
+        }
+        $allUsers = array();
+        foreach ($this->drivers as $driver) {
+            $allUsers = array_merge($allUsers, $driver->listUsers($baseGroup, $recursive));
+        }
+        return $allUsers;
+    }
+
+    /**
+     * @param UserInterface $userObject
+     */
+    public function updateUserObject(&$userObject)
+    {
+        $s = $this->getAuthScheme($userObject->getId());
+        if (!$this->masterSlaveMode) {
+            $test = $this->extractRealId($userObject->getId());
+            if ($test != $userObject->getId()) {
+                $restore = $userObject->getId();
+                $userObject->setId($test);
+            }
+        }
+        if (!empty($s) && isSet($this->drivers[$s])) {
+            $this->drivers[$s]->updateUserObject($userObject);
+        } else if (!empty($this->currentDriver) && isSet($this->drivers[$this->currentDriver])) {
+            $this->drivers[$this->currentDriver]->updateUserObject($userObject);
+        }
+        if (isSet($restore)) $userObject->setId($restore);
+    }
+
+    /**
+     * List children groups of a given group. By default will report this on the CONF driver,
+     * but can be overriden to grab info directly from auth driver (ldap, etc).
+     * @param string $baseGroup
+     * @return string[]
+     */
+    public function listChildrenGroups($baseGroup = "/")
+    {
+        if ($this->masterSlaveMode) {
+            if (!empty($this->baseName)) return $this->drivers[$this->baseName]->listChildrenGroups($baseGroup);
+            $aGroups = $this->drivers[$this->masterName]->listChildrenGroups($baseGroup);
+            $bGroups = $this->drivers[$this->slaveName]->listChildrenGroups($baseGroup);
+            return $aGroups + $bGroups;
+        }
+        if ($this->getCurrentDriver()) {
+//            return $this->drivers[$this->currentDriver]->listChildrenGroups($baseGroup);
+        }
+        $groups = array();
+        foreach ($this->drivers as $d) {
+            $groups = array_merge($groups, $d->listChildrenGroups($baseGroup));
+        }
+        return $groups;
+    }
+
+    /**
+     * Alternative method to be used when checking if user exists
+     * before creating a new user.
+     * @param $login
+     * @return bool
+     */
+    public function userExistsWrite($login)
+    {
+        if ($this->masterSlaveMode) {
+            if ($this->drivers[$this->slaveName]->userExists($login)) {
+                return true;
+            }
+            return false;
+        } else {
+            return $this->userExists($login);
+        }
+    }
+
+    /**
+     * @param $login
+     * @return boolean
+     */
+    public function userExists($login)
+    {
+        if ($this->masterSlaveMode) {
+            if ($this->drivers[$this->slaveName]->userExists($login)) {
+                return true;
+            }
+            if ($this->drivers[$this->masterName]->userExists($login)) {
+                return true;
+            }
+            return false;
+        }
+        $login = $this->extractRealId($login);
+        $this->logDebug("user exists " . $login);
+        if ($this->getCurrentDriver()) {
+            return $this->getCurrentDriver()->userExists($login);
+        } else {
+            throw new Exception("No driver instanciated in multi driver!");
+        }
+    }
+
+    /**
+     * @param string $login
+     * @param string $pass
+     * @return bool
+     * @throws Exception
+     */
+    public function checkPassword($login, $pass)
+    {
+        if ($this->masterSlaveMode) {
+            if ($this->drivers[$this->masterName]->userExists($login)) {
+                // check master, and refresh slave if necessary
+                if ($this->drivers[$this->masterName]->checkPassword($login, $pass)) {
+                    if ($this->getContextualOption(\Pydio\Core\Model\Context::emptyContext(), "CACHE_MASTER_USERS_TO_SLAVE")) {
+                        if ($this->drivers[$this->slaveName]->userExists($login)) {
+                            $this->drivers[$this->slaveName]->changePassword($login, $pass);
+                        } else {
+                            $this->drivers[$this->slaveName]->createUser($login, $pass);
+                        }
+                    }
+                    return true;
+                } else {
+                    if (!$this->getContextualOption(\Pydio\Core\Model\Context::emptyContext(), "CACHE_MASTER_USERS_TO_SLAVE") && $this->drivers[$this->slaveName]->userExists($login)) {
+                        // User may in fact be a SLAVE user
+                        return $this->drivers[$this->slaveName]->checkPassword($login, $pass);
+                    }
+                    return false;
+                }
+            } else {
+                $res = $this->drivers[$this->slaveName]->checkPassword($login, $pass);
+                return $res;
+            }
+        }
+
+        $login = $this->extractRealId($login);
+        $this->logDebug("check pass " . $login);
+        if ($this->getCurrentDriver()) {
+            return $this->getCurrentDriver()->checkPassword($login, $pass);
+        } else {
+            throw new Exception("No driver instanciated in multi driver!");
+        }
+    }
+
+    /**
+     * @return bool
+     * @throws Exception
+     */
+    public function usersEditable()
+    {
+        if ($this->masterSlaveMode) return true;
+
+        if ($this->getCurrentDriver()) {
+            return $this->getCurrentDriver()->usersEditable();
+        } else {
+            throw new Exception("No driver instanciated in multi driver!");
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    public function passwordsEditable()
+    {
+        if ($this->masterSlaveMode) return true;
+
+        if ($this->getCurrentDriver()) {
+            return $this->getCurrentDriver()->passwordsEditable();
+        } else {
+            //throw new Exception("No driver instanciated in multi driver!");
+            $this->logDebug("passEditable no current driver set??");
+            return false;
+        }
+    }
+
+    /**
+     * @param $login
+     * @param $passwd
+     */
+    public function createUser($login, $passwd)
+    {
+        if ($this->masterSlaveMode) {
+            return $this->drivers[$this->slaveName]->createUser($login, $passwd);
+        }
+
+        $login = $this->extractRealId($login);
+        if ($this->getCurrentDriver()) {
+            return $this->getCurrentDriver()->createUser($login, $passwd);
+        } else {
+            throw new Exception("No driver instanciated in multi driver!");
+        }
+    }
+
+    /**
+     * @param $login
+     * @param $newPass
+     */
+    public function changePassword($login, $newPass)
+    {
+        if ($this->masterSlaveMode) {
+            return $this->drivers[$this->slaveName]->changePassword($login, $newPass);
+        }
+
+        if ($this->getCurrentDriver() && $this->getCurrentDriver()->usersEditable()) {
+            return $this->getCurrentDriver()->changePassword($login, $newPass);
+        } else {
+            throw new Exception("No driver instanciated in multi driver!");
+        }
+    }
+
+    /**
+     * @param $login
+     * @throws Exception
+     */
+    public function deleteUser($login)
+    {
+        if ($this->masterSlaveMode) {
+            return $this->drivers[$this->slaveName]->deleteUser($login);
+        }
+
+        if ($this->getCurrentDriver()) {
+            return $this->getCurrentDriver()->deleteUser($login);
+        } else {
+            throw new Exception("No driver instanciated in multi driver!");
+        }
+    }
+
+    /**
+     * @param $login
+     * @return mixed
+     * @throws Exception
+     */
+    public function getUserPass($login)
+    {
+        if ($this->masterSlaveMode) {
+            return $this->drivers[$this->slaveName]->getUserPass($login);
+        }
+
+        if ($this->getCurrentDriver()) {
+            return $this->getCurrentDriver()->getUserPass($login);
+        } else {
+            throw new Exception("No driver instanciated in multi driver!");
+        }
+    }
+
+    /**
+     * @param $userId
+     * @param $pwd
+     * @return array
+     */
+    public function filterCredentials($userId, $pwd)
+    {
+        if ($this->masterSlaveMode) return array($userId, $pwd);
+        return array($this->extractRealId($userId), $pwd);
+    }
+
+    /**
+     * @param $s
+     * @param int $level
+     * @return mixed|string
+     */
+    public function sanitize($s, $level = InputFilter::SANITIZE_HTML)
+    {
+        /**
+         * Override only for ldap.
+         */
+        if ($this->masterSlaveMode) {
+            if (($this->masterName == 'ldap') || ($this->masterName == 'ldapv2')) {
+                return $this->drivers[$this->masterName]->sanitize($s, $level);
+            }
+        }
+        return parent::sanitize($s, $level);
+    }
+}
diff --git a/core/src/plugins/auth.multi/class.multiAuthDriver.php b/core/src/plugins/auth.multi/class.multiAuthDriver.php
deleted file mode 100644
index 30809de887..0000000000
--- a/core/src/plugins/auth.multi/class.multiAuthDriver.php
+++ /dev/null
@@ -1,455 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Ability to encapsulate many auth drivers and choose the right one at login.
- * @package AjaXplorer_Plugins
- * @subpackage Auth
- */
-class multiAuthDriver extends AbstractAuthDriver
-{
-    public $driverName = "multi";
-    public $driversDef = array();
-    public $currentDriver;
-
-    public $masterSlaveMode = false;
-    public $masterName;
-    public $slaveName;
-    public $baseName;
-
-    public static $schemesCache = null;
-
-    /**
-     * @var $drivers AbstractAuthDriver[]
-     */
-    public $drivers =  array();
-
-    public function init($options)
-    {
-        //parent::init($options);
-        $this->options = $options;
-        $this->driversDef = $this->getOption("DRIVERS");
-        $this->masterSlaveMode = ($this->getOption("MODE") == "MASTER_SLAVE");
-        $this->masterName = $this->getOption("MASTER_DRIVER");
-        $this->baseName = $this->getOption("USER_BASE_DRIVER");
-        foreach ($this->driversDef as $def) {
-            $name = $def["NAME"];
-            $options = $def["OPTIONS"];
-            $options["TRANSMIT_CLEAR_PASS"] = $this->options["TRANSMIT_CLEAR_PASS"];
-            $options["LOGIN_REDIRECT"] = $this->options["LOGIN_REDIRECT"];
-            $instance = AJXP_PluginsService::findPlugin("auth", $name);
-            if (!is_object($instance)) {
-                throw new Exception("Cannot find plugin $name for type 'auth'");
-            }
-            if (!$instance->isEnabled()){
-                throw new Exception("You have selected a disabled plugin ($name) for type 'auth'");
-            }
-            $instance->init($options);
-            if ($name != $this->getOption("MASTER_DRIVER")) {
-                $this->slaveName = $name;
-            }
-            $this->drivers[$name] = $instance;
-        }
-        if(!$this->masterSlaveMode){
-            // Enable Multiple choice login screen
-            $multi = AJXP_PluginsService::getInstance()->findPluginById("authfront.multi");
-            $multi->enabled = true;
-            $multi->options = $this->options;
-        }
-        // THE "LOAD REGISTRY CONTRIBUTIONS" METHOD
-        // WILL BE CALLED LATER, TO BE SURE THAT THE
-        // SESSION IS ALREADY STARTED.
-    }
-
-    public function getRegistryContributions( $extendedVersion = true )
-    {
-        // $this->logDebug("get contributions NOW");
-        $this->loadRegistryContributions();
-        return parent::getRegistryContributions( $extendedVersion );
-    }
-
-    public function getStats()
-    {
-        return implode(",", array_keys($this->drivers));
-    }
-
-    private function detectCurrentDriver()
-    {
-        //if(isSet($this->currentDriver)) return;
-        $authSource = $this->getOption("MASTER_DRIVER");
-        if (isSet($_POST["auth_source"])) {
-            $_SESSION["AJXP_MULTIAUTH_SOURCE"] = $_POST["auth_source"];
-            $authSource = $_POST["auth_source"];
-            $this->logDebug("Auth source from POST");
-        } else if (isSet($_SESSION["AJXP_MULTIAUTH_SOURCE"])) {
-            $authSource = $_SESSION["AJXP_MULTIAUTH_SOURCE"];
-            $this->logDebug("Auth source from SESSION");
-        } else {
-            $this->logDebug("Auth source from MASTER");
-        }
-        $this->setCurrentDriverName($authSource);
-    }
-
-    protected function setCurrentDriverName($name)
-    {
-        $this->currentDriver = $name;
-    }
-
-    protected function getCurrentDriver()
-    {
-        $this->detectCurrentDriver();
-        if (isSet($this->currentDriver) && isSet($this->drivers[$this->currentDriver])) {
-            return $this->drivers[$this->currentDriver];
-        } else {
-            return false;
-        }
-    }
-
-    protected function extractRealId($userId)
-    {
-        $parts = explode($this->getOption("USER_ID_SEPARATOR"), $userId);
-        if (count($parts) == 2) {
-            return $parts[1];
-        }
-        return $userId;
-    }
-
-    public function performChecks()
-    {
-        foreach ($this->drivers as $driver) {
-            $driver->performChecks();
-        }
-    }
-
-    public function getAuthScheme($login)
-    {
-        if (!isSet(multiAuthDriver::$schemesCache)) {
-            foreach ($this->drivers as $scheme => $d) {
-                if($d->userExists($login)) return $scheme;
-            }
-        } else if (isSet(multiAuthDriver::$schemesCache[$login])) {
-            return multiAuthDriver::$schemesCache[$login];
-        }
-        return null;
-    }
-
-    public function supportsAuthSchemes()
-    {
-        return true;
-    }
-
-    public function addToCache($usersList, $scheme)
-    {
-        if (!isset(multiAuthDriver::$schemesCache)) {
-            multiAuthDriver::$schemesCache = array();
-        }
-        foreach ($usersList as $userName) {
-            multiAuthDriver::$schemesCache[$userName] = $scheme;
-        }
-    }
-
-    public function supportsUsersPagination()
-    {
-        if (!empty($this->baseName)) {
-            return $this->drivers[$this->baseName]->supportsUsersPagination();
-        } else {
-            return $this->drivers[$this->masterName]->supportsUsersPagination() && $this->drivers[$this->slaveName]->supportsUsersPagination();
-        }
-    }
-
-    // $baseGroup = "/"
-    public function listUsersPaginated($baseGroup, $regexp, $offset, $limit, $recursive = true)
-    {
-        if (!empty($this->baseName) && $regexp == null) {
-            $users = $this->drivers[$this->baseName]->listUsersPaginated($baseGroup, $regexp, $offset, $limit, $recursive);
-            $this->addToCache(array_keys($users), $this->baseName);
-            return $users;
-        } else {
-            $keys = array_keys($this->drivers);
-            $k0 = $keys[0];
-            $k1 = $keys[1];
-            $users0 = $this->drivers[$k0]->listUsersPaginated($baseGroup, $regexp, $offset, $limit, $recursive);
-            $users1 = $this->drivers[$k1]->listUsersPaginated($baseGroup, $regexp, $offset, $limit, $recursive);
-            $this->addToCache(array_keys($users0), $k0);
-            $this->addToCache(array_keys($users1), $k1);
-            return $users0 + $users1;
-        }
-    }
-
-    public function getUsersCount($baseGroup = "/", $regexp = "", $filterProperty = null, $filterValue = null, $recursive = true)
-    {
-        if (empty($this->baseName)) {
-            if ($this->masterSlaveMode) {
-                return $this->drivers[$this->slaveName]->getUsersCount($baseGroup, $regexp, $filterProperty, $filterValue, $recursive) +  $this->drivers[$this->masterName]->getUsersCount($baseGroup, $regexp, $filterProperty, $filterValue, $recursive);
-            } else {
-                $keys = array_keys($this->drivers);
-                return $this->drivers[$keys[0]]->getUsersCount($baseGroup, $regexp, $filterProperty, $filterValue, $recursive) +  $this->drivers[$keys[1]]->getUsersCount($baseGroup, $regexp, $filterProperty, $filterValue, $recursive);
-            }
-        } else {
-            return $this->drivers[$this->baseName]->getUsersCount($baseGroup, $regexp, $filterProperty, $filterValue, $recursive);
-        }
-    }
-
-    public function isAjxpAdmin($login)
-    {
-        $keys = array_keys($this->drivers);
-        return ($this->drivers[$keys[0]]->getOption("AJXP_ADMIN_LOGIN") === $login) ||  ($this->drivers[$keys[1]]->getOption("AJXP_ADMIN_LOGIN") === $login);
-    }
-
-    public function listUsers($baseGroup="/", $recursive = true)
-    {
-        if ($this->masterSlaveMode) {
-            if (!empty($this->baseName)) {
-                $users = $this->drivers[$this->baseName]->listUsers($baseGroup, $recursive);
-                $this->addToCache(array_keys($users), $this->baseName);
-                return $users;
-            }
-            $masterUsers = $this->drivers[$this->slaveName]->listUsers($baseGroup, $recursive);
-            $this->addToCache(array_keys($masterUsers), $this->slaveName);
-            $slaveUsers = $this->drivers[$this->masterName]->listUsers($baseGroup, $recursive);
-            $this->addToCache(array_keys($slaveUsers), $this->masterName);
-            return array_merge($masterUsers, $slaveUsers);
-        }
-        if ($this->getCurrentDriver()) {
-//			return $this->getCurrentDriver()->listUsers($baseGroup);
-        }
-        $allUsers = array();
-        foreach ($this->drivers as $driver) {
-            $allUsers = array_merge($allUsers, $driver->listUsers($baseGroup, $recursive));
-        }
-        return $allUsers;
-    }
-
-    public function updateUserObject(&$userObject)
-    {
-        $s = $this->getAuthScheme($userObject->getId());
-        if (!$this->masterSlaveMode) {
-            $test = $this->extractRealId($userObject->getId());
-            if ($test != $userObject->getId()) {
-                $restore = $userObject->getId();
-                $userObject->setId($test);
-            }
-        }
-        if (!empty($s) && isSet($this->drivers[$s])) {
-            $this->drivers[$s]->updateUserObject($userObject);
-        } else if (!empty($this->currentDriver) && isSet($this->drivers[$this->currentDriver])) {
-            $this->drivers[$this->currentDriver]->updateUserObject($userObject);
-        }
-        if(isSet($restore)) $userObject->setId($restore);
-    }
-
-    /**
-     * List children groups of a given group. By default will report this on the CONF driver,
-     * but can be overriden to grab info directly from auth driver (ldap, etc).
-     * @param string $baseGroup
-     * @return string[]
-     */
-    public function listChildrenGroups($baseGroup = "/")
-    {
-        if ($this->masterSlaveMode) {
-            if(!empty($this->baseName)) return $this->drivers[$this->baseName]->listChildrenGroups($baseGroup);
-            $aGroups = $this->drivers[$this->masterName]->listChildrenGroups($baseGroup);
-            $bGroups = $this->drivers[$this->slaveName]->listChildrenGroups($baseGroup);
-            return $aGroups + $bGroups;
-        }
-        if ($this->getCurrentDriver()) {
-//            return $this->drivers[$this->currentDriver]->listChildrenGroups($baseGroup);
-        }
-        $groups = array();
-        foreach ($this->drivers as $d) {
-            $groups = array_merge($groups, $d->listChildrenGroups($baseGroup));
-        }
-        return $groups;
-    }
-
-
-    public function preLogUser($remoteSessionId)
-    {
-        if ($this->masterSlaveMode) {
-            $this->drivers[$this->slaveName]->preLogUser($remoteSessionId);
-            if (AuthService::getLoggedUser() == null) {
-                $this->drivers[$this->masterName]->preLogUser($remoteSessionId);
-                return;
-            }
-            return;
-        }
-
-        if ($this->getCurrentDriver()) {
-            $this->getCurrentDriver()->preLogUser($remoteSessionId);
-            return;
-        } else {
-            throw new Exception("No driver instanciated in multi driver!");
-        }
-    }
-
-    public function userExistsWrite($login)
-    {
-        if ($this->masterSlaveMode) {
-            if ($this->drivers[$this->slaveName]->userExists($login)) {
-                return true;
-            }
-            return false;
-        } else {
-            return $this->userExists($login);
-        }
-    }
-
-    public function userExists($login)
-    {
-        if ($this->masterSlaveMode) {
-            if ($this->drivers[$this->slaveName]->userExists($login)) {
-                return true;
-            }
-            if ($this->drivers[$this->masterName]->userExists($login)) {
-                return true;
-            }
-            return false;
-        }
-        $login = $this->extractRealId($login);
-        $this->logDebug("user exists ".$login);
-        if ($this->getCurrentDriver()) {
-            return $this->getCurrentDriver()->userExists($login);
-        } else {
-            throw new Exception("No driver instanciated in multi driver!");
-        }
-    }
-
-    public function checkPassword($login, $pass, $seed)
-    {
-        if ($this->masterSlaveMode) {
-            if ($this->drivers[$this->masterName]->userExists($login)) {
-                // check master, and refresh slave if necessary
-                if ($this->drivers[$this->masterName]->checkPassword($login, $pass, $seed)) {
-                    if($this->getFilteredOption("CACHE_MASTER_USERS_TO_SLAVE")){
-                        if ($this->drivers[$this->slaveName]->userExists($login)) {
-                            $this->drivers[$this->slaveName]->changePassword($login, $pass);
-                        } else {
-                            $this->drivers[$this->slaveName]->createUser($login, $pass);
-                        }
-                    }
-                    return true;
-                } else {
-                    if(!$this->getFilteredOption("CACHE_MASTER_USERS_TO_SLAVE") && $this->drivers[$this->slaveName]->userExists($login)){
-                        // User may in fact be a SLAVE user
-                        return $this->drivers[$this->slaveName]->checkPassword($login, $pass, $seed);
-                    }
-                    return false;
-                }
-            } else {
-                $res = $this->drivers[$this->slaveName]->checkPassword($login, $pass, $seed);
-                return $res;
-            }
-        }
-
-        $login = $this->extractRealId($login);
-        $this->logDebug("check pass ".$login);
-        if ($this->getCurrentDriver()) {
-            return $this->getCurrentDriver()->checkPassword($login, $pass, $seed);
-        } else {
-            throw new Exception("No driver instanciated in multi driver!");
-        }
-    }
-
-    public function usersEditable()
-    {
-        if($this->masterSlaveMode) return true;
-
-        if ($this->getCurrentDriver()) {
-            return $this->getCurrentDriver()->usersEditable();
-        } else {
-            throw new Exception("No driver instanciated in multi driver!");
-        }
-    }
-
-    public function passwordsEditable()
-    {
-        if($this->masterSlaveMode) return true;
-
-        if ($this->getCurrentDriver()) {
-            return $this->getCurrentDriver()->passwordsEditable();
-        } else {
-            //throw new Exception("No driver instanciated in multi driver!");
-            $this->logDebug("passEditable no current driver set??");
-            return false;
-        }
-    }
-
-    public function createUser($login, $passwd)
-    {
-        if ($this->masterSlaveMode) {
-            return $this->drivers[$this->slaveName]->createUser($login, $passwd);
-        }
-
-        $login = $this->extractRealId($login);
-        if ($this->getCurrentDriver()) {
-            return $this->getCurrentDriver()->createUser($login, $passwd);
-        } else {
-            throw new Exception("No driver instanciated in multi driver!");
-        }
-    }
-
-    public function changePassword($login, $newPass)
-    {
-        if ($this->masterSlaveMode) {
-            return $this->drivers[$this->slaveName]->changePassword($login, $newPass);
-        }
-
-        if ($this->getCurrentDriver() && $this->getCurrentDriver()->usersEditable()) {
-            return $this->getCurrentDriver()->changePassword($login, $newPass);
-        } else {
-            throw new Exception("No driver instanciated in multi driver!");
-        }
-    }
-
-    public function deleteUser($login)
-    {
-        if ($this->masterSlaveMode) {
-            return $this->drivers[$this->slaveName]->deleteUser($login);
-        }
-
-        if ($this->getCurrentDriver()) {
-            return $this->getCurrentDriver()->deleteUser($login);
-        } else {
-            throw new Exception("No driver instanciated in multi driver!");
-        }
-    }
-
-    public function getUserPass($login)
-    {
-        if ($this->masterSlaveMode) {
-            return $this->drivers[$this->slaveName]->getUserPass($login);
-        }
-
-        if ($this->getCurrentDriver()) {
-            return $this->getCurrentDriver()->getUserPass($login);
-        } else {
-            throw new Exception("No driver instanciated in multi driver!");
-        }
-    }
-
-    public function filterCredentials($userId, $pwd)
-    {
-        if($this->masterSlaveMode) return array($userId, $pwd);
-        return array($this->extractRealId($userId), $pwd);
-    }
-
-}
diff --git a/core/src/plugins/auth.multi/i18n/conf/de.php b/core/src/plugins/auth.multi/i18n/conf/de.php
index 44b1c70e50..28d863753e 100644
--- a/core/src/plugins/auth.multi/i18n/conf/de.php
+++ b/core/src/plugins/auth.multi/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Multiple" => "Mehrere",
@@ -33,4 +33,4 @@
 "In Master_Slave mode, use this option to limit the users listing in the administration to one driver only (leave empty if you want to see all users)" => "In Master_Slave mode, use this option to limit the users listing in the administration to one driver only (leave empty if you want to see all users)",
 "Cache master users" => "Cache master users",
 "Create a local copy (at login time) of master users inside slave base" => "Create a local copy (at login time) of master users inside slave base",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/auth.multi/i18n/conf/en.php b/core/src/plugins/auth.multi/i18n/conf/en.php
index 6ce5af8c17..165902f77f 100644
--- a/core/src/plugins/auth.multi/i18n/conf/en.php
+++ b/core/src/plugins/auth.multi/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Multiple" => "Multiple",
diff --git a/core/src/plugins/auth.multi/i18n/conf/fr.php b/core/src/plugins/auth.multi/i18n/conf/fr.php
index 0b68451f8f..469714b873 100644
--- a/core/src/plugins/auth.multi/i18n/conf/fr.php
+++ b/core/src/plugins/auth.multi/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Multiple" => "Multiple",
diff --git a/core/src/plugins/auth.multi/i18n/conf/it.php b/core/src/plugins/auth.multi/i18n/conf/it.php
index ab1ecee9db..0976a40e13 100644
--- a/core/src/plugins/auth.multi/i18n/conf/it.php
+++ b/core/src/plugins/auth.multi/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Multiple" => "Multiplo",
@@ -33,4 +33,4 @@
 "In Master_Slave mode, use this option to limit the users listing in the administration to one driver only (leave empty if you want to see all users)" => "In modalità Principale/Secondario, utilizza questa opzione per limitare il listing degli utenti in amministrazione ad un solo driver (lascia vuoto per vederli tutti)",
 "Cache master users" => "Cache master users",
 "Create a local copy (at login time) of master users inside slave base" => "Create a local copy (at login time) of master users inside slave base",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/auth.multi/i18n/conf/pt.php b/core/src/plugins/auth.multi/i18n/conf/pt.php
index 54396d8d56..8d3c6f50ac 100644
--- a/core/src/plugins/auth.multi/i18n/conf/pt.php
+++ b/core/src/plugins/auth.multi/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Multiple" => "Multiplicar",
diff --git a/core/src/plugins/auth.multi/manifest.xml b/core/src/plugins/auth.multi/manifest.xml
index b4e215e1f4..e3e3b355c4 100755
--- a/core/src/plugins/auth.multi/manifest.xml
+++ b/core/src/plugins/auth.multi/manifest.xml
@@ -16,7 +16,7 @@
         <param name="USER_ID_SEPARATOR" type="string"  label="CONF_MESSAGE[Separator]" description="CONF_MESSAGE[This is necessary to discriminate users data loaded from various sources. Warning, use foldername compliant characters. For example :: does not work!]" mandatory="true" default="_-_"/>
         <param name="DRIVERS" type="array" label="CONF_MESSAGE[Drivers]" description="CONF_MESSAGE[The auth drivers definition, see detailed documenation for more info.]" mandatory="true"/>
     </server_settings>
-	<class_definition filename="plugins/auth.multi/class.multiAuthDriver.php" classname="multiAuthDriver"/>
+	<class_definition filename="plugins/auth.multi/MultiAuthDriver.php" classname="Pydio\Auth\Driver\MultiAuthDriver"/>
 	<registry_contributions>
 		<external_file filename="plugins/core.auth/standard_auth_actions.xml" include="actions/*" exclude=""/>
 	</registry_contributions>
diff --git a/core/src/plugins/auth.phpbb/class.phpbbAuthDriver.php b/core/src/plugins/auth.phpbb/class.phpbbAuthDriver.php
deleted file mode 100644
index 10adecbc3d..0000000000
--- a/core/src/plugins/auth.phpbb/class.phpbbAuthDriver.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Bridge with the phpBB users system.
- * @package AjaXplorer_Plugins
- * @subpackage Auth
- */
-class phpbbAuthDriver extends serialAuthDriver
-{
-    public $usersSerFile;
-    public $phpbb_root_path;
-    public $driverName = "phpbb";
-
-    public function init($options)
-    {
-        parent::init($options);
-        $options = $this->options;
-
-        $this->usersSerFile = $options["USERS_FILEPATH"];
-        $this->slaveMode = ($options["SLAVE_MODE"]) ? true : false;
-        $this->urls = array($options["LOGIN_URL"], $options["LOGOUT_URL"]);
-
-        global $phpbb_root_path, $phpEx, $user, $db, $config, $cache, $template;
-        define('IN_PHPBB', true);
-        $phpbb_root_path =  $options["PHPBB_PATH"];
-        $phpEx = substr(strrchr(__FILE__, '.'), 1);
-        require($phpbb_root_path . 'common.' . $phpEx);
-        $user->session_begin();
-
-        if(!$user->data['is_registered'])
-            $this->disconnect();
-
-    }
-
-    public function disconnect()
-    {
-        if (!empty($_SESSION["AJXP_USER"])) {
-            unset($_SESSION["AJXP_USER"]);
-            session_destroy();
-        }
-    }
-
-    public function usersEditable() { return false; }
-
-    public function passwordsEditable() { return false; }
-
-    public function preLogUser($sessionId)
-    {
-        global $user;
-
-        $username = $user->data['username_clean'];
-        $password = md5($user->data['user_password']);
-
-        if(!$user->data['is_registered'])
-            return false;
-
-        if (!$this->userExists($username)) {
-            if ($this->autoCreateUser()) {
-                $this->createUser($username, $password);
-            } else {
-                return false;
-            }
-        }
-
-        AuthService::logUser($username, '', true);
-        return true;
-    }
-
-    public function getLoginRedirect()
-    {
-        if ($this->slaveMode) {
-            if (!empty($_SESSION["AJXP_USER"]))
-                return false;
-
-            return $this->urls[0];
-        }
-        return false;
-    }
-
-    public function getLogoutRedirect()
-    {
-        if ($this->slaveMode) {
-            return $this->urls[1];
-        }
-        return false;
-    }
-
-}
diff --git a/core/src/plugins/auth.phpbb/i18n/conf/de.php b/core/src/plugins/auth.phpbb/i18n/conf/de.php
deleted file mode 100644
index b990f02c96..0000000000
--- a/core/src/plugins/auth.phpbb/i18n/conf/de.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Remote authentication" => "Remote authentication",
-"Authentication on PHPBB is done remotely (useful in CMS system)." => "Authentifizierung über PHPBB-System.",
-"Authentication mode" => "Authentifizierung-Modus",
-"If set, the remote end calls us to register upon login, else, we will be calling the remote end when login is required" => "If set, the remote end calls us to register upon login, else, we will be calling the remote end when login is required",
-"Login URL" => "Login-URL",
-"When not in slave mode, AJXP calls the given URL as URL?name=XXX&amp;pass=XXX&amp;key=XXX. Else it redirect to the given URL" => "Wenn nicht im Slave-Modus ruft Pydio folgende URL auf: URL?name=XXX&amp;pass=XXX&amp;key=XXX. Andernfalls wird zur angegebenen URL weitergeleitet.",
-"Logout URL" => "Logout-URL",
-"Redirect to the given URL on loggin out" => "Beim Abmelden auf die angegebene URL weiterleiten.",
-"PHPbb" => "PHPbb",
-"The phpbb path" => "Der PHPbb-Pfad",
-"Users" => "Benutzer",
-"The users list" => "Eine Liste mit Benutzern",
-"PHPBB authentication" => "PHPBB-Authentifizierung",
-);
\ No newline at end of file
diff --git a/core/src/plugins/auth.phpbb/i18n/conf/en.php b/core/src/plugins/auth.phpbb/i18n/conf/en.php
deleted file mode 100644
index 4169f04b04..0000000000
--- a/core/src/plugins/auth.phpbb/i18n/conf/en.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Remote authentication" => "Remote authentication",
-"Authentication on PHPBB is done remotely (useful in CMS system)." => "Authentication is done remotely (useful in CMS system).",
-"Authentication mode" => "Authentication mode",
-"If set, the remote end calls us to register upon login, else, we will be calling the remote end when login is required" => "If set, the remote end calls us to register upon login, else, we will be calling the remote end when login is required",
-"Login URL" => "Login URL",
-"When not in slave mode, AJXP calls the given URL as URL?name=XXX&amp;pass=XXX&amp;key=XXX. Else it redirect to the given URL" => "When not in slave mode, AJXP calls the given URL as URL?name=XXX&amp;pass=XXX&amp;key=XXX. Else it redirect to the given URL",
-"Logout URL" => "Logout URL",
-"Redirect to the given URL on loggin out" => "Redirect to the given URL on loggin out",
-"PHPbb" => "PHPbb",
-"The phpbb path" => "The phpbb path",
-"Users" => "Users",
-"The users list" => "The users list",
-"PHPBB authentication" => "PHPBB authentication",
-);
\ No newline at end of file
diff --git a/core/src/plugins/auth.phpbb/i18n/conf/fr.php b/core/src/plugins/auth.phpbb/i18n/conf/fr.php
deleted file mode 100644
index 4390299247..0000000000
--- a/core/src/plugins/auth.phpbb/i18n/conf/fr.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Remote authentication" => "Authentication externe",
-"Authentication is done remotely (useful in CMS system)." => "L'authentification est effectuée à distance (utile pour les CMS)",
-"Authentication mode" => "Mode d'authentification",
-"If set, the remote end calls us to register upon login, else, we will be calling the remote end when login is required" => "Si défini, l'extrémité distante contacte Pydio pour enregistrement lors de la connexion, sinon Pydio contactera l'extremité distante lorsqu'une connexion sera requise",
-"Login URL" => "URL de connexion",
-"When not in slave mode, AJXP calls the given URL as URL?name=XXX&amp;pass=XXX&amp;key=XXX. Else it redirect to the given URL" => "Lorsqu'il n'est pas en mode Esclave, Pydio contacte l'URL définie (ex : URL?name=XXX&amp;pass=XXX&amp;key=XXX). Sinon, il redirige vers cette URL.",
-"Logout URL" => "URL de déconnexion",
-"Redirect to the given URL on loggin out" => "Redirection vers cette URL lors de la déconnexion.",
-"PHPbb" => "PHPbb",
-"The phpbb path" => "Chemin PHPBB",
-"Users" => "Utilisateurs",
-"The users list" => "Liste des utilisateurs",
-"PHPBB authentication" => "Authentification PHPBB",
-"Authentication on PHPBB is done remotely (useful in CMS system)." => "Authentication is done remotely (useful in CMS system).",
-);
\ No newline at end of file
diff --git a/core/src/plugins/auth.phpbb/i18n/conf/it.php b/core/src/plugins/auth.phpbb/i18n/conf/it.php
deleted file mode 100644
index 6ab53153a1..0000000000
--- a/core/src/plugins/auth.phpbb/i18n/conf/it.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Remote authentication" => "Autenticazione Remota",
-"Authentication is done remotely (useful in CMS system)." => "L'autenticazione è eseguita in remoto (utilizzando il sistema integrato nel CMS).",
-"Authentication mode" => "Modalità Autenticazione",
-"If set, the remote end calls us to register upon login, else, we will be calling the remote end when login is required" => "Se impostato, il contatto remoto ci chiede la registrazione al momento del login; altrimenti, il sistema chiamerà il contatto remoto quando il login è richiesto",
-"Login URL" => "Login URL",
-"When not in slave mode, AJXP calls the given URL as URL?name=XXX&amp;pass=XXX&amp;key=XXX. Else it redirect to the given URL" => "Quando il sistema non è Secondario, AJXP chiama l'indirizzo specificato come URL?name=XXX&amp;pass=XXX&amp;key=XXX. Altrimenti reindirizza all'indirizzo specificato.",
-"Logout URL" => "Logout URL",
-"Redirect to the given URL on loggin out" => "Reindirizza all'URL specificato dopo il logout.",
-"PHPbb" => "PHPbb",
-"The phpbb path" => "Il percorso di PHPbb",
-"Users" => "Utenti",
-"The users list" => "Lista utenti",
-"PHPBB authentication" => "Autenticazione PHPBB",
-"Authentication on PHPBB is done remotely (useful in CMS system)." => "Authentication is done remotely (useful in CMS system).",
-);
\ No newline at end of file
diff --git a/core/src/plugins/auth.phpbb/manifest.xml b/core/src/plugins/auth.phpbb/manifest.xml
deleted file mode 100644
index daf6b1f308..0000000000
--- a/core/src/plugins/auth.phpbb/manifest.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-USAGE :
-In /conf/conf.php
-
-$AUTH_DRIVER = array(
-	"NAME"			=> "phpbb",
-	"OPTIONS"		=> array(
-		"SLAVE_MODE"		=> true,
-		"LOGIN_URL"		=> 'http://www.ajaxplorer.info/',
-		"LOGOUT_URL"		=> 'http://www.ajaxplorer.info/',
-		"PHPBB_PATH"		=> '../../forum/',
-		"USERS_FILEPATH"	=> 'AJXP_INSTALL_PATH/data/users/users.ser',
-		"AUTOCREATE_AJXPUSER" 	=> true
-	)
-);
-
--->
-<authdriver name="phpbb" enabled="false" label="CONF_MESSAGE[PHPBB authentication]" description="CONF_MESSAGE[Authentication on PHPBB is done remotely (useful in CMS system).]"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <plugin_info>
-        <core_relation packaged="false" tested_version="3.5.0"/>
-        <plugin_author>Contributed</plugin_author>
-    </plugin_info>
-    <client_settings>
-        <resources>
-            <i18n namespace="phpbb_auth" path="plugins/auth.phpbb/i18n"/>
-        </resources>
-    </client_settings>
-    <server_settings>
-		<param name="SLAVE_MODE" type="boolean" label="CONF_MESSAGE[Authentication mode]" description="CONF_MESSAGE[If set, the remote end calls us to register upon login, else, we will be calling the remote end when login is required]" default="true" mandatory="true" />
-		<param name="LOGIN_URL" type="string" label="CONF_MESSAGE[Login URL]" description="CONF_MESSAGE[When not in slave mode, AJXP calls the given URL as URL?name=XXX&amp;pass=XXX&amp;key=XXX. Else it redirect to the given URL]" mandatory="true" />
-		<param name="LOGOUT_URL" type="string" label="CONF_MESSAGE[Logout URL]" description="CONF_MESSAGE[Redirect to the given URL on loggin out]" mandatory="false" />
-		<param name="PHPBB_PATH" type="string" label="CONF_MESSAGE[PHPbb]" description="CONF_MESSAGE[The phpbb path]" mandatory="true"/>
-		<param name="USERS_FILEPATH" type="string" label="CONF_MESSAGE[Users]" description="CONF_MESSAGE[The users list]" mandatory="true"/>
-	</server_settings>
-	<class_definition filename="plugins/auth.remote_ajxp/class.phpbbAuthDriver.php" classname="phpbbAuthDriver"/>
-	<registry_contributions>
-		<external_file filename="plugins/core.auth/standard_auth_actions.xml" include="actions/*" exclude=""/>
-	</registry_contributions>
-	<dependencies>
-		<pluginClass pluginName="auth.serial"/>
-	</dependencies>
-</authdriver>
diff --git a/core/src/plugins/auth.phpbb/plugin_doc.html b/core/src/plugins/auth.phpbb/plugin_doc.html
deleted file mode 100644
index 3cdd158a17..0000000000
--- a/core/src/plugins/auth.phpbb/plugin_doc.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>Interface with phpBB</p>
\ No newline at end of file
diff --git a/core/src/plugins/auth.radius/RadiusAuthDriver.php b/core/src/plugins/auth.radius/RadiusAuthDriver.php
new file mode 100644
index 0000000000..9ae7807092
--- /dev/null
+++ b/core/src/plugins/auth.radius/RadiusAuthDriver.php
@@ -0,0 +1,262 @@
+<?php
+namespace Pydio\Auth\Driver;
+
+use Pydio\Auth\Core\AbstractAuthDriver;
+use Pydio\Auth\Core\MemorySafe;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\AuthService;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Authenticates user against an RADIUS server
+ * @package AjaXplorer_Plugins
+ * @subpackage Auth
+ */
+class RadiusAuthDriver extends AbstractAuthDriver
+{
+    public $driverName = "radius";
+    public $radiusServer;
+    public $radiusPort = 1812;
+    public $radiusSecret;
+    public $radiusAuthType = 'chap';
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        parent::init($ctx, $options);
+        $this->radiusServer = $options["RADIUS Server"];
+        if ($options["RADIUS Port"])
+            $this->radiusPort = $options["RADIUS Port"];
+        if ($options["RADIUS Shared Secret"])
+            $this->radiusSecret = $options["RADIUS Shared Secret"];
+        if ($options["RADIUS Auth Type"])
+            $this->radiusAuthType = $options["RADIUS Auth Type"];
+    }
+
+    /**
+     * @param $options
+     * @return string
+     */
+    public function testRADIUSConnection($options)
+    {
+        $this->radiusServer = $options["RADIUS Server"];
+        if ($options["RADIUS Port"])
+            $this->radiusPort = $options["RADIUS Port"];
+        if ($options["RADIUS Shared Secret"])
+            $this->radiusSecret = $options["RADIUS Shared Secret"];
+        if ($options["RADIUS Auth Type"])
+            $this->radiusAuthType = $options["RADIUS Auth Type"];
+        if (!extension_loaded('radius')) {
+            return "ERROR: PHP radius extension is missing. Do NOT enable RADIUS authentication unless you installed the extension!";
+        }
+        $res = radius_auth_open();
+        $this->prepareRequest($res, $options["RADIUS Test-User"], $options["RADIUS Test-Password"]);
+        $req = radius_send_request($res);
+        if (!$req) {
+            return "ERROR: Could not send RADIUS request to server";
+        }
+        switch ($req) {
+            case RADIUS_ACCESS_ACCEPT:
+                radius_close($res);
+                return "SUCCESS: Sucessfully authenticated.";
+            case RADIUS_ACCESS_REJECT:
+                radius_close($res);
+                return "ERROR: Could connect but user was rejected (Verify correct test user/password).";
+            default:
+                radius_close($res);
+                return "ERROR: Server responded with an unknown code.";
+        }
+    }
+
+    /**
+     * @param string $baseGroup
+     * @param bool $recursive
+     * @return array
+     */
+    public function listUsers($baseGroup = "/", $recursive = true)
+    {
+        $adminUser = $this->options["AJXP_ADMIN_LOGIN"];
+        return array(
+            $adminUser => $adminUser
+        );
+    }
+
+    /**
+     * @param $login
+     * @return bool
+     */
+    public function userExists($login)
+    {
+        return true;
+    }
+
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     */
+    public function logoutCallback(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface)
+    {
+        MemorySafe::clearCredentials();
+        AuthService::disconnect();
+        session_write_close();
+
+        $x = new \Pydio\Core\Http\Response\SerializableResponseStream();
+        $x->addChunk(new \Pydio\Core\Http\Message\LoggingResult(2));
+        $responseInterface = $responseInterface->withBody($x);
+    }
+
+    /**
+     * @param $res
+     * @param $login
+     * @param $pass
+     * @return bool
+     */
+    public function prepareRequest($res, $login, $pass)
+    {
+        if (!radius_add_server($res, $this->radiusServer, $this->radiusPort, $this->radiusSecret, 3, 3)) {
+            Logger::debug(__CLASS__, __FUNCTION__, "RADIUS: Could not add server (" . radius_strerror($res) . ")");
+            return false;
+        }
+        if (!radius_create_request($res, RADIUS_ACCESS_REQUEST)) {
+            Logger::debug(__CLASS__, __FUNCTION__, "RADIUS: Could not create request (" . radius_strerror($res) . ")");
+            return false;
+        }
+        if (!radius_put_string($res, RADIUS_NAS_IDENTIFIER, isset($_SERVER["SERVER_NAME"]) ? $_SERVER["SERVER_NAME"] : 'localhost')) {
+            Logger::debug(__CLASS__, __FUNCTION__, "RADIUS: Could not put string for nas_identifier (" . radius_strerror($res) . ")");
+            return false;
+        }
+        if (!radius_put_int($res, RADIUS_SERVICE_TYPE, RADIUS_FRAMED)) {
+            Logger::debug(__CLASS__, __FUNCTION__, "RADIUS: Could not put int for service_type (" . radius_strerror($res) . ")");
+            return false;
+        }
+        if (!radius_put_int($res, RADIUS_FRAMED_PROTOCOL, RADIUS_PPP)) {
+            Logger::debug(__CLASS__, __FUNCTION__, "RADIUS: Could not put int for framed_protocol (" . radius_strerror($res) . ")");
+            return false;
+        }
+        if (!radius_put_string($res, RADIUS_CALLING_STATION_ID, isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '127.0.0.1') == -1) {
+            Logger::debug(__CLASS__, __FUNCTION__, "RADIUS: Could not put string for calling_station_id (" . radius_strerror($res) . ")");
+            return false;
+        }
+        if (!radius_put_string($res, RADIUS_USER_NAME, $login)) {
+            Logger::debug(__CLASS__, __FUNCTION__, "RADIUS: Could not put string for user name (" . radius_strerror($res) . ")");
+            return false;
+        }
+        if ($this->radiusAuthType == 'chap') {
+            Logger::debug(__CLASS__, __FUNCTION__, "RADIUS: Using CHAP.");
+            mt_srand(time());
+            $chall = mt_rand();
+            $chapval = pack('H*', md5(pack('Ca*', 1, $pass . $chall)));
+            $pass = pack('C', 1) . $chapval;
+            if (!radius_put_attr($res, RADIUS_CHAP_PASSWORD, $pass)) {
+                Logger::debug(__CLASS__, __FUNCTION__, "RADIUS: Could not put attribute for chap password (" . radius_strerror($res) . ")");
+                return false;
+            }
+            if (!radius_put_attr($res, RADIUS_CHAP_CHALLENGE, $chall)) {
+                Logger::debug(__CLASS__, __FUNCTION__, "RADIUS: Could not put attribute for chap callenge (" . radius_strerror($res) . ")");
+                return false;
+            }
+        } else {
+            Logger::debug(__CLASS__, __FUNCTION__, "RADIUS: Using PAP.");
+            if (!radius_put_string($res, RADIUS_USER_PASSWORD, $pass)) {
+                Logger::debug(__CLASS__, __FUNCTION__, "RADIUS: Could not put string for pap password (" . radius_strerror($res) . ")");
+                return false;
+            }
+        }
+        if (!radius_put_int($res, RADIUS_SERVICE_TYPE, RADIUS_FRAMED)) {
+            Logger::debug(__CLASS__, __FUNCTION__, "RADIUS: Could not put int for second service type (" . radius_strerror($res) . ")");
+            return false;
+        }
+        if (!radius_put_int($res, RADIUS_FRAMED_PROTOCOL, RADIUS_PPP)) {
+            Logger::debug(__CLASS__, __FUNCTION__, "RADIUS: Could not put int for second framed protocol (" . radius_strerror($res) . ")");
+            return false;
+        }
+    }
+
+    /**
+     * @param string $login
+     * @param string $pass
+     * @return bool
+     */
+    public function checkPassword($login, $pass)
+    {
+        if (!extension_loaded('radius')) {
+            Logger::logAction("RADIUS: php radius extension is missing, please install it.");
+            return false;
+        }
+        $res = radius_auth_open();
+        $this->prepareRequest($res, $login, $pass);
+        $req = radius_send_request($res);
+        if (!$req) {
+            Logger::debug(__CLASS__, __FUNCTION__, "RADIUS: Could not send request (" . radius_strerror($res) . ")");
+            return false;
+        }
+        switch ($req) {
+            case RADIUS_ACCESS_ACCEPT:
+                Logger::debug(__CLASS__, __FUNCTION__, "RADIUS: authentication for user \"" . $login . "\" successful");
+                radius_close($res);
+                return true;
+            case RADIUS_ACCESS_REJECT:
+                Logger::logAction("RADIUS: authentication for user \"" . $login . "\" failed");
+                break;
+            default:
+                Logger::debug(__CLASS__, __FUNCTION__, "RADIUS: unknwon return value " . $req);
+                break;
+        }
+        radius_close($res);
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    public function usersEditable()
+    {
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    public function passwordsEditable()
+    {
+        return false;
+    }
+
+    /**
+     * @param $login
+     * @param $passwd
+     */
+    public function createUser($login, $passwd)
+    {
+    }
+
+    /**
+     * @param $login
+     * @param $newPass
+     */
+    public function changePassword($login, $newPass)
+    {
+    }
+
+    /**
+     * @param $login
+     */
+    public function deleteUser($login)
+    {
+    }
+
+    /**
+     * @param $login
+     * @return string
+     */
+    public function getUserPass($login)
+    {
+        return "";
+    }
+}
diff --git a/core/src/plugins/auth.radius/class.radiusAuthDriver.php b/core/src/plugins/auth.radius/class.radiusAuthDriver.php
deleted file mode 100644
index eefe97537c..0000000000
--- a/core/src/plugins/auth.radius/class.radiusAuthDriver.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-defined('AJXP_EXEC') or die('Access not allowed');
-/**
- * Authenticates user against an RADIUS server
- * @package AjaXplorer_Plugins
- * @subpackage Auth
- */
-class radiusAuthDriver extends AbstractAuthDriver
-{
-    public $driverName = "radius";
-    public $radiusServer;
-    public $radiusPort = 1812;
-    public $radiusSecret;
-    public $radiusAuthType = 'chap';
-    public function init($options)
-    {
-        parent::init($options);
-        $this->radiusServer = $options["RADIUS Server"];
-        if ($options["RADIUS Port"])
-            $this->radiusPort = $options["RADIUS Port"];
-        if ($options["RADIUS Shared Secret"])
-            $this->radiusSecret = $options["RADIUS Shared Secret"];
-        if ($options["RADIUS Auth Type"])
-            $this->radiusAuthType = $options["RADIUS Auth Type"];
-    }
-    public function testRADIUSConnection($options)
-    {
-        $this->radiusServer = $options["RADIUS Server"];
-        if ($options["RADIUS Port"])
-            $this->radiusPort = $options["RADIUS Port"];
-        if ($options["RADIUS Shared Secret"])
-            $this->radiusSecret = $options["RADIUS Shared Secret"];
-        if ($options["RADIUS Auth Type"])
-            $this->radiusAuthType = $options["RADIUS Auth Type"];
-        if (!extension_loaded('radius')) {
-            return "ERROR: PHP radius extension is missing. Do NOT enable RADIUS authentication unless you installed the extension!";
-        }
-        $res = radius_auth_open();
-        $this->prepareRequest($res, $options["RADIUS Test-User"], $options["RADIUS Test-Password"], -1);
-        $req = radius_send_request($res);
-        if (!$req) {
-            return "ERROR: Could not send RADIUS request to server";
-        }
-        switch ($req) {
-            case RADIUS_ACCESS_ACCEPT:
-                radius_close($res);
-                return "SUCCESS: Sucessfully authenticated.";
-            case RADIUS_ACCESS_REJECT:
-                radius_close($res);
-                return "ERROR: Could connect but user was rejected (Verify correct test user/password).";
-            default:
-                radius_close($res);
-                return "ERROR: Server responded with an unknown code.";
-        }
-    }
-    public function listUsers($baseGroup = "/", $recursive = true)
-    {
-        $adminUser = $this->options["AJXP_ADMIN_LOGIN"];
-        return array(
-            $adminUser => $adminUser
-        );
-    }
-    public function userExists($login)
-    {
-        return true;
-    }
-    public function logoutCallback($actionName, $httpVars, $fileVars)
-    {
-        AJXP_Safe::clearCredentials();
-        $adminUser = $this->options["AJXP_ADMIN_LOGIN"];
-        AuthService::disconnect();
-        session_write_close();
-        AJXP_XMLWriter::header();
-        AJXP_XMLWriter::loggingResult(2);
-        AJXP_XMLWriter::close();
-    }
-    public function prepareRequest($res, $login, $pass, $seed)
-    {
-        if (!radius_add_server($res, $this->radiusServer, $this->radiusPort, $this->radiusSecret, 3, 3)) {
-            AJXP_Logger::debug(__CLASS__,__FUNCTION__,"RADIUS: Could not add server (" . radius_strerror($res) . ")");
-            return false;
-        }
-        if (!radius_create_request($res, RADIUS_ACCESS_REQUEST)) {
-            AJXP_Logger::debug(__CLASS__,__FUNCTION__,"RADIUS: Could not create request (" . radius_strerror($res) . ")");
-            return false;
-        }
-        if (!radius_put_string($res, RADIUS_NAS_IDENTIFIER, isset($_SERVER["SERVER_NAME"]) ? $_SERVER["SERVER_NAME"] : 'localhost')) {
-            AJXP_Logger::debug(__CLASS__,__FUNCTION__,"RADIUS: Could not put string for nas_identifier (" . radius_strerror($res) . ")");
-            return false;
-        }
-        if (!radius_put_int($res, RADIUS_SERVICE_TYPE, RADIUS_FRAMED)) {
-            AJXP_Logger::debug(__CLASS__,__FUNCTION__,"RADIUS: Could not put int for service_type (" . radius_strerror($res) . ")");
-            return false;
-        }
-        if (!radius_put_int($res, RADIUS_FRAMED_PROTOCOL, RADIUS_PPP)) {
-            AJXP_Logger::debug(__CLASS__,__FUNCTION__,"RADIUS: Could not put int for framed_protocol (" . radius_strerror($res) . ")");
-            return false;
-        }
-        if (!radius_put_string($res, RADIUS_CALLING_STATION_ID, isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '127.0.0.1') == -1) {
-            AJXP_Logger::debug(__CLASS__,__FUNCTION__,"RADIUS: Could not put string for calling_station_id (" . radius_strerror($res) . ")");
-            return false;
-        }
-        if (!radius_put_string($res, RADIUS_USER_NAME, $login)) {
-            AJXP_Logger::debug(__CLASS__,__FUNCTION__,"RADIUS: Could not put string for user name (" . radius_strerror($res) . ")");
-            return false;
-        }
-        if ($this->radiusAuthType == 'chap') {
-            AJXP_Logger::debug(__CLASS__,__FUNCTION__,"RADIUS: Using CHAP.");
-            mt_srand(time());
-            $chall   = mt_rand();
-            $chapval = pack('H*', md5(pack('Ca*', 1, $pass . $chall)));
-            $pass    = pack('C', 1) . $chapval;
-            if (!radius_put_attr($res, RADIUS_CHAP_PASSWORD, $pass)) {
-                AJXP_Logger::debug(__CLASS__,__FUNCTION__,"RADIUS: Could not put attribute for chap password (" . radius_strerror($res) . ")");
-                return false;
-            }
-            if (!radius_put_attr($res, RADIUS_CHAP_CHALLENGE, $chall)) {
-                AJXP_Logger::debug(__CLASS__,__FUNCTION__,"RADIUS: Could not put attribute for chap callenge (" . radius_strerror($res) . ")");
-                return false;
-            }
-        } else {
-            AJXP_Logger::debug(__CLASS__,__FUNCTION__,"RADIUS: Using PAP.");
-            if (!radius_put_string($res, RADIUS_USER_PASSWORD, $pass)) {
-                AJXP_Logger::debug(__CLASS__,__FUNCTION__,"RADIUS: Could not put string for pap password (" . radius_strerror($res) . ")");
-                return false;
-            }
-        }
-        if (!radius_put_int($res, RADIUS_SERVICE_TYPE, RADIUS_FRAMED)) {
-            AJXP_Logger::debug(__CLASS__,__FUNCTION__,"RADIUS: Could not put int for second service type (" . radius_strerror($res) . ")");
-            return false;
-        }
-        if (!radius_put_int($res, RADIUS_FRAMED_PROTOCOL, RADIUS_PPP)) {
-            AJXP_Logger::debug(__CLASS__,__FUNCTION__,"RADIUS: Could not put int for second framed protocol (" . radius_strerror($res) . ")");
-            return false;
-        }
-    }
-    public function checkPassword($login, $pass, $seed)
-    {
-        if (!extension_loaded('radius')) {
-            AJXP_Logger::logAction("RADIUS: php radius extension is missing, please install it.");
-            return false;
-        }
-        $res = radius_auth_open();
-        $this->prepareRequest($res, $login, $pass, $seed);
-        $req = radius_send_request($res);
-        if (!$req) {
-            AJXP_Logger::debug(__CLASS__,__FUNCTION__,"RADIUS: Could not send request (" . radius_strerror($res) . ")");
-            return false;
-        }
-        switch ($req) {
-            case RADIUS_ACCESS_ACCEPT:
-                AJXP_Logger::debug(__CLASS__,__FUNCTION__,"RADIUS: authentication for user \"" . $login . "\" successful");
-                radius_close($res);
-                return true;
-            case RADIUS_ACCESS_REJECT:
-                AJXP_Logger::logAction("RADIUS: authentication for user \"" . $login . "\" failed");
-                break;
-            default:
-                AJXP_Logger::debug(__CLASS__,__FUNCTION__,"RADIUS: unknwon return value " . $req);
-                break;
-        }
-        radius_close($res);
-        return false;
-    }
-    public function usersEditable()
-    {
-        return false;
-    }
-    public function passwordsEditable()
-    {
-        return false;
-    }
-    public function createUser($login, $passwd)
-    {
-    }
-    public function changePassword($login, $newPass)
-    {
-    }
-    public function deleteUser($login)
-    {
-    }
-    public function getUserPass($login)
-    {
-        return "";
-    }
-}
diff --git a/core/src/plugins/auth.radius/i18n/conf/de.php b/core/src/plugins/auth.radius/i18n/conf/de.php
index f729664f2c..98239a5304 100644
--- a/core/src/plugins/auth.radius/i18n/conf/de.php
+++ b/core/src/plugins/auth.radius/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "RADIUS Authentication" => "RADIUS-Authentifizierung",
diff --git a/core/src/plugins/auth.radius/i18n/conf/en.php b/core/src/plugins/auth.radius/i18n/conf/en.php
index d2e5964a59..cdfe095465 100644
--- a/core/src/plugins/auth.radius/i18n/conf/en.php
+++ b/core/src/plugins/auth.radius/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "RADIUS Authentication" => "RADIUS Authentication",
diff --git a/core/src/plugins/auth.radius/i18n/conf/fr.php b/core/src/plugins/auth.radius/i18n/conf/fr.php
index e6418da5e6..66d4d51a3c 100644
--- a/core/src/plugins/auth.radius/i18n/conf/fr.php
+++ b/core/src/plugins/auth.radius/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "RADIUS Authentication" => "Authentification RADIUS",
diff --git a/core/src/plugins/auth.radius/i18n/conf/it.php b/core/src/plugins/auth.radius/i18n/conf/it.php
index 213fb19892..0e28697df8 100644
--- a/core/src/plugins/auth.radius/i18n/conf/it.php
+++ b/core/src/plugins/auth.radius/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "RADIUS Authentication" => "Autenticazione RADIUS",
diff --git a/core/src/plugins/auth.radius/manifest.xml b/core/src/plugins/auth.radius/manifest.xml
index b7a8612830..97fdacd3f9 100644
--- a/core/src/plugins/auth.radius/manifest.xml
+++ b/core/src/plugins/auth.radius/manifest.xml
@@ -15,7 +15,7 @@
     <param type="button" name="TEST_RADIUS" choices="run_plugin_action:auth.radius:testRADIUSConnection" label="CONF_MESSAGE[Test Connection]" description="CONF_MESSAGE[Try to connect to RADIUS server]" mandatory="false"/>
 
 	</server_settings>
-	<class_definition filename="plugins/auth.radius/class.radiusAuthDriver.php" classname="radiusAuthDriver"/>
+	<class_definition filename="plugins/auth.radius/RadiusAuthDriver.php" classname="Pydio\Auth\Driver\RadiusAuthDriver"/>
 	<registry_contributions>
 		<external_file filename="plugins/core.auth/standard_auth_actions.xml" include="actions/*" exclude=""/>
 	</registry_contributions>
diff --git a/core/src/plugins/auth.remote/RemoteAuthDriver.php b/core/src/plugins/auth.remote/RemoteAuthDriver.php
new file mode 100644
index 0000000000..f39984d105
--- /dev/null
+++ b/core/src/plugins/auth.remote/RemoteAuthDriver.php
@@ -0,0 +1,375 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Auth\Driver;
+
+use DOMElement;
+use Pydio\Auth\Core\AbstractAuthDriver;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Model\UserInterface;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Utils\FileHelper;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\PasswordEncoder;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Plugin to bridge authentication between Ajxp and external CMS
+ *  This class works in 2 modes (master / slave)
+ * It requires the following arguments:
+ * - SLAVE_MODE
+ * - LOGIN_URL
+ * - LOGOUT_URL
+ * - SECRET
+ * - USERS_FILEPATH (the users.ser filepath)
+ *
+ * In master mode, the login dialog is still displayed in AJXP.
+ * When the user attempt a login, the given credential are sent back to the given remote URL.
+ * The LOGIN_URL is called as GET LOGIN_URL?name=<entered_user_name>&pass=<entered_password>&key=MD5(name.password.SECRET)
+ * The method must return a valid PHP serialized object for us to continue (see below)
+ *
+ * In slave mode, the login dialog is not displayed in AJXP.
+ * If the user directly go to the main page, (s)he's redirected to the LOGIN_URL.
+ * The logout button isn't displayed either, a back button linking to LOGOUT_URL is used instead.
+ * The user will log in on the remote site, and the remote script will call us, as GET ajxpPath/plugins/auth.remote/login.php?object=<serialized object>&key=MD5(object.SECRET)
+ *
+ * The serialized object contains the same data as the serialAuthDriver.
+ *
+ * @package AjaXplorer_Plugins
+ * @subpackage Auth
+ */
+class RemoteAuthDriver extends AbstractAuthDriver
+{
+    public $usersSerFile;
+    /** The current authentication mode */
+    public $slaveMode;
+    /** The current secret */
+    public $secret;
+    /** The current url array */
+    public $urls;
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        // Migrate new version of the options
+        if (isSet($options["CMS_TYPE"])) {
+            // Transform MASTER_URL + LOGIN_URI to MASTER_HOST, MASTER_URI, LOGIN_URL, LOGOUT_URI
+            $options["SLAVE_MODE"] = "false";
+            $cmsOpts = $options["CMS_TYPE"];
+            if ($cmsOpts["cms"] != "custom") {
+                $loginURI = $cmsOpts["LOGIN_URI"];
+                if (strpos($cmsOpts["MASTER_URL"], "http") === 0) {
+                    $parse = parse_url($cmsOpts["MASTER_URL"]);
+                    $rootHost = $parse["host"];
+                    $rootURI = $parse["path"];
+                } else {
+                    $rootHost = "";
+                    $rootURI = $cmsOpts["MASTER_URL"];
+                }
+                $cmsOpts["MASTER_HOST"] = $rootHost;
+                $cmsOpts["LOGIN_URL"] = $cmsOpts["MASTER_URI"] = InputFilter::securePath("/" . $rootURI . "/" . $loginURI);
+                $logoutAction = $cmsOpts["LOGOUT_ACTION"];
+                switch ($cmsOpts["cms"]) {
+                    case "wp":
+                        $cmsOpts["LOGOUT_URL"] = ($logoutAction == "back" ? $cmsOpts["MASTER_URL"] : $cmsOpts["MASTER_URL"] . "/wp-login.php?action=logout");
+                        break;
+                    case "joomla":
+                        $cmsOpts["LOGOUT_URL"] = $cmsOpts["LOGIN_URL"];
+                        break;
+                    case "drupal":
+                        $cmsOpts["LOGOUT_URL"] = ($logoutAction == "back" ? $cmsOpts["LOGIN_URL"] : $cmsOpts["MASTER_URL"] . "/user/logout");
+                        break;
+                    default:
+                        break;
+                }
+            }
+            $options = array_merge($options, $cmsOpts);
+        }
+
+        $this->slaveMode = $options["SLAVE_MODE"] == "true";
+        if ($this->slaveMode && ConfService::getContextConf($ctx, "ALLOW_GUEST_BROWSING", "auth")) {
+            $contribs = $this->getXPath()->query("registry_contributions/external_file");
+            /** @var DOMElement $contribNode */
+            foreach ($contribs as $contribNode) {
+                if ($contribNode->getAttribute('filename') == 'plugins/core.auth/standard_auth_actions.xml') {
+                    $contribNode->parentNode->removeChild($contribNode);
+                }
+            }
+        }
+        parent::init($ctx, $options);
+        $options = $this->options;
+
+        $this->usersSerFile = $options["USERS_FILEPATH"];
+        $this->secret = $options["SECRET"];
+        $this->urls = array($options["LOGIN_URL"], $options["LOGOUT_URL"]);
+    }
+
+    /**
+     * Wether users can be listed using offset and limit
+     * @return bool
+     */
+    public function supportsUsersPagination()
+    {
+        return true;
+    }
+
+    /**
+     *
+     * @param string $baseGroup
+     * @param bool $recursive
+     * @return UserInterface[]
+     */
+    public function listUsers($baseGroup = "/", $recursive = true)
+    {
+        $users = FileHelper::loadSerialFile($this->usersSerFile);
+        if (UsersService::ignoreUserCase()) {
+            $users = array_combine(array_map("strtolower", array_keys($users)), array_values($users));
+        }
+        ksort($users);
+        return $users;
+    }
+
+    /**
+     * List users using offsets
+     * @param string $baseGroup
+     * @param string $regexp
+     * @param int $offset
+     * @param int $limit
+     * @param bool $recursive
+     * @return UserInterface[]
+     */
+    public function listUsersPaginated($baseGroup, $regexp, $offset = -1, $limit = -1, $recursive = true)
+    {
+        $users = $this->listUsers();
+        $result = array();
+        $index = 0;
+        foreach ($users as $usr => $pass) {
+            if (!empty($regexp) && !preg_match("/$regexp/i", $usr)) {
+                continue;
+            }
+            if ($offset != -1 && $index < $offset) {
+                $index++;
+                continue;
+            }
+            $result[$usr] = $pass;
+            $index++;
+            if ($limit != -1 && count($result) >= $limit) break;
+        }
+        return $result;
+    }
+
+    /**
+     * @param string $baseGroup
+     * @param string $regexp
+     * @param null|string $filterProperty Can be "admin" or "parent"
+     * @param null|string $filterValue Can be a user Id, or AJXP_FILTER_EMPTY or AJXP_FILTER_NOT_EMPTY
+     * @param bool $recursive
+     * @return int
+     */
+    public function getUsersCount($baseGroup = "/", $regexp = "", $filterProperty = null, $filterValue = null, $recursive = true)
+    {
+        return count($this->listUsersPaginated($baseGroup, $regexp));
+    }
+
+
+    /**
+     * @param $login
+     * @return boolean
+     */
+    public function userExists($login)
+    {
+        $users = $this->listUsers();
+        if (UsersService::ignoreUserCase()) $login = strtolower($login);
+        if (!is_array($users) || !array_key_exists($login, $users)) return false;
+        return true;
+    }
+
+    /**
+     * @param string $login
+     * @param string $pass
+     * @return bool
+     */
+    public function checkPassword($login, $pass)
+    {
+        if (UsersService::ignoreUserCase()) $login = strtolower($login);
+        global $AJXP_GLUE_GLOBALS;
+        if (isSet($AJXP_GLUE_GLOBALS) || (!empty($this->options["LOCAL_PREFIX"]) && strpos($login, $this->options["LOCAL_PREFIX"]) === 0)) {
+            $userStoredPass = $this->getUserPass($login);
+            if (!$userStoredPass) return false;
+            return PasswordEncoder::pbkdf2_validate_password($pass, $userStoredPass);// ($userStoredPass == md5($pass));
+        } else {
+            $crtSessionId = session_id();
+            session_write_close();
+
+            if (!empty($this->options["MASTER_HOST"])) {
+                $host = $this->options["MASTER_HOST"];
+            } else {
+                $host = $_SERVER["HTTP_HOST"];
+            }
+            $formId = "";
+            if (isSet($this->options["MASTER_AUTH_FORM_ID"])) {
+                $formId = $this->options["MASTER_AUTH_FORM_ID"];
+            }
+            $uri = $this->options["MASTER_URI"];
+            $funcName = $this->options["MASTER_AUTH_FUNCTION"];
+            require_once 'cms_auth_functions.php';
+            if (function_exists($funcName)) {
+                Logger::debug("auth.remote", "Requesting authentication from remote CMS using function ".$funcName);
+                $sessCookies = call_user_func($funcName, $host, $uri, $login, $pass, $formId);
+                if ($sessCookies != "") {
+                    if (is_array($sessCookies)) {
+                        $sessid = $sessCookies["AjaXplorer"];
+                        session_id($sessid);
+                        session_start();
+                        if (!$this->slaveMode) {
+                            foreach ($sessCookies as $k => $v) {
+                                if ($k == "AjaXplorer") continue;
+                                setcookie($k, urldecode($v), 0, $uri);
+                            }
+                        }
+                    } else if (is_string($sessCookies)) {
+                        session_id($sessCookies);
+                        session_start();
+                    }
+                    Logger::debug("auth.remote", "Got cookies from remote authentication");
+                    return true;
+                }
+
+                $sessid = call_user_func($funcName, $host, $uri, $login, $pass, $formId);
+                if ($sessid != "") {
+                    session_id($sessid);
+                    session_start();
+                    return true;
+                }
+            }
+            Logger::debug("auth.remote", "No remote authentication from CMS succeeded, checking in local directory");
+            // NOW CHECK IN LOCAL USERS LIST
+            $userStoredPass = $this->getUserPass($login);
+            if (!$userStoredPass) return false;
+            $res = PasswordEncoder::pbkdf2_validate_password($pass, $userStoredPass);
+            if ($res) {
+                session_id($crtSessionId);
+                session_start();
+                return true;
+            }
+            return false;
+        }
+    }
+
+    /**
+     * @param string $login
+     * @return string
+     */
+    public function createCookieString($login)
+    {
+        $userPass = $this->getUserPass($login);
+        return md5($login . ":" . $userPass . ":ajxp");
+    }
+
+    /**
+     * @return bool
+     */
+    public function usersEditable()
+    {
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function passwordsEditable()
+    {
+        return false;
+    }
+
+    /**
+     * @param $login
+     * @param $passwd
+     */
+    public function createUser($login, $passwd)
+    {
+        if (UsersService::ignoreUserCase()) $login = strtolower($login);
+        $users = $this->listUsers();
+        if (!is_array($users)) $users = array();
+        if (array_key_exists($login, $users)) return;
+        $users[$login] = PasswordEncoder::pbkdf2_create_hash($passwd);
+        FileHelper::saveSerialFile($this->usersSerFile, $users);
+    }
+
+    /**
+     * @param $login
+     * @param $newPass
+     */
+    public function changePassword($login, $newPass)
+    {
+        if (UsersService::ignoreUserCase()) $login = strtolower($login);
+        $users = $this->listUsers();
+        if (!is_array($users) || !array_key_exists($login, $users)) return;
+        $users[$login] = PasswordEncoder::pbkdf2_create_hash($newPass);
+        FileHelper::saveSerialFile($this->usersSerFile, $users);
+    }
+
+    /**
+     * @param $login
+     */
+    public function deleteUser($login)
+    {
+        if (UsersService::ignoreUserCase()) $login = strtolower($login);
+        $users = $this->listUsers();
+        if (is_array($users) && array_key_exists($login, $users)) {
+            unset($users[$login]);
+            FileHelper::saveSerialFile($this->usersSerFile, $users);
+        }
+    }
+
+    /**
+     * @param $login
+     * @return bool|UserInterface
+     */
+    public function getUserPass($login)
+    {
+        if (!$this->userExists($login)) return false;
+        $users = $this->listUsers();
+        return $users[$login];
+    }
+
+    /**
+     * @return bool
+     */
+    public function getLoginRedirect()
+    {
+        return parent::getLoginRedirect();
+    }
+
+    /**
+     * @return bool
+     */
+    public function getLogoutRedirect()
+    {
+        return $this->urls[1];
+    }
+
+}
diff --git a/core/src/plugins/auth.remote/class.remoteAuthDriver.php b/core/src/plugins/auth.remote/class.remoteAuthDriver.php
deleted file mode 100644
index 20c6775626..0000000000
--- a/core/src/plugins/auth.remote/class.remoteAuthDriver.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * AJXP_Plugin to bridge authentication between Ajxp and external CMS
- *  This class works in 2 modes (master / slave)
-    It requires the following arguments:
-       - SLAVE_MODE
-       - LOGIN_URL
-       - LOGOUT_URL
-       - SECRET
-       - USERS_FILEPATH (the users.ser filepath)
-
-    In master mode, the login dialog is still displayed in AJXP.
-       When the user attempt a login, the given credential are sent back to the given remote URL.
-       The LOGIN_URL is called as GET LOGIN_URL?name=<entered_user_name>&pass=<entered_password>&key=MD5(name.password.SECRET)
-       The method must return a valid PHP serialized object for us to continue (see below)
-
-    In slave mode, the login dialog is not displayed in AJXP.
-    If the user directly go to the main page, (s)he's redirected to the LOGIN_URL.
-    The logout button isn't displayed either, a back button linking to LOGOUT_URL is used instead.
-    The user will log in on the remote site, and the remote script will call us, as GET ajxpPath/plugins/auth.remote/login.php?object=<serialized object>&key=MD5(object.SECRET)
-
-    The serialized object contains the same data as the serialAuthDriver.
- *
- * @package AjaXplorer_Plugins
- * @subpackage Auth
- */
-class remoteAuthDriver extends AbstractAuthDriver
-{
-    public $usersSerFile;
-    /** The current authentication mode */
-    public $slaveMode;
-    /** The current secret */
-    public $secret;
-    /** The current url array */
-    public $urls;
-
-    public function init($options)
-    {
-        // Migrate new version of the options
-        if (isSet($options["CMS_TYPE"])) {
-            // Transform MASTER_URL + LOGIN_URI to MASTER_HOST, MASTER_URI, LOGIN_URL, LOGOUT_URI
-            $options["SLAVE_MODE"] = "false";
-            $cmsOpts = $options["CMS_TYPE"];
-            if ($cmsOpts["cms"] != "custom") {
-                $loginURI = $cmsOpts["LOGIN_URI"];
-                if (strpos($cmsOpts["MASTER_URL"], "http") === 0) {
-                    $parse = parse_url($cmsOpts["MASTER_URL"]);
-                    $rootHost = $parse["host"];
-                    $rootURI = $parse["path"];
-                } else {
-                    $rootHost = "";
-                    $rootURI = $cmsOpts["MASTER_URL"];
-                }
-                $cmsOpts["MASTER_HOST"] = $rootHost;
-                $cmsOpts["LOGIN_URL"] = $cmsOpts["MASTER_URI"] = AJXP_Utils::securePath("/".$rootURI."/".$loginURI);
-                $logoutAction = $cmsOpts["LOGOUT_ACTION"];
-                switch ($cmsOpts["cms"]) {
-                    case "wp":
-                        $cmsOpts["LOGOUT_URL"] = ($logoutAction == "back" ? $cmsOpts["MASTER_URL"] : $cmsOpts["MASTER_URL"]."/wp-login.php?action=logout");
-                        break;
-                    case "joomla":
-                        $cmsOpts["LOGOUT_URL"] = $cmsOpts["LOGIN_URL"];
-                        break;
-                    case "drupal":
-                        $cmsOpts["LOGOUT_URL"] = ($logoutAction == "back" ? $cmsOpts["LOGIN_URL"] : $cmsOpts["MASTER_URL"]."/user/logout");
-                        break;
-                    default:
-                        break;
-                }
-            }
-            $options = array_merge($options, $cmsOpts);
-        }
-
-        $this->slaveMode = $options["SLAVE_MODE"] == "true";
-        if ($this->slaveMode && ConfService::getCoreConf("ALLOW_GUEST_BROWSING", "auth")) {
-            $contribs = $this->getXPath()->query("registry_contributions/external_file");
-            foreach ($contribs as $contribNode) {
-                if ($contribNode->getAttribute('filename') == 'plugins/core.auth/standard_auth_actions.xml') {
-                    $contribNode->parentNode->removeChild($contribNode);
-                }
-            }
-        }
-        parent::init($options);
-        $options = $this->options;
-
-        $this->usersSerFile = $options["USERS_FILEPATH"];
-        $this->secret = $options["SECRET"];
-        $this->urls = array($options["LOGIN_URL"], $options["LOGOUT_URL"]);
-    }
-
-    public function supportsUsersPagination()
-    {
-        return true;
-    }
-
-    public function listUsers($baseGroup = "/", $recursive = true)
-    {
-        $users = AJXP_Utils::loadSerialFile($this->usersSerFile);
-        if (AuthService::ignoreUserCase()) {
-            $users = array_combine(array_map("strtolower", array_keys($users)), array_values($users));
-        }
-        ksort($users);
-        return $users;
-    }
-
-    public function listUsersPaginated($baseGroup, $regexp, $offset = -1 , $limit = -1, $recursive = true)
-    {
-        $users = $this->listUsers();
-        $result = array();
-        $index = 0;
-        foreach ($users as $usr => $pass) {
-            if (!empty($regexp) && !preg_match("/$regexp/i", $usr)) {
-                continue;
-            }
-            if ($offset != -1 && $index < $offset) {
-                $index ++;
-                continue;
-            }
-            $result[$usr] = $pass;
-            $index ++;
-            if($limit != -1 && count($result) >= $limit) break;
-        }
-        return $result;
-    }
-    public function getUsersCount($baseGroup = "/", $regexp = "", $filterProperty = null, $filterValue = null, $recursive=true)
-    {
-        return count($this->listUsersPaginated($baseGroup, $regexp));
-    }
-
-
-    public function userExists($login)
-    {
-        $users = $this->listUsers();
-        if(AuthService::ignoreUserCase()) $login = strtolower($login);
-        if(!is_array($users) || !array_key_exists($login, $users)) return false;
-        return true;
-    }
-
-    public function checkPassword($login, $pass, $seed)
-    {
-        if(AuthService::ignoreUserCase()) $login = strtolower($login);
-        global $AJXP_GLUE_GLOBALS;
-        if (isSet($AJXP_GLUE_GLOBALS) || (!empty($this->options["LOCAL_PREFIX"]) && strpos($login, $this->options["LOCAL_PREFIX"]) === 0) ) {
-            $userStoredPass = $this->getUserPass($login);
-            if(!$userStoredPass) return false;
-            if ($seed == "-1") { // Seed = -1 means that password is not encoded.
-                return  AJXP_Utils::pbkdf2_validate_password($pass, $userStoredPass);// ($userStoredPass == md5($pass));
-            } else {
-                return (md5($userStoredPass.$seed) === $pass);
-            }
-        } else {
-            $crtSessionId = session_id();
-            session_write_close();
-            $host = "";
-            if (isSet($this->options["MASTER_HOST"])) {
-                $host = $this->options["MASTER_HOST"];
-            } else {
-                $host = parse_url($_SERVER["SERVER_ADDR"], PHP_URL_HOST);
-            }
-            $formId = "";
-            if (isSet($this->options["MASTER_AUTH_FORM_ID"])) {
-                $formId = $this->options["MASTER_AUTH_FORM_ID"];
-            }
-            $uri = $this->options["MASTER_URI"];
-            $funcName = $this->options["MASTER_AUTH_FUNCTION"];
-            require_once 'cms_auth_functions.php';
-            if (function_exists($funcName)) {
-                $sessCookies = call_user_func($funcName, $host, $uri, $login, $pass, $formId);
-                if ($sessCookies != "") {
-                    if (is_array($sessCookies)) {
-                        $sessid = $sessCookies["AjaXplorer"];
-                        session_id($sessid);
-                        session_start();
-                        if (!$this->slaveMode) {
-                            foreach ($sessCookies as $k => $v) {
-                                if($k == "AjaXplorer") continue;
-                                setcookie($k, urldecode($v), 0, $uri);
-                            }
-                        }
-                    } else if (is_string($sessCookies)) {
-                        session_id($sessCookies);
-                        session_start();
-                    }
-                    return true;
-                }
-
-                $sessid = call_user_func($funcName, $host, $uri, $login, $pass, $formId);
-                if ($sessid != "") {
-                    session_id($sessid);
-                    session_start();
-                    return true;
-                }
-            }
-            // NOW CHECK IN LOCAL USERS LIST
-            $userStoredPass = $this->getUserPass($login);
-            if(!$userStoredPass) return false;
-            if ($seed == "-1") { // Seed = -1 means that password is not encoded.
-                $res = AJXP_Utils::pbkdf2_validate_password($pass, $userStoredPass); //($userStoredPass == md5($pass));
-            } else {
-                $res = (md5($userStoredPass.$seed) === $pass);
-            }
-            if ($res) {
-                session_id($crtSessionId);
-                session_start();
-                return true;
-            }
-            return false;
-        }
-    }
-
-    public function createCookieString($login)
-    {
-        $userPass = $this->getUserPass($login);
-        return md5($login.":".$userPass.":ajxp");
-    }
-
-    public function usersEditable()
-    {
-        return true;
-    }
-    public function passwordsEditable()
-    {
-        return false;
-    }
-
-    public function createUser($login, $passwd)
-    {
-        if(AuthService::ignoreUserCase()) $login = strtolower($login);
-        $users = $this->listUsers();
-        if(!is_array($users)) $users = array();
-        if(array_key_exists($login, $users)) return "exists";
-        if ($this->getOptionAsBool("TRANSMIT_CLEAR_PASS")) {
-            $users[$login] = AJXP_Utils::pbkdf2_create_hash($passwd);
-        } else {
-            $users[$login] = $passwd;
-        }
-        AJXP_Utils::saveSerialFile($this->usersSerFile, $users);
-    }
-    public function changePassword($login, $newPass)
-    {
-        if(AuthService::ignoreUserCase()) $login = strtolower($login);
-        $users = $this->listUsers();
-        if(!is_array($users) || !array_key_exists($login, $users)) return ;
-        if ($this->getOptionAsBool("TRANSMIT_CLEAR_PASS")) {
-            $users[$login] = AJXP_Utils::pbkdf2_create_hash($newPass);
-        } else {
-            $users[$login] = $newPass;
-        }
-        AJXP_Utils::saveSerialFile($this->usersSerFile, $users);
-    }
-    public function deleteUser($login)
-    {
-        if(AuthService::ignoreUserCase()) $login = strtolower($login);
-        $users = $this->listUsers();
-        if (is_array($users) && array_key_exists($login, $users)) {
-            unset($users[$login]);
-            AJXP_Utils::saveSerialFile($this->usersSerFile, $users);
-        }
-    }
-
-    public function getUserPass($login)
-    {
-        if(!$this->userExists($login)) return false;
-        $users = $this->listUsers();
-        return $users[$login];
-    }
-
-    public function getLoginRedirect()
-    {
-        return parent::getLoginRedirect();
-    }
-
-    public function getLogoutRedirect()
-    {
-        return $this->urls[1];
-    }
-
-}
diff --git a/core/src/plugins/auth.remote/cms_auth_functions.php b/core/src/plugins/auth.remote/cms_auth_functions.php
index 48e7a9d40a..5f12d89371 100644
--- a/core/src/plugins/auth.remote/cms_auth_functions.php
+++ b/core/src/plugins/auth.remote/cms_auth_functions.php
@@ -16,11 +16,12 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  *
  * This functions are necessary to implement the bridge between Pydio
  * and other CMS's.
  */
+use Pydio\Log\Core\Logger;
 
 /**
  * @package AjaXplorer_Plugins
@@ -47,18 +48,32 @@ function extractResponseCookies($client)
     return $cookies;
 }
 
+/**
+ * @param $host
+ * @param $uri
+ * @param $login
+ * @param $pass
+ * @param string $formId
+ * @return array|string
+ * @throws \Pydio\Core\Exception\PydioException
+ */
 function wordpress_remote_auth($host, $uri, $login, $pass, $formId = "")
 {
+    require_once(AJXP_BIN_FOLDER."/lib/HttpClient.php");
     $client = new HttpClient($host);
     $client->setHandleRedirects(false);
     $client->setHeadersOnly(true);
     $client->setCookies(array("wordpress_test_cookie"=>"WP+Cookie+check"));
-    $res = $client->post($uri, array(
+    $client->post($uri, array(
         "log" => $login,
         "pwd" => $pass,
         "wp-submit" => "Log In",
         "testcookie" => 1)
     );
+    $err = $client->getError();
+    if(!empty($err)){
+        throw new \Pydio\Core\Exception\PydioException($err);
+    }
     $newCookies = extractResponseCookies($client);
     if (isSet($newCookies["AjaXplorer"])) {
         return $newCookies;
@@ -66,11 +81,20 @@ function wordpress_remote_auth($host, $uri, $login, $pass, $formId = "")
     return "";
 }
 
+/**
+ * @param $host
+ * @param $uri
+ * @param $login
+ * @param $pass
+ * @param string $formId
+ * @return array|string
+ */
 function joomla_remote_auth($host, $uri, $login, $pass, $formId = "")
 {
+    require_once(AJXP_BIN_FOLDER."/lib/HttpClient.php");
     $client = new HttpClient($host);
     $client->setHandleRedirects(false);
-    $res = $client->get($uri);
+    $client->get($uri);
     $content = $client->getContent();
     $postData = array(
            "username" => $login,
@@ -78,12 +102,14 @@ function joomla_remote_auth($host, $uri, $login, $pass, $formId = "")
            "Submit"   => "Log in",
            "remember" => "yes"
        );
-    $xmlDoc = @DOMDocument::loadHTML($content);
+    $xmlDoc = new DOMDocument();
+    $xmlDoc->loadHTML($content);
     if ($xmlDoc === false) {
         $pos1 = strpos($content, "<form ");
         $pos2 = strpos($content, "</form>", $pos1);
-        $content = substr($content, $pos1, $pos2 + "7" - $pos1);
-        $xmlDoc = @DOMDocument::loadHTML($content);
+        $content = substr($content, $pos1, $pos2 + 7 - $pos1);
+        $xmlDoc = new DOMDocument();
+        $xmlDoc->loadHTML($content);
     }
     if ($xmlDoc !== false) {
            $xPath = new DOMXPath($xmlDoc);
@@ -119,13 +145,23 @@ function joomla_remote_auth($host, $uri, $login, $pass, $formId = "")
     return "";
 }
 
+/**
+ * @param $host
+ * @param $uri
+ * @param $login
+ * @param $pass
+ * @param string $formId
+ * @return array|string
+ */
 function drupal_remote_auth($host, $uri, $login, $pass, $formId = "")
 {
+    require_once(AJXP_BIN_FOLDER."/lib/HttpClient.php");
     $client = new HttpClient($host);
     $client->setHandleRedirects(false);
-    $res = $client->get($uri);
+    $client->get($uri);
     $content = $client->getContent();
-    $xmlDoc = DOMDocument::loadHTML($content);
+    $xmlDoc = new DOMDocument();
+    $xmlDoc->loadHTML($content);
     $xPath = new DOMXPath($xmlDoc);
     if($formId == "") $formId = "user-login-form";
     $nodes = $xPath->query('//form[@id="'.$formId.'"]');
@@ -135,7 +171,7 @@ function drupal_remote_auth($host, $uri, $login, $pass, $formId = "")
     $form = $nodes->item(0);
     $postUri = $form->getAttribute("action");
     $hiddens = $xPath->query('.//input[@type="hidden"]', $form);
-    AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Carry on Drupal hiddens ". $hiddens->length);
+    Logger::debug(__CLASS__,__FUNCTION__,"Carry on Drupal hiddens ". $hiddens->length);
     $postData = array(
         "name" => $login,
         "pass" => $pass,
diff --git a/core/src/plugins/auth.remote/glueCode.php b/core/src/plugins/auth.remote/glueCode.php
index ca171cd49b..bd12d06017 100644
--- a/core/src/plugins/auth.remote/glueCode.php
+++ b/core/src/plugins/auth.remote/glueCode.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  *
  * Description : Interface between Pydio and external software. Handle with care!
  * Take care when using this file. It can't be included anywhere, as it's doing global scope pollution.
@@ -33,6 +33,13 @@
  * @package AjaXplorer_Plugins
  * @subpackage Auth
  */
+use Pydio\Conf\Core\AbstractUser;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\AuthService;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\RolesService;
+use Pydio\Core\Services\UsersService;
+
 global $AJXP_GLUE_GLOBALS;
 if (!isSet($AJXP_GLUE_GLOBALS)) {
     $AJXP_GLUE_GLOBALS = array();
@@ -47,7 +54,17 @@
 if (!class_exists("SessionSwitcher")) {
     require_once("$CURRENTPATH/sessionSwitcher.php");
 }
-$pServ = AJXP_PluginsService::getInstance();
+if (!function_exists("auth_remote_debug")){
+    /**
+     * @param $str
+     */
+    function auth_remote_debug($str){
+        if(AJXP_SERVER_DEBUG){
+            error_log('[Pydio Auth Remote] '.$str);
+        }
+    }
+}
+$pServ = PluginsService::getInstance();
 ConfService::init($FRAMEWORK_PATH);
 ConfService::start();
 $confStorageDriver = ConfService::getConfStorageImpl();
@@ -66,20 +83,27 @@
        die("This file must be included and cannot be called directly");
     }
     if ($_SERVER['PHP_SELF'] != $authPlug->getOption("LOGIN_URL")) {
-       $plugInAction = "WRONG_URL";
+        auth_remote_debug("No secret provided, comparing current URL and login URL parameter is wrong. Please set up a secret key.");
+        $plugInAction = "WRONG_URL";
     }
 } else if ($secret != $authPlug->getOption("SECRET")) {
+    auth_remote_debug("Secret keys are not corresponding. Make sure to setup secret in both CMS plugin and Pydio plugin.");
     $plugInAction = "WRONG_SECRET";
 }
 
 /**
  * @param array $loginData
- * @param AbstractAjxpUser $userObject
+ * @param AbstractUser $userObject
  */
 if(!function_exists("ajxp_gluecode_updateRole")){
 
+    /**
+     * @param $loginData
+     * @param $userObject
+     */
     function ajxp_gluecode_updateRole($loginData, &$userObject)
     {
+        auth_remote_debug("Updating user roles based on mappings");
         $authPlug = ConfService::getAuthDriverImpl();
         if(property_exists($authPlug, "drivers") && is_array($authPlug->drivers) && $authPlug->drivers["remote"]){
             $authPlug = $authPlug->drivers["remote"];
@@ -92,7 +116,7 @@ function ajxp_gluecode_updateRole($loginData, &$userObject)
         foreach ($rolesMap as $value) {
             $parts = explode(":", trim($value));
             $roleId = trim($parts[1]);
-            $roleObject = AuthService::getRole($roleId);
+            $roleObject = RolesService::getRole($roleId);
             if ($roleObject != null) {
                 $newMap[trim($parts[0])] = $roleObject;
                 $userObject->removeRole($roleId);
@@ -113,47 +137,54 @@ function ajxp_gluecode_updateRole($loginData, &$userObject)
 
 switch ($plugInAction) {
     case 'login':
+        auth_remote_debug("Entering 'login' case in glueCode");
         $login = $AJXP_GLUE_GLOBALS["login"]; $autoCreate = $AJXP_GLUE_GLOBALS["autoCreate"];
         if (is_array($login)) {
             $newSession = new SessionSwitcher("AjaXplorer");
+            auth_remote_debug("Entering 'login' case in glueCode");
             $creation = false;
-            if ($autoCreate && !AuthService::userExists($login["name"], "w")) {
+            if ($autoCreate && !UsersService::userExists($login["name"], "w")) {
+                auth_remote_debug("Automatically creating user in Pydio");
                 $creation = true;
                 $isAdmin = (isSet($login["right"]) && $login["right"] == "admin");
-                AuthService::createUser($login["name"], $login["password"], $isAdmin);
-            }
-            if (isSet($AJXP_GLUE_GLOBALS["checkPassword"]) && $AJXP_GLUE_GLOBALS["checkPassword"] === TRUE) {
-                $result = AuthService::logUser($login["name"], $login["password"], false, false, -1);
-            } else {
-                $result = AuthService::logUser($login["name"], $login["password"], true);
+                UsersService::createUser($login["name"], $login["password"], $isAdmin);
             }
-               // Update default rights (this could go in the trunk...)
-               if ($result == 1) {
-                   $userObject = AuthService::getLoggedUser();
-                   if ($userObject->isAdmin()) {
-                       AuthService::updateAdminRights($userObject);
-                   } else {
-                    AuthService::updateDefaultRights($userObject);
-                   }
+            try{
+                if (isSet($AJXP_GLUE_GLOBALS["checkPassword"]) && $AJXP_GLUE_GLOBALS["checkPassword"] === TRUE) {
+                    $userObject = AuthService::logUser($login["name"], $login["password"], false, false);
+                } else {
+                    $userObject = AuthService::logUser($login["name"], $login["password"], true);
+                }
+                auth_remote_debug("User logged to pydio succesfully");
+                if ($userObject->isAdmin()) {
+                    auth_remote_debug("User is admin, updating admin rights");
+                    RolesService::updateAdminRights($userObject);
+                } else {
+                    auth_remote_debug("User is standard, updating default rights");
+                    RolesService::updateDefaultRights($userObject);
+                }
                 if($creation) ajxp_gluecode_updateRole($login, $userObject);
                 $userObject->save("superuser");
-               }
+                AuthService::updateSessionUser($userObject);
+            }catch (\Pydio\Core\Exception\LoginException $l){
+
+            }
         }
         break;
     case 'logout':
+        auth_remote_debug("Entering 'logout' case in glueCode. Should kill pydio session");
         $newSession = new SessionSwitcher("AjaXplorer");
         global $_SESSION;
         $_SESSION = array();
         $result = TRUE;
         break;
     case 'addUser':
+        auth_remote_debug("Entering 'addUser' case in glueCode. Create user in pydio");
         $user = $AJXP_GLUE_GLOBALS["user"];
         if (is_array($user)) {
             $isAdmin = (isSet($user["right"]) && $user["right"] == "admin");
-            AuthService::createUser($user["name"], $user["password"], $isAdmin);
+            $userObject = UsersService::createUser($user["name"], $user["password"], $isAdmin);
             if (isSet($user["roles"])) {
-                $confDriver = ConfService::getConfStorageImpl();
-                $userObject = $confDriver->createUserObject($user["name"]);
                 ajxp_gluecode_updateRole($user, $userObject);
                 $userObject->save("superuser");
             }
@@ -161,19 +192,21 @@ function ajxp_gluecode_updateRole($loginData, &$userObject)
         }
         break;
     case 'delUser':
+        auth_remote_debug("Entering 'delUser' case in glueCode. Delete user from pydio");
         $userName = $AJXP_GLUE_GLOBALS["userName"];
         if (strlen($userName)) {
-            AuthService::deleteUser($userName);
+            UsersService::deleteUser($userName);
             $result = TRUE;
         }
         break;
     case 'updateUser':
+        auth_remote_debug("Entering 'updateUser' case in glueCode. Update user in pydio");
         $user = $AJXP_GLUE_GLOBALS["user"];
         if (is_array($user)) {
-            if (AuthService::userExists($user["name"]) && AuthService::updatePassword($user["name"], $user["password"])) {
+            if (UsersService::userExists($user["name"]) && UsersService::updatePassword($user["name"], $user["password"])) {
                 $isAdmin =  (isSet($user["right"]) && $user["right"] == "admin");
                 $confDriver = ConfService::getConfStorageImpl();
-                $userObject = $confDriver->createUserObject($user["name"]);
+                $userObject = UsersService::getUserById($user["name"], false);
                 $userObject->setAdmin($isAdmin);
                 ajxp_gluecode_updateRole($user, $userObject);
                 $userObject->save("superuser");
diff --git a/core/src/plugins/auth.remote/i18n/conf/de.php b/core/src/plugins/auth.remote/i18n/conf/de.php
index 815b83c5a9..5aeb5cded4 100644
--- a/core/src/plugins/auth.remote/i18n/conf/de.php
+++ b/core/src/plugins/auth.remote/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Remote authentication" => "Remote-Authentifizierung",
diff --git a/core/src/plugins/auth.remote/i18n/conf/en.php b/core/src/plugins/auth.remote/i18n/conf/en.php
index 5ca590f559..121830d41a 100644
--- a/core/src/plugins/auth.remote/i18n/conf/en.php
+++ b/core/src/plugins/auth.remote/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Remote authentication" => "Remote authentication",
diff --git a/core/src/plugins/auth.remote/i18n/conf/fr.php b/core/src/plugins/auth.remote/i18n/conf/fr.php
index f7be6257be..a58148eccc 100644
--- a/core/src/plugins/auth.remote/i18n/conf/fr.php
+++ b/core/src/plugins/auth.remote/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Remote authentication" => "Authentication externe",
diff --git a/core/src/plugins/auth.remote/i18n/conf/it.php b/core/src/plugins/auth.remote/i18n/conf/it.php
index dcc5699857..f7ef8da524 100644
--- a/core/src/plugins/auth.remote/i18n/conf/it.php
+++ b/core/src/plugins/auth.remote/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Remote authentication" => "Autenticazione Remota",
@@ -62,4 +62,4 @@
 "Custom" => "Custom",
 "Back to main page" => "Back to main page",
 "Logout" => "Logout",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/auth.remote/i18n/conf/pt.php b/core/src/plugins/auth.remote/i18n/conf/pt.php
index d5f6959ec9..5141619a17 100644
--- a/core/src/plugins/auth.remote/i18n/conf/pt.php
+++ b/core/src/plugins/auth.remote/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Remote authentication" => "Autenticação Remota",
diff --git a/core/src/plugins/auth.remote/manifest.xml b/core/src/plugins/auth.remote/manifest.xml
index 05582e90f2..d557343d65 100644
--- a/core/src/plugins/auth.remote/manifest.xml
+++ b/core/src/plugins/auth.remote/manifest.xml
@@ -37,7 +37,7 @@
         <param group_switch_name="cms" group_switch_label="CONF_MESSAGE[Custom]" group_switch_value="custom" name="LOGOUT_URL" type="string" label="CONF_MESSAGE[Logout URL]" description="CONF_MESSAGE[Redirect to the given URL on loggin out]" mandatory="false" />
 	    <param group_switch_name="cms" group_switch_label="CONF_MESSAGE[Custom]" group_switch_value="custom" name="MASTER_AUTH_FUNCTION" type="string" label="CONF_MESSAGE[Custom Auth Function]" description="CONF_MESSAGE[User-defined function for performing real password check, necessary for REST API (including iOS client). Add this function inside the plugin cms_auth_functions.php file]" mandatory="true"/>
 	</server_settings>
-	<class_definition filename="plugins/auth.remote/class.remoteAuthDriver.php" classname="remoteAuthDriver"/>
+	<class_definition filename="plugins/auth.remote/RemoteAuthDriver.php" classname="Pydio\Auth\Driver\RemoteAuthDriver"/>
 	<registry_contributions>
 		<external_file filename="plugins/core.auth/standard_auth_actions.xml" include="actions/*"/>
 		<external_file filename="plugins/auth.remote/remoteAuthActions.xml" include="actions/*"/>
diff --git a/core/src/plugins/auth.remote/sessionSwitcher.php b/core/src/plugins/auth.remote/sessionSwitcher.php
index 7fd57850ef..3c78aa9a29 100644
--- a/core/src/plugins/auth.remote/sessionSwitcher.php
+++ b/core/src/plugins/auth.remote/sessionSwitcher.php
@@ -16,8 +16,10 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
+use Pydio\Log\Core\Logger;
+
 defined('AJXP_EXEC') or die( 'Access not allowed');
 
 /**
@@ -33,7 +35,7 @@ class SessionSwitcher
     /** Construction. This kills the current session if any started, and restart the given session */
     public function __construct($name, $killPreviousSession = false, $loadPreviousSession = false, $saveHandlerType = "files", $saveHandlerData = null)
     {
-        AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Switching to session ".$name);
+        Logger::debug(__CLASS__,__FUNCTION__,"Switching to session ".$name);
         if (session_id() == "") {
             if (isSet($saveHandlerData)) {
                 session_set_save_handler(
@@ -64,7 +66,7 @@ public function __construct($name, $killPreviousSession = false, $loadPreviousSe
                 setcookie(session_name(), '', time() - 42000, '/');
                 session_destroy();
             }
-            AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Closing previous session ".session_name()." / ".session_id());
+            Logger::debug(__CLASS__,__FUNCTION__,"Closing previous session ".session_name()." / ".session_id());
             session_write_close();
             session_regenerate_id(false);
             $_SESSION = array();
@@ -86,7 +88,7 @@ public function __construct($name, $killPreviousSession = false, $loadPreviousSe
         }
 
         if ($loadPreviousSession) {
-            AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Restoring previous session".SessionSwitcher::$sessionArray[0]['id']);
+            Logger::debug(__CLASS__,__FUNCTION__,"Restoring previous session".SessionSwitcher::$sessionArray[0]['id']);
             session_id(SessionSwitcher::$sessionArray[0]['id']);
             $name = SessionSwitcher::$sessionArray[0]['name'];
             ini_set('session.save_handler', SessionSwitcher::$sessionArray[0]['save_handler']);
@@ -96,6 +98,6 @@ public function __construct($name, $killPreviousSession = false, $loadPreviousSe
         }
         session_name($name);
         session_start();
-        AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Restarted session ".session_name()." / ".session_id(), $_SESSION);
+        Logger::debug(__CLASS__,__FUNCTION__,"Restarted session ".session_name()." / ".session_id(), $_SESSION);
     }
 };
diff --git a/core/src/plugins/auth.remote_ajxp/class.remote_ajxpAuthDriver.php b/core/src/plugins/auth.remote_ajxp/class.remote_ajxpAuthDriver.php
deleted file mode 100644
index c6f631f9fa..0000000000
--- a/core/src/plugins/auth.remote_ajxp/class.remote_ajxpAuthDriver.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Authenticates against a remote server implementing ajxp API
- * @package AjaXplorer_Plugins
- * @subpackage Auth
- */
-class remote_ajxpAuthDriver extends serialAuthDriver
-{
-    public function usersEditable()
-    {
-        return false;
-    }
-    public function passwordsEditable()
-    {
-        return false;
-    }
-
-    public function preLogUser($sessionId)
-    {
-        require_once(AJXP_BIN_FOLDER."/class.HttpClient.php");
-        $client = new HttpClient($this->getOption("REMOTE_SERVER"), $this->getOption("REMOTE_PORT"));
-        $client->setDebug(false);
-        if ($this->getOption("REMOTE_USER") != "") {
-            $client->setAuthorization($this->getOption("REMOTE_USER"), $this->getOption("REMOTE_PASSWORD"));
-        }
-        $client->setCookies(array(($this->getOption("REMOTE_SESSION_NAME") ? $this->getOption("REMOTE_SESSION_NAME") : "PHPSESSID") => $sessionId));
-        $result = $client->get($this->getOption("REMOTE_URL"), array("session_id"=>$sessionId));
-        if ($result) {
-            $user = $client->getContent();
-            if ($this->autoCreateUser()) {
-                AuthService::logUser($user, "", true);
-            } else {
-                // If not auto-create but the user exists, log him.
-                if ($this->userExists($user)) {
-                    AuthService::logUser($user, "", true);
-                }
-            }
-        }
-
-    }
-
-}
diff --git a/core/src/plugins/auth.remote_ajxp/i18n/conf/de.php b/core/src/plugins/auth.remote_ajxp/i18n/conf/de.php
deleted file mode 100644
index 54f0ade55f..0000000000
--- a/core/src/plugins/auth.remote_ajxp/i18n/conf/de.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Remote AJXP" => "Pydio-Instanz",
-"Use another AJXP intall to log in." => "Eine weitere Pydio-Instanz zum Anmelden verwenden.",
-"Server" => "Server",
-"The host URL" => "Die Anbieter-URL",
-"Port" => "Port",
-"The host port" => "Der Anbieter-Port",
-"User name" => "Benutzername",
-"User on the remote host" => "Benutzer des Remote-Systems",
-"Password" => "Passwort",
-"Password on the remote host" => "Passwort des Remote-Systems",
-"Session Name" => "Session-Name",
-"Parameter name to pass the session id" => "Name des Parameters über den die Session-Id übergeben wird",
-"URI" => "URI",
-"Script URI on the remote server" => "Script-URI auf dem Remote-Server",
-);
diff --git a/core/src/plugins/auth.remote_ajxp/i18n/conf/en.php b/core/src/plugins/auth.remote_ajxp/i18n/conf/en.php
deleted file mode 100644
index fd1b13cbaf..0000000000
--- a/core/src/plugins/auth.remote_ajxp/i18n/conf/en.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Remote AJXP" => "Remote AJXP",
-"Use another AJXP intall to log in." => "Use another AJXP intall to log in.",
-"Server" => "Server",
-"The host URL" => "The host URL",
-"Port" => "Port",
-"The host port" => "The host port",
-"User name" => "User name",
-"User on the remote host" => "User on the remote host",
-"Password" => "Password",
-"Password on the remote host" => "Password on the remote host",
-"Session Name" => "Session Name",
-"Parameter name to pass the session id" => "Parameter name to pass the session id",
-"URI" => "URI",
-"Script URI on the remote server" => "Script URI on the remote server",
-);
diff --git a/core/src/plugins/auth.remote_ajxp/i18n/conf/fr.php b/core/src/plugins/auth.remote_ajxp/i18n/conf/fr.php
deleted file mode 100644
index 7d84e58aa0..0000000000
--- a/core/src/plugins/auth.remote_ajxp/i18n/conf/fr.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Remote AJXP" => "AJXP distant",
-"Use another AJXP intall to log in." => "Se connecter en utilisant une autre installation Pydio",
-"Server" => "Serveur",
-"The host URL" => "URL de l'hôte",
-"Port" => "Port",
-"The host port" => "Port de l'hôte",
-"User name" => "Nom d'utilisateur",
-"User on the remote host" => "Utilisateur sur l'hôte distant",
-"Password" => "Mot de passe",
-"Password on the remote host" => "Mot de passe sur l'hôte distant",
-"Session Name" => "Nom de la session",
-"Parameter name to pass the session id" => "Paramètre pour passer l'id de session",
-"URI" => "URI",
-"Script URI on the remote server" => "URI du script sur le serveur distant.",
-);
diff --git a/core/src/plugins/auth.remote_ajxp/i18n/conf/it.php b/core/src/plugins/auth.remote_ajxp/i18n/conf/it.php
deleted file mode 100644
index 912c44dfc4..0000000000
--- a/core/src/plugins/auth.remote_ajxp/i18n/conf/it.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Remote AJXP" => "AJXP Remoto",
-"Use another AJXP intall to log in." => "Utilizza un'altra installazione AJXP per autenticarsi.",
-"Server" => "Server",
-"The host URL" => "URL del server",
-"Port" => "Porta",
-"The host port" => "Porta del server",
-"User name" => "Nome Utente",
-"User on the remote host" => "Utente sul server remoto",
-"Password" => "Password",
-"Password on the remote host" => "Password sul server remoto",
-"Session Name" => "Nome Sessione",
-"Parameter name to pass the session id" => "Nome parametro per passare l'ID della sessione",
-"URI" => "URI",
-"Script URI on the remote server" => "URI dello script sul server remoto",
-);
diff --git a/core/src/plugins/auth.remote_ajxp/i18n/conf/pt.php b/core/src/plugins/auth.remote_ajxp/i18n/conf/pt.php
deleted file mode 100644
index 54fd29bcb0..0000000000
--- a/core/src/plugins/auth.remote_ajxp/i18n/conf/pt.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Remote AJXP" => "AJXP Remoto",
-"Use another AJXP intall to log in." => "Utilizar outra instalação do AJXP para iniciar sessão.",
-"Server" => "Servidor",
-"The host URL" => "URL do Anfitrião",
-"Port" => "Porta",
-"The host port" => "Porta do Anfitrião",
-"User name" => "Nome de Utilizador",
-"User on the remote host" => "Utilizador no Servidor Remoto",
-"Password" => "Palavra-Chave",
-"Password on the remote host" => "Palavra-Chave no Servidor Remoto",
-"Session Name" => "Nome da Sessão",
-"Parameter name to pass the session id" => "Parâmetro Nome para passar o ID da sessão",
-"URI" => "URI",
-"Script URI on the remote server" => "Script URI no servidor remoto",
-);
diff --git a/core/src/plugins/auth.remote_ajxp/manifest.xml b/core/src/plugins/auth.remote_ajxp/manifest.xml
deleted file mode 100644
index a0f9884fcb..0000000000
--- a/core/src/plugins/auth.remote_ajxp/manifest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<authdriver enabled="false" name="remote_ajxp" mixins="authdriver_commons" label="CONF_MESSAGE[Remote AJXP]" description="CONF_MESSAGE[Use another AJXP intall to log in.]"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <plugin_info>
-        <plugin_author>Charles du Jeu</plugin_author>
-        <core_relation packaged="false" tested_version="4.X"/>
-    </plugin_info>
-    <client_settings>
-        <resources>
-            <i18n namespace="remote_ajxp_auth" path="plugins/auth.remote_ajxp/i18n"/>
-        </resources>
-    </client_settings>
-	<server_settings>
-		<param name="REMOTE_SERVER" type="string" label="CONF_MESSAGE[Server]" description="CONF_MESSAGE[The host URL]" mandatory="true"/>
-		<param name="REMOTE_PORT" type="string" label="CONF_MESSAGE[Port]" description="CONF_MESSAGE[The host port]" mandatory="true"/>
-		<param name="REMOTE_USER" type="string" label="CONF_MESSAGE[User name]" description="CONF_MESSAGE[User on the remote host]" mandatory="false"/>
-		<param name="REMOTE_PASSWORD" type="string" label="CONF_MESSAGE[Password]" description="CONF_MESSAGE[Password on the remote host]" mandatory="false"/>
-		<param name="REMOTE_SESSION_NAME" type="string" label="CONF_MESSAGE[Session Name]" description="CONF_MESSAGE[Parameter name to pass the session id]" mandatory="false"/>
-		<param name="REMOTE_URL" type="string" label="CONF_MESSAGE[URI]" description="CONF_MESSAGE[Script URI on the remote server]" mandatory="true"/>
-	</server_settings>
-	<class_definition filename="plugins/auth.remote_ajxp/class.remote_ajxpAuthDriver.php" classname="remote_ajxpAuthDriver"/>
-	<registry_contributions>
-		<external_file filename="plugins/core.auth/standard_auth_actions.xml" include="actions/*" exclude=""/>
-	</registry_contributions>
-	<dependencies>
-		<pluginClass pluginName="auth.serial"/>
-	</dependencies>
-</authdriver>
diff --git a/core/src/plugins/auth.remote_ajxp/plugin_doc.html b/core/src/plugins/auth.remote_ajxp/plugin_doc.html
deleted file mode 100644
index f421bf6d65..0000000000
--- a/core/src/plugins/auth.remote_ajxp/plugin_doc.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>Performs authentication against a another Pydio installation. This is to be used in conjunction with the access.remote_fs plugin, to totally "proxy" an installation to another.</p>
diff --git a/core/src/plugins/auth.serial/class.serialAuthDriver.php b/core/src/plugins/auth.serial/class.serialAuthDriver.php
deleted file mode 100644
index 36ddee2dc5..0000000000
--- a/core/src/plugins/auth.serial/class.serialAuthDriver.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Standard auth implementation, stores the data in serialized files
- * @package AjaXplorer_Plugins
- * @subpackage Auth
- */
-class serialAuthDriver extends AbstractAuthDriver
-{
-    public $usersSerFile;
-    public $driverName = "serial";
-
-    public function init($options)
-    {
-        parent::init($options);
-        $this->usersSerFile = AJXP_VarsFilter::filter($this->getOption("USERS_FILEPATH"));
-    }
-
-    public function performChecks()
-    {
-        if(!isset($this->options)) return;
-        if (isset($this->options["FAST_CHECKS"]) && $this->options["FAST_CHECKS"] === true) {
-            return;
-        }
-        $usersDir = dirname($this->usersSerFile);
-        if (!is_dir($usersDir) || !is_writable($usersDir)) {
-            throw new Exception("Parent folder for users file is either inexistent or not writeable.");
-        }
-        if (is_file($this->usersSerFile) && !is_writable($this->usersSerFile)) {
-            throw new Exception("Users file exists but is not writeable!");
-        }
-    }
-
-    protected function _listAllUsers()
-    {
-        $users = AJXP_Utils::loadSerialFile($this->usersSerFile);
-        if (AuthService::ignoreUserCase()) {
-            $users = array_combine(array_map("strtolower", array_keys($users)), array_values($users));
-        }
-        ConfService::getConfStorageImpl()->filterUsersByGroup($users, "/", true);
-        return $users;
-    }
-
-    public function listUsers($baseGroup = "/", $recursive = true)
-    {
-        $users = AJXP_Utils::loadSerialFile($this->usersSerFile);
-        if (AuthService::ignoreUserCase()) {
-            $users = array_combine(array_map("strtolower", array_keys($users)), array_values($users));
-        }
-        ConfService::getConfStorageImpl()->filterUsersByGroup($users, $baseGroup, !$recursive);
-        ksort($users);
-        return $users;
-    }
-
-    public function supportsUsersPagination()
-    {
-        return true;
-    }
-
-    // $baseGroup = "/"
-    public function listUsersPaginated($baseGroup, $regexp, $offset = -1 , $limit = -1, $recursive = true)
-    {
-        $users = $this->listUsers($baseGroup);
-        $result = array();
-        $index = 0;
-        foreach ($users as $usr => $pass) {
-            if (!empty($regexp) && !preg_match("/".preg_quote($regexp)."/i", $usr)) {
-                continue;
-            }
-            if ($offset != -1 && $index < $offset) {
-                $index ++;
-                continue;
-            }
-            $result[$usr] = $pass;
-            $index ++;
-            if($limit != -1 && count($result) >= $limit) break;
-        }
-        return $result;
-    }
-    public function getUsersCount($baseGroup = "/", $regexp = "", $filterProperty = null, $filterValue = null, $recursive = true)
-    {
-        return count($this->listUsersPaginated($baseGroup, $regexp, -1, -1, $recursive));
-    }
-
-
-    public function userExists($login)
-    {
-        if(AuthService::ignoreUserCase()) $login = strtolower($login);
-        $users = $this->_listAllUsers();
-        if(!is_array($users) || !array_key_exists($login, $users)) return false;
-        return true;
-    }
-
-    public function checkPassword($login, $pass, $seed)
-    {
-        if(AuthService::ignoreUserCase()) $login = strtolower($login);
-        $userStoredPass = $this->getUserPass($login);
-        if(!$userStoredPass) return false;
-        if ($seed == "-1") { // Seed = -1 means that password is not encoded.
-            return AJXP_Utils::pbkdf2_validate_password($pass, $userStoredPass);//($userStoredPass == md5($pass));
-        } else {
-            return (md5($userStoredPass.$seed) === $pass);
-        }
-    }
-
-    public function usersEditable()
-    {
-        return true;
-    }
-    public function passwordsEditable()
-    {
-        return true;
-    }
-
-    public function createUser($login, $passwd)
-    {
-        if(AuthService::ignoreUserCase()) $login = strtolower($login);
-        $users = $this->_listAllUsers();
-        if(!is_array($users)) $users = array();
-        if(array_key_exists($login, $users)) return "exists";
-        if ($this->getOptionAsBool("TRANSMIT_CLEAR_PASS")) {
-            $users[$login] = AJXP_Utils::pbkdf2_create_hash($passwd);//md5($passwd);
-        } else {
-            $users[$login] = $passwd;
-        }
-        AJXP_Utils::saveSerialFile($this->usersSerFile, $users);
-    }
-    public function changePassword($login, $newPass)
-    {
-        if(AuthService::ignoreUserCase()) $login = strtolower($login);
-        $users = $this->_listAllUsers();
-        if(!is_array($users) || !array_key_exists($login, $users)) return ;
-        if ($this->getOptionAsBool("TRANSMIT_CLEAR_PASS")) {
-            $users[$login] = AJXP_Utils::pbkdf2_create_hash($newPass);//md5($newPass);
-        } else {
-            $users[$login] = $newPass;
-        }
-        AJXP_Utils::saveSerialFile($this->usersSerFile, $users);
-    }
-    public function deleteUser($login)
-    {
-        if(AuthService::ignoreUserCase()) $login = strtolower($login);
-        $users = $this->_listAllUsers();
-        if (is_array($users) && array_key_exists($login, $users)) {
-            unset($users[$login]);
-            AJXP_Utils::saveSerialFile($this->usersSerFile, $users);
-        }
-    }
-
-    public function getUserPass($login)
-    {
-        if(!$this->userExists($login)) return false;
-        $users = $this->_listAllUsers();
-        return $users[$login];
-    }
-
-}
diff --git a/core/src/plugins/auth.serial/i18n/conf/de.php b/core/src/plugins/auth.serial/i18n/conf/de.php
deleted file mode 100644
index 3940b14743..0000000000
--- a/core/src/plugins/auth.serial/i18n/conf/de.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Serialized authentication storage" => "Serialisierte Anmeldedaten",
-"Stores the Authentication data as serialized PHP values on the filesystem." => "Speichert Anmeldedaten durch PHP serialisiert im Dateisystem.",
-"Users" => "Benutzer",
-"The users list" => "Eine Liste mit Benutzern",
-"Users File" => "Benutzerdatei",
-"Fast Checks" => "Schnellprüfung",
-"When using a custom stream wrapper to read the files, this can increase performances by skipping various is_file,is_dir checks" => "Wenn ein benutzerdefinierter Stream-Wrapper verwendet wird kann dies die Geschwindigkeit verbessern, indem verschiedene is_file oder is_dir Prüfungen übersprungen werden.",
-);
diff --git a/core/src/plugins/auth.serial/i18n/conf/en.php b/core/src/plugins/auth.serial/i18n/conf/en.php
deleted file mode 100644
index a05dfc740f..0000000000
--- a/core/src/plugins/auth.serial/i18n/conf/en.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Serialized authentication storage" => "Serialized authentication storage",
-"Stores the Authentication data as serialized PHP values on the filesystem." => "Stores the Authentication data as serialized PHP values on the filesystem.",
-"Users" => "Users",
-"The users list" => "The users list",
-"Users File" => "Users File",
-"Fast Checks" => "Fast Checks",
-"When using a custom stream wrapper to read the files, this can increase performances by skipping various is_file,is_dir checks" => "When using a custom stream wrapper to read the files, this can increase performances by skipping various is_file,is_dir checks",
-);
\ No newline at end of file
diff --git a/core/src/plugins/auth.serial/i18n/conf/fr.php b/core/src/plugins/auth.serial/i18n/conf/fr.php
deleted file mode 100644
index 38e6761400..0000000000
--- a/core/src/plugins/auth.serial/i18n/conf/fr.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Serialized authentication storage" => "Stockage des identifiants dans des fichiers sérialisés",
-"Stores the Authentication data as serialized PHP values on the filesystem." => "Stockage des identifiants d'authentification dans des fichiers PHP sérialisés sur le système de fichier.",
-"Users" => "Utilisateurs",
-"The users list" => "Liste des utilisateurs.",
-"Users File" => "Fichier des utilisateurs",
-"Fast Checks" => "Vérifications rapides",
-"When using a custom stream wrapper to read the files, this can increase performances by skipping various is_file,is_dir checks" => "Lors de l'utilisation d'un wrapper personnalisé pour lire les fichiers, cela peut améliorer les performances en ignorant des vérifications de type 'is_file,is_dir'",
-);
\ No newline at end of file
diff --git a/core/src/plugins/auth.serial/i18n/conf/it.php b/core/src/plugins/auth.serial/i18n/conf/it.php
deleted file mode 100644
index 09c03eb57e..0000000000
--- a/core/src/plugins/auth.serial/i18n/conf/it.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Serialized authentication storage" => "Autenticazione Serializzata",
-"Stores the Authentication data as serialized PHP values on the filesystem." => "Salva i dati d'Autenticazione come valori serializzati, in un file PHP, sul filesystem.",
-"Users" => "Utenti",
-"The users list" => "Lista utenti",
-"Users File" => "File utenti",
-"Fast Checks" => "Controlli Rapidi",
-"When using a custom stream wrapper to read the files, this can increase performances by skipping various is_file,is_dir checks" => "Quando si utilizza un wrapper personalizzato per leggere i file, questa opzione può aumentare le performance saltando diversi controlli 'is_file' e 'is_dir'",
-);
diff --git a/core/src/plugins/auth.serial/i18n/conf/pt.php b/core/src/plugins/auth.serial/i18n/conf/pt.php
deleted file mode 100644
index 1b1f7afbf0..0000000000
--- a/core/src/plugins/auth.serial/i18n/conf/pt.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Serialized authentication storage" => "Armazenamento de Autenticação em Série",
-"Stores the Authentication data as serialized PHP values on the filesystem." => "Guarda os dados de autenticação em valores em série PHP no sistema de ficheiros.",
-"Users" => "Utilizadores",
-"The users list" => "Lista de Utilizadores",
-"Users File" => "Users File",
-"Fast Checks" => "Fast Checks",
-"When using a custom stream wrapper to read the files, this can increase performances by skipping various is_file,is_dir checks" => "When using a custom stream wrapper to read the files, this can increase performances by skipping various is_file,is_dir checks",
-);
\ No newline at end of file
diff --git a/core/src/plugins/auth.serial/manifest.xml b/core/src/plugins/auth.serial/manifest.xml
deleted file mode 100644
index e2cadb6ce4..0000000000
--- a/core/src/plugins/auth.serial/manifest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<authdriver name="serial" label="CONF_MESSAGE[Serialized authentication storage]" description="CONF_MESSAGE[Stores the Authentication data as serialized PHP values on the filesystem.]" mixins="authdriver_commons"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <client_settings>
-        <resources>
-            <i18n namespace="serial_auth" path="plugins/auth.serial/i18n"/>
-        </resources>
-    </client_settings>
-	<server_settings>
-		<param name="USERS_FILEPATH" type="string" label="CONF_MESSAGE[Users File]" description="CONF_MESSAGE[The users list]" mandatory="true" default="AJXP_DATA_PATH/plugins/auth.serial/users.ser"/>
-        <param name="FAST_CHECKS" type="boolean" label="CONF_MESSAGE[Fast Checks]" description="CONF_MESSAGE[When using a custom stream wrapper to read the files, this can increase performances by skipping various is_file,is_dir checks]" mandatory="false" default="false"/>
-	</server_settings>
-	<class_definition filename="plugins/auth.serial/class.serialAuthDriver.php" classname="serialAuthDriver"/>
-	<registry_contributions>
-		<external_file filename="plugins/core.auth/standard_auth_actions.xml" include="actions/*" exclude=""/>
-	</registry_contributions>
-</authdriver>
diff --git a/core/src/plugins/auth.serial/plugin_doc.html b/core/src/plugins/auth.serial/plugin_doc.html
deleted file mode 100644
index f644b8e253..0000000000
--- a/core/src/plugins/auth.serial/plugin_doc.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>The default authentication plugin, stores all data inside php serialized files under data/plugins/auth.serial. This allows, from the beginning of the Pydio project, to install Pydio everywhere without needing a database, and is really sufficient for generic use of Pydio.</p>
\ No newline at end of file
diff --git a/core/src/plugins/auth.smb/SmbAuthDriver.php b/core/src/plugins/auth.smb/SmbAuthDriver.php
new file mode 100644
index 0000000000..834f3294d5
--- /dev/null
+++ b/core/src/plugins/auth.smb/SmbAuthDriver.php
@@ -0,0 +1,178 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Auth\Driver;
+
+use Exception;
+use Pydio\Auth\Core\AbstractAuthDriver;
+use Pydio\Auth\Core\MemorySafe;
+use Pydio\Core\Model\UserInterface;
+use Pydio\Core\Services\AuthService;
+
+use Pydio\Core\Services\RepositoryService;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Authenticates user against an SMB server
+ * @package AjaXplorer_Plugins
+ * @subpackage Auth
+ */
+class SmbAuthDriver extends AbstractAuthDriver
+{
+    public $driverName = "smb";
+
+    /**
+     *
+     * @param string $baseGroup
+     * @param bool $recursive
+     * @return UserInterface[]
+     */
+    public function listUsers($baseGroup = "/", $recursive = true)
+    {
+        $adminUser = $this->options["ADMIN_USER"];
+        return array($adminUser => $adminUser);
+    }
+
+    /**
+     * @param $login
+     * @return boolean
+     */
+    public function userExists($login)
+    {
+        return true;
+    }
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     */
+    public function logoutCallback(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface)
+    {
+        MemorySafe::clearCredentials();
+        foreach ($_SESSION as $key => $val) {
+            if ((substr($key, -4) === "disk") && (substr($key, 0, 4) == "smb_")) {
+                unset($_SESSION[$key]);
+            }
+        }
+        AuthService::disconnect();
+        session_write_close();
+        $x = new \Pydio\Core\Http\Response\SerializableResponseStream();
+        $x->addChunk(new \Pydio\Core\Http\Message\LoggingResult(2));
+        $responseInterface = $responseInterface->withBody($x);
+    }
+
+    /**
+     * @param string $login
+     * @param string $pass
+     * @return bool
+     * @throws Exception
+     */
+    public function checkPassword($login, $pass)
+    {
+        if (!defined('SMB4PHP_SMBCLIENT')) {
+            define('SMB4PHP_SMBCLIENT', $this->options["SMBCLIENT"]);
+        }
+
+        require_once(AJXP_INSTALL_PATH . "/" . AJXP_PLUGINS_FOLDER . "/access.smb/smb.php");
+
+        $_SESSION["AJXP_SESSION_REMOTE_PASS"] = $pass;
+        $repoId = $this->options["REPOSITORY_ID"];
+        $repoObject = RepositoryService::getRepositoryById($repoId);
+        if (!isSet($repoObject)) throw new Exception("Cannot find repository with id " . $repoId);
+
+        $basePath = $repoObject->getSafeOption("PATH");
+        $basePath = str_replace("AJXP_USER", $login, $basePath);
+        $host = $repoObject->getSafeOption("HOST");
+        $domain = $repoObject->getSafeOption("DOMAIN");
+
+        if (!empty($domain)) {
+            $login = $domain . $login;
+        }
+        $strTmp = "$login:$pass@" . $host . "/" . $basePath . "/";
+        $strTmp = str_replace("//", "/", $strTmp);
+        $url = "smbclient://" . $strTmp;
+        try {
+            if (!is_dir($url)) {
+                $this->logDebug("SMB Login failure");
+                $_SESSION["AJXP_SESSION_REMOTE_PASS"] = '';
+                foreach ($_SESSION as $key => $val) {
+                    if ((substr($key, -4) === "disk") && (substr($key, 0, 4) == "smb_")) {
+                        unset($_SESSION[$key]);
+                    }
+                }
+                return false;
+            }
+            MemorySafe::storeCredentials($login, $pass);
+        } catch (Exception $e) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function usersEditable()
+    {
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    public function passwordsEditable()
+    {
+        return false;
+    }
+
+    /**
+     * @param $login
+     * @param $passwd
+     */
+    public function createUser($login, $passwd)
+    {
+    }
+
+    /**
+     * @param $login
+     * @param $newPass
+     */
+    public function changePassword($login, $newPass)
+    {
+    }
+
+    /**
+     * @param $login
+     */
+    public function deleteUser($login)
+    {
+    }
+
+    /**
+     * @param $login
+     * @return string
+     */
+    public function getUserPass($login)
+    {
+        return "";
+    }
+
+}
diff --git a/core/src/plugins/auth.smb/class.smbAuthDriver.php b/core/src/plugins/auth.smb/class.smbAuthDriver.php
deleted file mode 100644
index 46ccbf839a..0000000000
--- a/core/src/plugins/auth.smb/class.smbAuthDriver.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Authenticates user against an SMB server
- * @package AjaXplorer_Plugins
- * @subpackage Auth
- */
-class smbAuthDriver extends AbstractAuthDriver
-{
-    public $driverName = "smb";
-
-    public function listUsers($baseGroup = "/", $recursive = true)
-    {
-        $adminUser = $this->options["ADMIN_USER"];
-        return array($adminUser => $adminUser);
-    }
-
-    public function userExists($login)
-    {
-        return true;
-    }
-
-    public function logoutCallback($actionName, $httpVars, $fileVars)
-    {
-        AJXP_Safe::clearCredentials();
-        $adminUser = $this->options["ADMIN_USER"];
-        $subUsers = array();
-        foreach($_SESSION as $key => $val){
-            if((substr($key,-4) === "disk") && (substr($key,0,4) == "smb_")){
-                unset($_SESSION[$key]);
-            }
-        }
-        AuthService::disconnect();
-        session_write_close();
-        AJXP_XMLWriter::header();
-        AJXP_XMLWriter::loggingResult(2);
-        AJXP_XMLWriter::close();
-    }
-
-    public function checkPassword($login, $pass, $seed)
-    {
-        if(!defined('SMB4PHP_SMBCLIENT'))
-        {
-            define('SMB4PHP_SMBCLIENT', $this->options["SMBCLIENT"]);
-        }
-
-        require_once(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/access.smb/smb.php");
-
-        $_SESSION["AJXP_SESSION_REMOTE_PASS"] = $pass;
-        $repoId = $this->options["REPOSITORY_ID"];
-        $repoObject = ConfService::getRepositoryById($repoId);
-        if(!isSet($repoObject)) throw new Exception("Cannot find repository with id ".$repoId);
-        $path = "";
-        $basePath = $repoObject->getOption("PATH", true);
-        $basePath = str_replace("AJXP_USER", $login, $basePath);
-        $host = $repoObject->getOption("HOST");
-        $domain = $repoObject->getOption("DOMAIN", true);
-        $smbPath = $repoObject->getOption("PATH", true);
-
-        if(!empty($domain)){
-            $login = $domain.$login;
-        }
-        $strTmp = "$login:$pass@".$host."/".$basePath."/";
-        $strTmp = str_replace("//", "/",$strTmp);
-        $url = "smbclient://".$strTmp;
-        try {
-            if (!is_dir($url)) {
-                $this->logDebug("SMB Login failure");
-                $_SESSION["AJXP_SESSION_REMOTE_PASS"] = '';
-                foreach($_SESSION as $key => $val){
-                    if((substr($key,-4) === "disk") && (substr($key,0,4) == "smb_")){
-                        unset($_SESSION[$key]);
-                    }
-                }
-                return false;
-            }
-            AJXP_Safe::storeCredentials($login, $pass);
-        } catch (Exception $e) {
-            return false;
-        }
-        return true;
-    }
-
-    public function usersEditable()
-    {
-        return false;
-    }
-    public function passwordsEditable()
-    {
-        return false;
-    }
-
-    public function createUser($login, $passwd)
-    {
-    }
-    public function changePassword($login, $newPass)
-    {
-    }
-    public function deleteUser($login)
-    {
-    }
-
-    public function getUserPass($login)
-    {
-        return "";
-    }
-
-}
diff --git a/core/src/plugins/auth.smb/i18n/conf/de.php b/core/src/plugins/auth.smb/i18n/conf/de.php
index 595f1870a1..f2cc040a79 100644
--- a/core/src/plugins/auth.smb/i18n/conf/de.php
+++ b/core/src/plugins/auth.smb/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "SMB Authentication" => "SMB-Authentifizierung",
@@ -29,4 +29,4 @@
 "ID of the workspace used to validate credentials" => "ID of the workspace used to validate credentials",
 "Smbclient" => "Smbclient",
 "Path to smbclient executable, considered to be in the path by default." => "Path to smbclient executable, considered to be in the path by default.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/auth.smb/i18n/conf/en.php b/core/src/plugins/auth.smb/i18n/conf/en.php
index 98bb1e8af2..b3c2bafd0c 100644
--- a/core/src/plugins/auth.smb/i18n/conf/en.php
+++ b/core/src/plugins/auth.smb/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "SMB Authentication" => "SMB Authentication",
@@ -29,4 +29,4 @@
 "ID of the workspace used to validate credentials" => "ID of the workspace used to validate credentials",
 "Smbclient" => "Smbclient",
 "Path to smbclient executable, considered to be in the path by default." => "Path to smbclient executable, considered to be in the path by default.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/auth.smb/i18n/conf/fr.php b/core/src/plugins/auth.smb/i18n/conf/fr.php
index 4d30d60abf..e3312e3c77 100644
--- a/core/src/plugins/auth.smb/i18n/conf/fr.php
+++ b/core/src/plugins/auth.smb/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "SMB Authentication" => "Authentification SMB",
@@ -27,4 +27,4 @@
 "The ID of an existing admin for Pydio (using conf.serial)" => "Id d'un utilisateur ayant les droits d'administration sur Pydio (utilisation de conf.serial).",
 "Smbclient" => "Smbclient",
 "Path to smbclient executable, considered to be in the path by default." => "Chemin vers l'executable smbclient sur le serveur. Par défaut, va chercher dans le PATH de l'environnement.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/auth.smb/i18n/conf/it.php b/core/src/plugins/auth.smb/i18n/conf/it.php
index 730ba99eb2..72a7b6fbb8 100644
--- a/core/src/plugins/auth.smb/i18n/conf/it.php
+++ b/core/src/plugins/auth.smb/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "SMB Authentication" => "Autenticazione SMB",
@@ -29,4 +29,4 @@
 "ID of the workspace used to validate credentials" => "ID of the workspace used to validate credentials",
 "Smbclient" => "Smbclient",
 "Path to smbclient executable, considered to be in the path by default." => "Path to smbclient executable, considered to be in the path by default.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/auth.smb/i18n/conf/pt.php b/core/src/plugins/auth.smb/i18n/conf/pt.php
index a967a328a0..0a054e131d 100644
--- a/core/src/plugins/auth.smb/i18n/conf/pt.php
+++ b/core/src/plugins/auth.smb/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "SMB Authentication" => "Autenticação SMB",
@@ -29,4 +29,4 @@
 "ID of the workspace used to validate credentials" => "ID of the workspace used to validate credentials",
 "Smbclient" => "Smbclient",
 "Path to smbclient executable, considered to be in the path by default." => "Path to smbclient executable, considered to be in the path by default.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/auth.smb/manifest.xml b/core/src/plugins/auth.smb/manifest.xml
index 300da65d33..8836fe5c81 100644
--- a/core/src/plugins/auth.smb/manifest.xml
+++ b/core/src/plugins/auth.smb/manifest.xml
@@ -10,7 +10,7 @@
 		<param name="ADMIN_USER" type="string" label="CONF_MESSAGE[Admin user]" description="CONF_MESSAGE[The ID of an existing admin for Pydio (using conf.serial)]" mandatory="true"/>
         <param name="SMBCLIENT" type="string" label="CONF_MESSAGE[Smbclient]" description="CONF_MESSAGE[Path to smbclient executable, considered to be in the path by default.]" mandatory="true" default="smbclient"/>
 	</server_settings>
-	<class_definition filename="plugins/auth.smb/class.smbAuthDriver.php" classname="smbAuthDriver"/>
+	<class_definition filename="plugins/auth.smb/SmbAuthDriver.php" classname="Pydio\Auth\Driver\SmbAuthDriver"/>
 	<registry_contributions>
 		<external_file filename="plugins/core.auth/standard_auth_actions.xml" include="actions/action[@name='login'],actions/action[@name='get_seed'],actions/action[@name='get_secure_token'],actions/action[@name='get_captcha'],actions/action[@name='back']" exclude=""/>
 		<actions>
diff --git a/core/src/plugins/auth.sql/SqlAuthDriver.php b/core/src/plugins/auth.sql/SqlAuthDriver.php
new file mode 100644
index 0000000000..bc68be73bd
--- /dev/null
+++ b/core/src/plugins/auth.sql/SqlAuthDriver.php
@@ -0,0 +1,300 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Auth\Driver;
+
+use dibi;
+use DibiException;
+use Exception;
+use Pydio\Auth\Core\AbstractAuthDriver;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Utils\DBHelper;
+use Pydio\Core\Utils\Vars\OptionsHelper;
+use Pydio\Core\Utils\Vars\PasswordEncoder;
+use Pydio\Core\Utils\Vars\StringHelper;
+use Pydio\Core\PluginFramework\SqlTableProvider;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Store authentication data in an SQL database
+ * @package AjaXplorer_Plugins
+ * @subpackage Auth
+ */
+class SqlAuthDriver extends AbstractAuthDriver implements SqlTableProvider
+{
+    public $sqlDriver;
+    public $driverName = "sql";
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     * @throws Exception
+     * @throws \Pydio\Core\Exception\DBConnectionException
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        parent::init($ctx, $options);
+        if (empty($options["SQL_DRIVER"])) return;
+        $this->sqlDriver = OptionsHelper::cleanDibiDriverParameters($options["SQL_DRIVER"]);
+        try {
+            if (!dibi::isConnected()) {
+                dibi::connect($this->sqlDriver);
+            }
+        } catch (DibiException $e) {
+            throw new \Pydio\Core\Exception\DBConnectionException();
+        }
+    }
+
+    public function performChecks()
+    {
+        if (!isSet($this->options)) return;
+        $test = OptionsHelper::cleanDibiDriverParameters($this->options["SQL_DRIVER"]);
+        if (!count($test)) {
+            throw new Exception("You probably did something wrong! To fix this issue you have to remove the file \"bootstrap.json\" and rename the backup file \"bootstrap.json.bak\" into \"bootsrap.json\" in data/plugins/boot.conf/");
+        }
+    }
+
+    /**
+     * Wether users can be listed using offset and limit
+     * @return bool
+     */
+    public function supportsUsersPagination()
+    {
+        return true;
+    }
+
+    // $baseGroup = "/"
+    /**
+     * List users using offsets
+     * @param string $baseGroup
+     * @param string $regexp
+     * @param int $offset
+     * @param int $limit
+     * @param bool $recursive
+     * @return []
+     */
+    public function listUsersPaginated($baseGroup, $regexp, $offset, $limit, $recursive = true)
+    {
+        $ignoreHiddens = "NOT EXISTS (SELECT * FROM [ajxp_user_rights] AS c WHERE [c.login]=[u.login] AND [c.repo_uuid] = 'ajxp.hidden')";
+        if ($recursive) {
+            $groupPathCondition = "[groupPath] LIKE %like~";
+        } else {
+            $groupPathCondition = "[groupPath] = %s";
+        }
+        if ($regexp != null) {
+            $res = dibi::query("SELECT * FROM [ajxp_users] AS u WHERE [login] " . StringHelper::regexpToLike($regexp) . " AND $groupPathCondition AND $ignoreHiddens ORDER BY [login] ASC %lmt %ofs", StringHelper::cleanRegexp($regexp), $baseGroup, $limit, $offset);
+        } else if ($offset != -1 || $limit != -1) {
+            $res = dibi::query("SELECT * FROM [ajxp_users] AS u WHERE $groupPathCondition AND $ignoreHiddens ORDER BY [login] ASC %lmt %ofs", $baseGroup, $limit, $offset);
+        } else {
+            $res = dibi::query("SELECT * FROM [ajxp_users] AS u WHERE $groupPathCondition AND $ignoreHiddens ORDER BY [login] ASC", $baseGroup);
+        }
+        $pairs = $res->fetchPairs('login', 'password');
+        return $pairs;
+    }
+
+    /**
+     * See parent method
+     * @param string $baseGroup
+     * @param string $userLogin
+     * @param int $usersPerPage
+     * @param int $offset
+     * @return float
+     */
+    public function findUserPage($baseGroup, $userLogin, $usersPerPage, $offset = 0)
+    {
+
+        $res = dibi::query("SELECT COUNT(*) FROM [ajxp_users] WHERE [login] <= %s", $userLogin);
+        $count = $res->fetchSingle();
+        return ceil(($count - $offset) / $usersPerPage) - 1;
+
+    }
+
+    /**
+     * @param string $baseGroup
+     * @param string $regexp
+     * @param null|string $filterProperty Can be "admin" or "parent"
+     * @param null|string $filterValue Can be a user Id, or AJXP_FILTER_EMPTY or AJXP_FILTER_NOT_EMPTY
+     * @param bool $recursive
+     * @return int
+     */
+    public function getUsersCount($baseGroup = "/", $regexp = "", $filterProperty = null, $filterValue = null, $recursive = true)
+    {
+        // WITH PARENT
+        // SELECT COUNT(*) FROM ajxp_users AS u, ajxp_user_rights AS r WHERE u.groupPath LIKE '/%' AND r.login=u.login AND r.repo_uuid = 'ajxp.parent_user'
+        // WITH SPECIFIC PARENT 'username'
+        // SELECT COUNT(*) FROM ajxp_users AS u, ajxp_user_rights AS r WHERE u.groupPath LIKE '/%' AND r.login=u.login AND r.repo_uuid = 'ajxp.parent_user' AND r.rights = 'username'
+        // WITHOUT PARENT
+        // SELECT COUNT(*) FROM ajxp_users AS u WHERE NOT EXISTS (SELECT * FROM ajxp_user_rights AS c WHERE c.login=u.login AND c.repo_uuid='ajxp.parent_user')
+        $ands = array();
+        $select = "SELECT COUNT(*) FROM [ajxp_users] AS u WHERE %and";
+
+        if (!empty($regexp)) {
+            $ands[] = array("[u.login] " . StringHelper::regexpToLike($regexp), StringHelper::cleanRegexp($regexp));
+        }
+        if ($recursive) {
+            $ands[] = array("[u.groupPath] LIKE %like~", $baseGroup);
+        } else {
+            $ands[] = array("[u.groupPath] = %s", $baseGroup);
+        }
+        $ands[] = array("NOT EXISTS (SELECT * FROM [ajxp_user_rights] AS c WHERE [c.login]=[u.login] AND [c.repo_uuid] = 'ajxp.hidden')");
+
+        if ($filterProperty !== null && $filterValue !== null) {
+            if ($filterProperty == "parent") {
+                $filterProperty = "ajxp.parent_user";
+            } else if ($filterProperty == "admin") {
+                $filterProperty = "ajxp.admin";
+            }
+            if ($filterValue == AJXP_FILTER_EMPTY) {
+                $ands[] = array("NOT EXISTS (SELECT * FROM [ajxp_user_rights] AS c WHERE [c.login]=[u.login] AND [c.repo_uuid] = %s)", $filterProperty);
+            } else if ($filterValue == AJXP_FILTER_NOT_EMPTY) {
+                $select = "SELECT COUNT(*) FROM [ajxp_users] AS u, [ajxp_user_rights] AS r WHERE %and";
+                $ands[] = array("[r.login]=[u.login]");
+                $ands[] = array("[r.repo_uuid] = %s", $filterProperty);
+            } else {
+                $select = "SELECT COUNT(*) FROM [ajxp_users] AS u, [ajxp_user_rights] AS r WHERE %and";
+                $ands[] = array("[r.login]=[u.login]");
+                $ands[] = array("[r.repo_uuid] = %s", $filterProperty);
+                $ands[] = array("[r.rights] " . StringHelper::likeToLike($filterValue), StringHelper::cleanLike($filterValue));
+            }
+        }
+
+        $res = dibi::query($select, $ands);
+        return $res->fetchSingle();
+    }
+
+    /**
+     * See parent method
+     * @param string $baseGroup
+     * @param bool|true $recursive
+     * @return array
+     */
+    public function listUsers($baseGroup = "/", $recursive = true)
+    {
+        $pairs = array();
+        $ignoreHiddens = "NOT EXISTS (SELECT * FROM [ajxp_user_rights] AS c WHERE [c.login]=[u.login] AND [c.repo_uuid] = 'ajxp.hidden')";
+        $res = dibi::query("SELECT * FROM [ajxp_users] as u WHERE [u.groupPath] LIKE %like~ AND $ignoreHiddens ORDER BY [u.login] ASC", $baseGroup);
+        $rows = $res->fetchAll();
+        foreach ($rows as $row) {
+            $grp = $row["groupPath"];
+            if (strlen($grp) > strlen($baseGroup)) continue;
+            $pairs[$row["login"]] = $row["password"];
+        }
+        return $pairs;
+    }
+
+    /**
+     * @param $login
+     * @return boolean
+     */
+    public function userExists($login)
+    {
+        $res = dibi::query("SELECT COUNT(*) FROM [ajxp_users] WHERE [login]=%s", $login);
+        return (intval($res->fetchSingle()) > 0);
+    }
+
+    /**
+     * @param string $login
+     * @param string $pass
+     * @return bool
+     */
+    public function checkPassword($login, $pass)
+    {
+        $userStoredPass = $this->getUserPass($login);
+        if (!$userStoredPass) return false;
+        return PasswordEncoder::pbkdf2_validate_password($pass, $userStoredPass);
+    }
+
+    /**
+     * @return bool
+     */
+    public function usersEditable()
+    {
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function passwordsEditable()
+    {
+        return true;
+    }
+
+    /**
+     * @param $login
+     * @param $passwd
+     */
+    public function createUser($login, $passwd)
+    {
+        if ($this->userExists($login)) return;
+        $userData = array("login" => $login);
+        $userData["password"] = PasswordEncoder::pbkdf2_create_hash($passwd);
+        $userData['groupPath'] = '/';
+        dibi::query('INSERT INTO [ajxp_users]', $userData);
+    }
+
+    /**
+     * @param $login
+     * @param $newPass
+     * @throws PydioException
+     */
+    public function changePassword($login, $newPass)
+    {
+        if (!$this->userExists($login)) {
+            throw new PydioException("User does not exists!");
+        }
+        $userData = array("login" => $login);
+        $userData["password"] = PasswordEncoder::pbkdf2_create_hash($newPass);
+        dibi::query("UPDATE [ajxp_users] SET ", $userData, "WHERE [login]=%s", $login);
+    }
+
+    /**
+     * @param $login
+     */
+    public function deleteUser($login)
+    {
+        dibi::query("DELETE FROM [ajxp_users] WHERE [login]=%s", $login);
+    }
+
+    /**
+     * @param $login
+     * @return mixed
+     */
+    public function getUserPass($login)
+    {
+        $res = dibi::query("SELECT [password] FROM [ajxp_users] WHERE [login]=%s", $login);
+        $pass = $res->fetchSingle();
+        return $pass;
+    }
+
+    /**
+     * @param array $param
+     * @return string
+     * @throws Exception
+     */
+    public function installSQLTables($param)
+    {
+        $p = OptionsHelper::cleanDibiDriverParameters($param["SQL_DRIVER"]);
+        return DBHelper::runCreateTablesQuery($p, $this->getBaseDir() . "/create.sql");
+    }
+
+}
diff --git a/core/src/plugins/auth.sql/class.sqlAuthDriver.php b/core/src/plugins/auth.sql/class.sqlAuthDriver.php
deleted file mode 100644
index f8d4392997..0000000000
--- a/core/src/plugins/auth.sql/class.sqlAuthDriver.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Store authentication data in an SQL database
- * @package AjaXplorer_Plugins
- * @subpackage Auth
- */
-class sqlAuthDriver extends AbstractAuthDriver implements SqlTableProvider
-{
-    public $sqlDriver;
-    public $driverName = "sql";
-
-    public function init($options)
-    {
-        parent::init($options);
-        $this->sqlDriver = AJXP_Utils::cleanDibiDriverParameters($options["SQL_DRIVER"]);
-        try {
-            if(!dibi::isConnected()) {
-                dibi::connect($this->sqlDriver);
-            }
-        } catch (DibiException $e) {
-            echo get_class($e), ': ', $e->getMessage(), "\n";
-            exit(1);
-        }
-    }
-
-    public function performChecks()
-    {
-        if(!isSet($this->options)) return;
-        $test = AJXP_Utils::cleanDibiDriverParameters($this->options["SQL_DRIVER"]);
-        if (!count($test)) {
-            throw new Exception("You probably did something wrong! To fix this issue you have to remove the file \"bootstrap.json\" and rename the backup file \"bootstrap.json.bak\" into \"bootsrap.json\" in data/plugins/boot.conf/");
-        }
-    }
-
-    public function supportsUsersPagination()
-    {
-        return true;
-    }
-
-    // $baseGroup = "/"
-    public function listUsersPaginated($baseGroup, $regexp, $offset, $limit, $recursive = true)
-    {
-        $ignoreHiddens = "NOT EXISTS (SELECT * FROM [ajxp_user_rights] AS c WHERE [c.login]=[u.login] AND [c.repo_uuid] = 'ajxp.hidden')";
-        if($recursive){
-            $groupPathCondition = "[groupPath] LIKE %like~";
-        }else{
-            $groupPathCondition = "[groupPath] = %s";
-        }
-        if ($regexp != null) {
-            $res = dibi::query("SELECT * FROM [ajxp_users] AS u WHERE [login] ".AJXP_Utils::regexpToLike($regexp)." AND $groupPathCondition AND $ignoreHiddens ORDER BY [login] ASC %lmt %ofs", AJXP_Utils::cleanRegexp($regexp), $baseGroup, $limit, $offset) ;
-        } else if ($offset != -1 || $limit != -1) {
-            $res = dibi::query("SELECT * FROM [ajxp_users] AS u WHERE $groupPathCondition AND $ignoreHiddens ORDER BY [login] ASC %lmt %ofs", $baseGroup, $limit, $offset);
-        } else {
-            $res = dibi::query("SELECT * FROM [ajxp_users] AS u WHERE $groupPathCondition AND $ignoreHiddens ORDER BY [login] ASC", $baseGroup);
-        }
-        $pairs = $res->fetchPairs('login', 'password');
-        return $pairs;
-    }
-
-    /**
-     * See parent method
-     * @param string $baseGroup
-     * @param string $userLogin
-     * @param int $usersPerPage
-     * @param int $offset
-     * @return float
-     */
-    public function findUserPage($baseGroup, $userLogin, $usersPerPage, $offset = 0){
-
-        $res = dibi::query("SELECT COUNT(*) FROM [ajxp_users] WHERE [login] <= %s", $userLogin);
-        $count = $res->fetchSingle();
-        return ceil(($count - $offset) / $usersPerPage) - 1;
-
-    }
-
-    public function getUsersCount($baseGroup = "/", $regexp = "", $filterProperty = null, $filterValue = null, $recursive = true)
-    {
-        // WITH PARENT
-        // SELECT COUNT(*) FROM ajxp_users AS u, ajxp_user_rights AS r WHERE u.groupPath LIKE '/%' AND r.login=u.login AND r.repo_uuid = 'ajxp.parent_user'
-        // WITH SPECIFIC PARENT 'username'
-        // SELECT COUNT(*) FROM ajxp_users AS u, ajxp_user_rights AS r WHERE u.groupPath LIKE '/%' AND r.login=u.login AND r.repo_uuid = 'ajxp.parent_user' AND r.rights = 'username'
-        // WITHOUT PARENT
-        // SELECT COUNT(*) FROM ajxp_users AS u WHERE NOT EXISTS (SELECT * FROM ajxp_user_rights AS c WHERE c.login=u.login AND c.repo_uuid='ajxp.parent_user')
-        $ands = array();
-        $select = "SELECT COUNT(*) FROM [ajxp_users] AS u WHERE %and";
-
-        if(!empty($regexp)){
-            $ands[] = array("[u.login] ".AJXP_Utils::regexpToLike($regexp), AJXP_Utils::cleanRegexp($regexp));
-        }
-        if($recursive){
-            $ands[] = array("[u.groupPath] LIKE %like~", $baseGroup);
-        }else{
-            $ands[] = array("[u.groupPath] = %s", $baseGroup);
-        }
-        $ands[] = array("NOT EXISTS (SELECT * FROM [ajxp_user_rights] AS c WHERE [c.login]=[u.login] AND [c.repo_uuid] = 'ajxp.hidden')");
-
-        if($filterProperty !== null && $filterValue !== null){
-            if($filterProperty == "parent"){
-                $filterProperty = "ajxp.parent_user";
-            }else if($filterProperty == "admin"){
-                $filterProperty = "ajxp.admin";
-            }
-            if($filterValue == AJXP_FILTER_EMPTY){
-                $ands[] = array("NOT EXISTS (SELECT * FROM [ajxp_user_rights] AS c WHERE [c.login]=[u.login] AND [c.repo_uuid] = %s)",$filterProperty);
-            }else if($filterValue == AJXP_FILTER_NOT_EMPTY){
-                $select = "SELECT COUNT(*) FROM [ajxp_users] AS u, [ajxp_user_rights] AS r WHERE %and";
-                $ands[] = array("[r.login]=[u.login]");
-                $ands[] = array("[r.repo_uuid] = %s", $filterProperty);
-            }else{
-                $select = "SELECT COUNT(*) FROM [ajxp_users] AS u, [ajxp_user_rights] AS r WHERE %and";
-                $ands[] = array("[r.login]=[u.login]");
-                $ands[] = array("[r.repo_uuid] = %s", $filterProperty);
-                $ands[] = array("[r.rights] ".AJXP_Utils::likeToLike($filterValue), AJXP_Utils::cleanLike($filterValue));
-            }
-        }
-
-        $res = dibi::query($select, $ands);
-        return $res->fetchSingle();
-    }
-
-    /**
-     * See parent method
-     * @param string $baseGroup
-     * @param bool|true $recursive
-     * @return array
-     */
-    public function listUsers($baseGroup="/", $recursive = true)
-    {
-        $pairs = array();
-        $ignoreHiddens = "NOT EXISTS (SELECT * FROM [ajxp_user_rights] AS c WHERE [c.login]=[u.login] AND [c.repo_uuid] = 'ajxp.hidden')";
-        $res = dibi::query("SELECT * FROM [ajxp_users] as u WHERE [u.groupPath] LIKE %like~ AND $ignoreHiddens ORDER BY [u.login] ASC", $baseGroup);
-        $rows = $res->fetchAll();
-        foreach ($rows as $row) {
-            $grp = $row["groupPath"];
-            if(strlen($grp) > strlen($baseGroup)) continue;
-            $pairs[$row["login"]] = $row["password"];
-        }
-        return $pairs;
-    }
-
-    public function userExists($login)
-    {
-        $res = dibi::query("SELECT COUNT(*) FROM [ajxp_users] WHERE [login]=%s", $login);
-        return (intval($res->fetchSingle()) > 0);
-    }
-
-    public function checkPassword($login, $pass, $seed)
-    {
-        $userStoredPass = $this->getUserPass($login);
-        if(!$userStoredPass) return false;
-
-        if ($this->getOptionAsBool("TRANSMIT_CLEAR_PASS")) { // Seed = -1 means that password is not encoded.
-            return AJXP_Utils::pbkdf2_validate_password($pass, $userStoredPass); //($userStoredPass == md5($pass));
-        } else {
-            return (md5($userStoredPass.$seed) === $pass);
-        }
-    }
-
-    public function usersEditable()
-    {
-        return true;
-    }
-    public function passwordsEditable()
-    {
-        return true;
-    }
-
-    public function createUser($login, $passwd)
-    {
-        if($this->userExists($login)) return "exists";
-        $userData = array("login" => $login);
-        if ($this->getOptionAsBool("TRANSMIT_CLEAR_PASS")) {
-            $userData["password"] = AJXP_Utils::pbkdf2_create_hash($passwd); //md5($passwd);
-        } else {
-            $userData["password"] = $passwd;
-        }
-        $userData['groupPath'] = '/';
-        dibi::query('INSERT INTO [ajxp_users]', $userData);
-    }
-    public function changePassword($login, $newPass)
-    {
-        if(!$this->userExists($login)) throw new Exception("User does not exists!");
-        $userData = array("login" => $login);
-        if ($this->getOptionAsBool("TRANSMIT_CLEAR_PASS")) {
-            $userData["password"] = AJXP_Utils::pbkdf2_create_hash($newPass); //md5($newPass);
-        } else {
-            $userData["password"] = $newPass;
-        }
-        dibi::query("UPDATE [ajxp_users] SET ", $userData, "WHERE [login]=%s", $login);
-    }
-    public function deleteUser($login)
-    {
-        dibi::query("DELETE FROM [ajxp_users] WHERE [login]=%s", $login);
-    }
-
-    public function getUserPass($login)
-    {
-        $res = dibi::query("SELECT [password] FROM [ajxp_users] WHERE [login]=%s", $login);
-        $pass = $res->fetchSingle();
-        return $pass;
-    }
-
-    public function installSQLTables($param)
-    {
-        $p = AJXP_Utils::cleanDibiDriverParameters($param["SQL_DRIVER"]);
-        return AJXP_Utils::runCreateTablesQuery($p, $this->getBaseDir()."/create.sql");
-    }
-
-}
diff --git a/core/src/plugins/auth.sql/i18n/conf/de.php b/core/src/plugins/auth.sql/i18n/conf/de.php
index c1b43fed6c..423b353184 100644
--- a/core/src/plugins/auth.sql/i18n/conf/de.php
+++ b/core/src/plugins/auth.sql/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "DB Storage" => "DB-Speicher",
diff --git a/core/src/plugins/auth.sql/i18n/conf/en.php b/core/src/plugins/auth.sql/i18n/conf/en.php
index 01784dcd86..8795606d39 100644
--- a/core/src/plugins/auth.sql/i18n/conf/en.php
+++ b/core/src/plugins/auth.sql/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "DB Storage" => "DB Storage",
diff --git a/core/src/plugins/auth.sql/i18n/conf/fr.php b/core/src/plugins/auth.sql/i18n/conf/fr.php
index b4c2c9a931..9ffd68986a 100644
--- a/core/src/plugins/auth.sql/i18n/conf/fr.php
+++ b/core/src/plugins/auth.sql/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "DB Storage" => "Stockage BDD",
diff --git a/core/src/plugins/auth.sql/i18n/conf/it.php b/core/src/plugins/auth.sql/i18n/conf/it.php
index a7f2faa405..c83b5c77b8 100644
--- a/core/src/plugins/auth.sql/i18n/conf/it.php
+++ b/core/src/plugins/auth.sql/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "DB Storage" => "Conservazione DB",
diff --git a/core/src/plugins/auth.sql/i18n/conf/pt.php b/core/src/plugins/auth.sql/i18n/conf/pt.php
index 3de77e9491..0211cb5d3f 100644
--- a/core/src/plugins/auth.sql/i18n/conf/pt.php
+++ b/core/src/plugins/auth.sql/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "DB Storage" => "Armazenamento da BD",
diff --git a/core/src/plugins/auth.sql/manifest.xml b/core/src/plugins/auth.sql/manifest.xml
index 83d898cba1..ddf68d6e5a 100644
--- a/core/src/plugins/auth.sql/manifest.xml
+++ b/core/src/plugins/auth.sql/manifest.xml
@@ -14,7 +14,7 @@
 		<param name="SQL_DRIVER" type="group_switch:dibi" label="CONF_MESSAGE[Connexion]" description="CONF_MESSAGE[The Database Connexion]" default="core" mandatory="true"/>
         <param type="button" name="INSTALL_SQL" choices="run_plugin_action:auth.sql:installSQLTables" label="CONF_MESSAGE[SQL Tables]" description="CONF_MESSAGE[Install SQL Tables]" mandatory="false"/>
 	</server_settings>
-	<class_definition filename="plugins/auth.sql/class.sqlAuthDriver.php" classname="sqlAuthDriver"/>
+	<class_definition filename="plugins/auth.sql/SqlAuthDriver.php" classname="Pydio\Auth\Driver\SqlAuthDriver"/>
 	<registry_contributions>
 		<external_file filename="plugins/core.auth/standard_auth_actions.xml" include="actions/*" exclude=""/>
 	</registry_contributions>
diff --git a/core/src/plugins/authfront.cas/CasAuthFrontend.php b/core/src/plugins/authfront.cas/CasAuthFrontend.php
new file mode 100644
index 0000000000..96080fbbad
--- /dev/null
+++ b/core/src/plugins/authfront.cas/CasAuthFrontend.php
@@ -0,0 +1,435 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Auth\Frontend;
+
+use phpCAS;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Auth\Core\MemorySafe;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Services\AuthService;
+use Pydio\Auth\Frontend\Core\AbstractAuthFrontend;
+use Pydio\Core\Services\ConfService;
+use Pydio\Conf\Sql\SqlConfDriver;
+use Pydio\Core\Services\RolesService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\DBHelper;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+require_once 'CAS.php';
+require_once 'CAS/ProxiedService/Samba.php';
+
+define('PHPCAS_MODE_CLIENT', 'client');
+define('PHPCAS_MODE_PROXY', 'proxy');
+
+/**
+ * Class CasAuthFrontend
+ * @package Pydio\Auth\Frontend
+ */
+class CasAuthFrontend extends AbstractAuthFrontend
+{
+
+    private $cas_server;
+    private $cas_port;
+    private $cas_uri;
+    private $is_AutoCreateUser;
+    private $cas_logoutUrl;
+    //private $forceRedirect;
+
+    private $cas_mode; // client | proxy
+    private $cas_certificate_path;
+    private $cas_proxied_service; //
+    private $pgt_storage_mode; //file | db
+
+    private $cas_debug_mode;
+    private $cas_debug_file;
+    private $cas_modify_login_page;
+    private $cas_additional_role;
+    private $cas_setFixedCallbackURL;
+
+
+    /**
+     * Try to authenticate the user based on various external parameters
+     * Return true if user is now logged.
+     *
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @param bool $isLast Whether this is is the last plugin called.
+     * @return bool
+     */
+    function tryToLogUser(ServerRequestInterface &$request, ResponseInterface &$response, $isLast = false)
+    {
+        $httpVars = $request->getParsedBody();
+
+        if (ApplicationState::hasMinisiteHash()) {
+            return false;
+        }
+
+        $this->loadConfig();
+
+        if (isset($_SESSION['AUTHENTICATE_BY_CAS'])) {
+            $flag = $_SESSION['AUTHENTICATE_BY_CAS'];
+        } else {
+            $flag = 0;
+        }
+
+        $pgtIou = !empty($httpVars['pgtIou']);
+        $logged = isset($_SESSION['LOGGED_IN_BY_CAS']);
+        $enre = !empty($httpVars['put_action_enable_redirect']);
+        $ticket = !empty($httpVars['ticket']);
+        $pgt = !empty($_SESSION['phpCAS']['pgt']);
+        $clientModeTicketPendding = isset($_SESSION['AUTHENTICATE_BY_CAS_CLIENT_MOD_TICKET_PENDDING']);
+
+        if ($this->cas_modify_login_page) {
+
+            if (($flag == 0) && ($enre) && !$logged && !$pgtIou) {
+                $_SESSION['AUTHENTICATE_BY_CAS'] = 1;
+            } elseif (($flag == 1) && (!$enre) && !$logged && !$pgtIou && !$ticket && !$pgt) {
+                $_SESSION['AUTHENTICATE_BY_CAS'] = 0;
+            } elseif (($flag == 1) && ($enre) && !$logged && !$pgtIou) {
+                $_SESSION['AUTHENTICATE_BY_CAS'] = 1;
+            } elseif ($pgtIou || $pgt) {
+                $_SESSION['AUTHENTICATE_BY_CAS'] = 1;
+            } elseif ($ticket) {
+                $_SESSION['AUTHENTICATE_BY_CAS'] = 1;
+                $_SESSION['AUTHENTICATE_BY_CAS_CLIENT_MOD_TICKET_PENDDING'] = 1;
+            } elseif ($logged && $pgtIou) {
+                $_SESSION['AUTHENTICATE_BY_CAS'] = 2;
+            } else {
+                $_SESSION['AUTHENTICATE_BY_CAS'] = 0;
+            }
+            if ($_SESSION['AUTHENTICATE_BY_CAS'] < 1) {
+                if ($clientModeTicketPendding) {
+                    unset($_SESSION['AUTHENTICATE_BY_CAS_CLIENT_MOD_TICKET_PENDDING']);
+                } else {
+                    return false;
+                }
+            }
+        }
+
+        /**
+         * Depend on phpCAS mode configuration
+         */
+        switch ($this->cas_mode) {
+            case PHPCAS_MODE_CLIENT:
+                if ($this->checkConfigurationForClientMode()) {
+
+                    Logger::info(__FUNCTION__, "Start phpCAS mode Client: ", "sucessfully");
+
+                    phpCAS::client(CAS_VERSION_2_0, $this->cas_server, $this->cas_port, $this->cas_uri, false);
+
+                    if (!empty($this->cas_certificate_path)) {
+                        phpCAS::setCasServerCACert($this->cas_certificate_path);
+                    } else {
+                        phpCAS::setNoCasServerValidation();
+                    }
+
+                    /**
+                     * Debug
+                     */
+                    if ($this->cas_debug_mode) {
+                        // logfile name by date:
+                        $today = getdate();
+                        $file_path = AJXP_DATA_PATH . '/logs/phpcas_' . $today['year'] . '-' . $today['month'] . '-' . $today['mday'] . '.txt';
+                        $file_path = empty($this->cas_debug_file) ? $file_path : $this->cas_debug_file;
+                        phpCAS::setDebug($file_path);
+                    }
+
+                    phpCAS::forceAuthentication();
+
+                } else {
+                    Logger::error(__FUNCTION__, "Could not start phpCAS mode CLIENT, please verify the configuration", "");
+                    return false;
+                }
+                break;
+            case PHPCAS_MODE_PROXY:
+                /**
+                 * If in login page, user click on login via CAS, the page will be reload with manuallyredirectocas is set.
+                 * Or force redirect to cas login page even the force redirect is set in configuration of this module
+                 *
+                 */
+
+                if ($this->checkConfigurationForProxyMode()) {
+                    Logger::info(__FUNCTION__, "Start phpCAS mode Proxy: ", "sucessfully");
+                    /**
+                     * init phpCAS in mode proxy
+                     */
+
+                    phpCAS::proxy(CAS_VERSION_2_0, $this->cas_server, $this->cas_port, $this->cas_uri, false);
+
+                    if (!empty($this->cas_certificate_path)) {
+                        phpCAS::setCasServerCACert($this->cas_certificate_path);
+                    } else {
+                        phpCAS::setNoCasServerValidation();
+                    }
+
+                    /**
+                     * Debug
+                     */
+                    if ($this->cas_debug_mode) {
+                        // logfile name by date:
+                        $today = getdate();
+                        $file_path = AJXP_DATA_PATH . '/logs/phpcas_' . $today['year'] . '-' . $today['month'] . '-' . $today['mday'] . '.txt';
+                        empty($this->cas_debug_file) ? $file_path : $file_path = $this->cas_debug_file;
+                        phpCAS::setDebug($file_path);
+                    }
+
+                    if (!empty($this->cas_setFixedCallbackURL)) {
+                        phpCAS::setFixedCallbackURL($this->cas_setFixedCallbackURL);
+                    }
+                    //
+                    /**
+                     * PTG storage
+                     */
+                    $this->setPTGStorage();
+
+                    phpCAS::forceAuthentication();
+                    /**
+                     * Get proxy ticket (PT) for SAMBA to authentication at CAS via pam_cas
+                     * In fact, we can use any other service. Of course, it should be enabled in CAS
+                     *
+                     */
+                    $err_code = null;
+                    $serviceURL = $this->cas_proxied_service;
+                    Logger::debug(__FUNCTION__, "Try to get proxy ticket for service: ", $serviceURL);
+                    $res = phpCAS::serviceSMB($serviceURL, $err_code);
+
+                    if (!empty($res)) {
+                        $_SESSION['PROXYTICKET'] = $res;
+                        Logger::info(__FUNCTION__, "Get Proxy ticket successfully ", "");
+                    } else {
+                        Logger::info(__FUNCTION__, "Could not get Proxy ticket. ", "");
+                    }
+                    break;
+                } else {
+                    Logger::error(__FUNCTION__, "Could not start phpCAS mode PROXY, please verify the configuration", "");
+                    return false;
+                }
+
+            default:
+                return false;
+                break;
+        }
+
+        Logger::debug(__FUNCTION__, "Call phpCAS::getUser() after forceAuthentication ", "");
+        $cas_user = phpCAS::getUser();
+        if (!UsersService::userExists($cas_user) && $this->is_AutoCreateUser) {
+            UsersService::createUser($cas_user, openssl_random_pseudo_bytes(20));
+        }
+        if (UsersService::userExists($cas_user)) {
+            try {
+                $userObj = AuthService::logUser($cas_user, "", true);
+                AuthService::updateSessionUser($userObj);
+                MemorySafe::storeCredentials($cas_user, $_SESSION['PROXYTICKET']);
+                $_SESSION['LOGGED_IN_BY_CAS'] = true;
+
+                if (!empty($this->cas_additional_role)) {
+                    $userObj = UsersService::getUserById($cas_user, false);
+                    $cas_RoleID = $this->cas_additional_role;
+                    $userObj->addRole(RolesService::getOrCreateRole($cas_RoleID, $userObj->getGroupPath()));
+                    //AuthService::updateUser($userObj);
+                }
+
+                // try to log to DEFAULT START REPO
+                /*
+                 * WILL BE APPLIED LATER
+                $userObj->recomputeMergedRole();
+                $loggedUser = $userObj;
+                $force = $loggedUser->mergedRole->filterParameterValue("core.conf", "DEFAULT_START_REPOSITORY", AJXP_REPO_SCOPE_ALL, -1);
+                $passId = -1;
+                if (isSet($httpVars["tmp_repository_id"])) {
+                    $passId = $httpVars["tmp_repository_id"];
+                } else if ($force != "" && $loggedUser->canSwitchTo($force) && !isSet($httpVars["tmp_repository_id"]) && !isSet($_SESSION["PENDING_REPOSITORY_ID"])) {
+                    $passId = $force;
+                }
+                ConfService::switchUserToActiveRepository($loggedUser, $passId);
+                */
+
+                $request = $request->withAttribute("ctx", Context::contextWithObjects($userObj, null));
+                return true;
+            } catch (\Pydio\Core\Exception\LoginException $l) {
+
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     */
+    function logOutCAS(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface)
+    {
+        $action = $requestInterface->getAttribute("action");
+        if ($action !== "logout") return;
+
+        require_once "LogoutUrlMessage.php";
+        $x = new \Pydio\Core\Http\Response\SerializableResponseStream();
+        $responseInterface = $responseInterface->withBody($x);
+
+        if (isset($_SESSION['LOGGED_IN_BY_CAS'])) {
+            AuthService::disconnect();
+
+            $this->loadConfig();
+            if (!empty($this->pluginConf["LOGOUT_URL"])) {
+                $this->cas_logoutUrl = trim($this->pluginConf["LOGOUT_URL"]);
+            } else {
+                empty($this->pluginConf["CAS_URI"]) ? $logout_default = 'logout' : $logout_default = '/logout';
+                $this->cas_logoutUrl = 'https://' . $this->cas_server . ':' . $this->cas_port . $this->cas_uri . '/logout';
+            }
+
+            $x->addChunk(new LogoutUrlMessage($this->cas_logoutUrl));
+            session_unset();
+            session_destroy();
+        } else {
+            AuthService::disconnect();
+            $x->addChunk(new LogoutUrlMessage("#"));
+            session_unset();
+            session_destroy();
+        }
+
+    }
+
+    function loadConfig()
+    {
+        if (!empty($this->pluginConf["CAS_SERVER"])) {
+            $this->cas_server = trim($this->pluginConf["CAS_SERVER"]);
+        }
+
+        if (!empty($this->pluginConf["CAS_PORT"])) {
+            $this->cas_port = intval($this->pluginConf["CAS_PORT"]);
+        } else {
+            $this->cas_port = 443;
+        }
+
+        if (!empty($this->pluginConf["CAS_URI"])) {
+            $this->cas_uri = trim($this->pluginConf["CAS_URI"]);
+        } else {
+            $this->cas_uri = "/";
+        }
+
+        if (!empty($this->pluginConf["CREATE_USER"])) {
+            $this->is_AutoCreateUser = ($this->pluginConf["CREATE_USER"] == "true");
+        }
+
+        if (!empty($this->pluginConf["LOGOUT_URL"])) {
+            $this->cas_logoutUrl = trim($this->pluginConf["LOGOUT_URL"]);
+        } else {
+            empty($this->pluginConf["CAS_URI"]) ? $logout_default = 'logout' : $logout_default = '/logout';
+            $this->cas_logoutUrl = 'https://' . $this->cas_server . ':' . $this->cas_port . $this->cas_uri . '/logout';
+        }
+
+        if (!empty($this->pluginConf["ADDITIONAL_ROLE"])) {
+            $this->cas_additional_role = $this->pluginConf["ADDITIONAL_ROLE"];
+        }
+
+        if (!empty($this->pluginConf["PHPCAS_MODE"]["casmode"])) {
+            $this->cas_mode = $this->pluginConf["PHPCAS_MODE"]["casmode"];
+        }
+        else{
+            $this->cas_mode = PHPCAS_MODE_CLIENT;
+        }
+        
+        if (!empty($this->pluginConf["CERTIFICATE_PATH"])) {
+            $this->cas_certificate_path = trim($this->pluginConf["CERTIFICATE_PATH"]);
+        }
+        if (!empty($this->pluginConf["PHPCAS_MODE"]["PTG_STORE_MODE"])) {
+            $this->pgt_storage_mode = $this->pluginConf["PHPCAS_MODE"]["PTG_STORE_MODE"];
+        }
+        if (!empty($this->pluginConf["PHPCAS_MODE"]["PROXIED_SERVICE_SMB"])) {
+            $this->cas_proxied_service = $this->pluginConf["PHPCAS_MODE"]["PROXIED_SERVICE_SMB"];
+        }
+        if (!empty($this->pluginConf["PHPCAS_MODE"]["FIXED_CALLBACK_URL"])) {
+            $this->cas_setFixedCallbackURL = $this->pluginConf["PHPCAS_MODE"]["FIXED_CALLBACK_URL"];
+        }
+        if (!empty($this->pluginConf["DEBUG_MODE"])) {
+            $this->cas_debug_mode = $this->pluginConf["DEBUG_MODE"];
+        }
+        if (!empty($this->pluginConf["DEBUG_FILE"]) && $this->cas_debug_mode) {
+            $this->cas_debug_file = trim($this->pluginConf["DEBUG_FILE"]);
+        }
+
+        if (!empty($this->pluginConf["MODIFY_LOGIN_SCREEN"])) {
+            $this->cas_modify_login_page = trim($this->pluginConf["MODIFY_LOGIN_SCREEN"]);
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    function checkConfigurationForClientMode()
+    {
+        return !empty($this->cas_server) &&
+        (strcmp($this->cas_mode, PHPCAS_MODE_CLIENT) === 0);
+    }
+
+    /**
+     * @return bool
+     */
+    function checkConfigurationForProxyMode()
+    {
+        return !empty($this->cas_server) &&
+        !empty($this->cas_uri) &&
+        (strcmp($this->cas_mode, PHPCAS_MODE_PROXY) === 0) &&
+        !empty($this->cas_proxied_service);
+    }
+
+    private function setPTGStorage()
+    {
+        switch (strtolower($this->pgt_storage_mode)) {
+            case 'file':
+                phpCAS::setPGTStorageFile(session_save_path());
+                break;
+            case 'db':
+                $dbconfig = ConfService::getConfStorageImpl();
+                /**
+                 * support only for mySQL
+                 */
+                if ($dbconfig instanceof SqlConfDriver) {
+                    if (!empty($dbconfig->sqlDriver["username"])) {
+                        $db_username = $dbconfig->sqlDriver["username"];
+                        $db_password = $dbconfig->sqlDriver["password"];
+                        $db_database = "mysql:" . "dbname=" . $dbconfig->sqlDriver["database"] . ";host=" . $dbconfig->sqlDriver["host"];
+                        $db_table = "ajxp_cas_pgt";
+                        Logger::info(__CLASS__, __FUNCTION__, $db_database);
+                        phpCAS::setPGTStorageDb($db_database, $db_username, $db_password, $db_table, "");
+                    }
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function installSQLTables()
+    {
+        $param = ConfService::getConfStorageImpl();
+        $p = $param->sqlDriver;
+        return DBHelper::runCreateTablesQuery($p, $this->getBaseDir() . '/createPGTStorage.mysql');
+    }
+}
diff --git a/core/src/plugins/authfront.cas/LogoutUrlMessage.php b/core/src/plugins/authfront.cas/LogoutUrlMessage.php
new file mode 100644
index 0000000000..c5613ee484
--- /dev/null
+++ b/core/src/plugins/authfront.cas/LogoutUrlMessage.php
@@ -0,0 +1,60 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+
+namespace Pydio\Auth\Frontend;
+use Pydio\Core\Http\Response\XMLDocSerializableResponseChunk;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class LogoutUrlMessage
+ * @package Pydio\Auth\Frontend
+ */
+class LogoutUrlMessage implements XMLDocSerializableResponseChunk
+{
+    protected $url;
+
+    /**
+     * LogoutUrlMessage constructor.
+     * @param $url
+     */
+    public function __construct($url)
+    {
+        $this->url = $url;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCharset()
+    {
+        return "UTF-8";
+    }
+
+    /**
+     * @return string
+     */
+    public function toXML()
+    {
+        return "<url>" . $this->url . "</url>";
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/authfront.cas/class.CAS_LoginForm.js b/core/src/plugins/authfront.cas/class.CAS_LoginForm.js
index 9bd2a91bbc..ffbf4fb55e 100755
--- a/core/src/plugins/authfront.cas/class.CAS_LoginForm.js
+++ b/core/src/plugins/authfront.cas/class.CAS_LoginForm.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  *
  */
 Class.create("CAS_LoginForm", {
diff --git a/core/src/plugins/authfront.cas/class.CasAuthFrontend.php b/core/src/plugins/authfront.cas/class.CasAuthFrontend.php
deleted file mode 100755
index cbf9b7e844..0000000000
--- a/core/src/plugins/authfront.cas/class.CasAuthFrontend.php
+++ /dev/null
@@ -1,383 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die('Access not allowed');
-
-require_once 'CAS.php';
-require_once 'CAS/ProxiedService/Samba.php';
-
-define(PHPCAS_MODE_CLIENT, 'client');
-define(PHPCAS_MODE_PROXY, 'proxy');
-
-class CasAuthFrontend extends AbstractAuthFrontend
-{
-
-    private $cas_server;
-    private $cas_port;
-    private $cas_uri;
-    private $is_AutoCreateUser;
-    private $cas_logoutUrl;
-    //private $forceRedirect;
-
-    private $cas_mode; // client | proxy
-    private $cas_certificate_path;
-    private $cas_proxied_service; //
-    private $pgt_storage_mode; //file | db
-
-    private $cas_debug_mode;
-    private $cas_debug_file;
-    private $cas_modify_login_page;
-    private $cas_additional_role;
-    private $cas_setFixedCallbackURL;
-
-
-    function tryToLogUser(&$httpVars, $isLast = false)
-    {
-        if(isset($_SESSION["CURRENT_MINISITE"])){
-            return false;
-        }
-
-        $this->loadConfig();
-
-        if(isset($_SESSION['AUTHENTICATE_BY_CAS'])){
-            $flag = $_SESSION['AUTHENTICATE_BY_CAS'];
-        }else{
-            $flag = 0;
-        }
-
-        $pgtIou = !empty($httpVars['pgtIou']);
-        $logged = isset($_SESSION['LOGGED_IN_BY_CAS']);
-        $enre = !empty($httpVars['put_action_enable_redirect']);
-        $ticket = !empty($httpVars['ticket']);
-        $pgt = !empty($_SESSION['phpCAS']['pgt']);
-        $clientModeTicketPendding = isset($_SESSION['AUTHENTICATE_BY_CAS_CLIENT_MOD_TICKET_PENDDING']);
-
-        if ($this->cas_modify_login_page) {
-
-            if(($flag == 0) && ($enre) && !$logged && !$pgtIou){
-                $_SESSION['AUTHENTICATE_BY_CAS'] = 1;
-            }elseif(($flag == 1) && (!$enre) && !$logged && !$pgtIou && !$ticket && !$pgt){
-                $_SESSION['AUTHENTICATE_BY_CAS'] = 0;
-            }elseif(($flag == 1) && ($enre) && !$logged && !$pgtIou){
-                $_SESSION['AUTHENTICATE_BY_CAS'] = 1;
-            }elseif($pgtIou || $pgt){
-                $_SESSION['AUTHENTICATE_BY_CAS'] = 1;
-            }elseif($ticket){
-                $_SESSION['AUTHENTICATE_BY_CAS'] = 1;
-                $_SESSION['AUTHENTICATE_BY_CAS_CLIENT_MOD_TICKET_PENDDING'] = 1;
-            }elseif($logged && $pgtIou){
-                $_SESSION['AUTHENTICATE_BY_CAS'] = 2;
-            }else{
-                $_SESSION['AUTHENTICATE_BY_CAS'] = 0;
-            }
-            if ($_SESSION['AUTHENTICATE_BY_CAS'] < 1) {
-                if($clientModeTicketPendding){
-                    unset($_SESSION['AUTHENTICATE_BY_CAS_CLIENT_MOD_TICKET_PENDDING']);
-                }else{
-                    return false;
-                }
-            }
-        }
-
-        /**
-         * Depend on phpCAS mode configuration
-         */
-        switch ($this->cas_mode) {
-            case PHPCAS_MODE_CLIENT:
-                if ($this->checkConfigurationForClientMode()) {
-
-                    AJXP_Logger::info(__FUNCTION__, "Start phpCAS mode Client: ", "sucessfully");
-
-                    phpCAS::client(CAS_VERSION_2_0, $this->cas_server, $this->cas_port, $this->cas_uri, false);
-
-                    if (!empty($this->cas_certificate_path)) {
-                        phpCAS::setCasServerCACert($this->cas_certificate_path);
-                    } else {
-                        phpCAS::setNoCasServerValidation();
-                    }
-
-                    /**
-                     * Debug
-                     */
-                    if ($this->cas_debug_mode) {
-                        // logfile name by date:
-                        $today = getdate();
-                        $file_path = AJXP_DATA_PATH. '/logs/phpcas_'.$today['year'].'-'.$today['month'].'-'.$today['mday'].'.txt';
-                        empty($this->cas_debug_file) ? $file_path: $file_path = $this->cas_debug_file;
-                        phpCAS::setDebug($file_path);
-                    }
-
-                   phpCAS::forceAuthentication();
-
-                } else {
-                    AJXP_Logger::error(__FUNCTION__, "Could not start phpCAS mode CLIENT, please verify the configuration", "");
-                    return false;
-                }
-                break;
-            case PHPCAS_MODE_PROXY:
-                /**
-                 * If in login page, user click on login via CAS, the page will be reload with manuallyredirectocas is set.
-                 * Or force redirect to cas login page even the force redirect is set in configuration of this module
-                 *
-                 */
-
-                if ($this->checkConfigurationForProxyMode()) {
-                    AJXP_Logger::info(__FUNCTION__, "Start phpCAS mode Proxy: ", "sucessfully");
-                    /**
-                     * init phpCAS in mode proxy
-                     */
-
-                    phpCAS::proxy(CAS_VERSION_2_0, $this->cas_server, $this->cas_port, $this->cas_uri, false);
-
-                    if (!empty($this->cas_certificate_path)) {
-                        phpCAS::setCasServerCACert($this->cas_certificate_path);
-                    } else {
-                        phpCAS::setNoCasServerValidation();
-                    }
-
-                    /**
-                     * Debug
-                     */
-                    if ($this->cas_debug_mode) {
-                         // logfile name by date:
-                        $today = getdate();
-                        $file_path = AJXP_DATA_PATH. '/logs/phpcas_'.$today['year'].'-'.$today['month'].'-'.$today['mday'].'.txt';
-                        empty($this->cas_debug_file) ? $file_path: $file_path = $this->cas_debug_file;
-                        phpCAS::setDebug($file_path);
-                    }
-
-                    if(!empty($this->cas_setFixedCallbackURL)){
-                        phpCAS::setFixedCallbackURL($this->cas_setFixedCallbackURL);
-                    }
-                    //
-                    /**
-                     * PTG storage
-                     */
-                    $this->setPTGStorage();
-
-                    phpCAS::forceAuthentication();
-                    /**
-                     * Get proxy ticket (PT) for SAMBA to authentication at CAS via pam_cas
-                     * In fact, we can use any other service. Of course, it should be enabled in CAS
-                     *
-                     */
-                    $err_code = null;
-                    $serviceURL = $this->cas_proxied_service;
-                    AJXP_Logger::debug(__FUNCTION__, "Try to get proxy ticket for service: ", $serviceURL);
-                    $res = phpCAS::serviceSMB($serviceURL, $err_code);
-
-                    if (!empty($res)) {
-                        $_SESSION['PROXYTICKET'] = $res;
-                        AJXP_Logger::info(__FUNCTION__, "Get Proxy ticket successfully ", "");
-                    } else {
-                        AJXP_Logger::info(__FUNCTION__, "Could not get Proxy ticket. ", "");
-                    }
-                    break;
-                } else {
-                    AJXP_Logger::error(__FUNCTION__, "Could not start phpCAS mode PROXY, please verify the configuration", "");
-                    return false;
-                }
-
-            default:
-                return false;
-                break;
-        }
-
-        AJXP_Logger::debug(__FUNCTION__, "Call phpCAS::getUser() after forceAuthentication ", "");
-        $cas_user = phpCAS::getUser();
-        if (!AuthService::userExists($cas_user) && $this->is_AutoCreateUser) {
-            AuthService::createUser($cas_user, openssl_random_pseudo_bytes(20));
-        }
-        if (AuthService::userExists($cas_user)) {
-            $res = AuthService::logUser($cas_user, "", true);
-            if ($res > 0) {
-                AJXP_Safe::storeCredentials($cas_user, $_SESSION['PROXYTICKET']);
-                $_SESSION['LOGGED_IN_BY_CAS'] = true;
-
-                if(!empty($this->cas_additional_role)){
-                    $userObj = ConfService::getConfStorageImpl()->createUserObject($cas_user);
-                    $roles = $userObj->getRoles();
-                    $cas_RoleID = $this->cas_additional_role;
-                    $userObj->addRole(AuthService::getRole($cas_RoleID, true));
-                    AuthService::updateUser($userObj);
-                }
-
-                // try to log to DEFAULT START REPO
-                $userObj->recomputeMergedRole();
-                $loggedUser = $userObj;
-                $force = $loggedUser->mergedRole->filterParameterValue("core.conf", "DEFAULT_START_REPOSITORY", AJXP_REPO_SCOPE_ALL, -1);
-                $passId = -1;
-                if (isSet($httpVars["tmp_repository_id"])) {
-                    $passId = $httpVars["tmp_repository_id"];
-                } else if ($force != "" && $loggedUser->canSwitchTo($force) && !isSet($httpVars["tmp_repository_id"]) && !isSet($_SESSION["PENDING_REPOSITORY_ID"])) {
-                    $passId = $force;
-                }
-                ConfService::switchUserToActiveRepository($loggedUser, $passId);
-
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    function logOutCAS($action, $httpVars, $fileVars)
-    {
-        switch ($action) {
-            case "logout":
-                if(isset($_SESSION['LOGGED_IN_BY_CAS'])){
-                    AuthService::disconnect();
-
-                    $this->loadConfig();
-                    if (!empty($this->pluginConf["LOGOUT_URL"])) {
-                        $this->cas_logoutUrl = trim($this->pluginConf["LOGOUT_URL"]);
-                    } else {
-                        empty($this->pluginConf["CAS_URI"]) ? $logout_default = 'logout' : $logout_default = '/logout';
-                        $this->cas_logoutUrl = 'https://' . $this->cas_server . ':' . $this->cas_port . $this->cas_uri . '/logout';
-                    }
-
-                    AJXP_XMLWriter::header("url");
-                    echo $this->cas_logoutUrl;
-                    AJXP_XMLWriter::close("url");
-                    session_unset();
-                    session_destroy();
-                }else{
-                    AuthService::disconnect();
-                    AJXP_XMLWriter::header("url");
-                    echo "#";
-                    AJXP_XMLWriter::close("url");
-                    session_unset();
-                    session_destroy();
-                }
-                break;
-            default:
-
-                break;
-        }
-    }
-
-    function loadConfig()
-    {
-        if (!empty($this->pluginConf["CAS_SERVER"])) {
-            $this->cas_server = trim($this->pluginConf["CAS_SERVER"]);
-        }
-
-        if (!empty($this->pluginConf["CAS_PORT"])) {
-            $this->cas_port = intval($this->pluginConf["CAS_PORT"]);
-        } else {
-            $this->cas_port = 443;
-        }
-
-        if (!empty($this->pluginConf["CAS_URI"])) {
-            $this->cas_uri = trim($this->pluginConf["CAS_URI"]);
-        } else {
-            $this->cas_uri = "/";
-        }
-
-        if (!empty($this->pluginConf["CREATE_USER"])) {
-            $this->is_AutoCreateUser = ($this->pluginConf["CREATE_USER"] == "true");
-        }
-
-        if (!empty($this->pluginConf["LOGOUT_URL"])) {
-            $this->cas_logoutUrl = trim($this->pluginConf["LOGOUT_URL"]);
-        } else {
-            empty($this->pluginConf["CAS_URI"]) ? $logout_default = 'logout' : $logout_default = '/logout';
-            $this->cas_logoutUrl = 'https://' . $this->cas_server . ':' . $this->cas_port . $this->cas_uri . '/logout';
-        }
-
-        if (!empty($this->pluginConf["ADDITIONAL_ROLE"])) {
-            $this->cas_additional_role = $this->pluginConf["ADDITIONAL_ROLE"];
-        }
-
-        if (!empty($this->pluginConf["PHPCAS_MODE"]["casmode"])) {
-            $this->cas_mode = $this->pluginConf["PHPCAS_MODE"]["casmode"];
-        }
-        if (!empty($this->pluginConf["CERTIFICATE_PATH"])) {
-            $this->cas_certificate_path = trim($this->pluginConf["CERTIFICATE_PATH"]);
-        }
-        if (!empty($this->pluginConf["PHPCAS_MODE"]["PTG_STORE_MODE"])) {
-            $this->pgt_storage_mode = $this->pluginConf["PHPCAS_MODE"]["PTG_STORE_MODE"];
-        }
-        if (!empty($this->pluginConf["PHPCAS_MODE"]["PROXIED_SERVICE_SMB"])) {
-            $this->cas_proxied_service = $this->pluginConf["PHPCAS_MODE"]["PROXIED_SERVICE_SMB"];
-        }
-        if (!empty($this->pluginConf["PHPCAS_MODE"]["FIXED_CALLBACK_URL"])) {
-            $this->cas_setFixedCallbackURL = $this->pluginConf["PHPCAS_MODE"]["FIXED_CALLBACK_URL"];
-        }
-        if (!empty($this->pluginConf["DEBUG_MODE"])) {
-            $this->cas_debug_mode = $this->pluginConf["DEBUG_MODE"];
-        }
-        if (!empty($this->pluginConf["DEBUG_FILE"]) && $this->cas_debug_mode) {
-            $this->cas_debug_file = trim($this->pluginConf["DEBUG_FILE"]);
-        }
-
-        if (!empty($this->pluginConf["MODIFY_LOGIN_SCREEN"])) {
-            $this->cas_modify_login_page = trim($this->pluginConf["MODIFY_LOGIN_SCREEN"]);
-        }
-    }
-
-    function checkConfigurationForClientMode()
-    {
-        return !empty($this->cas_server) &&
-        (strcmp($this->cas_mode, PHPCAS_MODE_CLIENT) === 0);
-    }
-
-    function checkConfigurationForProxyMode()
-    {
-        return !empty($this->cas_server) &&
-        !empty($this->cas_uri) &&
-        (strcmp($this->cas_mode, PHPCAS_MODE_PROXY) === 0) &&
-        !empty($this->cas_proxied_service);
-    }
-
-    private function setPTGStorage()
-    {
-        switch (strtolower($this->pgt_storage_mode)) {
-            case 'file':
-                phpCAS::setPGTStorageFile(session_save_path());
-                break;
-            case 'db':
-                $dbconfig = ConfService::getConfStorageImpl();
-                /**
-                 * support only for mySQL
-                 */
-                if ($dbconfig instanceof sqlConfDriver) {
-                    if (!empty($dbconfig->sqlDriver["username"])) {
-                        $db_username = $dbconfig->sqlDriver["username"];
-                        $db_password = $dbconfig->sqlDriver["password"];
-                        $db_database = "mysql:"."dbname=".$dbconfig->sqlDriver["database"].";host=".$dbconfig->sqlDriver["host"];
-                        $db_table = "ajxp_cas_pgt";
-                        AJXP_Logger::info(__CLASS__, __FUNCTION__, $db_database);
-                        phpCAS::setPGTStorageDB($db_database, $db_username, $db_password, $db_table, "");
-                    }
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-    public function installSQLTables()
-    {
-        $param = ConfService::getConfStorageImpl();
-        $p = $param->sqlDriver;
-        return AJXP_Utils::runCreateTablesQuery($p, $this->getBaseDir() . '/createPGTStorage.mysql');
-    }
-}
diff --git a/core/src/plugins/authfront.cas/i18n/conf/de.php b/core/src/plugins/authfront.cas/i18n/conf/de.php
index b8d1798377..82c87f1c11 100755
--- a/core/src/plugins/authfront.cas/i18n/conf/de.php
+++ b/core/src/plugins/authfront.cas/i18n/conf/de.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/authfront.cas/i18n/conf/en.php b/core/src/plugins/authfront.cas/i18n/conf/en.php
index 04d664d807..cae741b333 100755
--- a/core/src/plugins/authfront.cas/i18n/conf/en.php
+++ b/core/src/plugins/authfront.cas/i18n/conf/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/authfront.cas/i18n/conf/es.php b/core/src/plugins/authfront.cas/i18n/conf/es.php
index b3cb0d8dad..42fad2dbb9 100755
--- a/core/src/plugins/authfront.cas/i18n/conf/es.php
+++ b/core/src/plugins/authfront.cas/i18n/conf/es.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Order" => "Order.",
@@ -65,4 +65,4 @@
 "mySQL Tables" => "MySQL Tables",
 "Set Fixed Callback Url" => "Set Fixed Callback Url",
 "CAS will call this url to pass pgtID and pgtIOU. It's very useful when you deploy Pydio in several nodes" => "CAS will call this url to pass pgtID and pgtIOU. It's very useful when you deploy Pydio in several nodes",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/authfront.cas/i18n/conf/fr.php b/core/src/plugins/authfront.cas/i18n/conf/fr.php
index a696b04d81..fd0e463963 100755
--- a/core/src/plugins/authfront.cas/i18n/conf/fr.php
+++ b/core/src/plugins/authfront.cas/i18n/conf/fr.php
@@ -1,69 +1,54 @@
 <?php
 /*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
 
 $mess = array(
-"Order" => "Commande",
-"Order this plugin with other auth frontends" => "Commander ce plugin avec d'autres interfaces d'authentification",
-"Create User" => "Créer un utilisateur",
-"Automatically create user if it does not already exists" => "Créer automatiquement l'utilisateur s'il n'existe pas déjà",
-"General" =>"Général" ,
-"Protocol Type" =>"Type de protocole",
-"Enable/disable automatically based on the protocol used" => "Activer / désactiver automatiquement en fonction du protocole utilisé",
-"CAS server address" => "Adresse du serveur CAS",
-"CAS Server" => "Serveur CAS",
-"CAS Port" => "Port CAS" ,
-"Port where CAS server is running on. Default: 443" => "Port utilisé par le serveur CAS. Par défaut : 443",
-"CAS URI" => "URI CAS" ,
-"URI for CAS service (without / at the end). Default:" => "URI du service CAS (sans / à la fin). Par défaut : ",
-"Redirect to the given URL on loggin out" => "Rediriger vers l'URL à la déconnexion",
-"Modify login page" => "Modifier la page de connexion",
-"Login page will be modified to give user a link to authenticate via CAS manually. Otherwise Pydio will redirect automatically to CAS login page." => "La page de connexion sera modifiée afin de fournir aux utilisateur un lien pour se connecter manuellement via CAS. Sinon, Pydio redirigera automatiquement vers  la page de connexion CAS.",
-"Certificate path" => "Chemin du certificat" ,
-"Path to the ca chain that issued the cas server certificate" => "Chemin de la chaîne ca qui a émis le certificat du serveur CAS",
-"Debug mode" => "Mode débug",
-"Debug file" => "Fichier de débug",
-"Set phpCAS in debug mode" => "Définir phpCAS en mode débug",
-"Log to file. If null, use yyyy-mm-dd.txt" => "Journaliser dans le fichier. Si nul, utilisera yyyy-mm-dd.txt",
-"phpCAS mode" => "Mode phpCAS",
-"In mode proxy, phpCAS works as a CAS Proxy who provides Proxy ticket for others services such as SMB, IMAP." => "En mode proxy, phpCAS fonctionnera comme un proxy CAS fournissant un ticket proxy pour les autres services tels SMB, IMAP.",
-"Client" => "Client" ,
-"Proxy" => "Proxy" ,
-"Proxied Service" => "Service Proxifié" ,
-"Proxied service who uses Proxy Ticket provided by this CAS Proxy.Ex smb://pydio.com" => "Service proxifié utilisant un ticket proxy fourni par ce proxy CAS. Ex : smb://pydio.com",
-"PTG store mode" => "Stockage du mode PTG" ,
-"Config for Proxy Granting Ticket Storage. If is file option, location for storate is session_save_path()" => "Configuration pour Proxy Granting Ticket Storage. Si un fichier est utilisé, l'emplacement du stockage sera session_save_path()",
-"Install SQL Table (support only mysql)" => "Installer la table SQL (supporte uniquement mysql)",
-"CAS FrontEnd" => "CAS FrontEnd",
-"Authentication by CAS" => "Authentication by CAS",
-"Sessions Only" => "Sessions Only",
-"URI for CAS service (without / at the end). Default: /" => "URI for CAS service (without / at the end). Default: /",
-"Logout URL" => "Logout URL",
-"String for CAS auth" => "String for CAS auth",
-"This message will be appeared in login page. Ex: Use CAS credential" => "This message will be appeared in login page. Ex: Use CAS credential",
-"String for Pydio auth" => "String for Pydio auth",
-"This message will be appeared in login page. Ex: Use Pydio credential" => "This message will be appeared in login page. Ex: Use Pydio credential",
-"String for button click here" => "String for button click here",
-"Additional roles for user logged in by CAS" => "Additional roles for user logged in by CAS",
-"In mode proxy, phpCAS works as a CAS Proxy who provides Proxy ticket for others services such as SMB, IMAP" => "In mode proxy, phpCAS works as a CAS Proxy who provides Proxy ticket for others services such as SMB, IMAP",
-"mySQL Tables" => "MySQL Tables",
-"Set Fixed Callback Url" => "Set Fixed Callback Url",
-"CAS will call this url to pass pgtID and pgtIOU. It's very useful when you deploy Pydio in several nodes" => "CAS will call this url to pass pgtID and pgtIOU. It's very useful when you deploy Pydio in several nodes",
+    "Order" => "Commande",
+    "Order this plugin with other auth frontends" => "Commander ce plugin avec d'autres interfaces d'authentification",
+    "Create User" => "Créer un utilisateur",
+    "Automatically create user if it does not already exists" => "Créer automatiquement l'utilisateur s'il n'existe pas déjà",
+    "General" =>"Général" ,
+    "Protocol Type" =>"Type de protocole",
+    "Enable/disable automatically based on the protocol used" => "Activer / désactiver automatiquement en fonction du protocole utilisé",
+    "CAS server address" => "Adresse du serveur CAS",
+    "CAS Server" => "Serveur CAS",
+    "CAS Port" => "Port CAS" ,
+    "Port where CAS server is running on. Default: 443" => "Port utilisé par le serveur CAS. Par défaut : 443",
+    "CAS URI" => "URI CAS" ,
+    "URI for CAS service (without / at the end). Default:" => "URI du service CAS (sans / à la fin). Par défaut : ",
+    "Redirect to the given URL on loggin out" => "Rediriger vers l'URL à la déconnexion",
+    "Modify login page" => "Modifier la page de connexion",
+    "Login page will be modified to give user a link to authenticate via CAS manually. Otherwise Pydio will redirect automatically to CAS login page." => "La page de connexion sera modifiée afin de fournir aux utilisateur un lien pour se connecter manuellement via CAS. Sinon, Pydio redirigera automatiquement vers  la page de connexion CAS.",
+    "Certificate path" => "Chemin du certificat" ,
+    "Path to the ca chain that issued the cas server certificate" => "Chemin de la chaîne ca qui a émis le certificat du serveur CAS",
+    "Debug mode" => "Mode débug",
+    "Debug file" => "Fichier de débug",
+    "Set phpCAS in debug mode" => "Définir phpCAS en mode débug",
+    "Log to file. If null, use yyyy-mm-dd.txt" => "Journaliser dans le fichier. Si nul, utilisera yyyy-mm-dd.txt",
+    "phpCAS mode" => "Mode phpCAS",
+    "In mode proxy, phpCAS works as a CAS Proxy who provides Proxy ticket for others services such as SMB, IMAP." => "En mode proxy, phpCAS fonctionnera comme un proxy CAS fournissant un ticket proxy pour les autres services tels SMB, IMAP.",
+    "Client" => "Client" ,
+    "Proxy" => "Proxy" ,
+    "Proxied Service" => "Service Proxifié" ,
+    "Proxied service who uses Proxy Ticket provided by this CAS Proxy.Ex smb://pydio.com" => "Service proxifié utilisant un ticket proxy fourni par ce proxy CAS. Ex : smb://pydio.com",
+    "PTG store mode" => "Stockage du mode PTG" ,
+    "Config for Proxy Granting Ticket Storage. If is file option, location for storate is session_save_path()" => "Configuration pour Proxy Granting Ticket Storage. Si un fichier est utilisé, l'emplacement du stockage sera session_save_path()",
+    "Install SQL Table (support only mysql)" => "Installer la table SQL (supporte uniquement mysql)"
 );
\ No newline at end of file
diff --git a/core/src/plugins/authfront.cas/i18n/conf/it.php b/core/src/plugins/authfront.cas/i18n/conf/it.php
index c02e916cfa..715bd69863 100755
--- a/core/src/plugins/authfront.cas/i18n/conf/it.php
+++ b/core/src/plugins/authfront.cas/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Use CAS authentication." => "Usa autenticazione CAS.",
@@ -68,4 +68,4 @@
 "Install SQL Table (support only mysql)" => "Install SQL Table (support only mysql)",
 "Set Fixed Callback Url" => "Set Fixed Callback Url",
 "CAS will call this url to pass pgtID and pgtIOU. It's very useful when you deploy Pydio in several nodes" => "CAS will call this url to pass pgtID and pgtIOU. It's very useful when you deploy Pydio in several nodes",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/authfront.cas/i18n/de.php b/core/src/plugins/authfront.cas/i18n/de.php
index a667ddbf35..476e3d2229 100755
--- a/core/src/plugins/authfront.cas/i18n/de.php
+++ b/core/src/plugins/authfront.cas/i18n/de.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/authfront.cas/i18n/en.php b/core/src/plugins/authfront.cas/i18n/en.php
index 3ef01aa5d1..203b8c8b2a 100755
--- a/core/src/plugins/authfront.cas/i18n/en.php
+++ b/core/src/plugins/authfront.cas/i18n/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/authfront.cas/i18n/fr.php b/core/src/plugins/authfront.cas/i18n/fr.php
index 0b767c095f..84f073c968 100644
--- a/core/src/plugins/authfront.cas/i18n/fr.php
+++ b/core/src/plugins/authfront.cas/i18n/fr.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/authfront.cas/i18n/it.php b/core/src/plugins/authfront.cas/i18n/it.php
index d8eaa82b5e..235d5e1b25 100755
--- a/core/src/plugins/authfront.cas/i18n/it.php
+++ b/core/src/plugins/authfront.cas/i18n/it.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/authfront.cas/manifest.xml b/core/src/plugins/authfront.cas/manifest.xml
index 6814fd5ca0..bd9b171f28 100755
--- a/core/src/plugins/authfront.cas/manifest.xml
+++ b/core/src/plugins/authfront.cas/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ajxp_plugin id="authfront.cas" enabled="false" label="CONF_MESSAGE[CAS FrontEnd]" description="CONF_MESSAGE[Authentication by CAS]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <class_definition filename="plugins/authfront.cas/class.CasAuthFrontend.php" classname="CasAuthFrontend"/>
+    <class_definition filename="plugins/authfront.cas/CasAuthFrontend.php" classname="Pydio\Auth\Frontend\CasAuthFrontend"/>
     <client_settings>
         <resources>
             <js className="CAS_LoginForm" file="plugins/authfront.cas/class.CAS_LoginForm.js" autoload="true"/>
diff --git a/core/src/plugins/authfront.cyphered/CypheredAuthFrontend.php b/core/src/plugins/authfront.cyphered/CypheredAuthFrontend.php
new file mode 100644
index 0000000000..5e74ca4d86
--- /dev/null
+++ b/core/src/plugins/authfront.cyphered/CypheredAuthFrontend.php
@@ -0,0 +1,216 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Auth\Frontend;
+
+use data;
+use dencrypted;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Core\Services\AuthService;
+use Pydio\Auth\Frontend\Core\AbstractAuthFrontend;
+use Pydio\Core\Services\SessionService;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class CypheredAuthFrontend
+ * @package Pydio\Auth\Frontend
+ */
+class CypheredAuthFrontend extends AbstractAuthFrontend
+{
+
+    /**
+     * @param $httpVars
+     * @param $varName
+     * @return string
+     */
+    function detectVar(&$httpVars, $varName)
+    {
+        if (isSet($httpVars[$varName])) return $httpVars[$varName];
+        if (isSet($_SERVER["HTTP_PYDIO_" . strtoupper($varName)])) return $_SERVER["HTTP_" . strtoupper($varName)];
+        return "";
+    }
+
+    /**
+     * @return array|mixed
+     * @throws \Exception
+     */
+    function getLastKeys()
+    {
+        $file = $this->getPluginWorkDir(false) . "/last_inc";
+        if (!is_file($file)) return array();
+        $content = file_get_contents($file);
+        if (empty($content)) return array();
+        $data = unserialize($content);
+        if (is_array($data)) return $data;
+        return array();
+    }
+
+    /**
+     * @param $data
+     * @throws \Exception
+     */
+    function storeLastKeys($data)
+    {
+        $file = $this->getPluginWorkDir(true) . "/last_inc";
+        file_put_contents($file, serialize($data));
+    }
+
+    /**
+     * decrypt AES 256
+     *
+     * @param string $password
+     * @param string $edata
+     * @return string data
+     */
+    public function decrypt($password, $edata)
+    {
+        $data = base64_decode($edata);
+        $salt = substr($data, 8, 8);
+        $ct = substr($data, 16);
+        /**
+         * From https://github.com/mdp/gibberish-aes
+         *
+         * Number of rounds depends on the size of the AES in use
+         * 3 rounds for 256
+         *        2 rounds for the key, 1 for the IV
+         * 2 rounds for 128
+         *        1 round for the key, 1 round for the IV
+         * 3 rounds for 192 since it's not evenly divided by 128 bits
+         */
+        $rounds = 3;
+        $data00 = $password . $salt;
+        $md5_hash = array();
+        $md5_hash[0] = md5($data00, true);
+        $result = $md5_hash[0];
+        for ($i = 1; $i < $rounds; $i++) {
+            $md5_hash[$i] = md5($md5_hash[$i - 1] . $data00, true);
+            $result .= $md5_hash[$i];
+        }
+        $key = substr($result, 0, 32);
+        $iv = substr($result, 32, 16);
+
+        return openssl_decrypt($ct, 'aes-256-cbc', $key, true, $iv);
+    }
+
+    /**
+     * crypt AES 256
+     *
+     * @param string $password
+     * @param string $data
+     * @return string encrypted data
+     */
+    public function crypt($password, $data)
+    {
+        // Set a random salt
+        $salt = openssl_random_pseudo_bytes(8);
+
+        $salted = '';
+        $dx = '';
+        // Salt the key(32) and iv(16) = 48
+        while (strlen($salted) < 48) {
+            $dx = md5($dx . $password . $salt, true);
+            $salted .= $dx;
+        }
+
+        $key = substr($salted, 0, 32);
+        $iv = substr($salted, 32, 16);
+
+        $encrypted_data = openssl_encrypt($data, 'aes-256-cbc', $key, true, $iv);
+        return base64_encode('Salted__' . $salt . $encrypted_data);
+    }
+
+
+    /**
+     * Try to authenticate the user based on various external parameters
+     * Return true if user is now logged.
+     *
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @param bool $isLast Whether this is is the last plugin called.
+     * @return bool
+     */
+    function tryToLogUser(ServerRequestInterface &$request, ResponseInterface &$response, $isLast = false)
+    {
+
+        $httpVars = $request->getParsedBody();
+        /** @var \Pydio\Core\Model\ContextInterface $ctx */
+        $ctx = $request->getAttribute("ctx");
+        $checkNonce = $this->pluginConf["CHECK_NONCE"] === true;
+        $token = $this->detectVar($httpVars, "cyphered_token");
+        $tokenInc = $this->detectVar($httpVars, "cyphered_token_inc");
+        if (empty($token) || ($checkNonce && empty($tokenInc))) {
+            return false;
+        }
+
+        if (!$checkNonce) {
+            $decoded = $this->decrypt($this->pluginConf["PRIVATE_KEY"], $token);
+        } else {
+            $decoded = $this->decrypt($this->pluginConf["PRIVATE_KEY"] . ":" . $tokenInc, $token);
+        }
+        if ($decoded == null) {
+            return false;
+        }
+        $data = unserialize($decoded);
+        if (empty($data) || !is_array($data) || !isset($data["user_id"]) || !isset($data["user_pwd"])) {
+            $this->logDebug(__FUNCTION__, "Cyphered Token found but wrong deserizalized data");
+            return false;
+        }
+        if ($ctx->hasUser() != null) {
+            $currentUser = $ctx->getUser()->getId();
+            if ($currentUser != $data["user_id"]) {
+                AuthService::disconnect();
+            }
+        }
+        $this->logDebug(__FUNCTION__, "Trying to log user " . $data["user_id"] . " from cyphered token");
+        $userId = $data["user_id"];
+        if ($checkNonce) {
+            $keys = $this->getLastKeys();
+            $lastInc = 0;
+            if (isSet($keys[$userId])) {
+                $lastInc = $keys[$userId];
+            }
+            if ($tokenInc <= $lastInc) {
+                $this->logDebug(__FUNCTION__, "Key was already used for this user id");
+                return false;
+            }
+        }
+        try {
+            $loggedUser = AuthService::logUser($data["user_id"], $data["user_pwd"], false, false);
+            $this->logDebug(__FUNCTION__, "Success");
+            if ($checkNonce) {
+                $keys[$userId] = $tokenInc;
+                $this->storeLastKeys($keys);
+            }
+            $ctx->setUserObject($loggedUser);
+            $request = $request->withAttribute("ctx", $ctx);
+            AuthService::updateSessionUser($loggedUser);
+            return true;
+
+        } catch (\Pydio\Core\Exception\LoginException $l) {
+            $this->logDebug(__FUNCTION__, "Wrong result " . $l->getLoginError());
+        }
+
+        return false;
+
+    }
+
+} 
\ No newline at end of file
diff --git a/core/src/plugins/authfront.cyphered/class.CypheredAuthFrontend.php b/core/src/plugins/authfront.cyphered/class.CypheredAuthFrontend.php
deleted file mode 100644
index ba826262ba..0000000000
--- a/core/src/plugins/authfront.cyphered/class.CypheredAuthFrontend.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-
-class CypheredAuthFrontend extends AbstractAuthFrontend {
-
-    function detectVar(&$httpVars, $varName){
-        if(isSet($httpVars[$varName])) return $httpVars[$varName];
-        if(isSet($_SERVER["HTTP_PYDIO_".strtoupper($varName)])) return $_SERVER["HTTP_".strtoupper($varName)];
-        return "";
-    }
-
-    function getLastKeys(){
-        $file = $this->getPluginWorkDir(false)."/last_inc";
-        if(!is_file($file)) return array();
-        $content = file_get_contents($file);
-        if(empty($content)) return array();
-        $data = unserialize($content);
-        if(is_array($data)) return $data;
-        return array();
-    }
-
-    function storeLastKeys($data){
-        $file = $this->getPluginWorkDir(true)."/last_inc";
-        file_put_contents($file, serialize($data));
-    }
-
-    /**
-     * decrypt AES 256
-     *
-     * @param string $password
-     * @param data $edata
-     * @return dencrypted data
-     */
-    public function decrypt($password, $edata) {
-        $data = base64_decode($edata);
-        $salt = substr($data, 8, 8);
-        $ct = substr($data, 16);
-        /**
-         * From https://github.com/mdp/gibberish-aes
-         *
-         * Number of rounds depends on the size of the AES in use
-         * 3 rounds for 256
-         *        2 rounds for the key, 1 for the IV
-         * 2 rounds for 128
-         *        1 round for the key, 1 round for the IV
-         * 3 rounds for 192 since it's not evenly divided by 128 bits
-         */
-        $rounds = 3;
-        $data00 = $password.$salt;
-        $md5_hash = array();
-        $md5_hash[0] = md5($data00, true);
-        $result = $md5_hash[0];
-        for ($i = 1; $i < $rounds; $i++) {
-            $md5_hash[$i] = md5($md5_hash[$i - 1].$data00, true);
-            $result .= $md5_hash[$i];
-        }
-        $key = substr($result, 0, 32);
-        $iv  = substr($result, 32,16);
-
-        return openssl_decrypt($ct, 'aes-256-cbc', $key, true, $iv);
-    }
-
-    /**
-     * crypt AES 256
-     *
-     * @param string $password
-     * @param string $data
-     * @return string encrypted data
-     */
-    public function crypt($password, $data) {
-        // Set a random salt
-        $salt = openssl_random_pseudo_bytes(8);
-
-        $salted = '';
-        $dx = '';
-        // Salt the key(32) and iv(16) = 48
-        while (strlen($salted) < 48) {
-            $dx = md5($dx.$password.$salt, true);
-            $salted .= $dx;
-        }
-
-        $key = substr($salted, 0, 32);
-        $iv  = substr($salted, 32,16);
-
-        $encrypted_data = openssl_encrypt($data, 'aes-256-cbc', $key, true, $iv);
-        return base64_encode('Salted__' . $salt . $encrypted_data);
-    }
-
-
-
-    function tryToLogUser(&$httpVars, $isLast = false){
-
-        $checkNonce = $this->pluginConf["CHECK_NONCE"] === true;
-        $token = $this->detectVar($httpVars, "cyphered_token");
-        $tokenInc = $this->detectVar($httpVars, "cyphered_token_inc");
-        if(empty($token) || ($checkNonce && empty($tokenInc))){
-            return false;
-        }
-
-        if(!$checkNonce){
-            $decoded = $this->decrypt($this->pluginConf["PRIVATE_KEY"], $token);
-        }else{
-            $decoded = $this->decrypt($this->pluginConf["PRIVATE_KEY"].":".$tokenInc, $token);
-        }
-        if($decoded == null){
-            return false;
-        }
-        $data = unserialize($decoded);
-        if(empty($data) || !is_array($data) || !isset($data["user_id"]) || !isset($data["user_pwd"])){
-            $this->logDebug(__FUNCTION__, "Cyphered Token found but wrong deserizalized data");
-            return false;
-        }
-        if(AuthService::getLoggedUser() != null){
-            $currentUser = AuthService::getLoggedUser()->getId();
-            if($currentUser != $data["user_id"]){
-                AuthService::disconnect();
-            }
-        }
-        $this->logDebug(__FUNCTION__, "Trying to log user ".$data["user_id"]." from cyphered token");
-        $userId = $data["user_id"];
-        if($checkNonce){
-            $keys = $this->getLastKeys();
-            $lastInc = 0;
-            if(isSet($keys[$userId])){
-                $lastInc = $keys[$userId];
-            }
-            if($tokenInc <= $lastInc){
-                $this->logDebug(__FUNCTION__, "Key was already used for this user id");
-                return false;
-            }
-        }
-        $res = AuthService::logUser($data["user_id"], $data["user_pwd"], false, false, -1);
-        if($res > 0) {
-            $this->logDebug(__FUNCTION__, "Success");
-            if($checkNonce){
-                $keys[$userId] = $tokenInc;
-                $this->storeLastKeys($keys);
-            }
-            $loggedUser = AuthService::getLoggedUser();
-            $force = $loggedUser->mergedRole->filterParameterValue("core.conf", "DEFAULT_START_REPOSITORY", AJXP_REPO_SCOPE_ALL, -1);
-            $passId = -1;
-            if (isSet($httpVars["tmp_repository_id"])) {
-                $passId = $httpVars["tmp_repository_id"];
-            } else if ($force != "" && $loggedUser->canSwitchTo($force) && !isSet($httpVars["tmp_repository_id"]) && !isSet($_SESSION["PENDING_REPOSITORY_ID"])) {
-                $passId = $force;
-            }
-            ConfService::switchUserToActiveRepository($loggedUser, $passId);
-            return true;
-        }
-
-        $this->logDebug(__FUNCTION__, "Wrong result ".$res);
-        return false;
-
-    }
-
-} 
\ No newline at end of file
diff --git a/core/src/plugins/authfront.cyphered/i18n/conf/de.php b/core/src/plugins/authfront.cyphered/i18n/conf/de.php
index a740e9889a..e892540930 100644
--- a/core/src/plugins/authfront.cyphered/i18n/conf/de.php
+++ b/core/src/plugins/authfront.cyphered/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Cyphered Identifiers" => "Verschlüsselte Anmeldedaten",
diff --git a/core/src/plugins/authfront.cyphered/i18n/conf/en.php b/core/src/plugins/authfront.cyphered/i18n/conf/en.php
index 3fdfe7f521..fb35aab25c 100644
--- a/core/src/plugins/authfront.cyphered/i18n/conf/en.php
+++ b/core/src/plugins/authfront.cyphered/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Cyphered Identifiers" => "Cyphered Identifiers",
diff --git a/core/src/plugins/authfront.cyphered/manifest.xml b/core/src/plugins/authfront.cyphered/manifest.xml
index aaba21229d..874d45f9a5 100644
--- a/core/src/plugins/authfront.cyphered/manifest.xml
+++ b/core/src/plugins/authfront.cyphered/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ajxpcore id="authfront.cyphered" label="CONF_MESSAGE[Cyphered Identifiers]" enabled="false" description="CONF_MESSAGE[Cyphered identifiers passed through GET, POST or HTTP Headers, using a private key shared by Pydio and Third-party application.]"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-	<class_definition filename="plugins/authfront.cyphered/class.CypheredAuthFrontend.php" classname="CypheredAuthFrontend"/>
+	<class_definition filename="plugins/authfront.cyphered/CypheredAuthFrontend.php" classname="Pydio\Auth\Frontend\CypheredAuthFrontend"/>
     <client_settings>
         <resources>
             <i18n namespace="authfront.cyphered" path="plugins/authfront.cyphered/i18n"/>
diff --git a/core/src/plugins/authfront.duosecurity/DuoSecurityFrontend.php b/core/src/plugins/authfront.duosecurity/DuoSecurityFrontend.php
new file mode 100644
index 0000000000..2bbd9c05be
--- /dev/null
+++ b/core/src/plugins/authfront.duosecurity/DuoSecurityFrontend.php
@@ -0,0 +1,127 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Auth\Frontend;
+
+require_once dirname(__FILE__)."/../authfront.session_login/SessionLoginFrontend.php";
+
+use Duo;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\AuthService;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class DuoSecurityFrontend
+ * @package Pydio\Auth\Frontend
+ */
+class DuoSecurityFrontend extends SessionLoginFrontend
+{
+
+    /**
+     * Authfront implementation
+     * @param \Psr\Http\Message\ServerRequestInterface $request
+     * @param \Psr\Http\Message\ResponseInterface $response
+     * @param bool $isLast
+     * @return bool
+     */
+    function tryToLogUser(\Psr\Http\Message\ServerRequestInterface &$request, \Psr\Http\Message\ResponseInterface &$response, $isLast = false)
+    {
+
+        if ($request->getAttribute("action") !== "login") {
+
+            return false;
+
+        }
+
+        $testResponse = $this->logUserFromLoginAction($request, $response, $isLast);
+        if(!$testResponse){
+            return false;
+        }
+        /** @var ContextInterface $ctx */
+        $ctx = $request->getAttribute("ctx");
+        if(!$ctx->hasUser()){
+            return false;
+        }
+        $uObject = $ctx->getUser();
+        $duoActive = $uObject->getMergedRole()->filterParameterValue("authfront.duosecurity", "DUO_AUTH_ACTIVE", AJXP_REPO_SCOPE_ALL, false);
+        if(!$duoActive){
+            return false;
+        }
+
+
+        require_once($this->getBaseDir() . "/duo_php/duo_web.php");
+        $appUnique = $this->getContextualOption($ctx, "DUO_AUTH_AKEY");
+        $iKey = $this->getContextualOption($ctx, "DUO_AUTH_IKEY");
+        $sKey = $this->getContextualOption($ctx, "DUO_AUTH_SKEY");
+
+        $res = \Duo::signRequest($iKey, $sKey, $appUnique, $uObject->getId());
+
+        $uObject->getPersonalRole()->setParameterValue("authfront.duosecurity", "DUO_AUTH_LAST_SIGNATURE", $res);
+        $uObject->setLock("duo_show_iframe");
+        $uObject->save("superuser");
+
+        return true;
+
+
+    }
+
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @throws \Exception
+     * @throws \Pydio\Core\Exception\AuthRequiredException
+     */
+    public function postVerificationCode(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface)
+    {
+
+        if ($requestInterface->getAttribute("action") !== "duo_post_verification_code") {
+            return;
+        }
+
+        $httpVars = $requestInterface->getParsedBody();
+        /** @var \Pydio\Core\Model\ContextInterface $ctx */
+        $ctx = $requestInterface->getAttribute("ctx");
+        $u = $ctx->getUser();
+        if ($u == null) return;
+        $sigResponse = $httpVars["sig_response"];
+
+        require_once($this->getBaseDir() . "/duo_php/duo_web.php");
+        $appUnique = $this->getContextualOption($ctx, "DUO_AUTH_AKEY");
+        $iKey = $this->getContextualOption($ctx, "DUO_AUTH_IKEY");
+        $sKey = $this->getContextualOption($ctx, "DUO_AUTH_SKEY");
+
+        $verif = Duo::verifyResponse($iKey, $sKey, $appUnique, $sigResponse);
+
+        if ($verif != null && $verif == $u->getId()) {
+            $u->removeLock("duo_show_iframe");
+            $u->save("superuser");
+            $u->recomputeMergedRole();
+            AuthService::updateSessionUser($u);
+        } else {
+            AuthService::disconnect();
+            throw new \Pydio\Core\Exception\AuthRequiredException();
+        }
+
+    }
+
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/authfront.duosecurity/class.DuoSecurityFrontend.php b/core/src/plugins/authfront.duosecurity/class.DuoSecurityFrontend.php
deleted file mode 100644
index 2c17cdeee1..0000000000
--- a/core/src/plugins/authfront.duosecurity/class.DuoSecurityFrontend.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-
-class DuoSecurityFrontend extends AbstractAuthFrontend {
-
-    function tryToLogUser(&$httpVars, $isLast = false){
-
-        // CATCH THE STANDARD LOGIN OPERATION
-        if(!isSet($httpVars["get_action"]) || $httpVars["get_action"] != "login"){
-            return false;
-        }
-        if(AJXP_Utils::userAgentIsNativePydioApp()){
-            return false;
-        }
-
-        $userId = (isSet($httpVars["userid"])?trim($httpVars["userid"]):null);
-        $duoActive = false;
-        if(!empty($userId)){
-            $uObject = ConfService::getConfStorageImpl()->createUserObject($userId);
-            if($uObject != null){
-                $duoActive = $uObject->mergedRole->filterParameterValue("authfront.duosecurity","DUO_AUTH_ACTIVE", AJXP_REPO_SCOPE_ALL, false);
-            }
-        }
-        if(!$duoActive) {
-            return false;
-        }
-
-        $rememberLogin = "";
-        $rememberPass = "";
-        $secureToken = "";
-        $loggedUser = null;
-        include_once(AJXP_BIN_FOLDER."/class.CaptchaProvider.php");
-        if (AuthService::suspectBruteForceLogin() && (!isSet($httpVars["captcha_code"]) || !CaptchaProvider::checkCaptchaResult($httpVars["captcha_code"]))) {
-            $loggingResult = -4;
-        } else {
-            $userId = (isSet($httpVars["userid"])?trim($httpVars["userid"]):null);
-            $userPass = (isSet($httpVars["password"])?trim($httpVars["password"]):null);
-            $rememberMe = ((isSet($httpVars["remember_me"]) && $httpVars["remember_me"] == "true")?true:false);
-            $cookieLogin = (isSet($httpVars["cookie_login"])?true:false);
-            $loggingResult = AuthService::logUser($userId, $userPass, false, $cookieLogin, $httpVars["login_seed"]);
-            if ($rememberMe && $loggingResult == 1) {
-                $rememberLogin = "notify";
-                $rememberPass = "notify";
-            }
-            if ($loggingResult == 1) {
-                session_regenerate_id(true);
-                $secureToken = AuthService::generateSecureToken();
-            }
-            if ($loggingResult < 1 && AuthService::suspectBruteForceLogin()) {
-                $loggingResult = -4; // Force captcha reload
-            }
-        }
-        $loggedUser = AuthService::getLoggedUser();
-        if ($loggedUser != null) {
-            $force = $loggedUser->mergedRole->filterParameterValue("core.conf", "DEFAULT_START_REPOSITORY", AJXP_REPO_SCOPE_ALL, -1);
-            $passId = -1;
-            if (isSet($httpVars["tmp_repository_id"])) {
-                $passId = $httpVars["tmp_repository_id"];
-            } else if ($force != "" && $loggedUser->canSwitchTo($force) && !isSet($httpVars["tmp_repository_id"]) && !isSet($_SESSION["PENDING_REPOSITORY_ID"])) {
-                $passId = $force;
-            }
-            $res = ConfService::switchUserToActiveRepository($loggedUser, $passId);
-            if (!$res) {
-                AuthService::disconnect();
-                $loggingResult = -3;
-            }
-        }
-
-        if ($loggedUser != null && (AuthService::hasRememberCookie() || (isSet($rememberMe) && $rememberMe ==true))) {
-            AuthService::refreshRememberCookie($loggedUser);
-        }
-        AJXP_XMLWriter::header();
-        AJXP_XMLWriter::loggingResult($loggingResult, $rememberLogin, $rememberPass, $secureToken);
-        AJXP_XMLWriter::close();
-
-        if($loggingResult > 0 && $loggedUser != null){
-
-            require_once($this->getBaseDir()."/duo_php/duo_web.php");
-            $appUnique = $this->getFilteredOption("DUO_AUTH_AKEY");
-            $iKey = $this->getFilteredOption("DUO_AUTH_IKEY");
-            $sKey = $this->getFilteredOption("DUO_AUTH_SKEY");
-
-            $res = Duo::signRequest($iKey, $sKey, $appUnique, $loggedUser->getId());
-
-            $loggedUser->personalRole->setParameterValue("authfront.duosecurity", "DUO_AUTH_LAST_SIGNATURE", $res);
-            $loggedUser->setLock("duo_show_iframe");
-            $loggedUser->save("superuser");
-        }
-
-//        if($loggingResult > 0 || $isLast){
-            exit();
-//       }
-
-    }
-
-    public function postVerificationCode($action, $httpVars, $fileVars)
-    {
-        if($action!="duo_post_verification_code") return;
-
-        $u = AuthService::getLoggedUser();
-        if($u == null) return;
-        $sigResponse = $httpVars["sig_response"];
-        require_once($this->getBaseDir()."/duo_php/duo_web.php");
-        $appUnique = $this->getFilteredOption("DUO_AUTH_AKEY");
-        $iKey = $this->getFilteredOption("DUO_AUTH_IKEY");
-        $sKey = $this->getFilteredOption("DUO_AUTH_SKEY");
-
-        $verif = Duo::verifyResponse($iKey, $sKey, $appUnique, $sigResponse);
-
-        if($verif != null && $verif == $u->getId()){
-            $u->removeLock();
-            $u->save("superuser");
-            $u->recomputeMergedRole();
-            AuthService::updateUser($u);
-            ConfService::switchUserToActiveRepository($u);
-            $force = $u->mergedRole->filterParameterValue("core.conf", "DEFAULT_START_REPOSITORY", AJXP_REPO_SCOPE_ALL, -1);
-            $passId = -1;
-            if ($force != "" && $u->canSwitchTo($force) && !isSet($httpVars["tmp_repository_id"]) && !isSet($_SESSION["PENDING_REPOSITORY_ID"])) {
-                $passId = $force;
-            }
-            $res = ConfService::switchUserToActiveRepository($u, $passId);
-            if (!$res) {
-                AuthService::disconnect();
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::requireAuth(true);
-                AJXP_XMLWriter::close();
-            }
-            ConfService::getInstance()->invalidateLoadedRepositories();
-        }else{
-            AuthService::disconnect();
-            AJXP_XMLWriter::header();
-            AJXP_XMLWriter::requireAuth(true);
-            AJXP_XMLWriter::close();
-        }
-
-    }
-
-
-
-} 
\ No newline at end of file
diff --git a/core/src/plugins/authfront.duosecurity/i18n/conf/de.php b/core/src/plugins/authfront.duosecurity/i18n/conf/de.php
index d47116f4e9..aa7cba9558 100644
--- a/core/src/plugins/authfront.duosecurity/i18n/conf/de.php
+++ b/core/src/plugins/authfront.duosecurity/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Dual-form Authentication" => "Zwei-Faktor-Authentifizierung über DuoSecurity",
diff --git a/core/src/plugins/authfront.duosecurity/i18n/conf/en.php b/core/src/plugins/authfront.duosecurity/i18n/conf/en.php
index 1e0009640e..36aab90fa2 100644
--- a/core/src/plugins/authfront.duosecurity/i18n/conf/en.php
+++ b/core/src/plugins/authfront.duosecurity/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Dual-form Authentication" => "Dual-form Authentication",
diff --git a/core/src/plugins/authfront.duosecurity/manifest.xml b/core/src/plugins/authfront.duosecurity/manifest.xml
index f7015524b9..a57164a44a 100644
--- a/core/src/plugins/authfront.duosecurity/manifest.xml
+++ b/core/src/plugins/authfront.duosecurity/manifest.xml
@@ -2,7 +2,7 @@
 <ajxpcore id="authfront.duosecurity" enabled="false" label="CONF_MESSAGE[Dual-form Authentication]"
           description="CONF_MESSAGE[Dual-form authentication using the DuoSecurity web service]"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-	<class_definition filename="plugins/authfront.duosecurity/class.DuoSecurityFrontend.php" classname="DuoSecurityFrontend"/>
+	<class_definition filename="plugins/authfront.duosecurity/DuoSecurityFrontend.php" classname="Pydio\Auth\Frontend\DuoSecurityFrontend"/>
     <client_settings>
         <resources>
             <js className="DuoSecurity" file="plugins/authfront.duosecurity/duo_php/js/Duo-Web-v1-PydioMod.js"/>
diff --git a/core/src/plugins/authfront.http_basic/BasicHttpAuthFrontend.php b/core/src/plugins/authfront.http_basic/BasicHttpAuthFrontend.php
new file mode 100644
index 0000000000..400e61b2df
--- /dev/null
+++ b/core/src/plugins/authfront.http_basic/BasicHttpAuthFrontend.php
@@ -0,0 +1,92 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Auth\Frontend;
+
+use Pydio\Core\Model\Context;
+use Pydio\Core\Services\AuthService;
+use Pydio\Auth\Frontend\Core\AbstractAuthFrontend;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class BasicHttpAuthFrontend
+ * @package Pydio\Auth\Frontend
+ */
+class BasicHttpAuthFrontend extends AbstractAuthFrontend
+{
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $request
+     * @param \Psr\Http\Message\ResponseInterface $response
+     * @param bool $isLast
+     * @return bool
+     */
+    function tryToLogUser(\Psr\Http\Message\ServerRequestInterface &$request, \Psr\Http\Message\ResponseInterface &$response, $isLast = false)
+    {
+
+        $serverData = $request->getServerParams();
+        $localHttpLogin = $serverData["PHP_AUTH_USER"];
+        $localHttpPassw = $serverData['PHP_AUTH_PW'];
+
+        // mod_php
+        if (isset($serverData['PHP_AUTH_USER'])) {
+            $localHttpLogin = $serverData['PHP_AUTH_USER'];
+            $localHttpPassw = $serverData['PHP_AUTH_PW'];
+
+            // most other servers
+        } elseif (isset($serverData['HTTP_AUTHORIZATION'])) {
+            if (strpos(strtolower($serverData['HTTP_AUTHORIZATION']), 'basic') === 0) {
+                list($localHttpLogin, $localHttpPassw) = explode(':', base64_decode(substr($serverData['HTTP_AUTHORIZATION'], 6)));
+            }
+            // Sometimes prepend a REDIRECT
+        } elseif (isset($serverData['REDIRECT_HTTP_AUTHORIZATION'])) {
+
+            if (strpos(strtolower($serverData['REDIRECT_HTTP_AUTHORIZATION']), 'basic') === 0) {
+                list($localHttpLogin, $localHttpPassw) = explode(':', base64_decode(substr($serverData['REDIRECT_HTTP_AUTHORIZATION'], 6)));
+            }
+
+        }
+
+        if ($isLast && empty($localHttpLogin)) {
+            $response = $response->withHeader("WWW-Authenticate", "Basic realm=\"Pydio API\"")->withStatus(401);
+            return true;
+        }
+        if (!isSet($localHttpLogin)) {
+            return false;
+        }
+
+        try {
+
+            $loggedUser = AuthService::logUser($localHttpLogin, $localHttpPassw, false, false);
+            $request = $request->withAttribute("ctx", Context::contextWithObjects($loggedUser, null));
+            return true;
+
+        } catch (\Pydio\Core\Exception\LoginException $l) {
+            if ($isLast && $l->getLoginError() !== -4) {
+                $response = $response->withHeader("WWW-Authenticate", "Basic realm=\"Pydio API\"")->withStatus(401);
+                return true;
+            }
+        }
+        return false;
+
+    }
+
+} 
\ No newline at end of file
diff --git a/core/src/plugins/authfront.http_basic/class.BasicHttpAuthFrontend.php b/core/src/plugins/authfront.http_basic/class.BasicHttpAuthFrontend.php
deleted file mode 100644
index 03ab312982..0000000000
--- a/core/src/plugins/authfront.http_basic/class.BasicHttpAuthFrontend.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-
-class BasicHttpAuthFrontend extends AbstractAuthFrontend {
-
-    function tryToLogUser(&$httpVars, $isLast = false){
-
-        $localHttpLogin = $_SERVER["PHP_AUTH_USER"];
-        $localHttpPassw = $_SERVER['PHP_AUTH_PW'];
-
-        // mod_php
-        if (isset($_SERVER['PHP_AUTH_USER'])) {
-            $localHttpLogin = $_SERVER['PHP_AUTH_USER'];
-            $localHttpPassw = $_SERVER['PHP_AUTH_PW'];
-
-        // most other servers
-        } elseif (isset($_SERVER['HTTP_AUTHORIZATION'])) {
-            if (strpos(strtolower($_SERVER['HTTP_AUTHORIZATION']),'basic')===0){
-                list($localHttpLogin,$localHttpPassw) = explode(':',base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
-            }
-        // Sometimes prepend a REDIRECT
-        } elseif (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION'])) {
-
-            if (strpos(strtolower($_SERVER['REDIRECT_HTTP_AUTHORIZATION']),'basic')===0){
-                list($localHttpLogin,$localHttpPassw) = explode(':',base64_decode(substr($_SERVER['REDIRECT_HTTP_AUTHORIZATION'], 6)));
-            }
-
-        }
-
-        if($isLast && empty($localHttpLogin)){
-            header('WWW-Authenticate: Basic realm="Pydio API"');
-            header('HTTP/1.0 401 Unauthorized');
-            echo 'You are not authorized to access this API.';
-            exit();
-        }
-        if(!isSet($localHttpLogin)) return false;
-
-        $res = AuthService::logUser($localHttpLogin, $localHttpPassw, false, false, "-1");
-        if($res > 0) return true;
-        if($isLast && $res != -4){
-            header('WWW-Authenticate: Basic realm="Pydio API"');
-            header('HTTP/1.0 401 Unauthorized');
-            echo 'You are not authorized to access this API.';
-            exit();
-        }
-
-
-        return false;
-
-    }
-
-} 
\ No newline at end of file
diff --git a/core/src/plugins/authfront.http_basic/i18n/conf/de.php b/core/src/plugins/authfront.http_basic/i18n/conf/de.php
index 6706d4c491..fa0612e722 100644
--- a/core/src/plugins/authfront.http_basic/i18n/conf/de.php
+++ b/core/src/plugins/authfront.http_basic/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Basic Http FrontEnd" => "Standard-HTTP (Anwendung)",
diff --git a/core/src/plugins/authfront.http_basic/i18n/conf/en.php b/core/src/plugins/authfront.http_basic/i18n/conf/en.php
index 43df181b4a..aab0c1f28b 100644
--- a/core/src/plugins/authfront.http_basic/i18n/conf/en.php
+++ b/core/src/plugins/authfront.http_basic/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Basic Http FrontEnd" => "Basic Http FrontEnd",
diff --git a/core/src/plugins/authfront.http_basic/manifest.xml b/core/src/plugins/authfront.http_basic/manifest.xml
index 07f29a25a7..5b3d3a7f62 100644
--- a/core/src/plugins/authfront.http_basic/manifest.xml
+++ b/core/src/plugins/authfront.http_basic/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ajxpcore id="authfront.http_basic" enabled="true" label="CONF_MESSAGE[Basic Http FrontEnd]" description="CONF_MESSAGE[Send a basic http request to the user]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-	<class_definition filename="plugins/authfront.http_basic/class.BasicHttpAuthFrontend.php" classname="BasicHttpAuthFrontend"/>
+	<class_definition filename="plugins/authfront.http_basic/BasicHttpAuthFrontend.php" classname="Pydio\Auth\Frontend\BasicHttpAuthFrontend"/>
     <client_settings>
         <resources>
             <i18n namespace="authfront.http_basic" path="plugins/authfront.http_basic/i18n"/>
diff --git a/core/src/plugins/authfront.http_server/ServerHttpAuthFrontend.php b/core/src/plugins/authfront.http_server/ServerHttpAuthFrontend.php
new file mode 100644
index 0000000000..81c8da97f2
--- /dev/null
+++ b/core/src/plugins/authfront.http_server/ServerHttpAuthFrontend.php
@@ -0,0 +1,69 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Auth\Frontend;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Services\AuthService;
+use Pydio\Auth\Frontend\Core\AbstractAuthFrontend;
+use Pydio\Core\Services\UsersService;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class ServerHttpAuthFrontend
+ * @package Pydio\Auth\Frontend
+ */
+class ServerHttpAuthFrontend extends AbstractAuthFrontend
+{
+
+    /**
+     * Try to authenticate the user based on various external parameters
+     * Return true if user is now logged.
+     *
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @param bool $isLast Whether this is is the last plugin called.
+     * @return bool
+     */
+    function tryToLogUser(ServerRequestInterface &$request, ResponseInterface &$response, $isLast = false)
+    {
+
+        $serverData = $request->getServerParams();
+        $localHttpLogin = $serverData["REMOTE_USER"];
+        $localHttpPassw = isSet($serverData['PHP_AUTH_PW']) ? $serverData['PHP_AUTH_PW'] : "";
+        if (!isSet($localHttpLogin)) return false;
+
+        if (!UsersService::userExists($localHttpLogin) && $this->pluginConf["CREATE_USER"] === true) {
+            UsersService::createUser($localHttpLogin, $localHttpPassw, (isset($this->pluginConf["AJXP_ADMIN"]) && $this->pluginConf["AJXP_ADMIN"] == $localHttpLogin));
+        }
+        try {
+            $logged = AuthService::logUser($localHttpLogin, $localHttpPassw, true);
+            $request = $request->withAttribute("ctx", Context::contextWithObjects($logged, null));
+            return true;
+        } catch (\Pydio\Core\Exception\LoginException $l) {
+        }
+        return false;
+
+    }
+
+} 
\ No newline at end of file
diff --git a/core/src/plugins/authfront.http_server/class.ServerHttpAuthFrontend.php b/core/src/plugins/authfront.http_server/class.ServerHttpAuthFrontend.php
deleted file mode 100644
index 6a240d5c42..0000000000
--- a/core/src/plugins/authfront.http_server/class.ServerHttpAuthFrontend.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-
-class ServerHttpAuthFrontend extends AbstractAuthFrontend {
-
-    function tryToLogUser(&$httpVars, $isLast = false){
-
-        $localHttpLogin = $_SERVER["REMOTE_USER"];
-        $localHttpPassw = isSet($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : "";
-        if(!isSet($localHttpLogin)) return false;
-
-        if(!AuthService::userExists($localHttpLogin) && $this->pluginConf["CREATE_USER"] === true){
-            AuthService::createUser($localHttpLogin, $localHttpPassw, (isset($this->pluginConf["AJXP_ADMIN"]) && $this->pluginConf["AJXP_ADMIN"] == $localHttpLogin));
-        }
-        $res = AuthService::logUser($localHttpLogin, $localHttpPassw, true);
-        if($res > 0) return true;
-
-        return false;
-
-    }
-
-} 
\ No newline at end of file
diff --git a/core/src/plugins/authfront.http_server/i18n/conf/de.php b/core/src/plugins/authfront.http_server/i18n/conf/de.php
index 585c8ef24c..edd3545cf6 100644
--- a/core/src/plugins/authfront.http_server/i18n/conf/de.php
+++ b/core/src/plugins/authfront.http_server/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Basic Http by Server" => "Standard-HTTP (Server)",
diff --git a/core/src/plugins/authfront.http_server/i18n/conf/en.php b/core/src/plugins/authfront.http_server/i18n/conf/en.php
index 4a9fd7ad34..2a135bb7b3 100644
--- a/core/src/plugins/authfront.http_server/i18n/conf/en.php
+++ b/core/src/plugins/authfront.http_server/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Basic Http by Server" => "Basic Http by Server",
diff --git a/core/src/plugins/authfront.http_server/manifest.xml b/core/src/plugins/authfront.http_server/manifest.xml
index 8d17d790c4..9b11eaa4dc 100644
--- a/core/src/plugins/authfront.http_server/manifest.xml
+++ b/core/src/plugins/authfront.http_server/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ajxpcore id="authfront.http_server" enabled="false" label="CONF_MESSAGE[Basic Http by Server]" description="CONF_MESSAGE[Basic Http Auth performed by server (e.g. apache htaccess)]"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-	<class_definition filename="plugins/authfront.http_server/class.ServerHttpAuthFrontend.php" classname="ServerHttpAuthFrontend"/>
+	<class_definition filename="plugins/authfront.http_server/ServerHttpAuthFrontend.php" classname="Pydio\Auth\Frontend\ServerHttpAuthFrontend"/>
     <client_settings>
         <resources>
             <i18n namespace="authfront.http_server" path="plugins/authfront.http_server/i18n"/>
diff --git a/core/src/plugins/authfront.keystore/KeystoreAuthFrontend.php b/core/src/plugins/authfront.keystore/KeystoreAuthFrontend.php
new file mode 100644
index 0000000000..0e3f2426c4
--- /dev/null
+++ b/core/src/plugins/authfront.keystore/KeystoreAuthFrontend.php
@@ -0,0 +1,185 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Auth\Frontend;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\ApiKeysService;
+use Pydio\Core\Services\AuthService;
+use Pydio\Auth\Frontend\Core\AbstractAuthFrontend;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Controller\HTMLWriter;
+use Zend\Diactoros\Response\JsonResponse;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class Pydio\Auth\Frontend\KeystoreAuthFrontend
+ */
+class KeystoreAuthFrontend extends AbstractAuthFrontend
+{
+    
+    /**
+     * @param $httpVars
+     * @param $varName
+     * @return string
+     */
+    function detectVar(&$httpVars, $varName)
+    {
+        if (isSet($httpVars[$varName])) return $httpVars[$varName];
+        if (isSet($_SERVER["HTTP_PYDIO_" . strtoupper($varName)])) return $_SERVER["HTTP_" . strtoupper($varName)];
+        return "";
+    }
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $request
+     * @param \Psr\Http\Message\ResponseInterface $response
+     * @param bool $isLast
+     * @return bool
+     */
+    function tryToLogUser(\Psr\Http\Message\ServerRequestInterface &$request, \Psr\Http\Message\ResponseInterface &$response, $isLast = false)
+    {
+
+        $httpVars = $request->getParsedBody();
+        $token = $this->detectVar($httpVars, "auth_token");
+        if (empty($token)) {
+            //$this->logDebug(__FUNCTION__, "Empty token", $_POST);
+            return false;
+        }
+
+        $data = ApiKeysService::loadDataForPair($token);
+        if($data === false){
+            $this->logDebug(__FUNCTION__, "Cannot find token in keystore");
+            return false;
+        }
+        $userId = $data["USER_ID"];
+        $private = $data["PRIVATE"];
+        $explode = explode("?", $_SERVER["REQUEST_URI"]);
+        $server_uri = rtrim(array_shift($explode), "/");
+        $decoded = array_map("urldecode", explode("/", $server_uri));
+        $decoded = array_map(array("Pydio\Core\Utils\TextEncoder", "toUTF8"), $decoded);
+        $decoded = array_map("rawurlencode", $decoded);
+        $server_uri = implode("/", $decoded);
+        $server_uri = str_replace("~", "%7E", $server_uri);
+        //$this->logDebug(__FUNCTION__, "Decoded URI is ".$server_uri);
+        list($nonce, $hash) = explode(":", $this->detectVar($httpVars, "auth_hash"));
+        //$this->logDebug(__FUNCTION__, "Nonce / hash is ".$nonce.":".$hash);
+        $replay = hash_hmac("sha256", $server_uri . ":" . $nonce . ":" . $private, $token);
+        //$this->logDebug(__FUNCTION__, "Replay is ".$replay);
+
+        if ($replay == $hash) {
+            try {
+                $loggedUser = AuthService::logUser($userId, "", true);
+                $request = $request->withAttribute("ctx", Context::contextWithObjects($loggedUser, null));
+                return true;
+            } catch (\Pydio\Core\Exception\LoginException $l) {
+            }
+        }
+        return false;
+
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $userId
+     * @return bool|null
+     */
+    public function revokeUserTokens(ContextInterface $ctx, $userId)
+    {
+        try{
+            $count = ApiKeysService::revokeTokens($userId);
+            $this->logInfo(__FUNCTION__, "Revoking " . $count . " keys for user '" . $userId . "' on user modification action.");
+        }catch (PydioException $e){}
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @return String
+     */
+    function authTokenActions(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface)
+    {
+        /** @var ContextInterface $ctx */
+        $ctx            = $requestInterface->getAttribute("ctx");
+        $action         = $requestInterface->getAttribute("action");
+        $httpVars       = $requestInterface->getParsedBody();
+        
+        if (!$ctx->hasUser()) {
+            return null;
+        }
+
+        $u = $ctx->getUser();
+        $user = $u->getId();
+        if ($u->isAdmin() && isSet($httpVars["user_id"])) {
+            $user = InputFilter::sanitize($httpVars["user_id"], InputFilter::SANITIZE_EMAILCHARS);
+        }
+        switch ($action) {
+
+            case "keystore_generate_auth_token":
+
+                if (ConfService::getContextConf($ctx, "SESSION_SET_CREDENTIALS", "auth")) {
+                    $this->logDebug("Keystore Generate Tokens", "Session Credentials set: returning empty tokens to force basic authentication");
+                    HTMLWriter::charsetHeader("text/plain");
+                    echo "";
+                    break;
+                }
+                $device = (isSet($httpVars["device"]) ? InputFilter::sanitize($httpVars["device"], InputFilter::SANITIZE_ALPHANUM) : "");
+                $tokenPair = ApiKeysService::generatePairForAuthfront($user, $device, $_SERVER["HTTP_USER_AGENT"], $_SERVER["REMOTE_ADDR"]);
+                $responseInterface = new JsonResponse($tokenPair);
+
+                break;
+
+            case "keystore_revoke_tokens":
+
+                // Invalidate previous tokens
+                $mess = LocaleService::getMessages();
+                $passedKeyId = "";
+                if (isSet($httpVars["key_id"])) $passedKeyId = $httpVars["key_id"];
+                $r = ApiKeysService::revokeTokens($user, $passedKeyId);
+                $responseInterface = new JsonResponse([
+                    "result" => "SUCCESS",
+                    "message" => $mess["keystore.8"]
+                ]);
+                break;
+
+            case "keystore_list_tokens":
+                
+                if (!isSet($user)) break;
+
+                $keys = ApiKeysService::listPairsForUser($user);
+                $responseInterface = new JsonResponse($keys);
+
+                break;
+
+            default:
+                break;
+        }
+
+        return null;
+    }
+
+} 
\ No newline at end of file
diff --git a/core/src/plugins/authfront.keystore/class.ApikeysPane.js b/core/src/plugins/authfront.keystore/class.ApikeysPane.js
index b8ebc15a89..9a4ae28e89 100644
--- a/core/src/plugins/authfront.keystore/class.ApikeysPane.js
+++ b/core/src/plugins/authfront.keystore/class.ApikeysPane.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  *
  */
 Class.create("ApikeysPane", AjxpPane, {
diff --git a/core/src/plugins/authfront.keystore/class.KeystoreAuthFrontend.php b/core/src/plugins/authfront.keystore/class.KeystoreAuthFrontend.php
deleted file mode 100755
index 6eb00f20a5..0000000000
--- a/core/src/plugins/authfront.keystore/class.KeystoreAuthFrontend.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-
-class KeystoreAuthFrontend extends AbstractAuthFrontend {
-
-    /**
-     * @var sqlConfDriver $storage
-     */
-    var $storage;
-
-    function init($options){
-        parent::init($options);
-    }
-
-    function detectVar(&$httpVars, $varName){
-        if(isSet($httpVars[$varName])) return $httpVars[$varName];
-        if(isSet($_SERVER["HTTP_PYDIO_".strtoupper($varName)])) return $_SERVER["HTTP_".strtoupper($varName)];
-        return "";
-    }
-
-    function tryToLogUser(&$httpVars, $isLast = false){
-
-        $token = $this->detectVar($httpVars, "auth_token");
-        if(empty($token)){
-            //$this->logDebug(__FUNCTION__, "Empty token", $_POST);
-            return false;
-        }
-        $this->storage = ConfService::getConfStorageImpl();
-        if(!is_a($this->storage, "sqlConfDriver")) return false;
-
-        $data = null;
-        $this->storage->simpleStoreGet("keystore", $token, "serial", $data);
-        if(empty($data)){
-            //$this->logDebug(__FUNCTION__, "Cannot find token in keystore");
-            return false;
-        }
-        //$this->logDebug(__FUNCTION__, "Found token in keystore");
-        $userId = $data["USER_ID"];
-        $private = $data["PRIVATE"];
-        $explode = explode("?", $_SERVER["REQUEST_URI"]);
-        $server_uri = rtrim(array_shift($explode), "/");
-        $decoded = array_map("urldecode", explode("/", $server_uri));
-        $decoded = array_map(array("SystemTextEncoding", "toUTF8"), $decoded);
-        $decoded = array_map("rawurlencode", $decoded);
-        $server_uri = implode("/", $decoded);
-        $server_uri = str_replace("~", "%7E", $server_uri);
-        //$this->logDebug(__FUNCTION__, "Decoded URI is ".$server_uri);
-        list($nonce, $hash) = explode(":", $this->detectVar($httpVars, "auth_hash"));
-        //$this->logDebug(__FUNCTION__, "Nonce / hash is ".$nonce.":".$hash);
-        $replay = hash_hmac("sha256", $server_uri.":".$nonce.":".$private, $token);
-        //$this->logDebug(__FUNCTION__, "Replay is ".$replay);
-
-        if($replay == $hash){
-            $res = AuthService::logUser($userId, "", true);
-            if($res > 0) return true;
-        }
-        return false;
-
-    }
-
-    public function revokeUserTokens($userId){
-
-        $this->storage = ConfService::getConfStorageImpl();
-        if(!is_a($this->storage, "sqlConfDriver")) return false;
-
-        $keys = $this->storage->simpleStoreList("keystore", null, "", "serial", '%"USER_ID";s:'.strlen($userId).':"'.$userId.'"%');
-        foreach($keys as $keyId => $keyData){
-            $this->storage->simpleStoreClear("keystore", $keyId);
-        }
-        if(count($keys)){
-            $this->logInfo(__FUNCTION__, "Revoking ".count($keys)." keys for user '".$userId."' on password change action.");
-        }
-        return null;
-    }
-
-    /**
-     * @param String $action
-     * @param Array $httpVars
-     * @param Array $fileVars
-     * @return String
-     */
-    function authTokenActions($action, $httpVars, $fileVars){
-
-        if(AuthService::getLoggedUser() == null) return;
-        $this->storage = ConfService::getConfStorageImpl();
-        if(!is_a($this->storage, "sqlConfDriver")) return false;
-
-        $user = AuthService::getLoggedUser()->getId();
-        if(AuthService::getLoggedUser()->isAdmin() && isSet($httpVars["user_id"])){
-            $user = AJXP_Utils::sanitize($httpVars["user_id"], AJXP_SANITIZE_EMAILCHARS);
-        }
-        switch($action){
-            case "keystore_generate_auth_token":
-
-                if(ConfService::getCoreConf("SESSION_SET_CREDENTIALS", "auth")){
-                    $this->logDebug("Keystore Generate Tokens", "Session Credentials set: returning empty tokens to force basic authentication");
-                    HTMLWriter::charsetHeader("text/plain");
-                    echo "";
-                    break;
-                }
-
-                $token = AJXP_Utils::generateRandomString();
-                $private = AJXP_Utils::generateRandomString();
-                $data = array("USER_ID" => $user, "PRIVATE" => $private);
-                if(!empty($httpVars["device"])){
-                    // Revoke previous tokens for this device
-                    $device = $httpVars["device"];
-                    $keys = $this->storage->simpleStoreList("keystore", null, "", "serial", '%"DEVICE_ID";s:'.strlen($device).':"'.$device.'"%');
-                    foreach($keys as $keyId => $keyData){
-                        if($keyData["USER_ID"] != $user) continue;
-                        $this->storage->simpleStoreClear("keystore", $keyId);
-                    }
-                    $data["DEVICE_ID"] = $device;
-                }
-                $data["DEVICE_UA"] = $_SERVER['HTTP_USER_AGENT'];
-                $data["DEVICE_IP"] = $_SERVER['REMOTE_ADDR'];
-                $this->storage->simpleStoreSet("keystore", $token, $data, "serial");
-                HTMLWriter::charsetHeader("application/json");
-                echo(json_encode(array(
-                    "t" => $token,
-                    "p" => $private)
-                ));
-
-                break;
-
-            case "keystore_revoke_tokens":
-
-                // Invalidate previous tokens
-                $mess = ConfService::getMessages();
-                $passedKeyId = "";
-                if(isSet($httpVars["key_id"])) $passedKeyId = $httpVars["key_id"];
-                $keys = $this->storage->simpleStoreList("keystore", null, $passedKeyId, "serial", '%"USER_ID";s:'.strlen($user).':"'.$user.'"%');
-                foreach($keys as $keyId => $keyData){
-                    $this->storage->simpleStoreClear("keystore", $keyId);
-                }
-                $message = array(
-                    "result" => "SUCCESS",
-                    "message" => $mess["keystore.8"]
-                );
-                HTMLWriter::charsetHeader("application/json");
-                echo json_encode($message);
-                break;
-
-            case "keystore_list_tokens":
-                if(!isSet($user)) break;
-                $keys = $this->storage->simpleStoreList("keystore", null, "", "serial", '%"USER_ID";s:'.strlen($user).':"'.$user.'"%');
-                foreach($keys as $keyId => &$keyData){
-                    unset($keyData["PRIVATE"]);
-                    unset($keyData["USER_ID"]);
-                    $deviceDesc = "Web Browser";
-                    $deviceOS = "Unkown";
-                    if(isSet($keyData["DEVICE_UA"])){
-                        $agent = $keyData["DEVICE_UA"];
-                        if(strpos($agent, "python-requests") !== false) {
-                            $deviceDesc = "PydioSync";
-                            if(strpos($agent, "Darwin") !== false) $deviceOS = "Mac OS X";
-                            else if(strpos($agent, "Windows/7") !== false) $deviceOS = "Windows 7";
-                            else if(strpos($agent, "Windows/8") !== false) $deviceOS = "Windows 8";
-                            else if(strpos($agent, "Linux") !== false) $deviceOS = "Linux";
-                        }else{
-                            $deviceOS = AJXP_Utils::osFromUserAgent($agent);
-                        }
-                    }
-                    $keyData["DEVICE_DESC"] = $deviceDesc;
-                    $keyData["DEVICE_OS"]   = $deviceOS;
-                }
-                header("Content-type: application/json;");
-                echo json_encode($keys);
-
-                break;
-
-            default:
-                break;
-        }
-
-        return null;
-    }
-
-} 
\ No newline at end of file
diff --git a/core/src/plugins/authfront.keystore/i18n/conf/de.php b/core/src/plugins/authfront.keystore/i18n/conf/de.php
index 3d73b62917..a383818235 100644
--- a/core/src/plugins/authfront.keystore/i18n/conf/de.php
+++ b/core/src/plugins/authfront.keystore/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "API Keystore" => "API-Keystore",
diff --git a/core/src/plugins/authfront.keystore/i18n/conf/en.php b/core/src/plugins/authfront.keystore/i18n/conf/en.php
index 0705f1251a..9792db127d 100644
--- a/core/src/plugins/authfront.keystore/i18n/conf/en.php
+++ b/core/src/plugins/authfront.keystore/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "API Keystore" => "API Keystore",
diff --git a/core/src/plugins/authfront.keystore/i18n/de.php b/core/src/plugins/authfront.keystore/i18n/de.php
index 3cd94949b1..04668bc222 100644
--- a/core/src/plugins/authfront.keystore/i18n/de.php
+++ b/core/src/plugins/authfront.keystore/i18n/de.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/authfront.keystore/i18n/en.php b/core/src/plugins/authfront.keystore/i18n/en.php
index 6d85ec7dcf..f9bdb28a06 100644
--- a/core/src/plugins/authfront.keystore/i18n/en.php
+++ b/core/src/plugins/authfront.keystore/i18n/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/authfront.keystore/i18n/fr.php b/core/src/plugins/authfront.keystore/i18n/fr.php
index 13195022ab..be46a0832d 100644
--- a/core/src/plugins/authfront.keystore/i18n/fr.php
+++ b/core/src/plugins/authfront.keystore/i18n/fr.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/authfront.keystore/manifest.xml b/core/src/plugins/authfront.keystore/manifest.xml
index 5caeaa61b1..c0e5ce0ca4 100644
--- a/core/src/plugins/authfront.keystore/manifest.xml
+++ b/core/src/plugins/authfront.keystore/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ajxpcore id="authfront.keystore" label="CONF_MESSAGE[API Keystore]" enabled="true" description="CONF_MESSAGE[Store API keys/token to simplify REST connection]"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-	<class_definition filename="plugins/authfront.keystore/class.KeystoreAuthFrontend.php" classname="KeystoreAuthFrontend"/>
+	<class_definition filename="plugins/authfront.keystore/KeystoreAuthFrontend.php" classname="Pydio\Auth\Frontend\KeystoreAuthFrontend"/>
     <client_settings>
         <resources>
             <i18n namespace="authfront.keystore" path="plugins/authfront.keystore/i18n"/>
@@ -24,22 +24,27 @@
         <client_configs>
             <component_config className="AjxpTabulator::userdashboard_main_tab">
                 <additional_tab id="apikeys_pane"
-                                tabInfo='{"id":"my-api-data","iconClass":"icon-key","element":"apikeys_pane","closeable":false,"label":"keystore.1","title":"keystore.2","dontFocus":true,"position":6}'
+                                tabInfo='{"id":"apikeys","iconClass":"icon-key","element":"apikeys_pane","closeable":false,"label":"keystore.1","title":"keystore.2","dontFocus":true,"position":6}'
                                 paneInfo='{"type":"widget"}'><![CDATA[
                     <div id="apikeys_pane" ajxpClass="ApikeysPane" ajxpOptions='{}' class="tabbed_editor" style="position:relative;">
-                        <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["keystore_bar"]}'></div>
-                        <h3 class="dashboard_panel_title">AJXP_MESSAGE[keystore.1]</h3>
+                        <div class="title-flex">
+                            <h3 class="dashboard_panel_title">
+                                AJXP_MESSAGE[keystore.1]
+                                <div class="legend">AJXP_MESSAGE[keystore.2]</div>
+                            </h3>
+                            <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["keystore_bar"]}'></div>
+                        </div>
                         <div id="token_results"><span class="mdi mdi-close"></span><div id="token_results_content"></div></div>
-                        <div style="padding:10px;overflow: auto;" class="fit_me_to_bottom">
-                            <h2>AJXP_MESSAGE[keystore.9]</h2>
-                            <ul></ul>
+                        <div style="padding:0 20px;overflow: auto;" class="fit_me_to_bottom react-mui-context">
+                            <h4>AJXP_MESSAGE[keystore.9]</h4>
+                            <ul style="list-style-type: none;"></ul>
                         </div>
                     </div>
                     ]]></additional_tab>
             </component_config>
         </client_configs>
         <actions>
-            <action name="keystore_generate_auth_token">
+            <action name="keystore_generate_auth_token" skipSecureToken="true">
                 <rightsContext adminOnly="false" noUser="false" read="false" userLogged="true" write="false"/>
                 <processing>
                     <serverCallback methodName="authTokenActions" restParams="/device" sdkMethodName="generateAuthToken" developerComment="Generate and store a authentication key that can be used by the currently logged user. Used by SDKs talking to REST API to avoid renegociating basic auth on each query.">
diff --git a/core/src/plugins/authfront.multi/MultiAuthFrontend.php b/core/src/plugins/authfront.multi/MultiAuthFrontend.php
new file mode 100644
index 0000000000..35d9d6a1f9
--- /dev/null
+++ b/core/src/plugins/authfront.multi/MultiAuthFrontend.php
@@ -0,0 +1,106 @@
+<?php
+/*
+ * Copyright 2007-2015 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Auth\Frontend;
+
+use DOMXPath;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Auth\Frontend\Core\AbstractAuthFrontend;
+use Pydio\Core\Model\ContextInterface;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class MultiAuthFrontend
+ * @package Pydio\Auth\Frontend
+ */
+class MultiAuthFrontend extends AbstractAuthFrontend
+{
+
+    /**
+     * Try to authenticate the user based on various external parameters
+     * Return true if user is now logged.
+     *
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @param bool $isLast Whether this is is the last plugin called.
+     * @return bool
+     */
+    function tryToLogUser(ServerRequestInterface &$request, ResponseInterface &$response, $isLast = false)
+    {
+        return false;
+    }
+
+    /**
+     * Dynamically modify some registry contributions nodes. Can be easily derivated to enable/disable
+     * some features dynamically during plugin initialization.
+     * @param ContextInterface $ctx
+     * @param \DOMNode $contribNode
+     * @return void
+     */
+    protected function parseSpecificContributions(ContextInterface $ctx, \DOMNode &$contribNode)
+    {
+        parent::parseSpecificContributions($ctx, $contribNode);
+        if ($contribNode->nodeName != "actions") return;
+        $sources = array();
+
+        if (!isSet($this->options) || !isSet($this->options["DRIVERS"]) || !is_array($this->options["DRIVERS"])
+            || (isSet($this->options["MODE"]) && $this->options["MODE"] == "MASTER_SLAVE")
+        ) {
+
+            $actionXpath = new DOMXPath($contribNode->ownerDocument);
+            $action = $actionXpath->query('action[@name="login"]', $contribNode);
+            if ($action->length) {
+                $action = $action->item(0);
+                $contribNode->removeChild($action);
+            }
+            return;
+
+        }
+
+        $actionXpath = new DOMXPath($contribNode->ownerDocument);
+        $loginCallbackNodeList = $actionXpath->query('//clientCallback', $contribNode);
+        $callbackNode = $loginCallbackNodeList->item(0);
+        $xmlContent = $callbackNode->firstChild->wholeText;
+
+
+        foreach ($this->options["DRIVERS"] as $driverDef) {
+            $dName = $driverDef["NAME"];
+            if (isSet($driverDef["LABEL"])) {
+                $dLabel = $driverDef["LABEL"];
+            } else {
+                $dLabel = $driverDef["NAME"];
+            }
+            $sources[$dName] = $dLabel;
+        }
+
+        $xmlContent = str_replace("AJXP_MULTIAUTH_SOURCES", json_encode($sources), $xmlContent);
+        $xmlContent = str_replace("AJXP_MULTIAUTH_MASTER", $this->options["MASTER_DRIVER"], $xmlContent);
+        $xmlContent = str_replace("AJXP_USER_ID_SEPARATOR", $this->options["USER_ID_SEPARATOR"], $xmlContent);
+        if ($callbackNode) {
+            $callbackNode->removeChild($callbackNode->firstChild);
+            $callbackNode->appendChild($contribNode->ownerDocument->createCDATASection($xmlContent));
+        }
+
+    }
+
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/authfront.multi/class.MultiAuthFrontend.php b/core/src/plugins/authfront.multi/class.MultiAuthFrontend.php
deleted file mode 100644
index 750c35b141..0000000000
--- a/core/src/plugins/authfront.multi/class.MultiAuthFrontend.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/*
- * Copyright 2007-2015 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-
-class MultiAuthFrontend extends AbstractAuthFrontend {
-
-    function tryToLogUser(&$httpVars, $isLast = false){
-        return false;
-    }
-
-    protected function parseSpecificContributions(&$contribNode)
-    {
-        parent::parseSpecificContributions($contribNode);
-        if($contribNode->nodeName != "actions") return ;
-
-        $actionXpath=new DOMXPath($contribNode->ownerDocument);
-        $loginCallbackNodeList = $actionXpath->query('//clientCallback', $contribNode);
-        $callbackNode = $loginCallbackNodeList->item(0);
-        $xmlContent = $callbackNode->firstChild->wholeText;
-
-        $sources = array();
-        if(!isSet($this->options) || !isSet($this->options["DRIVERS"]) || !is_array($this->options["DRIVERS"])) return;
-        foreach ($this->options["DRIVERS"] as $driverDef) {
-            $dName = $driverDef["NAME"];
-            if (isSet($driverDef["LABEL"])) {
-                $dLabel = $driverDef["LABEL"];
-            } else {
-                $dLabel = $driverDef["NAME"];
-            }
-            $sources[$dName] = $dLabel;
-        }
-        $xmlContent = str_replace("AJXP_MULTIAUTH_SOURCES", json_encode($sources), $xmlContent);
-        $xmlContent = str_replace("AJXP_MULTIAUTH_MASTER", $this->options["MASTER_DRIVER"], $xmlContent);
-        $xmlContent = str_replace("AJXP_USER_ID_SEPARATOR", $this->options["USER_ID_SEPARATOR"], $xmlContent);
-        if($callbackNode) {
-            $callbackNode->removeChild($callbackNode->firstChild);
-            $callbackNode->appendChild($contribNode->ownerDocument->createCDATASection($xmlContent));
-        }
-
-    }
-
-
-}
\ No newline at end of file
diff --git a/core/src/plugins/authfront.multi/manifest.xml b/core/src/plugins/authfront.multi/manifest.xml
index f086d111c6..577a3b7471 100644
--- a/core/src/plugins/authfront.multi/manifest.xml
+++ b/core/src/plugins/authfront.multi/manifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ajxp_plugin name="multi" label="CONF_MESSAGE[Multiple Auth Chooser]" enabled="false" description="CONF_MESSAGE[Add a selector on top of the login screen. DO NOT ENABLE MANUALLY, will be activated by auth.multi automatically.]"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
+<ajxp_plugin name="multi" label="CONF_MESSAGE[Multiple Auth Chooser]" enabled="true" description="CONF_MESSAGE[Add a selector on top of the login screen. DO NOT ENABLE MANUALLY, will be activated by auth.multi automatically.]"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
     <plugin_info>
         <plugin_author>Charles du Jeu</plugin_author>
     </plugin_info>
@@ -7,7 +7,7 @@
         <global_param name="ORDER" type="integer" label="Order"
                       description="Order this plugin with other auth frontends" default="200"/>
     </server_settings>
-    <class_definition classname="MultiAuthFrontend" filename="plugins/authfront.multi/class.MultiAuthFrontend.php"/>
+    <class_definition classname="Pydio\Auth\Frontend\MultiAuthFrontend" filename="plugins/authfront.multi/MultiAuthFrontend.php"/>
     <registry_contributions>
         <actions>
             <action name="login">
@@ -135,7 +135,6 @@
         </actions>
     </registry_contributions>
     <dependencies>
-        <activePlugin pluginName="authfront.session_login"/>
         <activePlugin pluginName="auth.multi"/>
     </dependencies>
 </ajxp_plugin>
diff --git a/core/src/plugins/authfront.otp/OtpAuthFrontend.php b/core/src/plugins/authfront.otp/OtpAuthFrontend.php
new file mode 100644
index 0000000000..df1b802b75
--- /dev/null
+++ b/core/src/plugins/authfront.otp/OtpAuthFrontend.php
@@ -0,0 +1,438 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Auth\Frontend;
+
+use Auth_Yubico;
+use Exception;
+use PEAR;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Auth\Frontend\Core\AbstractAuthFrontend;
+use Pydio\Core\Exception\AuthRequiredException;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Model\UserInterface;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\RolesService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\StringHelper;
+use Zend\Diactoros\Response\JsonResponse;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class OtpAuthFrontend
+ * @package Pydio\Auth\Frontend
+ */
+class OtpAuthFrontend extends AbstractAuthFrontend
+{
+
+    private $yubicoSecretKey;
+    private $yubicoClientId;
+
+    private $googleEnabled;
+    private $google;
+    private $googleLast;
+
+    private $yubikeyEnabled;
+    private $yubikey1;
+    private $yubikey2;
+
+    /**
+     * @param array $configData
+     */
+    function loadConfigs($configData){
+        parent::loadConfigs($configData);
+        if(isSet($this->pluginConf["google_enabled_admin"]) && $this->pluginConf["google_enabled_admin"] === true){
+            $this->pluginConf["google_enabled"] = true;
+        }
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param bool $extendedVersion
+     * @return \DOMElement[]
+     */
+    function getRegistryContributions(ContextInterface $ctx, $extendedVersion = true){
+        if($ctx->hasUser() && $ctx->getUser()->getPersonalRole()->filterParameterValue("authfront.otp", "google_enabled_admin", AJXP_REPO_SCOPE_ALL, false)){
+            if(!$this->manifestLoaded) $this->unserializeManifest();
+            /** @var \DOMElement $param */
+            $param = $this->getXPath()->query('server_settings/param[@name="google_enabled"]')->item(0);
+            $param->setAttribute("expose", "false");
+            $this->reloadXPath();
+        }
+        return parent::getRegistryContributions($ctx, $extendedVersion);
+    }
+
+    /**
+     * Try to authenticate the user based on various external parameters
+     * Return true if user is now logged.
+     *
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @param bool $isLast Whether this is is the last plugin called.
+     * @return bool
+     */
+    function tryToLogUser(ServerRequestInterface &$request, ResponseInterface &$response, $isLast = false)
+    {
+
+        $httpVars = $request->getParsedBody();
+        $exceptionMsg = "Login information is not correct! Please try again with the one-time-password at the end of your password";
+        if (empty($httpVars) || empty($httpVars["userid"])) {
+            return false;
+        } else {
+            $userid = InputFilter::sanitize($httpVars["userid"], InputFilter::SANITIZE_EMAILCHARS);
+            $this->loadConfig(UsersService::getUserById($userid));
+
+            if( ( empty($this->googleEnabled) || $this->googleEnabled === false) && (empty($this->yubikeyEnabled) || $this->yubikeyEnabled === false)){
+                return false;
+            }else if($this->googleEnabled && empty($this->google)){
+                $this->showSetupScreen($userid);
+                return false;
+            }
+
+            if (empty($this->google) && empty($this->googleLast) && empty($this->yubikey1) && empty($this->yubikey2)) {
+                return false;
+            }
+
+            // cut off password and otp in pass field
+            $cutPassword = false;
+            $codeOTP = "";
+            if (isSet($httpVars["otp_code"]) && !empty($httpVars["otp_code"])) {
+                $codeOTP = $httpVars["otp_code"];
+            } else if (strlen($httpVars["password"]) > 6) {
+                $codeOTP = substr($httpVars["password"], -6);
+                $cutPassword = true;
+            } else {
+                $this->breakAndSendError($exceptionMsg);
+            }
+
+            //Just the Google Authenticator set
+            if (!empty($this->google) &&  empty($this->yubikey1) && empty($this->yubikey2) ) {
+                if ($this->checkGooglePass($userid, $codeOTP, $this->google, $this->googleLast)) {
+                    $this->logDebug(__CLASS__, __FUNCTION__, "Check OTP: matched");
+                    //return false and cut off otp from password for next authfront.
+                    if ($cutPassword) {
+                        $httpVars["password"] = substr($httpVars["password"], 0, strlen($httpVars["password"]) - 6);
+                        $request = $request->withParsedBody($httpVars);
+                    }
+                    return false;
+                } else {
+                    $this->breakAndSendError($exceptionMsg);
+                }
+            } elseif (empty($this->google) && (!empty($this->yubikey1) || !empty($this->yubikey2)) ) {
+                if ($this->checkYubiOTP($httpVars["otp_code"], $this->yubikey1, $this->yubikey2)) {
+                    return false;
+                } else {
+                    $this->breakAndSendError($exceptionMsg);
+                }
+            } elseif (ctype_digit(substr($httpVars["password"], -1))) {
+                if ($this->checkGooglePass($userid, $codeOTP, $this->google, $this->googleLast)) {
+                    if ($cutPassword) {
+                        $httpVars["password"] = substr($httpVars["password"], 0, strlen($httpVars["password"]) - 6);
+                        $request = $request->withParsedBody($httpVars);
+                    }
+                    return false;
+                } else {
+                    $this->breakAndSendError($exceptionMsg);
+                }
+            } else {
+                if ($this->checkYubiOTP($httpVars["otp_code"], $this->yubikey1, $this->yubikey2)) {
+                    return false;
+                } else {
+                    $this->breakAndSendError($exceptionMsg);
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @param $exceptionMsg
+     * @throws \Pydio\Core\Exception\AuthRequiredException
+     */
+    protected function breakAndSendError($exceptionMsg) {
+        throw new AuthRequiredException($exceptionMsg, "", -1);
+    }
+
+
+
+    /**
+     * @param $userId
+     * @throws \Pydio\Core\Exception\UserNotFoundException
+     */
+    private function showSetupScreen($userId){
+        $userObject = UsersService::getUserById($userId);
+        $userObject->setLock("otp_show_setup_screen");
+        $userObject->save("superuser");
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @throws AuthRequiredException
+     * @throws PydioException
+     */
+    public function getConfigurationCode(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface){
+
+        /** @var ContextInterface $ctx */
+        $ctx = $requestInterface->getAttribute("ctx");
+        if(!$ctx->hasUser()){
+            throw new AuthRequiredException();
+        }
+        $mess = LocaleService::getMessages();
+        $uObject = $ctx->getUser();
+        $params  = $requestInterface->getParsedBody();
+        if(isSet($params["step"]) && $params["step"] === "verify"){
+
+            $this->loadConfig($uObject);
+            if(empty($this->google)){
+                throw new PydioException($mess["authfront.otp.8"]);
+            }
+            $otp = $requestInterface->getParsedBody()["otp"];
+            if($this->checkGooglePass($uObject->getId(), $otp, $this->google, $this->googleLast)){
+                $responseInterface = new JsonResponse(["RESULT" => "OK"]);
+                $uObject->removeLock("otp_show_setup_screen");
+                $uObject->save("superuser");
+            }else{
+                throw new PydioException($mess["authfront.otp.7"]);
+            }
+
+        }else{
+            $googleKey = $uObject->getMergedRole()->filterParameterValue("authfront.otp", "google", AJXP_REPO_SCOPE_ALL, '');
+            if(!empty($googleKey)){
+                $newKey = $googleKey;
+            }else{
+                $newKey = StringHelper::generateRandomString(16);
+                $newKey = str_replace([0,1,2,3,4,5,6,7,8,9], ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j'], $newKey);
+                $newKey = strtoupper($newKey);
+            }
+
+            $uObject->getPersonalRole()->setParameterValue("authfront.otp", "google", $newKey);
+            ConfService::getConfStorageImpl()->updateRole($uObject->getPersonalRole(), $uObject);
+
+            $responseInterface = new JsonResponse([
+                "key" => $newKey,
+                "qrcode" => "otpauth://totp/User:%20".$uObject->getId()."?secret=".$newKey."&issuer=".urlencode(ConfService::getGlobalConf("APPLICATION_TITLE"))
+            ]);
+        }
+
+    }
+
+    /**
+     * @param UserInterface $userObject
+     * @throws \Pydio\Core\Exception\UserNotFoundException
+     */
+    private function loadConfig($userObject)
+    {
+
+        if ($userObject != null) {
+
+            $this->googleEnabled    = $userObject->getMergedRole()->filterParameterValue("authfront.otp", "google_enabled", AJXP_REPO_SCOPE_ALL, false);
+            if($this->googleEnabled === "false") {
+                $this->googleEnabled = false;
+            }
+            $this->google           = $userObject->getMergedRole()->filterParameterValue("authfront.otp", "google", AJXP_REPO_SCOPE_ALL, '');
+            $this->googleLast       = $userObject->getMergedRole()->filterParameterValue("authfront.otp", "google_last", AJXP_REPO_SCOPE_ALL, '');
+
+            $this->yubikeyEnabled    = $userObject->getMergedRole()->filterParameterValue("authfront.otp", "yubikey_enabled", AJXP_REPO_SCOPE_ALL, false);
+            if($this->yubikeyEnabled === "false") {
+                $this->yubikeyEnabled = false;
+            }
+            $this->yubikey1 = $userObject->getMergedRole()->filterParameterValue("authfront.otp", "yubikey1", AJXP_REPO_SCOPE_ALL, '');
+            if(!empty($this->yubikey1) && strlen($this->yubikey1) >  12) {
+                $this->yubikey1 = substr($this->yubikey1, 0, 12);
+            }
+            $this->yubikey2 = $userObject->getMergedRole()->filterParameterValue("authfront.otp", "yubikey2", AJXP_REPO_SCOPE_ALL, '');
+            if(!empty($this->yubikey2) && strlen($this->yubikey2) >  12) {
+                $this->yubikey2 = substr($this->yubikey2, 0, 12);
+            }
+
+        }
+        if (!empty($this->pluginConf["YUBICO_CLIENT_ID"])) {
+            $this->yubicoClientId = trim($this->pluginConf["YUBICO_CLIENT_ID"]);
+        }
+        if (!empty($this->pluginConf["YUBICO_SECRET_KEY"])) {
+            $this->yubicoSecretKey = trim($this->pluginConf["YUBICO_SECRET_KEY"]);
+        }
+    }
+
+    // Google Authenticator
+
+    /**
+     * @param $key
+     * @param $counter
+     * @return string
+     */
+    public function oath_hotp($key, $counter)
+    {
+        $key = pack("H*", $key);
+        $cur_counter = array(0, 0, 0, 0, 0, 0, 0, 0);
+        for ($i = 7; $i >= 0; $i--) {
+            $cur_counter[$i] = pack('C*', $counter);
+            $counter = $counter >> 8;
+        }
+        $bin_counter = implode($cur_counter);
+        // Pad to 8 chars
+        if (strlen($bin_counter) < 8) {
+            $bin_counter = str_repeat(chr(0), 8 - strlen($bin_counter)) . $bin_counter;
+        }
+
+        // HMAC
+        $hash = hash_hmac('sha1', $bin_counter, $key);
+        return str_pad($this->oath_truncate($hash), 6, "0", STR_PAD_LEFT);
+    }
+
+    /**
+     * @param $hash
+     * @param int $length
+     * @return int
+     */
+    public function oath_truncate($hash, $length = 6)
+    {
+        $hmac_result = [];
+        // Convert to dec
+        foreach (str_split($hash, 2) as $hex) {
+            $hmac_result[] = hexdec($hex);
+        }
+
+        // Find offset
+        $offset = $hmac_result[19] & 0xf;
+
+        // Algorithm from RFC
+        return
+            (
+                (($hmac_result[$offset + 0] & 0x7f) << 24) |
+                (($hmac_result[$offset + 1] & 0xff) << 16) |
+                (($hmac_result[$offset + 2] & 0xff) << 8) |
+                ($hmac_result[$offset + 3] & 0xff)
+            ) % pow(10, $length);
+    }
+
+    /**
+     * @param $b32
+     * @return string
+     */
+    public function base32ToHex($b32)
+    {
+        $alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+
+        $out = "";
+        $dous = "";
+
+        for ($i = 0; $i < strlen($b32); $i++) {
+            $in = strrpos($alphabet, $b32[$i]);
+            $b = str_pad(base_convert($in, 10, 2), 5, "0", STR_PAD_LEFT);
+            $out .= $b;
+            $dous .= $b . ".";
+        }
+
+        $ar = str_split($out, 20);
+
+        $out2 = "";
+        foreach ($ar as $val) {
+            $rv = str_pad(base_convert($val, 2, 16), 5, "0", STR_PAD_LEFT);
+            $out2 .= $rv;
+
+        }
+        return $out2;
+    }
+
+    /**
+     * @param $loginId
+     * @param $codeOTP
+     * @param $userToken
+     * @param $userInvalid
+     * @return bool
+     * @throws Exception
+     * @throws \Pydio\Core\Exception\UserNotFoundException
+     */
+    public function checkGooglePass($loginId, $codeOTP, $userToken, $userInvalid)
+    {
+        $userToken = $this->base32ToHex($userToken);
+
+        $now = time();
+        $totpSkew = 2; // how many tokens in either side we should check. 2 means +-1 min
+        $tokenTimer = 30; // google authenticator support just 30s
+
+        $earliest = $now - ($totpSkew * $tokenTimer);
+        $latest = $now + ($totpSkew * $tokenTimer);
+
+        $st = ((int)($earliest / $tokenTimer));
+        $en = ((int)($latest / $tokenTimer));
+
+        $valid = 0;
+        $this->logDebug(__CLASS__, __FUNCTION__, "codeOTP " . $codeOTP);
+        for ($i = $st; ($i <= $en && $valid == 0); $i++) {
+            if ($i > $userInvalid) {
+                $stest = $this->oath_hotp($userToken, $i);
+                $this->logDebug(__CLASS__, __FUNCTION__, "stest " . $stest);
+                if ($codeOTP == $stest) {
+                    $valid = 1;
+                    // save google_last
+                    $userObject = UsersService::getUserById($loginId);
+                    $role = $userObject->getPersonalRole();
+                    if ($role === false) {
+                        throw new Exception("Cant find role! ");
+                    }
+                    $role->setParameterValue("authfront.otp", "google_last", $i);
+                    RolesService::updateRole($role, $userObject);
+
+                    return true;
+                }
+            }
+        }
+
+        return false;
+        //return ( AJXP_Utils::pbkdf2_validate_password($pass, $userStoredPass) && $valid == 1);
+    }
+
+    // YubiKey
+
+    /**
+     * @param $otp_code
+     * @param $yubikey1
+     * @param $yubikey2
+     * @return bool
+     */
+    public function checkYubiOTP($otp_code, $yubikey1, $yubikey2)
+    {
+
+        require_once 'Auth/Yubico.php';
+
+        // yubikey generates 44 character, identity is the first 12 character
+        $yubi1_identity = substr($yubikey1, 0, 12);
+        $yubi2_identity = substr($yubikey2, 0, 12);
+        $otp_identity = substr($otp_code, -44, 12);
+        if (($otp_identity != $yubi1_identity) and ($otp_identity != $yubi2_identity)) {
+            return false;
+        }
+
+        $yotp = substr($otp_code, -44);
+        $yubi = new Auth_Yubico($this->yubicoClientId, $this->yubicoSecretKey);
+        $auth = $yubi->verify($yotp);
+
+        return (!PEAR::isError($auth));
+    }
+
+}
diff --git a/core/src/plugins/authfront.otp/class.OTP_LoginForm.js b/core/src/plugins/authfront.otp/class.OTP_LoginForm.js
index d36436eadd..64dba0eb09 100644
--- a/core/src/plugins/authfront.otp/class.OTP_LoginForm.js
+++ b/core/src/plugins/authfront.otp/class.OTP_LoginForm.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  *
  */
 Class.create("OTP_LoginForm", {
@@ -53,4 +53,4 @@ Class.create("OTP_LoginForm", {
         }
     }
 });
-window.OTPFORM = new OTP_LoginForm();
\ No newline at end of file
+window.OTPFORM = new OTP_LoginForm();
diff --git a/core/src/plugins/authfront.otp/class.OtpAuthFrontend.php b/core/src/plugins/authfront.otp/class.OtpAuthFrontend.php
deleted file mode 100644
index d80dcff4e9..0000000000
--- a/core/src/plugins/authfront.otp/class.OtpAuthFrontend.php
+++ /dev/null
@@ -1,280 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die('Access not allowed');
-
-class OtpAuthFrontend extends AbstractAuthFrontend
-{
-/*
-    private $enable_Create_User;
-    private $modifyLoginScreen;
-    private $userFilePath;*/
-    
-    private $yubicoSecretKey;
-    private $yubicoClientId;
-    private $google;
-    private $googleLast;
-    private $yubikey1;
-    private $yubikey2;
-
-    function tryToLogUser(&$httpVars, $isLast = false)
-    {
-        $exceptionMsg = "Login information is not correct! Please try again with the one-time-password at the end of your password";
-        if(empty($httpVars) || empty($httpVars["userid"])){
-            return false;
-        } else{
-            $userid = $httpVars["userid"];
-            $this->loadConfig($userid);
-            // if there is no configuration for OTP, this means that this user don't have OTP
-            if ((empty($this->google) &&
-                empty($this->googleLast) &&
-                empty($this->yubikey1) &&
-                empty($this->yubikey2))) {
-                return false;
-            }
-
-            // load Yubico class
-            if(!empty($this->yubikey1)) {
-                require_once 'Auth/Yubico.php';
-            }
-
-            // cut off password and otp in pass field
-            $cutPassword = false;
-            if(isSet($httpVars["otp_code"]) && !empty($httpVars["otp_code"])){
-                $codeOTP = $httpVars["otp_code"];
-            }else if(strlen($httpVars["password"]) > 6){
-                $codeOTP = substr($httpVars["password"], -6);
-                $cutPassword = true;
-            }else{
-                $this->breakAndSendError($exceptionMsg);
-            }
-
-            //Just the Google Authenticator set
-            if (!empty($this->google) &&
-                empty($this->yubikey1) &&
-                empty($this->yubikey2)) {
-                if($this->checkGooglePass($userid, $codeOTP, $this->google, $this->googleLast)){
-                    $this->logDebug(__CLASS__, __FUNCTION__, "Check OTP: matched");
-                    //return false and cut off otp from password for next authfront.
-                    if($cutPassword){
-                        $httpVars["password"] = substr($httpVars["password"], 0, strlen($httpVars["password"]) - 6);
-                    }
-                    return false;
-                }
-                else{
-                    $this->breakAndSendError($exceptionMsg);
-                }
-            }elseif
-            // YubiKey1 or YubiKey2 set
-            (empty($this->google) &&
-                (!empty($this->yubikey1) || !empty($this->yubikey2))
-            ){
-               if ($this->checkYubiOTP($httpVars["otp_code"], $this->yubikey1, $this->yubikey2)){
-                   return false;
-               }else{
-                   $this->breakAndSendError($exceptionMsg);
-               }
-            }elseif
-            // Both Yubikey and Google Authenticator set
-            // If the last character of the password is digit, it is Google Authenticator
-            (ctype_digit(substr($httpVars["password"], -1))) {
-                if($this->checkGooglePass($userid, $codeOTP, $this->google, $this->googleLast)){
-                    if($cutPassword){
-                        $httpVars["password"] = substr($httpVars["password"], 0, strlen($httpVars["password"]) - 6);
-                    }
-                    return false;
-                }
-                else{
-                    $this->breakAndSendError($exceptionMsg);
-                }
-            }
-            else{
-                if ($this->checkYubiOTP($httpVars["otp_code"], $this->yubikey1, $this->yubikey2)){
-                    return false;
-                }
-                else{
-                    $this->breakAndSendError($exceptionMsg);
-                }
-            }
-        }
-    }
-
-    protected function breakAndSendError($exceptionMsg){
-
-        AJXP_XMLWriter::header();
-        AJXP_XMLWriter::loggingResult(-1, null, null, null);
-        AJXP_XMLWriter::sendMessage("ERROR", $exceptionMsg);
-        AJXP_XMLWriter::close();
-        //throw new AJXP_Exception($exceptionMsg);
-        exit();
-
-    }
-
-
-    private function loadConfig($userid)
-    {
-        $confStorage = ConfService::getConfStorageImpl();
-        $userObject = $confStorage->createUserObject($userid);
-
-        if($userObject != null){
-            $this->google = $userObject->mergedRole->filterParameterValue("authfront.otp", "google", AJXP_REPO_SCOPE_ALL, '');
-            $this->googleLast = $userObject->mergedRole->filterParameterValue("authfront.otp", "google_last", AJXP_REPO_SCOPE_ALL, '');
-            $this->yubikey1 = $userObject->mergedRole->filterParameterValue("authfront.otp", "yubikey1", AJXP_REPO_SCOPE_ALL, '');
-            $this->yubikey2 = $userObject->mergedRole->filterParameterValue("authfront.otp", "yubikey2", AJXP_REPO_SCOPE_ALL, '');
-        }
-        if (!empty($this->pluginConf["YUBICO_CLIENT_ID"])) {
-            $this->yubicoClientId = trim($this->pluginConf["YUBICO_CLIENT_ID"]);
-        }
-        if (!empty($this->pluginConf["YUBICO_SECRET_KEY"])) {
-            $this->yubicoSecretKey = trim($this->pluginConf["YUBICO_SECRET_KEY"]);
-        }
-    }
-
-    // Google Authenticator
-
-    public function oath_hotp($key, $counter)
-    {
-        $key = pack("H*", $key);
-        $cur_counter = array(0,0,0,0,0,0,0,0);
-        for ($i=7;$i>=0;$i--) {
-            $cur_counter[$i] = pack ('C*', $counter);
-            $counter = $counter >> 8;
-        }
-        $bin_counter = implode($cur_counter);
-        // Pad to 8 chars
-        if (strlen ($bin_counter) < 8) {
-            $bin_counter = str_repeat (chr(0), 8 - strlen ($bin_counter)) . $bin_counter;
-        }
-
-        // HMAC
-        $hash = hash_hmac ('sha1', $bin_counter, $key);
-        return str_pad($this->oath_truncate($hash), 6, "0", STR_PAD_LEFT);
-    }
-
-    public function oath_truncate($hash, $length = 6)
-    {
-        // Convert to dec
-        foreach (str_split($hash,2) as $hex) {
-            $hmac_result[]=hexdec($hex);
-        }
-
-        // Find offset
-        $offset = $hmac_result[19] & 0xf;
-
-        // Algorithm from RFC
-        return
-            (
-                (($hmac_result[$offset+0] & 0x7f) << 24 ) |
-                (($hmac_result[$offset+1] & 0xff) << 16 ) |
-                (($hmac_result[$offset+2] & 0xff) << 8 ) |
-                ($hmac_result[$offset+3] & 0xff)
-            ) % pow(10,$length);
-    }
-
-    public function base32ToHex($b32)
-    {
-        $alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
-
-        $out = "";
-        $dous = "";
-
-        for ($i = 0; $i < strlen($b32); $i++) {
-            $in = strrpos($alphabet, $b32[$i]);
-            $b = str_pad(base_convert($in, 10, 2), 5, "0", STR_PAD_LEFT);
-            $out .= $b;
-            $dous .= $b.".";
-        }
-
-        $ar = str_split($out,20);
-
-        $out2 = "";
-        foreach ($ar as $val) {
-            $rv = str_pad(base_convert($val, 2, 16), 5, "0", STR_PAD_LEFT);
-            $out2 .= $rv;
-
-        }
-        return $out2;
-    }
-
-    public function checkGooglePass($loginId, $codeOTP, $userToken, $userInvalid)
-    {
-        $userToken = $this->base32ToHex($userToken);
-
-        $now = time();
-        $totpSkew = 2; // how many tokens in either side we should check. 2 means +-1 min
-        $tokenTimer = 30; // google authenticator support just 30s
-
-        $earliest = $now - ($totpSkew * $tokenTimer);
-        $latest = $now + ($totpSkew * $tokenTimer);
-
-        $st = ((int) ($earliest / $tokenTimer));
-        $en = ((int) ($latest / $tokenTimer));
-
-        $valid = 0;
-        $this->logDebug(__CLASS__, __FUNCTION__, "codeOTP ".$codeOTP);
-        for ($i=$st; ($i<=$en && $valid == 0); $i++) {
-            if ($i > $userInvalid) {
-                $stest = $this->oath_hotp($userToken, $i);
-                $this->logDebug(__CLASS__, __FUNCTION__, "stest ".$stest);
-                if ($codeOTP == $stest) {
-                    $valid = 1;
-                    // save google_last
-                    $confStorage = ConfService::getConfStorageImpl();
-                    $userObject = $confStorage->createUserObject($loginId);
-                    $role = $userObject->personalRole;
-                    if ($role === false) {
-                        throw new Exception("Cant find role! ");
-                    }
-                    $role->setParameterValue("authfront.otp", "google_last", $i);
-                    AuthService::updateRole($role, $userObject);
-
-                    return true;
-                }
-            }
-        }
-
-        return false;
-        //return ( AJXP_Utils::pbkdf2_validate_password($pass, $userStoredPass) && $valid == 1);
-    }
-
-    // YubiKey
-
-    public function checkYubiOTP($otp_code, $yubikey1, $yubikey2)
-    {
-
-        // yubikey generates 44 character, identity is the first 12 character
-        $yubi1_identity = substr($yubikey1, 0, 12);
-        $yubi2_identity = substr($yubikey2, 0, 12);
-        $otp_identity = substr($otp_code, -44, 12);
-        if (($otp_identity != $yubi1_identity) and ($otp_identity != $yubi2_identity)) {
-            // YubiKey not listed in account
-            return false;
-        }
-
-        $yotp = substr($otp_code, -44);
-        $otp_code = substr($otp_code, 0, strlen($otp_code) - 44);
-
-        $yubi = new Auth_Yubico($this->yubicoClientId, $this->yubicoSecretKey);
-        $auth = $yubi->verify($yotp);
-
-        return (!PEAR::isError($auth));
-    }
-
-}
diff --git a/core/src/plugins/authfront.otp/configurator.css b/core/src/plugins/authfront.otp/configurator.css
new file mode 100644
index 0000000000..093c2ccaaa
--- /dev/null
+++ b/core/src/plugins/authfront.otp/configurator.css
@@ -0,0 +1,16 @@
+#otp_setup_screen {
+  font-size: 12px;
+}
+#otp_setup_screen span.step {
+  font-size: 14px;
+  font-weight: 500;
+}
+#otp_setup_screen .codes {
+  width: 200px;
+  text-align: center;
+  margin: 10px auto;
+}
+#otp_setup_screen .codes input {
+  text-align: center;
+  width: 200px;
+}
diff --git a/core/src/plugins/authfront.otp/configurator.less b/core/src/plugins/authfront.otp/configurator.less
new file mode 100644
index 0000000000..116b410618
--- /dev/null
+++ b/core/src/plugins/authfront.otp/configurator.less
@@ -0,0 +1,16 @@
+#otp_setup_screen{
+  font-size: 12px;
+  span.step{
+    font-size: 14px;
+    font-weight: 500;
+  }
+  .codes{
+    width: 200px;
+    text-align: center;
+    margin: 10px auto;
+    input{
+      text-align: center;
+      width: 200px;
+    }
+  }
+}
\ No newline at end of file
diff --git a/core/src/plugins/authfront.otp/i18n/conf/de.php b/core/src/plugins/authfront.otp/i18n/conf/de.php
index ebabb5b639..55e0fe3fc1 100644
--- a/core/src/plugins/authfront.otp/i18n/conf/de.php
+++ b/core/src/plugins/authfront.otp/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Authentication One-time-password" => "Einmal-Passwort",
@@ -39,4 +39,4 @@
 "Google Authenticator Secret" => "Google Authenticator Secret",
 "Google Authenticator Last" => "Google Authenticator Last",
 "Google Authenticator replay protection, do not edit" => "Google Authenticator replay protection, do not edit",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/authfront.otp/i18n/conf/en.php b/core/src/plugins/authfront.otp/i18n/conf/en.php
index 020e044088..088e7241c8 100644
--- a/core/src/plugins/authfront.otp/i18n/conf/en.php
+++ b/core/src/plugins/authfront.otp/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Authentication One-time-password" => "Authentication One-time-password",
@@ -39,4 +39,4 @@
 "Google Authenticator Secret" => "Google Authenticator Secret",
 "Google Authenticator Last" => "Google Authenticator Last",
 "Google Authenticator replay protection, do not edit" => "Google Authenticator replay protection, do not edit",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/authfront.otp/i18n/en.php b/core/src/plugins/authfront.otp/i18n/en.php
new file mode 100644
index 0000000000..8361d3c1f7
--- /dev/null
+++ b/core/src/plugins/authfront.otp/i18n/en.php
@@ -0,0 +1,11 @@
+<?php
+$mess = [
+    "1" => "Google Authenticator Configuration",
+    "2" => "Your account is configured to use 2-factors authentication using Google Authenticator. ",
+    "3" => "<span class='step'>Step 1</span> - If not already done, please install the Google Authenticator application on your mobile device. Application is available in the stores for iOS and Android.",
+    "4" => "<span class='step'>Step 2</span> - Once the application is installed, you can directly scan the QRCode below or manually create an account and enter the API key.",
+    "5" => "<span class='step'>Step 3</span> - Finally to verify that your GA account is properly configured, please enter the one-time-password provided.",
+    "6" => "Your google key is already configured. Please contact your administrator to reset it.",
+    "7" => "Cannot validate code, did you properly set up your Google Authenticator application?",
+    "8" => "Something went wrong, your key should not be empty.",
+];
\ No newline at end of file
diff --git a/core/src/plugins/authfront.otp/i18n/fr.php b/core/src/plugins/authfront.otp/i18n/fr.php
new file mode 100644
index 0000000000..b3145d33af
--- /dev/null
+++ b/core/src/plugins/authfront.otp/i18n/fr.php
@@ -0,0 +1,11 @@
+<?php
+$mess = [
+    "1" => "Configuration de Google Authenticator",
+    "2" => "Votre compte est configuré pour utiliser l'authentification à deux niveaux avec Google Authenticator.",
+    "3" => "<span class='step'>Etape 1</span> - Installez l'application Google Authenticator sur votre mobile à partir des store iOS ou Android.",
+    "4" => "<span class='step'>Etape 2</span> - Depuis l'application, scannez directement le code barre, ou créez une entrée manuellement avec la clé qui est affichée.",
+    "5" => "<span class='step'>Etape 3</span> - Verifiez la configuration en utilisant le code à utilisation unique qui s'affiche sur l'application.",
+    "6" => "Votre clé est déjà configurée, veuillez contacter l'administrateur pour la remettre à zéro.",
+    "7" => "La vérification a échoué, avez vous correctement configuré l'application?",
+    "8" => "Erreur interne, la clé ne devrait pas être vide.",
+];
\ No newline at end of file
diff --git a/core/src/plugins/authfront.otp/manifest.xml b/core/src/plugins/authfront.otp/manifest.xml
index 2022699537..603c0bd40b 100644
--- a/core/src/plugins/authfront.otp/manifest.xml
+++ b/core/src/plugins/authfront.otp/manifest.xml
@@ -10,29 +10,114 @@
         <resources>
             <i18n namespace="authfront.otp" path="plugins/authfront.otp/i18n"/>
             <js className="OTP_LoginForm" file="plugins/authfront.otp/class.OTP_LoginForm.js" autoload="true"/>
+            <css file="plugins/authfront.otp/configurator.css" autoload="true"/>
         </resources>
     </client_settings>
     <server_settings>
-        <global_param name="ORDER" type="integer" label="CONF_MESSAGE[Order]" description="CONF_MESSAGE[Order this plugin with other auth frontends]" default="13"/>
-        <global_param name="PROTOCOL_TYPE" type="select"
+        <global_param group="CONF_MESSAGE[Options]" name="ORDER" type="integer" label="CONF_MESSAGE[Order]" description="CONF_MESSAGE[Order this plugin with other auth frontends]" default="13"/>
+        <global_param group="CONF_MESSAGE[Options]" name="PROTOCOL_TYPE" type="select"
                       choices="session_only|CONF_MESSAGE[Sessions Only]"
                       label="CONF_MESSAGE[Protocol Type]" description="CONF_MESSAGE[Enable/disable automatically based on the protocol used]" default="session_only" editable="false"/>
-        <global_param  expose="true" name="MODIFY_LOGIN_SCREEN" group="CONF_MESSAGE[General]" type="boolean" label="CONF_MESSAGE[Modify login page]"
+        <global_param  group="CONF_MESSAGE[Options]" expose="true" name="MODIFY_LOGIN_SCREEN" type="boolean" label="CONF_MESSAGE[Modify login page]"
                        description="CONF_MESSAGE[Login page will be modified to give user a OTP textbox.]" default="true"/>
-        <global_param name="YUBICO_SECRET_KEY" type="string" label="CONF_MESSAGE[Yubico Secret Key]" description="CONF_MESSAGE[Yubico secret key attached to your account]" mandatory="false"/>
-        <global_param name="YUBICO_CLIENT_ID" type="string" label="CONF_MESSAGE[Yubico Client ID]" description="CONF_MESSAGE[Yubico client id attached to your account]" mandatory="false"/>
-        <param name="yubikey1" type="string" label="CONF_MESSAGE[YubiKey 1]"  description="CONF_MESSAGE[YubiKey 1]" mandatory="false"/>
-        <param name="yubikey2" type="string" label="CONF_MESSAGE[YubiKey 2]"  description="CONF_MESSAGE[YubiKey 2]" mandatory="false"/>
-        <param name="google" type="string" label="CONF_MESSAGE[Google Authenticator]"  description="CONF_MESSAGE[Google Authenticator Secret]" mandatory="false"/>
-        <param name="google_last" type="integer" label="CONF_MESSAGE[Google Authenticator Last]"  description="CONF_MESSAGE[Google Authenticator replay protection, do not edit]" mandatory="false" editable="false"/>
+        <global_param group="CONF_MESSAGE[Options]" name="YUBICO_SECRET_KEY" type="string" label="CONF_MESSAGE[Yubico Secret Key]" description="CONF_MESSAGE[Yubico secret key attached to your account]" mandatory="false"/>
+        <global_param group="CONF_MESSAGE[Options]" name="YUBICO_CLIENT_ID" type="string" label="CONF_MESSAGE[Yubico Client ID]" description="CONF_MESSAGE[Yubico client id attached to your account]" mandatory="false"/>
+        <param name="yubikey_enabled" group="CONF_MESSAGE[Yubikey]" type="boolean" label="CONF_MESSAGE[Use Yubikey]"  description="CONF_MESSAGE[Require a Yubikey usage by the user.]" mandatory="false" default="false" expose="true" scope="user,group"/>
+        <param name="yubikey1" group="CONF_MESSAGE[Yubikey]" type="string" label="CONF_MESSAGE[Your YubiKey ID]"  description="CONF_MESSAGE[YubiKey ID. To add a yubikey, simply use your key button to fill this field.]" mandatory="false" expose="true" scope="user"/>
+        <param name="yubikey2" group="CONF_MESSAGE[Yubikey]" type="string" label="CONF_MESSAGE[Second YubiKey ID]"  description="CONF_MESSAGE[YubiKey ID. To add a second yubikey, simply use your key button to fill this field.]" mandatory="false" expose="true" scope="user"/>
+        <param name="google_enabled_admin" group="CONF_MESSAGE[Google Authenticator]" type="boolean" label="CONF_MESSAGE[Force Google Authenticator]"  description="CONF_MESSAGE[Force Google Auth usage without letting the choice to the user.]" mandatory="false" default="false" scope="user,group"/>
+        <param name="google_enabled" group="CONF_MESSAGE[Google Authenticator]" type="boolean" label="CONF_MESSAGE[Enable Google Authenticator]"  description="CONF_MESSAGE[If you enable it for the first time, you will be able to configure Google Authenticator application next time you log in.]" mandatory="false" default="false" scope="user,group" expose="true"/>
+        <param name="google" group="CONF_MESSAGE[Google Authenticator]" type="string" label="CONF_MESSAGE[Google Authenticator Secret]"  description="CONF_MESSAGE[Google Authenticator Secret Key.]" mandatory="false" scope="user"/>
+        <param name="google_last" group="CONF_MESSAGE[Google Authenticator]" type="integer" label="CONF_MESSAGE[Google Authenticator Last]"  description="CONF_MESSAGE[Google Authenticator replay protection, do not edit]" mandatory="false" editable="false"/>
     </server_settings>
-    <class_definition filename="plugins/authfront.otp/class.OtpAuthFrontend.php" classname="OtpAuthFrontend"/>
+    <class_definition filename="plugins/authfront.otp/OtpAuthFrontend.php" classname="Pydio\Auth\Frontend\OtpAuthFrontend"/>
     <registry_contributions>
         <external_file filename="plugins/core.auth/standard_auth_actions.xml" include="actions/*" exclude=""/>
+        <actions>
+            <action name="otp_show_setup_screen">
+                <gui src="icon-key" iconClass="icon-key" text="authfront.otp.1" title="authfront.otp.1">
+                    <context dir="true" recycle="false" selection="false"/>
+                </gui>
+                <processing>
+                    <clientCallback prepareModal="true" dialogOpenForm="otp_setup_screen" dialogOkButtonOnly="true" dialogSkipButtons="false">
+                        <dialogOnOpen><![CDATA[
+                            PydioApi.getClient().request({get_action:"otp_show_setup_screen"}, function(t){
+                                if(t.responseJSON){
+                                    modal.getForm().down("#google_otp").setValue(t.responseJSON.key);
+                                    React.render(
+                                        React.createElement(ReactQRCode, {
+                                            size:200,
+                                            value:t.responseJSON.qrcode,
+                                            level:'L'
+                                        }),
+                                        modal.getForm().down("#qrcode")
+                                    );
+                                }
+                            });
+                            modal.refreshDialogPosition();
+                        ]]></dialogOnOpen>
+                        <dialogOnComplete><![CDATA[
+                            if(!modal.getForm().down("#google_otp_verification").getValue()){
+                                pydio.displayMessage('ERROR', 'Please set up verification code');
+                                return false;
+                            }
+                            PydioApi.getClient().request({
+                                get_action:"otp_show_setup_screen",
+                                step:"verify",
+                                otp:modal.getForm().down("#google_otp_verification").getValue()
+                            }, function(t){
+                                if(t.responseJSON && t.responseJSON.RESULT === "OK"){
+                                    location.reload();
+                                }
+                            });
+                        ]]></dialogOnComplete>
+                    </clientCallback>
+                    <clientForm id="otp_setup_screen"><![CDATA[
+                         <div id="otp_setup_screen" box_width="500">
+                            <div data:ajxp_message_id="authfront.otp.2">AJXP_MESSAGE[authfront.otp.2]</div>
+                            <div data:ajxp_message_id="authfront.otp.3">AJXP_MESSAGE[authfront.otp.3]</div>
+                            <div data:ajxp_message_id="authfront.otp.4">AJXP_MESSAGE[authfront.otp.4]</div>
+                            <div class="codes">
+                                <div id="qrcode"></div>
+                                <input id="google_otp" type="text"/>
+                            </div>
+                            <div class="verif">
+                                <div data:ajxp_message_id="authfront.otp.5">AJXP_MESSAGE[authfront.otp.5]</div>
+                                <input id="google_otp_verification" type="text"/>
+                            </div>
+                         </div>
+					]]></clientForm>
+                    <serverCallback methodName="getConfigurationCode"/>
+                </processing>
+            </action>
+        </actions>
         <client_configs>
             <template element="ajxp_desktop" name="otp_script" position="bottom"><![CDATA[
-            <script></script>
+            <script>
+                  document.observe("ajaxplorer:afterApply-login", function(){
+                    var f= modal.getForm();
+
+                    var enableModifyGUI = ajaxplorer.getPluginConfigs("authfront.otp").get('MODIFY_LOGIN_SCREEN');
+
+                    if(!enableModifyGUI) return;
+
+                    if(f.down('input[name="otp_code"]')){
+                        return;
+                    }
+                    try{
+                        var el = f.down('input[name="password"]').up("div.SF_element");
+                        var clone = el.cloneNode(true);
+                        el.insert({after:clone});
+                        var newField = clone.down('input[name="password"]');
+                        newField.writeAttribute('name', 'otp_code');
+                        newField.writeAttribute('data-ajxpLoginAdditionalParameter', 'true');
+                        clone.down('div.SF_label').update('Unique Code (6 digits)');
+                    }catch(e){
+                        if(console) console.log('Error while replacing OTP field', e);
+                    }
+                  });
+            </script>
             ]]></template>
         </client_configs>
     </registry_contributions>
-</authdriver>
+</authdriver>
\ No newline at end of file
diff --git a/core/src/plugins/authfront.otp/plugin_doc.html b/core/src/plugins/authfront.otp/plugin_doc.html
index a282cd21e8..0dc5bf66e9 100644
--- a/core/src/plugins/authfront.otp/plugin_doc.html
+++ b/core/src/plugins/authfront.otp/plugin_doc.html
@@ -19,8 +19,8 @@ <h2>Installation yubico package</h2>
 <p>You need to install php-yubico from <a href="http://code.google.com/p/php-yubico/">http://code.google.com/p/php-yubico/</a></p>
 
 <pre>
-wget http://php-yubico.googlecode.com/files/Auth_Yubico-2.4.tgz
-pear install Auth_Yubico-2.4.tgz
+wget http://php-yubico.googlecode.com/files/Auth_Yubico-2.5.tgz
+pear install Auth_Yubico-2.5.tgz
 </pre>
 
 <p><br />
@@ -50,7 +50,7 @@ <h2>Configuration</h2>
 		<p>Yubico secret KEY</p>
 		</li>
 		<li>
-		<p>Yubico Client Id: your Yubico Client Id generated at <a href="http://api.yubico.com/get-api-key/">http://api.yubico.com/get-api-key/</a> or blank when you don&#39;t plan to use YubiKey</p>
+		<p>Yubico Client Id: your Yubico Client Id generated at <a href="http://upgrade.yubico.com/get-api-key/">http://api.yubico.com/get-api-key/</a> or blank when you don&#39;t plan to use YubiKey</p>
 		</li>
 		<li>
 		<p>Modify login page: <strong>Yes (</strong>There is a line added into login page &quot;* OTP enabled&quot;<strong>)</strong></p>
diff --git a/core/src/plugins/authfront.session_login/SessionLoginFrontend.php b/core/src/plugins/authfront.session_login/SessionLoginFrontend.php
new file mode 100644
index 0000000000..21c0a04738
--- /dev/null
+++ b/core/src/plugins/authfront.session_login/SessionLoginFrontend.php
@@ -0,0 +1,267 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Auth\Frontend;
+
+use Exception;
+use Pydio\Core\Http\Message\ReloadRepoListMessage;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\UserInterface;
+use Pydio\Core\Services\AuthService;
+use Pydio\Auth\Frontend\Core\AbstractAuthFrontend;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\SessionService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Http\BruteForceHelper;
+use Pydio\Core\Utils\Http\CookiesHelper;
+use Pydio\Core\Utils\Vars\XMLFilter;
+use Pydio\Core\Utils\Http\CaptchaProvider;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class Pydio\Auth\Frontend\SessionLoginFrontend
+ */
+class SessionLoginFrontend extends AbstractAuthFrontend
+{
+
+    /**
+     * Override parent method : disable me if applicationFirstRun ( = installation steps ).
+     * @inheritdoc
+     */
+    function isEnabled()
+    {
+        if (ApplicationState::detectApplicationFirstRun()) return false;
+        return parent::isEnabled();
+    }
+
+    /**
+     * Try to get the logged user directly from the session
+     *
+     * @param \Psr\Http\Message\ServerRequestInterface $request
+     * @return bool
+     * @throws Exception
+     * @throws \Pydio\Core\Exception\LoginException
+     */
+    protected function logUserFromSession(\Psr\Http\Message\ServerRequestInterface &$request)
+    {
+
+        /**
+         * @var \Pydio\Conf\Core\AbstractUser $u
+         */
+        $u = SessionService::fetch(SessionService::USER_KEY);
+        if ($u !== null && $u instanceof UserInterface) {
+
+            if ($u->reloadRolesIfRequired()) {
+                ConfService::getInstance()->invalidateLoadedRepositories();
+                AuthService::$bufferedMessage = ReloadRepoListMessage::XML();
+            }
+            $request = $request->withAttribute("ctx", Context::contextWithObjects($u, null));
+            return true;
+
+        }
+
+        if (ConfService::getGlobalConf("ALLOW_GUEST_BROWSING", "auth") && !ApplicationState::hasMinisiteHash()) {
+
+            $authDriver = ConfService::getAuthDriverImpl();
+            if (!$authDriver->userExists("guest")) {
+                $guest = UsersService::createUser("guest", "");
+                $guest->save("superuser");
+            }
+            $logged = AuthService::logUser("guest", null);
+            $request = $request->withAttribute("ctx", Context::contextWithObjects($logged, null));
+            AuthService::updateSessionUser($logged);
+            return true;
+        }
+        return false;
+
+    }
+
+    /**
+     * Try to log the user from a submitted "login" action.
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @param bool $isLast
+     * @return \Psr\Http\Message\ResponseInterface|static
+     */
+    function logUserFromLoginAction(\Psr\Http\Message\ServerRequestInterface &$requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface, $isLast = false)
+    {
+
+        $httpVars = $requestInterface->getParsedBody();
+        $rememberLogin = "";
+        $rememberPass = "";
+        $secureToken = "";
+        $loggedUser = null;
+        $cookieLogin = (isSet($httpVars["cookie_login"]) ? true : false);
+        if (BruteForceHelper::suspectBruteForceLogin() && (!isSet($httpVars["captcha_code"]) || !CaptchaProvider::checkCaptchaResult($httpVars["captcha_code"]))) {
+
+            $loggingResult = -4;
+
+        } else if ($cookieLogin && !CookiesHelper::hasRememberCookie()) {
+
+            $loggingResult = -5;
+
+        } else {
+
+            if ($cookieLogin) {
+                list($userId, $userPass) = CookiesHelper::getRememberCookieData();
+            } else {
+                //$userId = (isSet($httpVars["userid"]) ? InputFilter::sanitize($httpVars["userid"], InputFilter::SANITIZE_EMAILCHARS) : null);
+                // Auth drivers will do the sanitizing userId.
+                $userId = (isSet($httpVars["userid"]) ? $httpVars["userid"] : null);
+                $userPass = (isSet($httpVars["password"]) ? trim($httpVars["password"]) : null);
+            }
+            $rememberMe = ((isSet($httpVars["remember_me"]) && $httpVars["remember_me"] == "true") ? true : false);
+            $loggingResult = 1;
+
+            try {
+
+                $loggedUser = AuthService::logUser($userId, $userPass, false, $cookieLogin);
+                $requestInterface = $requestInterface->withAttribute("ctx", Context::contextWithObjects($loggedUser, null));
+                AuthService::updateSessionUser($loggedUser);
+
+            } catch (\Pydio\Core\Exception\LoginException $l) {
+
+                $loggingResult = $l->getLoginError();
+
+            }
+
+            if ($rememberMe && $loggingResult == 1) {
+                $rememberLogin = "notify";
+                $rememberPass = "notify";
+            }
+            if ($loggingResult == 1) {
+                session_regenerate_id(true);
+                $secureToken = \Pydio\Core\Http\Middleware\SecureTokenMiddleware::generateSecureToken();
+            }
+            if ($loggingResult < 1 && BruteForceHelper::suspectBruteForceLogin()) {
+                $loggingResult = -4; // Force captcha reload
+            }
+        }
+
+        if ($loggedUser != null) {
+
+            if (ConfService::getGlobalConf("ALLOW_GUEST_BROWSING", "auth")) {
+                ConfService::getInstance()->invalidateLoadedRepositories();
+            }
+
+        }
+
+        if ($loggedUser != null && (CookiesHelper::hasRememberCookie() || (isSet($rememberMe) && $rememberMe == true))) {
+            CookiesHelper::refreshRememberCookie($loggedUser);
+        }
+
+        $stream = new \Pydio\Core\Http\Response\SerializableResponseStream();
+        $stream->addChunk(new \Pydio\Core\Http\Message\LoggingResult($loggingResult, $rememberLogin, $rememberPass, $secureToken));
+        $responseInterface = $responseInterface->withBody($stream);
+
+        return $responseInterface;
+
+    }
+
+    /**
+     * Authfront implementation
+     * @param \Psr\Http\Message\ServerRequestInterface $request
+     * @param \Psr\Http\Message\ResponseInterface $response
+     * @param bool $isLast
+     * @return bool
+     */
+    function tryToLogUser(\Psr\Http\Message\ServerRequestInterface &$request, \Psr\Http\Message\ResponseInterface &$response, $isLast = false)
+    {
+
+        if ($request->getAttribute("action") === "login") {
+
+            return $this->logUserFromLoginAction($request, $response, $isLast);
+
+        } else {
+
+            return $this->logUserFromSession($request);
+
+        }
+
+    }
+
+    /**
+     * Action controller method
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @return string
+     */
+    public function switchAction(\Psr\Http\Message\ServerRequestInterface &$requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface)
+    {
+        switch ($requestInterface->getAttribute("action")) {
+
+            case "login":
+
+                break;
+
+            case "logout" :
+
+                AuthService::disconnect();
+                $loggingResult = 2;
+                session_destroy();
+                $x = new \Pydio\Core\Http\Response\SerializableResponseStream();
+                $x->addChunk(new \Pydio\Core\Http\Message\LoggingResult($loggingResult));
+                $responseInterface = $responseInterface->withBody($x);
+
+                break;
+
+            case "get_seed" :
+
+                $seed = -1;
+                if (BruteForceHelper::suspectBruteForceLogin()) {
+                    $responseInterface = new \Zend\Diactoros\Response\JsonResponse(["seed" => $seed, "captcha" => true]);
+                } else {
+                    $responseInterface = $responseInterface->withHeader("Content-Type", "text/plain");
+                    $responseInterface->getBody()->write($seed);
+                }
+                break;
+
+            case "get_captcha":
+
+                $x = new \Pydio\Core\Http\Response\AsyncResponseStream(function () {
+                    restore_error_handler();
+                    restore_exception_handler();
+                    set_error_handler(function ($code, $message, $script) {
+                        if (error_reporting() == 0) return;
+                        \Pydio\Log\Core\Logger::error("Captcha", "Error while loading captcha : " . $message, []);
+                    });
+                    CaptchaProvider::sendCaptcha();
+                    return "";
+                });
+                $responseInterface = $responseInterface->withBody($x);
+                break;
+
+            case "back":
+
+                $responseInterface = $responseInterface->withHeader("Content-Type", "text/xml");
+                $responseInterface->getBody()->write("<url>" . UsersService::getLogoutAddress() . "</url>");
+                break;
+
+            default;
+                break;
+        }
+        return "";
+    }
+
+
+} 
\ No newline at end of file
diff --git a/core/src/plugins/authfront.session_login/class.SessionLoginFrontend.php b/core/src/plugins/authfront.session_login/class.SessionLoginFrontend.php
deleted file mode 100644
index a7d681afcc..0000000000
--- a/core/src/plugins/authfront.session_login/class.SessionLoginFrontend.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-
-class SessionLoginFrontend extends AbstractAuthFrontend {
-
-    function isEnabled(){
-        if(AJXP_Utils::detectApplicationFirstRun()) return false;
-        return parent::isEnabled();
-    }
-
-    function tryToLogUser(&$httpVars, $isLast = false){
-
-        if(!isSet($httpVars["get_action"]) || $httpVars["get_action"] != "login"){
-            return false;
-        }
-        $rememberLogin = "";
-        $rememberPass = "";
-        $secureToken = "";
-        $loggedUser = null;
-        include_once(AJXP_BIN_FOLDER."/class.CaptchaProvider.php");
-        if (AuthService::suspectBruteForceLogin() && (!isSet($httpVars["captcha_code"]) || !CaptchaProvider::checkCaptchaResult($httpVars["captcha_code"]))) {
-            $loggingResult = -4;
-        } else {
-            $userId = (isSet($httpVars["userid"])?AJXP_Utils::sanitize($httpVars["userid"], AJXP_SANITIZE_EMAILCHARS):null);
-            $userPass = (isSet($httpVars["password"])?trim($httpVars["password"]):null);
-            $rememberMe = ((isSet($httpVars["remember_me"]) && $httpVars["remember_me"] == "true")?true:false);
-            $cookieLogin = (isSet($httpVars["cookie_login"])?true:false);
-            $loggingResult = AuthService::logUser($userId, $userPass, false, $cookieLogin, $httpVars["login_seed"]);
-            if ($rememberMe && $loggingResult == 1) {
-                $rememberLogin = "notify";
-                $rememberPass = "notify";
-            }
-            if ($loggingResult == 1) {
-                session_regenerate_id(true);
-                $secureToken = AuthService::generateSecureToken();
-            }
-            if ($loggingResult < 1 && AuthService::suspectBruteForceLogin()) {
-                $loggingResult = -4; // Force captcha reload
-            }
-        }
-        $loggedUser = AuthService::getLoggedUser();
-        if ($loggedUser != null) {
-            $force = $loggedUser->mergedRole->filterParameterValue("core.conf", "DEFAULT_START_REPOSITORY", AJXP_REPO_SCOPE_ALL, -1);
-            $passId = -1;
-            if (isSet($httpVars["tmp_repository_id"])) {
-                $passId = $httpVars["tmp_repository_id"];
-            } else if ($force != "" && $loggedUser->canSwitchTo($force) && !isSet($httpVars["tmp_repository_id"]) && !isSet($_SESSION["PENDING_REPOSITORY_ID"])) {
-                $passId = $force;
-            }
-            $res = ConfService::switchUserToActiveRepository($loggedUser, $passId);
-            if (!$res) {
-                AuthService::disconnect();
-                $loggingResult = -3;
-            }
-        }
-
-        if ($loggedUser != null && (AuthService::hasRememberCookie() || (isSet($rememberMe) && $rememberMe ==true))) {
-            AuthService::refreshRememberCookie($loggedUser);
-        }
-        AJXP_XMLWriter::header();
-        AJXP_XMLWriter::loggingResult($loggingResult, $rememberLogin, $rememberPass, $secureToken);
-        AJXP_XMLWriter::close();
-
-        if($loggingResult > 0 || $isLast){
-            exit();
-        }
-
-    }
-
-    public function switchAction($action, $httpVars, $fileVars)
-    {
-        switch ($action) {
-
-            case "logout" :
-
-                AuthService::disconnect();
-                $loggingResult = 2;
-                session_destroy();
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::loggingResult($loggingResult, null, null, null);
-                AJXP_XMLWriter::close();
-
-                break;
-
-            case "get_seed" :
-                $seed = AuthService::generateSeed();
-                if (AuthService::suspectBruteForceLogin()) {
-                    HTMLWriter::charsetHeader('application/json');
-                    print json_encode(array("seed" => $seed, "captcha" => true));
-                } else {
-                    HTMLWriter::charsetHeader("text/plain");
-                    print $seed;
-                }
-                break;
-
-            case "get_captcha":
-                include_once(AJXP_BIN_FOLDER."/class.CaptchaProvider.php");
-                CaptchaProvider::sendCaptcha();
-                //exit(0) ;
-                break;
-
-            case "back":
-                AJXP_XMLWriter::header("url");
-                echo AuthService::getLogoutAddress(false);
-                AJXP_XMLWriter::close("url");
-                //exit(1);
-
-                break;
-
-            default;
-                break;
-        }
-        return "";
-    }
-
-
-
-} 
\ No newline at end of file
diff --git a/core/src/plugins/authfront.session_login/i18n/conf/de.php b/core/src/plugins/authfront.session_login/i18n/conf/de.php
index 27dfcf1cc4..28282fc865 100644
--- a/core/src/plugins/authfront.session_login/i18n/conf/de.php
+++ b/core/src/plugins/authfront.session_login/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Standard login screen" => "Standard Anmelde-Bildschirm",
diff --git a/core/src/plugins/authfront.session_login/i18n/conf/en.php b/core/src/plugins/authfront.session_login/i18n/conf/en.php
index 33f54d4b6e..fc43501762 100644
--- a/core/src/plugins/authfront.session_login/i18n/conf/en.php
+++ b/core/src/plugins/authfront.session_login/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Standard login screen" => "Standard login screen",
diff --git a/core/src/plugins/authfront.session_login/manifest.xml b/core/src/plugins/authfront.session_login/manifest.xml
index dd06307897..093ba73267 100644
--- a/core/src/plugins/authfront.session_login/manifest.xml
+++ b/core/src/plugins/authfront.session_login/manifest.xml
@@ -2,7 +2,7 @@
 <ajxpcore id="authfront.session_login" enabled="always" label="CONF_MESSAGE[Standard login screen]"
           description="CONF_MESSAGE[Display a standard user/password login screen]"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-	<class_definition filename="plugins/authfront.session_login/class.SessionLoginFrontend.php" classname="SessionLoginFrontend"/>
+	<class_definition filename="plugins/authfront.session_login/SessionLoginFrontend.php" classname="Pydio\Auth\Frontend\SessionLoginFrontend"/>
     <client_settings>
         <resources>
             <i18n namespace="authfront.session_login" path="plugins/authfront.session_login/i18n"/>
@@ -56,6 +56,9 @@
 						        oForm.addClassName('ajxp_password_auth');
 						        authConfs.set('SECURE_LOGIN_FORM', true);
 						        authConfs.set('ENABLE_FORGOT_PASSWORD', false);
+						        oForm.down('.dialogLegend').update(pydio.MessageHash[552]);
+                            }else{
+                                oForm.down('.dialogLegend').update(pydio.MessageHash[180]);
                             }
 						    $("generic_dialog_box").down(".titleString").hide();
 						    $("generic_dialog_box").down("#modalCloseBtn").hide();
@@ -91,7 +94,8 @@
                             }
                             if(authConfs && authConfs.get("ENABLE_FORGOT_PASSWORD") && !oForm.down('a.forgot-password-link')){
                                 try{
-                                    oForm.down('input[name="password"]').up("div.SF_element").insert({after:'<div class="SF_element"><a href="#" class="forgot-password-link" ajxp_message_id="479">AJXP_MESSAGE[479]</a></div>'});
+                                    var after = oForm.down('input[name="remember_me"]') ? oForm.down('input[name="remember_me"]').up("div.SF_element") : oForm.down('input[name="password"]').up("div.SF_element");
+                                    after.insert({after:'<div class="SF_element" id="forgot_element"><span class="icon-question-sign"></span><a href="#" class="forgot-password-link" ajxp_message_id="479">AJXP_MESSAGE[479]</a></div>'});
                                     oForm.down('a.forgot-password-link').observe("click", function(e){
                                         Event.stop(e);
                                         pydio.getController().fireAction(authConfs.get("FORGOT_PASSWORD_ACTION"));
@@ -133,6 +137,9 @@
                                     hideLightBox(true);
         						}else{
         						    var errorId = PydioApi.getClient().LAST_ERROR_ID;
+        						    if(errorId == '285' && window.ajxpBootstrap.parameters.get('PASSWORD_AUTH_ONLY')){
+        						        errorId = '553';
+        						    }
                                     if(transport.responseXML && XPathGetSingleNodeText(transport.responseXML.documentElement, "logging_result/@value") == "-4"){
                                         ajaxplorer.UI.loadSeedOrCaptcha(oForm.down('#login_seed'), oForm.down('img#captcha_image'), oForm.down('div.dialogLegend'), 'before');
                                     }
@@ -166,13 +173,13 @@
                                     <div class="SF_label"><ajxp:message ajxp_message_id="182">AJXP_MESSAGE[182]</ajxp:message></div>
                                     <div class="SF_input"><input type="password" name="password"  style="width: 100px; padding:0px;" placeholder="AJXP_MESSAGE[182]"></div>
                                 </div>
-                                <div class="SF_element">
+                                <div class="SF_element" id="remember_element">
                                     <input type="checkbox" class="radio" name="remember_me" style="border: none; width:20px !important;"/><ajxp:message ajxp_message_id="261">AJXP_MESSAGE[261]</ajxp:message>
                                 </div>
                             </div>
                         </form>
 					]]></clientForm>
-                    <serverCallback methodName="switchAction"></serverCallback>
+                    <serverCallback methodName="switchAction"/>
                 </processing>
             </action>
             <action name="logout" expireDefault="true">
diff --git a/core/src/plugins/authfront.webftp/FTPAuthFrontend.php b/core/src/plugins/authfront.webftp/FTPAuthFrontend.php
new file mode 100644
index 0000000000..e573f87ac8
--- /dev/null
+++ b/core/src/plugins/authfront.webftp/FTPAuthFrontend.php
@@ -0,0 +1,50 @@
+<?php
+/*
+ * Copyright 2007-2015 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Auth\Frontend;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Auth\Frontend\Core\AbstractAuthFrontend;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class FTPAuthFrontend
+ * @package Pydio\Auth\Frontend
+ */
+class FTPAuthFrontend extends AbstractAuthFrontend
+{
+
+    /**
+     * Try to authenticate the user based on various external parameters
+     * Return true if user is now logged.
+     *
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @param bool $isLast Whether this is is the last plugin called.
+     * @return bool
+     */
+    function tryToLogUser(ServerRequestInterface &$request, ResponseInterface &$response, $isLast = false)
+    {
+        return false;
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/authfront.webftp/class.FTPAuthFrontend.php b/core/src/plugins/authfront.webftp/class.FTPAuthFrontend.php
deleted file mode 100644
index 7da78ca9b8..0000000000
--- a/core/src/plugins/authfront.webftp/class.FTPAuthFrontend.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/*
- * Copyright 2007-2015 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-
-class FTPAuthFrontend extends AbstractAuthFrontend {
-
-    function tryToLogUser(&$httpVars, $isLast = false){
-        return false;
-    }
-
-}
\ No newline at end of file
diff --git a/core/src/plugins/authfront.webftp/manifest.xml b/core/src/plugins/authfront.webftp/manifest.xml
index bcc6b81f04..a1e496a0c4 100644
--- a/core/src/plugins/authfront.webftp/manifest.xml
+++ b/core/src/plugins/authfront.webftp/manifest.xml
@@ -7,7 +7,7 @@
         <global_param name="ORDER" type="integer" label="Order"
                       description="Order this plugin with other auth frontends" default="210"/>
     </server_settings>
-    <class_definition classname="FTPAuthFrontend" filename="plugins/authfront.webftp/class.FTPAuthFrontend.php"/>
+    <class_definition classname="Pydio\Auth\Frontend\FTPAuthFrontend" filename="plugins/authfront.webftp/FTPAuthFrontend.php"/>
     <registry_contributions>
         <actions>
             <action name="login">
diff --git a/core/src/plugins/boot.conf/BootConfLoader.php b/core/src/plugins/boot.conf/BootConfLoader.php
new file mode 100644
index 0000000000..00a81e6014
--- /dev/null
+++ b/core/src/plugins/boot.conf/BootConfLoader.php
@@ -0,0 +1,922 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Conf\Boot;
+
+use dibi;
+use DOMXPath;
+use Exception;
+use Pydio\Access\Core\Model\Repository;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\AuthService;
+use Pydio\Conf\Core\AbstractUser;
+use Pydio\Conf\Core\AbstractConfDriver;
+use Pydio\Conf\Core\AJXP_Role;
+use Pydio\Core\Services\ConfService;
+use Pydio\Conf\Core\CoreConfLoader;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\RolesService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\FileHelper;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\OptionsHelper;
+use Pydio\Core\Utils\Vars\PathUtils;
+use Pydio\Core\Utils\Vars\StringHelper;
+use Pydio\Core\Utils\Vars\VarsFilter;
+use Pydio\Core\Utils\Vars\XMLFilter;
+use Pydio\Core\Controller\HTMLWriter;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\PluginFramework\SqlTableProvider;
+use Pydio\Core\Utils\TextEncoder;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Implementation of the configuration driver on serial files
+ */
+class BootConfLoader extends AbstractConfDriver
+{
+    private static $internalConf;
+
+    /**
+     * @return mixed
+     */
+    private function getInternalConf()
+    {
+        if (!isSet(BootConfLoader::$internalConf)) {
+            if (file_exists(AJXP_CONF_PATH . "/bootstrap_plugins.php")) {
+                include(AJXP_CONF_PATH . "/bootstrap_plugins.php");
+                if (isSet($PLUGINS)) {
+                    BootConfLoader::$internalConf = $PLUGINS;
+                }
+            } else {
+                BootConfLoader::$internalConf = array();
+            }
+        }
+        return BootConfLoader::$internalConf;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        parent::init($ctx, $options);
+        try {
+            $dir = $this->getPluginWorkDir(true);
+            if (!is_file($dir . DIRECTORY_SEPARATOR . "server_uuid")) {
+                file_put_contents($dir . DIRECTORY_SEPARATOR . "server_uuid", md5(json_encode($_SERVER)));
+            }
+        } catch (Exception $e) {
+            die("Impossible write into the AJXP_DATA_PATH folder: Make sure to grant write access to this folder for your webserver!");
+        }
+    }
+
+    public function loadManifest()
+    {
+        parent::loadManifest();
+        if (!ApplicationState::detectApplicationFirstRun()) {
+            $actions = $this->getXPath()->query("server_settings|registry_contributions");
+            foreach ($actions as $ac) {
+                $ac->parentNode->removeChild($ac);
+            }
+            $this->reloadXPath();
+        }
+    }
+
+    /**
+     * @return string
+     * @throws Exception
+     */
+    public function getServerUuid()
+    {
+        return file_get_contents($this->getPluginWorkDir() . DIRECTORY_SEPARATOR . "server_uuid");
+    }
+
+    /**
+     * @param $fullManifest
+     * @return string
+     */
+    public function printFormFromServerSettings($fullManifest)
+    {
+
+        $xmlString = "<admin_data>";
+        $xPath = new DOMXPath($fullManifest->ownerDocument);
+        $addParams = "";
+        $pInstNodes = $xPath->query("server_settings/global_param[contains(@type, 'plugin_instance:')]");
+        foreach ($pInstNodes as $pInstNode) {
+            $type = $pInstNode->getAttribute("type");
+            $instType = str_replace("plugin_instance:", "", $type);
+            $fieldName = $pInstNode->getAttribute("name");
+            $pInstNode->setAttribute("type", "group_switch:" . $fieldName);
+            $typePlugs = PluginsService::getInstance(Context::emptyContext())->getPluginsByType($instType);
+            foreach ($typePlugs as $typePlug) {
+                if ($typePlug->getId() == "auth.multi") continue;
+                $checkErrorMessage = "";
+                try {
+                    $typePlug->performChecks();
+                } catch (Exception $e) {
+                    $checkErrorMessage = " (Warning : " . $e->getMessage() . ")";
+                }
+                $tParams = XMLFilter::resolveKeywords($typePlug->getManifestRawContent("server_settings/param"));
+                $addParams .= '<global_param group_switch_name="' . $fieldName . '" name="instance_name" group_switch_label="' . $typePlug->getManifestLabel() . $checkErrorMessage . '" group_switch_value="' . $typePlug->getId() . '" default="' . $typePlug->getId() . '" type="hidden"/>';
+                $addParams .= str_replace("<param", "<global_param group_switch_name=\"${fieldName}\" group_switch_label=\"" . $typePlug->getManifestLabel() . $checkErrorMessage . "\" group_switch_value=\"" . $typePlug->getId() . "\" ", $tParams);
+                $addParams .= XMLFilter::resolveKeywords($typePlug->getManifestRawContent("server_settings/global_param"));
+            }
+        }
+        $uri = $_SERVER["REQUEST_URI"];
+        if (strpos($uri, '.php') !== false) $uri = PathUtils::forwardSlashDirname($uri);
+        if (empty($uri)) $uri = "/";
+        $tryFullLocale = setlocale(LC_CTYPE, 0);
+        $locale = TextEncoder::getEncoding();
+        if(strpos($tryFullLocale, ".") !== false)$locale = $tryFullLocale;
+        if(defined('AJXP_LOCALE')) $locale = AJXP_LOCALE;
+        $apcCache = function_exists('apc_fetch') || function_exists('apcu_fetch');
+        $loadedValues = array(
+            "ENCODING" => $locale,
+            "SERVER_URI" => $uri,
+            "APC_CACHE_ENABLE" => $apcCache ? "true" : "false"
+        );
+        foreach ($loadedValues as $pName => $pValue) {
+            $vNodes = $xPath->query("server_settings/global_param[@name='$pName']");
+            if (!$vNodes->length) continue;
+            $vNodes->item(0)->setAttribute("default", $pValue);
+        }
+        $allParams = XMLFilter::resolveKeywords($fullManifest->ownerDocument->saveXML($fullManifest));
+        $allParams = str_replace('type="plugin_instance:', 'type="group_switch:', $allParams);
+        $allParams = str_replace("</server_settings>", $addParams . "</server_settings>", $allParams);
+
+        $xmlString .= $allParams;
+        $xmlString .= "</admin_data>";
+        return $xmlString;
+
+    }
+
+    /**
+     * Transmit to the ajxp_conf load_plugin_manifest action
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     */
+    public function loadInstallerForm(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface)
+    {
+        $httpVars = $requestInterface->getParsedBody();
+        if (isSet($httpVars["lang"])) {
+            LocaleService::setLanguage($httpVars["lang"]);
+        }
+        $fullManifest = $this->getManifestRawContent("", "xml");
+        $xmlString = $this->printFormFromServerSettings($fullManifest);
+        $doc = new \Pydio\Core\Http\Message\XMLDocMessage($xmlString);
+        $x = new \Pydio\Core\Http\Response\SerializableResponseStream([$doc]);
+        $responseInterface = $responseInterface->withBody($x);
+    }
+
+    /**
+     * Transmit to the ajxp_conf load_plugin_manifest action
+     * @param $action
+     * @param $httpVars
+     * @param $fileVars
+     */
+    public function applyInstallerForm($action, $httpVars, $fileVars, ContextInterface $ctx)
+    {
+        $data = array();
+        OptionsHelper::parseStandardFormParameters($ctx, $httpVars, $data, "");
+
+        list($newConfigPlugin, $newAuthPlugin, $newCachePlugin) = $this->createBootstrapConf($data);
+
+        $this->feedPluginsOptions($newConfigPlugin, $data);
+
+        ConfService::setTmpStorageImplementations($newConfigPlugin, $newAuthPlugin, $newCachePlugin);
+        $this->createUsers($data);
+
+        $this->setAdditionalData($data);
+        $htContent = null;
+        $htAccessToUpdate = $this->updateHtAccess($data, $htContent);
+        $this->sendInstallResult($htAccessToUpdate, $htContent);
+
+    }
+
+    /**
+     * Send output to the user.
+     * @param String $htAccessToUpdate file path
+     * @param String $htContent file content
+     */
+    public function sendInstallResult($htAccessToUpdate, $htContent)
+    {
+        ConfService::clearAllCaches();
+        ApplicationState::setApplicationFirstRunPassed();
+
+        if ($htAccessToUpdate != null) {
+            HTMLWriter::charsetHeader("application/json");
+            echo json_encode(array('file' => $htAccessToUpdate, 'content' => $htContent));
+        } else {
+            session_destroy();
+            HTMLWriter::charsetHeader("text/plain");
+            echo 'OK';
+        }
+
+    }
+
+    /**
+     * Non-impacting operations
+     * @param array $data Installer parsed form result
+     * @throws Exception
+     */
+    public function setAdditionalData($data)
+    {
+        if ($data["ENCODING"] != (defined('AJXP_LOCALE') ? AJXP_LOCALE : TextEncoder::getEncoding())) {
+            file_put_contents($this->getPluginWorkDir() . "/encoding.php", "<?php \$ROOT_ENCODING='" . $data["ENCODING"] . "';");
+        }
+    }
+
+    /**
+     * Update the plugins parameters. OptionsLinks can be an array associating keys of $data
+     * to pluginID/plugin_parameter_name
+     *
+     * @param AbstractConfDriver $confDriver
+     * @param array $data
+     * @param null|array $optionsLinks
+     */
+    public function feedPluginsOptions($confDriver, $data, $optionsLinks = null)
+    {
+
+        if (isSet($optionsLinks)) {
+            $direct = $optionsLinks;
+        } else {
+            $data["ENABLE_NOTIF"] = true;
+            // Prepare plugins configs
+            $direct = array(
+                "APPLICATION_TITLE" => "core.ajaxplorer/APPLICATION_TITLE",
+                "APPLICATION_LANGUAGE" => "core.ajaxplorer/DEFAULT_LANGUAGE",
+                "ENABLE_NOTIF" => "core.notifications/USER_EVENTS",
+                "APPLICATION_WELCOME" => "gui.ajax/CUSTOM_WELCOME_MESSAGE"
+            );
+            $mailerEnabled = $data["MAILER_ENABLE"]["status"];
+            if ($mailerEnabled == "yes") {
+                // Enable core.mailer
+                $data["MAILER_SYSTEM"] = $data["MAILER_ENABLE"]["MAILER_SYSTEM"];
+                $data["MAILER_ADMIN"] = $data["MAILER_ENABLE"]["MAILER_ADMIN"];
+                $direct = array_merge($direct, array(
+                    "MAILER_SYSTEM" => "mailer.phpmailer-lite/MAILER",
+                    "MAILER_ADMIN" => "core.mailer/FROM",
+                ));
+            }
+        }
+
+        foreach ($direct as $key => $value) {
+            list($pluginId, $param) = explode("/", $value);
+            $options = array();
+            $confDriver->_loadPluginConfig($pluginId, $options);
+            $options[$param] = $data[$key];
+            $confDriver->_savePluginConfig($pluginId, $options);
+        }
+
+
+    }
+
+    /**
+     * Create or update the bootstrap json file.
+     * @param array $data Parsed result of the installer form
+     * @return array 2 entries array containing the new Conf Driver (0) and Auth Driver (1)
+     * @throws Exception
+     */
+    public function createBootstrapConf($data)
+    {
+
+        // Create a custom bootstrap.json file
+        $coreConf = array();
+        $coreAuth = array();
+        $coreCache = array();
+        $this->_loadPluginConfig("core.conf", $coreConf);
+        $this->_loadPluginConfig("core.auth", $coreAuth);
+        $this->_loadPluginConfig("core.cache", $coreCache);
+        if (!isSet($coreConf["UNIQUE_INSTANCE_CONFIG"])) $coreConf["UNIQUE_INSTANCE_CONFIG"] = array();
+        if (!isSet($coreAuth["MASTER_INSTANCE_CONFIG"])) $coreAuth["MASTER_INSTANCE_CONFIG"] = array();
+        if (!isSet($coreCache["UNIQUE_INSTANCE_CONFIG"])) $coreCache["UNIQUE_INSTANCE_CONFIG"] = array();
+        $coreConf["AJXP_CLI_SECRET_KEY"] = StringHelper::generateRandomString(24, true);
+
+        // REWRITE BOOTSTRAP.JSON
+        $coreConf["DIBI_PRECONFIGURATION"] = $data["db_type"];
+        if (isSet($coreConf["DIBI_PRECONFIGURATION"]["sqlite3_driver"])) {
+            $dbFile = VarsFilter::filter($coreConf["DIBI_PRECONFIGURATION"]["sqlite3_database"], Context::emptyContext());
+            if (!file_exists(dirname($dbFile))) {
+                mkdir(dirname($dbFile), 0755, true);
+            }
+        }
+        $coreConf["UNIQUE_INSTANCE_CONFIG"] = array_merge($coreConf["UNIQUE_INSTANCE_CONFIG"], array(
+            "instance_name" => "conf.sql",
+            "group_switch_value" => "conf.sql",
+            "SQL_DRIVER" => array("core_driver" => "core", "group_switch_value" => "core")
+        ));
+        $coreAuth["MASTER_INSTANCE_CONFIG"] = array_merge($coreAuth["MASTER_INSTANCE_CONFIG"], array(
+            "instance_name" => "auth.sql",
+            "group_switch_value" => "auth.sql",
+            "SQL_DRIVER" => array("core_driver" => "core", "group_switch_value" => "core")
+        ));
+        if($data["APC_CACHE_ENABLE"]){
+            $coreCache["UNIQUE_INSTANCE_CONFIG"] = array_merge($coreCache["UNIQUE_INSTANCE_CONFIG"], array(
+                "instance_name" => "cache.doctrine",
+                "group_switch_value" => "cache.doctrine",
+                "CACHE_PREFIX" => StringHelper::slugify("pydio-".$data["SERVER_URI"]),
+                "DRIVER" => [
+                    "group_switch_value" => "apc",
+                    "driver" => "apc",
+                ]
+            ));
+        }else{
+            $coreCache["UNIQUE_INSTANCE_CONFIG"] = array_merge($coreCache["UNIQUE_INSTANCE_CONFIG"], array());
+        }
+
+        // DETECT REQUIRED SQL TABLES AND INSTALL THEM
+        $registry = PluginsService::getInstance(Context::emptyContext())->getDetectedPlugins();
+        $driverData = array("SQL_DRIVER" => $data["db_type"]);
+        foreach ($registry as $type => $plugins) {
+            foreach ($plugins as $plugObject) {
+                if ($plugObject instanceof SqlTableProvider) {
+                    $plugObject->installSQLTables($driverData);
+                }
+            }
+        }
+
+
+        $oldBoot = $this->getPluginWorkDir(true) . "/bootstrap.json";
+        if (is_file($oldBoot)) {
+            copy($oldBoot, $oldBoot . ".bak");
+            unlink($oldBoot);
+        }
+        $newBootstrap = array("core.conf" => $coreConf, "core.auth" => $coreAuth, "core.cache" => $coreCache);
+        FileHelper::saveSerialFile($oldBoot, $newBootstrap, true, false, "json", true);
+        @unlink($this->getPluginWorkDir(true) . "/admin_counted");
+        if(is_file(AJXP_CACHE_DIR . "/admin_counted")){
+            @unlink(AJXP_CACHE_DIR . "/admin_counted");
+        }
+
+        // Write new bootstrap and reload conf plugin!
+        $coreConf["UNIQUE_INSTANCE_CONFIG"]["SQL_DRIVER"] = $coreConf["DIBI_PRECONFIGURATION"];
+        $coreAuth["MASTER_INSTANCE_CONFIG"]["SQL_DRIVER"] = $coreConf["DIBI_PRECONFIGURATION"];
+
+        $newConfigPlugin = ConfService::instanciatePluginFromGlobalParams($coreConf["UNIQUE_INSTANCE_CONFIG"], "Pydio\\Conf\\Core\\AbstractConfDriver");
+        $newAuthPlugin = ConfService::instanciatePluginFromGlobalParams($coreAuth["MASTER_INSTANCE_CONFIG"], "Pydio\\Auth\\Core\\AbstractAuthDriver");
+        $newCachePlugin = ConfService::instanciatePluginFromGlobalParams($coreCache["UNIQUE_INSTANCE_CONFIG"], "Pydio\\Cache\\Core\\AbstractCacheDriver");
+
+        $sqlPlugs = array(
+            "core.notifications/UNIQUE_FEED_INSTANCE" => "feed.sql",
+            "core.log/UNIQUE_PLUGIN_INSTANCE" => "log.sql",
+            "core.mq/UNIQUE_MS_INSTANCE" => "mq.sql"
+        );
+        foreach ($sqlPlugs as $core => $value) {
+            list($pluginId, $param) = explode("/", $core);
+            $options = array();
+            $newConfigPlugin->_loadPluginConfig($pluginId, $options);
+            $options[$param] = array(
+                "instance_name" => $value,
+                "group_switch_value" => $value,
+                "SQL_DRIVER" => array("core_driver" => "core", "group_switch_value" => "core")
+            );
+            $newConfigPlugin->_savePluginConfig($pluginId, $options);
+        }
+
+        return array($newConfigPlugin, $newAuthPlugin, $newCachePlugin);
+    }
+
+    /**
+     * Tries to detect if the .htaccess file needs updating. If so, returns the path to this file
+     * and feed the $htContent with target data. That way it can be sent to the users to tell him
+     * how to update the content.
+     *
+     * @param $data
+     * @param $htContent
+     * @return null|string
+     */
+    public function updateHtAccess($data, &$htContent)
+    {
+
+        $htAccessToUpdate = null;
+        $tpl = file_get_contents($this->getBaseDir() . "/htaccess.tpl");
+        if (!empty($data["SERVER_URI"]) && $data["SERVER_URI"] != "/") {
+            $htContent = str_replace('${APPLICATION_ROOT}', $data["SERVER_URI"], $tpl);
+        } else {
+            $htContent = str_replace('${APPLICATION_ROOT}/', "/", $tpl);
+            $htContent = str_replace('${APPLICATION_ROOT}', "/", $htContent);
+        }
+        if (is_writeable(AJXP_INSTALL_PATH . "/.htaccess")) {
+            file_put_contents(AJXP_INSTALL_PATH . "/.htaccess", $htContent);
+        } else if (AJXP_PACKAGING == "zip") {
+            $testContent = @file_get_contents(AJXP_INSTALL_PATH . "/.htaccess");
+            if ($testContent === false || $testContent != $htContent) {
+                $htAccessToUpdate = AJXP_INSTALL_PATH . "/.htaccess";
+            }
+        }
+        return $htAccessToUpdate;
+
+    }
+
+    /**
+     * Create the users based on the installer form results.
+     * @param array $data Parsed form results
+     * @param bool $loginIsEmail Whether to use the login as primary email.
+     * @throws Exception
+     */
+    public function createUsers($data, $loginIsEmail = false)
+    {
+        $newConfigPlugin = ConfService::getConfStorageImpl();
+        require_once($newConfigPlugin->getUserClassFileName());
+
+        $adminLogin = InputFilter::sanitize($data["ADMIN_USER_LOGIN"], InputFilter::SANITIZE_EMAILCHARS);
+        $adminName = $data["ADMIN_USER_NAME"];
+        $adminPass = $data["ADMIN_USER_PASS"];
+        $uObj = UsersService::createUser($adminLogin, $adminPass, true);
+        if ($loginIsEmail) {
+            $uObj->getPersonalRole()->setParameterValue("core.conf", "email", $data["ADMIN_USER_LOGIN"]);
+        } else if (isSet($data["MAILER_ADMIN"])) {
+            $uObj->getPersonalRole()->setParameterValue("core.conf", "email", $data["MAILER_ADMIN"]);
+        }
+        $uObj->getPersonalRole()->setParameterValue("core.conf", "USER_DISPLAY_NAME", $adminName);
+        $repos = \Pydio\Core\Services\RepositoryService::listAllRepositories();
+        foreach ($repos as $repo) {
+            $uObj->getPersonalRole()->setAcl($repo->getId(), "rw");
+        }
+        RolesService::updateRole($uObj->getPersonalRole());
+
+        $loginP = "USER_LOGIN";
+        $i = 0;
+        while (isSet($data[$loginP]) && !empty($data[$loginP])) {
+            $pass = $data[str_replace("_LOGIN", "_PASS", $loginP)];
+            $name = $data[str_replace("_LOGIN", "_NAME", $loginP)];
+            $mail = $data[str_replace("_LOGIN", "_MAIL", $loginP)];
+            $saniLogin = InputFilter::sanitize($data[$loginP], InputFilter::SANITIZE_EMAILCHARS);
+            $uObj = UsersService::createUser($saniLogin, $pass);
+            $uObj->getPersonalRole()->setParameterValue("core.conf", "email", $mail);
+            $uObj->getPersonalRole()->setParameterValue("core.conf", "USER_DISPLAY_NAME", $name);
+            RolesService::updateRole($uObj->getPersonalRole());
+            $i++;
+            $loginP = "USER_LOGIN_" . $i;
+        }
+
+    }
+
+    /**
+     * Helpers to test SQL connection and send a test email.
+     * @param $action
+     * @param $httpVars
+     * @param $fileVars
+     * @throws Exception
+     */
+    public function testConnexions($action, $httpVars, $fileVars, ContextInterface $ctx)
+    {
+        $data = array();
+        OptionsHelper::parseStandardFormParameters($ctx, $httpVars, $data, "DRIVER_OPTION_");
+
+        if ($action == "boot_test_sql_connexion") {
+
+            $p = OptionsHelper::cleanDibiDriverParameters($data["db_type"]);
+            if ($p["driver"] == "sqlite3") {
+                $dbFile = VarsFilter::filter($p["database"], $ctx);
+                if (!file_exists(dirname($dbFile))) {
+                    mkdir(dirname($dbFile), 0755, true);
+                }
+            }
+            if(empty($p["password"])){
+                throw new PydioException("Although it's technically possible, for security reasons please do not use blank password for your DB connection.");
+            }
+            // Should throw an exception if there was a problem.
+            dibi::connect($p);
+            dibi::disconnect();
+            echo 'SUCCESS:Connexion established!';
+
+        } else if ($action == "boot_test_mailer") {
+
+            $mailerPlug = PluginsService::getInstance($ctx)->getPluginById("mailer.phpmailer-lite");
+            $mailerPlug->loadConfigs(array("MAILER" => $data["MAILER_ENABLE"]["MAILER_SYSTEM"]));
+            $mailerPlug->sendMail(
+                $ctx,
+                array("adress" => $data["MAILER_ENABLE"]["MAILER_ADMIN"]),
+                "Pydio Test Mail",
+                "Body of the test",
+                array("adress" => $data["MAILER_ENABLE"]["MAILER_ADMIN"])
+            );
+            echo 'SUCCESS:Mail sent to the admin adress, please check it is in your inbox!';
+
+        }
+    }
+
+    /**
+     * @param string $pluginId
+     * @param array $options
+     * @return mixed
+     */
+    public function _loadPluginConfig($pluginId, &$options)
+    {
+        $internal = self::getInternalConf();
+
+        if ($pluginId == "core.conf" && isSet($internal["CONF_DRIVER"])) {
+            // Reformat
+            $options["UNIQUE_INSTANCE_CONFIG"] = array(
+                "instance_name" => "conf." . $internal["CONF_DRIVER"]["NAME"],
+                "group_switch_value" => "conf." . $internal["CONF_DRIVER"]["NAME"],
+            );
+            unset($internal["CONF_DRIVER"]["NAME"]);
+            $options["UNIQUE_INSTANCE_CONFIG"] = array_merge($options["UNIQUE_INSTANCE_CONFIG"], $internal["CONF_DRIVER"]["OPTIONS"]);
+            return;
+
+        } else if ($pluginId == "core.auth" && isSet($internal["AUTH_DRIVER"])) {
+            $options = $this->authLegacyToBootConf($internal["AUTH_DRIVER"]);
+            return;
+
+        } else if ($pluginId == "core.cache" && isSet($internal["CACHE_DRIVER"])) {
+            $options['UNIQUE_INSTANCE_CONFIG'] = array(
+                "instance_name" => "cache." . $internal["CACHE_DRIVER"]["NAME"]
+            );
+            return;
+        }
+
+        CoreConfLoader::loadBootstrapConfForPlugin($pluginId, $options);
+    }
+
+    /**
+     * @param $legacy
+     * @return array
+     */
+    protected function authLegacyToBootConf($legacy)
+    {
+        $data = array();
+        $kOpts = array("LOGIN_REDIRECT", "AUTOCREATE_AJXPUSER");
+        foreach ($kOpts as $k) {
+            if (isSet($legacy["OPTIONS"][$k])) $data[$k] = $legacy["OPTIONS"][$k];
+        }
+        if ($legacy["NAME"] == "multi") {
+            $drivers = $legacy["OPTIONS"]["DRIVERS"];
+            $master = $legacy["OPTIONS"]["MASTER_DRIVER"];
+            $slave = array_pop(array_diff(array_keys($drivers), array($master)));
+
+            $data["MULTI_MODE"] = array("instance_name" => $legacy["OPTIONS"]["MODE"]);
+            $data["MULTI_USER_BASE_DRIVER"] = $legacy["OPTIONS"]["USER_BASE_DRIVER"] == $master ? "master" : ($legacy["OPTIONS"]["USER_BASE_DRIVER"] == $slave ? "slave" : "");
+
+            $data["MASTER_INSTANCE_CONFIG"] = array_merge($legacy["OPTIONS"]["DRIVERS"][$master]["OPTIONS"], array("instance_name" => "auth." . $master));
+            $data["SLAVE_INSTANCE_CONFIG"] = array_merge($legacy["OPTIONS"]["DRIVERS"][$slave]["OPTIONS"], array("instance_name" => "auth." . $slave));
+
+        } else {
+            $data["MASTER_INSTANCE_CONFIG"] = array_merge($legacy["OPTIONS"], array("instance_name" => "auth." . $legacy["NAME"]));
+        }
+        return $data;
+    }
+
+    /**
+     * @param String $pluginId
+     * @param String $options
+     */
+    public function _savePluginConfig($pluginId, $options)
+    {
+        $jsonData = CoreConfLoader::getBootstrapConf();
+
+        if (!is_array($jsonData)) $jsonData = array();
+        $jsonData[$pluginId] = $options;
+
+        if ($pluginId == "core.conf" || $pluginId == "core.auth" || $pluginId == "core.cache") {
+            $testKey = ($pluginId == "core.conf" || $pluginId == "core.cache" ? "UNIQUE_INSTANCE_CONFIG" : "MASTER_INSTANCE_CONFIG");
+            $current = array();
+            $this->_loadPluginConfig($pluginId, $current);
+            if (isSet($current[$testKey]["instance_name"]) && $current[$testKey]["instance_name"] != $options[$testKey]["instance_name"]) {
+                $forceDisconnexion = $pluginId;
+            }
+        }
+
+        CoreConfLoader::saveBootstrapConf($jsonData);
+
+        if (isSet($forceDisconnexion)) {
+            if ($pluginId == "core.conf") {
+                // DISCONNECT
+                AuthService::disconnect();
+            } else if ($pluginId == "core.auth") {
+                // DELETE admin_counted file and DISCONNECT
+                @unlink($this->getPluginWorkDir(true) . "/admin_counted");
+                if(is_file(AJXP_CACHE_DIR . "/admin_counted")){
+                    @unlink(AJXP_CACHE_DIR . "/admin_counted");
+                }
+            }
+        }
+    }
+
+    /**
+     * Returns a list of available repositories (dynamic ones only, not the ones defined in the config file).
+     * @param AbstractUser $user
+     * @return array
+     */
+    public function listRepositories($user = null)
+    {
+        return array();
+    }
+
+    /**
+     * Returns a list of available repositories (dynamic ones only, not the ones defined in the config file).
+     * @param array $criteria
+     * @param int $count
+     * @return array
+     */
+    public function listRepositoriesWithCriteria($criteria, &$count = null)
+    {
+        return array();
+    }
+
+    /**
+     * Retrieve a Repository given its unique ID.
+     *
+     * @param String $repositoryId
+     * @return Repository
+     */
+    public function getRepositoryById($repositoryId)
+    {
+        return null;
+    }
+
+    /**
+     * Retrieve a Repository given its alias.
+     *
+     * @param String $repositorySlug
+     * @return \Pydio\Access\Core\Model\Repository
+     */
+    public function getRepositoryByAlias($repositorySlug)
+    {
+        return null;
+    }
+
+    /**
+     * Stores a repository, new or not.
+     *
+     * @param Repository $repositoryObject
+     * @param Boolean $update
+     * @return int -1 if failed
+     */
+    public function saveRepository($repositoryObject, $update = false)
+    {
+        return -1;
+    }
+
+    /**
+     * Delete a repository, given its unique ID.
+     *
+     * @param String $repositoryId
+     */
+    public function deleteRepository($repositoryId)
+    {
+
+    }
+
+    /**
+     * Must return an associative array of roleId => AjxpRole objects.
+     * @param array $roleIds
+     * @param boolean $excludeReserved ,
+     * @return array AjxpRole[]
+     */
+    public function listRoles($roleIds = array(), $excludeReserved = false)
+    {
+        return array();
+    }
+
+    /**
+     * @param AJXP_Role[] $roles
+     * @return mixed
+     */
+    public function saveRoles($roles)
+    {
+    }
+
+    /**
+     * @param AJXP_Role $role
+     * @param AbstractUser $userObject
+     * @return void
+     */
+    public function updateRole($role, $userObject = null)
+    {
+    }
+
+    /**
+     * @param AJXP_Role|String $role
+     * @return void
+     */
+    public function deleteRole($role)
+    {
+
+    }
+
+    /**
+     * Specific queries
+     */
+    public function countAdminUsers()
+    {
+    }
+
+    /**
+     * @param array $context
+     * @param String $fileName
+     * @param String $ID
+     * @return String $ID
+     */
+    public function saveBinary($context, $fileName, $ID = null)
+    {
+        return $ID;
+    }
+
+    /**
+     * @param array $context
+     * @param String $ID
+     * @param resource $outputStream
+     * @return boolean
+     */
+    public function loadBinary($context, $ID, $outputStream = null)
+    {
+        return false;
+    }
+
+    /**
+     * @param array $context
+     * @param String $ID
+     * @return boolean
+     */
+    public function deleteBinary($context, $ID)
+    {
+        return false;
+    }
+
+    /**
+     * Function for deleting a user
+     *
+     * @param String $userId
+     * @param array $deletedSubUsers
+     * @return array
+     */
+    public function deleteUser($userId, &$deletedSubUsers)
+    {
+        return array();
+    }
+
+    /**
+     * Instantiate the right class
+     *
+     * @param string $userId
+     * @return AbstractUser
+     */
+    public function instantiateAbstractUserImpl($userId)
+    {
+        return null;
+    }
+
+    /**
+     * @return string
+     */
+    public function getUserClassFileName()
+    {
+        return "";
+    }
+
+    /**
+     * @param $userId
+     * @return AbstractUser[]
+     */
+    public function getUserChildren($userId)
+    {
+        return array();
+    }
+
+    /**
+     * @abstract
+     * @param string $repositoryId
+     * @param string $rolePrefix
+     * @param bool $countOnly
+     * @return array()
+     */
+    public function getRolesForRepository($repositoryId, $rolePrefix = '', $countOnly = false)
+    {
+        return array();
+    }
+
+    /**
+     * @param $ctx ContextInterface
+     * @param string $repositoryId
+     * @param boolean $details
+     * @param bool $admin
+     * @return array
+     */
+    public function countUsersForRepository(ContextInterface $ctx, $repositoryId, $details = false, $admin = false)
+    {
+        return array();
+    }
+
+    /**
+     * @param AbstractUser[] $flatUsersList
+     * @param string $baseGroup
+     * @param bool $fullTree
+     * @return void
+     */
+    public function filterUsersByGroup(&$flatUsersList, $baseGroup = "/", $fullTree = false)
+    {
+    }
+
+    /**
+     * @param string $groupPath
+     * @param string $groupLabel
+     * @return mixed
+     */
+    public function createGroup($groupPath, $groupLabel)
+    {
+        return false;
+    }
+
+    /**
+     * @param $groupPath
+     * @return void
+     */
+    public function deleteGroup($groupPath)
+    {
+    }
+
+    /**
+     * @param string $groupPath
+     * @param string $groupLabel
+     * @return void
+     */
+    public function relabelGroup($groupPath, $groupLabel)
+    {
+    }
+
+    /**
+     * @param string $baseGroup
+     * @return string[]
+     */
+    public function getChildrenGroups($baseGroup = "/")
+    {
+    }
+
+    /**
+     * @abstract
+     * @param String $keyType
+     * @param String $keyId
+     * @param String $userId
+     * @param array $data
+     * @return boolean
+     */
+    public function saveTemporaryKey($keyType, $keyId, $userId, $data)
+    {
+    }
+
+    /**
+     * @abstract
+     * @param String $keyType
+     * @param String $keyId
+     * @return array
+     */
+    public function loadTemporaryKey($keyType, $keyId)
+    {
+    }
+
+    /**
+     * @abstract
+     * @param String $keyType
+     * @param String $keyId
+     * @return boolean
+     */
+    public function deleteTemporaryKey($keyType, $keyId)
+    {
+    }
+
+    /**
+     * @abstract
+     * @param String $keyType
+     * @param String $expiration
+     * @return null
+     */
+    public function pruneTemporaryKeys($keyType, $expiration)
+    {
+    }
+
+    /**
+     * Check if group already exists
+     * @param string $groupPath
+     * @return boolean
+     */
+    public function groupExists($groupPath)
+    {
+        return false;
+    }
+}
diff --git a/core/src/plugins/boot.conf/class.AjxpInstaller.js b/core/src/plugins/boot.conf/class.AjxpInstaller.js
index b59ae87621..0ca9624dea 100644
--- a/core/src/plugins/boot.conf/class.AjxpInstaller.js
+++ b/core/src/plugins/boot.conf/class.AjxpInstaller.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 Class.create("AjxpInstaller", AjxpPane, {
 
@@ -33,13 +33,13 @@ Class.create("AjxpInstaller", AjxpPane, {
 
     initLanguageSwitcher: function(){
         var selector = this.htmlElement.down("#installer_lang");
-        $H(ajxpBootstrap.parameters.get('availableLanguages')).each(function(pair){
-            var option = new Element('option', {value:pair.key}).update(pair.value);
-            if(pair.key == ajaxplorer.currentLanguage){
-                option.writeAttribute("selected", "true");
-            }
-            selector.insert(option);
-        });
+        if(!selector.down('option')){
+            pydio.listLanguagesWithCallback(function(key, label, selected){
+                var option = new Element('option', {value:key}).update(label);
+                if(selected) option.writeAttribute("selected", "true");
+                selector.insert(option);
+            });
+        }
         selector.observe("change", function(){
             pydio.fire("language_changed");
             pydio.currentLanguage = selector.getValue();
diff --git a/core/src/plugins/boot.conf/class.BootConfLoader.php b/core/src/plugins/boot.conf/class.BootConfLoader.php
deleted file mode 100644
index 777f7b9630..0000000000
--- a/core/src/plugins/boot.conf/class.BootConfLoader.php
+++ /dev/null
@@ -1,800 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Implementation of the configuration driver on serial files
- * @package AjaXplorer_Plugins
- * @subpackage Boot
- */
-class BootConfLoader extends AbstractConfDriver
-{
-    private static $internalConf;
-    private static $jsonConf;
-    private static $jsonPath;
-
-    private function getInternalConf()
-    {
-        if (!isSet(BootConfLoader::$internalConf)) {
-            if (file_exists(AJXP_CONF_PATH."/bootstrap_plugins.php")) {
-                include(AJXP_CONF_PATH."/bootstrap_plugins.php");
-                if (isSet($PLUGINS)) {
-                    BootConfLoader::$internalConf = $PLUGINS;
-                }
-            } else {
-                BootConfLoader::$internalConf = array();
-            }
-        }
-        return BootConfLoader::$internalConf;
-    }
-
-    public function init($options)
-    {
-        parent::init($options);
-        try {
-            $dir = $this->getPluginWorkDir(true);
-            if(!is_file($dir.DIRECTORY_SEPARATOR."server_uuid")){
-                file_put_contents($dir.DIRECTORY_SEPARATOR."server_uuid", md5(json_encode($_SERVER)));
-            }
-        } catch (Exception $e) {
-            die("Impossible write into the AJXP_DATA_PATH folder: Make sure to grant write access to this folder for your webserver!");
-        }
-    }
-
-    public function loadManifest()
-    {
-        parent::loadManifest();
-        if (!AJXP_Utils::detectApplicationFirstRun()) {
-            $actions = $this->getXPath()->query("server_settings|registry_contributions");
-            foreach ($actions as $ac) {
-                $ac->parentNode->removeChild($ac);
-            }
-            $this->reloadXPath();
-        }
-    }
-
-    public function getServerUuid(){
-        return file_get_contents($this->getPluginWorkDir().DIRECTORY_SEPARATOR."server_uuid");
-    }
-
-    public function printFormFromServerSettings($fullManifest){
-
-        AJXP_XMLWriter::header("admin_data");
-        $xPath = new DOMXPath($fullManifest->ownerDocument);
-        $addParams = "";
-        $pInstNodes = $xPath->query("server_settings/global_param[contains(@type, 'plugin_instance:')]");
-        foreach ($pInstNodes as $pInstNode) {
-            $type = $pInstNode->getAttribute("type");
-            $instType = str_replace("plugin_instance:", "", $type);
-            $fieldName = $pInstNode->getAttribute("name");
-            $pInstNode->setAttribute("type", "group_switch:".$fieldName);
-            $typePlugs = AJXP_PluginsService::getInstance()->getPluginsByType($instType);
-            foreach ($typePlugs as $typePlug) {
-                if($typePlug->getId() == "auth.multi") continue;
-                $checkErrorMessage = "";
-                try {
-                    $typePlug->performChecks();
-                } catch (Exception $e) {
-                    $checkErrorMessage = " (Warning : ".$e->getMessage().")";
-                }
-                $tParams = AJXP_XMLWriter::replaceAjxpXmlKeywords($typePlug->getManifestRawContent("server_settings/param"));
-                $addParams .= '<global_param group_switch_name="'.$fieldName.'" name="instance_name" group_switch_label="'.$typePlug->getManifestLabel().$checkErrorMessage.'" group_switch_value="'.$typePlug->getId().'" default="'.$typePlug->getId().'" type="hidden"/>';
-                $addParams .= str_replace("<param", "<global_param group_switch_name=\"${fieldName}\" group_switch_label=\"".$typePlug->getManifestLabel().$checkErrorMessage."\" group_switch_value=\"".$typePlug->getId()."\" ", $tParams);
-                $addParams .= AJXP_XMLWriter::replaceAjxpXmlKeywords($typePlug->getManifestRawContent("server_settings/global_param"));
-            }
-        }
-        $uri = $_SERVER["REQUEST_URI"];
-        if(strpos($uri, '.php') !== false) $uri = AJXP_Utils::safeDirname($uri);
-        if(empty($uri)) $uri = "/";
-        $loadedValues = array(
-            "ENCODING"  => (defined('AJXP_LOCALE')?AJXP_LOCALE:SystemTextEncoding::getEncoding()),
-            "SERVER_URI"=> $uri
-        );
-        foreach($loadedValues as $pName => $pValue){
-            $vNodes = $xPath->query("server_settings/global_param[@name='$pName']");
-            if(!$vNodes->length) continue;
-            $vNodes->item(0)->setAttribute("default", $pValue);
-        }
-        $allParams = AJXP_XMLWriter::replaceAjxpXmlKeywords($fullManifest->ownerDocument->saveXML($fullManifest));
-        $allParams = str_replace('type="plugin_instance:', 'type="group_switch:', $allParams);
-        $allParams = str_replace("</server_settings>", $addParams."</server_settings>", $allParams);
-
-        echo($allParams);
-        AJXP_XMLWriter::close("admin_data");
-
-    }
-
-    /**
-     * Transmit to the ajxp_conf load_plugin_manifest action
-     * @param $action
-     * @param $httpVars
-     * @param $fileVars
-     */
-    public function loadInstallerForm($action, $httpVars, $fileVars)
-    {
-        if(isSet($httpVars["lang"])){
-            ConfService::setLanguage($httpVars["lang"]);
-        }
-        $fullManifest = $this->getManifestRawContent("", "xml");
-        $this->printFormFromServerSettings($fullManifest);
-    }
-
-    /**
-     * Transmit to the ajxp_conf load_plugin_manifest action
-     * @param $action
-     * @param $httpVars
-     * @param $fileVars
-     */
-    public function applyInstallerForm($action, $httpVars, $fileVars)
-    {
-        $data = array();
-        AJXP_Utils::parseStandardFormParameters($httpVars, $data, null, "");
-
-        list($newConfigPlugin, $newAuthPlugin, $newCachePlugin) = $this->createBootstrapConf($data);
-
-        $this->feedPluginsOptions($newConfigPlugin, $data);
-
-        ConfService::setTmpStorageImplementations($newConfigPlugin, $newAuthPlugin, $newCachePlugin);
-        $this->createUsers($data);
-
-        $this->setAdditionalData($data);
-        $htContent = null;
-        $htAccessToUpdate = $this->updateHtAccess($data, $htContent);
-        $this->sendInstallResult($htAccessToUpdate, $htContent);
-
-    }
-
-    /**
-     * Send output to the user.
-     * @param String $htAccessToUpdate file path
-     * @param String $htContent file content
-     */
-    public function sendInstallResult($htAccessToUpdate, $htContent){
-        ConfService::clearAllCaches();
-        AJXP_Utils::setApplicationFirstRunPassed();
-
-        if($htAccessToUpdate != null){
-            HTMLWriter::charsetHeader("application/json");
-            echo json_encode(array('file' => $htAccessToUpdate, 'content' => $htContent));
-        }else{
-            session_destroy();
-            HTMLWriter::charsetHeader("text/plain");
-            echo 'OK';
-        }
-
-    }
-
-    /**
-     * Non-impacting operations
-     * @param array $data Installer parsed form result
-     * @throws Exception
-     */
-    public function setAdditionalData($data){
-        if($data["ENCODING"] != (defined('AJXP_LOCALE')?AJXP_LOCALE:SystemTextEncoding::getEncoding())){
-            file_put_contents($this->getPluginWorkDir()."/encoding.php", "<?php \$ROOT_ENCODING='".$data["ENCODING"]."';");
-        }
-    }
-
-    /**
-     * Update the plugins parameters. OptionsLinks can be an array associating keys of $data
-     * to pluginID/plugin_parameter_name
-     *
-     * @param AbstractConfDriver $confDriver
-     * @param array $data
-     * @param null|array $optionsLinks
-     */
-    public function feedPluginsOptions($confDriver, $data, $optionsLinks = null){
-
-        if(isSet($optionsLinks)){
-            $direct = $optionsLinks;
-        }else{
-            $data["ENABLE_NOTIF"] = true;
-            // Prepare plugins configs
-            $direct = array(
-                "APPLICATION_TITLE" => "core.ajaxplorer/APPLICATION_TITLE",
-                "APPLICATION_LANGUAGE" => "core.ajaxplorer/DEFAULT_LANGUAGE",
-                "ENABLE_NOTIF"      => "core.notifications/USER_EVENTS",
-                "APPLICATION_WELCOME" => "gui.ajax/CUSTOM_WELCOME_MESSAGE"
-            );
-            $mailerEnabled = $data["MAILER_ENABLE"]["status"];
-            if ($mailerEnabled == "yes") {
-                // Enable core.mailer
-                $data["MAILER_SYSTEM"] = $data["MAILER_ENABLE"]["MAILER_SYSTEM"];
-                $data["MAILER_ADMIN"] = $data["MAILER_ENABLE"]["MAILER_ADMIN"];
-                $direct = array_merge($direct, array(
-                    "MAILER_SYSTEM" => "mailer.phpmailer-lite/MAILER",
-                    "MAILER_ADMIN" => "core.mailer/FROM",
-                ));
-            }
-        }
-
-        foreach ($direct as $key => $value) {
-            list($pluginId, $param) = explode("/", $value);
-            $options = array();
-            $confDriver->_loadPluginConfig($pluginId, $options);
-            $options[$param] = $data[$key];
-            $confDriver->_savePluginConfig($pluginId, $options);
-        }
-
-
-    }
-
-    /**
-     * Create or update the bootstrap json file.
-     * @param Array $data Parsed result of the installer form
-     * @return array 2 entries array containing the new Conf Driver (0) and Auth Driver (1)
-     * @throws Exception
-     */
-    public function createBootstrapConf($data){
-
-        // Create a custom bootstrap.json file
-        $coreConf = array(); $coreAuth = array(); $coreCache = array();
-        $this->_loadPluginConfig("core.conf", $coreConf);
-        $this->_loadPluginConfig("core.auth", $coreAuth);
-        $this->_loadPluginConfig("core.cache", $coreCache);
-        if(!isSet($coreConf["UNIQUE_INSTANCE_CONFIG"])) $coreConf["UNIQUE_INSTANCE_CONFIG"] = array();
-        if(!isSet($coreAuth["MASTER_INSTANCE_CONFIG"])) $coreAuth["MASTER_INSTANCE_CONFIG"] = array();
-        if(!isSet($coreCache["UNIQUE_INSTANCE_CONFIG"])) $coreCache["UNIQUE_INSTANCE_CONFIG"] = array();
-        $coreConf["AJXP_CLI_SECRET_KEY"] = AJXP_Utils::generateRandomString(24, true);
-
-        // REWRITE BOOTSTRAP.JSON
-        $coreConf["DIBI_PRECONFIGURATION"] = $data["db_type"];
-        if (isSet($coreConf["DIBI_PRECONFIGURATION"]["sqlite3_driver"])) {
-            $dbFile = AJXP_VarsFilter::filter($coreConf["DIBI_PRECONFIGURATION"]["sqlite3_database"]);
-            if (!file_exists(dirname($dbFile))) {
-                mkdir(dirname($dbFile), 0755, true);
-            }
-        }
-        $coreConf["UNIQUE_INSTANCE_CONFIG"] = array_merge($coreConf["UNIQUE_INSTANCE_CONFIG"], array(
-            "instance_name"=> "conf.sql",
-            "group_switch_value"=> "conf.sql",
-            "SQL_DRIVER"   => array("core_driver" => "core", "group_switch_value" => "core")
-        ));
-        $coreAuth["MASTER_INSTANCE_CONFIG"] = array_merge($coreAuth["MASTER_INSTANCE_CONFIG"], array(
-            "instance_name"=> "auth.sql",
-            "group_switch_value"=> "auth.sql",
-            "SQL_DRIVER"   => array("core_driver" => "core", "group_switch_value" => "core")
-        ));
-        $coreCache["UNIQUE_INSTANCE_CONFIG"] = array_merge($coreCache["UNIQUE_INSTANCE_CONFIG"], array());
-
-        // DETECT REQUIRED SQL TABLES AND INSTALL THEM
-        $registry = AJXP_PluginsService::getInstance()->getDetectedPlugins();
-        $driverData = array("SQL_DRIVER" => $data["db_type"]);
-        foreach($registry as $type => $plugins){
-            foreach($plugins as $plugObject){
-                if($plugObject instanceof SqlTableProvider){
-                    $plugObject->installSQLTables($driverData);
-                }
-            }
-        }
-
-
-        $oldBoot = $this->getPluginWorkDir(true)."/bootstrap.json";
-        if (is_file($oldBoot)) {
-            copy($oldBoot, $oldBoot.".bak");
-            unlink($oldBoot);
-        }
-        $newBootstrap = array("core.conf" => $coreConf, "core.auth" => $coreAuth, "core.cache" => $coreCache);
-        AJXP_Utils::saveSerialFile($oldBoot, $newBootstrap, true, false, "json", true);
-
-
-        // Write new bootstrap and reload conf plugin!
-        $coreConf["UNIQUE_INSTANCE_CONFIG"]["SQL_DRIVER"] = $coreConf["DIBI_PRECONFIGURATION"];
-        $coreAuth["MASTER_INSTANCE_CONFIG"]["SQL_DRIVER"] = $coreConf["DIBI_PRECONFIGURATION"];
-
-        $newConfigPlugin = ConfService::instanciatePluginFromGlobalParams($coreConf["UNIQUE_INSTANCE_CONFIG"], "AbstractConfDriver");
-        $newAuthPlugin = ConfService::instanciatePluginFromGlobalParams($coreAuth["MASTER_INSTANCE_CONFIG"], "AbstractAuthDriver");
-        $newCachePlugin = ConfService::instanciatePluginFromGlobalParams($coreCache["UNIQUE_INSTANCE_CONFIG"], "AbstractCacheDriver");
-
-        $sqlPlugs = array(
-            "core.notifications/UNIQUE_FEED_INSTANCE" => "feed.sql",
-            "core.log/UNIQUE_PLUGIN_INSTANCE" => "log.sql",
-            "core.mq/UNIQUE_MS_INSTANCE" => "mq.sql"
-        );
-        foreach ($sqlPlugs as $core => $value) {
-            list($pluginId, $param) = explode("/",$core);
-            $options = array();
-            $newConfigPlugin->_loadPluginConfig($pluginId, $options);
-            $options[$param] = array(
-                "instance_name"=> $value,
-                "group_switch_value"=> $value,
-                "SQL_DRIVER"   => array("core_driver" => "core", "group_switch_value" => "core")
-            );
-            $newConfigPlugin->_savePluginConfig($pluginId, $options);
-        }
-
-        return array($newConfigPlugin, $newAuthPlugin, $newCachePlugin);
-    }
-
-    /**
-     * Tries to detect if the .htaccess file needs updating. If so, returns the path to this file
-     * and feed the $htContent with target data. That way it can be sent to the users to tell him
-     * how to update the content.
-     *
-     * @param $data
-     * @param $htContent
-     * @return null|string
-     */
-    public function updateHtAccess($data, &$htContent){
-
-        $htAccessToUpdate = null;
-        $tpl = file_get_contents($this->getBaseDir()."/htaccess.tpl");
-        if(!empty($data["SERVER_URI"]) && $data["SERVER_URI"] != "/"){
-            $htContent = str_replace('${APPLICATION_ROOT}', $data["SERVER_URI"], $tpl);
-        }else{
-            $htContent = str_replace('${APPLICATION_ROOT}/', "/", $tpl);
-            $htContent = str_replace('${APPLICATION_ROOT}', "/", $htContent);
-        }
-        if(is_writeable(AJXP_INSTALL_PATH."/.htaccess")){
-            file_put_contents(AJXP_INSTALL_PATH."/.htaccess", $htContent);
-        }else if(AJXP_PACKAGING == "zip"){
-            $testContent = @file_get_contents(AJXP_INSTALL_PATH."/.htaccess");
-            if($testContent === false || $testContent != $htContent){
-                $htAccessToUpdate = AJXP_INSTALL_PATH."/.htaccess";
-            }
-        }
-        return $htAccessToUpdate;
-
-    }
-
-    /**
-     * Create the users based on the installer form results.
-     * @param array $data Parsed form results
-     * @param bool $loginIsEmail Whether to use the login as primary email.
-     * @throws Exception
-     */
-    public function createUsers($data, $loginIsEmail = false){
-        $newConfigPlugin = ConfService::getConfStorageImpl();
-        require_once($newConfigPlugin->getUserClassFileName());
-
-        $adminLogin = AJXP_Utils::sanitize($data["ADMIN_USER_LOGIN"], AJXP_SANITIZE_EMAILCHARS);
-        $adminName = $data["ADMIN_USER_NAME"];
-        $adminPass = $data["ADMIN_USER_PASS"];
-        AuthService::createUser($adminLogin, $adminPass, true);
-        $uObj = $newConfigPlugin->createUserObject($adminLogin);
-        if($loginIsEmail){
-            $uObj->personalRole->setParameterValue("core.conf", "email", $data["ADMIN_USER_LOGIN"]);
-        }else if(isSet($data["MAILER_ADMIN"])) {
-            $uObj->personalRole->setParameterValue("core.conf", "email", $data["MAILER_ADMIN"]);
-        }
-        $uObj->personalRole->setParameterValue("core.conf", "USER_DISPLAY_NAME", $adminName);
-        $repos = ConfService::getRepositoriesList("all", false);
-        foreach($repos as $repo){
-            $uObj->personalRole->setAcl($repo->getId(), "rw");
-        }
-        AuthService::updateRole($uObj->personalRole);
-
-        $loginP = "USER_LOGIN";
-        $i = 0;
-        while (isSet($data[$loginP]) && !empty($data[$loginP])) {
-            $pass  = $data[str_replace("_LOGIN", "_PASS",  $loginP)];
-            $name  = $data[str_replace("_LOGIN", "_NAME",  $loginP)];
-            $mail  = $data[str_replace("_LOGIN", "_MAIL",  $loginP)];
-            $saniLogin = AJXP_Utils::sanitize($data[$loginP], AJXP_SANITIZE_EMAILCHARS);
-            AuthService::createUser($saniLogin, $pass);
-            $uObj = $newConfigPlugin->createUserObject($saniLogin);
-            $uObj->personalRole->setParameterValue("core.conf", "email", $mail);
-            $uObj->personalRole->setParameterValue("core.conf", "USER_DISPLAY_NAME", $name);
-            AuthService::updateRole($uObj->personalRole);
-            $i++;
-            $loginP = "USER_LOGIN_".$i;
-        }
-
-    }
-
-    /**
-     * Helpers to test SQL connection and send a test email.
-     * @param $action
-     * @param $httpVars
-     * @param $fileVars
-     * @throws Exception
-     */
-    public function testConnexions($action, $httpVars, $fileVars)
-    {
-        $data = array();
-        AJXP_Utils::parseStandardFormParameters($httpVars, $data, null, "DRIVER_OPTION_");
-
-        if ($action == "boot_test_sql_connexion") {
-
-            $p = AJXP_Utils::cleanDibiDriverParameters($data["db_type"]);
-            if ($p["driver"] == "sqlite3") {
-                $dbFile = AJXP_VarsFilter::filter($p["database"]);
-                if (!file_exists(dirname($dbFile))) {
-                    mkdir(dirname($dbFile), 0755, true);
-                }
-            }
-
-            // Should throw an exception if there was a problem.
-            dibi::connect($p);
-            dibi::disconnect();
-            echo 'SUCCESS:Connexion established!';
-
-        } else if ($action == "boot_test_mailer") {
-
-            $mailerPlug = AJXP_PluginsService::findPluginById("mailer.phpmailer-lite");
-            $mailerPlug->loadConfigs(array("MAILER" => $data["MAILER_ENABLE"]["MAILER_SYSTEM"]));
-            $mailerPlug->sendMail(
-                array("adress" => $data["MAILER_ENABLE"]["MAILER_ADMIN"]),
-                "Pydio Test Mail",
-                "Body of the test",
-                array("adress" => $data["MAILER_ENABLE"]["MAILER_ADMIN"])
-            );
-            echo 'SUCCESS:Mail sent to the admin adress, please check it is in your inbox!';
-
-        }
-    }
-
-    public function _loadPluginConfig($pluginId, &$options)
-    {
-        $internal = self::getInternalConf();
-
-        if ($pluginId == "core.conf" && isSet($internal["CONF_DRIVER"])) {
-            // Reformat
-            $options["UNIQUE_INSTANCE_CONFIG"] = array(
-                "instance_name" => "conf.".$internal["CONF_DRIVER"]["NAME"],
-                "group_switch_value" => "conf.".$internal["CONF_DRIVER"]["NAME"],
-            );
-            unset($internal["CONF_DRIVER"]["NAME"]);
-            $options["UNIQUE_INSTANCE_CONFIG"] = array_merge($options["UNIQUE_INSTANCE_CONFIG"], $internal["CONF_DRIVER"]["OPTIONS"]);
-            return;
-
-        } else if ($pluginId == "core.auth" && isSet($internal["AUTH_DRIVER"])) {
-            $options = $this->authLegacyToBootConf($internal["AUTH_DRIVER"]);
-            return;
-
-        } else if ($pluginId == "core.cache" && isSet($internal["CACHE_DRIVER"])) {
-            $options['UNIQUE_INSTANCE_CONFIG'] = array(
-                "instance_name" => "cache.".$internal["CACHE_DRIVER"]["NAME"]
-            );
-            return;
-        }
-
-        CoreConfLoader::loadBootstrapConfForPlugin($pluginId, $options);
-    }
-
-    protected function authLegacyToBootConf($legacy)
-    {
-        $data = array();
-        $kOpts = array("LOGIN_REDIRECT","TRANSMIT_CLEAR_PASS", "AUTOCREATE_AJXPUSER");
-        foreach ($kOpts as $k) {
-            if(isSet($legacy["OPTIONS"][$k])) $data[$k] = $legacy["OPTIONS"][$k];
-        }
-        if ($legacy["NAME"] == "multi") {
-            $drivers = $legacy["OPTIONS"]["DRIVERS"];
-            $master = $legacy["OPTIONS"]["MASTER_DRIVER"];
-            $slave = array_pop(array_diff(array_keys($drivers), array($master)));
-
-            $data["MULTI_MODE"] = array("instance_name" => $legacy["OPTIONS"]["MODE"]);
-            $data["MULTI_USER_BASE_DRIVER"] = $legacy["OPTIONS"]["USER_BASE_DRIVER"] == $master ? "master" : ($legacy["OPTIONS"]["USER_BASE_DRIVER"] == $slave ? "slave" :  "" ) ;
-
-            $data["MASTER_INSTANCE_CONFIG"] = array_merge($legacy["OPTIONS"]["DRIVERS"][$master]["OPTIONS"], array("instance_name" => "auth.".$master));
-            $data["SLAVE_INSTANCE_CONFIG"] = array_merge($legacy["OPTIONS"]["DRIVERS"][$slave]["OPTIONS"], array("instance_name" => "auth.".$slave));
-
-        } else {
-            $data["MASTER_INSTANCE_CONFIG"] = array_merge($legacy["OPTIONS"], array("instance_name" => "auth.".$legacy["NAME"]));
-        }
-        return $data;
-    }
-
-    /**
-     * @param String $pluginId
-     * @param String $options
-     */
-    public function _savePluginConfig($pluginId, $options)
-    {
-        $jsonData = CoreConfLoader::getBootstrapConf();
-
-        if(!is_array($jsonData)) $jsonData = array();
-        $jsonData[$pluginId] = $options;
-
-        if ($pluginId == "core.conf" || $pluginId == "core.auth" || $pluginId == "core.cache") {
-            $testKey = ($pluginId == "core.conf" || $pluginId == "core.cache" ? "UNIQUE_INSTANCE_CONFIG" : "MASTER_INSTANCE_CONFIG" );
-            $current = array();
-            $this->_loadPluginConfig($pluginId, $current);
-            if (isSet($current[$testKey]["instance_name"]) && $current[$testKey]["instance_name"] != $options[$testKey]["instance_name"]) {
-                $forceDisconnexion = $pluginId;
-            }
-        }
-
-        CoreConfLoader::saveBootstrapConf($jsonData);
-
-        if (isSet($forceDisconnexion)) {
-            if ($pluginId == "core.conf") {
-                // DISCONNECT
-                AuthService::disconnect();
-            } else if ($pluginId == "core.auth") {
-                // DELETE admin_counted file and DISCONNECT
-                @unlink(AJXP_CACHE_DIR."/admin_counted");
-            }
-        }
-    }
-
-    /**
-     * Returns a list of available repositories (dynamic ones only, not the ones defined in the config file).
-     * @param AbstractAjxpUser $user
-     * @return Array
-     */
-    public function listRepositories($user = null)
-    {
-        return array();
-    }
-
-    /**
-     * Returns a list of available repositories (dynamic ones only, not the ones defined in the config file).
-     * @param Array $criteria
-     * @param int $count
-     * @return Array
-     */
-    public function listRepositoriesWithCriteria($criteria, &$count = null){
-        return array();
-    }
-
-    /**
-     * Retrieve a Repository given its unique ID.
-     *
-     * @param String $repositoryId
-     * @return Repository
-     */
-    public function getRepositoryById($repositoryId)
-    {
-        return null;
-    }
-
-    /**
-     * Retrieve a Repository given its alias.
-     *
-     * @param String $repositorySlug
-     * @return Repository
-     */
-    public function getRepositoryByAlias($repositorySlug) {
-        return null;
-    }
-
-    /**
-     * Stores a repository, new or not.
-     *
-     * @param Repository $repositoryObject
-     * @param Boolean $update
-     * @return int -1 if failed
-     */
-    public function saveRepository($repositoryObject, $update = false) {
-        return -1;
-    }
-
-    /**
-     * Delete a repository, given its unique ID.
-     *
-     * @param String $repositoryId
-     */
-    public function deleteRepository($repositoryId) {
-
-    }
-
-    /**
-     * Must return an associative array of roleId => AjxpRole objects.
-     * @param array $roleIds
-     * @param boolean $excludeReserved,
-     * @return array AjxpRole[]
-     */
-    public function listRoles($roleIds = array(), $excludeReserved = false) {
-        return array();
-    }
-
-    public function saveRoles($roles) {
-    }
-
-    /**
-     * @param AJXP_Role $role
-     * @param AbstractAjxpUser $userObject
-     * @return void
-     */
-    public function updateRole($role, $userObject = null) {
-    }
-
-    /**
-     * @param AJXP_Role|String $role
-     * @return void
-     */
-    public function deleteRole($role) {
-
-    }
-
-    /**
-     * Specific queries
-     */
-    public function countAdminUsers() {
-    }
-
-    /**
-     * @param array $context
-     * @param String $fileName
-     * @param String $ID
-     * @return String $ID
-     */
-    public function saveBinary($context, $fileName, $ID = null) {
-        return $ID;
-    }
-
-    /**
-     * @param array $context
-     * @param String $ID
-     * @param Stream $outputStream
-     * @return boolean
-     */
-    public function loadBinary($context, $ID, $outputStream = null) {
-        return false;
-    }
-
-    /**
-     * @param array $context
-     * @param String $ID
-     * @return boolean
-     */
-    public function deleteBinary($context, $ID) {
-        return false;
-    }
-
-    /**
-     * Function for deleting a user
-     *
-     * @param String $userId
-     * @param Array $deletedSubUsers
-     */
-    public function deleteUser($userId, &$deletedSubUsers) {
-        return array();
-    }
-
-    /**
-     * Instantiate the right class
-     *
-     * @param string $userId
-     * @return AbstractAjxpUser
-     */
-    public function instantiateAbstractUserImpl($userId) {
-        return null;
-    }
-
-    public function getUserClassFileName() {
-        return "";
-    }
-
-    /**
-     * @param $userId
-     * @return AbstractAjxpUser[]
-     */
-    public function getUserChildren($userId) {
-        return array();
-    }
-
-    /**
-     * @param string $repositoryId
-     * @return array()
-     */
-    public function getUsersForRepository($repositoryId) {
-        return array();
-    }
-
-    /**
-     * @abstract
-     * @param string $repositoryId
-     * @param string $rolePrefix
-     * @param bool $countOnly
-     * @return array()
-     */
-    public function getRolesForRepository($repositoryId, $rolePrefix = '', $countOnly = false){
-        return array();
-    }
-
-    /**
-     * @param string $repositoryId
-     * @param boolean $details
-     * @param bool $admin
-     * @return array
-     */
-    public function countUsersForRepository($repositoryId, $details = false, $admin=false){
-        return array();
-    }
-
-    /**
-     * @param AbstractAjxpUser[] $flatUsersList
-     * @param string $baseGroup
-     * @param bool $fullTree
-     * @return void
-     */
-    public function filterUsersByGroup(&$flatUsersList, $baseGroup = "/", $fullTree = false) {
-    }
-
-    /**
-     * @param string $groupPath
-     * @param string $groupLabel
-     * @return mixed
-     */
-    public function createGroup($groupPath, $groupLabel) {
-        return false;
-    }
-
-    /**
-     * @param $groupPath
-     * @return void
-     */
-    public function deleteGroup($groupPath) {
-    }
-
-    /**
-     * @param string $groupPath
-     * @param string $groupLabel
-     * @return void
-     */
-    public function relabelGroup($groupPath, $groupLabel) {
-    }
-
-    /**
-     * @param string $baseGroup
-     * @return string[]
-     */
-    public function getChildrenGroups($baseGroup = "/") {
-    }
-
-    /**
-     * @abstract
-     * @param String $keyType
-     * @param String $keyId
-     * @param String $userId
-     * @param Array $data
-     * @return boolean
-     */
-    public function saveTemporaryKey($keyType, $keyId, $userId, $data){}
-
-    /**
-     * @abstract
-     * @param String $keyType
-     * @param String $keyId
-     * @return array
-     */
-    public function loadTemporaryKey($keyType, $keyId){}
-
-    /**
-     * @abstract
-     * @param String $keyType
-     * @param String $keyId
-     * @return boolean
-     */
-    public function deleteTemporaryKey($keyType, $keyId){}
-
-    /**
-     * @abstract
-     * @param String $keyType
-     * @param String $expiration
-     * @return null
-     */
-    public function pruneTemporaryKeys($keyType, $expiration){}
-
-    /**
-     * Check if group already exists
-     * @param string $groupPath
-     * @return boolean
-     */
-    public function groupExists($groupPath)
-    {
-        return false;
-    }
-}
diff --git a/core/src/plugins/boot.conf/htaccess.tpl b/core/src/plugins/boot.conf/htaccess.tpl
index f900a96577..d08dcf13bf 100644
--- a/core/src/plugins/boot.conf/htaccess.tpl
+++ b/core/src/plugins/boot.conf/htaccess.tpl
@@ -8,14 +8,6 @@ RewriteEngine on
 RewriteBase ${APPLICATION_ROOT}
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule ^shares ./dav.php [L]
-RewriteRule ^api ./rest.php [L]
-RewriteRule ^ocs/ ./opencollab.php [L]
-RewriteRule ^ocs-provider/ ./opencollab.php [L]
-RewriteRule ^user ./index.php?get_action=user_access_point [L]
-RewriteCond %{REQUEST_URI} !^${APPLICATION_ROOT}/index
-RewriteCond %{REQUEST_URI} !^${APPLICATION_ROOT}/plugins
-RewriteCond %{REQUEST_URI} ^${APPLICATION_ROOT}/dashboard|^${APPLICATION_ROOT}/settings|^${APPLICATION_ROOT}/welcome|^${APPLICATION_ROOT}/ws-
 RewriteRule (.*) index.php [L]
 
 #Following lines seem to be necessary if PHP is working
diff --git a/core/src/plugins/boot.conf/htaccess.tpl.linux b/core/src/plugins/boot.conf/htaccess.tpl.linux
index 85cf58a9c6..79702b05cb 100644
--- a/core/src/plugins/boot.conf/htaccess.tpl.linux
+++ b/core/src/plugins/boot.conf/htaccess.tpl.linux
@@ -8,14 +8,6 @@ RewriteEngine on
 RewriteBase /pydio
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule ^shares ./dav.php [L]
-RewriteRule ^api ./rest.php [L]
-RewriteRule ^ocs/ ./opencollab.php [L]
-RewriteRule ^ocs-provider/ ./opencollab.php [L]
-RewriteRule ^user ./index.php?get_action=user_access_point [L]
-RewriteCond %{REQUEST_URI} !^/pydio/index
-RewriteCond %{REQUEST_URI} !^/pydio/plugins
-RewriteCond %{REQUEST_URI} ^/pydio/dashboard|^/pydio/welcome|^/pydio/settings|^/pydio/ws-
 RewriteRule (.*) index.php [L]
 
 #Following lines seem to be necessary if PHP is working
diff --git a/core/src/plugins/boot.conf/i18n/conf/de.php b/core/src/plugins/boot.conf/i18n/conf/de.php
index 69e300faaa..dd9241b48c 100644
--- a/core/src/plugins/boot.conf/i18n/conf/de.php
+++ b/core/src/plugins/boot.conf/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 $mess = array(
@@ -75,8 +75,6 @@
 "Detected Server Path" => "Server-Pfad",
 "Make sure this is correct, as it's used to rewrite the htaccess file" => " Stellen Sie sicher, dass dieser Pfad korrekt ist. Er wird zum generieren der htaccess-Datei verwendet.",
 "Select a language activated by default( users will still be able to switch)" => "Wählen Sie die standardmäßig aktivierte Sprache aus. Die Benutzer können die Sprache trotzdem ändern.",
-"Configurations storage" => "Configurations storage",
-"Select how the configurations will be stored" => "Select how the configurations will be stored",
-"Bootstrap Loader" => "Bootstrap Loader",
-"Core plugin for loading the framework. Do NOT disable this plugin!" => "Core plugin for loading the framework. Do NOT disable this plugin!",
-);
\ No newline at end of file
+"Enable cache (recommended)" => "Enable cache (recommended)",
+"Use key/value store to cache server data in-memory. If APC/APCu is detected, it will be enabled by default, you can change this setting later to use a dedicated server like Redis or Memcache." => "Use key/value store to cache server data in-memory. If APC/APCu is detected, it will be enabled by default, you can change this setting later to use a dedicated server like Redis or Memcache."
+);
diff --git a/core/src/plugins/boot.conf/i18n/conf/en.php b/core/src/plugins/boot.conf/i18n/conf/en.php
index deb814876c..a120f9a0c1 100644
--- a/core/src/plugins/boot.conf/i18n/conf/en.php
+++ b/core/src/plugins/boot.conf/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 $mess = array(
@@ -75,6 +75,6 @@
 "Detected Server Path" => "Detected Server Path",
 "Make sure this is correct, as it's used to rewrite the htaccess file" => "Make sure this is correct, as it's used to rewrite the htaccess file",
 "Select a language activated by default( users will still be able to switch)" => "Select a language activated by default( users will still be able to switch)",
-"Bootstrap Loader" => "Bootstrap Loader",
-"Core plugin for loading the framework. Do NOT disable this plugin!" => "Core plugin for loading the framework. Do NOT disable this plugin!",
-);
\ No newline at end of file
+"Enable cache (recommended)" => "Enable cache (recommended)",
+"Use key/value store to cache server data in-memory. If APC/APCu is detected, it will be enabled by default, you can change this setting later to use a dedicated server like Redis or Memcache." => "Use key/value store to cache server data in-memory. If APC/APCu is detected, it will be enabled by default, you can change this setting later to use a dedicated server like Redis or Memcache."
+);
diff --git a/core/src/plugins/boot.conf/i18n/conf/fr.php b/core/src/plugins/boot.conf/i18n/conf/fr.php
index a125ff1c0f..e296f0de26 100644
--- a/core/src/plugins/boot.conf/i18n/conf/fr.php
+++ b/core/src/plugins/boot.conf/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 $mess = array(
@@ -24,7 +24,7 @@
 "Global options" => "<span class='icon-cogs'></span> Options globales",
 "Configurations storage" => "<span class='icon-save'></span> Stockage des configurations",
 "Add some users" => "<span class='icon-group'></span> Ajouter des utilisateurs",
-"Please set up a login and password for the administrator user. This step is necessary to let you login the first time. You can create more administrators later by going to the 'Settings' workspace." => "Veuillez saisir un identifiant et un mot de passe pour l'administrateur. Ceci est requis pour vous connecter la première fois. Vous pourrez créer d'autres administrateurs ultérieurement, en vous connectant au dépôt 'Paramètres'.",
+"Please set up a login and password for the administrator user. This step is necessary to let you login the first time. You can create more administrators later by going to the 'Settings' workspace." => "Veuillez saisir un identifiant et un mot de passe pour l'administrateur. Ceci est requis pour vous connecter la première fois. Vous pourrez créer d'autres administrateurs ultérieurement, en vous connectant au dépôt 'Paramètres'.",		
 "Admin Login" => "Identifiant de l'administrateur",
 "Alphanumeric login" => "Identifiant alphanumérique",
 "Admin Display Name" => "Nom affiché pour l'administrateur",
@@ -59,23 +59,23 @@
 "Display name" => "Nom à afficher",
 "Password" => "Mot de passe",
 "Main options" => "Options Principales",
-"Set up application title and create a connexion identifier for the super-administrator user. Make sure to use a strong password, as this user will have full access to the server." => "Paramètrer le titre de l'application et créer un super-administrateur. Veuillez utiliser un mot de passe fort, cet utilisateur aura accès complet au serveur.",
+"Set up application title and create a connexion identifier for the super-administrator user. Make sure to use a strong password, as this user will have full access to the server." => "Choisir le nom de l'application et créer des identifiants de connexion pour le super-administrateur. Veillez à utiliser un mot de passe fort, car cet utilisateur a accès au serveur.",
 "Application Title" => "Titre de l'application",
-"Your system title" => "Le nom de votre système, affiché aux utilisateurs.",
+"Your system title" => "Le titre de la plateform tel qu'il apparait aux utilisateurs.",
 "Welcome Message" => "Message de bienvenue",
-"An additional message displayed at startup, on the splash screen and the login screen." => "Message affiché sur la page d'accueil et l'écran d'identification.",
+"An additional message displayed at startup, on the splash screen and the login screen." => "Message supplémentaire affiché sur la page d'accueil et dans l'écran de chargement.",
 "User-friendly name of the user" => "Nom de l'utilisateur",
 "Welcome to Pydio" => "Bienvenue sur Pydio",
-"Database Connexion" => "Connexion à la base de données",
-"Driver type (do not touch)" => "Driver type (ne pas changer)",
-"Advanced Options" => "Options avancées",
-"Please review these technical parameters. Encoding and URI should be auto-detected, but please make sure they reflect your actual server configuration." => "Merci de passer en revue ces caractéristiques techniques, en particulier l'encodage.",
+"Database Connexion" => "Base de données",
+"Driver type (do not touch)" => "Type de driver (ne pas changer)",
+"Advanced Options" => "Options Avancées",
+"Please review these technical parameters. Encoding and URI should be auto-detected, but please make sure they reflect your actual server configuration." => "Veuillez valider ces paramètres complémentaires. L'encodage et l'URI doivent être détectés automatiquement, mais assurez vous qu'ils correspondent à votre serveur.",
 "Detected Encoding" => "Encodage détecté",
-"Please make sure to set the encoding corresponding to your server configuration, something like ln_LN.CHARSET, e.g en_US.UTF-8" => "Veuillez vous assurer que ceci correspond à votre système, doit être de format ln_LN.CHARSET, e.g en_US.UTF-8. Le plus simple est de taper echo \$LANG dans une ligne de commande.",
-"Detected Server Path" => "Chemin de l'application",
-"Make sure this is correct, as it's used to rewrite the htaccess file" => "Chemin de l'application depuis la racine du serveur web. Veuillez vous assurer que c'est correct.",
-"Select a language activated by default( users will still be able to switch)" => "Sélectionner une langue par défaut (les utilisateurs seront toujours capables de switcher).",
-"Bootstrap Loader" => "Bootstrap Loader",
-"Core plugin for loading the framework. Do NOT disable this plugin!" => "Plugin de chargement du coeur du framework. NE PAS DESACTIVER!",
+"Please make sure to set the encoding corresponding to your server configuration, something like ln_LN.CHARSET, e.g en_US.UTF-8" => "Utilisez la valeur de l'encodage de votre système de fichier sur le serveur, au format ln_LN.CHARSET, par exemple fr_FR.UTF-8",
+"Detected Server Path" => "Chemin d'accès détecté",
+"Make sure this is correct, as it's used to rewrite the htaccess file" => "Chemin depuis le DocumentRoot de votre serveur web, utilisé dans la réécriture des redirections.",
+"Select a language activated by default( users will still be able to switch)" => "Selectionnez un langage par défaut (les utilisateurs pourront le changer)",
+"Enable cache (recommended)" => "Activer le cache (recommandé)",
+"Use key/value store to cache server data in-memory. If APC/APCu is detected, it will be enabled by default, you can change this setting later to use a dedicated server like Redis or Memcache." => "Utiliser un cache de type clé/valeur pour stocker des données serveurs en mémoire. Is APC/APCu est détecté, ça sera activé par défaut, vous pouvez le changer pour utiliser un serveur à part avec Redis ou Memcache."
 
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/boot.conf/i18n/conf/it.php b/core/src/plugins/boot.conf/i18n/conf/it.php
index 1cc46d088e..74efa0251a 100644
--- a/core/src/plugins/boot.conf/i18n/conf/it.php
+++ b/core/src/plugins/boot.conf/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 $mess = array(
@@ -75,7 +75,6 @@
 "Detected Server Path" => "Detected Server Path",
 "Make sure this is correct, as it's used to rewrite the htaccess file" => "Make sure this is correct, as it's used to rewrite the htaccess file",
 "Select a language activated by default( users will still be able to switch)" => "Select a language activated by default( users will still be able to switch)",
-"Bootstrap Loader" => "Bootstrap Loader",
-"Core plugin for loading the framework. Do NOT disable this plugin!" => "Core plugin for loading the framework. Do NOT disable this plugin!",
-
-);
\ No newline at end of file
+"Enable cache (recommended)" => "Enable cache (recommended)",
+"Use key/value store to cache server data in-memory. If APC/APCu is detected, it will be enabled by default, you can change this setting later to use a dedicated server like Redis or Memcache." => "Use key/value store to cache server data in-memory. If APC/APCu is detected, it will be enabled by default, you can change this setting later to use a dedicated server like Redis or Memcache."
+);
diff --git a/core/src/plugins/boot.conf/i18n/de.php b/core/src/plugins/boot.conf/i18n/de.php
index 342c8d7b8f..6f11a6cf45 100644
--- a/core/src/plugins/boot.conf/i18n/de.php
+++ b/core/src/plugins/boot.conf/i18n/de.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/boot.conf/i18n/en.php b/core/src/plugins/boot.conf/i18n/en.php
index 47dcf2a17a..d06ced427c 100644
--- a/core/src/plugins/boot.conf/i18n/en.php
+++ b/core/src/plugins/boot.conf/i18n/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/boot.conf/i18n/fr.php b/core/src/plugins/boot.conf/i18n/fr.php
index bcf2687c12..0254090739 100644
--- a/core/src/plugins/boot.conf/i18n/fr.php
+++ b/core/src/plugins/boot.conf/i18n/fr.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/boot.conf/i18n/it.php b/core/src/plugins/boot.conf/i18n/it.php
index c8fd67ec6d..b60122b31a 100644
--- a/core/src/plugins/boot.conf/i18n/it.php
+++ b/core/src/plugins/boot.conf/i18n/it.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/boot.conf/i18n/pt.php b/core/src/plugins/boot.conf/i18n/pt.php
index 1d2741a90e..43bef8ec06 100644
--- a/core/src/plugins/boot.conf/i18n/pt.php
+++ b/core/src/plugins/boot.conf/i18n/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 $mess = array(
diff --git a/core/src/plugins/boot.conf/manifest.xml b/core/src/plugins/boot.conf/manifest.xml
index ad42d1a140..50d7c676a8 100644
--- a/core/src/plugins/boot.conf/manifest.xml
+++ b/core/src/plugins/boot.conf/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ajxp_plugin label="CONF_MESSAGE[Bootstrap Loader]" description="CONF_MESSAGE[Core plugin for loading the framework. Do NOT disable this plugin!]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd" mixins="dibidriver_provider" id="boot.conf">
-    <class_definition classname="BootConfLoader" filename="plugins/boot.conf/class.BootConfLoader.php" />
+    <class_definition classname="Pydio\Conf\Boot\BootConfLoader" filename="plugins/boot.conf/BootConfLoader.php" />
     <client_settings>
         <resources>
             <css file="plugins/boot.conf/installer.css" autoload="true"/>
@@ -23,6 +23,7 @@
         <global_param group="CONF_MESSAGE[Advanced Options]" name="AdvancedLegend" type="legend" label="" description="CONF_MESSAGE[Please review these technical parameters. Encoding and URI should be auto-detected, but please make sure they reflect your actual server configuration.]"/>
         <global_param group="CONF_MESSAGE[Advanced Options]" name="ENCODING" type="string" label="CONF_MESSAGE[Detected Encoding]" description="CONF_MESSAGE[Please make sure to set the encoding corresponding to your server configuration, something like ln_LN.CHARSET, e.g en_US.UTF-8]" default="" mandatory="true"/>
         <global_param group="CONF_MESSAGE[Advanced Options]" name="SERVER_URI" type="string" label="CONF_MESSAGE[Detected Server Path]" description="CONF_MESSAGE[Make sure this is correct, as it's used to rewrite the htaccess file]" default="/" mandatory="true"/>
+        <global_param group="CONF_MESSAGE[Advanced Options]" name="APC_CACHE_ENABLE" type="boolean" label="CONF_MESSAGE[Enable cache (recommended)]" description="CONF_MESSAGE[Use key/value store to cache server data in-memory. If APC/APCu is detected, it will be enabled by default, you can change this setting later to use a dedicated server like Redis or Memcache.]" default="false" mandatory="true"/>
         <global_param group="CONF_MESSAGE[Advanced Options]" name="MAILER_ENABLE" type="group_switch:mailer" label="CONF_MESSAGE[Enable emails]" description="CONF_MESSAGE[Set up system to send emails]" default="no" mandatory="true"/>
         <global_param group_switch_name="mailer" group_switch_value="no" group_switch_label="CONF_MESSAGE[No (you can enable mails later)]" name="status" type="hidden" label="No" description="s" default="no"/>
         <global_param group_switch_name="mailer" group_switch_value="yes" group_switch_label="CONF_MESSAGE[Yes (requires a correct PHP configuration)]" name="status" type="hidden" label="Yes" description="s" default="yes"/>
diff --git a/core/src/plugins/cache.doctrine/DoctrineCacheDriver.php b/core/src/plugins/cache.doctrine/DoctrineCacheDriver.php
new file mode 100644
index 0000000000..ff1f3dfc2c
--- /dev/null
+++ b/core/src/plugins/cache.doctrine/DoctrineCacheDriver.php
@@ -0,0 +1,244 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Cache\Implementation;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+require __DIR__ . "/vendor/autoload.php";
+
+define('APC_EXTENSION_LOADED', extension_loaded('apc') || extension_loaded('apcu'));
+define('MEMCACHE_EXTENSION_LOADED', extension_loaded('memcache'));
+define('MEMCACHED_EXTENSION_LOADED', extension_loaded('memcached'));
+define('REDIS_EXTENSION_LOADED', extension_loaded('redis'));
+define('XCACHE_EXTENSION_LOADED', extension_loaded('xcache'));
+
+use \Doctrine\Common\Cache;
+use Pydio\Cache\Core\AbstractCacheDriver;
+use Pydio\Cache\Doctrine\Ext\PydioChainCache;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Vars\StringHelper;
+use Pydio\Log\Core\Logger;
+use Pydio\Cache\Doctrine\Ext;
+
+/**
+ * Standard Memcache driver
+ * @package AjaXplorer_Plugins
+ * @subpackage Log
+ */
+class doctrineCacheDriver extends AbstractCacheDriver
+{
+
+    /**
+     * @param string $namespace
+     * @return Cache\CacheProvider
+     */
+    public function getCacheDriver($namespace = AJXP_CACHE_SERVICE_NS_SHARED){
+
+        if(!isSet($this->namespacedCaches[$namespace])){
+            $this->namespacedCaches[$namespace] = $this->initCacheWithNamespace($namespace);
+        }
+        return $this->namespacedCaches[$namespace];
+
+    }
+
+    /**
+     * Initialise the cache driver based on config
+     * @param ContextInterface $ctx
+     * @param array $options array of options specific to the cache driver.
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        parent::init($ctx, $options);
+
+        $driverOptions = $this->getContextualOption($ctx, "DRIVER");
+        if(!is_array($driverOptions) || !isset($driverOptions['driver'])){
+            return;
+        }
+
+        switch ($driverOptions['driver']) {
+            case "apc":
+                if (!APC_EXTENSION_LOADED) {
+                    Logger::error(__CLASS__, "init", "The APC extension package must be installed!");
+                    return;
+                }
+                break;
+            case "memcache":
+                if (!MEMCACHE_EXTENSION_LOADED) {
+                    Logger::error(__CLASS__, "init", "The Memcache extension package must be installed!");
+                    return;
+                }
+                break;
+            case "memcached":
+                if (!MEMCACHED_EXTENSION_LOADED) {
+                    Logger::error(__CLASS__, "init", "The Memcached extension package must be installed!");
+                    return;
+                }
+                break;
+            case "redis":
+                if (!REDIS_EXTENSION_LOADED) {
+                    Logger::error(__CLASS__, "init", "The Redis extension package must be installed!");
+                    return;
+                }
+                break;
+            case "xcache":
+                if (!XCACHE_EXTENSION_LOADED) {
+                    Logger::error(__CLASS__, "init", "The XCache extension package must be installed!");
+                    return;
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    /**
+     * @param $namespace
+     * @return Cache\ApcCache|Cache\MemcacheCache|Cache\MemcachedCache|Cache\XcacheCache|null|Ext\PydioApcuCache|Ext\PydioRedisCache
+     */
+    private function initCacheWithNamespace($namespace){
+        $cacheDriver    = null;
+        $emptyContext   = Context::emptyContext();
+        $driverOptions  = $this->getContextualOption($emptyContext, "DRIVER");
+        $cachePrefix    = $this->getContextualOption($emptyContext, "CACHE_PREFIX");
+
+        if(!is_array($driverOptions) || (!isset($driverOptions["driver"]) && !isSet($driverOptions["group_switch_value"]))){
+            return null;
+        }else{
+            if(!isSet($driverOptions["driver"]) && isSet($driverOptions["group_switch_value"])){
+                $driverOptions["driver"] = $driverOptions["group_switch_value"];
+            }
+        }
+
+        switch ($driverOptions['driver']) {
+            case "apc":
+                $cacheDriver = $this->_apc_init($driverOptions);
+                break;
+            case "memcache":
+                $cacheDriver = $this->_memcache_init($driverOptions);
+                break;
+            case "memcached":
+                $cacheDriver = $this->_memcached_init($driverOptions);
+                break;
+            case "redis":
+                $cacheDriver = $this->_redis_init($driverOptions);
+                break;
+            case "xcache":
+                $cacheDriver = $this->_xcache_init($driverOptions);
+                break;
+            default:
+                break;
+        }
+
+        if(empty($cacheDriver)){
+            return null;
+        }
+
+        if(empty($cachePrefix)){
+            $cachePrefix = StringHelper::slugify(ApplicationState::detectServerURL(true));
+        }
+
+        $cachePrefix .= "_".$namespace."_";
+
+        // Using chained array for nodes
+        if ($namespace == AJXP_CACHE_SERVICE_NS_NODES) {
+            $arrayCache = new Ext\PydioArrayCache();
+
+            $cacheDriver = new PydioChainCache([
+                $arrayCache,
+                $cacheDriver
+            ]);
+        }
+
+        $cacheDriver->setNamespace($cachePrefix);
+        return $cacheDriver;
+
+    }
+
+    /**
+     * @param $options
+     * @return Cache\ApcCache|Ext\PydioApcuCache
+     */
+    public function _apc_init($options) {
+        if (extension_loaded('apcu')) {
+            $cacheDriver = new Ext\PydioApcuCache();
+        } else {
+            $cacheDriver = new Cache\ApcCache();
+        }
+        return $cacheDriver;
+    }
+
+    /**
+     * @param $options
+     * @return Cache\MemcacheCache|null
+     */
+    public function _memcache_init($options) {
+        $memcache = new \Memcache();
+        @$running = $memcache->connect($options['MEMCACHE_HOSTNAME'], $options['MEMCACHE_PORT']);
+
+        if (! $running) return null;
+
+        $cacheDriver = new Cache\MemcacheCache();
+        $cacheDriver->setMemcache($memcache);
+        return $cacheDriver;
+    }
+
+    /**
+     * @param $options
+     * @return Cache\MemcachedCache|null
+     */
+    public function _memcached_init($options) {
+        $memcached = new \Memcached();
+        @$running = $memcached->addServer($options['MEMCACHED_HOSTNAME'], $options['MEMCACHED_PORT']);
+
+        if (! $running) return null;
+
+        $cacheDriver = new Cache\MemcachedCache();
+        $cacheDriver->setMemcached($memcached);
+        return $cacheDriver;
+    }
+
+    /**
+     * @param $options
+     * @return null|Ext\PydioRedisCache
+     */
+    public function _redis_init($options) {
+        $redis = new \Redis();
+        @$running = $redis->connect($options['REDIS_HOSTNAME'], $options['REDIS_PORT']);
+
+        if (! $running) return null;
+
+        $cacheDriver = new Ext\PydioRedisCache();
+        $cacheDriver->setRedis($redis);
+        return $cacheDriver;
+    }
+
+    /**
+     * @param $options
+     * @return Cache\XcacheCache
+     */
+    public function _xcache_init($options) {
+        $cacheDriver = new Cache\XcacheCache();
+        return $cacheDriver;
+    }
+
+}
diff --git a/core/src/plugins/cache.doctrine/class.DoctrineCacheDriver.php b/core/src/plugins/cache.doctrine/class.DoctrineCacheDriver.php
deleted file mode 100644
index aa5c04195f..0000000000
--- a/core/src/plugins/cache.doctrine/class.DoctrineCacheDriver.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-require __DIR__ . "/doctrine/vendor/autoload.php";
-
-define('APC_EXTENSION_LOADED', extension_loaded('apc') || extension_loaded('apcu'));
-define('MEMCACHE_EXTENSION_LOADED', extension_loaded('memcache'));
-define('MEMCACHED_EXTENSION_LOADED', extension_loaded('memcached'));
-define('REDIS_EXTENSION_LOADED', extension_loaded('redis'));
-define('XCACHE_EXTENSION_LOADED', extension_loaded('xcache'));
-
-use \Doctrine\Common\Cache;
-use \Pydio\Plugins\Cache\Doctrine\Ext;
-
-/**
- * Standard Memcache driver
- * @package AjaXplorer_Plugins
- * @subpackage Log
- */
-class doctrineCacheDriver extends AbstractCacheDriver
-{
-
-    /**
-     * @param string $namespace
-     * @return Cache\CacheProvider
-     */
-    public function getCacheDriver($namespace = AJXP_CACHE_SERVICE_NS_SHARED){
-
-        if(!isSet($this->namespacedCaches[$namespace])){
-            $this->namespacedCaches[$namespace] = $this->initCacheWithNamespace($namespace);
-        }
-        return $this->namespacedCaches[$namespace];
-
-    }
-
-    /**
-     * Initialise the cache driver based on config
-     *
-     * @param array $options array of options specific to the cache driver.
-     * @access public
-     * @return null
-     */
-    public function init($options)
-    {
-        parent::init($options);
-
-        $driverOptions = $this->getFilteredOption("DRIVER");
-        if(!is_array($driverOptions) || !isset($driverOptions['driver'])){
-            return;
-        }
-
-        switch ($driverOptions['driver']) {
-            case "apc":
-                if (!APC_EXTENSION_LOADED) {
-                    AJXP_Logger::error(__CLASS__, "init", "The APC extension package must be installed!");
-                    return;
-                }
-                break;
-            case "memcache":
-                if (!MEMCACHE_EXTENSION_LOADED) {
-                    AJXP_Logger::error(__CLASS__, "init", "The Memcache extension package must be installed!");
-                    return;
-                }
-                break;
-            case "memcached":
-                if (!MEMCACHED_EXTENSION_LOADED) {
-                    AJXP_Logger::error(__CLASS__, "init", "The Memcached extension package must be installed!");
-                    return;
-                }
-                break;
-            case "redis":
-                if (!REDIS_EXTENSION_LOADED) {
-                    AJXP_Logger::error(__CLASS__, "init", "The Redis extension package must be installed!");
-                    return;
-                }
-                break;
-            case "xcache":
-                if (!XCACHE_EXTENSION_LOADED) {
-                    AJXP_Logger::error(__CLASS__, "init", "The XCache extension package must be installed!");
-                    return;
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-    private function initCacheWithNamespace($namespace){
-        $cacheDriver = null;
-        $driverOptions = $this->getFilteredOption("DRIVER");
-        $cachePrefix = $this->getFilteredOption("CACHE_PREFIX");
-
-        if(!is_array($driverOptions) || !isset($driverOptions['driver'])){
-            return null;
-        }
-
-        switch ($driverOptions['driver']) {
-            case "apc":
-                $cacheDriver = $this->_apc_init($driverOptions);
-                break;
-            case "memcache":
-                $cacheDriver = $this->_memcache_init($driverOptions);
-                break;
-            case "memcached":
-                $cacheDriver = $this->_memcached_init($driverOptions);
-                break;
-            case "redis":
-                $cacheDriver = $this->_redis_init($driverOptions);
-                break;
-            case "xcache":
-                $cacheDriver = $this->_xcache_init($driverOptions);
-                break;
-            default:
-                break;
-        }
-
-        if(empty($cacheDriver)){
-            return null;
-        }
-
-        if(empty($cachePrefix)){
-            $cachePrefix = AJXP_Utils::slugify(AJXP_Utils::detectServerURL(true));
-        }
-        $cachePrefix .= "_".$namespace."_";
-        $cacheDriver->setNamespace($cachePrefix);
-        return $cacheDriver;
-
-    }
-
-    public function _apc_init($options) {
-        if (extension_loaded('apcu')) {
-            require_once ("ext/PydioApcuCache.php");
-            $cacheDriver = new Ext\PydioApcuCache();
-        } else {
-            $cacheDriver = new Cache\ApcCache();
-        }
-        return $cacheDriver;
-    }
-
-    public function _memcache_init($options) {
-        $memcache = new Memcache();
-        @$running = $memcache->connect($options['MEMCACHE_HOSTNAME'], $options['MEMCACHE_PORT']);
-
-        if (! $running) return null;
-
-        $cacheDriver = new Cache\MemcacheCache();
-        $cacheDriver->setMemcache($memcache);
-        return $cacheDriver;
-    }
-
-    public function _memcached_init($options) {
-        $memcached = new Memcached();
-        @$running = $memcached->addServer($options['MEMCACHED_HOSTNAME'], $options['MEMCACHED_PORT']);
-
-        if (! $running) return null;
-
-        $cacheDriver = new Cache\MemcachedCache();
-        $cacheDriver->setMemcached($memcached);
-        return $cacheDriver;
-    }
-
-    public function _redis_init($options) {
-        $redis = new Redis();
-        @$running = $redis->connect($options['REDIS_HOSTNAME'], $options['REDIS_PORT']);
-
-        if (! $running) return null;
-
-        require_once "ext/PydioRedisCache.php";
-        $cacheDriver = new Ext\PydioRedisCache();
-        $cacheDriver->setRedis($redis);
-        return $cacheDriver;
-    }
-
-    public function _xcache_init($options) {
-        $cacheDriver = new Cache\XcacheCache();
-        return $cacheDriver;
-    }
-
-}
diff --git a/core/src/plugins/cache.doctrine/composer.json b/core/src/plugins/cache.doctrine/composer.json
new file mode 100644
index 0000000000..9dfa9b611b
--- /dev/null
+++ b/core/src/plugins/cache.doctrine/composer.json
@@ -0,0 +1,10 @@
+{
+  "require": {
+      "doctrine/cache": "*"
+  },
+  "autoload": {
+    "psr-4": {
+      "Pydio\\Cache\\Doctrine\\Ext\\": "./src"
+    }
+  }
+}
diff --git a/core/src/plugins/cache.doctrine/doctrine/composer.lock b/core/src/plugins/cache.doctrine/composer.lock
similarity index 100%
rename from core/src/plugins/cache.doctrine/doctrine/composer.lock
rename to core/src/plugins/cache.doctrine/composer.lock
diff --git a/core/src/plugins/cache.doctrine/doctrine/composer.json b/core/src/plugins/cache.doctrine/doctrine/composer.json
deleted file mode 100644
index 51c774b4fc..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/composer.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "require": {
-        "doctrine/cache": "*"
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/autoload.php b/core/src/plugins/cache.doctrine/doctrine/vendor/autoload.php
deleted file mode 100644
index df8d2aa5c5..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/autoload.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-// autoload.php @generated by Composer
-
-require_once __DIR__ . '/composer' . '/autoload_real.php';
-
-return ComposerAutoloaderInit4bc137430010115d1364cb6bdd1d28d7::getLoader();
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/composer/ClassLoader.php b/core/src/plugins/cache.doctrine/doctrine/vendor/composer/ClassLoader.php
deleted file mode 100644
index ff6ecfb822..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/composer/ClassLoader.php
+++ /dev/null
@@ -1,413 +0,0 @@
-<?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;
-
-    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;
-    }
-
-    /**
-     * 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)
-    {
-        // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
-        if ('\\' == $class[0]) {
-            $class = substr($class, 1);
-        }
-
-        // class map lookup
-        if (isset($this->classMap[$class])) {
-            return $this->classMap[$class];
-        }
-        if ($this->classMapAuthoritative) {
-            return false;
-        }
-
-        $file = $this->findFileWithExtension($class, '.php');
-
-        // Search for Hack files if we are running on HHVM
-        if ($file === null && defined('HHVM_VERSION')) {
-            $file = $this->findFileWithExtension($class, '.hh');
-        }
-
-        if ($file === null) {
-            // Remember that this class does not exist.
-            return $this->classMap[$class] = false;
-        }
-
-        return $file;
-    }
-
-    private function findFileWithExtension($class, $ext)
-    {
-        // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
-
-        $first = $class[0];
-        if (isset($this->prefixLengthsPsr4[$first])) {
-            foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
-                            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;
-        }
-    }
-}
-
-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- */
-function includeFile($file)
-{
-    include $file;
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/composer/LICENSE b/core/src/plugins/cache.doctrine/doctrine/vendor/composer/LICENSE
deleted file mode 100644
index c8d57af8b2..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/composer/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-
-Copyright (c) 2015 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/src/plugins/cache.doctrine/doctrine/vendor/composer/autoload_classmap.php b/core/src/plugins/cache.doctrine/doctrine/vendor/composer/autoload_classmap.php
deleted file mode 100644
index 7a91153b0d..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/composer/autoload_classmap.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-// autoload_classmap.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-);
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/composer/autoload_namespaces.php b/core/src/plugins/cache.doctrine/doctrine/vendor/composer/autoload_namespaces.php
deleted file mode 100644
index b7fc0125db..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/composer/autoload_namespaces.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-// autoload_namespaces.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-);
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/composer/autoload_psr4.php b/core/src/plugins/cache.doctrine/doctrine/vendor/composer/autoload_psr4.php
deleted file mode 100644
index 02f7cfd705..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/composer/autoload_psr4.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-// autoload_psr4.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-    'Doctrine\\Common\\Cache\\' => array($vendorDir . '/doctrine/cache/lib/Doctrine/Common/Cache'),
-);
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/composer/autoload_real.php b/core/src/plugins/cache.doctrine/doctrine/vendor/composer/autoload_real.php
deleted file mode 100644
index f58b55f299..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/composer/autoload_real.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-// autoload_real.php @generated by Composer
-
-class ComposerAutoloaderInit4bc137430010115d1364cb6bdd1d28d7
-{
-    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('ComposerAutoloaderInit4bc137430010115d1364cb6bdd1d28d7', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit4bc137430010115d1364cb6bdd1d28d7', 'loadClassLoader'));
-
-        $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);
-
-        return $loader;
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/composer/installed.json b/core/src/plugins/cache.doctrine/doctrine/vendor/composer/installed.json
deleted file mode 100644
index d1165376aa..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/composer/installed.json
+++ /dev/null
@@ -1,74 +0,0 @@
-[
-    {
-        "name": "doctrine/cache",
-        "version": "v1.6.0",
-        "version_normalized": "1.6.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/doctrine/cache.git",
-            "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/doctrine/cache/zipball/f8af318d14bdb0eff0336795b428b547bd39ccb6",
-            "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6",
-            "shasum": ""
-        },
-        "require": {
-            "php": "~5.5|~7.0"
-        },
-        "conflict": {
-            "doctrine/common": ">2.2,<2.4"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.8|~5.0",
-            "predis/predis": "~1.0",
-            "satooshi/php-coveralls": "~0.6"
-        },
-        "time": "2015-12-31 16:37:02",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.6.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache"
-            }
-        },
-        "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": "Caching library offering an object-oriented API for many cache backends",
-        "homepage": "http://www.doctrine-project.org",
-        "keywords": [
-            "cache",
-            "caching"
-        ]
-    }
-]
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/.coveralls.yml b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/.coveralls.yml
deleted file mode 100644
index 0c08233606..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/.coveralls.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-# for php-coveralls
-service_name: travis-ci
-src_dir: lib
-coverage_clover: build/logs/clover.xml
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/.gitignore b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/.gitignore
deleted file mode 100644
index ca2302312b..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-vendor/
-build/
-phpunit.xml
-composer.lock
\ No newline at end of file
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/.travis.yml b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/.travis.yml
deleted file mode 100644
index a16fd9d930..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/.travis.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-language: php
-
-sudo: false
-
-cache:
-    directories:
-        - vendor
-        - $HOME/.composer/cache
-
-php:
-    - 5.5
-    - 5.6
-    - 7.0
-    - hhvm
-
-services:
-    - riak
-    - mongodb
-    - memcached
-    - redis-server
-
-before_install:
-    - if [[ $TRAVIS_PHP_VERSION != 'hhvm' ]] ; then pecl channel-update pecl.php.net; fi;
-    - if [[ $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then pecl install riak-beta; fi;
-    - if [[ $TRAVIS_PHP_VERSION =~ 5.[56] ]] ; then echo yes | pecl install apcu-4.0.10; fi;
-    - if [[ $TRAVIS_PHP_VERSION = 7.* ]] ; then pecl config-set preferred_state beta; echo yes | pecl install apcu; fi;
-    - if [[ $TRAVIS_PHP_VERSION != 'hhvm' ]]; then phpenv config-add ./tests/travis/php.ini; fi;
-
-install:
-    - travis_retry composer install
-
-script:
-    - ./vendor/bin/phpunit -c ./tests/travis/phpunit.travis.xml -v
-
-after_script:
-    - php vendor/bin/coveralls -v
-
-matrix:
-    fast_finish: true
-    allow_failures:
-        - php: hhvm
-        - php: 7.0
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/LICENSE b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/LICENSE
deleted file mode 100644
index 8c38cc1bc2..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2006-2015 Doctrine Project
-
-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/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/README.md b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/README.md
deleted file mode 100644
index 94f80a30ee..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Doctrine Cache
-
-Master: [![Build Status](https://secure.travis-ci.org/doctrine/cache.png?branch=master)](http://travis-ci.org/doctrine/cache) [![Coverage Status](https://coveralls.io/repos/doctrine/cache/badge.png?branch=master)](https://coveralls.io/r/doctrine/cache?branch=master)
-
-[![Latest Stable Version](https://poser.pugx.org/doctrine/cache/v/stable.png)](https://packagist.org/packages/doctrine/cache) [![Total Downloads](https://poser.pugx.org/doctrine/cache/downloads.png)](https://packagist.org/packages/doctrine/cache)
-
-Cache component extracted from the Doctrine Common project.
-
-## Changelog
-
-### v1.2
-
-* Added support for MongoDB as Cache Provider
-* Fix namespace version reset
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/UPGRADE.md b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/UPGRADE.md
deleted file mode 100644
index e1f8a503ee..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/UPGRADE.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Upgrade to 1.4
-
-## Minor BC Break: `Doctrine\Common\Cache\FileCache#$extension` is now `private`.
-
-If you need to override the value of `Doctrine\Common\Cache\FileCache#$extension`, then use the
-second parameter of `Doctrine\Common\Cache\FileCache#__construct()` instead of overriding
-the property in your own implementation.
-
-## Minor BC Break: file based caches paths changed
-
-`Doctrine\Common\Cache\FileCache`, `Doctrine\Common\Cache\PhpFileCache` and
-`Doctrine\Common\Cache\FilesystemCache` are using a different cache paths structure.
-
-If you rely on warmed up caches for deployments, consider that caches generated
-with `doctrine/cache` `<1.4` are not compatible with the new directory structure,
-and will be ignored.
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/build.properties b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/build.properties
deleted file mode 100644
index 2d98c360aa..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# Version class and file
-project.version_class = Doctrine\\Common\\Cache\\Version
-project.version_file = lib/Doctrine/Common/Cache/Version.php
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/build.xml b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/build.xml
deleted file mode 100644
index e7774109ed..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/build.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0"?>
-<project name="DoctrineCommonCache" default="build" basedir="">
-    <property file="build.properties" />
-
-    <target name="php">
-        <exec executable="which" outputproperty="php_executable">
-            <arg value="php" />
-        </exec>
-    </target>
-
-    <target name="prepare">
-        <mkdir dir="build" />
-    </target>
-
-    <target name="build" depends="check-git-checkout-clean,prepare,php,composer">
-        <exec executable="${php_executable}">
-            <arg value="build/composer.phar" />
-            <arg value="archive" />
-            <arg value="--dir=build" />
-        </exec>
-    </target>
-
-    <target name="composer" depends="php,composer-check,composer-download">
-        <exec executable="${php_executable}">
-            <arg value="build/composer.phar" />
-            <arg value="install" />
-        </exec>
-    </target>
-
-    <target name="composer-check" depends="prepare">
-        <available file="build/composer.phar" property="composer.present"/>
-    </target>
-
-    <target name="composer-download" unless="composer.present">
-        <exec executable="wget">
-            <arg value="-Obuild/composer.phar" />
-            <arg value="http://getcomposer.org/composer.phar" />
-        </exec>
-    </target>
-
-    <target name="make-release" depends="check-git-checkout-clean,prepare,php">
-        <replace file="${project.version_file}" token="-DEV" value="" failOnNoReplacements="true" />
-        <exec executable="git" failonerror="true" outputproperty="current_git_branch">
-            <arg value="rev-parse" />
-            <arg value="--abbrev-ref" />
-            <arg value="HEAD" />
-        </exec>
-        <exec executable="${php_executable}" outputproperty="doctrine.current_version" failonerror="true">
-            <arg value="-r" />
-            <arg value="require_once '${project.version_file}';echo ${project.version_class}::VERSION;" />
-        </exec>
-        <exec executable="${php_executable}" outputproperty="doctrine.next_version" failonerror="true">
-            <arg value="-r" />
-            <arg value="$parts = explode('.', str_ireplace(array('-DEV', '-ALPHA', '-BETA'), '', '${doctrine.current_version}'));
-                if (count($parts) != 3) {
-                    throw new \InvalidArgumentException('Version is assumed in format x.y.z, ${doctrine.current_version} given');
-                }
-                if ('${current_git_branch}' === 'master') {
-                    $parts[1]++;
-                } else {
-                    $parts[2]++;
-                }
-                echo implode('.', $parts);
-            " />
-        </exec>
-
-        <git-commit file="${project.version_file}" message="Release ${doctrine.current_version}" />
-        <git-tag version="${doctrine.current_version}" />
-        <replace file="${project.version_file}" token="${doctrine.current_version}" value="${doctrine.next_version}-DEV" />
-        <git-commit file="${project.version_file}" message="Bump version to ${doctrine.next_version}" />
-    </target>
-
-    <target name="check-git-checkout-clean">
-        <exec executable="git" failonerror="true">
-            <arg value="diff-index" />
-            <arg value="--quiet" />
-            <arg value="HEAD" />
-        </exec>
-    </target>
-
-    <macrodef name="git-commit">
-        <attribute name="file" default="NOT SET"/>
-        <attribute name="message" default="NOT SET"/>
-
-        <sequential>
-            <exec executable="git">
-                <arg value="add" />
-                <arg value="@{file}" />
-            </exec>
-            <exec executable="git">
-                <arg value="commit" />
-                <arg value="-m" />
-                <arg value="@{message}" />
-            </exec>
-        </sequential>
-    </macrodef>
-
-    <macrodef name="git-tag">
-        <attribute name="version" default="NOT SET" />
-
-        <sequential>
-            <exec executable="git">
-                <arg value="tag" />
-                <arg value="-m" />
-                <arg value="v@{version}" />
-                <arg value="v@{version}" />
-            </exec>
-        </sequential>
-    </macrodef>
-</project>
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/composer.json b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/composer.json
deleted file mode 100644
index 7ef1727a10..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/composer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "name": "doctrine/cache",
-    "type": "library",
-    "description": "Caching library offering an object-oriented API for many cache backends",
-    "keywords": ["cache", "caching"],
-    "homepage": "http://www.doctrine-project.org",
-    "license": "MIT",
-    "authors": [
-        {"name": "Guilherme Blanco", "email": "guilhermeblanco@gmail.com"},
-        {"name": "Roman Borschel", "email": "roman@code-factory.org"},
-        {"name": "Benjamin Eberlei", "email": "kontakt@beberlei.de"},
-        {"name": "Jonathan Wage", "email": "jonwage@gmail.com"},
-        {"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"}
-    ],
-    "require": {
-        "php": "~5.5|~7.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit":         "~4.8|~5.0",
-        "satooshi/php-coveralls":  "~0.6",
-        "predis/predis":           "~1.0"
-    },
-    "conflict": {
-        "doctrine/common": ">2.2,<2.4"
-    },
-    "autoload": {
-        "psr-4": { "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache" }
-    },
-    "autoload-dev": {
-        "psr-4": { "Doctrine\\Tests\\": "tests/Doctrine/Tests" }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.6.x-dev"
-        }
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ApcCache.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ApcCache.php
deleted file mode 100644
index 7c617f33da..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ApcCache.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/*
- * 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
- * OWNER 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.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-/**
- * APC cache provider.
- *
- * @link       www.doctrine-project.org
- * @deprecated since version 1.6, use ApcuCache instead
- * @since      2.0
- * @author     Benjamin Eberlei <kontakt@beberlei.de>
- * @author     Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author     Jonathan Wage <jonwage@gmail.com>
- * @author     Roman Borschel <roman@code-factory.org>
- * @author     David Abdemoulaie <dave@hobodave.com>
- */
-class ApcCache extends CacheProvider
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        return apc_fetch($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return apc_exists($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        return apc_store($id, $data, $lifeTime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        // apc_delete returns false if the id does not exist
-        return apc_delete($id) || ! apc_exists($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        return apc_clear_cache() && apc_clear_cache('user');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetchMultiple(array $keys)
-    {
-        return apc_fetch($keys);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSaveMultiple(array $keysAndValues, $lifetime = 0)
-    {
-        $result = apc_store($keysAndValues, null, $lifetime);
-
-        return empty($result);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $info = apc_cache_info('', true);
-        $sma  = apc_sma_info();
-
-        // @TODO - Temporary fix @see https://github.com/krakjoe/apcu/pull/42
-        if (PHP_VERSION_ID >= 50500) {
-            $info['num_hits']   = isset($info['num_hits'])   ? $info['num_hits']   : $info['nhits'];
-            $info['num_misses'] = isset($info['num_misses']) ? $info['num_misses'] : $info['nmisses'];
-            $info['start_time'] = isset($info['start_time']) ? $info['start_time'] : $info['stime'];
-        }
-
-        return array(
-            Cache::STATS_HITS             => $info['num_hits'],
-            Cache::STATS_MISSES           => $info['num_misses'],
-            Cache::STATS_UPTIME           => $info['start_time'],
-            Cache::STATS_MEMORY_USAGE     => $info['mem_size'],
-            Cache::STATS_MEMORY_AVAILABLE => $sma['avail_mem'],
-        );
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ApcuCache.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ApcuCache.php
deleted file mode 100644
index d86e1be375..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ApcuCache.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/*
- * 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
- * OWNER 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.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-/**
- * APCu cache provider.
- *
- * @link   www.doctrine-project.org
- * @since  1.6
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-class ApcuCache extends CacheProvider
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        return apcu_fetch($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return apcu_exists($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        return apcu_store($id, $data, $lifeTime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        // apcu_delete returns false if the id does not exist
-        return apcu_delete($id) || ! apcu_exists($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        return apcu_clear_cache();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetchMultiple(array $keys)
-    {
-        return apcu_fetch($keys);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSaveMultiple(array $keysAndValues, $lifetime = 0)
-    {
-        $result = apcu_store($keysAndValues, null, $lifetime);
-
-        return empty($result);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $info = apcu_cache_info(true);
-        $sma  = apcu_sma_info();
-
-        return array(
-            Cache::STATS_HITS             => $info['num_hits'],
-            Cache::STATS_MISSES           => $info['num_misses'],
-            Cache::STATS_UPTIME           => $info['start_time'],
-            Cache::STATS_MEMORY_USAGE     => $info['mem_size'],
-            Cache::STATS_MEMORY_AVAILABLE => $sma['avail_mem'],
-        );
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ArrayCache.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ArrayCache.php
deleted file mode 100644
index 6610cc2173..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ArrayCache.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-/*
- * 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
- * OWNER 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.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-/**
- * Array cache driver.
- *
- * @link   www.doctrine-project.org
- * @since  2.0
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author David Abdemoulaie <dave@hobodave.com>
- */
-class ArrayCache extends CacheProvider
-{
-    /**
-     * @var array[] $data each element being a tuple of [$data, $expiration], where the expiration is int|bool
-     */
-    private $data = [];
-
-    /**
-     * @var int
-     */
-    private $hitsCount = 0;
-
-    /**
-     * @var int
-     */
-    private $missesCount = 0;
-
-    /**
-     * @var int
-     */
-    private $upTime;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct()
-    {
-        $this->upTime = time();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        if (! $this->doContains($id)) {
-            $this->missesCount += 1;
-
-            return false;
-        }
-
-        $this->hitsCount += 1;
-
-        return $this->data[$id][0];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        if (! isset($this->data[$id])) {
-            return false;
-        }
-
-        $expiration = $this->data[$id][1];
-
-        if ($expiration && $expiration < time()) {
-            $this->doDelete($id);
-
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        $this->data[$id] = [$data, $lifeTime ? time() + $lifeTime : false];
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        unset($this->data[$id]);
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        $this->data = [];
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        return [
-            Cache::STATS_HITS             => $this->hitsCount,
-            Cache::STATS_MISSES           => $this->missesCount,
-            Cache::STATS_UPTIME           => $this->upTime,
-            Cache::STATS_MEMORY_USAGE     => null,
-            Cache::STATS_MEMORY_AVAILABLE => null,
-        ];
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Cache.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Cache.php
deleted file mode 100644
index 89fe32307f..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Cache.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/*
- * 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
- * OWNER 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.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-/**
- * Interface for cache drivers.
- *
- * @link   www.doctrine-project.org
- * @since  2.0
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author Fabio B. Silva <fabio.bat.silva@gmail.com>
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
-interface Cache
-{
-    const STATS_HITS             = 'hits';
-    const STATS_MISSES           = 'misses';
-    const STATS_UPTIME           = 'uptime';
-    const STATS_MEMORY_USAGE     = 'memory_usage';
-    const STATS_MEMORY_AVAILABLE = 'memory_available';
-    /**
-     * Only for backward compatibility (may be removed in next major release)
-     *
-     * @deprecated
-     */
-    const STATS_MEMORY_AVAILIABLE = 'memory_available';
-
-    /**
-     * Fetches an entry from the cache.
-     *
-     * @param string $id The id of the cache entry to fetch.
-     *
-     * @return mixed The cached data or FALSE, if no cache entry exists for the given id.
-     */
-    public function fetch($id);
-
-    /**
-     * Tests if an entry exists in the cache.
-     *
-     * @param string $id The cache id of the entry to check for.
-     *
-     * @return bool TRUE if a cache entry exists for the given cache id, FALSE otherwise.
-     */
-    public function contains($id);
-
-    /**
-     * Puts data into the cache.
-     *
-     * If a cache entry with the given id already exists, its data will be replaced.
-     *
-     * @param string $id       The cache id.
-     * @param mixed  $data     The cache entry/data.
-     * @param int    $lifeTime The lifetime in number of seconds for this cache entry.
-     *                         If zero (the default), the entry never expires (although it may be deleted from the cache
-     *                         to make place for other entries).
-     *
-     * @return bool TRUE if the entry was successfully stored in the cache, FALSE otherwise.
-     */
-    public function save($id, $data, $lifeTime = 0);
-
-    /**
-     * Deletes a cache entry.
-     *
-     * @param string $id The cache id.
-     *
-     * @return bool TRUE if the cache entry was successfully deleted, FALSE otherwise.
-     *              Deleting a non-existing entry is considered successful.
-     */
-    public function delete($id);
-
-    /**
-     * Retrieves cached information from the data store.
-     *
-     * The server's statistics array has the following values:
-     *
-     * - <b>hits</b>
-     * Number of keys that have been requested and found present.
-     *
-     * - <b>misses</b>
-     * Number of items that have been requested and not found.
-     *
-     * - <b>uptime</b>
-     * Time that the server is running.
-     *
-     * - <b>memory_usage</b>
-     * Memory used by this server to store items.
-     *
-     * - <b>memory_available</b>
-     * Memory allowed to use for storage.
-     *
-     * @since 2.2
-     *
-     * @return array|null An associative array with server's statistics if available, NULL otherwise.
-     */
-    public function getStats();
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/CacheProvider.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/CacheProvider.php
deleted file mode 100644
index 9f579237a6..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/CacheProvider.php
+++ /dev/null
@@ -1,312 +0,0 @@
-<?php
-/*
- * 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
- * OWNER 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.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-/**
- * Base class for cache provider implementations.
- *
- * @since  2.2
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author Fabio B. Silva <fabio.bat.silva@gmail.com>
- */
-abstract class CacheProvider implements Cache, FlushableCache, ClearableCache, MultiGetCache, MultiPutCache
-{
-    const DOCTRINE_NAMESPACE_CACHEKEY = 'DoctrineNamespaceCacheKey[%s]';
-
-    /**
-     * The namespace to prefix all cache ids with.
-     *
-     * @var string
-     */
-    private $namespace = '';
-
-    /**
-     * The namespace version.
-     *
-     * @var integer|null
-     */
-    private $namespaceVersion;
-
-    /**
-     * Sets the namespace to prefix all cache ids with.
-     *
-     * @param string $namespace
-     *
-     * @return void
-     */
-    public function setNamespace($namespace)
-    {
-        $this->namespace        = (string) $namespace;
-        $this->namespaceVersion = null;
-    }
-
-    /**
-     * Retrieves the namespace that prefixes all cache ids.
-     *
-     * @return string
-     */
-    public function getNamespace()
-    {
-        return $this->namespace;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function fetch($id)
-    {
-        return $this->doFetch($this->getNamespacedId($id));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function fetchMultiple(array $keys)
-    {
-        if (empty($keys)) {
-            return array();
-        }
-        
-        // note: the array_combine() is in place to keep an association between our $keys and the $namespacedKeys
-        $namespacedKeys = array_combine($keys, array_map(array($this, 'getNamespacedId'), $keys));
-        $items          = $this->doFetchMultiple($namespacedKeys);
-        $foundItems     = array();
-
-        // no internal array function supports this sort of mapping: needs to be iterative
-        // this filters and combines keys in one pass
-        foreach ($namespacedKeys as $requestedKey => $namespacedKey) {
-            if (isset($items[$namespacedKey]) || array_key_exists($namespacedKey, $items)) {
-                $foundItems[$requestedKey] = $items[$namespacedKey];
-            }
-        }
-
-        return $foundItems;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function saveMultiple(array $keysAndValues, $lifetime = 0)
-    {
-        $namespacedKeysAndValues = array();
-        foreach ($keysAndValues as $key => $value) {
-            $namespacedKeysAndValues[$this->getNamespacedId($key)] = $value;
-        }
-
-        return $this->doSaveMultiple($namespacedKeysAndValues, $lifetime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function contains($id)
-    {
-        return $this->doContains($this->getNamespacedId($id));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function save($id, $data, $lifeTime = 0)
-    {
-        return $this->doSave($this->getNamespacedId($id), $data, $lifeTime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function delete($id)
-    {
-        return $this->doDelete($this->getNamespacedId($id));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getStats()
-    {
-        return $this->doGetStats();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function flushAll()
-    {
-        return $this->doFlush();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function deleteAll()
-    {
-        $namespaceCacheKey = $this->getNamespaceCacheKey();
-        $namespaceVersion  = $this->getNamespaceVersion() + 1;
-
-        if ($this->doSave($namespaceCacheKey, $namespaceVersion)) {
-            $this->namespaceVersion = $namespaceVersion;
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Prefixes the passed id with the configured namespace value.
-     *
-     * @param string $id The id to namespace.
-     *
-     * @return string The namespaced id.
-     */
-    private function getNamespacedId($id)
-    {
-        $namespaceVersion  = $this->getNamespaceVersion();
-
-        return sprintf('%s[%s][%s]', $this->namespace, $id, $namespaceVersion);
-    }
-
-    /**
-     * Returns the namespace cache key.
-     *
-     * @return string
-     */
-    private function getNamespaceCacheKey()
-    {
-        return sprintf(self::DOCTRINE_NAMESPACE_CACHEKEY, $this->namespace);
-    }
-
-    /**
-     * Returns the namespace version.
-     *
-     * @return integer
-     */
-    private function getNamespaceVersion()
-    {
-        if (null !== $this->namespaceVersion) {
-            return $this->namespaceVersion;
-        }
-
-        $namespaceCacheKey = $this->getNamespaceCacheKey();
-        $this->namespaceVersion = $this->doFetch($namespaceCacheKey) ?: 1;
-
-        return $this->namespaceVersion;
-    }
-
-    /**
-     * Default implementation of doFetchMultiple. Each driver that supports multi-get should owerwrite it.
-     *
-     * @param array $keys Array of keys to retrieve from cache
-     * @return array Array of values retrieved for the given keys.
-     */
-    protected function doFetchMultiple(array $keys)
-    {
-        $returnValues = array();
-
-        foreach ($keys as $key) {
-            if (false !== ($item = $this->doFetch($key)) || $this->doContains($key)) {
-                $returnValues[$key] = $item;
-            }
-        }
-
-        return $returnValues;
-    }
-
-    /**
-     * Fetches an entry from the cache.
-     *
-     * @param string $id The id of the cache entry to fetch.
-     *
-     * @return mixed|false The cached data or FALSE, if no cache entry exists for the given id.
-     */
-    abstract protected function doFetch($id);
-
-    /**
-     * Tests if an entry exists in the cache.
-     *
-     * @param string $id The cache id of the entry to check for.
-     *
-     * @return bool TRUE if a cache entry exists for the given cache id, FALSE otherwise.
-     */
-    abstract protected function doContains($id);
-
-    /**
-     * Default implementation of doSaveMultiple. Each driver that supports multi-put should override it.
-     *
-     * @param array $keysAndValues  Array of keys and values to save in cache
-     * @param int   $lifetime       The lifetime. If != 0, sets a specific lifetime for these
-     *                              cache entries (0 => infinite lifeTime).
-     *
-     * @return bool TRUE if the operation was successful, FALSE if it wasn't.
-     */
-    protected function doSaveMultiple(array $keysAndValues, $lifetime = 0)
-    {
-        $success = true;
-
-        foreach ($keysAndValues as $key => $value) {
-            if (!$this->doSave($key, $value, $lifetime)) {
-                $success = false;
-            }
-        }
-
-        return $success;
-    }
-
-    /**
-     * Puts data into the cache.
-     *
-     * @param string $id       The cache id.
-     * @param string $data     The cache entry/data.
-     * @param int    $lifeTime The lifetime. If != 0, sets a specific lifetime for this
-     *                           cache entry (0 => infinite lifeTime).
-     *
-     * @return bool TRUE if the entry was successfully stored in the cache, FALSE otherwise.
-     */
-    abstract protected function doSave($id, $data, $lifeTime = 0);
-
-    /**
-     * Deletes a cache entry.
-     *
-     * @param string $id The cache id.
-     *
-     * @return bool TRUE if the cache entry was successfully deleted, FALSE otherwise.
-     */
-    abstract protected function doDelete($id);
-
-    /**
-     * Flushes all cache entries.
-     *
-     * @return bool TRUE if the cache entries were successfully flushed, FALSE otherwise.
-     */
-    abstract protected function doFlush();
-
-    /**
-     * Retrieves cached information from the data store.
-     *
-     * @since 2.2
-     *
-     * @return array|null An associative array with server's statistics if available, NULL otherwise.
-     */
-    abstract protected function doGetStats();
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ChainCache.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ChainCache.php
deleted file mode 100644
index 96c9b5479f..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ChainCache.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-/*
- * 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
- * OWNER 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.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-/**
- * Cache provider that allows to easily chain multiple cache providers
- *
- * @author Michaël Gallego <mic.gallego@gmail.com>
- */
-class ChainCache extends CacheProvider
-{
-    /**
-     * @var CacheProvider[]
-     */
-    private $cacheProviders = array();
-
-    /**
-     * Constructor
-     *
-     * @param CacheProvider[] $cacheProviders
-     */
-    public function __construct($cacheProviders = array())
-    {
-        $this->cacheProviders = $cacheProviders;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setNamespace($namespace)
-    {
-        parent::setNamespace($namespace);
-
-        foreach ($this->cacheProviders as $cacheProvider) {
-            $cacheProvider->setNamespace($namespace);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doFetch($id)
-    {
-        foreach ($this->cacheProviders as $key => $cacheProvider) {
-            if ($cacheProvider->doContains($id)) {
-                $value = $cacheProvider->doFetch($id);
-
-                // We populate all the previous cache layers (that are assumed to be faster)
-                for ($subKey = $key - 1 ; $subKey >= 0 ; $subKey--) {
-                    $this->cacheProviders[$subKey]->doSave($id, $value);
-                }
-
-                return $value;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doContains($id)
-    {
-        foreach ($this->cacheProviders as $cacheProvider) {
-            if ($cacheProvider->doContains($id)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        $stored = true;
-
-        foreach ($this->cacheProviders as $cacheProvider) {
-            $stored = $cacheProvider->doSave($id, $data, $lifeTime) && $stored;
-        }
-
-        return $stored;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doDelete($id)
-    {
-        $deleted = true;
-
-        foreach ($this->cacheProviders as $cacheProvider) {
-            $deleted = $cacheProvider->doDelete($id) && $deleted;
-        }
-
-        return $deleted;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doFlush()
-    {
-        $flushed = true;
-
-        foreach ($this->cacheProviders as $cacheProvider) {
-            $flushed = $cacheProvider->doFlush() && $flushed;
-        }
-
-        return $flushed;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doGetStats()
-    {
-        // We return all the stats from all adapters
-        $stats = array();
-
-        foreach ($this->cacheProviders as $cacheProvider) {
-            $stats[] = $cacheProvider->doGetStats();
-        }
-
-        return $stats;
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ClearableCache.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ClearableCache.php
deleted file mode 100644
index 3a91eaf3a2..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ClearableCache.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/*
- * 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
- * OWNER 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.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-/**
- * Interface for cache that can be flushed.
- *
- * Intended to be used for partial clearing of a cache namespace. For a more
- * global "flushing", see {@see FlushableCache}.
- *
- * @link   www.doctrine-project.org
- * @since  1.4
- * @author Adirelle <adirelle@gmail.com>
- */
-interface ClearableCache
-{
-    /**
-     * Deletes all cache entries in the current cache namespace.
-     *
-     * @return bool TRUE if the cache entries were successfully deleted, FALSE otherwise.
-     */
-    public function deleteAll();
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/CouchbaseCache.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/CouchbaseCache.php
deleted file mode 100644
index c21691df96..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/CouchbaseCache.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/*
- * 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
- * OWNER 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.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-use \Couchbase;
-
-/**
- * Couchbase cache provider.
- *
- * @link   www.doctrine-project.org
- * @since  2.4
- * @author Michael Nitschinger <michael@nitschinger.at>
- */
-class CouchbaseCache extends CacheProvider
-{
-    /**
-     * @var Couchbase|null
-     */
-    private $couchbase;
-
-    /**
-     * Sets the Couchbase instance to use.
-     *
-     * @param Couchbase $couchbase
-     *
-     * @return void
-     */
-    public function setCouchbase(Couchbase $couchbase)
-    {
-        $this->couchbase = $couchbase;
-    }
-
-    /**
-     * Gets the Couchbase instance used by the cache.
-     *
-     * @return Couchbase|null
-     */
-    public function getCouchbase()
-    {
-        return $this->couchbase;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        return $this->couchbase->get($id) ?: false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return (null !== $this->couchbase->get($id));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        if ($lifeTime > 30 * 24 * 3600) {
-            $lifeTime = time() + $lifeTime;
-        }
-        return $this->couchbase->set($id, $data, (int) $lifeTime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        return $this->couchbase->delete($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        return $this->couchbase->flush();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $stats   = $this->couchbase->getStats();
-        $servers = $this->couchbase->getServers();
-        $server  = explode(":", $servers[0]);
-        $key     = $server[0] . ":" . "11210";
-        $stats   = $stats[$key];
-        return array(
-            Cache::STATS_HITS   => $stats['get_hits'],
-            Cache::STATS_MISSES => $stats['get_misses'],
-            Cache::STATS_UPTIME => $stats['uptime'],
-            Cache::STATS_MEMORY_USAGE     => $stats['bytes'],
-            Cache::STATS_MEMORY_AVAILABLE => $stats['limit_maxbytes'],
-        );
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FileCache.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FileCache.php
deleted file mode 100644
index b2e0427e59..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FileCache.php
+++ /dev/null
@@ -1,286 +0,0 @@
-<?php
-/*
- * 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
- * OWNER 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.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-/**
- * Base file cache driver.
- *
- * @since  2.3
- * @author Fabio B. Silva <fabio.bat.silva@gmail.com>
- * @author Tobias Schultze <http://tobion.de>
- */
-abstract class FileCache extends CacheProvider
-{
-    /**
-     * The cache directory.
-     *
-     * @var string
-     */
-    protected $directory;
-
-    /**
-     * The cache file extension.
-     *
-     * @var string
-     */
-    private $extension;
-
-    /**
-     * @var int
-     */
-    private $umask;
-
-    /**
-     * @var int
-     */
-    private $directoryStringLength;
-
-    /**
-     * @var int
-     */
-    private $extensionStringLength;
-
-    /**
-     * @var bool
-     */
-    private $isRunningOnWindows;
-
-    /**
-     * Constructor.
-     *
-     * @param string $directory The cache directory.
-     * @param string $extension The cache file extension.
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function __construct($directory, $extension = '', $umask = 0002)
-    {
-        // YES, this needs to be *before* createPathIfNeeded()
-        if ( ! is_int($umask)) {
-            throw new \InvalidArgumentException(sprintf(
-                'The umask parameter is required to be integer, was: %s',
-                gettype($umask)
-            ));
-        }
-        $this->umask = $umask;
-
-        if ( ! $this->createPathIfNeeded($directory)) {
-            throw new \InvalidArgumentException(sprintf(
-                'The directory "%s" does not exist and could not be created.',
-                $directory
-            ));
-        }
-
-        if ( ! is_writable($directory)) {
-            throw new \InvalidArgumentException(sprintf(
-                'The directory "%s" is not writable.',
-                $directory
-            ));
-        }
-
-        // YES, this needs to be *after* createPathIfNeeded()
-        $this->directory = realpath($directory);
-        $this->extension = (string) $extension;
-
-        $this->directoryStringLength = strlen($this->directory);
-        $this->extensionStringLength = strlen($this->extension);
-        $this->isRunningOnWindows    = defined('PHP_WINDOWS_VERSION_BUILD');
-    }
-
-    /**
-     * Gets the cache directory.
-     *
-     * @return string
-     */
-    public function getDirectory()
-    {
-        return $this->directory;
-    }
-
-    /**
-     * Gets the cache file extension.
-     *
-     * @return string
-     */
-    public function getExtension()
-    {
-        return $this->extension;
-    }
-
-    /**
-     * @param string $id
-     *
-     * @return string
-     */
-    protected function getFilename($id)
-    {
-        $hash = hash('sha256', $id);
-
-        // This ensures that the filename is unique and that there are no invalid chars in it.
-        if (
-            '' === $id
-            || ((strlen($id) * 2 + $this->extensionStringLength) > 255)
-            || ($this->isRunningOnWindows && ($this->directoryStringLength + 4 + strlen($id) * 2 + $this->extensionStringLength) > 258)
-        ) {
-            // Most filesystems have a limit of 255 chars for each path component. On Windows the the whole path is limited
-            // to 260 chars (including terminating null char). Using long UNC ("\\?\" prefix) does not work with the PHP API.
-            // And there is a bug in PHP (https://bugs.php.net/bug.php?id=70943) with path lengths of 259.
-            // So if the id in hex representation would surpass the limit, we use the hash instead. The prefix prevents
-            // collisions between the hash and bin2hex.
-            $filename = '_' . $hash;
-        } else {
-            $filename = bin2hex($id);
-        }
-
-        return $this->directory
-            . DIRECTORY_SEPARATOR
-            . substr($hash, 0, 2)
-            . DIRECTORY_SEPARATOR
-            . $filename
-            . $this->extension;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        $filename = $this->getFilename($id);
-
-        return @unlink($filename) || ! file_exists($filename);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        foreach ($this->getIterator() as $name => $file) {
-            if ($file->isDir()) {
-                // Remove the intermediate directories which have been created to balance the tree. It only takes effect
-                // if the directory is empty. If several caches share the same directory but with different file extensions,
-                // the other ones are not removed.
-                @rmdir($name);
-            } elseif ($this->isFilenameEndingWithExtension($name)) {
-                // If an extension is set, only remove files which end with the given extension.
-                // If no extension is set, we have no other choice than removing everything.
-                @unlink($name);
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $usage = 0;
-        foreach ($this->getIterator() as $name => $file) {
-            if (! $file->isDir() && $this->isFilenameEndingWithExtension($name)) {
-                $usage += $file->getSize();
-            }
-        }
-
-        $free = disk_free_space($this->directory);
-
-        return array(
-            Cache::STATS_HITS               => null,
-            Cache::STATS_MISSES             => null,
-            Cache::STATS_UPTIME             => null,
-            Cache::STATS_MEMORY_USAGE       => $usage,
-            Cache::STATS_MEMORY_AVAILABLE   => $free,
-        );
-    }
-
-    /**
-     * Create path if needed.
-     *
-     * @param string $path
-     * @return bool TRUE on success or if path already exists, FALSE if path cannot be created.
-     */
-    private function createPathIfNeeded($path)
-    {
-        if ( ! is_dir($path)) {
-            if (false === @mkdir($path, 0777 & (~$this->umask), true) && !is_dir($path)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Writes a string content to file in an atomic way.
-     *
-     * @param string $filename Path to the file where to write the data.
-     * @param string $content  The content to write
-     *
-     * @return bool TRUE on success, FALSE if path cannot be created, if path is not writable or an any other error.
-     */
-    protected function writeFile($filename, $content)
-    {
-        $filepath = pathinfo($filename, PATHINFO_DIRNAME);
-
-        if ( ! $this->createPathIfNeeded($filepath)) {
-            return false;
-        }
-
-        if ( ! is_writable($filepath)) {
-            return false;
-        }
-
-        $tmpFile = tempnam($filepath, 'swap');
-        @chmod($tmpFile, 0666 & (~$this->umask));
-
-        if (file_put_contents($tmpFile, $content) !== false) {
-            if (@rename($tmpFile, $filename)) {
-                return true;
-            }
-
-            @unlink($tmpFile);
-        }
-
-        return false;
-    }
-
-    /**
-     * @return \Iterator
-     */
-    private function getIterator()
-    {
-        return new \RecursiveIteratorIterator(
-            new \RecursiveDirectoryIterator($this->directory, \FilesystemIterator::SKIP_DOTS),
-            \RecursiveIteratorIterator::CHILD_FIRST
-        );
-    }
-
-    /**
-     * @param string $name The filename
-     *
-     * @return bool
-     */
-    private function isFilenameEndingWithExtension($name)
-    {
-        return '' === $this->extension
-            || strrpos($name, $this->extension) === (strlen($name) - $this->extensionStringLength);
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FilesystemCache.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FilesystemCache.php
deleted file mode 100644
index d988294f6f..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FilesystemCache.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/*
- * 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
- * OWNER 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.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-/**
- * Filesystem cache driver.
- *
- * @since  2.3
- * @author Fabio B. Silva <fabio.bat.silva@gmail.com>
- */
-class FilesystemCache extends FileCache
-{
-    const EXTENSION = '.doctrinecache.data';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct($directory, $extension = self::EXTENSION, $umask = 0002)
-    {
-        parent::__construct($directory, $extension, $umask);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        $data     = '';
-        $lifetime = -1;
-        $filename = $this->getFilename($id);
-
-        if ( ! is_file($filename)) {
-            return false;
-        }
-
-        $resource = fopen($filename, "r");
-
-        if (false !== ($line = fgets($resource))) {
-            $lifetime = (int) $line;
-        }
-
-        if ($lifetime !== 0 && $lifetime < time()) {
-            fclose($resource);
-
-            return false;
-        }
-
-        while (false !== ($line = fgets($resource))) {
-            $data .= $line;
-        }
-
-        fclose($resource);
-
-        return unserialize($data);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        $lifetime = -1;
-        $filename = $this->getFilename($id);
-
-        if ( ! is_file($filename)) {
-            return false;
-        }
-
-        $resource = fopen($filename, "r");
-
-        if (false !== ($line = fgets($resource))) {
-            $lifetime = (int) $line;
-        }
-
-        fclose($resource);
-
-        return $lifetime === 0 || $lifetime > time();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        if ($lifeTime > 0) {
-            $lifeTime = time() + $lifeTime;
-        }
-
-        $data      = serialize($data);
-        $filename  = $this->getFilename($id);
-
-        return $this->writeFile($filename, $lifeTime . PHP_EOL . $data);
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FlushableCache.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FlushableCache.php
deleted file mode 100644
index 4311d4f593..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/FlushableCache.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/*
- * 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
- * OWNER 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.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-/**
- * Interface for cache that can be flushed.
- *
- * @link   www.doctrine-project.org
- * @since  1.4
- * @author Adirelle <adirelle@gmail.com>
- */
-interface FlushableCache
-{
-    /**
-     * Flushes all cache entries, globally.
-     *
-     * @return bool TRUE if the cache entries were successfully flushed, FALSE otherwise.
-     */
-    public function flushAll();
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcacheCache.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcacheCache.php
deleted file mode 100644
index 8afaeeacc2..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcacheCache.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/*
- * 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
- * OWNER 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.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-use \Memcache;
-
-/**
- * Memcache cache provider.
- *
- * @link   www.doctrine-project.org
- * @since  2.0
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author David Abdemoulaie <dave@hobodave.com>
- */
-class MemcacheCache extends CacheProvider
-{
-    /**
-     * @var Memcache|null
-     */
-    private $memcache;
-
-    /**
-     * Sets the memcache instance to use.
-     *
-     * @param Memcache $memcache
-     *
-     * @return void
-     */
-    public function setMemcache(Memcache $memcache)
-    {
-        $this->memcache = $memcache;
-    }
-
-    /**
-     * Gets the memcache instance used by the cache.
-     *
-     * @return Memcache|null
-     */
-    public function getMemcache()
-    {
-        return $this->memcache;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        return $this->memcache->get($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        $flags = null;
-        $this->memcache->get($id, $flags);
-        
-        //if memcache has changed the value of "flags", it means the value exists
-        return ($flags !== null);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        if ($lifeTime > 30 * 24 * 3600) {
-            $lifeTime = time() + $lifeTime;
-        }
-        return $this->memcache->set($id, $data, 0, (int) $lifeTime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        // Memcache::delete() returns false if entry does not exist
-        return $this->memcache->delete($id) || ! $this->doContains($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        return $this->memcache->flush();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $stats = $this->memcache->getStats();
-        return array(
-            Cache::STATS_HITS   => $stats['get_hits'],
-            Cache::STATS_MISSES => $stats['get_misses'],
-            Cache::STATS_UPTIME => $stats['uptime'],
-            Cache::STATS_MEMORY_USAGE     => $stats['bytes'],
-            Cache::STATS_MEMORY_AVAILABLE => $stats['limit_maxbytes'],
-        );
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcachedCache.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcachedCache.php
deleted file mode 100644
index 408e452b90..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MemcachedCache.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-/*
- * 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
- * OWNER 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.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-use \Memcached;
-
-/**
- * Memcached cache provider.
- *
- * @link   www.doctrine-project.org
- * @since  2.2
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author David Abdemoulaie <dave@hobodave.com>
- */
-class MemcachedCache extends CacheProvider
-{
-    /**
-     * @var Memcached|null
-     */
-    private $memcached;
-
-    /**
-     * Sets the memcache instance to use.
-     *
-     * @param Memcached $memcached
-     *
-     * @return void
-     */
-    public function setMemcached(Memcached $memcached)
-    {
-        $this->memcached = $memcached;
-    }
-
-    /**
-     * Gets the memcached instance used by the cache.
-     *
-     * @return Memcached|null
-     */
-    public function getMemcached()
-    {
-        return $this->memcached;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        return $this->memcached->get($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetchMultiple(array $keys)
-    {
-        return $this->memcached->getMulti($keys);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSaveMultiple(array $keysAndValues, $lifetime = 0)
-    {
-        if ($lifetime > 30 * 24 * 3600) {
-            $lifetime = time() + $lifetime;
-        }
-
-        return $this->memcached->setMulti($keysAndValues, null, $lifetime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return false !== $this->memcached->get($id)
-            || $this->memcached->getResultCode() !== Memcached::RES_NOTFOUND;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        if ($lifeTime > 30 * 24 * 3600) {
-            $lifeTime = time() + $lifeTime;
-        }
-        return $this->memcached->set($id, $data, (int) $lifeTime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        return $this->memcached->delete($id)
-            || $this->memcached->getResultCode() === Memcached::RES_NOTFOUND;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        return $this->memcached->flush();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $stats   = $this->memcached->getStats();
-        $servers = $this->memcached->getServerList();
-        $key     = $servers[0]['host'] . ':' . $servers[0]['port'];
-        $stats   = $stats[$key];
-        return array(
-            Cache::STATS_HITS   => $stats['get_hits'],
-            Cache::STATS_MISSES => $stats['get_misses'],
-            Cache::STATS_UPTIME => $stats['uptime'],
-            Cache::STATS_MEMORY_USAGE     => $stats['bytes'],
-            Cache::STATS_MEMORY_AVAILABLE => $stats['limit_maxbytes'],
-        );
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MongoDBCache.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MongoDBCache.php
deleted file mode 100644
index 75fe0ca113..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MongoDBCache.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-/*
- * 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
- * OWNER 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.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-use MongoBinData;
-use MongoCollection;
-use MongoCursorException;
-use MongoDate;
-
-/**
- * MongoDB cache provider.
- *
- * @since  1.1
- * @author Jeremy Mikola <jmikola@gmail.com>
- */
-class MongoDBCache extends CacheProvider
-{
-    /**
-     * The data field will store the serialized PHP value.
-     */
-    const DATA_FIELD = 'd';
-
-    /**
-     * The expiration field will store a MongoDate value indicating when the
-     * cache entry should expire.
-     *
-     * With MongoDB 2.2+, entries can be automatically deleted by MongoDB by
-     * indexing this field with the "expireAfterSeconds" option equal to zero.
-     * This will direct MongoDB to regularly query for and delete any entries
-     * whose date is older than the current time. Entries without a date value
-     * in this field will be ignored.
-     *
-     * The cache provider will also check dates on its own, in case expired
-     * entries are fetched before MongoDB's TTLMonitor pass can expire them.
-     *
-     * @see http://docs.mongodb.org/manual/tutorial/expire-data/
-     */
-    const EXPIRATION_FIELD = 'e';
-
-    /**
-     * @var MongoCollection
-     */
-    private $collection;
-
-    /**
-     * Constructor.
-     *
-     * This provider will default to the write concern and read preference
-     * options set on the MongoCollection instance (or inherited from MongoDB or
-     * MongoClient). Using an unacknowledged write concern (< 1) may make the
-     * return values of delete() and save() unreliable. Reading from secondaries
-     * may make contain() and fetch() unreliable.
-     *
-     * @see http://www.php.net/manual/en/mongo.readpreferences.php
-     * @see http://www.php.net/manual/en/mongo.writeconcerns.php
-     * @param MongoCollection $collection
-     */
-    public function __construct(MongoCollection $collection)
-    {
-        $this->collection = $collection;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        $document = $this->collection->findOne(array('_id' => $id), array(self::DATA_FIELD, self::EXPIRATION_FIELD));
-
-        if ($document === null) {
-            return false;
-        }
-
-        if ($this->isExpired($document)) {
-            $this->doDelete($id);
-            return false;
-        }
-
-        return unserialize($document[self::DATA_FIELD]->bin);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        $document = $this->collection->findOne(array('_id' => $id), array(self::EXPIRATION_FIELD));
-
-        if ($document === null) {
-            return false;
-        }
-
-        if ($this->isExpired($document)) {
-            $this->doDelete($id);
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        try {
-            $result = $this->collection->update(
-                array('_id' => $id),
-                array('$set' => array(
-                    self::EXPIRATION_FIELD => ($lifeTime > 0 ? new MongoDate(time() + $lifeTime) : null),
-                    self::DATA_FIELD => new MongoBinData(serialize($data), MongoBinData::BYTE_ARRAY),
-                )),
-                array('upsert' => true, 'multiple' => false)
-            );
-        } catch (MongoCursorException $e) {
-            return false;
-        }
-
-        return isset($result['ok']) ? $result['ok'] == 1 : true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        $result = $this->collection->remove(array('_id' => $id));
-
-        return isset($result['ok']) ? $result['ok'] == 1 : true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        // Use remove() in lieu of drop() to maintain any collection indexes
-        $result = $this->collection->remove();
-
-        return isset($result['ok']) ? $result['ok'] == 1 : true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $serverStatus = $this->collection->db->command(array(
-            'serverStatus' => 1,
-            'locks' => 0,
-            'metrics' => 0,
-            'recordStats' => 0,
-            'repl' => 0,
-        ));
-
-        $collStats = $this->collection->db->command(array('collStats' => 1));
-
-        return array(
-            Cache::STATS_HITS => null,
-            Cache::STATS_MISSES => null,
-            Cache::STATS_UPTIME => (isset($serverStatus['uptime']) ? (int) $serverStatus['uptime'] : null),
-            Cache::STATS_MEMORY_USAGE => (isset($collStats['size']) ? (int) $collStats['size'] : null),
-            Cache::STATS_MEMORY_AVAILABLE  => null,
-        );
-    }
-
-    /**
-     * Check if the document is expired.
-     *
-     * @param array $document
-     *
-     * @return bool
-     */
-    private function isExpired(array $document)
-    {
-        return isset($document[self::EXPIRATION_FIELD]) &&
-            $document[self::EXPIRATION_FIELD] instanceof MongoDate &&
-            $document[self::EXPIRATION_FIELD]->sec < time();
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MultiGetCache.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MultiGetCache.php
deleted file mode 100644
index df7146d78e..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MultiGetCache.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/*
- * 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
- * OWNER 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.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-/**
- * Interface for cache drivers that allows to get many items at once.
- *
- * @link   www.doctrine-project.org
- * @since  1.4
- * @author Asmir Mustafic <goetas@gmail.com>
- */
-interface MultiGetCache
-{
-    /**
-     * Returns an associative array of values for keys is found in cache.
-     *
-     * @param string[] $keys Array of keys to retrieve from cache
-     * @return mixed[] Array of retrieved values, indexed by the specified keys.
-     *                 Values that couldn't be retrieved are not contained in this array.
-     */
-    function fetchMultiple(array $keys);
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MultiPutCache.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MultiPutCache.php
deleted file mode 100644
index bf87ea9f1c..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/MultiPutCache.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/*
- * 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
- * OWNER 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.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-/**
- * Interface for cache drivers that allows to put many items at once.
- *
- * @link   www.doctrine-project.org
- * @since  1.6
- * @author Daniel Gorgan <danut007ro@gmail.com>
- */
-interface MultiPutCache
-{
-    /**
-     * Returns a boolean value indicating if the operation succeeded.
-     *
-     * @param array $keysAndValues  Array of keys and values to save in cache
-     * @param int   $lifetime       The lifetime. If != 0, sets a specific lifetime for these
-     *                              cache entries (0 => infinite lifeTime).
-     *
-     * @return bool TRUE if the operation was successful, FALSE if it wasn't.
-     */
-    function saveMultiple(array $keysAndValues, $lifetime = 0);
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/PhpFileCache.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/PhpFileCache.php
deleted file mode 100644
index 5e7519674e..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/PhpFileCache.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/*
- * 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
- * OWNER 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.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-/**
- * Php file cache driver.
- *
- * @since  2.3
- * @author Fabio B. Silva <fabio.bat.silva@gmail.com>
- */
-class PhpFileCache extends FileCache
-{
-    const EXTENSION = '.doctrinecache.php';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct($directory, $extension = self::EXTENSION, $umask = 0002)
-    {
-        parent::__construct($directory, $extension, $umask);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        $value = $this->includeFileForId($id);
-
-        if (! $value) {
-            return false;
-        }
-
-        if ($value['lifetime'] !== 0 && $value['lifetime'] < time()) {
-            return false;
-        }
-
-        return $value['data'];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        $value = $this->includeFileForId($id);
-
-        if (! $value) {
-            return false;
-        }
-
-        return $value['lifetime'] === 0 || $value['lifetime'] > time();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        if ($lifeTime > 0) {
-            $lifeTime = time() + $lifeTime;
-        }
-
-        if (is_object($data) && ! method_exists($data, '__set_state')) {
-            throw new \InvalidArgumentException(
-                "Invalid argument given, PhpFileCache only allows objects that implement __set_state() " .
-                "and fully support var_export(). You can use the FilesystemCache to save arbitrary object " .
-                "graphs using serialize()/deserialize()."
-            );
-        }
-
-        $filename  = $this->getFilename($id);
-
-        $value = array(
-            'lifetime'  => $lifeTime,
-            'data'      => $data
-        );
-
-        $value  = var_export($value, true);
-        $code   = sprintf('<?php return %s;', $value);
-
-        return $this->writeFile($filename, $code);
-    }
-
-    /**
-     * @param string $id
-     *
-     * @return array|false
-     */
-    private function includeFileForId($id)
-    {
-        $fileName = $this->getFilename($id);
-
-        // note: error suppression is still faster than `file_exists`, `is_file` and `is_readable`
-        $value = @include $fileName;
-
-        if (! isset($value['lifetime'])) {
-            return false;
-        }
-
-        return $value;
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/PredisCache.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/PredisCache.php
deleted file mode 100644
index 980e266060..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/PredisCache.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-namespace Doctrine\Common\Cache;
-
-use Predis\ClientInterface;
-
-/**
- * Predis cache provider.
- *
- * @author othillo <othillo@othillo.nl>
- */
-class PredisCache extends CacheProvider
-{
-    /**
-     * @var ClientInterface
-     */
-    private $client;
-
-    /**
-     * @param ClientInterface $client
-     *
-     * @return void
-     */
-    public function __construct(ClientInterface $client)
-    {
-        $this->client = $client;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        $result = $this->client->get($id);
-        if (null === $result) {
-            return false;
-        }
-
-        return unserialize($result);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetchMultiple(array $keys)
-    {
-        $fetchedItems = call_user_func_array(array($this->client, 'mget'), $keys);
-
-        return array_map('unserialize', array_filter(array_combine($keys, $fetchedItems)));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSaveMultiple(array $keysAndValues, $lifetime = 0)
-    {
-        if ($lifetime) {
-            $success = true;
-
-            // Keys have lifetime, use SETEX for each of them
-            foreach ($keysAndValues as $key => $value) {
-                $response = $this->client->setex($key, $lifetime, serialize($value));
-
-                if ((string) $response != 'OK') {
-                    $success = false;
-                }
-            }
-
-            return $success;
-        }
-
-        // No lifetime, use MSET
-        $response = $this->client->mset(array_map(function ($value) {
-            return serialize($value);
-        }, $keysAndValues));
-
-        return (string) $response == 'OK';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return $this->client->exists($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        $data = serialize($data);
-        if ($lifeTime > 0) {
-            $response = $this->client->setex($id, $lifeTime, $data);
-        } else {
-            $response = $this->client->set($id, $data);
-        }
-
-        return $response === true || $response == 'OK';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        return $this->client->del($id) >= 0;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        $response = $this->client->flushdb();
-
-        return $response === true || $response == 'OK';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $info = $this->client->info();
-
-        return array(
-            Cache::STATS_HITS              => $info['Stats']['keyspace_hits'],
-            Cache::STATS_MISSES            => $info['Stats']['keyspace_misses'],
-            Cache::STATS_UPTIME            => $info['Server']['uptime_in_seconds'],
-            Cache::STATS_MEMORY_USAGE      => $info['Memory']['used_memory'],
-            Cache::STATS_MEMORY_AVAILABLE  => false
-        );
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RedisCache.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RedisCache.php
deleted file mode 100644
index a4f0e6e416..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RedisCache.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-/*
- * 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
- * OWNER 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.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-use Redis;
-
-/**
- * Redis cache provider.
- *
- * @link   www.doctrine-project.org
- * @since  2.2
- * @author Osman Ungur <osmanungur@gmail.com>
- */
-class RedisCache extends CacheProvider
-{
-    /**
-     * @var Redis|null
-     */
-    private $redis;
-
-    /**
-     * Sets the redis instance to use.
-     *
-     * @param Redis $redis
-     *
-     * @return void
-     */
-    public function setRedis(Redis $redis)
-    {
-        $redis->setOption(Redis::OPT_SERIALIZER, $this->getSerializerValue());
-        $this->redis = $redis;
-    }
-
-    /**
-     * Gets the redis instance used by the cache.
-     *
-     * @return Redis|null
-     */
-    public function getRedis()
-    {
-        return $this->redis;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        return $this->redis->get($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetchMultiple(array $keys)
-    {
-        $fetchedItems = array_combine($keys, $this->redis->mget($keys));
-
-        // Redis mget returns false for keys that do not exist. So we need to filter those out unless it's the real data.
-        $foundItems   = array();
-
-        foreach ($fetchedItems as $key => $value) {
-            if (false !== $value || $this->redis->exists($key)) {
-                $foundItems[$key] = $value;
-            }
-        }
-
-        return $foundItems;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSaveMultiple(array $keysAndValues, $lifetime = 0)
-    {
-        if ($lifetime) {
-            $success = true;
-
-            // Keys have lifetime, use SETEX for each of them
-            foreach ($keysAndValues as $key => $value) {
-                if (!$this->redis->setex($key, $lifetime, $value)) {
-                    $success = false;
-                }
-            }
-
-            return $success;
-        }
-
-        // No lifetime, use MSET
-        return (bool) $this->redis->mset($keysAndValues);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return $this->redis->exists($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        if ($lifeTime > 0) {
-            return $this->redis->setex($id, $lifeTime, $data);
-        }
-
-        return $this->redis->set($id, $data);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        return $this->redis->delete($id) >= 0;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        return $this->redis->flushDB();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $info = $this->redis->info();
-        return array(
-            Cache::STATS_HITS   => $info['keyspace_hits'],
-            Cache::STATS_MISSES => $info['keyspace_misses'],
-            Cache::STATS_UPTIME => $info['uptime_in_seconds'],
-            Cache::STATS_MEMORY_USAGE      => $info['used_memory'],
-            Cache::STATS_MEMORY_AVAILABLE  => false
-        );
-    }
-
-    /**
-     * Returns the serializer constant to use. If Redis is compiled with
-     * igbinary support, that is used. Otherwise the default PHP serializer is
-     * used.
-     *
-     * @return integer One of the Redis::SERIALIZER_* constants
-     */
-    protected function getSerializerValue()
-    {
-        if (defined('HHVM_VERSION')) {
-            return Redis::SERIALIZER_PHP;
-        }
-        return defined('Redis::SERIALIZER_IGBINARY') ? Redis::SERIALIZER_IGBINARY : Redis::SERIALIZER_PHP;
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php
deleted file mode 100644
index 0baa3f2531..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/RiakCache.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-/*
- * 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
- * OWNER 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.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-use Riak\Bucket;
-use Riak\Connection;
-use Riak\Input;
-use Riak\Exception;
-use Riak\Object;
-
-/**
- * Riak cache provider.
- *
- * @link   www.doctrine-project.org
- * @since  1.1
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- */
-class RiakCache extends CacheProvider
-{
-    const EXPIRES_HEADER = 'X-Riak-Meta-Expires';
-
-    /**
-     * @var \Riak\Bucket
-     */
-    private $bucket;
-
-    /**
-     * Sets the riak bucket instance to use.
-     *
-     * @param \Riak\Bucket $bucket
-     */
-    public function __construct(Bucket $bucket)
-    {
-        $this->bucket = $bucket;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        try {
-            $response = $this->bucket->get($id);
-
-            // No objects found
-            if ( ! $response->hasObject()) {
-                return false;
-            }
-
-            // Check for attempted siblings
-            $object = ($response->hasSiblings())
-                ? $this->resolveConflict($id, $response->getVClock(), $response->getObjectList())
-                : $response->getFirstObject();
-
-            // Check for expired object
-            if ($this->isExpired($object)) {
-                $this->bucket->delete($object);
-
-                return false;
-            }
-
-            return unserialize($object->getContent());
-        } catch (Exception\RiakException $e) {
-            // Covers:
-            // - Riak\ConnectionException
-            // - Riak\CommunicationException
-            // - Riak\UnexpectedResponseException
-            // - Riak\NotFoundException
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        try {
-            // We only need the HEAD, not the entire object
-            $input = new Input\GetInput();
-
-            $input->setReturnHead(true);
-
-            $response = $this->bucket->get($id, $input);
-
-            // No objects found
-            if ( ! $response->hasObject()) {
-                return false;
-            }
-
-            $object = $response->getFirstObject();
-
-            // Check for expired object
-            if ($this->isExpired($object)) {
-                $this->bucket->delete($object);
-
-                return false;
-            }
-
-            return true;
-        } catch (Exception\RiakException $e) {
-            // Do nothing
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        try {
-            $object = new Object($id);
-
-            $object->setContent(serialize($data));
-
-            if ($lifeTime > 0) {
-                $object->addMetadata(self::EXPIRES_HEADER, (string) (time() + $lifeTime));
-            }
-
-            $this->bucket->put($object);
-
-            return true;
-        } catch (Exception\RiakException $e) {
-            // Do nothing
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        try {
-            $this->bucket->delete($id);
-
-            return true;
-        } catch (Exception\BadArgumentsException $e) {
-            // Key did not exist on cluster already
-        } catch (Exception\RiakException $e) {
-            // Covers:
-            // - Riak\Exception\ConnectionException
-            // - Riak\Exception\CommunicationException
-            // - Riak\Exception\UnexpectedResponseException
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        try {
-            $keyList = $this->bucket->getKeyList();
-
-            foreach ($keyList as $key) {
-                $this->bucket->delete($key);
-            }
-
-            return true;
-        } catch (Exception\RiakException $e) {
-            // Do nothing
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        // Only exposed through HTTP stats API, not Protocol Buffers API
-        return null;
-    }
-
-    /**
-     * Check if a given Riak Object have expired.
-     *
-     * @param \Riak\Object $object
-     *
-     * @return bool
-     */
-    private function isExpired(Object $object)
-    {
-        $metadataMap = $object->getMetadataMap();
-
-        return isset($metadataMap[self::EXPIRES_HEADER])
-            && $metadataMap[self::EXPIRES_HEADER] < time();
-    }
-
-    /**
-     * On-read conflict resolution. Applied approach here is last write wins.
-     * Specific needs may override this method to apply alternate conflict resolutions.
-     *
-     * {@internal Riak does not attempt to resolve a write conflict, and store
-     * it as sibling of conflicted one. By following this approach, it is up to
-     * the next read to resolve the conflict. When this happens, your fetched
-     * object will have a list of siblings (read as a list of objects).
-     * In our specific case, we do not care about the intermediate ones since
-     * they are all the same read from storage, and we do apply a last sibling
-     * (last write) wins logic.
-     * If by any means our resolution generates another conflict, it'll up to
-     * next read to properly solve it.}
-     *
-     * @param string $id
-     * @param string $vClock
-     * @param array  $objectList
-     *
-     * @return \Riak\Object
-     */
-    protected function resolveConflict($id, $vClock, array $objectList)
-    {
-        // Our approach here is last-write wins
-        $winner = $objectList[count($objectList)];
-
-        $putInput = new Input\PutInput();
-        $putInput->setVClock($vClock);
-
-        $mergedObject = new Object($id);
-        $mergedObject->setContent($winner->getContent());
-
-        $this->bucket->put($mergedObject, $putInput);
-
-        return $mergedObject;
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/SQLite3Cache.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/SQLite3Cache.php
deleted file mode 100644
index 0bf6e4d44a..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/SQLite3Cache.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-/*
- * 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
- * OWNER 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.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-use SQLite3;
-use SQLite3Result;
-
-/**
- * SQLite3 cache provider.
- *
- * @since  1.4
- * @author Jake Bell <jake@theunraveler.com>
- */
-class SQLite3Cache extends CacheProvider
-{
-    /**
-     * The ID field will store the cache key.
-     */
-    const ID_FIELD = 'k';
-
-    /**
-     * The data field will store the serialized PHP value.
-     */
-    const DATA_FIELD = 'd';
-
-    /**
-     * The expiration field will store a date value indicating when the
-     * cache entry should expire.
-     */
-    const EXPIRATION_FIELD = 'e';
-
-    /**
-     * @var SQLite3
-     */
-    private $sqlite;
-
-    /**
-     * @var string
-     */
-    private $table;
-
-    /**
-     * Constructor.
-     *
-     * Calling the constructor will ensure that the database file and table 
-     * exist and will create both if they don't.
-     *
-     * @param SQLite3 $sqlite
-     * @param string $table
-     */
-    public function __construct(SQLite3 $sqlite, $table)
-    {
-        $this->sqlite = $sqlite;
-        $this->table  = (string) $table;
-
-        list($id, $data, $exp) = $this->getFields();
-
-        return $this->sqlite->exec(sprintf(
-            'CREATE TABLE IF NOT EXISTS %s(%s TEXT PRIMARY KEY NOT NULL, %s BLOB, %s INTEGER)',
-            $table,
-            $id,
-            $data,
-            $exp
-        ));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        if ($item = $this->findById($id)) {
-            return unserialize($item[self::DATA_FIELD]);
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return null !== $this->findById($id, false);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        $statement = $this->sqlite->prepare(sprintf(
-            'INSERT OR REPLACE INTO %s (%s) VALUES (:id, :data, :expire)',
-            $this->table,
-            implode(',', $this->getFields())
-        ));
-
-        $statement->bindValue(':id', $id);
-        $statement->bindValue(':data', serialize($data), SQLITE3_BLOB);
-        $statement->bindValue(':expire', $lifeTime > 0 ? time() + $lifeTime : null);
-
-        return $statement->execute() instanceof SQLite3Result;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        list($idField) = $this->getFields();
-
-        $statement = $this->sqlite->prepare(sprintf(
-            'DELETE FROM %s WHERE %s = :id',
-            $this->table,
-            $idField
-        ));
-
-        $statement->bindValue(':id', $id);
-
-        return $statement->execute() instanceof SQLite3Result;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        return $this->sqlite->exec(sprintf('DELETE FROM %s', $this->table));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        // no-op.
-    }
-
-    /**
-     * Find a single row by ID.
-     *
-     * @param mixed $id
-     * @param bool $includeData
-     *
-     * @return array|null
-     */
-    private function findById($id, $includeData = true)
-    {
-        list($idField) = $fields = $this->getFields();
-
-        if (!$includeData) {
-            $key = array_search(static::DATA_FIELD, $fields);
-            unset($fields[$key]);
-        }
-
-        $statement = $this->sqlite->prepare(sprintf(
-            'SELECT %s FROM %s WHERE %s = :id LIMIT 1',
-            implode(',', $fields),
-            $this->table,
-            $idField
-        ));
-
-        $statement->bindValue(':id', $id, SQLITE3_TEXT);
-
-        $item = $statement->execute()->fetchArray(SQLITE3_ASSOC);
-
-        if ($item === false) {
-            return null;
-        }
-
-        if ($this->isExpired($item)) {
-            $this->doDelete($id);
-
-            return null;
-        }
-
-        return $item;
-    }
-
-    /**
-     * Gets an array of the fields in our table.
-     *
-     * @return array
-     */
-    private function getFields()
-    {
-        return array(static::ID_FIELD, static::DATA_FIELD, static::EXPIRATION_FIELD);
-    }
-
-    /**
-     * Check if the item is expired.
-     *
-     * @param array $item
-     *
-     * @return bool
-     */
-    private function isExpired(array $item)
-    {
-        return isset($item[static::EXPIRATION_FIELD]) &&
-            $item[self::EXPIRATION_FIELD] !== null &&
-            $item[self::EXPIRATION_FIELD] < time();
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Version.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Version.php
deleted file mode 100644
index eff259ae38..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/Version.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/*
- * 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
- * OWNER 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.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-class Version
-{
-    const VERSION = '1.6.0';
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/VoidCache.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/VoidCache.php
deleted file mode 100644
index 65e8456faa..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/VoidCache.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/*
- * 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
- * OWNER 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.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-/**
- * Void cache driver. The cache could be of use in tests where you don`t need to cache anything.
- *
- * @link   www.doctrine-project.org
- * @since  1.5
- * @author Kotlyar Maksim <kotlyar.maksim@gmail.com>
- */
-class VoidCache extends CacheProvider
-{
-    /**
-     * {@inheritDoc}
-     */
-    protected function doFetch($id)
-    {
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doContains($id)
-    {
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doDelete($id)
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doFlush()
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function doGetStats()
-    {
-        return;
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/WinCacheCache.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/WinCacheCache.php
deleted file mode 100644
index 8a250b29a8..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/WinCacheCache.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/*
- * 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
- * OWNER 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.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-/**
- * WinCache cache provider.
- *
- * @link   www.doctrine-project.org
- * @since  2.2
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author David Abdemoulaie <dave@hobodave.com>
- */
-class WinCacheCache extends CacheProvider
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        return wincache_ucache_get($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return wincache_ucache_exists($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        return wincache_ucache_set($id, $data, $lifeTime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        return wincache_ucache_delete($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        return wincache_ucache_clear();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetchMultiple(array $keys)
-    {
-        return wincache_ucache_get($keys);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSaveMultiple(array $keysAndValues, $lifetime = 0)
-    {
-        $result = wincache_ucache_set($keysAndValues, null, $lifetime);
-
-        return empty($result);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $info    = wincache_ucache_info();
-        $meminfo = wincache_ucache_meminfo();
-
-        return array(
-            Cache::STATS_HITS             => $info['total_hit_count'],
-            Cache::STATS_MISSES           => $info['total_miss_count'],
-            Cache::STATS_UPTIME           => $info['total_cache_uptime'],
-            Cache::STATS_MEMORY_USAGE     => $meminfo['memory_total'],
-            Cache::STATS_MEMORY_AVAILABLE => $meminfo['memory_free'],
-        );
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/XcacheCache.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/XcacheCache.php
deleted file mode 100644
index a2c4ca5662..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/XcacheCache.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-/*
- * 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
- * OWNER 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.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-/**
- * Xcache cache driver.
- *
- * @link   www.doctrine-project.org
- * @since  2.0
- * @author Benjamin Eberlei <kontakt@beberlei.de>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- * @author Jonathan Wage <jonwage@gmail.com>
- * @author Roman Borschel <roman@code-factory.org>
- * @author David Abdemoulaie <dave@hobodave.com>
- */
-class XcacheCache extends CacheProvider
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        return $this->doContains($id) ? unserialize(xcache_get($id)) : false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return xcache_isset($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        return xcache_set($id, serialize($data), (int) $lifeTime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        return xcache_unset($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        $this->checkAuthorization();
-
-        xcache_clear_cache(XC_TYPE_VAR);
-
-        return true;
-    }
-
-    /**
-     * Checks that xcache.admin.enable_auth is Off.
-     *
-     * @return void
-     *
-     * @throws \BadMethodCallException When xcache.admin.enable_auth is On.
-     */
-    protected function checkAuthorization()
-    {
-        if (ini_get('xcache.admin.enable_auth')) {
-            throw new \BadMethodCallException(
-                'To use all features of \Doctrine\Common\Cache\XcacheCache, '
-                . 'you must set "xcache.admin.enable_auth" to "Off" in your php.ini.'
-            );
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        $this->checkAuthorization();
-
-        $info = xcache_info(XC_TYPE_VAR, 0);
-        return array(
-            Cache::STATS_HITS   => $info['hits'],
-            Cache::STATS_MISSES => $info['misses'],
-            Cache::STATS_UPTIME => null,
-            Cache::STATS_MEMORY_USAGE      => $info['size'],
-            Cache::STATS_MEMORY_AVAILABLE  => $info['avail'],
-        );
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ZendDataCache.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ZendDataCache.php
deleted file mode 100644
index 6e35ac8236..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/lib/Doctrine/Common/Cache/ZendDataCache.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/*
- * 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
- * OWNER 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.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the MIT license. For more information, see
- * <http://www.doctrine-project.org>.
- */
-
-namespace Doctrine\Common\Cache;
-
-/**
- * Zend Data Cache cache driver.
- *
- * @link   www.doctrine-project.org
- * @since  2.0
- * @author Ralph Schindler <ralph.schindler@zend.com>
- * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
- */
-class ZendDataCache extends CacheProvider
-{
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch($id)
-    {
-        return zend_shm_cache_fetch($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doContains($id)
-    {
-        return (false !== zend_shm_cache_fetch($id));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave($id, $data, $lifeTime = 0)
-    {
-        return zend_shm_cache_store($id, $data, $lifeTime);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete($id)
-    {
-        return zend_shm_cache_delete($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFlush()
-    {
-        $namespace = $this->getNamespace();
-        if (empty($namespace)) {
-            return zend_shm_cache_clear();
-        }
-        return zend_shm_cache_clear($namespace);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doGetStats()
-    {
-        return null;
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/phpunit.xml.dist b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/phpunit.xml.dist
deleted file mode 100644
index 40cc24deea..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/phpunit.xml.dist
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-    backupGlobals="false"
-    colors="true"
-    bootstrap="vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="Doctrine Cache Test Suite">
-            <directory>./tests/Doctrine/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./lib/Doctrine/</directory>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ApcCacheTest.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ApcCacheTest.php
deleted file mode 100644
index 29af44d257..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ApcCacheTest.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Cache;
-
-use Doctrine\Common\Cache\ApcCache;
-
-/**
- * @requires extension apc
- */
-class ApcCacheTest extends CacheTest
-{
-    protected function _getCacheDriver()
-    {
-        return new ApcCache();
-    }
-
-    public function testLifetime()
-    {
-        $this->markTestSkipped('The APC cache TTL is not working in a single process/request. See https://bugs.php.net/bug.php?id=58084');
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ApcuCacheTest.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ApcuCacheTest.php
deleted file mode 100644
index b0e91c3af5..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ApcuCacheTest.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Cache;
-
-use Doctrine\Common\Cache\ApcuCache;
-
-/**
- * @requires extension apcu
- */
-class ApcuCacheTest extends CacheTest
-{
-    protected function _getCacheDriver()
-    {
-        return new ApcuCache();
-    }
-
-    public function testLifetime()
-    {
-        $this->markTestSkipped('The APC cache TTL is not working in a single process/request. See https://bugs.php.net/bug.php?id=58084');
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ArrayCacheTest.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ArrayCacheTest.php
deleted file mode 100644
index 3be94c6175..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ArrayCacheTest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Cache;
-
-use Doctrine\Common\Cache\ArrayCache;
-use Doctrine\Common\Cache\Cache;
-
-class ArrayCacheTest extends CacheTest
-{
-    protected function _getCacheDriver()
-    {
-        return new ArrayCache();
-    }
-
-    public function testGetStats()
-    {
-        $cache = $this->_getCacheDriver();
-        $cache->fetch('test1');
-        $cache->fetch('test2');
-        $cache->fetch('test3');
-
-        $cache->save('test1', 123);
-        $cache->save('test2', 123);
-
-        $cache->fetch('test1');
-        $cache->fetch('test2');
-        $cache->fetch('test3');
-
-        $stats = $cache->getStats();
-        $this->assertEquals(2, $stats[Cache::STATS_HITS]);
-        $this->assertEquals(5, $stats[Cache::STATS_MISSES]); // +1 for internal call to DoctrineNamespaceCacheKey
-        $this->assertNotNull($stats[Cache::STATS_UPTIME]);
-        $this->assertNull($stats[Cache::STATS_MEMORY_USAGE]);
-        $this->assertNull($stats[Cache::STATS_MEMORY_AVAILABLE]);
-
-        $cache->delete('test1');
-        $cache->delete('test2');
-
-        $cache->fetch('test1');
-        $cache->fetch('test2');
-        $cache->fetch('test3');
-
-        $stats = $cache->getStats();
-        $this->assertEquals(2, $stats[Cache::STATS_HITS]);
-        $this->assertEquals(8, $stats[Cache::STATS_MISSES]); // +1 for internal call to DoctrineNamespaceCacheKey
-    }
-
-    protected function isSharedStorage()
-    {
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/BaseFileCacheTest.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/BaseFileCacheTest.php
deleted file mode 100644
index 689452f24c..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/BaseFileCacheTest.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Cache;
-
-use RecursiveDirectoryIterator;
-use RecursiveIteratorIterator;
-
-abstract class BaseFileCacheTest extends CacheTest
-{
-    protected $directory;
-
-    protected function setUp()
-    {
-        do {
-            $this->directory = sys_get_temp_dir() . '/doctrine_cache_'. uniqid();
-        } while (file_exists($this->directory));
-    }
-
-    protected function tearDown()
-    {
-        if ( ! is_dir($this->directory)) {
-            return;
-        }
-
-        $iterator = new RecursiveDirectoryIterator($this->directory);
-
-        foreach (new RecursiveIteratorIterator($iterator, RecursiveIteratorIterator::CHILD_FIRST) as $file) {
-            if ($file->isFile()) {
-                @unlink($file->getRealPath());
-            } elseif ($file->isDir()) {
-                @rmdir($file->getRealPath());
-            }
-        }
-
-        @rmdir($this->directory);
-    }
-
-    public function testFlushAllRemovesBalancingDirectories()
-    {
-        $cache = $this->_getCacheDriver();
-
-        $this->assertTrue($cache->save('key1', 1));
-        $this->assertTrue($cache->save('key2', 2));
-        $this->assertTrue($cache->flushAll());
-
-        $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->directory, \FilesystemIterator::SKIP_DOTS), \RecursiveIteratorIterator::CHILD_FIRST);
-
-        $this->assertCount(0, $iterator);
-    }
-
-    protected function isSharedStorage()
-    {
-        return false;
-    }
-
-    public function getPathLengthsToTest()
-    {
-        // Windows officially supports 260 bytes including null terminator
-        // 258 bytes available to use due to php bug #70943
-        // Windows officially supports 260 bytes including null terminator
-        // 259 characters is too large due to PHP bug (https://bugs.php.net/bug.php?id=70943)
-        // 260 characters is too large - null terminator is included in allowable length
-        return array(
-            array(257, false),
-            array(258, false),
-            array(259, true),
-            array(260, true)
-        );
-    }
-
-    private static function getBasePathForWindowsPathLengthTests($pathLength)
-    {
-        return FileCacheTest::getBasePathForWindowsPathLengthTests($pathLength);
-    }
-
-    private static function getKeyAndPathFittingLength($length)
-    {
-        $basePath = self::getBasePathForWindowsPathLengthTests($length);
-
-        $baseDirLength = strlen($basePath);
-        $extensionLength = strlen('.doctrine.cache');
-        $directoryLength = strlen(DIRECTORY_SEPARATOR . 'aa' . DIRECTORY_SEPARATOR);
-        $namespaceAndBracketLength = strlen(bin2hex("[][1]"));
-        $keyLength = $length
-            - ($baseDirLength
-                + $extensionLength
-                + $directoryLength
-                + $namespaceAndBracketLength);
-
-        $key = str_repeat('a', floor($keyLength / 2));
-        $namespacedKey = '[' . $key . '][1]';
-
-        $keyHash = hash('sha256', $namespacedKey);
-
-        $keyPath = $basePath
-            . DIRECTORY_SEPARATOR
-            . substr($keyHash, 0, 2)
-            . DIRECTORY_SEPARATOR
-            . bin2hex($namespacedKey)
-            . '.doctrine.cache';
-
-        $hashedKeyPath = $basePath
-            . DIRECTORY_SEPARATOR
-            . substr($keyHash, 0, 2)
-            . DIRECTORY_SEPARATOR
-            . '_' . $keyHash
-            . '.doctrine.cache';
-
-        return array($key, $keyPath, $hashedKeyPath);
-    }
-
-    /**
-     * @dataProvider getPathLengthsToTest
-     */
-    public function testWindowsPathLengthLimitIsCorrectlyHandled($length, $pathShouldBeHashed)
-    {
-        $this->directory = self::getBasePathForWindowsPathLengthTests($length);
-
-        list($key, $keyPath, $hashedKeyPath) = self::getKeyAndPathFittingLength($length);
-
-        $this->assertEquals($length, strlen($keyPath), "Unhashed path should be of correct length.");
-
-        $cacheClass = get_class($this->_getCacheDriver());
-        $cache = new $cacheClass($this->directory, '.doctrine.cache');
-
-        // Trick it into thinking this is windows.
-        $reflClass = new \ReflectionClass('\Doctrine\Common\Cache\FileCache');
-        $reflProp = $reflClass->getProperty('isRunningOnWindows');
-        $reflProp->setAccessible(true);
-        $reflProp->setValue($cache, true);
-        $reflProp->setAccessible(false);
-
-        $cache->save($key, $length);
-        $fetched = $cache->fetch($key);
-        $this->assertEquals($length, $fetched);
-
-        if ($pathShouldBeHashed) {
-            $this->assertFileExists($hashedKeyPath, "Path generated for key should be hashed.");
-            unlink($hashedKeyPath);
-        } else {
-            $this->assertFileExists($keyPath, "Path generated for key should not be hashed.");
-            unlink($keyPath);
-        }
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/CacheProviderTest.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/CacheProviderTest.php
deleted file mode 100644
index 5e11652cc5..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/CacheProviderTest.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Cache;
-
-class CacheProviderTest extends \Doctrine\Tests\DoctrineTestCase
-{
-    public function testFetchMultiWillFilterNonRequestedKeys()
-    {
-        /* @var $cache \Doctrine\Common\Cache\CacheProvider|\PHPUnit_Framework_MockObject_MockObject */
-        $cache = $this->getMockForAbstractClass(
-            'Doctrine\Common\Cache\CacheProvider',
-            array(),
-            '',
-            true,
-            true,
-            true,
-            array('doFetchMultiple')
-        );
-
-        $cache
-            ->expects($this->once())
-            ->method('doFetchMultiple')
-            ->will($this->returnValue(array(
-                '[foo][1]' => 'bar',
-                '[bar][1]' => 'baz',
-                '[baz][1]' => 'tab',
-            )));
-
-        $this->assertEquals(
-            array('foo' => 'bar', 'bar' => 'baz'),
-            $cache->fetchMultiple(array('foo', 'bar'))
-        );
-    }
-
-    public function testFailedDeleteAllDoesNotChangeNamespaceVersion()
-    {
-        /* @var $cache \Doctrine\Common\Cache\CacheProvider|\PHPUnit_Framework_MockObject_MockObject */
-        $cache = $this->getMockForAbstractClass(
-            'Doctrine\Common\Cache\CacheProvider',
-            array(),
-            '',
-            true,
-            true,
-            true,
-            array('doFetch', 'doSave', 'doContains')
-        );
-
-        $cache
-            ->expects($this->once())
-            ->method('doFetch')
-            ->with('DoctrineNamespaceCacheKey[]')
-            ->will($this->returnValue(false));
-
-        // doSave is only called once from deleteAll as we do not need to persist the default version in getNamespaceVersion()
-        $cache
-            ->expects($this->once())
-            ->method('doSave')
-            ->with('DoctrineNamespaceCacheKey[]')
-            ->will($this->returnValue(false));
-
-        // After a failed deleteAll() the local namespace version is not increased (still 1). Otherwise all data written afterwards
-        // would be lost outside the current instance.
-        $cache
-            ->expects($this->once())
-            ->method('doContains')
-            ->with('[key][1]')
-            ->will($this->returnValue(true));
-
-        $this->assertFalse($cache->deleteAll(), 'deleteAll() returns false when saving the namespace version fails');
-        $cache->contains('key');
-    }
-
-    public function testSaveMultipleNoFail()
-    {
-        /* @var $cache \Doctrine\Common\Cache\CacheProvider|\PHPUnit_Framework_MockObject_MockObject */
-        $cache = $this->getMockForAbstractClass(
-            'Doctrine\Common\Cache\CacheProvider',
-            array(),
-            '',
-            true,
-            true,
-            true,
-            array('doSave')
-        );
-
-        $cache
-            ->expects($this->at(1))
-            ->method('doSave')
-            ->with('[kerr][1]', 'verr', 0)
-            ->will($this->returnValue(false));
-
-        $cache
-            ->expects($this->at(2))
-            ->method('doSave')
-            ->with('[kok][1]', 'vok', 0)
-            ->will($this->returnValue(true));
-
-        $cache->saveMultiple(array(
-            'kerr'  => 'verr',
-            'kok'   => 'vok',
-        ));
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/CacheTest.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/CacheTest.php
deleted file mode 100644
index 5dd64d7fd9..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/CacheTest.php
+++ /dev/null
@@ -1,463 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Cache;
-
-use Doctrine\Common\Cache\Cache;
-use ArrayObject;
-
-abstract class CacheTest extends \Doctrine\Tests\DoctrineTestCase
-{
-    /**
-     * @dataProvider provideDataToCache
-     */
-    public function testSetContainsFetchDelete($value)
-    {
-        $cache = $this->_getCacheDriver();
-
-        // Test saving a value, checking if it exists, and fetching it back
-        $this->assertTrue($cache->save('key', $value));
-        $this->assertTrue($cache->contains('key'));
-        if (is_object($value)) {
-            $this->assertEquals($value, $cache->fetch('key'), 'Objects retrieved from the cache must be equal but not necessarily the same reference');
-        } else {
-            $this->assertSame($value, $cache->fetch('key'), 'Scalar and array data retrieved from the cache must be the same as the original, e.g. same type');
-        }
-
-        // Test deleting a value
-        $this->assertTrue($cache->delete('key'));
-        $this->assertFalse($cache->contains('key'));
-        $this->assertFalse($cache->fetch('key'));
-    }
-
-    /**
-     * @dataProvider provideDataToCache
-     */
-    public function testUpdateExistingEntry($value)
-    {
-        $cache = $this->_getCacheDriver();
-
-        $this->assertTrue($cache->save('key', 'old-value'));
-        $this->assertTrue($cache->contains('key'));
-
-        $this->assertTrue($cache->save('key', $value));
-        $this->assertTrue($cache->contains('key'));
-        if (is_object($value)) {
-            $this->assertEquals($value, $cache->fetch('key'), 'Objects retrieved from the cache must be equal but not necessarily the same reference');
-        } else {
-            $this->assertSame($value, $cache->fetch('key'), 'Scalar and array data retrieved from the cache must be the same as the original, e.g. same type');
-        }
-    }
-
-    public function testCacheKeyIsCaseSensitive()
-    {
-        $cache = $this->_getCacheDriver();
-
-        $this->assertTrue($cache->save('key', 'value'));
-        $this->assertTrue($cache->contains('key'));
-        $this->assertSame('value', $cache->fetch('key'));
-
-        $this->assertFalse($cache->contains('KEY'));
-        $this->assertFalse($cache->fetch('KEY'));
-
-        $cache->delete('KEY');
-        $this->assertTrue($cache->contains('key', 'Deleting cache item with different case must not affect other cache item'));
-    }
-
-    public function testFetchMultiple()
-    {
-        $cache  = $this->_getCacheDriver();
-        $values = $this->provideDataToCache();
-        $saved  = array();
-
-        foreach ($values as $key => $value) {
-            $cache->save($key, $value[0]);
-
-            $saved[$key] = $value[0];
-        }
-
-        $keys = array_keys($saved);
-
-        $this->assertEquals(
-            $saved,
-            $cache->fetchMultiple($keys),
-            'Testing fetchMultiple with different data types'
-        );
-        $this->assertEquals(
-            array_slice($saved, 0, 1),
-            $cache->fetchMultiple(array_slice($keys, 0, 1)),
-            'Testing fetchMultiple with a single key'
-        );
-
-        $keysWithNonExisting = array();
-        $keysWithNonExisting[] = 'non_existing1';
-        $keysWithNonExisting[] = $keys[0];
-        $keysWithNonExisting[] = 'non_existing2';
-        $keysWithNonExisting[] = $keys[1];
-        $keysWithNonExisting[] = 'non_existing3';
-
-        $this->assertEquals(
-            array_slice($saved, 0, 2),
-            $cache->fetchMultiple($keysWithNonExisting),
-            'Testing fetchMultiple with a subset of keys and mixed with non-existing ones'
-        );
-    }
-
-    public function testFetchMultipleWithNoKeys()
-    {
-        $cache = $this->_getCacheDriver();
-
-        $this->assertSame(array(), $cache->fetchMultiple(array()));
-    }
-
-    public function testSaveMultiple()
-    {
-        $cache = $this->_getCacheDriver();
-        $cache->deleteAll();
-
-        $data = array_map(function ($value) {
-            return $value[0];
-        }, $this->provideDataToCache());
-
-        $this->assertTrue($cache->saveMultiple($data));
-
-        $keys = array_keys($data);
-
-        $this->assertEquals($data, $cache->fetchMultiple($keys));
-    }
-
-    public function provideDataToCache()
-    {
-        $obj = new \stdClass();
-        $obj->foo = 'bar';
-        $obj2 = new \stdClass();
-        $obj2->bar = 'foo';
-        $obj2->obj = $obj;
-        $obj->obj2 = $obj2;
-
-        return array(
-            'array' => array(array('one', 2, 3.01)),
-            'string' => array('value'),
-            'string_invalid_utf8' => array("\xc3\x28"),
-            'string_null_byte' => array('with'."\0".'null char'),
-            'integer' => array(1),
-            'float' => array(1.5),
-            'object' => array(new ArrayObject(array('one', 2, 3.01))),
-            'object_recursive' => array($obj),
-            'true' => array(true),
-            // the following are considered FALSE in boolean context, but caches should still recognize their existence
-            'null' => array(null),
-            'false' => array(false),
-            'array_empty' => array(array()),
-            'string_zero' => array('0'),
-            'integer_zero' => array(0),
-            'float_zero' => array(0.0),
-            'string_empty' => array(''),
-        );
-    }
-
-    public function testDeleteIsSuccessfulWhenKeyDoesNotExist()
-    {
-        $cache = $this->_getCacheDriver();
-
-        $cache->delete('key');
-        $this->assertFalse($cache->contains('key'));
-        $this->assertTrue($cache->delete('key'));
-    }
-
-    public function testDeleteAll()
-    {
-        $cache = $this->_getCacheDriver();
-
-        $this->assertTrue($cache->save('key1', 1));
-        $this->assertTrue($cache->save('key2', 2));
-        $this->assertTrue($cache->deleteAll());
-        $this->assertFalse($cache->contains('key1'));
-        $this->assertFalse($cache->contains('key2'));
-    }
-
-    /**
-     * @dataProvider provideCacheIds
-     */
-    public function testCanHandleSpecialCacheIds($id)
-    {
-        $cache = $this->_getCacheDriver();
-
-        $this->assertTrue($cache->save($id, 'value'));
-        $this->assertTrue($cache->contains($id));
-        $this->assertEquals('value', $cache->fetch($id));
-
-        $this->assertTrue($cache->delete($id));
-        $this->assertFalse($cache->contains($id));
-        $this->assertFalse($cache->fetch($id));
-    }
-
-    public function testNoCacheIdCollisions()
-    {
-        $cache = $this->_getCacheDriver();
-
-        $ids = $this->provideCacheIds();
-
-        // fill cache with each id having a different value
-        foreach ($ids as $index => $id) {
-            $cache->save($id[0], $index);
-        }
-
-        // then check value of each cache id
-        foreach ($ids as $index => $id) {
-            $value = $cache->fetch($id[0]);
-            $this->assertNotFalse($value, sprintf('Failed to retrieve data for cache id "%s".', $id[0]));
-            if ($index !== $value) {
-                $this->fail(sprintf('Cache id "%s" collides with id "%s".', $id[0], $ids[$value][0]));
-            }
-        }
-    }
-
-    /**
-     * Returns cache ids with special characters that should still work.
-     *
-     * For example, the characters :\/<>"*?| are not valid in Windows filenames. So they must be encoded properly.
-     * Each cache id should be considered different from the others.
-     *
-     * @return array
-     */
-    public function provideCacheIds()
-    {
-        return array(
-            array(':'),
-            array('\\'),
-            array('/'),
-            array('<'),
-            array('>'),
-            array('"'),
-            array('*'),
-            array('?'),
-            array('|'),
-            array('['),
-            array(']'),
-            array('ä'),
-            array('a'),
-            array('é'),
-            array('e'),
-            array('.'), // directory traversal
-            array('..'), // directory traversal
-            array('-'),
-            array('_'),
-            array('$'),
-            array('%'),
-            array(' '),
-            array("\0"),
-            array(''),
-            array(str_repeat('a', 300)), // long key
-            array(str_repeat('a', 113)),
-        );
-    }
-
-    public function testLifetime()
-    {
-        $cache = $this->_getCacheDriver();
-        $cache->save('expire', 'value', 1);
-        $this->assertTrue($cache->contains('expire'), 'Data should not be expired yet');
-        // @TODO should more TTL-based tests pop up, so then we should mock the `time` API instead
-        sleep(2);
-        $this->assertFalse($cache->contains('expire'), 'Data should be expired');
-    }
-
-    public function testNoExpire()
-    {
-        $cache = $this->_getCacheDriver();
-        $cache->save('noexpire', 'value', 0);
-        // @TODO should more TTL-based tests pop up, so then we should mock the `time` API instead
-        sleep(1);
-        $this->assertTrue($cache->contains('noexpire'), 'Data with lifetime of zero should not expire');
-    }
-
-    public function testLongLifetime()
-    {
-        $cache = $this->_getCacheDriver();
-        $cache->save('longlifetime', 'value', 30 * 24 * 3600 + 1);
-        $this->assertTrue($cache->contains('longlifetime'), 'Data with lifetime > 30 days should be accepted');
-    }
-
-    public function testDeleteAllAndNamespaceVersioningBetweenCaches()
-    {
-        if ( ! $this->isSharedStorage()) {
-            $this->markTestSkipped('The cache storage needs to be shared.');
-        }
-
-        $cache1 = $this->_getCacheDriver();
-        $cache2 = $this->_getCacheDriver();
-
-        $this->assertTrue($cache1->save('key1', 1));
-        $this->assertTrue($cache2->save('key2', 2));
-
-        /* Both providers are initialized with the same namespace version, so
-         * they can see entries set by each other.
-         */
-        $this->assertTrue($cache1->contains('key1'));
-        $this->assertTrue($cache1->contains('key2'));
-        $this->assertTrue($cache2->contains('key1'));
-        $this->assertTrue($cache2->contains('key2'));
-
-        /* Deleting all entries through one provider will only increment the
-         * namespace version on that object (and in the cache itself, which new
-         * instances will use to initialize). The second provider will retain
-         * its original version and still see stale data.
-         */
-        $this->assertTrue($cache1->deleteAll());
-        $this->assertFalse($cache1->contains('key1'));
-        $this->assertFalse($cache1->contains('key2'));
-        $this->assertTrue($cache2->contains('key1'));
-        $this->assertTrue($cache2->contains('key2'));
-
-        /* A new cache provider should not see the deleted entries, since its
-         * namespace version will be initialized.
-         */
-        $cache3 = $this->_getCacheDriver();
-        $this->assertFalse($cache3->contains('key1'));
-        $this->assertFalse($cache3->contains('key2'));
-    }
-
-    public function testFlushAll()
-    {
-        $cache = $this->_getCacheDriver();
-
-        $this->assertTrue($cache->save('key1', 1));
-        $this->assertTrue($cache->save('key2', 2));
-        $this->assertTrue($cache->flushAll());
-        $this->assertFalse($cache->contains('key1'));
-        $this->assertFalse($cache->contains('key2'));
-    }
-
-    public function testFlushAllAndNamespaceVersioningBetweenCaches()
-    {
-        if ( ! $this->isSharedStorage()) {
-            $this->markTestSkipped('The cache storage needs to be shared.');
-        }
-
-        $cache1 = $this->_getCacheDriver();
-        $cache2 = $this->_getCacheDriver();
-
-        /* Deleting all elements from the first provider should increment its
-         * namespace version before saving the first entry.
-         */
-        $cache1->deleteAll();
-        $this->assertTrue($cache1->save('key1', 1));
-
-        /* The second provider will be initialized with the same namespace
-         * version upon its first save operation.
-         */
-        $this->assertTrue($cache2->save('key2', 2));
-
-        /* Both providers have the same namespace version and can see entries
-         * set by each other.
-         */
-        $this->assertTrue($cache1->contains('key1'));
-        $this->assertTrue($cache1->contains('key2'));
-        $this->assertTrue($cache2->contains('key1'));
-        $this->assertTrue($cache2->contains('key2'));
-
-        /* Flushing all entries through one cache will remove all entries from
-         * the cache but leave their namespace version as-is.
-         */
-        $this->assertTrue($cache1->flushAll());
-        $this->assertFalse($cache1->contains('key1'));
-        $this->assertFalse($cache1->contains('key2'));
-        $this->assertFalse($cache2->contains('key1'));
-        $this->assertFalse($cache2->contains('key2'));
-
-        /* Inserting a new entry will use the same, incremented namespace
-         * version, and it will be visible to both providers.
-         */
-        $this->assertTrue($cache1->save('key1', 1));
-        $this->assertTrue($cache1->contains('key1'));
-        $this->assertTrue($cache2->contains('key1'));
-
-        /* A new cache provider will be initialized with the original namespace
-         * version and not share any visibility with the first two providers.
-         */
-        $cache3 = $this->_getCacheDriver();
-        $this->assertFalse($cache3->contains('key1'));
-        $this->assertFalse($cache3->contains('key2'));
-        $this->assertTrue($cache3->save('key3', 3));
-        $this->assertTrue($cache3->contains('key3'));
-    }
-
-    public function testNamespace()
-    {
-        $cache = $this->_getCacheDriver();
-
-        $cache->setNamespace('ns1_');
-
-        $this->assertTrue($cache->save('key1', 1));
-        $this->assertTrue($cache->contains('key1'));
-
-        $cache->setNamespace('ns2_');
-
-        $this->assertFalse($cache->contains('key1'));
-    }
-
-    public function testDeleteAllNamespace()
-    {
-        $cache = $this->_getCacheDriver();
-
-        $cache->setNamespace('ns1');
-        $this->assertFalse($cache->contains('key1'));
-        $cache->save('key1', 'test');
-        $this->assertTrue($cache->contains('key1'));
-
-        $cache->setNamespace('ns2');
-        $this->assertFalse($cache->contains('key1'));
-        $cache->save('key1', 'test');
-        $this->assertTrue($cache->contains('key1'));
-
-        $cache->setNamespace('ns1');
-        $this->assertTrue($cache->contains('key1'));
-        $cache->deleteAll();
-        $this->assertFalse($cache->contains('key1'));
-
-        $cache->setNamespace('ns2');
-        $this->assertTrue($cache->contains('key1'));
-        $cache->deleteAll();
-        $this->assertFalse($cache->contains('key1'));
-    }
-
-    /**
-     * @group DCOM-43
-     */
-    public function testGetStats()
-    {
-        $cache = $this->_getCacheDriver();
-        $stats = $cache->getStats();
-
-        $this->assertArrayHasKey(Cache::STATS_HITS, $stats);
-        $this->assertArrayHasKey(Cache::STATS_MISSES, $stats);
-        $this->assertArrayHasKey(Cache::STATS_UPTIME, $stats);
-        $this->assertArrayHasKey(Cache::STATS_MEMORY_USAGE, $stats);
-        $this->assertArrayHasKey(Cache::STATS_MEMORY_AVAILABLE, $stats);
-    }
-
-    public function testSaveReturnsTrueWithAndWithoutTTlSet()
-    {
-        $cache = $this->_getCacheDriver();
-        $cache->deleteAll();
-        $this->assertTrue($cache->save('without_ttl', 'without_ttl'));
-        $this->assertTrue($cache->save('with_ttl', 'with_ttl', 3600));
-    }
-
-    /**
-     * Return whether multiple cache providers share the same storage.
-     *
-     * This is used for skipping certain tests for shared storage behavior.
-     *
-     * @return bool
-     */
-    protected function isSharedStorage()
-    {
-        return true;
-    }
-
-    /**
-     * @return \Doctrine\Common\Cache\CacheProvider
-     */
-    abstract protected function _getCacheDriver();
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ChainCacheTest.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ChainCacheTest.php
deleted file mode 100644
index a3c013b8dd..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ChainCacheTest.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Cache;
-
-use Doctrine\Common\Cache\ApcCache;
-use Doctrine\Common\Cache\ArrayCache;
-use Doctrine\Common\Cache\ChainCache;
-
-class ChainCacheTest extends CacheTest
-{
-    protected function _getCacheDriver()
-    {
-        return new ChainCache(array(new ArrayCache()));
-    }
-
-    public function testLifetime()
-    {
-        $this->markTestSkipped('The ChainCache test uses ArrayCache which does not implement TTL currently.');
-    }
-
-    public function testGetStats()
-    {
-        $cache = $this->_getCacheDriver();
-        $stats = $cache->getStats();
-
-        $this->assertInternalType('array', $stats);
-    }
-
-    public function testOnlyFetchFirstOne()
-    {
-        $cache1 = new ArrayCache();
-        $cache2 = $this->getMockForAbstractClass('Doctrine\Common\Cache\CacheProvider');
-
-        $cache2->expects($this->never())->method('doFetch');
-
-        $chainCache = new ChainCache(array($cache1, $cache2));
-        $chainCache->save('id', 'bar');
-
-        $this->assertEquals('bar', $chainCache->fetch('id'));
-    }
-
-    public function testFetchPropagateToFastestCache()
-    {
-        $cache1 = new ArrayCache();
-        $cache2 = new ArrayCache();
-
-        $cache2->save('bar', 'value');
-
-        $chainCache = new ChainCache(array($cache1, $cache2));
-
-        $this->assertFalse($cache1->contains('bar'));
-
-        $result = $chainCache->fetch('bar');
-
-        $this->assertEquals('value', $result);
-        $this->assertTrue($cache2->contains('bar'));
-    }
-
-    public function testNamespaceIsPropagatedToAllProviders()
-    {
-        $cache1 = new ArrayCache();
-        $cache2 = new ArrayCache();
-
-        $chainCache = new ChainCache(array($cache1, $cache2));
-        $chainCache->setNamespace('bar');
-
-        $this->assertEquals('bar', $cache1->getNamespace());
-        $this->assertEquals('bar', $cache2->getNamespace());
-    }
-
-    public function testDeleteToAllProviders()
-    {
-        $cache1 = $this->getMockForAbstractClass('Doctrine\Common\Cache\CacheProvider');
-        $cache2 = $this->getMockForAbstractClass('Doctrine\Common\Cache\CacheProvider');
-
-        $cache1->expects($this->once())->method('doDelete');
-        $cache2->expects($this->once())->method('doDelete');
-
-        $chainCache = new ChainCache(array($cache1, $cache2));
-        $chainCache->delete('bar');
-    }
-
-    public function testFlushToAllProviders()
-    {
-        $cache1 = $this->getMockForAbstractClass('Doctrine\Common\Cache\CacheProvider');
-        $cache2 = $this->getMockForAbstractClass('Doctrine\Common\Cache\CacheProvider');
-
-        $cache1->expects($this->once())->method('doFlush');
-        $cache2->expects($this->once())->method('doFlush');
-
-        $chainCache = new ChainCache(array($cache1, $cache2));
-        $chainCache->flushAll();
-    }
-
-    protected function isSharedStorage()
-    {
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/CouchbaseCacheTest.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/CouchbaseCacheTest.php
deleted file mode 100644
index f42b3a7f7f..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/CouchbaseCacheTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Cache;
-
-use Couchbase;
-use Doctrine\Common\Cache\CouchbaseCache;
-
-/**
- * @requires extension couchbase
- */
-class CouchbaseCacheTest extends CacheTest
-{
-    private $couchbase;
-
-    protected function setUp()
-    {
-        try {
-            $this->couchbase = new Couchbase('127.0.0.1', 'Administrator', 'password', 'default');
-        } catch(Exception $ex) {
-             $this->markTestSkipped('Could not instantiate the Couchbase cache because of: ' . $ex);
-        }
-    }
-
-    protected function _getCacheDriver()
-    {
-        $driver = new CouchbaseCache();
-        $driver->setCouchbase($this->couchbase);
-        return $driver;
-    }
-}
\ No newline at end of file
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/FileCacheTest.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/FileCacheTest.php
deleted file mode 100644
index c93b50925a..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/FileCacheTest.php
+++ /dev/null
@@ -1,256 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Cache;
-
-use Doctrine\Common\Cache\Cache;
-
-/**
- * @group DCOM-101
- */
-class FileCacheTest extends \Doctrine\Tests\DoctrineTestCase
-{
-    /**
-     * @var \Doctrine\Common\Cache\FileCache
-     */
-    private $driver;
-
-    protected function setUp()
-    {
-        $this->driver = $this->getMock(
-            'Doctrine\Common\Cache\FileCache',
-            array('doFetch', 'doContains', 'doSave'),
-            array(), '', false
-        );
-    }
-
-    public function testFilenameShouldCreateThePathWithOneSubDirectory()
-    {
-        $cache          = $this->driver;
-        $method         = new \ReflectionMethod($cache, 'getFilename');
-        $key            = 'item-key';
-        $expectedDir    = array(
-            '84',
-        );
-        $expectedDir    = implode(DIRECTORY_SEPARATOR, $expectedDir);
-
-        $method->setAccessible(true);
-
-        $path       = $method->invoke($cache, $key);
-        $dirname    = pathinfo($path, PATHINFO_DIRNAME);
-
-        $this->assertEquals(DIRECTORY_SEPARATOR . $expectedDir, $dirname);
-    }
-
-    public function testFileExtensionCorrectlyEscaped()
-    {
-        $driver1 = $this->getMock(
-            'Doctrine\Common\Cache\FileCache',
-            array('doFetch', 'doContains', 'doSave'),
-            array(__DIR__, '.*')
-        );
-        $driver2 = $this->getMock(
-            'Doctrine\Common\Cache\FileCache',
-            array('doFetch', 'doContains', 'doSave'),
-            array(__DIR__, '.php')
-        );
-
-        $doGetStats = new \ReflectionMethod($driver1, 'doGetStats');
-
-        $doGetStats->setAccessible(true);
-
-        $stats1 = $doGetStats->invoke($driver1);
-        $stats2 = $doGetStats->invoke($driver2);
-
-        $this->assertSame(0, $stats1[Cache::STATS_MEMORY_USAGE]);
-        $this->assertGreaterThan(0, $stats2[Cache::STATS_MEMORY_USAGE]);
-    }
-
-    /**
-     * @group DCOM-266
-     */
-    public function testFileExtensionSlashCorrectlyEscaped()
-    {
-        $driver = $this->getMock(
-            'Doctrine\Common\Cache\FileCache',
-            array('doFetch', 'doContains', 'doSave'),
-            array(__DIR__ . '/../', DIRECTORY_SEPARATOR . basename(__FILE__))
-        );
-
-        $doGetStats = new \ReflectionMethod($driver, 'doGetStats');
-
-        $doGetStats->setAccessible(true);
-
-        $stats = $doGetStats->invoke($driver);
-
-        $this->assertGreaterThan(0, $stats[Cache::STATS_MEMORY_USAGE]);
-    }
-
-    public function testNonIntUmaskThrowsInvalidArgumentException()
-    {
-        $this->setExpectedException('InvalidArgumentException');
-
-        $this->getMock(
-            'Doctrine\Common\Cache\FileCache',
-            array('doFetch', 'doContains', 'doSave'),
-            array('', '', 'invalid')
-        );
-    }
-
-    public function testGetDirectoryReturnsRealpathDirectoryString()
-    {
-        $directory = __DIR__ . '/../';
-        $driver = $this->getMock(
-            'Doctrine\Common\Cache\FileCache',
-            array('doFetch', 'doContains', 'doSave'),
-            array($directory)
-        );
-
-        $doGetDirectory = new \ReflectionMethod($driver, 'getDirectory');
-
-        $actualDirectory = $doGetDirectory->invoke($driver);
-        $expectedDirectory = realpath($directory);
-
-        $this->assertEquals($expectedDirectory, $actualDirectory);
-    }
-
-    public function testGetExtensionReturnsExtensionString()
-    {
-        $directory = __DIR__ . '/../';
-        $extension = DIRECTORY_SEPARATOR . basename(__FILE__);
-        $driver = $this->getMock(
-            'Doctrine\Common\Cache\FileCache',
-            array('doFetch', 'doContains', 'doSave'),
-            array($directory, $extension)
-        );
-
-        $doGetExtension = new \ReflectionMethod($driver, 'getExtension');
-
-        $actualExtension = $doGetExtension->invoke($driver);
-
-        $this->assertEquals($extension, $actualExtension);
-    }
-
-    const WIN_MAX_PATH_LEN = 258;
-
-    public static function getBasePathForWindowsPathLengthTests($pathLength)
-    {
-        // Not using __DIR__ because it can get screwed up when xdebug debugger is attached.
-        $basePath = realpath(sys_get_temp_dir());
-
-        // Test whether the desired path length is odd or even.
-        $desiredPathLengthIsOdd = ($pathLength % 2) == 1;
-
-        // If the cache key is not too long, the filecache codepath will add
-        // a slash and bin2hex($key). The length of the added portion will be an odd number.
-        // len(desired) = len(base path) + len(slash . bin2hex($key))
-        //          odd = even           + odd
-        //         even = odd            + odd
-        $basePathLengthShouldBeOdd = !$desiredPathLengthIsOdd;
-
-        $basePathLengthIsOdd = (strlen($basePath) % 2) == 1;
-
-        // If the base path needs to be odd or even where it is not, we add an odd number of
-        // characters as a pad. In this case, we're adding '\aa' (or '/aa' depending on platform)
-        // This is all to make it so that the key we're testing would result in
-        // a path that is exactly the length we want to test IF the path length limit
-        // were not in place in FileCache.
-        if ($basePathLengthIsOdd != $basePathLengthShouldBeOdd) {
-            $basePath .= DIRECTORY_SEPARATOR . "aa";
-        }
-
-        return $basePath;
-    }
-
-    public static function getKeyAndPathFittingLength($length)
-    {
-        $basePath = self::getBasePathForWindowsPathLengthTests($length);
-
-        $baseDirLength = strlen($basePath);
-        $extensionLength = strlen('.doctrine.cache');
-        $directoryLength = strlen(DIRECTORY_SEPARATOR . 'aa' . DIRECTORY_SEPARATOR);
-        $keyLength = $length - ($baseDirLength + $extensionLength + $directoryLength); // - 1 because of slash
-
-        $key = str_repeat('a', floor($keyLength / 2));
-
-        $keyHash = hash('sha256', $key);
-
-        $keyPath = $basePath
-            . DIRECTORY_SEPARATOR
-            . substr($keyHash, 0, 2)
-            . DIRECTORY_SEPARATOR
-            . bin2hex($key)
-            . '.doctrine.cache';
-
-        $hashedKeyPath = $basePath
-            . DIRECTORY_SEPARATOR
-            . substr($keyHash, 0, 2)
-            . DIRECTORY_SEPARATOR
-            . '_' . $keyHash
-            . '.doctrine.cache';
-
-        return array($key, $keyPath, $hashedKeyPath);
-    }
-
-    public function getPathLengthsToTest()
-    {
-        // Windows officially supports 260 bytes including null terminator
-        // 259 characters is too large due to PHP bug (https://bugs.php.net/bug.php?id=70943)
-        // 260 characters is too large - null terminator is included in allowable length
-        return array(
-            array(257, false),
-            array(258, false),
-            array(259, true),
-            array(260, true)
-        );
-    }
-
-    /**
-     * @runInSeparateProcess
-     * @dataProvider getPathLengthsToTest
-     *
-     * @covers \Doctrine\Common\Cache\FileCache::getFilename
-     */
-    public function testWindowsPathLengthLimitationsAreCorrectlyRespected($length, $pathShouldBeHashed)
-    {
-        if (! defined('PHP_WINDOWS_VERSION_BUILD')) {
-            define('PHP_WINDOWS_VERSION_BUILD', 'Yes, this is the "usual suspect", with the usual limitations');
-        }
-
-        $basePath = $this->getBasePathForWindowsPathLengthTests($length);
-
-        $fileCache = $this->getMockForAbstractClass(
-            'Doctrine\Common\Cache\FileCache',
-            array($basePath, '.doctrine.cache')
-        );
-
-        list($key, $keyPath, $hashedKeyPath) = $this->getKeyAndPathFittingLength($length);
-
-        $getFileName = new \ReflectionMethod($fileCache, 'getFilename');
-
-        $getFileName->setAccessible(true);
-
-        $this->assertEquals(
-            $length,
-            strlen($keyPath),
-            sprintf('Path expected to be %d characters long is %d characters long', $length, strlen($keyPath))
-        );
-
-        if ($pathShouldBeHashed) {
-            $keyPath = $hashedKeyPath;
-        }
-
-        if ($pathShouldBeHashed) {
-            $this->assertSame(
-                $hashedKeyPath,
-                $getFileName->invoke($fileCache, $key),
-                'Keys should be hashed correctly if they are over the limit.'
-            );
-        } else {
-            $this->assertSame(
-                $keyPath,
-                $getFileName->invoke($fileCache, $key),
-                'Keys below limit of the allowed length are used directly, unhashed'
-            );
-        }
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/FilesystemCacheTest.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/FilesystemCacheTest.php
deleted file mode 100644
index 9e7c9e8185..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/FilesystemCacheTest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Cache;
-
-use Doctrine\Common\Cache\Cache;
-use Doctrine\Common\Cache\FilesystemCache;
-
-/**
- * @group DCOM-101
- */
-class FilesystemCacheTest extends BaseFileCacheTest
-{
-    public function testGetStats()
-    {
-        $cache = $this->_getCacheDriver();
-        $stats = $cache->getStats();
-
-        $this->assertNull($stats[Cache::STATS_HITS]);
-        $this->assertNull($stats[Cache::STATS_MISSES]);
-        $this->assertNull($stats[Cache::STATS_UPTIME]);
-        $this->assertEquals(0, $stats[Cache::STATS_MEMORY_USAGE]);
-        $this->assertGreaterThan(0, $stats[Cache::STATS_MEMORY_AVAILABLE]);
-    }
-
-    public function testCacheInSharedDirectoryIsPerExtension()
-    {
-        $cache1 = new FilesystemCache($this->directory, '.foo');
-        $cache2 = new FilesystemCache($this->directory, '.bar');
-
-        $this->assertTrue($cache1->save('key1', 11));
-        $this->assertTrue($cache1->save('key2', 12));
-
-        $this->assertTrue($cache2->save('key1', 21));
-        $this->assertTrue($cache2->save('key2', 22));
-
-        $this->assertSame(11, $cache1->fetch('key1'), 'Cache value must not be influenced by a different cache in the same directory but different extension');
-        $this->assertSame(12, $cache1->fetch('key2'));
-        $this->assertTrue($cache1->flushAll());
-        $this->assertFalse($cache1->fetch('key1'), 'flushAll() must delete all items with the current extension');
-        $this->assertFalse($cache1->fetch('key2'));
-
-        $this->assertSame(21, $cache2->fetch('key1'), 'flushAll() must not remove items with a different extension in a shared directory');
-        $this->assertSame(22, $cache2->fetch('key2'));
-    }
-
-    public function testFlushAllWithNoExtension()
-    {
-        $cache = new FilesystemCache($this->directory, '');
-
-        $this->assertTrue($cache->save('key1', 1));
-        $this->assertTrue($cache->save('key2', 2));
-        $this->assertTrue($cache->flushAll());
-        $this->assertFalse($cache->contains('key1'));
-        $this->assertFalse($cache->contains('key2'));
-    }
-
-    protected function _getCacheDriver()
-    {
-        return new FilesystemCache($this->directory);
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/MemcacheCacheTest.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/MemcacheCacheTest.php
deleted file mode 100644
index 74853b8491..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/MemcacheCacheTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Cache;
-
-use Doctrine\Common\Cache\MemcacheCache;
-use Memcache;
-
-/**
- * @requires extension memcache
- */
-class MemcacheCacheTest extends CacheTest
-{
-    private $memcache;
-
-    protected function setUp()
-    {
-        $this->memcache = new Memcache();
-
-        if (@$this->memcache->connect('localhost', 11211) === false) {
-            unset($this->memcache);
-            $this->markTestSkipped('Cannot connect to Memcache.');
-        }
-    }
-
-    protected function tearDown()
-    {
-        if ($this->memcache instanceof Memcache) {
-            $this->memcache->flush();
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * Memcache does not support " " and null byte as key so we remove them from the tests.
-     */
-    public function provideCacheIds()
-    {
-        $ids = parent::provideCacheIds();
-        unset($ids[21], $ids[22]);
-
-        return $ids;
-    }
-
-    public function testGetMemcacheReturnsInstanceOfMemcache()
-    {
-        $this->assertInstanceOf('Memcache', $this->_getCacheDriver()->getMemcache());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function _getCacheDriver()
-    {
-        $driver = new MemcacheCache();
-        $driver->setMemcache($this->memcache);
-        return $driver;
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/MemcachedCacheTest.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/MemcachedCacheTest.php
deleted file mode 100644
index fbcf5c38ed..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/MemcachedCacheTest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Cache;
-
-use Doctrine\Common\Cache\MemcachedCache;
-use Memcached;
-
-/**
- * @requires extension memcached
- */
-class MemcachedCacheTest extends CacheTest
-{
-    private $memcached;
-
-    protected function setUp()
-    {
-        $this->memcached = new Memcached();
-        $this->memcached->setOption(Memcached::OPT_COMPRESSION, false);
-        $this->memcached->addServer('127.0.0.1', 11211);
-
-        if (@fsockopen('127.0.0.1', 11211) === false) {
-            unset($this->memcached);
-            $this->markTestSkipped('Cannot connect to Memcached.');
-        }
-    }
-
-    protected function tearDown()
-    {
-        if ($this->memcached instanceof Memcached) {
-            $this->memcached->flush();
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * Memcached does not support " ", null byte and very long keys so we remove them from the tests.
-     */
-    public function provideCacheIds()
-    {
-        $ids = parent::provideCacheIds();
-        unset($ids[21], $ids[22], $ids[24]);
-
-        return $ids;
-    }
-
-    public function testGetMemcachedReturnsInstanceOfMemcached()
-    {
-        $this->assertInstanceOf('Memcached', $this->_getCacheDriver()->getMemcached());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function _getCacheDriver()
-    {
-        $driver = new MemcachedCache();
-        $driver->setMemcached($this->memcached);
-        return $driver;
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/MongoDBCacheTest.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/MongoDBCacheTest.php
deleted file mode 100644
index fa7cfacd1d..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/MongoDBCacheTest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Cache;
-
-use Doctrine\Common\Cache\Cache;
-use Doctrine\Common\Cache\MongoDBCache;
-use MongoClient;
-use MongoCollection;
-
-/**
- * @requires extension mongo
- */
-class MongoDBCacheTest extends CacheTest
-{
-    /**
-     * @var MongoCollection
-     */
-    private $collection;
-
-    protected function setUp()
-    {
-        if ( ! version_compare(phpversion('mongo'), '1.3.0', '>=')) {
-            $this->markTestSkipped('Mongo >= 1.3.0 is required.');
-        }
-
-        $mongo = new MongoClient();
-        $this->collection = $mongo->selectCollection('doctrine_common_cache', 'test');
-    }
-
-    protected function tearDown()
-    {
-        if ($this->collection instanceof MongoCollection) {
-            $this->collection->drop();
-        }
-    }
-
-    public function testGetStats()
-    {
-        $cache = $this->_getCacheDriver();
-        $stats = $cache->getStats();
-
-        $this->assertNull($stats[Cache::STATS_HITS]);
-        $this->assertNull($stats[Cache::STATS_MISSES]);
-        $this->assertGreaterThan(0, $stats[Cache::STATS_UPTIME]);
-        $this->assertEquals(0, $stats[Cache::STATS_MEMORY_USAGE]);
-        $this->assertNull($stats[Cache::STATS_MEMORY_AVAILABLE]);
-    }
-
-    /**
-     * @group 108
-     */
-    public function testMongoCursorExceptionsDoNotBubbleUp()
-    {
-        /* @var $collection \MongoCollection|\PHPUnit_Framework_MockObject_MockObject */
-        $collection = $this->getMock('MongoCollection', array(), array(), '', false);
-
-        $collection->expects(self::once())->method('update')->willThrowException(new \MongoCursorException());
-
-        $cache = new MongoDBCache($collection);
-
-        self::assertFalse($cache->save('foo', 'bar'));
-    }
-
-    protected function _getCacheDriver()
-    {
-        return new MongoDBCache($this->collection);
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/PhpFileCacheTest.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/PhpFileCacheTest.php
deleted file mode 100644
index 32eec6e28f..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/PhpFileCacheTest.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Cache;
-
-use Doctrine\Common\Cache\Cache;
-use Doctrine\Common\Cache\PhpFileCache;
-
-/**
- * @group DCOM-101
- */
-class PhpFileCacheTest extends BaseFileCacheTest
-{
-    public function provideDataToCache()
-    {
-        $data = parent::provideDataToCache();
-
-        unset($data['object'], $data['object_recursive']); // PhpFileCache only allows objects that implement __set_state() and fully support var_export()
-        unset($data['float_zero']); // var_export exports float(0) as int(0)
-
-        return $data;
-    }
-
-    public function testImplementsSetState()
-    {
-        $cache = $this->_getCacheDriver();
-
-        // Test save
-        $cache->save('test_set_state', new SetStateClass(array(1,2,3)));
-
-        //Test __set_state call
-        $this->assertCount(0, SetStateClass::$values);
-
-        // Test fetch
-        $value = $cache->fetch('test_set_state');
-        $this->assertInstanceOf('Doctrine\Tests\Common\Cache\SetStateClass', $value);
-        $this->assertEquals(array(1,2,3), $value->getValue());
-
-        //Test __set_state call
-        $this->assertCount(1, SetStateClass::$values);
-
-        // Test contains
-        $this->assertTrue($cache->contains('test_set_state'));
-    }
-
-    public function testNotImplementsSetState()
-    {
-        $cache = $this->_getCacheDriver();
-
-        $this->setExpectedException('InvalidArgumentException');
-        $cache->save('test_not_set_state', new NotSetStateClass(array(1,2,3)));
-    }
-
-    public function testGetStats()
-    {
-        $cache = $this->_getCacheDriver();
-        $stats = $cache->getStats();
-
-        $this->assertNull($stats[Cache::STATS_HITS]);
-        $this->assertNull($stats[Cache::STATS_MISSES]);
-        $this->assertNull($stats[Cache::STATS_UPTIME]);
-        $this->assertEquals(0, $stats[Cache::STATS_MEMORY_USAGE]);
-        $this->assertGreaterThan(0, $stats[Cache::STATS_MEMORY_AVAILABLE]);
-    }
-
-    protected function _getCacheDriver()
-    {
-        return new PhpFileCache($this->directory);
-    }
-}
-
-class NotSetStateClass
-{
-    private $value;
-
-    public function __construct($value)
-    {
-        $this->value = $value;
-    }
-
-    public function getValue()
-    {
-        return $this->value;
-    }
-}
-
-class SetStateClass extends NotSetStateClass
-{
-    public static $values = array();
-
-    public static function __set_state($data)
-    {
-        self::$values = $data;
-        return new self($data['value']);
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/PredisCacheTest.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/PredisCacheTest.php
deleted file mode 100644
index e20839dc09..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/PredisCacheTest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Cache;
-
-use Doctrine\Common\Cache\Cache;
-use Doctrine\Common\Cache\PredisCache;
-use Predis\Client;
-use Predis\Connection\ConnectionException;
-
-class PredisCacheTest extends CacheTest
-{
-    private $client;
-
-    protected function setUp()
-    {
-        if (!class_exists('Predis\Client')) {
-            $this->markTestSkipped('Predis\Client is missing. Make sure to "composer install" to have all dev dependencies.');
-        }
-
-        $this->client = new Client();
-
-        try {
-            $this->client->connect();
-        } catch (ConnectionException $e) {
-            $this->markTestSkipped('Cannot connect to Redis because of: ' . $e);
-        }
-    }
-
-    public function testHitMissesStatsAreProvided()
-    {
-        $cache = $this->_getCacheDriver();
-        $stats = $cache->getStats();
-
-        $this->assertNotNull($stats[Cache::STATS_HITS]);
-        $this->assertNotNull($stats[Cache::STATS_MISSES]);
-    }
-
-    /**
-     * @return PredisCache
-     */
-    protected function _getCacheDriver()
-    {
-        return new PredisCache($this->client);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @dataProvider provideDataToCache
-     */
-    public function testSetContainsFetchDelete($value)
-    {
-        if (array() === $value) {
-            $this->markTestIncomplete(
-                'Predis currently doesn\'t support saving empty array values. '
-                . 'See https://github.com/nrk/predis/issues/241'
-            );
-        }
-
-        parent::testSetContainsFetchDelete($value);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @dataProvider provideDataToCache
-     */
-    public function testUpdateExistingEntry($value)
-    {
-        if (array() === $value) {
-            $this->markTestIncomplete(
-                'Predis currently doesn\'t support saving empty array values. '
-                . 'See https://github.com/nrk/predis/issues/241'
-            );
-        }
-
-        parent::testUpdateExistingEntry($value);
-    }
-
-    public function testAllowsGenericPredisClient()
-    {
-        /* @var $predisClient \Predis\ClientInterface */
-        $predisClient = $this->getMock('Predis\\ClientInterface');
-
-        $this->assertInstanceOf('Doctrine\\Common\\Cache\\PredisCache', new PredisCache($predisClient));
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/RedisCacheTest.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/RedisCacheTest.php
deleted file mode 100644
index caaaa06290..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/RedisCacheTest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Cache;
-
-use Doctrine\Common\Cache\RedisCache;
-use Doctrine\Common\Cache\Cache;
-
-/**
- * @requires extension redis
- */
-class RedisCacheTest extends CacheTest
-{
-    private $_redis;
-
-    protected function setUp()
-    {
-        $this->_redis = new \Redis();
-        $ok = @$this->_redis->connect('127.0.0.1');
-        if (!$ok) {
-            $this->markTestSkipped('Cannot connect to Redis.');
-        }
-    }
-
-    public function testHitMissesStatsAreProvided()
-    {
-        $cache = $this->_getCacheDriver();
-        $stats = $cache->getStats();
-
-        $this->assertNotNull($stats[Cache::STATS_HITS]);
-        $this->assertNotNull($stats[Cache::STATS_MISSES]);
-    }
-
-    public function testGetRedisReturnsInstanceOfRedis()
-    {
-        $this->assertInstanceOf('Redis', $this->_getCacheDriver()->getRedis());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function _getCacheDriver()
-    {
-        $driver = new RedisCache();
-        $driver->setRedis($this->_redis);
-        return $driver;
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/RiakCacheTest.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/RiakCacheTest.php
deleted file mode 100644
index e7d5f3dd33..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/RiakCacheTest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Cache;
-
-use Riak\Bucket;
-use Riak\Connection;
-use Riak\Exception;
-use Doctrine\Common\Cache\RiakCache;
-
-/**
- * RiakCache test
- *
- * @group Riak
- * @requires extension riak
- */
-class RiakCacheTest extends CacheTest
-{
-    /**
-     * @var \Riak\Connection
-     */
-    private $connection;
-
-    /**
-     * @var \Riak\Bucket
-     */
-    private $bucket;
-
-    protected function setUp()
-    {
-        try {
-            $this->connection = new Connection('127.0.0.1', 8087);
-            $this->bucket     = new Bucket($this->connection, 'test');
-        } catch (Exception\RiakException $e) {
-            $this->markTestSkipped('Cannot connect to Riak.');
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function testGetStats()
-    {
-        $cache = $this->_getCacheDriver();
-        $stats = $cache->getStats();
-
-        $this->assertNull($stats);
-    }
-
-    /**
-     * Retrieve RiakCache instance.
-     *
-     * @return \Doctrine\Common\Cache\RiakCache
-     */
-    protected function _getCacheDriver()
-    {
-        return new RiakCache($this->bucket);
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/SQLite3CacheTest.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/SQLite3CacheTest.php
deleted file mode 100644
index f0c5b0b592..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/SQLite3CacheTest.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Cache;
-
-use Doctrine\Common\Cache\Cache;
-use Doctrine\Common\Cache\SQLite3Cache;
-use SQLite3;
-
-/**
- * @requires extension sqlite3
- */
-class SQLite3Test extends CacheTest
-{
-    private $file;
-    private $sqlite;
-
-    protected function setUp()
-    {
-        $this->file = tempnam(null, 'doctrine-cache-test-');
-        unlink($this->file);
-        $this->sqlite = new SQLite3($this->file);
-    }
-
-    protected function tearDown()
-    {
-        $this->sqlite = null;  // DB must be closed before
-        unlink($this->file);
-    }
-
-    public function testGetStats()
-    {
-        $this->assertNull($this->_getCacheDriver()->getStats());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function _getCacheDriver()
-    {
-        return new SQLite3Cache($this->sqlite, 'test_table');
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/VoidCacheTest.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/VoidCacheTest.php
deleted file mode 100644
index 8ab7e5b472..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/VoidCacheTest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Cache;
-
-use Doctrine\Common\Cache\VoidCache;
-
-/**
- * @covers \Doctrine\Common\Cache\VoidCache
- */
-class VoidCacheTest extends \PHPUnit_Framework_TestCase
-{
-    public function testShouldAlwaysReturnFalseOnContains()
-    {
-        $cache = new VoidCache();
-
-        $this->assertFalse($cache->contains('foo'));
-        $this->assertFalse($cache->contains('bar'));
-    }
-
-    public function testShouldAlwaysReturnFalseOnFetch()
-    {
-        $cache = new VoidCache();
-
-        $this->assertFalse($cache->fetch('foo'));
-        $this->assertFalse($cache->fetch('bar'));
-    }
-
-    public function testShouldAlwaysReturnTrueOnSaveButNotStoreAnything()
-    {
-        $cache = new VoidCache();
-
-        $this->assertTrue($cache->save('foo', 'fooVal'));
-
-        $this->assertFalse($cache->contains('foo'));
-        $this->assertFalse($cache->fetch('foo'));
-    }
-
-    public function testShouldAlwaysReturnTrueOnDelete()
-    {
-        $cache = new VoidCache();
-
-        $this->assertTrue($cache->delete('foo'));
-    }
-
-    public function testShouldAlwaysReturnNullOnGetStatus()
-    {
-        $cache = new VoidCache();
-
-        $this->assertNull($cache->getStats());
-    }
-
-    public function testShouldAlwaysReturnTrueOnFlush()
-    {
-        $cache = new VoidCache();
-
-        $this->assertTrue($cache->flushAll());
-    }
-}
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/WinCacheCacheTest.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/WinCacheCacheTest.php
deleted file mode 100644
index 1dded42478..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/WinCacheCacheTest.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Cache;
-
-use Doctrine\Common\Cache\WincacheCache;
-
-/**
- * @requires extension wincache
- */
-class WincacheCacheTest extends CacheTest
-{
-    protected function _getCacheDriver()
-    {
-        return new WincacheCache();
-    }
-}
\ No newline at end of file
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/XcacheCacheTest.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/XcacheCacheTest.php
deleted file mode 100644
index 93deca4879..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/XcacheCacheTest.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Cache;
-
-use Doctrine\Common\Cache\XcacheCache;
-
-/**
- * @requires extension xcache
- */
-class XcacheCacheTest extends CacheTest
-{
-    protected function _getCacheDriver()
-    {
-        return new XcacheCache();
-    }
-}
\ No newline at end of file
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ZendDataCacheTest.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ZendDataCacheTest.php
deleted file mode 100644
index b39b9e8a79..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/ZendDataCacheTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Cache;
-
-use Doctrine\Common\Cache\ZendDataCache;
-
-/**
- * @requires function zend_shm_cache_fetch
- */
-class ZendDataCacheTest extends CacheTest
-{
-    protected function setUp()
-    {
-        if ('apache2handler' !== php_sapi_name()) {
-            $this->markTestSkipped('Zend Data Cache only works in apache2handler SAPI.');
-        }
-    }
-
-    public function testGetStats()
-    {
-        $cache = $this->_getCacheDriver();
-        $stats = $cache->getStats();
-
-        $this->assertNull($stats);
-    }
-
-    protected function _getCacheDriver()
-    {
-        return new ZendDataCache();
-    }
-}
\ No newline at end of file
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/DoctrineTestCase.php b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/DoctrineTestCase.php
deleted file mode 100644
index e8323d2940..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/Doctrine/Tests/DoctrineTestCase.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Doctrine\Tests;
-
-/**
- * Base testcase class for all Doctrine testcases.
- */
-abstract class DoctrineTestCase extends \PHPUnit_Framework_TestCase
-{
-}
\ No newline at end of file
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/travis/php.ini b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/travis/php.ini
deleted file mode 100644
index 105af36da0..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/travis/php.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-extension="mongo.so"
-extension="memcache.so"
-extension="memcached.so"
-extension="redis.so"
-
-apc.enabled=1
-apc.enable_cli=1
diff --git a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/travis/phpunit.travis.xml b/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/travis/phpunit.travis.xml
deleted file mode 100644
index fc387ca6ea..0000000000
--- a/core/src/plugins/cache.doctrine/doctrine/vendor/doctrine/cache/tests/travis/phpunit.travis.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="../../vendor/autoload.php"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <logging>
-        <log type="coverage-clover" target="../../build/logs/clover.xml"/>
-    </logging>
-
-    <testsuites>
-        <testsuite name="Doctrine Cache Test Suite">
-            <directory>../Doctrine/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>../../lib/Doctrine/</directory>
-        </whitelist>
-    </filter>
-    
-    <groups>
-        <exclude>
-            <group>performance</group>
-        </exclude>
-    </groups>
-</phpunit>
diff --git a/core/src/plugins/cache.doctrine/ext/PydioApcuCache.php b/core/src/plugins/cache.doctrine/ext/PydioApcuCache.php
deleted file mode 100644
index 6147909eac..0000000000
--- a/core/src/plugins/cache.doctrine/ext/PydioApcuCache.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/*
- * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-namespace Pydio\Plugins\Cache\Doctrine\Ext;
-
-defined('AJXP_EXEC') or die('Access not allowed');
-require_once "PatternClearableCache.php";
-
-class PydioApcuCache extends \Doctrine\Common\Cache\ApcuCache implements PatternClearableCache
-{
-    protected $internalNamespace;
-    protected $internalNamespaceVersion;
-
-    /**
-     * Prefixes the passed id with the configured namespace value.
-     *
-     * @param string $id The id to namespace.
-     *
-     * @return string The namespaced id.
-     */
-    private function namespacedIdAsPattern($id)
-    {
-        return sprintf('%s\['.preg_quote($id, "/"), $this->internalNamespace);
-    }
-
-    /**
-     * @param string $pattern
-     * @return bool
-     */
-    public function deleteKeysStartingWith($pattern)
-    {
-        $pattern = '/^'.$this->namespacedIdAsPattern($pattern).'/';
-        //SAMPLE /^pydio-unique-id_nodes_\[list\:\/\/1/
-        $iterator = new \APCIterator('user', $pattern);
-        foreach ($iterator as $data) {
-            $this->doDelete($data['key']);
-        }
-    }
-
-    /**
-     * @param string $namespace
-     * @return void
-     */
-    public function setNamespace($namespace)
-    {
-        parent::setNamespace($namespace);
-        $this->internalNamespace = $namespace;
-    }
-}
\ No newline at end of file
diff --git a/core/src/plugins/cache.doctrine/manifest.xml b/core/src/plugins/cache.doctrine/manifest.xml
index c1f2969bc3..bc2aa61673 100644
--- a/core/src/plugins/cache.doctrine/manifest.xml
+++ b/core/src/plugins/cache.doctrine/manifest.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ajxp_plugin name="memcache" enabled="no" label="CONF_MESSAGE[Doctrine Cache driver]" description="CONF_MESSAGE[Use doctrine as main caching driver.]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <class_definition filename="plugins/cache.doctrine/class.DoctrineCacheDriver.php" classname="DoctrineCacheDriver"/>
+    <class_definition filename="plugins/cache.doctrine/DoctrineCacheDriver.php" classname="Pydio\Cache\Implementation\DoctrineCacheDriver"/>
     <client_settings>
         <resources>
             <i18n namespace="doctrine_cachedriver" path="plugins/log.text/i18n"/>
         </resources>
     </client_settings>
     <server_settings>
-        <param name="DRIVER" type="group_switch:driver" label="CONF_MESSAGE[Cache Driver]" description="CONF_MESSAGE[Cache driver]" mandatory="false"/>
+        <param name="DRIVER" type="group_switch:driver" label="CONF_MESSAGE[Cache Driver]" description="CONF_MESSAGE[Cache driver]" default="apc" mandatory="false"/>
 
         <param group_switch_name="driver" group_switch_label="apc" group_switch_value="apc" name="driver" type="hidden" label="" description="" mandatory="false" default="apc"/>
 
diff --git a/core/src/plugins/cache.doctrine/ext/PatternClearableCache.php b/core/src/plugins/cache.doctrine/src/PatternClearableCache.php
similarity index 86%
rename from core/src/plugins/cache.doctrine/ext/PatternClearableCache.php
rename to core/src/plugins/cache.doctrine/src/PatternClearableCache.php
index b79a054bcc..6dcb18fe8d 100644
--- a/core/src/plugins/cache.doctrine/ext/PatternClearableCache.php
+++ b/core/src/plugins/cache.doctrine/src/PatternClearableCache.php
@@ -16,12 +16,16 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
-namespace Pydio\Plugins\Cache\Doctrine\Ext;
+namespace Pydio\Cache\Doctrine\Ext;
 
 defined('AJXP_EXEC') or die('Access not allowed');
 
+/**
+ * Interface PatternClearableCache
+ * @package Pydio\Cache\Doctrine\Ext
+ */
 interface PatternClearableCache{
 
     /**
diff --git a/core/src/plugins/cache.doctrine/src/PydioApcuCache.php b/core/src/plugins/cache.doctrine/src/PydioApcuCache.php
new file mode 100644
index 0000000000..9e3c5f4805
--- /dev/null
+++ b/core/src/plugins/cache.doctrine/src/PydioApcuCache.php
@@ -0,0 +1,82 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Cache\Doctrine\Ext;
+
+use Doctrine\Common\Cache\ApcuCache;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class PydioApcuCache
+ * @package Pydio\Cache\Doctrine\Ext
+ */
+class PydioApcuCache extends ApcuCache implements PatternClearableCache
+{
+    protected $internalNamespace;
+    protected $internalNamespaceVersion;
+
+    /**
+     * Prefixes the passed id with the configured namespace value.
+     *
+     * @param string $id The id to namespace.
+     *
+     * @return string The namespaced id.
+     */
+    private function namespacedIdAsPattern($id) {
+        
+        return sprintf('%s\['.preg_quote($id, "/"), $this->internalNamespace);
+    }
+
+    /**
+     * @param string $pattern
+     * @return bool
+     */
+    public function deleteKeysStartingWith($pattern) {
+        $pattern = '/^'.$this->namespacedIdAsPattern($pattern).'/';
+        //SAMPLE /^pydio-unique-id_nodes_\[list\:\/\/1/
+        $iterator = new \APCIterator('user', $pattern);
+        foreach ($iterator as $data) {
+            $this->doDelete($data['key']);
+        }
+    }
+
+    /**
+     * @param string $namespace
+     * @return void
+     */
+    public function setNamespace($namespace)
+    {
+        parent::setNamespace($namespace);
+        $this->internalNamespace = $namespace;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFetchMultiple(array $keys)
+    {
+        $test = apcu_fetch($keys);
+        if($test === false) return [];
+        else return $test;
+    }
+
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/cache.doctrine/src/PydioArrayCache.php b/core/src/plugins/cache.doctrine/src/PydioArrayCache.php
new file mode 100644
index 0000000000..f7c3c5921d
--- /dev/null
+++ b/core/src/plugins/cache.doctrine/src/PydioArrayCache.php
@@ -0,0 +1,152 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Cache\Doctrine\Ext;
+use Doctrine\Common\Cache\Cache;
+use Doctrine\Common\Cache\CacheProvider;
+
+/**
+ * Array cache driver with ability to clear keys
+ */
+class PydioArrayCache extends CacheProvider implements PatternClearableCache
+{
+    /**
+     * @var array[] $data each element being a tuple of [$data, $expiration], where the expiration is int|bool
+     */
+    private $data = [];
+
+    /**
+     * @var int
+     */
+    private $hitsCount = 0;
+
+    /**
+     * @var int
+     */
+    private $missesCount = 0;
+
+    /**
+     * @var int
+     */
+    private $upTime;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct()
+    {
+        $this->upTime = time();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFetch($id)
+    {
+        if (! $this->doContains($id)) {
+            $this->missesCount += 1;
+
+            return false;
+        }
+
+        $this->hitsCount += 1;
+
+        return $this->data[$id][0];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doContains($id)
+    {
+        if (! isset($this->data[$id])) {
+            return false;
+        }
+
+        $expiration = $this->data[$id][1];
+
+        if ($expiration && $expiration < time()) {
+            $this->doDelete($id);
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doSave($id, $data, $lifeTime = 0)
+    {
+        $this->data[$id] = [$data, $lifeTime ? time() + $lifeTime : false];
+
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doDelete($id)
+    {
+        unset($this->data[$id]);
+
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFlush()
+    {
+        $this->data = [];
+
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doGetStats()
+    {
+        return [
+            Cache::STATS_HITS             => $this->hitsCount,
+            Cache::STATS_MISSES           => $this->missesCount,
+            Cache::STATS_UPTIME           => $this->upTime,
+            Cache::STATS_MEMORY_USAGE     => null,
+            Cache::STATS_MEMORY_AVAILABLE => null,
+        ];
+    }
+
+    /**
+     * @param string $pattern
+     * @return bool
+     */
+    public function deleteKeysStartingWith($pattern) {
+
+        $pat = "[" . $pattern;
+        foreach($this->data as $key => $value){
+            if(substr($key, 0, strlen($pat)) === $pat){
+                unset($this->data[$key]);
+            }
+        }
+
+    }
+}
diff --git a/core/src/plugins/cache.doctrine/src/PydioChainCache.php b/core/src/plugins/cache.doctrine/src/PydioChainCache.php
new file mode 100644
index 0000000000..4225c58f3d
--- /dev/null
+++ b/core/src/plugins/cache.doctrine/src/PydioChainCache.php
@@ -0,0 +1,89 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Cache\Doctrine\Ext;
+
+
+use Doctrine\Common\Cache\CacheProvider;
+use Doctrine\Common\Cache\ChainCache;
+
+/**
+ * Class PydioChainCache
+ * @package Pydio\Cache\Doctrine\Ext
+ */
+class PydioChainCache extends ChainCache implements PatternClearableCache {
+    /**
+     * @var CacheProvider[]
+     */
+    protected $cacheProviders;
+
+    protected $internalNamespace;
+    protected $internalNamespaceVersion;
+
+    /**
+     * PydioChainCache constructor.
+     * @param array|\Doctrine\Common\Cache\CacheProvider[] $cacheProviders
+     */
+    public function __construct($cacheProviders)
+    {
+        parent::__construct($cacheProviders);
+
+        $this->cacheProviders = $cacheProviders;
+    }
+
+    /**
+     * @param string $pattern
+     * @return bool
+     */
+    public function deleteKeysStartingWith($pattern) {
+        $result = false;
+        foreach ($this->cacheProviders as $cache) {
+
+            if(!($cache instanceof PatternClearableCache)) {
+                continue;
+            }
+
+            /** @var PatternClearableCache $cache */
+            $result &= $cache->deleteKeysStartingWith($pattern);
+        }
+        return $result;
+    }
+
+    /**
+     * @param string $namespace
+     * @return void
+     */
+    public function setNamespace($namespace) {
+        parent::setNamespace($namespace);
+        foreach ($this->cacheProviders as $cache) {
+            $cache->setNamespace($namespace);
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    public function oneProviderRequiresHttpDeletion(){
+        foreach($this->cacheProviders as $provider){
+            if($provider instanceof PydioApcuCache) return true;
+        }
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/cache.doctrine/ext/PydioRedisCache.php b/core/src/plugins/cache.doctrine/src/PydioRedisCache.php
similarity index 83%
rename from core/src/plugins/cache.doctrine/ext/PydioRedisCache.php
rename to core/src/plugins/cache.doctrine/src/PydioRedisCache.php
index f08ea25b5d..7ffd24c8c8 100644
--- a/core/src/plugins/cache.doctrine/ext/PydioRedisCache.php
+++ b/core/src/plugins/cache.doctrine/src/PydioRedisCache.php
@@ -16,16 +16,20 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
-namespace Pydio\Plugins\Cache\Doctrine\Ext;
+namespace Pydio\Cache\Doctrine\Ext;
 defined('AJXP_EXEC') or die('Access not allowed');
 
-require_once "PatternClearableCache.php";
+use Doctrine\Common\Cache\RedisCache;
 use Redis;
 
 
-class PydioRedisCache extends \Doctrine\Common\Cache\RedisCache implements PatternClearableCache
+/**
+ * Class PydioRedisCache
+ * @package Pydio\Cache\Doctrine\Ext
+ */
+class PydioRedisCache extends RedisCache implements PatternClearableCache
 {
     /**
      * @var Redis
@@ -35,7 +39,14 @@ class PydioRedisCache extends \Doctrine\Common\Cache\RedisCache implements Patte
     protected $internalNamespaceVersion;
 
 
-    public function setRedis($redis){
+    /**
+     * Sets the redis instance to use.
+     *
+     * @param Redis $redis
+     *
+     * @return void
+     */
+    public function setRedis(Redis $redis){
         parent::setRedis($redis);
         $this->internalRedis = $redis;
     }
diff --git a/core/src/plugins/conf.serial/class.AJXP_SerialUser.php b/core/src/plugins/conf.serial/class.AJXP_SerialUser.php
deleted file mode 100644
index 163b6e9b7d..0000000000
--- a/core/src/plugins/conf.serial/class.AJXP_SerialUser.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Implementation of the AbstractUser for serial
- * @package AjaXplorer_Plugins
- * @subpackage Conf
- */
-class AJXP_SerialUser extends AbstractAjxpUser
-{
-    public $id;
-    public $hasAdmin = false;
-    public $rights;
-    public $prefs;
-    public $bookmarks;
-    public $version;
-
-    /**
-     * Conf Storage implementation
-     *
-     * @var AbstractConfDriver
-     */
-    public $storage;
-    public $registerForSave = array();
-    public $create = true;
-
-    public $childrenPointer = null;
-
-    /**
-     * @param $id
-     * @param serialConfDriver $storage
-     */
-    public function __construct($id, $storage=null)
-    {
-        parent::__construct($id, $storage);
-        $this->registerForSave = array();
-    }
-
-    public function setGroupPath($groupPath, $update = false)
-    {
-        if ($update && isSet($this->groupPath) && $this->groupPath != $groupPath) {
-            $children = $this->getChildrenPointer();
-            if (is_array($children)) {
-                foreach ($children as $userId) {
-                    // UPDATE USER GROUP AND ROLES
-                    $u = ConfService::getConfStorageImpl()->createUserObject($userId);
-                    $u->setGroupPath($groupPath);
-                    $r = $u->getRoles();
-                    // REMOVE OLD GROUP ROLES
-                    foreach (array_keys($r) as $role) {
-                        if(strpos($role, "AJXP_GRP_/") === 0) $u->removeRole($role);
-                    }
-                    $u->recomputeMergedRole();
-                    $u->save("superuser");
-                }
-            }
-        }
-        parent::setGroupPath($groupPath);
-        $groups = AJXP_Utils::loadSerialFile(AJXP_VarsFilter::filter($this->storage->getOption("USERS_DIRPATH"))."/groups.ser");
-        $groups[$this->getId()] = $groupPath;
-        AJXP_Utils::saveSerialFile(AJXP_VarsFilter::filter($this->storage->getOption("USERS_DIRPATH"))."/groups.ser", $groups);
-    }
-
-    public function __wakeup()
-    {
-        $this->registerForSave = array();
-    }
-
-    public function getStoragePath()
-    {
-        $subDir = trim($this->getGroupPath(), "/");
-        $id = $this->getId();
-        if(AuthService::ignoreUserCase()) $id = strtolower($id);
-        $res = AJXP_VarsFilter::filter($this->storage->getOption("USERS_DIRPATH"))."/".(empty($subDir)?"":$subDir."/").$id;
-        return $res;
-    }
-
-    public function storageExists()
-    {
-        return is_dir($this->getStoragePath());
-    }
-
-    public function load()
-    {
-        $groups = AJXP_Utils::loadSerialFile(AJXP_VarsFilter::filter($this->storage->getOption("USERS_DIRPATH"))."/groups.ser");
-        if(isSet($groups[$this->getId()])) $this->groupPath = $groups[$this->getId()];
-
-        $this->create = false;
-        $this->rights = AJXP_Utils::loadSerialFile($this->getStoragePath()."/rights.ser");
-        if(count($this->rights) == 0) $this->create = true;
-        $this->prefs = AJXP_Utils::loadSerialFile($this->getStoragePath()."/prefs.ser");
-        $this->bookmarks = AJXP_Utils::loadSerialFile($this->getStoragePath()."/bookmarks.ser");
-        if (isSet($this->rights["ajxp.admin"]) && $this->rights["ajxp.admin"] === true) {
-            $this->setAdmin(true);
-        }
-        if (isSet($this->rights["ajxp.parent_user"])) {
-            //$this->setParent($this->rights["ajxp.parent_user"]);
-            parent::setParent($this->rights["ajxp.parent_user"]);
-        }
-        if (isSet($this->rights["ajxp.group_path"])) {
-            $this->setGroupPath($this->rights["ajxp.group_path"]);
-        }
-        if (isSet($this->rights["ajxp.children_pointer"])) {
-            $this->childrenPointer = $this->rights["ajxp.children_pointer"];
-        }
-
-        // LOAD ROLES
-        $rolesToLoad = array();
-        if (isSet($this->rights["ajxp.roles"])) {
-            $rolesToLoad = array_keys($this->rights["ajxp.roles"]);
-        }
-        if ($this->groupPath != null) {
-            $base = "";
-            $exp = explode("/", $this->groupPath);
-            foreach ($exp as $pathPart) {
-                if(empty($pathPart)) continue;
-                $base = $base . "/" . $pathPart;
-                $rolesToLoad[] = "AJXP_GRP_".$base;
-            }
-        }
-        // Load roles
-        if (count($rolesToLoad)) {
-            $allRoles = AuthService::getRolesList($rolesToLoad);
-            foreach ($rolesToLoad as $roleId) {
-                if (isSet($allRoles[$roleId])) {
-                    $this->roles[$roleId] = $allRoles[$roleId];
-                    $this->rights["ajxp.roles"][$roleId] = true;
-                } else if (is_array($this->rights["ajxp.roles"]) && isSet($this->rights["ajxp.roles"][$roleId])) {
-                    unset($this->rights["ajxp.roles"][$roleId]);
-                }
-            }
-        }
-
-        // LOAD USR ROLE LOCALLY
-        $personalRole = AJXP_Utils::loadSerialFile($this->getStoragePath()."/role.ser");
-        if (is_a($personalRole, "AJXP_Role")) {
-            $this->personalRole = $personalRole;
-            $this->roles["AJXP_USR_"."/".$this->id] = $personalRole;
-        } else {
-            // MIGRATE NOW !
-            $changes = $this->migrateRightsToPersonalRole();
-            if ($changes) {
-                AJXP_Utils::saveSerialFile($this->getStoragePath()."/role.ser", $this->personalRole, true);
-                AJXP_Utils::saveSerialFile($this->getStoragePath()."/rights.ser", $this->rights, true);
-            }
-        }
-
-        $this->recomputeMergedRole();
-    }
-
-    protected function _save($context = "superuser")
-    {
-        if ($this->isAdmin() === true) {
-            $this->rights["ajxp.admin"] = true;
-        } else {
-            $this->rights["ajxp.admin"] = false;
-        }
-        if ($this->hasParent()) {
-            $this->rights["ajxp.parent_user"] = $this->parentUser;
-        }
-        if (isSet($this->childrenPointer)) {
-            $this->rights["ajxp.children_pointer"] = $this->childrenPointer;
-        }
-        $this->rights["ajxp.group_path"] = $this->getGroupPath();
-
-        if ($context == "superuser") {
-            $this->registerForSave["rights"] = true;
-        }
-        $this->registerForSave["prefs"] = true;
-        $this->registerForSave["bookmarks"] = true;
-    }
-
-    public function __destruct()
-    {
-        if(count($this->registerForSave)==0) return;
-        $fastCheck = $this->storage->getOption("FAST_CHECKS");
-        $fastCheck = ($fastCheck == "true" || $fastCheck == true);
-        if (isSet($this->registerForSave["rights"]) || $this->create) {
-            $filteredRights = $this->rights;
-            if(isSet($filteredRights["ajxp.roles"])) $filteredRights["ajxp.roles"] = $this->filterRolesForSaving($filteredRights["ajxp.roles"]);
-            AJXP_Utils::saveSerialFile($this->getStoragePath()."/rights.ser", $this->rights, !$fastCheck);
-            AJXP_Utils::saveSerialFile($this->getStoragePath()."/role.ser", $this->personalRole, !$fastCheck);
-        }
-        if (isSet($this->registerForSave["prefs"])) {
-            AJXP_Utils::saveSerialFile($this->getStoragePath()."/prefs.ser", $this->prefs, !$fastCheck);
-        }
-        if (isSet($this->registerForSave["bookmarks"])) {
-            AJXP_Utils::saveSerialFile($this->getStoragePath()."/bookmarks.ser", $this->bookmarks, !$fastCheck);
-        }
-        $this->registerForSave = array();
-    }
-
-    public function getTemporaryData($key)
-    {
-        $fastCheck = $this->storage->getOption("FAST_CHECKS");
-        $fastCheck = ($fastCheck == "true" || $fastCheck == true);
-        return AJXP_Utils::loadSerialFile($this->getStoragePath()."/".$key.".ser",$fastCheck);
-    }
-
-    public function saveTemporaryData($key, $value)
-    {
-        $fastCheck = $this->storage->getOption("FAST_CHECKS");
-        $fastCheck = ($fastCheck == "true" || $fastCheck == true);
-        AJXP_Utils::saveSerialFile($this->getStoragePath()."/".$key.".ser", $value, !$fastCheck);
-    }
-
-    /**
-     * Override parent method to keep a reference to the child users
-     * @param $parentId
-     */
-    public function setParent($parentId)
-    {
-        $u = ConfService::getConfStorageImpl()->createUserObject($parentId);
-        $p = $u->getChildrenPointer();
-        if($p == null) $p = array();
-        $p[$this->getId()] = $this->getId();
-        $u->setChildrenPointer($p);
-        $u->save("superuser");
-        if (AuthService::getLoggedUser() != null && AuthService::getLoggedUser()->getId() == $parentId) {
-            AuthService::updateUser($u);
-        }
-        parent::setParent($parentId);
-    }
-
-    /**
-     * @return null|Array
-     */
-    public function getChildrenPointer()
-    {
-        return $this->childrenPointer;
-    }
-
-    /**
-     * @param Array $array
-     */
-    public function setChildrenPointer($array)
-    {
-        $this->childrenPointer = $array;
-    }
-
-}
diff --git a/core/src/plugins/conf.serial/class.serialConfDriver.php b/core/src/plugins/conf.serial/class.serialConfDriver.php
deleted file mode 100644
index dd40784efb..0000000000
--- a/core/src/plugins/conf.serial/class.serialConfDriver.php
+++ /dev/null
@@ -1,717 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Implementation of the configuration driver on serial files
- * @package AjaXplorer_Plugins
- * @subpackage Conf
- */
-class serialConfDriver extends AbstractConfDriver
-{
-    public $repoSerialFile;
-    public $usersSerialDir;
-    public $rolesSerialFile;
-
-    public $aliasesIndexFile;
-    public $pluginsConfigsFile;
-
-    public function init($options)
-    {
-        parent::init($options);
-        $this->repoSerialFile = AJXP_VarsFilter::filter($this->options["REPOSITORIES_FILEPATH"]);
-        $this->usersSerialDir = AJXP_VarsFilter::filter($this->options["USERS_DIRPATH"]);
-        $this->rolesSerialFile = AJXP_VarsFilter::filter($this->options["ROLES_FILEPATH"]);
-        $this->aliasesIndexFile = dirname($this->repoSerialFile)."/aliases.ser";
-        $this->pluginsConfigsFile = dirname($this->repoSerialFile)."/plugins_configs.ser";
-    }
-
-    public function performChecks()
-    {
-        if(!isSet($this->options)) return;
-        if(isSet($this->options["FAST_CHECKS"]) && $this->options["FAST_CHECKS"] === true) return;
-        $this->performSerialFileCheck($this->repoSerialFile, "repositories file");
-        $this->performSerialFileCheck($this->usersSerialDir, "users file", true);
-        $this->performSerialFileCheck($this->rolesSerialFile, "roles file");
-    }
-
-    public function performSerialFileCheck($file, $fileLabel, $isDir = false)
-    {
-        // Try to replace start path to avoid seeing full paths on screen
-        if ($isDir) {
-            if (!is_dir($file) || !is_writable($file)) {
-                $file = str_replace(AJXP_INSTALL_PATH, "", $file);
-                throw new Exception("Folder $file for storing $fileLabel is either inexistent or not writeable.");
-            }
-            return ;
-        }
-        $dir = dirname($file);
-        if (!is_dir($dir) || !is_writable($dir)) {
-            $dir = str_replace(AJXP_INSTALL_PATH, "", $dir);
-            throw new Exception("Folder $dir for $fileLabel is either inexistent or not writeable.");
-        }
-        if (is_file($file) && !is_writable($file)) {
-            $file = str_replace(AJXP_INSTALL_PATH, "", $file);
-            throw new Exception(ucfirst($fileLabel)." ($file) exists but is not writeable!");
-        }
-    }
-
-    // SAVE / LOAD PLUGINS CONF
-    public function _loadPluginConfig($pluginId, &$options)
-    {
-        $data = AJXP_Utils::loadSerialFile($this->pluginsConfigsFile);
-        if (isSet($data[$pluginId]) && is_array($data[$pluginId])) {
-            foreach ($data[$pluginId] as $key => $value) {
-                if(isSet($options[$key])) continue;
-                if (is_string($value)) {
-                    if (strpos($value, "\\n")) {
-                        $value = str_replace("\\n", "\n", $value);
-                    }
-                    if (strpos($value, "\\r")) {
-                        $value = str_replace("\\r", "\r", $value);
-                    }
-                }
-                $options[$key] = $value;
-            }
-        }
-    }
-
-    public function _savePluginConfig($pluginId, $options)
-    {
-        $data = AJXP_Utils::loadSerialFile($this->pluginsConfigsFile);
-        foreach ($options as $k=>$v) {
-            if (is_string($v)) {
-                $options[$k] = addcslashes($v, "\r\n");
-            }
-        }
-        $data[$pluginId] = $options;
-        AJXP_Utils::saveSerialFile($this->pluginsConfigsFile, $data);
-    }
-
-    // SAVE / EDIT / CREATE / DELETE REPOSITORY
-    /**
-     * @param AbstractAjxpUser $user
-     * @return array
-     */
-    public function listRepositories($user = null)
-    {
-        $all = AJXP_Utils::loadSerialFile($this->repoSerialFile);
-        if ($user != null) {
-            foreach ($all as $repoId => $repoObject) {
-                if (!ConfService::repositoryIsAccessible($repoId, $repoObject, $user)) {
-                    unset($all[$repoId]);
-                }
-            }
-        }
-        return $all;
-    }
-
-    /**
-     * Returns a list of available repositories (dynamic ones only, not the ones defined in the config file).
-     * @param Array $criteria
-     * @param $count
-     * @return Array
-     */
-    public function listRepositoriesWithCriteria($criteria, &$count = null){
-
-        $all = AJXP_Utils::loadSerialFile($this->repoSerialFile);
-        if ($criteria != null) {
-            return ConfService::filterRepositoryListWithCriteria($all, $criteria);
-        }else{
-            return $all;
-        }
-
-    }
-
-
-    public function listRoles($roleIds = array(), $excludeReserved = false)
-    {
-        $all = AJXP_Utils::loadSerialFile($this->rolesSerialFile);
-        $result = array();
-        if (count($roleIds)) {
-            foreach ($roleIds as $id) {
-                if (isSet($all[$id]) && !($excludeReserved && strpos($id,"AJXP_") === 0)) {
-                    $result[$id] = $all[$id];
-                }
-            }
-        } else {
-            foreach ($all as $id => $role) {
-                if($excludeReserved && strpos($id,"AJXP_") === 0) continue;
-                $result[$id] = $role;
-            }
-        }
-        return $result;
-    }
-
-    public function saveRoles($roles)
-    {
-        AJXP_Utils::saveSerialFile($this->rolesSerialFile, $roles);
-    }
-
-    /**
-     * @param AJXP_Role $role
-     * @param AbstractAjxpUser|null $userObject
-     */
-    public function updateRole($role, $userObject = null)
-    {
-        if ($userObject != null) {
-            // This a personal role, save differently
-            $userObject->personalRole = $role;
-            $userObject->save("superuser");
-        } else {
-            $all = AJXP_Utils::loadSerialFile($this->rolesSerialFile);
-            $all[$role->getId()] = $role;
-            AJXP_Utils::saveSerialFile($this->rolesSerialFile, $all);
-        }
-    }
-
-    public function deleteRole($role)
-    {
-        // Mixed input Object or ID
-        if(is_a($role, "AJXP_Role")) $roleId = $role->getId();
-        else $roleId = $role;
-
-        $all = AJXP_Utils::loadSerialFile($this->rolesSerialFile);
-        if(isSet($all[$roleId])) unset($all[$roleId]);
-        AJXP_Utils::saveSerialFile($this->rolesSerialFile, $all);
-    }
-
-    public function countAdminUsers()
-    {
-        $confDriver = ConfService::getConfStorageImpl();
-        $authDriver = ConfService::getAuthDriverImpl();
-        $count = 0;
-        $users = $authDriver->listUsers();
-        foreach (array_keys($users) as $userId) {
-            $userObject = $confDriver->createUserObject($userId);
-            $userObject->load();
-            if($userObject->isAdmin()) $count++;
-        }
-        return $count;
-    }
-
-    /**
-     * Unique ID of the repositor
-     *
-     * @param String $repositoryId
-     * @return Repository
-     */
-    public function getRepositoryById($repositoryId)
-    {
-        $repositories = AJXP_Utils::loadSerialFile($this->repoSerialFile);
-        if (isSet($repositories[$repositoryId])) {
-            return $repositories[$repositoryId];
-        }
-        return null;
-    }
-    /**
-     * Retrieve a Repository given its alias.
-     *
-     * @param String $repositorySlug
-     * @return Repository
-     */
-    public function getRepositoryByAlias($repositorySlug)
-    {
-        $data = AJXP_Utils::loadSerialFile($this->aliasesIndexFile);
-        if (isSet($data[$repositorySlug])) {
-            return $this->getRepositoryById($data[$repositorySlug]);
-        }
-        return null;
-    }
-
-    /**
-     * Store a newly created repository
-     *
-     * @param Repository $repositoryObject
-     * @param Boolean $update
-     * @return -1 if failed
-     */
-    public function saveRepository($repositoryObject, $update = false)
-    {
-        $repositories = AJXP_Utils::loadSerialFile($this->repoSerialFile);
-        if (!$update) {
-            $repositoryObject->writeable = true;
-            $repositories[$repositoryObject->getUniqueId()] = $repositoryObject;
-        } else {
-            foreach ($repositories as $index => $repo) {
-                if ($repo->getUniqueId() == $repositoryObject->getUniqueId()) {
-                    $repositories[$index] = $repositoryObject;
-                    break;
-                }
-            }
-        }
-        try {
-            AJXP_Utils::saveSerialFile($this->repoSerialFile, $repositories);
-        } catch (Exception $e) {
-            return -1;
-        }
-        $this->updateAliasesIndex($repositoryObject->getUniqueId(), $repositoryObject->getSlug());
-    }
-    /**
-     * Delete a repository, given its unique ID.
-     *
-     * @param String $repositoryId
-     */
-    public function deleteRepository($repositoryId)
-    {
-        $repositories = AJXP_Utils::loadSerialFile($this->repoSerialFile);
-        $newList = array();
-        foreach ($repositories as $repo) {
-            if ($repo->getUniqueId() != $repositoryId) {
-                $newList[$repo->getUniqueId()] = $repo;
-            }
-        }
-        AJXP_Utils::saveSerialFile($this->repoSerialFile, $newList);
-        $this->updateAliasesIndex($repositoryId, null);
-        $us = $this->getUsersForRepository($repositoryId);
-        foreach ($us as $user) {
-            $user->personalRole->setAcl($repositoryId, "");
-            $user->save("superuser");
-        }
-    }
-    /**
-     * Serial specific method : indexes repositories by slugs, for better performances
-     */
-    public function updateAliasesIndex($repositoryId, $repositorySlug)
-    {
-        $data = AJXP_Utils::loadSerialFile($this->aliasesIndexFile);
-        $byId = array_flip($data);
-        if ($repositorySlug == null) {
-            if (isSet($byId[$repositoryId])) {
-                unset($byId[$repositoryId]);
-                AJXP_Utils::saveSerialFile($this->aliasesIndexFile, array_flip($byId));
-            }
-        } else {
-            $byId[$repositoryId] = $repositorySlug;
-            AJXP_Utils::saveSerialFile($this->aliasesIndexFile, array_flip($byId));
-        }
-    }
-
-    /**
-     * @abstract
-     * @param $userId
-     * @return array()
-     */
-    public function getUserChildren($userId)
-    {
-        $result = array();
-        $authDriver = ConfService::getAuthDriverImpl();
-        $confDriver = ConfService::getConfStorageImpl();
-        $parent = $confDriver->createUserObject($userId);
-        $pointer = $parent->getChildrenPointer(); // SERIAL USER SPECIFIC METHOD
-        if (!is_array($pointer)) { // UPDATE FIRST TIME
-            $users = $authDriver->listUsers();
-            $pointer = array();
-            foreach (array_keys($users) as $id) {
-                $object = $confDriver->createUserObject($id);
-                if ($object->hasParent() && $object->getParent() == $userId) {
-                    $result[] = $object;
-                    $pointer[$object->getId()] = $object->getId();
-                }
-            }
-            $parent->setChildrenPointer($pointer);
-            $parent->save("superuser");
-        } else {
-            foreach ($pointer as $childId) {
-                if (!AuthService::userExists($childId)) {
-                    $clean = true;
-                    unset($pointer[$childId]);
-                    continue;
-                }
-                $object = $confDriver->createUserObject($childId);
-                if ($object->hasParent() && $object->getParent() == $userId) {
-                    $result[] = $object;
-                }
-            }
-            if ($clean) {
-                $parent->setChildrenPointer($pointer);
-                $parent->save("superuser");
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * @param string $repositoryId
-     * @return AbstractAjxpUser[]
-     */
-    public function getUsersForRepository($repositoryId)
-    {
-        $result = array();
-        $authDriver = ConfService::getAuthDriverImpl();
-        $confDriver = ConfService::getConfStorageImpl();
-        $users = $authDriver->listUsers(AuthService::filterBaseGroup("/"));
-        foreach (array_keys($users) as $id) {
-            $object = $confDriver->createUserObject($id);
-            if ($object->canSwitchTo($repositoryId)) {
-                $result[$id] = $object;
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * @abstract
-     * @param string $repositoryId
-     * @param string $rolePrefix
-     * @param bool $countOnly
-     * @return array()
-     */
-    public function getRolesForRepository($repositoryId, $rolePrefix = '', $countOnly = false){
-        return array();
-    }
-
-    /**
-     * @param string $repositoryId
-     * @param boolean $details
-     * @param bool $admin
-     * @return array
-     */
-    public function countUsersForRepository($repositoryId, $details = false, $admin=false){
-        $c = count($this->getUsersForRepository($repositoryId));
-        if($details) return array("users" => $c);
-        else return $c;
-    }
-
-
-    public function filterUsersByGroup(&$flatUsersList, $baseGroup = "/", $fullTree = false)
-    {
-        $groups = AJXP_Utils::loadSerialFile(AJXP_VarsFilter::filter($this->getOption("USERS_DIRPATH"))."/groups.ser");
-        foreach ($flatUsersList as $userid => $userdata) {
-            if (is_array($groups) && array_key_exists($userid, $groups)) {
-                $path = $groups[$userid];
-                if (substr($path, 0, strlen($baseGroup)) != $baseGroup) {
-                    unset($flatUsersList[$userid]);
-                } else if (strlen($path) > strlen($baseGroup)) {
-                    if(!$fullTree) unset($flatUsersList[$userid]);
-                }
-            } else {
-                if ($baseGroup != "/") {
-                    unset($flatUsersList[$userid]);
-                }
-            }
-        }
-    }
-
-    public function getChildrenGroups($baseGroup = "/")
-    {
-        $groups = AJXP_Utils::loadSerialFile(AJXP_VarsFilter::filter($this->getOption("USERS_DIRPATH"))."/groups.ser");
-        $levelGroups = array();
-        $labels = array();
-        asort($groups);
-        foreach ($groups as $id => $path) {
-            $testGroup = $baseGroup;
-            if($baseGroup != "/") $testGroup .= "/";
-            if (substr($path, 0, strlen($testGroup)) == $testGroup && strlen($path) >  strlen($testGroup)) {
-                $parts = explode("/", ltrim(substr($path, strlen($baseGroup)), "/"));
-                $sub = "/".array_shift($parts);
-                if(!isset($levelGroups[$sub])) $levelGroups[$sub] = $path;
-                if (substr($id, 0, strlen("AJXP_GROUP:")) == "AJXP_GROUP:") {
-                    $labels[$path] = array_pop(explode(":", $id, 2));
-                }
-            }
-        }
-        foreach ($levelGroups as $gId => $grPath) {
-            if(isSet($labels[$grPath])) $levelGroups[$gId] = $labels[$grPath];
-            else $levelGroups[$gId] = $gId;
-        }
-        return $levelGroups;
-    }
-
-    public function createGroup($groupPath, $groupLabel)
-    {
-        $groups = AJXP_Utils::loadSerialFile(AJXP_VarsFilter::filter($this->getOption("USERS_DIRPATH"))."/groups.ser");
-        $reverse = array_flip($groups);
-        if (isSet($reverse[$groupPath])) {
-            $oldLabel = $reverse[$groupPath];
-            unset($groups[$oldLabel]);
-            $groups["AJXP_GROUP:$groupLabel"] = $groupPath;
-        } else {
-            $groups["AJXP_GROUP:$groupLabel"] = $groupPath;
-        }
-        AJXP_Utils::saveSerialFile(AJXP_VarsFilter::filter($this->getOption("USERS_DIRPATH"))."/groups.ser", $groups);
-    }
-
-    public function relabelGroup($groupPath, $groupLabel)
-    {
-        $groups = AJXP_Utils::loadSerialFile(AJXP_VarsFilter::filter($this->getOption("USERS_DIRPATH"))."/groups.ser");
-        $reverse = array_flip($groups);
-        if (isSet($reverse[$groupPath])) {
-            $oldLabel = $reverse[$groupPath];
-            unset($groups[$oldLabel]);
-            $groups["AJXP_GROUP:$groupLabel"] = $groupPath;
-            AJXP_Utils::saveSerialFile(AJXP_VarsFilter::filter($this->getOption("USERS_DIRPATH"))."/groups.ser", $groups);
-        }
-    }
-
-    public function deleteGroup($groupPath)
-    {
-        $gUsers = AuthService::listUsers($groupPath);
-        $gGroups = AuthService::listChildrenGroups($groupPath);
-        if (count($gUsers) || count($gGroups)) {
-            throw new Exception("Group is not empty, please do something with its content before trying to delete it!");
-        }
-        $groups = AJXP_Utils::loadSerialFile(AJXP_VarsFilter::filter($this->getOption("USERS_DIRPATH"))."/groups.ser");
-        foreach ($groups as $key => $value) {
-            if($value == $groupPath) unset($groups[$key]);
-        }
-        AJXP_Utils::saveSerialFile(AJXP_VarsFilter::filter($this->getOption("USERS_DIRPATH"))."/groups.ser", $groups);
-    }
-
-    /**
-     * Instantiate the right class
-     *
-     * @param String $userId
-     * @return AbstractAjxpUser
-     */
-    public function instantiateAbstractUserImpl($userId)
-    {
-        return new AJXP_SerialUser($userId, $this);
-    }
-
-    public function getUserClassFileName()
-    {
-        return AJXP_INSTALL_PATH."/plugins/conf.serial/class.AJXP_SerialUser.php";
-    }
-
-    /**
-     * Function for deleting a user
-     *
-     * @param String $userId
-     * @param Array $deletedSubUsers
-     */
-    public function deleteUser($userId, &$deletedSubUsers)
-    {
-        $user = $this->createUserObject($userId);
-        $files = glob($user->getStoragePath()."/*.ser");
-        if (is_array($files) && count($files)) {
-            foreach ($files as $file) {
-                unlink($file);
-            }
-        }
-        if (is_dir($user->getStoragePath())) {
-            rmdir($user->getStoragePath());
-        }
-
-        // DELETE CHILDREN USING POINTER IF POSSIBLE
-        $users = $this->getUserChildren($userId); // $authDriver->listUsers();
-        foreach (array_keys($users) as $id) {
-            $object = $this->createUserObject($id);
-            if ($object->hasParent() && $object->getParent() == $userId) {
-                $this->deleteUser($id, $deletedSubUsers);
-                $deletedSubUsers[] = $id;
-            }
-        }
-
-
-        // CLEAR PARENT POINTER IF NECESSARY
-        if ($user->hasParent()) {
-            $parentObject = $this->createUserObject($user->getParent());
-            $pointer = $parentObject->getChildrenPointer();
-            if ($pointer !== null) {
-                unset($pointer[$userId]);
-                $parentObject->setChildrenPointer($pointer);
-                $parentObject->save("superuser");
-                if (AuthService::getLoggedUser() != null && AuthService::getLoggedUser()->getId() == $parentObject->getId()) {
-                    AuthService::updateUser($parentObject);
-                }
-            }
-        }
-
-        $groups = AJXP_Utils::loadSerialFile(AJXP_VarsFilter::filter($user->storage->getOption("USERS_DIRPATH"))."/groups.ser");
-        if (isSet($groups[$userId])) {
-            unset($groups[$userId]);
-            AJXP_Utils::saveSerialFile(AJXP_VarsFilter::filter($user->storage->getOption("USERS_DIRPATH"))."/groups.ser", $groups);
-
-        }
-    }
-
-    protected function getBinaryPathStorage($context)
-    {
-        $storage = $this->getPluginWorkDir()."/binaries";
-        if (isSet($context["USER"])) {
-            $storage.="/users/".$context["USER"];
-        } else if (isSet($context["REPO"])) {
-            $storage.="/repos/".$context["REPO"];
-        } else if (isSet($context["ROLE"])) {
-            $storage.="/roles/".$context["ROLE"];
-        } else if (isSet($context["PLUGIN"])) {
-            $storage.="/plugins/".$context["PLUGIN"];
-        }
-        if (!isSet($this->options["FAST_CHECKS"]) || $this->options["FAST_CHECKS"] !== true) {
-            if(!is_dir($storage)) @mkdir($storage, 0755, true);
-        }
-        return $storage;
-    }
-
-    /**
-     * @param array $context
-     * @param String $fileName
-     * @param String $ID
-     * @return String $ID
-     */
-    public function saveBinary($context, $fileName, $ID = null)
-    {
-        if (empty($ID)) {
-            $ID = substr(md5(microtime()*rand(0,100)), 0, 12);
-            $ID .= ".".pathinfo($fileName, PATHINFO_EXTENSION);
-        }
-        copy($fileName, $this->getBinaryPathStorage($context)."/".$ID);
-
-        return $ID;
-    }
-
-    /**
-     * @abstract
-     * @param array $context
-     * @param String $ID
-     * @return boolean
-     */
-    public function deleteBinary($context, $ID)
-    {
-        if (is_file($this->getBinaryPathStorage($context)."/".$ID)) {
-            unlink($this->getBinaryPathStorage($context)."/".$ID);
-        }
-    }
-
-    /**
-     * @param array $context
-     * @param String $ID
-     * @param Resource $outputStream
-     * @return boolean
-     */
-    public function loadBinary($context, $ID, $outputStream = null)
-    {
-        $fileName = $this->getBinaryPathStorage($context)."/".$ID;
-        if (is_file($fileName)) {
-            if ($outputStream == null) {
-                header("Content-Type: ".AJXP_Utils::getImageMimeType($ID));
-                // PROBLEM AT STARTUP
-                header('Pragma:');
-                header('Cache-Control: public');
-                header("Last-Modified: " . gmdate("D, d M Y H:i:s", filemtime($fileName)) . " GMT");
-                header("Expires: " . gmdate("D, d M Y H:i:s", filemtime($fileName)+5*24*3600) . " GMT");
-                readfile($fileName);
-            } else if (is_resource($outputStream)) {
-                fwrite($outputStream, file_get_contents($this->getBinaryPathStorage($context)."/".$ID));
-            }
-        }
-    }
-
-    /**
-     * @abstract
-     * @param String $keyType
-     * @param String $keyId
-     * @param String $userId
-     * @param Array $data
-     * @return boolean
-     */
-    public function saveTemporaryKey($keyType, $keyId, $userId, $data)
-    {
-        $storage = $this->getPluginWorkDir()."/temporary_keys";
-        $list = AJXP_Utils::loadSerialFile($storage, false, "ser");
-        if(isSEt($list[$keyType])) $list[$keyType] = array();
-        $data["user_id"] = $userId;
-        $data["date"] = time();
-        $list[$keyType][$keyId] = $data;
-        AJXP_Utils::saveSerialFile($storage, $list);
-    }
-
-    /**
-     * @abstract
-     * @param String $keyType
-     * @param String $keyId
-     * @return array
-     */
-    public function loadTemporaryKey($keyType, $keyId)
-    {
-        $storage = $this->getPluginWorkDir()."/temporary_keys";
-        $list = AJXP_Utils::loadSerialFile($storage, false, "ser");
-        if (iSset($list[$keyType]) && iSset($list[$keyType][$keyId])) {
-            return $list[$keyType][$keyId];
-        } else {
-            return null;
-        }
-
-    }
-
-    /**
-     * @abstract
-     * @param String $keyType
-     * @param String $keyId
-     * @return boolean
-     */
-    public function deleteTemporaryKey($keyType, $keyId)
-    {
-        $storage = $this->getPluginWorkDir()."/temporary_keys";
-        $list = AJXP_Utils::loadSerialFile($storage, false, "ser");
-        if (iSset($list[$keyType]) && iSset($list[$keyType][$keyId])) {
-            unset($list[$keyType][$keyId]);
-            if (count($list[$keyType]) == 0) {
-                unset($list[$keyType]);
-            }
-        }
-        AJXP_Utils::saveSerialFile($storage, $list);
-        return true;
-    }
-
-    /**
-     * @abstract
-     * @param String $keyType
-     * @param String $expiration
-     * @return null
-     */
-    public function pruneTemporaryKeys($keyType, $expiration)
-    {
-        $storage = $this->getPluginWorkDir()."/temporary_keys";
-        $list = AJXP_Utils::loadSerialFile($storage, false, "ser");
-        foreach ($list as $type => &$keys) {
-            foreach ($keys as $key => $data) {
-                if ($data["date"] < time() - $expiration*60) {
-                    unset($keys[$key]);
-                }
-            }
-            if (count($keys) == 0) {
-                unset($list[$type]);
-            }
-        }
-        AJXP_Utils::saveSerialFile($storage, $list);
-    }
-
-    /**
-     * Check if group already exists
-     * @param string $groupPath
-     * @return boolean
-     */
-    public function groupExists($groupPath)
-    {
-        $groups = AJXP_Utils::loadSerialFile(AJXP_VarsFilter::filter($this->getOption("USERS_DIRPATH"))."/groups.ser");
-        $reverse = array_flip($groups);
-        if (isSet($reverse[$groupPath])) {
-            return true;
-        }
-
-        return false;
-    }
-
-}
diff --git a/core/src/plugins/conf.serial/i18n/conf/de.php b/core/src/plugins/conf.serial/i18n/conf/de.php
deleted file mode 100644
index c986ffa735..0000000000
--- a/core/src/plugins/conf.serial/i18n/conf/de.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Serialized Configuration Storage" => "Serialisierte Dateien",
-"Stores the conf data as serialized PHP values on the filesystem." => "Speichert Konfigurationsdaten durch PHP serialisiert im Dateisystem.",
-"Repositories" => "Arbeitsumgebungen",
-"The file in which the repositories are stored" => "Datei in der die Arbeitsumgebungen gespeichert werden",
-"Users" => "Benutzer",
-"The folder in which all users files will be stored" => "Ordner, in dem alle Benutzerdaten gespeichert werden",
-"Roles" => "Rollen",
-"The file in which all roles definitions will be stored" => "Die Datei, in der alle Rollendefinitionen gespeichert werden",
-"Repositories File" => "Arbeitsumgebungs Datei",
-"Users Folder" => "Benutzerordner",
-"Roles File" => "Rollendatei",
-"Fast Checks" => "Schnellprüfung",
-"When using a custom stream wrapper to read the files, this can increase performances by skipping various is_file,is_dir checks" => "Wenn ein benutzerdefinierter Stream-Wrapper verwendet wird kann dies die Geschwindigkeit verbessern, indem verschiedene is_file oder is_dir Prüfungen übersprungen werden.",
-);
diff --git a/core/src/plugins/conf.serial/i18n/conf/en.php b/core/src/plugins/conf.serial/i18n/conf/en.php
deleted file mode 100644
index cb23ada572..0000000000
--- a/core/src/plugins/conf.serial/i18n/conf/en.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Serialized Configuration Storage" => "Serialized Files",
-"Stores the conf data as serialized PHP values on the filesystem." => "Stores the conf data as serialized PHP values on the filesystem.",
-"Repositories" => "Workspaces",
-"The file in which the repositories are stored" => "The file in which the workspaces are stored",
-"Users" => "Users",
-"The folder in which all users files will be stored" => "The folder in which all users files will be stored",
-"Roles" => "Roles",
-"The file in which all roles definitions will be stored" => "The file in which all roles definitions will be stored",
-"Repositories File" => "Repositories File",
-"Users Folder" => "Users Folder",
-"Roles File" => "Roles File",
-"Fast Checks" => "Fast Checks",
-"When using a custom stream wrapper to read the files, this can increase performances by skipping various is_file,is_dir checks" => "When using a custom stream wrapper to read the files, this can increase performances by skipping various is_file,is_dir checks",
-);
\ No newline at end of file
diff --git a/core/src/plugins/conf.serial/i18n/conf/fr.php b/core/src/plugins/conf.serial/i18n/conf/fr.php
deleted file mode 100644
index 51a46fd4e5..0000000000
--- a/core/src/plugins/conf.serial/i18n/conf/fr.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Serialized Configuration Storage" => "Fichiers sérialisés",
-"Stores the conf data as serialized PHP values on the filesystem." => "Les configurations sont stockées sous forme de données sérialisées dans des fichiers",
-"Repositories" => "Dépôts",
-"The file in which the repositories are stored" => "Fichier de stockage des dépôts",
-"Users" => "Utilisateurs",
-"The folder in which all users files will be stored" => "Répertoire de stockage des fichiers des utilisateurs",
-"Roles" => "Rôles",
-"The file in which all roles definitions will be stored" => "Fichier de stockage des rôles.",
-"Repositories File" => "Fichier des dépôts",
-"Users Folder" => "Répertoire des utilisateurs",
-"Roles File" => "Fichier des rôles",
-"Fast Checks" => "Vérifications rapides",
-"When using a custom stream wrapper to read the files, this can increase performances by skipping various is_file,is_dir checks" => "Lors de l'utilisation d'un wrapper personnalisé pour lire les fichiers, cela peut améliorer les performances en ignorant des vérifications de type 'is_file,is_dir'",
-);
\ No newline at end of file
diff --git a/core/src/plugins/conf.serial/i18n/conf/it.php b/core/src/plugins/conf.serial/i18n/conf/it.php
deleted file mode 100644
index 4b3417249c..0000000000
--- a/core/src/plugins/conf.serial/i18n/conf/it.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Serialized Configuration Storage" => "File Serializzati",
-"Stores the conf data as serialized PHP values on the filesystem." => "Memorizza le configurazioni come valori serializzati PHP nel filesystem.",
-"Repositories" => "Workspaces",
-"The file in which the repositories are stored" => "Il file nel quale i workspace sono memorizzati",
-"Users" => "Utenti",
-"The folder in which all users files will be stored" => "La cartella nella quale tutti i file degli utenti saranno memorizzati",
-"Roles" => "Ruoli",
-"The file in which all roles definitions will be stored" => "Il file nel quale tutte le definizioni dei ruoli saranno memorizzate",
-"Repositories File" => "File Worspace",
-"Users Folder" => "Cartella Utenti",
-"Roles File" => "File Ruoli",
-"Fast Checks" => "Controlli Rapidi",
-"When using a custom stream wrapper to read the files, this can increase performances by skipping various is_file,is_dir checks" => "Quando si utilizza un wrapper personalizzato per leggere i file, questa opzione può aumentare le performance saltando diversi controlli 'is_file' e 'is_dir'",
-);
diff --git a/core/src/plugins/conf.serial/i18n/conf/pt.php b/core/src/plugins/conf.serial/i18n/conf/pt.php
deleted file mode 100644
index 9473454a7d..0000000000
--- a/core/src/plugins/conf.serial/i18n/conf/pt.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Serialized Configuration Storage" => "Ficheiros em série",
-"Stores the conf data as serialized PHP values on the filesystem." => "Guarda os dados de autenticação em valores em série PHP no sistema de ficheiros.",
-"Repositories" => "Áreas de Trabalho",
-"The file in which the repositories are stored" => "O ficheiro onde as Áreas de Trabalho são guardadas",
-"Users" => "Utilizadores",
-"The folder in which all users files will be stored" => "A pasta onde todos os utilizadores serão guardados",
-"Roles" => "Papéis",
-"The file in which all roles definitions will be stored" => "O Ficheiro onde todas as definições dos papéis serão guardados",
-"Repositories File" => "Repositories File",
-"Users Folder" => "Users Folder",
-"Roles File" => "Roles File",
-"Fast Checks" => "Fast Checks",
-"When using a custom stream wrapper to read the files, this can increase performances by skipping various is_file,is_dir checks" => "When using a custom stream wrapper to read the files, this can increase performances by skipping various is_file,is_dir checks",
-);
\ No newline at end of file
diff --git a/core/src/plugins/conf.serial/manifest.xml b/core/src/plugins/conf.serial/manifest.xml
deleted file mode 100644
index b749f8a618..0000000000
--- a/core/src/plugins/conf.serial/manifest.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<confdriver name="serial" id="conf.serial" label="CONF_MESSAGE[Serialized Configuration Storage]" description="CONF_MESSAGE[Stores the conf data as serialized PHP values on the filesystem.]"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <client_settings>
-        <resources>
-            <i18n namespace="serial_conf" path="plugins/conf.serial/i18n"/>
-        </resources>
-    </client_settings>
-	<server_settings>
-		<param name="REPOSITORIES_FILEPATH" type="string" label="CONF_MESSAGE[Repositories File]" description="CONF_MESSAGE[The file in which the repositories are stored]" mandatory="true" default="AJXP_DATA_PATH/plugins/conf.serial/repo.ser" />
-		<param name="USERS_DIRPATH" type="string" label="CONF_MESSAGE[Users Folder]" description="CONF_MESSAGE[The folder in which all users files will be stored]" mandatory="true" default="AJXP_DATA_PATH/plugins/auth.serial"/>
-		<param name="ROLES_FILEPATH" type="string" label="CONF_MESSAGE[Roles File]" description="CONF_MESSAGE[The file in which all roles definitions will be stored]" mandatory="true" default="AJXP_DATA_PATH/plugins/auth.serial/roles.ser"/>
-		<param name="FAST_CHECKS" type="boolean" label="CONF_MESSAGE[Fast Checks]" description="CONF_MESSAGE[When using a custom stream wrapper to read the files, this can increase performances by skipping various is_file,is_dir checks]" mandatory="false" default="false"/>
-	</server_settings>
-	<class_definition filename="plugins/conf.serial/class.serialConfDriver.php" classname="serialConfDriver"/>
-	<registry_contributions>
-		<external_file filename="plugins/core.conf/standard_conf_actions.xml" include="actions/*,client_configs/*" exclude=""/>
-	</registry_contributions>
-</confdriver>
diff --git a/core/src/plugins/conf.serial/plugin_doc.html b/core/src/plugins/conf.serial/plugin_doc.html
deleted file mode 100644
index f5f5363161..0000000000
--- a/core/src/plugins/conf.serial/plugin_doc.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>The default implementation, stores all data inside a php serialized files. By default, "ser" files are stored in data/plugins/conf.serial/ folder.</p>
\ No newline at end of file
diff --git a/core/src/plugins/conf.sql/SqlConfDriver.php b/core/src/plugins/conf.sql/SqlConfDriver.php
new file mode 100644
index 0000000000..7339a46f36
--- /dev/null
+++ b/core/src/plugins/conf.sql/SqlConfDriver.php
@@ -0,0 +1,1427 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Conf\Sql;
+
+use DibiResult;
+use Pydio\Access\Core\Filter\ContentFilter;
+use Pydio\Access\Core\Model\Repository;
+use Pydio\Core\Controller\HTMLWriter;
+use Pydio\Core\Exception\DBConnectionException;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Model\RepositoryInterface;
+use Pydio\Core\Model\UserInterface;
+use Pydio\Conf\Core\AbstractUser;
+use Pydio\Conf\Core\AbstractConfDriver;
+use Pydio\Conf\Core\AJXP_Role;
+use Pydio\Conf\Core\AjxpRole;
+
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Utils\DBHelper;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\OptionsHelper;
+use Pydio\Core\Utils\Vars\StatHelper;
+use Pydio\Core\Utils\Vars\StringHelper;
+use Pydio\Core\PluginFramework\SqlTableProvider;
+
+use \dibi;
+use \DibiException;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Configuration stored in an SQL Database
+ * @package AjaXplorer_Plugins
+ * @subpackage Conf
+ */
+class SqlConfDriver extends AbstractConfDriver implements SqlTableProvider
+{
+    public $sqlDriver = array();
+
+    /**
+     * Initialise the driver.
+     *
+     * Expects options containing a key 'SQL_DRIVER' with constructor values from dibi::connect()
+     *
+     * Example:
+     * 		"SQL_DRIVER" => Array(
+     *		'driver' => 'sqlite',
+     *			'file' => "./server/ajxp.db"
+     *		)
+     *
+     * Example 2:
+     * 		"SQL_DRIVER" => Array(
+     * 		'driver' => 'mysql',
+     * 		'host' => 'localhost',
+     * 		'username' => 'root',
+     * 		'password' => '***',
+     * 		'database' => 'dbname'
+     * 		)
+     *
+     * @see AbstractConfDriver#init($options)
+     * @param ContextInterface $ctx
+     * @param array $options
+     * @throws DBConnectionException
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        parent::init($ctx, $options);
+        $this->sqlDriver = OptionsHelper::cleanDibiDriverParameters($options["SQL_DRIVER"]);
+        try {
+            if(!dibi::isConnected()) {
+                dibi::connect($this->sqlDriver);
+            }
+            if(AJXP_SERVER_DEBUG && AJXP_VERSION_DB != "##DB_VERSION##"){
+                $res = dibi::query("select MAX(db_build) from [ajxp_version]");
+                if(!empty($res)){
+                    $dbVersion = intval($res->fetchSingle());
+                    $current = intval(AJXP_VERSION_DB);
+                    if($dbVersion > 0 && $dbVersion < $current){
+                        // We need to upgrade now!
+                        error_log("[Pydio] DB Upgrade Required! You may encounter strange issues. Make sure to manually apply the DB update.");
+                        $this->logError("[DB]", "DB Upgrade Required! You may encounter strange issues. Make sure to manually apply the DB update.");
+                    }
+                }
+            }
+        } catch (DibiException $e) {
+            throw new DBConnectionException();
+        }
+    }
+
+    public function performChecks()
+    {
+        if(!isSet($this->options)) return;
+        $test = OptionsHelper::cleanDibiDriverParameters($this->options["SQL_DRIVER"]);
+        if (!count($test)) {
+            throw new \Exception("You probably did something wrong! To fix this issue you have to remove the file \"bootsrap.json\" and rename the backup file \"bootstrap.json.bak\" into \"bootsrap.json\" in data/plugins/boot.conf/");
+        }
+    }
+
+    /**
+     * @param string $pluginId
+     * @param array $options
+     */
+    public function _loadPluginConfig($pluginId, &$options)
+    {
+        if($this->sqlDriver["driver"] == "postgre"){
+            dibi::query("SET bytea_output=escape");
+        }
+        $res_opts = dibi::query('SELECT * FROM [ajxp_plugin_configs] WHERE [id] = %s', $pluginId);
+        $config_row = $res_opts->fetchPairs();
+        $confOpt = unserialize($config_row[$pluginId]);
+        if (is_array($confOpt)) {
+            foreach($confOpt as $key => $value) $options[$key] = $value;
+        }
+    }
+
+    /**
+     *
+     * @param String $pluginId
+     * @param String $options
+     */
+    public function _savePluginConfig($pluginId, $options)
+    {
+        $res_opts = dibi::query('SELECT COUNT(*) FROM [ajxp_plugin_configs] WHERE [id] = %s', $pluginId);
+        if ($res_opts->fetchSingle()) {
+            dibi::query('UPDATE [ajxp_plugin_configs] SET [configs] = %bin WHERE [id] = %s', serialize($options), $pluginId);
+        } else {
+            dibi::query('INSERT INTO [ajxp_plugin_configs] ([id],[configs]) VALUES (%s,%bin)', $pluginId, serialize($options));
+        }
+    }
+
+    /**
+     * Create a Repository object from a Database Result
+     *
+     * The method expects the following schema:
+     * CREATE TABLE ajxp_repo ( uuid VARCHAR(33) PRIMARY KEY,
+     *                             path VARCHAR(255),
+     *                             display VARCHAR(255),
+     *                             accessType VARCHAR(20),
+     *                             recycle VARCHAR(255) ,
+     *                             bcreate BOOLEAN, -- For some reason 'create' is a reserved keyword
+     *                             writeable BOOLEAN,
+     *                             enabled BOOLEAN );
+     *
+     * Additionally, the options are stored in a separate table:
+     * CREATE TABLE ajxp_repo_options ( oid INTEGER PRIMARY KEY, uuid VARCHAR(33), name VARCHAR(50), val VARCHAR(255) );
+     *
+     * I recommend an index to increase performance of uuid lookups:
+     * CREATE INDEX ajxp_repo_options_uuid_idx ON ajxp_repo_options ( uuid );
+     *
+     *
+     * @param $result DibiResult of a dibi::query() as array
+     * @param array|DibiResult $options_result Result of dibi::query() for options as array
+     * @return RepositoryInterface object
+     */
+    public function repoFromDb($result, $options_result = Array())
+    {
+        $repo = new Repository($result['id'], $result['display'], $result['accessType']);
+        $repo->uuid = $result['uuid'];
+        $repo->setOwnerData($result['parent_uuid'], $result['owner_user_id'], $result['child_user_id']);
+        $repo->path = $result['path'];
+        $repo->create = (bool) $result['bcreate'];
+        $repo->writeable = (bool) $result['writeable'];
+        $repo->enabled = (bool) $result['enabled'];
+        $repo->recycle = "";
+        $repo->setSlug($result['slug']);
+        if (isSet($result['groupPath']) && !empty($result['groupPath'])) {
+            $repo->setGroupPath($result['groupPath']);
+        }
+        $repo->isTemplate = (bool) $result['isTemplate'];
+        $repo->setInferOptionsFromParent((bool) $result['inferOptionsFromParent']);
+
+        foreach ($options_result as $k => $v) {
+            if (strpos($v, '$phpserial$') !== false && strpos($v, '$phpserial$') === 0) {
+                $v = unserialize(substr($v, strlen('$phpserial$')));
+            } else if ($k == "META_SOURCES") {
+                $v = unserialize($v);
+            }
+            $repo->options[$k] = $v;
+        }
+        if(isSet($repo->options["content_filter"]) && $repo->options["content_filter"] instanceof ContentFilter){
+            $repo->setContentFilter($repo->options["content_filter"]);
+        }
+
+        return $repo;
+    }
+
+    /**
+     * Convert a repository object to an array, which will be stored in the database.
+     *
+     * @param $repository RepositoryInterface
+     * @return array containing row values, and another array with the key "options" to be stored as repo options.
+     */
+    public function repoToArray($repository)
+    {
+
+        $repository_row = Array(
+                'uuid'                      => $repository->getUniqueId(),
+                'parent_uuid'               => $repository->getParentId(),
+                'owner_user_id'             => $repository->getOwner(),
+                'child_user_id'             => $repository->getUniqueUser(),
+                'path'                      => $repository->options['PATH'],
+                'display'                   => $repository->getDisplay(),
+                'accessType'                => $repository->getAccessType(),
+                'recycle'                   => $repository->recycle,
+                'bcreate'                   => $repository->getCreate(),
+                'writeable'                 => $repository->isWriteable(),
+                'options'                   => $repository->options,
+                'groupPath'                 => $repository->getGroupPath(),
+                'slug'		                => $repository->getSlug(),
+                'isTemplate'                => (bool) $repository->isTemplate(),
+                'inferOptionsFromParent'    => $repository->getInferOptionsFromParent()
+        );
+
+        return $repository_row;
+    }
+
+
+    /**
+     * @param array $array
+     * @return Repository[]
+     */
+    protected function initRepoArrayFromDbFetch($array){
+        $repositories = array();
+        if(!count($array)){
+            return $repositories;
+        }
+        // Load all at once
+        $ids = array();
+        $allOpts = array();
+        foreach($array as $row) {
+            $ids[] = $row['uuid'];
+            $allOpts[$row['uuid']] = array("ROW" => $row, "OPTIONS" => array());
+        }
+        if($this->sqlDriver["driver"] == "postgre"){
+            dibi::query("SET bytea_output=escape");
+        }
+        $dbres = dibi::query("SELECT [uuid], [name], [val] FROM [ajxp_repo_options] WHERE [uuid] IN (%s)", $ids);
+        foreach($dbres as $row){
+            $allOpts[$row['uuid']]["OPTIONS"][$row['name']] = $row['val'];
+        }
+        foreach($allOpts as $repoId => $repoOptions){
+            $repo = $this->repoFromDb($repoOptions["ROW"], $repoOptions["OPTIONS"]);
+            $repositories[$repo->getUniqueId()] = $repo;
+        }
+        return $repositories;
+    }
+
+    /**
+     * Get a list of repositories
+     *
+     * The list is an associative array of Array( 'uuid' => [Repository Object] );
+     * @param AbstractUser $user
+     * @return Repository[]
+     * @see AbstractConfDriver#listRepositories()
+     */
+    public function listRepositories($user = null)
+    {
+        if ($user != null) {
+            return $this->listRepositoriesForRole($user->mergedRole);
+        } else {
+            $res = dibi::query('SELECT * FROM [ajxp_repo] ORDER BY [display] ASC');
+        }
+        $all = $res->fetchAll();
+        return $this->initRepoArrayFromDbFetch($all);
+    }
+
+    /**
+     * @param AJXP_Role $role
+     * @return RepositoryInterface[]
+     */
+    public function listRepositoriesForRole($role){
+        $acls = $role->listAcls();
+        if(!count($acls)) return array();
+        $limitRepositories = array_keys($acls);
+        $res = dibi::query('SELECT * FROM [ajxp_repo] WHERE [uuid] IN (%s) ORDER BY [display] ASC', $limitRepositories);
+        $all = $res->fetchAll();
+        return $this->initRepoArrayFromDbFetch($all);
+    }
+
+    /**
+     * Returns a list of available repositories (dynamic ones only, not the ones defined in the config file).
+     * @param array $criteria
+     * @param int $count possible total count
+     * @return Repository[]
+     */
+    public function listRepositoriesWithCriteria($criteria, &$count = null){
+
+        $wheres = array();
+        $limit = $groupBy = "";
+        $order = "ORDER BY display ASC";
+
+        if(isSet($criteria["role"]) && $criteria["role"] instanceof AJXP_Role){
+            return $this->listRepositoriesForRole($criteria["role"]);
+        }
+
+        $searchableKeys = array("uuid", "parent_uuid", "owner_user_id", "display", "accessType", "isTemplate", "slug", "groupPath");
+        foreach($criteria as $cName => $cValue){
+            if(in_array($cName, $searchableKeys) || in_array(substr($cName,1), $searchableKeys)){
+                if(is_array($cValue)){
+                    if($cName[0] == "!"){
+                        $cName = substr($cName, 1);
+                        $wheres[] = array("[$cName] NOT IN (%s)", $cValue);
+                    }else{
+                        $wheres[] = array("[$cName] IN (%s)", $cValue);
+                    }
+                }else if(strpos($cValue, "regexp:") === 0){
+                    $regexp = str_replace("regexp:", "", $cValue);
+                    $wheres[] = array("[$cName] ". StringHelper::regexpToLike($regexp), StringHelper::cleanRegexp($regexp));
+                }else if ($cValue == AJXP_FILTER_NOT_EMPTY){
+                    $wheres[] = array("[$cName] IS NOT NULL");
+                }else if ($cValue == AJXP_FILTER_EMPTY){
+                    $wheres[] = array("[$cName] IS NULL");
+                }else{
+                    $type = "%s";
+                    if($cName == 'isTemplate') $type = "%b";
+                    $wheres[] = array("[$cName] = $type", $cValue);
+                }
+            }else if($cName == "CURSOR"){
+                $limit = $cValue;
+            }else if($cName == "ORDERBY"){
+                $order = "ORDER BY ".$cValue["KEY"]." ".$cValue["DIR"];
+            }else if($cName == "GROUPBY"){
+                $groupBy = "GROUP BY ".$cValue;
+            }
+        }
+
+        if(isset($criteria["CURSOR"])){
+            $res = dibi::query("SELECT COUNT(uuid) FROM [ajxp_repo] WHERE %and", $wheres);
+            $count = $res->fetchSingle();
+        }
+
+        if(!empty($limit) && is_array($limit)){
+            $res = dibi::query("SELECT * FROM [ajxp_repo] WHERE %and $groupBy $order %lmt %ofs", $wheres, $limit["LIMIT"], $limit["OFFSET"]);
+        }else{
+            $res = dibi::query("SELECT * FROM [ajxp_repo] WHERE %and $groupBy $order", $wheres);
+        }
+        $all = $res->fetchAll();
+        return $this->initRepoArrayFromDbFetch($all);
+
+    }
+
+
+    /**
+     * Get repository by Unique ID (a hash calculated from the serialised object).
+     *
+     * @param String $repositoryId hash uuid
+     * @return RepositoryInterface object
+     */
+    public function getRepositoryById($repositoryId)
+    {
+        return $this->_loadRepository("uuid", $repositoryId);
+
+    }
+
+    /**
+     * Retrieve a Repository given its alias.
+     *
+     * @param String $repositorySlug
+     * @return RepositoryInterface
+     */
+    public function getRepositoryByAlias($repositorySlug)
+    {
+        return $this->_loadRepository("slug", $repositorySlug);
+    }
+
+    /**
+     * @param $slugOrAlias
+     * @param $value
+     * @return RepositoryInterface|null
+     */
+    protected function _loadRepository($slugOrAlias, $value){
+        if($this->sqlDriver["driver"] == "postgre"){
+            dibi::nativeQuery("SET bytea_output=escape");
+        }
+        $keyName = ($slugOrAlias=="slug"?"slug":"uuid");
+        $res = dibi::query("SELECT * FROM [ajxp_repo],[ajxp_repo_options] WHERE [ajxp_repo].[uuid] = [ajxp_repo_options].[uuid] AND [ajxp_repo].[$keyName] = %s", $value);
+
+        $options = array();
+        foreach($res as $row){
+            $options[$row->name] = $row->val;
+        }
+        if(isSet($row)){
+            unset($row->name);
+            unset($row->val);
+            $repository = $this->repoFromDb($row, $options);
+            return $repository;
+        }
+        return null;
+    }
+
+    /**
+     * @param String $slug
+     * @param String|null $repositoryId
+     * @return String mixed
+     */
+    protected function uniquifySlug($slug, $repositoryId = null){
+
+        if(!empty($repositoryId)){
+            $res = dibi::query("SELECT [slug],[uuid] FROM [ajxp_repo] WHERE [uuid] != %s AND [slug] LIKE '".$slug."%'", $repositoryId);
+        }else{
+            $res = dibi::query("SELECT [slug],[uuid] FROM [ajxp_repo] WHERE [slug] LIKE '".$slug."%'");
+        }
+        $existingSlugs = $res->fetchPairs();
+        $configSlugs = RepositoryService::reservedSlugsFromConfig();
+        if(in_array($slug, $configSlugs)){
+            $existingSlugs[$slug] = $slug;
+        }
+        if(!count($existingSlugs)) return $slug;
+        $index = 1;
+        $base = $slug;
+        $slug = $base."-".$index;
+        while(isSet($existingSlugs[$slug])){
+            $index++;
+            $slug = $base."-".$index;
+        }
+
+        return $slug;
+    }
+
+    /**
+     * Store a newly created repository
+     *
+     * @param Repository $repositoryObject
+     * @param Boolean $update
+     * @return int -1 if failed
+     */
+    public function saveRepository($repositoryObject, $update = false)
+    {
+        try {
+            if($update){
+                $repositoryObject->setSlug($this->uniquifySlug(
+                    $repositoryObject->getSlug(),
+                    $repositoryObject->getUniqueId()
+                ));
+            }else{
+                $repositoryObject->setSlug($this->uniquifySlug($repositoryObject->getSlug()));
+            }
+            $repository_array = $this->repoToArray($repositoryObject);
+            $options = $repository_array['options'];
+            if($repositoryObject->hasContentFilter()){
+                $options["content_filter"] = $repositoryObject->getContentFilter();
+            }else if(isSet($options["content_filter"])){
+                unset($options["content_filter"]);
+            }
+            unset($repository_array['options']);
+            if (!$update) {
+                dibi::query('INSERT INTO [ajxp_repo]', $repository_array);
+
+                foreach ($options as $k => $v) {
+                    if (!is_string($v)) {
+                        $v = '$phpserial$'.serialize($v);
+                    }
+                    dibi::query('INSERT INTO [ajxp_repo_options] ([uuid],[name],[val]) VALUES (%s,%s,%bin)', $repositoryObject->getUniqueId(), $k,$v);
+                }
+
+            } else {
+                dibi::query('DELETE FROM [ajxp_repo] WHERE [uuid] = %s',$repositoryObject->getUniqueId());
+                dibi::query('DELETE FROM [ajxp_repo_options] WHERE [uuid] = %s',$repositoryObject->getUniqueId());
+                dibi::query('INSERT INTO [ajxp_repo]', $repository_array);
+                foreach ($options as $k => $v) {
+                    if (!is_string($v)) {
+                        $v = '$phpserial$'.serialize($v);
+                    }
+                    dibi::query('INSERT INTO [ajxp_repo_options] ([uuid],[name],[val]) VALUES (%s,%s,%bin)',$repositoryObject->getUniqueId(),$k,$v);
+                }
+            }
+
+        } catch (DibiException $e) {
+            throw $e;
+        }
+    }
+
+    /**
+     * Delete a repository, given its unique ID.
+     *
+     * @param String $repositoryId
+     * @return int|string
+     */
+    public function deleteRepository($repositoryId)
+    {
+        try {
+            dibi::query('DELETE FROM [ajxp_repo] WHERE [uuid] = %s', $repositoryId);
+            dibi::query('DELETE FROM [ajxp_repo_options] WHERE [uuid] = %s', $repositoryId);
+            dibi::query('DELETE FROM [ajxp_user_rights] WHERE [repo_uuid] = %s',$repositoryId);
+
+            switch ($this->sqlDriver["driver"]) {
+                case "postgre":
+                    dibi::nativeQuery("SET bytea_output=escape");
+                    $children_results = dibi::query('SELECT * FROM [ajxp_roles] WHERE [searchable_repositories] LIKE %~like~ GROUP BY [role_id]', '"'.$repositoryId.'";s:');
+                    break;
+                case "sqlite":
+                case "sqlite3":
+                    $children_results = dibi::query('SELECT * FROM [ajxp_roles] WHERE [searchable_repositories] LIKE %~like~ GROUP BY [role_id]', '"'.$repositoryId.'";s:');
+                    break;
+                case "mysqli":
+                case "mysql":
+                    $children_results = dibi::query('SELECT * FROM [ajxp_roles] WHERE [serial_role] LIKE %~like~ GROUP BY [role_id]', '"'.$repositoryId.'";s:');
+                    break;
+                default:
+                    return "ERROR!, DB driver ". $this->sqlDriver["driver"] ." not supported yet in __FUNCTION__";
+            }
+            $all = $children_results->fetchAll();
+            foreach ($all as $item) {
+                $role = unserialize($item["serial_role"]);
+                $role->setAcl($repositoryId, "");
+                $this->updateRole($role);
+            }
+
+        } catch (DibiException $e) {
+            $this->logError(__FUNCTION__, $e->getMessage());
+            return -1;
+        }
+        return 1;
+    }
+
+    /**
+     * @abstract
+     * @param $userId
+     * @return AbstractUser[]
+     */
+    public function getUserChildren($userId )
+    {
+        $ignoreHiddens = "NOT EXISTS (SELECT * FROM [ajxp_user_rights] WHERE [ajxp_user_rights.login]=[ajxp_users.login] AND [ajxp_user_rights.repo_uuid] = 'ajxp.hidden')";
+        $children = array();
+        $children_results = dibi::query('SELECT [ajxp_users].[login] FROM [ajxp_user_rights],[ajxp_users] WHERE [repo_uuid] = %s AND [rights] = %s AND [ajxp_user_rights].[login] = [ajxp_users].[login] AND '.$ignoreHiddens, "ajxp.parent_user", $userId);
+        $all = $children_results->fetchAll();
+        foreach ($all as $item) {
+            $children[] = UsersService::getUserById($item["login"]);
+        }
+        return $children;
+
+    }
+
+    /**
+     * @abstract
+     * @param string $repositoryId
+     * @param string $rolePrefix
+     * @param bool $splitByType
+     * @return array
+     */
+    public function getRolesForRepository($repositoryId, $rolePrefix = '', $splitByType = false){
+
+        $allRoles = $q = $selectStr = $fromStr = [];
+
+        // Initing select
+        $q['select']['role_id'] = '[role_id]';
+
+        if ($splitByType) {
+            $q['select']['type'] = 'case when [role_id] LIKE \'AJXP_USR%\' then \'role_user\' when [role_id] LIKE \'AJXP_GRP%\' then \'role_grp\' else \'role_role\' end';
+        }
+
+        // Initing from
+        $q['from']['a'] = '[ajxp_roles]';
+
+        // Initing where and args
+        if(is_numeric($repositoryId)){
+            $likeRepositoryId = "i:$repositoryId;s:";
+        }else{
+            $likeRepositoryId = '"'.$repositoryId.'";s:';
+        }
+        switch ($this->sqlDriver["driver"]) {
+            case "sqlite":
+            case "sqlite3":
+            case "postgre":
+                $q['where'][] = ['[searchable_repositories] LIKE %~like~', $likeRepositoryId];
+                break;
+            case "mysql":
+            case "mysqli":
+                $q['where'][] = ['[serial_role] LIKE %~like~', $likeRepositoryId];
+                break;
+            default:
+                return "ERROR!, DB driver ". $this->sqlDriver["driver"] ." not supported yet in __FUNCTION__";
+        }
+
+        if(!empty($rolePrefix)){
+            $q['where'][] = ['[role_id] LIKE %like~', $rolePrefix];
+        }
+
+        // Initing group by
+        $q['groupBy'][] = '[role_id]';
+
+        // Building the request from $q
+
+        // Building select
+        $reqStr = 'SELECT';
+        foreach ($q['select'] as $k => $v) {
+            $selectStr[] = $v.' as '.$k;
+        }
+        $reqStr .= ' ';
+        $reqStr .= join(', ', $selectStr);
+        $reqStr .= ' ';
+
+        // Building from
+        $reqStr .= 'FROM';
+        foreach ($q['from'] as $k => $v) {
+            $fromStr[] = $v.' '.$k;
+        }
+        $reqStr .= ' ';
+        $reqStr .= join(', ', $fromStr);
+        $reqStr .= ' ';
+
+        // Building where
+        if (!empty($q['where'])) {
+            $reqStr .= 'WHERE %and';
+            $reqStr .= ' ';
+        }
+
+        // Building group by
+        if (!empty($q['groupBy'])) {
+            $reqStr .= 'GROUP BY';
+            $reqStr .= ' ';
+            $reqStr .= join(', ', $q['groupBy']);
+            $reqStr .= ' ';
+        }
+
+        $res =  dibi::query($reqStr, $q['where']);
+        $all = $res->fetchAll();
+        foreach ($all as $item) {
+            $rId = $item['role_id'];
+
+            if ($splitByType) {
+                $type = $item['type'];
+                $allRoles[$type][] = $rId;
+            } else {
+                $allRoles[] = $rId;
+            }
+        }
+
+        return $allRoles;
+    }
+
+    /**
+     * @param $roleId
+     * @param bool $countOnly
+     * @return \DibiRow[]|mixed
+     */
+    public function getUsersForRole($roleId, $countOnly = false) {
+        if($countOnly){
+            $res =  dibi::query("SELECT count([login]) FROM [ajxp_user_rights] WHERE [repo_uuid] = %s AND [rights] LIKE %~like~", "ajxp.roles", '"'.$roleId.'";b:1');
+            return $res->fetchSingle();
+        }else{
+            $res =  dibi::query("SELECT [login] FROM [ajxp_user_rights] WHERE [repo_uuid] = %s AND [rights] LIKE %~like~", "ajxp.roles", '"'.$roleId.'";b:1');
+            return $res->fetchAll();
+        }
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param string $repositoryId
+     * @param boolean $details
+     * @param bool $admin
+     * @return array|int
+     */
+    public function countUsersForRepository(ContextInterface $ctx, $repositoryId, $details = false, $admin=false){
+        $object = RepositoryService::getRepositoryById($repositoryId);
+        if(!$admin){
+            if($object->securityScope() == "USER"){
+                if($details) {
+                    return array('users' => 1);
+                } else {
+                    return 1;
+                }
+            }else if($object->securityScope() == "GROUP" && $ctx->hasUser()){
+                $groupUsers = UsersService::authCountUsers($ctx->getUser()->getGroupPath());
+                if($details) {
+                    return array('users' => $groupUsers);
+                } else {
+                    return $groupUsers;
+                }
+            }
+        }
+
+        // Users from roles
+        $roles = $this->getRolesForRepository($repositoryId, '', $details);
+
+        if($details){
+            return array(
+                'users' => count($roles['role_user']),
+                'groups' => count($roles['role_group']) + count($roles['role_role'])
+            );
+        }else{
+            return count($roles);
+        }
+    }
+
+
+    // SAVE / EDIT / CREATE / DELETE USER OBJECT (except password)
+    /**
+     * Instantiate the right class
+     *
+     * @param AbstractUser $userId
+     * @return AbstractUser|SqlUser
+     */
+    public function instantiateAbstractUserImpl($userId)
+    {
+        return new SqlUser($userId, $this);
+    }
+
+    /**
+     * Get the full path to the Ajxp user class.
+     *
+     * @see AbstractConfDriver#getUserClassFileName()
+     */
+    public function getUserClassFileName()
+    {
+        return AJXP_INSTALL_PATH."/plugins/conf.sql/SqlUser.php";
+    }
+
+
+    /**
+     * @param array $roleIds
+     * @param bool $excludeReserved
+     * @return array
+     */
+    public function listRoles($roleIds = array(), $excludeReserved = false)
+    {
+        $wClauses = array();
+        if (count($roleIds)) {
+            // We use (%s) instead of %in to pass everyting as string ('1' instead of 1)
+            $wClauses[] = array('[role_id] IN (%s)', $roleIds);
+        }
+        if ($excludeReserved) {
+            $wClauses[] = array('[role_id] NOT LIKE %like~', 'AJXP_');
+        }
+        if($this->sqlDriver["driver"] == "postgre"){
+            dibi::nativeQuery("SET bytea_output=escape");
+        }
+        $res = dibi::query('SELECT * FROM [ajxp_roles] %if', count($wClauses), 'WHERE %and', $wClauses);
+        $all = $res->fetchAll();
+
+        $roles = Array();
+
+        foreach ($all as $role_row) {
+            $id = $role_row['role_id'];
+            $serialized = $role_row['serial_role'];
+            $object = unserialize($serialized);
+            if ($object instanceof AjxpRole || $object instanceof AJXP_Role) {
+                $roles[$id] = $object;
+                if($object instanceof AJXP_Role){
+                    $object->setLastUpdated($role_row["last_updated"]);
+                }
+            }
+        }
+
+        return $roles;
+
+    }
+
+    /**
+     * @param AJXP_Role[] $roles
+     * @return void
+     * @throws PydioException
+     */
+    public function saveRoles($roles)
+    {
+        dibi::query("DELETE FROM [ajxp_roles]");
+        foreach ($roles as $roleId => $roleObject) {
+            switch ($this->sqlDriver["driver"]) {
+                case "sqlite":
+                case "sqlite3":
+                case "postgre":
+                    dibi::query("INSERT INTO [ajxp_roles] ([role_id],[serial_role],[searchable_repositories],[last_updated]) VALUES (%s, %bin, %s, %i)",
+                        $roleId,
+                        serialize($roleObject),
+                        serialize($roleObject->listAcls()),
+                        time()
+                    );
+                    break;
+                case "mysqli":
+                case "mysql":
+                    dibi::query("INSERT INTO [ajxp_roles] ([role_id],[serial_role],[last_updated]) VALUES (%s, %s, %i)",
+                        $roleId,
+                        serialize($roleObject),
+                        time()
+                    );
+                    break;
+                default:
+                    throw new PydioException("ERROR!, DB driver " . $this->sqlDriver["driver"] . " not supported yet in __FUNCTION__");
+            }
+        }
+    }
+
+    /**
+     * @param AJXP_Role $role
+     * @param null $userObject
+     * @return string|void
+     * @throws PydioException
+     */
+    public function updateRole($role, $userObject = null)
+    {
+        // if role is not existed => insert into
+        switch ($this->sqlDriver["driver"]) {
+            case "sqlite":
+            case "sqlite3":
+            case "postgre":
+                $row = dibi::query("SELECT [role_id] FROM [ajxp_roles] WHERE [role_id]=%s", $role->getId());
+                $res = $row->fetchSingle();
+                if($res != null){
+                    dibi::query("UPDATE [ajxp_roles] SET [serial_role]=%bin,[searchable_repositories]=%s,[last_updated]=%i WHERE [role_id]=%s", serialize($role), serialize($role->listAcls()), time(), $role->getId());
+                }
+                else{
+                    dibi::query("INSERT INTO [ajxp_roles] ([role_id],[serial_role],[searchable_repositories],[last_updated]) VALUES (%s, %bin,%s,%i)", $role->getId(), serialize($role), serialize($role->listAcls()), time());
+                }
+                break;
+            case "mysqli":
+            case "mysql":
+                dibi::query("INSERT INTO [ajxp_roles] ([role_id],[serial_role],[last_updated]) VALUES (%s, %s, %i) ON DUPLICATE KEY UPDATE [serial_role]=VALUES([serial_role]), [last_updated]=VALUES([last_updated])", $role->getId(), serialize($role), time());
+                break;
+            default:
+                throw new PydioException("ERROR!, DB driver ". $this->sqlDriver["driver"] ." not supported yet in __FUNCTION__");
+        }
+    }
+
+    /**
+     * @param AJXP_Role $role
+     */
+    public function deleteRole($role)
+    {
+        // Mixed input Object or ID
+        if($role instanceof AJXP_Role) $roleId = $role->getId();
+        else $roleId = $role;
+
+        dibi::query("DELETE FROM [ajxp_roles] WHERE [role_id]=%s", $roleId);
+    }
+
+    /**
+     * Compute the most recent date where one of these roles where updated.
+     *
+     * @param $rolesIdsList
+     * @return int
+     */
+    public function rolesLastUpdated($rolesIdsList){
+        $res = dibi::query("SELECT MAX([last_updated]) FROM [ajxp_roles] WHERE [role_id] IN (%s)", $rolesIdsList);
+        return $res->fetchSingle();
+    }
+
+    /**
+     * @return mixed
+     */
+    public function countAdminUsers()
+    {
+        $rows = dibi::query("SELECT COUNT(*) FROM [ajxp_user_rights] WHERE [repo_uuid] = %s AND [rights] = %s", "ajxp.admin", "1");
+        return $rows->fetchSingle();
+    }
+
+    /**
+     * This function is useless for the SQL driver : users are by default correctly listed by group.
+     * @param AbstractUser[] $flatUsersList
+     * @param string $baseGroup
+     * @param bool $fullTree
+     * @return void
+     */
+    public function filterUsersByGroup(&$flatUsersList, $baseGroup = "/", $fullTree = false)
+    {
+    }
+
+    /**
+     * Check if group already exists
+     * @param string $groupPath
+     * @return boolean
+     */
+    public function groupExists($groupPath)
+    {
+        $ret = dibi::query("SELECT [groupPath] FROM [ajxp_groups] WHERE [groupPath] = %s", $groupPath);
+        $groups = $ret->fetchSingle();
+        if(!empty($groups)) return true;
+
+        return false;
+    }
+
+    /**
+     * @param string $groupPath
+     * @param string $groupLabel
+     * @return mixed
+     */
+    public function createGroup($groupPath, $groupLabel)
+    {
+        $test = dibi::query("SELECT COUNT(*) FROM [ajxp_groups] WHERE [groupPath] = %s", $groupPath);
+        if ($test->fetchSingle()) {
+            dibi::query("UPDATE [ajxp_groups] SET [groupLabel]=%s WHERE [groupPath]=%s", $groupLabel, $groupPath);
+        } else {
+            dibi::query("INSERT INTO [ajxp_groups]",array("groupPath" => $groupPath, "groupLabel" => $groupLabel));
+        }
+    }
+
+    /**
+     * @param string $groupPath
+     * @param string $groupLabel
+     */
+    public function relabelGroup($groupPath, $groupLabel)
+    {
+        dibi::query("UPDATE [ajxp_groups] SET [groupLabel]=%s WHERE [groupPath]=%s", $groupLabel, $groupPath);
+    }
+
+
+    /**
+     * @param $groupPath
+     * @throws \Exception
+     */
+    public function deleteGroup($groupPath)
+    {
+        // Delete users of this group, as well as subgroups
+        $res = dibi::query("SELECT * FROM [ajxp_users] WHERE [groupPath] LIKE %like~ OR [groupPath] = %s ORDER BY [login] ASC", $groupPath."/", $groupPath);
+        $rows = $res->fetchAll();
+        $subUsers = array();
+        foreach ($rows as $row) {
+            $this->deleteUser($row["login"], $subUsers);
+            dibi::query("DELETE FROM [ajxp_users] WHERE [login] = %s", $row["login"]);
+        }
+        dibi::query("DELETE FROM [ajxp_groups] WHERE [groupPath] LIKE %like~ OR [groupPath] = %s", $groupPath."/", $groupPath);
+        dibi::query('DELETE FROM [ajxp_roles] WHERE [role_id] = %s', 'AJXP_GRP_'.$groupPath);
+    }
+
+    /**
+     * @param string $baseGroup
+     * @return string[]
+     */
+    public function getChildrenGroups($baseGroup = "/")
+    {
+        $searchGroup = $baseGroup;
+        if($baseGroup[strlen($baseGroup)-1] != "/") $searchGroup.="/";
+        $res = dibi::query("SELECT * FROM [ajxp_groups] WHERE [groupPath] LIKE %like~ AND [groupPath] NOT LIKE %s", $searchGroup, $searchGroup."%/%");
+        $pairs = $res->fetchPairs("groupPath", "groupLabel");
+        foreach ($pairs as $path => $label) {
+            if(strlen($path) <= strlen($baseGroup)) unset($pairs[$path]);
+            if ($baseGroup != "/") {
+                unset($pairs[$path]);
+                $pairs[substr($path, strlen($baseGroup))] = $label;
+            }
+        }
+        return $pairs;
+    }
+
+    /**
+     * Function for deleting a user
+     *
+     * @param String $userId
+     * @param array $deletedSubUsers
+     * @throws \Exception
+     * @return void
+     */
+    public function deleteUser($userId, &$deletedSubUsers)
+    {
+        $children = array();
+        try {
+            // FIND ALL CHILDREN FIRST
+            $children_results = dibi::query('SELECT [login] FROM [ajxp_user_rights] WHERE [repo_uuid] = %s AND [rights] = %s', "ajxp.parent_user", $userId);
+            $all = $children_results->fetchAll();
+            foreach ($all as $item) {
+                $children[] = $item["login"];
+            }
+            dibi::begin();
+            //This one is done by AUTH_DRIVER, not CONF_DRIVER
+            //dibi::query('DELETE FROM [ajxp_users] WHERE [login] = %s', $userId);
+            dibi::query('DELETE FROM [ajxp_user_rights] WHERE [login] = %s', $userId);
+            dibi::query('DELETE FROM [ajxp_user_prefs] WHERE [login] = %s', $userId);
+            dibi::query('DELETE FROM [ajxp_user_bookmarks] WHERE [login] = %s', $userId);
+            dibi::query('DELETE FROM [ajxp_user_teams] WHERE [owner_id] = %s', $userId);
+            dibi::query('DELETE FROM [ajxp_roles] WHERE [role_id] = %s', 'AJXP_USR_/'.$userId);
+            dibi::commit();
+            foreach ($children as $childId) {
+                $this->deleteUser($childId, $deletedSubUsers);
+                $deletedSubUsers[] = $childId;
+            }
+        } catch (DibiException $e) {
+            throw new \Exception('Failed to delete user, Reason: '.$e->getMessage());
+        }
+    }
+
+    /**
+     * @param $storeID
+     * @param $dataID
+     * @param $data
+     * @param string $dataType
+     * @param null $relatedObjectId
+     * @throws \Exception
+     */
+    public function simpleStoreSet($storeID, $dataID, $data, $dataType = "serial", $relatedObjectId = null)
+    {
+        $values = array(
+            "store_id" => $storeID,
+            "object_id" => $dataID
+        );
+        if ($relatedObjectId !== null) {
+            $values["related_object_id"] = $relatedObjectId;
+        }
+        if ($dataType == "serial") {
+            $values["serialized_data"] = serialize($data);
+        } else if ($dataType == "binary") {
+            $values["binary_data"] = $data;
+        } else {
+            throw new \Exception("Unsupported format type ".$dataType);
+        }
+        dibi::query("DELETE FROM [ajxp_simple_store] WHERE [store_id]=%s AND [object_id]=%s", $storeID, $dataID);
+        dibi::query("INSERT INTO [ajxp_simple_store] ([object_id],[store_id],[serialized_data],[binary_data],[related_object_id]) VALUES (%s,%s,%bin,%bin,%s)",
+            $dataID, $storeID, $values["serialized_data"], $values["binary_data"], $values["related_object_id"]);
+    }
+
+    /**
+     * @param $storeID
+     * @param $dataID
+     */
+    public function simpleStoreClear($storeID, $dataID)
+    {
+        dibi::query("DELETE FROM [ajxp_simple_store] WHERE [store_id]=%s AND [object_id]=%s", $storeID, $dataID);
+    }
+
+    /**
+     * @param $storeID
+     * @param $dataID
+     * @param $dataType
+     * @param $data
+     * @return bool
+     */
+    public function simpleStoreGet($storeID, $dataID, $dataType, &$data)
+    {
+        if($this->sqlDriver["driver"] == "postgre"){
+            dibi::nativeQuery("SET bytea_output=escape");
+        }
+        $children_results = dibi::query("SELECT * FROM [ajxp_simple_store] WHERE [store_id]=%s AND [object_id]=%s", $storeID, $dataID);
+        $value = $children_results->fetchAll();
+        if(!count($value)) return false;
+        $value = $value[0];
+        if ($dataType == "serial") {
+            $data = unserialize($value["serialized_data"]);
+        } else {
+            $data = $value["binary_data"];
+        }
+        if (isSet($value["related_object_id"])) {
+            return $value["related_object_id"];
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * @param $storeId
+     * @param null $cursor
+     * @param string $dataIdLike
+     * @param string $dataType
+     * @param string $serialDataLike
+     * @param string $relatedObjectId
+     * @return array
+     */
+    public function simpleStoreList($storeId, &$cursor=null, $dataIdLike="", $dataType="serial", $serialDataLike="", $relatedObjectId=""){
+        $wheres = array();
+        $wheres[] = array('[store_id]=%s', $storeId);
+        if(!empty($dataIdLike)){
+            $wheres[] = array('[object_id] LIKE %s', $dataIdLike);
+        }
+        if(!empty($serialDataLike)){
+            $wheres[] = array('[serialized_data] LIKE %s', $serialDataLike);
+        }
+        if($relatedObjectId != ""){
+            $wheres[] = array('[related_object_id] = %s', $relatedObjectId);
+        }
+        if($cursor != null){
+            $total = dibi::query("SELECT count(*) FROM [ajxp_simple_store] WHERE %and", $wheres);
+            $cursor["total"] = $total->fetchSingle();
+            if(isSet($cursor["count"])) {
+                return [];
+            }
+            $children_results = dibi::query("SELECT * FROM [ajxp_simple_store] WHERE %and %lmt %ofs", $wheres, $cursor[1], $cursor[0]);
+        }else{
+            $children_results = dibi::query("SELECT * FROM [ajxp_simple_store] WHERE %and", $wheres);
+
+        }
+        $values = $children_results->fetchAll();
+        $result = array();
+        foreach($values as $value){
+            if ($dataType == "serial") {
+                $data = unserialize($value["serialized_data"]);
+            } else {
+                $data = $value["binary_data"];
+            }
+            $result[$value['object_id']] = $data;
+        }
+        return $result;
+    }
+
+    /**
+     * @param $context
+     * @return string
+     */
+    protected function binaryContextToStoreID($context)
+    {
+        $storage = "binaries";
+        if (isSet($context["USER"])) {
+            $storage ="users_binaries.".$context["USER"];
+        } else if (isSet($context["REPO"])) {
+            $storage ="repos_binaries.".$context["REPO"];
+        } else if (isSet($context["ROLE"])) {
+            $storage ="roles_binaries.".$context["ROLE"];
+        } else if (isSet($context["PLUGIN"])) {
+            $storage ="plugins_binaries.".$context["PLUGIN"];
+        }
+        return $storage;
+    }
+    /**
+     * @param array $context
+     * @param String $fileName
+     * @param String $ID
+     * @return String $ID
+     */
+    public function saveBinary($context, $fileName, $ID = null)
+    {
+        if (empty($ID)) {
+            $ID = substr(md5(microtime()*rand(0,100)), 0, 12);
+            $ID .= ".".pathinfo($fileName, PATHINFO_EXTENSION);
+        }
+        $store = $this->binaryContextToStoreID($context);
+        $this->simpleStoreSet($store, $ID, file_get_contents($fileName), "binary");
+        return $ID;
+    }
+
+    /**
+     * @abstract
+     * @param array $context
+     * @param String $ID
+     * @return boolean
+     */
+    public function deleteBinary($context, $ID)
+    {
+        $store = $this->binaryContextToStoreID($context);
+        $this->simpleStoreClear($store, $ID);
+    }
+
+
+    /**
+     * @param array $context
+     * @param String $ID
+     * @param Resource $outputStream
+     * @return boolean
+     */
+    public function loadBinary($context, $ID, $outputStream = null)
+    {
+        $store = $this->binaryContextToStoreID($context);
+        $data = "";
+        $this->simpleStoreGet($store, $ID, "binary", $data);
+        if ($outputStream != null) {
+            fwrite($outputStream, $data, strlen($data));
+        } else {
+            header("Content-Type: ". StatHelper::getImageMimeType($ID));
+            echo $data;
+        }
+    }
+
+    /**
+     * @abstract
+     * @param String $keyType
+     * @param String $keyId
+     * @param String $userId
+     * @param array $data
+     * @return boolean
+     */
+    public function saveTemporaryKey($keyType, $keyId, $userId, $data)
+    {
+        $this->simpleStoreSet("temporakey_".$keyType, $keyId, $data, "serial", $userId);
+    }
+
+    /**
+     * @abstract
+     * @param String $keyType
+     * @param String $keyId
+     * @return array
+     */
+    public function loadTemporaryKey($keyType, $keyId)
+    {
+        $data = array();
+        $userId = $this->simpleStoreGet("temporakey_".$keyType, $keyId, "serial", $data);
+        $data['user_id'] = $userId;
+        return $data;
+    }
+
+    /**
+     * @abstract
+     * @param String $keyType
+     * @param String $keyId
+     * @return boolean
+     */
+    public function deleteTemporaryKey($keyType, $keyId)
+    {
+        $this->simpleStoreClear("temporakey_".$keyType, $keyId);
+    }
+
+    /**
+     * @abstract
+     * @param String $keyType
+     * @param String $expiration
+     * @return null
+     */
+    public function pruneTemporaryKeys($keyType, $expiration)
+    {
+        if($this->sqlDriver["driver"] == "postgre"){
+            dibi::query("DELETE FROM [ajxp_simple_store] WHERE [store_id] = %s AND [insertion_date] < (CURRENT_TIMESTAMP - time '0:$expiration')", "temporakey_".$keyType);
+        }else{
+            dibi::query("DELETE FROM [ajxp_simple_store] WHERE [store_id] = %s AND [insertion_date] < (CURRENT_TIMESTAMP - %i)", "temporakey_".$keyType, $expiration*60);
+        }
+    }
+
+
+    /**
+     * @param array $param
+     * @return string
+     * @throws \Exception
+     */
+    public function installSQLTables($param)
+    {
+        $p = OptionsHelper::cleanDibiDriverParameters($param["SQL_DRIVER"]);
+        $res = DBHelper::runCreateTablesQuery($p, $this->getBaseDir() . "/create.sql");
+        // SET DB VERSION
+        if(defined('AJXP_VERSION_DB') && AJXP_VERSION_DB != "##DB_VERSION##"){
+            dibi::connect($p);
+            dibi::query("UPDATE [ajxp_version] SET [db_build]=%i", intval(AJXP_VERSION_DB));
+            dibi::disconnect();
+        }
+        return $res;
+    }
+
+    /**
+     * @return bool
+     */
+    public function supportsUserTeams()
+    {
+        return true;
+    }
+
+    /**
+     * @param UserInterface $parentUser
+     * @return array
+     */
+    public function listUserTeams(UserInterface $parentUser)
+    {
+        dibi::query("DELETE FROM [ajxp_user_teams] WHERE [user_id] NOT IN (SELECT [login] FROM [ajxp_users])");
+        $res = dibi::query("SELECT * FROM [ajxp_user_teams] WHERE [owner_id] = %s ORDER BY [team_id]", $parentUser->getId());
+        $data = $res->fetchAll();
+        $all = array();
+        foreach ($data as $row) {
+            $teamId = $row["team_id"];
+            $userId = $row["user_id"];
+            $teamLabel = $row["team_label"];
+            if(!isSet($all[$teamId])) $all[$teamId] = array("LABEL" => $teamLabel, "USERS" => array());
+            $all[$teamId]["USERS"][$userId] = $userId;
+        }
+        return $all;
+    }
+
+    /**
+     * @param UserInterface $parentUser
+     * @param $teamId
+     * @return array
+     */
+    public function teamIdToUsers(UserInterface $parentUser, $teamId)
+    {
+        if(empty($parentUser)) {
+            return [];
+        }
+        $res = [];
+        $teams = $this->listUserTeams($parentUser);
+        $teamData = $teams[$teamId];
+        foreach ($teamData["USERS"] as $userId) {
+            if (UsersService::userExists($userId)) {
+                $res[] = $userId;
+            } else {
+                $this->removeUserFromTeam($teamId, $userId);
+            }
+        }
+        return $res;
+    }
+
+    /**
+     * @param UserInterface $parentUser
+     * @param $teamId
+     * @param $userId
+     * @param null $teamLabel
+     */
+    private function addUserToTeam(UserInterface $parentUser, $teamId, $userId, $teamLabel = null)
+    {
+        if ($teamLabel == null) {
+            $res = dibi::query("SELECT [team_label] FROM [ajxp_user_teams] WHERE [team_id] = %s AND  [owner_id] = %s",
+                $teamId, $parentUser->getId());
+            $teamLabel = $res->fetchSingle();
+        }
+        dibi::query("INSERT INTO [ajxp_user_teams] ([team_id],[user_id],[team_label],[owner_id]) VALUES (%s,%s,%s,%s)",
+            $teamId, $userId, $teamLabel, $parentUser->getId()
+        );
+    }
+
+    /**
+     * @param UserInterface $parentUser
+     * @param $teamId
+     * @param $users
+     * @param null $teamLabel
+     */
+    private function editTeamUsers(UserInterface $parentUser, $teamId, $users, $teamLabel = null)
+    {
+        if ($teamLabel == null) {
+            $res = dibi::query("SELECT [team_label] FROM [ajxp_user_teams] WHERE [team_id] = %s AND  [owner_id] = %s",
+                $teamId, $parentUser->getId());
+            $teamLabel = $res->fetchSingle();
+        }
+        // Remove old users
+        dibi::query("DELETE FROM [ajxp_user_teams] WHERE [team_id] = %s", $teamId);
+        foreach($users as $userId){
+            if(!UsersService::userExists($userId, "r")) continue;
+            dibi::query("INSERT INTO [ajxp_user_teams] ([team_id],[user_id],[team_label],[owner_id]) VALUES (%s,%s,%s,%s)",
+                $teamId, $userId, $teamLabel, $parentUser->getId()
+            );
+        }
+    }
+
+    /**
+     * @param UserInterface $parentUser
+     * @param $teamId
+     * @param null $userId
+     */
+    private function removeUserFromTeam(UserInterface $parentUser, $teamId, $userId = null)
+    {
+        if ($userId == null) {
+            dibi::query("DELETE FROM [ajxp_user_teams] WHERE [team_id] = %s AND  [owner_id] = %s",
+                $teamId, $parentUser->getId()
+            );
+        } else {
+            dibi::query("DELETE FROM [ajxp_user_teams] WHERE [team_id] = %s AND  [user_id] = %s AND [owner_id] = %s",
+                $teamId, $userId, $parentUser->getId()
+            );
+        }
+    }
+
+    /**
+     * @param $actionName
+     * @param $httpVars
+     * @param $fileVars
+     * @param ContextInterface $ctx
+     * @throws \Exception
+     */
+    public function userTeamsActions($actionName, $httpVars, $fileVars, ContextInterface $ctx)
+    {
+        switch ($actionName) {
+
+            case "user_team_create":
+
+                $userIds = $httpVars["user_ids"];
+                $teamLabel = InputFilter::sanitize($httpVars["team_label"], InputFilter::SANITIZE_HTML_STRICT);
+                if(empty($teamLabel)){
+                    throw new \Exception("Empty Team Label!");
+                }
+                if(empty($userIds)){
+                    throw new \Exception("Please select some users for this team.");
+                }
+                $teamId = StringHelper::slugify($teamLabel) ."-".intval(rand(0,1000));
+                foreach ($userIds as $userId) {
+                    $id = InputFilter::sanitize($userId, InputFilter::SANITIZE_EMAILCHARS);
+                    $this->addUserToTeam($ctx->getUser(), $teamId, $id, $teamLabel);
+                }
+                echo 'Created Team $teamId';
+
+                break;
+
+            case "user_team_delete":
+
+                $this->removeUserFromTeam($ctx->getUser(), $httpVars["team_id"], null);
+                break;
+
+            case "user_team_add_user":
+
+                $this->addUserToTeam($ctx->getUser(), $httpVars["team_id"], $httpVars["user_id"], null);
+                break;
+
+            case "user_team_edit_users":
+
+                $this->editTeamUsers($ctx->getUser(), $httpVars["team_id"], $httpVars["users"], $httpVars["team_label"]);
+                break;
+
+            case "user_team_delete_user":
+
+                $this->removeUserFromTeam($ctx->getUser(), $httpVars["team_id"], $httpVars["user_id"]);
+                break;
+
+        }
+    }
+
+
+    /**
+     * @param $actionName
+     * @param $httpVars
+     * @param $fileVars
+     */
+    public function ajxpTableExists($actionName, $httpVars, $fileVars){
+
+        $p = $this->sqlDriver;
+        if($p["driver"] == "postgre"){
+            $tableQuery = "SELECT [tablename] FROM [pg_catalog].[pg_tables] WHERE [tablename] = %s";
+        }else if($p["driver"] == "sqlite3" || $p["driver"] == "sqlite"){
+            $tableQuery = "SELECT [name] FROM [sqlite_master] WHERE type = \"table\" AND [name] = %s";
+        }else{
+            $tableQuery = "SHOW TABLES LIKE %s";
+        }
+        $tableName = InputFilter::sanitize($httpVars["table_name"], InputFilter::SANITIZE_ALPHANUM);
+        $tables = dibi::query($tableQuery, $tableName)->fetchPairs();
+        $exists = (count($tables) && in_array($tableName, $tables));
+        HTMLWriter::charsetHeader("application/json");
+        echo json_encode(array("result" => $exists));
+
+    }
+
+}
diff --git a/core/src/plugins/conf.sql/SqlUser.php b/core/src/plugins/conf.sql/SqlUser.php
new file mode 100644
index 0000000000..ae95362c1e
--- /dev/null
+++ b/core/src/plugins/conf.sql/SqlUser.php
@@ -0,0 +1,587 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Conf\Sql;
+
+use dibi;
+use DibiException;
+use Pydio\Conf\Core\AbstractUser;
+use Pydio\Conf\Core\AbstractConfDriver;
+use Pydio\Conf\Core\AJXP_Role;
+use Pydio\Core\Model\UserInterface;
+use Pydio\Core\Services\RolesService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Utils\FileHelper;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * AJXP_User class for the conf.sql driver.
+ *
+ * Stores rights, preferences and bookmarks in various database tables.
+ *
+ * The class will expect these schema objects to be present:
+ *
+ */
+class SqlUser extends AbstractUser
+{
+    /**
+     * Whether queries will be logged with AJXP_Logger
+     */
+    public $debugEnabled = false;
+
+    /**
+     * Login name of the user.
+     * @var String
+     */
+    public $id;
+
+    /**
+     * User is an admin?
+     * @var Boolean
+     */
+    public $hasAdmin = false;
+
+    /**
+     * User rights map. In the format Array( "repoid" => "rw | r | nothing" )
+     * @var array
+     */
+    public $rights;
+
+    /**
+     * User preferences array in the format Array( "preference_key" => "preference_value" )
+     * @var array
+     */
+    public $prefs;
+
+    /**
+     * User bookmarks array in the format Array( "repoid" => Array( Array( "path"=>"/path/to/bookmark", "title"=>"bookmark" )))
+     * @var array
+     */
+    public $bookmarks;
+
+    /**
+     * User version(?) possibly deprecated.
+     *
+     * @var string
+     */
+    public $version;
+
+    /**
+     * Conf Storage implementation - Any class/plugin implementing AbstractConfDriver.
+     *
+     * This is set by the constructor.
+     *
+     * @var AbstractConfDriver
+     */
+    public $storage;
+
+    /**
+     * AJXP_User Constructor
+     * @param $id String User login name.
+     * @param $storage AbstractConfDriver User storage implementation.
+     * @return SqlUser
+     */
+    public function __construct($id, $storage=null, $debugEnabled = false)
+    {
+        parent::__construct($id, $storage);
+        //$this->debugEnabled = true;
+
+        $this->log('Instantiating User');
+    }
+
+    /**
+     * Does the configuration storage exist?
+     * Will return true if all schema objects are available.
+     *
+     * @see UserInterface#storageExists()
+     * @return boolean false if storage does not exist
+     */
+    public function storageExists()
+    {
+        $this->log('Checking for existence of SqlUser storage...');
+
+        try {
+
+            if (isSet($this->rights["ajxp.admin"])) {
+                // already loaded!
+                return true;
+            }
+            $result_rights = dibi::query('SELECT [rights] FROM [ajxp_user_rights] WHERE [login] = %s AND [repo_uuid] = %s', $this->getId(), 'ajxp.admin');
+            $testRight = $result_rights->fetchSingle();
+            if ($testRight === false) {
+                return false;
+            }
+
+        } catch (DibiException $e) {
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Log a message if the logQueries property is true.
+     *
+     * @param string $textMessage String text of the message to log
+     * @param string $severityLevel Integer constant of the logging severity
+     * @return null
+     */
+    public function log($textMessage, $severityLevel = LOG_LEVEL_DEBUG)
+    {
+        if ($this->debugEnabled) {
+            $logger = Logger::getInstance();
+            $logger->logDebug("AJXP_SQLUSER", $textMessage);
+        }
+    }
+
+    /**
+     * Set a user preference.
+     *
+     * @param string $prefName Name of the preference.
+     * @param string|object $prefValue Value to assign to the preference.
+     * @return null or -1 on error.
+     * @see UserInterface#setPref($prefName, $prefValue)
+     */
+    public function setPref($prefName, $prefValue)
+    {
+        if (!is_string($prefValue)) {
+            $prefValue = '$phpserial$'.serialize($prefValue);
+        }
+        // Prevent a query if the preferences are identical to the existing preferences.
+        if (array_key_exists($prefName, $this->prefs) && $this->prefs[$prefName] == $prefValue) {
+            return;
+        }
+
+        // Try/Catch DibiException
+        try {
+            // Update an existing preference
+            if (array_key_exists($prefName, $this->prefs)) {
+
+                // Delete an existing preferences row, because the value has been unset.
+                if ('' == $prefValue) {
+
+                    dibi::query('DELETE FROM [ajxp_user_prefs] WHERE [login] = %s AND [name] = %s', $this->getId(), $prefName);
+
+                    $this->log('DELETE PREFERENCE: [Login]: '.$this->getId().' [Preference]:'.$prefName.' [Value]:'.$prefValue);
+                    unset($this->prefs[$prefName]); // Update the internal array only if successful.
+
+                // Update an existing rights row, because only some of the rights have changed.
+                } else {
+
+                    dibi::query('UPDATE [ajxp_user_prefs] SET [val] = %bin WHERE [login] = %s AND [name] = %s', $prefValue, $this->getId(), $prefName);
+
+                    $this->log('UPDATE PREFERENCE: [Login]: '.$this->getId().' [Preference]:'.$prefName.' [Value]:'.$prefValue);
+                    $this->prefs[$prefName] = $prefValue;
+                }
+
+            // The repository supplied does not exist, so insert the right.
+            } else {
+
+                dibi::query('INSERT INTO [ajxp_user_prefs] ([login],[name],[val]) VALUES (%s, %s, %bin)', $this->getId(),$prefName,$prefValue);
+
+                $this->log('INSERT PREFERENCE: [Login]: '.$this->getId().' [Preference]:'.$prefName.' [Value]:'.$prefValue);
+                $this->prefs[$prefName] = $prefValue;
+            }
+
+        } catch (DibiException $e) {
+            $this->log('MODIFY PREFERENCE FAILED: Reason: '.$e->getMessage());
+        }
+
+    }
+
+    /**
+     * @param $prefName
+     * @return mixed|string
+     */
+    public function getPref($prefName)
+    {
+        $p = parent::getPref($prefName);
+        if (isSet($p) && is_string($p)) {
+            if (strpos($p, '$phpserial$') !== false && strpos($p, '$phpserial$') === 0) {
+                $p = substr($p, strlen('$phpserial$'));
+                return unserialize($p);
+            }
+            if (strpos($p, '$json$') !== false && strpos($p, '$json$') === 0) {
+                $p = substr($p, strlen('$json$'));
+                return json_decode($p, true);
+            }
+            // By default, unserialize
+            if ($prefName == "CUSTOM_PARAMS") {
+                return unserialize($p);
+            }
+        }
+        return $p;
+    }
+
+    /**
+     * Add a user bookmark.
+     * @inheritdoc
+     */
+    public function addBookmark($repositoryId, $path, $title)
+    {
+        if(!isSet($this->bookmarks)) $this->bookmarks = array();
+        if($title == "") $title = basename($path);
+        if(!isSet($this->bookmarks[$repositoryId])) $this->bookmarks[$repositoryId] = array();
+        foreach ($this->bookmarks[$repositoryId] as $v) {
+            $toCompare = "";
+            if(is_string($v)) $toCompare = $v;
+            else if(is_array($v)) $toCompare = $v["PATH"];
+            if($toCompare == trim($path)) return null; // RETURN IF ALREADY HERE!
+        }
+
+        try {
+            dibi::query('INSERT INTO [ajxp_user_bookmarks]', Array(
+                'login' => $this->getId(),
+                'repo_uuid' => $repositoryId,
+                'path' => $path,
+                'title' => $title
+            ));
+
+        } catch (DibiException $e) {
+            $this->log('BOOKMARK ADD FAILED: Reason: '.$e->getMessage());
+            return -1;
+        }
+        $this->bookmarks[$repositoryId][] = array("PATH"=>trim($path), "TITLE"=>$title);
+        return null;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function removeBookmark($repositoryId, $path)
+    {
+        if(isSet($this->bookmarks)
+            && isSet($this->bookmarks[$repositoryId])
+            && is_array($this->bookmarks[$repositoryId]))
+            {
+                foreach ($this->bookmarks[$repositoryId] as $k => $v) {
+                    $toCompare = "";
+                    if(is_string($v)) $toCompare = $v;
+                    else if(is_array($v)) $toCompare = $v["PATH"];
+                    if ($toCompare == trim($path)) {
+                        try {
+                            dibi::query('DELETE FROM [ajxp_user_bookmarks] WHERE [login] = %s AND [repo_uuid] = %s AND [title] = %s', $this->getId(), $repositoryId, $v["TITLE"]);
+                        } catch (DibiException $e) {
+                            $this->log('BOOKMARK REMOVE FAILED: Reason: '.$e->getMessage());
+                            return -1;
+                        }
+
+                        unset($this->bookmarks[$repositoryId][$k]);
+                    }
+                }
+            }
+        return null;
+    }
+
+    /**
+     * Rename a user bookmark.
+     *
+     * @param string $path Path of the bookmark to rename.
+     * @param string $title New title to give the bookmark.
+     * @return null or -1 on error.
+     * @see UserInterface#renameBookmark($path, $title)
+     */
+    public function renameBookmark($repositoryId, $path, $title)
+    {
+        if(isSet($this->bookmarks)
+            && isSet($this->bookmarks[$repositoryId])
+            && is_array($this->bookmarks[$repositoryId]))
+            {
+                foreach ($this->bookmarks[$repositoryId] as $k => $v) {
+                    $toCompare = "";
+                    if(is_string($v)) $toCompare = $v;
+                    else if(is_array($v)) $toCompare = $v["PATH"];
+                    if ($toCompare == trim($path)) {
+                         try {
+                             dibi::query('UPDATE [ajxp_user_bookmarks] SET ',
+                                         Array('path'=>trim($path), 'title'=>$title),
+                                         'WHERE [login] = %s AND [repo_uuid] = %s AND [title] = %s',
+                                         $this->getId(), $repositoryId, $v["TITLE"]
+                             );
+
+                         } catch (DibiException $e) {
+                             $this->log('BOOKMARK RENAME FAILED: Reason: '.$e->getMessage());
+                             return -1;
+                         }
+                         $this->bookmarks[$repositoryId][$k] = array("PATH"=>trim($path), "TITLE"=>$title);
+                    }
+                }
+            }
+        return null;
+    }
+
+    /**
+     * Load initial user data (Rights, Preferences and Bookmarks).
+     *
+     * @see UserInterface#load()
+     */
+    public function load()
+    {
+        $this->log('Loading all user data..');
+        // update group
+        $res = dibi::query('SELECT [groupPath] FROM [ajxp_users] WHERE [login] = %s', $this->getId());
+        $this->groupPath = $res->fetchSingle();
+        if (empty($this->groupPath)) {
+            // Auto migrate from old version
+            $this->setGroupPath("/");
+        }
+
+        $result_rights = dibi::query('SELECT [repo_uuid], [rights] FROM [ajxp_user_rights] WHERE [login] = %s', $this->getId());
+        $this->rights = $result_rights->fetchPairs('repo_uuid', 'rights');
+
+        // Db field returns integer or string so we are required to cast it in order to make the comparison
+        if (isSet($this->rights["ajxp.admin"]) && (bool) $this->rights["ajxp.admin"] === true) {
+            $this->setAdmin(true);
+        }
+        if (isSet($this->rights["ajxp.parent_user"])) {
+            $this->setParent($this->rights["ajxp.parent_user"]);
+        }
+        if (isSet($this->rights["ajxp.hidden"])){
+            $this->setHidden(true);
+        }
+
+        if ("postgre" == $this->storage->sqlDriver["driver"]) {
+            dibi::nativeQuery('SET bytea_output = escape');
+        }
+        $result_prefs = dibi::query('SELECT [name], [val] FROM [ajxp_user_prefs] WHERE [login] = %s', $this->getId());
+        $this->prefs = $result_prefs->fetchPairs('name', 'val');
+
+        $result_bookmarks = dibi::query('SELECT [repo_uuid], [path], [title] FROM [ajxp_user_bookmarks] WHERE [login] = %s', $this->getId());
+        $all_bookmarks = $result_bookmarks->fetchAll();
+        if (!is_array($this->bookmarks)) {
+            $this->bookmarks = Array();
+        }
+
+        $this->bookmarks = array();
+        foreach ($all_bookmarks as $b) {
+            if (!is_array($this->bookmarks[$b['repo_uuid']])) {
+                $this->bookmarks[$b['repo_uuid']] = Array();
+            }
+
+            $this->bookmarks[$b['repo_uuid']][] = Array('PATH'=>$b['path'], 'TITLE'=>$b['title']);
+        }
+
+        // COLLECT ROLES TO LOAD
+        $rolesToLoad = array();
+        if (isSet($this->rights["ajxp.roles"])) {
+            if (is_string($this->rights["ajxp.roles"])) {
+                if (strpos($this->rights["ajxp.roles"], '$phpserial$') === 0) {
+                    $this->rights["ajxp.roles"] = unserialize(str_replace('$phpserial$', '', $this->rights["ajxp.roles"]));
+                } else if (strpos($this->rights["ajxp.roles"], '$json$') === 0) {
+                    $this->rights["ajxp.roles"] = json_decode(str_replace('$json$', '', $this->rights["ajxp.roles"]), true);
+                } else {
+                    $this->rights["ajxp.roles"] = unserialize($this->rights["ajxp.roles"]);
+                }
+            }
+            if(is_array($this->rights["ajxp.roles"])){
+                $rolesToLoad = array_keys($this->rights["ajxp.roles"]);
+            }
+        }
+        $rolesToLoad[] = "AJXP_GRP_/";
+        if ($this->groupPath != null) {
+            $base = "";
+            $exp = explode("/", $this->groupPath);
+            foreach ($exp as $pathPart) {
+                if(empty($pathPart)) continue;
+                $base = $base . "/" . $pathPart;
+                $rolesToLoad[] = "AJXP_GRP_".$base;
+            }
+        }
+        $rolesToLoad[] = "AJXP_USR_/".$this->id;
+
+        // NOW LOAD THEM
+        if (count($rolesToLoad)) {
+            $allRoles = RolesService::getRolesList($rolesToLoad);
+            foreach ($rolesToLoad as $roleId) {
+                if (isSet($allRoles[$roleId])) {
+                    $this->roles[$roleId] = $allRoles[$roleId];
+                    $this->rights["ajxp.roles"][$roleId] = true;
+                    $roleObject = $allRoles[$roleId];
+                    if($roleObject->alwaysOverrides()){
+                        if(!isSet($this->rights["ajxp.roles.sticky"]) || !is_array($this->rights["ajxp.roles.sticky"])) {
+                            $this->rights["ajxp.roles.sticky"] = array();
+                        }
+                        $this->rights["ajxp.roles.sticky"][$roleId] = true;
+                    }
+                } else if (is_array($this->rights["ajxp.roles"]) && isSet($this->rights["ajxp.roles"][$roleId])) {
+                    unset($this->rights["ajxp.roles"][$roleId]);
+                }
+            }
+        }
+
+        if(!isSet($this->rights["ajxp.roles.order"]) && is_array($this->rights["ajxp.roles"])){
+            // Create sample order
+            $this->rights["ajxp.roles.order"] = array();
+            $index = 0;
+            foreach($this->rights["ajxp.roles"] as $id => $rBool){
+                $this->rights["ajxp.roles.order"][$id] = $index;
+                $index++;
+            }
+        }else{
+            $this->rights["ajxp.roles.order"] = unserialize(str_replace('$phpserial$', '', $this->rights["ajxp.roles.order"]));
+        }
+
+        // CHECK USER PERSONAL ROLE
+        if (isSet($this->roles["AJXP_USR_"."/".$this->id]) && $this->roles["AJXP_USR_"."/".$this->id] instanceof AJXP_Role) {
+            $this->personalRole = $this->roles["AJXP_USR_"."/".$this->id];
+        } else {
+            // MIGRATE NOW !
+            $originalRights = $this->rights;
+            $changes = $this->migrateRightsToPersonalRole();
+            // SAVE RIGHT AND ROLE
+            if ($changes > 0) {
+                // There was an actual migration, let's save the changes now.
+                $removedRights = array_keys(array_diff($originalRights, $this->rights));
+                if (count($removedRights)) {
+                    // We use (%s) instead of %in to pass everything as string ('1' instead of 1)
+                    dibi::query("DELETE FROM [ajxp_user_rights] WHERE [login] = %s AND [repo_uuid] IN (%s)", $this->getId(), $removedRights);
+                }
+                RolesService::updateRole($this->personalRole);
+            } else {
+                $this->personalRole = new AJXP_Role("AJXP_USR_"."/".$this->id);
+            }
+            $this->roles["AJXP_USR_"."/".$this->id] = $this->personalRole;
+
+        }
+        $this->recomputeMergedRole();
+    }
+
+    /**
+     * Save user rights, preferences and bookmarks.
+     * @param String $context
+     * @see UserInterface#save()
+     * @return mixed|void
+     */
+    protected function _save($context = "superuser")
+    {
+        if ($context != "superuser") {
+            // Nothing specific to do, prefs and bookmarks are saved on-the-fly.
+            return;
+        }
+        $this->log('Saving user...');
+
+        // UPDATE RIGHTS ARRAY
+        $this->rights["ajxp.admin"] = ($this->isAdmin() ? "1" : "0");
+        if ($this->hasParent()) {
+            $this->rights["ajxp.parent_user"] = $this->parentUser;
+        }
+        if($this->isHidden()){
+            $this->rights["ajxp.hidden"] = 'true';
+        }
+
+        // UPDATE TABLE
+        dibi::query("DELETE FROM [ajxp_user_rights] WHERE [login]=%s", $this->getId());
+        foreach ($this->rights as $rightKey => $rightValue) {
+            if ($rightKey == "ajxp.roles.sticky") {
+                continue;
+            }
+            if ($rightKey == "ajxp.roles" || $rightKey == "ajxp.roles.order") {
+                if (is_array($rightValue) && count($rightValue)) {
+                    $rightValue = $this->filterRolesForSaving($rightValue, $rightKey == "ajxp.roles" ? true: false);
+                    $rightValue = '$phpserial$'.serialize($rightValue);
+                } else {
+                    continue;
+                }
+            }
+            dibi::query("INSERT INTO [ajxp_user_rights]", array(
+                'login' => $this->getId(),
+                'repo_uuid' => $rightKey,
+                'rights'	=> $rightValue
+            ));
+        }
+
+        RolesService::updateRole($this->personalRole);
+
+        if (!empty($this->groupPath)) {
+            $this->setGroupPath($this->groupPath);
+        }
+
+    }
+
+    /**
+     * Get Temporary Data.
+     * Implementation uses serialised files because of the overhead incurred with a full db implementation.
+     *
+     * @param $key String key of data to retrieve
+     * @return mixed Requested value
+     */
+    public function getTemporaryData($key)
+    {
+        $dirPath = $this->storage->getOption("USERS_DIRPATH");
+        if ($dirPath == "") {
+            $dirPath = AJXP_INSTALL_PATH."/data/users";
+            Logger::info(__CLASS__,"getTemporaryData", array("Warning" => "The conf.sql driver is missing a mandatory option USERS_DIRPATH!"));
+        }
+        $id = UsersService::ignoreUserCase() ?strtolower($this->getId()):$this->getId();
+        return FileHelper::loadSerialFile($dirPath . "/" . $id . "/temp-" . $key . ".ser");
+    }
+
+    /**
+     * Save Temporary Data.
+     * Implementation uses serialised files because of the overhead incurred with a full db implementation.
+     *
+     * @param string $key String key of data to save.
+     * @param mixed $value Value to save
+     * @return mixed|void
+     */
+    public function saveTemporaryData($key, $value)
+    {
+        $dirPath = $this->storage->getOption("USERS_DIRPATH");
+        if ($dirPath == "") {
+            $dirPath = AJXP_INSTALL_PATH."/data/users";
+            Logger::info(__CLASS__,"setTemporaryData", array("Warning" => "The conf.sql driver is missing a mandatory option USERS_DIRPATH!"));
+        }
+        $id = UsersService::ignoreUserCase() ?strtolower($this->getId()):$this->getId();
+        FileHelper::saveSerialFile($dirPath . "/" . $id . "/temp-" . $key . ".ser", $value);
+    }
+
+    /**
+     * @param String $groupPath
+     * @param bool $update
+     * @throws \Pydio\Core\Exception\UserNotFoundException
+     */
+    public function setGroupPath($groupPath, $update = false)
+    {
+        if ($update &&  isSet($this->groupPath) && $groupPath != $this->groupPath) {
+            // Update Shared Users groups as well
+            $res = dibi::query("SELECT [u.login] FROM [ajxp_users] AS u, [ajxp_user_rights] AS p WHERE [u.login] = [p.login] AND [p.repo_uuid] = %s AND [p.rights] = %s AND [u.groupPath] != %s ", "ajxp.parent_user", $this->getId(), $groupPath);
+            foreach ($res as $row) {
+                $userId = $row->login;
+                // UPDATE USER GROUP AND ROLES
+                $u = UsersService::getUserById($userId, false);
+                $u->setGroupPath($groupPath);
+                $r = $u->getRoles();
+                // REMOVE OLD GROUP ROLES
+                foreach (array_keys($r) as $role) {
+                    if(strpos($role, "AJXP_GRP_/") === 0) $u->removeRole($role);
+                }
+                $u->recomputeMergedRole();
+                $u->save("superuser");
+            }
+        }
+        parent::setGroupPath($groupPath);
+        dibi::query('UPDATE [ajxp_users] SET ', Array('groupPath'=>$groupPath), 'WHERE [login] = %s', $this->getId());
+        $this->log('UPDATE GROUP: [Login]: '.$this->getId().' [Group]:'.$groupPath);
+    }
+
+}
diff --git a/core/src/plugins/conf.sql/class.AJXP_SqlUser.php b/core/src/plugins/conf.sql/class.AJXP_SqlUser.php
deleted file mode 100755
index 9690bf68c4..0000000000
--- a/core/src/plugins/conf.sql/class.AJXP_SqlUser.php
+++ /dev/null
@@ -1,581 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * AJXP_User class for the conf.sql driver.
- *
- * Stores rights, preferences and bookmarks in various database tables.
- *
- * The class will expect these schema objects to be present:
- *
- * CREATE TABLE ajxp_user_rights ( rid INTEGER PRIMARY KEY, login VARCHAR(255), repo_uuid VARCHAR(33), rights VARCHAR(20));
- * CREATE TABLE ajxp_user_prefs ( rid INTEGER PRIMARY KEY, login VARCHAR(255), name VARCHAR(255), val VARCHAR(255));
- * CREATE TABLE ajxp_user_bookmarks ( rid INTEGER PRIMARY KEY, login VARCHAR(255), repo_uuid VARCHAR(33), path VARCHAR(255), title VARCHAR(255));
- *
- *
- * @author ebrosnan
- * @package AjaXplorer_Plugins
- * @subpackage Conf
- */
-class AJXP_SqlUser extends AbstractAjxpUser
-{
-    /**
-     * Whether queries will be logged with AJXP_Logger
-     */
-    public $debugEnabled = false;
-
-    /**
-     * Login name of the user.
-     * @var String
-     */
-    public $id;
-
-    /**
-     * User is an admin?
-     * @var Boolean
-     */
-    public $hasAdmin = false;
-
-    /**
-     * User rights map. In the format Array( "repoid" => "rw | r | nothing" )
-     * @var Array
-     */
-    public $rights;
-
-    /**
-     * User preferences array in the format Array( "preference_key" => "preference_value" )
-     * @var Array
-     */
-    public $prefs;
-
-    /**
-     * User bookmarks array in the format Array( "repoid" => Array( Array( "path"=>"/path/to/bookmark", "title"=>"bookmark" )))
-     * @var Array
-     */
-    public $bookmarks;
-
-    /**
-     * User version(?) possibly deprecated.
-     *
-     * @var unknown_type
-     */
-    public $version;
-
-    /**
-     * Conf Storage implementation - Any class/plugin implementing AbstractConfDriver.
-     *
-     * This is set by the constructor.
-     *
-     * @var AbstractConfDriver
-     */
-    public $storage;
-
-    /**
-     * AJXP_User Constructor
-     * @param $id String User login name.
-     * @param $storage AbstractConfDriver User storage implementation.
-     * @return AJXP_SqlUser
-     */
-    public function __construct($id, $storage=null, $debugEnabled = false)
-    {
-        parent::__construct($id, $storage);
-        //$this->debugEnabled = true;
-
-        $this->log('Instantiating User');
-    }
-
-    /**
-     * Does the configuration storage exist?
-     * Will return true if all schema objects are available.
-     *
-     * @see AbstractAjxpUser#storageExists()
-     * @return boolean false if storage does not exist
-     */
-    public function storageExists()
-    {
-        $this->log('Checking for existence of AJXP_SqlUser storage...');
-
-        try {
-
-            if (isSet($this->rights["ajxp.admin"])) {
-                // already loaded!
-                return true;
-            }
-            $result_rights = dibi::query('SELECT [rights] FROM [ajxp_user_rights] WHERE [login] = %s AND [repo_uuid] = %s', $this->getId(), 'ajxp.admin');
-            $testRight = $result_rights->fetchSingle();
-            if ($testRight === false) {
-                return false;
-            }
-
-        } catch (DibiException $e) {
-
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Log a message if the logQueries property is true.
-     *
-     * @param $textMessage String text of the message to log
-     * @param $severityLevel Integer constant of the logging severity
-     * @return null
-     */
-    public function log($textMessage, $severityLevel = LOG_LEVEL_DEBUG)
-    {
-        if ($this->debugEnabled) {
-            $logger = AJXP_Logger::getInstance();
-            $logger->write($textMessage, $severityLevel);
-        }
-    }
-
-    /**
-     * Set a user preference.
-     *
-     * @param $prefName String Name of the preference.
-     * @param $prefValue String Value to assign to the preference.
-     * @return null or -1 on error.
-     * @see AbstractAjxpUser#setPref($prefName, $prefValue)
-     */
-    public function setPref($prefName, $prefValue)
-    {
-        if (!is_string($prefValue)) {
-            $prefValue = '$phpserial$'.serialize($prefValue);
-        }
-        // Prevent a query if the preferences are identical to the existing preferences.
-        if (array_key_exists($prefName, $this->prefs) && $this->prefs[$prefName] == $prefValue) {
-            return;
-        }
-
-        // Try/Catch DibiException
-        try {
-            // Update an existing preference
-            if (array_key_exists($prefName, $this->prefs)) {
-
-                // Delete an existing preferences row, because the value has been unset.
-                if ('' == $prefValue) {
-
-                    dibi::query('DELETE FROM [ajxp_user_prefs] WHERE [login] = %s AND [name] = %s', $this->getId(), $prefName);
-
-                    $this->log('DELETE PREFERENCE: [Login]: '.$this->getId().' [Preference]:'.$prefName.' [Value]:'.$prefValue);
-                    unset($this->prefs[$prefName]); // Update the internal array only if successful.
-
-                // Update an existing rights row, because only some of the rights have changed.
-                } else {
-
-                    dibi::query('UPDATE [ajxp_user_prefs] SET [val] = %bin WHERE [login] = %s AND [name] = %s', $prefValue, $this->getId(), $prefName);
-
-                    $this->log('UPDATE PREFERENCE: [Login]: '.$this->getId().' [Preference]:'.$prefName.' [Value]:'.$prefValue);
-                    $this->prefs[$prefName] = $prefValue;
-                }
-
-            // The repository supplied does not exist, so insert the right.
-            } else {
-
-                dibi::query('INSERT INTO [ajxp_user_prefs] ([login],[name],[val]) VALUES (%s, %s, %bin)', $this->getId(),$prefName,$prefValue);
-
-                $this->log('INSERT PREFERENCE: [Login]: '.$this->getId().' [Preference]:'.$prefName.' [Value]:'.$prefValue);
-                $this->prefs[$prefName] = $prefValue;
-            }
-
-        } catch (DibiException $e) {
-            $this->log('MODIFY PREFERENCE FAILED: Reason: '.$e->getMessage());
-        }
-
-    }
-
-    public function getPref($prefName)
-    {
-        $p = parent::getPref($prefName);
-        if (isSet($p) && is_string($p)) {
-            if (strpos($p, '$phpserial$') !== false && strpos($p, '$phpserial$') === 0) {
-                $p = substr($p, strlen('$phpserial$'));
-                return unserialize($p);
-            }
-            if (strpos($p, '$json$') !== false && strpos($p, '$json$') === 0) {
-                $p = substr($p, strlen('$json$'));
-                return json_decode($p, true);
-            }
-            // By default, unserialize
-            if ($prefName == "CUSTOM_PARAMS") {
-                return unserialize($p);
-            }
-        }
-        return $p;
-    }
-
-    /**
-     * Add a user bookmark.
-     *
-     * @param $path String Relative path to bookmarked location.
-     * @param $title String Title of the bookmark
-     * @param $repId String Repository Unique ID
-     * @return null or -1 on error.
-     * @see AbstractAjxpUser#addBookmark($path, $title, $repId)
-     */
-    public function addBookmark($path, $title="", $repId = -1)
-    {
-        if(!isSet($this->bookmarks)) $this->bookmarks = array();
-        if($repId == -1) $repId = ConfService::getCurrentRepositoryId();
-        if($title == "") $title = basename($path);
-        if(!isSet($this->bookmarks[$repId])) $this->bookmarks[$repId] = array();
-        foreach ($this->bookmarks[$repId] as $v) {
-            $toCompare = "";
-            if(is_string($v)) $toCompare = $v;
-            else if(is_array($v)) $toCompare = $v["PATH"];
-            if($toCompare == trim($path)) return ; // RETURN IF ALREADY HERE!
-        }
-
-        try {
-            dibi::query('INSERT INTO [ajxp_user_bookmarks]', Array(
-                'login' => $this->getId(),
-                'repo_uuid' => $repId,
-                'path' => $path,
-                'title' => $title
-            ));
-
-        } catch (DibiException $e) {
-            $this->log('BOOKMARK ADD FAILED: Reason: '.$e->getMessage());
-            return -1;
-        }
-        $this->bookmarks[$repId][] = array("PATH"=>trim($path), "TITLE"=>$title);
-    }
-
-    /**
-     * Remove a user bookmark.
-     *
-     * @param $path String String of the path of the bookmark to remove.
-     * @return null or -1 on error.
-     * @see AbstractAjxpUser#removeBookmark($path)
-     */
-    public function removeBookmark($path)
-    {
-        $repId = ConfService::getCurrentRepositoryId();
-        if(isSet($this->bookmarks)
-            && isSet($this->bookmarks[$repId])
-            && is_array($this->bookmarks[$repId]))
-            {
-                foreach ($this->bookmarks[$repId] as $k => $v) {
-                    $toCompare = "";
-                    if(is_string($v)) $toCompare = $v;
-                    else if(is_array($v)) $toCompare = $v["PATH"];
-                    if ($toCompare == trim($path)) {
-                        try {
-                            dibi::query('DELETE FROM [ajxp_user_bookmarks] WHERE [login] = %s AND [repo_uuid] = %s AND [title] = %s', $this->getId(), $repId, $v["TITLE"]);
-                        } catch (DibiException $e) {
-                            $this->log('BOOKMARK REMOVE FAILED: Reason: '.$e->getMessage());
-                            return -1;
-                        }
-
-                        unset($this->bookmarks[$repId][$k]);
-                    }
-                }
-            }
-    }
-
-    /**
-     * Rename a user bookmark.
-     *
-     * @param $path String Path of the bookmark to rename.
-     * @param $title New title to give the bookmark.
-     * @return null or -1 on error.
-     * @see AbstractAjxpUser#renameBookmark($path, $title)
-     */
-    public function renameBookmark($path, $title)
-    {
-        $repId = ConfService::getCurrentRepositoryId();
-        if(isSet($this->bookmarks)
-            && isSet($this->bookmarks[$repId])
-            && is_array($this->bookmarks[$repId]))
-            {
-                foreach ($this->bookmarks[$repId] as $k => $v) {
-                    $toCompare = "";
-                    if(is_string($v)) $toCompare = $v;
-                    else if(is_array($v)) $toCompare = $v["PATH"];
-                    if ($toCompare == trim($path)) {
-                         try {
-                             dibi::query('UPDATE [ajxp_user_bookmarks] SET ',
-                                         Array('path'=>trim($path), 'title'=>$title),
-                                         'WHERE [login] = %s AND [repo_uuid] = %s AND [title] = %s',
-                                         $this->getId(), $repId, $v["TITLE"]
-                             );
-
-                         } catch (DibiException $e) {
-                             $this->log('BOOKMARK RENAME FAILED: Reason: '.$e->getMessage());
-                             return -1;
-                         }
-                         $this->bookmarks[$repId][$k] = array("PATH"=>trim($path), "TITLE"=>$title);
-                    }
-                }
-            }
-    }
-
-    /**
-     * Load initial user data (Rights, Preferences and Bookmarks).
-     *
-     * @see AbstractAjxpUser#load()
-     */
-    public function load()
-    {
-        $this->log('Loading all user data..');
-        // update group
-        $res = dibi::query('SELECT [groupPath] FROM [ajxp_users] WHERE [login] = %s', $this->getId());
-        $this->groupPath = $res->fetchSingle();
-        if (empty($this->groupPath)) {
-            // Auto migrate from old version
-            $this->setGroupPath("/");
-        }
-
-        $result_rights = dibi::query('SELECT [repo_uuid], [rights] FROM [ajxp_user_rights] WHERE [login] = %s', $this->getId());
-        $this->rights = $result_rights->fetchPairs('repo_uuid', 'rights');
-
-        // Db field returns integer or string so we are required to cast it in order to make the comparison
-        if (isSet($this->rights["ajxp.admin"]) && (bool) $this->rights["ajxp.admin"] === true) {
-            $this->setAdmin(true);
-        }
-        if (isSet($this->rights["ajxp.parent_user"])) {
-            $this->setParent($this->rights["ajxp.parent_user"]);
-        }
-        if (isSet($this->rights["ajxp.hidden"])){
-            $this->setHidden(true);
-        }
-
-        if ("postgre" == $this->storage->sqlDriver["driver"]) {
-            dibi::nativeQuery('SET bytea_output = escape');
-        }
-        $result_prefs = dibi::query('SELECT [name], [val] FROM [ajxp_user_prefs] WHERE [login] = %s', $this->getId());
-        $this->prefs = $result_prefs->fetchPairs('name', 'val');
-
-        $result_bookmarks = dibi::query('SELECT [repo_uuid], [path], [title] FROM [ajxp_user_bookmarks] WHERE [login] = %s', $this->getId());
-        $all_bookmarks = $result_bookmarks->fetchAll();
-        if (!is_array($this->bookmarks)) {
-            $this->bookmarks = Array();
-        }
-
-        $this->bookmarks = array();
-        foreach ($all_bookmarks as $b) {
-            if (!is_array($this->bookmarks[$b['repo_uuid']])) {
-                $this->bookmarks[$b['repo_uuid']] = Array();
-            }
-
-            $this->bookmarks[$b['repo_uuid']][] = Array('PATH'=>$b['path'], 'TITLE'=>$b['title']);
-        }
-
-        // COLLECT ROLES TO LOAD
-        $rolesToLoad = array();
-        if (isSet($this->rights["ajxp.roles"])) {
-            if (is_string($this->rights["ajxp.roles"])) {
-                if (strpos($this->rights["ajxp.roles"], '$phpserial$') === 0) {
-                    $this->rights["ajxp.roles"] = unserialize(str_replace('$phpserial$', '', $this->rights["ajxp.roles"]));
-                } else if (strpos($this->rights["ajxp.roles"], '$json$') === 0) {
-                    $this->rights["ajxp.roles"] = json_decode(str_replace('$json$', '', $this->rights["ajxp.roles"]), true);
-                } else {
-                    $this->rights["ajxp.roles"] = unserialize($this->rights["ajxp.roles"]);
-                }
-            }
-            if(is_array($this->rights["ajxp.roles"])){
-                $rolesToLoad = array_keys($this->rights["ajxp.roles"]);
-            }
-        }
-        $rolesToLoad[] = "AJXP_GRP_/";
-        if ($this->groupPath != null) {
-            $base = "";
-            $exp = explode("/", $this->groupPath);
-            foreach ($exp as $pathPart) {
-                if(empty($pathPart)) continue;
-                $base = $base . "/" . $pathPart;
-                $rolesToLoad[] = "AJXP_GRP_".$base;
-            }
-        }
-        $rolesToLoad[] = "AJXP_USR_/".$this->id;
-
-        // NOW LOAD THEM
-        if (count($rolesToLoad)) {
-            $allRoles = AuthService::getRolesList($rolesToLoad);
-            foreach ($rolesToLoad as $roleId) {
-                if (isSet($allRoles[$roleId])) {
-                    $this->roles[$roleId] = $allRoles[$roleId];
-                    $this->rights["ajxp.roles"][$roleId] = true;
-                    $roleObject = $allRoles[$roleId];
-                    if($roleObject->alwaysOverrides()){
-                        if(!isSet($this->rights["ajxp.roles.sticky"]) || !is_array($this->rights["ajxp.roles.sticky"])) {
-                            $this->rights["ajxp.roles.sticky"] = array();
-                        }
-                        $this->rights["ajxp.roles.sticky"][$roleId] = true;
-                    }
-                } else if (is_array($this->rights["ajxp.roles"]) && isSet($this->rights["ajxp.roles"][$roleId])) {
-                    unset($this->rights["ajxp.roles"][$roleId]);
-                }
-            }
-        }
-
-        if(!isSet($this->rights["ajxp.roles.order"]) && is_array($this->rights["ajxp.roles"])){
-            // Create sample order
-            $this->rights["ajxp.roles.order"] = array();
-            $index = 0;
-            foreach($this->rights["ajxp.roles"] as $id => $rBool){
-                $this->rights["ajxp.roles.order"][$id] = $index;
-                $index++;
-            }
-        }else{
-            $this->rights["ajxp.roles.order"] = unserialize(str_replace('$phpserial$', '', $this->rights["ajxp.roles.order"]));
-        }
-
-        // CHECK USER PERSONAL ROLE
-        if (isSet($this->roles["AJXP_USR_"."/".$this->id]) && is_a($this->roles["AJXP_USR_"."/".$this->id], "AJXP_Role")) {
-            $this->personalRole = $this->roles["AJXP_USR_"."/".$this->id];
-        } else {
-            // MIGRATE NOW !
-            $originalRights = $this->rights;
-            $changes = $this->migrateRightsToPersonalRole();
-            // SAVE RIGHT AND ROLE
-            if ($changes > 0) {
-                // There was an actual migration, let's save the changes now.
-                $removedRights = array_keys(array_diff($originalRights, $this->rights));
-                if (count($removedRights)) {
-                    // We use (%s) instead of %in to pass everything as string ('1' instead of 1)
-                    dibi::query("DELETE FROM [ajxp_user_rights] WHERE [login] = %s AND [repo_uuid] IN (%s)", $this->getId(), $removedRights);
-                }
-                AuthService::updateRole($this->personalRole);
-            } else {
-                $this->personalRole = new AJXP_Role("AJXP_USR_"."/".$this->id);
-            }
-            $this->roles["AJXP_USR_"."/".$this->id] = $this->personalRole;
-
-        }
-        $this->recomputeMergedRole();
-    }
-
-    /**
-     * Save user rights, preferences and bookmarks.
-     * @param String $context
-     * @see AbstractAjxpUser#save()
-     */
-    protected function _save($context = "superuser")
-    {
-        if ($context != "superuser") {
-            // Nothing specific to do, prefs and bookmarks are saved on-the-fly.
-            return;
-        }
-        $this->log('Saving user...');
-
-        // UPDATE RIGHTS ARRAY
-        $this->rights["ajxp.admin"] = ($this->isAdmin() ? "1" : "0");
-        if ($this->hasParent()) {
-            $this->rights["ajxp.parent_user"] = $this->parentUser;
-        }
-        if($this->isHidden()){
-            $this->rights["ajxp.hidden"] = 'true';
-        }
-
-        // UPDATE TABLE
-        dibi::query("DELETE FROM [ajxp_user_rights] WHERE [login]=%s", $this->getId());
-        foreach ($this->rights as $rightKey => $rightValue) {
-            if ($rightKey == "ajxp.roles.sticky") {
-                continue;
-            }
-            if ($rightKey == "ajxp.roles" || $rightKey == "ajxp.roles.order") {
-                if (is_array($rightValue) && count($rightValue)) {
-                    $rightValue = $this->filterRolesForSaving($rightValue, $rightKey == "ajxp.roles" ? true: false);
-                    $rightValue = '$phpserial$'.serialize($rightValue);
-                } else {
-                    continue;
-                }
-            }
-            dibi::query("INSERT INTO [ajxp_user_rights]", array(
-                'login' => $this->getId(),
-                'repo_uuid' => $rightKey,
-                'rights'	=> $rightValue
-            ));
-        }
-
-        AuthService::updateRole($this->personalRole);
-
-        if (!empty($this->groupPath)) {
-            $this->setGroupPath($this->groupPath);
-        }
-
-    }
-
-    /**
-     * Get Temporary Data.
-     * Implementation uses serialised files because of the overhead incurred with a full db implementation.
-     *
-     * @param $key String key of data to retrieve
-     * @return Requested value
-     */
-    public function getTemporaryData($key)
-    {
-        $dirPath = $this->storage->getOption("USERS_DIRPATH");
-        if ($dirPath == "") {
-            $dirPath = AJXP_INSTALL_PATH."/data/users";
-            AJXP_Logger::info(__CLASS__,"getTemporaryData", array("Warning" => "The conf.sql driver is missing a mandatory option USERS_DIRPATH!"));
-        }
-        $id = AuthService::ignoreUserCase()?strtolower($this->getId()):$this->getId();
-        return AJXP_Utils::loadSerialFile($dirPath."/".$id."/temp-".$key.".ser");
-    }
-
-    /**
-     * Save Temporary Data.
-     * Implementation uses serialised files because of the overhead incurred with a full db implementation.
-     *
-     * @param $key String key of data to save.
-     * @param $value Value to save
-     */
-    public function saveTemporaryData($key, $value)
-    {
-        $dirPath = $this->storage->getOption("USERS_DIRPATH");
-        if ($dirPath == "") {
-            $dirPath = AJXP_INSTALL_PATH."/data/users";
-            AJXP_Logger::info(__CLASS__,"setTemporaryData", array("Warning" => "The conf.sql driver is missing a mandatory option USERS_DIRPATH!"));
-        }
-        $id = AuthService::ignoreUserCase()?strtolower($this->getId()):$this->getId();
-        AJXP_Utils::saveSerialFile($dirPath."/".$id."/temp-".$key.".ser", $value);
-    }
-
-    public function setGroupPath($groupPath, $update = false)
-    {
-        if ($update &&  isSet($this->groupPath) && $groupPath != $this->groupPath) {
-            // Update Shared Users groups as well
-            $res = dibi::query("SELECT [u.login] FROM [ajxp_users] AS u, [ajxp_user_rights] AS p WHERE [u.login] = [p.login] AND [p.repo_uuid] = %s AND [p.rights] = %s AND [u.groupPath] != %s ", "ajxp.parent_user", $this->getId(), $groupPath);
-            foreach ($res as $row) {
-                $userId = $row->login;
-                // UPDATE USER GROUP AND ROLES
-                $u = ConfService::getConfStorageImpl()->createUserObject($userId);
-                $u->setGroupPath($groupPath);
-                $r = $u->getRoles();
-                // REMOVE OLD GROUP ROLES
-                foreach (array_keys($r) as $role) {
-                    if(strpos($role, "AJXP_GRP_/") === 0) $u->removeRole($role);
-                }
-                $u->recomputeMergedRole();
-                $u->save("superuser");
-            }
-        }
-        parent::setGroupPath($groupPath);
-        dibi::query('UPDATE [ajxp_users] SET ', Array('groupPath'=>$groupPath), 'WHERE [login] = %s', $this->getId());
-        $this->log('UPDATE GROUP: [Login]: '.$this->getId().' [Group]:'.$groupPath);
-    }
-
-}
diff --git a/core/src/plugins/conf.sql/class.TeamEditor.js b/core/src/plugins/conf.sql/class.TeamEditor.js
index dec91454bb..1b0cf004b1 100644
--- a/core/src/plugins/conf.sql/class.TeamEditor.js
+++ b/core/src/plugins/conf.sql/class.TeamEditor.js
@@ -15,7 +15,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 Class.create("TeamEditor", {
diff --git a/core/src/plugins/conf.sql/class.sqlConfDriver.php b/core/src/plugins/conf.sql/class.sqlConfDriver.php
deleted file mode 100644
index 9e07a706ab..0000000000
--- a/core/src/plugins/conf.sql/class.sqlConfDriver.php
+++ /dev/null
@@ -1,1279 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Configuration stored in an SQL Database
- * @package AjaXplorer_Plugins
- * @subpackage Conf
- */
-class sqlConfDriver extends AbstractConfDriver implements SqlTableProvider
-{
-    public $sqlDriver = array();
-
-    /**
-     * Initialise the driver.
-     *
-     * Expects options containing a key 'SQL_DRIVER' with constructor values from dibi::connect()
-     *
-     * Example:
-     * 		"SQL_DRIVER" => Array(
-     *		'driver' => 'sqlite',
-     *			'file' => "./server/ajxp.db"
-     *		)
-     *
-     * Example 2:
-     * 		"SQL_DRIVER" => Array(
-     * 		'driver' => 'mysql',
-     * 		'host' => 'localhost',
-     * 		'username' => 'root',
-     * 		'password' => '***',
-     * 		'database' => 'dbname'
-     * 		)
-     *
-     * @see AbstractConfDriver#init($options)
-     */
-    public function init($options)
-    {
-        parent::init($options);
-        $this->sqlDriver = AJXP_Utils::cleanDibiDriverParameters($options["SQL_DRIVER"]);
-        try {
-            if(!dibi::isConnected()) {
-                dibi::connect($this->sqlDriver);
-            }
-            if(AJXP_SERVER_DEBUG && AJXP_VERSION_DB != "##DB_VERSION##"){
-                $res = dibi::query("select MAX(db_build) from [ajxp_version]");
-                if(!empty($res)){
-                    $dbVersion = intval($res->fetchSingle());
-                    $current = intval(AJXP_VERSION_DB);
-                    if($dbVersion > 0 && $dbVersion < $current){
-                        // We need to upgrade now!
-                        error_log("[Pydio] DB Upgrade Required! You may encounter strange issues. Make sure to manually apply the DB update.");
-                        $this->logError("[DB]", "DB Upgrade Required! You may encounter strange issues. Make sure to manually apply the DB update.");
-                    }
-                }
-            }
-        } catch (DibiException $e) {
-            //throw $e;
-            echo get_class($e), ': ', $e->getMessage(), "\n";
-            exit(1);
-        }
-    }
-
-    public function performChecks()
-    {
-        if(!isSet($this->options)) return;
-        $test = AJXP_Utils::cleanDibiDriverParameters($this->options["SQL_DRIVER"]);
-        if (!count($test)) {
-            throw new Exception("You probably did something wrong! To fix this issue you have to remove the file \"bootsrap.json\" and rename the backup file \"bootstrap.json.bak\" into \"bootsrap.json\" in data/plugins/boot.conf/");
-        }
-    }
-
-    public function _loadPluginConfig($pluginId, &$options)
-    {
-        if($this->sqlDriver["driver"] == "postgre"){
-            dibi::query("SET bytea_output=escape");
-        }
-        $res_opts = dibi::query('SELECT * FROM [ajxp_plugin_configs] WHERE [id] = %s', $pluginId);
-        $config_row = $res_opts->fetchPairs();
-        $confOpt = unserialize($config_row[$pluginId]);
-        if (is_array($confOpt)) {
-            foreach($confOpt as $key => $value) $options[$key] = $value;
-        }
-    }
-
-    /**
-     *
-     * @param String $pluginId
-     * @param String $options
-     */
-    public function _savePluginConfig($pluginId, $options)
-    {
-        $res_opts = dibi::query('SELECT COUNT(*) FROM [ajxp_plugin_configs] WHERE [id] = %s', $pluginId);
-        if ($res_opts->fetchSingle()) {
-            dibi::query('UPDATE [ajxp_plugin_configs] SET [configs] = %bin WHERE [id] = %s', serialize($options), $pluginId);
-        } else {
-            dibi::query('INSERT INTO [ajxp_plugin_configs] ([id],[configs]) VALUES (%s,%bin)', $pluginId, serialize($options));
-        }
-    }
-
-    /**
-     * Create a Repository object from a Database Result
-     *
-     * The method expects the following schema:
-     * CREATE TABLE ajxp_repo ( uuid VARCHAR(33) PRIMARY KEY,
-     *                             path VARCHAR(255),
-     *                             display VARCHAR(255),
-     *                             accessType VARCHAR(20),
-     *                             recycle VARCHAR(255) ,
-     *                             bcreate BOOLEAN, -- For some reason 'create' is a reserved keyword
-     *                             writeable BOOLEAN,
-     *                             enabled BOOLEAN );
-     *
-     * Additionally, the options are stored in a separate table:
-     * CREATE TABLE ajxp_repo_options ( oid INTEGER PRIMARY KEY, uuid VARCHAR(33), name VARCHAR(50), val VARCHAR(255) );
-     *
-     * I recommend an index to increase performance of uuid lookups:
-     * CREATE INDEX ajxp_repo_options_uuid_idx ON ajxp_repo_options ( uuid );
-     *
-     *
-     * @param $result Result of a dibi::query() as array
-     * @param array|\Result $options_result Result of dibi::query() for options as array
-     * @return Repository object
-     */
-    public function repoFromDb($result, $options_result = Array())
-    {
-        $repo = new Repository($result['id'], $result['display'], $result['accessType']);
-        $repo->uuid = $result['uuid'];
-        $repo->setOwnerData($result['parent_uuid'], $result['owner_user_id'], $result['child_user_id']);
-        $repo->path = $result['path'];
-        $repo->create = (bool) $result['bcreate'];
-        $repo->writeable = (bool) $result['writeable'];
-        $repo->enabled = (bool) $result['enabled'];
-        $repo->recycle = "";
-        $repo->setSlug($result['slug']);
-        if (isSet($result['groupPath']) && !empty($result['groupPath'])) {
-            $repo->setGroupPath($result['groupPath']);
-        }
-        $repo->isTemplate = (bool) $result['isTemplate'];
-        $repo->setInferOptionsFromParent((bool) $result['inferOptionsFromParent']);
-
-        foreach ($options_result as $k => $v) {
-            if (strpos($v, '$phpserial$') !== false && strpos($v, '$phpserial$') === 0) {
-                $v = unserialize(substr($v, strlen('$phpserial$')));
-            } else if ($k == "META_SOURCES") {
-                $v = unserialize($v);
-            }
-            $repo->options[$k] = $v;
-        }
-        if(isSet($repo->options["content_filter"]) && is_a($repo->options["content_filter"], "ContentFilter")){
-            $repo->setContentFilter($repo->options["content_filter"]);
-        }
-
-        return $repo;
-    }
-
-    /**
-     * Convert a repository object to an array, which will be stored in the database.
-     *
-     * @param $repository Repository
-     * @return Array containing row values, and another array with the key "options" to be stored as repo options.
-     */
-    public function repoToArray($repository)
-    {
-
-        $repository_row = Array(
-                'uuid'                      => $repository->getUniqueId(),
-                'parent_uuid'               => $repository->getParentId(),
-                'owner_user_id'             => $repository->getOwner(),
-                'child_user_id'             => $repository->getUniqueUser(),
-                'path'                      => $repository->options['PATH'],
-                'display'                   => $repository->getDisplay(),
-                'accessType'                => $repository->getAccessType(),
-                'recycle'                   => $repository->recycle,
-                'bcreate'                   => $repository->getCreate(),
-                'writeable'                 => $repository->isWriteable(),
-                'enabled'                   => $repository->isEnabled(),
-                'options'                   => $repository->options,
-                'groupPath'                 => $repository->getGroupPath(),
-                'slug'		                => $repository->getSlug(),
-                'isTemplate'                => (bool) $repository->isTemplate,
-                'inferOptionsFromParent'    => $repository->getInferOptionsFromParent()
-        );
-
-        return $repository_row;
-    }
-
-
-    /**
-     * @param array $array
-     * @return Repository[]
-     */
-    protected function initRepoArrayFromDbFetch($array){
-        $repositories = array();
-        if(!count($array)){
-            return $repositories;
-        }
-        // Load all at once
-        $ids = array();
-        $allOpts = array();
-        foreach($array as $row) {
-            $ids[] = $row['uuid'];
-            $allOpts[$row['uuid']] = array("ROW" => $row, "OPTIONS" => array());
-        }
-        if($this->sqlDriver["driver"] == "postgre"){
-            dibi::query("SET bytea_output=escape");
-        }
-        $dbres = dibi::query("SELECT [uuid], [name], [val] FROM [ajxp_repo_options] WHERE [uuid] IN (%s)", $ids);
-        foreach($dbres as $row){
-            $allOpts[$row['uuid']]["OPTIONS"][$row['name']] = $row['val'];
-        }
-        foreach($allOpts as $repoId => $repoOptions){
-            $repo = $this->repoFromDb($repoOptions["ROW"], $repoOptions["OPTIONS"]);
-            $repositories[$repo->getUniqueId()] = $repo;
-        }
-        return $repositories;
-    }
-
-    /**
-     * Get a list of repositories
-     *
-     * The list is an associative array of Array( 'uuid' => [Repository Object] );
-     * @param AbstractAjxpUser $user
-     * @return Repository[]
-     * @see AbstractConfDriver#listRepositories()
-     */
-    public function listRepositories($user = null)
-    {
-        if ($user != null) {
-            return $this->listRepositoriesForRole($user->mergedRole);
-        } else {
-            $res = dibi::query('SELECT * FROM [ajxp_repo] ORDER BY [display] ASC');
-        }
-        $all = $res->fetchAll();
-        return $this->initRepoArrayFromDbFetch($all);
-    }
-
-    /**
-     * @param AJXP_Role $role
-     * @return Repository[]
-     */
-    public function listRepositoriesForRole($role){
-        $acls = $role->listAcls();
-        if(!count($acls)) return array();
-        $limitRepositories = array_keys($acls);
-        $res = dibi::query('SELECT * FROM [ajxp_repo] WHERE [uuid] IN (%s) ORDER BY [display] ASC', $limitRepositories);
-        $all = $res->fetchAll();
-        return $this->initRepoArrayFromDbFetch($all);
-    }
-
-    /**
-     * Returns a list of available repositories (dynamic ones only, not the ones defined in the config file).
-     * @param Array $criteria
-     * @param int $count possible total count
-     * @return Repository[]
-     */
-    public function listRepositoriesWithCriteria($criteria, &$count = null){
-
-        $wheres = array();
-        $limit = $groupBy = "";
-        $order = "ORDER BY display ASC";
-
-        if(isSet($criteria["role"]) && is_a($criteria["role"], "AJXP_Role")){
-            return $this->listRepositoriesForRole($criteria["role"]);
-        }
-
-        $searchableKeys = array("uuid", "parent_uuid", "owner_user_id", "display", "accessType", "isTemplate", "slug", "groupPath");
-        foreach($criteria as $cName => $cValue){
-            if(in_array($cName, $searchableKeys) || in_array(substr($cName,1), $searchableKeys)){
-                if(is_array($cValue)){
-                    if($cName[0] == "!"){
-                        $cName = substr($cName, 1);
-                        $wheres[] = array("[$cName] NOT IN (%s)", $cValue);
-                    }else{
-                        $wheres[] = array("[$cName] IN (%s)", $cValue);
-                    }
-                }else if(strpos($cValue, "regexp:") === 0){
-                    $regexp = str_replace("regexp:", "", $cValue);
-                    $wheres[] = array("[$cName] ".AJXP_Utils::regexpToLike($regexp), AJXP_Utils::cleanRegexp($regexp));
-                }else if ($cValue == AJXP_FILTER_NOT_EMPTY){
-                    $wheres[] = array("[$cName] IS NOT NULL");
-                }else if ($cValue == AJXP_FILTER_EMPTY){
-                    $wheres[] = array("[$cName] IS NULL");
-                }else{
-                    $type = "%s";
-                    if($cName == 'isTemplate') $type = "%b";
-                    $wheres[] = array("[$cName] = $type", $cValue);
-                }
-            }else if($cName == "CURSOR"){
-                $limit = $cValue;
-            }else if($cName == "ORDERBY"){
-                $order = "ORDER BY ".$cValue["KEY"]." ".$cValue["DIR"];
-            }else if($cName == "GROUPBY"){
-                $groupBy = "GROUP BY ".$cValue;
-            }
-        }
-
-        if(isset($criteria["CURSOR"])){
-            $res = dibi::query("SELECT COUNT(uuid) FROM [ajxp_repo] WHERE %and", $wheres);
-            $count = $res->fetchSingle();
-        }
-
-        if(!empty($limit) && is_array($limit)){
-            $res = dibi::query("SELECT * FROM [ajxp_repo] WHERE %and $groupBy $order %lmt %ofs", $wheres, $limit["LIMIT"], $limit["OFFSET"]);
-        }else{
-            $res = dibi::query("SELECT * FROM [ajxp_repo] WHERE %and $groupBy $order", $wheres);
-        }
-        $all = $res->fetchAll();
-        return $this->initRepoArrayFromDbFetch($all);
-
-    }
-
-
-    /**
-     * Get repository by Unique ID (a hash calculated from the serialised object).
-     *
-     * @param String $repositoryId hash uuid
-     * @return Repository object
-     */
-    public function getRepositoryById($repositoryId)
-    {
-        return $this->_loadRepository("uuid", $repositoryId);
-
-    }
-
-    /**
-     * Retrieve a Repository given its alias.
-     *
-     * @param String $repositorySlug
-     * @return Repository
-     */
-    public function getRepositoryByAlias($repositorySlug)
-    {
-        return $this->_loadRepository("slug", $repositorySlug);
-    }
-
-
-    protected function _loadRepository($slugOrAlias, $value){
-        if($this->sqlDriver["driver"] == "postgre"){
-            dibi::nativeQuery("SET bytea_output=escape");
-        }
-        $keyName = ($slugOrAlias=="slug"?"slug":"uuid");
-        $res = dibi::query("SELECT * FROM [ajxp_repo],[ajxp_repo_options] WHERE [ajxp_repo].[uuid] = [ajxp_repo_options].[uuid] AND [ajxp_repo].[$keyName] = %s", $value);
-
-        $options = array();
-        foreach($res as $row){
-            $options[$row->name] = $row->val;
-        }
-        if(isSet($row)){
-            unset($row->name);
-            unset($row->val);
-            $repository = $this->repoFromDb($row, $options);
-            return $repository;
-        }
-        return null;
-    }
-
-    /**
-     * @param String $slug
-     * @param String|null $repositoryId
-     * @return String mixed
-     */
-    protected function uniquifySlug($slug, $repositoryId = null){
-
-        if(!empty($repositoryId)){
-            $res = dibi::query("SELECT [slug],[uuid] FROM [ajxp_repo] WHERE [uuid] != %s AND [slug] LIKE '".$slug."%'", $repositoryId);
-        }else{
-            $res = dibi::query("SELECT [slug],[uuid] FROM [ajxp_repo] WHERE [slug] LIKE '".$slug."%'");
-        }
-        $existingSlugs = $res->fetchPairs();
-        $configSlugs = ConfService::reservedSlugsFromConfig();
-        if(in_array($slug, $configSlugs)){
-            $existingSlugs[$slug] = $slug;
-        }
-        if(!count($existingSlugs)) return $slug;
-        $index = 1;
-        $base = $slug;
-        $slug = $base."-".$index;
-        while(isSet($existingSlugs[$slug])){
-            $index++;
-            $slug = $base."-".$index;
-        }
-
-        return $slug;
-    }
-
-    /**
-     * Store a newly created repository
-     *
-     * @param Repository $repositoryObject
-     * @param Boolean $update
-     * @return int -1 if failed
-     */
-    public function saveRepository($repositoryObject, $update = false)
-    {
-        try {
-            if($update){
-                $repositoryObject->setSlug($this->uniquifySlug(
-                    $repositoryObject->getSlug(),
-                    $repositoryObject->getUniqueId()
-                ));
-            }else{
-                $repositoryObject->setSlug($this->uniquifySlug($repositoryObject->getSlug()));
-            }
-            $repository_array = $this->repoToArray($repositoryObject);
-            $options = $repository_array['options'];
-            if($repositoryObject->hasContentFilter()){
-                $options["content_filter"] = $repositoryObject->getContentFilter();
-            }else if(isSet($options["content_filter"])){
-                unset($options["content_filter"]);
-            }
-            unset($repository_array['options']);
-            if (!$update) {
-                dibi::query('INSERT INTO [ajxp_repo]', $repository_array);
-
-                foreach ($options as $k => $v) {
-                    if (!is_string($v)) {
-                        $v = '$phpserial$'.serialize($v);
-                    }
-                    dibi::query('INSERT INTO [ajxp_repo_options] ([uuid],[name],[val]) VALUES (%s,%s,%bin)', $repositoryObject->getUniqueId(), $k,$v);
-                }
-
-            } else {
-                dibi::query('DELETE FROM [ajxp_repo] WHERE [uuid] = %s',$repositoryObject->getUniqueId());
-                dibi::query('DELETE FROM [ajxp_repo_options] WHERE [uuid] = %s',$repositoryObject->getUniqueId());
-                dibi::query('INSERT INTO [ajxp_repo]', $repository_array);
-                foreach ($options as $k => $v) {
-                    if (!is_string($v)) {
-                        $v = '$phpserial$'.serialize($v);
-                    }
-                    dibi::query('INSERT INTO [ajxp_repo_options] ([uuid],[name],[val]) VALUES (%s,%s,%bin)',$repositoryObject->getUniqueId(),$k,$v);
-                }
-            }
-
-        } catch (DibiException $e) {
-            throw $e;
-        }
-    }
-    /**
-     * Delete a repository, given its unique ID.
-     *
-     * @param String $repositoryId
-     */
-    public function deleteRepository($repositoryId)
-    {
-        try {
-            dibi::query('DELETE FROM [ajxp_repo] WHERE [uuid] = %s', $repositoryId);
-            dibi::query('DELETE FROM [ajxp_repo_options] WHERE [uuid] = %s', $repositoryId);
-            dibi::query('DELETE FROM [ajxp_user_rights] WHERE [repo_uuid] = %s',$repositoryId);
-
-            switch ($this->sqlDriver["driver"]) {
-                case "postgre":
-                    dibi::nativeQuery("SET bytea_output=escape");
-                    $children_results = dibi::query('SELECT * FROM [ajxp_roles] WHERE [searchable_repositories] LIKE %~like~ GROUP BY [role_id]', '"'.$repositoryId.'";s:');
-                    break;
-                case "sqlite":
-                case "sqlite3":
-                    $children_results = dibi::query('SELECT * FROM [ajxp_roles] WHERE [searchable_repositories] LIKE %~like~ GROUP BY [role_id]', '"'.$repositoryId.'";s:');
-                    break;
-                case "mysqli":
-                case "mysql":
-                    $children_results = dibi::query('SELECT * FROM [ajxp_roles] WHERE [serial_role] LIKE %~like~ GROUP BY [role_id]', '"'.$repositoryId.'";s:');
-                    break;
-                default:
-                    return "ERROR!, DB driver ". $this->sqlDriver["driver"] ." not supported yet in __FUNCTION__";
-            }
-            $all = $children_results->fetchAll();
-            foreach ($all as $item) {
-                $role = unserialize($item["serial_role"]);
-                $role->setAcl($repositoryId, "");
-                $this->updateRole($role);
-            }
-
-        } catch (DibiException $e) {
-            $this->logError(__FUNCTION__, $e->getMessage());
-            return -1;
-        }
-        return 1;
-    }
-
-    public function getUserChildren( $userId )
-    {
-        $ignoreHiddens = "NOT EXISTS (SELECT * FROM [ajxp_user_rights] WHERE [ajxp_user_rights.login]=[ajxp_users.login] AND [ajxp_user_rights.repo_uuid] = 'ajxp.hidden')";
-        $children = array();
-        $children_results = dibi::query('SELECT [ajxp_users].[login] FROM [ajxp_user_rights],[ajxp_users] WHERE [repo_uuid] = %s AND [rights] = %s AND [ajxp_user_rights].[login] = [ajxp_users].[login] AND '.$ignoreHiddens, "ajxp.parent_user", $userId);
-        $all = $children_results->fetchAll();
-        foreach ($all as $item) {
-            $children[] = $this->createUserObject($item["login"]);
-        }
-        return $children;
-
-    }
-
-    /**
-     * @param string $repositoryId
-     * @return array
-     */
-    public function getUsersForRepository($repositoryId)
-    {
-        $result = array();
-        // OLD METHOD
-        $children_results = dibi::query('SELECT [ajxp_users].[login] FROM [ajxp_user_rights],[ajxp_users] WHERE [repo_uuid] = %s AND [ajxp_user_rights].[login] = [ajxp_users].[login] GROUP BY [ajxp_users].[login]', $repositoryId);
-        $all = $children_results->fetchAll();
-        foreach ($all as $item) {
-            $result[$item["login"]] = $this->createUserObject($item["login"]);
-        }
-        $usersRoles = $this->getRolesForRepository($repositoryId, "AJXP_USR_/");
-        foreach ($usersRoles as $rId) {
-            $id = substr($rId, strlen("AJXP_USR/") + 1);
-            $result[$id] = $this->createUserObject($id);
-        }
-        return $result;
-    }
-
-    /**
-     * @abstract
-     * @param string $repositoryId
-     * @param string $rolePrefix
-     * @param bool $splitByType
-     * @return array
-     */
-    public function getRolesForRepository($repositoryId, $rolePrefix = '', $splitByType = false){
-
-        $allRoles = $q = $selectStr = $fromStr = [];
-
-        // Initing select
-        $q['select']['role_id'] = '[role_id]';
-
-        if ($splitByType) {
-            $q['select']['type'] = 'case when [role_id] LIKE \'AJXP_USR%\' then \'role_user\' when [role_id] LIKE \'AJXP_GRP%\' then \'role_grp\' else \'role_role\' end';
-        }
-
-        // Initing from
-        $q['from']['a'] = '[ajxp_roles]';
-
-        // Initing where and args
-        if(is_numeric($repositoryId)){
-            $likeRepositoryId = "i:$repositoryId;s:";
-        }else{
-            $likeRepositoryId = '"'.$repositoryId.'";s:';
-        }
-        switch ($this->sqlDriver["driver"]) {
-            case "sqlite":
-            case "sqlite3":
-            case "postgre":
-                $q['where'][] = ['[searchable_repositories] LIKE %~like~', $likeRepositoryId];
-                break;
-            case "mysql":
-            case "mysqli":
-                $q['where'][] = ['[serial_role] LIKE %~like~', $likeRepositoryId];
-                break;
-            default:
-                return "ERROR!, DB driver ". $this->sqlDriver["driver"] ." not supported yet in __FUNCTION__";
-        }
-
-        if(!empty($rolePrefix)){
-            $q['where'][] = ['[role_id] LIKE %like~', $rolePrefix];
-        }
-
-        // Initing group by
-        $q['groupBy'][] = '[role_id]';
-
-        // Building the request from $q
-
-        // Building select
-        $reqStr = 'SELECT';
-        foreach ($q['select'] as $k => $v) {
-            $selectStr[] = $v.' as '.$k;
-        }
-        $reqStr .= ' ';
-        $reqStr .= join(', ', $selectStr);
-        $reqStr .= ' ';
-
-        // Building from
-        $reqStr .= 'FROM';
-        foreach ($q['from'] as $k => $v) {
-            $fromStr[] = $v.' '.$k;
-        }
-        $reqStr .= ' ';
-        $reqStr .= join(', ', $fromStr);
-        $reqStr .= ' ';
-
-        // Building where
-        if (!empty($q['where'])) {
-            $reqStr .= 'WHERE %and';
-            $reqStr .= ' ';
-        }
-
-        // Building group by
-        if (!empty($q['groupBy'])) {
-            $reqStr .= 'GROUP BY';
-            $reqStr .= ' ';
-            $reqStr .= join(', ', $q['groupBy']);
-            $reqStr .= ' ';
-        }
-
-        $res =  dibi::query($reqStr, $q['where']);
-        $all = $res->fetchAll();
-        foreach ($all as $item) {
-            $rId = $item['role_id'];
-
-            if ($splitByType) {
-                $type = $item['type'];
-                $allRoles[$type][] = $rId;
-            } else {
-                $allRoles[] = $rId;
-            }
-        }
-
-        return $allRoles;
-    }
-
-    public function getUsersForRole($roleId, $countOnly = false) {
-        if($countOnly){
-            $res =  dibi::query("SELECT count([login]) FROM [ajxp_user_rights] WHERE [repo_uuid] = %s AND [rights] LIKE %~like~", "ajxp.roles", '"'.$roleId.'";b:1');
-            return $res->fetchSingle();
-        }else{
-            $res =  dibi::query("SELECT [login] FROM [ajxp_user_rights] WHERE [repo_uuid] = %s AND [rights] LIKE %~like~", "ajxp.roles", '"'.$roleId.'";b:1');
-            return $res->fetchAll();
-        }
-    }
-
-    /**
-     * @param string $repositoryId
-     * @param boolean $details
-     * @param bool $admin
-     * @return array|int
-     */
-    public function countUsersForRepository($repositoryId, $details = false, $admin=false){
-        $object = ConfService::getRepositoryById($repositoryId);
-        if(!$admin){
-            if($object->securityScope() == "USER"){
-                if($details) return array('users' => 1);
-                else return 1;
-            }else if($object->securityScope() == "GROUP"){
-                // Count users from current group
-                $groupUsers = AuthService::authCountUsers(AuthService::getLoggedUser()->getGroupPath());
-                if($details) return array('users' => $groupUsers);
-                else return $groupUsers;
-            }
-        }
-
-        // Users from roles
-        $roles = $this->getRolesForRepository($repositoryId, '', $details);
-
-        if($details){
-            return array(
-                'users' => count($roles['role_user']),
-                'groups' => count($roles['role_group']) + count($roles['role_role'])
-            );
-        }else{
-            return count($roles);
-        }
-    }
-
-
-    // SAVE / EDIT / CREATE / DELETE USER OBJECT (except password)
-    /**
-     * Instantiate the right class
-     *
-     * @param AbstractAjxpUser $userId
-     */
-    public function instantiateAbstractUserImpl($userId)
-    {
-        return new AJXP_SqlUser($userId, $this);
-    }
-
-    /**
-     * Get the full path to the Ajxp user class.
-     *
-     * @see AbstractConfDriver#getUserClassFileName()
-     */
-    public function getUserClassFileName()
-    {
-        return AJXP_INSTALL_PATH."/plugins/conf.sql/class.AJXP_SqlUser.php";
-    }
-
-
-    public function listRoles($roleIds = array(), $excludeReserved = false)
-    {
-        $wClauses = array();
-        if (count($roleIds)) {
-            // We use (%s) instead of %in to pass everyting as string ('1' instead of 1)
-            $wClauses[] = array('[role_id] IN (%s)', $roleIds);
-        }
-        if ($excludeReserved) {
-            $wClauses[] = array('[role_id] NOT LIKE %like~', 'AJXP_');
-        }
-        if($this->sqlDriver["driver"] == "postgre"){
-            dibi::nativeQuery("SET bytea_output=escape");
-        }
-        $res = dibi::query('SELECT * FROM [ajxp_roles] %if', count($wClauses), 'WHERE %and', $wClauses);
-        $all = $res->fetchAll();
-
-        $roles = Array();
-
-        foreach ($all as $role_row) {
-            $id = $role_row['role_id'];
-            $serialized = $role_row['serial_role'];
-            $object = unserialize($serialized);
-            if (is_a($object, "AjxpRole") || is_a($object, "AJXP_Role")) {
-                $roles[$id] = $object;
-                if(is_a($object, "AJXP_Role")){
-                    $object->setLastUpdated($role_row["last_updated"]);
-                }
-            }
-        }
-
-        return $roles;
-
-    }
-
-    /**
-     * @param AJXP_Role[] $roles
-     */
-    public function saveRoles($roles)
-    {
-        dibi::query("DELETE FROM [ajxp_roles]");
-        foreach ($roles as $roleId => $roleObject) {
-            switch ($this->sqlDriver["driver"]) {
-                case "sqlite":
-                case "sqlite3":
-                case "postgre":
-                    dibi::query("INSERT INTO [ajxp_roles] ([role_id],[serial_role],[searchable_repositories],[last_updated]) VALUES (%s, %bin, %s, %i)",
-                        $roleId,
-                        serialize($roleObject),
-                        serialize($roleObject->listAcls()),
-                        time()
-                    );
-                    break;
-                case "mysqli":
-                case "mysql":
-                    dibi::query("INSERT INTO [ajxp_roles] ([role_id],[serial_role],[last_updated]) VALUES (%s, %s, %i)",
-                        $roleId,
-                        serialize($roleObject),
-                        time()
-                    );
-                    break;
-                default:
-                    return "ERROR!, DB driver " . $this->sqlDriver["driver"] . " not supported yet in __FUNCTION__";
-            }
-        }
-    }
-
-    /**
-     * @param AJXP_Role $role
-     * @return string|void
-     */
-    public function updateRole($role, $userObject = null)
-    {
-        // if role is not existed => insert into
-        switch ($this->sqlDriver["driver"]) {
-            case "sqlite":
-            case "sqlite3":
-            case "postgre":
-                $row = dibi::query("SELECT [role_id] FROM [ajxp_roles] WHERE [role_id]=%s", $role->getId());
-                $res = $row->fetchSingle();
-                if($res != null){
-                    dibi::query("UPDATE [ajxp_roles] SET [serial_role]=%bin,[searchable_repositories]=%s,[last_updated]=%i WHERE [role_id]=%s", serialize($role), serialize($role->listAcls()), time(), $role->getId());
-                }
-                else{
-                    dibi::query("INSERT INTO [ajxp_roles] ([role_id],[serial_role],[searchable_repositories],[last_updated]) VALUES (%s, %bin,%s,%i)", $role->getId(), serialize($role), serialize($role->listAcls()), time());
-                }
-                break;
-            case "mysqli":
-            case "mysql":
-                dibi::query("INSERT INTO [ajxp_roles] ([role_id],[serial_role],[last_updated]) VALUES (%s, %s, %i) ON DUPLICATE KEY UPDATE [serial_role]=VALUES([serial_role]), [last_updated]=VALUES([last_updated])", $role->getId(), serialize($role), time());
-                break;
-            default:
-                return "ERROR!, DB driver ". $this->sqlDriver["driver"] ." not supported yet in __FUNCTION__";
-        }
-    }
-
-    /**
-     * @param AJXP_Role $role
-     */
-    public function deleteRole($role)
-    {
-        // Mixed input Object or ID
-        if(is_a($role, "AJXP_Role")) $roleId = $role->getId();
-        else $roleId = $role;
-
-        dibi::query("DELETE FROM [ajxp_roles] WHERE [role_id]=%s", $roleId);
-    }
-
-    /**
-     * Compute the most recent date where one of these roles where updated.
-     *
-     * @param $rolesIdsList
-     * @return int
-     */
-    public function rolesLastUpdated($rolesIdsList){
-        $res = dibi::query("SELECT MAX([last_updated]) FROM [ajxp_roles] WHERE [role_id] IN (%s)", $rolesIdsList);
-        return $res->fetchSingle();
-    }
-
-    public function countAdminUsers()
-    {
-        $rows = dibi::query("SELECT COUNT(*) FROM [ajxp_user_rights] WHERE [repo_uuid] = %s AND [rights] = %s", "ajxp.admin", "1");
-        return $rows->fetchSingle();
-    }
-
-    /**
-     * This function is useless for the SQL driver : users are by default correctly listed by group.
-     * @param AbstractAjxpUser[] $flatUsersList
-     * @param string $baseGroup
-     * @param bool $fullTree
-     * @return void
-     */
-    public function filterUsersByGroup(&$flatUsersList, $baseGroup = "/", $fullTree = false)
-    {
-    }
-
-    /**
-     * Check if group already exists
-     * @param string $groupPath
-     * @return boolean
-     */
-    public function groupExists($groupPath)
-    {
-        $ret = dibi::query("SELECT [groupPath] FROM [ajxp_groups] WHERE [groupPath] = %s", $groupPath);
-        $groups = $ret->fetchSingle();
-        if(!empty($groups)) return true;
-
-        return false;
-    }
-
-    /**
-     * @param string $groupPath
-     * @param string $groupLabel
-     * @return mixed
-     */
-    public function createGroup($groupPath, $groupLabel)
-    {
-        $test = dibi::query("SELECT COUNT(*) FROM [ajxp_groups] WHERE [groupPath] = %s", $groupPath);
-        if ($test->fetchSingle()) {
-            dibi::query("UPDATE [ajxp_groups] SET [groupLabel]=%s WHERE [groupPath]=%s", $groupLabel, $groupPath);
-        } else {
-            dibi::query("INSERT INTO [ajxp_groups]",array("groupPath" => $groupPath, "groupLabel" => $groupLabel));
-        }
-    }
-
-    public function relabelGroup($groupPath, $groupLabel)
-    {
-        dibi::query("UPDATE [ajxp_groups] SET [groupLabel]=%s WHERE [groupPath]=%s", $groupLabel, $groupPath);
-    }
-
-
-    public function deleteGroup($groupPath)
-    {
-        // Delete users of this group, as well as subgroups
-        $res = dibi::query("SELECT * FROM [ajxp_users] WHERE [groupPath] LIKE %like~ OR [groupPath] = %s ORDER BY [login] ASC", $groupPath."/", $groupPath);
-        $rows = $res->fetchAll();
-        $subUsers = array();
-        foreach ($rows as $row) {
-            $this->deleteUser($row["login"], $subUsers);
-            dibi::query("DELETE FROM [ajxp_users] WHERE [login] = %s", $row["login"]);
-        }
-        dibi::query("DELETE FROM [ajxp_groups] WHERE [groupPath] LIKE %like~ OR [groupPath] = %s", $groupPath."/", $groupPath);
-        dibi::query('DELETE FROM [ajxp_roles] WHERE [role_id] = %s', 'AJXP_GRP_'.$groupPath);
-    }
-
-    /**
-     * @param string $baseGroup
-     * @return string[]
-     */
-    public function getChildrenGroups($baseGroup = "/")
-    {
-        $searchGroup = $baseGroup;
-        if($baseGroup[strlen($baseGroup)-1] != "/") $searchGroup.="/";
-        $res = dibi::query("SELECT * FROM [ajxp_groups] WHERE [groupPath] LIKE %like~ AND [groupPath] NOT LIKE %s", $searchGroup, $searchGroup."%/%");
-        $pairs = $res->fetchPairs("groupPath", "groupLabel");
-        foreach ($pairs as $path => $label) {
-            if(strlen($path) <= strlen($baseGroup)) unset($pairs[$path]);
-            if ($baseGroup != "/") {
-                unset($pairs[$path]);
-                $pairs[substr($path, strlen($baseGroup))] = $label;
-            }
-        }
-        return $pairs;
-    }
-
-    /**
-     * Function for deleting a user
-     *
-     * @param String $userId
-     * @param array $deletedSubUsers
-     * @throws Exception
-     * @return void
-     */
-    public function deleteUser($userId, &$deletedSubUsers)
-    {
-        $children = array();
-        try {
-            // FIND ALL CHILDREN FIRST
-            $children_results = dibi::query('SELECT [login] FROM [ajxp_user_rights] WHERE [repo_uuid] = %s AND [rights] = %s', "ajxp.parent_user", $userId);
-            $all = $children_results->fetchAll();
-            foreach ($all as $item) {
-                $children[] = $item["login"];
-            }
-            dibi::begin();
-            //This one is done by AUTH_DRIVER, not CONF_DRIVER
-            //dibi::query('DELETE FROM [ajxp_users] WHERE [login] = %s', $userId);
-            dibi::query('DELETE FROM [ajxp_user_rights] WHERE [login] = %s', $userId);
-            dibi::query('DELETE FROM [ajxp_user_prefs] WHERE [login] = %s', $userId);
-            dibi::query('DELETE FROM [ajxp_user_bookmarks] WHERE [login] = %s', $userId);
-            dibi::query('DELETE FROM [ajxp_user_teams] WHERE [owner_id] = %s', $userId);
-            dibi::query('DELETE FROM [ajxp_roles] WHERE [role_id] = %s', 'AJXP_USR_/'.$userId);
-            dibi::commit();
-            foreach ($children as $childId) {
-                $this->deleteUser($childId, $deletedSubUsers);
-                $deletedSubUsers[] = $childId;
-            }
-        } catch (DibiException $e) {
-            throw new Exception('Failed to delete user, Reason: '.$e->getMessage());
-        }
-    }
-
-    public function simpleStoreSet($storeID, $dataID, $data, $dataType = "serial", $relatedObjectId = null)
-    {
-        $values = array(
-            "store_id" => $storeID,
-            "object_id" => $dataID
-        );
-        if ($relatedObjectId !== null) {
-            $values["related_object_id"] = $relatedObjectId;
-        }
-        if ($dataType == "serial") {
-            $values["serialized_data"] = serialize($data);
-        } else if ($dataType == "binary") {
-            $values["binary_data"] = $data;
-        } else {
-            throw new Exception("Unsupported format type ".$dataType);
-        }
-        dibi::query("DELETE FROM [ajxp_simple_store] WHERE [store_id]=%s AND [object_id]=%s", $storeID, $dataID);
-        dibi::query("INSERT INTO [ajxp_simple_store] ([object_id],[store_id],[serialized_data],[binary_data],[related_object_id]) VALUES (%s,%s,%bin,%bin,%s)",
-            $dataID, $storeID, $values["serialized_data"], $values["binary_data"], $values["related_object_id"]);
-    }
-
-    public function simpleStoreClear($storeID, $dataID)
-    {
-        dibi::query("DELETE FROM [ajxp_simple_store] WHERE [store_id]=%s AND [object_id]=%s", $storeID, $dataID);
-    }
-
-    public function simpleStoreGet($storeID, $dataID, $dataType, &$data)
-    {
-        if($this->sqlDriver["driver"] == "postgre"){
-            dibi::nativeQuery("SET bytea_output=escape");
-        }
-        $children_results = dibi::query("SELECT * FROM [ajxp_simple_store] WHERE [store_id]=%s AND [object_id]=%s", $storeID, $dataID);
-        $value = $children_results->fetchAll();
-        if(!count($value)) return false;
-        $value = $value[0];
-        if ($dataType == "serial") {
-            $data = unserialize($value["serialized_data"]);
-        } else {
-            $data = $value["binary_data"];
-        }
-        if (isSet($value["related_object_id"])) {
-            return $value["related_object_id"];
-        } else {
-            return false;
-        }
-    }
-
-    public function simpleStoreList($storeId, $cursor=null, $dataIdLike="", $dataType="serial", $serialDataLike="", $relatedObjectId=""){
-        $wheres = array();
-        $wheres[] = array('[store_id]=%s', $storeId);
-        if(!empty($dataIdLike)){
-            $wheres[] = array('[object_id] LIKE %s', $dataIdLike);
-        }
-        if(!empty($serialDataLike)){
-            $wheres[] = array('[serialized_data] LIKE %s', $serialDataLike);
-        }
-        if($relatedObjectId != ""){
-            $wheres[] = array('[related_object_id] = %s', $relatedObjectId);
-        }
-        if($cursor != null){
-            $children_results = dibi::query("SELECT * FROM [ajxp_simple_store] WHERE %and %lmt %ofs", $wheres, $cursor[1], $cursor[0]);
-        }else{
-            $children_results = dibi::query("SELECT * FROM [ajxp_simple_store] WHERE %and", $wheres);
-
-        }
-        $values = $children_results->fetchAll();
-        $result = array();
-        foreach($values as $value){
-            if ($dataType == "serial") {
-                $data = unserialize($value["serialized_data"]);
-            } else {
-                $data = $value["binary_data"];
-            }
-            $result[$value['object_id']] = $data;
-        }
-        return $result;
-    }
-
-    protected function binaryContextToStoreID($context)
-    {
-        $storage = "binaries";
-        if (isSet($context["USER"])) {
-            $storage ="users_binaries.".$context["USER"];
-        } else if (isSet($context["REPO"])) {
-            $storage ="repos_binaries.".$context["REPO"];
-        } else if (isSet($context["ROLE"])) {
-            $storage ="roles_binaries.".$context["ROLE"];
-        } else if (isSet($context["PLUGIN"])) {
-            $storage ="plugins_binaries.".$context["PLUGIN"];
-        }
-        return $storage;
-    }
-    /**
-     * @param array $context
-     * @param String $fileName
-     * @param String $ID
-     * @return String $ID
-     */
-    public function saveBinary($context, $fileName, $ID = null)
-    {
-        if (empty($ID)) {
-            $ID = substr(md5(microtime()*rand(0,100)), 0, 12);
-            $ID .= ".".pathinfo($fileName, PATHINFO_EXTENSION);
-        }
-        $store = $this->binaryContextToStoreID($context);
-        $this->simpleStoreSet($store, $ID, file_get_contents($fileName), "binary");
-        return $ID;
-    }
-
-    /**
-     * @abstract
-     * @param array $context
-     * @param String $ID
-     * @return boolean
-     */
-    public function deleteBinary($context, $ID)
-    {
-        $store = $this->binaryContextToStoreID($context);
-        $this->simpleStoreClear($store, $ID);
-    }
-
-
-    /**
-     * @param array $context
-     * @param String $ID
-     * @param Resource $outputStream
-     * @return boolean
-     */
-    public function loadBinary($context, $ID, $outputStream = null)
-    {
-        $store = $this->binaryContextToStoreID($context);
-        $data = "";
-        $this->simpleStoreGet($store, $ID, "binary", $data);
-        if ($outputStream != null) {
-            fwrite($outputStream, $data, strlen($data));
-        } else {
-            header("Content-Type: ".AJXP_Utils::getImageMimeType($ID));
-            echo $data;
-        }
-    }
-
-    /**
-     * @abstract
-     * @param String $keyType
-     * @param String $keyId
-     * @param String $userId
-     * @param array $data
-     * @return boolean
-     */
-    public function saveTemporaryKey($keyType, $keyId, $userId, $data)
-    {
-        $this->simpleStoreSet("temporakey_".$keyType, $keyId, $data, "serial", $userId);
-    }
-
-    /**
-     * @abstract
-     * @param String $keyType
-     * @param String $keyId
-     * @return array
-     */
-    public function loadTemporaryKey($keyType, $keyId)
-    {
-        $data = array();
-        $userId = $this->simpleStoreGet("temporakey_".$keyType, $keyId, "serial", $data);
-        $data['user_id'] = $userId;
-        return $data;
-    }
-
-    /**
-     * @abstract
-     * @param String $keyType
-     * @param String $keyId
-     * @return boolean
-     */
-    public function deleteTemporaryKey($keyType, $keyId)
-    {
-        $this->simpleStoreClear("temporakey_".$keyType, $keyId);
-    }
-
-    /**
-     * @abstract
-     * @param String $keyType
-     * @param String $expiration
-     * @return null
-     */
-    public function pruneTemporaryKeys($keyType, $expiration)
-    {
-        if($this->sqlDriver["driver"] == "postgre"){
-            dibi::query("DELETE FROM [ajxp_simple_store] WHERE [store_id] = %s AND [insertion_date] < (CURRENT_TIMESTAMP - time '0:$expiration')", "temporakey_".$keyType);
-        }else{
-            dibi::query("DELETE FROM [ajxp_simple_store] WHERE [store_id] = %s AND [insertion_date] < (CURRENT_TIMESTAMP - %i)", "temporakey_".$keyType, $expiration*60);
-        }
-    }
-
-
-    public function installSQLTables($param)
-    {
-        $p = AJXP_Utils::cleanDibiDriverParameters($param["SQL_DRIVER"]);
-        $res = AJXP_Utils::runCreateTablesQuery($p, $this->getBaseDir()."/create.sql");
-        // SET DB VERSION
-        if(defined('AJXP_VERSION_DB') && AJXP_VERSION_DB != "##DB_VERSION##"){
-            dibi::connect($p);
-            dibi::query("UPDATE [ajxp_version] SET [db_build]=%i", intval(AJXP_VERSION_DB));
-            dibi::disconnect();
-        }
-        return $res;
-    }
-
-    public function supportsUserTeams()
-    {
-        return true;
-    }
-
-    public function listUserTeams()
-    {
-        if (AuthService::getLoggedUser() == null) {
-            return array();
-        }
-        dibi::query("DELETE FROM [ajxp_user_teams] WHERE [user_id] NOT IN (SELECT [login] FROM [ajxp_users])");
-        $res = dibi::query("SELECT * FROM [ajxp_user_teams] WHERE [owner_id] = %s ORDER BY [team_id]", AuthService::getLoggedUser()->getId());
-        $data = $res->fetchAll();
-        $all = array();
-        foreach ($data as $row) {
-            $teamId = $row["team_id"];
-            $userId = $row["user_id"];
-            $teamLabel = $row["team_label"];
-            if(!isSet($all[$teamId])) $all[$teamId] = array("LABEL" => $teamLabel, "USERS" => array());
-            $all[$teamId]["USERS"][$userId] = $userId;
-        }
-        return $all;
-    }
-
-    public function teamIdToUsers($teamId)
-    {
-        $res = array();
-        $teams = $this->listUserTeams();
-        $teamData = $teams[$teamId];
-        foreach ($teamData["USERS"] as $userId) {
-            if (AuthService::userExists($userId)) {
-                $res[] = $userId;
-            } else {
-                $this->removeUserFromTeam($teamId, $userId);
-            }
-        }
-        return $res;
-    }
-
-    private function addUserToTeam($teamId, $userId, $teamLabel = null)
-    {
-        if ($teamLabel == null) {
-            $res = dibi::query("SELECT [team_label] FROM [ajxp_user_teams] WHERE [team_id] = %s AND  [owner_id] = %s",
-                $teamId, AuthService::getLoggedUser()->getId());
-            $teamLabel = $res->fetchSingle();
-        }
-        dibi::query("INSERT INTO [ajxp_user_teams] ([team_id],[user_id],[team_label],[owner_id]) VALUES (%s,%s,%s,%s)",
-            $teamId, $userId, $teamLabel, AuthService::getLoggedUser()->getId()
-        );
-    }
-
-    private function editTeamUsers($teamId, $users, $teamLabel = null)
-    {
-        if ($teamLabel == null) {
-            $res = dibi::query("SELECT [team_label] FROM [ajxp_user_teams] WHERE [team_id] = %s AND  [owner_id] = %s",
-                $teamId, AuthService::getLoggedUser()->getId());
-            $teamLabel = $res->fetchSingle();
-        }
-        // Remove old users
-        dibi::query("DELETE FROM [ajxp_user_teams] WHERE [team_id] = %s", $teamId);
-        foreach($users as $userId){
-            if(!AuthService::userExists($userId, "r")) continue;
-            dibi::query("INSERT INTO [ajxp_user_teams] ([team_id],[user_id],[team_label],[owner_id]) VALUES (%s,%s,%s,%s)",
-                $teamId, $userId, $teamLabel, AuthService::getLoggedUser()->getId()
-            );
-        }
-    }
-
-    private function removeUserFromTeam($teamId, $userId = null)
-    {
-        if ($userId == null) {
-            dibi::query("DELETE FROM [ajxp_user_teams] WHERE [team_id] = %s AND  [owner_id] = %s",
-                $teamId, AuthService::getLoggedUser()->getId()
-            );
-        } else {
-            dibi::query("DELETE FROM [ajxp_user_teams] WHERE [team_id] = %s AND  [user_id] = %s AND [owner_id] = %s",
-                $teamId, $userId, AuthService::getLoggedUser()->getId()
-            );
-        }
-    }
-
-    public function userTeamsActions($actionName, $httpVars, $fileVars)
-    {
-        switch ($actionName) {
-            case "user_team_create":
-                $userIds = $httpVars["user_ids"];
-                $teamLabel = AJXP_Utils::sanitize($httpVars["team_label"], AJXP_SANITIZE_HTML_STRICT);
-                if(empty($teamLabel)){
-                    throw new Exception("Empty Team Label!");
-                }
-                if(empty($userIds)){
-                    throw new Exception("Please select some users for this team.");
-                }
-                $teamId = AJXP_Utils::slugify($teamLabel)."-".intval(rand(0,1000));
-                foreach ($userIds as $userId) {
-                    $id = AJXP_Utils::sanitize($userId, AJXP_SANITIZE_EMAILCHARS);
-                    $this->addUserToTeam($teamId, $id, $teamLabel);
-                }
-                echo 'Created Team $teamId';
-                break;
-            case "user_team_delete":
-                $this->removeUserFromTeam($httpVars["team_id"], null);
-                break;
-            case "user_team_add_user":
-                $this->addUserToTeam($httpVars["team_id"], $httpVars["user_id"], null);
-                break;
-            case "user_team_edit_users":
-                $this->editTeamUsers($httpVars["team_id"], $httpVars["users"], $httpVars["team_label"]);
-                break;
-            case "user_team_delete_user":
-                $this->removeUserFromTeam($httpVars["team_id"], $httpVars["user_id"]);
-                break;
-        }
-    }
-
-
-    public function ajxpTableExists($actionName, $httpVars, $fileVars){
-
-        $p = $this->sqlDriver;
-        if($p["driver"] == "postgre"){
-            $tableQuery = "SELECT [tablename] FROM [pg_catalog].[pg_tables] WHERE [tablename] = %s";
-        }else if($p["driver"] == "sqlite3" || $p["driver"] == "sqlite"){
-            $tableQuery = "SELECT [name] FROM [sqlite_master] WHERE type = \"table\" AND [name] = %s";
-        }else{
-            $tableQuery = "SHOW TABLES LIKE %s";
-        }
-        $tableName = AJXP_Utils::sanitize($httpVars["table_name"], AJXP_SANITIZE_ALPHANUM);
-        $tables = dibi::query($tableQuery, $tableName)->fetchPairs();
-        $exists = (count($tables) && in_array($tableName, $tables));
-        HTMLWriter::charsetHeader("application/json");
-        echo json_encode(array("result" => $exists));
-
-    }
-
-}
diff --git a/core/src/plugins/conf.sql/i18n/conf/cs.php b/core/src/plugins/conf.sql/i18n/conf/cs.php
index eabe3fb2c1..84fc09cdb5 100644
--- a/core/src/plugins/conf.sql/i18n/conf/cs.php
+++ b/core/src/plugins/conf.sql/i18n/conf/cs.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "DB Storage" => "DB úložiště",
diff --git a/core/src/plugins/conf.sql/i18n/conf/de.php b/core/src/plugins/conf.sql/i18n/conf/de.php
index 6a0a9aeefb..e99838ceb9 100644
--- a/core/src/plugins/conf.sql/i18n/conf/de.php
+++ b/core/src/plugins/conf.sql/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "DB Storage" => "DB-Speicher",
diff --git a/core/src/plugins/conf.sql/i18n/conf/en.php b/core/src/plugins/conf.sql/i18n/conf/en.php
index e0480fe1da..3e21f20b22 100644
--- a/core/src/plugins/conf.sql/i18n/conf/en.php
+++ b/core/src/plugins/conf.sql/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "DB Storage" => "DB Storage",
diff --git a/core/src/plugins/conf.sql/i18n/conf/fr.php b/core/src/plugins/conf.sql/i18n/conf/fr.php
index e57647338b..41ffcbc0ca 100644
--- a/core/src/plugins/conf.sql/i18n/conf/fr.php
+++ b/core/src/plugins/conf.sql/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "DB Storage" => "Configuration BDD",
diff --git a/core/src/plugins/conf.sql/i18n/conf/it.php b/core/src/plugins/conf.sql/i18n/conf/it.php
index b51ca26992..ba45101b08 100644
--- a/core/src/plugins/conf.sql/i18n/conf/it.php
+++ b/core/src/plugins/conf.sql/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "DB Storage" => "Conservazione DB",
diff --git a/core/src/plugins/conf.sql/i18n/conf/pt.php b/core/src/plugins/conf.sql/i18n/conf/pt.php
index 0d208d7f57..5a46424f39 100644
--- a/core/src/plugins/conf.sql/i18n/conf/pt.php
+++ b/core/src/plugins/conf.sql/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "DB Storage" => "Armazenamento da BD",
diff --git a/core/src/plugins/conf.sql/manifest.xml b/core/src/plugins/conf.sql/manifest.xml
index 6a8f14d6f7..b59a948061 100644
--- a/core/src/plugins/conf.sql/manifest.xml
+++ b/core/src/plugins/conf.sql/manifest.xml
@@ -12,12 +12,12 @@
 		<param name="SQL_DRIVER" type="group_switch:dibi" label="CONF_MESSAGE[Connexion]" description="CONF_MESSAGE[The Database Connexion]" mandatory="true" default="core"/>
         <param type="button" name="INSTALL_SQL" choices="run_plugin_action:conf.sql:installSQLTables" label="CONF_MESSAGE[SQL Tables]" description="CONF_MESSAGE[Install SQL Tables]" mandatory="false"/>
 	</server_settings>
-	<class_definition filename="plugins/conf.sql/class.sqlConfDriver.php" classname="sqlConfDriver"/>
+	<class_definition filename="plugins/conf.sql/SqlConfDriver.php" classname="Pydio\Conf\Sql\SqlConfDriver"/>
 	<registry_contributions>
 		<external_file filename="plugins/core.conf/standard_conf_actions.xml" include="actions/*,client_configs/*" exclude=""/>
         <actions>
             <action name="user_team_create">
-                <gui src="delete.png" iconClass="icon-create" text="user_dash.57" title="user_dash.57">
+                <gui src="delete.png" iconClass="icon-plus" text="user_dash.57" title="user_dash.57">
                     <context dir="false" recycle="false" selection="false" actionBar="true" actionBarGroup="team_address_book"/>
                 </gui>
                 <processing>
@@ -120,11 +120,13 @@
         <client_configs>
             <component_config className="AjxpTabulator::userdashboard_main_tab">
                 <additional_tab id="team_pane"
-                                tabInfo='{"id":"team_pane","position":2,"iconClass":"icon-group","element":"team_pane","closeable":false,"label":"user_dash.50","title":"user_dash.51","dontFocus":true}'
+                                tabInfo='{"id":"teams","position":2,"iconClass":"icon-group","element":"team_pane","closeable":false,"label":"user_dash.50","title":"user_dash.51","dontFocus":true}'
                                 paneInfo='{"type":"widget"}'><![CDATA[
                 <div id="team_pane" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
-                    <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"dataModelElementId":"team_panel","toolbarsList":["team_address_book"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
-                    <h3 class="dashboard_panel_title">AJXP_MESSAGE[user_dash.50]</h3>
+                    <div class="title-flex">
+                        <h3 class="dashboard_panel_title">AJXP_MESSAGE[user_dash.50]<div class="legend">AJXP_MESSAGE[user_dash.51]</div></h3>
+                        <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"dataModelElementId":"team_panel","toolbarsList":["team_address_book"],"submenuOffsetTop":2}'></div>
+                    </div>
                     <div id="team_panel" ajxpClass="FetchedResultPane" ajxpOptions='{"updateGlobalContext":false,"nodeProviderProperties":{"get_action":"ls","dir":"teams"}}' class="tabbed_editor display_metadata"></div>
                 </div>
                 ]]></additional_tab>
diff --git a/core/src/plugins/core.access/class.AbstractAccessDriver.php b/core/src/plugins/core.access/class.AbstractAccessDriver.php
deleted file mode 100644
index fe7ddfdc3f..0000000000
--- a/core/src/plugins/core.access/class.AbstractAccessDriver.php
+++ /dev/null
@@ -1,625 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * @package AjaXplorer_Plugins
- * @subpackage Core
- * @class AbstractAccessDriver
- * Abstract representation of an action driver. Must be implemented.
- */
-class AbstractAccessDriver extends AJXP_Plugin
-{
-    /**
-    * @var Repository
-    */
-    public $repository;
-    public $driverType = "access";
-
-    public function init($repository, $options = array())
-    {
-        //$this->loadActionsFromManifest();
-        parent::init($options);
-        $this->repository = $repository;
-    }
-
-    public function initRepository()
-    {
-        // To be implemented by subclasses
-    }
-
-
-    public function accessPreprocess($actionName, &$httpVars, &$filesVar)
-    {
-        if ($actionName == "apply_check_hook") {
-            if (!in_array($httpVars["hook_name"], array("before_create", "before_path_change", "before_change"))) {
-                return;
-            }
-            $selection = new UserSelection($this->repository, $httpVars);
-            AJXP_Controller::applyHook("node.".$httpVars["hook_name"], array($selection->getUniqueNode(), $httpVars["hook_arg"]));
-        }
-        if ($actionName == "ls") {
-            // UPWARD COMPATIBILTY
-            if (isSet($httpVars["options"])) {
-                if($httpVars["options"] == "al") $httpVars["mode"] = "file_list";
-                else if($httpVars["options"] == "a") $httpVars["mode"] = "search";
-                else if($httpVars["options"] == "d") $httpVars["skipZip"] = "true";
-                // skip "complete" mode that was in fact quite the same as standard tree listing (dz)
-            }
-        }
-    }
-
-    protected function parseSpecificContributions(&$contribNode)
-    {
-        parent::parseSpecificContributions($contribNode);
-    }
-
-
-    /**
-     * Backward compatibility, now moved to SharedCenter::loadPubliclet();
-     * @param $data
-     * @return void
-     */
-    public function loadPubliclet($data)
-    {
-        require_once(AJXP_INSTALL_PATH . "/" . AJXP_PLUGINS_FOLDER . "/action.share/class.ShareCenter.php");
-        ShareCenter::loadPubliclet($data);
-    }
-
-    /**
-     * Populate publiclet options
-     * @param String $filePath The path to the file to share
-     * @param String $password optionnal password
-     * @param String $downloadlimit optional limit for downloads
-     * @param String $expires optional expiration date
-     * @param Repository $repository
-     * @return Array
-     */
-    public function makePublicletOptions($filePath, $password, $expires, $downloadlimit, $repository) {}
-
-    /**
-     * Populate shared repository options
-     * @param Array $httpVars
-     * @param Repository $repository
-     * @return Array
-     */
-    public function makeSharedRepositoryOptions($httpVars, $repository){}
-
-    /**
-     * @param $directoryPath string
-     * @param $repositoryResolvedOptions array
-     * @return integer
-     * @throw Exception
-     */
-    public function directoryUsage($directoryPath, $repositoryResolvedOptions){
-        throw new Exception("Current driver does not support recursive directory usage!");
-    }
-
-    public function crossRepositoryCopy($httpVars)
-    {
-        ConfService::detectRepositoryStreams(true);
-        $mess = ConfService::getMessages();
-        $selection = new UserSelection(ConfService::getRepository());
-        $selection->initFromHttpVars($httpVars);
-        $files = $selection->getFiles();
-
-        $repositoryId = $this->repository->getId();
-        $this->repository->detectStreamWrapper(true);
-        $origStreamURL = "pydio://$repositoryId";
-
-        $destRepoId = $httpVars["dest_repository_id"];
-        $destRepoObject = ConfService::getRepositoryById($destRepoId);
-        $destRepoObject->detectStreamWrapper(true);
-        $destStreamURL = "pydio://$destRepoId";
-
-        // Check rights
-        if (AuthService::usersEnabled()) {
-            $loggedUser = AuthService::getLoggedUser();
-            if(!$loggedUser->canRead($repositoryId) || !$loggedUser->canWrite($destRepoId)
-                || (isSet($httpVars["moving_files"]) && !$loggedUser->canWrite($repositoryId))
-            ){
-                throw new Exception($mess[364]);
-            }
-        }
-        $srcRepoData= array(
-            'base_url' => $origStreamURL,
-            'recycle'   => $this->repository->getOption("RECYCLE_BIN")
-        );
-        $destRepoData=array(
-            'base_url' => $destStreamURL,
-            'chmod'         => $this->repository->getOption('CHMOD')
-        );
-
-        $messages = array();
-        $errorMessages = array();
-        foreach ($files as $file) {
-
-            $this->copyOrMoveFile(
-                AJXP_Utils::decodeSecureMagic($httpVars["dest"]),
-                $file, $errorMessages, $messages, isSet($httpVars["moving_files"]) ? true: false,
-                $srcRepoData, $destRepoData);
-
-        }
-        AJXP_XMLWriter::header();
-        if (count($errorMessages)) {
-            AJXP_XMLWriter::sendMessage(null, join("\n", $errorMessages), true);
-        }
-        AJXP_XMLWriter::sendMessage(join("\n", $messages), null, true);
-        AJXP_XMLWriter::close();
-    }
-
-    /**
-     * @param String $destDir url of destination dir
-     * @param String $srcFile url of source file
-     * @param Array $error accumulator for error messages
-     * @param Array $success accumulator for success messages
-     * @param bool $move Whether to copy or move
-     * @param array $srcRepoData Set of data concerning source repository: base_url, recycle option
-     * @param array $destRepoData Set of data concerning destination repository: base_url, chmod option
-     */
-    protected function copyOrMoveFile($destDir, $srcFile, &$error, &$success, $move = false, $srcRepoData = array(), $destRepoData = array())
-    {
-        $srcUrlBase = $srcRepoData['base_url'];
-        $srcRecycle = $srcRepoData['recycle'];
-        $destUrlBase = $destRepoData['base_url'];
-
-        $mess = ConfService::getMessages();
-        $bName = basename($srcFile);
-        $localName = '';
-        AJXP_Controller::applyHook("dl.localname", array($srcFile, &$localName));
-        if(!empty($localName)) $bName = $localName;
-        $destFile = $destUrlBase.$destDir."/".$bName;
-        $realSrcFile = $srcUrlBase.$srcFile;
-
-        if (is_dir(dirname($realSrcFile)) && (strpos($destFile, rtrim($realSrcFile, "/") . "/") === 0)) {
-            $error[] = $mess[101];
-            return;
-        }
-
-        if (!file_exists($realSrcFile)) {
-            $error[] = $mess[100].$srcFile;
-            return ;
-        }
-        if (!$move) {
-            $size = filesize($realSrcFile);
-            AJXP_Controller::applyHook("node.before_create", array(new AJXP_Node($destFile), $size));
-        }
-        if (dirname($realSrcFile)==dirname($destFile)) {
-            if ($move) {
-                $error[] = $mess[101];
-                return ;
-            } else {
-                $base = basename($srcFile);
-                if (is_file($realSrcFile)) {
-                    $dotPos = strrpos($base, ".");
-                    if ($dotPos>-1) {
-                        $radic = substr($base, 0, $dotPos);
-                        $ext = substr($base, $dotPos);
-                    }
-                }
-                // auto rename file
-                $i = 1;
-                $newName = $base;
-                while (file_exists($destUrlBase.$destDir."/".$newName)) {
-                    $suffix = "-$i";
-                    if(isSet($radic)) $newName = $radic . $suffix . $ext;
-                    else $newName = $base.$suffix;
-                    $i++;
-                }
-                $destFile = $destUrlBase.$destDir."/".$newName;
-            }
-        }
-        $srcNode = new AJXP_Node($realSrcFile);
-        $destNode = new AJXP_Node($destFile);
-        if (!is_file($realSrcFile)) {
-            $errors = array();
-            $succFiles = array();
-            $srcNode->setLeaf(false);
-            if ($move) {
-                AJXP_Controller::applyHook("node.before_path_change", array($srcNode));
-                if(file_exists($destFile)) $this->deldir($destFile, $destRepoData);
-                $res = rename($realSrcFile, $destFile);
-            } else {
-                $dirRes = $this->dircopy($realSrcFile, $destFile, $errors, $succFiles, false, true, $srcRepoData, $destRepoData);
-            }
-            if (count($errors) || (isSet($res) && $res!==true)) {
-                $error[] = $mess[114];
-                return ;
-            } else {
-                $destNode->setLeaf(false);
-                AJXP_Controller::applyHook("node.change", array($srcNode, $destNode, !$move));
-            }
-        } else {
-            if ($move) {
-                AJXP_Controller::applyHook("node.before_path_change", array($srcNode));
-                if(file_exists($destFile)) unlink($destFile);
-                if(AJXP_MetaStreamWrapper::nodesUseSameWrappers($realSrcFile, $destFile)){
-                    rename($realSrcFile, $destFile);
-                }else{
-                    copy($realSrcFile, $destFile);
-                }
-                AJXP_Controller::applyHook("node.change", array($srcNode, $destNode, false));
-            } else {
-                try {
-                    $this->filecopy($realSrcFile, $destFile);
-                    $this->changeMode($destFile, $destRepoData);
-                    AJXP_Controller::applyHook("node.change", array($srcNode, $destNode, true));
-                } catch (Exception $e) {
-                    $error[] = $e->getMessage();
-                    return ;
-                }
-            }
-        }
-
-        if ($move) {
-            // Now delete original
-            // $this->deldir($realSrcFile); // both file and dir
-            $messagePart = $mess[74]." ".SystemTextEncoding::toUTF8($destDir);
-            if (RecycleBinManager::recycleEnabled() && $destDir == RecycleBinManager::getRelativeRecycle()) {
-                RecycleBinManager::fileToRecycle($srcFile);
-                $messagePart = $mess[123]." ".$mess[122];
-            }
-            if (is_dir($destFile)) {
-                $success[] = $mess[117]." ".SystemTextEncoding::toUTF8(basename($srcFile))." ".$messagePart;
-            } else {
-                $success[] = $mess[34]." ".SystemTextEncoding::toUTF8(basename($srcFile))." ".$messagePart;
-            }
-        } else {
-            if (RecycleBinManager::recycleEnabled() && $destDir == "/".$srcRecycle) {
-                RecycleBinManager::fileToRecycle($srcFile);
-            }
-            if (isSet($dirRes)) {
-                $success[] = $mess[117]." ".SystemTextEncoding::toUTF8(basename($srcFile))." ".$mess[73]." ".SystemTextEncoding::toUTF8($destDir)." (".SystemTextEncoding::toUTF8($dirRes)." ".$mess[116].")";
-            } else {
-                $success[] = $mess[34]." ".SystemTextEncoding::toUTF8(basename($srcFile))." ".$mess[73]." ".SystemTextEncoding::toUTF8($destDir);
-            }
-        }
-
-    }
-
-    /**
-     * @param String $srcFile url of source file
-     * @param String $destFile url of destination file
-     */
-    protected function filecopy($srcFile, $destFile)
-    {
-        if (!AJXP_MetaStreamWrapper::nodesUseSameWrappers($srcFile, $destFile)
-            || AJXP_MetaStreamWrapper::wrapperIsRemote($srcFile)
-            || AJXP_MetaStreamWrapper::wrapperIsRemote($destFile)) {
-            $src = fopen($srcFile, "r");
-            $dest = fopen($destFile, "w");
-            if (is_resource($src) && is_resource($dest)) {
-                while (!feof($src)) {
-                    //stream_copy_to_stream($src, $dest, 4096);
-                    $count = stream_copy_to_stream($src, $dest, 4096);
-                    if ($count == 0) break;
-                }
-            }
-            if(is_resource($dest)) fclose($dest);
-            if(is_resource($src)) fclose($src);
-        } else {
-            copy($srcFile, $destFile);
-        }
-    }
-
-    /**
-     * @param String $srcdir Url of source file
-     * @param String $dstdir Url of dest file
-     * @param Array $errors Array of errors
-     * @param Array $success Array of success
-     * @param bool $verbose Boolean
-     * @param bool $convertSrcFile Boolean
-     * @param array $srcRepoData Set of data concerning source repository: base_url, recycle option
-     * @param array $destRepoData Set of data concerning destination repository: base_url, chmod option
-     * @return int
-     */
-    protected function dircopy($srcdir, $dstdir, &$errors, &$success, $verbose = false, $convertSrcFile = true, $srcRepoData = array(), $destRepoData = array())
-    {
-        $num = 0;
-        //$verbose = true;
-        $recurse = array();
-        if (!is_dir($dstdir)) {
-            $dirMode = 0755;
-            $chmodValue = $destRepoData["chmod"]; //$this->repository->getOption("CHMOD_VALUE");
-            if (isSet($chmodValue) && $chmodValue != "") {
-                $dirMode = octdec(ltrim($chmodValue, "0"));
-                if ($dirMode & 0400) $dirMode |= 0100; // User is allowed to read, allow to list the directory
-                if ($dirMode & 0040) $dirMode |= 0010; // Group is allowed to read, allow to list the directory
-                if ($dirMode & 0004) $dirMode |= 0001; // Other are allowed to read, allow to list the directory
-            }
-            $old = umask(0);
-            mkdir($dstdir, $dirMode);
-            umask($old);
-        }
-        if ($curdir = opendir($srcdir)) {
-            while (($file = readdir($curdir)) !== FALSE) {
-                if ($file != '.' && $file != '..') {
-                    $srcfile = $srcdir . "/" . $file;
-                    $dstfile = $dstdir . "/" . $file;
-                    if (is_file($srcfile)) {
-                        if(is_file($dstfile)) $ow = filemtime($srcfile) - filemtime($dstfile); else $ow = 1;
-                        if ($ow > 0) {
-                            try {
-                                if($convertSrcFile) $tmpPath = AJXP_MetaStreamWrapper::getRealFSReference($srcfile);
-                                else $tmpPath = $srcfile;
-                                if($verbose) echo "Copying '$tmpPath' to '$dstfile'...";
-                                copy($tmpPath, $dstfile);
-                                $success[] = $srcfile;
-                                $num ++;
-                                $this->changeMode($dstfile, $destRepoData);
-                            } catch (Exception $e) {
-                                $errors[] = $srcfile;
-                            }
-                        }
-                    } else {
-                        $recurse[] = array("src" => $srcfile, "dest"=> $dstfile);
-                    }
-                }
-            }
-            closedir($curdir);
-            foreach ($recurse as $rec) {
-                if($verbose) echo "Dircopy $srcfile";
-                $num += $this->dircopy($rec["src"], $rec["dest"], $errors, $success, $verbose, $convertSrcFile, $srcRepoData, $destRepoData);
-            }
-        }
-        return $num;
-    }
-
-    /**
-     * @param $filePath
-     * @param $repoData
-     */
-    protected function changeMode($filePath, $repoData)
-    {
-        $chmodValue = $repoData["chmod"];
-        if (isSet($chmodValue) && $chmodValue != "") {
-            $chmodValue = octdec(ltrim($chmodValue, "0"));
-            AJXP_MetaStreamWrapper::changeMode($filePath, $chmodValue);
-        }
-    }
-
-    /**
-     * @param $location
-     * @param $repoData
-     * @throws Exception
-     */
-    protected function deldir($location, $repoData)
-    {
-        if (is_dir($location)) {
-            AJXP_Controller::applyHook("node.before_path_change", array(new AJXP_Node($location)));
-            $all=opendir($location);
-            while (($file=readdir($all)) !== FALSE) {
-                if (is_dir("$location/$file") && $file !=".." && $file!=".") {
-                    $this->deldir("$location/$file", $repoData);
-                    if (file_exists("$location/$file")) {
-                        rmdir("$location/$file");
-                    }
-                    unset($file);
-                } elseif (!is_dir("$location/$file")) {
-                    if (file_exists("$location/$file")) {
-                        unlink("$location/$file");
-                    }
-                    unset($file);
-                }
-            }
-            closedir($all);
-            rmdir($location);
-        } else {
-            if (file_exists("$location")) {
-                AJXP_Controller::applyHook("node.before_path_change", array(new AJXP_Node($location)));
-                $test = @unlink("$location");
-                if(!$test) throw new Exception("Cannot delete file ".$location);
-            }
-        }
-        if (isSet($repoData["recycle"]) && basename(dirname($location)) == $repoData["recycle"]) {
-            // DELETING FROM RECYCLE
-            RecycleBinManager::deleteFromRecycle($location);
-        }
-    }
-
-
-    /**
-     *
-     * Try to reapply correct permissions
-     * @param array $stat
-     * @param Repository $repoObject
-     * @param callable $remoteDetectionCallback
-     * @var \oct $mode
-     */
-    public static function fixPermissions(&$stat, $repoObject, $remoteDetectionCallback = null)
-    {
-        $fixPermPolicy = $repoObject->getOption("FIX_PERMISSIONS");
-        $loggedUser = AuthService::getLoggedUser();
-        if ($loggedUser == null) {
-            return;
-        }
-        $sessionKey = md5($repoObject->getId()."-".$loggedUser->getId()."-fixPermData");
-
-
-        if (!isSet($_SESSION[$sessionKey])) {
-            if ($fixPermPolicy == "detect_remote_user_id" && $remoteDetectionCallback != null) {
-                list($uid, $gid) = call_user_func($remoteDetectionCallback, $repoObject);
-                if ($uid != null && $gid != null) {
-                    $_SESSION[$sessionKey] = array("uid" => $uid, "gid" => $gid);
-                }
-
-            } else if (substr($fixPermPolicy, 0, strlen("file:")) == "file:") {
-                $filePath = AJXP_VarsFilter::filter(substr($fixPermPolicy, strlen("file:")));
-                if (file_exists($filePath)) {
-                    // GET A GID/UID FROM FILE
-                    $lines = file($filePath);
-                    foreach ($lines as $line) {
-                        $res = explode(":", $line);
-                        if ($res[0] == $loggedUser->getId()) {
-                            $uid = $res[1];
-                            $gid = $res[2];
-                            $_SESSION[$sessionKey] = array("uid" => $uid, "gid" => $gid);
-                            break;
-                        }
-                    }
-                }
-            }
-            // If not set, set an empty anyway
-            if (!isSet($_SESSION[$sessionKey])) {
-                $_SESSION[$sessionKey] = array(null, null);
-            }
-
-        } else {
-            $data = $_SESSION[$sessionKey];
-            if (!empty($data)) {
-                if(isSet($data["uid"])) $uid = $data["uid"];
-                if(isSet($data["gid"])) $gid = $data["gid"];
-            }
-        }
-
-        $p = $stat["mode"];
-        //$st = sprintf("%07o", ($p & 7777770));
-        //AJXP_Logger::debug("FIX PERM DATA ($fixPermPolicy, $st)".$p,sprintf("%o", ($p & 000777)));
-        if ($p != NULL) {
-            /*
-                decoct returns a string, it's more convenient to manipulate as we know the structure
-                of the octal form of stat["mode"]
-                    - first two or three chars => file type (dir: 40, file: 100, symlink: 120)
-                    - three remaining characters => file permissions (1st char: user, 2nd char: group, 3rd char: others)
-            */
-
-            $p = decoct($p);
-            $lastInd = (intval($p[0]) == 4)? 4 : 5;
-            $otherPerms = decbin(intval($p[$lastInd]));
-            $actualPerms = $otherPerms;
-
-            if ( ( isSet($uid) && $stat["uid"] == $uid ) || $fixPermPolicy == "user"  ) {
-                AJXP_Logger::debug(__CLASS__,__FUNCTION__,"upgrading abit to ubit");
-                $userPerms = decbin(intval($p[$lastInd - 2]));
-                $actualPerms |= $userPerms;
-            } else if ( ( isSet($gid) && $stat["gid"] == $gid ) || $fixPermPolicy == "group"  ) {
-                AJXP_Logger::debug(__CLASS__,__FUNCTION__,"upgrading abit to gbit");
-                $groupPerms = decbin(intval($p[$lastInd - 1]));
-                $actualPerms |= $groupPerms;
-            }
-            $test = bindec($actualPerms);
-            $p[$lastInd] = $test;
-
-            $stat["mode"] = $stat[2] = octdec($p);
-            //AJXP_Logger::debug(__CLASS__,__FUNCTION__,"FIXED PERM DATA ($fixPermPolicy)",sprintf("%o", ($p & 000777)));
-        }
-    }
-
-    protected function resetAllPermission($value)
-    {
-    }
-
-    /**
-     * Test if userSelection is containing a hidden file, which should not be the case!
-     * @param Array $files
-     * @throws Exception
-     */
-    public function filterUserSelectionToHidden($files)
-    {
-        $showHiddenFiles = $this->getFilteredOption("SHOW_HIDDEN_FILES", $this->repository);
-        foreach ($files as $file) {
-            $file = basename($file);
-            if (AJXP_Utils::isHidden($file) && !$showHiddenFiles) {
-                throw new Exception("$file Forbidden", 411);
-            }
-            if ($this->filterFile($file) || $this->filterFolder($file)) {
-                throw new Exception("$file Forbidden", 411);
-            }
-        }
-    }
-
-    public function filterNodeName($nodePath, $nodeName, &$isLeaf, $lsOptions)
-    {
-        $showHiddenFiles = $this->getFilteredOption("SHOW_HIDDEN_FILES", $this->repository);
-        if($isLeaf === ""){
-            $isLeaf = (is_file($nodePath."/".$nodeName) || AJXP_Utils::isBrowsableArchive($nodeName));
-        }
-        if (AJXP_Utils::isHidden($nodeName) && !$showHiddenFiles) {
-            return false;
-        }
-        $nodeType = "d";
-        if ($isLeaf) {
-            if(AJXP_Utils::isBrowsableArchive($nodeName)) $nodeType = "z";
-            else $nodeType = "f";
-        }
-        if(!$lsOptions[$nodeType]) return false;
-        if ($nodeType == "d") {
-            if(RecycleBinManager::recycleEnabled()
-                && $nodePath."/".$nodeName == RecycleBinManager::getRecyclePath()){
-                return false;
-            }
-            return !$this->filterFolder($nodeName);
-        } else {
-            if($nodeName == "." || $nodeName == "..") return false;
-            if(RecycleBinManager::recycleEnabled()
-                && $nodePath == RecycleBinManager::getRecyclePath()
-                && $nodeName == RecycleBinManager::getCacheFileName()){
-                return false;
-            }
-            return !$this->filterFile($nodeName);
-        }
-    }
-
-    public function filterFile($fileName, $hiddenTest = false)
-    {
-        $pathParts = pathinfo($fileName);
-        if($hiddenTest){
-            $showHiddenFiles = $this->getFilteredOption("SHOW_HIDDEN_FILES", $this->repository);
-            if (AJXP_Utils::isHidden($pathParts["basename"]) && !$showHiddenFiles) return true;
-        }
-        $hiddenFileNames = $this->getFilteredOption("HIDE_FILENAMES", $this->repository);
-        $hiddenExtensions = $this->getFilteredOption("HIDE_EXTENSIONS", $this->repository);
-        if (!empty($hiddenFileNames)) {
-            if (!is_array($hiddenFileNames)) {
-                $hiddenFileNames = explode(",",$hiddenFileNames);
-            }
-            foreach ($hiddenFileNames as $search) {
-                if(strcasecmp($search, $pathParts["basename"]) == 0) return true;
-            }
-        }
-        if (!empty($hiddenExtensions)) {
-            if (!is_array($hiddenExtensions)) {
-                $hiddenExtensions = explode(",",$hiddenExtensions);
-            }
-            foreach ($hiddenExtensions as $search) {
-                if(strcasecmp($search, $pathParts["extension"]) == 0) return true;
-            }
-        }
-        return false;
-    }
-
-    public function filterFolder($folderName, $compare = "equals")
-    {
-        $hiddenFolders = $this->getFilteredOption("HIDE_FOLDERS", $this->repository);
-        if (!empty($hiddenFolders)) {
-            if (!is_array($hiddenFolders)) {
-                $hiddenFolders = explode(",",$hiddenFolders);
-            }
-            foreach ($hiddenFolders as $search) {
-                if($compare == "equals" && strcasecmp($search, $folderName) == 0) return true;
-                if($compare == "contains" && strpos($folderName, "/".$search) !== false) return true;
-            }
-        }
-        return false;
-    }
-
-
-}
diff --git a/core/src/plugins/core.access/manifest.xml b/core/src/plugins/core.access/manifest.xml
index d7eeea19fc..04c9717dc5 100644
--- a/core/src/plugins/core.access/manifest.xml
+++ b/core/src/plugins/core.access/manifest.xml
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ajxp_plugin label="CONF_MESSAGE[File Access Drivers]" description="CONF_MESSAGE[Container for all access.* plugins]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
+
+    <class_definition classname="Pydio\Access\Core\CoreAccessHandler"
+                      filename="plugins/core.access/src/CoreAccessHandler.php"/>
+
+    <registry_contributions>
+        <actions>
+            <action name="multisearch">
+                <processing>
+                    <serverCallback methodName="multipleSearch" restParams="/query"/>
+                </processing>
+            </action>
+        </actions>
+    </registry_contributions>
+
 </ajxp_plugin>
diff --git a/core/src/plugins/core.access/src/AbstractAccessDriver.php b/core/src/plugins/core.access/src/AbstractAccessDriver.php
new file mode 100644
index 0000000000..36bbd45bf4
--- /dev/null
+++ b/core/src/plugins/core.access/src/AbstractAccessDriver.php
@@ -0,0 +1,719 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Core;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\Repository;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Services\LocaleService;
+
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\PathUtils;
+use Pydio\Core\Utils\Vars\StatHelper;
+
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\Utils\Vars\VarsFilter;
+use Pydio\Log\Core\Logger;
+use Pydio\Tasks\Task;
+use Pydio\Tasks\TaskService;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * @package AjaXplorer_Plugins
+ * @subpackage Core
+ * @class AbstractAccessDriver
+ * Abstract representation of an action driver. Must be implemented.
+ */
+abstract class AbstractAccessDriver extends Plugin
+{
+    /**
+    * @var Repository
+    */
+    public $repository;
+    public $driverType = "access";
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     * @throws PydioException
+     */
+    public function init(ContextInterface $ctx, $options = array())
+    {
+        parent::init($ctx, $options);
+        if(!$ctx->hasRepository()){
+            throw new PydioException("Cannot instanciate an access plugin without a valid repository");
+        }
+        $this->repository = $ctx->getRepository();
+        $this->detectStreamWrapper(true, $ctx);
+        $this->initRepository($ctx);
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     */
+    abstract protected function initRepository(ContextInterface $ctx);
+
+
+    /**
+     * @param ServerRequestInterface $request
+     * @throws \Exception
+     */
+    public function accessPreprocess(ServerRequestInterface &$request)
+    {
+        $actionName = $request->getAttribute("action");
+        $ctx        = $request->getAttribute("ctx");
+        $httpVars   = $request->getParsedBody();
+
+        if ($actionName == "apply_check_hook") {
+            if (!in_array($httpVars["hook_name"], array("before_create", "before_path_change", "before_change"))) {
+                return;
+            }
+            $selection = UserSelection::fromContext($ctx, $httpVars);
+            Controller::applyHook("node.".$httpVars["hook_name"], array($selection->getUniqueNode(), $httpVars["hook_arg"]));
+        }
+        if ($actionName == "ls") {
+            // UPWARD COMPATIBILTY
+            if (isSet($httpVars["options"])) {
+                if($httpVars["options"] == "al") $httpVars["mode"] = "file_list";
+                else if($httpVars["options"] == "a") $httpVars["mode"] = "search";
+                else if($httpVars["options"] == "d") $httpVars["skipZip"] = "true";
+                // skip "complete" mode that was in fact quite the same as standard tree listing (dz)
+                $request = $request->withParsedBody($httpVars);
+            }
+        }
+    }
+    
+
+    /**
+     * Populate publiclet options
+     * @param String $filePath The path to the file to share
+     * @param String $password optionnal password
+     * @param String $downloadlimit optional limit for downloads
+     * @param String $expires optional expiration date
+     * @param Repository $repository
+     * @return array
+     */
+    public function makePublicletOptions($filePath, $password, $expires, $downloadlimit, $repository) {}
+
+    /**
+     * Populate shared repository options
+     * @param ContextInterface $ctx
+     * @param array $httpVars
+     * @return array
+     */
+    public function makeSharedRepositoryOptions(ContextInterface $ctx, $httpVars){}
+
+    /**
+     * @param $node AJXP_Node
+     * @return int
+     * @throws \Exception
+     */
+    public function directoryUsage(AJXP_Node $node){
+        throw new \Exception("Current driver does not support recursive directory usage!");
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public function crossRepositoryCopy(ServerRequestInterface &$requestInterface, ResponseInterface &$responseInterface)
+    {
+        $httpVars   = $requestInterface->getParsedBody();
+        $mess       = LocaleService::getMessages();
+
+        $taskId     = $requestInterface->getAttribute("pydio-task-id");
+        $ctx        = $requestInterface->getAttribute("ctx");
+        if(empty($taskId)){
+            $task = TaskService::actionAsTask($ctx, "cross_copy", $httpVars);
+            $task->setActionLabel($mess, isSet($httpVars["moving_files"]) ? '70' : '66');
+            $responseInterface = TaskService::getInstance()->enqueueTask($task, $requestInterface, $responseInterface);
+            return;
+        }
+
+
+        $selection = UserSelection::fromContext($ctx, $httpVars);
+        $files = $selection->getFiles();
+
+        $crtUser = $ctx->getUser()->getId();
+        $repositoryId = $this->repository->getId();
+        $origStreamURL = "pydio://$crtUser@$repositoryId";
+        $origNode = new AJXP_Node($origStreamURL);
+        MetaStreamWrapper::detectWrapperForNode($origNode, true);
+
+        $destRepoId = $httpVars["dest_repository_id"];
+        $destStreamURL = "pydio://$crtUser@$destRepoId";
+        $destNode = new AJXP_Node($destStreamURL);
+        MetaStreamWrapper::detectWrapperForNode($destNode, true);
+
+        // Check rights
+        if (UsersService::usersEnabled()) {
+            /** @var ContextInterface $ctx */
+            $ctx = $requestInterface->getAttribute("ctx");
+            $loggedUser = $ctx->getUser();
+            if(!$loggedUser->canRead($repositoryId) || !$loggedUser->canWrite($destRepoId)
+                || (isSet($httpVars["moving_files"]) && !$loggedUser->canWrite($repositoryId))
+            ){
+                throw new \Exception($mess[364]);
+            }
+        }
+        $srcRepoData= array(
+            'base_url'      => $origStreamURL,
+            'recycle'       => $this->repository->getContextOption($ctx, "RECYCLE_BIN")
+        );
+        $destRepoData=array(
+            'base_url'      => $destStreamURL,
+            'chmod'         => $this->repository->getContextOption($ctx, 'CHMOD')
+        );
+
+        $messages = array();
+        $errorMessages = array();
+        foreach ($files as $file) {
+
+            $destFile = rtrim(InputFilter::decodeSecureMagic($httpVars["dest"]), "/") ."/". PathUtils::forwardSlashBasename($file);
+            $this->copyOrMoveFile(
+                $destFile,
+                $file, $errorMessages, $messages, isSet($httpVars["moving_files"]) ? true: false,
+                $srcRepoData, $destRepoData, $taskId);
+
+        }
+
+        if(!empty($taskId)){
+            if (count($errorMessages)) {
+                TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_FAILED, implode("\n", $errorMessages));
+            }else{
+                TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_COMPLETE, "");
+            }
+        }
+    }
+
+    /**
+     * @param String $destFile url of destination file
+     * @param String $srcFile url of source file
+     * @param array $error accumulator for error messages
+     * @param array $success accumulator for success messages
+     * @param bool $move Whether to copy or move
+     * @param array $srcRepoData Set of data concerning source repository: base_url, recycle option
+     * @param array $destRepoData Set of data concerning destination repository: base_url, chmod option
+     * @param string $taskId Optional task UUID to update during operation
+     */
+    protected function copyOrMoveFile($destFile, $srcFile, &$error, &$success, $move = false, $srcRepoData = array(), $destRepoData = array(), $taskId = null)
+    {
+        $srcUrlBase = $srcRepoData['base_url'];
+        $srcRecycle = $srcRepoData['recycle'];
+        $destUrlBase = $destRepoData['base_url'];
+
+        $mess = LocaleService::getMessages();
+        /*
+        $bName = basename($srcFile);
+        $localName = '';
+        Controller::applyHook("dl.localname", array($srcFile, &$localName));
+        if(!empty($localName)) $bName = $localName;
+        */
+        $destDir = PathUtils::forwardSlashDirname($destFile);
+        $destFile = $destUrlBase.$destFile;
+        $realSrcFile = $srcUrlBase.$srcFile;
+
+        if (is_dir(dirname($realSrcFile)) && (strpos($destFile, rtrim($realSrcFile, "/") . "/") === 0)) {
+            $error[] = $mess[101];
+            if(!empty($taskId)) TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_FAILED, $mess[101]);
+            return;
+        }
+
+        if (!file_exists($realSrcFile)) {
+            $error[] = $mess[100].$srcFile;
+            if(!empty($taskId)) TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_FAILED, $mess[100].$srcFile);
+            return ;
+        }
+        if (!$move) {
+            $size = filesize($realSrcFile);
+            Controller::applyHook("node.before_create", array(new AJXP_Node($destFile), $size));
+        }
+        if (dirname($realSrcFile) == dirname($destFile) && basename($realSrcFile) == basename($destFile)) {
+            if ($move) {
+                if(!empty($taskId)) TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_FAILED, $mess[101]);
+                $error[] = $mess[101];
+                return ;
+            } else {
+                $base = basename($srcFile);
+                $ext = "";
+                if (is_file($realSrcFile)) {
+                    $dotPos = strrpos($base, ".");
+                    if ($dotPos>-1) {
+                        $radic = substr($base, 0, $dotPos);
+                        $ext = substr($base, $dotPos);
+                    }
+                }
+                // auto rename file
+                $destDir = PathUtils::forwardSlashDirname($destFile);
+                $i = 1;
+                $newName = $base;
+                while (file_exists($destDir."/".$newName)) {
+                    $suffix = "-$i";
+                    if(isSet($radic)) $newName = $radic . $suffix . $ext;
+                    else $newName = $base.$suffix;
+                    $i++;
+                }
+                $destFile = $destDir."/".$newName;
+            }
+        }
+        $srcNode = new AJXP_Node($realSrcFile);
+        $destNode = new AJXP_Node($destFile);
+        if (!is_file($realSrcFile)) {
+            $errors = array();
+            $succFiles = array();
+            $srcNode->setLeaf(false);
+            if ($move) {
+                Controller::applyHook("node.before_path_change", array($srcNode));
+                if(file_exists($destFile)) {
+                    $this->deldir($destFile, $destRepoData);
+                }
+                $res = rename($realSrcFile, $destFile);
+                if($res!==true){
+                    $errors[] = "Error while renaming $realSrcFile to $destFile";
+                }
+            } else {
+                $dirRes = $this->dircopy($realSrcFile, $destFile, $errors, $succFiles, false, true, $srcRepoData, $destRepoData, $taskId);
+            }
+            if (count($errors)) {
+                if (!empty($taskId)) TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_FAILED, implode(" ", $errors));
+                return;
+            } else {
+                $destNode->setLeaf(false);
+                Controller::applyHook("node.change", array($srcNode, $destNode, !$move));
+            }
+        } else {
+            if ($move) {
+                Controller::applyHook("node.before_path_change", array($srcNode));
+                if(file_exists($destFile)) unlink($destFile);
+                if(MetaStreamWrapper::nodesUseSameWrappers($realSrcFile, $destFile)){
+                    rename($realSrcFile, $destFile);
+                }else{
+                    copy($realSrcFile, $destFile);
+                }
+                Controller::applyHook("node.change", array($srcNode, $destNode, false));
+            } else {
+                try {
+                    $this->filecopy($realSrcFile, $destFile);
+                    $this->changeMode($destFile, $destRepoData);
+                    Controller::applyHook("node.change", array($srcNode, $destNode, true));
+                } catch (\Exception $e) {
+                    $error[] = $e->getMessage();
+                    if(!empty($taskId)) TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_FAILED, $e->getMessage());
+                    return ;
+                }
+            }
+        }
+
+        if ($move) {
+            // Now delete original
+            // $this->deldir($realSrcFile); // both file and dir
+            $messagePart = $mess[74]." ".$destDir;
+            if (RecycleBinManager::recycleEnabled() && $destDir == RecycleBinManager::getRelativeRecycle()) {
+                RecycleBinManager::fileToRecycle($srcFile);
+                $messagePart = $mess[123]." ".$mess[122];
+            }
+            if (is_dir($destFile)) {
+                $successMessage = $mess[117]." ". basename($srcFile)." ".$messagePart;
+            } else {
+                $successMessage = $mess[34]." ". basename($srcFile)." ".$messagePart;
+            }
+        } else {
+            if (RecycleBinManager::recycleEnabled() && $destDir == "/".$srcRecycle) {
+                RecycleBinManager::fileToRecycle($srcFile);
+            }
+            if (isSet($dirRes)) {
+                $successMessage = $mess[117]." ".basename($destFile)." ".$mess[73]." ".$destDir." (".$dirRes." ".$mess[116].")";
+            } else {
+                $successMessage = $mess[34]." ". basename($destFile)." ".$mess[73]." ". $destDir;
+            }
+        }
+        $success[] = $successMessage;
+        if(!empty($taskId)){
+            TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_RUNNING, $successMessage);
+        }
+
+    }
+
+    /**
+     * @param String $srcFile url of source file
+     * @param String $destFile url of destination file
+     */
+    protected function filecopy($srcFile, $destFile)
+    {
+        if (!MetaStreamWrapper::nodesUseSameWrappers($srcFile, $destFile)
+            || MetaStreamWrapper::wrapperIsRemote($srcFile)
+            || MetaStreamWrapper::wrapperIsRemote($destFile)) {
+            $src = fopen($srcFile, "r");
+            $dest = fopen($destFile, "w");
+            if (is_resource($src) && is_resource($dest)) {
+                while (!feof($src)) {
+                    //stream_copy_to_stream($src, $dest, 4096);
+                    $count = stream_copy_to_stream($src, $dest, 4096);
+                    if ($count == 0) break;
+                }
+            }
+            if(is_resource($dest)) fclose($dest);
+            if(is_resource($src)) fclose($src);
+        } else {
+            copy($srcFile, $destFile);
+        }
+    }
+
+    /**
+     * @param String $srcdir Url of source file
+     * @param String $dstdir Url of dest file
+     * @param array $errors Array of errors
+     * @param array $success Array of success
+     * @param bool $verbose Boolean
+     * @param bool $convertSrcFile Boolean
+     * @param array $srcRepoData Set of data concerning source repository: base_url, recycle option
+     * @param array $destRepoData Set of data concerning destination repository: base_url, chmod option
+     * @param string $taskId Optional Task ID
+     * @return int
+     */
+    protected function dircopy($srcdir, $dstdir, &$errors, &$success, $verbose = false, $convertSrcFile = true, $srcRepoData = array(), $destRepoData = array(), $taskId = null)
+    {
+        $num = 0;
+        //$verbose = true;
+        $recurse = array();
+        if (!is_dir($dstdir)) {
+            $dirMode = 0755;
+            $chmodValue = $destRepoData["chmod"]; //$this->repository->getOption("CHMOD_VALUE");
+            if (isSet($chmodValue) && $chmodValue != "") {
+                $dirMode = octdec(ltrim($chmodValue, "0"));
+                if ($dirMode & 0400) $dirMode |= 0100; // User is allowed to read, allow to list the directory
+                if ($dirMode & 0040) $dirMode |= 0010; // Group is allowed to read, allow to list the directory
+                if ($dirMode & 0004) $dirMode |= 0001; // Other are allowed to read, allow to list the directory
+            }
+            $old = umask(0);
+            mkdir($dstdir, $dirMode);
+            umask($old);
+        }
+        if ($curdir = opendir($srcdir)) {
+            while (($file = readdir($curdir)) !== FALSE) {
+                if ($file != '.' && $file != '..') {
+                    $srcfile = $srcdir . "/" . $file;
+                    $dstfile = $dstdir . "/" . $file;
+                    if (is_file($srcfile)) {
+                        if(is_file($dstfile)) $ow = filemtime($srcfile) - filemtime($dstfile); else $ow = 1;
+                        if ($ow > 0) {
+                            try {
+                                if($convertSrcFile) $tmpPath = MetaStreamWrapper::getRealFSReference($srcfile);
+                                else $tmpPath = $srcfile;
+                                if($verbose) echo "Copying '$tmpPath' to '$dstfile'...";
+                                if(!empty($taskId)){
+                                    TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_RUNNING, "Copying ".$srcfile);
+                                }
+                                copy($tmpPath, $dstfile);
+                                $success[] = $srcfile;
+                                $num ++;
+                                $this->changeMode($dstfile, $destRepoData);
+                            } catch (\Exception $e) {
+                                $errors[] = $e->getMessage()." - ".$srcfile;
+                            }
+                        }else{
+                            if($verbose) echo "Skipping file ".$srcfile.", already there.";
+                            if(!empty($taskId)){
+                                TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_RUNNING, "Skipping file ".$srcfile.", already there.");
+                            }
+                        }
+                    } else {
+                        $recurse[] = array("src" => $srcfile, "dest"=> $dstfile);
+                    }
+                }
+            }
+            closedir($curdir);
+            foreach ($recurse as $rec) {
+                if($verbose && isSet($srcfile)) echo "Dircopy $srcfile";
+                $num += $this->dircopy($rec["src"], $rec["dest"], $errors, $success, $verbose, $convertSrcFile, $srcRepoData, $destRepoData, $taskId);
+            }
+        }
+        return $num;
+    }
+
+    /**
+     * @param $filePath
+     * @param $repoData
+     */
+    protected function changeMode($filePath, $repoData)
+    {
+        $chmodValue = $repoData["chmod"];
+        if (isSet($chmodValue) && $chmodValue != "") {
+            $chmodValue = octdec(ltrim($chmodValue, "0"));
+            MetaStreamWrapper::changeMode($filePath, $chmodValue);
+        }
+    }
+
+    /**
+     * @param string $location
+     * @param array $repoData
+     * @param string $taskId
+     * @throws \Exception
+     */
+    protected function deldir($location, $repoData, $taskId = null)
+    {
+        if (is_dir($location)) {
+            Controller::applyHook("node.before_path_change", array(new AJXP_Node($location)));
+            $all=opendir($location);
+            while (($file=readdir($all)) !== FALSE) {
+                if (is_dir("$location/$file") && $file !=".." && $file!=".") {
+                    $this->deldir("$location/$file", $repoData, $taskId);
+                    if (file_exists("$location/$file")) {
+                        @rmdir("$location/$file");
+                        if($taskId != null) TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_RUNNING, "Deleting $file");
+                    }
+                    unset($file);
+                } elseif (!is_dir("$location/$file")) {
+                    if (file_exists("$location/$file")) {
+                        @unlink("$location/$file");
+                        if($taskId != null) TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_RUNNING, "Deleting $file");
+                    }
+                    unset($file);
+                }
+            }
+            closedir($all);
+            @rmdir($location);
+            if($taskId != null) TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_RUNNING, "Deleting ". PathUtils::forwardSlashBasename($location));
+        } else {
+            if (file_exists("$location")) {
+                Controller::applyHook("node.before_path_change", array(new AJXP_Node($location)));
+                $test = @unlink("$location");
+                if(!$test) throw new \Exception("Cannot delete file ".$location);
+            }
+        }
+        if (isSet($repoData["recycle"]) && basename(dirname($location)) == $repoData["recycle"]) {
+            // DELETING FROM RECYCLE
+            RecycleBinManager::deleteFromRecycle($location);
+        }
+    }
+
+
+    /**
+     *
+     * Try to reapply correct permissions
+     * @param AJXP_Node $node
+     * @param array $stat
+     * @param callable $remoteDetectionCallback
+     * @var integer $mode
+     */
+    public static function fixPermissions(AJXP_Node $node, &$stat, $remoteDetectionCallback = null)
+    {
+        $repoObject = $node->getRepository();
+        $fixPermPolicy = $repoObject->getContextOption($node->getContext(), "FIX_PERMISSIONS");
+        $loggedUser = $node->getUser();
+        if ($loggedUser == null) {
+            return;
+        }
+        $sessionKey = md5($repoObject->getId()."-".$loggedUser->getId()."-fixPermData");
+
+
+        if (!isSet($_SESSION[$sessionKey])) {
+            if ($fixPermPolicy == "detect_remote_user_id" && $remoteDetectionCallback != null) {
+                list($uid, $gid) = call_user_func($remoteDetectionCallback, $node);
+                if ($uid != null && $gid != null) {
+                    $_SESSION[$sessionKey] = array("uid" => $uid, "gid" => $gid);
+                }
+
+            } else if (substr($fixPermPolicy, 0, strlen("file:")) == "file:") {
+                $filePath = VarsFilter::filter(substr($fixPermPolicy, strlen("file:")), $node->getContext());
+                if (file_exists($filePath)) {
+                    // GET A GID/UID FROM FILE
+                    $lines = file($filePath);
+                    foreach ($lines as $line) {
+                        $res = explode(":", $line);
+                        if ($res[0] == $loggedUser->getId()) {
+                            $uid = $res[1];
+                            $gid = $res[2];
+                            $_SESSION[$sessionKey] = array("uid" => $uid, "gid" => $gid);
+                            break;
+                        }
+                    }
+                }
+            }
+            // If not set, set an empty anyway
+            if (!isSet($_SESSION[$sessionKey])) {
+                $_SESSION[$sessionKey] = array(null, null);
+            }
+
+        } else {
+            $data = $_SESSION[$sessionKey];
+            if (!empty($data)) {
+                if(isSet($data["uid"])) $uid = $data["uid"];
+                if(isSet($data["gid"])) $gid = $data["gid"];
+            }
+        }
+
+        $p = $stat["mode"];
+        //$st = sprintf("%07o", ($p & 7777770));
+        //AJXP_Logger::debug("FIX PERM DATA ($fixPermPolicy, $st)".$p,sprintf("%o", ($p & 000777)));
+        if ($p != NULL) {
+            /*
+                decoct returns a string, it's more convenient to manipulate as we know the structure
+                of the octal form of stat["mode"]
+                    - first two or three chars => file type (dir: 40, file: 100, symlink: 120)
+                    - three remaining characters => file permissions (1st char: user, 2nd char: group, 3rd char: others)
+            */
+
+            $p = decoct($p);
+            $lastInd = (intval($p[0]) == 4)? 4 : 5;
+            $otherPerms = decbin(intval($p[$lastInd]));
+            $actualPerms = $otherPerms;
+
+            if ( ( isSet($uid) && $stat["uid"] == $uid ) || $fixPermPolicy == "user"  ) {
+                Logger::debug(__CLASS__,__FUNCTION__,"upgrading abit to ubit");
+                $userPerms = decbin(intval($p[$lastInd - 2]));
+                $actualPerms |= $userPerms;
+            } else if ( ( isSet($gid) && $stat["gid"] == $gid ) || $fixPermPolicy == "group"  ) {
+                Logger::debug(__CLASS__,__FUNCTION__,"upgrading abit to gbit");
+                $groupPerms = decbin(intval($p[$lastInd - 1]));
+                $actualPerms |= $groupPerms;
+            }
+            $test = bindec($actualPerms);
+            $p[$lastInd] = $test;
+
+            $stat["mode"] = $stat[2] = octdec($p);
+            //AJXP_Logger::debug(__CLASS__,__FUNCTION__,"FIXED PERM DATA ($fixPermPolicy)",sprintf("%o", ($p & 000777)));
+        }
+    }
+    
+    /**
+     * Test if userSelection is containing a hidden file, which should not be the case!
+     * @param ContextInterface $ctx
+     * @param array $files
+     * @throws \Exception
+     */
+    public function filterUserSelectionToHidden(ContextInterface $ctx, $files)
+    {
+        $showHiddenFiles = $this->getContextualOption($ctx, "SHOW_HIDDEN_FILES");
+        foreach ($files as $file) {
+            $file = basename($file);
+            if (StatHelper::isHidden($file) && !$showHiddenFiles) {
+                throw new \Exception("$file Forbidden", 411);
+            }
+            if ($this->filterFile($ctx, $file) || $this->filterFolder($ctx, $file)) {
+                throw new \Exception("$file Forbidden", 411);
+            }
+        }
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $nodePath
+     * @param $nodeName
+     * @param $isLeaf
+     * @param $lsOptions
+     * @return bool
+     */
+    public function filterNodeName(ContextInterface $ctx, $nodePath, $nodeName, &$isLeaf, $lsOptions)
+    {
+        $showHiddenFiles = $this->getContextualOption($ctx, "SHOW_HIDDEN_FILES");
+        if($isLeaf === ""){
+            $isLeaf = (is_file($nodePath."/".$nodeName) || StatHelper::isBrowsableArchive($nodeName));
+        }
+        if (StatHelper::isHidden($nodeName) && !$showHiddenFiles) {
+            return false;
+        }
+        $nodeType = "d";
+        if ($isLeaf) {
+            if(StatHelper::isBrowsableArchive($nodeName)) $nodeType = "z";
+            else $nodeType = "f";
+        }
+        if(!$lsOptions[$nodeType]) return false;
+        if ($nodeType == "d") {
+            if(RecycleBinManager::recycleEnabled()
+                && $nodePath."/".$nodeName == RecycleBinManager::getRecyclePath()){
+                return false;
+            }
+            return !$this->filterFolder($ctx, $nodeName);
+        } else {
+            if($nodeName == "." || $nodeName == "..") return false;
+            if(RecycleBinManager::recycleEnabled()
+                && $nodePath == RecycleBinManager::getRecyclePath()
+                && $nodeName == RecycleBinManager::getCacheFileName()){
+                return false;
+            }
+            return !$this->filterFile($ctx, $nodeName);
+        }
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param string $fileName
+     * @param bool $hiddenTest
+     * @return bool
+     */
+    public function filterFile(ContextInterface $ctx, $fileName, $hiddenTest = false)
+    {
+        $pathParts = pathinfo($fileName);
+        if($hiddenTest){
+            $showHiddenFiles = $this->getContextualOption($ctx, "SHOW_HIDDEN_FILES");
+            if (StatHelper::isHidden($pathParts["basename"]) && !$showHiddenFiles) return true;
+        }
+        $hiddenFileNames = $this->getContextualOption($ctx, "HIDE_FILENAMES");
+        $hiddenExtensions = $this->getContextualOption($ctx, "HIDE_EXTENSIONS");
+        if (!empty($hiddenFileNames)) {
+            if (!is_array($hiddenFileNames)) {
+                $hiddenFileNames = explode(",",$hiddenFileNames);
+            }
+            foreach ($hiddenFileNames as $search) {
+                if(strcasecmp($search, $pathParts["basename"]) == 0) return true;
+            }
+        }
+        if (!empty($hiddenExtensions)) {
+            if (!is_array($hiddenExtensions)) {
+                $hiddenExtensions = explode(",",$hiddenExtensions);
+            }
+            foreach ($hiddenExtensions as $search) {
+                if(strcasecmp($search, $pathParts["extension"]) == 0) return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param string $folderName
+     * @param string $compare
+     * @return bool
+     */
+    public function filterFolder(ContextInterface $ctx, $folderName, $compare = "equals")
+    {
+        $hiddenFolders = $this->getContextualOption($ctx, "HIDE_FOLDERS");
+        if (!empty($hiddenFolders)) {
+            if (!is_array($hiddenFolders)) {
+                $hiddenFolders = explode(",",$hiddenFolders);
+            }
+            foreach ($hiddenFolders as $search) {
+                if($compare == "equals" && strcasecmp($search, $folderName) == 0) return true;
+                if($compare == "contains" && strpos($folderName, "/".$search) !== false) return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/core/src/plugins/core.access/src/CoreAccessHandler.php b/core/src/plugins/core.access/src/CoreAccessHandler.php
new file mode 100644
index 0000000000..6e37141cde
--- /dev/null
+++ b/core/src/plugins/core.access/src/CoreAccessHandler.php
@@ -0,0 +1,99 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Access\Core;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\NodesList;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Http\Response\SerializableResponseStream;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\UsersService;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class CoreAccessHandler
+ * Manage global actions
+ * @package Pydio\Access\Core
+ */
+class CoreAccessHandler extends Plugin
+{
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        parent::init($ctx, $options);
+        MetaStreamWrapper::register();
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     */
+    public function multipleSearch(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface){
+        /** @var ContextInterface $parentContext */
+        $parentContext = $requestInterface->getAttribute("ctx");
+        $user = $parentContext->getUser();
+        $repositories = UsersService::getRepositoriesForUser($user);
+        $results = new NodesList();
+        $results->setParentNode(new AJXP_Node($parentContext->getUrlBase()));
+        $searchParams = $requestInterface->getParsedBody();
+        $searchParams["limit"] = 5;
+        $searchParams["skip_unindexed"] = "true";
+        $searchParams["query"] = $searchParams["query"]."*";
+        foreach($repositories as $repository){
+            try{
+                $childContext = $parentContext->withRepositoryId($repository->getId());
+                $indexer = PluginsService::getInstance($childContext)->getUniqueActivePluginForType("index");
+                if(empty($indexer)){
+                    continue;
+                }
+                $searchRequest = Controller::executableRequest($childContext, "search", $searchParams);
+                $localResponse = Controller::run($searchRequest);
+                $serial = $localResponse->getBody();
+                if($serial instanceof SerializableResponseStream){
+                    /** @var NodesList $nodesList */
+                    $nodesList = $serial->getChunks()[0];
+                    if($nodesList instanceof NodesList){
+                        $children = $nodesList->getChildren();
+                        foreach($children as $childNode){
+                            $childNode->mergeMetadata([
+                                "repository_id" => $repository->getId(),
+                                "repository_display" => $repository->getDisplay()
+                            ]);
+                            $results->addBranch($childNode);
+                        }
+                    }
+                }
+            }catch (\Exception $r){
+                $message = $r->getMessage();
+            }
+        }
+        $responseInterface = $responseInterface->withBody(new SerializableResponseStream($results));
+    }
+    
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.access/src/EncodingWrapper.php b/core/src/plugins/core.access/src/EncodingWrapper.php
new file mode 100644
index 0000000000..e5d181362c
--- /dev/null
+++ b/core/src/plugins/core.access/src/EncodingWrapper.php
@@ -0,0 +1,205 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Access\Core;
+
+use Pydio\Core\Utils\TextEncoder;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Encode/Decode Class EncodingWrapper
+ * @package Pydio\Access\Core
+ */
+class EncodingWrapper extends SchemeTranslatorWrapper
+{
+    /**
+     * Source is the underlying FS encoding
+     * @var string
+     */
+    private $sourceEncoding;
+    /**
+     * Target is the application encoding, should be utf8
+     * @var string
+     */
+    private $targetEncoding;
+
+    /**
+     * @param $path
+     * @return string
+     */
+    protected static function encode($path){
+        return TextEncoder::fromStorageEncoding($path);
+    }
+
+    /**
+     * @param $path
+     * @return string
+     */
+    protected static function decode($path){
+        return TextEncoder::toStorageEncoding($path);
+    }
+
+    /**
+     * EncodingWrapper constructor.
+     * @param $sourceEncoding
+     * @param string $targetEncoding
+     */
+    public function __construct($sourceEncoding = 'UTF-8', $targetEncoding = 'UTF-8')
+    {
+        $this->sourceEncoding = $sourceEncoding;
+        $this->targetEncoding = $targetEncoding;
+    }
+
+    /*****************/
+    /* DECODE INPUTS */
+    /*****************/
+
+    /**
+     * @param string $path
+     * @param int $options
+     * @return bool
+     */
+    public function dir_opendir($path, $options)
+    {
+        return parent::dir_opendir($this->decode($path), $options);
+    }
+
+    /**
+     * @param string $path
+     * @param string $mode
+     * @param int $options
+     * @param string $context
+     * @return bool
+     */
+    public function stream_open($path, $mode, $options, &$context)
+    {
+        return parent::stream_open($this->decode($path), $mode, $options, $context);
+    }
+
+    /**
+     * @param string $path
+     * @param int $mode
+     * @param int $options
+     * @return bool
+     */
+    public function mkdir($path, $mode, $options)
+    {
+        return parent::mkdir($this->decode($path), $mode, $options);
+    }
+
+    /**
+     * @param string $path_from
+     * @param string $path_to
+     * @return bool
+     */
+    public function rename($path_from, $path_to)
+    {
+        return parent::rename($this->decode($path_from), $this->decode($path_to));
+    }
+
+    /**
+     * @param string $path
+     * @param int $options
+     * @return bool
+     */
+    public function rmdir($path, $options)
+    {
+        return parent::rmdir($this->decode($path), $options);
+    }
+
+    /**
+     * @param string $path
+     * @return bool
+     */
+    public function unlink($path)
+    {
+        return parent::unlink($this->decode($path));
+    }
+
+    /**
+     * @param string $path
+     * @param int $flags
+     * @return array
+     */
+    public function url_stat($path, $flags)
+    {
+        return parent::url_stat($this->decode($path), $flags);
+    }
+
+    /******************/
+    /* ENCODE OUTPUTS */
+    /******************/
+
+    /**
+     * @return string
+     */
+    public function dir_readdir()
+    {
+        $data = parent::dir_readdir();
+        if(!empty($data) && is_string($data)){
+            return $this->encode($data);
+        }else{
+            return $data;
+        }
+    }
+
+
+    /**
+     * Get a "usable" reference to a file : the real file or a tmp copy.
+     * Return the "storage-encoded" version of the path.
+     *
+     * @param string $path
+     * @param bool $persistent
+     * @return string
+     * @throws \Exception
+     */
+    public static function getRealFSReference($path, $persistent = false)
+    {
+        $wrapper = self::findSubWrapperClassName($path);
+        return call_user_func(array($wrapper, "getRealFSReference"), self::translateScheme(self::decode($path)), $persistent);
+    }
+
+    /**
+     * Read a file (by chunks) and copy the data directly inside the given stream.
+     *
+     * @param string $path
+     * @param resource $stream
+     */
+    public static function copyFileInStream($path, $stream)
+    {
+        $wrapper = self::findSubWrapperClassName($path);
+        call_user_func(array($wrapper, "copyFileInStream"), self::translateScheme(self::decode($path)), $stream);
+    }
+
+    /**
+     * Chmod implementation for this type of access.
+     *
+     * @param string $path
+     * @param number $chmodValue
+     */
+    public static function changeMode($path, $chmodValue)
+    {
+        $wrapper = self::findSubWrapperClassName($path);
+        call_user_func(array($wrapper, "changeMode"), self::translateScheme(self::decode($path)), $chmodValue);
+    }
+
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.access/src/Exception/FileNotFoundException.php b/core/src/plugins/core.access/src/Exception/FileNotFoundException.php
new file mode 100644
index 0000000000..a111f35986
--- /dev/null
+++ b/core/src/plugins/core.access/src/Exception/FileNotFoundException.php
@@ -0,0 +1,44 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Access\Core\Exception;
+
+use Pydio\Core\Exception\PydioException;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class FileNotFoundException
+ * @package Pydio\Access\Core\Exception
+ */
+class FileNotFoundException extends PydioException
+{
+    private $filePath;
+
+    /**
+     * FileNotFoundException constructor.
+     * @param string $filePath
+     */
+    public function __construct($filePath)
+    {
+        $this->filePath = $filePath;
+        parent::__construct("Cannot find file!", false, 5015);
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.access/src/Exception/FileNotWriteableException.php b/core/src/plugins/core.access/src/Exception/FileNotWriteableException.php
new file mode 100644
index 0000000000..d65f12898d
--- /dev/null
+++ b/core/src/plugins/core.access/src/Exception/FileNotWriteableException.php
@@ -0,0 +1,42 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Access\Core\Exception;
+
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Core\Exception\PydioException;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class FileNotWriteableException
+ * @package Pydio\Access\Core\Exception
+ */
+class FileNotWriteableException extends PydioException
+{
+    /**
+     * FileNotWriteableException constructor.
+     * @param AJXP_Node $node
+     */
+    public function __construct($node)
+    {
+        parent::__construct("File ".$node->getPath()." is not writeable");
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.access/src/Filter/AJXP_Permission.php b/core/src/plugins/core.access/src/Filter/AJXP_Permission.php
new file mode 100644
index 0000000000..3a2c01d617
--- /dev/null
+++ b/core/src/plugins/core.access/src/Filter/AJXP_Permission.php
@@ -0,0 +1,208 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Core\Filter;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class AJXP_Permission
+ *
+ * Atomic permission associated to a folder path. Can be initialized either with an integer
+ * value (use MASK constants) or with a string value like "r", "rw", etc.
+ *
+ * @package Pydio
+ * @subpackage Core
+ */
+class AJXP_Permission implements \JsonSerializable
+{
+    /**
+     * Use an integer number to store permission
+     *  |r|w|d|t|....|..
+     *  |0|1|0|0|....|..
+     */
+
+    const MASK = 15; // 0000..001111 means use 4 first bits for encoding permission. The rest will be cut off.
+    const READ = 1; // 0001
+    const WRITE = 2; // 0010
+    const DENY = 4; // 0100
+    const TRAVEL = 8; //1000
+
+    private $value = 0;
+
+    /**
+     * @param array|null $value
+     */
+    function __construct($value = null){
+        if($value != null){
+            if(is_array($value)) $this->value = $value;
+            elseif(is_integer($value)) {
+                $this->value = $value & self::MASK;
+            }
+            elseif(is_string($value)){
+                if(strpos($value, "r") !== false) $this->setRead();
+                if(strpos($value, "w") !== false) $this->setWrite();
+                if(strpos($value, "d") !== false) $this->setDeny();
+            }
+        }
+    }
+
+    /**
+     * Replicate this permission.
+     * @return AJXP_Permission
+     */
+    function getCopy(){
+        return new AJXP_Permission($this->value);
+    }
+
+    /**
+     * Test if the permission is readable
+     * @return bool
+     */
+    function canRead(){
+        return ($this->value & self::READ) === self::READ;
+    }
+
+    /**
+     * Test if the permission is writeable
+     * @return bool
+     */
+    function canWrite(){
+        return ($this->value & self::WRITE) === self::WRITE;
+    }
+
+    /**
+     * Test if the permission denies access, whatever happens.
+     * @return bool
+     */
+    function denies(){
+        if ($this->value === self::DENY) return true;
+        if ($this->value === 0) return true;
+        return false;
+    }
+
+    /**
+     * Test if the permission is just empty
+     * @return bool
+     */
+    function isEmpty(){
+        return $this->value === 0;
+    }
+
+    /**
+     * Test permission against an integer value
+     * @param int $numPerm
+     * @return bool
+     * @throws \Exception
+     */
+    function testPermission($numPerm){
+        if(is_integer($numPerm) && ($numPerm < self::MASK)){
+            $numPerm = $numPerm & self::MASK;
+            if (($this->value !== 0) && $numPerm === 0) return false;
+            if (($this->value === 0) && $numPerm === self::DENY) return true;
+            if ( ($this->value & self::DENY ) === self::DENY) return false;
+            return (($this->value & $numPerm) === $numPerm);
+        }
+        else{
+            throw new \Exception("Unimplemented permission : " . $numPerm);
+        }
+    }
+
+    /**
+     * Set this permission as readable
+     * @param bool|true $value
+     */
+    function setRead($value = true){
+        if($value)
+            $this->value = $this->value | self::READ;
+        else{
+            $this->value = $this->value & (self::READ ^ self::MASK);
+        }
+    }
+
+    /**
+     * Set this permission as writeable
+     * @param bool|true $value
+     */
+    function setWrite($value = true){
+        if($value)
+            $this->value = $this->value | self::WRITE;
+        else{
+            $this->value = $this->value & (self::WRITE ^ self::MASK);
+        }
+    }
+
+    /**
+     * Set this permission as denied
+     * @param bool|true $value
+     */
+    function setDeny($value = true){
+        if($value)
+            $this->value = self::DENY;
+        else{
+            $this->value = $this->value & (self::DENY ^ self::MASK);
+        }
+    }
+
+    /**
+     * Override this permission value with the one passed in parameter
+     * @param AJXP_Permission $perm
+     * @return AJXP_Permission
+     */
+    function override($perm){
+        $newPerm = $perm->getCopy();
+        if($this->denies()){
+            $newPerm->setDeny();
+        }else{
+            if($this->canRead())
+                $newPerm->setRead();
+            if($this->canWrite())
+                $newPerm->setWrite();
+        }
+        return $newPerm;
+    }
+
+    /**
+     * @return string
+     */
+    function __toString(){
+        if($this->denies()) {
+            return "DENY";
+        }else if($this->canRead() && !$this->canWrite()) {
+            return "READONLY";
+        }else if(!$this->canRead() && $this->canWrite()) {
+            return "WRITEONLY";
+        }else{
+            return "READ WRITE";
+        }
+    }
+
+    /**
+     * Specify data which should be serialized to JSON
+     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+     * @return mixed data which can be serialized by <b>json_encode</b>,
+     * which is a value of any type other than a resource.
+     * @since 5.4.0
+     */
+    function jsonSerialize()
+    {
+        return array("read" => $this->canRead(), "write" => $this->canWrite(), "deny" => $this->denies());
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.access/src/Filter/AJXP_PermissionMask.php b/core/src/plugins/core.access/src/Filter/AJXP_PermissionMask.php
new file mode 100644
index 0000000000..10148555c5
--- /dev/null
+++ b/core/src/plugins/core.access/src/Filter/AJXP_PermissionMask.php
@@ -0,0 +1,321 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Core\Filter;
+
+use Pydio\Core\Utils\Vars\InputFilter;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class AJXP_PermissionMask
+ *
+ * Stores a mapping of path => AJXP_Permission that can be used as a mask on an existing folder structure.
+ *
+ * @package Pydio
+ * @subpackage Core
+ *
+ */
+class AJXP_PermissionMask implements \JsonSerializable, \Serializable
+{
+    /**
+     * @var array
+     */
+    private $permissionTree = array();
+
+    /**
+     * Initialize an empty mask, or from a serializedForm.
+     * @param array|null $serializedForm
+     */
+    function __construct($serializedForm = null){
+        if($serializedForm != null){
+            foreach($serializedForm as $path => $permissionValue){
+                $path = InputFilter::sanitize(InputFilter::securePath($path), InputFilter::SANITIZE_DIRNAME);
+                if(!is_array($permissionValue) || $permissionValue["children"]) continue;
+                $perm = new AJXP_Permission();
+                if($permissionValue["read"]) $perm->setRead();
+                if($permissionValue["write"]) $perm->setWrite();
+                if($permissionValue["deny"]) $perm->setDeny();
+                if($perm->isEmpty()) continue;
+                $this->updateBranch($path, $perm);
+            }
+        }
+    }
+
+    /**
+     * Returns the whole permission tree
+     * @return array
+     */
+    function getTree(){
+        if($this->permissionTree == null) return array();
+        return $this->permissionTree;
+    }
+
+    /**
+     * Set the permision tree at once
+     * @param array $tree
+     * @return AJXP_PermissionMask;
+     */
+    function updateTree($tree){
+        $this->permissionTree = $tree;
+        return $this;
+    }
+
+    /**
+     * Add a branch in the permissions tree
+     * @param string $path
+     * @param AJXP_Permission $permission
+     * @return AJXP_PermissionMask
+     */
+    function updateBranch($path, $permission){
+        // Update the tree
+        $this->permissionTree = $this->mergeTrees($this->permissionTree, $this->pathToBranch($path, $permission));
+        return $this;
+    }
+
+    /**
+     * Delete a branch from the permission tree
+     * @param string $path
+     * @return AJXP_PermissionMask
+     */
+    function deleteBranch($path){
+        // Update the tree
+        return $this;
+    }
+
+    /**
+     * Merge the current permission tree with the one passed in parameter. The latter takes precedence on the first.
+     * @param AJXP_PermissionMask $mask
+     * @return AJXP_PermissionMask
+     */
+    function override($mask){
+        // Return a new mask
+        $newMask = new AJXP_PermissionMask();
+        $newMask->updateTree($this->mergeTrees($this->permissionTree, $mask->getTree()));
+        return $newMask;
+    }
+
+    /**
+     * Copy the full tree from the one passed in parameter
+     * @param AJXP_PermissionMask $mask
+     * @return AJXP_PermissionMask
+     */
+
+    function copyMask($mask){
+        $this->updateTree($mask->getTree());
+    }
+
+    /**
+     * Test if a given path does have the given permission according to this mask permission tree.
+     * @param string $test
+     * @param  string $permission
+     * @return bool
+     */
+    function match($test, $permission){
+        // Check if a path has the given permission
+        $pathes = $this->flattenTree();
+
+        if(empty($test) || $test == "/" || $test == "/." || $test == "/..") {
+            if(!count($pathes)) return true;
+            if(isSet($pathes["/"])) {
+                $permObject = $pathes["/"];
+                // If not read or write, must be read at least for root
+                if($permObject->denies()) $permObject->setRead(true);
+                return $permObject->testPermission($permission);
+            }
+            if($permission == AJXP_Permission::READ) return true;
+            else if($permission == AJXP_Permission::WRITE) return false;
+            return true;
+        }
+
+        foreach($pathes as $path => $permObject){
+            if(strpos($test, rtrim($path, "/")."/") === 0 || $test === $path){
+                return $permObject->testPermission($permission);
+            }
+        }
+        // test is not under a defined permission, check if it needs traversal
+        foreach($pathes as $path => $permObject){
+            if(strpos($path, $test) === 0 && !$permObject->denies()){
+                if($permission == AJXP_Permission::READ) return true;
+                else if($permission == AJXP_Permission::WRITE) return false;
+                return $permObject->testPermission($permission);
+            }
+        }
+
+        // Not in any path
+        return false;
+
+    }
+
+    /**
+     * Merge two trees
+     * @param array $t1
+     * @param array $t2
+     * @return array
+     */
+    private function mergeTrees($t1, $t2){
+        $result = $t1;
+        foreach($t2 as $key => $value2){
+            if(!isset($t1[$key])){
+                // Add branch
+                $result[$key] = $value2;
+                continue;
+            }
+            $value1 = $t1[$key];
+            if(is_a($value1, "AJXP_Permission") && is_a($value2, "AJXP_Permission")){
+                /**
+                 * @var AJXP_Permission $value2
+                 */
+                $result[$key] = $value2->override($value1);
+            }else if(is_a($value1, "AJXP_Permission")){
+                $result[$key] = $value2;
+            }else if(is_a($value2, "AJXP_Permission")){
+                /**
+                 * @var AJXP_Permission $value2
+                 */
+                //if($value2->denies()) {
+                    $result[$key] = $value2;
+                //} else{
+                    // do nothing, keep original branch
+                //}
+            }else{
+                // Two arrays
+                $result[$key] = $this->mergeTrees($value1, $value2);
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Translate a path=> AJXP_Permission to an array-based branch.
+     * @param string $path
+     * @param AJXP_Permission $permission
+     * @return array
+     */
+    private function pathToBranch($path, $permission){
+        $parts = explode("/", trim($path, "/"));
+        $l = count($parts);
+        $br = array();
+        $current = &$br;
+        for($i=0;$i<$l; $i++){
+            if($i < $l - 1){
+                $current[$parts[$i]] = array();
+                $current = &$current[$parts[$i]];
+            }else{
+                $current[$parts[$i]] = $permission;
+            }
+        }
+        return $br;
+    }
+
+    /**
+     * Transform the permission tree into a flat structure of pathes => permissions.
+     * @param array|null $tree
+     * @param array|null $pathes
+     * @param string $currentRoot
+     * @return AJXP_Permission[]
+     */
+    public function flattenTree($tree = null, &$pathes = null, $currentRoot=""){
+        if($tree == null) $tree = $this->getTree();
+        if($pathes == null) $pathes = array();
+        if(!is_array($tree) || $tree == null) $tree = array();
+        foreach($tree as $pathPart => $value){
+            if(is_a($value, "AJXP_Permission")){
+                $pathes[$currentRoot."/".$pathPart] = $value;
+            }else{
+                $this->flattenTree($value, $pathes, $currentRoot."/".$pathPart);
+            }
+        }
+
+        return $pathes;
+    }
+
+
+    /**
+     * Print the tree as a string (for debug puprpose).
+     * @param $permissionTree
+     * @param $level
+     */
+    public function toStr($permissionTree, &$level)
+    {
+        $level = $level + 1;
+        foreach ($permissionTree as $key => $node) {
+
+            $this->printSpace($level);
+            echo "[" . $key . "]";
+            if ($node instanceof AJXP_Permission) echo "(".$node.")";
+
+            echo "\n";
+            if (is_array($node) && count($node) > 0) {
+                $permissionTree = $node;
+                $this->toStr($permissionTree, $level);
+            }
+
+        }
+        $level = $level - 1;
+        //echo "\n";
+    }
+
+    /**
+     * @param int $number
+     */
+    public function printSpace($number){
+        for ($i = 0; $i < $number; $i++){
+            echo "--";
+        }
+    }
+
+    /**
+     * Specify data which should be serialized to JSON
+     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+     * @return mixed data which can be serialized by <b>json_encode</b>,
+     * which is a value of any type other than a resource.
+     * @since 5.4.0
+     */
+    function jsonSerialize()
+    {
+        return $this->flattenTree();
+    }
+
+    /**
+     * String representation of object
+     * @link http://php.net/manual/en/serializable.serialize.php
+     * @return string the string representation of the object or null
+     * @since 5.1.0
+     */
+    public function serialize()
+    {
+        return serialize($this->permissionTree);
+    }
+
+    /**
+     * Constructs the object
+     * @link http://php.net/manual/en/serializable.unserialize.php
+     * @param string $serialized <p>
+     * The string representation of the object.
+     * </p>
+     * @return void
+     * @since 5.1.0
+     */
+    public function unserialize($serialized)
+    {
+        $this->permissionTree = unserialize($serialized);
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.access/src/Filter/ContentFilter.php b/core/src/plugins/core.access/src/Filter/ContentFilter.php
new file mode 100644
index 0000000000..b6b3c49faf
--- /dev/null
+++ b/core/src/plugins/core.access/src/Filter/ContentFilter.php
@@ -0,0 +1,153 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Core\Filter;
+
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Core\Utils\Vars\PathUtils;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Class ContentFilter
+ */
+class ContentFilter {
+
+    public $filters = array();
+    public $virtualPaths = array();
+
+    /**
+     * @param AJXP_Node[] $nodes
+     */
+    function __construct($nodes){
+        foreach($nodes as $n){
+            $virtualPath = $this->getVirtualPath($n->getPath());
+            $this->filters[$n->getPath()] = $virtualPath;
+        }
+        $this->virtualPaths = array_flip($this->filters);
+    }
+
+    /**
+     * @param $path
+     * @return string
+     */
+    private function getVirtualPath($path){
+        return "/".substr(md5($path), 0, 10)."/".basename($path);
+    }
+
+    /**
+     * @param UserSelection $userSelection
+     */
+    function filterUserSelection( &$userSelection ){
+        if($userSelection->isEmpty()){
+            foreach($this->filters as $path => $virtual){
+                $userSelection->addFile($path);
+            }
+        }else{
+            $newFiles = array();
+            foreach($userSelection->getFiles() as $f){
+                if(isSet($this->virtualPaths[$f])){
+                    $newFiles[] = $this->virtualPaths[$f];
+                }else{
+                    $testB = base64_decode($f);
+                    if(isSet($this->virtualPaths[$testB])){
+                        $newFiles[] = $this->virtualPaths[$testB];
+                    }
+                }
+            }
+            $userSelection->setFiles($newFiles);
+        }
+    }
+
+    /**
+     * @return mixed|string
+     */
+    function getBaseDir(){
+        return PathUtils::forwardSlashDirname(array_keys($this->filters)[0]);
+    }
+
+    /**
+     * Retrieves the path of the first object
+     * @return mixed|string
+     */
+    function getUniquePath(){
+        return PathUtils::forwardSlashBasename(array_keys($this->filters)[0]);
+    }
+
+    /**
+     * @param AJXP_Node $node
+     * @return String
+     */
+    function externalPath(AJXP_Node $node){
+        return $this->getVirtualPath($node->getPath());
+    }
+
+    /**
+     * @param String $vPath
+     * @return String mixed
+     */
+    function filterExternalPath($vPath){
+        if(isSet($this->virtualPaths) && isSet($this->virtualPaths[$vPath])){
+            return $this->virtualPaths[$vPath];
+        }
+        return $vPath;
+    }
+
+    /**
+     * @param String $oldPath
+     * @param String $newPath
+     * @return bool Operation result
+     */
+    public function movePath($oldPath, $newPath){
+
+        if(isSet($this->filters[$oldPath])){
+            $this->filters[$newPath] = $this->getVirtualPath($newPath);
+            unset($this->filters[$oldPath]);
+            $this->virtualPaths = array_flip($this->filters);
+            return true;
+        }
+        return false;
+
+    }
+
+    /**
+     * @return array public data as array, pre-utf8 encoded
+     */
+    public function toArray(){
+        $data = array("filters" => array(), "virtualPaths" => array());
+        foreach($this->filters as $k => $v){
+            $data["filters"][$k] = $v;
+        }
+        foreach($this->virtualPaths as $k => $v){
+            $data["virtualPaths"][$k] = $v;
+        }
+        return $data;
+    }
+
+    /**
+     * @param $filters
+     */
+    public function fromFilterArray($filters){
+        $this->filters = $filters;
+        $this->virtualPaths = array_flip($this->filters);
+    }
+
+} 
\ No newline at end of file
diff --git a/core/src/plugins/core.access/src/IAjxpWrapper.php b/core/src/plugins/core.access/src/IAjxpWrapper.php
new file mode 100644
index 0000000000..2fd662b1b3
--- /dev/null
+++ b/core/src/plugins/core.access/src/IAjxpWrapper.php
@@ -0,0 +1,226 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Core;
+
+use Pydio\Access\Core\Model\AJXP_Node;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Defines the methods that an access driver must implement to be considered as a file wrapper.
+ * @package Pydio
+ * @subpackage Core
+ * @interface AjxpWrapper
+ */
+interface IAjxpWrapper
+{
+    /**
+     * Get a "usable" reference to a file : the real file or a tmp copy.
+     *
+     * @param string $path
+     * @param bool $persistent
+     */
+    public static function getRealFSReference($path, $persistent = false);
+
+    /**
+     * @param AJXP_Node $node
+     * @return array
+     */
+    public static function getResolvedOptionsForNode($node);
+
+    /**
+     * Read a file (by chunks) and copy the data directly inside the given stream.
+     *
+     * @param string $path
+     * @param resource $stream
+     */
+    public static function copyFileInStream($path, $stream);
+
+    /**
+     * Chmod implementation for this type of access.
+     *
+     * @param string $path
+     * @param number $chmodValue
+     */
+    public static function changeMode($path, $chmodValue);
+
+    /**
+     * Describe whether the current wrapper operates on a remote server or not.
+     * @static
+     * @abstract
+     * @return boolean
+     */
+    public static function isRemote();
+
+    /**
+     * Describe whether the current wrapper can rewind a stream or not.
+     * @param String $url Url of the resource
+     * @static
+     * @abstract
+     * @return boolean
+     */
+    public static function isSeekable($url);
+
+    /**
+     *
+     *
+     * @return bool
+     */
+    public function dir_closedir();
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path
+     * @param int $options
+     * @return bool
+     */
+    public function dir_opendir($path , $options);
+
+    /**
+     * Enter description here...
+     *
+     * @return string
+     */
+    public function dir_readdir();
+
+    /**
+     * Enter description here...
+     *
+     * @return bool
+     */
+    public function dir_rewinddir();
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path
+     * @param int $mode
+     * @param int $options
+     * @return bool
+     */
+    public function mkdir($path , $mode , $options);
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path_from
+     * @param string $path_to
+     * @return bool
+     */
+    public function rename($path_from , $path_to);
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path
+     * @param int $options
+     * @return bool
+     */
+    public function rmdir($path , $options);
+
+    /**
+     * Enter description here...
+     *
+     */
+    public function stream_close();
+
+    /**
+     * Enter description here...
+     *
+     * @return bool
+     */
+    public function stream_eof();
+
+    /**
+     * Enter description here...
+     *
+     * @return bool
+     */
+    public function stream_flush();
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path
+     * @param string $mode
+     * @param int $options
+     * @param string &$opened_path
+     * @return bool
+     */
+    public function stream_open($path , $mode , $options , &$opened_path);
+
+    /**
+     * Enter description here...
+     *
+     * @param int $count
+     * @return string
+     */
+    public function stream_read($count);
+
+    /**
+     * Enter description here...
+     *
+     * @param int $offset
+     * @param int $whence = SEEK_SET
+     * @return bool
+     */
+    public function stream_seek($offset , $whence = SEEK_SET);
+
+    /**
+     * Enter description here...
+     *
+     * @return array
+     */
+    public function stream_stat();
+
+    /**
+     * Enter description here...
+     *
+     * @return int
+     */
+    public function stream_tell();
+
+    /**
+     * Enter description here...
+     *
+     * @param string $data
+     * @return int
+     */
+    public function stream_write($data);
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function unlink($path);
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path
+     * @param int $flags
+     * @return array
+     */
+    public function url_stat($path , $flags);
+}
diff --git a/core/src/plugins/core.access/src/IAjxpWrapperProvider.php b/core/src/plugins/core.access/src/IAjxpWrapperProvider.php
new file mode 100644
index 0000000000..8b2e33943a
--- /dev/null
+++ b/core/src/plugins/core.access/src/IAjxpWrapperProvider.php
@@ -0,0 +1,86 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Core;
+
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Core\Model\ContextInterface;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Interface must be implemented for access drivers that can be accessed via a wrapper protocol.
+ * @package Pydio
+ * @subpackage Core
+ * @interface AjxpWrapperProvider
+ */
+interface IAjxpWrapperProvider
+{
+    /**
+     * Convert a path (from the repository root) to a fully
+     * qualified ajaxplorer url like ajxp.protocol://repoId/path/to/node
+     * @param String $path
+     * @return String
+     */
+    public function getResourceUrl($path);
+
+    /**
+     * Creates a directory
+     * @param String $path
+     * @param String $newDirName
+     * @param bool $ignoreExists
+     * @param bool $recursive
+     * @return
+     */
+    public function mkDir($path, $newDirName, $ignoreExists=false, $recursive=false);
+
+    /**
+     * Creates an empty file
+     * @param AJXP_Node $node
+     * @param string $content
+     * @param bool $forceCreation
+     * @return
+     */
+    public function createEmptyFile(AJXP_Node $node, $content = "", $forceCreation = false);
+
+    /**
+     * @param AJXP_Node $from
+     * @param AJXP_Node $to
+     * @param Boolean $copy
+     */
+    public function nodeChanged(&$from = null, &$to  = null, $copy = false);
+
+    /**
+     * @param AJXP_Node $node
+     * @param null $newSize
+     * @return
+     */
+    public function nodeWillChange($node, $newSize = null);
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $nodePath
+     * @param $nodeName
+     * @param $isLeaf
+     * @param $lsOptions
+     * @return mixed
+     */
+    public function filterNodeName(ContextInterface $ctx, $nodePath, $nodeName, &$isLeaf, $lsOptions);
+}
diff --git a/core/src/plugins/core.access/src/MetaStreamWrapper.php b/core/src/plugins/core.access/src/MetaStreamWrapper.php
new file mode 100644
index 0000000000..ee2dad8b14
--- /dev/null
+++ b/core/src/plugins/core.access/src/MetaStreamWrapper.php
@@ -0,0 +1,697 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Access\Core;
+
+use Normalizer;
+use Pydio\Access\Core\Filter\ContentFilter;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Model\ContextInterface;
+
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Utils\Vars\PathUtils;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class MetaStreamWrapper
+ *
+ * Global streamWrapper that encapsulates all wrappers to access a driver's resource.
+ * Registered under the "pydio" protocol, it should replace all the old ajxp.XX direct calls.
+ * The static "appendMetaWrapper" method allows to add additional wrapper that will be sequentially called until
+ * reaching the driver ajxp.XX wrapper.
+ */
+class MetaStreamWrapper implements IAjxpWrapper
+{
+    /**
+     * @var resource
+     */
+    protected $handle;
+
+    /**
+     * @var string
+     */
+    protected $currentDirPath;
+
+    protected static $metaWrappers = [
+        'core' => [
+            'pydio' => 'Pydio\Access\Core\MetaStreamWrapper'
+        ],
+    ];
+
+    protected static $metaWrappersOrders = [
+        'core' => [
+            'pydio' => 0
+        ],
+    ];
+
+    protected static $cachedRepositoriesWrappers = array();
+
+    protected $currentUniquePath;
+
+    /**
+     * Register the stack of protocols/wrappers.
+     * @param null $registered_wrappers
+     */
+    public static function register($registered_wrappers = null){
+        if($registered_wrappers == null){
+            $registered_wrappers = stream_get_wrappers();
+        }
+        $it = new \RecursiveIteratorIterator(new \RecursiveArrayIterator(self::$metaWrappers));
+        foreach($it as $protocol => $className){
+            if(!in_array($protocol, $registered_wrappers)){
+                stream_wrapper_register($protocol, $className);
+            }
+        }
+    }
+
+
+    /**
+     * Check if a repository accessDriver declares a streamWrapper, and eventually register it.
+     * @param AJXP_Node $node
+     * @param bool $register
+     * @param array|null $streams
+     * @param array|bool  $streamData
+     * @return bool
+     */
+    public static function detectWrapperForNode(AJXP_Node $node, $register = false, &$streams = null, &$streamData = false){
+
+        $driverInstance = $node->getDriver();
+        if(!empty($driverInstance) && $driverInstance instanceof AbstractAccessDriver){
+            $plugin = $driverInstance;
+        }
+        if(empty($plugin)) {
+            return false;
+        }
+
+        $streamData = $plugin->detectStreamWrapper($register);
+        if (!$register && $streamData !== false && is_array($streams)) {
+            $accessType = $node->getRepository()->getAccessType();
+            $streams[$accessType] = $accessType;
+        }
+        return ($streamData !== false);
+
+    }
+
+    /**
+     * Register an addition protocol/wrapper in the stack
+     * @param $name string
+     * @param $className string
+     * @param int $order
+     * @param string $parent
+     * @throws PydioException
+     */
+    public static function appendMetaWrapper($name, $className, $order = 50, $parent = "core"){
+        if($order === 0){
+            throw new PydioException("Invalid argument: cannot use order 0 for registering a meta-wrapper.");
+        }
+        self::$metaWrappers[$parent][$name] = $className;
+        self::$metaWrappersOrders[$parent][$name] = $order;
+        $orders = self::$metaWrappersOrders[$parent];
+        uksort(self::$metaWrappers[$parent], function($a, $b) use ($orders){
+            $oA = $orders[$a];
+            $oB = $orders[$b];
+            if($oA === $oB) return 0;
+            return $oA > $oB ? 1 : -1;
+        });
+        self::register();
+    }
+
+    /**
+     * @param $scheme
+     * @return array
+     */
+    protected static function getMetaWrappers($scheme) {
+        return array_merge((array) self::$metaWrappers['core'], (array) self::$metaWrappers[$scheme]);
+    }
+
+    /**
+     * @param $url
+     * @param string $context
+     * @return mixed
+     * @throws \Exception
+     */
+    protected static function getNextScheme($url, $context='core'){
+        $parts = parse_url($url);
+        $metaWrapperKeys = array_keys(self::getMetaWrappers($context));
+        $key = array_search($parts["scheme"], $metaWrapperKeys);
+        if($key < count($metaWrapperKeys) - 1){
+            // Return next registered meta wrapper
+            return $metaWrapperKeys[$key + 1];
+        }else{
+            // Otherwise return repository wrapper
+            $data = self::actualRepositoryWrapperData(new AJXP_Node($url));
+            return $data["protocol"];
+        }
+    }
+
+    /**
+     * @param string $url
+     * @param MetaStreamWrapper $crtInstance
+     * @return string
+     * @throws \Exception
+     */
+    public static function translateScheme($url, $crtInstance = null){
+
+        $node               = new AJXP_Node($url);
+        $currentScheme      = $node->getScheme();
+        $context            = self::actualRepositoryWrapperProtocol($node);
+        $newScheme          = self::getNextScheme($url, $context);
+        $repository         = $node->getRepository();
+
+        if($currentScheme == "pydio" && $repository->hasContentFilter()){
+
+            $contentFilter = $repository->getContentFilter();
+
+            if ($contentFilter instanceof ContentFilter) {
+                $baseDir = $contentFilter->getBaseDir();
+
+                if ($crtInstance != null) {
+                    $crtInstance->currentUniquePath = $contentFilter->getUniquePath();
+                }
+
+                if (!empty($baseDir) || $baseDir != "/") {
+                    $crtPath = $node->getPath();
+                    if(empty($crtPath)){
+                        $crtPath = "/";
+                    }
+                    $crtBase = basename($crtPath);
+                    if (!empty($crtPath) && $crtPath != "/" && PathUtils::unPatchPathForBaseDir($crtBase) != $contentFilter->getUniquePath() && $crtBase != ".ajxp_meta") {
+                        throw new \Exception("Cannot find file " . $crtBase);
+                    }
+                    $url = $node->getContext()->getUrlBase().rtrim($baseDir.$crtPath, "/");
+                }
+            }
+        }
+
+        $newUrl = str_replace($currentScheme."://", $newScheme."://", $url);
+
+        self::applyInitPathHook($newUrl, $context);
+
+        return $newUrl;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $scheme
+     * @param string $context
+     * @return mixed|string
+     * @throws \Exception
+     */
+    protected static function findWrapperClassName(ContextInterface $ctx, $scheme, $context = "core"){
+
+        $metaWrappers = self::getMetaWrappers($context);
+
+        if(isSet($metaWrappers[$scheme])){
+            $wrapper = $metaWrappers[$scheme];
+        }else{
+            $wrapper = PluginsService::getInstance($ctx)->getWrapperClassName($scheme);
+        }
+        if(empty($wrapper)) {
+            throw new \Exception("Cannot find any wrapper for the scheme " . $scheme . " in context " . $context);
+        }
+        return $wrapper;
+    }
+
+    /**
+     * @param $url
+     * @return mixed|string
+     * @throws \Exception
+     */
+    protected static function findSubWrapperClassName($url){
+        $context = self::actualRepositoryWrapperProtocol(new AJXP_Node($url));
+        $nextScheme = self::getNextScheme($url, $context);
+        return self::findWrapperClassName(AJXP_Node::contextFromUrl($url), $nextScheme, $context);
+    }
+
+    /** @var $node AJXP_Node */
+    protected static function actualRepositoryWrapperData(AJXP_Node $node){
+        $repositoryId = $node->getRepositoryId();
+        if(isSet(self::$cachedRepositoriesWrappers[$repositoryId])){
+            return self::$cachedRepositoriesWrappers[$repositoryId];
+        }
+        $repository = RepositoryService::getRepositoryById($repositoryId);
+        if(!is_a($repository, "Repository")){
+            throw new \Exception("Cannot find repository with this id!");
+        }
+        if(self::detectWrapperForNode($node, false, $streams, $streamData)){
+            self::$cachedRepositoriesWrappers[$repositoryId] = $streamData;
+            return $streamData;
+        }else{
+            throw new \Exception("Repository does not provide a stream wrapper!");
+        }
+    }
+
+    /**
+     * Return the final ajxp.XX wrapper class name.
+     * @param $node AJXP_Node
+     * @return string mixed
+     * @throws \Exception
+     */
+    public static function actualRepositoryWrapperClass($node){
+        $data = self::actualRepositoryWrapperData($node);
+        return $data["classname"];
+    }
+
+    /**
+     * Return the final ajxp.XX wrapper protocol.
+     * @param $node AJXP_Node
+     * @return string mixed
+     * @throws \Exception
+     */
+    public static function actualRepositoryWrapperProtocol($node){
+        $data = self::actualRepositoryWrapperData($node);
+        return $data["protocol"];
+    }
+
+
+
+    /**
+     * Call Init function for a translated Path if defined
+     *
+     * @param string $path
+     */
+    public static function applyInitPathHook($path, $context = 'core') {
+        $currentScheme = parse_url($path, PHP_URL_SCHEME);
+        $wrapper = self::findWrapperClassName(AJXP_Node::contextFromUrl($path), $currentScheme, $context);
+
+        if (is_callable(array($wrapper, "applyInitPathHook"))) {
+            call_user_func(array($wrapper, "applyInitPathHook"), $path);
+        }
+    }
+
+    /**
+     * Get a "usable" reference to a file : the real file or a tmp copy.
+     *
+     * @param string $path
+     * @param bool $persistent
+     * @return string
+     * @throws \Exception
+     */
+    public static function getRealFSReference($path, $persistent = false)
+    {
+        $wrapper = self::findSubWrapperClassName($path);
+        return call_user_func(array($wrapper, "getRealFSReference"), self::translateScheme($path), $persistent);
+    }
+
+    /**
+     * Read a file (by chunks) and copy the data directly inside the given stream.
+     *
+     * @param string $path
+     * @param resource $stream
+     */
+    public static function copyFileInStream($path, $stream)
+    {
+        $wrapper = self::findSubWrapperClassName($path);
+        call_user_func(array($wrapper, "copyFileInStream"), self::translateScheme($path), $stream);
+        $meta = stream_get_meta_data($stream);
+        if(isSet($meta["uri"]) && $meta["uri"] === "php://output" && intval(ini_get("output_buffering")) > 0){
+            ob_end_flush();
+        }
+    }
+
+    /**
+     * Chmod implementation for this type of access.
+     *
+     * @param string $path
+     * @param number $chmodValue
+     */
+    public static function changeMode($path, $chmodValue)
+    {
+        $wrapper = self::findSubWrapperClassName($path);
+        call_user_func(array($wrapper, "changeMode"), self::translateScheme($path), $chmodValue);
+    }
+
+    /**
+     * Describe whether the current wrapper operates on a remote server or not.
+     * @static
+     * @return boolean
+     * @throws \Exception
+     */
+    public static function isRemote()
+    {
+        throw new \Exception("Do not call this method directly, but MetaStreamWrapper::wrapperIsRemote() instead");
+    }
+
+    /**
+     * Describe whether the current wrapper operates on a remote server or not.
+     * @param String $url Url of the resource
+     * @static
+     * @return boolean
+     * @throws \Exception
+     */
+    public static function isSeekable($url)
+    {
+        throw new \Exception("Do not call this method directly, but MetaStreamWrapper::wrapperIsSeekable() instead");
+    }
+
+    /**
+     * @param string $url
+     * @return boolean
+     */
+    public static function wrapperIsRemote($url){
+        return call_user_func(array(self::actualRepositoryWrapperClass(new AJXP_Node($url)), "isRemote"));
+    }
+
+    /**
+     * @param string $url
+     * @return boolean
+     */
+    public static function wrapperIsSeekable($url){
+        return call_user_func(array(self::actualRepositoryWrapperClass(new AJXP_Node($url)), "isSeekable"), $url);
+    }
+
+    /**
+     * @param $url1
+     * @param $url2
+     * @return bool
+     */
+    public static function nodesUseSameWrappers($url1, $url2){
+        $w1 = self::actualRepositoryWrapperClass(new AJXP_Node($url1));
+        $w2 = self::actualRepositoryWrapperClass(new AJXP_Node($url2));
+        return $w1 == $w2;
+    }
+
+    /**
+     *
+     *
+     * @return bool
+     */
+    public function dir_closedir()
+    {
+        if(isSet($this->handle) && is_resource($this->handle)){
+            closedir($this->handle);
+        }
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path
+     * @param int $options
+     * @return bool
+     */
+    public function dir_opendir($path, $options)
+    {
+        $newPath = self::translateScheme($path, $this);
+
+        $this->handle = opendir($newPath);
+        if($this->handle !== false){
+            $this->currentDirPath = parse_url($path, PHP_URL_PATH);
+            return true;
+        }else{
+            return false;
+        }
+    }
+
+    /**
+     * Standard readdir() implementation
+     *
+     * @return string
+     */
+    public function dir_readdir()
+    {
+        if(isSet($this->handle) && is_resource($this->handle)){
+            if($this->currentUniquePath != null){
+                return $this->innerReadDirFiltered($this->handle);
+            }else{
+                return readdir($this->handle);
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Skip values until correct one is found
+     * @param Resource $resource
+     * @return string
+     */
+    protected function innerReadDirFiltered($resource){
+        $test = readdir($resource);
+        if($test === false || $test == "." || $test == ".."){
+            return $test;
+        }
+        if (class_exists("Normalizer")) {
+            $test = Normalizer::normalize($test);
+        }
+        if($this->currentUniquePath == $test) {
+            return $test;
+        }
+        // Return next one
+        return $this->innerReadDirFiltered($resource);
+    }
+
+
+    /**
+     * Enter description here...
+     *
+     * @return bool
+     */
+    public function dir_rewinddir()
+    {
+        $this->currentDirPath = null;
+        if(isSet($this->handle) && is_resource($this->handle)){
+            return rewind($this->handle);
+        }
+        return false;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path
+     * @param int $mode
+     * @param int $options
+     * @return bool
+     */
+    public function mkdir($path, $mode, $options)
+    {
+        return mkdir($this->translateScheme($path), $mode, $options);
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path_from
+     * @param string $path_to
+     * @return bool
+     */
+    public function rename($path_from, $path_to)
+    {
+        return rename($this->translateScheme($path_from), $this->translateScheme($path_to));
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path
+     * @param int $options
+     * @return bool
+     */
+    public function rmdir($path, $options)
+    {
+        if(is_resource($options)){
+            return rmdir(MetaStreamWrapper::translateScheme($path), $options);
+        }else{
+            return rmdir(MetaStreamWrapper::translateScheme($path));
+        }
+    }
+
+    /**
+     * Enter description here...
+     *
+     */
+    public function stream_close()
+    {
+        if(isSet($this->handle) && is_resource($this->handle)){
+            return fclose($this->handle);
+        }
+        return false;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return bool
+     */
+    public function stream_eof()
+    {
+        if(isSet($this->handle) && is_resource($this->handle)){
+            return feof($this->handle);
+        }
+        return false;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return bool
+     */
+    public function stream_flush()
+    {
+        if(isSet($this->handle) && is_resource($this->handle)){
+            return fflush($this->handle);
+        }
+        return false;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path
+     * @param string $mode
+     * @param int $options
+     * @param string &$context
+     * @return bool
+     */
+    public function stream_open($path, $mode, $options, &$context)
+    {
+        if(is_resource($context)){
+            $this->handle = fopen($this->translateScheme($path), $mode, $options, $context);
+        }else{
+            $this->handle = fopen($this->translateScheme($path), $mode, $options);
+        }
+        return ($this->handle !== false);
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param int $count
+     * @return string
+     */
+    public function stream_read($count)
+    {
+        if(isSet($this->handle) && is_resource($this->handle)){
+            return fread($this->handle, $count);
+        }
+        return null;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param int $offset
+     * @param int $whence = SEEK_SET
+     * @return bool
+     */
+    public function stream_seek($offset, $whence = SEEK_SET)
+    {
+        if(isSet($this->handle) && is_resource($this->handle)){
+            return fseek($this->handle, $offset, $whence);
+        }
+        return false;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return array
+     */
+    public function stream_stat()
+    {
+        if(isSet($this->handle) && is_resource($this->handle)){
+            return fstat($this->handle);
+        }
+        return false;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return int
+     */
+    public function stream_tell()
+    {
+        if(isSet($this->handle) && is_resource($this->handle)){
+            return ftell($this->handle);
+        }
+        return false;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param string $data
+     * @return int
+     */
+    public function stream_write($data)
+    {
+        if(isSet($this->handle) && is_resource($this->handle)){
+            return fwrite($this->handle, $data);
+        }
+        return false;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function unlink($path)
+    {
+        return unlink($this->translateScheme($path));
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path
+     * @param int $flags
+     * @return array
+     */
+    public function url_stat($path, $flags)
+    {
+        $path = $this->translateScheme($path);
+
+        $stat = @stat($path);
+        if($stat === false) {
+            return null;
+        }
+        $bytesize = $stat["size"];
+        $wrapper = self::actualRepositoryWrapperClass(new AJXP_Node($path));
+        if(method_exists($wrapper, "getLastRealSize")){
+            $custom = call_user_func(array($wrapper, "getLastRealSize"));
+            if ($custom !== false) {
+                $bytesize = $custom;
+            }
+        }
+        if ($bytesize < 0) {
+            $bytesize = sprintf("%u", $bytesize);
+        }
+        $stat["size"] = $stat[7] = $bytesize;
+
+        return $stat;
+    }
+
+    /**
+     * @param AJXP_Node $node
+     * @return array
+     */
+    public static function getResolvedOptionsForNode($node)
+    {
+        $finalWrapper = self::actualRepositoryWrapperClass($node);
+        return call_user_func(array($finalWrapper, "getResolvedOptionsForNode"), $node);
+    }
+}
diff --git a/core/src/plugins/core.access/src/Model/AJXP_Node.php b/core/src/plugins/core.access/src/Model/AJXP_Node.php
new file mode 100644
index 0000000000..e6f03c3468
--- /dev/null
+++ b/core/src/plugins/core.access/src/Model/AJXP_Node.php
@@ -0,0 +1,813 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Core\Model;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Access\Core\MetaStreamWrapper;
+use Pydio\Access\Meta\Core\IFileHasher;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Model\ContextProviderInterface;
+use Pydio\Core\Model\RepositoryInterface;
+use Pydio\Core\Model\UserInterface;
+
+
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Utils\FileHelper;
+use Pydio\Access\Metastore\Core\IMetaStoreProvider;
+
+
+/**
+ * Atomic representation of a data. This the basic node of the hierarchical data.
+ * Encapsulates the path and url, the nature (leaf or not) and the metadata of the node.
+ * @package Pydio
+ * @subpackage Core
+ */
+class AJXP_Node implements \JsonSerializable, ContextProviderInterface
+{
+    /**
+     * @var string URL of the node in the form ajxp.protocol://repository_id/path/to/node
+     */
+    protected $_url;
+    /**
+     * @var array The node metadata
+     */
+    protected $_metadata = [];
+    /**
+     * @var string Associated wrapper
+     */
+    protected $_wrapperClassName;
+    /**
+     * @var array Parsed url fragments
+     */
+    protected $urlParts = [];
+    /**
+     * @var string A local representation of a real file, if possible
+     */
+    protected $realFilePointer;
+    /**
+     * @var bool Whether the core information of the node is already loaded or not
+     */
+    protected $nodeInfoLoaded = false;
+    /**
+     * @var string Details level passed to nodeLoadInfo()
+     */
+    protected $nodeInfoLevel = "minimal";
+    /**
+     * @var RepositoryInterface
+     */
+    private $_repository;
+    /**
+     * @var AbstractAccessDriver
+     */
+    private $_accessDriver;
+    /**
+     * @var IMetaStoreProvider
+     */
+    private $_metaStore;
+    /**
+     * @var IFileHasher
+     */
+    private $_fileHasher;
+
+    /**
+     * @var String
+     */
+    private $_user;
+
+    /**
+     * @var array
+     */
+    private $_indexableMetaKeys = [];
+
+    /**
+     * @var bool
+     */
+    private $_metadataBulkUpdate = false;
+
+    /**
+     * @param string $url URL of the node in the form ajxp.protocol://repository_id/path/to/node
+     * @param array $metadata Node metadata
+     */
+    public function __construct($url, $metadata = [])
+    {
+        $this->setUrl($url);
+        $this->_metadata = $metadata;
+    }
+
+    /**
+     * @return array
+     */
+    public function __sleep()
+    {
+        $t = array_diff(array_keys(get_class_vars("Pydio\\Access\\Core\\Model\\AJXP_Node")), ["_accessDriver", "_repository", "_metaStore"]);
+        return $t;
+    }
+
+    /**
+     * @param string $url
+     * @return ContextInterface
+     */
+    public static function contextFromUrl($url){
+        $n = new AJXP_Node($url);
+        return $n->getContext();
+    }
+
+    /**
+     * @param String $url of the node in the form ajxp.protocol://repository_id/path/to/node
+     * @return void
+     */
+    public function setUrl($url)
+    {
+        $url = rtrim($url, "/");
+        $this->_url = $url;
+        // Clean url
+        $testExp = explode("//", $url);
+        if (count($testExp) > 1) {
+            $this->_url = array_shift($testExp)."//";
+            $this->_url .= implode("/", $testExp);
+        }
+        $this->parseUrl();
+    }
+
+    /**
+     * @return RepositoryInterface
+     */
+    public function getRepository()
+    {
+        if (!isSet($this->_repository)) {
+            $this->_repository = RepositoryService::getRepositoryById($this->urlParts["host"]);
+        }
+        return $this->_repository;
+    }
+
+    /**
+     * @return ContextInterface
+     * @throws \Exception
+     */
+    public function getContext(){
+        if(empty($this->_user)){
+            throw new \Exception("Missing user in node URL");
+        }
+        $ctx = new Context($this->getUserId());
+        $ctx->setRepositoryObject($this->getRepository());
+        if(isSet($uObject)){
+            $ctx->setUserObject($uObject);
+        }
+        return $ctx;
+    }
+
+    /**
+     * @param string $pathSegment
+     * @return AJXP_Node
+     */
+    public function createChildNode($pathSegment){
+        $n = new AJXP_Node($this->getUrl()."/".$pathSegment);
+        return $n;
+    }
+
+    /**
+     * @return AbstractAccessDriver
+     */
+    public function getDriver()
+    {
+        if (!isSet($this->_accessDriver)) {
+            $repo = $this->getRepository();
+            if ($repo != null) {
+                $this->_accessDriver = $repo->getDriverInstance($this->getContext());
+            }
+        }
+        return $this->_accessDriver;
+    }
+
+    /**
+     * @param AbstractAccessDriver
+     */
+    public function setDriver($accessDriver)
+    {
+        $this->_accessDriver = $accessDriver;
+    }
+
+    /**
+     * @return IMetaStoreProvider
+     */
+    protected function getMetaStore()
+    {
+        if (!isSet($this->_metaStore)) {
+            $this->getDriver();
+            $this->_metaStore = PluginsService::getInstance($this->getContext())->getUniqueActivePluginForType("metastore");
+        }
+        return $this->_metaStore;
+    }
+
+    /**
+     * @return IFileHasher
+     */
+    protected function getFileHasher()
+    {
+        if (!isSet($this->_fileHasher)) {
+            $this->getDriver();
+            $hashers = PluginsService::getInstance($this->getContext())->getActivePluginsForType("meta");
+            if(is_array($hashers) && array_key_exists("filehasher", $hashers)){
+                $this->_fileHasher = $hashers["filehasher"];
+            }else{
+                $this->_fileHasher = false;
+            }
+        }
+        return $this->_fileHasher;
+    }
+
+    /**
+     * Check if there is currently a MetaStore provider set
+     * @return bool
+     */
+    public function hasMetaStore()
+    {
+        return ($this->getMetaStore() !== false);
+    }
+
+    /**
+     * Start a session of set / remove Metadata calls without applying the node.meta_change hook
+     */
+    public function startUpdatingMetadata(){
+        $this->_metadataBulkUpdate = true;
+    }
+
+    /**
+     * Finish updating the metadata and trigger the node.meta_change event
+     * @throws \Exception
+     */
+    public function finishedUpdatingMetadata(){
+        $this->_metadataBulkUpdate = false;
+        Controller::applyHook("node.meta_change", [&$this]);
+    }
+
+    /**
+     * @param $nameSpace
+     * @param $metaData
+     * @param bool $private
+     * @param int $scope
+     * @param bool $indexable
+     */
+    public function setMetadata($nameSpace, $metaData, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY, $indexable = false)
+    {
+        if(!$this->hasMetaStore()){
+            return;
+        }
+        $this->getMetaStore()->setMetadata($this, $nameSpace, $metaData, $private, $scope);
+        //$this->mergeMetadata($metaData);
+        if ($indexable) {
+            if(!isSet($this->_indexableMetaKeys[$private ? "user":"shared"]))$this->_indexableMetaKeys[$private ? "user":"shared"] = [];
+            $this->_indexableMetaKeys[$private ? "user":"shared"][$nameSpace] = $nameSpace;
+        }
+        if(!$this->_metadataBulkUpdate){
+            Controller::applyHook("node.meta_change", [&$this]);
+        }
+    }
+
+    /**
+     * @param String $nameSpace
+     * @param bool $private
+     * @param int $scope
+     * @param bool $indexable
+     */
+    public function removeMetadata($nameSpace, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY, $indexable = false)
+    {
+        if(!$this->hasMetaStore()){
+            return;
+        }
+        $this->getMetaStore()->removeMetadata($this, $nameSpace, $private, $scope);
+        if ($indexable && isSet($this->_indexableMetaKeys[$private ? "user":"shared"]) && isset($this->_indexableMetaKeys[$private ? "user":"shared"][$nameSpace])) {
+            unset($this->_indexableMetaKeys[$private ? "user":"shared"][$nameSpace]);
+        }
+        if(!$this->_metadataBulkUpdate) {
+            Controller::applyHook("node.meta_change", [&$this]);
+        }
+    }
+
+    /**
+     * @param String $nameSpace
+     * @param bool $private
+     * @param int $scope
+     * @param bool $indexable
+     * @return array
+     */
+    public function retrieveMetadata($nameSpace, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY, $indexable = false)
+    {
+        if(!$this->hasMetaStore()){
+            return [];
+        }
+        $data = $this->getMetaStore()->retrieveMetadata($this, $nameSpace, $private, $scope);
+        if (!empty($data) && $indexable) {
+            if(!isSet($this->_indexableMetaKeys[$private ? "user":"shared"]))$this->_indexableMetaKeys[$private ? "user":"shared"] = [];
+            $this->_indexableMetaKeys[$private ? "user":"shared"][$nameSpace] = $nameSpace;
+        }
+        return $data;
+    }
+
+    /**
+     * @param AJXP_Node $originalNode
+     * @param string $nameSpace
+     * @param string $operation
+     * @param bool $private
+     * @param int $scope
+     * @param bool $indexable
+     * @return array()
+     */
+    public function copyOrMoveMetadataFromNode($originalNode, $nameSpace, $operation="move", $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY, $indexable = false){
+
+        if($this->getMetaStore() == false || $this->getMetaStore()->inherentMetaMove()){
+            return [];
+        }
+        $metaData = $originalNode->retrieveMetadata($nameSpace, $private, $scope, $indexable);
+        if(isSet($metaData) && !empty($metaData)){
+            $this->setMetadata($nameSpace, $metaData, $private, $scope, $indexable);
+            if($operation == "move"){
+                $originalNode->removeMetadata($nameSpace, $private, $scope, $indexable);
+            }
+            return $metaData;
+        }
+        return [];
+
+    }
+
+    /**
+     * @return AJXP_Node|null
+     */
+    public function getParent(){
+
+        if(empty($this->urlParts["path"]) || $this->urlParts["path"] === "/"){
+            return null;
+        }
+        $parent = new AJXP_Node(dirname($this->_url));
+        $parent->setDriver($this->_accessDriver);
+        return $parent;
+
+    }
+
+
+    /**
+     * Search for metadata in parents, recursively
+     * @param $nameSpace
+     * @param bool $private
+     * @param int $scope
+     * @param bool $indexable
+     * @return array|bool
+     */
+    public function findMetadataInParent($nameSpace, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY, $indexable = false){
+
+        $metadata = false;
+        $parentNode = $this->getParent();
+        if($parentNode != null){
+            $metadata = $parentNode->retrieveMetadata($nameSpace, $private, $scope,$indexable);
+            if($metadata == false){
+                $metadata = $parentNode->findMetadataInParent($nameSpace, $private, $scope, $indexable);
+            }else{
+                $metadata["SOURCE_NODE"] = $parentNode;
+            }
+        }
+        return $metadata;
+
+    }
+
+    /**
+     * @param String $nameSpace
+     * @param bool $private
+     * @param int $scope
+     * @param bool $indexable
+     * @param array $collect
+     */
+    public function collectMetadataInParents($nameSpace, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY, $indexable = false, &$collect= []){
+
+        $parentNode = $this->getParent();
+        if($parentNode != null){
+            $metadata = $parentNode->retrieveMetadata($nameSpace, $private, $scope,$indexable);
+            if($metadata != false){
+                $metadata["SOURCE_NODE"] = $parentNode;
+                $collect[] = $metadata;
+            }
+            $parentNode->collectMetadataInParents($nameSpace, $private, $scope, $indexable, $collect);
+        }
+
+    }
+
+    /**
+     * @param array $nameSpaces
+     * @param bool $private
+     * @param int $scope
+     * @param bool $indexable
+     * @param array $collect
+     */
+    public function collectMetadatasInParents($nameSpaces, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY, $indexable = false, &$collect= []){
+
+        $parentNode = $this->getParent();
+        if($parentNode != null){
+            $nodeMeta = [];
+            foreach($nameSpaces as $nameSpace){
+                $metadata = $parentNode->retrieveMetadata($nameSpace, $private, $scope,$indexable);
+                if($metadata != false){
+                    $nodeMeta[$nameSpace] = $metadata;
+                }
+            }
+            if(count($nodeMeta)){
+                $nodeMeta["SOURCE_NODE"] = $parentNode;
+                $collect[] = $nodeMeta;
+            }
+            $parentNode->collectMetadatasInParents($nameSpaces, $private, $scope, $indexable, $collect);
+        }
+
+    }
+
+    /**
+     * @param $nameSpace
+     * @param $userScope
+     * @return array
+     */
+    public function collectRepositoryMetadatasInChildren($nameSpace, $userScope){
+        $result = [];
+        $metaStore = $this->getMetaStore();
+        if($metaStore !== false && method_exists($metaStore, "collectChildrenWithRepositoryMeta")){
+            $result = $metaStore->collectChildrenWithRepositoryMeta($this, $nameSpace, $userScope);
+        }
+        return $result;
+    }
+
+    /**
+     * @return void
+     */
+    public function loadHash(){
+        if($this->getFileHasher() !== false){
+            $this->getFileHasher()->getFileHash($this);
+        }
+    }
+
+    /**
+     * @param bool $boolean Leaf or Collection?
+     * @return void
+     */
+    public function setLeaf($boolean)
+    {
+        $this->_metadata["is_file"] = $boolean;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isLeaf()
+    {
+        return isSet($this->_metadata["is_file"])?$this->_metadata["is_file"]:true;
+    }
+
+    /**
+     * @param $label String Main label, will set the metadata "text" key.
+     * @return void
+     */
+    public function setLabel($label)
+    {
+        $this->_metadata["text"] = $label;
+    }
+
+    /**
+     * @return string Try to get the metadata "text" key, or the basename of the node path.
+     */
+    public function getLabel()
+    {
+        return isSet($this->_metadata["text"])? $this->_metadata["text"] : basename($this->urlParts["path"]);
+    }
+
+    /**
+     * @return string
+     */
+    public function getExtension(){
+        return strtolower(pathinfo($this->urlParts["path"], PATHINFO_EXTENSION));
+    }
+
+    /**
+     * @param $string
+     * @return bool
+     */
+    public function hasExtension($string){
+        return strcasecmp($string, $this->getExtension()) == 0;
+    }
+
+    /**
+     * List all set metadata keys
+     * @return array
+     */
+    public function listMetaKeys()
+    {
+        return array_keys($this->_metadata);
+    }
+
+    /**
+     * Applies the "node.info" hook, thus going through the plugins that have registered this node, and loading
+     * all metadata at once.
+     * @param bool $forceRefresh
+     * @param bool $contextNode The parent node, if it can be useful for the hooks callbacks
+     * @param mixed $details A specification of expected metadata fields, or minimal
+     * @return void
+     */
+    public function loadNodeInfo($forceRefresh = false, $contextNode = false, $details = false)
+    {
+        if($this->nodeInfoLoaded && $this->nodeInfoLevel != $details){
+            $forceRefresh = true;
+        }
+        if($this->nodeInfoLoaded && !$forceRefresh){
+            return;
+        }
+        if (!empty($this->_wrapperClassName)) {
+            $registered = PluginsService::getInstance($this->getContext())->getRegisteredWrappers();
+            if (!isSet($registered[$this->getScheme()])) {
+                $driver = $this->getDriver();
+                if(is_object($driver)) $driver->detectStreamWrapper(true, $this->getContext());
+            }
+        }
+        Controller::applyHook("node.info.start", [&$this, $contextNode, $details, $forceRefresh]);
+        if($this->nodeInfoLoaded && !$forceRefresh && (isSet($this->_metadata["ajxp_mime"]) || isSet($this->_metadata["mimestring_id"]))){
+            Controller::applyHook("node.info.nocache", [&$this, $contextNode, $details, $forceRefresh]);
+            return;
+        }
+        Controller::applyHook("node.info", [&$this, $contextNode, $details, $forceRefresh]);
+        Controller::applyHook("node.info.end", [&$this, $contextNode, $details, $forceRefresh]);
+        Controller::applyHook("node.info.nocache", [&$this, $contextNode, $details, $forceRefresh]);
+        $this->nodeInfoLoaded = true;
+        $this->nodeInfoLevel = $details;
+    }
+
+    /**
+     * Get a real reference to the filesystem. Remote wrappers will copy the file locally.
+     * This will last the time of the script and will be removed afterward.
+     * @return string
+     */
+    public function getRealFile()
+    {
+        if (!isset($this->realFilePointer)) {
+        $this->realFilePointer = MetaStreamWrapper::getRealFSReference($this->_url, true);
+            $isRemote = MetaStreamWrapper::wrapperIsRemote($this->_url);
+            if ($isRemote) {
+                register_shutdown_function(function(){
+                    FileHelper::silentUnlink($this->realFilePointer);
+                });
+
+            }
+        }
+        return $this->realFilePointer;
+    }
+
+    /**
+     * Check if node wrapper is local or remote
+     * @return bool
+     */
+    public function wrapperIsRemote(){
+        return MetaStreamWrapper::wrapperIsRemote($this->_url);
+    }
+
+    /**
+     * @return string URL of the node in the form ajxp.protocol://repository_id/path/to/node
+     */
+    public function getUrl()
+    {
+        return $this->_url;
+    }
+
+    /**
+     * @return string The path from the root of the repository
+     */
+    public function getPath()
+    {
+        return !empty($this->urlParts["path"]) ? $this->urlParts["path"] : "/";
+    }
+
+    /**
+     * @return bool
+     */
+    public function isRoot()
+    {
+        return !isset($this->urlParts["path"]) || $this->urlParts["path"] == "/";
+    }
+
+    /**
+     * @return string The scheme part of the url
+     */
+    public function getScheme()
+    {
+        return $this->urlParts["scheme"];
+    }
+
+    /**
+     * @return string A username
+     */
+    public function getUserId(){
+        return $this->_user;
+    }
+
+    /**
+     * @return UserInterface
+     */
+    public function getUser(){
+        return $this->getContext()->getUser();
+    }
+
+    /**
+     * @param string $userId A username
+     */
+    public function setUserId($userId){
+        // Update url with a user@workspaceID
+        $this->_user = $userId;
+        $this->urlParts["user"] = $userId;
+        $this->setUrl($this->getScheme()."://".$this->_user."@".$this->getRepositoryId().$this->getPath());
+    }
+
+    /**
+     * @return string A username passed through url
+     */
+    public function hasUser(){
+        return isSet($this->_user);
+    }
+
+    /**
+     * @return string The repository identifer
+     */
+    public function getRepositoryId()
+    {
+        return $this->urlParts["host"];
+    }
+
+    /**
+     * Pass an array of metadata and merge its content with the current metadata.
+     * @param array $metadata
+     * @param bool $mergeValues
+     * @return void
+     */
+    public function mergeMetadata($metadata, $mergeValues = false)
+    {
+        if ($mergeValues) {
+            foreach ($metadata as $key => $value) {
+                if (isSet($this->_metadata[$key])) {
+                    $existingValue = explode(",", $this->_metadata[$key]);
+                    if (!in_array($value, $existingValue)) {
+                        array_push($existingValue, $value);
+                        $this->_metadata[$key] = implode(",", $existingValue);
+                    }
+                } else {
+                    $this->_metadata[$key] = $value;
+                }
+            }
+        } else {
+            $this->_metadata = array_merge($this->_metadata, $metadata);
+        }
+    }
+
+    /**
+     * Return all metadata loaded during node.info, mainly used for caching.
+     * @return array
+     */
+    public function getNodeInfoMeta(){
+        return $this->_metadata;
+    }
+
+    /**
+     * Set nodeInfoLoaded to true from external.
+     * @param string $level
+     */
+    public function setInfoLoaded($level){
+        $this->nodeInfoLoaded = true;
+        $this->nodeInfoLevel = $level;
+    }
+
+    /**
+     * Try the size of collection recursively.
+     * Will trigger the node.size.recursive hook, allowing certain plugins
+     * to perform the operation if they have the information (e.g. meta.syncable).
+     * Otherwise will use the directoryUsage() method of the accessDriver.
+     * @return int|mixed
+     */
+    public function getSizeRecursive(){
+        $this->loadNodeInfo();
+        if($this->isLeaf()){
+            return $this->_metadata["bytesize"];
+        }else{
+            $result = -1;
+            Controller::applyHook("node.size.recursive", [&$this, &$result]);
+            if($result == -1){
+                try{
+                    return $this->getDriver()->directoryUsage($this);
+                }catch(\Exception $e){
+                    return -1;
+                }
+            }else{
+                return $result;
+            }
+        }
+    }
+
+    /**
+     * Magic getter for metadata
+     * @param $varName
+     * @return array|null|string
+     */
+    public function __get($varName)
+    {
+        if(strtolower($varName) == "wrapperclassname") return $this->_wrapperClassName;
+        if(strtolower($varName) == "url") return $this->_url;
+        if(strtolower($varName) == "metadata") return $this->_metadata;
+        if(strtolower($varName) == "indexablemetakeys") return $this->_indexableMetaKeys;
+
+        if (isSet($this->_metadata[$varName])) {
+            return $this->_metadata[$varName];
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Magic setter for metadata
+     * @param $metaName
+     * @param $metaValue
+     * @return void
+     */
+    public function __set($metaName, $metaValue)
+    {
+        if (strtolower($metaName) == "metadata") {
+            $this->_metadata = $metaValue;
+            return;
+        }
+        if($metaValue == null) unset($this->_metadata[$metaName]);
+        else $this->_metadata[$metaName] = $metaValue;
+    }
+
+    /**
+     * Safe parseUrl implementation
+     * @return void
+     */
+    protected function parseUrl()
+    {
+        if (strstr($this->_url, "#") !== false) {
+            $url = str_replace("#", "__HASH__", $this->_url);
+            $this->urlParts = parse_url($url);
+            foreach ($this->urlParts as $partKey => $partValue) {
+                $this->urlParts[$partKey] = str_replace("__HASH__", "#", $partValue);
+            }
+        } else {
+            $this->urlParts = parse_url($this->_url);
+        }
+        if(isSet($this->urlParts["user"])){
+            $this->_user = $this->urlParts["user"];
+        }
+
+        if (strstr($this->urlParts["scheme"], "ajxp.")!==false) {
+            $pServ = PluginsService::getInstance($this->getContext());
+            $this->_wrapperClassName = $pServ->getWrapperClassName($this->urlParts["scheme"]);
+        }else if($this->urlParts["scheme"] == "pydio"){
+            $this->_wrapperClassName = "Pydio\\Access\\Core\\MetaStreamWrapper";
+        }
+    }
+
+    /**
+     * Specify data which should be serialized to JSON
+     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+     * @return mixed data which can be serialized by <b>json_encode</b>,
+     * which is a value of any type other than a resource.
+     * @since 5.4.0
+     */
+    function jsonSerialize()
+    {
+        $data = $this->_metadata;
+        unset($data["filename"]);
+        $data["path"] = $this->_metadata["filename"];
+        if(empty($data["path"]) && !empty($this->urlParts["path"])){
+            $data["path"] = $this->urlParts["path"];
+        }
+        if(isSet($this->_metadata["is_file"])){
+            unset($data["is_file"]);
+            $data["type"] = $this->isLeaf() ? "leaf" : "collection";
+        }
+        if(isSet($this->_metadata["text"])){
+            unset($data["text"]);
+            $data["label"] = $this->getLabel();
+        }
+        return $data;
+    }
+}
diff --git a/core/src/plugins/core.access/src/Model/NodesDiff.php b/core/src/plugins/core.access/src/Model/NodesDiff.php
new file mode 100644
index 0000000000..a7d3352b97
--- /dev/null
+++ b/core/src/plugins/core.access/src/Model/NodesDiff.php
@@ -0,0 +1,193 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Core\Model;
+
+use Pydio\Core\Utils\Vars\XMLFilter;
+use Pydio\Core\Http\Response\JSONSerializableResponseChunk;
+use Pydio\Core\Http\Response\XMLSerializableResponseChunk;
+
+use Pydio\Core\Serializer\NodeXML;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Utils\Vars\StringHelper;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class NodesDiff
+ * Http Response describing a node change in the datamodel
+ * @package Pydio\Access\Core\Model
+ */
+class NodesDiff implements XMLSerializableResponseChunk, JSONSerializableResponseChunk
+{
+    /**
+     * @var AJXP_Node[] Array of new nodes added, indexes are numeric.
+     */
+    private $added;
+
+    /**
+     * @var AJXP_Node[] Array of nodes updated, INDEXED by their original path.
+     */
+    private $updated;
+
+    /**
+     * @var string[] Array of removed nodes PATHES.
+     */
+    private $removed;
+
+    /**
+     * NodesDiff constructor.
+     */
+    public function __construct()
+    {
+        $this->added = [];
+        $this->updated = [];
+        $this->removed = [];
+    }
+
+    /**
+     * @return bool
+     */
+    public function isEmpty(){
+        return !(count($this->added) || count($this->updated) || count($this->removed));
+    }
+
+    /**
+     * @param AJXP_Node|AJXP_Node[] $nodes
+     * @return NodesDiff
+     */
+    public function add($nodes){
+        if(!is_array($nodes)) $nodes = [$nodes];
+        $this->added = array_merge($this->added, $nodes);
+        return $this;
+    }
+
+    /**
+     * @param AJXP_Node|AJXP_Node[] $nodes
+     * @param string|null $originalPath
+     * @return NodesDiff
+     */
+    public function update($nodes, $originalPath = null){
+        if(!is_array($nodes)) {
+            if($originalPath === null){
+                $originalPath = $nodes->getPath();
+            }
+            $nodes = [$originalPath => $nodes];
+        }
+        $this->updated = array_merge($this->updated, $nodes);
+        return $this;
+    }
+
+    /**
+     * @param string|string[] $nodePathes
+     * @return NodesDiff
+     */
+    public function remove($nodePathes){
+        if(!is_array($nodePathes)) $nodePathes = [$nodePathes];
+        $this->removed = array_merge($this->removed, $nodePathes);
+        return $this;
+    }
+
+    /**
+     * @param AJXP_Node $ajxpNode
+     */
+    protected function forceLoadNodeInfo(&$ajxpNode){
+        $mess = LocaleService::getMessages();
+        $ajxpNode->loadNodeInfo(false, false, "all");
+        if (!empty($ajxpNode->metaData["mimestring_id"]) && array_key_exists($ajxpNode->metaData["mimestring_id"], $mess)) {
+            $ajxpNode->mergeMetadata(array("mimestring" =>  $mess[$ajxpNode->metaData["mimestring_id"]]));
+        }
+        // Add Repository to the metadata
+        $ajxpNode->mergeMetadata(array("node_repository_id" => $ajxpNode->getRepositoryId()));
+    }
+
+    /**
+     * @return string
+     */
+    public function toXML()
+    {
+        $buffer = "<nodes_diff>";
+        if (count($this->removed)) {
+            $buffer .= "<remove>";
+            foreach ($this->removed as $nodePath) {
+                $nodePath = StringHelper::xmlEntities($nodePath, true);
+                $buffer .= "<tree filename=\"$nodePath\" ajxp_im_time=\"".time()."\"/>";
+            }
+            $buffer .= "</remove>";
+        }
+        if (count($this->added)) {
+            $buffer .= "<add>";
+            foreach ($this->added as $ajxpNode) {
+                $this->forceLoadNodeInfo($ajxpNode);
+                $buffer .= NodeXML::toXML($ajxpNode, true);
+            }
+            $buffer .= "</add>";
+        }
+        if (count($this->updated)) {
+            $buffer .= "<update>";
+            foreach ($this->updated as $originalPath => $ajxpNode) {
+                $this->forceLoadNodeInfo($ajxpNode);
+                $ajxpNode->original_path = $originalPath;
+                $buffer .= NodeXML::toXML($ajxpNode, true);
+            }
+            $buffer .= "</update>";
+        }
+        $buffer .= "</nodes_diff>";
+        return $buffer;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function jsonSerializableData()
+    {
+        $output = [];
+        if (count($this->removed)) {
+            $output['remove'] = [];
+            foreach ($this->removed as $nodePath) {
+                $output['remove'][] = ["path"=>$nodePath, "ajxp_im_time"=>time()];
+            }
+        }
+        if (count($this->added)) {
+            $output['add'] = [];
+            foreach ($this->added as $ajxpNode) {
+                $this->forceLoadNodeInfo($ajxpNode);
+                $output['add'][] = $ajxpNode;
+            }
+        }
+        if (count($this->updated)) {
+            $output['update'] = [];
+            foreach ($this->updated as $originalPath => $ajxpNode) {
+                $this->forceLoadNodeInfo($ajxpNode);
+                $ajxpNode->original_path = $originalPath;
+                $output['update'][] = $ajxpNode;
+            }
+        }
+        return $output;
+    }
+
+    /**
+     * @return string
+     */
+    public function jsonSerializableKey()
+    {
+        return "nodesDiff";
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.access/src/Model/NodesList.php b/core/src/plugins/core.access/src/Model/NodesList.php
new file mode 100644
index 0000000000..8a357a50f0
--- /dev/null
+++ b/core/src/plugins/core.access/src/Model/NodesList.php
@@ -0,0 +1,313 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Core\Model;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+use Pydio\Core\Utils\Vars\XMLFilter;
+use Pydio\Core\Http\Response\CLISerializableResponseChunk;
+use Pydio\Core\Http\Response\JSONSerializableResponseChunk;
+use Pydio\Core\Http\Response\XMLDocSerializableResponseChunk;
+use Pydio\Core\Serializer\NodeXML;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Utils\XMLHelper;
+use Symfony\Component\Console\Helper\Table;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * Class NodesList
+ * @package Pydio\Access\Core\Model
+ */
+class NodesList implements XMLDocSerializableResponseChunk, JSONSerializableResponseChunk, CLISerializableResponseChunk
+{
+
+    /**
+     * @var AJXP_Node
+     */
+    private $parentNode;
+    /**
+     * @var (AJXP_Node|NodesList)[]
+     */
+    private $children = array();
+
+    private $isRoot = true;
+
+    private $paginationData;
+
+    private $columnsDescription;
+
+    /**
+     * NodesList constructor.
+     * @param string $rootPath
+     */
+    public function __construct($rootPath = "/"){
+        // Create a fake parent node by default, without label
+        $this->parentNode = new AJXP_Node($rootPath, ["text" => "", "is_file" => false]);
+    }
+
+    /**
+     * @param AJXP_Node $parentNode
+     */
+    public function setParentNode(AJXP_Node $parentNode){
+        $this->parentNode = $parentNode;
+    }
+    /**
+     * @param AJXP_Node|NodesList $nodeOrList
+     */
+    public function addBranch($nodeOrList){
+        $this->children[] = $nodeOrList;
+        if($nodeOrList instanceof NodesList){
+            $nodeOrList->setRoot(false);
+        }
+    }
+
+    /**
+     * @return AJXP_Node[]|NodesList[]
+     */
+    public function getChildren(){
+        return $this->children;
+    }
+
+    /**
+     * @param $path
+     * @return AJXP_Node
+     */
+    public function findChildByPath( $path ){
+        return array_shift(array_filter($this->children, function($child) use ($path){
+            return ($child instanceof AJXP_Node && $child->getPath() == $path);
+        }));
+    }
+
+    /**
+     * @param $count
+     * @param $currentPage
+     * @param $totalPages
+     * @param int $dirsCount
+     * @param null $remoteSortAttributes
+     */
+    public function setPaginationData($count, $currentPage, $totalPages, $dirsCount = -1, $remoteSortAttributes = null){
+        $this->paginationData = [
+            'count' => $count,
+            'current' => $currentPage,
+            'total'   => $totalPages,
+            'dirs'   => $dirsCount,
+            'remoteSort' => $remoteSortAttributes
+        ];
+    }
+
+    /**
+     * @param $bool
+     */
+    public function setRoot($bool){
+        $this->isRoot = $bool;
+    }
+
+    /**
+     * @return string
+     */
+    public function toXML()
+    {
+        $buffer  = "";
+        $buffer .= NodeXML::toXML($this->parentNode, false);
+        if(isSet($this->paginationData)){
+            $buffer .= $this->renderPaginationData(
+                $this->paginationData["count"],
+                $this->paginationData["current"],
+                $this->paginationData["total"],
+                $this->paginationData["dirs"],
+                $this->paginationData["remoteSort"]);
+        }
+        if(isSet($this->columnsDescription)){
+            $xmlChildren = [];
+            foreach($this->columnsDescription['columns'] as $column){
+                $xmlChildren[] = XMLHelper::toXmlElement("column", $column);
+            }
+            $xmlConfig = XMLHelper::toXmlElement("columns", $this->columnsDescription['description'], implode("", $xmlChildren));
+            $xmlConfig = XMLHelper::toXmlElement("component_config", ["className" => "FilesList"], $xmlConfig);
+            $buffer .= XMLHelper::toXmlElement("client_configs", [], $xmlConfig);
+        }
+        foreach ($this->children as $child){
+            if($child instanceof NodesList){
+                $buffer .= $child->toXML();
+            }else{
+                $buffer .= NodeXML::toXML($child, true);
+            }
+        }
+        $buffer .= "</tree>";
+        return $buffer;
+    }
+
+    /**
+     * @param string $switchGridMode
+     * @param string $switchDisplayMode
+     * @param string $templateName
+     * @return $this
+     */
+    public function initColumnsData($switchGridMode='', $switchDisplayMode='', $templateName=''){
+        $this->columnsDescription = [
+            'description' => ['switchGridMode' => $switchGridMode, 'switchDisplayMode' => $switchDisplayMode, 'template_name' => $templateName],
+            'columns'     => []
+        ];
+        return $this;
+    }
+
+    /**
+     * @param string $messageId
+     * @param string $attributeName
+     * @param string $sortType
+     * @param string $width
+     * @return $this
+     */
+    public function appendColumn($messageId, $attributeName, $sortType='String', $width=''){
+        $this->columnsDescription['columns'][] = [
+            'messageId'     => $messageId,
+            'attributeName' => $attributeName,
+            'sortType'      => $sortType,
+            'width'         => $width
+        ];
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function jsonSerializableData()
+    {
+        $children = [];
+        foreach ($this->children as $child){
+            if($child instanceof NodesList){
+                $children[$child->jsonSerializableKey()] = $child->jsonSerializableData();
+            }else{
+                $children[$child->getPath()] = $child;
+            }
+        }
+        if(isSet($this->paginationData)){
+            return [
+                "pagination" => $this->paginationData,
+                "data"      => ["node" => $this->parentNode, "children" => $children]
+            ];
+        }else{
+            return [ "node" => $this->parentNode, "children" => $children];
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function jsonSerializableKey()
+    {
+        return $this->parentNode->getPath();
+    }
+
+    /**
+     * @return string
+     */
+    public function getCharset()
+    {
+        return "UTF-8";
+    }
+
+    /**
+     * @param OutputInterface $output
+     * @return mixed
+     */
+    public function render($output)
+    {
+        // If recursive, back to JSON for the moment
+        $recursive = false;
+        foreach($this->children as $child){
+            if($child instanceof NodesList){
+                $recursive = true;
+            }
+        }
+        if($recursive){
+            $data = $this->jsonSerializableData();
+            $output->writeln(json_encode($data, JSON_PRETTY_PRINT));
+            return;
+        }
+
+        $table      = new Table($output);
+        $headers    = [];
+        $rows       = [];
+
+        // Prepare Headers
+        if(isSet($this->columnsDescription["columns"])){
+            $messages = LocaleService::getMessages();
+            foreach($this->columnsDescription["columns"] as $column){
+                $colTitle = $messages[$column["messageId"]];
+                $collAttr = $column["attributeName"];
+                $headers[$collAttr] = $colTitle;
+            }
+        }else if(count($this->children)){
+            /** @var AJXP_Node $firstNode */
+            $firstNode = $this->children[0];
+            $headers["text"] = "Label"; //$firstNode->getLabel();
+            $meta = $firstNode->getNodeInfoMeta();
+            foreach($meta as $attName => $value){
+                if(in_array($attName, ["text", "ajxp_description"])) continue;
+                if($attName === "filename") {
+                    $headers[$attName] = "Path";
+                }else{
+                    $headers[$attName] = ucfirst($attName);
+                }
+            }
+        }else{
+            $headers["h"] = "No results found";
+        }
+        $table->setHeaders(array_values($headers));
+
+        // Prepare Rows
+        foreach($this->children as $child){
+            $row = [];
+            foreach($headers as $attName => $label){
+                if($attName === "text" || $attName === "ajxp_label") $row[] = $child->getLabel();
+                else if($attName === "is_file") $row[] = $child->isLeaf() ? "True" : "False";
+                else $row[] = $child->$attName;
+            }
+            $rows[] = $row;
+        }
+        $table->setRows($rows);
+
+        // Render
+        $table->render();
+    }
+
+    /**
+     * Ouput the <pagination> tag
+     * @static
+     * @param integer $count
+     * @param integer $currentPage
+     * @param integer $totalPages
+     * @param integer $dirsCount
+     * @param null $remoteSortAttributes
+     * @return void|string
+     */
+    private function renderPaginationData($count, $currentPage, $totalPages, $dirsCount = -1, $remoteSortAttributes = null)
+    {
+        $remoteSortString = "";
+        if (is_array($remoteSortAttributes)) {
+            foreach($remoteSortAttributes as $k => $v) $remoteSortString .= " $k='$v'";
+        }
+        return '<pagination count="'.$count.'" total="'.$totalPages.'" current="'.$currentPage.'" overflowMessage="'.$currentPage."/".$totalPages.'" icon="folder.png" openicon="folder_open.png" dirsCount="'.$dirsCount.'"'.$remoteSortString.'/>';
+    }
+
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.access/src/Model/Repository.php b/core/src/plugins/core.access/src/Model/Repository.php
new file mode 100644
index 0000000000..c64bb2855f
--- /dev/null
+++ b/core/src/plugins/core.access/src/Model/Repository.php
@@ -0,0 +1,724 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Core\Model;
+
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Access\Core\Filter\ContentFilter;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Exception\RepositoryLoadException;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Model\RepositoryInterface;
+
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\StatHelper;
+use Pydio\Core\Utils\Vars\StringHelper;
+
+use Pydio\Core\Utils\Vars\VarsFilter;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+define('AJXP_REPOSITORY_TYPE_LOCAL', 'local');
+
+/**
+ * Class Repository
+ * @package Pydio\Access\Core\Model
+ */
+class Repository implements RepositoryInterface
+{
+    /**
+     * @var string
+     */
+    public $uuid;
+    /**
+     * @var string
+     */
+    public $id;
+    /**
+     * @var string
+     */
+    public $path;
+    /**
+     * @var string
+     */
+    public $display;
+    /**
+     * @var string
+     */
+    public $displayStringId;
+    /**
+     * @var string
+     */
+    public $accessType = "fs";
+    /**
+     * @var string
+     */
+    public $recycle = "";
+    /**
+     * @var bool
+     */
+    public $create = true;
+    /**
+     * @var bool
+     */
+    public $writeable = true;
+    /**
+     * @var bool
+     */
+    public $enabled = true;
+    /**
+     * @var array
+     */
+    public $options = array();
+    /**
+     * @var string
+     */
+    public $slug;
+    /**
+     * @var bool
+     */
+    public $isTemplate = false;
+
+    /**
+     * @var string local or remote
+     */
+    protected $repositoryType = AJXP_REPOSITORY_TYPE_LOCAL;
+
+    /**
+     * @var string status
+     */
+    protected $accessStatus;
+
+    /**
+     * @var string
+     */
+    private $owner;
+    /**
+     * @var string
+     */
+    private $parentId;
+    /**
+     * @var string
+     */
+    private $uniqueUser;
+    /**
+     * @var bool
+     */
+    private $inferOptionsFromParent;
+
+    /**
+     * @var String the groupPath of the administrator who created that repository.
+     */
+    protected $groupPath;
+
+
+    /**
+     * @var AbstractAccessDriver
+     */
+    public $driverInstance;
+
+    /**
+     * @var ContentFilter
+     */
+    protected $contentFilter;
+
+    /**
+     * @var array Store filters as array variable to avoid serialization problems
+     */
+    private $contentFilterData;
+
+    /**
+     * @param ContentFilter $contentFilter
+     */
+    public function setContentFilter($contentFilter)
+    {
+        $this->contentFilter = $contentFilter;
+        $this->contentFilterData  = $contentFilter->filters;
+    }
+
+    /**
+     * Fix unserialization issues by reloading object from data array
+     */
+    private function checkCFilterData(){
+        if(!is_object($this->contentFilter) && is_array($this->contentFilterData)){
+            $cf = new ContentFilter(array());
+            $cf->fromFilterArray($this->contentFilterData);
+            $this->contentFilter = $cf;
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasContentFilter(){
+        $this->checkCFilterData();
+        return isSet($this->contentFilter);
+    }
+
+    /**
+     * @return ContentFilter
+     */
+    public function getContentFilter()
+    {
+        $this->checkCFilterData();
+        return $this->contentFilter;
+    }
+
+    /**
+     * @param ContextInterface $contextInterface
+     * @return AbstractAccessDriver
+     * @throws RepositoryLoadException
+     */
+    public function getDriverInstance(ContextInterface $contextInterface)
+    {
+        if(!isSet($this->driverInstance)){
+            $plugin = PluginsService::getInstance($contextInterface)->getUniqueActivePluginForType("access");
+            if(empty($plugin)){
+                throw new RepositoryLoadException($this, ["Cannot find access driver for repository ".$this->getSlug()]);
+            }
+            $this->driverInstance = $plugin;
+        }
+        return $this->driverInstance;
+    }
+
+    /**
+     * @param AbstractAccessDriver $driverInstance
+     */
+    public function setDriverInstance($driverInstance)
+    {
+        $this->driverInstance = $driverInstance;
+    }
+
+    /**
+     * @param string $id
+     * @param string $display
+     * @param string $driver
+     */
+    public function __construct($id, $display, $driver)
+    {
+        $this->setAccessType($driver);
+        $this->setDisplay($display);
+        $this->setId($id);
+        $this->uuid = md5(microtime());
+        $this->slug = StringHelper::slugify($display);
+        $this->inferOptionsFromParent = false;
+        $this->options["CREATION_TIME"] = time();
+//        if (AuthService::usersEnabled() && AuthService::getLoggedUser() != null) {
+//            $this->options["CREATION_USER"] = AuthService::getLoggedUser()->getId();
+//        }
+    }
+
+    /**
+     * @param string $newLabel
+     * @param array $newOptions
+     * @param string $parentId
+     * @param string $owner
+     * @param null $uniqueUser
+     * @return Repository
+     */
+    public function createSharedChild($newLabel, $newOptions, $parentId, $owner, $uniqueUser = null)
+    {
+        $repo = new Repository(0, $newLabel, $this->accessType);
+        $newOptions = array_merge($this->options, $newOptions);
+        $newOptions["CREATION_TIME"] = time();
+        $newOptions["CREATION_USER"] = $owner;
+        $repo->options = $newOptions;
+        if ($parentId === null) {
+            $parentId = $this->getId();
+        }
+        $repo->setInferOptionsFromParent(true);
+        $repo->setOwnerData($parentId, $owner, $uniqueUser);
+        return $repo;
+    }
+
+    /**
+     * @param string $newLabel
+     * @param array $newOptions
+     * @param null $creator
+     * @param null $uniqueUser
+     * @return Repository
+     */
+    public function createTemplateChild($newLabel, $newOptions, $creator = null, $uniqueUser = null)
+    {
+        $repo = new Repository(0, $newLabel, $this->accessType);
+        $newOptions["CREATION_TIME"] = time();
+        $newOptions["CREATION_USER"] = $creator;
+        $repo->options = $newOptions;
+        $repo->setOwnerData($this->getId(), null, $uniqueUser);
+        $repo->setInferOptionsFromParent(true);
+        return $repo;
+    }
+
+    /**
+     * @return bool
+     */
+    public function upgradeId()
+    {
+        if (!isSet($this->uuid)) {
+            $this->uuid = md5(serialize($this));
+            //$this->uuid = md5(time());
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @param bool $serial
+     * @return string
+     */
+    public function getUniqueId($serial=false)
+    {
+        if ($serial) {
+            return md5(serialize($this));
+        }
+        return $this->uuid;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSlug()
+    {
+        return $this->slug;
+    }
+
+    /**
+     * @param null $slug
+     */
+    public function setSlug($slug = null)
+    {
+        if (empty($slug)) {
+            $this->slug = StringHelper::slugify($this->display);
+        } else {
+            $this->slug = $slug;
+        }
+    }
+
+    /**
+     * @param $oName
+     * @param $oValue
+     */
+    public function addOption($oName, $oValue)
+    {
+        if (strpos($oName, "PATH") !== false) {
+            $oValue = str_replace("\\", "/", $oValue);
+        }
+        $this->options[$oName] = $oValue;
+    }
+
+    /**
+     * @param string $oName
+     * @return mixed|string
+     * @throws \Exception
+     */
+    public function getSafeOption($oName){
+        if (isSet($this->options[$oName])) {
+            $value = $this->options[$oName];
+            return $value;
+        }
+        if ($this->inferOptionsFromParent && isSet($this->parentId)) {
+            $parentTemplateObject = RepositoryService::getRepositoryById($this->parentId);
+            if(empty($parentTemplateObject) || !$parentTemplateObject instanceof RepositoryInterface) {
+                throw new PydioException("Option should be loaded from parent repository, but it was not found");
+            }
+            return $parentTemplateObject->getSafeOption($oName);
+        }
+        return null;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param string $oName
+     * @param null $default
+     * @return mixed
+     * @throws PydioException
+     */
+    public function getContextOption(ContextInterface $ctx, $oName, $default = null){
+        if(isSet($this->inferOptionsFromParent) && isSet($this->parentId)){
+            $parentTemplateObject = RepositoryService::getRepositoryById($this->parentId);
+            if(empty($parentTemplateObject) || !is_a($parentTemplateObject, "Repository")) {
+                throw new PydioException("Option should be loaded from parent repository, but it was not found");
+            }
+        }
+        if ($this->inferOptionsFromParent && isSet($parentTemplateObject)) {
+            $pvalue = $parentTemplateObject->getContextOption($ctx, $oName);
+            $pathChanged = false;
+            if (is_string($pvalue) && strstr($pvalue, "AJXP_ALLOW_SUB_PATH") !== false) {
+                $pvalue = rtrim(str_replace("AJXP_ALLOW_SUB_PATH", "", $pvalue), "/")."/".$this->options[$oName];
+                $pathChanged = true;
+            }
+            if ($pathChanged) {
+                return InputFilter::securePath($pvalue);
+            }
+        }
+        if (isSet($this->options[$oName]) && (!empty($this->options[$oName]) || empty($default))) {
+            return VarsFilter::filter($this->options[$oName], $ctx);
+        }
+        if ($this->inferOptionsFromParent && isset($parentTemplateObject)) {
+            return $parentTemplateObject->getContextOption($ctx, $oName);
+        }
+        return $default;
+
+    }
+
+    /**
+     * @return array
+     */
+    public function getOptionsDefined()
+    {
+        $keys = array();
+        foreach ($this->options as $key => $value) {
+            if(is_string($value) && strstr($value, "AJXP_ALLOW_SUB_PATH") !== false) continue;
+            $keys[] = $key;
+        }
+        return $keys;
+    }
+
+    /**
+     * @return mixed|string
+     * @throws PydioException
+     */
+    public function getDefaultRight()
+    {
+        $opt = $this->getSafeOption("DEFAULT_RIGHTS");
+        return (isSet($opt)?$opt:"");
+    }
+
+    /**
+     * @return string
+     */
+    public function getAccessType()
+    {
+        return $this->accessType;
+    }
+
+    /**
+     * @return mixed|string
+     * @throws PydioException
+     */
+    public function getDisplay()
+    {
+        if (isSet($this->displayStringId)) {
+            $mess = LocaleService::getMessages();
+            if (isSet($mess[$this->displayStringId])) {
+                return $mess[$this->displayStringId];
+            }
+        }
+        return VarsFilter::filter($this->display, Context::emptyContext());
+    }
+
+    /**
+     * @return string
+     */
+    public function getId()
+    {
+        if($this->isWriteable() || $this->id === null) return $this->getUniqueId();
+        return $this->id;
+    }
+
+    /**
+     * @return bool
+     * @throws PydioException
+     */
+    public function getCreate()
+    {
+        return (bool) $this->getSafeOption("CREATE");
+    }
+
+    /**
+     * @param bool $create
+     */
+    public function setCreate($create)
+    {
+        $this->options["CREATE"] = (bool) $create;
+    }
+
+    /**
+     * @param String $accessType
+     */
+    public function setAccessType($accessType)
+    {
+        $this->accessType = $accessType;
+    }
+
+    /**
+     * @param String $display
+     */
+    public function setDisplay($display)
+    {
+        $this->display = $display;
+    }
+
+    /**
+     * @param int $id
+     */
+    public function setId($id)
+    {
+        $this->id = $id;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isWriteable()
+    {
+        return (bool) $this->writeable;
+    }
+
+    /**
+     * @param bool $w
+     */
+    public function setWriteable($w)
+    {
+        $this->writeable = (bool) $w;
+    }
+
+    /**
+     * @param string $id
+     */
+    public function setDisplayStringId($id)
+    {
+        $this->displayStringId = $id;
+    }
+
+    /**
+     * @param string $repoParentId
+     * @param null $ownerUserId
+     * @param null $childUserId
+     */
+    public function setOwnerData($repoParentId, $ownerUserId = null, $childUserId = null)
+    {
+        $this->owner = $ownerUserId;
+        $this->uniqueUser = $childUserId;
+        $this->parentId = $repoParentId;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOwner()
+    {
+        return $this->owner;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getParentId()
+    {
+        return $this->parentId;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isTemplate(){
+        return $this->isTemplate;
+    }
+    /**
+     * @return null|RepositoryInterface
+     */
+    public function getParentRepository(){
+        if(!$this->hasParent()) return null;
+        return RepositoryService::getRepositoryById($this->parentId);
+    }
+
+    /**
+     * @return string
+     */
+    public function getUniqueUser()
+    {
+        return $this->uniqueUser;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasOwner()
+    {
+        return isSet($this->owner);
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasParent()
+    {
+        return isSet($this->parentId);
+    }
+
+    /**
+     * @param $bool
+     */
+    public function setInferOptionsFromParent($bool)
+    {
+        $this->inferOptionsFromParent = (bool) $bool;
+    }
+
+    /**
+     * @return bool
+     */
+    public function getInferOptionsFromParent()
+    {
+        return (bool) $this->inferOptionsFromParent;
+    }
+
+    /**
+     * @param String $groupPath
+     */
+    public function setGroupPath($groupPath, $update = true)
+    {
+        if(strlen($groupPath) > 1) $groupPath = rtrim($groupPath, "/");
+        $this->groupPath = $groupPath;
+    }
+
+    /**
+     * @return String
+     */
+    public function getGroupPath()
+    {
+        return $this->groupPath;
+    }
+
+    /**
+     * @param String $descriptionText
+     */
+    public function setDescription( $descriptionText )
+    {
+        $this->options["USER_DESCRIPTION"] = $descriptionText;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAccessStatus()
+    {
+        return $this->accessStatus;
+    }
+
+    /**
+     * @param string $accessStatus
+     */
+    public function setAccessStatus($accessStatus)
+    {
+        $this->accessStatus = $accessStatus;
+    }
+
+    /**
+     * @return string
+     */
+    public function getRepositoryType()
+    {
+        return $this->repositoryType;
+    }
+
+    /**
+     * @param string $repositoryType
+     */
+    public function setRepositoryType($repositoryType)
+    {
+        $this->repositoryType = $repositoryType;
+    }
+
+    /**
+     * @param bool $public
+     * @param null $ownerLabel
+     * @return mixed
+     */
+    public function getDescription( $public = false, $ownerLabel = null )
+    {
+        $m = LocaleService::getMessages();
+        if (isset($this->options["USER_DESCRIPTION"]) && !empty($this->options["USER_DESCRIPTION"])) {
+            if (isSet($m[$this->options["USER_DESCRIPTION"]])) {
+                return $m[$this->options["USER_DESCRIPTION"]];
+            } else {
+                return $this->options["USER_DESCRIPTION"];
+            }
+        }
+        if (isSet($this->parentId) && isset($this->owner)) {
+            if (isSet($this->options["CREATION_TIME"])) {
+                $date = StatHelper::relativeDate($this->options["CREATION_TIME"], $m);
+                return str_replace(
+                    array("%date", "%user"),
+                    array($date, $ownerLabel!= null ? $ownerLabel : $this->owner),
+                    $public?$m["470"]:$m["473"]);
+            } else {
+                if($public) return $m["474"];
+                else return str_replace(
+                    array("%user"),
+                    array($ownerLabel!= null ? $ownerLabel : $this->owner),
+                    $m["472"]);
+            }
+        } else if ($this->isWriteable() && isSet($this->options["CREATION_TIME"])) {
+            $date = StatHelper::relativeDate($this->options["CREATION_TIME"], $m);
+            if (isSet($this->options["CREATION_USER"])) {
+                return str_replace(array("%date", "%user"), array($date, $this->options["CREATION_USER"]), $m["471"]);
+            } else {
+                return str_replace(array("%date"), array($date), $m["470"]);
+            }
+        } else {
+            return $m["474"];
+        }
+    }
+
+    /**
+     * @return bool|string
+     * @throws PydioException
+     */
+    public function securityScope()
+    {
+        if($this->hasParent()){
+            $parentRepo = RepositoryService::getRepositoryById($this->getParentId());
+            if(!empty($parentRepo) && $parentRepo->isTemplate()){
+                $path = $parentRepo->getSafeOption("PATH");
+                $container = $parentRepo->getSafeOption("CONTAINER");
+                // If path is set in the template, compute identifier from the template path.
+                if(!empty($path) || !empty($container)) return $parentRepo->securityScope();
+            }
+        }
+        $path = $this->getSafeOption("CONTAINER");
+        if(!empty($path)){
+            if(strpos($path, "AJXP_USER") !== false) return "USER";
+            if(strpos($path, "AJXP_GROUP_PATH") !== false) return "GROUP";
+            if(strpos($path, "AJXP_GROUP_PATH_FLAT") !== false) return "GROUP";
+        }
+        $path = $this->getSafeOption("PATH");
+        if($this->accessType == "ajxp_conf" || $this->accessType == "ajxp_admin" || $this->accessType == "inbox") return "USER";
+        if(empty($path)) return false;
+        if(strpos($path, "AJXP_USER") !== false) return "USER";
+        if(strpos($path, "AJXP_GROUP_PATH") !== false) return "GROUP";
+        if(strpos($path, "AJXP_GROUP_PATH_FLAT") !== false) return "GROUP";
+        return false;
+    }
+
+    /**
+     * @return array
+     */
+    public function __sleep()
+    {
+        $this->driverInstance = null;
+        return array_keys(get_object_vars($this));
+    }
+
+}
diff --git a/core/src/plugins/core.access/src/Model/UserSelection.php b/core/src/plugins/core.access/src/Model/UserSelection.php
new file mode 100644
index 0000000000..979d33b917
--- /dev/null
+++ b/core/src/plugins/core.access/src/Model/UserSelection.php
@@ -0,0 +1,401 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Core\Model;
+
+
+
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Model\RepositoryInterface;
+use Pydio\Core\Model\UserInterface;
+
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\PathUtils;
+
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+/**
+ * Abstraction of a user selection passed via http parameters.
+ * @package Pydio
+ * @subpackage Core
+ */
+class UserSelection
+{
+    public $files;
+    /**
+     * @var AJXP_Node[]
+     */
+    private $nodes;
+    public $varPrefix = "file";
+    public $dirPrefix = "dir";
+    public $isUnique = true;
+    public $dir;
+
+    public $inZip = false;
+    public $zipFile;
+    public $localZipPath;
+
+    /**
+     * @var Repository
+     */
+    private $repository;
+
+    /**
+     * @var ContextInterface
+     */
+    private $context;
+    
+    
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $parsedBody
+     * @return UserSelection
+     */
+    public static function fromContext(ContextInterface $ctx, $parsedBody){
+        $selection = new UserSelection($ctx->getRepository(), $parsedBody, $ctx->getUser());
+        return $selection;
+    }
+
+    /**
+     * Construction selector
+     * @param RepositoryInterface|null $repository
+     * @param array|null $httpVars
+     * @param UserInterface $user
+     */
+    public function __construct($repository = null, $httpVars = null, $user = null)
+    {
+        $this->files = array();
+        $this->context = Context::contextWithObjects($user, $repository);
+        if(iSset($httpVars)){
+            $this->initFromHttpVars($httpVars);
+        }
+    }
+    /**
+     * Init the selection from the query vars
+     * @param array $passedArray
+     * @return void
+     */
+    public function initFromHttpVars($passedArray=null)
+    {
+        if ($passedArray != null) {
+            if (isSet($passedArray["selection_nodes"]) && is_array($passedArray["selection_nodes"])) {
+                $this->initFromNodes($passedArray["selection_nodes"]);
+            } else {
+                $this->initFromArray($passedArray);
+            }
+        } else {
+            $this->initFromArray($_GET);
+            $this->initFromArray($_POST);
+        }
+    }
+
+    /**
+     * @param AJXP_Node[] $nodes
+     */
+    public function initFromNodes($nodes)
+    {
+        $this->nodes = $nodes;
+        $this->isUnique = (count($nodes) == 1);
+        $this->dir = '/';
+        $this->files = array();
+        $this->inZip = false;
+        foreach ($nodes as $n) {
+            $this->addFile($n->getPath());
+        }
+
+    }
+
+    /**
+     * @param string $path
+     * @return AJXP_Node
+     */
+    public function nodeForPath($path){
+        $n = new AJXP_Node(rtrim($this->currentBaseUrl(), "/").$path);
+        if($this->context->hasUser()){
+            $n->setUserId($this->context->getUser()->getId());
+        }
+        return $n;
+    }
+
+    /**
+     * @return ContextInterface
+     */
+    public function getContext()
+    {
+        return $this->context;
+    }
+
+    /**
+     * @param ContextInterface $context
+     */
+    public function setContext($context)
+    {
+        $this->context = $context;
+    }
+
+
+
+    /**
+     *
+     * Init from a simple array
+     * @param $array
+     */
+    public function initFromArray($array)
+    {
+        if (!is_array($array)) {
+            return ;
+        }
+        if (isSet($array[$this->varPrefix]) && $array[$this->varPrefix] != "") {
+            $v = $array[$this->varPrefix];
+            if(strpos($v, "base64encoded:") === 0){
+                $v = base64_decode(array_pop(explode(':', $v, 2)));
+            }
+            $this->addFile(InputFilter::decodeSecureMagic($v));
+            $this->isUnique = true;
+            //return ;
+        }
+        if (isSet($array[$this->varPrefix."_0"])) {
+            $index = 0;
+            while (isSet($array[$this->varPrefix."_".$index])) {
+                $v = $array[$this->varPrefix."_".$index];
+                if(strpos($v, "base64encoded:") === 0){
+                    $v = base64_decode(array_pop(explode(':', $v, 2)));
+                }
+                $this->addFile(InputFilter::decodeSecureMagic($v));
+                $index ++;
+            }
+            $this->isUnique = false;
+            if (count($this->files) == 1) {
+                $this->isUnique = true;
+            }
+            //return ;
+        }
+        if (isSet($array["path"])){
+            if(!is_array($array["path"])){
+                $array["path"] = [$array["path"]];
+            }
+            foreach ($array["path"] as $p){
+                $p = InputFilter::decodeSecureMagic($p);
+                // First part must be the repository ID
+                $p = "/".implode("/", array_slice(explode("/", trim($p, "/")), 1));
+                $this->addFile($p);
+            }
+        }
+        if (isSet($array["nodes"]) && is_array($array["nodes"])) {
+            $this->files = array();
+            foreach($array["nodes"] as $value){
+                $this->addFile(InputFilter::decodeSecureMagic($value));
+            }
+            $this->isUnique = count($this->files) == 1;
+        }
+        if (isSet($array[$this->dirPrefix])) {
+            $this->dir = InputFilter::securePath($array[$this->dirPrefix]);
+            if ($test = $this->detectZip($this->dir)) {
+                $this->inZip = true;
+                $this->zipFile = $test[0];
+                $this->localZipPath = $test[1];
+            }
+        } else if (!$this->isEmpty() && $this->isUnique()) {
+            if ($test = $this->detectZip(PathUtils::forwardSlashDirname($this->files[0]))) {
+                $this->inZip = true;
+                $this->zipFile = $test[0];
+                $this->localZipPath = $test[1];
+            }
+        }
+    }
+
+    /**
+     * @param string $filePath
+     */
+    public function addFile($filePath){
+        if(!in_array($filePath, $this->files)){
+            $this->files[] = $filePath;
+        }
+    }
+
+    /**
+     * Does the selection have one or more items
+     * @return bool
+     */
+    public function isUnique()
+    {
+        return (count($this->files) == 1);
+    }
+    /**
+     * Are we currently inside a zip?
+     * @return bool
+     */
+    public function inZip()
+    {
+        return $this->inZip;
+    }
+    /**
+     * Returns UTF8 encoded path
+     * @param bool $decode
+     * @return String
+     */
+    public function getZipPath($decode = false)
+    {
+        if($decode) return InputFilter::decodeSecureMagic($this->zipFile);
+        else return $this->zipFile;
+    }
+
+    /**
+     * Returns UTF8 encoded path
+     * @param bool $decode
+     * @return String
+     */
+    public function getZipLocalPath($decode = false)
+    {
+        if($decode) return InputFilter::decodeSecureMagic($this->localZipPath);
+        else return $this->localZipPath;
+    }
+    /**
+     * Number of selected items
+     * @return int
+     */
+    public function getCount()
+    {
+        return count($this->files);
+    }
+    /**
+     * List of items selected
+     * @return string[]
+     */
+    public function getFiles()
+    {
+        return $this->files;
+    }
+    /**
+     * First item of the list
+     * @return string
+     */
+    public function getUniqueFile()
+    {
+        return $this->files[0];
+    }
+
+    /**
+     * @return AJXP_Node
+     * @throws \Exception
+     */
+    public function getUniqueNode()
+    {
+        if (isSet($this->nodes) && is_array($this->nodes)) {
+            return $this->nodes[0];
+        }
+        $currentFile = $this->getUniqueFile();
+        $ajxpNode = new AJXP_Node($this->currentBaseUrl().$currentFile);
+        return $ajxpNode;
+
+    }
+
+    /**
+     * @return AJXP_Node[]
+     * @throws \Exception
+     */
+    public function buildNodes()
+    {
+        if (isSet($this->nodes)) {
+            return $this->nodes;
+        }
+        $nodes = array();
+        foreach ($this->files as $file) {
+            $node = new AJXP_Node($this->currentBaseUrl().$file);
+            if($this->context->hasUser()){
+                $node->setUserId($this->context->getUser()->getId());
+            }
+            $nodes[] = $node;
+        }
+        return $nodes;
+
+    }
+
+    /**
+     * @return string
+     * @throws \Exception
+     */
+    public function currentBaseUrl(){
+        if(!$this->context->hasRepository()){
+            throw new \Exception("UserSelection::currentBaseUrl: cannot build nodes URL without a proper repository");
+        }
+        $uId = $this->context->hasUser()?$this->context->getUser()->getId():"shared";
+        return "pydio://".$uId."@".$this->context->getRepositoryId();
+    }
+
+    /**
+     * Is this selection empty?
+     * @return bool
+     */
+    public function isEmpty()
+    {
+        if (count($this->files) == 0) {
+            return true;
+        }
+        return false;
+    }
+    /**
+     * Detect if there is .zip somewhere in the path
+     * @static
+     * @param string $dirPath
+     * @return array|bool
+     */
+    public static function detectZip($dirPath)
+    {
+        if (preg_match("/\.zip\//i", $dirPath) || preg_match("/\.zip$/i", $dirPath)) {
+            $contExt = strrpos(strtolower($dirPath), ".zip");
+            $zipPath = substr($dirPath, 0, $contExt+4);
+            $localPath = substr($dirPath, $contExt+4);
+            if($localPath == "") $localPath = "/";
+            return array($zipPath, $localPath);
+        }
+        return false;
+    }
+    /**
+     * Sets the selected items
+     * @param array $files
+     * @return void
+     */
+    public function setFiles($files)
+    {
+        $this->files = $files;
+    }
+
+    /**
+     * @param $file
+     */
+    public function removeFile($file){
+        $newFiles = array();
+        foreach($this->files as $k => $f){
+            if($f != $file) $newFiles[] = $file;
+        }
+        $this->files = $newFiles;
+        if(isSet($this->nodes)){
+            $newNodes = array();
+            foreach($this->nodes as $l => $n){
+                if($n->getPath() != $file) $newNodes[] = $n;
+            }
+            $this->nodes = $newNodes;
+        }
+    }
+    
+}
diff --git a/core/src/plugins/core.access/src/RecycleBinManager.php b/core/src/plugins/core.access/src/RecycleBinManager.php
new file mode 100644
index 0000000000..fca248cfe8
--- /dev/null
+++ b/core/src/plugins/core.access/src/RecycleBinManager.php
@@ -0,0 +1,208 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Core;
+
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Core\Utils\Vars\PathUtils;
+
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+/**
+ * Recycle bin actions manager. Utilitaries to check whether the current dir is the recycle bin,
+ * and to filter the actions accordingly : transform an item deletion into a move into the recycle folder, etc.
+ * @package Pydio
+ * @subpackage Core
+ */
+class RecycleBinManager
+{
+    private static $rbmRecycle;
+    private static $rbmRelativeRecycle;
+
+    /**
+     * @return bool
+     */
+    public static function recycleEnabled()
+    {
+        return (isSet(self::$rbmRecycle) && self::$rbmRecycle != null && is_string(self::$rbmRecycle));
+    }
+
+    /**
+     * Initialize manager
+     * @static
+     * @param $repositoryWrapperURL
+     * @param $recyclePath
+     * @return void
+     */
+    public static function init($repositoryWrapperURL, $recyclePath)
+    {
+        self::$rbmRecycle = $repositoryWrapperURL.$recyclePath;
+        self::$rbmRelativeRecycle = $recyclePath;
+    }
+    /**
+     * Get the recycle bin path (repository URL included)
+     * @static
+     * @return string
+     */
+    public static function getRecyclePath()
+    {
+        return self::$rbmRecycle ;
+    }
+    /**
+     * Get the recycle bin path (from the root of the repository)
+     * @static
+     * @return string
+     */
+    public static function getRelativeRecycle()
+    {
+        return self::$rbmRelativeRecycle;
+    }
+    /**
+     * Is the current path the recycle?
+     * @static
+     * @param string $currentLocation PATH from the root of repo
+     * @return bool
+     */
+    public static function currentLocationIsRecycle($currentLocation)
+    {
+        return ($currentLocation == self::$rbmRelativeRecycle);
+    }
+
+    /**
+     * Transform delete/restore actions into move actino
+     * @static
+     * @param string $action
+     * @param UserSelection $selection
+     * @param string $currentLocation
+     * @param array $httpVars
+     */
+    public static function filterActions(&$action, $selection, &$httpVars)
+    {
+        if(!self::recycleEnabled() || $selection->isEmpty()) {
+            return;
+        }
+        $currentLocation = PathUtils::forwardSlashDirname($selection->getUniqueFile());
+
+        // FILTER ACTION FOR DELETE
+        if ($action == "delete" && !self::currentLocationIsRecycle($currentLocation) && !isSet($httpVars["force_deletion"])) {
+            $action = "move";
+            $httpVars["dest"] = self::$rbmRelativeRecycle;
+        }
+        // FILTER ACTION FOR RESTORE
+        if ($action == "restore" && self::currentLocationIsRecycle($currentLocation)) {
+            $originalRep = self::getFileOrigin($selection->getUniqueFile());
+            if ($originalRep != "") {
+                $action = "move";
+                $httpVars["recycle_restore"] = true;
+                $httpVars["dest"] = $originalRep; // CHECK UTF8 HANDLING HERE
+            }
+        }
+
+    }
+    /**
+     * Get the file for caching recylce metadata
+     * @static
+     * @return string
+     */
+    public static function getCacheFileName()
+    {
+        return ".ajxp_recycle_cache.ser";
+    }
+    /**
+     * Update metadata
+     * @static
+     * @param string $originalFilePath
+     * @return void
+     */
+    public static function fileToRecycle($originalFilePath)
+    {
+        $cache = self::loadCache();
+        $cache[basename($originalFilePath)] = str_replace("\\", "/", dirname($originalFilePath));
+        self::saveCache($cache);
+    }
+
+    /**
+     * Update metadata
+     * @static
+     * @param $filePath
+     * @return void
+     */
+    public static function deleteFromRecycle($filePath)
+    {
+        $cache = self::loadCache();
+        if (array_key_exists(basename($filePath), $cache)) {
+            unset($cache[basename($filePath)]);
+        }
+        self::saveCache($cache);
+    }
+    /**
+     * Use metadata for getting original location
+     * @static
+     * @param $filePath
+     * @return string
+     */
+    public static function getFileOrigin($filePath)
+    {
+        $cache = self::loadCache();
+        if (is_array($cache) && array_key_exists(basename($filePath), $cache)) {
+            return $cache[basename($filePath)];
+        }
+        return "";
+    }
+    /**
+     * Load the metadata cache
+     * @static
+     * @return array|mixed|null
+     */
+    public static function loadCache()
+    {
+        $result = array();
+        if(!self::recycleEnabled()) return null;
+        $cachePath = self::getRecyclePath()."/".self::getCacheFileName();
+        $fp = @fopen($cachePath, "r");
+        if ($fp) {
+            $s = "";
+            while (!feof($fp)) {
+                $s .= fread($fp, 4096);
+            }
+            fclose($fp);
+            $result = unserialize($s);
+        }
+        return $result;
+    }
+    /**
+     * Save the metadata cache
+     * @static
+     * @param $value
+     * @return null
+     */
+    public static function saveCache($value)
+    {
+        if(!self::recycleEnabled()) return null;
+        $cachePath = self::getRecyclePath()."/".self::getCacheFileName();
+        $fp = fopen($cachePath, "w");
+        if ($fp) {
+            fwrite($fp, serialize($value));
+            fflush($fp);
+            fclose($fp);
+        }
+    }
+
+}
diff --git a/core/src/plugins/core.access/src/SchemeTranslatorWrapper.php b/core/src/plugins/core.access/src/SchemeTranslatorWrapper.php
new file mode 100644
index 0000000000..7a7e49c148
--- /dev/null
+++ b/core/src/plugins/core.access/src/SchemeTranslatorWrapper.php
@@ -0,0 +1,342 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Core;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class SchemeTranslatorWrapper
+ * Simple Wrapper that justs converts a given protocol to another one.
+ *
+ * @package Pydio
+ * @subpackage Core
+ */
+class SchemeTranslatorWrapper extends MetaStreamWrapper implements IAjxpWrapper
+{
+    /**
+     * @var resource
+     */
+    protected $handle;
+
+    /**
+     * @var string
+     */
+    protected $currentDirPath;
+
+
+    /**
+     * Initialise the path for a file
+     */
+    public static function applyInitPathHook($path, $context = 'core') {
+        //Do nothing
+    }
+
+    /**
+     * Get a "usable" reference to a file : the real file or a tmp copy.
+     *
+     * @param string $path
+     * @param bool $persistent
+     * @return string
+     * @throws \Exception
+     */
+    public static function getRealFSReference($path, $persistent = false)
+    {
+        $wrapper = MetaStreamWrapper::findSubWrapperClassName($path);
+        return call_user_func(array($wrapper, "getRealFSReference"), MetaStreamWrapper::translateScheme($path), $persistent);
+    }
+
+    /**
+     * Read a file (by chunks) and copy the data directly inside the given stream.
+     *
+     * @param string $path
+     * @param resource $stream
+     */
+    public static function copyFileInStream($path, $stream)
+    {
+        $wrapper = MetaStreamWrapper::findSubWrapperClassName($path);
+        call_user_func(array($wrapper, "copyFileInStream"), MetaStreamWrapper::translateScheme($path), $stream);
+    }
+
+    /**
+     * Chmod implementation for this type of access.
+     *
+     * @param string $path
+     * @param number $chmodValue
+     */
+    public static function changeMode($path, $chmodValue)
+    {
+        $wrapper = MetaStreamWrapper::findSubWrapperClassName($path);
+        call_user_func(array($wrapper, "changeMode"), MetaStreamWrapper::translateScheme($path), $chmodValue);
+    }
+
+    /**
+     *
+     *
+     * @return bool
+     */
+    public function dir_closedir()
+    {
+        $this->currentDirPath = null;
+        if(isSet($this->handle) && is_resource($this->handle)){
+            closedir($this->handle);
+        }
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path
+     * @param int $options
+     * @return bool
+     */
+    public function dir_opendir($path, $options)
+    {
+        $newPath = MetaStreamWrapper::translateScheme($path);
+        $this->handle = opendir($newPath);
+        if($this->handle !== false){
+            $this->currentDirPath = $path;
+            return true;
+        }else{
+            return false;
+        }
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return string
+     */
+    public function dir_readdir()
+    {
+        if(isSet($this->handle) && is_resource($this->handle)){
+            return readdir($this->handle);
+        }
+        return false;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return bool
+     */
+    public function dir_rewinddir()
+    {
+        //$this->currentDirPath = null;
+        if(isSet($this->handle) && is_resource($this->handle)){
+            return rewind($this->handle);
+        }
+        return false;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path
+     * @param int $mode
+     * @param int $options
+     * @return bool
+     */
+    public function mkdir($path, $mode, $options)
+    {
+        return mkdir(MetaStreamWrapper::translateScheme($path), $mode, $options);
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path_from
+     * @param string $path_to
+     * @return bool
+     */
+    public function rename($path_from, $path_to)
+    {
+        return rename(MetaStreamWrapper::translateScheme($path_from), MetaStreamWrapper::translateScheme($path_to));
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path
+     * @param int $options
+     * @return bool
+     */
+    public function rmdir($path, $options)
+    {
+        if(is_resource($options)){
+            return rmdir(MetaStreamWrapper::translateScheme($path), $options);
+        }else{
+            return rmdir(MetaStreamWrapper::translateScheme($path));
+        }
+    }
+
+    /**
+     * Enter description here...
+     *
+     */
+    public function stream_close()
+    {
+        if(isSet($this->handle) && is_resource($this->handle)){
+            return fclose($this->handle);
+        }
+        return false;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return bool
+     */
+    public function stream_eof()
+    {
+        if(isSet($this->handle) && is_resource($this->handle)){
+            return feof($this->handle);
+        }
+        return false;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return bool
+     */
+    public function stream_flush()
+    {
+        if(isSet($this->handle) && is_resource($this->handle)){
+            return fflush($this->handle);
+        }
+        return false;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path
+     * @param string $mode
+     * @param int $options
+     * @param string &$context
+     * @return bool
+     */
+    public function stream_open($path, $mode, $options, &$context)
+    {
+        if(is_resource($context)){
+            $this->handle = fopen(MetaStreamWrapper::translateScheme($path), $mode, $options, $context);
+        }else{
+            $this->handle = fopen(MetaStreamWrapper::translateScheme($path), $mode, $options);
+        }
+        return ($this->handle !== false);
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param int $count
+     * @return string
+     */
+    public function stream_read($count)
+    {
+        if(isSet($this->handle) && is_resource($this->handle)){
+            return fread($this->handle, $count);
+        }
+        return null;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param int $offset
+     * @param int $whence = SEEK_SET
+     * @return bool
+     */
+    public function stream_seek($offset, $whence = SEEK_SET)
+    {
+        if(isSet($this->handle) && is_resource($this->handle)){
+            return fseek($this->handle, $offset, $whence);
+        }
+        return false;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return array
+     */
+    public function stream_stat()
+    {
+        if(isSet($this->handle) && is_resource($this->handle)){
+            return fstat($this->handle);
+        }
+        return false;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @return int
+     */
+    public function stream_tell()
+    {
+        if(isSet($this->handle) && is_resource($this->handle)){
+            return ftell($this->handle);
+        }
+        return false;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param string $data
+     * @return int
+     */
+    public function stream_write($data)
+    {
+        if(isSet($this->handle) && is_resource($this->handle)){
+            return fwrite($this->handle, $data);
+        }
+        return false;
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function unlink($path)
+    {
+        return unlink(MetaStreamWrapper::translateScheme($path));
+    }
+
+    /**
+     * Enter description here...
+     *
+     * @param string $path
+     * @param int $flags
+     * @return array
+     */
+    public function url_stat($path, $flags)
+    {
+        $stat = @stat(MetaStreamWrapper::translateScheme($path));
+        if($stat === false){
+            return null;
+        }
+        return $stat;
+    }
+}
diff --git a/core/src/plugins/core.access/src/Stream/AuthStream.php b/core/src/plugins/core.access/src/Stream/AuthStream.php
new file mode 100644
index 0000000000..4c58018cb5
--- /dev/null
+++ b/core/src/plugins/core.access/src/Stream/AuthStream.php
@@ -0,0 +1,63 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium SAS <team (at) pyd.io>
+ * This file is part of the Pydio Enterprise Distribution.
+ * It is subject to the End User License Agreement that you should have
+ * received and accepted along with this distribution.
+ */
+
+namespace Pydio\Access\Core\Stream;
+
+use GuzzleHttp\Stream\StreamDecoratorTrait;
+use GuzzleHttp\Stream\StreamInterface;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Auth\Core\MemorySafe;
+use Pydio\Core\Model\ContextInterface;
+
+/**
+ * Class AuthStream
+ * @package Pydio\Access\Core\Stream
+ */
+class AuthStream implements StreamInterface {
+    use StreamDecoratorTrait;
+
+    /** @var ContextInterface Context */
+    private $context;
+
+    /**
+     * AuthStream constructor.
+     * @param StreamInterface $stream
+     * @param AJXP_Node $node
+     */
+    public function __construct(
+        StreamInterface $stream,
+        AJXP_Node $node
+    ) {
+        $this->context = $node->getContext();
+
+        $credentials = MemorySafe::tryLoadingCredentialsFromSources($this->context);
+        $user = $credentials["user"];
+        $password = $credentials["password"];
+
+        if ($user == "") {
+            throw new \Exception("Cannot find user/pass for Remote Access!");
+        }
+
+        $authScheme = Stream::getContextOption($this->context, "authScheme", "basic");
+
+        $auth = [$user, $password, $authScheme];
+
+        Stream::addContextOption($this->context, [
+            "auth" => $auth
+        ]);
+
+        $this->stream = $stream;
+    }
+
+    /**
+     * @return string
+     */
+    public function getContents() {
+        return $this->stream->getContents();
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.access/src/Stream/AuthWrapper.php b/core/src/plugins/core.access/src/Stream/AuthWrapper.php
deleted file mode 100644
index 4369378ee6..0000000000
--- a/core/src/plugins/core.access/src/Stream/AuthWrapper.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/*
- * Copyright 2007-2015 Abstrium SAS <team (at) pyd.io>
- * This file is part of the Pydio Enterprise Distribution.
- * It is subject to the End User License Agreement that you should have
- * received and accepted along with this distribution.
- */
-
-namespace Pydio\Access\Core\Stream;
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-use AJXP_SchemeTranslatorWrapper;
-use AJXP_Safe;
-use AJXP_Utils;
-use ConfService;
-
-class AuthWrapper extends AJXP_SchemeTranslatorWrapper
-{
-    public static function applyInitPathHook($url, $context = 'core') {
-        $urlParts = AJXP_Utils::safeParseUrl($url);
-
-        $repository = ConfService::getRepositoryById($urlParts["host"]);
-        if ($repository == null) {
-            throw new Exception("Cannot find repository");
-        }
-
-        $credentials = AJXP_Safe::tryLoadingCredentialsFromSources($urlParts, $repository);
-        $user = $credentials["user"];
-        $password = $credentials["password"];
-
-        if ($user == "") {
-            throw new Exception("Cannot find user/pass for Remote Access!");
-        }
-
-        $repoData = self::actualRepositoryWrapperData($urlParts["host"]);
-        $repoProtocol = $repoData['protocol'];
-
-        $default = stream_context_get_options(stream_context_get_default());
-
-        $auth = [
-            'user' => $user,
-            'password' => $password
-        ];
-
-        $default[$repoProtocol]['auth'] = $auth;
-        $default[$repoProtocol]['client']->setAuth($auth);
-
-        stream_context_set_default($default);
-    }
-
-
-}
diff --git a/core/src/plugins/core.access/src/Stream/Client.php b/core/src/plugins/core.access/src/Stream/Client.php
deleted file mode 100755
index d2d2335607..0000000000
--- a/core/src/plugins/core.access/src/Stream/Client.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-namespace Pydio\Access\Core\Stream;
-
-use Pydio\Access\Core\Stream\Listener\PathListener;
-use GuzzleHttp\Command\Guzzle\GuzzleClient;
-
-/**
- * Client to interact with Guzzle Client
- *
- */
-class Client extends GuzzleClient implements ClientInterface
-{
-    const LATEST_API_VERSION = '2016-01-01';
-
-    public static $STAT_TEMPLATE = [
-        0  => 0,  'dev'     => 0,
-        1  => 0,  'ino'     => 0,
-        2  => 0,  'mode'    => 0,
-        3  => 0,  'nlink'   => 0,
-        4  => 0,  'uid'     => 0,
-        5  => 0,  'gid'     => 0,
-        6  => -1, 'rdev'    => -1,
-        7  => 0,  'size'    => 0,
-        8  => 0,  'atime'   => 0,
-        9  => 0,  'mtime'   => 0,
-        10 => 0,  'ctime'   => 0,
-        11 => -1, 'blksize' => -1,
-        12 => -1, 'blocks'  => -1,
-    ];
-
-    /**
-     * @param ClientInterface      $client      HTTP client to use.
-     * @param DescriptionInterface $description Guzzle service description
-     * @param array                $config      Configuration options
-     */
-    public function __construct__(
-        ClientInterface $client,
-        DescriptionInterface $description,
-        array $config = []
-    ) {
-        parent::__construct($client, $config);
-
-        $this->processConfig($config);
-    }
-
-    /**
-     * Register this client on the StreamWrapper
-     */
-    public function registerStreamWrapper() {
-        StreamWrapper::register($this);
-    }
-
-    /**
-     *
-     * Set the authentication parameters
-     *
-     * @param array $params
-     */
-    public function setAuth($arr) {
-        $this->setConfig('defaults/request_options/auth', [$arr['user'], $arr['password']]);
-    }
-
-    /**
-     * Set the default url of the client
-     *
-     * @param string $url
-     */
-    public function setDefaultUrl($url) {
-        $this->setConfig('defaults/base_url', $url);
-    }
-
-    /**
-     * Redefine a file stat
-     *
-     * @param array $arr
-     *
-     * @return array Associative array containing the stats
-     */
-    public function formatUrlStat($arr) {
-        return $STAT_TEMPLATE;
-    }
-
-    /**
-     * Get a Directory Iterator based on the given array
-     *
-     * @param array $arr
-     *
-     * @return DirIterator
-     */
-    public function getIterator($arr, $params) {
-        return new Iterator\DirIterator($arr);
-    }
-
-}
diff --git a/core/src/plugins/core.access/src/Stream/ClientInterface.php b/core/src/plugins/core.access/src/Stream/ClientInterface.php
deleted file mode 100755
index 5eae7f9faa..0000000000
--- a/core/src/plugins/core.access/src/Stream/ClientInterface.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-namespace Pydio\Access\Core\Stream;
-
-use GuzzleHttp\Command\Guzzle\GuzzleClient\ClientInterface as GuzzleClientInterface;
-use GuzzleHttp\Command\Guzzle\GuzzleClient\DescriptionInterface as DescriptionInterface;
-
-/**
- * Client to interact with SabreDAV Client
- *
- *
- * @link http://docs.aws.amazon.com/aws-sdk-php/v2/guide/service-s3.html User guide
- * @link http://docs.aws.amazon.com/aws-sdk-php/v2/api/class-Aws.S3.S3Client.html API docs
- */
-interface ClientInterface
-{
-    /**
-     * Register this client on the StreamWrapper
-     */
-    public function registerStreamWrapper();
-
-    /**
-     *
-     * Set the authentication parameters
-     *
-     * @param array $params
-     */
-    public function setAuth($arr);
-
-    /**
-     * Set the default url of the client
-     *
-     * @param string $url
-     */
-    public function setDefaultUrl($url);
-
-    /**
-     * Redefine a file stat
-     *
-     * @param array $arr
-     *
-     * @return array Associative array containing the stats
-     */
-    public function formatUrlStat($arr);
-
-    /**
-     * Get a Directory Iterator based on the given array
-     *
-     * @param array $arr
-     *
-     * @return DirIterator
-     */
-    public function getIterator($arr, $params);
-}
diff --git a/core/src/plugins/core.access/src/Stream/Iterator/DirIterator.php b/core/src/plugins/core.access/src/Stream/Iterator/DirIterator.php
index 5f283c9a51..6ff44ee775 100644
--- a/core/src/plugins/core.access/src/Stream/Iterator/DirIterator.php
+++ b/core/src/plugins/core.access/src/Stream/Iterator/DirIterator.php
@@ -16,11 +16,15 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 namespace Pydio\Access\Core\Stream\Iterator;
 
+/**
+ * Class DirIterator
+ * @package Pydio\Access\Core\Stream\Iterator
+ */
 class DirIterator implements \Iterator {
 
     private $position = 0;
diff --git a/core/src/plugins/core.access/src/Stream/Listener/AuthSubscriber.php b/core/src/plugins/core.access/src/Stream/Listener/AuthSubscriber.php
new file mode 100644
index 0000000000..9d9373f12c
--- /dev/null
+++ b/core/src/plugins/core.access/src/Stream/Listener/AuthSubscriber.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: ghecquet
+ * Date: 22/06/16
+ * Time: 18:10
+ */
+
+namespace Pydio\Access\Core\Stream\Listener;
+use GuzzleHttp\Event\BeforeEvent;
+use GuzzleHttp\Event\RequestEvents;
+use GuzzleHttp\Event\SubscriberInterface;
+
+/**
+ * Custom authentication listener that handles the "foo" auth type.
+ *
+ * Listens to the "before" event of a request and only modifies the request
+ * when the "auth" config setting of the request is "foo".
+ */
+class AuthSubscriber implements SubscriberInterface
+{
+    private $digest;
+
+    /**
+     * AuthSubscriber constructor.
+     * @param $digest
+     */
+    public function __construct($digest)
+    {
+        $this->digest = $digest;
+    }
+
+    /**
+     * @return array
+     */
+    public function getEvents()
+    {
+        return ['before' => ['sign', RequestEvents::SIGN_REQUEST]];
+    }
+
+    /**
+     * @param BeforeEvent $e
+     */
+    public function sign(BeforeEvent $e)
+    {
+        //$e->getClient()->setDefaultOptions
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.access/src/Stream/Listener/PathListener.php b/core/src/plugins/core.access/src/Stream/Listener/PathListener.php
deleted file mode 100644
index ba16883740..0000000000
--- a/core/src/plugins/core.access/src/Stream/Listener/PathListener.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-namespace Pydio\Access\Core\Stream\Listener;
-
-use GuzzleHttp\Event\SubscriberInterface;
-use GuzzleHttp\Command\Event\PreparedEvent;
-
-/**
- * Listener used to change the way the paths are given (no urlencode for the slash)
- */
-class PathListener implements SubscriberInterface
-{
-
-    /**
-     * Get the list of events this subscriber is being triggered on
-     *
-     * @return array Events
-     */
-    public function getEvents()
-    {
-        return [
-            'prepared'   => ['onBefore']
-        ];
-    }
-
-    /**
-     * Handle the before trigger
-     *
-     * @param PreparedEvent event
-     */
-    public function onBefore(PreparedEvent $e)
-    {
-        $request = $e->getRequest();
-        if (empty($request)) {
-            return;
-        }
-
-        $path = $request->getPath();
-        if (empty($path)) {
-            return;
-        }
-
-        $path = rawurldecode($path);
-        $path = str_replace('//', '/', $path);
-
-        $request->setPath($path);
-    }
-}
diff --git a/core/src/plugins/core.access/src/Stream/Listener/PathSubscriber.php b/core/src/plugins/core.access/src/Stream/Listener/PathSubscriber.php
new file mode 100644
index 0000000000..87924e0bb5
--- /dev/null
+++ b/core/src/plugins/core.access/src/Stream/Listener/PathSubscriber.php
@@ -0,0 +1,67 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Access\Core\Stream\Listener;
+
+use GuzzleHttp\Event\SubscriberInterface;
+use GuzzleHttp\Command\Event\PreparedEvent;
+
+/**
+ * Listener used to change the way the paths are given (no urlencode for the slash)
+ */
+class PathSubscriber implements SubscriberInterface
+{
+
+    /**
+     * Get the list of events this subscriber is being triggered on
+     *
+     * @return array Events
+     */
+    public function getEvents()
+    {
+        return [
+            'prepared'   => ['onBefore']
+        ];
+    }
+
+    /**
+     * Handle the before trigger
+     *
+     * @param PreparedEvent event
+     */
+    public function onBefore(PreparedEvent $e)
+    {
+        $request = $e->getRequest();
+        if (empty($request)) {
+            return;
+        }
+
+        $path = $request->getPath();
+        if (empty($path)) {
+            return;
+        }
+
+        $path = rawurldecode($path);
+        $path = str_replace('//', '/', $path);
+
+        $request->setPath($path);
+    }
+}
diff --git a/core/src/plugins/core.access/src/Stream/MetadataCachingStream.php b/core/src/plugins/core.access/src/Stream/MetadataCachingStream.php
new file mode 100644
index 0000000000..46be7acc44
--- /dev/null
+++ b/core/src/plugins/core.access/src/Stream/MetadataCachingStream.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: ghecquet
+ * Date: 21/06/16
+ * Time: 09:39
+ */
+
+namespace Pydio\Access\Core\Stream;
+use GuzzleHttp\Stream\StreamDecoratorTrait;
+use GuzzleHttp\Stream\StreamInterface;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Cache\Core\AbstractCacheDriver;
+use Pydio\Core\Services\CacheService;
+
+/**
+ * Stream decorator that can cache previously read bytes from a sequentially
+ * read stream.
+ */
+class MetadataCachingStream implements StreamInterface
+{
+    use StreamDecoratorTrait;
+
+    /** @var array stat */
+    private static $stat;
+
+    /** @var AJXP_Node node */
+    private $node;
+
+    /** @var string uri */
+    private $uri;
+
+    /** @var array contentFilters */
+    private $contentFilters;
+
+    /** @var string path */
+    private $path;
+
+    /** @var array statCacheId */
+    private $cacheOptions;
+
+    /**
+     * We will treat the buffer object as the body of the stream
+     *
+     * @param StreamInterface $stream Stream to cache
+     * @param AJXP_Node $node
+     * @param StreamInterface $target
+     */
+    public function __construct(
+        StreamInterface $stream,
+        AJXP_Node $node,
+        StreamInterface $target = null
+    ) {
+        $this->node = $node;
+        $this->uri = $node->getUrl();
+        $this->cacheOptions = AbstractCacheDriver::getOptionsForNode($node, "meta");
+        $this->contentFilters = $node->getRepository()->getContentFilter()->filters;
+        $this->path = parse_url($this->uri, PHP_URL_PATH);
+
+        $this->stream = $stream;
+
+        $this->stat();
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getSize() {
+        $stat = $this->stat();
+
+        if (isset($stat["size"])) {
+            return (int) $stat["size"];
+        }
+
+        return null;
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getLastModifiedTime() {
+        $stat = $this->stat();
+
+        if (isset($stat["mtime"])) {
+            return (int) $stat["mtime"];
+        }
+
+        return null;
+    }
+
+    /**
+     * @return bool|null
+     */
+    public function isFile() {
+        $stat = $this->stat();
+        if (isset($stat["type"])) {
+            return ($stat["type"] != "folder");
+        }
+
+        return null;
+    }
+
+    /**
+     * @return string
+     */
+    public function getContents() {
+        return $this->stream->getContents();
+    }
+
+    /**
+     * @return bool|mixed
+     */
+    public function stat() {
+
+        $stat = CacheService::fetch(AJXP_CACHE_SERVICE_NS_NODES, $this->cacheOptions["id"]);
+
+        if(is_array($stat)) return $stat;
+
+        $stats = $this->stream->stat();
+
+        // Some APIs will return us multiple uri to avoid having to send multiple requests
+        // So storing them in a local cache
+        if (is_array($stats[0])) {
+            foreach ($stats as $stat) {
+                $path = "/" . $stat["name"];
+
+                if (isset($this->contentFilters[$path])) {
+                    $path = $this->contentFilters[$path];
+                }
+
+                $node = new AJXP_Node($this->uri . "/" . $path);
+
+                $id = AbstractCacheDriver::getOptionsForNode($node, "meta")["id"];
+
+                CacheService::save(AJXP_CACHE_SERVICE_NS_NODES, $id, $stat);
+            }
+        } else {
+            CacheService::save(AJXP_CACHE_SERVICE_NS_NODES, $this->cacheOptions["id"], $stats, $this->cacheOptions["timelimit"]);
+        }
+
+        return CacheService::fetch(AJXP_CACHE_SERVICE_NS_NODES, $this->cacheOptions["id"]);
+    }
+}
diff --git a/core/src/plugins/core.access/src/Stream/OAuthStream.php b/core/src/plugins/core.access/src/Stream/OAuthStream.php
new file mode 100644
index 0000000000..7c343b4884
--- /dev/null
+++ b/core/src/plugins/core.access/src/Stream/OAuthStream.php
@@ -0,0 +1,233 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium SAS <team (at) pyd.io>
+ * This file is part of the Pydio Enterprise Distribution.
+ * It is subject to the End User License Agreement that you should have
+ * received and accepted along with this distribution.
+ */
+
+namespace Pydio\Access\Core\Stream;
+
+use CommerceGuys\Guzzle\Oauth2\GrantType\RefreshToken;
+use CommerceGuys\Guzzle\Oauth2\Oauth2Subscriber;
+use GuzzleHttp\Client;
+use GuzzleHttp\Stream\StreamDecoratorTrait;
+use GuzzleHttp\Stream\StreamInterface;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Stream\Utils\AuthorizationCode;
+use Pydio\Core\Exception\PydioUserAlertException;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\CacheService;
+use Pydio\Core\Utils\FileHelper;
+
+
+/**
+ * Class OAuthStream
+ * @package Pydio\Access\Core\Stream
+ */
+class OAuthStream implements StreamInterface
+{
+    use StreamDecoratorTrait;
+
+    /** @var ContextInterface Context */
+    private $context;
+
+
+    /**
+     * OAuthStream constructor.
+     * @param StreamInterface $stream
+     * @param mixed $base
+     * @throws PydioUserAlertException
+     * @throws \Exception
+     */
+    public function __construct(
+        StreamInterface $stream,
+        $base
+    ) {
+        /** @var AJXP_Node $node */
+        $node = null;
+
+        $context = null;
+
+        if ($base instanceof AJXP_Node) {
+            $node = $base;
+            $context = $node->getContext();
+        } elseif ($base instanceof ContextInterface) {
+            $context = $base;
+        } else {
+            return;
+        }
+
+        $this->context = $context;
+
+        // Repository options
+        $options = $this->getOptions($this->context);
+
+        $authUrl = $options["authUrl"] . $this->getAuthURI($options);
+
+        // Retrieving tokens
+        $tokens = $this->getTokens();
+
+        $accessToken = $tokens[0];
+        $refreshToken = $tokens[1];
+
+        // OAuth 2 Tokens
+        $oauth2Client = new Client(['base_url' => $options["tokenUrl"]]);
+
+        // Mandatory config
+        $config = [
+            'client_id'     => $options["clientId"],
+            'client_secret' => $options["clientSecret"],
+            'redirect_uri'  => $options["redirectUrl"],
+            'token_url'     => '',
+            'auth_location' => 'body',
+        ];
+
+        // Non-mandatory
+        if (!empty($options["scope"])) {
+            $config['scope'] = $options["scope"];
+        }
+
+        $code = Stream::getContextOption($this->context, "oauth_code");
+        // Setting up the subscriber
+        if (isset($code)) {
+            // Authorization code
+            $config['code'] = $code;
+
+            $accessToken = new AuthorizationCode($oauth2Client, $config);
+            $refreshToken = new RefreshToken($oauth2Client, $config);
+
+            $oauth2 = new Oauth2Subscriber($accessToken, $refreshToken);
+        } else if (!empty($accessToken)) {
+            if (empty($refreshToken)) {
+                // Using access token
+                $oauth2 = new Oauth2Subscriber(null, null);
+                $oauth2->setAccessToken($accessToken);
+            } else {
+                // Refresh Token
+                $config['refresh_token'] = $refreshToken;
+
+                $oauth2 = new Oauth2Subscriber(null, new RefreshToken($oauth2Client, $config));
+
+                $oauth2->setAccessToken($accessToken);
+                $oauth2->setRefreshToken($refreshToken);
+            }
+        }
+
+        if (empty($oauth2)) {
+            throw new PydioUserAlertException("Please go to <a style=\"text-decoration:underline;\" href=\"" . $authUrl . "\">" . $authUrl . "</a> to authorize the access to your onedrive. Then try again to switch to this workspace");
+        }
+
+        // Retrieving access token and checking access
+        try {
+            $accessToken = $oauth2->getAccessToken();
+            $refreshToken = $oauth2->getRefreshToken();
+        } catch (\Exception $e) {
+            throw new PydioUserAlertException("Please go to <a style=\"text-decoration:underline;\" href=\"" . $authUrl . "\">" . $authUrl . "</a> to authorize the access to your onedrive. Then try again to switch to this workspace");
+        }
+
+        // Saving tokens for later use
+        $accessToken = $accessToken->getToken();
+        if (isset($refreshToken)) {
+            $refreshToken = $refreshToken->getToken();
+        }
+        $this->setTokens($accessToken, $refreshToken);
+
+        Stream::addContextOption($this->context, [
+            "auth" => "oauth2",
+            "subscribers" => [$oauth2]
+        ]);
+
+        if (isset($node)) {
+            $resource = PydioStreamWrapper::getResource($stream);
+            $this->stream = new Stream($resource, $node);
+        }
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @return array
+     */
+    public function getOptions(ContextInterface $ctx) {
+        $repository = $ctx->getRepository();
+
+        return [
+            "clientId"     => $repository->getContextOption($ctx, 'CLIENT_ID'),
+            "clientSecret" => $repository->getContextOption($ctx, 'CLIENT_SECRET'),
+            "scope"        => $repository->getContextOption($ctx, 'SCOPE'),
+            "authUrl"      => $repository->getContextOption($ctx, 'AUTH_URL'),
+            "tokenUrl"     => $repository->getContextOption($ctx, 'TOKEN_URL'),
+            "redirectUrl"  => $repository->getContextOption($ctx, 'REDIRECT_URL')
+        ];
+    }
+
+    /**
+     * @param array $options
+     * @return string
+     */
+    public function getAuthURI(array $options) {
+        $uri = '?client_id=%s' .
+            '&scope=%s' .
+            '&redirect_uri=%s' .
+            '&response_type=code';
+
+        return sprintf($uri,
+            $options["clientId"],
+            $options["scope"],
+            urlencode($options["redirectUrl"])
+        );
+    }
+
+    /**
+     * @return string key
+     */
+    private function getTokenKey() {
+        return 'OAUTH_' . $this->context->getStringIdentifier() . '_TOKENS';
+    }
+    /**
+     * @return array
+     */
+    private function getTokens()
+    {
+        $key = $this->getTokenKey();
+
+        // TOKENS IN SESSION?
+        if (!empty($_SESSION[$key])) return $_SESSION[$key];
+
+        // TOKENS IN CACHE?
+        if ($tokens = CacheService::fetch(AJXP_CACHE_SERVICE_NS_SHARED, $key)) return $tokens;
+
+        // TOKENS IN FILE ?
+        return FileHelper::loadSerialFile(AJXP_CACHE_DIR . '/' . $key);
+    }
+
+    /**
+     * @param $accessToken
+     * @param $refreshToken
+     * @return bool
+     */
+    private function setTokens($accessToken, $refreshToken)
+    {
+        $key = $this->getTokenKey();
+
+        $value = [$accessToken, $refreshToken];
+
+        // Save in file
+        FileHelper::saveSerialFile(AJXP_CACHE_DIR . '/' . $key, $value, true);
+
+        // Save in cache
+        CacheService::save(AJXP_CACHE_SERVICE_NS_SHARED, $key, $value);
+
+        // Save in session
+        $_SESSION[$key] = $value;
+
+        return true;
+    }
+
+    /**
+     * @return \GuzzleHttp\Ring\Future\FutureInterface|mixed|null|string
+     */
+    public function getContents() {
+        return $this->stream->getContents();
+    }
+}
diff --git a/core/src/plugins/core.access/src/Stream/OAuthWrapper.php b/core/src/plugins/core.access/src/Stream/OAuthWrapper.php
deleted file mode 100644
index 7fca315cc4..0000000000
--- a/core/src/plugins/core.access/src/Stream/OAuthWrapper.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-/*
- * Copyright 2007-2016 Abstrium SAS <team (at) pyd.io>
- * This file is part of the Pydio Enterprise Distribution.
- * It is subject to the End User License Agreement that you should have
- * received and accepted along with this distribution.
- */
-
-namespace Pydio\Access\Core\Stream;
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-require_once(AJXP_BIN_FOLDER . '/guzzle/vendor/autoload.php');
-
-use AJXP_SchemeTranslatorWrapper;
-use AJXP_Utils;
-use AuthService;
-use CacheService;
-use CommerceGuys\Guzzle\Oauth2\GrantType\AuthorizationCode;
-use CommerceGuys\Guzzle\Oauth2\AccessToken;
-use CommerceGuys\Guzzle\Oauth2\GrantType\RefreshToken;
-use CommerceGuys\Guzzle\Oauth2\Oauth2Subscriber;
-use GuzzleHttp\Client as GuzzleClient;
-use ConfService;
-use AJXP_UserAlertException;
-use Exception;
-use GuzzleHttp\Event\ErrorEvent;
-use GuzzleHttp\Exception\RequestException;
-
-class OAuthWrapper extends AJXP_SchemeTranslatorWrapper
-{
-    /**
-     * @param $url
-     * @return bool|void
-     * @throws AJXP_UserAlertException
-     * @throws Exception
-     */
-    public static function applyInitPathHook($url) {
-
-        if (!class_exists('CommerceGuys\Guzzle\Oauth2\Oauth2Subscriber')) {
-            throw new Exception('Oauth plugin not loaded - go to ' . AJXP_BIN_FOLDER . '/guzzle from the command line and run \'composer update\' to install');
-        }
-
-        // Repository information
-        $urlParts = AJXP_Utils::safeParseUrl($url);
-        $repository = ConfService::getRepositoryById($urlParts["host"]);
-
-        if ($repository == null) {
-            throw new Exception("Cannot find repository");
-        }
-
-        $repositoryId = $repository->getId();
-
-        if(AuthService::usersEnabled()) {
-            $u = AuthService::getLoggedUser();
-            $userId = $u->getId();
-            if($u->getResolveAsParent()){
-                $userId = $u->getParent();
-            }
-        } else {
-            $userId = 'shared';
-        }
-
-        // User information
-
-        // Repository params
-        $clientId     = $repository->getOption('CLIENT_ID');
-        $clientSecret = $repository->getOption('CLIENT_SECRET');
-        $scope        = $repository->getOption('SCOPE');
-        $authUrl      = $repository->getOption('AUTH_URL');
-        $tokenUrl     = $repository->getOption('TOKEN_URL');
-        $redirectUrl  = $repository->getOption('REDIRECT_URL');
-
-        $authUrl .= '?client_id=' . $clientId .
-                    '&scope=' . $scope .
-                    '&redirect_uri=' . urlencode($redirectUrl) .
-                    '&response_type=code';
-
-        // Retrieving context
-        $repoData = self::actualRepositoryWrapperData($urlParts["host"]);
-        $repoProtocol = $repoData['protocol'];
-
-        $default = stream_context_get_options(stream_context_get_default());
-
-        // Retrieving subscriber
-        $oauth2 = $default[$repoProtocol]['oauth2_subscriber'];
-
-        if (!empty($oauth2)) {
-            // Authentication already made for this request - move on
-            return true;
-        }
-
-        // Retrieving tokens
-        $tokensKey = self::getTokenKey($repositoryId, $userId);
-        $tokens = self::getTokens($tokensKey);
-
-        $accessToken = $tokens[0];
-        $refreshToken = $tokens[1];
-
-        // OAuth 2 Tokens
-        $oauth2Client = new GuzzleClient(['base_url' => $tokenUrl]);
-
-        $config = [
-            'client_id'     => $clientId,
-            'client_secret' => $clientSecret,
-            'scope'         => $scope,
-            'redirect_uri'  => $redirectUrl,
-            'token_url'     => '',
-            'auth_location' => 'body',
-        ];
-
-        // Setting up the subscriber
-        if (empty($refreshToken) || !empty($_SESSION['oauth_code'])) {
-            // Authorization code
-            $config['code'] = $_SESSION['oauth_code'];
-
-            $accessToken = new AuthorizationCode($oauth2Client, $config);
-            $refreshToken = new RefreshToken($oauth2Client, $config);
-
-            $oauth2 = new Oauth2Subscriber($accessToken, $refreshToken);
-
-            unset($_SESSION['oauth_code']);
-        } else {
-            // Refresh Token
-            $config['refresh_token'] = $refreshToken;
-
-            $oauth2 = new Oauth2Subscriber(null, new RefreshToken($oauth2Client, $config));
-
-            $oauth2->setAccessToken($accessToken);
-            $oauth2->setRefreshToken($refreshToken);
-        }
-
-        // Retrieving access token and checking access
-        try {
-            $accessToken = $oauth2->getAccessToken();
-            $refreshToken = $oauth2->getRefreshToken();
-        } catch (\Exception $e) {
-            throw new AJXP_UserAlertException("Please go to <a style=\"text-decoration:underline;\" href=\"" . $authUrl . "\">" . $authUrl . "</a> to authorize the access to your onedrive. Then try again to switch to this workspace");
-        }
-
-        // Saving tokens for later use
-        self::setTokens($tokensKey, $accessToken->getToken(), $refreshToken->getToken());
-
-        // Saving subscriber in context
-        $default[$repoProtocol]['oauth2_subscriber'] = $oauth2;
-
-        // Retrieving client
-        $client = $default[$repoProtocol]['client'];
-        $httpClient = $client->getHttpClient();
-        $httpClient->getEmitter()->attach($oauth2);
-
-        stream_context_set_default($default);
-
-        return true;
-    }
-
-    /**
-     * @return string key
-     */
-    private static function getTokenKey($repositoryId, $userId) {
-        return 'OAUTH_ONEDRIVE_' . $repositoryId . '_' . $userId . '_TOKENS';
-    }
-    /**
-     * @return Array
-     */
-    private static function getTokens($key)
-    {
-        // TOKENS IN SESSION?
-        if (!empty($_SESSION[$key])) return $_SESSION[$key];
-
-        // TOKENS IN CACHE?
-        if ($tokens = CacheService::fetch(AJXP_CACHE_SERVICE_NS_SHARED, $key)) return $tokens;
-
-        // TOKENS IN FILE ?
-        return AJXP_Utils::loadSerialFile(AJXP_DATA_PATH . '/plugins/access.onedrive/' . $key);
-    }
-
-    /**
-     * @param $oauth_tokens
-     * @return bool
-     * @throws Exception
-     */
-    private function setTokens($key, $accessToken, $refreshToken)
-    {
-        $value = [$accessToken, $refreshToken];
-
-        // Save in file
-        AJXP_Utils::saveSerialFile(AJXP_DATA_PATH . '/plugins/access.onedrive/' . $key, $value, true);
-
-        // Save in cache
-        CacheService::save(AJXP_CACHE_SERVICE_NS_SHARED, $key, $value);
-
-        // Save in session
-        $_SESSION["OAUTH_ONEDRIVE_TOKENS"] = $value;
-
-        return true;
-    }
-
-}
\ No newline at end of file
diff --git a/core/src/plugins/core.access/src/Stream/PathWrapper.php b/core/src/plugins/core.access/src/Stream/PathWrapper.php
deleted file mode 100644
index 5a9e31aa36..0000000000
--- a/core/src/plugins/core.access/src/Stream/PathWrapper.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/*
- * Copyright 2007-2015 Abstrium SAS <team (at) pyd.io>
- * This file is part of the Pydio Enterprise Distribution.
- * It is subject to the End User License Agreement that you should have
- * received and accepted along with this distribution.
- */
-
-namespace Pydio\Access\Core\Stream;
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-use AJXP_SchemeTranslatorWrapper;
-use AJXP_Utils;
-use CacheService;
-use ConfService;
-
-class PathWrapper extends AJXP_SchemeTranslatorWrapper
-{
-    const CACHE_KEY='PathWrapperParams';
-
-    /*
-     * @array localParams
-     */
-    protected static $localParams = [];
-
-    public static function applyInitPathHook($url, $context = 'core')
-    {
-        $params = [];
-        $parts = AJXP_Utils::safeParseUrl($url);
-
-        if (! ($params = self::getLocalParams(self::CACHE_KEY . $url)) ) {
-
-            // Nothing in cache
-            $repositoryId = $parts["host"];
-            $repository = ConfService::getRepositoryById($parts["host"]);
-            if ($repository == null) {
-                throw new \Exception("Cannot find repository");
-            }
-
-            $configHost = $repository->getOption('HOST');
-            $configPath = $repository->getOption('PATH');
-
-            $params['path'] = $parts['path'];
-            $params['basepath'] = $configPath;
-
-            $params['itemname'] = basename($params['path']);
-
-            // Special case for root dir
-            if (empty($params['path']) || $params['path'] == '/') {
-                $params['path'] = '/';
-            }
-
-            $params['path'] = dirname($params['path']);
-            $params['fullpath'] = rtrim($params['path'], '/') . '/' . $params['itemname'];
-            $params['base_url'] = $configHost;
-
-            $params['keybase'] = $repositoryId . $params['fullpath'];
-            $params['key'] = md5($params['keybase']);
-
-            self::addLocalParams(self::CACHE_KEY . $url, $params);
-        }
-
-        $repoData = self::actualRepositoryWrapperData($parts["host"]);
-        $repoProtocol = $repoData['protocol'];
-
-        $default = stream_context_get_options(stream_context_get_default());
-        $default[$repoProtocol]['path'] = $params;
-
-        $default[$repoProtocol]['client']->setDefaultUrl($configHost);
-        stream_context_set_default($default);
-    }
-
-    /**
-     * @return array
-     */
-    public function getLocalParams($key)
-    {
-        return isset(static::$localParams[$key]) ? static::$localParams[$key] : false;
-    }
-
-    /**
-     * @param $key
-     * @param $value
-     * @internal param array $localParams
-     */
-    public function addLocalParams($key, $value)
-    {
-        static::$localParams[$key] = $value;
-    }
-
-
-}
diff --git a/core/src/plugins/core.access/src/Stream/PydioStreamWrapper.php b/core/src/plugins/core.access/src/Stream/PydioStreamWrapper.php
new file mode 100644
index 0000000000..233992f932
--- /dev/null
+++ b/core/src/plugins/core.access/src/Stream/PydioStreamWrapper.php
@@ -0,0 +1,154 @@
+<?php
+namespace Pydio\Access\Core\Stream;
+use GuzzleHttp\Stream\StreamInterface;
+
+
+/**
+ * Converts Guzzle streams into PHP stream resources.
+ */
+class PydioStreamWrapper
+{
+    /** @var resource */
+    public $context;
+
+    /** @var StreamInterface */
+    private $stream;
+
+    /** @var string r, r+, or w */
+    private $mode;
+
+    /**
+     * Returns a resource representing the stream.
+     *
+     * @param StreamInterface $stream The stream to get a resource for
+     *
+     * @return resource
+     * @throws \InvalidArgumentException if stream is not readable or writable
+     */
+    public static function getResource(StreamInterface $stream)
+    {
+        self::register();
+
+        if ($stream->isReadable()) {
+            $mode = $stream->isWritable() ? 'r+' : 'r';
+        } elseif ($stream->isWritable()) {
+            $mode = 'w';
+        } else {
+            throw new \InvalidArgumentException('The stream must be readable, '
+                . 'writable, or both.');
+        }
+
+        return fopen('pydiostreamwrapper://stream', $mode, null, stream_context_create([
+            'pydiostreamwrapper' => ['stream' => $stream]
+        ]));
+    }
+
+    /**
+     * Registers the stream wrapper if needed
+     */
+    public static function register()
+    {
+        if (!in_array('pydiostreamwrapper', stream_get_wrappers())) {
+            stream_wrapper_register('pydiostreamwrapper', __CLASS__);
+        }
+    }
+
+    /**
+     * @param $path
+     * @param $mode
+     * @param $options
+     * @param $opened_path
+     * @return bool
+     */
+    public function stream_open($path, $mode, $options, &$opened_path)
+    {
+        $options = stream_context_get_options($this->context);
+
+        if (!isset($options['pydiostreamwrapper']['stream'])) {
+            return false;
+        }
+
+        $this->mode = $mode;
+        $this->stream = $options['pydiostreamwrapper']['stream'];
+
+        return true;
+    }
+
+    /**
+     * @param $count
+     * @return string
+     */
+    public function stream_read($count)
+    {
+        $data = $this->stream->read($count);
+        return $data;
+    }
+
+    /**
+     * @param $data
+     * @return int
+     */
+    public function stream_write($data)
+    {
+        return (int) $this->stream->write($data);
+    }
+
+    /**
+     * @return bool|int
+     */
+    public function stream_tell()
+    {
+        return $this->stream->tell();
+    }
+
+    /**
+     * @return bool
+     */
+    public function stream_eof()
+    {
+        return $this->stream->eof();
+    }
+
+    /**
+     * @param $offset
+     * @param $whence
+     * @return bool
+     */
+    public function stream_seek($offset, $whence)
+    {
+        return $this->stream->seek($offset, $whence);
+    }
+
+    /**
+     * @return array|bool
+     */
+    public function stream_stat()
+    {
+        $isFile = $this->stream->isFile();
+
+        if ($isFile  === TRUE) {
+            $mode = 0100000;
+            $mode |= 0777;
+        } elseif ($isFile  === FALSE) {
+            $mode = 00040777;
+        } else {
+            return false;
+        }
+
+        return [
+            'dev'     => 0,
+            'ino'     => 0,
+            'mode'    => $mode,
+            'nlink'   => 0,
+            'uid'     => 0,
+            'gid'     => 0,
+            'rdev'    => 0,
+            'size'    => $this->stream->getSize() ?: 0,
+            'atime'   => 0,
+            'mtime'   => $this->stream->getLastModifiedTime() ?: 0,
+            'ctime'   => 0,
+            'blksize' => 0,
+            'blocks'  => 0
+        ];
+    }
+}
diff --git a/core/src/plugins/core.access/src/Stream/Stream.php b/core/src/plugins/core.access/src/Stream/Stream.php
new file mode 100644
index 0000000000..373411ed24
--- /dev/null
+++ b/core/src/plugins/core.access/src/Stream/Stream.php
@@ -0,0 +1,538 @@
+<?php
+namespace Pydio\Access\Core\Stream;
+
+use Exception;
+use Guzzle\Service\Loader\JsonLoader;
+use GuzzleHttp\Client;
+use GuzzleHttp\Command\Command;
+use GuzzleHttp\Command\Guzzle\Description;
+use GuzzleHttp\Command\Guzzle\GuzzleClient;
+use GuzzleHttp\Stream\GuzzleStreamWrapper;
+use GuzzleHttp\Stream\Stream as GuzzleStream;
+use GuzzleHttp\Stream\StreamInterface;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Core\Model\ContextInterface;
+use Symfony\Component\Config\FileLocator;
+
+
+/**
+ * Decorator used to return only a subset of a stream
+ */
+class Stream implements StreamInterface
+{
+    private $resource;
+    private $size;
+    private $lastModifiedTime;
+    private $customMetadata;
+
+    /** @var AJXP_Node $node */
+    private $node;
+
+    /** @var GuzzleClient $client */
+    private $client;
+
+    /** @var Client $httpClient */
+    private $httpClient;
+
+    /** @var Command $command */
+    private $command;
+
+    private $seekable = true;
+    private $readable = true;
+    private $writable = true;
+
+    /** @var array Hash of readable and writable stream types */
+    private static $readWriteHash = [
+        'read' => [
+            'r' => true, 'w+' => true, 'r+' => true, 'x+' => true, 'c+' => true,
+            'rb' => true, 'w+b' => true, 'r+b' => true, 'x+b' => true,
+            'c+b' => true, 'rt' => true, 'w+t' => true, 'r+t' => true,
+            'x+t' => true, 'c+t' => true, 'a+' => true
+        ],
+        'write' => [
+            'w' => true, 'w+' => true, 'rw' => true, 'r+' => true, 'x+' => true,
+            'c+' => true, 'wb' => true, 'w+b' => true, 'r+b' => true,
+            'x+b' => true, 'c+b' => true, 'w+t' => true, 'r+t' => true,
+            'x+t' => true, 'c+t' => true, 'a' => true, 'a+' => true
+        ]
+    ];
+
+    /**
+     * Stream constructor.
+     * @param $resource
+     * @param AJXP_Node $node
+     * @param $options
+     * @throws \Exception
+     */
+    public function __construct(
+        $resource,
+        AJXP_Node $node,
+        $options = []
+    ) {
+
+        $this->node = $node;
+
+        $ctx = $node->getContext();
+        $repository = $ctx->getRepository();
+
+
+        $this->customMetadata["uri"] = $node->getUrl();
+
+        $this->attach($resource);
+
+        $this->readable = isset($options['readable']) ? $options['readable'] : $this->readable;
+        $this->writable = isset($options['writable']) ? $options['writable'] : $this->writable;
+
+        $apiUrl = $repository->getContextOption($ctx, "API_URL");
+        $host = $repository->getContextOption($ctx, "HOST");
+        $uri = $repository->getContextOption($ctx, "URI");
+
+        if ($apiUrl == "") {
+            $apiUrl = $options["api_url"];
+
+            if ($apiUrl == "") {
+                $apiUrl = $host . $uri;
+            }
+        }
+
+        $options["base_url"] = $apiUrl;
+        $this->httpClient = new Client([
+            "base_url" => $apiUrl
+        ]);
+
+        $options["defaults"] = self::getContextOption($ctx);
+        $resources = $options["defaults"]["resources"];
+
+        $locator = new FileLocator([dirname($resources)]);
+        $jsonLoader = new JsonLoader($locator);
+        $description = $jsonLoader->load($locator->locate(basename($resources)));
+        $description = new Description($description);
+        $client = new GuzzleClient($this->httpClient, $description);
+
+        foreach ($options["defaults"]["subscribers"] as $subscriber) {
+            $client->getEmitter()->attach($subscriber);
+        }
+
+        $this->client = $client;
+    }
+
+    /**
+     * @param string $resource
+     * @param string $mode
+     * @param array $options
+     * @return GuzzleStream|Stream
+     */
+    public static function factory($resource = '', $mode = "r+", array $options = []) {
+        if ($resource instanceof AJXP_Node) {
+
+            $node = $resource;
+
+            return new self(fopen('php://memory', $mode), $node, [
+                "readable" => isset(self::$readWriteHash['read'][$mode]),
+                "writable" => isset(self::$readWriteHash['write'][$mode])
+            ]);
+        }
+
+        return GuzzleStream::factory($resource, $options);
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $arr
+     */
+    public static function addContextOption(ContextInterface $ctx, array $arr) {
+
+        $default = stream_context_get_options(stream_context_get_default());
+
+        $contextKey = "access." . $ctx->getRepository()->getAccessType();
+
+        foreach ($arr as $key => $value) {
+            if (is_array($value)) {
+                $orig = [];
+                if (isset($default[$contextKey][$key])) {
+                    $orig = $default[$contextKey][$key];
+                }
+                $default[$contextKey][$key] = array_merge($orig, $value);
+            } else {
+                $default[$contextKey][$key] = $value;
+            }
+        }
+
+        stream_context_set_default($default);
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param null $key
+     * @param null $default
+     * @return null
+     */
+    public static function getContextOption(ContextInterface $ctx, $key = null, $default = null) {
+        $options = stream_context_get_options(stream_context_get_default());
+
+        $contextKey = "access." . $ctx->getRepository()->getAccessType();
+
+        if ($key != null && isset($options[$contextKey][$key])) {
+            return $options[$contextKey][$key];
+        } elseif ($key == null) {
+            return $options[$contextKey];
+        }
+
+        return $default;
+    }
+
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        if (!$this->resource) {
+            return '';
+        }
+
+        $this->seek(0);
+
+        return (string) stream_get_contents($this->resource);
+    }
+
+    /**
+     * @return \GuzzleHttp\Ring\Future\FutureInterface|mixed|null
+     */
+    public function getContents()
+    {
+        $uri = $this->getMetadata("uri");
+
+        if (!is_file($uri)) {
+            return $this->ls();
+        } else {
+            return $this->get();
+        }
+    }
+
+    public function close()
+    {
+        if (is_resource($this->resource)) {
+            fclose($this->resource);
+        }
+
+        $this->detach();
+    }
+
+    /**
+     * @return mixed
+     */
+    public function detach()
+    {
+        $result = $this->resource;
+        $this->resource = $this->size = null;
+        $this->readable = $this->writable = $this->seekable = false;
+
+        return $result;
+    }
+
+    /**
+     * @param resource $stream
+     */
+    public function attach($stream) {
+        $this->resource = $stream;
+        $meta = stream_get_meta_data($this->resource);
+        $this->seekable = $meta['seekable'];
+
+        $this->readable = isset(self::$readWriteHash['read'][$meta['mode']]);
+        $this->writable = isset(self::$readWriteHash['write'][$meta['mode']]);
+    }
+
+    /**
+     * Returns the size of the limited subset of data
+     * {@inheritdoc}
+     */
+    public function getSize() {
+        if ($this->size !== null) {
+            return $this->size;
+        }
+
+        if (!$this->resource) {
+            return null;
+        }
+
+        // Clear the stat cache if the stream has a URI
+        $uri = $this->getMetadata("uri");
+        if (isset($uri)) {
+            clearstatcache(true, $uri);
+        }
+
+        $stat = $this->stat();
+
+        if (isset($stat["size"])) {
+            $this->size = (int) $stat["size"];
+            return $this->size;
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns the size of the limited subset of data
+     * {@inheritdoc}
+     */
+    public function getLastModifiedTime() {
+        if ($this->lastModifiedTime !== null) {
+            return $this->lastModifiedTime;
+        }
+
+        if (!$this->resource) {
+            return null;
+        }
+
+        // Clear the stat cache if the stream has a URI
+        $uri = $this->getMetadata("uri");
+        if (isset($uri)) {
+            clearstatcache(true, $uri);
+        }
+
+        $stat = $this->stat();
+
+        if (isset($stat["mtime"])) {
+            $this->lastModifiedTime = (int) $stat["mtime"];
+            return $this->lastModifiedTime;
+        }
+
+        return null;
+    }
+
+    /**
+     * @return bool|null
+     */
+    public function isFile() {
+        if (!$this->resource) {
+            return null;
+        }
+
+        // Clear the stat cache if the stream has a URI
+        $uri = $this->getMetadata("uri");
+        if (isset($uri)) {
+            clearstatcache(true, $uri);
+        }
+
+        $stat = $this->stat();
+        if (isset($stat["type"])) {
+            return ($stat["type"] != "folder");
+        }
+
+        return null;
+    }
+
+    /**
+     * @return bool|mixed
+     */
+    public function isReadable() {
+        return $this->readable;
+    }
+
+    /**
+     * @return bool|mixed
+     */
+    public function isWritable() {
+        return $this->writable;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isSeekable() {
+        return $this->seekable;
+    }
+
+    /**
+     * @return bool
+     */
+    public function eof() {
+        return !$this->resource || feof($this->resource);
+    }
+
+    /**
+     * Allow for a bounded seek on the read limited stream
+     * {@inheritdoc}
+     */
+    public function seek($offset, $whence = SEEK_SET) {
+        return $this->seekable
+            ? fseek($this->resource, $offset, $whence) === 0
+            : false;
+    }
+
+    /**
+     * Give a relative tell()
+     * {@inheritdoc}
+
+
+     */
+    public function tell() {
+        return $this->resource ? ftell($this->resource) : false;
+    }
+
+    /**
+     * @param int $length
+     * @return bool|string
+     */
+    public function read($length) {
+        return $this->readable ? fread($this->resource, $length) : false;
+    }
+
+    /**
+     * @param string $buffer
+     * @return int|null
+     */
+    public function write($buffer) {
+        // We can't know the size after writing anything
+        $this->detach();
+
+        $type = gettype($buffer);
+
+        if ($type == "string") {
+            $stream = Stream::factory($buffer);
+        } else {
+            $stream = $buffer;
+            $stream->seek(0);
+        }
+
+        $this->attach(GuzzleStreamWrapper::getResource($stream));
+
+        $this->size = $stream->getSize();
+
+        $command = $this->client->getCommand('Put', [
+            'path'    => $this->node,
+            'headers' => [
+                "Content-Length" => $this->size
+            ],
+            'body' => $this->resource
+        ]);
+
+        $this->client->execute($command);
+
+        return $stream->getSize();
+    }
+
+    /**
+     * @param null $key
+     * @return array|mixed|null
+     */
+    public function getMetadata($key = null) {
+        if (!$this->resource) {
+            return $key ? null : [];
+        } elseif (isset($this->customMetadata[$key])) {
+            return $this->customMetadata[$key];
+        } elseif ($this->resource instanceof GuzzleStream) {
+            return $this->resource->getMetadata($key);
+        } elseif (!$key) {
+            return $this->customMetadata + stream_get_meta_data($this->resource);
+        }
+    }
+
+    /**
+     * @param null $cmdName
+     * @throws Exception
+     */
+    private function prepare($cmdName = null) {
+
+        $options = self::getContextOption($this->node->getContext());
+        $options = array_intersect_key($options, ["subscribers" => "", "auth" => ""]);
+
+        if (!isset($this->httpClient)) {
+            $this->httpClient = new Client($options);
+        } else {
+            foreach ($options as $key => $option) {
+                $this->httpClient->setDefaultOption($key, $option);
+            }
+        }
+
+        if (!isset($cmdName)) {
+            return;
+        }
+
+        $this->command = $this->client->getCommand($cmdName, [
+            'path' => $this->node
+        ]);
+    }
+
+    /**
+     * @return \GuzzleHttp\Ring\Future\FutureInterface|mixed|null
+     */
+    private function ls() {
+
+        $this->prepare('Ls');
+
+        $result = $this->client->execute($this->command);
+
+        return $result;
+    }
+
+    /**
+     * @return \GuzzleHttp\Ring\Future\FutureInterface|mixed|null
+     */
+    private function get() {
+
+        $this->prepare('Get');
+
+        $result = $this->client->execute($this->command);
+
+        $this->detach();
+        $this->attach(GuzzleStreamWrapper::getResource($result["body"]));
+
+        return $result;
+    }
+
+    /**
+     * @return \GuzzleHttp\Ring\Future\FutureInterface|mixed|null
+     */
+    public function stat() {
+
+        $this->prepare('Stat');
+
+        try {
+            $result = $this->client->execute($this->command);
+        } catch (Exception $e) {
+            return null;
+        }
+
+        return $result;
+    }
+
+    /**
+     * @return bool
+     */
+    public function mkdir() {
+
+        $this->prepare('Mkdir');
+
+        $this->client->execute($this->command);
+
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function rmdir() {
+
+        $this->prepare('Rmdir');
+
+        $this->client->execute($this->command);
+
+        return true;
+    }
+
+    /**
+     * @param $newNode
+     * @return bool
+     */
+    public function rename($newNode) {
+        $this->client->getCommand('Rename', [
+            'path'    => $this->node,
+            'newPath' => $newNode
+        ]);
+
+        $this->client->execute($this->command);
+
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.access/src/Stream/StreamWrapper.php b/core/src/plugins/core.access/src/Stream/StreamWrapper.php
index ce55f74cfb..9ac4cf6f0e 100755
--- a/core/src/plugins/core.access/src/Stream/StreamWrapper.php
+++ b/core/src/plugins/core.access/src/Stream/StreamWrapper.php
@@ -16,692 +16,338 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 namespace Pydio\Access\Core\Stream;
+use ArrayIterator;
+use GuzzleHttp\Stream\StreamInterface;
+use Pydio\Access\Core\IAjxpWrapper;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Core\Services\ApplicationState;
+
+use Pydio\Core\Utils\FileHelper;
+use React\Promise\Deferred;
 
-use AJXP_Utils;
-use GuzzleHttp\Exception\BadResponseException;
-use GuzzleHttp\Exception\ClientException;
-use GuzzleHttp\Exception\RequestException;
-use Pydio\Access\Core\Stream\Exception\NotFoundException;
-use RecursiveArrayIterator;
-use RecursiveIteratorIterator;
-use Pydio\Access\Core\Stream\ClientInterface;
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Stream\CachingStream;
 
 /**
- * Standard stream wrapper to use files with PHP streams, supporting "r", "w", "a", "x".
- *
- * # Supported stream related PHP functions:
- * - fopen, fclose, fread, fwrite, fseek, ftell, feof, fflush
- * - opendir, closedir, readdir, rewinddir
- * - copy, rename, unlink
- * - mkdir, rmdir, rmdir (recursive)
- * - file_get_contents, file_put_contents
- * - file_exists, filesize, is_file, is_dir
- *
+ * Standard stream wrapper to use files with Pydio streams, supporting "r", "w", "a", "x".
  */
-class StreamWrapper
+class StreamWrapper implements IAjxpWrapper
 {
-    /**
-     * @var AbstractClient Client used to send requests
-     */
-    protected static $client;
-
-    /**
-     * @var string Mode the stream was opened with
-     */
-    protected $mode;
+    /** @var resource */
+    public $context;
 
-    /**
-     * @var EntityBody Underlying stream resource
-     */
-    protected $body;
-
-    /**
-     * @var array Current parameters to use with the flush operation
-     */
-    protected $params;
-
-    /**
-     * @var DirIterator Iterator used with opendir() and subsequent readdir() calls
-     */
-    protected $objectIterator;
+    /** @var StreamInterface */
+    private $stream;
 
-    /**
-     * @var string the current protocol
-     */
-    private $protocol;
+    /** @var string r, r+, or w */
+    private $mode;
 
-    /**
-     * @var array The next key to retrieve when using a directory iterator. Helps for fast directory traversal.
-     */
-    protected static $nextStat = array();
+    /** @var Deferred */
+    private $deferred;
 
-    /**
-     * @var array The list of files not found received as response
-     * If we receive a 404 once, we should be able to tell if we created the file after that
-     */
-    protected static $filesNotFound = array();
+    /** @var ArrayIterator */
+    private $iterator;
 
     /**
-     * Register the stream wrapper
-     *
-     * @param Client $client to use with the stream wrapper
+     * Registers the stream wrapper if needed
+     * @param $protocol
      */
-    public static function register (
-        ClientInterface $client,
-        $protocol
-    ) {
-        if (in_array($protocol, stream_get_wrappers())) {
-            stream_wrapper_unregister($protocol);
+    public static function register($protocol) {
+        if (!in_array($protocol, stream_get_wrappers())) {
+            stream_wrapper_register($protocol, __CLASS__);
         }
-
-        // Set the client passed in as the default stream context client
-        stream_wrapper_register($protocol, get_called_class(), STREAM_IS_URL);
-
-        $default = stream_context_get_options(stream_context_get_default());
-        $default[$protocol]['client'] = $client;
-        stream_context_set_default($default);
-    }
-
-    public static function applyInitPathHook($url) {
-        // Do nothing
-    }
-
-    /**
-     * Close the stream
-     */
-    public function stream_close()
-    {
-        $this->body = null;
     }
 
     /**
      * @param string $path
      * @param string $mode
-     * @param int    $options
+     * @param int $options
      * @param string $opened_path
-     *
      * @return bool
      */
-    public function stream_open($path, $mode, $options, &$opened_path)
-    {
-        $this->mode = $mode = rtrim($mode, 'bt');
-        $this->params = $params = $this->getParams($path);
-        $errors = array();
-
-        if (!in_array($mode, array('r', 'w', 'a', 'x', '+'))) {
-            $errors[] = "Mode not supported: {$mode}. Use one 'r', 'w', 'a', or 'x'.";
-        }
+    public function stream_open($path, $mode, $options, &$opened_path) {
+        $this->stream = self::createStream($path, $mode);
 
-        if (!$errors) {
-            if ($mode == 'r') {
-                return $this->openReadStream($params, $errors);
-            } elseif ($mode == 'a') {
-                return $this->openAppendStream($params, $errors);
-            } else {
-                return $this->openWriteStream($params, $errors);
-            }
-        }
-
-        return $this->triggerError($errors);
+        return true;
     }
 
     /**
-     * @return bool
+     * @return mixed
      */
-    public function stream_eof()
-    {
-        return $this->body->eof();
+    public function stream_stat() {
+        return $this->stream->stat();
     }
 
     /**
-     * @return bool
+     * @param string $data
+     * @return int
      */
-    public function stream_flush()
-    {
-        if ($this->mode == 'r') {
-            return false;
-        }
-
-        $this->body->seek(0);
-
-        $params = $this->params;
-        $params['body'] = $this->body;
-
-        try {
-            $this->getClient()->put($params);
-        } catch (\Exception $e) {
-            $this->triggerError("Unable to write content : " . $e->getMessage());
-            return false;
-        }
-
-        $this->clearStatInfo($params['path/key']);
-
-        return true;
+    public function stream_write($data) {
+        return (int) $this->stream->write($data);
     }
 
     /**
-     * Read data from the underlying stream
-     *
-     * @param int $count Amount of bytes to read
-     *
+     * @param int $count
      * @return string
      */
-    public function stream_read($count)
-    {
-        return $this->body->read($count);
+    public function stream_read($count) {
+        return $this->stream->read($count);
     }
 
     /**
-     * Seek to a specific byte in the stream
-     *
-     * @param int $offset Seek offset
-     * @param int $whence Whence (SEEK_SET, SEEK_CUR, SEEK_END)
-     *
-     * @return bool
+     * @return bool|int
      */
-    public function stream_seek($offset, $whence = SEEK_SET)
-    {
-        return $this->body->seek($offset, $whence);
+    public function stream_tell() {
+        return $this->stream->tell();
     }
 
     /**
-     * Get the current position of the stream
-     *
-     * @return int Returns the current position in the stream
+     * @return bool
      */
-    public function stream_tell()
-    {
-        return $this->body->ftell();
+    public function stream_eof() {
+        return $this->stream->eof();
     }
 
     /**
-     * Write data the to the stream
-     *
-     * @param string $data
-     *
-     * @return int Returns the number of bytes written to the stream
+     * @param int $offset
+     * @param int $whence
+     * @return bool
      */
-    public function stream_write($data)
-    {
-        return $this->body->write($data);
+    public function stream_seek($offset, $whence=SEEK_SET) {
+        return $this->stream->seek($offset, $whence);
+    }
+
+    public function stream_close() {
+        $this->stream->close();
     }
 
     /**
-     * Delete a specific object
-     *
-     * @param string $path
+     * @param $path
+     * @param $options
      * @return bool
      */
-    public function unlink($path)
-    {
-        $params = $this->getParams($path);
+    public function dir_opendir($path, $options) {
+        $this->stream = self::createStream($path);
 
-        try {
-            $this->clearStatInfo($path);
-            $this->getClient()->delete($params);
-        } catch (\Exception $e) {
-            $this->triggerError("Unable to delete item : " . $e->getMessage());
-            return false;
-        }
+        // TODO - do that asynchronously
+        $contents = $this->stream->getContents();
+        $this->iterator = new ArrayIterator($contents);
 
         return true;
     }
-
+    
     /**
-     * @return array
+     * @return bool
      */
-    public function stream_stat()
-    {
-        $stat = @fstat($this->body);
-
-        // Add the size of the underlying stream if it is known
-        if ($this->mode == 'r' && $this->body->getSize()) {
-            $stat[7] = $stat['size'] = $this->body->getSize();
+    public function dir_readdir() {
+        if (!$this->iterator->valid()) {
+            return false;
         }
 
-        return $stat;
-    }
-
-    /*
-     * Wrapper around stat
-     */
-    public function file_exists($path) {
-        $params = $this->getParams($path);
-
-        $key = $params['path/key'];
+        $current =  $this->iterator->current();
 
-        if (isset(static::$filesNotFound[$key])) {
-            return false;
-        }
+        $this->iterator->next();
 
-        return file_exists($path);
+        return $current["name"];
     }
-
     /**
-     * Provides information for is_dir, is_file, filesize, etc. Works on buckets, keys, and prefixes
-     *
-     * @param string $path
-     * @param int    $flags
-     *
-     * @return array Returns an array of stat data
-     * @link http://www.php.net/manual/en/streamwrapper.url-stat.php
+     * @return bool
      */
-    public function url_stat($path, $flags)
-    {
-        $params = $this->getParams($path);
-
-        $key = $params['path/key'];
-
-        if (isset(static::$nextStat[$key])) {
-            return static::$nextStat[$key];
-        }
-
-        try {
-            $result = $this->getClient()->stat($params);
-
-            if ($result) {
-                $result = $this->getClient()->formatUrlStat($result);
-
-                static::$nextStat[$key] = $result;
-            }
-        } catch (ClientException $e) {
-            if ($e->getCode() == 404) {
-                static::$nextStat[$key] = false;
-                return false;
-            }
-        } catch (\Exception $e) {
-            static::$nextStat[$key] = false;
-            return $this->triggerError('Cannot access file ' . $e->getMessage(), $flags);
-        }
-
-        return $result;
+    public function dir_closedir() {
+        $this->iterator = null;
+        $this->stream->close();
+        return true;
     }
 
     /**
-     * Support for mkdir().
-     *
-     * @param string $path    Directory which should be created.
-     * @param int    $mode    Permissions. 700-range permissions map to ACL_PUBLIC. 600-range permissions map to
-     *                        ACL_AUTH_READ. All other permissions map to ACL_PRIVATE. Expects octal form.
-     * @param int    $options A bitwise mask of values, such as STREAM_MKDIR_RECURSIVE.
-     *
      * @return bool
-     * @link http://www.php.net/manual/en/streamwrapper.mkdir.php
      */
-    public function mkdir($path, $mode, $options)
-    {
-        $params = $this->getParams($path);
-
-        $key = $params['path/key'];
-
-        $this->clearStatInfo($key);
-
-        try {
-            $result = $this->getClient()->mkdir($params);
-        } catch (\Exception $e) {
-            $this->triggerError("Unable to create directory : " . $e->getMessage());
-            return false;
+    public function dir_rewinddir() {
+        if (isset($this->iterator)) {
+            $this->iterator->rewind();
         }
 
-        return $result;
+        return true;
     }
 
     /**
-     * Support for rmdir().
+     * Enter description here...
      *
-     * @param string $path the directory path
-     * @param int    $options A bitwise mask of values
-     *
-     * @return bool true if directory was successfully removed
-     * @link http://www.php.net/manual/en/streamwrapper.rmdir.php
+     * @param string $path
+     * @param int $mode
+     * @param int $options
+     * @return bool
      */
-    public function rmdir($path, $options)
-    {
-        $params = $this->getParams($path);
-
-        $key = $params['path/key'];
-
-        $this->clearStatInfo($key);
-
-        try {
-            $result = $this->getClient()->rmdir($params);
-        } catch (\Exception $e) {
-            $this->triggerError("Unable to remove directory : " . $e->getMessage());
-            return false;
-        }
-
-        return $result;
+    public function mkdir($path, $mode, $options) {
+        $stream = self::createStream($path);
+        
+        return $stream->mkdir();
     }
 
     /**
-     * Support for opendir().
+     * Enter description here...
      *
-     * @param string $path    The path to the directory (e.g. "s3://dir[</prefix>]")
-     * @param string $options Whether or not to enforce safe_mode (0x04). Unused.
-     *
-     * @return bool true on success
-     * @see http://www.php.net/manual/en/function.opendir.php
+     * @param string $path
+     * @param int $options
+     * @return bool
      */
-    public function dir_opendir($path, $options)
-    {
-        $params = $this->getParams($path);
-
-        try {
-            $result = $this->getClient()->ls($params);
-        } catch (\Exception $e) {
-            $this->triggerError("Unable to list directory : " . $e->getMessage());
-        }
+    public function rmdir($path, $options) {
+        $stream = self::createStream($path);
 
-        $this->objectIterator = $this->getClient()->getIterator($result, $params);
-
-        return true;
+        return $stream->rmdir();
     }
 
     /**
-     * Close the directory listing handles
-     *
-     * @return bool true on success
+     * @param string $oldName
+     * @param string $newName
+     * @return bool
      */
-    public function dir_closedir()
-    {
-        $this->objectIterator = null;
+    public function rename($oldName, $newName) {
 
-        return true;
+        $stream = self::createStream($oldName);
+
+        return $stream->rename(new AJXP_Node($newName));
     }
 
     /**
-     * This method is called in response to rewinddir()
-     *
-     * @return boolean true on success
+     * @param string $path
+     * @param int $flags
+     * @return array
      */
-    public function dir_rewinddir()
-    {
-        $this->objectIterator->rewind();
+    public function url_stat($path, $flags) {
+        $stream = self::createStream($path);
+        $resource = PydioStreamWrapper::getResource($stream);
+        $stat = fstat($resource);
+        fclose($resource);
 
-        return true;
+        return $stat;
     }
 
     /**
-     * This method is called in response to readdir()
-     *
-     * @return string Should return a string representing the next filename, or false if there is no next file.
-     *
-     * @link http://www.php.net/manual/en/function.readdir.php
+     * @param String $url
+     * @return bool
      */
-    public function dir_readdir()
-    {
-        // Skip empty result keys
-        if (!$this->objectIterator->valid()) {
-            return false;
-        }
-
-        $current = $this->objectIterator->current();
-
-        $this->objectIterator->next();
-
-        static::$nextStat[$current[1]] = $current[2];
-
-        return $current[0];
+    public static function isSeekable($url) {
+        return true;
     }
 
     /**
-     * Called in response to rename() to rename a file or directory. Currently only supports renaming objects.
-     *
-     * @param string $path_from the path to the file to rename
-     * @param string $path_to   the new path to the file
-     *
-     * @return bool true if file was successfully renamed
-     * @link http://www.php.net/manual/en/function.rename.php
+     * @return bool
      */
-    public function rename($path_from, $path_to)
-    {
-        $paramsTo = $this->getParams($path_to, "to");
-        $paramsFrom = $this->getParams($path_from, "from");
-
-        $params = $paramsTo + $paramsFrom;
-
-        $this->clearStatInfo($path_from);
-        $this->clearStatInfo($path_to);
-
-        try {
-            $result = $this->getClient()->rename($params);
-        } catch (\Exception $e) {
-            $this->triggerError("Unable to rename item : " . $e->getMessage());
-            return false;
-        }
-
+    public static function isRemote() {
         return true;
     }
 
     /**
-     * Get the params from the passed path
-     *
-     * @param string $path Path passed to the stream wrapper
-     *
-     * @return array Hash of custom params
+     * @param string $path
+     * @param bool $persistent
+     * @return string
      */
-    protected function getParams($path, $mainPrefix = "")
-    {
-        $parts = explode('://', $path, 2);
-        $this->protocol = $parts[0];
-
-        $default = stream_context_get_options(stream_context_get_default());
-        $default['core']['currentProtocol'] = $this->protocol;
-        stream_context_set_default($default);
-
-        $parts = AJXP_Utils::safeParseUrl($path);
-
-        $params = [];
+    public static function getRealFSReference($path, $persistent = false) {
+        $nodeStream = self::createStream($path);
+        $nodeStream->getContents();
 
-        $default = stream_context_get_options(stream_context_get_default());
-
-        $it = new RecursiveArrayIterator($default[$this->protocol]);
+        $tmpFile = ApplicationState::getAjxpTmpDir() ."/".md5(time()).".".pathinfo($path, PATHINFO_EXTENSION);
+        $tmpHandle = fopen($tmpFile, "wb");
 
-        foreach ($it as $k => $v) {
-            $prefix = $mainPrefix . $k . "/";
+        self::copyStreamInStream(PydioStreamWrapper::getResource($nodeStream), $tmpHandle);
 
-            $itChild = new RecursiveArrayIterator($default[$this->protocol][$k]);
+        fclose($tmpHandle);
 
-            foreach ($itChild as $kChild => $vChild) {
-                $params[$prefix . $kChild] = $vChild;
-            }
+        if (!$persistent) {
+            register_shutdown_function(function() use($tmpFile){
+                FileHelper::silentUnlink($tmpFile);
+            }, $tmpFile);
         }
-
-        // TODO - add call to parent client
-        $params["parentReference"] = [
-            "path" => "/drive/root:" . dirname($parts['path'])
-        ];
-
-        $params[$mainPrefix . 'path/itemname'] = basename($parts['path']);
-        $params[$mainPrefix . 'path/path']     = dirname($parts['path']);
-        $params[$mainPrefix . 'path/fullpath'] = rtrim(dirname($parts['path']), '/') . '/' . basename($parts['path']);
-        $params[$mainPrefix . 'path/fulluri'] = $params[$mainPrefix . 'path/basepath'] . '/' . $params[$mainPrefix . 'path/fullpath'];
-
-        return $params;
+        return $tmpFile;
     }
 
     /**
-     * Initialize the stream wrapper for a read only stream
-     *
-     * @param array $params Operation parameters
-     * @param array $errors Any encountered errors to append to
-     *
-     * @return bool
+     * @param string $path
+     * @param resource $stream
      */
-    protected function openReadStream(array $params, array &$errors)
-    {
-        // Create the command and serialize the request
-        try {
-            $response = $this->getClient()->open($params);
-        } catch (\Exception $e) {
-            $this->triggerError("Unable to open stream : " . $e->getMessage());
-            return false;
-        }
-
-        $this->body = $response->getBody();
+    public static function copyFileInStream($path, $stream) {
+        $nodeStream = self::createStream($path);
+        $nodeStream->getContents();
 
-        return true;
+        self::copyStreamInStream(PydioStreamWrapper::getResource($nodeStream), $stream);
     }
 
     /**
-     * Initialize the stream wrapper for a write only stream
-     *
-     * @param array $params Operation parameters
-     * @param array $errors Any encountered errors to append to
-     *
-     * @return bool
+     * @param $from
+     * @param $to
      */
-    protected function openWriteStream(array $params, array &$errors)
-    {
-        $this->body = Stream::factory(fopen('php://temp', 'r+'));
-
-        return true;
+    public static function copyStreamInStream($from, $to) {
+        while (!feof($from)) {
+            $data = fread($from, 4096);
+            fwrite($to, $data, strlen($data));
+        }
     }
 
     /**
-     * Initialize the stream wrapper for an append stream
-     *
-     * @param array $params Operation parameters
-     * @param array $errors Any encountered errors to append to
-     *
-     * @return bool
+     * @param string $path
+     * @param number $chmodValue
      */
-    protected function openAppendStream(array $params, array &$errors)
-    {
-        try {
-            $this->body->seek(0, SEEK_END);
-        } catch (\Exception $e) {
-            // The object does not exist, so use a simple write stream
-            $this->openWriteStream($params, $errors);
-        }
-
-        return true;
+    public static function changeMode($path, $chmodValue) {
     }
 
     /**
-     * Trigger one or more errors
-     *
-     * @param string|array $errors Errors to trigger
-     * @param mixed        $flags  If set to STREAM_URL_STAT_QUIET, then no error or exception occurs
-     *
-     * @return bool Returns false
-     * @throws RuntimeException if throw_errors is true
+     * @param $path
+     * @param string $mode
+     * @return \GuzzleHttp\Stream\Stream|AuthStream|MetadataCachingStream|OAuthStream|Stream|WriteBufferStream
+     * @throws \Exception
      */
-    protected function triggerError($errors, $flags = null)
-    {
-        if ($flags & STREAM_URL_STAT_QUIET) {
-          // This is triggered with things like file_exists()
-
-          if ($flags & STREAM_URL_STAT_LINK) {
-            // This is triggered for things like is_link()
-            return $this->getClient()->formatUrlStat([]);
-          }
-          return false;
-        }
+    public static function createStream($path, $mode = "r+") {
+        $node = new AJXP_Node($path);
+        $repository = $node->getRepository();
+        $ctx = $node->getContext();
+
+        $useOAuthStream = $repository->getContextOption($ctx, "USE_OAUTH_STREAM", false);
+        $useAuthStream = $repository->getContextOption($ctx, "USE_AUTH_STREAM", !$useOAuthStream);
+
+        $nodeStream = Stream::factory($node, $mode);
+        if ($useAuthStream) $nodeStream = new AuthStream($nodeStream, $node);
+        if ($useOAuthStream) $nodeStream = new OAuthStream($nodeStream, $node);
+
+        $nodeStream = new MetadataCachingStream($nodeStream, $node);
+        $nodeStream = new WriteBufferStream($nodeStream, $node);
 
-        // This is triggered when doing things like lstat() or stat()
-        trigger_error(implode("\n", (array) $errors), E_USER_WARNING);
+        PydioStreamWrapper::getResource($nodeStream);
 
-        return false;
+        return $nodeStream;
     }
 
     /**
-     * Clear the next stat result from the cache
-     *
-     * @param string $path If a path is specific, clearstatcache() will be called
+     * @param AJXP_Node $node
+     * @return array
      */
-    protected function clearStatInfo($path = null)
+    public static function getResolvedOptionsForNode($node)
     {
-        if ($path) {
-            unset(static::$nextStat[$path]);
-            clearstatcache(true, $path);
-        } else {
-            static::$nextStat = array();
-            clearstatcache(true);
-        }
+        // TODO: Implement getResolvedOptionsForNode() method.
+        // Create a generic HTTP Type inc. Authentication data
+        return ["TYPE" => "php"];
     }
 
     /**
-     * Determine the most appropriate ACL based on a file mode.
-     *
-     * @param int $mode File mode
+     * Enter description here...
      *
-     * @return string
+     * @return bool
      */
-    private function determineAcl($mode)
-    {
-        $mode = decoct($mode);
-
-        if ($mode >= 700 && $mode <= 799) {
-            return 'public-read';
-        }
-
-        if ($mode >= 600 && $mode <= 699) {
-            return 'authenticated-read';
-        }
-
-        return 'private';
-    }
-
-    public static function getRealFSReference($path, $persistent = false)
-    {
-        $tmpFile = AJXP_Utils::getAjxpTmpDir()."/".md5(time()).".".pathinfo($path, PATHINFO_EXTENSION);
-        $tmpHandle = fopen($tmpFile, "wb");
-
-        self::copyFileInStream($path, $tmpHandle);
-
-        fclose($tmpHandle);
-
-        if (!$persistent) {
-            register_shutdown_function(array("AJXP_Utils", "silentUnlink"), $tmpFile);
-        }
-        return $tmpFile;
-    }
-
-    public static function copyFileInStream($path, $stream)
-    {
-        $fp = fopen($path, "r");
-        if(!is_resource($fp)) return;
-        while (!feof($fp)) {
-            $data = fread($fp, 4096);
-            fwrite($stream, $data, strlen($data));
-        }
-        fclose($fp);
-    }
-
-    public static function changeMode($path, $chmodValue)
+    public function stream_flush()
     {
-        @chmod($path, $chmodValue);
-    }
-
-    public static function isSeekable($url) {
-        return true;
-    }
-
-    public static function isRemote() {
-        return true;
+        //$this->stream->flush();
     }
 
     /**
-     * Gets the client from the stream context
+     * Enter description here...
      *
-     * @return Client
-     * @throws Exception if no client has been configured
+     * @param string $path
+     * @return bool
      */
-    private function getClient()
+    public function unlink($path)
     {
-        $default = stream_context_get_options(stream_context_get_default());
-
-        if (!$client = $default[$this->protocol]['client']) {
-            throw new \Exception('No client defined for '. $this->protocol);
-        }
-
-        return $client;
+        // TODO: Implement unlink() method.
     }
-}
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.access/src/Stream/Utils/AuthorizationCode.php b/core/src/plugins/core.access/src/Stream/Utils/AuthorizationCode.php
new file mode 100644
index 0000000000..898ff41b4c
--- /dev/null
+++ b/core/src/plugins/core.access/src/Stream/Utils/AuthorizationCode.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Pydio\Access\Core\Stream\Utils;
+
+use CommerceGuys\Guzzle\Oauth2\GrantType\GrantTypeBase;
+
+/**
+ * Created by PhpStorm.
+ * User: ghecquet
+ * Date: 24/06/16
+ * Time: 17:50
+ */
+class AuthorizationCode extends GrantTypeBase
+{
+    protected $grantType = 'authorization_code';
+
+    /**
+     * @inheritdoc
+     */
+    protected function getDefaults()
+    {
+        $defaults = parent::getDefaults() + ['redirect_uri' => ''];
+        unset($defaults['scope']);
+
+        return $defaults;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getRequired()
+    {
+        return array_merge(parent::getRequired(), ['code']);
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.access/src/Stream/WriteBufferStream.php b/core/src/plugins/core.access/src/Stream/WriteBufferStream.php
new file mode 100644
index 0000000000..c08ad68dc8
--- /dev/null
+++ b/core/src/plugins/core.access/src/Stream/WriteBufferStream.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace Pydio\Access\Core\Stream;
+
+use GuzzleHttp\Stream\Stream as GuzzleStream;
+use GuzzleHttp\Stream\StreamDecoratorTrait;
+use GuzzleHttp\Stream\StreamInterface;
+use Pydio\Access\Core\Model\AJXP_Node;
+
+/**
+ * Provides a buffer stream that can be written to to fill a buffer, and read
+ * from to remove bytes from the buffer.
+ *
+ * This stream returns a "hwm" metadata value that tells upstream consumers
+ * what the configured high water mark of the stream is, or the maximum
+ * preferred size of the buffer.
+ *
+ * @package GuzzleHttp\Stream
+ */
+class WriteBufferStream implements StreamInterface {
+
+    use StreamDecoratorTrait;
+
+    /** @var StreamInterface $bufferStream */
+    private $bufferStream;
+
+    private $size;
+    private $hwm;
+
+    /**
+     * @param StreamInterface $stream
+     * @param AJXP_Node $node
+     * @param int $hwm High water mark, representing the preferred maximum
+     *                 buffer size. If the size of the buffer exceeds the high
+     *                 water mark, then calls to write will continue to succeed
+     *                 but will return false to inform writers to slow down
+     *                 until the buffer has been drained by reading from it.
+     */
+    public function __construct(
+        StreamInterface $stream,
+        AJXP_Node $node,
+        $hwm = -1) {
+
+        $this->bufferStream = new GuzzleStream(fopen('php://temp', 'w+'));
+
+        $this->stream = $stream;
+
+        $this->hwm = $hwm;
+    }
+
+    /**
+     * @return string
+     */
+    public function getContents() {
+        return $this->stream->getContents();
+    }
+
+    public function close() {
+        if ($this->size > 0) {
+            $this->stream->write($this->bufferStream);
+        }
+
+        $this->size = 0;
+        $this->stream->close();
+    }
+
+    /**
+     * Writes data to the buffer.
+     * @param string $string
+     * @return bool|int
+     */
+    public function write($string)
+    {
+        $this->size += $this->bufferStream->write($string);
+
+        if ($this->hwm > 0 && $this->size >= $this->hwm) {
+            $this->stream->write($this->bufferStream->getContents());
+
+            $this->size = 0;
+
+            return false;
+        }
+
+        return strlen($string);
+    }
+}
diff --git a/core/src/plugins/core.access/tests/Stream/StreamTest.php b/core/src/plugins/core.access/tests/Stream/StreamTest.php
new file mode 100644
index 0000000000..9370103d13
--- /dev/null
+++ b/core/src/plugins/core.access/tests/Stream/StreamTest.php
@@ -0,0 +1,90 @@
+<?php
+namespace Pydio\Access\Core\Tests\Stream;
+
+require __DIR__ . '/../../../../core/vendor/autoload.php';
+
+include_once(__DIR__ . "/../../../../base.conf.php");
+
+use PHPUnit_Framework_TestCase;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Stream\Stream;
+use Symfony\Component\Config\FileLocator;
+
+/**
+ * @covers GuzzleHttp\Stream\Stream
+ */
+class StreamTest extends PHPUnit_Framework_TestCase
+{
+    const RESOURCES_PATH = __DIR__;
+    const RESOURCES_FILE = "test.json";
+
+    // TESTS :
+    // For the test to pass,
+    // you need to create a mock api here http://www.mocky.io/
+    // with this json in return {"test":"ok"}
+    // and a Content-Length header of 13
+    // and replace the id in the test.json file
+    public function testConstructorInitializesProperties()
+    {
+        $node = new AJXP_Node("pydio.dropbox://admin:Alanci3nn5@0/test");
+
+        $stream = Stream::factory($node, [
+            "api_url" => "http://www.mocky.io/v2/",
+            "api_resources_path" => self::RESOURCES_PATH,
+            "api_resources_file" => self::RESOURCES_FILE
+        ]);
+
+        $this->assertTrue($stream->isReadable());
+        $this->assertTrue($stream->isWritable());
+        $this->assertTrue($stream->isSeekable());
+        $this->assertEquals('pydio.dropbox://admin:Alanci3nn5@0/test', $stream->getMetadata('uri'));
+        $this->assertInternalType('array', $stream->getMetadata());
+        $this->assertEquals(13, $stream->getSize());
+        $this->assertFalse($stream->eof());
+
+        $stream->close();
+    }
+
+    public function testStreamClosesHandleOnDestruct()
+    {
+        $node = new AJXP_Node("pydio.dropbox://admin:Alanci3nn5@0/test");
+
+        $stream = Stream::factory($node, [
+            "api_resources_path" => self::RESOURCES_PATH,
+            "api_resources_file" => self::RESOURCES_FILE
+        ]);
+
+        unset($stream);
+        $this->assertFalse(is_resource($node));
+    }
+
+    public function testCloseClearProperties()
+    {
+        $node = new AJXP_Node("pydio.dropbox://admin:Alanci3nn5@0/test");
+
+        $stream = Stream::factory($node, [
+            "api_resources_path" => self::RESOURCES_PATH,
+            "api_resources_file" => self::RESOURCES_FILE
+        ]);
+        $stream->close();
+
+        $this->assertEmpty($stream->getMetadata());
+        $this->assertFalse($stream->isSeekable());
+        $this->assertFalse($stream->isReadable());
+        $this->assertFalse($stream->isWritable());
+        $this->assertNull($stream->getSize());
+    }
+
+    public function testReturnsCustomMetadata()
+    {
+        $node = new AJXP_Node("pydio.dropbox://admin:Alanci3nn5@0/test");
+
+        $s = Stream::factory($node, [
+            "api_resources_path" => self::RESOURCES_PATH,
+            "api_resources_file" => self::RESOURCES_FILE,
+            'metadata' => ['hwm' => 3]
+        ]);
+        $this->assertEquals(3, $s->getMetadata('hwm'));
+        $this->assertArrayHasKey('hwm', $s->getMetadata());
+    }
+}
diff --git a/core/src/plugins/core.access/tests/Stream/test.json b/core/src/plugins/core.access/tests/Stream/test.json
new file mode 100644
index 0000000000..84d8abdf9d
--- /dev/null
+++ b/core/src/plugins/core.access/tests/Stream/test.json
@@ -0,0 +1,46 @@
+{
+    "name" : "Test Client",
+    "description" : "Test REST API client",
+    "operations" : {
+        "Stat" : {
+            "httpMethod" : "GET",
+            "uri": "57625f95100000970e8b13d7",
+            "responseClass": "BodyOutput"
+        },
+        "Open" : {
+            "httpMethod" : "GET"
+        },
+        "Mkdir" : {
+            "httpMethod" : "POST"
+        },
+        "Rmdir" : {
+            "httpMethod" : "DELETE"
+        },
+        "Rename" : {
+            "httpMethod" : "MOVE"
+        },
+        "Put" : {
+            "httpMethod" : "PUT"
+        },
+        "Delete" : {
+            "httpMethod": "DELETE"
+        }
+    },
+    "models": {
+        "BodyOutput": {
+            "type": "object",
+            "properties": {
+                "type" : {
+                    "location": "header",
+                    "sentAs": "Content-Type",
+                    "type": "string"
+                },
+                "size": {
+                    "location": "header",
+                    "sentAs": "Content-Length",
+                    "type": "string"
+                }
+            }
+        }
+    }
+}
diff --git a/core/src/plugins/core.access/vendor/autoload.php b/core/src/plugins/core.access/vendor/autoload.php
deleted file mode 100644
index dd372c74a9..0000000000
--- a/core/src/plugins/core.access/vendor/autoload.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-// autoload.php @generated by Composer
-
-require_once __DIR__ . '/composer' . '/autoload_real.php';
-
-return ComposerAutoloaderInitdb0e61827bdd5825c2893f85204a44e9::getLoader();
diff --git a/core/src/plugins/core.access/vendor/composer/ClassLoader.php b/core/src/plugins/core.access/vendor/composer/ClassLoader.php
deleted file mode 100644
index ff6ecfb822..0000000000
--- a/core/src/plugins/core.access/vendor/composer/ClassLoader.php
+++ /dev/null
@@ -1,413 +0,0 @@
-<?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;
-
-    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;
-    }
-
-    /**
-     * 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)
-    {
-        // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
-        if ('\\' == $class[0]) {
-            $class = substr($class, 1);
-        }
-
-        // class map lookup
-        if (isset($this->classMap[$class])) {
-            return $this->classMap[$class];
-        }
-        if ($this->classMapAuthoritative) {
-            return false;
-        }
-
-        $file = $this->findFileWithExtension($class, '.php');
-
-        // Search for Hack files if we are running on HHVM
-        if ($file === null && defined('HHVM_VERSION')) {
-            $file = $this->findFileWithExtension($class, '.hh');
-        }
-
-        if ($file === null) {
-            // Remember that this class does not exist.
-            return $this->classMap[$class] = false;
-        }
-
-        return $file;
-    }
-
-    private function findFileWithExtension($class, $ext)
-    {
-        // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
-
-        $first = $class[0];
-        if (isset($this->prefixLengthsPsr4[$first])) {
-            foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
-                            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;
-        }
-    }
-}
-
-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- */
-function includeFile($file)
-{
-    include $file;
-}
diff --git a/core/src/plugins/core.access/vendor/composer/LICENSE b/core/src/plugins/core.access/vendor/composer/LICENSE
deleted file mode 100644
index c8d57af8b2..0000000000
--- a/core/src/plugins/core.access/vendor/composer/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-
-Copyright (c) 2015 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/src/plugins/core.access/vendor/composer/autoload_classmap.php b/core/src/plugins/core.access/vendor/composer/autoload_classmap.php
deleted file mode 100644
index 7a91153b0d..0000000000
--- a/core/src/plugins/core.access/vendor/composer/autoload_classmap.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-// autoload_classmap.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-);
diff --git a/core/src/plugins/core.access/vendor/composer/autoload_namespaces.php b/core/src/plugins/core.access/vendor/composer/autoload_namespaces.php
deleted file mode 100644
index b7fc0125db..0000000000
--- a/core/src/plugins/core.access/vendor/composer/autoload_namespaces.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-// autoload_namespaces.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-);
diff --git a/core/src/plugins/core.access/vendor/composer/autoload_psr4.php b/core/src/plugins/core.access/vendor/composer/autoload_psr4.php
deleted file mode 100644
index f9068ac50e..0000000000
--- a/core/src/plugins/core.access/vendor/composer/autoload_psr4.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-// autoload_psr4.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-    'Pydio\\Access\\Core\\' => array($baseDir . '/src'),
-);
diff --git a/core/src/plugins/core.access/vendor/composer/autoload_real.php b/core/src/plugins/core.access/vendor/composer/autoload_real.php
deleted file mode 100644
index ca49302d42..0000000000
--- a/core/src/plugins/core.access/vendor/composer/autoload_real.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-// autoload_real.php @generated by Composer
-
-class ComposerAutoloaderInitdb0e61827bdd5825c2893f85204a44e9
-{
-    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('ComposerAutoloaderInitdb0e61827bdd5825c2893f85204a44e9', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitdb0e61827bdd5825c2893f85204a44e9', 'loadClassLoader'));
-
-        $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);
-
-        return $loader;
-    }
-}
diff --git a/core/src/plugins/core.access/vendor/composer/installed.json b/core/src/plugins/core.access/vendor/composer/installed.json
deleted file mode 100644
index fe51488c70..0000000000
--- a/core/src/plugins/core.access/vendor/composer/installed.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
diff --git a/core/src/plugins/core.ajaxplorer/ajxp_mixins.xml b/core/src/plugins/core.ajaxplorer/ajxp_mixins.xml
index 360b4477da..c62c1ce8fc 100644
--- a/core/src/plugins/core.ajaxplorer/ajxp_mixins.xml
+++ b/core/src/plugins/core.ajaxplorer/ajxp_mixins.xml
@@ -2,6 +2,7 @@
 <ajxp_mixins xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:ajxp_registry.xsd">
     <credentials_consumer>
         <server_settings uuidAttr="name">
+            <param group="MIXIN_MESSAGE[User Credentials]" name="USE_AUTH_STREAM" type="hidden" mandatory="true" default="true" />
             <param group="MIXIN_MESSAGE[User Credentials]" name="USER" type="string" label="MIXIN_MESSAGE[User]" description="MIXIN_MESSAGE[User name - Can be overriden on a per-user basis (see users 'Personal Data' tab)]" mandatory="false"/>
             <param group="MIXIN_MESSAGE[User Credentials]" name="PASS" type="password" label="MIXIN_MESSAGE[Password]" description="MIXIN_MESSAGE[User password - Can be overriden on a per-user basis.]" mandatory="false"/>
             <param group="MIXIN_MESSAGE[User Credentials]" name="USE_SESSION_CREDENTIALS" type="boolean" label="MIXIN_MESSAGE[Session credentials]" description="MIXIN_MESSAGE[Try to use the current Pydio user credentials for connecting. Warning, the AJXP_SESSION_SET_CREDENTIALS config must be set to true!]" mandatory="false" default="false"/>
@@ -46,7 +47,6 @@
     </filesystem_commons>
     <authdriver_commons>
         <server_settings uuidAttr="name">
-            <param group="MIXIN_MESSAGE[Auth Driver Commons]" name="TRANSMIT_CLEAR_PASS" type="hidden" label="MIXIN_MESSAGE[Transmit Clear Pass]" description="MIXIN_MESSAGE[Whether the password will be transmitted clear or encoded between the client and the server]" default="true"/>
             <param group="MIXIN_MESSAGE[Auth Driver Commons]" name="AUTOCREATE_AJXPUSER" type="boolean" label="MIXIN_MESSAGE[Auto Create User]" description="MIXIN_MESSAGE[When set to true, the user object is created automatically if the authentication succeed. Used by remote authentication systems.]" mandatory="false" default="false"/>
             <param group="MIXIN_MESSAGE[Auth Driver Commons]" name="LOGIN_REDIRECT" type="string" label="MIXIN_MESSAGE[Login Redirect]" description="MIXIN_MESSAGE[If set to a given URL, the login action will not trigger the display of login screen but redirect to this URL.]" mandatory="false"/>
             <param group="MIXIN_MESSAGE[Auth Driver Commons]" name="AJXP_ADMIN_LOGIN" type="string" label="MIXIN_MESSAGE[Admin Login]" description="MIXIN_MESSAGE[For exotic auth drivers, an user ID that must be considered as admin by default.]" mandatory="false"/>
@@ -106,9 +106,10 @@
     </dibidriver_third_provider>
     <oauth_commons>
         <server_settings uuidAttr="name">
+            <param group="MIXIN_MESSAGE[OAuth Commons]" name="USE_OAUTH_STREAM" label="MIXIN_MESSAGE[OAuth Stream enabled]" description="MIXIN_MESSAGE[OAuth Stream enabled]" type="hidden" default="true" mandatory="true"/>
             <param group="MIXIN_MESSAGE[OAuth Commons]" name="CLIENT_ID" type="string" label="MIXIN_MESSAGE[Client ID]" description="MIXIN_MESSAGE[Client ID]" mandatory="true"/>
             <param group="MIXIN_MESSAGE[OAuth Commons]" name="CLIENT_SECRET" type="string" label="MIXIN_MESSAGE[Client SECRET]" description="MIXIN_MESSAGE[Client SECRET]" mandatory="true"/>
-            <param group="MIXIN_MESSAGE[OAuth Commons]" name="SCOPE" type="string" label="MIXIN_MESSAGE[Scope]" description="MIXIN_MESSAGE[Scope]" mandatory="true"/>
+            <param group="MIXIN_MESSAGE[OAuth Commons]" name="SCOPE" type="string" label="MIXIN_MESSAGE[Scope]" description="MIXIN_MESSAGE[Scope]" default=""/>
             <param group="MIXIN_MESSAGE[OAuth Commons]" name="AUTH_URL" type="string" label="MIXIN_MESSAGE[Auth URL]" description="MIXIN_MESSAGE[API endpoint - Used to launch the window allowing the user to authenticate and accept the terms of the app]" mandatory="true"/>
             <param group="MIXIN_MESSAGE[OAuth Commons]" name="TOKEN_URL" type="string" label="MIXIN_MESSAGE[Token URL]" description="MIXIN_MESSAGE[API endpoint - Used to refresh or validate the token retrieved in the authentication part]" mandatory="true"/>
             <param group="MIXIN_MESSAGE[OAuth Commons]" name="REDIRECT_URL" type="string" label="MIXIN_MESSAGE[Redirect URL]" description="MIXIN_MESSAGE[API setting - Redirect URL for the OAuth Application]" mandatory="true"/>
diff --git a/core/src/plugins/core.ajaxplorer/ajxp_registry.xsd b/core/src/plugins/core.ajaxplorer/ajxp_registry.xsd
index ff15748d45..53b6cf709e 100644
--- a/core/src/plugins/core.ajaxplorer/ajxp_registry.xsd
+++ b/core/src/plugins/core.ajaxplorer/ajxp_registry.xsd
@@ -521,6 +521,7 @@
                 <xs:element minOccurs="0" ref="clientCallback"/>
                 <xs:element minOccurs="0" maxOccurs="100" ref="clientForm"/>
                 <xs:element minOccurs="0" ref="dialogOnOpen"/>
+                <xs:element minOccurs="0" ref="dialogOnComplete"/>
                 <xs:element minOccurs="0" ref="extensionOnInit"/>
                 <xs:element minOccurs="0" ref="clientListener"/>
                 <xs:element minOccurs="0" ref="standardFormDefinition"/>
diff --git a/core/src/plugins/core.ajaxplorer/i18n-template.php b/core/src/plugins/core.ajaxplorer/i18n-template.php
index c9d2c69079..29a1f66aff 100644
--- a/core/src/plugins/core.ajaxplorer/i18n-template.php
+++ b/core/src/plugins/core.ajaxplorer/i18n-template.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 );
diff --git a/core/src/plugins/core.ajaxplorer/i18n/ca.php b/core/src/plugins/core.ajaxplorer/i18n/ca.php
index a70cdf2ef7..7690491ac4 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/ca.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/ca.php
@@ -17,7 +17,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 //	Catalan translation: Jose Fco Martinez <josefmc.martinez@gmail.com>
 //	Catalan translation: Salva Gómez <salva.gomez at gmail.com> 2015
@@ -51,7 +51,7 @@
 "22" => "Script PHP",
 "23" => "Fitxer",
 "24" => "Directori superior",
-"25" => "Envía un fitxer o més (max ".ConfService::getConf('UPLOAD_MAX_NUMBER').") al directori: ",
+"25" => "Envía un fitxer o més (max ". \Pydio\Core\Services\ConfService::getConf('UPLOAD_MAX_NUMBER').") al directori: ",
 "26" => "Crear nou arxiu en: ",
 "27" => "Envia",
 "28" => "Crear nou arxiu en: ",
@@ -593,7 +593,6 @@
 "534" => "Contrasenya emprada per acceder",
 "535" => "Enviar contrasenya per correu electrònic",
 "536" => "Enviar un correu electrònic de benvinguda incloent la contrasenya per al nou usuari",
-
 "plugtype.title.access" => "Drivers de repositori",
 "plugtype.desc.access" => "Plugins que defineixen com un repositori accedirà tant al seu back-end (sistema d'arxius o similar) i a les principals accions y dissenys.",
 "plugtype.title.action" => "Plugins d'acció",
@@ -648,7 +647,12 @@
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
 "548" => "Decline",
-    "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
-    "550" => "Reject this share",
-    "551" => "Reject",
-);
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
+"556" => "Launching task %s in background",
+
+);
\ No newline at end of file
diff --git a/core/src/plugins/core.ajaxplorer/i18n/conf/de.php b/core/src/plugins/core.ajaxplorer/i18n/conf/de.php
index f55730baf0..2ff908fdaa 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/conf/de.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 /*******************************************************************************
diff --git a/core/src/plugins/core.ajaxplorer/i18n/conf/en.php b/core/src/plugins/core.ajaxplorer/i18n/conf/en.php
index 45a6f41fc6..b681c2053e 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/conf/en.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Main"      => "Main Options",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/conf/fr.php b/core/src/plugins/core.ajaxplorer/i18n/conf/fr.php
index 9e4530a6d2..85202b157d 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/conf/fr.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Main"      => "Options principales",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/conf/it.php b/core/src/plugins/core.ajaxplorer/i18n/conf/it.php
index 168eca7062..a4f939c6ef 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/conf/it.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Main"      => "Opzioni Principali",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/conf/pt.php b/core/src/plugins/core.ajaxplorer/i18n/conf/pt.php
index 2331b0994b..fe6e2618da 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/conf/pt.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Main"      => "Opções Principais",
diff --git a/core/src/plugins/core.ajaxplorer/i18n/cs.php b/core/src/plugins/core.ajaxplorer/i18n/cs.php
index 31cb872bf6..63148cd1b7 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/cs.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/cs.php
@@ -1,23 +1,23 @@
 <?php
 /*
- * Copyright 2007-2014 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
+* Copyright 2007-2014 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+* This file is part of Pydio.
+*
+* Pydio is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Affero General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* Pydio 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 Affero General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+*
+* The latest code can be found at <https://pydio.com>.
+*/
 $mess=array(
 "languageLabel" => "Čeština",
 "date_intl_locale" => "cs_CZ",
@@ -57,7 +57,7 @@
 "22" => "PHP skript",
 "23" => "Soubor",
 "24" => "Nadřazený adresář",
-"25" => "Nahrát jeden nebo více souborů (max. \".ConfService::getConf('UPLOAD_MAX_NUMBER').\") do adresáře : ",
+"25" => "Nahrát jeden nebo více souborů (max. ". \Pydio\Core\Services\ConfService::getConf('UPLOAD_MAX_NUMBER').") do adresáře : ",
 "26" => "Vytvořit nový adresář v : ",
 "27" => "Nahrát",
 "28" => "Vytvořit nový soubor v : ",
@@ -257,7 +257,6 @@
 "204" => "Velikost souboru \"",
 "205" => "\" překračuje povolený limit (",
 "206" => "Mb).\\nSoubor nebude nahrán.",
-/* END SENTENCE */
 "207" => "Nemáte právo zápisu na tento adresář",
 "208" => "Nemáte právo čtení z tohoto adresáře",
 "209" => "Vnitřní chyba serveru, kontaktujte prosím svého administrátora!",
@@ -433,7 +432,6 @@
 "375" => "Varování: nebyli jste aktivní více než __IDLE__, budete odhlášeni za __LOGOUT__",
 "376" => "Klikněte kamkoliv pro aktivaci",
 "378" => "Varování: heslo je prázdné nebo příliš krátké!",
-/* password strength tester */
 "379" => "Nespolehlivé slovo!",
 "380" => "Příliš krátké",
 "381" => "Velmi slabé",
@@ -646,7 +644,11 @@
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
 "548" => "Decline",
-    "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
-    "550" => "Reject this share",
-    "551" => "Reject",
-);
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
+"556" => "Launching task %s in background",
+);
\ No newline at end of file
diff --git a/core/src/plugins/core.ajaxplorer/i18n/da.php b/core/src/plugins/core.ajaxplorer/i18n/da.php
index 8ca9803f85..680ce1301a 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/da.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/da.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 //  Dansk oversættelse: Mike Johnsen
@@ -53,7 +53,7 @@
 "22" => "PHP script",
 "23" => "Fil",
 "24" => "Et niveau op",
-"25" => "Upload en eller flere filer (maks. ".ConfService::getConf('UPLOAD_MAX_NUMBER').") i biblioteket : ",
+"25" => "Upload en eller flere filer (maks. ". \Pydio\Core\Services\ConfService::getConf('UPLOAD_MAX_NUMBER').") i biblioteket : ",
 "26" => "Opret nyt bibliotek i : ",
 "27" => "Upload",
 "28" => "Opret ny fil i : ",
@@ -652,5 +652,9 @@
 "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
 "550" => "Reject this share",
 "551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
+"556" => "Launching task %s in background",
 /* END SENTENCE */
-);
+);
\ No newline at end of file
diff --git a/core/src/plugins/core.ajaxplorer/i18n/de.php b/core/src/plugins/core.ajaxplorer/i18n/de.php
index 436b306a7f..1aeb308e26 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/de.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 /*******************************************************************************
@@ -24,7 +24,7 @@
 *   + update: Axel Otterstätter <axel.otterstaetter@googlemail.com>
 *   + update: Stefan Huber <sh@signalwerk.ch>
 *   + update: Martin Schaible <martin@martinschaible.ch>
-*******************************************************************************/  
+*******************************************************************************/
 $mess=array(
 "languageLabel" => "Deutsch",
 "date_intl_locale" => "de_DE",
@@ -64,7 +64,7 @@
 "22" => "PHP-Skript",
 "23" => "Datei",
 "24" => "Aufwärts",
-"25" => "Eine oder mehrere Dateien (max. ".ConfService::getConf('UPLOAD_MAX_NUMBER').") in folgenden Ordner hochladen: ",
+"25" => "Eine oder mehrere Dateien (max. ". \Pydio\Core\Services\ConfService::getConf('UPLOAD_MAX_NUMBER').") in folgenden Ordner hochladen: ",
 "26" => "Erstelle einen neuen Ordner in: ",
 "27" => "Hochladen",
 "28" => "Erstelle neue Datei in: ",
@@ -264,7 +264,6 @@
 "204" => "Die Datei \"",
 "205" => "\" ist größer als die maximal erlaubte Dateigröße (",
 "206" => "Mb).\\nDie Datei konnte nicht hochgeladen werden.",
-/* END SENTENCE */
 "207" => "Sie haben keine Schreibrechte in diesem Ordner",
 "208" => "Sie haben keine Leserechte in diesem Ordner",
 "209" => "Ein interner Serverfehler ist aufgetreten. Wenden Sie sich bitte an den Systemadministrator!",
@@ -440,7 +439,6 @@
 "375" => "Achtung, Inaktivität seit mehr als __IDLE__. Ein automatischer Logout erfolgt in __LOGOUT__.",
 "376" => "Zum Zurücksetzen irgendwo klicken",
 "378" => "Achtung! Sie haben entweder ein leeres oder ein zu kurzes Passwort eingegeben!",
-/* password strength tester */
 "379" => "Unsicheres Passwort!",
 "380" => "Zu kurz",
 "381" => "Sehr unsicher",
@@ -656,4 +654,10 @@
 "549" => "Sie haben die Freigabe des Benutzers %%OWNER%% von einem entfernten System bereits akzeptiert. Möchten Sie diese nun ablehnen?",
 "550" => "Freigabe ablehnen",
 "551" => "Ablehnen",
-);
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
+"556" => "Launching task %s in background",
+/* END SENTENCE */
+/* password strength tester */
+);
\ No newline at end of file
diff --git a/core/src/plugins/core.ajaxplorer/i18n/en.php b/core/src/plugins/core.ajaxplorer/i18n/en.php
index dc605cb21c..42dfb68f46 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/en.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "languageLabel" => "English",
@@ -57,7 +57,7 @@
 "22" => "PHP script",
 "23" => "File",
 "24" => "Parent directory",
-"25" => "Upload one or more files (max. ".ConfService::getConf('UPLOAD_MAX_NUMBER').") in the directory : ",
+"25" => "Upload one or more files (max. ". \Pydio\Core\Services\ConfService::getConf('UPLOAD_MAX_NUMBER').") in the directory : ",
 "26" => "Create a new directory in : ",
 "27" => "Upload",
 "28" => "Create a new file in : ",
@@ -649,4 +649,8 @@
 "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
 "550" => "Reject this share",
 "551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
+"556" => "Launching task %s in background",
 ); 
diff --git a/core/src/plugins/core.ajaxplorer/i18n/es.php b/core/src/plugins/core.ajaxplorer/i18n/es.php
index 998f477874..8d896597de 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/es.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/es.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 //	spanish translation: Mikel Pascual Aldabaldetreku <mikel.paskual@gmail.com>, 2008
 //	spanish translation: Mikel Pascual Aldabaldetreku <mikel.paskual@gmail.com>, 2009
@@ -55,7 +55,7 @@
 "22" => "Script PHP",
 "23" => "Archivo",
 "24" => "Carpeta superior",
-"25" => "Subir uno más archivos (max ".ConfService::getConf('UPLOAD_MAX_NUMBER').") a la carpeta: ",
+"25" => "Subir uno más archivos (max ". \Pydio\Core\Services\ConfService::getConf('UPLOAD_MAX_NUMBER').") a la carpeta: ",
 "26" => "Crear nueva carpeta en: ",
 "27" => "Subir",
 "28" => "Crear nuevo archivo en: ",
@@ -654,4 +654,8 @@
 "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
 "550" => "Reject this share",
 "551" => "Reject",
-);
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
+"556" => "Launching task %s in background",
+);
\ No newline at end of file
diff --git a/core/src/plugins/core.ajaxplorer/i18n/et.php b/core/src/plugins/core.ajaxplorer/i18n/et.php
index 4ebcec4e63..e3fccc7318 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/et.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/et.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 //  Estonian translation by Ardi Jürgens <ardi (at) zone.ee>
 //  + updates/fixes by Kain Väljaots <kain (at) zone.ee>
@@ -60,7 +60,7 @@
 "22" => "PHP skript",
 "23" => "Fail",
 "24" => "Ülemine kataloog",
-"25" => "Lae üles fail või mitu faili (maks. ".ConfService::getConf('UPLOAD_MAX_NUMBER').") kataloogi : ",
+"25" => "Lae üles fail või mitu faili (maks. ". \Pydio\Core\Services\ConfService::getConf('UPLOAD_MAX_NUMBER').") kataloogi : ",
 "26" => "Loo uus kataloog asukohta : ",
 "27" => "Saada",
 "28" => "Loo uus fail asukohta : ",
@@ -647,8 +647,12 @@
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
 "548" => "Decline",
-    "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
-    "550" => "Reject this share",
-    "551" => "Reject",
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
+"556" => "Launching task %s in background",
 /* END SENTENCE */
-);
+);
\ No newline at end of file
diff --git a/core/src/plugins/core.ajaxplorer/i18n/eus.php b/core/src/plugins/core.ajaxplorer/i18n/eus.php
index ad6bb6ec85..7dbb2e54a7 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/eus.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/eus.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 //	basque translation: Ion Rey <ionrei@gmail.com> (zuzenketa eta iradokizunen zain naukazue)
 $mess=array(
@@ -49,7 +49,7 @@
 "22" => "PHP skripta",
 "23" => "Fitxategia",
 "24" => "Goiko karpeta",
-"25" => "Bidali fitxategi bat, edo gehiago,  (max ".ConfService::getConf('UPLOAD_MAX_NUMBER').") karpeta honetara: ",
+"25" => "Bidali fitxategi bat, edo gehiago,  (max ". \Pydio\Core\Services\ConfService::getConf('UPLOAD_MAX_NUMBER').") karpeta honetara: ",
 "26" => "Sortu karpeta berria non? ",
 "27" => "Igo fitxategiak",
 "28" => "Sortu fitxategi berria non? ",
@@ -645,8 +645,12 @@
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
 "548" => "Decline",
-    "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
-    "550" => "Reject this share",
-    "551" => "Reject",
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
+"556" => "Launching task %s in background",
 /* END SENTENCE */
-);
+);
\ No newline at end of file
diff --git a/core/src/plugins/core.ajaxplorer/i18n/fi.php b/core/src/plugins/core.ajaxplorer/i18n/fi.php
index e4838c69ba..f3a69d478a 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/fi.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/fi.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 //	Finnish translation by Aleksi Postari
 //	aleksi (at) postari.net
@@ -51,7 +51,7 @@
 "22" => "PHP skripti",
 "23" => "Tiedosto",
 "24" => "Taaksepäin",
-"25" => "Lähetä yksi tai useampi tiedosto (max. ".ConfService::getConf('UPLOAD_MAX_NUMBER').") kansioon : ",
+"25" => "Lähetä yksi tai useampi tiedosto (max. ". \Pydio\Core\Services\ConfService::getConf('UPLOAD_MAX_NUMBER').") kansioon : ",
 "26" => "Luo uusi kansio sijaintiin : ",
 "27" => "Lähetä",
 "28" => "Luo uusi tiedosto sijaintiin : ",
@@ -647,8 +647,12 @@
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
 "548" => "Decline",
-    "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
-    "550" => "Reject this share",
-    "551" => "Reject",
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
+"556" => "Launching task %s in background",
 /* END SENTENCE */
-);
+);
\ No newline at end of file
diff --git a/core/src/plugins/core.ajaxplorer/i18n/fr.php b/core/src/plugins/core.ajaxplorer/i18n/fr.php
index 5f4fbc6aae..c145dc40a1 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/fr.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 //  French Translation by Charles du Jeu, corrected by GravuTrad
 $mess=array(
@@ -58,7 +58,7 @@
 "22" => "Script PHP",
 "23" => "Fichier",
 "24" => "Dossier parent",
-"25" => "Transférer un ou plusieurs fichiers (max ".ConfService::getConf('UPLOAD_MAX_NUMBER').") dans : ",
+"25" => "Transférer un ou plusieurs fichiers (max ". \Pydio\Core\Services\ConfService::getConf('UPLOAD_MAX_NUMBER').") dans : ",
 "26" => "Créer un nouveau répertoire dans : ",
 "27" => "Transférer",
 "28" => "Créer un nouveau fichier dans : ",
@@ -646,8 +646,12 @@
 "546" => "Ce partage provient de %%OWNER%% d'un système distant. Souhaîtez-vous continuer ?",
 "547" => "Accepter",
 "548" => "Refuser",
-    "549" => "Vaous avez précedemment accepté ce partage depuis un système distant (par %%OWNER%%). Désirez-vous le rejeter désormais?",
-    "550" => "Rejeter ce partage",
-    "551" => "Rejeter",
+"549" => "Vaous avez précedemment accepté ce partage depuis un système distant (par %%OWNER%%). Désirez-vous le rejeter désormais?",
+"550" => "Rejeter ce partage",
+"551" => "Rejeter",
+"552" => "Please provide a password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s résultat(s) dans la Corbeille",
+"556" => "Launching task %s in background",
 /* END SENTENCE */
-);
+);
\ No newline at end of file
diff --git a/core/src/plugins/core.ajaxplorer/i18n/gr.php b/core/src/plugins/core.ajaxplorer/i18n/gr.php
index 34f0987467..f20ae6777a 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/gr.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/gr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "languageLabel" => "Ελληνικά",
@@ -48,7 +48,7 @@
 "22" => "PHP script",
 "23" => "Αρχείο",
 "24" => "Πίσω",
-"25" => "Φορτώστε ένα ή περισσότερα αρχεία (max. ".ConfService::getConf('UPLOAD_MAX_NUMBER').") στον φάκελο : ",
+"25" => "Φορτώστε ένα ή περισσότερα αρχεία (max. ". \Pydio\Core\Services\ConfService::getConf('UPLOAD_MAX_NUMBER').") στον φάκελο : ",
 "26" => "Δημιουργήστε ένα νέο φάκελο στο : ",
 "27" => "Upload",
 "28" => "Δημιουργήστε ένα νέο αρχείο στο : ",
@@ -644,8 +644,12 @@
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
 "548" => "Decline",
-    "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
-    "550" => "Reject this share",
-    "551" => "Reject",
-    /* END SENTENCE */
-);
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
+"556" => "Launching task %s in background",
+/* END SENTENCE */
+);
\ No newline at end of file
diff --git a/core/src/plugins/core.ajaxplorer/i18n/he.php b/core/src/plugins/core.ajaxplorer/i18n/he.php
index 9de587f8e5..0c97f68102 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/he.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/he.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "languageLabel" => "עברית",
@@ -48,7 +48,7 @@
 "22" => "PHP script",
 "23" => "קובץ",
 "24" => "Parent directory",
-"25" => "Upload one or more files (max. ".ConfService::getConf('UPLOAD_MAX_NUMBER').") in the directory : ",
+"25" => "Upload one or more files (max. ". \Pydio\Core\Services\ConfService::getConf('UPLOAD_MAX_NUMBER').") in the directory : ",
 "26" => "צור ספריה חדשה ב: ",
 "27" => "העלה קובץ",
 "28" => "צור קובץ חדש ב : ",
@@ -644,8 +644,12 @@
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
 "548" => "Decline",
-    "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
-    "550" => "Reject this share",
-    "551" => "Reject",
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
+"556" => "Launching task %s in background",
 /* END SENTENCE */
-);
+);
\ No newline at end of file
diff --git a/core/src/plugins/core.ajaxplorer/i18n/hu.php b/core/src/plugins/core.ajaxplorer/i18n/hu.php
index 814d2d1e11..2c1ce573df 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/hu.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/hu.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 //  hungarian translation: Gyarmati Balázs <gyarmati.balazs@gmail.com>
 //  fixes, additions: Levente Huszkó <levente.huszko@gmail.com>
@@ -52,7 +52,7 @@
 "22" => "PHP script",
 "23" => "Fájl",
 "24" => "Szülőkönyvtár",
-"25" => "Egy vagy több fájl feltöltése (max. ".ConfService::getConf('UPLOAD_MAX_NUMBER').") ebbe a mappába : ",
+"25" => "Egy vagy több fájl feltöltése (max. ". \Pydio\Core\Services\ConfService::getConf('UPLOAD_MAX_NUMBER').") ebbe a mappába : ",
 "26" => "Új mappa létrehozása ebben a mappában : ",
 "27" => "Feltöltés",
 "28" => "Új fájl létrehozása ebben a mappában : ",
@@ -649,8 +649,12 @@
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
 "548" => "Decline",
-    "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
-    "550" => "Reject this share",
-    "551" => "Reject",
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
+"556" => "Launching task %s in background",
 /* END SENTENCE */
-);
+);
\ No newline at end of file
diff --git a/core/src/plugins/core.ajaxplorer/i18n/it.php b/core/src/plugins/core.ajaxplorer/i18n/it.php
index 0f71319814..b10856c495 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/it.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 //
 //      Maintained by DepaMarco
@@ -68,7 +68,7 @@
 "22" => "Script PHP",
 "23" => "File",
 "24" => "Cartella superiore",
-"25" => "Invia uno o più file (max. ".ConfService::getConf('UPLOAD_MAX_NUMBER').") nella cartella : ",
+"25" => "Invia uno o più file (max. ". \Pydio\Core\Services\ConfService::getConf('UPLOAD_MAX_NUMBER').") nella cartella : ",
 "26" => "Crea una nuova cartella in: ",
 "27" => "Carica",
 "28" => "Crea un nuovo file in in: ",
@@ -604,13 +604,13 @@
 "527"=> "Condiviso con",
 "528"=> "Utenti Interni",
 "530"=> "Utenti Esterni",
-"531"=> "Utenti",
-"532"=> "Gruppi",
-"533" => "Identificativo usato per il login. Utilizzare caratteri alfanumerici o indirizzo e-mail con caratteri minuscoli.",
-"534" => "Password usata per il login",
-"535" => "Invia password per e-mail",
-"536" => "Invia al nuovo utente una e-mail di benvenuto includendo la password",
-"plugtype.title.access" => "Driver Workspace",
+"531"=> "Users",
+"532"=> "Groups",
+"533" => "Identifier used to login, please use alphanumeric or email lowercase characters.",
+"534" => "Password used to login",
+"535" => "Send password by email",
+"536" => "Send a welcome email including the password to the new user",
+"plugtype.title.access" => "Workspace Driver",
 "plugtype.desc.access" => "'Plugin' definisce come un workspace può accedere al backend (un sistema di memorizzazione file o altro) e le principali azioni.",
 "plugtype.title.action" => "Plugin Azioni",
 "plugtype.desc.action" => "Plugin orientato alle funzionalità per gestire diversi aspetti",
@@ -660,12 +660,16 @@
 "542" => "Errore caricamento: un'estensione PHP ha bloccato il processo di caricamento",
 "543" => "Risultati limitati a %s.",
 "544" => "Visualizza tutti",
-"545" => "Finestra Condivisione Remota",
-"546" => "Questo elemento è stato condiviso da un percorso remoto con te da %%OWNER%%. Vuoi continuare?",
-"547" => "Accetta",
-"548" => "Declina",
-"549" => "Hai precedentemente accettato questo elemento che era stato condiviso da un percorso remoto con te da %%OWNER%%. Desideri rifiutare ora?",
-"550" => "Rifiuta questa condivisione",
-"551" => "Rifiuta",
+"545" => "Remote Share Dialog",
+"546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
+"547" => "Accept",
+"548" => "Decline",
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
+"556" => "Launching task %s in background",
 /* END SENTENCE */
-);
+);
\ No newline at end of file
diff --git a/core/src/plugins/core.ajaxplorer/i18n/ja.php b/core/src/plugins/core.ajaxplorer/i18n/ja.php
index 9b0dde51bc..2a3deeaefd 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/ja.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/ja.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 // Japanese translation: Apr. 20 2011 by Satoru Matsumoto (HeliosReds@opensuse.org)
 // Reference dictionnary for translations
@@ -53,7 +53,7 @@
 "22" => "PHP スクリプト",
 "23" => "ファイル",
 "24" => "親ディレクトリ",
-"25" => "ファイル(複数可 - 上限 ".ConfService::getConf('UPLOAD_MAX_NUMBER')." 個まで) を次のディレクトリにアップロード : ",
+"25" => "ファイル(複数可 - 上限 ". \Pydio\Core\Services\ConfService::getConf('UPLOAD_MAX_NUMBER')." 個まで) を次のディレクトリにアップロード : ",
 "26" => "新しいディレクトリを作成 : ",
 "27" => "アップロード(U)",
 "28" => "新しいファイルを作成 : ",
@@ -652,6 +652,10 @@
 "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
 "550" => "Reject this share",
 "551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
+"556" => "Launching task %s in background",
 /* 文章はここまで */
 /* 文章終了 */
 );
\ No newline at end of file
diff --git a/core/src/plugins/core.ajaxplorer/i18n/kr.php b/core/src/plugins/core.ajaxplorer/i18n/kr.php
index 6abc4a04d5..13e5598d2f 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/kr.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/kr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 //  Korean translation : minuki@gmail.com
 //  오타, 오역, 어색한 부분은 누구든지 수정하여 재 공유 부탁드립니다.
@@ -57,7 +57,7 @@
 "22" => "PHP 스크립트",
 "23" => "파일",
 "24" => "상위 디렉토리",
-"25" => "하나 또는 다수의 파일을 업로드 (최대 ".ConfService::getConf('UPLOAD_MAX_NUMBER')." 개), 해당 디렉토리: ",
+"25" => "하나 또는 다수의 파일을 업로드 (최대 ". \Pydio\Core\Services\ConfService::getConf('UPLOAD_MAX_NUMBER')." 개), 해당 디렉토리: ",
 "26" => "새 디렉토리 생성 : ",
 "27" => "업로드(U)",
 "28" => "다음 디렉토리에 새 파일 생성 : ",
@@ -653,8 +653,12 @@
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
 "548" => "Decline",
-    "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
-    "550" => "Reject this share",
-    "551" => "Reject",
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
+"556" => "Launching task %s in background",
 /* END SENTENCE */
-);
+);
\ No newline at end of file
diff --git a/core/src/plugins/core.ajaxplorer/i18n/nl.php b/core/src/plugins/core.ajaxplorer/i18n/nl.php
index 28ae33960b..0dc42bfd64 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/nl.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/nl.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 //  Dutch translation Jasper Vermeulen
 //  + update Luk Boone 2009/05/24 (version 2.4 - 2009/03/26)
@@ -54,7 +54,7 @@
 "22" => "PHP script",
 "23" => "Bestand",
 "24" => "Bovenliggende map",
-"25" => "Upload ��n of meerdere bestanden (max. ".ConfService::getConf('UPLOAD_MAX_NUMBER').") in de map : ",
+"25" => "Upload ��n of meerdere bestanden (max. ". \Pydio\Core\Services\ConfService::getConf('UPLOAD_MAX_NUMBER').") in de map : ",
 "26" => "Maak een nieuwe map in : ",
 "27" => "Upload",
 "28" => "Maak een nieuwe bestand in : ",
@@ -650,8 +650,12 @@
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
 "548" => "Decline",
-    "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
-    "550" => "Reject this share",
-    "551" => "Reject",
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
+"556" => "Launching task %s in background",
 /* END SENTENCE */
-);
+);
\ No newline at end of file
diff --git a/core/src/plugins/core.ajaxplorer/i18n/no.php b/core/src/plugins/core.ajaxplorer/i18n/no.php
index dedbe09718..25d1ecb8d2 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/no.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/no.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 //  Norsk oversettelse: Pål Monstad 2010
 //
@@ -52,7 +52,7 @@
 "22" => "PHP-script",
 "23" => "Fil",
 "24" => "Ett nivå opp",
-"25" => "Last opp en eller flere filer (maks. ".ConfService::getConf('UPLOAD_MAX_NUMBER').") i mappen : ",
+"25" => "Last opp en eller flere filer (maks. ". \Pydio\Core\Services\ConfService::getConf('UPLOAD_MAX_NUMBER').") i mappen : ",
 "26" => "Opprett ny mappe i : ",
 "27" => "Last opp",
 "28" => "Opprett ny fil i : ",
@@ -648,8 +648,12 @@
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
 "548" => "Decline",
-    "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
-    "550" => "Reject this share",
-    "551" => "Reject",
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
+"556" => "Launching task %s in background",
 /* END SENTENCE */
-);
+);
\ No newline at end of file
diff --git a/core/src/plugins/core.ajaxplorer/i18n/pl.php b/core/src/plugins/core.ajaxplorer/i18n/pl.php
index 0bfbf0d476..8a4f34d3df 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/pl.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/pl.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "languageLabel" => "Polski",
@@ -48,7 +48,7 @@
 "22" => "Skrypt PHP",
 "23" => "Plik",
 "24" => "Katalog wyżej",
-"25" => "Wgraj na serwer jeden lub więcej plików (max. ".ConfService::getConf('UPLOAD_MAX_NUMBER').") w katalogu: ",
+"25" => "Wgraj na serwer jeden lub więcej plików (max. ". \Pydio\Core\Services\ConfService::getConf('UPLOAD_MAX_NUMBER').") w katalogu: ",
 "26" => "Utwórz nowy katalog w: ",
 "27" => "Wgraj",
 "28" => "Utwórz nowy plik w: ",
@@ -644,8 +644,12 @@
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
 "548" => "Decline",
-    "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
-    "550" => "Reject this share",
-    "551" => "Reject",
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
+"556" => "Launching task %s in background",
 /* END SENTENCE */
-);
+);
\ No newline at end of file
diff --git a/core/src/plugins/core.ajaxplorer/i18n/pt-br.php b/core/src/plugins/core.ajaxplorer/i18n/pt-br.php
index d00f0b6974..bfd93d5bd9 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/pt-br.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/pt-br.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 //      Portuguese Brazilian translation: Andre Domarques <andre@dmd2.com.br>
 //	Revision in 2011 January Luciano lucianoes@ufrgs.br
@@ -52,7 +52,7 @@
 "22" => "Script PHP",
 "23" => "Arquivo",
 "24" => "Diretório pai",
-"25" => "Enviar um ou vários arquivo (máx. ".ConfService::getConf('UPLOAD_MAX_NUMBER').") no diretório : ",
+"25" => "Enviar um ou vários arquivo (máx. ". \Pydio\Core\Services\ConfService::getConf('UPLOAD_MAX_NUMBER').") no diretório : ",
 "26" => "Criar um novo diretório em : ",
 "27" => "Enviar",
 "28" => "Criar um novo arquivo em : ",
@@ -648,8 +648,12 @@
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
 "548" => "Decline",
-    "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
-    "550" => "Reject this share",
-    "551" => "Reject",
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
+"556" => "Launching task %s in background",
 /* END SENTENCE */
-);
+);
\ No newline at end of file
diff --git a/core/src/plugins/core.ajaxplorer/i18n/pt.php b/core/src/plugins/core.ajaxplorer/i18n/pt.php
index c4ca534127..f1690382d5 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/pt.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "languageLabel" => "Português (Portugal)",
@@ -57,7 +57,7 @@
 "22" => "Script PHP",
 "23" => "Ficheiro",
 "24" => "Pasta Parente",
-"25" => "Enviar um ou mais ficheiros (max. ".ConfService::getConf('UPLOAD_MAX_NUMBER').") na pasta : ",
+"25" => "Enviar um ou mais ficheiros (max. ". \Pydio\Core\Services\ConfService::getConf('UPLOAD_MAX_NUMBER').") na pasta : ",
 "26" => "Criar uma nova pasta em : ",
 "27" => "Enviar",
 "28" => "Criar um novo ficheiro em : ",
@@ -644,9 +644,13 @@
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
 "548" => "Decline",
-    "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
-    "550" => "Reject this share",
-    "551" => "Reject",
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
+"556" => "Launching task %s in background",
 /* END SENTENCE */
 /* password strength tester */
-);
+);
\ No newline at end of file
diff --git a/core/src/plugins/core.ajaxplorer/i18n/ru.php b/core/src/plugins/core.ajaxplorer/i18n/ru.php
index 347bcd47d1..4dd4359187 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/ru.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/ru.php
@@ -1,23 +1,23 @@
 <?php
 /*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
+* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+* This file is part of Pydio.
+*
+* Pydio is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Affero General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* Pydio 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 Affero General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+*
+* The latest code can be found at <https://pydio.com>.
+*/
 $mess=array(
 "languageLabel" => "Russian",
 "date_intl_locale" => "ru_RU",
@@ -57,7 +57,7 @@
 "22" => "Скрипт PHP",
 "23" => "Файл",
 "24" => "На уровень выше",
-"25" => "Загрузить один или несколько файлов (максимум ".ConfService::getConf('UPLOAD_MAX_NUMBER').") в папку: ",
+"25" => "Загрузить один или несколько файлов (максимум ". \Pydio\Core\Services\ConfService::getConf('UPLOAD_MAX_NUMBER').") в папку: ",
 "26" => "Создать новую папку в: ",
 "27" => "Закачать",
 "28" => "Создать новый файл в: ",
@@ -257,7 +257,6 @@
 "204" => "Файл \"",
 "205" => "\" превышает допустимый размер (",
 "206" => "Mb).\\nОн не будет загружен.",
-/* END SENTENCE */
 "207" => "У вас нет прав для записи в эту папку",
 "208" => "У вас нет прав для чтения этой папки",
 "209" => "Внутренняя ошибка сервера, пожалуйста обратитесь к администратору!",
@@ -433,7 +432,6 @@
 "375" => "Предупреждение: Вы неактивны с более чем __IDLE__, сессия прервётся в __LOGOUT__",
 "376" => "Щелкните в любом месте, чтобы активировать",
 "378" => "Предупреждение: пароль пустой или слишком короткий!",
-/* password strength tester */
 "379" => "Небезопасное слово!",
 "380" => "Очень коротко",
 "381" => "Очень слабый",
@@ -646,7 +644,13 @@
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
 "548" => "Decline",
-    "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
-    "550" => "Reject this share",
-    "551" => "Reject",
-);
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
+"556" => "Launching task %s in background",
+/* END SENTENCE */
+/* password strength tester */
+);
\ No newline at end of file
diff --git a/core/src/plugins/core.ajaxplorer/i18n/si.php b/core/src/plugins/core.ajaxplorer/i18n/si.php
index 94e0be0830..c9a3bc1cd7 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/si.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/si.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 // Slovenian translation: April 21 2011 by Vladimir Bohinc (vladimir.bohinc@gmail.com)
 $mess=array(
@@ -49,7 +49,7 @@
 "22" => "PHP skripta",
 "23" => "Datoteka",
 "24" => "Gor",
-"25" => "Naložite eno ali več datotek (največ ".ConfService::getConf('UPLOAD_MAX_NUMBER').") v mapo: ",
+"25" => "Naložite eno ali več datotek (največ ". \Pydio\Core\Services\ConfService::getConf('UPLOAD_MAX_NUMBER').") v mapo: ",
 "26" => "Ustvari novo mapo v: ",
 "27" => "Naloži",
 "28" => "Ustvari novo datoteko v: ",
@@ -645,8 +645,12 @@
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
 "548" => "Decline",
-    "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
-    "550" => "Reject this share",
-    "551" => "Reject",
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
+"556" => "Launching task %s in background",
 /* END SENTENCE */
-);
+);
\ No newline at end of file
diff --git a/core/src/plugins/core.ajaxplorer/i18n/sv.php b/core/src/plugins/core.ajaxplorer/i18n/sv.php
index 847bb410ad..38f77f3774 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/sv.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/sv.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "languageLabel" => "Svenska",
@@ -48,7 +48,7 @@
 "22" => "PHP-script",
 "23" => "Fil",
 "24" => "Överordnad katalog",
-"25" => "Ladda upp en eller flera filer (max. ".ConfService::getConf('UPLOAD_MAX_NUMBER').") i katalogen : ",
+"25" => "Ladda upp en eller flera filer (max. ". \Pydio\Core\Services\ConfService::getConf('UPLOAD_MAX_NUMBER').") i katalogen : ",
 "26" => "Skapa en ny katalog i : ",
 "27" => "Ladda upp",
 "28" => "Skapa en ny fil i : ",
@@ -644,8 +644,12 @@
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
 "548" => "Decline",
-    "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
-    "550" => "Reject this share",
-    "551" => "Reject",
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
+"556" => "Launching task %s in background",
 /* END SENTENCE */
-);
+);
\ No newline at end of file
diff --git a/core/src/plugins/core.ajaxplorer/i18n/tr.php b/core/src/plugins/core.ajaxplorer/i18n/tr.php
index a2d3a6624a..d60b0fb6fc 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/tr.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/tr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 //	Turkish translation by: Heron / date: 23 october 2011 (second revision, it feels good to help!)
 //  transilated version: Pydio-core-3.3.2 (release date: 25 septembre 2011)
@@ -51,7 +51,7 @@
 "22" => "PHP beti&#287;i",
 "23" => "Dosya",
 "24" => "Ana Klas&#246;r",
-"25" => "Y&uuml;kle bir veya daha fazla dosya (en fazla". ConfService::getConf( 'UPLOAD_MAX_NUMBER').") Klas&#246;r i&#231;inde : ",
+"25" => "Y&uuml;kle bir veya daha fazla dosya (en fazla". \Pydio\Core\Services\ConfService::getConf( 'UPLOAD_MAX_NUMBER').") Klas&#246;r i&#231;inde : ",
 "26" => "Yeni bir klas&#246;r olu&#351;tur : ",
 "27" => "Y&#220;KLE",
 "28" => "yeni bir dosya olu&#351;tur : ",
@@ -647,8 +647,12 @@
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
 "548" => "Decline",
-    "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
-    "550" => "Reject this share",
-    "551" => "Reject",
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
+"556" => "Launching task %s in background",
 /* END SENTENCE */
-);
+);
\ No newline at end of file
diff --git a/core/src/plugins/core.ajaxplorer/i18n/zh-tw.php b/core/src/plugins/core.ajaxplorer/i18n/zh-tw.php
index bbe482b055..bfd2000d21 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/zh-tw.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/zh-tw.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 //  Traditional Chinese (zh-tw UTF-8) translated by: Tommy Lam (Nov 13, 2008)
 //---------------------------------------------------------------------------------------------------
@@ -51,7 +51,7 @@
 "22" => "PHP 程式",
 "23" => "檔案",
 "24" => "上一目錄",
-"25" => "上載一個或以上檔案 (最多 ".ConfService::getConf('UPLOAD_MAX_NUMBER')." 個) 到目錄 : ",
+"25" => "上載一個或以上檔案 (最多 ". \Pydio\Core\Services\ConfService::getConf('UPLOAD_MAX_NUMBER')." 個) 到目錄 : ",
 "26" => "建立新目錄於 : ",
 "27" => "上載檔案(U)",
 "28" => "建立新檔案於 : ",
@@ -647,8 +647,12 @@
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
 "548" => "Decline",
-    "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
-    "550" => "Reject this share",
-    "551" => "Reject",
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
+"556" => "Launching task %s in background",
 /* END SENTENCE */
-);
+);
\ No newline at end of file
diff --git a/core/src/plugins/core.ajaxplorer/i18n/zh.php b/core/src/plugins/core.ajaxplorer/i18n/zh.php
index 3c290baf34..a96d5f06eb 100644
--- a/core/src/plugins/core.ajaxplorer/i18n/zh.php
+++ b/core/src/plugins/core.ajaxplorer/i18n/zh.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 //---------------------------------------------------------------------------------------------------
 //
@@ -60,7 +60,7 @@
 "22" => "PHP脚本",
 "23" => "文件",
 "24" => "上一级目录",
-"25" => "上传一个或多个文件 (最多 ".ConfService::getConf('UPLOAD_MAX_NUMBER')." 个) 到目录: ",
+"25" => "上传一个或多个文件 (最多 ". \Pydio\Core\Services\ConfService::getConf('UPLOAD_MAX_NUMBER')." 个) 到目录: ",
 "26" => "创建新目录于 : ",
 "27" => "上传(U)",
 "28" => "创建新文件于 : ",
@@ -656,8 +656,12 @@
 "546" => "This item has been shared with you by %%OWNER%% from a remote location. Do you want to continue ?",
 "547" => "Accept",
 "548" => "Decline",
-    "549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
-    "550" => "Reject this share",
-    "551" => "Reject",
+"549" => "You have previously accepted this item that was shared with you by %%OWNER%% from a remote location. Do you want to reject it now?",
+"550" => "Reject this share",
+"551" => "Reject",
+"552" => "Please provide password.",
+"553" => "Invalid password, please try again. \\n Make sure your Caps Lock is not engaged!",
+"554" => "%s result(s) in Recycle Bin",
+"556" => "Launching task %s in background",
 /* END SENTENCE */
-);
+);
\ No newline at end of file
diff --git a/core/src/plugins/core.ajaxplorer/manifest.xml b/core/src/plugins/core.ajaxplorer/manifest.xml
index 317f7801b1..fa1e31c606 100644
--- a/core/src/plugins/core.ajaxplorer/manifest.xml
+++ b/core/src/plugins/core.ajaxplorer/manifest.xml
@@ -19,11 +19,13 @@
 		<global_param name="APPLICATION_TITLE" group="CONF_MESSAGE[Main]" type="string" label="CONF_MESSAGE[App Title]" description="CONF_MESSAGE[Your application title]" mandatory="true" default="Pydio" expose="true"/>
 		<global_param name="DEFAULT_LANGUAGE" group="CONF_MESSAGE[Main]" type="select" choices="AJXP_AVAILABLE_LANGUAGES" label="CONF_MESSAGE[Default Language]" description="CONF_MESSAGE[Default language when a user does not have set his/her own.]" mandatory="true" default="en"/>
 		<global_param name="SERVER_URL" group="CONF_MESSAGE[Main]" type="string" label="CONF_MESSAGE[Server URL]" description="CONF_MESSAGE[Server URL used to build share links and notifications. It will be detected if empty.]" mandatory="false"/>
-		<global_param name="PUBLIC_DOWNLOAD_FOLDER" group="CONF_MESSAGE[Sharing]" type="string" label="CONF_MESSAGE[Download Folder]" description="CONF_MESSAGE[Absolute path to the public folder where temporary download links will be created. Setting this empty will disable the sharing feature.]" mandatory="false" default="AJXP_INSTALL_PATH/data/public"/>
+		<global_param name="PUBLIC_BASEURI" group="CONF_MESSAGE[Sharing]" type="string" label="CONF_MESSAGE[Public Base URI]" description="CONF_MESSAGE[URI where to serve the public links]" mandatory="true" default="/public"/>
+		<global_param name="PUBLIC_DOWNLOAD_FOLDER" group="CONF_MESSAGE[Sharing]" type="string" label="CONF_MESSAGE[Download Folder (Legacy)]" description="CONF_MESSAGE[Absolute path to the public folder where temporary download links will be created. This is used for legacy purpose, newly created links do not use it anymore, but use the Base URI instead.]" mandatory="false" default="AJXP_INSTALL_PATH/data/public"/>
         <!-- MAKE SURE NOT TO CHANGE ORDER OF name AND default ATTRIBUTES, CAN BE REPLACED BY INSTALLERS -->
-		<global_param name="PUBLIC_DOWNLOAD_URL" default="" group="CONF_MESSAGE[Sharing]" type="string" label="CONF_MESSAGE[Download URL]" description="CONF_MESSAGE[If not inferred directly from the current ajaxplorer URI plus the public download folder name, replace the public access URL here.]" mandatory="false"/>
+		<global_param name="PUBLIC_DOWNLOAD_URL" default="" group="CONF_MESSAGE[Sharing]" type="string" label="CONF_MESSAGE[Download URL]" description="CONF_MESSAGE[If not inferred directly from the current pydio URL plus the public base URI, replace the public access URL here.]" mandatory="false"/>
 		<global_param name="WEBDAV_ENABLE" group="CONF_MESSAGE[WebDAV Server]" type="boolean" label="CONF_MESSAGE[Enable WebDAV]" description="CONF_MESSAGE[Enable the webDAV support. Please READ THE DOC to safely use this feature.]" mandatory="false" default="false"/>
-		<global_param name="WEBDAV_BASEURI" group="CONF_MESSAGE[WebDAV Server]" type="string" label="CONF_MESSAGE[Shares URI]" description="CONF_MESSAGE[Common URI to access the shares. Please READ THE DOC to safely use this feature.]" mandatory="false" default="/pydio/shares"/>
+		<global_param name="WEBDAV_ACTIVE_ALL" group="CONF_MESSAGE[WebDAV Server]" type="boolean" label="CONF_MESSAGE[Enable for all users]" description="CONF_MESSAGE[Enable WebDAV for all users by default. If set to false, users will have to manually enable WebDAV via their preferences panel.]" mandatory="false" default="false"/>
+		<global_param name="WEBDAV_BASEURI" group="CONF_MESSAGE[WebDAV Server]" type="string" label="CONF_MESSAGE[Shares URI]" description="CONF_MESSAGE[Common URI to access the shares. Please READ THE DOC to safely use this feature.]" mandatory="false" default="/shares"/>
 		<global_param name="WEBDAV_BASEHOST" group="CONF_MESSAGE[WebDAV Server]" type="string" label="CONF_MESSAGE[Shares Host]" description="CONF_MESSAGE[Host used in webDAV protocol. Should be detected by default. Please READ THE DOC to safely use this feature.]" mandatory="false" default=""/>
 		<global_param name="WEBDAV_DIGESTREALM" group="CONF_MESSAGE[WebDAV Server]" type="string" label="CONF_MESSAGE[Digest Realm]" description="CONF_MESSAGE[Default realm for authentication. Please READ THE DOC to safely use this feature.]" mandatory="false" default="ajxp_webdav_realm"/>
 		<global_param name="WEBDAV_FORCE_BASIC" group="CONF_MESSAGE[WebDAV Server]" type="boolean" label="CONF_MESSAGE[Force Basic Auth]" description="CONF_MESSAGE[This authentication mechanism is less secure, but will avoid the users having to re-enter a password in some case.]" mandatory="false" default="false"/>
@@ -34,8 +36,12 @@
         <global_param name="DISABLE_ZIP_BROWSING" group="CONF_MESSAGE[Compression Features]" type="boolean" label="CONF_MESSAGE[Disable Zip browsing]" description="CONF_MESSAGE[Disable Zip files inline browsing. This can be necessary if you always store huge zip archives: it can have some impact on performance.]" mandatory="false" default="false"/>
         <global_param name="ZIP_CREATION" expose="true" group="CONF_MESSAGE[Compression Features]" type="boolean" label="CONF_MESSAGE[Zip Creation]" description="CONF_MESSAGE[If you encounter problems with online zip creation or multiple files downloading, you can disable the feature.]" mandatory="false" default="true"/>
         <global_param name="ZIP_ENCODING" expose="false" group="CONF_MESSAGE[Compression Features]" type="string" label="CONF_MESSAGE[Zip Encoding]" description="CONF_MESSAGE[Set up a specific encoding (try IBM850 or CP437) for filenames to fix characters problems during Zip creation. This may create OS-incompatible archives (Win/Mac).]" mandatory="false"/>
-        <global_param name="GZIP_COMPRESSION" group="CONF_MESSAGE[Compression Features]" type="boolean" label="CONF_MESSAGE[Gzip Download]" description="CONF_MESSAGE[Gzip files on-the-fly before downloading. Disabled by default, as it's generally useful only on small files, and decreases performances on big files. This has nothing to see with the Zip Creation feature, it's just a on-the-fly compression applied on a unique file at download.]" mandatory="false" default="false"/>
-        <global_param name="GZIP_LIMIT" group="CONF_MESSAGE[Compression Features]" type="string" label="CONF_MESSAGE[Gzip Limit]" description="CONF_MESSAGE[If activated, a default limit should be set above when files are no more compressed.]" mandatory="false" default="1048576"/>
+
+        <!-- Downloads Group -->
+        <global_param name="USE_DOWNLOAD_ACCELERATOR" group="CONF_MESSAGE[Downloads]" type="select" label="CONF_MESSAGE[Download Delegation]" description="CONF_MESSAGE[Delegates download operations to an alternative agent, either webserver or pydio agent. Warning, this requires external modules to be installed. When using XSendFile/XaccelRedirect, you have to manually add the folders where files will be downloaded in the module configuration]" choices="pydio|Pydio Agent (any server),xsendfile|X-SendFile (Apache/Lighttpd),xaccelredirect|X-Accel-Redirect (Nginx)"/>
+        <global_param name="GZIP_COMPRESSION" group="CONF_MESSAGE[Downloads]" type="boolean" label="CONF_MESSAGE[Gzip Download]" description="CONF_MESSAGE[Gzip files on-the-fly before downloading. Disabled by default, as it's generally useful only on small files, and decreases performances on big files. This has nothing to see with the Zip Creation feature, it's just a on-the-fly compression applied on a unique file at download.]" mandatory="false" default="false"/>
+        <global_param name="GZIP_LIMIT" group="CONF_MESSAGE[Downloads]" type="string" label="CONF_MESSAGE[Gzip Limit]" description="CONF_MESSAGE[If activated, a default limit should be set above when files are no more compressed.]" mandatory="false" default="1048576"/>
+
 		<global_param name="NODENAME_MAX_LENGTH" expose="true" group="CONF_MESSAGE[Miscellaneous]" type="integer" label="CONF_MESSAGE[Filename length]" description="CONF_MESSAGE[Maximum characters length of new files or folders]" mandatory="false" default="255"/>
 		<global_param name="AJXP_TMP_DIR" group="CONF_MESSAGE[Miscellaneous]" type="string" label="CONF_MESSAGE[Temporary Folder]" description="CONF_MESSAGE[This is necessary only if you have errors concerning the tmp dir access or writeability : most probably, they are due to PHP SAFE MODE (should disappear in php6) or various OPEN_BASEDIR restrictions. In that case, create and set writeable a tmp folder somewhere at the root of your hosting (but above the web/ or www/ or http/ if possible!!) and enter here the full path to this folder]" mandatory="false" default=""/>
 	</server_settings>
diff --git a/core/src/plugins/core.ajaxplorer/routes.json b/core/src/plugins/core.ajaxplorer/routes.json
new file mode 100644
index 0000000000..2edc162539
--- /dev/null
+++ b/core/src/plugins/core.ajaxplorer/routes.json
@@ -0,0 +1,82 @@
+{
+  "/api": {
+    "methods": "*",
+    "routes": [
+      "/api[{optional:.+}]"
+    ],
+    "class": "Pydio\\Core\\Http\\Base",
+    "method": "handleRoute"
+  },
+  "/wopi": {
+    "methods": "*",
+    "routes": [
+      "/wopi[{optional:.+}]"
+    ],
+    "class": "Pydio\\Core\\Http\\Base",
+    "method": "handleRoute"
+  },
+  "/user":{
+    "methods": "GET",
+    "routes": [
+      "/user/reset-password/{key}"
+    ],
+    "class": "Pydio\\Core\\Http\\Base",
+    "method": "handleRoute"
+  },
+  "%WEBDAV_BASEURI%": {
+    "methods": "*",
+    "routes": [
+      "%WEBDAV_BASEURI%[{optional:.+}]"
+    ],
+    "class": "Pydio\\Core\\Http\\Dav\\DAVServer",
+    "method": "handleRoute"
+  },
+  "/ocs-provider":{
+    "methods": "*",
+    "routes": [
+      "/ocs-provider[{optional:.+}]"
+    ],
+    "class": "Pydio\\OCS\\OCSPlugin",
+    "method": "startServer"
+  },
+  "/ocs":{
+    "methods": "*",
+    "routes": [
+      "/ocs[{optional:.+}]"
+    ],
+    "class": "Pydio\\OCS\\OCSPlugin",
+    "method": "startServer"
+  },
+  "%PUBLIC_BASEURI%":{
+    "methods": "*",
+    "routes": [
+      "%PUBLIC_BASEURI%/{hash}/dl/[{optional:.+}]",
+      "%PUBLIC_BASEURI%/{hash}",
+      "%PUBLIC_BASEURI%[{optional:.+}]"
+    ],
+    "class": "Pydio\\Share\\ShareCenter",
+    "path" : "plugins/action.share/src/ShareCenter.php",
+    "method": "publicRoute"
+  },
+  "/favicon":{
+    "methods": "GET",
+    "routes":[
+      "/favicon.ico"
+    ],
+    "class":"Pydio\\Core\\Http\\Base",
+    "method":"handleRoute"
+  },
+  "/": {
+    "methods": "*",
+    "routes": [
+      "/",
+      "/index[{optional:.+}]",
+      "/dashboard[{optional:.+}]",
+      "/settings[{optional:.+}]",
+      "/welcome[{optional:.+}]",
+      "/ws-[{optional:.+}]"
+    ],
+    "class": "Pydio\\Core\\Http\\Base",
+    "method": "handleRoute"
+  }
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.auth/AbstractAuthDriver.php b/core/src/plugins/core.auth/AbstractAuthDriver.php
new file mode 100644
index 0000000000..096769b9f6
--- /dev/null
+++ b/core/src/plugins/core.auth/AbstractAuthDriver.php
@@ -0,0 +1,396 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Auth\Core;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Conf\Core\AbstractUser;
+use Pydio\Core\Http\Middleware\SecureTokenMiddleware;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Model\UserInterface;
+use Pydio\Core\Serializer\UserXML;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\Services\RolesService;
+use Pydio\Core\Services\UsersService;
+use Zend\Diactoros\Response\TextResponse;
+use Pydio\Core\Utils\Vars\InputFilter;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+define('AJXP_FILTER_EMPTY', 'AJXP_FILTER_EMPTY');
+define('AJXP_FILTER_NOT_EMPTY', 'AJXP_FILTER_NOT_EMPTY');
+
+/**
+ * @package AjaXplorer_Plugins
+ * @subpackage Core
+ * @class AbstractAuthDriver
+ * Abstract representation of an authentication driver. Must be implemented by the auth plugin
+ */
+class AbstractAuthDriver extends Plugin
+{
+    public $options;
+    public $driverName = "abstract";
+    public $driverType = "auth";
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @return string
+     * @throws \Exception
+     */
+    public function switchAction(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface)
+    {
+        $action     = $requestInterface->getAttribute("action");
+        $httpVars   = $requestInterface->getParsedBody();
+        /** @var ContextInterface $ctx */
+        $ctx        = $requestInterface->getAttribute("ctx");
+        
+        switch ($action) {
+
+            case "get_secure_token" :
+                $responseInterface = new TextResponse(SecureTokenMiddleware::generateSecureToken());
+                break;
+
+            //------------------------------------
+            //	CHANGE USER PASSWORD
+            //------------------------------------
+            case "pass_change":
+
+                $userObject = $ctx->getUser();
+                if ($userObject == null || $userObject->getId() == "guest") {
+                    header("Content-Type:text/plain");
+                    print "SUCCESS";
+                    break;
+                }
+                $oldPass = $httpVars["old_pass"];
+                $newPass = $httpVars["new_pass"];
+                if (strlen($newPass) < ConfService::getContextConf($ctx, "PASSWORD_MINLENGTH", "auth")) {
+                    header("Content-Type:text/plain");
+                    print "PASS_ERROR";
+                    break;
+                }
+                if (UsersService::checkPassword($userObject->getId(), $oldPass, false)) {
+                    UsersService::updatePassword($userObject->getId(), $newPass);
+                    if ($userObject->hasLockByName("pass_change")) {
+                        $userObject->removeLock("pass_change");
+                        $userObject->save("superuser");
+                    }
+                } else {
+                    header("Content-Type:text/plain");
+                    print "PASS_ERROR";
+                    break;
+                }
+                header("Content-Type:text/plain");
+                print "SUCCESS";
+
+                break;
+
+
+
+            default;
+            break;
+        }
+        return "";
+    }
+
+
+    /**
+     * @inheritdoc
+     */
+    public function getRegistryContributions(ContextInterface $ctx, $extendedVersion = true )
+    {
+        $this->loadRegistryContributions($ctx);
+        if(!$extendedVersion) return $this->registryContributions;
+        if(UsersService::usersEnabled() && !$ctx->hasUser()){
+            return $this->registryContributions;
+        }
+
+        $userSerializer = new UserXML();
+        $xmlString = $userSerializer->serialize($ctx);
+
+        $dom = new \DOMDocument();
+        $dom->loadXML($xmlString);
+        $this->registryContributions[]=$dom->documentElement;
+        return $this->registryContributions;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function parseSpecificContributions(ContextInterface $ctx, \DOMNode &$contribNode)
+    {
+        parent::parseSpecificContributions($ctx, $contribNode);
+        if($contribNode->nodeName != "actions") return ;
+
+        if(UsersService::usersEnabled() && $this->passwordsEditable()) return ;
+        // Disable password change action
+        if(!isSet($actionXpath)) $actionXpath=new \DOMXPath($contribNode->ownerDocument);
+        $passChangeNodeList = $actionXpath->query('action[@name="pass_change"]', $contribNode);
+        if(!$passChangeNodeList->length) return ;
+        $passChangeNode = $passChangeNodeList->item(0);
+        $contribNode->removeChild($passChangeNode);
+    }
+    
+    /**
+     * Wether users can be listed using offset and limit
+     * @return bool
+     */
+    public function supportsUsersPagination()
+    {
+        return false;
+    }
+
+    /**
+     * Applicable if supportsUsersPagination(), try to detect at what page the user is
+     * @param string $baseGroup
+     * @param string $userLogin
+     * @param int $usersPerPage
+     * @param int $offset
+     * @return int
+     */
+    public function findUserPage($baseGroup, $userLogin, $usersPerPage, $offset = 0){
+        return -1;
+    }
+
+    /**
+     * List users using offsets
+     * @param string $baseGroup
+     * @param string $regexp
+     * @param int $offset
+     * @param int $limit
+     * @param bool $recursive
+     * @return AbstractUser[]
+     */
+    public function listUsersPaginated($baseGroup, $regexp, $offset, $limit, $recursive = true)
+    {
+        return $this->listUsers($baseGroup, $recursive);
+    }
+
+    /**
+     * @param string $baseGroup
+     * @param string $regexp
+     * @param null|string $filterProperty Can be "admin" or "parent"
+     * @param null|string $filterValue Can be a user Id, or AJXP_FILTER_EMPTY or AJXP_FILTER_NOT_EMPTY
+     * @param bool $recursive
+     * @return int
+     */
+    public function getUsersCount($baseGroup = "/", $regexp = "", $filterProperty = null, $filterValue = null, $recursive = true)
+    {
+        return -1;
+    }
+
+    /**
+     *
+     * @param string $baseGroup
+     * @param bool $recursive
+     * @return AbstractUser[]
+     */
+    public function listUsers($baseGroup = "/", $recursive = true){}
+
+    /**
+     * @param $login
+     * @return boolean
+     */
+    public function userExists($login){}
+
+    /**
+     * Alternative method to be used when checking if user exists
+     * before creating a new user.
+     * @param $login
+     * @return bool
+     */
+    public function userExistsWrite($login)
+    {
+        return $this->userExists($login);
+    }
+
+    /**
+     * @param string $login
+     * @param string $pass
+     * @return bool
+     */
+    public function checkPassword($login, $pass){}
+
+    /**
+     * @param string $login
+     * @return string
+     */
+    public function createCookieString($login){}
+
+
+
+    /**
+     * @return bool
+     */
+    public function usersEditable(){}
+
+    /**
+     * @return bool
+     */
+    public function passwordsEditable(){}
+
+    /**
+     * @param $login
+     * @param $passwd
+     */
+    public function createUser($login, $passwd){}
+
+    /**
+     * @param $login
+     * @param $newPass
+     */
+    public function changePassword($login, $newPass){}
+
+    /**
+     * @param $login
+     */
+    public function deleteUser($login){}
+
+    /**
+     * @return bool
+     */
+    public function supportsAuthSchemes()
+    {
+        return false;
+    }
+    /**
+     * @param $login
+     * @return String
+     */
+    public function getAuthScheme($login)
+    {
+        return null;
+    }
+
+    /**
+     * @return bool
+     */
+    public function getLoginRedirect()
+    {
+        if (isSet($this->options["LOGIN_REDIRECT"])) {
+            return $this->options["LOGIN_REDIRECT"];
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    public function getLogoutRedirect()
+    {
+        return false;
+    }
+
+    /**
+     * @param $optionName
+     * @return string
+     */
+    public function getOption($optionName)
+    {
+        return (isSet($this->options[$optionName])?$this->options[$optionName]:"");
+    }
+
+    /**
+     * @param $optionName
+     * @return bool
+     */
+    public function getOptionAsBool($optionName)
+    {
+        return (isSet($this->options[$optionName]) &&
+            ($this->options[$optionName] === true || $this->options[$optionName] === 1
+                || $this->options[$optionName] === "true" || $this->options[$optionName] === "1")
+        );
+    }
+
+    /**
+     * @param $login
+     * @return bool
+     */
+    public function isAjxpAdmin($login)
+    {
+        return ($this->getOption("AJXP_ADMIN_LOGIN") === $login);
+    }
+
+    /**
+     * @return bool
+     */
+    public function autoCreateUser()
+    {
+        $opt = $this->getOption("AUTOCREATE_AJXPUSER");
+        if($opt === true) return true;
+        return false;
+    }
+
+    /**
+     * @param $userId
+     * @param $pwd
+     * @return array
+     */
+    public function filterCredentials($userId, $pwd)
+    {
+        return array($userId, $pwd);
+    }
+
+    /**
+     * List children groups of a given group. By default will report this on the CONF driver,
+     * but can be overriden to grab info directly from auth driver (ldap, etc).
+     * @param string $baseGroup
+     * @return string[]
+     */
+    public function listChildrenGroups($baseGroup = "/")
+    {
+        return ConfService::getConfStorageImpl()->getChildrenGroups($baseGroup);
+    }
+    
+    /**
+     * @return string
+     */
+    public function getStats(){
+        return $this->getId();
+    }
+
+    /**
+     * @param UserInterface $userObject
+     */
+    public function updateUserObject(&$userObject)
+    {
+        $applyRole = $this->getOption("AUTO_APPLY_ROLE");
+        if(!empty($applyRole) && !(is_array($userObject->getRoles()) && array_key_exists($applyRole, $userObject->getRoles())) ){
+            $rObject = RolesService::getOrCreateRole($applyRole, "/");
+            $userObject->addRole($rObject);
+            $userObject->save("superuser");
+        }
+    }
+
+    /**
+     * Sanitize user_id and password. Should be implemented by children (auth ldap) to
+     * be able to use login_id with special characters (utf8) such as : ä, é ...
+     * @param $s
+     * @param int $level
+     * @return mixed|string
+     * @throws \Pydio\Core\Exception\ForbiddenCharacterException
+     */
+    public function sanitize($s, $level = InputFilter::SANITIZE_HTML){
+        return InputFilter::sanitize($s, $level);
+    }
+}
diff --git a/core/src/plugins/core.auth/CoreAuthLoader.php b/core/src/plugins/core.auth/CoreAuthLoader.php
new file mode 100644
index 0000000000..cbea011764
--- /dev/null
+++ b/core/src/plugins/core.auth/CoreAuthLoader.php
@@ -0,0 +1,146 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Auth\Core;
+
+use Exception;
+use Pydio\Core\Model\Context;
+use Pydio\Core\PluginFramework\CoreInstanceProvider;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\PluginFramework\PluginsService;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Config loader overrider
+ * @package AjaXplorer_Plugins
+ * @subpackage Core
+ */
+class CoreAuthLoader extends Plugin implements CoreInstanceProvider
+{
+    /**
+     * @var AbstractAuthDriver
+     */
+    protected static $authStorageImpl;
+
+    /**
+     * Return this plugin configs, merged with its associated "core" configs.
+     * @return array
+     */
+    public function getConfigs()
+    {
+        $configs = parent::getConfigs();
+        $configs["ALLOW_GUEST_BROWSING"] = !isSet($_SERVER["HTTP_AJXP_FORCE_LOGIN"]) && ($configs["ALLOW_GUEST_BROWSING"] === "true" || $configs["ALLOW_GUEST_BROWSING"] === true || intval($configs["ALLOW_GUEST_BROWSING"]) == 1);
+        // FORCE CASE INSENSITIVY FOR SQL BASED DRIVERS
+        if (isSet($configs["MASTER_INSTANCE_CONFIG"]) && is_array($configs["MASTER_INSTANCE_CONFIG"]) && isSet($configs["MASTER_INSTANCE_CONFIG"]["instance_name"]) && $configs["MASTER_INSTANCE_CONFIG"]["instance_name"] == "auth.sql") {
+            $configs["CASE_SENSITIVE"] = false;
+        }
+        if (isSet($configs["SLAVE_INSTANCE_CONFIG"]) && !empty($configs["SLAVE_INSTANCE_CONFIG"]) && isset($configs["SLAVE_INSTANCE_CONFIG"]["instance_name"]) && $configs["SLAVE_INSTANCE_CONFIG"]["instance_name"] == "auth.sql") {
+            $configs["CASE_SENSITIVE"] = false;
+        }
+        return $configs;
+    }
+
+    /**
+     * @param PluginsService|null $pluginsServiceInstance
+     * @return null|AbstractAuthDriver|Plugin
+     * @throws Exception
+     */
+    public function getImplementation($pluginsServiceInstance = null)
+    {
+        if ($pluginsServiceInstance === null) {
+            $pluginsServiceInstance = PluginsService::getInstance(Context::emptyContext());
+        }
+        if (!isSet(self::$authStorageImpl)) {
+            if (!isSet($this->pluginConf["MASTER_INSTANCE_CONFIG"])) {
+                throw new Exception("Please set up at least one MASTER_INSTANCE_CONFIG in core.auth options");
+            }
+            $masterName = is_array($this->pluginConf["MASTER_INSTANCE_CONFIG"]) ? $this->pluginConf["MASTER_INSTANCE_CONFIG"]["instance_name"] : $this->pluginConf["MASTER_INSTANCE_CONFIG"];
+            if (is_array($this->pluginConf["SLAVE_INSTANCE_CONFIG"]) && $this->pluginConf["SLAVE_INSTANCE_CONFIG"]["instance_name"] !== $masterName) {
+                $slaveName = is_array($this->pluginConf["SLAVE_INSTANCE_CONFIG"]) ? $this->pluginConf["SLAVE_INSTANCE_CONFIG"]["instance_name"] : $this->pluginConf["SLAVE_INSTANCE_CONFIG"];
+            }
+            if (!empty($slaveName) && !empty($this->pluginConf["MULTI_MODE"])) {
+                $masterName = str_replace("auth.", "", $masterName);
+                $slaveName = str_replace("auth.", "", $slaveName);
+                // Manually set up a multi config
+
+                $userBase = $this->pluginConf["MULTI_USER_BASE_DRIVER"];
+                if ($userBase == "master") $baseName = $masterName;
+                else if ($userBase == "slave") $baseName = $slaveName;
+                else $baseName = "";
+
+                $mLabel = "";
+                $sLabel = "";
+                $separator = "";
+                $cacheMasters = true;
+                if (isSet($this->pluginConf["MULTI_MODE"]) && !isSet($this->pluginConf["MULTI_MODE"]["instance_name"])) {
+                    $this->pluginConf["MULTI_MODE"]["instance_name"] = $this->pluginConf["MULTI_MODE"]["group_switch_value"];
+                }
+                if ($this->pluginConf["MULTI_MODE"]["instance_name"] == "USER_CHOICE") {
+                    $mLabel = $this->pluginConf["MULTI_MODE"]["MULTI_MASTER_LABEL"];
+                    $sLabel = $this->pluginConf["MULTI_MODE"]["MULTI_SLAVE_LABEL"];
+                    $separator = $this->pluginConf["MULTI_MODE"]["MULTI_USER_ID_SEPARATOR"];
+                } else {
+                    $cacheMasters = $this->pluginConf["MULTI_MODE"]["CACHE_MASTER_USERS_TO_SLAVE"];
+                }
+                $newOptions = array(
+                    "instance_name" => "auth.multi",
+                    "MODE" => $this->pluginConf["MULTI_MODE"]["instance_name"],
+                    "MASTER_DRIVER" => $masterName,
+                    "USER_BASE_DRIVER" => $baseName,
+                    "USER_ID_SEPARATOR" => $separator,
+                    "CACHE_MASTER_USERS_TO_SLAVE" => $cacheMasters,
+                    "DRIVERS" => array(
+                        $masterName => array(
+                            "NAME" => $masterName,
+                            "LABEL" => $mLabel,
+                            "OPTIONS" => $this->pluginConf["MASTER_INSTANCE_CONFIG"]
+                        ),
+                        $slaveName => array(
+                            "NAME" => $slaveName,
+                            "LABEL" => $sLabel,
+                            "OPTIONS" => $this->pluginConf["SLAVE_INSTANCE_CONFIG"]
+                        ),
+                    )
+                );
+                // MERGE BASIC AUTH OPTIONS FROM MASTER
+                $masterMainAuthOptions = array();
+                $keys = array("AUTOCREATE_AJXPUSER", "LOGIN_REDIRECT", "AJXP_ADMIN_LOGIN");
+                if (is_array($this->pluginConf["MASTER_INSTANCE_CONFIG"])) {
+                    foreach ($keys as $key) {
+                        if (isSet($this->pluginConf["MASTER_INSTANCE_CONFIG"][$key])) {
+                            $masterMainAuthOptions[$key] = $this->pluginConf["MASTER_INSTANCE_CONFIG"][$key];
+                        }
+                    }
+                }
+                $newOptions = array_merge($newOptions, $masterMainAuthOptions);
+                self::$authStorageImpl = ConfService::instanciatePluginFromGlobalParams($newOptions, "Pydio\\Auth\\Core\\AbstractAuthDriver", $pluginsServiceInstance);
+
+            } else {
+                self::$authStorageImpl = ConfService::instanciatePluginFromGlobalParams($this->pluginConf["MASTER_INSTANCE_CONFIG"], "Pydio\\Auth\\Core\\AbstractAuthDriver", $pluginsServiceInstance);
+            }
+        }
+        return self::$authStorageImpl;
+    }
+
+
+}
diff --git a/core/src/plugins/core.auth/MemorySafe.php b/core/src/plugins/core.auth/MemorySafe.php
new file mode 100644
index 0000000000..eba8c3af0a
--- /dev/null
+++ b/core/src/plugins/core.auth/MemorySafe.php
@@ -0,0 +1,330 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Auth\Core;
+
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\SessionService;
+use Pydio\Core\Utils\Crypto;
+use Pydio\Core\Utils\Vars\OptionsHelper;
+
+
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Credential keeper that can be stored in the session, the credentials are kept crypted.
+ * @package Pydio
+ * @subpackage Core
+ */
+class MemorySafe
+{
+
+    const SAFE_CREDENTIALS_KEY = "PYDIO_SAFE_CREDENTIALS";
+
+    private static $instance;
+
+    private $user;
+    private $encodedPassword;
+    private $secretKey;
+    private $separator = "__SAFE_SEPARATOR__";
+    private $forceSessionCredentials = false;
+    /**
+     * Instance constructor
+     */
+    public function __construct()
+    {
+        $this->secretKey = Crypto::getApplicationSecret();
+    }
+    /**
+     * Store the user/password pair. Password will be encoded
+     * @param string $user
+     * @param string $password
+     * @return void
+     */
+    public function setCredentials($user, $password)
+    {
+        $this->user = $user;
+        $this->encodedPassword = $this->_encodePassword($password, $user);
+    }
+    /**
+     * Return the user/password pair, or false if cannot find it.
+     * @return array|bool
+     */
+    public function getCredentials()
+    {
+        if (isSet($this->user) && isSet($this->encodedPassword)) {
+            $decoded = $this->_decodePassword($this->encodedPassword, $this->user);
+            return array(
+                "user" 		=> $this->user,
+                "password"	=> $decoded,
+                0			=> $this->user,
+                1			=> $decoded
+            );
+        } else {
+            return false;
+        }
+    }
+    /**
+     * Use mcrypt function to encode the password
+     * @param $password
+     * @param $user
+     * @return string
+     */
+    private function _encodePassword($password, $user)
+    {
+        return Crypto::encrypt($password, Crypto::buildKey($user, $this->secretKey));
+    }
+    /**
+     * Use mcrypt functions to decode the password
+     * @param $encoded
+     * @param $user
+     * @return string
+     */
+    private function _decodePassword($encoded, $user)
+    {
+        return  Crypto::decrypt($encoded, Crypto::buildKey($user, $this->secretKey, $encoded));
+    }
+    /**
+     * Store the password credentials in the session
+     * @return void
+     */
+    public function store() {
+        SessionService::save(self::SAFE_CREDENTIALS_KEY, base64_encode($this->user.$this->separator.$this->encodedPassword));
+    }
+
+    /**
+     * Set the encrypted string in the environment for running a CLI.
+     * @return bool
+     */
+    public static function setEnv(){
+        $encodedCreds = self::getEncodedCredentialString();
+        if (!empty($encodedCreds)) {
+            putenv(self::SAFE_CREDENTIALS_KEY. "=" . $encodedCreds);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Clear the environment variable
+     */
+    public static function clearEnv(){
+        putenv(self::SAFE_CREDENTIALS_KEY);
+    }
+
+    /**
+     * Try to load encrypted string, decode, and get password if the user is corresponding.
+     * @param string $userId
+     * @return bool|mixed
+     */
+    public static function loadPasswordStringFromEnvironment($userId){
+        $env = getenv(self::SAFE_CREDENTIALS_KEY);
+        if(!empty($env)){
+            $array = self::getCredentialsFromEncodedString($env);
+            if(isSet($array["user"]) && $array["user"] == $userId){
+                return $array["password"];
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Load the credentials from session
+     * @param string $encodedString
+     * @return void
+     */
+    public function load($encodedString = "")
+    {
+        if ($encodedString == "" && SessionService::has(self::SAFE_CREDENTIALS_KEY)) {
+            $encodedString = SessionService::fetch(self::SAFE_CREDENTIALS_KEY);
+        }
+        if(empty($encodedString)) return;
+        $sessData = base64_decode($encodedString);
+        $parts = explode($this->separator, $sessData);
+        $this->user = $parts[0];
+        $this->encodedPassword = $parts[1];
+    }
+    /**
+     * Remove the credentials from session
+     * @return void
+     */
+    public function clear()
+    {
+        SessionService::delete(self::SAFE_CREDENTIALS_KEY);
+        $this->user = null;
+        $this->encodedPassword = null;
+    }
+    /**
+     * For the session credentials to override other credentials set via config
+     * @return void
+     */
+    public function forceSessionCredentialsUsage()
+    {
+        $this->forceSessionCredentials = true;
+    }
+
+
+
+    /**
+     * Creates the singleton instance
+     * @return MemorySafe
+     */
+    public static function getInstance()
+    {
+        if (empty(self::$instance)) {
+            self::$instance = new MemorySafe();
+        }
+        return self::$instance;
+    }
+    /**
+     * Store the user/pass key pair
+     * @static
+     * @param string $user
+     * @param string $password
+     * @return void
+     */
+    public static function storeCredentials($user, $password)
+    {
+        $inst = MemorySafe::getInstance();
+        $inst->setCredentials($user, $password);
+        $inst->store();
+    }
+    /**
+     * Remove the user/pass encoded from the session
+     * @static
+     * @return void
+     */
+    public static function clearCredentials()
+    {
+        $inst = MemorySafe::getInstance();
+        $inst->clear();
+    }
+    /**
+     * Retrieve the user/pass from the session
+     * @static
+     * @return array|bool
+     */
+    public static function loadCredentials()
+    {
+        $inst = MemorySafe::getInstance();
+        $inst->load();
+        return $inst->getCredentials();
+    }
+
+    /**
+     * @return mixed
+     */
+    public static function getEncodedCredentialString() {
+        return SessionService::fetch(self::SAFE_CREDENTIALS_KEY);
+    }
+
+    /**
+     * @param $encoded
+     * @return array|bool
+     */
+    public static function getCredentialsFromEncodedString($encoded)
+    {
+        $tmpInstance = new MemorySafe();
+        $tmpInstance->load($encoded);
+        return $tmpInstance->getCredentials();
+    }
+
+    /**
+     * Will try to get the credentials for a given repository as follow :
+     * + Try to get the credentials from the url parsing
+     * + Try to get them from the user "Wallet" (personal data)
+     * + Try to get them from the repository configuration
+     * + Try to get them from the MemorySafe.
+     *
+     * @param ContextInterface $ctx
+     * @return array
+     */
+    public static function tryLoadingCredentialsFromSources($ctx)
+    {
+        $user = $password = "";
+        $optionsPrefix = "";
+        $repository = $ctx->getRepository();
+        if ($repository->getAccessType() == "ftp") {
+            $optionsPrefix = "FTP_";
+        }
+        // Get USER/PASS
+        // 1. Try from URL
+        /*
+        if (isSet($parsedUrl["user"]) && isset($parsedUrl["pass"])) {
+            $user       = rawurldecode($parsedUrl["user"]);
+            $password   = rawurldecode($parsedUrl["pass"]);
+        }
+        */
+        // 2. Try from user wallet
+        if ($user=="") {
+            $loggedUser = $ctx->getUser();
+            if ($loggedUser != null) {
+                $wallet = $loggedUser->getPref("AJXP_WALLET");
+                if (is_array($wallet) && isSet($wallet[$repository->getId()][$optionsPrefix."USER"])) {
+                    $user = $wallet[$repository->getId()][$optionsPrefix."USER"];
+                    $password = OptionsHelper::decypherStandardFormPassword($loggedUser->getId(), $wallet[$repository->getId()][$optionsPrefix . "PASS"]);
+                }
+            }
+        }
+        // 2bis. Wallet is now a custom parameter
+        if ($user =="") {
+            $loggedUser = $ctx->getUser();
+            if ($loggedUser != null) {
+                $u = $loggedUser->getMergedRole()->filterParameterValue("access.".$repository->getAccessType(), $optionsPrefix."USER", $repository->getId(), "");
+                $p = $loggedUser->getMergedRole()->filterParameterValue("access.".$repository->getAccessType(), $optionsPrefix."PASS", $repository->getId(), "");
+                if (!empty($u) && !empty($p)) {
+                    $user = $u;
+                    $password = OptionsHelper::decypherStandardFormPassword($loggedUser->getId(), $p);
+                }
+            }
+        }
+        // 3. Try from repository config
+        if ($user=="") {
+            $user       = $repository->getContextOption($ctx, $optionsPrefix."USER");
+            $password   = $repository->getContextOption($ctx, $optionsPrefix."PASS");
+        }
+        // 4. Test if there are encoded credentials available
+        if ($user == "" && $repository->getContextOption($ctx, "ENCODED_CREDENTIALS") != "") {
+            list($user, $password) = MemorySafe::getCredentialsFromEncodedString($repository->getContextOption($ctx, "ENCODED_CREDENTIALS"));
+        }
+        // 5. Try from session
+        $storeCreds = false;
+        if ($repository->getContextOption($ctx, "META_SOURCES")) {
+            $options["META_SOURCES"] = $repository->getContextOption($ctx, "META_SOURCES");
+            foreach ($options["META_SOURCES"] as $metaSource) {
+                if (isSet($metaSource["USE_SESSION_CREDENTIALS"]) && $metaSource["USE_SESSION_CREDENTIALS"] === true) {
+                    $storeCreds = true;
+                    break;
+                }
+            }
+        }
+        if ($user=="" && ( $repository->getContextOption($ctx, "USE_SESSION_CREDENTIALS") || $storeCreds || self::getInstance()->forceSessionCredentials )) {
+            $safeCred = MemorySafe::loadCredentials();
+            if ($safeCred !== false) {
+                $user = $safeCred["user"];
+                $password = $safeCred["password"];
+            }
+        }
+        return array("user" => $user, "password" => $password);
+
+    }
+
+}
diff --git a/core/src/plugins/core.auth/class.AbstractAuthDriver.php b/core/src/plugins/core.auth/class.AbstractAuthDriver.php
deleted file mode 100644
index 7cd6573261..0000000000
--- a/core/src/plugins/core.auth/class.AbstractAuthDriver.php
+++ /dev/null
@@ -1,337 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-define('AJXP_FILTER_EMPTY', 'AJXP_FILTER_EMPTY');
-define('AJXP_FILTER_NOT_EMPTY', 'AJXP_FILTER_NOT_EMPTY');
-
-/**
- * @package AjaXplorer_Plugins
- * @subpackage Core
- * @class AbstractAuthDriver
- * Abstract representation of an authentication driver. Must be implemented by the auth plugin
- */
-class AbstractAuthDriver extends AJXP_Plugin
-{
-    public $options;
-    public $driverName = "abstract";
-    public $driverType = "auth";
-
-    public function switchAction($action, $httpVars, $fileVars)
-    {
-        switch ($action) {
-
-            case "get_secure_token" :
-                HTMLWriter::charsetHeader("text/plain");
-                print AuthService::generateSecureToken();
-                //exit(0);
-                break;
-
-            //------------------------------------
-            //	CHANGE USER PASSWORD
-            //------------------------------------
-            case "pass_change":
-
-                $userObject = AuthService::getLoggedUser();
-                if ($userObject == null || $userObject->getId() == "guest") {
-                    header("Content-Type:text/plain");
-                    print "SUCCESS";
-                    break;
-                }
-                $oldPass = $httpVars["old_pass"];
-                $newPass = $httpVars["new_pass"];
-                $passSeed = $httpVars["pass_seed"];
-                if (strlen($newPass) < ConfService::getCoreConf("PASSWORD_MINLENGTH", "auth")) {
-                    header("Content-Type:text/plain");
-                    print "PASS_ERROR";
-                    break;
-                }
-                if (AuthService::checkPassword($userObject->getId(), $oldPass, false, $passSeed)) {
-                    AuthService::updatePassword($userObject->getId(), $newPass);
-                    if ($userObject->getLock() == "pass_change") {
-                        $userObject->removeLock();
-                        $userObject->save("superuser");
-                    }
-                } else {
-                    header("Content-Type:text/plain");
-                    print "PASS_ERROR";
-                    break;
-                }
-                header("Content-Type:text/plain");
-                print "SUCCESS";
-
-                break;
-
-
-
-            default;
-            break;
-        }
-        return "";
-    }
-
-
-    public function getRegistryContributions( $extendedVersion = true )
-    {
-        $this->loadRegistryContributions();
-        if(!$extendedVersion) return $this->registryContributions;
-
-        $logged = AuthService::getLoggedUser();
-        if (AuthService::usersEnabled()) {
-            if ($logged == null) {
-                return $this->registryContributions;
-            } else {
-                $xmlString = AJXP_XMLWriter::getUserXml($logged);
-            }
-        } else {
-            $xmlString = AJXP_XMLWriter::getUserXml(null);
-        }
-        $dom = new DOMDocument();
-        $dom->loadXML($xmlString);
-        $this->registryContributions[]=$dom->documentElement;
-        return $this->registryContributions;
-    }
-
-    protected function parseSpecificContributions(&$contribNode)
-    {
-        parent::parseSpecificContributions($contribNode);
-        if($contribNode->nodeName != "actions") return ;
-
-        if(AuthService::usersEnabled() && $this->passwordsEditable()) return ;
-        // Disable password change action
-        if(!isSet($actionXpath)) $actionXpath=new DOMXPath($contribNode->ownerDocument);
-        $passChangeNodeList = $actionXpath->query('action[@name="pass_change"]', $contribNode);
-        if(!$passChangeNodeList->length) return ;
-        $passChangeNode = $passChangeNodeList->item(0);
-        $contribNode->removeChild($passChangeNode);
-    }
-
-    /**
-     * Old way of prelogging user, replaced by authentication frontends
-     * @param String $sessionId
-     */
-    public function preLogUser($sessionId){}
-
-    /**
-     * Wether users can be listed using offset and limit
-     * @return bool
-     */
-    public function supportsUsersPagination()
-    {
-        return false;
-    }
-
-    /**
-     * Applicable if supportsUsersPagination(), try to detect at what page the user is
-     * @param string $baseGroup
-     * @param string $userLogin
-     * @param int $usersPerPage
-     * @param int $offset
-     * @return int
-     */
-    public function findUserPage($baseGroup, $userLogin, $usersPerPage, $offset = 0){
-        return -1;
-    }
-
-    /**
-     * List users using offsets
-     * @param string $baseGroup
-     * @param string $regexp
-     * @param int $offset
-     * @param int $limit
-     * @param bool $recursive
-     * @return AbstractAjxpUser[]
-     */
-    public function listUsersPaginated($baseGroup, $regexp, $offset, $limit, $recursive = true)
-    {
-        return $this->listUsers($baseGroup, $recursive);
-    }
-
-    /**
-     * @param string $baseGroup
-     * @param string $regexp
-     * @param null|string $filterProperty Can be "admin" or "parent"
-     * @param null|string $filterValue Can be a user Id, or AJXP_FILTER_EMPTY or AJXP_FILTER_NOT_EMPTY
-     * @param bool $recursive
-     * @return int
-     */
-    public function getUsersCount($baseGroup = "/", $regexp = "", $filterProperty = null, $filterValue = null, $recursive = true)
-    {
-        return -1;
-    }
-
-    /**
-     *
-     * @param string $baseGroup
-     * @param bool $recursive
-     * @return AbstractAjxpUser[]
-     */
-    public function listUsers($baseGroup = "/", $recursive = true){}
-
-    /**
-     * @param $login
-     * @return boolean
-     */
-    public function userExists($login){}
-
-    /**
-     * Alternative method to be used when checking if user exists
-     * before creating a new user.
-     * @param $login
-     * @return bool
-     */
-    public function userExistsWrite($login)
-    {
-        return $this->userExists($login);
-    }
-
-    /**
-     * @param string $login
-     * @param string $pass
-     * @param string $seed
-     * @return bool
-     */
-    public function checkPassword($login, $pass, $seed){}
-
-    /**
-     * @param string $login
-     * @return string
-     */
-    public function createCookieString($login){}
-
-
-
-    /**
-     * @return bool
-     */
-    public function usersEditable(){}
-
-    /**
-     * @return bool
-     */
-    public function passwordsEditable(){}
-
-    public function createUser($login, $passwd){}
-    public function changePassword($login, $newPass){}
-    public function deleteUser($login){}
-
-    public function supportsAuthSchemes()
-    {
-        return false;
-    }
-    /**
-     * @param $login
-     * @return String
-     */
-    public function getAuthScheme($login)
-    {
-        return null;
-    }
-
-    public function getLoginRedirect()
-    {
-        if (isSet($this->options["LOGIN_REDIRECT"])) {
-            return $this->options["LOGIN_REDIRECT"];
-        } else {
-            return false;
-        }
-    }
-
-    public function getLogoutRedirect()
-    {
-        return false;
-    }
-
-    public function getOption($optionName)
-    {
-        return (isSet($this->options[$optionName])?$this->options[$optionName]:"");
-    }
-
-    /**
-     * @param $optionName
-     * @return bool
-     */
-    public function getOptionAsBool($optionName)
-    {
-        return (isSet($this->options[$optionName]) &&
-            ($this->options[$optionName] === true || $this->options[$optionName] === 1
-                || $this->options[$optionName] === "true" || $this->options[$optionName] === "1")
-        );
-    }
-
-    public function isAjxpAdmin($login)
-    {
-        return ($this->getOption("AJXP_ADMIN_LOGIN") === $login);
-    }
-
-    public function autoCreateUser()
-    {
-        $opt = $this->getOption("AUTOCREATE_AJXPUSER");
-        if($opt === true) return true;
-        return false;
-    }
-
-    public function getSeed($new=true)
-    {
-        if($this->getOptionAsBool("TRANSMIT_CLEAR_PASS")) return -1;
-        if ($new) {
-            $seed = md5(time());
-            $_SESSION["AJXP_CURRENT_SEED"] = $seed;
-            return $seed;
-        } else {
-            return (isSet($_SESSION["AJXP_CURRENT_SEED"])?$_SESSION["AJXP_CURRENT_SEED"]:0);
-        }
-    }
-
-    public function filterCredentials($userId, $pwd)
-    {
-        return array($userId, $pwd);
-    }
-
-    /**
-     * List children groups of a given group. By default will report this on the CONF driver,
-     * but can be overriden to grab info directly from auth driver (ldap, etc).
-     * @param string $baseGroup
-     * @return string[]
-     */
-    public function listChildrenGroups($baseGroup = "/")
-    {
-        return ConfService::getConfStorageImpl()->getChildrenGroups($baseGroup);
-    }
-    
-    public function getStats(){
-        return $this->getId();
-    }
-
-    /**
-     * @param AbstractAjxpUser $userObject
-     */
-    public function updateUserObject(&$userObject)
-    {
-        $applyRole = $this->getOption("AUTO_APPLY_ROLE");
-        if(!empty($applyRole) && !(is_array($userObject->getRoles()) && array_key_exists($applyRole, $userObject->getRoles())) ){
-            $rObject = AuthService::getRole($applyRole, true);
-            $userObject->addRole($rObject);
-            $userObject->save("superuser");
-        }
-    }
-
-}
diff --git a/core/src/plugins/core.auth/class.CoreAuthLoader.php b/core/src/plugins/core.auth/class.CoreAuthLoader.php
deleted file mode 100644
index 3b090b4b19..0000000000
--- a/core/src/plugins/core.auth/class.CoreAuthLoader.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Config loader overrider
- * @package AjaXplorer_Plugins
- * @subpackage Core
- */
-class CoreAuthLoader extends AJXP_Plugin
-{
-    /**
-     * @var AbstractAuthDriver
-     */
-    protected static $authStorageImpl;
-
-    public function getConfigs()
-    {
-        $configs = parent::getConfigs();
-        $configs["ALLOW_GUEST_BROWSING"] = !isSet($_SERVER["HTTP_AJXP_FORCE_LOGIN"]) && ($configs["ALLOW_GUEST_BROWSING"] === "true" || $configs["ALLOW_GUEST_BROWSING"] === true || intval($configs["ALLOW_GUEST_BROWSING"]) == 1);
-        // FORCE CASE INSENSITIVY FOR SQL BASED DRIVERS
-        if (isSet($configs["MASTER_INSTANCE_CONFIG"]) && is_array($configs["MASTER_INSTANCE_CONFIG"]) &&  isSet($configs["MASTER_INSTANCE_CONFIG"]["instance_name"]) && $configs["MASTER_INSTANCE_CONFIG"]["instance_name"] == "auth.sql") {
-            $configs["CASE_SENSITIVE"] = false;
-        }
-        if (isSet($configs["SLAVE_INSTANCE_CONFIG"]) && !empty($configs["SLAVE_INSTANCE_CONFIG"])  && isset($configs["SLAVE_INSTANCE_CONFIG"]["instance_name"]) && $configs["SLAVE_INSTANCE_CONFIG"]["instance_name"] == "auth.sql") {
-            $configs["CASE_SENSITIVE"] = false;
-        }
-        return $configs;
-    }
-
-    public function getAuthImpl()
-    {
-        if (!isSet(self::$authStorageImpl)) {
-            if (!isSet($this->pluginConf["MASTER_INSTANCE_CONFIG"])) {
-                throw new Exception("Please set up at least one MASTER_INSTANCE_CONFIG in core.auth options");
-            }
-            $masterName = is_array($this->pluginConf["MASTER_INSTANCE_CONFIG"]) ? $this->pluginConf["MASTER_INSTANCE_CONFIG"]["instance_name"] : $this->pluginConf["MASTER_INSTANCE_CONFIG"];
-            $masterName = str_replace("auth.", "", $masterName);
-            if (!empty($this->pluginConf["SLAVE_INSTANCE_CONFIG"]) && !empty($this->pluginConf["MULTI_MODE"])) {
-                $slaveName = is_array($this->pluginConf["SLAVE_INSTANCE_CONFIG"]) ? $this->pluginConf["SLAVE_INSTANCE_CONFIG"]["instance_name"] : $this->pluginConf["SLAVE_INSTANCE_CONFIG"];
-                $slaveName = str_replace("auth.", "", $slaveName);
-                // Manually set up a multi config
-
-                $userBase = $this->pluginConf["MULTI_USER_BASE_DRIVER"];
-                if($userBase == "master") $baseName = $masterName;
-                else if($userBase == "slave") $baseName = $slaveName;
-                else $baseName = "";
-
-                $mLabel = ""; $sLabel = "";$separator = "";
-                $cacheMasters = true;
-                if(isSet($this->pluginConf["MULTI_MODE"]) && !isSet($this->pluginConf["MULTI_MODE"]["instance_name"])){
-                    $this->pluginConf["MULTI_MODE"]["instance_name"] = $this->pluginConf["MULTI_MODE"]["group_switch_value"];
-                }
-                if ($this->pluginConf["MULTI_MODE"]["instance_name"] == "USER_CHOICE") {
-                    $mLabel = $this->pluginConf["MULTI_MODE"]["MULTI_MASTER_LABEL"];
-                    $sLabel = $this->pluginConf["MULTI_MODE"]["MULTI_SLAVE_LABEL"];
-                    $separator = $this->pluginConf["MULTI_MODE"]["MULTI_USER_ID_SEPARATOR"];
-                }else{
-                    $cacheMasters = $this->pluginConf["MULTI_MODE"]["CACHE_MASTER_USERS_TO_SLAVE"];
-                }
-                $newOptions = array(
-                    "instance_name" => "auth.multi",
-                    "MODE" => $this->pluginConf["MULTI_MODE"]["instance_name"],
-                    "MASTER_DRIVER" => $masterName,
-                    "USER_BASE_DRIVER" => $baseName,
-                    "USER_ID_SEPARATOR" => $separator,
-                    "CACHE_MASTER_USERS_TO_SLAVE" => $cacheMasters,
-                    "TRANSMIT_CLEAR_PASS" => $this->pluginConf["TRANSMIT_CLEAR_PASS"],
-                    "DRIVERS" => array(
-                        $masterName => array(
-                            "NAME" => $masterName,
-                            "LABEL" => $mLabel,
-                            "OPTIONS" => $this->pluginConf["MASTER_INSTANCE_CONFIG"]
-                        ),
-                        $slaveName => array(
-                            "NAME" => $slaveName,
-                            "LABEL" => $sLabel,
-                            "OPTIONS" => $this->pluginConf["SLAVE_INSTANCE_CONFIG"]
-                        ),
-                    )
-                );
-                // MERGE BASIC AUTH OPTIONS FROM MASTER
-                $masterMainAuthOptions = array();
-                $keys = array("TRANSMIT_CLEAR_PASS", "AUTOCREATE_AJXPUSER", "LOGIN_REDIRECT", "AJXP_ADMIN_LOGIN");
-                if (is_array($this->pluginConf["MASTER_INSTANCE_CONFIG"])) {
-                    foreach ($keys as $key) {
-                        if (isSet($this->pluginConf["MASTER_INSTANCE_CONFIG"][$key])) {
-                            $masterMainAuthOptions[$key] = $this->pluginConf["MASTER_INSTANCE_CONFIG"][$key];
-                        }
-                    }
-                }
-                $newOptions = array_merge($newOptions, $masterMainAuthOptions);
-                self::$authStorageImpl = ConfService::instanciatePluginFromGlobalParams($newOptions, "AbstractAuthDriver");
-                AJXP_PluginsService::getInstance()->setPluginUniqueActiveForType("auth", self::$authStorageImpl->getName(), self::$authStorageImpl);
-
-            } else {
-                self::$authStorageImpl = ConfService::instanciatePluginFromGlobalParams($this->pluginConf["MASTER_INSTANCE_CONFIG"], "AbstractAuthDriver");
-                AJXP_PluginsService::getInstance()->setPluginUniqueActiveForType("auth", self::$authStorageImpl->getName());
-            }
-        }
-        return self::$authStorageImpl;
-    }
-
-
-}
diff --git a/core/src/plugins/core.auth/i18n/conf/de.php b/core/src/plugins/core.auth/i18n/conf/de.php
index f311ce225f..5491511354 100644
--- a/core/src/plugins/core.auth/i18n/conf/de.php
+++ b/core/src/plugins/core.auth/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Generic Auth Features" => "Standard-Authentifizierung",
@@ -63,4 +63,4 @@
 "Disable the check of failed login attempts, will disable the Captcha display" => "Disable the check of failed login attempts, will disable the Captcha display",
 "Multiple Instances Mode" => "Multiple Instances Mode",
 "Secondary Instance Driver" => "Secondary Instance Driver",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/core.auth/i18n/conf/en.php b/core/src/plugins/core.auth/i18n/conf/en.php
index d463c36d74..b4ea4344ca 100644
--- a/core/src/plugins/core.auth/i18n/conf/en.php
+++ b/core/src/plugins/core.auth/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Generic Auth Features" => "Generic Features",
diff --git a/core/src/plugins/core.auth/i18n/conf/fr.php b/core/src/plugins/core.auth/i18n/conf/fr.php
index 37fac5bc0b..b4f47b9cdc 100644
--- a/core/src/plugins/core.auth/i18n/conf/fr.php
+++ b/core/src/plugins/core.auth/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Generic Auth Features" => "Configuration génériques pour les authentifications",
diff --git a/core/src/plugins/core.auth/i18n/conf/it.php b/core/src/plugins/core.auth/i18n/conf/it.php
index dfaadd6f19..73bbfe262e 100644
--- a/core/src/plugins/core.auth/i18n/conf/it.php
+++ b/core/src/plugins/core.auth/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Generic Auth Features" => "Funzionalità Generiche",
@@ -63,4 +63,4 @@
 "Disable the check of failed login attempts, will disable the Captcha display" => "Disable the check of failed login attempts, will disable the Captcha display",
 "Multiple Instances Mode" => "Multiple Instances Mode",
 "Secondary Instance Driver" => "Secondary Instance Driver",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/core.auth/i18n/conf/pt.php b/core/src/plugins/core.auth/i18n/conf/pt.php
index 216dc1c410..c03a12371c 100644
--- a/core/src/plugins/core.auth/i18n/conf/pt.php
+++ b/core/src/plugins/core.auth/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Generic Auth Features" => "Funções Auth Genéricas",
diff --git a/core/src/plugins/core.auth/i18n/conf/ru.php b/core/src/plugins/core.auth/i18n/conf/ru.php
index 77209a785e..fdb271dc53 100644
--- a/core/src/plugins/core.auth/i18n/conf/ru.php
+++ b/core/src/plugins/core.auth/i18n/conf/ru.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Generic Auth Features" => "Ключевые параметры",
@@ -63,4 +63,4 @@
 "Disable the check of failed login attempts, will disable the Captcha display" => "Disable the check of failed login attempts, will disable the Captcha display",
 "Multiple Instances Mode" => "Multiple Instances Mode",
 "Secondary Instance Driver" => "Secondary Instance Driver",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/core.auth/manifest.xml b/core/src/plugins/core.auth/manifest.xml
index 514650e69e..9aad83ad38 100644
--- a/core/src/plugins/core.auth/manifest.xml
+++ b/core/src/plugins/core.auth/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ajxpcore id="core.auth" label="CONF_MESSAGE[Authentication]" description="CONF_MESSAGE[Options applied to all auth drivers]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-	<class_definition filename="plugins/core.auth/class.CoreAuthLoader.php" classname="CoreAuthLoader"/>
+	<class_definition filename="plugins/core.auth/CoreAuthLoader.php" classname="Pydio\Auth\Core\CoreAuthLoader"/>
     <client_settings>
         <resources>
             <i18n namespace="core_auth" path="plugins/core.auth/i18n"/>
@@ -14,9 +14,9 @@
 		<global_param name="SESSION_SET_CREDENTIALS" group="CONF_MESSAGE[Generic Auth Features]"  type="boolean" label="CONF_MESSAGE[Store Credentials in Session]" description="CONF_MESSAGE[Set the users credentials in the session after a successful login, this can be necessary when bridging specific auth and access plugins.]" mandatory="true" default="false"/>
 		<global_param name="SECURE_LOGIN_FORM" group="CONF_MESSAGE[Login Form]"  type="boolean" label="CONF_MESSAGE[Secure Login Form]" description="CONF_MESSAGE[Raise the security of the login form by disabling autocompletion and remember me feature]" mandatory="true" default="false" expose="true"/>
 		<global_param name="ENABLE_FORGOT_PASSWORD" group="CONF_MESSAGE[Login Form]"  type="boolean" label="CONF_MESSAGE[Enable Forgot Password]" description="CONF_MESSAGE[Add a Forgot Password link at the bottom of the login form]" mandatory="true" default="false" expose="true"/>
-		<global_param name="FORGOT_PASSWORD_ACTION" group="CONF_MESSAGE[Login Form]"  type="string" label="CONF_MESSAGE[Forgot Password Action]" description="CONF_MESSAGE[Action to trigger when clicking on Forgot Password]" mandatory="true" default="reset-password-ask" expose="true"/>
+		<global_param name="FORGOT_PASSWORD_ACTION" group="CONF_MESSAGE[Login Form]"  type="string" label="CONF_MESSAGE[Forgot Password Action]" description="CONF_MESSAGE[Action to trigger when clicking on Forgot Password. Can be changed to trigger a custom action if you rely on external authentication system.]" mandatory="true" default="reset-password-ask" expose="true"/>
 		<global_param name="DISABLE_BRUTE_FORCE_CHECK" group="CONF_MESSAGE[Login Form]"  type="boolean" label="CONF_MESSAGE[Disable Brute Force Check (Captcha)]" description="CONF_MESSAGE[Disable the check of failed login attempts, will disable the Captcha display]" default="false"/>
-        <global_param type="plugin_instance:auth" name="MASTER_INSTANCE_CONFIG" group="CONF_MESSAGE[Main Instance]" label="CONF_MESSAGE[Instance Type]" description="CONF_MESSAGE[Choose the configuration plugin]" mandatory="true" default="auth.serial"/>
+        <global_param type="plugin_instance:auth" name="MASTER_INSTANCE_CONFIG" group="CONF_MESSAGE[Main Instance]" label="CONF_MESSAGE[Instance Type]" description="CONF_MESSAGE[Choose the configuration plugin]" mandatory="true" default="auth.sql"/>
 
         <global_param group="CONF_MESSAGE[Multiple Instances Mode]" name="MULTI_MODE" type="group_switch:multimode" label="CONF_MESSAGE[Mode]" description="CONF_MESSAGE[Master/slave will assume that the master is read-only, and the slave is a local alternative to allow sharing features. User Choice will allow the user to manually choose its authentication method at startup.]" mandatory="true" default="MASTER_SLAVE"/>
         <global_param group_switch_name="multimode" group_switch_label="CONF_MESSAGE[Master/Slave]" group_switch_value="MASTER_SLAVE" description="" label="Master slave" name="instance_name" type="hidden" default="MASTER_SLAVE" mandatory="true"/>
diff --git a/core/src/plugins/core.authfront/AbstractAuthFrontend.php b/core/src/plugins/core.authfront/AbstractAuthFrontend.php
new file mode 100644
index 0000000000..42ffad6778
--- /dev/null
+++ b/core/src/plugins/core.authfront/AbstractAuthFrontend.php
@@ -0,0 +1,45 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Auth\Frontend\Core;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Core\PluginFramework\Plugin;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Class AbstractAuthFrontend
+ * @package Pydio\Auth\Frontend\Core
+ */
+abstract class AbstractAuthFrontend extends Plugin {
+
+    /**
+     * Try to authenticate the user based on various external parameters
+     * Return true if user is now logged.
+     *
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @param bool $isLast Whether this is is the last plugin called.
+     * @return bool
+     */
+    abstract function tryToLogUser(ServerRequestInterface &$request, ResponseInterface &$response, $isLast = false);
+
+} 
\ No newline at end of file
diff --git a/core/src/plugins/core.authfront/FrontendsLoader.php b/core/src/plugins/core.authfront/FrontendsLoader.php
new file mode 100644
index 0000000000..8c12f90e13
--- /dev/null
+++ b/core/src/plugins/core.authfront/FrontendsLoader.php
@@ -0,0 +1,119 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Auth\Frontend\Core;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Class FrontendsLoader
+ * @package Pydio\Auth\Frontend\Core
+ */
+class FrontendsLoader extends Plugin {
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @return null|ResponseInterface
+     */
+    public static function frontendsAsAuthMiddlewares(ServerRequestInterface &$requestInterface, ResponseInterface &$responseInterface){
+
+        if(UsersService::usersEnabled()){
+
+            $ctx = $requestInterface->getAttribute("ctx");
+            PluginsService::getInstance($ctx)->initActivePlugins();
+            $frontends = PluginsService::getInstance($ctx)->getActivePluginsForType("authfront");
+            $index = 0;
+            /**
+             * @var AbstractAuthFrontend $frontendPlugin
+             */
+            foreach($frontends as $frontendPlugin){
+                if(!$frontendPlugin->isEnabled()) continue;
+                if(!method_exists($frontendPlugin, "tryToLogUser")){
+                    Logger::error(__CLASS__, __FUNCTION__, "Trying to use an authfront plugin without tryToLogUser method. Wrongly initialized?");
+                    continue;
+                }
+                //$res = $frontendPlugin->tryToLogUser($httpVars, ($index == count($frontends)-1));
+                $isLast = ($index == count($frontends)-1);
+                $res = $frontendPlugin->tryToLogUser($requestInterface, $responseInterface, $isLast);
+                $index ++;
+                if($res) {
+                    if($responseInterface->getBody()->getSize() > 0 || $responseInterface->getStatusCode() != 200){
+                        // Do not go to the other middleware, return directly.
+                        return $responseInterface;
+                    }
+                    break;
+                }
+            }
+
+        }
+
+        return null;
+
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+
+        parent::init($ctx, $options);
+
+        // Load all enabled frontend plugins
+        $useSessions = ApplicationState::sapiUsesSession();
+        $fronts = PluginsService::getInstance($ctx)->getPluginsByType("authfront");
+        usort($fronts, array($this, "frontendsSort"));
+        foreach($fronts as $front){
+            if($front->isEnabled()){
+                $configs = $front->getConfigs();
+                $protocol = $configs["PROTOCOL_TYPE"];
+                if($protocol == "session_only" && !$useSessions) continue;
+                if($protocol == "no_session" && $useSessions) continue;
+                PluginsService::getInstance($ctx)->setPluginActive($front->getType(), $front->getName(), true);
+            }
+        }
+
+    }
+
+    /**
+     * @param \Pydio\Core\PluginFramework\Plugin $a
+     * @param \Pydio\Core\PluginFramework\Plugin $b
+     * @return int
+     */
+    public function frontendsSort($a, $b){
+        $aConf = $a->getConfigs();
+        $bConf = $b->getConfigs();
+        $orderA = intval($aConf["ORDER"]);
+        $orderB = intval($bConf["ORDER"]);
+        if($orderA == $orderB) return 0;
+        return $orderA > $orderB ? 1 : -1;
+    }
+
+} 
\ No newline at end of file
diff --git a/core/src/plugins/core.authfront/class.AbstractAuthFrontend.php b/core/src/plugins/core.authfront/class.AbstractAuthFrontend.php
deleted file mode 100644
index 29e5cdb23d..0000000000
--- a/core/src/plugins/core.authfront/class.AbstractAuthFrontend.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-abstract class AbstractAuthFrontend extends AJXP_Plugin {
-
-    /**
-     * Try to authenticate the user based on various external parameters
-     * Return true if user is now logged.
-     *
-     * @param array $httpVars
-     * @param bool $isLast Whether this is is the last plugin called.
-     * @return bool
-     */
-    abstract function tryToLogUser(&$httpVars, $isLast = false);
-
-} 
\ No newline at end of file
diff --git a/core/src/plugins/core.authfront/class.FrontendsLoader.php b/core/src/plugins/core.authfront/class.FrontendsLoader.php
deleted file mode 100644
index 319153c3d4..0000000000
--- a/core/src/plugins/core.authfront/class.FrontendsLoader.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-class FrontendsLoader extends AJXP_Plugin {
-
-    public function init($options){
-
-        parent::init($options);
-
-        // Load all enabled frontend plugins
-        $fronts = AJXP_PluginsService::getInstance()->getPluginsByType("authfront");
-        usort($fronts, array($this, "frontendsSort"));
-        foreach($fronts as $front){
-            if($front->isEnabled()){
-                $configs = $front->getConfigs();
-                $protocol = $configs["PROTOCOL_TYPE"];
-                if($protocol == "session_only" && !AuthService::$useSession) continue;
-                if($protocol == "no_session" && AuthService::$useSession) continue;
-                AJXP_PluginsService::setPluginActive($front->getType(), $front->getName(), true);
-            }
-        }
-
-    }
-
-    /**
-     * @param AJXP_Plugin $a
-     * @param AJXP_Plugin $b
-     * @return int
-     */
-    public function frontendsSort($a, $b){
-        $aConf = $a->getConfigs();
-        $bConf = $b->getConfigs();
-        $orderA = intval($aConf["ORDER"]);
-        $orderB = intval($bConf["ORDER"]);
-        if($orderA == $orderB) return 0;
-        return $orderA > $orderB ? 1 : -1;
-    }
-
-} 
\ No newline at end of file
diff --git a/core/src/plugins/core.authfront/manifest.xml b/core/src/plugins/core.authfront/manifest.xml
index 0d7eb15197..b547245505 100644
--- a/core/src/plugins/core.authfront/manifest.xml
+++ b/core/src/plugins/core.authfront/manifest.xml
@@ -3,5 +3,5 @@
           description="CONF_MESSAGE[Actual way to authenticate users (via credentials, certificates, http, etc]"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <class_definition classname="FrontendsLoader" filename="plugins/core.authfront/class.FrontendsLoader.php"/>
+    <class_definition classname="Pydio\Auth\Frontend\Core\FrontendsLoader" filename="plugins/core.authfront/FrontendsLoader.php"/>
 </ajxpcore>
\ No newline at end of file
diff --git a/core/src/plugins/core.cache/AbstractCacheDriver.php b/core/src/plugins/core.cache/AbstractCacheDriver.php
new file mode 100644
index 0000000000..eb85ef47b5
--- /dev/null
+++ b/core/src/plugins/core.cache/AbstractCacheDriver.php
@@ -0,0 +1,409 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>, mosen
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Cache\Core;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+define('AJXP_CACHE_SERVICE_NS_SHARED', 'shared');
+define('AJXP_CACHE_SERVICE_NS_NODES', 'nodes');
+
+use Doctrine\Common\Cache;
+use Pydio\Access\Core\Model\AJXP_Node;
+
+
+use Pydio\Cache\Doctrine\Ext\PydioApcuCache;
+use Pydio\Cache\Doctrine\Ext\PydioChainCache;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Cache\Doctrine\Ext\PatternClearableCache;
+use GuzzleHttp\Client;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Log\Core\Logger;
+
+/**
+ * @package AjaXplorer_Plugins
+ * @subpackage Core
+ * @class AbstractCacheDriver
+ * @author ghecquet
+ * @abstract
+ * Abstraction of the caching system
+ * The cache will be implemented by the plugin which extends this class.
+ */
+abstract class AbstractCacheDriver extends Plugin
+{
+    /**
+     * Driver type
+     *
+     * @var String type of driver
+     */
+    public $driverType = "cache";
+
+    /**
+     * @var Cache\CacheProvider[]
+     */
+    protected $namespacedCaches = array();
+
+    /**
+     * Keep a pointer to an http client if necessary
+     * @var Client
+     */
+    protected $httpClient;
+
+    /**
+     * @var array
+     */
+    private $httpDeletion = [];
+    
+    /**
+     * @param string $namespace
+     * @return Cache\CacheProvider
+     */
+    abstract public function getCacheDriver($namespace=AJXP_CACHE_SERVICE_NS_SHARED);
+
+    /**
+     * Compute a cache ID for a given node. Will be in the form
+     * cacheType://repositoryId/userSepcificKey|shared/nodePath[##detail]
+     *
+     * @param AJXP_Node $node
+     * @param string $cacheType
+     * @param string $details
+     * @return string
+     */
+    public static function getOptionsForNode($node, $cacheType, $details = ''){
+        $ctx = $node->getContext();
+        $repo = $node->getRepository();
+        if($repo == null) return ["id" => "failed-id"];
+        $scope = $repo->securityScope();
+        $userId = $node->getUserId();
+        // Compute second segment
+        if($userId === "*"){
+            $subPath = "";
+        }else if($scope === "USER"){
+            $subPath = "/".$userId;
+        }else if($scope == "GROUP"){
+            $gPath = "/";
+            $user = $ctx->getUser();
+            if($user !== null) $gPath = $user->getGroupPath();
+            $subPath =  "/".ltrim(str_replace("/", "__", $gPath), "__");
+        }else{
+            $subPath = "/shared";
+        }
+
+        $options = [
+            "id"        => $cacheType."://".$repo->getId().$subPath.$node->getPath().($details?"##$details":""),
+            "timelimit" => $repo->getContextOption($ctx, "CACHE_TIMELIMIT", 5)
+        ];
+        return $options;
+    }
+
+    /**
+     * Same as computeIdForNode but maybe used if a repository has been deleted
+     * @param $repositoryId
+     * @param $cacheType
+     * @return string
+     */
+    public static function computeFullRepositoryId($repositoryId, $cacheType){
+        return $ID = $cacheType."://".$repositoryId."/";
+    }
+
+    /**
+     * Fetches an entry from the cache.
+     *
+     * @param $namespace
+     * @param string $id The id of the cache entry to fetch.
+     * @return mixed The cached data or FALSE, if no cache entry exists for the given id.
+     */
+    public function fetch($namespace, $id){
+        $cacheDriver = $this->getCacheDriver($namespace);
+
+        if (isset($cacheDriver) && $cacheDriver->contains($id)) {
+            $result = $cacheDriver->fetch($id);
+            return $result;
+        }
+
+        return false;
+    }
+
+    /**
+     * Fetches many entries from the cache.
+     *
+     * @param $namespace
+     * @param string[] $ids The ids of the cache entry to fetch.
+     * @return mixed The cached data or FALSE, if no cache entry exists for the given id.
+     */
+    public function fetchMultiple($namespace, $ids){
+        $cacheDriver = $this->getCacheDriver($namespace);
+
+        if (isset($cacheDriver)) {
+            return $cacheDriver->fetchMultiple($ids);
+        }
+
+        return false;
+    }
+
+    /**
+     * Tests if an entry exists in the cache.
+     *
+     * @param $namespace
+     * @param string $id The cache id of the entry to check for.
+     * @return bool TRUE if a cache entry exists for the given cache id, FALSE otherwise.
+     */
+    public function contains($namespace, $id){
+        $cacheDriver = $this->getCacheDriver($namespace);
+
+        if (! isset($cacheDriver)) {
+            return false;
+        }
+
+        $result = $cacheDriver->contains($id);
+        return $result;
+    }
+
+    /**
+     * Puts data into the cache.
+     *
+     * @param $namespace
+     * @param string $id The cache id.
+     * @param mixed $data The cache entry/data.
+     * @param int $lifeTime The cache lifetime.
+     *                         If != 0, sets a specific lifetime for this cache entry (0 => infinite lifeTime).
+     * @return bool TRUE if the entry was successfully stored in the cache, FALSE otherwise.
+     */
+    public function save($namespace, $id, $data, $lifeTime = 0){
+        $cacheDriver = $this->getCacheDriver($namespace);
+
+        if (! isset($cacheDriver)) {
+          return false;
+        }
+
+        $result = $cacheDriver->save($id, $data, $lifeTime);
+
+        return $result;
+    }
+
+    /**
+     * Puts data into the cache, and store an associated timestamp of current time
+     * @param $namespace
+     * @param $id
+     * @param $data
+     * @param int $lifeTime
+     * @return bool
+     */
+    public function saveWithTimestamp($namespace, $id, $data, $lifeTime = 0){
+
+        $cacheDriver = $this->getCacheDriver($namespace);
+        if(!isSet($cacheDriver)) return false;
+
+        $res = $cacheDriver->save($id, $data, $lifeTime);
+        if(!$res){
+            return false;
+        }
+        $timestamp = time();
+        $cacheDriver->save($this->getTimestampKey($id), $timestamp, $lifeTime);
+        return $res;
+    }
+
+
+    /**
+     * @param $namespace
+     * @param $id
+     * @param $idsToCheck
+     * @return mixed|false
+     */
+    public function fetchWithTimestamps($namespace, $id, $idsToCheck){
+
+        $cacheDriver = $this->getCacheDriver($namespace);
+        if(!isSet($cacheDriver)) return false;
+        if(!count($idsToCheck)){
+            return $cacheDriver->fetch($id);
+        }
+        $idStamp = $cacheDriver->fetch($this->getTimestampKey($id));
+        if(!$idStamp){
+            return false;
+        }
+        $keys = array_map(array($this, "getTimestampKey"), $idsToCheck);
+        $stamps = $cacheDriver->fetchMultiple($keys);
+
+        foreach($stamps as $stampKey => $stampTime){
+            if($stampTime > $idStamp){
+                // One of the object has a more recent timestamp, needs reload
+                $this->delete($namespace, $id);
+                return false;
+            }
+        }
+        return $cacheDriver->fetch($id);
+
+    }
+
+
+    /**
+     * Deletes an entry from the cache
+     *
+     * @param $namespace
+     * @param string $id The id of the cache entry to fetch.
+     * @return bool TRUE if the entry was successfully deleted, FALSE otherwise.
+     */
+    public function delete($namespace, $id){
+
+        $cacheDriver = $this->getCacheDriver($namespace);
+        if($this->requiresHttpForwarding($cacheDriver)){
+            $this->httpDeletion[$namespace.$id.'key'] = ["namespace"=>$namespace, "key" => $id];
+            return true;
+        }
+
+        if (isset($cacheDriver) && $cacheDriver->contains($id)) {
+            Logger::debug("CacheDriver::Http", "Clear Key ".$id, ["namespace" => $namespace]);
+            $result = $cacheDriver->delete($id);
+            if($cacheDriver->contains($this->getTimestampKey($id))){
+                $cacheDriver->delete($this->getTimestampKey($id));
+            }
+            return $result;
+        }
+
+        return false;
+    }
+
+    /**
+     * Deletes ALL entries from the cache
+     *
+     * @param $namespace
+     * @return bool TRUE if the entries were successfully deleted, FALSE otherwise.
+     *
+     */
+    public function deleteAll($namespace){
+
+        $cacheDriver = $this->getCacheDriver($namespace);
+        if($this->requiresHttpForwarding($cacheDriver)){
+            $this->httpDeletion[$namespace.'all'] = ["namespace"=>$namespace, "all" => "true"];
+            return true;
+        }
+
+        if (isset($cacheDriver)) {
+            Logger::debug("CacheDriver::Http", "Clear All", ["namespace" => $namespace]);
+            $result = $cacheDriver->deleteAll();
+            return $result;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param string $namespace
+     * @return bool
+     */
+    public function supportsPatternDelete($namespace)
+    {
+        $cacheDriver = $this->getCacheDriver($namespace);
+        return $cacheDriver instanceof PatternClearableCache;
+    }
+
+    /**
+     * @param string $namespace
+     * @param string $id
+     * @return bool
+     */
+    public function deleteKeyStartingWith($namespace, $id){
+
+        $cacheDriver = $this->getCacheDriver($namespace);
+        if($this->requiresHttpForwarding($cacheDriver)){
+            $this->httpDeletion[$namespace.$id.'pattern'] = ["namespace"=>$namespace, "pattern" => $id];
+            return true;
+        }
+
+        if(!($cacheDriver instanceof PatternClearableCache)){
+            return false;
+        }
+        Logger::debug("CacheDriver::Http", "Clear Pattern ".$id, ["namespace" => $namespace]);
+        return $cacheDriver->deleteKeysStartingWith($id);
+    }
+
+
+    /**
+     * @return array
+     */
+    public function listNamespaces(){
+        return [AJXP_CACHE_SERVICE_NS_SHARED, AJXP_CACHE_SERVICE_NS_NODES];
+    }
+
+    /**
+     * @param $namespace
+     * @return array|null
+     */
+    public function getStats($namespace){
+        $cacheDriver = $this->getCacheDriver($namespace);
+        if(empty($cacheDriver) || !method_exists($cacheDriver, "getStats")){
+            return null;
+        }
+        return $cacheDriver->getStats();
+    }
+
+    /**
+     * @param string $id
+     * @return string
+     */
+    protected function getTimestampKey($id){
+        return $id . "-PYDIO_CACHE_TIME";
+    }
+
+    /**
+     * @param CacheProvider
+     * @return bool
+     */
+    protected function requiresHttpForwarding($cacheDriver){
+        if(empty($cacheDriver) || !ApplicationState::sapiIsCli()){
+            return false;
+        }
+        if(($cacheDriver instanceof PydioChainCache && $cacheDriver->oneProviderRequiresHttpDeletion()) || $cacheDriver instanceof PydioApcuCache){
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @return Client
+     * @throws PydioException
+     */
+    protected function getHttpClient(){
+        if(!isSet($this->httpClient)){
+            $baseUrl = ApplicationState::detectServerURL(true);
+            if(empty($baseUrl)){
+                throw new PydioException("Server URL does not seem to be configured, CLI cannot trigger cache deletion commands");
+            }
+            $this->httpClient = new Client([
+                'base_url' => $baseUrl
+            ]);
+        }
+        return $this->httpClient;
+    }
+
+    public function __destruct()
+    {
+        if(count($this->httpDeletion)){
+            $this->getHttpClient()->post('/?get_action=clear_cache_key', [
+                'body' => [
+                    'data' => json_encode($this->httpDeletion)
+                ]
+            ]);
+
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.cache/CacheStreamLayer.php b/core/src/plugins/core.cache/CacheStreamLayer.php
new file mode 100644
index 0000000000..0e1f8a66c2
--- /dev/null
+++ b/core/src/plugins/core.cache/CacheStreamLayer.php
@@ -0,0 +1,154 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Cache\Core;
+
+
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\SchemeTranslatorWrapper;
+use Pydio\Core\Services\CacheService;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class CacheStreamLayer
+ * StreamWrapper using CacheService to cache data
+ * @package Pydio\Cache\Core
+ */
+class CacheStreamLayer extends SchemeTranslatorWrapper
+{
+    /**
+     * @param $path
+     */
+    public static function clearStatCache($path) {
+        $options = AbstractCacheDriver::getOptionsForNode(new AJXP_Node($path), "stat");
+
+        CacheService::delete(AJXP_CACHE_SERVICE_NS_NODES, $options["id"]);
+    }
+
+    /**
+     * @param $path
+     */
+    public static function clearDirCache($path) {
+        $options = AbstractCacheDriver::getOptionsForNode(new AJXP_Node($path), "list");
+
+        CacheService::delete(AJXP_CACHE_SERVICE_NS_NODES, $options["id"]);
+    }
+
+    private $currentListingOrig = null;
+    private $currentListingRead = null;
+
+    private $currentBufferOptions = null;
+    private $currentBuffer = array();
+
+    /**
+     * @param string $path
+     * @param int $options
+     * @return bool
+     */
+    public function dir_opendir($path, $options) {
+
+        $options = AbstractCacheDriver::getOptionsForNode(new AJXP_Node($path), "list");
+
+        if(CacheService::contains(AJXP_CACHE_SERVICE_NS_NODES, $options["id"])) {
+            $this->currentListingRead = $this->currentListingOrig = CacheService::fetch(AJXP_CACHE_SERVICE_NS_NODES, $options["id"]);
+            return true;
+        }
+
+        $this->currentBufferOptions = $options;
+        $this->currentBuffer = array();
+
+        return parent::dir_opendir($path, $options);
+
+    }
+
+    /**
+     * @return bool|mixed|string
+     */
+    public function dir_readdir() {
+
+        if($this->currentListingRead !== null) {
+            if(count($this->currentListingRead)) return array_shift($this->currentListingRead);
+            else return false;
+        }
+
+        $value = parent::dir_readdir();
+        if($value !== false){
+            $this->currentBuffer[] = $value;
+        }
+
+        return $value;
+    }
+
+    /**
+     * Close handle
+     */
+    public function dir_closedir() {
+
+        if($this->currentListingRead !== null) {
+            $this->currentListingRead = $this->currentListingOrig = null;
+            return;
+        }
+
+        if(isSet($this->currentBufferOptions)) {
+            CacheService::save(AJXP_CACHE_SERVICE_NS_NODES, $this->currentBufferOptions["id"], $this->currentBuffer, $this->currentBufferOptions["timelimit"]);
+        }
+
+        parent::dir_closedir();
+    }
+
+    /**
+     * Rewind handle
+     * @return bool
+     */
+    public function dir_rewinddir() {
+
+        if($this->currentListingOrig !== null) {
+            $this->currentListingRead = $this->currentListingOrig;
+            return true;
+        }
+
+        if(isSet($this->currentBuffer)) {
+            $this->currentBuffer = array();
+        }
+
+        return parent::dir_rewinddir();
+    }
+
+    /**
+     * @param string $path
+     * @param int $flags
+     * @return array|bool|mixed
+     */
+    public function url_stat($path, $flags) {
+
+        $options = AbstractCacheDriver::getOptionsForNode(new AJXP_Node($path), "stat");
+
+        if(CacheService::contains(AJXP_CACHE_SERVICE_NS_NODES, $options["id"])) {
+            $stat = CacheService::fetch(AJXP_CACHE_SERVICE_NS_NODES, $options["id"]);
+            if(is_array($stat)) return $stat;
+        }
+
+        $stat = parent::url_stat($path, $flags);
+        CacheService::save(AJXP_CACHE_SERVICE_NS_NODES, $options["id"], $stat, $options["timelimit"]);
+
+        return $stat;
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.cache/CoreCacheLoader.php b/core/src/plugins/core.cache/CoreCacheLoader.php
new file mode 100644
index 0000000000..e2543da2ab
--- /dev/null
+++ b/core/src/plugins/core.cache/CoreCacheLoader.php
@@ -0,0 +1,273 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Cache\Core;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\MetaStreamWrapper;
+use Pydio\Access\Core\Model\Repository;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\PluginFramework\CoreInstanceProvider;
+use Pydio\Core\Services\CacheService;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Vars\InputFilter;
+
+use Pydio\Log\Core\Logger;
+use Zend\Diactoros\Response\JsonResponse;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * @package AjaXplorer_Plugins
+ * @subpackage Core
+ * @static
+ * Provides access to the cache via the Doctrine interface
+ */
+class CoreCacheLoader extends Plugin implements CoreInstanceProvider
+{
+    /**
+     * @var AbstractCacheDriver
+     */
+    protected static $cacheInstance;
+
+    /**
+     * @param PluginsService|null $pluginsService
+     * @return null|AbstractCacheDriver|Plugin
+     */
+    public function getImplementation($pluginsService = null)
+    {
+
+        $pluginInstance = null;
+
+        if (!isSet(self::$cacheInstance) || (isset($this->pluginConf["UNIQUE_INSTANCE_CONFIG"]["instance_name"]) && self::$cacheInstance->getId() != $this->pluginConf["UNIQUE_INSTANCE_CONFIG"]["instance_name"])) {
+            if (isset($this->pluginConf["UNIQUE_INSTANCE_CONFIG"])) {
+                if($pluginsService === null){
+                    $pluginsService = PluginsService::getInstance(Context::emptyContext());
+                }
+                $pluginInstance = ConfService::instanciatePluginFromGlobalParams($this->pluginConf["UNIQUE_INSTANCE_CONFIG"], "Pydio\\Cache\\Core\\AbstractCacheDriver", $pluginsService);
+            }
+            self::$cacheInstance = $pluginInstance;
+            if(!ApplicationState::sapiIsCli() && $pluginInstance !== null && $pluginInstance instanceof AbstractCacheDriver && $pluginInstance->supportsPatternDelete(AJXP_CACHE_SERVICE_NS_NODES)){
+                MetaStreamWrapper::appendMetaWrapper("pydio.cache", "\\Pydio\\Cache\\Core\\CacheStreamLayer");
+            }
+        }
+
+        return self::$cacheInstance;
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     * @param \Pydio\Access\Core\Model\AJXP_Node $contextNode
+     * @param bool $details
+     */
+    public function cacheNodeInfo(&$node, $contextNode, $details){
+        $cDriver = ConfService::getCacheDriverImpl();
+        if(empty($cDriver) || !($cDriver->supportsPatternDelete(AJXP_CACHE_SERVICE_NS_NODES))){
+            return;
+        }
+        $id = $this->computeId($node, $details);
+        CacheService::save(AJXP_CACHE_SERVICE_NS_NODES, $id, $node->getNodeInfoMeta());
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     * @param AJXP_Node $contextNode
+     * @param bool $details
+     * @param bool $forceRefresh
+     */
+    public function loadNodeInfoFromCache(&$node, $contextNode, $details, $forceRefresh = false){
+        if($forceRefresh) {
+            $this->clearNodeInfoCache($node);
+            return;
+        }
+        $cDriver = ConfService::getCacheDriverImpl();
+        if(empty($cDriver) || !($cDriver->supportsPatternDelete(AJXP_CACHE_SERVICE_NS_NODES))){
+            return;
+        }
+        $id = $this->computeId($node, $details);
+        if(CacheService::contains(AJXP_CACHE_SERVICE_NS_NODES, $id)){
+            $metadata = CacheService::fetch(AJXP_CACHE_SERVICE_NS_NODES, $id);
+            if(is_array($metadata)){
+                $node->mergeMetadata($metadata);
+                $node->setInfoLoaded($details);
+            }
+        }
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node|null $from
+     * @param \Pydio\Access\Core\Model\AJXP_Node|null $to
+     * @param bool $copy
+     */
+    public function clearNodeInfoCache($from=null, $to=null, $copy = false){
+        $cDriver = ConfService::getCacheDriverImpl();
+        if(empty($cDriver) || !($cDriver->supportsPatternDelete(AJXP_CACHE_SERVICE_NS_NODES))){
+            return;
+        }
+        if($from != null){
+            $this->clearCacheForNode($from);
+        }
+        if($to != null){
+            $this->clearCacheForNode($to);
+        }
+    }
+
+    /**
+     * Hooked to workspace.after_update event
+     * @param ContextInterface $ctx
+     * @param Repository $repositoryObject
+     */
+    public function onWorkspaceUpdate(ContextInterface $ctx, $repositoryObject){
+        $this->clearWorkspaceCache($repositoryObject->getId());
+    }
+
+    /**
+     * Hooked to workspace.after_delete event
+     * @param ContextInterface $ctx
+     * @param string $repositoryId
+     */
+    public function onWorkspaceDelete(ContextInterface $ctx, $repositoryId){
+        $this->clearWorkspaceCache($repositoryId);
+    }
+
+    /**
+     * Util to clear all caches (node.info, stat, list) for a workspace (any users).
+     * @param $repositoryId
+     */
+    private function clearWorkspaceCache($repositoryId){
+        $cDriver = ConfService::getCacheDriverImpl();
+        if(empty($cDriver) || !($cDriver->supportsPatternDelete(AJXP_CACHE_SERVICE_NS_NODES))){
+            return;
+        }
+        $cDriver->deleteKeyStartingWith(AJXP_CACHE_SERVICE_NS_NODES, AbstractCacheDriver::computeFullRepositoryId($repositoryId, "node.info"));
+        $cDriver->deleteKeyStartingWith(AJXP_CACHE_SERVICE_NS_NODES, AbstractCacheDriver::computeFullRepositoryId($repositoryId, "stat"));
+        $cDriver->deleteKeyStartingWith(AJXP_CACHE_SERVICE_NS_NODES, AbstractCacheDriver::computeFullRepositoryId($repositoryId, "list"));
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     */
+    protected function clearCacheForNode($node){
+        $cacheDriver = ConfService::getCacheDriverImpl();
+        if($cacheDriver === null) {
+            return;
+        }
+        // Clear meta for this node
+        $cacheDriver->delete(AJXP_CACHE_SERVICE_NS_NODES, $this->computeId($node, true));
+        $cacheDriver->delete(AJXP_CACHE_SERVICE_NS_NODES, $this->computeId($node, false));
+        
+        if($node->isLeaf()){
+            // Clear stat
+            $cacheDriver->delete(AJXP_CACHE_SERVICE_NS_NODES, AbstractCacheDriver::getOptionsForNode($node, "stat")["id"]);
+            // Clear parent listing
+            if($node->getParent() !== null){
+                $cacheDriver->delete(AJXP_CACHE_SERVICE_NS_NODES, AbstractCacheDriver::getOptionsForNode($node->getParent(), "list")["id"]);
+            }
+        }else {
+            // Delete node data and all its children
+            $cacheDriver->deleteKeyStartingWith(AJXP_CACHE_SERVICE_NS_NODES, AbstractCacheDriver::getOptionsForNode($node, "stat")["id"]);
+            if($node->getParent() !== null){
+                $cacheDriver->deleteKeyStartingWith(AJXP_CACHE_SERVICE_NS_NODES, AbstractCacheDriver::getOptionsForNode($node->getParent(), "list")["id"]);
+            }else{
+                $cacheDriver->deleteKeyStartingWith(AJXP_CACHE_SERVICE_NS_NODES, AbstractCacheDriver::getOptionsForNode($node, "list")["id"]);
+            }
+        }
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     * @param bool $details
+     * @return string
+     */
+    protected function computeId($node, $details){
+        return AbstractCacheDriver::getOptionsForNode($node, "node.info", $details?"all":"short")["id"];
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     */
+    public function exposeCacheStats(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface){
+
+        $cImpl = $this->getImplementation();
+        $result = [];
+        if($cImpl != null){
+            $nspaces = $cImpl->listNamespaces();
+            foreach ($nspaces as $nspace){
+                $data = $cImpl->getStats($nspace);
+                $data["namespace"] = $nspace;
+                $result[] = $data;
+            }
+        }
+        $responseInterface = new JsonResponse($result);
+
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     */
+    public function clearCacheByNS(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface){
+
+        $ns = InputFilter::sanitize($requestInterface->getParsedBody()["namespace"], InputFilter::SANITIZE_ALPHANUM);
+        if($ns == AJXP_CACHE_SERVICE_NS_SHARED){
+            ConfService::clearAllCaches();
+        }else{
+            CacheService::deleteAll($ns);
+        }
+        $responseInterface = new JsonResponse(["result"=>"ok"]);
+
+    }
+
+    /**
+     * Service to clear a cache key or a pattern
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     */
+    public function clearCacheKey(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface){
+        $cacheDriver = ConfService::getCacheDriverImpl();
+        if($cacheDriver === null) {
+            $responseInterface = new JsonResponse(["result" => "NOCACHEFOUND"]);
+            return;
+        }
+        $params = $requestInterface->getParsedBody();
+        $data = json_decode($params["data"], true);
+        foreach($data as $key => $params){
+            $ns = $params['namespace'];
+            if(isSet($params["key"])){
+                Logger::info("CoreCacheLoader", "Clear Key ".$params["key"], $params);
+                $cacheDriver->delete($ns, $params["key"]);
+            }else if(isSet($params["pattern"])){
+                Logger::info("CoreCacheLoader", "Clear Pattern ".$params["pattern"], $params);
+                $cacheDriver->deleteKeyStartingWith($ns, $params["pattern"]);
+            }else if(isSet($params["all"])) {
+                Logger::info("CoreCacheLoader", "Clear All ", $params);
+                $cacheDriver->deleteAll($ns);
+            }
+        }
+        $responseInterface = new JsonResponse(["result" => "SUCCESS"]);
+    }
+
+}
diff --git a/core/src/plugins/core.cache/class.AbstractCacheDriver.php b/core/src/plugins/core.cache/class.AbstractCacheDriver.php
deleted file mode 100644
index 6c1aca2a61..0000000000
--- a/core/src/plugins/core.cache/class.AbstractCacheDriver.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>, mosen
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-define('AJXP_CACHE_SERVICE_NS_SHARED', 'shared');
-define('AJXP_CACHE_SERVICE_NS_NODES', 'nodes');
-
-use Doctrine\Common\Cache;
-
-/**
- * @package AjaXplorer_Plugins
- * @subpackage Core
- * @class AbstractCacheDriver
- * @author ghecquet
- * @abstract
- * Abstraction of the caching system
- * The cache will be implemented by the plugin which extends this class.
- */
-abstract class AbstractCacheDriver extends AJXP_Plugin
-{
-    /**
-     * Driver type
-     *
-     * @var String type of driver
-     */
-    public $driverType = "cache";
-
-    /**
-     * @var Cache\CacheProvider[]
-     */
-    protected $namespacedCaches = array();
-
-
-    public function init($options)
-    {
-      parent::init($options);
-    }
-
-    /**
-     * @param string $namespace
-     * @return Cache\CacheProvider
-     */
-    abstract public function getCacheDriver($namespace=AJXP_CACHE_SERVICE_NS_SHARED);
-
-    /**
-     * @param AJXP_Node $node
-     * @param string $cacheType
-     * @param string $details
-     * @return string
-     */
-    public static function computeIdForNode($node, $cacheType, $details = ''){
-        $repo = $node->getRepository();
-        if($repo == null) return "failed-id";
-        $scope = $repo->securityScope();
-        $additional = "";
-        if($scope === "USER"){
-            $additional = AuthService::getLoggedUser()->getId()."@";
-        }else if($scope == "GROUP"){
-            $additional =  ltrim(str_replace("/", "__", AuthService::getLoggedUser()->getGroupPath()), "__")."@";
-        }
-        $scheme = parse_url($node->getUrl(), PHP_URL_SCHEME);
-        return str_replace($scheme . "://", $cacheType."://".$additional, $node->getUrl()).($details?"##".$details:"");
-    }
-
-    /**
-     * @param string $namespace
-     * @return bool
-     */
-    public function supportsPatternDelete($namespace)
-    {
-        $cacheDriver = $this->getCacheDriver($namespace);
-        return $cacheDriver instanceof Pydio\Plugins\Cache\Doctrine\Ext\PatternClearableCache;
-        //return is_a($cacheDriver, "PatternClearableCache");
-    }
-
-    /**
-     * @param string $namespace
-     * @param string $id
-     * @return bool
-     */
-    public function deleteKeyStartingWith($namespace, $id){
-        $cacheDriver = $this->getCacheDriver($namespace);
-        if(!($cacheDriver instanceof Pydio\Plugins\Cache\Doctrine\Ext\PatternClearableCache)){
-            return false;
-        }
-        return $cacheDriver->deleteKeysStartingWith($id);
-    }
-
-    /**
-     * Fetches an entry from the cache.
-     *
-     * @param $namespace
-     * @param string $id The id of the cache entry to fetch.
-     * @return mixed The cached data or FALSE, if no cache entry exists for the given id.
-     */
-    public function fetch($namespace, $id){
-        $cacheDriver = $this->getCacheDriver($namespace);
-
-        if (isset($cacheDriver) && $cacheDriver->contains($id)) {
-            $result = $cacheDriver->fetch($id);
-            return $result;
-        }
-
-        return false;
-    }
-
-    /**
-     * Tests if an entry exists in the cache.
-     *
-     * @param $namespace
-     * @param string $id The cache id of the entry to check for.
-     * @return bool TRUE if a cache entry exists for the given cache id, FALSE otherwise.
-     */
-    public function contains($namespace, $id){
-        $cacheDriver = $this->getCacheDriver($namespace);
-
-        if (! isset($cacheDriver)) {
-            return false;
-        }
-
-        $result = $cacheDriver->contains($id);
-
-        return $result;
-    }
-
-    /**
-     * Puts data into the cache.
-     *
-     * @param $namespace
-     * @param string $id The cache id.
-     * @param mixed $data The cache entry/data.
-     * @param int $lifeTime The cache lifetime.
-     *                         If != 0, sets a specific lifetime for this cache entry (0 => infinite lifeTime).
-     * @return bool TRUE if the entry was successfully stored in the cache, FALSE otherwise.
-     */
-    public function save($namespace, $id, $data, $lifeTime = 0){
-        $cacheDriver = $this->getCacheDriver($namespace);
-
-        if (! isset($cacheDriver)) {
-          return false;
-        }
-
-        $result = $cacheDriver->save($id, $data, $lifeTime);
-
-        return $result;
-    }
-
-    /**
-     * Deletes an entry from the cache
-     *
-     * @param $namespace
-     * @param string $id The id of the cache entry to fetch.
-     * @return bool TRUE if the entry was successfully deleted, FALSE otherwise.
-     */
-    public function delete($namespace, $id){
-        $cacheDriver = $this->getCacheDriver($namespace);
-
-        if (isset($cacheDriver) && $cacheDriver->contains($id)) {
-           $result = $cacheDriver->delete($id);
-           return $result;
-        }
-
-        return false;
-    }
-
-    /**
-     * Deletes ALL entries from the cache
-     *
-     * @param $namespace
-     * @return bool TRUE if the entries were successfully deleted, FALSE otherwise.
-     *
-     */
-    public function deleteAll($namespace){
-        $cacheDriver = $this->getCacheDriver($namespace);
-
-        if (isset($cacheDriver)) {
-           $result = $cacheDriver->deleteAll();
-           return $result;
-        }
-
-        return false;
-    }
-
-    public function listNamespaces(){
-        return [AJXP_CACHE_SERVICE_NS_SHARED, AJXP_CACHE_SERVICE_NS_NODES];
-    }
-
-    public function getStats($namespace){
-        $cacheDriver = $this->getCacheDriver($namespace);
-        return $cacheDriver->getStats();
-    }
-
-}
\ No newline at end of file
diff --git a/core/src/plugins/core.cache/class.CacheStreamLayer.php b/core/src/plugins/core.cache/class.CacheStreamLayer.php
deleted file mode 100644
index 3e7d660827..0000000000
--- a/core/src/plugins/core.cache/class.CacheStreamLayer.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/*
- * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <https://pydio.com/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-
-class CacheStreamLayer extends AJXP_SchemeTranslatorWrapper
-{
-    public static function clearStatCache($path){
-        $scheme = parse_url($path, PHP_URL_SCHEME);
-        CacheService::delete(AJXP_CACHE_SERVICE_NS_NODES, str_replace($scheme . "://", "stat://", $path));
-    }
-    public static function clearDirCache($path){
-        $scheme = parse_url($path, PHP_URL_SCHEME);
-        CacheService::delete(AJXP_CACHE_SERVICE_NS_NODES, str_replace($scheme . "://", "list://", $path));
-    }
-
-    private $currentListingOrig = null;
-    private $currentListingRead = null;
-
-    private $currentBufferId = null;
-    private $currentBuffer = array();
-
-    protected function computeCacheId($path, $type){
-
-        return AbstractCacheDriver::computeIdForNode(new AJXP_Node($path), $type);
-        
-    }
-
-    // Keep listing in cache
-    public function dir_opendir($path, $options)
-    {
-        $id = $this->computeCacheId($path, "list");
-        if(CacheService::contains(AJXP_CACHE_SERVICE_NS_NODES, $id)){
-            $this->currentListingRead = $this->currentListingOrig = CacheService::fetch(AJXP_CACHE_SERVICE_NS_NODES, $id);
-            return true;
-        }
-        $this->currentBufferId = $id;
-        $this->currentBuffer = array();
-        return parent::dir_opendir($path, $options);
-    }
-
-    public function dir_readdir()
-    {
-        if($this->currentListingRead !== null){
-            if(count($this->currentListingRead)) return array_shift($this->currentListingRead);
-            else return false;
-        }
-        $value = parent::dir_readdir();
-        if($value !== false){
-            $this->currentBuffer[] = $value;
-        }
-        return $value;
-    }
-
-    public function dir_closedir()
-    {
-        if($this->currentListingRead !== null){
-            $this->currentListingRead = $this->currentListingOrig = null;
-            return;
-        }
-        if(isSet($this->currentBufferId)){
-            CacheService::save(AJXP_CACHE_SERVICE_NS_NODES, $this->currentBufferId, $this->currentBuffer);
-        }
-        parent::dir_closedir();
-    }
-
-    public function dir_rewinddir()
-    {
-        if($this->currentListingOrig !== null){
-            $this->currentListingRead = $this->currentListingOrig;
-            return true;
-        }
-        if(isSet($this->currentBuffer)){
-            $this->currentBuffer = array();
-        }
-        return parent::dir_rewinddir();
-    }
-
-    public function url_stat($path, $flags)
-    {
-        $id = $this->computeCacheId($path, "stat");
-        if(CacheService::contains(AJXP_CACHE_SERVICE_NS_NODES, $id)){
-            $stat = CacheService::fetch(AJXP_CACHE_SERVICE_NS_NODES, $id);
-            if(is_array($stat)) return $stat;
-        }
-        $stat = parent::url_stat($path, $flags);
-        CacheService::save(AJXP_CACHE_SERVICE_NS_NODES, $id, $stat);
-        return $stat;
-    }
-}
\ No newline at end of file
diff --git a/core/src/plugins/core.cache/class.CoreCacheLoader.php b/core/src/plugins/core.cache/class.CoreCacheLoader.php
deleted file mode 100644
index 2f70ba1189..0000000000
--- a/core/src/plugins/core.cache/class.CoreCacheLoader.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * @package AjaXplorer_Plugins
- * @subpackage Core
- * @static
- * Provides access to the cache via the Doctrine interface
- */
-class CoreCacheLoader extends AJXP_Plugin
-{
-    /**
-     * @var AbstractCacheDriver
-     */
-    protected static $cacheInstance;
-
-    public function getCacheImpl()
-    {
-
-        $pluginInstance = null;
-
-        if (!isSet(self::$cacheInstance) || (isset($this->pluginConf["UNIQUE_INSTANCE_CONFIG"]["instance_name"]) && self::$cacheInstance->getId() != $this->pluginConf["UNIQUE_INSTANCE_CONFIG"]["instance_name"])) {
-            if (isset($this->pluginConf["UNIQUE_INSTANCE_CONFIG"])) {
-                $pluginInstance = ConfService::instanciatePluginFromGlobalParams($this->pluginConf["UNIQUE_INSTANCE_CONFIG"], "AbstractCacheDriver");
-
-                if ($pluginInstance != false) {
-                    AJXP_PluginsService::getInstance()->setPluginUniqueActiveForType("cache", $pluginInstance->getName(), $pluginInstance);
-                }
-            }
-            self::$cacheInstance = $pluginInstance;
-            if($pluginInstance !== null && is_a($pluginInstance, "AbstractCacheDriver") && $pluginInstance->supportsPatternDelete(AJXP_CACHE_SERVICE_NS_NODES)){
-                AJXP_MetaStreamWrapper::appendMetaWrapper("pydio.cache", "CacheStreamLayer");
-            }
-        }
-
-        return self::$cacheInstance;
-    }
-
-    /**
-     * @param AJXP_Node $node
-     * @param AJXP_Node $contextNode
-     * @param bool $details
-     */
-    public function cacheNodeInfo(&$node, $contextNode, $details){
-        $cDriver = ConfService::getCacheDriverImpl();
-        if(empty($cDriver) || !($cDriver->supportsPatternDelete(AJXP_CACHE_SERVICE_NS_NODES))){
-            return;
-        }
-        $id = $this->computeId($node, $details);
-        CacheService::save(AJXP_CACHE_SERVICE_NS_NODES, $id, $node->getNodeInfoMeta());
-    }
-
-    /**
-     * @param AJXP_Node $node
-     * @param AJXP_Node $contextNode
-     * @param bool $details
-     */
-    public function loadNodeInfoFromCache(&$node, $contextNode, $details){
-        $cDriver = ConfService::getCacheDriverImpl();
-        if(empty($cDriver) || !($cDriver->supportsPatternDelete(AJXP_CACHE_SERVICE_NS_NODES))){
-            return;
-        }
-        $id = $this->computeId($node, $details);
-        if(CacheService::contains(AJXP_CACHE_SERVICE_NS_NODES, $id)){
-            $metadata = CacheService::fetch(AJXP_CACHE_SERVICE_NS_NODES, $id);
-            if(is_array($metadata)){
-                $node->mergeMetadata($metadata);
-                $node->setInfoLoaded($details);
-            }
-        }
-    }
-
-    /**
-     * @param AJXP_Node|null $from
-     * @param AJXP_Node|null $to
-     * @param bool $copy
-     */
-    public function clearNodeInfoCache($from=null, $to=null, $copy = false){
-        $cDriver = ConfService::getCacheDriverImpl();
-        if(empty($cDriver) || !($cDriver->supportsPatternDelete(AJXP_CACHE_SERVICE_NS_NODES))){
-            return;
-        }
-        if($from != null){
-            $this->clearCacheForNode($from);
-        }
-        if($to != null){
-            $this->clearCacheForNode($to);
-        }
-    }
-
-    /**
-     * @param Repository $repositoryObject
-     */
-    public function clearWorkspaceNodeInfos($repositoryObject){
-        $cDriver = ConfService::getCacheDriverImpl();
-        if(empty($cDriver) || !($cDriver->supportsPatternDelete(AJXP_CACHE_SERVICE_NS_NODES))){
-            return;
-        }
-        $node = new AJXP_Node("pydio://".$repositoryObject->getId()."/");
-        $node->setLeaf(false);
-        $this->clearCacheForNode($node);
-    }
-
-    /**
-     * @param AJXP_Node $node
-     */
-    protected function clearCacheForNode($node){
-        if($node->isLeaf()){
-            // Clear meta
-            CacheService::delete(AJXP_CACHE_SERVICE_NS_NODES, $this->computeId($node, true));
-            CacheService::delete(AJXP_CACHE_SERVICE_NS_NODES, $this->computeId($node, false));
-            // Clear stat
-            CacheService::delete(AJXP_CACHE_SERVICE_NS_NODES, AbstractCacheDriver::computeIdForNode($node, "stat"));
-            // Clear parent listing
-            if($node->getParent() !== null){
-                CacheService::delete(AJXP_CACHE_SERVICE_NS_NODES, AbstractCacheDriver::computeIdForNode($node->getParent(), "list"));
-            }
-        }else {
-            $cacheDriver = ConfService::getCacheDriverImpl();
-            $cacheDriver->deleteKeyStartingWith(AJXP_CACHE_SERVICE_NS_NODES, $this->computeId($node, true));
-            $cacheDriver->deleteKeyStartingWith(AJXP_CACHE_SERVICE_NS_NODES, $this->computeId($node, false));
-            $cacheDriver->deleteKeyStartingWith(AJXP_CACHE_SERVICE_NS_NODES, AbstractCacheDriver::computeIdForNode($node, "stat"));
-            if($node->getParent() !== null){
-                $cacheDriver->deleteKeyStartingWith(AJXP_CACHE_SERVICE_NS_NODES, AbstractCacheDriver::computeIdForNode($node->getParent(), "list"));
-            }else{
-                $cacheDriver->deleteKeyStartingWith(AJXP_CACHE_SERVICE_NS_NODES, AbstractCacheDriver::computeIdForNode($node, "list"));
-            }
-        }
-    }
-
-    /**
-     * @param AJXP_Node $node
-     * @param bool $details
-     * @return string
-     */
-    protected function computeId($node, $details){
-        return AbstractCacheDriver::computeIdForNode($node, "node.info", $details?"all":"short");
-    }
-
-    public function exposeCacheStats($actionName, $httpVars, $fileVars){
-
-        $cImpl = $this->getCacheImpl();
-        $result = [];
-        if($cImpl != null){
-            $nspaces = $cImpl->listNamespaces();
-            foreach ($nspaces as $nspace){
-                $data = $cImpl->getStats($nspace);
-                $data["namespace"] = $nspace;
-                $result[] = $data;
-            }
-        }
-        HTMLWriter::charsetHeader("application/json");
-        echo json_encode($result);
-
-    }
-
-    public function clearCacheByNS($actionName, $httpVars, $fileVars){
-
-        $ns = AJXP_Utils::sanitize($httpVars["namespace"], AJXP_SANITIZE_ALPHANUM);
-        if($ns == AJXP_CACHE_SERVICE_NS_SHARED){
-            ConfService::clearAllCaches();
-        }else{
-            CacheService::deleteAll($ns);
-        }
-        HTMLWriter::charsetHeader("text/json");
-        echo json_encode(["result"=>"ok"]);
-
-    }
-
-
-}
diff --git a/core/src/plugins/core.cache/manifest.xml b/core/src/plugins/core.cache/manifest.xml
index 094e9b2573..ae4328dfca 100644
--- a/core/src/plugins/core.cache/manifest.xml
+++ b/core/src/plugins/core.cache/manifest.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ajxp_plugin label="CONF_MESSAGE[Caching Driver]" description="CONF_MESSAGE[Setup the caching system]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <class_definition classname="CoreCacheLoader" filename="plugins/core.cache/class.CoreCacheLoader.php"/>
+    <class_definition classname="Pydio\Cache\Core\CoreCacheLoader" filename="plugins/core.cache/CoreCacheLoader.php"/>
     <client_settings>
         <resources>
             <i18n namespace="core.cache" path="plugins/core.cache/i18n"/>
         </resources>
     </client_settings>
     <server_settings>
-        <global_param type="plugin_instance:cache" name="UNIQUE_INSTANCE_CONFIG" group="CONF_MESSAGE[Cache Store Instance]" label="CONF_MESSAGE[Instance]" description="CONF_MESSAGE[Choose the configuration plugin]" mandatory="false"/>
+        <global_param type="plugin_instance:cache" name="UNIQUE_INSTANCE_CONFIG" group="CONF_MESSAGE[Cache Store Instance]" default="cache.doctrine" label="CONF_MESSAGE[Instance]" description="CONF_MESSAGE[Choose the configuration plugin]" mandatory="false"/>
     </server_settings>
     <registry_contributions>
         <actions>
@@ -24,13 +24,19 @@
                     <serverCallback methodName="clearCacheByNS" restParams="/namespace"/>
                 </processing>
             </action>
+            <action name="clear_cache_key" skipSecureToken="true">
+                <processing>
+                    <serverCallback methodName="clearCacheKey" restParams="/namespace"/>
+                </processing>
+            </action>
         </actions>
         <hooks>
             <serverCallback methodName="loadNodeInfoFromCache" hookName="node.info.start"/>
             <serverCallback methodName="cacheNodeInfo" hookName="node.info.end"/>
             <serverCallback methodName="clearNodeInfoCache" hookName="node.change" defer="true"/>
             <serverCallback methodName="clearNodeInfoCache" hookName="node.meta_change" defer="true"/>
-            <serverCallback methodName="clearWorkspaceNodeInfos" hookName="workspace.after_update" defer="true"/>
+            <serverCallback methodName="onWorkspaceUpdate" hookName="workspace.after_update" defer="true"/>
+            <serverCallback methodName="onWorkspaceDelete" hookName="workspace.after_delete" defer="true"/>
         </hooks>
     </registry_contributions>
 </ajxp_plugin>
diff --git a/core/src/plugins/core.conf/AJXP_Role.php b/core/src/plugins/core.conf/AJXP_Role.php
new file mode 100644
index 0000000000..8eef3ffdc6
--- /dev/null
+++ b/core/src/plugins/core.conf/AJXP_Role.php
@@ -0,0 +1,660 @@
+<?php
+/*
+ * Copyright 2007-2012 Charles du Jeu <contact (at) cdujeu.me>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Conf\Core;
+
+use Pydio\Access\Core\Filter\AJXP_PermissionMask;
+
+use Pydio\Core\Model\RepositoryInterface;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+define('AJXP_VALUE_CLEAR', "AJXP_VALUE_CLEAR");
+define('AJXP_REPO_SCOPE_ALL',"AJXP_REPO_SCOPE_ALL");
+define('AJXP_REPO_SCOPE_SHARED',"AJXP_REPO_SCOPE_SHARED");
+define('AJXP_PLUGINS_SCOPE_ALL',"plugin_all");
+
+/**
+ * @package Pydio
+ * @subpackage Core
+ */
+class AJXP_Role implements IGroupPathProvider
+{
+
+    /**
+     * @var String path of this role, default is root path
+     */
+    protected $groupPath;
+    /**
+     * @var String Role identifier
+     */
+    protected $roleId;
+
+    /**
+     * @var array List of access rights for each workspaces (wsId => "r", "w", "rw", "d")
+     */
+    protected $acls = array();
+    /**
+     * @var array List of plugins parameters values, (SCOPE => PLUGIN NAME => PARAM NAME => value)
+     */
+    protected $parameters = array();
+    /**
+     * @var array List of plugin actions that can be disabled/enabled (SCOPE => PLUGIN NAME => ACTION NAME => status)
+     */
+    protected $actions = array();
+    /**
+     * @var array Automatically applies to a given list of profiles
+     */
+    protected $autoApplies = array();
+    /**
+     * @var AJXP_PermissionMask[]
+     */
+    protected $masks = array();
+
+    /**
+     * @var integer
+     */
+    protected $lastUpdated = 0;
+
+    static $cypheredPassPrefix = '$pydio_password$';
+
+    /**
+     * AJXP_Role constructor.
+     * @param string $id
+     */
+    public function __construct($id)
+    {
+        $this->roleId = $id;
+    }
+
+    /**
+     * Migrates an old AjxpRole object to AJXP_Role
+     * @param $repositoriesList
+     * @param AjxpRole $oldRole
+     */
+    public function migrateDeprecated($repositoriesList, AjxpRole $oldRole)
+    {
+        $repositoriesList["ajxp.all"] = "";
+        foreach ($repositoriesList as $repoId => $repoObject) {
+            $right = $oldRole->getRight($repoId);
+            if(!empty($right)) $this->setAcl($repoId, $right);
+            $actions = $oldRole->getSpecificActionsRights($repoId);
+            if (count($actions)) {
+                foreach ($actions as $act => $status) {
+                    if ($repoId == "ajxp.all") {
+                        $this->setActionState(AJXP_PLUGINS_SCOPE_ALL, $act, AJXP_REPO_SCOPE_ALL, $status);
+                    } else {
+                        $this->setActionState(AJXP_PLUGINS_SCOPE_ALL, $act, $repoId, $status);
+                    }
+                }
+            }
+        }
+        $this->setGroupPath($oldRole->getGroupPath());
+        if ($oldRole->isDefault()) {
+            $this->setAutoApplies(array("all"));
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    public function isGroupRole()
+    {
+        return strpos($this->roleId, "AJXP_GRP_") === 0;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isUserRole()
+    {
+        return strpos($this->roleId, "AJXP_USER_") === 0;
+    }
+
+
+    /**
+     * Whether this role can read the given repo
+     * @param string $repositoryId Repository ID
+     * @return bool
+     */
+    public function canRead($repositoryId)
+    {
+        $right = $this->getAcl($repositoryId);
+        if($right == "rw" || $right == "r") return true;
+        return false;
+    }
+
+    /**
+     * Whether this role can write the given repo
+     * @param string $repositoryId Repository ID
+     * @return bool
+     */
+    public function canWrite($repositoryId)
+    {
+        $right = $this->getAcl($repositoryId);
+        if($right == "rw" || $right == "w") return true;
+        return false;
+    }
+
+
+    /**
+     * @param string $repositoryId
+     * @param string $rightString
+     * @return void
+     */
+    public function setAcl($repositoryId, $rightString)
+    {
+        if (empty($rightString)) {
+            if(isSet($this->acls[$repositoryId])) unset($this->acls[$repositoryId]);
+        } else {
+            $this->acls[$repositoryId] = $rightString;
+        }
+        return;
+    }
+    /**
+     * @param string $repositoryId
+     * @return string
+     */
+    public function getAcl($repositoryId)
+    {
+        if (isSet($this->acls[$repositoryId])) {
+            return $this->acls[$repositoryId];
+        }
+        return "";
+    }
+
+    /**
+     * @param bool $accessibleOnly If set to true, return only r, w, or rw.
+     * @return array Associative array[REPO_ID] => RIGHT_STRING (r / w / rw / AJXP_VALUE_CLEAR)
+     */
+    public function listAcls($accessibleOnly = false)
+    {
+        if(!$accessibleOnly){
+            return $this->acls;
+        }
+        $output = array();
+        foreach ($this->acls as $id => $acl) {
+            if(empty($acl) || $acl == AJXP_VALUE_CLEAR) continue;
+            $output[$id] = $acl;
+        }
+        return $output;
+    }
+
+    public function clearAcls()
+    {
+        $this->acls = array();
+    }
+
+    /**
+     * @param String $repositoryId
+     * @param AJXP_PermissionMask $mask
+     */
+    public function setMask($repositoryId, $mask){
+        $this->masks[$repositoryId] = $mask;
+    }
+
+    /**
+     * @param string $repositoryId
+     */
+    public function clearMask($repositoryId){
+        if(isSet($this->masks[$repositoryId])){
+            unset($this->masks[$repositoryId]);
+        }
+    }
+
+    /**
+     * @param string $repositoryId
+     * @return bool
+     */
+    public function hasMask($repositoryId){
+        return isSet($this->masks[$repositoryId]);
+    }
+
+    /**
+     * @param $repositoryId
+     * @return AJXP_PermissionMask|null
+     */
+    public function getMask($repositoryId){
+        return (isSet($this->masks[$repositoryId]) ? $this->masks[$repositoryId] : null);
+    }
+
+    /**
+     * @return AJXP_PermissionMask[]
+     */
+    public function listMasks(){
+        return $this->masks;
+    }
+
+    /**
+     * Send all role informations as an associative array
+     * @param bool $blurPasswords
+     * @return array
+     */
+    public function getDataArray($blurPasswords = false)
+    {
+        $roleData = array();
+        $roleData["ACL"] = $this->listAcls();
+        $roleData["MASKS"] = $this->listMasks();
+        $roleData["ACTIONS"] = $this->listActionsStates();
+        $roleData["PARAMETERS"] = $this->listParameters(false, $blurPasswords);
+        $roleData["APPLIES"] = $this->listAutoApplies();
+        return $roleData;
+    }
+
+    /**
+     * Update the role information from an associative array
+     * @see getDataArray()
+     * @param array $roleData
+     */
+    public function bunchUpdate($roleData)
+    {
+        $this->acls = $roleData["ACL"];
+        $this->actions = $roleData["ACTIONS"];
+        $this->parameters = $roleData["PARAMETERS"];
+        $this->autoApplies = $roleData["APPLIES"];
+        if(isSet($roleData["MASKS"])){
+            $this->masks = $roleData["MASKS"];
+        }
+
+    }
+
+
+    /**
+     * @param string $pluginId
+     * @param string $parameterName
+     * @param mixed $parameterValue can be AJXP_VALUE_CLEAR (force clear previous), or empty string for clearing value (apply previous).
+     * @param string|null $repositoryId
+     */
+    public function setParameterValue($pluginId, $parameterName, $parameterValue, $repositoryId = null)
+    {
+        if($repositoryId === null) $repositoryId = AJXP_REPO_SCOPE_ALL;
+        if (empty($parameterValue) && $parameterValue !== false && $parameterValue !== "0") {
+            if (isSet($this->parameters[$repositoryId][$pluginId][$parameterName])) {
+                unset($this->parameters[$repositoryId][$pluginId][$parameterName]);
+                if(!count($this->parameters[$repositoryId][$pluginId])) unset($this->parameters[$repositoryId][$pluginId]);
+                if(!count($this->parameters[$repositoryId])) unset($this->parameters[$repositoryId]);
+            }
+        } else {
+            $this->parameters = $this->setArrayValue($this->parameters, $repositoryId, $pluginId, $parameterName, $parameterValue);
+        }
+        return;
+    }
+
+    /**
+     * @param string $pluginId
+     * @param array $parameters
+     * @param string $repositoryId
+     * @return array
+     */
+    public function filterPluginConfigs($pluginId, $parameters, $repositoryId){
+
+        $roleParams = $this->listParameters();
+        if (isSet($roleParams[AJXP_REPO_SCOPE_ALL][$pluginId])) {
+            $parameters = array_merge($parameters, $roleParams[AJXP_REPO_SCOPE_ALL][$pluginId]);
+        }
+        if ($repositoryId !== null && isSet($roleParams[$repositoryId][$pluginId])) {
+            $parameters = array_merge($parameters, $roleParams[$repositoryId][$pluginId]);
+        }
+        return $parameters;
+
+    }
+
+    /**
+     * @param string $pluginId
+     * @param string $parameterName
+     * @param string $repositoryId
+     * @param mixed $parameterValue
+     * @return mixed
+     */
+    public function filterParameterValue($pluginId, $parameterName, $repositoryId, $parameterValue)
+    {
+        if (isSet($this->parameters[$repositoryId][$pluginId][$parameterName])) {
+            $v = $this->parameters[$repositoryId][$pluginId][$parameterName];
+            if($v === AJXP_VALUE_CLEAR) return "";
+            else return $this->filterCypheredPasswordValue($v);
+        }
+        if (isSet($this->parameters[AJXP_REPO_SCOPE_ALL][$pluginId][$parameterName])) {
+            $v = $this->parameters[AJXP_REPO_SCOPE_ALL][$pluginId][$parameterName];
+            if($v === AJXP_VALUE_CLEAR) return "";
+            else return $this->filterCypheredPasswordValue($v);
+        }
+        return $parameterValue;
+    }
+
+    /**
+     * @param bool $preserveCypheredPasswords
+     * @param bool $blurCypheredPasswords
+     * @return array Associative array of parameters : array[REPO_ID][PLUGIN_ID][PARAMETER_NAME] = PARAMETER_VALUE
+     */
+    public function listParameters($preserveCypheredPasswords = false, $blurCypheredPasswords = false)
+    {
+        if($preserveCypheredPasswords) return $this->parameters;
+
+        $copy = $this->parameters;
+        foreach($copy as $repo => &$plugs){
+            foreach($plugs as $plugName => &$plugData){
+                foreach($plugData as $paramName => &$paramValue){
+                    $testValue = $this->filterCypheredPasswordValue($paramValue);
+                    if($testValue != $paramValue){
+                        if($blurCypheredPasswords) $paramValue = "__AJXP_VALUE_SET__";
+                        else $paramValue = $testValue;
+                    }
+                }
+            }
+        }
+        return $copy;
+    }
+
+    /**
+     * @return array
+     */
+    public function listAutoApplies()
+    {
+        return $this->autoApplies;
+    }
+
+    /**
+     * @param String $value
+     * @return String
+     */
+    private function filterCypheredPasswordValue($value){
+        if(is_string($value) && strpos($value, self::$cypheredPassPrefix) === 0) return str_replace(self::$cypheredPassPrefix, "", $value);
+        return $value;
+    }
+
+    /**
+     * @param string $pluginId
+     * @param string $actionName
+     * @param string|null $repositoryId
+     * @param string $state
+     */
+    public function setActionState($pluginId, $actionName, $repositoryId = null, $state = "disabled")
+    {
+        $this->actions = $this->setArrayValue($this->actions, $repositoryId, $pluginId, $actionName, $state);
+        return;
+    }
+
+    /**
+     * @return array
+     */
+    public function listActionsStates()
+    {
+        return $this->actions;
+    }
+
+    /**
+     * @param RepositoryInterface $repository
+     * @return array
+     */
+    public function listActionsStatesFor($repository)
+    {
+        $actions = array();
+        if (isSet($this->actions[AJXP_REPO_SCOPE_ALL])) {
+            $actions = $this->actions[AJXP_REPO_SCOPE_ALL];
+        }
+        if ($repository != null && isSet($this->actions[AJXP_REPO_SCOPE_SHARED]) && $repository->hasParent()) {
+            $actions = $this->array_merge_recursive2($actions, $this->actions[AJXP_REPO_SCOPE_SHARED]);
+        }
+        if ($repository != null && isSet($this->actions[$repository->getId()])) {
+            $actions = $this->array_merge_recursive2($actions, $this->actions[$repository->getId()]);
+        }
+        return $actions;
+    }
+
+    /**
+     * @param string $pluginId
+     * @param string $actionName
+     * @param string $repositoryId
+     * @param boolean $inputState
+     * @return boolean
+     */
+    public function actionEnabled($pluginId, $actionName, $repositoryId, $inputState)
+    {
+        if (isSet($this->actions[AJXP_REPO_SCOPE_ALL][$pluginId][$actionName])) {
+            return $this->actions[AJXP_REPO_SCOPE_ALL][$pluginId][$actionName] == "enabled" ? true : false ;
+        }
+        if (isSet($this->actions[$repositoryId][$pluginId][$actionName])) {
+            return $this->actions[$repositoryId][$pluginId][$actionName]  == "enabled" ? true : false ;
+        }
+        return $inputState;
+    }
+
+    /**
+     * @return array
+     */
+    public function listAllActionsStates()
+    {
+        return $this->actions;
+    }
+
+    /**
+     * @param AJXP_Role $role
+     * @return AJXP_Role
+     */
+    public function override(AJXP_Role $role)
+    {
+        $newRole = new AJXP_Role($role->getId());
+
+        $roleAcl = $role->listAcls();
+        $newAcls = $this->array_merge_recursive2($roleAcl, $this->listAcls());
+        foreach ($newAcls as $repoId => $rightString) {
+            //if($rightString == AJXP_VALUE_CLEAR) continue;
+            if(empty($rightString) && !empty($roleAcl[$repoId])){
+                $rightString = $roleAcl[$repoId];
+            }
+            $newRole->setAcl($repoId, $rightString);
+        }
+
+        $roleParameters = $role->listParameters(true);
+        $newParams = $this->array_merge_recursive2($roleParameters, $this->listParameters(true));
+        foreach ($newParams as $repoId => $data) {
+            foreach ($data as $pluginId => $param) {
+                foreach ($param as $parameterName => $parameterValue) {
+                    if ($parameterValue === true || $parameterValue === false) {
+                        $newRole->setParameterValue($pluginId, $parameterName, $parameterValue, $repoId);
+                        continue;
+                    }
+                    if($parameterValue == AJXP_VALUE_CLEAR) continue;
+                    if($parameterValue === "" && !empty($roleParameters[$repoId][$pluginId][$parameterName])){
+                        $parameterValue = $newParams[$repoId][$pluginId][$parameterName];
+                    }
+                    $newRole->setParameterValue($pluginId, $parameterName, $parameterValue, $repoId);
+                }
+            }
+        }
+
+        $newActions = $this->array_merge_recursive2($role->listActionsStates(), $this->listActionsStates());
+        foreach ($newActions as $repoId => $data) {
+            foreach ($data as $pluginId => $action) {
+                foreach ($action as $actionName => $actionState) {
+                    $newRole->setActionState($pluginId, $actionName, $repoId, $actionState);
+                }
+            }
+        }
+
+        $roleMasks = $role->listMasks();
+        $allKeys = array_merge(array_keys($this->masks), array_keys($roleMasks));
+        foreach($allKeys as $repoId){
+            if(isSet($roleMasks[$repoId]) && isSet($this->masks[$repoId])){
+                $newRole->setMask($repoId, $roleMasks[$repoId]->override($this->masks[$repoId]));
+            }else if(isSet($roleMasks[$repoId])){
+                $newRole->setMask($repoId, $roleMasks[$repoId]);
+            }else{
+                $newRole->setMask($repoId, $this->masks[$repoId]);
+            }
+        }
+
+        return $newRole;
+    }
+
+    /**
+     * @param array
+     * @param key1
+     * @param key2
+     * @param key3...
+     * @param value
+     */
+    public function setArrayValue()
+    {
+        $args = func_get_args();
+        $arr = $args[0]; //array_shift($args);
+        $argMaxIndex = count($args)-1;
+        $value = $args[$argMaxIndex]; //array_pop($args);
+        $current = &$arr;
+        foreach ($args as $index => $key) {
+            if($index == 0) continue;
+            if ($index < $argMaxIndex -1) {
+                if(!isset($current[$key])) $current[$key] = array();
+                $current = &$current[$key];
+            } else {
+                $current[$key] = $value;
+                break;
+            }
+        }
+        return $arr;
+    }
+
+    /**
+     * @param array $array1
+     * @param array $array2
+     * @return array
+     */
+    public function array_merge_recursive2($array1, $array2)
+    {
+        $arrays = func_get_args();
+        $narrays = count($arrays);
+
+        // check arguments
+        // comment out if more performance is necessary (in this case the foreach loop will trigger a warning if the argument is not an array)
+        for ($i = 0; $i < $narrays; $i ++) {
+            if (!is_array($arrays[$i])) {
+                // also array_merge_recursive returns nothing in this case
+                trigger_error('Argument #' . ($i+1) . ' is not an array - trying to merge array with scalar! Returning null!', E_USER_WARNING);
+                return null;
+            }
+        }
+
+        // the first array is in the output set in every case
+        $ret = $arrays[0];
+
+        // merege $ret with the remaining arrays
+        for ($i = 1; $i < $narrays; $i ++) {
+            foreach ($arrays[$i] as $key => $value) {
+                            //if (((string) $key) === ((string) intval($key))) { // integer or string as integer key - append
+                //    $ret[] = $value;
+                //}
+                //{ // string key - megre
+                    if (is_array($value) && isset($ret[$key])) {
+                        // if $ret[$key] is not an array you try to merge an scalar value with an array - the result is not defined (incompatible arrays)
+                        // in this case the call will trigger an E_USER_WARNING and the $ret[$key] will be null.
+                        $ret[$key] = $this->array_merge_recursive2($ret[$key], $value);
+                    } else {
+                        $ret[$key] = $value;
+                    }
+               // }
+            }
+        }
+
+        return $ret;
+    }
+
+    /**
+     * @param String $groupPath
+     * @param bool $update
+     */
+    public function setGroupPath($groupPath, $update = true)
+    {
+        $this->groupPath = $groupPath;
+    }
+
+    /**
+     * @return String
+     */
+    public function getGroupPath()
+    {
+        return $this->groupPath;
+    }
+
+    /**
+     * @return String
+     */
+    public function getId()
+    {
+        return $this->roleId;
+    }
+
+    /**
+     * @param string $roleLabel
+     */
+    public function setLabel($roleLabel)
+    {
+        $this->setParameterValue("core.conf", "ROLE_DISPLAY_NAME", $roleLabel);
+    }
+
+    /**
+     * @return String
+     */
+    public function getLabel()
+    {
+        $test = $this->filterParameterValue("core.conf", "ROLE_DISPLAY_NAME", AJXP_REPO_SCOPE_ALL, $this->roleId);
+        if(!empty($test)) return $test;
+        return $this->roleId;
+   }
+
+    /**
+     * @return mixed
+     */
+    public function alwaysOverrides()
+    {
+        return $this->filterParameterValue("core.conf", "ROLE_FORCE_OVERRIDE", AJXP_REPO_SCOPE_ALL, false);
+   }
+
+    /**
+     * @param array $specificRights
+     */
+    public function setAutoApplies($specificRights)
+    {
+        $this->autoApplies = $specificRights;
+    }
+
+    /**
+     * @param string $specificRight
+     * @return boolean
+     */
+    public function autoAppliesTo($specificRight)
+    {
+        return in_array($specificRight, $this->autoApplies);
+    }
+
+    /**
+     * @return int
+     */
+    public function getLastUpdated(){
+        return $this->lastUpdated;
+    }
+
+    /**
+     * @param $time
+     */
+    public function setLastUpdated($time){
+        $this->lastUpdated = $time;
+    }
+
+}
diff --git a/core/src/plugins/core.conf/AbstractConfDriver.php b/core/src/plugins/core.conf/AbstractConfDriver.php
new file mode 100644
index 0000000000..8df7e4086c
--- /dev/null
+++ b/core/src/plugins/core.conf/AbstractConfDriver.php
@@ -0,0 +1,1449 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Conf\Core;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\UploadedFileInterface;
+use Pydio\Access\Core\IAjxpWrapperProvider;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Http\Message\RegistryMessage;
+use Pydio\Core\Http\Message\ReloadMessage;
+use Pydio\Core\Http\Message\UserMessage;
+use Pydio\Core\Http\Message\XMLDocMessage;
+use Pydio\Core\Http\Message\XMLMessage;
+use Pydio\Core\Http\Response\AsyncResponseStream;
+use Pydio\Core\Http\Response\SerializableResponseStream;
+
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Model\RepositoryInterface;
+use Pydio\Core\Model\UserInterface;
+use Pydio\Core\Serializer\UserXML;
+use Pydio\Core\Services\AuthService;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Services\RolesService;
+use Pydio\Core\Services\SessionService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Crypto;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\OptionsHelper;
+use Pydio\Core\Utils\Vars\StatHelper;
+
+use Pydio\Core\Utils\Vars\XMLFilter;
+use Pydio\Core\Controller\HTMLWriter;
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Utils\Vars\StringHelper;
+use Zend\Diactoros\Response\JsonResponse;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * @package AjaXplorer_Plugins
+ * @subpackage Core
+ * @class AbstractConfDriver
+ * Abstract representation of a conf driver. Must be implemented by the "conf" plugin
+ */
+abstract class AbstractConfDriver extends Plugin
+{
+    public $options;
+    public $driverType = "conf";
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        parent::init($ctx, $options);
+        $options = $this->options;
+
+        // BACKWARD COMPATIBILIY PREVIOUS CONFIG VIA OPTIONS
+        if (isSet($options["CUSTOM_DATA"])) {
+            $custom = $options["CUSTOM_DATA"];
+            $serverSettings = $this->getXPath()->query('//server_settings')->item(0);
+            foreach ($custom as $key => $value) {
+                $n = $this->manifestDoc->createElement("param");
+                $n->setAttribute("name", $key);
+                $n->setAttribute("label", $value);
+                $n->setAttribute("description", $value);
+                $n->setAttribute("type", "string");
+                $n->setAttribute("scope", "user");
+                $n->setAttribute("expose", "true");
+                $serverSettings->appendChild($n);
+            }
+            $this->reloadXPath();
+        }
+
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function parseSpecificContributions(ContextInterface $ctx, \DOMNode &$contribNode)
+    {
+        parent::parseSpecificContributions($ctx, $contribNode);
+        if ($contribNode->nodeName == 'client_configs' && !ConfService::getContextConf($ctx, "WEBDAV_ENABLE")) {
+            $actionXpath=new \DOMXPath($contribNode->ownerDocument);
+            $webdavCompNodeList = $actionXpath->query('component_config/additional_tab[@id="webdav_pane"]', $contribNode);
+            if ($webdavCompNodeList->length) {
+                $contribNode->removeChild($webdavCompNodeList->item(0)->parentNode);
+            }
+        }
+
+        if($contribNode->nodeName != "actions") return;
+
+        // WEBDAV ACTION
+        if (!ConfService::getContextConf($ctx, "WEBDAV_ENABLE")) {
+            $actionXpath=new \DOMXPath($contribNode->ownerDocument);
+            $publicUrlNodeList = $actionXpath->query('action[@name="webdav_preferences"]', $contribNode);
+            if ($publicUrlNodeList->length) {
+                $publicUrlNode = $publicUrlNodeList->item(0);
+                $contribNode->removeChild($publicUrlNode);
+            }
+        }
+
+        // SWITCH TO DASHBOARD ACTION
+        $u = $ctx->getUser();
+        $access = true;
+        if($u == null) $access = false;
+        else {
+            $acl = $u->getMergedRole()->getAcl("ajxp_user");
+            if(empty($acl)) $access = false;
+        }
+        if(!$access){
+            $actionXpath=new \DOMXPath($contribNode->ownerDocument);
+            $publicUrlNodeList = $actionXpath->query('action[@name="switch_to_user_dashboard"]', $contribNode);
+            if ($publicUrlNodeList->length) {
+                $publicUrlNode = $publicUrlNodeList->item(0);
+                $contribNode->removeChild($publicUrlNode);
+            }
+        } 
+
+        $exposed = UsersService::getUsersExposedParameters();
+        if (!count($exposed)) {
+            $actionXpath=new \DOMXPath($contribNode->ownerDocument);
+            $publicUrlNodeList = $actionXpath->query('action[@name="custom_data_edit"]', $contribNode);
+            $publicUrlNode = $publicUrlNodeList->item(0);
+            $contribNode->removeChild($publicUrlNode);
+        }
+
+        // CREATE A NEW REPOSITORY
+        if (!ConfService::getContextConf($ctx, "USER_CREATE_REPOSITORY", "conf")) {
+            $actionXpath=new \DOMXPath($contribNode->ownerDocument);
+            $publicUrlNodeList = $actionXpath->query('action[@name="user_create_repository"]', $contribNode);
+            if ($publicUrlNodeList->length) {
+                $publicUrlNode = $publicUrlNodeList->item(0);
+                $contribNode->removeChild($publicUrlNode);
+            }
+            $actionXpath=new \DOMXPath($contribNode->ownerDocument);
+            $publicUrlNodeList = $actionXpath->query('action[@name="user_delete_repository"]', $contribNode);
+            if ($publicUrlNodeList->length) {
+                $publicUrlNode = $publicUrlNodeList->item(0);
+                $contribNode->removeChild($publicUrlNode);
+            }
+        }
+
+        // CREATE A NEW USER
+        if (!ConfService::getContextConf($ctx, "USER_CREATE_USERS", "conf")) {
+            $actionXpath=new \DOMXPath($contribNode->ownerDocument);
+            $publicUrlNodeList = $actionXpath->query('action[@name="user_create_user"]', $contribNode);
+            if ($publicUrlNodeList->length) {
+                $publicUrlNode = $publicUrlNodeList->item(0);
+                $contribNode->removeChild($publicUrlNode);
+            }
+            $actionXpath=new \DOMXPath($contribNode->ownerDocument);
+            $publicUrlNodeList = $actionXpath->query('action[@name="user_update_user"]', $contribNode);
+            if ($publicUrlNodeList->length) {
+                $publicUrlNode = $publicUrlNodeList->item(0);
+                $contribNode->removeChild($publicUrlNode);
+            }
+            $actionXpath=new \DOMXPath($contribNode->ownerDocument);
+            $publicUrlNodeList = $actionXpath->query('action[@name="user_delete_user"]', $contribNode);
+            if ($publicUrlNodeList->length) {
+                $publicUrlNode = $publicUrlNodeList->item(0);
+                $contribNode->removeChild($publicUrlNode);
+            }
+        }
+
+    }
+
+    // NEW FUNCTIONS FOR  LOADING/SAVING PLUGINS CONFIGS
+    /**
+     * Returns an array of options=>values merged from various sources (.inc.php, implementation source)
+     * @return array
+     * @param String $pluginType
+     * @param String $pluginName
+     */
+    public function loadPluginConfig($pluginType, $pluginName)
+    {
+        $options = [];
+        if (is_file(AJXP_CONF_PATH."/conf.$pluginType.inc")) {
+            include AJXP_CONF_PATH."/conf.$pluginType.inc";
+            if (!empty($DRIVER_CONF)) {
+                foreach ($DRIVER_CONF as $key=>$value) {
+                    $options[$key] = $value;
+                }
+                unset($DRIVER_CONF);
+            }
+        }
+        if (is_file(AJXP_CONF_PATH."/conf.$pluginType.$pluginName.inc")) {
+            include AJXP_CONF_PATH."/conf.$pluginType.$pluginName.inc";
+            if (!empty($DRIVER_CONF)) {
+                foreach ($DRIVER_CONF as $key=>$value) {
+                    $options[$key] = $value;
+                }
+                unset($DRIVER_CONF);
+            }
+        }
+        if ($this->pluginUsesBootConf($pluginType.".".$pluginName)) {
+            ConfService::getBootConfStorageImpl()->_loadPluginConfig($pluginType.".".$pluginName, $options);
+        } else {
+            $this->_loadPluginConfig($pluginType.".".$pluginName, $options);
+        }
+        return $options;
+    }
+
+    /**
+     * @param string $pluginId
+     * @param array $options
+     * @return mixed
+     */
+    abstract public function _loadPluginConfig($pluginId, &$options);
+
+    /**
+     * Intercept CONF and AUTH configs to use the BootConf Storage
+        * @param String $pluginId
+        * @param array $options
+        */
+    public function savePluginConfig($pluginId, $options)
+    {
+        if ($this->pluginUsesBootConf($pluginId)) {
+            ConfService::getBootConfStorageImpl()->_savePluginConfig($pluginId, $options);
+        } else {
+            $this->_savePluginConfig($pluginId, $options);
+        }
+    }
+
+    /**
+     * @param String $pluginId
+     * @return bool
+     */
+    protected function pluginUsesBootConf($pluginId)
+    {
+        return ($pluginId == "core.conf" || strpos($pluginId, "conf.") === 0
+          || $pluginId == "core.auth" || strpos($pluginId, "auth.") === 0
+          || $pluginId == "core.cache" || strpos($pluginId, "cache.") === 0);
+    }
+
+    /**
+     * @param String $pluginId
+     * @param String $options
+     */
+    abstract public function _savePluginConfig($pluginId, $options);
+
+
+    // SAVE / EDIT / CREATE / DELETE REPOSITORY
+    /**
+     * Returns a list of available repositories (dynamic ones only, not the ones defined in the config file).
+     * @param AbstractUser $user
+     * @return RepositoryInterface[]
+     */
+    abstract public function listRepositories($user = null);
+
+    /**
+     * Returns a list of available repositories (dynamic ones only, not the ones defined in the config file).
+     * @param array $criteria This parameter can take the following keys
+     *      - Search keys "uuid", "parent_uuid", "owner_user_id", "display", "accessType", "isTemplate", "slug", "groupPath",
+     *        Search values can be either string, array of string, AJXP_FILTER_EMPTY, AJXP_FILTER_NOT_EMPTY or regexp:RegexpString
+     *      - or "role" => AJXP_Role object: will search repositories accessible to this role
+     *      - ORDERBY = array("KEY"=>"", "DIR"=>""), GROUPBY, CURSOR = array("OFFSET" => 0, "LIMIT", 30)
+     *      - COUNT_ONLY
+     * @param $count int fill this integer with a count
+     * @return RepositoryInterface[]
+     */
+    abstract public function listRepositoriesWithCriteria($criteria, &$count=null);
+
+
+    /**
+     * Retrieve a Repository given its unique ID.
+     *
+     * @param String $repositoryId
+     * @return RepositoryInterface
+     */
+    abstract public function getRepositoryById($repositoryId);
+    /**
+     * Retrieve a Repository given its alias.
+     *
+     * @param String $repositorySlug
+     * @return RepositoryInterface
+     */
+    abstract public function getRepositoryByAlias($repositorySlug);
+    /**
+     * Stores a repository, new or not.
+     *
+     * @param RepositoryInterface $repositoryObject
+     * @param Boolean $update
+     * @return -1 if failed
+     */
+    abstract public function saveRepository($repositoryObject, $update = false);
+    /**
+     * Delete a repository, given its unique ID.
+     *
+     * @param String $repositoryId
+     */
+    abstract public function deleteRepository($repositoryId);
+
+    /**
+     * Must return an associative array of roleId => AjxpRole objects.
+     * @param array $roleIds
+     * @param boolean $excludeReserved,
+     * @return array AJXP_Role[]
+     */
+    abstract public function listRoles($roleIds = [], $excludeReserved = false);
+
+    /**
+     * @param AJXP_Role[] $roles
+     * @return mixed
+     */
+    abstract public function saveRoles($roles);
+
+    /**
+     * @abstract
+     * @param AJXP_Role $role
+     * @param AbstractUser $userObject
+     * @return void
+     */
+    abstract public function updateRole($role, $userObject = null);
+
+    /**
+     * @abstract
+     * @param AJXP_Role|String $role
+     * @return void
+     */
+    abstract public function deleteRole($role);
+
+    /**
+     * Compute the most recent date where one of these roles where updated.
+     *
+     * @param $rolesIdsList
+     * @return int
+     */
+    public function rolesLastUpdated($rolesIdsList){
+        return 0;
+    }
+
+    /**
+     * Specific queries
+     */
+    abstract public function countAdminUsers();
+
+    /**
+     * @abstract
+     * @param array $context
+     * @param String $fileName
+     * @param String $ID
+     * @return String $ID
+     */
+    abstract public function saveBinary($context, $fileName, $ID = null);
+
+    /**
+     * @abstract
+     * @param array $context
+     * @param String $ID
+     * @param Resource $outputStream
+     * @return boolean
+     */
+    abstract public function loadBinary($context, $ID, $outputStream = null);
+
+    /**
+     * @abstract
+     * @param array $context
+     * @param String $ID
+     * @return boolean
+     */
+    abstract public function deleteBinary($context, $ID);
+
+    /**
+     * @abstract
+     * @param String $keyType
+     * @param String $keyId
+     * @param String $userId
+     * @param array $data
+     * @return boolean
+     */
+    abstract public function saveTemporaryKey($keyType, $keyId, $userId, $data);
+
+    /**
+     * @abstract
+     * @param String $keyType
+     * @param String $keyId
+     * @return array
+     */
+    abstract public function loadTemporaryKey($keyType, $keyId);
+
+    /**
+     * @abstract
+     * @param String $keyType
+     * @param String $keyId
+     * @return boolean
+     */
+    abstract public function deleteTemporaryKey($keyType, $keyId);
+
+    /**
+     * @abstract
+     * @param String $keyType
+     * @param String $expiration
+     * @return null
+     */
+    abstract public function pruneTemporaryKeys($keyType, $expiration);
+
+    /**
+     * Instantiate a new UserInterface
+     *
+     * @param String $userId
+     * @return UserInterface
+     */
+    public function createUserObject($userId)
+    {
+        $userId = UsersService::filterUserSensitivity($userId);
+        $abstractUser = $this->instantiateAbstractUserImpl($userId);
+        if (!$abstractUser->storageExists()) {
+            RolesService::updateDefaultRights($abstractUser);
+        }
+        RolesService::updateAutoApplyRole($abstractUser);
+        RolesService::updateAuthProvidedData($abstractUser);
+        $args = [&$abstractUser];
+        Controller::applyIncludeHook("include.user.updateUserObject", $args);
+        return $abstractUser;
+    }
+
+    /**
+     * Function for deleting a user
+     *
+     * @param String $userId
+     * @param array $deletedSubUsers
+     */
+    abstract public function deleteUser($userId, &$deletedSubUsers);
+
+
+    /**
+     * Instantiate the right class
+     *
+     * @param string $userId
+     * @return AbstractUser
+     */
+    abstract public function instantiateAbstractUserImpl($userId);
+
+    /**
+     * @return string
+     */
+    abstract public function getUserClassFileName();
+
+    /**
+     * @abstract
+     * @param $userId
+     * @return AbstractUser[]
+     */
+    abstract public function getUserChildren($userId);
+
+    /**
+     * @abstract
+     * @param string $repositoryId
+     * @param string $rolePrefix
+     * @param bool $splitByType
+     * @return array An array of role ids
+     */
+    abstract public function getRolesForRepository($repositoryId, $rolePrefix = '', $splitByType = false);
+    /**
+     * @abstract
+     * @param ContextInterface $ctx
+     * @param string $repositoryId
+     * @param boolean $details
+     * @param boolean $admin
+     * @return Integer|array
+     */
+    abstract public function countUsersForRepository(ContextInterface $ctx, $repositoryId, $details = false, $admin = false);
+
+
+    /**
+     * @param AbstractUser[] $flatUsersList
+     * @param string $baseGroup
+     * @param bool $fullTree
+     * @return void
+     */
+    abstract public function filterUsersByGroup(&$flatUsersList, $baseGroup = "/", $fullTree = false);
+
+    /**
+     * Check if group already exists
+     * @param string $groupPath
+     * @return boolean
+     */
+    abstract public function groupExists($groupPath);
+
+    /**
+     * @param string $groupPath
+     * @param string $groupLabel
+     * @return mixed
+     */
+    abstract public function createGroup($groupPath, $groupLabel);
+
+    /**
+     * @abstract
+     * @param $groupPath
+     * @return void
+     */
+    abstract public function deleteGroup($groupPath);
+
+    /**
+     * @abstract
+     * @param string $groupPath
+     * @param string $groupLabel
+     * @return void
+     */
+    abstract public function relabelGroup($groupPath, $groupLabel);
+
+
+        /**
+     * @param string $baseGroup
+     * @return string[]
+     */
+    abstract public function getChildrenGroups($baseGroup = "/");
+
+    /**
+     * @inheritdoc
+     */
+    public function getOption($optionName)
+    {
+        return (isSet($this->options[$optionName])?$this->options[$optionName]:"");
+    }
+
+    /**
+     * @param UserInterface $userObject
+     * @return array()
+     */
+    public function getExposedPreferences($userObject)
+    {
+        $stringPrefs = ["lang","history/last_repository","pending_folder","plugins_preferences"];
+        $jsonPrefs = ["ls_history","gui_preferences"];
+        $prefs = [];
+        if ( $userObject->getId()=="guest" && ConfService::getGlobalConf("SAVE_GUEST_PREFERENCES", "conf") === false) {
+            return [];
+        }
+        if ( ConfService::getGlobalConf("SKIP_USER_HISTORY", "conf") === true ) {
+            $stringPrefs = ["lang","pending_folder", "plugins_preferences"];
+            $jsonPrefs = ["gui_preferences"];
+            $prefs["SKIP_USER_HISTORY"] = ["value" => "true", "type" => "string"];
+        }
+        foreach ($stringPrefs as $pref) {
+            if (strstr($pref, "/")!==false) {
+                $parts = explode("/", $pref);
+                $value = $userObject->getArrayPref($parts[0], $parts[1]);
+                $pref = str_replace("/", "_", $pref);
+            } else {
+                $value = $userObject->getPref($pref);
+            }
+            $prefs[$pref] = ["value" => $value, "type" => "string"];
+        }
+        foreach ($jsonPrefs as $pref) {
+            $prefs[$pref] = ["value" => $userObject->getPref($pref), "type" => "json"];
+        }
+
+        $exposed = UsersService::getUsersExposedParameters();
+        foreach ($exposed as $exposedProp) {
+            $value = $userObject->getMergedRole()->filterParameterValue($exposedProp["PLUGIN_ID"], $exposedProp["NAME"], AJXP_REPO_SCOPE_ALL, "");
+            $prefs[$exposedProp["NAME"]] = ["value" => $value, "type" => "string", "pluginId" => $exposedProp["PLUGIN_ID"]];
+        }
+
+        return $prefs;
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @throws PydioException
+     * @throws \Exception
+     * @throws \Pydio\Core\Exception\UserNotFoundException
+     */
+    public function switchAction(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface)
+    {
+        $httpVars = $requestInterface->getParsedBody();
+        $action = $requestInterface->getAttribute("action");
+        /** @var ContextInterface $ctx */
+        $ctx    = $requestInterface->getAttribute("ctx");
+        $loggedUser = $ctx->getUser();
+
+        foreach ($httpVars as $getName=>$getValue) {
+            $$getName = InputFilter::securePath($getValue);
+        }
+
+        $mess = LocaleService::getMessages();
+
+        switch ($action) {
+            //------------------------------------
+            //	SWITCH THE ROOT REPOSITORY
+            //------------------------------------
+            case "switch_repository":
+
+                if (!isSet($repository_id)) {
+                    break;
+                }
+                $dirList = UsersService::getRepositoriesForUser($ctx->getUser());
+                /** @var $repository_id string */
+                if (!isSet($dirList[$repository_id])) {
+                    throw new PydioException("Trying to switch to an unkown repository!");
+                }
+                //ConfService::switchRootDir($repository_id);
+                SessionService::switchSessionRepositoriId($repository_id);
+                PluginsService::getInstance($ctx->withRepositoryId($repository_id));
+                if (UsersService::usersEnabled() && $loggedUser !== null) {
+                    $loggedUser->setArrayPref("repository_last_connected", $repository_id, time());
+                    $loggedUser->save("user");
+                }
+
+                $this->logInfo("Switch Repository", ["rep. id"=>$repository_id]);
+
+            break;
+
+            //------------------------------------
+            //	SEND XML REGISTRY
+            //------------------------------------
+            case "get_xml_registry" :
+            case "state" :
+            case "user_state" :
+
+                if($action === "user_state"){
+                    // Build xPath manually
+                    $uri = $requestInterface->getServerParams()["REQUEST_URI"];
+                    if(strpos($uri, "/user/workspaces") !== false) $xPath = "user/repositories";
+                    else if(strpos($uri, "/user/preferences") !== false) $xPath = "user/preferences";
+                    else $xPath = "user";
+                    $httpVars["xPath"] = $xPath;
+                }
+                
+                $clone = PluginsService::getInstance($ctx)->getFilteredXMLRegistry(true, true);
+                $clonePath = new \DOMXPath($clone);
+                if(!AJXP_SERVER_DEBUG){
+                    $serverCallbacks = $clonePath->query("//serverCallback|hooks");
+                    foreach ($serverCallbacks as $callback) {
+                        $callback->parentNode->removeChild($callback);
+                    }
+                }
+                $xPath = null;
+                if (isSet($httpVars["xPath"])) {
+                    $xPath = ltrim(InputFilter::securePath($httpVars["xPath"]), "/");
+                }
+                $json = (isSet($httpVars["format"]) && $httpVars["format"] == "json");
+                $message = new RegistryMessage($clone, $xPath, $clonePath);
+                if(empty($xPath) && !$json){
+                    $string = $message->toXML();
+                    $etag = md5($string);
+                    $match = isSet($requestInterface->getServerParams()["HTTP_IF_NONE_MATCH"])?$requestInterface->getServerParams()["HTTP_IF_NONE_MATCH"]:'';
+                    if($match == $etag){
+                        header('HTTP/1.1 304 Not Modified');
+                        $responseInterface = $responseInterface->withStatus(304);
+                        break;
+                    }else{
+                        $responseInterface = $responseInterface
+                            ->withHeader("Cache-Control", "public, max-age=31536000")
+                            ->withHeader("ETag", $etag);
+                    }
+                }
+                ApplicationState::safeIniSet("zlib.output_compression", "4096");
+                $x = new SerializableResponseStream();
+                $responseInterface = $responseInterface->withBody($x);
+                $x->addChunk($message);
+
+            break;
+
+            //------------------------------------
+            //	BOOKMARK BAR
+            //------------------------------------
+            case "get_bookmarks":
+
+                $bmUser = null;
+                if (UsersService::usersEnabled() && $loggedUser != null) {
+                    $bmUser = $loggedUser;
+                } else if (!UsersService::usersEnabled()) {
+                    $bmUser = UsersService::getUserById("shared", false);
+                }
+                $x = new SerializableResponseStream();
+                $responseInterface = $responseInterface->withBody($x);
+                if ($bmUser == null) {
+                    break;
+                }
+                /** @var ContextInterface $ctx */
+                $ctx = $requestInterface->getAttribute("ctx");
+                $driver = $ctx->getRepository()->getDriverInstance($ctx);
+                if (!($driver instanceof IAjxpWrapperProvider)) {
+                    $driver = false;
+                }
+
+
+                $repositoryId = $ctx->getRepositoryId();
+                if (isSet($httpVars["bm_action"]) && isset($httpVars["bm_path"])) {
+                    $bmPath = InputFilter::decodeSecureMagic($httpVars["bm_path"]);
+                    if ($httpVars["bm_action"] == "add_bookmark") {
+                        $title = "";
+                        if(isSet($httpVars["bm_title"])) $title = InputFilter::decodeSecureMagic($httpVars["bm_title"]);
+                        if($title == "" && $bmPath=="/") $title = $ctx->getRepository()->getDisplay();
+                        $bmUser->addBookmark($repositoryId, $bmPath, $title);
+                        if ($driver) {
+                            $node = new AJXP_Node($ctx->getUrlBase().$bmPath);
+                            $node->setMetadata("ajxp_bookmarked", ["ajxp_bookmarked" => "true"], true, AJXP_METADATA_SCOPE_REPOSITORY, true);
+                        }
+                    } else if ($httpVars["bm_action"] == "delete_bookmark") {
+                        $bmUser->removeBookmark($repositoryId, $bmPath);
+                        if ($driver) {
+                            $node = new AJXP_Node($ctx->getUrlBase().$bmPath);
+                            $node->removeMetadata("ajxp_bookmarked", true, AJXP_METADATA_SCOPE_REPOSITORY, true);
+                        }
+                    } else if ($httpVars["bm_action"] == "rename_bookmark" && isset($httpVars["bm_title"])) {
+                        $title = InputFilter::decodeSecureMagic($httpVars["bm_title"]);
+                        $bmUser->renameBookmark($repositoryId, $bmPath, $title);
+                    }
+                    Controller::applyHook("msg.instant", [$ctx, "<reload_bookmarks/>", $loggedUser->getId()]
+                    );
+
+                    if (UsersService::usersEnabled() && $loggedUser != null) {
+                        $bmUser->save("user");
+                        AuthService::updateSessionUser($bmUser);
+                    } else if (!UsersService::usersEnabled()) {
+                        $bmUser->save("user");
+                    }
+                }
+                $doc = new XMLMessage(UserXML::writeBookmarks($bmUser->getBookmarks($repositoryId), $ctx, false, isset($httpVars["format"]) ? $httpVars["format"] : "legacy"));
+                $x = new SerializableResponseStream([$doc]);
+                $responseInterface = $responseInterface->withBody($x);
+
+            break;
+
+            //------------------------------------
+            //	SAVE USER PREFERENCE
+            //------------------------------------
+            case "save_user_pref":
+
+                $i = 0;
+                while (isSet($httpVars["pref_name_".$i]) && isSet($httpVars["pref_value_".$i])) {
+                    $prefName = InputFilter::sanitize($httpVars["pref_name_" . $i], InputFilter::SANITIZE_ALPHANUM);
+                    $prefValue = InputFilter::sanitize(InputFilter::magicDequote($httpVars["pref_value_" . $i]));
+                    if($prefName == "password") continue;
+                    if ($prefName != "pending_folder" && $loggedUser == null) {
+                        $i++;
+                        continue;
+                    }
+                    $loggedUser->setPref($prefName, $prefValue);
+                    $loggedUser->save("user");
+                    AuthService::updateSessionUser($loggedUser);
+                    $i++;
+                }
+
+                $responseInterface = $responseInterface->withHeader("Content-type", "text/plain");
+                $responseInterface->getBody()->write("SUCCESS");
+
+            break;
+
+            //------------------------------------
+            //	SAVE USER PREFERENCE
+            //------------------------------------
+            case "custom_data_edit":
+            case "user_create_user":
+
+                $data = [];
+
+                if ($action == "user_create_user" && isSet($httpVars["NEW_new_user_id"])) {
+                    $updating = false;
+                    OptionsHelper::parseStandardFormParameters($ctx, $httpVars, $data, "NEW_");
+                    $original_id = InputFilter::decodeSecureMagic($data["new_user_id"]);
+                    $data["new_user_id"] = InputFilter::decodeSecureMagic($data["new_user_id"], InputFilter::SANITIZE_EMAILCHARS);
+                    if($original_id != $data["new_user_id"]){
+                        throw new \Exception(str_replace("%s", $data["new_user_id"], $mess["ajxp_conf.127"]));
+                    }
+                    if (UsersService::userExists($data["new_user_id"], "w")) {
+                        throw new \Exception($mess["ajxp_conf.43"]);
+                    }
+                    $limit = $loggedUser->getMergedRole()->filterParameterValue("core.conf", "USER_SHARED_USERS_LIMIT", AJXP_REPO_SCOPE_ALL, "");
+                    if (!empty($limit) && intval($limit) > 0) {
+                        $count = count($this->getUserChildren($loggedUser->getId()));
+                        if ($count >= $limit) {
+                            throw new \Exception($mess['483']);
+                        }
+                    }
+
+                    $userObject = UsersService::createUser($data["new_user_id"], $data["new_password"]);
+                    $userObject->setParent($loggedUser->getId());
+                    $userObject->save('superuser');
+                    $userObject->getPersonalRole()->clearAcls();
+                    $userObject->setGroupPath($loggedUser->getGroupPath());
+                    $userObject->setProfile("shared");
+
+                } else if($action == "user_create_user" && isSet($httpVars["NEW_existing_user_id"])){
+
+                    $updating = true;
+                    OptionsHelper::parseStandardFormParameters($ctx, $httpVars, $data, "NEW_");
+                    $userId = $data["existing_user_id"];
+                    $userObject = UsersService::getUserById($userId);
+                    if($userObject->getParent() !== $loggedUser->getId()){
+                        throw new \Exception("Cannot find user");
+                    }
+                    if(!empty($data["new_password"])){
+                        UsersService::updatePassword($userId, $data["new_password"]);
+                    }
+
+                } else {
+                    $updating = false;
+                    $userObject = $loggedUser;
+                    OptionsHelper::parseStandardFormParameters($ctx, $httpVars, $data, "PREFERENCES_");
+                }
+
+                $rChanges = false;
+                $exposed = UsersService::getUsersExposedParameters();
+                foreach($exposed as $parameter){
+                    $pluginId = $parameter["PLUGIN_ID"];
+                    $name     = $parameter["NAME"];
+                    if (isSet($data[$name]) || $data[$name] === "") {
+                        if($data[$name] === "__AJXP_VALUE_SET__") continue;
+                        $pRole = null;
+                        $persRole = $userObject->getPersonalRole();
+                        if($userObject instanceof AbstractUser) $pRole = $userObject->parentRole;
+                        if ($data[$name] === ""
+                            || $pRole === null || $pRole->filterParameterValue($pluginId, $name, AJXP_REPO_SCOPE_ALL, "") != $data[$name]
+                            || $persRole->filterParameterValue($pluginId, $name, AJXP_REPO_SCOPE_ALL, "") != $data[$name])
+                        {
+                            $persRole->setParameterValue($pluginId, $name, $data[$name]);
+                            $rChanges = true;
+                        }
+                    }
+                }
+                if ($rChanges) {
+                    RolesService::updateRole($userObject->getPersonalRole(), $userObject);
+                    $userObject->recomputeMergedRole();
+                    if ($action == "custom_data_edit") {
+                        AuthService::updateSessionUser($userObject);
+                        $crtLang = LocaleService::getLanguage();
+                        $newLang = $userObject->getPersonalRole()->filterParameterValue("core.conf", "lang", AJXP_REPO_SCOPE_ALL, $crtLang);
+                        if($newLang !== $crtLang){
+                            LocaleService::setLanguage($newLang);
+                            $mess = LocaleService::getMessages(true);
+                        }
+                    }
+                    UsersService::updateUser($userObject);
+                }
+
+                if ($action == "user_create_user") {
+
+                    Controller::applyHook($updating?"user.after_update":"user.after_create", [$ctx, $userObject]);
+                    if (isset($data["send_email"]) && $data["send_email"] == true && !empty($data["email"])) {
+                        $mailer = PluginsService::getInstance($ctx)->getUniqueActivePluginForType("mailer");
+                        if ($mailer !== false) {
+                            $mess = LocaleService::getMessages();
+                            $link = ApplicationState::detectServerURL();
+                            $apptitle = ConfService::getGlobalConf("APPLICATION_TITLE");
+                            $subject = str_replace("%s", $apptitle, $mess["507"]);
+                            $body = str_replace(["%s", "%link", "%user", "%pass"], [$apptitle, $link, $data["new_user_id"], $data["new_password"]], $mess["508"]);
+                            $mailer->sendMail($ctx, [$data["email"]], $subject, $body);
+                        }
+                    }
+
+                    $responseInterface = $responseInterface->withHeader("Content-type", "text/plain");
+                    $responseInterface->getBody()->write("SUCCESS");
+
+                } else {
+
+                    $x = new SerializableResponseStream();
+                    $responseInterface = $responseInterface->withBody($x);
+                    $x->addChunk(new UserMessage($mess["241"]));
+
+                }
+
+            break;
+
+            case "user_update_user":
+
+                if(!isSet($httpVars["user_id"])) {
+                    throw new \Exception("invalid arguments");
+                }
+                $userId = InputFilter::sanitize($httpVars["user_id"], InputFilter::SANITIZE_EMAILCHARS);
+                $userObject = UsersService::getUserById($userId);
+
+                if($userObject->getParent() != $loggedUser->getId()){
+                    throw new \Exception("Cannot find user");
+                }
+                $paramsString = ConfService::getContextConf($ctx, "NEWUSERS_EDIT_PARAMETERS", "conf");
+                $result = [];
+                $params = explode(",", $paramsString);
+                foreach($params as $p){
+                    $result[$p] = $userObject->getPersonalRole()->filterParameterValue("core.conf", $p, AJXP_REPO_SCOPE_ALL, "");
+                }
+
+                $responseInterface = $responseInterface->withHeader("Content-type", "application/json");
+                $responseInterface->getBody()->write(json_encode($result));
+
+            break;
+
+            //------------------------------------
+            // WEBDAV PREFERENCES
+            //------------------------------------
+            case "webdav_preferences" :
+
+                $webdavActive = false;
+                $passSet = false;
+                // Detect http/https and host
+                if (ConfService::getGlobalConf("WEBDAV_BASEHOST") != "") {
+                    $baseURL = ConfService::getGlobalConf("WEBDAV_BASEHOST");
+                } else {
+                    $baseURL = ApplicationState::detectServerURL(true);
+                }
+                $webdavBaseUrl = rtrim($baseURL,"/")."/".trim(ConfService::getGlobalConf("WEBDAV_BASEURI"), "/")."/";
+                $davData = $loggedUser->getPref("AJXP_WEBDAV_DATA");
+                $digestSet = isSet($davData["HA1"]);
+                if (isSet($httpVars["activate"]) || isSet($httpVars["webdav_pass"])) {
+                    if (!empty($httpVars["activate"])) {
+                        $activate = ($httpVars["activate"]==="true" ? true:false);
+                        if (empty($davData)) {
+                            $davData = [];
+                        }
+                        $davData["ACTIVE"] = $activate;
+                    }
+                    if (!empty($httpVars["webdav_pass"])) {
+                        $davData["PASS"] = Crypto::encrypt($httpVars["webdav_pass"], Crypto::buildKey($loggedUser->getId(),Crypto::getApplicationSecret()));
+                    }
+                    $loggedUser->setPref("AJXP_WEBDAV_DATA", $davData);
+                    $loggedUser->save("user");
+                }
+                if (!empty($davData)) {
+                    $webdavActive = ConfService::getGlobalConf("WEBDAV_ACTIVE_ALL");
+                    // override with local value if set.
+                    if(isSet($davData["ACTIVE"]) && is_bool($davData["ACTIVE"])){
+                        $webdavActive = $davData["ACTIVE"];
+                    }
+                    $passSet = (isSet($davData["PASS"]));
+                }
+                $repoList = UsersService::getRepositoriesForUser($ctx->getUser());
+                $davRepos = [];
+                foreach ($repoList as $repoIndex => $repoObject) {
+                    $accessType = $repoObject->getAccessType();
+                    $driver = PluginsService::getInstance($ctx)->getPluginByTypeName("access", $accessType);
+                    if (($driver instanceof IAjxpWrapperProvider) && !$repoObject->getContextOption($ctx, "AJXP_WEBDAV_DISABLED") && ($loggedUser->canRead($repoIndex) || $loggedUser->canWrite($repoIndex))) {
+                        $davRepos[$repoIndex] = $webdavBaseUrl . "" . ($repoObject->getSlug() == null ? $repoObject->getId() : $repoObject->getSlug());
+                    }
+                }
+                $prefs = [
+                    "webdav_active"  => $webdavActive,
+                    "password_set"   => $passSet,
+                    "digest_set"    => $digestSet,
+                    "webdav_force_basic" => (ConfService::getGlobalConf("WEBDAV_FORCE_BASIC") === true),
+                    "webdav_base_url"  => $webdavBaseUrl,
+                    "webdav_repositories" => $davRepos
+                ];
+
+                $responseInterface = $responseInterface->withHeader("Content-type", "application/json");
+                $responseInterface->getBody()->write(json_encode($prefs));
+
+            break;
+
+            case  "get_user_template_logo":
+
+                $tplId = $httpVars["template_id"];
+                $iconFormat = $httpVars["icon_format"];
+                $repo = RepositoryService::getRepositoryById($tplId);
+                $logo = $repo->getContextOption($ctx, "TPL_ICON_".strtoupper($iconFormat));
+
+                $async = new AsyncResponseStream(function() use($logo, $iconFormat){
+                    if (isSet($logo) && is_file(AJXP_DATA_PATH."/plugins/core.conf/tpl_logos/".$logo)) {
+                        header("Content-Type: ". StatHelper::getImageMimeType($logo) ."; name=\"".$logo."\"");
+                        header("Content-Length: ".filesize(AJXP_DATA_PATH."/plugins/core.conf/tpl_logos/".$logo));
+                        header('Pragma:');
+                        header('Cache-Control: public');
+                        header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()-10000) . " GMT");
+                        header("Expires: " . gmdate("D, d M Y H:i:s", time()+5*24*3600) . " GMT");
+                        readfile(AJXP_DATA_PATH."/plugins/core.conf/tpl_logos/".$logo);
+                    } else {
+                        $logo = "default_template_logo-".($iconFormat == "small"?16:22).".png";
+                        header("Content-Type: ". StatHelper::getImageMimeType($logo) ."; name=\"".$logo."\"");
+                        header("Content-Length: ".filesize(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/core.conf/".$logo));
+                        header('Pragma:');
+                        header('Cache-Control: public');
+                        header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()-10000) . " GMT");
+                        header("Expires: " . gmdate("D, d M Y H:i:s", time()+5*24*3600) . " GMT");
+                        readfile(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/core.conf/".$logo);
+                    }
+                });
+                $responseInterface = $responseInterface->withBody($async);
+
+            break;
+
+            case  "get_user_templates_definition":
+
+                $xml = "<repository_templates>";
+                $count = 0;
+                $repositories = RepositoryService::listRepositoriesWithCriteria([
+                    "isTemplate" => 1
+                ], $count);
+                $pServ = PluginsService::getInstance($ctx);
+                foreach ($repositories as $repo) {
+                    if(!$repo->isTemplate) continue;
+                    if(!$repo->getContextOption($ctx, "TPL_USER_CAN_CREATE")) continue;
+                    $repoId = $repo->getId();
+                    $repoLabel = $repo->getDisplay();
+                    $repoType = $repo->getAccessType();
+                    $xml .= "<template repository_id=\"$repoId\" repository_label=\"$repoLabel\" repository_type=\"$repoType\">";
+                    $driverPlug = $pServ->getPluginByTypeName("access", $repoType);
+                    $params = $driverPlug->getManifestRawContent("//param", "node");
+                    $tplDefined = $repo->getOptionsDefined();
+                    $defaultLabel = '';
+                    foreach ($params as $paramNode) {
+                        $name = $paramNode->getAttribute("name");
+                        if ( strpos($name, "TPL_") === 0 ) {
+                            if ($name == "TPL_DEFAULT_LABEL") {
+                                $defaultLabel = str_replace("AJXP_USER", $loggedUser->getId(), $repo->getContextOption($ctx, $name));
+                            }
+                            continue;
+                        }
+                        if( in_array($paramNode->getAttribute("name"), $tplDefined) ) continue;
+                        if($paramNode->getAttribute('no_templates') == 'true') continue;
+                        $xml.= XMLFilter::resolveKeywords($paramNode->ownerDocument->saveXML($paramNode));
+                    }
+                    // ADD LABEL
+                    $xml .= '<param name="DISPLAY" type="string" label="'.$mess[359].'" description="'.$mess[429].'" mandatory="true" default="'.$defaultLabel.'"/>';
+                    $xml .= "</template>";
+                }
+
+                $xml.= "</repository_templates>";
+                $doc = new XMLDocMessage($xml);
+                $x = new SerializableResponseStream([$doc]);
+                $responseInterface = $responseInterface->withBody($x);
+
+
+            break;
+
+            case "user_create_repository" :
+
+                $tplId = $httpVars["template_id"];
+                $tplRepo = RepositoryService::getRepositoryById($tplId);
+                $options = [];
+                OptionsHelper::parseStandardFormParameters($ctx, $httpVars, $options);
+                $display = InputFilter::sanitize($httpVars["DISPLAY"]);
+                if(empty($display)){
+                    throw new PydioException("Cannot create repository with empty label");
+                }
+                $newRep = $tplRepo->createTemplateChild($display, $options, $loggedUser->getId(), $loggedUser->getId());
+                $gPath = $loggedUser->getGroupPath();
+                if (!empty($gPath)) {
+                    $newRep->setGroupPath($gPath);
+                }
+                $res = RepositoryService::addRepository($newRep);
+                if ($res == -1) {
+                    throw new PydioException($mess[426], 426);
+                }
+
+                // Make sure we do not overwrite otherwise loaded rights.
+                $loggedUser->load();
+                $loggedUser->getPersonalRole()->setAcl($newRep->getUniqueId(), "rw");
+                $loggedUser->save("superuser");
+                $loggedUser->recomputeMergedRole();
+                AuthService::updateSessionUser($loggedUser);
+
+                $x = new SerializableResponseStream();
+                $responseInterface = $responseInterface->withBody($x);
+                $x->addChunk(new UserMessage($mess[425]));
+                $x->addChunk(new ReloadMessage("", $newRep->getUniqueId()));
+                $x->addChunk(new XMLMessage("<reload_instruction object=\"repository_list\"/>"));
+
+            break;
+
+            case "user_delete_repository" :
+
+                $repoId = $httpVars["repository_id"];
+                $repository = RepositoryService::getRepositoryById($repoId);
+                if (!$repository->getUniqueUser()||$repository->getUniqueUser()!= $loggedUser->getId()) {
+                    throw new \Exception("You are not allowed to perform this operation!");
+                }
+                $res = RepositoryService::deleteRepository($repoId);
+
+                if ($res == -1) {
+                    throw new PydioException($mess[427]);
+                }
+
+                // Make sure we do not override remotely set rights
+                $loggedUser->load();
+                $loggedUser->getPersonalRole()->setAcl($repoId, "");
+                $loggedUser->save("superuser");
+                AuthService::updateSessionUser($loggedUser);
+
+                $x = new SerializableResponseStream();
+                $responseInterface = $responseInterface->withBody($x);
+                $x->addChunk(new UserMessage($mess[428]));
+                $x->addChunk(new XMLMessage("<reload_instruction object=\"repository_list\"/>"));
+
+            break;
+
+            case "user_delete_user":
+
+                $userId = InputFilter::sanitize($httpVars["user_id"], InputFilter::SANITIZE_EMAILCHARS);
+                $userObject = UsersService::getUserById($userId);
+                if ($userObject == null || !$userObject->hasParent() || $userObject->getParent() != $loggedUser->getId()) {
+                    throw new \Exception("You are not allowed to edit this user");
+                }
+                UsersService::deleteUser($userId);
+                $responseInterface = $responseInterface->withHeader("Content-type", "text/plain");
+                $responseInterface->getBody()->write("SUCCESS");
+
+                break;
+
+            case "user_list_authorized_users" :
+
+                if(isSet($httpVars["format"]) && $httpVars["format"] == "xml"){
+                    header('Content-Type: text/xml; charset=UTF-8');
+                    header('Cache-Control: no-cache');
+                    print('<?xml version="1.0" encoding="UTF-8"?>');
+                }else{
+                    HTMLWriter::charsetHeader();
+                }
+                if (!ConfService::getAuthDriverImpl()->usersEditable()) {
+                    break;
+                }
+
+                $crtValue = $httpVars["value"];
+                $usersOnly = isSet($httpVars["users_only"]) && $httpVars["users_only"] == "true";
+                $existingOnly = isSet($httpVars["existing_only"]) && $httpVars["existing_only"] == "true";
+                if(!empty($crtValue)) {
+                    $regexp = '^'.$crtValue;
+                    $pregexp = '/^'.preg_quote($crtValue).'/i';
+                } else {
+                    $regexp = $pregexp = null;
+                }
+                $skipDisplayWithoutRegexp = ConfService::getContextConf($ctx, "USERS_LIST_REGEXP_MANDATORY", "conf");
+                if($skipDisplayWithoutRegexp && $regexp == null){
+                    $users = "";
+                    if (method_exists($this, "listUserTeams")) {
+                        $teams = $this->listUserTeams($ctx->getUser());
+                        foreach ($teams as $tId => $tData) {
+                            $label = htmlentities($tData["LABEL"]);
+                            $users.= "<li class='complete_group_entry' data-group='/AJXP_TEAM/$tId' data-label=\"[team] ".$label."\"><span class='user_entry_label'>[team] ".$label."</span></li>";
+                        }
+                    }
+                    print("<ul>$users</ul>");
+                    break;
+                }
+                $limit = intval(ConfService::getContextConf($ctx, "USERS_LIST_COMPLETE_LIMIT", "conf"));
+                $searchAll = ConfService::getContextConf($ctx, "CROSSUSERS_ALLGROUPS", "conf");
+                $displayAll = ConfService::getContextConf($ctx, "CROSSUSERS_ALLGROUPS_DISPLAY", "conf");
+                $baseGroup = "/";
+                if( ($regexp == null && !$displayAll) || ($regexp != null && !$searchAll) && $ctx->hasUser()){
+                    $baseGroup = $ctx->getUser()->getGroupPath();
+                }
+                $allUsers = UsersService::listUsers($baseGroup, $regexp, 0, $limit, false);
+
+                if (!$usersOnly) {
+                    $allGroups = [];
+
+                    $roleOrGroup = ConfService::getContextConf($ctx, "GROUP_OR_ROLE", "conf");
+                    $rolePrefix = $excludeString = $includeString = null;
+                    if(!is_array($roleOrGroup)){
+                        $roleOrGroup = ["group_switch_value" => $roleOrGroup];
+                    }
+
+                    $listRoleType = false;
+
+                    if(isSet($roleOrGroup["PREFIX"])){
+                        $rolePrefix    = $loggedUser->getMergedRole()->filterParameterValue("core.conf", "PREFIX", null, $roleOrGroup["PREFIX"]);
+                        $excludeString = $loggedUser->getMergedRole()->filterParameterValue("core.conf", "EXCLUDED", null, $roleOrGroup["EXCLUDED"]);
+                        $includeString = $loggedUser->getMergedRole()->filterParameterValue("core.conf", "INCLUDED", null, $roleOrGroup["INCLUDED"]);
+                        $listUserRolesOnly = $loggedUser->getMergedRole()->filterParameterValue("core.conf", "LIST_ROLE_BY", null, $roleOrGroup["LIST_ROLE_BY"]);
+                        if (is_array($listUserRolesOnly) && isset($listUserRolesOnly["group_switch_value"])) {
+                            switch ($listUserRolesOnly["group_switch_value"]) {
+                                case "userroles":
+                                    $listRoleType = true;
+                                    break;
+                                case "allroles":
+                                    $listRoleType = false;
+                                    break;
+                                default;
+                                    break;
+                            }
+                        }
+                    }
+
+                    switch (strtolower($roleOrGroup["group_switch_value"])) {
+                        case 'user':
+                            // donothing
+                            break;
+                        case 'group':
+                            $authGroups = UsersService::listChildrenGroups($baseGroup);
+                            foreach ($authGroups as $gId => $gName) {
+                                $allGroups["AJXP_GRP_" . rtrim($baseGroup, "/")."/".ltrim($gId, "/")] = $gName;
+                            }
+                            break;
+                        case 'role':
+                            $allGroups = $this->getUserRoleList($loggedUser, $rolePrefix, $includeString, $excludeString, $listRoleType);
+                            break;
+                        case 'rolegroup';
+                            $groups = [];
+                            $authGroups = UsersService::listChildrenGroups($baseGroup);
+                            foreach ($authGroups as $gId => $gName) {
+                                $groups["AJXP_GRP_" . rtrim($baseGroup, "/")."/".ltrim($gId, "/")] = $gName;
+                            }
+                            $roles = $this->getUserRoleList($loggedUser, $rolePrefix, $includeString, $excludeString, $listRoleType);
+
+                            empty($groups) ? $allGroups = $roles : (empty($roles) ? $allGroups = $groups : $allGroups = array_merge($groups, $roles));
+                            //$allGroups = array_merge($groups, $roles);
+                            break;
+                        default;
+                            break;
+                    }
+                }
+
+
+                $users = "";
+                $index = 0;
+                if(!empty($crtValue)){
+                    $crtValue = InputFilter::sanitize($crtValue, InputFilter::SANITIZE_HTML_STRICT);
+                }
+                if ($regexp != null && (!count($allUsers) || (!empty($crtValue) && !array_key_exists(strtolower($crtValue), $allUsers)))  && ConfService::getContextConf($ctx, "USER_CREATE_USERS", "conf") && !$existingOnly) {
+                    $users .= "<li class='complete_user_entry_temp' data-temporary='true' data-label=\"".StringHelper::xmlEntities($crtValue)."\"><span class='user_entry_label'>".StringHelper::xmlEntities($crtValue." (".$mess["448"]).")</span></li>";
+                } else if ($existingOnly && !empty($crtValue)) {
+                    $users .= "<li class='complete_user_entry_temp' data-temporary='true' data-label=\"".StringHelper::xmlEntities($crtValue)."\" data-entry_id=\"".StringHelper::xmlEntities($crtValue)."\"><span class='user_entry_label'>".StringHelper::xmlEntities($crtValue)."</span></li>";
+                }
+                $mess = LocaleService::getMessages();
+                if (!$usersOnly && (empty($regexp)  ||  preg_match($pregexp, $mess["447"]))) {
+                    $users .= "<li class='complete_group_entry' data-group='AJXP_GRP_/' data-label=\"".StringHelper::xmlEntities($mess["447"])."\"><span class='user_entry_label'>".StringHelper::xmlEntities($mess["447"])."</span></li>";
+                }
+                $indexGroup = 0;
+                if (!$usersOnly && isset($allGroups) && is_array($allGroups)) {
+                    foreach ($allGroups as $groupId => $groupLabel) {
+                        if ($regexp == null ||  preg_match($pregexp, $groupLabel)) {
+                            $groupLabel = StringHelper::xmlEntities($groupLabel);
+                            $users .= "<li class='complete_group_entry' data-group='$groupId' data-label=\"".$groupLabel."\" data-entry_id='$groupId'><span class='user_entry_label'>".$groupLabel."</span></li>";
+                            $indexGroup++;
+                        }
+                        if($indexGroup == $limit) break;
+                    }
+                }
+                if (method_exists($this, "listUserTeams") && !$usersOnly) {
+                    $teams = $this->listUserTeams($ctx->getUser());
+                    foreach ($teams as $tId => $tData) {
+                        if($regexp == null  ||  preg_match($pregexp, $tData["LABEL"])){
+                            $teamLabel = StringHelper::xmlEntities($tData["LABEL"]);
+                            $users.= "<li class='complete_group_entry' data-group='/AJXP_TEAM/$tId' data-label=\"[team] ".$teamLabel."\"><span class='user_entry_label'>[team] ".$teamLabel."</span></li>";
+                        }
+                    }
+                }
+                foreach ($allUsers as $userId => $userObject) {
+                    if($userObject->getId() == $loggedUser->getId()) continue;
+                    if ( ( !$userObject->hasParent() &&  ConfService::getContextConf($ctx, "ALLOW_CROSSUSERS_SHARING", "conf")) || $userObject->getParent() == $loggedUser->getId() ) {
+                        $userLabel = UsersService::getUserPersonalParameter("USER_DISPLAY_NAME", $userObject, "core.conf", $userId);
+                        $userAvatar = UsersService::getUserPersonalParameter("avatar", $userObject, "core.conf", "");
+                        //if($regexp != null && ! (preg_match("/$regexp/i", $userId) || preg_match("/$regexp/i", $userLabel)) ) continue;
+                        $userDisplay = ($userLabel == $userId ? $userId : $userLabel . " ($userId)");
+                        if (ConfService::getContextConf($ctx, "USERS_LIST_HIDE_LOGIN", "conf") == true && $userLabel != $userId) {
+                            $userDisplay = $userLabel;
+                        }
+                        $userIsExternal = $userObject->hasParent() ? "true":"false";
+                        $userLabel = StringHelper::xmlEntities($userLabel);
+                        $userDisplay = StringHelper::xmlEntities($userDisplay);
+                        $users .= "<li class='complete_user_entry' data-external=\"$userIsExternal\" data-label=\"".$userLabel."\" data-avatar='$userAvatar' data-entry_id='$userId'><span class='user_entry_label'>".$userDisplay."</span></li>";
+                        $index ++;
+                    }
+                    if($index == $limit) break;
+                }
+                print("<ul>".$users."</ul>");
+
+                break;
+
+            case "load_repository_info":
+
+                $data = [];
+                $repo = $ctx->getRepository();
+                if($repo != null){
+                    $users = UsersService::countUsersForRepository($ctx, $repo->getId(), true);
+                    $data["core.users"] = $users;
+                    if(isSet($httpVars["collect"]) && $httpVars["collect"] == "true"){
+                        Controller::applyHook("repository.load_info", [$ctx, &$data]);
+                    }
+                }
+
+                $responseInterface = $responseInterface->withHeader("Content-type", "application/json");
+                $responseInterface->getBody()->write(json_encode($data));
+                break;
+
+            case "get_binary_param" :
+
+                if (isSet($httpVars["tmp_file"])) {
+                    $file = ApplicationState::getAjxpTmpDir() ."/". InputFilter::securePath($httpVars["tmp_file"]);
+                    if (isSet($file)) {
+                        session_write_close();
+                        header("Content-Type:image/png");
+                        readfile($file);
+                    }
+                } else if (isSet($httpVars["binary_id"])) {
+                    if (isSet($httpVars["user_id"]) && $loggedUser != null
+                        && ( $loggedUser->getId() == $httpVars["user_id"] || $loggedUser->isAdmin() )) {
+                        $context = ["USER" => InputFilter::sanitize($httpVars["user_id"], InputFilter::SANITIZE_EMAILCHARS)];
+                    } else if($loggedUser !== null) {
+                        $context = ["USER" => $loggedUser->getId()];
+                    } else {
+                        $context = [];
+                    }
+                    session_write_close();
+                    $this->loadBinary($context, InputFilter::sanitize($httpVars["binary_id"], InputFilter::SANITIZE_ALPHANUM));
+                }
+            break;
+
+            case "get_global_binary_param" :
+
+                session_write_close();
+                if (isSet($httpVars["tmp_file"])) {
+                    $file = ApplicationState::getAjxpTmpDir() ."/". InputFilter::securePath($httpVars["tmp_file"]);
+                    if (isSet($file)) {
+                        header("Content-Type:image/png");
+                        readfile($file);
+                    }
+                } else if (isSet($httpVars["binary_id"])) {
+                    $this->loadBinary([], InputFilter::sanitize($httpVars["binary_id"], InputFilter::SANITIZE_ALPHANUM));
+                }
+            break;
+
+            case "store_binary_temp" :
+
+                $uploadedFiles = $requestInterface->getUploadedFiles();
+                if (count($uploadedFiles)) {
+                    /**
+                     * @var UploadedFileInterface $boxData
+                     */
+                    $boxData = array_shift($uploadedFiles);
+                    $err = InputFilter::parseFileDataErrors($boxData);
+                    if ($err != null) {
+
+                    } else {
+                        $rand = substr(md5(time()), 0, 6);
+                        $tmp = $rand."-". $boxData->getClientFilename();
+                        $boxData->moveTo(ApplicationState::getAjxpTmpDir() . "/" . $tmp);
+                    }
+                }
+                if (isSet($tmp) && file_exists(ApplicationState::getAjxpTmpDir() ."/".$tmp)) {
+                    print('<script type="text/javascript">');
+                    print('parent.formManagerHiddenIFrameSubmission("'.$tmp.'");');
+                    print('</script>');
+                }
+
+                break;
+            default;
+            break;
+        }
+
+    }
+
+    /**
+     * @param UserInterface $userObject
+     * @param string $rolePrefix get all roles with prefix
+     * @param string $includeString get roles in this string
+     * @param string $excludeString eliminate roles in this string
+     * @param bool $byUserRoles
+     * @return array
+     */
+    public function getUserRoleList($userObject, $rolePrefix, $includeString, $excludeString, $byUserRoles = false)
+    {
+        if (!$userObject){
+            return [];
+        }
+        if ($byUserRoles) {
+            $allUserRoles = $userObject->getRoles();
+        } else {
+            $allUserRoles = RolesService::getRolesList([], true);
+        }
+        $allRoles = [];
+        if (isset($allUserRoles)) {
+
+            // Exclude
+            if ($excludeString) {
+                if (strpos($excludeString, "preg:") !== false) {
+                    $matchFilterExclude = "/" . str_replace("preg:", "", $excludeString) . "/i";
+                } else {
+                    $valueFiltersExclude = array_map("trim", explode(",", $excludeString));
+                    $valueFiltersExclude = array_map("strtolower", $valueFiltersExclude);
+                }
+            }
+
+            // Include
+            if ($includeString) {
+                if (strpos($includeString, "preg:") !== false) {
+                    $matchFilterInclude = "/" . str_replace("preg:", "", $includeString) . "/i";
+                } else {
+                    $valueFiltersInclude = array_map("trim", explode(",", $includeString));
+                    $valueFiltersInclude = array_map("strtolower", $valueFiltersInclude);
+                }
+            }
+
+            foreach ($allUserRoles as $roleId => $role) {
+                if (!empty($rolePrefix) && strpos($roleId, $rolePrefix) === false) continue;
+                if (isSet($matchFilterExclude) && preg_match($matchFilterExclude, substr($roleId, strlen($rolePrefix)))) continue;
+                if (isSet($valueFiltersExclude) && in_array(strtolower(substr($roleId, strlen($rolePrefix))), $valueFiltersExclude)) continue;
+                if (isSet($matchFilterInclude) && !preg_match($matchFilterInclude, substr($roleId, strlen($rolePrefix)))) continue;
+                if (isSet($valueFiltersInclude) && !in_array(strtolower(substr($roleId, strlen($rolePrefix))), $valueFiltersInclude)) continue;
+                if($role instanceof AJXP_Role) $roleObject = $role;
+                else $roleObject = RolesService::getRole($roleId);
+                $label = $roleObject->getLabel();
+                $label = !empty($label) ? $label : substr($roleId, strlen($rolePrefix));
+                $allRoles[$roleId] = $label;
+            }
+        }
+        return $allRoles;
+    }
+
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     */
+    public function publishPermissionsMask(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface){
+        $mask = [];
+        /** @var ContextInterface $ctx */
+        $ctx = $requestInterface->getAttribute("ctx");
+        $user = $ctx->getUser();
+
+        if(!UsersService::usersEnabled() || $user == null){
+            $responseInterface = new JsonResponse($mask);
+            return $responseInterface;
+        }
+        $repoId = $ctx->getRepositoryId();
+        $role = $user->getMergedRole();
+        if($role->hasMask($repoId)){
+            $fullMask = $role->getMask($repoId);
+            foreach($fullMask->flattenTree() as $path => $permission){
+                // Do not show if "deny".
+                if($permission->denies()) continue;
+                $mask[$path] = [
+                    "read" => $permission->canRead(),
+                    "write" => $permission->canWrite()
+                ];
+            }
+        }
+        $responseInterface = new JsonResponse($mask);
+        return $responseInterface;
+
+    }
+}
diff --git a/core/src/plugins/core.conf/AbstractUser.php b/core/src/plugins/core.conf/AbstractUser.php
new file mode 100644
index 0000000000..1ae8ea2ca1
--- /dev/null
+++ b/core/src/plugins/core.conf/AbstractUser.php
@@ -0,0 +1,820 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Conf\Core;
+
+use Pydio\Core\Model\RepositoryInterface;
+use Pydio\Core\Model\UserInterface;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Services\RolesService;
+use Pydio\Core\Services\UsersService;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Abstract class to be extended by conf.* implementations
+ * @package Pydio\Conf\Core
+ */
+abstract class AbstractUser implements UserInterface
+{
+    /**
+     * @var string
+     */
+    public $id;
+    public $hasAdmin = false;
+    public $rights;
+    /**
+     * @var AJXP_Role[]
+     */
+    public $roles;
+    public $prefs;
+    public $bookmarks;
+    public $version;
+    /**
+     * @var string
+     */
+    public $parentUser;
+    /**
+     * @var bool
+     */
+    protected $hidden;
+
+    /**
+     * Set user as "hidden" ( = shared )
+     * @param bool $hidden
+     */
+    public function setHidden($hidden)
+    {
+        $this->hidden = $hidden;
+    }
+
+    /**
+     * Check if user is hidden
+     * @return bool
+     */
+    public function isHidden()
+    {
+        return $this->hidden;
+    }
+
+    public $groupPath = "/";
+    /**
+     * @var AJXP_Role
+     */
+    public $mergedRole;
+
+    /**
+     * @var AJXP_Role
+     */
+    public $parentRole;
+
+    /**
+     * @var AJXP_Role Accessible for update
+     */
+    public $personalRole;
+
+    /**
+     * Conf Storage implementation
+     *
+     * @var AbstractConfDriver
+     */
+    public $storage;
+
+    /**
+     * AbstractUser constructor.
+     * @param $id
+     * @param null $storage
+     */
+    public function __construct($id, $storage=null)
+    {
+        $this->id = $id;
+        if ($storage == null) {
+            $storage = ConfService::getConfStorageImpl();
+        }
+        $this->storage = $storage;
+        $this->load();
+    }
+
+    /**
+     * @return string
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param string $id
+     */
+    public function setId($id)
+    {
+        $this->id = $id ;
+    }
+
+    /**
+     *
+     */
+    public function storageExists(){
+    }
+
+    /**
+     * @param AJXP_Role $roleObject
+     * @throws \Exception
+     */
+    public function addRole($roleObject)
+    {
+        if (isSet($this->roles[$roleObject->getId()])) {
+            // Role may have been updated, but ajxp.roles does not need reload.
+            $this->roles[$roleObject->getId()] = $roleObject;
+            $this->recomputeMergedRole();
+            return;
+        }
+        if(!isSet($this->rights["ajxp.roles"])) $this->rights["ajxp.roles"] = array();
+        $this->rights["ajxp.roles"][$roleObject->getId()] = true;
+        if(!isSet($this->rights["ajxp.roles.order"])){
+            $this->rights["ajxp.roles.order"] = array();
+        }
+        $this->rights["ajxp.roles.order"][$roleObject->getId()] = count($this->rights["ajxp.roles"]);
+        if($roleObject->alwaysOverrides()){
+            if(!isSet($this->rights["ajxp.roles.sticky"])){
+                $this->rights["ajxp.roles.sticky"] = array();
+            }
+            $this->rights["ajxp.roles.sticky"][$roleObject->getId()] = true;
+        }
+        uksort($this->rights["ajxp.roles"], array($this, "orderRoles"));
+        $this->roles[$roleObject->getId()] = $roleObject;
+        $this->recomputeMergedRole();
+    }
+
+    /**
+     * @param string $roleId
+     * @throws \Exception
+     */
+    public function removeRole($roleId)
+    {
+        if (isSet($this->rights["ajxp.roles"]) && isSet($this->rights["ajxp.roles"][$roleId])) {
+            unset($this->rights["ajxp.roles"][$roleId]);
+            if(isSet($this->roles[$roleId])) unset($this->roles[$roleId]);
+            if(isSet($this->rights["ajxp.roles.sticky"]) && isSet($this->rights["ajxp.roles.sticky"][$roleId])){
+                unset($this->rights["ajxp.roles.sticky"][$roleId]);
+            }
+            if(isset($this->rights["ajxp.roles.order"]) && isset($this->rights["ajxp.roles.order"][$roleId])){
+                $previousPos = $this->rights["ajxp.roles.order"][$roleId];
+                $ordered = array_flip($this->rights["ajxp.roles.order"]);
+                ksort($ordered);
+                unset($ordered[$previousPos]);
+                $reordered = array();
+                $p = 0;
+                foreach($ordered as $id) {
+                    $reordered[$id] = $p;
+                    $p++;
+                }
+                $this->rights["ajxp.roles.order"] = $reordered;
+            }
+            uksort($this->rights["ajxp.roles"], array($this, "orderRoles"));
+        }
+        $this->recomputeMergedRole();
+    }
+
+    /**
+     * @param array $orderedRolesIds
+     */
+    public function updateRolesOrder($orderedRolesIds){
+        // check content
+        $saveRoleOrders = array();
+        foreach($orderedRolesIds as $position => $rId){
+            if(isSet($this->rights["ajxp.roles"][$rId])) $saveRoleOrders[$rId] = $position;
+        }
+        $this->rights["ajxp.roles.order"] = $saveRoleOrders;
+    }
+
+    /**
+     * @return array
+     */
+    public function getRoles()
+    {
+        if (isSet($this->rights["ajxp.roles"])) {
+            uksort($this->rights["ajxp.roles"], array($this, "orderRoles"));
+            return $this->rights["ajxp.roles"];
+        } else {
+            return array();
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function getProfile()
+    {
+        if (isSet($this->rights["ajxp.profile"])) {
+            return $this->rights["ajxp.profile"];
+        }
+        if($this->isAdmin()) return "admin";
+        if($this->hasParent()) return "shared";
+        if($this->getId() == "guest") return "guest";
+        return "standard";
+    }
+
+    /**
+     * @param string $profile
+     */
+    public function setProfile($profile)
+    {
+        $this->rights["ajxp.profile"] = $profile;
+    }
+
+    /**
+     * @param string $lockAction
+     * @throws \Exception
+     */
+    public function setLock($lockAction)
+    {
+        $sLock = $this->getLock();
+        $currentLocks = !empty($sLock) ? explode(",", $sLock) : [] ;
+        if(!in_array($lockAction, $currentLocks)){
+            array_unshift($currentLocks, $lockAction);
+        }
+        $locks = implode(",", $currentLocks);
+        $this->personalRole->setParameterValue('core.conf', 'USER_LOCK_ACTION', $locks);
+        $this->recomputeMergedRole();
+    }
+
+    /**
+     * @param $lockAction
+     * @throws \Exception
+     */
+    public function removeLock($lockAction)
+    {
+        $sLock = $this->getLock();
+        $currentLocks = !empty($sLock) ? explode(",", $sLock) : [] ;
+        $pos = array_search($lockAction, $currentLocks);
+        if($pos !== false){
+            unset($currentLocks[$pos]);
+        }
+        $this->rights["ajxp.lock"] = !count($currentLocks) ? false: implode(",", $currentLocks);
+        $newValue = !count($currentLocks) ? AJXP_VALUE_CLEAR : implode(",", $currentLocks);
+        $this->personalRole->setParameterValue('core.conf', 'USER_LOCK_ACTION', $newValue);
+        $this->recomputeMergedRole();
+    }
+
+    /**
+     * @return bool|mixed
+     */
+    public function getLock()
+    {
+        if(AJXP_SERVER_DEBUG && $this->isAdmin() && $this->getGroupPath() === "/") return false;
+        if (!empty($this->rights["ajxp.lock"])) {
+            return $this->rights["ajxp.lock"];
+        }
+        return $this->mergedRole->filterParameterValue('core.conf', 'USER_LOCK_ACTION', AJXP_REPO_SCOPE_ALL, false);
+    }
+
+    /**
+     * @param $lockAction
+     * @return string|false
+     */
+    public function hasLockByName($lockAction){
+        $sLock = $this->getLock();
+        $currentLocks = !empty($sLock) ? explode(",", $sLock) : [] ;
+        return array_search($lockAction, $currentLocks) !== false;
+    }
+
+
+    /**
+     * @return bool
+     */
+    public function isAdmin()
+    {
+        return $this->hasAdmin;
+    }
+
+    /**
+     * @param bool $boolean
+     */
+    public function setAdmin($boolean)
+    {
+        $this->hasAdmin = $boolean;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasParent()
+    {
+        return isSet($this->parentUser);
+    }
+
+    /**
+     * @param string $user
+     */
+    public function setParent($user)
+    {
+        $this->parentUser = $user;
+    }
+
+    /**
+     * @return string
+     */
+    public function getParent()
+    {
+        return $this->parentUser;
+    }
+
+    /**
+     * @param string $repositoryId
+     * @return bool
+     */
+    public function canRead($repositoryId)
+    {
+        if($this->getLock() != false) return false;
+        return $this->mergedRole->canRead($repositoryId);
+    }
+
+    /**
+     * @param string $repositoryId
+     * @return bool
+     */
+    public function canWrite($repositoryId)
+    {
+        if($this->getLock() != false) return false;
+        return $this->mergedRole->canWrite($repositoryId);
+    }
+
+    /**
+     * @param RepositoryInterface|string $idOrObject
+     * @return bool
+     */
+    public function canAccessRepository($idOrObject){
+        if($idOrObject instanceof RepositoryInterface){
+            $repository = RepositoryService::getRepositoryById($idOrObject);
+            if(empty($repository)) return false;
+        }else{
+            $repository = $idOrObject;
+        }
+        return RepositoryService::repositoryIsAccessible($repository, $this, false, true);
+    }
+
+    /**
+     * @param int $repositoryId
+     * @return bool
+     */
+    public function canSwitchTo($repositoryId)
+    {
+        $repositoryObject = RepositoryService::getRepositoryById($repositoryId);
+        if($repositoryObject == null) return false;
+        return RepositoryService::repositoryIsAccessible($repositoryObject, $this, false, true);
+    }
+
+    /**
+     * @param $prefName
+     * @return mixed|string
+     */
+    public function getPref($prefName)
+    {
+        if ($prefName == "lang") {
+            // Migration path
+            if (isSet($this->mergedRole)) {
+                $l = $this->mergedRole->filterParameterValue("core.conf", "lang", AJXP_REPO_SCOPE_ALL, "");
+                if($l != "") return $l;
+            }
+        }
+        if(isSet($this->prefs[$prefName])) return $this->prefs[$prefName];
+        return "";
+    }
+
+    /**
+     * @param $prefName
+     * @param $prefValue
+     */
+    public function setPref($prefName, $prefValue)
+    {
+        $this->prefs[$prefName] = $prefValue;
+    }
+
+    /**
+     * @param string $prefName
+     * @param string $prefPath
+     * @param mixed $prefValue
+     */
+    public function setArrayPref($prefName, $prefPath, $prefValue)
+    {
+        $data = $this->getPref($prefName);
+        if(!is_array($data)){
+            $data = array();
+        }
+        $data[$prefPath] = $prefValue;
+        $this->setPref($prefName, $data);
+    }
+
+    /**
+     * @param $prefName
+     * @param $prefPath
+     * @return mixed|string
+     */
+    public function getArrayPref($prefName, $prefPath)
+    {
+        $prefArray = $this->getPref($prefName);
+        if(empty($prefArray) || !is_array($prefArray) || !isSet($prefArray[$prefPath])) return "";
+        return $prefArray[$prefPath];
+    }
+
+    /**
+     * @param $repositoryId
+     * @param string $path
+     * @param string $title
+     */
+    public function addBookmark($repositoryId, $path, $title)
+    {
+        if(!isSet($this->bookmarks)) $this->bookmarks = array();
+        if(!isSet($this->bookmarks[$repositoryId])) $this->bookmarks[$repositoryId] = array();
+        foreach ($this->bookmarks[$repositoryId] as $v) {
+            $toCompare = "";
+            if(is_string($v)) $toCompare = $v;
+            else if(is_array($v)) $toCompare = $v["PATH"];
+            if($toCompare == trim($path)) return ; // RETURN IF ALREADY HERE!
+        }
+        $this->bookmarks[$repositoryId][] = array("PATH"=>trim($path), "TITLE"=>$title);
+    }
+
+    /**
+     * @param string $repositoryId
+     * @param string $path
+     */
+    public function removeBookmark($repositoryId, $path)
+    {
+        if(isSet($this->bookmarks)
+            && isSet($this->bookmarks[$repositoryId])
+            && is_array($this->bookmarks[$repositoryId]))
+            {
+                foreach ($this->bookmarks[$repositoryId] as $k => $v) {
+                    $toCompare = "";
+                    if(is_string($v)) $toCompare = $v;
+                    else if(is_array($v)) $toCompare = $v["PATH"];
+                    if($toCompare == trim($path)) unset($this->bookmarks[$repositoryId][$k]);
+                }
+            }
+    }
+
+    /**
+     * @param string $repositoryId
+     * @param string $path
+     * @param string $title
+     */
+    public function renameBookmark($repositoryId, $path, $title)
+    {
+        if(isSet($this->bookmarks)
+            && isSet($this->bookmarks[$repositoryId])
+            && is_array($this->bookmarks[$repositoryId]))
+            {
+                foreach ($this->bookmarks[$repositoryId] as $k => $v) {
+                    $toCompare = "";
+                    if(is_string($v)) $toCompare = $v;
+                    else if(is_array($v)) $toCompare = $v["PATH"];
+                    if ($toCompare == trim($path)) {
+                         $this->bookmarks[$repositoryId][$k] = array("PATH"=>trim($path), "TITLE"=>$title);
+                    }
+                }
+            }
+    }
+
+    /**
+     * @param $repositoryId
+     * @return array
+     */
+    public function getBookmarks($repositoryId)
+    {
+        if(isSet($this->bookmarks)
+            && isSet($this->bookmarks[$repositoryId]))
+            return $this->bookmarks[$repositoryId];
+        return array();
+    }
+
+    /**
+     * @return mixed
+     */
+    abstract public function load();
+
+    /**
+     * @param string $context
+     */
+    public function save($context = "superuser"){
+        $this->_save($context);
+        UsersService::updateUser($this, $context);
+    }
+
+    /**
+     * @param string $context
+     * @return mixed
+     */
+    abstract protected function _save($context = "superuser");
+
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    abstract public function getTemporaryData($key);
+
+    /**
+     * @param string $key
+     * @param mixed $value
+     * @return mixed
+     */
+    abstract public function saveTemporaryData($key, $value);
+
+    /**
+     * @param String $groupPath
+     * @param bool $update
+     */
+    public function setGroupPath($groupPath, $update = false)
+    {
+        if(strlen($groupPath) > 1) $groupPath = rtrim($groupPath, "/");
+        $this->groupPath = $groupPath;
+    }
+
+    /**
+     * @return null|string
+     */
+    public function getGroupPath()
+    {
+        if(!isSet($this->groupPath)) return null;
+        return $this->groupPath;
+    }
+
+
+    /**
+     * Automatically set the group to the current user base
+     * @param $baseGroup
+     * @return string
+     */
+    public function getRealGroupPath($baseGroup)
+    {
+        // make sure it starts with a slash.
+        $baseGroup = "/".ltrim($baseGroup, "/");
+        $groupPath = $this->getGroupPath();
+        if(empty($groupPath)) $groupPath = "/";
+        if ($groupPath != "/") {
+            if($baseGroup == "/") return $groupPath;
+            else return $groupPath.$baseGroup;
+        } else {
+            return $baseGroup;
+        }
+    }
+
+    /**
+     * Check if the current user can administrate the GroupPathProvider object
+     * @param IGroupPathProvider $provider
+     * @return bool
+     */
+    public function canAdministrate(IGroupPathProvider $provider)
+    {
+        $pGP = $provider->getGroupPath();
+        if(empty($pGP)) $pGP = "/";
+        if($this->getGroupPath() == null) return true;
+        return (strpos($pGP, $this->getGroupPath(), 0) === 0);
+    }
+
+    /**
+     * Check if the current user can assign administration for the GroupPathProvider object
+     * @param IGroupPathProvider $provider
+     * @return bool
+     */
+    public function canSee(IGroupPathProvider $provider)
+    {
+        $pGP = $provider->getGroupPath();
+        if(empty($pGP)) $pGP = "/";
+        if($this->getGroupPath() == null || $pGP == null) return true;
+        return (strpos($this->getGroupPath(), $pGP, 0) === 0);
+    }
+
+    public function recomputeMergedRole()
+    {
+        if (!count($this->roles)) {
+            throw new \Exception("Empty role, this is not normal");
+        }
+        uksort($this->roles, array($this, "orderRoles"));
+        $keys = array_keys($this->roles);
+        $this->mergedRole =  clone $this->roles[array_shift($keys)];
+        if (count($this->roles) > 1) {
+            $this->parentRole = $this->mergedRole;
+        }
+        $index = 0;
+        foreach ($this->roles as $role) {
+            if ($index > 0) {
+                $this->mergedRole = $role->override($this->mergedRole);
+                if($index < count($this->roles) -1 ) $this->parentRole = $role->override($this->parentRole);
+            }
+            $index ++;
+        }
+        if ($this->hasParent() && isSet($this->parentRole)) {
+            // It's a shared user, we don't want it to inherit the rights...
+            $this->parentRole->clearAcls();
+            //... but we want the parent user's role, filtered with inheritable properties only.
+            $stretchedParentUserRole = RolesService::limitedRoleFromParent($this->parentUser);
+            if ($stretchedParentUserRole !== null) {
+                $this->parentRole = $stretchedParentUserRole->override($this->parentRole);  //$this->parentRole->override($stretchedParentUserRole);
+                // REAPPLY SPECIFIC "SHARED" ROLES
+                foreach ($this->roles as $role) {
+                    if(! $role->autoAppliesTo("shared")) continue;
+                    $this->parentRole = $role->override($this->parentRole);
+                }
+            }
+            $this->mergedRole = $this->personalRole->override($this->parentRole);  // $this->parentRole->override($this->personalRole);
+        }
+    }
+
+    /**
+     * @return AJXP_Role
+     */
+    public function getMergedRole()
+    {
+        return $this->mergedRole;
+    }
+
+    /**
+     * @return AJXP_Role
+     */
+    public function getPersonalRole()
+    {
+        return $this->personalRole;
+    }
+
+    /**
+     * @param AJXP_Role $role
+     */
+    public function updatePersonalRole(AJXP_Role $role)
+    {
+        $this->personalRole = $role;
+    }
+
+    /**
+     * @return int
+     */
+    protected function migrateRightsToPersonalRole()
+    {
+        $changes = 0;
+        $this->personalRole = new AJXP_Role("AJXP_USR_"."/".$this->id);
+        $this->roles["AJXP_USR_"."/".$this->id] = $this->personalRole;
+        foreach ($this->rights as $rightKey => $rightValue) {
+            if ($rightKey == "ajxp.actions" && is_array($rightValue)) {
+                foreach ($rightValue as $repoId => $repoData) {
+                    foreach ($repoData as $actionName => $actionState) {
+                        $this->personalRole->setActionState("plugin.all", $actionName, $repoId, $actionState);
+                        $changes++;
+                    }
+                }
+                unset($this->rights[$rightKey]);
+            }
+            if(strpos($rightKey, "ajxp.") === 0) continue;
+            $this->personalRole->setAcl($rightKey, $rightValue);
+            $changes++;
+            unset($this->rights[$rightKey]);
+        }
+        // Move old CUSTOM_DATA values to personal role parameter
+        $customValue = $this->getPref("CUSTOM_PARAMS");
+        $custom = ConfService::getConfStorageImpl()->getOption("CUSTOM_DATA");
+        if (is_array($custom) && count($custom)) {
+            foreach ($custom as $key => $value) {
+                if (isSet($customValue[$key])) {
+                    $this->personalRole->setParameterValue(ConfService::getConfStorageImpl()->getId(), $key, $customValue[$key]);
+                }
+            }
+        }
+
+        // Move old WALLET values to personal role parameter
+        $wallet = $this->getPref("AJXP_WALLET");
+        if (is_array($wallet) && count($wallet)) {
+            foreach ($wallet as $repositoryId => $walletData) {
+                $repoObject = RepositoryService::getRepositoryById($repositoryId);
+                if($repoObject == null) continue;
+                $accessType = "access.".$repoObject->getAccessType();
+                foreach ($walletData as $paramName => $paramValue) {
+                    $this->personalRole->setParameterValue($accessType, $paramName, $paramValue, $repositoryId);
+                }
+            }
+        }
+        return $changes;
+    }
+
+    /**
+     * @param $r1
+     * @param $r2
+     * @return int
+     */
+    protected function orderRoles($r1, $r2)
+    {
+        // One group and something else
+        if(strpos($r1, "AJXP_GRP_") === 0 && strpos($r2, "AJXP_GRP_") === FALSE) return -1;
+        if(strpos($r2, "AJXP_GRP_") === 0 && strpos($r1, "AJXP_GRP_") === FALSE) return 1;
+
+        // Usr role and something else
+        if(strpos($r1, "AJXP_USR_") === 0) return 1;
+        if(strpos($r2, "AJXP_USR_") === 0) return -1;
+
+        // Two groups, sort by string, will magically keep group hierarchy
+        if(strpos($r1, "AJXP_GRP_") === 0 && strpos($r2, "AJXP_GRP_") === 0) {
+            return strcmp($r1,$r2);
+        }
+
+        // Two roles: if sticky and something else, always last.
+        if(isSet($this->rights["ajxp.roles.sticky"])){
+            $sticky = $this->rights["ajxp.roles.sticky"];
+            if(isSet($sticky[$r1]) && !isSet($sticky[$r2])){
+                return 1;
+            }
+            if(isSet($sticky[$r2]) && !isSet($sticky[$r1])){
+                return -1;
+            }
+        }
+
+        // Two roles - Try to get sorting order
+        if(isSet($this->rights["ajxp.roles.order"])){
+            return $this->rights["ajxp.roles.order"][$r1] - $this->rights["ajxp.roles.order"][$r2];
+        }else{
+            return strcmp($r1,$r2);
+        }
+    }
+
+    /**
+     * @param array $roles
+     * @param boolean $checkBoolean
+     * @return array
+     */
+    protected function filterRolesForSaving($roles, $checkBoolean)
+    {
+        $res = array();
+        foreach ($roles as $rName => $status) {
+            if($checkBoolean &&  !$status) continue;
+            if(strpos($rName, "AJXP_GRP_/") === 0) continue;
+            $res[$rName] = $status;
+        }
+        return $res;
+    }
+
+    protected $lastSessionSerialization = 0;
+
+    /**
+     * @return array
+     */
+    public function getRolesKeys(){
+        return array_keys($this->roles);
+    }
+
+    /**
+     * @return array
+     */
+    public function __sleep(){
+        $this->lastSessionSerialization = time();
+        return array("id", "hasAdmin", "rights", "prefs", "bookmarks", "version", "roles", "parentUser", "hidden", "groupPath", "personalRole", "lastSessionSerialization");
+    }
+
+    public function __wakeup(){
+        $this->storage = ConfService::getConfStorageImpl();
+        if(!is_object($this->personalRole)){
+            $this->personalRole = RolesService::getRole("AJXP_USR_/" . $this->getId());
+        }
+        $this->recomputeMergedRole();
+    }
+
+    /**
+     * @return bool
+     * @throws \Exception
+     */
+    public function reloadRolesIfRequired(){
+        if($this->lastSessionSerialization && count($this->roles)
+            && $this->storage->rolesLastUpdated(array_keys($this->roles)) > $this->lastSessionSerialization){
+
+            $newRoles = RolesService::getRolesList(array_keys($this->roles));
+            foreach($newRoles as $rId => $newRole){
+                if(strpos($rId, "AJXP_USR_/") === 0){
+                    $this->personalRole = $newRole;
+                    $this->roles[$rId] = $this->personalRole;
+                }else{
+                    $this->roles[$rId] = $newRole;
+                }
+            }
+            $this->recomputeMergedRole();
+            return true;
+
+        }
+        return false;
+    }
+
+}
diff --git a/core/src/plugins/core.conf/AjxpRole.php b/core/src/plugins/core.conf/AjxpRole.php
new file mode 100644
index 0000000000..8b596ea30e
--- /dev/null
+++ b/core/src/plugins/core.conf/AjxpRole.php
@@ -0,0 +1,190 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Conf\Core;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Authentication "role" concept : set of permissions that can be applied to
+ * one or more users, plus set of actions to be disabled.
+ * @package Pydio
+ * @subpackage Core
+ * @deprecated use AJXP_Role instead. Still present in package for automatic migration.
+ */
+class AjxpRole implements IGroupPathProvider
+{
+    private $id;
+    private $rights = array();
+    private $default = false;
+    /**
+     * @var String
+     */
+    protected $groupPath;
+    /**
+     * Constructor
+     * @param string $id
+     * @return void
+     */
+    public function __construct($id)
+    {
+        $this->id = $id;
+    }
+    /**
+     * @param $id
+     * @return void
+     */
+    public function setId($id)
+    {
+        $this->id = $id;
+    }
+    /**
+     * @return string
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+    /**
+     * Whether this role can read the given repo
+     * @param string $rootDirId Repository ID
+     * @return bool
+     */
+    public function canRead($rootDirId)
+    {
+        $right = $this->getRight($rootDirId);
+        if($right == "rw" || $right == "r") return true;
+        return false;
+    }
+
+    /**
+     * Whether this role can write the given repo
+     * @param string $rootDirId Repository ID
+     * @return bool
+     */
+    public function canWrite($rootDirId)
+    {
+        $right = $this->getRight($rootDirId);
+        if($right == "rw" || $right == "w") return true;
+        return false;
+    }
+
+    /**
+     * Current definitioon (r, rw, w, empty string) for the given repo
+     * @param string $rootDirId Repository ID
+     * @return string
+     */
+    public function getRight($rootDirId)
+    {
+        if(isSet($this->rights[$rootDirId])) return $this->rights[$rootDirId];
+        return "";
+    }
+
+    /**
+     * Set the right
+     * @param string $rootDirId Repo id
+     * @param string $rightString ("r", "rw", "w", "")
+     * @return void
+     */
+    public function setRight($rootDirId, $rightString)
+    {
+        $this->rights[$rootDirId] = $rightString;
+    }
+    /**
+     * Remove a right entry for the repository
+     * @param string $rootDirId
+     * @return void
+     */
+    public function removeRights($rootDirId)
+    {
+        if(isSet($this->rights[$rootDirId])) unset($this->rights[$rootDirId]);
+    }
+    /**
+     * Remove all rights
+     * @return void
+     */
+    public function clearRights()
+    {
+        $this->rights = array();
+    }
+    /**
+     * Get the specific actions rights (see setSpecificActionsRights)
+     * @param $rootDirId
+     * @return array
+     */
+    public function getSpecificActionsRights($rootDirId)
+    {
+        $res = array();
+        if ($rootDirId."" != "ajxp.all") {
+            $res = $this->getSpecificActionsRights("ajxp.all");
+        }
+        if (isSet($this->rights["ajxp.actions"]) && isSet($this->rights["ajxp.actions"][$rootDirId])) {
+            $res = array_merge($res, $this->rights["ajxp.actions"][$rootDirId]);
+        }
+        return $res;
+    }
+    /**
+     * This method allows to specifically disable some actions for a given role for one or more repository.
+     * @param string $rootDirId Repository id or "ajxp.all" for all repositories
+     * @param string $actionName
+     * @param bool $allowed
+     * @return void
+     */
+    public function setSpecificActionRight($rootDirId, $actionName, $allowed)
+    {
+        if(!isSet($this->rights["ajxp.actions"])) $this->rights["ajxp.actions"] = array();
+        if(!isset($this->rights["ajxp.actions"][$rootDirId])) $this->rights["ajxp.actions"][$rootDirId] = array();
+        $this->rights["ajxp.actions"][$rootDirId][$actionName] = $allowed;
+    }
+
+    /**
+     * @param $default
+     */
+    public function setDefault($default)
+    {
+        $this->default = $default;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isDefault()
+    {
+        return $this->default;
+    }
+
+    /**
+     * @param String $groupPath
+     * @param bool $update
+     */
+    public function setGroupPath($groupPath, $update = true)
+    {
+        $this->groupPath = $groupPath;
+    }
+
+    /**
+     * @return String
+     */
+    public function getGroupPath()
+    {
+        return $this->groupPath;
+    }
+
+}
diff --git a/core/src/plugins/core.conf/CoreConfLoader.php b/core/src/plugins/core.conf/CoreConfLoader.php
new file mode 100644
index 0000000000..758f6d8528
--- /dev/null
+++ b/core/src/plugins/core.conf/CoreConfLoader.php
@@ -0,0 +1,98 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Conf\Core;
+
+use Pydio\Core\Model\Context;
+use Pydio\Core\PluginFramework\CoreInstanceProvider;
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Utils\FileHelper;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+/**
+ * @package AjaXplorer_Plugins
+ * @subpackage Core
+ */
+class CoreConfLoader extends Plugin implements CoreInstanceProvider
+{
+    /**
+     * @var AbstractConfDriver
+     */
+    protected static $confImpl;
+
+    /**
+     * @param PluginsService|null $pluginsService
+     * @return AbstractConfDriver
+     */
+    public function getImplementation($pluginsService = null)
+    {
+        if (!isSet(self::$confImpl) || (isset($this->pluginConf["UNIQUE_INSTANCE_CONFIG"]["instance_name"]) && self::$confImpl->getId() != $this->pluginConf["UNIQUE_INSTANCE_CONFIG"]["instance_name"])) {
+            if (isset($this->pluginConf["UNIQUE_INSTANCE_CONFIG"])) {
+                if($pluginsService === null){
+                    $pluginsService = PluginsService::getInstance(Context::emptyContext());
+                }
+                self::$confImpl = ConfService::instanciatePluginFromGlobalParams($this->pluginConf["UNIQUE_INSTANCE_CONFIG"], "Pydio\\Conf\\Core\\AbstractConfDriver", $pluginsService);
+            }
+        }
+        return self::$confImpl;
+
+    }
+
+    /**
+     * @return string filepath
+     */
+    public static function _getBootstrapFilePath() {
+        return Plugin::getWorkDirForPluginId("boot.conf").DIRECTORY_SEPARATOR."bootstrap.json";
+    }
+
+    /**
+     * @return array jsonData
+     */
+    public static function getBootstrapConf() {
+       return FileHelper::loadSerialFile(self::_getBootstrapFilePath(), false, "json");
+    }
+
+    /**
+     * @load json array into options
+     */
+    public static function loadBootstrapConfForPlugin($pluginId, &$options) {
+        $jsonData = self::getBootstrapConf();
+
+        if (is_array($jsonData) && isset($jsonData[$pluginId])) {
+            $options = array_merge($options, $jsonData[$pluginId]);
+        }
+    }
+
+    /**
+     * @param $jsonData
+     * @throws \Exception
+     */
+    public static function saveBootstrapConf($jsonData) {
+        $jsonPath = self::_getBootstrapFilePath();
+        if (file_exists($jsonPath)) {
+            copy($jsonPath, $jsonPath.".bak");
+        }
+        FileHelper::saveSerialFile($jsonPath, $jsonData, true, false, "json", true);
+    }
+
+}
diff --git a/core/src/plugins/core.conf/IGroupPathProvider.php b/core/src/plugins/core.conf/IGroupPathProvider.php
new file mode 100644
index 0000000000..6e824d94a3
--- /dev/null
+++ b/core/src/plugins/core.conf/IGroupPathProvider.php
@@ -0,0 +1,46 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Conf\Core;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * @package Pydio
+ * @subpackage Core
+ */
+interface IGroupPathProvider
+{
+    /**
+     * @abstract
+     * @return String
+     */
+    public function getGroupPath();
+
+
+    /**
+     * @abstract
+     * @param String $groupPath
+     * @param bool $update Save use after setting groupPath
+     * @return void
+     */
+    public function setGroupPath($groupPath, $update=true);
+
+}
diff --git a/core/src/plugins/core.conf/class.AbstractAjxpUser.php b/core/src/plugins/core.conf/class.AbstractAjxpUser.php
deleted file mode 100644
index 16c960dc60..0000000000
--- a/core/src/plugins/core.conf/class.AbstractAjxpUser.php
+++ /dev/null
@@ -1,640 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * @package AjaXplorer_Plugins
- * @subpackage Core
- * @class AbstractAjxpUser
- * @abstract
- * User abstraction, the "conf" driver must provides its own implementation
- */
-abstract class AbstractAjxpUser implements AjxpGroupPathProvider
-{
-    public $id;
-    public $hasAdmin = false;
-    public $rights;
-    /**
-     * @var AJXP_Role[]
-     */
-    public $roles;
-    public $prefs;
-    public $bookmarks;
-    public $version;
-    /**
-     * @var string
-     */
-    public $parentUser;
-    /**
-     * @var bool
-     */
-    public $resolveAsParent = false;
-    /**
-     * @var bool
-     */
-    protected $hidden;
-
-    /**
-     * @param bool $hidden
-     */
-    public function setHidden($hidden)
-    {
-        $this->hidden = $hidden;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isHidden()
-    {
-        return $this->hidden;
-    }
-
-    public $groupPath = "/";
-    /**
-     * @var AJXP_Role
-     */
-    public $mergedRole;
-
-    /**
-     * @var AJXP_Role
-     */
-    public $parentRole;
-
-    /**
-     * @var AJXP_Role Accessible for update
-     */
-    public $personalRole;
-
-    /**
-     * Conf Storage implementation
-     *
-     * @var AbstractConfDriver
-     */
-    public $storage;
-
-    public function __construct($id, $storage=null)
-    {
-        $this->id = $id;
-        if ($storage == null) {
-            $storage = ConfService::getConfStorageImpl();
-        }
-        $this->storage = $storage;
-        $this->load();
-    }
-
-    public function checkCookieString($cookieString)
-    {
-        if($this->getPref("cookie_hash") == "") return false;
-        $hashes = explode(",", $this->getPref("cookie_hash"));
-        return in_array($cookieString, $hashes);
-    }
-
-    public function invalidateCookieString($cookieString = "")
-    {
-        if($this->getPref("cookie_hash") == "") return false;
-        $hashes = explode(",", $this->getPref("cookie_hash"));
-        if(in_array($cookieString, $hashes)) $hashes = array_diff($hashes, array($cookieString));
-        $this->setPref("cookie_hash", implode(",", $hashes));
-        $this->save("user");
-    }
-
-    public function getCookieString()
-    {
-        $hashes = $this->getPref("cookie_hash");
-        if ($hashes == "") {
-            $hashes = array();
-        } else {
-            $hashes = explode(",", $hashes);
-        }
-        $newHash = md5($this->id.":".AJXP_Utils::generateRandomString());
-        array_push($hashes, $newHash);
-        $this->setPref("cookie_hash", implode(",",$hashes));
-        $this->save("user");
-        return $newHash;
-    }
-
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    public function setId($id)
-    {
-        $this->id = $id ;
-    }
-    /**
-     * @return bool
-     */
-    public function storageExists()
-    {
-    }
-
-    public function getVersion()
-    {
-        if(!isSet($this->version)) return "";
-        return $this->version;
-    }
-
-    public function setVersion($v)
-    {
-        $this->version = $v;
-    }
-
-    /**
-     * @param AJXP_Role $roleObject
-     */
-    public function addRole($roleObject)
-    {
-        if (isSet($this->roles[$roleObject->getId()])) {
-            // NOTHING SPECIAL TO DO !
-            return;
-        }
-        if(!isSet($this->rights["ajxp.roles"])) $this->rights["ajxp.roles"] = array();
-        $this->rights["ajxp.roles"][$roleObject->getId()] = true;
-        if(!isSet($this->rights["ajxp.roles.order"])){
-            $this->rights["ajxp.roles.order"] = array();
-        }
-        $this->rights["ajxp.roles.order"][$roleObject->getId()] = count($this->rights["ajxp.roles"]);
-        if($roleObject->alwaysOverrides()){
-            if(!isSet($this->rights["ajxp.roles.sticky"])){
-                $this->rights["ajxp.roles.sticky"] = array();
-            }
-            $this->rights["ajxp.roles.sticky"][$roleObject->getId()] = true;
-        }
-        uksort($this->rights["ajxp.roles"], array($this, "orderRoles"));
-        $this->roles[$roleObject->getId()] = $roleObject;
-        $this->recomputeMergedRole();
-    }
-
-    public function removeRole($roleId)
-    {
-        if (isSet($this->rights["ajxp.roles"]) && isSet($this->rights["ajxp.roles"][$roleId])) {
-            unset($this->rights["ajxp.roles"][$roleId]);
-            if(isSet($this->roles[$roleId])) unset($this->roles[$roleId]);
-            if(isSet($this->rights["ajxp.roles.sticky"]) && isSet($this->rights["ajxp.roles.sticky"][$roleId])){
-                unset($this->rights["ajxp.roles.sticky"][$roleId]);
-            }
-            if(isset($this->rights["ajxp.roles.order"]) && isset($this->rights["ajxp.roles.order"][$roleId])){
-                $previousPos = $this->rights["ajxp.roles.order"][$roleId];
-                $ordered = array_flip($this->rights["ajxp.roles.order"]);
-                ksort($ordered);
-                unset($ordered[$previousPos]);
-                $reordered = array();
-                $p = 0;
-                foreach($ordered as $id) {
-                    $reordered[$id] = $p;
-                    $p++;
-                }
-                $this->rights["ajxp.roles.order"] = $reordered;
-            }
-            uksort($this->rights["ajxp.roles"], array($this, "orderRoles"));
-        }
-        $this->recomputeMergedRole();
-    }
-
-    /**
-     * @param $orderedRolesIds Ordered array of roles ids
-     */
-    public function updateRolesOrder($orderedRolesIds){
-        // check content
-        $saveRoleOrders = array();
-        foreach($orderedRolesIds as $position => $rId){
-            if(isSet($this->rights["ajxp.roles"][$rId])) $saveRoleOrders[$rId] = $position;
-        }
-        $this->rights["ajxp.roles.order"] = $saveRoleOrders;
-    }
-
-    public function getRoles()
-    {
-        if (isSet($this->rights["ajxp.roles"])) {
-            uksort($this->rights["ajxp.roles"], array($this, "orderRoles"));
-            return $this->rights["ajxp.roles"];
-        } else {
-            return array();
-        }
-    }
-
-    public function getProfile()
-    {
-        if (isSet($this->rights["ajxp.profile"])) {
-            return $this->rights["ajxp.profile"];
-        }
-        if($this->isAdmin()) return "admin";
-        if($this->hasParent()) return "shared";
-        if($this->getId() == "guest") return "guest";
-        return "standard";
-    }
-
-    public function setProfile($profile)
-    {
-        $this->rights["ajxp.profile"] = $profile;
-    }
-
-    public function setLock($lockAction)
-    {
-        //$this->rights["ajxp.lock"] = $lockAction;
-        $this->personalRole->setParameterValue('core.conf', 'USER_LOCK_ACTION', $lockAction);
-        $this->recomputeMergedRole();
-    }
-
-    public function removeLock()
-    {
-        if(isSet($this->rights['ajxp.lock'])){
-            $this->rights["ajxp.lock"] = false;
-        }
-        $this->personalRole->setParameterValue('core.conf', 'USER_LOCK_ACTION', AJXP_VALUE_CLEAR);
-        $this->recomputeMergedRole();
-    }
-
-    public function getLock()
-    {
-        if(AJXP_SERVER_DEBUG && $this->isAdmin() && $this->getGroupPath() == "/") return false;
-        if (!empty($this->rights["ajxp.lock"])) {
-            return $this->rights["ajxp.lock"];
-        }
-        return $this->mergedRole->filterParameterValue('core.conf', 'USER_LOCK_ACTION', AJXP_REPO_SCOPE_ALL, false);
-    }
-
-    public function isAdmin()
-    {
-        return $this->hasAdmin;
-    }
-
-    public function setAdmin($boolean)
-    {
-        $this->hasAdmin = $boolean;
-    }
-
-    /**
-     * @return bool Whether the user has a parent or not
-     */
-    public function hasParent()
-    {
-        return isSet($this->parentUser);
-    }
-
-    /**
-     * @param string $user A user ID
-     */
-    public function setParent($user)
-    {
-        $this->parentUser = $user;
-    }
-
-    /**
-     * @return string Returns the ID of the parent user
-     */
-    public function getParent()
-    {
-        return $this->parentUser;
-    }
-
-    public function canRead($rootDirId)
-    {
-        if($this->getLock() != false) return false;
-        return $this->mergedRole->canRead($rootDirId);
-    }
-
-    public function canWrite($rootDirId)
-    {
-        if($this->getLock() != false) return false;
-        return $this->mergedRole->canWrite($rootDirId);
-    }
-
-    /**
-     * Test if user can switch to this repository
-     *
-     * @param integer $repositoryId
-     * @return boolean
-     */
-    public function canSwitchTo($repositoryId)
-    {
-        $repositoryObject = ConfService::getRepositoryById($repositoryId);
-        if($repositoryObject == null) return false;
-        return ConfService::repositoryIsAccessible($repositoryId, $repositoryObject, $this, false, true);
-        /*
-        if($repositoryObject->getAccessType() == "ajxp_conf" && !$this->isAdmin()) return false;
-        if($repositoryObject->getUniqueUser() && $this->id != $repositoryObject->getUniqueUser()) return false;
-        return ($this->mergedRole->canRead($repositoryId) || $this->mergedRole->canWrite($repositoryId)) ;
-        */
-    }
-
-    public function getRight($rootDirId)
-    {
-        return $this->mergedRole->getAcl($rootDirId);
-    }
-
-    public function getPref($prefName)
-    {
-        if ($prefName == "lang") {
-            // Migration path
-            if (isSet($this->mergedRole)) {
-                $l = $this->mergedRole->filterParameterValue("core.conf", "lang", AJXP_REPO_SCOPE_ALL, "");
-                if($l != "") return $l;
-            }
-        }
-        if(isSet($this->prefs[$prefName])) return $this->prefs[$prefName];
-        return "";
-    }
-
-    public function setPref($prefName, $prefValue)
-    {
-        $this->prefs[$prefName] = $prefValue;
-    }
-
-    public function setArrayPref($prefName, $prefPath, $prefValue)
-    {
-        $data = $this->getPref($prefName);
-        if(!is_array($data)){
-            $data = array();
-        }
-        $data[$prefPath] = $prefValue;
-        $this->setPref($prefName, $data);
-    }
-
-    public function getArrayPref($prefName, $prefPath)
-    {
-        $prefArray = $this->getPref($prefName);
-        if(empty($prefArray) || !is_array($prefArray) || !isSet($prefArray[$prefPath])) return "";
-        return $prefArray[$prefPath];
-    }
-
-    public function addBookmark($path, $title="", $repId = -1)
-    {
-        if(!isSet($this->bookmarks)) $this->bookmarks = array();
-        if($repId == -1) $repId = ConfService::getCurrentRepositoryId();
-        if($title == "") $title = basename($path);
-        if(!isSet($this->bookmarks[$repId])) $this->bookmarks[$repId] = array();
-        foreach ($this->bookmarks[$repId] as $v) {
-            $toCompare = "";
-            if(is_string($v)) $toCompare = $v;
-            else if(is_array($v)) $toCompare = $v["PATH"];
-            if($toCompare == trim($path)) return ; // RETURN IF ALREADY HERE!
-        }
-        $this->bookmarks[$repId][] = array("PATH"=>trim($path), "TITLE"=>$title);
-    }
-
-    public function removeBookmark($path)
-    {
-        $repId = ConfService::getCurrentRepositoryId();
-        if(isSet($this->bookmarks)
-            && isSet($this->bookmarks[$repId])
-            && is_array($this->bookmarks[$repId]))
-            {
-                foreach ($this->bookmarks[$repId] as $k => $v) {
-                    $toCompare = "";
-                    if(is_string($v)) $toCompare = $v;
-                    else if(is_array($v)) $toCompare = $v["PATH"];
-                    if($toCompare == trim($path)) unset($this->bookmarks[$repId][$k]);
-                }
-            }
-    }
-
-    public function renameBookmark($path, $title)
-    {
-        $repId = ConfService::getCurrentRepositoryId();
-        if(isSet($this->bookmarks)
-            && isSet($this->bookmarks[$repId])
-            && is_array($this->bookmarks[$repId]))
-            {
-                foreach ($this->bookmarks[$repId] as $k => $v) {
-                    $toCompare = "";
-                    if(is_string($v)) $toCompare = $v;
-                    else if(is_array($v)) $toCompare = $v["PATH"];
-                    if ($toCompare == trim($path)) {
-                         $this->bookmarks[$repId][$k] = array("PATH"=>trim($path), "TITLE"=>$title);
-                    }
-                }
-            }
-    }
-
-    public function getBookmarks()
-    {
-        if(isSet($this->bookmarks)
-            && isSet($this->bookmarks[ConfService::getCurrentRepositoryId()]))
-            return $this->bookmarks[ConfService::getCurrentRepositoryId()];
-        return array();
-    }
-
-    abstract public function load();
-
-    public function save($context = "superuser"){
-        $this->_save($context);
-        CacheService::save("shared", "pydio:user:" . $this->getId(), $this);
-    }
-
-    abstract protected function _save($context = "superuser");
-
-    abstract public function getTemporaryData($key);
-
-    abstract public function saveTemporaryData($key, $value);
-
-    public function setGroupPath($groupPath, $update = false)
-    {
-        if(strlen($groupPath) > 1) $groupPath = rtrim($groupPath, "/");
-        $this->groupPath = $groupPath;
-    }
-
-    public function getGroupPath()
-    {
-        if(!isSet($this->groupPath)) return null;
-        return $this->groupPath;
-    }
-
-    public function recomputeMergedRole()
-    {
-        if (!count($this->roles)) {
-            throw new Exception("Empty role, this is not normal");
-        }
-        uksort($this->roles, array($this, "orderRoles"));
-        $keys = array_keys($this->roles);
-        $this->mergedRole =  clone $this->roles[array_shift($keys)];
-        if (count($this->roles) > 1) {
-            $this->parentRole = $this->mergedRole;
-        }
-        $index = 0;
-        foreach ($this->roles as $role) {
-            if ($index > 0) {
-                $this->mergedRole = $role->override($this->mergedRole);
-                if($index < count($this->roles) -1 ) $this->parentRole = $role->override($this->parentRole);
-            }
-            $index ++;
-        }
-        if ($this->hasParent() && isSet($this->parentRole)) {
-            // It's a shared user, we don't want it to inherit the rights...
-            $this->parentRole->clearAcls();
-            //... but we want the parent user's role, filtered with inheritable properties only.
-            $stretchedParentUserRole = AuthService::limitedRoleFromParent($this->parentUser);
-            if ($stretchedParentUserRole !== null) {
-                $this->parentRole = $stretchedParentUserRole->override($this->parentRole);  //$this->parentRole->override($stretchedParentUserRole);
-                // REAPPLY SPECIFIC "SHARED" ROLES
-                foreach ($this->roles as $role) {
-                    if(! $role->autoAppliesTo("shared")) continue;
-                    $this->parentRole = $role->override($this->parentRole);
-                }
-            }
-            $this->mergedRole = $this->personalRole->override($this->parentRole);  // $this->parentRole->override($this->personalRole);
-        }
-    }
-
-    protected function migrateRightsToPersonalRole()
-    {
-        $changes = 0;
-        $this->personalRole = new AJXP_Role("AJXP_USR_"."/".$this->id);
-        $this->roles["AJXP_USR_"."/".$this->id] = $this->personalRole;
-        foreach ($this->rights as $rightKey => $rightValue) {
-            if ($rightKey == "ajxp.actions" && is_array($rightValue)) {
-                foreach ($rightValue as $repoId => $repoData) {
-                    foreach ($repoData as $actionName => $actionState) {
-                        $this->personalRole->setActionState("plugin.all", $actionName, $repoId, $actionState);
-                        $changes++;
-                    }
-                }
-                unset($this->rights[$rightKey]);
-            }
-            if(strpos($rightKey, "ajxp.") === 0) continue;
-            $this->personalRole->setAcl($rightKey, $rightValue);
-            $changes++;
-            unset($this->rights[$rightKey]);
-        }
-        // Move old CUSTOM_DATA values to personal role parameter
-        $customValue = $this->getPref("CUSTOM_PARAMS");
-        $custom = ConfService::getConfStorageImpl()->getOption("CUSTOM_DATA");
-        if (is_array($custom) && count($custom)) {
-            foreach ($custom as $key => $value) {
-                if (isSet($customValue[$key])) {
-                    $this->personalRole->setParameterValue(ConfService::getConfStorageImpl()->getId(), $key, $customValue[$key]);
-                }
-            }
-        }
-
-        // Move old WALLET values to personal role parameter
-        $wallet = $this->getPref("AJXP_WALLET");
-        if (is_array($wallet) && count($wallet)) {
-            foreach ($wallet as $repositoryId => $walletData) {
-                $repoObject = ConfService::getRepositoryById($repositoryId);
-                if($repoObject == null) continue;
-                $accessType = "access.".$repoObject->getAccessType();
-                foreach ($walletData as $paramName => $paramValue) {
-                    $this->personalRole->setParameterValue($accessType, $paramName, $paramValue, $repositoryId);
-                }
-            }
-        }
-        return $changes;
-    }
-
-    protected function orderRoles($r1, $r2)
-    {
-        // One group and something else
-        if(strpos($r1, "AJXP_GRP_") === 0 && strpos($r2, "AJXP_GRP_") === FALSE) return -1;
-        if(strpos($r2, "AJXP_GRP_") === 0 && strpos($r1, "AJXP_GRP_") === FALSE) return 1;
-
-        // Usr role and something else
-        if(strpos($r1, "AJXP_USR_") === 0) return 1;
-        if(strpos($r2, "AJXP_USR_") === 0) return -1;
-
-        // Two groups, sort by string, will magically keep group hierarchy
-        if(strpos($r1, "AJXP_GRP_") === 0 && strpos($r2, "AJXP_GRP_") === 0) {
-            return strcmp($r1,$r2);
-        }
-
-        // Two roles: if sticky and something else, always last.
-        if(isSet($this->rights["ajxp.roles.sticky"])){
-            $sticky = $this->rights["ajxp.roles.sticky"];
-            if(isSet($sticky[$r1]) && !isSet($sticky[$r2])){
-                return 1;
-            }
-            if(isSet($sticky[$r2]) && !isSet($sticky[$r1])){
-                return -1;
-            }
-        }
-
-        // Two roles - Try to get sorting order
-        if(isSet($this->rights["ajxp.roles.order"])){
-            return $this->rights["ajxp.roles.order"][$r1] - $this->rights["ajxp.roles.order"][$r2];
-        }else{
-            return strcmp($r1,$r2);
-        }
-    }
-
-    public function setResolveAsParent($resolveAsParent)
-    {
-        $this->resolveAsParent = $resolveAsParent;
-    }
-
-    public function getResolveAsParent()
-    {
-        return $this->resolveAsParent;
-    }
-
-    /**
-     * @param array $roles
-     * @param boolean $checkBoolean
-     * @return array
-     */
-    protected function filterRolesForSaving($roles, $checkBoolean)
-    {
-        $res = array();
-        foreach ($roles as $rName => $status) {
-            if($checkBoolean &&  !$status) continue;
-            if(strpos($rName, "AJXP_GRP_/") === 0) continue;
-            $res[$rName] = $status;
-        }
-        return $res;
-    }
-
-    protected $lastSessionSerialization = 0;
-
-    public function __sleep(){
-        $this->lastSessionSerialization = time();
-        return array("id", "hasAdmin", "rights", "prefs", "bookmarks", "version", "roles", "parentUser", "resolveAsParent", "hidden", "groupPath", "personalRole", "lastSessionSerialization");
-    }
-
-    public function __wakeup(){
-        $this->storage = ConfService::getConfStorageImpl();
-        if(!is_object($this->personalRole)){
-            $this->personalRole = AuthService::getRole("AJXP_USR_/".$this->getId());
-        }
-        $this->recomputeMergedRole();
-    }
-
-    public function reloadRolesIfRequired(){
-        if($this->lastSessionSerialization && count($this->roles)
-            && $this->storage->rolesLastUpdated(array_keys($this->roles)) > $this->lastSessionSerialization){
-
-            $newRoles = AuthService::getRolesList(array_keys($this->roles));
-            foreach($newRoles as $rId => $newRole){
-                if(strpos($rId, "AJXP_USR_/") === 0){
-                    $this->personalRole = $newRole;
-                    $this->roles[$rId] = $this->personalRole;
-                }else{
-                    $this->roles[$rId] = $newRole;
-                }
-            }
-            $this->recomputeMergedRole();
-            return true;
-
-        }
-        return false;
-    }
-
-}
diff --git a/core/src/plugins/core.conf/class.AbstractConfDriver.php b/core/src/plugins/core.conf/class.AbstractConfDriver.php
deleted file mode 100644
index 320056b4c4..0000000000
--- a/core/src/plugins/core.conf/class.AbstractConfDriver.php
+++ /dev/null
@@ -1,1420 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * @package AjaXplorer_Plugins
- * @subpackage Core
- * @class AbstractConfDriver
- * Abstract representation of a conf driver. Must be implemented by the "conf" plugin
- */
-abstract class AbstractConfDriver extends AJXP_Plugin
-{
-    public $options;
-    public $driverType = "conf";
-
-
-    public function init($options)
-    {
-        parent::init($options);
-        $options = $this->options;
-
-        // BACKWARD COMPATIBILIY PREVIOUS CONFIG VIA OPTIONS
-        if (isSet($options["CUSTOM_DATA"])) {
-            $custom = $options["CUSTOM_DATA"];
-            $serverSettings = $this->getXPath()->query('//server_settings')->item(0);
-            foreach ($custom as $key => $value) {
-                $n = $this->manifestDoc->createElement("param");
-                $n->setAttribute("name", $key);
-                $n->setAttribute("label", $value);
-                $n->setAttribute("description", $value);
-                $n->setAttribute("type", "string");
-                $n->setAttribute("scope", "user");
-                $n->setAttribute("expose", "true");
-                $serverSettings->appendChild($n);
-            }
-            $this->reloadXPath();
-        }
-
-    }
-
-    protected function parseSpecificContributions(&$contribNode)
-    {
-        parent::parseSpecificContributions($contribNode);
-        if ($contribNode->nodeName == 'client_configs' && !ConfService::getCoreConf("WEBDAV_ENABLE")) {
-            $actionXpath=new DOMXPath($contribNode->ownerDocument);
-            $webdavCompNodeList = $actionXpath->query('component_config/additional_tab[@id="webdav_pane"]', $contribNode);
-            if ($webdavCompNodeList->length) {
-                $contribNode->removeChild($webdavCompNodeList->item(0)->parentNode);
-            }
-        }
-
-        if($contribNode->nodeName != "actions") return;
-
-        // WEBDAV ACTION
-        if (!ConfService::getCoreConf("WEBDAV_ENABLE")) {
-            $actionXpath=new DOMXPath($contribNode->ownerDocument);
-            $publicUrlNodeList = $actionXpath->query('action[@name="webdav_preferences"]', $contribNode);
-            if ($publicUrlNodeList->length) {
-                $publicUrlNode = $publicUrlNodeList->item(0);
-                $contribNode->removeChild($publicUrlNode);
-            }
-        }
-
-        // SWITCH TO DASHBOARD ACTION
-        $u = AuthService::getLoggedUser();
-        $access = true;
-        if($u == null) $access = false;
-        else {
-            $acl = $u->mergedRole->getAcl("ajxp_user");
-            if(empty($acl)) $access = false;
-        }
-        if(!$access){
-            $actionXpath=new DOMXPath($contribNode->ownerDocument);
-            $publicUrlNodeList = $actionXpath->query('action[@name="switch_to_user_dashboard"]', $contribNode);
-            if ($publicUrlNodeList->length) {
-                $publicUrlNode = $publicUrlNodeList->item(0);
-                $contribNode->removeChild($publicUrlNode);
-            }
-        }
-
-        // PERSONAL INFORMATIONS
-        $hasExposed = false;
-        $cacheHasExposed = AJXP_PluginsService::getInstance()->loadFromPluginQueriesCache("//server_settings/param[contains(@scope,'user') and @expose='true']");
-        if ($cacheHasExposed !== null) {
-            $hasExposed = $cacheHasExposed;
-        } else {
-            $paramNodes = AJXP_PluginsService::searchAllManifests("//server_settings/param[contains(@scope,'user') and @expose='true']", "node", false, false, true);
-            if (is_array($paramNodes) && count($paramNodes)) {
-                $hasExposed = true;
-            }
-            AJXP_PluginsService::getInstance()->storeToPluginQueriesCache("//server_settings/param[contains(@scope,'user') and @expose='true']", $hasExposed);
-        }
-        //$hasExposed = true;
-
-
-        if (!$hasExposed) {
-            $actionXpath=new DOMXPath($contribNode->ownerDocument);
-            $publicUrlNodeList = $actionXpath->query('action[@name="custom_data_edit"]', $contribNode);
-            $publicUrlNode = $publicUrlNodeList->item(0);
-            $contribNode->removeChild($publicUrlNode);
-        }
-
-        // CREATE A NEW REPOSITORY
-        if (!ConfService::getCoreConf("USER_CREATE_REPOSITORY", "conf")) {
-            $actionXpath=new DOMXPath($contribNode->ownerDocument);
-            $publicUrlNodeList = $actionXpath->query('action[@name="user_create_repository"]', $contribNode);
-            if ($publicUrlNodeList->length) {
-                $publicUrlNode = $publicUrlNodeList->item(0);
-                $contribNode->removeChild($publicUrlNode);
-            }
-            $actionXpath=new DOMXPath($contribNode->ownerDocument);
-            $publicUrlNodeList = $actionXpath->query('action[@name="user_delete_repository"]', $contribNode);
-            if ($publicUrlNodeList->length) {
-                $publicUrlNode = $publicUrlNodeList->item(0);
-                $contribNode->removeChild($publicUrlNode);
-            }
-        }
-
-        // CREATE A NEW USER
-        if (!ConfService::getCoreConf("USER_CREATE_USERS", "conf")) {
-            $actionXpath=new DOMXPath($contribNode->ownerDocument);
-            $publicUrlNodeList = $actionXpath->query('action[@name="user_create_user"]', $contribNode);
-            if ($publicUrlNodeList->length) {
-                $publicUrlNode = $publicUrlNodeList->item(0);
-                $contribNode->removeChild($publicUrlNode);
-            }
-            $actionXpath=new DOMXPath($contribNode->ownerDocument);
-            $publicUrlNodeList = $actionXpath->query('action[@name="user_update_user"]', $contribNode);
-            if ($publicUrlNodeList->length) {
-                $publicUrlNode = $publicUrlNodeList->item(0);
-                $contribNode->removeChild($publicUrlNode);
-            }
-            $actionXpath=new DOMXPath($contribNode->ownerDocument);
-            $publicUrlNodeList = $actionXpath->query('action[@name="user_delete_user"]', $contribNode);
-            if ($publicUrlNodeList->length) {
-                $publicUrlNode = $publicUrlNodeList->item(0);
-                $contribNode->removeChild($publicUrlNode);
-            }
-        }
-
-    }
-
-    // NEW FUNCTIONS FOR  LOADING/SAVING PLUGINS CONFIGS
-    /**
-     * Returns an array of options=>values merged from various sources (.inc.php, implementation source)
-     * @return Array
-     * @param String $pluginType
-     * @param String $pluginName
-     */
-    public function loadPluginConfig($pluginType, $pluginName)
-    {
-        $options = array();
-        if (is_file(AJXP_CONF_PATH."/conf.$pluginType.inc")) {
-            include AJXP_CONF_PATH."/conf.$pluginType.inc";
-            if (!empty($DRIVER_CONF)) {
-                foreach ($DRIVER_CONF as $key=>$value) {
-                    $options[$key] = $value;
-                }
-                unset($DRIVER_CONF);
-            }
-        }
-        if (is_file(AJXP_CONF_PATH."/conf.$pluginType.$pluginName.inc")) {
-            include AJXP_CONF_PATH."/conf.$pluginType.$pluginName.inc";
-            if (!empty($DRIVER_CONF)) {
-                foreach ($DRIVER_CONF as $key=>$value) {
-                    $options[$key] = $value;
-                }
-                unset($DRIVER_CONF);
-            }
-        }
-        if ($this->pluginUsesBootConf($pluginType.".".$pluginName)) {
-            ConfService::getBootConfStorageImpl()->_loadPluginConfig($pluginType.".".$pluginName, $options);
-        } else {
-            $this->_loadPluginConfig($pluginType.".".$pluginName, $options);
-        }
-        return $options;
-    }
-
-    abstract public function _loadPluginConfig($pluginId, &$options);
-
-    /**
-     * Intercept CONF and AUTH configs to use the BootConf Storage
-        * @param String $pluginId
-        * @param array $options
-        */
-    public function savePluginConfig($pluginId, $options)
-    {
-        if ($this->pluginUsesBootConf($pluginId)) {
-            ConfService::getBootConfStorageImpl()->_savePluginConfig($pluginId, $options);
-        } else {
-            $this->_savePluginConfig($pluginId, $options);
-        }
-    }
-
-    /**
-     * @param String $pluginId
-     * @return bool
-     */
-    protected function pluginUsesBootConf($pluginId)
-    {
-        return ($pluginId == "core.conf" || strpos($pluginId, "conf.") === 0
-          || $pluginId == "core.auth" || strpos($pluginId, "auth.") === 0
-          || $pluginId == "core.cache" || strpos($pluginId, "cache.") === 0);
-    }
-
-    /**
-     * @param String $pluginId
-     * @param String $options
-     */
-    abstract public function _savePluginConfig($pluginId, $options);
-
-
-    // SAVE / EDIT / CREATE / DELETE REPOSITORY
-    /**
-     * Returns a list of available repositories (dynamic ones only, not the ones defined in the config file).
-     * @param AbstractAjxpUser $user
-     * @return Repository[]
-     */
-    abstract public function listRepositories($user = null);
-
-    /**
-     * Returns a list of available repositories (dynamic ones only, not the ones defined in the config file).
-     * @param Array $criteria This parameter can take the following keys
-     *      - Search keys "uuid", "parent_uuid", "owner_user_id", "display", "accessType", "isTemplate", "slug", "groupPath",
-     *        Search values can be either string, array of string, AJXP_FILTER_EMPTY, AJXP_FILTER_NOT_EMPTY or regexp:RegexpString
-     *      - or "role" => AJXP_Role object: will search repositories accessible to this role
-     *      - ORDERBY = array("KEY"=>"", "DIR"=>""), GROUPBY, CURSOR = array("OFFSET" => 0, "LIMIT", 30)
-     *      - COUNT_ONLY
-     * @param $count int fill this integer with a count
-     * @return Repository[]
-     */
-    abstract public function listRepositoriesWithCriteria($criteria, &$count=null);
-
-
-    /**
-     * Retrieve a Repository given its unique ID.
-     *
-     * @param String $repositoryId
-     * @return Repository
-     */
-    abstract public function getRepositoryById($repositoryId);
-    /**
-     * Retrieve a Repository given its alias.
-     *
-     * @param String $repositorySlug
-     * @return Repository
-     */
-    abstract public function getRepositoryByAlias($repositorySlug);
-    /**
-     * Stores a repository, new or not.
-     *
-     * @param Repository $repositoryObject
-     * @param Boolean $update
-     * @return -1 if failed
-     */
-    abstract public function saveRepository($repositoryObject, $update = false);
-    /**
-     * Delete a repository, given its unique ID.
-     *
-     * @param String $repositoryId
-     */
-    abstract public function deleteRepository($repositoryId);
-
-    /**
-     * Must return an associative array of roleId => AjxpRole objects.
-     * @param array $roleIds
-     * @param boolean $excludeReserved,
-     * @return array AjxpRole[]
-     */
-    abstract public function listRoles($roleIds = array(), $excludeReserved = false);
-    abstract public function saveRoles($roles);
-
-    /**
-     * @abstract
-     * @param AJXP_Role $role
-     * @param AbstractAjxpUser $userObject
-     * @return void
-     */
-    abstract public function updateRole($role, $userObject = null);
-
-    /**
-     * @abstract
-     * @param AJXP_Role|String $role
-     * @return void
-     */
-    abstract public function deleteRole($role);
-
-    /**
-     * Compute the most recent date where one of these roles where updated.
-     *
-     * @param $rolesIdsList
-     * @return int
-     */
-    public function rolesLastUpdated($rolesIdsList){
-        return 0;
-    }
-
-    /**
-     * Specific queries
-     */
-    abstract public function countAdminUsers();
-
-    /**
-     * @abstract
-     * @param array $context
-     * @param String $fileName
-     * @param String $ID
-     * @return String $ID
-     */
-    abstract public function saveBinary($context, $fileName, $ID = null);
-
-    /**
-     * @abstract
-     * @param array $context
-     * @param String $ID
-     * @param Resource $outputStream
-     * @return boolean
-     */
-    abstract public function loadBinary($context, $ID, $outputStream = null);
-
-    /**
-     * @abstract
-     * @param array $context
-     * @param String $ID
-     * @return boolean
-     */
-    abstract public function deleteBinary($context, $ID);
-
-    /**
-     * @abstract
-     * @param String $keyType
-     * @param String $keyId
-     * @param String $userId
-     * @param Array $data
-     * @return boolean
-     */
-    abstract public function saveTemporaryKey($keyType, $keyId, $userId, $data);
-
-    /**
-     * @abstract
-     * @param String $keyType
-     * @param String $keyId
-     * @return array
-     */
-    abstract public function loadTemporaryKey($keyType, $keyId);
-
-    /**
-     * @abstract
-     * @param String $keyType
-     * @param String $keyId
-     * @return boolean
-     */
-    abstract public function deleteTemporaryKey($keyType, $keyId);
-
-    /**
-     * @abstract
-     * @param String $keyType
-     * @param String $expiration
-     * @return null
-     */
-    abstract public function pruneTemporaryKeys($keyType, $expiration);
-
-    /**
-     * Instantiate a new AbstractAjxpUser
-     *
-     * @param String $userId
-     * @return AbstractAjxpUser
-     */
-    public function createUserObject($userId)
-    {
-        $test=CacheService::fetch("shared", "pydio:user:" . $userId);
-        if($test !== false && is_a($test, "AbstractAjxpUser")){
-            if($test->personalRole == null){
-                $test->personalRole = $test->roles["AJXP_USR_/".$userId];
-            }
-            $test->recomputeMergedRole();
-            return $test;
-        }
-        $userId = AuthService::filterUserSensitivity($userId);
-        $abstractUser = $this->instantiateAbstractUserImpl($userId);
-        if (!$abstractUser->storageExists()) {
-            AuthService::updateDefaultRights($abstractUser);
-        }
-        AuthService::updateAutoApplyRole($abstractUser);
-        AuthService::updateAuthProvidedData($abstractUser);
-        $args = array(&$abstractUser);
-        AJXP_Controller::applyIncludeHook("include.user.updateUserObject", $args);
-        CacheService::save("shared", "pydio:user:" . $userId, $abstractUser);
-        return $abstractUser;
-    }
-
-    /**
-     * Function for deleting a user
-     *
-     * @param String $userId
-     * @param Array $deletedSubUsers
-     */
-    abstract public function deleteUser($userId, &$deletedSubUsers);
-
-
-    /**
-     * Instantiate the right class
-     *
-     * @param string $userId
-     * @return AbstractAjxpUser
-     */
-    abstract public function instantiateAbstractUserImpl($userId);
-
-    abstract public function getUserClassFileName();
-
-    /**
-     * @abstract
-     * @param $userId
-     * @return AbstractAjxpUser[]
-     */
-    abstract public function getUserChildren($userId);
-
-    /**
-     * @abstract
-     * @param string $repositoryId
-     * @return AbstractAjxpUser[]
-     */
-    abstract public function getUsersForRepository($repositoryId);
-
-    /**
-     * @abstract
-     * @param string $repositoryId
-     * @param string $rolePrefix
-     * @param bool $splitByType
-     * @return array An array of role ids
-     */
-    abstract public function getRolesForRepository($repositoryId, $rolePrefix = '', $splitByType = false);
-    /**
-     * @abstract
-     * @param string $repositoryId
-     * @param boolean $details
-     * @param boolean $admin
-     * @return Integer|array
-     */
-    abstract public function countUsersForRepository($repositoryId, $details = false, $admin = false);
-
-
-    /**
-     * @param AbstractAjxpUser[] $flatUsersList
-     * @param string $baseGroup
-     * @param bool $fullTree
-     * @return void
-     */
-    abstract public function filterUsersByGroup(&$flatUsersList, $baseGroup = "/", $fullTree = false);
-
-    /**
-     * Check if group already exists
-     * @param string $groupPath
-     * @return boolean
-     */
-    abstract public function groupExists($groupPath);
-
-    /**
-     * @param string $groupPath
-     * @param string $groupLabel
-     * @return mixed
-     */
-    abstract public function createGroup($groupPath, $groupLabel);
-
-    /**
-     * @abstract
-     * @param $groupPath
-     * @return void
-     */
-    abstract public function deleteGroup($groupPath);
-
-    /**
-     * @abstract
-     * @param string $groupPath
-     * @param string $groupLabel
-     * @return void
-     */
-    abstract public function relabelGroup($groupPath, $groupLabel);
-
-
-        /**
-     * @param string $baseGroup
-     * @return string[]
-     */
-    abstract public function getChildrenGroups($baseGroup = "/");
-
-    public function getOption($optionName)
-    {
-        return (isSet($this->options[$optionName])?$this->options[$optionName]:"");
-    }
-
-    /**
-     * @param AbstractAjxpUser $userObject
-     * @return array()
-     */
-    public function getExposedPreferences($userObject)
-    {
-        $stringPrefs = array("lang","history/last_repository","pending_folder","plugins_preferences");
-        $jsonPrefs = array("ls_history","gui_preferences");
-        $prefs = array();
-        if ( $userObject->getId()=="guest" && ConfService::getCoreConf("SAVE_GUEST_PREFERENCES", "conf") === false) {
-            return array();
-        }
-        if ( ConfService::getCoreConf("SKIP_USER_HISTORY", "conf") === true ) {
-            $stringPrefs = array("lang","pending_folder", "plugins_preferences");
-            $jsonPrefs = array("gui_preferences");
-            $prefs["SKIP_USER_HISTORY"] = array("value" => "true", "type" => "string" );
-        }
-        foreach ($stringPrefs as $pref) {
-            if (strstr($pref, "/")!==false) {
-                $parts = explode("/", $pref);
-                $value = $userObject->getArrayPref($parts[0], $parts[1]);
-                $pref = str_replace("/", "_", $pref);
-            } else {
-                $value = $userObject->getPref($pref);
-            }
-            $prefs[$pref] = array("value" => $value, "type" => "string" );
-        }
-        foreach ($jsonPrefs as $pref) {
-            $prefs[$pref] = array("value" => $userObject->getPref($pref), "type" => "json" );
-        }
-
-
-        $exposed = array();
-        $cacheHasExposed = AJXP_PluginsService::getInstance()->loadFromPluginQueriesCache("//server_settings/param[contains(@scope,'user') and @expose='true']");
-        if ($cacheHasExposed !== null && is_array($cacheHasExposed)) {
-            $exposed = $cacheHasExposed;
-        } else {
-            $exposed_props = AJXP_PluginsService::searchAllManifests("//server_settings/param[contains(@scope,'user') and @expose='true']", "node", false, false, true);
-            foreach($exposed_props as $exposed_prop){
-                $parentNode = $exposed_prop->parentNode->parentNode;
-                $pluginId = $parentNode->getAttribute("id");
-                if (empty($pluginId)) {
-                    $pluginId = $parentNode->nodeName.".".$parentNode->getAttribute("name");
-                }
-                $paramName = $exposed_prop->getAttribute("name");
-                $exposed[] = array("PLUGIN_ID" => $pluginId, "NAME" => $paramName);
-            }
-            AJXP_PluginsService::getInstance()->storeToPluginQueriesCache("//server_settings/param[contains(@scope,'user') and @expose='true']", $exposed);
-        }
-
-        foreach ($exposed as $exposedProp) {
-            $value = $userObject->mergedRole->filterParameterValue($exposedProp["PLUGIN_ID"], $exposedProp["NAME"], AJXP_REPO_SCOPE_ALL, "");
-            $prefs[$exposedProp["NAME"]] = array("value" => $value, "type" => "string", "pluginId" => $exposedProp["PLUGIN_ID"]);
-        }
-
-        return $prefs;
-    }
-
-    public function switchAction($action, $httpVars, $fileVars)
-    {
-        $xmlBuffer = "";
-        foreach ($httpVars as $getName=>$getValue) {
-            $$getName = AJXP_Utils::securePath($getValue);
-        }
-        if(isSet($dir) && $action != "upload") $dir = SystemTextEncoding::fromUTF8($dir);
-        $mess = ConfService::getMessages();
-
-        switch ($action) {
-            //------------------------------------
-            //	SWITCH THE ROOT REPOSITORY
-            //------------------------------------
-            case "switch_repository":
-
-                if (!isSet($repository_id)) {
-                    break;
-                }
-                $dirList = ConfService::getRepositoriesList();
-                /** @var $repository_id string */
-                if (!isSet($dirList[$repository_id])) {
-                    $errorMessage = "Trying to switch to an unkown repository!";
-                    break;
-                }
-                ConfService::switchRootDir($repository_id);
-                // Load try to init the driver now, to trigger an exception
-                // if it's not loading right.
-                ConfService::loadRepositoryDriver();
-                if (AuthService::usersEnabled() && AuthService::getLoggedUser()!=null) {
-                    $user = AuthService::getLoggedUser();
-                    $activeRepId = ConfService::getCurrentRepositoryId();
-                    $user->setArrayPref("history", "last_repository", $activeRepId);
-                    $user->setArrayPref("repository_last_connected", $activeRepId, time());
-                    $user->save("user");
-                }
-                //$logMessage = "Successfully Switched!";
-                $this->logInfo("Switch Repository", array("rep. id"=>$repository_id));
-
-            break;
-
-            //------------------------------------
-            //	SEND XML REGISTRY
-            //------------------------------------
-            case "get_xml_registry" :
-            case "state" :
-
-                $clone = ConfService::getFilteredXMLRegistry(true, true);
-                $clonePath = new DOMXPath($clone);
-                $serverCallbacks = $clonePath->query("//serverCallback|hooks");
-                foreach ($serverCallbacks as $callback) {
-                    $callback->parentNode->removeChild($callback);
-                }
-                $xPath = '';
-                if (isSet($httpVars["xPath"])) {
-                    $xPath = ltrim(AJXP_Utils::securePath($httpVars["xPath"]), "/");
-                }
-                if (!empty($xPath)) {
-                    $nodes = $clonePath->query($xPath);
-                    if($httpVars["format"] == "json"){
-                        $data = AJXP_XMLWriter::xmlToArray($nodes->item(0));
-                        HTMLWriter::charsetHeader("application/json");
-                        echo json_encode($data);
-                    }else{
-                        AJXP_XMLWriter::header("ajxp_registry_part", array("xPath"=>$xPath));
-                        if ($nodes->length) {
-                            print(AJXP_XMLWriter::replaceAjxpXmlKeywords($clone->saveXML($nodes->item(0))));
-                        }
-                        AJXP_XMLWriter::close("ajxp_registry_part");
-                    }
-                } else {
-                    AJXP_Utils::safeIniSet("zlib.output_compression", "4096");
-                    if($httpVars["format"] == "json"){
-                        $data = AJXP_XMLWriter::xmlToArray($clone);
-                        HTMLWriter::charsetHeader("application/json");
-                        echo json_encode($data);
-                    }else{
-                        header('Content-Type: application/xml; charset=UTF-8');
-                        $string = AJXP_XMLWriter::replaceAjxpXmlKeywords($clone->saveXML());
-                        $etag = md5($string);
-                        $match = isSet($_SERVER["HTTP_IF_NONE_MATCH"])?$_SERVER["HTTP_IF_NONE_MATCH"]:'';
-                        if($match == $etag){
-                            header('HTTP/1.1 304 Not Modified');
-                        }else{
-                            header('Cache-Control:public, max-age=31536000');
-                            header('ETag: '.$etag);
-                            print($string);
-                        }
-                    }
-                }
-
-            break;
-
-            //------------------------------------
-            //	BOOKMARK BAR
-            //------------------------------------
-            case "get_bookmarks":
-
-                $bmUser = null;
-                if (AuthService::usersEnabled() && AuthService::getLoggedUser() != null) {
-                    $bmUser = AuthService::getLoggedUser();
-                } else if (!AuthService::usersEnabled()) {
-                    $confStorage = ConfService::getConfStorageImpl();
-                    $bmUser = $confStorage->createUserObject("shared");
-                }
-                if ($bmUser == null) {
-                    AJXP_XMLWriter::header();
-                    AJXP_XMLWriter::close();
-                }
-                $driver = ConfService::loadRepositoryDriver();
-                if (!is_a($driver, "AjxpWrapperProvider")) {
-                    $driver = false;
-                }
-
-
-                if (isSet($httpVars["bm_action"]) && isset($httpVars["bm_path"])) {
-                    $bmPath = AJXP_Utils::decodeSecureMagic($httpVars["bm_path"]);
-
-                    if ($httpVars["bm_action"] == "add_bookmark") {
-                        $title = "";
-                        if(isSet($httpVars["bm_title"])) $title = AJXP_Utils::decodeSecureMagic($httpVars["bm_title"]);
-                        if($title == "" && $bmPath=="/") $title = ConfService::getCurrentRootDirDisplay();
-                        $bmUser->addBookMark($bmPath, $title);
-                        if ($driver) {
-                            $node = new AJXP_Node($driver->getResourceUrl($bmPath));
-                            $node->setMetadata("ajxp_bookmarked", array("ajxp_bookmarked" => "true"), true, AJXP_METADATA_SCOPE_REPOSITORY, true);
-                        }
-                    } else if ($httpVars["bm_action"] == "delete_bookmark") {
-                        $bmUser->removeBookmark($bmPath);
-                        if ($driver) {
-                            $node = new AJXP_Node($driver->getResourceUrl($bmPath));
-                            $node->removeMetadata("ajxp_bookmarked", true, AJXP_METADATA_SCOPE_REPOSITORY, true);
-                        }
-                    } else if ($httpVars["bm_action"] == "rename_bookmark" && isset($httpVars["bm_title"])) {
-                        $title = AJXP_Utils::decodeSecureMagic($httpVars["bm_title"]);
-                        $bmUser->renameBookmark($bmPath, $title);
-                    }
-                    AJXP_Controller::applyHook("msg.instant", array("<reload_bookmarks/>",
-                            ConfService::getRepository()->getId(),
-                            AuthService::getLoggedUser()->getId())
-                    );
-
-                    if (AuthService::usersEnabled() && AuthService::getLoggedUser() != null) {
-                        $bmUser->save("user");
-                        AuthService::updateUser($bmUser);
-                    } else if (!AuthService::usersEnabled()) {
-                        $bmUser->save("user");
-                    }
-                }
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::writeBookmarks($bmUser->getBookmarks(), true, isset($httpVars["format"])?$httpVars["format"]:"legacy");
-                AJXP_XMLWriter::close();
-
-            break;
-
-            //------------------------------------
-            //	SAVE USER PREFERENCE
-            //------------------------------------
-            case "save_user_pref":
-
-                $userObject = AuthService::getLoggedUser();
-                $i = 0;
-                while (isSet($httpVars["pref_name_".$i]) && isSet($httpVars["pref_value_".$i])) {
-                    $prefName = AJXP_Utils::sanitize($httpVars["pref_name_".$i], AJXP_SANITIZE_ALPHANUM);
-                    $prefValue = AJXP_Utils::sanitize(SystemTextEncoding::magicDequote($httpVars["pref_value_".$i]));
-                    if($prefName == "password") continue;
-                    if ($prefName != "pending_folder" && $userObject == null) {
-                        $i++;
-                        continue;
-                    }
-                    $userObject->setPref($prefName, $prefValue);
-                    $userObject->save("user");
-                    AuthService::updateUser($userObject);
-                    //setcookie("AJXP_$prefName", $prefValue);
-                    $i++;
-                }
-                header("Content-Type:text/plain");
-                print "SUCCESS";
-
-            break;
-
-            //------------------------------------
-            //	SAVE USER PREFERENCE
-            //------------------------------------
-            case "custom_data_edit":
-            case "user_create_user":
-
-                $data = array();
-
-                if ($action == "user_create_user" && isSet($httpVars["NEW_new_user_id"])) {
-                    $updating = false;
-                    AJXP_Utils::parseStandardFormParameters($httpVars, $data, null, "NEW_");
-                    $original_id = AJXP_Utils::decodeSecureMagic($data["new_user_id"]);
-                    $data["new_user_id"] = AJXP_Utils::decodeSecureMagic($data["new_user_id"], AJXP_SANITIZE_EMAILCHARS);
-                    if($original_id != $data["new_user_id"]){
-                        throw new Exception(str_replace("%s", $data["new_user_id"], $mess["ajxp_conf.127"]));
-                    }
-                    if (AuthService::userExists($data["new_user_id"],"w")) {
-                        throw new Exception($mess["ajxp_conf.43"]);
-                    }
-                    $loggedUser = AuthService::getLoggedUser();
-                    $limit = $loggedUser->mergedRole->filterParameterValue("core.conf", "USER_SHARED_USERS_LIMIT", AJXP_REPO_SCOPE_ALL, "");
-                    if (!empty($limit) && intval($limit) > 0) {
-                        $count = count($this->getUserChildren($loggedUser->getId()));
-                        if ($count >= $limit) {
-                            throw new Exception($mess['483']);
-                        }
-                    }
-
-                    AuthService::createUser($data["new_user_id"], $data["new_password"]);
-                    $userObject = ConfService::getConfStorageImpl()->createUserObject($data["new_user_id"]);
-                    $userObject->setParent($loggedUser->getId());
-                    $userObject->save('superuser');
-                    $userObject->personalRole->clearAcls();
-                    $userObject->setGroupPath($loggedUser->getGroupPath());
-                    $userObject->setProfile("shared");
-
-                } else if($action == "user_create_user" && isSet($httpVars["NEW_existing_user_id"])){
-
-                    $updating = true;
-                    AJXP_Utils::parseStandardFormParameters($httpVars, $data, null, "NEW_");
-                    $userId = $data["existing_user_id"];
-                    if(!AuthService::userExists($userId)){
-                        throw new Exception("Cannot find user");
-                    }
-                    $userObject = ConfService::getConfStorageImpl()->createUserObject($userId);
-                    if($userObject->getParent() != AuthService::getLoggedUser()->getId()){
-                        throw new Exception("Cannot find user");
-                    }
-                    if(!empty($data["new_password"])){
-                        AuthService::updatePassword($userId, $data["new_password"]);
-                    }
-
-                } else {
-                    $updating = false;
-                    $userObject = AuthService::getLoggedUser();
-                    AJXP_Utils::parseStandardFormParameters($httpVars, $data, null, "PREFERENCES_");
-                }
-
-                $paramNodes = AJXP_PluginsService::searchAllManifests("//server_settings/param[contains(@scope,'user') and @expose='true']", "node", false, false, true);
-                $rChanges = false;
-                if (is_array($paramNodes) && count($paramNodes)) {
-                    foreach ($paramNodes as $xmlNode) {
-                        if ($xmlNode->getAttribute("expose") == "true") {
-                            $parentNode = $xmlNode->parentNode->parentNode;
-                            $pluginId = $parentNode->getAttribute("id");
-                            if (empty($pluginId)) {
-                                $pluginId = $parentNode->nodeName.".".$parentNode->getAttribute("name");
-                            }
-                            $name = $xmlNode->getAttribute("name");
-                            if (isSet($data[$name]) || $data[$name] === "") {
-                                if($data[$name] == "__AJXP_VALUE_SET__") continue;
-                                if ($data[$name] === "" || $userObject->parentRole == null
-                                    || $userObject->parentRole->filterParameterValue($pluginId, $name, AJXP_REPO_SCOPE_ALL, "") != $data[$name]
-                                    || $userObject->personalRole->filterParameterValue($pluginId, $name, AJXP_REPO_SCOPE_ALL, "") != $data[$name]) {
-                                    $userObject->personalRole->setParameterValue($pluginId, $name, $data[$name]);
-                                    $rChanges = true;
-                                }
-                            }
-                        }
-                    }
-                }
-                if ($rChanges) {
-                    AuthService::updateRole($userObject->personalRole, $userObject);
-                    $userObject->recomputeMergedRole();
-                    if ($action == "custom_data_edit") {
-                        AuthService::updateUser($userObject);
-                        if(isSet($data["lang"]) && $data["lang"] !== ConfService::getLanguage()){
-                            ConfService::setLanguage($data["lang"]);
-                            $mess = ConfService::getMessages(true);
-                        }
-                    }
-                }
-
-                if ($action == "user_create_user") {
-
-                    AJXP_Controller::applyHook($updating?"user.after_update":"user.after_create", array($userObject));
-                    if (isset($data["send_email"]) && $data["send_email"] == true && !empty($data["email"])) {
-                        $mailer = AJXP_PluginsService::getInstance()->getUniqueActivePluginForType("mailer");
-                        if ($mailer !== false) {
-                            $mess = ConfService::getMessages();
-                            $link = AJXP_Utils::detectServerURL();
-                            $apptitle = ConfService::getCoreConf("APPLICATION_TITLE");
-                            $subject = str_replace("%s", $apptitle, $mess["507"]);
-                            $body = str_replace(array("%s", "%link", "%user", "%pass"), array($apptitle, $link, $data["new_user_id"], $data["new_password"]), $mess["508"]);
-                            $mailer->sendMail(array($data["email"]), $subject, $body);
-                        }
-                    }
-
-                    echo "SUCCESS";
-                } else {
-                    AJXP_XMLWriter::header();
-                    AJXP_XMLWriter::sendMessage($mess["241"], null);
-                    AJXP_XMLWriter::close();
-                }
-
-            break;
-
-            case "user_update_user":
-
-                if(!isSet($httpVars["user_id"])) {
-                    throw new Exception("invalid arguments");
-                }
-                $userId = $httpVars["user_id"];
-                if(!AuthService::userExists($userId)){
-                    throw new Exception("Cannot find user");
-                }
-                $userObject = ConfService::getConfStorageImpl()->createUserObject($userId);
-                if($userObject->getParent() != AuthService::getLoggedUser()->getId()){
-                    throw new Exception("Cannot find user");
-                }
-                $paramsString = ConfService::getCoreConf("NEWUSERS_EDIT_PARAMETERS", "conf");
-                $result = array();
-                $params = explode(",", $paramsString);
-                foreach($params as $p){
-                    $result[$p] = $userObject->personalRole->filterParameterValue("core.conf", $p, AJXP_REPO_SCOPE_ALL, "");
-                }
-                HTMLWriter::charsetHeader("application/json");
-                echo json_encode($result);
-
-            break;
-
-            //------------------------------------
-            // WEBDAV PREFERENCES
-            //------------------------------------
-            case "webdav_preferences" :
-
-                $userObject = AuthService::getLoggedUser();
-                $webdavActive = false;
-                $passSet = false;
-                $digestSet = false;
-                // Detect http/https and host
-                if (ConfService::getCoreConf("WEBDAV_BASEHOST") != "") {
-                    $baseURL = ConfService::getCoreConf("WEBDAV_BASEHOST");
-                } else {
-                    $baseURL = AJXP_Utils::detectServerURL();
-                }
-                $webdavBaseUrl = $baseURL.ConfService::getCoreConf("WEBDAV_BASEURI")."/";
-                $davData = $userObject->getPref("AJXP_WEBDAV_DATA");
-                $digestSet = isSet($davData["HA1"]);
-                if (isSet($httpVars["activate"]) || isSet($httpVars["webdav_pass"])) {
-                    if (!empty($httpVars["activate"])) {
-                        $activate = ($httpVars["activate"]=="true" ? true:false);
-                        if (empty($davData)) {
-                            $davData = array();
-                        }
-                        $davData["ACTIVE"] = $activate;
-                    }
-                    if (!empty($httpVars["webdav_pass"])) {
-                        $password = $httpVars["webdav_pass"];
-                        if (function_exists('mcrypt_encrypt')) {
-                            $user = $userObject->getId();
-                            $secret = (defined("AJXP_SAFE_SECRET_KEY")? AJXP_SAFE_SECRET_KEY:"\1CDAFx¨op#");
-                            $password = base64_encode(mcrypt_encrypt(MCRYPT_RIJNDAEL_256,  md5($user.$secret), $password, MCRYPT_MODE_ECB));
-                        }
-                        $davData["PASS"] = $password;
-                    }
-                    $userObject->setPref("AJXP_WEBDAV_DATA", $davData);
-                    $userObject->save("user");
-                }
-                if (!empty($davData)) {
-                    $webdavActive = (isSet($davData["ACTIVE"]) && $davData["ACTIVE"]===true);
-                    $passSet = (isSet($davData["PASS"]));
-                }
-                $repoList = ConfService::getRepositoriesList();
-                $davRepos = array();
-                $loggedUser = AuthService::getLoggedUser();
-                foreach ($repoList as $repoIndex => $repoObject) {
-                    $accessType = $repoObject->getAccessType();
-                    $driver = AJXP_PluginsService::getInstance()->getPluginByTypeName("access", $accessType);
-            if (is_a($driver, "AjxpWrapperProvider") && !$repoObject->getOption("AJXP_WEBDAV_DISABLED") && ($loggedUser->canRead($repoIndex) || $loggedUser->canWrite($repoIndex))) {
-                        $davRepos[$repoIndex] = $webdavBaseUrl ."".($repoObject->getSlug()==null?$repoObject->getId():$repoObject->getSlug());
-                    }
-                }
-                $prefs = array(
-                    "webdav_active"  => $webdavActive,
-                    "password_set"   => $passSet,
-                    "digest_set"    => $digestSet,
-                    "webdav_force_basic" => (ConfService::getCoreConf("WEBDAV_FORCE_BASIC") === true),
-                    "webdav_base_url"  => $webdavBaseUrl,
-                    "webdav_repositories" => $davRepos
-                );
-                HTMLWriter::charsetHeader("application/json");
-                print(json_encode($prefs));
-
-            break;
-
-            case  "get_user_template_logo":
-
-                $tplId = $httpVars["template_id"];
-                $iconFormat = $httpVars["icon_format"];
-                $repo = ConfService::getRepositoryById($tplId);
-                $logo = $repo->getOption("TPL_ICON_".strtoupper($iconFormat));
-                if (isSet($logo) && is_file(AJXP_DATA_PATH."/plugins/core.conf/tpl_logos/".$logo)) {
-                    header("Content-Type: ".AJXP_Utils::getImageMimeType($logo)."; name=\"".$logo."\"");
-                    header("Content-Length: ".filesize(AJXP_DATA_PATH."/plugins/core.conf/tpl_logos/".$logo));
-                    header('Pragma:');
-                    header('Cache-Control: public');
-                    header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()-10000) . " GMT");
-                    header("Expires: " . gmdate("D, d M Y H:i:s", time()+5*24*3600) . " GMT");
-                    readfile(AJXP_DATA_PATH."/plugins/core.conf/tpl_logos/".$logo);
-                } else {
-                    $logo = "default_template_logo-".($iconFormat == "small"?16:22).".png";
-                    header("Content-Type: ".AJXP_Utils::getImageMimeType($logo)."; name=\"".$logo."\"");
-                    header("Content-Length: ".filesize(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/core.conf/".$logo));
-                    header('Pragma:');
-                    header('Cache-Control: public');
-                    header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()-10000) . " GMT");
-                    header("Expires: " . gmdate("D, d M Y H:i:s", time()+5*24*3600) . " GMT");
-                    readfile(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/core.conf/".$logo);
-                }
-
-            break;
-
-            case  "get_user_templates_definition":
-
-                AJXP_XMLWriter::header("repository_templates");
-                $count = 0;
-                $repositories = ConfService::listRepositoriesWithCriteria(array(
-                    "isTemplate" => 1
-                ), $count);
-                $pServ = AJXP_PluginsService::getInstance();
-                foreach ($repositories as $repo) {
-                    if(!$repo->isTemplate) continue;
-                    if(!$repo->getOption("TPL_USER_CAN_CREATE")) continue;
-                    $repoId = $repo->getId();
-                    $repoLabel = $repo->getDisplay();
-                    $repoType = $repo->getAccessType();
-                    print("<template repository_id=\"$repoId\" repository_label=\"$repoLabel\" repository_type=\"$repoType\">");
-                    $driverPlug = $pServ->getPluginByTypeName("access", $repoType);
-                    $params = $driverPlug->getManifestRawContent("//param", "node");
-                    $tplDefined = $repo->getOptionsDefined();
-                    $defaultLabel = '';
-                    foreach ($params as $paramNode) {
-                        $name = $paramNode->getAttribute("name");
-                        if ( strpos($name, "TPL_") === 0 ) {
-                            if ($name == "TPL_DEFAULT_LABEL") {
-                                $defaultLabel = str_replace("AJXP_USER", AuthService::getLoggedUser()->getId(), $repo->getOption($name));
-                            }
-                            continue;
-                        }
-                        if( in_array($paramNode->getAttribute("name"), $tplDefined) ) continue;
-                        if($paramNode->getAttribute('no_templates') == 'true') continue;
-                        print(AJXP_XMLWriter::replaceAjxpXmlKeywords($paramNode->ownerDocument->saveXML($paramNode)));
-                    }
-                    // ADD LABEL
-                    echo '<param name="DISPLAY" type="string" label="'.$mess[359].'" description="'.$mess[429].'" mandatory="true" default="'.$defaultLabel.'"/>';
-                    print("</template>");
-                }
-                AJXP_XMLWriter::close("repository_templates");
-
-
-            break;
-
-            case "user_create_repository" :
-
-                $tplId = $httpVars["template_id"];
-                $tplRepo = ConfService::getRepositoryById($tplId);
-                $options = array();
-                AJXP_Utils::parseStandardFormParameters($httpVars, $options);
-                $loggedUser = AuthService::getLoggedUser();
-                $newRep = $tplRepo->createTemplateChild(AJXP_Utils::sanitize($httpVars["DISPLAY"]), $options, null, $loggedUser->getId());
-                $gPath = $loggedUser->getGroupPath();
-                if (!empty($gPath)) {
-                    $newRep->setGroupPath($gPath);
-                }
-                $res = ConfService::addRepository($newRep);
-                AJXP_XMLWriter::header();
-                if ($res == -1) {
-                    AJXP_XMLWriter::sendMessage(null, $mess[426]);
-                } else {
-                    // Make sure we do not overwrite otherwise loaded rights.
-                    $loggedUser->load();
-                    $loggedUser->personalRole->setAcl($newRep->getUniqueId(), "rw");
-                    $loggedUser->save("superuser");
-                    $loggedUser->recomputeMergedRole();
-                    AuthService::updateUser($loggedUser);
-
-                    AJXP_XMLWriter::sendMessage($mess[425], null);
-                    AJXP_XMLWriter::reloadDataNode("", $newRep->getUniqueId());
-                    AJXP_XMLWriter::reloadRepositoryList();
-                }
-                AJXP_XMLWriter::close();
-
-            break;
-
-            case "user_delete_repository" :
-
-                $repoId = $httpVars["repository_id"];
-                $repository = ConfService::getRepositoryById($repoId);
-                if (!$repository->getUniqueUser()||$repository->getUniqueUser()!=AuthService::getLoggedUser()->getId()) {
-                    throw new Exception("You are not allowed to perform this operation!");
-                }
-                $res = ConfService::deleteRepository($repoId);
-                AJXP_XMLWriter::header();
-                if ($res == -1) {
-                    AJXP_XMLWriter::sendMessage(null, $mess[427]);
-                } else {
-                    $loggedUser = AuthService::getLoggedUser();
-                    // Make sure we do not override remotely set rights
-                    $loggedUser->load();
-                    $loggedUser->personalRole->setAcl($repoId, "");
-                    $loggedUser->save("superuser");
-                    AuthService::updateUser($loggedUser);
-
-                    AJXP_XMLWriter::sendMessage($mess[428], null);
-                    AJXP_XMLWriter::reloadRepositoryList();
-                }
-                AJXP_XMLWriter::close();
-
-            break;
-
-            case "user_delete_user":
-
-                $userId = $httpVars["user_id"];
-                $userObject = ConfService::getConfStorageImpl()->createUserObject($userId);
-                if ($userObject == null || !$userObject->hasParent() || $userObject->getParent() != AuthService::getLoggedUser()->getId()) {
-                    throw new Exception("You are not allowed to edit this user");
-                }
-                AuthService::deleteUser($userId);
-                echo "SUCCESS";
-
-            break;
-
-            case "user_list_authorized_users" :
-
-                $defaultFormat = "html";
-                if(isSet($httpVars["format"]) && $httpVars["format"] == "xml"){
-                    header('Content-Type: text/xml; charset=UTF-8');
-                    header('Cache-Control: no-cache');
-                    print('<?xml version="1.0" encoding="UTF-8"?>');
-                }else{
-                    HTMLWriter::charsetHeader();
-                }
-                if (!ConfService::getAuthDriverImpl()->usersEditable()) {
-                    break;
-                }
-                $loggedUser = AuthService::getLoggedUser();
-                $crtValue = $httpVars["value"];
-                $usersOnly = isSet($httpVars["users_only"]) && $httpVars["users_only"] == "true";
-                $existingOnly = isSet($httpVars["existing_only"]) && $httpVars["existing_only"] == "true";
-                if(!empty($crtValue)) {
-                    $regexp = '^'.$crtValue;
-                    $pregexp = '/^'.preg_quote($crtValue).'/i';
-                } else {
-                    $regexp = $pregexp = null;
-                }
-                $skipDisplayWithoutRegexp = ConfService::getCoreConf("USERS_LIST_REGEXP_MANDATORY", "conf");
-                if($skipDisplayWithoutRegexp && $regexp == null){
-                    $users = "";
-                    if (method_exists($this, "listUserTeams")) {
-                        $teams = $this->listUserTeams();
-                        foreach ($teams as $tId => $tData) {
-                            $users.= "<li class='complete_group_entry' data-group='/AJXP_TEAM/$tId' data-label=\"[team] ".$tData["LABEL"]."\"><span class='user_entry_label'>[team] ".$tData["LABEL"]."</span></li>";
-                        }
-                    }
-                    print("<ul>$users</ul>");
-                    break;
-                }
-                $limit = intval(ConfService::getCoreConf("USERS_LIST_COMPLETE_LIMIT", "conf"));
-                $searchAll = ConfService::getCoreConf("CROSSUSERS_ALLGROUPS", "conf");
-                $displayAll = ConfService::getCoreConf("CROSSUSERS_ALLGROUPS_DISPLAY", "conf");
-                $baseGroup = "/";
-                if( ($regexp == null && !$displayAll) || ($regexp != null && !$searchAll) ){
-                    $baseGroup = AuthService::filterBaseGroup("/");
-                }
-                AuthService::setGroupFiltering(false);
-                $allUsers = AuthService::listUsers($baseGroup, $regexp, 0, $limit, false);
-
-                if (!$usersOnly) {
-                    $allGroups = array();
-
-                    $roleOrGroup = ConfService::getCoreConf("GROUP_OR_ROLE", "conf");
-                    $rolePrefix = $excludeString = $includeString = null;
-                    if(!is_array($roleOrGroup)){
-                        $roleOrGroup = array("group_switch_value" => $roleOrGroup);
-                    }
-
-                    $listRoleType = false;
-
-                    if(isSet($roleOrGroup["PREFIX"])){
-                        $rolePrefix    = $loggedUser->mergedRole->filterParameterValue("core.conf", "PREFIX", null, $roleOrGroup["PREFIX"]);
-                        $excludeString = $loggedUser->mergedRole->filterParameterValue("core.conf", "EXCLUDED", null, $roleOrGroup["EXCLUDED"]);
-                        $includeString = $loggedUser->mergedRole->filterParameterValue("core.conf", "INCLUDED", null, $roleOrGroup["INCLUDED"]);
-                        $listUserRolesOnly = $loggedUser->mergedRole->filterParameterValue("core.conf", "LIST_ROLE_BY", null, $roleOrGroup["LIST_ROLE_BY"]);
-                        if (is_array($listUserRolesOnly) && isset($listUserRolesOnly["group_switch_value"])) {
-                            switch ($listUserRolesOnly["group_switch_value"]) {
-                                case "userroles":
-                                    $listRoleType = true;
-                                    break;
-                                case "allroles":
-                                    $listRoleType = false;
-                                    break;
-                                default;
-                                    break;
-                            }
-                        }
-                    }
-
-                    switch (strtolower($roleOrGroup["group_switch_value"])) {
-                        case 'user':
-                            // donothing
-                            break;
-                        case 'group':
-                            $authGroups = AuthService::listChildrenGroups($baseGroup);
-                            foreach ($authGroups as $gId => $gName) {
-                                $allGroups["AJXP_GRP_" . rtrim($baseGroup, "/")."/".ltrim($gId, "/")] = $gName;
-                            }
-                            break;
-                        case 'role':
-                            $allGroups = $this->getUserRoleList($loggedUser, $rolePrefix, $includeString, $excludeString, $listRoleType);
-                            break;
-                        case 'rolegroup';
-                            $groups = array();
-                            $authGroups = AuthService::listChildrenGroups($baseGroup);
-                            foreach ($authGroups as $gId => $gName) {
-                                $groups["AJXP_GRP_" . rtrim($baseGroup, "/")."/".ltrim($gId, "/")] = $gName;
-                            }
-                            $roles = $this->getUserRoleList($loggedUser, $rolePrefix, $includeString, $excludeString, $listRoleType);
-
-                            empty($groups) ? $allGroups = $roles : (empty($roles) ? $allGroups = $groups : $allGroups = array_merge($groups, $roles));
-                            //$allGroups = array_merge($groups, $roles);
-                            break;
-                        default;
-                            break;
-                    }
-                }
-
-
-                $users = "";
-                $index = 0;
-                if ($regexp != null && (!count($allUsers) || (!empty($crtValue) && !array_key_exists(strtolower($crtValue), $allUsers)))  && ConfService::getCoreConf("USER_CREATE_USERS", "conf") && !$existingOnly) {
-                    $users .= "<li class='complete_user_entry_temp' data-temporary='true' data-label='$crtValue'><span class='user_entry_label'>$crtValue (".$mess["448"].")</span></li>";
-                } else if ($existingOnly && !empty($crtValue)) {
-                    $users .= "<li class='complete_user_entry_temp' data-temporary='true' data-label='$crtValue' data-entry_id='$crtValue'><span class='user_entry_label'>$crtValue</span></li>";
-                }
-                $mess = ConfService::getMessages();
-                if (!$usersOnly && (empty($regexp)  ||  preg_match($pregexp, $mess["447"]))) {
-                    $users .= "<li class='complete_group_entry' data-group='AJXP_GRP_/' data-label=\"".$mess["447"]."\"><span class='user_entry_label'>".$mess["447"]."</span></li>";
-                }
-                $indexGroup = 0;
-                if (!$usersOnly && isset($allGroups) && is_array($allGroups)) {
-                    foreach ($allGroups as $groupId => $groupLabel) {
-                        if ($regexp == null ||  preg_match($pregexp, $groupLabel)) {
-                            $users .= "<li class='complete_group_entry' data-group='$groupId' data-label=\"$groupLabel\" data-entry_id='$groupId'><span class='user_entry_label'>".$groupLabel."</span></li>";
-                            $indexGroup++;
-                        }
-                        if($indexGroup == $limit) break;
-                    }
-                }
-                if (method_exists($this, "listUserTeams") && !$usersOnly) {
-                    $teams = $this->listUserTeams();
-                    foreach ($teams as $tId => $tData) {
-                        if($regexp == null  ||  preg_match($pregexp, $tData["LABEL"])){
-                            $users.= "<li class='complete_group_entry' data-group='/AJXP_TEAM/$tId' data-label=\"[team] ".$tData["LABEL"]."\"><span class='user_entry_label'>[team] ".$tData["LABEL"]."</span></li>";
-                        }
-                    }
-                }
-                foreach ($allUsers as $userId => $userObject) {
-                    if($userObject->getId() == $loggedUser->getId()) continue;
-                    if ( ( !$userObject->hasParent() &&  ConfService::getCoreConf("ALLOW_CROSSUSERS_SHARING", "conf")) || $userObject->getParent() == $loggedUser->getId() ) {
-                        $userLabel = ConfService::getUserPersonalParameter("USER_DISPLAY_NAME", $userObject, "core.conf", $userId);
-                        $userAvatar = ConfService::getUserPersonalParameter("avatar", $userObject, "core.conf", "");
-                        //if($regexp != null && ! (preg_match("/$regexp/i", $userId) || preg_match("/$regexp/i", $userLabel)) ) continue;
-                        $userDisplay = ($userLabel == $userId ? $userId : $userLabel . " ($userId)");
-                        if (ConfService::getCoreConf("USERS_LIST_HIDE_LOGIN", "conf") == true && $userLabel != $userId) {
-                            $userDisplay = $userLabel;
-                        }
-                        $userIsExternal = $userObject->hasParent() ? "true":"false";
-                        $users .= "<li class='complete_user_entry' data-external=\"$userIsExternal\" data-label=\"$userLabel\" data-avatar='$userAvatar' data-entry_id='$userId'><span class='user_entry_label'>".$userDisplay."</span></li>";
-                        $index ++;
-                    }
-                    if($index == $limit) break;
-                }
-                print("<ul>".$users."</ul>");
-                AuthService::setGroupFiltering(true);
-
-                break;
-
-            case "load_repository_info":
-
-                $data = array();
-                $repo = ConfService::getRepository();
-                if($repo != null){
-                    $users = AuthService::countUsersForRepository(ConfService::getRepository()->getId(), true);
-                    $data["core.users"] = $users;
-                    if(isSet($httpVars["collect"]) && $httpVars["collect"] == "true"){
-                        AJXP_Controller::applyHook("repository.load_info", array(&$data));
-                    }
-                }
-                HTMLWriter::charsetHeader("application/json");
-                echo json_encode($data);
-
-                break;
-
-            case "get_binary_param" :
-
-                if (isSet($httpVars["tmp_file"])) {
-                    $file = AJXP_Utils::getAjxpTmpDir()."/".AJXP_Utils::securePath($httpVars["tmp_file"]);
-                    if (isSet($file)) {
-                        session_write_close();
-                        header("Content-Type:image/png");
-                        readfile($file);
-                    }
-                } else if (isSet($httpVars["binary_id"])) {
-                    if (isSet($httpVars["user_id"]) && AuthService::getLoggedUser() != null
-                        && ( AuthService::getLoggedUser()->getId() == $httpVars["user_id"] || AuthService::getLoggedUser()->isAdmin() )) {
-                        $context = array("USER" => AJXP_Utils::sanitize($httpVars["user_id"], AJXP_SANITIZE_EMAILCHARS));
-                    } else if(AuthService::getLoggedUser() !== null) {
-                        $context = array("USER" => AuthService::getLoggedUser()->getId());
-                    } else {
-                        $context = array();
-                    }
-                    session_write_close();
-                    $this->loadBinary($context, AJXP_Utils::sanitize($httpVars["binary_id"], AJXP_SANITIZE_ALPHANUM));
-                }
-            break;
-
-            case "get_global_binary_param" :
-
-                session_write_close();
-                if (isSet($httpVars["tmp_file"])) {
-                    $file = AJXP_Utils::getAjxpTmpDir()."/".AJXP_Utils::securePath($httpVars["tmp_file"]);
-                    if (isSet($file)) {
-                        header("Content-Type:image/png");
-                        readfile($file);
-                    }
-                } else if (isSet($httpVars["binary_id"])) {
-                    $this->loadBinary(array(), AJXP_Utils::sanitize($httpVars["binary_id"], AJXP_SANITIZE_ALPHANUM));
-                }
-            break;
-
-            case "store_binary_temp" :
-
-                if (count($fileVars)) {
-                    $keys = array_keys($fileVars);
-                    $boxData = $fileVars[$keys[0]];
-                    $err = AJXP_Utils::parseFileDataErrors($boxData);
-                    if ($err != null) {
-
-                    } else {
-                        $rand = substr(md5(time()), 0, 6);
-                        $tmp = $rand."-". $boxData["name"];
-                        @move_uploaded_file($boxData["tmp_name"], AJXP_Utils::getAjxpTmpDir()."/". $tmp);
-                    }
-                }
-                if (isSet($tmp) && file_exists(AJXP_Utils::getAjxpTmpDir()."/".$tmp)) {
-                    print('<script type="text/javascript">');
-                    print('parent.formManagerHiddenIFrameSubmission("'.$tmp.'");');
-                    print('</script>');
-                }
-
-                break;
-            default;
-            break;
-        }
-        if (isset($logMessage) || isset($errorMessage)) {
-            $xmlBuffer .= AJXP_XMLWriter::sendMessage((isSet($logMessage)?$logMessage:null), (isSet($errorMessage)?$errorMessage:null), false);
-        }
-
-        if (isset($requireAuth)) {
-            $xmlBuffer .= AJXP_XMLWriter::requireAuth(false);
-        }
-
-        return $xmlBuffer;
-    }
-
-    /**
-     * @param AbstractAjxpUser $userObject
-     * @param string $rolePrefix get all roles with prefix
-     * @param string $includeString get roles in this string
-     * @param string $excludeString eliminate roles in this string
-     * @param bool $byUserRoles
-     * @return array
-     */
-    public function getUserRoleList($userObject, $rolePrefix, $includeString, $excludeString, $byUserRoles = false)
-    {
-        if (!$userObject){
-            return array();
-        }
-        if ($byUserRoles) {
-            $allUserRoles = $userObject->getRoles();
-        } else {
-            $allUserRoles = AuthService::getRolesList(array(), true);
-        }
-        $allRoles = array();
-        if (isset($allUserRoles)) {
-
-            // Exclude
-            if ($excludeString) {
-                if (strpos($excludeString, "preg:") !== false) {
-                    $matchFilterExclude = "/" . str_replace("preg:", "", $excludeString) . "/i";
-                } else {
-                    $valueFiltersExclude = array_map("trim", explode(",", $excludeString));
-                    $valueFiltersExclude = array_map("strtolower", $valueFiltersExclude);
-                }
-            }
-
-            // Include
-            if ($includeString) {
-                if (strpos($includeString, "preg:") !== false) {
-                    $matchFilterInclude = "/" . str_replace("preg:", "", $includeString) . "/i";
-                } else {
-                    $valueFiltersInclude = array_map("trim", explode(",", $includeString));
-                    $valueFiltersInclude = array_map("strtolower", $valueFiltersInclude);
-                }
-            }
-
-            foreach ($allUserRoles as $roleId => $role) {
-                if (!empty($rolePrefix) && strpos($roleId, $rolePrefix) === false) continue;
-                if (isSet($matchFilterExclude) && preg_match($matchFilterExclude, substr($roleId, strlen($rolePrefix)))) continue;
-                if (isSet($valueFiltersExclude) && in_array(strtolower(substr($roleId, strlen($rolePrefix))), $valueFiltersExclude)) continue;
-                if (isSet($matchFilterInclude) && !preg_match($matchFilterInclude, substr($roleId, strlen($rolePrefix)))) continue;
-                if (isSet($valueFiltersInclude) && !in_array(strtolower(substr($roleId, strlen($rolePrefix))), $valueFiltersInclude)) continue;
-                if(is_a($role, "AJXP_Role")) $roleObject = $role;
-                else $roleObject = AuthService::getRole($roleId);
-                $label = $roleObject->getLabel();
-                $label = !empty($label) ? $label : substr($roleId, strlen($rolePrefix));
-                $allRoles[$roleId] = $label;
-            }
-        }
-        return $allRoles;
-    }
-
-    /**
-     * @param string $actionName
-     * @param array $httpVars
-     * @param array $fileVars
-     */
-    public function publishPermissionsMask($actionName, $httpVars, $fileVars){
-        $mask = array();
-        HTMLWriter::charsetHeader("application/json");
-        if(!AuthService::usersEnabled() || AuthService::getLoggedUser() == null){
-            print json_encode($mask);
-            return;
-        }
-        $repoId = ConfService::getCurrentRepositoryId();
-        $role = AuthService::getLoggedUser()->mergedRole;
-        if($role->hasMask($repoId)){
-            $fullMask = $role->getMask($repoId);
-            foreach($fullMask->flattenTree() as $path => $permission){
-                // Do not show if "deny".
-                if($permission->denies()) continue;
-                $mask[$path] = array(
-                    "read" => $permission->canRead(),
-                    "write" => $permission->canWrite()
-                );
-            }
-        }
-        print json_encode($mask);
-        return;
-
-    }
-}
diff --git a/core/src/plugins/core.conf/class.CoreConfLoader.php b/core/src/plugins/core.conf/class.CoreConfLoader.php
deleted file mode 100644
index 9e1cf09f83..0000000000
--- a/core/src/plugins/core.conf/class.CoreConfLoader.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-/**
- * @package AjaXplorer_Plugins
- * @subpackage Core
- */
-class CoreConfLoader extends AJXP_Plugin
-{
-    /**
-     * @var AbstractConfDriver
-     */
-    protected static $confImpl;
-
-    /**
-     * @return AbstractConfDriver
-     */
-    public function getConfImpl()
-    {
-        if (!isSet(self::$confImpl) || (isset($this->pluginConf["UNIQUE_INSTANCE_CONFIG"]["instance_name"]) && self::$confImpl->getId() != $this->pluginConf["UNIQUE_INSTANCE_CONFIG"]["instance_name"])) {
-            if (isset($this->pluginConf["UNIQUE_INSTANCE_CONFIG"])) {
-                self::$confImpl = ConfService::instanciatePluginFromGlobalParams($this->pluginConf["UNIQUE_INSTANCE_CONFIG"], "AbstractConfDriver");
-                AJXP_PluginsService::getInstance()->setPluginUniqueActiveForType("conf", self::$confImpl->getName());
-            }
-        }
-        return self::$confImpl;
-
-    }
-
-    /*
-     * @return str filepath
-     */
-    public static function _getBootstrapFilePath() {
-        return AJXP_Plugin::getWorkDirForPluginId("boot.conf").DIRECTORY_SEPARATOR."bootstrap.json";
-    }
-
-    /*
-     * @return array jsonData
-     */
-    public static function getBootstrapConf() {
-       return AJXP_Utils::loadSerialFile(self::_getBootstrapFilePath(), false, "json");
-    }
-
-    /*
-     * @load json array into options
-     */
-    public static function loadBootstrapConfForPlugin($pluginId, &$options) {
-        $jsonData = self::getBootstrapConf();
-
-        if (is_array($jsonData) && isset($jsonData[$pluginId])) {
-            $options = array_merge($options, $jsonData[$pluginId]);
-        }
-    }
-
-    public static function saveBootstrapConf($jsonData) {
-        $jsonPath = self::_getBootstrapFilePath();
-        if (file_exists($jsonPath)) {
-            copy($jsonPath, $jsonPath.".bak");
-        }
-        AJXP_Utils::saveSerialFile($jsonPath, $jsonData, true, false, "json", true);
-    }
-
-}
diff --git a/core/src/plugins/core.conf/i18n/conf/ca.php b/core/src/plugins/core.conf/i18n/conf/ca.php
index 8def396758..074215fa45 100644
--- a/core/src/plugins/core.conf/i18n/conf/ca.php
+++ b/core/src/plugins/core.conf/i18n/conf/ca.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 // catalan translation: Salva Gómez <salva.gomez at gmail.com>, 2015
 $mess=array(
diff --git a/core/src/plugins/core.conf/i18n/conf/de.php b/core/src/plugins/core.conf/i18n/conf/de.php
index 7a4a7e6df4..593d86df7e 100644
--- a/core/src/plugins/core.conf/i18n/conf/de.php
+++ b/core/src/plugins/core.conf/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Generic Conf Features" => "Standard Konfiguration",
@@ -90,4 +90,4 @@
 "Always Override" => "Always Override",
 "Do not load groups and users list if no regexp is entered. Avoid sending large search on LDAP." => "Do not load groups and users list if no regexp is entered. Avoid sending large search on LDAP.",
 "Make regexp mandatory" => "Make regexp mandatory",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/core.conf/i18n/conf/en.php b/core/src/plugins/core.conf/i18n/conf/en.php
index 23919b8cb7..7054047a0e 100644
--- a/core/src/plugins/core.conf/i18n/conf/en.php
+++ b/core/src/plugins/core.conf/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Generic Conf Features" => "Generic Conf Features",
@@ -90,4 +90,4 @@
 "Always Override" => "Always Override",
 "Do not load groups and users list if no regexp is entered. Avoid sending large search on LDAP." => "Do not load groups and users list if no regexp is entered. Avoid sending large search on LDAP.",
 "Make regexp mandatory" => "Make regexp mandatory",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/core.conf/i18n/conf/es.php b/core/src/plugins/core.conf/i18n/conf/es.php
index 48d2c8cbc7..9c2b0648b6 100644
--- a/core/src/plugins/core.conf/i18n/conf/es.php
+++ b/core/src/plugins/core.conf/i18n/conf/es.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 // spanish translation: Salva Gómez <salva.gomez at gmail.com>, 2015
 
diff --git a/core/src/plugins/core.conf/i18n/conf/fr.php b/core/src/plugins/core.conf/i18n/conf/fr.php
index b7d7d2befa..f62189dbef 100644
--- a/core/src/plugins/core.conf/i18n/conf/fr.php
+++ b/core/src/plugins/core.conf/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Generic Conf Features" => "Configurations génériques",
@@ -90,4 +90,4 @@
 "Always Override" => "Toujours écraser",
 "Do not load groups and users list if no regexp is entered. Avoid sending large search on LDAP." => "Ne pas charger la liste des rôles ou des utilisateurs si aucun caractère n'est tapé. Evite d'envoyer de très large requêtes aux annuaires d'utilisateurs.",
 "Make regexp mandatory" => "Caractère de recherche obligatoire",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/core.conf/i18n/conf/it.php b/core/src/plugins/core.conf/i18n/conf/it.php
index a7985c3807..14cf05b503 100644
--- a/core/src/plugins/core.conf/i18n/conf/it.php
+++ b/core/src/plugins/core.conf/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Generic Conf Features" => "Configurazioni Generiche",
@@ -90,4 +90,4 @@
 "Always Override" => "Always Override",
 "Do not load groups and users list if no regexp is entered. Avoid sending large search on LDAP." => "Do not load groups and users list if no regexp is entered. Avoid sending large search on LDAP.",
 "Make regexp mandatory" => "Make regexp mandatory",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/core.conf/i18n/conf/pt.php b/core/src/plugins/core.conf/i18n/conf/pt.php
index 2bea4887ec..a19a031615 100644
--- a/core/src/plugins/core.conf/i18n/conf/pt.php
+++ b/core/src/plugins/core.conf/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Generic Conf Features" => "Funções de Configuração Genéricas",
diff --git a/core/src/plugins/core.conf/i18n/conf/ru.php b/core/src/plugins/core.conf/i18n/conf/ru.php
index 8b7abcc67b..1332efd12a 100644
--- a/core/src/plugins/core.conf/i18n/conf/ru.php
+++ b/core/src/plugins/core.conf/i18n/conf/ru.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Generic Conf Features" => "Основная конфигурация",
@@ -90,4 +90,4 @@
 "Always Override" => "Always Override",
 "Do not load groups and users list if no regexp is entered. Avoid sending large search on LDAP." => "Do not load groups and users list if no regexp is entered. Avoid sending large search on LDAP.",
 "Make regexp mandatory" => "Make regexp mandatory",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/core.conf/manifest.xml b/core/src/plugins/core.conf/manifest.xml
index 2bb41dcb42..97193379da 100644
--- a/core/src/plugins/core.conf/manifest.xml
+++ b/core/src/plugins/core.conf/manifest.xml
@@ -5,7 +5,7 @@
           xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd"
           mixins="dibidriver_provider"
         >
-    <class_definition classname="CoreConfLoader" filename="plugins/core.conf/class.CoreConfLoader.php"/>
+    <class_definition classname="Pydio\Conf\Core\CoreConfLoader" filename="plugins/core.conf/CoreConfLoader.php"/>
     <client_settings>
         <resources>
             <i18n namespace="core_conf" path="plugins/core.conf/i18n"/>
@@ -79,6 +79,6 @@
         <global_param name="NEWUSERS_EDIT_PARAMETERS" group="CONF_MESSAGE[External Users Creation]" type="string" label="CONF_MESSAGE[External users parameters]" description="CONF_MESSAGE[List of parameters to be edited when creating a new shared user.]" mandatory="false" default="email,USER_DISPLAY_NAME,lang" expose="true"/>
 
 
-        <global_param type="plugin_instance:conf" name="UNIQUE_INSTANCE_CONFIG" group="CONF_MESSAGE[Configuration Store Instance]" label="CONF_MESSAGE[Instance]" description="CONF_MESSAGE[Choose the configuration plugin]" mandatory="true" default="conf.serial"/>
+        <global_param type="plugin_instance:conf" name="UNIQUE_INSTANCE_CONFIG" group="CONF_MESSAGE[Configuration Store Instance]" label="CONF_MESSAGE[Instance]" description="CONF_MESSAGE[Choose the configuration plugin]" mandatory="true" default="boot.conf"/>
     </server_settings>
 </ajxpcore>
diff --git a/core/src/plugins/core.conf/standard_conf_actions.xml b/core/src/plugins/core.conf/standard_conf_actions.xml
index 43d65d0beb..586900539c 100644
--- a/core/src/plugins/core.conf/standard_conf_actions.xml
+++ b/core/src/plugins/core.conf/standard_conf_actions.xml
@@ -14,6 +14,12 @@
                     <output type="JSON|XML" description="Return XML or JSON depending on the format parameter."/>
                 </serverCallback>
             </processing>
+        </action>
+        <action name="user_state">
+            <!-- Alias to "state" for API V2 -->
+            <processing>
+                <serverCallback methodName="switchAction"/>
+            </processing>
         </action>
 		<action name="switch_repository">
 			<processing>
@@ -88,7 +94,7 @@
                        conn.onComplete = function(transport){
                             conn.TPL_XML = transport.responseXML;
                             var templates = XPathSelectNodes(conn.TPL_XML, "//template");
-                            conn.ORIGINAL_HEIGHT = (templates.length*39+25);
+                            conn.ORIGINAL_HEIGHT = (templates.length*47 + 21);
                             $('user_tpl_container').setStyle({height:conn.ORIGINAL_HEIGHT+'px'});
                             $('user_templates_selector').update('<div class="panelHeader">'+MessageHash[420]+'</div>');
                             for(var i=0;i<templates.length;i++){
@@ -184,7 +190,7 @@
                 <clientListener name="init"><![CDATA[
                 window.setTimeout(function(){
                     if(!$('get_bookmarks_button')) {
-                        if(!ajaxplorer.bookmarkBar) ajaxplorer.bookmarkBar = new BookmarksBar(null, {});
+                        if(!pydio.bookmarkBar) pydio.bookmarkBar = new BookmarksBar(null, {});
                         return;
                     }
                     if(!window.BookmarksBar) return;
@@ -202,7 +208,7 @@
                         image:ajxpResourcesFolder+'/images/actions/16/bookmark_add.png',
                         icon_class:'icon-plus-sign',
                         callback:function(e){
-                            var node = ajaxplorer.getContextNode();
+                            var node = pydio.getContextNode();
                             node.getMetadata().set('ajxp_bookmarked', 'true');
                             node.getMetadata().set('overlay_icon', 'bookmark.png');
                             node.getMetadata().set('overlay_class', 'icon-bookmark');
@@ -262,8 +268,8 @@
                 <clientCallback prepareModal="true" dialogOpenForm="custom_data_edit" dialogOkButtonOnly="false" dialogSkipButtons="false">
                     <dialogOnOpen><![CDATA[
                         var f = new FormManager();
-                          var definitions = f.parseParameters(ajaxplorer.getXmlRegistry(), "user/preferences/pref[@exposed]|//param[contains(@scope,'user')]");
-                          f.createParametersInputs(oForm.down('#custom_data_edit'), definitions, true, ajaxplorer.user.preferences, false, true);
+                          var definitions = f.parseParameters(pydio.getXmlRegistry(), "user/preferences/pref[@exposed]|//param[contains(@scope,'user')]");
+                          f.createParametersInputs(oForm.down('#custom_data_edit'), definitions, true, pydio.user.preferences, false, true);
                           modal.refreshDialogPosition();
                     ]]></dialogOnOpen>
                     <dialogOnComplete hideDialog="true"><![CDATA[
@@ -280,7 +286,7 @@
                                   if(event.memo != "user/preferences") return;
                                   pydio.Registry.logXmlUser();
                               });
-                              ajaxplorer.loadXmlRegistry(false, "user/preferences");
+                              pydio.loadXmlRegistry(false, "user/preferences");
                           };
                           conn.sendAsync();
                     ]]></dialogOnComplete>
@@ -315,7 +321,7 @@
                                 var values = $H(transport.responseJSON);
                                 values.set("existing_user_id", user_id);
 
-                                var params = $A(ajaxplorer.getPluginConfigs('conf').get('NEWUSERS_EDIT_PARAMETERS').split(','));
+                                var params = $A(pydio.getPluginConfigs('conf').get('NEWUSERS_EDIT_PARAMETERS').split(','));
                                 for(var i=0;i<params.length;i++){
                                     params[i] = "user/preferences/pref[@exposed]|//param[@name='"+params[i]+"']";
                                 }
@@ -338,7 +344,7 @@
                                     scope: "user",
                                     type: "password-create"
                                 }));
-                                var definitions = f.parseParameters(ajaxplorer.getXmlRegistry(), params.join('|'));
+                                var definitions = f.parseParameters(pydio.getXmlRegistry(), params.join('|'));
                                 definitions.each(function(el){ def1.push(el); });
                                 f.createParametersInputs(oForm.down('#user_create_user'), def1, true, values, false, true);
                                 modal.refreshDialogPosition();
@@ -360,7 +366,7 @@
                                    if($("address_book")){
                                         $("address_book").ajxpPaneObject.reloadDataModel();
                                   }
-                                  ajaxplorer.displayMessage("SUCCESS", MessageHash[521]);
+                                  pydio.displayMessage("SUCCESS", MessageHash[521]);
                                 }
                           };
                           conn.sendAsync();
@@ -378,7 +384,7 @@
             <processing>
                 <clientCallback prepareModal="true" dialogOpenForm="user_create_user" dialogOkButtonOnly="false" dialogSkipButtons="false">
                     <dialogOnOpen><![CDATA[
-                        var params = $A(ajaxplorer.getPluginConfigs('conf').get('NEWUSERS_EDIT_PARAMETERS').split(','));
+                        var params = $A(pydio.getPluginConfigs('conf').get('NEWUSERS_EDIT_PARAMETERS').split(','));
                         for(var i=0;i<params.length;i++){
                             params[i] = "user/preferences/pref[@exposed]|//param[@name='"+params[i]+"']";
                         }
@@ -401,7 +407,7 @@
                             scope: "user",
                             type: "password-create"
                         }));
-                        var definitions = f.parseParameters(ajaxplorer.getXmlRegistry(), params.join('|'));
+                        var definitions = f.parseParameters(pydio.getXmlRegistry(), params.join('|'));
                         definitions.each(function(el){ def1.push(el); });
                         f.createParametersInputs(oForm.down('#user_create_user'), def1, true, $H(), false, true);
                         modal.refreshDialogPosition();
@@ -437,39 +443,38 @@
 			<processing>
 				<clientCallback prepareModal="true" dialogOpenForm="switch_language_form" dialogOkButtonOnly="false" dialogSkipButtons="false">
 					<dialogOnOpen><![CDATA[
-					    if(ajaxplorer.user) var userLang = ajaxplorer.user.getPreference("lang");
+					    if(pydio.user) var userLang = pydio.user.getPreference("lang");
 						if(!userLang) userLang = window.ajxpBootstrap.parameters.get("currentLanguage");
 						var selector = $(oForm).select('select[id="language_selector"]')[0];
-						var languages = $H(window.ajxpBootstrap.parameters.get("availableLanguages"));
-						languages.each(function(pair){
-							var option = new Element('option', {value:pair.key,id:'lang_'+pair.key});
-							option.update(pair.value);
+						pydio.listLanguagesWithCallback(function(key, label){
+							var option = new Element('option', {value:key,id:'lang_'+key});
+							option.update(label);
 							selector.insert(option);
 						});
 						selector.setValue(userLang);
 						selector.observe("change", function(){
 							var value = selector.getValue();
-							if(ajaxplorer.user){
-    							ajaxplorer.user.setPreference("lang", selector.getValue());
-	    						ajaxplorer.user.savePreference("lang");
+							if(pydio.user){
+    							pydio.user.setPreference("lang", selector.getValue());
+	    						pydio.user.savePreference("lang");
 	    					}
 						});
 						$(oForm).up('.dialogContent').previous('.dialogTitle').select('span').invoke('remove');
 					]]></dialogOnOpen>
 					<dialogOnComplete hideDialog="true"><![CDATA[
-                        if(ajaxplorer.user){
-                            var oUser = ajaxplorer.user;
+                        if(pydio.user){
+                            var oUser = pydio.user;
                             if(oUser.getPreference('lang') != null
                                 && oUser.getPreference('lang') != ""
-                                && oUser.getPreference('lang') != ajaxplorer.currentLanguage)
+                                && oUser.getPreference('lang') != pydio.currentLanguage)
                             {
-                                ajaxplorer.loadI18NMessages(oUser.getPreference('lang'));
-                                ajaxplorer.displayMessage('SUCCESS', MessageHash[241]);
+                                pydio.loadI18NMessages(oUser.getPreference('lang'));
+                                pydio.displayMessage('SUCCESS', MessageHash[241]);
                             }
                         }else{
                             var selector = $(oForm).select('select[id="language_selector"]')[0];
                             var value = selector.getValue();
-                            ajaxplorer.loadI18NMessages(value);
+                            pydio.loadI18NMessages(value);
                             window.ajxpBootstrap.parameters.set("currentLanguage", value);
                         }
 					]]></dialogOnComplete>
@@ -495,28 +500,28 @@
 			<processing>
 				<clientCallback prepareModal="true" dialogOpenForm="webdav_pref_form" dialogOkButtonOnly="true" dialogSkipButtons="false">
 					<dialogOnOpen><![CDATA[
-					if(!ajaxplorer.user) return;
+					if(!pydio.user) return;
 					var cont = $('webdav_repo_list');
 					cont.update('');
 					var even = false;
 					var conn = new Connexion();
 					conn.setParameters(new Hash({get_action:'webdav_preferences'}));
 					conn.onComplete = function(transport){
-						ajaxplorer.webdavCurrentPreferences = transport.responseJSON;
-						$('webdav_activator').checked = ajaxplorer.webdavCurrentPreferences.webdav_active;
-						if($('webdav_activator').checked && !ajaxplorer.webdavCurrentPreferences.digest_set
-						    && !ajaxplorer.webdavCurrentPreferences.webdav_force_basic) {
+						pydio.webdavCurrentPreferences = transport.responseJSON;
+						$('webdav_activator').checked = pydio.webdavCurrentPreferences.webdav_active;
+						if($('webdav_activator').checked && !pydio.webdavCurrentPreferences.digest_set
+						    && !pydio.webdavCurrentPreferences.webdav_force_basic) {
 						    $('webdav_password_form').show();
 						}
-                        ProtoCompat.map2hash(ajaxplorer.user.getRepositoriesList()).each(function(pair){
-                            if(ajaxplorer.webdavCurrentPreferences.webdav_repositories[pair.key]){
+                        ProtoCompat.map2hash(pydio.user.getRepositoriesList()).each(function(pair){
+                            if(pydio.webdavCurrentPreferences.webdav_repositories[pair.key]){
                                 var div = new Element('div', {className:(even?'even':'')});
-                                div.update('<span>'+pair.value.label+'</span><input readonly type="text" value="'+ ajaxplorer.webdavCurrentPreferences.webdav_repositories[pair.key] +'">' );
+                                div.update('<span>'+pair.value.label+'</span><input readonly type="text" value="'+ pydio.webdavCurrentPreferences.webdav_repositories[pair.key] +'">' );
                                 cont.insert(div);
                                 even = !even;
                             }
                         });
-                        modal.getForm().down('#webdav_main_access').setValue(ajaxplorer.webdavCurrentPreferences.webdav_base_url);
+                        modal.getForm().down('#webdav_main_access').setValue(pydio.webdavCurrentPreferences.webdav_base_url);
                         modal.getForm().down('#webdav_main_access').observe("click", function(){
                             modal.getForm().down('#webdav_main_access').select();
                         });
@@ -539,21 +544,21 @@
                                     activate:(checked?'true':'false')
                                 }));
                                 conn.onComplete = function(transport){
-                                    ajaxplorer.webdavCurrentPreferences = transport.responseJSON;
-                                    if(ajaxplorer.webdavCurrentPreferences.webdav_active){
-                                        if(!ajaxplorer.webdavCurrentPreferences.digest_set
-                                        || ajaxplorer.webdavCurrentPreferences.webdav_force_basic) {
+                                    pydio.webdavCurrentPreferences = transport.responseJSON;
+                                    if(pydio.webdavCurrentPreferences.webdav_active){
+                                        if(!pydio.webdavCurrentPreferences.digest_set
+                                        || pydio.webdavCurrentPreferences.webdav_force_basic) {
                                             $('webdav_password_form').show();
                                         }
-                                        ajaxplorer.displayMessage("SUCCESS", MessageHash[408]);
+                                        pydio.displayMessage("SUCCESS", MessageHash[408]);
                                     }else {
                                         $('webdav_password_form').hide();
-                                        ajaxplorer.displayMessage("SUCCESS", MessageHash[409]);
+                                        pydio.displayMessage("SUCCESS", MessageHash[409]);
                                     }
                                 };
                                 conn.sendAsync();
                             });
-                            if(!ajaxplorer.webdavCurrentPreferences.digest_set){
+                            if(!pydio.webdavCurrentPreferences.digest_set){
                                 $('webdav_pass_saver').observe("click", function(){
                                     var conn = new Connexion();
                                     conn.setMethod('POST');
@@ -562,7 +567,7 @@
                                         webdav_pass: $('webdav_password').value
                                     }));
                                     conn.onComplete = function(transport){
-                                        ajaxplorer.displayMessage("SUCCESS", MessageHash[410]);
+                                        pydio.displayMessage("SUCCESS", MessageHash[410]);
                                     };
                                     conn.sendAsync();
                                 });
@@ -603,8 +608,8 @@
             <rightsContext adminOnly="false" noUser="false" read="false" userLogged="only" write="false"/>
             <processing>
                 <clientCallback><![CDATA[
-                    if(!ajaxplorer.repositoryId || ajaxplorer.repositoryId != "ajxp_user"){
-                        ajaxplorer.triggerRepositoryChange('ajxp_user');
+                    if(!pydio.repositoryId || pydio.repositoryId != "ajxp_user"){
+                        pydio.triggerRepositoryChange('ajxp_user');
                     }
                 ]]></clientCallback>
             </processing>
@@ -616,8 +621,8 @@
             <rightsContext adminOnly="true" noUser="true" read="false" userLogged="only" write="false"/>
             <processing>
                 <clientCallback><![CDATA[
-                    if(!ajaxplorer.repositoryId || ajaxplorer.repositoryId != "ajxp_conf"){
-                        ajaxplorer.triggerRepositoryChange('ajxp_conf');
+                    if(!pydio.repositoryId || pydio.repositoryId != "ajxp_conf"){
+                        pydio.triggerRepositoryChange('ajxp_conf');
                     }
                 ]]></clientCallback>
             </processing>
@@ -626,25 +631,9 @@
     <client_configs>
         <component_config className="AjxpTabulator::userdashboard_main_tab">
             <additional_tab id="webdav_pane"
-                            tabInfo='{"id":"my-webdav-data","iconClass":"icon-cog","element":"webdav_pane","closeable":false,"label":"403","title":"403","dontFocus":true,"position":3}'
+                            tabInfo='{"id":"webdav","iconClass":"icon-cog","element":"webdav_pane","closeable":false,"label":"403","title":"403","dontFocus":true,"position":3}'
                             paneInfo='{"type":"widget"}'><![CDATA[
-                <div id="webdav_pane" ajxpClass="WebDAVprefsEditor" class="tabbed_editor">
-                    <div class="action_bar" style="height: 33px;">&nbsp;</div>
-                    <h3 class="dashboard_panel_title">AJXP_MESSAGE[403]</h3>
-                    <div style="padding:10px;overflow: auto;" class="fit_me_to_bottom">
-                        <div style="padding:10px;"><input type="checkbox" id="webdav_activator" style="width:16px;" name="webdav_activator"> <label for="webdav_activator">AJXP_MESSAGE[406]</label></div>
-                        <div class="dialogLegend" style="margin-bottom: 2px;padding: 10px;" ajxp_message_id="404">AJXP_MESSAGE[404]</div>
-                        <div id="webdav_password_form" style="display:none;text-align: left;padding-left: 15px;height: 42px;font-size: 0.9em;padding-top: 5px;">
-                            <div style="width: 70%; float: left; padding-right: 5px; text-align: right;">AJXP_MESSAGE[407]</div><input type="password" id="webdav_password" style="float:left;height: 24px;width: 80px !important;"> <input type="image" src="AJXP_THEME_FOLDER/images/actions/22/dialog_ok_apply.png" height="22" width="22" title="OK" id="webdav_pass_saver">
-                        </div>
-                        <div class="dialogLegend" style="margin: 10px;" ajxp_message_id="405">AJXP_MESSAGE[405]</div>
-                        <input type="text" style="width: 95% !important;" id="webdav_main_access" value="AJXP_MESSAGE[466]" readonly/>
-                        <div class="dialogLegend" id="perworkspace-urls-toggle" style="margin-bottom: 2px; padding:5px;" ajxp_message_id="405">
-                        <span class="icon-caret-right"></span>AJXP_MESSAGE[465]</div>
-                        <div id="webdav_repo_list" style="display:none; height: 200px; overflow:auto; margin: 10px;"></div>
-                        <input type="hidden" name="get_action" value="webdav_preferences">
-                    </div>
-                </div>
+                <div id="webdav_pane" ajxpClass="AjxpReactComponent" class="tabbed_editor" ajxpOptions='{"componentNamespace":"UserAccount","componentName":"WebDAVPane"}'></div>
                 ]]></additional_tab>
         </component_config>
         <component_config className="InfoPanel">
diff --git a/core/src/plugins/core.index/AbstractSearchEngineIndexer.php b/core/src/plugins/core.index/AbstractSearchEngineIndexer.php
new file mode 100644
index 0000000000..19aaaca75f
--- /dev/null
+++ b/core/src/plugins/core.index/AbstractSearchEngineIndexer.php
@@ -0,0 +1,170 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Access\Indexer\Core;
+
+use DOMNode;
+use DOMXPath;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Vars\StatHelper;
+
+use Pydio\Core\Utils\Vars\VarsFilter;
+use Pydio\Access\Meta\Core\AbstractMetaSource;
+
+/**
+ * Class AbstractSearchEngineIndexer
+ * @package Pydio\Access\Indexer\Core
+ */
+abstract class AbstractSearchEngineIndexer extends AbstractMetaSource
+{
+
+    /**
+     * @param DOMNode $contribNode
+     */
+    public function parseSpecificContributions(ContextInterface $ctx, \DOMNode &$contribNode)
+    {
+        parent::parseSpecificContributions($ctx, $contribNode);
+        if ($this->getContextualOption($ctx, "HIDE_MYSHARES_SECTION") !== true) return;
+        if ($contribNode->nodeName != "client_configs") return;
+        $actionXpath = new DOMXPath($contribNode->ownerDocument);
+        $nodeList = $actionXpath->query('component_config[@className="AjxpPane::navigation_scroller"]', $contribNode);
+        if (!$nodeList->length) return;
+        $contribNode->removeChild($nodeList->item(0));
+    }
+
+    /**
+     * @param AJXP_Node $ajxpNode
+     * @return null|string
+     */
+    protected function extractIndexableContent($ajxpNode)
+    {
+
+        $ext = strtolower(pathinfo($ajxpNode->getLabel(), PATHINFO_EXTENSION));
+        if (in_array($ext, explode(",", $this->getContextualOption($ajxpNode->getContext(), "PARSE_CONTENT_TXT")))) {
+            return file_get_contents($ajxpNode->getUrl());
+        }
+        $unoconv = $this->getContextualOption($ajxpNode->getContext(), "UNOCONV");
+        $pipe = false;
+        if (!empty($unoconv) && in_array($ext, array("doc", "odt", "xls", "ods"))) {
+            $targetExt = "txt";
+            if (in_array($ext, array("xls", "ods"))) {
+                $targetExt = "csv";
+            } else if (in_array($ext, array("odp", "ppt"))) {
+                $targetExt = "pdf";
+                $pipe = true;
+            }
+            $realFile = call_user_func(array($ajxpNode->wrapperClassName, "getRealFSReference"), $ajxpNode->getUrl());
+            $unoconv = "HOME=" . ApplicationState::getAjxpTmpDir() . " " . $unoconv . " --stdout -f $targetExt " . escapeshellarg($realFile);
+            if ($pipe) {
+                $newTarget = str_replace(".$ext", ".pdf", $realFile);
+                $unoconv .= " > $newTarget";
+                register_shutdown_function("unlink", $newTarget);
+            }
+            $output = array();
+            exec($unoconv, $output, $return);
+            if (!$pipe) {
+                $out = implode("\n", $output);
+                $enc = 'ISO-8859-1';
+                $asciiString = iconv($enc, 'ASCII//TRANSLIT//IGNORE', $out);
+                return $asciiString;
+            } else {
+                $ext = "pdf";
+            }
+        }
+        $pdftotext = $this->getContextualOption($ajxpNode->getContext(), "PDFTOTEXT");
+        if (!empty($pdftotext) && in_array($ext, array("pdf"))) {
+            $realFile = call_user_func(array($ajxpNode->wrapperClassName, "getRealFSReference"), $ajxpNode->getUrl());
+            if ($pipe && isset($newTarget) && is_file($newTarget)) {
+                $realFile = $newTarget;
+            }
+            $cmd = $pdftotext . " " . escapeshellarg($realFile) . " -";
+            $output = array();
+            exec($cmd, $output, $return);
+            $out = implode("\n", $output);
+            $enc = 'UTF8';
+            $asciiString = iconv($enc, 'ASCII//TRANSLIT//IGNORE', $out);
+            return $asciiString;
+        }
+        return null;
+    }
+
+    /**
+     * @param String $query
+     * @return String mixed
+     */
+    protected function filterSearchRangesKeywords($query)
+    {
+        if (strpos($query, "AJXP_SEARCH_RANGE_TODAY") !== false) {
+            $t1 = date("Ymd");
+            $t2 = date("Ymd");
+            $query = str_replace("AJXP_SEARCH_RANGE_TODAY", "[$t1 TO  $t2]", $query);
+        } else if (strpos($query, "AJXP_SEARCH_RANGE_YESTERDAY") !== false) {
+            $t1 = date("Ymd", mktime(0, 0, 0, date('m'), date('d') - 1, date('Y')));
+            $t2 = date("Ymd", mktime(0, 0, 0, date('m'), date('d') - 1, date('Y')));
+            $query = str_replace("AJXP_SEARCH_RANGE_YESTERDAY", "[$t1 TO $t2]", $query);
+        } else if (strpos($query, "AJXP_SEARCH_RANGE_LAST_WEEK") !== false) {
+            $t1 = date("Ymd", mktime(0, 0, 0, date('m'), date('d') - 7, date('Y')));
+            $t2 = date("Ymd", mktime(0, 0, 0, date('m'), date('d'), date('Y')));
+            $query = str_replace("AJXP_SEARCH_RANGE_LAST_WEEK", "[$t1 TO $t2]", $query);
+        } else if (strpos($query, "AJXP_SEARCH_RANGE_LAST_MONTH") !== false) {
+            $t1 = date("Ymd", mktime(0, 0, 0, date('m') - 1, date('d'), date('Y')));
+            $t2 = date("Ymd", mktime(0, 0, 0, date('m'), date('d'), date('Y')));
+            $query = str_replace("AJXP_SEARCH_RANGE_LAST_MONTH", "[$t1 TO $t2]", $query);
+        } else if (strpos($query, "AJXP_SEARCH_RANGE_LAST_YEAR") !== false) {
+            $t1 = date("Ymd", mktime(0, 0, 0, date('m'), date('d'), date('Y') - 1));
+            $t2 = date("Ymd", mktime(0, 0, 0, date('m'), date('d'), date('Y')));
+            $query = str_replace("AJXP_SEARCH_RANGE_LAST_YEAR", "[$t1 TO $t2]", $query);
+        }
+
+        $split = array_map("trim", explode("AND", $query));
+        foreach ($split as $s) {
+            list($k, $v) = explode(":", $s, 2);
+            if ($k == "ajxp_bytesize") {
+                //list($from, $to) = sscanf($v, "[%s TO %s]");
+                preg_match('/\[(.*) TO (.*)\]/', $v, $matches);
+                $oldSize = $s;
+                $newSize = "ajxp_bytesize:[" . intval(StatHelper::convertBytes($matches[1])) . " TO " . intval(StatHelper::convertBytes($matches[2])) . "]";
+            }
+        }
+        if (isSet($newSize) && isSet($oldSize)) {
+            $query = str_replace($oldSize, $newSize, $query);
+        }
+
+        return $query;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @return string
+     */
+    protected function buildSpecificId(ContextInterface $ctx)
+    {
+        $specificId = "";
+        $specKey = $this->getContextualOption($ctx, "repository_specific_keywords");
+        if (!empty($specKey)) {
+            $specificId = "-" . str_replace(array(",", "/"), array("-", "__"), VarsFilter::filter($specKey, $ctx));
+        }
+        return $ctx->getRepositoryId() . $specificId;
+    }
+
+} 
\ No newline at end of file
diff --git a/core/src/plugins/core.index/CoreIndexer.php b/core/src/plugins/core.index/CoreIndexer.php
new file mode 100644
index 0000000000..19b8f86fa1
--- /dev/null
+++ b/core/src/plugins/core.index/CoreIndexer.php
@@ -0,0 +1,282 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Access\Indexer\Core;
+
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Model\UserInterface;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Tasks\Schedule;
+use Pydio\Tasks\Task;
+use Pydio\Tasks\TaskService;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Class CoreIndexer
+ * @package Pydio\Access\Indexer\Core
+ */
+class CoreIndexer extends Plugin {
+
+    private $verboseIndexation = false;
+    private $currentTaskId;
+
+    /**
+     * @param string $message
+     */
+    public function debug($message = ""){
+        $this->logDebug("core.indexer", $message);
+        if($this->verboseIndexation && ApplicationState::sapiIsCli()){
+            print($message."\n");
+        }
+    }
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @return null|\Psr\Http\Message\ResponseInterface
+     * @throws \Exception
+     * @throws \Pydio\Core\Exception\PydioException
+     */
+    public function applyAction(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface)
+    {
+
+        $actionName = $requestInterface->getAttribute("action");
+        $httpVars   = $requestInterface->getParsedBody();
+        /** @var \Pydio\Core\Model\ContextInterface $ctx */
+        $ctx        = $requestInterface->getAttribute("ctx");
+        $this->currentTaskId = $requestInterface->getAttribute("pydio-task-id") OR null;
+        $mess       = LocaleService::getMessages();
+
+        if ($actionName !== "index") return null;
+
+        $userSelection = UserSelection::fromContext($ctx, $httpVars);
+        if($userSelection->isEmpty()){
+            $userSelection->addFile("/");
+        }
+        $nodes = $userSelection->buildNodes();
+
+        if (isSet($httpVars["verbose"]) && $httpVars["verbose"] == "true") {
+            $this->verboseIndexation = true;
+        }
+        $taskId = $requestInterface->getAttribute("pydio-task-id");
+        if (empty($taskId)) {
+            $task = TaskService::actionAsTask($ctx, "index", $httpVars, [$nodes[0]->getUrl()], Task::FLAG_STOPPABLE | Task::FLAG_RESUMABLE);
+            $task->setLabel($mess['core.index.3']);
+            $task->setSchedule(new Schedule(Schedule::TYPE_ONCE_DEFER));
+            TaskService::getInstance()->enqueueTask($task, $requestInterface, $responseInterface);
+            $responseInterface = $responseInterface->withBody(new \Pydio\Core\Http\Response\SerializableResponseStream(new \Pydio\Core\Http\Message\UserMessage("Indexation launched")));
+            return $responseInterface;
+        }
+        // GIVE BACK THE HAND TO USER
+        session_write_close();
+
+        foreach($nodes as $node){
+
+            $dir = $node->getPath() == "/" || is_dir($node->getUrl());
+            // SIMPLE FILE
+            if(!$dir){
+                try{
+                    $this->debug("Indexing - node.index ".$node->getUrl());
+                    Controller::applyHook("node.index", array($node));
+                    if($this->currentTaskId){
+                        TaskService::getInstance()->updateTaskStatus($this->currentTaskId, Task::STATUS_COMPLETE, "Done");
+                    }
+                }catch (\Exception $e){
+                    $this->debug("Error Indexing Node ".$node->getUrl()." (".$e->getMessage().")");
+                }
+            }else{
+                try{
+                    $this->recursiveIndexation($ctx, $node);
+                }catch (\Exception $e){
+                    $this->debug("Indexation of ".$node->getUrl()." interrupted by error: (".$e->getMessage().")");
+                }
+            }
+
+        }
+
+        return null;
+    }
+
+    /**
+     *
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     * @param int $depth
+     * @throws \Exception
+     */
+    public function recursiveIndexation(ContextInterface $ctx, $node, $depth = 0)
+    {
+        $repository = $node->getRepository();
+        $messages = LocaleService::getMessages();
+        $user = $ctx->getUser();
+        if($depth == 0){
+            $this->debug("Starting indexation - node.index.recursive.start  - ". memory_get_usage(true) ."  - ". $node->getUrl());
+            $this->setIndexStatus("RUNNING", str_replace("%s", $node->getPath(), $messages["core.index.8"]), $repository, $user);
+            Controller::applyHook("node.index.recursive.start", array($node));
+        }else{
+            if($this->isInterruptRequired($repository, $user)){
+                $this->debug("Interrupting indexation! - node.index.recursive.end - ". $node->getUrl());
+                Controller::applyHook("node.index.recursive.end", array($node));
+                $this->releaseStatus($repository, $user);
+                throw new \Exception("User interrupted");
+            }
+        }
+
+        if(!ApplicationState::sapiIsCli()) @set_time_limit(120);
+        $url = $node->getUrl();
+        $this->debug("Indexing Node parent node ".$url);
+        $this->setIndexStatus("RUNNING", str_replace("%s", $node->getPath(), $messages["core.index.8"]), $repository, $user);
+        if($node->getPath() != "/"){
+            try {
+                Controller::applyHook("node.index", array($node));
+            } catch (\Exception $e) {
+                $this->debug("Error Indexing Node ".$url." (".$e->getMessage().")");
+            }
+        }
+
+        $handle = opendir($url);
+        if ($handle !== false) {
+            while ( ($child = readdir($handle)) != false) {
+                if($child[0] == ".") continue;
+                $childNode = new AJXP_Node(rtrim($url, "/")."/".$child);
+                $childUrl = $childNode->getUrl();
+                if(is_dir($childUrl)){
+                    $this->debug("Entering recursive indexation for ".$childUrl);
+                    $this->recursiveIndexation($ctx, $childNode, $depth + 1);
+                }else{
+                    try {
+                        $this->debug("Indexing Node ".$childUrl);
+                        Controller::applyHook("node.index", array($childNode));
+                    } catch (\Exception $e) {
+                        $this->debug("Error Indexing Node ".$childUrl." (".$e->getMessage().")");
+                    }
+                }
+            }
+            closedir($handle);
+        } else {
+            $this->debug("Cannot open $url!!");
+        }
+        if($depth == 0){
+            $this->debug("End indexation - node.index.recursive.end - ". memory_get_usage(true) ."  -  ". $node->getUrl());
+            $this->setIndexStatus("RUNNING", "Indexation finished, cleaning...", $repository, $user, false);
+            Controller::applyHook("node.index.recursive.end", array($node));
+            $this->releaseStatus($repository, $user);
+            $this->debug("End indexation - After node.index.recursive.end - ". memory_get_usage(true) ."  -  ". $node->getUrl());
+        }
+    }
+
+
+    /**
+     * @param \Pydio\Core\Model\RepositoryInterface $repository
+     * @param UserInterface $user
+     * @return string
+     */
+    protected function buildIndexLockKey($repository, $user){
+        $scope = $repository->securityScope();
+        $key = $repository->getId();
+        if($scope == "USER"){
+            $key .= "-".$user->getId();
+        }else if($scope == "GROUP"){
+            $key .= "-".ltrim(str_replace("/", "__", $user->getGroupPath()), "__");
+        }
+        return $key;
+    }
+
+
+    /**
+     * @param String $status
+     * @param String $message
+     * @param \Pydio\Core\Model\RepositoryInterface $repository
+     * @param UserInterface $user
+     * @param boolean $stoppable
+     */
+    protected function setIndexStatus($status, $message, $repository, $user, $stoppable = true)
+    {
+        if(isSet($this->currentTaskId)){
+            TaskService::getInstance()->updateTaskStatus($this->currentTaskId, Task::STATUS_RUNNING, $message, $stoppable);
+        }
+        $iPath = (defined('AJXP_SHARED_CACHE_DIR')?AJXP_SHARED_CACHE_DIR:AJXP_CACHE_DIR)."/indexes";
+        if(!is_dir($iPath)) mkdir($iPath,0755, true);
+        $f = $iPath."/.indexation_status-".$this->buildIndexLockKey($repository, $user);
+        $this->debug("Updating file ".$f." with status $status - $message");
+        file_put_contents($f, strtoupper($status).":".$message);
+    }
+
+    /**
+     * @param \Pydio\Core\Model\RepositoryInterface $repository
+     * @param UserInterface $user
+     * @return array Array(STATUS, Message)
+     */
+    protected function getIndexStatus($repository, $user)
+    {
+        $f = (defined('AJXP_SHARED_CACHE_DIR')?AJXP_SHARED_CACHE_DIR:AJXP_CACHE_DIR)."/indexes/.indexation_status-".$this->buildIndexLockKey($repository, $user);
+        if (file_exists($f)){
+            return explode(":", file_get_contents($f));
+        }else{
+            return array("", "");
+        }
+    }
+
+    /**
+     * @param \Pydio\Core\Model\RepositoryInterface $repository
+     * @param UserInterface $user
+     */
+    protected function releaseStatus($repository, $user)
+    {
+        if(isSet($this->currentTaskId)){
+            TaskService::getInstance()->updateTaskStatus($this->currentTaskId, Task::STATUS_COMPLETE, "Done");
+        }
+        $f = (defined('AJXP_SHARED_CACHE_DIR')?AJXP_SHARED_CACHE_DIR:AJXP_CACHE_DIR)."/indexes/.indexation_status-".$this->buildIndexLockKey($repository, $user);
+        $this->debug("Removing file ".$f);
+        @unlink($f);
+    }
+
+
+    /**
+     * @param \Pydio\Core\Model\RepositoryInterface $repository
+     * @param UserInterface $user
+     */
+    protected function requireInterrupt($repository, $user)
+    {
+        $this->setIndexStatus("INTERRUPT", "Interrupt required by user", $repository, $user);
+    }
+
+    /**
+     * @param \Pydio\Core\Model\RepositoryInterface $repository
+     * @param UserInterface $user
+     * @return boolean
+     */
+    protected function isInterruptRequired($repository, $user)
+    {
+        if(isSet($this->currentTaskId)){
+            $task = TaskService::getInstance()->getTaskById($this->currentTaskId);
+            return ($task->getStatus() == Task::STATUS_PAUSED);
+        }
+        list($status, $message) = $this->getIndexStatus($repository, $user);
+        return ($status == "INTERRUPT");
+    }
+
+} 
\ No newline at end of file
diff --git a/core/src/plugins/core.index/class.AbstractSearchEngineIndexer.php b/core/src/plugins/core.index/class.AbstractSearchEngineIndexer.php
deleted file mode 100644
index 3e8530f892..0000000000
--- a/core/src/plugins/core.index/class.AbstractSearchEngineIndexer.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: charles
- * Date: 15/04/2015
- * Time: 14:52
- */
-
-abstract class AbstractSearchEngineIndexer extends AJXP_AbstractMetaSource {
-
-    /**
-     * @param DOMNode $contribNode
-     */
-    public function parseSpecificContributions(&$contribNode){
-        parent::parseSpecificContributions($contribNode);
-        if($this->getFilteredOption("HIDE_MYSHARES_SECTION") !== true) return;
-        if($contribNode->nodeName != "client_configs") return ;
-        $actionXpath=new DOMXPath($contribNode->ownerDocument);
-        $nodeList = $actionXpath->query('component_config[@className="AjxpPane::navigation_scroller"]', $contribNode);
-        if(!$nodeList->length) return ;
-        $contribNode->removeChild($nodeList->item(0));
-    }
-
-    /**
-     * @param AJXP_Node $ajxpNode
-     * @return null|string
-     */
-    protected function extractIndexableContent($ajxpNode){
-
-        $ext = strtolower(pathinfo($ajxpNode->getLabel(), PATHINFO_EXTENSION));
-        if (in_array($ext, explode(",",$this->getFilteredOption("PARSE_CONTENT_TXT")))) {
-            return file_get_contents($ajxpNode->getUrl());
-        }
-        $unoconv = $this->getFilteredOption("UNOCONV");
-        $pipe = false;
-        if (!empty($unoconv) && in_array($ext, array("doc", "odt", "xls", "ods"))) {
-            $targetExt = "txt";
-            if (in_array($ext, array("xls", "ods"))) {
-                $targetExt = "csv";
-            } else if (in_array($ext, array("odp", "ppt"))) {
-                $targetExt = "pdf";
-                $pipe = true;
-            }
-            $realFile = call_user_func(array($ajxpNode->wrapperClassName, "getRealFSReference"), $ajxpNode->getUrl());
-            $unoconv = "HOME=".AJXP_Utils::getAjxpTmpDir()." ".$unoconv." --stdout -f $targetExt ".escapeshellarg($realFile);
-            if ($pipe) {
-                $newTarget = str_replace(".$ext", ".pdf", $realFile);
-                $unoconv.= " > $newTarget";
-                register_shutdown_function("unlink", $newTarget);
-            }
-            $output = array();
-            exec($unoconv, $output, $return);
-            if (!$pipe) {
-                $out = implode("\n", $output);
-                $enc = 'ISO-8859-1';
-                $asciiString = iconv($enc, 'ASCII//TRANSLIT//IGNORE', $out);
-                return $asciiString;
-            } else {
-                $ext = "pdf";
-            }
-        }
-        $pdftotext = $this->getFilteredOption("PDFTOTEXT");
-        if (!empty($pdftotext) && in_array($ext, array("pdf"))) {
-            $realFile = call_user_func(array($ajxpNode->wrapperClassName, "getRealFSReference"), $ajxpNode->getUrl());
-            if ($pipe && isset($newTarget) && is_file($newTarget)) {
-                $realFile = $newTarget;
-            }
-            $cmd = $pdftotext." ".escapeshellarg($realFile)." -";
-            $output = array();
-            exec($cmd, $output, $return);
-            $out = implode("\n", $output);
-            $enc = 'UTF8';
-            $asciiString = iconv($enc, 'ASCII//TRANSLIT//IGNORE', $out);
-            return $asciiString;
-        }
-        return null;
-    }
-
-    /**
-     * @param String $query
-     * @return String mixed
-     */
-    protected function filterSearchRangesKeywords($query)
-    {
-        if (strpos($query, "AJXP_SEARCH_RANGE_TODAY") !== false) {
-            $t1 = date("Ymd");
-            $t2 = date("Ymd");
-            $query = str_replace("AJXP_SEARCH_RANGE_TODAY", "[$t1 TO  $t2]", $query);
-        } else if (strpos($query, "AJXP_SEARCH_RANGE_YESTERDAY") !== false) {
-            $t1 = date("Ymd", mktime(0,0,0,date('m'), date('d')-1, date('Y')));
-            $t2 = date("Ymd", mktime(0,0,0,date('m'), date('d')-1, date('Y')));
-            $query = str_replace("AJXP_SEARCH_RANGE_YESTERDAY", "[$t1 TO $t2]", $query);
-        } else if (strpos($query, "AJXP_SEARCH_RANGE_LAST_WEEK") !== false) {
-            $t1 = date("Ymd", mktime(0,0,0,date('m'), date('d')-7, date('Y')));
-            $t2 = date("Ymd", mktime(0,0,0,date('m'), date('d'), date('Y')));
-            $query = str_replace("AJXP_SEARCH_RANGE_LAST_WEEK", "[$t1 TO $t2]", $query);
-        } else if (strpos($query, "AJXP_SEARCH_RANGE_LAST_MONTH") !== false) {
-            $t1 = date("Ymd", mktime(0,0,0,date('m')-1, date('d'), date('Y')));
-            $t2 = date("Ymd", mktime(0,0,0,date('m'), date('d'), date('Y')));
-            $query = str_replace("AJXP_SEARCH_RANGE_LAST_MONTH", "[$t1 TO $t2]", $query);
-        } else if (strpos($query, "AJXP_SEARCH_RANGE_LAST_YEAR") !== false) {
-            $t1 = date("Ymd", mktime(0,0,0,date('m'), date('d'), date('Y')-1));
-            $t2 = date("Ymd", mktime(0,0,0,date('m'), date('d'), date('Y')));
-            $query = str_replace("AJXP_SEARCH_RANGE_LAST_YEAR", "[$t1 TO $t2]", $query);
-        }
-
-        $split = array_map("trim", explode("AND", $query));
-        foreach($split as $s){
-            list($k, $v) = explode(":", $s, 2);
-            if($k == "ajxp_bytesize"){
-                //list($from, $to) = sscanf($v, "[%s TO %s]");
-                preg_match('/\[(.*) TO (.*)\]/', $v, $matches);
-                $oldSize = $s;
-                $newSize = "ajxp_bytesize:[".intval(AJXP_Utils::convertBytes($matches[1]))." TO ".intval(AJXP_Utils::convertBytes($matches[2]))."]";
-            }
-        }
-        if(isSet($newSize) && isSet($oldSize)){
-            $query = str_replace($oldSize, $newSize, $query);
-        }
-
-        return $query;
-    }
-
-    /**
-     * @param String $repositoryId
-     * @param String $userId
-     * @return string
-     */
-    protected function buildSpecificId($repositoryId, $userId = null){
-        $specificId = "";
-        $specKey = $this->getFilteredOption("repository_specific_keywords");
-        if (!empty($specKey)) {
-            $specificId = "-".str_replace(array(",", "/"), array("-", "__"), AJXP_VarsFilter::filter($specKey, $userId));
-        }
-        return $repositoryId.$specificId;
-    }
-
-} 
\ No newline at end of file
diff --git a/core/src/plugins/core.index/class.CoreIndexer.php b/core/src/plugins/core.index/class.CoreIndexer.php
deleted file mode 100644
index 062efd4bbf..0000000000
--- a/core/src/plugins/core.index/class.CoreIndexer.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-class CoreIndexer extends AJXP_Plugin {
-
-    private $verboseIndexation = false;
-
-
-    public function debug($message = ""){
-        $this->logDebug("core.indexer", $message);
-        if($this->verboseIndexation && ConfService::currentContextIsCommandLine()){
-            print($message."\n");
-        }
-    }
-
-    public function applyAction($actionName, $httpVars, $fileVars)
-    {
-        $messages = ConfService::getMessages();
-
-        if ($actionName == "index") {
-
-            $repository = ConfService::getRepository();
-            $repositoryId = $repository->getId();
-            $userSelection = new UserSelection($repository, $httpVars);
-            if($userSelection->isEmpty()){
-                $userSelection->addFile("/");
-            }
-            $nodes = $userSelection->buildNodes();
-
-            if (isSet($httpVars["verbose"]) && $httpVars["verbose"] == "true") {
-                $this->verboseIndexation = true;
-            }
-
-            if (ConfService::backgroundActionsSupported() && !ConfService::currentContextIsCommandLine()) {
-                AJXP_Controller::applyActionInBackground($repositoryId, "index", $httpVars);
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::triggerBgAction("check_index_status", array("repository_id" => $repositoryId), sprintf($messages["core.index.8"], $nodes[0]->getPath()), true, 2);
-                if(!isSet($httpVars["inner_apply"])){
-                    AJXP_XMLWriter::close();
-                }
-                return null;
-            }
-
-            // GIVE BACK THE HAND TO USER
-            session_write_close();
-
-            foreach($nodes as $node){
-
-                $dir = $node->getPath() == "/" || is_dir($node->getUrl());
-                // SIMPLE FILE
-                if(!$dir){
-                    try{
-                        $this->debug("Indexing - node.index ".$node->getUrl());
-                        AJXP_Controller::applyHook("node.index", array($node));
-                    }catch (Exception $e){
-                        $this->debug("Error Indexing Node ".$node->getUrl()." (".$e->getMessage().")");
-                    }
-                }else{
-                    try{
-                        $this->recursiveIndexation($node);
-                    }catch (Exception $e){
-                        $this->debug("Indexation of ".$node->getUrl()." interrupted by error: (".$e->getMessage().")");
-                    }
-                }
-
-            }
-
-        } else if ($actionName == "check_index_status") {
-            $repoId = $httpVars["repository_id"];
-            list($status, $message) = $this->getIndexStatus(ConfService::getRepositoryById($repoId), AuthService::getLoggedUser());
-            if (!empty($status)) {
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::triggerBgAction("check_index_status", array("repository_id" => $repoId), $message, true, 3);
-                AJXP_XMLWriter::close();
-            } else {
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::triggerBgAction("info_message", array(), $messages["core.index.5"], true, 5);
-                AJXP_XMLWriter::close();
-            }
-        }
-        return null;
-    }
-
-    /**
-     *
-     * @param AJXP_Node $node
-     * @param int $depth
-     * @throws Exception
-     */
-    public function recursiveIndexation($node, $depth = 0)
-    {
-        $repository = $node->getRepository();
-        $user = $node->getUser();
-        $messages = ConfService::getMessages();
-        if($user == null && AuthService::usersEnabled()) $user = AuthService::getLoggedUser();
-        if($depth == 0){
-            $this->debug("Starting indexation - node.index.recursive.start  - ". memory_get_usage(true) ."  - ". $node->getUrl());
-            $this->setIndexStatus("RUNNING", str_replace("%s", SystemTextEncoding::toUTF8($node->getPath()), $messages["core.index.8"]), $repository, $user);
-            AJXP_Controller::applyHook("node.index.recursive.start", array($node));
-        }else{
-            if($this->isInterruptRequired($repository, $user)){
-                $this->debug("Interrupting indexation! - node.index.recursive.end - ". $node->getUrl());
-                AJXP_Controller::applyHook("node.index.recursive.end", array($node));
-                $this->releaseStatus($repository, $user);
-                throw new Exception("User interrupted");
-            }
-        }
-
-        if(!ConfService::currentContextIsCommandLine()) @set_time_limit(120);
-        $url = $node->getUrl();
-        $this->debug("Indexing Node parent node ".$url);
-        $this->setIndexStatus("RUNNING", str_replace("%s", SystemTextEncoding::toUTF8($node->getPath()), $messages["core.index.8"]), $repository, $user);
-        if($node->getPath() != "/"){
-            try {
-                AJXP_Controller::applyHook("node.index", array($node));
-            } catch (Exception $e) {
-                $this->debug("Error Indexing Node ".$url." (".$e->getMessage().")");
-            }
-        }
-
-        $handle = opendir($url);
-        if ($handle !== false) {
-            while ( ($child = readdir($handle)) != false) {
-                if($child[0] == ".") continue;
-                $childNode = new AJXP_Node(rtrim($url, "/")."/".$child);
-                $childUrl = $childNode->getUrl();
-                if(is_dir($childUrl)){
-                    $this->debug("Entering recursive indexation for ".$childUrl);
-                    $this->recursiveIndexation($childNode, $depth + 1);
-                }else{
-                    try {
-                        $this->debug("Indexing Node ".$childUrl);
-                        AJXP_Controller::applyHook("node.index", array($childNode));
-                    } catch (Exception $e) {
-                        $this->debug("Error Indexing Node ".$childUrl." (".$e->getMessage().")");
-                    }
-                }
-            }
-            closedir($handle);
-        } else {
-            $this->debug("Cannot open $url!!");
-        }
-        if($depth == 0){
-            $this->debug("End indexation - node.index.recursive.end - ". memory_get_usage(true) ."  -  ". $node->getUrl());
-            $this->setIndexStatus("RUNNING", "Indexation finished, cleaning...", $repository, $user);
-            AJXP_Controller::applyHook("node.index.recursive.end", array($node));
-            $this->releaseStatus($repository, $user);
-            $this->debug("End indexation - After node.index.recursive.end - ". memory_get_usage(true) ."  -  ". $node->getUrl());
-        }
-    }
-
-
-    /**
-     * @param Repository $repository
-     * @param AbstractAjxpUser $user
-     * @return Array
-     */
-    protected function buildIndexLockKey($repository, $user){
-        $scope = $repository->securityScope();
-        $key = $repository->getId();
-        if($scope == "USER"){
-            $key .= "-".$user->getId();
-        }else if($scope == "GROUP"){
-            $key .= "-".ltrim(str_replace("/", "__", $user->getGroupPath()), "__");
-        }
-        return $key;
-    }
-
-
-    /**
-     * @param String $status
-     * @param String $message
-     * @param Repository $repository
-     * @param AbstractAjxpUser $user
-     */
-    protected function setIndexStatus($status, $message, $repository, $user)
-    {
-        $iPath = (defined('AJXP_SHARED_CACHE_DIR')?AJXP_SHARED_CACHE_DIR:AJXP_CACHE_DIR)."/indexes";
-        if(!is_dir($iPath)) mkdir($iPath,0755, true);
-        $f = $iPath."/.indexation_status-".$this->buildIndexLockKey($repository, $user);
-        $this->debug("Updating file ".$f." with status $status - $message");
-        file_put_contents($f, strtoupper($status).":".$message);
-    }
-
-    /**
-     * @param Repository $repository
-     * @param AbstractAjxpUser $user
-     * @return Array Array(STATUS, Message)
-     */
-    protected function getIndexStatus($repository, $user)
-    {
-        $f = (defined('AJXP_SHARED_CACHE_DIR')?AJXP_SHARED_CACHE_DIR:AJXP_CACHE_DIR)."/indexes/.indexation_status-".$this->buildIndexLockKey($repository, $user);
-        if (file_exists($f)){
-            return explode(":", file_get_contents($f));
-        }else{
-            return array("", "");
-        }
-    }
-
-    /**
-     * @param Repository $repository
-     * @param AbstractAjxpUser $user
-     */
-    protected function releaseStatus($repository, $user)
-    {
-        $f = (defined('AJXP_SHARED_CACHE_DIR')?AJXP_SHARED_CACHE_DIR:AJXP_CACHE_DIR)."/indexes/.indexation_status-".$this->buildIndexLockKey($repository, $user);
-        $this->debug("Removing file ".$f);
-        @unlink($f);
-    }
-
-
-    /**
-     * @param Repository $repository
-     * @param AbstractAjxpUser $user
-     */
-    protected function requireInterrupt($repository, $user)
-    {
-        $this->setIndexStatus("INTERRUPT", "Interrupt required by user", $repository, $user);
-    }
-
-    /**
-     * @param Repository $repository
-     * @param AbstractAjxpUser $user
-     * @return boolean
-     */
-    protected function isInterruptRequired($repository, $user)
-    {
-        list($status, $message) = $this->getIndexStatus($repository, $user);
-        return ($status == "INTERRUPT");
-    }
-
-} 
\ No newline at end of file
diff --git a/core/src/plugins/core.index/i18n/de.php b/core/src/plugins/core.index/i18n/de.php
index 04c73f60f9..6ced872ed0 100644
--- a/core/src/plugins/core.index/i18n/de.php
+++ b/core/src/plugins/core.index/i18n/de.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/core.index/i18n/en.php b/core/src/plugins/core.index/i18n/en.php
index af26a2cae2..ba8a212a52 100644
--- a/core/src/plugins/core.index/i18n/en.php
+++ b/core/src/plugins/core.index/i18n/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/core.index/i18n/es.php b/core/src/plugins/core.index/i18n/es.php
index eee650e980..fedfef20c0 100644
--- a/core/src/plugins/core.index/i18n/es.php
+++ b/core/src/plugins/core.index/i18n/es.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/core.index/i18n/fr.php b/core/src/plugins/core.index/i18n/fr.php
index b3687bb234..21ed65d02c 100644
--- a/core/src/plugins/core.index/i18n/fr.php
+++ b/core/src/plugins/core.index/i18n/fr.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/core.index/i18n/pt.php b/core/src/plugins/core.index/i18n/pt.php
index 564b6a3ccf..78f7d0d8bc 100644
--- a/core/src/plugins/core.index/i18n/pt.php
+++ b/core/src/plugins/core.index/i18n/pt.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/core.index/i18n/ru.php b/core/src/plugins/core.index/i18n/ru.php
index 8a023596c8..0ee389ed50 100644
--- a/core/src/plugins/core.index/i18n/ru.php
+++ b/core/src/plugins/core.index/i18n/ru.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/core.index/manifest.xml b/core/src/plugins/core.index/manifest.xml
index 53ae9321ce..9827646175 100644
--- a/core/src/plugins/core.index/manifest.xml
+++ b/core/src/plugins/core.index/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ajxp_plugin label="CONF_MESSAGE[Indexation]" description="CONF_MESSAGE[Indexation plugins]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <class_definition classname="CoreIndexer" filename="plugins/core.index/class.CoreIndexer.php"/>
+    <class_definition classname="Pydio\Access\Indexer\Core\CoreIndexer" filename="plugins/core.index/CoreIndexer.php"/>
     <client_settings>
         <resources>
             <i18n namespace="core.index" path="plugins/core.index/i18n"/>
@@ -25,9 +25,7 @@
                         if(!pydio.getUserSelection().isEmpty()){
                             crtDir = pydio.getUserSelection().getUniqueNode().getPath();
                         }
-						var bgManager = pydio.getController().getBackgroundTasksManager();
-						bgManager.queueAction("index", {file:crtDir}, MessageHash["index.lucene.8"].replace('%s', crtDir));
-						bgManager.next();
+						PydioApi.getClient().request({"get_action":"index", "file":crtDir}, function(transport){});
 					]]></clientCallback>
                     <serverCallback methodName="applyAction" restParams="/file+" developerComment="Trigger re-indexation of a directory, recursively">
                         <input_param name="file" type="string" description="Folder to index (can be empty for root)"/>
@@ -35,14 +33,6 @@
                     </serverCallback>
                 </processing>
             </action>
-            <action name="check_index_status">
-                <rightsContext noUser="true" userLogged="only" read="true"
-                               write="false" adminOnly="false">
-                </rightsContext>
-                <processing>
-                    <serverCallback methodName="applyAction" restParams="/" sdkMethodName="checkIndexStatus" developerComment="Check the indexation process status."/>
-                </processing>
-            </action>
         </actions>
     </registry_contributions>
     <dependencies>
diff --git a/core/src/plugins/core.log/AbstractLogDriver.php b/core/src/plugins/core.log/AbstractLogDriver.php
new file mode 100644
index 0000000000..59f72ea93c
--- /dev/null
+++ b/core/src/plugins/core.log/AbstractLogDriver.php
@@ -0,0 +1,95 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>, mosen
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Log\Core;
+
+use Pydio\Core\PluginFramework\Plugin;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+if (!defined('LOG_LEVEL_DEBUG')) {
+    define("LOG_LEVEL_DEBUG", "Debug");
+    define("LOG_LEVEL_INFO", "Info");
+    define("LOG_LEVEL_NOTICE", "Notice");
+    define("LOG_LEVEL_WARNING", "Warning");
+    define("LOG_LEVEL_ERROR", "Error");
+}
+
+/**
+ * @package AjaXplorer_Plugins
+ * @subpackage Core
+ * @class AbstractLogDriver
+ * @author mosen
+ * @abstract
+ * Abstraction of the logging system
+ * The output stream/file/device will be implemented by the plugin which extends this class.
+ * The object has a chance to open its stream or file from the init() method. all subsequent calls assume
+ * the availability of the stream or file.
+ */
+abstract class AbstractLogDriver extends Plugin
+{
+    /**
+     * Driver type
+     *
+     * @var String type of driver
+     */
+    public $driverType = "log";
+
+    /**
+     * Write an entry to the log.
+     *
+     * @param String $level Log severity: one of LOG_LEVEL_* (DEBUG,INFO,NOTICE,WARNING,ERROR)
+     * @param String $ip The client ip
+     * @param String $user The user login
+     * @param String $source The source of the message
+     * @param String $prefix  The prefix of the message
+     * @param String $message The message to log
+     *
+     */
+    public function write2($level, $ip, $user, $repoId, $source, $prefix, $message, $nodePathes = array())
+    {
+        //for backward compatibility
+        $this->write($source."\t".$prefix."\t".$message, $level);
+    }
+
+    /**
+     * List available log files in XML
+     *
+     * @param string $nodeName
+     * @param null $year
+     * @param null $month
+     * @param string $rootPath
+     * @return \String[]
+     */
+    abstract public function listLogFiles($nodeName = "file", $year = null, $month = null, $rootPath = "/logs");
+
+    /**
+     * List log contents in XML
+     *
+     * @param $parentDir
+     * @param String $date Assumed to be m-d-y format.
+     * @param string $nodeName
+     * @param string $rootPath
+     * @param int $cursor
+     * @return
+     */
+    abstract public function listLogs($parentDir, $date, $nodeName = "log", $rootPath = "/logs", $cursor = -1);
+
+}
diff --git a/core/src/plugins/core.log/Logger.php b/core/src/plugins/core.log/Logger.php
new file mode 100644
index 0000000000..e0048bb2c0
--- /dev/null
+++ b/core/src/plugins/core.log/Logger.php
@@ -0,0 +1,344 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Log\Core;
+
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\UsersService;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+define("LOG_LEVEL_DEBUG", "Debug");
+define("LOG_LEVEL_INFO", "Info");
+define("LOG_LEVEL_NOTICE", "Notice");
+define("LOG_LEVEL_WARNING", "Warning");
+define("LOG_LEVEL_ERROR", "Error");
+
+/**
+ * Class Logger
+ * @package Pydio\Log\Core
+ */
+class Logger extends Plugin
+{
+    /**
+     * @var AbstractLogDriver
+     */
+    protected $pluginInstance;
+    /**
+     * @var AbstractLogDriver
+     */
+    protected static $loggerInstance;
+    protected static $globalOptions;
+
+    /** @var  ContextInterface */
+    private static $context;
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        parent::init($ctx, $options);
+        self::$globalOptions = $this->pluginConf;
+        $pService = PluginsService::getInstance($ctx);
+        $this->pluginInstance = ConfService::instanciatePluginFromGlobalParams($this->pluginConf["UNIQUE_PLUGIN_INSTANCE"], "Pydio\\Log\\Core\\AbstractLogDriver", $pService);
+        if ($this->pluginInstance != false) {
+            $pService->setPluginUniqueActiveForType("log", $this->pluginInstance->getName(), $this->pluginInstance);
+        }
+        self::$loggerInstance = $this->pluginInstance;
+        self::$context =  $ctx;
+    }
+
+    /**
+     * @return AbstractLogDriver
+     */
+    public function getLoggerInstance(){
+        return $this->pluginInstance;
+    }
+
+    /**
+     * @param ContextInterface $context
+     */
+    public static function updateContext($context){
+        self::$context = $context;
+    }
+
+    /**
+     * Use current logger instance and write a message at the desired loglevel
+     * @static
+     * @param string $level The log level
+     * @param string $source The source of the message (plugin id or classname)
+     * @param string $prefix A quick description
+     * @param array $messages An array of messages (string or array).
+     */
+    public static function log2($level, $source, $prefix, $messages = [])
+    {
+        $res = "";
+        $i = 0;
+        $nodePathes = [];
+        foreach ($messages as $value) {
+            if($i > 0) $res .= "\t";
+            $i++;
+
+            if (is_string($value)) {
+                $res .= $value;
+            } else if (is_array($value) && count($value)) {
+                $res .= self::arrayToString($value);
+                if(isSet($value["files"])) {
+                    if(is_array($value["files"])) $nodePathes = $value["files"];
+                    else $nodePathes[] = $value["files"];
+                }
+            } else if (!empty($value)) {
+                $res .= print_r($value, true);
+            }
+        }
+        $res = str_replace(["\r\n", "\n", "\r"], ' ', $res);
+        $ip = self::getClientAdress();
+        $user = self::getLoggedUser();
+        $logger = self::getInstance();
+        $repoId = (!empty(self::$context) && self::$context->hasRepository()) ? self::$context->getRepositoryId() : "no-repository";
+        if ($logger != null) {
+            try {
+                $logger->write2($level, $ip, $user, $repoId, $source, $prefix, $res, $nodePathes);
+                if ( $level == LOG_LEVEL_ERROR && self::$globalOptions["ERROR_TO_ERROR_LOG"] === true) {
+                    error_log("[PYDIO] IP $ip | user $user | $level | $prefix | from $source | ".$res);
+                }
+            } catch (\Exception $e) {
+                error_log("Exception while logging");
+                error_log("Log message was : IP => $ip | user => $user | level => $level | source => $source | prefix => $prefix | message => ".$res);
+                error_log("Exception is:".$e->getMessage());
+                error_log("In ".$e->getFile()." line ".$e->getLine());
+                error_log($e->getTraceAsString());
+            }
+        } else {
+            error_log("No logger");
+            error_log("Message was : IP => $ip | user => $user | level => $level | source => $source | prefix => $prefix | message => ".$res);
+        }
+    }
+
+    /**
+     * Use current logger instance and write a debug message
+     * @static
+     * @param string $source  The source of the message (plugin id or classname)
+     * @param string $prefix  A quick description
+     * @return void
+     */
+    public static function debug($source, $prefix = "")
+    {
+        if(!class_exists("Pydio\\Core\\Services\\ConfService")) return ;
+        if(!ConfService::getConf("SERVER_DEBUG")) return ;
+        if (func_num_args() <= 2) {
+            self::notice(__CLASS__, "Deprecated", "You are calling debug() with ".func_num_args()." arguments, please use at least 3");
+            $args = [];
+            $args[0] = $prefix;
+            self::log2(LOG_LEVEL_DEBUG, "Deprecated", $source, $args);
+        } else {
+            $args = func_get_args();
+            array_shift($args);
+            array_shift($args);
+            self::log2(LOG_LEVEL_DEBUG, $source, $prefix, $args);
+        }
+    }
+
+    /**
+     * Use current logger instance and write an info message
+     * @static
+     * @param string $source  The source of the message (plugin id or classname)
+     * @param string $prefix  A quick description
+     * @param string|array $messages Variable number of message args (string or array).
+     * @return void
+     */
+    public static function info($source, $prefix, $messages)
+    {
+        $args = func_get_args();
+        array_shift($args);
+        array_shift($args);
+        self::log2(LOG_LEVEL_INFO, $source, $prefix, $args);
+    }
+
+
+    /**
+     * Use current logger instance and write a notice message
+     * @static
+     * @param string $source  The source of the message (plugin id or classname)
+     * @param string $prefix  A quick description
+     * @param string|array $messages Variable number of message args (string or array).
+     * @return void
+     */
+    public static function notice($source, $prefix, $messages)
+    {
+        $args = func_get_args();
+        array_shift($args);
+        array_shift($args);
+        self::log2(LOG_LEVEL_NOTICE, $source, $prefix, $args);
+    }
+
+    /**
+     * Use current logger instance and write a warning message
+     * @static
+     * @param string $source  The source of the message (plugin id or classname)
+     * @param string $prefix  A quick description
+     * @param string|array $messages Variable number of message args (string or array).
+     * @return void
+     */
+    public static function warning($source, $prefix, $messages)
+    {
+        $args = func_get_args();
+        array_shift($args);
+        array_shift($args);
+        self::log2(LOG_LEVEL_WARNING, $source, $prefix, $args);
+    }
+
+    /**
+     * Use current logger instance and write an error message
+     * @static
+     * @param string $source  The source of the message (plugin id or classname)
+     * @param string $prefix  A quick description
+     * @param string|array $messages Variable number of message args (string or array).
+     * @return void
+     */
+    public static function error($source, $prefix, $messages)
+    {
+        $args = func_get_args();
+        array_shift($args);
+        array_shift($args);
+        self::log2(LOG_LEVEL_ERROR, $source, $prefix, $args);
+    }
+
+    /**
+     * Send an action log message to the current logger instance.
+     * @deprecated Deprecated since version 5.0.4
+     * @static
+     * @param string $action
+     * @param string|array $params
+     * @return void
+     */
+    public static function logAction($action, $params= [])
+    {
+        self::notice(__CLASS__, "Deprecated", "Function logAction() is deprecated, use info() instead");
+        $args = [];
+        $args[0] = $params;
+        self::log2(LOG_LEVEL_INFO, "Deprecated", $action, $args);
+    }
+
+    /**
+     * Return the client IP adress
+     * @static
+     * @return String client IP adress
+     */
+    public static function getClientAdress()
+    {
+        if (isSet(self::$globalOptions["CUSTOM_HEADER_FOR_IP"])){
+            $hName = "HTTP_".strtoupper(str_replace("-", "_", self::$globalOptions["CUSTOM_HEADER_FOR_IP"]));
+            if(isSet($_SERVER[$hName])) {
+                return $_SERVER[$hName];
+            }
+        }
+        if (isSet($_SERVER['REMOTE_ADDR'])) {
+            return $_SERVER['REMOTE_ADDR'];
+        }
+        if (php_sapi_name() == "cli") {
+            return "PHP_CLI";
+        }
+        return "Unknown Origin";
+    }
+
+    /**
+     * Return the user if it exists
+     * @static
+     * @return String client login
+     */
+    public static function getLoggedUser()
+    {
+        $user = "No User";
+        if (UsersService::usersEnabled()) {
+            if (self::$context !== null && self::$context->hasUser()) {
+                $user = self::$context->getUser()->getId();
+            } else {
+                $user = "shared";
+            }
+        }
+        return $user;
+    }
+
+    /**
+     * Format an array as a readable string
+     *
+     * @param array $params
+     * @return String readable list of parameters.
+     */
+    public static function arrayToString($params)
+    {
+        $st = "";
+        $index=0;
+        foreach ($params as $key=>$value) {
+            $index++;
+            if (!is_numeric($key)) {
+                $st.="$key=";
+            }
+            if (is_string($value) || is_numeric($value)) {
+                $st .= $value;
+            } else if (is_array($value)) {
+                $st .= self::arrayToString($value);
+            } else if (is_bool($value)) {
+                $st .= ($value?"true":"false");
+            } else if (is_object($value) && $value instanceof UserSelection) {
+                $st .= self::arrayToString($value->getFiles());
+            }
+
+            if ($index < count($params)) {
+                if (is_numeric($key)) {
+                    $st.=",";
+                } else {
+                    $st.=";";
+                }
+            }
+        }
+        return $st;
+    }
+
+    /**
+     * returns an instance of the AbstractLogDriver object
+     *
+     * @access public
+     * @static
+     *
+     * @return AbstractLogDriver an instance of the AJXP_Logger object
+     */
+    public static function getInstance()
+    {
+        if (!isset(self::$loggerInstance)) {
+            $ctx = Context::emptyContext();
+            $p = PluginsService::getInstance($ctx)->getPluginByTypeName("core", "log");
+            if(is_object($p)) {
+                $p->init($ctx, []);
+            }
+        }
+        return self::$loggerInstance;
+    }
+
+}
diff --git a/core/src/plugins/core.log/class.AJXP_Logger.php b/core/src/plugins/core.log/class.AJXP_Logger.php
deleted file mode 100644
index 29e684ced0..0000000000
--- a/core/src/plugins/core.log/class.AJXP_Logger.php
+++ /dev/null
@@ -1,312 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-define("LOG_LEVEL_DEBUG", "Debug");
-define("LOG_LEVEL_INFO", "Info");
-define("LOG_LEVEL_NOTICE", "Notice");
-define("LOG_LEVEL_WARNING", "Warning");
-define("LOG_LEVEL_ERROR", "Error");
-/**
- * @package AjaXplorer_Plugins
- * @subpackage Core
- * @static
- * Provides static access to the logging mechanism
- */
-class AJXP_Logger extends AJXP_Plugin
-{
-    /**
-     * @var AbstractLogDriver
-     */
-    protected $pluginInstance;
-    protected static $loggerInstance;
-    protected static $globalOptions;
-
-    public function init($options)
-    {
-        parent::init($options);
-        self::$globalOptions = $this->pluginConf;
-        $this->pluginInstance = ConfService::instanciatePluginFromGlobalParams($this->pluginConf["UNIQUE_PLUGIN_INSTANCE"], "AbstractLogDriver");
-        if ($this->pluginInstance != false) {
-            AJXP_PluginsService::getInstance()->setPluginUniqueActiveForType("log", $this->pluginInstance->getName(), $this->pluginInstance);
-        }
-        self::$loggerInstance = $this->pluginInstance;
-    }
-
-    public function getLoggerInstance()
-    {
-        return $this->pluginInstance;
-    }
-
-    /**
-     * Use current logger instance and write a message at the desired loglevel
-     * @static
-     * @param string $level The log level
-     * @param string $source The source of the message (plugin id or classname)
-     * @param string $prefix A quick description
-     * @param array $messages An array of messages (string or array).
-     * @param array $nodePathes Optional array of pathes
-     */
-    public static function log2($level, $source, $prefix, $messages = array())
-    {
-        $res = "";
-        $i = 0;
-        $nodePathes = array();
-        foreach ($messages as $value) {
-            if($i > 0) $res .= "\t";
-            $i++;
-
-            if (is_string($value)) {
-                $res .= $value;
-            } else if (is_array($value) && count($value)) {
-                $res .= self::arrayToString($value);
-                if(isSet($value["files"])) {
-                    if(is_array($value["files"])) $nodePathes = $value["files"];
-                    else $nodePathes[] = $value["files"];
-                }
-            } else if (!empty($value)) {
-                $res .= print_r($value, true);
-            }
-        }
-        $res = str_replace(array("\r\n", "\n", "\r"), ' ', $res);
-        $ip = self::getClientAdress();
-        $user = self::getLoggedUser();
-        $logger = self::getInstance();
-        if ($logger != null) {
-            try {
-                $logger->write2($level, $ip, $user, $source, $prefix, $res, $nodePathes);
-                if ( $level == LOG_LEVEL_ERROR && self::$globalOptions["ERROR_TO_ERROR_LOG"] === true) {
-                    error_log("[PYDIO] IP $ip | user $user | $level | $prefix | from $source | ".$res);
-                }
-            } catch (Exception $e) {
-                error_log("Exception while logging");
-                error_log("Log message was : IP => $ip | user => $user | level => $level | source => $source | prefix => $prefix | message => ".$res);
-                error_log("Exception is:".$e->getMessage());
-                error_log("In ".$e->getFile()." line ".$e->getLine());
-                error_log($e->getTraceAsString());
-            }
-        } else {
-            error_log("No logger");
-            error_log("Message was : IP => $ip | user => $user | level => $level | source => $source | prefix => $prefix | message => ".$res);
-        }
-    }
-
-    /**
-     * Use current logger instance and write a debug message
-     * @static
-     * @param string $source  The source of the message (plugin id or classname)
-     * @param string $prefix  A quick description
-     * @param string|array $messages Variable number of message args (string or array).
-     * @return void
-     */
-    public static function debug($source, $prefix = "")
-    {
-        if(!class_exists("ConfService")) return ;
-        if(!ConfService::getConf("SERVER_DEBUG")) return ;
-        if (func_num_args() <= 2) {
-            self::notice(__CLASS__, "Deprecated", "You are calling debug() with ".func_num_args()." arguments, please use at least 3");
-            $args = array();
-            $args[0] = $prefix;
-            self::log2(LOG_LEVEL_DEBUG, "Deprecated", $source, $args);
-        } else {
-            $args = func_get_args();
-            array_shift($args);
-            array_shift($args);
-            self::log2(LOG_LEVEL_DEBUG, $source, $prefix, $args);
-        }
-    }
-
-    /**
-     * Use current logger instance and write an info message
-     * @static
-     * @param string $source  The source of the message (plugin id or classname)
-     * @param string $prefix  A quick description
-     * @param string|array $messages Variable number of message args (string or array).
-     * @return void
-     */
-    public static function info($source, $prefix, $messages)
-    {
-        $args = func_get_args();
-        array_shift($args);
-        array_shift($args);
-        self::log2(LOG_LEVEL_INFO, $source, $prefix, $args);
-    }
-
-
-    /**
-     * Use current logger instance and write a notice message
-     * @static
-     * @param string $source  The source of the message (plugin id or classname)
-     * @param string $prefix  A quick description
-     * @param string|array $messages Variable number of message args (string or array).
-     * @return void
-     */
-    public static function notice($source, $prefix, $messages)
-    {
-        $args = func_get_args();
-        array_shift($args);
-        array_shift($args);
-        self::log2(LOG_LEVEL_NOTICE, $source, $prefix, $args);
-    }
-
-    /**
-     * Use current logger instance and write a warning message
-     * @static
-     * @param string $source  The source of the message (plugin id or classname)
-     * @param string $prefix  A quick description
-     * @param string|array $messages Variable number of message args (string or array).
-     * @return void
-     */
-    public static function warning($source, $prefix, $messages)
-    {
-        $args = func_get_args();
-        array_shift($args);
-        array_shift($args);
-        self::log2(LOG_LEVEL_WARNING, $source, $prefix, $args);
-    }
-
-    /**
-     * Use current logger instance and write an error message
-     * @static
-     * @param string $source  The source of the message (plugin id or classname)
-     * @param string $prefix  A quick description
-     * @param string|array $messages Variable number of message args (string or array).
-     * @return void
-     */
-    public static function error($source, $prefix, $messages)
-    {
-        $args = func_get_args();
-        array_shift($args);
-        array_shift($args);
-        self::log2(LOG_LEVEL_ERROR, $source, $prefix, $args);
-    }
-
-    /**
-     * Send an action log message to the current logger instance.
-     * @deprecated Deprecated since version 5.0.4
-     * @static
-     * @param string $action
-     * @param string|array $params
-     * @return void
-     */
-    public static function logAction($action, $params=array())
-    {
-        self::notice(__CLASS__, "Deprecated", "Function logAction() is deprecated, use info() instead");
-        $args = array();
-        $args[0] = $params;
-        self::log2(LOG_LEVEL_INFO, "Deprecated", $action, $args);
-    }
-
-    /**
-     * Return the client IP adress
-     * @static
-     * @return String client IP adress
-     */
-    public static function getClientAdress()
-    {
-        if (isSet(self::$globalOptions["CUSTOM_HEADER_FOR_IP"])){
-            $hName = "HTTP_".strtoupper(str_replace("-", "_", self::$globalOptions["CUSTOM_HEADER_FOR_IP"]));
-            if(isSet($_SERVER[$hName])) {
-                return $_SERVER[$hName];
-            }
-        }
-        if (isSet($_SERVER['REMOTE_ADDR'])) {
-            return $_SERVER['REMOTE_ADDR'];
-        }
-        if (php_sapi_name() == "cli") {
-            return "PHP_CLI";
-        }
-        return "Unknown Origin";
-    }
-
-    /**
-     * Return the user if it exists
-     * @static
-     * @return String client login
-     */
-    public static function getLoggedUser()
-    {
-        $user = "No User";
-        if (AuthService::usersEnabled()) {
-            $logged = AuthService::getLoggedUser();
-            if ($logged != null) {
-                $user = $logged->getId();
-            } else {
-                $user = "shared";
-            }
-        }
-        return $user;
-    }
-
-    /**
-     * Format an array as a readable string
-     *
-     * @param Array $params
-     * @return String readable list of parameters.
-     */
-    public static function arrayToString($params)
-    {
-        $st = "";
-        $index=0;
-        foreach ($params as $key=>$value) {
-            $index++;
-            if (!is_numeric($key)) {
-                $st.="$key=";
-            }
-            if (is_string($value) || is_numeric($value)) {
-                $st .= $value;
-            } else if (is_array($value)) {
-                $st .= self::arrayToString($value);
-            } else if (is_bool($value)) {
-                $st .= ($value?"true":"false");
-            } else if (is_a($value, "UserSelection")) {
-                $st .= self::arrayToString($value->getFiles());
-            }
-
-            if ($index < count($params)) {
-                if (is_numeric($key)) {
-                    $st.=",";
-                } else {
-                    $st.=";";
-                }
-            }
-        }
-        return $st;
-    }
-
-    /**
-     * returns an instance of the AbstractLogDriver object
-     *
-     * @access public
-     * @static
-     *
-     * @return AbstractLogDriver an instance of the AJXP_Logger object
-     */
-    public static function getInstance()
-    {
-        if (!isset(self::$loggerInstance)) {
-            $p = AJXP_PluginsService::findPlugin("core", "log");
-            if(is_object($p)) $p->init(array());
-        }
-        return self::$loggerInstance;
-    }
-
-}
diff --git a/core/src/plugins/core.log/class.AbstractLogDriver.php b/core/src/plugins/core.log/class.AbstractLogDriver.php
deleted file mode 100644
index bd68618113..0000000000
--- a/core/src/plugins/core.log/class.AbstractLogDriver.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>, mosen
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-if (!defined('LOG_LEVEL_DEBUG')) {
-    define("LOG_LEVEL_DEBUG", "Debug");
-    define("LOG_LEVEL_INFO", "Info");
-    define("LOG_LEVEL_NOTICE", "Notice");
-    define("LOG_LEVEL_WARNING", "Warning");
-    define("LOG_LEVEL_ERROR", "Error");
-}
-
-/**
- * @package AjaXplorer_Plugins
- * @subpackage Core
- * @class AbstractLogDriver
- * @author mosen
- * @abstract
- * Abstraction of the logging system
- * The output stream/file/device will be implemented by the plugin which extends this class.
- * The object has a chance to open its stream or file from the init() method. all subsequent calls assume
- * the availability of the stream or file.
- */
-abstract class AbstractLogDriver extends AJXP_Plugin
-{
-    /**
-     * Driver type
-     *
-     * @var String type of driver
-     */
-    public $driverType = "log";
-
-    /**
-     * Write an entry to the log.
-     *
-     * @param String $level Log severity: one of LOG_LEVEL_* (DEBUG,INFO,NOTICE,WARNING,ERROR)
-     * @param String $ip The client ip
-     * @param String $user The user login
-     * @param String $source The source of the message
-     * @param String $prefix  The prefix of the message
-     * @param String $message The message to log
-     *
-     */
-    public function write2($level, $ip, $user, $source, $prefix, $message, $nodePathes = array())
-    {
-        //for backward compatibility
-        $this->write($source."\t".$prefix."\t".$message, $level);
-    }
-
-    /**
-     * List available log files in XML
-     *
-     * @param string $nodeName
-     * @param null $year
-     * @param null $month
-     * @param string $rootPath
-     * @return String[]
-     */
-    abstract public function xmlListLogFiles($nodeName="file", $year=null, $month=null, $rootPath = "/logs", $print = true);
-
-    /**
-     * List log contents in XML
-     *
-     * @param $parentDir
-     * @param String $date Assumed to be m-d-y format.
-     * @param string $nodeName
-     * @param string $rootPath
-     * @return void
-     */
-    abstract public function xmlLogs($parentDir, $date, $nodeName = "log", $rootPath = "/logs");
-
-}
diff --git a/core/src/plugins/core.log/i18n/conf/de.php b/core/src/plugins/core.log/i18n/conf/de.php
index 136dcf19f5..31ad1bd694 100755
--- a/core/src/plugins/core.log/i18n/conf/de.php
+++ b/core/src/plugins/core.log/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess = array(
 "Application Logger" => "Protokollierung",
@@ -27,4 +27,4 @@
 "Logger plugin" => "Erweiterung",
 "Custom Header for IP" => "Custom Header for IP",
 "Can be used in a proxy situation to use e.g. X-Forwarded-For header value instead of proxy IP." => "Can be used in a proxy situation to use e.g. X-Forwarded-For header value instead of proxy IP.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/core.log/i18n/conf/en.php b/core/src/plugins/core.log/i18n/conf/en.php
index 1e261eaf40..255d0b4151 100755
--- a/core/src/plugins/core.log/i18n/conf/en.php
+++ b/core/src/plugins/core.log/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess = array(
 "Application Logger" => "Application Logger",
@@ -27,4 +27,4 @@
 "Logger plugin" => "Logger plugin",
 "Custom Header for IP" => "Custom Header for IP",
 "Can be used in a proxy situation to use e.g. X-Forwarded-For header value instead of proxy IP." => "Can be used in a proxy situation to use e.g. X-Forwarded-For header value instead of proxy IP.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/core.log/manifest.xml b/core/src/plugins/core.log/manifest.xml
index 5dcba63052..8f92f853eb 100644
--- a/core/src/plugins/core.log/manifest.xml
+++ b/core/src/plugins/core.log/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ajxp_plugin label="CONF_MESSAGE[Application Logger]" description="CONF_MESSAGE[Setup the logging system]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <class_definition classname="AJXP_Logger" filename="plugins/core.log/class.AJXP_Logger.php"/>
+    <class_definition classname="Pydio\Log\Core\Logger" filename="plugins/core.log/Logger.php"/>
     <client_settings>
         <resources>
             <i18n namespace="core.log" path="plugins/core.log/i18n"/>
diff --git a/core/src/plugins/core.mailer/Mailer.php b/core/src/plugins/core.mailer/Mailer.php
new file mode 100644
index 0000000000..9116df761b
--- /dev/null
+++ b/core/src/plugins/core.mailer/Mailer.php
@@ -0,0 +1,768 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Mailer\Core;
+
+use DateTime;
+use dibi;
+use DibiException;
+use Exception;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Conf\Core\AbstractUser;
+use Pydio\Core\Model\UserInterface;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Utils\DBHelper;
+use Pydio\Core\Utils\Vars\OptionsHelper;
+
+use Pydio\Core\Controller\HTMLWriter;
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\PluginFramework\SqlTableProvider;
+use Pydio\Notification\Core\Notification;
+use Pydio\Tasks\Task;
+use Pydio\Tasks\TaskService;
+use Zend\Diactoros\Response\JsonResponse;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * @package AjaXplorer_Plugins
+ * @subpackage Core
+ */
+class Mailer extends Plugin implements SqlTableProvider
+{
+
+    public static $TEMPLATES = [
+        "html" => [
+            "body"        => '<div id="digest">%s</div>',   // Argument section
+            "section"     => '%s%s',                        // Argument title, listWrapper
+            "title"       => '<h1>%s</h1>',                 // Argument %var%
+            "listWrapper" => '<ul>%s</ul>',                 // Argument list
+            "list"        => '<li>%s</li>'                  // Argument %var%
+        ],
+        "plain" => [
+            "body"        => '%s',                          // Argument section
+            "section"     => '%s%s',                        // Argument title, listWrapper
+            "title"       => '%s\n\n',                      // Argument %var%
+            "listWrapper" => '%s',                          // Argument list
+            "list"        => '%s\n'                         // Argument %var%
+        ]
+    ];
+
+    public $mailCache;
+    protected $_dibiDriver;
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        parent::init($ctx, $options);
+        if (AJXP_SERVER_DEBUG) {
+            $this->mailCache = $this->getPluginWorkDir(true) . "/mailbox";
+        }
+        $pConf = $this->pluginConf["UNIQUE_MAILER_INSTANCE"];
+        if (!empty($pConf)) {
+            $pService = PluginsService::getInstance($ctx);
+            $p = ConfService::instanciatePluginFromGlobalParams($pConf, "Pydio\\Mailer\\Core\\Mailer", $pService);
+            if($p !== false){
+                $pService->setPluginUniqueActiveForType($p->getType(), $p->getName(), $p);
+            }
+        }
+    }
+
+    /**
+     * @return array
+     * @throws Exception
+     */
+    protected function getDibiDriver()
+    {
+        if (!isset($this->_dibiDriver)) {
+            $this->_dibiDriver = OptionsHelper::cleanDibiDriverParameters(array("group_switch_value" => "core"));
+        }
+        return $this->_dibiDriver;
+    }
+
+    /**
+     * @return int
+     * @throws Exception
+     */
+    public function getConsumerLock() {
+
+        $workDir = $this->getPluginWorkDir(true);
+        $consumerLockFile = $workDir . DIRECTORY_SEPARATOR . "/consume_mail_queue.lock";
+
+        // Opening the file
+        $consumerLock = fopen($consumerLockFile, "w");
+
+        // Making sure the file gets closed and the lock gets released at the end of the script
+        register_shutdown_function(function () use ($consumerLock) {
+            fflush($consumerLock);
+            flock($consumerLock, LOCK_UN);
+
+            fclose($consumerLock);
+        });
+
+        // Retrieving the lock
+        while (!flock($consumerLock, LOCK_EX)) {
+            sleep(60);
+        }
+
+        // Writing the time the lock was granted
+        $time = time();
+        ftruncate($consumerLock, 0);
+        fwrite($consumerLock, $time);
+
+        return $time;
+    }
+
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @throws PydioException
+     */
+    public function mailConsumeQueue(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface)
+    {
+        /** @var ContextInterface $ctx */
+        $ctx        = $requestInterface->getAttribute("ctx");
+        $httpVars   = $requestInterface->getParsedBody();
+        $verbose    = $httpVars["log-output"];
+        $taskUid    = $requestInterface->getAttribute("pydio-task-id");
+
+        $logInfo = function () {};
+        if ($verbose) {
+            $logInfo = function ($str) {
+                fwrite(STDOUT, $str . "\n");
+            };
+        }else if(!empty($taskUid)){
+            $logInfo = function ($str) use ($taskUid) {
+                TaskService::getInstance()->updateTaskStatus($taskUid, Task::STATUS_RUNNING, $str);
+            };
+        }
+
+
+        $mailer = PluginsService::getInstance($ctx)->getActivePluginsForType("mailer", true);
+        if (!$mailer instanceof Mailer) {
+            throw new PydioException("Cannot find active mailer!");
+        }
+        if (!dibi::isConnected()) {
+            dibi::connect($this->getDibiDriver());
+        }
+        if ($this->_dibiDriver["driver"] == "postgre") {
+            dibi::query("SET bytea_output=escape");
+        }
+
+        // Get the queue consumer lock and the time it was given
+        $time = $this->getConsumerLock();
+
+        try {
+            $querySQL = dibi::query("SELECT * FROM [ajxp_mail_queue] WHERE [date_event] <= %s", $time);
+        } catch (DibiException $e) {
+            throw new PydioException($e->getMessage());
+        }
+        //$querySQL->fetch();
+        //$resultsSQL = $querySQL->fetchAll();
+        $numRows = $querySQL->count();
+
+        $results = [];
+
+        HTMLWriter::charsetHeader("text/json");
+
+        if ($numRows == 0) {
+            $logInfo("Nothing to process");
+            $output = array("report" => "Sent 0 emails", "detail" => "");
+            $responseInterface = new JsonResponse($output);
+            if(!empty($taskUid)){
+                TaskService::getInstance()->updateTaskStatus($taskUid, Task::STATUS_COMPLETE, "Sent 0 emails");
+            }
+            return;
+        }
+
+        $logInfo("Processing " . $numRows . " rows.");
+
+        $i = 0;
+        // We need to send one email :
+        // - per user
+        // - per email type (HTML or PLAIN)
+        while($value = $querySQL->fetch()) {
+
+            // Retrieving user information
+            $recipient = $value['recipient'];
+            $logInfo("Processing notification ".($i+1)."/$numRows");
+
+            // Retrieving Email type information
+            $emailType = ($value["html"] == 1) ? "html" : "plain";
+
+            // Retrieving notification information
+            /** @var Notification $notification */
+            $notification = unserialize($value["notification_object"]);
+
+            $action = $notification->getAction();
+            $author = $notification->getAuthor();
+            $node   = $notification->getNode();
+            if(!$node instanceof AJXP_Node){
+                continue;
+            }
+            try {
+                @$node->loadNodeInfo();
+            } catch(Exception $e){
+                continue;
+            }
+
+            if ($node->isLeaf() && !$node->isRoot()) {
+                $dirName = $node->getParent()->getPath();
+            } else {
+                $dirName = $node->getPath();
+                if ($dirName === null) {
+                    $dirName = '/';
+                }
+            }
+            $key = sprintf("%s|%s|%s", $action, $author, $dirName);
+
+            // Retrieving workspace information
+            if($node->getRepository() != null) {
+                $workspace = $node->getRepository()->getDisplay();
+            } else {
+                $workspace = "Deleted Workspace";
+            }
+
+            $results[$emailType][$recipient][$workspace][$key][] = $notification;
+
+            $logInfo("Processed recipient ".($i+1)."/$numRows (" . $recipient.")");
+
+            $i ++;
+
+        }
+
+        $logInfo("Created digest array.");
+
+        $subject = LocaleService::getMessages()["core.mailer.9"];
+
+        $success = 0;
+        $errors = [];
+        foreach ($results as $emailType => $recipients) {
+
+            $isHTML = $emailType == "html";
+
+            $i = 0;
+            foreach ($recipients as $recipient => $workspaces) {
+                $logInfo("Processing " . ++$i . " out of " . count($recipients) . " " . $emailType . " emails " . $recipient);
+                $body = $this->_buildDigest($workspaces, $emailType);
+                $success++;
+                try {
+                    $mailer->sendMail(
+                        $ctx,
+                        [$recipient],
+                        $subject,
+                        $body,
+                        null,
+                        null,
+                        $isHTML
+                    );
+
+                    $success++;
+                } catch (\Exception $e) {
+                    $errors[] = "Failed to send email to " . $recipient . ": " . $e->getMessage();
+                }
+            }
+        }
+
+        // Clearing memory
+        unset($results);
+
+        try {
+            dibi::query('DELETE FROM [ajxp_mail_queue] WHERE [date_event] <= %s', $time);
+        } catch (DibiException $e) {
+            throw new PydioException($e->getMessage());
+        }
+
+        $output = array("report" => "Sent ".$success." emails", "errors" => $errors);
+        $responseInterface = new JsonResponse($output);
+        if(!empty($taskUid)){
+            TaskService::getInstance()->updateTaskStatus($taskUid, Task::STATUS_COMPLETE, "Sent $success emails");
+        }
+
+    }
+
+    /**
+     * @param $workspaces
+     * @param $emailType
+     * @return string
+     */
+    private function _buildDigest($workspaces, $emailType) {
+
+        $template = self::$TEMPLATES[$emailType];
+
+        $sections = [];
+        foreach ($workspaces as $workspace => $keys) {
+
+            $title = "";
+            $li = [];
+
+            foreach ($keys as $key => $notifications) {
+
+                $descriptions = [];
+
+                /** @var Notification $notification */
+                foreach ($notifications as $notification) {
+                    if (empty($current) && $notification->getNode()->getRepository() !== null) {
+                        $title = sprintf($template["title"], $notification->getDescriptionLocation());
+                    }
+
+                    $description = $notification->getDescriptionLong(true);
+
+                    if(array_key_exists($description, $descriptions)) {
+                        $descriptions[$description]++;
+                    } else {
+                        $descriptions[$description] = 1;
+                    }
+                }
+
+                foreach ($descriptions as $description => $count){
+                    $li[] = sprintf($template["list"], $description . ($count > 1 ? ' ('.$count.')' : ''));
+                }
+            }
+
+            $listWrapper = sprintf($template["listWrapper"], join("", $li));
+            $sections[] = sprintf($template["section"], $title, $listWrapper);
+        }
+
+        return sprintf($template["body"], join("", $sections));
+    }
+
+
+
+    /**
+     * @param $int
+     * @return string
+     */
+    protected function stringify($int)
+    {
+        return ($int < 10 ? "0" . $int : "" . $int);
+    }
+
+    /**
+     * @param $frequencyType
+     * @param $frequencyDetail
+     * @return DateTime|int|null|string
+     */
+    protected function computeEmailSendDate($frequencyType, $frequencyDetail)
+    {
+
+        $date = new DateTime("now");
+        $year = $date->format("Y");
+        $day = $date->format("d");
+        $month = $date->format("m");
+        $hour = intval($date->format('H'));
+        $minute = intval($date->format('i'));
+        $frequency = $frequencyDetail;
+        $allMinute = ($hour * 60) + $minute;
+        $nextFrequency = null;
+        switch ($frequencyType) {
+            case "M":
+                //FOR EVERY X MIN
+                $lastInterval = $allMinute - ($allMinute % $frequency);
+                $newMinutes = $this->stringify($lastInterval % 60);
+                $newHour = $this->stringify(($lastInterval - $newMinutes) / 60);
+                $lastFrequency = DateTime::createFromFormat("Y-m-d H:i", "$year-$month-$day $newHour:$newMinutes");
+                $nextFrequency = $lastFrequency->modify("+ $frequency minutes")->getTimestamp();
+                break;
+            case "H":
+                //FOR EVERY X HOUR
+                $frequency = $frequency * 60;
+                $lastInterval = $allMinute - ($allMinute % $frequency);
+                $newHour = $this->stringify($lastInterval / 60);
+                $lastFrequency = DateTime::createFromFormat("Y-m-d H:i", "$year-$month-$day $newHour:00");
+                $nextFrequency = $lastFrequency->modify("+ $frequency minutes")->getTimestamp();
+                break;
+            case "D1":
+                $compareDate = new DateTime($date->format('d-m-Y') . ' ' . $frequency . ':00');
+                if ($date > $compareDate) {
+                    //FREQUENCY ALREADY GONE, NEXT INTERVAL => NEXT DAY
+                    $compareDate = $compareDate->modify('+1 day');
+                }
+                $nextFrequency = new DateTime($compareDate->format('Y-m-d ' . $frequency . ':00'));
+                $nextFrequency = $nextFrequency->getTimestamp();
+                break;
+            case "D2":
+                //FOR EVERY DAY AT X and Y
+                $arrayFrequency = explode(",", $frequencyDetail);
+                if (count($arrayFrequency) === 2) {
+                    $compareDate1 = new DateTime($date->format('d-m-Y') . ' ' . $arrayFrequency[0] . ':00');
+                    $compareDate2 = new DateTime($date->format('d-m-Y') . ' ' . $arrayFrequency[1] . ':00');
+                    if ($date < $compareDate1 && $date < $compareDate2) {
+                        $nextFrequency = $date->format('Y-m-d ' . $arrayFrequency[0] . ':00');
+                    } elseif ($date > $compareDate1 && $date < $compareDate2) {
+                        $nextFrequency = $date->format('Y-m-d ' . $arrayFrequency[1] . ':00');
+                    } else {
+                        $nextFrequency = $date->modify('+1 day')->format('Y-m-d ' . $arrayFrequency[0] . ':00');
+                    }
+                    $nextFrequency = new DateTime($nextFrequency);
+                    $nextFrequency = $nextFrequency->getTimestamp();
+                }
+                break;
+            case "W1":
+                //FOR EVERY WEEK AT THE DAY
+                $nextFrequency = $date->modify('next ' . $frequency)->getTimestamp();
+                break;
+        }
+        return $nextFrequency;
+    }
+
+    /**
+     * @param Notification $notification
+     * @throws Exception
+     * @throws PydioException
+     */
+    public function processNotification(Notification &$notification)
+    {
+            // Inserting the node information.
+        try {
+            $notification->getNode()->loadNodeInfo();
+        } catch (Exception $e) {
+            // Do nothing
+        }
+
+        try {
+            $userObject = UsersService::getUserById($notification->getTarget());
+        } catch (\Pydio\Core\Exception\UserNotFoundException $e) {
+            $messages = LocaleService::getMessages();
+            throw new PydioException($messages['core.mailer.2']);
+        }
+        if ($userObject->getMergedRole()->filterParameterValue("core.mailer", "NOTIFICATIONS_EMAIL_GET", AJXP_REPO_SCOPE_ALL, "true") !== "true") {
+            // User does not want to receive any emails.
+            return;
+        }
+
+        $notification_email = $userObject->getMergedRole()->filterParameterValue("core.mailer", "NOTIFICATIONS_EMAIL", AJXP_REPO_SCOPE_ALL, "");
+        $arrayRecipients = array();
+        $mainRecipient = $userObject->getMergedRole()->filterParameterValue("core.conf", "email", AJXP_REPO_SCOPE_ALL, "");
+        $useHtml = $userObject->getMergedRole()->filterParameterValue("core.mailer", "NOTIFICATIONS_EMAIL_SEND_HTML", AJXP_REPO_SCOPE_ALL, "true") === "true" ? 1 : 0;
+
+        if (!empty($mainRecipient)) $arrayRecipients[] = $mainRecipient;
+        $additionalRecipients = array_map("trim", explode(',', $notification_email));
+        foreach ($additionalRecipients as $addR) {
+            if (!empty($addR)) $arrayRecipients[] = $addR;
+        }
+
+        if ($this->pluginConf["MAILER_ACTIVATE_QUEUE"] && count($arrayRecipients)) {
+
+            $frequencyType = $userObject->getMergedRole()->filterParameterValue("core.mailer", "NOTIFICATIONS_EMAIL_FREQUENCY", AJXP_REPO_SCOPE_ALL, "M");
+            $frequencyDetail = $userObject->getMergedRole()->filterParameterValue("core.mailer", "NOTIFICATIONS_EMAIL_FREQUENCY_USER", AJXP_REPO_SCOPE_ALL, "5");
+            $nextFrequency = $this->computeEmailSendDate(
+                $frequencyType,
+                $frequencyDetail
+            );
+
+            if (!empty($nextFrequency)) {
+                if (!dibi::isConnected()) {
+                    dibi::connect($this->getDibiDriver());
+                }
+                foreach ($arrayRecipients as $recipient) {
+                    try {
+                        dibi::query("INSERT INTO [ajxp_mail_queue] ([recipient],[url],[date_event],[notification_object],[html]) VALUES (%s,%s,%s,%bin,%i) ",
+                            $recipient,
+                            $notification->getNode()->getUrl(),
+                            $nextFrequency,
+                            serialize($notification),
+                            $useHtml);
+                    } catch (Exception $e) {
+                        $this->logError("[mailer]", $e->getMessage());
+                    }
+                }
+            } else {
+                $this->logError("[mailer]", "Could not determine email frequency from $frequencyType / $frequencyDetail for send email to user " . $userObject->getId());
+            }
+        } else {
+            $mailer = PluginsService::getInstance($notification->getNode()->getContext())->getActivePluginsForType("mailer", true);
+            if ($mailer !== false && $mailer instanceof Mailer) {
+                try {
+                    $mailer->sendMail(
+                        $notification->getNode()->getContext(),
+                        array($notification->getTarget()),
+                        $notification->getDescriptionShort(),
+                        $notification->getDescriptionLong(),
+                        $notification->getAuthor(),
+                        $notification->getMainLink(),
+                        $useHtml
+                    );
+                } catch (Exception $e) {
+                    throw new PydioException($e->getMessage());
+                }
+            }
+        }
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $recipients
+     * @param $subject
+     * @param $body
+     * @param null $from
+     * @param null $imageLink
+     * @param bool $useHtml
+     */
+    public function sendMail(ContextInterface $ctx, $recipients, $subject, $body, $from = null, $imageLink = null, $useHtml = true)
+    {
+        $prepend = ConfService::getContextConf($ctx, "SUBJECT_PREPEND", "mailer");
+        $append = ConfService::getContextConf($ctx, "SUBJECT_APPEND", "mailer");
+        $layoutFolder = ConfService::getContextConf($ctx, "LAYOUT_FOLDER", "mailer");
+        $layout = ConfService::getContextConf($ctx, "BODY_LAYOUT", "mailer");
+        $forceFrom = ConfService::getContextConf($ctx, "FORCE_UNIQUE_FROM", "mailer");
+        $coreFrom = ConfService::getContextConf($ctx, "FROM", "mailer");
+
+        if ($forceFrom && $coreFrom != null) {
+            $coreFromName = ConfService::getContextConf($ctx, "FROM_NAME", "mailer");
+            $from = array("adress" => $coreFrom, "name" => $coreFromName);
+        }
+        $rowBody = $body;
+        $images = array();
+        if (!empty($prepend)) $subject = $prepend . " " . $subject;
+        if (!empty($append)) $subject .= " " . $append;
+        if (!empty($layoutFolder)) {
+            $layoutFolder .= "/";
+            $lang = LocaleService::getLanguage();
+            if (!$useHtml) {
+                if (is_file(AJXP_INSTALL_PATH . "/" . $layoutFolder . $lang . ".txt")) {
+                    $layout = implode("", file(AJXP_INSTALL_PATH . "/" . $layoutFolder . $lang . ".txt"));
+                } else if (is_file(AJXP_INSTALL_PATH . "/" . $layoutFolder . "en.txt")) {
+                    $layout = implode("", file(AJXP_INSTALL_PATH . "/" . $layoutFolder . "en.txt"));
+                } else {
+                    $layout = "AJXP_MAIL_BODY";
+                }
+            } else {
+                if (is_file(AJXP_INSTALL_PATH . "/" . $layoutFolder . $lang . ".html")) {
+                    $layout = implode("", file(AJXP_INSTALL_PATH . "/" . $layoutFolder . $lang . ".html"));
+                } else if (is_file(AJXP_INSTALL_PATH . "/" . $layoutFolder . "en.html")) {
+                    $layout = implode("", file(AJXP_INSTALL_PATH . "/" . $layoutFolder . "en.html"));
+                }
+            }
+        }
+        if (strpos($layout, "AJXP_MAIL_BODY") !== false) {
+            $body = str_replace("AJXP_MAIL_BODY", $useHtml ? nl2br($body) : $body, $layout);
+        }
+        if ($imageLink != null && $useHtml) {
+            $body = str_replace(array("AJXP_IMAGE_LINK"), "<a href='" . $imageLink . "'>" . '<img alt="Download" width="100" style="width: 100px;" src="cid:download_id">' . "</a>", $body);
+            $images[] = array("path" => AJXP_INSTALL_PATH . "/" . $layoutFolder . "/download.png", "cid" => "download_id");
+        } else {
+            $body = str_replace(array("AJXP_IMAGE_LINK", "AJXP_IMAGE_END"), "", $body);
+        }
+        $body = str_replace("AJXP_MAIL_SUBJECT", $subject, $body);
+        $this->sendMailImpl($ctx, $recipients, $subject, $body, $from, $images, $useHtml);
+        if (AJXP_SERVER_DEBUG) {
+            if (!$useHtml) {
+                $rowBody = '[TEXT ONLY] ' . Mailer::simpleHtml2Text($rowBody);
+            }
+            $line = "------------------------------------------------------------------------\n";
+            file_put_contents($this->mailCache, $line . "Sending mail from " . print_r($from, true) . " to " . print_r($recipients, true) . "\nSubject: $subject\nBody:\n$rowBody\n", FILE_APPEND);
+        }
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $recipients
+     * @param $subject
+     * @param $body
+     * @param null $from
+     * @param array $images
+     * @param bool $useHtml
+     */
+    protected function sendMailImpl(ContextInterface $ctx, $recipients, $subject, $body, $from = null, $images = array(), $useHtml = true)
+    {
+    }
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @throws Exception
+     */
+    public function sendMailAction(\Psr\Http\Message\ServerRequestInterface &$requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface)
+    {
+        $mess = LocaleService::getMessages();
+        /** @var ContextInterface $ctx */
+        $ctx = $requestInterface->getAttribute("ctx");
+        $mailers = PluginsService::getInstance($ctx)->getActivePluginsForType("mailer");
+        if (!count($mailers)) {
+            throw new Exception($mess["core.mailer.3"]);
+        }
+
+        $httpVars = $requestInterface->getParsedBody();
+        $mailer = array_pop($mailers);
+
+        //$toUsers = array_merge(explode(",", $httpVars["users_ids"]), explode(",", $httpVars["to"]));
+        //$toGroups =  explode(",", $httpVars["groups_ids"]);
+        $toUsers = $httpVars["emails"];
+
+        $emails = $this->resolveAdresses($ctx, $toUsers);
+        $from = $this->resolveFrom($ctx, $httpVars["from"]);
+        $imageLink = isSet($httpVars["link"]) ? $httpVars["link"] : null;
+
+        $subject = $httpVars["subject"];
+        $body = $httpVars["message"];
+        $x = new \Pydio\Core\Http\Response\SerializableResponseStream();
+        $responseInterface = $responseInterface->withBody($x);
+
+        if (count($emails)) {
+            $mailer->sendMail($requestInterface->getAttribute("ctx"), $emails, $subject, $body, $from, $imageLink);
+            $x->addChunk(new \Pydio\Core\Http\Message\UserMessage(str_replace("%s", count($emails), $mess["core.mailer.1"])));
+        } else {
+            $x->addChunk(new \Pydio\Core\Http\Message\UserMessage($mess["core.mailer.2"], LOG_LEVEL_ERROR));
+        }
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param null $fromAdress
+     * @return array|mixed
+     */
+    public function resolveFrom(ContextInterface $ctx, $fromAdress = null)
+    {
+        $fromResult = array();
+        if ($fromAdress != null) {
+            $arr = $this->resolveAdresses($ctx, array($fromAdress));
+            if (count($arr)) $fromResult = $arr[0];
+        } else if ($ctx->hasUser()) {
+            $arr = $this->resolveAdresses($ctx, array($ctx->getUser()));
+            if (count($arr)) $fromResult = $arr[0];
+        }
+        if (!count($fromResult)) {
+            $f = ConfService::getContextConf($ctx, "FROM", "mailer");
+            $fName = ConfService::getContextConf($ctx, "FROM_NAME", "mailer");
+            $fromResult = array("adress" => $f, "name" => $fName);
+        }
+        return $fromResult;
+    }
+
+    /**
+     * @param array $recipients
+     * @return array
+     *
+     */
+    public function resolveAdresses(ContextInterface $ctx, $recipients)
+    {
+        $realRecipients = array();
+        foreach ($recipients as $recipient) {
+            if (is_string($recipient) && strpos($recipient, "/AJXP_TEAM/") === 0) {
+                $confDriver = ConfService::getConfStorageImpl();
+                if (method_exists($confDriver, "teamIdToUsers")) {
+                    $newRecs = $confDriver->teamIdToUsers($ctx->getUser(), str_replace("/AJXP_TEAM/", "", $recipient));
+                }
+            }
+        }
+        if (isSet($newRecs)) {
+            $recipients = array_merge($recipients, $newRecs);
+        }
+        // Recipients can be either UserInterface objects, either array(adress, name), either "adress".
+        foreach ($recipients as $recipient) {
+            if (is_object($recipient) && $recipient instanceof AbstractUser) {
+                $resolved = $this->abstractUserToAdress($recipient);
+                if ($resolved !== false) {
+                    $realRecipients[] = $resolved;
+                }
+            } else if (is_array($recipient)) {
+                if (array_key_exists("adress", $recipient)) {
+                    if (!array_key_exists("name", $recipient)) {
+                        $recipient["name"] = $recipient["adress"];
+                    }
+                    $realRecipients[] = $recipient;
+                }
+            } else if (is_string($recipient)) {
+                if (strpos($recipient, ":") !== false) {
+                    $parts = explode(":", $recipient, 2);
+                    $realRecipients[] = array("name" => $parts[0], "adress" => $parts[2]);
+                } else {
+                    if ($this->validateEmail($recipient)) {
+                        $realRecipients[] = array("name" => $recipient, "adress" => $recipient);
+                    } else if (UsersService::userExists($recipient)) {
+                        $user = UsersService::getUserById($recipient, false);
+                        $res = $this->abstractUserToAdress($user);
+                        if ($res !== false) $realRecipients[] = $res;
+                    }
+                }
+            }
+        }
+
+        return $realRecipients;
+    }
+
+    /**
+     * @param UserInterface $user
+     * @return array|bool
+     */
+    public function abstractUserToAdress(UserInterface $user)
+    {
+        // SHOULD CHECK THAT THIS USER IS "AUTHORIZED" TO AVOID SPAM
+        $userEmail = $user->getPersonalRole()->filterParameterValue("core.conf", "email", AJXP_REPO_SCOPE_ALL, "");
+        if (empty($userEmail)) {
+            return false;
+        }
+        $displayName = $user->getPersonalRole()->filterParameterValue("core.conf", "USER_DISPLAY_NAME", AJXP_REPO_SCOPE_ALL, "");
+        if (empty($displayName)) $displayName = $user->getId();
+        return array("name" => $displayName, "adress" => $userEmail);
+    }
+
+
+    /**
+     * @param $email
+     * @return bool
+     */
+    public function validateEmail($email)
+    {
+        return filter_var($email, FILTER_VALIDATE_EMAIL) !== false;
+    }
+
+    /**
+     * @param $html
+     * @return string
+     */
+    public static function simpleHtml2Text($html)
+    {
+
+        $html = preg_replace('/<br\>/', "\n", $html);
+        $html = preg_replace('/<br>/', "\n", $html);
+        $html = preg_replace('/<li>/', "\n * ", $html);
+        $html = preg_replace('/<\/li>/', '', $html);
+        return strip_tags($html);
+    }
+
+    /**
+     * Install SQL table using a dibi driver data
+     * @param $param array("SQL_DRIVER" => $dibiDriverData)
+     * @return mixed
+     */
+    public function installSQLTables($param)
+    {
+        $base = basename($this->getBaseDir());
+        if ($base == "core.mailer") {
+            $p = OptionsHelper::cleanDibiDriverParameters($param["SQL_DRIVER"]);
+            return DBHelper::runCreateTablesQuery($p, $this->getBaseDir() . "/create.sql");
+        }
+        return true;
+    }
+}
diff --git a/core/src/plugins/core.mailer/class.AjxpMailer.js b/core/src/plugins/core.mailer/class.AjxpMailer.js
index 62010bff4d..ae2b49c3f1 100755
--- a/core/src/plugins/core.mailer/class.AjxpMailer.js
+++ b/core/src/plugins/core.mailer/class.AjxpMailer.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 Class.create("AjxpMailer", {
diff --git a/core/src/plugins/core.mailer/class.AjxpMailer.php b/core/src/plugins/core.mailer/class.AjxpMailer.php
deleted file mode 100644
index 15980ac364..0000000000
--- a/core/src/plugins/core.mailer/class.AjxpMailer.php
+++ /dev/null
@@ -1,631 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-/**
- * @package AjaXplorer_Plugins
- * @subpackage Core
- */
-class AjxpMailer extends AJXP_Plugin implements SqlTableProvider
-{
-
-    public static $TEMPLATES = [
-        "html" => [
-            "body"        => '<div id="digest">%s</div>',   // Argument section
-            "section"     => '%s%s',                        // Argument title, listWrapper
-            "title"       => '<h1>%s</h1>',                 // Argument %var%
-            "listWrapper" => '<ul>%s</ul>',                 // Argument list
-            "list"        => '<li>%s</li>'                  // Argument %var%
-        ],
-        "plain" => [
-            "body"        => '%s',                          // Argument section
-            "section"     => '%s%s',                        // Argument title, listWrapper
-            "title"       => '%s\n\n',                      // Argument %var%
-            "listWrapper" => '%s',                          // Argument list
-            "list"        => '%s\n'                         // Argument %var%
-        ]
-    ];
-
-    public $mailCache;
-    protected $_dibiDriver;
-
-    public function init($options)
-    {
-        parent::init($options);
-        if (AJXP_SERVER_DEBUG) {
-            $this->mailCache = $this->getPluginWorkDir(true)."/mailbox";
-        }
-        $pConf = $this->pluginConf["UNIQUE_MAILER_INSTANCE"];
-        if (!empty($pConf)) {
-            $p = ConfService::instanciatePluginFromGlobalParams($pConf, "AjxpMailer");
-            AJXP_PluginsService::getInstance()->setPluginUniqueActiveForType($p->getType(), $p->getName(), $p);
-        }
-    }
-
-    protected function getDibiDriver () {
-        if (!isset($this->_dibiDriver)) {
-            $this->_dibiDriver = AJXP_Utils::cleanDibiDriverParameters(array("group_switch_value"=>"core"));
-        }
-        return $this->_dibiDriver;
-    }
-
-    public function getConsumerLock() {
-
-        $workDir = $this->getPluginWorkDir(true);
-        $consumerLockFile = $workDir . DIRECTORY_SEPARATOR . "/consume_mail_queue.lock";
-
-        // Opening the file
-        $consumerLock = fopen($consumerLockFile, "w");
-
-        // Making sure the file gets closed and the lock gets released at the end of the script
-        register_shutdown_function(function () use ($consumerLock) {
-            fflush($consumerLock);
-            flock($consumerLock, LOCK_UN);
-
-            fclose($consumerLock);
-        });
-
-        // Retrieving the lock
-        while (!flock($consumerLock, LOCK_EX)) {
-            sleep(60);
-        }
-
-        // Writing the time the lock was granted
-        $time = time();
-        ftruncate($consumerLock, 0);
-        fwrite($consumerLock, $time);
-
-        return $time;
-    }
-    
-    public function mailConsumeQueue ($action, $httpVars, $fileVars) {
-
-        if ($action === "consume_mail_queue") {
-
-            $verbose = $httpVars["verbose"];
-
-            $logInfo = function () {};
-            if ($verbose) {
-                $logInfo = function ($str) {
-                    fwrite(STDOUT, $str . "\n");
-                };
-            }
-
-            /** @var AjxpMailer $mailer */
-            $mailer = AJXP_PluginsService::getInstance()->getActivePluginsForType("mailer", true);
-
-            if (!dibi::isConnected()) {
-                dibi::connect($this->getDibiDriver());
-            }
-
-            if($this->_dibiDriver["driver"] == "postgre"){
-                dibi::query("SET bytea_output=escape");
-            }
-
-            // Get the queue consumer lock and the time it was given
-            $time = $this->getConsumerLock();
-
-            try {
-                $querySQL = dibi::query("SELECT * FROM [ajxp_mail_queue] WHERE [date_event] <= %s", $time);
-            } catch (DibiException $e) {
-                throw new AJXP_Exception($e->getMessage());
-            }
-
-            //$querySQL->fetch();
-            //$resultsSQL = $querySQL->fetchAll();
-            $numRows = $querySQL->count();
-
-            $results = [];
-
-            HTMLWriter::charsetHeader("text/json");
-
-            if ($numRows == 0) {
-                $logInfo("Nothing to process");
-                $output = array("report" => "Sent 0 emails", "detail" => "");
-                echo json_encode($output);
-                return;
-            }
-
-            $logInfo("Processing " . $numRows . " rows.");
-
-            // We need to send one email :
-            // - per user
-            // - per email type (HTML or PLAIN)
-            while($value = $querySQL->fetch()) {
-
-                // Retrieving user information
-                $recipient = $value['recipient'];
-
-                // Retrieving Email type information
-                $emailType = ($value["html"] == 1) ? "html" : "plain";
-
-                // Retrieving notification information
-                /** @var AJXP_Notification $notification */
-                $notification = unserialize($value["notification_object"]);
-
-                $action = $notification->getAction();
-                $author = $notification->getAuthor();
-                $node   = $notification->getNode();
-
-                try {
-                    @$node->loadNodeInfo();
-                } catch(Exception $e){
-                }
-
-                if ($node->isLeaf() && !$node->isRoot()) {
-                    $dirName = $node->getParent()->getPath();
-                } else {
-                    $dirName = $node->getPath();
-                    if ($dirName === null) {
-                        $dirName = '/';
-                    }
-                }
-                $key = sprintf("%s|%s|%s", $action, $author, $dirName);
-
-                // Retrieving workspace information
-                if($node->getRepository() != null) {
-                    $workspace = $node->getRepository()->getDisplay();
-                } else {
-                    $workspace = "Deleted Workspace";
-                }
-
-                $results[$emailType][$recipient][$workspace][$key][] = $notification;
-            }
-
-            $logInfo("Created digest array.");
-
-            $subject = ConfService::getMessages()["core.mailer.9"];
-
-            $success = 0;
-            $errors = [];
-            foreach ($results as $emailType => $recipients) {
-
-                $isHTML = $emailType == "html";
-
-                $i = 0;
-                foreach ($recipients as $recipient => $workspaces) {
-
-                    $logInfo("Processed " . ++$i . " out of " . count($recipients) . " " . $emailType . " emails " . $recipient);
-
-                    $body = $this->_buildDigest($workspaces, $emailType);
-
-                    try {
-                        $mailer->sendMail(
-                            [$recipient],
-                            $subject,
-                            $body,
-                            null,
-                            null,
-                            $isHTML
-                        );
-
-                        $success++;
-                    } catch (Exception $e) {
-                        $errors[] = "Failed to send email to " . $recipient . ": " . $e->getMessage();
-                    }
-                }
-            }
-
-            // Clearing memory
-            unset($results);
-
-            try {
-                dibi::query('DELETE FROM [ajxp_mail_queue] WHERE [date_event] <= %s', $time);
-            } catch (DibiException $e) {
-                throw new AJXP_Exception($e->getMessage());
-            }
-
-            $output = array("report" => "Sent ".$success." emails", "errors" => $errors);
-            echo json_encode($output);
-        }
-    }
-
-    private function _buildDigest($workspaces, $emailType) {
-
-        $template = self::$TEMPLATES[$emailType];
-
-        $sections = [];
-        foreach ($workspaces as $workspace => $keys) {
-
-            $title = "";
-            $li = [];
-
-            foreach ($keys as $key => $notifications) {
-
-                $descriptions = [];
-
-                /** @var AJXP_Notification $notification */
-                foreach ($notifications as $notification) {
-                    if (empty($current)) {
-                        $title = sprintf($template["title"], $notification->getDescriptionLocation());
-                    }
-
-                    $description = $notification->getDescriptionLong(true);
-
-                    if(array_key_exists($description, $descriptions)) {
-                        $descriptions[$description]++;
-                    } else {
-                        $descriptions[$description] = 1;
-                    }
-                }
-
-                foreach ($descriptions as $description => $count){
-                    $li[] = sprintf($template["list"], $description . ($count > 1 ? ' ('.$count.')' : ''));
-                }
-            }
-
-            $listWrapper = sprintf($template["listWrapper"], join("", $li));
-            $sections[] = sprintf($template["section"], $title, $listWrapper);
-        }
-
-        return sprintf($template["body"], join("", $sections));
-    }
-
-    protected function stringify($int){
-        return ($int < 10 ? "0".$int : "".$int);
-    }
-
-    protected function computeEmailSendDate($frequencyType, $frequencyDetail) {
-
-        $date = new DateTime("now");
-
-        $year  = $date->format("Y");
-        $day   = $date->format("d");
-        $month = $date->format("m");
-
-        $hour   = intval($date->format('H'));
-        $minute = intval($date->format('i'));
-
-        $frequency = $frequencyDetail;
-        $allMinute = ($hour * 60) + $minute;
-
-        $nextFrequency = null;
-        switch ($frequencyType) {
-            case "M":
-                //FOR EVERY X MIN
-                $lastInterval = $allMinute - ($allMinute % $frequency);
-                $newMinutes = $this->stringify($lastInterval % 60);
-                $newHour = $this->stringify(($lastInterval - $newMinutes) / 60);
-                $lastFrequency = DateTime::createFromFormat("Y-m-d H:i", "$year-$month-$day $newHour:$newMinutes");
-                $nextFrequency = $lastFrequency->modify("+ $frequency minutes")->getTimestamp();
-                break;
-            case "H":
-                //FOR EVERY X HOUR
-                $frequency = $frequency * 60;
-                $lastInterval = $allMinute - ($allMinute % $frequency);
-                $newHour = $this->stringify($lastInterval / 60);
-                $lastFrequency = DateTime::createFromFormat("Y-m-d H:i", "$year-$month-$day $newHour:00");
-                $nextFrequency = $lastFrequency->modify("+ $frequency minutes")->getTimestamp();
-                break;
-            case "D1":
-                $compareDate = new DateTime($date->format('d-m-Y') . ' ' . $frequency . ':00');
-                if ($date > $compareDate) {
-                    //FREQUENCY ALREADY GONE, NEXT INTERVAL => NEXT DAY
-                    $compareDate = $compareDate->modify('+1 day');
-                }
-                $nextFrequency = new DateTime($compareDate->format('Y-m-d ' . $frequency . ':00'));
-                $nextFrequency = $nextFrequency->getTimestamp();
-                break;
-            case "D2":
-                //FOR EVERY DAY AT X and Y
-                $arrayFrequency = explode(",", $frequencyDetail);
-                if (count($arrayFrequency) === 2) {
-                    $compareDate1 = new DateTime($date->format('d-m-Y') . ' ' . $arrayFrequency[0] . ':00');
-                    $compareDate2 = new DateTime($date->format('d-m-Y') . ' ' . $arrayFrequency[1] . ':00');
-                    if ($date < $compareDate1 && $date < $compareDate2) {
-                        $nextFrequency = $date->format('Y-m-d ' . $arrayFrequency[0] . ':00');
-                    } elseif ($date > $compareDate1 && $date < $compareDate2) {
-                        $nextFrequency = $date->format('Y-m-d ' . $arrayFrequency[1] . ':00');
-                    } else {
-                        $nextFrequency = $date->modify('+1 day')->format('Y-m-d ' . $arrayFrequency[0] . ':00');
-                    }
-                    $nextFrequency = new DateTime($nextFrequency);
-                    $nextFrequency = $nextFrequency->getTimestamp();
-                }
-                break;
-            case "W1":
-                //FOR EVERY WEEK AT THE DAY
-                $nextFrequency = $date->modify('next ' . $frequency)->getTimestamp();
-                break;
-        }
-        return $nextFrequency;
-    }
-
-    public function processNotification(AJXP_Notification &$notification)
-    {
-        // Inserting the node information.
-        try {
-            $notification->getNode()->loadNodeInfo();
-        } catch (Exception $e) {
-            // Do nothing
-        }
-
-        $userExist = AuthService::userExists($notification->getTarget());
-        if ($userExist === true) {
-            $userObject = ConfService::getConfStorageImpl()->createUserObject($notification->getTarget());
-        } else {
-            $messages = ConfService::getMessages();
-            throw new AJXP_Exception($messages['core.mailer.2']);
-        }
-        if($userObject->mergedRole->filterParameterValue("core.mailer","NOTIFICATIONS_EMAIL_GET", AJXP_REPO_SCOPE_ALL,"true") !== "true"){
-            // User does not want to receive any emails.
-            return;
-        }
-
-        $notification_email = $userObject->mergedRole->filterParameterValue("core.mailer","NOTIFICATIONS_EMAIL", AJXP_REPO_SCOPE_ALL,"");
-        $arrayRecipients = array();
-        $mainRecipient = $userObject->mergedRole->filterParameterValue("core.conf", "email", AJXP_REPO_SCOPE_ALL, "");
-        $useHtml = $userObject->mergedRole->filterParameterValue("core.mailer","NOTIFICATIONS_EMAIL_SEND_HTML", AJXP_REPO_SCOPE_ALL,"true") === "true" ? 1 : 0;
-
-        if(!empty($mainRecipient)) $arrayRecipients[] = $mainRecipient;
-        $additionalRecipients = array_map("trim", explode(',', $notification_email));
-        foreach($additionalRecipients as $addR){
-            if(!empty($addR)) $arrayRecipients[] = $addR;
-        }
-
-        if ($this->pluginConf["MAILER_ACTIVATE_QUEUE"] && count($arrayRecipients)) {
-
-            $frequencyType = $userObject->mergedRole->filterParameterValue("core.mailer","NOTIFICATIONS_EMAIL_FREQUENCY", AJXP_REPO_SCOPE_ALL,"M");
-            $frequencyDetail = $userObject->mergedRole->filterParameterValue("core.mailer","NOTIFICATIONS_EMAIL_FREQUENCY_USER", AJXP_REPO_SCOPE_ALL,"5");
-            $nextFrequency = $this->computeEmailSendDate(
-                $frequencyType,
-                $frequencyDetail
-            );
-
-            if(!empty($nextFrequency)){
-                if (!dibi::isConnected()) {
-                    dibi::connect($this->getDibiDriver());
-                }
-                foreach ($arrayRecipients as $recipient) {
-                    try {
-                        dibi::query("INSERT INTO [ajxp_mail_queue] ([recipient],[url],[date_event],[notification_object],[html]) VALUES (%s,%s,%s,%bin,%i) ",
-                            $recipient,
-                            $notification->getNode()->getUrl(),
-                            $nextFrequency,
-                            serialize($notification),
-                            $useHtml);
-                    } catch (Exception $e) {
-                        $this->logError("[mailer]", $e->getMessage());
-                    }
-                }
-            }else{
-                $this->logError("[mailer]", "Could not determine email frequency from $frequencyType / $frequencyDetail for send email to user ".$userObject->getId());
-            }
-        } else {
-
-            $mailer = AJXP_PluginsService::getInstance()->getActivePluginsForType("mailer", true);
-
-            if ($mailer !== false) {
-                try {
-                    $mailer->sendMail(
-                        array($notification->getTarget()),
-                        $notification->getDescriptionShort(),
-                        $notification->getDescriptionLong(),
-                        $notification->getAuthor(),
-                        $notification->getMainLink(),
-                        $useHtml
-                    );
-                } catch (Exception $e) {
-                    throw new AJXP_Exception($e->getMessage());
-                }
-            }
-        }
-    }
-
-    public function sendMail($recipients, $subject, $body, $from = null, $imageLink = null, $useHtml = true)
-    {
-        $prepend      = ConfService::getCoreConf("SUBJECT_PREPEND", "mailer");
-        $append       = ConfService::getCoreConf("SUBJECT_APPEND", "mailer");
-        $layoutFolder = ConfService::getCoreConf("LAYOUT_FOLDER", "mailer");
-        $layout       = ConfService::getCoreConf("BODY_LAYOUT", "mailer");
-        $forceFrom    = ConfService::getCoreConf("FORCE_UNIQUE_FROM", "mailer");
-        $coreFrom     = ConfService::getCoreConf("FROM", "mailer");
-
-        if($forceFrom && $coreFrom != null){
-            $coreFromName = ConfService::getCoreConf("FROM_NAME", "mailer");
-            $from = array("adress" => $coreFrom, "name" => $coreFromName);
-        }
-        $rowBody = $body;
-        $images = array();
-        if(!empty($prepend)) $subject = $prepend ." ". $subject;
-        if(!empty($append)) $subject .= " ".$append;
-        if (!empty($layoutFolder)) {
-            $layoutFolder .= "/";
-            $lang = ConfService::getLanguage();
-            if(!$useHtml){
-                if (is_file(AJXP_INSTALL_PATH."/".$layoutFolder.$lang.".txt")) {
-                    $layout = implode("", file(AJXP_INSTALL_PATH."/".$layoutFolder.$lang.".txt"));
-                } else if (is_file(AJXP_INSTALL_PATH."/".$layoutFolder."en.txt")) {
-                    $layout = implode("", file(AJXP_INSTALL_PATH."/".$layoutFolder."en.txt"));
-                } else{
-                    $layout = "AJXP_MAIL_BODY";
-                }
-            }else{
-                if (is_file(AJXP_INSTALL_PATH."/".$layoutFolder.$lang.".html")) {
-                    $layout = implode("", file(AJXP_INSTALL_PATH."/".$layoutFolder.$lang.".html"));
-                } else if (is_file(AJXP_INSTALL_PATH."/".$layoutFolder."en.html")) {
-                    $layout = implode("", file(AJXP_INSTALL_PATH."/".$layoutFolder."en.html"));
-                }
-            }
-        }
-        if (strpos($layout, "AJXP_MAIL_BODY") !== false) {
-            $body = str_replace("AJXP_MAIL_BODY", $useHtml?nl2br($body):$body, $layout);
-        }
-        if ($imageLink != null && $useHtml) {
-            $body = str_replace(array("AJXP_IMAGE_LINK"), "<a href='".$imageLink."'>".'<img alt="Download" width="100" style="width: 100px;" src="cid:download_id">'."</a>", $body);
-            $images[] = array("path" => AJXP_INSTALL_PATH."/".$layoutFolder."/download.png", "cid" => "download_id");
-        } else {
-            $body = str_replace(array("AJXP_IMAGE_LINK", "AJXP_IMAGE_END"), "", $body);
-        }
-        $body = str_replace("AJXP_MAIL_SUBJECT", $subject, $body);
-        $this->sendMailImpl($recipients, $subject, $body, $from, $images, $useHtml);
-        if (AJXP_SERVER_DEBUG) {
-            if(!$useHtml) {
-                $rowBody = '[TEXT ONLY] '.AjxpMailer::simpleHtml2Text($rowBody);
-            }
-            $line = "------------------------------------------------------------------------\n";
-            file_put_contents($this->mailCache, $line."Sending mail from ".print_r($from, true)." to ".print_r($recipients, true)."\nSubject: $subject\nBody:\n$rowBody\n", FILE_APPEND);
-        }
-    }
-
-    protected function sendMailImpl($recipients, $subject, $body, $from = null, $images = array(), $useHtml = true) {
-    }
-
-    public function sendMailAction($actionName, $httpVars, $fileVars) {
-        $mess = ConfService::getMessages();
-        $mailers = AJXP_PluginsService::getInstance()->getActivePluginsForType("mailer");
-        if (!count($mailers)) {
-            throw new Exception($mess["core.mailer.3"]);
-        }
-
-        $mailer = array_pop($mailers);
-
-        //$toUsers = array_merge(explode(",", $httpVars["users_ids"]), explode(",", $httpVars["to"]));
-        //$toGroups =  explode(",", $httpVars["groups_ids"]);
-        $toUsers = $httpVars["emails"];
-
-        $emails = $this->resolveAdresses($toUsers);
-        $from = $this->resolveFrom($httpVars["from"]);
-        $imageLink = isSet($httpVars["link"]) ? $httpVars["link"] : null;
-
-        $subject = $httpVars["subject"];
-        $body = $httpVars["message"];
-
-        if (count($emails)) {
-            $mailer->sendMail($emails, $subject, $body, $from, $imageLink);
-            AJXP_XMLWriter::header();
-            AJXP_XMLWriter::sendMessage(str_replace("%s", count($emails), $mess["core.mailer.1"]), null);
-            AJXP_XMLWriter::close();
-        } else {
-            AJXP_XMLWriter::header();
-            AJXP_XMLWriter::sendMessage(null, $mess["core.mailer.2"]);
-            AJXP_XMLWriter::close();
-        }
-    }
-
-    public function resolveFrom($fromAdress = null) {
-        $fromResult = array();
-        if ($fromAdress != null) {
-            $arr = $this->resolveAdresses(array($fromAdress));
-            if(count($arr)) $fromResult = $arr[0];
-        } else if (AuthService::getLoggedUser() != null) {
-            $arr = $this->resolveAdresses(array(AuthService::getLoggedUser()));
-            if(count($arr)) $fromResult = $arr[0];
-        }
-        if (!count($fromResult)) {
-            $f = ConfService::getCoreConf("FROM", "mailer");
-            $fName = ConfService::getCoreConf("FROM_NAME", "mailer");
-            $fromResult = array("adress" => $f, "name" => $fName );
-        }
-        return $fromResult;
-    }
-
-    /**
-     * @param array $recipients
-     * @return array
-     *
-     */
-    public function resolveAdresses($recipients) {
-        $realRecipients = array();
-        foreach ($recipients as $recipient) {
-            if (is_string($recipient) && strpos($recipient, "/AJXP_TEAM/") === 0) {
-                $confDriver = ConfService::getConfStorageImpl();
-                if (method_exists($confDriver, "teamIdToUsers")) {
-                    $newRecs = $confDriver->teamIdToUsers(str_replace("/AJXP_TEAM/", "", $recipient));
-                }
-            }
-        }
-        if (isSet($newRecs)) {
-            $recipients = array_merge($recipients, $newRecs);
-        }
-        // Recipients can be either AbstractAjxpUser objects, either array(adress, name), either "adress".
-        foreach ($recipients as $recipient) {
-            if (is_object($recipient) && is_a($recipient, "AbstractAjxpUser")) {
-                $resolved = $this->abstractUserToAdress($recipient);
-                if ($resolved !== false) {
-                    $realRecipients[] = $resolved;
-                }
-            } else if (is_array($recipient)) {
-                if (array_key_exists("adress", $recipient)) {
-                    if (!array_key_exists("name", $recipient)) {
-                        $recipient["name"] = $recipient["adress"];
-                    }
-                    $realRecipients[] = $recipient;
-                }
-            } else if (is_string($recipient)) {
-                if (strpos($recipient, ":") !== false) {
-                    $parts = explode(":", $recipient, 2);
-                    $realRecipients[] = array("name" => $parts[0], "adress" => $parts[2]);
-                } else {
-                    if ($this->validateEmail($recipient)) {
-                        $realRecipients[] = array("name" => $recipient, "adress" => $recipient);
-                    } else if (AuthService::userExists($recipient)) {
-                        $user = ConfService::getConfStorageImpl()->createUserObject($recipient);
-                        $res = $this->abstractUserToAdress($user);
-                        if($res !== false) $realRecipients[] = $res;
-                    }
-                }
-            }
-        }
-
-        return $realRecipients;
-    }
-
-    public function abstractUserToAdress(AbstractAjxpUser $user)
-    {
-        // SHOULD CHECK THAT THIS USER IS "AUTHORIZED" TO AVOID SPAM
-        $userEmail = $user->personalRole->filterParameterValue("core.conf", "email", AJXP_REPO_SCOPE_ALL, "");
-        if (empty($userEmail)) {
-            return false;
-        }
-        $displayName = $user->personalRole->filterParameterValue("core.conf", "USER_DISPLAY_NAME", AJXP_REPO_SCOPE_ALL, "");
-        if(empty($displayName)) $displayName = $user->getId();
-        return array("name" => $displayName, "adress" => $userEmail);
-    }
-
-
-    public function validateEmail($email) {
-        return filter_var($email, FILTER_VALIDATE_EMAIL) !== false;
-    }
-
-    public static function simpleHtml2Text($html){
-        $html = preg_replace('/<br\>/', "\n", $html);
-        $html = preg_replace('/<br>/', "\n", $html);
-        $html = preg_replace('/<li>/', "\n * ", $html);
-        $html = preg_replace('/<\/li>/', '', $html);
-        return strip_tags($html);
-    }
-
-    /**
-     * Install SQL table using a dibi driver data
-     * @param $param array("SQL_DRIVER" => $dibiDriverData)
-     * @return mixed
-     */
-    public function installSQLTables($param) {
-        $base = basename($this->getBaseDir());
-        if($base == "core.mailer"){
-            $p = AJXP_Utils::cleanDibiDriverParameters($param["SQL_DRIVER"]);
-            return AJXP_Utils::runCreateTablesQuery($p, $this->getBaseDir()."/create.sql");
-        }
-        return true;
-    }
-}
diff --git a/core/src/plugins/core.mailer/i18n/conf/de.php b/core/src/plugins/core.mailer/i18n/conf/de.php
index 7ed649d2b8..a2336c96f5 100755
--- a/core/src/plugins/core.mailer/i18n/conf/de.php
+++ b/core/src/plugins/core.mailer/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess = array(
     "Mailers" => "Mailer",
diff --git a/core/src/plugins/core.mailer/i18n/conf/en.php b/core/src/plugins/core.mailer/i18n/conf/en.php
index f762c8a44e..bd4cf451a9 100755
--- a/core/src/plugins/core.mailer/i18n/conf/en.php
+++ b/core/src/plugins/core.mailer/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess = array(
     "Mailers" => "Mailers",
diff --git a/core/src/plugins/core.mailer/i18n/conf/fr.php b/core/src/plugins/core.mailer/i18n/conf/fr.php
index d915da3e8f..c294ac8b2e 100644
--- a/core/src/plugins/core.mailer/i18n/conf/fr.php
+++ b/core/src/plugins/core.mailer/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess = array(
     "Mailers" => "Emails",
diff --git a/core/src/plugins/core.mailer/i18n/de.php b/core/src/plugins/core.mailer/i18n/de.php
index e192753339..5c46766fcf 100755
--- a/core/src/plugins/core.mailer/i18n/de.php
+++ b/core/src/plugins/core.mailer/i18n/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess = array(
     "1" => "E-Mail erfolgreich an %s Benutzer versendet",
diff --git a/core/src/plugins/core.mailer/i18n/en.php b/core/src/plugins/core.mailer/i18n/en.php
index 729730bd3e..b877bab2ac 100755
--- a/core/src/plugins/core.mailer/i18n/en.php
+++ b/core/src/plugins/core.mailer/i18n/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess = array(
     "1" => "Email successfully sent to %s user(s)",
diff --git a/core/src/plugins/core.mailer/i18n/fr.php b/core/src/plugins/core.mailer/i18n/fr.php
index 77f7dfa4b7..b949b30b8a 100755
--- a/core/src/plugins/core.mailer/i18n/fr.php
+++ b/core/src/plugins/core.mailer/i18n/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess = array(
     "1" => "Le courriel a été envoyé avec succès à %s utilisateur(s)",
diff --git a/core/src/plugins/core.mailer/i18n/it.php b/core/src/plugins/core.mailer/i18n/it.php
index 7797b67e0b..00faf4d36d 100755
--- a/core/src/plugins/core.mailer/i18n/it.php
+++ b/core/src/plugins/core.mailer/i18n/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess = array(
     "1" => "Email inviata correttamente a %s ",
diff --git a/core/src/plugins/core.mailer/i18n/pt.php b/core/src/plugins/core.mailer/i18n/pt.php
index a686596567..ae6daec504 100644
--- a/core/src/plugins/core.mailer/i18n/pt.php
+++ b/core/src/plugins/core.mailer/i18n/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess = array(
     "1" => "E-mail enviado com sucesso para %s ",
diff --git a/core/src/plugins/core.mailer/js/react/PydioMailer.js b/core/src/plugins/core.mailer/js/react/PydioMailer.js
index 38ff8a27f1..432d124847 100644
--- a/core/src/plugins/core.mailer/js/react/PydioMailer.js
+++ b/core/src/plugins/core.mailer/js/react/PydioMailer.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 (function(global){
 
diff --git a/core/src/plugins/core.mailer/manifest.xml b/core/src/plugins/core.mailer/manifest.xml
index c124d7c65d..5e27c1a8ad 100644
--- a/core/src/plugins/core.mailer/manifest.xml
+++ b/core/src/plugins/core.mailer/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ajxp_plugin id="core.mailer" label="CONF_MESSAGE[Mailers]" description="CONF_MESSAGE[Core configs for sending emails]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <class_definition classname="AjxpMailer" filename="plugins/core.mailer/class.AjxpMailer.php"/>
+    <class_definition classname="Pydio\Mailer\Core\Mailer" filename="plugins/core.mailer/Mailer.php"/>
     <server_settings>
         <global_param name="MAILER_ACTIVATE_QUEUE" type="boolean" label="CONF_MESSAGE[Activate Queue]" description="CONF_MESSAGE[Store emails in a queue and batch-process them. Users can choose the sending frequency. Make sure to set up a CRON on consume_mail_queue action if you use this option.]" default="false"/>
         <global_param name="UNIQUE_MAILER_INSTANCE" type="plugin_instance:mailer" label="CONF_MESSAGE[Mailer Plugin]" description="CONF_MESSAGE[Select the plugin to activate for concretely sending emails]" mandatory="true" default="mailer.phpmailer-lite"/>
diff --git a/core/src/plugins/core.mailer/package.json b/core/src/plugins/core.mailer/package.json
index 0a468109ef..9677bcb706 100644
--- a/core/src/plugins/core.mailer/package.json
+++ b/core/src/plugins/core.mailer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "core.mailer",
-  "version": "6.2.3",
+  "version": "6.5.1",
   "description": "",
   "source_path":"js",
   "main": "index.js",
diff --git a/core/src/plugins/core.meta/AbstractMetaSource.php b/core/src/plugins/core.meta/AbstractMetaSource.php
new file mode 100644
index 0000000000..8f54abf766
--- /dev/null
+++ b/core/src/plugins/core.meta/AbstractMetaSource.php
@@ -0,0 +1,62 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Meta\Core;
+
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Core\Model\ContextInterface;
+
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\Services\RepositoryService;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Class AbstractMetaSource
+ * Abstract class from which all meta.* plugins must extend.
+ */
+abstract class AbstractMetaSource extends Plugin {
+
+    /**
+     * @var AbstractAccessDriver
+     */
+    protected $accessDriver;
+
+    /**
+     * @param ContextInterface $ctx
+     * @param AbstractAccessDriver $accessDriver
+     */
+    public function initMeta(ContextInterface $ctx, AbstractAccessDriver $accessDriver)
+    {
+
+        // Override options with parent META SOURCE options
+        // Could be refined ?
+        if($ctx->getRepository()->hasParent()){
+            $parentRepo = RepositoryService::getRepositoryById($ctx->getRepository()->getParentId());
+            if($parentRepo != null){
+                $sources = $parentRepo->getContextOption($ctx, "META_SOURCES");
+                $qParent = $sources["meta.quota"];
+                if(is_array($qParent)) $this->options = array_merge($this->options, $qParent);
+            }
+        }
+
+    }
+
+} 
\ No newline at end of file
diff --git a/core/src/plugins/core.meta/IFileHasher.php b/core/src/plugins/core.meta/IFileHasher.php
new file mode 100644
index 0000000000..53e38687dc
--- /dev/null
+++ b/core/src/plugins/core.meta/IFileHasher.php
@@ -0,0 +1,39 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Access\Meta\Core;
+
+use Pydio\Access\Core\Model\AJXP_Node;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Interface IFileHasher
+ * @package Pydio\Access\Meta\Core
+ */
+interface IFileHasher
+{
+    /**
+     * Get a hash and add it to the current node as metadata
+     * @param AJXP_Node $node
+     * @return string md5
+     */
+    public function getFileHash(AJXP_Node $node);
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.metastore/IMetaStoreProvider.php b/core/src/plugins/core.metastore/IMetaStoreProvider.php
new file mode 100644
index 0000000000..78cd33cebf
--- /dev/null
+++ b/core/src/plugins/core.metastore/IMetaStoreProvider.php
@@ -0,0 +1,96 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Metastore\Core;
+
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Access\Core\IAjxpWrapperProvider;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Core\Model\ContextInterface;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+define('AJXP_METADATA_SHAREDUSER', 'AJXP_METADATA_SHAREDUSER');
+define('AJXP_METADATA_ALLUSERS', 'AJXP_METADATA_ALLUSERS');
+
+define('AJXP_METADATA_SCOPE_GLOBAL', 1);
+define('AJXP_METADATA_SCOPE_REPOSITORY', 2);
+/**
+ * Metadata interface, must be implemented by Metastore plugins.
+ *
+ * @package Pydio\Access\Metastore\Core;
+ */
+interface IMetaStoreProvider
+{
+
+    /**
+     * @param ContextInterface $ctx
+     * @param AbstractAccessDriver|IAjxpWrapperProvider $accessDriver
+     */
+    public function initMeta(ContextInterface $ctx, AbstractAccessDriver $accessDriver);
+
+    /**
+     * @abstract
+     * @return bool
+     */
+    public function inherentMetaMove();
+
+    /**
+     * @abstract
+     * @param AJXP_Node $ajxpNode The node where to set metadata
+     * @param String $nameSpace The metadata namespace (generally depending on the plugin)
+     * @param array $metaData Metadata to store
+     * @param bool $private Either false (will store under a shared user name) or true (will store under the node user name).
+     * @param int $scope
+     * Either AJXP_METADATA_SCOPE_REPOSITORY (this metadata is available only inside the current repository)
+     * or AJXP_METADATA_SCOPE_GLOBAL (metadata available globally).
+     */
+    public function setMetadata($ajxpNode, $nameSpace, $metaData, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY);
+    
+    /**
+     *
+     * @abstract
+     * @param AJXP_Node $ajxpNode The node to inspect
+     * @param String $nameSpace The metadata namespace (generally depending on the plugin)
+     * @param bool $private Either false (will store under a shared user name) or true (will store under the node user name).
+     * @param int $scope
+     * Either AJXP_METADATA_SCOPE_REPOSITORY (this metadata is available only inside the current repository)
+     * or AJXP_METADATA_SCOPE_GLOBAL (metadata available globally).
+     * @return array Metadata or empty array.
+     */
+    public function removeMetadata($ajxpNode, $nameSpace, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY);
+
+    /**
+     * @abstract
+     * @param AJXP_Node $ajxpNode
+     * @param String $nameSpace
+     * @param bool|String $private
+     * Either false (will store under a shared user name), true (will store under the node user name),
+     * or AJXP_METADATA_ALL_USERS (will retrieve and merge all metadata from all users).
+     * @param int $scope
+     */
+    public function retrieveMetadata($ajxpNode, $nameSpace, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY);
+
+    /**
+     * @param AJXP_Node $ajxpNode Load all metadatas on this node, merging the global, shared and private ones.
+     * @return void
+     */
+    public function enrichNode(&$ajxpNode);
+
+}
diff --git a/core/src/plugins/core.metastore/interface.MetaStoreProvider.php b/core/src/plugins/core.metastore/interface.MetaStoreProvider.php
deleted file mode 100644
index 6f9cfb84b3..0000000000
--- a/core/src/plugins/core.metastore/interface.MetaStoreProvider.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-define('AJXP_METADATA_SHAREDUSER', 'AJXP_METADATA_SHAREDUSER');
-define('AJXP_METADATA_ALLUSERS', 'AJXP_METADATA_ALLUSERS');
-
-define('AJXP_METADATA_SCOPE_GLOBAL', 1);
-define('AJXP_METADATA_SCOPE_REPOSITORY', 2);
-/**
- * Metadata interface, must be implemented by Metastore plugins.
- *
- * @package AjaXplorer_Plugins
- * @subpackage Core
- */
-interface MetaStoreProvider
-{
-    public function init($options);
-    public function initMeta($accessDriver);
-
-    /**
-     * @abstract
-     * @return bool
-     */
-    public function inherentMetaMove();
-
-    /**
-     * @abstract
-     * @param AJXP_Node $ajxpNode The node where to set metadata
-     * @param String $nameSpace The metadata namespace (generally depending on the plugin)
-     * @param array $metaData Metadata to store
-     * @param bool $private Either false (will store under a shared user name) or true (will store under the node user name).
-     * @param int $scope
-     * Either AJXP_METADATA_SCOPE_REPOSITORY (this metadata is available only inside the current repository)
-     * or AJXP_METADATA_SCOPE_GLOBAL (metadata available globally).
-     */
-
-    public function setMetadata($ajxpNode, $nameSpace, $metaData, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY);
-    /**
-     *
-     * @abstract
-     * @param AJXP_Node $ajxpNode The node to inspect
-     * @param String $nameSpace The metadata namespace (generally depending on the plugin)
-     * @param bool $private Either false (will store under a shared user name) or true (will store under the node user name).
-     * @param int $scope
-     * Either AJXP_METADATA_SCOPE_REPOSITORY (this metadata is available only inside the current repository)
-     * or AJXP_METADATA_SCOPE_GLOBAL (metadata available globally).
-     * @return Array Metadata or empty array.
-     */
-    public function removeMetadata($ajxpNode, $nameSpace, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY);
-
-    /**
-     * @abstract
-     * @param AJXP_Node $ajxpNode
-     * @param String $nameSpace
-     * @param bool|String $private
-     * Either false (will store under a shared user name), true (will store under the node user name),
-     * or AJXP_METADATA_ALL_USERS (will retrieve and merge all metadata from all users).
-     * @param int $scope
-     */
-    public function retrieveMetadata($ajxpNode, $nameSpace, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY);
-
-    /**
-     * @param AJXP_Node $ajxpNode Load all metadatas on this node, merging the global, shared and private ones.
-     * @return void
-     */
-    public function enrichNode(&$ajxpNode);
-
-}
diff --git a/core/src/plugins/core.mq/class.AjxpMqObserver.js b/core/src/plugins/core.mq/class.AjxpMqObserver.js
deleted file mode 100755
index a0d114eec3..0000000000
--- a/core/src/plugins/core.mq/class.AjxpMqObserver.js
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright 2007-2012 Charles du Jeu <contact (at) cdujeu.me>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-/**
- * Use WebSocket or Poller
- */
-Class.create("AjxpMqObserver", {
-
-    pe:null,
-    currentRepo:null,
-    clientId:null,
-    ws: null,
-    configs: null,
-    channel_pending: false,
-
-    initialize : function(){
-        "use strict";
-
-        if(window.ajxpMinisite) return;
-
-        this.clientId = window.ajxpBootstrap.parameters.get("SECURE_TOKEN");
-        this.configs = ajaxplorer.getPluginConfigs("mq");
-
-        document.observe("ajaxplorer:repository_list_refreshed", function(event){
-
-            var repoId;
-            var data = event.memo;
-            if(data.active) {
-                repoId = data.active;
-            } else if(pydio.repositoryId) {
-                repoId = pydio.repositoryId;
-            }
-            if(this.currentRepo && this.currentRepo == repoId){ // Ignore, repoId did not change!
-                return;
-            }
-            this.initForRepoId(repoId);
-
-        }.bind(this));
-
-        if(ajaxplorer.repositoryId){
-            this.initForRepoId(ajaxplorer.repositoryId);
-        }
-
-    },
-
-    initForRepoId:function(repoId){
-        if(window.WebSocket && this.configs.get("WS_SERVER_ACTIVE")){
-
-            if(this.ws) {
-                if(!repoId){
-                    this.ws.onclose = function(){
-                        delete this.ws;
-                    }.bind(this);
-                    this.ws.close();
-
-                } else {
-                    try{
-                        this.ws.send("register:" + repoId);
-                    }catch(e){
-                        if(console) console.log('Error while sending WebSocket message: '+ e.message);
-                    }
-                }
-            }else{
-                if(repoId){
-                    var url = "ws"+(this.configs.get("WS_SERVER_SECURE")?"s":"")+"://"+this.configs.get("WS_SERVER_HOST")+":"+this.configs.get("WS_SERVER_PORT")+this.configs.get("WS_SERVER_PATH");
-                    this.ws = new WebSocket(url);
-                    this.ws.onmessage = function(event){
-                        var obj = parseXml(event.data);
-                        if(obj){
-                            PydioApi.getClient().parseXmlMessage(obj);
-                            ajaxplorer.notify("server_message", obj);
-                        }
-                    };
-                    this.ws.onopen = function(){
-                        this.ws.send("register:" + repoId);
-                    }.bind(this);
-                    this.ws.onclose = function(event){
-                        var reason;
-                        // See http://tools.ietf.org/html/rfc6455#section-7.4.1
-                        if (event.code == 1000)
-                            reason = "Normal closure, meaning that the purpose for which the connection was established has been fulfilled.";
-                        else if(event.code == 1001)
-                            reason = "An endpoint is \"going away\", such as a server going down or a browser having navigated away from a page.";
-                        else if(event.code == 1002)
-                            reason = "An endpoint is terminating the connection due to a protocol error";
-                        else if(event.code == 1003)
-                            reason = "An endpoint is terminating the connection because it has received a type of data it cannot accept (e.g., an endpoint that understands only text data MAY send this if it receives a binary message).";
-                        else if(event.code == 1004)
-                            reason = "Reserved. The specific meaning might be defined in the future.";
-                        else if(event.code == 1005)
-                            reason = "No status code was actually present.";
-                        else if(event.code == 1006)
-                            reason = "The connection was closed abnormally, e.g., without sending or receiving a Close control frame";
-                        else if(event.code == 1007)
-                            reason = "An endpoint is terminating the connection because it has received data within a message that was not consistent with the type of the message (e.g., non-UTF-8 [http://tools.ietf.org/html/rfc3629] data within a text message).";
-                        else if(event.code == 1008)
-                            reason = "An endpoint is terminating the connection because it has received a message that \"violates its policy\". This reason is given either if there is no other sutible reason, or if there is a need to hide specific details about the policy.";
-                        else if(event.code == 1009)
-                            reason = "An endpoint is terminating the connection because it has received a message that is too big for it to process.";
-                        else if(event.code == 1010) // Note that this status code is not used by the server, because it can fail the WebSocket handshake instead.
-                            reason = "An endpoint (client) is terminating the connection because it has expected the server to negotiate one or more extension, but the server didn't return them in the response message of the WebSocket handshake. Specifically, the extensions that are needed are: " + event.reason;
-                        else if(event.code == 1011)
-                            reason = "A server is terminating the connection because it encountered an unexpected condition that prevented it from fulfilling the request.";
-                        else if(event.code == 1015)
-                            reason = "The connection was closed due to a failure to perform a TLS handshake (e.g., the server certificate can't be verified).";
-                        else
-                            reason = "Unknown reason";
-                        if(window.console){
-                            console.error("WebSocket Closed Connection for this reason :" + reason + " (code "+event.code+")");
-                            console.error("Switching back to polling");
-                        }
-                        delete this.ws;
-                        this.configs.set("WS_SERVER_ACTIVE", false);
-                        this.initForRepoId(repoId);
-
-                    }.bind(this);
-                    this.ws.onerror = function(){
-                        if(window.console){
-                            console.error("Cannot login to websocket server, switching back to polling");
-                        }
-                        delete this.ws;
-                        this.configs.set("WS_SERVER_ACTIVE", false);
-                        this.initForRepoId(repoId);
-                    }.bind(this);
-                }
-            }
-
-        }else{
-
-            if(this.pe){
-                this.pe.stop();
-            }
-
-            if(this.currentRepo && repoId){
-
-                this.unregisterCurrentChannel(function(){
-                    this.registerChannel(repoId);
-                }.bind(this));
-
-            }else if(this.currentRepo && !repoId){
-
-                this.unregisterCurrentChannel();
-
-            }else if(!this.currentRepo && repoId){
-
-                this.registerChannel(repoId);
-
-            }
-
-        }
-
-    },
-
-    unregisterCurrentChannel : function(callback){
-
-        var conn = new Connexion();
-        conn.setParameters($H({
-            get_action:'client_unregister_channel',
-            channel:'nodes:' + this.currentRepo,
-            client_id:this.clientId
-        }));
-        conn.discrete = true;
-        conn.onComplete = function(transp){
-            this.currentRepo = null;
-            if(callback) callback();
-        }.bind(this);
-        conn.sendAsync();
-
-    },
-
-    registerChannel : function(repoId){
-
-        this.currentRepo = repoId;
-        var conn = new Connexion();
-        conn.setParameters($H({
-            get_action:'client_register_channel',
-            channel:'nodes:' + repoId,
-            client_id:this.clientId
-        }));
-        conn.discrete = true;
-        conn.sendAsync();
-
-        this.pe = new PeriodicalExecuter(this.consumeChannel.bind(this), this.configs.get('POLLER_FREQUENCY') || 5);
-
-    },
-
-    consumeChannel : function(){
-        if(this.channel_pending) {
-            return;
-        }
-        var conn = new Connexion();
-        conn.setParameters($H({
-            get_action:'client_consume_channel',
-            channel:'nodes:' + this.currentRepo,
-            client_id:this.clientId
-        }));
-        conn.discrete = true;
-        conn.onComplete = function(transport){
-            this.channel_pending = false;
-            if(transport.responseXML){
-                PydioApi.getClient().parseXmlMessage(transport.responseXML);
-                ajaxplorer.notify("server_message", transport.responseXML);
-            }
-        }.bind(this);
-        this.channel_pending = true;
-        conn.sendAsync();
-    }
-
-});
\ No newline at end of file
diff --git a/core/src/plugins/core.mq/class.MqManager.php b/core/src/plugins/core.mq/class.MqManager.php
deleted file mode 100755
index 5b57cbfa7d..0000000000
--- a/core/src/plugins/core.mq/class.MqManager.php
+++ /dev/null
@@ -1,355 +0,0 @@
-<?php
-/*
- * Copyright 2007-2012 Charles du Jeu <contact (at) cdujeu.me>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-// DL and install install vendor (composer?) https://github.com/Devristo/phpws
-
-
-/**
- * Websocket JS Sample
- *
- * var websocket = new WebSocket("ws://serverURL:8090/echo");
-websocket.onmessage = function(event){console.log(event.data);};
- *
- *     new PeriodicalExecuter(function(pe){
-     var conn = new Connexion();
-     conn.setParameters($H({get_action:'client_consume_channel',channel:'nodes:0',client_id:'toto'}));
-     conn.onComplete = function(transport){PydioApi.getClient().parseXmlMessage(transport.responseXML);};
-     conn.sendAsync();
-     }, 5);
- *
- * @package AjaXplorer_Plugins
- * @subpackage Core
- *
- */
-class MqManager extends AJXP_Plugin
-{
-
-    private $wsClient;
-
-    /**
-     * @var AJXP_MessageExchanger;
-     */
-    private $msgExchanger = false;
-    private $useQueue = false ;
-
-
-    public function init($options)
-    {
-        parent::init($options);
-        $this->useQueue = $this->pluginConf["USE_QUEUE"];
-        try {
-            $this->msgExchanger = ConfService::instanciatePluginFromGlobalParams($this->pluginConf["UNIQUE_MS_INSTANCE"], "AJXP_MessageExchanger");
-            if(AuthService::$bufferedMessage != null && AuthService::getLoggedUser() != null){
-                $this->sendInstantMessage(AuthService::$bufferedMessage, ConfService::getCurrentRepositoryId(), AuthService::getLoggedUser()->getId());
-                AuthService::$bufferedMessage = null;
-            }
-        } catch (Exception $e) {}
-    }
-
-
-    public function sendToQueue(AJXP_Notification $notification)
-    {
-        if (!$this->useQueue) {
-            $this->logDebug("SHOULD DISPATCH NOTIFICATION ON ".$notification->getNode()->getUrl()." ACTION ".$notification->getAction());
-            AJXP_Controller::applyHook("msg.notification", array(&$notification));
-        } else {
-            if($this->msgExchanger) $this->msgExchanger->publishWorkerMessage("user_notifications", $notification);
-        }
-    }
-
-    public function consumeQueue($action, $httpVars, $fileVars)
-    {
-        if($action != "consume_notification_queue" || $this->msgExchanger === false) return;
-        $queueObjects = $this->msgExchanger->consumeWorkerChannel("user_notifications");
-        if (is_array($queueObjects)) {
-            $this->logDebug("Processing notification queue, ".count($queueObjects)." notifs to handle");
-            foreach ($queueObjects as $notification) {
-                AJXP_Controller::applyHook("msg.notification", array(&$notification));
-            }
-        }
-    }
-
-    /**
-     * @param AJXP_Node $origNode
-     * @param AJXP_Node $newNode
-     * @param bool $copy
-     */
-    public function publishNodeChange($origNode = null, $newNode = null, $copy = false)
-    {
-        $content = "";$repo = "";$targetUserId=null; $nodePathes = array();
-        $update = false;
-        if ($newNode != null) {
-            $repo = $newNode->getRepositoryId();
-            $targetUserId = $newNode->getUser();
-            $nodePathes[] = $newNode->getPath();
-            $update = false;
-            $data = array();
-            if ($origNode != null && !$copy) {
-                $update = true;
-                $data[$origNode->getPath()] = $newNode;
-            } else {
-                $data[] = $newNode;
-            }
-            $content = AJXP_XMLWriter::writeNodesDiff(array(($update?"UPDATE":"ADD") => $data));
-        }
-        if ($origNode != null && ! $update && !$copy) {
-
-            $repo = $origNode->getRepositoryId();
-            $targetUserId = $origNode->getUser();
-            $nodePathes[] = $origNode->getPath();
-            $content = AJXP_XMLWriter::writeNodesDiff(array("REMOVE" => array($origNode->getPath())));
-
-        }
-        if (!empty($content) && $repo != "") {
-
-            $this->sendInstantMessage($content, $repo, $targetUserId, null, $nodePathes);
-
-        }
-
-    }
-
-    public function sendInstantMessage($xmlContent, $repositoryId, $targetUserId = null, $targetGroupPath = null, $nodePathes = array())
-    {
-        if ($repositoryId === AJXP_REPO_SCOPE_ALL) {
-            $userId = $targetUserId;
-        } else {
-            $scope = ConfService::getRepositoryById($repositoryId)->securityScope();
-            if ($scope == "USER") {
-                if($targetUserId) $userId = $targetUserId;
-                else $userId = AuthService::getLoggedUser()->getId();
-            } else if ($scope == "GROUP") {
-                $gPath = AuthService::getLoggedUser()->getGroupPath();
-            } else if (isSet($targetUserId)) {
-                $userId = $targetUserId;
-            } else if (isSet($targetGroupPath)) {
-                $gPath = $targetGroupPath;
-            }
-        }
-
-        // Publish for pollers
-        $message = new stdClass();
-        $message->content = $xmlContent;
-        if(isSet($userId)) {
-            $message->userId = $userId;
-        }
-        if(isSet($gPath)) {
-            $message->groupPath = $gPath;
-        }
-        if(count($nodePathes)) {
-            $message->nodePathes = $nodePathes;
-        }
-
-        if ($this->msgExchanger) {
-            $this->msgExchanger->publishInstantMessage("nodes:$repositoryId", $message);
-        }
-
-        // Publish for WebSockets
-        $configs = $this->getConfigs();
-        if ($configs["WS_SERVER_ACTIVE"]) {
-
-            require_once($this->getBaseDir()."/vendor/phpws/websocket.client.php");
-            // Publish for websockets
-            $input = array("REPO_ID" => $repositoryId, "CONTENT" => "<tree>".$xmlContent."</tree>");
-            if(isSet($userId)){
-                $input["USER_ID"] = $userId;
-            } else if(isSet($gPath)) {
-                $input["GROUP_PATH"] = $gPath;
-            }
-            if(count($nodePathes)) {
-                $input["NODE_PATHES"] = $nodePathes;
-            }
-            $input = serialize($input);
-            $msg = WebSocketMessage::create($input);
-            if (!isset($this->wsClient)) {
-                $this->wsClient = new WebSocket("ws://".$configs["WS_SERVER_BIND_HOST"].":".$configs["WS_SERVER_BIND_PORT"].$configs["WS_SERVER_PATH"]);
-                $this->wsClient->addHeader("Admin-Key", $configs["WS_SERVER_ADMIN"]);
-                @$this->wsClient->open();
-            }
-            @$this->wsClient->sendMessage($msg);
-        }
-
-    }
-
-    /**
-     * @param $action
-     * @param $httpVars
-     * @param $fileVars
-     *
-     */
-    public function clientChannelMethod($action, $httpVars, $fileVars)
-    {
-        if(!$this->msgExchanger) return;
-        switch ($action) {
-            case "client_register_channel":
-                $this->msgExchanger->suscribeToChannel($httpVars["channel"], $httpVars["client_id"]);
-                break;
-            case "client_unregister_channel":
-                $this->msgExchanger->unsuscribeFromChannel($httpVars["channel"], $httpVars["client_id"]);
-                break;
-            case "client_consume_channel":
-                if (AuthService::usersEnabled()) {
-                    $user = AuthService::getLoggedUser();
-                    if ($user == null) {
-                        AJXP_XMLWriter::header();
-                        AJXP_XMLWriter::requireAuth();
-                        AJXP_XMLWriter::close();
-                        return;
-                    }
-                    $GROUP_PATH = $user->getGroupPath();
-                    if($GROUP_PATH == null) $GROUP_PATH = false;
-                    $uId = $user->getId();
-                } else {
-                    $GROUP_PATH = '/';
-                    $uId = 'shared';
-                }
-                $currentRepository = ConfService::getCurrentRepositoryId();
-                $currentRepoMasks = array(); $regexp = null;
-                AJXP_Controller::applyHook("role.masks", array($currentRepository, &$currentRepoMasks, AJXP_Permission::READ));
-                if(count($currentRepoMasks)){
-                    $regexps = array();
-                    foreach($currentRepoMasks as $path){
-                        $regexps[] = '^'.preg_quote($path, '/');
-                    }
-                    $regexp = '/'.implode("|", $regexps).'/';
-                }
-                $channelRepository = str_replace("nodes:", "", $httpVars["channel"]);
-                if($channelRepository != $currentRepository){
-                    AJXP_XMLWriter::header();
-                    echo "<require_registry_reload repositoryId=\"$currentRepository\"/>";
-                    AJXP_XMLWriter::close();
-                    return;
-                }
-
-                $data = $this->msgExchanger->consumeInstantChannel($httpVars["channel"], $httpVars["client_id"], $uId, $GROUP_PATH);
-                if (count($data)) {
-                   AJXP_XMLWriter::header();
-                   ksort($data);
-                   foreach ($data as $messageObject) {
-                       if(isSet($regexp) && isSet($messageObject->nodePathes)){
-                           $pathIncluded = false;
-                           foreach($messageObject->nodePathes as $nodePath){
-                               if(preg_match($regexp, $nodePath)){
-                                   $pathIncluded = true;
-                                   break;
-                               }
-                           }
-                           if(!$pathIncluded) continue;
-                       }
-                       echo $messageObject->content;
-                   }
-                   AJXP_XMLWriter::close();
-                }
-
-                break;
-            default:
-                break;
-        }
-    }
-
-    public function wsAuthenticate($action, $httpVars, $fileVars)
-    {
-        $this->logDebug("Entering wsAuthenticate");
-        $configs = $this->getConfigs();
-        if (!isSet($httpVars["key"]) || $httpVars["key"] != $configs["WS_SERVER_ADMIN"]) {
-            throw new Exception("Cannot authentify admin key");
-        }
-        $user = AuthService::getLoggedUser();
-        if ($user == null) {
-            $this->logDebug("Error Authenticating through WebSocket (not logged)");
-            throw new Exception("You must be logged in");
-        }
-        $xml = AJXP_XMLWriter::getUserXML($user);
-        // add groupPath
-        if ($user->getGroupPath() != null) {
-            $groupString = "groupPath=\"".AJXP_Utils::xmlEntities($user->getGroupPath())."\"";
-            $xml = str_replace("<user id=", "<user {$groupString} id=", $xml);
-        }
-        $this->logDebug("Authenticating user ".$user->id." through WebSocket");
-        AJXP_XMLWriter::header();
-        echo $xml;
-        AJXP_XMLWriter::close();
-
-    }
-
-    public function switchWebSocketOn($params)
-    {
-        $wDir = $this->getPluginWorkDir(true);
-        $pidFile = $wDir.DIRECTORY_SEPARATOR."ws-pid";
-        if (file_exists($pidFile)) {
-            $pId = file_get_contents($pidFile);
-            $unixProcess = new UnixProcess();
-            $unixProcess->setPid($pId);
-            $status = $unixProcess->status();
-            if ($status) {
-                throw new Exception("Web Socket server seems to already be running!");
-            }
-        }
-        $host = escapeshellarg($params["WS_SERVER_BIND_HOST"]);
-        $port = escapeshellarg($params["WS_SERVER_BIND_PORT"]);
-        $path = escapeshellarg($params["WS_SERVER_PATH"]);
-        $cmd = ConfService::getCoreConf("CLI_PHP")." ws-server.php -host=".$host." -port=".$port." -path=".$path;
-        chdir(AJXP_INSTALL_PATH.DIRECTORY_SEPARATOR.AJXP_PLUGINS_FOLDER.DIRECTORY_SEPARATOR."core.mq");
-        $process = AJXP_Controller::runCommandInBackground($cmd, null);
-        if ($process != null) {
-            $pId = $process->getPid();
-            $wDir = $this->getPluginWorkDir(true);
-            file_put_contents($wDir.DIRECTORY_SEPARATOR."ws-pid", $pId);
-            return "SUCCESS: Started WebSocket Server with process ID $pId";
-        }
-        return "SUCCESS: Started WebSocket Server";
-    }
-
-    public function switchWebSocketOff($params)
-    {
-        $wDir = $this->getPluginWorkDir(true);
-        $pidFile = $wDir.DIRECTORY_SEPARATOR."ws-pid";
-        if (!file_exists($pidFile)) {
-            throw new Exception("No information found about WebSocket server");
-        } else {
-            $pId = file_get_contents($pidFile);
-            $unixProcess = new UnixProcess();
-            $unixProcess->setPid($pId);
-            $unixProcess->stop();
-            unlink($pidFile);
-        }
-        return "SUCCESS: Killed WebSocket Server";
-    }
-
-    public function getWebSocketStatus()
-    {
-        $wDir = $this->getPluginWorkDir(true);
-        $pidFile = $wDir.DIRECTORY_SEPARATOR."ws-pid";
-        if (!file_exists($pidFile)) {
-            return "OFF";
-        } else {
-            $pId = file_get_contents($pidFile);
-            $unixProcess = new UnixProcess();
-            $unixProcess->setPid($pId);
-            $status = $unixProcess->status();
-            if($status) return "ON";
-            else return "OFF";
-        }
-
-    }
-
-}
diff --git a/core/src/plugins/core.mq/class.PydioInstantMessenger.js b/core/src/plugins/core.mq/class.PydioInstantMessenger.js
new file mode 100644
index 0000000000..5b081834ae
--- /dev/null
+++ b/core/src/plugins/core.mq/class.PydioInstantMessenger.js
@@ -0,0 +1,272 @@
+/*
+ * Copyright 2007-2012 Charles du Jeu <contact (at) cdujeu.me>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+/**
+ * Use WebSocket or Poller
+ */
+Class.create("PydioInstantMessenger", {
+
+    pe:null,
+    currentRepo:null,
+    clientId:null,
+    ws: null,
+    configs: null,
+    channel_pending: false,
+
+    initialize : function(){
+        "use strict";
+
+        if(window.ajxpMinisite) return;
+
+        this.clientId = window.ajxpBootstrap.parameters.get("SECURE_TOKEN");
+        this.configs = pydio.getPluginConfigs("mq");
+        this.defaultPollerFreq = this.configs.get('POLLER_FREQUENCY') || 15;
+        this.pollingFrequency = this.defaultPollerFreq;
+
+        pydio.observe("repository_list_refreshed", function(data){
+
+            var repoId;
+            if(data.active) {
+                repoId = data.active;
+            } else if(pydio.repositoryId) {
+                repoId = pydio.repositoryId;
+            }
+            if(this.currentRepo && this.currentRepo == repoId){ // Ignore, repoId did not change!
+                return;
+            }
+            this.initForRepoId(repoId);
+
+        }.bind(this));
+
+        if(pydio.repositoryId){
+            this.initForRepoId(pydio.repositoryId);
+        }
+
+    },
+
+    initForRepoId:function(repoId){
+
+        if(window.WebSocket && this.configs.get("WS_ACTIVE")){
+
+            if(this.ws) {
+                if(!repoId){
+                    this.ws.onclose = function(){
+                        delete this.ws;
+                    }.bind(this);
+                    this.ws.close();
+
+                } else {
+                    try{
+                        this.ws.send("register:" + repoId);
+                    }catch(e){
+                        if(console) console.log('Error while sending WebSocket message: '+ e.message);
+                    }
+                }
+            }else{
+                if(repoId){
+                    var host = this.configs.get("BOOSTER_MAIN_HOST");
+                    if(this.configs.get("BOOSTER_WS_ADVANCED") && this.configs.get("BOOSTER_WS_ADVANCED")['booster_ws_advanced'] === 'custom' && this.configs.get("BOOSTER_WS_ADVANCED")['WS_HOST']){
+                        host = this.configs.get("BOOSTER_WS_ADVANCED")['WS_HOST'];
+                    }
+                    var port = this.configs.get("BOOSTER_MAIN_PORT");
+                    if(this.configs.get("BOOSTER_WS_ADVANCED") && this.configs.get("BOOSTER_WS_ADVANCED")['booster_ws_advanced'] === 'custom' && this.configs.get("BOOSTER_WS_ADVANCED")['WS_PORT']){
+                        port = this.configs.get("BOOSTER_WS_ADVANCED")['WS_PORT'];
+                    }
+                    var secure = this.configs.get("BOOSTER_MAIN_SECURE");
+                    if(this.configs.get("BOOSTER_WS_ADVANCED") && this.configs.get("BOOSTER_WS_ADVANCED")['booster_ws_advanced'] === 'custom' && this.configs.get("BOOSTER_WS_ADVANCED")['WS_SECURE']){
+                        secure = this.configs.get("BOOSTER_WS_ADVANCED")['WS_SECURE'];
+                    }
+
+                    var url = "ws"+(secure?"s":"")+"://"+host+":"+port+"/"+this.configs.get("WS_PATH");
+                    this.ws = new WebSocket(url);
+                    this.ws.onmessage = function(event){
+                        var obj = parseXml(event.data);
+                        if(obj){
+                            PydioApi.getClient().parseXmlMessage(obj);
+                            pydio.notify("server_message", obj);
+                        }
+                    };
+                    this.ws.onopen = function(){
+                        this.ws.send("register:" + repoId);
+                    }.bind(this);
+                    this.ws.onclose = function(event){
+                        var reason;
+                        // See http://tools.ietf.org/html/rfc6455#section-7.4.1
+                        if (event.code == 1000)
+                            reason = "Normal closure, meaning that the purpose for which the connection was established has been fulfilled.";
+                        else if(event.code == 1001)
+                            reason = "An endpoint is \"going away\", such as a server going down or a browser having navigated away from a page.";
+                        else if(event.code == 1002)
+                            reason = "An endpoint is terminating the connection due to a protocol error";
+                        else if(event.code == 1003)
+                            reason = "An endpoint is terminating the connection because it has received a type of data it cannot accept (e.g., an endpoint that understands only text data MAY send this if it receives a binary message).";
+                        else if(event.code == 1004)
+                            reason = "Reserved. The specific meaning might be defined in the future.";
+                        else if(event.code == 1005)
+                            reason = "No status code was actually present.";
+                        else if(event.code == 1006)
+                            reason = "The connection was closed abnormally, e.g., without sending or receiving a Close control frame";
+                        else if(event.code == 1007)
+                            reason = "An endpoint is terminating the connection because it has received data within a message that was not consistent with the type of the message (e.g., non-UTF-8 [http://tools.ietf.org/html/rfc3629] data within a text message).";
+                        else if(event.code == 1008)
+                            reason = "An endpoint is terminating the connection because it has received a message that \"violates its policy\". This reason is given either if there is no other sutible reason, or if there is a need to hide specific details about the policy.";
+                        else if(event.code == 1009)
+                            reason = "An endpoint is terminating the connection because it has received a message that is too big for it to process.";
+                        else if(event.code == 1010) // Note that this status code is not used by the server, because it can fail the WebSocket handshake instead.
+                            reason = "An endpoint (client) is terminating the connection because it has expected the server to negotiate one or more extension, but the server didn't return them in the response message of the WebSocket handshake. Specifically, the extensions that are needed are: " + event.reason;
+                        else if(event.code == 1011)
+                            reason = "A server is terminating the connection because it encountered an unexpected condition that prevented it from fulfilling the request.";
+                        else if(event.code == 1015)
+                            reason = "The connection was closed due to a failure to perform a TLS handshake (e.g., the server certificate can't be verified).";
+                        else
+                            reason = "Unknown reason";
+                        if(window.console){
+                            console.error("WebSocket Closed Connection for this reason :" + reason + " (code "+event.code+")");
+                            console.error("Switching back to polling");
+                        }
+                        delete this.ws;
+                        this.configs.set("WS_ACTIVE", false);
+                        this.initForRepoId(repoId);
+
+                    }.bind(this);
+                    this.ws.onerror = function(){
+                        if(window.console){
+                            console.error("Cannot login to websocket server, switching back to polling");
+                        }
+                        delete this.ws;
+                        this.configs.set("WS_ACTIVE", false);
+                        this.initForRepoId(repoId);
+                    }.bind(this);
+                }
+            }
+
+        }else{
+
+            if(this.pe){
+                this.pe.stop();
+            }
+
+            if(this.currentRepo && repoId){
+
+                this.unregisterCurrentChannel(function(){
+                    this.registerChannel(repoId);
+                }.bind(this));
+
+            }else if(this.currentRepo && !repoId){
+
+                this.unregisterCurrentChannel();
+
+            }else if(!this.currentRepo && repoId){
+
+                this.registerChannel(repoId);
+
+            }
+
+        }
+
+    },
+
+    unregisterCurrentChannel : function(callback){
+
+        var conn = new Connexion();
+        conn.setParameters($H({
+            get_action:'client_unregister_channel',
+            channel:'nodes:' + this.currentRepo,
+            client_id:this.clientId
+        }));
+        conn.discrete = true;
+        conn.onComplete = function(transp){
+            this.currentRepo = null;
+            if(callback) callback();
+        }.bind(this);
+        conn.sendAsync();
+
+        if(this._consumeTriggerObs) {
+            pydio.stopObserving("response.xml", this._consumeTriggerObs);
+            this._consumeTriggerObs = null;
+        }
+        if(this._pollingFreqObs){
+            pydio.stopObserving("poller.frequency", this._pollingFreqObs);
+            this._pollingFreqObs = null;
+        }
+
+    },
+
+    registerChannel : function(repoId){
+
+        this.currentRepo = repoId;
+        var conn = new Connexion();
+        conn.setParameters($H({
+            get_action:'client_register_channel',
+            channel:'nodes:' + repoId,
+            client_id:this.clientId
+        }));
+        conn.discrete = true;
+        conn.sendAsync();
+
+
+        this.pe = new PeriodicalExecuter(this.consumeChannel.bind(this), this.pollingFrequency);
+
+        this._consumeTriggerObs = function(responseXML){
+            if(XMLUtils.XPathSelectSingleNode(responseXML, "//consume_channel")){
+                this.consumeChannel();
+            }
+        }.bind(this);
+        pydio.observe("response.xml", this._consumeTriggerObs);
+
+        this._pollingFreqObs = function(freq){
+            var value = freq.value ? freq.value : this.defaultPollerFreq;
+            if(value == this.pollingFrequency) return;
+            var lastPing = (value > this.pollingFrequency ? this.pollingFrequency: 0);
+            this.pollingFrequency = value;
+            this.pe.stop();
+            this.pe = new PeriodicalExecuter(this.consumeChannel.bind(this), value);
+            if(lastPing){
+                window.setTimeout(this.consumeChannel.bind(this), lastPing * 1000);
+            }
+        }.bind(this);
+        pydio.observe("poller.frequency", this._pollingFreqObs);
+
+    },
+
+    consumeChannel : function(){
+        if(this.channel_pending) {
+            return;
+        }
+        pydio.notify("poller.event");
+        var conn = new Connexion();
+        conn.setParameters($H({
+            get_action:'client_consume_channel',
+            channel:'nodes:' + this.currentRepo,
+            client_id:this.clientId
+        }));
+        conn.discrete = true;
+        conn.onComplete = function(transport){
+            this.channel_pending = false;
+            if(transport.responseXML){
+                PydioApi.getClient().parseXmlMessage(transport.responseXML);
+                pydio.notify("server_message", transport.responseXML);
+            }
+        }.bind(this);
+        this.channel_pending = true;
+        conn.sendAsync();
+    }
+
+});
diff --git a/core/src/plugins/core.mq/composer.json b/core/src/plugins/core.mq/composer.json
new file mode 100644
index 0000000000..d41d110977
--- /dev/null
+++ b/core/src/plugins/core.mq/composer.json
@@ -0,0 +1,11 @@
+{
+  "name": "Internal Messaging",
+  "description": "Dispatch and collect messages inside the application or using external booster tool.",
+  "homepage": "https://pydio.com/",
+  "license":"AGPL-3.0",
+  "autoload": {
+    "psr-4": {
+      "Pydio\\Mq\\Core\\": "./src"
+    }
+  }
+}
diff --git a/core/src/plugins/core.mq/i18n/conf/de.php b/core/src/plugins/core.mq/i18n/conf/de.php
index e21413e7c0..b9824a800c 100644
--- a/core/src/plugins/core.mq/i18n/conf/de.php
+++ b/core/src/plugins/core.mq/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Message Queuing" => "Nachrichten-Warteschlangen",
diff --git a/core/src/plugins/core.mq/i18n/conf/en.php b/core/src/plugins/core.mq/i18n/conf/en.php
index c04fb34e18..4db49f0bb7 100644
--- a/core/src/plugins/core.mq/i18n/conf/en.php
+++ b/core/src/plugins/core.mq/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Message Queuing" => "Message Queuing",
diff --git a/core/src/plugins/core.mq/manifest.xml b/core/src/plugins/core.mq/manifest.xml
index 90db350ab3..d9479574aa 100644
--- a/core/src/plugins/core.mq/manifest.xml
+++ b/core/src/plugins/core.mq/manifest.xml
@@ -4,27 +4,63 @@
     <client_settings>
         <resources>
             <i18n namespace="core.mq" path="plugins/core.mq/i18n"/>
-            <js className="AjxpMqObserver" file="plugins/core.mq/class.AjxpMqObserver.js"/>
+            <js className="PydioInstantMessenger" file="plugins/core.mq/class.PydioInstantMessenger.js"/>
         </resources>
     </client_settings>
     <server_settings>
-        <global_param group="CONF_MESSAGE[Inner Messaging]" type="plugin_instance:mq" name="UNIQUE_MS_INSTANCE" label="CONF_MESSAGE[MQ Instance]" description="CONF_MESSAGE[Choose the plugin]" mandatory="false" default="mq.serial"/>
-        <global_param group="CONF_MESSAGE[Inner Messaging]" description="CONF_MESSAGE[Post the notification in a temporary queue. You must set up the scheduler accordingly to make sure the queue is then consumed on a regularly basis.]" label="CONF_MESSAGE[Queue notifications]" name="USE_QUEUE" type="boolean" default="false"/>
 
-        <global_param group="CONF_MESSAGE[WebSocket Server]" description="CONF_MESSAGE[WebSocket server is running]" label="CONF_MESSAGE[WebSocket]" name="WS_SERVER_ACTIVE" type="boolean" expose="true"/>
-        <global_param group="CONF_MESSAGE[WebSocket Server]" description="CONF_MESSAGE[WebSocket client connect address]" label="CONF_MESSAGE[WS Client Address]" name="WS_SERVER_HOST" type="string" expose="true"/>
-        <global_param group="CONF_MESSAGE[WebSocket Server]" description="CONF_MESSAGE[WebSocket client connect port]" label="CONF_MESSAGE[WS Client Port]" name="WS_SERVER_PORT" type="string" expose="true" default="8090"/>
-        <global_param group="CONF_MESSAGE[WebSocket Server]" description="CONF_MESSAGE[WebSocket client secure connection]" label="CONF_MESSAGE[WS Client SSL]" name="WS_SERVER_SECURE" type="boolean" expose="true" default="false"/>
-        <global_param group="CONF_MESSAGE[WebSocket Server]" description="CONF_MESSAGE[WebSocket server bind address]" label="CONF_MESSAGE[WS Server Host]" name="WS_SERVER_BIND_HOST" type="string" expose="true"/>
-        <global_param group="CONF_MESSAGE[WebSocket Server]" description="CONF_MESSAGE[WebSocket server bind port]" label="CONF_MESSAGE[WS Server Port]" name="WS_SERVER_BIND_PORT" type="string" expose="true" default="8090"/>
-        <global_param group="CONF_MESSAGE[WebSocket Server]" description="CONF_MESSAGE[WebSocket handler path]" label="CONF_MESSAGE[WS Path]" name="WS_SERVER_PATH" type="string" expose="true"/>
-        <global_param group="CONF_MESSAGE[WebSocket Server]" description="CONF_MESSAGE[WebSocket admin key]" label="CONF_MESSAGE[WS Key]" name="WS_SERVER_ADMIN" type="string"/>
-        <global_param group="CONF_MESSAGE[WebSocket Server]" type="monitor" name="WS_STATUS" choices="run_plugin_action:core.mq:getWebSocketStatus" label="CONF_MESSAGE[WebSocket Server Status]" description="CONF_MESSAGE[Try to detect if the server is running correctly]" mandatory="false"/>
-        <global_param group="CONF_MESSAGE[WebSocket Server]" type="button" name="SWITCH_WS_ON" choices="run_plugin_action:core.mq:switchWebSocketOn" label="CONF_MESSAGE[Run WebSocket Server]" description="CONF_MESSAGE[Switch the WS server ON]" mandatory="false"/>
-        <global_param group="CONF_MESSAGE[WebSocket Server]" type="button" name="SWITCH_WS_OFF" choices="run_plugin_action:core.mq:switchWebSocketOff" label="CONF_MESSAGE[Stop WebSocket Server]" description="CONF_MESSAGE[Switch the WS server OFF]" mandatory="false"/>
-        <global_param group="CONF_MESSAGE[WebSocket Server]" type="integer" name="POLLER_FREQUENCY" label="CONF_MESSAGE[Alternative poller frequency]" description="CONF_MESSAGE[If WebSocket server is not running, a polling mechanism will replace it. Fix the frequency of refresh, in seconds.]" mandatory="true" default="15" expose="true"/>
+        <global_param group="CONF_MESSAGE[Main Configurations]" name="WS_ACTIVE" type="boolean" description="CONF_MESSAGE[WebSocket Server provides a server-to-client messaging feature, avoiding regular polling from browsers and sync applications, thus reducing the server load.]" label="CONF_MESSAGE[WebSocket Server]" default="false" expose="true"/>
+        <global_param group="CONF_MESSAGE[Main Configurations]" name="UPLOAD_ACTIVE" description="CONF_MESSAGE[Pydio Upload Server is a unique feature used to delegate file uploads to our dedicated binary, that will send the files directly to the storage.]" label="CONF_MESSAGE[Upload Server]" type="boolean" expose="true"/>
+        <global_param group="CONF_MESSAGE[Main Configurations]" name="BOOSTER_MAIN_HOST" type="string" label="CONF_MESSAGE[Host]" description="CONF_MESSAGE[Host]" expose="true" default="127.0.0.1"/>
+        <global_param group="CONF_MESSAGE[Main Configurations]" name="BOOSTER_MAIN_PORT" type="string" label="CONF_MESSAGE[Port]" description="CONF_MESSAGE[Port]" expose="true" default="8090"/>
+        <global_param group="CONF_MESSAGE[Main Configurations]" name="BOOSTER_MAIN_SECURE" type="boolean" label="CONF_MESSAGE[SSL]" description="CONF_MESSAGE[Use secure connection]" expose="true" default="true"/>
+        <global_param group="CONF_MESSAGE[Main Configurations]" name="NSQ_PORT" type="string" label="CONF_MESSAGE[NSQ Port]" description="CONF_MESSAGE[NSQ Port]" default="4150"/>
+        <global_param group="CONF_MESSAGE[Main Configurations]" name="BOOSTER_INTERNAL_CONNECTION" type="group_switch:booster_internal_connection" label="CONF_MESSAGE[Internal Connection]" description="CONF_MESSAGE[If different from default host/port]" default="same" mandatory="true"/>
+        <global_param group_switch_name="booster_internal_connection" group_switch_label="Same as external" group_switch_value="same" name="booster_internal_connection" type="hidden" label="same" description="custom" default="same"/>
+        <global_param group_switch_name="booster_internal_connection" group_switch_label="Custom" group_switch_value="custom" name="booster_internal_connection" type="hidden" label="custom" description="custom" default="custom"/>
+        <global_param group_switch_name="booster_internal_connection" group_switch_label="Custom" group_switch_value="custom" name="BOOSTER_INTERNAL_HOST" type="string" label="CONF_MESSAGE[Internal Host (if LAN IP is different from outside-world IP).]" description="CONF_MESSAGE[Internal Host]" default="127.0.0.1"/>
+        <global_param group_switch_name="booster_internal_connection" group_switch_label="Custom" group_switch_value="custom" name="BOOSTER_INTERNAL_PORT" type="string" label="CONF_MESSAGE[Internal Port (if LAN Port is different from outside-world Port).]" description="CONF_MESSAGE[Internal Host]" default="8090"/>
+
+        <global_param group="CONF_MESSAGE[Advanced Configurations]" name="BOOSTER_ADV_WS_LEGEND" type="legend" label="" description="Customize URL's depending on the features."/>
+
+        <global_param group="CONF_MESSAGE[Advanced Configurations]" name="BOOSTER_WS_ADVANCED" type="group_switch:booster_ws_advanced" label="CONF_MESSAGE[Websocket Network Configuration]" description="CONF_MESSAGE[Use custom URL's for websocket feature]" expose="true" default="same" mandatory="true"/>
+        <global_param group_switch_name="booster_ws_advanced" group_switch_label="Use main configurations" group_switch_value="same" name="booster_ws_advanced" type="hidden" label="same" description="same" default="same"/>
+        <global_param group_switch_name="booster_ws_advanced" group_switch_label="Customize" group_switch_value="custom" name="booster_ws_advanced" type="hidden" label="custom" description="custom" default="custom"/>
+        <global_param group_switch_name="booster_ws_advanced" group_switch_label="Customize" group_switch_value="custom" description="CONF_MESSAGE[WebSocket host]" label="CONF_MESSAGE[WS Hostname]" name="WS_HOST" type="string" expose="true" default="localhost"/>
+        <global_param group_switch_name="booster_ws_advanced" group_switch_label="Customize" group_switch_value="custom" description="CONF_MESSAGE[WebSocket port]" label="CONF_MESSAGE[WS Port]" name="WS_PORT" type="string" expose="true" default="8090"/>
+        <global_param group_switch_name="booster_ws_advanced" group_switch_label="Customize" group_switch_value="custom" description="CONF_MESSAGE[WebSocket host]" label="CONF_MESSAGE[WS Hostname]" name="WS_HOST_INTERNAL" type="string" expose="false" default="localhost"/>
+        <global_param group_switch_name="booster_ws_advanced" group_switch_label="Customize" group_switch_value="custom" description="CONF_MESSAGE[WebSocket port]" label="CONF_MESSAGE[WS Port]" name="WS_PORT_INTERNAL" type="string" expose="false" default="8090"/>
+        <global_param group_switch_name="booster_ws_advanced" group_switch_label="Customize" group_switch_value="custom" description="CONF_MESSAGE[WebSocket secure]" label="CONF_MESSAGE[WS Client SSL]" name="WS_SECURE" type="boolean" expose="true" default="false"/>
+        <global_param group="CONF_MESSAGE[Advanced Configurations]" description="CONF_MESSAGE[WebSocket path]" label="CONF_MESSAGE[WS Path]" name="WS_PATH" type="string" expose="true" default="ws"/>
+
+        <global_param group="CONF_MESSAGE[Advanced Configurations]" name="BOOSTER_UPLOAD_ADVANCED" type="group_switch:booster_upload_advanced" label="CONF_MESSAGE[Uploader Network Configuration]" description="CONF_MESSAGE[Use custom URL's for uploader feature]" expose="true" default="same" mandatory="true"/>
+        <global_param group_switch_name="booster_upload_advanced" group_switch_label="Use main configurations" group_switch_value="same" name="booster_upload_advanced" type="hidden" label="same" description="same" default="same"/>
+        <global_param group_switch_name="booster_upload_advanced" group_switch_label="Customize" group_switch_value="custom" name="booster_upload_advanced" type="hidden" label="custom" description="custom" default="custom"/>
+        <global_param group_switch_name="booster_upload_advanced" group_switch_label="Customize" group_switch_value="custom" description="CONF_MESSAGE[Upload Server host]" label="CONF_MESSAGE[Upload Server host]" name="UPLOAD_HOST" type="string" expose="true" default="localhost"/>
+        <global_param group_switch_name="booster_upload_advanced" group_switch_label="Customize" group_switch_value="custom" description="CONF_MESSAGE[Upload Server port]" label="CONF_MESSAGE[Upload Server port]" name="UPLOAD_PORT" type="string" expose="true" default="8090"/>
+        <global_param group_switch_name="booster_upload_advanced" group_switch_label="Customize" group_switch_value="custom" description="CONF_MESSAGE[Upload Server host]" label="CONF_MESSAGE[Upload Server host]" name="UPLOAD_HOST_INTERNAL" type="string" expose="false" default="localhost"/>
+        <global_param group_switch_name="booster_upload_advanced" group_switch_label="Customize" group_switch_value="custom" description="CONF_MESSAGE[Upload Server port]" label="CONF_MESSAGE[Upload Server port]" name="UPLOAD_PORT_INTERNAL" type="string" expose="false" default="8090"/>
+        <global_param group_switch_name="booster_upload_advanced" group_switch_label="Customize" group_switch_value="custom" description="CONF_MESSAGE[Upload Server secure]" label="CONF_MESSAGE[Upload Server secure]" name="UPLOAD_SECURE" type="boolean" expose="true" default="false"/>
+        <global_param group="CONF_MESSAGE[Advanced Configurations]" description="CONF_MESSAGE[Upload Server path]" label="CONF_MESSAGE[Upload Server path]" name="UPLOAD_PATH" type="string" expose="true" default="io"/>
+
+        <global_param group="CONF_MESSAGE[Advanced Configurations]" name="BOOSTER_NSQ_ADVANCED" type="group_switch:booster_nsq_advanced" label="CONF_MESSAGE[Messaging Service Network Configuration]" description="CONF_MESSAGE[Use custom URL for nsq service]" default="same" mandatory="true"/>
+        <global_param group_switch_name="booster_nsq_advanced" group_switch_label="Use main configurations" group_switch_value="same" name="booster_nsq_advanced" type="hidden" label="same" description="same" default="same"/>
+        <global_param group_switch_name="booster_nsq_advanced" group_switch_label="Customize" group_switch_value="custom" name="booster_nsq_advanced" type="hidden" label="custom" description="custom" default="custom"/>
+        <global_param group_switch_name="booster_nsq_advanced" group_switch_label="Customize" group_switch_value="custom" description="CONF_MESSAGE[NSQ Host]" label="CONF_MESSAGE[NSQ Host]" name="NSQ_HOST" type="string" default="localhost" />
+
+        <global_param group="CONF_MESSAGE[Server Internals]" type="plugin_instance:mq" name="UNIQUE_MS_INSTANCE" label="CONF_MESSAGE[MQ Instance]" description="CONF_MESSAGE[Choose the plugin, sql should be the default value]" mandatory="false" default="mq.sql"/>
+        <global_param group="CONF_MESSAGE[Server Internals]" description="CONF_MESSAGE[Post the notification in a temporary queue. You must set up the scheduler accordingly to make sure the queue is then consumed on a regularly basis.]" label="CONF_MESSAGE[Queue notifications]" name="USE_QUEUE" type="boolean" default="false"/>
+        <global_param group="CONF_MESSAGE[Server Internals]" type="boolean" name="MQ_USE_WORKERS" label="CONF_MESSAGE[Use Workers (experimental)]" description="CONF_MESSAGE[Send commands in background to workers waiting to execute them]" mandatory="false" default="false"/>
+        <global_param group="CONF_MESSAGE[Server Internals]" type="monitor" name="MQ_WORKER_STATUS" choices="run_plugin_action:core.mq:getWorkerStatus" label="CONF_MESSAGE[Worker Status]" description="CONF_MESSAGE[Try to detect if the worker is responding]" mandatory="false"/>
+        <global_param group="CONF_MESSAGE[Server Internals]" type="button" name="MQ_WORKER_SWITCH_ON" choices="run_plugin_action:core.mq:switchWorkerOn" label="CONF_MESSAGE[Start Worker]" description="CONF_MESSAGE[Switch a worker ON]" mandatory="false"/>
+        <global_param group="CONF_MESSAGE[Server Internals]" type="button" name="MQ_WORKER_SWITCH_OFF" choices="run_plugin_action:core.mq:switchWorkerOff" label="CONF_MESSAGE[Stop Worker]" description="CONF_MESSAGE[Switch a worker OFF]" mandatory="false"/>
+
+        <global_param group="CONF_MESSAGE[Administrative API Key]" type="legend" name="MQ_LEGEND_ADMIN_KEY" description="CONF_MESSAGE[Pydio Booster uses an administrative API key pair to communicate with the server. If you start it manually, use the buttons below to generate or revoke key pairs. If you start using the admin dashboard, you should not need that.]" label="CONF_MESSAGE[Generate Key]" mandatory="false"/>
+        <global_param group="CONF_MESSAGE[Administrative API Key]" type="button" name="MQ_GENERATE_ADMIN_KEY" choices="run_plugin_action:core.mq:generateAdminKey" label="CONF_MESSAGE[Generate API Key]" description="CONF_MESSAGE[Generate Key]" mandatory="false"/>
+        <global_param group="CONF_MESSAGE[Administrative API Key]" type="button" name="MQ_REVOKE_ADMIN_KEY" choices="run_plugin_action:core.mq:revokeAdminKey" label="CONF_MESSAGE[Revoke existing API Key(s)]" description="CONF_MESSAGE[Revoke Key]" mandatory="false"/>
+
     </server_settings>
-    <class_definition classname="MqManager" filename="plugins/core.mq/class.MqManager.php"/>
+    <class_definition classname="Pydio\Mq\Core\MqManager" filename="plugins/core.mq/vendor/autoload.php"/>
     <registry_contributions>
         <actions>
             <action name="consume_notification_queue">
@@ -36,11 +72,11 @@
             <action name="client_register_channel">
                 <rightsContext adminOnly="false" noUser="true" read="false" userLogged="true" write="false"/>
                 <processing>
-                    <clientListener name="contextChange"><![CDATA[
-                        if(!ajaxplorer.mqObserver && ajaxplorer.user && !ajaxplorer.mqObserverLoading && !window.ajxpMinisite){
-                            ajaxplorer.mqObserverLoading = true;
-                            ResourcesManager.prototype.loadJSResource('plugins/core.mq/class.AjxpMqObserver.js', 'AjxpMqObserver', function(){
-                                ajaxplorer.mqObserver = new AjxpMqObserver();
+                    <clientListener name="init"><![CDATA[
+                        if(!pydio.mqObserver && !pydio.mqObserverLoading && !window.ajxpMinisite){
+                            pydio.mqObserverLoading = true;
+                            ResourcesManager.prototype.loadJSResource('plugins/core.mq/class.PydioInstantMessenger.js', 'PydioInstantMessenger', function(){
+                                pydio.mqObserver = new PydioInstantMessenger();
                             }, true);
                         }
                     ]]></clientListener>
@@ -73,14 +109,16 @@
             </action>
             <action name="ws_authenticate" skipSecureToken="true">
                 <processing>
-                    <serverCallback methodName="wsAuthenticate"/>
+                    <serverCallback restParams="/" methodName="wsAuthenticate"/>
                 </processing>
             </action>
         </actions>
         <hooks>
             <serverCallback methodName="publishNodeChange" hookName="node.change" defer="true"/>
             <serverCallback methodName="sendInstantMessage" hookName="msg.instant" />
+            <serverCallback methodName="sendTaskMessage" hookName="msg.task" defer="true" dontBreakOnException="true"/>
             <serverCallback methodName="sendToQueue" hookName="msg.queue_notification" />
+            <serverCallback methodName="appendRefreshInstruction" hookName="response.send" dontBreakOnException="true"/>
         </hooks>
     </registry_contributions>
     <dependencies>
diff --git a/core/src/plugins/core.mq/src/Message/ConsumeChannelMessage.php b/core/src/plugins/core.mq/src/Message/ConsumeChannelMessage.php
new file mode 100644
index 0000000000..3787f6aa6c
--- /dev/null
+++ b/core/src/plugins/core.mq/src/Message/ConsumeChannelMessage.php
@@ -0,0 +1,59 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Mq\Core\Message;
+
+use Pydio\Core\Http\Response\JSONSerializableResponseChunk;
+use Pydio\Core\Http\Response\XMLSerializableResponseChunk;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class ConsumeChannelMessage
+ * @package Pydio\Mq\Core
+ */
+class ConsumeChannelMessage implements XMLSerializableResponseChunk, JSONSerializableResponseChunk
+{
+
+    /**
+     * @return mixed
+     */
+    public function jsonSerializableData()
+    {
+        return ["consume_channel"=>"now"];
+    }
+
+    /**
+     * @return string
+     */
+    public function jsonSerializableKey()
+    {
+        return "mq";
+    }
+
+    /**
+     * @return string
+     */
+    public function toXML()
+    {
+        return "<consume_channel/>";
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.mq/src/MqManager.php b/core/src/plugins/core.mq/src/MqManager.php
new file mode 100644
index 0000000000..fcb257f732
--- /dev/null
+++ b/core/src/plugins/core.mq/src/MqManager.php
@@ -0,0 +1,563 @@
+<?php
+/*
+ * Copyright 2007-2012 Charles du Jeu <contact (at) cdujeu.me>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Mq\Core;
+
+use nsqphp\Message\Message;
+use nsqphp\nsqphp;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Filter\AJXP_Permission;
+use Pydio\Access\Core\Model\NodesDiff;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Exception\AuthRequiredException;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Http\Message\XMLMessage;
+use Pydio\Core\Http\Response\SerializableResponseStream;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Serializer\UserXML;
+use Pydio\Core\Services\ApiKeysService;
+use Pydio\Core\Services\AuthService;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Vars\StringHelper;
+
+use Pydio\Core\Utils\Vars\XMLFilter;
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Mq\Core\Message\ConsumeChannelMessage;
+use Pydio\Notification\Core\IMessageExchanger;
+use Pydio\Notification\Core\Notification;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+// DL and install install vendor (composer?) https://github.com/Devristo/phpws
+
+
+/**
+ * MqManager
+ *
+ * @package AjaXplorer_Plugins
+ * @subpackage Core
+ *
+ */
+class MqManager extends Plugin
+{
+
+    /**
+     * @var nsqphp
+     */
+    private $nsqClient;
+
+    /**
+     * @var IMessageExchanger;
+     */
+    private $msgExchanger = false;
+    private $useQueue = false ;
+    private $hasPendingMessage = false;
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        parent::init($ctx, $options);
+        $this->useQueue = $this->pluginConf["USE_QUEUE"];
+        try {
+            $pService = PluginsService::getInstance($ctx);
+            $this->msgExchanger = ConfService::instanciatePluginFromGlobalParams($this->pluginConf["UNIQUE_MS_INSTANCE"], "Pydio\\Notification\\Core\\IMessageExchanger", $pService);
+            if(!empty($this->msgExchanger)){
+                $pService->setPluginActive($this->msgExchanger->getType(), $this->msgExchanger->getName(), true, $this->msgExchanger);
+            }
+            if(AuthService::$bufferedMessage != null && $ctx->hasUser()){
+                $this->sendInstantMessage($ctx, AuthService::$bufferedMessage, $ctx->getUser()->getId());
+                AuthService::$bufferedMessage = null;
+            }
+        } catch (\Exception $e) {}
+    }
+
+    /**
+     * Override parent method
+     * @param $configName
+     * @param $configValue
+     */
+    public function exposeConfigInManifest($configName, $configValue)
+    {
+        // Do not expose those
+        if(in_array($configName, ["WS_HOST", "WS_PORT", "UPLOAD_HOST", "UPLOAD_PORT"])){
+            return;
+        }
+        if(is_array($configValue)){
+            $newValue = [];
+            foreach($configValue as $key => $val){
+                if(strpos($key, "INTERNAL") !== false) continue;
+                $newValue[$key] = $val;
+            }
+            parent::exposeConfigInManifest($configName, $newValue);
+        }else{
+            parent::exposeConfigInManifest($configName, $configValue);
+        }
+    }
+
+
+    /**
+     * @param Notification $notification
+     * @throws \Exception
+     */
+    public function sendToQueue(Notification $notification)
+    {
+        if (!$this->useQueue) {
+            $this->logDebug("SHOULD DISPATCH NOTIFICATION ON ".$notification->getNode()->getUrl()." ACTION ".$notification->getAction());
+            Controller::applyHook("msg.notification", array(&$notification));
+        } else {
+            if($this->msgExchanger) {
+                $this->msgExchanger->publishWorkerMessage(
+                    $notification->getNode()->getContext(),
+                    "user_notifications",
+                    $notification);
+            }
+        }
+    }
+
+    /**
+     * @param $action
+     * @param $httpVars
+     * @param $fileVars
+     * @param ContextInterface $ctx
+     * @throws \Exception
+     */
+    public function consumeQueue($action, $httpVars, $fileVars, ContextInterface $ctx)
+    {
+        if($action != "consume_notification_queue" || $this->msgExchanger === false) return;
+        $queueObjects = $this->msgExchanger->consumeWorkerChannel($ctx, "user_notifications");
+        if (is_array($queueObjects)) {
+            $this->logDebug("Processing notification queue, ".count($queueObjects)." notifs to handle");
+            foreach ($queueObjects as $notification) {
+                Controller::applyHook("msg.notification", array(&$notification));
+            }
+        }
+    }
+
+    /**
+     * @param AJXP_Node $origNode
+     * @param AJXP_Node $newNode
+     * @param bool $copy
+     */
+    public function publishNodeChange($origNode = null, $newNode = null, $copy = false)
+    {
+        $content = "";$targetUserId=null; $nodePaths = array();
+        $update = false;
+        $ctx = null;
+        $diff = new NodesDiff();
+        if ($newNode != null) {
+            $ctx = $newNode->getContext();
+            //$targetUserId = $newNode->getUserId();
+            $targetUserId = null;
+            $nodePaths[] = $newNode->getPath();
+            $update = false;
+            if ($origNode != null && !$copy) {
+                $update = true;
+                $diff->update($newNode, $origNode->getPath());
+            } else {
+                $diff->add($newNode);
+            }
+            $content = $diff->toXML();
+        }
+        if ($origNode != null && ! $update && !$copy) {
+
+            $ctx = $origNode->getContext();
+            //$targetUserId = $origNode->getUserId();
+            $targetUserId = null;
+            $nodePaths[] = $origNode->getPath();
+            $diff->remove([$origNode->getPath()]);
+            $content = $diff->toXML();
+
+        }
+        if (!empty($content) && !empty($ctx)) {
+
+            $this->sendInstantMessage($ctx, $content, $targetUserId, null, $nodePaths);
+
+        }
+
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $xmlContent
+     * @param null $targetUserId
+     * @param null $targetGroupPath
+     * @param array $nodePaths
+     */
+    public function sendInstantMessage(ContextInterface $ctx, $xmlContent, $targetUserId = null, $targetGroupPath = null, $nodePaths = array())
+    {
+        $currentUser = $ctx->getUser();
+        $repositoryId = $ctx->getRepositoryId();
+
+        if (!$ctx->hasRepository()) {
+            $userId = $targetUserId;
+            $gPath  = $targetGroupPath;
+        } else {
+            $scope = RepositoryService::getRepositoryById($repositoryId)->securityScope();
+            if ($scope == "USER") {
+                if($targetUserId) $userId = $targetUserId;
+                else $userId = $currentUser->getId();
+            } else if ($scope == "GROUP") {
+                $gPath = $currentUser->getGroupPath();
+            } else if (isSet($targetUserId)) {
+                $userId = $targetUserId;
+            } else if (isSet($targetGroupPath)) {
+                $gPath = $targetGroupPath;
+            }
+        }
+
+        // Publish for pollers
+        $message = new \stdClass();
+        $message->content = $xmlContent;
+        if(isSet($userId)) {
+            $message->userId = $userId;
+        }
+        if(isSet($gPath)) {
+            $message->groupPath = $gPath;
+        }
+        if(count($nodePaths)) {
+            $message->nodePaths = $nodePaths;
+        }
+
+        if($repositoryId === null && (isset($userId) || isSet($gPath))){
+            $repositoryId = "*";
+        }
+        if ($this->msgExchanger) {
+            $this->msgExchanger->publishInstantMessage($ctx, "nodes:$repositoryId", $message);
+        }
+
+        // Publish for websockets
+        $input = array("REPO_ID" => "$repositoryId", "CONTENT" => "<tree>".$xmlContent."</tree>");
+        if(isSet($userId)){
+            $input["USER_ID"] = "$userId";
+        } else if(isSet($gPath)) {
+            $input["GROUP_PATH"] = "$gPath";
+        }
+        if(count($nodePaths)) {
+            $input["NODE_PATHES"] = $nodePaths;
+        }
+
+        $this->_sendMessage($ctx, 'im', json_encode($input));
+
+        $this->hasPendingMessage = true;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $content
+     */
+    public function sendTaskMessage(ContextInterface $ctx, $content){
+
+        $this->logInfo("Core.mq", "Should now publish a message to NSQ :". json_encode($content));
+
+        $this->_sendMessage($ctx, 'task', json_encode($content));
+    }
+
+    /**
+     * Send a message to NSQ
+     * @param ContextInterface $ctx
+     * @param $topic
+     * @param $content
+     */
+    private function _sendMessage(ContextInterface $ctx, $topic, $content) {
+
+        $wsActive = $this->getContextualOption($ctx, "WS_ACTIVE");
+        if(!$wsActive){
+            return;
+        }
+        $host = $this->getContextualOption($ctx, "NSQ_HOST");
+        $port = $this->getContextualOption($ctx, "NSQ_PORT");
+
+        if(!empty($host) && !empty($port)){
+
+            if(empty($this->nsqClient)){
+                // Publish on NSQ
+                $this->nsqClient = new nsqphp;
+                $this->nsqClient->publishTo(join(":", [$host, $port]), 1);
+            }
+            set_error_handler(function ($errNo, $str) use (&$msg) { $msg = $str; });
+            try {
+                $this->nsqClient->publish($topic, new Message($content));
+                $this->logDebug("core.mq", "Published to NSQ " .$topic." :". $content);
+            } catch (\Exception $e) {
+
+                $this->logError("core.mq", "sendMessage " . $topic, $e->getMessage());
+
+                if(ApplicationState::sapiIsCli()){
+                    print("Error while trying to send a ".$topic." message ".$content." : ".$e->getMessage());
+                }
+            }
+            restore_error_handler();
+        }
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param ResponseInterface $responseInterface
+     */
+    public function appendRefreshInstruction(ContextInterface $ctx, ResponseInterface &$responseInterface){
+        if(! $this->hasPendingMessage ){
+            return;
+        }
+        $respType = &$responseInterface->getBody();
+        if(!$respType instanceof SerializableResponseStream && !$respType->getSize()){
+            $respType = new SerializableResponseStream();
+            $responseInterface = $responseInterface->withBody($respType);
+        }
+        if($respType instanceof SerializableResponseStream){
+            $respType->addChunk(new ConsumeChannelMessage());
+        }
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @throws \Pydio\Core\Exception\AuthRequiredException
+     */
+    public function clientChannelMethod(ServerRequestInterface $request, ResponseInterface &$response)
+    {
+        if(!$this->msgExchanger) return;
+        $action = $request->getAttribute("action");
+        $httpVars = $request->getParsedBody();
+
+        /** @var \Pydio\Core\Model\ContextInterface $ctx */
+        $ctx = $request->getAttribute("ctx");
+
+        switch ($action) {
+            case "client_register_channel":
+                
+                $this->msgExchanger->suscribeToChannel($ctx, $httpVars["channel"], $httpVars["client_id"]);
+                break;
+            
+            case "client_unregister_channel":
+                
+                $this->msgExchanger->unsuscribeFromChannel($ctx, $httpVars["channel"], $httpVars["client_id"]);
+                break;
+            
+            case "client_consume_channel":
+
+                if (UsersService::usersEnabled()) {
+                    $user = $ctx->getUser();
+                    if ($user == null) {
+                        throw new AuthRequiredException();
+                    }
+                    $GROUP_PATH = $user->getGroupPath();
+                    if($GROUP_PATH == null) $GROUP_PATH = false;
+                    $uId = $user->getId();
+                } else {
+                    $GROUP_PATH = '/';
+                    $uId = 'shared';
+                }
+
+                $currentRepository = $ctx->getRepositoryId();
+                $currentRepoMasks = array(); $regexp = null;
+                Controller::applyHook("role.masks", array($ctx, &$currentRepoMasks, AJXP_Permission::READ));
+                if(count($currentRepoMasks)){
+                    $regexps = array();
+                    foreach($currentRepoMasks as $path){
+                        $regexps[] = '^'.preg_quote($path, '/');
+                    }
+                    $regexp = '/'.implode("|", $regexps).'/';
+                }
+
+                $channelRepository = str_replace("nodes:", "", $httpVars["channel"]);
+                $serialBody = new SerializableResponseStream();
+                $response = $response->withBody($serialBody);
+                if($channelRepository != $currentRepository){
+                    $serialBody->addChunk(new XMLMessage("<require_registry_reload repositoryId=\"$currentRepository\"/>"));
+                    return;
+                }
+
+                $data = $this->msgExchanger->consumeInstantChannel($ctx, $httpVars["channel"], $httpVars["client_id"], $uId, $GROUP_PATH);
+                if (count($data)) {
+                   ksort($data);
+                   foreach ($data as $messageObject) {
+                       if(isSet($regexp) && isSet($messageObject->nodePaths)){
+                           $pathIncluded = false;
+                           foreach($messageObject->nodePaths as $nodePath){
+                               if(preg_match($regexp, $nodePath)){
+                                   $pathIncluded = true;
+                                   break;
+                               }
+                           }
+                           if(!$pathIncluded) continue;
+                       }
+                       $serialBody->addChunk(new XMLMessage($messageObject->content));
+                   }
+                }
+
+                break;
+            default:
+                break;
+        }
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @throws \Exception
+     */
+    public function wsAuthenticate(ServerRequestInterface $request, ResponseInterface &$response)
+    {
+        $this->logDebug("Entering wsAuthenticate");
+
+        $apiKeyString = $this->getAdminKeyString();
+        $httpVars = $request->getQueryParams();
+        if (!isSet($httpVars["key"]) || $httpVars["key"] !== $apiKeyString) {
+            throw new \Exception("Cannot authentify admin key");
+        }
+
+        /** @var \Pydio\Core\Model\ContextInterface $ctx */
+        $ctx = $request->getAttribute("ctx");
+        $user = $ctx->getUser();
+        if ($user == null) {
+            $this->logDebug("Error Authenticating through WebSocket (not logged)");
+            throw new \Exception("You must be logged in");
+        }
+
+        $serializer = new UserXML();
+        $xml = $serializer->serialize($ctx);
+        // add groupPath
+        if ($user->getGroupPath() != null) {
+            $groupString = "groupPath=\"". StringHelper::xmlEntities($user->getGroupPath()) ."\"";
+            $xml = str_replace("<user id=", "<user {$groupString} id=", $xml);
+        }
+
+        $this->logDebug("Authenticating user ".$user->getId()." through WebSocket");
+        $x = new SerializableResponseStream();
+        $x->addChunk(new XMLMessage($xml));
+        $response = $response->withBody($x);
+
+    }
+
+
+    /**
+     * Save an admin key to a file
+     * @param array $params
+     * @param ContextInterface $ctx
+     * @return string
+     */
+    public function generateAdminKey($params, $ctx){
+        $u = $ctx->getUser();
+        if(!$u->isAdmin()){
+            return "ERROR: You are not administrator";
+        }
+        try{
+            $this->getAdminKeyString();
+            return "SUCCESS: Nothing to do, a pair already exists";
+        }catch(PydioException $e){
+            $adminPair = $this->getAdminKeyString(true);
+            $pairFile = $this->getPluginWorkDir(true)."/apikey";
+            $r = file_put_contents($pairFile, $adminPair);
+            if($r === false){
+                return "ERROR: Something went wrong";
+            }else{
+                return "SUCCESS: An API key pair has been written in $pairFile on the server. You can now use it to configure PydioBooster.";
+            }
+        }
+    }
+
+    /**
+     * Save an admin key to a file
+     * @param array $params
+     * @param ContextInterface $ctx
+     * @return string
+     */
+    public function revokeAdminKey($params, $ctx){
+        $u = $ctx->getUser();
+        if(!$u->isAdmin()){
+            return "ERROR: You are not administrator";
+        }
+        $c = ApiKeysService::revokePairForAdminTask(PYDIO_BOOSTER_TASK_IDENTIFIER);
+        if($c > 0){
+            return "SUCCESS: Successfully revoked $c pair of keys. You may have to generate new ones and reload PydioBooster.";
+        }else{
+            return "SUCCESS: Nothing to do, there is no admin key";
+        }
+    }
+
+
+    /**
+     * @param bool $createIfNotExists
+     * @param string $restrictToIp
+     * @throws PydioException
+     * @return string
+     */
+    protected function getAdminKeyString($createIfNotExists = false, $restrictToIp = ""){
+
+        if($createIfNotExists){
+            $adminKey = ApiKeysService::findPairForAdminTask(PYDIO_BOOSTER_TASK_IDENTIFIER);
+            if($adminKey === null){
+                $adminKey = ApiKeysService::generatePairForAdminTask(PYDIO_BOOSTER_TASK_IDENTIFIER, "", $restrictToIp);
+            }
+            $adminKeyString = $adminKey["t"].":".$adminKey["p"];
+        }else{
+            $adminKey = ApiKeysService::findPairForAdminTask(PYDIO_BOOSTER_TASK_IDENTIFIER);
+            if($adminKey === null){
+                throw new PydioException("Cannot find any key pair for admin access, something went wrong!");
+            }
+            $adminKeyString = $adminKey["t"].":".$adminKey["p"];
+        }
+        return $adminKeyString;
+
+    }
+
+    /********************************************/
+    /* ACTIONS CALLED VIA run_plugin_action API */
+    /********************************************/
+    /**
+     * @param $params
+     * @param ContextInterface $ctx
+     * @return string
+     * @throws \Exception
+     */
+    public function switchWorkerOn($params, $ctx)
+    {
+        //$adminKeyString = $this->getAdminKeyString($ctx->getUser()->getId());
+        //$res = $this->getBoosterManager()->switchWorkerOn($params, $adminKeyString);
+        return  "NOT IMPLEMENTED";//"SUCCESS: ".$res;
+    }
+
+    /**
+     * @param $params
+     * @return string
+     * @throws \Exception
+     */
+    public function switchWorkerOff($params){
+        return "NOT IMPLEMENTED"; //$this->getBoosterManager()->switchWorkerOff($params);
+    }
+
+    /**
+     * @param $params
+     * @return string
+     */
+    public function getWorkerStatus($params){
+        return "OFF"; //$this->getBoosterManager()->getWorkerStatus($params);
+    }
+    
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.mq/vendor/phpws/.buildpath b/core/src/plugins/core.mq/vendor/phpws/.buildpath
deleted file mode 100644
index 5027702ff2..0000000000
--- a/core/src/plugins/core.mq/vendor/phpws/.buildpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<buildpath>
-	<buildpathentry kind="con" path="org.eclipse.dltk.USER_LIBRARY/SimpleTest"/>
-	<buildpathentry kind="con" path="org.eclipse.php.core.LANGUAGE"/>
-	<buildpathentry kind="src" path=""/>
-</buildpath>
diff --git a/core/src/plugins/core.mq/vendor/phpws/.project b/core/src/plugins/core.mq/vendor/phpws/.project
deleted file mode 100644
index d283ecc2b3..0000000000
--- a/core/src/plugins/core.mq/vendor/phpws/.project
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>phpws</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.aptana.ide.core.unifiedBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.aptana.editor.php.aptanaPhpBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.dltk.core.scriptbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.php.core.PHPNature</nature>
-		<nature>com.aptana.editor.php.phpNature</nature>
-		<nature>com.aptana.projects.webnature</nature>
-		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/core/src/plugins/core.mq/vendor/phpws/client.html b/core/src/plugins/core.mq/vendor/phpws/client.html
deleted file mode 100644
index d6fabb6b1d..0000000000
--- a/core/src/plugins/core.mq/vendor/phpws/client.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<html>
-    <head>
-        <title>WebSocket TEST</title>
-
-        <style>
-            html,body{font:normal 0.9em arial,helvetica;}
-            #log {width:440px; height:200px; border:1px solid #7F9DB9; overflow:auto;}
-            #msg {width:330px;}
-        </style>
-
-        <script>
-
-            String.prototype.repeat = function(num)
-            {
-                return new Array(num + 1).join(this);
-            }
-
-
-
-            var socket;
-
-
-            function createSocket(host) {
-
-                if (window.WebSocket)
-                    return new WebSocket(host);
-                else if (window.MozWebSocket)
-                    return new MozWebSocket(host);
-
-            }
-
-            function init() {
-                var host = "ws://" + window.location.host + ":12345/echo";
-                try {
-                    socket = createSocket(host);
-                    log('WebSocket - status ' + socket.readyState);
-                    socket.onopen = function(msg) {
-                        log("Welcome - status " + this.readyState);
-                    };
-                    socket.onmessage = function(msg) {
-                        log("Received (" + msg.data.length + " bytes): " + msg.data);
-                    };
-                    socket.onclose = function(msg) {
-                        log("Disconnected - status " + this.readyState);
-                    };
-                }
-                catch (ex) {
-                    log(ex);
-                }
-                $("msg").focus();
-            }
-
-            function send() {
-
-
-                var msg = document.getElementById('msg').value;
-
-                try {
-                    socket.send(msg);
-                    log('Sent (' + msg.length + " bytes): " + msg);
-                } catch (ex) {
-                    log(ex);
-                }
-            }
-            function quit() {
-                log("Goodbye!");
-                socket.close();
-                socket = null;
-            }
-
-            // Utilities
-            function $(id) {
-                return document.getElementById(id);
-            }
-            function log(msg) {
-                $("log").innerHTML += "<br>" + msg;
-            }
-            function onkey(event) {
-                if (event.keyCode == 13) {
-                    send();
-                }
-            }
-        </script>
-
-    </head>
-    <body onload="init()">
-        <h3>WebSocket Test</h3>
-        <div id="log"></div>
-        <input id="msg" type="textbox" onkeypress="onkey(event)"/>
-        <button onclick="send()">Send</button>
-        <button onclick="quit()">Quit</button>
-        <div>Server will echo your response!</div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/core/src/plugins/core.mq/vendor/phpws/demo.php b/core/src/plugins/core.mq/vendor/phpws/demo.php
deleted file mode 100644
index cf4cf85719..0000000000
--- a/core/src/plugins/core.mq/vendor/phpws/demo.php
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/php -q
-<?php
-// Run from command prompt > php demo.php
-require_once("websocket.server.php");
-
-/**
- * This demo resource handler will respond to all messages sent to /echo/ on the socketserver below
- *
- * All this handler does is echoing the responds to the user
- * @author Chris
- *
- */
-class DemoEchoHandler extends WebSocketUriHandler {
-
-    public function onMessage(IWebSocketConnection $user, IWebSocketMessage $msg) {
-        $this->say("[ECHO] " . strlen($msg->getData()) . " bytes");
-        // Echo
-        $user->sendMessage($msg);
-    }
-
-    public function onAdminMessage(IWebSocketConnection $user, IWebSocketMessage $obj) {
-        $this->say("[DEMO] Admin TEST received!");
-
-        $frame = WebSocketFrame::create(WebSocketOpcode::PongFrame);
-        $user->sendFrame($frame);
-    }
-
-}
-
-/**
- * Demo socket server. Implements the basic eventlisteners and attaches a resource handler for /echo/ urls.
- *
- *
- * @author Chris
- *
- */
-class DemoSocketServer implements IWebSocketServerObserver {
-
-    protected $debug = true;
-    protected $server;
-
-    public function __construct() {
-        $this->server = new WebSocketServer("tcp://0.0.0.0:12345", 'superdupersecretkey');
-        $this->server->addObserver($this);
-
-        $this->server->addUriHandler("echo", new DemoEchoHandler());
-    }
-
-    public function onConnect(IWebSocketConnection $user) {
-        $this->say("[DEMO] {$user->getId()} connected");
-    }
-
-    public function onMessage(IWebSocketConnection $user, IWebSocketMessage $msg) {
-        //$this->say("[DEMO] {$user->getId()} says '{$msg->getData()}'");
-    }
-
-    public function onDisconnect(IWebSocketConnection $user) {
-        $this->say("[DEMO] {$user->getId()} disconnected");
-    }
-
-    public function onAdminMessage(IWebSocketConnection $user, IWebSocketMessage $msg) {
-        $this->say("[DEMO] Admin Message received!");
-
-        $frame = WebSocketFrame::create(WebSocketOpcode::PongFrame);
-        $user->sendFrame($frame);
-    }
-
-    public function say($msg) {
-        echo "$msg \r\n";
-    }
-
-    public function run() {
-        $this->server->run();
-    }
-
-}
-
-// Start server
-$server = new DemoSocketServer();
-$server->run();
\ No newline at end of file
diff --git a/core/src/plugins/core.mq/vendor/phpws/demo_ssl.php b/core/src/plugins/core.mq/vendor/phpws/demo_ssl.php
deleted file mode 100644
index b316c4933a..0000000000
--- a/core/src/plugins/core.mq/vendor/phpws/demo_ssl.php
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/php -q
-<?php
-// Run from command prompt > php demo.php
-require_once("websocket.server.php");
-
-/**
- * This demo resource handler will respond to all messages sent to /echo/ on the socketserver below
- *
- * All this handler does is echoing the responds to the user
- * @author Chris
- *
- */
-class DemoEchoHandler extends WebSocketUriHandler {
-
-    public function onMessage(IWebSocketConnection $user, IWebSocketMessage $msg) {
-        $this->say("[ECHO] {$msg->getData()}");
-        // Echo
-        $user->sendMessage($msg);
-    }
-
-    public function onAdminMessage(IWebSocketConnection $user, IWebSocketMessage $obj) {
-        $this->say("[DEMO] Admin TEST received!");
-
-        $frame = WebSocketFrame::create(WebSocketOpcode::PongFrame);
-        $user->sendFrame($frame);
-    }
-
-}
-
-/**
- * Demo socket server. Implements the basic eventlisteners and attaches a resource handler for /echo/ urls.
- *
- *
- * @author Chris
- *
- */
-class DemoSocketServer implements IWebSocketServerObserver {
-
-    protected $debug = true;
-    protected $server;
-
-    public function __construct() {
-        $this->server = new WebSocketServer("ssl://0.0.0.0:12345", 'superdupersecretkey');
-        $this->server->addObserver($this);
-
-        $this->server->addUriHandler("echo", new DemoEchoHandler());
-
-        $this->setupSSL();
-    }
-
-    private function getPEMFilename() {
-        return './democert.pem';
-    }
-
-    public function setupSSL() {
-        $context = stream_context_create();
-
-        // local_cert must be in PEM format
-        stream_context_set_option($context, 'ssl', 'local_cert', $this->getPEMFilename());
-
-        stream_context_set_option($context, 'ssl', 'allow_self_signed', true);
-        stream_context_set_option($context, 'ssl', 'verify_peer', false);
-
-        $this->server->setStreamContext($context);
-    }
-
-    public function onConnect(IWebSocketConnection $user) {
-        $this->say("[DEMO] {$user->getId()} connected");
-    }
-
-    public function onMessage(IWebSocketConnection $user, IWebSocketMessage $msg) {
-        $this->say("[DEMO] {$user->getId()} says '{$msg->getData()}'");
-    }
-
-    public function onDisconnect(IWebSocketConnection $user) {
-        $this->say("[DEMO] {$user->getId()} disconnected");
-    }
-
-    public function onAdminMessage(IWebSocketConnection $user, IWebSocketMessage $msg) {
-        $this->say("[DEMO] Admin Message received!");
-
-        $frame = WebSocketFrame::create(WebSocketOpcode::PongFrame);
-        $user->sendFrame($frame);
-    }
-
-    public function say($msg) {
-        echo "$msg \r\n";
-    }
-
-    public function run() {
-        $this->server->run();
-    }
-
-}
-
-// Start server
-$server = new DemoSocketServer("ssl://0.0.0.0:12345");
-$server->run();
\ No newline at end of file
diff --git a/core/src/plugins/core.mq/vendor/phpws/democert.pem b/core/src/plugins/core.mq/vendor/phpws/democert.pem
deleted file mode 100644
index adf677ba0d..0000000000
--- a/core/src/plugins/core.mq/vendor/phpws/democert.pem
+++ /dev/null
@@ -1,38 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDwDCCAymgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBojELMAkGA1UEBhMCVVMx
-DjAMBgNVBAgTBVRleGFzMQ8wDQYDVQQHEwZBdXN0aW4xHzAdBgNVBAoTFlBIUFdT
-IERlbW8gQ2VydGlmaWNhdGUxHzAdBgNVBAsTFlBIUFdTIERlbW8gQ2VydGlmaWNh
-dGUxDjAMBgNVBAMTBXBocHdzMSAwHgYJKoZIhvcNAQkBFhFwaHB3c0BleGFtcGxl
-LmNvbTAeFw0xMTEyMTgxNzI3MjlaFw0xMjEyMTcxNzI3MjlaMIGiMQswCQYDVQQG
-EwJVUzEOMAwGA1UECBMFVGV4YXMxDzANBgNVBAcTBkF1c3RpbjEfMB0GA1UEChMW
-UEhQV1MgRGVtbyBDZXJ0aWZpY2F0ZTEfMB0GA1UECxMWUEhQV1MgRGVtbyBDZXJ0
-aWZpY2F0ZTEOMAwGA1UEAxMFcGhwd3MxIDAeBgkqhkiG9w0BCQEWEXBocHdzQGV4
-YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDeht+8x3R4eCft
-yf5pHFJwCUB1zYuNrKULIS7XAFPzNHkTQZxU2BEBHjKdcSXJqXUMyByHH1bu70dw
-wjnUcXiMfJuTvtTkqyq2GbQu47SujqkcbguBUajo4+OgypmV7BDmatq/JJOH1wMQ
-NKmVE7in6v2fEp5DS9Q0DIeb0X0oZQIDAQABo4IBAjCB/zAdBgNVHQ4EFgQUS0a7
-Agqixx6D0ExIBwT2oSygZBswgc8GA1UdIwSBxzCBxIAUS0a7Agqixx6D0ExIBwT2
-oSygZBuhgaikgaUwgaIxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIEwVUZXhhczEPMA0G
-A1UEBxMGQXVzdGluMR8wHQYDVQQKExZQSFBXUyBEZW1vIENlcnRpZmljYXRlMR8w
-HQYDVQQLExZQSFBXUyBEZW1vIENlcnRpZmljYXRlMQ4wDAYDVQQDEwVwaHB3czEg
-MB4GCSqGSIb3DQEJARYRcGhwd3NAZXhhbXBsZS5jb22CAQAwDAYDVR0TBAUwAwEB
-/zANBgkqhkiG9w0BAQQFAAOBgQAOuG4cfsbLq1CSxtLuhLCtx4XmEbGNIq6PRFbA
-+mnVEAs0J4rfeCDxNhQeSeZGduqE5jdq8kNFSBfu3vVYeFbNj91uObAc4ZUQeVgT
-N5zrGKKATHAwnftCoMloS07D82z0+HpBbPB5kJ4I6+Z8Dt65cS8aWzw2LE7Thcjg
-NXluZw==
------END CERTIFICATE-----
------BEGIN RSA PRIVATE KEY-----
-MIICXwIBAAKBgQDeht+8x3R4eCftyf5pHFJwCUB1zYuNrKULIS7XAFPzNHkTQZxU
-2BEBHjKdcSXJqXUMyByHH1bu70dwwjnUcXiMfJuTvtTkqyq2GbQu47SujqkcbguB
-Uajo4+OgypmV7BDmatq/JJOH1wMQNKmVE7in6v2fEp5DS9Q0DIeb0X0oZQIDAQAB
-AoGBANcNsZxXhhAGz0/XLq+WV3U++7TdeEjq2HXxE7tk7bzUsU4S0mqMhaJ29KOD
-felug1he7HMJrpIrXPd0PT86iiwtfdzFKRjhDmKLWn8iSXp04tJOOY51BTmN/wO/
-NCKnj60lbjwCjbGxGLq7VyYQjpnIVZ5Y/RGlc155eMBz0jkBAkEA94UfBWNxkNJA
-GQdXtrfF/ShbHK5HCgrh+oSRUQ7oqigTjod/1cXUmLWDX03oxELeKOiJx3nOi1YA
-8L1BuBOLeQJBAOYmjMUPapcIvUubweEw6sYXaM+3Msie+HHTI0VzIQkvAUYUtGQz
-5T0pUaSe9SGOpQeCUViczE5ko4T7GyfrnU0CQQCFl8gCdIXbEF+gIqJo8A9gb+Od
-O0MEXJNTTzHPeiiBjlff2apZiwkP0wgw7C/xndWiZr/WdhvQgH7JcJyD6aihAkEA
-xfnNR8pOH2PWKc7vRT4mBoamk198oNUW1BsSkTBK77JufxFaZ4O4oxcC8wAFz3r7
-/Oyd+wLOQHUTsFWs83cbVQJBAIX03j/CO2NuoEESTXWmE3MjMdghT45CKpfqHrFY
-T8kZ6oQtxtNibxC5dwWnl4pCGTDGuCkE7/tfLchs0lID16M=
------END RSA PRIVATE KEY-----
diff --git a/core/src/plugins/core.mq/vendor/phpws/tests/framing.test.php b/core/src/plugins/core.mq/vendor/phpws/tests/framing.test.php
deleted file mode 100644
index e658a79e77..0000000000
--- a/core/src/plugins/core.mq/vendor/phpws/tests/framing.test.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-require_once("../websocket.server.php");
-
-class test extends PHPUnit_Framework_TestCase {
-
-    function test_unmaskedTextMessage() {
-
-        $bin = "\x81\x05\x48\x65\x6c\x6c\x6f";
-
-        $str = "Hello";
-        $f = WebSocketFrame::create(WebSocketOpcode::TextFrame, $str);
-
-        $enc = $f->encode();
-
-        $this->assertEquals($bin, $enc);
-    }
-
-    function test_127chars() {
-
-        $str = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
-
-        $msg = WebSocketMessage::create($str);
-
-        $serialised = '';
-        foreach ($msg->getFrames() as $frame) {
-            $serialised .= $frame->encode();
-        }
-
-        $frame = WebSocketFrame::decode($serialised);
-
-        $this->assertEquals($str, $frame->getData());
-    }
-
-    function test_maskedTextMessage() {
-        $bin = "\x81\x85\x37\xfa\x21\x3d\x7f\x9f\x4d\x51\x58";
-        $str = "Hello";
-
-        $f = WebSocketFrame::decode($bin);
-
-        $this->assertEquals($str, $f->getData());
-    }
-
-    /**
-     * @expectedException WebSocketMessageNotFinalised
-     */
-    function test_incompleteTextMessage() {
-        $bf1 = "\x01\x03\x48\x65\x6c";
-        $bf2 = "\x80\x02\x6c\x6f";
-
-        $f1 = WebSocketFrame::decode($bf1);
-        $f2 = WebSocketFrame::decode($bf2);
-
-        $msg = WebSocketMessage::fromFrame($f1);
-
-        $this->assertFalse($msg->isFinalised());
-        $msg->getData();
-    }
-
-    function test_fragmentedTextMessage() {
-        $bf1 = "\x01\x03\x48\x65\x6c";
-        $bf2 = "\x80\x02\x6c\x6f";
-
-        $f1 = WebSocketFrame::decode($bf1);
-        $f2 = WebSocketFrame::decode($bf2);
-
-        $this->assertEquals("Hel", $f1->getData());
-        $this->assertEquals("lo", $f2->getData());
-
-        $msg = WebSocketMessage::fromFrame($f1);
-        $msg->takeFrame($f2);
-
-        $this->assertEquals("Hello", $msg->getData());
-    }
-
-}
-
diff --git a/core/src/plugins/core.mq/vendor/phpws/tests/server.test.php b/core/src/plugins/core.mq/vendor/phpws/tests/server.test.php
deleted file mode 100644
index d47119a5bc..0000000000
--- a/core/src/plugins/core.mq/vendor/phpws/tests/server.test.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-require_once("../websocket.client.php");
-require_once("../websocket.admin.php");
-
-/**
- * These tests need the 'demo.php' server to be running
- *
- * @author Chris
- *
- */
-class TestServer extends PHPUnit_Framework_TestCase {
-
-    function testMasking() {
-        $input = "Hello World!";
-        $frame = WebSocketFrame::create(WebSocketOpcode::TextFrame, $input);
-        $frame->setMasked(true);
-
-
-
-        $client = new WebSocket("ws://127.0.0.1:12345/echo/");
-        $client->open();
-        $client->sendFrame($frame);
-
-        $msg = $client->readMessage();
-
-        $client->close();
-        $this->assertEquals($input, $frame->getData());
-        $frames = $msg->getFrames();
-        $this->assertEquals(false, $frames[0]->isMasked());
-    }
-
-    function test_echoResourceHandlerResponse() {
-        $input = "Hello World!";
-        $msg = WebSocketMessage::create($input);
-
-        $client = new WebSocket("ws://127.0.0.1:12345/echo/");
-        $client->open();
-        $client->sendMessage($msg);
-
-        $msg = $client->readMessage();
-
-        $client->close();
-        $this->assertEquals($input, $msg->getData());
-        $frames = $msg->getFrames();
-        $this->assertEquals(false, $frames[0]->isMasked());
-    }
-
-    function test_DoubleEchoResourceHandlerResponse() {
-        $input = str_repeat("a", 1024);
-        $input2 = str_repeat("b", 1024);
-        $msg = WebSocketMessage::create($input);
-
-        $client = new WebSocket("ws://127.0.0.1:12345/echo/");
-        $client->setTimeOut(1000);
-        $client->open();
-        $client->sendMessage($msg);
-        $client->sendMessage(WebSocketMessage::create($input2));
-
-        $msg = $client->readMessage();
-        $msg2 = $client->readMessage();
-
-        $client->close();
-        $this->assertEquals($input, $msg->getData());
-
-        $this->assertEquals($input2, $msg2->getData());
-    }
-
-}
\ No newline at end of file
diff --git a/core/src/plugins/core.mq/vendor/phpws/websocket.admin.php b/core/src/plugins/core.mq/vendor/phpws/websocket.admin.php
deleted file mode 100644
index b6b9fe34fc..0000000000
--- a/core/src/plugins/core.mq/vendor/phpws/websocket.admin.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-require_once("websocket.client.php");
-
-class WebSocketAdminClient extends WebSocket {
-
-    protected $adminKey = null;
-
-    public function __construct($url, $adminKey) {
-        parent::__construct($url);
-
-        $this->adminKey = $adminKey;
-
-        $this->addHeader("Admin-Key", $adminKey);
-    }
-
-    public function sendMessage($msg) {
-        $wsmsg = WebSocketMessage::create(json_encode($msg));
-
-        parent::sendMessage($wsmsg);
-    }
-
-}
-
-/**
- * Helper class to send Admin Messages to the WebSocketServer
- *
- * Makes the server execute onAdminXXXX() events
- *
- * @author Chris
- *
- */
-class WebSocketAdminMessage extends stdClass {
-
-    public $task = null;
-
-    private function __construct() {
-        
-    }
-
-    /**
-     * Create a message that will be send to the instance of the WebSocketServer
-     *
-     * @param string $task
-     * @return WebSocketAdminMessage
-     */
-    public static function create($task) {
-        $o = new self();
-        $o->task = $task;
-
-        return $o;
-    }
-
-}
\ No newline at end of file
diff --git a/core/src/plugins/core.mq/vendor/phpws/websocket.client.php b/core/src/plugins/core.mq/vendor/phpws/websocket.client.php
deleted file mode 100644
index 1461b23a9a..0000000000
--- a/core/src/plugins/core.mq/vendor/phpws/websocket.client.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-
-require_once("websocket.functions.php");
-require_once("websocket.exceptions.php");
-require_once("websocket.framing.php");
-require_once("websocket.message.php");
-require_once("websocket.resources.php");
-require_once("websocket.socket.php");
-
-class WebSocket implements WebSocketObserver {
-
-    protected $socket;
-    protected $handshakeChallenge;
-    protected $hixieKey1;
-    protected $hixieKey2;
-    protected $host;
-    protected $port;
-    protected $origin;
-    protected $requestUri;
-    protected $url;
-    protected $hybi;
-    protected $_frames = array();
-    protected $_messages = array();
-    protected $_head = '';
-    protected $_timeOut = 1;
-
-    // mamta
-    public function __construct($url, $useHybie = true) {
-        $this->hybi = $useHybie;
-        $parts = parse_url($url);
-
-        $this->url = $url;
-
-        if (in_array($parts['scheme'], array('ws', 'wss')) === false)
-            throw new WebSocketInvalidUrlScheme();
-
-        $this->scheme = $parts['scheme'];
-
-        $this->host = $parts['host'];
-        $this->port = $parts['port'];
-
-        $this->origin = 'http://' . $this->host;
-
-        if (isset($parts['path']))
-            $this->requestUri = $parts['path'];
-        else
-            $this->requestUri = "/";
-
-        if (isset($parts['query']))
-            $this->requestUri .= "?" . $parts['query'];
-
-        // mamta
-        if ($useHybie) {
-            $this->buildHeaderArray();
-        } else {
-            $this->buildHeaderArrayHixie76();
-        }
-    }
-
-    public function onDisconnect(WebSocketSocket $s) {
-        
-    }
-
-    public function onConnectionEstablished(WebSocketSocket $s) {
-        
-    }
-
-    public function onMessage(IWebSocketConnection $s, IWebSocketMessage $msg) {
-        $this->_messages[] = $msg;
-    }
-
-    public function onFlashXMLRequest(WebSocketConnectionFlash $connection) {
-        
-    }
-
-    public function setTimeOut($seconds) {
-        $this->_timeOut = $seconds;
-    }
-
-    public function getTimeOut() {
-        return $this->_timeOut;
-    }
-
-    /**
-     * TODO: Proper header generation!
-     * TODO: Check server response!
-     */
-    public function open() {
-        $errno = $errstr = null;
-
-        $protocol = $this->scheme == 'ws' ? "tcp" : "ssl";
-
-        $this->socket = stream_socket_client("$protocol://{$this->host}:{$this->port}", $errno, $errstr, $this->getTimeOut());
-        // socket_connect($this->socket, $this->host, $this->port);
-
-        $buffer = $this->serializeHeaders();
-
-        fwrite($this->socket, $buffer, strlen($buffer));
-
-        // wait for response
-        $buffer = WebSocketFunctions::readWholeBuffer($this->socket);
-        $headers = WebSocketFunctions::parseHeaders($buffer);
-
-        $s = new WebSocketSocket($this, $this->socket, $immediateWrite = true);
-
-        if ($this->hybi)
-            $this->_connection = new WebSocketConnectionHybi($s, $headers);
-        else
-            $this->_connection = new WebSocketConnectionHixie($s, $headers, $buffer);
-
-        $s->setConnection($this->_connection);
-
-        return true;
-    }
-
-    private function serializeHeaders() {
-        $str = '';
-
-        foreach ($this->headers as $k => $v) {
-            $str .= $k . " " . $v . "\r\n";
-        }
-        # mamta add key 3 needed for the handshake/swithching protocol compatible with glassfish
-        $key3 = WebSocketFunctions::genKey3();
-        $str .= "\r\n" . $key3;
-
-        return $str;
-    }
-
-    public function addHeader($key, $value) {
-        $this->headers[$key . ":"] = $value;
-    }
-
-    protected function buildHeaderArray() {
-        $this->handshakeChallenge = WebSocketFunctions::randHybiKey();
-
-        $this->headers = array("GET" => "{$this->url} HTTP/1.1", "Connection:" => "Upgrade", "Host:" => "{$this->host}:{$this->port}", "Sec-WebSocket-Key:" => "{$this->handshakeChallenge}", "Sec-WebSocket-Origin:" => "{$this->origin}", "Sec-WebSocket-Version:" => 8, "Upgrade:" => "websocket");
-
-        return $this->headers;
-    }
-
-    # mamta: hixie 76
-
-    protected function buildHeaderArrayHixie76() {
-        $this->hixieKey1 = WebSocketFunctions::randHixieKey();
-        $this->hixieKey2 = WebSocketFunctions::randHixieKey();
-        $this->headers = array("GET" => "{$this->url} HTTP/1.1", "Connection:" => "Upgrade", "Host:" => "{$this->host}:{$this->port}", "Origin:" => "{$this->origin}", "Sec-WebSocket-Key1:" => "{$this->hixieKey1->key}", "Sec-WebSocket-Key2:" => "{$this->hixieKey2->key}", "Upgrade:" => "websocket", "Sec-WebSocket-Protocol: " => "hiwavenet");
-
-        return $this->headers;
-    }
-
-    public function send($string) {
-        $this->_connection->sendString($string);
-    }
-
-    public function sendMessage($msg) {
-        $this->_connection->sendMessage($msg);
-    }
-
-    public function sendFrame(IWebSocketFrame $frame) {
-        $this->_connection->sendFrame($frame);
-    }
-
-    /**
-     * @return WebSocketFrame
-     */
-    public function readFrame() {
-        $buffer = WebSocketFunctions::readWholeBuffer($this->socket);
-
-        $this->_frames = array_merge($this->_frames, $this->_connection->readFrame($buffer));
-
-        return array_shift($this->_frames);
-    }
-
-    /**
-     * 
-     * @return IWebSocketMessage
-     */
-    public function readMessage() {
-        while (count($this->_messages) == 0)
-            $this->readFrame();
-
-
-
-        return array_shift($this->_messages);
-    }
-
-    public function close() {
-        /**
-         * @var WebSocketFrame
-         */
-        $frame = null;
-        $this->sendFrame(WebSocketFrame::create(WebSocketOpcode::CloseFrame));
-
-        $i = 0;
-        do {
-            $i++;
-            $frame = @$this->readFrame();
-        } while ($i < 2 && $frame && $frame->getType() == WebSocketOpcode::CloseFrame);
-
-        @fclose($this->socket);
-    }
-
-}
diff --git a/core/src/plugins/core.mq/vendor/phpws/websocket.exceptions.php b/core/src/plugins/core.mq/vendor/phpws/websocket.exceptions.php
deleted file mode 100644
index 88b53fb896..0000000000
--- a/core/src/plugins/core.mq/vendor/phpws/websocket.exceptions.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-class WebSocketMessageNotFinalised extends Exception {
-
-    public function __construct(IWebSocketMessage $msg) {
-        parent::__construct("WebSocketMessage is not finalised!");
-    }
-
-}
-
-class WebSocketFrameSizeMismatch extends Exception {
-
-    public function __construct(IWebSocketFrame $msg) {
-        parent::__construct("Frame size mismatches with the expected frame size. Maybe a buggy client.");
-    }
-
-}
-
-class WebSocketInvalidChallengeResponse extends Exception {
-
-    public function __construct() {
-        parent::__construct("Server send an incorrect response to the clients challenge!");
-    }
-
-}
-
-class WebSocketInvalidUrlScheme extends Exception {
-
-    public function __construct() {
-        parent::__construct("Only 'ws://' urls are supported!");
-    }
-
-}
-
-class WebSocketNotAuthorizedException extends Exception {
-
-    protected $user;
-
-    public function __construct(IWebSocketUser $user) {
-        parent::__construct("None or invalid credentials provided!");
-        $this->user = $user;
-    }
-
-}
-
-class WebSocketInvalidKeyException extends Exception {
-
-    public function __construct($key1, $key2, $l8b) {
-        parent::__construct("Client sent an invalid opening handshake!");
-        fwrite(STDERR, "Key 1: \t$key1\nKey 2: \t$key2\nL8b: \t$l8b");
-    }
-
-}
\ No newline at end of file
diff --git a/core/src/plugins/core.mq/vendor/phpws/websocket.framing.php b/core/src/plugins/core.mq/vendor/phpws/websocket.framing.php
deleted file mode 100644
index f4d7c050da..0000000000
--- a/core/src/plugins/core.mq/vendor/phpws/websocket.framing.php
+++ /dev/null
@@ -1,296 +0,0 @@
-<?php
-
-/**
- * Enum-like construct containing all opcodes defined in the WebSocket protocol
-
- * @author Chris
- *
- */
-class WebSocketOpcode {
-
-    const __default = 0;
-    const ContinuationFrame = 0x00;
-    const TextFrame = 0x01;
-    const BinaryFrame = 0x02;
-    const CloseFrame = 0x08;
-    const PingFrame = 0x09;
-    const PongFrame = 0x09;
-
-    private function __construct() {
-        
-    }
-
-    /**
-     * Check if a opcode is a control frame. Control frames should be handled internally by the server.
-     * @param int $type
-     */
-    public static function isControlFrame($type) {
-        $controlframes = array(self::CloseFrame, self::PingFrame, self::PongFrame);
-
-        return array_search($type, $controlframes) !== false;
-    }
-
-}
-
-/**
- * Interface for WebSocket frames. One or more frames compose a message.
- * In the case of the Hixie protocol, a message contains of one frame only
- *
- * @author Chris
- */
-interface IWebSocketFrame {
-
-    /**
-     * Serialize the frame so that it can be send over a socket
-     * @return string Serialized binary string
-     */
-    public function encode();
-
-    /**
-     * Deserialize a binary string into a IWebSocketFrame
-     * @return string Serialized binary string
-     */
-    public static function decode(&$string, $head = null);
-
-    /**
-     * @return string Payload Data inside the frame
-     */
-    public function getData();
-
-    /**
-     * @return int The frame type (opcode)
-     */
-    public function getType();
-
-    /**
-     * Create a frame by type and payload data
-     * @param int $type
-     * @param string $data
-     *
-     * @return IWebSocketFrame
-     */
-    public static function create($type, $data = null);
-}
-
-/**
- * HYBIE WebSocketFrame
- *
- * @author Chris
- *
- */
-class WebSocketFrame implements IWebSocketFrame {
-
-    // First Byte
-    protected $FIN = 0;
-    protected $RSV1 = 0;
-    protected $RSV2 = 0;
-    protected $RSV3 = 0;
-    protected $opcode = WebSocketOpcode::TextFrame;
-    // Second Byte
-    protected $mask = 0;
-    protected $payloadLength = 0;
-    protected $maskingKey = 0;
-    protected $payloadData = '';
-    protected $actualLength = 0;
-
-    private function __construct() {
-        
-    }
-
-    public static function create($type, $data = null) {
-        $o = new self();
-
-        $o->FIN = true;
-        $o->payloadData = $data;
-        $o->payloadLength = $data != null ? strlen($data) : 0;
-        $o->setType($type);
-
-        return $o;
-    }
-
-    public function setMasked($mask) {
-        $this->mask = $mask ? 1 : 0;
-    }
-
-    public function isMasked() {
-        return $this->mask == 1;
-    }
-
-    protected function setType($type) {
-        $this->opcode = $type;
-
-        if ($type == WebSocketOpcode::CloseFrame)
-            $this->mask = 1;
-    }
-
-    protected static function IsBitSet($byte, $pos) {
-        return ($byte & pow(2, $pos)) > 0 ? 1 : 0;
-    }
-
-    protected static function rotMask($data, $key, $offset = 0) {
-        $res = '';
-        for ($i = 0; $i < strlen($data); $i++) {
-            $j = ($i + $offset) % 4;
-            $res .= chr(ord($data[$i]) ^ ord($key[$j]));
-        }
-
-        return $res;
-    }
-
-    public function getType() {
-        return $this->opcode;
-    }
-
-    public function encode() {
-        $this->payloadLength = strlen($this->payloadData);
-
-        $firstByte = $this->opcode;
-
-        $firstByte += $this->FIN * 128 + $this->RSV1 * 64 + $this->RSV2 * 32 + $this->RSV3 * 16;
-
-        $encoded = chr($firstByte);
-
-        if ($this->payloadLength <= 125) {
-            $secondByte = $this->payloadLength;
-            $secondByte += $this->mask * 128;
-
-            $encoded .= chr($secondByte);
-        } else if ($this->payloadLength <= 255 * 255 - 1) {
-            $secondByte = 126;
-            $secondByte += $this->mask * 128;
-
-            $encoded .= chr($secondByte) . pack("n", $this->payloadLength);
-        } else {
-            // TODO: max length is now 32 bits instead of 64 !!!!!
-            $secondByte = 127;
-            $secondByte += $this->mask * 128;
-
-            $encoded .= chr($secondByte);
-            $encoded .= pack("N", 0);
-            $encoded .= pack("N", $this->payloadLength);
-        }
-
-        $key = 0;
-        if ($this->mask) {
-            $key = pack("N", rand(0, pow(255, 4) - 1));
-            $encoded .= $key;
-        }
-
-        if ($this->payloadData)
-            $encoded .= ($this->mask == 1) ? $this->rotMask($this->payloadData, $key) : $this->payloadData;
-
-        return $encoded;
-    }
-
-    public static function decode(&$raw, $head = null) {
-        if ($head != null) {
-            $frame = $head;
-        } else {
-            $frame = new self();
-
-            // Read the first two bytes, then chop them off
-            list($firstByte, $secondByte) = substr($raw, 0, 2);
-            $raw = substr($raw, 2);
-
-            $firstByte = ord($firstByte);
-            $secondByte = ord($secondByte);
-
-            $frame->FIN = self::IsBitSet($firstByte, 7);
-            $frame->RSV1 = self::IsBitSet($firstByte, 6);
-            $frame->RSV2 = self::IsBitSet($firstByte, 5);
-            $frame->RSV3 = self::IsBitSet($firstByte, 4);
-
-            $frame->mask = self::IsBitSet($secondByte, 7);
-
-            $frame->opcode = ($firstByte & 0x0F);
-
-            $len = $secondByte & ~128;
-
-            if ($len <= 125)
-                $frame->payloadLength = $len;
-            elseif ($len == 126) {
-                $arr = unpack("nfirst", $raw);
-                $frame->payloadLength = array_pop($arr);
-                $raw = substr($raw, 2);
-            } elseif ($len == 127) {
-                list(, $h, $l) = unpack('N2', $raw);
-                $frame->payloadLength = ($l + ($h * 0x0100000000));
-                $raw = substr($raw, 8);
-            }
-
-            if ($frame->mask) {
-                $frame->maskingKey = substr($raw, 0, 4);
-                $raw = substr($raw, 4);
-            }
-        }
-
-        $currentOffset = $frame->actualLength;
-        $fullLength = min($frame->payloadLength - $frame->actualLength, strlen($raw));
-        $frame->actualLength += $fullLength;
-
-        if ($fullLength < strlen($raw)) {
-            $frameData = substr($raw, 0, $fullLength);
-            $raw = substr($raw, $fullLength);
-        } else {
-            $frameData = $raw;
-            $raw = '';
-        }
-
-        if ($frame->mask)
-            $frame->payloadData .= self::rotMask($frameData, $frame->maskingKey, $currentOffset);
-        else
-            $frame->payloadData .= $frameData;
-
-        return $frame;
-    }
-
-    public function isReady() {
-        if ($this->actualLength > $this->payloadLength) {
-            throw new WebSocketFrameSizeMismatch($this);
-        }
-        return ($this->actualLength == $this->payloadLength);
-    }
-
-    public function isFinal() {
-        return $this->FIN == 1;
-    }
-
-    public function getData() {
-        return $this->payloadData;
-    }
-
-}
-
-class WebSocketFrame76 implements IWebSocketFrame {
-
-    public $payloadData = '';
-    protected $opcode = WebSocketOpcode::TextFrame;
-
-    public static function create($type, $data = null) {
-        $o = new self();
-
-        $o->payloadData = $data;
-
-        return $o;
-    }
-
-    public function encode() {
-        return chr(0) . $this->payloadData . chr(255);
-    }
-
-    public function getData() {
-        return $this->payloadData;
-    }
-
-    public function getType() {
-        return $this->opcode;
-    }
-
-    public static function decode(&$str, $head = null) {
-        $o = new self();
-        $o->payloadData = substr($str, 1, strlen($str) - 2);
-
-        return $o;
-    }
-
-}
diff --git a/core/src/plugins/core.mq/vendor/phpws/websocket.functions.php b/core/src/plugins/core.mq/vendor/phpws/websocket.functions.php
deleted file mode 100644
index 141cb988a1..0000000000
--- a/core/src/plugins/core.mq/vendor/phpws/websocket.functions.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-
-// mamta
-class HixieKey {
-
-    public $number;
-    public $key;
-
-    public function __construct($number, $key) {
-        $this->number = $number;
-        $this->key = $key;
-    }
-
-}
-
-class WebSocketProtocolVersions {
-
-    const HIXIE_76 = 0;
-    const HYBI_8 = 8;
-    const HYBI_9 = 8;
-    const HYBI_10 = 8;
-    const HYBI_11 = 8;
-    const HYBI_12 = 8;
-    const LATEST = self::HYBI_12;
-
-    private function __construct() {
-        
-    }
-
-}
-
-class WebSocketFunctions {
-
-    /**
-     * Parse a HTTP HEADER 'Cookie:' value into a key-value pair array
-     *
-     * @param string $line Value of the COOKIE header
-     * @return array Key-value pair array
-     */
-    public static function cookie_parse($line) {
-        $cookies = array();
-        $csplit = explode(';', $line);
-        $cdata = array();
-
-        foreach ($csplit as $data) {
-
-            $cinfo = explode('=', $data);
-            $key = trim($cinfo[0]);
-            $val = urldecode($cinfo[1]);
-
-            $cookies[$key] = $val;
-        }
-
-        return $cookies;
-    }
-
-    public static function writeWholeBuffer($fp, $string) {
-        for ($written = 0; $written < strlen($string); $written += $fwrite) {
-            $fwrite = fwrite($fp, substr($string, $written));
-            if ($fwrite === false) {
-                return $written;
-            }
-        }
-        return $written;
-    }
-
-    public static function readWholeBuffer($resource) {
-        $buffer = '';
-        $buffsize = 8192;
-
-        $metadata['unread_bytes'] = 0;
-
-        do {
-            if (feof($resource)) {
-                return false;
-            }
-
-            $result = fread($resource, $buffsize);
-            if ($result === false) {
-                return false;
-            }
-            $buffer .= $result;
-
-            $metadata = stream_get_meta_data($resource);
-
-            $buffsize = min($buffsize, $metadata['unread_bytes']);
-        } while ($metadata['unread_bytes'] > 0);
-
-        return $buffer;
-    }
-
-    /**
-     * Parse HTTP request into an array
-     *
-     * @param string $header HTTP request as a string
-     * @return array Headers as a key-value pair array
-     */
-    public static function parseHeaders($header) {
-        $retVal = array();
-        $fields = explode("\r\n", preg_replace('/\x0D\x0A[\x09\x20]+/', ' ', $header));
-        foreach ($fields as $field) {
-            if (preg_match('/([^:]+): (.+)/m', $field, $match)) {
-                $match[1] = preg_replace_callback('/(?<=^|[\x09\x20\x2D])./', function($matches){return strtoupper($matches[0]);}, strtolower(trim($match[1])));
-                if (isset($retVal[$match[1]])) {
-                    $retVal[$match[1]] = array($retVal[$match[1]], $match[2]);
-                } else {
-                    $retVal[$match[1]] = trim($match[2]);
-                }
-            }
-        }
-
-        if (preg_match("/GET (.*) HTTP/", $header, $match)) {
-            $retVal['GET'] = $match[1];
-        }
-
-        return $retVal;
-    }
-
-    public static function calcHybiResponse($challenge) {
-        return base64_encode(sha1($challenge . '258EAFA5-E914-47DA-95CA-C5AB0DC85B11', true));
-    }
-
-    /**
-     * Calculate the #76 draft key based on the 2 challenges from the client and the last 8 bytes of the request
-     *
-     * @param string $key1 Sec-WebSocket-Key1
-     * @param string $key2 Sec-Websocket-Key2
-     * @param string $l8b Last 8 bytes of the client's opening handshake
-     */
-    public static function calcHixieResponse($key1, $key2, $l8b) {
-        // Get the numbers from the opening handshake
-        $numbers1 = preg_replace("/[^0-9]/", "", $key1);
-        $numbers2 = preg_replace("/[^0-9]/", "", $key2);
-
-        //Count spaces
-        $spaces1 = substr_count($key1, " ");
-        $spaces2 = substr_count($key2, " ");
-
-        if ($spaces1 == 0 || $spaces2 == 0) {
-            throw new WebSocketInvalidKeyException($key1, $key2, $l8b);
-            return null;
-        }
-
-        // Key is the number divided by the amount of spaces expressed as a big-endian 32 bit integer
-        $key1_sec = pack("N", $numbers1 / $spaces1);
-        $key2_sec = pack("N", $numbers2 / $spaces2);
-
-        // The response is the md5-hash of the 2 keys and the last 8 bytes of the opening handshake, expressed as a binary string
-        return md5($key1_sec . $key2_sec . $l8b, 1);
-    }
-
-    public static function randHybiKey() {
-        return base64_encode(
-                chr(rand(0, 255)) . chr(rand(0, 255)) . chr(rand(0, 255)) . chr(rand(0, 255))
-                . chr(rand(0, 255)) . chr(rand(0, 255)) . chr(rand(0, 255)) . chr(rand(0, 255))
-                . chr(rand(0, 255)) . chr(rand(0, 255)) . chr(rand(0, 255)) . chr(rand(0, 255))
-                . chr(rand(0, 255)) . chr(rand(0, 255)) . chr(rand(0, 255)) . chr(rand(0, 255))
-        );
-    }
-
-    /**
-     * Output a line to stdout
-     *
-     * @param string $msg Message to output to the STDOUT
-     */
-    public static function say($msg = "") {
-        echo date("Y-m-d H:i:s") . " | " . $msg . "\n";
-    }
-
-    // mamta
-    public static function genKey3() {
-        return "" . chr(rand(0, 255)) . chr(rand(0, 255)) . chr(rand(0, 255)) . chr(rand(0, 255))
-                . chr(rand(0, 255)) . chr(rand(0, 255)) . chr(rand(0, 255)) . chr(rand(0, 255));
-    }
-
-    public static function randHixieKey() {
-        $_MAX_INTEGER = (1 << 32) - 1;
-        #$_AVAILABLE_KEY_CHARS = range(0x21, 0x2f + 1) + range(0x3a, 0x7e + 1);
-        #$_MAX_CHAR_BYTE = (1<<8) -1;
-        # $spaces_n = 2;
-        $spaces_n = rand(1, 12); // random.randint(1, 12)
-        $max_n = $_MAX_INTEGER / $spaces_n;
-        # $number_n = 123456789;
-        $number_n = rand(0, $max_n); // random.randint(0, max_n)
-        $product_n = $number_n * $spaces_n;
-        $key_n = "" . $product_n;
-        # $range = 3; //
-        $range = rand(1, 12);
-        for ($i = 0; $i < $range; $i++) {
-            #i in range(random.randint(1, 12)):
-            if (rand(0, 1) > 0) {
-                $c = chr(rand(0x21, 0x2f + 1)); #random.choice(_AVAILABLE_KEY_CHARS)
-            } else {
-                $c = chr(rand(0x3a, 0x7e + 1)); #random.choice(_AVAILABLE_KEY_CHARS)
-            }
-            # $c = chr(65);
-            $len = strlen($key_n);
-            # $pos = 2;
-            $pos = rand(0, $len);
-            $key_n1 = substr($key_n, 0, $pos);
-            $key_n2 = substr($key_n, $pos);
-            $key_n = $key_n1 . $c . $key_n2;
-        }
-        for ($i = 0; $i < $spaces_n; $i++) {
-            $len = strlen($key_n);
-            # $pos = 2;
-            $pos = rand(1, $len - 1);
-            $key_n1 = substr($key_n, 0, $pos);
-            $key_n2 = substr($key_n, $pos);
-            $key_n = $key_n1 . " " . $key_n2;
-        }
-
-        return new HixieKey($number_n, $key_n);
-    }
-
-}
diff --git a/core/src/plugins/core.mq/vendor/phpws/websocket.message.php b/core/src/plugins/core.mq/vendor/phpws/websocket.message.php
deleted file mode 100644
index ba5875fe1c..0000000000
--- a/core/src/plugins/core.mq/vendor/phpws/websocket.message.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-
-/**
- * 
- * Interface for incoming and outgoing messages
- * @author Chris
- *
- */
-interface IWebSocketMessage {
-
-    /**
-     * Retreive an array of frames of which this message is composed
-     * 
-     * @return WebSocketFrame[]
-     */
-    public function getFrames();
-
-    /**
-     * Set the body of the message 
-     * This should recompile the array of frames
-     * @param string $data
-     */
-    public function setData($data);
-
-    /**
-     * Retreive the body of the message
-     * @return string
-     */
-    public function getData();
-
-    /**
-     * Create a new message
-     * @param string $data Content of the message to be created
-     */
-    public static function create($data);
-
-    /**
-     * Check if we have received the last frame of the message
-     *  
-     * @return bool
-     */
-    public function isFinalised();
-
-    /**
-     * Create a message from it's first frame
-     * @param IWebSocketFrame $frame
-     * @throws Exception
-     */
-    public static function fromFrame(IWebSocketFrame $frame);
-}
-
-/**
- * WebSocketMessage compatible with the Hixie Draft #76
- * Used for backwards compatibility with older versions of Chrome and
- * several Flash fallback solutions
- * 
- * @author Chris
- */
-class WebSocketMessage76 implements IWebSocketMessage {
-
-    protected $data = '';
-    protected $frame = null;
-
-    public static function create($data) {
-        $o = new self();
-
-        $o->setData($data);
-        return $o;
-    }
-
-    public function getFrames() {
-        $arr = array();
-
-        $arr[] = $this->frame;
-
-        return $arr;
-    }
-
-    public function setData($data) {
-        $this->data = $data;
-        $this->frame = WebSocketFrame76::create(WebSocketOpcode::TextFrame, $data);
-    }
-
-    public function getData() {
-        return $this->frame->getData();
-    }
-
-    public function isFinalised() {
-        return true;
-    }
-
-    /**
-     * Creates a new WebSocketMessage76 from a IWebSocketFrame
-     * @param IWebSocketFrame $frame
-     * 
-     * @return WebSocketMessage76 Message composed of the frame provided
-     */
-    public static function fromFrame(IWebSocketFrame $frame) {
-        $o = new self();
-        $o->frame = $frame;
-
-        return $o;
-    }
-
-}
-
-/**
- * WebSocketMessage compatible with the latest draft.
- * Should be updated to keep up with the latest changes.
- * 
- * @author Chris
- *
- */
-class WebSocketMessage implements IWebSocketMessage {
-
-    /**
-     * 
-     * Enter description here ...
-     * @var WebSocketFrame[];
-     */
-    protected $frames = array();
-    protected $data = '';
-
-    public function setData($data) {
-        $this->data = $data;
-
-        $this->createFrames();
-    }
-
-    public static function create($data) {
-        $o = new self();
-
-        $o->setData($data);
-        return $o;
-    }
-
-    public function getData() {
-        if ($this->isFinalised() == false)
-            throw new WebSocketMessageNotFinalised($this);
-
-        $data = '';
-
-        foreach ($this->frames as $frame) {
-            $data .= $frame->getData();
-        }
-
-        return $data;
-    }
-
-    public static function fromFrame(IWebSocketFrame $frame) {
-        $o = new self();
-        $o->takeFrame($frame);
-
-        return $o;
-    }
-
-    protected function createFrames() {
-        $this->frames = array(WebSocketFrame::create(WebSocketOpcode::TextFrame, $this->data));
-    }
-
-    public function getFrames() {
-        return $this->frames;
-    }
-
-    public function isFinalised() {
-        if (count($this->frames) == 0)
-            return false;
-
-        return $this->frames[count($this->frames) - 1]->isFinal();
-    }
-
-    /**
-     * Append a frame to the message
-     * @param unknown_type $frame
-     */
-    public function takeFrame(WebSocketFrame $frame) {
-        $this->frames[] = $frame;
-    }
-
-}
\ No newline at end of file
diff --git a/core/src/plugins/core.mq/vendor/phpws/websocket.protocol.php b/core/src/plugins/core.mq/vendor/phpws/websocket.protocol.php
deleted file mode 100644
index 88829931b9..0000000000
--- a/core/src/plugins/core.mq/vendor/phpws/websocket.protocol.php
+++ /dev/null
@@ -1,358 +0,0 @@
-<?php
-
-class WebSocketConnectionFactory {
-
-    public static function fromSocketData(WebSocketSocket $socket, $data) {
-        $headers = WebSocketFunctions::parseHeaders($data);
-
-        if (isset($headers['Sec-Websocket-Key1'])) {
-            $s = new WebSocketConnectionHixie($socket, $headers, $data);
-            $s->sendHandshakeResponse();
-        } else if (strpos($data, '<policy-file-request/>') === 0) {
-            $s = new WebSocketConnectionFlash($socket, $data);
-        } else {
-            $s = new WebSocketConnectionHybi($socket, $headers);
-            $s->sendHandshakeResponse();
-        }
-
-        $s->setRole(WebSocketConnectionRole::SERVER);
-
-
-        return $s;
-    }
-
-}
-
-class WebSocketConnectionRole {
-
-    const CLIENT = 0;
-    const SERVER = 1;
-
-}
-
-interface IWebSocketConnection {
-
-    public function sendHandshakeResponse();
-
-    public function setRole($role);
-
-    public function readFrame($data);
-
-    public function sendFrame(IWebSocketFrame $frame);
-
-    public function sendMessage(IWebSocketMessage $msg);
-
-    public function sendString($msg);
-
-    public function getHeaders();
-
-    public function getUriRequested();
-
-    public function getCookies();
-
-    public function getIp();
-
-    public function disconnect();
-}
-
-abstract class WebSocketConnection implements IWebSocketConnection {
-
-    protected $_headers = array();
-
-    /**
-     *
-     * @var WebSocketSocket
-     */
-    protected $_socket = null;
-    protected $_cookies = array();
-    public $parameters = null;
-    protected $_role = WebSocketConnectionRole::CLIENT;
-
-    public function __construct(WebSocketSocket $socket, array $headers) {
-        $this->setHeaders($headers);
-        $this->_socket = $socket;
-    }
-
-    public function getIp() {
-        return stream_socket_get_name($this->_socket->getResource(), true);
-    }
-
-    public function getId() {
-        return (int) $this->_socket->getResource();
-    }
-
-    public function sendFrame(IWebSocketFrame $frame) {
-        if ($this->_socket->write($frame->encode()) === false)
-            return FALSE;
-    }
-
-    public function sendMessage(IWebSocketMessage $msg) {
-        foreach ($msg->getFrames() as $frame) {
-            if ($this->sendFrame($frame) === false)
-                return FALSE;
-        }
-
-        return TRUE;
-    }
-
-    public function getHeaders() {
-        return $this->_headers;
-    }
-
-    public function setHeaders($headers) {
-        $this->_headers = $headers;
-
-        if (array_key_exists('Cookie', $this->_headers) && is_array($this->_headers['Cookie'])) {
-            $this->cookie = array();
-        } else {
-            if (array_key_exists("Cookie", $this->_headers)) {
-                $this->_cookies = WebSocketFunctions::cookie_parse($this->_headers['Cookie']);
-            }
-            else
-                $this->_cookies = array();
-        }
-
-        $this->getQueryParts();
-    }
-
-    public function getCookies() {
-        return $this->_cookies;
-    }
-
-    public function getUriRequested() {
-        if (array_key_exists('GET', $this->_headers))
-            return $this->_headers['GET'];
-        else
-            return null;
-    }
-
-    public function setRole($role) {
-        $this->_role = $role;
-    }
-
-    protected function getQueryParts() {
-        $url = $this->getUriRequested();
-
-        // We dont have an URL to process (this is the case for the client)
-        if ($url == null)
-            return;
-
-        if (($pos = strpos($url, "?")) == -1) {
-            $this->parameters = array();
-        }
-
-        $q = substr($url, strpos($url, "?") + 1);
-
-        $kvpairs = explode("&", $q);
-        $this->parameters = array();
-
-        foreach ($kvpairs as $kv) {
-            if (strpos($kv, "=") == -1)
-                continue;
-
-            @list($k, $v) = explode("=", $kv);
-
-            $this->parameters[urldecode($k)] = urldecode($v);
-        }
-    }
-
-    public function getAdminKey() {
-        return isset($this->_headers['Admin-Key']) ? $this->_headers['Admin-Key'] : null;
-    }
-
-    public function getSocket() {
-        return $this->_socket;
-    }
-
-}
-
-class WebSocketConnectionFlash {
-
-    public function __construct($socket, $data) {
-        $this->_socket = $socket;
-        $this->_socket->onFlashXMLRequest($this);
-    }
-
-    public function sendString($msg) {
-        $this->_socket->write($msg);
-    }
-
-    public function disconnect() {
-        $this->_socket->disconnect();
-    }
-
-}
-
-class WebSocketConnectionHybi extends WebSocketConnection {
-
-    private $_openMessage = null;
-    private $lastFrame = null;
-
-    public function sendHandshakeResponse() {
-        // Check for newer handshake
-        $challenge = isset($this->_headers['Sec-Websocket-Key']) ? $this->_headers['Sec-Websocket-Key'] : null;
-
-        // Build response
-        $response = "HTTP/1.1 101 WebSocket Protocol Handshake\r\n" . "Upgrade: WebSocket\r\n" . "Connection: Upgrade\r\n";
-
-        // Build HYBI response
-        $response .= "Sec-WebSocket-Accept: " . WebSocketFunctions::calcHybiResponse($challenge) . "\r\n\r\n";
-
-        $this->_socket->write($response);
-
-        WebSocketFunctions::say("HYBI Response SENT!");
-    }
-
-    public function readFrame($data) {
-        $frames = array();
-        while (!empty($data)) {
-            $frame = WebSocketFrame::decode($data, $this->lastFrame);
-            if ($frame->isReady()) {
-
-                if (WebSocketOpcode::isControlFrame($frame->getType()))
-                    $this->processControlFrame($frame);
-                else
-                    $this->processMessageFrame($frame);
-
-                $this->lastFrame = null;
-            } else {
-                $this->lastFrame = $frame;
-            }
-
-            $frames[] = $frame;
-        }
-
-        return $frames;
-    }
-
-    public function sendFrame(IWebSocketFrame $frame) {
-        /**
-         * @var WebSocketFrame
-         */
-        $hybiFrame = $frame;
-
-        // Mask IFF client!
-        $hybiFrame->setMasked($this->_role == WebSocketConnectionRole::CLIENT);
-
-        parent::sendFrame($hybiFrame);
-    }
-
-    /**
-     * Process a Message Frame
-     *
-     * Appends or creates a new message and attaches it to the user sending it.
-     *
-     * When the last frame of a message is received, the message is sent for processing to the
-     * abstract WebSocket::onMessage() method.
-     *
-     * @param IWebSocketUser $user
-     * @param WebSocketFrame $frame
-     */
-    protected function processMessageFrame(WebSocketFrame $frame) {
-        if ($this->_openMessage && $this->_openMessage->isFinalised() == false) {
-            $this->_openMessage->takeFrame($frame);
-        } else {
-            $this->_openMessage = WebSocketMessage::fromFrame($frame);
-        }
-
-        if ($this->_openMessage && $this->_openMessage->isFinalised()) {
-            $this->_socket->onMessage($this->_openMessage);
-            $this->_openMessage = null;
-        }
-    }
-
-    /**
-     * Handle incoming control frames
-     *
-     * Sends Pong on Ping and closes the connection after a Close request.
-     *
-     * @param IWebSocketUser $user
-     * @param WebSocketFrame $frame
-     */
-    protected function processControlFrame(WebSocketFrame $frame) {
-        switch ($frame->getType()) {
-            case WebSocketOpcode::CloseFrame :
-                $frame = WebSocketFrame::create(WebSocketOpcode::CloseFrame);
-                $this->sendFrame($frame);
-
-                $this->_socket->disconnect();
-                break;
-            case WebSocketOpcode::PingFrame :
-                $frame = WebSocketFrame::create(WebSocketOpcode::PongFrame);
-                $this->sendFrame($frame);
-                break;
-        }
-    }
-
-    public function sendString($msg) {
-        try {
-            $m = WebSocketMessage::create($msg);
-
-            return $this->sendMessage($m);
-        } catch (Exception $e) {
-            $this->disconnect();
-        }
-    }
-
-    public function disconnect() {
-        $f = WebSocketFrame::create(WebSocketOpcode::CloseFrame);
-        $this->sendFrame($f);
-
-        $this->_socket->disconnect();
-    }
-
-}
-
-class WebSocketConnectionHixie extends WebSocketConnection {
-
-    private $_clientHandshake;
-
-    public function __construct(WebSocketSocket $socket, array $headers, $clientHandshake) {
-        $this->_clientHandshake = $clientHandshake;
-        parent::__construct($socket, $headers);
-    }
-
-    public function sendHandshakeResponse() {
-        // Last 8 bytes of the client's handshake are used for key calculation later
-        $l8b = substr($this->_clientHandshake, -8);
-
-        // Check for 2-key based handshake (Hixie protocol draft)
-        $key1 = isset($this->_headers['Sec-Websocket-Key1']) ? $this->_headers['Sec-Websocket-Key1'] : null;
-        $key2 = isset($this->_headers['Sec-Websocket-Key2']) ? $this->_headers['Sec-Websocket-Key2'] : null;
-
-        // Origin checking (TODO)
-        $origin = isset($this->_headers['Origin']) ? $this->_headers['Origin'] : null;
-        $host = $this->_headers['Host'];
-        $location = $this->_headers['GET'];
-
-        // Build response
-        $response = "HTTP/1.1 101 WebSocket Protocol Handshake\r\n" . "Upgrade: WebSocket\r\n" . "Connection: Upgrade\r\n";
-
-        // Build HIXIE response
-        $response .= "Sec-WebSocket-Origin: $origin\r\n" . "Sec-WebSocket-Location: ws://{$host}$location\r\n";
-        $response .= "\r\n" . WebSocketFunctions::calcHixieResponse($key1, $key2, $l8b);
-
-        $this->_socket->write($response);
-        echo "HIXIE Response SENT!";
-    }
-
-    public function readFrame($data) {
-        $f = WebSocketFrame76::decode($data);
-        $m = WebSocketMessage76::fromFrame($f);
-
-        $this->_socket->onMessage($m);
-
-        return array($f);
-    }
-
-    public function sendString($msg) {
-        $m = WebSocketMessage76::create($msg);
-
-        return $this->sendMessage($m);
-    }
-
-    public function disconnect() {
-        $this->_socket->disconnect();
-    }
-
-}
diff --git a/core/src/plugins/core.mq/vendor/phpws/websocket.resources.php b/core/src/plugins/core.mq/vendor/phpws/websocket.resources.php
deleted file mode 100644
index 0dd9881b1a..0000000000
--- a/core/src/plugins/core.mq/vendor/phpws/websocket.resources.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-interface IWebSocketUriHandler {
-
-    public function addConnection(IWebSocketConnection $user);
-
-    public function removeConnection(IWebSocketConnection $user);
-
-    public function onMessage(IWebSocketConnection $user, IWebSocketMessage $msg);
-
-    public function onAdminMessage(IWebSocketConnection $user, IWebSocketMessage $msg);
-
-    public function setServer(WebSocketServer $server);
-
-    public function getConnections();
-}
-
-abstract class WebSocketUriHandler implements IWebSocketUriHandler {
-
-    /**
-     *
-     * Enter description here ...
-     * @var SplObjectStorage
-     */
-    protected $users;
-
-    /**
-     *
-     * Enter description here ...
-     * @var WebSocketServer
-     */
-    protected $server;
-
-    public function __construct() {
-        $this->users = new SplObjectStorage();
-    }
-
-    public function addConnection(IWebSocketConnection $user) {
-        $this->users->attach($user);
-    }
-
-    public function removeConnection(IWebSocketConnection $user) {
-        $this->users->detach($user);
-        $this->onDisconnect($user);
-    }
-
-    public function setServer(WebSocketServer $server) {
-        $this->server = $server;
-    }
-
-    public function say($msg = '') {
-        return $this->server->say($msg);
-    }
-
-    public function send(IWebSocketConnection $client, $str) {
-        return $client->sendString($str);
-    }
-
-    public function onDisconnect(IWebSocketConnection $user) {
-        
-    }
-
-    public function onMessage(IWebSocketConnection $user, IWebSocketMessage $msg) {
-        
-    }
-
-    public function onAdminMessage(IWebSocketConnection $user, IWebSocketMessage $msg) {
-        
-    }
-
-    //abstract public function onMessage(WebSocketUser $user, IWebSocketMessage $msg);
-
-    public function getConnections() {
-        return $this->users;
-    }
-
-}
\ No newline at end of file
diff --git a/core/src/plugins/core.mq/vendor/phpws/websocket.server.php b/core/src/plugins/core.mq/vendor/phpws/websocket.server.php
deleted file mode 100644
index 42647bf72f..0000000000
--- a/core/src/plugins/core.mq/vendor/phpws/websocket.server.php
+++ /dev/null
@@ -1,467 +0,0 @@
-<?php
-
-require_once("websocket.functions.php");
-require_once("websocket.exceptions.php");
-require_once("websocket.socket.php");
-require_once("websocket.framing.php");
-require_once("websocket.message.php");
-require_once("websocket.resources.php");
-
-
-interface IWebSocketServerObserver {
-
-    public function onConnect(IWebSocketConnection $user);
-
-    public function onMessage(IWebSocketConnection $user, IWebSocketMessage $msg);
-
-    public function onDisconnect(IWebSocketConnection $user);
-
-    public function onAdminMessage(IWebSocketConnection $user, IWebSocketMessage $msg);
-}
-
-/**
- * WebSocketServer
- *
- * @author Chris
- */
-class WebSocketServer implements WebSocketObserver {
-
-    protected $master;
-    protected $_url;
-
-    /**
-     *
-     * Enter description here ...
-     * @var SplObjectStorage
-     */
-    protected $sockets;
-    protected $_connections = array();
-
-    /**
-     * @var IWebSocketServerObserver[]
-     */
-    protected $_observers = array();
-    protected $debug = true;
-    protected $purgeUserTimeOut = null;
-    protected $_context = null;
-    protected $adminKey;
-
-    /**
-     *
-     * Enter description here ...
-     * @var IWebSocketUriHandler[]
-     */
-    protected $uriHandlers = array();
-
-    /**
-     * Flash-policy-response for flashplayer/flashplugin
-     * @access protected
-     * @var string
-     */
-    protected $FLASH_POLICY_FILE = "<cross-domain-policy><allow-access-from domain=\"*\" to-ports=\"*\" /></cross-domain-policy>\0";
-
-    /**
-     * Handle incoming messages.
-     *
-     * Must be implemented by all extending classes
-     *
-     * @param IWebSocketUser $user The user which sended the message
-     * @param IWebSocketMessage $msg The message that was received (can be WebSocketMessage76 or WebSocketMessage)
-     */
-    public function __construct($url, $adminKey) {
-        $this->adminKey = $adminKey;
-
-        $this->_url = $url;
-
-        $this->sockets = new SplObjectStorage();
-        $this->_connections = new SplObjectStorage();
-
-        $this->_context = stream_context_create();
-    }
-
-    public function getStreamContext() {
-        return $this->_context;
-    }
-
-    public function setStreamContext($context) {
-        $this->_context = $context;
-    }
-
-    /**
-     * Unassociate a request uri to a IWebSocketResourceHandler.
-     *
-     * @param string $script For example 'handler1' to capture request with URI '/handler1/'
-     * @param $disconnectUsers if true, disconnect users assosiated to handler.
-     */
-    public function removeUriHandler($script, $disconnectUsers = true) {
-
-        if (empty($this->uriHandlers[$script]))
-            return false;
-        $handler = $this->uriHandlers[$script];
-        unset($this->uriHandlers[$script]);
-
-        if ($disconnectUsers)
-            foreach ($handler->getConnections() as $user) {
-
-                $handler->removeConnection($user);
-                $user->disconnect();
-            }
-
-        return $handler;
-    }
-
-    /**
-     * Start the server
-     */
-    public function run() {
-
-        error_reporting(E_ALL);
-        set_time_limit(0);
-
-        ob_implicit_flush();
-
-
-        $err = $errno = 0;
-
-        $port = parse_url($this->_url, PHP_URL_PORT);
-
-
-        $this->FLASH_POLICY_FILE = str_replace('to-ports="*', 'to-ports="' . $port, $this->FLASH_POLICY_FILE);
-
-        $this->master = stream_socket_server($this->_url, $errno, $err, STREAM_SERVER_BIND | STREAM_SERVER_LISTEN, $this->_context);
-
-        $this->say("PHP WebSocket Server");
-        $this->say("========================================");
-        $this->say("Server Started : " . date('Y-m-d H:i:s'));
-        $this->say("Listening on   : " . $this->_url);
-        $this->say("========================================");
-
-        if ($this->master == false) {
-            $this->say("Error: $err");
-            return;
-        }
-
-        $this->sockets->attach(new WebSocketSocket($this, $this->master));
-
-
-        while (true) {
-
-            clearstatcache();
-            // Garbage Collection (PHP >= 5.3)
-            if (function_exists('gc_collect_cycles')) {
-                gc_collect_cycles();
-            }
-
-            //$this->debug("Blocking on socket_select()");
-            // Retreive sockets which are 'Changed'
-            $changed = $this->getResources();
-            $write = $this->getWriteStreams();
-            $except = null;
-
-            if (@stream_select($changed, $write, $except, NULL) === false) {
-                $this->say("Select failed!");
-                break;
-            }
-
-
-            //$this->debug("Socket selected");
-
-
-            foreach ($changed as $resource) {
-
-                if ($resource == $this->master) {
-                    $this->acceptSocket();
-                } else {
-                    $buffer = WebSocketFunctions::readWholeBuffer($resource);
-
-                    $socket = $this->getSocketByResource($resource);
-
-                    // If read returns false, close the stream and continue with the next socket
-                    if ($buffer === false) {
-                        $socket->close();
-                        // Skip to next stream
-                        continue;
-                    }
-
-                    $bytes = strlen($buffer);
-
-                    if ($bytes === 0) {
-                        $socket->close();
-                    } else if ($socket != null) {
-                        $socket->onData($buffer);
-                    }
-                }
-            }
-
-            if (is_array($write)) {
-                foreach ($write as $s) {
-                    $o = $this->getSocketByResource($s);
-                    if ($o != null)
-                        $o->mayWrite();
-                }
-            }
-
-
-            //$this->debug('Number of users connected: '.count($this->getConnections()));
-            $this->purgeUsers();
-        }
-    }
-
-    private function acceptSocket() {
-        try {
-            $client = stream_socket_accept($this->master);
-            if ($client === false) {
-                WebSocketFunctions::say('socket_accept() failed');
-            }
-
-            $this->sockets->attach(new WebSocketSocket($this, $client));
-
-            $this->debug("Socket accepted");
-        } catch (Exception $e) {
-            $this->say($e);
-        }
-    }
-
-    /**
-     *
-     * @param resource $res
-     * @return WebSocketSocket
-     */
-    private function getSocketByResource($res) {
-        foreach ($this->sockets as $socket) {
-            if ($socket->getResource() == $res)
-                return $socket;
-        }
-    }
-
-    private function getResources() {
-        $resources = array();
-
-        foreach ($this->sockets as $socket) {
-            $resources[] = $socket->getResource();
-        }
-
-        return $resources;
-    }
-
-    /**
-     * Dispatch an admin message to the associated resource handler or to the servers prefixed onAdmin functions
-
-     * @param WebSocketAdminUser $user
-     * @param stdClass $obj
-     */
-    protected function dispatchAdminMessage(IWebSocketConnection $user, IWebSocketMessage $msg) {
-
-        if (array_key_exists($this->_connections[$user], $this->uriHandlers)) {
-            $this->uriHandlers[$this->_connections[$user]]->onAdminMessage($user, $msg);
-        }
-
-        foreach ($this->_observers as $o) {
-            $o->onAdminMessage($user, $msg);
-        }
-    }
-
-    public function addObserver(IWebSocketServerObserver $o) {
-        $this->_observers[] = $o;
-    }
-
-    /**
-     * Associate a request uri to a IWebSocketResourceHandler.
-     *
-     * @param string $script For example 'handler1' to capture request with URI '/handler1/'
-     * @param IWebSocketResourceHandler $handler Instance of a IWebSocketResourceHandler. This instance will receive the messages.
-     */
-    public function addUriHandler($script, IWebSocketUriHandler $handler) {
-        $this->uriHandlers[$script] = $handler;
-        $handler->setServer($this);
-    }
-
-    /**
-     * Dispatch incoming message to the associated resource and to the general onMessage event handler
-
-     * @param IWebSocketUser $user
-     * @param IWebSocketMessage $msg
-     */
-    protected function dispatchMessage(IWebSocketConnection $user, IWebSocketMessage $msg) {
-        $this->debug("dispatchMessage");
-
-        if (array_key_exists($this->_connections[$user], $this->uriHandlers)) {
-            $this->uriHandlers[$this->_connections[$user]]->onMessage($user, $msg);
-        }
-
-        foreach ($this->_observers as $o) {
-            $o->onMessage($user, $msg);
-        }
-    }
-
-    /**
-     * Adds a user to a IWebSocketResourceHandler by using the request uri in the GET request of
-     * the client's opening handshake
-     *
-     * @param IWebSocketUser $user
-     * @param array $headers
-     * @return IWebSocketResourceHandler Instance of the resource handler the user has been added to.
-     */
-    protected function addConnectionToUriHandler(WebSocketConnection $user, $uri) {
-        $url = parse_url($uri);
-
-        if (isset($url['query']))
-            parse_str($url['query'], $query);
-        else
-            $query = array();
-
-        if (isset($url['path']) == false)
-            $url['path'] = '/';
-
-        $pathSplit = preg_split("/\//", $url['path'], 0, PREG_SPLIT_NO_EMPTY);
-        $resource = array_pop($pathSplit);
-
-        $user->parameters = $query;
-
-
-        if (array_key_exists($resource, $this->uriHandlers)) {
-            $this->uriHandlers[$resource]->addConnection($user);
-            $this->_connections[$user] = $resource;
-
-            $this->say("User has been added to $resource");
-        }
-    }
-
-    /**
-     * Find the user associated with the socket
-     *
-     * @param socket $socket
-     * @return IWebSocketUser User associated with the socket, returns null when none found
-     */
-    protected function getUserBySocket($socket) {
-        $found = null;
-        foreach ($this->users as $user) {
-            if ($user->getSocket() == $socket) {
-                $found = $user;
-                break;
-            }
-        }
-        return $found;
-    }
-
-    /**
-     * Output a line to stdout
-     *
-     * @param string $msg Message to output to the STDOUT
-     */
-    public function say($msg = "") {
-        echo date("Y-m-d H:i:s") . " | " . $msg . "\n";
-    }
-
-    public function onConnectionEstablished(WebSocketSocket $s) {
-        $con = $s->getConnection();
-        $this->_connections->attach($con);
-
-        $uri = $con->getUriRequested();
-
-        $this->addConnectionToUriHandler($con, $uri);
-
-        foreach ($this->_observers as $o) {
-            /**
-             * @var @o IWebSocketServerObserver
-             */
-            $o->onConnect($con);
-        }
-    }
-
-    public function onMessage(IWebSocketConnection $connection, IWebSocketMessage $msg) {
-        try {
-            if ($connection->getAdminKey() == $this->getAdminKey())
-                $this->dispatchAdminMessage($connection, $msg);
-            else
-                $this->dispatchMessage($connection, $msg);
-        } catch (Exception $e) {
-            $this->say("Exception occurred while handling message:\r\n" . $e->getTraceAsString());
-        }
-    }
-
-    public function onDisconnect(WebSocketSocket $socket) {
-        $con = $socket->getConnection();
-        try {
-            if ($con) {
-                $handler = $this->_connections[$con];
-
-                if ($handler)
-                    $this->uriHandlers[$handler]->removeConnection($con);
-
-                $this->_connections->detach($socket->getConnection());
-            }
-        } catch (Exception $e) {
-            $this->say("Exception occurred while handling message:\r\n" . $e->getTraceAsString());
-        }
-
-
-        if ($con instanceof IWebSocketConnection) {
-            foreach ($this->_observers as $o) {
-                /**
-                 * @var @o IWebSocketServerObserver
-                 */
-                $o->onDisconnect($con);
-            }
-        }
-
-        $this->sockets->detach($socket);
-    }
-
-    protected function purgeUsers() {
-        $currentTime = time();
-
-        if ($this->purgeUserTimeOut == NULL)
-            return;
-
-        foreach ($this->_sockets as $s) {
-            if ($currentTime - $s->getLastChanged() > $this->purgeUserTimeOut) {
-                $s->disconnect();
-                $this->onDisconnect($s);
-            }
-        }
-    }
-
-    public function getConnections() {
-        return $this->_connections;
-    }
-
-    public function debug($msg) {
-        if ($this->debug)
-            echo date("Y-m-d H:i:s") . " | " . $msg . "\n";
-    }
-
-    public function onFlashXMLRequest(WebSocketConnectionFlash $connection) {
-        $connection->sendString($this->FLASH_POLICY_FILE);
-        $connection->disconnect();
-    }
-
-    protected function getWriteStreams() {
-        $resources = array();
-
-        foreach ($this->sockets as $socket) {
-            if ($socket->mustWrite())
-                $resources[] = $socket->getResource();
-        }
-
-        return $resources;
-    }
-
-    protected function getAdminKey() {
-        return $this->adminKey;
-    }
-
-    public function isAdmin(WebSocketConnection $con) {
-        return $this->getAdminKey() === $con->getAdminKey();
-    }
-
-    /**
-     *
-     * @param IWebSocketUriHandler $uri
-     */
-    public function getUriHandler($uri) {
-        return $this->uriHandlers[$uri];
-    }
-
-}
-
diff --git a/core/src/plugins/core.mq/vendor/phpws/websocket.socket.php b/core/src/plugins/core.mq/vendor/phpws/websocket.socket.php
deleted file mode 100644
index b496bd40b5..0000000000
--- a/core/src/plugins/core.mq/vendor/phpws/websocket.socket.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-
-require_once("websocket.protocol.php");
-
-interface WebSocketObserver {
-
-    public function onDisconnect(WebSocketSocket $s);
-
-    public function onConnectionEstablished(WebSocketSocket $s);
-
-    public function onMessage(IWebSocketConnection $s, IWebSocketMessage $msg);
-
-    public function onFlashXMLRequest(WebSocketConnectionFlash $connection);
-}
-
-class WebSocketSocket {
-
-    private $_socket = null;
-    private $_protocol = null;
-
-    /**
-     *
-     * @var IWebSocketConnection
-     */
-    private $_connection = null;
-    private $_writeBuffer = '';
-    private $_lastChanged = null;
-    private $_disconnecting = false;
-    private $_immediateWrite = false;
-
-    /**
-     *
-     * Enter description here ...
-     * @var WebSocketObserver[]
-     */
-    private $_observers = array();
-
-    public function __construct(WebSocketObserver $server, $socket, $immediateWrite = false) {
-        $this->_socket = $socket;
-        $this->_lastChanged = time();
-        $this->_immediateWrite = $immediateWrite;
-
-        $this->addObserver($server);
-    }
-
-    public function onData($data) {
-        try {
-            $this->_lastChanged = time();
-
-            if ($this->_connection)
-                $this->_connection->readFrame($data);
-            else
-                $this->establishConnection($data);
-        } catch (Exception $e) {
-            $this->disconnect();
-        }
-    }
-
-    public function setConnection(IWebSocketConnection $con) {
-        $this->_connection = $con;
-    }
-
-    public function onMessage(IWebSocketMessage $m) {
-        foreach ($this->_observers as $observer) {
-            $observer->onMessage($this->getConnection(), $m);
-        }
-    }
-
-    public function establishConnection($data) {
-        $this->_connection = WebSocketConnectionFactory::fromSocketData($this, $data);
-
-        if ($this->_connection instanceof WebSocketConnectionFlash)
-            return;
-
-        foreach ($this->_observers as $observer) {
-            $observer->onConnectionEstablished($this);
-        }
-    }
-
-    public function write($data) {
-        $this->_writeBuffer .= $data;
-
-        if ($this->_immediateWrite == true) {
-            while ($this->_writeBuffer != '')
-                $this->mayWrite();
-        }
-    }
-
-    public function mustWrite() {
-        return strlen($this->_writeBuffer);
-    }
-
-    public function mayWrite() {
-        if (strlen($this->_writeBuffer) > 4096) {
-            $buff = substr($this->_writeBuffer, 0, 4096);
-            $this->_writeBuffer = strlen($buff) > 0 ? substr($this->_writeBuffer, 4096) : '';
-        } else {
-            $buff = $this->_writeBuffer;
-            $this->_writeBuffer = '';
-        }
-
-
-        if (WebSocketFunctions::writeWholeBuffer($this->_socket, $buff) == false) {
-            $this->close();
-        }
-
-        if (strlen($this->_writeBuffer) == 0 && $this->isClosing())
-            $this->close();
-    }
-
-    public function getLastChanged() {
-        return $this->_lastChanged;
-    }
-
-    public function onFlashXMLRequest(WebSocketConnectionFlash $connection) {
-        foreach ($this->_observers as $observer) {
-            $observer->onFlashXMLRequest($connection);
-        }
-    }
-
-    public function disconnect() {
-        $this->_disconnecting = true;
-
-        if ($this->_writeBuffer == '')
-            $this->close();
-    }
-
-    public function isClosing() {
-        return $this->_disconnecting;
-    }
-
-    public function close() {
-        fclose($this->_socket);
-        foreach ($this->_observers as $observer) {
-            $observer->onDisconnect($this);
-        }
-    }
-
-    public function getResource() {
-        return $this->_socket;
-    }
-
-    /**
-     *
-     * @return IWebSocketConnection
-     */
-    public function getConnection() {
-        return $this->_connection;
-    }
-
-    public function addObserver(WebSocketObserver $s) {
-        $this->_observers[] = $s;
-    }
-
-}
\ No newline at end of file
diff --git a/core/src/plugins/core.mq/vendor/phpws/websocket.users.php b/core/src/plugins/core.mq/vendor/phpws/websocket.users.php
deleted file mode 100644
index 0fa8b44c4a..0000000000
--- a/core/src/plugins/core.mq/vendor/phpws/websocket.users.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-
-interface IWebSocketUser {
-
-    public function __construct($socket, WebSocketServer $server);
-
-    public function getId();
-
-    public function getResource();
-
-    public function setResource($resource);
-
-    public function isAdmin();
-
-    public function hasHandshaked();
-
-    public function setHandshaked();
-
-    public function getHeaders();
-
-    public function setHeaders($headers);
-
-    public function getLastMessage();
-
-    public function addMessage(IWebSocketMessage $msg);
-
-    public function getLastMessageTime();
-
-    public function getSocket();
-
-    public function getServerInstance();
-
-    public function getIp();
-}
-
-/**
- * TODO: Getters and setters
- *
- * @author Chris
- *
- */
-class WebSocketUser implements IWebSocketUser {
-
-    protected $id;
-    private $socket;
-    private $resource;
-    private $ip;
-
-    /**
-     *
-     * Enter description here ...
-     * @var WebSocketMessage
-     */
-    private $message;
-    private $headers = array();
-    private $cookies = array();
-    private $isAdmin = false;
-    private $lastTime = null;
-    private $_server;
-
-    public function __construct($socket, WebSocketServer $server) {
-        $this->socket = $socket;
-
-        $address = '';
-        if (socket_getpeername($socket, $address) === false)
-            throw new Exception();
-
-        $this->ip = $address;
-        $this->id = uniqid("u-");
-
-        $this->_server = $server;
-
-        $this->lastTime = time();
-    }
-
-    public function getId() {
-        return $this->id;
-    }
-
-    public function getHeaders() {
-        return $this->headers;
-    }
-
-    public function setHeaders($headers) {
-        $this->headers = $headers;
-
-        if (array_key_exists('Cookie', $this->headers) && is_array($this->headers['Cookie'])) {
-            $this->cookie = array();
-        } else {
-            if (array_key_exists("Cookie", $this->headers)) {
-                $this->_cookies = WebSocketFunctions::cookie_parse($this->headers['Cookie']);
-            }
-            else
-                $this->_cookies = array();
-        }
-
-        $this->isAdmin = array_key_exists('Admin-Key', $this->headers) && $this->headers['Admin-Key'] == $this->getServerInstance()->getAdminKey();
-
-        // Incorrect admin-key
-        if ($this->isAdmin == false && array_key_exists('Admin-Key', $this->headers))
-            throw new WebSocketNotAuthorizedException($this);
-    }
-
-    public function hasHandshaked() {
-        return $this->handshaked;
-    }
-
-    public function setHandshaked() {
-        $this->handshaked = true;
-    }
-
-    public function getCookies() {
-        return $this->_cookies;
-    }
-
-    public function setProtocolVersion($version) {
-        $this->protocol = $version;
-    }
-
-    public function getResource() {
-        return $this->resource;
-    }
-
-    public function setResource($resource) {
-        $this->resource = $resource;
-    }
-
-    public function isAdmin() {
-        return $this->isAdmin;
-    }
-
-    public function getLastMessage() {
-        return $this->message;
-    }
-
-    public function getSocket() {
-        return $this->socket;
-    }
-
-    public function getLastMessageTime() {
-        return $this->lastTime;
-    }
-
-    public function getServerInstance() {
-        return $this->_server;
-    }
-
-    public function getIp() {
-        return $this->ip;
-    }
-
-}
\ No newline at end of file
diff --git a/core/src/plugins/core.mq/ws-server.php b/core/src/plugins/core.mq/ws-server.php
deleted file mode 100755
index 3bea28c334..0000000000
--- a/core/src/plugins/core.mq/ws-server.php
+++ /dev/null
@@ -1,188 +0,0 @@
-#!/php -q
-<?php
-// Run from command prompt > php demo.php
-require_once("vendor/phpws/websocket.server.php");
-require_once("../../core/classes/class.HttpClient.php");
-/**
- * This demo resource handler will respond to all messages sent to /echo/ on the socketserver below
- *
- * All this handler does is echoing the responds to the user
- * @author Cdujeu
- * @package AjaXplorer_Plugins
- * @subpackage Core
- */
-class AjaXplorerHandler extends WebSocketUriHandler
-{
-    public function onMessage(IWebSocketConnection $user, IWebSocketMessage $msg)
-    {
-        $this->say("[AJXP] " . strlen($msg->getData()) . " bytes");
-        $data = $msg->getData();
-        if (strpos($data, "register:") === 0) {
-            $regId = substr($data, strlen("register:"));
-            if (is_array($user->ajxpRepositories) && in_array($regId, $user->ajxpRepositories)) {
-                $user->currentRepository = $regId;
-                $this->say("User is registered on channel ".$user->currentRepository);
-            }
-        } else if (strpos($data, "unregister:") === 0) {
-            unset($user->currentRepository);
-        }
-    }
-
-    public function onAdminMessage(IWebSocketConnection $user, IWebSocketMessage $msg)
-    {
-        $this->say("[AJXP] Admin message received!");
-
-        // Echo
-        // $user->sendMessage($msg);
-        $data = unserialize($msg->getData());
-        $repoId = $data["REPO_ID"];
-        $userId = isSet($data["USER_ID"]) ? $data["USER_ID"] : false;
-        $userGroupPath = isSet($data["GROUP_PATH"]) ? $data["GROUP_PATH"] : false;
-        $msg->setData($data["CONTENT"]);
-        foreach ($this->getConnections() as $conn) {
-            if($conn == $user) continue;
-            if ($repoId != "AJXP_REPO_SCOPE_ALL" && (!isSet($conn->currentRepository) || $conn->currentRepository != $repoId)) {
-                $this->say("Skipping, not the same repository");
-                continue;
-            }
-            if ($userId !== false && $conn->ajxpId != $userId) {
-                $this->say("Skipping, not the same userId");
-                continue;
-            }
-            if ($userGroupPath != false && (!isSet($conn->ajxpGroupPath) || $conn->ajxpGroupPath!=$userGroupPath)) {
-                $this->say("Skipping, not the same groupPath");
-                continue;
-            }
-            $this->say("Should dispatch to user ".$conn->ajxpId);
-            $conn->sendMessage($msg);
-        }
-
-
-        //$frame = WebSocketFrame::create(WebSocketOpcode::PongFrame);
-        //$user->sendFrame($frame);
-    }
-
-}
-
-/**
- * Demo socket server. Implements the basic eventlisteners and attaches a resource handler for /echo/ urls.
- *
- *
- * @author Chris
- *
- */
-class AjaxplorerSocketServer implements IWebSocketServerObserver
-{
-    protected $debug = true;
-    protected $server;
-    public static $ADMIN_KEY = "adminsecretkey";
-    protected $host;
-    protected $port;
-    protected $path;
-
-    public function __construct($host, $port, $path)
-    {
-        $this->host = $host;
-        $this->port = $port;
-        $this->path =  trim($path, "/");
-        $this->server = new WebSocketServer("tcp://{$host}:{$port}", self::$ADMIN_KEY);
-        $this->server->addObserver($this);
-        $this->server->addUriHandler($this->path, new AjaXplorerHandler());
-    }
-
-    public function onConnect(IWebSocketConnection $user)
-    {
-        if ($user->getAdminKey() == self::$ADMIN_KEY) {
-            $this->say("[ECHO] Admin user connected");
-            return;
-        }
-
-        $h = $user->getHeaders();
-        /*
-         * @todo
-         * Handle a REST auth instead of cookie based.
-         */
-        $c = WebSocketFunctions::cookie_parse($h["Cookie"]);
-
-        $client = new HttpClient($this->host);
-        $client->cookies = $c;
-        $client->get("/{$this->path}/?get_action=ws_authenticate&key=".self::$ADMIN_KEY);
-        $registry = $client->getContent();
-        //$this->say("[ECHO] Registry loaded".$registry);
-        $xml = new DOMDocument();
-        $xml->loadXML($registry);
-        $xPath = new DOMXPath($xml);
-        $err = $xPath->query("//message[@type='ERROR']");
-        if ($err->length) {
-            $this->say($err->item(0)->firstChild->nodeValue);
-            $user->disconnect();
-        } else {
-            $userRepositories = array();
-            $repos = $xPath->query("/tree/user/repositories/repo");
-            foreach ($repos as $repo) {
-                $repoId = $repo->attributes->getNamedItem("id")->nodeValue;
-                $userRepositories[] = $repoId;
-            }
-            $user->ajxpRepositories = $userRepositories;
-            $user->ajxpId = $xPath->query("/tree/user/@id")->item(0)->nodeValue;
-            if ($xPath->query("/tree/user/@groupPath")->length) {
-                $groupPath = $xPath->query("/tree/user/@groupPath")->item(0)->nodeValue;
-                if(!empty($groupPath)) $user->ajxpGroupPath = $groupPath;
-            }
-        }
-        $this->say("[ECHO] User '".$user->ajxpId."' connected with ".count($user->ajxpRepositories)." registered repositories "/*. print_r($user->ajxpRepositories, true)*/);
-    }
-
-    public function onMessage(IWebSocketConnection $user, IWebSocketMessage $msg)
-    {
-        //$this->say("[ECHO] {$user->getId()} says '{$msg->getData()}'");
-    }
-
-    public function onDisconnect(IWebSocketConnection $user)
-    {
-        //$this->say("[ECHO] {$user->getId()} disconnected");
-    }
-
-    public function onAdminMessage(IWebSocketConnection $user, IWebSocketMessage $msg)
-    {
-        //$this->say("[ECHO] Admin Message received!");
-    }
-
-    public function say($msg)
-    {
-        echo "$msg \r\n";
-    }
-
-    public function run()
-    {
-        $this->server->run();
-    }
-
-}
-
-function usage()
-{
-    echo "You must use the following command: \n > php ws-server.php -host=HOST_IP -port=HOST_PORT [-path=PATH]\n\n";
-}
-
-$optArgs = array();
-$options = array();
-$regex = '/^-(-?)([a-zA-z0-9_]*)=(.*)/';
-foreach ($argv as $key => $argument) {
-    //echo("$key => $argument \n");
-    if (preg_match($regex, $argument, $matches)) {
-        if ($matches[1] == "-") {
-            $optArgs[trim($matches[2])] = trim($matches[3]);
-        } else {
-            $options[trim($matches[2])] = trim($matches[3]);
-        }
-    }
-}
-
-if (!isSet($options["host"]) || !isSet($options["port"])) {
-    usage();
-    exit(0);
-}
-// Start server
-$server = new AjaxplorerSocketServer($options["host"], $options["port"], $options["path"]);
-$server->run();
diff --git a/core/src/plugins/core.notifications/IFeedStore.php b/core/src/plugins/core.notifications/IFeedStore.php
new file mode 100644
index 0000000000..e0b2ce3007
--- /dev/null
+++ b/core/src/plugins/core.notifications/IFeedStore.php
@@ -0,0 +1,127 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Notification\Core;
+
+use Pydio\Core\Model\ContextInterface;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * @package AjaXplorer_Plugins
+ * @subpackage Core
+ */
+interface IFeedStore
+{
+    /**
+     * @abstract
+     * @param string $hookName
+     * @param string $data
+     * @param string $repositoryId
+     * @param string $repositoryScope
+     * @param string $repositoryOwner
+     * @param string $userId
+     * @param string $userGroup
+     * @return void
+     */
+    public function persistEvent($hookName, $data, $repositoryId, $repositoryScope, $repositoryOwner, $userId, $userGroup);
+
+    /**
+     * @abstract
+     * @param array $filterByRepositories
+     * @param $filterByPath
+     * @param string $userGroup
+     * @param integer $offset
+     * @param integer $limit
+     * @param boolean $enlargeToOwned
+     * @param string $userId
+     * @return Notification[]
+     */
+    public function loadEvents($filterByRepositories, $filterByPath, $userGroup, $offset = 0, $limit = 10, $enlargeToOwned = true, $userId);
+
+    /**
+     * Delete feed data
+     * @param string $types
+     * @param null $userId
+     * @param null $repositoryId
+     * @param int $count
+     * @return mixed
+     */
+    public function deleteFeed($types='event', $userId = null, $repositoryId = null, &$count = 0);
+
+    /**
+     * @abstract
+     * @param Notification $notif
+     * @return mixed
+     */
+    public function persistAlert(Notification $notif);
+
+    /**
+     * @abstract
+     * @param $userId
+     * @param null $repositoryIdFilter
+     * @return Notification[]
+     */
+    public function loadAlerts($userId, $repositoryIdFilter = null);
+
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $alertId
+     * @param $occurrences
+     */
+    public function dismissAlertById(ContextInterface $ctx, $alertId, $occurrences = 1);
+
+    /**
+     * @param string $indexPath
+     * @param mixed $data
+     * @param string $repositoryId
+     * @param string $repositoryScope
+     * @param string $repositoryOwner
+     * @param string $userId
+     * @param string $userGroup
+     * @return void
+     */
+    public function persistMetaObject($indexPath, $data, $repositoryId, $repositoryScope, $repositoryOwner, $userId, $userGroup);
+
+    /**
+     * @param $repositoryId
+     * @param $indexPath
+     * @param $userId
+     * @param $userGroup
+     * @param int $offset
+     * @param int $limit
+     * @param string $orderBy
+     * @param string $orderDir
+     * @param bool $recurring
+     * @return mixed
+     */
+    public function findMetaObjectsByIndexPath($repositoryId, $indexPath, $userId, $userGroup, $offset = 0, $limit = 20, $orderBy = "date", $orderDir = "desc", $recurring=true);
+
+    /**
+     * @param $repositoryId
+     * @param $oldPath
+     * @param null $newPath
+     * @param bool $copy
+     * @return mixed
+     */
+    public function updateMetaObject($repositoryId, $oldPath, $newPath = null, $copy = false);
+
+}
diff --git a/core/src/plugins/core.notifications/IMessageExchanger.php b/core/src/plugins/core.notifications/IMessageExchanger.php
new file mode 100644
index 0000000000..7a050b7e9c
--- /dev/null
+++ b/core/src/plugins/core.notifications/IMessageExchanger.php
@@ -0,0 +1,89 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Notification\Core;
+
+use Pydio\Core\Model\ContextInterface;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * @package AjaXplorer_Plugins
+ * @subpackage Core
+ */
+interface IMessageExchanger
+{
+    /**
+     * @abstract
+     * @param ContextInterface $ctx
+     * @param $channelName
+     * @param $clientId
+     * @return mixed
+     */
+    public function suscribeToChannel(ContextInterface $ctx, $channelName, $clientId);
+
+    /**
+     * @abstract
+     * @param ContextInterface $ctx
+     * @param $channelName
+     * @param $clientId
+     * @return mixed
+     */
+    public function unsuscribeFromChannel(ContextInterface $ctx, $channelName, $clientId);
+
+    /**
+     * @abstract
+     * @param ContextInterface $ctx
+     * @param $channelName
+     * @param $clientId
+     * @param $userId
+     * @param $userGroup
+     * @return mixed
+     */
+    public function consumeInstantChannel(ContextInterface $ctx, $channelName, $clientId, $userId, $userGroup);
+
+    /**
+     * @abstract
+     * @param ContextInterface $ctx
+     * @param $channelName
+     * @param $filter
+     * @return mixed
+     */
+    public function consumeWorkerChannel(ContextInterface $ctx, $channelName, $filter = null);
+
+    /**
+     * @abstract
+     * @param ContextInterface $ctx
+     * @param string $channel Name of the persistant queue to create
+     * @param object $message Message to send
+     * @return mixed
+     */
+    public function publishWorkerMessage(ContextInterface $ctx, $channel, $message);
+
+    /**
+     * @abstract
+     * @param ContextInterface $ctx
+     * @param $channel
+     * @param $message
+     * @return mixed
+     */
+    public function publishInstantMessage(ContextInterface $ctx, $channel, $message);
+    
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.notifications/Notification.php b/core/src/plugins/core.notifications/Notification.php
new file mode 100644
index 0000000000..ba81f2b2ef
--- /dev/null
+++ b/core/src/plugins/core.notifications/Notification.php
@@ -0,0 +1,427 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Notification\Core;
+
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Core\Model\ContextProviderInterface;
+
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Vars\StatHelper;
+
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+define('AJXP_NOTIF_NODE_ADD', "add");
+define('AJXP_NOTIF_NODE_DEL', "delete");
+define('AJXP_NOTIF_NODE_CHANGE', "change");
+define('AJXP_NOTIF_NODE_RENAME', "rename");
+define('AJXP_NOTIF_NODE_VIEW', "view");
+define('AJXP_NOTIF_NODE_COPY', "copy");
+define('AJXP_NOTIF_NODE_MOVE', "move");
+define('AJXP_NOTIF_NODE_COPY_TO', "copy_to");
+define('AJXP_NOTIF_NODE_MOVE_TO', "move_to");
+define('AJXP_NOTIF_NODE_COPY_FROM', "copy_from");
+define('AJXP_NOTIF_NODE_MOVE_FROM', "move_from");
+/**
+ * Simple properties container
+ * @package AjaXplorer_Plugins
+ * @subpackage Core
+ */
+class Notification implements ContextProviderInterface
+{
+
+    /**
+     * @var AJXP_Node
+     */
+    public $node;
+    /**
+     * @var String
+     */
+    public $action;
+    /**
+     * @var String
+     */
+    public $author;
+    /**
+     * @var int
+     */
+    public $date;
+    /**
+     * @var string;
+     */
+    public $target;
+
+    /**
+     * @var \Pydio\Access\Core\Model\AJXP_Node
+     */
+    public $secondaryNode;
+
+    /**
+     * @var Notification[]
+     */
+    public $relatedNotifications;
+
+    public static $usersCaches = array();
+
+    /**
+     * @var string A hint about the current context (workspace, shared minisite, etc..)
+     */
+    private $locationType;
+
+    public static function autoload()
+    {
+    }
+
+    /**
+     * @param $string
+     * @return string
+     */
+    protected function getRoot($string)
+    {
+        if(empty($string)) return "/";
+        return $string;
+    }
+
+    /**
+     * @param $tplString
+     * @param $mess
+     * @param bool $rich
+     * @return mixed
+     */
+    protected function replaceVars($tplString, $mess, $rich = true)
+    {
+        $repoId = $this->getNode()->getRepositoryId();
+        $repoObject = RepositoryService::getRepositoryById($repoId);
+        if ($repoObject != null) {
+            $repoLabel = $repoObject->getDisplay();
+        } else {
+            $repoLabel = "Repository";
+        }
+        $uLabel = "";
+        if (strstr($tplString, "AJXP_USER") !== false){
+            $uLabel = $this->getAuthorLabel();
+        }
+
+        $em = ($rich ? "<em>" : "");
+        $me = ($rich ? "</em>" : "");
+
+        $replaces = array(
+            "AJXP_NODE_PATH"        => $em.$this->getRoot($this->getNode()->getPath()).$me,
+            "AJXP_NODE_LABEL"       => $em.$this->getNode()->getLabel().$me,
+            "AJXP_PARENT_PATH"      => $em.$this->getRoot(dirname($this->getNode()->getPath())).$me,
+            "AJXP_PARENT_LABEL"     => $em.$this->getRoot(basename(dirname($this->getNode()->getPath()))).$me,
+            "AJXP_REPOSITORY_ID"    => $em.$repoId.$me,
+            "AJXP_REPOSITORY_LABEL" => $em.$repoLabel.$me,
+            "AJXP_LINK"             => $this->getMainLink(),
+            "AJXP_USER"             => $uLabel,
+            "AJXP_DATE"             => StatHelper::relativeDate($this->getDate(), $mess),
+        );
+
+        if($replaces["AJXP_NODE_LABEL"]==$em.$me || $replaces["AJXP_NODE_LABEL"] == $em."/".$me ){
+            $replaces["AJXP_NODE_LABEL"] = $replaces["AJXP_REPOSITORY_LABEL"];
+        }
+        if($replaces["AJXP_PARENT_LABEL"] == $em.$me || $replaces["AJXP_PARENT_LABEL"] == $em."/".$me ){
+            $replaces["AJXP_PARENT_LABEL"] = $replaces["AJXP_REPOSITORY_LABEL"];
+        }
+        if((strstr($tplString, "AJXP_TARGET_FOLDER") !== false || strstr($tplString, "AJXP_SOURCE_FOLDER")) &&
+            isSet($this->secondaryNode)
+        ){
+            $p = $this->secondaryNode->getPath();
+            if($this->secondaryNode->isLeaf()) $p = $this->getRoot(dirname($p));
+            $replaces["AJXP_TARGET_FOLDER"] = $replaces["AJXP_SOURCE_FOLDER"] =  $em.$p.$me;
+        }
+
+        if ((strstr($tplString, "AJXP_TARGET_LABEL") !== false || strstr($tplString, "AJXP_SOURCE_LABEL") !== false ) && isSet($this->secondaryNode) ) {
+            $replaces["AJXP_TARGET_LABEL"] = $replaces["AJXP_SOURCE_LABEL"] = $em.$this->secondaryNode->getLabel().$me;
+        }
+
+        return str_replace(array_keys($replaces), array_values($replaces), $tplString);
+    }
+
+    /**
+     * @return string
+     */
+    public function getMainLink()
+    {
+        if(ApplicationState::hasMinisiteHash() && class_exists("\\Pydio\\Share\\ShareCenter")){
+            $hash = ApplicationState::getMinisiteHash();
+            $shareCenter = \Pydio\Share\ShareCenter::getShareCenter($this->getContext());
+            if(!empty($shareCenter)){
+                return $shareCenter->getPublicAccessManager()->buildPublicLink($hash);
+            }
+        }
+        return ApplicationState::getWorkspaceShortcutURL($this->getNode()->getRepository()) .$this->getNode()->getPath();
+    }
+
+    /**
+     * @return string
+     */
+    public function getDescriptionShort()
+    {
+        $mess = LocaleService::getMessages();
+        $tpl = $mess["notification.tpl.short.".($this->getNode()->isLeaf()?"file":"folder").".".$this->action];
+        return $this->replaceVars($tpl, $mess, false);
+    }
+
+    /**
+     * @return string
+     */
+    public function getDescriptionBlock()
+    {
+        $mess = LocaleService::getMessages();
+        $tpl = $mess["notification.tpl.block.".($this->getNode()->isLeaf()?"file":"folder").".".$this->action];
+        return $this->replaceVars($tpl, $mess, false);
+    }
+
+    /**
+     * @param bool $skipLink
+     * @return string
+     */
+    public function getDescriptionLong($skipLink = false)
+    {
+        $mess = LocaleService::getMessages();
+        $tpl = "";
+        if(!$skipLink){
+            $tpl = "[".$this->getDescriptionLocation()."] ";
+        }
+
+        if (count($this->relatedNotifications) == 1 && $this->relatedNotifications[0]->getNode()->getUrl() != $this->getNode()->getUrl()){
+
+            $key = "notification.tpl.group.".($this->getNode()->isLeaf()?"file":"folder").".".$this->action;
+            $tpl .= $this->replaceVars($mess[$key], $mess).": ";
+            $tpl .= "".lcfirst($this->relatedNotifications[0]->getDescriptionLong(true)).".";
+
+        }else if (count($this->relatedNotifications) > 1) {
+
+            $key = "notification.tpl.group.".($this->getNode()->isLeaf()?"file":"folder").".".$this->action;
+            $tpl .= $this->replaceVars($mess[$key], $mess).": ";
+            $tpl .= "<ul>";
+            foreach ($this->relatedNotifications as $relatedNotification) {
+                $tpl .= "<li>".$relatedNotification->getDescriptionLong(true)."</li>";
+            }
+            $tpl .= "</ul>";
+
+        } else {
+            $tpl .= $this->replaceVars($mess["notification.tpl.long.".($this->getNode()->isLeaf()?"file":"folder").".".$this->action], $mess);
+
+        }
+        if (!$skipLink) {
+            $tpl .= "<br><br>".$this->replaceVars($mess["notification.tpl.long.ajxp_link"], $mess);
+        }
+        return $tpl;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getDescriptionLocation(){
+        $mess = LocaleService::getMessages();
+        if(!isSet($this->locationType)){
+            $this->computeLocationType();
+        }
+        return $this->replaceVars($mess["notification.tpl.location.".$this->locationType], $mess);
+    }
+
+    private function computeLocationType(){
+
+        $type = "workspace.normal";
+        $repo = $this->getNode()->getRepository();
+        $crtUserId = "shared";
+        $crtUser = $this->getNode()->hasUser() ? $this->getNode()->getUser() : null;
+        if($crtUser != null) $crtUserId = $crtUser->getId();
+        if(ApplicationState::hasMinisiteHash()){
+            if($repo->hasContentFilter()){
+                $type = "minisite.file";
+            }else{
+                $type = "minisite.folder";
+            }
+        }else if($repo->hasOwner() && $repo->getOwner() != $crtUserId){
+            if($repo->hasContentFilter()){
+                $type = "workspace.shared.file";
+            }else{
+                $type = "workspace.shared.folder";
+            }
+        }
+
+        $this->locationType = $type;
+    }
+
+    /**
+     * @param $action
+     */
+    public function setAction($action)
+    {
+        $this->action = $action;
+    }
+
+    /**
+     * @return String
+     */
+    public function getAction()
+    {
+        return $this->action;
+    }
+
+    /**
+     * @param $author
+     */
+    public function setAuthor($author)
+    {
+        $this->author = $author;
+    }
+
+    /**
+     * @return String
+     */
+    public function getAuthor()
+    {
+        return $this->author;
+    }
+
+    /**
+     * @return mixed|String
+     * @throws \Pydio\Core\Exception\UserNotFoundException
+     */
+    public function getAuthorLabel(){
+        if (array_key_exists($this->getAuthor(), self::$usersCaches)) {
+            if(self::$usersCaches[$this->getAuthor()] != 'AJXP_USER_DONT_EXISTS'){
+                $uLabel = self::$usersCaches[$this->getAuthor()];
+            }
+        } else if (UsersService::userExists($this->getAuthor())) {
+            $obj = UsersService::getUserById($this->getAuthor(), false);
+            if($obj->isHidden()){
+                return $this->getPublicAuthorLabel();
+            }
+            $uLabel = $obj->getPersonalRole()->filterParameterValue("core.conf", "USER_DISPLAY_NAME", AJXP_REPO_SCOPE_ALL, "");
+            self::$usersCaches[$this->getAuthor()] = $uLabel;
+        } else{
+            self::$usersCaches[$this->getAuthor()] = 'AJXP_USER_DONT_EXISTS';
+        }
+        if(!empty($uLabel)) return $uLabel;
+        else return $this->getAuthor();
+    }
+
+    /**
+     * @return mixed
+     */
+    protected function getPublicAuthorLabel(){
+        $m = LocaleService::getMessages();
+        $label = str_replace("%s", Logger::getClientAdress(), $m["notification.tpl.location.public_user"]);
+        return $label;
+    }
+
+    /**
+     * @param $date
+     */
+    public function setDate($date)
+    {
+        $this->date = $date;
+    }
+
+    /**
+     * @return int
+     */
+    public function getDate()
+    {
+        return $this->date;
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     */
+    public function setNode($node)
+    {
+        $this->node = $node;
+        $this->computeLocationType();
+    }
+
+    /**
+     * @return AJXP_Node
+     */
+    public function getNode()
+    {
+        if($this->node instanceof AJXP_Node && $this->node->getUserId() == null){
+            $this->node->setUserId($this->getAuthor());
+        }
+        return $this->node;
+    }
+
+    /**
+     * @param $secondaryNode
+     */
+    public function setSecondaryNode($secondaryNode)
+    {
+        $this->secondaryNode = $secondaryNode;
+    }
+
+    /**
+     * @return AJXP_Node
+     */
+    public function getSecondaryNode()
+    {
+        return $this->secondaryNode;
+    }
+
+    /**
+     * @param string $target
+     */
+    public function setTarget($target)
+    {
+        $this->target = $target;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTarget()
+    {
+        return $this->target;
+    }
+
+    /**
+     * @param Notification $relatedNotification
+     */
+    public function addRelatedNotification($relatedNotification)
+    {
+        $this->relatedNotifications[] = $relatedNotification;
+    }
+
+    /**
+     * @return Notification
+     */
+    public function getRelatedNotifications()
+    {
+        return $this->relatedNotifications;
+    }
+
+    /**
+     * Returns a valid context
+     * @return \Pydio\Core\Model\ContextInterface
+     */
+    public function getContext()
+    {
+        return $this->getNode()->getContext();
+    }
+}
diff --git a/core/src/plugins/core.notifications/NotificationCenter.php b/core/src/plugins/core.notifications/NotificationCenter.php
new file mode 100755
index 0000000000..9502e56b1b
--- /dev/null
+++ b/core/src/plugins/core.notifications/NotificationCenter.php
@@ -0,0 +1,602 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Notification\Core;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\StatHelper;
+use Pydio\Core\PluginFramework\Plugin;
+use \DOMXPath as DOMXPath;
+use Zend\Diactoros\Response\JsonResponse;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Notification dispatcher
+ * @package AjaXplorer_Plugins
+ * @subpackage Core
+ */
+class NotificationCenter extends Plugin
+{
+    /**
+     * @var String
+     */
+    private $userId;
+    /**
+     * @var IFeedStore|bool
+     */
+    private $eventStore = false;
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        parent::init($ctx, $options);
+        $this->userId = $ctx->hasUser() ? $ctx->getUser()->getId() : "shared";
+        $pService = PluginsService::getInstance($ctx);
+        try {
+            $this->eventStore = ConfService::instanciatePluginFromGlobalParams($this->pluginConf["UNIQUE_FEED_INSTANCE"], "Pydio\\Notification\\Core\\IFeedStore", $pService);
+        } catch (\Exception $e) {
+
+        }
+        if ($this->eventStore === false) {
+            $this->pluginConf["USER_EVENTS"] = false;
+        }else{
+            $pService->setPluginActive($this->eventStore->getType(), $this->eventStore->getName(), true, $this->eventStore);
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function parseSpecificContributions(ContextInterface $ctx, \DOMNode &$contribNode)
+    {
+        parent::parseSpecificContributions($ctx, $contribNode);
+        $disableWsActivity = $this->getContextualOption($ctx, "SHOW_WORKSPACES_ACTIVITY") === false;
+        $disableUserEvents = $this->getContextualOption($ctx, "USER_EVENTS") === false;
+        if(!$disableUserEvents && !$disableWsActivity){
+            return;
+        }
+        // DISABLE STUFF AS NEEDED
+       if($contribNode->nodeName == "actions" && $disableUserEvents){
+           $actionXpath=new DOMXPath($contribNode->ownerDocument);
+           $publicUrlNodeList = $actionXpath->query('action[@name="get_my_feed"]', $contribNode);
+           $publicUrlNode = $publicUrlNodeList->item(0);
+           $contribNode->removeChild($publicUrlNode);
+       }else if($contribNode->nodeName == "client_configs"){
+           $actionXpath=new DOMXPath($contribNode->ownerDocument);
+           $children = $actionXpath->query('component_config', $contribNode);
+           /** @var \DOMElement $child */
+           foreach($children as $child){
+               if($child->getAttribute("className") !== "InfoPanel" && !$disableUserEvents){
+                   continue;
+               }
+               $contribNode->removeChild($child);
+           }
+       }
+    }
+
+    /**
+     * Hooked on msg.notifications
+     * @param Notification $notification
+     * @throws \Exception
+     */
+    public function persistNotificationToAlerts(Notification &$notification)
+    {
+        if ($this->eventStore) {
+            $this->eventStore->persistAlert($notification);
+            Controller::applyHook("msg.instant",array(
+                $notification->getNode()->getContext(),
+                "<reload_user_feed/>",
+                $notification->getTarget()
+            ));
+            if($notification->getNode()->getRepository() != null && $notification->getNode()->getRepository()->hasParent()){
+                $parentRepoId = $notification->getNode()->getRepository()->getParentId();
+                Controller::applyHook("msg.instant",array(
+                    $notification->getNode()->getContext()->withRepositoryId($parentRepoId),
+                    "<reload_user_feed/>",
+                    $notification->getTarget()
+                ));
+            }
+        }
+    }
+
+
+    /**
+     * @param AJXP_Node|null $oldNode
+     * @param AJXP_Node|null $newNode
+     * @param bool $copy
+     * @param string $targetNotif
+     * @throws \Exception
+     */
+    public function persistChangeHookToFeed(AJXP_Node $oldNode = null, AJXP_Node $newNode = null, $copy = false, $targetNotif = "new")
+    {
+        if(!$this->eventStore) return;
+
+        $nodes = [];
+        if($oldNode !== null && $newNode !== null && $oldNode->getRepositoryId() !== $newNode->getRepositoryId()){
+            $nodes[] = $oldNode;
+            $nodes[] = $newNode;
+        }else{
+            $nodes[] = ($oldNode === null ? $newNode : $oldNode);
+        }
+        /** @var AJXP_Node $n */
+        foreach($nodes as $n){
+            $ctx = $n->getContext();
+            if(!$ctx->hasUser() || !$ctx->hasRepository()){
+                return;
+            }
+            $repository = $n->getContext()->getRepository();
+            $userObject = $n->getContext()->getUser();
+            $repositoryScope = $repository->securityScope();
+            $repositoryScope = ($repositoryScope !== false ? $repositoryScope : "ALL");
+            $repositoryOwner = $repository->hasOwner() ? $repository->getOwner() : null;
+            Controller::applyHook("msg.instant",array(
+                $ctx,
+                "<reload_user_feed/>",
+                $userObject->getId()
+            ));
+            $this->eventStore->persistEvent("node.change", func_get_args(), $repository->getId(), $repositoryScope, $repositoryOwner, $userObject->getId(), $userObject->getGroupPath());
+        }
+
+    }
+
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $data
+     * @throws \Pydio\Core\Exception\PydioException
+     */
+    public function loadRepositoryInfo(ContextInterface $ctx, &$data){
+        $body = [
+            'format' => 'array',
+            'current_repository'=>true,
+            'feed_type'=>'notif',
+            'limit' => 1,
+            'path'=>'/',
+            'merge_description'=>true,
+            'description_as_label'=>false
+        ];
+        $req = Controller::executableRequest($ctx, "get_my_feed", $body);
+        $this->loadUserFeed($req, new \Zend\Diactoros\Response\EmptyResponse(), $returnData);
+        $data["core.notifications"] = $returnData;
+    }
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @param array $returnData
+     * @throws \Pydio\Core\Exception\PydioException
+     */
+    public function loadUserFeed(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface, &$returnData = [])
+    {
+        $httpVars = $requestInterface->getParsedBody();
+        if(!$this->eventStore) {
+            throw new \Pydio\Core\Exception\PydioException("Cannot find eventStore for notification plugin");
+        }
+        /** @var ContextInterface $ctx */
+        $ctx = $requestInterface->getAttribute("ctx");
+        $u = $ctx->getUser();
+
+        $mess = LocaleService::getMessages();
+        $nodesList = new \Pydio\Access\Core\Model\NodesList();
+        $format = "html";
+        if (isSet($httpVars["format"])) {
+            $format = $httpVars["format"];
+        }
+        if ($format == "html") {
+            $responseInterface = $responseInterface->withHeader("Content-Type", "text/html");
+            $responseInterface->getBody()->write("<h2>".$mess["notification_center.4"]."</h2>");
+            $responseInterface->getBody()->write("<ul class='notification_list'>");
+        } else {
+            $x = new \Pydio\Core\Http\Response\SerializableResponseStream();
+            $responseInterface = $responseInterface->withBody($x);
+            $x->addChunk($nodesList);
+        }
+
+        if ($u == null) {
+            if($format == "html"){
+                $responseInterface->getBody()->write("</ul>");
+            }
+            return;
+        }
+        $userId = $u->getId();
+        $userGroup = $u->getGroupPath();
+        $authRepos = array();
+        $crtRepId = $ctx->getRepositoryId();
+        if (isSet($httpVars["repository_id"]) && $u->getMergedRole()->canRead($httpVars["repository_id"])) {
+            $authRepos[] = $httpVars["repository_id"];
+        } else if (isSet($httpVars["current_repository"])){
+            $authRepos[] = $crtRepId;
+        } else {
+            $accessibleRepos =  \Pydio\Core\Services\UsersService::getRepositoriesForUser($u, false);
+            $authRepos = array_keys($accessibleRepos);
+        }
+        $offset = isSet($httpVars["offset"]) ? intval($httpVars["offset"]): 0;
+        $limit = isSet($httpVars["limit"]) ? intval($httpVars["limit"]): 15;
+        if(!isSet($httpVars["feed_type"]) || $httpVars["feed_type"] == "notif" || $httpVars["feed_type"] == "all"){
+            $res = $this->eventStore->loadEvents($authRepos, isSet($httpVars["path"])?$httpVars["path"]:"", $userGroup, $offset, $limit, false, $userId);
+        }else{
+            $res = array();
+        }
+
+        // APPEND USER ALERT IN THE SAME QUERY FOR NOW
+        if(!isSet($httpVars["feed_type"]) || $httpVars["feed_type"] == "alert" || $httpVars["feed_type"] == "all"){
+            $this->loadUserAlerts($requestInterface, $responseInterface, $nodesList);
+        }
+        restore_error_handler();
+        $index = 1;
+        foreach ($res as $n => $object) {
+            $args = $object->arguments;
+            $oldNode = (isSet($args[0]) ? $args[0] : null);
+            $newNode = (isSet($args[1]) ? $args[1] : null);
+            $copy = (isSet($args[2]) && $args[2] === true ? true : null);
+            if( ($oldNode != null && !$oldNode instanceof AJXP_Node) || ($newNode != null && !$newNode instanceof AJXP_Node)){
+                error_log("Skipping notification as nodes are not excepted class, probably a deserialization issue");
+                continue;
+            }
+            // Backward compat : make sure there is a user ID in the node url.
+            if( $oldNode !== null && !$oldNode->hasUser() ){
+                $oldNode->setUserId($object->author);
+            }
+            if( $newNode !== null && !$newNode->hasUser() ){
+                $newNode->setUserId($object->author);
+            }
+            $notif = $this->generateNotificationFromChangeHook($oldNode, $newNode, $copy, "unify");
+            if ($notif !== false && $notif->getNode() !== false) {
+                $notif->setAuthor($object->author);
+                $notif->setDate(intval($object->date));
+                if ($format == "html") {
+                    $p = $notif->getNode()->getPath();
+                    $responseInterface->getBody()->write("<li data-ajxpNode='$p'>".$notif->getDescriptionShort()."</li>");
+                } else {
+                    $node = $notif->getNode();
+                    if ($node == null) {
+                        $this->logInfo("Warning", "Empty node stored in notification ".$notif->getAuthor()."/ ".$notif->getAction());
+                        continue;
+                    }
+                    //$node->setUserId($node->hasUser() ? $node->getUserId() : $notif->getAuthor());
+                    try {
+                        @$node->loadNodeInfo();
+                    } catch (\Exception $e) {
+                        continue;
+                    }
+                    $node->event_description = ucfirst($notif->getDescriptionBlock()) . " ".$mess["notification.tpl.block.user_link"] ." ". $notif->getAuthorLabel();
+                    $node->event_description_long = strip_tags($notif->getDescriptionLong(true));
+                    $node->event_date = StatHelper::relativeDate($notif->getDate(), $mess);
+                    $node->short_date = StatHelper::relativeDate($notif->getDate(), $mess, true);
+                    $node->event_time = $notif->getDate();
+                    $node->event_type = "notification";
+                    $node->event_id = $object->event_id;
+                    if ($node->getRepository() != null) {
+                        $node->repository_id = ''.$node->getRepository()->getId();
+                        if ($node->repository_id != $crtRepId && $node->getRepository()->getDisplay() != null) {
+                            $node->event_repository_label = "[".$node->getRepository()->getDisplay()."]";
+                        }
+                    }
+                    $node->event_author = $notif->getAuthor();
+                    // Replace PATH, to make sure they will be distinct children of the loader node
+                    $node->real_path = $node->getPath();
+                    $node->setLabel(basename($node->getPath()));
+                    if(isSet($httpVars["merge_description"]) && $httpVars["merge_description"] == "true"){
+                        if(isSet($httpVars["description_as_label"]) && $httpVars["description_as_label"] == "true"){
+                            $node->setLabel($node->event_description." ".$node->event_date);
+                        }else{
+                            $node->setLabel(basename($node->getPath()));
+                            $node->ajxp_description = $node->event_description .' ' . $node->event_date;
+                            //$node->setLabel(basename($node->getPath())." ".$node->event_description." ".$node->event_date);
+                        }
+                    }
+                    $url = parse_url($node->getUrl());
+                    $node->setUrl($url["scheme"]."://".$url["host"]."/notification_".$index);
+                    $index ++;
+                    if($format == "array"){
+                        $keys = $node->listMetaKeys();
+                        $data = array();
+                        foreach($keys as $k){
+                            $data[$k] = $node->$k;
+                        }
+                        $returnData[] = $data;
+                    }else{
+                        $nodesList->addBranch($node);
+                    }
+                }
+            }
+        }
+        if ($format == "html") {
+            echo("</ul>");
+            $responseInterface->getBody()->write("</ul>");
+        }
+
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @throws PydioException
+     */
+    public function clearUserFeed(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface){
+
+        if(!$this->eventStore){
+            return;
+        }
+        $data = $requestInterface->getParsedBody();
+        $contextType = $data["context_type"];
+        if(!in_array($contextType, ["all", "user", "repository"])){
+            throw new PydioException("Invalid Arguments");
+        }
+        $contextValue = InputFilter::sanitize($data["context_value"], InputFilter::SANITIZE_ALPHANUM);
+        $this->eventStore->deleteFeed('event', $contextType === 'user' ? $contextValue : null, $contextType === 'repository' ? $contextValue : null, $count);
+        $responseInterface = new JsonResponse(["cleared_rows" => $count]);
+
+    }
+
+
+    /**
+     * @param $actionName
+     * @param $httpVars
+     * @param $fileVars
+     * @param ContextInterface $ctx
+     */
+    public function dismissUserAlert($actionName, $httpVars, $fileVars, ContextInterface $ctx)
+    {
+        if(!$this->eventStore) return;
+        $alertId = $httpVars["alert_id"];
+        $oc = 1;
+        if(isSet($httpVars["occurrences"])) $oc = intval($httpVars["occurrences"]);
+        $this->eventStore->dismissAlertById($ctx, $alertId, $oc);
+    }
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @param \Pydio\Access\Core\Model\NodesList|null $nodesList
+     */
+    public function loadUserAlerts(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface, \Pydio\Access\Core\Model\NodesList &$nodesList = null)
+    {
+        if(!$this->eventStore) return;
+        /** @var ContextInterface $ctx */
+        $ctx = $requestInterface->getAttribute("ctx");
+        $u = $ctx->getUser();
+        $userId = $u->getId();
+        $repositoryFilter = null;
+        $httpVars = $requestInterface->getParsedBody();
+
+        if (isSet($httpVars["repository_id"]) && $u->getMergedRole()->canRead($httpVars["repository_id"])) {
+            $repositoryFilter = $httpVars["repository_id"];
+        }
+        if ($repositoryFilter == null) {
+            $repositoryFilter = $ctx->getRepositoryId();
+        }
+        $res = $this->eventStore->loadAlerts($userId, $repositoryFilter);
+        if(!count($res)) return;
+
+        // Recompute children notifs
+
+
+        $format = $httpVars["format"];
+        $fillList = ($nodesList !== null);
+        $mess = LocaleService::getMessages();
+        if (!$fillList) {
+            if ($format == "html") {
+                $responseInterface = $responseInterface->withHeader("Content-Type", "text/html");
+                $responseInterface->getBody()->write("<h2>".$mess["notification_center.3"]."</h2>");
+                $responseInterface->getBody()->write("<ul class='notification_list'>");
+            } else {
+                $nodesList = new \Pydio\Access\Core\Model\NodesList();
+                $x = new \Pydio\Core\Http\Response\SerializableResponseStream();
+                $responseInterface = $responseInterface->withBody($x);
+                $x->addChunk($nodesList);
+            }
+        }
+        $parentRepository = RepositoryService::getRepositoryById($repositoryFilter);
+        $parentRoot = $parentRepository->getContextOption($ctx, "PATH");
+        $cumulated = array();
+        foreach ($res as $notification) {
+            if ($format == "html") {
+                $responseInterface->getBody()->write("<li>".$notification->getDescriptionLong(true)."</li>");
+            } else {
+                $node = $notification->getNode();
+                if(!$node instanceof AJXP_Node){
+                    error_log("Skipping notification as nodes are not excepted class, probably a deserialization issue");
+                    if($notification->alert_id){
+                        $this->eventStore->dismissAlertById($ctx, $notification->alert_id);
+                    }
+                    continue;
+                }
+                $path = $node->getPath();
+                $nodeRepo = $node->getRepository();
+
+                if($nodeRepo != null && $nodeRepo->hasParent() && $nodeRepo->getParentId() == $repositoryFilter){
+                    $newCtx = $node->getContext();
+                    $currentRoot = $nodeRepo->getContextOption($newCtx, "PATH");
+                    $contentFilter = $nodeRepo->getContentFilter();
+                    if(isSet($contentFilter)){
+                        $nodePath = $contentFilter->filterExternalPath($node->getPath());
+                        if(empty($nodePath) || $nodePath == "/"){
+                            $k = array_keys($contentFilter->filters);
+                            $nodePath = $k[0];
+                        }
+                    }else{
+                        $nodePath = $node->getPath();
+                    }
+                    $relative = rtrim( substr($currentRoot, strlen($parentRoot)), "/"). rtrim($nodePath, "/");
+                    $parentNodeURL = $node->getScheme()."://".$node->getUser()->getId()."@".$repositoryFilter.$relative;
+                    $this->logDebug("action.share", "Recompute alert to ".$parentNodeURL);
+                    $node = new AJXP_Node($parentNodeURL);
+                    $path = $node->getPath();
+                }
+
+
+                if (isSet($cumulated[$path])) {
+                    $cumulated[$path]->event_occurence ++;
+                    continue;
+                }
+                try {
+                    @$node->loadNodeInfo();
+                } catch (\Exception $e) {
+                    if($notification->alert_id){
+                        $this->eventStore->dismissAlertById($ctx, $notification->alert_id);
+                    }
+                    continue;
+                }
+                $node->event_is_alert = true;
+                $node->event_description = ucfirst($notification->getDescriptionBlock()) . " ".$mess["notification.tpl.block.user_link"] ." ". $notification->getAuthorLabel();
+                $node->event_description_long = strip_tags($notification->getDescriptionLong(true));
+                $node->event_date = StatHelper::relativeDate($notification->getDate(), $mess);
+                $node->event_type = "alert";
+                $node->alert_id = $notification->alert_id;
+                if ($node->getRepository() != null) {
+                    $node->repository_id = ''.$node->getRepository()->getId();
+                    if ($node->repository_id != $repositoryFilter && $node->getRepository()->getDisplay() != null) {
+                        $node->event_repository_label = "[".$node->getRepository()->getDisplay()."]";
+                    }
+                } else {
+                    $node->event_repository_label = "[N/A]";
+                }
+                $node->event_author = $notification->getAuthor();
+                $node->event_occurence = 1;
+                $cumulated[$path] = $node;
+            }
+        }
+        if ($format == "html") {
+            $responseInterface->getBody()->write("</ul>");
+            return;
+        }
+        $index = 1;
+        foreach ($cumulated as $path => $nodeToSend) {
+            $nodeOcc = $nodeToSend->event_occurence > 1 ? " (".$nodeToSend->event_occurence.")" : "";
+            if(isSet($httpVars["merge_description"]) && $httpVars["merge_description"] == "true"){
+                if(isSet($httpVars["description_as_label"]) && $httpVars["description_as_label"] == "true"){
+                    $nodeToSend->setLabel($nodeToSend->event_description." ". $nodeOcc." ".$nodeToSend->event_date);
+                }else{
+                    $baseName = basename($nodeToSend->getPath());
+                    if(empty($baseName) && $nodeToSend->getRepository() != null){
+                        $baseName = $nodeToSend->getRepository()->getDisplay();
+                    }
+                    $nodeToSend->setLabel($baseName." ". $nodeOcc." "." <small class='notif_desc'>".$nodeToSend->event_description." ".$nodeToSend->event_date."</small>");
+                }
+            }else{
+                $baseName = basename($nodeToSend->getPath());
+                if(empty($baseName) && $nodeToSend->getRepository() != null){
+                    $baseName = $nodeToSend->getRepository()->getDisplay();
+                }
+                $nodeToSend->setLabel($baseName . $nodeOcc);
+            }
+            // Replace PATH
+            $nodeToSend->real_path = $path;
+            //$url = parse_url($nodeToSend->getUrl());
+            //$nodeToSend->setUrl($url["scheme"]."://".$url["host"]."/alert_".$index);
+            $index ++;
+            $nodesList->addBranch($nodeToSend);
+
+        }
+
+
+    }
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $oldNode
+     * @param \Pydio\Access\Core\Model\AJXP_Node $newNode
+     * @param bool $copy
+     * @param string $targetNotif
+     * @return Notification
+     */
+    public function generateNotificationFromChangeHook(AJXP_Node $oldNode = null, AJXP_Node $newNode = null, $copy = false, $targetNotif = "new")
+    {
+        $type = "";
+        $primaryNode = null;
+        $secondNode = null;
+        $notif = new Notification();
+        if ($oldNode == null) {
+            if($targetNotif == "old") return false;
+            $type = AJXP_NOTIF_NODE_ADD;
+            $primaryNode = $newNode;
+        } else if ($newNode == null) {
+            if($targetNotif == "new") return false;
+            $type = AJXP_NOTIF_NODE_DEL;
+            $primaryNode = $oldNode;
+        } else {
+            if ($oldNode->getUrl() == $newNode->getUrl()) {
+                $type = AJXP_NOTIF_NODE_CHANGE;
+                $primaryNode = $newNode;
+            } else if (dirname($oldNode->getPath()) == dirname($newNode->getPath())) {
+                $type = AJXP_NOTIF_NODE_RENAME;
+                $primaryNode = $newNode;
+                $secondNode = $oldNode;
+            } else if ($targetNotif == "new") {
+                $type = $copy ? AJXP_NOTIF_NODE_COPY_FROM : AJXP_NOTIF_NODE_MOVE_FROM;
+                $primaryNode = $newNode;
+                $secondNode = $oldNode;
+            } else if ($targetNotif == "old") {
+                $type = $copy ? AJXP_NOTIF_NODE_COPY_TO : AJXP_NOTIF_NODE_MOVE_TO;
+                $primaryNode = $oldNode;
+                $secondNode = $newNode;
+            } else if ($targetNotif == "unify") {
+                $type = $copy ? AJXP_NOTIF_NODE_COPY : AJXP_NOTIF_NODE_MOVE;
+                $primaryNode = $newNode;
+                $secondNode = $oldNode;
+            }
+        }
+        $notif->setNode($primaryNode);
+        $notif->setAction($type);
+        if ($secondNode != null) {
+            $notif->setSecondaryNode($secondNode);
+        }
+
+        return $notif;
+    }
+
+
+    /**
+     * @param Notification $notif
+     */
+    public function prepareNotification(Notification &$notif)
+    {
+        $notif->setAuthor($this->userId);
+        $notif->setDate(time());
+
+    }
+    /**
+     * @param Notification $notif
+     * @param string $targetId
+     */
+    public function postNotification(Notification $notif, $targetId)
+    {
+        $this->prepareNotification($notif);
+        $notif->setTarget($targetId);
+        //$this->sendToQueue($notif);
+        Controller::applyHook("msg.queue_notification", array($notif));
+
+    }
+
+
+}
diff --git a/core/src/plugins/core.notifications/class.AJXP_Notification.php b/core/src/plugins/core.notifications/class.AJXP_Notification.php
deleted file mode 100755
index 4b95c0655d..0000000000
--- a/core/src/plugins/core.notifications/class.AJXP_Notification.php
+++ /dev/null
@@ -1,358 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-define('AJXP_NOTIF_NODE_ADD', "add");
-define('AJXP_NOTIF_NODE_DEL', "delete");
-define('AJXP_NOTIF_NODE_CHANGE', "change");
-define('AJXP_NOTIF_NODE_RENAME', "rename");
-define('AJXP_NOTIF_NODE_VIEW', "view");
-define('AJXP_NOTIF_NODE_COPY', "copy");
-define('AJXP_NOTIF_NODE_MOVE', "move");
-define('AJXP_NOTIF_NODE_COPY_TO', "copy_to");
-define('AJXP_NOTIF_NODE_MOVE_TO', "move_to");
-define('AJXP_NOTIF_NODE_COPY_FROM', "copy_from");
-define('AJXP_NOTIF_NODE_MOVE_FROM', "move_from");
-/**
- * Simple properties container
- * @package AjaXplorer_Plugins
- * @subpackage Core
- */
-class AJXP_Notification
-{
-
-    /**
-     * @var AJXP_Node
-     */
-    public $node;
-    /**
-     * @var String
-     */
-    public $action;
-    /**
-     * @var String
-     */
-    public $author;
-    /**
-     * @var int
-     */
-    public $date;
-    /**
-     * @var string;
-     */
-    public $target;
-
-    /**
-     * @var AJXP_Node
-     */
-    public $secondaryNode;
-
-    /**
-     * @var AJXP_Notification[]
-     */
-    public $relatedNotifications;
-
-    public static $usersCaches = array();
-
-    /**
-     * @var string A hint about the current context (workspace, shared minisite, etc..)
-     */
-    private $locationType;
-
-    public static function autoload()
-    {
-    }
-
-    protected function getRoot($string)
-    {
-        if(empty($string)) return "/";
-        return $string;
-    }
-
-    protected function replaceVars($tplString, $mess, $rich = true)
-    {
-        //$tplString = SystemTextEncoding::fromUTF8($tplString);
-        $repoId = $this->getNode()->getRepositoryId();
-        $repoObject = ConfService::getRepositoryById($repoId);
-        if ($repoObject != null) {
-            $repoLabel = $repoObject->getDisplay();
-        } else {
-            $repoLabel = "Repository";
-        }
-        $uLabel = "";
-        if (strstr($tplString, "AJXP_USER") !== false){
-            $uLabel = $this->getAuthorLabel();
-        }
-
-        $em = ($rich ? "<em>" : "");
-        $me = ($rich ? "</em>" : "");
-
-        $replaces = array(
-            "AJXP_NODE_PATH"        => $em.$this->getRoot($this->getNode()->getPath()).$me,
-            "AJXP_NODE_LABEL"       => $em.$this->getNode()->getLabel().$me,
-            "AJXP_PARENT_PATH"      => $em.$this->getRoot(dirname($this->getNode()->getPath())).$me,
-            "AJXP_PARENT_LABEL"     => $em.$this->getRoot(basename(dirname($this->getNode()->getPath()))).$me,
-            "AJXP_REPOSITORY_ID"    => $em.$repoId.$me,
-            "AJXP_REPOSITORY_LABEL" => $em.$repoLabel.$me,
-            "AJXP_LINK"             => $this->getMainLink(),
-            "AJXP_USER"             => $uLabel,
-            "AJXP_DATE"             => AJXP_Utils::relativeDate($this->getDate(),$mess),
-        );
-
-        if($replaces["AJXP_NODE_LABEL"]==$em.$me || $replaces["AJXP_NODE_LABEL"] == $em."/".$me ){
-            $replaces["AJXP_NODE_LABEL"] = $replaces["AJXP_REPOSITORY_LABEL"];
-        }
-        if($replaces["AJXP_PARENT_LABEL"] == $em.$me || $replaces["AJXP_PARENT_LABEL"] == $em."/".$me ){
-            $replaces["AJXP_PARENT_LABEL"] = $replaces["AJXP_REPOSITORY_LABEL"];
-        }
-        if((strstr($tplString, "AJXP_TARGET_FOLDER") !== false || strstr($tplString, "AJXP_SOURCE_FOLDER")) &&
-            isSet($this->secondaryNode)
-        ){
-            $p = $this->secondaryNode->getPath();
-            if($this->secondaryNode->isLeaf()) $p = $this->getRoot(dirname($p));
-            $replaces["AJXP_TARGET_FOLDER"] = $replaces["AJXP_SOURCE_FOLDER"] =  $em.$p.$me;
-        }
-
-        if ((strstr($tplString, "AJXP_TARGET_LABEL") !== false || strstr($tplString, "AJXP_SOURCE_LABEL") !== false ) && isSet($this->secondaryNode) ) {
-            $replaces["AJXP_TARGET_LABEL"] = $replaces["AJXP_SOURCE_LABEL"] = $em.$this->secondaryNode->getLabel().$me;
-        }
-
-        return str_replace(array_keys($replaces), array_values($replaces), $tplString);
-    }
-
-    /**
-     * @return string
-     */
-    public function getMainLink()
-    {
-        if(isSet($_SESSION["CURRENT_MINISITE"])){
-            $hash = $_SESSION["CURRENT_MINISITE"];
-            $shareCenter = ShareCenter::getShareCenter();
-            if(!empty($shareCenter)){
-                return $shareCenter->getPublicAccessManager()->buildPublicLink($hash);
-            }
-        }
-        return AJXP_Utils::getWorkspaceShortcutURL($this->getNode()->getRepository()).$this->getNode()->getPath();
-    }
-
-    /**
-     * @return string
-     */
-    public function getDescriptionShort()
-    {
-        $mess = ConfService::getMessages();
-        $tpl = $mess["notification.tpl.short.".($this->getNode()->isLeaf()?"file":"folder").".".$this->action];
-        return $this->replaceVars($tpl, $mess, false);
-    }
-
-    /**
-     * @return string
-     */
-    public function getDescriptionBlock()
-    {
-        $mess = ConfService::getMessages();
-        $tpl = $mess["notification.tpl.block.".($this->getNode()->isLeaf()?"file":"folder").".".$this->action];
-        return $this->replaceVars($tpl, $mess, false);
-    }
-
-    /**
-     * @return string
-     */
-    public function getDescriptionLong($skipLink = false)
-    {
-        $mess = ConfService::getMessages();
-        $tpl = "";
-        if(!$skipLink){
-            $tpl = "[".$this->getDescriptionLocation()."] ";
-        }
-
-        if (count($this->relatedNotifications) == 1 && $this->relatedNotifications[0]->getNode()->getUrl() != $this->getNode()->getUrl()){
-
-            $key = "notification.tpl.group.".($this->getNode()->isLeaf()?"file":"folder").".".$this->action;
-            $tpl .= $this->replaceVars($mess[$key], $mess).": ";
-            $tpl .= "".lcfirst($this->relatedNotifications[0]->getDescriptionLong(true)).".";
-
-        }else if (count($this->relatedNotifications) > 1) {
-
-            $key = "notification.tpl.group.".($this->getNode()->isLeaf()?"file":"folder").".".$this->action;
-            $tpl .= $this->replaceVars($mess[$key], $mess).": ";
-            $tpl .= "<ul>";
-            foreach ($this->relatedNotifications as $relatedNotification) {
-                $tpl .= "<li>".$relatedNotification->getDescriptionLong(true)."</li>";
-            }
-            $tpl .= "</ul>";
-
-        } else {
-            $tpl .= $this->replaceVars($mess["notification.tpl.long.".($this->getNode()->isLeaf()?"file":"folder").".".$this->action], $mess);
-
-        }
-        if (!$skipLink) {
-            $tpl .= "<br><br>".$this->replaceVars($mess["notification.tpl.long.ajxp_link"], $mess);
-        }
-        return $tpl;
-    }
-
-    public function getDescriptionLocation(){
-        $mess = ConfService::getMessages();
-        if(!isSet($this->locationType)){
-            $this->computeLocationType();
-        }
-        return $this->replaceVars($mess["notification.tpl.location.".$this->locationType], $mess);
-    }
-
-    private function computeLocationType(){
-
-        $type = "workspace.normal";
-        $repo = $this->getNode()->getRepository();
-        $crtUserId = "shared";
-        $crtUser = AuthService::getLoggedUser();
-        if($crtUser != null) $crtUserId = $crtUser->getId();
-        if(isSet($_SESSION["CURRENT_MINISITE"])){
-            if($repo->hasContentFilter()){
-                $type = "minisite.file";
-            }else{
-                $type = "minisite.folder";
-            }
-        }else if($repo->hasOwner() && $repo->getOwner() != $crtUserId){
-            if($repo->hasContentFilter()){
-                $type = "workspace.shared.file";
-            }else{
-                $type = "workspace.shared.folder";
-            }
-        }
-
-        $this->locationType = $type;
-    }
-
-    public function setAction($action)
-    {
-        $this->action = $action;
-    }
-
-    public function getAction()
-    {
-        return $this->action;
-    }
-
-    public function setAuthor($author)
-    {
-        $this->author = $author;
-    }
-
-    public function getAuthor()
-    {
-        return $this->author;
-    }
-
-    public function getAuthorLabel(){
-        if (array_key_exists($this->getAuthor(), self::$usersCaches)) {
-            if(self::$usersCaches[$this->getAuthor()] != 'AJXP_USER_DONT_EXISTS'){
-                $uLabel = self::$usersCaches[$this->getAuthor()];
-            }
-        } else if (AuthService::userExists($this->getAuthor())) {
-            $obj = ConfService::getConfStorageImpl()->createUserObject($this->getAuthor());
-            if($obj->isHidden()){
-                return $this->getPublicAuthorLabel();
-            }
-            $uLabel = $obj->personalRole->filterParameterValue("core.conf", "USER_DISPLAY_NAME", AJXP_REPO_SCOPE_ALL, "");
-            self::$usersCaches[$this->getAuthor()] = $uLabel;
-        } else{
-            self::$usersCaches[$this->getAuthor()] = 'AJXP_USER_DONT_EXISTS';
-        }
-        if(!empty($uLabel)) return $uLabel;
-        else return $this->getAuthor();
-    }
-
-    protected function getPublicAuthorLabel(){
-        $m = ConfService::getMessages();
-        $label = str_replace("%s", AJXP_Logger::getClientAdress(), $m["notification.tpl.location.public_user"]);
-        return $label;
-    }
-
-    public function setDate($date)
-    {
-        $this->date = $date;
-    }
-
-    public function getDate()
-    {
-        return $this->date;
-    }
-
-    /**
-     * @param AJXP_Node $node
-     */
-    public function setNode($node)
-    {
-        $this->node = $node;
-        $this->computeLocationType();
-    }
-
-    /**
-     * @return AJXP_Node
-     */
-    public function getNode()
-    {
-        return $this->node;
-    }
-
-    public function setSecondaryNode($secondaryNode)
-    {
-        $this->secondaryNode = $secondaryNode;
-    }
-
-    public function getSecondaryNode()
-    {
-        return $this->secondaryNode;
-    }
-
-    /**
-     * @param string $target
-     */
-    public function setTarget($target)
-    {
-        $this->target = $target;
-    }
-
-    /**
-     * @return string
-     */
-    public function getTarget()
-    {
-        return $this->target;
-    }
-
-    /**
-     * @param AJXP_Notification $relatedNotification
-     */
-    public function addRelatedNotification($relatedNotification)
-    {
-        $this->relatedNotifications[] = $relatedNotification;
-    }
-
-    /**
-     * @return AJXP_Notification
-     */
-    public function getRelatedNotifications()
-    {
-        return $this->relatedNotifications;
-    }
-}
diff --git a/core/src/plugins/core.notifications/class.AJXP_NotificationCenter.php b/core/src/plugins/core.notifications/class.AJXP_NotificationCenter.php
deleted file mode 100755
index a93544219a..0000000000
--- a/core/src/plugins/core.notifications/class.AJXP_NotificationCenter.php
+++ /dev/null
@@ -1,492 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Notification dispatcher
- * @package AjaXplorer_Plugins
- * @subpackage Core
- */
-class AJXP_NotificationCenter extends AJXP_Plugin
-{
-    /**
-     * @var String
-     */
-    private $userId;
-    /**
-     * @var AJXP_FeedStore|bool
-     */
-    private $eventStore = false;
-
-    public function init($options)
-    {
-        parent::init($options);
-        $this->userId = AuthService::getLoggedUser() !== null ? AuthService::getLoggedUser()->getId() : "shared";
-        try {
-            $this->eventStore = ConfService::instanciatePluginFromGlobalParams($this->pluginConf["UNIQUE_FEED_INSTANCE"], "AJXP_FeedStore");
-        } catch (Exception $e) {
-
-        }
-        if ($this->eventStore === false) {
-            $this->pluginConf["USER_EVENTS"] = false;
-        }
-    }
-
-    protected function parseSpecificContributions(&$contribNode)
-    {
-           parent::parseSpecificContributions($contribNode);
-
-           // DISABLE STUFF
-           if (empty($this->pluginConf["USER_EVENTS"])) {
-               if($contribNode->nodeName == "actions"){
-                   $actionXpath=new DOMXPath($contribNode->ownerDocument);
-                   $publicUrlNodeList = $actionXpath->query('action[@name="get_my_feed"]', $contribNode);
-                   $publicUrlNode = $publicUrlNodeList->item(0);
-                   $contribNode->removeChild($publicUrlNode);
-               }else if($contribNode->nodeName == "client_configs"){
-                   $actionXpath=new DOMXPath($contribNode->ownerDocument);
-                   $children = $actionXpath->query('component_config', $contribNode);
-                   foreach($children as $child){
-                       $contribNode->removeChild($child);
-                   }
-               }
-           }
-    }
-
-    public function persistNotificationToAlerts(AJXP_Notification &$notification)
-    {
-        if ($this->eventStore) {
-            $this->eventStore->persistAlert($notification);
-            AJXP_Controller::applyHook("msg.instant",array(
-                "<reload_user_feed/>",
-                $notification->getNode()->getRepositoryId(),
-                $notification->getTarget()
-            ));
-            if($notification->getNode()->getRepository() != null && $notification->getNode()->getRepository()->hasParent()){
-                AJXP_Controller::applyHook("msg.instant",array(
-                    "<reload_user_feed/>",
-                    $notification->getNode()->getRepository()->getParentId(),
-                    $notification->getTarget()
-                ));
-            }
-        }
-    }
-
-
-    public function persistChangeHookToFeed(AJXP_Node $oldNode = null, AJXP_Node $newNode = null, $copy = false, $targetNotif = "new")
-    {
-        if(!$this->eventStore) return;
-
-        $nodes = [];
-        if($oldNode !== null && $newNode !== null && $oldNode->getRepositoryId() !== $newNode->getRepositoryId()){
-            $nodes[] = $oldNode;
-            $nodes[] = $newNode;
-        }else{
-            $nodes[] = ($oldNode === null ? $newNode : $oldNode);
-        }
-
-        foreach($nodes as $n){
-            $repoId = $n->getRepositoryId();
-            $userGroup = null;
-            if($n->getUser()){
-                $userId = $n->getUser();
-                $obj = ConfService::getConfStorageImpl()->createUserObject($userId);
-                if($obj) $userGroup = $obj->getGroupPath();
-            }else{
-                $userId = AuthService::getLoggedUser()->getId();
-                $userGroup = AuthService::getLoggedUser()->getGroupPath();
-            }
-            $repository = ConfService::getRepositoryById($repoId);
-            $repositoryScope = $repository->securityScope();
-            $repositoryScope = ($repositoryScope !== false ? $repositoryScope : "ALL");
-            $repositoryOwner = $repository->hasOwner() ? $repository->getOwner() : null;
-            AJXP_Controller::applyHook("msg.instant",array(
-                "<reload_user_feed/>",
-                $repoId,
-                $userId
-            ));
-            $this->eventStore->persistEvent("node.change", func_get_args(), $repoId, $repositoryScope, $repositoryOwner, $userId, $userGroup);
-        }
-
-    }
-
-    public function loadRepositoryInfo(&$data){
-        $f = $this->loadUserFeed("get_my_feed", array(
-                'format' => 'array',
-                'current_repository'=>true,
-                'feed_type'=>'notif',
-                'limit' => 1,
-                'path'=>'/',
-                'merge_description'=>true,
-                'description_as_label'=>false
-        ), array());
-        $data["core.notifications"] = $f;
-    }
-
-    public function loadUserFeed($actionName, $httpVars, $fileVars)
-    {
-        if(!$this->eventStore) return array();
-        $u = AuthService::getLoggedUser();
-        if ($u == null) {
-            if($httpVars["format"] == "html" || $httpVars["format"] == "array") return array();
-            AJXP_XMLWriter::header();
-            AJXP_XMLWriter::close();
-            return array();
-        }
-        $userId = $u->getId();
-        $userGroup = $u->getGroupPath();
-        $authRepos = array();
-        $crtRepId = ConfService::getCurrentRepositoryId();
-        if (isSet($httpVars["repository_id"]) && $u->mergedRole->canRead($httpVars["repository_id"])) {
-            $authRepos[] = $httpVars["repository_id"];
-        } else if (isSet($httpVars["current_repository"])){
-            $authRepos[] = $crtRepId;
-        } else {
-            $accessibleRepos = ConfService::getAccessibleRepositories(AuthService::getLoggedUser(), false, true, false);
-            $authRepos = array_keys($accessibleRepos);
-        }
-        $offset = isSet($httpVars["offset"]) ? intval($httpVars["offset"]): 0;
-        $limit = isSet($httpVars["limit"]) ? intval($httpVars["limit"]): 15;
-        if(!isSet($httpVars["feed_type"]) || $httpVars["feed_type"] == "notif" || $httpVars["feed_type"] == "all"){
-            $res = $this->eventStore->loadEvents($authRepos, isSet($httpVars["path"])?$httpVars["path"]:"", $userGroup, $offset, $limit, false, $userId);
-        }else{
-            $res = array();
-        }
-
-        $mess = ConfService::getMessages();
-        $format = "html";
-        if (isSet($httpVars["format"])) {
-            $format = $httpVars["format"];
-        }
-        if ($format == "html") {
-            echo("<h2>".$mess["notification_center.4"]."</h2>");
-            echo("<ul class='notification_list'>");
-        } else if($format == "json"){
-            $jsonNodes = array();
-        } else if($format != 'array') {
-            AJXP_XMLWriter::header();
-        }
-
-        // APPEND USER ALERT IN THE SAME QUERY FOR NOW
-        if(!isSet($httpVars["feed_type"]) || $httpVars["feed_type"] == "alert" || $httpVars["feed_type"] == "all"){
-            $this->loadUserAlerts("", array_merge($httpVars, array("skip_container_tags" => "true")), $fileVars);
-        }
-        restore_error_handler();
-        $index = 1;
-        foreach ($res as $n => $object) {
-            $args = $object->arguments;
-            $oldNode = (isSet($args[0]) ? $args[0] : null);
-            $newNode = (isSet($args[1]) ? $args[1] : null);
-            $copy = (isSet($args[2]) && $args[2] === true ? true : null);
-            $notif = $this->generateNotificationFromChangeHook($oldNode, $newNode, $copy, "unify");
-            if ($notif !== false && $notif->getNode() !== false) {
-                $notif->setAuthor($object->author);
-                $notif->setDate(intval($object->date));
-                if ($format == "html") {
-                    $p = $notif->getNode()->getPath();
-                    echo("<li data-ajxpNode='$p'>");
-                    echo($notif->getDescriptionShort(true));
-                    echo("</li>");
-                } else {
-                    $node = $notif->getNode();
-                    if ($node == null) {
-                        $this->logInfo("Warning", "Empty node stored in notification ".$notif->getAuthor()."/ ".$notif->getAction());
-                        continue;
-                    }
-                    try {
-                        @$node->loadNodeInfo();
-                    } catch (Exception $e) {
-                        continue;
-                    }
-                    $node->event_description = ucfirst($notif->getDescriptionBlock()) . " ".$mess["notification.tpl.block.user_link"] ." ". $notif->getAuthorLabel();
-                    $node->event_description = SystemTextEncoding::fromUTF8($node->event_description);
-                    $node->event_description_long = $notif->getDescriptionLong(true);
-                    $node->event_date = SystemTextEncoding::fromUTF8(AJXP_Utils::relativeDate($notif->getDate(), $mess));
-                    $node->short_date = AJXP_Utils::relativeDate($notif->getDate(), $mess, true);
-                    $node->event_time = $notif->getDate();
-                    $node->event_type = "notification";
-                    $node->event_id = $object->event_id;
-                    if ($node->getRepository() != null) {
-                        $node->repository_id = ''.$node->getRepository()->getId();
-                        if ($node->repository_id != $crtRepId && $node->getRepository()->getDisplay() != null) {
-                            $node->event_repository_label = "[".$node->getRepository()->getDisplay()."]";
-                        }
-                    }
-                    $node->event_author = $notif->getAuthor();
-                    // Replace PATH, to make sure they will be distinct children of the loader node
-                    $node->real_path = $node->getPath();
-                    $node->setLabel(basename($node->getPath()));
-                    if(isSet($httpVars["merge_description"]) && $httpVars["merge_description"] == "true"){
-                        if(isSet($httpVars["description_as_label"]) && $httpVars["description_as_label"] == "true"){
-                            $node->setLabel($node->event_description." ".$node->event_date);
-                        }else{
-                            $node->setLabel(basename($node->getPath())." <small class='notif_desc'>".$node->event_description." ".$node->event_date."</small>");
-                        }
-                    }
-                    $url = parse_url($node->getUrl());
-                    $node->setUrl($url["scheme"]."://".$url["host"]."/notification_".$index);
-                    $index ++;
-                    if($format == "json" || $format == "array"){
-                        $keys = $node->listMetaKeys();
-                        $data = array();
-                        foreach($keys as $k){
-                            $data[$k] = $node->$k;
-                        }
-                        if($format == "json"){
-                            $jsonNodes[] = json_encode($data);
-                        }else{
-                            $jsonNodes[] = $data;
-                        }
-                    }else{
-                        AJXP_XMLWriter::renderAjxpNode($node);
-                    }
-                }
-            }
-        }
-        if ($format == "html") {
-            echo("</ul>");
-        } else if($format == "json"){
-            HTMLWriter::charsetHeader("application/json");
-            echo('[' . implode(",", $jsonNodes). ']');
-        } else if($format == "array"){
-            return $jsonNodes;
-        } else {
-            AJXP_XMLWriter::close();
-        }
-
-    }
-
-
-    public function dismissUserAlert($actionName, $httpVars, $fileVars)
-    {
-        if(!$this->eventStore) return;
-        $alertId = $httpVars["alert_id"];
-        $oc = 1;
-        if(isSet($httpVars["occurrences"])) $oc = intval($httpVars["occurrences"]);
-        $this->eventStore->dismissAlertById($alertId, $oc);
-    }
-
-
-    public function loadUserAlerts($actionName, $httpVars, $fileVars)
-    {
-        if(!$this->eventStore) return;
-        $u = AuthService::getLoggedUser();
-        $userId = $u->getId();
-        $repositoryFilter = null;
-        if (isSet($httpVars["repository_id"]) && $u->mergedRole->canRead($httpVars["repository_id"])) {
-            $repositoryFilter = $httpVars["repository_id"];
-        }
-        if ($repositoryFilter == null) {
-            $repositoryFilter = ConfService::getRepository()->getId();
-        }
-        $res = $this->eventStore->loadAlerts($userId, $repositoryFilter);
-        if(!count($res)) return;
-
-        // Recompute children notifs
-
-
-        $format = $httpVars["format"];
-        $skipContainingTags = (isSet($httpVars["skip_container_tags"]));
-        $mess = ConfService::getMessages();
-        if (!$skipContainingTags) {
-            if ($format == "html") {
-                echo("<h2>".$mess["notification_center.3"]."</h2>");
-                echo("<ul class='notification_list'>");
-            } else {
-                AJXP_XMLWriter::header();
-            }
-        }
-        $parentRepository = ConfService::getRepositoryById($repositoryFilter);
-        $parentRoot = $parentRepository->getOption("PATH");
-        $cumulated = array();
-        foreach ($res as $notification) {
-            if ($format == "html") {
-                echo("<li>");
-                echo($notification->getDescriptionLong(true));
-                echo("</li>");
-            } else {
-                $node = $notification->getNode();
-                $path = $node->getPath();
-                $nodeRepo = $node->getRepository();
-
-                if($nodeRepo != null && $nodeRepo->hasParent() && $nodeRepo->getParentId() == $repositoryFilter){
-                    $currentRoot = $nodeRepo->getOption("PATH");
-                    $contentFilter = $nodeRepo->getContentFilter();
-                    if(isSet($contentFilter)){
-                        $nodePath = $contentFilter->filterExternalPath($node->getPath());
-                        if(empty($nodePath) || $nodePath == "/"){
-                            $k = array_keys($contentFilter->filters);
-                            $nodePath = $k[0];
-                        }
-                    }else{
-                        $nodePath = $node->getPath();
-                    }
-                    $relative = rtrim( substr($currentRoot, strlen($parentRoot)), "/"). rtrim($nodePath, "/");
-                    $parentNodeURL = $node->getScheme()."://".$repositoryFilter.$relative;
-                    $this->logDebug("action.share", "Recompute alert to ".$parentNodeURL);
-                    $node = new AJXP_Node($parentNodeURL);
-                    $path = $node->getPath();
-                }
-
-
-                if (isSet($cumulated[$path])) {
-                    $cumulated[$path]->event_occurence ++;
-                    continue;
-                }
-                try {
-                    @$node->loadNodeInfo();
-                } catch (Exception $e) {
-                    if($notification->alert_id){
-                        $this->eventStore->dismissAlertById($notification->alert_id);
-                    }
-                    continue;
-                }
-                $node->event_is_alert = true;
-                $node->event_description = ucfirst($notification->getDescriptionBlock()) . " ".$mess["notification.tpl.block.user_link"] ." ". $notification->getAuthorLabel();
-                $node->event_description = SystemTextEncoding::fromUTF8($node->event_description);
-                $node->event_description_long = $notification->getDescriptionLong(true);
-                $node->event_date = SystemTextEncoding::fromUTF8(AJXP_Utils::relativeDate($notification->getDate(), $mess));
-                $node->event_type = "alert";
-                $node->alert_id = $notification->alert_id;
-                if ($node->getRepository() != null) {
-                    $node->repository_id = ''.$node->getRepository()->getId();
-                    if ($node->repository_id != $repositoryFilter && $node->getRepository()->getDisplay() != null) {
-                        $node->event_repository_label = "[".$node->getRepository()->getDisplay()."]";
-                    }
-                } else {
-                    $node->event_repository_label = "[N/A]";
-                }
-                $node->event_author = $notification->getAuthor();
-                $node->event_occurence = 1;
-                $cumulated[$path] = $node;
-            }
-        }
-        $index = 1;
-        foreach ($cumulated as $nodeToSend) {
-            $nodeOcc = $nodeToSend->event_occurence > 1 ? " (".$nodeToSend->event_occurence.")" : "";
-            if(isSet($httpVars["merge_description"]) && $httpVars["merge_description"] == "true"){
-                if(isSet($httpVars["description_as_label"]) && $httpVars["description_as_label"] == "true"){
-                    $nodeToSend->setLabel($nodeToSend->event_description." ". $nodeOcc." ".$nodeToSend->event_date);
-                }else{
-                    $baseName = basename($nodeToSend->getPath());
-                    if(empty($baseName) && $nodeToSend->getRepository() != null){
-                        $baseName = $nodeToSend->getRepository()->getDisplay();
-                    }
-                    $nodeToSend->setLabel($baseName." ". $nodeOcc." "." <small class='notif_desc'>".$nodeToSend->event_description." ".$nodeToSend->event_date."</small>");
-                }
-            }else{
-                $baseName = basename($nodeToSend->getPath());
-                if(empty($baseName) && $nodeToSend->getRepository() != null){
-                    $baseName = $nodeToSend->getRepository()->getDisplay();
-                }
-                $nodeToSend->setLabel($baseName . $nodeOcc);
-            }
-            // Replace PATH
-            $nodeToSend->real_path = $path;
-            //$url = parse_url($nodeToSend->getUrl());
-            //$nodeToSend->setUrl($url["scheme"]."://".$url["host"]."/alert_".$index);
-            $index ++;
-            AJXP_XMLWriter::renderAjxpNode($nodeToSend);
-
-        }
-        if (!$skipContainingTags) {
-            if ($format == "html") {
-                echo("</ul>");
-            } else {
-                AJXP_XMLWriter::close();
-            }
-        }
-
-    }
-    /**
-     * @param AJXP_Node $oldNode
-     * @param AJXP_Node $newNode
-     * @param bool $copy
-     * @param string $targetNotif
-     * @return AJXP_Notification
-     */
-    public function generateNotificationFromChangeHook(AJXP_Node $oldNode = null, AJXP_Node $newNode = null, $copy = false, $targetNotif = "new")
-    {
-        $type = "";
-        $primaryNode = null;
-        $secondNode = null;
-        $notif = new AJXP_Notification();
-        if ($oldNode == null) {
-            if($targetNotif == "old") return false;
-            $type = AJXP_NOTIF_NODE_ADD;
-            $primaryNode = $newNode;
-        } else if ($newNode == null) {
-            if($targetNotif == "new") return false;
-            $type = AJXP_NOTIF_NODE_DEL;
-            $primaryNode = $oldNode;
-        } else {
-            if ($oldNode->getUrl() == $newNode->getUrl()) {
-                $type = AJXP_NOTIF_NODE_CHANGE;
-                $primaryNode = $newNode;
-            } else if (dirname($oldNode->getPath()) == dirname($newNode->getPath())) {
-                $type = AJXP_NOTIF_NODE_RENAME;
-                $primaryNode = $newNode;
-                $secondNode = $oldNode;
-            } else if ($targetNotif == "new") {
-                $type = $copy ? AJXP_NOTIF_NODE_COPY_FROM : AJXP_NOTIF_NODE_MOVE_FROM;
-                $primaryNode = $newNode;
-                $secondNode = $oldNode;
-            } else if ($targetNotif == "old") {
-                $type = $copy ? AJXP_NOTIF_NODE_COPY_TO : AJXP_NOTIF_NODE_MOVE_TO;
-                $primaryNode = $oldNode;
-                $secondNode = $newNode;
-            } else if ($targetNotif == "unify") {
-                $type = $copy ? AJXP_NOTIF_NODE_COPY : AJXP_NOTIF_NODE_MOVE;
-                $primaryNode = $newNode;
-                $secondNode = $oldNode;
-            }
-        }
-        $notif->setNode($primaryNode);
-        $notif->setAction($type);
-        if ($secondNode != null) {
-            $notif->setSecondaryNode($secondNode);
-        }
-
-        return $notif;
-    }
-
-
-    public function prepareNotification(AJXP_Notification &$notif)
-    {
-        $notif->setAuthor($this->userId);
-        $notif->setDate(time());
-
-    }
-    /**
-     * @param AJXP_Notification $notif
-     * @param string $targetId
-     */
-    public function postNotification(AJXP_Notification $notif, $targetId)
-    {
-        $this->prepareNotification($notif);
-        $notif->setTarget($targetId);
-        //$this->sendToQueue($notif);
-        AJXP_Controller::applyHook("msg.queue_notification", array($notif));
-
-    }
-
-
-}
diff --git a/core/src/plugins/core.notifications/class.NotificationLoader.js b/core/src/plugins/core.notifications/class.NotificationLoader.js
index 070be32205..fbb4f49ec8 100644
--- a/core/src/plugins/core.notifications/class.NotificationLoader.js
+++ b/core/src/plugins/core.notifications/class.NotificationLoader.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 Class.create("NotificationLoader", {
@@ -92,7 +92,7 @@ Class.create("NotificationLoader", {
             }
             var elLabel = el.getLabel();
             if(!elLabel) elLabel = "/";
-            var block = '<div class="notif_event_label">'+elLabel+'</div>';
+            var block = '<div class="notif_event_label">'+he.escape(elLabel)+'</div>';
             var detail = '';
             if(el.getMetadata().get('event_repository_label')){
                 detail += '<div class="notif_event_repository">'+ el.getMetadata().get('event_repository_label') + '</div>';
@@ -201,7 +201,7 @@ Class.create("NotificationLoader", {
                     obje.title,
                     {
                         body: obje.body,
-                        icon: 'plugins/gui.ajax/res/themes/vision/images/mimes/64/mime_empty.png',
+                        icon: 'plugins/gui.ajax/res/themes/orbit/images/mimes/64/mime_empty.png',
                         tag: 'ajaxplorer',
                         dir: 'auto',
                         lang: ajaxplorer.currentLanguage
@@ -338,7 +338,8 @@ Class.create("NotificationLoader", {
             "columnsDef":[
                 {"attributeName":"ajxp_label", "messageId":1, "sortType":"String"},
                 {"attributeName":"event_time", "messageString":"Time", "sortType":"Number"},
-                {"attributeName":"event_type", "messageString":"Type", "sortType":"String"}],
+                {"attributeName":"event_description", "messageString":"Description", "sortType":"String"}
+            ],
             "silentLoading":true,
             "fixedSortColumn":"event_time",
             "fixedSortDirection":"desc",
diff --git a/core/src/plugins/core.notifications/interface.AJXP_FeedStore.php b/core/src/plugins/core.notifications/interface.AJXP_FeedStore.php
deleted file mode 100644
index 2edad482ae..0000000000
--- a/core/src/plugins/core.notifications/interface.AJXP_FeedStore.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-/**
- * @package AjaXplorer_Plugins
- * @subpackage Core
- */
-interface AJXP_FeedStore
-{
-    /**
-     * @abstract
-     * @param string $hookName
-     * @param string $data
-     * @param string $repositoryId
-     * @param string $repositoryScope
-     * @param string $repositoryOwner
-     * @param string $userId
-     * @param string $userGroup
-     * @return void
-     */
-    public function persistEvent($hookName, $data, $repositoryId, $repositoryScope, $repositoryOwner, $userId, $userGroup);
-
-    /**
-     * @abstract
-     * @param array $filterByRepositories
-     * @param $filterByPath
-     * @param string $userGroup
-     * @param integer $offset
-     * @param integer $limit
-     * @param boolean $enlargeToOwned
-     * @param string $userId
-     * @return AJXP_Notification[]
-     */
-    public function loadEvents($filterByRepositories, $filterByPath, $userGroup, $offset = 0, $limit = 10, $enlargeToOwned = true, $userId);
-
-    /**
-     * @abstract
-     * @param AJXP_Notification $notif
-     * @return mixed
-     */
-    public function persistAlert(AJXP_Notification $notif);
-
-    /**
-     * @abstract
-     * @param $userId
-     * @param null $repositoryIdFilter
-     * @return AJXP_Notification[]
-     */
-    public function loadAlerts($userId, $repositoryIdFilter = null);
-
-
-    /**
-     * @param $alertId
-     * @param $occurrences
-     */
-    public function dismissAlertById($alertId, $occurrences = 1);
-
-    /**
-     * @param string $indexPath
-     * @param mixed $data
-     * @param string $repositoryId
-     * @param string $repositoryScope
-     * @param string $repositoryOwner
-     * @param string $userId
-     * @param string $userGroup
-     * @return void
-     */
-    public function persistMetaObject($indexPath, $data, $repositoryId, $repositoryScope, $repositoryOwner, $userId, $userGroup);
-    public function findMetaObjectsByIndexPath($repositoryId, $indexPath, $userId, $userGroup, $offset = 0, $limit = 20, $orderBy = "date", $orderDir = "desc");
-    public function updateMetaObject($repositoryId, $oldPath, $newPath = null, $copy = false);
-
-}
diff --git a/core/src/plugins/core.notifications/interface.AJXP_MessageExchanger.php b/core/src/plugins/core.notifications/interface.AJXP_MessageExchanger.php
deleted file mode 100644
index f3209c4995..0000000000
--- a/core/src/plugins/core.notifications/interface.AJXP_MessageExchanger.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-/**
- * @package AjaXplorer_Plugins
- * @subpackage Core
- */
-interface AJXP_MessageExchanger
-{
-    /**
-     * @abstract
-     * @param $channelName
-     * @param $clientId
-     * @return mixed
-     */
-    public function suscribeToChannel($channelName, $clientId);
-
-    /**
-     * @abstract
-     * @param $channelName
-     * @param $clientId
-     * @return mixed
-     */
-    public function unsuscribeFromChannel($channelName, $clientId);
-
-    /**
-     * @abstract
-     * @param $channelName
-     * @param $clientId
-     * @param $userId
-     * @param $userGroup
-     * @return mixed
-     */
-    public function consumeInstantChannel($channelName, $clientId, $userId, $userGroup);
-
-    /**
-     * @abstract
-     * @param $channelName
-     * @param $filter
-     * @return mixed
-     */
-    public function consumeWorkerChannel($channelName, $filter = null);
-
-
-    /**
-     * @abstract
-     * @param string $channel Name of the persistant queue to create
-     * @param object $message Message to send
-     * @return mixed
-     */
-    public function publishWorkerMessage($channel, $message);
-
-    /**
-     * @abstract
-     * @param $channel
-     * @param $message
-     * @return mixed
-     */
-    public function publishInstantMessage($channel, $message);
-
-
-}
diff --git a/core/src/plugins/core.notifications/manifest.xml b/core/src/plugins/core.notifications/manifest.xml
index 883aa147f9..fb547e8522 100644
--- a/core/src/plugins/core.notifications/manifest.xml
+++ b/core/src/plugins/core.notifications/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ajxp_plugin label="CONF_MESSAGE[Notification Center]" description="CONF_MESSAGE[Handle users watches and notifications]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <class_definition classname="AJXP_NotificationCenter" filename="plugins/core.notifications/class.AJXP_NotificationCenter.php"/>
+    <class_definition classname="Pydio\Notification\Core\NotificationCenter" filename="plugins/core.notifications/NotificationCenter.php"/>
     <client_settings>
         <resources>
             <i18n namespace="notification.tpl.short" path="plugins/core.notifications/templates/short"/>
@@ -17,7 +17,8 @@
     </client_settings>
     <server_settings>
         <param name="activate_notifications" scope="user" description="CONF_MESSAGE[Activate desktop notifications]" label="CONF_MESSAGE[Desktop Notifications]" type="button" choices="run_client_action:activateDesktopNotifications" expose="true" editable="true"/>
-        <global_param description="CONF_MESSAGE[Display a new entry with all events happening on a user workspaces, and alerts. An SQL database must be setup for the FEED_DRIVER configuration.]" label="CONF_MESSAGE[User events and alerts]" name="USER_EVENTS" type="boolean" default="false"/>
+        <global_param name="USER_EVENTS" description="CONF_MESSAGE[Display a new entry with all events happening on a user workspaces, and alerts. An SQL database must be setup for the FEED_DRIVER configuration.]" label="CONF_MESSAGE[User events and alerts]" type="boolean" default="false"/>
+        <global_param name="SHOW_WORKSPACES_ACTIVITY" label="CONF_MESSAGE[Display Workspaces Activity]" description="CONF_MESSAGE[Display workspaces activity to the users in the right-hand information panel]" type="boolean" default="true"/>
         <global_param type="plugin_instance:feed" name="UNIQUE_FEED_INSTANCE" group="CONF_MESSAGE[Instance Params]" label="CONF_MESSAGE[Feed Instance]" description="CONF_MESSAGE[Choose the plugin]" mandatory="true" default="feed.sql"/>
     </server_settings>
     <registry_contributions>
@@ -69,6 +70,12 @@
                     </serverCallback>
                 </processing>
             </action>
+            <action name="clear_feed">
+                <processing><serverCallback methodName="clearUserFeed" restParams="/context_type/context_value">
+                    <input_param name="context_type" type="string" description="all|repository|user"/>
+                    <input_param name="context_value" type="string" description="Either empty, or a repo ID, or a userId depending on the context_type"/>
+                </serverCallback></processing>
+            </action>
             <action name="dismiss_user_alert">
                 <gui text="notification_center.7" title="notification_center.7" iconClass="mdi mdi-close-circle" src="notification_center/ICON_SIZE/feed.png" accessKey="" hasAccessKey="false">
                     <context selection="true" dir="" recycle="true" actionBar="true" actionBarGroup="inline-notifications" contextMenu="false" infoPanel="false"/>
diff --git a/core/src/plugins/core.notifications/res/i18n/ca.php b/core/src/plugins/core.notifications/res/i18n/ca.php
index f27db34857..9fdea09e30 100644
--- a/core/src/plugins/core.notifications/res/i18n/ca.php
+++ b/core/src/plugins/core.notifications/res/i18n/ca.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 *
 * 
 */
diff --git a/core/src/plugins/core.notifications/res/i18n/conf/ca.php b/core/src/plugins/core.notifications/res/i18n/conf/ca.php
index d4d359ca86..04b1297bf0 100644
--- a/core/src/plugins/core.notifications/res/i18n/conf/ca.php
+++ b/core/src/plugins/core.notifications/res/i18n/conf/ca.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 // catalan translation: Salva Gómez <salva.gomez at gmail.com>, 2015
 $mess=array(
diff --git a/core/src/plugins/core.notifications/res/i18n/conf/de.php b/core/src/plugins/core.notifications/res/i18n/conf/de.php
index a05556252c..0183796fc8 100644
--- a/core/src/plugins/core.notifications/res/i18n/conf/de.php
+++ b/core/src/plugins/core.notifications/res/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 /*******************************************************************************
 * German translation:
diff --git a/core/src/plugins/core.notifications/res/i18n/conf/en.php b/core/src/plugins/core.notifications/res/i18n/conf/en.php
index 7fea66ddd2..bd07d5bec7 100644
--- a/core/src/plugins/core.notifications/res/i18n/conf/en.php
+++ b/core/src/plugins/core.notifications/res/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Notification Center" => "Notification Center",
diff --git a/core/src/plugins/core.notifications/res/i18n/conf/es.php b/core/src/plugins/core.notifications/res/i18n/conf/es.php
index 85de3f1e65..04da77d025 100644
--- a/core/src/plugins/core.notifications/res/i18n/conf/es.php
+++ b/core/src/plugins/core.notifications/res/i18n/conf/es.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 // spanish translation: Salva Gómez <salva.gomez at gmail.com>, 2015
 $mess=array(
diff --git a/core/src/plugins/core.notifications/res/i18n/conf/fr.php b/core/src/plugins/core.notifications/res/i18n/conf/fr.php
index 962c416fda..6818c7ab44 100644
--- a/core/src/plugins/core.notifications/res/i18n/conf/fr.php
+++ b/core/src/plugins/core.notifications/res/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Activate desktop notifications" => "Activer les notifications sur l'espace de travail",
@@ -28,4 +28,4 @@
 "Instance Params" => "Paramêtre d'instance",
 "Feed Instance" => "Feed Instance",
 "Choose the plugin" => "Choisir un plugin",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/core.notifications/res/i18n/de.php b/core/src/plugins/core.notifications/res/i18n/de.php
index da304c9b43..7638e7284f 100644
--- a/core/src/plugins/core.notifications/res/i18n/de.php
+++ b/core/src/plugins/core.notifications/res/i18n/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 /*******************************************************************************
diff --git a/core/src/plugins/core.notifications/res/i18n/en.php b/core/src/plugins/core.notifications/res/i18n/en.php
index 5ffbb72250..025c36438c 100644
--- a/core/src/plugins/core.notifications/res/i18n/en.php
+++ b/core/src/plugins/core.notifications/res/i18n/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
     "1" => "Notifications",
diff --git a/core/src/plugins/core.notifications/res/i18n/es.php b/core/src/plugins/core.notifications/res/i18n/es.php
index 11162fd448..b78cd52030 100644
--- a/core/src/plugins/core.notifications/res/i18n/es.php
+++ b/core/src/plugins/core.notifications/res/i18n/es.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 // spanish translation: Salva Gómez <salva.gomez at gmail.com>, 2015
 $mess=array(
diff --git a/core/src/plugins/core.notifications/res/i18n/fr.php b/core/src/plugins/core.notifications/res/i18n/fr.php
index 31ef9aec82..8c4ac083db 100644
--- a/core/src/plugins/core.notifications/res/i18n/fr.php
+++ b/core/src/plugins/core.notifications/res/i18n/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Notifications",
diff --git a/core/src/plugins/core.notifications/res/i18n/it.php b/core/src/plugins/core.notifications/res/i18n/it.php
index 9f0f50a2d1..e3468fc15f 100644
--- a/core/src/plugins/core.notifications/res/i18n/it.php
+++ b/core/src/plugins/core.notifications/res/i18n/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Notifiche",
diff --git a/core/src/plugins/core.notifications/res/i18n/pt.php b/core/src/plugins/core.notifications/res/i18n/pt.php
index 196e08dfb9..2ea794d2e3 100644
--- a/core/src/plugins/core.notifications/res/i18n/pt.php
+++ b/core/src/plugins/core.notifications/res/i18n/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Notificações",
diff --git a/core/src/plugins/core.notifications/res/i18n/ru.php b/core/src/plugins/core.notifications/res/i18n/ru.php
index 5fec802662..96e198b316 100644
--- a/core/src/plugins/core.notifications/res/i18n/ru.php
+++ b/core/src/plugins/core.notifications/res/i18n/ru.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Уведомления",
diff --git a/core/src/plugins/core.notifications/templates/block/ca.php b/core/src/plugins/core.notifications/templates/block/ca.php
index 6ac806304a..071e3fa35f 100644
--- a/core/src/plugins/core.notifications/templates/block/ca.php
+++ b/core/src/plugins/core.notifications/templates/block/ca.php
@@ -16,7 +16,7 @@
     * You should have received a copy of the GNU Affero General Public License
     * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
     *
-    * The latest code can be found at <http://pyd.io/>.
+    * The latest code can be found at <https://pydio.com>.
     */
 //      catalan translation: Salva Gómez <salva.gomez at gmail.com>, 2016
 $mess=array(
diff --git a/core/src/plugins/core.notifications/templates/block/de.php b/core/src/plugins/core.notifications/templates/block/de.php
index 13ce30756b..ac607a6825 100644
--- a/core/src/plugins/core.notifications/templates/block/de.php
+++ b/core/src/plugins/core.notifications/templates/block/de.php
@@ -16,7 +16,7 @@
     * You should have received a copy of the GNU Affero General Public License
     * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
     *
-    * The latest code can be found at <http://pyd.io/>.
+    * The latest code can be found at <https://pydio.com>.
     */
 $mess=array(
     "user_link"  => "von",
diff --git a/core/src/plugins/core.notifications/templates/block/en.php b/core/src/plugins/core.notifications/templates/block/en.php
index 1eae70f585..5e8ac9a062 100644
--- a/core/src/plugins/core.notifications/templates/block/en.php
+++ b/core/src/plugins/core.notifications/templates/block/en.php
@@ -16,7 +16,7 @@
     * You should have received a copy of the GNU Affero General Public License
     * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
     *
-    * The latest code can be found at <http://pyd.io/>.
+    * The latest code can be found at <https://pydio.com>.
     */
 
 $mess=array(
diff --git a/core/src/plugins/core.notifications/templates/block/es.php b/core/src/plugins/core.notifications/templates/block/es.php
index 1306d608f5..5eaed4a438 100644
--- a/core/src/plugins/core.notifications/templates/block/es.php
+++ b/core/src/plugins/core.notifications/templates/block/es.php
@@ -16,7 +16,7 @@
     * You should have received a copy of the GNU Affero General Public License
     * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
     *
-    * The latest code can be found at <http://pyd.io/>.
+    * The latest code can be found at <https://pydio.com>.
     */
 //      spanish translation: Salva Gómez <salva.gomez at gmail.com>, 2016
 $mess=array(
diff --git a/core/src/plugins/core.notifications/templates/block/fr.php b/core/src/plugins/core.notifications/templates/block/fr.php
index 31df49d618..718dcc1f4e 100644
--- a/core/src/plugins/core.notifications/templates/block/fr.php
+++ b/core/src/plugins/core.notifications/templates/block/fr.php
@@ -16,7 +16,7 @@
     * You should have received a copy of the GNU Affero General Public License
     * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
     *
-    * The latest code can be found at <http://pyd.io/>.
+    * The latest code can be found at <https://pydio.com>.
     */
 $mess=array(
     "user_link"  => "par",
diff --git a/core/src/plugins/core.notifications/templates/block/pt.php b/core/src/plugins/core.notifications/templates/block/pt.php
index c7ec86dcfd..75c5bd2231 100644
--- a/core/src/plugins/core.notifications/templates/block/pt.php
+++ b/core/src/plugins/core.notifications/templates/block/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "user_URL"  => "por",
diff --git a/core/src/plugins/core.notifications/templates/block/ru.php b/core/src/plugins/core.notifications/templates/block/ru.php
index 4fd3b54670..1a4782685e 100644
--- a/core/src/plugins/core.notifications/templates/block/ru.php
+++ b/core/src/plugins/core.notifications/templates/block/ru.php
@@ -16,7 +16,7 @@
     * You should have received a copy of the GNU Affero General Public License
     * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
     *
-    * The latest code can be found at <http://pyd.io/>.
+    * The latest code can be found at <https://pydio.com>.
     */
 $mess=array(
     "user_link"  => "пользователь",
diff --git a/core/src/plugins/core.notifications/templates/group/ca.php b/core/src/plugins/core.notifications/templates/group/ca.php
index b72e9a0e3a..f83682f322 100644
--- a/core/src/plugins/core.notifications/templates/group/ca.php
+++ b/core/src/plugins/core.notifications/templates/group/ca.php
@@ -16,7 +16,7 @@
     * You should have received a copy of the GNU Affero General Public License
     * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
     *
-    * The latest code can be found at <http://pyd.io/>.
+    * The latest code can be found at <https://pydio.com>.
     */
 //      catalan translation: Salva Gómez <salva.gomez at gmail.com>, 2016
 $mess=array(
diff --git a/core/src/plugins/core.notifications/templates/group/de.php b/core/src/plugins/core.notifications/templates/group/de.php
index e15bcd9baa..4aa7725fd1 100755
--- a/core/src/plugins/core.notifications/templates/group/de.php
+++ b/core/src/plugins/core.notifications/templates/group/de.php
@@ -16,7 +16,7 @@
     * You should have received a copy of the GNU Affero General Public License
     * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
     *
-    * The latest code can be found at <http://pyd.io/>.
+    * The latest code can be found at <https://pydio.com>.
     */
 $mess=array(
     "file.add" => "Datei AJXP_NODE_LABEL zu AJXP_PARENT_PATH hinzugefügt",
diff --git a/core/src/plugins/core.notifications/templates/group/en.php b/core/src/plugins/core.notifications/templates/group/en.php
index 71b6756a66..9fd89e957f 100755
--- a/core/src/plugins/core.notifications/templates/group/en.php
+++ b/core/src/plugins/core.notifications/templates/group/en.php
@@ -16,7 +16,7 @@
     * You should have received a copy of the GNU Affero General Public License
     * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
     *
-    * The latest code can be found at <http://pyd.io/>.
+    * The latest code can be found at <https://pydio.com>.
     */
 
 $mess=array(
diff --git a/core/src/plugins/core.notifications/templates/group/es.php b/core/src/plugins/core.notifications/templates/group/es.php
index ee9ee61ac4..3119783827 100644
--- a/core/src/plugins/core.notifications/templates/group/es.php
+++ b/core/src/plugins/core.notifications/templates/group/es.php
@@ -16,7 +16,7 @@
     * You should have received a copy of the GNU Affero General Public License
     * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
     *
-    * The latest code can be found at <http://pyd.io/>.
+    * The latest code can be found at <https://pydio.com>.
     */
 //      spanish translation: Salva Gómez <salva.gomez at gmail.com>, 2016
 $mess=array(
diff --git a/core/src/plugins/core.notifications/templates/group/fr.php b/core/src/plugins/core.notifications/templates/group/fr.php
index f42cc5f401..a2f6a7018b 100755
--- a/core/src/plugins/core.notifications/templates/group/fr.php
+++ b/core/src/plugins/core.notifications/templates/group/fr.php
@@ -16,7 +16,7 @@
     * You should have received a copy of the GNU Affero General Public License
     * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
     *
-    * The latest code can be found at <http://pyd.io/>.
+    * The latest code can be found at <https://pydio.com>.
     */
 $mess=array(
     "file.add" => "Le fichier AJXP_NODE_LABEL a été ajouté dans AJXP_PARENT_PATH",
diff --git a/core/src/plugins/core.notifications/templates/group/pt.php b/core/src/plugins/core.notifications/templates/group/pt.php
index 7c075d489f..ea789a0666 100644
--- a/core/src/plugins/core.notifications/templates/group/pt.php
+++ b/core/src/plugins/core.notifications/templates/group/pt.php
@@ -16,7 +16,7 @@
     * You should have received a copy of the GNU Affero General Public License
     * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
     *
-    * The latest code can be found at <http://pyd.io/>.
+    * The latest code can be found at <https://pydio.com>.
     */
 $mess=array(
     "file.add" => "Ficheiro AJXP_NODE_LABEL adicionado a AJXP_PARENT_PATH",
diff --git a/core/src/plugins/core.notifications/templates/group/ru.php b/core/src/plugins/core.notifications/templates/group/ru.php
index 00519922d8..8d647e8f0f 100644
--- a/core/src/plugins/core.notifications/templates/group/ru.php
+++ b/core/src/plugins/core.notifications/templates/group/ru.php
@@ -16,7 +16,7 @@
     * You should have received a copy of the GNU Affero General Public License
     * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
     *
-    * The latest code can be found at <http://pyd.io/>.
+    * The latest code can be found at <https://pydio.com>.
     */
 $mess=array(
     "file.add" => "Файл AJXP_NODE_LABEL добавлен к AJXP_PARENT_PATH",
diff --git a/core/src/plugins/core.notifications/templates/location/ca.php b/core/src/plugins/core.notifications/templates/location/ca.php
index 5c0c613b92..df4b298ba5 100644
--- a/core/src/plugins/core.notifications/templates/location/ca.php
+++ b/core/src/plugins/core.notifications/templates/location/ca.php
@@ -16,7 +16,7 @@
     * You should have received a copy of the GNU Affero General Public License
     * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
     *
-    * The latest code can be found at <http://pyd.io/>.
+    * The latest code can be found at <https://pydio.com>.
     */
 	//      catalan translation: Salva Gómez <salva.gomez at gmail.com>, 2016
 $mess=array(
diff --git a/core/src/plugins/core.notifications/templates/location/de.php b/core/src/plugins/core.notifications/templates/location/de.php
index 898e5aa8e1..b6a8fadb83 100644
--- a/core/src/plugins/core.notifications/templates/location/de.php
+++ b/core/src/plugins/core.notifications/templates/location/de.php
@@ -16,7 +16,7 @@
     * You should have received a copy of the GNU Affero General Public License
     * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
     *
-    * The latest code can be found at <http://pyd.io/>.
+    * The latest code can be found at <https://pydio.com>.
     */
 $mess=array(
     "workspace.normal" => "Arbeitsumgebung AJXP_REPOSITORY_LABEL",
diff --git a/core/src/plugins/core.notifications/templates/location/en.php b/core/src/plugins/core.notifications/templates/location/en.php
index 61009ca42e..253d195516 100644
--- a/core/src/plugins/core.notifications/templates/location/en.php
+++ b/core/src/plugins/core.notifications/templates/location/en.php
@@ -16,7 +16,7 @@
     * You should have received a copy of the GNU Affero General Public License
     * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
     *
-    * The latest code can be found at <http://pyd.io/>.
+    * The latest code can be found at <https://pydio.com>.
     */
 $mess=array(
     "workspace.normal" => "Workspace AJXP_REPOSITORY_LABEL",
diff --git a/core/src/plugins/core.notifications/templates/location/es.php b/core/src/plugins/core.notifications/templates/location/es.php
index 775616303f..5a5f862d64 100644
--- a/core/src/plugins/core.notifications/templates/location/es.php
+++ b/core/src/plugins/core.notifications/templates/location/es.php
@@ -16,7 +16,7 @@
     * You should have received a copy of the GNU Affero General Public License
     * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
     *
-    * The latest code can be found at <http://pyd.io/>.
+    * The latest code can be found at <https://pydio.com>.
     */
 	//      spanish translation: Salva Gómez <salva.gomez at gmail.com>, 2016
 $mess=array(
diff --git a/core/src/plugins/core.notifications/templates/location/fr.php b/core/src/plugins/core.notifications/templates/location/fr.php
index 87c4913a7d..6af0058bba 100644
--- a/core/src/plugins/core.notifications/templates/location/fr.php
+++ b/core/src/plugins/core.notifications/templates/location/fr.php
@@ -16,7 +16,7 @@
     * You should have received a copy of the GNU Affero General Public License
     * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
     *
-    * The latest code can be found at <http://pyd.io/>.
+    * The latest code can be found at <https://pydio.com>.
     */
 $mess=array(
     "workspace.normal" => "Dépôt AJXP_REPOSITORY_LABEL",
diff --git a/core/src/plugins/core.notifications/templates/long/ca.php b/core/src/plugins/core.notifications/templates/long/ca.php
index bee518713c..ec85338be9 100644
--- a/core/src/plugins/core.notifications/templates/long/ca.php
+++ b/core/src/plugins/core.notifications/templates/long/ca.php
@@ -16,7 +16,7 @@
     * You should have received a copy of the GNU Affero General Public License
     * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
     *
-    * The latest code can be found at <http://pyd.io/>.
+    * The latest code can be found at <https://pydio.com>.
     */
 	//      catalan translation: Salva Gómez <salva.gomez at gmail.com>, 2016
 $mess=array(
diff --git a/core/src/plugins/core.notifications/templates/long/de.php b/core/src/plugins/core.notifications/templates/long/de.php
index b8b500518a..7bedd59899 100755
--- a/core/src/plugins/core.notifications/templates/long/de.php
+++ b/core/src/plugins/core.notifications/templates/long/de.php
@@ -16,7 +16,7 @@
     * You should have received a copy of the GNU Affero General Public License
     * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
     *
-    * The latest code can be found at <http://pyd.io/>.
+    * The latest code can be found at <https://pydio.com>.
     */
 $mess=array(
     "file.add" => "In den Repositorie AJXP_REPOSITORY_LABEL wurde, innerhalb des Ordners AJXP_PARENT_PATH, die Datei AJXP_NODE_LABEL erstellt. AJXP_DATE, von AJXP_USER",
diff --git a/core/src/plugins/core.notifications/templates/long/en.php b/core/src/plugins/core.notifications/templates/long/en.php
index bebfb84d04..27fabbb90f 100755
--- a/core/src/plugins/core.notifications/templates/long/en.php
+++ b/core/src/plugins/core.notifications/templates/long/en.php
@@ -16,7 +16,7 @@
     * You should have received a copy of the GNU Affero General Public License
     * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
     *
-    * The latest code can be found at <http://pyd.io/>.
+    * The latest code can be found at <https://pydio.com>.
     */
 $mess=array(
     "file.add" => "The file AJXP_NODE_LABEL was created inside AJXP_PARENT_PATH AJXP_DATE by AJXP_USER.",
diff --git a/core/src/plugins/core.notifications/templates/long/es.php b/core/src/plugins/core.notifications/templates/long/es.php
index 5ff002f03d..b8c308d817 100644
--- a/core/src/plugins/core.notifications/templates/long/es.php
+++ b/core/src/plugins/core.notifications/templates/long/es.php
@@ -16,7 +16,7 @@
     * You should have received a copy of the GNU Affero General Public License
     * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
     *
-    * The latest code can be found at <http://pyd.io/>.
+    * The latest code can be found at <https://pydio.com>.
     */
 	//      spanish translation: Salva Gómez <salva.gomez at gmail.com>, 2016
 $mess=array(
diff --git a/core/src/plugins/core.notifications/templates/long/fr.php b/core/src/plugins/core.notifications/templates/long/fr.php
index 559d7eb5a4..85a42eb9e4 100755
--- a/core/src/plugins/core.notifications/templates/long/fr.php
+++ b/core/src/plugins/core.notifications/templates/long/fr.php
@@ -16,7 +16,7 @@
     * You should have received a copy of the GNU Affero General Public License
     * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
     *
-    * The latest code can be found at <http://pyd.io/>.
+    * The latest code can be found at <https://pydio.com>.
     */
 $mess=array(
     "file.add" => "Le fichier AJXP_NODE_LABEL a été créé dans le répertoire AJXP_PARENT_PATH, AJXP_DATE par AJXP_USER.",
diff --git a/core/src/plugins/core.notifications/templates/long/pt.php b/core/src/plugins/core.notifications/templates/long/pt.php
index 5524c4a51a..616094be84 100644
--- a/core/src/plugins/core.notifications/templates/long/pt.php
+++ b/core/src/plugins/core.notifications/templates/long/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "file.add" => "Dentro da Área de Trabalho AJXP_REPOSITORY_LABEL, o ficheiro AJXP_NODE_LABEL foi criado dentro de AJXP_PARENT_PATH AJXP_DATE por AJXP_USER.",
diff --git a/core/src/plugins/core.notifications/templates/long/ru.php b/core/src/plugins/core.notifications/templates/long/ru.php
index c44f3cb5f9..296abacfa9 100644
--- a/core/src/plugins/core.notifications/templates/long/ru.php
+++ b/core/src/plugins/core.notifications/templates/long/ru.php
@@ -16,7 +16,7 @@
     * You should have received a copy of the GNU Affero General Public License
     * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
     *
-    * The latest code can be found at <http://pyd.io/>.
+    * The latest code can be found at <https://pydio.com>.
     */
 $mess=array(
     "file.add" => "Файл AJXP_NODE_LABEL создан пользователем AJXP_USER AJXP_DATE в папке AJXP_PARENT_PATH в рабочем пространстве AJXP_REPOSITORY_LABEL.",
diff --git a/core/src/plugins/core.notifications/templates/short/ca.php b/core/src/plugins/core.notifications/templates/short/ca.php
index d66399089b..071b882585 100644
--- a/core/src/plugins/core.notifications/templates/short/ca.php
+++ b/core/src/plugins/core.notifications/templates/short/ca.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 //      catalan translation: Salva Gómez <salva.gomez at gmail.com>, 2016
 $mess=array(
diff --git a/core/src/plugins/core.notifications/templates/short/de.php b/core/src/plugins/core.notifications/templates/short/de.php
index 263e98cac4..aab4c5b999 100755
--- a/core/src/plugins/core.notifications/templates/short/de.php
+++ b/core/src/plugins/core.notifications/templates/short/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
     "file.add" => "Datei AJXP_NODE_LABEL in AJXP_PARENT_PATH erstellt",
diff --git a/core/src/plugins/core.notifications/templates/short/en.php b/core/src/plugins/core.notifications/templates/short/en.php
index 9d0112c0ba..b76c7db0d5 100755
--- a/core/src/plugins/core.notifications/templates/short/en.php
+++ b/core/src/plugins/core.notifications/templates/short/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 $mess=array(
diff --git a/core/src/plugins/core.notifications/templates/short/es.php b/core/src/plugins/core.notifications/templates/short/es.php
index f69974c0e4..9369ea901b 100644
--- a/core/src/plugins/core.notifications/templates/short/es.php
+++ b/core/src/plugins/core.notifications/templates/short/es.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 //      spanish translation: Salva Gómez <salva.gomez at gmail.com>, 2016
 $mess=array(
diff --git a/core/src/plugins/core.notifications/templates/short/fr.php b/core/src/plugins/core.notifications/templates/short/fr.php
index 365565bf37..1c2038da73 100755
--- a/core/src/plugins/core.notifications/templates/short/fr.php
+++ b/core/src/plugins/core.notifications/templates/short/fr.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
     "file.add" => "Fichier AJXP_NODE_LABEL créé dans AJXP_PARENT_PATH",
diff --git a/core/src/plugins/core.notifications/templates/short/pt.php b/core/src/plugins/core.notifications/templates/short/pt.php
index 1bcda63d01..a43e0520a7 100644
--- a/core/src/plugins/core.notifications/templates/short/pt.php
+++ b/core/src/plugins/core.notifications/templates/short/pt.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
     "file.add" => "Ficheiro AJXP_NODE_LABEL criado em AJXP_PARENT_PATH",
diff --git a/core/src/plugins/core.notifications/templates/short/ru.php b/core/src/plugins/core.notifications/templates/short/ru.php
index 46628d1c8c..3a1c2063a4 100644
--- a/core/src/plugins/core.notifications/templates/short/ru.php
+++ b/core/src/plugins/core.notifications/templates/short/ru.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
     "file.add" => "Файл AJXP_NODE_LABEL создан в AJXP_PARENT_PATH",
diff --git a/core/src/plugins/core.ocs/ActionsController.php b/core/src/plugins/core.ocs/ActionsController.php
deleted file mode 100644
index 558df842e9..0000000000
--- a/core/src/plugins/core.ocs/ActionsController.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/*
- * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-namespace Pydio\OCS;
-use Pydio\OCS\Client\OCSClient;
-use Pydio\OCS\Model\SQLStore;
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-
-class ActionsController
-{
-    public function switchActions($actionName, $httpVars, $fileVars){
-
-        switch($actionName){
-
-            case "accept_invitation":
-
-                $remoteShareId = \AJXP_Utils::sanitize($httpVars["remote_share_id"], AJXP_SANITIZE_ALPHANUM);
-                $store = new SQLStore();
-                $remoteShare = $store->remoteShareById($remoteShareId);
-                if($remoteShare !== null){
-                    $client = new OCSClient();
-                    $client->acceptInvitation($remoteShare);
-                    $remoteShare->setStatus(OCS_INVITATION_STATUS_ACCEPTED);
-                    $store->storeRemoteShare($remoteShare);
-                }
-
-                break;
-
-            case "reject_invitation":
-
-                $remoteShareId = \AJXP_Utils::sanitize($httpVars["remote_share_id"], AJXP_SANITIZE_ALPHANUM);
-                $store = new SQLStore();
-                $remoteShare = $store->remoteShareById($remoteShareId);
-                if($remoteShare !== null){
-                    $client = new OCSClient();
-                    $client->declineInvitation($remoteShare);
-                    $store->deleteRemoteShare($remoteShare);
-                    \ConfService::getInstance()->invalidateLoadedRepositories();
-                }
-
-                break;
-            default:
-                break;
-        }
-
-        return null;
-
-    }
-
-
-}
\ No newline at end of file
diff --git a/core/src/plugins/core.ocs/OCSPlugin.php b/core/src/plugins/core.ocs/OCSPlugin.php
deleted file mode 100644
index 2eb3e20b27..0000000000
--- a/core/src/plugins/core.ocs/OCSPlugin.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-/*
- * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-namespace Pydio\OCS;
-
-use Aws\AutoScaling\Exception\ScalingActivityInProgressException;
-use Pydio\OCS\Server\Dummy;
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-require_once("vendor/autoload.php");
-
-class OCSPlugin extends \AJXP_Plugin{
-
-    /**
-     * @var ActionsController $controller
-     */
-    protected $controller;
-
-    public function init($options)
-    {
-        parent::init($options);
-        \AJXP_Controller::registerIncludeHook("repository.list", array($this, "populateRemotes"));
-        \AJXP_Controller::registerIncludeHook("repository.search", array($this, "remoteRepositoryById"));
-    }
-
-    protected function getController(){
-        if($this->controller == null){
-            require_once ("ActionsController.php");
-            $this->controller = new ActionsController();
-        }
-        return $this->controller;
-    }
-
-    public function applyActions($actionName, $httpVars, $fileVars){
-        return $this->getController()->switchActions($actionName, $httpVars, $fileVars);
-    }
-
-    public function federatedEnabled(){
-        return $this->getConfigs()["ENABLE_FEDERATED_SHARING"] === true;
-    }
-
-    public function publishServices(){
-
-        $services = array();
-        if($this->federatedEnabled()){
-            $services["FEDERATED_SHARING"] = array(
-                "version" => 1,
-                "endpoints" => array(
-                    "share" => "/ocs/v2/shares",
-                    "webdav" => "/ocs/v2/dav"
-                )
-            );
-        }
-        $output = array("version" => 2, "services" => $services);
-        header("Content-Type: text/json");
-        print(json_encode($output));
-
-    }
-
-    public function route($baseUri, $endpoint, $uriParts, $parameters){
-
-        if($endpoint == "dav" && $this->federatedEnabled()){
-
-            $server = new Server\Dav\Server();
-            $server->start($baseUri."/ocs/v2/dav");
-
-        }else if($endpoint == "shares" && $this->federatedEnabled()){
-
-            $server = new Server\Federated\Server();
-            $server->run($uriParts, $parameters);
-
-        }else{
-
-            Dummy::notImplemented($uriParts, $parameters);
-
-        }
-
-    }
-
-    /**
-     * Triggered on repository list loading
-     * @param array $wsList
-     * @param string $scope
-     * @param bool $includeShared
-     */
-    public function populateRemotes(&$wsList, $scope = "user", $includeShared = true){
-        if(!$includeShared || $scope != "user"){
-            return;
-        }
-        $loggedUser = \AuthService::getLoggedUser();
-        if($loggedUser == null){
-            return;
-        }
-        $store = new Model\SQLStore();
-        $shares = $store->remoteSharesForUser($loggedUser->getId());
-        foreach($shares as $share){
-            $repo = $share->buildVirtualRepository();
-            $loggedUser->personalRole->setAcl($repo->getId(), "rw");
-            $wsList[$repo->getId()] = $repo;
-        }
-        if(count($shares)){
-            $loggedUser->recomputeMergedRole();
-            \AuthService::updateUser($loggedUser);
-        }
-    }
-
-    public function remoteRepositoryById($repositoryId, &$repoObject){
-        if(strpos($repositoryId, "ocs_remote_share_") !== 0){
-            return;
-        }
-        $store = new Model\SQLStore();
-        $remoteShareId = str_replace("ocs_remote_share_", "", $repositoryId);
-        $share = $store->remoteShareById($remoteShareId);
-        if($share != null){
-            $repoObject = $share->buildVirtualRepository();
-            $loggedUser = \AuthService::getLoggedUser();
-            if($loggedUser != null){
-                $loggedUser->personalRole->setAcl($repoObject->getId(), "rw");
-                $loggedUser->recomputeMergedRole();
-                \AuthService::updateUser($loggedUser);
-            }
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/core/src/plugins/core.ocs/composer.json b/core/src/plugins/core.ocs/composer.json
index e6986b8b38..f38b8ac403 100644
--- a/core/src/plugins/core.ocs/composer.json
+++ b/core/src/plugins/core.ocs/composer.json
@@ -6,8 +6,6 @@
   "autoload": {
     "psr-4": {
       "Pydio\\OCS\\": "./src"
-    },
-    "classmap":["../../core/classes/sabredav/ajaxplorer"],
-    "files":["../../core/classes/sabredav/lib/Sabre/autoload.php"]
+    }
   }
 }
diff --git a/core/src/plugins/core.ocs/manifest.xml b/core/src/plugins/core.ocs/manifest.xml
index e40ec1297d..0291a866d5 100644
--- a/core/src/plugins/core.ocs/manifest.xml
+++ b/core/src/plugins/core.ocs/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ajxp_plugin label="CONF_MESSAGE[Open Cloud API]" description="CONF_MESSAGE[Open Cloud API Implementation]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <class_definition classname="Pydio\OCS\OCSPlugin" filename="plugins/core.ocs/OCSPlugin.php"/>
+    <class_definition classname="Pydio\OCS\OCSPlugin" filename="plugins/core.ocs/src/OCSPlugin.php"/>
     <client_settings>
         <resources>
             <i18n namespace="core.ocs" path="plugins/core.ocs/i18n"/>
@@ -15,12 +15,12 @@
         <actions>
             <action name="accept_invitation">
                 <processing>
-                    <serverCallback methodName="applyActions" restParams="/remote_share_id" />
+                    <serverCallback methodName="switchAction" restParams="/remote_share_id" />
                 </processing>
             </action>
             <action name="reject_invitation">
                 <processing>
-                    <serverCallback methodName="applyActions" restParams="/remote_share_id" />
+                    <serverCallback methodName="switchAction" restParams="/remote_share_id" />
                 </processing>
             </action>
         </actions>
diff --git a/core/src/plugins/core.ocs/src/ActionsController.php b/core/src/plugins/core.ocs/src/ActionsController.php
new file mode 100644
index 0000000000..414da4f7a6
--- /dev/null
+++ b/core/src/plugins/core.ocs/src/ActionsController.php
@@ -0,0 +1,122 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\OCS;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Cache\Core\CacheStreamLayer;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Utils\Vars\InputFilter;
+
+use Pydio\Log\Core\Logger;
+use Pydio\OCS\Client\OCSClient;
+use Pydio\OCS\Model\SQLStore;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class ActionsController
+ * @package Pydio\OCS
+ */
+class ActionsController
+{
+    /**
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @return null
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public function switchAction(ServerRequestInterface &$request, ResponseInterface &$response) {
+
+        /** @var ContextInterface $ctx */
+        $ctx = $request->getAttribute("ctx");
+        $action = $request->getAttribute("action");
+        $httpVars = $request->getParsedBody();
+        
+        switch($action){
+
+            case "accept_invitation":
+
+                $remoteShareId = InputFilter::sanitize($httpVars["remote_share_id"], InputFilter::SANITIZE_ALPHANUM);
+                $store = new SQLStore();
+                $remoteShare = $store->remoteShareById($remoteShareId);
+                if($remoteShare === null){
+                    throw new PydioException("Cannot find remote share with ID ".$remoteShareId);
+                }
+
+                $client = new OCSClient();
+                $client->acceptInvitation($remoteShare);
+                $remoteShare->setStatus(OCS_INVITATION_STATUS_ACCEPTED);
+                $store->storeRemoteShare($remoteShare);
+
+                $urlBase = $ctx->getUrlBase();
+                
+                CacheStreamLayer::clearDirCache($urlBase);
+                CacheStreamLayer::clearStatCache($urlBase . "/" . $remoteShare->getDocumentName());
+
+                $remoteCtx = new Context($remoteShare->getUser(), "ocs_remote_share_" . $remoteShare->getId());
+                CacheStreamLayer::clearStatCache($remoteCtx->getUrlBase());
+
+                break;
+
+            case "reject_invitation":
+
+                $remoteShareId = InputFilter::sanitize($httpVars["remote_share_id"], InputFilter::SANITIZE_ALPHANUM);
+                $store = new SQLStore();
+                $remoteShare = $store->remoteShareById($remoteShareId);
+                if($remoteShare === null){
+                    throw new PydioException("Cannot find remote share with ID ".$remoteShareId);
+                }
+
+                $client = new OCSClient();
+                try {
+                    $client->declineInvitation($remoteShare);
+                } catch (\Exception $e) {
+                    // If the reject fails, we still want the share to be removed from the db
+                    Logger::error(__CLASS__,"Exception",$e->getMessage());
+                }
+                $store->deleteRemoteShare($remoteShare);
+                ConfService::getInstance()->invalidateLoadedRepositories();
+
+                $urlBase = $ctx->getUrlBase();
+
+                CacheStreamLayer::clearDirCache($urlBase);
+                CacheStreamLayer::clearStatCache($urlBase . "/" . $remoteShare->getDocumentName());
+
+                $remoteCtx = new Context($remoteShare->getUser(), "ocs_remote_share_" . $remoteShare->getId());
+                CacheStreamLayer::clearStatCache($remoteCtx->getUrlBase());
+
+                break;
+
+            default:
+
+                break;
+            
+        }
+
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.ocs/src/Client/IFederated.php b/core/src/plugins/core.ocs/src/Client/IFederated.php
index 7312198d3e..abf35c39b9 100644
--- a/core/src/plugins/core.ocs/src/Client/IFederated.php
+++ b/core/src/plugins/core.ocs/src/Client/IFederated.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 namespace Pydio\OCS\Client;
 
@@ -26,15 +26,37 @@
 defined('AJXP_EXEC') or die('Access not allowed');
 
 
+/**
+ * Interface IFederated
+ * @package Pydio\OCS\Client
+ */
 interface IFederated
 {
     // Sender to Remote
+    /**
+     * @param ShareInvitation $invitation
+     * @return mixed
+     */
     public function sendInvitation(ShareInvitation $invitation);
+
+    /**
+     * @param ShareInvitation $invitation
+     * @return mixed
+     */
     public function cancelInvitation(ShareInvitation $invitation);
 
 
     // Remote from sender
+    /**
+     * @param RemoteShare $remoteShare
+     * @return mixed
+     */
     public function acceptInvitation(RemoteShare $remoteShare);
+
+    /**
+     * @param RemoteShare $remoteShare
+     * @return mixed
+     */
     public function declineInvitation(RemoteShare $remoteShare);
 
 }
\ No newline at end of file
diff --git a/core/src/plugins/core.ocs/src/Client/IServiceDiscovery.php b/core/src/plugins/core.ocs/src/Client/IServiceDiscovery.php
index 685aee6490..65ad3a7d7e 100644
--- a/core/src/plugins/core.ocs/src/Client/IServiceDiscovery.php
+++ b/core/src/plugins/core.ocs/src/Client/IServiceDiscovery.php
@@ -16,16 +16,28 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 namespace Pydio\OCS\Client;
 defined('AJXP_EXEC') or die('Access not allowed');
 
 
+/**
+ * Interface IServiceDiscovery
+ * @package Pydio\OCS\Client
+ */
 interface IServiceDiscovery
 {
+    /**
+     * @param $url
+     * @return mixed
+     */
     public static function findEndpointsForURL($url);
 
+    /**
+     * @param $client
+     * @return mixed
+     */
     public static function findEndpointsForClient($client);
 }
diff --git a/core/src/plugins/core.ocs/src/Client/OCSClient.php b/core/src/plugins/core.ocs/src/Client/OCSClient.php
index 7a693591c2..ba4ca6dc9b 100644
--- a/core/src/plugins/core.ocs/src/Client/OCSClient.php
+++ b/core/src/plugins/core.ocs/src/Client/OCSClient.php
@@ -16,22 +16,25 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 namespace Pydio\OCS\Client;
 
 defined('AJXP_EXEC') or die('Access not allowed');
 defined('AJXP_BIN_FOLDER') or die('Bin folder not available');
 
-require_once(AJXP_BIN_FOLDER . '/guzzle/vendor/autoload.php');
+use Pydio\Core\Services\ApplicationState;
 
-use AJXP_Utils;
 use GuzzleHttp\Exception\RequestException;
 use Pydio\OCS\Model\RemoteShare;
 use Pydio\OCS\Model\ShareInvitation;
 use GuzzleHttp\Client as GuzzleClient;
 
 
+/**
+ * Class OCSClient
+ * @package Pydio\OCS\Client
+ */
 class OCSClient implements IFederated, IServiceDiscovery
 {
     /**
@@ -55,7 +58,7 @@ public function sendInvitation(ShareInvitation $invitation)
             'name' => $invitation->getDocumentName(),
             'remoteId' => $invitation->getId(),
             'owner' => $invitation->getOwner(),
-            'remote' => AJXP_Utils::detectServerUrl(true)
+            'remote' => ApplicationState::detectServerURL(true)
         ];
 
         $response = $client->post(ltrim($endpoints['share'], '/'), [
@@ -152,7 +155,9 @@ public function declineInvitation(RemoteShare $remoteShare)
     /**
      *
      * Retrieves the OCS Provider endpoints for the URL
+     * @param string $url
      *
+     * @return array
      */
     public static function findEndpointsForURL($url) {
         $client = self::getClient($url);
@@ -173,7 +178,7 @@ public static function findEndpointsForClient($client)
             // WARNING - This needs to be relative... :/
             $response = $client->get('ocs-provider/');
         } catch (RequestException $e) {
-            throw new \Exception('Failed to communicate with ocs provider');
+            throw new \Exception('Failed to communicate with ocs provider : '. $e->getMessage());
         }
 
         if ($response->getStatusCode() != 200) {
@@ -209,13 +214,4 @@ private static function getClient($url) {
         ]);
     }
 
-    /**
-     * @param $url
-     * @return mixed|string
-     */
-    private static function getPath($url) {
-        $path = parse_url($url, PHP_URL_PATH);
-        if($path == "/" || $path === $url) return "";
-        return $path;
-    }
 }
diff --git a/core/src/plugins/core.ocs/src/Model/IStore.php b/core/src/plugins/core.ocs/src/Model/IStore.php
index bea09f2be2..7caab9a8f2 100644
--- a/core/src/plugins/core.ocs/src/Model/IStore.php
+++ b/core/src/plugins/core.ocs/src/Model/IStore.php
@@ -16,13 +16,17 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 namespace Pydio\OCS\Model;
 
 defined('AJXP_EXEC') or die('Access not allowed');
 
+/**
+ * Interface IStore
+ * @package Pydio\OCS\Model
+ */
 interface IStore
 {
 
diff --git a/core/src/plugins/core.ocs/src/Model/RemoteShare.php b/core/src/plugins/core.ocs/src/Model/RemoteShare.php
index 26722164f5..15037b37cd 100644
--- a/core/src/plugins/core.ocs/src/Model/RemoteShare.php
+++ b/core/src/plugins/core.ocs/src/Model/RemoteShare.php
@@ -16,10 +16,13 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 namespace Pydio\OCS\Model;
 
+use Pydio\Access\Core\Filter\ContentFilter;
+
+use Pydio\Core\Services\RepositoryService;
 use Sabre\DAV;
 use Sabre\DAV\Exception;
 
@@ -30,6 +33,10 @@
     define('OCS_INVITATION_STATUS_REJECTED', 4);
 }
 
+/**
+ * Class RemoteShare
+ * @package Pydio\OCS\Model
+ */
 class RemoteShare
 {
     /**
@@ -112,12 +119,15 @@ public function getId()
         return $this->id;
     }
 
+    /**
+     * @param $id
+     */
     public function setId($id){
         $this->id = $id;
     }
 
     /**
-     * @return \Repository
+     * @return \Pydio\Access\Core\Model\Repository
      */
     public function buildVirtualRepository(){
         $repositoryId = "ocs_remote_share_".$this->getOcsToken();
@@ -140,19 +150,22 @@ public function buildVirtualRepository(){
 
         $remoteHost = $this->getHost();
         $remoteHost = !empty($remoteHost) ? '@' . $remoteHost : ' [remote]';
-        $repo = \ConfService::createRepositoryFromArray($repositoryId, $data);
+        $repo = RepositoryService::createRepositoryFromArray($repositoryId, $data);
         $repo->setRepositoryType("remote");
         $repo->setAccessStatus($this->getStatus() == OCS_INVITATION_STATUS_ACCEPTED ? "accepted":"");
         $repo->setWriteable(false);
         $repo->setOwnerData(null, $this->getSender().$remoteHost);
         if($this->isDocumentIsLeaf()){
-            $contentFilter = new \ContentFilter(array());
+            $contentFilter = new ContentFilter(array());
             $contentFilter->filters["/".$this->getDocumentName()] = "/"; // . $this->getDocumentName();
             $repo->setContentFilter($contentFilter);
         }
         return $repo;
     }
 
+    /**
+     * @return bool
+     */
     public function pingRemoteDAVPoint(){
 
         $fullPath = rtrim($this->getOcsDavUrl(), "/")."/".$this->getDocumentName();
diff --git a/core/src/plugins/core.ocs/src/Model/SQLStore.php b/core/src/plugins/core.ocs/src/Model/SQLStore.php
index a4ccef2312..73bc3aca84 100644
--- a/core/src/plugins/core.ocs/src/Model/SQLStore.php
+++ b/core/src/plugins/core.ocs/src/Model/SQLStore.php
@@ -16,31 +16,45 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 namespace Pydio\OCS\Model;
 
+use Pydio\Core\Services\ConfService;
+use Pydio\Conf\Sql\SqlConfDriver;
+
 defined('AJXP_EXEC') or die('Access not allowed');
 
 define('OCS_SQLSTORE_FORMAT', 'serial');
 define('OCS_SQLSTORE_NS_INVITATION', 'ocs_invitation');
 define('OCS_SQLSTORE_NS_REMOTE_SHARE', 'ocs_remote_share');
 
+/**
+ * Class SQLStore
+ * @package Pydio\OCS\Model
+ */
 class SQLStore implements IStore
 {
     /**
-     * @var \sqlConfDriver
+     * @var SqlConfDriver
      */
     protected $storage;
 
+    /**
+     * SQLStore constructor.
+     */
     public function __construct()
     {
-        $storage = \ConfService::getConfStorageImpl();
+        $storage = ConfService::getConfStorageImpl();
         if($storage->getId() == "conf.sql") {
             $this->storage = $storage;
         }
     }
 
+    /**
+     * @param ShareInvitation $invitation
+     * @return int
+     */
     public function generateInvitationId(ShareInvitation &$invitation){
         if(empty($id)){
             $id = $this->findAvailableID(OCS_SQLSTORE_NS_INVITATION);
@@ -74,7 +88,8 @@ public function storeInvitation(ShareInvitation $invitation)
      */
     public function invitationsForLink($linkToken)
     {
-        return $this->storage->simpleStoreList(OCS_SQLSTORE_NS_INVITATION, null, "", OCS_SQLSTORE_FORMAT, "", $linkToken);
+        $cursor = null;
+        return $this->storage->simpleStoreList(OCS_SQLSTORE_NS_INVITATION, $cursor, "", OCS_SQLSTORE_FORMAT, "", $linkToken);
     }
 
     /**
@@ -123,7 +138,8 @@ public function storeRemoteShare(RemoteShare $remoteShare)
      */
     public function remoteSharesForUser($userName)
     {
-        return $this->storage->simpleStoreList(OCS_SQLSTORE_NS_REMOTE_SHARE, null, "", OCS_SQLSTORE_FORMAT, "", $userName);
+        $cursor = null;
+        return $this->storage->simpleStoreList(OCS_SQLSTORE_NS_REMOTE_SHARE, $cursor, "", OCS_SQLSTORE_FORMAT, "", $userName);
     }
 
     /**
@@ -137,9 +153,14 @@ public function remoteShareById($remoteShareId)
         return $data;
     }
 
+    /**
+     * @param $ocsRemoteId
+     * @return mixed|null
+     */
     public function remoteShareForOcsRemoteId($ocsRemoteId){
         $searchString = 's:11:"ocsRemoteId";s:'.strlen($ocsRemoteId).':"'.$ocsRemoteId.'"';
-        $l = $this->storage->simpleStoreList(OCS_SQLSTORE_NS_REMOTE_SHARE, null,  "", OCS_SQLSTORE_FORMAT, "%$searchString%");
+        $cursor = null;
+        $l = $this->storage->simpleStoreList(OCS_SQLSTORE_NS_REMOTE_SHARE, $cursor,  "", OCS_SQLSTORE_FORMAT, "%$searchString%");
         if(count($l)){
             return array_shift(array_values($l));
         }else{
@@ -158,6 +179,10 @@ public function deleteRemoteShare(RemoteShare $remoteShare)
         return true;
     }
 
+    /**
+     * @param $namespace
+     * @return int
+     */
     protected function findAvailableID($namespace){
         $id = 0;
         while(true){
@@ -170,6 +195,9 @@ protected function findAvailableID($namespace){
         return $id;
     }
 
+    /**
+     * @return string
+     */
     protected function getGUID(){
         if (function_exists('com_create_guid')){
             return com_create_guid();
diff --git a/core/src/plugins/core.ocs/src/Model/ShareInvitation.php b/core/src/plugins/core.ocs/src/Model/ShareInvitation.php
index e51cf92ccb..10e93a3fa3 100644
--- a/core/src/plugins/core.ocs/src/Model/ShareInvitation.php
+++ b/core/src/plugins/core.ocs/src/Model/ShareInvitation.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 namespace Pydio\OCS\Model;
 
@@ -27,6 +27,10 @@
     define('OCS_INVITATION_STATUS_REJECTED', 4);
 }
 
+/**
+ * Class ShareInvitation
+ * @package Pydio\OCS\Model
+ */
 class ShareInvitation implements \JsonSerializable
 {
     /**
@@ -70,6 +74,9 @@ public function getId()
         return $this->id;
     }
 
+    /**
+     * @param string $id
+     */
     public function setId($id){
         $this->id = $id;
     }
@@ -82,6 +89,9 @@ public function getDocumentName()
         return $this->documentName;
     }
 
+    /**
+     * @param string $documentName
+     */
     public function setDocumentName($documentName){
         $this->documentName = $documentName;
     }
diff --git a/core/src/plugins/core.ocs/src/Model/TargettedLink.php b/core/src/plugins/core.ocs/src/Model/TargettedLink.php
index aad7d06e32..4cc05d3fd7 100644
--- a/core/src/plugins/core.ocs/src/Model/TargettedLink.php
+++ b/core/src/plugins/core.ocs/src/Model/TargettedLink.php
@@ -16,20 +16,33 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 namespace Pydio\OCS\Model;
+use Pydio\Share\Model\ShareLink;
+use Pydio\Share\View\PublicAccessManager;
+
 defined('AJXP_EXEC') or die('Access not allowed');
 
-require_once(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/action.share/class.ShareLink.php");
-class TargettedLink extends \ShareLink
+require_once(AJXP_INSTALL_PATH . "/" . AJXP_PLUGINS_FOLDER . "/action.share/vendor/autoload.php");
+
+/**
+ * Class TargettedLink
+ * @package Pydio\OCS\Model
+ */
+class TargettedLink extends ShareLink
 {
     /**
      * @var array
      */
     protected $pendingInvitation;
 
+    /**
+     * TargettedLink constructor.
+     * @param $store
+     * @param array $storeData
+     */
     public function __construct($store, $storeData = array()){
         parent::__construct($store, $storeData);
         $this->store = $store;
@@ -77,7 +90,7 @@ public function getPendingInvitation(){
     }
 
     /**
-     * @param \PublicAccessManager $publicAccessManager
+     * @param PublicAccessManager $publicAccessManager
      * @param array $messages
      * @return mixed
      */
diff --git a/core/src/plugins/core.ocs/src/OCSPlugin.php b/core/src/plugins/core.ocs/src/OCSPlugin.php
new file mode 100644
index 0000000000..cc60c21e8b
--- /dev/null
+++ b/core/src/plugins/core.ocs/src/OCSPlugin.php
@@ -0,0 +1,234 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\OCS;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Model\UserInterface;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\AuthService;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\OCS\Server\Dummy;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class OCSPlugin
+ * @package Pydio\OCS
+ */
+class OCSPlugin extends Plugin {
+
+    /**
+     * @var ActionsController $controller
+     */
+    protected $controller;
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        parent::init($ctx, $options);
+        Controller::registerIncludeHook("repository.list", array($this, "populateRemotes"));
+        Controller::registerIncludeHook("repository.search", array($this, "remoteRepositoryById"));
+    }
+
+    /**
+     * @return ActionsController
+     */
+    protected function getController(){
+        if($this->controller == null){
+            require_once("ActionsController.php");
+            $this->controller = new ActionsController();
+        }
+        return $this->controller;
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @return null
+     * @throws \Pydio\Core\Exception\PydioException
+     */
+    public function switchAction(ServerRequestInterface &$request, ResponseInterface &$response) {
+        return $this->getController()->switchAction($request, $response);
+    }
+
+    /**
+     * @return bool
+     */
+    public function federatedEnabled(){
+        return $this->getConfigs()["ENABLE_FEDERATED_SHARING"] === true;
+    }
+
+    public function publishServices(){
+
+        $services = array();
+        if($this->federatedEnabled()){
+            $services["FEDERATED_SHARING"] = array(
+                "version" => 1,
+                "endpoints" => array(
+                    "share" => "/ocs/v2/shares",
+                    "webdav" => "/ocs/v2/dav"
+                )
+            );
+        }
+        $output = array("version" => 2, "services" => $services);
+        header("Content-Type: text/json");
+        print(json_encode($output));
+
+    }
+
+    /**
+     * @param $baseUri
+     * @param $endpoint
+     * @param $uriParts
+     * @param $parameters
+     * @throws Server\InvalidArgumentsException
+     */
+    public function route($baseUri, $endpoint, $uriParts, $parameters){
+
+        if($endpoint == "dav" && $this->federatedEnabled()) {
+
+            $server = new Server\Dav\Server();
+            $server->start($baseUri."/ocs/v2/dav");
+
+        } else if($endpoint == "shares" && $this->federatedEnabled()) {
+
+            $server = new Server\Federated\Server();
+            $server->run($uriParts, $parameters);
+
+        } else {
+            Dummy::notImplemented($uriParts, $parameters);
+        }
+    }
+
+    /**
+     * Triggered on repository list loading
+     * @param array $wsList
+     * @param string $scope
+     * @param UserInterface $userObject
+     * @param bool $includeShared
+     */
+    public function populateRemotes(&$wsList, $scope = "user", $userObject, $includeShared = true){
+        if(!$includeShared || $scope != "user"){
+            return;
+        }
+        if($userObject == null){
+            return;
+        }
+        $store = new Model\SQLStore();
+        $shares = $store->remoteSharesForUser($userObject->getId());
+        foreach($shares as $share){
+            $repo = $share->buildVirtualRepository();
+            $userObject->getPersonalRole()->setAcl($repo->getId(), "rw");
+            $wsList[$repo->getId()] = $repo;
+        }
+        if(count($shares)){
+            $userObject->recomputeMergedRole();
+        }
+    }
+
+    /**
+     * @param $repositoryId
+     * @param $repoObject
+     * @throws \Exception
+     */
+    public function remoteRepositoryById($repositoryId, &$repoObject){
+        if(strpos($repositoryId, "ocs_remote_share_") !== 0){
+            return;
+        }
+        $store = new Model\SQLStore();
+        $remoteShareId = str_replace("ocs_remote_share_", "", $repositoryId);
+        $share = $store->remoteShareById($remoteShareId);
+        if($share != null){
+            $repoObject = $share->buildVirtualRepository();
+            AuthService::updateSessionUserAcl($repositoryId, "rw");
+        }
+        
+    }
+
+
+    /**
+     * @param $base
+     * @param $route
+     */
+    public static function startServer($base, $route) {
+        
+        $pServ = PluginsService::getInstance(Context::emptyContext());
+        ApplicationState::setSapiRestBase($base);
+
+        ConfService::init();
+        ConfService::start();
+
+        $pServ->initActivePlugins();
+
+        /**
+         * @var OCSPlugin $coreLoader
+         */
+        $coreLoader = $pServ->getPluginById("core.ocs");
+
+        if ($route == "/ocs-provider") {
+
+            $coreLoader->publishServices();
+
+        } else if ($route == "/ocs") {
+
+            $uri = $_SERVER["REQUEST_URI"];
+            $parts = explode("/", trim(parse_url($uri, PHP_URL_PATH), "/"));
+            $baseUri = array();
+            $root = array_shift($parts);
+            while (!in_array($root, array("ocs-provider", "ocs")) && count($parts)) {
+                $baseUri[] = $root;
+                $root = array_shift($parts);
+            }
+
+            if (count($parts) < 2) {
+                $d = new Dummy();
+                $response = $d->buildResponse("fail", "400", "Wrong URI");
+                $d->sendResponse($response);
+                return;
+            }
+
+            $version = array_shift($parts);
+            if ($version != "v2") {
+                $d = new Dummy();
+                $response = $d->buildResponse("fail", "400", "Api version not supported - Please switch to v2.");
+                $d->sendResponse($response);
+                return;
+            }
+            $endpoint = array_shift($parts);
+            if (count($baseUri)) {
+                $baseUriStr = "/" . implode("/", $baseUri);
+            } else {
+                $baseUriStr = "";
+            }
+
+            $coreLoader->route($baseUriStr, $endpoint, $parts, array_merge($_GET, $_POST));
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.ocs/src/Server/Dav/AuthSharingBackend.php b/core/src/plugins/core.ocs/src/Server/Dav/AuthSharingBackend.php
index fe7651f6ff..ee0d733d00 100644
--- a/core/src/plugins/core.ocs/src/Server/Dav/AuthSharingBackend.php
+++ b/core/src/plugins/core.ocs/src/Server/Dav/AuthSharingBackend.php
@@ -16,24 +16,37 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 namespace Pydio\OCS\Server\Dav;
 
 defined('AJXP_EXEC') or die('Access not allowed');
 
+use Pydio\Core\Exception\LoginException;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\AuthService;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Utils\TextEncoder;
+use Pydio\Log\Core\Logger;
+use Pydio\Share\Store\ShareStore;
 use Sabre\DAV;
 use Sabre\HTTP;
 
-require_once(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/action.share/class.ShareStore.php");
+require_once(AJXP_INSTALL_PATH . "/" . AJXP_PLUGINS_FOLDER . "/action.share/vendor/autoload.php");
 
+/**
+ * Class AuthSharingBackend
+ * @package Pydio\OCS\Server\Dav
+ */
 class AuthSharingBackend extends DAV\Auth\Backend\AbstractBasic
 {
 
     /**
-     * @var \AJXP_Sabre_Collection
+     * @var ContextInterface
      */
-    var $rootCollection;
+    private $context;
+
     /**
      * @var array
      */
@@ -41,10 +54,10 @@ class AuthSharingBackend extends DAV\Auth\Backend\AbstractBasic
 
     /**
      * OCS_DavAuthSharingBackend constructor.
-     * @param \AJXP_Sabre_Collection $rootCollection Repository object will be updated once authentication is passed
+     * @param ContextInterface $context Repository object will be updated once authentication is passed
      */
-    public function __construct($rootCollection){
-        $this->rootCollection = $rootCollection;
+    public function __construct(ContextInterface $context){
+        $this->context = $context;
     }
 
     /**
@@ -55,16 +68,20 @@ public function __construct($rootCollection){
      *
      * @param string $username
      * @param string $password
-     * @return bool
+     * @return mixed AJXP_User|bool
      */
     protected function validateUserPass($username, $password)
     {
-        if(isSet($this->shareData["PRESET_LOGIN"])){
-            $res = \AuthService::logUser($this->shareData["PRESET_LOGIN"], $password, false, false, -1);
-        }else{
-            $res = \AuthService::logUser($this->shareData["PRELOG_USER"], "", true);
+        try{
+            if(isSet($this->shareData["PRESET_LOGIN"])){
+                $user = AuthService::logUser($this->shareData["PRESET_LOGIN"], $password, false, false);
+            }else{
+                $user = AuthService::logUser($this->shareData["PRELOG_USER"], "", true);
+            }
+            return $user;
+        }catch (LoginException $l){
+            return false;
         }
-        return $res === 1;
     }
 
 
@@ -93,7 +110,8 @@ public function authenticate(DAV\Server $server, $realm) {
 
         // Authenticates the user
         $token = $userpass[0];
-        $shareStore = new \ShareStore(\ConfService::getCoreConf("PUBLIC_DOWNLOAD_FOLDER"));
+
+        $shareStore = new ShareStore($this->context, ConfService::getGlobalConf("PUBLIC_DOWNLOAD_FOLDER"));
         $shareData = $shareStore->loadShare($token);
         if(is_array($shareData)){
             $this->shareData = $shareData;
@@ -101,23 +119,30 @@ public function authenticate(DAV\Server $server, $realm) {
             $auth->requireLogin();
             throw new DAV\Exception\NotAuthenticated('Username or password does not match');
         }
-        if (!$this->validateUserPass($userpass[0],$userpass[1])) {
+
+        $user = $this->validateUserPass($userpass[0],$userpass[1]);
+        if (!$user) {
             $auth->requireLogin();
             throw new DAV\Exception\NotAuthenticated('Username or password does not match');
         }
 
         $repositoryId = $this->shareData["REPOSITORY"];
-        $repository = \ConfService::getRepositoryById($repositoryId);
+        $repository = RepositoryService::getRepositoryById($repositoryId);
         if ($repository == null) {
-            $repository = \ConfService::getRepositoryByAlias($repositoryId);
+            $repository = RepositoryService::getRepositoryByAlias($repositoryId);
         }
         if ($repository == null) {
             throw new DAV\Exception\NotAuthenticated('Username cannot access any repository');
         }else{
-            $this->rootCollection->updateRepository($repository);
+            $this->context->setRepositoryObject($repository);
         }
 
         $this->currentUser = $userpass[0];
+        $this->context->setUserObject($user);
+
+        Logger::updateContext($this->context);
+        TextEncoder::updateContext($this->context);
+
         return true;
     }
 
diff --git a/core/src/plugins/core.ocs/src/Server/Dav/BasicAuthNoPass.php b/core/src/plugins/core.ocs/src/Server/Dav/BasicAuthNoPass.php
index 840afce935..cad5e211b5 100644
--- a/core/src/plugins/core.ocs/src/Server/Dav/BasicAuthNoPass.php
+++ b/core/src/plugins/core.ocs/src/Server/Dav/BasicAuthNoPass.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 namespace Pydio\OCS\Server\Dav;
 
@@ -24,6 +24,11 @@
 
 use Sabre\HTTP;
 
+/**
+ * Class BasicAuthNoPass
+ * Implements OCS Spec to log user with "empty_user:password"
+ * @package Pydio\OCS\Server\Dav
+ */
 class BasicAuthNoPass extends HTTP\BasicAuth
 {
     /**
@@ -43,6 +48,10 @@ public function getUserPass() {
 
     }
 
+    /**
+     * @param HTTP\Request $httpRequest
+     * @return array|bool
+     */
     public static function parseUserPass(HTTP\Request $httpRequest){
 
         // Apache and mod_php
diff --git a/core/src/plugins/core.ocs/src/Server/Dav/Server.php b/core/src/plugins/core.ocs/src/Server/Dav/Server.php
index 6d81725721..258ffdb3a9 100644
--- a/core/src/plugins/core.ocs/src/Server/Dav/Server.php
+++ b/core/src/plugins/core.ocs/src/Server/Dav/Server.php
@@ -16,63 +16,79 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 namespace Pydio\OCS\Server\Dav;
 
 defined('AJXP_EXEC') or die('Access not allowed');
-require_once(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/action.share/class.ShareStore.php");
-
+require_once(AJXP_INSTALL_PATH . "/" . AJXP_PLUGINS_FOLDER . "/action.share/vendor/autoload.php");
+
+use Pydio\Core\Http\Dav\BrowserPlugin;
+use Pydio\Core\Http\Dav\Collection;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\ConfService;
+use Pydio\Log\Core\Logger;
+use Pydio\Share\Store\ShareStore;
 use Sabre;
 
+/**
+ * Class Server
+ * @package Pydio\OCS\Server\Dav
+ */
 class Server extends Sabre\DAV\Server
 {
-    var $rootCollection;
+    var $context;
     var $uniqueBaseFile;
 
+    /**
+     * Server constructor.
+     */
     public function __construct()
     {
-        $this->rootCollection = new \AJXP_Sabre_Collection("/", null, null);
-        parent::__construct($this->rootCollection);
+        $this->context = $this->buildContext(Context::emptyContext());
+        $rootCollection = new Collection("/", $this->context);
+
+        parent::__construct($rootCollection);
     }
 
     /**
-     * @return string
+     * @param ContextInterface $context
+     * @return ContextInterface|null
      */
-    protected function pointToBaseFile(){
-        try{
+    protected function buildContext(ContextInterface $context){
+        try {
             $testBackend = new BasicAuthNoPass();
             $userPass = $testBackend->getUserPass();
-            if(isSet($userPass[0])){
-                $shareStore = new \ShareStore(\ConfService::getCoreConf("PUBLIC_DOWNLOAD_FOLDER"));
+            if(isSet($userPass[0])) {
+
+                $context = $context->withUserId($userPass[0]);
+
+                $shareStore = new ShareStore($context, ConfService::getGlobalConf("PUBLIC_DOWNLOAD_FOLDER"));
                 $shareData = $shareStore->loadShare($userPass[0]);
-                if(isSet($shareData) && isSet($shareData["REPOSITORY"])){
-                    $repo = \ConfService::getRepositoryById($shareData["REPOSITORY"]);
-                    if(!empty($repo) && $repo->hasContentFilter()){
-                        return "/".$repo->getContentFilter()->getUniquePath();
-                    }
+
+                if(isSet($shareData) && isSet($shareData["REPOSITORY"])) {
+                    $context = $context->withRepositoryId($shareData["REPOSITORY"]);
                 }
             }
-        }catch (\Exception $e){}
-        return null;
-    }
 
-    public function calculateUri($uri) {
-        $uri = parent::calculateUri($uri);
-        if(!empty($this->uniqueBaseFile) && '/'.$uri !== $this->uniqueBaseFile){
-            $uri.= $this->uniqueBaseFile;
+            return $context;
+        } catch (\Exception $e) {
+
         }
-        return $uri;
+        return null;
     }
 
+    /**
+     * @param string $baseUri
+     */
     public function start($baseUri = "/"){
 
-        $this->uniqueBaseFile = $this->pointToBaseFile();
         $this->setBaseUri($baseUri);
 
-        $authBackend = new AuthSharingBackend($this->rootCollection);
-        $authPlugin = new Sabre\DAV\Auth\Plugin($authBackend, \ConfService::getCoreConf("WEBDAV_DIGESTREALM"));
+        $authBackend = new AuthSharingBackend($this->context);
+        $authPlugin = new Sabre\DAV\Auth\Plugin($authBackend, ConfService::getGlobalConf("WEBDAV_DIGESTREALM"));
         $this->addPlugin($authPlugin);
 
         if (!is_dir(AJXP_DATA_PATH."/plugins/server.sabredav")) {
@@ -86,54 +102,17 @@ public function start($baseUri = "/"){
         $lockPlugin = new Sabre\DAV\Locks\Plugin($lockBackend);
         $this->addPlugin($lockPlugin);
 
-        if (\ConfService::getCoreConf("WEBDAV_BROWSER_LISTING")) {
-            $browerPlugin = new \AJXP_Sabre_BrowserPlugin((isSet($repository)?$repository->getDisplay():null));
+        if (ConfService::getGlobalConf("WEBDAV_BROWSER_LISTING")) {
+            $browserPlugin = new BrowserPlugin((isSet($repository)?$repository->getDisplay():null));
             $extPlugin = new Sabre\DAV\Browser\GuessContentType();
-            $this->addPlugin($browerPlugin);
+            $this->addPlugin($browserPlugin);
             $this->addPlugin($extPlugin);
         }
+        
         try {
             $this->exec();
         } catch ( \Exception $e ) {
-            \AJXP_Logger::error(__CLASS__,"Exception",$e->getMessage());
+            Logger::error(__CLASS__,"Exception",$e->getMessage());
         }
     }
-
-    /**
-     * Not used for the moment
-     * This will expose folder as /dav/FolderName and file as /dav/FileName.txt
-     *
-     * @param $baseUri
-     * @return \AJXP_Sabre_Collection|SharingCollection
-     * @throws \Exception
-     */
-    protected function initCollectionForFileOrFolderAsUniqueItem(&$baseUri){
-        try{
-            $testBackend = new BasicAuthNoPass();
-            $userPass = $testBackend->getUserPass();
-            if(isSet($userPass[0])){
-                $shareStore = new \ShareStore(\ConfService::getCoreConf("PUBLIC_DOWNLOAD_FOLDER"));
-                $shareData = $shareStore->loadShare($userPass[0]);
-                if(isSet($shareData) && isSet($shareData["REPOSITORY"])){
-                    $repo = \ConfService::getRepositoryById($shareData["REPOSITORY"]);
-                    if(!empty($repo) && !$repo->hasContentFilter()){
-                        $baseDir = basename($repo->getOption("PATH"));
-                    }
-                }
-            }
-        }catch (\Exception $e){}
-        $rootCollection =  new \AJXP_Sabre_Collection("/", null, null);
-        if(isSet($baseDir)){
-            $currentPath = parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
-            if($currentPath == $baseUri || $currentPath == $baseUri."/"){
-                $rootCollection = new SharingCollection("/", null, null);
-            }else{
-                $baseUri .= "/$baseDir";
-            }
-        }
-        return $rootCollection;
-    }
-
-
-
 }
\ No newline at end of file
diff --git a/core/src/plugins/core.ocs/src/Server/Dav/SharingCollection.php b/core/src/plugins/core.ocs/src/Server/Dav/SharingCollection.php
index e3bada7987..30dbb9a9b0 100644
--- a/core/src/plugins/core.ocs/src/Server/Dav/SharingCollection.php
+++ b/core/src/plugins/core.ocs/src/Server/Dav/SharingCollection.php
@@ -16,21 +16,24 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 namespace Pydio\OCS\Server\Dav;
+use Pydio\Core\Http\Dav\Collection;
+use Sabre\DAV\SimpleCollection;
+
 defined('AJXP_EXEC') or die('Access not allowed');
 
 
-class SharingCollection extends \AJXP_Sabre_Collection
+class SharingCollection extends Collection
 {
     public function getChildren()
     {
-        if($this->path == "/" && !$this->repository->hasContentFilter()){
-            $basePath = $this->repository->getOption("PATH");
+        if($this->path == "/" && !$this->context->getRepository()->hasContentFilter()){
+            $basePath = $this->context->getRepository()->getContextOption($this->context, "PATH");
             $dirName = basename($basePath);
-            $this->children[$dirName] = new \Sabre\DAV\SimpleCollection($dirName);
+            $this->children[$dirName] = new SimpleCollection($dirName);
             return $this->children;
         }else{
             return parent::getChildren();
diff --git a/core/src/plugins/core.ocs/src/Server/Dummy.php b/core/src/plugins/core.ocs/src/Server/Dummy.php
index 78d79279bb..d74162b739 100644
--- a/core/src/plugins/core.ocs/src/Server/Dummy.php
+++ b/core/src/plugins/core.ocs/src/Server/Dummy.php
@@ -16,15 +16,21 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 namespace Pydio\OCS\Server;
 
 defined('AJXP_EXEC') or die('Access not allowed');
 
+/**
+ * Dummy Server for not active Federated Sharing
+ * @package Pydio\OCS\Server
+ */
 class Dummy
 {
-
+    /**
+     * Dummy constructor.
+     */
     public function __construct()
     {
         set_exception_handler(array($this, "handleException"));
diff --git a/core/src/plugins/core.ocs/src/Server/Federated/Server.php b/core/src/plugins/core.ocs/src/Server/Federated/Server.php
index af8ce8f636..534e994760 100644
--- a/core/src/plugins/core.ocs/src/Server/Federated/Server.php
+++ b/core/src/plugins/core.ocs/src/Server/Federated/Server.php
@@ -16,10 +16,14 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 namespace Pydio\OCS\Server\Federated;
 
+use Pydio\Core\Services\RolesService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Utils\Vars\InputFilter;
+
 use Pydio\OCS\Model\RemoteShare;
 use Pydio\OCS\Model\SQLStore;
 use Pydio\OCS\Client\OCSClient;
@@ -29,8 +33,18 @@
 
 defined('AJXP_EXEC') or die('Access not allowed');
 
+/**
+ * Class Server
+ * @package Pydio\OCS\Server\Federated
+ */
 class Server extends Dummy
 {
+    /**
+     * @param $uriParts
+     * @param $parameters
+     * @throws InvalidArgumentsException
+     * @throws UserNotFoundException
+     */
     public function run($uriParts, $parameters){
 
         if(!count($uriParts)){
@@ -56,16 +70,21 @@ public function run($uriParts, $parameters){
 
     }
 
+    /**
+     * @param $parameters
+     * @throws InvalidArgumentsException
+     * @throws UserNotFoundException
+     */
     protected function actionReceive($parameters){
 
-        $targetUser = \AJXP_Utils::sanitize($parameters["shareWith"], AJXP_SANITIZE_EMAILCHARS);
-        if(!\AuthService::userExists($targetUser)){
+        $targetUser = InputFilter::sanitize($parameters["shareWith"], InputFilter::SANITIZE_EMAILCHARS);
+        if(!UsersService::userExists($targetUser)){
             throw new UserNotFoundException();
         }
-        $token          = \AJXP_Utils::sanitize($parameters["token"], AJXP_SANITIZE_ALPHANUM);
-        $remoteId       = \AJXP_Utils::sanitize($parameters["remoteId"], AJXP_SANITIZE_ALPHANUM);
-        $documentName   = \AJXP_Utils::sanitize($parameters["name"], AJXP_SANITIZE_FILENAME);
-        $sender         = \AJXP_Utils::sanitize($parameters["owner"], AJXP_SANITIZE_EMAILCHARS);
+        $token          = InputFilter::sanitize($parameters["token"], InputFilter::SANITIZE_ALPHANUM);
+        $remoteId       = InputFilter::sanitize($parameters["remoteId"], InputFilter::SANITIZE_ALPHANUM);
+        $documentName   = InputFilter::sanitize($parameters["name"], InputFilter::SANITIZE_FILENAME);
+        $sender         = InputFilter::sanitize($parameters["owner"], InputFilter::SANITIZE_EMAILCHARS);
         $remote         = $parameters["remote"];
         $testParts = parse_url($remote);
         if(!is_array($testParts) || empty($testParts["scheme"]) || empty($testParts["host"])){
@@ -94,15 +113,21 @@ protected function actionReceive($parameters){
         $response = $this->buildResponse("ok", 200, "Successfully received share, waiting for user response.", array("id" => $newShare->getId()));
         $this->sendResponse($response, $this->getFormat($parameters));
 
-        $userRole = \AuthService::getRole("AJXP_USR_/".$targetUser);
+        $userRole = RolesService::getRole("AJXP_USR_/" . $targetUser);
         if($userRole !== false){
             // Artificially "touch" user role
             // to force repositories reload if he is logged in
-            \AuthService::updateRole($userRole);
+            RolesService::updateRole($userRole);
         }
 
     }
 
+    /**
+     * @param $remoteId
+     * @param $token
+     * @param $parameters
+     * @throws InvalidArgumentsException
+     */
     protected function actionAccept($remoteId, $token, $parameters){
 
         $store = new SQLStore();
@@ -121,6 +146,12 @@ protected function actionAccept($remoteId, $token, $parameters){
 
     }
 
+    /**
+     * @param $remoteId
+     * @param $token
+     * @param $parameters
+     * @throws InvalidArgumentsException
+     */
     protected function actionDecline($remoteId, $token, $parameters){
 
         $store = new SQLStore();
@@ -138,10 +169,16 @@ protected function actionDecline($remoteId, $token, $parameters){
 
     }
 
+    /**
+     * @param $remoteId
+     * @param $token
+     * @param $parameters
+     * @throws InvalidArgumentsException
+     */
     protected function actionUnshare($remoteId, $token, $parameters){
 
-        $token          = \AJXP_Utils::sanitize($token, AJXP_SANITIZE_ALPHANUM);
-        $remoteId       = \AJXP_Utils::sanitize($remoteId, AJXP_SANITIZE_ALPHANUM);
+        $token          = InputFilter::sanitize($token, InputFilter::SANITIZE_ALPHANUM);
+        $remoteId       = InputFilter::sanitize($remoteId, InputFilter::SANITIZE_ALPHANUM);
         $store = new SQLStore();
         $remoteShare = $store->remoteShareForOcsRemoteId($remoteId);
         if(empty($remoteShare)){
@@ -155,15 +192,19 @@ protected function actionUnshare($remoteId, $token, $parameters){
         $response = $this->buildResponse("ok", 200, "Successfully removed share.");
         $this->sendResponse($response, $this->getFormat($parameters));
 
-        $userRole = \AuthService::getRole("AJXP_USR_/".$targetUser);
+        $userRole = RolesService::getRole("AJXP_USR_/" . $targetUser);
         if($userRole !== false){
             // Artificially "touch" user role
             // to force repositories reload if he is logged in
-            \AuthService::updateRole($userRole);
+            RolesService::updateRole($userRole);
         }
 
     }
 
+    /**
+     * @param $parameters
+     * @throws InvalidArgumentsException
+     */
     protected function validateReceiveShareParameters($parameters){
 
         $keys = array("shareWith", "token", "name", "remoteId", "owner", "remote");
diff --git a/core/src/plugins/core.ocs/src/Server/InvalidArgumentsException.php b/core/src/plugins/core.ocs/src/Server/InvalidArgumentsException.php
index 89c63f9f9d..b4a304c32b 100644
--- a/core/src/plugins/core.ocs/src/Server/InvalidArgumentsException.php
+++ b/core/src/plugins/core.ocs/src/Server/InvalidArgumentsException.php
@@ -16,14 +16,22 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 namespace Pydio\OCS\Server;
 
 defined('AJXP_EXEC') or die('Access not allowed');
 
+/**
+ * Class InvalidArgumentsException
+ * @package Pydio\OCS\Server
+ */
 class InvalidArgumentsException extends \Exception
 {
+    /**
+     * InvalidArgumentsException constructor.
+     * @param \Exception|null $previous
+     */
     public function __construct(\Exception $previous = null)
     {
         parent::__construct("Invalid Arguments", 400, $previous);
diff --git a/core/src/plugins/core.ocs/src/Server/UserNotFoundException.php b/core/src/plugins/core.ocs/src/Server/UserNotFoundException.php
index 08c897036c..f887ee95b1 100644
--- a/core/src/plugins/core.ocs/src/Server/UserNotFoundException.php
+++ b/core/src/plugins/core.ocs/src/Server/UserNotFoundException.php
@@ -16,15 +16,23 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 namespace Pydio\OCS\Server;
 defined('AJXP_EXEC') or die('Access not allowed');
 
 
+/**
+ * Class UserNotFoundException
+ * @package Pydio\OCS\Server
+ */
 class UserNotFoundException extends InvalidArgumentsException
 {
+    /**
+     * InvalidArgumentsException constructor.
+     * @param \Exception|null $previous
+     */
     public function __construct(\Exception $previous = null)
     {
         parent::__construct($previous);
diff --git a/core/src/plugins/core.ocs/vendor/autoload.php b/core/src/plugins/core.ocs/vendor/autoload.php
deleted file mode 100644
index edc1bfeb5d..0000000000
--- a/core/src/plugins/core.ocs/vendor/autoload.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-// autoload.php @generated by Composer
-
-require_once __DIR__ . '/composer' . '/autoload_real.php';
-
-return ComposerAutoloaderInit4eeaa50fa862538b5310f9359b37b796::getLoader();
diff --git a/core/src/plugins/core.ocs/vendor/composer/ClassLoader.php b/core/src/plugins/core.ocs/vendor/composer/ClassLoader.php
deleted file mode 100644
index ff6ecfb822..0000000000
--- a/core/src/plugins/core.ocs/vendor/composer/ClassLoader.php
+++ /dev/null
@@ -1,413 +0,0 @@
-<?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;
-
-    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;
-    }
-
-    /**
-     * 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)
-    {
-        // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
-        if ('\\' == $class[0]) {
-            $class = substr($class, 1);
-        }
-
-        // class map lookup
-        if (isset($this->classMap[$class])) {
-            return $this->classMap[$class];
-        }
-        if ($this->classMapAuthoritative) {
-            return false;
-        }
-
-        $file = $this->findFileWithExtension($class, '.php');
-
-        // Search for Hack files if we are running on HHVM
-        if ($file === null && defined('HHVM_VERSION')) {
-            $file = $this->findFileWithExtension($class, '.hh');
-        }
-
-        if ($file === null) {
-            // Remember that this class does not exist.
-            return $this->classMap[$class] = false;
-        }
-
-        return $file;
-    }
-
-    private function findFileWithExtension($class, $ext)
-    {
-        // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
-
-        $first = $class[0];
-        if (isset($this->prefixLengthsPsr4[$first])) {
-            foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
-                            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;
-        }
-    }
-}
-
-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- */
-function includeFile($file)
-{
-    include $file;
-}
diff --git a/core/src/plugins/core.ocs/vendor/composer/LICENSE b/core/src/plugins/core.ocs/vendor/composer/LICENSE
deleted file mode 100644
index c8d57af8b2..0000000000
--- a/core/src/plugins/core.ocs/vendor/composer/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-
-Copyright (c) 2015 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/src/plugins/core.ocs/vendor/composer/autoload_classmap.php b/core/src/plugins/core.ocs/vendor/composer/autoload_classmap.php
deleted file mode 100644
index 188a57f6e7..0000000000
--- a/core/src/plugins/core.ocs/vendor/composer/autoload_classmap.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-// autoload_classmap.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-    'AJXP_Sabre_AuthBackendBasic' => $baseDir . '/../../core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_AuthBackendBasic.php',
-    'AJXP_Sabre_AuthBackendDigest' => $baseDir . '/../../core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_AuthBackendDigest.php',
-    'AJXP_Sabre_BrowserPlugin' => $baseDir . '/../../core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_BrowserPlugin.php',
-    'AJXP_Sabre_Collection' => $baseDir . '/../../core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_Collection.php',
-    'AJXP_Sabre_Node' => $baseDir . '/../../core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_Node.php',
-    'AJXP_Sabre_NodeLeaf' => $baseDir . '/../../core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_NodeLeaf.php',
-    'AJXP_Sabre_RootCollection' => $baseDir . '/../../core/classes/sabredav/ajaxplorer/class.AJXP_Sabre_RootCollection.php',
-);
diff --git a/core/src/plugins/core.ocs/vendor/composer/autoload_files.php b/core/src/plugins/core.ocs/vendor/composer/autoload_files.php
deleted file mode 100644
index 895f489800..0000000000
--- a/core/src/plugins/core.ocs/vendor/composer/autoload_files.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-// autoload_files.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-    'b40c01b585d23bc9e6c6821c282cfa7e' => $baseDir . '/../../core/classes/sabredav/lib/Sabre/autoload.php',
-);
diff --git a/core/src/plugins/core.ocs/vendor/composer/autoload_namespaces.php b/core/src/plugins/core.ocs/vendor/composer/autoload_namespaces.php
deleted file mode 100644
index b7fc0125db..0000000000
--- a/core/src/plugins/core.ocs/vendor/composer/autoload_namespaces.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-// autoload_namespaces.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-);
diff --git a/core/src/plugins/core.ocs/vendor/composer/autoload_psr4.php b/core/src/plugins/core.ocs/vendor/composer/autoload_psr4.php
deleted file mode 100644
index fd5602d5b1..0000000000
--- a/core/src/plugins/core.ocs/vendor/composer/autoload_psr4.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-// autoload_psr4.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-    'Pydio\\OCS\\' => array($baseDir . '/src'),
-);
diff --git a/core/src/plugins/core.ocs/vendor/composer/autoload_real.php b/core/src/plugins/core.ocs/vendor/composer/autoload_real.php
deleted file mode 100644
index 17ba66b090..0000000000
--- a/core/src/plugins/core.ocs/vendor/composer/autoload_real.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-// autoload_real.php @generated by Composer
-
-class ComposerAutoloaderInit4eeaa50fa862538b5310f9359b37b796
-{
-    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('ComposerAutoloaderInit4eeaa50fa862538b5310f9359b37b796', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit4eeaa50fa862538b5310f9359b37b796', 'loadClassLoader'));
-
-        $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);
-
-        $includeFiles = require __DIR__ . '/autoload_files.php';
-        foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire4eeaa50fa862538b5310f9359b37b796($fileIdentifier, $file);
-        }
-
-        return $loader;
-    }
-}
-
-function composerRequire4eeaa50fa862538b5310f9359b37b796($fileIdentifier, $file)
-{
-    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
-        require $file;
-
-        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
-    }
-}
diff --git a/core/src/plugins/core.ocs/vendor/composer/installed.json b/core/src/plugins/core.ocs/vendor/composer/installed.json
deleted file mode 100644
index fe51488c70..0000000000
--- a/core/src/plugins/core.ocs/vendor/composer/installed.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
diff --git a/core/src/plugins/core.tasks/Gruntfile.js b/core/src/plugins/core.tasks/Gruntfile.js
new file mode 100644
index 0000000000..f60854d567
--- /dev/null
+++ b/core/src/plugins/core.tasks/Gruntfile.js
@@ -0,0 +1,34 @@
+module.exports = function(grunt) {
+    grunt.initConfig({
+        babel: {
+            options: {},
+
+            dist: {
+                files: [
+                    {
+                        expand: true,
+                        cwd: 'js/react/',
+                        src: ['**/*.js'],
+                        dest: 'js/build/',
+                        ext: '.js'
+                    }
+                ]
+            }
+        },
+        watch: {
+            js: {
+                files: [
+                    "js/react/**/*"
+                ],
+                tasks: ['babel'],
+                options: {
+                    spawn: false
+                }
+            }
+        }
+    });
+    grunt.loadNpmTasks('grunt-babel');
+    grunt.loadNpmTasks('grunt-contrib-watch');
+    grunt.registerTask('default', ['babel']);
+
+};
\ No newline at end of file
diff --git a/core/src/plugins/core.tasks/composer.json b/core/src/plugins/core.tasks/composer.json
new file mode 100644
index 0000000000..1502ed71e8
--- /dev/null
+++ b/core/src/plugins/core.tasks/composer.json
@@ -0,0 +1,14 @@
+{
+  "name": "Tasks Management",
+  "description": "Centralized task management",
+  "homepage": "https://pydio.com/",
+  "license":"AGPL-3.0",
+  "autoload": {
+    "psr-4": {
+      "Pydio\\Tasks\\": "./src"
+    }
+  },
+  "require": {
+    "mtdowling/cron-expression": "^1.1"
+  }
+}
diff --git a/core/src/plugins/core.tasks/create.mysql b/core/src/plugins/core.tasks/create.mysql
new file mode 100644
index 0000000000..f7db46d869
--- /dev/null
+++ b/core/src/plugins/core.tasks/create.mysql
@@ -0,0 +1,30 @@
+DROP TABLE IF EXISTS ajxp_tasks;
+
+CREATE TABLE IF NOT EXISTS ajxp_tasks (
+    uid VARCHAR(255) NOT NULL ,
+    type INTEGER NOT NULL,
+    parent_uid VARCHAR(255) DEFAULT NULL,
+    flags INTEGER NOT NULL,
+    label VARCHAR(255) NOT NULL,
+    user_id VARCHAR(255) NOT NULL,
+    ws_id VARCHAR(32) NOT NULL,
+    status INTEGER NOT NULL,
+    status_msg VARCHAR(500) NOT NULL,
+    progress INTEGER NOT NULL,
+    schedule INTEGER NOT NULL,
+    schedule_value VARCHAR(255) DEFAULT NULL,
+    action VARCHAR(255) NOT NULL,
+    parameters VARCHAR(500) NOT NULL,
+    nodes VARCHAR(500) NOT NULL,
+    creation_date INTEGER NOT NULL DEFAULT 0,
+    status_update INTEGER NOT NULL DEFAULT 0,
+
+    PRIMARY KEY (uid)
+);
+
+
+CREATE INDEX ajxp_task_usr_idx ON ajxp_tasks (user_id);
+CREATE INDEX ajxp_task_status_idx ON ajxp_tasks (status);
+CREATE INDEX ajxp_task_type ON ajxp_tasks (type);
+CREATE INDEX ajxp_task_schedule ON ajxp_tasks (schedule);
+CREATE INDEX ajxp_task_nodes_idx ON ajxp_tasks (nodes);
diff --git a/core/src/plugins/core.tasks/create.pgsql b/core/src/plugins/core.tasks/create.pgsql
new file mode 100644
index 0000000000..f7db46d869
--- /dev/null
+++ b/core/src/plugins/core.tasks/create.pgsql
@@ -0,0 +1,30 @@
+DROP TABLE IF EXISTS ajxp_tasks;
+
+CREATE TABLE IF NOT EXISTS ajxp_tasks (
+    uid VARCHAR(255) NOT NULL ,
+    type INTEGER NOT NULL,
+    parent_uid VARCHAR(255) DEFAULT NULL,
+    flags INTEGER NOT NULL,
+    label VARCHAR(255) NOT NULL,
+    user_id VARCHAR(255) NOT NULL,
+    ws_id VARCHAR(32) NOT NULL,
+    status INTEGER NOT NULL,
+    status_msg VARCHAR(500) NOT NULL,
+    progress INTEGER NOT NULL,
+    schedule INTEGER NOT NULL,
+    schedule_value VARCHAR(255) DEFAULT NULL,
+    action VARCHAR(255) NOT NULL,
+    parameters VARCHAR(500) NOT NULL,
+    nodes VARCHAR(500) NOT NULL,
+    creation_date INTEGER NOT NULL DEFAULT 0,
+    status_update INTEGER NOT NULL DEFAULT 0,
+
+    PRIMARY KEY (uid)
+);
+
+
+CREATE INDEX ajxp_task_usr_idx ON ajxp_tasks (user_id);
+CREATE INDEX ajxp_task_status_idx ON ajxp_tasks (status);
+CREATE INDEX ajxp_task_type ON ajxp_tasks (type);
+CREATE INDEX ajxp_task_schedule ON ajxp_tasks (schedule);
+CREATE INDEX ajxp_task_nodes_idx ON ajxp_tasks (nodes);
diff --git a/core/src/plugins/core.tasks/create.sqlite b/core/src/plugins/core.tasks/create.sqlite
new file mode 100644
index 0000000000..f7db46d869
--- /dev/null
+++ b/core/src/plugins/core.tasks/create.sqlite
@@ -0,0 +1,30 @@
+DROP TABLE IF EXISTS ajxp_tasks;
+
+CREATE TABLE IF NOT EXISTS ajxp_tasks (
+    uid VARCHAR(255) NOT NULL ,
+    type INTEGER NOT NULL,
+    parent_uid VARCHAR(255) DEFAULT NULL,
+    flags INTEGER NOT NULL,
+    label VARCHAR(255) NOT NULL,
+    user_id VARCHAR(255) NOT NULL,
+    ws_id VARCHAR(32) NOT NULL,
+    status INTEGER NOT NULL,
+    status_msg VARCHAR(500) NOT NULL,
+    progress INTEGER NOT NULL,
+    schedule INTEGER NOT NULL,
+    schedule_value VARCHAR(255) DEFAULT NULL,
+    action VARCHAR(255) NOT NULL,
+    parameters VARCHAR(500) NOT NULL,
+    nodes VARCHAR(500) NOT NULL,
+    creation_date INTEGER NOT NULL DEFAULT 0,
+    status_update INTEGER NOT NULL DEFAULT 0,
+
+    PRIMARY KEY (uid)
+);
+
+
+CREATE INDEX ajxp_task_usr_idx ON ajxp_tasks (user_id);
+CREATE INDEX ajxp_task_status_idx ON ajxp_tasks (status);
+CREATE INDEX ajxp_task_type ON ajxp_tasks (type);
+CREATE INDEX ajxp_task_schedule ON ajxp_tasks (schedule);
+CREATE INDEX ajxp_task_nodes_idx ON ajxp_tasks (nodes);
diff --git a/core/src/plugins/core.tasks/js/react/PydioTasks.js b/core/src/plugins/core.tasks/js/react/PydioTasks.js
new file mode 100644
index 0000000000..69f018b1ee
--- /dev/null
+++ b/core/src/plugins/core.tasks/js/react/PydioTasks.js
@@ -0,0 +1,366 @@
+(function(global){
+
+    class Task{
+
+        constructor(data){
+            this._internal = data;
+        }
+
+        getId(){
+            return this._internal['id'];
+        }
+
+        getUserId(){
+            return this._internal['userId'];
+        }
+
+        getWorkspaceId(){
+            return this._internal['wsId'];
+        }
+
+        isStoppable(){
+            return this._internal['flags'] & Task.FLAG_STOPPABLE;
+        }
+
+        isResumable(){
+            return this._internal['flags'] & Task.FLAG_RESUMABLE;
+        }
+
+        hasProgress(){
+            return this._internal['flags'] & Task.FLAG_HAS_PROGRESS;
+        }
+
+        getProgress(){
+            return this._internal['progress'];
+        }
+
+        getLabel(){
+            return this._internal['label'];
+        }
+
+        getStatus(){
+            return this._internal['status'];
+        }
+
+        getStatusMessage(){
+            return this._internal['statusMessage'];
+        }
+
+        getData(){
+            return this._internal;
+        }
+
+        pause(){
+            TaskAPI.updateTaskStatus(this, Task.STATUS_PAUSED);
+        }
+
+        stop(){
+            TaskAPI.updateTaskStatus(this, Task.STATUS_COMPLETE);
+        }
+
+        hasOpenablePane(){
+            return false;
+        }
+        openDetailPane(){}
+
+    }
+
+    Task.STATUS_PENDING = 1;
+    Task.STATUS_RUNNING = 2;
+    Task.STATUS_COMPLETE = 4;
+    Task.STATUS_FAILED = 8;
+    Task.STATUS_PAUSED = 16;
+
+    Task.FLAG_STOPPABLE = 1;
+    Task.FLAG_RESUMABLE = 2;
+    Task.FLAG_HAS_PROGRESS = 4;
+
+    class TaskAPI{
+        
+        static createTask(task, targetUsers = null, targetRepositories = null){
+            let params = {
+                "get_action":"task_create",
+                "task":JSON.stringify(task.getData())
+            };
+            if(targetUsers && targetRepositories){
+                params['target-users'] = targetUsers;
+                params['target-repositories'] = targetRepositories;
+            }
+            PydioApi.getClient().request(params);
+        }
+
+        static loadTasks(callback, params = null){
+            if(!global.pydio.user){
+                callback([]);
+                return;
+            }
+            if(params){
+                params['get_action'] = 'tasks_list';
+            }else{
+                params = {get_action:'tasks_list'};
+            }
+            PydioApi.getClient().request(params, function(transport){
+                if(transport.responseJSON){
+                    let tasks = transport.responseJSON.map(function(taskData){
+                        return new Task(taskData);
+                    });
+                    callback(tasks);
+                }
+            }.bind(this), null, {discrete: true});
+        }
+
+        static loadAdminTasks(userScope = null, repoScope = null, callback){
+            let params = {get_action:"tasks_list"};
+            if(userScope){
+                params["scope"] = "user";
+                params["user_id"] = userScope;
+            }else if(repoScope){
+                params["scope"] = "repository";
+                params["repo_id"] = repoScope;
+            }else{
+                params["scope"] = "global";
+            }
+            TaskAPI.loadTasks(callback, params);
+        }
+
+        static updateTaskStatus(task, status){
+            PydioApi.getClient().request({
+                "get_action":"task_toggle_status",
+                "taskId":task.getData()['id'],
+                "status": status
+            });
+
+        }
+
+    }
+
+    var STORE_INSTANCE = null;
+
+    class TaskStore extends Observable{
+
+        static getInstance(){
+            if (!STORE_INSTANCE) STORE_INSTANCE = new TaskStore();
+            return STORE_INSTANCE;
+        }
+
+        constructor(){
+            super();
+            this._crtPoll   = 10;
+
+            this._quickPoll = 2;
+            this._longPoll  = 15;
+            this._pollSteps = 1.4;
+            // Start listening to server messages
+            global.pydio.observe("server_message", function(xml){
+                var task = XMLUtils.XPathSelectSingleNode(xml, 'tree/task');
+                if(task){
+                    let data = task.getAttribute("data");
+                    let t = JSON.parse(data);
+                    if( t instanceof Object && t.id){
+                        let taskObject = new Task(t);
+                        this._tasksList.set(t.id, taskObject);
+                        this.notify("tasks_updated", taskObject);
+                        global.pydio.notify("poller.frequency", {value:2});
+                    }
+                }
+                var taskList = XMLUtils.XPathSelectSingleNode(xml, 'tree/taskList');
+                if(taskList){
+                    let jsonData = taskList.firstChild.nodeValue; // CDATA
+                    let tasks = JSON.parse(jsonData);
+                    if(tasks instanceof Object){
+                        let taskMap = new Map();
+                        tasks.map(function(t){
+                            let task = new Task(t);
+                            taskMap.set(task.getId(), task);
+                        });
+                        this._tasksList = taskMap;
+                        this.notifyAndSetPollerSpeed(tasks);
+                    }
+                }
+            }.bind(this));
+
+            global.pydio.observe("registry_loaded", function(){
+
+                this.getTasks(true);
+
+            }.bind(this));
+        }
+
+        getTasks(forceRefresh = false){
+            if(this._tasksList == undefined || forceRefresh){
+                this._tasksList = new Map();
+                TaskAPI.loadTasks(function(tasks){
+                    let taskMap = new Map();
+                    tasks.map(function(t){taskMap.set(t.getId(), t)});
+                    this._tasksList = taskMap;
+                    this.notifyAndSetPollerSpeed(tasks);
+                }.bind(this));
+            }
+            // Add local tasks
+            if(this._localTasks){
+                this._localTasks.forEach(function(lT){
+                    this._tasksList.set(lT.getId(), lT);
+                }.bind(this));
+            }
+            return this._tasksList;
+        }
+
+        notifyAndSetPollerSpeed(tasks){
+            this.notify("tasks_updated");
+            if(tasks.length){
+                this._crtPoll = this._quickPoll;
+                global.pydio.notify("poller.frequency", {value:this._quickPoll});
+            }else{
+                this._crtPoll *= this._pollSteps;
+                if(this._crtPoll >= this._longPoll){
+                    global.pydio.notify("poller.frequency", {});
+                }else{
+                    global.pydio.notify("poller.frequency", {value:this._crtPoll});
+                }
+            }
+        }
+
+        enqueueLocalTask(task){
+            if(!this._localTasks) {
+                this._localTasks = new Map();
+            }
+            this._localTasks.set(task.getId(), task);
+            this.notify("tasks_updated");
+        }
+
+        static enqueueActionTask(label, action, parameters = {}, nodes = [], flags = Task.FLAG_STOPPABLE, targetUsers = null, targetRepositories = null){
+            let task = {
+                label: label,
+                flags: flags,
+                status: 1,
+                statusMessage : '',
+                action: action,
+                parameters: parameters,
+                nodes: nodes
+            };
+            TaskAPI.createTask(new Task(task), targetUsers, targetRepositories);
+        }
+
+    }
+
+    var TaskAction = React.createClass({
+
+        getInitialState: function(){
+            return {showProgress: true};
+        },
+
+        showAction: function(){
+            this.setState({showProgress: false});
+        },
+
+        showProgress: function(){
+            this.setState({showProgress: true});
+        },
+
+        render: function(){
+            let t = this.props.task;
+
+            let actions;
+            if(t.getStatus() === Task.STATUS_RUNNING && t.isStoppable()){
+                actions = (<span className="icon-stop" onClick={t.pause.bind(t)}/>);
+            }else{
+                actions = (<span className="mdi mdi-close-circle-outline" onClick={t.stop.bind(t)}/>);
+            }
+            if(this.state.showProgress && t.hasProgress() && t.getStatus() !== Task.STATUS_FAILED){
+                actions = (
+                    <div className="radial-progress">
+                        <div className={"pie-wrapper pie-wrapper--solid progress-" + t.getProgress()}></div>
+                    </div>
+                );
+            }
+            return <div className="task_actions" onMouseOver={this.showAction} onMouseOut={this.showProgress}>{actions}</div>;
+        }
+
+    });
+
+    var TaskEntry = React.createClass({
+
+        propTypes: {
+            task: React.PropTypes.instanceOf(Task),
+            adminDisplayScope: React.PropTypes.bool
+        },
+
+        render: function(){
+            let t = this.props.task;
+            let scopeInfo;
+            if(this.props['adminDisplayScope'] && this.props.adminDisplayScope === 'repository'){
+                scopeInfo = "["+ this.props.task.getUserId() +"] ";
+            }
+            let click, clickStyle;
+            if(this.props.task.hasOpenablePane()){
+                click = this.props.task.openDetailPane.bind(this);
+                clickStyle = {cursor:'pointer'};
+            }
+            return (
+                <div className={"task " + "task-status-" + this.props.task.getStatus()}>
+                    <div className="task_texts" onClick={click} style={clickStyle}>
+                        <div className="task_label">{scopeInfo}{t.getLabel()}</div>
+                        <div className="status_message" title={t.getStatusMessage()}>{t.getStatusMessage()}</div>
+                    </div>
+                    <TaskAction task={t}/>
+                </div>
+            );
+        }
+    });
+
+    var TasksPanel = React.createClass({
+
+        refreshTasks: function(){
+            if(!this.isMounted()){
+                return;
+            }
+            this.setState({
+                tasks: TaskStore.getInstance().getTasks()
+            });
+        },
+
+        getInitialState(){
+            return {
+                tasks: TaskStore.getInstance().getTasks()
+            };
+        },
+
+        componentDidMount: function(){
+            TaskStore.getInstance().observe("tasks_updated", this.refreshTasks.bind(this));
+        },
+
+        componentWillUnmount: function(){
+            TaskStore.getInstance().stopObserving("tasks_updated");
+        },
+
+        render: function(){
+            let tasks = [];
+            this.state.tasks.forEach(function(t){
+                if(t.getStatus() == Task.STATUS_COMPLETE) return;
+                tasks.push(<TaskEntry task={t}/>);
+            });
+            let className = "pydio-tasks-panel";
+            let heightStyle;
+            if(!tasks.length){
+                className += " invisible";
+            }else{
+                heightStyle = {height: Math.min(tasks.length * 60, 180)};
+            }
+            return (
+                <div className={className} style={heightStyle}>
+                    {tasks}
+                </div>
+            );
+        }
+    });
+
+    // Export TaskStore
+    var ns = global.PydioTasks || {};
+    ns.Store = TaskStore;
+    ns.Task = Task;
+    ns.API = TaskAPI;
+    ns.Panel = TasksPanel;
+    ns.TaskEntry = TaskEntry;
+    global.PydioTasks = ns;
+
+})(window);
diff --git a/core/src/plugins/core.tasks/manifest.xml b/core/src/plugins/core.tasks/manifest.xml
new file mode 100644
index 0000000000..0969655a2f
--- /dev/null
+++ b/core/src/plugins/core.tasks/manifest.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ajxp_plugin label="CONF_MESSAGE[Tasks Service]" description="CONF_MESSAGE[Centralize background tasks and scheduling]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
+    <class_definition classname="Pydio\Tasks\TaskController" filename="plugins/core.tasks/src/TaskController.php"/>
+    <client_settings>
+        <resources>
+            <js className="PydioTasks" file="plugins/core.tasks/js/build/PydioTasks.js" depends="React,ReactPydio"/>
+        </resources>
+    </client_settings>
+    <registry_contributions>
+        <actions>
+            <action name="tasks_list">
+                <processing>
+                    <serverCallback methodName="route"/>
+                </processing>
+            </action>
+            <action name="task_info">
+                <processing>
+                    <serverCallback methodName="route"/>
+                </processing>
+            </action>
+            <action name="task_create">
+                <processing>
+                    <serverCallback methodName="route"/>
+                </processing>
+            </action>
+            <action name="task_update">
+                <processing>
+                    <serverCallback methodName="route"/>
+                </processing>
+            </action>
+            <action name="task_toggle_status">
+                <processing>
+                    <serverCallback methodName="route"/>
+                </processing>
+            </action>
+            <action name="task_delete">
+                <processing>
+                    <serverCallback methodName="route"/>
+                </processing>
+            </action>
+            <action name="client_consume_channel">
+                <post_processing>
+                    <serverCallback methodName="enrichConsumeChannel"/>
+                </post_processing>
+            </action>
+        </actions>
+        <hooks>
+            <serverCallback methodName="attachTasksToNode" hookName="node.info"/>
+        </hooks>
+        <client_configs>
+            <template name="pydio-tasks-panel" element="ajxp_desktop" position="bottom"><![CDATA[
+                <div id="tasks_panel" class="react-mui-context" ajxpClass="AjxpReactComponent" ajxpOptions='{"componentNamespace":"PydioTasks","componentName":"Panel"}'></div>
+            ]]></template>
+        </client_configs>
+    </registry_contributions>
+</ajxp_plugin>
diff --git a/core/src/plugins/core.tasks/package.json b/core/src/plugins/core.tasks/package.json
new file mode 100644
index 0000000000..09e155bc1c
--- /dev/null
+++ b/core/src/plugins/core.tasks/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "core.tasks",
+  "version": "6.5.1",
+  "description": "",
+  "source_path":"js",
+  "main": "index.js",
+  "author": "Abstrium SAS",
+  "license": "AGPL",
+  "devDependencies": {
+    "grunt": "~0.4.5",
+    "grunt-babel": "~5.0.3",
+    "grunt-contrib-watch": "~0.6.1"
+  }
+}
diff --git a/core/src/plugins/core.tasks/src/ITasksProvider.php b/core/src/plugins/core.tasks/src/ITasksProvider.php
new file mode 100644
index 0000000000..fd5a608d7e
--- /dev/null
+++ b/core/src/plugins/core.tasks/src/ITasksProvider.php
@@ -0,0 +1,103 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tasks;
+
+use Pydio\Access\Core\Model\AJXP_Node;
+
+
+use Pydio\Core\Model\RepositoryInterface;
+use Pydio\Core\Model\UserInterface;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Interface ITasksProvider
+ * @package Pydio\Tasks
+ */
+interface ITasksProvider
+{
+    /**
+     * @param Task $task
+     * @param Schedule $when
+     * @return Task
+     */
+    public function createTask(Task $task, Schedule $when);
+
+    /**
+     * @param string $taskId
+     * @return Task
+     */
+    public function getTaskById($taskId);
+
+
+    /**
+     * @param Task $task
+     * @return Task
+     */
+    public function updateTask(Task $task);
+    
+    /**
+     * @param string $taskId
+     * @return bool
+     */
+    public function deleteTask($taskId);
+
+
+    /**
+     * @return Task[]
+     */
+    public function getPendingTasks();
+
+    /**
+     * @return Task[]
+     */
+    public function getScheduledTasks();
+
+    /**
+     * @param UserInterface $user
+     * @param RepositoryInterface $repository
+     * @return Task[]
+     */
+    public function getCurrentRunningTasks($user = null, $repository = null);
+
+    /**
+     * @param AJXP_Node $node
+     * @return Task[]
+     */
+    public function getActiveTasksForNode(AJXP_Node $node);
+
+    /**
+     * @param UserInterface $user
+     * @param RepositoryInterface $repository
+     * @param int $status
+     * @param int $scheduleType
+     * @param int $taskType
+     * @param string $parentUid
+     * @return \Pydio\Tasks\Task[]
+     */
+    public function getTasks($user = null, $repository = null, $status = -1, $scheduleType = -1, $taskType = Task::TYPE_USER, $parentUid = "");
+
+    /**
+     * @param string $taskId
+     * @return Task[]
+     */
+    public function getChildrenTasks($taskId);
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.tasks/src/Providers/MockTasksProvider.php b/core/src/plugins/core.tasks/src/Providers/MockTasksProvider.php
new file mode 100644
index 0000000000..adede10aab
--- /dev/null
+++ b/core/src/plugins/core.tasks/src/Providers/MockTasksProvider.php
@@ -0,0 +1,150 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Tasks\Providers;
+
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\Repository;
+use Pydio\Conf\Core\AbstractUser;
+use Pydio\Core\Model\RepositoryInterface;
+use Pydio\Core\Model\UserInterface;
+use Pydio\Tasks\Task;
+use Pydio\Tasks\Schedule;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class MockTasksProvider
+ * @package Pydio\Tasks\Providers
+ */
+class MockTasksProvider implements \Pydio\Tasks\ITasksProvider
+{
+
+    /**
+     * @param Task $task
+     * @param Schedule $when
+     * @return Task
+     */
+    public function createTask(Task $task, Schedule $when)
+    {
+        $task->setSchedule($when);
+        $task->setId("newly-generated-id");
+        return $task;
+    }
+
+    /**
+     * @param string $taskId
+     * @return Task
+     */
+    public function getTaskById($taskId)
+    {
+        $fakeTask = new Task();
+        $fakeTask->setId($taskId);
+        $fakeTask->setAction("fake_action");
+        return $fakeTask;
+    }
+
+    /**
+     * @param Task $task
+     * @return Task
+     */
+    public function updateTask(Task $task)
+    {
+        return $task;
+    }
+    
+    /**
+     * @param string $taskId
+     * @return bool
+     */
+    public function deleteTask($taskId)
+    {
+        return true;
+    }
+
+    /**
+     * @return Task[]
+     */
+    public function getPendingTasks()
+    {
+        $t1 = new Task();
+        $t1->setAction("fake-task-action");
+        $t1->setId("fake-task-id");
+        return [$t1];
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     * @return \Pydio\Tasks\Task[]
+     */
+    public function getActiveTasksForNode(AJXP_Node $node)
+    {
+        $t1 = new Task();
+        $t1->setAction("fake-task-action");
+        $t1->setId("fake-task-id");
+        return [$t1];
+    }
+
+    /**
+     * @param UserInterface $user
+     * @param RepositoryInterface $repository
+     * @param int $status
+     * @param int $scheduleType
+     * @param int $taskType
+     * @param string $parentUid
+     * @return \Pydio\Tasks\Task[]
+     */
+    public function getTasks($user = null, $repository = null, $status = -1, $scheduleType = -1, $taskType = Task::TYPE_USER, $parentUid = "")
+    {
+        $t1 = new Task();
+        $t1->setAction("fake-task-action");
+        $t1->setId("fake-task-id");
+        return [$t1];
+    }
+
+    /**
+     * @param AbstractUser $user
+     * @param Repository $repository
+     * @return \Pydio\Tasks\Task[]
+     */
+    public function getCurrentRunningTasks($user = null, $repository = null)
+    {
+        // TODO: Implement getCurrentRunningTasks() method.
+    }
+
+    /**
+     * @return Task[]
+     */
+    public function getScheduledTasks()
+    {
+        // TODO: Implement getScheduledTasks() method.
+    }
+
+    /**
+     * @param string $taskId
+     * @return Task[]
+     */
+    public function getChildrenTasks($taskId){
+
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.tasks/src/Providers/SqlTasksProvider.php b/core/src/plugins/core.tasks/src/Providers/SqlTasksProvider.php
new file mode 100644
index 0000000000..71591da1dd
--- /dev/null
+++ b/core/src/plugins/core.tasks/src/Providers/SqlTasksProvider.php
@@ -0,0 +1,263 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tasks\Providers;
+
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Core\Model\RepositoryInterface;
+use Pydio\Core\Model\UserInterface;
+use Pydio\Tasks\ITasksProvider;
+use Pydio\Tasks\Schedule;
+use Pydio\Tasks\Task;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class SqlTasksProvider
+ * @package Pydio\Tasks\Providers
+ */
+class SqlTasksProvider implements ITasksProvider
+{
+    /**
+     * Serialize task for storing in ajxp_tasks
+     * @param Task $task
+     * @param bool $removeId
+     * @return array
+     */
+    protected function taskToDBValues(Task $task, $removeId = false){
+        $values = [
+            "type"              => $task->getType(),
+            "parent_uid"        => $task->getParentId(),
+            "flags"             => $task->getFlags(),
+            "label"             => $task->getLabel(),
+            "user_id"            => $task->getUserId(),
+            "ws_id"              => $task->getWsId(),
+            "status"            => $task->getStatus(),
+            "status_msg"        => $task->getStatusMessage(),
+            "progress"          => $task->getProgress(),
+            "schedule"          => $task->getSchedule()->getType(),
+            "schedule_value"    => $task->getSchedule()->getValue(),
+            "action"            => $task->getAction(),
+            "parameters"        => json_encode($task->getParameters()),
+            "nodes"             => ""
+        ];
+        if(count($task->nodes)){
+            $values["nodes"] = "|||".implode("|||", $task->nodes)."|||";
+        }
+        if(!$removeId){
+            // This is a creation
+            $values["creation_date"] = time();
+            $values = array_merge(["uid" => $task->getId()], $values);
+        }else{
+            $values["status_update"] = time();
+        }
+        return $values;
+    }
+
+    /**
+     * @param \DibiRow $values
+     * @return Task
+     */
+    protected function taskFromDBValues(\DibiRow $values){
+        $task = new Task();
+        $task->setId($values["uid"]);
+        $task->setType($values["type"]);
+        if(!empty($values["parent_uid"])){
+            $task->setParentId($values["parent_uid"]);
+        }
+        $task->setFlags($values["flags"]);
+        $task->setLabel($values["label"]);
+        $task->setUserId($values["user_id"]);
+        $task->setWsId($values["ws_id"]);
+        $task->setStatus($values["status"]);
+        $task->setStatusMessage($values["status_msg"]);
+        $task->setProgress($values["progress"]);
+        $task->setSchedule(new Schedule($values["schedule"], $values["schedule_value"]));
+        $task->setAction($values["action"]);
+        $task->setCreationDate($values["creation_date"]);
+        $task->setStatusChangeDate($values["status_update"]);
+        $task->setParameters(json_decode($values["parameters"], true));
+        $nodes = explode("|||", trim($values["nodes"], "|||"));
+        foreach ($nodes as $node) {
+            if(!empty($node)) $task->attachToNode($node);
+        }
+        return $task;
+    }
+
+    /**
+     * @param Task $task
+     * @param Schedule $when
+     * @return Task
+     */
+    public function createTask(Task $task, Schedule $when)
+    {
+        \dibi::query("INSERT INTO [ajxp_tasks] ", $this->taskToDBValues($task));
+    }
+
+    /**
+     * @param string $taskId
+     * @return Task
+     */
+    public function getTaskById($taskId)
+    {
+        $res = \dibi::query('SELECT * FROM [ajxp_tasks] WHERE [uid]=%s', $taskId);
+        foreach ($res->fetchAll() as $row) {
+            return $this->taskFromDBValues($row);
+        }
+        return null;
+    }
+
+    /**
+     * @param Task $task
+     * @return Task
+     */
+    public function updateTask(Task $task)
+    {
+        try{
+            \dibi::query("UPDATE [ajxp_tasks] SET ", $this->taskToDBValues($task, true), " WHERE [uid] =%s", $task->getId());
+        }catch (\DibiException $ex){
+            $sql = $ex->getSql();
+        }
+    }
+    
+    /**
+     * @param string $taskId
+     * @return bool
+     */
+    public function deleteTask($taskId)
+    {
+        \dibi::query("DELETE FROM [ajxp_tasks] WHERE uid=%s", $taskId);
+    }
+
+    /**
+     * @return Task[]
+     */
+    public function getPendingTasks()
+    {
+        return $this->getTasks(null, null, Task::STATUS_PENDING);
+    }
+
+    /**
+     * @return Task[]
+     */
+    public function getScheduledTasks(){
+        return $this->getTasks(null, null, -1, Schedule::TYPE_RECURRENT, Task::TYPE_ADMIN, AJXP_FILTER_EMPTY);
+    }
+
+    /**
+     * @param string $taskId
+     * @return Task[]
+     */
+    public function getChildrenTasks($taskId){
+        $tasks = [];
+        $where = [];
+        $where[] = array("[parent_uid] = %s", $taskId);
+        $res = \dibi::query('SELECT * FROM [ajxp_tasks] WHERE %and', $where);
+        foreach ($res->fetchAll() as $row) {
+            $tasks[] = $this->taskFromDBValues($row);
+        }
+        return $tasks;
+    }
+
+
+    /**
+     * @param UserInterface $user
+     * @param RepositoryInterface $repository
+     * @return \Pydio\Tasks\Task[]
+     */
+    public function getCurrentRunningTasks($user = null, $repository = null)
+    {
+        $tasks = [];
+        $where = [];
+        if($user !== null){
+            $where[] = array("[user_id] = %s", $user->getId());
+        }
+        if($repository !== null){
+            $where[] = array("[ws_id] = %s", $repository->getId());
+        }
+        $where[] = array("[status] IN (1,2,8,16)");
+        $res = \dibi::query('SELECT * FROM [ajxp_tasks] WHERE %and', $where);
+        foreach ($res->fetchAll() as $row) {
+            $tasks[] = $this->taskFromDBValues($row);
+        }
+        return $tasks;
+    }
+
+    /**
+     * @param AJXP_Node $node
+     * @return \Pydio\Tasks\Task[]
+     */
+    public function getActiveTasksForNode(AJXP_Node $node)
+    {
+        $tasks = [];
+        try{
+            $res = \dibi::query('SELECT * FROM [ajxp_tasks] WHERE [nodes] LIKE %s AND [status] NOT IN (1,4,8)', "%|||".$node->getUrl()."|||%");
+            foreach ($res->fetchAll() as $row) {
+                $tasks[] = $this->taskFromDBValues($row);
+            }
+        }catch(\DibiException $e){
+            $sql = $e->getSql();
+        }
+        return $tasks;
+    }
+
+    /**
+     * @param UserInterface $user
+     * @param RepositoryInterface $repository
+     * @param int $status
+     * @param int $scheduleType
+     * @param int $taskType
+     * @param string $parentUid
+     * @return \Pydio\Tasks\Task[]
+     */
+    public function getTasks($user = null, $repository = null, $status = -1, $scheduleType = -1, $taskType = Task::TYPE_USER, $parentUid = "")
+    {
+        $tasks = [];
+        $where = [];
+        if($user !== null){
+            $where[] = array("[user_id] = %s", $user->getId());
+        }
+        if($repository !== null){
+            $where[] = array("[ws_id] = %s", $repository->getId());
+        }
+        if($status !== -1){
+            $where[] = array("[status] = %i", $status);
+        }
+        if($scheduleType !== -1){
+            $where[] = array("[schedule] = %i", $scheduleType);
+        }
+        if($taskType !== -1){
+            $where[] = array("[type] = %i", $taskType);
+        }
+        if(!empty($parentUid)){
+            if($parentUid === AJXP_FILTER_EMPTY){
+                $where[] = array("[parent_uid] IS NULL");
+            }else{
+                $where[] = array("[parent_uid] = %s", $parentUid);
+            }
+        }
+        $res = \dibi::query('SELECT * FROM [ajxp_tasks] WHERE %and', $where);
+        foreach ($res->fetchAll() as $row) {
+            $tasks[] = $this->taskFromDBValues($row);
+        }
+        return $tasks;
+
+    }
+}
diff --git a/core/src/plugins/core.tasks/src/Schedule.php b/core/src/plugins/core.tasks/src/Schedule.php
new file mode 100644
index 0000000000..f472633810
--- /dev/null
+++ b/core/src/plugins/core.tasks/src/Schedule.php
@@ -0,0 +1,143 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tasks;
+
+use Cron\CronExpression;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class Schedule
+ * @package Pydio\Tasks
+ */
+class Schedule implements \JsonSerializable
+{
+    const TYPE_RECURRENT = 1;
+    const TYPE_ONCE_NOW = 2;
+    const TYPE_ONCE_DEFER = 4;
+
+    /**
+     * @var int
+     */
+    private $type;
+
+    /**
+     * @var string
+     */
+    private $value;
+
+    /**
+     * Schedule constructor.
+     * @param $type
+     * @param string $value
+     */
+    public function __construct($type, $value = ""){
+        $this->type = $type;
+        $this->value = $value;
+    }
+
+    /**
+     * Detect if a task should run now
+     * @param int $recurringTimeInterval
+     * @return bool
+     */
+    public function shouldRunNow($recurringTimeInterval = 0){
+
+        if($this->type === self::TYPE_ONCE_NOW){
+            return true;
+        }
+        if($this->type !== self::TYPE_RECURRENT){
+            return false;
+        }
+
+        // Recurring task case : check CRON expression
+        $cron = CronExpression::factory($this->value);
+
+        $nowDate = new \DateTime();
+        $nowDate->setTimestamp(time());
+
+        $lastExecDate = new \DateTime();
+        $lastExecDate->setTimestamp($lastExec = time() - 60 * $recurringTimeInterval);
+
+        $nextRunDate = $cron->getNextRunDate($lastExecDate);
+        return ($nextRunDate >= $lastExecDate && $nextRunDate < $nowDate);
+
+    }
+
+    /**
+     * @return Schedule
+     */
+    public static function scheduleNow(){
+        return new Schedule(self::TYPE_ONCE_NOW);
+    }
+
+    /**
+     * @return Schedule
+     */
+    public static function scheduleDeferred(){
+        return new Schedule(self::TYPE_ONCE_DEFER);
+    }
+
+    /**
+     * @param $recurringDescriptor
+     * @return Schedule
+     */
+    public static function scheduleRecurring($recurringDescriptor){
+        return new Schedule(self::TYPE_RECURRENT, $recurringDescriptor);
+    }
+
+    /**
+     * @return int
+     */
+    public function getType(){
+        return $this->type;
+    }
+
+    /**
+     * @return string
+     */
+    public function getValue(){
+        return $this->value;
+    }
+
+    /**
+     * @param $data
+     * @return Schedule
+     */
+    public static function fromJson($data){
+        if(is_array($data)){
+            return new Schedule($data["type"], $data["value"]);
+        }else{
+            return new Schedule($data->type, $data->value);
+        }
+    }
+
+    /**
+     * Specify data which should be serialized to JSON
+     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+     * @return mixed data which can be serialized by <b>json_encode</b>,
+     * which is a value of any type other than a resource.
+     * @since 5.4.0
+     */
+    function jsonSerialize(){
+        return ["type" => $this->type, "value" => $this->value];
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.tasks/src/Task.php b/core/src/plugins/core.tasks/src/Task.php
new file mode 100644
index 0000000000..9c59a0b082
--- /dev/null
+++ b/core/src/plugins/core.tasks/src/Task.php
@@ -0,0 +1,485 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tasks;
+
+
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class Task
+ * @package Pydio\Tasks
+ */
+class Task
+{
+    const TYPE_USER     = 1;
+    const TYPE_ADMIN    = 2;
+
+    const STATUS_PENDING = 1;
+    const STATUS_RUNNING = 2;
+    const STATUS_COMPLETE = 4;
+    const STATUS_FAILED = 8;
+    const STATUS_PAUSED = 16;
+    const STATUS_TEMPLATE = 32;
+
+    const FLAG_STOPPABLE    = 1;
+    const FLAG_RESUMABLE    = 2;
+    const FLAG_HAS_PROGRESS  = 4;
+
+    /**
+     * @var string
+     */
+    public $id;
+
+    /**
+     * A boolean combination
+     * of the FLAG_XXX constants
+     * @var integer
+     */
+    public $flags;
+
+    /**
+     * @var string
+     */
+    public $label;
+
+    /**
+     * @var string
+     */
+    public $userId;
+    /**
+     * @var string
+     */
+    public $wsId;
+    /**
+     * @var string
+     */
+    public $wsIdentifier;
+
+    /**
+     * @var int
+     */
+    public $status = 1;
+
+    /**
+     * @var string
+     */
+    public $statusMessage;
+
+    /**
+     * @var int
+     */
+    public $progress = -1;
+
+    /**
+     * @var Schedule
+     */
+    public $schedule;
+    /**
+     * @var string
+     */
+    public $action;
+    /**
+     * @var array
+     */
+    public $parameters;
+
+    /**
+     * @var int
+     */
+    public $type = self::TYPE_USER;
+
+    /**
+     * @var string Uid of parent task
+     */
+    public $parentId;
+
+    /**
+     * @var int
+     */
+    public $statusChangeDate;
+
+    /**
+     * @var int
+     */
+    public $creationDate;
+
+    /**
+     * @var string
+     */
+    private $impersonateUsers;
+
+    /**
+     * @var array
+     */
+    public $nodes = [];
+
+    /**
+     * Task constructor.
+     */
+    public function __construct()
+    {
+        $this->status = self::STATUS_PENDING;
+        $this->parameters = [];
+        $this->flags = 0;
+        $this->schedule = Schedule::scheduleNow();
+    }
+
+    /**
+     * @return Task[]
+     */
+    public function getChildrenTasks(){
+        return TaskService::getInstance()->getChildrenTasks($this->id);
+    }
+
+    /**
+     * @return string
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param string $id
+     */
+    public function setId($id)
+    {
+        $this->id = $id;
+    }
+
+    /**
+     * @return int
+     */
+    public function getFlags()
+    {
+        return $this->flags;
+    }
+
+    /**
+     * @param int $flags
+     */
+    public function setFlags($flags)
+    {
+        $this->flags = $flags;
+    }
+
+    /**
+     * @return int
+     */
+    public function isStoppable(){
+        return $this->flags & Task::FLAG_STOPPABLE;
+    }
+
+    /**
+     * @return int
+     */
+    public function isResumable(){
+        return $this->flags & Task::FLAG_RESUMABLE;
+    }
+
+    /**
+     * @return int
+     */
+    public function hasProgress(){
+        return $this->flags & Task::FLAG_HAS_PROGRESS;
+    }
+
+    /**
+     * @return string
+     */
+    public function getLabel()
+    {
+        return $this->label;
+    }
+
+    /**
+     * @param string $label
+     */
+    public function setLabel($label)
+    {
+        $this->label = $label;
+    }
+
+    /**
+     * Set label like 'Launching task $actionLabel in background'
+     * @param array $messages
+     * @param string $actionLabelId
+     */
+    public function setActionLabel($messages, $actionLabelId){
+        $this->setLabel(str_replace("%s", $messages[$actionLabelId], $messages[556]));
+    }
+
+    /**
+     * @return ContextInterface
+     */
+    public function getContext(){
+        return new Context($this->userId, $this->wsId);
+    }
+
+    /**
+     * @return string
+     */
+    public function getUserId()
+    {
+        return $this->userId;
+    }
+
+    /**
+     * @param string $userId
+     */
+    public function setUserId($userId)
+    {
+        $this->userId = $userId;
+    }
+
+    /**
+     * @return string
+     */
+    public function getWsId()
+    {
+        return $this->wsId;
+    }
+
+    /**
+     * @param string $wsId
+     */
+    public function setWsId($wsId)
+    {
+        $this->wsId = $wsId;
+    }
+
+    /**
+     * @return string
+     */
+    public function getWsIdentifier()
+    {
+        return $this->wsIdentifier;
+    }
+
+    /**
+     * @param string $wsIdentifier
+     */
+    public function setWsIdentifier($wsIdentifier)
+    {
+        $this->wsIdentifier = $wsIdentifier;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStatus()
+    {
+        return $this->status;
+    }
+
+    /**
+     * @param int $status
+     */
+    public function setStatus($status)
+    {
+        $this->status = $status;
+    }
+
+    /**
+     * @return string
+     */
+    public function getStatusMessage()
+    {
+        return $this->statusMessage;
+    }
+
+    /**
+     * @param string $statusMessage
+     */
+    public function setStatusMessage($statusMessage)
+    {
+        $this->statusMessage = $statusMessage;
+    }
+
+    /**
+     * @return int
+     */
+    public function getProgress()
+    {
+        return $this->progress;
+    }
+
+    /**
+     * @param int $progress
+     */
+    public function setProgress($progress)
+    {
+        $this->progress = $progress;
+    }
+
+    /**
+     * @return Schedule
+     */
+    public function getSchedule()
+    {
+        return $this->schedule;
+    }
+
+    /**
+     * @param Schedule $schedule
+     */
+    public function setSchedule($schedule)
+    {
+        $this->schedule = $schedule;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAction()
+    {
+        return $this->action;
+    }
+
+    /**
+     * @param string $action
+     */
+    public function setAction($action)
+    {
+        $this->action = $action;
+    }
+
+    /**
+     * @return array
+     */
+    public function getParameters()
+    {
+        return $this->parameters;
+    }
+
+    /**
+     * @param array $parameters
+     */
+    public function setParameters($parameters)
+    {
+        $this->parameters = $parameters;
+    }
+
+    /**
+     * @param $nodePath
+     */
+    public function attachToNode($nodePath){
+        $this->nodes[] = $nodePath;
+    }
+
+    /**
+     * @return string
+     */
+    public function getImpersonateUsers()
+    {
+        return $this->impersonateUsers;
+    }
+
+    /**
+     * @param string $impersonateUsers
+     */
+    public function setImpersonateUsers($impersonateUsers)
+    {
+        $this->impersonateUsers = $impersonateUsers;
+    }
+
+    /**
+     * @return int
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * @param int $type
+     */
+    public function setType($type)
+    {
+        $this->type = $type;
+    }
+
+    /**
+     * @return string
+     */
+    public function getParentId()
+    {
+        return $this->parentId;
+    }
+
+    /**
+     * @param string $parentId
+     */
+    public function setParentId($parentId)
+    {
+        $this->parentId = $parentId;
+    }
+
+    /**
+     * @return \DateTime
+     */
+    public function getStatusChangeDate()
+    {
+        if(!empty($this->statusChangeDate)){
+            $dTime = new \DateTime();
+            $dTime->setTimestamp($this->statusChangeDate);
+            return $dTime;
+        }else{
+            return null;
+        }
+    }
+
+    /**
+     * @param int $statusChangeDate
+     */
+    public function setStatusChangeDate($statusChangeDate)
+    {
+        $this->statusChangeDate = $statusChangeDate;
+    }
+
+    /**
+     * @return \DateTime
+     */
+    public function getCreationDate()
+    {
+        if(!empty($this->creationDate)){
+            $dTime = new \DateTime();
+            $dTime->setTimestamp($this->creationDate);
+            return $dTime;
+        }else{
+            return null;
+        }
+    }
+
+    /**
+     * @param int $creationDate
+     */
+    public function setCreationDate($creationDate)
+    {
+        $this->creationDate = $creationDate;
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.tasks/src/TaskController.php b/core/src/plugins/core.tasks/src/TaskController.php
new file mode 100644
index 0000000000..ab9cecfb95
--- /dev/null
+++ b/core/src/plugins/core.tasks/src/TaskController.php
@@ -0,0 +1,234 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tasks;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Core\Controller\CliRunner;
+
+use Pydio\Core\Http\Message\UserMessage;
+use Pydio\Core\Http\SimpleRestResourceRouter;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\PluginFramework\SqlTableProvider;
+
+
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Utils\DBHelper;
+use Pydio\Core\Utils\Vars\OptionsHelper;
+use Pydio\Core\Utils\Vars\StringHelper;
+
+use Pydio\Tasks\Providers\SqlTasksProvider;
+use Zend\Diactoros\Response\JsonResponse;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class TaskController
+ * Main controller for TaskService actions
+ * @package Pydio\Tasks
+ */
+class TaskController extends Plugin implements SqlTableProvider
+{
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        parent::init($ctx, $options);
+        TaskService::getInstance()->setProvider(new SqlTasksProvider());
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param Task $task
+     */
+    protected function initTaskFromApi(ServerRequestInterface $request, Task &$task){
+        $params = $request->getParsedBody();
+        $taskData = json_decode($params["task"], true);
+        /** @var Task $task */
+        $task = SimpleRestResourceRouter::cast($task, $taskData);
+        if(isSet($params["taskId"])) {
+            $task->setId($params["taskId"]);
+        } else {
+            $task->setId(StringHelper::createGUID());
+        }
+        /** @var ContextInterface $ctx */
+        $ctx = $request->getAttribute("ctx");
+
+        if(isSet($params["target-users"]) && isSet($params["target-repositories"]) && $ctx->getUser()->isAdmin()){
+            $task->setUserId($ctx->getUser()->getId());
+            $task->setImpersonateUsers($params["target-users"]);
+            $task->setWsId($params["target-repositories"]);
+        }else{
+            $task->setUserId($ctx->getUser()->getId());
+            $task->setWsId($ctx->getRepositoryId());
+        }
+        if(count($task->nodes)){
+            foreach($task->nodes as $index => $path){
+                $task->nodes[$index] = "pydio://".$task->getUserId()."@".$task->getWsId().$path;
+            }
+        }
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @throws \Pydio\Core\Exception\UserNotFoundException
+     */
+    public function route(ServerRequestInterface &$request, ResponseInterface &$response){
+
+        $action = $request->getAttribute("action");
+        $taskService = TaskService::getInstance();
+        /** @var ContextInterface $ctx */
+        $ctx = $request->getAttribute("ctx");
+        if(!$ctx->hasUser() || !$ctx->hasRepository()){
+            return;
+        }
+        switch ($action){
+
+            case "tasks_list":
+                
+                $params = $request->getParsedBody();
+                if(isSet($params["scope"]) && $ctx->getUser()->isAdmin()){
+                    $userObject = $repoObject = null;
+                    if($params["scope"] === "repository" && !empty($params["repository_id"])){
+                        $repoObject = RepositoryService::getRepositoryById($params["repository_id"]);
+                    }else if($params["scope"] === "user" && !empty($params["user_id"])){
+                        $userObject = UsersService::getUserById($params["user_id"]);
+                    }
+                    $tasks = $taskService->getCurrentRunningTasks($userObject, $repoObject);
+                }else{
+                    $tasks = $taskService->getCurrentRunningTasks($ctx->getUser(), $ctx->getRepository());
+                }
+                $response = new JsonResponse($tasks);
+                break;
+
+            case "task_info":
+                
+                $task = $taskService->getTaskById($request->getParsedBody()["taskId"]);
+                $response = new JsonResponse($task);
+                break;
+
+            case "task_create":
+                
+                $newTask = new Task();
+                $this->initTaskFromApi($request, $newTask);
+                $taskService->createTask($newTask, $newTask->getSchedule());
+                if($newTask->getSchedule()->shouldRunNow()){
+                    CliRunner::applyTaskInBackground($newTask);
+                }
+                $response = new JsonResponse($newTask);
+                break;
+
+            case "task_update":
+                
+                $taskData = $request->getParsedBody()["request_body"];
+                $newTask = $taskService->getTaskById($request->getParsedBody()["taskId"]);
+                $newTask = SimpleRestResourceRouter::cast($newTask, $taskData);
+                $taskService->updateTask($newTask);
+                $response = new JsonResponse($newTask);
+                break;
+
+            case "task_toggle_status":
+                
+                $task = $taskService->getTaskById($request->getParsedBody()["taskId"]);
+                if(!empty($task)){
+                    $status = intval($request->getParsedBody()["status"]);
+                    if($status != $task->getStatus()){
+                        $task->setStatus($status);
+                        $taskService->updateTask($task);
+                    }
+                }
+                break;
+
+            case "task_delete":
+                if($taskService->deleteTask($request->getParsedBody()["taskId"])){
+                    $response = new JsonResponse(new UserMessage("Ok"));
+                }
+                break;
+            default:
+                break;
+        }
+
+    }
+
+    /**
+     * @param AJXP_Node $node
+     * @param bool $isContextNode
+     * @param string $details
+     */
+    public function attachTasksToNode(AJXP_Node &$node, $isContextNode = false, $details = "all"){
+
+        if($details == "all"){
+            $t = TaskService::getInstance()->getActiveTasksForNode($node);
+            if(count($t)){
+                $ids = array_map(function (Task $el) {
+                    return $el->getId();
+                }, $t);
+                $node->mergeMetadata([
+                    "tasks"=> implode(",",$ids),
+                    "overlay_icon" => "task-running.png",
+                    "overlay_class" => "mdi mdi-radar"
+                ], true);
+            }
+        }
+
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     */
+    public function enrichConsumeChannel(ServerRequestInterface &$requestInterface, ResponseInterface &$responseInterface){
+
+        /** @var ContextInterface $ctx */
+        $ctx = $requestInterface->getAttribute("ctx");
+        if(!$ctx->hasUser() || !$ctx->hasRepository()) return;
+
+        $respType = &$responseInterface->getBody();
+        if(!$respType instanceof \Pydio\Core\Http\Response\SerializableResponseStream && !$respType->getSize()){
+            $respType = new \Pydio\Core\Http\Response\SerializableResponseStream();
+            $responseInterface = $responseInterface->withBody($respType);
+        }
+        if($respType instanceof \Pydio\Core\Http\Response\SerializableResponseStream){
+            $taskList = TaskService::getInstance()->getCurrentRunningTasks($ctx->getUser(), $ctx->getRepository());
+            $respType->addChunk(new TaskListMessage($taskList));
+        }
+
+    }
+
+    /**
+     * Install SQL table using a dibi driver data
+     * @param $param array("SQL_DRIVER" => $dibiDriverData)
+     * @return mixed
+     */
+    public function installSQLTables($param)
+    {
+        $p = OptionsHelper::cleanDibiDriverParameters($param["SQL_DRIVER"]);
+        return DBHelper::runCreateTablesQuery($p, $this->getBaseDir() . "/create.sql");
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.tasks/src/TaskListMessage.php b/core/src/plugins/core.tasks/src/TaskListMessage.php
new file mode 100644
index 0000000000..c5cdef20f3
--- /dev/null
+++ b/core/src/plugins/core.tasks/src/TaskListMessage.php
@@ -0,0 +1,69 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tasks;
+
+use Pydio\Core\Http\Response\JSONSerializableResponseChunk;
+use Pydio\Core\Http\Response\XMLSerializableResponseChunk;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class TaskListMessage
+ * Serializable message for http response
+ * @package Pydio\Tasks
+ */
+class TaskListMessage implements JSONSerializableResponseChunk, XMLSerializableResponseChunk
+{
+
+    private $taskList;
+    /**
+     * TaskListMessage constructor.
+     * @param array $taskList
+     */
+    public function __construct($taskList)
+    {
+        $this->taskList = $taskList;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function jsonSerializableData()
+    {
+        return $this->taskList;
+    }
+
+    /**
+     * @return string
+     */
+    public function jsonSerializableKey()
+    {
+        return "taskList";
+    }
+
+    /**
+     * @return string
+     */
+    public function toXML()
+    {
+        return "<taskList><![CDATA[ ".json_encode($this->taskList)." ]]></taskList>";
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.tasks/src/TaskService.php b/core/src/plugins/core.tasks/src/TaskService.php
new file mode 100644
index 0000000000..87766bbba0
--- /dev/null
+++ b/core/src/plugins/core.tasks/src/TaskService.php
@@ -0,0 +1,300 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Tasks;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\NodesDiff;
+use Pydio\Core\Controller\CliRunner;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Exception\PydioException;
+
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Model\RepositoryInterface;
+use Pydio\Core\Model\UserInterface;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Vars\StringHelper;
+
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Class TaskService
+ * @package Pydio\Tasks
+ */
+class TaskService implements ITasksProvider
+{
+    /**
+     * @var ITasksProvider
+     */
+    private $realProvider;
+
+    /**
+     * @var TaskService
+     */
+    private static $instance;
+
+    /**
+     * @param ITasksProvider $provider
+     */
+    public function setProvider(ITasksProvider $provider){
+        $this->realProvider = $provider;
+    }
+
+    /**
+     * @return TaskService
+     */
+    public static function getInstance(){
+        if(!isSet(self::$instance)){
+            self::$instance = new TaskService();
+        }
+        return self::$instance;
+    }
+
+    /**
+     * @param Task $task
+     * @param ServerRequestInterface|null $request
+     * @param ResponseInterface|null $response
+     * @throws \Pydio\Core\Exception\ActionNotFoundException
+     * @throws \Pydio\Core\Exception\AuthRequiredException
+     * @return ResponseInterface|null
+     */
+    public function enqueueTask(Task $task, ServerRequestInterface $request = null, ResponseInterface $response = null){
+        
+        $workers = ConfService::getGlobalConf("MQ_USE_WORKERS", "mq");
+        if($workers && !$task->getSchedule()->shouldRunNow()){
+            Logger::getInstance()->logInfo("TaskService", "Enqueuing Task ".$task->getId());
+            $msg = ["pending_task" => $task->getId()];
+            Controller::applyHook("msg.task", [$task->getContext(), $msg]);
+            return $response;
+        }
+
+        $minisite = $request !== null && $request->getAttribute("minisite");
+
+        if(ConfService::backgroundActionsSupported() && !ApplicationState::sapiIsCli() && !$minisite) {
+
+            CliRunner::applyTaskInBackground($task);
+            return $response;
+
+        }else{
+            $params = $task->getParameters();
+            $action = $task->getAction();
+            $id = $task->getId();
+            if(empty($request)){
+                $ctx = $task->getContext();
+            }else{
+                $ctx = $request->getAttribute("ctx");
+            }
+            $request = Controller::executableRequest($ctx, $action, $params)->withAttribute("pydio-task-id", $id);
+            return Controller::run($request);
+        }
+
+    }
+
+    /**
+     * @param Task $task
+     * @throws \Exception
+     */
+    protected function publishTaskUpdate(Task $task){
+
+        if($task->getStatus() === Task::STATUS_TEMPLATE){
+            return;
+        }
+        $json = StringHelper::xmlEntities(json_encode($task));
+        if(count($task->nodes)){
+            $nodesDiff = new NodesDiff();
+            foreach($task->nodes as $url){
+                $n = new AJXP_Node($url);
+                $n->loadNodeInfo(true, false, "all");
+                Controller::applyHook("node.meta_change", array(&$n));
+                $nodesDiff->update($n);
+            }
+        }
+        $xmlString = "";
+        if(isSet($nodesDiff)){
+            $xmlString = $nodesDiff->toXML();
+        }
+        Controller::applyHook("msg.instant", array($task->getContext(), "<task id='".$task->getId()."' data=\"".$json."\"/>".$xmlString, $task->getUserId()));
+
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $actionName
+     * @param $parameters
+     * @param array $nodePathes
+     * @param int $flags
+     * @return Task
+     */
+    public static function actionAsTask(ContextInterface $ctx, $actionName, $parameters, $nodePathes = [], $flags = 0){
+
+        $userId = $ctx->hasUser() ? $ctx->getUser()->getId() : "shared";
+        $repoId = $ctx->getRepositoryId();
+        
+        $task = new Task();
+        $task->setLabel("Launching action ".$actionName);
+        $task->setId(StringHelper::createGUID());
+        $task->setUserId($userId);
+        $task->setWsId($repoId);
+        $task->setStatus(Task::STATUS_PENDING);
+        $task->setStatusMessage("Starting...");
+        $task->setAction($actionName);
+        $task->setParameters($parameters);
+        $task->setFlags($flags);
+        if(count($nodePathes)){
+            array_map(function ($node) use ($task){
+                $task->attachToNode($node);
+            }, $nodePathes);
+        }
+        TaskService::getInstance()->createTask($task, Schedule::scheduleNow());
+
+        return $task;
+
+    }
+
+    /**
+     * @param string $taskId
+     * @param integer $status
+     * @param string $message
+     * @param bool|null $stoppable
+     * @param integer|null $progress
+     * @return Task
+     * @throws PydioException
+     */
+    public function updateTaskStatus($taskId, $status, $message, $stoppable = null, $progress = null){
+        $t = self::getTaskById($taskId);
+        if(empty($t)){
+            throw new PydioException("Cannot find task with this id");
+        }
+        $t->setStatus($status);
+        $t->setStatusMessage($message);
+        if($stoppable !== null){
+            $f = $t->isResumable() ? Task::FLAG_RESUMABLE : 0;
+            $f = $t->hasProgress() ? $f | Task::FLAG_HAS_PROGRESS : $f;
+            $f = $stoppable ? $f | Task::FLAG_STOPPABLE : $f;
+            $t->setFlags($f);
+        }
+        if($progress !== null){
+            $t->setProgress($progress);
+        }
+        return self::updateTask($t);
+    }
+
+    /**
+     * @param Task $task
+     * @param Schedule $when
+     * @return Task
+     */
+    public function createTask(Task $task, Schedule $when)
+    {
+        $res = $this->realProvider->createTask($task, $when);
+        $this->publishTaskUpdate($task);
+        return $res;
+    }
+
+    /**
+     * @param string $taskId
+     * @return Task
+     */
+    public function getTaskById($taskId)
+    {
+        return $this->realProvider->getTaskById($taskId);
+    }
+
+    /**
+     * @param Task $task
+     * @return Task
+     */
+    public function updateTask(Task $task)
+    {
+        $res = $this->realProvider->updateTask($task);
+        $this->publishTaskUpdate($task);
+        return $res;
+    }
+
+    /**
+     * @param string $taskId
+     * @return bool
+     */
+    public function deleteTask($taskId)
+    {
+        return $this->realProvider->deleteTask($taskId);
+    }
+
+    /**
+     * @return Task[]
+     */
+    public function getPendingTasks()
+    {
+        return $this->realProvider->getPendingTasks();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCurrentRunningTasks($user = null, $repository = null)
+    {
+        return $this->realProvider->getCurrentRunningTasks($user, $repository);
+    }
+
+    /**
+     * @param AJXP_Node $node
+     * @return Task[]
+     */
+    public function getActiveTasksForNode(AJXP_Node $node)
+    {
+        return $this->realProvider->getActiveTasksForNode($node);
+    }
+
+    /**
+     * @param UserInterface $user
+     * @param RepositoryInterface $repository
+     * @param int $status
+     * @param int $scheduleType
+     * @param int $taskType
+     * @param string $parentUid
+     * @return \Pydio\Tasks\Task[]
+     */
+    public function getTasks($user = null, $repository = null, $status = -1, $scheduleType = -1, $taskType = Task::TYPE_USER, $parentUid = "")
+    {
+        return $this->realProvider->getTasks($user, $repository, $status);
+    }
+
+    /**
+     * @return Task[]
+     */
+    public function getScheduledTasks()
+    {
+        return $this->realProvider->getScheduledTasks();
+    }
+
+    /**
+     * @param string $taskId
+     * @return Task[]
+     */
+    public function getChildrenTasks($taskId){
+        return $this->realProvider->getChildrenTasks($taskId);
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/core.uploader/CoreUploaderLoader.php b/core/src/plugins/core.uploader/CoreUploaderLoader.php
new file mode 100644
index 0000000000..0489a545fc
--- /dev/null
+++ b/core/src/plugins/core.uploader/CoreUploaderLoader.php
@@ -0,0 +1,76 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Uploader\Core;
+
+use Pydio\Core\Utils\Vars\StatHelper;
+use Pydio\Core\PluginFramework\Plugin;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Config loader overrider
+ * @package AjaXplorer_Plugins
+ * @subpackage Core
+ */
+class CoreUploaderLoader extends Plugin
+{
+    public $AUTO_LOAD_TYPE = true;
+
+    /**
+     * Return this plugin configs, merged with its associated "core" configs.
+     * @return array
+     */
+    public function getConfigs()
+    {
+        $data = parent::getConfigs();
+        $this->filterData($data);
+        return $data;
+    }
+
+    /**
+     * Load the configs passed as parameter. This method will
+     * + Parse the config definitions and load the default values
+     * + Merge these values with the $configData parameter
+     * + Publish their value in the manifest if the global_param is "exposed" to the client.
+     * @param array $data
+     * @return void
+     */
+    public function loadConfigs($data)
+    {
+        $this->filterData($data);
+        parent::loadConfigs($data);
+
+    }
+
+    /**
+     * @param $data
+     */
+    private function filterData(&$data)
+    {
+        $confMaxSize = StatHelper::convertBytes($data["UPLOAD_MAX_SIZE"]);
+        $UploadMaxSize = min(StatHelper::convertBytes(ini_get('upload_max_filesize')), StatHelper::convertBytes(ini_get('post_max_size')));
+        if (intval($confMaxSize) != 0) {
+            $UploadMaxSize = min ($UploadMaxSize, $confMaxSize);
+        }
+        $data["UPLOAD_MAX_SIZE"] = $UploadMaxSize;
+
+    }
+}
diff --git a/core/src/plugins/core.uploader/class.CoreUploaderLoader.php b/core/src/plugins/core.uploader/class.CoreUploaderLoader.php
deleted file mode 100644
index 8c5d0a068b..0000000000
--- a/core/src/plugins/core.uploader/class.CoreUploaderLoader.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Config loader overrider
- * @package AjaXplorer_Plugins
- * @subpackage Core
- */
-class CoreUploaderLoader extends AJXP_Plugin
-{
-    public $AUTO_LOAD_TYPE = true;
-
-    public function getConfigs()
-    {
-        $data = parent::getConfigs();
-        $this->filterData($data);
-        return $data;
-    }
-    public function loadConfigs($data)
-    {
-        $this->filterData($data);
-        parent::loadConfigs($data);
-
-    }
-
-    private function filterData(&$data)
-    {
-        $confMaxSize = AJXP_Utils::convertBytes($data["UPLOAD_MAX_SIZE"]);
-        $UploadMaxSize = min(AJXP_Utils::convertBytes(ini_get('upload_max_filesize')), AJXP_Utils::convertBytes(ini_get('post_max_size')));
-        if (intval($confMaxSize) != 0) {
-            $UploadMaxSize = min ($UploadMaxSize, $confMaxSize);
-        }
-        $data["UPLOAD_MAX_SIZE"] = $UploadMaxSize;
-
-    }
-}
diff --git a/core/src/plugins/core.uploader/i18n/conf/cs.php b/core/src/plugins/core.uploader/i18n/conf/cs.php
index a77d9a73c7..959e5b0d0c 100644
--- a/core/src/plugins/core.uploader/i18n/conf/cs.php
+++ b/core/src/plugins/core.uploader/i18n/conf/cs.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Allowed Extensions" => "Povolená rozšíření",
diff --git a/core/src/plugins/core.uploader/i18n/conf/de.php b/core/src/plugins/core.uploader/i18n/conf/de.php
index 7f395624f4..8c02aa1a8c 100644
--- a/core/src/plugins/core.uploader/i18n/conf/de.php
+++ b/core/src/plugins/core.uploader/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Allowed Extensions" => "Erlaubte Erweiterungen",
diff --git a/core/src/plugins/core.uploader/i18n/conf/en.php b/core/src/plugins/core.uploader/i18n/conf/en.php
index 2e3977a1c4..900cc4d1c7 100644
--- a/core/src/plugins/core.uploader/i18n/conf/en.php
+++ b/core/src/plugins/core.uploader/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Allowed Extensions" => "Allowed Extensions",
diff --git a/core/src/plugins/core.uploader/i18n/conf/fr.php b/core/src/plugins/core.uploader/i18n/conf/fr.php
index d118f9506d..96996c1bd5 100644
--- a/core/src/plugins/core.uploader/i18n/conf/fr.php
+++ b/core/src/plugins/core.uploader/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Allowed Extensions" => "Extensions autorisées",
diff --git a/core/src/plugins/core.uploader/i18n/conf/it.php b/core/src/plugins/core.uploader/i18n/conf/it.php
index 5447f6f182..44740418f6 100644
--- a/core/src/plugins/core.uploader/i18n/conf/it.php
+++ b/core/src/plugins/core.uploader/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Allowed Extensions" => "Estensioni Ammesse",
@@ -33,4 +33,4 @@
 "Maximum number of files for each upload. Leave to 0 for no limit." => "Maximum number of files for each upload. Leave to 0 for no limit.",
 "Maximum size per file allowed to upload. By default, this is fixed by php config 'upload_max_filesize'. Use this one only if you want to set it smaller than the php config. If you want to increase the php value, please check the PHP documentation for how to set a php config. Use either the php config syntax with letters for size (e.g. '2M' for 2MegaBytes , '1G' for one gigabyte, etc.) or an integer value like 2097152 for 2 megabytes." => "Maximum size per file allowed to upload. By default, this is fixed by php config 'upload_max_filesize'. Use this one only if you want to set it smaller than the php config. If you want to increase the php value, please check the PHP documentation for how to set a php config. Use either the php config syntax with letters for size (e.g. '2M' for 2MegaBytes , '1G' for one gigabyte, etc.) or an integer value like 2097152 for 2 megabytes.",
 "Maximum total size (all files size cumulated) by upload. Leave to 0 if you do not want any limit. See the previous variable for syntax ('2M' or 2097152 )" => "Maximum total size (all files size cumulated) by upload. Leave to 0 if you do not want any limit. See the previous variable for syntax ('2M' or 2097152 )",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/core.uploader/i18n/conf/pt.php b/core/src/plugins/core.uploader/i18n/conf/pt.php
index 1e9228f5dd..e26e94f3be 100644
--- a/core/src/plugins/core.uploader/i18n/conf/pt.php
+++ b/core/src/plugins/core.uploader/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Allowed Extensions" => "Extensões Permitidas",
diff --git a/core/src/plugins/core.uploader/i18n/conf/ru.php b/core/src/plugins/core.uploader/i18n/conf/ru.php
index b8173c545a..bbeb895a57 100644
--- a/core/src/plugins/core.uploader/i18n/conf/ru.php
+++ b/core/src/plugins/core.uploader/i18n/conf/ru.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Allowed Extensions" => "Допустимые расширения",
@@ -33,4 +33,4 @@
 "Maximum number of files for each upload. Leave to 0 for no limit." => "Maximum number of files for each upload. Leave to 0 for no limit.",
 "Maximum size per file allowed to upload. By default, this is fixed by php config 'upload_max_filesize'. Use this one only if you want to set it smaller than the php config. If you want to increase the php value, please check the PHP documentation for how to set a php config. Use either the php config syntax with letters for size (e.g. '2M' for 2MegaBytes , '1G' for one gigabyte, etc.) or an integer value like 2097152 for 2 megabytes." => "Maximum size per file allowed to upload. By default, this is fixed by php config 'upload_max_filesize'. Use this one only if you want to set it smaller than the php config. If you want to increase the php value, please check the PHP documentation for how to set a php config. Use either the php config syntax with letters for size (e.g. '2M' for 2MegaBytes , '1G' for one gigabyte, etc.) or an integer value like 2097152 for 2 megabytes.",
 "Maximum total size (all files size cumulated) by upload. Leave to 0 if you do not want any limit. See the previous variable for syntax ('2M' or 2097152 )" => "Maximum total size (all files size cumulated) by upload. Leave to 0 if you do not want any limit. See the previous variable for syntax ('2M' or 2097152 )",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/core.uploader/manifest.xml b/core/src/plugins/core.uploader/manifest.xml
index 181cecf5b2..39691df34a 100644
--- a/core/src/plugins/core.uploader/manifest.xml
+++ b/core/src/plugins/core.uploader/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ajxpcore id="core.uploader" label="CONF_MESSAGE[Uploaders Options]" description="CONF_MESSAGE[Options shared by all uploaders plugins]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <class_definition filename="plugins/core.uploader/class.CoreUploaderLoader.php" classname="CoreUploaderLoader"/>
+    <class_definition filename="plugins/core.uploader/CoreUploaderLoader.php" classname="Pydio\Uploader\Core\CoreUploaderLoader"/>
     <client_settings>
         <resources>
             <i18n namespace="core_uploader" path="plugins/core.uploader/i18n"/>
diff --git a/core/src/plugins/cypher.encfs/EncfsMounter.php b/core/src/plugins/cypher.encfs/EncfsMounter.php
new file mode 100644
index 0000000000..fa5b1e5711
--- /dev/null
+++ b/core/src/plugins/cypher.encfs/EncfsMounter.php
@@ -0,0 +1,326 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Action\Cypher;
+
+use Exception;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\RecycleBinManager;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Utils\Vars\InputFilter;
+
+use Pydio\Core\PluginFramework\Plugin;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * @package AjaXplorer_Plugins
+ * @subpackage Cypher
+ */
+class EncfsMounter extends Plugin
+{
+    /**
+     * @param ContextInterface $contextInterface
+     * @return string
+     */
+    protected function getWorkingPath(ContextInterface $contextInterface)
+    {
+        return $contextInterface->getRepository()->getContextOption($contextInterface, "PATH");
+    }
+
+    /**
+     * @param $actionName
+     * @param $httpVars
+     * @param $fileVars
+     * @param ContextInterface $ctx
+     * @throws Exception
+     */
+    public function cypherAllMounted($actionName, &$httpVars, &$fileVars, ContextInterface $ctx)
+    {
+        $dirs = glob($this->getWorkingPath($ctx) . "/ENCFS_CLEAR_*/.ajxp_mount");
+        if ($dirs !== false && count($dirs)) {
+            foreach ($dirs as $mountedFile) {
+                $mountedDir = dirname($mountedFile);
+                $this->logDebug("Warning, $mountedDir was not unmounted before $actionName");
+                $this->umountFolder($mountedDir);
+            }
+        }
+    }
+
+    /**
+     * @param $actionName
+     * @param $httpVars
+     * @param $fileVars
+     * @param ContextInterface $ctx
+     */
+    public function preProcessMove($actionName, &$httpVars, &$fileVars, ContextInterface $ctx)
+    {
+        $destO = InputFilter::decodeSecureMagic($httpVars["dest"]);
+        $dest = substr($destO, 1, strpos(ltrim($destO, "/"), "/"));
+        if (empty($dest)) $dest = ltrim($destO, "/");
+        $userSelection = UserSelection::fromContext($ctx, $httpVars);
+        if (!$userSelection->isEmpty()) {
+            $testFileO = $userSelection->getUniqueFile();
+            $testFile = substr($testFileO, 1, strpos(ltrim($testFileO, "/"), "/"));
+            if (empty($testFile)) $testFile = ltrim($testFileO, "/");
+            if ($actionName == "move") {
+                if ((strstr($dest, "ENCFS_CLEAR_") != false && strstr($testFile, "ENCFS_CLEAR_") === false)
+                    || (strstr($dest, "ENCFS_CLEAR_") === false && strstr($testFile, "ENCFS_CLEAR_") !== false)
+                    || (strstr($dest, "ENCFS_CLEAR_") != false && strstr($testFile, "ENCFS_CLEAR_") !== false
+                        && $testFile != $dest)
+                ) {
+                    $httpVars["force_copy_delete"] = "true";
+                    $this->logDebug("One mount to another, copy/delete instead of move ($dest, $testFile)");
+                }
+            } else if ($actionName == "delete" && RecycleBinManager::recycleEnabled()) {
+                if (strstr($testFile, "ENCFS_CLEAR_") !== false) {
+                    $httpVars["force_copy_delete"] = "true";
+                    $this->logDebug("One mount to another, copy/delete instead of move");
+                }
+            } else if ($actionName == "restore") {
+                if (strstr(RecycleBinManager::getFileOrigin($testFile), "ENCFS_CLEAR_")) {
+                    $httpVars["force_copy_delete"] = "true";
+                    $this->logDebug("One mount to another, copy/delete instead of move");
+                }
+            }
+        }
+    }
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @throws Exception
+     */
+    public function switchAction(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface)
+    {
+
+        $actionName = $requestInterface->getAttribute("action");
+        $httpVars = $requestInterface->getParsedBody();
+        /** @var ContextInterface $ctx */
+        $ctx = $requestInterface->getAttribute("ctx");
+        $xmlTemplate = $this->getContextualOption($ctx, "ENCFS_XML_TEMPLATE");
+        $userSelection = UserSelection::fromContext($ctx, $httpVars);
+        if ($userSelection->isEmpty()) {
+            throw new Exception("Please select a folder");
+        }
+        $node = $userSelection->getUniqueNode();
+
+        switch ($actionName) {
+
+            case "encfs.cypher_folder" :
+
+                if (empty($xmlTemplate) || !is_file($xmlTemplate)) {
+                    throw new Exception("It seems that you have not set the plugin 'Enfcs XML File' configuration, or the system cannot find it!");
+                }
+
+                $workingP = rtrim($this->getWorkingPath($ctx), "/");
+                $dir = $workingP . $node->getPath();
+
+                if ($node->isRoot() || !$node->getParent()->isRoot()) {
+                    throw new Exception("Please cypher only folders at the root of your repository");
+                }
+
+                $pass = $httpVars["pass"];
+                $raw = dirname($dir) . DIRECTORY_SEPARATOR . "ENCFS_RAW_" . basename($dir);
+                if (!strstr($dir, "ENCFS_CLEAR_") && !is_dir($raw)) {
+                    // NEW FOLDER SCENARIO
+                    $clear = dirname($dir) . DIRECTORY_SEPARATOR . "ENCFS_CLEAR_" . basename($dir);
+                    mkdir($raw);
+                    $result = self::initEncFolder($raw, $xmlTemplate, $this->getContextualOption($ctx, "ENCFS_XML_PASSWORD"), $pass);
+                    if ($result) {
+                        // Mount folder
+                        mkdir($clear);
+                        $uid = $this->getContextualOption($ctx, "ENCFS_UID");
+                        self::mountFolder($raw, $clear, $pass, $uid);
+                        $content = scandir($dir);
+                        foreach ($content as $fileOrFolder) {
+                            if ($fileOrFolder == "." || $fileOrFolder == "..") continue;
+                            $cmd = "mv " . escapeshellarg($dir . DIRECTORY_SEPARATOR . $fileOrFolder) . " " . escapeshellarg($clear . DIRECTORY_SEPARATOR);
+                            shell_exec($cmd);
+                        }
+                        rmdir($dir);
+                        self::umountFolder($clear);
+                    }
+                } else if (substr(basename($dir), 0, strlen("ENCFS_CLEAR_")) == "ENCFS_CLEAR_") {
+                    // SIMPLY UNMOUNT
+                    self::umountFolder($dir);
+                }
+                break;
+
+            case "encfs.uncypher_folder":
+
+                $dir = $this->getWorkingPath($ctx) . $node->getPath();
+                $raw = str_replace("ENCFS_CLEAR_", "ENCFS_RAW_", $dir);
+                $pass = $httpVars["pass"];
+                $uid = $this->getContextualOption($ctx, "ENCFS_UID");
+                if (is_dir($raw)) {
+                    self::mountFolder($raw, $dir, $pass, $uid);
+                }
+                break;
+        }
+
+        $x = new \Pydio\Core\Http\Response\SerializableResponseStream();
+        $diff = new \Pydio\Access\Core\Model\NodesDiff();
+        $diff->update($node);
+        $x->addChunk($diff);
+        $responseInterface = $responseInterface->withBody($x);
+
+    }
+
+
+    /**
+     * @param AJXP_Node $ajxpNode
+     * @param AJXP_Node|bool $parentNode
+     * @param bool $details
+     */
+    public function filterENCFS(&$ajxpNode, $parentNode = false, $details = false)
+    {
+        if (substr($ajxpNode->getLabel(), 0, strlen("ENCFS_RAW_")) == "ENCFS_RAW_") {
+            $ajxpNode->hidden = true;
+        } else if (substr($ajxpNode->getLabel(), 0, strlen("ENCFS_CLEAR_")) == "ENCFS_CLEAR_") {
+            $ajxpNode->ENCFS_clear_folder = true;
+            $ajxpNode->overlay_icon = "cypher.encfs/overlay_ICON_SIZE.png";
+            $ajxpNode->overlay_class = "icon-lock";
+            $ajxpNode->ajxp_readonly = "true";
+            if (is_file($ajxpNode->getUrl() . "/.ajxp_mount")) {
+                $ajxpNode->setLabel(substr($ajxpNode->getLabel(), strlen("ENCFS_CLEAR_")));
+                $ajxpNode->ENCFS_clear_folder_mounted = true;
+                $ajxpNode->ajxp_readonly = "false";
+            } else {
+                $ajxpNode->setLabel(substr($ajxpNode->getLabel(), strlen("ENCFS_CLEAR_")) . " (encrypted)");
+            }
+        }
+    }
+
+    /**
+     * @param $raw
+     * @param $originalXML
+     * @param $originalSecret
+     * @param $secret
+     * @return bool
+     * @throws Exception
+     */
+    public static function initEncFolder($raw, $originalXML, $originalSecret, $secret)
+    {
+        copy($originalXML, $raw . "/" . basename($originalXML));
+        $descriptorspec = array(
+            0 => array("pipe", "r"),  // stdin
+            1 => array("pipe", "w"),  // stdout
+            2 => array("pipe", "w")   // stderr ?? instead of a file
+        );
+        $command = 'sudo encfsctl autopasswd ' . escapeshellarg($raw);
+        $process = proc_open($command, $descriptorspec, $pipes);
+        $text = "";
+        $error = "";
+        if (is_resource($process)) {
+            fwrite($pipes[0], $originalSecret);
+            fwrite($pipes[0], "\n");
+            fwrite($pipes[0], $secret);
+            fflush($pipes[0]);
+            fclose($pipes[0]);
+            while ($s = fgets($pipes[1], 1024)) {
+                $text .= $s;
+            }
+            fclose($pipes[1]);
+            while ($s = fgets($pipes[2], 1024)) {
+                $error .= $s . "\n";
+            }
+            fclose($pipes[2]);
+        }
+        if ((!empty($error) || stristr($text, "invalid password") !== false) && file_exists($raw . "/" . basename($originalXML))) {
+            unlink($raw . "/" . basename($originalXML));
+            throw new Exception("Error while creating encfs volume");
+        } else {
+            return true;
+        }
+    }
+
+
+    /**
+     * @param $raw
+     * @param $clear
+     * @param $secret
+     * @param $uid
+     * @throws Exception
+     */
+    public static function mountFolder($raw, $clear, $secret, $uid)
+    {
+        $descriptorspec = array(
+            0 => array("pipe", "r"),  // stdin
+            1 => array("pipe", "w"),  // stdout
+            2 => array("pipe", "w")   // stderr ?? instead of a file
+        );
+        $command = 'sudo encfs -o allow_other,uid=' . $uid . ' -S ' . escapeshellarg($raw) . ' ' . escapeshellarg($clear);
+        $process = proc_open($command, $descriptorspec, $pipes);
+        $text = "";
+        $error = "";
+        if (is_resource($process)) {
+            fwrite($pipes[0], $secret);
+            fclose($pipes[0]);
+            while ($s = fgets($pipes[1], 1024)) {
+                $text .= $s;
+            }
+            fclose($pipes[1]);
+            while ($s = fgets($pipes[2], 1024)) {
+                $error .= $s . "\n";
+            }
+            fclose($pipes[2]);
+        }
+        if (!empty($error)) {
+            throw new Exception("Error mounting volume : " . $error);
+        }
+        if (stristr($text, "error")) {
+            throw new Exception("Error mounting volume : " . $text);
+        }
+        // Mount should have succeeded now
+        if (!is_file($clear . "/.ajxp_mount")) {
+            file_put_contents($clear . "/.ajxp_mount", "ajxp encfs mount");
+        }
+    }
+
+    /**
+     * @param $clear
+     * @throws Exception
+     */
+    public static function umountFolder($clear)
+    {
+        $descriptorspec = array(
+            1 => array("pipe", "w"),  // stdout
+            2 => array("pipe", "w")   // stderr ?? instead of a file
+        );
+        $command = 'sudo umount ' . escapeshellarg($clear);
+        $process = proc_open($command, $descriptorspec, $pipes);
+        $text = "";
+        $error = "";
+        if (is_resource($process)) {
+            while ($s = fgets($pipes[1], 1024)) {
+                $text .= $s;
+            }
+            fclose($pipes[1]);
+            while ($s = fgets($pipes[2], 1024)) {
+                $error .= $s . "\n";
+            }
+            fclose($pipes[2]);
+        }
+        if (!empty($error)) throw new Exception($error);
+    }
+}
diff --git a/core/src/plugins/cypher.encfs/class.EncfsMounter.php b/core/src/plugins/cypher.encfs/class.EncfsMounter.php
deleted file mode 100644
index 70cf81ea63..0000000000
--- a/core/src/plugins/cypher.encfs/class.EncfsMounter.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-/**
- * @package AjaXplorer_Plugins
- * @subpackage Cypher
- */
-class EncfsMounter extends AJXP_Plugin
-{
-
-    protected function getWorkingPath()
-    {
-        $repo = ConfService::getRepository();
-        $path = $repo->getOption("PATH");
-        return $path;
-    }
-
-    public function cypherAllMounted($actionName, &$httpVars, &$fileVars)
-    {
-        $dirs = glob($this->getWorkingPath()."/ENCFS_CLEAR_*/.ajxp_mount");
-        if ($dirs!==false && count($dirs)) {
-            foreach ($dirs as $mountedFile) {
-                $mountedDir = dirname($mountedFile);
-                $this->logDebug("Warning, $mountedDir was not unmounted before $actionName");
-                $this->umountFolder($mountedDir);
-            }
-        }
-    }
-
-    public function preProcessMove($actionName, &$httpVars, &$fileVars)
-    {
-        $destO = AJXP_Utils::decodeSecureMagic($httpVars["dest"]);
-        $dest = substr($destO, 1, strpos(ltrim($destO, "/"), "/"));
-        if(empty($dest)) $dest = ltrim($destO, "/");
-        $userSelection = new UserSelection();
-        $userSelection->initFromHttpVars($httpVars);
-        if (!$userSelection->isEmpty()) {
-            $testFileO = $userSelection->getUniqueFile();
-            $testFile = substr($testFileO, 1, strpos(ltrim($testFileO, "/"), "/"));
-            if(empty($testFile)) $testFile = ltrim($testFileO, "/");
-            if ($actionName == "move") {
-                if( (strstr($dest, "ENCFS_CLEAR_")!=false && strstr($testFile, "ENCFS_CLEAR_")===false)
-                    || (strstr($dest, "ENCFS_CLEAR_")===false && strstr($testFile, "ENCFS_CLEAR_")!==false)
-                    || (strstr($dest, "ENCFS_CLEAR_")!=false && strstr($testFile, "ENCFS_CLEAR_")!==false
-                        &&  $testFile != $dest)
-                ){
-                    $httpVars["force_copy_delete"] = "true";
-                    $this->logDebug("One mount to another, copy/delete instead of move ($dest, $testFile)");
-                }
-            } else if ( $actionName == "delete" && RecycleBinManager::recycleEnabled() ) {
-                if (strstr($testFile, "ENCFS_CLEAR_")!==false) {
-                    $httpVars["force_copy_delete"] = "true";
-                    $this->logDebug("One mount to another, copy/delete instead of move");
-                }
-            } else if ($actionName == "restore") {
-                if (strstr(RecycleBinManager::getFileOrigin($testFile), "ENCFS_CLEAR_")) {
-                    $httpVars["force_copy_delete"] = "true";
-                    $this->logDebug("One mount to another, copy/delete instead of move");
-                }
-            }
-        }
-    }
-
-    public function switchAction($actionName, $httpVars, $fileVars)
-    {
-        //var_dump($httpVars);
-        $xmlTemplate = $this->getFilteredOption("ENCFS_XML_TEMPLATE");
-
-        switch ($actionName) {
-            case "encfs.cypher_folder" :
-                if (empty($xmlTemplate) || !is_file($xmlTemplate)) {
-                    throw new Exception("It seems that you have not set the plugin 'Enfcs XML File' configuration, or the system cannot find it!");
-                }
-
-                //$repo = ConfService::getRepository();
-                $workingP = rtrim($this->getWorkingPath(), "/");
-                $dir = $workingP.AJXP_Utils::decodeSecureMagic($httpVars["dir"]);
-
-                if (dirname($dir) != $workingP) {
-                    throw new Exception("Please cypher only folders at the root of your repository");
-                }
-
-                $pass = $httpVars["pass"];
-                $raw  = dirname($dir).DIRECTORY_SEPARATOR."ENCFS_RAW_".basename($dir);
-                if (!strstr($dir, "ENCFS_CLEAR_") && !is_dir($raw)) {
-                    // NEW FOLDER SCENARIO
-                    $clear  = dirname($dir).DIRECTORY_SEPARATOR."ENCFS_CLEAR_".basename($dir);
-                    mkdir($raw);
-                    $result = self::initEncFolder($raw, $xmlTemplate, $this->getFilteredOption("ENCFS_XML_PASSWORD"), $pass);
-                    if ($result) {
-                        // Mount folder
-                        mkdir($clear);
-                        $uid = $this->getFilteredOption("ENCFS_UID");
-                        self::mountFolder($raw, $clear, $pass, $uid);
-                        $content = scandir($dir);
-                        foreach ($content as $fileOrFolder) {
-                            if($fileOrFolder == "." || $fileOrFolder == "..") continue;
-                            $cmd = "mv ". escapeshellarg($dir . DIRECTORY_SEPARATOR . $fileOrFolder)." ". escapeshellarg($clear . DIRECTORY_SEPARATOR);
-                            $exec = shell_exec($cmd);
-                        }
-                        rmdir($dir);
-                        self::umountFolder($clear);
-                    }
-                } else if (substr(basename($dir), 0, strlen("ENCFS_CLEAR_")) == "ENCFS_CLEAR_") {
-                    // SIMPLY UNMOUNT
-                    self::umountFolder($dir);
-                }
-                break;
-            case "encfs.uncypher_folder":
-                $dir = $this->getWorkingPath().AJXP_Utils::decodeSecureMagic($httpVars["dir"]);
-                $raw = str_replace("ENCFS_CLEAR_", "ENCFS_RAW_", $dir);
-                $pass = $httpVars["pass"];
-                $uid = $this->getFilteredOption("ENCFS_UID");
-                if (is_dir($raw)) {
-                    self::mountFolder($raw, $dir, $pass, $uid);
-                }
-                break;
-        }
-        AJXP_XMLWriter::header();
-        AJXP_XMLWriter::reloadDataNode();
-        AJXP_XMLWriter::close();
-
-    }
-
-
-    /**
-     * @param AJXP_Node $ajxpNode
-     * @param AJXP_Node|bool $parentNode
-     * @param bool $details
-     */
-    public function filterENCFS(&$ajxpNode, $parentNode = false, $details = false)
-    {
-        if (substr($ajxpNode->getLabel(), 0, strlen("ENCFS_RAW_")) == "ENCFS_RAW_") {
-            $ajxpNode->hidden = true;
-        } else if (substr($ajxpNode->getLabel(), 0, strlen("ENCFS_CLEAR_")) == "ENCFS_CLEAR_") {
-            $ajxpNode->ENCFS_clear_folder = true;
-            $ajxpNode->overlay_icon = "cypher.encfs/overlay_ICON_SIZE.png";
-            $ajxpNode->overlay_class = "icon-lock";
-            $ajxpNode->ajxp_readonly = "true";
-            if (is_file($ajxpNode->getUrl()."/.ajxp_mount")) {
-                $ajxpNode->setLabel(substr($ajxpNode->getLabel(), strlen("ENCFS_CLEAR_")));
-                $ajxpNode->ENCFS_clear_folder_mounted = true;
-                $ajxpNode->ajxp_readonly = "false";
-            } else {
-                $ajxpNode->setLabel(substr($ajxpNode->getLabel(), strlen("ENCFS_CLEAR_")) . " (encrypted)");
-            }
-        }
-    }
-
-    public static function initEncFolder($raw, $originalXML, $originalSecret,  $secret)
-    {
-        copy($originalXML, $raw."/".basename($originalXML));
-        $descriptorspec = array(
-            0 => array("pipe", "r"),  // stdin
-            1 => array("pipe", "w"),  // stdout
-            2 => array("pipe", "w")   // stderr ?? instead of a file
-        );
-        $command = 'sudo encfsctl autopasswd '.escapeshellarg($raw);
-        $process = proc_open($command, $descriptorspec, $pipes);
-        $text = ""; $error = "";
-        if (is_resource($process)) {
-            fwrite($pipes[0], $originalSecret);
-            fwrite($pipes[0], "\n");
-            fwrite($pipes[0], $secret);
-            fflush($pipes[0]);
-            fclose($pipes[0]);
-            while ($s= fgets($pipes[1], 1024)) {
-                $text .= $s;
-            }
-            fclose($pipes[1]);
-            while ($s= fgets($pipes[2], 1024)) {
-                $error .= $s . "\n";
-            }
-            fclose($pipes[2]);
-        }
-        if (( !empty($error) || stristr($text, "invalid password")!==false ) && file_exists($raw."/".basename($originalXML))) {
-            unlink($raw."/".basename($originalXML));
-            throw new Exception("Error while creating encfs volume");
-        } else {
-            return true;
-        }
-    }
-
-
-    public static function mountFolder($raw, $clear, $secret, $uid)
-    {
-        $descriptorspec = array(
-            0 => array("pipe", "r"),  // stdin
-            1 => array("pipe", "w"),  // stdout
-            2 => array("pipe", "w")   // stderr ?? instead of a file
-        );
-        $command = 'sudo encfs -o allow_other,uid='.$uid.' -S '.escapeshellarg($raw).' '.escapeshellarg($clear);
-        $process = proc_open($command, $descriptorspec, $pipes);
-        $text = ""; $error = "";
-        if (is_resource($process)) {
-            fwrite($pipes[0], $secret);
-            fclose($pipes[0]);
-            while ($s= fgets($pipes[1], 1024)) {
-                $text .= $s;
-            }
-            fclose($pipes[1]);
-            while ($s= fgets($pipes[2], 1024)) {
-                $error .= $s . "\n";
-            }
-            fclose($pipes[2]);
-        }
-        if (!empty($error)) {
-            throw new Exception("Error mounting volume : ".$error);
-        }
-        if (stristr($text, "error")) {
-            throw new Exception("Error mounting volume : ".$text);
-        }
-        // Mount should have succeeded now
-        if (!is_file($clear."/.ajxp_mount")) {
-            file_put_contents($clear."/.ajxp_mount", "ajxp encfs mount");
-        }
-    }
-
-    public static function umountFolder($clear)
-    {
-        $descriptorspec = array(
-            1 => array("pipe", "w"),  // stdout
-            2 => array("pipe", "w")   // stderr ?? instead of a file
-        );
-        $command = 'sudo umount '.escapeshellarg($clear);
-        $process = proc_open($command, $descriptorspec, $pipes);
-        $text = ""; $error = "";
-        if (is_resource($process)) {
-            while ($s= fgets($pipes[1], 1024)) {
-                $text .= $s;
-            }
-            fclose($pipes[1]);
-            while ($s= fgets($pipes[2], 1024)) {
-                $error .= $s . "\n";
-            }
-            fclose($pipes[2]);
-        }
-        if(!empty($error)) throw new Exception($error);
-    }
-}
diff --git a/core/src/plugins/cypher.encfs/manifest.xml b/core/src/plugins/cypher.encfs/manifest.xml
index 7c40476163..36f782509a 100644
--- a/core/src/plugins/cypher.encfs/manifest.xml
+++ b/core/src/plugins/cypher.encfs/manifest.xml
@@ -22,7 +22,7 @@
                       label="CONF_MESSAGE[UID]" name="ENCFS_UID"
                       type="integer" mandatory="true" default="33"/>
     </server_settings>
-    <class_definition classname="EncfsMounter" filename="plugins/cypher.encfs/class.EncfsMounter.php"/>
+    <class_definition classname="Pydio\Action\Cypher\EncfsMounter" filename="plugins/cypher.encfs/EncfsMounter.php"/>
     <registry_contributions>
         <actions>
             <action name="encfs.cypher_folder_create">
diff --git a/core/src/plugins/cypher.encfs/resources/i18n/conf/de.php b/core/src/plugins/cypher.encfs/resources/i18n/conf/de.php
index c37ef81ccd..3686ccfa46 100644
--- a/core/src/plugins/cypher.encfs/resources/i18n/conf/de.php
+++ b/core/src/plugins/cypher.encfs/resources/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Encfs Mount" => "Encfs-Mount",
diff --git a/core/src/plugins/cypher.encfs/resources/i18n/conf/en.php b/core/src/plugins/cypher.encfs/resources/i18n/conf/en.php
index feec64b888..3a230eeeb2 100644
--- a/core/src/plugins/cypher.encfs/resources/i18n/conf/en.php
+++ b/core/src/plugins/cypher.encfs/resources/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Encfs Mount" => "Encfs Mount",
diff --git a/core/src/plugins/cypher.encfs/resources/i18n/de.php b/core/src/plugins/cypher.encfs/resources/i18n/de.php
index 148511a152..85ce06565e 100644
--- a/core/src/plugins/cypher.encfs/resources/i18n/de.php
+++ b/core/src/plugins/cypher.encfs/resources/i18n/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Chiffre Ordner",
diff --git a/core/src/plugins/cypher.encfs/resources/i18n/en.php b/core/src/plugins/cypher.encfs/resources/i18n/en.php
index 434732da4f..0965c9dcc3 100644
--- a/core/src/plugins/cypher.encfs/resources/i18n/en.php
+++ b/core/src/plugins/cypher.encfs/resources/i18n/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Cypher Folder",
diff --git a/core/src/plugins/cypher.encfs/resources/i18n/fr.php b/core/src/plugins/cypher.encfs/resources/i18n/fr.php
index 3fc8efe510..8512b2a90c 100644
--- a/core/src/plugins/cypher.encfs/resources/i18n/fr.php
+++ b/core/src/plugins/cypher.encfs/resources/i18n/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Chiffrer le répertoire",
diff --git a/core/src/plugins/cypher.encfs/resources/i18n/it.php b/core/src/plugins/cypher.encfs/resources/i18n/it.php
index a43270a635..36fb12c0e9 100644
--- a/core/src/plugins/cypher.encfs/resources/i18n/it.php
+++ b/core/src/plugins/cypher.encfs/resources/i18n/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Cartella Cifratore",
diff --git a/core/src/plugins/editor.ajxp_datagrid/class.AjxpDataGridEditor.js b/core/src/plugins/editor.ajxp_datagrid/class.AjxpDataGridEditor.js
index ac3708b4b0..7d4115ba1b 100644
--- a/core/src/plugins/editor.ajxp_datagrid/class.AjxpDataGridEditor.js
+++ b/core/src/plugins/editor.ajxp_datagrid/class.AjxpDataGridEditor.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 Class.create("AjxpDataGridEditor", AbstractEditor, {
 
diff --git a/core/src/plugins/editor.ajxp_graphs/class.GraphsViewer.js b/core/src/plugins/editor.ajxp_graphs/class.GraphsViewer.js
index c6a5d36bc0..788724e4e8 100644
--- a/core/src/plugins/editor.ajxp_graphs/class.GraphsViewer.js
+++ b/core/src/plugins/editor.ajxp_graphs/class.GraphsViewer.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 Class.create("GraphsViewer", AbstractEditor, {
 
diff --git a/core/src/plugins/editor.ajxp_plugin/class.PluginEditor.js b/core/src/plugins/editor.ajxp_plugin/class.PluginEditor.js
index 89194106fc..5bbdfecb03 100755
--- a/core/src/plugins/editor.ajxp_plugin/class.PluginEditor.js
+++ b/core/src/plugins/editor.ajxp_plugin/class.PluginEditor.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 Class.create("PluginEditor", AbstractEditor, {
 
diff --git a/core/src/plugins/editor.ajxp_plugin/i18n/conf/de.php b/core/src/plugins/editor.ajxp_plugin/i18n/conf/de.php
index 44797038a2..af786b34bf 100755
--- a/core/src/plugins/editor.ajxp_plugin/i18n/conf/de.php
+++ b/core/src/plugins/editor.ajxp_plugin/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Plugin Editor" => "Erweiterungs-Editor",
diff --git a/core/src/plugins/editor.ajxp_plugin/i18n/conf/en.php b/core/src/plugins/editor.ajxp_plugin/i18n/conf/en.php
index b89ac82da7..0e54e3107d 100755
--- a/core/src/plugins/editor.ajxp_plugin/i18n/conf/en.php
+++ b/core/src/plugins/editor.ajxp_plugin/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Plugin Editor" => "Plugin Editor",
diff --git a/core/src/plugins/editor.ajxp_plugin/i18n/conf/fr.php b/core/src/plugins/editor.ajxp_plugin/i18n/conf/fr.php
index 52f754954a..08c75a78e0 100755
--- a/core/src/plugins/editor.ajxp_plugin/i18n/conf/fr.php
+++ b/core/src/plugins/editor.ajxp_plugin/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Repository Editor" => "Editeur de dépôts",
diff --git a/core/src/plugins/editor.ajxp_plugin/i18n/conf/it.php b/core/src/plugins/editor.ajxp_plugin/i18n/conf/it.php
index f581c6e888..b8ab8e66cf 100755
--- a/core/src/plugins/editor.ajxp_plugin/i18n/conf/it.php
+++ b/core/src/plugins/editor.ajxp_plugin/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Repository Editor" => "Editor Repository",
diff --git a/core/src/plugins/editor.ajxp_plugin/i18n/conf/pt.php b/core/src/plugins/editor.ajxp_plugin/i18n/conf/pt.php
index a679826826..7ffcec4345 100644
--- a/core/src/plugins/editor.ajxp_plugin/i18n/conf/pt.php
+++ b/core/src/plugins/editor.ajxp_plugin/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Repository Editor" => "Editor de Repositórios",
diff --git a/core/src/plugins/editor.ajxp_plugin/i18n/de.php b/core/src/plugins/editor.ajxp_plugin/i18n/de.php
index f817e95627..2678e225c8 100755
--- a/core/src/plugins/editor.ajxp_plugin/i18n/de.php
+++ b/core/src/plugins/editor.ajxp_plugin/i18n/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Erweiterungs-Editor",
diff --git a/core/src/plugins/editor.ajxp_plugin/i18n/en.php b/core/src/plugins/editor.ajxp_plugin/i18n/en.php
index 765e770106..79ee77fa5e 100755
--- a/core/src/plugins/editor.ajxp_plugin/i18n/en.php
+++ b/core/src/plugins/editor.ajxp_plugin/i18n/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Plugin Editor",
diff --git a/core/src/plugins/editor.ajxp_plugin/i18n/fr.php b/core/src/plugins/editor.ajxp_plugin/i18n/fr.php
index babd1b3a0c..2d8fb1a60d 100755
--- a/core/src/plugins/editor.ajxp_plugin/i18n/fr.php
+++ b/core/src/plugins/editor.ajxp_plugin/i18n/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
     "1" => "Editeur de plugin",
diff --git a/core/src/plugins/editor.ajxp_plugin/i18n/it.php b/core/src/plugins/editor.ajxp_plugin/i18n/it.php
index a3fd396d8e..14fbaf43b3 100755
--- a/core/src/plugins/editor.ajxp_plugin/i18n/it.php
+++ b/core/src/plugins/editor.ajxp_plugin/i18n/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Plugin Editor",
diff --git a/core/src/plugins/editor.ajxp_plugin/i18n/pt.php b/core/src/plugins/editor.ajxp_plugin/i18n/pt.php
index fd6d053fcb..44c28aa54e 100644
--- a/core/src/plugins/editor.ajxp_plugin/i18n/pt.php
+++ b/core/src/plugins/editor.ajxp_plugin/i18n/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Editor de Plugins",
diff --git a/core/src/plugins/editor.ajxp_repository/class.RepositoryEditor.js b/core/src/plugins/editor.ajxp_repository/class.RepositoryEditor.js
index de9ad34dad..d700ee87b1 100644
--- a/core/src/plugins/editor.ajxp_repository/class.RepositoryEditor.js
+++ b/core/src/plugins/editor.ajxp_repository/class.RepositoryEditor.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 Class.create("RepositoryEditor", AbstractEditor, {
 
@@ -155,8 +155,6 @@ Class.create("RepositoryEditor", AbstractEditor, {
 
             this.sharesToolbar = new ActionsToolbar(actionPane, {
                 toolbarsList:["share_list_toolbar-selection", "share_list_toolbar"],
-                skipBubbling:true,
-                skipCarousel:true,
                 submenuOffsetTop:2,
                 dataModelElementId:listPaneId
             });
diff --git a/core/src/plugins/editor.ajxp_repository/i18n/conf/de.php b/core/src/plugins/editor.ajxp_repository/i18n/conf/de.php
index 915007517c..9882e10aba 100644
--- a/core/src/plugins/editor.ajxp_repository/i18n/conf/de.php
+++ b/core/src/plugins/editor.ajxp_repository/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Repository Editor" => "Arbeitsumgebungs-Editor",
diff --git a/core/src/plugins/editor.ajxp_repository/i18n/conf/en.php b/core/src/plugins/editor.ajxp_repository/i18n/conf/en.php
index da065438b1..23fc5a4777 100755
--- a/core/src/plugins/editor.ajxp_repository/i18n/conf/en.php
+++ b/core/src/plugins/editor.ajxp_repository/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Repository Editor" => "Repository Editor",
diff --git a/core/src/plugins/editor.ajxp_repository/i18n/conf/fr.php b/core/src/plugins/editor.ajxp_repository/i18n/conf/fr.php
index e8057af51e..ce6b81afb6 100755
--- a/core/src/plugins/editor.ajxp_repository/i18n/conf/fr.php
+++ b/core/src/plugins/editor.ajxp_repository/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
     "Repository Editor" => "Editeur de dépôts",
diff --git a/core/src/plugins/editor.ajxp_repository/i18n/conf/it.php b/core/src/plugins/editor.ajxp_repository/i18n/conf/it.php
index 8e613b4306..091a54a240 100755
--- a/core/src/plugins/editor.ajxp_repository/i18n/conf/it.php
+++ b/core/src/plugins/editor.ajxp_repository/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Repository Editor" => "Modifica Repository",
diff --git a/core/src/plugins/editor.ajxp_repository/i18n/conf/pt.php b/core/src/plugins/editor.ajxp_repository/i18n/conf/pt.php
index df730de307..d2a4427520 100644
--- a/core/src/plugins/editor.ajxp_repository/i18n/conf/pt.php
+++ b/core/src/plugins/editor.ajxp_repository/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Repository Editor" => "Editor de Repositórios",
diff --git a/core/src/plugins/editor.ajxp_repository/i18n/de.php b/core/src/plugins/editor.ajxp_repository/i18n/de.php
index 27a21be2b5..e51b027fc8 100755
--- a/core/src/plugins/editor.ajxp_repository/i18n/de.php
+++ b/core/src/plugins/editor.ajxp_repository/i18n/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Arbeitsumgebungs-Editor",
diff --git a/core/src/plugins/editor.ajxp_repository/i18n/en.php b/core/src/plugins/editor.ajxp_repository/i18n/en.php
index c5049beafc..9cb86b2f93 100755
--- a/core/src/plugins/editor.ajxp_repository/i18n/en.php
+++ b/core/src/plugins/editor.ajxp_repository/i18n/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Workspace Editor",
diff --git a/core/src/plugins/editor.ajxp_repository/i18n/fr.php b/core/src/plugins/editor.ajxp_repository/i18n/fr.php
index fb311b97a1..835a74ee2c 100755
--- a/core/src/plugins/editor.ajxp_repository/i18n/fr.php
+++ b/core/src/plugins/editor.ajxp_repository/i18n/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
     "1" => "Editeur de dépôts",
diff --git a/core/src/plugins/editor.ajxp_repository/i18n/it.php b/core/src/plugins/editor.ajxp_repository/i18n/it.php
index b605c70f34..ff41fa4381 100755
--- a/core/src/plugins/editor.ajxp_repository/i18n/it.php
+++ b/core/src/plugins/editor.ajxp_repository/i18n/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Modifica Workspace",
diff --git a/core/src/plugins/editor.ajxp_repository/i18n/pt.php b/core/src/plugins/editor.ajxp_repository/i18n/pt.php
index e732fcf47b..a41571d02f 100644
--- a/core/src/plugins/editor.ajxp_repository/i18n/pt.php
+++ b/core/src/plugins/editor.ajxp_repository/i18n/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Editor de Repositórios",
diff --git a/core/src/plugins/editor.ajxp_repository/i18n/ru.php b/core/src/plugins/editor.ajxp_repository/i18n/ru.php
index d99e29a16e..745b655c5e 100644
--- a/core/src/plugins/editor.ajxp_repository/i18n/ru.php
+++ b/core/src/plugins/editor.ajxp_repository/i18n/ru.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "редактор рабочих пространств",
diff --git a/core/src/plugins/editor.ajxp_role/class.RoleEditor.js b/core/src/plugins/editor.ajxp_role/class.RoleEditor.js
index 2342753ab9..72abcd0d81 100755
--- a/core/src/plugins/editor.ajxp_role/class.RoleEditor.js
+++ b/core/src/plugins/editor.ajxp_role/class.RoleEditor.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 Class.create("RoleEditor", AbstractEditor, {
 
@@ -364,8 +364,11 @@ Class.create("RoleEditor", AbstractEditor, {
                 });
                 modal.currentLightBoxModal.setStyle({display:'block'});
             }.bind(this));
-            var locked = this.roleData.USER.LOCK ? true : false;
-            var b1 = new Element("span", {className:'m-2'}).update((locked?MessageHash["ajxp_role_editor.27"]:MessageHash["ajxp_role_editor.26"]));
+            var locked = this.roleData.USER.LOCK || "";
+            var uLockedOut = locked.indexOf('logout') > 1;
+            var uLockedPass = locked.indexOf('pass_change') > 1;
+
+            var b1 = new Element("span", {className:'m-2'}).update((uLockedOut ?MessageHash["ajxp_role_editor.27"]:MessageHash["ajxp_role_editor.26"]));
             buttonPane.insert(b1);
             var userId = this.roleId.replace("AJXP_USR_/", "");
             b1.observe("click", function(){
@@ -374,16 +377,16 @@ Class.create("RoleEditor", AbstractEditor, {
                     get_action:"edit",
                     sub_action:"user_set_lock",
                     user_id : userId,
-                    lock : (locked?"false":"true")
+                    lock_type:"logout",
+                    lock : (uLockedOut?"false":"true")
                 });
-                if(!locked) conn.addParameter("lock_type", "logout");
                 conn.onComplete = function(transport){
-                    locked = !locked;
-                    b1.update((locked?MessageHash["ajxp_role_editor.27"]:MessageHash["ajxp_role_editor.26"]));
+                    uLockedOut = !uLockedOut;
+                    b1.update((uLockedOut?MessageHash["ajxp_role_editor.27"]:MessageHash["ajxp_role_editor.26"]));
                 }.bind(this);
                 conn.sendAsync();
             }.bind(this) );
-            var b2 = new Element("span", {className:'m-2'}).update(MessageHash["ajxp_role_editor.28"]);
+            var b2 = new Element("span", {className:'m-2'}).update(uLockedPass ? MessageHash["ajxp_role_editor.28b"]: MessageHash["ajxp_role_editor.28"]);
             buttonPane.insert(b2);
             var userId = this.roleId.replace("AJXP_USR_/", "");
             b2.observe("click", function(){
@@ -392,9 +395,13 @@ Class.create("RoleEditor", AbstractEditor, {
                     get_action:"edit",
                     sub_action:"user_set_lock",
                     user_id : userId,
-                    lock : "true",
+                    lock : uLockedPass ? "false" : "true",
                     lock_type : "pass_change"
                 });
+                conn.onComplete = function(transport){
+                    uLockedPass = !uLockedPass;
+                    b2.update((uLockedPass?MessageHash["ajxp_role_editor.28b"]:MessageHash["ajxp_role_editor.28"]));
+                }.bind(this);
                 conn.sendAsync();
             });
 
diff --git a/core/src/plugins/editor.ajxp_role/i18n/conf/de.php b/core/src/plugins/editor.ajxp_role/i18n/conf/de.php
index 2fe4f2d0f7..83e9f7f397 100644
--- a/core/src/plugins/editor.ajxp_role/i18n/conf/de.php
+++ b/core/src/plugins/editor.ajxp_role/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 /*******************************************************************************
diff --git a/core/src/plugins/editor.ajxp_role/i18n/conf/en.php b/core/src/plugins/editor.ajxp_role/i18n/conf/en.php
index b425b5fd09..beb8d494dd 100755
--- a/core/src/plugins/editor.ajxp_role/i18n/conf/en.php
+++ b/core/src/plugins/editor.ajxp_role/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Role Editor" => "Role Editor",
diff --git a/core/src/plugins/editor.ajxp_role/i18n/conf/fr.php b/core/src/plugins/editor.ajxp_role/i18n/conf/fr.php
index b073811bf6..71844ca508 100755
--- a/core/src/plugins/editor.ajxp_role/i18n/conf/fr.php
+++ b/core/src/plugins/editor.ajxp_role/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Text Editor" => "Editeur texte",
diff --git a/core/src/plugins/editor.ajxp_role/i18n/conf/it.php b/core/src/plugins/editor.ajxp_role/i18n/conf/it.php
index d7dcede158..21ec061f9c 100755
--- a/core/src/plugins/editor.ajxp_role/i18n/conf/it.php
+++ b/core/src/plugins/editor.ajxp_role/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Text Editor" => "Editor Testi",
diff --git a/core/src/plugins/editor.ajxp_role/i18n/conf/pt.php b/core/src/plugins/editor.ajxp_role/i18n/conf/pt.php
index 10aacc81ae..3ceec6fa12 100644
--- a/core/src/plugins/editor.ajxp_role/i18n/conf/pt.php
+++ b/core/src/plugins/editor.ajxp_role/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Text Editor" => "Editor de Texto",
diff --git a/core/src/plugins/editor.ajxp_role/i18n/conf/ru.php b/core/src/plugins/editor.ajxp_role/i18n/conf/ru.php
index 6f456c46b4..7e35110c06 100644
--- a/core/src/plugins/editor.ajxp_role/i18n/conf/ru.php
+++ b/core/src/plugins/editor.ajxp_role/i18n/conf/ru.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Text Editor" => "Текстовый редактор",
diff --git a/core/src/plugins/editor.ajxp_role/i18n/de.php b/core/src/plugins/editor.ajxp_role/i18n/de.php
index b7ca64d015..a3e9a79838 100755
--- a/core/src/plugins/editor.ajxp_role/i18n/de.php
+++ b/core/src/plugins/editor.ajxp_role/i18n/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 /*******************************************************************************
@@ -58,6 +58,7 @@
 "26" => "Benutzer sperren",
 "27" => "Benutzer aktivieren",
 "28" => "Passwort&auml;nderung erzwingen",
+"28b"=> "Cancel password change",
 "29" => "Geben Sie ein neues Passwort f&uuml;r den Benutzer ein",
 "30" => "Wiederholen",
 "31" => "Rollen-ID",
diff --git a/core/src/plugins/editor.ajxp_role/i18n/en.php b/core/src/plugins/editor.ajxp_role/i18n/en.php
index 0718c1cb91..cae64275a0 100755
--- a/core/src/plugins/editor.ajxp_role/i18n/en.php
+++ b/core/src/plugins/editor.ajxp_role/i18n/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Role Editor",
@@ -52,6 +52,7 @@
 "26" => "Lock out user",
 "27" => "Reactivate user",
 "28" => "Force password change",
+"28b"=> "Cancel password change",
 "29" => "Enter new password for this user",
 "30" => "Confirm",
 "31" => "Role ID",
diff --git a/core/src/plugins/editor.ajxp_role/i18n/fr.php b/core/src/plugins/editor.ajxp_role/i18n/fr.php
index 383afafbb8..2afa5f4749 100755
--- a/core/src/plugins/editor.ajxp_role/i18n/fr.php
+++ b/core/src/plugins/editor.ajxp_role/i18n/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Editeur de rôle",
@@ -52,6 +52,7 @@
 "26" => "Exclure l'utilisateur",
 "27" => "Réactiver l'utilisateur",
 "28" => "Forcer une mise à jour du mot de passe",
+"28b"=> "Annuler la mise à jour forcée du mot de passe",
 "29" => "Entrez le nouveau mot de passe pour cet utilisateur",
 "30" => "Confirmez",
 "31" => "ID rôle",
@@ -70,4 +71,4 @@
 "44" => "Paramètres avançés de plugins",
 "45" => "Contrôle d'accès",
 "46" => "Actions désactivées",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/editor.ajxp_role/i18n/it.php b/core/src/plugins/editor.ajxp_role/i18n/it.php
index 40acc54708..6c9105c241 100755
--- a/core/src/plugins/editor.ajxp_role/i18n/it.php
+++ b/core/src/plugins/editor.ajxp_role/i18n/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Modifica Ruoli",
@@ -52,6 +52,7 @@
 "26" => "Blocca Utente",
 "27" => "Riattiva Utente",
 "28" => "Forza cambio",
+"28b"=> "Cancel password change",
 "29" => "Inserisci la nuova password per questo utente",
 "30" => "Conferma",
 "31" => "ID Ruolo",
@@ -70,4 +71,4 @@
 "44" => "Plugins Parameters Fine-tuning",
 "45" => "Access Control List",
 "46" => "Disabled Actions",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/editor.ajxp_role/i18n/pt.php b/core/src/plugins/editor.ajxp_role/i18n/pt.php
index 1e0077085a..151e9a54e5 100644
--- a/core/src/plugins/editor.ajxp_role/i18n/pt.php
+++ b/core/src/plugins/editor.ajxp_role/i18n/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Editor de Papel",
@@ -52,6 +52,7 @@
 "26" => "Bloquear Utilizador",
 "27" => "Reactivar utilizador",
 "28" => "Forçar Mudança de Palavra-Chave",
+"28b"=> "Cancel password change",
 "29" => "Introduza uma nova Palavra-Chave para este utilizador",
 "30" => "Confirmar",
 "31" => "ID de Papel",
@@ -70,4 +71,4 @@
 "44" => "Plugins Parameters Fine-tuning",
 "45" => "Access Control List",
 "46" => "Disabled Actions",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/editor.ajxp_role/i18n/ru.php b/core/src/plugins/editor.ajxp_role/i18n/ru.php
index 8e220e26bf..b30106e309 100644
--- a/core/src/plugins/editor.ajxp_role/i18n/ru.php
+++ b/core/src/plugins/editor.ajxp_role/i18n/ru.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Редатор ролей",
@@ -52,6 +52,7 @@
 "26" => "Блокировка пользователя",
 "27" => "Переактивировать пользователя",
 "28" => "Принудительная смена пароля",
+"28b"=> "Cancel password change",
 "29" => "Введите новый пароль для этого пользователя",
 "30" => "Подтверждение",
 "31" => "ID роли",
@@ -70,4 +71,4 @@
 "44" => "Plugins Parameters Fine-tuning",
 "45" => "Access Control List",
 "46" => "Disabled Actions",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/editor.ajxp_role/rolesEditor.css b/core/src/plugins/editor.ajxp_role/rolesEditor.css
index b937777a03..97764e39c7 100644
--- a/core/src/plugins/editor.ajxp_role/rolesEditor.css
+++ b/core/src/plugins/editor.ajxp_role/rolesEditor.css
@@ -1,493 +1,381 @@
-div#meta_source_button_add{
-    margin-top: 20px;
-}
-div.tabbed_editor{
-    background-color: #194172;
-    font-size: 13px;
-    border-left: 1px solid #bbbbbb;
-    border-right: 1px solid #bbbbbb;
-    line-height: initial;
-}
-.ajxp_theme_orbit div.tabbed_editor{
-    background-color: #f8f8f8;
-    border: 0;
-}
-
-div.tabbed_editor div.accordion_content{
-    padding-bottom: 20px;
-}
-
-div.tabbed_editor input[type="text"],
-div.tabbed_editor input[type="password"]
-{
-    font-size: 13px;
-    line-height: 21px;
-    padding: 0 0 0 5px !important;
-    width: 52% !important;
-    height: 30px;
-    border: 1px solid #C8CCD3;
-    box-sizing: border-box;
-}
-
-div.tabbed_editor input:focus,
-div.tabbed_editor textarea:focus,
-div.tabbed_editor select:focus
-{
-    border: 1px solid #4dc5c3;
-}
-
-div.tabbed_editor select, div.tabbed_editor textarea{
-    border: 1px solid #C8CCD3;
-    font-size: 13px;
-}
-
-div.tabbed_editor select{
-    height: 30px;
-    border: 1px solid #C8CCD3;
-}
-
-div.tabbed_editor select[multiple='true']{
-    height: auto;
-}
-
-div.tabbed_editor textarea{
-    font-size: 13px;
-    margin: 3px;
-}
-
-div.tabbed_editor div.SF_input{
-    padding-top: 5px !important;
-}
-
-div.tabbed_editor div.SF_image_block{
-    max-width: 80px !important;
-    float: left;
-    margin-left: 11px;
-    border: 1px solid #C8CCD3;
-    border-radius: 2px;
-    padding: 2px 2px;
-    font-size: 11px;
-    text-align: center;
-}
-
-div.tabbed_editor div.SF_label{
-    padding-right: 0;
-    font-size: 14px !important;
-    line-height: 22px;
-    color: rgb(111, 123, 136);
-}
-
-div.tabbed_editor label{
-    color: rgb(111, 123, 136);
-}
-
-div.tabbed_editor div.SF_element{
-    padding-top: 15px;
-}
-div#actions-selector div.SF_element,
-div#parameters-selector div.SF_element{
-    padding-top: 5px;
-}
-
-div#actions-selector,
-div#parameters-selector{
-    margin-bottom: 20px;
-}
-
-div.tabbed_editor div.SF_input.SF_inlineButton{
-    margin-left: 10px !important;
-    width: 56% !important;
-    padding: 7px 3px !important;
-    box-sizing: border-box;
-    box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.26);
-}
-
-.ajxp_theme_vision div.tabbed_editor{
-    background-color: #ffffff;
-    padding: 0;
-    border-radius: 4px;
-    border:0;
-}
-
-
-div.tabbed_editor div.editor_header{
-    display: none;
-    height: 0;
-}
-
-.ajxp_theme_vision div.tabbed_editor div.editor_header{
-    color: #666666;
-}
-
-
-div.editor_header a{
-    padding: 3px 10px 5px;
-    background-color: rgba(255, 255, 255, 0.93);
-    box-shadow: 1px 1px 8px black;
-    margin-right: 7px;
-}
-
-.ajxp_theme_vision div.editor_header a{
-    padding: 3px 10px 5px;
-    background-color: #4dc5c3;
-    box-shadow: none;
-    margin-right: 7px;
-    color: white !important;
-}
-
-
-div.editor_header a:hover{
-    border:none;
-    margin: 5px 7px 0px 1px;
-}
-
-div.editor_header a.disabled:hover{
-    background-color: rgba(255, 255, 255, 0.93);
-}
-
-.ajxp_theme_vision div.editor_header a.disabled:hover{
-        background-color: #4dc5c3;
-}
-
-div.editor_header img.actionbar_button_icon {
-    float: left;
-    width: 18px;
-    height: 18px;
-}
-
-div.editor_header span.actionbar_button_label {
-    font-size: 12px;
-    color: black;
-    text-shadow: none;
-    padding-top: 5px;
-    text-align: left;
-    padding-left: 23px;
-}
-
-.ajxp_theme_vision div.editor_header span.actionbar_button_label {
-    color: white;
-    padding-left: 5px;
-}
-
-.ajxp_theme_vision div.editor_header > div.editor_action_bar{
-    border-bottom:0;
-}
-
-div.tabbed_editor span.inherited,
-div.tabbed_editor div.inherited
-{
-    color: #AAAAAA;
-}
-
-div#actions-selector,
-div#parameters-selector,
-div#pane-acls > div.dialogLegend
-{
-    padding: 10px;
-}
-
-div#pane-infos > div{
-    clear: both;
-}
-
-div#pane-docs{
-    padding:0 !important;
-}
-
-div.tabbed_editor div.innerTitle{
-    font-size: 13px;
-    margin: 3px 9px 10px;
-    border-bottom: 1px solid rgba(111, 123, 136, 1);
-    margin-bottom: 10px;
-    text-align: left;
-    padding: 8px 10px 10px;
-    color: rgba(76, 85, 95, 1);
-    letter-spacing: 0px;
-    font-size: 15px;
-}
-
-span#user_roles_update_button {
-    padding: 2px 6px;
-    border: 1px solid #C50707;
-    color: #C50707;
-    margin: 0 6px;
-    border-radius: 4px;
-    display: inline-block;
-    cursor: pointer;
-}
-
-div#account_actions{
-    background: none;
-    text-align: right;
-    padding: 12px 5% 18px;
-}
-
-div#actions-selected,
-div#acls-selected
-{
-    margin: 20px;
-    overflow-y: auto;
-    padding: 2px;
-    font-size: 12px;
-}
-
-div#parameters-selected{
-    font-size: 12px;
-
-}
-
-div#actions-selected > div{
-    padding: 13px 12px;
-}
-
-
-div#actions-selected > span.list_remove_item{
-    margin-top: -8px;
-}
-
-div#acls-selected div.repositoryEntry{
-    clear:both;
-    height: 17px;
-    padding: 11px 8px 11px;
-}
-
-div#acls-selected div.repositoryLabel{
-    float:left;
-}
-
-div#acls-selected div.repositoryRights{
-    float:right;
-}
-
-div#actions-selected > div:nth-child(even),
-div#acls-selected > div:nth-child(even),
-table.repository > tbody > tr:nth-child(even)
-{
-    background: #F7F7F7;
-}
-
-div#acls-selected input[type="checkbox"]{
-    width: 20px;
-    margin-right: 0;
-}
-
-div#acls-selected label{
-    cursor: pointer;
-    margin-right: 5px;
-    text-align: left;
-    min-width: 28px;
-}
-
-#actions-selector div.SF_element,
-#parameters-selector div.SF_element
-{
-    width: 64%;
-}
-
-div.add_button,
-span.list_remove_item
-{
-    display: inline-block;
-    cursor: pointer;
-    background-color: #4dc5c3;
-    color: white;
-    text-decoration: none;
-    border-radius: 4px;
-}
-div.add_button{
-    padding: 5px;
-    position: absolute;
-    right: 16%;
-}
-span.list_remove_item{
-    cursor: pointer;
-    top: 16px;
-    right: 0;
-    padding: 6px 8px;
-    margin-right: 5px;
-}
-
-
-div.add_button.disabled{
-    opacity: 0.5;
-}
-
-div.role_edit-params-form{
-    padding: 10px;
-    border: 1px solid #ebedf0;
-    border-radius: 4px;
-}
-
-div#parameters-selected{
-    overflow-y: hidden;
-}
-
-div#parameters-selected.non_empty{
-    border: 0;
-}
-
-div#parameters-selected div.SF_element{
-    position: relative;
-}
-div#parameters-selected .SF_input{
-    width: 45% !important;
-}
-div#parameters-selected span.list_remove_item{
-    position: absolute;
-    top: 16px;
-    right: 0;
-}
-
-span.m-2 {
-    display: inline-block;
-    font-size: 11px;
-    padding: 5px 12px 7px 12px;
-    text-align: center;
-    overflow: visible;
-    color: #fff;
-    outline: none;
-    border-radius: 14px;
-    margin: 5px 6px 0 5px;
-    background: #4dc5c3;
-    letter-spacing: 1px;
-    cursor: pointer;
-}
-
-.pluginfo_list {
-    padding: 0 !important;
-    margin: 10px 20px;
-}
-
-.pluginfo_list li:nth-child(2n+1) {
-    background-color: #F7F7F7;
-}
-
-.pluginfo_list li {
-    list-style: none;
-    padding: 10px 7px;
-    overflow: hidden;
-}
-
-.pluginfo_key {
-    display: inline-block;
-    width: 90px;
-}
-
-div.documentation{
-    padding: 0 20px !important;
-}
-
-.shares-list{
-    margin: 10px 15px 15px;
-}
-
-.shares-list div.header_cell:first-child{
-    border-radius: 4px 0 0 0;
-}
-.shares-list div.header_cell:last-child{
-    border-radius: 0 4px 0 0;
-}
-.shares-list div.header_label{
-    padding: 7px 6px 4px;
-}
-.shares-list div.header_resizer{
-    max-height: 30px;
-}
-.shares-list div.paginator{
-    height: 23px;
-    padding-top: 6px;
-}
-
-#shares-toolbar a {
-    display: inline-block;
-    margin-left: 15px;
-}
-
-#shares-toolbar a span.ajxp_icon_span{
-    display: inline-block;
-    margin-right: 5px;
-}
-
-#shares-toolbar{
-    padding: 18px 0 0 24px;
-    position: absolute;
-    right: 0;
-}
-
-.innerContainer{
-    background-color: #FFFFFF;
-    border-radius: 3px;
-    border: 1px solid #F1F1F1;
-    box-shadow: 0px 1px 1px rgba(0,0,0,0.25);
-}
-
-.ajxp_theme_orbit .innerContainer{
-    border: 0;
-    box-shadow: none;
-}
-
-.ajxp_theme_orbit #metaTabulator .innerContainer{
-    background-color: transparent;
-    margin: 0 !important;
-    padding: 10px !important;
-    padding-bottom: 20px !important;
-
-}
-
-.innerTabRow{
-    border-radius: 3px;
-    margin: 0 10px;
-    box-shadow: 0px 1px 1px rgba(0,0,0,0.15);
-}
-
-.ajxp_theme_orbit .innerTabRow{
-    border-radius: 0;
-    margin: 0;
-    box-shadow: none;
-}
-
-/* ORBIT THEME */
-
-.ajxp_theme_orbit div.tabbed_editor input[type="text"],
-.ajxp_theme_orbit div.tabbed_editor input[type="password"]{
-    width: inherit !important;
-}
-
-.ajxp_theme_orbit div.tabbed_editor div.chosen-search input[type="text"]{
-    width: 100% !important;
-    padding: 4px 20px 4px 5px !important;
-    border-radius: 2px;
-}
-
-.ajxp_theme_orbit div#parameters-selected span.list_remove_item {
-    top: 42px;
-    left: 400px;
-    right: inherit;
-}
-
-.ajxp_theme_orbit div#account_actions {
-    text-align: left;
-    padding: 12px 40px 18px;
-}
-
-.ajxp_theme_orbit div.meta_plugin_new_form{
-    background-color: white;
-    margin: 8px 0 0 2%;
-    border-radius: 5px;
-    padding: 0 1% 10px;
-    border: 1px solid #C8CCD3;
-    max-width: 447px;
-    width: 93%;
-}
-
-.ajxp_theme_orbit div.meta_plugin_new_form.empty{
-    display: none;
-}
-
-.ajxp_theme_orbit div.meta_source_new_empty_params {
-    margin: 11px 11px 0;
-    font-style: italic;
-}
-.ajxp_theme_orbit div#parameters-selected{
-    border-radius: 0 !important;
-}
\ No newline at end of file
+#editor_tabs {
+  /* ORBIT THEME */
+}
+#editor_tabs div#meta_source_button_add {
+  margin-top: 20px;
+}
+#editor_tabs div.tabbed_editor {
+  background-color: #194172;
+  font-size: 13px;
+  border-left: 1px solid #bbbbbb;
+  border-right: 1px solid #bbbbbb;
+  line-height: initial;
+}
+#editor_tabs div.tabbed_editor {
+  background-color: #f8f8f8;
+  border: 0;
+}
+#editor_tabs div.tabbed_editor div.accordion_content {
+  padding-bottom: 20px;
+}
+#editor_tabs div.tabbed_editor input[type="text"],
+#editor_tabs div.tabbed_editor input[type="password"] {
+  font-size: 13px;
+  line-height: 21px;
+  padding: 0 0 0 5px !important;
+  width: 52% !important;
+  height: 30px;
+  border: 1px solid #C8CCD3;
+  box-sizing: border-box;
+}
+#editor_tabs div.tabbed_editor input:focus,
+#editor_tabs div.tabbed_editor textarea:focus,
+#editor_tabs div.tabbed_editor select:focus {
+  border: 1px solid #4dc5c3;
+}
+#editor_tabs div.tabbed_editor select,
+#editor_tabs div.tabbed_editor textarea {
+  border: 1px solid #C8CCD3;
+  font-size: 13px;
+}
+#editor_tabs div.tabbed_editor select {
+  height: 30px;
+  border: 1px solid #C8CCD3;
+}
+#editor_tabs div.tabbed_editor select[multiple='true'] {
+  height: auto;
+}
+#editor_tabs div.tabbed_editor textarea {
+  font-size: 13px;
+  margin: 3px;
+}
+#editor_tabs div.tabbed_editor div.SF_input {
+  padding-top: 5px !important;
+}
+#editor_tabs div.tabbed_editor div.SF_image_block {
+  max-width: 80px !important;
+  float: left;
+  margin-left: 11px;
+  border: 1px solid #C8CCD3;
+  border-radius: 2px;
+  padding: 2px 2px;
+  font-size: 11px;
+  text-align: center;
+}
+#editor_tabs div.tabbed_editor div.SF_label {
+  padding-right: 0;
+  font-size: 14px !important;
+  line-height: 22px;
+  color: #6f7b88;
+}
+#editor_tabs div.tabbed_editor label {
+  color: #6f7b88;
+}
+#editor_tabs div.tabbed_editor div.SF_element {
+  padding-top: 15px;
+}
+#editor_tabs div#actions-selector div.SF_element,
+#editor_tabs div#parameters-selector div.SF_element {
+  padding-top: 5px;
+}
+#editor_tabs div#actions-selector,
+#editor_tabs div#parameters-selector {
+  margin-bottom: 20px;
+}
+#editor_tabs div.tabbed_editor div.SF_input.SF_inlineButton {
+  margin-left: 10px !important;
+  width: 56% !important;
+  padding: 7px 3px !important;
+  box-sizing: border-box;
+  box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.26);
+}
+#editor_tabs div.tabbed_editor div.editor_header {
+  display: none;
+  height: 0;
+}
+#editor_tabs div.editor_header a {
+  padding: 3px 10px 5px;
+  background-color: rgba(255, 255, 255, 0.93);
+  box-shadow: 1px 1px 8px black;
+  margin-right: 7px;
+}
+#editor_tabs div.editor_header a:hover {
+  border: none;
+  margin: 5px 7px 0px 1px;
+}
+#editor_tabs div.editor_header a.disabled:hover {
+  background-color: rgba(255, 255, 255, 0.93);
+}
+#editor_tabs div.editor_header img.actionbar_button_icon {
+  float: left;
+  width: 18px;
+  height: 18px;
+}
+#editor_tabs div.editor_header span.actionbar_button_label {
+  font-size: 12px;
+  color: black;
+  text-shadow: none;
+  padding-top: 5px;
+  text-align: left;
+  padding-left: 23px;
+}
+#editor_tabs div.tabbed_editor span.inherited,
+#editor_tabs div.tabbed_editor div.inherited {
+  color: #AAAAAA;
+}
+#editor_tabs div#actions-selector,
+#editor_tabs div#parameters-selector,
+#editor_tabs div#pane-acls > div.dialogLegend {
+  padding: 10px;
+}
+#editor_tabs div#pane-infos > div {
+  clear: both;
+}
+#editor_tabs div#pane-docs {
+  padding: 0 !important;
+}
+#editor_tabs div.tabbed_editor div.innerTitle {
+  font-size: 13px;
+  margin: 3px 9px 10px;
+  border-bottom: 1px solid #6f7b88;
+  margin-bottom: 10px;
+  text-align: left;
+  padding: 8px 10px 10px;
+  color: #4c555f;
+  letter-spacing: 0px;
+  font-size: 15px;
+}
+#editor_tabs span#user_roles_update_button {
+  padding: 2px 6px;
+  border: 1px solid #C50707;
+  color: #C50707;
+  margin: 0 6px;
+  border-radius: 4px;
+  display: inline-block;
+  cursor: pointer;
+}
+#editor_tabs div#account_actions {
+  background: none;
+  text-align: right;
+  padding: 12px 5% 18px;
+}
+#editor_tabs div#actions-selected,
+#editor_tabs div#acls-selected {
+  margin: 20px;
+  overflow-y: auto;
+  padding: 2px;
+  font-size: 12px;
+}
+#editor_tabs div#parameters-selected {
+  font-size: 12px;
+}
+#editor_tabs div#actions-selected > div {
+  padding: 13px 12px;
+}
+#editor_tabs div#actions-selected > span.list_remove_item {
+  margin-top: -8px;
+}
+#editor_tabs div#acls-selected div.repositoryEntry {
+  clear: both;
+  height: 17px;
+  padding: 11px 8px 11px;
+}
+#editor_tabs div#acls-selected div.repositoryLabel {
+  float: left;
+}
+#editor_tabs div#acls-selected div.repositoryRights {
+  float: right;
+}
+#editor_tabs div#actions-selected > div:nth-child(even),
+#editor_tabs div#acls-selected > div:nth-child(even),
+#editor_tabs table.repository > tbody > tr:nth-child(even) {
+  background: #F7F7F7;
+}
+#editor_tabs div#acls-selected input[type="checkbox"] {
+  width: 20px;
+  margin-right: 0;
+}
+#editor_tabs div#acls-selected label {
+  cursor: pointer;
+  margin-right: 5px;
+  text-align: left;
+  min-width: 28px;
+}
+#editor_tabs #actions-selector div.SF_element,
+#editor_tabs #parameters-selector div.SF_element {
+  width: 64%;
+}
+#editor_tabs div.add_button,
+#editor_tabs span.list_remove_item {
+  display: inline-block;
+  cursor: pointer;
+  background-color: #4dc5c3;
+  color: white;
+  text-decoration: none;
+  border-radius: 4px;
+}
+#editor_tabs div.add_button {
+  padding: 5px;
+  position: absolute;
+  right: 16%;
+}
+#editor_tabs span.list_remove_item {
+  cursor: pointer;
+  top: 16px;
+  right: 0;
+  padding: 6px 8px;
+  margin-right: 5px;
+}
+#editor_tabs div.add_button.disabled {
+  opacity: 0.5;
+}
+#editor_tabs div.role_edit-params-form {
+  padding: 10px;
+  border: 1px solid #ebedf0;
+  border-radius: 4px;
+}
+#editor_tabs div#parameters-selected {
+  overflow-y: hidden;
+}
+#editor_tabs div#parameters-selected.non_empty {
+  border: 0;
+}
+#editor_tabs div#parameters-selected div.SF_element {
+  position: relative;
+}
+#editor_tabs div#parameters-selected .SF_input {
+  width: 45% !important;
+}
+#editor_tabs div#parameters-selected span.list_remove_item {
+  position: absolute;
+  top: 16px;
+  right: 0;
+}
+#editor_tabs span.m-2 {
+  display: inline-block;
+  font-size: 11px;
+  padding: 5px 12px 7px 12px;
+  text-align: center;
+  overflow: visible;
+  color: #fff;
+  outline: none;
+  border-radius: 14px;
+  margin: 5px 6px 0 5px;
+  background: #4dc5c3;
+  letter-spacing: 1px;
+  cursor: pointer;
+}
+#editor_tabs .pluginfo_list {
+  padding: 0 !important;
+  margin: 10px 20px;
+}
+#editor_tabs .pluginfo_list li:nth-child(2n+1) {
+  background-color: #F7F7F7;
+}
+#editor_tabs .pluginfo_list li {
+  list-style: none;
+  padding: 10px 7px;
+  overflow: hidden;
+}
+#editor_tabs .pluginfo_key {
+  display: inline-block;
+  width: 90px;
+}
+#editor_tabs div.documentation {
+  padding: 0 20px !important;
+}
+#editor_tabs .shares-list {
+  margin: 10px 15px 15px;
+}
+#editor_tabs .shares-list div.header_cell:first-child {
+  border-radius: 4px 0 0 0;
+}
+#editor_tabs .shares-list div.header_cell:last-child {
+  border-radius: 0 4px 0 0;
+}
+#editor_tabs .shares-list div.header_label {
+  padding: 7px 6px 4px;
+}
+#editor_tabs .shares-list div.header_resizer {
+  max-height: 30px;
+}
+#editor_tabs .shares-list div.paginator {
+  height: 23px;
+  padding-top: 6px;
+}
+#editor_tabs #shares-toolbar a {
+  display: inline-block;
+  margin-left: 15px;
+}
+#editor_tabs #shares-toolbar a span.ajxp_icon_span {
+  display: inline-block;
+  margin-right: 5px;
+}
+#editor_tabs #shares-toolbar {
+  padding: 18px 0 0 24px;
+  position: absolute;
+  right: 0;
+}
+#editor_tabs .innerContainer {
+  background-color: #FFFFFF;
+  border-radius: 3px;
+  border: 1px solid #F1F1F1;
+  box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.25);
+}
+#editor_tabs .innerTabRow {
+  border-radius: 3px;
+  margin: 0 10px;
+  box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.15);
+}
+.ajxp_theme_orbit #editor_tabs .innerContainer {
+  border: 0;
+  box-shadow: none;
+}
+.ajxp_theme_orbit #editor_tabs #metaTabulator .innerContainer {
+  background-color: transparent;
+  margin: 0 !important;
+  padding: 10px !important;
+  padding-bottom: 20px !important;
+}
+.ajxp_theme_orbit #editor_tabs .innerTabRow {
+  border-radius: 0;
+  margin: 0;
+  box-shadow: none;
+}
+.ajxp_theme_orbit #editor_tabs div.tabbed_editor input[type="text"],
+.ajxp_theme_orbit #editor_tabs div.tabbed_editor input[type="password"] {
+  width: inherit !important;
+}
+.ajxp_theme_orbit #editor_tabs div.tabbed_editor div.chosen-search input[type="text"] {
+  width: 100% !important;
+  padding: 4px 20px 4px 5px !important;
+  border-radius: 2px;
+}
+.ajxp_theme_orbit #editor_tabs div#parameters-selected span.list_remove_item {
+  top: 42px;
+  left: 400px;
+  right: inherit;
+}
+.ajxp_theme_orbit #editor_tabs div#account_actions {
+  text-align: left;
+  padding: 12px 40px 18px;
+}
+.ajxp_theme_orbit #editor_tabs div.meta_plugin_new_form {
+  background-color: white;
+  margin: 8px 0 0 2%;
+  border-radius: 5px;
+  padding: 0 1% 10px;
+  border: 1px solid #C8CCD3;
+  max-width: 447px;
+  width: 93%;
+}
+.ajxp_theme_orbit #editor_tabs div.meta_plugin_new_form.empty {
+  display: none;
+}
+.ajxp_theme_orbit #editor_tabs div.meta_source_new_empty_params {
+  margin: 11px 11px 0;
+  font-style: italic;
+}
+.ajxp_theme_orbit #editor_tabs div#parameters-selected {
+  border-radius: 0 !important;
+}
diff --git a/core/src/plugins/editor.ajxp_role/rolesEditor.less b/core/src/plugins/editor.ajxp_role/rolesEditor.less
new file mode 100644
index 0000000000..2ada39494c
--- /dev/null
+++ b/core/src/plugins/editor.ajxp_role/rolesEditor.less
@@ -0,0 +1,469 @@
+#editor_tabs{
+
+  div#meta_source_button_add{
+      margin-top: 20px;
+  }
+  div.tabbed_editor{
+      background-color: #194172;
+      font-size: 13px;
+      border-left: 1px solid #bbbbbb;
+      border-right: 1px solid #bbbbbb;
+      line-height: initial;
+  }
+  div.tabbed_editor{
+      background-color: #f8f8f8;
+      border: 0;
+  }
+
+  div.tabbed_editor div.accordion_content{
+      padding-bottom: 20px;
+  }
+
+  div.tabbed_editor input[type="text"],
+  div.tabbed_editor input[type="password"]
+  {
+      font-size: 13px;
+      line-height: 21px;
+      padding: 0 0 0 5px !important;
+      width: 52% !important;
+      height: 30px;
+      border: 1px solid #C8CCD3;
+      box-sizing: border-box;
+  }
+
+  div.tabbed_editor input:focus,
+  div.tabbed_editor textarea:focus,
+  div.tabbed_editor select:focus
+  {
+      border: 1px solid #4dc5c3;
+  }
+
+  div.tabbed_editor select, div.tabbed_editor textarea{
+      border: 1px solid #C8CCD3;
+      font-size: 13px;
+  }
+
+  div.tabbed_editor select{
+      height: 30px;
+      border: 1px solid #C8CCD3;
+  }
+
+  div.tabbed_editor select[multiple='true']{
+      height: auto;
+  }
+
+  div.tabbed_editor textarea{
+      font-size: 13px;
+      margin: 3px;
+  }
+
+  div.tabbed_editor div.SF_input{
+      padding-top: 5px !important;
+  }
+
+  div.tabbed_editor div.SF_image_block{
+      max-width: 80px !important;
+      float: left;
+      margin-left: 11px;
+      border: 1px solid #C8CCD3;
+      border-radius: 2px;
+      padding: 2px 2px;
+      font-size: 11px;
+      text-align: center;
+  }
+
+  div.tabbed_editor div.SF_label{
+      padding-right: 0;
+      font-size: 14px !important;
+      line-height: 22px;
+      color: rgb(111, 123, 136);
+  }
+
+  div.tabbed_editor label{
+      color: rgb(111, 123, 136);
+  }
+
+  div.tabbed_editor div.SF_element{
+      padding-top: 15px;
+  }
+  div#actions-selector div.SF_element,
+  div#parameters-selector div.SF_element{
+      padding-top: 5px;
+  }
+
+  div#actions-selector,
+  div#parameters-selector{
+      margin-bottom: 20px;
+  }
+
+  div.tabbed_editor div.SF_input.SF_inlineButton{
+      margin-left: 10px !important;
+      width: 56% !important;
+      padding: 7px 3px !important;
+      box-sizing: border-box;
+      box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.26);
+  }
+
+
+  div.tabbed_editor div.editor_header{
+      display: none;
+      height: 0;
+  }
+
+
+  div.editor_header a{
+      padding: 3px 10px 5px;
+      background-color: rgba(255, 255, 255, 0.93);
+      box-shadow: 1px 1px 8px black;
+      margin-right: 7px;
+  }
+
+
+  div.editor_header a:hover{
+      border:none;
+      margin: 5px 7px 0px 1px;
+  }
+
+  div.editor_header a.disabled:hover{
+      background-color: rgba(255, 255, 255, 0.93);
+  }
+
+  div.editor_header img.actionbar_button_icon {
+      float: left;
+      width: 18px;
+      height: 18px;
+  }
+
+  div.editor_header span.actionbar_button_label {
+      font-size: 12px;
+      color: black;
+      text-shadow: none;
+      padding-top: 5px;
+      text-align: left;
+      padding-left: 23px;
+  }
+
+  div.tabbed_editor span.inherited,
+  div.tabbed_editor div.inherited
+  {
+      color: #AAAAAA;
+  }
+
+  div#actions-selector,
+  div#parameters-selector,
+  div#pane-acls > div.dialogLegend
+  {
+      padding: 10px;
+  }
+
+  div#pane-infos > div{
+      clear: both;
+  }
+
+  div#pane-docs{
+      padding:0 !important;
+  }
+
+  div.tabbed_editor div.innerTitle{
+      font-size: 13px;
+      margin: 3px 9px 10px;
+      border-bottom: 1px solid rgba(111, 123, 136, 1);
+      margin-bottom: 10px;
+      text-align: left;
+      padding: 8px 10px 10px;
+      color: rgba(76, 85, 95, 1);
+      letter-spacing: 0px;
+      font-size: 15px;
+  }
+
+  span#user_roles_update_button {
+      padding: 2px 6px;
+      border: 1px solid #C50707;
+      color: #C50707;
+      margin: 0 6px;
+      border-radius: 4px;
+      display: inline-block;
+      cursor: pointer;
+  }
+
+  div#account_actions{
+      background: none;
+      text-align: right;
+      padding: 12px 5% 18px;
+  }
+
+  div#actions-selected,
+  div#acls-selected
+  {
+      margin: 20px;
+      overflow-y: auto;
+      padding: 2px;
+      font-size: 12px;
+  }
+
+  div#parameters-selected{
+      font-size: 12px;
+
+  }
+
+  div#actions-selected > div{
+      padding: 13px 12px;
+  }
+
+
+  div#actions-selected > span.list_remove_item{
+      margin-top: -8px;
+  }
+
+  div#acls-selected div.repositoryEntry{
+      clear:both;
+      height: 17px;
+      padding: 11px 8px 11px;
+  }
+
+  div#acls-selected div.repositoryLabel{
+      float:left;
+  }
+
+  div#acls-selected div.repositoryRights{
+      float:right;
+  }
+
+  div#actions-selected > div:nth-child(even),
+  div#acls-selected > div:nth-child(even),
+  table.repository > tbody > tr:nth-child(even)
+  {
+      background: #F7F7F7;
+  }
+
+  div#acls-selected input[type="checkbox"]{
+      width: 20px;
+      margin-right: 0;
+  }
+
+  div#acls-selected label{
+      cursor: pointer;
+      margin-right: 5px;
+      text-align: left;
+      min-width: 28px;
+  }
+
+  #actions-selector div.SF_element,
+  #parameters-selector div.SF_element
+  {
+      width: 64%;
+  }
+
+  div.add_button,
+  span.list_remove_item
+  {
+      display: inline-block;
+      cursor: pointer;
+      background-color: #4dc5c3;
+      color: white;
+      text-decoration: none;
+      border-radius: 4px;
+  }
+  div.add_button{
+      padding: 5px;
+      position: absolute;
+      right: 16%;
+  }
+  span.list_remove_item{
+      cursor: pointer;
+      top: 16px;
+      right: 0;
+      padding: 6px 8px;
+      margin-right: 5px;
+  }
+
+
+  div.add_button.disabled{
+      opacity: 0.5;
+  }
+
+  div.role_edit-params-form{
+      padding: 10px;
+      border: 1px solid #ebedf0;
+      border-radius: 4px;
+  }
+
+  div#parameters-selected{
+      overflow-y: hidden;
+  }
+
+  div#parameters-selected.non_empty{
+      border: 0;
+  }
+
+  div#parameters-selected div.SF_element{
+      position: relative;
+  }
+  div#parameters-selected .SF_input{
+      width: 45% !important;
+  }
+  div#parameters-selected span.list_remove_item{
+      position: absolute;
+      top: 16px;
+      right: 0;
+  }
+
+  span.m-2 {
+      display: inline-block;
+      font-size: 11px;
+      padding: 5px 12px 7px 12px;
+      text-align: center;
+      overflow: visible;
+      color: #fff;
+      outline: none;
+      border-radius: 14px;
+      margin: 5px 6px 0 5px;
+      background: #4dc5c3;
+      letter-spacing: 1px;
+      cursor: pointer;
+  }
+
+  .pluginfo_list {
+      padding: 0 !important;
+      margin: 10px 20px;
+  }
+
+  .pluginfo_list li:nth-child(2n+1) {
+      background-color: #F7F7F7;
+  }
+
+  .pluginfo_list li {
+      list-style: none;
+      padding: 10px 7px;
+      overflow: hidden;
+  }
+
+  .pluginfo_key {
+      display: inline-block;
+      width: 90px;
+  }
+
+  div.documentation{
+      padding: 0 20px !important;
+  }
+
+  .shares-list{
+      margin: 10px 15px 15px;
+  }
+
+  .shares-list div.header_cell:first-child{
+      border-radius: 4px 0 0 0;
+  }
+  .shares-list div.header_cell:last-child{
+      border-radius: 0 4px 0 0;
+  }
+  .shares-list div.header_label{
+      padding: 7px 6px 4px;
+  }
+  .shares-list div.header_resizer{
+      max-height: 30px;
+  }
+  .shares-list div.paginator{
+      height: 23px;
+      padding-top: 6px;
+  }
+
+  #shares-toolbar a {
+      display: inline-block;
+      margin-left: 15px;
+  }
+
+  #shares-toolbar a span.ajxp_icon_span{
+      display: inline-block;
+      margin-right: 5px;
+  }
+
+  #shares-toolbar{
+      padding: 18px 0 0 24px;
+      position: absolute;
+      right: 0;
+  }
+
+  .innerContainer{
+      background-color: #FFFFFF;
+      border-radius: 3px;
+      border: 1px solid #F1F1F1;
+      box-shadow: 0px 1px 1px rgba(0,0,0,0.25);
+  }
+
+  .innerTabRow{
+    border-radius: 3px;
+    margin: 0 10px;
+    box-shadow: 0px 1px 1px rgba(0,0,0,0.15);
+  }
+
+  /* ORBIT THEME */
+  .ajxp_theme_orbit &{
+
+    .innerContainer{
+      border: 0;
+      box-shadow: none;
+    }
+
+    #metaTabulator .innerContainer{
+      background-color: transparent;
+      margin: 0 !important;
+      padding: 10px !important;
+      padding-bottom: 20px !important;
+
+    }
+
+    .innerTabRow{
+      border-radius: 0;
+      margin: 0;
+      box-shadow: none;
+    }
+
+    div.tabbed_editor input[type="text"],
+    div.tabbed_editor input[type="password"]{
+      width: inherit !important;
+    }
+
+    div.tabbed_editor div.chosen-search input[type="text"]{
+      width: 100% !important;
+      padding: 4px 20px 4px 5px !important;
+      border-radius: 2px;
+    }
+
+    div#parameters-selected span.list_remove_item {
+      top: 42px;
+      left: 400px;
+      right: inherit;
+    }
+
+    div#account_actions {
+      text-align: left;
+      padding: 12px 40px 18px;
+    }
+
+    div.meta_plugin_new_form{
+      background-color: white;
+      margin: 8px 0 0 2%;
+      border-radius: 5px;
+      padding: 0 1% 10px;
+      border: 1px solid #C8CCD3;
+      max-width: 447px;
+      width: 93%;
+    }
+
+    div.meta_plugin_new_form.empty{
+      display: none;
+    }
+
+    div.meta_source_new_empty_params {
+      margin: 11px 11px 0;
+      font-style: italic;
+    }
+    div#parameters-selected{
+      border-radius: 0 !important;
+    }
+
+  }
+
+}
+
diff --git a/core/src/plugins/editor.audio/AudioPreviewer.php b/core/src/plugins/editor.audio/AudioPreviewer.php
new file mode 100644
index 0000000000..d9f2ba395c
--- /dev/null
+++ b/core/src/plugins/editor.audio/AudioPreviewer.php
@@ -0,0 +1,145 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Editor\Audio;
+
+use Pydio\Access\Core\MetaStreamWrapper;
+use Pydio\Access\Core\Exception\FileNotFoundException;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Core\Http\Middleware\SecureTokenMiddleware;
+
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Utils\Vars\InputFilter;
+
+
+use Pydio\Core\PluginFramework\Plugin;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Class AudioPreviewer
+ * Streams MP3 files to a client
+ * @package Pydio\Editor\Audio
+ */
+class AudioPreviewer extends Plugin
+{
+
+    /**
+     * Action Controller
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @throws FileNotFoundException
+     */
+    public function switchAction(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface)
+    {
+        $contextInterface   = $requestInterface->getAttribute("ctx");
+        $action             = $requestInterface->getAttribute("action");
+        $httpVars           = $requestInterface->getParsedBody();
+
+        if ($action == "audio_proxy") {
+
+            $selection = UserSelection::fromContext($contextInterface, $httpVars);
+            $destStreamURL = $selection->currentBaseUrl();
+
+            $node = $selection->getUniqueNode();
+            // Backward compat
+            // May be a backward compatibility problem, try to base64decode the filepath
+            $exist = false;
+            try{
+                $exist = file_exists($node->getUrl());
+            }catch(\Exception $e){
+            }
+            if(!$exist && strpos($httpVars["file"], "base64encoded:") === false){
+                $file = InputFilter::decodeSecureMagic(base64_decode($httpVars["file"]));
+                if(!file_exists($destStreamURL.$file)){
+                    throw new FileNotFoundException($file);
+                }else{
+                    $user = $node->getUserId();
+                    $node = new AJXP_Node($destStreamURL.$file);
+                    $node->setUserId($user);
+                }
+            }
+            if(!is_readable($node->getUrl())){
+                throw new FileNotFoundException($node->getPath());
+            }
+            
+
+            $aSyncReader = new \Pydio\Core\Http\Response\AsyncResponseStream(function () use ($node){
+
+                $fileUrl    = $node->getUrl();
+                $localName  = $node->getLabel();
+                $cType      = "audio/".array_pop(explode(".", $localName));
+                $size       = filesize($fileUrl);
+
+                header("Content-Type: ".$cType."; name=\"".$localName."\"");
+                header("Content-Length: ".$size);
+
+                $stream = fopen("php://output", "a");
+                MetaStreamWrapper::copyFileInStream($fileUrl, $stream);
+                fflush($stream);
+                fclose($stream);
+
+                Controller::applyHook("node.read", array($node));
+                $this->logInfo('Preview', 'Read content of '.$node->getUrl(), array("files" => $node->getUrl()));
+
+            });
+
+            $responseInterface = $responseInterface->withBody($aSyncReader);
+
+            //exit(1);
+
+        } else if ($action == "ls") {
+
+            if (!isSet($httpVars["playlist"])) {
+                return;
+            }
+
+            // Transform the XML into XSPF
+            $xmlString = $responseInterface->getBody()->getContents();
+            $responseInterface->getBody()->rewind();
+            $xmlDoc = new \DOMDocument();
+            $xmlDoc->loadXML($xmlString);
+            $xElement = $xmlDoc->documentElement;
+            $xmlBuff = "";
+            header("Content-Type:application/xspf+xml;charset=UTF-8");
+            $xmlBuff.='<?xml version="1.0" encoding="UTF-8"?>';
+            $xmlBuff.='<playlist version="1" xmlns="http://xspf.org/ns/0/">';
+            $xmlBuff.="<trackList>";
+            /** @var \DOMElement $child */
+            foreach ($xElement->childNodes as $child) {
+                $isFile = ($child->getAttribute("is_file") == "true");
+                $label = $child->getAttribute("text");
+                $ar = explode(".", $label);
+                $ext = strtolower(end($ar));
+                if(!$isFile || $ext != "mp3") continue;
+                $xmlBuff.="<track><location>".AJXP_SERVER_ACCESS."?&get_action=audio_proxy&file=".base64_encode($child->getAttribute("filename"))."</location><title>".$label."</title></track>";
+            }
+            $xmlBuff.="</trackList>";
+            $xmlBuff.= "</playlist>";
+
+            $responseInterface = $responseInterface->withHeader("Content-type", "application/xspf+xml;charset=UTF-8");
+            $responseInterface->getBody()->write($xmlBuff);
+
+        }
+
+    }
+}
diff --git a/core/src/plugins/editor.audio/class.AudioPreviewer.js b/core/src/plugins/editor.audio/class.AudioPreviewer.js
index 624d0cb6b4..7a9211179e 100644
--- a/core/src/plugins/editor.audio/class.AudioPreviewer.js
+++ b/core/src/plugins/editor.audio/class.AudioPreviewer.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 Class.create("AudioPreviewer", AbstractEditor, {
 
diff --git a/core/src/plugins/editor.audio/class.AudioPreviewer.php b/core/src/plugins/editor.audio/class.AudioPreviewer.php
deleted file mode 100644
index e40759742f..0000000000
--- a/core/src/plugins/editor.audio/class.AudioPreviewer.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Streams MP3 files to the flash client
- * @package AjaXplorer_Plugins
- * @subpackage Editor
- */
-class AudioPreviewer extends AJXP_Plugin
-{
-    public function preProcessAction($action, &$httpVars, &$fileVars)
-    {
-        if ($action != "ls" || !isset($httpVars["playlist"])) {
-            return ;
-        }
-        $httpVars["dir"] = base64_decode($httpVars["dir"]);
-    }
-
-    public function switchAction($action, $httpVars, $postProcessData)
-    {
-        $repository = ConfService::getRepository();
-        if (!$repository->detectStreamWrapper(false)) {
-            return false;
-        }
-
-        if ($action == "audio_proxy") {
-
-            $selection = new UserSelection($repository, $httpVars);
-            $destStreamURL = $selection->currentBaseUrl();
-
-            $node = new AJXP_Node($destStreamURL."/".$selection->getUniqueFile());
-            // Backward compat
-            // May be a backward compatibility problem, try to base64decode the filepath
-            if(!file_exists($node->getUrl()) && strpos($httpVars["file"], "base64encoded:") === false){
-                $file = AJXP_Utils::decodeSecureMagic(base64_decode($httpVars["file"]));
-                if(!file_exists($destStreamURL.$file)){
-                    throw new Exception("Cannot find file!");
-                }else{
-                    $node = new AJXP_Node($destStreamURL.$file);
-                }
-            }
-            if(!is_readable($node->getUrl())){
-                throw new Exception("Cannot find file!");
-            }
-
-            $fileUrl = $node->getUrl();
-            $localName = basename($fileUrl);
-            $cType = "audio/".array_pop(explode(".", $localName));
-            $size = filesize($node->getUrl());
-
-            header("Content-Type: ".$cType."; name=\"".$localName."\"");
-            header("Content-Length: ".$size);
-
-            $stream = fopen("php://output", "a");
-            AJXP_MetaStreamWrapper::copyFileInStream($fileUrl, $stream);
-            fflush($stream);
-            fclose($stream);
-
-            AJXP_Controller::applyHook("node.read", array($node));
-            $this->logInfo('Preview', 'Read content of '.$node->getUrl(), array("files" => $node->getUrl()));
-            //exit(1);
-
-        } else if ($action == "ls") {
-            if (!isSet($httpVars["playlist"])) {
-                // This should not happen anyway, because of the applyCondition.
-                AJXP_Controller::passProcessDataThrough($postProcessData);
-                return false;
-            }
-            // We transform the XML into XSPF
-            $xmlString = $postProcessData["ob_output"];
-            $xmlDoc = new DOMDocument();
-            $xmlDoc->loadXML($xmlString);
-            $xElement = $xmlDoc->documentElement;
-            header("Content-Type:application/xspf+xml;charset=UTF-8");
-            print('<?xml version="1.0" encoding="UTF-8"?>');
-            print('<playlist version="1" xmlns="http://xspf.org/ns/0/">');
-            print("<trackList>");
-            foreach ($xElement->childNodes as $child) {
-                $isFile = ($child->getAttribute("is_file") == "true");
-                $label = $child->getAttribute("text");
-                $ar = explode(".", $label);
-                $ext = strtolower(end($ar));
-                if(!$isFile || $ext != "mp3") continue;
-                print("<track><location>".AJXP_SERVER_ACCESS."?secure_token=".AuthService::getSecureToken()."&get_action=audio_proxy&file=".base64_encode($child->getAttribute("filename"))."</location><title>".$label."</title></track>");
-            }
-            print("</trackList>");
-            AJXP_XMLWriter::close("playlist");
-        }
-    }
-}
diff --git a/core/src/plugins/editor.audio/i18n/conf/de.php b/core/src/plugins/editor.audio/i18n/conf/de.php
index 146a410958..568b8a7425 100644
--- a/core/src/plugins/editor.audio/i18n/conf/de.php
+++ b/core/src/plugins/editor.audio/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Audio Player" => "Audio-Player",
diff --git a/core/src/plugins/editor.audio/i18n/conf/en.php b/core/src/plugins/editor.audio/i18n/conf/en.php
index fd033f37e6..c018fd2a9a 100644
--- a/core/src/plugins/editor.audio/i18n/conf/en.php
+++ b/core/src/plugins/editor.audio/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Audio Player" => "Audio Player",
diff --git a/core/src/plugins/editor.audio/i18n/conf/fr.php b/core/src/plugins/editor.audio/i18n/conf/fr.php
index c2114c5cb2..4b07162208 100644
--- a/core/src/plugins/editor.audio/i18n/conf/fr.php
+++ b/core/src/plugins/editor.audio/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Audio Player" => "Player Audio",
diff --git a/core/src/plugins/editor.audio/i18n/conf/it.php b/core/src/plugins/editor.audio/i18n/conf/it.php
index 33e8802c1c..2325cacd7a 100644
--- a/core/src/plugins/editor.audio/i18n/conf/it.php
+++ b/core/src/plugins/editor.audio/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Audio Player" => "Riproduttore Audio",
diff --git a/core/src/plugins/editor.audio/i18n/conf/pt.php b/core/src/plugins/editor.audio/i18n/conf/pt.php
index 5fa38978f7..3d2c1bd463 100644
--- a/core/src/plugins/editor.audio/i18n/conf/pt.php
+++ b/core/src/plugins/editor.audio/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Audio Player" => "Reprodutor de Música",
diff --git a/core/src/plugins/editor.audio/manifest.xml b/core/src/plugins/editor.audio/manifest.xml
index b36fd55513..3310f87fab 100644
--- a/core/src/plugins/editor.audio/manifest.xml
+++ b/core/src/plugins/editor.audio/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <editor id="editor.audio" order="1000" enabled="true" modalOnly="true" openable="false" previewProvider="true" text="186" title="136" icon="frame_image.png" className="AudioPreviewer" mimes="mp3" label="CONF_MESSAGE[Audio Player]" description="CONF_MESSAGE[Inserts a flash player for reading mp3 files online, and playing a whole folder in a separate window.]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-	<class_definition filename="plugins/editor.audio/class.AudioPreviewer.php" classname="AudioPreviewer"/>
+	<class_definition filename="plugins/editor.audio/AudioPreviewer.php" classname="Pydio\Editor\Audio\AudioPreviewer"/>
     <client_settings>
         <resources>
             <js file="plugins/editor.audio/class.AudioPreviewer.js" className="AudioPreviewer"/>
@@ -9,7 +9,7 @@
     </client_settings>
 	<registry_contributions>
 		<actions>
-			<action name="audio_proxy" contentTypedProvider="true">
+			<action name="audio_proxy" contentTypedProvider="true" skipSecureToken="true">
 				<processing>
 					<serverCallback methodName="switchAction" restParams="/file+" developerComment="Server an audio file as a stream">
                         <input_param name="file" type="AJXP_NODE" description="Path to the file"/>
diff --git a/core/src/plugins/editor.browser/FileMimeSender.php b/core/src/plugins/editor.browser/FileMimeSender.php
new file mode 100644
index 0000000000..f54d154cf8
--- /dev/null
+++ b/core/src/plugins/editor.browser/FileMimeSender.php
@@ -0,0 +1,134 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Editor\Mime;
+
+use Pydio\Access\Core\MetaStreamWrapper;
+use Pydio\Access\Core\Model\UserSelection;
+
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Controller\HTMLWriter;
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Services\UsersService;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Class FileMimeSender
+ * Extract the mimetype of a file and send it to the browser
+ * @package Pydio\Editor\Mime
+ */
+class FileMimeSender extends Plugin
+{
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @throws \Pydio\Core\Exception\AuthRequiredException
+     * @throws \Pydio\Core\Exception\PydioException
+     */
+    public function switchAction(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface)
+    {
+        if($requestInterface->getAttribute("action") !== "open_file"){
+            return;
+        }
+
+        /** @var \Pydio\Core\Model\ContextInterface $ctx */
+        $ctx        = $requestInterface->getAttribute("ctx");
+        $httpVars   = $requestInterface->getParsedBody();
+
+        $repository = RepositoryService::getRepositoryById($httpVars["repository_id"]);
+        
+        if (UsersService::usersEnabled()) {
+            $loggedUser = $ctx->getUser();
+            if (!$loggedUser->canSwitchTo($repository->getId())) {
+                throw new \Pydio\Core\Exception\AuthRequiredException();
+            }
+        }
+
+        $selection = UserSelection::fromContext($ctx, $httpVars);
+
+        $selectedNode = $selection->getUniqueNode();
+        $selectedNodeUrl = $selectedNode->getUrl();
+
+        if (!file_exists($selectedNodeUrl) || !is_readable($selectedNodeUrl)) {
+            throw new \Pydio\Core\Exception\PydioException("File does not exist");
+        }
+
+        $filesize = filesize($selectedNodeUrl);
+        $fp = fopen($selectedNodeUrl, "rb");
+        $fileMime = "application/octet-stream";
+
+        //Get mimetype with fileinfo PECL extension
+        if (class_exists("finfo")) {
+            $finfo = new \finfo(FILEINFO_MIME);
+            $fileMime = $finfo->buffer(fread($fp, 2000));
+        }
+        //Get mimetype with (deprecated) mime_content_type
+        if (strpos($fileMime, "application/octet-stream")===0 && function_exists("mime_content_type")) {
+            $fileMime = @mime_content_type($fp);
+        }
+        //Guess mimetype based on file extension
+        if (strpos($fileMime, "application/octet-stream")===0 ) {
+            $fileExt = substr(strrchr(basename($selectedNodeUrl), '.'), 1);
+            if(empty($fileExt))
+                $fileMime = "application/octet-stream";
+            else {
+                $regex = "/^([\w\+\-\.\/]+)\s+(\w+\s)*($fileExt\s)/i";
+                $lines = file( $this->getBaseDir()."/resources/other/mime.types");
+                foreach ($lines as $line) {
+                    if(substr($line, 0, 1) == '#')
+                        continue; // skip comments
+                    $line = rtrim($line) . " ";
+                    if(!preg_match($regex, $line, $matches))
+                        continue; // no match to the extension
+                    $fileMime = $matches[1];
+                }
+            }
+        }
+        fclose($fp);
+        // If still no mimetype, give up and serve application/octet-stream
+        if(empty($fileMime))
+            $fileMime = "application/octet-stream";
+
+        if(strpos($fileMime, "image/svg+xml;") === 0){
+            // Do not open SVG directly in browser.
+            $fileMime = "application/octet-stream";
+        }
+
+        //Send headers
+        $responseInterface = HTMLWriter::responseWithInlineHeaders($responseInterface, basename($selectedNodeUrl), $filesize, $fileMime);
+        $aSyncReader = new \Pydio\Core\Http\Response\AsyncResponseStream(function () use ($selectedNode){
+
+            $stream = fopen("php://output", "a");
+            MetaStreamWrapper::copyFileInStream($selectedNode->getUrl(), $stream);
+            fflush($stream);
+            fclose($stream);
+
+            Controller::applyHook("node.read", array($selectedNode));
+            $this->logInfo('Download', 'Read content of '.$selectedNode->getUrl(), array("files" => $selectedNode->getUrl()));
+
+        });
+
+        $responseInterface = $responseInterface->withBody($aSyncReader);
+
+    }
+}
diff --git a/core/src/plugins/editor.browser/class.BrowserOpener.js b/core/src/plugins/editor.browser/class.BrowserOpener.js
index fba4f51c33..01f5d7c63b 100644
--- a/core/src/plugins/editor.browser/class.BrowserOpener.js
+++ b/core/src/plugins/editor.browser/class.BrowserOpener.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 Class.create("BrowserOpener", AbstractEditor, {
 
@@ -40,7 +40,7 @@ Class.create("BrowserOpener", AbstractEditor, {
             if(url.substr(-1) == '/') url = url.substr(0, url.length - 1);
         }
         //var nonSecureAccessPath = window.ajxpServerAccessPath.substring(0, window.ajxpServerAccessPath.lastIndexOf('?'));
-        var open_file_url = url + "/" + window.ajxpServerAccessPath + "&get_action=open_file&repository_id=" + repo + "&file=" + encodeURIComponent(node.getPath());
+        var open_file_url = LangUtils.trimRight(url, "\/") + "/" + window.ajxpServerAccessPath + "&get_action=open_file&repository_id=" + repo + "&file=" + encodeURIComponent(node.getPath());
 
         if(this.editorOptions.context.__className == 'Modal'){
             window.open(open_file_url);
diff --git a/core/src/plugins/editor.browser/class.FileMimeSender.php b/core/src/plugins/editor.browser/class.FileMimeSender.php
deleted file mode 100755
index 1c1c58e758..0000000000
--- a/core/src/plugins/editor.browser/class.FileMimeSender.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Extract the mimetype of a file and send it to the browser
- * @package AjaXplorer_Plugins
- * @subpackage Editor
- */
-class FileMimeSender extends AJXP_Plugin
-{
-    public function switchAction($action, $httpVars, $filesVars)
-    {
-        $repository = ConfService::getRepositoryById($httpVars["repository_id"]);
-
-        if(!$repository->detectStreamWrapper(true)){
-            return false;
-        }
-
-        if (AuthService::usersEnabled()) {
-            $loggedUser = AuthService::getLoggedUser();
-            if ($loggedUser === null && ConfService::getCoreConf("ALLOW_GUEST_BROWSING", "auth")) {
-                AuthService::logUser("guest", null);
-                $loggedUser = AuthService::getLoggedUser();
-            }
-            if (!$loggedUser->canSwitchTo($repository->getId())) {
-                echo("You do not have permissions to access this resource");
-                return false;
-            }
-        }
-
-        $selection = new UserSelection($repository, $httpVars);
-
-        if ($action == "open_file") {
-            $selectedNode = $selection->getUniqueNode();
-            $selectedNodeUrl = $selectedNode->getUrl();
-
-            if (!file_exists($selectedNodeUrl) || !is_readable($selectedNodeUrl)) {
-                echo("File does not exist");
-                return false;
-            }
-
-            $filesize = filesize($selectedNodeUrl);
-            $fp = fopen($selectedNodeUrl, "rb");
-            $fileMime = "application/octet-stream";
-
-            //Get mimetype with fileinfo PECL extension
-            if (class_exists("finfo")) {
-                $finfo = new finfo(FILEINFO_MIME);
-                $fileMime = $finfo->buffer(fread($fp, 2000));
-            }
-            //Get mimetype with (deprecated) mime_content_type
-            if (strpos($fileMime, "application/octet-stream")===0 && function_exists("mime_content_type")) {
-                $fileMime = @mime_content_type($fp);
-            }
-            //Guess mimetype based on file extension
-            if (strpos($fileMime, "application/octet-stream")===0 ) {
-                $fileExt = substr(strrchr(basename($selectedNodeUrl), '.'), 1);
-                if(empty($fileExt))
-                    $fileMime = "application/octet-stream";
-                else {
-                    $regex = "/^([\w\+\-\.\/]+)\s+(\w+\s)*($fileExt\s)/i";
-                    $lines = file( $this->getBaseDir()."/resources/other/mime.types");
-                    foreach ($lines as $line) {
-                        if(substr($line, 0, 1) == '#')
-                            continue; // skip comments
-                        $line = rtrim($line) . " ";
-                        if(!preg_match($regex, $line, $matches))
-                            continue; // no match to the extension
-                        $fileMime = $matches[1];
-                    }
-                }
-            }
-            fclose($fp);
-            // If still no mimetype, give up and serve application/octet-stream
-            if(empty($fileMime))
-                $fileMime = "application/octet-stream";
-
-            if(strpos($fileMime, "image/svg+xml;") === 0){
-                // Do not open SVG directly in browser.
-                $fileMime = "application/octet-stream";
-            }
-
-            //Send headers
-            HTMLWriter::generateInlineHeaders(basename($selectedNodeUrl), $filesize, $fileMime);
-
-            $stream = fopen("php://output", "a");
-            AJXP_MetaStreamWrapper::copyFileInStream($selectedNodeUrl, $stream);
-            fflush($stream);
-            fclose($stream);
-
-            AJXP_Controller::applyHook("node.read", array($selectedNode));
-            $this->logInfo('Download', 'Read content of '.$selectedNodeUrl, array("files" => $selectedNodeUrl));
-
-        }
-    }
-}
diff --git a/core/src/plugins/editor.browser/manifest.xml b/core/src/plugins/editor.browser/manifest.xml
index c984952ca5..ac822b3177 100644
--- a/core/src/plugins/editor.browser/manifest.xml
+++ b/core/src/plugins/editor.browser/manifest.xml
@@ -28,8 +28,8 @@
 		<!-- Stream Wrapper Access -->
 		<activePlugin pluginName="access.AJXP_STREAM_PROVIDER"/>
 	</dependencies>
-    <class_definition filename="plugins/editor.browser/class.FileMimeSender.php"
-        classname="FileMimeSender" />
+    <class_definition filename="plugins/editor.browser/FileMimeSender.php"
+        classname="Pydio\Editor\Mime\FileMimeSender" />
     <registry_contributions>
     	<actions>
     		<action name="open_file" skipSecureToken="true">
diff --git a/core/src/plugins/editor.browser/resources/i18n/ca.php b/core/src/plugins/editor.browser/resources/i18n/ca.php
index 8d9c5fcc24..4b584898cb 100644
--- a/core/src/plugins/editor.browser/resources/i18n/ca.php
+++ b/core/src/plugins/editor.browser/resources/i18n/ca.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
   //	Catalan translation: Salva Gómez <salva.gomez at gmail.com> 2015
 $mess=array(
diff --git a/core/src/plugins/editor.browser/resources/i18n/conf/de.php b/core/src/plugins/editor.browser/resources/i18n/conf/de.php
index 53746cf06d..2e5522e3a8 100644
--- a/core/src/plugins/editor.browser/resources/i18n/conf/de.php
+++ b/core/src/plugins/editor.browser/resources/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "External Window" => "Externes Fenster",
diff --git a/core/src/plugins/editor.browser/resources/i18n/conf/en.php b/core/src/plugins/editor.browser/resources/i18n/conf/en.php
index a5cd7dca47..15f204bb90 100644
--- a/core/src/plugins/editor.browser/resources/i18n/conf/en.php
+++ b/core/src/plugins/editor.browser/resources/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "External Window" => "External Window",
diff --git a/core/src/plugins/editor.browser/resources/i18n/de.php b/core/src/plugins/editor.browser/resources/i18n/de.php
index 7a0d826f75..2b196d46d9 100755
--- a/core/src/plugins/editor.browser/resources/i18n/de.php
+++ b/core/src/plugins/editor.browser/resources/i18n/de.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "Externes Fenster",
diff --git a/core/src/plugins/editor.browser/resources/i18n/en.php b/core/src/plugins/editor.browser/resources/i18n/en.php
index 16a7052b8f..08912522c4 100755
--- a/core/src/plugins/editor.browser/resources/i18n/en.php
+++ b/core/src/plugins/editor.browser/resources/i18n/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "External window",
diff --git a/core/src/plugins/editor.browser/resources/i18n/es.php b/core/src/plugins/editor.browser/resources/i18n/es.php
index e387531585..e7037edfd4 100755
--- a/core/src/plugins/editor.browser/resources/i18n/es.php
+++ b/core/src/plugins/editor.browser/resources/i18n/es.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
   //	Spanish translation: Salva Gómez <salva.gomez at gmail.com> 2016
 $mess=array(
diff --git a/core/src/plugins/editor.browser/resources/i18n/et.php b/core/src/plugins/editor.browser/resources/i18n/et.php
index 00ee9fe6a3..fc5a2d25b4 100644
--- a/core/src/plugins/editor.browser/resources/i18n/et.php
+++ b/core/src/plugins/editor.browser/resources/i18n/et.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
  //  Estonian translation by Ardi Jürgens <ardi (at) zone.ee>
 //  + updates/fixes by Kain Väljaots <kain (at) zone.ee>
diff --git a/core/src/plugins/editor.browser/resources/i18n/fr.php b/core/src/plugins/editor.browser/resources/i18n/fr.php
index 34d6007c26..6b375fb258 100644
--- a/core/src/plugins/editor.browser/resources/i18n/fr.php
+++ b/core/src/plugins/editor.browser/resources/i18n/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Fenêtre externe",
diff --git a/core/src/plugins/editor.browser/resources/i18n/it.php b/core/src/plugins/editor.browser/resources/i18n/it.php
index f8bf0de2ff..89882f0381 100755
--- a/core/src/plugins/editor.browser/resources/i18n/it.php
+++ b/core/src/plugins/editor.browser/resources/i18n/it.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "Finestra Esterna",
diff --git a/core/src/plugins/editor.browser/resources/i18n/pt.php b/core/src/plugins/editor.browser/resources/i18n/pt.php
index 740921f03c..d10a80852f 100644
--- a/core/src/plugins/editor.browser/resources/i18n/pt.php
+++ b/core/src/plugins/editor.browser/resources/i18n/pt.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "Janela Externa",
diff --git a/core/src/plugins/editor.browser/resources/i18n/ru.php b/core/src/plugins/editor.browser/resources/i18n/ru.php
index 4482ee0526..07ff982146 100644
--- a/core/src/plugins/editor.browser/resources/i18n/ru.php
+++ b/core/src/plugins/editor.browser/resources/i18n/ru.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "Программы просмотра",
diff --git a/core/src/plugins/editor.ckeditor/class.AjxpCkEditor.js b/core/src/plugins/editor.ckeditor/class.AjxpCkEditor.js
index c47dd92b51..6fc8af9a6a 100644
--- a/core/src/plugins/editor.ckeditor/class.AjxpCkEditor.js
+++ b/core/src/plugins/editor.ckeditor/class.AjxpCkEditor.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 Class.create("AjxpCkEditor", TextEditor, {
 
@@ -124,7 +124,7 @@ Class.create("AjxpCkEditor", TextEditor, {
 		if(window.ajxpMobile){
 			this.setFullScreen();
 		}
-
+        this.element.down('.action_bar').removeClassName('full_width_action_bar');
 	},
 	
 	bindCkEditorEvents : function(){
@@ -181,11 +181,15 @@ Class.create("AjxpCkEditor", TextEditor, {
 	},
 			
 	saveFile : function(){
-		var connexion = this.prepareSaveConnexion();
-		var value = CKEDITOR.instances[this.editorInstanceId].getData();
-		this.textarea.value = value;		
-		connexion.addParameter('content', value);
-		connexion.sendAsync();
+
+        var value = CKEDITOR.instances[this.editorInstanceId].getData();
+        this.textarea.value = value;
+        PydioApi.getClient().postPlainTextContent(this.inputNode.getPath(), this.textarea.value, function(success){
+            if(success){
+                this.setModified(false);
+            }
+        }.bind(this));
+
 	},
 		
 	parseTxt : function(transport){	
diff --git a/core/src/plugins/editor.ckeditor/i18n/conf/de.php b/core/src/plugins/editor.ckeditor/i18n/conf/de.php
index 12ad4b4d9f..1c34f1922e 100644
--- a/core/src/plugins/editor.ckeditor/i18n/conf/de.php
+++ b/core/src/plugins/editor.ckeditor/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "CKEditor" => "CKEditor",
diff --git a/core/src/plugins/editor.ckeditor/i18n/conf/en.php b/core/src/plugins/editor.ckeditor/i18n/conf/en.php
index 003262a523..3227d7fcd3 100644
--- a/core/src/plugins/editor.ckeditor/i18n/conf/en.php
+++ b/core/src/plugins/editor.ckeditor/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "CKEditor" => "CKEditor",
diff --git a/core/src/plugins/editor.ckeditor/i18n/conf/fr.php b/core/src/plugins/editor.ckeditor/i18n/conf/fr.php
index e4c060742d..d5bf7afe0e 100644
--- a/core/src/plugins/editor.ckeditor/i18n/conf/fr.php
+++ b/core/src/plugins/editor.ckeditor/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "CKEditor" => "CKEditor",
diff --git a/core/src/plugins/editor.ckeditor/i18n/conf/it.php b/core/src/plugins/editor.ckeditor/i18n/conf/it.php
index 9e73239298..c6f559af25 100644
--- a/core/src/plugins/editor.ckeditor/i18n/conf/it.php
+++ b/core/src/plugins/editor.ckeditor/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "CKEditor" => "CKEditor",
diff --git a/core/src/plugins/editor.ckeditor/i18n/conf/pt.php b/core/src/plugins/editor.ckeditor/i18n/conf/pt.php
index 003262a523..3227d7fcd3 100644
--- a/core/src/plugins/editor.ckeditor/i18n/conf/pt.php
+++ b/core/src/plugins/editor.ckeditor/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "CKEditor" => "CKEditor",
diff --git a/core/src/plugins/editor.codemirror/class.CodeMirrorEditor.js b/core/src/plugins/editor.codemirror/class.CodeMirrorEditor.js
index c82ff4d9b1..dee2883df8 100644
--- a/core/src/plugins/editor.codemirror/class.CodeMirrorEditor.js
+++ b/core/src/plugins/editor.codemirror/class.CodeMirrorEditor.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 Class.create("CodeMirrorEditor", AbstractEditor, {
 
@@ -302,46 +302,25 @@ Class.create("CodeMirrorEditor", AbstractEditor, {
 	loadFileContent : function(fileName){
 		
 		this.currentFile = fileName;
-		var connexion = new Connexion();
-		connexion.addParameter('get_action', 'get_content');
-		connexion.addParameter('file', fileName);	
-		connexion.onComplete = function(transp){
-			this.parseTxt(transp);
+        PydioApi.getClient().request({
+            get_action: 'get_content',
+            file: fileName
+        }, function(transport){
+			this.parseTxt(transport);
 			this.updateTitle(getBaseName(fileName));
-		}.bind(this);
-		this.setModified(false);
-		this.setOnLoad(this.contentMainContainer);
-		connexion.sendAsync();
-	},
-	
-	prepareSaveConnexion : function(){
-		var connexion = new Connexion();
-		connexion.addParameter('get_action', 'put_content');
-        connexion.addParameter('file', this.inputNode.getPath());
-        connexion.onComplete = function(transp){
-			this.parseXml(transp);
-            ajaxplorer.fireNodeRefresh(this.inputNode);
-		}.bind(this);
-		this.setOnLoad(this.contentMainContainer);
-		connexion.setMethod('put');		
-		return connexion;
+        }.bind(this));
 	},
 	
 	saveFile : function(){
-		var connexion = this.prepareSaveConnexion();
-		connexion.addParameter('content', this.codeMirror.getCode());		
-		connexion.sendAsync();
-	},
-	
-	parseXml : function(transport){
-		if(parseInt(transport.responseText).toString() == transport.responseText){
-			alert("Cannot write the file to disk (Error code : "+transport.responseText+")");
-		}else{
-			this.setModified(false);
-		}
-		this.removeOnLoad(this.contentMainContainer);
+        this.setOnLoad(this.contentMainContainer);
+        PydioApi.getClient().postPlainTextContent(this.inputNode.getPath(), this.codeMirror.getCode(), function(success){
+            if(success){
+                this.setModified(false);
+            }
+            this.removeOnLoad(this.contentMainContainer)
+        }.bind(this));
 	},
-	
+
 	parseTxt : function(transport){	
 		this.codeMirror.setCode(transport.responseText);
 		this.setModified(false);
diff --git a/core/src/plugins/editor.codemirror/i18n/conf/de.php b/core/src/plugins/editor.codemirror/i18n/conf/de.php
index d2c3a74de8..c984cbd3aa 100644
--- a/core/src/plugins/editor.codemirror/i18n/conf/de.php
+++ b/core/src/plugins/editor.codemirror/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 /*******************************************************************************
diff --git a/core/src/plugins/editor.codemirror/i18n/conf/en.php b/core/src/plugins/editor.codemirror/i18n/conf/en.php
index c4835e3bc5..df21885bb3 100644
--- a/core/src/plugins/editor.codemirror/i18n/conf/en.php
+++ b/core/src/plugins/editor.codemirror/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Source Viewer" => "Source Viewer",
diff --git a/core/src/plugins/editor.codemirror/i18n/conf/fr.php b/core/src/plugins/editor.codemirror/i18n/conf/fr.php
index b81cd9324b..dd591e3df2 100644
--- a/core/src/plugins/editor.codemirror/i18n/conf/fr.php
+++ b/core/src/plugins/editor.codemirror/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Source Viewer" => "Afficheur de sources",
diff --git a/core/src/plugins/editor.codemirror/i18n/conf/it.php b/core/src/plugins/editor.codemirror/i18n/conf/it.php
index 4a8e4dcecd..acbc81fa88 100644
--- a/core/src/plugins/editor.codemirror/i18n/conf/it.php
+++ b/core/src/plugins/editor.codemirror/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Source Viewer" => "Visualizzatore Sorgente",
diff --git a/core/src/plugins/editor.codemirror/i18n/conf/pt.php b/core/src/plugins/editor.codemirror/i18n/conf/pt.php
index 8e76495604..7744818cb9 100644
--- a/core/src/plugins/editor.codemirror/i18n/conf/pt.php
+++ b/core/src/plugins/editor.codemirror/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Source Viewer" => "Visualizador de Código-Fonte",
diff --git a/core/src/plugins/editor.codemirror/i18n/de.php b/core/src/plugins/editor.codemirror/i18n/de.php
index 6ded5d9820..6db91c3753 100644
--- a/core/src/plugins/editor.codemirror/i18n/de.php
+++ b/core/src/plugins/editor.codemirror/i18n/de.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 /*******************************************************************************
 * German translation:
diff --git a/core/src/plugins/editor.codemirror/i18n/en.php b/core/src/plugins/editor.codemirror/i18n/en.php
index c6639fb7c1..0b3928e4da 100644
--- a/core/src/plugins/editor.codemirror/i18n/en.php
+++ b/core/src/plugins/editor.codemirror/i18n/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1"	=> "Source Editor",
diff --git a/core/src/plugins/editor.codemirror/i18n/et.php b/core/src/plugins/editor.codemirror/i18n/et.php
index edb182a2ee..b56fd59e18 100644
--- a/core/src/plugins/editor.codemirror/i18n/et.php
+++ b/core/src/plugins/editor.codemirror/i18n/et.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 //  Estonian translation by Ardi Jürgens <ardi (at) zone.ee>
 //  + updates/fixes by Kain Väljaots <kain (at) zone.ee>
diff --git a/core/src/plugins/editor.codemirror/i18n/fr.php b/core/src/plugins/editor.codemirror/i18n/fr.php
index 6ea439db6d..6069ca3a14 100644
--- a/core/src/plugins/editor.codemirror/i18n/fr.php
+++ b/core/src/plugins/editor.codemirror/i18n/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Editeur de source",
diff --git a/core/src/plugins/editor.codemirror/i18n/it.php b/core/src/plugins/editor.codemirror/i18n/it.php
index c9a567caf9..315c489dbb 100644
--- a/core/src/plugins/editor.codemirror/i18n/it.php
+++ b/core/src/plugins/editor.codemirror/i18n/it.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1"	=> "Editor Sorgente",
diff --git a/core/src/plugins/editor.codemirror/i18n/pt.php b/core/src/plugins/editor.codemirror/i18n/pt.php
index d730de700f..96f35603f6 100644
--- a/core/src/plugins/editor.codemirror/i18n/pt.php
+++ b/core/src/plugins/editor.codemirror/i18n/pt.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1"	=> "Editor de Código-Fonte",
diff --git a/core/src/plugins/editor.codemirror/i18n/ru.php b/core/src/plugins/editor.codemirror/i18n/ru.php
index def6f083b8..74ab79e73f 100644
--- a/core/src/plugins/editor.codemirror/i18n/ru.php
+++ b/core/src/plugins/editor.codemirror/i18n/ru.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1"	=> "Редактора кода",
diff --git a/core/src/plugins/editor.codemirror/i18n/si.php b/core/src/plugins/editor.codemirror/i18n/si.php
index 1047cbb5ab..7edbd1c380 100644
--- a/core/src/plugins/editor.codemirror/i18n/si.php
+++ b/core/src/plugins/editor.codemirror/i18n/si.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 // Slovenian translation: April 21 2011 by Vladimir Bohinc (vladimir.bohinc@gmail.com)
 //
diff --git a/core/src/plugins/editor.codepress/class.CodePressEditor.js b/core/src/plugins/editor.codepress/class.CodePressEditor.js
deleted file mode 100644
index 0db6649c51..0000000000
--- a/core/src/plugins/editor.codepress/class.CodePressEditor.js
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-Class.create("CodePressEditor", TextEditor, {
-
-	initialize: function($super, oFormObject, options)
-	{
-		$super(oFormObject, options);
-	},
-	
-	
-	open : function($super, node){
-		this.inputNode = node;
-		var fileName = node.getPath();
-		// CREATE GUI
-		var cpStyle = this.codePressStyle(getBaseName(fileName));
-		var textarea;
-		this.textareaContainer = document.createElement('div');
-		this.textarea = $(document.createElement('textarea'));
-		var hidden = document.createElement('input');
-		hidden.type = 'hidden';
-		hidden.name = hidden.id = 'content';		
-		this.element.appendChild(hidden);
-		this.textarea.name = this.textarea.id = 'cpCode';
-		$(this.textarea).addClassName('codepress');
-		$(this.textarea).addClassName(cpStyle);
-		//$(this.textarea).addClassName('linenumbers-on');
-		this.currentUseCp = true;
-		this.contentMainContainer = this.textarea.parentNode;
-		this.element.observe("editor:resize", function(event){
-			var cpIframe = $(this.contentMainContainer).select('iframe')[0];
-			if(!cpIframe) return;
-			if(event.memo && Object.isNumber(event.memo)){
-				cpIframe.setStyle({height:event.memo});
-			}else{
-				cpIframe.setStyle({width:'100%'});
-				fitHeightToBottom(cpIframe, this.element);
-			}
-		}.bind(this));
-		this.element.observe("editor:enterFS", function(e){this.textarea.value = this.element.select('iframe')[0].getCode();}.bind(this) );
-		this.element.observe("editor:exitFS", function(e){this.textarea.value = this.element.select('iframe')[0].getCode();}.bind(this) );
-		this.textarea.setStyle({width:'100%'});	
-		this.textarea.setAttribute('wrap', 'off');	
-		this.element.appendChild(this.textareaContainer);
-		this.textareaContainer.appendChild(this.textarea);
-		fitHeightToBottom($(this.textarea), $(modal.elementName));
-		// LOAD FILE NOW
-		this.loadFileContent(fileName);
-		if(window.ajxpMobile){
-			this.setFullScreen();
-			attachMobileScroll(this.textarea, "vertical");
-		}				
-	},
-			
-	saveFile : function(){
-		var connexion = this.prepareSaveConnexion();
-		var value;
-		value = this.element.select('iframe')[0].getCode();
-		this.textarea.value = value;		
-		connexion.addParameter('content', value);
-		connexion.sendAsync();
-	},
-		
-	parseTxt : function(transport){	
-		this.textarea.value = transport.responseText;
-		var contentObserver = function(el, value){
-			this.setModified(true);
-		}.bind(this);
-
-		this.textarea.id = 'cpCode_cp';
-		var code = new CodePress(this.textarea, contentObserver);
-		this.cpCodeObject = code;
-		this.textarea.parentNode.insertBefore(code, this.textarea);
-		this.contentMainContainer = this.textarea.parentNode;
-		this.element.observe("editor:close", function(){
-			this.cpCodeObject.close();
-			modal.clearContent(modal.dialogContent);		
-		}, this );			
-		this.removeOnLoad(this.textareaContainer);
-				
-	},
-
-	codePressStyle : function(fileName)
-	{	
-		if(Prototype.Browser.Opera) return "";
-		if(fileName.search('\.php$|\.php3$|\.php5$|\.phtml$') > -1) return "php";
-		else if (fileName.search("\.js$") > -1) return "javascript";
-		else if (fileName.search("\.java$") > -1) return "java";
-		else if (fileName.search("\.pl$") > -1) return "perl";
-		else if (fileName.search("\.sql$") > -1) return "sql";
-		else if (fileName.search("\.htm$|\.html$|\.xml$") > -1) return "html";
-		else if (fileName.search("\.css$") > -1) return "css";
-		else return "";	
-	}
-
-	
-});
\ No newline at end of file
diff --git a/core/src/plugins/editor.codepress/codepress/codepress.css b/core/src/plugins/editor.codepress/codepress/codepress.css
deleted file mode 100644
index d83a06e343..0000000000
--- a/core/src/plugins/editor.codepress/codepress/codepress.css
+++ /dev/null
@@ -1,7 +0,0 @@
-body {margin-top:13px;_margin-top:14px;background:white;font-family:monospace;font-size:13px;margin-left:32px;white-space:pre;background-image:url("images/line-numbers.png");background-repeat:repeat-y;background-position:0 3px;line-height:16px;}
-html>body{background-position:0 2px;}
-P {margin:0;padding:0;border:0;outline:0;display:block;white-space:pre;}
-b, i, s, u, a, em, tt, ins, big, cite, strong {text-decoration:none;font-weight:normal;font-style:normal;font-size:13px;}
-
-body.hide-line-numbers {background:white;margin-left:16px;}
-body.show-line-numbers {background-image:url("images/line-numbers.png");margin-left:32px;}
\ No newline at end of file
diff --git a/core/src/plugins/editor.codepress/codepress/codepress.html b/core/src/plugins/editor.codepress/codepress/codepress.html
deleted file mode 100644
index 642b1708ce..0000000000
--- a/core/src/plugins/editor.codepress/codepress/codepress.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-<head>
-	<title>CodePress - Real Time Syntax Highlighting Editor written in JavaScript</title>
-	<meta name="description" content="CodePress - source code editor window" />
-
-	<script type="text/javascript">
-	var language = 'generic';
-	var engine = 'older';
-	var ua = navigator.userAgent;
-	var ts = (new Date).getTime(); // timestamp to avoid cache
-	var lh = location.href;
-	
-	if(ua.match('MSIE')) engine = 'msie';
-	else if(ua.match('AppleWebKit')) engine = 'webkit'; 
-	else if(ua.match('Opera')) engine = 'opera'; 
-	else if(ua.match('Gecko')) engine = 'gecko';
-
-	if(lh.match('language=')) language = lh.replace(/.*language=(.*?)(&.*)?$/,'$1');
-
-	document.write('<link type="text/css" href="codepress.css?ts='+ts+'" rel="stylesheet" />');
-	document.write('<link type="text/css" href="languages/'+language+'.css?ts='+ts+'" rel="stylesheet" id="cp-lang-style" />');
-	document.write('<scr'+'ipt type="text/javascript" src="engines/'+engine+'.js?ts='+ts+'"></scr'+'ipt>');
-	document.write('<scr'+'ipt type="text/javascript" src="languages/'+language+'.js?ts='+ts+'"></scr'+'ipt>');
-	</script>
-
-</head>
-
-<script type="text/javascript">
-if(engine == "msie" || engine == "gecko" || engine == "webkit") document.write('<body><pre> </pre></body>');
-else if(engine == "opera") document.write('<body></body>');
-</script>
-
-</html>
diff --git a/core/src/plugins/editor.codepress/codepress/codepress.js b/core/src/plugins/editor.codepress/codepress/codepress.js
deleted file mode 100644
index e6a8a701be..0000000000
--- a/core/src/plugins/editor.codepress/codepress/codepress.js
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * CodePress - Real Time Syntax Highlighting Editor written in JavaScript - http://codepress.org/
- * 
- * Copyright (C) 2006 Fernando M.A.d.S. <fermads@gmail.com>
- *
- * This program 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.
- * 
- * Read the full licence: http://www.opensource.org/licenses/lgpl-license.php
- */
-
-CodePress = function(obj, contentObserver) {
-	var self = document.createElement('iframe');
-	self.textarea = obj;
-	self.textarea.disabled = true;
-	self.textarea.style.overflow = 'hidden';
-	self.style.height = self.textarea.clientHeight +'px';
-	self.style.width = self.textarea.clientWidth +'px';
-	self.textarea.style.overflow = 'auto';
-	self.style.border = '1px solid gray';
-	self.frameBorder = 0; // remove IE internal iframe border
-	self.style.visibility = 'hidden';
-	self.style.position = 'absolute';
-	self.options = self.textarea.className;
-	self.contentObserver = contentObserver;
-	
-	self.initialize = function() {
-		self.editor = self.contentWindow.CodePress;
-		self.editor.body = self.contentWindow.document.getElementsByTagName('body')[0];
-		self.editor.setCode(self.textarea.value);
-		self.setOptions();
-		self.editor.syntaxHighlight('init');
-		self.textarea.style.display = 'none';
-		self.style.position = 'static';
-		self.style.visibility = 'visible';
-		self.style.display = 'inline';
-		if(self.contentObserver){
-			self.pe = new PeriodicalExecuter(function(pe){
-				if(self.interrupt){pe.stop();return;}
-				var crtCode = self.getCode();
-				if(!self.prevCode){ self.prevCode = crtCode; return;}
-				if(self.prevCode != crtCode) self.contentObserver();
-				self.prevCode = crtCode;
-				return;				
-			}, 0.2);
-		}
-	} ;
-
-	self.close = function(){
-		self.interrupt = true;
-	} ;
-	
-	self.edit = function(id,language) {
-		if(id) self.textarea.value = document.getElementById(id).value;
-		if(!self.textarea.disabled) return;
-		self.language = language ? language : self.options.replace(/ ?codepress ?| ?readonly-on ?| ?autocomplete-off ?| ?linenumbers-off ?/g,'');
-		if(!CodePress.languages[self.language]) self.language = 'generic';
-		self.src = CodePress.path+'codepress.html?language='+self.language+'&ts='+(new Date).getTime();
-		if(self.attachEvent) self.attachEvent('onload',self.initialize);
-		else self.addEventListener('load',self.initialize,false);
-	} ;
-
-	self.setOptions = function() {
-		if(self.options.match('autocomplete-off')) self.toggleAutoComplete();
-		if(self.options.match('readonly-on')) self.toggleReadOnly();
-		if(self.options.match('linenumbers-off')) self.toggleLineNumbers();
-	};
-	
-	self.getCode = function() {
-		return self.textarea.disabled ? self.editor.getCode() : self.textarea.value;
-	};
-
-	self.setCode = function(code) {
-		self.textarea.disabled ? self.editor.setCode(code) : self.textarea.value = code;
-	};
-
-	self.toggleAutoComplete = function() {
-		self.editor.autocomplete = (self.editor.autocomplete) ? false : true;
-	};
-	
-	self.toggleReadOnly = function() {
-		self.textarea.readOnly = (self.textarea.readOnly) ? false : true;
-		if(self.style.display != 'none') // prevent exception on FF + iframe with display:none
-			self.editor.readOnly(self.textarea.readOnly ? true : false);
-	};
-	
-	self.toggleLineNumbers = function() {
-		var cn = self.editor.body.className;
-		self.editor.body.className = (cn==''||cn=='show-line-numbers') ? 'hide-line-numbers' : 'show-line-numbers';
-	};
-	
-	self.toggleEditor = function() {
-		if(self.textarea.disabled) {
-			self.textarea.value = self.getCode();
-			self.textarea.disabled = false;
-			self.style.display = 'none';
-			self.textarea.style.display = 'inline';
-		}
-		else {
-			self.textarea.disabled = true;
-			self.setCode(self.textarea.value);
-			self.editor.syntaxHighlight('init');
-			self.style.display = 'inline';
-			self.textarea.style.display = 'none';
-		}
-	};
-
-	self.edit();
-	return self;
-};
-
-CodePress.languages = {	
-	css : 'CSS', 
-	generic : 'Generic',
-	html : 'HTML',
-	java : 'Java', 
-	javascript : 'JavaScript', 
-	perl : 'Perl', 
-	ruby : 'Ruby',	
-	php : 'PHP', 
-	text : 'Text', 
-	sql : 'SQL'
-};
-
-CodePress.path = 'plugins/editor.codepress/codepress/';
-/*
-CodePress.run = function() {
-	s = document.getElementsByTagName('script');
-	for(var i=0,n=s.length;i<n;i++) {
-		if(s[i].src.match('codepress.js')) {
-			CodePress.path = s[i].src.replace('codepress.js','');
-		}
-	}
-	t = document.getElementsByTagName('textarea');
-	for(var i=0,n=t.length;i<n;i++) {
-		if(t[i].className.match('codepress')) {
-			id = t[i].id;
-			t[i].id = id+'_cp';
-			eval(id+' = new CodePress(t[i])');
-			t[i].parentNode.insertBefore(eval(id), t[i]);
-		} 
-	}
-} ;
-
-if(window.attachEvent) window.attachEvent('onload',CodePress.run);
-else window.addEventListener('DOMContentLoaded',CodePress.run,false);
-*/
\ No newline at end of file
diff --git a/core/src/plugins/editor.codepress/codepress/engines/gecko.js b/core/src/plugins/editor.codepress/codepress/engines/gecko.js
deleted file mode 100644
index 1838adf914..0000000000
--- a/core/src/plugins/editor.codepress/codepress/engines/gecko.js
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * CodePress - Real Time Syntax Highlighting Editor written in JavaScript - http://codepress.org/
- * 
- * Copyright (C) 2007 Fernando M.A.d.S. <fermads@gmail.com>
- *
- * Contributors :
- *
- * 	Michael Hurni <michael.hurni@gmail.com>
- *
- * This program 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.
- * 
- * Read the full licence: http://www.opensource.org/licenses/lgpl-license.php
- */
-
-
-CodePress = {
-	scrolling : false,
-	autocomplete : true,
-
-	// set initial vars and start sh
-	initialize : function() {
-		if(typeof(editor)=='undefined' && !arguments[0]) return;
-		chars = '|32|46|62|'; // charcodes that trigger syntax highlighting
-		cc = '\u2009'; // control char
-		editor = document.getElementsByTagName('body')[0];
-		document.designMode = 'on';
-		document.addEventListener('keypress', this.keyHandler, true);
-		window.addEventListener('scroll', function() { if(!CodePress.scrolling) CodePress.syntaxHighlight('scroll') }, false);
-		completeChars = this.getCompleteChars();
-//		CodePress.syntaxHighlight('init');
-	},
-
-	// treat key bindings
-	keyHandler : function(evt) {
-    	keyCode = evt.keyCode;	
-		charCode = evt.charCode;
-
-		if((evt.ctrlKey || evt.metaKey) && evt.shiftKey && charCode!=90)  { // shortcuts = ctrl||appleKey+shift+key!=z(undo) 
-			CodePress.shortcuts(charCode?charCode:keyCode);
-		}
-		else if(completeChars.indexOf('|'+String.fromCharCode(charCode)+'|')!=-1 && CodePress.autocomplete) { // auto complete
-			CodePress.complete(String.fromCharCode(charCode));
-		}
-	    else if(chars.indexOf('|'+charCode+'|')!=-1||keyCode==13) { // syntax highlighting
-		 	CodePress.syntaxHighlight('generic');
-		}
-		else if(keyCode==9 || evt.tabKey) {  // snippets activation (tab)
-			CodePress.snippets(evt);
-		}
-		else if(keyCode==46||keyCode==8) { // save to history when delete or backspace pressed
-		 	CodePress.actions.history[CodePress.actions.next()] = editor.innerHTML;
-		}
-		else if((charCode==122||charCode==121||charCode==90) && evt.ctrlKey) { // undo and redo
-			(charCode==121||evt.shiftKey) ? CodePress.actions.redo() :  CodePress.actions.undo(); 
-			evt.preventDefault();
-		}
-		else if(keyCode==86 && evt.ctrlKey)  { // paste
-			// TODO: pasted text should be parsed and highlighted
-		}
-	},
-
-	// put cursor back to its original position after every parsing
-	findString : function() {
-		if(self.find(cc))
-			window.getSelection().getRangeAt(0).deleteContents();
-	},
-	
-	// split big files, highlighting parts of it
-	split : function(code,flag) {
-		if(flag=='scroll') {
-			this.scrolling = true;
-			return code;
-		}
-		else {
-			this.scrolling = false;
-			mid = code.indexOf(cc);
-			if(mid-2000<0) {ini=0;end=4000;}
-			else if(mid+2000>code.length) {ini=code.length-4000;end=code.length;}
-			else {ini=mid-2000;end=mid+2000;}
-			code = code.substring(ini,end);
-			return code;
-		}
-	},
-	
-	// syntax highlighting parser
-	syntaxHighlight : function(flag) {
-		//if(document.designMode=='off') document.designMode='on'
-		if(flag!='init') window.getSelection().getRangeAt(0).insertNode(document.createTextNode(cc));
-
-		o = editor.innerHTML;
-		o = o.replace(/<br>/g,'\n');
-		o = o.replace(/<.*?>/g,'');
-		x = z = this.split(o,flag);
-		x = x.replace(/\n/g,'<br>');
-
-		if(arguments[1]&&arguments[2]) x = x.replace(arguments[1],arguments[2]);
-	
-		for(i=0;i<Language.syntax.length;i++) 
-			x = x.replace(Language.syntax[i].input,Language.syntax[i].output);
-
-		editor.innerHTML = this.actions.history[this.actions.next()] = (flag=='scroll') ? x : o.split(z).join(x); 
-		if(flag!='init') this.findString();
-	},
-	
-	getLastWord : function() {
-		var rangeAndCaret = CodePress.getRangeAndCaret();
-		var words = rangeAndCaret[0].substring(rangeAndCaret[1]-40,rangeAndCaret[1]).split(/[\s\r\n\);]/);
-		return words[words.length-1].replace(/_/g,'');
-	},
-	
-	snippets : function(evt) {
-		var snippets = Language.snippets;	
-		var trigger = this.getLastWord();
-		for (var i=0; i<snippets.length; i++) {
-			if(snippets[i].input == trigger) {
-				var content = snippets[i].output.replace(/</g,'&lt;');
-				content = content.replace(/>/g,'&gt;');
-				if(content.indexOf('$0')<0) content += cc;
-				else content = content.replace(/\$0/,cc);
-				content = content.replace(/\n/g,'<br>');
-				var pattern = new RegExp(trigger+cc,'g');
-				evt.preventDefault(); // prevent the tab key from being added
-				this.syntaxHighlight('snippets',pattern,content);
-			}
-		}
-	},
-	
-	readOnly : function() {
-		document.designMode = (arguments[0]) ? 'off' : 'on';
-	},
-
-	complete : function(trigger) {
-		window.getSelection().getRangeAt(0).deleteContents();
-		var complete = Language.complete;
-		for (var i=0; i<complete.length; i++) {
-			if(complete[i].input == trigger) {
-				var pattern = new RegExp('\\'+trigger+cc);
-				var content = complete[i].output.replace(/\$0/g,cc);
-				parent.setTimeout(function () { CodePress.syntaxHighlight('complete',pattern,content)},0); // wait for char to appear on screen
-			}
-		}
-	},
-
-	getCompleteChars : function() {
-		var cChars = '';
-		for(var i=0;i<Language.complete.length;i++)
-			cChars += '|'+Language.complete[i].input;
-		return cChars+'|';
-	},
-
-	shortcuts : function() {
-		var cCode = arguments[0];
-		if(cCode==13) cCode = '[enter]';
-		else if(cCode==32) cCode = '[space]';
-		else cCode = '['+String.fromCharCode(charCode).toLowerCase()+']';
-		for(var i=0;i<Language.shortcuts.length;i++)
-			if(Language.shortcuts[i].input == cCode)
-				this.insertCode(Language.shortcuts[i].output,false);
-	},
-	
-	getRangeAndCaret : function() {	
-		var range = window.getSelection().getRangeAt(0);
-		var range2 = range.cloneRange();
-		var node = range.endContainer;			
-		var caret = range.endOffset;
-		range2.selectNode(node);	
-		return [range2.toString(),caret];
-	},
-	
-	insertCode : function(code,replaceCursorBefore) {
-		var range = window.getSelection().getRangeAt(0);
-		var node = window.document.createTextNode(code);
-		var selct = window.getSelection();
-		var range2 = range.cloneRange();
-		// Insert text at cursor position
-		selct.removeAllRanges();
-		range.deleteContents();
-		range.insertNode(node);
-		// Move the cursor to the end of text
-		range2.selectNode(node);		
-		range2.collapse(replaceCursorBefore);
-		selct.removeAllRanges();
-		selct.addRange(range2);
-	},
-	
-	// get code from editor
-	getCode : function() {
-		var code = editor.innerHTML;
-		code = code.replace(/<br>/g,'\n');
-		code = code.replace(/\u2009/g,'');
-		code = code.replace(/<.*?>/g,'');
-		code = code.replace(/&lt;/g,'<');
-		code = code.replace(/&gt;/g,'>');
-		code = code.replace(/&amp;/gi,'&');
-		return code;
-	},
-
-	// put code inside editor
-	setCode : function() {
-		var code = arguments[0];
-		code = code.replace(/\u2009/gi,'');
-		code = code.replace(/&/gi,'&amp;');
-       	code = code.replace(/</g,'&lt;');
-        code = code.replace(/>/g,'&gt;');
-		editor.innerHTML = code;
-	},
-
-	// undo and redo methods
-	actions : {
-		pos : -1, // actual history position
-		history : [], // history vector
-		
-		undo : function() {
-			if(editor.innerHTML.indexOf(cc)==-1){
-				window.getSelection().getRangeAt(0).insertNode(document.createTextNode(cc));
-			 	this.history[this.pos] = editor.innerHTML;
-			}
-			this.pos--;
-			if(typeof(this.history[this.pos])=='undefined') this.pos++;
-			editor.innerHTML = this.history[this.pos];
-			CodePress.findString();
-		},
-		
-		redo : function() {
-			this.pos++;
-			if(typeof(this.history[this.pos])=='undefined') this.pos--;
-			editor.innerHTML = this.history[this.pos];
-			CodePress.findString();
-		},
-		
-		next : function() { // get next vector position and clean old ones
-			if(this.pos>20) this.history[this.pos-21] = undefined;
-			return ++this.pos;
-		}
-	}
-}
-
-Language={};
-window.addEventListener('load', function() { CodePress.initialize('new'); }, true);
\ No newline at end of file
diff --git a/core/src/plugins/editor.codepress/codepress/engines/khtml.js b/core/src/plugins/editor.codepress/codepress/engines/khtml.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/core/src/plugins/editor.codepress/codepress/engines/msie.js b/core/src/plugins/editor.codepress/codepress/engines/msie.js
deleted file mode 100644
index 1f18c7ab45..0000000000
--- a/core/src/plugins/editor.codepress/codepress/engines/msie.js
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * CodePress - Real Time Syntax Highlighting Editor written in JavaScript - http://codepress.org/
- * 
- * Copyright (C) 2007 Fernando M.A.d.S. <fermads@gmail.com>
- *
- * Contributors :
- *
- * 	Michael Hurni <michael.hurni@gmail.com>
- *
- * This program 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.
- * 
- * Read the full licence: http://www.opensource.org/licenses/lgpl-license.php
- */
-
-
-CodePress = {
-	scrolling : false,
-	autocomplete : true,
-	
-	// set initial vars and start sh
-	initialize : function() {
-		if(typeof(editor)=='undefined' && !arguments[0]) return;
-		chars = '|32|46|62|'; // charcodes that trigger syntax highlighting
-		cc = '\u2009'; // control char
-		editor = document.getElementsByTagName('pre')[0];
-		editor.contentEditable = 'true';
-		document.getElementsByTagName('body')[0].onfocus = function() {editor.focus();}
-		document.attachEvent('onkeydown', this.metaHandler);
-		document.attachEvent('onkeypress', this.keyHandler);
-		window.attachEvent('onscroll', function() { if(!CodePress.scrolling) setTimeout(function(){CodePress.syntaxHighlight('scroll')},1)});
-		completeChars = this.getCompleteChars();
-//		CodePress.syntaxHighlight('init');
-		setTimeout(function() { window.scroll(0,0) },50); // scroll IE to top
-	},
-	
-	// treat key bindings
-	keyHandler : function(evt) {
-		charCode = evt.keyCode;
-		if(completeChars.indexOf('|'+String.fromCharCode(charCode)+'|')!=-1 && CodePress.autocomplete) { // auto complete
-			CodePress.complete(String.fromCharCode(charCode))
-		}
-	    else if(chars.indexOf('|'+charCode+'|')!=-1||charCode==13) { // syntax highlighting
-		 	CodePress.syntaxHighlight('generic');
-		}
-	},
-
-	metaHandler : function(evt) {
-		keyCode = evt.keyCode;
-		if(keyCode==9 || evt.tabKey) { 
-			CodePress.snippets();
-		}
-		else if((keyCode==122||keyCode==121||keyCode==90) && evt.ctrlKey) { // undo and redo
-			(keyCode==121||evt.shiftKey) ? CodePress.actions.redo() :  CodePress.actions.undo(); 
-			evt.returnValue = false;
-		}
-		else if(keyCode==34||keyCode==33) { // handle page up/down for IE
-			self.scrollBy(0, (keyCode==34) ? 200 : -200); 
-			evt.returnValue = false;
-		}
-		else if(keyCode==46||keyCode==8) { // save to history when delete or backspace pressed
-		 	CodePress.actions.history[CodePress.actions.next()] = editor.innerHTML;
-		}
-		else if((evt.ctrlKey || evt.metaKey) && evt.shiftKey && keyCode!=90)  { // shortcuts = ctrl||appleKey+shift+key!=z(undo) 
-			CodePress.shortcuts(keyCode);
-			evt.returnValue = false;
-		}
-		else if(keyCode==86 && evt.ctrlKey)  { // paste
-			// TODO: pasted text should be parsed and highlighted
-		}
-	},
-
-	// put cursor back to its original position after every parsing
-	findString : function() {
-	    range = self.document.body.createTextRange();
-		if(range.findText(cc)){
-			range.select();
-			range.text = '';
-		}
-	},
-	
-	// split big files, highlighting parts of it
-	split : function(code,flag) {
-		if(flag=='scroll') {
-			this.scrolling = true;
-			return code;
-		}
-		else {
-			this.scrolling = false;
-			mid = code.indexOf(cc);
-			if(mid-2000<0) {ini=0;end=4000;}
-			else if(mid+2000>code.length) {ini=code.length-4000;end=code.length;}
-			else {ini=mid-2000;end=mid+2000;}
-			code = code.substring(ini,end);
-			return code.substring(code.indexOf('<P>'),code.lastIndexOf('</P>')+4);
-		}
-	},
-	
-	// syntax highlighting parser
-	syntaxHighlight : function(flag) {
-		if(flag!='init') document.selection.createRange().text = cc;
-		o = editor.innerHTML;
-		o = o.replace(/<P>/g,'\n');
-		o = o.replace(/<\/P>/g,'\r');
-		o = o.replace(/<.*?>/g,'');
-		o = o.replace(/&nbsp;/g,'');			
-		o = '<PRE><P>'+o+'</P></PRE>';
-		o = o.replace(/\n\r/g,'<P></P>');
-		o = o.replace(/\n/g,'<P>');
-		o = o.replace(/\r/g,'<\/P>');
-		o = o.replace(/<P>(<P>)+/,'<P>');
-		o = o.replace(/<\/P>(<\/P>)+/,'</P>');
-		o = o.replace(/<P><\/P>/g,'<P><BR/></P>');
-		x = z = this.split(o,flag);
-
-		if(arguments[1]&&arguments[2]) x = x.replace(arguments[1],arguments[2]);
-	
-		for(i=0;i<Language.syntax.length;i++) 
-			x = x.replace(Language.syntax[i].input,Language.syntax[i].output);
-			
-		editor.innerHTML = this.actions.history[this.actions.next()] = (flag=='scroll') ? x : o.replace(z,x);
-		if(flag!='init') this.findString();
-	},
-
-	snippets : function(evt) {
-		var snippets = Language.snippets;
-		var trigger = this.getLastWord();
-		for (var i=0; i<snippets.length; i++) {
-			if(snippets[i].input == trigger) {
-				var content = snippets[i].output.replace(/</g,'&lt;');
-				content = content.replace(/>/g,'&gt;');
-				if(content.indexOf('$0')<0) content += cc;
-				else content = content.replace(/\$0/,cc);
-				content = content.replace(/\n/g,'</P><P>');
-				var pattern = new RegExp(trigger+cc);
-				this.syntaxHighlight('snippets',pattern,content);
-			}
-		}
-	},
-	
-	readOnly : function() {
-		editor.contentEditable = (arguments[0]) ? 'false' : 'true';
-	},
-	
-	complete : function(trigger) {
-		var complete = Language.complete;
-		for (var i=0; i<complete.length; i++) {
-			if(complete[i].input == trigger) {
-				var pattern = new RegExp('\\'+trigger+cc);
-				var content = complete[i].output.replace(/\$0/g,cc);
-				setTimeout(function () { CodePress.syntaxHighlight('complete',pattern,content)},0); // wait for char to appear on screen
-			}
-		}
-	},
-	
-	getCompleteChars : function() {
-		var cChars = '';
-		for(var i=0;i<Language.complete.length;i++)
-			cChars += '|'+Language.complete[i].input;
-		return cChars+'|';
-	},
-
-	shortcuts : function() {
-		var cCode = arguments[0];
-		if(cCode==13) cCode = '[enter]';
-		else if(cCode==32) cCode = '[space]';
-		else cCode = '['+String.fromCharCode(keyCode).toLowerCase()+']';
-		for(var i=0;i<Language.shortcuts.length;i++)
-			if(Language.shortcuts[i].input == cCode)
-				this.insertCode(Language.shortcuts[i].output,false);
-	},
-	
-	getLastWord : function() {
-		var rangeAndCaret = CodePress.getRangeAndCaret();
-		words = rangeAndCaret[0].substring(rangeAndCaret[1]-40,rangeAndCaret[1]);
-		words = words.replace(/[\s\r\);]/g,'\n').split('\n');
-		return words[words.length-1];
-	},
-
-	getRangeAndCaret : function() {	
-		var range = document.selection.createRange();
-		var caret = Math.abs(range.moveStart('character', -1000000)+1);
-		range = this.getCode();
-		range = range.replace(/\n\r/gi,'  ');
-		range = range.replace(/\n/gi,'');
-		return [range.toString(),caret];
-	},
-	
-	insertCode : function(code,replaceCursorBefore) {
-		var repdeb = '';
-		var repfin = '';
-		
-		if(replaceCursorBefore) { repfin = code; }
-		else { repdeb = code; }
-		
-		if(typeof document.selection != 'undefined') {
-			var range = document.selection.createRange();
-			range.text = repdeb + repfin;
-			range = document.selection.createRange();
-			range.move('character', -repfin.length);
-			range.select();	
-		}	
-	},
-
-	// get code from editor	
-	getCode : function() {
-		var code = editor.innerHTML;
-		code = code.replace(/<br>/g,'\n');
-		code = code.replace(/<\/p>/gi,'\r');
-		code = code.replace(/<p>/i,''); // IE first line fix
-		code = code.replace(/<p>/gi,'\n');
-		code = code.replace(/&nbsp;/gi,'');
-		code = code.replace(/\u2009/g,'');
-		code = code.replace(/<.*?>/g,'');
-		code = code.replace(/&lt;/g,'<');
-		code = code.replace(/&gt;/g,'>');
-		code = code.replace(/&amp;/gi,'&');
-		return code;
-	},
-
-	// put code inside editor
-	setCode : function() {
-		var code = arguments[0];
-		code = code.replace(/\u2009/gi,'');
-		code = code.replace(/&/gi,'&amp;');		
-       	code = code.replace(/</g,'&lt;');
-        code = code.replace(/>/g,'&gt;');
-		editor.innerHTML = '<pre>'+code+'</pre>';
-	},
-
-	
-	// undo and redo methods
-	actions : {
-		pos : -1, // actual history position
-		history : [], // history vector
-		
-		undo : function() {
-			if(editor.innerHTML.indexOf(cc)==-1){
-				document.selection.createRange().text = cc;
-			 	this.history[this.pos] = editor.innerHTML;
-			}
-			this.pos--;
-			if(typeof(this.history[this.pos])=='undefined') this.pos++;
-			editor.innerHTML = this.history[this.pos];
-			CodePress.findString();
-		},
-		
-		redo : function() {
-			this.pos++;
-			if(typeof(this.history[this.pos])=='undefined') this.pos--;
-			editor.innerHTML = this.history[this.pos];
-			CodePress.findString();
-		},
-		
-		next : function() { // get next vector position and clean old ones
-			if(this.pos>20) this.history[this.pos-21] = undefined;
-			return ++this.pos;
-		}
-	}
-}
-
-Language={};
-window.attachEvent('onload', function() { CodePress.initialize('new');});
\ No newline at end of file
diff --git a/core/src/plugins/editor.codepress/codepress/engines/older.js b/core/src/plugins/editor.codepress/codepress/engines/older.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/core/src/plugins/editor.codepress/codepress/engines/opera.js b/core/src/plugins/editor.codepress/codepress/engines/opera.js
deleted file mode 100644
index bbbc6d4ea6..0000000000
--- a/core/src/plugins/editor.codepress/codepress/engines/opera.js
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * CodePress - Real Time Syntax Highlighting Editor written in JavaScript - http://codepress.org/
- * 
- * Copyright (C) 2007 Fernando M.A.d.S. <fermads@gmail.com>
- *
- * Contributors :
- *
- * 	Michael Hurni <michael.hurni@gmail.com>
- *
- * This program 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.
- * 
- * Read the full licence: http://www.opensource.org/licenses/lgpl-license.php
- */
-
-
-CodePress = {
-	scrolling : false,
-	autocomplete : true,
-
-	// set initial vars and start sh
-	initialize : function() {
-		if(typeof(editor)=='undefined' && !arguments[0]) return;
-		chars = '|32|46|62|'; // charcodes that trigger syntax highlighting
-		cc = '\u2009'; // control char
-		editor = document.getElementsByTagName('body')[0];
-		document.designMode = 'on';
-		document.addEventListener('keyup', this.keyHandler, true);
-		window.addEventListener('scroll', function() { if(!CodePress.scrolling) CodePress.syntaxHighlight('scroll') }, false);
-		completeChars = this.getCompleteChars();
-//		CodePress.syntaxHighlight('init');
-	},
-
-	// treat key bindings
-	keyHandler : function(evt) {
-    	keyCode = evt.keyCode;	
-		charCode = evt.charCode;
-
-		if((evt.ctrlKey || evt.metaKey) && evt.shiftKey && charCode!=90)  { // shortcuts = ctrl||appleKey+shift+key!=z(undo) 
-			CodePress.shortcuts(charCode?charCode:keyCode);
-		}
-		else if(completeChars.indexOf('|'+String.fromCharCode(charCode)+'|')!=-1 && CodePress.autocomplete) { // auto complete
-			CodePress.complete(String.fromCharCode(charCode));
-		}
-	    else if(chars.indexOf('|'+charCode+'|')!=-1||keyCode==13) { // syntax highlighting
-		 	CodePress.syntaxHighlight('generic');
-		}
-		else if(keyCode==9 || evt.tabKey) {  // snippets activation (tab)
-			CodePress.snippets(evt);
-		}
-		else if(keyCode==46||keyCode==8) { // save to history when delete or backspace pressed
-		 	CodePress.actions.history[CodePress.actions.next()] = editor.innerHTML;
-		}
-		else if((charCode==122||charCode==121||charCode==90) && evt.ctrlKey) { // undo and redo
-			(charCode==121||evt.shiftKey) ? CodePress.actions.redo() :  CodePress.actions.undo(); 
-			evt.preventDefault();
-		}
-		else if(keyCode==86 && evt.ctrlKey)  { // paste
-			// TODO: pasted text should be parsed and highlighted
-		}
-	},
-
-	// put cursor back to its original position after every parsing
-	findString : function() {
-		var sel = window.getSelection();
-		var range = window.document.createRange();
-		var span = window.document.getElementsByTagName('span')[0];
-			
-		range.selectNode(span);
-		sel.removeAllRanges();
-		sel.addRange(range);
-		span.parentNode.removeChild(span);
-		//if(self.find(cc))
-		//window.getSelection().getRangeAt(0).deleteContents();
-	},
-	
-	// split big files, highlighting parts of it
-	split : function(code,flag) {
-		if(flag=='scroll') {
-			this.scrolling = true;
-			return code;
-		}
-		else {
-			this.scrolling = false;
-			mid = code.indexOf('<SPAN>');
-			if(mid-2000<0) {ini=0;end=4000;}
-			else if(mid+2000>code.length) {ini=code.length-4000;end=code.length;}
-			else {ini=mid-2000;end=mid+2000;}
-			code = code.substring(ini,end);
-			return code;
-		}
-	},
-	
-	// syntax highlighting parser
-	syntaxHighlight : function(flag) {
-		//if(document.designMode=='off') document.designMode='on'
-		if(flag!='init') {
-			var span = document.createElement('span');
-			window.getSelection().getRangeAt(0).insertNode(span);
-		}
-
-		o = editor.innerHTML;
-//		o = o.replace(/<br>/g,'\r\n');
-//		o = o.replace(/<(b|i|s|u|a|em|tt|ins|big|cite|strong)?>/g,'');
-		//alert(o)
-		o = o.replace(/<(?!span|\/span|br).*?>/gi,'');
-//		alert(o)
-//		x = o;
-		x = z = this.split(o,flag);
-		//alert(z)
-//		x = x.replace(/\r\n/g,'<br>');
-		x = x.replace(/\t/g, '        ');
-
-
-		if(arguments[1]&&arguments[2]) x = x.replace(arguments[1],arguments[2]);
-	
-		for(i=0;i<Language.syntax.length;i++) 
-			x = x.replace(Language.syntax[i].input,Language.syntax[i].output);
-
-		editor.innerHTML = this.actions.history[this.actions.next()] = (flag=='scroll') ? x : o.split(z).join(x); 
-
-		if(flag!='init') this.findString();
-	},
-	
-	getLastWord : function() {
-		var rangeAndCaret = CodePress.getRangeAndCaret();
-		var words = rangeAndCaret[0].substring(rangeAndCaret[1]-40,rangeAndCaret[1]).split(/[\s\r\n\);]/);
-		return words[words.length-1].replace(/_/g,'');
-	},
-	
-	snippets : function(evt) {
-		var snippets = Language.snippets;	
-		var trigger = this.getLastWord();
-		for (var i=0; i<snippets.length; i++) {
-			if(snippets[i].input == trigger) {
-				var content = snippets[i].output.replace(/</g,'&lt;');
-				content = content.replace(/>/g,'&gt;');
-				if(content.indexOf('$0')<0) content += cc;
-				else content = content.replace(/\$0/,cc);
-				content = content.replace(/\n/g,'<br>');
-				var pattern = new RegExp(trigger+cc,'g');
-				evt.preventDefault(); // prevent the tab key from being added
-				this.syntaxHighlight('snippets',pattern,content);
-			}
-		}
-	},
-	
-	readOnly : function() {
-		document.designMode = (arguments[0]) ? 'off' : 'on';
-	},
-
-	complete : function(trigger) {
-		window.getSelection().getRangeAt(0).deleteContents();
-		var complete = Language.complete;
-		for (var i=0; i<complete.length; i++) {
-			if(complete[i].input == trigger) {
-				var pattern = new RegExp('\\'+trigger+cc);
-				var content = complete[i].output.replace(/\$0/g,cc);
-				parent.setTimeout(function () { CodePress.syntaxHighlight('complete',pattern,content)},0); // wait for char to appear on screen
-			}
-		}
-	},
-
-	getCompleteChars : function() {
-		var cChars = '';
-		for(var i=0;i<Language.complete.length;i++)
-			cChars += '|'+Language.complete[i].input;
-		return cChars+'|';
-	},
-
-	shortcuts : function() {
-		var cCode = arguments[0];
-		if(cCode==13) cCode = '[enter]';
-		else if(cCode==32) cCode = '[space]';
-		else cCode = '['+String.fromCharCode(charCode).toLowerCase()+']';
-		for(var i=0;i<Language.shortcuts.length;i++)
-			if(Language.shortcuts[i].input == cCode)
-				this.insertCode(Language.shortcuts[i].output,false);
-	},
-	
-	getRangeAndCaret : function() {	
-		var range = window.getSelection().getRangeAt(0);
-		var range2 = range.cloneRange();
-		var node = range.endContainer;			
-		var caret = range.endOffset;
-		range2.selectNode(node);	
-		return [range2.toString(),caret];
-	},
-	
-	insertCode : function(code,replaceCursorBefore) {
-		var range = window.getSelection().getRangeAt(0);
-		var node = window.document.createTextNode(code);
-		var selct = window.getSelection();
-		var range2 = range.cloneRange();
-		// Insert text at cursor position
-		selct.removeAllRanges();
-		range.deleteContents();
-		range.insertNode(node);
-		// Move the cursor to the end of text
-		range2.selectNode(node);		
-		range2.collapse(replaceCursorBefore);
-		selct.removeAllRanges();
-		selct.addRange(range2);
-	},
-	
-	// get code from editor
-	getCode : function() {
-		var code = editor.innerHTML;
-		code = code.replace(/<br>/g,'\n');
-		code = code.replace(/\u2009/g,'');
-		code = code.replace(/<.*?>/g,'');
-		code = code.replace(/&lt;/g,'<');
-		code = code.replace(/&gt;/g,'>');
-		code = code.replace(/&amp;/gi,'&');
-		return code;
-	},
-
-	// put code inside editor
-	setCode : function() {
-		var code = arguments[0];
-		code = code.replace(/\u2009/gi,'');
-		code = code.replace(/&/gi,'&amp;');
-       	code = code.replace(/</g,'&lt;');
-        code = code.replace(/>/g,'&gt;');
-		editor.innerHTML = code;
-	},
-
-	// undo and redo methods
-	actions : {
-		pos : -1, // actual history position
-		history : [], // history vector
-		
-		undo : function() {
-			if(editor.innerHTML.indexOf(cc)==-1){
-				window.getSelection().getRangeAt(0).insertNode(document.createTextNode(cc));
-			 	this.history[this.pos] = editor.innerHTML;
-			}
-			this.pos--;
-			if(typeof(this.history[this.pos])=='undefined') this.pos++;
-			editor.innerHTML = this.history[this.pos];
-			CodePress.findString();
-		},
-		
-		redo : function() {
-			this.pos++;
-			if(typeof(this.history[this.pos])=='undefined') this.pos--;
-			editor.innerHTML = this.history[this.pos];
-			CodePress.findString();
-		},
-		
-		next : function() { // get next vector position and clean old ones
-			if(this.pos>20) this.history[this.pos-21] = undefined;
-			return ++this.pos;
-		}
-	}
-}
-
-Language={};
-window.addEventListener('load', function() { CodePress.initialize('new'); }, true);
diff --git a/core/src/plugins/editor.codepress/codepress/engines/webkit.js b/core/src/plugins/editor.codepress/codepress/engines/webkit.js
deleted file mode 100644
index 1da3a0fca5..0000000000
--- a/core/src/plugins/editor.codepress/codepress/engines/webkit.js
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * CodePress - Real Time Syntax Highlighting Editor written in JavaScript - http://codepress.org/
- * 
- * Copyright (C) 2007 Fernando M.A.d.S. <fermads@gmail.com>
- *
- * Developers:
- *		Fernando M.A.d.S. <fermads@gmail.com>
- *		Michael Hurni <michael.hurni@gmail.com>
- * Contributors: 	
- *		Martin D. Kirk
- *
- * This program 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.
- * 
- * Read the full licence: http://www.opensource.org/licenses/lgpl-license.php
- */
-
-CodePress = {
-	scrolling : false,
-	autocomplete : true,
-
-	// set initial vars and start sh
-	initialize : function() {
-
-		if(typeof(editor)=='undefined' && !arguments[0]) return;
-		body = document.getElementsByTagName('body')[0];
-		body.innerHTML = body.innerHTML.replace(/\n/g,"");
-		chars = '|32|46|62|8|'; // charcodes that trigger syntax highlighting
-		cc = '\u2009'; // carret char
-		
-		editor = document.getElementsByTagName('pre')[0];
-		document.designMode = 'on';
-		
-		document.addEventListener('keypress', this.keyHandler, true);
-		window.addEventListener('scroll', function() { if(!CodePress.scrolling) CodePress.syntaxHighlight('scroll') }, false);
-		completeChars = this.getCompleteChars();
-		completeEndingChars =  this.getCompleteEndingChars();
-	},
-
-	// treat key bindings
-	keyHandler : function(evt) {
-    	keyCode = evt.keyCode;	
-		charCode = evt.charCode;
-		fromChar = String.fromCharCode(charCode);
-
-		if((evt.ctrlKey || evt.metaKey) && evt.shiftKey && charCode!=90)  { // shortcuts = ctrl||appleKey+shift+key!=z(undo) 
-			CodePress.shortcuts(charCode?charCode:keyCode);
-		}
-		else if( (completeEndingChars.indexOf('|'+fromChar+'|')!= -1 || completeChars.indexOf('|'+fromChar+'|')!=-1) && CodePress.autocomplete) { // auto complete
-			if(!CodePress.completeEnding(fromChar))
-			     CodePress.complete(fromChar);
-		}
-	    else if(chars.indexOf('|'+charCode+'|')!=-1||keyCode==13) { // syntax highlighting
-			top.setTimeout(function(){CodePress.syntaxHighlight('generic');},100);
-		}
-		else if(keyCode==9 || evt.tabKey) {  // snippets activation (tab)
-			CodePress.snippets(evt);
-		}
-		else if(keyCode==46||keyCode==8) { // save to history when delete or backspace pressed
-		 	CodePress.actions.history[CodePress.actions.next()] = editor.innerHTML;
-		}
-		else if((charCode==122||charCode==121||charCode==90) && evt.ctrlKey) { // undo and redo
-			(charCode==121||evt.shiftKey) ? CodePress.actions.redo() :  CodePress.actions.undo(); 
-			evt.preventDefault();
-		}
-		else if(charCode==118 && evt.ctrlKey)  { // handle paste
-		 	top.setTimeout(function(){CodePress.syntaxHighlight('generic');},100);
-		}
-		else if(charCode==99 && evt.ctrlKey)  { // handle cut
-		 	//alert(window.getSelection().getRangeAt(0).toString().replace(/\t/g,'FFF'));
-		}
-
-	},
-
-	// put cursor back to its original position after every parsing
-	findString : function() {
-		if(self.find(cc))
-			window.getSelection().getRangeAt(0).deleteContents();
-	},
-	
-	// split big files, highlighting parts of it
-	split : function(code,flag) {
-		if(flag=='scroll') {
-			this.scrolling = true;
-			return code;
-		}
-		else {
-			this.scrolling = false;
-			mid = code.indexOf(cc);
-			if(mid-2000<0) {ini=0;end=4000;}
-			else if(mid+2000>code.length) {ini=code.length-4000;end=code.length;}
-			else {ini=mid-2000;end=mid+2000;}
-			code = code.substring(ini,end);
-			return code;
-		}
-	},
-	
-	getEditor : function() {
-		if(!document.getElementsByTagName('pre')[0]) {
-			body = document.getElementsByTagName('body')[0];
-			if(!body.innerHTML) return body;
-			if(body.innerHTML=="<br>") body.innerHTML = "<pre> </pre>";
-			else body.innerHTML = "<pre>"+body.innerHTML+"</pre>";
-		}
-		return document.getElementsByTagName('pre')[0];
-	},
-	
-	// syntax highlighting parser
-	syntaxHighlight : function(flag) {
-		//if(document.designMode=='off') document.designMode='on'
-		if(flag != 'init') { window.getSelection().getRangeAt(0).insertNode(document.createTextNode(cc));}
-		editor = CodePress.getEditor();
-		o = editor.innerHTML;
-		o = o.replace(/<br>/g,'\n');
-		o = o.replace(/<.*?>/g,'');
-		x = z = this.split(o,flag);
-		x = x.replace(/\n/g,'<br>');
-
-		if(arguments[1]&&arguments[2]) x = x.replace(arguments[1],arguments[2]);
-	
-		for(i=0;i<Language.syntax.length;i++) 
-			x = x.replace(Language.syntax[i].input,Language.syntax[i].output);
-
-		editor.innerHTML = this.actions.history[this.actions.next()] = (flag=='scroll') ? x : o.split(z).join(x);
-		if(flag!='init') this.findString();
-	},
-	
-	getLastWord : function() {
-		var rangeAndCaret = CodePress.getRangeAndCaret();
-		words = rangeAndCaret[0].substring(rangeAndCaret[1]-40,rangeAndCaret[1]);
-		words = words.replace(/[\s\n\r\);\W]/g,'\n').split('\n');
-		return words[words.length-1].replace(/[\W]/gi,'').toLowerCase();
-	},
-	
-	snippets : function(evt) {
-		var snippets = Language.snippets;	
-		var trigger = this.getLastWord();
-		for (var i=0; i<snippets.length; i++) {
-			if(snippets[i].input == trigger) {
-				var content = snippets[i].output.replace(/</g,'&lt;');
-				content = content.replace(/>/g,'&gt;');
-				if(content.indexOf('$0')<0) content += cc;
-				else content = content.replace(/\$0/,cc);
-				content = content.replace(/\n/g,'<br>');
-				var pattern = new RegExp(trigger+cc,'gi');
-				evt.preventDefault(); // prevent the tab key from being added
-				this.syntaxHighlight('snippets',pattern,content);
-			}
-		}
-	},
-	
-	readOnly : function() {
-		document.designMode = (arguments[0]) ? 'off' : 'on';
-	},
-
-	complete : function(trigger) {
-		window.getSelection().getRangeAt(0).deleteContents();
-		var complete = Language.complete;
-		for (var i=0; i<complete.length; i++) {
-			if(complete[i].input == trigger) {
-				var pattern = new RegExp('\\'+trigger+cc);
-				var content = complete[i].output.replace(/\$0/g,cc);
-				parent.setTimeout(function () { CodePress.syntaxHighlight('complete',pattern,content)},0); // wait for char to appear on screen
-			}
-		}
-	},
-
-	getCompleteChars : function() {
-		var cChars = '';
-		for(var i=0;i<Language.complete.length;i++)
-			cChars += '|'+Language.complete[i].input;
-		return cChars+'|';
-	},
-	
-	getCompleteEndingChars : function() {
-		var cChars = '';
-		for(var i=0;i<Language.complete.length;i++)
-			cChars += '|'+Language.complete[i].output.charAt(Language.complete[i].output.length-1);
-		return cChars+'|';
-	},
-	
-	completeEnding : function(trigger) {
-		var range = window.getSelection().getRangeAt(0);
-		try {
-			range.setEnd(range.endContainer, range.endOffset+1)
-		}
-		catch(e) {
-			return false;
-		}
-		var next_character = range.toString()
-		range.setEnd(range.endContainer, range.endOffset-1)
-		if(next_character != trigger) return false;
-		else {
-			range.setEnd(range.endContainer, range.endOffset+1)
-			range.deleteContents();
-			return true;
-		}
-	},
-	
-	shortcuts : function() {
-		var cCode = arguments[0];
-		if(cCode==13) cCode = '[enter]';
-		else if(cCode==32) cCode = '[space]';
-		else cCode = '['+String.fromCharCode(charCode).toLowerCase()+']';
-		for(var i=0;i<Language.shortcuts.length;i++)
-			if(Language.shortcuts[i].input == cCode)
-				this.insertCode(Language.shortcuts[i].output,false);
-	},
-	
-	getRangeAndCaret : function() {	
-		var range = window.getSelection().getRangeAt(0);
-		var range2 = range.cloneRange();
-		var node = range.endContainer;			
-		var caret = range.endOffset;
-		range2.selectNode(node);	
-		return [range2.toString(),caret];
-	},
-	
-	insertCode : function(code,replaceCursorBefore) {
-		var range = window.getSelection().getRangeAt(0);
-		var node = window.document.createTextNode(code);
-		var selct = window.getSelection();
-		var range2 = range.cloneRange();
-		// Insert text at cursor position
-		selct.removeAllRanges();
-		range.deleteContents();
-		range.insertNode(node);
-		// Move the cursor to the end of text
-		range2.selectNode(node);		
-		range2.collapse(replaceCursorBefore);
-		selct.removeAllRanges();
-		selct.addRange(range2);
-	},
-	
-	// get code from editor
-	getCode : function() {
-		if(!document.getElementsByTagName('pre')[0] || editor.innerHTML == '')
-			editor = CodePress.getEditor();
-		var code = editor.innerHTML;
-		code = code.replace(/<br>/g,'\n');
-		code = code.replace(/\u2009/g,'');
-		code = code.replace(/<.*?>/g,'');
-		code = code.replace(/&lt;/g,'<');
-		code = code.replace(/&gt;/g,'>');
-		code = code.replace(/&amp;/gi,'&');
-		return code;
-	},
-
-	// put code inside editor
-	setCode : function() {
-		var code = arguments[0];
-		code = code.replace(/\u2009/gi,'');
-		code = code.replace(/&/gi,'&amp;');
-		code = code.replace(/</g,'&lt;');
-		code = code.replace(/>/g,'&gt;');
-		
-		editor.innerHTML = code;
-		if (code == '')
-			document.getElementsByTagName('body')[0].innerHTML = '';
-	},
-
-	// undo and redo methods
-	actions : {
-		pos : -1, // actual history position
-		history : [], // history vector
-		
-		undo : function() {
-			editor = CodePress.getEditor();
-			if(editor.innerHTML.indexOf(cc)==-1){
-				if(editor.innerHTML != " ")
-					window.getSelection().getRangeAt(0).insertNode(document.createTextNode(cc));
-				this.history[this.pos] = editor.innerHTML;
-			}
-			this.pos --;
-			if(typeof(this.history[this.pos])=='undefined') this.pos ++;
-			editor.innerHTML = this.history[this.pos];
-			if(editor.innerHTML.indexOf(cc)>-1) editor.innerHTML+=cc;
-			CodePress.findString();
-		},
-		
-		redo : function() {
-			// editor = CodePress.getEditor();
-			this.pos++;
-			if(typeof(this.history[this.pos])=='undefined') this.pos--;
-			editor.innerHTML = this.history[this.pos];
-			CodePress.findString();
-		},
-		
-		next : function() { // get next vector position and clean old ones
-			if(this.pos>20) this.history[this.pos-21] = undefined;
-			return ++this.pos;
-		}
-	}
-}
-
-Language={};
-window.addEventListener('load', function() { CodePress.initialize('new'); }, true);
\ No newline at end of file
diff --git a/core/src/plugins/editor.codepress/codepress/images/line-numbers.png b/core/src/plugins/editor.codepress/codepress/images/line-numbers.png
deleted file mode 100644
index edc96d0216..0000000000
Binary files a/core/src/plugins/editor.codepress/codepress/images/line-numbers.png and /dev/null differ
diff --git a/core/src/plugins/editor.codepress/codepress/index.html b/core/src/plugins/editor.codepress/codepress/index.html
deleted file mode 100644
index 49f9a1b690..0000000000
--- a/core/src/plugins/editor.codepress/codepress/index.html
+++ /dev/null
@@ -1,437 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html>
-<head>
-	<title>CodePress - Real Time Syntax Highlighting Editor written in JavaScript</title>
-
-	<style>
-	body {color:#000;background-color:white;font:15px georgia, "Lucida Grande", "Lucida Sans Unicode", Arial, Helvetica, sans-serif; letter-spacing:0.01em;margin:15px;}
-	p {margin:0 0 15px 0;}
-	a,a:visited {color:#7f0055;}
-	select {background:#ffffe1;}
-	button {margin-top:5px;}
-	button.actions {width:171px;font-family:arial;}
-	h1 {color:#7f0055;margin:0;padding:0;font-size:42px;font-weight:normal;}
-	h1 a {text-decoration:none;}
-	h2 {margin:0;}
-	h2 a {text-decoration:none;font-weight:normal;font-size:22px;color:black !important;}
-	h3 {font-size:20px;font-weight:normal;padding:0;margin:25px 0 5px 0;color:#7f0055;font-weight:bold;border-bottom:2px dotted #d8d8d8;}
-	h4 {font-size:18px;font-weight:normal;z-index:0;}	
-	code {color:#0080c0;font-size:13px;font-weight:bold;}
-	ol, ul {padding:5px 0 5px 25px;margin:0;}
-	ol li, ul li {margin:8px 0 8px 0;}
-	
-	#logo {text-align:center;background-color:#d6d6d6;padding:10px;-moz-border-radius:5px;border:1px solid silver;}
-	#container {width:700px;margin:20px auto;padding:25px;border:3px solid #d9d9d9;-moz-border-radius:10px;background:#f8f8f8;}
-	#languages {margin:5px 0;}
-	
-	#menu {width:100%;background:#7f0055;-moz-border-radius:4px;}
-	#menu a {font:bold 17px georgia;color:white;padding:4px;display:block;border-left:1px solid white;text-align:center;text-decoration:none;}
-	#menu a:hover {background:#b9669e;} 
-
-	.hidden-code {display:none;}
-	.copycode {border:1px dotted gray;padding:10px;background:white;font-family:monospace;color:gray}
-	</style>
-
-</head>
-
-<body>
-<div id="container">
-
-<div id="logo">
-	<h1><a href="http://codepress.org/">CodePress</a></h1>
-	<h2><a href="http://codepress.org/">Online Real Time Syntax Highlighting Editor</a></h2>
-</div>
-
-<br />
-
-<table cellpadding="0" cellspacing="0" id="menu">
-<tr>
-	<td>
-		<a href="http://www.codepress.org/index.php">Home/Download</a>
-	</td>
-	<td>
-		<a href="http://www.codepress.org/install.php">&nbsp;&nbsp;Install&nbsp;&nbsp;</a>
-	</td>
-	<td>
-		<a href="http://www.codepress.org/to-do.php">&nbsp;&nbsp;To-do&nbsp;&nbsp;</a>
-	</td>
-	<td>
-		<a href="http://www.codepress.org/about.php" id="about">&nbsp;&nbsp;About&nbsp;&nbsp;</a>
-	</td>
-</tr>
-</table>
-
-<h4>
-	CodePress is web-based source code editor with syntax highlighting written in JavaScript that colors text in real time while it's being typed in the browser.
-</h4>
-	
-<p>
-	Go to <strong><a href="http://codepress.org/">http://codepress.org/</a></strong> for updates.
-</p>
-
-<h3>Demo</h3>
-<div id="languages">
-	<em>choose example in:</em> 
-	<button onclick="cp1.edit('cp-php','php')">PHP</button> 
-	<button onclick="cp1.edit('cp-javascript','javascript')">JavaScript</button> 
-	<button onclick="cp1.edit('cp-java','java')">Java</button>
-	<button onclick="cp1.edit('cp-perl','perl')">Perl</button>
-	<button onclick="cp1.edit('cp-sql','sql')">SQL</button>	
-	<button onclick="cp1.edit('cp-html','html')">HTML</button> 
-	<button onclick="cp1.edit('cp-css','css')">CSS</button> 	
-</div>
-
-<textarea id="cp1" class="codepress php" style="width:700px;height:300px;" wrap="off">
-<?php
-// Very simple implementation of server side script
-
-if(isset($_GET['file'])) {
-	$file = basename($_GET['file']);
-	$full_file = $path['server'].'/'.$path['webdocs'].'/'.$path['files']."/".$file;
-	if(file_exists($full_file)) {
-		$code = file_get_contents($full_file);
-		$code = preg_replace("/>/","&amp;gt;",$code);
-		$code = preg_replace("/</","&amp;lt;",$code);
-		$language = getLanguage($file);
-	}
-}
-?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-<head>
-	<title>CodePress - Real Time Syntax Highlighting Editor written in JavaScript</title>
-	<link type="text/css" href="languages/codepress-<?php print($language);?>.css" rel="stylesheet" id="cp-lang-style" />
-	<script type="text/javascript" src="codepress.js"></script>
-	<script type="text/javascript">
-		CodePress.language = '<?=$language?>';
-	</script>
-</head>
-<body id="ffedt"><pre id="ieedt"><?=$code?></pre></body>
-</html>
-</textarea>
-
-<br /><br />
-
-<textarea id="codepress2" class="codepress javascript linenumbers-off" style="width:700px;height:200px;" wrap="off">
-//set language
-this.setLanguage = function() {
-	if(arguments[0]) {
-		language = (typeof(Content.languages[arguments[0]])!='undefined') ? arguments[0] : this.setLanguage();
-		cpLanguage.innerHTML = Content.languages[language].name;
-		if(cpBody.document.designMode=='on') cpBody.document.designMode = 'off';
-		CodePress.loadScript(cpBody.document, '../languages/'+language+'.js', function () { cpBody.CodePress.syntaxHighlight('init'); })
-		cpBody.document.getElementById('cp-lang-style').href = '../languages/'+language+'.css';
-		this.hideMenu();
-	}
-	else {
-		var extension = filename.replace(/.*\.([^\.]+)$/,'$1');
-		var aux = false;
-		for(lang in Content.languages) {
-			extensions = ','+Content.languages[lang].extensions+',';
-			if(extensions.match(','+extension+',')) aux = lang;
-		}
-		language = (aux) ? aux : 'generic';
-	}
-}
-</textarea>
-
-<p>
-	<button class="actions" onclick="alert(codepress2.getCode())">get code from editor</button>
-	<button class="actions" onclick="codepress2.toggleEditor()">turn on/off CodePress</button>
-	<button class="actions" onclick="codepress2.toggleLineNumbers()">show/hide line numbers</button>
-	<button class="actions" onclick="codepress2.toggleAutoComplete()">turn on/off auto-complete</button>
-	<button class="actions" onclick="codepress2.toggleReadOnly()">turn on/off read only</button>
-</p>
-
-
-
-<h3>Installation</h3>
-<ol>
-	<li>
-		<p>
-			<a href="http://codepress.org/">Download</a> and uncompress CodePress under a directory inside your webserver.<br>
-			Example:<strong> http://yourserver/codepress/</strong><br />
-			Since CodePress is pure JavaScript and HTML, you can also test it without a webserver.
-		</p>
-	</li>
-	<li>
-		<p>
-			Insert CodePress script somewhere in your page inside the <code>&lt;head&gt;</code> or above the <code>&lt;/body&gt;</code> tag.
-		</p>
-	
-		<p class="copycode">
-			&lt;script src="/codepress/codepress.js" type="text/javascript"&gt;&lt;/script&gt;
-		</p>
-	</li>
-	
-	<li>
-		<p>
-			Add the <code>&lt;textarea&gt;</code> tag to the place on your page you want CodePress to appear. CodePress will inherit the width and height of your textarea.
-			When the page loads, it will automatically replace your textarea with a CodePress window.
-		</p>
-		<p class="copycode">
-			&lt;textarea id="myCpWindow" class="codepress javascript linenumbers-off"&gt;<br />
-			&nbsp;&nbsp;&nbsp;// your code here<br />
-			&lt;/textarea&gt;
-		</p>
-		<ul>
-			<li>
-				The <code>javascript</code> portion of the class="" means that the language being edited is JavaScript.
-			</li>
-			<li>
-				The <code>codepress</code> portion of the class="" is mandatory and indicates a textarea to be replaced for a CodePress window.
-			</li>
-			<li>
-				Other class options are <code>linenumbers-off</code>, <code>autocomplete-off</code> and <code>readonly-on</code>.
-			</li>			
-			<li>
-				Careful not to use the same id for two different CodePress windows (<code>&lt;textarea id="<strong>xx</strong>"...&gt;</code>)
-			</li>
-		</ul>
-
-	</li>
-</ol>
-
-<h3>You also can...</h3>
-<ol>
-	<li>
-		Open/edit code from a different textarea.<br />
-		Example: <code>textarea_id.edit('other_textarea_id','language')</code><br>
-	</li>
-	<li>
-		Get code from CodePress window.<br />
-		Example: <code>textarea_id.getCode()</code><br>
-	</li>
-	<li>
-		Turn on/off CodePress editor and return to the regular textarea.<br />
-		Example: <code>textarea_id.toggleEditor()</code><br>
-	</li>
-	<li>
-		Turn on/off line numbers.<br />
-		Example: <code>textarea_id.toggleLineNumbers()</code><br>
-	</li>
-	<li>
-		Turn on/off read only.<br />
-		Example: <code>textarea_id.toggleReadOnly()</code><br>
-	</li>
-	<li>
-		Turn on/off auto-complete.<br />
-		Example: <code>textarea_id.toggleAutoComplete()</code><br>
-	</li>
-	
-</ol>
-
-<!-- p>
-	You may want to use [id].getCode() to get the content code from CodePress window and save it to your server since CodePress only edit files and do not save them.
-</p>
-<p>
-	You may also want to open files from server. You'll have to write a server side script and replace the JavaScript call on codepress.js from codepress.html to codepress.php (if your server side language is PHP, of course).
-</p -->
-
-<h3>License</h3>
-<p>
-	CodePress is distributed under the <a href="http://www.opensource.org/licenses/lgpl-license.php">LGPL</a>. If your software is <a href="http://www.gnu.org/philosophy/license-list.html#GPLCompatibleLicenses">compatible</a> with this licence or it is under <a href="http://creativecommons.org/">Creative Commons</a>, you can use it as you want. Just keep the credits somewhere around.
-</p>
-
-
-</div><!--/container-->
-
-
-
-<!-- hidden codes for loading -->
-<textarea id="cp-php" class="hidden-code">
-<?php
-// Very simple implementation of server side script
-
-if(isset($_GET['file'])) {
-	$file = basename($_GET['file']);
-	$full_file = $path['server'].'/'.$path['webdocs'].'/'.$path['files']."/".$file;
-	if(file_exists($full_file)) {
-		$code = file_get_contents($full_file);
-		$code = preg_replace("/>/","&amp;gt;",$code);
-		$code = preg_replace("/</","&amp;lt;",$code);
-		$language = getLanguage($file);
-	}
-}
-?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-<head>
-	<title>CodePress - Real Time Syntax Highlighting Editor written in JavaScript</title>
-	<link type="text/css" href="languages/codepress-<?=$language?>.css" rel="stylesheet" id="cp-lang-style" />
-	<script type="text/javascript" src="codepress.js"></script>
-	<script type="text/javascript">
-		CodePress.language = '<?=$language?>';
-	</script>
-</head>
-<body id="ffedt"><pre id="ieedt"><?=$code?></pre></body>
-</html>
-</textarea>
-
-<textarea id="cp-javascript" class="hidden-code">
-CodePress = function(obj) {
-	var self = document.createElement('iframe');
-	self.textarea = obj;
-	self.textarea.disabled = true;
-	self.style.height = self.textarea.clientHeight +'px';
-	self.style.width = self.textarea.clientWidth +'px';
-	
-	self.initialize = function() {
-		self.editor = self.contentWindow.CodePress;
-		self.editor.body = self.contentWindow.document.getElementsByTagName('body')[0];
-		self.editor.setCode(self.textarea.value);
-		self.editor.syntaxHighlight('init');
-	}
-	
-	self.edit = function(id,language) {
-		self.language = (language) ? language : self.textarea.className.replace(/ ?codepress ?/,'');
-		self.src = cpPath+'modules/codepress.html?engine='+self.getEngine()+'&language='+self.language;
-		if(self.attachEvent) self.attachEvent('onload',self.initialize);
-		else self.addEventListener('load',self.initialize,false);
-	}
-}
-</textarea>
-
-
-<textarea id="cp-java" class="hidden-code">
-import java.io.FileFilter;
-import java.io.IOException;
-import java.io.PrintWriter;
-
-/**
- * Project ECCO - File manager class
- * @author Fernando M.A.d.S.
- */
-public class FileManager extends HttpServlet {
-
-	private static final long serialVersionUID = 1L;
-	private static String login = "feanndor"; // session var should come here
-	private static String usersPath = System.getProperty("user.dir")+File.separator+"htdocs"+File.separator+"ecco"+File.separator+"users"+File.separator;
-	private static File dir = new File(usersPath+login+File.separator);
-	static boolean existDirectories = false;
-	static int isDirectory = 0;
-
-	public FileFilter filterFiles(File dir) {
-		return (new FileFilter() {
-			public boolean accept(File pathname) {
-				return !(pathname.isDirectory());
-			}
-		});
-	}
-}
-</textarea>
-
-<textarea id="cp-perl" class="hidden-code">
-#!/usr/bin/perl      
-# The first line of the script envokes Perl 
-
-# Scalar variables
-$var1 = "Hello World";   
-$var2 = 14.6;
-
-# Array variables
-@arr1 = ("zero","one","two","three","four");
-
-# Hash variable, or associative array
-%hash1 = ("one","Monday","two", "Tuesday","three", "Wednesday","four","Thursday");
-
-# Some simple printing
-print $var1; 
-
-# Subroutine
-sub test() {
-	print "ok";
-}
-</textarea>
-
-<textarea id="cp-sql" class="hidden-code">
---
--- simple select example
--- 
-SELECT * FROM books
-	WHERE price > 100.00 and price < 150.00
-	ORDER BY title
-
-SELECT books.title, count(*) AS Authors
-	FROM books
-	JOIN book_authors 
-		ON books.book_number = book_authors.book_number
-	GROUP BY books.title
-
--- insert, update and delete examples
-	
-INSERT INTO my_table (field1, field2, field3) VALUES ('test', 'N', NULL);
-
-BEGIN WORK;
-	UPDATE inventory SET quantity = quantity - 3 WHERE item = 'pants';
-COMMIT;
-</textarea>
-
-<textarea id="cp-html" class="hidden-code">
-
-<html>
-<head>
-	<title>CodePress - Online Real Time Syntax Highlighting Editor</title>
-
-	<style type="text/css">
-	@import url(styles.css);	
-	</style>
-	<script type="text/javascript">
-	function getCode() {
-		alert(textWithoutHighlighting);
-	}
-	</script>
-</head>
-<body>
-<div id="logo">
-	<h1><a href="http://codepress.org/">CodePress</a></h1>
-	<h2>Online Real Time Syntax Highlighting Editor</h2>
-	<img src="testimage.gif" />
-</div>
-<div id="languages">
-	<em>choose language:</em> 
-	<button onclick="edit('codepress.php',this)" id="default">PHP</button> 
-	<button onclick="edit('FileManager.java',this)">Java</button> 
-</div>
-</body>
-</html>
-</textarea>
-
-<textarea id="cp-css" class="hidden-code">
-/* CSS comment */
-
-body {
-	color:#000;
-	background-color:white;
-	font:15px Georgia, "Lucida Grande", Arial, sans-serif; 
-	letter-spacing:0.01em;
-	margin:15px;
-}
-
-p { 
-	margin:0 0 15px 0; 
-}
-
-a,a:visited {
-	color:#7f0055;
-}
-
-select {
-	background:#ffffe1;
-}
-
-h1 {
-	color:#7f0055;
-	margin:0;
-	padding:0;
-	font-size:42px;
-}
-</textarea>
-
-
-<script src="codepress.js" type="text/javascript"></script>
-</body>
-</html>
diff --git a/core/src/plugins/editor.codepress/codepress/languages/css.css b/core/src/plugins/editor.codepress/codepress/languages/css.css
deleted file mode 100644
index 64778d203a..0000000000
--- a/core/src/plugins/editor.codepress/codepress/languages/css.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * CodePress color styles for CSS syntax highlighting
- */
-
-b, b a, b u {color:#000080;} /* tags, ids, classes */
-i, i b, i s, i a, i u {color:gray;} /* comments */
-s, s b {color:#a0a0dd;} /* parameters */
-a {color:#0000ff;} /* keys */
-u {color:red;} /* values */
-
diff --git a/core/src/plugins/editor.codepress/codepress/languages/css.js b/core/src/plugins/editor.codepress/codepress/languages/css.js
deleted file mode 100644
index 00dcce0b0e..0000000000
--- a/core/src/plugins/editor.codepress/codepress/languages/css.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * CodePress regular expressions for CSS syntax highlighting
- */
-
-// CSS
-Language.syntax = [
-	{ input : /(.*?){(.*?)}/g,output : '<b>$1</b>{<u>$2</u>}' }, // tags, ids, classes, values
-	{ input : /([\w-]*?):([^\/])/g,output : '<a>$1</a>:$2' }, // keys
-	{ input : /\((.*?)\)/g,output : '(<s>$1</s>)' }, // parameters
-	{ input : /\/\*(.*?)\*\//g,output : '<i>/*$1*/</i>'} // comments
-]
-
-Language.snippets = []
-
-Language.complete = [
-	{ input : '\'',output : '\'$0\'' },
-	{ input : '"', output : '"$0"' },
-	{ input : '(', output : '\($0\)' },
-	{ input : '[', output : '\[$0\]' },
-	{ input : '{', output : '{\n\t$0\n}' }		
-]
-
-Language.shortcuts = []
diff --git a/core/src/plugins/editor.codepress/codepress/languages/generic.css b/core/src/plugins/editor.codepress/codepress/languages/generic.css
deleted file mode 100644
index 3d52b6b001..0000000000
--- a/core/src/plugins/editor.codepress/codepress/languages/generic.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * CodePress color styles for generic syntax highlighting
- */
-
-b {color:#7F0055;font-weight:bold;} /* reserved words */
-u {color:darkblue;font-weight:bold;} /* special words */
-i, i b, i s, i u, i em {color:green;font-weight:normal;} /* comments */
-s, s b, s em {color:#2A00FF;font-weight:normal;} /* strings */
-em {font-weight:bold;} /* special chars */
\ No newline at end of file
diff --git a/core/src/plugins/editor.codepress/codepress/languages/generic.js b/core/src/plugins/editor.codepress/codepress/languages/generic.js
deleted file mode 100644
index 8289da0835..0000000000
--- a/core/src/plugins/editor.codepress/codepress/languages/generic.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * CodePress regular expressions for generic syntax highlighting
- */
- 
-// generic languages
-Language.syntax = [
-	{ input : /\"(.*?)(\"|<br>|<\/P>)/g, output : '<s>"$1$2</s>' }, // strings double quote
-	{ input : /\'(.*?)(\'|<br>|<\/P>)/g, output : '<s>\'$1$2</s>' }, // strings single quote
-	{ input : /\b(abstract|continue|for|new|switch|default|goto|boolean|do|if|private|this|break|double|protected|throw|byte|else|import|public|throws|case|return|catch|extends|int|short|try|char|final|interface|static|void|class|finally|long|const|float|while|function|label)\b/g, output : '<b>$1</b>' }, // reserved words
-	{ input : /([\(\){}])/g, output : '<em>$1</em>' }, // special chars;
-	{ input : /([^:]|^)\/\/(.*?)(<br|<\/P)/g, output : '$1<i>//$2</i>$3' }, // comments //
-	{ input : /\/\*(.*?)\*\//g, output : '<i>/*$1*/</i>' } // comments /* */
-]
-
-Language.snippets = []
-
-Language.complete = [
-	{ input : '\'', output : '\'$0\'' },
-	{ input : '"', output : '"$0"' },
-	{ input : '(', output : '\($0\)' },
-	{ input : '[', output : '\[$0\]' },
-	{ input : '{', output : '{\n\t$0\n}' }		
-]
-
-Language.shortcuts = []
diff --git a/core/src/plugins/editor.codepress/codepress/languages/html.css b/core/src/plugins/editor.codepress/codepress/languages/html.css
deleted file mode 100644
index 35617cb633..0000000000
--- a/core/src/plugins/editor.codepress/codepress/languages/html.css
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * CodePress color styles for HTML syntax highlighting
- */
-
-b {color:#000080;} /* tags */
-ins, ins b, ins s, ins em {color:gray;} /* comments */
-s, s b {color:#7777e4;} /* attribute values */
-a {color:green;} /* links */
-u {color:#E67300;} /* forms */
-big {color:#db0000;} /* images */
-em, em b {color:#800080;} /* style */
-strong {color:#800000;} /* script */
-tt i {color:darkblue;font-weight:bold;} /* script reserved words */
diff --git a/core/src/plugins/editor.codepress/codepress/languages/html.js b/core/src/plugins/editor.codepress/codepress/languages/html.js
deleted file mode 100644
index 94469b448a..0000000000
--- a/core/src/plugins/editor.codepress/codepress/languages/html.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * CodePress regular expressions for HTML syntax highlighting
- */
-
-// HTML
-Language.syntax = [
-	{ input : /(&lt;[^!]*?&gt;)/g, output : '<b>$1</b>'	}, // all tags
-	{ input : /(&lt;a .*?&gt;|&lt;\/a&gt;)/g, output : '<a>$1</a>' }, // links
-	{ input : /(&lt;img .*?&gt;)/g, output : '<big>$1</big>' }, // images
-	{ input : /(&lt;\/?(button|textarea|form|input|select|option|label).*?&gt;)/g, output : '<u>$1</u>' }, // forms
-	{ input : /(&lt;style.*?&gt;)(.*?)(&lt;\/style&gt;)/g, output : '<em>$1</em><em>$2</em><em>$3</em>' }, // style tags
-	{ input : /(&lt;script.*?&gt;)(.*?)(&lt;\/script&gt;)/g, output : '<strong>$1</strong><tt>$2</tt><strong>$3</strong>' }, // script tags
-	{ input : /=(".*?")/g, output : '=<s>$1</s>' }, // atributes double quote
-	{ input : /=('.*?')/g, output : '=<s>$1</s>' }, // atributes single quote
-	{ input : /(&lt;!--.*?--&gt.)/g, output : '<ins>$1</ins>' }, // comments 
-	{ input : /\b(alert|window|document|break|continue|do|for|new|this|void|case|default|else|function|return|typeof|while|if|label|switch|var|with|catch|boolean|int|try|false|throws|null|true|goto)\b/g, output : '<i>$1</i>' } // script reserved words 
-]
-
-Language.snippets = [
-	{ input : 'aref', output : '<a href="$0"></a>' },
-	{ input : 'h1', output : '<h1>$0</h1>' },
-	{ input : 'h2', output : '<h2>$0</h2>' },
-	{ input : 'h3', output : '<h3>$0</h3>' },
-	{ input : 'h4', output : '<h4>$0</h4>' },
-	{ input : 'h5', output : '<h5>$0</h5>' },
-	{ input : 'h6', output : '<h6>$0</h6>' },
-	{ input : 'html', output : '<html>\n\t$0\n</html>' },
-	{ input : 'head', output : '<head>\n\t<meta http-equiv="content-type" content="text/html; charset=utf-8" />\n\t<title>$0</title>\n\t\n</head>' },
-	{ input : 'img', output : '<img src="$0" alt="" />' },
-	{ input : 'input', output : '<input name="$0" id="" type="" value="" />' },
-	{ input : 'label', output : '<label for="$0"></label>' },
-	{ input : 'legend', output : '<legend>\n\t$0\n</legend>' },
-	{ input : 'link', output : '<link rel="stylesheet" href="$0" type="text/css" media="screen" charset="utf-8" />' },		
-	{ input : 'base', output : '<base href="$0" />' }, 
-	{ input : 'body', output : '<body>\n\t$0\n</body>' }, 
-	{ input : 'css', output : '<link rel="stylesheet" href="$0" type="text/css" media="screen" charset="utf-8" />' },
-	{ input : 'div', output : '<div>\n\t$0\n</div>' },
-	{ input : 'divid', output : '<div id="$0">\n\t\n</div>' },
-	{ input : 'dl', output : '<dl>\n\t<dt>\n\t\t$0\n\t</dt>\n\t<dd></dd>\n</dl>' },
-	{ input : 'fieldset', output : '<fieldset>\n\t$0\n</fieldset>' },
-	{ input : 'form', output : '<form action="$0" method="" name="">\n\t\n</form>' },
-	{ input : 'meta', output : '<meta name="$0" content="" />' },
-	{ input : 'p', output : '<p>$0</p>' },
-	{ input : 'script', output : '<script type="text/javascript" language="javascript" charset="utf-8">\n\t$0\t\n</script>' },
-	{ input : 'scriptsrc', output : '<script src="$0" type="text/javascript" language="javascript" charset="utf-8"></script>' },
-	{ input : 'span', output : '<span>$0</span>' },
-	{ input : 'table', output : '<table border="$0" cellspacing="" cellpadding="">\n\t<tr><th></th></tr>\n\t<tr><td></td></tr>\n</table>' },
-	{ input : 'style', output : '<style type="text/css" media="screen">\n\t$0\n</style>' }
-]
-	
-Language.complete = [
-	{ input : '\'',output : '\'$0\'' },
-	{ input : '"', output : '"$0"' },
-	{ input : '(', output : '\($0\)' },
-	{ input : '[', output : '\[$0\]' },
-	{ input : '{', output : '{\n\t$0\n}' }		
-]
-
-Language.shortcuts = []
diff --git a/core/src/plugins/editor.codepress/codepress/languages/java.css b/core/src/plugins/editor.codepress/codepress/languages/java.css
deleted file mode 100644
index 2339dedf50..0000000000
--- a/core/src/plugins/editor.codepress/codepress/languages/java.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * CodePress color styles for Java syntax highlighting
- */
-
-b {color:#7F0055;font-weight:bold;font-style:normal;} /* reserved words */
-i, i b, i s {color:#3F7F5F;font-weight:bold;} /* comments */
-s, s b {color:#2A00FF;font-weight:normal;} /* strings */
diff --git a/core/src/plugins/editor.codepress/codepress/languages/java.js b/core/src/plugins/editor.codepress/codepress/languages/java.js
deleted file mode 100644
index 61e9a0673b..0000000000
--- a/core/src/plugins/editor.codepress/codepress/languages/java.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * CodePress regular expressions for Java syntax highlighting
- */
- 
-// Java
-Language.syntax = [
-	{ input : /\"(.*?)(\"|<br>|<\/P>)/g, output : '<s>"$1$2</s>'}, // strings double quote
-	{ input : /\'(.*?)(\'|<br>|<\/P>)/g, output : '<s>\'$1$2</s>'}, // strings single quote
-	{ input : /\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/g, output : '<b>$1</b>'}, // reserved words
-	{ input : /([^:]|^)\/\/(.*?)(<br|<\/P)/g, output : '$1<i>//$2</i>$3'}, // comments //	
-	{ input : /\/\*(.*?)\*\//g, output : '<i>/*$1*/</i>' }// comments /* */
-]
-
-Language.snippets = []
-
-Language.complete = [
-	{ input : '\'',output : '\'$0\'' },
-	{ input : '"', output : '"$0"' },
-	{ input : '(', output : '\($0\)' },
-	{ input : '[', output : '\[$0\]' },
-	{ input : '{', output : '{\n\t$0\n}' }		
-]
-
-Language.shortcuts = []
diff --git a/core/src/plugins/editor.codepress/codepress/languages/javascript.css b/core/src/plugins/editor.codepress/codepress/languages/javascript.css
deleted file mode 100644
index 8cb9092de3..0000000000
--- a/core/src/plugins/editor.codepress/codepress/languages/javascript.css
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * CodePress color styles for JavaScript syntax highlighting
- */
-
-b {color:#7F0055;font-weight:bold;} /* reserved words */
-u {color:darkblue;font-weight:bold;} /* special words */
-i, i b, i s, i u {color:green;font-weight:normal;} /* comments */
-s, s b, s u {color:#2A00FF;font-weight:normal;} /* strings */
diff --git a/core/src/plugins/editor.codepress/codepress/languages/javascript.js b/core/src/plugins/editor.codepress/codepress/languages/javascript.js
deleted file mode 100644
index 08cdea42f9..0000000000
--- a/core/src/plugins/editor.codepress/codepress/languages/javascript.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * CodePress regular expressions for JavaScript syntax highlighting
- */
- 
-// JavaScript
-Language.syntax = [ 
-	{ input : /\"(.*?)(\"|<br>|<\/P>)/g, output : '<s>"$1$2</s>' }, // strings double quote
-	{ input : /\'(.*?)(\'|<br>|<\/P>)/g, output : '<s>\'$1$2</s>' }, // strings single quote
-	{ input : /\b(break|continue|do|for|new|this|void|case|default|else|function|return|typeof|while|if|label|switch|var|with|catch|boolean|int|try|false|throws|null|true|goto)\b/g, output : '<b>$1</b>' }, // reserved words
-	{ input : /\b(alert|isNaN|parent|Array|parseFloat|parseInt|blur|clearTimeout|prompt|prototype|close|confirm|length|Date|location|Math|document|element|name|self|elements|setTimeout|navigator|status|String|escape|Number|submit|eval|Object|event|onblur|focus|onerror|onfocus|onclick|top|onload|toString|onunload|unescape|open|valueOf|window|onmouseover)\b/g, output : '<u>$1</u>' }, // special words
-	{ input : /([^:]|^)\/\/(.*?)(<br|<\/P)/g, output : '$1<i>//$2</i>$3' }, // comments //
-	{ input : /\/\*(.*?)\*\//g, output : '<i>/*$1*/</i>' } // comments /* */
-]
-
-Language.snippets = [
-	{ input : 'dw', output : 'document.write(\'$0\');' },
-	{ input : 'getid', output : 'document.getElementById(\'$0\')' },
-	{ input : 'fun', output : 'function $0(){\n\t\n}' },
-	{ input : 'func', output : 'function $0(){\n\t\n}' }
-]
-
-Language.complete = [
-	{ input : '\'',output : '\'$0\'' },
-	{ input : '"', output : '"$0"' },
-	{ input : '(', output : '\($0\)' },
-	{ input : '[', output : '\[$0\]' },
-	{ input : '{', output : '{\n\t$0\n}' }		
-]
-
-Language.shortcuts = []
diff --git a/core/src/plugins/editor.codepress/codepress/languages/perl.css b/core/src/plugins/editor.codepress/codepress/languages/perl.css
deleted file mode 100644
index d9bce85c54..0000000000
--- a/core/src/plugins/editor.codepress/codepress/languages/perl.css
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * CodePress color styles for Perl syntax highlighting
- * By J. Nick Koston
- */
-
-b {color:#7F0055;font-weight:bold;} /* reserved words */
-i, i b, i s, i em, i a, i u {color:gray;font-weight:normal;} /* comments */
-s, s b, s a, s em, s u {color:#2A00FF;font-weight:normal;} /* strings */
-a {color:#006700;font-weight:bold;} /* variables */
-em {color:darkblue;font-weight:bold;} /* functions */
-u {font-weight:bold;} /* special chars */
\ No newline at end of file
diff --git a/core/src/plugins/editor.codepress/codepress/languages/perl.js b/core/src/plugins/editor.codepress/codepress/languages/perl.js
deleted file mode 100644
index 5026e5d039..0000000000
--- a/core/src/plugins/editor.codepress/codepress/languages/perl.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * CodePress regular expressions for Perl syntax highlighting
- * By J. Nick Koston
- */
-
-// Perl
-Language.syntax = [ 
-	{ input  : /\"(.*?)(\"|<br>|<\/P>)/g, output : '<s>"$1$2</s>' }, // strings double quote
-	{ input  : /\'(.*?)(\'|<br>|<\/P>)/g, output : '<s>\'$1$2</s>' }, // strings single quote
-	{ input  : /([\$\@\%][\w\.]*)/g, output : '<a>$1</a>' }, // vars
-	{ input  : /(sub\s+)([\w\.]*)/g, output : '$1<em>$2</em>' }, // functions
-	{ input  : /\b(abs|accept|alarm|atan2|bind|binmode|bless|caller|chdir|chmod|chomp|chop|chown|chr|chroot|close|closedir|connect|continue|cos|crypt|dbmclose|dbmopen|defined|delete|die|do|dump|each|else|elsif|endgrent|endhostent|endnetent|endprotoent|endpwent|eof|eval|exec|exists|exit|fcntl|fileno|find|flock|for|foreach|fork|format|formlinegetc|getgrent|getgrgid|getgrnam|gethostbyaddr|gethostbyname|gethostent|getlogin|getnetbyaddr|getnetbyname|getnetent|getpeername|getpgrp|getppid|getpriority|getprotobyname|getprotobynumber|getprotoent|getpwent|getpwnam|getpwuid|getservbyaddr|getservbyname|getservbyport|getservent|getsockname|getsockopt|glob|gmtime|goto|grep|hex|hostname|if|import|index|int|ioctl|join|keys|kill|last|lc|lcfirst|length|link|listen|LoadExternals|local|localtime|log|lstat|map|mkdir|msgctl|msgget|msgrcv|msgsnd|my|next|no|oct|open|opendir|ordpack|package|pipe|pop|pos|print|printf|push|pwd|qq|quotemeta|qw|rand|read|readdir|readlink|recv|redo|ref|rename|require|reset|return|reverse|rewinddir|rindex|rmdir|scalar|seek|seekdir|select|semctl|semget|semop|send|setgrent|sethostent|setnetent|setpgrp|setpriority|setprotoent|setpwent|setservent|setsockopt|shift|shmctl|shmget|shmread|shmwrite|shutdown|sin|sleep|socket|socketpair|sort|splice|split|sprintf|sqrt|srand|stat|stty|study|sub|substr|symlink|syscall|sysopen|sysread|system|syswritetell|telldir|tie|tied|time|times|tr|truncate|uc|ucfirst|umask|undef|unless|unlink|until|unpack|unshift|untie|use|utime|values|vec|waitpid|wantarray|warn|while|write)\b/g, output : '<b>$1</b>' }, // reserved words
-	{ input  : /([\(\){}])/g, output : '<u>$1</u>' }, // special chars
-	{ input  : /#(.*?)(<br>|<\/P>)/g, output : '<i>#$1</i>$2' } // comments
-]
-
-Language.snippets = []
-
-Language.complete = [
-	{ input : '\'',output : '\'$0\'' },
-	{ input : '"', output : '"$0"' },
-	{ input : '(', output : '\($0\)' },
-	{ input : '[', output : '\[$0\]' },
-	{ input : '{', output : '{\n\t$0\n}' }		
-]
-
-Language.shortcuts = []
diff --git a/core/src/plugins/editor.codepress/codepress/languages/php.css b/core/src/plugins/editor.codepress/codepress/languages/php.css
deleted file mode 100644
index b20a35cc83..0000000000
--- a/core/src/plugins/editor.codepress/codepress/languages/php.css
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * CodePress color styles for PHP syntax highlighting
- */
-
-b {color:#000080;} /* tags */
-big, big b, big em, big ins, big s, strong i, strong i b, strong i s, strong i u, strong i a, strong i a u, strong i s u {color:gray;font-weight:normal;} /* comments */
-s, s b, strong s u, strong s cite {color:#5656fa;font-weight:normal;} /* attributes and strings */
-strong a, strong a u {color:#006700;font-weight:bold;} /* variables */
-em {color:#800080;font-style:normal;} /* style */
-ins {color:#800000;} /* script */
-strong u {color:#7F0055;font-weight:bold;} /* reserved words */
-cite, s cite {color:red;font-weight:bold;} /* <?php and ?> */
diff --git a/core/src/plugins/editor.codepress/codepress/languages/php.js b/core/src/plugins/editor.codepress/codepress/languages/php.js
deleted file mode 100644
index a2dd04bbf5..0000000000
--- a/core/src/plugins/editor.codepress/codepress/languages/php.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * CodePress regular expressions for PHP syntax highlighting
- */
-
-// PHP
-Language.syntax = [
-	{ input : /(&lt;[^!\?]*?&gt;)/g, output : '<b>$1</b>' }, // all tags
-	{ input : /(&lt;style.*?&gt;)(.*?)(&lt;\/style&gt;)/g, output : '<em>$1</em><em>$2</em><em>$3</em>' }, // style tags
-	{ input : /(&lt;script.*?&gt;)(.*?)(&lt;\/script&gt;)/g, output : '<ins>$1</ins><ins>$2</ins><ins>$3</ins>' }, // script tags
-	{ input : /\"(.*?)(\"|<br>|<\/P>)/g, output : '<s>"$1$2</s>' }, // strings double quote
-	{ input : /\'(.*?)(\'|<br>|<\/P>)/g, output : '<s>\'$1$2</s>'}, // strings single quote
-	{ input : /(&lt;\?)/g, output : '<strong>$1' }, // <?.*
-	{ input : /(\?&gt;)/g, output : '$1</strong>' }, // .*?>
-	{ input : /(&lt;\?php|&lt;\?=|&lt;\?|\?&gt;)/g, output : '<cite>$1</cite>' }, // php tags
-	{ input : /(\$[\w\.]*)/g, output : '<a>$1</a>' }, // vars
-	{ input : /\b(false|true|and|or|xor|__FILE__|exception|__LINE__|array|as|break|case|class|const|continue|declare|default|die|do|echo|else|elseif|empty|enddeclare|endfor|endforeach|endif|endswitch|endwhile|eval|exit|extends|for|foreach|function|global|if|include|include_once|isset|list|new|print|require|require_once|return|static|switch|unset|use|while|__FUNCTION__|__CLASS__|__METHOD__|final|php_user_filter|interface|implements|extends|public|private|protected|abstract|clone|try|catch|throw|this)\b/g, output : '<u>$1</u>' }, // reserved words
-	{ input : /([^:])\/\/(.*?)(<br|<\/P)/g, output : '$1<i>//$2</i>$3' }, // php comments //
-	{ input : /\/\*(.*?)\*\//g, output : '<i>/*$1*/</i>' }, // php comments /* */
-	{ input : /(&lt;!--.*?--&gt.)/g, output : '<big>$1</big>' } // html comments
-]
-
-Language.snippets = [
-	{ input : 'if', output : 'if($0){\n\t\n}' },
-	{ input : 'ifelse', output : 'if($0){\n\t\n}\nelse{\n\t\n}' },
-	{ input : 'else', output : '}\nelse {\n\t' },
-	{ input : 'elseif', output : '}\nelseif($0) {\n\t' },
-	{ input : 'do', output : 'do{\n\t$0\n}\nwhile();' },
-	{ input : 'inc', output : 'include_once("$0");' },
-	{ input : 'fun', output : 'function $0(){\n\t\n}' },	
-	{ input : 'func', output : 'function $0(){\n\t\n}' },	
-	{ input : 'while', output : 'while($0){\n\t\n}' },
-	{ input : 'for', output : 'for($0,,){\n\t\n}' },
-	{ input : 'fore', output : 'foreach($0 as ){\n\t\n}' },
-	{ input : 'foreach', output : 'foreach($0 as ){\n\t\n}' },
-	{ input : 'echo', output : 'echo \'$0\';' },
-	{ input : 'switch', output : 'switch($0) {\n\tcase "": break;\n\tdefault: ;\n}' },
-	{ input : 'case', output : 'case "$0" : break;' },
-	{ input : 'ret0', output : 'return false;' },
-	{ input : 'retf', output : 'return false;' },
-	{ input : 'ret1', output : 'return true;' },
-	{ input : 'rett', output : 'return true;' },
-	{ input : 'ret', output : 'return $0;' },
-	{ input : 'def', output : 'define(\'$0\',\'\');' },
-	{ input : '<?', output : 'php\n$0\n?>' }
-]
-
-Language.complete = [
-	{ input : '\'', output : '\'$0\'' },
-	{ input : '"', output : '"$0"' },
-	{ input : '(', output : '\($0\)' },
-	{ input : '[', output : '\[$0\]' },
-	{ input : '{', output : '{\n\t$0\n}' }		
-]
-
-Language.shortcuts = [
-	{ input : '[space]', output : '&nbsp;' },
-	{ input : '[enter]', output : '<br />' } ,
-	{ input : '[j]', output : 'testing' },
-	{ input : '[7]', output : '&amp;' }
-]
\ No newline at end of file
diff --git a/core/src/plugins/editor.codepress/codepress/languages/ruby.css b/core/src/plugins/editor.codepress/codepress/languages/ruby.css
deleted file mode 100644
index b23166b9c9..0000000000
--- a/core/src/plugins/editor.codepress/codepress/languages/ruby.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * CodePress color styles for Ruby syntax highlighting
- */
-
-b {color:#7F0055;font-weight:bold;} /* reserved words */
-i, i b, i s, i em, i a, i u {color:gray;font-weight:normal;} /* comments */
-s, s b, s a, s em, s u {color:#2A00FF;font-weight:normal;} /* strings */
-a {color:#006700;font-weight:bold;} /* variables */
-em {color:darkblue;font-weight:bold;} /* functions */
-u {font-weight:bold;} /* special chars */
\ No newline at end of file
diff --git a/core/src/plugins/editor.codepress/codepress/languages/ruby.js b/core/src/plugins/editor.codepress/codepress/languages/ruby.js
deleted file mode 100644
index 860f43381a..0000000000
--- a/core/src/plugins/editor.codepress/codepress/languages/ruby.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * CodePress regular expressions for Perl syntax highlighting
- */
-
-// Ruby
-Language.syntax = [
-	{ input : /\"(.*?)(\"|<br>|<\/P>)/g, output : '<s>"$1$2</s>' }, // strings double quote 
-	{ input : /\'(.*?)(\'|<br>|<\/P>)/g, output : '<s>\'$1$2</s>' }, // strings single quote
-	{ input : /([\$\@\%]+)([\w\.]*)/g, output : '<a>$1$2</a>' }, // vars
-	{ input : /(def\s+)([\w\.]*)/g, output : '$1<em>$2</em>' }, // functions
-	{ input : /\b(alias|and|BEGIN|begin|break|case|class|def|defined|do|else|elsif|END|end|ensure|false|for|if|in|module|next|nil|not|or|redo|rescue|retry|return|self|super|then|true|undef|unless|until|when|while|yield)\b/g, output : '<b>$1</b>' }, // reserved words
-	{ input  : /([\(\){}])/g, output : '<u>$1</u>' }, // special chars
-	{ input  : /#(.*?)(<br>|<\/P>)/g, output : '<i>#$1</i>$2' } // comments
-];
-
-Language.snippets = []
-
-Language.complete = [
-	{ input : '\'',output : '\'$0\'' },
-	{ input : '"', output : '"$0"' },
-	{ input : '(', output : '\($0\)' },
-	{ input : '[', output : '\[$0\]' },
-	{ input : '{', output : '{\n\t$0\n}' }		
-]
-
-Language.shortcuts = []
diff --git a/core/src/plugins/editor.codepress/codepress/languages/sql.css b/core/src/plugins/editor.codepress/codepress/languages/sql.css
deleted file mode 100644
index 17458c5a06..0000000000
--- a/core/src/plugins/editor.codepress/codepress/languages/sql.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * CodePress color styles for SQL syntax highlighting
- * By Merlin Moncure
- */
- 
-b {color:#0000FF;font-style:normal;font-weight:bold;} /* reserved words */
-u {color:#FF0000;font-style:normal;} /* types */
-a {color:#CD6600;font-style:normal;font-weight:bold;} /* commands */
-i, i b, i u, i a, i s  {color:#A9A9A9;font-weight:normal;font-style:italic;} /* comments */
-s, s b, s u, s a, s i {color:#2A00FF;font-weight:normal;} /* strings */
diff --git a/core/src/plugins/editor.codepress/codepress/languages/sql.js b/core/src/plugins/editor.codepress/codepress/languages/sql.js
deleted file mode 100644
index 22ccaced95..0000000000
--- a/core/src/plugins/editor.codepress/codepress/languages/sql.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * CodePress regular expressions for SQL syntax highlighting
- * By Merlin Moncure
- */
- 
-// SQL
-Language.syntax = [
-	{ input : /\'(.*?)(\')/g, output : '<s>\'$1$2</s>' }, // strings single quote
-	{ input : /\b(add|after|aggregate|alias|all|and|as|authorization|between|by|cascade|cache|cache|called|case|check|column|comment|constraint|createdb|createuser|cycle|database|default|deferrable|deferred|diagnostics|distinct|domain|each|else|elseif|elsif|encrypted|except|exception|for|foreign|from|from|full|function|get|group|having|if|immediate|immutable|in|increment|initially|increment|index|inherits|inner|input|intersect|into|invoker|is|join|key|language|left|limit|local|loop|match|maxvalue|minvalue|natural|nextval|no|nocreatedb|nocreateuser|not|null|of|offset|oids|on|only|operator|or|order|outer|owner|partial|password|perform|plpgsql|primary|record|references|replace|restrict|return|returns|right|row|rule|schema|security|sequence|session|sql|stable|statistics|table|temp|temporary|then|time|to|transaction|trigger|type|unencrypted|union|unique|user|using|valid|value|values|view|volatile|when|where|with|without|zone)\b/gi, output : '<b>$1</b>' }, // reserved words
-	{ input : /\b(bigint|bigserial|bit|boolean|box|bytea|char|character|cidr|circle|date|decimal|double|float4|float8|inet|int2|int4|int8|integer|interval|line|lseg|macaddr|money|numeric|oid|path|point|polygon|precision|real|refcursor|serial|serial4|serial8|smallint|text|timestamp|varbit|varchar)\b/gi, output : '<u>$1</u>' }, // types
-	{ input : /\b(abort|alter|analyze|begin|checkpoint|close|cluster|comment|commit|copy|create|deallocate|declare|delete|drop|end|execute|explain|fetch|grant|insert|listen|load|lock|move|notify|prepare|reindex|reset|restart|revoke|rollback|select|set|show|start|truncate|unlisten|update)\b/gi, output : '<a>$1</a>' }, // commands
-	{ input : /([^:]|^)\-\-(.*?)(<br|<\/P)/g, output: '$1<i>--$2</i>$3' } // comments //	
-]
-
-Language.snippets = [
-	{ input : 'select', output : 'select $0 from  where ' }
-]
-
-Language.complete = [
-	{ input : '\'', output : '\'$0\'' },
-	{ input : '"', output : '"$0"' },
-	{ input : '(', output : '\($0\)' },
-	{ input : '[', output : '\[$0\]' },
-	{ input : '{', output : '{\n\t$0\n}' }		
-]
-
-Language.shortcuts = []
-
-
-
diff --git a/core/src/plugins/editor.codepress/codepress/languages/text.css b/core/src/plugins/editor.codepress/codepress/languages/text.css
deleted file mode 100644
index 8e5ba28fc6..0000000000
--- a/core/src/plugins/editor.codepress/codepress/languages/text.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- * CodePress color styles for Text syntax highlighting
- */
-
-/* do nothing as expected */
diff --git a/core/src/plugins/editor.codepress/codepress/languages/text.js b/core/src/plugins/editor.codepress/codepress/languages/text.js
deleted file mode 100644
index 1895430782..0000000000
--- a/core/src/plugins/editor.codepress/codepress/languages/text.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * CodePress regular expressions for Text syntax highlighting
- */
-
-// plain text
-Language.syntax = []
-Language.snippets = []
-Language.complete = []
-Language.shortcuts = []
diff --git a/core/src/plugins/editor.codepress/codepress/license.txt b/core/src/plugins/editor.codepress/codepress/license.txt
deleted file mode 100644
index 81b55d91ff..0000000000
--- a/core/src/plugins/editor.codepress/codepress/license.txt
+++ /dev/null
@@ -1,458 +0,0 @@
-		  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
diff --git a/core/src/plugins/editor.codepress/i18n/conf/cs.php b/core/src/plugins/editor.codepress/i18n/conf/cs.php
deleted file mode 100644
index 304ac198e8..0000000000
--- a/core/src/plugins/editor.codepress/i18n/conf/cs.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"CodePress" => "CodePress",
-"Legacy Syntax Highlighter" => "Postarší zvýrazňovač syntaxe",
-);
diff --git a/core/src/plugins/editor.codepress/i18n/conf/de.php b/core/src/plugins/editor.codepress/i18n/conf/de.php
deleted file mode 100644
index e11c359a2b..0000000000
--- a/core/src/plugins/editor.codepress/i18n/conf/de.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"CodePress" => "CodePress",
-"Legacy Syntax Highlighter" => "Text-Editor mit Syntaxhervorhebung (veraltet)",
-);
diff --git a/core/src/plugins/editor.codepress/i18n/conf/en.php b/core/src/plugins/editor.codepress/i18n/conf/en.php
deleted file mode 100644
index 47a92c98f2..0000000000
--- a/core/src/plugins/editor.codepress/i18n/conf/en.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"CodePress" => "CodePress",
-"Legacy Syntax Highlighter" => "Legacy Syntax Highlighter",
-);
diff --git a/core/src/plugins/editor.codepress/i18n/conf/fr.php b/core/src/plugins/editor.codepress/i18n/conf/fr.php
deleted file mode 100644
index de24a7c695..0000000000
--- a/core/src/plugins/editor.codepress/i18n/conf/fr.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"CodePress" => "CodePress",
-"Legacy Syntax Highlighter" => "Coloration syntaxique",
-);
diff --git a/core/src/plugins/editor.codepress/i18n/conf/it.php b/core/src/plugins/editor.codepress/i18n/conf/it.php
deleted file mode 100644
index b2fc69a437..0000000000
--- a/core/src/plugins/editor.codepress/i18n/conf/it.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"CodePress" => "CodePress",
-"Legacy Syntax Highlighter" => "Vecchio Evidenziatore di Sintassi",
-);
diff --git a/core/src/plugins/editor.codepress/manifest.xml b/core/src/plugins/editor.codepress/manifest.xml
deleted file mode 100644
index 9c0eed9773..0000000000
--- a/core/src/plugins/editor.codepress/manifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<editor id="editor.codepress" enabled="false" openable="true" iconClass="icon-text-height" text="317" title="318" icon="codepress_images/source_edit.png" className="CodePressEditor" mimes="php,php3,php4,php4,phtml,js,java,pl,sql,html,htm,xml,css,jsp" formId="edit_box" write="true" canWrite="true" label="CONF_MESSAGE[CodePress]" description="CONF_MESSAGE[Legacy Syntax Highlighter]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <plugin_info>
-        <core_relation packaged="false" tested_version="4.0.4"/>
-        <plugin_author>Charles du Jeu</plugin_author>
-    </plugin_info>
-	<dependencies>
-		<pluginResources pluginName="editor.text"/>
-		<!-- Stream Wrapper Access -->
-		<activePlugin pluginName="access.AJXP_STREAM_PROVIDER"/>
-	</dependencies>
-    <client_settings>
-        <resources>
-            <js file="plugins/editor.codepress/codepress/codepress.js" className="CodePress"/>
-            <js file="plugins/editor.codepress/class.CodePressEditor.js" className="CodePressEditor"/>
-            <img_library alias="codepress_images" path="plugins/editor.codepress"/>
-            <i18n namespace="codepress" path="plugins/editor.codepress/i18n" />
-        </resources>
-    </client_settings>
-</editor>
diff --git a/core/src/plugins/editor.codepress/plugin_doc.html b/core/src/plugins/editor.codepress/plugin_doc.html
deleted file mode 100644
index 9ec2deea5b..0000000000
--- a/core/src/plugins/editor.codepress/plugin_doc.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>This is a real-time syntax highlighter. Deprecated in profit of CodeMirror.</p>
\ No newline at end of file
diff --git a/core/src/plugins/editor.codepress/source_edit.png b/core/src/plugins/editor.codepress/source_edit.png
deleted file mode 100644
index 1e7e34066b..0000000000
Binary files a/core/src/plugins/editor.codepress/source_edit.png and /dev/null differ
diff --git a/core/src/plugins/editor.diaporama/ImagePreviewer.php b/core/src/plugins/editor.diaporama/ImagePreviewer.php
new file mode 100644
index 0000000000..caba77a675
--- /dev/null
+++ b/core/src/plugins/editor.diaporama/ImagePreviewer.php
@@ -0,0 +1,236 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Editor\Image;
+
+use Pydio\Access\Core\MetaStreamWrapper;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\UserSelection;
+
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\LocalCache;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Utils\Vars\StatHelper;
+use Pydio\Core\PluginFramework\Plugin;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Class ImagePreviewer
+ * Generate an image thumbnail and send the thumb/full version to the browser
+ * @package Pydio\Editor\Image
+ */
+class ImagePreviewer extends Plugin
+{
+    private $currentDimension;
+
+    /**
+     * @param $action
+     * @param $httpVars
+     * @param $filesVars
+     * @param ContextInterface $contextInterface
+     * @throws \Exception
+     */
+    public function switchAction($action, $httpVars, $filesVars, ContextInterface $contextInterface)
+    {
+        if (!isSet($this->pluginConf)) {
+            $this->pluginConf = array("GENERATE_THUMBNAIL"=>false);
+        }
+        $selection = UserSelection::fromContext($contextInterface, $httpVars);
+        $destStreamURL = $selection->currentBaseUrl();
+
+        if ($action == "preview_data_proxy") {
+            $file = $selection->getUniqueFile();
+            if (!file_exists($destStreamURL.$file) || !is_readable($destStreamURL.$file)) {
+                header("Content-Type: ". StatHelper::getImageMimeType(basename($file)) ."; name=\"".basename($file)."\"");
+                header("Content-Length: 0");
+                return;
+            }
+            $this->logInfo('Preview', 'Preview content of '.$file, array("files" =>$selection->getUniqueFile()));
+            if (isSet($httpVars["get_thumb"]) && $httpVars["get_thumb"] == "true" && $this->getContextualOption($contextInterface, "GENERATE_THUMBNAIL")) {
+                $dimension = 200;
+                if(isSet($httpVars["dimension"]) && is_numeric($httpVars["dimension"])) $dimension = $httpVars["dimension"];
+                $this->currentDimension = $dimension;
+                //$cacheItem = LocalCache::getItem("diaporama_".$dimension, $destStreamURL.$file, array($this, "generateThumbnail"));
+                $cacheItem = LocalCache::getItem("diaporama_".$dimension, $destStreamURL.$file, function($masterFile, $targetFile) use ($contextInterface){
+                    return $this->generateThumbnail($contextInterface, $masterFile, $targetFile);
+                });
+                $data = $cacheItem->getData();
+                $cId = $cacheItem->getId();
+
+                header("Content-Type: ". StatHelper::getImageMimeType(basename($cId)) ."; name=\"".basename($cId)."\"");
+                header("Content-Length: ".strlen($data));
+                header('Cache-Control: public');
+                header("Pragma:");
+                header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()-10000) . " GMT");
+                header("Expires: " . gmdate("D, d M Y H:i:s", time()+5*24*3600) . " GMT");
+                print($data);
+
+            } else {
+
+                $node = new AJXP_Node($destStreamURL.$file);
+
+                $fp = fopen($destStreamURL.$file, "r");
+                $stat = fstat($fp);
+                $filesize = $stat["size"];
+                header("Content-Type: ". StatHelper::getImageMimeType(basename($file)) ."; name=\"".basename($file)."\"");
+                header("Content-Length: ".$filesize);
+                header('Cache-Control: public');
+                header("Pragma:");
+                header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()-10000) . " GMT");
+                header("Expires: " . gmdate("D, d M Y H:i:s", time()+5*24*3600) . " GMT");
+
+                $stream = fopen("php://output", "a");
+                MetaStreamWrapper::copyFileInStream($destStreamURL.$file, $stream);
+                fflush($stream);
+                fclose($stream);
+                Controller::applyHook("node.read", array($node));
+            }
+        }
+    }
+
+    /**
+     *
+     * @param \Pydio\Access\Core\Model\AJXP_Node $oldFile
+     * @param \Pydio\Access\Core\Model\AJXP_Node $newFile
+     * @param Boolean $copy
+     */
+    public function removeThumbnail($oldFile, $newFile = null, $copy = false)
+    {
+        if($oldFile == null) return ;
+        if(!$this->handleMime($oldFile->getUrl())) return;
+        if ($newFile == null || $copy == false) {
+            $diapoFolders = glob((defined('AJXP_SHARED_CACHE_DIR')?AJXP_SHARED_CACHE_DIR:AJXP_CACHE_DIR)."/diaporama_*",GLOB_ONLYDIR);
+            if ($diapoFolders !== false && is_array($diapoFolders)) {
+                foreach ($diapoFolders as $f) {
+                    $f = basename($f);
+                    $this->logDebug("GLOB ".$f);
+                    LocalCache::clearItem($f, $oldFile->getUrl());
+                }
+            }
+        }
+    }
+
+    /**
+     * @param \Pydio\Core\Model\ContextInterface $ctx
+     * @param $masterFile
+     * @param $targetFile
+     * @return bool
+     */
+    public function generateThumbnail(ContextInterface $ctx, $masterFile, $targetFile)
+    {
+        $size = $this->currentDimension;
+        require_once(AJXP_INSTALL_PATH."/plugins/editor.diaporama/PThumb.lib.php");
+        $pThumb = new PThumb($this->getContextualOption($ctx, "THUMBNAIL_QUALITY"), $this->getContextualOption($ctx, "EXIF_ROTATION"));
+
+        if (!$pThumb->isError()) {
+            $pThumb->remote_wrapper = "Pydio\\Access\\Core\\MetaStreamWrapper";
+            //$this->logDebug("Will fit thumbnail");
+            $sizes = $pThumb->fit_thumbnail($masterFile, $size, -1, 1, true);
+            //$this->logDebug("Will print thumbnail");
+            $pThumb->print_thumbnail($masterFile,$sizes[0],$sizes[1],false, false, $targetFile);
+            //$this->logDebug("Done");
+            if ($pThumb->isError()) {
+                print_r($pThumb->error_array);
+                $this->logError("ImagePreviewer", $pThumb->error_array);
+                return false;
+            }
+        } else {
+            print_r($pThumb->error_array);
+            $this->logError("ImagePreviewer", $pThumb->error_array);
+            return false;
+        }
+        return true;
+    }
+
+    //public function extractImageMetadata($currentNode, &$metadata, $wrapperClassName, &$realFile){
+    /**
+     * Enrich node metadata
+     * @param AJXP_Node $ajxpNode
+     */
+    public function extractImageMetadata(AJXP_Node &$ajxpNode)
+    {
+        $currentPath = $ajxpNode->getUrl();
+        $wrapperClassName = $ajxpNode->wrapperClassName;
+        $isImage = StatHelper::basenameIsImage($currentPath);
+        $ajxpNode->is_image = $isImage;
+        if(!$isImage) return;
+
+        $context = $ajxpNode->getContext();
+        $setRemote = false;
+        $remoteWrappers = $this->getContextualOption($context, "META_EXTRACTION_REMOTEWRAPPERS");
+        if (is_string($remoteWrappers)) {
+            $remoteWrappers = explode(",",$remoteWrappers);
+        }
+        $remoteThreshold = $this->getContextualOption($context, "META_EXTRACTION_THRESHOLD");
+        if (in_array($wrapperClassName, $remoteWrappers)) {
+            if ($remoteThreshold != 0 && isSet($ajxpNode->bytesize)) {
+                $setRemote = ($ajxpNode->bytesize > $remoteThreshold);
+            } else {
+                $setRemote = true;
+            }
+        }
+        if ($isImage) {
+            if ($setRemote) {
+                $ajxpNode->image_type = "N/A";
+                $ajxpNode->image_width = "N/A";
+                $ajxpNode->image_height = "N/A";
+                $ajxpNode->readable_dimension = "";
+            } else {
+                $realFile = $ajxpNode->getRealFile();
+                list($width, $height, $type, $attr) = @getimagesize($realFile);
+
+                if($this->getContextualOption($context, "EXIF_ROTATION")){
+                    require_once(AJXP_INSTALL_PATH."/plugins/editor.diaporama/PThumb.lib.php");
+                    $pThumb = new \Pydio\Editor\Image\PThumb($this->getContextualOption($context, "THUMBNAIL_QUALITY"),$this->getContextualOption($context, "EXIF_ROTATION"));
+                    $orientation = $pThumb->exiforientation($realFile, false);
+                    if ($pThumb->rotationsupported($orientation))
+                    {
+                        $ajxpNode->image_exif_orientation = $orientation;
+                        if ($orientation>4)
+                        {
+                            $tmp=$height;
+                            $height=$width;
+                            $width=$tmp;
+                        }
+                    }
+                }
+
+                $ajxpNode->image_type = image_type_to_mime_type($type);
+                $ajxpNode->image_width = $width;
+                $ajxpNode->image_height = $height;
+                $ajxpNode->readable_dimension = $width."px X ".$height."px";
+            }
+        }
+        //$this->logDebug("CURRENT NODE IN EXTRACT IMAGE METADATA ", $ajxpNode);
+    }
+
+    /**
+     * @param $filename
+     * @return bool
+     */
+    protected function handleMime($filename)
+    {
+        $mimesAtt = explode(",", $this->getXPath()->query("@mimes")->item(0)->nodeValue);
+        $ext = strtolower(pathinfo($filename, PATHINFO_EXTENSION));
+        return in_array($ext, $mimesAtt);
+    }
+
+}
diff --git a/core/src/plugins/editor.diaporama/PThumb.lib.php b/core/src/plugins/editor.diaporama/PThumb.lib.php
index 5d8cfd3842..3c1ad0890f 100644
--- a/core/src/plugins/editor.diaporama/PThumb.lib.php
+++ b/core/src/plugins/editor.diaporama/PThumb.lib.php
@@ -24,564 +24,551 @@
  * @package PThumb
  * @version 1.2.10
  */
+namespace Pydio\Editor\Image;
+
+use Pydio\Core\Services\ApplicationState;
+
 
 /**
  * @package PThumb
  */
-class PThumb{
+class PThumb
+{
     /**#@
-	     * PThumb Configuration Section
-	     */
+     * PThumb Configuration Section
+     */
 
     /**
-	     * Set whether Cache is used
-	     * It is strongly recommended that you enable this. If you do, this will also allow methods to return thumbnail data and 
-	     * remote image data retrival should allow_url_fopen be disabled.
-	     * 
-	     * @access public
-	     * @var boolean
-	     */
+     * Set whether Cache is used
+     * It is strongly recommended that you enable this. If you do, this will also allow methods to return thumbnail data and
+     * remote image data retrival should allow_url_fopen be disabled.
+     *
+     * @access public
+     * @var boolean
+     */
     var $use_cache = true;
-	
-	/**
-	      * Set to clear cache after thumbnail generation
-	      * Useful if you want to enable features that require the cache but do not want normal images to be cached.
-	      * 
-	      * @var public
-	      * @var boolean
-	   */
-	var $clear_cache = false;
-    
+
     /**
-	     * Set the DIR of cache file. Include Trailing Slash or methods will FAIL!
-	     * @access public
-	     * @var string
-	     */
+     * Set to clear cache after thumbnail generation
+     * Useful if you want to enable features that require the cache but do not want normal images to be cached.
+     *
+     * @var boolean
+     */
+    var $clear_cache = false;
+
+    /**
+     * Set the DIR of cache file. Include Trailing Slash or methods will FAIL!
+     * @access public
+     * @var string
+     */
     var $cache_dir = "cache/";
-    
+
     /**
-	     * Set behaviour of script when fatal error is encountered.
-	     * 
-	     * Set to 0 to end script execution when an error is encountered with a die() statement.
-	     * Set to 1 to End script execution when an error is encountered with an image displaiyng the error
-	     * Set to 2 to log error in array
-	     * 
-	     * @access public
-	     * @var integer
-	     */
+     * Set behaviour of script when fatal error is encountered.
+     *
+     * Set to 0 to end script execution when an error is encountered with a die() statement.
+     * Set to 1 to End script execution when an error is encountered with an image displaiyng the error
+     * Set to 2 to log error in array
+     *
+     * @access public
+     * @var integer
+     */
     var $error_mode = 2;
 
-	/**
-	 * Set to log error messages to file error_log in cache directory (Requires cache to be enabled!)
-	 * 
-	 * @access public
-	 * @var boolean
-	 */
-	
-	var $log_error = true;
-
-	/**
-	 * Set to retrieve remote data on every request. Defaults to True
-	 *  If set to false, remote files will be cached and any changes to remote files will not be reflected,
-	*  unless file cache is destroyed.
-	 * Therefore, this option requires cache to be enabled to be set to false.
-	 *
-	 * @access public
-	 * @var boolean
-	 */
+    /**
+     * Set to log error messages to file error_log in cache directory (Requires cache to be enabled!)
+     *
+     * @access public
+     * @var boolean
+     */
+
+    var $log_error = true;
+
+    /**
+     * Set to retrieve remote data on every request. Defaults to True
+     *  If set to false, remote files will be cached and any changes to remote files will not be reflected,
+     *  unless file cache is destroyed.
+     * Therefore, this option requires cache to be enabled to be set to false.
+     *
+     * @access public
+     * @var boolean
+     */
     var $remote_check = true;
     public $remote_wrapper = "";
     /**
-	     * END Configuration Section
-	     * There should be no need to touch anything below this line.
-	     */
+     * END Configuration Section
+     * There should be no need to touch anything below this line.
+     */
 
     /**
-	     * An array of error messages
-	     *  
-	     * @access private
-	     * @var array
-	     */
+     * An array of error messages
+     *
+     * @access private
+     * @var array
+     */
     var $error_array = array();
-    
+
     /**
-	     * An array of cache'd remote file data
-	     * 
-	     * @access private
-	     * @var array
-	     */
+     * An array of cache'd remote file data
+     *
+     * @access private
+     * @var array
+     */
     var $data_cache = array();
-	
-    
+
+
     /**
-	     * An array mapping PHP image format IDs to their appropriate file extensions
-	     * 
-	     * This also declares the image format supported.
-	     * 
-	     * @access private
-	     * @var array
-	     */
+     * An array mapping PHP image format IDs to their appropriate file extensions
+     *
+     * This also declares the image format supported.
+     *
+     * @access private
+     * @var array
+     */
     var $file_ext = array();
-    
+
     var $thumb_quality = 3;
 
     var $exif_rotation = true;
-    
+
     /**#@-*/
     /**
-	     * The class constructor.
-	     * @access public
-	     */
-    function __construct($quality, $exifrotation) {
-    	$this->thumb_quality = $quality;
-    	$this->exif_rotation = $exifrotation;
-		$this -> error_array["fatal"] = array();
-		$this -> error_array["warning"] = array();
-        if (!function_exists("gd_info")){
-            $this -> set_error("GD is not enabled on this server! Unable to generate thumbnails.",0);
+     * The class constructor.
+     * @access public
+     */
+    function __construct($quality, $exifrotation)
+    {
+        $this->thumb_quality = $quality;
+        $this->exif_rotation = $exifrotation;
+        $this->error_array["fatal"] = array();
+        $this->error_array["warning"] = array();
+        if (!function_exists("gd_info")) {
+            $this->set_error("GD is not enabled on this server! Unable to generate thumbnails.", 0);
         }
-        
+
         //These are currently supported by PHP GD
-        $this -> file_ext = array(
-                                1 => 'gif', 
-                                2 => 'jpg', 
-                                3 => 'png', 
-                                15 => 'wbmp', 
-                                16 => 'xbm'
-                            );
+        $this->file_ext = array(
+            1 => 'gif',
+            2 => 'jpg',
+            3 => 'png',
+            15 => 'wbmp',
+            16 => 'xbm'
+        );
     }
+
     /**
-	     * Check whether it is possible to cache
-	     * @return boolean
-	     * @access private
-	     * @scope protected
-	     */
-     function is_cacheable(){
-        if ($this -> use_cache == true && file_exists($this -> cache_dir) && is_writable($this -> cache_dir)){
+     * Check whether it is possible to cache
+     * @return boolean
+     * @access private
+     * @scope protected
+     */
+    function is_cacheable()
+    {
+        if ($this->use_cache == true && file_exists($this->cache_dir) && is_writable($this->cache_dir)) {
             return true;
-        }
-        else{
+        } else {
             return false;
         }
-     }
-	 
-	 /**
-	   * Sets an error to the error_array array. Method always returns false.
-	   *
-	   * @access private
-	   * @param string $msg Error Message
-	   * @param boolean $is_fatal Set to true to enable a fatal error that will terminate script
-	   * @return boolean
-	   */
-	   
-	 function set_error($msg, $is_fatal=true){
-		if ($this -> is_cacheable() && $this -> log_error == true){
-			$this -> log_error($msg, $is_fatal);
-		}
-		if ($is_fatal){
-			$msg = "[PThumb Fatal Error] ".$msg;
-			if ($this -> error_mode == 0){
-				die($msg);
-			}
-			elseif ($this -> error_mode == 1){
-				//Decide on the width 
-	            $strlen = strlen($msg);
-	            $size_x = $strlen * 10;
-	            $im = @imagecreate($size_x, 25)
-	                 or die("$msg");
-	            $background_color = imagecolorallocate($im, 255, 0, 0);
-	            $transparent = imagecolortransparent($im,$background_color);
-	            $text_color = imagecolorallocate($im, 255,0,0);
-	            imagestring($im, 5, 0, 0,  "$msg", $text_color);
-	            header("Expires: " . gmdate("D, d M Y H:i:s") . " GMT");        
-	            header("Cache-Control: no-store, no-cache, must-revalidate");
-	            header("Cache-Control: post-check=0, pre-check=0", false);
-	            header("Pragma: no-cache"); 
-	            header("Content-type: image/png");
-	            imagepng($im);
-	            imagedestroy($im);
-	            die();
-			}
-			else{
-				if ($is_fatal == true){
-					$this -> error_array["fatal"][] = $msg;
-				}
-				else{
-					$this -> error_array["warning"][] = $msg;
-				}
-			}
-		}
-		else{
-			$msg = "[Warning] ".$msg;
-			if ($is_fatal == true){
-				$this -> error_array["fatal"][] = $msg;
-			}
-			else{
-				$this -> error_array["warning"][] = $msg;
-			}
-		}
-		return false;
-	 }
-	 
-	 /**
-	   * Logs an error to error log
-	   *
-	   * @access private
-	   * @param string $msg Error Message
-	   * @param boolean $is_fatal Set to true to enable a fatal error 
-	   * @return none
-	   */
-	 function log_error($msg, $is_fatal=true){
-		if ($this -> is_cacheable() && $this -> log_error == true){
-			$handle = fopen($this -> cache_dir."error_log","a");
-			@flock($handle, LOCK_EX);
-			$str = "\r\n[";
-			if ($is_fatal){
-				$str .= "Fatal Error";
-			}
-			else{
-				$str .= "Warning";
-			}
-			$str .= " @ ".date("r")."] ".$msg;
-			@fwrite($handle,$str);
-			fclose($handle);
-		}
-	 }
+    }
 
     /**
-	     * Function to get the error message from the array
-	     * 
-	     * @access public
-	     * @param boolean $fatal_error Set to true to return fatal errors or false for warnings
-	     * @return array
-	     * 
-	     */ 
-    function error($fatal_error = true){
-		if ($fatal_error == true){
-			return $this -> error_array["fatal"];
-		}
-		else{
-			return $this -> error_array["warning"];
-		}
+     * Sets an error to the error_array array. Method always returns false.
+     *
+     * @access private
+     * @param string $msg Error Message
+     * @param boolean $is_fatal Set to true to enable a fatal error that will terminate script
+     * @return boolean
+     */
+
+    function set_error($msg, $is_fatal = true)
+    {
+        if ($this->is_cacheable() && $this->log_error == true) {
+            $this->log_error($msg, $is_fatal);
+        }
+        if ($is_fatal) {
+            $msg = "[PThumb Fatal Error] " . $msg;
+            if ($this->error_mode == 0) {
+                die($msg);
+            } elseif ($this->error_mode == 1) {
+                //Decide on the width
+                $strlen = strlen($msg);
+                $size_x = $strlen * 10;
+                $im = @imagecreate($size_x, 25)
+                or die("$msg");
+                $background_color = imagecolorallocate($im, 255, 0, 0);
+                $transparent = imagecolortransparent($im, $background_color);
+                $text_color = imagecolorallocate($im, 255, 0, 0);
+                imagestring($im, 5, 0, 0, "$msg", $text_color);
+                header("Expires: " . gmdate("D, d M Y H:i:s") . " GMT");
+                header("Cache-Control: no-store, no-cache, must-revalidate");
+                header("Cache-Control: post-check=0, pre-check=0", false);
+                header("Pragma: no-cache");
+                header("Content-type: image/png");
+                imagepng($im);
+                imagedestroy($im);
+                die();
+            } else {
+                if ($is_fatal == true) {
+                    $this->error_array["fatal"][] = $msg;
+                } else {
+                    $this->error_array["warning"][] = $msg;
+                }
+            }
+        } else {
+            $msg = "[Warning] " . $msg;
+            if ($is_fatal == true) {
+                $this->error_array["fatal"][] = $msg;
+            } else {
+                $this->error_array["warning"][] = $msg;
+            }
+        }
+        return false;
     }
-    
+
     /**
-	      * Returns true if there is an error inside error_array
-	      * 
-	      * @return boolean
-	      * @access public
-	      */
-	    
-    function isError(){
-        if (!empty($this -> error_array["fatal"]) || !empty($this -> error_array["warning"])){
-            return true;
+     * Logs an error to error log
+     *
+     * @access private
+     * @param string $msg Error Message
+     * @param boolean $is_fatal Set to true to enable a fatal error
+     * @return none
+     */
+    function log_error($msg, $is_fatal = true)
+    {
+        if ($this->is_cacheable() && $this->log_error == true) {
+            $handle = fopen($this->cache_dir . "error_log", "a");
+            @flock($handle, LOCK_EX);
+            $str = "\r\n[";
+            if ($is_fatal) {
+                $str .= "Fatal Error";
+            } else {
+                $str .= "Warning";
+            }
+            $str .= " @ " . date("r") . "] " . $msg;
+            @fwrite($handle, $str);
+            fclose($handle);
+        }
+    }
+
+    /**
+     * Function to get the error message from the array
+     *
+     * @access public
+     * @param boolean $fatal_error Set to true to return fatal errors or false for warnings
+     * @return array
+     *
+     */
+    function error($fatal_error = true)
+    {
+        if ($fatal_error == true) {
+            return $this->error_array["fatal"];
+        } else {
+            return $this->error_array["warning"];
         }
-        else{
+    }
+
+    /**
+     * Returns true if there is an error inside error_array
+     *
+     * @return boolean
+     * @access public
+     */
+
+    function isError()
+    {
+        if (!empty($this->error_array["fatal"]) || !empty($this->error_array["warning"])) {
+            return true;
+        } else {
             return false;
         }
     }
-    
-    
+
+
     /**
-	     * Prints out and cache the thumbnail. Returns verbose errors.
-	     * 
-	     * @access public
-	     * @param string $image The Relative Path to the image
-	     * @param integer $width The Width of the new thumbnail
-	     * @param integer $height The Height of the thumbnail
-	     * @param boolean $return_img Set to true to return the string instead of outputting it. Default to false
-	     * @param boolean $display_inline If set to true, heaers sent to browser will instruct it to display the image inline instead of asking the user to download. Defaults to true.
-	     * @return string
-	     * 
-	     */
-     
-     function print_thumbnail($image,$width,$height,$return_img = false, $display_inline = true, $target_file=false){
+     * Prints out and cache the thumbnail. Returns verbose errors.
+     *
+     * @access public
+     * @param string $image The Relative Path to the image
+     * @param integer $width The Width of the new thumbnail
+     * @param integer $height The Height of the thumbnail
+     * @param boolean $return_img Set to true to return the string instead of outputting it. Default to false
+     * @param boolean $display_inline If set to true, heaers sent to browser will instruct it to display the image inline instead of asking the user to download. Defaults to true.
+     * @return string
+     *
+     */
+
+    function print_thumbnail($image, $width, $height, $return_img = false, $display_inline = true, $target_file = false)
+    {
         //Check parameters
-        if (empty($image) || empty($width) ||empty($height)){
-            return $this -> set_error("Method print_thumbnail: Missing Parameters");
+        if (empty($image) || empty($width) || empty($height)) {
+            return $this->set_error("Method print_thumbnail: Missing Parameters");
+        }
+        if (isSet($this->currentRealFile) && is_file($this->currentRealFile)) {
+            $image = $this->currentRealFile;
         }
-         if(isSet($this->currentRealFile) && is_file($this->currentRealFile)){
-             $image = $this->currentRealFile;
-         }
         //Check whether $image is a remote address
-        if ($this -> is_remote($image) == 1){
-                $is_remote = true;
-                //Check that file exists (Check only enabled in PHP 5 because only PHP 5 supports for checking remote files
-                if (phpversion() >= 5){
-                    if (!file_exists($image)){
-                        return $this -> set_error("Method print_thumbnail: Error. The file '$image' you specified does not exists or cannot be accessed.");
-                    }   
+        if ($this->is_remote($image) == 1) {
+            $is_remote = true;
+            //Check that file exists (Check only enabled in PHP 5 because only PHP 5 supports for checking remote files
+            if (phpversion() >= 5) {
+                if (!file_exists($image)) {
+                    return $this->set_error("Method print_thumbnail: Error. The file '$image' you specified does not exists or cannot be accessed.");
                 }
-                $image_data = $this -> retrieve_remote_file($image,true, false, 1);
-        }
-        elseif ($this -> is_remote($image) == 0){
+            }
+            $image_data = $this->retrieve_remote_file($image, true, false, 1);
+        } elseif ($this->is_remote($image) == 0) {
             $is_remote = false;
-            if (!file_exists($image)){
-                return $this -> set_error("Method print_thumbnail: Error. The file '$image' you specified does not exists or cannot be accessed.");
+            if (!file_exists($image)) {
+                return $this->set_error("Method print_thumbnail: Error. The file '$image' you specified does not exists or cannot be accessed.");
             }
             $image_data = implode("", file($image));
         }
-        
-        if (!is_string($image_data)){
-            return $this -> set_error("Method print_thumbnail: Error, could not read image file '$image'.");
+
+        if (!is_string($image_data)) {
+            return $this->set_error("Method print_thumbnail: Error, could not read image file '$image'.");
         }
-        
-        $array = $this -> retrieve_image_data($image);
-        if (!$array){
-            return $this -> set_error("Method print_thumbnail: Unable to determine Image '$image' type and/or dimensions.");
+
+        $array = $this->retrieve_image_data($image);
+        if (!$array) {
+            return $this->set_error("Method print_thumbnail: Unable to determine Image '$image' type and/or dimensions.");
         }
         list($ori_width, $ori_height, $format) = $array;
-        
+
         //Check whether format is supported
-        if (!array_key_exists($format, $this -> file_ext)){
-            return $this -> set_error("Method print_thumbnail: Image '$image' format is not supported.");
+        if (!array_key_exists($format, $this->file_ext)) {
+            return $this->set_error("Method print_thumbnail: Image '$image' format is not supported.");
         }
         //Check that cache is enabled, cache DIR is writable, cache DIR exists
-        if ($this -> is_cacheable()){
+        if ($this->is_cacheable()) {
             //Passed eh? Generate the root dir of request file
-            if ($is_remote != true){
+            if ($is_remote != true) {
                 $transformed = realpath($image);
                 $hash = sha1_file($image);
-            }
-            else{
+            } else {
                 $transformed = $image;
                 $hash = sha1($image_data);
             }
             //Check if a version exists
-            if ($this -> exif_rotation)
-              $cache_file = $this -> cache_dir.sha1($transformed).".".$width.".".$height.".rotated.".$hash.".".$this->file_ext[$format];
+            if ($this->exif_rotation)
+                $cache_file = $this->cache_dir . sha1($transformed) . "." . $width . "." . $height . ".rotated." . $hash . "." . $this->file_ext[$format];
             else
-              $cache_file = $this -> cache_dir.sha1($transformed).".".$width.".".$height.".".$hash.".".$this->file_ext[$format];
-
-            if (file_exists($cache_file)){   
-                if ($return_img == false){
-            		//AJXP_Logger::debug("Using Cache");
-                	//die($cache_file);
-		            header("Expires: " . gmdate("D, d M Y H:i:s") . " GMT");        
-		            header("Cache-Control: no-store, no-cache, must-revalidate");
-		            header("Pragma: no-cache"); 
-		            header("Content-Transfer-Encoding: binary");
-		            header("Content-type: ".image_type_to_mime_type($format));
-					if ($display_inline == true){
-						header("Content-Disposition: inline; filename=\"".time().".".$this->file_ext[$format]."\"");
-		            }
-					else{
-						header("Content-Disposition: attachment; filename=\"".time().".".$this->file_ext[$format]."\"");
-					}
-                	print(implode("",file($cache_file)));
-                	die();
-                	
-					//Prepare redirectional URL
-					$redir_url = $_SERVER["HTTP_HOST"].dirname($_SERVER["PHP_SELF"])."/".$cache_file;
-					//Remove instances of double slashes "//"
-					$redir_url = str_replace("//","/",$redir_url);
-                    header("Location: http://$redir_url");                    
+                $cache_file = $this->cache_dir . sha1($transformed) . "." . $width . "." . $height . "." . $hash . "." . $this->file_ext[$format];
+
+            if (file_exists($cache_file)) {
+                if ($return_img == false) {
+                    //AJXP_Logger::debug("Using Cache");
+                    //die($cache_file);
+                    header("Expires: " . gmdate("D, d M Y H:i:s") . " GMT");
+                    header("Cache-Control: no-store, no-cache, must-revalidate");
+                    header("Pragma: no-cache");
+                    header("Content-Transfer-Encoding: binary");
+                    header("Content-type: " . image_type_to_mime_type($format));
+                    if ($display_inline == true) {
+                        header("Content-Disposition: inline; filename=\"" . time() . "." . $this->file_ext[$format] . "\"");
+                    } else {
+                        header("Content-Disposition: attachment; filename=\"" . time() . "." . $this->file_ext[$format] . "\"");
+                    }
+                    print(implode("", file($cache_file)));
                     die();
+
+                } else {
+                    return implode("", file($cache_file));
                 }
-                else{
-                    return implode("",file($cache_file));
-                }
-            }
-            //Check that an older version does not exists and if it does, delete it
-            else{
-            	$handle = @opendir($this -> cache_dir);
+            } //Check that an older version does not exists and if it does, delete it
+            else {
+                $handle = @opendir($this->cache_dir);
                 if ($handle !== FALSE) {
-                     while (false !== ($file = readdir($handle))) { 
-                          if ($this -> exif_rotation)
+                    while (false !== ($file = readdir($handle))) {
+                        if ($this->exif_rotation)
                             $rotated = "\.rotated";
-                          else
+                        else
                             $rotated = "";
 
-                          if (preg_match("/^".preg_quote(sha1($transformed))."\.[0-9]+\.[0-9]+".$rotated."\.([0-9a-z]{40})\.(.+?)$/i",$file,$matches)) {
-                              //Hash is in [1]
-                              //Check to see if the file data is the same. If it is, then don't delete it.
-                              if ($matches[1] != $hash){
+                        if (preg_match("/^" . preg_quote(sha1($transformed)) . "\.[0-9]+\.[0-9]+" . $rotated . "\.([0-9a-z]{40})\.(.+?)$/i", $file, $matches)) {
+                            //Hash is in [1]
+                            //Check to see if the file data is the same. If it is, then don't delete it.
+                            if ($matches[1] != $hash) {
                                 $matched[] = $file;
-                              }
-                           }
-                     } 
-                     closedir($handle);
-                     if (!empty($matched)){
-                         for ($i = 0; $i <= count($matched) - 1; $i++){
-                            @unlink($this -> cache_dir.$matched[$i]);
-                         }
+                            }
+                        }
                     }
-                }   
+                    closedir($handle);
+                    if (!empty($matched)) {
+                        for ($i = 0; $i <= count($matched) - 1; $i++) {
+                            @unlink($this->cache_dir . $matched[$i]);
+                        }
+                    }
+                }
             }
         }
         $gd_info = gd_info();
-        
+
         //Special GIF handling
-        if ($format == 1 && $gd_info["GIF Create Support"] != true){
+        if ($format == 1 && $gd_info["GIF Create Support"] != true) {
             //return $this -> set_error("Method print_thumbnail: Error, GIF support is unavaliable for PHP Version ".phpversion());
             //Image Outputted will be in PNG Format
             $format = 3;
         }
         $handle = @imagecreatefromstring($image_data);
-        if ($handle == false){
-            return $this -> set_error("Method print_thumbnail: Unsupported Image '$image' type");
+        if ($handle == false) {
+            return $this->set_error("Method print_thumbnail: Unsupported Image '$image' type");
         }
-		
+
         //Exif Orientation patch
-        $orientation = $this -> exiforientation($image, true);
-        if ($this -> rotationsupported($orientation) and $orientation>4)
-        {
-          $width2 = $width;
-          $width = $height;
-          $height = $width2;
+        $orientation = $this->exiforientation($image, true);
+        if ($this->rotationsupported($orientation) and $orientation > 4) {
+            $width2 = $width;
+            $width = $height;
+            $height = $width2;
         }
 
         //Now lets resize it
         //First lets create a new image handler which will be the thumbnailed image
-        $thumbnail = imagecreatetruecolor($width,$height);
+        $thumbnail = imagecreatetruecolor($width, $height);
+
+        if (!$thumbnail) {
+            return $this->set_error("Method print_thumbnail: A thumbnail image '$image' could not be created");
+        }
 
-        if (!$thumbnail){
-            return $this -> set_error("Method print_thumbnail: A thumbnail image '$image' could not be created");
+        /*  Image Format Special Handlinng */
+        //GIF truecolour to palette - preserve transparency
+        if ($format == 1) {
+            imagetruecolortopalette($handle, true, 256);
+        }
+        //PNG Alpha Channel saving
+        if ($format == 3) {
+            //Set to save alpha channel info in source and destination
+            imagealphablending($handle, false);
+            imagesavealpha($handle, true);
+            imagealphablending($thumbnail, false);
+            imagesavealpha($thumbnail, true);
         }
-		
-		/*  Image Format Special Handlinng */
-		//GIF truecolour to palette - preserve transparency
-		if ($format == 1){
-			imagetruecolortopalette($handle, true, 256);
-		}
-		//PNG Alpha Channel saving
-		if ($format == 3){
-			//Set to save alpha channel info in source and destination
-			imagealphablending($handle, false);
-			imagesavealpha($handle, true);
-			imagealphablending($thumbnail, false);
-			imagesavealpha($thumbnail, true);
-		}
-		//Resize it
-        if (!$this->fastimagecopyresampled($thumbnail,$handle,0,0,0,0,$width,$height,ImageSX($handle),ImageSY($handle), $this->thumb_quality)){
-            return $this -> set_error("Method print_thumbnail: Failed resizing image '$image'.");  
+        //Resize it
+        if (!$this->fastimagecopyresampled($thumbnail, $handle, 0, 0, 0, 0, $width, $height, ImageSX($handle), ImageSY($handle), $this->thumb_quality)) {
+            return $this->set_error("Method print_thumbnail: Failed resizing image '$image'.");
         }
 
         // Rotate if JPEG and Exif Information is available
-        $orientation = $this -> exiforientation($image, true);
-        if ($this -> rotationsupported($orientation))
-        {
-          switch($orientation)
-          {
-            case 2: // mirror horizontal
-            @imageflip($thumbnail, IMG_FLIP_HORIZONTAL);
-            break;
-          
-            case 3: // rotate 180
-            $thumbnail = @imagerotate($thumbnail, 180, imagecolorallocate($thumbnail, 255, 255, 255));
-            break;
-
-            case 4: // mirror vertical
-            @imageflip($thumbnail, IMG_FLIP_VERTICAL);
-            break;
-
-            case 5: // mirror horizontal, 90 rotate left
-            @imageflip($thumbnail, IMG_FLIP_HORIZONTAL);
-            $thumbnail = @imagerotate($thumbnail, 90, imagecolorallocate($thumbnail, 255, 255, 255));
-            break;
-   
-            case 6: // 90 rotate right
-            $thumbnail = @imagerotate($thumbnail, -90, imagecolorallocate($thumbnail, 255, 255, 255));
-            break;
-
-            case 7: // mirror horizontal, 90 rotate right
-            @imageflip($thumbnail, IMG_FLIP_HORIZONTAL);
-            $thumbnail = @imagerotate($thumbnail, -90, imagecolorallocate($thumbnail, 255, 255, 255));
-            break;
-
-            case 8:    // 90 rotate left
-            $thumbnail = @imagerotate($thumbnail, 90, imagecolorallocate($thumbnail, 255, 255, 255));
-            break;
-          }
+        $orientation = $this->exiforientation($image, true);
+        if ($this->rotationsupported($orientation)) {
+            switch ($orientation) {
+                case 2: // mirror horizontal
+                    @imageflip($thumbnail, IMG_FLIP_HORIZONTAL);
+                    break;
+
+                case 3: // rotate 180
+                    $thumbnail = @imagerotate($thumbnail, 180, imagecolorallocate($thumbnail, 255, 255, 255));
+                    break;
+
+                case 4: // mirror vertical
+                    @imageflip($thumbnail, IMG_FLIP_VERTICAL);
+                    break;
+
+                case 5: // mirror horizontal, 90 rotate left
+                    @imageflip($thumbnail, IMG_FLIP_HORIZONTAL);
+                    $thumbnail = @imagerotate($thumbnail, 90, imagecolorallocate($thumbnail, 255, 255, 255));
+                    break;
+
+                case 6: // 90 rotate right
+                    $thumbnail = @imagerotate($thumbnail, -90, imagecolorallocate($thumbnail, 255, 255, 255));
+                    break;
+
+                case 7: // mirror horizontal, 90 rotate right
+                    @imageflip($thumbnail, IMG_FLIP_HORIZONTAL);
+                    $thumbnail = @imagerotate($thumbnail, -90, imagecolorallocate($thumbnail, 255, 255, 255));
+                    break;
+
+                case 8:    // 90 rotate left
+                    $thumbnail = @imagerotate($thumbnail, 90, imagecolorallocate($thumbnail, 255, 255, 255));
+                    break;
+            }
         }
 
         //Cache it
-        if ($this -> is_cacheable()){
-            switch ($format){
+        if ($this->is_cacheable()) {
+            switch ($format) {
                 case 1:
-                    $cached = @imagegif($thumbnail,$cache_file);
+                    $cached = @imagegif($thumbnail, $cache_file);
                     break;
                 case 2:
-                    $cached = @imageJPEG($thumbnail,$cache_file,100);
+                    $cached = @imageJPEG($thumbnail, $cache_file, 100);
                     break;
                 case 3:
-                    $cached = @imagepng($thumbnail,$cache_file);
+                    $cached = @imagepng($thumbnail, $cache_file);
                     break;
                 case 15:
-                    $cached = @imagewbmp($thumbnail,$cache_file);
+                    $cached = @imagewbmp($thumbnail, $cache_file);
                     break;
                 case 16:
-                    $cached = @imagexbm($thumbnail,$cache_file);
+                    $cached = @imagexbm($thumbnail, $cache_file);
                     break;
                 default:
                     $cached = false;
             }
-            
-            if (!$cached){
-                return $this -> set_error("Method print_thumbnail 1: Error in cache generation of image '$image'.");
+
+            if (!$cached) {
+                return $this->set_error("Method print_thumbnail 1: Error in cache generation of image '$image'.");
             }
         }
-        if ($target_file != false){
+        if ($target_file != false) {
             $wrappers = stream_get_wrappers();
             $wrappers_re = '(' . implode('|', $wrappers) . ')';
-            $isStream = (preg_match( "!^$wrappers_re://!", $target_file ) === 1);
-            if($isStream){
+            $isStream = (preg_match("!^$wrappers_re://!", $target_file) === 1);
+            if ($isStream) {
                 $backToStreamTarget = $target_file;
-                $target_file = tempnam(AJXP_Utils::getAjxpTmpDir(), "pthumb_");
+                $target_file = tempnam(ApplicationState::getAjxpTmpDir(), "pthumb_");
             }
 
-            switch ($format){
+            switch ($format) {
                 case 1:
-                    $cached = @imagegif($thumbnail,$target_file);
+                    $cached = @imagegif($thumbnail, $target_file);
                     break;
                 case 2:
-                    $cached = @imageJPEG($thumbnail,$target_file,100);
+                    $cached = @imageJPEG($thumbnail, $target_file, 100);
                     break;
                 case 3:
-                    $cached = @imagepng($thumbnail,$target_file);
+                    $cached = @imagepng($thumbnail, $target_file);
                     break;
                 case 15:
-                    $cached = @imagewbmp($thumbnail,$target_file);
+                    $cached = @imagewbmp($thumbnail, $target_file);
                     break;
                 case 16:
-                    $cached = @imagexbm($thumbnail,$target_file);
+                    $cached = @imagexbm($thumbnail, $target_file);
                     break;
                 default:
                     $cached = false;
             }
-            
-            if($cached && $isStream){
+
+            if ($cached && $isStream) {
                 $cached = @copy($target_file, $backToStreamTarget);
                 @unlink($target_file);
             }
-            if (!$cached){
-                return $this -> set_error("Method print_thumbnail: Error in cache generation of image '$image'.");
+            if (!$cached) {
+                return $this->set_error("Method print_thumbnail: Error in cache generation of image '$image'.");
             }
             return true;
-        	
+
         }
-        if ($return_img == false){
-            header("Expires: " . gmdate("D, d M Y H:i:s") . " GMT");        
+        if ($return_img == false) {
+            header("Expires: " . gmdate("D, d M Y H:i:s") . " GMT");
             header("Cache-Control: no-store, no-cache, must-revalidate");
-            header("Pragma: no-cache"); 
+            header("Pragma: no-cache");
             header("Content-Transfer-Encoding: binary");
-            header("Content-type: ".image_type_to_mime_type($format));
-			if ($display_inline == true){
-				header("Content-Disposition: inline; filename=\"".time().".".$this -> file_ext[$format]."\"");
-            }
-			else{
-				header("Content-Disposition: attachment; filename=\"".time().".".$this -> file_ext[$format]."\"");
-			}
-			if ($this -> is_cacheable()){
-                echo implode("",file($cache_file));
+            header("Content-type: " . image_type_to_mime_type($format));
+            if ($display_inline == true) {
+                header("Content-Disposition: inline; filename=\"" . time() . "." . $this->file_ext[$format] . "\"");
+            } else {
+                header("Content-Disposition: attachment; filename=\"" . time() . "." . $this->file_ext[$format] . "\"");
             }
-            else{
-                switch ($format){
+            if ($this->is_cacheable()) {
+                echo implode("", file($cache_file));
+            } else {
+                switch ($format) {
                     case 1:
                         $outputed = @imagegif($thumbnail);
                         break;
                     case 2:
-                        $outputed = @imageJPEG($thumbnail,null,100);
+                        $outputed = @imageJPEG($thumbnail, null, 100);
                         break;
                     case 3:
                         $outputed = @imagepng($thumbnail);
@@ -595,515 +582,505 @@ function print_thumbnail($image,$width,$height,$return_img = false, $display_inl
                     default:
                         $outputed = false;
                 }
-                if (!$outputed){
+                if (!$outputed) {
                     return $this->set_error("Method print_thumbnail: Error outputting Image '$image'");
                 }
             }
-            
-        }
-        else{
-            if ($this -> is_cacheable()){
-                return implode("",file($cache_file));
-            }
-            else{
-                return $this -> set_error("Method print_thumbnail: Cannot return image '$image'! Cache must be enabled!");
+
+        } else {
+            if ($this->is_cacheable()) {
+                return implode("", file($cache_file));
+            } else {
+                return $this->set_error("Method print_thumbnail: Cannot return image '$image'! Cache must be enabled!");
             }
         }
         //Destroy the image
         imagedestroy($handle);
         imagedestroy($thumbnail);
-		//Clear any cache; if needed
-		$this -> clear_cache();
-     }
-     /**
-	      * Function to turn a HEX Based color into an array of RBG
-	      * 
-	      * http://sg2.php.net/hexdec User Comment by henrique at recidive dot com
-	      * 
-	      * @access private
-	      * @param string $hex The Color code in HEX
-	      * @return array
-	      */
-    function hex2dec($hex) {
-      $color = str_replace('#', '', $hex);
-      $ret = array(
-       'r' => hexdec(substr($color, 0, 2)),
-       'g' => hexdec(substr($color, 2, 2)),
-       'b' => hexdec(substr($color, 4, 2))
-      );
-      return $ret;
-    }    
-     /**
-	     * Generate an image with the specified font and options. Image generated is always PNG. 
-	     * 
-	     * MAKE SURE TO GIVE COLOUR CODES IN HEX FORM!
-	     * 
-	     * @access private
-	     * @param string $text  The Text to output
-	     * @param integer $width The width of the image
-	     * @param integer $height The Width of the Image
-	     * @param integer $size The Font size of the text
-	     * @param string $font The Font of the text to use
-	     * @param integer $x The X-co-ordinate of the lower left corner of the text
-	     * @param integer $y The Y-Co-ordinate of the lower left of the text
-	     * @param string $bg The Background colour of the text. Defaults to #ffffff
-	     * @param string $textcolor The Colour of the text Defaults to #000000
-	     */
-     function output_text($text,$width,$height,$size,$font,$x,$y,$bg="ffffff",$textcolor="000000"){
+        //Clear any cache; if needed
+        $this->clear_cache();
+    }
+
+    /**
+     * Function to turn a HEX Based color into an array of RBG
+     *
+     * http://sg2.php.net/hexdec User Comment by henrique at recidive dot com
+     *
+     * @access private
+     * @param string $hex The Color code in HEX
+     * @return array
+     */
+    function hex2dec($hex)
+    {
+        $color = str_replace('#', '', $hex);
+        $ret = array(
+            'r' => hexdec(substr($color, 0, 2)),
+            'g' => hexdec(substr($color, 2, 2)),
+            'b' => hexdec(substr($color, 4, 2))
+        );
+        return $ret;
+    }
+
+    /**
+     * Generate an image with the specified font and options. Image generated is always PNG.
+     *
+     * MAKE SURE TO GIVE COLOUR CODES IN HEX FORM!
+     *
+     * @access private
+     * @param string $text The Text to output
+     * @param integer $width The width of the image
+     * @param integer $height The Width of the Image
+     * @param integer $size The Font size of the text
+     * @param string $font The Font of the text to use
+     * @param integer $x The X-co-ordinate of the lower left corner of the text
+     * @param integer $y The Y-Co-ordinate of the lower left of the text
+     * @param string $bg The Background colour of the text. Defaults to #ffffff
+     * @param string $textcolor The Colour of the text Defaults to #000000
+     */
+    function output_text($text, $width, $height, $size, $font, $x, $y, $bg = "ffffff", $textcolor = "000000")
+    {
         /*
         if (!$font || !$size || !$height || !$width || !$text || !$x || !$y){
             return $this -> set_error("Method output_text: Missing Parameters");
         }
         */
-        $bg = $this -> hex2dec($bg);
-        $textcolor = $this -> hex2dec($textcolor);
-            if (!file_exists($font)){
-                return $this -> set_error("Method print_thumbnail: Font cannot be found");
-            }
-            else{
-                $im = @imagecreate($width, $height) or die("GD is not enabled.");
-                $background_color = imagecolorallocate($im, $bg["r"], $bg["g"], $bg["b"]);
-                //$transparent = imagecolortransparent($im,$background_color);
-                $text_color = imagecolorallocate($im, $textcolor["r"],$textcolor["g"],$textcolor["b"]);
-                //imagestring($im, $font, 0, 0,  "$msg", $text_color);
-                 imagettftext($im, $size, 0, $x,$y, $text_color, $font,"$text");
-                header("Content-type: image/png");
-                imagepng($im);
-                imagedestroy($im);
-                die();
-            }
+        $bg = $this->hex2dec($bg);
+        $textcolor = $this->hex2dec($textcolor);
+        if (!file_exists($font)) {
+            return $this->set_error("Method print_thumbnail: Font cannot be found");
+        } else {
+            $im = @imagecreate($width, $height) or die("GD is not enabled.");
+            $background_color = imagecolorallocate($im, $bg["r"], $bg["g"], $bg["b"]);
+            //$transparent = imagecolortransparent($im,$background_color);
+            $text_color = imagecolorallocate($im, $textcolor["r"], $textcolor["g"], $textcolor["b"]);
+            //imagestring($im, $font, 0, 0,  "$msg", $text_color);
+            imagettftext($im, $size, 0, $x, $y, $text_color, $font, "$text");
+            header("Content-type: image/png");
+            imagepng($im);
+            imagedestroy($im);
+            die();
+        }
     }
-        /**
-	         * Validates whether a Given URL is valid or whether it is a remote URL
-	         * 
-	         * Returns 0 if it is not remote
-	         * Returns 1 if it is remote and is accessible
-	         * 
-	         * @param string $address URL
-	         * @access private
-	         * @return integer
-	         */
-        function is_remote($address){
-            //Validate that the address is of correct format
-            //if (!preg_match("/^(http|https|ftp|(ajxp\.[a-z]*))\:\/\/([a-zA-Z0-9\.\-]+(\:[a-zA-Z0-9\.&%\$\-]+)*@)*((25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])|([a-zA-Z0-9\-]+\.)*[a-zA-Z0-9\-]+\.[a-zA-Z]{2,4})(\:[0-9]+)*(\/[^\/][a-zA-Z0-9\.\,\?\'\\/\+&%\$#\=~_\-]*)*[\/]{0,1}$/",$address)){
-                //return 0;
-            //}
-            /*
-            //Test for connectivity
-            $connected = $this -> validate_connectivity($address);
-            if (!$connected){
-                return 2;
-            }
-            */
-            return 1;
+
+    /**
+     * Validates whether a Given URL is valid or whether it is a remote URL
+     *
+     * Returns 0 if it is not remote
+     * Returns 1 if it is remote and is accessible
+     *
+     * @param string $address URL
+     * @access private
+     * @return integer
+     */
+    function is_remote($address)
+    {
+        //Validate that the address is of correct format
+        //if (!preg_match("/^(http|https|ftp|(ajxp\.[a-z]*))\:\/\/([a-zA-Z0-9\.\-]+(\:[a-zA-Z0-9\.&%\$\-]+)*@)*((25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9])\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[1-9]|0)\.(25[0-5]|2[0-4][0-9]|[0-1]{1}[0-9]{2}|[1-9]{1}[0-9]{1}|[0-9])|([a-zA-Z0-9\-]+\.)*[a-zA-Z0-9\-]+\.[a-zA-Z]{2,4})(\:[0-9]+)*(\/[^\/][a-zA-Z0-9\.\,\?\'\\/\+&%\$#\=~_\-]*)*[\/]{0,1}$/",$address)){
+        //return 0;
+        //}
+        /*
+        //Test for connectivity
+        $connected = $this -> validate_connectivity($address);
+        if (!$connected){
+            return 2;
         }
+        */
+        return 1;
+    }
 
     /**
-	     * Scale the image to the magnitude specified and then calls print_thumbnail
-	     * Returns the dimensions calculated on request
-	     * 
-	     * @param string $image The Image
-	     * @param number $magnitude The magnitude of scaling Value can be a float of integer
-	     * @param boolean $return Whether to return the values or to call print_thumbnail. If set to true, will return an array or Width and Height respectively
-	     * @access public
-	     * @return mixed
-	     */
-    function scale_thumbnail($image,$magnitude,$return = false){
+     * Scale the image to the magnitude specified and then calls print_thumbnail
+     * Returns the dimensions calculated on request
+     *
+     * @param string $image The Image
+     * @param number $magnitude The magnitude of scaling Value can be a float of integer
+     * @param boolean $return Whether to return the values or to call print_thumbnail. If set to true, will return an array or Width and Height respectively
+     * @access public
+     * @return mixed
+     */
+    function scale_thumbnail($image, $magnitude, $return = false)
+    {
         $magnitude = abs(floatval($magnitude));
 
-        $array  = @$this -> retrieve_image_data($image);
-        if (!$array){
-            return $this -> set_error("Method scale_thumbnail: Unable to retrieve Image '$image' Size.");
-        }
-        list($width,$height) = $array;
-        if ($magnitude == 0){
-            return $this -> set_error("Method scale_thumbnail error: Magnitude cannot be zero.");
+        $array = @$this->retrieve_image_data($image);
+        if (!$array) {
+            return $this->set_error("Method scale_thumbnail: Unable to retrieve Image '$image' Size.");
         }
-        elseif ($magnitude == 1){
+        list($width, $height) = $array;
+        if ($magnitude == 0) {
+            return $this->set_error("Method scale_thumbnail error: Magnitude cannot be zero.");
+        } elseif ($magnitude == 1) {
             //Do nothing... 
+        } else {
+            $width = round($width * $magnitude);
+            $height = round($height * $magnitude);
         }
-        else{
-            $width = round($width*$magnitude);
-            $height = round($height*$magnitude);
-        }
-        if ($return == false){
-            return $this -> print_thumbnail($image,$width,$height);
-        }
-        else{
-            $array = array($width,$height);
+        if ($return == false) {
+            return $this->print_thumbnail($image, $width, $height);
+        } else {
+            $array = array($width, $height);
             return $array;
         }
     }
-    
+
     /**
-	     * Calculate the best Image dimensions so that they fit within the supplied dimensions.
-	     * Returns the dimensions calculated on request
-	     * 
-	     * i.e. If you call this method with $width and $height of 200 and 100 and the $image provided is 500,250
-	     * A calculation will be made so that the width and height of the thumbnail does not alter the image width,height ratio
-	     * 
-	     * 
-	     * @param string $image The Image
-	     * @param integer $max_width The Width. Set to -1 for no restrictions
-	     * @param integer $max_height The height. Set to -1 for no restrictions
-	     * @param integer $behaviour Sometimes, 2 values are obtained. Set this to 1 to return the one with the bigger pixel area or 2 to return the one with smaller pixel area.
-	     * @param boolean boolean $return Whether to return the values or to call print_thumbnail. If set to true, will return an array or Width and Height respectively
-	     * @return mixed
-	     * @access public
-	     */
-     
-     function fit_thumbnail($image,$max_width = -1, $max_height = -1,$behaviour = 1 ,$return = false){
-
-        $array = @$this -> retrieve_image_data($image);
-        if (!$array){
-            return $this -> set_error("Method scale_thumbnail: Unable to retrieve Image '$image' Size.");  
-        } 
-        list($width,$height) = $array; 
+     * Calculate the best Image dimensions so that they fit within the supplied dimensions.
+     * Returns the dimensions calculated on request
+     *
+     * i.e. If you call this method with $width and $height of 200 and 100 and the $image provided is 500,250
+     * A calculation will be made so that the width and height of the thumbnail does not alter the image width,height ratio
+     *
+     *
+     * @param string $image The Image
+     * @param integer $max_width The Width. Set to -1 for no restrictions
+     * @param integer $max_height The height. Set to -1 for no restrictions
+     * @param integer $behaviour Sometimes, 2 values are obtained. Set this to 1 to return the one with the bigger pixel area or 2 to return the one with smaller pixel area.
+     * @param boolean boolean $return Whether to return the values or to call print_thumbnail. If set to true, will return an array or Width and Height respectively
+     * @return mixed
+     * @access public
+     */
+
+    function fit_thumbnail($image, $max_width = -1, $max_height = -1, $behaviour = 1, $return = false)
+    {
+
+        $array = @$this->retrieve_image_data($image);
+        if (!$array) {
+            return $this->set_error("Method scale_thumbnail: Unable to retrieve Image '$image' Size.");
+        }
+        list($width, $height) = $array;
         $max_height = intval($max_height);
         $max_width = intval($max_width);
         //Calculate the width:height ratio
-        if ($height == 0 || $width == 0){
-            return $this -> set_error("Method fit_thumbnail: Unknown error. Height/width is zero.");
+        if ($height == 0 || $width == 0) {
+            return $this->set_error("Method fit_thumbnail: Unknown error. Height/width is zero.");
         }
-        $ratio = $height/$width;
-        if ($max_height < 0 || $max_width < 0){
-            if ($max_height < 0 && $max_width < 0){
+        $ratio = $height / $width;
+        if ($max_height < 0 || $max_width < 0) {
+            if ($max_height < 0 && $max_width < 0) {
                 //Do nothing
-            }
-            elseif ($max_height < 0){
+            } elseif ($max_height < 0) {
                 $width = $max_width;
-                $height = round($width*$ratio);
-            }
-            elseif ($max_width < 0){
+                $height = round($width * $ratio);
+            } elseif ($max_width < 0) {
                 $height = $max_height;
-                $width = round($height/$ratio);
+                $width = round($height / $ratio);
             }
-        }
-        elseif ($ratio == 1){
+        } elseif ($ratio == 1) {
             //Same Height/Width
-            if ($max_height === $max_width){
+            if ($max_height === $max_width) {
                 $width = $max_width;
                 $height = $max_height;
+            } else {
+                $height = min($max_height, $max_width);
+                $width = min($max_height, $max_width);
             }
-            else{
-                $height = min($max_height,$max_width);
-                $width = min($max_height,$max_width);
-            }
-        }
-        else{
+        } else {
             $case1_width = $max_width;
-            $case1_height = round($case1_width*$ratio);
-            $case1_area = round($case1_width*$case1_height);
-            
+            $case1_height = round($case1_width * $ratio);
+            $case1_area = round($case1_width * $case1_height);
+
             $case2_height = $max_height;
-            $case2_width = round($case2_height/$ratio);
-            $case2_area = round($case2_width*$case2_height);
-            
+            $case2_width = round($case2_height / $ratio);
+            $case2_area = round($case2_width * $case2_height);
+
             //Check if it is an ambiguous case
-            if ($case1_width <= $max_width && $case1_height <= $max_height && $case2_width <= $max_width && $case2_height <= $max_height){
-                if ($behaviour == 1){
-                    if ($case1_area >= $case2_area){
+            if ($case1_width <= $max_width && $case1_height <= $max_height && $case2_width <= $max_width && $case2_height <= $max_height) {
+                if ($behaviour == 1) {
+                    if ($case1_area >= $case2_area) {
                         $height = $case1_height;
                         $width = $case1_width;
-                    }
-                    else{
+                    } else {
                         $height = $case2_height;
-                        $width = $case2_width;                      
+                        $width = $case2_width;
                     }
-                }
-                else{
-                    if ($case1_area <= $case2_area){
+                } else {
+                    if ($case1_area <= $case2_area) {
                         $height = $case1_height;
                         $width = $case1_width;
-                    }
-                    else{
+                    } else {
                         $height = $case2_height;
-                        $width = $case2_width;                      
-                    }                   
+                        $width = $case2_width;
+                    }
                 }
-            }
-            else{
-                if ($case1_width <= $max_width && $case1_height <= $max_height){
+            } else {
+                if ($case1_width <= $max_width && $case1_height <= $max_height) {
                     $height = $case1_height;
                     $width = $case1_width;
-                }
-                else{
+                } else {
                     $height = $case2_height;
-                    $width = $case2_width;                      
+                    $width = $case2_width;
                 }
             }
         }
-        list($owidth,$oheight) = $array;// $this -> retrieve_image_data($image);
-        if ($height > $oheight || $width > $owidth){
+        list($owidth, $oheight) = $array;// $this -> retrieve_image_data($image);
+        if ($height > $oheight || $width > $owidth) {
             $width = $owidth;
             $height = $oheight;
         }
 
         //if ($format == 2){
-        $orientation = $this -> exiforientation($image, true);
-        if ($this -> rotationsupported($orientation) and $orientation>4) 
-        {
-           $width2 = $width;
-           $width = $height;
-           $height = $width2;
+        $orientation = $this->exiforientation($image, true);
+        if ($this->rotationsupported($orientation) and $orientation > 4) {
+            $width2 = $width;
+            $width = $height;
+            $height = $width2;
         }
 
-        if ($return == false){
-            return $this -> print_thumbnail($image,$width,$height);
-        }
-        else{
-            $array = array($width,$height);
+        if ($return == false) {
+            return $this->print_thumbnail($image, $width, $height);
+        } else {
+            $array = array($width, $height);
             return $array;
         }
-     }
-     /**
-	     * Writes an image file according to data provided. This method is just here to save scripters some trouble.
-	     * Users have to ensure directory can be written to! 
-	     *  
-	     * @param string $image The Image data
-	     * @param string $filename The relative path to the image file to be written
-	     * @param boolean $overwrite Specifies whether the file, if it exists, should be overwritten or not.
-	     * @return boolean
-	     */
-     function image_to_file($image,$filename,$overwrite=false){
-        if (file_exists ($filename) && $overwrite == false){
-            return $this -> set_error("Method image_to_file: File exists.");
-        } 
-        $handle = @fopen($filename,"wb");
-        if (!$handle){
-            return $this -> set_error("Method image_to_file: Unknown error. File cannot be opened for writing.");
+    }
+
+    /**
+     * Writes an image file according to data provided. This method is just here to save scripters some trouble.
+     * Users have to ensure directory can be written to!
+     *
+     * @param string $image The Image data
+     * @param string $filename The relative path to the image file to be written
+     * @param boolean $overwrite Specifies whether the file, if it exists, should be overwritten or not.
+     * @return boolean
+     */
+    function image_to_file($image, $filename, $overwrite = false)
+    {
+        if (file_exists($filename) && $overwrite == false) {
+            return $this->set_error("Method image_to_file: File exists.");
+        }
+        $handle = @fopen($filename, "wb");
+        if (!$handle) {
+            return $this->set_error("Method image_to_file: Unknown error. File cannot be opened for writing.");
         }
-        @flock($handle,LOCK_EX);
+        @flock($handle, LOCK_EX);
         $write = fwrite($handle, $image);
-        if (!$write){
-            return $this -> set_error("Method image_to_file: Unknown error. File cannot be written to.");
+        if (!$write) {
+            return $this->set_error("Method image_to_file: Unknown error. File cannot be written to.");
         }
-        fclose ($handle);
+        fclose($handle);
         return true;
-     }
-     
-     /**
-	     * Attempts to retrieve a remote file data and returns it. Returns false on error.
-	     * 
-	     * Returns string on success, 0 on failure after repeated attempts using different methods, 1 on invalid URL, 2 on inaccessible URL, 3 on file not exist error
-	     * 
-	     * @param string $url URL
-	     * @param boolean $skip_checks Set to skip URL validating
-	     * @param boolean $refresh Set to ignore cache
-	     * @param integer $force_method Force a certain method of file retrival. Set to null
-	     * @return mixed
-	     * @access private
-	     */
-    function retrieve_remote_file($url,$skip_checks=false,$refresh=false, $force_method = 2){
-        if ($refresh == false && !empty($this -> data_cache[sha1($url)])){
-            return $this -> data_cache[sha1($url)];
+    }
+
+    /**
+     * Attempts to retrieve a remote file data and returns it. Returns false on error.
+     *
+     * Returns string on success, 0 on failure after repeated attempts using different methods, 1 on invalid URL, 2 on inaccessible URL, 3 on file not exist error
+     *
+     * @param string $url URL
+     * @param boolean $skip_checks Set to skip URL validating
+     * @param boolean $refresh Set to ignore cache
+     * @param integer $force_method Force a certain method of file retrival. Set to null
+     * @return mixed
+     * @access private
+     */
+    function retrieve_remote_file($url, $skip_checks = false, $refresh = false, $force_method = 2)
+    {
+        if ($refresh == false && !empty($this->data_cache[sha1($url)])) {
+            return $this->data_cache[sha1($url)];
         }
-        if ($skip_checks == false){
-            if ($this -> is_remote($url) == 1){
-                    //Check that file exists (Check only enabled in PHP 5 because only PHP 5 supports for checking remote files
-                    if (phpversion() >= 5){
-                        if (!file_exists($url)){
-							$this -> set_error("Method retrieve_remote_file: '$url' does not exists.", false);
-                            return 3;
-                        }   
+        if ($skip_checks == false) {
+            if ($this->is_remote($url) == 1) {
+                //Check that file exists (Check only enabled in PHP 5 because only PHP 5 supports for checking remote files
+                if (phpversion() >= 5) {
+                    if (!file_exists($url)) {
+                        $this->set_error("Method retrieve_remote_file: '$url' does not exists.", false);
+                        return 3;
                     }
-            }
-            elseif ($this -> is_remote($url) == 0){
-                if (!file_exists($url)){
-					$this -> set_error("Method retrieve_remote_file: '$url' is invalid.", false);
+                }
+            } elseif ($this->is_remote($url) == 0) {
+                if (!file_exists($url)) {
+                    $this->set_error("Method retrieve_remote_file: '$url' is invalid.", false);
                     return 1;
                 }
             }
         }
-        
-        
-        if (($force_method == null || $force_method == 1)){
-            
+
+
+        if (($force_method == null || $force_method == 1)) {
+
             $data = "";
             $fp = fopen($url, "r");
-            if(is_resource($fp)){
+            if (is_resource($fp)) {
                 while (!feof($fp)) {
                     $data .= fread($fp, 4096);
                 }
                 fclose($fp);
             }
             //$data = @implode("",file($url));
-            if (strlen($data) > 0){
-                $this -> data_cache[sha1($url)] = $data;
+            if (strlen($data) > 0) {
+                $this->data_cache[sha1($url)] = $data;
                 return $data;
-            }else{
-            	$data = false;
+            } else {
+                $data = false;
             }
         }
         //METHOD 2: HTTP_RETRIEVE + CURL (by class)
-		if (class_exists("HTTPRetriever") && ($force_method == null || $force_method == 2)){
-			$handle = new HTTPRetriever();
-			
-			//Set Options
-			$handle -> headers["Referer"] = $url;
-			$handle -> insecure_ssl = true;
-			$handle -> ignore_ssl_hostname = true;
-			$handle -> follow_redirects = true;
-			
-			//Retreieve Data
-			if (!$handle -> get($url)){
-				//Well,,,
-			}
-			else{
-				$data = $handle -> response;
-				$this -> data_cache[sha1($url)] = $data;
-				return $data;
-			}
-		}
+        if (class_exists("HTTPRetriever") && ($force_method == null || $force_method == 2)) {
+            $handle = new \HTTPRetriever();
+
+            //Set Options
+            $handle->headers["Referer"] = $url;
+            $handle->insecure_ssl = true;
+            $handle->ignore_ssl_hostname = true;
+            $handle->follow_redirects = true;
+
+            //Retreieve Data
+            if (!$handle->get($url)) {
+                //Well,,,
+            } else {
+                $data = $handle->response;
+                $this->data_cache[sha1($url)] = $data;
+                return $data;
+            }
+        }
         //METHOD 3: CURL Take II
-        if (function_exists("curl_version") && ($force_method == null || $force_method == 3)){
-            $handle = @curl_init(); 
-            if ($handle != false){
-                curl_setopt ($handle, CURLOPT_RETURNTRANSFER, 1);
-                curl_setopt ($handle, CURLOPT_CONNECTTIMEOUT, 1); 
-                curl_setopt ($handle, CURLOPT_FOLLOWLOCATION, 1);
-                curl_setopt ($handle, CURLOPT_URL, $url);
+        if (function_exists("curl_version") && ($force_method == null || $force_method == 3)) {
+            $handle = @curl_init();
+            if ($handle != false) {
+                curl_setopt($handle, CURLOPT_RETURNTRANSFER, 1);
+                curl_setopt($handle, CURLOPT_CONNECTTIMEOUT, 1);
+                curl_setopt($handle, CURLOPT_FOLLOWLOCATION, 1);
+                curl_setopt($handle, CURLOPT_URL, $url);
                 $data = @curl_exec($handle);
-                curl_close($handle);  
-                if ($data != false){
-                    $this -> data_cache[sha1($url)] = $data;
+                curl_close($handle);
+                if ($data != false) {
+                    $this->data_cache[sha1($url)] = $data;
                     return $data;
                 }
             }
         }
-        
+
         //Well, too bad.
-		$this -> set_error("Method retrieve_remote_file: '$url' cannot be retrieved.", false);
+        $this->set_error("Method retrieve_remote_file: '$url' cannot be retrieved.", false);
         return 0;
     }
-    
+
     /**
-	     *
-	     * Retrieves image data. Workaround for allow_url_fopen if it is disabled
-	     * Does not validate file existence
-	     * 
-	     * @access private
-	     * @return array
-	     * @param string $file Filename
-	     * 
-	     */
-    function retrieve_image_data($file){
+     *
+     * Retrieves image data. Workaround for allow_url_fopen if it is disabled
+     * Does not validate file existence
+     *
+     * @access private
+     * @return array
+     * @param string $file Filename
+     *
+     */
+    function retrieve_image_data($file)
+    {
         //DOESN'T CHECK!!!
-        if ($this -> is_remote($file) == 0){
+        if ($this->is_remote($file) == 0) {
             return getimagesize($file);
         }
         //Try via the direct method first.
-        
-        if ($this -> remote_check == true){
-            if(!isSet($this->currentRealFile)){
+
+        if ($this->remote_check == true) {
+            if (!isSet($this->currentRealFile)) {
                 $this->currentRealFile = call_user_func(array($this->remote_wrapper, "getRealFSReference"), $file);
             }
             $array = getimagesize($this->currentRealFile);
-            if ($array != false){
+            if ($array != false) {
                 return $array;
             }
         }
-		
-        if ($this -> is_cacheable()){
-			$filename = 'remote_'.sha1($file)."_".time();
-			//Check for file existence
-			if (file_exists($this -> cache_dir.$filename) && $this -> remote_check == false){
-				$data = implode("", file($this -> cache_dir.$filename));
-			}
-			else{
-				$data = $this -> retrieve_remote_file($file);
-	        }
-			if (!is_string($data)){
-				$this -> set_error("Method retrieve_image_data: '$file' cannot be read.", false);
-	            return false;
-	        }
-			if (!file_exists($this -> cache_dir.$filename) || $this -> remote_check == true){
-	            $handle = @fopen($this -> cache_dir.$filename,"w+");
-	            if ($handle){
-	                flock($handle,LOCK_EX);
-	                fwrite($handle,$data);
+
+        if ($this->is_cacheable()) {
+            $filename = 'remote_' . sha1($file) . "_" . time();
+            //Check for file existence
+            if (file_exists($this->cache_dir . $filename) && $this->remote_check == false) {
+                $data = implode("", file($this->cache_dir . $filename));
+            } else {
+                $data = $this->retrieve_remote_file($file);
+            }
+            if (!is_string($data)) {
+                $this->set_error("Method retrieve_image_data: '$file' cannot be read.", false);
+                return false;
+            }
+            if (!file_exists($this->cache_dir . $filename) || $this->remote_check == true) {
+                $handle = @fopen($this->cache_dir . $filename, "w+");
+                if ($handle) {
+                    flock($handle, LOCK_EX);
+                    fwrite($handle, $data);
                     fclose($handle);
-	                }
-	            }
-			$array = getimagesize($this -> cache_dir.$filename);
-			if ($this -> remote_check == true){
-				@unlink($this-> cache_dir.$filename);
-			}
-			if ($array != false){
-				return $array;
-			}
+                }
+            }
+            $array = getimagesize($this->cache_dir . $filename);
+            if ($this->remote_check == true) {
+                @unlink($this->cache_dir . $filename);
+            }
+            if ($array != false) {
+                return $array;
+            }
         }
-        
+
         //Well, TOO BAD
-		$this -> set_error("Method rretrieve_image_data: Unable to retrieve image '$file' data.", false);
+        $this->set_error("Method rretrieve_image_data: Unable to retrieve image '$file' data.", false);
         return false;
     }
-	
+
     /**
-	     *
-	     * Clears Cache 
-	     * 
-	     * @access private
-	     * 
-	     */
-	function clear_cache(){
-		if ($this -> clear_cache == true){
-			$handle = @opendir($this -> cache_dir);
-			if ($handle !== FALSE) {
-			   while (false !== ($file = readdir($handle))) {
-				   if ($file != "." && $file != ".." && $file != ".htaccess" && $file != "error_log") {
-					   @unlink($this -> cache_dir.$file) or $this -> set_error("Method clear_cache: Unable to delete '$file' from cache.",false);
-				   }
-			   }
-			   closedir($handle);
-			}
-			else{
-				$this -> set_error("Method clear_cache: Unable to open cache directory.",false);
-			}
-		}
-	}
-	
-	function fastimagecopyresampled (&$dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h, $quality = 1)
-	{
-		// Plug-and-Play fastimagecopyresampled function replaces much slower imagecopyresampled.
-		// Just include this function and change all "imagecopyresampled" references to "fastimagecopyresampled".
-		// Typically from 30 to 60 times faster when reducing high resolution images down to thumbnail size using the default quality setting.
-		// Author: Tim Eckel - Date: 09/07/07 - Version: 1.1 - Project: FreeRingers.net - Freely distributable - These comments must remain.
-		//
-		// Optional "quality" parameter (defaults is 3). Fractional values are allowed, for example 1.5. Must be greater than zero.
-		// Between 0 and 1 = Fast, but mosaic results, closer to 0 increases the mosaic effect.
-		// 1 = Up to 350 times faster. Poor results, looks very similar to imagecopyresized.
-		// 2 = Up to 95 times faster.  Images appear a little sharp, some prefer this over a quality of 3.
-		// 3 = Up to 60 times faster.  Will give high quality smooth results very close to imagecopyresampled, just faster.
-		// 4 = Up to 25 times faster.  Almost identical to imagecopyresampled for most images.
-		// 5 = No speedup. Just uses imagecopyresampled, no advantage over imagecopyresampled.
-
-		if (empty($src_image) || empty($dst_image) || $quality <= 0) { return false; }
-		if ($quality < 5 && (($dst_w * $quality) < $src_w || ($dst_h * $quality) < $src_h)) {
-			$temp = imagecreatetruecolor ($dst_w * $quality + 1, $dst_h * $quality + 1);
-			imagecopyresized ($temp, $src_image, 0, 0, $src_x, $src_y, $dst_w * $quality + 1, $dst_h * $quality + 1, $src_w, $src_h);
-			imagecopyresampled ($dst_image, $temp, $dst_x, $dst_y, 0, 0, $dst_w, $dst_h, $dst_w * $quality, $dst_h * $quality);
-			imagedestroy ($temp);
-		} else imagecopyresampled ($dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
-
-		return true;
-	}
+     *
+     * Clears Cache
+     *
+     * @access private
+     *
+     */
+    function clear_cache()
+    {
+        if ($this->clear_cache == true) {
+            $handle = @opendir($this->cache_dir);
+            if ($handle !== FALSE) {
+                while (false !== ($file = readdir($handle))) {
+                    if ($file != "." && $file != ".." && $file != ".htaccess" && $file != "error_log") {
+                        @unlink($this->cache_dir . $file) or $this->set_error("Method clear_cache: Unable to delete '$file' from cache.", false);
+                    }
+                }
+                closedir($handle);
+            } else {
+                $this->set_error("Method clear_cache: Unable to open cache directory.", false);
+            }
+        }
+    }
+
+    function fastimagecopyresampled(&$dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h, $quality = 1)
+    {
+        // Plug-and-Play fastimagecopyresampled function replaces much slower imagecopyresampled.
+        // Just include this function and change all "imagecopyresampled" references to "fastimagecopyresampled".
+        // Typically from 30 to 60 times faster when reducing high resolution images down to thumbnail size using the default quality setting.
+        // Author: Tim Eckel - Date: 09/07/07 - Version: 1.1 - Project: FreeRingers.net - Freely distributable - These comments must remain.
+        //
+        // Optional "quality" parameter (defaults is 3). Fractional values are allowed, for example 1.5. Must be greater than zero.
+        // Between 0 and 1 = Fast, but mosaic results, closer to 0 increases the mosaic effect.
+        // 1 = Up to 350 times faster. Poor results, looks very similar to imagecopyresized.
+        // 2 = Up to 95 times faster.  Images appear a little sharp, some prefer this over a quality of 3.
+        // 3 = Up to 60 times faster.  Will give high quality smooth results very close to imagecopyresampled, just faster.
+        // 4 = Up to 25 times faster.  Almost identical to imagecopyresampled for most images.
+        // 5 = No speedup. Just uses imagecopyresampled, no advantage over imagecopyresampled.
+
+        if (empty($src_image) || empty($dst_image) || $quality <= 0) {
+            return false;
+        }
+        if ($quality < 5 && (($dst_w * $quality) < $src_w || ($dst_h * $quality) < $src_h)) {
+            $temp = imagecreatetruecolor($dst_w * $quality + 1, $dst_h * $quality + 1);
+            imagecopyresized($temp, $src_image, 0, 0, $src_x, $src_y, $dst_w * $quality + 1, $dst_h * $quality + 1, $src_w, $src_h);
+            imagecopyresampled($dst_image, $temp, $dst_x, $dst_y, 0, 0, $dst_w, $dst_h, $dst_w * $quality, $dst_h * $quality);
+            imagedestroy($temp);
+        } else imagecopyresampled($dst_image, $src_image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
+
+        return true;
+    }
 
     function exiforientation($image, $fetch)
     {
-        if (!$this -> exif_rotation || !function_exists('exif_read_data'))
+        if (!$this->exif_rotation || !function_exists('exif_read_data'))
             return false;
 
-        if ($fetch)
-        {
-            $image_data = $this -> retrieve_remote_file($image,true, false, 1);
-            $exif = @exif_read_data("data://image/jpeg;base64,".@base64_encode($image_data),'IFD0');
-        } else
-        {
+        if ($fetch) {
+            $image_data = $this->retrieve_remote_file($image, true, false, 1);
+            $exif = @exif_read_data("data://image/jpeg;base64," . @base64_encode($image_data), 'IFD0');
+        } else {
             $exif = @exif_read_data($image);
         }
-        if ($exif!=FALSE)
-        {
+        if ($exif != FALSE) {
             return $exif['Orientation'];
         }
     }
@@ -1113,13 +1090,13 @@ function rotationsupported($exif_orientation)
         if (!$exif_orientation)
             return FALSE;
 
-        if (!$this -> exif_rotation)
+        if (!$this->exif_rotation)
             return FALSE;
 
         if (function_exists("imageflip"))
             return TRUE;
 
-        if ($exif_orientation!=2 and $exif_orientation!=4 and $exif_orientation!=5 and $exif_orientation!=7)
+        if ($exif_orientation != 2 and $exif_orientation != 4 and $exif_orientation != 5 and $exif_orientation != 7)
             return TRUE;
 
         return FALSE;
diff --git a/core/src/plugins/editor.diaporama/class.Diaporama.js b/core/src/plugins/editor.diaporama/class.Diaporama.js
index c5b14fdcd4..4192e8bc54 100644
--- a/core/src/plugins/editor.diaporama/class.Diaporama.js
+++ b/core/src/plugins/editor.diaporama/class.Diaporama.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  * Description : The image gallery manager.
  */
 Class.create("Diaporama", AbstractEditor, {
@@ -713,14 +713,14 @@ Class.create("Diaporama", AbstractEditor, {
 	
     getSharedPreviewTemplate : function(node){
 
-        return new Template('<img width="#{WIDTH}" height="#{HEIGHT}" src="#{DL_CT_LINK}">');
+        return new Template('<img src="#{DL_CT_LINK}">');
 
     },
 
     getRESTPreviewLinks:function(node){
         return {
-            "Original image": "&file=" + encodeURIComponent(node.getPath()),
-            "Thumbnail (200px)": "&get_thumb=true&dimension=200&file=" + encodeURIComponent(node.getPath())
+            "Original image": "",
+            "Thumbnail (200px)": "&get_thumb=true&dimension=200"
         };
     },
 
diff --git a/core/src/plugins/editor.diaporama/class.ImagePreviewer.php b/core/src/plugins/editor.diaporama/class.ImagePreviewer.php
deleted file mode 100644
index fabbf329ef..0000000000
--- a/core/src/plugins/editor.diaporama/class.ImagePreviewer.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Generate an image thumbnail and send the thumb/full version to the browser
- * @package AjaXplorer_Plugins
- * @subpackage Editor
- */
-class ImagePreviewer extends AJXP_Plugin
-{
-    private $currentDimension;
-
-    public function switchAction($action, $httpVars, $filesVars)
-    {
-        $repository = ConfService::getRepository();
-        if (!$repository->detectStreamWrapper(true)) {
-            return false;
-        }
-        if (!isSet($this->pluginConf)) {
-            $this->pluginConf = array("GENERATE_THUMBNAIL"=>false);
-        }
-        $selection = new UserSelection($repository, $httpVars);
-        $destStreamURL = $selection->currentBaseUrl();
-
-        if ($action == "preview_data_proxy") {
-            $file = $selection->getUniqueFile();
-            if (!file_exists($destStreamURL.$file) || !is_readable($destStreamURL.$file)) {
-                header("Content-Type: ".AJXP_Utils::getImageMimeType(basename($file))."; name=\"".basename($file)."\"");
-                header("Content-Length: 0");
-                return;
-            }
-            $this->logInfo('Preview', 'Preview content of '.$file, array("files" =>$selection->getUniqueFile()));
-            if (isSet($httpVars["get_thumb"]) && $httpVars["get_thumb"] == "true" && $this->getFilteredOption("GENERATE_THUMBNAIL", $repository)) {
-                $dimension = 200;
-                if(isSet($httpVars["dimension"]) && is_numeric($httpVars["dimension"])) $dimension = $httpVars["dimension"];
-                $this->currentDimension = $dimension;
-                $cacheItem = AJXP_Cache::getItem("diaporama_".$dimension, $destStreamURL.$file, array($this, "generateThumbnail"));
-                $data = $cacheItem->getData();
-                $cId = $cacheItem->getId();
-
-                header("Content-Type: ".AJXP_Utils::getImageMimeType(basename($cId))."; name=\"".basename($cId)."\"");
-                header("Content-Length: ".strlen($data));
-                header('Cache-Control: public');
-                header("Pragma:");
-                header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()-10000) . " GMT");
-                header("Expires: " . gmdate("D, d M Y H:i:s", time()+5*24*3600) . " GMT");
-                print($data);
-
-            } else {
-                 //$filesize = filesize($destStreamURL.$file);
-
-                $node = new AJXP_Node($destStreamURL.$file);
-
-                $fp = fopen($destStreamURL.$file, "r");
-                $stat = fstat($fp);
-                $filesize = $stat["size"];
-                header("Content-Type: ".AJXP_Utils::getImageMimeType(basename($file))."; name=\"".basename($file)."\"");
-                header("Content-Length: ".$filesize);
-                header('Cache-Control: public');
-                header("Pragma:");
-                header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()-10000) . " GMT");
-                header("Expires: " . gmdate("D, d M Y H:i:s", time()+5*24*3600) . " GMT");
-
-                $stream = fopen("php://output", "a");
-                AJXP_MetaStreamWrapper::copyFileInStream($destStreamURL.$file, $stream);
-                fflush($stream);
-                fclose($stream);
-                AJXP_Controller::applyHook("node.read", array($node));
-            }
-        }
-    }
-
-    /**
-     *
-     * @param AJXP_Node $oldFile
-     * @param AJXP_Node $newFile
-     * @param Boolean $copy
-     */
-    public function removeThumbnail($oldFile, $newFile = null, $copy = false)
-    {
-        if($oldFile == null) return ;
-        if(!$this->handleMime($oldFile->getUrl())) return;
-        if ($newFile == null || $copy == false) {
-            $diapoFolders = glob((defined('AJXP_SHARED_CACHE_DIR')?AJXP_SHARED_CACHE_DIR:AJXP_CACHE_DIR)."/diaporama_*",GLOB_ONLYDIR);
-            if ($diapoFolders !== false && is_array($diapoFolders)) {
-                foreach ($diapoFolders as $f) {
-                    $f = basename($f);
-                    $this->logDebug("GLOB ".$f);
-                    AJXP_Cache::clearItem($f, $oldFile->getUrl());
-                }
-            }
-        }
-    }
-
-    public function generateThumbnail($masterFile, $targetFile)
-    {
-        $size = $this->currentDimension;
-        require_once(AJXP_INSTALL_PATH."/plugins/editor.diaporama/PThumb.lib.php");
-        $pThumb = new PThumb($this->getFilteredOption("THUMBNAIL_QUALITY"), $this->getFilteredOption("EXIF_ROTATION"));
-        if (!$pThumb->isError()) {
-            $pThumb->remote_wrapper = "AJXP_MetaStreamWrapper";
-            //$this->logDebug("Will fit thumbnail");
-            $sizes = $pThumb->fit_thumbnail($masterFile, $size, -1, 1, true);
-            //$this->logDebug("Will print thumbnail");
-            $pThumb->print_thumbnail($masterFile,$sizes[0],$sizes[1],false, false, $targetFile);
-            //$this->logDebug("Done");
-            if ($pThumb->isError()) {
-                print_r($pThumb->error_array);
-                $this->logError("ImagePreviewer", $pThumb->error_array);
-                return false;
-            }
-        } else {
-            print_r($pThumb->error_array);
-            $this->logError("ImagePreviewer", $pThumb->error_array);
-            return false;
-        }
-    }
-
-    //public function extractImageMetadata($currentNode, &$metadata, $wrapperClassName, &$realFile){
-    /**
-     * Enrich node metadata
-     * @param AJXP_Node $ajxpNode
-     */
-    public function extractImageMetadata(&$ajxpNode)
-    {
-        $currentPath = $ajxpNode->getUrl();
-        $wrapperClassName = $ajxpNode->wrapperClassName;
-        $isImage = AJXP_Utils::is_image($currentPath);
-        $ajxpNode->is_image = $isImage;
-        if(!$isImage) return;
-        $setRemote = false;
-        $remoteWrappers = $this->getFilteredOption("META_EXTRACTION_REMOTEWRAPPERS");
-        if (is_string($remoteWrappers)) {
-            $remoteWrappers = explode(",",$remoteWrappers);
-        }
-        $remoteThreshold = $this->getFilteredOption("META_EXTRACTION_THRESHOLD");
-        if (in_array($wrapperClassName, $remoteWrappers)) {
-            if ($remoteThreshold != 0 && isSet($ajxpNode->bytesize)) {
-                $setRemote = ($ajxpNode->bytesize > $remoteThreshold);
-            } else {
-                $setRemote = true;
-            }
-        }
-        if ($isImage) {
-            if ($setRemote) {
-                $ajxpNode->image_type = "N/A";
-                $ajxpNode->image_width = "N/A";
-                $ajxpNode->image_height = "N/A";
-                $ajxpNode->readable_dimension = "";
-            } else {
-                $realFile = $ajxpNode->getRealFile();
-                list($width, $height, $type, $attr) = @getimagesize($realFile);
-
-                if($this->getFilteredOption("EXIF_ROTATION")){
-                    require_once(AJXP_INSTALL_PATH."/plugins/editor.diaporama/PThumb.lib.php");
-                    $pThumb = new PThumb($this->getFilteredOption["THUMBNAIL_QUALITY"],$this->getFilteredOption("EXIF_ROTATION"));
-                    $orientation = $pThumb->exiforientation($realFile, false);
-                    if ($pThumb->rotationsupported($orientation))
-                    {
-                        $ajxpNode->image_exif_orientation = $orientation;
-                        if ($orientation>4)
-                        {
-                            $tmp=$height;
-                            $height=$width;
-                            $width=$tmp;
-                        }
-                    }
-                }
-
-                $ajxpNode->image_type = image_type_to_mime_type($type);
-                $ajxpNode->image_width = $width;
-                $ajxpNode->image_height = $height;
-                $ajxpNode->readable_dimension = $width."px X ".$height."px";
-            }
-        }
-        //$this->logDebug("CURRENT NODE IN EXTRACT IMAGE METADATA ", $ajxpNode);
-    }
-
-    protected function handleMime($filename)
-    {
-        $mimesAtt = explode(",", $this->getXPath()->query("@mimes")->item(0)->nodeValue);
-        $ext = strtolower(pathinfo($filename, PATHINFO_EXTENSION));
-        return in_array($ext, $mimesAtt);
-    }
-
-}
diff --git a/core/src/plugins/editor.diaporama/i18n/conf/de.php b/core/src/plugins/editor.diaporama/i18n/conf/de.php
index f9abbb662c..1895fe025a 100644
--- a/core/src/plugins/editor.diaporama/i18n/conf/de.php
+++ b/core/src/plugins/editor.diaporama/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Image viewer" => "Bildbetrachter",
diff --git a/core/src/plugins/editor.diaporama/i18n/conf/en.php b/core/src/plugins/editor.diaporama/i18n/conf/en.php
index e8d0676e0c..996c208282 100644
--- a/core/src/plugins/editor.diaporama/i18n/conf/en.php
+++ b/core/src/plugins/editor.diaporama/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Image viewer" => "Image viewer",
diff --git a/core/src/plugins/editor.diaporama/i18n/conf/fr.php b/core/src/plugins/editor.diaporama/i18n/conf/fr.php
index a5810b51c0..6ae21a6b8c 100644
--- a/core/src/plugins/editor.diaporama/i18n/conf/fr.php
+++ b/core/src/plugins/editor.diaporama/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Image viewer" => "Aperçu d'images",
@@ -33,4 +33,4 @@
 "Rotate image using exif rotation" => "Faire pivoter l'image en utilisation la rotation exif",
 "Low-res Sizes" => "Tailles low-res",
 "Threshold for low-res versions of images" => "Seuil pour la version low-res des images",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/editor.diaporama/i18n/conf/it.php b/core/src/plugins/editor.diaporama/i18n/conf/it.php
index fc6178f92b..2b84815588 100644
--- a/core/src/plugins/editor.diaporama/i18n/conf/it.php
+++ b/core/src/plugins/editor.diaporama/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Image viewer" => "Visualizzatore Immagini",
@@ -33,4 +33,4 @@
 "Rotate image using exif rotation" => "Ruota l'immagine usando la rotazione exif",
 "Low-res Sizes" => "Low-res Sizes",
 "Threshold for low-res versions of images" => "Threshold for low-res versions of images",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/editor.diaporama/i18n/conf/pt.php b/core/src/plugins/editor.diaporama/i18n/conf/pt.php
index 0298770887..972ba3d3f9 100644
--- a/core/src/plugins/editor.diaporama/i18n/conf/pt.php
+++ b/core/src/plugins/editor.diaporama/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Image viewer" => "Visualizador de Imagens",
@@ -33,4 +33,4 @@
 "Rotate image using exif rotation" => "Rotate image using exif rotation",
 "Low-res Sizes" => "Low-res Sizes",
 "Threshold for low-res versions of images" => "Threshold for low-res versions of images",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/editor.diaporama/i18n/conf/ru.php b/core/src/plugins/editor.diaporama/i18n/conf/ru.php
index f313a68fb2..e1774b952c 100644
--- a/core/src/plugins/editor.diaporama/i18n/conf/ru.php
+++ b/core/src/plugins/editor.diaporama/i18n/conf/ru.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Image viewer" => "Просмотр изображения",
@@ -33,4 +33,4 @@
 "Rotate image using exif rotation" => "Rotate image using exif rotation",
 "Low-res Sizes" => "Low-res Sizes",
 "Threshold for low-res versions of images" => "Threshold for low-res versions of images",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/editor.diaporama/manifest.xml b/core/src/plugins/editor.diaporama/manifest.xml
index 8e1d611f1d..a6e44aab29 100644
--- a/core/src/plugins/editor.diaporama/manifest.xml
+++ b/core/src/plugins/editor.diaporama/manifest.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <editor id="editor.diaporama" order="-1" openable="true" iconClass="icon-picture" previewProvider="true" text="186" title="136" icon="frame_image.png" className="Diaporama" mimes="png,jpg,jpeg,gif" formId="diaporama_box" label="CONF_MESSAGE[Image viewer]" description="CONF_MESSAGE[Image viewer, used for previewing images and browsing them in a diaporam. Generates a thumbnail version of the images.]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
 	<server_settings>
-		<global_param name="META_EXTRACTION_REMOTEWRAPPERS" type="array" label="CONF_MESSAGE[Remote Wrappers]" description="CONF_MESSAGE[When connected to a remote server, metadata extraction can make the listing action very long, as it must first copy each file locally. For plugins using the defined wrappers and files whose size is greater than this threshold, the image type and dimension will be skipped.]" default="ftpAccessWrapper"/>
+		<global_param name="META_EXTRACTION_REMOTEWRAPPERS" type="array" label="CONF_MESSAGE[Remote Wrappers]" description="CONF_MESSAGE[When connected to a remote server, metadata extraction can make the listing action very long, as it must first copy each file locally. For plugins using the defined wrappers and files whose size is greater than this threshold, the image type and dimension will be skipped.]" default="FtpAccessWrapper"/>
 		<global_param name="META_EXTRACTION_THRESHOLD" type="string" label="CONF_MESSAGE[Size Threshold]" description="CONF_MESSAGE[Threshold]" default="50000"/>
 		<global_param name="GENERATE_THUMBNAIL" type="boolean" label="CONF_MESSAGE[Thumbnails]" description="CONF_MESSAGE[Generate thumbnails or not]" default="true"/>
 		<global_param name="PREVIEWER_LOWRES_SIZES" type="string" label="CONF_MESSAGE[Low-res Sizes]" description="CONF_MESSAGE[Threshold for low-res versions of images]" default="300,700,1000,1300" expose="true"/>
 		<global_param name="THUMBNAIL_QUALITY" type="integer" label="CONF_MESSAGE[Quality]" description="CONF_MESSAGE[Thumbs quality]" default="2"/>
     <global_param name="EXIF_ROTATION" type="boolean" label="CONF_MESSAGE[Exif Rotation]" description="CONF_MESSAGE[Rotate image using exif rotation]" default="true"/>
 	</server_settings>
-	<class_definition filename="plugins/editor.diaporama/class.ImagePreviewer.php" classname="ImagePreviewer"/>
+	<class_definition filename="plugins/editor.diaporama/ImagePreviewer.php" classname="Pydio\Editor\Image\ImagePreviewer"/>
     <client_settings>
         <resources>
             <js file="plugins/editor.diaporama/class.Diaporama.js" className="Diaporama"/>
@@ -17,26 +17,6 @@
         </resources>
     </client_settings>
 	<clientForm id="diaporama_box"><![CDATA[
-		<div id="diaporama_box" action="view_diapo" box_width="90%" box_height="90%" box_resize="true" box_padding="0">
-			<div class="action_bar full_width_action_bar" style="width: 100%;" title="AJXP_MESSAGE[414]">
-				<div align="right" id="diaporama_input_boxes" style="float:right; padding-top: 1px; padding-right: 5px; height: 21px;margin-top:28px;margin-left:30px;">
-				    <a href="#" id="showLowResButton" class="icon-picture" style="float: none; display:none;padding: 0 !important;margin-top: 0;font-size: 10px;"><span message_id="526">AJXP_MESSAGE[526]</span></a>
-				    <a href="#" id="showOriginalButton" class="icon-picture" style="float: none; display:none;padding: 0 !important;margin-top: 0;font-size: 14px;"><span message_id="525">AJXP_MESSAGE[525]</span></a>
-					<input id="zoomValue" type="text" style="text-align: center;width: 40px;height: 16px;padding: 2px;border: 1px solid #222;padding-right: 1px;background-color: #666;color: #fff;margin-top: -2px;"/>
-					<a href="#" class="icon-screenshot" id="actualSizeButton" style="float: none;padding: 0 !important;margin-top: 0;font-size: 14px;" onclick="return false;"><img width="22" height="22" src="AJXP_THEME_FOLDER/images/actions/22/zoom-original.png" alt="" border="0"><br><span message_id="327">AJXP_MESSAGE[327]</span></a>
-				</div>
-				<a href="#" class="icon-arrow-left" id="prevButton" onclick="return false;"><img  width="22" height="22" src="AJXP_THEME_FOLDER/images/actions/22/back_22.png" alt="" border="0"><br><span message_id="178">AJXP_MESSAGE[178]</span></a>
-				<a href="#" class="icon-stop" access_key="s" id="stopButton" onclick="return false;"><img width="22" height="22" src="AJXP_THEME_FOLDER/images/actions/22/player_stop.png" alt="AJXP_MESSAGE[233]" border="0"><br><span message_id="232">AJXP_MESSAGE[232]</span></a>
-                <input id="time" type="text" value="3 s" style="text-align: center;width: 26px;height: 17px;padding: 0px 2px 2px 2px;background-color: #666;color: #fff;margin: 6px 1px;float: left;border: 1px solid #222;border-radius: 2px;"/>
-				<a href="#" class="icon-play" access_key="p" id="playButton" onclick="return false;"><img width="22" height="22" src="AJXP_THEME_FOLDER/images/actions/22/player_play.png" alt="AJXP_MESSAGE[231]" border="0"><br><span message_id="230">AJXP_MESSAGE[230]</span></a>
-				<a href="#" class="icon-arrow-right" id="nextButton" onclick="return false;"><img width="22" height="22" src="AJXP_THEME_FOLDER/images/actions/22/forward_22.png" alt="" border="0"><br><span message_id="179">AJXP_MESSAGE[179]</span></a>
-			</div>
-            <div style="text-align:center; vertical-align:center;overflow:auto; background-color:rgb(85,85,85);" id="imageContainer">
-                <div id="imageBorder" style="background-color:transparent;-webkit-box-shadow:rgb(51, 51, 51) 2px 2px 6px;-moz-box-shadow:rgb(51, 51, 51) 2px 2px 6px;box-shadow:rgb(51, 51, 51) 2px 2px 6px;"><img id="mainImage" src=""></div>
-            </div>
-		</div>
-	]]></clientForm>
-	<clientForm id="diaporama_box" theme="orbit"><![CDATA[
 		<div id="diaporama_box" action="view_diapo" box_width="90%" box_height="90%" box_resize="true" box_padding="0">
 			<div class="action_bar full_width_action_bar" style="width: 100%;" title="AJXP_MESSAGE[414]">
 				<div align="right" id="diaporama_input_boxes" style="float:right; padding-top: 1px; padding-right: 5px; height: 21px;margin-top:28px;margin-left:30px;">
@@ -112,28 +92,6 @@
 				</columns>
 			</component_config>
 			<component_config className="InfoPanel">
-				<infoPanelExtension mime="AJXP_MIMES_IMAGE" attributes="image_width,image_height,image_type" theme="oxygen,umbra,vision">
-					<messages>
-						<message key="type_string" id="134"/>
-						<message key="dim_string" id="135"/>
-						<message key="header_string" id="343"/>
-					</messages>
-					<html><![CDATA[
-						<div style="">
-							<div class="panelHeader infoPanelGroup" colspan="2"><span class="icon-picture" data-ajxpAction="no-action"></span> #{header_string}</div>
-							<table class="infoPanelTable" cellspacing="0" border="0" cellpadding="0">
-								<tr>
-									<td class="infoPanelLabel">#{dim_string}</td>
-									<td class="infoPanelValue">#{image_width}px X #{image_height}px</td>
-								</tr>
-								<tr class="even">
-									<td class="infoPanelLabel">#{type_string}</td>
-									<td class="infoPanelValue">#{image_type}</td>
-								</tr>
-							</table>
-						</div>
-					]]></html>
-				</infoPanelExtension>
 				<infoPanelExtension mime="AJXP_MIMES_IMAGE" attributes="basename,preview_rich,filesize,mimestring,formated_date,ajxp_description,image_width,image_height,image_type" theme="orbit" primary="true">
                     <messages>
                         <message key="name_string" id="133"/>
diff --git a/core/src/plugins/editor.eml/EmlParser.php b/core/src/plugins/editor.eml/EmlParser.php
new file mode 100644
index 0000000000..93cdca0091
--- /dev/null
+++ b/core/src/plugins/editor.eml/EmlParser.php
@@ -0,0 +1,531 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Editor\EML;
+
+use Pydio\Access\Core\MetaStreamWrapper;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Core\Model\ContextInterface;
+
+use Pydio\Core\Services\LocalCache;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Services\LocaleService;
+
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\StringHelper;
+use Pydio\Core\Utils\Http\UserAgent;
+
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\Utils\TextEncoder;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Parses an EML file and return the result as XML
+ * @package Pydio\Editor\EML
+ */
+class EmlParser extends Plugin
+{
+    public static $currentListingOnlyEmails;
+
+    public function performChecks()
+    {
+        if (!ApplicationState::searchIncludePath("Mail/mimeDecode.php")) {
+            throw new \Exception("Cannot find Mail/mimeDecode PEAR library");
+        }
+    }
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @throws \Exception
+     * @throws \Pydio\Core\Exception\PydioException
+     */
+    public function switchAction(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface)
+    {
+        $httpVars = $requestInterface->getParsedBody();
+        $action = $requestInterface->getAttribute("action");
+        /** @var ContextInterface $ctx */
+        $ctx = $requestInterface->getAttribute("ctx");
+
+        $x = new \Pydio\Core\Http\Response\SerializableResponseStream();
+        $responseInterface = $responseInterface->withBody($x);
+
+        $selection = UserSelection::fromContext($ctx, $httpVars);
+        if($selection->isEmpty()) return;
+        $node = $selection->getUniqueNode();
+        $file = $node->getUrl();
+        Controller::applyHook("node.read", array($node));
+
+        $wrapperClassName = MetaStreamWrapper::actualRepositoryWrapperClass($node);
+
+        $mess = LocaleService::getMessages();
+        switch ($action) {
+            case "eml_get_xml_structure":
+                $params = array(
+                    'include_bodies' => false,
+                    'decode_bodies' => false,
+                    'decode_headers' => 'UTF-8'
+                );
+                $decoder = $this->getStructureDecoder($file, ($wrapperClassName == "imapAccessWrapper"));
+                $xml = $decoder->getXML($decoder->decode($params));
+                $doc = new \Pydio\Core\Http\Message\XMLDocMessage($xml);
+                if (function_exists("imap_mime_header_decode")) {
+                    $xPath = new \DOMXPath($doc);
+                    $headers = $xPath->query("//headername");
+                    $charset = "UTF-8";
+                    foreach ($headers as $headerNode) {
+                        if ($headerNode->firstChild->nodeValue == "Subject") {
+                            $headerValueNode = $headerNode->nextSibling->nextSibling;
+                            $value = $headerValueNode->nodeValue;
+                            $elements = imap_mime_header_decode($value);
+                            $decoded = "";
+                            foreach ($elements as $element) {
+                                $decoded.=$element->text;
+                                $charset = $element->charset;
+                            }
+                            if ($decoded != $value) {
+                                $value = TextEncoder::changeCharset($charset, "UTF-8", $decoded);
+                                $node = $doc->createElement("headervalue", $value);
+                                $headerNode->parentNode->replaceChild($node, $headerValueNode);
+                            }
+                        }
+                    }
+                }
+                $x->addChunk($doc);
+            break;
+            case "eml_get_bodies":
+                require_once("Mail/mimeDecode.php");
+                $params = array(
+                    'include_bodies' => true,
+                    'decode_bodies' => true,
+                    'decode_headers' => false
+                );
+                if ($wrapperClassName == "imapAccessWrapper") {
+                    $cache = LocalCache::getItem("eml_remote", $file, null, array("EmlParser", "computeCacheId"));
+                    $content = $cache->getData();
+                } else {
+                    $content = file_get_contents($file);
+                }
+
+                $decoder = new \Mail_mimeDecode($content);
+                $structure = $decoder->decode($params);
+                $html = $this->_findPartByCType($structure, "text", "html");
+                $text = $this->_findPartByCType($structure, "text", "plain");
+                $charset = 'UTF-8';
+                if ($html != false && isSet($html->ctype_parameters) && isSet($html->ctype_parameters["charset"])) {
+                    $charset = $html->ctype_parameters["charset"];
+                }
+                require_once "EmlXmlMessage.php";
+                $x->addChunk(new EmlXmlMessage($charset, $html, $text));
+
+            break;
+
+            case "eml_dl_attachment":
+
+                $attachId = $httpVars["attachment_id"];
+                if(!isset($attachId)) break;
+
+                require_once("Mail/mimeDecode.php");
+                $params = array(
+                    'include_bodies' => true,
+                    'decode_bodies' => true,
+                    'decode_headers' => false
+                );
+                if ($wrapperClassName == "imapAccessWrapper") {
+                    $cache = LocalCache::getItem("eml_remote", $file, null, array("EmlParser", "computeCacheId"));
+                    $content = $cache->getData();
+                } else {
+                    $content = file_get_contents($file);
+                }
+                $decoder = new \Mail_mimeDecode($content);
+                $structure = $decoder->decode($params);
+                $part = $this->_findAttachmentById($structure, $attachId);
+
+                $fileReader = new \Pydio\Core\Http\Response\FileReaderResponse(null, $part->body);
+                $fileReader->setLocalName($part->d_parameters['filename']);
+                $responseInterface = $responseInterface->withBody($fileReader);
+
+            break;
+
+            case "eml_cp_attachment":
+
+                $attachId = $httpVars["attachment_id"];
+                $destRep = InputFilter::decodeSecureMagic($httpVars["destination"]);
+                if (!isset($attachId)) {
+                    throw new \Pydio\Core\Exception\PydioException("Wrong Parameters");
+                }
+
+                require_once("Mail/mimeDecode.php");
+                $params = array(
+                    'include_bodies' => true,
+                    'decode_bodies' => true,
+                    'decode_headers' => false
+                );
+                if ($wrapperClassName == "imapAccessWrapper") {
+                    $cache = LocalCache::getItem("eml_remote", $file, null, array("EmlParser", "computeCacheId"));
+                    $content = $cache->getData();
+                } else {
+                    $content = file_get_contents($file);
+                }
+
+                $decoder = new \Mail_mimeDecode($content);
+                $structure = $decoder->decode($params);
+                $part = $this->_findAttachmentById($structure, $attachId);
+                if ($part !== false) {
+                    $destStreamURL = $selection->currentBaseUrl();
+                    if (isSet($httpVars["dest_repository_id"])) {
+                        $destRepoId = $httpVars["dest_repository_id"];
+                        if (UsersService::usersEnabled()) {
+                            $loggedUser = $ctx->getUser();
+                            if(!$loggedUser->canWrite($destRepoId)) throw new \Exception($mess[364]);
+                        }
+                        $user = $ctx->getUser()->getId();
+                        $destStreamURL = "pydio://$user@$destRepoId";
+                        MetaStreamWrapper::detectWrapperForNode(new AJXP_Node($destStreamURL), true);
+                    }
+                    $destFile = $destStreamURL.$destRep."/".$part->d_parameters['filename'];
+                    $fp = fopen($destFile, "w");
+                    if ($fp !== false) {
+                        fwrite($fp, $part->body, strlen($part->body));
+                        fclose($fp);
+                        $x->addChunk(new \Pydio\Core\Http\Message\UserMessage(sprintf($mess["editor.eml.7"], $part->d_parameters["filename"], $destRep)));
+                    } else {
+                        $x->addChunk(new \Pydio\Core\Http\Message\UserMessage($mess["editor.eml.8"], LOG_LEVEL_ERROR));
+                    }
+                } else {
+                    $x->addChunk(new \Pydio\Core\Http\Message\UserMessage($mess["editor.eml.9"], LOG_LEVEL_ERROR));
+                }
+            break;
+
+            default:
+            break;
+        }
+    }
+
+    /**
+     * @param AJXP_Node $ajxpNode
+     * @param Boolean $isParent
+     */
+    public function extractMimeHeaders(&$ajxpNode, $isParent = false)
+    {
+        if($isParent) return;
+        $currentNode = $ajxpNode->getUrl();
+        $metadata = $ajxpNode->metadata;
+        $wrapperClassName = MetaStreamWrapper::actualRepositoryWrapperClass($ajxpNode);
+
+        $noMail = true;
+        if ($metadata["is_file"] && ($wrapperClassName == "imapAccessWrapper" || preg_match("/\.eml$/i",$currentNode))) {
+            $noMail = false;
+        }
+        if ($wrapperClassName == "imapAccessWrapper" && !$metadata["is_file"]) {
+            $metadata["mimestring"] = "Mailbox";
+        }
+        $parsed = parse_url($currentNode);
+        if ( $noMail || ( isSet($parsed["fragment"]) && strpos($parsed["fragment"], "attachments") === 0 ) ) {
+            EmlParser::$currentListingOnlyEmails = FALSE;
+            return;
+        }
+        if (EmlParser::$currentListingOnlyEmails === NULL) {
+            EmlParser::$currentListingOnlyEmails = true;
+        }
+        if ($wrapperClassName == "imapAccessWrapper") {
+            $cachedFile = LocalCache::getItem("eml_remote", $currentNode, null, array("EmlParser", "computeCacheId"));
+            $realFile = $cachedFile->getId();
+            if (!is_file($realFile)) {
+                $cachedFile->getData();// trigger loading!
+            }
+        } else {
+            $realFile = $ajxpNode->getRealFile();
+        }
+        $cacheItem = LocalCache::getItem("eml_mimes", $realFile, array($this, "mimeExtractorCallback"));
+        $data = unserialize($cacheItem->getData());
+        $data["ajxp_mime"] = "eml";
+        $data["mimestring"] = "Email";
+        $metadata = array_merge($metadata, $data);
+        if ($wrapperClassName == "imapAccessWrapper" && $metadata["eml_attachments"]!= "0" && (strpos($_SERVER["HTTP_USER_AGENT"], "ajaxplorer-ios") !== false)) {
+            $metadata["is_file"] = false;
+            $metadata["nodeName"] = basename($currentNode)."#attachments";
+        }
+        $ajxpNode->metadata = $metadata;
+    }
+
+    /**
+     * @param $masterFile
+     * @param $targetFile
+     */
+    public function mimeExtractorCallback($masterFile, $targetFile)
+    {
+        $metadata = array();
+        require_once("Mail/mimeDecode.php");
+        $params = array(
+            'include_bodies' => true,
+            'decode_bodies' => false,
+            'decode_headers' => 'UTF-8'
+        );
+        $content = file_get_contents($masterFile);
+        $decoder = new \Mail_mimeDecode($content);
+        $structure = $decoder->decode($params);
+        $allowedHeaders = array("to", "from", "subject", "message-id", "mime-version", "date", "return-path");
+        foreach ($structure->headers as $hKey => $hValue) {
+            if(!in_array($hKey, $allowedHeaders)) continue;
+            if (is_array($hValue)) {
+                $hValue = implode(", ", $hValue);
+            }
+            if ($hKey == "date") {
+                $date = strtotime($hValue);
+                $metadata["eml_time"] = $date;
+            }
+            $metadata["eml_".$hKey] = StringHelper::xmlEntities(@htmlentities($hValue, ENT_COMPAT, "UTF-8"));
+            //$this->logDebug($hKey." - ".$hValue. " - ".$metadata["eml_".$hKey]);
+            if ($metadata["eml_".$hKey] == "") {
+                $metadata["eml_".$hKey] = StringHelper::xmlEntities(@htmlentities($hValue));
+                if (!TextEncoder::isUtf8($metadata["eml_".$hKey])) {
+                    $metadata["eml_".$hKey] = TextEncoder::toUTF8($metadata["eml_".$hKey]);
+                }
+            }
+            $metadata["eml_".$hKey] = str_replace("&amp;", "&", $metadata["eml_".$hKey]);
+        }
+        $metadata["eml_attachments"] = 0;
+        $parts = $structure->parts;
+        if (!empty($parts)) {
+            foreach ($parts as $mimePart) {
+                if (!empty($mimePart->disposition) && $mimePart->disposition == "attachment") {
+                    $metadata["eml_attachments"]++;
+                }
+            }
+        }
+        $metadata["icon"] = "eml_images/ICON_SIZE/mail_mime.png";
+        file_put_contents($targetFile, serialize($metadata));
+    }
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @return \Psr\Http\Message\ResponseInterface|\Zend\Diactoros\Response|static
+     */
+    public function lsPostProcess(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface)
+    {
+        if (!EmlParser::$currentListingOnlyEmails) {
+            header('Content-Type: text/xml; charset=UTF-8');
+            header('Cache-Control: no-cache');
+            return $responseInterface;
+        }
+
+        $config = '<columns template_name="eml.list">
+            <column messageId="editor.eml.1" attributeName="ajxp_label" sortType="String"/>
+            <column messageId="editor.eml.2" attributeName="eml_to" sortType="String"/>
+            <column messageId="editor.eml.3" attributeName="eml_subject" sortType="String"/>
+            <column messageId="editor.eml.4" attributeName="ajxp_modiftime" sortType="MyDate"/>
+            <column messageId="2" attributeName="filesize" sortType="NumberKo"/>
+            <column messageId="editor.eml.5" attributeName="eml_attachments" sortType="Number" modifier="EmlViewer.prototype.attachmentCellRenderer" fixedWidth="30"/>
+        </columns>';
+
+        $responseData = $responseInterface->getBody()->getContents();
+
+        $dom = new \DOMDocument("1.0", "UTF-8");
+        $dom->loadXML($responseData);
+        $mobileAgent = UserAgent::userAgentIsIOS() || UserAgent::userAgentIsNativePydioApp();
+        $this->logDebug("MOBILE AGENT DETECTED?".$mobileAgent, $_SERVER["HTTP_USER_AGENT"]);
+        if (EmlParser::$currentListingOnlyEmails === true) {
+            // Replace all text attributes by the "from" value
+            $index = 1;
+            /** @var \DOMElement $child */
+            foreach ($dom->documentElement->childNodes as $child) {
+                if ($mobileAgent) {
+                    $from = $child->getAttribute("eml_from");
+                    $ar = explode("&lt;", $from);
+                    $from = trim(array_shift($ar));
+                    $text = ($index < 10?"0":"").$index.". ".$from." &gt; ".$child->getAttribute("eml_subject");
+                    if (UserAgent::userAgentIsNativePydioApp()) {
+                        $text = html_entity_decode($text, ENT_COMPAT, "UTF-8");
+                    }
+                    $index ++;
+                } else {
+                    $text = $child->getAttribute("eml_from");
+                }
+                $child->setAttribute("text", $text);
+                $child->setAttribute("ajxp_modiftime", $child->getAttribute("eml_time"));
+            }
+        }
+
+        // Add the columns template definition
+        $insert = new \DOMDocument("1.0", "UTF-8");
+        $config = "<client_configs><component_config className=\"FilesList\" local=\"true\">$config</component_config></client_configs>";
+        $insert->loadXML($config);
+        $imported = $dom->importNode($insert->documentElement, true);
+        $dom->documentElement->appendChild($imported);
+        $responseInterface = new \Zend\Diactoros\Response();
+        $responseInterface = $responseInterface->withHeader("ContentType", "text/xml");
+        $responseInterface = $responseInterface->withHeader("Cache-Control", "no-cache");
+        $responseInterface->getBody()->write($dom->saveXML());
+        return $responseInterface;
+    }
+
+    /**
+     *
+     * Enter description here ...
+     * @param string $file url
+     * @param boolean $cacheRemoteContent
+     * @return \Mail_mimeDecode
+     */
+    public function getStructureDecoder($file, $cacheRemoteContent = false)
+    {
+        require_once ("Mail/mimeDecode.php");
+        if ($cacheRemoteContent) {
+            $cache = LocalCache::getItem ( "eml_remote", $file , null, array("EmlParser", "computeCacheId"));
+            $content = $cache->getData ();
+        } else {
+            $content = file_get_contents ( $file );
+        }
+        $decoder = new \Mail_mimeDecode ( $content );
+
+        header ( 'Content-Type: text/xml; charset=UTF-8' );
+        header ( 'Cache-Control: no-cache' );
+        return $decoder;
+    }
+
+    // $cacheRemoteContent = false
+    /**
+     * @param $file
+     * @param $cacheRemoteContent
+     * @param $attachments
+     * @param null $structure
+     */
+    public function listAttachments($file, $cacheRemoteContent, &$attachments, $structure = null)
+    {
+        if ($structure == null) {
+            $decoder = $this->getStructureDecoder($file, $cacheRemoteContent);
+               $params = array(
+                   'include_bodies' => false,
+                   'decode_bodies' => false,
+                   'decode_headers' => 'UTF-8'
+               );
+            $structure = $decoder->decode($params);
+        }
+        if (isSet($structure->disposition) && $structure->disposition == "attachment") {
+            $attachments[] = array(
+                "filename" => $structure->d_parameters['filename'],
+                "content-type" => $structure->ctype_primary."/".$structure->ctype_secondary,
+                "x-attachment-id" => (isSet($structure->headers["x-attachment-id"])?$structure->headers["x-attachment-id"]:count($attachments))
+            );
+        } else if (isset($structure->parts)) {
+            foreach ($structure->parts as $partObject) {
+                $this->listAttachments($file, true, $attachments, $partObject);
+            }
+        }
+    }
+
+    /**
+     * @param $file
+     * @param $attachmentId
+     * @param bool $cacheRemoteContent
+     * @param array $metadata
+     * @return bool
+     */
+    public function getAttachmentBody($file, $attachmentId, $cacheRemoteContent = false, &$metadata = array())
+    {
+        $decoder = $this->getStructureDecoder($file, $cacheRemoteContent);
+           $params = array(
+               'include_bodies' => true,
+               'decode_bodies' => true,
+               'decode_headers' => 'UTF-8'
+           );
+        $structure = $decoder->decode($params);
+        $part = $this->_findAttachmentById($structure, $attachmentId);
+        if($part == false) return false;
+        $metadata = array(
+            "filename" => $part->d_parameters['filename'],
+            "content-type" => $part->ctype_primary."/".$part->ctype_secondary,
+            "x-attachment-id" => $attachmentId
+        );
+        return $part->body;
+    }
+
+    /**
+     * @param $structure
+     * @param $primary
+     * @param $secondary
+     * @return bool
+     */
+    protected function _findPartByCType($structure, $primary, $secondary)
+    {
+        if ($structure->ctype_primary == $primary && $structure->ctype_secondary == $secondary) {
+            return $structure;
+        }
+        if(empty($structure->parts)) return false;
+        foreach ($structure->parts as $part) {
+            $res = $this->_findPartByCType($part, $primary, $secondary);
+            if ($res !== false) {
+                return $res;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @param $structure
+     * @param $attachId
+     * @return bool
+     */
+    protected function _findAttachmentById($structure, $attachId)
+    {
+        if (is_numeric($attachId)) {
+            $attachId = intval($attachId);
+            if(empty($structure->parts)) return false;
+            $index = 0;
+            foreach ($structure->parts as $part) {
+                if (!empty($part->disposition) &&  $part->disposition == "attachment") {
+                    if($index == $attachId) return $part;
+                    $index++;
+                }
+            }
+            return false;
+        } else {
+            if(!empty($structure->disposition) &&  $structure->disposition == "attachment"
+                && ($structure->headers["x-attachment-id"] == $attachId || $attachId == "0" )){
+                return $structure;
+            }
+            if(empty($structure->parts)) return false;
+            foreach ($structure->parts as $part) {
+                $res = $this->_findAttachmentById($part, $attachId);
+                if ($res !== false) {
+                    return $res;
+                }
+            }
+            return false;
+        }
+    }
+
+    /**
+     * @param $mailPath
+     * @return string
+     */
+    public static function computeCacheId($mailPath)
+    {
+        $header = file_get_contents($mailPath."#header");
+        //$this->logDebug("Headers ", $header);
+        return md5($header);
+    }
+
+}
diff --git a/core/src/plugins/editor.eml/EmlXmlMessage.php b/core/src/plugins/editor.eml/EmlXmlMessage.php
new file mode 100644
index 0000000000..ea93299cc9
--- /dev/null
+++ b/core/src/plugins/editor.eml/EmlXmlMessage.php
@@ -0,0 +1,85 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Editor\EML;
+
+use Pydio\Core\Http\Response\XMLDocSerializableResponseChunk;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class EmlXmlMessage
+ * @package Pydio\Editor\EML
+ */
+class EmlXmlMessage implements XMLDocSerializableResponseChunk
+{
+
+    protected $charset;
+    protected $html;
+    protected $text;
+
+    /**
+     * EmlXmlMessage constructor.
+     * @param string $charset
+     * @param bool $html
+     * @param bool $text
+     */
+    public function __construct($charset = "UTF-8", $html = false, $text = false)
+    {
+        $this->charset = $charset;
+        $this->html = $html;
+        $this->text = $text;
+    }
+
+    /**
+     * @return string
+     */
+    public function toXML()
+    {
+        $buffer = "";
+        if (isSet($this->charset)) {
+            header('Content-Type: text/xml; charset='.$this->charset);
+        } 
+        $buffer .= '<email_body>';
+        if ($this->html!==false) {
+            $buffer .= '<mimepart type="html"><![CDATA[';
+            $buffer .= $this->html->body;
+            $buffer .= "]]></mimepart>";
+        }
+        if ($this->text!==false) {
+            $buffer .= '<mimepart type="plain"><![CDATA[';
+            $buffer .= $this->text->body;
+            $buffer .= "]]></mimepart>";
+        }
+        $buffer .= "</email_body>";
+        return $buffer;
+        
+    }
+
+    /**
+     * @return string
+     */
+    public function getCharset()
+    {
+        return $this->charset;
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/editor.eml/class.EmlParser.php b/core/src/plugins/editor.eml/class.EmlParser.php
deleted file mode 100644
index e863d6096b..0000000000
--- a/core/src/plugins/editor.eml/class.EmlParser.php
+++ /dev/null
@@ -1,487 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Parses an EML file and return the result as XML
- * @package AjaXplorer_Plugins
- * @subpackage Editor
- */
-class EmlParser extends AJXP_Plugin
-{
-    public static $currentListingOnlyEmails;
-
-    public function performChecks()
-    {
-        if (!AJXP_Utils::searchIncludePath("Mail/mimeDecode.php")) {
-            throw new Exception("Cannot find Mail/mimeDecode PEAR library");
-        }
-    }
-
-    public function switchAction($action, $httpVars, $filesVars)
-    {
-        $repository = ConfService::getRepository();
-        if (!$repository->detectStreamWrapper(true)) {
-            return false;
-        }
-
-        $selection = new UserSelection($repository, $httpVars);
-        if($selection->isEmpty()) return;
-        $node = $selection->getUniqueNode();
-        $file = $node->getUrl();
-        AJXP_Controller::applyHook("node.read", array($node));
-
-        $wrapperClassName = AJXP_MetaStreamWrapper::actualRepositoryWrapperClass($repository->getId());
-
-        $mess = ConfService::getMessages();
-        switch ($action) {
-            case "eml_get_xml_structure":
-                $params = array(
-                    'include_bodies' => false,
-                    'decode_bodies' => false,
-                    'decode_headers' => 'UTF-8'
-                );
-                $decoder = $this->getStructureDecoder($file, ($wrapperClassName == "imapAccessWrapper"));
-                $xml = $decoder->getXML($decoder->decode($params));
-                if (function_exists("imap_mime_header_decode")) {
-                    $doc = new DOMDocument();
-                    $doc->loadXML($xml);
-                    $xPath = new DOMXPath($doc);
-                    $headers = $xPath->query("//headername");
-                    $changes = false;
-                    foreach ($headers as $headerNode) {
-                        if ($headerNode->firstChild->nodeValue == "Subject") {
-                            $headerValueNode = $headerNode->nextSibling->nextSibling;
-                            $value = $headerValueNode->nodeValue;
-                            $elements = imap_mime_header_decode($value);
-                            $decoded = "";
-                            foreach ($elements as $element) {
-                                $decoded.=$element->text;
-                                $charset = $element->charset;
-                            }
-                            if ($decoded != $value) {
-                                $value = SystemTextEncoding::changeCharset($charset, "UTF-8", $decoded);
-                                $node = $doc->createElement("headervalue", $value);
-                                $res = $headerNode->parentNode->replaceChild($node, $headerValueNode);
-                                $changes = true;
-                            }
-                        }
-                    }
-                    if($changes) $xml = $doc->saveXML();
-                }
-                print $xml;
-            break;
-            case "eml_get_bodies":
-                require_once("Mail/mimeDecode.php");
-                $params = array(
-                    'include_bodies' => true,
-                    'decode_bodies' => true,
-                    'decode_headers' => false
-                );
-                if ($wrapperClassName == "imapAccessWrapper") {
-                    $cache = AJXP_Cache::getItem("eml_remote", $file, null, array("EmlParser", "computeCacheId"));
-                    $content = $cache->getData();
-                } else {
-                    $content = file_get_contents($file);
-                }
-
-                $decoder = new Mail_mimeDecode($content);
-                $structure = $decoder->decode($params);
-                $html = $this->_findPartByCType($structure, "text", "html");
-                $text = $this->_findPartByCType($structure, "text", "plain");
-                if ($html != false && isSet($html->ctype_parameters) && isSet($html->ctype_parameters["charset"])) {
-                    $charset = $html->ctype_parameters["charset"];
-                }
-                if (isSet($charset)) {
-                    header('Content-Type: text/xml; charset='.$charset);
-                    header('Cache-Control: no-cache');
-                    print('<?xml version="1.0" encoding="'.$charset.'"?>');
-                    print('<email_body>');
-                } else {
-                    AJXP_XMLWriter::header("email_body");
-                }
-                if ($html!==false) {
-                    print('<mimepart type="html"><![CDATA[');
-                    $text = $html->body;
-                    print($text);
-                    print("]]></mimepart>");
-                }
-                if ($text!==false) {
-                    print('<mimepart type="plain"><![CDATA[');
-                    print($text->body);
-                    print("]]></mimepart>");
-                }
-                AJXP_XMLWriter::close("email_body");
-
-            break;
-            case "eml_dl_attachment":
-                $attachId = $httpVars["attachment_id"];
-                if(!isset($attachId)) break;
-
-                require_once("Mail/mimeDecode.php");
-                $params = array(
-                    'include_bodies' => true,
-                    'decode_bodies' => true,
-                    'decode_headers' => false
-                );
-                if ($wrapperClassName == "imapAccessWrapper") {
-                    $cache = AJXP_Cache::getItem("eml_remote", $file, null, array("EmlParser", "computeCacheId"));
-                    $content = $cache->getData();
-                } else {
-                    $content = file_get_contents($file);
-                }
-                $decoder = new Mail_mimeDecode($content);
-                $structure = $decoder->decode($params);
-                $part = $this->_findAttachmentById($structure, $attachId);
-                if ($part !== false) {
-                    $fake = new fsAccessDriver("fake", "");
-                    $fake->repository = $repository;
-                    $fake->readFile($part->body, "file", $part->d_parameters['filename'], true);
-                    exit();
-                } else {
-                    //var_dump($structure);
-                }
-            break;
-            case "eml_cp_attachment":
-                $attachId = $httpVars["attachment_id"];
-                $destRep = AJXP_Utils::decodeSecureMagic($httpVars["destination"]);
-                if (!isset($attachId)) {
-                    AJXP_XMLWriter::sendMessage(null, "Wrong Parameters");
-                    break;
-                }
-
-                require_once("Mail/mimeDecode.php");
-                $params = array(
-                    'include_bodies' => true,
-                    'decode_bodies' => true,
-                    'decode_headers' => false
-                );
-                if ($wrapperClassName == "imapAccessWrapper") {
-                    $cache = AJXP_Cache::getItem("eml_remote", $file, null, array("EmlParser", "computeCacheId"));
-                    $content = $cache->getData();
-                } else {
-                    $content = file_get_contents($file);
-                }
-
-                $decoder = new Mail_mimeDecode($content);
-                $structure = $decoder->decode($params);
-                $part = $this->_findAttachmentById($structure, $attachId);
-                AJXP_XMLWriter::header();
-                if ($part !== false) {
-                    $destStreamURL = $selection->currentBaseUrl();
-                    if (isSet($httpVars["dest_repository_id"])) {
-                        $destRepoId = $httpVars["dest_repository_id"];
-                        if (AuthService::usersEnabled()) {
-                            $loggedUser = AuthService::getLoggedUser();
-                            if(!$loggedUser->canWrite($destRepoId)) throw new Exception($mess[364]);
-                        }
-                        $destRepoObject = ConfService::getRepositoryById($destRepoId);
-                        $destRepoObject->detectStreamWrapper(true);
-                        $destStreamURL = "pydio://$destRepoId";
-                    }
-                    $destFile = $destStreamURL.$destRep."/".$part->d_parameters['filename'];
-                    $fp = fopen($destFile, "w");
-                    if ($fp !== false) {
-                        fwrite($fp, $part->body, strlen($part->body));
-                        fclose($fp);
-                        AJXP_XMLWriter::sendMessage(sprintf($mess["editor.eml.7"], $part->d_parameters["filename"], $destRep), NULL);
-                    } else {
-                        AJXP_XMLWriter::sendMessage(null, $mess["editor.eml.8"]);
-                    }
-                } else {
-                    AJXP_XMLWriter::sendMessage(null, $mess["editor.eml.9"]);
-                }
-                AJXP_XMLWriter::close();
-            break;
-
-            default:
-            break;
-        }
-    }
-
-    /**
-     * @param AJXP_Node $ajxpNode
-     * @param Boolean $isParent
-     */
-    public function extractMimeHeaders(&$ajxpNode, $isParent = false)
-    {
-        if($isParent) return;
-        $currentNode = $ajxpNode->getUrl();
-        $metadata = $ajxpNode->metadata;
-        $wrapperClassName = AJXP_MetaStreamWrapper::actualRepositoryWrapperClass($ajxpNode->getRepositoryId());
-
-        $noMail = true;
-        if ($metadata["is_file"] && ($wrapperClassName == "imapAccessWrapper" || preg_match("/\.eml$/i",$currentNode))) {
-            $noMail = false;
-        }
-        if ($wrapperClassName == "imapAccessWrapper" && !$metadata["is_file"]) {
-            $metadata["mimestring"] = "Mailbox";
-        }
-        $parsed = parse_url($currentNode);
-        if ( $noMail || ( isSet($parsed["fragment"]) && strpos($parsed["fragment"], "attachments") === 0 ) ) {
-            EmlParser::$currentListingOnlyEmails = FALSE;
-            return;
-        }
-        if (EmlParser::$currentListingOnlyEmails === NULL) {
-            EmlParser::$currentListingOnlyEmails = true;
-        }
-        if ($wrapperClassName == "imapAccessWrapper") {
-            $cachedFile = AJXP_Cache::getItem("eml_remote", $currentNode, null, array("EmlParser", "computeCacheId"));
-            $realFile = $cachedFile->getId();
-            if (!is_file($realFile)) {
-                $cachedFile->getData();// trigger loading!
-            }
-        } else {
-            $realFile = $ajxpNode->getRealFile();
-        }
-        $cacheItem = AJXP_Cache::getItem("eml_mimes", $realFile, array($this, "mimeExtractorCallback"));
-        $data = unserialize($cacheItem->getData());
-        $data["ajxp_mime"] = "eml";
-        $data["mimestring"] = "Email";
-        $metadata = array_merge($metadata, $data);
-        if ($wrapperClassName == "imapAccessWrapper" && $metadata["eml_attachments"]!= "0" && (strpos($_SERVER["HTTP_USER_AGENT"], "ajaxplorer-ios") !== false)) {
-            $metadata["is_file"] = false;
-            $metadata["nodeName"] = basename($currentNode)."#attachments";
-        }
-        $ajxpNode->metadata = $metadata;
-    }
-
-    public function mimeExtractorCallback($masterFile, $targetFile)
-    {
-        $metadata = array();
-        require_once("Mail/mimeDecode.php");
-        $params = array(
-            'include_bodies' => true,
-            'decode_bodies' => false,
-            'decode_headers' => 'UTF-8'
-        );
-        $mess = ConfService::getMessages();
-        $content = file_get_contents($masterFile);
-        $decoder = new Mail_mimeDecode($content);
-        $structure = $decoder->decode($params);
-        $allowedHeaders = array("to", "from", "subject", "message-id", "mime-version", "date", "return-path");
-        foreach ($structure->headers as $hKey => $hValue) {
-            if(!in_array($hKey, $allowedHeaders)) continue;
-            if (is_array($hValue)) {
-                $hValue = implode(", ", $hValue);
-            }
-            if ($hKey == "date") {
-                $date = strtotime($hValue);
-                $metadata["eml_time"] = $date;
-            }
-            $metadata["eml_".$hKey] = AJXP_Utils::xmlEntities(@htmlentities($hValue, ENT_COMPAT, "UTF-8"));
-            //$this->logDebug($hKey." - ".$hValue. " - ".$metadata["eml_".$hKey]);
-            if ($metadata["eml_".$hKey] == "") {
-                $metadata["eml_".$hKey] = AJXP_Utils::xmlEntities(@htmlentities($hValue));
-                if (!SystemTextEncoding::isUtf8($metadata["eml_".$hKey])) {
-                    $metadata["eml_".$hKey] = SystemTextEncoding::toUTF8($metadata["eml_".$hKey]);
-                }
-            }
-            $metadata["eml_".$hKey] = str_replace("&amp;", "&", $metadata["eml_".$hKey]);
-        }
-        $metadata["eml_attachments"] = 0;
-        $parts = $structure->parts;
-        if (!empty($parts)) {
-            foreach ($parts as $mimePart) {
-                if (!empty($mimePart->disposition) && $mimePart->disposition == "attachment") {
-                    $metadata["eml_attachments"]++;
-                }
-            }
-        }
-        $metadata["icon"] = "eml_images/ICON_SIZE/mail_mime.png";
-        file_put_contents($targetFile, serialize($metadata));
-    }
-
-    public function lsPostProcess($action, $httpVars, $outputVars)
-    {
-        if (!EmlParser::$currentListingOnlyEmails) {
-            if(isSet($httpVars["playlist"])) return;
-            header('Content-Type: text/xml; charset=UTF-8');
-            header('Cache-Control: no-cache');
-            print($outputVars["ob_output"]);
-            return;
-        }
-
-        $config = '<columns template_name="eml.list">
-            <column messageId="editor.eml.1" attributeName="ajxp_label" sortType="String"/>
-            <column messageId="editor.eml.2" attributeName="eml_to" sortType="String"/>
-            <column messageId="editor.eml.3" attributeName="eml_subject" sortType="String"/>
-            <column messageId="editor.eml.4" attributeName="ajxp_modiftime" sortType="MyDate"/>
-            <column messageId="2" attributeName="filesize" sortType="NumberKo"/>
-            <column messageId="editor.eml.5" attributeName="eml_attachments" sortType="Number" modifier="EmlViewer.prototype.attachmentCellRenderer" fixedWidth="30"/>
-        </columns>';
-
-        $dom = new DOMDocument("1.0", "UTF-8");
-        $dom->loadXML($outputVars["ob_output"]);
-        $mobileAgent = AJXP_Utils::userAgentIsIOS() || AJXP_Utils::userAgentIsNativePydioApp();
-        $this->logDebug("MOBILE AGENT DETECTED?".$mobileAgent, $_SERVER["HTTP_USER_AGENT"]);
-        if (EmlParser::$currentListingOnlyEmails === true) {
-            // Replace all text attributes by the "from" value
-            $index = 1;
-            foreach ($dom->documentElement->childNodes as $child) {
-                if ($mobileAgent) {
-                    $from = $child->getAttribute("eml_from");
-                    $ar = explode("&lt;", $from);
-                    $from = trim(array_shift($ar));
-                    $text = ($index < 10?"0":"").$index.". ".$from." &gt; ".$child->getAttribute("eml_subject");
-                    if (AJXP_Utils::userAgentIsNativePydioApp()) {
-                        $text = html_entity_decode($text, ENT_COMPAT, "UTF-8");
-                    }
-                    $index ++;
-                } else {
-                    $text = $child->getAttribute("eml_from");
-                }
-                $child->setAttribute("text", $text);
-                $child->setAttribute("ajxp_modiftime", $child->getAttribute("eml_time"));
-            }
-        }
-
-        // Add the columns template definition
-        $insert = new DOMDocument("1.0", "UTF-8");
-        $config = "<client_configs><component_config className=\"FilesList\" local=\"true\">$config</component_config></client_configs>";
-        $insert->loadXML($config);
-        $imported = $dom->importNode($insert->documentElement, true);
-        $dom->documentElement->appendChild($imported);
-        header('Content-Type: text/xml; charset=UTF-8');
-        header('Cache-Control: no-cache');
-        print($dom->saveXML());
-    }
-
-    /**
-     *
-     * Enter description here ...
-     * @param string $file url
-     * @param boolean $cacheRemoteContent
-     * @return Mail_mimeDecode
-     */
-    public function getStructureDecoder($file, $cacheRemoteContent = false)
-    {
-        require_once ("Mail/mimeDecode.php");
-        if ($cacheRemoteContent) {
-            $cache = AJXP_Cache::getItem ( "eml_remote", $file , null, array("EmlParser", "computeCacheId"));
-            $content = $cache->getData ();
-        } else {
-            $content = file_get_contents ( $file );
-        }
-        $decoder = new Mail_mimeDecode ( $content );
-
-        header ( 'Content-Type: text/xml; charset=UTF-8' );
-        header ( 'Cache-Control: no-cache' );
-        return $decoder;
-    }
-
-    // $cacheRemoteContent = false
-    public function listAttachments($file, $cacheRemoteContent, &$attachments,  $structure = null)
-    {
-        if ($structure == null) {
-            $decoder = $this->getStructureDecoder($file, $cacheRemoteContent);
-               $params = array(
-                   'include_bodies' => false,
-                   'decode_bodies' => false,
-                   'decode_headers' => 'UTF-8'
-               );
-            $structure = $decoder->decode($params);
-        }
-        if (isSet($structure->disposition) && $structure->disposition == "attachment") {
-            $attachments[] = array(
-                "filename" => $structure->d_parameters['filename'],
-                "content-type" => $structure->ctype_primary."/".$structure->ctype_secondary,
-                "x-attachment-id" => (isSet($structure->headers["x-attachment-id"])?$structure->headers["x-attachment-id"]:count($attachments))
-            );
-        } else if (isset($structure->parts)) {
-            foreach ($structure->parts as $partObject) {
-                $this->listAttachments($file, true, $attachments, $partObject);
-            }
-        }
-    }
-
-    public function getAttachmentBody($file, $attachmentId, $cacheRemoteContent = false, &$metadata = array())
-    {
-        $decoder = $this->getStructureDecoder($file, $cacheRemoteContent);
-           $params = array(
-               'include_bodies' => true,
-               'decode_bodies' => true,
-               'decode_headers' => 'UTF-8'
-           );
-        $structure = $decoder->decode($params);
-        $part = $this->_findAttachmentById($structure, $attachmentId);
-        if($part == false) return false;
-        $metadata = array(
-            "filename" => $part->d_parameters['filename'],
-            "content-type" => $part->ctype_primary."/".$part->ctype_secondary,
-            "x-attachment-id" => $attachmentId
-        );
-        return $part->body;
-    }
-
-    protected function _findPartByCType($structure, $primary, $secondary)
-    {
-        if ($structure->ctype_primary == $primary && $structure->ctype_secondary == $secondary) {
-            return $structure;
-        }
-        if(empty($structure->parts)) return false;
-        foreach ($structure->parts as $part) {
-            $res = $this->_findPartByCType($part, $primary, $secondary);
-            if ($res !== false) {
-                return $res;
-            }
-        }
-        return false;
-    }
-
-    protected function _findAttachmentById($structure, $attachId)
-    {
-        if (is_numeric($attachId)) {
-            $attachId = intval($attachId);
-            if(empty($structure->parts)) return false;
-            $index = 0;
-            foreach ($structure->parts as $part) {
-                if (!empty($part->disposition) &&  $part->disposition == "attachment") {
-                    if($index == $attachId) return $part;
-                    $index++;
-                }
-            }
-            return false;
-        } else {
-            if(!empty($structure->disposition) &&  $structure->disposition == "attachment"
-                && ($structure->headers["x-attachment-id"] == $attachId || $attachId == "0" )){
-                return $structure;
-            }
-            if(empty($structure->parts)) return false;
-            foreach ($structure->parts as $part) {
-                $res = $this->_findAttachmentById($part, $attachId);
-                if ($res !== false) {
-                    return $res;
-                }
-            }
-            return false;
-        }
-    }
-
-    public static function computeCacheId($mailPath)
-    {
-        $header = file_get_contents($mailPath."#header");
-        //$this->logDebug("Headers ", $header);
-        return md5($header);
-    }
-
-}
diff --git a/core/src/plugins/editor.eml/class.EmlViewer.js b/core/src/plugins/editor.eml/class.EmlViewer.js
index 424b545e61..331f50b03a 100644
--- a/core/src/plugins/editor.eml/class.EmlViewer.js
+++ b/core/src/plugins/editor.eml/class.EmlViewer.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 Class.create("EmlViewer", AbstractEditor, {
 
diff --git a/core/src/plugins/editor.eml/emlViewer.css b/core/src/plugins/editor.eml/emlViewer.css
index 2170959106..2c44f0a7ac 100644
--- a/core/src/plugins/editor.eml/emlViewer.css
+++ b/core/src/plugins/editor.eml/emlViewer.css
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 div#emlHeaderContainer{
 	background-color: #EEE;
diff --git a/core/src/plugins/editor.eml/i18n/conf/de.php b/core/src/plugins/editor.eml/i18n/conf/de.php
index eca8b16959..2ae60fbe57 100644
--- a/core/src/plugins/editor.eml/i18n/conf/de.php
+++ b/core/src/plugins/editor.eml/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Email Viewer" => "E-Mail-Betrachter",
diff --git a/core/src/plugins/editor.eml/i18n/conf/en.php b/core/src/plugins/editor.eml/i18n/conf/en.php
index a97ba47d5c..445fa3e169 100644
--- a/core/src/plugins/editor.eml/i18n/conf/en.php
+++ b/core/src/plugins/editor.eml/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Email Viewer" => "Email Viewer",
diff --git a/core/src/plugins/editor.eml/i18n/conf/fr.php b/core/src/plugins/editor.eml/i18n/conf/fr.php
index bea00d785e..18332a5202 100644
--- a/core/src/plugins/editor.eml/i18n/conf/fr.php
+++ b/core/src/plugins/editor.eml/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Email Viewer" => "Afficheur de courriel",
diff --git a/core/src/plugins/editor.eml/i18n/conf/it.php b/core/src/plugins/editor.eml/i18n/conf/it.php
index 181dde67c1..636aeb27e8 100644
--- a/core/src/plugins/editor.eml/i18n/conf/it.php
+++ b/core/src/plugins/editor.eml/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Email Viewer" => "Visualizzatore Email",
diff --git a/core/src/plugins/editor.eml/i18n/conf/pt.php b/core/src/plugins/editor.eml/i18n/conf/pt.php
index 45feca6a5f..c3c4a4b170 100644
--- a/core/src/plugins/editor.eml/i18n/conf/pt.php
+++ b/core/src/plugins/editor.eml/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "E-Mail Viewer" => "Visualizador de E-mail",
diff --git a/core/src/plugins/editor.eml/i18n/si.php b/core/src/plugins/editor.eml/i18n/si.php
index e0a507596d..56b5fe0900 100644
--- a/core/src/plugins/editor.eml/i18n/si.php
+++ b/core/src/plugins/editor.eml/i18n/si.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 // Slovenian translation: April 21 2011 by Vladimir Bohinc (vladimir.bohinc@gmail.com)
 //
diff --git a/core/src/plugins/editor.eml/manifest.xml b/core/src/plugins/editor.eml/manifest.xml
index 23c16f31fc..1f3bc815e6 100644
--- a/core/src/plugins/editor.eml/manifest.xml
+++ b/core/src/plugins/editor.eml/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <editor id="editor.eml" openable="true" text="editor.eml.name" iconClass="icon-envelope-alt" title="editor.eml.title" icon="mail_generic.png" className="EmlViewer" mimes="eml" formId="emlviewer_box" label="CONF_MESSAGE[Email Viewer]" description="CONF_MESSAGE[Email reader, supports eml format and eml mimetypes. Detects if a folder contains only email and display columns accordingly.]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-	<class_definition filename="plugins/editor.eml/class.EmlParser.php" classname="EmlParser"/>
+	<class_definition filename="plugins/editor.eml/EmlParser.php" classname="Pydio\Editor\EML\EmlParser"/>
     <client_settings>
         <resources>
             <js file="plugins/editor.eml/class.EmlViewer.js" className="EmlViewer"/>
@@ -37,32 +37,32 @@
 		<actions>
 			<action name="eml_get_xml_structure">
 				<processing>
-					<serverCallback methodName="switchAction"></serverCallback>
+					<serverCallback methodName="switchAction"/>
 				</processing>
 			</action>
 			<action name="eml_get_bodies">
 				<processing>
-					<serverCallback methodName="switchAction"></serverCallback>
+					<serverCallback methodName="switchAction"/>
 				</processing>
 			</action>
 			<action name="eml_dl_attachment">
 				<processing>
-					<serverCallback methodName="switchAction"></serverCallback>
+					<serverCallback methodName="switchAction"/>
 				</processing>
 			</action>
 			<action name="eml_cp_attachment">
 				<processing>
-					<serverCallback methodName="switchAction"></serverCallback>
+					<serverCallback methodName="switchAction"/>
 				</processing>
 			</action>
 			<action name="ls" dirDefault="true">
 				<post_processing>
-					<serverCallback methodName="lsPostProcess" capture="true"></serverCallback>
+					<serverCallback methodName="lsPostProcess" capture="true"/>
 				</post_processing>
 			</action>
 		</actions>
 		<hooks>
-			<serverCallback hookName="node.info" methodName="extractMimeHeaders"></serverCallback>
+			<serverCallback hookName="node.info" methodName="extractMimeHeaders"/>
 		</hooks>
 	</registry_contributions>
 	<dependencies>
diff --git a/core/src/plugins/editor.etherpad/EtherpadClient.php b/core/src/plugins/editor.etherpad/EtherpadClient.php
new file mode 100644
index 0000000000..77baa3669a
--- /dev/null
+++ b/core/src/plugins/editor.etherpad/EtherpadClient.php
@@ -0,0 +1,221 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Editor\Etherpad;
+
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Core\Model\ContextInterface;
+
+use Pydio\Core\Controller\Controller;
+
+use Pydio\Core\Utils\Vars\PathUtils;
+use Pydio\Core\Utils\Vars\StringHelper;
+
+use Pydio\Core\Controller\HTMLWriter;
+use Pydio\Core\PluginFramework\Plugin;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Class EtherpadClient
+ * @package Pydio\Editor\Etherpad
+ */
+class EtherpadClient extends Plugin
+{
+    public $baseURL = "http://localhost:9001";
+    public $apiKey = "";
+
+    /**
+     * @param $actionName
+     * @param $httpVars
+     * @param $fileVars
+     * @param ContextInterface $ctx
+     * @return null
+     * @throws \Exception
+     * @throws \Exception
+     */
+    public function switchAction($actionName, $httpVars, $fileVars, ContextInterface $ctx)
+    {
+        $this->baseURL = rtrim($this->getContextualOption($ctx, "ETHERPAD_SERVER"), "/");
+        $this->apiKey =  $this->getContextualOption($ctx, "ETHERPAD_APIKEY");
+
+        $userSelection = UserSelection::fromContext($ctx, $httpVars);
+        if ($userSelection->isEmpty()){
+            throw new \Exception("Empty selection");
+        }
+        $selectedNode = $userSelection->getUniqueNode();
+        $selectedNode->loadNodeInfo();
+        if(!$selectedNode->isLeaf()){
+            throw new \Exception("Cannot handle folders, please select a file!");
+        }
+        $nodeExtension = strtolower(pathinfo($selectedNode->getPath(), PATHINFO_EXTENSION));
+
+        // Determine pad ID
+        if($nodeExtension == "pad"){
+            $padID = file_get_contents($selectedNode->getUrl());
+        }else{
+            // TRY TO LOAD PAD ID FROM NODE SHARED METADATA
+            $metadata = $selectedNode->retrieveMetadata("etherpad", AJXP_METADATA_ALLUSERS, AJXP_METADATA_SCOPE_GLOBAL, false);
+            if(isSet($metadata["pad_id"])){
+                $padID = $metadata["pad_id"];
+            }else{
+                $padID = StringHelper::generateRandomString();
+                $selectedNode->setMetadata("etherpad", array("pad_id" => $padID), AJXP_METADATA_ALLUSERS, AJXP_METADATA_SCOPE_GLOBAL, false);
+            }
+        }
+
+        require_once("etherpad-client/etherpad-lite-client.php");
+        $client = new \EtherpadLiteClient($this->apiKey,$this->baseURL."/api");
+        $loggedUser = $ctx->getUser();
+        $userName = $loggedUser->getId();
+        $userLabel = $loggedUser->getMergedRole()->filterParameterValue("core.conf", "USER_DISPLAY_NAME", AJXP_REPO_SCOPE_ALL, $userName);
+        $res = $client->createAuthorIfNotExistsFor($userName, $userLabel);
+        $authorID = $res->authorID;
+        $res2 = $client->createGroupIfNotExistsFor($loggedUser->getGroupPath());
+        $groupID = $res2->groupID;
+        $fullId = $groupID."$".$padID;
+
+        if ($actionName == "etherpad_create") {
+
+            $resP = $client->listPads($groupID);
+
+            $currentContent = file_get_contents($selectedNode->getUrl());
+            if($nodeExtension == "html" && strpos($currentContent, "<html>") === false){
+               $currentContent = "<html><head></head><body>$currentContent</body></html>";
+            }
+            if (!in_array($fullId, $resP->padIDs)) {
+                $client->createGroupPad($groupID, $padID, null);
+                if($nodeExtension == "html" && !empty($currentContent)){
+                    $client->setHTML($fullId, $currentContent);
+                }else if($nodeExtension != "pad"){
+                    $client->setText($fullId, $currentContent);
+                }
+            } else if($nodeExtension != "pad") {
+                // If someone is already connected, do not override.
+                $existingAuthors = $client->listAuthorsOfPad($fullId);
+                if(!count($existingAuthors->authorIDs)){
+                    if($nodeExtension == "html" && !empty($currentContent)){
+                        $client->setHTML($fullId, $currentContent);
+                    }else{
+                        $client->setText($fullId, $currentContent);
+                    }
+                }
+            }
+
+            $res4 = $client->createSession($groupID, $authorID, time()+14400);
+            $sessionID = $res4->sessionID;
+
+            setcookie('sessionID', $sessionID, null, "/");
+
+            $padID = $groupID.'$'.$padID;
+
+            $data = array(
+                "url" => $this->baseURL."/p/".$padID,
+                "padID" => $padID,
+                "sessionID" => $sessionID,
+            );
+
+            HTMLWriter::charsetHeader('application/json');
+            echo(json_encode($data));
+
+        } else if ($actionName == "etherpad_save") {
+
+            $padID = $httpVars["pad_id"];
+
+            if ($nodeExtension == "html" || $nodeExtension == "pad") {
+                $res = $client->getHTML($padID);
+                $content = $res->html;
+            } else {
+                $res = $client->getText($padID);
+                $content = $res->text;
+            }
+
+            if($nodeExtension == "pad"){
+                // Create a new file and save the content in it.
+                $origUrl = $selectedNode->getUrl();
+                $dateStamp = date(" Y-m-d H:i", time());
+                $startUrl = preg_replace('"\.pad$"', $dateStamp.'.html', $origUrl);
+                $newNode = new AJXP_Node($startUrl);
+                Controller::applyHook("node.before_create", array($newNode, strlen($content)));
+                file_put_contents($newNode->getUrl(), $content);
+                Controller::applyHook("node.change", array(null, $newNode));
+            }else{
+                Controller::applyHook("node.before_change", array($selectedNode, strlen($content)));
+                file_put_contents($selectedNode->getUrl(), $content);
+                clearstatcache(true, $selectedNode->getUrl());
+                $selectedNode->loadNodeInfo(true);
+                Controller::applyHook("node.change", array($selectedNode, $selectedNode));
+            }
+
+
+        } else if ($actionName == "etherpad_close") {
+
+            // WE SHOULD DETECT IF THERE IS NOBODY CONNECTED ANYMORE, AND DELETE THE PAD.
+            // BUT SEEMS LIKE THERE'S NO WAY TO PROPERLY REMOVE AN AUTHOR VIA API
+            $sessionID = $httpVars["session_id"];
+            $client->deleteSession($sessionID);
+
+        } else if ($actionName == "etherpad_proxy_api") {
+
+            if ($httpVars["api_action"] == "list_pads") {
+                $res = $client->listPads($groupID);
+            } else if ($httpVars["api_action"] == "list_authors_for_pad") {
+                $res = $client->listAuthorsOfPad($httpVars["pad_id"]);
+            }
+            HTMLWriter::charsetHeader("application/json");
+            echo(json_encode($res));
+
+        } else if ($actionName == "etherpad_get_content"){
+
+            HTMLWriter::charsetHeader("text/plain");
+            echo $client->getText($httpVars["pad_id"])->text;
+
+        }
+
+        return null;
+
+    }
+
+    /**
+     * @param AJXP_Node $ajxpNode
+     */
+    public function hideExtension(&$ajxpNode){
+        if($ajxpNode->hasExtension("pad")){
+            $baseName = PathUtils::forwardSlashBasename($ajxpNode->getPath());
+            $ajxpNode->setLabel(str_replace(".pad", "", $baseName));
+        }
+    }
+
+    /**
+     * @param AJXP_Node $fromNode
+     * @param AJXP_Node $toNode
+     * @param bool $copy
+     */
+    public function handleNodeChange($fromNode=null, $toNode=null, $copy = false){
+        if($fromNode == null) return;
+        if($toNode == null){
+            $fromNode->removeMetadata("etherpad", AJXP_METADATA_ALLUSERS, AJXP_METADATA_SCOPE_GLOBAL, false);
+        }else if(!$copy){
+            $toNode->copyOrMoveMetadataFromNode($fromNode, "etherpad", "move", AJXP_METADATA_ALLUSERS, AJXP_METADATA_SCOPE_GLOBAL, false);
+        }
+    }
+
+}
diff --git a/core/src/plugins/editor.etherpad/class.EtherpadClient.php b/core/src/plugins/editor.etherpad/class.EtherpadClient.php
deleted file mode 100644
index 98abe4dc1e..0000000000
--- a/core/src/plugins/editor.etherpad/class.EtherpadClient.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-class EtherpadClient extends AJXP_Plugin
-{
-    public $baseURL = "http://localhost:9001";
-    public $apiKey = "";
-
-    public function switchAction($actionName, $httpVars, $fileVars)
-    {
-        $this->baseURL = rtrim($this->getFilteredOption("ETHERPAD_SERVER"), "/");
-        $this->apiKey =  $this->getFilteredOption("ETHERPAD_APIKEY");
-
-        $userSelection = new UserSelection(ConfService::getRepository(), $httpVars);
-        if ($userSelection->isEmpty()){
-            throw new Exception("Empty selection");
-        }
-        $repository = ConfService::getRepository();
-        if (!$repository->detectStreamWrapper(false)) {
-            return false;
-        }
-        $selectedNode = $userSelection->getUniqueNode();
-        $selectedNode->loadNodeInfo();
-        if(!$selectedNode->isLeaf()){
-            throw new Exception("Cannot handle folders, please select a file!");
-        }
-        $nodeExtension = strtolower(pathinfo($selectedNode->getPath(), PATHINFO_EXTENSION));
-
-        // Determine pad ID
-        if($nodeExtension == "pad"){
-            $padID = file_get_contents($selectedNode->getUrl());
-        }else{
-            // TRY TO LOAD PAD ID FROM NODE SHARED METADATA
-            $metadata = $selectedNode->retrieveMetadata("etherpad", AJXP_METADATA_ALLUSERS, AJXP_METADATA_SCOPE_GLOBAL, false);
-            if(isSet($metadata["pad_id"])){
-                $padID = $metadata["pad_id"];
-            }else{
-                $padID = AJXP_Utils::generateRandomString();
-                $selectedNode->setMetadata("etherpad", array("pad_id" => $padID), AJXP_METADATA_ALLUSERS, AJXP_METADATA_SCOPE_GLOBAL, false);
-            }
-        }
-
-        require_once("etherpad-client/etherpad-lite-client.php");
-        $client = new EtherpadLiteClient($this->apiKey,$this->baseURL."/api");
-        $loggedUser = AuthService::getLoggedUser();
-        $userName = $loggedUser->getId();
-        $userLabel = $loggedUser->mergedRole->filterParameterValue("core.conf", "USER_DISPLAY_NAME", AJXP_REPO_SCOPE_ALL, $userName);
-        $res = $client->createAuthorIfNotExistsFor($userName, $userLabel);
-        $authorID = $res->authorID;
-        $res2 = $client->createGroupIfNotExistsFor($loggedUser->getGroupPath());
-        $groupID = $res2->groupID;
-        $fullId = $groupID."$".$padID;
-
-        if ($actionName == "etherpad_create") {
-
-            $resP = $client->listPads($groupID);
-
-            $currentContent = file_get_contents($selectedNode->getUrl());
-            if($nodeExtension == "html" && strpos($currentContent, "<html>") === false){
-               $currentContent = "<html><head></head><body>$currentContent</body></html>";
-            }
-            if (!in_array($fullId, $resP->padIDs)) {
-                $client->createGroupPad($groupID, $padID, null);
-                if($nodeExtension == "html" && !empty($currentContent)){
-                    $client->setHTML($fullId, $currentContent);
-                }else if($nodeExtension != "pad"){
-                    $client->setText($fullId, $currentContent);
-                }
-            } else if($nodeExtension != "pad") {
-                // If someone is already connected, do not override.
-                $existingAuthors = $client->listAuthorsOfPad($fullId);
-                if(!count($existingAuthors->authorIDs)){
-                    if($nodeExtension == "html" && !empty($currentContent)){
-                        $client->setHTML($fullId, $currentContent);
-                    }else{
-                        $client->setText($fullId, $currentContent);
-                    }
-                }
-            }
-
-            $res4 = $client->createSession($groupID, $authorID, time()+14400);
-            $sessionID = $res4->sessionID;
-
-            setcookie('sessionID', $sessionID, null, "/");
-
-            $padID = $groupID.'$'.$padID;
-
-            $data = array(
-                "url" => $this->baseURL."/p/".$padID,
-                "padID" => $padID,
-                "sessionID" => $sessionID,
-            );
-
-            HTMLWriter::charsetHeader('application/json');
-            echo(json_encode($data));
-
-        } else if ($actionName == "etherpad_save") {
-
-            $padID = $httpVars["pad_id"];
-
-            if ($nodeExtension == "html" || $nodeExtension == "pad") {
-                $res = $client->getHTML($padID);
-                $content = $res->html;
-            } else {
-                $res = $client->getText($padID);
-                $content = $res->text;
-            }
-
-            if($nodeExtension == "pad"){
-                // Create a new file and save the content in it.
-                $origUrl = $selectedNode->getUrl();
-                $mess = ConfService::getMessages();
-                $dateStamp = date(" Y-m-d H:i", time());
-                $startUrl = preg_replace('"\.pad$"', $dateStamp.'.html', $origUrl);
-                $newNode = new AJXP_Node($startUrl);
-                AJXP_Controller::applyHook("node.before_create", array($newNode, strlen($content)));
-                file_put_contents($newNode->getUrl(), $content);
-                AJXP_Controller::applyHook("node.change", array(null, $newNode));
-            }else{
-                AJXP_Controller::applyHook("node.before_change", array($selectedNode, strlen($content)));
-                file_put_contents($selectedNode->getUrl(), $content);
-                clearstatcache(true, $selectedNode->getUrl());
-                $selectedNode->loadNodeInfo(true);
-                AJXP_Controller::applyHook("node.change", array($selectedNode, $selectedNode));
-            }
-
-
-        } else if ($actionName == "etherpad_close") {
-
-            // WE SHOULD DETECT IF THERE IS NOBODY CONNECTED ANYMORE, AND DELETE THE PAD.
-            // BUT SEEMS LIKE THERE'S NO WAY TO PROPERLY REMOVE AN AUTHOR VIA API
-            $sessionID = $httpVars["session_id"];
-            $client->deleteSession($sessionID);
-
-        } else if ($actionName == "etherpad_proxy_api") {
-
-            if ($httpVars["api_action"] == "list_pads") {
-                $res = $client->listPads($groupID);
-            } else if ($httpVars["api_action"] == "list_authors_for_pad") {
-                $res = $client->listAuthorsOfPad($httpVars["pad_id"]);
-            }
-            HTMLWriter::charsetHeader("application/json");
-            echo(json_encode($res));
-
-        } else if ($actionName == "etherpad_get_content"){
-
-            HTMLWriter::charsetHeader("text/plain");
-            echo $client->getText($httpVars["pad_id"])->text;
-
-        }
-
-        return null;
-
-    }
-
-    /**
-     * @param AJXP_Node $ajxpNode
-     */
-    public function hideExtension(&$ajxpNode){
-        if($ajxpNode->hasExtension("pad")){
-            $baseName = AJXP_Utils::safeBasename($ajxpNode->getPath());
-            $ajxpNode->setLabel(str_replace(".pad", "", $baseName));
-        }
-    }
-
-    /**
-     * @param AJXP_Node $fromNode
-     * @param AJXP_Node $toNode
-     * @param bool $copy
-     */
-    public function handleNodeChange($fromNode=null, $toNode=null, $copy = false){
-        if($fromNode == null) return;
-        if($toNode == null){
-            $fromNode->removeMetadata("etherpad", AJXP_METADATA_ALLUSERS, AJXP_METADATA_SCOPE_GLOBAL, false);
-        }else if(!$copy){
-            $toNode->copyOrMoveMetadataFromNode($fromNode, "etherpad", "move", AJXP_METADATA_ALLUSERS, AJXP_METADATA_SCOPE_GLOBAL, false);
-        }
-    }
-
-}
diff --git a/core/src/plugins/editor.etherpad/class.EtherpadLauncher.js b/core/src/plugins/editor.etherpad/class.EtherpadLauncher.js
index 353f455f58..d30247bd8b 100644
--- a/core/src/plugins/editor.etherpad/class.EtherpadLauncher.js
+++ b/core/src/plugins/editor.etherpad/class.EtherpadLauncher.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 Class.create("EtherpadLauncher", AbstractEditor, {
 
diff --git a/core/src/plugins/editor.etherpad/etherpad-client/etherpad-lite-client.php b/core/src/plugins/editor.etherpad/etherpad-client/etherpad-lite-client.php
index 1b3bb60cfd..7189faec30 100755
--- a/core/src/plugins/editor.etherpad/etherpad-client/etherpad-lite-client.php
+++ b/core/src/plugins/editor.etherpad/etherpad-client/etherpad-lite-client.php
@@ -50,6 +50,7 @@ protected function call($function, array $arguments = array(), $method = 'GET')
       $c = curl_init($url);
       curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
       curl_setopt($c, CURLOPT_TIMEOUT, 20);
+      curl_setopt($c, CURLOPT_SSL_VERIFYPEER, false);
       if ($method === 'POST') {
         curl_setopt($c, CURLOPT_POST, true);
         curl_setopt($c, CURLOPT_POSTFIELDS, $arguments);
diff --git a/core/src/plugins/editor.etherpad/i18n/conf/de.php b/core/src/plugins/editor.etherpad/i18n/conf/de.php
index 1c31c90ffa..a844bcef18 100644
--- a/core/src/plugins/editor.etherpad/i18n/conf/de.php
+++ b/core/src/plugins/editor.etherpad/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Etherpad" => "Etherpad",
diff --git a/core/src/plugins/editor.etherpad/i18n/conf/en.php b/core/src/plugins/editor.etherpad/i18n/conf/en.php
index 4d9925a4e0..3ccd2b744f 100644
--- a/core/src/plugins/editor.etherpad/i18n/conf/en.php
+++ b/core/src/plugins/editor.etherpad/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Etherpad" => "Etherpad",
diff --git a/core/src/plugins/editor.etherpad/i18n/conf/fr.php b/core/src/plugins/editor.etherpad/i18n/conf/fr.php
index f1f5ca36d6..cb35967f2c 100644
--- a/core/src/plugins/editor.etherpad/i18n/conf/fr.php
+++ b/core/src/plugins/editor.etherpad/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Etherpad" => "Etherpad",
diff --git a/core/src/plugins/editor.etherpad/i18n/conf/it.php b/core/src/plugins/editor.etherpad/i18n/conf/it.php
index f34fc4b591..ebb382e27b 100644
--- a/core/src/plugins/editor.etherpad/i18n/conf/it.php
+++ b/core/src/plugins/editor.etherpad/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Etherpad" => "Etherpad",
diff --git a/core/src/plugins/editor.etherpad/i18n/conf/pt.php b/core/src/plugins/editor.etherpad/i18n/conf/pt.php
index 8dabe4fac0..d7a9981da6 100644
--- a/core/src/plugins/editor.etherpad/i18n/conf/pt.php
+++ b/core/src/plugins/editor.etherpad/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Etherpad" => "Etherpad",
diff --git a/core/src/plugins/editor.etherpad/i18n/de.php b/core/src/plugins/editor.etherpad/i18n/de.php
index ad4cd7a8b0..dc1b19e404 100644
--- a/core/src/plugins/editor.etherpad/i18n/de.php
+++ b/core/src/plugins/editor.etherpad/i18n/de.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/editor.etherpad/i18n/en.php b/core/src/plugins/editor.etherpad/i18n/en.php
index 924a5bb465..233cbc523b 100644
--- a/core/src/plugins/editor.etherpad/i18n/en.php
+++ b/core/src/plugins/editor.etherpad/i18n/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/editor.etherpad/i18n/fr.php b/core/src/plugins/editor.etherpad/i18n/fr.php
index b819e6601a..e3aa36d822 100755
--- a/core/src/plugins/editor.etherpad/i18n/fr.php
+++ b/core/src/plugins/editor.etherpad/i18n/fr.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/editor.etherpad/i18n/it.php b/core/src/plugins/editor.etherpad/i18n/it.php
index b289bc00f1..dc3f551e18 100644
--- a/core/src/plugins/editor.etherpad/i18n/it.php
+++ b/core/src/plugins/editor.etherpad/i18n/it.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/editor.etherpad/i18n/pt.php b/core/src/plugins/editor.etherpad/i18n/pt.php
index c554ca1e76..64cbb2dd77 100644
--- a/core/src/plugins/editor.etherpad/i18n/pt.php
+++ b/core/src/plugins/editor.etherpad/i18n/pt.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/editor.etherpad/manifest.xml b/core/src/plugins/editor.etherpad/manifest.xml
index cb4f32070f..f23b4c3a97 100644
--- a/core/src/plugins/editor.etherpad/manifest.xml
+++ b/core/src/plugins/editor.etherpad/manifest.xml
@@ -127,5 +127,5 @@
             <serverCallback methodName="handleNodeChange" hookName="node.change"/>
         </hooks>
     </registry_contributions>
-    <class_definition classname="EtherpadClient" filename="plugins/editor.etherpad/class.EtherpadClient.php"/>
+    <class_definition classname="Pydio\Editor\Etherpad\EtherpadClient" filename="plugins/editor.etherpad/EtherpadClient.php"/>
 </editor>
diff --git a/core/src/plugins/editor.exif/class.ExifEditor.js b/core/src/plugins/editor.exif/class.ExifEditor.js
index 1f5671bdd0..ab330e61c6 100644
--- a/core/src/plugins/editor.exif/class.ExifEditor.js
+++ b/core/src/plugins/editor.exif/class.ExifEditor.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 Class.create("ExifEditor", AbstractEditor, {
 
diff --git a/core/src/plugins/editor.exif/i18n/conf/de.php b/core/src/plugins/editor.exif/i18n/conf/de.php
index 60574fe9f9..ed8b58b636 100644
--- a/core/src/plugins/editor.exif/i18n/conf/de.php
+++ b/core/src/plugins/editor.exif/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "EXIF Extractor" => "EXIF-Betrachter",
diff --git a/core/src/plugins/editor.exif/i18n/conf/en.php b/core/src/plugins/editor.exif/i18n/conf/en.php
index e2411cace8..46646a82c2 100644
--- a/core/src/plugins/editor.exif/i18n/conf/en.php
+++ b/core/src/plugins/editor.exif/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "EXIF Extractor" => "EXIF Extractor",
diff --git a/core/src/plugins/editor.exif/i18n/conf/fr.php b/core/src/plugins/editor.exif/i18n/conf/fr.php
index 3472d9ff92..72bf3f5ca9 100644
--- a/core/src/plugins/editor.exif/i18n/conf/fr.php
+++ b/core/src/plugins/editor.exif/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "EXIF Extractor" => "Extraction EXIF",
diff --git a/core/src/plugins/editor.exif/i18n/conf/it.php b/core/src/plugins/editor.exif/i18n/conf/it.php
index ef301eabee..d3eb8eb027 100644
--- a/core/src/plugins/editor.exif/i18n/conf/it.php
+++ b/core/src/plugins/editor.exif/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "EXIF Extractor" => "Estrattore EXIF",
diff --git a/core/src/plugins/editor.exif/i18n/conf/pt.php b/core/src/plugins/editor.exif/i18n/conf/pt.php
index 10e5dd9b0b..f22888c0af 100644
--- a/core/src/plugins/editor.exif/i18n/conf/pt.php
+++ b/core/src/plugins/editor.exif/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "EXIF Extractor" => "Extractor EXIF",
diff --git a/core/src/plugins/editor.exif/i18n/fr.php b/core/src/plugins/editor.exif/i18n/fr.php
index 522e4a2c69..9a06dfdcb7 100644
--- a/core/src/plugins/editor.exif/i18n/fr.php
+++ b/core/src/plugins/editor.exif/i18n/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Lecteur Exif",
diff --git a/core/src/plugins/editor.exif/i18n/si.php b/core/src/plugins/editor.exif/i18n/si.php
index ed66936e0e..540c91345b 100644
--- a/core/src/plugins/editor.exif/i18n/si.php
+++ b/core/src/plugins/editor.exif/i18n/si.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 // Slovenian translation: April 21 2011 by Vladimir Bohinc (vladimir.bohinc@gmail.com)
 //
diff --git a/core/src/plugins/editor.imagick/IMagickPreviewer.php b/core/src/plugins/editor.imagick/IMagickPreviewer.php
new file mode 100644
index 0000000000..c103335e11
--- /dev/null
+++ b/core/src/plugins/editor.imagick/IMagickPreviewer.php
@@ -0,0 +1,467 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Editor\Image;
+
+use Pydio\Access\Core\Exception\FileNotFoundException;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Core\Model\ContextInterface;
+
+use Pydio\Core\Services\LocalCache;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Vars\InputFilter;
+
+use Pydio\Core\PluginFramework\Plugin;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Class IMagickPreviewer
+ * Encapsulates calls to Image Magick to extract JPG previews of PDF, PSD, TIFF, etc.
+ *
+ * @package Pydio\Editor\Image
+ */
+class IMagickPreviewer extends Plugin
+{
+    protected $extractAll = false;
+    protected $onTheFly = false;
+    protected $useOnTheFly = false;
+
+    protected $imagickExtensions = array("pdf", "svg", "tif", "tiff", "psd", "xcf", "eps", "cr2","ai");
+    protected $unoconvExtensios = array("xls", "xlt", "xlsx", "xltx", "ods", "doc", "dot", "docx", "dotx", "odt", "ppt", "pptx", "odp", "rtf");
+
+    /**
+     * Load the configs passed as parameter. This method will
+     * + Parse the config definitions and load the default values
+     * + Merge these values with the $configData parameter
+     * + Publish their value in the manifest if the global_param is "exposed" to the client.
+     * @param array $configsData
+     * @return void
+     */
+    public function loadConfigs($configsData)
+    {
+        parent::loadConfigs($configsData);
+        if (isSet($configsData["UNOCONV"]) && !empty($configsData["UNOCONV"])) {
+            // APPEND THE UNOCONV SUPPORTED EXTENSIONS
+            $this->manifestDoc->documentElement->setAttribute("mimes", implode(",", array_merge($this->imagickExtensions,$this->unoconvExtensios)));
+        } else {
+            $this->manifestDoc->documentElement->setAttribute("mimes", implode(",", $this->imagickExtensions));
+        }
+    }
+
+    /**
+     * @param $action
+     * @param $httpVars
+     * @param $filesVars
+     * @param ContextInterface $contextInterface
+     * @throws PydioException
+     * @throws FileNotFoundException
+     */
+    public function switchAction($action, $httpVars, $filesVars, \Pydio\Core\Model\ContextInterface $contextInterface)
+    {
+        $convert = $this->getContextualOption($contextInterface, "IMAGE_MAGICK_CONVERT");
+        if (empty($convert)) {
+            return ;
+        }
+        $flyThreshold = 1024*1024*intval($this->getContextualOption($contextInterface, "ONTHEFLY_THRESHOLD"));
+        $selection = UserSelection::fromContext($contextInterface, $httpVars);
+        $destStreamURL = $selection->currentBaseUrl();
+
+        if ($action == "imagick_data_proxy") {
+            $this->extractAll = false;
+            $file = $selection->getUniqueNode()->getUrl();
+            if(!file_exists($file) || !is_readable($file)){
+                throw new FileNotFoundException($file);
+            }
+            if(isSet($httpVars["all"])) {
+                $this->logInfo('Preview', 'Preview content of '.$file, array("files" => $file));
+                $this->extractAll = true;
+            }
+
+            if (($size = filesize($file)) === false) {
+                return ;
+            } else {
+                if($size > $flyThreshold) $this->useOnTheFly = true;
+                else $this->useOnTheFly = false;
+            }
+
+            if ($this->extractAll) {
+                $node = new AJXP_Node($file);
+                Controller::applyHook("node.read", array($node));
+            }
+
+            $cache = LocalCache::getItem("imagick_".($this->extractAll?"full":"thumb"), $file, function($masterFile, $targetFile) use ($contextInterface){
+                return $this->generateJpegsCallback($contextInterface, $masterFile, $targetFile);
+            });
+            session_write_close();
+            $cacheData = $cache->getData();
+
+            if (!$this->useOnTheFly && $this->extractAll) { // extract all on first view
+                $ext = pathinfo($file, PATHINFO_EXTENSION);
+                $prefix = str_replace(".$ext", "", $cache->getId());
+                $files = $this->listExtractedJpg($file, $prefix);
+                header("Content-Type: application/json");
+                print(json_encode($files));
+                return ;
+            } else if ($this->extractAll) { // on the fly extract mode
+                $ext = pathinfo($file, PATHINFO_EXTENSION);
+                $prefix = str_replace(".$ext", "", $cache->getId());
+                $files = $this->listPreviewFiles($contextInterface, $file, $prefix);
+                header("Content-Type: application/json");
+                print(json_encode($files));
+                return ;
+            } else {
+                header("Content-Type: image/jpeg; name=\"".basename($file)."\"");
+                header("Content-Length: ".strlen($cacheData));
+                header('Cache-Control: public');
+                header("Pragma:");
+                header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()-10000) . " GMT");
+                header("Expires: " . gmdate("D, d M Y H:i:s", time()+5*24*3600) . " GMT");
+                print($cacheData);
+                return ;
+            }
+
+        } else if ($action == "get_extracted_page" && isSet($httpVars["file"])) {
+
+            $file = (defined('AJXP_SHARED_CACHE_DIR')?AJXP_SHARED_CACHE_DIR:AJXP_CACHE_DIR)."/imagick_full/". InputFilter::decodeSecureMagic($httpVars["file"]);
+            if (!is_file($file)) {
+                $srcfile = InputFilter::decodeSecureMagic($httpVars["src_file"]);
+                if($contextInterface->getRepository()->hasContentFilter()){
+                    $contentFilter = $contextInterface->getRepository()->getContentFilter();
+                    $srcfile = $contentFilter->filterExternalPath($srcfile);
+                }
+                $size = filesize($destStreamURL."/".$srcfile);
+                if($size > $flyThreshold) $this->useOnTheFly = true;
+                else $this->useOnTheFly = false;
+
+                if($this->useOnTheFly) $this->onTheFly = true;
+                $this->generateJpegsCallback($contextInterface, $destStreamURL.$srcfile, $file);
+
+            }
+            if(!is_file($file)) return ;
+            header("Content-Type: image/jpeg; name=\"".basename($file)."\"");
+            header("Content-Length: ".filesize($file));
+            header('Cache-Control: public');
+            readfile($file);
+
+        } else if ($action == "delete_imagick_data" && !$selection->isEmpty()) {
+            /*
+            $files = $this->listExtractedJpg(AJXP_CACHE_DIR."/".$httpVars["file"]);
+            foreach ($files as $file) {
+                if(is_file(AJXP_CACHE_DIR."/".$file["file"])) unlink(AJXP_CACHE_DIR."/".$file["file"]);
+            }
+            */
+        }
+        
+    }
+
+    /**
+     *
+     * @param \Pydio\Access\Core\Model\AJXP_Node $oldNode
+     * @param AJXP_Node $newNode
+     * @param Boolean $copy
+     */
+    public function deleteImagickCache($oldNode, $newNode = null, $copy = false)
+    {
+        if($oldNode == null) return;
+        $oldFile = $oldNode->getUrl();
+        // Should remove imagick cache file
+        if(!$this->handleMime($oldFile)) return;
+        if ($newNode == null || $copy == false) {
+
+            // Main Thumb
+            LocalCache::clearItem("imagick_thumb", $oldFile);
+
+            // Unoconv small PDF
+            $thumbCache = LocalCache::getItem("imagick_thumb", $oldFile, false);
+            $unoFile = pathinfo($thumbCache->getId(), PATHINFO_DIRNAME).DIRECTORY_SEPARATOR.pathinfo($thumbCache->getId(), PATHINFO_FILENAME)."_unoconv.pdf";
+            if(file_exists($unoFile)){
+                unlink($unoFile);
+            }
+
+            $cache = LocalCache::getItem("imagick_full", $oldFile, false);
+            // Unoconv full pdf
+            $unoFile = pathinfo($cache->getId(), PATHINFO_DIRNAME).DIRECTORY_SEPARATOR.pathinfo($cache->getId(), PATHINFO_FILENAME)."_unoconv.pdf";
+            if(file_exists($unoFile)){
+                unlink($unoFile);
+            }
+            $prefix = str_replace(".".pathinfo($cache->getId(), PATHINFO_EXTENSION), "", $cache->getId());
+            // Additional Extracted pages
+            $files = $this->listExtractedJpg($oldFile, $prefix);
+            $cacheDir = (defined('AJXP_SHARED_CACHE_DIR')?AJXP_SHARED_CACHE_DIR:AJXP_CACHE_DIR)."/imagick_full";
+            foreach ($files as $file) {
+                if(is_file($cacheDir."/".$file["file"])) {
+                    unlink($cacheDir."/".$file["file"]);
+                }
+            }
+        }
+    }
+
+    /**
+     * @param $file
+     * @param $prefix
+     * @return array
+     */
+    protected function listExtractedJpg($file, $prefix)
+    {
+        $n = new AJXP_Node($file);
+        $path = $n->getPath();
+        $files = array();
+        $index = 0;
+        while (is_file($prefix."-".$index.".jpg")) {
+            $extract = $prefix."-".$index.".jpg";
+            list($width, $height, $type, $attr) = @getimagesize($extract);
+            $files[] = array(
+                "file" => basename($extract),
+                "width"=>$width,
+                "height"=>$height,
+                "rest"  => "/get_extracted_page/".basename($extract).str_replace("%2F", "/", urlencode($path))
+            );
+            $index ++;
+        }
+        if (is_file($prefix.".jpg")) {
+            $extract = $prefix.".jpg";
+            list($width, $height, $type, $attr) = @getimagesize($extract);
+            $files[] = array(
+                "file" => basename($extract),
+                "width"=>$width,
+                "height"=>$height,
+                "rest"  => "/get_extracted_page/".basename($extract).str_replace("%2F", "/", urlencode($path))
+            );
+        }
+        return $files;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $file
+     * @param $prefix
+     * @return array
+     */
+    protected function listPreviewFiles(ContextInterface $ctx, $file, $prefix)
+    {
+        $files = array();
+        $index = 0;
+        $unoconv =  $this->getContextualOption($ctx, "UNOCONV");
+        if (!empty($unoconv)) {
+            $officeExt = array('xls', 'xlsx', 'ods', 'doc', 'docx', 'odt', 'ppt', 'pptx', 'odp', 'rtf');
+            $extension = pathinfo($file, PATHINFO_EXTENSION);
+            if (in_array(strtolower($extension), $officeExt)) {
+                $unoDoc = $prefix."_unoconv.pdf";
+                if(is_file($unoDoc)) $file = $unoDoc;
+            }
+        }
+        $count = $this->countPages($file);
+        $n = new AJXP_Node($file);
+        $path = $n->getPath();
+
+        while ($index < $count) {
+            $extract = $prefix."-".$index.".jpg";
+            list($width, $height, $type, $attr) = @getimagesize($extract);
+            $files[] = array(
+                "file" => basename($extract),
+                "width"=>$width,
+                "height"=>$height,
+                "rest"  => "/get_extracted_page/".basename($extract).str_replace("%2F", "/", urlencode($path))
+            );
+            $index ++;
+        }
+        if (is_file($prefix.".jpg")) {
+            $extract = $prefix.".jpg";
+            list($width, $height, $type, $attr) = @getimagesize($extract);
+            $files[] = array(
+                "file" => basename($extract),
+                "width"=>$width,
+                "height"=>$height,
+                "rest"  => "/get_extracted_page/".basename($extract).str_replace("%2F", "/", urlencode($path))
+            );
+        }
+        return $files;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $masterFile
+     * @param $targetFile
+     * @return bool
+     * @throws PydioException
+     */
+    public function generateJpegsCallback(ContextInterface $ctx, $masterFile, $targetFile)
+    {
+        $unoconv =  $this->getContextualOption($ctx, "UNOCONV");
+        if (!empty($unoconv)) {
+            $officeExt = array('xls', 'xlsx', 'ods', 'doc', 'docx', 'odt', 'ppt', 'pptx', 'odp', 'rtf');
+        } else {
+            $unoconv = false;
+            $officeExt = [];
+        }
+
+        $extension = pathinfo($masterFile, PATHINFO_EXTENSION);
+        $node = new AJXP_Node($masterFile);
+        $masterFile = $node->getRealFile();
+
+        if (DIRECTORY_SEPARATOR == "\\") {
+            $masterFile = str_replace("/", "\\", $masterFile);
+        }
+        $wrappers = stream_get_wrappers();
+        $wrappers_re = '(' . join('|', $wrappers) . ')';
+        $isStream = (preg_match( "!^$wrappers_re://!", $targetFile ) === 1);
+        if ($isStream) {
+            $backToStreamTarget = $targetFile;
+            $targetFile = tempnam(ApplicationState::getAjxpTmpDir(), "imagick_").".pdf";
+        }else{
+            $backToStreamTarget = null;
+        }
+        $workingDir = dirname($targetFile);
+        $out = array();
+        $return = 0;
+        $tmpFileThumb =  str_replace(".$extension", ".jpg", $targetFile);
+        if (DIRECTORY_SEPARATOR == "\\") {
+            $tmpFileThumb =  str_replace("/", "\\", $tmpFileThumb);
+        }
+        if (!$this->extractAll) {
+            //register_shutdown_function("unlink", $tmpFileThumb);
+        } else {
+            @set_time_limit(90);
+        }
+        chdir($workingDir);
+        if ($unoconv !== false && in_array(strtolower($extension), $officeExt)) {
+            $unoDoc = preg_replace("/(-[0-9]+)?\\.jpg/", "_unoconv.pdf", $tmpFileThumb);
+            if (!is_file($unoDoc)  || (is_file($unoDoc) && (filesize($unoDoc) == 0))) {
+                if (stripos(PHP_OS, "win") === 0) {
+                    $unoconv = $this->pluginConf["UNOCONV"]." -o ".escapeshellarg(basename($unoDoc))." -f pdf ".escapeshellarg($masterFile);
+                } else {
+                    $unoconv =  "HOME=". ApplicationState::getAjxpTmpDir() ." ".$unoconv." --stdout -f pdf ".escapeshellarg($masterFile)." > ".escapeshellarg(basename($unoDoc));
+                }
+                if(defined('AJXP_LOCALE')){
+                    putenv('LC_CTYPE='.AJXP_LOCALE);
+                }
+                exec($unoconv, $out, $return);
+            }
+            if (is_file($unoDoc)) {
+                $masterFile = basename($unoDoc);
+            }
+        }
+
+        if ($this->onTheFly) {
+            $pageNumber = strrchr($targetFile, "-");
+            $pageNumber = str_replace(array(".jpg","-"), "", $pageNumber);
+            $pageLimit = "[".$pageNumber."]";
+            $this->extractAll = true;
+        } else {
+            if (!$this->useOnTheFly) {
+                $pageLimit = ($this->extractAll?"":"[0]");
+            } else {
+                $pageLimit = "[0]";
+                if($this->extractAll) $tmpFileThumb = str_replace(".jpg", "-0.jpg", $tmpFileThumb);
+            }
+        }
+
+        $customOptions = $this->getContextualOption($ctx, "IM_CUSTOM_OPTIONS");
+        $customEnvPath = $this->getContextualOption($ctx, "ADDITIONAL_ENV_PATH");
+        $viewerQuality = $this->getContextualOption($ctx, "IM_VIEWER_QUALITY");
+        $thumbQuality = $this->getContextualOption($ctx, "IM_THUMB_QUALITY");
+        if (empty($customOptions)) {
+            $customOptions = "";
+        }
+        if (!empty($customEnvPath)) {
+            putenv("PATH=".getenv("PATH").":".$customEnvPath);
+        }
+        $params = $customOptions." ".( $this->extractAll? $viewerQuality : $thumbQuality );
+        $cmd = $this->getContextualOption($ctx, "IMAGE_MAGICK_CONVERT")." ".$params." ".escapeshellarg(($masterFile).$pageLimit)." ".escapeshellarg($tmpFileThumb);
+        $this->logDebug("IMagick Command : $cmd");
+        session_write_close(); // Be sure to give the hand back
+        exec($cmd, $out, $return);
+        if (is_array($out) && count($out)) {
+            throw new PydioException(implode("\n", $out));
+        }
+        if(!(is_file($tmpFileThumb) || is_file(str_replace(".jpg", "-0.jpg", $tmpFileThumb)))){
+            throw new PydioException("Error while converting PDF file to JPG thumbnail. Return code '$return'. Command used '".$this->getContextualOption($ctx, "IMAGE_MAGICK_CONVERT")."': is the binary at the correct location? Is the server allowed to use it?");
+        }
+        if (!$this->extractAll) {
+            rename($tmpFileThumb, $targetFile);
+            if ($isStream) {
+                $this->logDebug("Copy preview file to remote", $backToStreamTarget);
+                copy($targetFile, $backToStreamTarget);
+                unlink($targetFile);
+            }
+        } else {
+            if ($isStream) {
+                if (is_file(str_replace(".$extension", "", $targetFile))) {
+                    $targetFile = str_replace(".$extension", "", $targetFile);
+                }
+                if (is_file($targetFile)) {
+                    $this->logDebug("Copy preview file to remote", $backToStreamTarget);
+                    copy($targetFile, $backToStreamTarget);
+                    unlink($targetFile);
+                }
+                $this->logDebug("Searching for ", str_replace(".jpg", "-0.jpg", $tmpFileThumb));
+                $i = 0;
+                while (file_exists(str_replace(".jpg", "-$i.jpg", $tmpFileThumb))) {
+                    $page = str_replace(".jpg", "-$i.jpg", $tmpFileThumb);
+                    $remote_page = str_replace(".$extension", "-$i.jpg", $backToStreamTarget);
+                    $this->logDebug("Copy preview file to remote", $remote_page);
+                    copy($page, $remote_page);
+                    unlink($page);
+                    $i++;
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * @param $filename
+     * @return bool
+     */
+    protected function handleMime($filename)
+    {
+        $mimesAtt = explode(",", $this->getXPath()->query("@mimes")->item(0)->nodeValue);
+        $ext = strtolower(pathinfo($filename, PATHINFO_EXTENSION));
+        return in_array($ext, $mimesAtt);
+    }
+
+    /**
+     * @param $file
+     * @return int|null
+     */
+    protected function countPages($file)
+    {
+        $ext = strtolower(pathinfo($file, PATHINFO_EXTENSION));
+        if($ext != "pdf") return 20;
+        if(!file_exists($file))return null;
+        if (!$fp = @fopen($file,"r"))return null;
+        $max=0;
+        while (!feof($fp)) {
+            $line = fgets($fp, 255);
+            if (preg_match('/\/Count [0-9]+/', $line, $matches)) {
+                            preg_match('/[0-9]+/',$matches[0], $matches2);
+                            if ($max<$matches2[0]) $max=$matches2[0];
+            }
+        }
+        fclose($fp);
+        return (int) $max;
+    }
+
+
+}
diff --git a/core/src/plugins/editor.imagick/class.IMagickPreviewer.js b/core/src/plugins/editor.imagick/class.IMagickPreviewer.js
index 8438ab9bfa..2f46c8eb8c 100644
--- a/core/src/plugins/editor.imagick/class.IMagickPreviewer.js
+++ b/core/src/plugins/editor.imagick/class.IMagickPreviewer.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 Class.create("IMagickPreviewer", Diaporama, {
 
@@ -98,7 +98,7 @@ Class.create("IMagickPreviewer", Diaporama, {
             className:'thumbnail_iconlike_shadow',
             align:'absmiddle',
             src:IMagickPreviewer.prototype.getThumbnailSource(ajxpNode)
-		});		
+		});
         var div = new Element('div');
         div.insert(img);
 		div.resizePreviewElement = function(dimensionObject){
@@ -117,7 +117,7 @@ Class.create("IMagickPreviewer", Diaporama, {
 				height:20/ratio
 			};
 			var styleObj = fitRectangleToDimension(imgDim, dimensionObject);
-			img.setStyle(styleObj);
+            img.setStyle(styleObj);
             div.setStyle({
                 height:styleObj.height,
                 width:styleObj.width,
@@ -172,7 +172,7 @@ Class.create("IMagickPreviewer", Diaporama, {
 
     getRESTPreviewLinks:function(node){
         return {
-            "First Page Thumbnail": "&file=" + encodeURIComponent(node.getPath())
+            "First Page Thumbnail": ""
         };
     },
 
diff --git a/core/src/plugins/editor.imagick/class.IMagickPreviewer.php b/core/src/plugins/editor.imagick/class.IMagickPreviewer.php
deleted file mode 100644
index e4f1ace79e..0000000000
--- a/core/src/plugins/editor.imagick/class.IMagickPreviewer.php
+++ /dev/null
@@ -1,407 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Encapsulates calls to Image Magick to extract JPG previews of PDF, PSD, TIFF, etc.
- * @package AjaXplorer_Plugins
- * @subpackage Editor
- */
-class IMagickPreviewer extends AJXP_Plugin
-{
-    protected $extractAll = false;
-    protected $onTheFly = false;
-    protected $useOnTheFly = false;
-
-    protected $imagickExtensions = array("pdf", "svg", "tif", "tiff", "psd", "xcf", "eps", "cr2","ai");
-    protected $unoconvExtensios = array("xls", "xlt", "xlsx", "xltx", "ods", "doc", "dot", "docx", "dotx", "odt", "ppt", "pptx", "odp", "rtf");
-
-    public function loadConfigs($configsData)
-    {
-        parent::loadConfigs($configsData);
-        if (isSet($configsData["UNOCONV"]) && !empty($configsData["UNOCONV"])) {
-            // APPEND THE UNOCONV SUPPORTED EXTENSIONS
-            $this->manifestDoc->documentElement->setAttribute("mimes", implode(",", array_merge($this->imagickExtensions,$this->unoconvExtensios)));
-        } else {
-            $this->manifestDoc->documentElement->setAttribute("mimes", implode(",", $this->imagickExtensions));
-        }
-    }
-
-    public function switchAction($action, $httpVars, $filesVars)
-    {
-        $repository = ConfService::getRepository();
-        if (!$repository->detectStreamWrapper(true)) {
-            return false;
-        }
-        $convert = $this->getFilteredOption("IMAGE_MAGICK_CONVERT");
-        if (empty($convert)) {
-            return false;
-        }
-        $flyThreshold = 1024*1024*intval($this->getFilteredOption("ONTHEFLY_THRESHOLD", $repository));
-        $selection = new UserSelection($repository, $httpVars);
-        $destStreamURL = $selection->currentBaseUrl();
-
-        if ($action == "imagick_data_proxy") {
-            $this->extractAll = false;
-            $file = $selection->getUniqueNode()->getUrl();
-            if(!file_exists($file) || !is_readable($file)){
-                throw new Exception("Cannot find file");
-            }
-            if(isSet($httpVars["all"])) {
-                $this->logInfo('Preview', 'Preview content of '.$file, array("files" => $file));
-                $this->extractAll = true;
-            }
-
-            if (($size = filesize($file)) === false) {
-                return false;
-            } else {
-                if($size > $flyThreshold) $this->useOnTheFly = true;
-                else $this->useOnTheFly = false;
-            }
-
-            if ($this->extractAll) {
-                $node = new AJXP_Node($file);
-                AJXP_Controller::applyHook("node.read", array($node));
-            }
-
-            $cache = AJXP_Cache::getItem("imagick_".($this->extractAll?"full":"thumb"), $file, array($this, "generateJpegsCallback"));
-            session_write_close();
-            $cacheData = $cache->getData();
-
-            if (!$this->useOnTheFly && $this->extractAll) { // extract all on first view
-                $ext = pathinfo($file, PATHINFO_EXTENSION);
-                $prefix = str_replace(".$ext", "", $cache->getId());
-                $files = $this->listExtractedJpg($file, $prefix);
-                header("Content-Type: application/json");
-                print(json_encode($files));
-                return false;
-            } else if ($this->extractAll) { // on the fly extract mode
-                $ext = pathinfo($file, PATHINFO_EXTENSION);
-                $prefix = str_replace(".$ext", "", $cache->getId());
-                $files = $this->listPreviewFiles($file, $prefix);
-                header("Content-Type: application/json");
-                print(json_encode($files));
-                return false;
-            } else {
-                header("Content-Type: image/jpeg; name=\"".basename($file)."\"");
-                header("Content-Length: ".strlen($cacheData));
-                header('Cache-Control: public');
-                header("Pragma:");
-                header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()-10000) . " GMT");
-                header("Expires: " . gmdate("D, d M Y H:i:s", time()+5*24*3600) . " GMT");
-                print($cacheData);
-                return false;
-            }
-
-        } else if ($action == "get_extracted_page" && isSet($httpVars["file"])) {
-            $file = (defined('AJXP_SHARED_CACHE_DIR')?AJXP_SHARED_CACHE_DIR:AJXP_CACHE_DIR)."/imagick_full/".AJXP_Utils::decodeSecureMagic($httpVars["file"]);
-            if (!is_file($file)) {
-                $srcfile = AJXP_Utils::decodeSecureMagic($httpVars["src_file"]);
-                if($repository->hasContentFilter()){
-                    $contentFilter = $repository->getContentFilter();
-                    $srcfile = $contentFilter->filterExternalPath($srcfile);
-                }
-                $size = filesize($destStreamURL."/".$srcfile);
-                if($size > $flyThreshold) $this->useOnTheFly = true;
-                else $this->useOnTheFly = false;
-
-                if($this->useOnTheFly) $this->onTheFly = true;
-                $this->generateJpegsCallback($destStreamURL.$srcfile, $file);
-
-            }
-            if(!is_file($file)) return false;
-            header("Content-Type: image/jpeg; name=\"".basename($file)."\"");
-            header("Content-Length: ".filesize($file));
-            header('Cache-Control: public');
-            readfile($file);
-            exit(1);
-        } else if ($action == "delete_imagick_data" && !$selection->isEmpty()) {
-            /*
-            $files = $this->listExtractedJpg(AJXP_CACHE_DIR."/".$httpVars["file"]);
-            foreach ($files as $file) {
-                if(is_file(AJXP_CACHE_DIR."/".$file["file"])) unlink(AJXP_CACHE_DIR."/".$file["file"]);
-            }
-            */
-        }
-    }
-
-    /**
-     *
-     * @param AJXP_Node $oldNode
-     * @param AJXP_Node $newNode
-     * @param Boolean $copy
-     */
-    public function deleteImagickCache($oldNode, $newNode = null, $copy = false)
-    {
-        if($oldNode == null) return;
-        $oldFile = $oldNode->getUrl();
-        // Should remove imagick cache file
-        if(!$this->handleMime($oldFile)) return;
-        if ($newNode == null || $copy == false) {
-
-            // Main Thumb
-            AJXP_Cache::clearItem("imagick_thumb", $oldFile);
-
-            // Unoconv small PDF
-            $thumbCache = AJXP_Cache::getItem("imagick_thumb", $oldFile, false);
-            $unoFile = pathinfo($thumbCache->getId(), PATHINFO_DIRNAME).DIRECTORY_SEPARATOR.pathinfo($thumbCache->getId(), PATHINFO_FILENAME)."_unoconv.pdf";
-            if(file_exists($unoFile)){
-                unlink($unoFile);
-            }
-
-            $cache = AJXP_Cache::getItem("imagick_full", $oldFile, false);
-            // Unoconv full pdf
-            $unoFile = pathinfo($cache->getId(), PATHINFO_DIRNAME).DIRECTORY_SEPARATOR.pathinfo($cache->getId(), PATHINFO_FILENAME)."_unoconv.pdf";
-            if(file_exists($unoFile)){
-                unlink($unoFile);
-            }
-            $prefix = str_replace(".".pathinfo($cache->getId(), PATHINFO_EXTENSION), "", $cache->getId());
-            // Additional Extracted pages
-            $files = $this->listExtractedJpg($oldFile, $prefix);
-            $cacheDir = (defined('AJXP_SHARED_CACHE_DIR')?AJXP_SHARED_CACHE_DIR:AJXP_CACHE_DIR)."/imagick_full";
-            foreach ($files as $file) {
-                if(is_file($cacheDir."/".$file["file"])) {
-                    unlink($cacheDir."/".$file["file"]);
-                }
-            }
-
-
-        }
-    }
-
-    protected function listExtractedJpg($file, $prefix)
-    {
-        $n = new AJXP_Node($file);
-        $path = $n->getPath();
-        $files = array();
-        $index = 0;
-        while (is_file($prefix."-".$index.".jpg")) {
-            $extract = $prefix."-".$index.".jpg";
-            list($width, $height, $type, $attr) = @getimagesize($extract);
-            $files[] = array(
-                "file" => basename($extract),
-                "width"=>$width,
-                "height"=>$height,
-                "rest"  => "/get_extracted_page/".basename($extract).str_replace("%2F", "/", urlencode($path))
-            );
-            $index ++;
-        }
-        if (is_file($prefix.".jpg")) {
-            $extract = $prefix.".jpg";
-            list($width, $height, $type, $attr) = @getimagesize($extract);
-            $files[] = array(
-                "file" => basename($extract),
-                "width"=>$width,
-                "height"=>$height,
-                "rest"  => "/get_extracted_page/".basename($extract).str_replace("%2F", "/", urlencode($path))
-            );
-        }
-        return $files;
-    }
-
-    protected function listPreviewFiles($file, $prefix)
-    {
-        $files = array();
-        $index = 0;
-        $unoconv =  $this->getFilteredOption("UNOCONV");
-        if (!empty($unoconv)) {
-            $officeExt = array('xls', 'xlsx', 'ods', 'doc', 'docx', 'odt', 'ppt', 'pptx', 'odp', 'rtf');
-            $extension = pathinfo($file, PATHINFO_EXTENSION);
-            if (in_array(strtolower($extension), $officeExt)) {
-                $unoDoc = $prefix."_unoconv.pdf";
-                if(is_file($unoDoc)) $file = $unoDoc;
-            }
-        }
-        $count = $this->countPages($file);
-        $n = new AJXP_Node($file);
-        $path = $n->getPath();
-
-        while ($index < $count) {
-            $extract = $prefix."-".$index.".jpg";
-            list($width, $height, $type, $attr) = @getimagesize($extract);
-            $files[] = array(
-                "file" => basename($extract),
-                "width"=>$width,
-                "height"=>$height,
-                "rest"  => "/get_extracted_page/".basename($extract).str_replace("%2F", "/", urlencode($path))
-            );
-            $index ++;
-        }
-        if (is_file($prefix.".jpg")) {
-            $extract = $prefix.".jpg";
-            list($width, $height, $type, $attr) = @getimagesize($extract);
-            $files[] = array(
-                "file" => basename($extract),
-                "width"=>$width,
-                "height"=>$height,
-                "rest"  => "/get_extracted_page/".basename($extract).str_replace("%2F", "/", urlencode($path))
-            );
-        }
-        return $files;
-    }
-
-    public function generateJpegsCallback($masterFile, $targetFile)
-    {
-        $unoconv =  $this->getFilteredOption("UNOCONV");
-        if (!empty($unoconv)) {
-            $officeExt = array('xls', 'xlsx', 'ods', 'doc', 'docx', 'odt', 'ppt', 'pptx', 'odp', 'rtf');
-        } else {
-            $unoconv = false;
-        }
-
-        $extension = pathinfo($masterFile, PATHINFO_EXTENSION);
-        $node = new AJXP_Node($masterFile);
-        $masterFile = $node->getRealFile();
-
-        if (DIRECTORY_SEPARATOR == "\\") {
-            $masterFile = str_replace("/", "\\", $masterFile);
-        }
-        $wrappers = stream_get_wrappers();
-        $wrappers_re = '(' . join('|', $wrappers) . ')';
-        $isStream = (preg_match( "!^$wrappers_re://!", $targetFile ) === 1);
-        if ($isStream) {
-            $backToStreamTarget = $targetFile;
-            $targetFile = tempnam(AJXP_Utils::getAjxpTmpDir(), "imagick_").".pdf";
-        }
-        $workingDir = dirname($targetFile);
-        $out = array();
-        $return = 0;
-        $tmpFileThumb =  str_replace(".$extension", ".jpg", $targetFile);
-        if (DIRECTORY_SEPARATOR == "\\") {
-            $tmpFileThumb =  str_replace("/", "\\", $tmpFileThumb);
-        }
-        if (!$this->extractAll) {
-            //register_shutdown_function("unlink", $tmpFileThumb);
-        } else {
-            @set_time_limit(90);
-        }
-        chdir($workingDir);
-        if ($unoconv !== false && in_array(strtolower($extension), $officeExt)) {
-            $unoDoc = preg_replace("/(-[0-9]+)?\\.jpg/", "_unoconv.pdf", $tmpFileThumb);
-            if (!is_file($unoDoc)  || (is_file($unoDoc) && (filesize($unoDoc) == 0))) {
-                if (stripos(PHP_OS, "win") === 0) {
-                    $unoconv = $this->pluginConf["UNOCONV"]." -o ".escapeshellarg(basename($unoDoc))." -f pdf ".escapeshellarg($masterFile);
-                } else {
-                    $unoconv =  "HOME=".AJXP_Utils::getAjxpTmpDir()." ".$unoconv." --stdout -f pdf ".escapeshellarg($masterFile)." > ".escapeshellarg(basename($unoDoc));
-                }
-                putenv('LC_CTYPE='.AJXP_LOCALE);
-                exec($unoconv, $out, $return);
-            }
-            if (is_file($unoDoc)) {
-                $masterFile = basename($unoDoc);
-            }
-        }
-
-        if ($this->onTheFly) {
-            $pageNumber = strrchr($targetFile, "-");
-            $pageNumber = str_replace(array(".jpg","-"), "", $pageNumber);
-            $pageLimit = "[".$pageNumber."]";
-            $this->extractAll = true;
-        } else {
-            if (!$this->useOnTheFly) {
-                $pageLimit = ($this->extractAll?"":"[0]");
-            } else {
-                $pageLimit = "[0]";
-                if($this->extractAll) $tmpFileThumb = str_replace(".jpg", "-0.jpg", $tmpFileThumb);
-            }
-        }
-
-        $customOptions = $this->getFilteredOption("IM_CUSTOM_OPTIONS");
-        $customEnvPath = $this->getFilteredOption("ADDITIONAL_ENV_PATH");
-        $viewerQuality = $this->getFilteredOption("IM_VIEWER_QUALITY");
-        $thumbQuality = $this->getFilteredOption("IM_THUMB_QUALITY");
-        if (empty($customOptions)) {
-            $customOptions = "";
-        }
-        if (!empty($customEnvPath)) {
-            putenv("PATH=".getenv("PATH").":".$customEnvPath);
-        }
-        $params = $customOptions." ".( $this->extractAll? $viewerQuality : $thumbQuality );
-        $cmd = $this->getFilteredOption("IMAGE_MAGICK_CONVERT")." ".$params." ".escapeshellarg(($masterFile).$pageLimit)." ".escapeshellarg($tmpFileThumb);
-        $this->logDebug("IMagick Command : $cmd");
-        session_write_close(); // Be sure to give the hand back
-        exec($cmd, $out, $return);
-        if (is_array($out) && count($out)) {
-            throw new AJXP_Exception(implode("\n", $out));
-        }
-        if(!(is_file($tmpFileThumb) || is_file(str_replace(".jpg", "-0.jpg", $tmpFileThumb)))){
-            throw new AJXP_Exception("Error while converting PDF file to JPG thumbnail. Return code '$return'. Command used '".$this->getFilteredOption("IMAGE_MAGICK_CONVERT")."': is the binary at the correct location? Is the server allowed to use it?");
-        }
-        if (!$this->extractAll) {
-            rename($tmpFileThumb, $targetFile);
-            if ($isStream) {
-                $this->logDebug("Copy preview file to remote", $backToStreamTarget);
-                copy($targetFile, $backToStreamTarget);
-                unlink($targetFile);
-            }
-        } else {
-            if ($isStream) {
-                if (is_file(str_replace(".$extension", "", $targetFile))) {
-                    $targetFile = str_replace(".$extension", "", $targetFile);
-                }
-                if (is_file($targetFile)) {
-                    $this->logDebug("Copy preview file to remote", $backToStreamTarget);
-                    copy($targetFile, $backToStreamTarget);
-                    unlink($targetFile);
-                }
-                $this->logDebug("Searching for ", str_replace(".jpg", "-0.jpg", $tmpFileThumb));
-                $i = 0;
-                while (file_exists(str_replace(".jpg", "-$i.jpg", $tmpFileThumb))) {
-                    $page = str_replace(".jpg", "-$i.jpg", $tmpFileThumb);
-                    $remote_page = str_replace(".$extension", "-$i.jpg", $backToStreamTarget);
-                    $this->logDebug("Copy preview file to remote", $remote_page);
-                    copy($page, $remote_page);
-                    unlink($page);
-                    $i++;
-                }
-            }
-        }
-        return true;
-    }
-
-    protected function handleMime($filename)
-    {
-        $mimesAtt = explode(",", $this->getXPath()->query("@mimes")->item(0)->nodeValue);
-        $ext = strtolower(pathinfo($filename, PATHINFO_EXTENSION));
-        return in_array($ext, $mimesAtt);
-    }
-
-    protected function countPages($file)
-    {
-        $ext = strtolower(pathinfo($file, PATHINFO_EXTENSION));
-        if($ext != "pdf") return 20;
-        if(!file_exists($file))return null;
-        if (!$fp = @fopen($file,"r"))return null;
-        $max=0;
-        while (!feof($fp)) {
-            $line = fgets($fp, 255);
-            if (preg_match('/\/Count [0-9]+/', $line, $matches)) {
-                            preg_match('/[0-9]+/',$matches[0], $matches2);
-                            if ($max<$matches2[0]) $max=$matches2[0];
-            }
-        }
-        fclose($fp);
-        return (int) $max;
-    }
-
-
-}
diff --git a/core/src/plugins/editor.imagick/i18n/conf/de.php b/core/src/plugins/editor.imagick/i18n/conf/de.php
index 669a3edfe5..629f3e365a 100644
--- a/core/src/plugins/editor.imagick/i18n/conf/de.php
+++ b/core/src/plugins/editor.imagick/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Image Magick" => "ImageMagick-Betrachter",
diff --git a/core/src/plugins/editor.imagick/i18n/conf/en.php b/core/src/plugins/editor.imagick/i18n/conf/en.php
index 991a4cec63..923fb69de6 100644
--- a/core/src/plugins/editor.imagick/i18n/conf/en.php
+++ b/core/src/plugins/editor.imagick/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Image Magick" => "Image Magick",
diff --git a/core/src/plugins/editor.imagick/i18n/conf/fr.php b/core/src/plugins/editor.imagick/i18n/conf/fr.php
index 33327d11ef..c54c4fdfc5 100644
--- a/core/src/plugins/editor.imagick/i18n/conf/fr.php
+++ b/core/src/plugins/editor.imagick/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Image Magick" => "Image Magick",
diff --git a/core/src/plugins/editor.imagick/i18n/conf/it.php b/core/src/plugins/editor.imagick/i18n/conf/it.php
index b9d3342b73..508e7deb3c 100644
--- a/core/src/plugins/editor.imagick/i18n/conf/it.php
+++ b/core/src/plugins/editor.imagick/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Image Magick" => "Image Magick",
diff --git a/core/src/plugins/editor.imagick/i18n/conf/pt.php b/core/src/plugins/editor.imagick/i18n/conf/pt.php
index fa5b4f9294..00944f8a24 100644
--- a/core/src/plugins/editor.imagick/i18n/conf/pt.php
+++ b/core/src/plugins/editor.imagick/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Image Magick" => "Image Magick",
diff --git a/core/src/plugins/editor.imagick/manifest.xml b/core/src/plugins/editor.imagick/manifest.xml
index 8d1b619f57..244c3856ef 100644
--- a/core/src/plugins/editor.imagick/manifest.xml
+++ b/core/src/plugins/editor.imagick/manifest.xml
@@ -4,7 +4,7 @@
         mimes="pdf,svg,tif,tiff,psd,xcf,eps,xls,xlsx,ods,doc,docx,odt,ppt,pptx,odp,rtf,cr2,ai" label="CONF_MESSAGE[Image Magick]"
         description="CONF_MESSAGE[Image Magick viewer supports PDF and various images formats preview. Requires external library to be installed on the server.]"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <class_definition filename="plugins/editor.imagick/class.IMagickPreviewer.php" classname="IMagickPreviewer"/>
+    <class_definition filename="plugins/editor.imagick/IMagickPreviewer.php" classname="Pydio\Editor\Image\IMagickPreviewer"/>
     <client_settings>
         <resources>
             <js file="plugins/editor.imagick/class.IMagickPreviewer.js" className="IMagickPreviewer"/>
diff --git a/core/src/plugins/editor.infopanel/i18n/conf/de.php b/core/src/plugins/editor.infopanel/i18n/conf/de.php
index 877b2353de..c202eecf71 100644
--- a/core/src/plugins/editor.infopanel/i18n/conf/de.php
+++ b/core/src/plugins/editor.infopanel/i18n/conf/de.php
@@ -16,11 +16,11 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Info Panel..." => "Info-Bereich",
 "Info Panel" => "Auf der rechten Seite wird ein Info-Bereich mit weiteren Infrmationen zum ausgewählten Element angezeigt.",
 "Open in..." => "Open in...",
 "Simple Picker to open any type of file in any available editor." => "Simple Picker to open any type of file in any available editor.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/editor.infopanel/i18n/conf/en.php b/core/src/plugins/editor.infopanel/i18n/conf/en.php
index b47c7e58b4..1ff259d318 100644
--- a/core/src/plugins/editor.infopanel/i18n/conf/en.php
+++ b/core/src/plugins/editor.infopanel/i18n/conf/en.php
@@ -16,11 +16,11 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Open in..." => "Open in...",
 "Simple Picker to open any type of file in any available editor." => "Simple Picker to open any type of file in any available editor.",
 "Info Panel..." => "Info Panel...",
 "Info Panel" => "Info Panel",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/editor.openlayer/class.OLViewer.js b/core/src/plugins/editor.openlayer/class.OLViewer.js
index f691520dee..e1fb686e2f 100644
--- a/core/src/plugins/editor.openlayer/class.OLViewer.js
+++ b/core/src/plugins/editor.openlayer/class.OLViewer.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 if(!window.OpenLayers && !window.OpenLayersLoading){
diff --git a/core/src/plugins/editor.openlayer/i18n/conf/de.php b/core/src/plugins/editor.openlayer/i18n/conf/de.php
index 2a73e3fdf8..468ea29c3f 100644
--- a/core/src/plugins/editor.openlayer/i18n/conf/de.php
+++ b/core/src/plugins/editor.openlayer/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Map viewer" => "Karten-Betrachter",
diff --git a/core/src/plugins/editor.openlayer/i18n/conf/en.php b/core/src/plugins/editor.openlayer/i18n/conf/en.php
index 073012d30e..ff77b67781 100644
--- a/core/src/plugins/editor.openlayer/i18n/conf/en.php
+++ b/core/src/plugins/editor.openlayer/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Map viewer" => "Map viewer",
diff --git a/core/src/plugins/editor.openlayer/i18n/conf/fr.php b/core/src/plugins/editor.openlayer/i18n/conf/fr.php
index d7a7585011..57acc73449 100644
--- a/core/src/plugins/editor.openlayer/i18n/conf/fr.php
+++ b/core/src/plugins/editor.openlayer/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Map viewer" => "Cartes",
diff --git a/core/src/plugins/editor.openlayer/i18n/conf/it.php b/core/src/plugins/editor.openlayer/i18n/conf/it.php
index 249c26eaa8..6955fdfeb5 100644
--- a/core/src/plugins/editor.openlayer/i18n/conf/it.php
+++ b/core/src/plugins/editor.openlayer/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Map viewer" => "Visualizzatore Mappe",
diff --git a/core/src/plugins/editor.openlayer/i18n/conf/pt.php b/core/src/plugins/editor.openlayer/i18n/conf/pt.php
index a56f83da32..cde4345177 100644
--- a/core/src/plugins/editor.openlayer/i18n/conf/pt.php
+++ b/core/src/plugins/editor.openlayer/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Map viewer" => "Visualizador de Mapas",
diff --git a/core/src/plugins/editor.openlayer/i18n/si.php b/core/src/plugins/editor.openlayer/i18n/si.php
index bd693b2185..44cc43502f 100644
--- a/core/src/plugins/editor.openlayer/i18n/si.php
+++ b/core/src/plugins/editor.openlayer/i18n/si.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 // Slovenian translation: April 21 2011 by Vladimir Bohinc (vladimir.bohinc@gmail.com)
 //
diff --git a/core/src/plugins/editor.other/class.OtherEditorChooser.js b/core/src/plugins/editor.other/class.OtherEditorChooser.js
index 7a7d033e4c..16267be6c1 100644
--- a/core/src/plugins/editor.other/class.OtherEditorChooser.js
+++ b/core/src/plugins/editor.other/class.OtherEditorChooser.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 Class.create("OtherEditorChooser", AbstractEditor, {
 
diff --git a/core/src/plugins/editor.other/resources/i18n/ca.php b/core/src/plugins/editor.other/resources/i18n/ca.php
index 7653567464..fa1e49609c 100644
--- a/core/src/plugins/editor.other/resources/i18n/ca.php
+++ b/core/src/plugins/editor.other/resources/i18n/ca.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "Triar-ne un altre...",
diff --git a/core/src/plugins/editor.other/resources/i18n/conf/de.php b/core/src/plugins/editor.other/resources/i18n/conf/de.php
index 7c4a916ce9..3bc8d6e2b4 100644
--- a/core/src/plugins/editor.other/resources/i18n/conf/de.php
+++ b/core/src/plugins/editor.other/resources/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Open in..." => "Öffnen mit...",
diff --git a/core/src/plugins/editor.other/resources/i18n/conf/en.php b/core/src/plugins/editor.other/resources/i18n/conf/en.php
index 44ab850fab..879db31e33 100644
--- a/core/src/plugins/editor.other/resources/i18n/conf/en.php
+++ b/core/src/plugins/editor.other/resources/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Open in..." => "Open in...",
diff --git a/core/src/plugins/editor.other/resources/i18n/conf/fr.php b/core/src/plugins/editor.other/resources/i18n/conf/fr.php
index 8c5735ef9f..211f083a6f 100644
--- a/core/src/plugins/editor.other/resources/i18n/conf/fr.php
+++ b/core/src/plugins/editor.other/resources/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Open in..." => "Ouvrir dans...",
diff --git a/core/src/plugins/editor.other/resources/i18n/conf/it.php b/core/src/plugins/editor.other/resources/i18n/conf/it.php
index f1b26e2315..b5400000f2 100644
--- a/core/src/plugins/editor.other/resources/i18n/conf/it.php
+++ b/core/src/plugins/editor.other/resources/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Open in..." => "Apri in...",
diff --git a/core/src/plugins/editor.other/resources/i18n/conf/pt.php b/core/src/plugins/editor.other/resources/i18n/conf/pt.php
index 6fe72b25b2..c03c9d7772 100644
--- a/core/src/plugins/editor.other/resources/i18n/conf/pt.php
+++ b/core/src/plugins/editor.other/resources/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Open in..." => "Abrir em...",
diff --git a/core/src/plugins/editor.other/resources/i18n/de.php b/core/src/plugins/editor.other/resources/i18n/de.php
index 01191133c5..6ff4356242 100644
--- a/core/src/plugins/editor.other/resources/i18n/de.php
+++ b/core/src/plugins/editor.other/resources/i18n/de.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "Anderer Editor...",
diff --git a/core/src/plugins/editor.other/resources/i18n/en.php b/core/src/plugins/editor.other/resources/i18n/en.php
index 5c518c3836..cea6d20cc1 100644
--- a/core/src/plugins/editor.other/resources/i18n/en.php
+++ b/core/src/plugins/editor.other/resources/i18n/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "Choose other...",
diff --git a/core/src/plugins/editor.other/resources/i18n/es.php b/core/src/plugins/editor.other/resources/i18n/es.php
index cff141bcc1..1c2c9646ae 100644
--- a/core/src/plugins/editor.other/resources/i18n/es.php
+++ b/core/src/plugins/editor.other/resources/i18n/es.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "Elegir otro...",
diff --git a/core/src/plugins/editor.other/resources/i18n/et.php b/core/src/plugins/editor.other/resources/i18n/et.php
index 21b4bffdaf..665b5b2f79 100644
--- a/core/src/plugins/editor.other/resources/i18n/et.php
+++ b/core/src/plugins/editor.other/resources/i18n/et.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 //  Estonian translation by Ardi Jürgens <ardi (at) zone.ee>
 //  + updates/fixes by Kain Väljaots <kain (at) zone.ee>
diff --git a/core/src/plugins/editor.other/resources/i18n/fr.php b/core/src/plugins/editor.other/resources/i18n/fr.php
index 084719d5a8..d11a2e682a 100644
--- a/core/src/plugins/editor.other/resources/i18n/fr.php
+++ b/core/src/plugins/editor.other/resources/i18n/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Choisissez un autre...",
diff --git a/core/src/plugins/editor.other/resources/i18n/it.php b/core/src/plugins/editor.other/resources/i18n/it.php
index 31b4b773b4..f29ab1642a 100644
--- a/core/src/plugins/editor.other/resources/i18n/it.php
+++ b/core/src/plugins/editor.other/resources/i18n/it.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "Scegli altro...",
diff --git a/core/src/plugins/editor.other/resources/i18n/pt.php b/core/src/plugins/editor.other/resources/i18n/pt.php
index 6343181ca8..b3d5c82720 100644
--- a/core/src/plugins/editor.other/resources/i18n/pt.php
+++ b/core/src/plugins/editor.other/resources/i18n/pt.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "Escolher outro...",
diff --git a/core/src/plugins/editor.other/resources/i18n/ru.php b/core/src/plugins/editor.other/resources/i18n/ru.php
index cb99859602..4b7a32b0a3 100644
--- a/core/src/plugins/editor.other/resources/i18n/ru.php
+++ b/core/src/plugins/editor.other/resources/i18n/ru.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "Другой...",
diff --git a/core/src/plugins/editor.other/resources/other_chooser.css b/core/src/plugins/editor.other/resources/other_chooser.css
index 5f82404a77..61f7701dac 100644
--- a/core/src/plugins/editor.other/resources/other_chooser.css
+++ b/core/src/plugins/editor.other/resources/other_chooser.css
@@ -1,17 +1,22 @@
-#editor_selector{
+#other_editor_box #editor_selector{
 	border:1px solid #bbb;
 	margin-top: 5px;
-	max-height: 150px;
+	max-height: 230px;
 	overflow-x: hidden;
 	overflow-y: auto;
-	border-radius: 3px;
+	border-radius: 1px;
+}
+
+#other_editor_box div.dialogLegend{
+    padding: 10px 0;
+    font-size: 13px;
 }
 
 #other_editor_box a {
 	display:block;
 	background-repeat: no-repeat;
 	background-position: 5px;
-	padding: 7px 10px 7px 34px;
+	padding: 14px 10px 14px 34px;
 	cursor: pointer;
 	border-top: 1px solid #ddd;
 }
@@ -22,7 +27,7 @@
 
 #other_editor_box a.iconic span[class^="icon-"]{
     display: inline-block;
-    margin: 0px 10px 0 5px;
+    margin: 0px 20px 0 15px;
     width: 10px;
     font-size: 13px;
     text-align: center;
@@ -38,6 +43,7 @@
 	-moz-opacity:0.7;
 	font-style:italic;
 	display:none;
+    font-size: 13px;
 }
 
 #other_editor_box a.even {
@@ -45,7 +51,7 @@
 }
 
 #other_editor_box a:hover{
-	font-weight:bold;
+	font-weight:500;
 }
 
 #other_editor_box a:hover span{
@@ -54,6 +60,7 @@
 }
 
 #clear_assoc_link{
+    font-size: 13px;
     float: left;
     color: #999;
     cursor: pointer;
diff --git a/core/src/plugins/editor.pdfjs/class.PDFJSViewer.js b/core/src/plugins/editor.pdfjs/class.PDFJSViewer.js
index dd6e4faf40..5598b967e7 100644
--- a/core/src/plugins/editor.pdfjs/class.PDFJSViewer.js
+++ b/core/src/plugins/editor.pdfjs/class.PDFJSViewer.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /*
@@ -53,7 +53,7 @@ Class.create("PDFJSViewer", AbstractEditor, {
 
 		// Get the direct PDF file link valid for this session.
 		var fileName = nodeOrNodes.getPath();
-		var pdfurl = encodeURIComponent(url+'/'+ajxpBootstrap.parameters.get('ajxpServerAccess')+'&action=get_content&file=base64encoded:' + base64_encode(fileName) + '&fake_file_name=' + encodeURIComponent(PathUtils.getBasename(fileName)));
+		var pdfurl = encodeURIComponent(LangUtils.trimRight(url, '\/')+'/'+ajxpBootstrap.parameters.get('ajxpServerAccess')+'&action=get_content&file=base64encoded:' + base64_encode(fileName) + '&fake_file_name=' + encodeURIComponent(PathUtils.getBasename(fileName)));
 
 		// Hide the Pydio action bar.
 		this.element.down('.editor_action_bar').setStyle({display:'none'});
diff --git a/core/src/plugins/editor.pdfjs/i18n/conf/cs.php b/core/src/plugins/editor.pdfjs/i18n/conf/cs.php
index 743e2315f9..54ec04efb0 100644
--- a/core/src/plugins/editor.pdfjs/i18n/conf/cs.php
+++ b/core/src/plugins/editor.pdfjs/i18n/conf/cs.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 /* PSD.JS viewer. Adjusted for Pydio by Kristian Garnét. */
diff --git a/core/src/plugins/editor.pdfjs/i18n/conf/de.php b/core/src/plugins/editor.pdfjs/i18n/conf/de.php
index 03a3b02c79..f390093ae5 100644
--- a/core/src/plugins/editor.pdfjs/i18n/conf/de.php
+++ b/core/src/plugins/editor.pdfjs/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 /* PSD.JS viewer. Adjusted for Pydio by Kristian Garnét. */
diff --git a/core/src/plugins/editor.pdfjs/i18n/conf/en.php b/core/src/plugins/editor.pdfjs/i18n/conf/en.php
index cb3fa4e361..a2a556462e 100644
--- a/core/src/plugins/editor.pdfjs/i18n/conf/en.php
+++ b/core/src/plugins/editor.pdfjs/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 /* PSD.JS viewer. Adjusted for Pydio by Kristian Garnét. */
diff --git a/core/src/plugins/editor.pdfjs/i18n/cs.php b/core/src/plugins/editor.pdfjs/i18n/cs.php
index c8bb2e0b9b..87123c1c20 100644
--- a/core/src/plugins/editor.pdfjs/i18n/cs.php
+++ b/core/src/plugins/editor.pdfjs/i18n/cs.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 /* PSD.JS viewer. Adjusted for Pydio by Kristian Garnét. */
diff --git a/core/src/plugins/editor.pdfjs/i18n/de.php b/core/src/plugins/editor.pdfjs/i18n/de.php
index fe52a671bc..f1e710b825 100644
--- a/core/src/plugins/editor.pdfjs/i18n/de.php
+++ b/core/src/plugins/editor.pdfjs/i18n/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 /* PSD.JS viewer. Adjusted for Pydio by Kristian Garnét. */
diff --git a/core/src/plugins/editor.pdfjs/i18n/en.php b/core/src/plugins/editor.pdfjs/i18n/en.php
index 4a9cf829f8..97eb642008 100644
--- a/core/src/plugins/editor.pdfjs/i18n/en.php
+++ b/core/src/plugins/editor.pdfjs/i18n/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 /* PSD.JS viewer. Adjusted for Pydio by Kristian Garnét. */
diff --git a/core/src/plugins/editor.pdfjs/plugin_doc.html b/core/src/plugins/editor.pdfjs/plugin_doc.html
index 6a750ea1a8..b3bbec2fd4 100644
--- a/core/src/plugins/editor.pdfjs/plugin_doc.html
+++ b/core/src/plugins/editor.pdfjs/plugin_doc.html
@@ -1,2 +1,6 @@
 <p>PDF.JS JavaScript PDF viewer from Mozilla beautifully integrated into Pydio.</p>
-<p align="center"><img src="frame_image.png" alt="PDF Viewer"></p>
+<p align="center"><img src="editor-pdfjs.png.png" alt="PDF Viewer"></p>
+<p>If you want to have the viewer automatically open its sidebar with pages thumbnails, you have to manually apply this modification:
+    <br>line 407 in "plugins/editor.pdfjs/pdfjs/web/viewer.js", change 0 to 1 like this :
+    <br>sidebarViewOnLoad: 1,
+</p>
diff --git a/core/src/plugins/editor.pixlr/PixlrEditor.php b/core/src/plugins/editor.pixlr/PixlrEditor.php
new file mode 100644
index 0000000000..1055a85457
--- /dev/null
+++ b/core/src/plugins/editor.pixlr/PixlrEditor.php
@@ -0,0 +1,201 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Editor\Image;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Core\Model\ContextInterface;
+
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Vars\InputFilter;
+
+use Pydio\Core\PluginFramework\Plugin;
+
+use GuzzleHttp\Client;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Class PixlrEditor
+ * Uses Pixlr.com service to edit images online.
+ * @package Pydio\Editor\Image
+ */
+class PixlrEditor extends Plugin
+{
+
+    /**
+     * @var Client
+     */
+    private $client;
+
+    // Plugin initialisation
+    /**
+     * @param ContextInterface $context
+     */
+    public function init(\Pydio\Core\Model\ContextInterface $ctx, $options = []) {
+
+        parent::init($ctx, $options);
+
+        $this->client = new Client([
+            'base_url' => "https://pixlr.com/editor/"
+        ]);
+    }
+
+    // Main controller function
+    /**
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @throws PydioException
+     * @throws \Exception
+     */
+    public function switchAction(ServerRequestInterface &$request, ResponseInterface &$response) {
+
+        /** @var ContextInterface $ctx */
+        $ctx = $request->getAttribute("ctx");
+        $action = $request->getAttribute("action");
+        $httpVars = $request->getParsedBody();
+
+        $selection = UserSelection::fromContext($ctx, $httpVars);
+        $selectedNode = $selection->getUniqueNode();
+        $selectedNodeUrl = $selectedNode->getUrl();
+
+        if ($action == "post_to_server") {
+            if(!is_writeable($selectedNodeUrl)){
+                header("Location:". ApplicationState::detectServerURL(true) ."/plugins/editor.pixlr/fake_error_pixlr.php");
+                return;
+            }
+
+            // Backward compat
+            if(strpos($httpVars["file"], "base64encoded:") !== 0){
+                $legacyFilePath = InputFilter::decodeSecureMagic(base64_decode($httpVars["file"]));
+                $selectedNode = new AJXP_Node($selection->currentBaseUrl().$legacyFilePath);
+                $selectedNodeUrl = $selectedNode->getUrl();
+            }
+
+            $target = rtrim(base64_decode($httpVars["parent_url"]), '/') ."/plugins/editor.pixlr";
+            $this->logInfo('Preview', 'Sending content of '.$selectedNodeUrl.' to Pixlr server.', array("files" => $selectedNodeUrl));
+            Controller::applyHook("node.read", array($selectedNode));
+
+            $saveTarget = $target."/fake_save_pixlr.php";
+            if ($this->getContextualOption($ctx, "CHECK_SECURITY_TOKEN")) {
+                $saveTarget = $target."/fake_save_pixlr_".md5($httpVars["secure_token"]).".php";
+            }
+
+            $type = pathinfo($selectedNodeUrl, PATHINFO_EXTENSION);
+            $data = file_get_contents($selectedNodeUrl);
+            $rawData = 'data:image/' . $type . ';base64,' . base64_encode($data);
+
+            $params = [
+                'allow_redirects' => false,
+                'body' => [
+                    "referrer"   => "Pydio",
+                    "method"     => "get",
+                    "type"       => $type,
+                    "loc"        => LocaleService::getLanguage(),
+                    "target"     => $saveTarget,
+                    "exit"       => $target."/fake_close_pixlr.php",
+                    "title"      => urlencode(basename($selectedNodeUrl)),
+                    "locktarget" => "false",
+                    "locktitle"  => "true",
+                    "locktype"   => "source",
+                    "image"      => $rawData
+                ]
+            ];
+
+            $postResponse = $this->client->post("/editor/", $params);
+
+            $response = $response
+                ->withStatus(302)
+                ->withHeader("Location", $postResponse->getHeader("Location"));
+
+        } else if ($action == "retrieve_pixlr_image") {
+
+            $file = InputFilter::decodeSecureMagic($httpVars["original_file"]);
+            $selectedNode = new AJXP_Node($selection->currentBaseUrl() . $file);
+            $selectedNode->loadNodeInfo();
+
+            if(!is_writeable($selectedNode->getUrl())){
+                $this->logError("Pixlr Editor", "Trying to edit an unauthorized file ".$selectedNode->getUrl());
+                return;
+            }
+
+            $this->logInfo('Edit', 'Retrieving content of '.$file.' from Pixlr server.', array("files" => $file));
+            Controller::applyHook("node.before_change", array(&$selectedNode));
+            $url = $httpVars["new_url"];
+            $urlParts = parse_url($url);
+            $query = $urlParts["query"];
+            if ($this->getContextualOption($ctx, "CHECK_SECURITY_TOKEN")) {
+                $scriptName = basename($urlParts["path"]);
+                $token = str_replace(array("fake_save_pixlr_", ".php"), "", $scriptName);
+                if ($token != md5($httpVars["secure_token"])) {
+                    throw new PydioException("Invalid Token, this could mean some security problem!");
+                }
+            }
+            $params = array();
+            parse_str($query, $params);
+
+            $image = $params['image'];
+            $headers = get_headers($image, 1);
+            $content_type = explode("/", $headers['Content-Type']);
+            if ($content_type[0] != "image") {
+                throw new PydioException("Invalid File Type");
+            }
+            $content_length = intval($headers["Content-Length"]);
+            if($content_length != 0) Controller::applyHook("node.before_change", array(&$selectedNode, $content_length));
+
+            $orig = fopen($image, "r");
+            $target = fopen($selectedNode->getUrl(), "w");
+            if(is_resource($orig) && is_resource($target)){
+                while (!feof($orig)) {
+                    fwrite($target, fread($orig, 4096));
+                }
+                fclose($orig);
+                fclose($target);
+            }
+            clearstatcache(true, $selectedNode->getUrl());
+            $selectedNode->loadNodeInfo(true);
+            Controller::applyHook("node.change", array(&$selectedNode, &$selectedNode));
+        }
+
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getClient()
+    {
+        return $this->client;
+    }
+
+    /**
+     * @param mixed $client
+     */
+    public function setClient($client)
+    {
+        $this->client = $client;
+    }
+
+}
diff --git a/core/src/plugins/editor.pixlr/class.PixlrEditor.js b/core/src/plugins/editor.pixlr/class.PixlrEditor.js
index 36d4e483ca..6ddb8ff845 100644
--- a/core/src/plugins/editor.pixlr/class.PixlrEditor.js
+++ b/core/src/plugins/editor.pixlr/class.PixlrEditor.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 Class.create("PixlrEditor", AbstractEditor, {
 
diff --git a/core/src/plugins/editor.pixlr/class.PixlrEditor.php b/core/src/plugins/editor.pixlr/class.PixlrEditor.php
deleted file mode 100644
index 2ec1028555..0000000000
--- a/core/src/plugins/editor.pixlr/class.PixlrEditor.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Uses Pixlr.com service to edit images online.
- * @package AjaXplorer_Plugins
- * @subpackage Editor
- */
-class PixlrEditor extends AJXP_Plugin
-{
-  public function switchAction($action, $httpVars, $filesVars)
-  {
-        $repository = ConfService::getRepository();
-        if (!$repository->detectStreamWrapper(true)) {
-          return false;
-        }
-
-        $selection = new UserSelection($repository, $httpVars);
-        $selectedNode = $selection->getUniqueNode();
-        $selectedNodeUrl = $selectedNode->getUrl();
-
-        if ($action == "post_to_server") {
-
-            if(!is_writeable($selectedNodeUrl)){
-                header("Location:".AJXP_Utils::detectServerURL(true)."/plugins/editor.pixlr/fake_error_pixlr.php");
-                return false;
-            }
-
-            // Backward compat
-            if(strpos($httpVars["file"], "base64encoded:") !== 0){
-                $legacyFilePath = AJXP_Utils::decodeSecureMagic(base64_decode($httpVars["file"]));
-                $selectedNode = new AJXP_Node($selection->currentBaseUrl().$legacyFilePath);
-                $selectedNodeUrl = $selectedNode->getUrl();
-            }
-
-            $target = rtrim(base64_decode($httpVars["parent_url"]), '/') ."/plugins/editor.pixlr";
-            $tmp = AJXP_MetaStreamWrapper::getRealFSReference($selectedNodeUrl);
-            $tmp = SystemTextEncoding::fromUTF8($tmp);
-            $this->logInfo('Preview', 'Sending content of '.$selectedNodeUrl.' to Pixlr server.', array("files" => $selectedNodeUrl));
-            AJXP_Controller::applyHook("node.read", array($selectedNode));
-
-
-            $saveTarget = $target."/fake_save_pixlr.php";
-            if ($this->getFilteredOption("CHECK_SECURITY_TOKEN", $repository)) {
-                $saveTarget = $target."/fake_save_pixlr_".md5($httpVars["secure_token"]).".php";
-            }
-            $params = array(
-                "referrer"  => "Pydio",
-                "method"  => "get",
-                "loc"    => ConfService::getLanguage(),
-                "target"  => $saveTarget,
-                "exit"    => $target."/fake_close_pixlr.php",
-                "title"    => urlencode(basename($selectedNodeUrl)),
-                "locktarget"=> "false",
-                "locktitle" => "true",
-                "locktype"  => "source"
-            );
-
-            require_once(AJXP_BIN_FOLDER."/http_class/http_class.php");
-            $arguments = array();
-            $httpClient = new http_class();
-            $httpClient->request_method = "POST";
-            $httpClient->GetRequestArguments("https://pixlr.com/editor/", $arguments);
-            $arguments["PostValues"] = $params;
-            $arguments["PostFiles"] = array(
-                "image"   => array("FileName" => $tmp, "Content-Type" => "automatic/name"));
-
-            $err = $httpClient->Open($arguments);
-            if (empty($err)) {
-                $err = $httpClient->SendRequest($arguments);
-                if (empty($err)) {
-                    $response = "";
-                    while (true) {
-                        $header = array();
-                        $error = $httpClient->ReadReplyHeaders($header, 1000);
-                        if ($error != "" || $header != null) break;
-                            $response .= $header;
-                    }
-                }
-            }
-
-            if(isSet($header) && isSet($header["location"])){
-                header("Location: {$header['location']}"); //$response");
-            }else{
-                header("Location:".AJXP_Utils::detectServerURL(true)."/plugins/editor.pixlr/fake_error_pixlr.php");
-            }
-
-        } else if ($action == "retrieve_pixlr_image") {
-
-            $file = AJXP_Utils::decodeSecureMagic($httpVars["original_file"]);
-            $selectedNode = new AJXP_Node($selection->currentBaseUrl() . $file);
-            $selectedNode->loadNodeInfo();
-
-            if(!is_writeable($selectedNode->getUrl())){
-                $this->logError("Pixlr Editor", "Trying to edit an unauthorized file ".$selectedNode->getUrl());
-                return false;
-            }
-
-            $this->logInfo('Edit', 'Retrieving content of '.$file.' from Pixlr server.', array("files" => $file));
-            AJXP_Controller::applyHook("node.before_change", array(&$selectedNode));
-            $url = $httpVars["new_url"];
-            $urlParts = parse_url($url);
-            $query = $urlParts["query"];
-            if ($this->getFilteredOption("CHECK_SECURITY_TOKEN", $repository)) {
-                $scriptName = basename($urlParts["path"]);
-                $token = str_replace(array("fake_save_pixlr_", ".php"), "", $scriptName);
-                if ($token != md5($httpVars["secure_token"])) {
-                    throw new AJXP_Exception("Invalid Token, this could mean some security problem!");
-                }
-            }
-            $params = array();
-            parse_str($query, $params);
-
-            $image = $params['image'];
-            $headers = get_headers($image, 1);
-            $content_type = explode("/", $headers['Content-Type']);
-            if ($content_type[0] != "image") {
-                throw new AJXP_Exception("Invalid File Type");
-            }
-            $content_length = intval($headers["Content-Length"]);
-            if($content_length != 0) AJXP_Controller::applyHook("node.before_change", array(&$selectedNode, $content_length));
-
-            $orig = fopen($image, "r");
-            $target = fopen($selectedNode->getUrl(), "w");
-            if(is_resource($orig) && is_resource($target)){
-                while (!feof($orig)) {
-                    fwrite($target, fread($orig, 4096));
-                }
-                fclose($orig);
-                fclose($target);
-            }
-            clearstatcache(true, $selectedNode->getUrl());
-            $selectedNode->loadNodeInfo(true);
-            AJXP_Controller::applyHook("node.change", array(&$selectedNode, &$selectedNode));
-        }
-
-    }
-
-}
diff --git a/core/src/plugins/editor.pixlr/i18n/conf/de.php b/core/src/plugins/editor.pixlr/i18n/conf/de.php
index 206bb7de0c..54ed9c9dd3 100644
--- a/core/src/plugins/editor.pixlr/i18n/conf/de.php
+++ b/core/src/plugins/editor.pixlr/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Pixlr Editor" => "Pixlr-Editor",
diff --git a/core/src/plugins/editor.pixlr/i18n/conf/en.php b/core/src/plugins/editor.pixlr/i18n/conf/en.php
index 0cc02c44b0..478ad7df00 100644
--- a/core/src/plugins/editor.pixlr/i18n/conf/en.php
+++ b/core/src/plugins/editor.pixlr/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Pixlr Editor" => "Pixlr Editor",
diff --git a/core/src/plugins/editor.pixlr/i18n/conf/fr.php b/core/src/plugins/editor.pixlr/i18n/conf/fr.php
index 423415a65c..e2bf68a663 100644
--- a/core/src/plugins/editor.pixlr/i18n/conf/fr.php
+++ b/core/src/plugins/editor.pixlr/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Pixlr Editor" => "Editeur Pixlr",
diff --git a/core/src/plugins/editor.pixlr/i18n/conf/it.php b/core/src/plugins/editor.pixlr/i18n/conf/it.php
index 1f7fd69b90..3066eac9ba 100644
--- a/core/src/plugins/editor.pixlr/i18n/conf/it.php
+++ b/core/src/plugins/editor.pixlr/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Pixlr Editor" => "Editor Pixlr",
diff --git a/core/src/plugins/editor.pixlr/i18n/conf/pt.php b/core/src/plugins/editor.pixlr/i18n/conf/pt.php
index c8e9698ec9..7510340645 100644
--- a/core/src/plugins/editor.pixlr/i18n/conf/pt.php
+++ b/core/src/plugins/editor.pixlr/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Pixlr Editor" => "Editor Pixlr",
diff --git a/core/src/plugins/editor.pixlr/manifest.xml b/core/src/plugins/editor.pixlr/manifest.xml
index 22bebf48d2..74f9038110 100644
--- a/core/src/plugins/editor.pixlr/manifest.xml
+++ b/core/src/plugins/editor.pixlr/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <editor id="editor.pixlr" openable="true" iconClass="icon-edit" text="333" title="333" icon="pixlr_images/actions/ICON_SIZE/color_fill.png" className="PixlrEditor" mimes="jpg,jpeg,png,bmp,pxd" formId="pixlr_box" write="true" canWrite="true" label="CONF_MESSAGE[Pixlr Editor]" description="CONF_MESSAGE[Bridge to the Pixlr.com webservice that allow online image edition via a photoshop-like GUI.]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-	<class_definition filename="plugins/editor.pixlr/class.PixlrEditor.php" classname="PixlrEditor"/>
+	<class_definition filename="plugins/editor.pixlr/PixlrEditor.php" classname="Pydio\Editor\Image\PixlrEditor"/>
     <server_settings>
         <global_param
                 description="CONF_MESSAGE[Add a secure token to the target script to make sure that we are downloading an authorized image. The .htaccess file contained in the plugin must be correctly configured (apache)]"
diff --git a/core/src/plugins/editor.soundmanager/class.SMPlayer.js b/core/src/plugins/editor.soundmanager/class.SMPlayer.js
index 2ea97dbdfc..33a5e4dcf2 100644
--- a/core/src/plugins/editor.soundmanager/class.SMPlayer.js
+++ b/core/src/plugins/editor.soundmanager/class.SMPlayer.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 window.SM2_DEFER = true;
 if(!$$("html")[0].hasClassName("no-canvas") && !window.soundManager){
@@ -199,7 +199,7 @@ Class.create("SMPlayer", AbstractEditor, {
 
     open : function($super, ajxpNode){
         this.currentRichPreview = this.getPreview(ajxpNode, true);
-        this.element.down(".smplayer_title").update(ajxpNode.getLabel());
+        this.element.down(".smplayer_title").update(he.escape(ajxpNode.getLabel()));
         this.element.down(".smplayer_preview_element").insert(this.currentRichPreview);
         window.setTimeout(function(){
             try{this.currentRichPreview.down('span.sm2-360btn').click();}catch(e){}
@@ -224,21 +224,26 @@ Class.create("SMPlayer", AbstractEditor, {
         var rgxtrim = new RegExp('\/+$');
         crtRoot = crtRoot.replace(rgxtrim, '');
 
-        return new Template('<link rel="stylesheet" type="text/css" href="'+crtRoot+'/plugins/editor.soundmanager/sm/shared/mp3-player-button.css" />\n\
-&lt;script type="text/javascript" src="'+crtRoot+'/plugins/editor.soundmanager/sm/shared/soundmanager2.js"&gt;&lt;/script&gt;\n\
-&lt;script type="text/javascript" src="'+crtRoot+'/plugins/editor.soundmanager/sm/shared/mp3-player-button.js"&gt;&lt;/script&gt;\n\
-&lt;script&gt;\n \
+        return new Template('\
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/soundmanager2/2.97a.20150601/script/soundmanager2-nodebug-jsmin.js"></script>\n\
+<script>\n \
 soundManager.setup({\n\
-      url: "'+crtRoot+'/plugins/editor.soundmanager/sm/swf/",\n\
-      debugMode : false\n\
+      url: "https://cdnjs.cloudflare.com/ajax/libs/soundmanager2/2.97a.20150601/swf/",\n\
+      debugMode : false,\n\
+        onready: function() {\n\
+        var mySound = soundManager.createSound({\n\
+            id: "pydioSound",\n\
+            url: "#{DL_CT_LINK}&fake=ext.'+getAjxpMimeType(node)+'"\n\
+        });\n\
+        mySound.play();\n\
+    }\n\
 });\n\
-&lt;/script&gt;\n\
-<a href="#{DL_CT_LINK}&fake=ext.'+getAjxpMimeType(node)+'" class="sm2_button">'+node.getLabel()+'</a> '+node.getLabel());
+</script>');
 
     },
 
     getRESTPreviewLinks:function(node){
-        return {"MP3 Stream": "&file=" + encodeURIComponent(node.getPath())};
+        return {"MP3 Stream": ""};
     },
 
 	getPreview : function(ajxpNode, rich){
diff --git a/core/src/plugins/editor.soundmanager/i18n/conf/de.php b/core/src/plugins/editor.soundmanager/i18n/conf/de.php
index e107c5ca38..dafddcafe3 100644
--- a/core/src/plugins/editor.soundmanager/i18n/conf/de.php
+++ b/core/src/plugins/editor.soundmanager/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Sound Player" => "Audio-Manager",
diff --git a/core/src/plugins/editor.soundmanager/i18n/conf/en.php b/core/src/plugins/editor.soundmanager/i18n/conf/en.php
index 21c74450ed..3f0a441370 100644
--- a/core/src/plugins/editor.soundmanager/i18n/conf/en.php
+++ b/core/src/plugins/editor.soundmanager/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Sound Player" => "Sound Player",
diff --git a/core/src/plugins/editor.soundmanager/i18n/conf/fr.php b/core/src/plugins/editor.soundmanager/i18n/conf/fr.php
index 58463c6019..9a03229b74 100644
--- a/core/src/plugins/editor.soundmanager/i18n/conf/fr.php
+++ b/core/src/plugins/editor.soundmanager/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Audio Player" => "Lecteur audio",
diff --git a/core/src/plugins/editor.soundmanager/i18n/conf/it.php b/core/src/plugins/editor.soundmanager/i18n/conf/it.php
index f58a817139..79f7c5ea81 100644
--- a/core/src/plugins/editor.soundmanager/i18n/conf/it.php
+++ b/core/src/plugins/editor.soundmanager/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Audio Player" => "Riproduttore Audio",
diff --git a/core/src/plugins/editor.soundmanager/i18n/conf/pt.php b/core/src/plugins/editor.soundmanager/i18n/conf/pt.php
index 6bd50b9142..9cd3aa3484 100644
--- a/core/src/plugins/editor.soundmanager/i18n/conf/pt.php
+++ b/core/src/plugins/editor.soundmanager/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Audio Player" => "Reprodutor de Música",
diff --git a/core/src/plugins/editor.soundmanager/i18n/de.php b/core/src/plugins/editor.soundmanager/i18n/de.php
index 2dd064f55f..ad15f34c1f 100644
--- a/core/src/plugins/editor.soundmanager/i18n/de.php
+++ b/core/src/plugins/editor.soundmanager/i18n/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Lautstärke",
diff --git a/core/src/plugins/editor.soundmanager/i18n/en.php b/core/src/plugins/editor.soundmanager/i18n/en.php
index 18676a970d..804bb2305f 100644
--- a/core/src/plugins/editor.soundmanager/i18n/en.php
+++ b/core/src/plugins/editor.soundmanager/i18n/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Sound Volume",
diff --git a/core/src/plugins/editor.soundmanager/i18n/et.php b/core/src/plugins/editor.soundmanager/i18n/et.php
index e92571dd25..c7caf1d4ce 100644
--- a/core/src/plugins/editor.soundmanager/i18n/et.php
+++ b/core/src/plugins/editor.soundmanager/i18n/et.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 //  Estonian translation by Ardi Jürgens <ardi (at) zone.ee>
 //  + updates/fixes by Kain Väljaots <kain (at) zone.ee>
diff --git a/core/src/plugins/editor.soundmanager/i18n/fr.php b/core/src/plugins/editor.soundmanager/i18n/fr.php
index 912d2de0df..983b4b33c6 100644
--- a/core/src/plugins/editor.soundmanager/i18n/fr.php
+++ b/core/src/plugins/editor.soundmanager/i18n/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Volume du son",
diff --git a/core/src/plugins/editor.soundmanager/i18n/it.php b/core/src/plugins/editor.soundmanager/i18n/it.php
index 90ef210b57..054855e65e 100644
--- a/core/src/plugins/editor.soundmanager/i18n/it.php
+++ b/core/src/plugins/editor.soundmanager/i18n/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Volume Suono",
diff --git a/core/src/plugins/editor.soundmanager/i18n/pt.php b/core/src/plugins/editor.soundmanager/i18n/pt.php
index 64d235ac1e..4f8adfc10c 100644
--- a/core/src/plugins/editor.soundmanager/i18n/pt.php
+++ b/core/src/plugins/editor.soundmanager/i18n/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Volume",
diff --git a/core/src/plugins/editor.soundmanager/manifest.xml b/core/src/plugins/editor.soundmanager/manifest.xml
index 6138b19c66..43d3886194 100644
--- a/core/src/plugins/editor.soundmanager/manifest.xml
+++ b/core/src/plugins/editor.soundmanager/manifest.xml
@@ -5,7 +5,7 @@
         label="CONF_MESSAGE[Sound Player]" description="CONF_MESSAGE[Uses HTML5 or Flash to play a sound]"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <class_definition classname="AudioPreviewer" filename="plugins/editor.audio/class.AudioPreviewer.php"/>
+    <class_definition filename="plugins/editor.audio/AudioPreviewer.php" classname="Pydio\Editor\Audio\AudioPreviewer"/>
     <client_settings>
         <resources>
             <js className="SMPlayer" file="plugins/editor.soundmanager/class.SMPlayer.js" autoload="true"/>
diff --git a/core/src/plugins/editor.soundmanager/sm_preview_player.css b/core/src/plugins/editor.soundmanager/sm_preview_player.css
index a384347945..cea6dbefed 100644
--- a/core/src/plugins/editor.soundmanager/sm_preview_player.css
+++ b/core/src/plugins/editor.soundmanager/sm_preview_player.css
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 .ui360container{
     background-image: url("player_bg_icon.png");
diff --git a/core/src/plugins/editor.text/class.TextEditor.js b/core/src/plugins/editor.text/class.TextEditor.js
index cfe8125655..24db3d6c00 100644
--- a/core/src/plugins/editor.text/class.TextEditor.js
+++ b/core/src/plugins/editor.text/class.TextEditor.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 Class.create("TextEditor", AbstractEditor, {
 
@@ -39,15 +39,16 @@ Class.create("TextEditor", AbstractEditor, {
 		$super(nodeOrNodes);
 		var fileName = nodeOrNodes.getPath();
 		var textarea;
-		this.textareaContainer = document.createElement('div');
-		this.textarea = $(document.createElement('textarea'));
-		this.textarea.name =  this.textarea.id = 'content';
-		this.textarea.addClassName('dialogFocus');
-		this.textarea.addClassName('editor');
+		this.textareaContainer = new Element('div');
+		this.textarea = new Element('textarea', {
+            id:'content',
+            name:'content',
+            style:'margin:0; border:0; width: 100%;',
+            className:'dialogFocus editor',
+            wrap: 'off'
+        });
 		this.currentUseCp = false;
 		this.contentMainContainer = this.textarea;
-		this.textarea.setStyle({width:'100%'});	
-		this.textarea.setAttribute('wrap', 'off');	
 		if(!this.canWrite){
 			this.textarea.readOnly = true;
 		}
@@ -69,6 +70,7 @@ Class.create("TextEditor", AbstractEditor, {
         this.textarea.observe("blur", function(){
             pydio.UI.enableAllKeyBindings()
         });
+        this.element.down('.action_bar').addClassName('full_width_action_bar');
 	},
 	
 	loadFileContent : function(fileName){
@@ -85,33 +87,18 @@ Class.create("TextEditor", AbstractEditor, {
 		connexion.sendAsync();
 	},
 	
-	prepareSaveConnexion : function(){
-		var connexion = new Connexion();
-		connexion.addParameter('get_action', 'put_content');
-		connexion.addParameter('file', this.inputNode.getPath());
-		connexion.onComplete = function(transp){
-			this.parseXml(transp);			
-		}.bind(this);
-		this.setOnLoad(this.textareaContainer);
-		connexion.setMethod('put');		
-		return connexion;
-	},
-	
 	saveFile : function(){
-		var connexion = this.prepareSaveConnexion();
-		connexion.addParameter('content', this.textarea.value);		
-		connexion.sendAsync();
+        
+        this.setOnLoad(this.textareaContainer);
+        PydioApi.getClient().postPlainTextContent(this.inputNode.getPath(), this.textarea.value, function(success){
+            if(success){
+                this.setModified(false);
+            }
+            this.removeOnLoad(this.textareaContainer)
+        }.bind(this));
+        
 	},
-	
-	parseXml : function(transport){
-		if(parseInt(transport.responseText).toString() == transport.responseText){
-			alert("Cannot write the file to disk (Error code : "+transport.responseText+")");
-		}else{
-			this.setModified(false);
-		}
-		this.removeOnLoad(this.textareaContainer);
-	},
-	
+
 	parseTxt : function(transport){	
 		this.textarea.value = transport.responseText;
 		if(this.canWrite){
diff --git a/core/src/plugins/editor.text/i18n/conf/de.php b/core/src/plugins/editor.text/i18n/conf/de.php
index 6f3f720cd4..278ae8382c 100644
--- a/core/src/plugins/editor.text/i18n/conf/de.php
+++ b/core/src/plugins/editor.text/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Text Editor" => "Text-Editor",
diff --git a/core/src/plugins/editor.text/i18n/conf/en.php b/core/src/plugins/editor.text/i18n/conf/en.php
index 8c08e6a5e5..d030df1812 100644
--- a/core/src/plugins/editor.text/i18n/conf/en.php
+++ b/core/src/plugins/editor.text/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Text Editor" => "Text Editor",
diff --git a/core/src/plugins/editor.text/i18n/conf/fr.php b/core/src/plugins/editor.text/i18n/conf/fr.php
index 4a3eff93c4..2cf97810ba 100644
--- a/core/src/plugins/editor.text/i18n/conf/fr.php
+++ b/core/src/plugins/editor.text/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Text Editor" => "Editeur texte",
diff --git a/core/src/plugins/editor.text/i18n/conf/it.php b/core/src/plugins/editor.text/i18n/conf/it.php
index 969dc77db5..3bf4af5bf8 100644
--- a/core/src/plugins/editor.text/i18n/conf/it.php
+++ b/core/src/plugins/editor.text/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Text Editor" => "Editor Testi",
diff --git a/core/src/plugins/editor.text/i18n/conf/pt.php b/core/src/plugins/editor.text/i18n/conf/pt.php
index a8fb390482..d515252cac 100644
--- a/core/src/plugins/editor.text/i18n/conf/pt.php
+++ b/core/src/plugins/editor.text/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Text Editor" => "Editor de Texto",
diff --git a/core/src/plugins/editor.text/i18n/conf/ru.php b/core/src/plugins/editor.text/i18n/conf/ru.php
index c4bfbccef7..5ea20c08ad 100644
--- a/core/src/plugins/editor.text/i18n/conf/ru.php
+++ b/core/src/plugins/editor.text/i18n/conf/ru.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Text Editor" => "Текстовый редактор",
diff --git a/core/src/plugins/editor.video/VideoReader.php b/core/src/plugins/editor.video/VideoReader.php
new file mode 100644
index 0000000000..6377487172
--- /dev/null
+++ b/core/src/plugins/editor.video/VideoReader.php
@@ -0,0 +1,163 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Editor\Video;
+
+use Pydio\Access\Core\MetaStreamWrapper;
+use Pydio\Access\Core\Exception\FileNotFoundException;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\UserSelection;
+
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Utils\Vars\PathUtils;
+
+use Pydio\Core\Controller\HTMLWriter;
+use Pydio\Core\PluginFramework\Plugin;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Streams video to a client
+ * @package Pydio\Editor\Video
+ */
+class VideoReader extends Plugin
+{
+    /**
+     * @param $action
+     * @param $httpVars
+     * @param $filesVars
+     * @param \Pydio\Core\Model\ContextInterface $contextInterface
+     * @throws FileNotFoundException
+     */
+    public function switchAction($action, $httpVars, $filesVars, \Pydio\Core\Model\ContextInterface $contextInterface)
+    {
+        $selection = UserSelection::fromContext($contextInterface, $httpVars);
+        $node = $selection->getUniqueNode();
+
+        if ($action == "read_video_data") {
+            if(!file_exists($node->getUrl()) || !is_readable($node->getUrl())){
+                throw new FileNotFoundException($node->getPath());
+            }
+            $this->logDebug("Reading video");
+            session_write_close();
+            $filesize = filesize($node->getUrl());
+            $filename = $node->getUrl();
+            $basename = PathUtils::forwardSlashBasename($filename);
+
+            //$fp = fopen($destStreamURL.$file, "r");
+            if (preg_match("/\.ogv$/", $basename)) {
+                header("Content-Type: video/ogg; name=\"".$basename."\"");
+            } else if (preg_match("/\.mp4$/", $basename)) {
+                header("Content-Type: video/mp4; name=\"".$basename."\"");
+            } else if (preg_match("/\.m4v$/", $basename)) {
+                header("Content-Type: video/x-m4v; name=\"".$basename."\"");
+            } else if (preg_match("/\.webm$/", $basename)) {
+                header("Content-Type: video/webm; name=\"".$basename."\"");
+            }
+
+            if ( isset($_SERVER['HTTP_RANGE']) && $filesize != 0 ) {
+                $this->logDebug("Http range", array($_SERVER['HTTP_RANGE']));
+                // multiple ranges, which can become pretty complex, so ignore it for now
+                $ranges = explode('=', $_SERVER['HTTP_RANGE']);
+                $offsets = explode('-', $ranges[1]);
+                $offset = floatval($offsets[0]);
+                if($offset == 0){
+                    $this->logInfo('Preview', 'Streaming content of '.$filename, array("files" => $filename));
+                }
+
+                $additionalOffset = 1;
+                if (isset($_SERVER['HTTP_USER_AGENT']) && strlen(strstr($_SERVER['HTTP_USER_AGENT'], 'Firefox')) > 0) {
+                    $additionalOffset = 0;
+                }
+                $length = floatval($offsets[1]) - $offset + $additionalOffset;
+
+                if (!$length) $length = $filesize - $offset;
+                if ($length + $offset > $filesize || $length < 0) $length = $filesize - $offset;
+                header('HTTP/1.1 206 Partial Content');
+
+                header('Content-Range: bytes ' . $offset . '-' . ($offset + $length - 1) . '/' . $filesize);
+                header('Accept-Ranges:bytes');
+                header("Content-Length: ". $length);
+                $file = fopen($filename, 'rb');
+                if(!is_resource($file)) throw new FileNotFoundException($file);
+                fseek($file, 0);
+                $relOffset = $offset;
+                while ($relOffset > 2.0E9) {
+                    // seek to the requested offset, this is 0 if it's not a partial content request
+                    fseek($file, 2000000000, SEEK_CUR);
+                    $relOffset -= 2000000000;
+                    // This works because we never overcome the PHP 32 bit limit
+                }
+                fseek($file, $relOffset, SEEK_CUR);
+
+                while(ob_get_level()) ob_end_flush();
+                $readSize = 0.0;
+                while (!feof($file) && $readSize < $length && connection_status() == 0) {
+                    if ($length < 2048){
+                        echo fread($file, $length);
+                    } else {
+                        echo fread($file, 2048);
+                    }
+
+                    $readSize += 2048.0;
+                    flush();
+                }
+                fclose($file);
+            } else {
+                $this->logInfo('Preview', 'Streaming content of '.$filename, array("files" => $filename));
+                header("Content-Length: ".$filesize);
+                header("Content-Range: bytes 0-" . ($filesize - 1) . "/" . $filesize. ";");
+                header('Cache-Control: public');
+
+                $stream = fopen("php://output", "a");
+                MetaStreamWrapper::copyFileInStream($node->getUrl(), $stream);
+                fflush($stream);
+                fclose($stream);
+            }
+            Controller::applyHook("node.read", array($node));
+        } else if ($action == "get_sess_id") {
+            HTMLWriter::charsetHeader("text/plain");
+            print(session_id());
+        }
+    }
+
+    /**
+     * @param AJXP_Node $ajxpNode
+     */
+    public function videoAlternateVersions(&$ajxpNode)
+    {
+        if(!preg_match('/\.mpg$|\.mp4$|\.ogv$|\.webm$/i', $ajxpNode->getLabel())) return;
+        if (file_exists(str_replace(".mpg","_PREVIEW.mp4", $ajxpNode->getUrl()))) {
+            $ajxpNode->mergeMetadata(array("video_altversion_mp4" => str_replace(".mpg","_PREVIEW.mp4", $ajxpNode->getPath())));
+        }
+        $rotating = array("mp4","ogv", "webm");
+        foreach ($rotating as $ext) {
+            if (preg_match('/\.'.$ext.'$/i', $ajxpNode->getLabel())) {
+                foreach ($rotating as $other) {
+                    if($other == $ext) continue;
+                    if (file_exists(str_replace($ext, $other,$ajxpNode->getUrl()))) {
+                        $ajxpNode->mergeMetadata(array("video_altversion_".$other => str_replace($ext, $other, $ajxpNode->getPath())));
+                    }
+                }
+            }
+        }
+    }
+
+}
diff --git a/core/src/plugins/editor.video/class.VideoPreviewer.js b/core/src/plugins/editor.video/class.VideoPreviewer.js
index e188e4e0c4..160e5185ed 100644
--- a/core/src/plugins/editor.video/class.VideoPreviewer.js
+++ b/core/src/plugins/editor.video/class.VideoPreviewer.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 Class.create("VideoPreviewer", AbstractEditor, {
 
@@ -83,7 +83,7 @@ Class.create("VideoPreviewer", AbstractEditor, {
         else if(mime == "ogv") cType = "video/ogg";
         else if(mime == "webm") cType = "video/webm";
         return new Template('<link href="http://vjs.zencdn.net/c/video-js.css" rel="stylesheet">\n\
-&lt;script src="http://vjs.zencdn.net/c/video.js"&gt;&lt;/script&gt;\n\
+<script src="http://vjs.zencdn.net/c/video.js"></script>\n\
 <video id="my_video_1" class="video-js vjs-default-skin" controls\n\
 preload="auto" width="#{WIDTH}" height="#{HEIGHT}" data-setup="{}">\n\
 <source src="#{DL_CT_LINK}" type="'+cType+'">\n\
@@ -92,7 +92,7 @@ preload="auto" width="#{WIDTH}" height="#{HEIGHT}" data-setup="{}">\n\
     },
 
     getRESTPreviewLinks:function(node){
-        return {"Video Stream": "&file=" + encodeURIComponent(node.getPath())};
+        return {"Video Stream": ""};
     },
 
 
@@ -110,6 +110,7 @@ preload="auto" width="#{WIDTH}" height="#{HEIGHT}" data-setup="{}">\n\
                     url = document.location.origin + url;
                 }
             }
+            url = LangUtils.trimRight(url, "\/");
 
             var html5proxies = $H({});
 			var mime = ajxpNode.getAjxpMime();
diff --git a/core/src/plugins/editor.video/class.VideoReader.php b/core/src/plugins/editor.video/class.VideoReader.php
deleted file mode 100755
index 676fc568a1..0000000000
--- a/core/src/plugins/editor.video/class.VideoReader.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Streams video to a client
- * @package AjaXplorer_Plugins
- * @subpackage Editor
- */
-class VideoReader extends AJXP_Plugin
-{
-    public function switchAction($action, $httpVars, $filesVars)
-    {
-        $repository = ConfService::getRepository();
-        if (!$repository->detectStreamWrapper(true)) {
-            return false;
-        }
-
-        $selection = new UserSelection($repository, $httpVars);
-        $node = $selection->getUniqueNode();
-
-        if ($action == "read_video_data") {
-            if(!file_exists($node->getUrl()) || !is_readable($node->getUrl())){
-                throw new Exception("Cannot find file!");
-            }
-            $this->logDebug("Reading video");
-            session_write_close();
-            $filesize = filesize($node->getUrl());
-            $filename = $node->getUrl();
-            $basename = AJXP_Utils::safeBasename($filename);
-
-            //$fp = fopen($destStreamURL.$file, "r");
-            if (preg_match("/\.ogv$/", $basename)) {
-                header("Content-Type: video/ogg; name=\"".$basename."\"");
-            } else if (preg_match("/\.mp4$/", $basename)) {
-                header("Content-Type: video/mp4; name=\"".$basename."\"");
-            } else if (preg_match("/\.m4v$/", $basename)) {
-                header("Content-Type: video/x-m4v; name=\"".$basename."\"");
-            } else if (preg_match("/\.webm$/", $basename)) {
-                header("Content-Type: video/webm; name=\"".$basename."\"");
-            }
-
-            if ( isset($_SERVER['HTTP_RANGE']) && $filesize != 0 ) {
-                $this->logDebug("Http range", array($_SERVER['HTTP_RANGE']));
-                // multiple ranges, which can become pretty complex, so ignore it for now
-                $ranges = explode('=', $_SERVER['HTTP_RANGE']);
-                $offsets = explode('-', $ranges[1]);
-                $offset = floatval($offsets[0]);
-                if($offset == 0){
-                    $this->logInfo('Preview', 'Streaming content of '.$filename, array("files" => $filename));
-                }
-
-                $additionalOffset = 1;
-                if (isset($_SERVER['HTTP_USER_AGENT']) && strlen(strstr($_SERVER['HTTP_USER_AGENT'], 'Firefox')) > 0) {
-                    $additionalOffset = 0;
-                }
-                $length = floatval($offsets[1]) - $offset + $additionalOffset;
-
-                if (!$length) $length = $filesize - $offset;
-                if ($length + $offset > $filesize || $length < 0) $length = $filesize - $offset;
-                header('HTTP/1.1 206 Partial Content');
-
-                header('Content-Range: bytes ' . $offset . '-' . ($offset + $length - 1) . '/' . $filesize);
-                header('Accept-Ranges:bytes');
-                header("Content-Length: ". $length);
-                $file = fopen($filename, 'rb');
-                if(!is_resource($file)) throw new Exception("Cannot open file $file!");
-                fseek($file, 0);
-                $relOffset = $offset;
-                while ($relOffset > 2.0E9) {
-                    // seek to the requested offset, this is 0 if it's not a partial content request
-                    fseek($file, 2000000000, SEEK_CUR);
-                    $relOffset -= 2000000000;
-                    // This works because we never overcome the PHP 32 bit limit
-                }
-                fseek($file, $relOffset, SEEK_CUR);
-
-                while(ob_get_level()) ob_end_flush();
-                $readSize = 0.0;
-                while (!feof($file) && $readSize < $length && connection_status() == 0) {
-                    if ($length < 2048){
-                        echo fread($file, $length);
-                    } else {
-                        echo fread($file, 2048);
-                    }
-
-                    $readSize += 2048.0;
-                    flush();
-                }
-                fclose($file);
-            } else {
-                $this->logInfo('Preview', 'Streaming content of '.$filename, array("files" => $filename));
-                header("Content-Length: ".$filesize);
-                header("Content-Range: bytes 0-" . ($filesize - 1) . "/" . $filesize. ";");
-                header('Cache-Control: public');
-
-                $stream = fopen("php://output", "a");
-                AJXP_MetaStreamWrapper::copyFileInStream($node->getUrl(), $stream);
-                fflush($stream);
-                fclose($stream);
-            }
-            AJXP_Controller::applyHook("node.read", array($node));
-        } else if ($action == "get_sess_id") {
-            HTMLWriter::charsetHeader("text/plain");
-            print(session_id());
-        }
-    }
-
-    /**
-     * @param AJXP_Node $ajxpNode
-     */
-    public function videoAlternateVersions(&$ajxpNode)
-    {
-        if(!preg_match('/\.mpg$|\.mp4$|\.ogv$|\.webm$/i', $ajxpNode->getLabel())) return;
-        if (file_exists(str_replace(".mpg","_PREVIEW.mp4", $ajxpNode->getUrl()))) {
-            $ajxpNode->mergeMetadata(array("video_altversion_mp4" => str_replace(".mpg","_PREVIEW.mp4", $ajxpNode->getPath())));
-        }
-        $rotating = array("mp4","ogv", "webm");
-        foreach ($rotating as $ext) {
-            if (preg_match('/\.'.$ext.'$/i', $ajxpNode->getLabel())) {
-                foreach ($rotating as $other) {
-                    if($other == $ext) continue;
-                    if (file_exists(str_replace($ext, $other,$ajxpNode->getUrl()))) {
-                        $ajxpNode->mergeMetadata(array("video_altversion_".$other => str_replace($ext, $other, $ajxpNode->getPath())));
-                    }
-                }
-            }
-        }
-    }
-
-}
diff --git a/core/src/plugins/editor.video/i18n/conf/de.php b/core/src/plugins/editor.video/i18n/conf/de.php
index bbd9c2c8b4..dfe3bfc279 100644
--- a/core/src/plugins/editor.video/i18n/conf/de.php
+++ b/core/src/plugins/editor.video/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Video Player" => "Video-Player",
diff --git a/core/src/plugins/editor.video/i18n/conf/en.php b/core/src/plugins/editor.video/i18n/conf/en.php
index 80f438d969..76765c003b 100644
--- a/core/src/plugins/editor.video/i18n/conf/en.php
+++ b/core/src/plugins/editor.video/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Video Player" => "Video Player",
diff --git a/core/src/plugins/editor.video/i18n/conf/fr.php b/core/src/plugins/editor.video/i18n/conf/fr.php
index 930368b982..c26aaad95f 100644
--- a/core/src/plugins/editor.video/i18n/conf/fr.php
+++ b/core/src/plugins/editor.video/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Video Player" => "Lecteur vidéo",
diff --git a/core/src/plugins/editor.video/i18n/conf/it.php b/core/src/plugins/editor.video/i18n/conf/it.php
index db50dcedbb..fb6e9d999a 100644
--- a/core/src/plugins/editor.video/i18n/conf/it.php
+++ b/core/src/plugins/editor.video/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Video Player" => "Riproduttore Video",
diff --git a/core/src/plugins/editor.video/i18n/conf/pt.php b/core/src/plugins/editor.video/i18n/conf/pt.php
index b3a2cacf54..5f63d9bbb9 100644
--- a/core/src/plugins/editor.video/i18n/conf/pt.php
+++ b/core/src/plugins/editor.video/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Video Player" => "Reprodutor de Vídeo",
diff --git a/core/src/plugins/editor.video/i18n/de.php b/core/src/plugins/editor.video/i18n/de.php
index 990d057f1c..f229e9cb52 100644
--- a/core/src/plugins/editor.video/i18n/de.php
+++ b/core/src/plugins/editor.video/i18n/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Video-Player",
diff --git a/core/src/plugins/editor.video/i18n/en.php b/core/src/plugins/editor.video/i18n/en.php
index 250ac1d83e..fa354151e9 100644
--- a/core/src/plugins/editor.video/i18n/en.php
+++ b/core/src/plugins/editor.video/i18n/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Media Player",
diff --git a/core/src/plugins/editor.video/i18n/fr.php b/core/src/plugins/editor.video/i18n/fr.php
index bad41b40cf..18313bf04c 100644
--- a/core/src/plugins/editor.video/i18n/fr.php
+++ b/core/src/plugins/editor.video/i18n/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Lecteur multimédia",
diff --git a/core/src/plugins/editor.video/i18n/it.php b/core/src/plugins/editor.video/i18n/it.php
index 6b047ce709..c02c385935 100644
--- a/core/src/plugins/editor.video/i18n/it.php
+++ b/core/src/plugins/editor.video/i18n/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Riproduttore Media",
diff --git a/core/src/plugins/editor.video/i18n/pt.php b/core/src/plugins/editor.video/i18n/pt.php
index 2c0bdec3f7..b37a0ff89f 100644
--- a/core/src/plugins/editor.video/i18n/pt.php
+++ b/core/src/plugins/editor.video/i18n/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Reprodutor de Media",
diff --git a/core/src/plugins/editor.video/manifest.xml b/core/src/plugins/editor.video/manifest.xml
index 227524299e..500f404f10 100644
--- a/core/src/plugins/editor.video/manifest.xml
+++ b/core/src/plugins/editor.video/manifest.xml
@@ -4,7 +4,7 @@
         text="video_editor.1" title="video_editor.1" icon="frame_image.png" iconClass="icon-film"
         className="VideoPreviewer" label="CONF_MESSAGE[Video Player]"
         description="CONF_MESSAGE[Inserts a video player in the info panel, either HTML5 or Flash depending on the format.]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-	<class_definition filename="plugins/editor.video/class.VideoReader.php" classname="VideoReader"/>
+	<class_definition filename="plugins/editor.video/VideoReader.php" classname="Pydio\Editor\Video\VideoReader"/>
     <client_settings>
         <resources>
             <js file="plugins/editor.video/class.VideoPreviewer.js" className="VideoPreviewer"/>
diff --git a/core/src/plugins/editor.webodf/class.WebodfEditor.js b/core/src/plugins/editor.webodf/class.WebodfEditor.js
index 074dd4ecc8..129cdaba4a 100644
--- a/core/src/plugins/editor.webodf/class.WebodfEditor.js
+++ b/core/src/plugins/editor.webodf/class.WebodfEditor.js
@@ -15,41 +15,14 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 Class.create("WebodfEditor", AbstractEditor, {
 
     padID:null,
     sessionID: null,
     node: null,
-
-	initialize: function($super, oFormObject, options)
-	{
-		$super(oFormObject, options);
-		if(!ajaxplorer.user || ajaxplorer.user.canWrite()){
-			this.canWrite = true;
-			this.actions.get("saveButton").observe('click', function(){
-				this.saveFile();
-				return false;
-			}.bind(this));		
-		}else{
-			this.canWrite = false;
-			this.actions.get("saveButton").hide();
-		}
-        // HIDE SAVE FOR THE MOMENT
-        this.actions.get("saveButton").hide();
-
-        if(options.context.__className == "Modal"){
-            this.actions.get("downloadFileButton").observe('click', function(){
-                if(!this.currentFile) return false;
-                PydioApi.triggerDownload(ajxpBootstrap.parameters.get('ajxpServerAccess')+'&action=download&file='+this.currentFile);
-                return false;
-            }.bind(this));
-        }else{
-            this.actions.get("downloadFileButton").hide();
-        }
-	},
-	
+    
 	open : function($super, nodeOrNodes){
 		$super(nodeOrNodes);
         this.node = nodeOrNodes;
@@ -70,7 +43,27 @@ Class.create("WebodfEditor", AbstractEditor, {
 
 
 	},
-	
+
+    resize : function(size){
+        if(size){
+            this.contentMainContainer.setStyle({height:size+'px'});
+            if(this.IEorigWidth) this.contentMainContainer.setStyle({width:this.IEorigWidth});
+        }else{
+            if(this.fullScreenMode){
+                fitHeightToBottom(this.contentMainContainer, this.element);
+                if(this.IEorigWidth) this.contentMainContainer.setStyle({width:this.element.getWidth()});
+            }else{
+                if(this.editorOptions.context.elementName){
+                    fitHeightToBottom(this.contentMainContainer, $(this.editorOptions.context.elementName), 5);
+                }else{
+                    fitHeightToBottom($(this.element));
+                    fitHeightToBottom($(this.contentMainContainer), $(this.element));
+                }
+                if(this.IEorigWidth) this.contentMainContainer.setStyle({width:this.IEorigWidth});
+            }
+        }
+        this.element.fire("editor:resize", size);
+    },
 
 	saveFile : function(){
         if(!this.padID || !this.node) return;
diff --git a/core/src/plugins/editor.webodf/frame.php b/core/src/plugins/editor.webodf/frame.php
index 5e7f8ba566..b5427fee58 100644
--- a/core/src/plugins/editor.webodf/frame.php
+++ b/core/src/plugins/editor.webodf/frame.php
@@ -1,10 +1,12 @@
 <?php
 define('AJXP_EXEC', true);
-require_once('../../core/classes/class.AJXP_Utils.php');
-$AJXP_FILE_URL = AJXP_Utils::securePath(AJXP_Utils::sanitize($_GET["file"], 5));
-$parts = explode("/", AJXP_Utils::securePath($_GET["file"]));
+require_once('../../core/src/pydio/Core/Utils/Vars/InputFilter.php');
+use Pydio\Core\Utils\Vars\InputFilter;
+
+$AJXP_FILE_URL = InputFilter::securePath(InputFilter::sanitize($_GET["file"], 5));
+$parts = explode("/", InputFilter::securePath($_GET["file"]));
 foreach($parts as  $i => $part){
-    $parts[$i] = AJXP_Utils::sanitize($part, AJXP_SANITIZE_FILENAME);
+    $parts[$i] = InputFilter::sanitize($part, InputFilter::SANITIZE_FILENAME);
 }
 $AJXP_FILE_URL = implode("/", $parts);
 ?>
diff --git a/core/src/plugins/editor.webodf/i18n/conf/de.php b/core/src/plugins/editor.webodf/i18n/conf/de.php
index d663ef6e52..fc6bf74c3e 100644
--- a/core/src/plugins/editor.webodf/i18n/conf/de.php
+++ b/core/src/plugins/editor.webodf/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Open Documents Viewer" => "WebODF-Betrachter",
diff --git a/core/src/plugins/editor.webodf/i18n/conf/en.php b/core/src/plugins/editor.webodf/i18n/conf/en.php
index a99166dde5..0f77afb8da 100644
--- a/core/src/plugins/editor.webodf/i18n/conf/en.php
+++ b/core/src/plugins/editor.webodf/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Open Documents Viewer" => "Open Documents Viewer",
diff --git a/core/src/plugins/editor.webodf/i18n/conf/fr.php b/core/src/plugins/editor.webodf/i18n/conf/fr.php
index 100d327f01..349491f604 100644
--- a/core/src/plugins/editor.webodf/i18n/conf/fr.php
+++ b/core/src/plugins/editor.webodf/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Open Documents Viewer" => "Visionneur Open Documents",
diff --git a/core/src/plugins/editor.webodf/i18n/conf/it.php b/core/src/plugins/editor.webodf/i18n/conf/it.php
index 881cf33582..7bf0f29150 100644
--- a/core/src/plugins/editor.webodf/i18n/conf/it.php
+++ b/core/src/plugins/editor.webodf/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Open Documents Viewer" => "Visualizzatore Open Documents",
diff --git a/core/src/plugins/editor.webodf/i18n/de.php b/core/src/plugins/editor.webodf/i18n/de.php
index def6345a77..465b82ed04 100644
--- a/core/src/plugins/editor.webodf/i18n/de.php
+++ b/core/src/plugins/editor.webodf/i18n/de.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/editor.webodf/i18n/en.php b/core/src/plugins/editor.webodf/i18n/en.php
index 3c9e37c2fe..446975ba46 100644
--- a/core/src/plugins/editor.webodf/i18n/en.php
+++ b/core/src/plugins/editor.webodf/i18n/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/editor.webodf/i18n/fr.php b/core/src/plugins/editor.webodf/i18n/fr.php
index 334a37ffde..58c66cccf5 100644
--- a/core/src/plugins/editor.webodf/i18n/fr.php
+++ b/core/src/plugins/editor.webodf/i18n/fr.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/editor.webodf/i18n/it.php b/core/src/plugins/editor.webodf/i18n/it.php
index 73738ab5f2..f8e73fdfeb 100644
--- a/core/src/plugins/editor.webodf/i18n/it.php
+++ b/core/src/plugins/editor.webodf/i18n/it.php
@@ -1,26 +1,25 @@
 <?php
 /*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
 
 $mess = array(
-"1" => "Visualizzatore Open Documents",
-"2" => "Visualizzatore Open Documents",
-"3" => "Open Documents Viewer",
-);
\ No newline at end of file
+    "1" => "Visualizzatore Open Documents",
+    "2" => "Visualizzatore Open Documents",
+);
diff --git a/core/src/plugins/editor.webodf/manifest.xml b/core/src/plugins/editor.webodf/manifest.xml
index 7423fdf35e..e3fa7dc302 100644
--- a/core/src/plugins/editor.webodf/manifest.xml
+++ b/core/src/plugins/editor.webodf/manifest.xml
@@ -11,10 +11,7 @@
 	</client_settings>
 	<clientForm id="webodf_box"><![CDATA[
 		<div id="webodf_box" box_width="80%" box_height="90%" box_padding="0"  class="editor_container">
-			<div class="action_bar">
-				<a href="#" onclick="return false;" class="icon-save" id="saveButton" onclick="saveForm();return false;"><img src="AJXP_THEME_FOLDER/images/actions/22/filesave.png" width="22" height="22" alt="AJXP_MESSAGE[53]" border="0"><br><span message_id="53">AJXP_MESSAGE[53]</span></a>
-				<a href="#" onclick="return false;" class="icon-download" id="downloadFileButton"><img width="22" height="22" src="AJXP_THEME_FOLDER/images/actions/22/download_manager.png" alt="AJXP_MESSAGE[88]" border="0"><br><span message_id="88">AJXP_MESSAGE[88]</span></a>
-			</div>
+			<div class="action_bar"></div>
 			<iframe id="webodf_container" style="border:0; width:100%;"></iframe>
 		</div>
 	]]></clientForm>
diff --git a/core/src/plugins/editor.zoho/ZohoEditor.php b/core/src/plugins/editor.zoho/ZohoEditor.php
new file mode 100644
index 0000000000..fa2b817555
--- /dev/null
+++ b/core/src/plugins/editor.zoho/ZohoEditor.php
@@ -0,0 +1,297 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ *
+ * Description : Zoho plugin. First version by Pawel Wolniewicz http://innodevel.net/ 2011
+ * Improved by cdujeu / Https Support now necessary for zoho API.
+ */
+namespace Pydio\Editor\Office;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\Exception\FileNotFoundException;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Utils\FileHelper;
+use Pydio\Core\Utils\Vars\InputFilter;
+
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Log\Core\Logger;
+
+use GuzzleHttp\Client;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * @package AjaXplorer_Plugins
+ * @subpackage Editor
+ */
+class ZohoEditor extends Plugin
+{
+
+    /**
+     * @var Client
+     */
+    private $client;
+
+
+    public function performChecks() {
+        if (!extension_loaded("openssl")) {
+            throw new \Exception("Zoho plugin requires PHP 'openssl' extension, as posting the document to the Zoho server requires the Https protocol.");
+        }
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = []) {
+        parent::init($ctx, $options);
+
+        $this->client = new Client();
+
+        if(!extension_loaded("openssl")) return;
+
+        $keyFile = $this->getPluginWorkDir(true)."/agent.pem";
+        if(file_exists($keyFile)) return;
+
+        $config = array(
+            "digest_alg" => "sha1",
+            "private_key_bits" => 1024,
+            "private_key_type" => OPENSSL_KEYTYPE_RSA,
+        );
+
+        // Create the private and public key
+        $res = openssl_pkey_new($config);
+        if($res === false){
+            Logger::error(__CLASS__, __FUNCTION__, "Warning, OpenSSL is active but could not correctly generate a key for Zoho Editor. Please make sure the openssl.cnf file is correctly set up.");
+            while($message = openssl_error_string()){
+                Logger::debug(__CLASS__,__FUNCTION__,"Open SSL Error: ".$message);
+            }
+        }else{
+            openssl_pkey_export_to_file($res, $keyFile);
+        }
+    }
+
+    /**
+     * Load the configs passed as parameter. This method will
+     * + Parse the config definitions and load the default values
+     * + Merge these values with the $configData parameter
+     * + Publish their value in the manifest if the global_param is "exposed" to the client.
+     * @param array $configData
+     * @return void
+     */
+    public function loadConfigs($configData) {
+
+        parent::loadConfigs($configData);
+
+        $keyFile = $this->getPluginWorkDir(true)."/agent.pem";
+        if(file_exists($keyFile)) {
+            $res = openssl_pkey_get_private(file_get_contents($keyFile));
+            $details = openssl_pkey_get_details($res);
+            $public = $details["key"];
+            $this->pluginConf["ZOHO_AGENT_PUBLIC_KEY"] = $public;
+        }
+    }
+
+    /**
+     * @param $id
+     * @return bool|string
+     * @throws \Exception
+     */
+    public function signID($id) {
+
+        $keyFile = $this->getPluginWorkDir(true)."/agent.pem";
+        if(file_exists($keyFile)) {
+            $keyId = openssl_get_privatekey(file_get_contents($keyFile));
+            $message = $id;
+            openssl_sign($message, $signature, $keyId);
+            openssl_free_key($keyId);
+            return urlencode(base64_encode($signature));
+        }
+
+        return false;
+    }
+
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @throws \Exception
+     */
+    public function switchAction(ServerRequestInterface &$request, ResponseInterface &$response)
+    {
+        /** @var ContextInterface $ctx */
+        $ctx = $request->getAttribute("ctx");
+        $action = $request->getAttribute("action");
+        $httpVars = $request->getParsedBody();
+
+        $loggedUser = $ctx->getUser();
+
+        if($loggedUser != null){
+            $repoWriteable = $loggedUser->canWrite($ctx->getRepositoryId());
+        }else{
+            $repoWriteable = false;
+        }
+
+        $selection = UserSelection::fromContext($ctx, $httpVars);
+        $destStreamURL = $selection->currentBaseUrl();
+
+        if ($action == "post_to_zohoserver") {
+
+            $sheetExt =  explode(",", "xls,xlsx,ods,sxc,csv,tsv");
+            $presExt = explode(",", "ppt,pptx,pps,odp,sxi");
+            $docExt = explode(",", "doc,docx,rtf,odt,sxw");
+
+            // Backward compat
+            if(strpos($httpVars["file"], "base64encoded:") !== 0){
+                $file = InputFilter::decodeSecureMagic(base64_decode($httpVars["file"]));
+            }else{
+                $file = $selection->getUniqueFile();
+            }
+            $nodeUrl = $destStreamURL.$file;
+            if(!is_readable($nodeUrl)){
+                throw new FileNotFoundException($file);
+            }
+
+            $target = base64_decode($httpVars["parent_url"]);
+
+            $node = new AJXP_Node($nodeUrl);
+            Controller::applyHook("node.read", array($node));
+            $this->logInfo('Preview', 'Posting content of '.$file.' to Zoho server', array("files" => $file));
+
+            $extension = strtolower(pathinfo(urlencode(basename($file)), PATHINFO_EXTENSION));
+
+            $_SESSION["ZOHO_CURRENT_EDITED"] = $nodeUrl;
+            $_SESSION["ZOHO_CURRENT_UUID"]   = md5(rand()."-".microtime());
+
+            if ($this->getContextualOption($ctx, "USE_ZOHO_AGENT")) {
+                $saveUrl = $this->getContextualOption($ctx, "ZOHO_AGENT_URL");
+            } else {
+                $saveUrl = $target."/".AJXP_PLUGINS_FOLDER."/editor.zoho/agent/save_zoho.php";
+            }
+
+            $b64Sig = $this->signID($_SESSION["ZOHO_CURRENT_UUID"]);
+
+            $service = "exportwriter";
+            if (in_array($extension, $sheetExt)) {
+                $service = "sheet";
+            } else if (in_array($extension, $presExt)) {
+                $service = "show";
+            } else if (in_array($extension, $docExt)) {
+                $service = "exportwriter";
+            }
+
+            $contentHandle = fopen($nodeUrl, 'r');
+
+            $postResponse = $this->client->post("https://".$service.".zoho.com/remotedoc.im", [
+                'headers' => [
+                    'User-Agent' => $request->getHeader('User-Agent')
+                ],
+                'body' => [
+                    'id'            => $_SESSION["ZOHO_CURRENT_UUID"],
+                    'apikey'        => $this->getContextualOption($ctx, "ZOHO_API_KEY"),
+                    'output'        => 'url',
+                    'lang'          => $this->getContextualOption($ctx, "ZOHO_LANGUAGE"),
+                    'filename'      => basename($file),
+                    'persistence'   => 'false',
+                    'format'        => $extension,
+                    'mode'          => $repoWriteable && is_writeable($nodeUrl) ? 'normaledit' : 'view',
+                    'saveurl'       => $saveUrl."?signature=".$b64Sig."&XDEBUG_SESSION_START=phpstorm",
+                    'content'       => fopen($nodeUrl, 'r')
+                ]
+            ]);
+
+            $body = $postResponse->getBody();
+
+            $contents = $body->getContents();
+
+            $lines = explode("\n", $contents);
+            $result = array();
+            foreach ($lines as $line) {
+                list($key, $val) = explode("=", $line, 2);
+                $result[$key] = $val;
+            }
+
+            if (!isset($result["RESULT"]) || $result["RESULT"] !== "TRUE" || !isset($result["URL"])) {
+                throw new FileNotFoundException("Could not open file");
+            }
+
+            fclose($contentHandle);
+
+            $response = $response
+                ->withStatus(302)
+                ->withHeader("Location", $result["URL"]);
+
+        } else if ($action == "retrieve_from_zohoagent") {
+
+            $targetFile = $_SESSION["ZOHO_CURRENT_EDITED"];
+            $id = $_SESSION["ZOHO_CURRENT_UUID"];
+            $ext = pathinfo($targetFile, PATHINFO_EXTENSION);
+            $node = new AJXP_Node($targetFile);
+            $node->loadNodeInfo();
+
+            $file = fopen('php://memory', 'w+');
+            $stream = new \Zend\Diactoros\Stream($file);
+
+            $response = $response
+                ->withStatus(200)
+                ->withBody($stream);
+
+            if(!$repoWriteable || !is_writeable($node->getUrl())){
+                $this->logError("Zoho Editor", "Trying to edit an unauthorized file ".$node->getUrl());
+
+                $stream->write("NOT_ALLOWED");
+                return ;
+            }
+
+            Controller::applyHook("node.before_change", array(&$node));
+
+            $b64Sig = $this->signID($id);
+
+            if ($this->getContextualOption($ctx, "USE_ZOHO_AGENT") ) {
+
+                $url =  $this->getContextualOption($ctx, "ZOHO_AGENT_URL")."?ajxp_action=get_file&name=".$id."&ext=".$ext."&signature=".$b64Sig ;
+
+                $data = FileHelper::getRemoteContent($url);
+                if (strlen($data)) {
+                    file_put_contents($targetFile, $data);
+
+                    $stream->write("MODIFIED");
+
+                    $this->logInfo('Edit', 'Retrieved content of '.$node->getUrl(), array("files" => $node->getUrl()));
+                    Controller::applyHook("node.change", array(null, &$node));
+                }
+            } else {
+                if (is_file(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/editor.zoho/agent/files/".$id.".".$ext)) {
+                    copy(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/editor.zoho/agent/files/".$id.".".$ext, $targetFile);
+                    unlink(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/editor.zoho/agent/files/".$id.".".$ext);
+
+                    $stream->write("MODIFIED");
+
+                    $this->logInfo('Edit', 'Retrieved content of '.$node->getUrl(), array("files" => $node->getUrl()));
+                    Controller::applyHook("node.change", array(null, &$node));
+                }
+            }
+        }
+    }
+
+}
diff --git a/core/src/plugins/editor.zoho/class.ZohoEditor.js b/core/src/plugins/editor.zoho/class.ZohoEditor.js
index 40f658ef70..e93e4e039c 100644
--- a/core/src/plugins/editor.zoho/class.ZohoEditor.js
+++ b/core/src/plugins/editor.zoho/class.ZohoEditor.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 Class.create("ZohoEditor", AbstractEditor, {
 
diff --git a/core/src/plugins/editor.zoho/class.ZohoEditor.php b/core/src/plugins/editor.zoho/class.ZohoEditor.php
deleted file mode 100644
index 24bef620c5..0000000000
--- a/core/src/plugins/editor.zoho/class.ZohoEditor.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- * Description : Zoho plugin. First version by Pawel Wolniewicz http://innodevel.net/ 2011
- * Improved by cdujeu / Https Support now necessary for zoho API.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * @package AjaXplorer_Plugins
- * @subpackage Editor
- */
-class ZohoEditor extends AJXP_Plugin
-{
-    public function performChecks()
-    {
-        if (!extension_loaded("openssl")) {
-            throw new Exception("Zoho plugin requires PHP 'openssl' extension, as posting the document to the Zoho server requires the Https protocol.");
-        }
-    }
-
-    public function init($options){
-
-        parent::init($options);
-        if(!extension_loaded("openssl")) return;
-
-        $keyFile = $this->getPluginWorkDir(true)."/agent.pem";
-        if(file_exists($keyFile)) return;
-
-        $config = array(
-            "digest_alg" => "sha1",
-            "private_key_bits" => 1024,
-            "private_key_type" => OPENSSL_KEYTYPE_RSA,
-        );
-
-        // Create the private and public key
-        $res = openssl_pkey_new($config);
-        if($res === false){
-            AJXP_Logger::error(__CLASS__, __FUNCTION__, "Warning, OpenSSL is active but could not correctly generate a key for Zoho Editor. Please make sure the openssl.cnf file is correctly set up.");
-            while($message = openssl_error_string()){
-                AJXP_Logger::debug(__CLASS__,__FUNCTION__,"Open SSL Error: ".$message);
-            }
-        }else{
-            openssl_pkey_export_to_file($res, $keyFile);
-        }
-
-    }
-
-    public function loadConfigs($configData){
-
-        parent::loadConfigs($configData);
-        $keyFile = $this->getPluginWorkDir(true)."/agent.pem";
-        if(file_exists($keyFile)){
-            $res = openssl_pkey_get_private(file_get_contents($keyFile));
-            $details = openssl_pkey_get_details($res);
-            $public = $details["key"];
-            $this->pluginConf["ZOHO_AGENT_PUBLIC_KEY"] = $public;
-        }
-
-    }
-
-    public function signID($id){
-        $keyFile = $this->getPluginWorkDir(true)."/agent.pem";
-        if(file_exists($keyFile)){
-            $keyId = openssl_get_privatekey(file_get_contents($keyFile));
-            $message = $id;
-            openssl_sign($message, $signature, $keyId);
-            openssl_free_key($keyId);
-            return urlencode(base64_encode($signature));
-        }
-        return false;
-    }
-
-
-    public function switchAction($action, $httpVars, $filesVars)
-    {
-        $repository = ConfService::getRepository();
-        if (!$repository->detectStreamWrapper(true)) {
-            return false;
-        }
-        if(AuthService::getLoggedUser() != null){
-            $repoWriteable = AuthService::getLoggedUser()->canWrite($repository->getId());
-        }else{
-            $repoWriteable = false;
-        }
-        $selection = new UserSelection($repository, $httpVars);
-        $destStreamURL = $selection->currentBaseUrl();
-
-        if ($action == "post_to_zohoserver") {
-
-            $sheetExt =  explode(",", "xls,xlsx,ods,sxc,csv,tsv");
-            $presExt = explode(",", "ppt,pptx,pps,odp,sxi");
-            $docExt = explode(",", "doc,docx,rtf,odt,sxw");
-
-            require_once(AJXP_BIN_FOLDER."/http_class/http_class.php");
-
-            // Backward compat
-            if(strpos($httpVars["file"], "base64encoded:") !== 0){
-                $file = AJXP_Utils::decodeSecureMagic(base64_decode($httpVars["file"]));
-            }else{
-                $file = $selection->getUniqueFile();
-            }
-            $nodeUrl = $destStreamURL.$file;
-            if(!is_readable($nodeUrl)){
-                throw new Exception("Cannot find file!");
-            }
-
-            $target = base64_decode($httpVars["parent_url"]);
-            $tmp = AJXP_MetaStreamWrapper::getRealFSReference($nodeUrl);
-            //$tmp = SystemTextEncoding::fromUTF8($tmp);
-
-            $node = new AJXP_Node($nodeUrl);
-            AJXP_Controller::applyHook("node.read", array($node));
-            $this->logInfo('Preview', 'Posting content of '.$file.' to Zoho server', array("files" => $file));
-
-            $extension = strtolower(pathinfo(urlencode(basename($file)), PATHINFO_EXTENSION));
-            $httpClient = new http_class();
-            $httpClient->request_method = "POST";
-
-            $_SESSION["ZOHO_CURRENT_EDITED"] = $nodeUrl;
-            $_SESSION["ZOHO_CURRENT_UUID"]   = md5(rand()."-".microtime());
-
-            if ($this->getFilteredOption("USE_ZOHO_AGENT", $repository)) {
-                $saveUrl = $this->getFilteredOption("ZOHO_AGENT_URL", $repository);
-            } else {
-                $saveUrl = $target."/".AJXP_PLUGINS_FOLDER."/editor.zoho/agent/save_zoho.php";
-            }
-
-            $b64Sig = $this->signID($_SESSION["ZOHO_CURRENT_UUID"]);
-
-            $params = array(
-                'id' => $_SESSION["ZOHO_CURRENT_UUID"],
-                'apikey' => $this->getFilteredOption("ZOHO_API_KEY", $repository),
-                'output' => 'url',
-                'lang' => $this->getFilteredOption("ZOHO_LANGUAGE"),
-                'filename' => SystemTextEncoding::toUTF8(basename($file)),
-                'persistence' => 'false',
-                'format' => $extension,
-                'mode' => $repoWriteable && is_writeable($nodeUrl) ? 'normaledit' : 'view',
-                'saveurl'   => $saveUrl."?signature=".$b64Sig
-            );
-
-            $service = "exportwriter";
-            if (in_array($extension, $sheetExt)) {
-                $service = "sheet";
-            } else if (in_array($extension, $presExt)) {
-                $service = "show";
-            } else if (in_array($extension, $docExt)) {
-                $service = "exportwriter";
-            }
-            $arguments = array();
-            $httpClient->GetRequestArguments("https://".$service.".zoho.com/remotedoc.im", $arguments);
-            $arguments["PostValues"] = $params;
-            $arguments["PostFiles"] = array(
-                "content"   => array("FileName" => $tmp, "Content-Type" => "automatic/name")
-            );
-            $err = $httpClient->Open($arguments);
-            if (empty($err)) {
-                $err = $httpClient->SendRequest($arguments);
-                if (empty($err)) {
-                    $response = "";
-                    while (true) {
-                        $body = "";
-                        $error = $httpClient->ReadReplyBody($body, 1000);
-                        if($error != "" || strlen($body) == 0) break;
-                        $response .= $body;
-                    }
-                    $result = trim($response);
-                    $matchlines = explode("\n", $result);
-                    $resultValues = array();
-                    foreach ($matchlines as $line) {
-                        list($key, $val) = explode("=", $line, 2);
-                        $resultValues[$key] = $val;
-                    }
-                    if ($resultValues["RESULT"] == "TRUE" && isSet($resultValues["URL"])) {
-                        header("Location: ".$resultValues["URL"]);
-                    } else {
-                        echo "Zoho API Error ".$resultValues["ERROR_CODE"]." : ".$resultValues["WARNING"];
-                        echo "<script>window.parent.setTimeout(function(){parent.hideLightBox();}, 2000);</script>";
-                    }
-                }
-                $httpClient->Close();
-            }
-
-        } else if ($action == "retrieve_from_zohoagent") {
-            $targetFile = $_SESSION["ZOHO_CURRENT_EDITED"];
-            $id = $_SESSION["ZOHO_CURRENT_UUID"];
-            $ext = pathinfo($targetFile, PATHINFO_EXTENSION);
-            $node = new AJXP_Node($targetFile);
-            $node->loadNodeInfo();
-
-            if(!$repoWriteable || !is_writeable($node->getUrl())){
-                $this->logError("Zoho Editor", "Trying to edit an unauthorized file ".$node->getUrl());
-                echo "NOT_ALLOWED";
-                return false;
-            }
-            AJXP_Controller::applyHook("node.before_change", array(&$node));
-
-            $b64Sig = $this->signID($id);
-
-            if ($this->getFilteredOption("USE_ZOHO_AGENT",$repository) ) {
-                $url =  $this->getFilteredOption("ZOHO_AGENT_URL",$repository)."?ajxp_action=get_file&name=".$id."&ext=".$ext."&signature=".$b64Sig ;
-                $data = AJXP_Utils::getRemoteContent($url);
-                if (strlen($data)) {
-                    file_put_contents($targetFile, $data);
-                    echo "MODIFIED";
-                    $this->logInfo('Edit', 'Retrieved content of '.$node->getUrl(), array("files" => $node->getUrl()));
-                    AJXP_Controller::applyHook("node.change", array(null, &$node));
-                }
-            } else {
-                if (is_file(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/editor.zoho/agent/files/".$id.".".$ext)) {
-                    copy(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/editor.zoho/agent/files/".$id.".".$ext, $targetFile);
-                    unlink(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/editor.zoho/agent/files/".$id.".".$ext);
-                    echo "MODIFIED";
-                    $this->logInfo('Edit', 'Retrieved content of '.$node->getUrl(), array("files" => $node->getUrl()));
-                    AJXP_Controller::applyHook("node.change", array(null, &$node));
-                }
-            }
-        }
-
-
-    }
-
-}
diff --git a/core/src/plugins/editor.zoho/i18n/conf/de.php b/core/src/plugins/editor.zoho/i18n/conf/de.php
index b4785cd209..d03059e754 100644
--- a/core/src/plugins/editor.zoho/i18n/conf/de.php
+++ b/core/src/plugins/editor.zoho/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Office Docs" => "Zoho Office-Editor",
@@ -31,4 +31,4 @@
 "External Z-Agent" => "Externer Zoho-Agent",
 "You can change ZOHO menu language (de, en, fr, it, pt, ru, ...)" => "You can change ZOHO menu language (de, en, fr, it, pt, ru, ...)",
 "Language" => "Language",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/editor.zoho/i18n/conf/en.php b/core/src/plugins/editor.zoho/i18n/conf/en.php
index 95d07ca525..1f02ff9591 100644
--- a/core/src/plugins/editor.zoho/i18n/conf/en.php
+++ b/core/src/plugins/editor.zoho/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Office Docs" => "Office Docs",
diff --git a/core/src/plugins/editor.zoho/i18n/conf/fr.php b/core/src/plugins/editor.zoho/i18n/conf/fr.php
index 67a0aebc2c..35596f5deb 100644
--- a/core/src/plugins/editor.zoho/i18n/conf/fr.php
+++ b/core/src/plugins/editor.zoho/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Zoho API Key, you must have registered to api.zoho.com" => "Clef d'API Zoho, vous devez être enregistré sur api.zoho.com",
diff --git a/core/src/plugins/editor.zoho/i18n/conf/it.php b/core/src/plugins/editor.zoho/i18n/conf/it.php
index 2955a4e19a..9a2a3a6982 100644
--- a/core/src/plugins/editor.zoho/i18n/conf/it.php
+++ b/core/src/plugins/editor.zoho/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Zoho API Key, you must have registered to api.zoho.com" => "Chiave API Zoho; devi essere registrato ad 'api.zoho.com'",
@@ -34,4 +34,4 @@
 "Zoho editor" => "Zoho editor",
 "You can change ZOHO menu language (de, en, fr, it, pt, ru, ...)" => "You can change ZOHO menu language (de, en, fr, it, pt, ru, ...)",
 "Language" => "Language",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/editor.zoho/i18n/conf/pt.php b/core/src/plugins/editor.zoho/i18n/conf/pt.php
index e62dc9a9f2..5736c32db3 100644
--- a/core/src/plugins/editor.zoho/i18n/conf/pt.php
+++ b/core/src/plugins/editor.zoho/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Zoho API Key, you must have registered to api.zoho.com" => "Chave API Zoho, tem que registar a sua em api.zoho.com",
diff --git a/core/src/plugins/editor.zoho/i18n/de.php b/core/src/plugins/editor.zoho/i18n/de.php
index 70df708c68..a8a46bda23 100644
--- a/core/src/plugins/editor.zoho/i18n/de.php
+++ b/core/src/plugins/editor.zoho/i18n/de.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
     "1" => "Zoho Office-Editor",
diff --git a/core/src/plugins/editor.zoho/i18n/en.php b/core/src/plugins/editor.zoho/i18n/en.php
index 5a6d22b954..d6aee60354 100644
--- a/core/src/plugins/editor.zoho/i18n/en.php
+++ b/core/src/plugins/editor.zoho/i18n/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
     "1" => "Office Documents",
diff --git a/core/src/plugins/editor.zoho/i18n/et.php b/core/src/plugins/editor.zoho/i18n/et.php
index c9df37e610..3960d3f718 100644
--- a/core/src/plugins/editor.zoho/i18n/et.php
+++ b/core/src/plugins/editor.zoho/i18n/et.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
  //  Estonian translation by Ardi Jürgens <ardi (at) zone.ee>
 //  + updates/fixes by Kain Väljaots <kain (at) zone.ee>
diff --git a/core/src/plugins/editor.zoho/i18n/fr.php b/core/src/plugins/editor.zoho/i18n/fr.php
index eb5426bae9..cd9e5373cf 100644
--- a/core/src/plugins/editor.zoho/i18n/fr.php
+++ b/core/src/plugins/editor.zoho/i18n/fr.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
     "1" => "Documents Office",
diff --git a/core/src/plugins/editor.zoho/i18n/it.php b/core/src/plugins/editor.zoho/i18n/it.php
index 05b717f7e0..0b7c2a6611 100644
--- a/core/src/plugins/editor.zoho/i18n/it.php
+++ b/core/src/plugins/editor.zoho/i18n/it.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
     "1" => "Documenti Office",
diff --git a/core/src/plugins/editor.zoho/i18n/pt.php b/core/src/plugins/editor.zoho/i18n/pt.php
index 99f782a196..1e1b578e2a 100644
--- a/core/src/plugins/editor.zoho/i18n/pt.php
+++ b/core/src/plugins/editor.zoho/i18n/pt.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
     "1" => "Documentos Office",
diff --git a/core/src/plugins/editor.zoho/i18n/ru.php b/core/src/plugins/editor.zoho/i18n/ru.php
index 0e1a771836..20c92c5b24 100644
--- a/core/src/plugins/editor.zoho/i18n/ru.php
+++ b/core/src/plugins/editor.zoho/i18n/ru.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
     "1" => "Документы Office",
diff --git a/core/src/plugins/editor.zoho/manifest.xml b/core/src/plugins/editor.zoho/manifest.xml
index cde0f03d2d..fbe761ff52 100644
--- a/core/src/plugins/editor.zoho/manifest.xml
+++ b/core/src/plugins/editor.zoho/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <editor id="editor.zoho" order="3" enabled="false" openable="true" text="zoho_editor.1" iconClass="icon-edit" title="zoho_editor.2" canWrite="true" description="CONF_MESSAGE[Zoho editor]" icon="zoho_img/zoho.png" label="CONF_MESSAGE[Office Docs]" className="ZohoEditor" mimes="xls,xlsx,ods,sxc,csv,tsv,ppt,pptx,pps,odp,sxi,doc,docx,rtf,odt,sxw" formId="zoho_box" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-	<class_definition filename="plugins/editor.zoho/class.ZohoEditor.php" classname="ZohoEditor"/>
+	<class_definition filename="plugins/editor.zoho/ZohoEditor.php" classname="Pydio\Editor\Office\ZohoEditor"/>
     <server_settings>
         <global_param name="ZOHO_LANGUAGE" type="string" description="CONF_MESSAGE[You can change ZOHO menu language (de, en, fr, it, pt, ru, ...)]" label="CONF_MESSAGE[Language]" mandatory="true" default="en"/>
         <global_param name="ZOHO_API_KEY" type="string" description="CONF_MESSAGE[Zoho API Key, you must have registered to api.zoho.com]" label="CONF_MESSAGE[API Key]" mandatory="true"/>
diff --git a/core/src/plugins/feed.sql/SqlFeedStore.php b/core/src/plugins/feed.sql/SqlFeedStore.php
new file mode 100755
index 0000000000..4d645511a5
--- /dev/null
+++ b/core/src/plugins/feed.sql/SqlFeedStore.php
@@ -0,0 +1,464 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Notification\Feed;
+
+use Pydio\Access\Core\Filter\AJXP_Permission;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Utils\DBHelper;
+use Pydio\Core\Utils\Vars\OptionsHelper;
+
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\PluginFramework\SqlTableProvider;
+use Pydio\Notification\Core\IFeedStore;
+use Pydio\Notification\Core\Notification;
+
+use \dibi as dibi;
+use \DibiException as DibiException;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * @package AjaXplorer_Plugins
+ * @subpackage Feed
+ */
+class SqlFeedStore extends Plugin implements IFeedStore, SqlTableProvider
+{
+
+    private $sqlDriver;
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        $this->sqlDriver = OptionsHelper::cleanDibiDriverParameters($options["SQL_DRIVER"]);
+        parent::init($ctx, $options);
+    }
+
+    public function performChecks()
+    {
+        if(!isSet($this->options)) return;
+        $test = OptionsHelper::cleanDibiDriverParameters($this->options["SQL_DRIVER"]);
+        if (!count($test)) {
+            throw new \Exception("Please define an SQL connexion in the core configuration");
+        }
+    }
+
+
+    /**
+     * @param string $hookName
+     * @param mixed $data
+     * @param string $repositoryId
+     * @param string $repositoryScope
+     * @param string $repositoryOwner
+     * @param string $userId
+     * @param string $userGroup
+     * @return void
+     */
+    public function persistEvent($hookName, $data, $repositoryId, $repositoryScope, $repositoryOwner, $userId, $userGroup)
+    {
+        if($this->sqlDriver["password"] == "XXXX") return;
+        if(!dibi::isConnected()) {
+            dibi::connect($this->sqlDriver);
+        }
+        try {
+            /** @var AJXP_Node $node */
+            $node = null;
+            if(is_object($data[1]) && $data[1] instanceof \Pydio\Access\Core\Model\AJXP_Node && $data[1]->getContext()->getRepositoryId() === $repositoryId) {
+                $node = $data[1];
+            } else if(is_object($data[0]) && $data[0] instanceof \Pydio\Access\Core\Model\AJXP_Node && $data[0]->getContext()->getRepositoryId() === $repositoryId) {
+                $node = $data[0];
+            }
+            dibi::query("INSERT INTO [ajxp_feed] ([edate],[etype],[htype],[user_id],[repository_id],[repository_owner],[user_group],[repository_scope],[content],[index_path]) VALUES (%i,%s,%s,%s,%s,%s,%s,%s,%bin,%s)",
+                time(),
+                "event",
+                $hookName,
+                $userId,
+                $repositoryId,
+                $repositoryOwner,
+                $userGroup,
+                ($repositoryScope !== false ? $repositoryScope : "ALL"),
+                serialize($data),
+                ($node!=null ? $node->getUrl():'')
+            );
+        } catch (DibiException $e) {
+            $this->logError("DibiException", "trying to persist event", $e->getMessage());
+        }
+    }
+
+    /**
+     * @param array $filterByRepositories
+     * @param $filterByPath
+     * @param string $userGroup
+     * @param integer $offset
+     * @param integer $limit
+     * @param bool $enlargeToOwned
+     * @param string $userId
+     * @return array An array of stdClass objects with keys hookname, arguments, author, date, repository
+     */
+    public function loadEvents($filterByRepositories, $filterByPath, $userGroup, $offset = 0, $limit = 10, $enlargeToOwned = true, $userId)
+    {
+        if($this->sqlDriver["password"] == "XXXX") return array();
+        if(!dibi::isConnected()) {
+            dibi::connect($this->sqlDriver);
+        }
+        if($this->sqlDriver["driver"] == "postgre"){
+            dibi::query("SET bytea_output=escape");
+        }
+
+        // Add some permission mask if necessary
+
+        $repoOrs = array();
+        foreach($filterByRepositories as $repoId){
+            $masks = array();
+            Controller::applyHook("role.masks", array(new Context($userId, $repoId), &$masks, AJXP_Permission::READ));
+            if(count($masks)){
+                $pathesOr = array();
+                foreach($masks as $mask){
+                    $filterLike = "://%@".$repoId.rtrim($mask, "/") . "/";
+                    $pathesOr[] = array("[index_path] LIKE %~like~", $filterLike);
+                }
+                if(count($pathesOr)){
+                    $repoOrs[] = array("[repository_id]=%s AND %or", $repoId, $pathesOr);
+                }else{
+                    $repoOrs[] = array("[repository_id]=%s", $repoId);
+                }
+            }
+        }
+
+
+        if ($enlargeToOwned) {
+            $res = dibi::query("SELECT * FROM [ajxp_feed] WHERE [etype] = %s AND
+            ( [repository_id] IN (%s) OR [repository_owner] = %s )
+            AND (
+                [repository_scope] = 'ALL'
+                OR  ([repository_scope] = 'USER' AND [user_id] = %s  )
+                OR  ([repository_scope] = 'GROUP' AND [user_group] = %s  )
+            )
+            ORDER BY [edate] DESC %lmt %ofs", "event", $filterByRepositories, $userId, $userId, $userGroup, $limit, $offset);
+        } else {
+            if(!empty($filterByPath)){
+                $groupByClause = "";
+                if($filterByPath[strlen($filterByPath)-1]=='/'){
+                    //$groupByClause = " GROUP BY [index_path] ";
+                }
+                $index_path = "%://%@".$filterByRepositories[0].$filterByPath."%";
+                $res = dibi::query("SELECT * FROM [ajxp_feed] WHERE [etype] = %s
+                AND
+                  ( %or )
+                AND
+                  ([index_path] LIKE %s)
+                AND (
+                    [repository_scope] = 'ALL'
+                    OR  ([repository_scope] = 'USER' AND [user_id] = %s  )
+                    OR  ([repository_scope] = 'GROUP' AND [user_group] = %s  )
+                )
+                $groupByClause ORDER BY [edate] DESC %lmt %ofs", "event", $repoOrs, $index_path, $userId, $userGroup, $limit, $offset);
+            }else{
+                    $res = dibi::query("SELECT * FROM [ajxp_feed] WHERE [etype] = %s AND
+                ( %or )
+                AND (
+                    [repository_scope] = 'ALL'
+                    OR  ([repository_scope] = 'USER' AND [user_id] = %s  )
+                    OR  ([repository_scope] = 'GROUP' AND [user_group] = %s  )
+                )
+                ORDER BY [edate] DESC %lmt %ofs", "event", $repoOrs, $userId, $userGroup, $limit, $offset);
+            }
+        }
+        $data = array();
+        foreach ($res as $n => $row) {
+            $object = new \stdClass();
+            $object->hookname = $row->htype;
+            $object->arguments = unserialize($row->content);
+            $object->author = $row->user_id;
+            $object->date = $row->edate;
+            $object->repository = $row->repository_id;
+            $object->event_id = $row->id;
+            $data[] = $object;
+        }
+        return $data;
+    }
+
+    /**
+     * @abstract
+     * @param Notification $notif
+     * @return mixed
+     */
+    public function persistAlert(Notification $notif)
+    {
+        if(!$notif->getNode()) return;
+        $repositoryId = $notif->getNode()->getRepositoryId();
+        $userId = $notif->getTarget();
+        if($this->sqlDriver["password"] == "XXXX") return;
+        if(!dibi::isConnected()) {
+            dibi::connect($this->sqlDriver);
+        }
+        try {
+            dibi::query("INSERT INTO [ajxp_feed] ([edate],[etype],[htype],[user_id],[repository_id],[content], [index_path]) VALUES (%i,%s,%s,%s,%s,%bin,%s)",
+                time(),
+                "alert",
+                "notification",
+                $userId,
+                $repositoryId,
+                serialize($notif),
+                ($notif->getNode()!=null ? $notif->getNode()->getUrl():'')
+            );
+        } catch (DibiException $e) {
+            $this->logError("DibiException", "trying to persist alert", $e->getMessage());
+        }
+    }
+
+    /**
+     * @abstract
+     * @param $userId
+     * @param null $repositoryIdFilter
+     * @return mixed
+     */
+    public function loadAlerts($userId, $repositoryIdFilter = null)
+    {
+        if($this->sqlDriver["password"] == "XXXX") return array();
+        if(!dibi::isConnected()) {
+            dibi::connect($this->sqlDriver);
+        }
+        if ($repositoryIdFilter !== null) {
+            $res = dibi::query("SELECT * FROM [ajxp_feed] WHERE [etype] = %s
+            AND ([repository_id] = %s OR [repository_id] IN  (SELECT [uuid] FROM [ajxp_repo] WHERE [parent_uuid]=%s))
+            AND [user_id] = %s ORDER BY [edate] DESC %lmt", "alert", $repositoryIdFilter, $repositoryIdFilter, $userId, 100);
+            //$res = dibi::query("SELECT * FROM [ajxp_feed] WHERE [etype] = %s AND [repository_id] = %s AND [user_id] = %s ORDER BY [edate] DESC %lmt", "alert", $repositoryIdFilter, $userId, 100);
+        } else {
+            $res = dibi::query("SELECT * FROM [ajxp_feed] WHERE [etype] = %s AND [user_id] = %s ORDER BY [edate] DESC %lmt", "alert", $userId, 100);
+        }
+        $data = array();
+        foreach ($res as $n => $row) {
+            $test = unserialize($row->content);
+            if ($test instanceof Notification) {
+                $test->alert_id = $row->id;
+                $data[] = $test;
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function dismissAlertById(ContextInterface $contextInterface, $alertId, $occurrences = 1)
+    {
+        if(!dibi::isConnected()) {
+            dibi::connect($this->sqlDriver);
+        }
+        $userId = $contextInterface->getUser()->getId();
+        if ($occurrences == 1) {
+            dibi::query("DELETE FROM [ajxp_feed] WHERE [id] = %i AND [user_id] = %s", $alertId, $userId);
+        } else {
+            $res = dibi::query("SELECT * FROM [ajxp_feed] WHERE [id] = %i AND [user_id] = %s", $alertId, $userId);
+            if(!count($res)){
+                return;
+            }
+            foreach ($res as $n => $row) {
+                $startEventRow = $row;
+                break;
+            }
+            /**
+             * @var $startEventNotif Notification
+             */
+            $startEventNotif = unserialize($startEventRow->content);
+            if(empty($startEventNotif)) {
+                // Ignore, empty notif;
+                return;
+            }
+            $url = $startEventNotif->getNode()->getUrl();
+            $date = $startEventRow->edate;
+            $newRes = dibi::query("SELECT [id] FROM [ajxp_feed] WHERE [etype] = %s AND [user_id] = %s AND [edate] <= %s AND [index_path] = %s ORDER BY [edate] DESC %lmt", "alert", $userId, $date, $url, $occurrences);
+            $a = $newRes->fetchPairs();
+            if (!count($a)) {
+                // Weird, probably not upgraded!
+                $this->upgradeAlertsContentToIndexPath();
+            }
+            dibi::query("DELETE FROM [ajxp_feed] WHERE [id] IN %in",  $a);
+        }
+    }
+
+
+    public function upgradeAlertsContentToIndexPath()
+    {
+        // Load alerts with empty index_path
+        $res = dibi::query("SELECT [id],[content],[index_path] FROM [ajxp_feed] WHERE [etype] = %s AND [index_path] IS NULL", "alert");
+        foreach ($res as $row) {
+            $test = unserialize($row->content);
+            if ($test instanceof Notification) {
+                $url = $test->getNode()->getUrl();
+                try {
+                    dibi::query("UPDATE [ajxp_feed] SET [index_path]=%s WHERE [id] = %i", $url, $row->id);
+                } catch (\Exception $e) {
+                    $this->logError("[sql]", $e->getMessage());
+                }
+            }
+        }
+    }
+
+    /**
+     * @param string $indexPath
+     * @param mixed $data
+     * @param string $repositoryId
+     * @param string $repositoryScope
+     * @param string $repositoryOwner
+     * @param string $userId
+     * @param string $userGroup
+     * @return void
+     */
+    public function persistMetaObject($indexPath, $data, $repositoryId, $repositoryScope, $repositoryOwner, $userId, $userGroup)
+    {
+        if($this->sqlDriver["password"] == "XXXX") return;
+        if(!dibi::isConnected()) {
+            dibi::connect($this->sqlDriver);
+        }
+        try {
+            dibi::query("INSERT INTO [ajxp_feed] ([edate],[etype],[htype],[index_path],[user_id],[repository_id],[repository_owner],[user_group],[repository_scope],[content]) VALUES (%i,%s,%s,%s,%s,%s,%s,%s,%s,%bin)", time(), "meta", "comment", $indexPath, $userId, $repositoryId, $repositoryOwner, $userGroup, ($repositoryScope !== false ? $repositoryScope : "ALL"), serialize($data));
+        } catch (DibiException $e) {
+            $this->logError("DibiException", "trying to persist meta", $e->getMessage());
+        }
+    }
+
+    /**
+     * @param $repositoryId
+     * @param $indexPath
+     * @param $userId
+     * @param $userGroup
+     * @param int $offset
+     * @param int $limit
+     * @param string $orderBy
+     * @param string $orderDir
+     * @param bool $recurring
+     * @return array
+     */
+    public function findMetaObjectsByIndexPath($repositoryId, $indexPath, $userId, $userGroup, $offset = 0, $limit = 20, $orderBy = "date", $orderDir = "desc", $recurring = true)
+    {
+        if($this->sqlDriver["password"] == "XXXX") return array();
+        if(!dibi::isConnected()) {
+            dibi::connect($this->sqlDriver);
+        }
+        if($recurring){
+            $res = dibi::query("SELECT * FROM [ajxp_feed]
+                WHERE [etype] = %s AND [repository_id] = %s AND [index_path] LIKE %like~
+                ORDER BY %by %lmt %ofs
+            ", "meta", $repositoryId, $indexPath, array('edate' => $orderDir), $limit, $offset);
+        }else{
+            $res = dibi::query("SELECT * FROM [ajxp_feed]
+                WHERE [etype] = %s AND [repository_id] = %s AND [index_path] = %s
+                ORDER BY %by %lmt %ofs
+            ", "meta", $repositoryId, $indexPath, array('edate' => $orderDir), $limit, $offset);
+        }
+
+        $data = array();
+        foreach ($res as $n => $row) {
+            $object = new \stdClass();
+            $object->path = $row->index_path;
+            $object->content = unserialize($row->content);
+            $object->author = $row->user_id;
+            $object->date = $row->edate;
+            $object->repository = $row->repository_id;
+            $object->uuid = $row->id;
+            $data[] = $object;
+        }
+        return $data;
+    }
+
+    /**
+     * @param $repositoryId
+     * @param $oldPath
+     * @param null $newPath
+     * @param bool $copy
+     */
+    public function updateMetaObject($repositoryId, $oldPath, $newPath = null, $copy = false)
+    {
+        if($this->sqlDriver["password"] == "XXXX") return;
+        if(!dibi::isConnected()) {
+            dibi::connect($this->sqlDriver);
+        }
+        if ($oldPath != null && $newPath == null) {// DELETE
+
+            dibi::query("DELETE FROM [ajxp_feed] WHERE [repository_id]=%s and [index_path] LIKE %like~", $repositoryId, $oldPath);
+
+        } else if ($oldPath != null && $newPath != null) { // MOVE or COPY
+
+            if ($copy) {
+
+                // ?? Do we want to duplicate metadata?
+
+            } else {
+
+                $starter = "__START__";
+                dibi::query("UPDATE [ajxp_feed] SET [index_path] = CONCAT(%s, [index_path]) WHERE [index_path] LIKE %s AND [repository_id]=%s", $starter, $oldPath."%", $repositoryId);
+                dibi::query("UPDATE [ajxp_feed] SET [index_path] = REPLACE([index_path], %s, %s) WHERE [index_path] LIKE %s AND [repository_id]=%s", $starter.$oldPath, $starter.$newPath, $starter.$oldPath."%", $repositoryId);
+                dibi::query("UPDATE [ajxp_feed] SET [index_path] = REPLACE([index_path], %s, %s) WHERE [index_path] LIKE %s AND [repository_id]=%s", $starter, '', $starter.$newPath."%", $repositoryId);
+
+            }
+
+        }
+
+    }
+
+    /**
+     * @param array $param
+     * @return string
+     * @throws \Exception
+     */
+    public function installSQLTables($param)
+    {
+        $p = OptionsHelper::cleanDibiDriverParameters($param["SQL_DRIVER"]);
+        return DBHelper::runCreateTablesQuery($p, $this->getBaseDir() . "/create.sql");
+    }
+
+    /**
+     * Delete feed data
+     * @param array|string $types
+     * @param null $userId
+     * @param null $repositoryId
+     * @param int $count
+     * @return mixed
+     */
+    public function deleteFeed($types = 'event', $userId = null, $repositoryId = null, &$count = 0)
+    {
+        $wheres = [];
+        if($types !== 'both') {
+            $wheres[] = ['etype = %s', $types];
+        }
+        if($userId != null) {
+            $wheres[] = ['user_id = %s OR index_path LIKE %s', $userId, '%pydio://'.$userId.'@%'];
+        }
+        if($repositoryId != null) {
+            $wheres[] = ['repository_id = %s OR index_path LIKE %s', $repositoryId, '%pydio://%@'.$repositoryId.'/%'];
+        }
+        if(count($wheres)){
+            $count = dibi::query("SELECT count(*) FROM [ajxp_feed] WHERE %and ", $wheres)->fetchSingle();
+            dibi::query("DELETE FROM [ajxp_feed] WHERE %and", $wheres);
+        }else{
+            $count = dibi::query("SELECT count(*) FROM [ajxp_feed]")->fetchSingle();
+            dibi::query("DELETE FROM [ajxp_feed]");
+        }
+    }
+}
diff --git a/core/src/plugins/feed.sql/class.AJXP_SqlFeedStore.php b/core/src/plugins/feed.sql/class.AJXP_SqlFeedStore.php
deleted file mode 100755
index a9ca26b10e..0000000000
--- a/core/src/plugins/feed.sql/class.AJXP_SqlFeedStore.php
+++ /dev/null
@@ -1,390 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-/**
- * @package AjaXplorer_Plugins
- * @subpackage Feed
- */
-class AJXP_SqlFeedStore extends AJXP_Plugin implements AJXP_FeedStore, SqlTableProvider
-{
-
-    private $sqlDriver;
-
-    public function init($options)
-    {
-        $this->sqlDriver = AJXP_Utils::cleanDibiDriverParameters($options["SQL_DRIVER"]);
-        parent::init($options);
-    }
-
-    public function performChecks()
-    {
-        if(!isSet($this->options)) return;
-        $test = AJXP_Utils::cleanDibiDriverParameters($this->options["SQL_DRIVER"]);
-        if (!count($test)) {
-            throw new Exception("Please define an SQL connexion in the core configuration");
-        }
-    }
-
-
-    /**
-     * @param string $hookName
-     * @param mixed $data
-     * @param string $repositoryId
-     * @param string $repositoryScope
-     * @param string $repositoryOwner
-     * @param string $userId
-     * @param string $userGroup
-     * @return void
-     */
-    public function persistEvent($hookName, $data, $repositoryId, $repositoryScope, $repositoryOwner, $userId, $userGroup)
-    {
-        if($this->sqlDriver["password"] == "XXXX") return;
-        if(!dibi::isConnected()) {
-            dibi::connect($this->sqlDriver);
-        }
-        try {
-            $node = null;
-            if(is_object($data[1]) && $data[1] instanceof AJXP_Node && $data[1]->getRepositoryId() === $repositoryId) {
-                $node = $data[1];
-            } else if(is_object($data[0]) && $data[0] instanceof AJXP_Node && $data[0]->getRepositoryId() === $repositoryId) {
-                $node = $data[0];
-            }
-            dibi::query("INSERT INTO [ajxp_feed] ([edate],[etype],[htype],[user_id],[repository_id],[repository_owner],[user_group],[repository_scope],[content],[index_path]) VALUES (%i,%s,%s,%s,%s,%s,%s,%s,%bin,%s)",
-                time(),
-                "event",
-                $hookName,
-                $userId,
-                $repositoryId,
-                $repositoryOwner,
-                $userGroup,
-                ($repositoryScope !== false ? $repositoryScope : "ALL"),
-                serialize($data),
-                ($node!=null ? SystemTextEncoding::toUTF8($node->getUrl()):'')
-            );
-        } catch (DibiException $e) {
-            $this->logError("DibiException", "trying to persist event", $e->getMessage());
-        }
-    }
-
-    /**
-     * @param array $filterByRepositories
-     * @param $filterByPath
-     * @param string $userGroup
-     * @param integer $offset
-     * @param integer $limit
-     * @param bool $enlargeToOwned
-     * @param string $userId
-     * @return An array of stdClass objects with keys hookname, arguments, author, date, repository
-     */
-    public function loadEvents($filterByRepositories, $filterByPath, $userGroup, $offset = 0, $limit = 10, $enlargeToOwned = true, $userId)
-    {
-        if($this->sqlDriver["password"] == "XXXX") return array();
-        if(!dibi::isConnected()) {
-            dibi::connect($this->sqlDriver);
-        }
-        if($this->sqlDriver["driver"] == "postgre"){
-            dibi::query("SET bytea_output=escape");
-        }
-
-        // Add some permission mask if necessary
-
-        $repoOrs = array();
-        foreach($filterByRepositories as $repoId){
-            $masks = array();
-            AJXP_Controller::applyHook("role.masks", array($repoId, &$masks, AJXP_Permission::READ));
-            if(count($masks)){
-                $pathesOr = array();
-                foreach($masks as $mask){
-                    $filterLike = "://".$repoId.rtrim($mask, "/") . "/";
-                    $pathesOr[] = array("[index_path] LIKE %~like~", $filterLike);
-                }
-                if(count($pathesOr)){
-                    $repoOrs[] = array("[repository_id]=%s AND %or", $repoId, $pathesOr);
-                }else{
-                    $repoOrs[] = array("[repository_id]=%s", $repoId);
-                }
-            }
-        }
-
-
-        if ($enlargeToOwned) {
-            $res = dibi::query("SELECT * FROM [ajxp_feed] WHERE [etype] = %s AND
-            ( [repository_id] IN (%s) OR [repository_owner] = %s )
-            AND (
-                [repository_scope] = 'ALL'
-                OR  ([repository_scope] = 'USER' AND [user_id] = %s  )
-                OR  ([repository_scope] = 'GROUP' AND [user_group] = %s  )
-            )
-            ORDER BY [edate] DESC %lmt %ofs", "event", $filterByRepositories, $userId, $userId, $userGroup, $limit, $offset);
-        } else {
-            if(!empty($filterByPath)){
-                $groupByClause = "";
-                if($filterByPath[strlen($filterByPath)-1]=='/'){
-                    //$groupByClause = " GROUP BY [index_path] ";
-                }
-                $index_path[] = array("[index_path] LIKE %s","%://".$filterByRepositories[0].$filterByPath."%");
-                $index_path[] = array("[index_path] LIKE %s","%://".$userId."@".$filterByRepositories[0].$filterByPath."%");
-                $res = dibi::query("SELECT * FROM [ajxp_feed] WHERE [etype] = %s
-                AND
-                  ( %or )
-                AND
-                  ( %or )
-                AND (
-                    [repository_scope] = 'ALL'
-                    OR  ([repository_scope] = 'USER' AND [user_id] = %s  )
-                    OR  ([repository_scope] = 'GROUP' AND [user_group] = %s  )
-                )
-                $groupByClause ORDER BY [edate] DESC %lmt %ofs", "event", $repoOrs, $index_path, $userId, $userGroup, $limit, $offset);
-            }else{
-                    $res = dibi::query("SELECT * FROM [ajxp_feed] WHERE [etype] = %s AND
-                ( %or )
-                AND (
-                    [repository_scope] = 'ALL'
-                    OR  ([repository_scope] = 'USER' AND [user_id] = %s  )
-                    OR  ([repository_scope] = 'GROUP' AND [user_group] = %s  )
-                )
-                ORDER BY [edate] DESC %lmt %ofs", "event", $repoOrs, $userId, $userGroup, $limit, $offset);
-            }
-        }
-        $data = array();
-        foreach ($res as $n => $row) {
-            $object = new stdClass();
-            $object->hookname = $row->htype;
-            $object->arguments = unserialize($row->content);
-            $object->author = $row->user_id;
-            $object->date = $row->edate;
-            $object->repository = $row->repository_id;
-            $object->event_id = $row->id;
-            $data[] = $object;
-        }
-        return $data;
-    }
-
-    /**
-     * @abstract
-     * @param AJXP_Notification $notif
-     * @return mixed
-     */
-    public function persistAlert(AJXP_Notification $notif)
-    {
-        if(!$notif->getNode()) return;
-        $repositoryId = $notif->getNode()->getRepositoryId();
-        $userId = $notif->getTarget();
-        if($this->sqlDriver["password"] == "XXXX") return;
-        if(!dibi::isConnected()) {
-            dibi::connect($this->sqlDriver);
-        }
-        try {
-            dibi::query("INSERT INTO [ajxp_feed] ([edate],[etype],[htype],[user_id],[repository_id],[content], [index_path]) VALUES (%i,%s,%s,%s,%s,%bin,%s)",
-                time(),
-                "alert",
-                "notification",
-                $userId,
-                $repositoryId,
-                serialize($notif),
-                ($notif->getNode()!=null ? SystemTextEncoding::toUTF8($notif->getNode()->getUrl()):'')
-            );
-        } catch (DibiException $e) {
-            $this->logError("DibiException", "trying to persist alert", $e->getMessage());
-        }
-    }
-
-    /**
-     * @abstract
-     * @param $userId
-     * @param null $repositoryIdFilter
-     * @return mixed
-     */
-    public function loadAlerts($userId, $repositoryIdFilter = null)
-    {
-        if($this->sqlDriver["password"] == "XXXX") return array();
-        if(!dibi::isConnected()) {
-            dibi::connect($this->sqlDriver);
-        }
-        if ($repositoryIdFilter !== null) {
-            $res = dibi::query("SELECT * FROM [ajxp_feed] WHERE [etype] = %s
-            AND ([repository_id] = %s OR [repository_id] IN  (SELECT [uuid] FROM [ajxp_repo] WHERE [parent_uuid]=%s))
-            AND [user_id] = %s ORDER BY [edate] DESC %lmt", "alert", $repositoryIdFilter, $repositoryIdFilter, $userId, 100);
-            //$res = dibi::query("SELECT * FROM [ajxp_feed] WHERE [etype] = %s AND [repository_id] = %s AND [user_id] = %s ORDER BY [edate] DESC %lmt", "alert", $repositoryIdFilter, $userId, 100);
-        } else {
-            $res = dibi::query("SELECT * FROM [ajxp_feed] WHERE [etype] = %s AND [user_id] = %s ORDER BY [edate] DESC %lmt", "alert", $userId, 100);
-        }
-        $data = array();
-        foreach ($res as $n => $row) {
-            $test = unserialize($row->content);
-            if (is_a($test, "AJXP_Notification")) {
-                $test->alert_id = $row->id;
-                $data[] = $test;
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * @param $occurrences
-     * @param $alertId
-     */
-    public function dismissAlertById($alertId, $occurrences = 1)
-    {
-        if(!dibi::isConnected()) {
-            dibi::connect($this->sqlDriver);
-        }
-        $userId = AuthService::getLoggedUser()->getId();
-        if ($occurrences == 1) {
-            dibi::query("DELETE FROM [ajxp_feed] WHERE [id] = %i AND [user_id] = %s", $alertId, $userId);
-        } else {
-            $res = dibi::query("SELECT * FROM [ajxp_feed] WHERE [id] = %i AND [user_id] = %s", $alertId, $userId);
-            foreach ($res as $n => $row) {
-                $startEventRow = $row;
-                break;
-            }
-            /**
-             * @var $startEventNotif AJXP_Notification
-             */
-            $startEventNotif = unserialize($startEventRow->content);
-            if(empty($startEventNotif)) {
-                // Ignore, empty notif;
-                return;
-            }
-            $url = $startEventNotif->getNode()->getUrl();
-            $date = $startEventRow->edate;
-            $newRes = dibi::query("SELECT [id] FROM [ajxp_feed] WHERE [etype] = %s AND [user_id] = %s AND [edate] <= %s AND [index_path] = %s ORDER BY [edate] DESC %lmt", "alert", $userId, $date, $url, $occurrences);
-            $a = $newRes->fetchPairs();
-            if (!count($a)) {
-                // Weird, probably not upgraded!
-                $this->upgradeAlertsContentToIndexPath();
-            }
-            dibi::query("DELETE FROM [ajxp_feed] WHERE [id] IN %in",  $a);
-        }
-    }
-
-
-    public function upgradeAlertsContentToIndexPath()
-    {
-        // Load alerts with empty index_path
-        $res = dibi::query("SELECT [id],[content],[index_path] FROM [ajxp_feed] WHERE [etype] = %s AND [index_path] IS NULL", "alert");
-        foreach ($res as $row) {
-            $test = unserialize($row->content);
-            if (is_a($test, "AJXP_Notification")) {
-                $url = $test->getNode()->getUrl();
-                try {
-                    dibi::query("UPDATE [ajxp_feed] SET [index_path]=%s WHERE [id] = %i", $url, $row->id);
-                } catch (Exception $e) {
-                    $this->logError("[sql]", $e->getMessage());
-                }
-            }
-        }
-    }
-
-    /**
-     * @param string $indexPath
-     * @param mixed $data
-     * @param string $repositoryId
-     * @param string $repositoryScope
-     * @param string $repositoryOwner
-     * @param string $userId
-     * @param string $userGroup
-     * @return void
-     */
-    public function persistMetaObject($indexPath, $data, $repositoryId, $repositoryScope, $repositoryOwner, $userId, $userGroup)
-    {
-        if($this->sqlDriver["password"] == "XXXX") return;
-        if(!dibi::isConnected()) {
-            dibi::connect($this->sqlDriver);
-        }
-        try {
-            dibi::query("INSERT INTO [ajxp_feed] ([edate],[etype],[htype],[index_path],[user_id],[repository_id],[repository_owner],[user_group],[repository_scope],[content]) VALUES (%i,%s,%s,%s,%s,%s,%s,%s,%s,%bin)", time(), "meta", "comment", $indexPath, $userId, $repositoryId, $repositoryOwner, $userGroup, ($repositoryScope !== false ? $repositoryScope : "ALL"), serialize($data));
-        } catch (DibiException $e) {
-            $this->logError("DibiException", "trying to persist meta", $e->getMessage());
-        }
-    }
-
-    public function findMetaObjectsByIndexPath($repositoryId, $indexPath, $userId, $userGroup, $offset = 0, $limit = 20, $orderBy = "date", $orderDir = "desc", $recurring = true)
-    {
-        if($this->sqlDriver["password"] == "XXXX") return array();
-        if(!dibi::isConnected()) {
-            dibi::connect($this->sqlDriver);
-        }
-        if($recurring){
-            $res = dibi::query("SELECT * FROM [ajxp_feed]
-                WHERE [etype] = %s AND [repository_id] = %s AND [index_path] LIKE %like~
-                ORDER BY %by %lmt %ofs
-            ", "meta", $repositoryId, $indexPath, array('edate' => $orderDir), $limit, $offset);
-        }else{
-            $res = dibi::query("SELECT * FROM [ajxp_feed]
-                WHERE [etype] = %s AND [repository_id] = %s AND [index_path] = %s
-                ORDER BY %by %lmt %ofs
-            ", "meta", $repositoryId, $indexPath, array('edate' => $orderDir), $limit, $offset);
-        }
-
-        $data = array();
-        foreach ($res as $n => $row) {
-            $object = new stdClass();
-            $object->path = $row->index_path;
-            $object->content = unserialize($row->content);
-            $object->author = $row->user_id;
-            $object->date = $row->edate;
-            $object->repository = $row->repository_id;
-            $object->uuid = $row->id;
-            $data[] = $object;
-        }
-        return $data;
-    }
-
-    public function updateMetaObject($repositoryId, $oldPath, $newPath = null, $copy = false)
-    {
-        if($this->sqlDriver["password"] == "XXXX") return array();
-        if(!dibi::isConnected()) {
-            dibi::connect($this->sqlDriver);
-        }
-        if ($oldPath != null && $newPath == null) {// DELETE
-
-            dibi::query("DELETE FROM [ajxp_feed] WHERE [repository_id]=%s and [index_path] LIKE %like~", $repositoryId, $oldPath);
-
-        } else if ($oldPath != null && $newPath != null) { // MOVE or COPY
-
-            if ($copy) {
-
-                // ?? Do we want to duplicate metadata?
-
-            } else {
-
-                $starter = "__START__";
-                dibi::query("UPDATE [ajxp_feed] SET [index_path] = CONCAT(%s, [index_path]) WHERE [index_path] LIKE %s AND [repository_id]=%s", $starter, $oldPath."%", $repositoryId);
-                dibi::query("UPDATE [ajxp_feed] SET [index_path] = REPLACE([index_path], %s, %s) WHERE [index_path] LIKE %s AND [repository_id]=%s", $starter.$oldPath, $starter.$newPath, $starter.$oldPath."%", $repositoryId);
-                dibi::query("UPDATE [ajxp_feed] SET [index_path] = REPLACE([index_path], %s, %s) WHERE [index_path] LIKE %s AND [repository_id]=%s", $starter, '', $starter.$newPath."%", $repositoryId);
-
-            }
-
-        }
-
-    }
-
-
-    public function installSQLTables($param)
-    {
-        $p = AJXP_Utils::cleanDibiDriverParameters($param["SQL_DRIVER"]);
-        return AJXP_Utils::runCreateTablesQuery($p, $this->getBaseDir()."/create.sql");
-    }
-
-}
diff --git a/core/src/plugins/feed.sql/i18n/conf/de.php b/core/src/plugins/feed.sql/i18n/conf/de.php
index cf9f09f757..6cfbc8aabf 100644
--- a/core/src/plugins/feed.sql/i18n/conf/de.php
+++ b/core/src/plugins/feed.sql/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Events SQL" => "Arbeitsbereich-Ereignisse in SQL-Datenbank",
diff --git a/core/src/plugins/feed.sql/i18n/conf/en.php b/core/src/plugins/feed.sql/i18n/conf/en.php
index ea4384cf30..e1664e9097 100644
--- a/core/src/plugins/feed.sql/i18n/conf/en.php
+++ b/core/src/plugins/feed.sql/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Events SQL" => "Events SQL",
diff --git a/core/src/plugins/feed.sql/manifest.xml b/core/src/plugins/feed.sql/manifest.xml
index 41660035a8..505a7b6e09 100644
--- a/core/src/plugins/feed.sql/manifest.xml
+++ b/core/src/plugins/feed.sql/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ajxp_plugin id="feed.sql" label="CONF_MESSAGE[Events SQL]" description="CONF_MESSAGE[Use an SQL based storage for persisting all user-space event logs]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd" mixins="dibidriver_consumer">
-    <class_definition classname="AJXP_SqlFeedStore" filename="plugins/feed.sql/class.AJXP_SqlFeedStore.php"/>
+    <class_definition classname="Pydio\Notification\Feed\SqlFeedStore" filename="plugins/feed.sql/SqlFeedStore.php"/>
     <server_settings>
         <param description="CONF_MESSAGE[SQL Connexion Parameters]" label="CONF_MESSAGE[SQL Driver]" name="SQL_DRIVER"
                       type="group_switch:dibi" mandatory="true" default="core"/>
diff --git a/core/src/plugins/gui.ajax/.gitignore b/core/src/plugins/gui.ajax/.gitignore
index ef1c925c0a..6475534a66 100644
--- a/core/src/plugins/gui.ajax/.gitignore
+++ b/core/src/plugins/gui.ajax/.gitignore
@@ -1,3 +1,6 @@
 res/js/core
 res/js/vendor/nodejs/bundle*
-res/js/pydio.min.js
\ No newline at end of file
+res/js/pydio.min.js
+res/js/ui/reactjs/build/
+res/mui/mui-sources
+/res/themes/orbit/css/allz.css
diff --git a/core/src/plugins/gui.ajax/AjaXplorerOrange.png b/core/src/plugins/gui.ajax/AjaXplorerOrange.png
deleted file mode 100644
index a826fcd97e..0000000000
Binary files a/core/src/plugins/gui.ajax/AjaXplorerOrange.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/AjxpLogo250.png b/core/src/plugins/gui.ajax/AjxpLogo250.png
deleted file mode 100644
index 25f2e2cb56..0000000000
Binary files a/core/src/plugins/gui.ajax/AjxpLogo250.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/Gruntfile.js b/core/src/plugins/gui.ajax/Gruntfile.js
index 91af4703c1..7fe5eddace 100644
--- a/core/src/plugins/gui.ajax/Gruntfile.js
+++ b/core/src/plugins/gui.ajax/Gruntfile.js
@@ -33,18 +33,17 @@ var gui_ajax_core = [
     'res/js/vendor/scriptaculous/src/slider.js',
     'res/js/vendor/prototype/cssfx.js',
     'res/js/vendor/prototype/proto.scroller.js',
-    'res/js/vendor/prototype/carousel.js',
     'res/js/vendor/prototype/accordion.js',
     'res/js/vendor/webfx/xtree.js',
     'res/js/vendor/webfx/ajxptree.js',
     'res/js/vendor/chosen/event.simulate.js',
     'res/js/vendor/chosen/chosen.proto.js',
+    'node_modules/he/he.js',
     'res/js/core/model/User.js',
     'res/js/core/http/ResourcesManager.js',
     'res/js/core/model/RemoteNodeProvider.js',
     'res/js/core/model/EmptyNodeProvider.js',
     'res/js/core/model/Repository.js',
-    'res/js/core/model/BackgroundTasksManager.js',
     'res/js/core/http/PydioApi.js',
     'res/js/core/http/PydioUsersApi.js',
     'res/js/core/http/MetaCacheService.js',
@@ -68,7 +67,6 @@ var gui_ajax_core = [
     'res/js/ui/prototype/class.TreeSelector.js',
     'res/js/ui/prototype/class.SliderInput.js',
     'res/js/ui/prototype/class.ActionsToolbar.js',
-    'res/js/ui/prototype/class.BackgroundManagerPane.js',
     'res/js/ui/prototype/class.HeaderResizer.js',
     'res/js/ui/prototype/class.PreviewFactory.js',
     'res/js/ui/prototype/class.FilesList.js',
diff --git a/core/src/plugins/gui.ajax/RichClient.php b/core/src/plugins/gui.ajax/RichClient.php
new file mode 100644
index 0000000000..a19005a6a5
--- /dev/null
+++ b/core/src/plugins/gui.ajax/RichClient.php
@@ -0,0 +1,528 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Gui;
+
+use DOMXPath;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Pydio\Core\Http\Middleware\SecureTokenMiddleware;
+use Pydio\Core\Http\Response\FileReaderResponse;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\AuthService;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Services\SessionService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Utils\Reflection\DiagnosticRunner;
+use Pydio\Core\Utils\Reflection\DocsParser;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Reflection\JSPacker;
+use Pydio\Core\Utils\Reflection\LocaleExtractor;
+
+use Pydio\Core\Utils\Vars\XMLFilter;
+use Pydio\Core\Controller\HTMLWriter;
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\PluginFramework\PluginsService;
+use Zend\Diactoros\Response\HtmlResponse;
+use Zend\Diactoros\Response\JsonResponse;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Class RichClient
+ * Serves the GUI
+ * @package Pydio\Gui
+ */
+class RichClient extends Plugin
+{
+    private static $loadedBookmarks;
+
+    /**
+     * Utilitary to pass some parameters directly at startup :
+     * + repository_id / folder
+     * + compile & skipDebug
+     * + update_i18n, extract, create
+     * + external_selector_type
+     * + skipIOS
+     * + gui
+     * @static
+     * @param ContextInterface $ctx
+     * @param $parameters
+     * @param $output
+     * @param $session
+     * @return void
+     */
+    public static function parseApplicationGetParameters(ContextInterface $ctx, $parameters, &$output, &$session)
+    {
+        $output["EXT_REP"] = "/";
+
+        if (isSet($parameters["repository_id"]) && isSet($parameters["folder"]) || isSet($parameters["goto"])) {
+            if (isSet($parameters["goto"])) {
+                $explode = explode("/", ltrim($parameters["goto"], "/"));
+                $repoId = array_shift($explode);
+                $parameters["folder"] = str_replace($repoId, "", ltrim($parameters["goto"], "/"));
+            } else {
+                $repoId = $parameters["repository_id"];
+            }
+            $repository = RepositoryService::getRepositoryById($repoId);
+            if ($repository == null) {
+                $repository = RepositoryService::getRepositoryByAlias($repoId);
+                if ($repository != null) {
+                    $parameters["repository_id"] = $repository->getId();
+                }
+            } else {
+                $parameters["repository_id"] = $repository->getId();
+            }
+            if (UsersService::usersEnabled()) {
+                $loggedUser = $ctx->getUser();
+                if ($loggedUser != null && $loggedUser->canSwitchTo($parameters["repository_id"])) {
+                    $output["FORCE_REGISTRY_RELOAD"] = true;
+                    $output["EXT_REP"] = urldecode($parameters["folder"]);
+                    $loggedUser->setArrayPref("history", "last_repository", $parameters["repository_id"]);
+                    $loggedUser->setPref("pending_folder", InputFilter::decodeSecureMagic($parameters["folder"]));
+                    AuthService::updateSessionUser($loggedUser);
+                } else {
+                    $session["PENDING_REPOSITORY_ID"] = $parameters["repository_id"];
+                    $session["PENDING_FOLDER"] = InputFilter::decodeSecureMagic($parameters["folder"]);
+                }
+            } else {
+                //ConfService::switchRootDir($parameters["repository_id"]);
+                $output["EXT_REP"] = urldecode($parameters["folder"]);
+            }
+        }
+
+
+        if (isSet($parameters["skipDebug"])) {
+            ConfService::setConf("JS_DEBUG", false);
+        }
+        if (ConfService::getConf("JS_DEBUG") && isSet($parameters["compile"])) {
+            JSPacker::pack();
+        }
+        if (ConfService::getConf("JS_DEBUG") && isSet($parameters["update_i18n"])) {
+            if (isSet($parameters["extract"])) {
+                LocaleExtractor::extractConfStringsFromManifests();
+            }
+            LocaleExtractor::updateAllI18nLibraries((isSet($parameters["create"]) ? $parameters["create"] : ""), (isSet($parameters["plugin"]) ? $parameters["plugin"] : ""));
+        }
+        if (ConfService::getConf("JS_DEBUG") && isSet($parameters["clear_plugins_cache"])) {
+            @unlink(AJXP_PLUGINS_CACHE_FILE);
+            @unlink(AJXP_PLUGINS_REQUIRES_FILE);
+        }
+        if (AJXP_SERVER_DEBUG && isSet($parameters["extract_application_hooks"])) {
+            DocsParser::extractHooksToDoc();
+        }
+
+        if (isSet($parameters["external_selector_type"])) {
+            $output["SELECTOR_DATA"] = array("type" => $parameters["external_selector_type"], "data" => $parameters);
+        }
+
+        if (isSet($parameters["skipIOS"])) {
+            setcookie("SKIP_IOS", "true");
+        }
+        if (isSet($parameters["skipANDROID"])) {
+            setcookie("SKIP_ANDROID", "true");
+        }
+        if (isSet($parameters["gui"])) {
+            setcookie("AJXP_GUI", $parameters["gui"]);
+            if ($parameters["gui"] == "light") $session["USE_EXISTING_TOKEN_IF_EXISTS"] = true;
+        } else {
+            if (isSet($session["USE_EXISTING_TOKEN_IF_EXISTS"])) {
+                unset($session["USE_EXISTING_TOKEN_IF_EXISTS"]);
+            }
+            setcookie("AJXP_GUI", null);
+        }
+        if (isSet($session["OVERRIDE_GUI_START_PARAMETERS"])) {
+            $output = array_merge($output, $session["OVERRIDE_GUI_START_PARAMETERS"]);
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    public function isEnabled()
+    {
+        return true;
+    }
+
+    /**
+     * Load the configs passed as parameter. This method will
+     * + Parse the config definitions and load the default values
+     * + Merge these values with the $configData parameter
+     * + Publish their value in the manifest if the global_param is "exposed" to the client.
+     * @param array $configData
+     * @return void
+     */
+    public function loadConfigs($configData)
+    {
+        parent::loadConfigs($configData);
+        if (!defined("AJXP_THEME_FOLDER")) {
+            define("CLIENT_RESOURCES_FOLDER", AJXP_PLUGINS_FOLDER."/gui.ajax/res");
+            define("AJXP_THEME_FOLDER", CLIENT_RESOURCES_FOLDER."/themes/".$this->pluginConf["GUI_THEME"]);
+        }
+        if (!isSet($configData["CLIENT_TIMEOUT_TIME"])) {
+            $this->pluginConf["CLIENT_TIMEOUT_TIME"] = intval(ini_get("session.gc_maxlifetime"));
+        }
+    }
+
+    /*******************
+     * ACTIONS METHODS
+     *******************/
+    /**
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     */
+    public function getBootConf(ServerRequestInterface &$request, ResponseInterface &$response){
+
+        /** @var ContextInterface $ctx */
+        $ctx = $request->getAttribute("ctx");
+        $out = array();
+        self::parseApplicationGetParameters($ctx, $request->getQueryParams(), $out, $_SESSION);
+        $config = $this->computeBootConf($ctx);
+        $response = new JsonResponse($config);
+
+    }
+        /**
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     */
+    public function getBootGui(ServerRequestInterface &$request, ResponseInterface &$response){
+
+        if (!defined("AJXP_THEME_FOLDER")) {
+            define("CLIENT_RESOURCES_FOLDER", AJXP_PLUGINS_FOLDER."/gui.ajax/res");
+            define("AJXP_THEME_FOLDER", CLIENT_RESOURCES_FOLDER."/themes/".$this->pluginConf["GUI_THEME"]);
+        }
+        $mess = LocaleService::getMessages();
+        /** @var ContextInterface $ctx */
+        $ctx = $request->getAttribute("ctx");
+
+        $httpVars = $request->getParsedBody();
+        HTMLWriter::internetExplorerMainDocumentHeader($response);
+
+        if (!is_file(TESTS_RESULT_FILE) && !is_file(TESTS_RESULT_FILE_LEGACY)) {
+            $outputArray = array();
+            $testedParams = array();
+            $passed = DiagnosticRunner::runTests($outputArray, $testedParams);
+            if (!$passed && !isset($httpVars["ignore_tests"])) {
+                $html = DiagnosticRunner::testResultsToTable($outputArray, $testedParams);
+                $response = new HtmlResponse($html);
+                return;
+            } else {
+                DiagnosticRunner::testResultsToFile($outputArray, $testedParams);
+            }
+        }
+
+        $root = parse_url($request->getServerParams()['REQUEST_URI'], PHP_URL_PATH);
+        $configUrl = ConfService::getGlobalConf("SERVER_URL");
+        if(!empty($configUrl)){
+            $root = '/'.ltrim(parse_url($configUrl, PHP_URL_PATH), '/');
+            if(strlen($root) > 1) $root = rtrim($root, '/').'/';
+        }else{
+            preg_match ('/ws-(.)*\/|settings|dashboard|welcome|user/', $root, $matches, PREG_OFFSET_CAPTURE);
+            if(count($matches)){
+                $capture = $matches[0][1];
+                $root = substr($root, 0, $capture);
+            }
+        }
+        $START_PARAMETERS = array(
+            "BOOTER_URL"        =>"index.php?get_action=get_boot_conf",
+            "MAIN_ELEMENT"      => "ajxp_desktop",
+            "APPLICATION_ROOT"  => $root,
+            "REBASE"            => $root
+        );
+        if($request->getAttribute("flash") !== null){
+            $START_PARAMETERS["ALERT"] = $request->getAttribute("flash");
+        }
+
+        self::parseApplicationGetParameters($ctx, $request->getQueryParams(), $START_PARAMETERS, $_SESSION);
+
+        $confErrors = ConfService::getErrors();
+        if (count($confErrors)) {
+            $START_PARAMETERS["ALERT"] = implode(", ", array_values($confErrors));
+        }
+        // PRECOMPUTE BOOT CONF
+        $userAgent = $request->getServerParams()['HTTP_USER_AGENT'];
+        if (!preg_match('/MSIE 7/',$userAgent) && !preg_match('/MSIE 8/',$userAgent)) {
+            $preloadedBootConf = $this->computeBootConf($ctx);
+            Controller::applyHook("loader.filter_boot_conf", array($ctx, &$preloadedBootConf));
+            $START_PARAMETERS["PRELOADED_BOOT_CONF"] = $preloadedBootConf;
+        }
+
+        // PRECOMPUTE REGISTRY
+        if (!isSet($START_PARAMETERS["FORCE_REGISTRY_RELOAD"])) {
+            $clone = PluginsService::getInstance($ctx)->getFilteredXMLRegistry(true, true);
+            if(!AJXP_SERVER_DEBUG){
+                $clonePath = new DOMXPath($clone);
+                $serverCallbacks = $clonePath->query("//serverCallback|hooks");
+                foreach ($serverCallbacks as $callback) {
+                    $callback->parentNode->removeChild($callback);
+                }
+            }
+            $START_PARAMETERS["PRELOADED_REGISTRY"] = XMLFilter::resolveKeywords($clone->saveXML());
+        }
+
+        $JSON_START_PARAMETERS = json_encode($START_PARAMETERS);
+        $crtTheme = $this->pluginConf["GUI_THEME"];
+        $additionalFrameworks = $this->getContextualOption($ctx, "JS_RESOURCES_BEFORE");
+        $ADDITIONAL_FRAMEWORKS = "";
+        if( !empty($additionalFrameworks) ){
+            $frameworkList = explode(",", $additionalFrameworks);
+            foreach($frameworkList as $index => $framework){
+                $frameworkList[$index] = '<script language="javascript" type="text/javascript" src="'.$framework.'"></script>'."\n";
+            }
+            $ADDITIONAL_FRAMEWORKS = implode("", $frameworkList);
+        }
+        if (ConfService::getConf("JS_DEBUG")) {
+            if (!isSet($mess)) {
+                $mess = LocaleService::getMessages();
+            }
+            if (is_file(AJXP_INSTALL_PATH."/plugins/gui.ajax/res/themes/$crtTheme/html/gui_debug.html")) {
+                include(AJXP_INSTALL_PATH."/plugins/gui.ajax/res/themes/$crtTheme/html/gui_debug.html");
+            } else {
+                include(AJXP_INSTALL_PATH."/plugins/gui.ajax/res/html/gui_debug.html");
+            }
+        } else {
+            if (is_file(AJXP_INSTALL_PATH."/plugins/gui.ajax/res/themes/$crtTheme/html/gui.html")) {
+                $content = file_get_contents(AJXP_INSTALL_PATH."/plugins/gui.ajax/res/themes/$crtTheme/html/gui.html");
+            } else {
+                $content = file_get_contents(AJXP_INSTALL_PATH."/plugins/gui.ajax/res/html/gui.html");
+            }
+            if (preg_match('/MSIE 7/',$userAgent)){
+                $ADDITIONAL_FRAMEWORKS = "";
+            }
+            $content = str_replace("AJXP_ADDITIONAL_JS_FRAMEWORKS", $ADDITIONAL_FRAMEWORKS, $content);
+            $content = XMLFilter::resolveKeywords($content, false);
+            $content = str_replace("AJXP_REBASE", isSet($START_PARAMETERS["REBASE"])?'<base href="'.$START_PARAMETERS["REBASE"].'"/>':"", $content);
+            if ($JSON_START_PARAMETERS) {
+                $content = str_replace("//AJXP_JSON_START_PARAMETERS", "startParameters = ".$JSON_START_PARAMETERS.";", $content);
+            }
+            $response->getBody()->write($content);
+        }
+
+    }
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @return bool
+     */
+    public function switchAction(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface)
+    {
+        if (!defined("AJXP_THEME_FOLDER")) {
+            define("CLIENT_RESOURCES_FOLDER", AJXP_PLUGINS_FOLDER."/gui.ajax/res");
+            define("AJXP_THEME_FOLDER", CLIENT_RESOURCES_FOLDER."/themes/".$this->pluginConf["GUI_THEME"]);
+        }
+
+        switch ($requestInterface->getAttribute("action")) {
+
+            case "serve_favicon":
+
+                $image = AJXP_THEME_FOLDER."/images/html-folder.png";
+                $reader = new FileReaderResponse($image);
+                $reader->setHeaderType("image");
+                $responseInterface = $responseInterface->withBody($reader);
+
+                break;
+
+            //------------------------------------
+            //	GET I18N MESSAGES
+            //------------------------------------
+            case "get_i18n_messages":
+
+                $refresh = false;
+                $httpVars = $requestInterface->getParsedBody();
+                if (isSet($httpVars["lang"])) {
+                    LocaleService::setLanguage($httpVars["lang"]);
+                    $refresh = true;
+                }
+                $responseInterface = new JsonResponse(LocaleService::getMessages($refresh));
+
+            break;
+
+            //------------------------------------
+            //	DISPLAY DOC
+            //------------------------------------
+            case "display_doc":
+
+                $responseInterface = $responseInterface->withHeader("Content-type", "text/plain;charset=UTF-8");
+                $docPath = InputFilter::securePath(htmlentities($requestInterface->getParsedBody()["doc_file"]));
+                $responseInterface->getBody()->write(HTMLWriter::getDocFile($docPath));
+
+            break;
+
+            
+            default;
+            break;
+        }
+
+        return false;
+    }
+
+    /************************
+     * HOOKS FOR BOOKMARKS
+     ************************/
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $ajxpNode
+     * @return void
+     */
+    public function nodeBookmarkMetadata(&$ajxpNode)
+    {
+        $user = $ajxpNode->getContext()->getUser();
+        if(empty($user)) return;
+        $metadata = $ajxpNode->retrieveMetadata("ajxp_bookmarked", true, AJXP_METADATA_SCOPE_REPOSITORY, true);
+        if (is_array($metadata) && count($metadata)) {
+            $ajxpNode->mergeMetadata(array(
+                     "ajxp_bookmarked" => "true",
+                     "overlay_icon"  => "bookmark.png",
+                     "overlay_class" => "icon-bookmark-empty"
+                ), true);
+            return;
+        }
+        if (!isSet(self::$loadedBookmarks)) {
+            self::$loadedBookmarks = $user->getBookmarks($ajxpNode->getRepositoryId());
+        }
+        foreach (self::$loadedBookmarks as $bm) {
+            if ($bm["PATH"] == $ajxpNode->getPath()) {
+                $ajxpNode->mergeMetadata(array(
+                         "ajxp_bookmarked" => "true",
+                         "overlay_icon"  => "bookmark.png",
+                        "overlay_class" => "icon-bookmark-empty"
+                    ), true);
+                $ajxpNode->setMetadata("ajxp_bookmarked", array("ajxp_bookmarked"=> "true"), true, AJXP_METADATA_SCOPE_REPOSITORY, true);
+            }
+        }
+    }
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $fromNode
+     * @param \Pydio\Access\Core\Model\AJXP_Node $toNode
+     * @param bool $copy
+     */
+    public function nodeChangeBookmarkMetadata($fromNode=null, $toNode=null, $copy=false){
+        if($copy || $fromNode == null) return;
+        $user = $fromNode->getContext()->getUser();
+        if($user == null) return;
+        if (!isSet(self::$loadedBookmarks)) {
+            self::$loadedBookmarks = $user->getBookmarks($fromNode->getRepositoryId());
+        }
+        if($toNode == null) {
+            $fromNode->removeMetadata("ajxp_bookmarked", true, AJXP_METADATA_SCOPE_REPOSITORY, true);
+        } else {
+            $toNode->copyOrMoveMetadataFromNode($fromNode, "ajxp_bookmarked", "move", true, AJXP_METADATA_SCOPE_REPOSITORY, true);
+        }
+        Controller::applyHook("msg.instant", array($fromNode->getContext(), "<reload_bookmarks/>", $user->getId()));
+    }
+
+
+    /************************
+     * XML.FILTER INCLUDE HOOK
+     ************************/
+    public static function filterXml(&$value)
+    {
+        $instance = PluginsService::getInstance(Context::emptyContext())->getPluginByTypeName("gui", "ajax");
+        if($instance === false) return null;
+        $confs = $instance->getConfigs();
+        $theme = $confs["GUI_THEME"];
+        if (!defined("AJXP_THEME_FOLDER")) {
+            define("CLIENT_RESOURCES_FOLDER", AJXP_PLUGINS_FOLDER."/gui.ajax/res");
+            define("AJXP_THEME_FOLDER", CLIENT_RESOURCES_FOLDER."/themes/".$theme);
+        }
+        $value = str_replace(array("AJXP_CLIENT_RESOURCES_FOLDER", "AJXP_CURRENT_VERSION"), array(CLIENT_RESOURCES_FOLDER, AJXP_VERSION), $value);
+        if (SessionService::has('PYDIO-SERVER-URI-PREFIX')) {
+            $value = str_replace("AJXP_THEME_FOLDER", SessionService::fetch('PYDIO-SERVER-URI-PREFIX')."plugins/gui.ajax/res/themes/".$theme, $value);
+        } else {
+            $value = str_replace("AJXP_THEME_FOLDER", "plugins/gui.ajax/res/themes/".$theme, $value);
+        }
+        return $value;
+    }
+
+    /************************
+     * PRIVATE FUNCTIONS
+     ************************/
+    /**
+     * @param ContextInterface $ctx
+     * @return array
+     */
+    private function computeBootConf(ContextInterface $ctx)
+    {
+        if (isSet($_GET["server_prefix_uri"])) {
+            SessionService::save('PYDIO-SERVER-URI-PREFIX', str_replace("_UP_", "..", $_GET["server_prefix_uri"]));
+        }
+        $currentIsMinisite = (strpos(session_name(), "AjaXplorer_Shared") === 0);
+        $config = array();
+        $config["ajxpResourcesFolder"] = "plugins/gui.ajax/res";
+        if ($currentIsMinisite) {
+            $config["ajxpServerAccess"] = "public/";
+        } else {
+            $config["ajxpServerAccess"] = AJXP_SERVER_ACCESS;
+        }
+        $config["zipEnabled"] = ConfService::zipBrowsingEnabled();
+        $config["multipleFilesDownloadEnabled"] = ConfService::zipCreationEnabled();
+        $customIcon = $this->getContextualOption($ctx, "CUSTOM_ICON");
+        self::filterXml($customIcon);
+        $config["customWording"] = array(
+            "welcomeMessage" => $this->getContextualOption($ctx, "CUSTOM_WELCOME_MESSAGE"),
+            "title"			 => ConfService::getGlobalConf("APPLICATION_TITLE"),
+            "icon"			 => $customIcon,
+            "iconWidth"		 => $this->getContextualOption($ctx, "CUSTOM_ICON_WIDTH"),
+            "iconHeight"     => $this->getContextualOption($ctx, "CUSTOM_ICON_HEIGHT"),
+            "iconOnly"       => $this->getContextualOption($ctx, "CUSTOM_ICON_ONLY"),
+            "titleFontSize"	 => $this->getContextualOption($ctx, "CUSTOM_FONT_SIZE")
+        );
+        $cIcBin = $this->getContextualOption($ctx, "CUSTOM_ICON_BINARY");
+        if (!empty($cIcBin)) {
+            $config["customWording"]["icon_binary_url"] = "get_action=get_global_binary_param&binary_id=".$cIcBin;
+        }
+        $config["usersEnabled"] = UsersService::usersEnabled();
+        $config["loggedUser"] = ($ctx->hasUser());
+        $config["currentLanguage"] = LocaleService::getLanguage();
+        $config["session_timeout"] = intval(ini_get("session.gc_maxlifetime"));
+        $timeoutTime = $this->getContextualOption($ctx, "CLIENT_TIMEOUT_TIME");
+        if (empty($timeoutTime)) {
+            $to = $config["session_timeout"];
+        } else {
+            $to = $timeoutTime;
+        }
+        if($currentIsMinisite) $to = -1;
+        $config["client_timeout"] = intval($to);
+        $config["client_timeout_warning"] = floatval($this->getContextualOption($ctx, "CLIENT_TIMEOUT_WARN"));
+        $config["availableLanguages"] = LocaleService::listAvailableLanguages();
+        $config["usersEditable"] = ConfService::getAuthDriverImpl()->usersEditable();
+        $config["ajxpVersion"] = AJXP_VERSION;
+        $config["ajxpVersionDate"] = AJXP_VERSION_DATE;
+        $analytic = $this->getContextualOption($ctx, 'GOOGLE_ANALYTICS_ID');
+        if (!empty($analytic)) {
+            $config["googleAnalyticsData"] = array(
+                "id"=> 		$analytic,
+                "domain" => $this->getContextualOption($ctx, 'GOOGLE_ANALYTICS_DOMAIN'),
+                "event" => 	$this->getContextualOption($ctx, 'GOOGLE_ANALYTICS_EVENT')
+            );
+        }
+        $config["i18nMessages"] = LocaleService::getMessages();
+        $config["SECURE_TOKEN"] = SecureTokenMiddleware::generateSecureToken();
+        $config["streaming_supported"] = "true";
+        $config["theme"] = $this->pluginConf["GUI_THEME"];
+        return $config;
+    }
+
+}
+
+Controller::registerIncludeHook("xml.filter", array("Pydio\\Gui\\RichClient", "filterXml"));
diff --git a/core/src/plugins/gui.ajax/ajxpclient_actions.xml b/core/src/plugins/gui.ajax/ajxpclient_actions.xml
index d5fd46fd6c..f00cd84fd5 100644
--- a/core/src/plugins/gui.ajax/ajxpclient_actions.xml
+++ b/core/src/plugins/gui.ajax/ajxpclient_actions.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <registry_contributions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
 	<actions>
-		<action name="get_template">
-			<processing>
-				<serverCallback methodName="switchAction"/>
-			</processing>
-		</action>
 		<action name="get_i18n_messages">
 			<processing>
 				<serverCallback methodName="switchAction" restParams="/" developerComment="Load the list of translation strings">
@@ -13,6 +8,11 @@
 				</serverCallback>
 			</processing>
 		</action>
+		<action name="serve_favicon" skipSecureToken="true">
+			<processing>
+				<serverCallback methodName="switchAction" restParams="/" developerComment="Return site favicon"/>
+			</processing>
+		</action>
 		<action name="display_doc">
 			<processing>
 				<serverCallback methodName="switchAction" restParams="/doc_file" developerComment="Load a doc file">
diff --git a/core/src/plugins/gui.ajax/class.AJXP_ClientDriver.php b/core/src/plugins/gui.ajax/class.AJXP_ClientDriver.php
deleted file mode 100644
index 62fc3b02ee..0000000000
--- a/core/src/plugins/gui.ajax/class.AJXP_ClientDriver.php
+++ /dev/null
@@ -1,388 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * User Interface main implementation
- * @package AjaXplorer_Plugins
- * @subpackage Gui
- */
-class AJXP_ClientDriver extends AJXP_Plugin
-{
-    private static $loadedBookmarks;
-
-    public function isEnabled()
-    {
-        return true;
-    }
-
-    public function loadConfigs($configData)
-    {
-        parent::loadConfigs($configData);
-        if (!defined("AJXP_THEME_FOLDER")) {
-            define("CLIENT_RESOURCES_FOLDER", AJXP_PLUGINS_FOLDER."/gui.ajax/res");
-            define("AJXP_THEME_FOLDER", CLIENT_RESOURCES_FOLDER."/themes/".$this->pluginConf["GUI_THEME"]);
-        }
-        if (!isSet($configData["CLIENT_TIMEOUT_TIME"])) {
-            $this->pluginConf["CLIENT_TIMEOUT_TIME"] = intval(ini_get("session.gc_maxlifetime"));
-        }
-    }
-
-    public function switchAction($action, $httpVars, $fileVars)
-    {
-        if (!defined("AJXP_THEME_FOLDER")) {
-            define("CLIENT_RESOURCES_FOLDER", AJXP_PLUGINS_FOLDER."/gui.ajax/res");
-            define("AJXP_THEME_FOLDER", CLIENT_RESOURCES_FOLDER."/themes/".$this->pluginConf["GUI_THEME"]);
-        }
-        foreach ($httpVars as $getName=>$getValue) {
-            $$getName = AJXP_Utils::securePath($getValue);
-        }
-        $mess = ConfService::getMessages();
-
-        switch ($action) {
-            //------------------------------------
-            //	GET AN HTML TEMPLATE
-            //------------------------------------
-            case "get_template":
-
-                HTMLWriter::charsetHeader();
-                $folder = CLIENT_RESOURCES_FOLDER."/html";
-                if (isSet($httpVars["pluginName"])) {
-                    $folder = AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/".AJXP_Utils::securePath($httpVars["pluginName"]);
-                    if (isSet($httpVars["pluginPath"])) {
-                        $folder.= "/".AJXP_Utils::securePath($httpVars["pluginPath"]);
-                    }
-                }
-                $thFolder = AJXP_THEME_FOLDER."/html";
-                if (isset($template_name)) {
-                    if (is_file($thFolder."/".$template_name)) {
-                        include($thFolder."/".$template_name);
-                    } else if (is_file($folder."/".$template_name)) {
-                        include($folder."/".$template_name);
-                    }
-                }
-
-            break;
-
-            //------------------------------------
-            //	GET I18N MESSAGES
-            //------------------------------------
-            case "get_i18n_messages":
-
-                $refresh = false;
-                if (isSet($httpVars["lang"])) {
-                    ConfService::setLanguage($httpVars["lang"]);
-                    $refresh = true;
-                }
-                if(isSet($httpVars["format"]) && $httpVars["format"] == "json"){
-                    HTMLWriter::charsetHeader("application/json");
-                    echo json_encode(ConfService::getMessages($refresh));
-                }else{
-                    HTMLWriter::charsetHeader('text/javascript');
-                    HTMLWriter::writeI18nMessagesClass(ConfService::getMessages($refresh));
-                }
-
-            break;
-
-            //------------------------------------
-            //	DISPLAY DOC
-            //------------------------------------
-            case "display_doc":
-
-                HTMLWriter::charsetHeader();
-                echo HTMLWriter::getDocFile(AJXP_Utils::securePath(htmlentities($httpVars["doc_file"])));
-
-            break;
-
-
-            //------------------------------------
-            //	GET BOOT GUI
-            //------------------------------------
-            case "get_boot_gui":
-
-                HTMLWriter::internetExplorerMainDocumentHeader();
-                HTMLWriter::charsetHeader();
-
-                if (!is_file(TESTS_RESULT_FILE)) {
-                    $outputArray = array();
-                    $testedParams = array();
-                    $passed = AJXP_Utils::runTests($outputArray, $testedParams);
-                    if (!$passed && !isset($httpVars["ignore_tests"])) {
-                        AJXP_Utils::testResultsToTable($outputArray, $testedParams);
-                        die();
-                    } else {
-                        AJXP_Utils::testResultsToFile($outputArray, $testedParams);
-                    }
-                }
-
-                $root = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);
-                $configUrl = ConfService::getCoreConf("SERVER_URL");
-                if(!empty($configUrl)){
-                    $root = '/'.ltrim(parse_url($configUrl, PHP_URL_PATH), '/');
-                    if(strlen($root) > 1) $root = rtrim($root, '/').'/';
-                }else{
-                    preg_match ('/ws-(.)*\/|settings|dashboard|welcome|user/', $root, $matches, PREG_OFFSET_CAPTURE);
-                    if(count($matches)){
-                        $capture = $matches[0][1];
-                        $root = substr($root, 0, $capture);
-                    }
-                }
-                $START_PARAMETERS = array(
-                    "BOOTER_URL"        =>"index.php?get_action=get_boot_conf",
-                    "MAIN_ELEMENT"      => "ajxp_desktop",
-                    "APPLICATION_ROOT"  => $root,
-                    "REBASE"            => $root
-                );
-                if (AuthService::usersEnabled()) {
-                    AuthService::preLogUser((isSet($httpVars["remote_session"])?$httpVars["remote_session"]:""));
-                    AuthService::bootSequence($START_PARAMETERS);
-                    if (AuthService::getLoggedUser() != null || AuthService::logUser(null, null) == 1) {
-                        if (AuthService::getDefaultRootId() == -1) {
-                            AuthService::disconnect();
-                        } else {
-                            $loggedUser = AuthService::getLoggedUser();
-                            if(!$loggedUser->canRead(ConfService::getCurrentRepositoryId())
-                                    && AuthService::getDefaultRootId() != ConfService::getCurrentRepositoryId())
-                            {
-                                ConfService::switchRootDir(AuthService::getDefaultRootId());
-                            }
-                        }
-                    }
-                }
-
-                AJXP_Utils::parseApplicationGetParameters($_GET, $START_PARAMETERS, $_SESSION);
-
-                $confErrors = ConfService::getErrors();
-                if (count($confErrors)) {
-                    $START_PARAMETERS["ALERT"] = implode(", ", array_values($confErrors));
-                }
-                // PRECOMPUTE BOOT CONF
-                if (!preg_match('/MSIE 7/',$_SERVER['HTTP_USER_AGENT']) && !preg_match('/MSIE 8/',$_SERVER['HTTP_USER_AGENT'])) {
-                    $preloadedBootConf = $this->computeBootConf();
-                    AJXP_Controller::applyHook("loader.filter_boot_conf", array(&$preloadedBootConf));
-                    $START_PARAMETERS["PRELOADED_BOOT_CONF"] = $preloadedBootConf;
-                }
-
-                // PRECOMPUTE REGISTRY
-                if (!isSet($START_PARAMETERS["FORCE_REGISTRY_RELOAD"])) {
-                    $clone = ConfService::getFilteredXMLRegistry(true, true);
-                    $clonePath = new DOMXPath($clone);
-                    $serverCallbacks = $clonePath->query("//serverCallback|hooks");
-                    foreach ($serverCallbacks as $callback) {
-                        $callback->parentNode->removeChild($callback);
-                    }
-                    $START_PARAMETERS["PRELOADED_REGISTRY"] = AJXP_XMLWriter::replaceAjxpXmlKeywords($clone->saveXML());
-                }
-
-                $JSON_START_PARAMETERS = json_encode($START_PARAMETERS);
-                $crtTheme = $this->pluginConf["GUI_THEME"];
-                $additionalFrameworks = $this->getFilteredOption("JS_RESOURCES_BEFORE");
-                $ADDITIONAL_FRAMEWORKS = "";
-                if( !empty($additionalFrameworks) ){
-                    $frameworkList = explode(",", $additionalFrameworks);
-                    foreach($frameworkList as $index => $framework){
-                        $frameworkList[$index] = '<script language="javascript" type="text/javascript" src="'.$framework.'"></script>'."\n";
-                    }
-                    $ADDITIONAL_FRAMEWORKS = implode("", $frameworkList);
-                }
-                if (ConfService::getConf("JS_DEBUG")) {
-                    if (!isSet($mess)) {
-                        $mess = ConfService::getMessages();
-                    }
-                    if (is_file(AJXP_INSTALL_PATH."/plugins/gui.ajax/res/themes/$crtTheme/html/gui_debug.html")) {
-                        include(AJXP_INSTALL_PATH."/plugins/gui.ajax/res/themes/$crtTheme/html/gui_debug.html");
-                    } else {
-                        include(AJXP_INSTALL_PATH."/plugins/gui.ajax/res/html/gui_debug.html");
-                    }
-                } else {
-                    if (is_file(AJXP_INSTALL_PATH."/plugins/gui.ajax/res/themes/$crtTheme/html/gui.html")) {
-                        $content = file_get_contents(AJXP_INSTALL_PATH."/plugins/gui.ajax/res/themes/$crtTheme/html/gui.html");
-                    } else {
-                        $content = file_get_contents(AJXP_INSTALL_PATH."/plugins/gui.ajax/res/html/gui.html");
-                    }
-                    if (preg_match('/MSIE 7/',$_SERVER['HTTP_USER_AGENT'])){
-                        $ADDITIONAL_FRAMEWORKS = "";
-                    }
-                    $content = str_replace("AJXP_ADDITIONAL_JS_FRAMEWORKS", $ADDITIONAL_FRAMEWORKS, $content);
-                    $content = AJXP_XMLWriter::replaceAjxpXmlKeywords($content, false);
-                    $content = str_replace("AJXP_REBASE", isSet($START_PARAMETERS["REBASE"])?'<base href="'.$START_PARAMETERS["REBASE"].'"/>':"", $content);
-                    if ($JSON_START_PARAMETERS) {
-                        $content = str_replace("//AJXP_JSON_START_PARAMETERS", "startParameters = ".$JSON_START_PARAMETERS.";", $content);
-                    }
-                    print($content);
-                }
-            break;
-            //------------------------------------
-            //	GET CONFIG FOR BOOT
-            //------------------------------------
-            case "get_boot_conf":
-
-                $out = array();
-                AJXP_Utils::parseApplicationGetParameters($_GET, $out, $_SESSION);
-                $config = $this->computeBootConf();
-                header("Content-type:application/json;charset=UTF-8");
-                print(json_encode($config));
-
-            break;
-
-            default;
-            break;
-        }
-
-        return false;
-    }
-
-    public function computeBootConf()
-    {
-        if (isSet($_GET["server_prefix_uri"])) {
-            $_SESSION["AJXP_SERVER_PREFIX_URI"] = str_replace("_UP_", "..", $_GET["server_prefix_uri"]);
-        }
-        $currentIsMinisite = (strpos(session_name(), "AjaXplorer_Shared") === 0);
-        $config = array();
-        $config["ajxpResourcesFolder"] = "plugins/gui.ajax/res";
-        if ($currentIsMinisite) {
-            $config["ajxpServerAccess"] = "index_shared.php";
-        } else {
-            $config["ajxpServerAccess"] = AJXP_SERVER_ACCESS;
-        }
-        $config["zipEnabled"] = ConfService::zipBrowsingEnabled();
-        $config["multipleFilesDownloadEnabled"] = ConfService::zipCreationEnabled();
-        $customIcon = $this->getFilteredOption("CUSTOM_ICON");
-        self::filterXml($customIcon);
-        $config["customWording"] = array(
-            "welcomeMessage" => $this->getFilteredOption("CUSTOM_WELCOME_MESSAGE"),
-            "title"			 => ConfService::getCoreConf("APPLICATION_TITLE"),
-            "icon"			 => $customIcon,
-            "iconWidth"		 => $this->getFilteredOption("CUSTOM_ICON_WIDTH"),
-            "iconHeight"     => $this->getFilteredOption("CUSTOM_ICON_HEIGHT"),
-            "iconOnly"       => $this->getFilteredOption("CUSTOM_ICON_ONLY"),
-            "titleFontSize"	 => $this->getFilteredOption("CUSTOM_FONT_SIZE")
-        );
-        $cIcBin = $this->getFilteredOption("CUSTOM_ICON_BINARY");
-        if (!empty($cIcBin)) {
-            $config["customWording"]["icon_binary_url"] = "get_action=get_global_binary_param&binary_id=".$cIcBin;
-        }
-        $config["usersEnabled"] = AuthService::usersEnabled();
-        $config["loggedUser"] = (AuthService::getLoggedUser()!=null);
-        $config["currentLanguage"] = ConfService::getLanguage();
-        $config["session_timeout"] = intval(ini_get("session.gc_maxlifetime"));
-        $timeoutTime = $this->getFilteredOption("CLIENT_TIMEOUT_TIME");
-        if (empty($timeoutTime)) {
-            $to = $config["session_timeout"];
-        } else {
-            $to = $timeoutTime;
-        }
-        if($currentIsMinisite) $to = -1;
-        $config["client_timeout"] = intval($to);
-        $config["client_timeout_warning"] = floatval($this->getFilteredOption("CLIENT_TIMEOUT_WARN"));
-        $config["availableLanguages"] = ConfService::getConf("AVAILABLE_LANG");
-        $config["usersEditable"] = ConfService::getAuthDriverImpl()->usersEditable();
-        $config["ajxpVersion"] = AJXP_VERSION;
-        $config["ajxpVersionDate"] = AJXP_VERSION_DATE;
-        $analytic = $this->getFilteredOption('GOOGLE_ANALYTICS_ID');
-        if (!empty($analytic)) {
-            $config["googleAnalyticsData"] = array(
-                "id"=> 		$analytic,
-                "domain" => $this->getFilteredOption('GOOGLE_ANALYTICS_DOMAIN'),
-                "event" => 	$this->getFilteredOption('GOOGLE_ANALYTICS_EVENT')
-            );
-        }
-        $config["i18nMessages"] = ConfService::getMessages();
-        $config["SECURE_TOKEN"] = AuthService::generateSecureToken();
-        $config["streaming_supported"] = "true";
-        $config["theme"] = $this->pluginConf["GUI_THEME"];
-        return $config;
-    }
-
-    /**
-     * @param AJXP_Node $ajxpNode
-     * @return void
-     */
-    public function nodeBookmarkMetadata(&$ajxpNode)
-    {
-        $user = AuthService::getLoggedUser();
-        if($user == null) return;
-        $metadata = $ajxpNode->retrieveMetadata("ajxp_bookmarked", true, AJXP_METADATA_SCOPE_REPOSITORY, true);
-        if (is_array($metadata) && count($metadata)) {
-            $ajxpNode->mergeMetadata(array(
-                     "ajxp_bookmarked" => "true",
-                     "overlay_icon"  => "bookmark.png",
-                     "overlay_class" => "icon-bookmark-empty"
-                ), true);
-            return;
-        }
-        if (!isSet(self::$loadedBookmarks)) {
-            self::$loadedBookmarks = $user->getBookmarks();
-        }
-        foreach (self::$loadedBookmarks as $bm) {
-            if ($bm["PATH"] == $ajxpNode->getPath()) {
-                $ajxpNode->mergeMetadata(array(
-                         "ajxp_bookmarked" => "true",
-                         "overlay_icon"  => "bookmark.png",
-                        "overlay_class" => "icon-bookmark-empty"
-                    ), true);
-                $ajxpNode->setMetadata("ajxp_bookmarked", array("ajxp_bookmarked"=> "true"), true, AJXP_METADATA_SCOPE_REPOSITORY, true);
-            }
-        }
-    }
-
-    /**
-     * @param AJXP_Node $fromNode
-     * @param AJXP_Node $toNode
-     * @param bool $copy
-     */
-    public function nodeChangeBookmarkMetadata($fromNode=null, $toNode=null, $copy=false){
-        if($copy || $fromNode == null) return;
-        $user = AuthService::getLoggedUser();
-        if($user == null) return;
-        if (!isSet(self::$loadedBookmarks)) {
-            self::$loadedBookmarks = $user->getBookmarks();
-        }
-        if($toNode == null) {
-            $fromNode->removeMetadata("ajxp_bookmarked", true, AJXP_METADATA_SCOPE_REPOSITORY, true);
-        } else {
-            $toNode->copyOrMoveMetadataFromNode($fromNode, "ajxp_bookmarked", "move", true, AJXP_METADATA_SCOPE_REPOSITORY, true);
-        }
-        AJXP_Controller::applyHook("msg.instant", array("<reload_bookmarks/>", $fromNode->getRepositoryId(), AuthService::getLoggedUser()->getId()));
-    }
-
-    public static function filterXml(&$value)
-    {
-        $instance = AJXP_PluginsService::getInstance()->findPlugin("gui", "ajax");
-        if($instance === false) return null;
-        $confs = $instance->getConfigs();
-        $theme = $confs["GUI_THEME"];
-        if (!defined("AJXP_THEME_FOLDER")) {
-            define("CLIENT_RESOURCES_FOLDER", AJXP_PLUGINS_FOLDER."/gui.ajax/res");
-            define("AJXP_THEME_FOLDER", CLIENT_RESOURCES_FOLDER."/themes/".$theme);
-        }
-        $value = str_replace(array("AJXP_CLIENT_RESOURCES_FOLDER", "AJXP_CURRENT_VERSION"), array(CLIENT_RESOURCES_FOLDER, AJXP_VERSION), $value);
-        if (isSet($_SESSION["AJXP_SERVER_PREFIX_URI"])) {
-            $value = str_replace("AJXP_THEME_FOLDER", $_SESSION["AJXP_SERVER_PREFIX_URI"]."plugins/gui.ajax/res/themes/".$theme, $value);
-        } else {
-            $value = str_replace("AJXP_THEME_FOLDER", "plugins/gui.ajax/res/themes/".$theme, $value);
-        }
-        return $value;
-    }
-}
-
-AJXP_Controller::registerIncludeHook("xml.filter", array("AJXP_ClientDriver", "filterXml"));
diff --git a/core/src/plugins/gui.ajax/gui-ajax-umbra.png b/core/src/plugins/gui.ajax/gui-ajax-umbra.png
deleted file mode 100644
index 4e8ae4ef00..0000000000
Binary files a/core/src/plugins/gui.ajax/gui-ajax-umbra.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/manifest.xml b/core/src/plugins/gui.ajax/manifest.xml
index 5bf56b4138..d7a8f99c57 100644
--- a/core/src/plugins/gui.ajax/manifest.xml
+++ b/core/src/plugins/gui.ajax/manifest.xml
@@ -13,7 +13,7 @@
         </resources>
     </client_settings>
 	<server_settings>
-        <global_param name="GUI_THEME" group="CONF_MESSAGE[Main Options]" type="select" choices="orbit|Orbit,umbra|Umbra (Legacy - Discouraged),vision|Vision (Legacy - Discouraged)," label="CONF_MESSAGE[Theme]" description="CONF_MESSAGE[Theme used for display]" mandatory="true" default="orbit"/>
+        <global_param name="GUI_THEME" group="CONF_MESSAGE[Main Options]" type="select" choices="orbit|Orbit" label="CONF_MESSAGE[Theme]" description="CONF_MESSAGE[Theme used for display]" mandatory="true" default="orbit"/>
         <global_param name="JS_RESOURCES_BEFORE" group="CONF_MESSAGE[Main Options]" type="string" label="CONF_MESSAGE[Additional JS frameworks]" description="CONF_MESSAGE[Additional JS frameworks description]" mandatory="false" default="plugins/gui.ajax/res/js/jquery_backbone-min.js"/>
         <global_param name="CUSTOM_WELCOME_MESSAGE" group="CONF_MESSAGE[Login Screen]" type="string" label="CONF_MESSAGE[Welcome Message]" description="CONF_MESSAGE[An additionnal message displayed in the start up screen]" mandatory="false" default="Welcome to Pydio"/>
         <global_param name="CUSTOM_ICON_ONLY" group="CONF_MESSAGE[Login Screen]" type="boolean" label="CONF_MESSAGE[Icon Only]" description="CONF_MESSAGE[Skip the title, only display an image]" mandatory="false" default="true"/>
@@ -41,7 +41,7 @@
                       editable="true"
                       uploadAction="store_binary_temp"
                       loadAction="get_global_binary_param"
-                      defaultImage="plugins/gui.ajax/res/themes/vision/images/white_logo.png"
+                      defaultImage="AJXP_THEME_FOLDER/images/white_logo.png"
                       expose="true"
                 />
         <global_param name="CUSTOM_TOP_LOGO_H" group="CONF_MESSAGE[Top Toolbar]" type="integer" label="CONF_MESSAGE[Logo Height]" description="CONF_MESSAGE[Manually set a logo height]" mandatory="false" default="39" expose="true"/>
@@ -58,7 +58,7 @@
                       editable="true"
                       uploadAction="store_binary_temp"
                       loadAction="get_global_binary_param"
-                      defaultImage="plugins/gui.ajax/res/themes/orbit/images/hires-photos/01.jpg"
+                      defaultImage="AJXP_THEME_FOLDER/images/hires-photos/01.jpg"
                       expose="true"
                 />
         <global_param name="WELCOME_PAGE_BACKGROUND_ATTRIBUTES_1" group="CONF_MESSAGE[Page Background Images]" type="select"
@@ -70,7 +70,7 @@
                       editable="true"
                       uploadAction="store_binary_temp"
                       loadAction="get_global_binary_param"
-                      defaultImage="plugins/gui.ajax/res/themes/orbit/images/hires-photos/02.jpg"
+                      defaultImage="AJXP_THEME_FOLDER/images/hires-photos/02.jpg"
                       expose="true"
                 />
         <global_param name="WELCOME_PAGE_BACKGROUND_ATTRIBUTES_2" group="CONF_MESSAGE[Page Background Images]" type="select"
@@ -82,7 +82,7 @@
                       editable="true"
                       uploadAction="store_binary_temp"
                       loadAction="get_global_binary_param"
-                      defaultImage="plugins/gui.ajax/res/themes/orbit/images/hires-photos/03.jpg"
+                      defaultImage="AJXP_THEME_FOLDER/images/hires-photos/03.jpg"
                       expose="true"
                 />
         <global_param name="WELCOME_PAGE_BACKGROUND_ATTRIBUTES_3" group="CONF_MESSAGE[Page Background Images]" type="select"
@@ -94,7 +94,7 @@
                       editable="true"
                       uploadAction="store_binary_temp"
                       loadAction="get_global_binary_param"
-                      defaultImage="plugins/gui.ajax/res/themes/orbit/images/hires-photos/04.jpg"
+                      defaultImage="AJXP_THEME_FOLDER/images/hires-photos/04.jpg"
                       expose="true"
                 />
         <global_param name="WELCOME_PAGE_BACKGROUND_ATTRIBUTES_4" group="CONF_MESSAGE[Page Background Images]" type="select"
@@ -106,7 +106,7 @@
                       editable="true"
                       uploadAction="store_binary_temp"
                       loadAction="get_global_binary_param"
-                      defaultImage="plugins/gui.ajax/res/themes/orbit/images/hires-photos/05.jpg"
+                      defaultImage="AJXP_THEME_FOLDER/images/hires-photos/05.jpg"
                       expose="true"
                 />
         <global_param name="WELCOME_PAGE_BACKGROUND_ATTRIBUTES_5" group="CONF_MESSAGE[Page Background Images]" type="select"
@@ -130,7 +130,7 @@
                       editable="true"
                       uploadAction="store_binary_temp"
                       loadAction="get_global_binary_param"
-                      defaultImage="plugins/gui.ajax/res/themes/orbit/images/hires-photos/03-mobile.jpg"
+                      defaultImage="AJXP_THEME_FOLDER/images/hires-photos/03-mobile.jpg"
                       expose="true"
                 />
 
@@ -143,7 +143,7 @@
                       editable="true"
                       uploadAction="store_binary_temp"
                       loadAction="get_global_binary_param"
-                      defaultImage="plugins/gui.ajax/res/themes/orbit/images/hires-photos/02.jpg"
+                      defaultImage="AJXP_THEME_FOLDER/images/hires-photos/02.jpg"
                       expose="true"
                 />
         <global_param name="CUSTOM_SHAREPAGE_BACKGROUND_ATTRIBUTES_1" group="CONF_MESSAGE[Minisite]" type="select"
@@ -154,7 +154,7 @@
                       editable="true"
                       uploadAction="store_binary_temp"
                       loadAction="get_global_binary_param"
-                      defaultImage="plugins/gui.ajax/res/themes/orbit/images/hires-photos/03.jpg"
+                      defaultImage="AJXP_THEME_FOLDER/images/hires-photos/03.jpg"
                       expose="true"
                 />
         <global_param name="CUSTOM_SHAREPAGE_BACKGROUND_ATTRIBUTES_2" group="CONF_MESSAGE[Minisite]" type="select"
@@ -164,7 +164,7 @@
                       editable="true"
                       uploadAction="store_binary_temp"
                       loadAction="get_global_binary_param"
-                      defaultImage="plugins/gui.ajax/res/themes/orbit/images/hires-photos/05.jpg"
+                      defaultImage="AJXP_THEME_FOLDER/images/hires-photos/05.jpg"
                       expose="true"
                 />
         <global_param name="CUSTOM_SHAREPAGE_BACKGROUND_ATTRIBUTES_3" group="CONF_MESSAGE[Minisite]" type="select"
@@ -181,150 +181,39 @@
                 />
 
 	</server_settings>
-	<class_definition filename="plugins/gui.ajax/class.AJXP_ClientDriver.php" classname="AJXP_ClientDriver"/>
+	<class_definition filename="plugins/gui.ajax/RichClient.php" classname="Pydio\Gui\RichClient"/>
 	<registry_contributions>
 		<actions>
 			<action name="get_boot_gui" skipSecureToken="true">
 				<processing>
-					<serverCallback methodName="switchAction"></serverCallback>
+					<serverCallback methodName="getBootGui"/>
 				</processing>
 			</action>
 			<action name="get_boot_conf" skipSecureToken="true">
 				<processing>
-					<serverCallback methodName="switchAction"></serverCallback>
+					<serverCallback methodName="getBootConf"/>
 				</processing>
 			</action>
 		</actions>
         <hooks>
-            <serverCallback hookName="node.info" methodName="nodeBookmarkMetadata"/>
+            <serverCallback hookName="node.info.nocache" methodName="nodeBookmarkMetadata"/>
             <serverCallback hookName="node.change" methodName="nodeChangeBookmarkMetadata"/>
         </hooks>
 		<external_file filename="plugins/gui.ajax/ajxpclient_actions.xml" include="actions/*" exclude=""/>
 		<client_configs uuidAttr="name">
-			<template name="main_oxygen" element="ajxp_desktop" position="top" theme="oxygen"><![CDATA[
-				<div id="toolbars">
-					<div id="action_bar">
-						<div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar"></div>
-						<div id="locationbar_cont">
-							<div style="height: 100%;" class="separator"></div>
-							<div style="padding-top : 5px;">
-								<div id="repo_chooser" ajxpClass="RepositorySelect"></div>
-								<div id="locationBar" ajxpClass="LocationBar" ajxpOptions='{"flexTo":"locationbar_cont"}'></div>
-								<div id="logging_string" ajxpClass="UserWidget"></div>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div id="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop"}'>
-					<div id="vertical_splitter" style="background-color: #fff;" ajxpClass="Splitter" ajxpOptions='{"direction": "vertical", "initA": 200, "maxA":600, "minA":50,"fit":"height","fitParent":"browser"}'>
-						<div id="sidebar_splitter" style="float:left; overflow:hidden;" ajxpClass="Splitter" ajxpOptions='{"direction":"horizontal","initB":200,"minB":24,"maxB":500}'>
-							<div id="topPane" ajxpClass="FoldersTree" ajxpOptions='{"display":"dz"}' ajxpPaneHeader="130" style="border: 1px solid #676965;"></div>
-					    	<div id="bottomSplitPane" ajxpClass="AjxpTabulator" style="border: 1px solid #676965;" ajxpOptions='{"defaultTabId": "info","tabInfos" : [{"id":"info","label":"131","icon":"file_info.png","element":"info_panel"},{"id":"search","label":"87","icon":"search.png","element":"search_container"}]}'>
-						    	<div id="search_container" ajxpClass="SearchEngine"></div>
-						    	<div id="info_panel" ajxpClass="InfoPanel"></div>
-					    	</div>
-					    </div>
-						<div id="content_pane" ajxpClass="FilesList" ajxpOptions='"list"' style="border: 1px solid #676965;"></div>
-					</div>
-				</div>
-			]]></template>
-            <template name="main_umbra" element="ajxp_desktop" position="top" theme="umbra"><![CDATA[
-				<div id="toolbars">
-					<div>
-						<div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"skipBubbling":true,"defaultIconSize":16,"defaultStyle":"icon_text","styles":{"icons_only":"Icons Only","icon_text":"Icons and Text","text_only":"Text only"},"stylesImgSizes":{"icons_only":22,"icon_text":16,"text_only":16},"stylesBarSizes":{"icons_only":40,"icon_text":51,"text_only":30}}' class="soft_css_gradient"></div>
-						<div id="locationbar_cont" class="css_gradient">
-							<div style="height: 100%;" class="separator"></div>
-							<div style="padding-top : 5px;">
-								<div id="repo_chooser" ajxpClass="RepositorySelect"></div>
-								<div id="locationBar" ajxpClass="LocationBar" ajxpOptions='{"flexTo":"locationbar_cont","searchButton":"searchbar_splitter","searchIcon":"xmag.png", "searchFocus":"search_txt"}'></div>
-								<div id="logging_string" ajxpClass="UserWidget"></div>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div id="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop"}'>
-					<div id="vertical_splitter" ajxpClass="Splitter" ajxpOptions='{"direction": "vertical", "initA": 350, "maxA":600, "minA":0,"fit":"height","fitParent":"browser", "minSize":0, "foldingButton":true}'>
-						<div id="sidebar_splitter" style="float:left; overflow:hidden;" ajxpClass="Splitter" ajxpOptions='{"direction":"horizontal","initB":300,"minB":57}'>
-							<div id="topPane" ajxpClass="FoldersTree" ajxpOptions='{"display":"dz","replaceScroller":true}' ajxpPaneHeader="130" ajxpPaneIcon="view_tree.png" style="margin:20px;margin-bottom:10px;padding-right: 10px;"></div>
-							<div id="info_panel" ajxpClass="InfoPanel" ajxpPaneHeader="131" ajxpPaneIcon="file_info.png" ajxpOptions='{"replaceScroller":"true"}' style="margin:20px;margin-top:10px;padding-right: 10px;" ></div>
-					    </div>
-						<div id="searchbar_splitter" style="overflow:hidden;" ajxpClass="Splitter" ajxpOptions='{"direction":"horizontal","initA":0, "minSize":0, "startFolded": true, "foldingButton": "A"}'>
-							<div id="search_container" ajxpClass="SearchEngine" ajxpPaneHeader="87" ajxpPaneIcon="xmag.png" data-globalOptions='{"headerClose":{"icon":"panel_vertical_hide.png","splitter":"searchbar_splitter","title":86}}' style="height: 0px; overflow:hidden;"></div>
-    						<div id="content_pane" ajxpClass="FilesList" ajxpOptions='{"displayMode":"list","replaceScroller":true, "messageBoxReference":true}' style="border: 1px solid #bbb;"></div>
-					    </div>
-					</div>
-				</div>
-			]]></template>
-            <template name="main_vision" element="ajxp_desktop" position="top" theme="vision"><![CDATA[
-				<div id="toolbars" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height", "fitParent":"ajxp_desktop"}'>
-					<div id="global_toolbar" ajxpClass="LogoWidget" ajxpOptions='{"link":"triggerRepositoryChange:ajxp_home", "linkTitle":"Back to Home"}'>
-					    <div id="logging_string" ajxpClass="UserWidget" ajxpOptions='{"menuEvent" : "over"}'></div>
-						<div id="top_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["user", "admin"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
-						<div id="repo_chooser" ajxpClass="RepositorySelect" ajxpOptions='{"menuPosition": "bottom middle", "menuOffsetTop":11, "menuOffsetLeft":0, "menuMaxHeight":535, "menuEvent":"over", "simpleLabel":"<span class=\"icon-sitemap\"></span><span class=\"ws-label\" ajxp_message_id=\"455\">AJXP_MESSAGE[455]</span><span class=\"icon-caret-down\"></span>"}'></div>
-					</div>
-					<div id="workspace_toolbar" ajxpClass="AjxpPane">
-                        <div id="simple_repository_label" ajxpClass="RepositorySimpleLabel" ajxpOptions='{"bindSizeTo":{"width":{"id":"topPane", "events":["resize-AjxpTabulator-cpane_tabs","actions_refreshed"], "min":150, "checkSiblings":true,"offset":-5}}}'></div>
-					    <div style="float:left;" ajxpClass="AjxpPane"  id="buttons_bar_cont">
-						    <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["put", "get"],"groupOtherToolbars":["more", "change", "remote"], "groupOtherLabel":"More","skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
-						</div>
-						<div style="float:right;" ajxpClass="AjxpPane" ajxpOptions='{"bindSizeTo":{"width":{"id":"info_panel", "events":["resize-InfoPanel-info_panel", "resize-FoldersTree-folder_pane","actions_refreshed"], "min":120, "offset":-20, "checkSiblings":true}}}' id="search_engine_cont">
-						    <div id="search_container" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "fitMarginBottom":20}'></div>
-						</div>
-						<div style="clear:both;" class="skipSibling"/>
-					</div>
-				</div>
-				<div id="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop"}'>
-					<div id="vertical_splitter" ajxpClass="Splitter" ajxpOptions='{"direction": "vertical", "initA":"70%", "minB":26,"fit":"height","fitParent":"browser", "minSize":26, "foldingButton":"B", "invisibleBar": true}'>
-    					<div id="vertical_splitter2" ajxpClass="Splitter" ajxpOptions='{"direction": "vertical", "autoFoldOnEvent":"ajaxplorer:context_changed", "initA": "50%", "minA":26, "maxA":450, "fit":"height","fitParent":"browser", "minSize":0, "foldingButton":"A", "invisibleBar": true}'>
-    					    <div id="topPane" ajxpClass="AjxpTabulator" ajxpOptions='{"defaultTabId": "folders","tabInfos" : [{"id":"folders","label":"130","iconClass":"icon-folder-close","element":"folder_pane"},{"id":"flagged","label":"147","iconClass":"icon-bookmark-empty","element":"flagged_elements"}],"headerToolbarOptions":{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["filter","vertical_splitter2-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}}'>
-                                <div id="folder_pane" ajxpClass="FoldersTree" ajxpOptions='{"display":"dz","replaceScroller":true}' ></div>
-                                <div id="flagged_elements" ajxpClass="FetchedResultPane" ajxpOptions='{"nodeProviderProperties":{"get_action":"get_bookmarks", "format":"node_list"},"reloadOnServerMessage":"tree/reload_bookmarks"}'></div>
-    					    </div>
-							<div id="cpane_container" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"browser"}'>
-                                <div id="cpane_tabs" ajxpClass="AjxpTabulator" ajxpOptions='{"fit":"height", "fitParent":"browser","registerAsEditorOpener":true, "saveState":true,"events":{"ajaxplorer:context_changed":"this.switchToFirstIfPathDiffers(arguments[0]);"}, "defaultTabId": "files","tabInfos" : [{"id":"files","label":"","iconClass":"icon-folder-open", "element":"files_list_pane"}]}'>
-                                    <div id="files_list_pane" ajxpClass="AjxpPane">
-                                        <div id="files_list_header" ajxpClass="AjxpPane">
-                                            <div id="display_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["content_pane-actions","vertical_splitter-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
-                                            <div id="breadcrumb" ajxpClass="Breadcrumb" style="width:50%;" ajxpOptions='{"flexTo":"cpane_tabs","flexToMargin":20}'></div>
-                                        </div>
-                                        <div id="content_pane" ajxpClass="FilesList" ajxpOptions='{"displayMode":"detail","replaceScroller":true, "messageBoxReference":true, "fit":"height", "fitParent":"files_lit_pane", "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px"}' style="border-left: 1px solid #bbb;"></div>
-                                    </div>
-                                </div>
-							</div>
-                        </div>
-                        <div id="info_panel" ajxpClass="InfoPanel" ajxpPaneHeader="131" ajxpPaneIcon="file_info.png" ajxpOptions='{"replaceScroller":"true", "skipActions":true,"headerToolbarOptions":{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["filter","vertical_splitter-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}}'></div>
-                    </div>
-				</div>
-			]]></template>
             <template name="main_orbit" element="ajxp_desktop" position="top" theme="orbit"><![CDATA[
                 <div id="background-imager" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height", "fitParent":"ajxp_desktop","imageBackgroundFromConfigs":"gui.ajax/WELCOME_PAGE_BACKGROUND_"}'>
                     <div id="global_toolbar" ajxpClass="LogoWidget" ajxpOptions='{"link":"triggerRepositoryChange:ajxp_home", "linkTitle":"Back to Home"}'>
                         <div id="logging_string" ajxpClass="UserWidget" ajxpOptions='{"menuEvent" : "over","menuOffsetLeft":11,"menuOffsetTop":11}'></div>
-						<div id="top_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["admin"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
+						<div id="top_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["admin"],"submenuOffsetTop":2}'></div>
                     </div>
                     <div id="orbit_content" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height", "fitParent":"ajxp_desktop"}'></div>
                 </div>
 			]]></template>
-            <template name="widget_umbra" element="ajxp_widget" position="top" theme="umbra"><![CDATA[
-				<div id="toolbars">
-					<div>
-						<div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"skipBubbling":true,"defaultIconSize":16,"defaultStyle":"icon_text","styles":{"icons_only":"Icons Only","icon_text":"Icons and Text","text_only":"Text only"},"stylesImgSizes":{"icons_only":22,"icon_text":16,"text_only":16},"stylesBarSizes":{"icons_only":40,"icon_text":51,"text_only":30}}' class="soft_css_gradient"></div>
-						<div id="locationbar_cont" class="css_gradient">
-							<div style="height: 100%;" class="separator"></div>
-							<div style="padding-top : 5px;">
-								<div id="locationBar" ajxpClass="LocationBar" ajxpOptions='{"flexTo":"locationbar_cont"}'></div>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div id="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_widget"}'>
-					<div id="content_pane" ajxpClass="FilesList"  ajxpOptions='{"fit":"height","fitParent":"browser"}'  style="margin:0px;"></div>
-				</div>
-			]]></template>
             <template name="widget_orbit" element="ajxp_widget" position="top" theme="orbit"><![CDATA[
 				<div id="toolbars">
 					<div>
-						<div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"skipBubbling":true,"defaultIconSize":16,"defaultStyle":"icon_text","styles":{"icons_only":"Icons Only","icon_text":"Icons and Text","text_only":"Text only"},"stylesImgSizes":{"icons_only":22,"icon_text":16,"text_only":16},"stylesBarSizes":{"icons_only":40,"icon_text":51,"text_only":30}}' class="soft_css_gradient"></div>
+						<div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"defaultIconSize":16,"defaultStyle":"icon_text","styles":{"icons_only":"Icons Only","icon_text":"Icons and Text","text_only":"Text only"},"stylesImgSizes":{"icons_only":22,"icon_text":16,"text_only":16},"stylesBarSizes":{"icons_only":40,"icon_text":51,"text_only":30}}' class="soft_css_gradient"></div>
 						<div id="locationbar_cont" class="css_gradient">
 							<div style="height: 100%;" class="separator"></div>
 							<div style="padding-top : 5px;">
@@ -336,205 +225,6 @@
 				<div id="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_widget"}'>
 					<div id="content_pane" ajxpClass="FilesList"  ajxpOptions='{"fit":"height","fitParent":"browser"}'  style="margin:0px;"></div>
 				</div>
-			]]></template>			
-            <template name="widget_vision" element="ajxp_widget" position="top" theme="vision"><![CDATA[
-				<div id="toolbars">
-    			    <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["put", "get"],"groupOtherToolbars":["more", "change", "remote"], "groupOtherLabel":"More","skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
-				</div>
-				<div id="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop"}'>
-                    <div id="cpane_container" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"browser"}'>
-                        <div id="cpane_header" class="panelHeader">
-                            <div id="display_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["default"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
-                            <div id="breadcrumb" ajxpClass="Breadcrumb" style="width:50%;" ajxpOptions='{"flexTo":"cpane_header", "flexToMargin":30}'></div>
-                        </div>
-                        <div id="content_pane" ajxpClass="FilesList" ajxpOptions='{"displayMode":"list","replaceScroller":true, "fit":"height", "fitParent":"cpane_container", "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px"}' style="border: 1px solid #bbb; border-width:0 1px;"></div>
-                    </div>
-				</div>
-			]]></template>
-            <template name="minisite_vision" element="ajxp_shared_folder" position="top" label="Standard" theme="vision"><![CDATA[
-				<div id="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
-                    <div class="widget_logo"></div>
-                    <div id="widget_title" ajxpClass="RepositorySimpleLabel" ajxpOptions='{"displayLabelLegend":false,"displayWorkspaceDescription":true}'></div>
-      			    <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["minisite", "inline"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
-                    <div id="cpane_container" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"browser"}'>
-                        <div id="cpane_header" class="panelHeader">
-                            <div id="display_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["default"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
-                            <div id="breadcrumb" ajxpClass="Breadcrumb" style="width:50%;" ajxpOptions='{"flexTo":"cpane_header","flexToMargin":30}'></div>
-                        </div>
-                        <div id="content_pane" ajxpClass="FilesList" ajxpOptions='{"displayMode":"detail", "detailThumbSize": 50 ,"replaceScroller":true, "messageBoxReference":true, "fit":"height", "fitParent":"cpane_container", "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px", "invisibleSelection":false}' style="border: 1px solid #bbb; border-width:0 1px;"></div>
-                    </div>
-				</div>
-			]]></template>
-            <template name="minisite_orbit" element="ajxp_shared_folder" position="top" label="share_center.153" theme="orbit"><![CDATA[
-				<div id="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
-                    <div id="logo_widget" class="widget_logo" ajxpClass="LogoWidget"  ajxpOptions='{"imageParameter":"gui.ajax/CUSTOM_MINISITE_LOGO"}'></div>
-                    <div id="widget_title" ajxpClass="RepositorySimpleLabel" ajxpOptions='{"displayLabelLegend":false,"displayWorkspaceDescription":true}'></div>
-                    <div id="breadcrumb" ajxpClass="Breadcrumb" ajxpOptions='{}'></div>
-                    <div id="files_list_header">
-                        <div id="display_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["content_pane-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
-                        <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["navigation","minisite", "inline"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
-                    </div>
-                    <div id="cpane_container1" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"browser"}'>
-                        <div id="content_pane" ajxpClass="FilesList" ajxpOptions='{"displayMode":"detail", "detailThumbSize": 50 ,"replaceScroller":true, "messageBoxReference":true, "fit":"height", "fitParent":"cpane_container1", "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px", "invisibleSelection":false}' style="border: 1px solid #bbb; border-width:0 1px;"></div>
-                    </div>
-				</div>
-                <script>
-                document.observe("ajaxplorer:afterApply-login", function(){
-                    AjxpPane.prototype.staticApplyBackgroundFromConfigs($("overlay"), "gui.ajax/CUSTOM_SHAREPAGE_BACKGROUND_", "display:block;", true);
-                });
-                </script>
-			]]></template>
-            <template name="minisite_film_strip" element="ajxp_film_strip" position="top" label="share_center.154" theme="orbit"><![CDATA[
-				<div id="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
-                    <div id="logo_widget" class="widget_logo" ajxpClass="LogoWidget" ajxpOptions='{"imageParameter":"gui.ajax/CUSTOM_MINISITE_LOGO"}'></div>
-                    <div id="widget_title" ajxpClass="RepositorySimpleLabel" ajxpOptions='{"displayLabelLegend":false,"displayWorkspaceDescription":true}'></div>
-                    <div id="cpane_container" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"browser", "fitMarginBottom":80}'>
-                        <div id="cpane_header" class="panelHeader">
-                            <div id="display_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["minisite", "inline"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
-                            <div id="breadcrumb" ajxpClass="Breadcrumb" style="width:50%;" ajxpOptions='{"flexTo":"cpane_header", "flexToMargin":50, "resize_events":["actions_refreshed"]}'></div>
-                        </div>
-                        <div id="cpane_tabs" ajxpClass="AjxpTabulator" ajxpOptions='{"fit":"height", "fitParent":"cpane_container","registerAsEditorOpener":true, "saveState":false, "defaultTabId": "","tabInfos" : [], "uniqueTab":true}'></div>
-                        <div id="content_pane" ajxpClass="FilesList" ajxpOptions='{"displayMode":"thumb", "fixedDisplayMode":"thumb", "fixedThumbSize":60,"replaceScroller":false, "horizontalScroll":true, "messageBoxReference":true, "fit":"content", "fitParent":"cpane_container", "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px", "invisibleSelection":false}'></div>
-                    </div>
-				</div>
-				<script>
-                    document.observe("ajaxplorer:afterApply-login", function(){
-                        AjxpPane.prototype.staticApplyBackgroundFromConfigs($("overlay"), "gui.ajax/CUSTOM_SHAREPAGE_BACKGROUND_", "display:block;", true);
-                    });
-                    document.observe("ajaxplorer:selection_changed", function(e){
-                        try{
-                            var dm = ajaxplorer.getContextHolder();
-                            var nodes = dm.getSelectedNodes();
-                            if(nodes[0].isLeaf() && e.memo._selectionSource.__className == 'FilesList'){
-                                window.setTimeout(function(){pydio.getController().fireDefaultAction("file");}, 1);
-                            }
-                        }catch(e){}
-                    });
-                    var p;
-				    document.observe("ajaxplorer:user_logged", function(){
-                        if(p) return;
-                        try{
-                            p = new PeriodicalExecuter(function(){
-                                var dm = ajaxplorer.getContextHolder();
-                                if(dm.getSelectedNodes().length){
-                                    p.stop();
-                                    return;
-                                }
-                                var first = dm.getRootNode().getFirstChildIfExists();
-                                if(first){
-                                    dm.setSelectedNodes([first], "dataModel");
-                                    window.setTimeout(function(){pydio.getController().fireDefaultAction("file");}, 1);
-                                    p.stop();
-                                    return;
-                                }
-                            }, 1);
-                        }catch(e){}
-                    });
-				</script>
-			]]></template>
-            <template name="unique_preview_file" element="ajxp_unique_strip" position="top" label="Unique File Preview"><![CDATA[
-				<div id="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
-                    <div id="logo_widget" class="widget_logo" ajxpClass="LogoWidget" ajxpOptions='{"imageParameter":"gui.ajax/CUSTOM_MINISITE_LOGO"}'></div>
-                    <div id="display_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["inline", "minisite-share-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
-                    <div id="widget_title" style="padding: 28px 0 22px 20px;" ajxpClass="RepositorySimpleLabel" ajxpOptions='{"displayLabelLegend":false,"displayWorkspaceDescription":true}'></div>
-                    <div id="cpane_container" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"browser"}'>
-                        <div id="cpane_tabs" ajxpClass="AjxpTabulator" ajxpOptions='{"fit":"height", "fitParent":"cpane_container","registerAsEditorOpener":true, "saveState":false, "defaultTabId": "","tabInfos" : [], "uniqueTab":true}'></div>
-                    </div>
-				</div>
-				<script>
-                    document.observe("ajaxplorer:afterApply-login", function(){
-                        AjxpPane.prototype.staticApplyBackgroundFromConfigs($("overlay"), "gui.ajax/CUSTOM_SHAREPAGE_BACKGROUND_", "display:block;", true);
-                    });
-				    document.observe("ajaxplorer:user_logged", function(){
-                        try{
-
-                            var p = new PeriodicalExecuter(function(){
-                                var dm = ajaxplorer.getContextHolder();
-                                if(dm.getSelectedNodes().length){
-                                    p.stop();
-                                    return;
-                                }
-                                var root = dm.getRootNode();
-                                var first = root.getFirstChildIfExists();
-                                if(first){
-                                    if((first.getAjxpMime() == 'mp3' || first.getAjxpMime() == 'wav') && !(window.soundManager && window.soundManager.enabled)){
-                                        return;
-                                    }
-                                    dm.setSelectedNodes([first], "dataModel");
-                                    window.setTimeout(function(){pydio.getController().fireDefaultAction("file");}, 1);
-                                    p.stop();
-                                    return;
-                                }
-                            }, 1);
-                        }catch(e){
-                            if (console) console.log(e);
-                        }
-                    });
-				</script>
-			]]></template>
-            <template name="unique_preview_download" element="ajxp_unique_dl" position="top" label="Big download button"><![CDATA[
-				<div id="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
-                    <div id="background_container" ajxpClass="AjxpPane" ajxpOptions='{"imageBackgroundFromConfigs":"gui.ajax/CUSTOM_SHAREPAGE_BACKGROUND_"}'></div>
-                    <div id="cpane_container" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"browser"}'>
-                        <div id="logo_widget" class="widget_logo" ajxpClass="LogoWidget"  ajxpOptions='{"imageParameter":"gui.ajax/CUSTOM_MINISITE_LOGO"}'></div>
-                        <div id="widget_title" ajxpClass="RepositorySimpleLabel" ajxpOptions='{"displayLabelLegend":false,"displayWorkspaceDescription":true}'>
-                        </div>
-                        <div id="dl_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["inline"], "skipCarousel":true}'></div>
-                        <div id="share_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["minisite-share-actions"], "skipCarousel":true}'></div>
-                    </div>
-				</div>
-				<script>
-				    document.observe("ajaxplorer:user_logged", function(){
-                        try{
-
-                            var p = new PeriodicalExecuter(function(){
-                                var dm = ajaxplorer.getContextHolder();
-                                if(dm.getSelectedNodes().length){
-                                    p.stop();
-                                    return;
-                                }
-                                var first = dm.getRootNode().getFirstChildIfExists();
-                                if(first){
-                                    dm.setSelectedNodes([first], "dataModel");
-                                    p.stop();
-                                    return;
-                                }
-                            }, 1);
-                        }catch(e){
-                            if (console) console.log(e);
-                        }
-                    });
-				</script>
-			]]></template>
-            <template name="minisite_bare" element="ajxp_embed_template" position="top" label="share_center.155"><![CDATA[
-				<div id="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
-                    <div id="cpane_header" class="panelHeader">
-                        <div id="display_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["navigation", "minisite", "inline", "content_pane-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
-                        <div id="breadcrumb" ajxpClass="Breadcrumb" style="width:50%;" ajxpOptions='{"flexTo":"cpane_header", "flexToMargin":30}'></div>
-                    </div>
-                    <div id="content_pane" ajxpClass="FilesList" ajxpOptions='{"displayMode":"detail", "detailThumbSize": 50 ,"replaceScroller":true, "messageBoxReference":true, "fit":"height", "fitParent":"cpane_container", "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px", "invisibleSelection":false}' style="border: 1px solid #bbb; border-width:0 1px;"></div>
-                    <div id="logo_widget" class="widget_logo" ajxpClass="LogoWidget"  ajxpOptions='{"imageParameter":"gui.ajax/CUSTOM_MINISITE_LOGO"}'></div>
-				</div>
-                <script>
-                    document.observe("ajaxplorer:afterApply-login", function(){
-                        AjxpPane.prototype.staticApplyBackgroundFromConfigs($("overlay"), "gui.ajax/CUSTOM_SHAREPAGE_BACKGROUND_", "display:block;", true);
-                    });
-                </script>
-			]]></template>
-            <template name="minisite_dropbox" element="ajxp_dropbox_template" position="top" label="share_center.163"><![CDATA[
-				<div id="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
-                    <div id="cpane_header" class="panelHeader">
-                        <div id="display_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["minisite", "inline","content_pane-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
-                        <div id="breadcrumb" ajxpClass="Breadcrumb" style="width:50%;" ajxpOptions='{"flexTo":"cpane_header", "flexToMargin":30}'></div>
-                    </div>
-                    <div id="content_pane" ajxpClass="FilesList" ajxpOptions='{"displayMode":"detail", "detailThumbSize": 50 ,"replaceScroller":true, "messageBoxReference":true, "fit":"height", "fitParent":"cpane_container", "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px", "invisibleSelection":false}' style="border: 1px solid #bbb; border-width:0 1px;"></div>
-                    <div id="logo_widget" class="widget_logo" ajxpClass="LogoWidget" ajxpOptions='{"imageParameter":"gui.ajax/CUSTOM_MINISITE_LOGO"}'></div>
-				</div>
-				<script>
-                    document.observe("ajaxplorer:afterApply-login", function(){
-                        AjxpPane.prototype.staticApplyBackgroundFromConfigs($("overlay"), "gui.ajax/CUSTOM_SHAREPAGE_BACKGROUND_", "display:block;", true);
-                    });
-                </script>
 			]]></template>
 			<component_config className="FilesList">
 				<property name="thumbSize" value="64"/>
diff --git a/core/src/plugins/gui.ajax/package.json b/core/src/plugins/gui.ajax/package.json
index e538204ece..9239542b3d 100644
--- a/core/src/plugins/gui.ajax/package.json
+++ b/core/src/plugins/gui.ajax/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gui.ajax",
-  "version": "6.3.1",
+  "version": "6.5.1",
   "description": "",
   "main": "index.js",
   "source_path":"res/js",
@@ -25,7 +25,9 @@
     "classnames": "~2.1.3",
     "react-autosuggest": "1.18.2",
     "clipboard":"^1.5.8",
-    "qrcode.react":"0.6.1"
+    "qrcode.react":"0.6.1",
+    "cronstrue":"0.3.1",
+    "he":"1.1.0"
   },
   "devDependencies": {
     "grunt": "~0.4.5",
diff --git a/core/src/plugins/gui.ajax/plugin_doc.html b/core/src/plugins/gui.ajax/plugin_doc.html
index 2ba5477d4e..2a35e5b78b 100644
--- a/core/src/plugins/gui.ajax/plugin_doc.html
+++ b/core/src/plugins/gui.ajax/plugin_doc.html
@@ -6,4 +6,4 @@
 you can change the theme by accessing the plugin options.</p>
 <p>Although not necessary, at the moment the other gui plugins rely on this one to load all the core JS classes and
 bootstrap the Pydio framework in the client.</p>
-<p align="center"><img src="gui-ajax-umbra.png" alt="Umbra Theme"></p>
\ No newline at end of file
+<p align="center"><img src="pydio-gui.png" alt="UI Screenshot"></p>
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/pydio-gui.png b/core/src/plugins/gui.ajax/pydio-gui.png
new file mode 100644
index 0000000000..6a4e97472b
Binary files /dev/null and b/core/src/plugins/gui.ajax/pydio-gui.png differ
diff --git a/core/src/plugins/gui.ajax/res/html/404.html b/core/src/plugins/gui.ajax/res/html/404.html
new file mode 100644
index 0000000000..48dd0cf4a2
--- /dev/null
+++ b/core/src/plugins/gui.ajax/res/html/404.html
@@ -0,0 +1,31 @@
+<style>
+    body, html{
+        width: 100%;
+        height: 90%;
+        font-family: Roboto, Arial, sans-serif;
+    }
+    .Aligner {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        height: 100%;
+        width: 100%;
+    }
+
+    .Aligner-item {
+        max-width: 90%;
+        font-size: 2em;
+        color: rgba(0,0,0,0.73);
+        text-align: center;
+    }
+</style>
+<head>
+    <title>Page not found!</title>
+</head>
+<body>
+    <div class="Aligner">
+        <div class="Aligner-item">
+            Oups, cannot find this page!
+        </div>
+    </div>
+</body>
diff --git a/core/src/plugins/gui.ajax/res/html/gui.html b/core/src/plugins/gui.ajax/res/html/gui.html
index 913c1c8dbd..1728b2925d 100644
--- a/core/src/plugins/gui.ajax/res/html/gui.html
+++ b/core/src/plugins/gui.ajax/res/html/gui.html
@@ -1,53 +1,67 @@
+<!DOCTYPE html>
 <html xmlns:ajxp>
-	<head>
-		<title>AJXP_APPLICATION_TITLE</title>
-        AJXP_REBASE
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
-		<link rel="icon" type="image/x-png" href="AJXP_THEME_FOLDER/images/html-folder.png">
-		<link rel="stylesheet" type="text/css" href="AJXP_THEME_FOLDER/css/allz.css?v=AJXP_CURRENT_VERSION">
-		<!--[if IE 8]>
-		<script src="AJXP_CLIENT_RESOURCES_FOLDER/js/vendor/es6/es5-shim.min.js"></script>
-		<script src="AJXP_CLIENT_RESOURCES_FOLDER/js/vendor/es6/es5-sham.min.js"></script>
-		<![endif]-->
-        AJXP_ADDITIONAL_JS_FRAMEWORKS
-		<script language="javascript" type="text/javascript" src="AJXP_CLIENT_RESOURCES_FOLDER/js/ajaxplorer_boot.js?v=AJXP_CURRENT_VERSION"></script>
-	</head>
-	<body style="overflow:hidden;">
-		<script type="text/javascript">
-		// Initialize booter. Do not remove the commented line AJXP_JSON_START_PARAMETERS, as it is 
-		// dynamically replaced by the application!
-		var ajaxplorer, startParameters = {}, MessageHash={};
-		//AJXP_JSON_START_PARAMETERS
-		window.ajxpBootstrap = new AjxpBootstrap(startParameters);
-		</script>
-		<div id="ajxp_desktop" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"window","fitMarginBottom":"$(\"optional_bottom_div\").getHeight()"}'></div>
-		<div id="all_forms">
-			<div id="generic_dialog_box" class="dialogBox"><div class="dialogTitle"></div><div class="dialogContent"></div></div>
-			<div id="hidden_frames" style="display:none;"></div>
-			<div id="hidden_forms" style="position:absolute;left:-1000px;"></div>	
-			
-			<!-- LOGIN SCREEN MUST BE ALREADY IN PAGE TO ENABLE PASSWORD REMEMBERING -->
-			<form id="login_form" action="login" style="display:none;" box_width="230">
-				<input type="hidden" name="get_action" value="login">
-				<input type="hidden" name="login_seed" id="login_seed" value="">
-		 	   	<a style="float:right;" href="javascript:pydio.getController().fireAction('switch_language');" title="AJXP_MESSAGE[190]" alt="AJXP_MESSAGE[190]"><img src="AJXP_THEME_FOLDER/images/actions/16/flag.png" border="0" height="16" width="16"></a>
-				<div class="dialogLegend" style="margin-bottom: 3px;margin-top: 4px;" ajxp_message_id="180">AJXP_MESSAGE[180]</div>
-				<div style="width:100%;">
-					<div class="SF_element">
-						<div class="SF_label"><ajxp:message ajxp_message_id="181">AJXP_MESSAGE[181]</ajxp:message></div>
-						<div class="SF_input"><input type="text" name="userid" style="width: 100px; padding:0px;" class="dialogFocus"></div>
-					</div>
-					<div class="SF_element">
-						<div class="SF_label"><ajxp:message ajxp_message_id="182">AJXP_MESSAGE[182]</ajxp:message></div>
-						<div class="SF_input"><input type="password" name="password"  style="width: 100px; padding:0px;"></div>
-					</div>
-					<div class="SF_element">
-						<input type="checkbox" class="radio" name="remember_me" style="border: none; width:20px !important;"/><ajxp:message ajxp_message_id="261">AJXP_MESSAGE[261]</ajxp:message>
-					</div>
-				</div>
-			</form>
-		</div>
-        <link rel="stylesheet" href="plugins/gui.ajax/res/js/lib/chosen/chosen.css"/>
-	</body>
+<head>
+    <title>AJXP_APPLICATION_TITLE</title>
+    AJXP_REBASE
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" type="text/css" href="AJXP_THEME_FOLDER/css/allz.css?v=AJXP_CURRENT_VERSION">
+    <!--[if IE 8]>
+    <script src="AJXP_CLIENT_RESOURCES_FOLDER/js/vendor/es6/es5-shim.min.js"></script>
+    <script src="AJXP_CLIENT_RESOURCES_FOLDER/js/vendor/es6/es5-sham.min.js"></script>
+    <![endif]-->
+    <!--[if IE 7]>
+    <script src="AJXP_CLIENT_RESOURCES_FOLDER/js/vendor/es6/json3.min.js"></script>
+    <![endif]-->
+    AJXP_ADDITIONAL_JS_FRAMEWORKS
+    <script language="javascript" type="text/javascript" src="AJXP_CLIENT_RESOURCES_FOLDER/js/ajaxplorer_boot.js?v=AJXP_CURRENT_VERSION"></script>
+    <link rel="icon" type="image/x-png" href="index.php?get_action=serve_favicon">
+</head>
+<body style="overflow: hidden;">
+<script type="text/javascript">
+    window.ajxpNoNotifLoader = true;
+    window.ajxpThemeSkipLoaderProgress = true;
+    // Initialize booter. Do not remove the commented line AJXP_JSON_START_PARAMETERS, as it is
+    // dynamically replaced by the application!
+    var ajaxplorer, startParameters = {}, MessageHash={};
+    //AJXP_JSON_START_PARAMETERS
+    document.observe("ajaxplorer:before_gui_load", function(e){
+        if(window.React){
+            React.initializeTouchEvents(true);
+        }
+        ajaxplorer.currentThemeUsesIconFonts = true;
+        pydio.Parameters.set('currentThemeUsesIconFonts', true);
+        document.documentElement.className += " ajxp_theme_orbit";
+    });
+    window.ajxpBootstrap = new AjxpBootstrap(startParameters);
+    //window.onbeforeunload = function(){return "Do you want to quit?";};
+</script>
+<div id="ajxp_desktop" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"window","fitMarginBottom":"$(\"optional_bottom_div\").getHeight()"}'></div>
+<div id="all_forms">
+    <div id="generic_dialog_box" class="dialogBox form-login_form"><div class="dialogTitle"></div><div class="dialogContent"></div></div>
+    <div id="hidden_frames" style="display:none;"></div>
+    <div id="hidden_forms" style="position:absolute;left:-1000px;"></div>
+
+    <!-- LOGIN SCREEN MUST BE ALREADY IN PAGE TO ENABLE PASSWORD REMEMBERING -->
+    <form id="login_form" style="display:none;" box_width="320" box_padding="0">
+        <input type="hidden" name="get_action" value="login">
+        <input type="hidden" name="login_seed" id="login_seed" value="">
+        <a href="javascript:pydio.getController().fireAction('switch_language');" title="AJXP_MESSAGE[190]" alt="AJXP_MESSAGE[190]" class="icon-flag">&nbsp;</a>
+        <div class="dialogLegend" ajxp_message_id="180">AJXP_MESSAGE[180]</div>
+        <div style="width:100%;">
+            <div class="SF_element">
+                <div class="SF_label"><ajxp:message ajxp_message_id="181">AJXP_MESSAGE[181]</ajxp:message></div>
+                <div class="SF_input"><input type="text" name="userid" class="dialogFocus" placeholder="AJXP_MESSAGE[181]"></div>
+            </div>
+            <div class="SF_element">
+                <div class="SF_label"><ajxp:message ajxp_message_id="182">AJXP_MESSAGE[182]</ajxp:message></div>
+                <div class="SF_input"><input type="password" name="password"  placeholder="AJXP_MESSAGE[182]"></div>
+            </div>
+            <div class="SF_element">
+                <input type="checkbox" class="radio" name="remember_me" id="remember_me"/><label for="remember_me" ajxp_message_id="261">AJXP_MESSAGE[261]</label>
+            </div>
+        </div>
+    </form>
+</div>
+</body>
 </html>
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/html/gui_debug.html b/core/src/plugins/gui.ajax/res/html/gui_debug.html
index 6eea66a8e6..df124ff0af 100644
--- a/core/src/plugins/gui.ajax/res/html/gui_debug.html
+++ b/core/src/plugins/gui.ajax/res/html/gui_debug.html
@@ -1,27 +1,32 @@
+<!DOCTYPE html>
 <html xmlns:ajxp>
 <head>
-<title>Pydio</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<?php if(isSet($START_PARAMETERS) && isSet($START_PARAMETERS["REBASE"])){
-    echo '<base href="'.$START_PARAMETERS["REBASE"].'"/>';
-}?>
-<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
-<link rel="icon" type="image/x-png" href="<?php print(AJXP_THEME_FOLDER);?>/images/html-folder.png">
+    <title>Pydio</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <?php if(isSet($START_PARAMETERS) && isSet($START_PARAMETERS["REBASE"])){
+        echo '<base href="'.$START_PARAMETERS["REBASE"].'"/>';
+    }?>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="icon" type="image/x-png" href="<?php print(AJXP_THEME_FOLDER);?>/images/html-folder.png">
     <!--[if IE 8]>
     <script src="plugins/gui.ajax/res/js/vendor/es6/es5-shim.min.js"></script>
     <script src="plugins/gui.ajax/res/js/vendor/es6/es5-sham.min.js"></script>
     <![endif]-->
-<?php
+    <!--[if IE 7]>
+    <script src="plugins/gui.ajax/res/js/vendor/es6/json3.min.js"></script>
+    <![endif]-->
+    <script src="plugins/gui.ajax/node_modules/he/he.js"></script>
+    <?php
     print($ADDITIONAL_FRAMEWORKS);
 
 $list = AJXP_INSTALL_PATH."/".AJXP_THEME_FOLDER."/css/allz_list.txt";
 $lines = file($list);
 foreach ($lines as $line){
 	print("<link rel=\"stylesheet\" type=\"text/css\" href=\"".CLIENT_RESOURCES_FOLDER."/".trim($line)."\">\n");
-}
-?>
+    }
+    ?>
 
-<?php
+    <?php
 $list = AJXP_INSTALL_PATH."/".CLIENT_RESOURCES_FOLDER."/js/ajaxplorer_boot_list.txt";
 $lines = file($list);
 foreach ($lines as $line){
@@ -30,14 +35,16 @@
 ?>
 </head>
 <body style="overflow:hidden;">
-<div id="ajxp_desktop" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"window","fitMarginBottom":"$(\"optional_bottom_div\").getHeight()"}'></div>
+        <div id="ajxp_desktop" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"window","fitMarginBottom":"$(\"optional_bottom_div\").getHeight()"}'></div>
 
-<script type="text/javascript">
+        <script type="text/javascript">
+window.ajxpNoNotifLoader = true;
+window.ajxpThemeSkipLoaderProgress = true;
 var ajaxplorer, startParameters = {};
 <?php if($JSON_START_PARAMETERS) print "startParameters = ".$JSON_START_PARAMETERS.";"; ?>
 window.ajxpBootstrap = new AjxpBootstrap(startParameters);
-</script>
-<?php
+    </script>
+    <?php
 $list = AJXP_INSTALL_PATH."/".CLIENT_RESOURCES_FOLDER."/js/ajaxplorer_core.txt";
 $lines = file($list);
 foreach ($lines as $line){
@@ -46,35 +53,43 @@
 $list = AJXP_INSTALL_PATH."/".CLIENT_RESOURCES_FOLDER."/js/ajaxplorer_ui.txt";
 $lines = file($list);
 foreach ($lines as $line){
-	print("<script language=\"javascript\" type=\"text/javascript\" src=\"".CLIENT_RESOURCES_FOLDER."/".trim($line)."\"></script>\n");
-}
-?>
-<div id="all_forms">
+    print("<script language=\"javascript\" type=\"text/javascript\" src=\"".CLIENT_RESOURCES_FOLDER."/".trim($line)."\"></script>\n");
+    }
+    ?>
+    <div id="all_forms">
         <div id="generic_dialog_box" class="dialogBox form-login_form"><div class="dialogTitle"></div><div class="dialogContent"></div></div>
-	<div id="hidden_frames" style="display:none;"></div>
-	<div id="hidden_forms" style="position:absolute;left:-1000px;"></div>	
-	
-	<!-- LOGIN SCREEN MUST BE ALREADY IN PAGE TO ENABLE PASSWORD REMEMBERING -->
-	<form id="login_form" action="login" style="display:none;" box_width="230" overlayStyle='{"backgroundColor":"white","opacity":10}'>
-	<input type="hidden" name="get_action" value="login">
-	<input type="hidden" name="login_seed" id="login_seed" value="">
-   	<a style="float:right;" href="javascript:pydio.getController().fireAction('switch_language');" title="<?php print($mess[190]);?>" alt="<?php print($mess[190]);?>"><img src="<?php print(AJXP_THEME_FOLDER); ?>/images/actions/16/flag.png" border="0" height="16" width="16"></a>
-	<div class="dialogLegend" style="margin-bottom: 3px;margin-top:4px;" ajxp_message_id="180"><?php print($mess[180]);?></div>
-	<div style="width:100%;">
-		<div class="SF_element">
-			<div class="SF_label"><ajxp:message ajxp_message_id="181"><?php print($mess[181]);?></ajxp:message></div>
-			<div class="SF_input"><input type="text" name="userid" style="width: 100px; padding:0px;" class="dialogFocus"></div>
-		</div>
-		<div class="SF_element">
-			<div class="SF_label"><ajxp:message ajxp_message_id="182"><?php print($mess[182]);?></ajxp:message></div>
-			<div class="SF_input"><input type="password" name="password"  style="width: 100px; padding:0px;"></div>
-		</div>
-		<div class="SF_element">
-			<input type="checkbox" class="radio" name="remember_me" style="border: none; width:20px !important;"/><ajxp:message ajxp_message_id="261"><?php print($mess[261]);?></ajxp:message>
-		</div>
-	</div>
-	</form>
-</div>
-<link rel="stylesheet" href="plugins/gui.ajax/res/js/lib/chosen/chosen.css"/>
-</body>
+        <div id="hidden_frames" style="display:none;"></div>
+        <div id="hidden_forms" style="position:absolute;left:-1000px;"></div>
+
+        <!-- LOGIN SCREEN MUST BE ALREADY IN PAGE TO ENABLE PASSWORD REMEMBERING -->
+        <form id="login_form" action="login" style="display:none;" box_width="320" box_padding="0" overlayStyle='{"backgroundColor":"white","opacity":10,"backgroundImage":"url(\"<?php print(AJXP_THEME_FOLDER); ?>/images/grid_t.png\")"}'>
+            <input type="hidden" name="get_action" value="login">
+            <input type="hidden" name="login_seed" id="login_seed" value="">
+            <a href="javascript:pydio.getController().fireAction('switch_language');" title="<?php print($mess[190]);?>" alt="<?php print($mess[190]);?>" class="icon-flag"></a>
+            <div class="dialogLegend" ajxp_message_id="180"><?php print($mess[180]);?></div>
+            <div>
+                <div class="SF_element">
+                    <div class="SF_label"><ajxp:message ajxp_message_id="181"><?php print($mess[181]);?></ajxp:message></div>
+                    <div class="SF_input"><input type="text" name="userid" class="dialogFocus" placeholder="<?php print($mess[181]);?>"></div>
+                </div>
+                <div class="SF_element">
+                    <div class="SF_label"><ajxp:message ajxp_message_id="182"><?php print($mess[182]);?></ajxp:message></div>
+                    <div class="SF_input"><input type="password" name="password" placeholder="<?php print($mess[182]);?>"></div>
+                </div>
+                <div class="SF_element">
+                    <input type="checkbox" class="radio" name="remember_me" id="remember_me"/><label for="remember_me" ajxp_message_id="261"><?php print($mess[261]);?></label>
+                </div>
+            </div>
+        </form>
+    </div>
+    <script type="text/javascript">
+        if(window.React) React.initializeTouchEvents(true);
+        document.observe("ajaxplorer:before_gui_load", function(e){
+            ajaxplorer.currentThemeUsesIconFonts = true;
+            pydio.Parameters.set('currentThemeUsesIconFonts', true);
+            document.documentElement.className += " ajxp_theme_orbit";
+        });
+    </script>
+
+    </body>
 </html>
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/i18n/conf/de.php b/core/src/plugins/gui.ajax/res/i18n/conf/de.php
index cb895ad2f0..e16fa2cf29 100644
--- a/core/src/plugins/gui.ajax/res/i18n/conf/de.php
+++ b/core/src/plugins/gui.ajax/res/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 /* *****************************************************************************
@@ -113,4 +113,4 @@
 "Show the palette on the interface to change the interface colors and logos. Make sure to reload the interface if you toggle this option." => "Show the palette on the interface to change the interface colors and logos. Make sure to reload the interface if you toggle this option.",
 "Use configured branding" => "Use configured branding",
 "Override default styles and colors with the options defined in the branding tool. Make sure to reload the interface if you toggle this option." => "Override default styles and colors with the options defined in the branding tool. Make sure to reload the interface if you toggle this option.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/gui.ajax/res/i18n/conf/en.php b/core/src/plugins/gui.ajax/res/i18n/conf/en.php
index c964e0b160..261d4277bf 100644
--- a/core/src/plugins/gui.ajax/res/i18n/conf/en.php
+++ b/core/src/plugins/gui.ajax/res/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Client Plugin" => "Client Plugin",
@@ -107,4 +107,4 @@
 "Show the palette on the interface to change the interface colors and logos. Make sure to reload the interface if you toggle this option." => "Show the palette on the interface to change the interface colors and logos. Make sure to reload the interface if you toggle this option.",
 "Use configured branding" => "Use configured branding",
 "Override default styles and colors with the options defined in the branding tool. Make sure to reload the interface if you toggle this option." => "Override default styles and colors with the options defined in the branding tool. Make sure to reload the interface if you toggle this option.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/gui.ajax/res/i18n/conf/fr.php b/core/src/plugins/gui.ajax/res/i18n/conf/fr.php
index b1674bc237..2dd3353978 100644
--- a/core/src/plugins/gui.ajax/res/i18n/conf/fr.php
+++ b/core/src/plugins/gui.ajax/res/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Client Plugin" => "Plugin client",
@@ -107,4 +107,4 @@
 "Show the palette on the interface to change the interface colors and logos. Make sure to reload the interface if you toggle this option." => "Afficher la palette sur l'interface permettant de modifier les couleurs et les logos. Recharger complètement la fenêtre après changement de cette option.",
 "Use configured branding" => "Utiliser le branding configuré",
 "Override default styles and colors with the options defined in the branding tool. Make sure to reload the interface if you toggle this option." => "Utiliser les logos et couleurs définis et sauvés lors de l'utilisation de l'outil de branding. Recharger complètement la fenêtre après changement de cette option.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/gui.ajax/res/i18n/conf/it.php b/core/src/plugins/gui.ajax/res/i18n/conf/it.php
index e328f3809d..6eb99f7968 100644
--- a/core/src/plugins/gui.ajax/res/i18n/conf/it.php
+++ b/core/src/plugins/gui.ajax/res/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Client Plugin" => "Plugin Client",
@@ -107,4 +107,4 @@
 "Show the palette on the interface to change the interface colors and logos. Make sure to reload the interface if you toggle this option." => "Show the palette on the interface to change the interface colors and logos. Make sure to reload the interface if you toggle this option.",
 "Use configured branding" => "Use configured branding",
 "Override default styles and colors with the options defined in the branding tool. Make sure to reload the interface if you toggle this option." => "Override default styles and colors with the options defined in the branding tool. Make sure to reload the interface if you toggle this option.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/gui.ajax/res/i18n/conf/pt.php b/core/src/plugins/gui.ajax/res/i18n/conf/pt.php
index 25d3904638..5db6083a4c 100644
--- a/core/src/plugins/gui.ajax/res/i18n/conf/pt.php
+++ b/core/src/plugins/gui.ajax/res/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Client Plugin" => "Plugin de Cliente",
@@ -107,4 +107,4 @@
 "Show the palette on the interface to change the interface colors and logos. Make sure to reload the interface if you toggle this option." => "Show the palette on the interface to change the interface colors and logos. Make sure to reload the interface if you toggle this option.",
 "Use configured branding" => "Use configured branding",
 "Override default styles and colors with the options defined in the branding tool. Make sure to reload the interface if you toggle this option." => "Override default styles and colors with the options defined in the branding tool. Make sure to reload the interface if you toggle this option.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer_boot.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer_boot.js
index a4aff5258c..9a0a7571ad 100644
--- a/core/src/plugins/gui.ajax/res/js/ajaxplorer_boot.js
+++ b/core/src/plugins/gui.ajax/res/js/ajaxplorer_boot.js
@@ -1 +1 @@
-eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('(I e(t,n,r){I s(o,u){if(!n[o]){if(!t[o]){N a=2d 1a=="I"&&1a;if(!u&&a)J a(o,!0);if(i)J i(o,!0);N f=1q 5o("hJ 3V 1A \'"+o+"\'");2f f.4z="zR",f}N l=n[o]={1y:{}};t[o][0].1u(l.1y,I(e){N n=t[o][1][e];J s(n?n:e)},l,l.1y,e,t,n,r)}J n[o].1y}N i=2d 1a=="I"&&1a;1x(N o=0;o<r.Y;o++)s(r[o]);J s})({1:[I(1a,1A,1y){(I(3h){"3Q 3Y";1a("5b-js/tz");1a("tt/8t");if(3h.tA){2f 1q 5o("l5 x7 dU of zO/zx is oY")}3h.tA=1i}).1u(L,2d 3h!=="1S"?3h:2d 5e!=="1S"?5e:2d 1v!=="1S"?1v:{})},{"5b-js/tz":78,"tt/8t":79}],2:[I(1a,1A,1y){"3Q 3Y";N $=1a("./$");1A.1y=I(gE){J I(el){N O=$.3B(L),Y=$.6j(O.Y),1l=$.7f(1M[1],Y),U;if(gE&&el!=el)1N(Y>1l){U=O[1l++];if(U!=U)J 1i}1h 1x(;Y>1l;1l++)if(gE||1l in O){if(O[1l]===el)J gE||1l}J!gE&&-1}}},{"./$":21}],3:[I(1a,1A,1y){"3Q 3Y";N $=1a("./$"),2Y=1a("./$.2Y");1A.1y=I(aa){N 6z=aa==1,tl=aa==2,tq=aa==3,i1=aa==4,q7=aa==6,tm=aa==5||q7;J I(bN){N O=1c($.6D(L)),5e=$.bO(O),f=2Y(bN,1M[1],3),Y=$.6j(5e.Y),1l=0,1B=6z?2G(Y):tl?[]:1S,5g,4j;1x(;Y>1l;1l++)if(tm||1l in 5e){5g=5e[1l];4j=f(5g,1l,O);if(aa){if(6z)1B[1l]=4j;1h if(4j)6R(aa){2N 3:J 1i;2N 5:J 5g;2N 6:J 1l;2N 2:1B.1I(5g)}1h if(i1)J 1t}}J q7?-1:tq||i1?i1:1B}}},{"./$":21,"./$.2Y":11}],4:[I(1a,1A,1y){N $=1a("./$");I 2m(tp,q4,q3){if(!tp)2f 4R(q3?q4+q3:q4)}2m.1d=$.6D;2m.fn=I(it){if(!$.2A(it))2f 4R(it+" is 8X a I!");J it};2m.4W=I(it){if(!$.3g(it))2f 4R(it+" is 8X an 1m!");J it};2m.al=I(it,9m,1C){if(!(it 8A 9m))2f 4R(1C+": 3Q j3 \'1q\' 8M!");J it};1A.1y=2m},{"./$":21}],5:[I(1a,1A,1y){N $=1a("./$"),kp=1a("./$.ic-1Z");1A.1y=1c.cC||I cC(2w,3G){N T=1c($.6D(2w)),l=1M.Y,i=1;1N(l>i){N S=$.bO(1M[i++]),1Z=kp(S),Y=1Z.Y,j=0,1b;1N(Y>j)T[1b=1Z[j++]]=S[1b]}J T}},{"./$":21,"./$.ic-1Z":13}],6:[I(1a,1A,1y){N $=1a("./$"),7m=1a("./$.5l")("qT"),3p={}.3p;I 2x(it){J 3p.1u(it).2g(8,-1)}2x.9V=I(it){N O,T;J it==1S?it===1S?"sc":"sb":2d(T=(O=1c(it))[7m])=="2D"?T:2x(O)};2x.1F=I(it,4C,tO){if(it&&!$.2F(it=tO?it:it.1z,7m))$.3D(it,7m,4C)};1A.1y=2x},{"./$":21,"./$.5l":32}],7:[I(1a,1A,1y){"3Q 3Y";N $=1a("./$"),2Y=1a("./$.2Y"),4M=1a("./$.2p").4M,2m=1a("./$.2m"),8O=1a("./$.1x-of"),3K=1a("./$.1Q").3K,2F=$.2F,1F=$.1F,3g=$.3g,3D=$.3D,6d=1c.6d||$.5b.1c.6d,ID=4M("id"),bR=4M("bR"),bY=4M("7r"),8V=4M("6p"),85=4M("1Q"),ej=$.7s?4M("5W"):"5W",id=0;I qe(it,2u){if(!3g(it))J(2d it=="2D"?"S":"P")+it;if(6d(it))J"F";if(!2F(it,ID)){if(!2u)J"E";3D(it,ID,++id)}J"O"+it[ID]}I bW(1V,1b){N 1l=qe(1b),1H;if(1l!="F")J 1V[bR][1l];1x(1H=1V[8V];1H;1H=1H.n){if(1H.k==1b)J 1H}}1A.1y={aK:I(3W,6z,9Y){I C(){N 1V=2m.al(L,C,3W),3t=1M[0];1F(1V,bR,$.2u(1p));1F(1V,ej,0);1F(1V,bY,1S);1F(1V,8V,1S);if(3t!=1S)8O(3t,6z,1V[9Y],1V)}$.gs(C.1z,{ai:I ai(){1x(N 1V=L,3x=1V[bR],1H=1V[8V];1H;1H=1H.n){1H.r=1i;if(1H.p)1H.p=1H.p.n=1S;3w 3x[1H.i]}1V[8V]=1V[bY]=1S;1V[ej]=0},"3w":I(1b){N 1V=L,1H=bW(1V,1b);if(1H){N 2C=1H.n,6i=1H.p;3w 1V[bR][1H.i];1H.r=1i;if(6i)6i.n=2C;if(2C)2C.p=6i;if(1V[8V]==1H)1V[8V]=2C;if(1V[bY]==1H)1V[bY]=6i;1V[ej]--}J!!1H},9d:I 9d(bN){N f=2Y(bN,1M[1],3),1H;1N(1H=1H?1H.n:L[8V]){f(1H.v,1H.k,L);1N(1H&&1H.r)1H=1H.p}},2F:I 2F(1b){J!!bW(L,1b)}});if($.7s)$.4g(C.1z,"5W",{1k:I(){J 2m.1d(L[ej])}});J C},1d:I(1V,1b,U){N 1H=bW(1V,1b),6i,1l;if(1H){1H.v=U}1h{1V[bY]=1H={i:1l=qe(1b,1i),k:1b,v:U,p:6i=1V[bY],n:1S,r:1t};if(!1V[8V])1V[8V]=1H;if(6i)6i.n=1H;1V[ej]++;if(1l!="F")1V[bR][1l]=1H}J 1V},bW:bW,sK:I(C,3W,6z){1a("./$.1Q-6l")(C,3W,I(aR,7W){1F(L,85,{o:aR,k:7W})},I(){N 1Q=L[85],7W=1Q.k,1H=1Q.l;1N(1H&&1H.r)1H=1H.p;if(!1Q.o||!(1Q.l=1H=1H?1H.n:1Q.o[8V])){1Q.o=1S;J 3K(1)}if(7W=="1Z")J 3K(0,1H.k);if(7W=="2J")J 3K(0,1H.v);J 3K(0,[1H.k,1H.v])},6z?"3k":"2J",!6z,1i)}}},{"./$":21,"./$.2m":4,"./$.2Y":11,"./$.1x-of":14,"./$.1Q":20,"./$.1Q-6l":18,"./$.2p":30}],8:[I(1a,1A,1y){N $1d=1a("./$.1d"),8O=1a("./$.1x-of");1A.1y=I(3W){$1d($1d.P,3W,{8g:I 8g(){N 5B=[];8O(L,1t,5B.1I,5B);J 5B}})}},{"./$.1d":12,"./$.1x-of":14}],9:[I(1a,1A,1y){"3Q 3Y";N $=1a("./$"),4M=1a("./$.2p").4M,2m=1a("./$.2m"),8O=1a("./$.1x-of"),f4=$.2F,3g=$.3g,3D=$.3D,6d=1c.6d||$.5b.1c.6d,id=0,ID=4M("id"),6G=4M("5R"),iJ=4M("zV"),2b=1a("./$.1Y-2L"),3V=2b(5),gx=2b(6);I iG(7A,1b){J 3V.1u(7A.1Y,I(it){J it[0]===1b})}I 9p(1V){J 1V[iJ]||3D(1V,iJ,{1Y:[],1k:I(1b){N 1H=iG(L,1b);if(1H)J 1H[1]},2F:I(1b){J!!iG(L,1b)},1F:I(1b,U){N 1H=iG(L,1b);if(1H)1H[1]=U;1h L.1Y.1I([1b,U])},"3w":I(1b){N 1l=gx.1u(L.1Y,I(it){J it[0]===1b});if(~1l)L.1Y.b8(1l,1);J!!~1l}})[iJ]}1A.1y={aK:I(3W,6z,9Y){I C(){$.1F(2m.al(L,C,3W),ID,id++);N 3t=1M[0];if(3t!=1S)8O(3t,6z,L[9Y],L)}$.gs(C.1z,{"3w":I(1b){if(!3g(1b))J 1t;if(6d(1b))J 9p(L)["3w"](1b);J f4(1b,6G)&&f4(1b[6G],L[ID])&&3w 1b[6G][L[ID]]},2F:I 2F(1b){if(!3g(1b))J 1t;if(6d(1b))J 9p(L).2F(1b);J f4(1b,6G)&&f4(1b[6G],L[ID])}});J C},1d:I(1V,1b,U){if(6d(2m.4W(1b))){9p(1V).1F(1b,U)}1h{f4(1b,6G)||3D(1b,6G,{});1b[6G][1V[ID]]=U}J 1V},9p:9p,6G:6G,ID:ID}},{"./$":21,"./$.1Y-2L":3,"./$.2m":4,"./$.1x-of":14,"./$.2p":30}],10:[I(1a,1A,1y){"3Q 3Y";N $=1a("./$"),$1d=1a("./$.1d"),hb=1a("./$.1Q").hb,8O=1a("./$.1x-of"),5u=1a("./$.5u"),sO=1a("./$.2m").al;1A.1y=I(3W,2L,pk,6z,hk){N 5h=$.g[3W],C=5h,9Y=6z?"1F":"d7",2q=C&&C.1z,O={};I hg(qW,sU){N 2b=2q[qW];if($.FW)2q[qW]=I(a,b){N 1B=2b.1u(L,a===0?0:a,b);J sU?L:1B}}if(!$.2A(C)||!(hk||!hb&&2q.9d&&2q.3k)){C=pk.aK(3W,6z,9Y);$.gs(C.1z,2L)}1h{N al=1q C,8S=al[9Y](hk?{}:-0,1),j2;if(!1a("./$.1Q-8N")(I(1Q){1q C(1Q)})){C=I(){sO(L,C,3W);N 1V=1q 5h,3t=1M[0];if(3t!=1S)8O(3t,6z,1V[9Y],1V);J 1V};C.1z=2q;if($.FW)2q.4y=C}hk||al.9d(I(5g,1b){j2=1/1b===-9s});if(j2){hg("3w");hg("2F");6z&&hg("1k")}if(j2||8S!==al)hg(9Y,1i)}1a("./$.2x").1F(C,3W);O[3W]=C;$1d($1d.G+$1d.W+$1d.F*(C!=5h),O);5u(C);5u($.5b[3W]);if(!hk)pk.sK(C,3W,6z);J C}},{"./$":21,"./$.2m":4,"./$.2x":6,"./$.1d":12,"./$.1x-of":14,"./$.1Q":20,"./$.1Q-8N":19,"./$.5u":27}],11:[I(1a,1A,1y){N bE=1a("./$.2m").fn;1A.1y=I(fn,1V,Y){bE(fn);if(~Y&&1V===1S)J fn;6R(Y){2N 1:J I(a){J fn.1u(1V,a)};2N 2:J I(a,b){J fn.1u(1V,a,b)};2N 3:J I(a,b,c){J fn.1u(1V,a,b,c)}}J I(){J fn.2X(1V,1M)}}},{"./$.2m":4}],12:[I(1a,1A,1y){N $=1a("./$"),3h=$.g,5b=$.5b,2A=$.2A;I 2Y(fn,1V){J I(){J fn.2X(1V,1M)}}3h.5b=5b;$1d.F=1;$1d.G=2;$1d.S=4;$1d.P=8;$1d.B=16;$1d.W=32;I $1d(1J,1C,3G){N 1b,8p,ao,7F,hi=1J&$1d.G,2w=hi?3h:1J&$1d.S?3h[1C]:(3h[1C]||{}).1z,1y=hi?5b:5b[1C]||(5b[1C]={});if(hi)3G=1C;1x(1b in 3G){8p=!(1J&$1d.F)&&2w&&1b in 2w;ao=(8p?2w:3G)[1b];if(1J&$1d.B&&8p)7F=2Y(ao,3h);1h 7F=1J&$1d.P&&2A(ao)?2Y(7B.1u,ao):ao;if(2w&&!8p){if(hi)2w[1b]=ao;1h 3w 2w[1b]&&$.3D(2w,1b,ao)}if(1y[1b]!=ao)$.3D(1y,1b,7F)}}1A.1y=$1d},{"./$":21}],13:[I(1a,1A,1y){N $=1a("./$");1A.1y=I(it){N 1Z=$.cG(it),4Z=$.4Z,9q=$.9q;if(9q)$.2T.1u(9q(it),I(1b){if(4Z(it,1b).fk)1Z.1I(1b)});J 1Z}},{"./$":21}],14:[I(1a,1A,1y){N 2Y=1a("./$.2Y"),1k=1a("./$.1Q").1k,1u=1a("./$.1Q-1u");1A.1y=I(3t,3k,fn,1V){N 1E=1k(3t),f=2Y(fn,1V,3k?2:1),3K;1N(!(3K=1E.2C()).5m){if(1u(1E,f,3K.U,3k)===1t){J 1u.cO(1E)}}}},{"./$.2Y":11,"./$.1Q":20,"./$.1Q-1u":17}],15:[I(1a,1A,1y){1A.1y=I($){$.FW=1i;$.l6=$.g;J $}},{}],16:[I(1a,1A,1y){1A.1y=I(fn,1R,1V){N un=1V===1S;6R(1R.Y){2N 0:J un?fn():fn.1u(1V);2N 1:J un?fn(1R[0]):fn.1u(1V,1R[0]);2N 2:J un?fn(1R[0],1R[1]):fn.1u(1V,1R[0],1R[1]);2N 3:J un?fn(1R[0],1R[1],1R[2]):fn.1u(1V,1R[0],1R[1],1R[2]);2N 4:J un?fn(1R[0],1R[1],1R[2],1R[3]):fn.1u(1V,1R[0],1R[1],1R[2],1R[3]);2N 5:J un?fn(1R[0],1R[1],1R[2],1R[3],1R[4]):fn.1u(1V,1R[0],1R[1],1R[2],1R[3],1R[4])}J fn.2X(1V,1R)}},{}],17:[I(1a,1A,1y){N 4p=1a("./$.2m").4W;I cO(1E){N 6n=1E["J"];if(6n!==1S)4p(6n.1u(1E))}I 1u(1E,fn,U,3k){2s{J 3k?fn(4p(U)[0],U[1]):fn(U)}2o(e){cO(1E);2f e}}1u.cO=cO;1A.1y=1u},{"./$.2m":4}],18:[I(1a,1A,1y){N $1d=1a("./$.1d"),$=1a("./$"),2x=1a("./$.2x"),$1Q=1a("./$.1Q"),9g=1a("./$.5l")("1E"),bd="@@1E",i2="2J",6f=$1Q.6f;1A.1y=I(5h,3W,9m,2C,bP,tb,uK){$1Q.2u(9m,3W,2C);I h8(7W){J I(){J 1q 9m(L,7W)}}N 7m=3W+" sF",2q=5h.1z,oL=2q[9g]||2q[bd]||bP&&2q[bP],bS=oL||h8(bP),2L,1b;if(oL){N dZ=$.9r(bS.1u(1q 5h));2x.1F(dZ,7m,1i);if($.FW&&$.2F(2q,bd))$1Q.1F(dZ,$.1V)}if($.FW)$1Q.1F(2q,bS);6f[3W]=bS;6f[7m]=$.1V;if(bP){2L={1Z:tb?bS:h8("1Z"),2J:bP==i2?bS:h8(i2),3k:bP!=i2?bS:h8("3k")};if(uK)1x(1b in 2L){if(!(1b in 2q))$.3D(2q,1b,2L[1b])}1h $1d($1d.P+$1d.F*$1Q.hb,3W,2L)}}},{"./$":21,"./$.2x":6,"./$.1d":12,"./$.1Q":20,"./$.5l":32}],19:[I(1a,1A,1y){N 9g=1a("./$.5l")("1E"),pX=1t;2s{N pT=[7][9g]();pT["J"]=I(){pX=1i};2G.4U(pT,I(){2f 2})}2o(e){}1A.1y=I(bb){if(!pX)J 1t;N 4M=1t;2s{N 5B=[7],1Q=5B[9g]();1Q.2C=I(){4M=1i};5B[9g]=I(){J 1Q};bb(5B)}2o(e){}J 4M}},{"./$.5l":32}],20:[I(1a,1A,1y){"3Q 3Y";N $=1a("./$"),2x=1a("./$.2x"),4p=1a("./$.2m").4W,9g=1a("./$.5l")("1E"),bd="@@1E",6f={},dZ={};pL(dZ,$.1V);I pL(O,U){$.3D(O,9g,U);if(bd in[])$.3D(O,bd,U)}1A.1y={hb:"1Z"in[]&&!("2C"in[].1Z()),6f:6f,3K:I(5m,U){J{U:U,5m:!!5m}},is:I(it){N O=1c(it),3R=$.g.3R,uG=3R&&3R.1E||bd;J uG in O||9g in O||$.2F(6f,2x.9V(O))},1k:I(it){N 3R=$.g.3R,v1=it[3R&&3R.1E||bd],uU=v1||it[9g]||6f[2x.9V(it)];J 4p(uU.1u(it))},1F:pL,2u:I(9m,3W,2C,2q){9m.1z=$.2u(2q||dZ,{2C:$.4F(1,2C)});2x.1F(9m,3W+" sF")}}},{"./$":21,"./$.2m":4,"./$.2x":6,"./$.5l":32}],21:[I(1a,1A,1y){"3Q 3Y";N 3h=2d 5e!="1S"?5e:7B("J L")(),5b={},7a=1c.7a,9l={}.9l,9k=2R.9k,6k=2R.6k,ah=2R.ah,7I=2R.7I;N 7s=!!I(){2s{J 7a({},"a",{1k:I(){J 2}}).a==2}2o(e){}}();N 3D=pe(1);I aL(it){J cT(it=+it)?0:(it>0?6k:9k)(it)}I 4F(dW,U){J{fk:!(dW&1),cE:!(dW&2),w4:!(dW&4),U:U}}I pi(1m,1b,U){1m[1b]=U;J 1m}I pe(dW){J 7s?I(1m,1b,U){J $.4g(1m,1b,4F(dW,U))}:pi}I 3g(it){J it!==1p&&(2d it=="1m"||2d it=="I")}I 2A(it){J 2d it=="I"}I 6D(it){if(it==1S)2f 4R("va\'t 1u 2b on  "+it);J it}N $=1A.1y=1a("./$.fw")({g:3h,5b:5b,3Z:3h.1o&&1o.3i,3g:3g,2A:2A,it:I(it){J it},1V:I(){J L},aL:aL,6j:I(it){J it>0?7I(aL(it),yL):0},7f:I(1l,Y){1l=aL(1l);J 1l<0?ah(1l+Y,0):7I(1l,Y)},2F:I(it,1b){J 9l.1u(it,1b)},2u:1c.2u,9r:1c.ek,7s:7s,4F:4F,4Z:1c.9n,4g:7a,ki:1c.92,cG:1c.1Z,93:1c.cF,9q:1c.hw,6D:6D,bO:1c,3B:I(it){J $.bO(6D(it))},3D:3D,1d:pe(0),1F:3h.3R?pi:3D,gs:I(2w,5c){1x(N 1b in 5c)3D(2w,1b,5c[1b]);J 2w},2T:[].9d});if(2d u4!="1S")u4=5b;if(2d u3!="1S")u3=3h},{"./$.fw":15}],22:[I(1a,1A,1y){N $=1a("./$");1A.1y=I(1m,el){N O=$.3B(1m),1Z=$.cG(O),Y=1Z.Y,1l=0,1b;1N(Y>1l)if(O[1b=1Z[1l++]]===el)J 1b}},{"./$":21}],23:[I(1a,1A,1y){N $=1a("./$"),4p=1a("./$.2m").4W;1A.1y=I jF(it){4p(it);N 1Z=$.93(it),9q=$.9q;J 9q?1Z.5k(9q(it)):1Z}},{"./$":21,"./$.2m":4}],24:[I(1a,1A,1y){"3Q 3Y";N $=1a("./$"),4J=1a("./$.4J"),bE=1a("./$.2m").fn;1A.1y=I(){N fn=bE(L),Y=1M.Y,jT=2G(Y),i=0,97=$.l6.97,eP=1t;1N(Y>i)if((jT[i]=1M[i++])===97)eP=1i;J I(){N 1V=L,qJ=1M.Y,j=0,k=0,1R;if(!eP&&!qJ)J 4J(fn,jT,1V);1R=jT.2g();if(eP)1x(;Y>j;j++)if(1R[j]===97)1R[j]=1M[k++];1N(qJ>k)1R.1I(1M[k++]);J 4J(fn,1R,1V)}}},{"./$":21,"./$.2m":4,"./$.4J":16}],25:[I(1a,1A,1y){"3Q 3Y";1A.1y=I(ux,2j,uv){N b5=2j===1c(2j)?I(u2){J 2j[u2]}:2j;J I(it){J 2y(uv?it:L).2j(ux,b5)}}},{}],26:[I(1a,1A,1y){N $=1a("./$"),2m=1a("./$.2m");I 5i(O,2q){2m.4W(O);2m(2q===1p||$.3g(2q),2q,": wI\'t 1F as 1z!")}1A.1y={1F:1c.g1||("8a"in{}?I(qd,1F){2s{1F=1a("./$.2Y")(7B.1u,$.4Z(1c.1z,"8a").1F,2);1F({},[])}2o(e){qd=1i}J I g1(O,2q){5i(O,2q);if(qd)O.8a=2q;1h 1F(O,2q);J O}}():1S),5i:5i}},{"./$":21,"./$.2m":4,"./$.2Y":11}],27:[I(1a,1A,1y){N $=1a("./$"),dx=1a("./$.5l")("5u");1A.1y=I(C){if($.7s&&!(dx in C))$.4g(C,dx,{cE:1i,1k:$.1V})}},{"./$":21,"./$.5l":32}],28:[I(1a,1A,1y){"3Q 3Y";N $=1a("./$");1A.1y=I(jz){J I(g7){N s=2y($.6D(L)),i=$.aL(g7),l=s.Y,a,b;if(i<0||i>=l)J jz?"":1S;a=s.7V(i);J a<pO||a>AU||i+1===l||(b=s.7V(i+1))<oX||b>AY?jz?s.9S(i):a:jz?s.2g(i,i+2):(a-pO<<10)+(b-oX)+pK}}},{"./$":21}],29:[I(1a,1A,1y){"3Q 3Y";N $=1a("./$"),2Y=1a("./$.2Y"),2x=1a("./$.2x"),4J=1a("./$.4J"),3h=$.g,2A=$.2A,3Z=$.3Z,1o=3h.1o,83=3h.83,jG=3h.vE,jE=3h.vy,gP=3h.gP,6t=3h.6t,jD=3h.jD,jv=0,6F={},qA="e8",5D,jI,bo;I hl(){N id=+L;if($.2F(6F,id)){N fn=6F[id];3w 6F[id];fn()}}I qb(1G){hl.1u(1G.3x)}if(!2A(jG)||!2A(jE)){jG=I(fn){N 1R=[],i=1;1N(1M.Y>i)1R.1I(1M[i++]);6F[++jv]=I(){4J(2A(fn)?fn:7B(fn),1R)};5D(jv);J jv};jE=I(id){3w 6F[id]};if(2x(83)=="83"){5D=I(id){83.yA(2Y(hl,id,1))}}1h if(6t&&2A(gP)&&!3h.AZ){5D=I(id){gP(id,"*")};6t("4d",qb,1t)}1h if(2A(jD)){jI=1q jD;bo=jI.B2;jI.B1.B0=qb;5D=2Y(bo.gP,bo,1)}1h if(1o&&qA in 1o.4D("6w")){5D=I(id){3Z.89(1o.4D("6w"))[qA]=I(){3Z.8K(L);hl.1u(id)}}}1h{5D=I(id){9o(2Y(hl,id,1),0)}}}1A.1y={1F:jG,ai:jE}},{"./$":21,"./$.2x":6,"./$.2Y":11,"./$.4J":16}],30:[I(1a,1A,1y){N uk=0;I 2p(1b){J"3R("+1b+")97"+(++uk+2R.lM()).3p(36)}2p.4M=1a("./$").g.3R||2p;1A.1y=2p},{"./$":21}],31:[I(1a,1A,1y){N $=1a("./$"),ko=1a("./$.5l")("wz");if($.FW&&!(ko in[]))$.3D(2G.1z,ko,{});1A.1y=I(1b){if($.FW)[][ko][1b]=1i}},{"./$":21,"./$.5l":32}],32:[I(1a,1A,1y){N 3h=1a("./$").g,7A={};1A.1y=I(1C){J 7A[1C]||(7A[1C]=3h.3R&&3h.3R[1C]||1a("./$.2p").4M("3R."+1C))}},{"./$":21,"./$.2p":30}],33:[I(1a,1A,1y){N $=1a("./$"),2x=1a("./$.2x"),$1d=1a("./$.1d"),4J=1a("./$.4J"),dp=1a("./$.1Y-2L"),hs=1a("./$.2p").4M("8a"),2m=1a("./$.2m"),4p=2m.4W,qs=1c.1z,A=[],2g=A.2g,2z=A.2z,9V=2x.9V,2F=$.2F,7a=$.4g,um=$.4Z,92=$.ki,2A=$.2A,3B=$.3B,6j=$.6j,kl=1t;if(!$.7s){2s{kl=7a(1o.4D("1w"),"x",{1k:I(){J 8}}).x==8}2o(e){}$.4g=I(O,P,eQ){if(kl)2s{J 7a(O,P,eQ)}2o(e){}if("1k"in eQ||"1F"in eQ)2f 4R("AR 8X rW!");if("U"in eQ)4p(O)[P]=eQ.U;J O};$.4Z=I(O,P){if(kl)2s{J um(O,P)}2o(e){}if(2F(O,P))J $.4F(!qs.oe.1u(O,P),O[P])};$.ki=92=I(O,c3){4p(O);N 1Z=$.cG(c3),Y=1Z.Y,i=0,P;1N(Y>i)$.4g(O,P=1Z[i++],c3[P]);J O}}$1d($1d.S+$1d.F*!$.7s,"1c",{9n:$.4Z,7a:$.4g,92:92});N hB=("4y,9l,s6,oe,"+"s9,3p,ag").4L(","),qu=hB.5k("Y","1z"),qB=hB.Y;N ht=I(){N cI=1o.4D("cI"),i=qB,gt=">",ep;cI.1L.4f="7Z";$.3Z.89(cI);cI.5c="eL:";ep=cI.AO.1o;ep.g6();ep.eR("<6w>1o.F=1c</6w"+gt);ep.cO();ht=ep.F;1N(i--)3w ht.1z[hB[i]];J ht()};I qo(4S,Y){J I(1m){N O=3B(1m),i=0,1B=[],1b;1x(1b in O)if(1b!=hs)2F(O,1b)&&1B.1I(1b);1N(Y>i)if(2F(O,1b=4S[i++])){~2z.1u(1B,1b)||1B.1I(1b)}J 1B}}I qx(it){J!$.3g(it)}I ks(){}$1d($1d.S,"1c",{ek:$.9r=$.9r||I(O){O=1c(2m.1d(O));if(2F(O,hs))J O[hs];if(2A(O.4y)&&O 8A O.4y){J O.4y.1z}J O 8A 1c?qs:1p},cF:$.93=$.93||qo(qu,qu.Y,1i),2u:$.2u=$.2u||I(O,c3){N 1B;if(O!==1p){ks.1z=4p(O);1B=1q ks;ks.1z=1p;1B[hs]=O}1h 1B=ht();J c3===1S?1B:92(1B,c3)},1Z:$.cG=$.cG||qo(hB,qB,1t),yB:$.it,lZ:$.it,iC:$.it,yz:qx,6d:qx,g0:$.3g});$1d($1d.P,"7B",{3a:I(1V){N fn=2m.fn(L),rn=2g.1u(1M,1);I bB(){N 1R=rn.5k(2g.1u(1M));J 4J(fn,1R,L 8A bB?$.2u(fn.1z):1V)}if(fn.1z)bB.1z=fn.1z;J bB}});I q8(fn){J I(){J fn.2X($.bO(L),1M)}}if(!(0 in 1c("z")&&"z"[0]=="z")){$.bO=I(it){J 2x(it)=="2y"?it.4L(""):1c(it)}}$1d($1d.P+$1d.F*($.bO!=1c),"2G",{2g:q8(2g),3L:q8(A.3L)});$1d($1d.S,"2G",{5K:I(2H){J 2x(2H)=="2G"}});I r4(hp){J I(bN,5r){2m.fn(bN);N O=3B(L),Y=6j(O.Y),1l=hp?Y-1:0,i=hp?-1:1;if(1M.Y<2)1x(;;){if(1l in O){5r=O[1l];1l+=i;3A}1l+=i;2m(hp?1l>=0:Y>1l,"AV of 9P 1Y fR no gv U")}1x(;hp?1l>=0:Y>1l;1l+=i)if(1l in O){5r=bN(5r,O[1l],1l,L)}J 5r}}$1d($1d.P,"2G",{9d:$.2T=$.2T||dp(0),3I:dp(1),2V:dp(2),96:dp(3),94:dp(4),xm:r4(1t),xo:r4(1i),2z:2z=2z||1a("./$.1Y-7z")(1t),cQ:I(el,rg){N O=3B(L),Y=6j(O.Y),1l=Y-1;if(1M.Y>1)1l=2R.7I(1l,$.aL(rg));if(1l<0)1l=6j(Y+1l);1x(;1l>=0;1l--)if(1l in O)if(O[1l]===el)J 1l;J-1}});$1d($1d.P,"2y",{sG:1a("./$.b5")(/^\\s*([\\s\\S]*\\S)?\\s*$/,"$1")});$1d($1d.S,"aZ",{Aq:I(){J+1q aZ}});I lz(bQ){J bQ>9?bQ:"0"+bQ}N qI=1q aZ(-Ar-1),ru=!(qI.bz&&qI.bz()=="Ap-Ao-Ak:Al:39.Am");$1d($1d.P+$1d.F*ru,"aZ",{bz:I(){if(!9c(L))2f k1("Au lC U");N d=L,y=d.uj(),m=d.Av(),s=y<0?"-":y>AC?"+":"";J s+("AE"+2R.4V(y)).2g(s?-6:-4)+"-"+lz(d.uf()+1)+"-"+lz(d.ug())+"T"+lz(d.uh())+":"+lz(d.uo())+":"+lz(d.uq())+"."+(m>99?m:"0"+lz(m))+"Z"}});if(9V(I(){J 1M}())=="1c")2x.9V=I(it){N 4C=9V(it);J 4C=="1c"&&2A(it.tx)?"rh":4C}},{"./$":21,"./$.1Y-7z":2,"./$.1Y-2L":3,"./$.2m":4,"./$.2x":6,"./$.1d":12,"./$.4J":16,"./$.b5":25,"./$.2p":30}],34:[I(1a,1A,1y){"3Q 3Y";N $=1a("./$"),$1d=1a("./$.1d"),7f=$.7f;$1d($1d.P,"2G",{jt:I jt(2w,4o){N O=1c($.6D(L)),3r=$.6j(O.Y),to=7f(2w,3r),4U=7f(4o,3r),4u=1M[2],r5=4u===1S?3r:7f(4u,3r),6N=2R.7I(r5-4U,3r-to),k8=1;if(4U<to&&to<4U+6N){k8=-1;4U=4U+6N-1;to=to+6N-1}1N(6N-->0){if(4U in O)O[to]=O[4U];1h 3w O[to];to+=k8;4U+=k8}J O}});1a("./$.8s")("jt")},{"./$":21,"./$.1d":12,"./$.8s":31}],35:[I(1a,1A,1y){"3Q 3Y";N $=1a("./$"),$1d=1a("./$.1d"),7f=$.7f;$1d($1d.P,"2G",{eG:I eG(U){N O=1c($.6D(L)),Y=$.6j(O.Y),1l=7f(1M[1],Y),4u=1M[2],ra=4u===1S?Y:7f(4u,Y);1N(ra>1l)O[1l++]=U;J O}});1a("./$.8s")("eG")},{"./$":21,"./$.1d":12,"./$.8s":31}],36:[I(1a,1A,1y){N $1d=1a("./$.1d");$1d($1d.P,"2G",{gx:1a("./$.1Y-2L")(6)});1a("./$.8s")("gx")},{"./$.1Y-2L":3,"./$.1d":12,"./$.8s":31}],37:[I(1a,1A,1y){N $1d=1a("./$.1d");$1d($1d.P,"2G",{3V:1a("./$.1Y-2L")(5)});1a("./$.8s")("3V")},{"./$.1Y-2L":3,"./$.1d":12,"./$.8s":31}],38:[I(1a,1A,1y){N $=1a("./$"),2Y=1a("./$.2Y"),$1d=1a("./$.1d"),$1Q=1a("./$.1Q"),1u=1a("./$.1Q-1u");$1d($1d.S+$1d.F*!1a("./$.1Q-8N")(I(1Q){2G.4U(1Q)}),"2G",{4U:I 4U(rj){N O=1c($.6D(rj)),pP=1M[1],kt=pP!==1S,f=kt?2Y(pP,1M[2],2):1S,1l=0,Y,1B,3K,1E;if($1Q.is(O)){1E=$1Q.1k(O);1B=1q(2d L=="I"?L:2G);1x(;!(3K=1E.2C()).5m;1l++){1B[1l]=kt?1u(1E,f,[3K.U,1l],1i):3K.U}}1h{1B=1q(2d L=="I"?L:2G)(Y=$.6j(O.Y));1x(;Y>1l;1l++){1B[1l]=kt?f(O[1l],1l):O[1l]}}1B.Y=1l;J 1B}})},{"./$":21,"./$.2Y":11,"./$.1d":12,"./$.1Q":20,"./$.1Q-1u":17,"./$.1Q-8N":19}],39:[I(1a,1A,1y){N $=1a("./$"),ku=1a("./$.8s"),85=1a("./$.2p").4M("1Q"),$1Q=1a("./$.1Q"),3K=$1Q.3K,6f=$1Q.6f;1a("./$.1Q-6l")(2G,"2G",I(aR,7W){$.1F(L,85,{o:$.3B(aR),i:0,k:7W})},I(){N 1Q=L[85],O=1Q.o,7W=1Q.k,1l=1Q.i++;if(!O||1l>=O.Y){1Q.o=1S;J 3K(1)}if(7W=="1Z")J 3K(0,1l);if(7W=="2J")J 3K(0,O[1l]);J 3K(0,[1l,O[1l]])},"2J");6f.rh=6f.2G;ku("1Z");ku("2J");ku("3k")},{"./$":21,"./$.1Q":20,"./$.1Q-6l":18,"./$.2p":30,"./$.8s":31}],40:[I(1a,1A,1y){N $1d=1a("./$.1d");$1d($1d.S,"2G",{of:I of(){N 1l=0,Y=1M.Y,1B=1q(2d L=="I"?L:2G)(Y);1N(Y>1l)1B[1l]=1M[1l++];1B.Y=Y;J 1B}})},{"./$.1d":12}],41:[I(1a,1A,1y){1a("./$.5u")(2G)},{"./$.5u":27}],42:[I(1a,1A,1y){"3Q 3Y";N $=1a("./$"),3W="1C",4g=$.4g,pN=7B.1z;3W in pN||$.FW&&$.7s&&4g(pN,3W,{cE:1i,1k:I(){N 1n=2y(L).1n(/^\\s*I ([^ (]*)/),1C=1n?1n[1]:"";$.2F(L,3W)||4g(L,3W,$.4F(5,1C));J 1C},1F:I(U){$.2F(L,3W)||4g(L,3W,$.4F(0,U))}})},{"./$":21}],43:[I(1a,1A,1y){"3Q 3Y";N 91=1a("./$.5q-91");1a("./$.5q")("wy",{1k:I 1k(1b){N 1H=91.bW(L,1b);J 1H&&1H.v},1F:I 1F(1b,U){J 91.1d(L,1b===0?0:1b,U)}},91,1i)},{"./$.5q":10,"./$.5q-91":7}],44:[I(1a,1A,1y){N 9s=1/0,$1d=1a("./$.1d"),E=2R.E,am=2R.am,4V=2R.4V,7F=2R.7F,7T=2R.7T,dB=2R.dB,9k=2R.9k,6k=2R.6k,ec=am(2,-52),fp=am(2,-23),sx=am(2,sp)*(2-fp),k2=am(2,-AA);I sj(n){J n+1/ec-1/ec}I a4(x){J(x=+x)==0||x!=x?x:x<0?-1:1}I kr(x){J!9c(x=+x)||x==0?x:x<0?-kr(-x):7T(x+dB(x*x+1))}I bX(x){J(x=+x)==0?x:x>-1e-6&&x<1e-6?x+x*x/2:7F(x)-1}$1d($1d.S,"2R",{rq:I rq(x){J(x=+x)<1?ym:9c(x)?7T(x/E+dB(x+1)*dB(x-1)/E)+1:x},kr:kr,ro:I ro(x){J(x=+x)==0?x:7T((1+x)/(1-x))/2},r6:I r6(x){J a4(x=+x)*am(4V(x),1/3)},sh:I sh(x){J(x>>>=0)?31-6k(7T(x+.5)*2R.Az):32},sg:I sg(x){J(7F(x=+x)+7F(-x))/2},bX:bX,sf:I sf(x){N $4V=4V(x),$a4=a4(x),a,1B;if($4V<k2)J $a4*sj($4V/k2/fp)*k2*fp;a=(1+fp/ec)*$4V;1B=a-(a-$4V);if(1B>sx||1B!=1B)J $a4*9s;J $a4*1B},sC:I sC(Bn,Bk){N p1=0,eV=1M.Y,oV=eV,1R=2G(eV),eh=-9s,2H;1N(eV--){2H=1R[eV]=+1M[eV];if(2H==9s||2H==-9s)J 9s;if(2H>eh)eh=2H}eh=2H||1;1N(oV--)p1+=am(1R[oV]/eh,2);J eh*dB(p1)},sr:I sr(x,y){N fr=zt,xn=+x,yn=+y,xl=fr&xn,yl=fr&yn;J 0|xl*yl+((fr&xn>>>16)*yl+xl*(fr&yn>>>16)<<16>>>0)},su:I su(x){J(x=+x)>-1e-8&&x<1e-8?x-x*x/2:7T(1+x)},st:I st(x){J 7T(x)/2R.zD},s5:I s5(x){J 7T(x)/2R.zS},a4:a4,rN:I rN(x){J 4V(x=+x)<1?(bX(x)-bX(-x))/2:(7F(x-1)-7F(-x-1))*(E/2)},rY:I rY(x){N a=bX(x=+x),b=bX(-x);J a==9s?1:b==9s?-1:(a-b)/(7F(x)+7F(-x))},rP:I rP(it){J(it>0?6k:9k)(it)}})},{"./$.1d":12}],45:[I(1a,1A,1y){"3Q 3Y";N $=1a("./$"),3g=$.3g,2A=$.2A,qY="4Y",4Y=$.g[qY],5h=4Y,2q=4Y.1z;I qK(it){N fn,5g;if(2A(fn=it.ag)&&!3g(5g=fn.1u(it)))J 5g;if(2A(fn=it.3p)&&!3g(5g=fn.1u(it)))J 5g;2f 4R("va\'t zQ 1m to 4i")}I q9(it){if(3g(it))it=qK(it);if(2d it=="2D"&&it.Y>2&&it.7V(0)==48){N qt=1t;6R(it.7V(1)){2N 66:2N 98:qt=1i;2N 79:2N zN:J 7d(it.2g(2),qt?2:8)}}J+it}if($.FW&&!(4Y("As")&&4Y("zU"))){4Y=I 4Y(it){J L 8A 4Y?1q 5h(q9(it)):q9(it)};$.2T.1u($.7s?$.93(5h):("zY,A0,ym,Ah,Ac,"+"ec,9c,ee,cT,q2,e4,"+"yD,aq,7d,ee").4L(","),I(1b){if($.2F(5h,1b)&&!$.2F(4Y,1b)){$.4g(4Y,1b,$.4Z(5h,1b))}});4Y.1z=2q;2q.4y=4Y;$.3D($.g,qY,4Y)}},{"./$":21}],46:[I(1a,1A,1y){N $=1a("./$"),$1d=1a("./$.1d"),4V=2R.4V,6k=2R.6k,pa=$.g.9c,e4=yL;I ee(it){J!$.3g(it)&&pa(it)&&6k(it)===it}$1d($1d.S,"4Y",{ec:2R.am(2,-52),9c:I 9c(it){J 2d it=="4i"&&pa(it)},ee:ee,cT:I cT(4i){J 4i!=4i},q2:I q2(4i){J ee(4i)&&4V(4i)<=e4},e4:e4,yD:-e4,aq:aq,7d:7d})},{"./$":21,"./$.1d":12}],47:[I(1a,1A,1y){N $1d=1a("./$.1d");$1d($1d.S,"1c",{cC:1a("./$.cC")})},{"./$.cC":5,"./$.1d":12}],48:[I(1a,1A,1y){N $1d=1a("./$.1d");$1d($1d.S,"1c",{is:I is(x,y){J x===y?x!==0||1/x===1/y:x!=x&&y!=y}})},{"./$.1d":12}],49:[I(1a,1A,1y){N $1d=1a("./$.1d");$1d($1d.S,"1c",{g1:1a("./$.1F-2q").1F})},{"./$.1d":12,"./$.1F-2q":26}],50:[I(1a,1A,1y){N $=1a("./$"),$1d=1a("./$.1d"),3g=$.3g,3B=$.3B;I 8U(kZ,e6){N fn=($.5b.1c||{})[kZ]||1c[kZ],f=0,o={};o[kZ]=e6==1?I(it){J 3g(it)?fn(it):it}:e6==2?I(it){J 3g(it)?fn(it):1i}:e6==3?I(it){J 3g(it)?fn(it):1t}:e6==4?I 9n(it,1b){J fn(3B(it),1b)}:e6==5?I ek(it){J fn(1c($.6D(it)))}:I(it){J fn(3B(it))};2s{fn("z")}2o(e){f=1}$1d($1d.S+$1d.F*f,"1c",o)}8U("lZ",1);8U("yB",1);8U("iC",1);8U("6d",2);8U("yz",2);8U("g0",3);8U("9n",4);8U("ek",5);8U("1Z");8U("cF")},{"./$":21,"./$.1d":12}],51:[I(1a,1A,1y){"3Q 3Y";N $=1a("./$"),2x=1a("./$.2x"),az={};az[1a("./$.5l")("qT")]="z";if($.FW&&2x(az)!="z")$.3D(1c.1z,"3p",I 3p(){J"[1m "+2x.9V(L)+"]"})},{"./$":21,"./$.2x":6,"./$.5l":32}],52:[I(1a,1A,1y){"3Q 3Y";N $=1a("./$"),2Y=1a("./$.2Y"),2x=1a("./$.2x"),$1d=1a("./$.1d"),2m=1a("./$.2m"),8O=1a("./$.1x-of"),cV=1a("./$.1F-2q").1F,5u=1a("./$.5u"),dx=1a("./$.5l")("5u"),fM=1a("./$.2p").4M("1X"),bV="eS",3h=$.g,83=3h.83,pR=83&&83.yA||1a("./$.cH").1F,P=3h[bV],2A=$.2A,3g=$.3g,bE=2m.fn,4p=2m.4W,2Z;N 8f=2A(P)&&2A(P.7t)&&P.7t(2Z=1q P(I(){}))==2Z;I bU(x){N 5e=1q P(x);cV(5e,bU.1z);J 5e}if(8f){2s{cV(bU,P);bU.1z=$.2u(P.1z,{4y:{U:bU}});if(!(bU.7t(5).5U(I(){})8A bU)){8f=1t}}2o(e){8f=1t}}I aK(C){N S=4p(C)[dx];J S!=1S?S:C}I py(it){N 5U;if(3g(it))5U=it.5U;J 2A(5U)?5U:1t}I bf(1X){N 8S=1X.c;if(8S.Y)pR(I(){N U=1X.v,ok=1X.s==1,i=0;1N(8S.Y>i)!I(5j){N cb=ok?5j.ok:5j.pm,6n,5U;2s{if(cb){if(!ok)1X.h=1i;6n=cb===1i?U:cb(U);if(6n===5j.P){5j.7Q(4R("eS-8S Br"))}1h if(5U=py(6n)){5U.1u(6n,5j.4j,5j.7Q)}1h 5j.4j(6n)}1h 5j.7Q(U)}2o(9Z){5j.7Q(9Z)}}(8S[i++]);8S.Y=0})}I pV(7g){N 1X=7g[fM],8S=1X.a,i=0,5j;if(1X.h)J 1t;1N(8S.Y>i){5j=8S[i++];if(5j.pm||!pV(5j.P))J 1t}J 1i}I $8d(U){N 1X=L,7g;if(1X.d)J;1X.d=1i;1X=1X.r||1X;1X.v=U;1X.s=2;pR(I(){9o(I(){if(pV(7g=1X.p)){if(2x(83)=="83"){83.Bu("By",U,7g)}1h if(3h.b6&&2A(b6.6g)){b6.6g("BD 7g BC",U)}}},1)});bf(1X)}I $7t(U){N 1X=L,5U,5J;if(1X.d)J;1X.d=1i;1X=1X.r||1X;2s{if(5U=py(U)){5J={r:1X,d:1t};5U.1u(U,2Y($7t,5J,1),2Y($8d,5J,1))}1h{1X.v=U;1X.s=1;bf(1X)}}2o(9Z){$8d.1u(5J||{r:1X,d:1t},9Z)}}if(!8f){P=I eS(pH){bE(pH);N 1X={p:2m.al(L,P,bV),c:[],a:[],s:0,d:1t,v:1S,h:1t};$.3D(L,fM,1X);2s{pH(2Y($7t,1X,1),2Y($8d,1X,1))}2o(9Z){$8d.1u(1X,9Z)}};$.gs(P.1z,{5U:I 5U(pZ,fK){N S=4p(4p(L).4y)[dx];N 5j={ok:2A(pZ)?pZ:1i,pm:2A(fK)?fK:1t};N 7g=5j.P=1q(S!=1S?S:P)(I(4j,7Q){5j.4j=bE(4j);5j.7Q=bE(7Q)});N 1X=L[fM];1X.a.1I(5j);1X.c.1I(5j);1X.s&&bf(1X);J 7g},"2o":I(fK){J L.5U(1S,fK)}})}$1d($1d.G+$1d.W+$1d.F*!8f,{eS:P});2x.1F(P,bV);5u(P);5u($.5b[bV]);$1d($1d.S+$1d.F*!8f,bV,{8d:I 8d(r){J 1q(aK(L))(I(4j,7Q){7Q(r)})},7t:I 7t(x){J 3g(x)&&fM in x&&$.9r(x)===L.1z?x:1q(aK(L))(I(4j){4j(x)})}});$1d($1d.S+$1d.F*!(8f&&1a("./$.1Q-8N")(I(1Q){P.9x(1Q)["2o"](I(){})})),bV,{9x:I 9x(3t){N C=aK(L),2J=[];J 1q C(I(4j,7Q){8O(3t,1t,2J.1I,2J);N jg=2J.Y,1K=2G(jg);if(jg)$.2T.1u(2J,I(7g,1l){C.7t(7g).5U(I(U){1K[1l]=U;--jg||4j(1K)},7Q)});1h 4j(1K)})},zj:I zj(3t){N C=aK(L);J 1q C(I(4j,7Q){8O(3t,1t,I(7g){C.7t(7g).5U(4j,7Q)})})}})},{"./$":21,"./$.2m":4,"./$.2x":6,"./$.2Y":11,"./$.1d":12,"./$.1x-of":14,"./$.1Q-8N":19,"./$.1F-2q":26,"./$.5u":27,"./$.cH":29,"./$.2p":30,"./$.5l":32}],53:[I(1a,1A,1y){N $=1a("./$"),$1d=1a("./$.1d"),cV=1a("./$.1F-2q"),$1Q=1a("./$.1Q"),85=1a("./$.2p").4M("1Q"),3K=$1Q.3K,2m=1a("./$.2m"),3g=$.3g,4Z=$.4Z,4g=$.4g,9r=$.9r,2X=7B.2X,4p=2m.4W,vU=1c.g0||$.it;I q6(aR){$.1F(L,85,{o:aR,k:1S,i:0})}$1Q.2u(q6,"1c",I(){N 1Q=L[85],1Z=1Q.k,1b;if(1Z==1S){1Q.k=1Z=[];1x(1b in 1Q.o)1Z.1I(1b)}do{if(1Q.i>=1Z.Y)J 3K(1)}1N(!((1b=1Z[1Q.i++])in 1Q.o));J 3K(0,1b)});I 4O(fn){J I(it){4p(it);2s{fn.2X(1S,1M);J 1i}2o(e){J 1t}}}I 1k(2w,6L){N 6H=1M.Y<3?2w:1M[2],4F=4Z(4p(2w),6L),2q;if(4F)J $.2F(4F,"U")?4F.U:4F.1k===1S?1S:4F.1k.1u(6H);J 3g(2q=9r(2w))?1k(2q,6L,6H):1S}I 1F(2w,6L,V){N 6H=1M.Y<4?2w:1M[3],bL=4Z(4p(2w),6L),iD,2q;if(!bL){if(3g(2q=9r(2w))){J 1F(2q,6L,V,6H)}bL=$.4F(0)}if($.2F(bL,"U")){if(bL.w4===1t||!3g(6H))J 1t;iD=4Z(6H,6L)||$.4F(0);iD.U=V;4g(6H,6L,iD);J 1i}J bL.1F===1S?1t:(bL.1F.1u(6H,V),1i)}N fU={2X:1a("./$.2Y")(7B.1u,2X,3),w6:I w6(2w,w9){N 2q=2m.fn(1M.Y<3?2w:1M[2]).1z,dU=$.2u(3g(2q)?2q:1c.1z),1B=2X.1u(2w,dU,w9);J 3g(1B)?1B:dU},7a:4O(4g),w8:I w8(2w,6L){N 4F=4Z(4p(2w),6L);J 4F&&!4F.cE?1t:3w 2w[6L]},w7:I w7(2w){J 1q q6(4p(2w))},1k:1k,9n:I 9n(2w,6L){J 4Z(4p(2w),6L)},ek:I ek(2w){J 9r(4p(2w))},2F:I 2F(2w,6L){J 6L in 2w},g0:I g0(2w){J!!vU(4p(2w))},jF:1a("./$.8p-1Z"),iC:4O(1c.iC||$.it),1F:1F};if(cV)fU.g1=I g1(2w,2q){cV.5i(2w,2q);2s{cV.1F(2w,2q);J 1i}2o(e){J 1t}};$1d($1d.G,{wq:{}});$1d($1d.S,"wq",fU)},{"./$":21,"./$.2m":4,"./$.2Y":11,"./$.1d":12,"./$.1Q":20,"./$.8p-1Z":23,"./$.1F-2q":26,"./$.2p":30}],54:[I(1a,1A,1y){N $=1a("./$"),2x=1a("./$.2x"),2K=$.g.2K,5h=2K,2q=2K.1z;I wd(){2s{N a=/a/g;if(a===1q 2K(a)){J 1i}J 2K(/a/g,"i")!="/a/i"}2o(e){J 1i}}if($.FW&&$.7s){if(wd()){2K=I 2K(3j,eI){J 1q 5h(2x(3j)=="2K"?3j.3G:3j,eI===1S?3j.eI:eI)};$.2T.1u($.93(5h),I(1b){1b in 2K||$.4g(2K,1b,{cE:1i,1k:I(){J 5h[1b]},1F:I(it){5h[1b]=it}})});2q.4y=2K;2K.1z=2q;$.3D($.g,"2K",2K)}if(/./g.eI!="g")$.4g(2q,"eI",{cE:1i,1k:1a("./$.b5")(/^.*\\/(\\w*)$/,"$1")})}1a("./$.5u")(2K)},{"./$":21,"./$.2x":6,"./$.b5":25,"./$.5u":27}],55:[I(1a,1A,1y){"3Q 3Y";N 91=1a("./$.5q-91");1a("./$.5q")("xK",{d7:I d7(U){J 91.1d(L,U=U===0?0:U,U)}},91)},{"./$.5q":10,"./$.5q-91":7}],56:[I(1a,1A,1y){N $1d=1a("./$.1d");$1d($1d.P,"2y",{Ay:1a("./$.2D-at")(1t)})},{"./$.1d":12,"./$.2D-at":28}],57:[I(1a,1A,1y){"3Q 3Y";N $=1a("./$"),2x=1a("./$.2x"),$1d=1a("./$.1d"),6j=$.6j;$1d($1d.P,"2y",{bv:I bv(7w){if(2x(7w)=="2K")2f 4R();N 1V=2y($.6D(L)),pE=1M[1],3r=6j(1V.Y),4u=pE===1S?3r:2R.7I(6j(pE),3r);7w+="";J 1V.2g(4u-7w.Y,4u)===7w}})},{"./$":21,"./$.2x":6,"./$.1d":12}],58:[I(1a,1A,1y){N $1d=1a("./$.1d"),7f=1a("./$").7f,7D=2y.7D;$1d($1d.S,"2y",{vK:I vK(x){N 4j=[],3r=1M.Y,i=0,4z;1N(3r>i){4z=+1M[i++];if(7f(4z,Bv)!==4z)2f k1(4z+" is 8X a Aj 4z ad");4j.1I(4z<pK?7D(4z):7D(((4z-=pK)>>10)+pO,4z%Bi+oX))}J 4j.3L("")}})},{"./$":21,"./$.1d":12}],59:[I(1a,1A,1y){"3Q 3Y";N $=1a("./$"),2x=1a("./$.2x"),$1d=1a("./$.1d");$1d($1d.P,"2y",{7z:I 7z(7w){if(2x(7w)=="2K")2f 4R();J!!~2y($.6D(L)).2z(7w,1M[1])}})},{"./$":21,"./$.2x":6,"./$.1d":12}],60:[I(1a,1A,1y){N 1F=1a("./$").1F,at=1a("./$.2D-at")(1i),85=1a("./$.2p").4M("1Q"),$1Q=1a("./$.1Q"),3K=$1Q.3K;1a("./$.1Q-6l")(2y,"2y",I(aR){1F(L,85,{o:2y(aR),i:0})},I(){N 1Q=L[85],O=1Q.o,1l=1Q.i,ad;if(1l>=O.Y)J 3K(1);ad=at.1u(O,1l);1Q.i+=ad.Y;J 3K(0,ad)})},{"./$":21,"./$.1Q":20,"./$.1Q-6l":18,"./$.2D-at":28,"./$.2p":30}],61:[I(1a,1A,1y){N $=1a("./$"),$1d=1a("./$.1d");$1d($1d.S,"2y",{fT:I fT(xy){N pg=$.3B(xy.fT),3r=$.6j(pg.Y),xH=1M.Y,4j=[],i=0;1N(3r>i){4j.1I(2y(pg[i++]));if(i<xH)4j.1I(2y(1M[i]))}J 4j.3L("")}})},{"./$":21,"./$.1d":12}],62:[I(1a,1A,1y){"3Q 3Y";N $=1a("./$"),$1d=1a("./$.1d");$1d($1d.P,"2y",{eo:I eo(6N){N 3C=2y($.6D(L)),4j="",n=$.aL(6N);if(n<0||n==9s)2f k1("A9 wI\'t be Ag");1x(;n>0;(n>>>=1)&&(3C+=3C))if(n&1)4j+=3C;J 4j}})},{"./$":21,"./$.1d":12}],63:[I(1a,1A,1y){"3Q 3Y";N $=1a("./$"),2x=1a("./$.2x"),$1d=1a("./$.1d");$1d($1d.P,"2y",{bD:I bD(7w){if(2x(7w)=="2K")2f 4R();N 1V=2y($.6D(L)),1l=$.6j(2R.7I(1M[1],1V.Y));7w+="";J 1V.2g(1l,1l+7w.Y)===7w}})},{"./$":21,"./$.2x":6,"./$.1d":12}],64:[I(1a,1A,1y){"3Q 3Y";N $=1a("./$"),hO=1a("./$.2x").1F,2p=1a("./$.2p"),$1d=1a("./$.1d"),wN=1a("./$.wR"),kp=1a("./$.ic-1Z"),4p=1a("./$.2m").4W,2F=$.2F,$2u=$.2u,4Z=$.4Z,4g=$.4g,4F=$.4F,93=$.93,3B=$.3B,3R=$.g.3R,gM=1t,7m=2p("4C"),7K=2p("aU"),fa={},cD={},8f=$.2A(3R);I 4O(4C){N gV=cD[4C]=$.1F($2u(3R.1z),7m,4C);$.7s&&gM&&4g(1c.1z,4C,{cE:1i,1F:I(U){if(2F(L,7K)&&2F(L[7K],4C))L[7K][4C]=1t;4g(L,4C,4F(1,U))}});J gV}I 7a(it,1b,D){if(D&&2F(cD,1b)){if(!D.fk){if(!2F(it,7K))4g(it,7K,4F(1,{}));it[7K][1b]=1i}1h{if(2F(it,7K)&&it[7K][1b])it[7K][1b]=1t;D.fk=1t}}J 4g(it,1b,D)}I 92(it,P){4p(it);N 1Z=kp(P=3B(P)),i=0,l=1Z.Y,1b;1N(l>i)7a(it,1b=1Z[i++],P[1b]);J it}I 2u(it,P){J P===1S?$2u(it):92($2u(it),P)}I 9n(it,1b){N D=4Z(it=3B(it),1b);if(D&&2F(cD,1b)&&!(2F(it,7K)&&it[7K][1b]))D.fk=1i;J D}I cF(it){N 4S=93(3B(it)),1B=[],i=0,1b;1N(4S.Y>i)if(!2F(cD,1b=4S[i++])&&1b!=7K)1B.1I(1b);J 1B}I hw(it){N 4S=93(3B(it)),1B=[],i=0,1b;1N(4S.Y>i)if(2F(cD,1b=4S[i++]))1B.1I(cD[1b]);J 1B}if(!8f){3R=I 3R(wL){if(L 8A 3R)2f 4R("3R is 8X a 4y");J 4O(2p(wL))};$.3D(3R.1z,"3p",I(){J L[7m]});$.2u=2u;$.4g=7a;$.4Z=9n;$.ki=92;$.93=cF;$.9q=hw}N qi={"1x":I(1b){J 2F(fa,1b+="")?fa[1b]:fa[1b]=3R(1b)},wO:I wO(1b){J wN(fa,1b)},zG:I(){gM=1i},zH:I(){gM=1t}};$.2T.1u(("zP,zv,1E,1n,2j,A1,"+"5u,4L,qK,qT,wz").4L(","),I(it){N gV=1a("./$.5l")(it);qi[it]=8f?gV:4O(gV)});gM=1i;$1d($1d.G+$1d.W,{3R:3R});$1d($1d.S,"3R",qi);$1d($1d.S+$1d.F*!8f,"1c",{2u:2u,7a:7a,92:92,9n:9n,cF:cF,hw:hw});hO(3R,"3R");hO(2R,"2R",1i);hO($.g.7n,"7n",1i)},{"./$":21,"./$.2m":4,"./$.2x":6,"./$.1d":12,"./$.ic-1Z":13,"./$.wR":22,"./$.2p":30,"./$.5l":32}],65:[I(1a,1A,1y){"3Q 3Y";N $=1a("./$"),5R=1a("./$.5q-5R"),9p=5R.9p,ID=5R.ID,6G=5R.6G,2F=$.2F,3g=$.3g,6d=1c.6d||$.5b.1c.6d,az={};N hc=1a("./$.5q")("hc",{1k:I 1k(1b){if(3g(1b)){if(6d(1b))J 9p(L).1k(1b);if(2F(1b,6G))J 1b[6G][L[ID]]}},1F:I 1F(1b,U){J 5R.1d(L,1b,U)}},5R,1i,1i);if($.FW&&(1q hc).1F((1c.lZ||1c)(az),7).1k(az)!=7){$.2T.1u(["3w","2F","1k","1F"],I(1b){N 2b=hc.1z[1b];hc.1z[1b]=I(a,b){if(3g(a)&&6d(a)){N 1B=9p(L)[1b](a,b);J 1b=="1F"?L:1B}J 2b.1u(L,a,b)}})}},{"./$":21,"./$.5q":10,"./$.5q-5R":9}],66:[I(1a,1A,1y){"3Q 3Y";N 5R=1a("./$.5q-5R");1a("./$.5q")("zM",{d7:I d7(U){J 5R.1d(L,U,1i)}},5R,1t,1i)},{"./$.5q":10,"./$.5q-5R":9}],67:[I(1a,1A,1y){N $1d=1a("./$.1d");$1d($1d.P,"2G",{7z:1a("./$.1Y-7z")(1i)});1a("./$.8s")("7z")},{"./$.1Y-7z":2,"./$.1d":12,"./$.8s":31}],68:[I(1a,1A,1y){1a("./$.5q-to-3n")("wy")},{"./$.5q-to-3n":8}],69:[I(1a,1A,1y){N $=1a("./$"),$1d=1a("./$.1d"),jF=1a("./$.8p-1Z");$1d($1d.S,"1c",{wG:I wG(1m){N O=$.3B(1m),1B={};$.2T.1u(jF(O),I(1b){$.4g(1B,1b,$.4F(0,$.4Z(O,1b)))});J 1B}})},{"./$":21,"./$.1d":12,"./$.8p-1Z":23}],70:[I(1a,1A,1y){N $=1a("./$"),$1d=1a("./$.1d");I lK(xA){J I(1m){N O=$.3B(1m),1Z=$.cG(O),Y=1Z.Y,i=0,1B=2G(Y),1b;if(xA)1N(Y>i)1B[i]=[1b=1Z[i++],O[1b]];1h 1N(Y>i)1B[i]=O[1Z[i++]];J 1B}}$1d($1d.S,"1c",{2J:lK(1t),3k:lK(1i)})},{"./$":21,"./$.1d":12}],71:[I(1a,1A,1y){N $1d=1a("./$.1d");$1d($1d.S,"2K",{cu:1a("./$.b5")(/([\\\\\\-[\\]{}()*+?.,^$|])/g,"\\\\$1",1i)})},{"./$.1d":12,"./$.b5":25}],72:[I(1a,1A,1y){1a("./$.5q-to-3n")("xK")},{"./$.5q-to-3n":8}],73:[I(1a,1A,1y){N $1d=1a("./$.1d");$1d($1d.P,"2y",{at:1a("./$.2D-at")(1i)})},{"./$.1d":12,"./$.2D-at":28}],74:[I(1a,1A,1y){N $=1a("./$"),$1d=1a("./$.1d"),$2G=$.5b.2G||2G,9C={};I hQ(1Z,Y){$.2T.1u(1Z.4L(","),I(1b){if(Y==1S&&1b in $2G)9C[1b]=$2G[1b];1h if(1b in[])9C[1b]=1a("./$.2Y")(7B.1u,[][1b],Y)})}hQ("9J,bC,aG,1Z,2J,3k",1);hQ("2z,94,96,9d,3I,2V,3V,gx,7z",3);hQ("3L,2g,5k,1I,b8,cL,kK,cQ,"+"xm,xo,jt,eG,Bh");$1d($1d.S,"2G",9C)},{"./$":21,"./$.2Y":11,"./$.1d":12}],75:[I(1a,1A,1y){1a("./2k.1Y.1E");N $=1a("./$"),6f=1a("./$.1Q").6f,lY=1a("./$.5l")("1E"),lU=6f.2G,eW=$.g.eW;if($.FW&&eW&&!(lY in eW.1z)){$.3D(eW.1z,lY,lU)}6f.eW=lU},{"./$":21,"./$.1Q":20,"./$.5l":32,"./2k.1Y.1E":39}],76:[I(1a,1A,1y){N $1d=1a("./$.1d"),$cH=1a("./$.cH");$1d($1d.G+$1d.B,{vE:$cH.1F,vy:$cH.ai})},{"./$.1d":12,"./$.cH":29}],77:[I(1a,1A,1y){N $=1a("./$"),$1d=1a("./$.1d"),4J=1a("./$.4J"),8y=1a("./$.8y"),f5=$.g.f5,af=!!f5&&/af .\\./.2Z(f5.ne);I 4O(1F){J af?I(fn,lC){J 1F(4J(8y,[].2g.1u(1M,2),$.2A(fn)?fn:7B(fn)),lC)}:1F}$1d($1d.G+$1d.B+$1d.F*af,{9o:4O($.g.9o),mp:4O($.g.mp)})},{"./$":21,"./$.1d":12,"./$.4J":16,"./$.8y":24}],78:[I(1a,1A,1y){1a("./1P/vJ");1a("./1P/2k.wc");1a("./1P/2k.1m.cC");1a("./1P/2k.1m.is");1a("./1P/2k.1m.1F-1z-of");1a("./1P/2k.1m.to-2D");1a("./1P/2k.1m.9C-vr-vs");1a("./1P/2k.I.1C");1a("./1P/2k.4i.4y");1a("./1P/2k.4i.9C");1a("./1P/2k.vc");1a("./1P/2k.2D.4U-4z-ad");1a("./1P/2k.2D.fT");1a("./1P/2k.2D.1E");1a("./1P/2k.2D.4z-ad-at");1a("./1P/2k.2D.vm-fR");1a("./1P/2k.2D.7z");1a("./1P/2k.2D.eo");1a("./1P/2k.2D.wi-fR");1a("./1P/2k.1Y.4U");1a("./1P/2k.1Y.of");1a("./1P/2k.1Y.1E");1a("./1P/2k.1Y.5u");1a("./1P/2k.1Y.r1-qa");1a("./1P/2k.1Y.eG");1a("./1P/2k.1Y.3V");1a("./1P/2k.1Y.3V-1l");1a("./1P/2k.cR");1a("./1P/2k.7g");1a("./1P/2k.3I");1a("./1P/2k.1F");1a("./1P/2k.5R-3I");1a("./1P/2k.5R-1F");1a("./1P/2k.fU");1a("./1P/7i.1Y.7z");1a("./1P/7i.2D.at");1a("./1P/7i.cR.cu");1a("./1P/7i.1m.1k-8p-2n-wl");1a("./1P/7i.1m.to-1Y");1a("./1P/7i.3I.to-3n");1a("./1P/7i.1F.to-3n");1a("./1P/js.1Y.9C");1a("./1P/d9.xS");1a("./1P/d9.wn");1a("./1P/d9.hC.3t");1A.1y=1a("./1P/$").5b},{"./1P/$":21,"./1P/vJ":33,"./1P/2k.1Y.r1-qa":34,"./1P/2k.1Y.eG":35,"./1P/2k.1Y.3V":37,"./1P/2k.1Y.3V-1l":36,"./1P/2k.1Y.4U":38,"./1P/2k.1Y.1E":39,"./1P/2k.1Y.of":40,"./1P/2k.1Y.5u":41,"./1P/2k.I.1C":42,"./1P/2k.3I":43,"./1P/2k.vc":44,"./1P/2k.4i.4y":45,"./1P/2k.4i.9C":46,"./1P/2k.1m.cC":47,"./1P/2k.1m.is":48,"./1P/2k.1m.1F-1z-of":49,"./1P/2k.1m.9C-vr-vs":50,"./1P/2k.1m.to-2D":51,"./1P/2k.7g":52,"./1P/2k.fU":53,"./1P/2k.cR":54,"./1P/2k.1F":55,"./1P/2k.2D.4z-ad-at":56,"./1P/2k.2D.vm-fR":57,"./1P/2k.2D.4U-4z-ad":58,"./1P/2k.2D.7z":59,"./1P/2k.2D.1E":60,"./1P/2k.2D.fT":61,"./1P/2k.2D.eo":62,"./1P/2k.2D.wi-fR":63,"./1P/2k.wc":64,"./1P/2k.5R-3I":65,"./1P/2k.5R-1F":66,"./1P/7i.1Y.7z":67,"./1P/7i.3I.to-3n":68,"./1P/7i.1m.1k-8p-2n-wl":69,"./1P/7i.1m.to-1Y":70,"./1P/7i.cR.cu":71,"./1P/7i.1F.to-3n":72,"./1P/7i.2D.at":73,"./1P/js.1Y.9C":74,"./1P/d9.hC.3t":75,"./1P/d9.wn":76,"./1P/d9.xS":77}],79:[I(1a,1A,1y){(I(3h){!I(3h){"3Q 3Y";N aN=1c.1z.9l;N 1S;N ov=2d 3R==="I"&&3R.1E||"@@1E";N nV=2d 1A==="1m";N 8t=3h.vR;if(8t){if(nV){1A.1y=8t}J}8t=3h.vR=nV?1A.1y:{};I 4O(dA,jj,5e,dl){N aJ=1c.2u((jj||gm).1z);aJ.xY=zo(dA,5e||1p,1q l1(dl||[]));J aJ}8t.4O=4O;I gn(fn,4W,2H){2s{J{1J:"lc",2H:fn.1u(4W,2H)}}2o(9Z){J{1J:"2f",2H:9Z}}}N nn="AJ";N hT="Be";N np="AQ";N gu="AN";N fh={};I gm(){}I cB(){}I fI(){}N Gp=fI.1z=gm.1z;cB.1z=Gp.4y=fI;fI.4y=cB;cB.zh="cB";8t.AK=I(cw){N fD=2d cw==="I"&&cw.4y;J fD?fD===cB||(fD.zh||fD.1C)==="cB":1t};8t.AG=I(cw){cw.8a=fI;cw.1z=1c.2u(Gp);J cw};8t.kv=I(dA,jj,5e,dl){J 1q eS(I(7t,8d){N aJ=4O(dA,jj,5e,dl);N nr=3K.3a(aJ,"2C");N zp=3K.3a(aJ,"2f");I 3K(2b,2H){N 1X=gn(aJ[2b],aJ,2H);if(1X.1J==="2f"){8d(1X.2H);J}N 9B=1X.2H;if(9B.5m){7t(9B.U)}1h{eS.7t(9B.U).5U(nr,zp)}}nr()})};I zo(dA,5e,1j){N 6J=nn;J I 4J(2b,2H){if(6J===np){2f 1q 5o("gm is AF bM")}if(6J===gu){J os()}1N(1i){N 6E=1j.6E;if(6E){if(2b==="J"||2b==="2f"&&6E.1E[2b]===1S){1j.6E=1p;N nq=6E.1E["J"];if(nq){N 1X=gn(nq,6E.1E,2H);if(1X.1J==="2f"){2b="2f";2H=1X.2H;6B}}if(2b==="J"){6B}}N 1X=gn(6E.1E[2b],6E.1E,2H);if(1X.1J==="2f"){1j.6E=1p;2b="2f";2H=1X.2H;6B}2b="2C";2H=1S;N 9B=1X.2H;if(9B.5m){1j[6E.jw]=9B.U;1j.2C=6E.jC}1h{6J=hT;J 9B}1j.6E=1p}if(2b==="2C"){if(6J===hT){1j.m5=2H}1h{3w 1j.m5}}1h if(2b==="2f"){if(6J===nn){6J=gu;2f 2H}if(1j.a2(2H)){2b="2C";2H=1S}}1h if(2b==="J"){1j.z0("J",2H)}6J=np;N 1X=gn(dA,5e,1j);if(1X.1J==="lc"){6J=1j.5m?gu:hT;N 9B={U:1X.2H,5m:1j.5m};if(1X.2H===fh){if(1j.6E&&2b==="2C"){2H=1S}}1h{J 9B}}1h if(1X.1J==="2f"){6J=gu;2b="2f";2H=1X.2H}}}}I iv(2b){Gp[2b]=I(2H){J L.xY(2b,2H)}}iv("2C");iv("2f");iv("J");Gp[ov]=I(){J L};Gp.3p=I(){J"[1m gm]"};I yE(cy){N 1H={ak:cy[0]};if(1 in cy){1H.dR=cy[1]}if(2 in cy){1H.7y=cy[2];1H.fx=cy[3]}L.8r.1I(1H)}I o5(1H){N 1X=1H.cz||{};1X.1J="lc";3w 1X.2H;1H.cz=1X}I l1(dl){L.8r=[{ak:"cX"}];dl.9d(yE,L);L.eT()}8t.1Z=I(1m){N 1Z=[];1x(N 1b in 1m){1Z.1I(1b)}1Z.bC();J I 2C(){1N(1Z.Y){N 1b=1Z.9J();if(1b in 1m){2C.U=1b;2C.5m=1t;J 2C}}2C.5m=1i;J 2C}};I 2J(3t){if(3t){N op=3t[ov];if(op){J op.1u(3t)}if(2d 3t.2C==="I"){J 3t}if(!cT(3t.Y)){N i=-1,2C=I 2C(){1N(++i<3t.Y){if(aN.1u(3t,i)){2C.U=3t[i];2C.5m=1t;J 2C}}2C.U=1S;2C.5m=1i;J 2C};J 2C.2C=2C}}J{2C:os}}8t.2J=2J;I os(){J{U:1S,5m:1i}}l1.1z={4y:l1,eT:I(){L.6i=0;L.2C=0;L.m5=1S;L.5m=1t;L.6E=1p;L.8r.9d(o5);1x(N kN=0,oD;aN.1u(L,oD="t"+kN)||kN<20;++kN){L[oD]=1p}},bw:I(){L.5m=1i;N yK=L.8r[0];N oA=yK.cz;if(oA.1J==="2f"){2f oA.2H}J L.z8},a2:I(dD){if(L.5m){2f dD}N 1j=L;I dQ(yH,lR){1X.1J="2f";1X.2H=dD;1j.2C=yH;J!!lR}1x(N i=L.8r.Y-1;i>=0;--i){N 1H=L.8r[i];N 1X=1H.cz;if(1H.ak==="cX"){J dQ("4u")}if(1H.ak<=L.6i){N oB=aN.1u(1H,"dR");N oC=aN.1u(1H,"7y");if(oB&&oC){if(L.6i<1H.dR){J dQ(1H.dR,1i)}1h if(L.6i<1H.7y){J dQ(1H.7y)}}1h if(oB){if(L.6i<1H.dR){J dQ(1H.dR,1i)}}1h if(oC){if(L.6i<1H.7y){J dQ(1H.7y)}}1h{2f 1q 5o("2s zy 8C 2o or nG")}}}},z0:I(1J,2H){1x(N i=L.8r.Y-1;i>=0;--i){N 1H=L.8r[i];if(1H.ak<=L.6i&&aN.1u(1H,"7y")&&L.6i<1H.7y){N aj=1H;3A}}if(aj&&(1J==="3A"||1J==="6B")&&aj.ak<=2H&&2H<=aj.7y){aj=1p}N 1X=aj?aj.cz:{};1X.1J=1J;1X.2H=2H;if(aj){L.2C=aj.7y}1h{L.dh(1X)}J fh},dh:I(1X,fx){if(1X.1J==="2f"){2f 1X.2H}if(1X.1J==="3A"||1X.1J==="6B"){L.2C=1X.2H}1h if(1X.1J==="J"){L.z8=1X.2H;L.2C="4u"}1h if(1X.1J==="lc"&&fx){L.2C=fx}J fh},zI:I(7y){1x(N i=L.8r.Y-1;i>=0;--i){N 1H=L.8r[i];if(1H.7y===7y){J L.dh(1H.cz,1H.fx)}}},"2o":I(ak){1x(N i=L.8r.Y-1;i>=0;--i){N 1H=L.8r[i];if(1H.ak===ak){N 1X=1H.cz;if(1X.1J==="2f"){N rF=1X.2H;o5(1H)}J rF}}2f 1q 5o("A7 2o Ab")},zz:I(3t,jw,jC){L.6E={1E:2J(3t),jw:jw,jC:jC};J fh}}}(2d 3h==="1m"?3h:2d 1v==="1m"?1v:2d 5e==="1m"?5e:L)}).1u(L,2d 3h!=="1S"?3h:2d 5e!=="1S"?5e:2d 1v!=="1S"?1v:{})},{}]},{},[1]);N 1T={iu:\'1.7.3\',6P:(I(){N ua=f5.ne;N oh=1c.1z.3p.1u(1v.yi)==\'[1m dG]\';J{IE:!!1v.7p&&!oh,qG:ua.2z(\'af 10\')>-1,zL:ua.2z(\'af 10\')>-1||ua.2z(\'af 11\')>-1||ua.2z(\'af 12\')>-1||ua.2z(\'af 13\')>-1||ua.2z(\'.Bp.0\')>-1,dG:oh,xD:ua.2z(\'Bo/\')>-1,i7:ua.2z(\'i7\')>-1&&ua.2z(\'Bg\')===-1,sm:/B9.*B6/.2Z(ua)}})(),gp:{yb:!!1o.jk,Ba:!!1o.Bb,fq:(I(){N 4y=1v.1f||1v.gB;J!!(4y&&4y.1z)})(),jA:(I(){if(2d 1v.Bd!==\'1S\')J 1i;N 1w=1o.4D(\'1w\'),2Q=1o.4D(\'2Q\'),od=1t;if(1w[\'8a\']&&(1w[\'8a\']!==2Q[\'8a\'])){od=1i}1w=2Q=1p;J od})()},ky:\'<6w[^>]*>([\\\\S\\\\s]*?)<\\/6w\\\\s*>\',uH:/^\\/\\*-BN-([\\s\\S]*)\\*\\/\\s*$/,8G:I(){},K:I(x){J x}};if(1T.6P.sm)1T.gp.jA=1t;N 3F=(I(){N k3=(I(){1x(N p in{3p:1}){if(p===\'3p\')J 1t}J 1i})();I a7(){};I 2u(){N 2c=1p,2S=$A(1M);if(1c.2A(2S[0]))2c=2S.aG();I 4A(){L.3T.2X(L,1M)}1c.1O(4A,3F.2O);4A.gh=2c;4A.e0=[];if(2c){a7.1z=2c.1z;4A.1z=1q a7;2c.e0.1I(4A)}1x(N i=0,Y=2S.Y;i<Y;i++)4A.5S(2S[i]);if(!4A.1z.3T)4A.1z.3T=1T.8G;4A.1z.4y=4A;J 4A}I 5S(3G){N 5a=L.gh&&L.gh.1z,2S=1c.1Z(3G);if(k3){if(3G.3p!=1c.1z.3p)2S.1I("3p");if(3G.ag!=1c.1z.ag)2S.1I("ag")}1x(N i=0,Y=2S.Y;i<Y;i++){N 2n=2S[i],U=3G[2n];if(5a&&1c.2A(U)&&U.kq()[0]=="$7x"){N 2b=U;U=(I(m){J I(){J 5a[m].2X(L,1M)}})(2n).4O(2b);U.ag=(I(2b){J I(){J 2b.ag.1u(2b)}})(2b);U.3p=(I(2b){J I(){J 2b.3p.1u(2b)}})(2b)}L.1z[2n]=U}J L}J{2u:2u,2O:{5S:5S}}})();(I(){N cJ=1c.1z.3p,mr=1c.1z.9l,s8=\'sb\',sd=\'sc\',se=\'sa\',sk=\'4Y\',sl=\'2y\',k7=\'1c\',rd=\'[1m 7B]\',si=\'[1m sa]\',mz=\'[1m 4Y]\',my=\'[1m 2y]\',ms=\'[1m 2G]\',rm=\'[1m aZ]\',rt=1v.7n&&2d 7n.eH===\'I\'&&7n.eH(0)===\'0\'&&2d 7n.eH(1T.K)===\'1S\';N rp=[\'3p\',\'s9\',\'ag\',\'9l\',\'s6\',\'oe\',\'4y\'];N k3=(I(){1x(N p in{3p:1}){if(p===\'3p\')J 1t}J 1i})();I gA(o){6R(o){2N 1p:J s8;2N(yC 0):J sd}N 1J=2d o;6R(1J){2N\'uJ\':J se;2N\'4i\':J sk;2N\'2D\':J sl}J k7}I 1O(eu,3G){1x(N 2n in 3G)eu[2n]=3G[2n];J eu}I 3M(1m){2s{if(3o(1m))J\'1S\';if(1m===1p)J\'1p\';J 1m.3M?1m.3M():2y(1m)}2o(e){if(e 8A k1)J\'...\';2f e}}I 8g(U){J kn(\'\',{\'\':U},[])}I kn(1b,eP,cA){N U=eP[1b];if(gA(U)===k7&&2d U.8g===\'I\'){U=U.8g(1b)}N og=cJ.1u(U);6R(og){2N mz:2N si:2N my:U=U.ag()}6R(U){2N 1p:J\'1p\';2N 1i:J\'1i\';2N 1t:J\'1t\'}N 1J=2d U;6R(1J){2N\'2D\':J U.3M(1i);2N\'4i\':J 9c(U)?2y(U):\'1p\';2N\'1m\':1x(N i=0,Y=cA.Y;i<Y;i++){if(cA[i]===U){2f 1q 4R("B5 B4 to \'"+U+"\' in 1m")}}cA.1I(U);N 8y=[];if(og===ms){1x(N i=0,Y=U.Y;i<Y;i++){N 3C=kn(i,U,cA);8y.1I(2d 3C===\'1S\'?\'1p\':3C)}8y=\'[\'+8y.3L(\',\')+\']\'}1h{N 1Z=1c.1Z(U);1x(N i=0,Y=1Z.Y;i<Y;i++){N 1b=1Z[i],3C=kn(1b,U,cA);if(2d 3C!=="1S"){8y.1I(1b.3M(1i)+\':\'+3C)}}8y=\'{\'+8y.3L(\',\')+\'}\'}cA.9J();J 8y}}I eH(1m){J 7n.eH(1m)}I 8I(1m){J $H(1m).8I()}I 9b(1m){J 1m&&1m.9b?1m.9b():2y.dt(1m)}I 1Z(1m){if(gA(1m)!==k7){2f 1q 4R()}N 1K=[];1x(N 2n in 1m){if(mr.1u(1m,2n))1K.1I(2n)}if(k3){1x(N i=0;2n=rp[i];i++){if(mr.1u(1m,2n))1K.1I(2n)}}J 1K}I 2J(1m){N 1K=[];1x(N 2n in 1m)1K.1I(1m[2n]);J 1K}I 4a(1m){J 1O({},1m)}I 8H(1m){J!!(1m&&1m.2P==1)}I 5K(1m){J cJ.1u(1m)===ms}N rf=(2d 2G.5K==\'I\')&&2G.5K([])&&!2G.5K({});if(rf){5K=2G.5K}I gS(1m){J 1m 8A 6Y}I 2A(1m){J cJ.1u(1m)===rd}I 4P(1m){J cJ.1u(1m)===my}I aw(1m){J cJ.1u(1m)===mz}I mF(1m){J cJ.1u(1m)===rm}I 3o(1m){J 2d 1m==="1S"}1O(1c,{1O:1O,3M:3M,8g:rt?eH:8g,8I:8I,9b:9b,1Z:1c.1Z||1Z,2J:2J,4a:4a,8H:8H,5K:5K,gS:gS,2A:2A,4P:4P,aw:aw,mF:mF,3o:3o})})();1c.1O(7B.1z,(I(){N 2g=2G.1z.2g;I 4w(1Y,1R){N j8=1Y.Y,Y=1R.Y;1N(Y--)1Y[j8+Y]=1R[Y];J 1Y}I eM(1Y,1R){1Y=2g.1u(1Y,0);J 4w(1Y,1R)}I kq(){N 4S=L.3p().1n(/^[\\s\\(]*I[^(]*\\(([^)]*)\\)/)[1].2j(/\\/\\/.*?[\\r\\n]|\\/\\*(?:.|[\\r\\n])*?\\*\\//g,\'\').2j(/\\s+/g,\'\').4L(\',\');J 4S.Y==1&&!4S[0]?[]:4S}I 3a(1j){if(1M.Y<2&&1c.3o(1M[0]))J L;if(!1c.2A(L))2f 1q 4R("xU 1m is 8X AL.");N mG=I(){};N 7M=L,1R=2g.1u(1M,1);N bB=I(){N a=eM(1R,1M);N c=L 8A bB?L:1j;J 7M.2X(c,a)};mG.1z=L.1z;bB.1z=1q mG();J bB}I mA(1j){N 7M=L,1R=2g.1u(1M,1);J I(1G){N a=4w([1G||1v.1G],1R);J 7M.2X(1j,a)}}I mB(){if(!1M.Y)J L;N 7M=L,1R=2g.1u(1M,0);J I(){N a=eM(1R,1M);J 7M.2X(L,a)}}I h7(k4){N 7M=L,1R=2g.1u(1M,1);k4=k4*uw;J 1v.9o(I(){J 7M.2X(7M,1R)},k4)}I 5D(){N 1R=4w([0.AI],1M);J L.h7.2X(L,1R)}I 4O(5J){N 7M=L;J I(){N a=4w([7M.3a(L)],1M);J 5J.2X(L,a)}}I 8F(){if(L.mD)J L.mD;N 7M=L;J L.mD=I(){N a=4w([L],1M);J 7M.2X(1p,a)}}N mC={kq:kq,mA:mA,mB:mB,h7:h7,5D:5D,4O:4O,8F:8F};if(!7B.1z.3a)mC.3a=3a;J mC})());(I(2q){I bz(){J L.uj()+\'-\'+(L.uf()+1).9f(2)+\'-\'+L.ug().9f(2)+\'T\'+L.uh().9f(2)+\':\'+L.uo().9f(2)+\':\'+L.uq().9f(2)+\'Z\'}I 8g(){J L.bz()}if(!2q.bz)2q.bz=bz;if(!2q.8g)2q.8g=8g})(aZ.1z);2K.1z.1n=2K.1z.2Z;2K.cu=I(3C){J 2y(3C).2j(/([.*+?^=!:${}()|[\\]\\/\\\\])/g,\'\\\\$1\')};N wP=3F.2u({3T:I(4Q,9U){L.4Q=4Q;L.9U=9U;L.gT=1t;L.gF()},gF:I(){L.ar=mp(L.h6.3a(L),L.9U*uw)},qE:I(){L.4Q(L)},bw:I(){if(!L.ar)J;B3(L.ar);L.ar=1p},h6:I(){if(!L.gT){2s{L.gT=1i;L.qE();L.gT=1t}2o(e){L.gT=1t;2f e}}}});1c.1O(2y,{dt:I(U){J U==1p?\'\':2y(U)},mn:{\'\\b\':\'\\\\b\',\'\\t\':\'\\\\t\',\'\\n\':\'\\\\n\',\'\\f\':\'\\\\f\',\'\\r\':\'\\\\r\',\'\\\\\':\'\\\\\\\\\'}});1c.1O(2y.1z,(I(){N sT=1v.7n&&2d 7n.n3===\'I\'&&7n.n3(\'{"2Z": 1i}\').2Z;I mc(5Y){if(1c.2A(5Y))J 5Y;N et=1q gU(5Y);J I(1n){J et.jk(1n)}}I u1(cR){J cR.3G&&cR.3G!==\'(?:)\'}I 82(3j,5Y){N 1B=\'\',3G=L,1n;5Y=mc(5Y);if(1c.4P(3j))3j=2K.cu(3j);if(!(3j.Y||u1(3j))){5Y=5Y(\'\');J 5Y+3G.4L(\'\').3L(5Y)+5Y}1N(3G.Y>0){1n=3G.1n(3j);if(1n&&1n[0].Y>0){1B+=3G.2g(0,1n.1l);1B+=2y.dt(5Y(1n));3G=3G.2g(1n.1l+1n[0].Y)}1h{1B+=3G,3G=\'\'}}J 1B}I n4(3j,5Y,6N){5Y=mc(5Y);6N=1c.3o(6N)?1:6N;J L.82(3j,I(1n){if(--6N<0)J 1n[0];J 5Y(1n)})}I n5(3j,1E){L.82(3j,1E);J 2y(L)}I nb(Y,dr){Y=Y||30;dr=1c.3o(dr)?\'...\':dr;J L.Y>Y?L.2g(0,Y-dr.Y)+dr:2y(L)}I 8E(){J L.2j(/^\\s+/,\'\').2j(/\\s+$/,\'\')}I hN(){J L.2j(/<\\w+(\\s+("[^"]*"|\'[^\']*\'|[^>])+)?(\\/)?>|<\\/\\w+>/gi,\'\')}I 8m(){J L.2j(1q 2K(1T.ky,\'ey\'),\'\')}I j9(){N u9=1q 2K(1T.ky,\'ey\'),u6=1q 2K(1T.ky,\'im\');J(L.1n(u9)||[]).3I(I(d4){J(d4.1n(u6)||[\'\',\'\'])[1]})}I bH(){J L.j9().3I(I(6w){J b9(6w)})}I nc(){J L.2j(/&/g,\'&uX;\').2j(/</g,\'&lt;\').2j(/>/g,\'&gt;\')}I ni(){J L.hN().2j(/&lt;/g,\'<\').2j(/&gt;/g,\'>\').2j(/&uX;/g,\'&\')}I d1(uT){N 1n=L.8E().1n(/([^?#]*)(#.*)?$/);if(!1n)J{};J 1n[1].4L(uT||\'&\').9I({},I(5O,4h){if((4h=4h.4L(\'=\'))[0]){N 1b=n8(4h.aG()),U=4h.Y>1?4h.3L(\'=\'):4h[0];if(U!=1S){U=U.82(\'+\',\' \');U=n8(U)}if(1b in 5O){if(!1c.5K(5O[1b]))5O[1b]=[5O[1b]];5O[1b].1I(U)}1h 5O[1b]=U}J 5O})}I 6y(){J L.4L(\'\')}I cN(){J L.2g(0,L.Y-1)+2y.7D(L.7V(L.Y-1)+1)}I cM(6N){J 6N<1?\'\':1q 2G(6N+1).3L(L)}I dT(){J L.2j(/-+(.)?/g,I(1n,ml){J ml?ml.7H():\'\'})}I fd(){J L.9S(0).7H()+L.d8(1).3c()}I ng(){J L.2j(/::/g,\'/\').2j(/([A-Z]+)([A-Z][a-z])/g,\'$v5$2\').2j(/([a-z\\d])([A-Z])/g,\'$v5$2\').2j(/-/g,\'97\').3c()}I nd(){J L.2j(/97/g,\'-\')}I 3M(uF){N mk=L.2j(/[\\z1-\\BA\\\\]/g,I(kO){if(kO in 2y.mn){J 2y.mn[kO]}J\'\\\\Bz\'+kO.7V().9f(2,16)});if(uF)J\'"\'+mk.2j(/"/g,\'\\\\"\')+\'"\';J"\'"+mk.2j(/\'/g,\'\\\\\\\'\')+"\'"}I ei(2V){J L.2j(2V||1T.uH,\'$1\')}I jh(){N 3C=L;if(3C.a3())J 1t;3C=3C.2j(/\\\\(?:["\\\\\\/Bw]|u[0-9a-fA-F]{4})/g,\'@\');3C=3C.2j(/"[^"\\\\\\n\\r]*"|1i|1t|1p|-?\\d+(?:\\.\\d*)?(?:[eE][+\\-]?\\d+)?/g,\']\');3C=3C.2j(/(?:^|:|,)(?:\\s*\\[)+/g,\'\');J(/^[\\],:{}\\s]*$/).2Z(3C)}I 8W(t5){N 3n=L.ei(),cx=/[\\BE\\BF-\\BM\\BO\\BP\\BL\\BK-\\BG\\BH-\\BI\\BJ-\\Bt\\Bs\\Bc-\\Bf\\B7]/g;if(cx.2Z(3n)){3n=3n.2j(cx,I(a){J\'\\\\u\'+(\'B8\'+a.7V(0).3p(16)).2g(-4)})}2s{if(!t5||3n.jh())J b9(\'(\'+3n+\')\')}2o(e){}2f 1q Bm(\'Bj BQ 7n 2D: \'+L.3M())}I sR(){N 3n=L.ei();J 7n.n3(3n)}I 3m(3j){J L.2z(3j)>-1}I bD(3j,1U){1U=1c.aw(1U)?1U:0;J L.cQ(3j,1U)===1U}I bv(3j,1U){3j=2y(3j);1U=1c.aw(1U)?1U:L.Y;if(1U<0)1U=0;if(1U>L.Y)1U=L.Y;N d=1U-3j.Y;J d>=0&&L.2z(3j,d)===d}I 9P(){J L==\'\'}I a3(){J/^\\s*$/.2Z(L)}I e2(1m,3j){J 1q gU(L,3j).jk(1m)}J{82:82,n4:n4,n5:n5,nb:nb,8E:2y.1z.sG||8E,hN:hN,8m:8m,j9:j9,bH:bH,nc:nc,ni:ni,d1:d1,zT:d1,6y:6y,cN:cN,cM:cM,dT:dT,fd:fd,ng:ng,nd:nd,3M:3M,ei:ei,jh:jh,8W:sT?sR:8W,3m:3m,bD:2y.1z.bD||bD,bv:2y.1z.bv||bv,9P:9P,a3:a3,e2:e2}})());N gU=3F.2u({3T:I(et,3j){L.et=et.3p();L.3j=3j||gU.tG},jk:I(1m){if(1m&&1c.2A(1m.mK))1m=1m.mK();J L.et.82(L.3j,I(1n){if(1m==1p)J(1n[1]+\'\');N c5=1n[1]||\'\';if(c5==\'\\\\\')J 1n[2];N 2Y=1m,7q=1n[3],3j=/^([^.[]+|\\[((?:.*?[^\\\\])?)\\])(\\.|\\[|$)/;1n=3j.bb(7q);if(1n==1p)J c5;1N(1n!=1p){N tJ=1n[1].bD(\'[\')?1n[2].2j(/\\\\\\\\]/g,\']\'):1n[1];2Y=2Y[tJ];if(1p==2Y||\'\'==1n[3])3A;7q=7q.d8(\'[\'==1n[3]?1n[1].Y:1n[0].Y);1n=3j.bb(7q)}J c5+2y.dt(2Y)})}});gU.tG=/(^|.|\\r|\\n)(#\\{(.*?)\\})/;N $3A={};N bt=(I(){I 2T(1E,1j){2s{L.6v(1E,1j)}2o(e){if(e!=$3A)2f e}J L}I j5(4i,1E,1j){N 1l=-4i,n1=[],1Y=L.6y();if(4i<1)J 1Y;1N((1l+=4i)<1Y.Y)n1.1I(1Y.2g(1l,1l+4i));J n1.eX(1E,1j)}I 9x(1E,1j){1E=1E||1T.K;N 1B=1i;L.2T(I(U,1l){1B=1B&&!!1E.1u(1j,U,1l,L);if(!1B)2f $3A},L);J 1B}I hm(1E,1j){1E=1E||1T.K;N 1B=1t;L.2T(I(U,1l){if(1B=!!1E.1u(1j,U,1l,L))2f $3A},L);J 1B}I eX(1E,1j){1E=1E||1T.K;N 1K=[];L.2T(I(U,1l){1K.1I(1E.1u(1j,U,1l,L))},L);J 1K}I 8N(1E,1j){N 1B;L.2T(I(U,1l){if(1E.1u(1j,U,1l,L)){1B=U;2f $3A}},L);J 1B}I a6(1E,1j){N 1K=[];L.2T(I(U,1l){if(1E.1u(1j,U,1l,L))1K.1I(U)},L);J 1K}I mM(2V,1E,1j){1E=1E||1T.K;N 1K=[];if(1c.4P(2V))2V=1q 2K(2K.cu(2V));L.2T(I(U,1l){if(2V.1n(U))1K.1I(1E.1u(1j,U,1l,L))},L);J 1K}I 3m(1m){if(1c.2A(L.2z)&&L.2z(1m)!=-1)J 1i;N cv=1t;L.2T(I(U){if(U==1m){cv=1i;2f $3A}});J cv}I mZ(4i,gQ){gQ=1c.3o(gQ)?1p:gQ;J L.j5(4i,I(2g){1N(2g.Y<4i)2g.1I(gQ);J 2g})}I 9I(5r,1E,1j){L.2T(I(U,1l){5r=1E.1u(1j,5r,U,1l,L)},L);J 5r}I 4J(2b){N 1R=$A(1M).2g(1);J L.3I(I(U){J U[2b].2X(U,1R)})}I ah(1E,1j){1E=1E||1T.K;N 1B;L.2T(I(U,1l){U=1E.1u(1j,U,1l,L);if(1B==1p||U>=1B)1B=U},L);J 1B}I 7I(1E,1j){1E=1E||1T.K;N 1B;L.2T(I(U,1l){U=1E.1u(1j,U,1l,L);if(1B==1p||U<1B)1B=U},L);J 1B}I mW(1E,1j){1E=1E||1T.K;N mP=[],mQ=[];L.2T(I(U,1l){(1E.1u(1j,U,1l,L)?mP:mQ).1I(U)},L);J[mP,mQ]}I c0(2n){N 1K=[];L.2T(I(U){1K.1I(U[2n])});J 1K}I 8d(1E,1j){N 1K=[];L.2T(I(U,1l){if(!1E.1u(1j,U,1l,L))1K.1I(U)},L);J 1K}I i8(1E,1j){J L.3I(I(U,1l){J{U:U,mN:1E.1u(1j,U,1l,L)}},L).kK(I(2t,4l){N a=2t.mN,b=4l.mN;J a<b?-1:a>b?1:0}).c0(\'U\')}I 6y(){J L.3I()}I mV(){N 1E=1T.K,1R=$A(1M);if(1c.2A(1R.7r()))1E=1R.9J();N tN=[L].5k(1R).3I($A);J L.3I(I(U,1l){J 1E(tN.c0(1l))})}I 5W(){J L.6y().Y}I 3M(){J\'#<bt:\'+L.6y().3M()+\'>\'}J{2T:2T,j5:j5,9x:9x,94:9x,hm:hm,96:hm,eX:eX,3I:eX,8N:8N,a6:a6,2U:a6,2V:a6,mM:mM,3m:3m,A3:3m,mZ:mZ,9I:9I,4J:4J,ah:ah,7I:7I,mW:mW,c0:c0,8d:8d,i8:i8,6y:6y,3k:6y,mV:mV,5W:5W,3M:3M,3V:8N}})();I $A(3t){if(!3t)J[];if(\'6y\'in 1c(3t))J 3t.6y();N Y=3t.Y||0,1K=1q 2G(Y);1N(Y--)1K[Y]=3t[Y];J 1K}I $w(2D){if(!1c.4P(2D))J[];2D=2D.8E();J 2D?2D.4L(/\\s+/):[]}2G.4U=$A;(I(){N 5x=2G.1z,2g=5x.2g,6v=5x.9d;I 2T(1E,1j){1x(N i=0,Y=L.Y>>>0;i<Y;i++){if(i in L)1E.1u(1j,L[i],i,L)}}if(!6v)6v=2T;I ai(){L.Y=0;J L}I 6p(){J L[0]}I 7r(){J L[L.Y-1]}I mX(){J L.2U(I(U){J U!=1p})}I jB(){J L.9I([],I(1Y,U){if(1c.5K(U))J 1Y.5k(U.jB());1Y.1I(U);J 1Y})}I 8C(){N 2J=2g.1u(1M,0);J L.2U(I(U){J!2J.3m(U)})}I bC(oG){J(oG===1t?L.6y():L).mT()}I lr(tw){J L.9I([],I(1Y,U,1l){if(0==1l||(tw?1Y.7r()!=U:!1Y.3m(U)))1Y.1I(U);J 1Y})}I n0(1Y){J L.lr().a6(I(7k){J 1Y.2z(7k)!==-1})}I 4a(){J 2g.1u(L,0)}I 5W(){J L.Y}I 3M(){J\'[\'+L.3I(1c.3M).3L(\', \')+\']\'}I 2z(7k,i){if(L==1p)2f 1q 4R();N 1Y=1c(L),Y=1Y.Y>>>0;if(Y===0)J-1;i=4Y(i);if(cT(i)){i=0}1h if(i!==0&&9c(i)){i=(i>0?1:-1)*2R.6k(2R.4V(i))}if(i>Y)J-1;N k=i>=0?i:2R.ah(Y-2R.4V(i),0);1x(;k<Y;k++)if(k in 1Y&&1Y[k]===7k)J k;J-1}I cQ(7k,i){if(L==1p)2f 1q 4R();N 1Y=1c(L),Y=1Y.Y>>>0;if(Y===0)J-1;if(!1c.3o(i)){i=4Y(i);if(cT(i)){i=0}1h if(i!==0&&9c(i)){i=(i>0?1:-1)*2R.6k(2R.4V(i))}}1h{i=Y}N k=i>=0?2R.7I(i,Y-1):Y-2R.4V(i);1x(;k>=0;k--)if(k in 1Y&&1Y[k]===7k)J k;J-1}I 5k(97){N 1Y=[],iK=2g.1u(1M,0),7k,n=0;iK.cL(L);1x(N i=0,Y=iK.Y;i<Y;i++){7k=iK[i];if(1c.5K(7k)&&!(\'tx\'in 7k)){1x(N j=0,j8=7k.Y;j<j8;j++){if(j in 7k)1Y[n]=7k[j];n++}}1h{1Y[n++]=7k}}1Y.Y=n;J 1Y}I ir(2b){J I(){if(1M.Y===0){J 2b.1u(L,1T.K)}1h if(1M[0]===1S){N 1R=2g.1u(1M,1);1R.cL(1T.K);J 2b.2X(L,1R)}1h{J 2b.2X(L,1M)}}}I 3I(1E){if(L==1p)2f 1q 4R();1E=1E||1T.K;N 1m=1c(L);N 1K=[],1j=1M[1],n=0;1x(N i=0,Y=1m.Y>>>0;i<Y;i++){if(i in 1m){1K[n]=1E.1u(1j,1m[i],i,1m)}n++}1K.Y=n;J 1K}if(5x.3I){3I=ir(2G.1z.3I)}I 2V(1E){if(L==1p||!1c.2A(1E))2f 1q 4R();N 1m=1c(L);N 1K=[],1j=1M[1],U;1x(N i=0,Y=1m.Y>>>0;i<Y;i++){if(i in 1m){U=1m[i];if(1E.1u(1j,U,i,1m)){1K.1I(U)}}}J 1K}if(5x.2V){2V=2G.1z.2V}I 96(1E){if(L==1p)2f 1q 4R();1E=1E||1T.K;N 1j=1M[1];N 1m=1c(L);1x(N i=0,Y=1m.Y>>>0;i<Y;i++){if(i in 1m&&1E.1u(1j,1m[i],i,1m)){J 1i}}J 1t}if(5x.96){96=ir(2G.1z.96)}I 94(1E){if(L==1p)2f 1q 4R();1E=1E||1T.K;N 1j=1M[1];N 1m=1c(L);1x(N i=0,Y=1m.Y>>>0;i<Y;i++){if(i in 1m&&!1E.1u(1j,1m[i],i,1m)){J 1t}}J 1i}if(5x.94){94=ir(2G.1z.94)}1c.1O(5x,bt);if(5x.3k===bt.3k){3w 5x.3k}if(!5x.mT)5x.mT=5x.bC;1c.1O(5x,{6v:6v,3I:3I,eX:3I,2U:2V,2V:2V,a6:2V,96:96,hm:96,94:94,9x:94,ai:ai,6p:6p,7r:7r,mX:mX,jB:jB,8C:8C,bC:bC,lr:lr,n0:n0,4a:4a,6y:4a,5W:5W,3M:3M});N ti=(I(){J[].5k(1M)[0][0]!==1})(1,2);if(ti)5x.5k=5k;if(!5x.2z)5x.2z=2z;if(!5x.cQ)5x.cQ=cQ})();I $H(1m){J 1q 6Y(1m)};N 6Y=3F.2u(bt,(I(){I 3T(1m){L.9R=1c.gS(1m)?1m.3B():1c.4a(1m)}I 6v(1E,1j){N i=0;1x(N 1b in L.9R){N U=L.9R[1b],4h=[1b,U];4h.1b=1b;4h.U=U;1E.1u(1j,4h,i);i++}}I 1F(1b,U){J L.9R[1b]=U}I 1k(1b){if(L.9R[1b]!==1c.1z[1b])J L.9R[1b]}I cZ(1b){N U=L.9R[1b];3w L.9R[1b];J U}I 3B(){J 1c.4a(L.9R)}I 1Z(){J L.c0(\'1b\')}I 2J(){J L.c0(\'U\')}I 1l(U){N 1n=L.8N(I(4h){J 4h.U===U});J 1n&&1n.1b}I eM(1m){J L.4a().4w(1m)}I 4w(1m){J 1q 6Y(1m).9I(L,I(1B,4h){1B.1F(4h.1b,4h.U);J 1B})}I mL(1b,U){if(1c.3o(U))J 1b;U=2y.dt(U);U=U.82(/(\\r)?\\n/,\'\\r\\n\');U=fe(U);U=U.82(/%20/,\'+\');J 1b+\'=\'+U}I 8I(){J L.9I([],I(1K,4h){N 1b=fe(4h.1b),2J=4h.U;if(2J&&2d 2J==\'1m\'){if(1c.5K(2J)){N mR=[];1x(N i=0,3r=2J.Y,U;i<3r;i++){U=2J[i];mR.1I(mL(1b,U))}J 1K.5k(mR)}}1h 1K.1I(mL(1b,2J));J 1K}).3L(\'&\')}I 3M(){J\'#<6Y:{\'+L.3I(I(4h){J 4h.3I(1c.3M).3L(\': \')}).3L(\', \')+\'}>\'}I 4a(){J 1q 6Y(L)}J{3T:3T,6v:6v,1F:1F,1k:1k,cZ:cZ,3B:3B,mK:3B,1Z:1Z,2J:2J,1l:1l,eM:eM,4w:4w,8I:8I,3M:3M,8g:3B,4a:4a}})());6Y.4U=$H;1c.1O(4Y.1z,(I(){I mJ(){J L.9f(2,16)}I cN(){J L+1}I cM(1E,1j){$R(0,L,1i).2T(1E,1j);J L}I 9f(Y,tB){N 2D=L.3p(tB||10);J\'0\'.cM(Y-2D.Y)+2D}I 4V(){J 2R.4V(L)}I bG(){J 2R.bG(L)}I 9k(){J 2R.9k(L)}I 6k(){J 2R.6k(L)}J{mJ:mJ,cN:cN,cM:cM,9f:9f,4V:4V,bG:bG,9k:9k,6k:6k}})());I $R(4o,4u,ez){J 1q tM(4o,4u,ez)}N tM=3F.2u(bt,(I(){I 3T(4o,4u,ez){L.4o=4o;L.4u=4u;L.ez=ez}I 6v(1E,1j){N U=L.4o,i;1x(i=0;L.3m(U);i++){1E.1u(1j,U,i);U=U.cN()}}I 3m(U){if(U<L.4o)J 1t;if(L.ez)J U<L.4u;J U<=L.4u}J{3T:3T,6v:6v,3m:3m}})());N ci={};N tQ={tS:I(){N io;1x(N i=0,Y=1M.Y;i<Y;i++){N tP=1M[i];2s{io=tP();3A}2o(e){}}J io}};N 4b={tD:I(){J tQ.tS(I(){J 1q pQ()},I(){J 1q tL(\'IY.tK\')},I(){J 1q tL(\'yv.tK\')})||1t},mO:0};4b.dy={hv:[],6v:I(1E,1j){L.hv.6v(1E,1j)},je:I(3E){if(!L.3m(3E))L.hv.1I(3E)},pw:I(3E){L.hv=L.hv.8C(3E)},hL:I(4Q,6O,2v,3n){L.2T(I(3E){if(1c.2A(3E[4Q])){2s{3E[4Q].2X(3E,[6O,2v,3n])}2o(e){}}})}};1c.1O(4b.dy,bt);4b.dy.je({iW:I(){4b.mO++},4I:I(){4b.mO--}});4b.5h=3F.2u({3T:I(1r){L.1r={2b:\'eU\',dO:1i,hf:\'aI/x-x1-2Q-IP\',nf:\'Ik-8\',1D:\'\',8W:1i,lx:1i};1c.1O(L.1r,1r||{});L.1r.2b=L.1r.2b.3c();if(1c.gS(L.1r.1D))L.1r.1D=L.1r.1D.3B()}});4b.9D=3F.2u(4b.5h,{nj:1t,3T:I($7x,4x,1r){$7x(1r);L.2v=4b.tD();L.6O(4x)},6O:I(4x){L.4x=4x;L.2b=L.1r.2b;N 6x=1c.4P(L.1r.1D)?L.1r.1D:1c.8I(L.1r.1D);if(![\'1k\',\'eU\'].3m(L.2b)){6x+=(6x?\'&\':\'\')+"hu="+L.2b;L.2b=\'eU\'}if(6x&&L.2b===\'1k\'){L.4x+=(L.4x.3m(\'?\')?\'&\':\'?\')+6x}L.1D=6x.d1();2s{N 5v=1q 4b.n7(L);if(L.1r.iW)L.1r.iW(5v);4b.dy.hL(\'iW\',L,5v);L.2v.g6(L.2b.7H(),L.4x,L.1r.dO);if(L.1r.dO)L.nh.3a(L).5D(1);1h if(L.1r.tC&&1T.6P.qG){2s{L.2v.tE=\'tF-1o\'}2o(e){}}L.2v.e8=L.n2.3a(L);L.tH();L.2W=L.2b==\'eU\'?(L.1r.Im||6x):1p;L.2v.so(L.2W);if(!L.1r.dO&&L.2v.tI)L.n2()}2o(e){L.a2(e)}},n2:I(){N 6A=L.2v.6A;if(6A>1&&!((6A==4)&&L.nj))L.nh(L.2v.6A)},tH:I(){N 81={\'X-In-Iq\':\'pQ\',\'X-1T-iu\':1T.iu,\'Ip\':\'5H/eL, 5H/3Z, aI/3l, 5H/3l, */*\'};if(L.2b==\'eU\'){81[\'dV-1J\']=L.1r.hf+(L.1r.nf?\'; Ia=\'+L.1r.nf:\'\');if(L.2v.tI&&(f5.ne.1n(/i7\\/(\\d{4})/)||[0,sS])[1]<sS)81[\'I9\']=\'cO\'}if(2d L.1r.sQ==\'1m\'){N f6=L.1r.sQ;if(1c.2A(f6.1I))1x(N i=0,Y=f6.Y;i<Y;i+=2)81[f6[i]]=f6[i+1];1h $H(f6).2T(I(4h){81[4h.1b]=4h.U})}1x(N 1C in 81)if(81[1C]!=1p)L.2v.rZ(1C,81[1C])},ct:I(){N 87=L.h5();J!87||(87>=qR&&87<If)||87==Is},h5:I(){2s{if(L.2v.87===IJ)J IG;J L.2v.87||0}2o(e){J 0}},nh:I(6A){N 6J=4b.9D.sM[6A],5v=1q 4b.n7(L);if(6J==\'n6\'){2s{L.nj=1i;(L.1r[\'on\'+5v.87]||L.1r[\'on\'+(L.ct()?\'IK\':\'IL\')]||1T.8G)(5v,5v.iq)}2o(e){L.a2(e)}N hf=5v.dj(\'dV-1J\');if(L.1r.lx==\'lq\'||(L.1r.lx&&L.i0()&&hf&&hf.1n(/^\\s*(5H|aI)\\/(x-)?(Iw|Iy)6w(;.*)?\\s*$/i)))L.sJ()}2s{(L.1r[\'on\'+6J]||1T.8G)(5v,5v.iq);4b.dy.hL(\'on\'+6J,L,5v,5v.iq)}2o(e){L.a2(e)}if(6J==\'n6\'){L.2v.e8=1T.8G}},i0:I(){N m=L.4x.1n(/^\\s*fu?:\\/\\/[^\\/]*/);J!m||(m[0]==\'#{ij}//#{gW}#{bo}\'.e2({ij:a8.ij,gW:1o.gW,bo:a8.bo?\':\'+a8.bo:\'\'}))},dj:I(1C){2s{J L.2v.n9(1C)||1p}2o(e){J 1p}},sJ:I(){2s{J b9((L.2v.5n||\'\').ei())}2o(e){L.a2(e)}},a2:I(dD){(L.1r.sN||1T.8G)(L,dD);4b.dy.hL(\'sN\',L,dD)}});4b.9D.sM=[\'IB\',\'Iu\',\'Iv\',\'IC\',\'n6\'];4b.n7=3F.2u({3T:I(6O){L.6O=6O;N 2v=L.2v=6O.2v,6A=L.6A=2v.6A;if((6A>2&&!1T.6P.IE)||6A==4){L.87=L.h5();L.na=L.t8();L.5n=2y.dt(2v.5n);L.iq=L.tf()}if(6A==4){N 3l=2v.5w;L.5w=1c.3o(3l)?1p:3l;L.IM=L.t6()}},87:0,na:\'\',h5:4b.9D.1z.h5,t8:I(){2s{J L.2v.na||\'\'}2o(e){J\'\'}},dj:4b.9D.1z.dj,IN:I(){2s{J L.hP()}2o(e){J 1p}},n9:I(1C){J L.2v.n9(1C)},hP:I(){J L.2v.hP()},tf:I(){N 3n=L.dj(\'X-7n\');if(!3n)J 1p;2s{3n=n8(cu(3n))}2o(e){}2s{J 3n.8W(L.6O.1r.t0||!L.6O.i0())}2o(e){L.6O.a2(e)}},t6:I(){N 1r=L.6O.1r;if(!1r.8W||(1r.8W!=\'lq\'&&!(L.dj(\'dV-1J\')||\'\').3m(\'aI/3n\'))||L.5n.a3())J 1p;2s{J L.5n.8W(1r.t0||!L.6O.i0())}2o(e){L.6O.a2(e)}}});4b.uO=3F.2u(4b.9D,{3T:I($7x,8h,4x,1r){L.8h={ct:(8h.ct||8h),mI:(8h.mI||(8h.ct?1p:8h))};1r=1c.4a(1r);N 4I=1r.4I;1r.4I=(I(5v,3n){L.t3(5v.5n);if(1c.2A(4I))4I(5v,3n)}).3a(L);$7x(4x,1r)},t3:I(5n){N 6H=L.8h[L.ct()?\'ct\':\'mI\'],1r=L.1r;if(!1r.bH)5n=5n.8m();if(6H=$(6H)){if(1r.ca){if(1c.4P(1r.ca)){N ca={};ca[1r.ca]=5n;6H.5T(ca)}1h 1r.ca(6H,5n)}1h 6H.4w(5n)}}});4b.Ib=3F.2u(4b.5h,{3T:I($7x,8h,4x,1r){$7x(1r);L.4I=L.1r.4I;L.9U=(L.1r.9U||2);L.c9=(L.1r.c9||1);L.mi={};L.8h=8h;L.4x=4x;L.4o()},4o:I(){L.1r.4I=L.uM.3a(L);L.h6()},bw:I(){L.mi.1r.4I=1S;vT(L.ar);(L.4I||1T.8G).2X(L,1M)},uM:I(5v){if(L.1r.c9){L.c9=(5v.5n==L.uL?L.c9*L.1r.c9:1);L.uL=5v.5n}L.ar=L.h6.3a(L).h7(L.c9*L.9U)},h6:I(){L.mi=1q 4b.uO(L.8h,L.4x,L.1r)}});(I(3X){N lv;N m6=2G.1z.2g;N 4N=1o.4D(\'1w\');I $(M){if(1M.Y>1){1x(N i=0,3f=[],Y=1M.Y;i<Y;i++)3f.1I($(1M[i]));J 3f}if(1c.4P(M))M=1o.g2(M);J 1f.1O(M)}3X.$=$;if(!3X.8o)3X.8o={};if(!3X.8o.em){1c.1O(3X.8o,{em:1,Jk:2,kQ:3,Jd:4,Jb:5,IX:6,Jc:7,IS:8,y7:9,IT:10,IU:11,J1:12})}N di={};I uQ(2h,4e){if(2h===\'2U\')J 1t;if(\'1J\'in 4e)J 1t;J 1i}N kx=(I(){2s{N el=1o.4D(\'<3O 1C="x">\');J el.2h.3c()===\'3O\'&&el.1C===\'x\'}2o(9Z){J 1t}})();N kX=3X.1f;I 1f(2h,4e){4e=4e||{};2h=2h.3c();if(kx&&4e.1C){2h=\'<\'+2h+\' 1C="\'+4e.1C+\'">\';3w 4e.1C;J 1f.cd(1o.4D(2h),4e)}if(!di[2h])di[2h]=1f.1O(1o.4D(2h));N 1W=uQ(2h,4e)?di[2h].uZ(1t):1o.4D(2h);J 1f.cd(1W,4e)}3X.1f=1f;1c.1O(3X.1f,kX||{});if(kX)3X.1f.1z=kX.1z;1f.2O={7R:{},c8:{}};N 2L={};N mh={id:\'id\',2a:\'3z\'};I 3M(M){M=$(M);N 1B=\'<\'+M.2h.3c();N 4B,U;1x(N 2n in mh){4B=mh[2n];U=(M[2n]||\'\').3p();if(U)1B+=\' \'+4B+\'=\'+U.3M(1i)}J 1B+\'>\'}2L.3M=3M;I d5(M){J $(M).3P(\'4f\')!==\'7Z\'}I iR(M,8Z){M=$(M);if(2d 8Z!==\'uJ\')8Z=!1f.d5(M);1f[8Z?\'b7\':\'3D\'](M);J M}I 3D(M){M=$(M);M.1L.4f=\'7Z\';J M}I b7(M){M=$(M);M.1L.4f=\'\';J M}1c.1O(2L,{d5:d5,iR:iR,3D:3D,b7:b7});I aF(M){M=$(M);M.2E.8K(M);J M}N uC=(I(){N el=1o.4D("2U"),7C=1i;el.7v="<fY U=\\"2Z\\">2Z</fY>";if(el.1r&&el.1r[0]){7C=el.1r[0].4s.7H()!=="J3"}el=1p;J 7C})();N uB=(I(){2s{N el=1o.4D("5F");if(el&&el.uI){el.7v="<bx><tr><td>2Z</td></tr></bx>";N 7C=2d el.uI[0]=="1S";el=1p;J 7C}}2o(e){J 1i}})();N mg=(I(){2s{N el=1o.4D(\'1w\');el.7v="<qH />";N 7C=(el.8e.Y===0);el=1p;J 7C}2o(e){J 1i}})();N uD=uC||uB||mg;N uA=(I(){N s=1o.4D("6w"),7C=1t;2s{s.89(1o.J5(""));7C=!s.4q||s.4q&&s.4q.2P!==3}2o(e){7C=1i}s=1p;J 7C})();I 4w(M,2e){M=$(M);N 8l=M.7o(\'*\'),i=8l.Y;1N(i--)hd(8l[i]);if(2e&&2e.9M)2e=2e.9M();if(1c.8H(2e))J M.4w().5T(2e);2e=1c.9b(2e);N 2h=M.2h.7H();if(2h===\'I5\'&&uA){M.5H=2e;J M}if(uD){if(2h in dS.9h){1N(M.4q)M.8K(M.4q);N dC=hj(2h,2e.8m());1x(N i=0,1W;1W=dC[i];i++)M.89(1W)}1h if(mg&&1c.4P(2e)&&2e.2z(\'<qH\')>-1){1N(M.4q)M.8K(M.4q);N dC=hj(2h,2e.8m(),1i);1x(N i=0,1W;1W=dC[i];i++)M.89(1W)}1h{M.7v=2e.8m()}}1h{M.7v=2e.8m()}2e.bH.3a(2e).5D();J M}I 2j(M,2e){M=$(M);if(2e&&2e.9M){2e=2e.9M()}1h if(!1c.8H(2e)){2e=1c.9b(2e);N mj=M.7L.GP();mj.GL(M);2e.bH.3a(2e).5D();2e=mj.GH(2e.8m())}M.2E.mm(2e,M);J M}N dS={c5:I(M,1W){M.2E.kD(1W,M)},2M:I(M,1W){M.kD(1W,M.4q)},4E:I(M,1W){M.89(1W)},cY:I(M,1W){M.2E.kD(1W,M.7h)},9h:{GK:[\'<5F>\',\'</5F>\',1],jJ:[\'<5F><bx>\',\'</bx></5F>\',2],sw:[\'<5F><bx><tr>\',\'</tr></bx></5F>\',3],ol:[\'<5F><bx><tr><td>\',\'</td></tr></bx></5F>\',4],rH:[\'<2U>\',\'</2U>\',1]}};N 9h=dS.9h;1c.1O(9h,{sB:9h.jJ,sD:9h.jJ,rv:9h.ol});I v2(M,2e){M=$(M);if(2e&&2e.9M)2e=2e.9M();if(1c.8H(2e)){M.2E.mm(2e,M);J M}2e=1c.9b(2e);N 2c=M.2E,2h=2c.2h.7H();if(2h in dS.9h){N 7h=1f.2C(M);N v4=hj(2h,2e.8m());2c.8K(M);N 1E;if(7h)1E=I(1W){2c.kD(1W,7h)};1h 1E=I(1W){2c.89(1W)};v4.2T(1E)}1h{M.v3=2e.8m()}2e.bH.3a(2e).5D();J M}if(\'v3\'in 1o.3i)2j=v2;I v8(2e){if(1c.3o(2e)||2e===1p)J 1t;if(1c.4P(2e)||1c.aw(2e))J 1i;if(1c.8H(2e))J 1i;if(2e.9M||2e.9b)J 1i;J 1t}I v7(M,2e,1U){1U=1U.3c();N 2b=dS[1U];if(2e&&2e.9M)2e=2e.9M();if(1c.8H(2e)){2b(M,2e);J M}2e=1c.9b(2e);N 2h=((1U===\'c5\'||1U===\'cY\')?M.2E:M).2h.7H();N 8e=hj(2h,2e.8m());if(1U===\'2M\'||1U===\'cY\')8e.bC();1x(N i=0,1W;1W=8e[i];i++)2b(M,1W);2e.bH.3a(2e).5D()}I 5T(M,eg){M=$(M);if(v8(eg))eg={4E:eg};1x(N 1U in eg)v7(M,eg[1U],1U);J M}I 4O(M,5J,4e){M=$(M);if(1c.8H(5J)){$(5J).cd(4e||{})}1h if(1c.4P(5J)){5J=1q 1f(5J,4e)}1h{5J=1q 1f(\'1w\',5J)}if(M.2E)M.2E.mm(5J,M);5J.89(M);J 5J}I m8(M){M=$(M);N 1W=M.4q;1N(1W){N uV=1W.7h;if(1W.2P===8o.kQ&&!/\\S/.2Z(1W.eC))M.8K(1W);1W=uV}J M}I 9P(M){J $(M).7v.a3()}I hj(2h,3Z,lq){N t=dS.9h[2h],1w=4N;N ln=!!t;if(!ln&&lq){ln=1i;t=[\'\',\'\',0]}if(ln){1w.7v=\'&#Gd;\'+t[0]+3Z+t[1];1w.8K(1w.4q);1x(N i=t[2];i--;)1w=1w.4q}1h{1w.7v=3Z}J $A(1w.8e)}I 4a(M,me){if(!(M=$(M)))J;N 4a=M.uZ(me);if(!fy){4a.aC=lv;if(me){N 8l=1f.2U(4a,\'*\'),i=8l.Y;1N(i--)8l[i].aC=lv}}J 1f.1O(4a)}I hd(M){N 2p=7G(M);if(2p){1f.6C(M);if(!fy)M.aC=lv;3w 1f.aS[2p]}}I uY(3f){N i=3f.Y;1N(i--)hd(3f[i])}I uz(3f){N i=3f.Y,M,2p;1N(i--){M=3f[i];2p=7G(M);3w 1f.aS[2p];3w 2B.4n[2p]}}if(fy){uY=uz}I m7(M){if(!(M=$(M)))J;hd(M);N 8l=M.7o(\'*\'),i=8l.Y;1N(i--)hd(8l[i]);J 1p}1c.1O(2L,{aF:aF,4w:4w,2j:2j,5T:5T,4O:4O,m8:m8,9P:9P,4a:4a,m7:m7});I dz(M,2n,lk){M=$(M);lk=lk||-1;N 3f=[];1N(M=M[2n]){if(M.2P===8o.em)3f.1I(1f.1O(M));if(3f.Y===lk)3A}J 3f}I ma(M){J dz(M,\'2E\')}I 8l(M){J 1f.2U(M,\'*\')}I jR(M){M=$(M).4q;1N(M&&M.2P!==8o.em)M=M.7h;J $(M)}I jX(M){N 1K=[],8n=$(M).4q;1N(8n){if(8n.2P===8o.em)1K.1I(1f.1O(8n));8n=8n.7h}J 1K}I jS(M){J dz(M,\'fW\')}I jM(M){J dz(M,\'7h\')}I dL(M){M=$(M);N gD=jS(M),2C=jM(M);J gD.bC().5k(2C)}I 1n(M,2l){M=$(M);if(1c.4P(2l))J 1T.4K.1n(M,2l);J 2l.1n(M)}I li(M,2n,3e,1l){M=$(M),3e=3e||0,1l=1l||0;if(1c.aw(3e)){1l=3e,3e=1p}1N(M=M[2n]){if(M.2P!==1)6B;if(3e&&!1T.4K.1n(M,3e))6B;if(--1l>=0)6B;J 1f.1O(M)}}I up(M,3e,1l){M=$(M);if(1M.Y===1)J $(M.2E);J li(M,\'2E\',3e,1l)}I 9y(M,3e,1l){if(1M.Y===1)J jR(M);M=$(M),3e=3e||0,1l=1l||0;if(1c.aw(3e))1l=3e,3e=\'*\';N 1W=1T.4K.2U(3e,M)[1l];J 1f.1O(1W)}I gD(M,3e,1l){J li(M,\'fW\',3e,1l)}I 2C(M,3e,1l){J li(M,\'7h\',3e,1l)}I 2U(M){M=$(M);N dv=m6.1u(1M,1).3L(\', \');J 1T.4K.2U(dv,M)}I md(M){M=$(M);N dv=m6.1u(1M,1).3L(\', \');N dL=1f.dL(M),1K=[];1x(N i=0,kz;kz=dL[i];i++){if(1T.4K.1n(kz,dv))1K.1I(kz)}J 1K}I m9(M,5a){M=$(M),5a=$(5a);if(!M||!5a)J 1t;1N(M=M.2E)if(M===5a)J 1i;J 1t}I ub(M,5a){M=$(M),5a=$(5a);if(!M||!5a)J 1t;if(!5a.6T)J m9(M,5a);J 5a.6T(M)&&5a!==M}I uc(M,5a){M=$(M),5a=$(5a);if(!M||!5a)J 1t;J(M.9N(5a)&8)===8}N ba;if(4N.9N){ba=uc}1h if(4N.6T){ba=ub}1h{ba=m9}1c.1O(2L,{dz:dz,ma:ma,8l:8l,jR:jR,jX:jX,jS:jS,jM:jM,dL:dL,1n:1n,up:up,9y:9y,gD:gD,2C:2C,2U:2U,md:md,ba:ba,GA:2U,Gz:jX});N u0=1;I mq(M){M=$(M);N id=1f.ck(M,\'id\');if(id)J id;do{id=\'GB\'+u0++}1N($(id));1f.cd(M,\'id\',id);J id}I ck(M,1C){J $(M).3b(1C)}I ue(M,1C){M=$(M);N 5F=8k.fb;if(5F.2J[1C])J 5F.2J[1C](M,1C);if(5F.4S[1C])1C=5F.4S[1C];if(1C.3m(\':\')){if(!M.4e||!M.4e[1C])J 1p;J M.4e[1C].U}J M.3b(1C)}I ut(M,1C){if(1C===\'9X\')J M.9X;J M.3b(1C)}N ud=(I(){4N.90(\'eA\',[]);N U=4N.3b(\'eA\');N 2A=1c.5K(U);4N.iX(\'eA\');J 2A})();if(ud){ck=ue}1h if(1T.6P.dG){ck=ut}I cd(M,1C,U){M=$(M);N 4e={},5F=8k.eR;if(2d 1C===\'1m\'){4e=1C}1h{4e[1C]=1c.3o(U)?1i:U}1x(N 6c in 4e){1C=5F.4S[6c]||6c;U=4e[6c];if(5F.2J[6c]){U=5F.2J[6c](M,U);if(1c.3o(U))6B}if(U===1t||U===1p)M.iX(1C);1h if(U===1i)M.90(1C,1C);1h M.90(1C,U)}J M}N ur=(I(){if(!kx){J 1t}N ch=1o.4D(\'<3O 1J="ch">\');ch.6Z=1i;N 1W=ch.cP(\'6Z\');J!1W||!1W.jp})();I bK(M,4B){4B=8k.2F[4B]||4B;N 1W=$(M).cP(4B);J!!(1W&&1W.jp)}I uu(M,4B){if(4B===\'6Z\'){J M.6Z}J bK(M,4B)}3X.1f.2O.c8.bK=ur?uu:bK;I cc(M){J 1q 1f.hH(M)}N jW={};I mb(2a){if(jW[2a])J jW[2a];N re=1q 2K("(^|\\\\s+)"+2a+"(\\\\s+|$)");jW[2a]=re;J re}I fg(M,2a){if(!(M=$(M)))J;N jK=M.2a;if(jK.Y===0)J 1t;if(jK===2a)J 1i;J mb(2a).2Z(jK)}I kh(M,2a){if(!(M=$(M)))J;if(!fg(M,2a))M.2a+=(M.2a?\' \':\'\')+2a;J M}I kg(M,2a){if(!(M=$(M)))J;M.2a=M.2a.2j(mb(2a),\' \').8E();J M}I mt(M,2a,8Z){if(!(M=$(M)))J;if(1c.3o(8Z))8Z=!fg(M,2a);N 2b=1f[8Z?\'kh\':\'kg\'];J 2b(M,2a)}N 8k={};N gR=\'2a\',gN=\'1x\';4N.90(gR,\'x\');if(4N.2a!==\'x\'){4N.90(\'3z\',\'x\');if(4N.2a===\'x\')gR=\'3z\'}N dH=1o.4D(\'GC\');dH.90(gN,\'x\');if(dH.f0!==\'x\'){dH.90(\'f0\',\'x\');if(dH.f0===\'x\')gN=\'f0\'}dH=1p;I v9(M,4B){J M.3b(4B)}I mE(M,4B){J M.3b(4B,2)}I sv(M,4B){N 1W=M.cP(4B);J 1W?1W.U:\'\'}I hq(M,4B){J $(M).bK(4B)?4B:1p}4N.eA=1T.8G;N mo=4N.3b(\'eA\');N 4X;if(2y(mo).2z(\'{\')>-1){4X=I(M,4B){N U=M.3b(4B);if(!U)J 1p;U=U.3p();U=U.4L(\'{\')[1];U=U.4L(\'}\')[0];J U.8E()}}1h if(mo===\'\'){4X=I(M,4B){N U=M.3b(4B);if(!U)J 1p;J U.8E()}}8k.fb={4S:{\'3z\':gR,\'2a\':gR,\'1x\':gN,\'f0\':gN},2J:{1L:I(M){J M.1L.k6.3c()},9X:I(M){J M.9X}}};8k.eR={4S:{2a:\'3z\',f0:\'1x\',Gs:\'Hc\',HN:\'HM\'},2J:{6Z:I(M,U){U=!!U;M.6Z=U;J U?\'6Z\':1p},1L:I(M,U){M.1L.k6=U?U:\'\'}}};8k.2F={4S:{}};1c.1O(8k.eR.4S,8k.fb.4S);N ul=$w(\'HI HJ HK HS \'+\'I3 hn HY HF HE Hp Hj\');1x(N i=0,6c;6c=ul[i];i++){8k.eR.4S[6c.3c()]=6c;8k.2F.4S[6c.3c()]=6c}1c.1O(8k.fb.2J,{9i:mE,5c:mE,1J:v9,b1:sv,7U:hq,6Z:hq,zs:hq,zi:hq,pC:4X,ia:4X,eA:4X,Hg:4X,Hh:4X,Hi:4X,Hq:4X,Hr:4X,HA:4X,Hz:4X,HB:4X,HC:4X,HD:4X,Hy:4X,Hx:4X,Ht:4X,Hs:4X,Hw:4X});1c.1O(2L,{mq:mq,ck:ck,cd:cd,cc:cc,fg:fg,kh:kh,kg:kg,mt:mt});I rc(1L){if(1L===\'kf\'||1L===\'fs\')J\'ka\';J 1L.dT()}I rb(1L){if(1L===\'kf\'||1L===\'ka\')J\'fs\';J 1L.dT()}I 5p(M,5z){M=$(M);N k5=M.1L,1n;if(1c.4P(5z)){k5.k6+=\';\'+5z;if(5z.3m(\'6q\')){N 6q=5z.1n(/6q:\\s*(\\d?\\.?\\d*)/)[1];1f.ce(M,6q)}J M}1x(N 2n in 5z){if(2n===\'6q\'){1f.ce(M,5z[2n])}1h{N U=5z[2n];if(2n===\'kf\'||2n===\'ka\'){2n=1c.3o(k5.fs)?\'ka\':\'fs\'}2s{k5[2n]=U}2o(e){}}}J M}I 3P(M,1L){M=$(M);1L=rc(1L);N U=M.1L[1L];if(!U||U===\'fo\'){N 9u=1o.nU.rK(M,1p);U=9u?9u[1L]:1p}if(1L===\'6q\')J U?aq(U):1.0;J U===\'fo\'?1p:U}I Hu(M,1L){6R(1L){2N\'2I\':2N\'2r\':if(!1f.d5(M))J 1p;N mu=7d(3P(M,1L),10);if(mu!==M[\'3U\'+1L.fd()])J mu+\'px\';J 1f.av(M,1L);gl:J 3P(M,1L)}}I rk(M,1L){M=$(M);1L=rb(1L);N U=M.1L[1L];if(!U&&M.95){U=M.95[1L]}if(1L===\'6q\'){if(!k9)J nk(M);1h J U?aq(U):1.0}if(U===\'fo\'){if((1L===\'2r\'||1L===\'2I\')&&1f.d5(M))J 1f.av(M,1L)+\'px\';J 1p}J U}I mx(2V){J(2V||\'\').2j(/mw\\([^\\)]*\\)/gi,\'\')}I r8(M){if(!M.95||!M.95.c6)M.1L.s2=1;J M}N k9=(I(){4N.1L.k6="6q:.55";J/^0.55/.2Z(4N.1L.6q)})();I ce(M,U){M=$(M);if(U==1||U===\'\')U=\'\';1h if(U<0.r7)U=0;M.1L.6q=U;J M}I ri(M,U){if(k9)J ce(M,U);M=r8($(M));N 2V=1f.3P(M,\'2V\'),1L=M.1L;if(U==1||U===\'\'){2V=mx(2V);if(2V)1L.2V=2V;1h 1L.iX(\'2V\');J M}if(U<0.r7)U=0;1L.2V=mx(2V)+\' mw(6q=\'+(U*9w)+\')\';J M}I fi(M){J 1f.3P(M,\'6q\')}I nk(M){if(k9)J fi(M);N 2V=1f.3P(M,\'2V\');if(2V.Y===0)J 1.0;N 1n=(2V||\'\').1n(/mw\\(6q=(.*)\\)/i);if(1n&&1n[1])J aq(1n[1])/9w;J 1.0}1c.1O(2L,{5p:5p,3P:3P,ce:ce,fi:fi});if(\'fs\'in 4N.1L){2L.3P=rk;2L.ce=ri;2L.fi=nk}N iO=0;3X.1f.aS={iO:1};I 7G(M){if(M===1v)J 0;if(2d M.aC===\'1S\')M.aC=1f.aS.iO++;J M.aC}I j0(M){if(M===1v)J 0;if(M==1o)J 1;J M.iZ}N fy=(\'iZ\'in 4N);if(fy)7G=j0;I bI(M){if(!(M=$(M)))J;N 2p=7G(M);if(!1f.aS[2p])1f.aS[2p]=$H();J 1f.aS[2p]}I 7A(M,1b,U){if(!(M=$(M)))J;N 6W=bI(M);if(1M.Y===2){6W.4w(1b)}1h{6W.1F(1b,U)}J M}I e5(M,1b,ik){if(!(M=$(M)))J;N 6W=bI(M),U=6W.1k(1b);if(1c.3o(U)){6W.1F(1b,ik);U=ik}J U}1c.1O(2L,{bI:bI,7A:7A,e5:e5});N 2O={},7R=1f.2O.7R,F=1T.gp;if(!F.fq&&(\'8a\'in 4N)){3X.gB={};3X.gB.1z=4N[\'8a\'];F.fq=1i}I rr(2h){if(2d 1v.1f===\'1S\')J 1t;if(!kx)J 1t;N 2q=1v.1f.1z;if(2q){N id=\'97\'+(2R.lM()+\'\').2g(2),el=1o.4D(2h);2q[id]=\'x\';N 7C=(el[id]!==\'x\');3w 2q[id];el=1p;J 7C}J 1t}N r9=rr(\'1m\');I fm(M,2L){1x(N 2n in 2L){N U=2L[2n];if(1c.2A(U)&&!(2n in M))M[2n]=U.8F()}}N k0={};I nl(M){N 2p=7G(M);J(2p in k0)}I 1O(M){if(!M||nl(M))J M;if(M.2P!==8o.em||M==1v)J M;N 2L=1c.4a(2O),2h=M.2h.7H();if(7R[2h])1c.1O(2L,7R[2h]);fm(M,2L);k0[7G(M)]=1i;J M}I sE(M){if(!M||nl(M))J M;N t=M.2h;if(t&&(/^(?:1m|Hk|Ho)$/i.2Z(t))){fm(M,1f.2O);fm(M,1f.2O.c8);fm(M,1f.2O.7R[t.7H()])}J M}if(F.jA){1O=r9?sE:1T.K}I oc(2h,2L){2h=2h.7H();if(!7R[2h])7R[2h]={};1c.1O(7R[2h],2L)}I jV(eu,2L,kk){if(1c.3o(kk))kk=1t;1x(N 2n in 2L){N U=2L[2n];if(!1c.2A(U))6B;if(!kk||!(2n in eu))eu[2n]=U.8F()}}I ss(2h){N 4A;N oj={"Hn":"Hl","rG":"Hm","P":"HX","HW":"HU","HV":"HZ","I0":"I4","DL":"I2","I1":"HT","H1":"f3","H2":"f3","H3":"f3","H4":"f3","H5":"f3","H6":"f3","Q":"HG","HH":"sy","HL":"sy","A":"HR","HQ":"tc","HP":"HO","Hd":"sA","Gw":"sA","sB":"oi","sD":"oi","jJ":"oi","sw":"Gv","rv":"sq","ol":"sq","Gu":"Gt","Gx":"GD"};if(oj[2h])4A=\'fZ\'+oj[2h]+\'1f\';if(1v[4A])J 1v[4A];4A=\'fZ\'+2h+\'1f\';if(1v[4A])J 1v[4A];4A=\'fZ\'+2h.fd()+\'1f\';if(1v[4A])J 1v[4A];N M=1o.4D(2h),2q=M[\'8a\']||M.4y.1z;M=1p;J 2q}I 5S(2L){if(1M.Y===0)s4();if(1M.Y===2){N 2h=2L;2L=1M[1]}if(!2h){1c.1O(1f.2O,2L||{})}1h{if(1c.5K(2h)){1x(N i=0,4C;4C=2h[i];i++)oc(4C,2L)}1h{oc(2h,2L)}}N ob=1v.gB?gB.1z:1f.1z;if(F.fq){jV(ob,1f.2O);jV(ob,1f.2O.c8,1i)}if(F.jA){1x(N 4C in 1f.2O.7R){N 4A=ss(4C);if(1c.3o(4A))6B;jV(4A.1z,7R[4C])}}1c.1O(1f,1f.2O);1c.1O(1f,1f.2O.c8);3w 1f.7R;3w 1f.c8;1f.1O.iS();di={}}1c.1O(3X.1f,{1O:1O,5S:5S});if(1O===1T.K){3X.1f.1O.iS=1T.8G}1h{3X.1f.1O.iS=I(){if(1T.gp.fq)J;1c.1O(2O,1f.2O);1c.1O(2O,1f.2O.c8);k0={}}}I s4(){1c.1O(3H,3H.2O);1c.1O(3H.1f,3H.1f.2O);1c.1O(1f.2O.7R,{"Gq":1c.4a(3H.2O),"Gh":1c.4a(3H.1f.2O),"rH":1c.4a(3H.1f.2O),"rG":1c.4a(3H.1f.2O),"Gg":1c.4a(3H.1f.2O)})}1f.5S(2L);I i6(){4N=1p;di=1p}if(1v.7p)1v.7p(\'ia\',i6)})(L);(I(){I rM(rJ){N 1n=rJ.1n(/^(\\d+)%?$/i);if(!1n)J 1p;J(4Y(1n[1])/9w)}I lg(M,1L){M=$(M);N U=M.1L[1L];if(!U||U===\'fo\'){N 9u=1o.nU.rK(M,1p);U=9u?9u[1L]:1p}if(1L===\'6q\')J U?aq(U):1.0;J U===\'fo\'?1p:U}I rw(M,1L){N U=M.1L[1L];if(!U&&M.95){U=M.95[1L]}J U}I o9(M,1j){N rD=M.8D;N bl=5X(M,\'y3\',1j)||0;N br=5X(M,\'y2\',1j)||0;N pl=5X(M,\'y6\',1j)||0;N pr=5X(M,\'xW\',1j)||0;J rD-bl-br-pl-pr}if(!1c.3o(1o.3i.95)&&!1T.6P.dG){lg=rw}I 5X(U,2n,1j){N M=1p;if(1c.8H(U)){M=U;U=lg(M,2n)}if(U===1p||1c.3o(U)){J 1p}if((/^(?:-)?\\d+(\\.\\d+)?(px)?$/i).2Z(U)){J 1v.aq(U)}N o0=U.3m(\'%\'),rz=(1j===1o.aV);if(/\\d/.2Z(U)&&M&&M.jN&&!(o0&&rz)){N 1L=M.1L.2t,rB=M.jN.2t;M.jN.2t=M.95.2t;M.1L.2t=U||0;U=M.1L.Gi;M.1L.2t=1L;M.jN.2t=rB;J U}if(M&&o0){1j=1j||M.2E;N rX=rM(U),c7=1p;N o6=2n.3m(\'2t\')||2n.3m(\'4l\')||2n.3m(\'2r\');N o7=2n.3m(\'2M\')||2n.3m(\'4E\')||2n.3m(\'2I\');if(1j===1o.aV){if(o6){c7=1o.aV.9v()}1h if(o7){c7=1o.aV.a5()}}1h{if(o6){c7=$(1j).av(\'2r\')}1h if(o7){c7=$(1j).av(\'2I\')}}J(c7===1p)?0:c7*rX}J 0}I Go(4i){if(1c.4P(4i)&&4i.bv(\'px\'))J 4i;J 4i+\'px\'}I rQ(M){1N(M&&M.2E){N 4f=M.3P(\'4f\');if(4f===\'7Z\'){J 1t}M=$(M.2E)}J 1i}N c6=1T.K;if(\'95\'in 1o.3i){c6=I(M){if(!M.95.c6){M.1L.s2=1}J M}}I zf(1b){if(1b.3m(\'3v\'))1b=1b+\'-2r\';J 1b.dT()}1f.7c=3F.2u(6Y,{3T:I($7x,M,kM){$7x();L.M=$(M);1f.7c.c2.2T(I(2n){L.oo(2n,1p)},L);if(kM){L.8j=1i;L.dN();1f.7c.c2.2T(L.om,L);L.bi();L.8j=1t}},oo:I(2n,U){J 6Y.1z.1F.1u(L,2n,U)},1F:I(2n,U){2f"c3 of 1f.7c i9 fb-l5."},1k:I($7x,2n){N U=$7x(2n);J U===1p?L.om(2n):U},dN:I(){if(L.rT())J;N M=L.M;if(rQ(M)){L.l9(1i);J}N 9j={1U:M.1L.1U||\'\',2r:M.1L.2r||\'\',ed:M.1L.ed||\'\',4f:M.1L.4f||\'\'};M.7A(\'o8\',9j);N 1U=lg(M,\'1U\'),2r=M.8D;if(2r===0||2r===1p){M.1L.4f=\'g8\';2r=M.8D}N 1j=(1U===\'gb\')?1o.aV:M.2E;N oa={ed:\'aU\',4f:\'g8\'};if(1U!==\'gb\')oa.1U=\'6V\';M.5p(oa);N rR=M.8D,gg;if(2r&&(rR===2r)){gg=o9(M,1j)}1h if(1U===\'6V\'||1U===\'gb\'){gg=o9(M,1j)}1h{N 2c=M.2E,rS=$(2c).ay();gg=rS.1k(\'2r\')-L.1k(\'4k-2t\')-L.1k(\'3v-2t\')-L.1k(\'3s-2t\')-L.1k(\'3s-4l\')-L.1k(\'3v-4l\')-L.1k(\'4k-4l\')}M.5p({2r:gg+\'px\'});L.l9(1i)},bi:I(){N M=L.M;N 9j=M.e5(\'o8\');M.7A(\'o8\',1p);M.5p(9j);L.l9(1t)},om:I(2n){N e1=1f.7c.e1;if(!(2n in e1)){2f"Gn 8X cv."}J L.oo(2n,e1[2n].1u(L,L.M))},rT:I(){J L.M.e5(\'u8\',1t)},l9:I(8Z){J L.M.7A(\'u8\',8Z)},3B:I(){N 1R=$A(1M);N 1Z=(1R.Y===0)?1f.7c.c2:1R.3L(\' \').4L(\' \');N 4W={};1Z.2T(I(1b){if(!1f.7c.c2.3m(1b))J;N U=L.1k(1b);if(U!=1p)4W[1b]=U},L);J 4W},Gm:I(){N 4W=L.3B.2X(L,1M);J 1q 6Y(4W)},Gk:I(){N 1R=$A(1M);N 1Z=(1R.Y===0)?1f.7c.c2:1R.3L(\' \').4L(\' \');N 9u={};1Z.2T(I(1b){if(!1f.7c.c2.3m(1b))J;if(1f.7c.ze.3m(1b))J;N U=L.1k(1b);if(U!=1p)9u[zf(1b)]=U+\'px\'},L);J 9u},3M:I(){J"#<1f.7c>"}});1c.1O(1f.7c,{c2:$w(\'2I 2r 2M 2t 4l 4E 3v-2t 3v-4l 3v-2M 3v-4E 3s-2t 3s-4l 3s-2M 3s-4E 4k-2M 4k-4E 4k-2t 4k-4l 3s-4t-2r 3s-4t-2I 3v-4t-2r 3v-4t-2I 4k-4t-2r 4k-4t-2I\'),ze:$w(\'3s-4t-2r 3s-4t-2I 4k-4t-2r 4k-4t-2I 3v-4t-2r 3v-4t-2I\'),e1:{\'2I\':I(M){if(!L.8j)L.dN();N dM=L.1k(\'3v-4t-2I\');if(dM<=0){if(!L.8j)L.bi();J 0}N zd=L.1k(\'3v-2M\'),zc=L.1k(\'3v-4E\');N lm=L.1k(\'3s-2M\'),lA=L.1k(\'3s-4E\');if(!L.8j)L.bi();J dM-zd-zc-lm-lA},\'2r\':I(M){if(!L.8j)L.dN();N dP=L.1k(\'3v-4t-2r\');if(dP<=0){if(!L.8j)L.bi();J 0}N z4=L.1k(\'3v-2t\'),yX=L.1k(\'3v-4l\');N ly=L.1k(\'3s-2t\'),lw=L.1k(\'3s-4l\');if(!L.8j)L.bi();J dP-z4-yX-ly-lw},\'3s-4t-2I\':I(M){N 2I=L.1k(\'2I\'),lm=L.1k(\'3s-2M\'),lA=L.1k(\'3s-4E\');J 2I+lm+lA},\'3s-4t-2r\':I(M){N 2r=L.1k(\'2r\'),ly=L.1k(\'3s-2t\'),lw=L.1k(\'3s-4l\');J 2r+ly+lw},\'3v-4t-2I\':I(M){if(!L.8j)L.dN();N 2I=M.c4;if(!L.8j)L.bi();J 2I},\'3v-4t-2r\':I(M){if(!L.8j)L.dN();N 2r=M.8D;if(!L.8j)L.bi();J 2r},\'4k-4t-2I\':I(M){N dM=L.1k(\'3v-4t-2I\'),zg=L.1k(\'4k-2M\'),zr=L.1k(\'4k-4E\');if(dM<=0)J 0;J dM+zg+zr},\'4k-4t-2r\':I(M){N dP=L.1k(\'3v-4t-2r\'),zl=L.1k(\'4k-2t\'),zm=L.1k(\'4k-4l\');if(dP<=0)J 0;J dP+zl+zm},\'2M\':I(M){N 3U=M.8B();J 3U.2M},\'4E\':I(M){N 3U=M.8B(),2c=M.7O(),zn=2c.av(\'2I\');N zq=L.1k(\'3v-4t-2I\');J zn-zq-3U.2M},\'2t\':I(M){N 3U=M.8B();J 3U.2t},\'4l\':I(M){N 3U=M.8B(),2c=M.7O(),y9=2c.av(\'2r\');N ye=L.1k(\'3v-4t-2r\');J y9-ye-3U.2t},\'3s-2M\':I(M){J 5X(M,\'GY\')},\'3s-4E\':I(M){J 5X(M,\'GX\')},\'3s-2t\':I(M){J 5X(M,\'y6\')},\'3s-4l\':I(M){J 5X(M,\'xW\')},\'3v-2M\':I(M){J 5X(M,\'GW\')},\'3v-4E\':I(M){J 5X(M,\'GU\')},\'3v-2t\':I(M){J 5X(M,\'y3\')},\'3v-4l\':I(M){J 5X(M,\'y2\')},\'4k-2M\':I(M){J 5X(M,\'GV\')},\'4k-4E\':I(M){J 5X(M,\'iN\')},\'4k-2t\':I(M){J 5X(M,\'GZ\')},\'4k-4l\':I(M){J 5X(M,\'Ha\')}}});if(\'cf\'in 1o.3i){1c.1O(1f.7c.e1,{\'4l\':I(M){N 2c=c6(M.7O());N bj=M.cf(),l4=2c.cf();J(l4.4l-bj.4l).bG()},\'4E\':I(M){N 2c=c6(M.7O());N bj=M.cf(),l4=2c.cf();J(l4.4E-bj.4E).bG()}})}1f.8i=3F.2u({3T:I(2t,2M){L.2t=2t.bG();L.2M=2M.bG();L[0]=L.2t;L[1]=L.2M},yr:I(3U){J 1q 1f.8i(L.2t-3U.2t,L.2M-3U.2M)},3M:I(){J"#<1f.8i 2t: #{2t} 2M: #{2M}>".e2(L)},3p:I(){J"[#{2t}, #{2M}]".e2(L)},6y:I(){J[L.2t,L.2M]}});I ay(M,kM){J 1q 1f.7c(M,kM)}I av(M,2n){J $(M).ay().1k(2n)}I a5(M){J 1f.8T(M).2I}I 9v(M){J 1f.8T(M).2r}I 8T(M){M=$(M);N 4f=1f.3P(M,\'4f\');if(4f&&4f!==\'7Z\'){J{2r:M.8D,2I:M.c4}}N 1L=M.1L;N 9j={ed:1L.ed,1U:1L.1U,4f:1L.4f};N oE={ed:\'aU\',4f:\'g8\'};if(9j.1U!==\'gb\')oE.1U=\'6V\';1f.5p(M,oE);N gk={2r:M.8D,2I:M.c4};1f.5p(M,9j);J gk}I 7O(M){M=$(M);I oF(M){J hV(M)?$(1o.2W):$(M)}if(nD(M)||hG(M)||iy(M)||hV(M))J $(1o.2W);N yN=(1f.3P(M,\'4f\')===\'oG\');if(!yN&&M.6X)J oF(M.6X);1N((M=M.2E)&&M!==1o.2W){if(1f.3P(M,\'1U\')!==\'fB\'){J oF(M)}}J $(1o.2W)}I 9z(M){M=$(M);N 5E=0,5C=0;if(M.2E){do{5E+=M.dc||0;5C+=M.dg||0;M=M.6X}1N(M)}J 1q 1f.8i(5C,5E)}I 8B(M){M=$(M);N 9e=M.ay();N 5E=0,5C=0;do{5E+=M.dc||0;5C+=M.dg||0;M=M.6X;if(M){if(iy(M))3A;N p=1f.3P(M,\'1U\');if(p!==\'fB\')3A}}1N(M);5C-=9e.1k(\'4k-2t\');5E-=9e.1k(\'4k-2M\');J 1q 1f.8i(5C,5E)}I g5(M){N 5E=0,5C=0;do{if(M===1o.2W){N oz=1o.3i||1o.2W.2E||1o.2W;5E+=!1c.3o(1v.fC)?1v.fC:oz.7b||0;5C+=!1c.3o(1v.ev)?1v.ev:oz.7e||0;3A}1h{5E+=M.7b||0;5C+=M.7e||0;M=M.2E}}1N(M);J 1q 1f.8i(5C,5E)}I aB(gd){N 5E=0,5C=0,oy=1o.2W;gd=$(gd);N M=gd;do{5E+=M.dc||0;5C+=M.dg||0;if(M.6X==oy&&1f.3P(M,\'1U\')==\'6V\')3A}1N(M=M.6X);M=gd;do{if(M!=oy){5E-=M.7b||0;5C-=M.7e||0}}1N(M=M.2E);J 1q 1f.8i(5C,5E)}I fL(M){M=$(M);if(1f.3P(M,\'1U\')===\'6V\'){J M}N 6X=7O(M);N yu=M.aB(),yp=6X.aB();N 3U=yu.yr(yp);N 9e=M.ay();M.7A(\'yw\',{1U:M.3P(\'1U\'),2t:M.3P(\'2t\'),2M:M.3P(\'2M\'),2r:M.3P(\'2r\'),2I:M.3P(\'2I\')});M.5p({1U:\'6V\',2M:3U.2M+\'px\',2t:3U.2t+\'px\',2r:9e.1k(\'2r\')+\'px\',2I:9e.1k(\'2I\')+\'px\'});J M}I g4(M){M=$(M);if(1f.3P(M,\'1U\')===\'6s\'){J M}N 9j=M.e5(\'yw\');if(9j)M.5p(9j);J M}I ix(M){M=$(M);N g7=1f.9z(M);1v.ix(g7.2t,g7.2M);J M}I nx(M){M=$(M);N 1U=1f.3P(M,\'1U\'),5z={};if(1U===\'fB\'||!1U){5z.1U=\'6s\';if(1T.6P.dG){5z.2M=0;5z.2t=0}1f.5p(M,5z);1f.7A(M,\'oq\',1i)}J M}I nA(M){M=$(M);N 6W=1f.bI(M),yg=6W.1k(\'oq\');if(yg){6W.cZ(\'oq\');1f.5p(M,{1U:\'\',2M:\'\',4E:\'\',2t:\'\',4l:\'\'})}J M}I nB(M){M=$(M);N 6W=1f.bI(M),yy=6W.1k(\'kR\');if(1c.3o(yy)){N au=1f.3P(M,\'au\');6W.1F(\'kR\',au);if(au!==\'aU\')M.1L.au=\'aU\'}J M}I nE(M){M=$(M);N 6W=1f.bI(M),au=6W.1k(\'kR\');if(!1c.3o(au)){6W.cZ(\'kR\');M.1L.au=au||\'\'}J M}I jb(M,3G,1r){1r=1c.1O({ou:1i,ox:1i,nZ:1i,nY:1i,dc:0,dg:0},1r||{});N 6b=1o.3i;3G=$(3G);M=$(M);N p,8J,9e,5z={};if(1r.ou||1r.ox){p=1f.aB(3G);8J=[0,0];if(1f.3P(M,\'1U\')===\'6V\'){N 2c=1f.7O(M);if(2c!==1o.2W)8J=1f.aB(2c)}}I ys(){N x=0,y=0;if(1c.aw(1v.ev)){x=1v.ev;y=1v.fC}1h if(1o.2W&&(1o.2W.7e||1o.2W.7b)){x=1o.2W.7e;y=1o.2W.7b}1h if(6b&&(6b.7e||6b.7b)){x=6b.7e;y=6b.7b}J{x:x,y:y}}N ow=ys();if(1r.nZ||1r.nY){9e=1f.ay(3G)}if(1r.ou)5z.2t=(p[0]+ow.x-8J[0]+1r.dg)+\'px\';if(1r.ox)5z.2M=(p[1]+ow.y-8J[1]+1r.dc)+\'px\';N GI=M.ay();if(1r.nZ){5z.2r=9e.1k(\'2r\')+\'px\'}if(1r.nY){5z.2I=9e.1k(\'2I\')+\'px\'}J 1f.5p(M,5z)}if(1T.6P.IE){7O=7O.4O(I(de,M){M=$(M);if(nD(M)||hG(M)||iy(M)||hV(M))J $(1o.2W);N 1U=M.3P(\'1U\');if(1U!==\'fB\')J de(M);M.5p({1U:\'6s\'});N U=de(M);M.5p({1U:1U});J U});8B=8B.4O(I(de,M){M=$(M);if(!M.2E)J 1q 1f.8i(0,0);N 1U=M.3P(\'1U\');if(1U!==\'fB\')J de(M);N 6X=M.7O();if(6X&&6X.3P(\'1U\')===\'gb\')c6(6X);M.5p({1U:\'6s\'});N U=de(M);M.5p({1U:1U});J U})}1h if(1T.6P.I6){9z=I(M){M=$(M);N 5E=0,5C=0;do{5E+=M.dc||0;5C+=M.dg||0;if(M.6X==1o.2W){if(1f.3P(M,\'1U\')==\'6V\')3A}M=M.6X}1N(M);J 1q 1f.8i(5C,5E)}}1f.5S({ay:ay,av:av,9v:9v,a5:a5,8T:8T,7O:7O,9z:9z,8B:8B,g5:g5,aB:aB,fL:fL,g4:g4,ix:ix,nx:nx,nA:nA,nB:nB,nE:nE,jb:jb});I iy(M){J M.4s.7H()===\'GN\'}I hV(M){J M.4s.7H()===\'fZ\'}I nD(M){J M.2P===8o.y7}I hG(M){J M!==1o.2W&&!1f.ba(M,1o.2W)}if(\'cf\'in 1o.3i){1f.5S({aB:I(M){M=$(M);if(hG(M))J 1q 1f.8i(0,0);N bj=M.cf(),6b=1o.3i;J 1q 1f.8i(bj.2t-6b.xI,bj.2M-6b.xM)}})}})();(I(){N yk=1T.6P.dG&&(1v.aq(1v.yi.Id())<9.5);N go=1p;I nC(){if(go)J go;go=yk?1o.2W:1o.3i;J go}I 8T(){J{2r:L.9v(),2I:L.a5()}}I 9v(){J nC().J7}I a5(){J nC().J0}I nv(){N x=1v.ev||1o.3i.7e||1o.2W.7e;N y=1v.fC||1o.3i.7b||1o.2W.7b;J 1q 1f.8i(x,y)}1o.aV={8T:8T,9v:9v,a5:a5,nv:nv}})();1v.$$=I(){N 3e=$A(1M).3L(\', \');J 1T.4K.2U(3e,1o)};1T.4K=(I(){I 2U(){2f 1q 5o(\'yd "1T.4K.2U" l7 be yR.\')}I 1n(){2f 1q 5o(\'yd "1T.4K.1n" l7 be yR.\')}I 3V(3f,3e,1l){1l=1l||0;N 1n=1T.4K.1n,Y=3f.Y,ii=0,i;1x(i=0;i<Y;i++){if(1n(3f[i],3e)&&1l==ii++){J 1f.1O(3f[i])}}}I eN(3f){1x(N i=0,Y=3f.Y;i<Y;i++){1f.1O(3f[i])}J 3f}N K=1T.K;J{2U:2U,1n:1n,3V:3V,eN:(1f.1O===K)?K:eN,IR:1f.1O}})();1T.lF=1v.3y;(I(){I nm(fn){1T.iU=fn()}nm.iL=1i;if(2d 6l!==\'1S\'&&6l.iL){1T.lW=6l;1T.iU=1p;1v.6l=nm}})();(I(1v){N i,4m,3q,eJ,9O,he,2U,fc,a0,cl,9Q,1o,9H,8Y,6Q,bc,6e,6T,5f="IV"+ -(1q aZ()),8b=1v.1o,8P=0,5m=0,nN=iY(),m2=iY(),m0=iY(),l0=I(a,b){if(a===b){cl=1i}J 0},cm=2d 1S,nR=1<<31,aN=({}).9l,5B=[],9J=5B.9J,xR=5B.1I,1I=5B.1I,2g=5B.2g,2z=5B.2z||I(1g){N i=0,3r=L.Y;1x(;i<3r;i++){if(L[i]===1g){J i}}J-1},j7="6Z|ae|kv|Je|Jq|Jo|5D|7U|aU|Jn|Jp|zi|g6|zs|Jl|Jf",4c="[\\\\Jm\\\\t\\\\r\\\\n\\\\f]",cg="(?:\\\\\\\\.|[\\\\w-]|[^\\\\z1-\\\\Jh])+",nt=cg.2j("w","w#"),4e="\\\\["+4c+"*("+cg+")"+4c+"*(?:([*^$|!~]?=)"+4c+"*(?:([\'\\"])((?:\\\\\\\\.|[^\\\\\\\\])*?)\\\\3|("+nt+")|)|)"+4c+"*\\\\]",8u=":("+cg+")(?:\\\\((([\'\\"])((?:\\\\\\\\.|[^\\\\\\\\])*?)\\\\3|((?:\\\\\\\\.|[^\\\\\\\\()[\\\\]]|"+4e.2j(3,8)+")*)|.*)\\\\)|)",fj=1q 2K("^"+4c+"+|((?:^|[^\\\\\\\\])(?:\\\\\\\\.)*)"+4c+"+$","g"),xe=1q 2K("^"+4c+"*,"+4c+"*"),xd=1q 2K("^"+4c+"*([>+~]|"+4c+")"+4c+"*"),wf=1q 2K("="+4c+"*([^\\\\]\'\\"]*?)"+4c+"*\\\\]","g"),vk=1q 2K(8u),vG=1q 2K("^"+nt+"$"),gO={"ID":1q 2K("^#("+cg+")"),"nO":1q 2K("^\\\\.("+cg+")"),"7m":1q 2K("^("+cg.2j("w","w*")+")"),"nM":1q 2K("^"+4e),"lD":1q 2K("^"+8u),"ju":1q 2K("^:(l5|6p|7r|f7|f7-7r)-(8n|of-1J)(?:\\\\("+4c+"*(j1|fJ|(([+-]|)(\\\\d*)n|)"+4c+"*(?:([+-]|)"+4c+"*(\\\\d+)|))"+4c+"*\\\\)|)","i"),"8Z":1q 2K("^(?:"+j7+")$","i"),"wx":1q 2K("^"+4c+"*[>+~]|:(j1|fJ|eq|gt|lt|f7|6p|7r)(?:\\\\("+4c+"*((?:-\\\\d)?\\\\d*)"+4c+"*\\\\)|)(?=[^-]|$)","i")},vC=/^(?:3O|2U|qj|a1)$/i,vD=/^h\\d$/i,eK=/^[^{]+\\{\\s*\\[Jj \\w/,w3=/^(?:#([\\w-]+)|(\\w+)|\\.([\\w-]+))$/,lo=/[+~]/,w2=/\'|\\\\/g,a9=1q 2K("\\\\\\\\([\\\\da-f]{1,6}"+4c+"?|("+4c+")|.)","ig"),ab=I(97,nF,zb){N cp="Il"+nF-z6;J cp!==cp||zb?nF:cp<0?2y.7D(cp+z6):2y.7D(cp>>10|IQ,cp&Ij|Ii)};2s{1I.2X((5B=2g.1u(8b.8e)),8b.8e);5B[8b.8e.Y].2P}2o(e){1I={2X:5B.Y?I(2w,iA){xR.2X(2w,2g.1u(iA))}:I(2w,iA){N j=2w.Y,i=0;1N((2w[j++]=iA[i++])){}2w.Y=j-1}}}I 3y(2l,1j,1K,3u){N 1n,1g,m,2P,i,9K,fH,cq,iM,fF;if((1j?1j.7L||1j:8b)!==1o){9Q(1j)}1j=1j||1o;1K=1K||[];if(!2l||2d 2l!=="2D"){J 1K}if((2P=1j.2P)!==1&&2P!==9){J[]}if(8Y&&!3u){if((1n=w3.bb(2l))){if((m=1n[1])){if(2P===9){1g=1j.g2(m);if(1g&&1g.2E){if(1g.id===m){1K.1I(1g);J 1K}}1h{J 1K}}1h{if(1j.7L&&(1g=1j.7L.g2(m))&&6T(1j,1g)&&1g.id===m){1K.1I(1g);J 1K}}}1h if(1n[2]){1I.2X(1K,1j.7o(2l));J 1K}1h if((m=1n[3])&&4m.7P&&1j.7P){1I.2X(1K,1j.7P(m));J 1K}}if(4m.wa&&(!6Q||!6Q.2Z(2l))){cq=fH=5f;iM=1j;fF=2P===9&&2l;if(2P===1&&1j.4s.3c()!=="1m"){9K=hr(2l);if((fH=1j.3b("id"))){cq=fH.2j(w2,"\\\\$&")}1h{1j.90("id",cq)}cq="[id=\'"+cq+"\'] ";i=9K.Y;1N(i--){9K[i]=cq+gH(9K[i])}iM=lo.2Z(2l)&&kI(1j.2E)||1j;fF=9K.3L(",")}if(fF){2s{1I.2X(1K,iM.b0(fF));J 1K}2o(Io){}nG{if(!fH){1j.iX("id")}}}}}J 2U(2l.2j(fj,"$1"),1j,1K,3u)}I iY(){N 1Z=[];I 4n(1b,U){if(1Z.1I(1b+" ")>3q.vl){3w 4n[1Z.aG()]}J(4n[1b+" "]=U)}J 4n}I 88(fn){fn[5f]=1i;J fn}I 2m(fn){N 1w=1o.4D("1w");2s{J!!fn(1w)}2o(e){J 1t}nG{if(1w.2E){1w.2E.8K(1w)}1w=1p}}I hR(nT,3S){N 5B=nT.4L("|"),i=nT.Y;1N(i--){3q.il[5B[i]]=3S}}I nP(a,b){N 6I=b&&a,6o=6I&&a.2P===1&&b.2P===1&&(~b.w0||nR)-(~a.w0||nR);if(6o){J 6o}if(6I){1N((6I=6I.7h)){if(6I===b){J-1}}}J a?1:-1}I xv(1J){J I(1g){N 1C=1g.4s.3c();J 1C==="3O"&&1g.1J===1J}}I xu(1J){J I(1g){N 1C=1g.4s.3c();J(1C==="3O"||1C==="a1")&&1g.1J===1J}}I bJ(fn){J 88(I(5d){5d=+5d;J 88(I(3u,6e){N j,6h=fn([],3u.Y,5d),i=6h.Y;1N(i--){if(3u[(j=6h[i])]){3u[j]=!(6e[j]=3u[j])}}})})}I kI(1j){J 1j&&2d 1j.7o!==cm&&1j}4m=3y.4m={};9O=3y.9O=I(1g){N 3i=1g&&(1g.7L||1g).3i;J 3i?3i.4s!=="fZ":1t};9Q=3y.9Q=I(1W){N hK,5y=1W?1W.7L||1W:8b,2c=5y.nU;if(5y===1o||5y.2P!==9||!5y.3i){J 1o}1o=5y;9H=5y.3i;8Y=!9O(5y);if(2c&&2c!==2c.2M){if(2c.6t){2c.6t("Ih",I(){9Q()},1t)}1h if(2c.7p){2c.7p("ia",I(){9Q()})}}4m.4e=2m(I(1w){1w.2a="i";J!1w.3b("2a")});4m.7o=2m(I(1w){1w.89(5y.Ig(""));J!1w.7o("*").Y});4m.7P=eK.2Z(5y.7P)&&2m(I(1w){1w.7v="<1w 3z=\'a\'></1w><1w 3z=\'a i\'></1w>";1w.4q.2a="i";J 1w.7P("i").Y===2});4m.oI=2m(I(1w){9H.89(1w).id=5f;J!5y.vV||!5y.vV(5f).Y});if(4m.oI){3q.3V["ID"]=I(id,1j){if(2d 1j.g2!==cm&&8Y){N m=1j.g2(id);J m&&m.2E?[m]:[]}};3q.2V["ID"]=I(id){N jn=id.2j(a9,ab);J I(1g){J 1g.3b("id")===jn}}}1h{3w 3q.3V["ID"];3q.2V["ID"]=I(id){N jn=id.2j(a9,ab);J I(1g){N 1W=2d 1g.cP!==cm&&1g.cP("id");J 1W&&1W.U===jn}}}3q.3V["7m"]=4m.7o?I(4C,1j){if(2d 1j.7o!==cm){J 1j.7o(4C)}}:I(4C,1j){N 1g,az=[],i=0,1K=1j.7o(4C);if(4C==="*"){1N((1g=1K[i++])){if(1g.2P===1){az.1I(1g)}}J az}J 1K};3q.3V["nO"]=4m.7P&&I(2a,1j){if(2d 1j.7P!==cm&&8Y){J 1j.7P(2a)}};bc=[];6Q=[];if((4m.wa=eK.2Z(5y.b0))){2m(I(1w){1w.7v="<2U t=\'\'><fY ae=\'\'></fY></2U>";if(1w.b0("[t^=\'\']").Y){6Q.1I("[*^$]="+4c+"*(?:\'\'|\\"\\")")}if(!1w.b0("[ae]").Y){6Q.1I("\\\\["+4c+"*(?:U|"+j7+")")}if(!1w.b0(":6Z").Y){6Q.1I(":6Z")}});2m(I(1w){N 3O=5y.4D("3O");3O.90("1J","aU");1w.89(3O).90("1C","D");if(1w.b0("[1C=d]").Y){6Q.1I("1C"+4c+"*[*^$|!~]?=")}if(!1w.b0(":m4").Y){6Q.1I(":m4",":7U")}1w.b0("*,:x");6Q.1I(",.*:")})}if((4m.nH=eK.2Z((6e=9H.Ie||9H.Ir||9H.IO||9H.IF)))){2m(I(1w){4m.wh=6e.1u(1w,"1w");6e.1u(1w,"[s!=\'\']:x");bc.1I("!=",8u)})}6Q=6Q.Y&&1q 2K(6Q.3L("|"));bc=bc.Y&&1q 2K(bc.3L("|"));hK=eK.2Z(9H.9N);6T=hK||eK.2Z(9H.6T)?I(a,b){N nQ=a.2P===9?a.3i:a,9A=b&&b.2E;J a===9A||!!(9A&&9A.2P===1&&(nQ.6T?nQ.6T(9A):a.9N&&a.9N(9A)&16))}:I(a,b){if(b){1N((b=b.2E)){if(b===a){J 1i}}}J 1t};l0=hK?I(a,b){if(a===b){cl=1i;J 0}N cr=!a.9N-!b.9N;if(cr){J cr}cr=(a.7L||a)===(b.7L||b)?a.9N(b):1;if(cr&1||(!4m.x4&&b.9N(a)===cr)){if(a===5y||a.7L===8b&&6T(8b,a)){J-1}if(b===5y||b.7L===8b&&6T(8b,b)){J 1}J a0?(2z.1u(a0,a)-2z.1u(a0,b)):0}J cr&4?-1:1}:I(a,b){if(a===b){cl=1i;J 0}N 6I,i=0,ip=a.2E,9A=b.2E,ap=[a],bp=[b];if(!ip||!9A){J a===5y?-1:b===5y?1:ip?-1:9A?1:a0?(2z.1u(a0,a)-2z.1u(a0,b)):0}1h if(ip===9A){J nP(a,b)}6I=a;1N((6I=6I.2E)){ap.cL(6I)}6I=b;1N((6I=6I.2E)){bp.cL(6I)}1N(ap[i]===bp[i]){i++}J i?nP(ap[i],bp[i]):ap[i]===8b?-1:bp[i]===8b?1:0};J 5y};3y.6e=I(7q,3f){J 3y(7q,1p,1p,3f)};3y.nH=I(1g,7q){if((1g.7L||1g)!==1o){9Q(1g)}7q=7q.2j(wf,"=\'$1\']");if(4m.nH&&8Y&&(!bc||!bc.2Z(7q))&&(!6Q||!6Q.2Z(7q))){2s{N 6n=6e.1u(1g,7q);if(6n||4m.wh||1g.1o&&1g.1o.2P!==11){J 6n}}2o(e){}}J 3y(7q,1o,1p,[1g]).Y>0};3y.6T=I(1j,1g){if((1j.7L||1j)!==1o){9Q(1j)}J 6T(1j,1g)};3y.6c=I(1g,1C){if((1g.7L||1g)!==1o){9Q(1g)}N fn=3q.il[1C.3c()],5g=fn&&aN.1u(3q.il,1C.3c())?fn(1g,1C,!8Y):1S;J 5g!==1S?5g:4m.4e||!8Y?1g.3b(1C):(5g=1g.cP(1C))&&5g.jp?5g.U:1p};3y.6g=I(vp){2f 1q 5o("Di 6g, Dj 3e: "+vp)};3y.wH=I(1K){N 1g,nK=[],j=0,i=0;cl=!4m.wQ;a0=!4m.wC&&1K.2g(0);1K.kK(l0);if(cl){1N((1g=1K[i++])){if(1g===1K[i]){j=nK.1I(i)}}1N(j--){1K.b8(nK[j],1)}}a0=1p;J 1K};eJ=3y.eJ=I(1g){N 1W,6n="",i=0,2P=1g.2P;if(!2P){1N((1W=1g[i++])){6n+=eJ(1W)}}1h if(2P===1||2P===9||2P===11){if(2d 1g.km==="2D"){J 1g.km}1h{1x(1g=1g.4q;1g;1g=1g.7h){6n+=eJ(1g)}}}1h if(2P===3||2P===4){J 1g.eC}J 6n};3q=3y.Dg={vl:50,De:88,1n:gO,il:{},3V:{},6s:{">":{5G:"2E",6p:1i}," ":{5G:"2E"},"+":{5G:"fW",6p:1i},"~":{5G:"fW"}},cj:{"nM":I(1n){1n[1]=1n[1].2j(a9,ab);1n[3]=(1n[4]||1n[5]||"").2j(a9,ab);if(1n[2]==="~="){1n[3]=" "+1n[3]+" "}J 1n.2g(0,4)},"ju":I(1n){1n[1]=1n[1].3c();if(1n[1].2g(0,3)==="f7"){if(!1n[3]){3y.6g(1n[0])}1n[4]=+(1n[4]?1n[5]+(1n[6]||1):2*(1n[3]==="j1"||1n[3]==="fJ"));1n[5]=+((1n[7]+1n[8])||1n[3]==="fJ")}1h if(1n[3]){3y.6g(1n[0])}J 1n},"lD":I(1n){N eD,bs=!1n[5]&&1n[2];if(gO["ju"].2Z(1n[0])){J 1p}if(1n[3]&&1n[4]!==1S){1n[2]=1n[4]}1h if(bs&&vk.2Z(bs)&&(eD=hr(bs,1i))&&(eD=bs.2z(")",bs.Y-eD)-bs.Y)){1n[0]=1n[0].2g(0,eD);1n[2]=bs.2g(0,eD)}J 1n.2g(0,3)}},2V:{"7m":I(nL){N 4s=nL.2j(a9,ab).3c();J nL==="*"?I(){J 1i}:I(1g){J 1g.4s&&1g.4s.3c()===4s}},"nO":I(2a){N 3j=nN[2a+" "];J 3j||(3j=1q 2K("(^|"+4c+")"+2a+"("+4c+"|$)"))&&nN(2a,I(1g){J 3j.2Z(2d 1g.2a==="2D"&&1g.2a||2d 1g.3b!==cm&&1g.3b("3z")||"")})},"nM":I(1C,8M,5i){J I(1g){N 1B=3y.6c(1g,1C);if(1B==1p){J 8M==="!="}if(!8M){J 1i}1B+="";J 8M==="="?1B===5i:8M==="!="?1B!==5i:8M==="^="?5i&&1B.2z(5i)===0:8M==="*="?5i&&1B.2z(5i)>-1:8M==="$="?5i&&1B.2g(-5i.Y)===5i:8M==="~="?(" "+1B+" ").2z(5i)>-1:8M==="|="?1B===5i||1B.2g(0,5i.Y+1)===5i+"-":1t}},"ju":I(1J,qP,5d,6p,7r){N oH=1J.2g(0,3)!=="f7",l8=1J.2g(-4)!=="7r",fV=qP==="of-1J";J 6p===1&&7r===0?I(1g){J!!1g.2E}:I(1g,1j,3l){N 4n,aM,1W,6o,9T,4o,5G=oH!==l8?"7h":"fW",2c=1g.2E,1C=fV&&1g.4s.3c(),kb=!3l&&!fV;if(2c){if(oH){1N(5G){1W=1g;1N((1W=1W[5G])){if(fV?1W.4s.3c()===1C:1W.2P===1){J 1t}}4o=5G=1J==="l5"&&!4o&&"7h"}J 1i}4o=[l8?2c.4q:2c.Dl];if(l8&&kb){aM=2c[5f]||(2c[5f]={});4n=aM[1J]||[];9T=4n[0]===8P&&4n[1];6o=4n[0]===8P&&4n[2];1W=9T&&2c.8e[9T];1N((1W=++9T&&1W&&1W[5G]||(6o=9T=0)||4o.9J())){if(1W.2P===1&&++6o&&1W===1g){aM[1J]=[8P,9T,6o];3A}}}1h if(kb&&(4n=(1g[5f]||(1g[5f]={}))[1J])&&4n[0]===8P){6o=4n[1]}1h{1N((1W=++9T&&1W&&1W[5G]||(6o=9T=0)||4o.9J())){if((fV?1W.4s.3c()===1C:1W.2P===1)&&++6o){if(kb){(1W[5f]||(1W[5f]={}))[1J]=[8P,6o]}if(1W===1g){3A}}}}6o-=7r;J 6o===6p||(6o%6p===0&&6o/6p>=0)}}},"lD":I(bF,5d){N 1R,fn=3q.8u[bF]||3q.ex[bF.3c()]||3y.6g("vF bF: "+bF);if(fn[5f]){J fn(5d)}if(fn.Y>1){1R=[bF,bF,"",5d];J 3q.ex.9l(bF.3c())?88(I(3u,6e){N kV,7l=fn(3u,5d),i=7l.Y;1N(i--){kV=2z.1u(3u,7l[i]);3u[kV]=!(6e[kV]=7l[i])}}):I(1g){J fn(1g,0,1R)}}J fn}},8u:{"8X":88(I(2l){N 3O=[],1K=[],4v=he(2l.2j(fj,"$1"));J 4v[5f]?88(I(3u,6e,1j,3l){N 1g,9L=4v(3u,1p,3l,[]),i=3u.Y;1N(i--){if((1g=9L[i])){3u[i]=!(6e[i]=1g)}}}):I(1g,1j,3l){3O[0]=1g;4v(3O,1p,3l,1K);J!1K.9J()}}),"2F":88(I(2l){J I(1g){J 3y(2l,1g).Y>0}}),"6T":88(I(5H){J I(1g){J(1g.km||1g.Dr||eJ(1g)).2z(5H)>-1}}),"8x":88(I(8x){if(!vG.2Z(8x||"")){3y.6g("vF 8x: "+8x)}8x=8x.2j(a9,ab).3c();J I(1g){N eO;do{if((eO=8Y?1g.8x:1g.3b("3l:8x")||1g.3b("8x"))){eO=eO.3c();J eO===8x||eO.2z(8x+"-")===0}}1N((1g=1g.2E)&&1g.2P===1);J 1t}}),"2w":I(1g){N 5O=1v.a8&&1v.a8.5O;J 5O&&5O.2g(1)===1g.id},"cX":I(1g){J 1g===9H},"iH":I(1g){J 1g===1o.Do&&(!1o.vx||1o.vx())&&!!(1g.1J||1g.9i||~1g.hn)},"m4":I(1g){J 1g.7U===1t},"7U":I(1g){J 1g.7U===1i},"6Z":I(1g){N 4s=1g.4s.3c();J(4s==="3O"&&!!1g.6Z)||(4s==="fY"&&!!1g.ae)},"ae":I(1g){if(1g.2E){1g.2E.x6}J 1g.ae===1i},"9P":I(1g){1x(1g=1g.4q;1g;1g=1g.7h){if(1g.2P<6){J 1t}}J 1i},"2c":I(1g){J!3q.8u["9P"](1g)},"Dm":I(1g){J vD.2Z(1g.4s)},"3O":I(1g){J vC.2Z(1g.4s)},"a1":I(1g){N 1C=1g.4s.3c();J 1C==="3O"&&1g.1J==="a1"||1C==="a1"},"5H":I(1g){N 6c;J 1g.4s.3c()==="3O"&&1g.1J==="5H"&&((6c=1g.3b("1J"))==1p||6c.3c()==="5H")},"6p":bJ(I(){J[0]}),"7r":bJ(I(6h,Y){J[Y-1]}),"eq":bJ(I(6h,Y,5d){J[5d<0?5d+Y:5d]}),"j1":bJ(I(6h,Y){N i=0;1x(;i<Y;i+=2){6h.1I(i)}J 6h}),"fJ":bJ(I(6h,Y){N i=1;1x(;i<Y;i+=2){6h.1I(i)}J 6h}),"lt":bJ(I(6h,Y,5d){N i=5d<0?5d+Y:5d;1x(;--i>=0;){6h.1I(i)}J 6h}),"gt":bJ(I(6h,Y,5d){N i=5d<0?5d+Y:5d;1x(;++i<Y;){6h.1I(i)}J 6h})}};3q.8u["f7"]=3q.8u["eq"];1x(i in{lu:1i,ch:1i,5A:1i,D2:1i,jZ:1i}){3q.8u[i]=xv(i)}1x(i in{aQ:1i,eT:1i}){3q.8u[i]=xu(i)}I ex(){}ex.1z=3q.D3=3q.8u;3q.ex=1q ex();I hr(2l,m3){N 7l,1n,3N,1J,6M,9K,hE,86=m2[2l+" "];if(86){J m3?0:86.2g(0)}6M=2l;9K=[];hE=3q.cj;1N(6M){if(!7l||(1n=xe.bb(6M))){if(1n){6M=6M.2g(1n[0].Y)||6M}9K.1I((3N=[]))}7l=1t;if((1n=xd.bb(6M))){7l=1n.aG();3N.1I({U:7l,1J:1n[0].2j(fj," ")});6M=6M.2g(7l.Y)}1x(1J in 3q.2V){if((1n=gO[1J].bb(6M))&&(!hE[1J]||(1n=hE[1J](1n)))){7l=1n.aG();3N.1I({U:7l,1J:1J,6e:1n});6M=6M.2g(7l.Y)}}if(!7l){3A}}J m3?6M.Y:6M?3y.6g(2l):m2(2l,9K).2g(0)}I gH(3N){N i=0,3r=3N.Y,2l="";1x(;i<3r;i++){2l+=3N[i].U}J 2l}I lf(4v,m1,xi){N 5G=m1.5G,kU=xi&&5G==="2E",lG=5m++;J m1.6p?I(1g,1j,3l){1N((1g=1g[5G])){if(1g.2P===1||kU){J 4v(1g,1j,3l)}}}:I(1g,1j,3l){N gc,aM,kW=[8P,lG];if(3l){1N((1g=1g[5G])){if(1g.2P===1||kU){if(4v(1g,1j,3l)){J 1i}}}}1h{1N((1g=1g[5G])){if(1g.2P===1||kU){aM=1g[5f]||(1g[5f]={});if((gc=aM[5G])&&gc[0]===8P&&gc[1]===lG){J(kW[2]=gc[2])}1h{aM[5G]=kW;if((kW[2]=4v(1g,1j,3l))){J 1i}}}}}}}I jO(8Q){J 8Q.Y>1?I(1g,1j,3l){N i=8Q.Y;1N(i--){if(!8Q[i](1g,1j,3l)){J 1t}}J 1i}:8Q[0]}I xQ(2l,lT,1K){N i=0,3r=lT.Y;1x(;i<3r;i++){3y(2l,lT[i],1K)}J 1K}I ft(9L,3I,2V,1j,3l){N 1g,lS=[],i=0,3r=9L.Y,xJ=3I!=1p;1x(;i<3r;i++){if((1g=9L[i])){if(!2V||2V(1g,1j,3l)){lS.1I(1g);if(xJ){3I.1I(i)}}}}J lS}I jQ(cj,2l,4v,aO,8w,xN){if(aO&&!aO[5f]){aO=jQ(aO)}if(8w&&!8w[5f]){8w=jQ(8w,xN)}J 88(I(3u,1K,1j,3l){N 8R,i,1g,lL=[],kF=[],lJ=1K.Y,dE=3u||xQ(2l||"*",1j.2P?[1j]:1j,[]),ge=cj&&(3u||!2l)?ft(dE,lL,cj,1j,3l):dE,6m=4v?8w||(3u?cj:lJ||aO)?[]:1K:ge;if(4v){4v(ge,6m,1j,3l)}if(aO){8R=ft(6m,kF);aO(8R,[],1j,3l);i=8R.Y;1N(i--){if((1g=8R[i])){6m[kF[i]]=!(ge[kF[i]]=1g)}}}if(3u){if(8w||cj){if(8w){8R=[];i=6m.Y;1N(i--){if((1g=6m[i])){8R.1I((ge[i]=1g))}}8w(1p,(6m=[]),8R,3l)}i=6m.Y;1N(i--){if((1g=6m[i])&&(8R=8w?2z.1u(3u,1g):lL[i])>-1){3u[8R]=!(1K[8R]=1g)}}}}1h{6m=ft(6m===1K?6m.b8(lJ,6m.Y):6m);if(8w){8w(1p,1K,6m,3l)}1h{1I.2X(1K,6m)}}})}I kd(3N){N lh,4v,j,3r=3N.Y,ld=3q.6s[3N[0].1J],lI=ld||3q.6s[" "],i=ld?1:0,xG=lf(I(1g){J 1g===lh},lI,1i),xF=lf(I(1g){J 2z.1u(lh,1g)>-1},lI,1i),8Q=[I(1g,1j,3l){J(!ld&&(3l||1j!==fc))||((lh=1j).2P?xG(1g,1j,3l):xF(1g,1j,3l))}];1x(;i<3r;i++){if((4v=3q.6s[3N[i].1J])){8Q=[lf(jO(8Q),4v)]}1h{4v=3q.2V[3N[i].1J].2X(1p,3N[i].6e);if(4v[5f]){j=++i;1x(;j<3r;j++){if(3q.6s[3N[j].1J]){3A}}J jQ(i>1&&jO(8Q),i>1&&gH(3N.2g(0,i-1).5k({U:3N[i-2].1J===" "?"*":""})).2j(fj,"$1"),4v,i<j&&kd(3N.2g(i,j)),j<3r&&kd((3N=3N.2g(j))),j<3r&&gH(3N))}8Q.1I(4v)}}J jO(8Q)}I wF(eB,cW){N ke=cW.Y>0,lN=eB.Y>0,lO=I(3u,1j,3l,1K,f1){N 1g,j,4v,eZ=0,i="0",9L=3u&&[],b4=[],lP=fc,dE=3u||lN&&3q.3V["7m"]("*",f1),lQ=(8P+=lP==1p?1:2R.lM()||0.1),3r=dE.Y;if(f1){fc=1j!==1o&&1j}1x(;i!==3r&&(1g=dE[i])!=1p;i++){if(lN&&1g){j=0;1N((4v=eB[j++])){if(4v(1g,1j,3l)){1K.1I(1g);3A}}if(f1){8P=lQ}}if(ke){if((1g=!4v&&1g)){eZ--}if(3u){9L.1I(1g)}}}eZ+=i;if(ke&&i!==eZ){j=0;1N((4v=cW[j++])){4v(9L,b4,1j,3l)}if(3u){if(eZ>0){1N(i--){if(!(9L[i]||b4[i])){b4[i]=9J.1u(1K)}}}b4=ft(b4)}1I.2X(1K,b4);if(f1&&!3u&&b4.Y>0&&(eZ+cW.Y)>1){3y.wH(1K)}}if(f1){8P=lQ;fc=lP}J 9L};J ke?88(lO):lO}he=3y.he=I(2l,1n){N i,cW=[],eB=[],86=m0[2l+" "];if(!86){if(!1n){1n=hr(2l)}i=1n.Y;1N(i--){86=kd(1n[i]);if(86[5f]){cW.1I(86)}1h{eB.1I(86)}}86=m0(2l,wF(eB,cW));86.2l=2l}J 86};2U=3y.2U=I(2l,1j,1K,3u){N i,3N,9W,1J,3V,lj=2d 2l==="I"&&2l,1n=!3u&&hr((2l=lj.2l||2l));1K=1K||[];if(1n.Y===1){3N=1n[0]=1n[0].2g(0);if(3N.Y>2&&(9W=3N[0]).1J==="ID"&&4m.oI&&1j.2P===9&&8Y&&3q.6s[3N[1].1J]){1j=(3q.3V["ID"](9W.6e[0].2j(a9,ab),1j)||[])[0];if(!1j){J 1K}1h if(lj){1j=1j.2E}2l=2l.2g(3N.aG().U.Y)}i=gO["wx"].2Z(2l)?0:3N.Y;1N(i--){9W=3N[i];if(3q.6s[(1J=9W.1J)]){3A}if((3V=3q.3V[1J])){if((3u=3V(9W.6e[0].2j(a9,ab),lo.2Z(3N[0].1J)&&kI(1j.2E)||1j))){3N.b8(i,1);2l=3u.Y&&gH(3N);if(!2l){1I.2X(1K,3u);J 1K}3A}}}}(lj||he(2l,1n))(3u,1j,!8Y,1K,lo.2Z(2l)&&kI(1j.2E)||1j);J 1K};4m.wC=5f.4L("").kK(l0).3L("")===5f;4m.wQ=!!cl;9Q();4m.x4=2m(I(x3){J x3.9N(1o.4D("1w"))&1});if(!2m(I(1w){1w.7v="<a 9i=\'#\'></a>";J 1w.4q.3b("9i")==="#"})){hR("1J|9i|2I|2r",I(1g,1C,9O){if(!9O){J 1g.3b(1C,1C.3c()==="1J"?1:2)}})}if(!4m.4e||!2m(I(1w){1w.7v="<3O/>";1w.4q.90("U","");J 1w.4q.3b("U")===""})){hR("U",I(1g,1C,9O){if(!9O&&1g.4s.3c()==="3O"){J 1g.ik}})}if(!2m(I(1w){J 1w.3b("7U")==1p})){hR(j7,I(1g,1C,9O){N 5g;if(!9O){J 1g[1C]===1i?1C.3c():(5g=1g.cP(1C))&&5g.jp?5g.U:1p}})}if(2d 6l==="I"&&6l.iL){6l(I(){J 3y})}1h if(2d 1A!=="1S"&&1A.1y){1A.1y=3y}1h{1v.3y=3y}})(1v);(I(){if(2d 3y!==\'1S\'){J}if(2d 6l!==\'1S\'&&6l.iL){1v.3y=1T.iU;1v.6l=1T.lW;3w 1T.iU;3w 1T.lW}1h if(2d 1A!==\'1S\'&&1A.1y){1v.3y=1A.1y;1A.1y={}}})();(I(hA){N eN=1T.4K.eN;I 2U(2l,wS){J eN(hA(2l,wS||1o))}I 1n(M,2l){J hA.6e(2l,[M]).Y==1}1T.4K.hA=hA;1T.4K.2U=2U;1T.4K.1n=1n})(3y);1v.3y=1T.lF;3w 1T.lF;N 3H={eT:I(2Q){2Q=$(2Q);2Q.eT();J 2Q},rO:I(3f,1r){if(2d 1r!=\'1m\')1r={5O:!!1r};1h if(1c.3o(1r.5O))1r.5O=1i;N 1b,U,lV=1t,aQ=1r.aQ,kH,gv;if(1r.5O){gv={};kH=I(1B,1b,U){if(1b in 1B){if(!1c.5K(1B[1b]))1B[1b]=[1B[1b]];1B[1b]=1B[1b].5k(U)}1h 1B[1b]=U;J 1B}}1h{gv=\'\';kH=I(1B,1b,2J){if(!1c.5K(2J)){2J=[2J]}if(!2J.Y){J 1B}N wY=fe(1b).82(/%20/,\'+\');J 1B+(1B?"&":"")+2J.3I(I(U){U=U.82(/(\\r)?\\n/,\'\\r\\n\');U=fe(U);U=U.82(/%20/,\'+\');J wY+"="+U}).3L("&")}}J 3f.9I(gv,I(1B,M){if(!M.7U&&M.1C){1b=M.1C;U=$(M).6K();if(U!=1p&&M.1J!=\'5A\'&&(M.1J!=\'aQ\'||(!lV&&aQ!==1t&&(!aQ||1b==aQ)&&(lV=1i)))){1B=kH(1B,1b,U)}}J 1B})}};3H.2O={ho:I(2Q,1r){J 3H.rO(3H.dd(2Q),1r)},dd:I(2Q){N 3f=$(2Q).7o(\'*\');N M,1K=[],wX=3H.1f.hS;1x(N i=0;M=3f[i];i++){if(wX[M.2h.3c()])1K.1I(1f.1O(M))}J 1K},DP:I(2Q,jo,1C){2Q=$(2Q);N iQ=2Q.7o(\'3O\');if(!jo&&!1C)J $A(iQ).3I(1f.1O);1x(N i=0,qr=[],Y=iQ.Y;i<Y;i++){N 3O=iQ[i];if((jo&&3O.1J!=jo)||(1C&&3O.1C!=1C))6B;qr.1I(1f.1O(3O))}J qr},qz:I(2Q){2Q=$(2Q);3H.dd(2Q).4J(\'qz\');J 2Q},qm:I(2Q){2Q=$(2Q);3H.dd(2Q).4J(\'qm\');J 2Q},wT:I(2Q){N 3f=$(2Q).dd().a6(I(M){J\'aU\'!=M.1J&&!M.7U});N qw=3f.a6(I(M){J M.bK(\'hn\')&&M.hn>=0}).i8(I(M){J M.hn}).6p();J qw?qw:3f.3V(I(M){J/^(?:3O|2U|qj)$/i.2Z(M.2h)})},DN:I(2Q){2Q=$(2Q);N M=2Q.wT();if(M)M.x0();J 2Q},6O:I(2Q,1r){2Q=$(2Q),1r=1c.4a(1r||{});N 6x=1r.1D,b1=2Q.ck(\'b1\')||\'\';if(b1.a3())b1=1v.a8.9i;1r.1D=2Q.ho(1i);if(6x){if(1c.4P(6x))6x=6x.d1();1c.1O(1r.1D,6x)}if(2Q.bK(\'2b\')&&!1r.2b)1r.2b=2Q.2b;J 1q 4b.9D(b1,1r)}};3H.1f={iH:I(M){$(M).iH();J M},2U:I(M){$(M).2U();J M}};3H.1f.2O={ho:I(M){M=$(M);if(!M.7U&&M.1C){N U=M.6K();if(U!=1S){N 4h={};4h[M.1C]=U;J 1c.8I(4h)}}J\'\'},6K:I(M){M=$(M);N 2b=M.2h.3c();J 3H.1f.hS[2b](M)},DS:I(M,U){M=$(M);N 2b=M.2h.3c();3H.1f.hS[2b](M,U);J M},ai:I(M){$(M).U=\'\';J M},DT:I(M){J $(M).U!=\'\'},x0:I(M){M=$(M);2s{M.iH();if(M.2U&&(M.2h.3c()!=\'3O\'||!(/^(?:a1|eT|aQ)$/i.2Z(M.1J))))M.2U()}2o(e){}J M},qz:I(M){M=$(M);M.7U=1i;J M},qm:I(M){M=$(M);M.7U=1t;J M}};N DY=3H.1f;N $F=3H.1f.2O.6K;3H.1f.hS=(I(){I 3O(M,U){6R(M.1J.3c()){2N\'ch\':2N\'lu\':J l2(M,U);gl:J kC(M,U)}}I l2(M,U){if(1c.3o(U))J M.6Z?M.U:1p;1h M.6Z=!!U}I kC(M,U){if(1c.3o(U))J M.U;1h M.U=U}I 2U(M,U){if(1c.3o(U))J(M.1J===\'2U-x7\'?kY:kP)(M);N 8q,ie,x9=!1c.5K(U);1x(N i=0,Y=M.Y;i<Y;i++){8q=M.1r[i];ie=L.ea(8q);if(x9){if(ie==U){8q.ae=1i;J}}1h 8q.ae=U.3m(ie)}}I kY(M){N 1l=M.x6;J 1l>=0?ea(M.1r[1l]):1p}I kP(M){N 2J,Y=M.Y;if(!Y)J 1p;1x(N i=0,2J=[];i<Y;i++){N 8q=M.1r[i];if(8q.ae)2J.1I(ea(8q))}J 2J}I ea(8q){J 1f.bK(8q,\'U\')?8q.U:8q.5H}J{3O:3O,l2:l2,qj:kC,2U:2U,kY:kY,kP:kP,ea:ea,a1:kC}})();ci.r2=3F.2u(wP,{3T:I($7x,M,9U,4Q){$7x(4Q,9U);L.M=$(M);L.bh=L.6K()},qE:I(){N U=L.6K();if(1c.4P(L.bh)&&1c.4P(U)?L.bh!=U:2y(L.bh)!=2y(U)){L.4Q(L.M,U);L.bh=U}}});3H.1f.wA=3F.2u(ci.r2,{6K:I(){J 3H.1f.6K(L.M)}});3H.wA=3F.2u(ci.r2,{6K:I(){J 3H.ho(L.M)}});ci.hy=3F.2u({3T:I(M,4Q){L.M=$(M);L.4Q=4Q;L.bh=L.6K();if(L.M.2h.3c()==\'2Q\')L.ww();1h L.gF(L.M)},r0:I(){N U=L.6K();if(L.bh!=U){L.4Q(L.M,U);L.bh=U}},ww:I(){3H.dd(L.M).2T(L.gF,L)},gF:I(M){if(M.1J){6R(M.1J.3c()){2N\'ch\':2N\'lu\':2B.4H(M,\'xz\',L.r0.3a(L));3A;gl:2B.4H(M,\'DW\',L.r0.3a(L));3A}}}});3H.1f.hy=3F.2u(ci.hy,{6K:I(){J 3H.1f.6K(L.M)}});3H.hy=3F.2u(ci.hy,{6K:I(){J 3H.ho(L.M)}});(I(3X){N 4N=1o.4D(\'1w\');N 6b=1o.3i;N i4=\'we\'in 6b&&\'wk\'in 6b;N 2B={DV:8,DK:9,DJ:13,Dz:27,DA:37,Dy:38,Dx:39,Du:40,Dv:46,Dw:36,DB:35,DC:33,DH:34,DI:45};N gz=I(1G){J 1t};if(1v.7p){if(1v.6t){gz=I(1G){J!(1G 8A 1v.2B)}}1h{gz=I(1G){J 1i}}}N bk;I p4(1G,4z){J 1G.e7?(1G.e7===4z+1):(1G.a1===4z)}N xb={0:1,1:4,2:2};I p9(1G,4z){J 1G.a1===xb[4z]}I xC(1G,4z){6R(4z){2N 0:J 1G.e7==1&&!1G.xE;2N 1:J 1G.e7==2||(1G.e7==1&&1G.xE);2N 2:J 1G.e7==3;gl:J 1t}}if(1v.7p){if(!1v.6t){bk=p9}1h{bk=I(1G,4z){J gz(1G)?p9(1G,4z):p4(1G,4z)}}}1h if(1T.6P.xD){bk=xC}1h{bk=p4}I oO(1G){J bk(1G,0)}I oP(1G){J bk(1G,1)}I oM(1G){J bk(1G,2)}I M(1G){J 1f.1O(pc(1G))}I pc(1G){1G=2B.1O(1G);N 1W=1G.2w,1J=1G.1J,co=1G.co;if(co&&co.2h){if(1J===\'w1\'||1J===\'6g\'||(1J===\'xz\'&&co.2h.3c()===\'3O\'&&co.1J===\'lu\'))1W=co}J 1W.2P==8o.kQ?1W.2E:1W}I gy(1G,3e){N M=pc(1G),2l=1T.4K;if(!3e)J 1f.1O(M);1N(M){if(1c.8H(M)&&2l.1n(M,3e))J 1f.1O(M);M=M.2E}}I cs(1G){J{x:kS(1G),y:kT(1G)}}I kS(1G){N e3=1o.3i,2W=1o.2W||{7e:0};J 1G.xw||(1G.DD+(e3.7e||2W.7e)-(e3.xI||0))}I kT(1G){N e3=1o.3i,2W=1o.2W||{7b:0};J 1G.xt||(1G.DE+(e3.7b||2W.7b)-(e3.xM||0))}I bw(1G){2B.1O(1G);1G.xg();1G.xk();1G.yq=1i}2B.2O={oO:oO,oP:oP,oM:oM,M:M,gy:gy,cs:cs,kS:kS,kT:kT,bw:bw};N 2L=1c.1Z(2B.2O).9I({},I(m,1C){m[1C]=2B.2O[1C].8F();J m});if(1v.7p){I xf(1G){N M;6R(1G.1J){2N\'xq\':2N\'oZ\':M=1G.CV;3A;2N\'xr\':2N\'p2\':M=1G.9M;3A;gl:J 1p}J 1f.1O(M)}N xs={xk:I(){L.Ce=1i},xg:I(){L.io=1t},3M:I(){J\'[1m 2B]\'}};2B.1O=I(1G,M){if(!1G)J 1t;if(!gz(1G))J 1G;if(1G.xc)J 1G;1G.xc=1T.8G;N cs=2B.cs(1G);1c.1O(1G,{2w:1G.Cf||M,vX:xf(1G),xw:cs.x,xt:cs.y});1c.1O(1G,2L);1c.1O(1G,xs);J 1G}}1h{2B.1O=1T.K}if(1v.6t){2B.1z=1v.2B.1z||1o.ji(\'vh\').8a;1c.1O(2B.1z,2L)}N wv={oZ:\'xq\',p2:\'xr\'};I iV(2i){J wv[2i]||2i}if(i4)iV=1T.K;I 7G(M){if(M===1v)J 0;if(2d M.aC===\'1S\')M.aC=1f.aS.iO++;J M.aC}I j0(M){if(M===1v)J 0;if(M==1o)J 1;J M.iZ}if(\'iZ\'in 4N)7G=j0;I jy(2i){J 2i.3m(\':\')}2B.wr=jy;I jx(M,2p){N jq=3X.2B.4n;if(1c.3o(2p))2p=7G(M);if(!jq[2p])jq[2p]={M:M};J jq[2p]}I kj(M,2p){if(1c.3o(2p))2p=7G(M);3w 3X.2B.4n[2p]}I je(M,2i,3S){N 5V=jx(M);if(!5V[2i])5V[2i]=[];N 3k=5V[2i];N i=3k.Y;1N(i--)if(3k[i].3S===3S)J 1p;N 2p=7G(M);N 3E=3X.2B.vZ(2p,2i,3S);N 1H={3E:3E,3S:3S};3k.1I(1H);J 1H}I pw(M,2i,3S){N 5V=jx(M);N 3k=5V[2i]||[];N i=3k.Y,1H;1N(i--){if(3k[i].3S===3S){1H=3k[i];3A}}if(1H){N 1l=3k.2z(1H);3k.b8(1l,1)}if(3k.Y===0){3w 5V[2i];if(1c.1Z(5V).Y===1&&(\'M\'in 5V))kj(M)}J 1H}I 4H(M,2i,3S){M=$(M);N 1H=je(M,2i,3S);if(1H===1p)J M;N 3E=1H.3E;if(jy(2i))vw(M,2i,3E);1h vA(M,2i,3E);J M}I vA(M,2i,3E){N eF=iV(2i);if(M.6t){M.6t(eF,3E,1t)}1h{M.7p(\'on\'+eF,3E)}}I vw(M,2i,3E){if(M.6t){M.6t(\'pD\',3E,1t)}1h{M.7p(\'pF\',3E);M.7p(\'pz\',3E)}}I 6C(M,2i,3S){M=$(M);N pI=!1c.3o(3S),vz=!1c.3o(2i);if(!vz&&!pI){vN(M);J M}if(!pI){vL(M,2i);J M}N 1H=pw(M,2i,3S);if(!1H)J M;kw(M,2i,1H.3E);J M}I vv(M,2i,3E){N eF=iV(2i);if(M.kJ){M.kJ(eF,3E,1t)}1h{M.iF(\'on\'+eF,3E)}}I vI(M,2i,3E){if(M.kJ){M.kJ(\'pD\',3E,1t)}1h{M.iF(\'pF\',3E);M.iF(\'pz\',3E)}}I vN(M){N 2p=7G(M),5V=3X.2B.4n[2p];if(!5V)J;kj(M,2p);N 3k,i;1x(N 2i in 5V){if(2i===\'M\')6B;3k=5V[2i];i=3k.Y;1N(i--)kw(M,2i,3k[i].3E)}}I vL(M,2i){N 5V=jx(M);N 3k=5V[2i];if(3k){3w 5V[2i]}3k=3k||[];N i=3k.Y;1N(i--)kw(M,2i,3k[i].3E);1x(N 1C in 5V){if(1C===\'M\')6B;J}kj(M)}I kw(M,2i,3S){if(jy(2i))vI(M,2i,3S);1h vv(M,2i,3S)}I vu(M){if(M!==1o)J M;if(1o.ji&&!M.vi)J 1o.3i;J M}I 8c(M,2i,5r,b2){M=vu($(M));if(1c.3o(b2))b2=1i;5r=5r||{};N 1G=pu(M,2i,5r,b2);J 2B.1O(1G)}I vt(M,2i,5r,b2){N 1G=1o.ji(\'vh\');1G.Cb(\'pD\',b2,1i);1G.2i=2i;1G.5r=5r;M.vi(1G);J 1G}I vq(M,2i,5r,b2){N 1G=1o.Cg();1G.vd=b2?\'pF\':\'pz\';1G.2i=2i;1G.5r=5r;2s{M.pu(1G.vd,1G)}2o(Ch){}J 1G}N pu=1o.ji?vt:vq;2B.wj=3F.2u({3T:I(M,2i,2l,4Q){L.M=$(M);L.2i=2i;L.2l=2l;L.4Q=4Q;L.3S=L.vo.3a(L)},4o:I(){2B.4H(L.M,L.2i,L.3S);J L},bw:I(){2B.6C(L.M,L.2i,L.3S);J L},vo:I(1G){N M=2B.gy(1G,L.2l);if(M)L.4Q.1u(L.M,1G,M)}});I on(M,2i,2l,4Q){M=$(M);if(1c.2A(2l)&&1c.3o(4Q)){4Q=2l,2l=1p}J 1q 2B.wj(M,2i,2l,4Q).4o()}1c.1O(2B,2B.2O);1c.1O(2B,{8c:8c,4H:4H,6C:6C,on:on});1f.5S({8c:8c,4H:4H,6C:6C,on:on});1c.1O(1o,{8c:8c.8F(),4H:4H.8F(),6C:6C.8F(),on:on.8F(),df:1t});if(3X.2B)1c.1O(1v.2B,2B);1h 3X.2B=2B;3X.2B.4n={};I i6(){3X.2B.4n=1p}if(1v.7p)1v.7p(\'ia\',i6);4N=1p;6b=1p})(L);(I(3X){N 6b=1o.3i;N i4=\'we\'in 6b&&\'wk\'in 6b;I ws(2i){J!i4&&(2i===\'oZ\'||2i===\'p2\')}I vW(2p,2i,3S){if(2B.wr(2i))J wt(2p,2i,3S);if(ws(2i))J wp(2p,2i,3S);J I(1G){if(!2B.4n)J;N M=2B.4n[2p].M;2B.1O(1G,M);3S.1u(M,1G)}}I wt(2p,2i,3S){J I(1G){N 4n=2B.4n[2p];N M=4n&&4n.M;if(1c.3o(1G.2i))J 1t;if(1G.2i!==2i)J 1t;2B.1O(1G,M);3S.1u(M,1G)}}I wp(2p,2i,3S){J I(1G){N M=2B.4n[2p].M;2B.1O(1G,M);N 2c=1G.vX;1N(2c&&2c!==M){2s{2c=2c.2E}2o(e){2c=M}}if(2c===M)J;3S.1u(M,1G)}}3X.2B.vZ=vW;6b=1p})(L);(I(3X){N fQ;I en(){if(1o.df)J;if(fQ)1v.vT(fQ);1o.df=1i;1o.8c(\'hC:df\')}I qf(){if(1o.6A===\'dh\'){1o.iF(\'e8\',qf);en()}}I qh(){2s{1o.3i.Ci(\'2t\')}2o(e){fQ=qh.5D();J}en()}if(1o.6A===\'dh\'){en();J}if(1o.6t){1o.6t(\'Cj\',en,1t)}1h{1o.7p(\'e8\',qf);if(1v==2M)fQ=qh.5D()}2B.4H(1v,\'w1\',en)})(L);1f.5S();6Y.8I=1c.8I;N C7={4f:1f.iR};1f.5S({BX:1f.2O.ba});N BY={BW:I(M,2e){J 1f.5T(M,{c5:2e})},BS:I(M,2e){J 1f.5T(M,{2M:2e})},BT:I(M,2e){J 1f.5T(M,{4E:2e})},BU:I(M,2e){J 1f.5T(M,{cY:2e})}};N $6B=1q 5o(\'"2f $6B" is C5, 3Q "J" C6\');N q1={yU:1t,p6:I(){L.yZ=1v.ev||1o.3i.7e||1o.2W.7e||0;L.z3=1v.fC||1o.3i.7b||1o.2W.7b||0},qa:I(M,x,y){if(L.yU)J L.yY(M,x,y);L.fN=x;L.fO=y;L.3U=1f.9z(M);J(y>=L.3U[1]&&y<L.3U[1]+M.c4&&x>=L.3U[0]&&x<L.3U[0]+M.8D)},yY:I(M,x,y){N r3=1f.g5(M);L.fN=x+r3[0]-L.yZ;L.fO=y+r3[1]-L.z3;L.3U=1f.9z(M);J(L.fO>=L.3U[1]&&L.fO<L.3U[1]+M.c4&&L.fN>=L.3U[0]&&L.fN<L.3U[0]+M.8D)},C4:I(jm,M){if(!jm)J 0;if(jm==\'C3\')J((L.3U[1]+M.c4)-L.fO)/M.c4;if(jm==\'C1\')J((L.3U[0]+M.8D)-L.fN)/M.8D},9z:1f.2O.9z,8B:1f.2O.8B,fL:I(M){q1.p6();J 1f.fL(M)},g4:I(M){q1.p6();J 1f.g4(M)},Cp:1f.2O.g5,6X:1f.2O.7O,tj:1f.2O.aB,4a:I(3G,2w,1r){1r=1r||{};J 1f.jb(2w,3G,1r)}};if(!1o.7P)1o.7P=I(yc){I 1Q(1C){J 1C.a3()?1p:"[6T(5k(\' \', @3z, \' \'), \' "+1C+" \')]"}yc.7P=1T.gp.yb?I(M,2a){2a=2a.3p().8E();N q0=/\\s/.2Z(2a)?$w(2a).3I(1Q).3L(\'\'):1Q(2a);J q0?1o.CL(\'.//*\'+q0,M):[]}:I(M,2a){2a=2a.3p().8E();N 3f=[],cc=(/\\s/.2Z(2a)?$w(2a):1p);if(!cc&&!2a)J 3f;N dC=$(M).7o(\'*\');2a=\' \'+2a+\' \';1x(N i=0,8n,cn;8n=dC[i];i++){if(8n.2a&&(cn=\' \'+8n.2a+\' \')&&(cn.3m(2a)||(cc&&cc.9x(I(1C){J!1C.3p().a3()&&cn.3m(\' \'+1C+\' \')}))))3f.1I(1f.1O(8n))}J 3f};J I(2a,yj){J $(yj||1o.2W).7P(2a)}}(1f.2O);1f.hH=3F.2u();1f.hH.1z={3T:I(M){L.M=$(M)},6v:I(1E,1j){L.M.2a.4L(/\\s+/).2U(I(1C){J 1C.Y>0}).6v(1E,1j)},1F:I(2a){L.M.2a=2a},d7:I(pA){if(L.3m(pA))J;L.1F($A(L).5k(pA).3L(\' \'))},aF:I(p7){if(!L.3m(p7))J;L.1F($A(L).8C(p7).3L(\' \'))},3p:I(){J $A(L).3L(\' \')}};1c.1O(1f.hH.1z,bt);(I(){1v.4K=3F.2u({3T:I(3e){L.3e=3e.8E()},CM:I(xX){J 1T.4K.2U(L.3e,xX)},1n:I(M){J 1T.4K.1n(M,L.3e)},3p:I(){J L.3e},3M:I(){J"#<4K: "+L.3e+">"}});1c.1O(4K,{CK:I(3f,3e){N 1n=1T.4K.1n,1K=[];1x(N i=0,Y=3f.Y;i<Y;i++){N M=3f[i];if(1n(M,3e)){1K.1I(1f.1O(M))}}J 1K},gy:I(3f,3e,1l){1l=1l||0;N ii=0,M;1x(N i=0,Y=3f.Y;i<Y;i++){M=3f[i];if(1T.4K.1n(M,3e)&&1l===ii++){J 1f.1O(M)}}},CJ:I(M,dv){N 2l=dv.6y().3L(\', \');J 1T.4K.2U(2l,M||1o)}})})();if(2d(y5)==\'1S\')y5={};N $gw=I(gw){J 2d(gw)==\'I\'?gw:I(){J gw}};N $U=I(U){J 2d(U)==\'I\'?U():U};1c.2B={1O:I(1m){1m.bg=I(3d){L.5Z=L.5Z||{};L.5Z[3d]=L.5Z[3d]||[]};1m.4H=I(3d,cK){if(2d(3d)==\'2D\'&&2d(cK)!=\'1S\'){L.bg(3d);if(!L.5Z[3d].3m(cK))L.5Z[3d].1I(cK)}1h{1x(N e in 3d)L.4H(e,3d[e])}};1m.6C=I(3d,cK){L.bg(3d);if(3d&&cK)L.5Z[3d]=L.5Z[3d].8C(cK);1h if(3d)L.5Z[3d]=[];1h L.5Z={}};1m.cS=I(3d,y1){N pW=I(){y1.2X(L,1M);L.6C(3d,pW)}.3a(L);L.bg(3d);L.5Z[3d].1I(pW)};1m.bf=I(3d){L.bg(3d);N cU=[];N 1R=$A(1M).2g(1);2s{1x(N i=0;i<L.5Z[3d].Y;++i)cU.1I(L.5Z[3d][i].2X(L.5Z[3d][i],1R)||1p)}2o(e){if(e==$3A)J 1t;1h 2f e}J cU};if(1m.1z){1m.1z.bg=1m.bg;1m.1z.4H=1m.4H;1m.1z.6C=1m.6C;1m.1z.cS=1m.cS;1m.1z.bf=I(3d){if(1m.bf){N 1R=$A(1M).2g(1);1R.cL(L);1R.cL(3d);1m.bf.2X(1m,1R)}L.bg(3d);N 1R=$A(1M).2g(1);N cU=[];2s{if(L.1r&&L.1r[3d]&&2d(L.1r[3d])==\'I\')cU.1I(L.1r[3d].2X(L,1R)||1p);1x(N i=0;i<L.5Z[3d].Y;++i)cU.1I(L.5Z[3d][i].2X(L.5Z[3d][i],1R)||1p)}2o(e){if(e==$3A)J 1t;1h 2f e}J cU}}}};(I(){I cS(1o,3d,jl){N dn=I(){jl.2X(L,1M);1f.6C(1o,3d,dn)};1f.4H(1o,3d,dn)}1c.1O(1o,{cS:cS.8F()})})();1f.5S({cS:I(M,3d,jl){N dn=I(){jl.2X(L,1M);1f.6C(M,3d,dn)};1f.4H(M,3d,dn)}});(I(){I l3(1G){N 8J,M,pn;if(1G.yQ){8J=1G.yQ/ sZ} 1h if (1G.yO) {              8J =- 1G.yO /3}if(!8J){J}M=2B.1O(1G).2w;M=1f.1O(M.2P===8o.kQ?M.2E:M);2s{pn=M.8c(\'CU:l3\',{8J:8J});if(pn.yq){2B.bw(1G);J 1t}}2o(e){J 1t}}1o.4H(\'CP\',l3);1o.4H(\'CQ\',l3)})();N CG=3F.2u({3T:I(){L.M=1q 1f(\'cI\',{1L:\'1U:6V;2V:Cv:Cw.yv.Cu(6q=0);4f:7Z\',5c:\'eL:yC(0);\',Ct:0});$(1o.2W).5T(L.M)},3D:I(){L.M.3D();J L},b7:I(){L.M.b7();J L},Cq:I(M){N M=$(M);N 3U=M.9z();N gk=M.8T();L.M.5p({2t:3U[0]+\'px\',2M:3U[1]+\'px\',2r:gk.2r+\'px\',2I:gk.2I+\'px\',yM:M.3P(\'yM\')-1}).b7();J L},Cr:I(kG){1x(yP in kG)kG[yP]+=\'px\';L.M.5p(kG);J L},Cs:I(){if(L.M)L.M.aF();J L}});$$dX={lB:1q 6Y(),qC:1q 6Y()};3F.2u=I(){N 2c=1p,2S=$A(1M),$$2a=1p,7N=[];1x(N i=0;i<2S.Y;i++){if(1c.4P(2S[i])){$$2a=2S[i];2S=2S.8C(2S[i])}if(1c.2A(2S[i])){2c=2S[i];2S=2S.8C(2S[i])}if(2d(2S[i])=="1m"&&2S[i].7u){if(1c.4P(2S[i].7u)){2S[i].7u=[2S[i].7u]}7N=7N.5k(2S[i].7u)}}if(2c&&2c.7u){7N=7N.5k(2c.7u)}I 6a(){L.Cy=$$2a;L.3T.2X(L,1M);if(7N.Y){L.7u=7N}}1c.1O(6a,3F.2O);1c.2B.1O(6a);6a.gh=2c;6a.e0=[];if(2c){N a7=I(){};a7.1z=2c.1z;6a.1z=1q a7;2c.e0.1I(6a)}1x(i=0;i<2S.Y;i++)6a.5S(2S[i]);if(7N.Y){6a.7u=7N;1x(N j=0;j<7N.Y;j++){N qg=$$dX.qC.1k(7N[j]);N 4d;if(!qg){4d="CD to an CE le \'"+7N[j]+"\' in 3z \'"+$$2a+"\'";7S(4d);2f 1q 5o(4d)}1x(N qU in qg.1z){if(!6a.1z[qU]){4d="CC, j3 3z \'"+$$2a+"\' l7 CB 9x 2b of le \'"+7N[j]+"\'. xU 2b \'"+qU+"\' is CA!";7S(4d);2f 1q 5o(4d)}}}}if(!6a.1z.3T)6a.1z.3T=1T.8G;6a.1z.4y=6a;if($$2a){$$dX.lB.1F($$2a,6a);1v[$$2a]=6a}J 6a};3F.E0=I(2a){J $$dX.lB.1k(2a)};3F.E1=I(la){N cv=[];N 4W=$$dX.lB.3B();1x(N 1b in 4W){if(4W.9l(1b)&&4W[1b].7u&&$A(4W[1b].7u).3V(I(U){J(U==la)})){cv.1I(1b)}}J cv};3F.Ft=I(qn,la){J qn.7u&&$A(qn.7u).3V(I(U){J(U==la)})};N Fu=(I(){I 2u(){N 2c=1p,2S=$A(1M),$$2a=1p;1x(N i=0;i<2S.Y;i++){if(1c.4P(2S[i])){$$2a=2S[i];2S=2S.8C(2S[i])}1h if(1c.2A(2S[i])){2c=2S[i];2S=2S.8C(2S[i])}}if(!$$2a){2f 1q 5o("pf l7 1F an le 1C!")}I 8v(){2f 1q 5o("hJ Fr an le ("+$$2a+")!")}1c.1O(8v,3F.2O);8v.gh=2c;8v.e0=[];if(2c){N a7=I(){};a7.1z=2c.1z;8v.1z=1q a7;2c.e0.1I(8v)}1x(i=0;i<2S.Y;i++)8v.5S(2S[i]);8v.1z.4y=8v;$$dX.qC.1F($$2a,8v);1v[$$2a]=8v;J 8v}J{2u:2u,2O:{5S:3F.2O.5S}}})();\'3Q 3Y\';I rC(dU,9m){if(!(dU 8A 9m)){2f 1q 4R(\'hJ 1u a 3z as a I\')}}N 1s=(I(){I 1s(){rC(L,1s)}1s.po=I po(s){J 1s.kA(1s.b3(1s.bT(s),s.Y*1s.7X))};1s.rA=I rA(s){J 1s.kE(1s.b3(1s.bT(s),s.Y*1s.7X))};1s.rx=I rx(s){J 1s.ll(1s.b3(1s.bT(s),s.Y*1s.7X))};1s.ry=I ry(1b,3x){J 1s.kA(1s.gC(1b,3x))};1s.rE=I rE(1b,3x){J 1s.kE(1s.gC(1b,3x))};1s.rL=I rL(1b,3x){J 1s.ll(1s.gC(1b,3x))};1s.rI=I rI(3x){N fz="uR+/=";N o1,o2,o3,h1,h2,h3,h4,dF,i=0,ac=0,84,oQ=[];if(!3x){J 3x}3x=1s.p0(3x+\'\');do{o1=3x.7V(i++);o2=3x.7V(i++);o3=3x.7V(i++);dF=o1<<16|o2<<8|o3;h1=dF>>18&jL;h2=dF>>12&jL;h3=dF>>6&jL;h4=dF&jL;oQ[ac++]=fz.9S(h1)+fz.9S(h2)+fz.9S(h3)+fz.9S(h4)}1N(i<3x.Y);84=oQ.3L(\'\');6R(3x.Y%3){2N 1:84=84.2g(0,-2)+\'==\';3A;2N 2:84=84.2g(0,-1)+\'=\';3A}J 84};1s.p0=I p0(2D){2D=(2D+\'\').2j(/\\r\\n/g,"\\n").2j(/\\r/g,"\\n");N fv="";N 4o,4u;N oW;4o=4u=0;oW=2D.Y;1x(N n=0;n<oW;n++){N c1=2D.7V(n);N 84=1p;if(c1<gX){4u++}1h if(c1>sp&&c1<Fz){84=2y.7D(c1>>6|Fx)+2y.7D(c1&63|gX)}1h{84=2y.7D(c1>>12|Fy)+2y.7D(c1>>6&63|gX)+2y.7D(c1&63|gX)}if(84!=1p){if(4u>4o){fv+=2D.d8(4o,4u)}fv+=84;4o=4u=n+1}}if(4u>4o){fv+=2D.d8(4o,2D.Y)}J fv};1s.s7=I s7(){J 1s.po("Fd")=="Fe"};1s.b3=I b3(x,3r){x[3r>>5]|=Fc<<3r%32;x[(3r+64>>>9<<4)+14]=3r;N a=Fb;N b=-F8;N c=-F9;N d=Fa;1x(N i=0;i<x.Y;i+=16){N tZ=a;N tY=b;N tV=c;N tW=d;a=1s.5L(a,b,c,d,x[i+0],7,-Ff);d=1s.5L(d,a,b,c,x[i+1],12,-Fg);c=1s.5L(c,d,a,b,x[i+2],17,Fl);b=1s.5L(b,c,d,a,x[i+3],22,-Fm);a=1s.5L(a,b,c,d,x[i+4],7,-Fk);d=1s.5L(d,a,b,c,x[i+5],12,Fj);c=1s.5L(c,d,a,b,x[i+6],17,-Fh);b=1s.5L(b,c,d,a,x[i+7],22,-Fi);a=1s.5L(a,b,c,d,x[i+8],7,FD);d=1s.5L(d,a,b,c,x[i+9],12,-FE);c=1s.5L(c,d,a,b,x[i+10],17,-G1);b=1s.5L(b,c,d,a,x[i+11],22,-G2);a=1s.5L(a,b,c,d,x[i+12],7,G0);d=1s.5L(d,a,b,c,x[i+13],12,-FZ);c=1s.5L(c,d,a,b,x[i+14],17,-FX);b=1s.5L(b,c,d,a,x[i+15],22,FY);a=1s.5M(a,b,c,d,x[i+1],5,-G3);d=1s.5M(d,a,b,c,x[i+6],9,-G4);c=1s.5M(c,d,a,b,x[i+11],14,G9);b=1s.5M(b,c,d,a,x[i+0],20,-Ga);a=1s.5M(a,b,c,d,x[i+5],5,-G8);d=1s.5M(d,a,b,c,x[i+10],9,G7);c=1s.5M(c,d,a,b,x[i+15],14,-G5);b=1s.5M(b,c,d,a,x[i+4],20,-G6);a=1s.5M(a,b,c,d,x[i+9],5,FV);d=1s.5M(d,a,b,c,x[i+14],9,-FU);c=1s.5M(c,d,a,b,x[i+3],14,-FK);b=1s.5M(b,c,d,a,x[i+8],20,FL);a=1s.5M(a,b,c,d,x[i+13],5,-FJ);d=1s.5M(d,a,b,c,x[i+2],9,-FI);c=1s.5M(c,d,a,b,x[i+7],14,FF);b=1s.5M(b,c,d,a,x[i+12],20,-FG);a=1s.5Q(a,b,c,d,x[i+5],4,-FH);d=1s.5Q(d,a,b,c,x[i+8],11,-FM);c=1s.5Q(c,d,a,b,x[i+11],16,FN);b=1s.5Q(b,c,d,a,x[i+14],23,-FS);a=1s.5Q(a,b,c,d,x[i+1],4,-FT);d=1s.5Q(d,a,b,c,x[i+4],11,FR);c=1s.5Q(c,d,a,b,x[i+7],16,-FQ);b=1s.5Q(b,c,d,a,x[i+10],23,-FO);a=1s.5Q(a,b,c,d,x[i+13],4,FP);d=1s.5Q(d,a,b,c,x[i+0],11,-F7);c=1s.5Q(c,d,a,b,x[i+3],16,-F6);b=1s.5Q(b,c,d,a,x[i+6],23,Eo);a=1s.5Q(a,b,c,d,x[i+9],4,-Ep);d=1s.5Q(d,a,b,c,x[i+12],11,-En);c=1s.5Q(c,d,a,b,x[i+15],16,Em);b=1s.5Q(b,c,d,a,x[i+2],23,-Ej);a=1s.5P(a,b,c,d,x[i+0],6,-Ek);d=1s.5P(d,a,b,c,x[i+7],10,El);c=1s.5P(c,d,a,b,x[i+14],15,-Eq);b=1s.5P(b,c,d,a,x[i+5],21,-Er);a=1s.5P(a,b,c,d,x[i+12],6,Ew);d=1s.5P(d,a,b,c,x[i+3],10,-Ex);c=1s.5P(c,d,a,b,x[i+10],15,-Ev);b=1s.5P(b,c,d,a,x[i+1],21,-Eu);a=1s.5P(a,b,c,d,x[i+8],6,Es);d=1s.5P(d,a,b,c,x[i+15],10,-Et);c=1s.5P(c,d,a,b,x[i+6],15,-Ei);b=1s.5P(b,c,d,a,x[i+13],21,Eh);a=1s.5P(a,b,c,d,x[i+4],6,-E7);d=1s.5P(d,a,b,c,x[i+11],10,-E8);c=1s.5P(c,d,a,b,x[i+2],15,E6);b=1s.5P(b,c,d,a,x[i+9],21,-E5);a=1s.9E(a,tZ);b=1s.9E(b,tY);c=1s.9E(c,tV);d=1s.9E(d,tW)}J[a,b,c,d]};1s.ef=I ef(q,a,b,x,s,t){J 1s.9E(1s.pU(1s.9E(1s.9E(a,q),1s.9E(x,t)),s),b)};1s.5L=I 5L(a,b,c,d,x,s,t){J 1s.ef(b&c|~b&d,a,b,x,s,t)};1s.5M=I 5M(a,b,c,d,x,s,t){J 1s.ef(b&d|c&~d,a,b,x,s,t)};1s.5Q=I 5Q(a,b,c,d,x,s,t){J 1s.ef(b^c^d,a,b,x,s,t)};1s.5P=I 5P(a,b,c,d,x,s,t){J 1s.ef(c^(b|~d),a,b,x,s,t)};1s.gC=I gC(1b,3x){N dY=1s.bT(1b);if(dY.Y>16)dY=1s.b3(dY,1b.Y*1s.7X);N oT=1q 2G(16),oU=1q 2G(16);1x(N i=0;i<16;i++){oT[i]=dY[i]^E2;oU[i]=dY[i]^E3}N 5O=1s.b3(oT.5k(1s.bT(3x)),u5+3x.Y*1s.7X);J 1s.b3(oU.5k(5O),u5+gX)};1s.9E=I 9E(x,y){N pS=(x&pY)+(y&pY);N uy=(x>>16)+(y>>16)+(pS>>16);J uy<<16|pS&pY};1s.pU=I pU(bQ,ps){J bQ<<ps|bQ>>>32-ps};1s.bT=I bT(3C){N eb=[];N kB=(1<<1s.7X)-1;1x(N i=0;i<3C.Y*1s.7X;i+=1s.7X)eb[i>>5]|=(3C.7V(i/1s.7X)&kB)<<i%32;J eb};1s.ll=I ll(eb){N 3C="";N kB=(1<<1s.7X)-1;1x(N i=0;i<eb.Y*32;i+=1s.7X)3C+=2y.7D(eb[i>>5]>>>i%32&kB);J 3C};1s.kA=I kA(9F){N pq=1s.tT?"Ef":"Eg";N 3C="";1x(N i=0;i<9F.Y*4;i++){3C+=pq.9S(9F[i>>2]>>i%4*8+4&uS)+pq.9S(9F[i>>2]>>i%4*8&uS)}J 3C};1s.kE=I kE(9F){N uP="uR+/";N 3C="";1x(N i=0;i<9F.Y*4;i+=3){N uN=(9F[i>>2]>>8*(i%4)&pt)<<16|(9F[i+1>>2]>>8*((i+1)%4)&pt)<<8|9F[i+2>>2]>>8*((i+2)%4)&pt;1x(N j=0;j<4;j++){if(i*8+j*6>9F.Y*32)3C+=1s.t4;1h 3C+=uP.9S(uN>>6*(3-j)&Ed)}}J 3C};J 1s})();1s.tT=0;1s.t4="";1s.7X=8;if(!j4){N j4={}}j4.vf=3F.2u({el:1p,id:1p,6U:1p,1r:1p,jd:1p,hU:1p,p3:1p,gI:1p,bq:1p,bM:1p,6F:1t,3T:I(el,6U,1r){L.1r=1c.1O({nu:1i,iI:1i,2r:sZ,nX:\'fX/wb.fS\',7E:\'fX/wm.fS\',2I:12,ta:\'\',i3:I(nJ){J 1i}},1r||{});L.el=$(el);L.id=$(el).id;L.6U=0;L.gI=0;L.bq=0;L.bM=1t;L.6F=[];L.oN=1t;L.Ey=L.1r.2r*2;L.jd=L.1r.2r*(-1);L.p3=L.1r.2r/9w; L.hU=6U;if(L.1r.7E.4y!=2G){L.1r.7E=[L.1r.7E]}L.te()},te:I(){1x(N i=0;i<L.1r.7E.Y;i++){N bZ=1p;bZ=1q tc();bZ.pC=I(){L.bq++}.3a(L);bZ.tX=I(){L.bq++}.3a(L);bZ.Ez=I(){L.bq++}.3a(L);bZ.5c=L.1r.7E[i];if(bZ.dh){L.bq++}}if(!1T.6P.IE){L.oS()}1h{L.hX()}},oS:I(){if(7d(L.bq,10)>=7d(L.1r.7E.Y,10)){L.hX()}1h{if(7d(L.bq,10)<=7d(L.1r.7E.Y,10)){9o(I(){L.oS()}.3a(L),9w)}}},hX:I(){$(L.el).4w(\'<ey id="\'+L.id+\'gK" 5c="\'+L.1r.nX+\'" sP="0%" 1L="1U:6V;2r: \'+L.1r.2r+\'px; 2I: \'+L.1r.2I+\'px; 9G-1U: \'+L.jd+\'px 50%; 9G-jZ: 4x(\'+L.1r.7E[L.gI]+\'); 3s: 0; 4k: 0; \'+L.1r.ta+\'" 3z="EV" />\'+((L.1r.iI==1i)?\'<8z id="\'+L.id+\'sV" 3z="EW">0%</8z>\':\'\'));L.oN=1i;L.j6(L.hU)},j6:I(5N,sX){if(!L.oN){L.hU=5N;L.hX();J}if(sX){L.6U=(L.6F.Y!=0)?L.6F[0]:5N;L.ar=1p;L.6F=[];9o(I(){L.j6(5N)}.3a(L),10)}1h{L.6F.1I(5N);if(L.bM==1t){L.ja()}}},ja:I(){if(L.6F.Y>0){L.bM=1i;L.ph(L.6F[0])}1h{}},ph:I(5N){N bn=7d(L.6U,10);if((5N.3p().d8(0,1)=="+")||(5N.3p().d8(0,1)=="-")){5N=bn+7d(5N)}if(5N<0)5N=0;if(5N>9w)5N=9w;if(L.1r.nu==1t){L.6F.b8(0,1);L.p5(5N);if(!L.1r.i3(L)){J}L.bM=1t;L.ja();J}N dw,hM;if(5N!=bn){if(bn<5N){dw=bn+1}1h{dw=bn-1}hM=1i}1h{dw=bn;hM=1t}L.p5(dw);if(hM&&!L.1r.i3(L)){J}if(bn!=dw){L.ar=9o(I(){L.ph(5N)}.3a(L),3)}1h{L.6F.b8(0,1);L.bM=1t;L.ar=1p;L.ja()}},vn:I(id){J L.6U},p5:I(6U){$(L.id+"gK").1L.EX=(L.jd+(6U*L.p3))+"px 50%";N gJ=2R.6k((6U-1)/(9w/L.1r.7E.Y));if((gJ!=L.gI)&&(L.1r.7E[gJ]!=1S)){$(L.id+"gK").1L.EY="4x("+L.1r.7E[gJ]+")"}L.gI=gJ;$(L.id+"gK").sP=6U+"%";$(L.id+"gK").9X=6U+"%";if(L.1r.iI==1i){$(L.id+"sV").4w(""+6U+"%")}L.6U=6U}});N qL=$A();3F.2u("4G",{qQ:1t,3T:I(p8){L.aT=1v.ax;if(p8)L.aT=p8;L.kc=1v.5I+\'/js\';L.7Y=1q 6Y();L.hu=\'eU\'},th:I(f9,qV){if(L.7Y.1k(f9)&&f9.bv(\'[]\')){N f8=L.7Y.1k(f9);if(1c.4P(f8))f8=[f8];f8.1I(qV);L.7Y.1F(f9,f8)}1h{L.7Y.1F(f9,qV)}},yG:I(tg){L.7Y=$H(tg)},F2:I(2b){L.hu=2b},qX:I(){if(4G.4T&&L.aT.2z(\'7j\')==-1&&!L.7Y.1k(\'7j\')){L.th(\'7j\',4G.4T)}1h if(L.aT.2z(\'7j=\')!==-1){N fG=L.aT.4L(\'7j=\');N qS=fG[1].4L(\'&\');N 9W=qS.aG();N qO=qS.3L(\'&\');L.aT=fG[0]+(qO?\'&\'+qO:\'\');L.7Y.1F(\'7j\',9W)}},qM:I(){if(L.qQ)J;if(!$(\'es-er\')&&1v.d0.1D.1k("vj")){N 8z=1q 1f("8z",{id:\'es-er\',1L:\'1U:6V;2M:oR;4l:oR;z-1l:EZ;4f:7Z;\'});N ey=1q 1f("ey",{5c:5I+"/fX/F0.fS"});8z.5T(ey);$$(\'2W\')[0].5T(8z)}if($(\'es-er\'))$(\'es-er\').b7()},tn:I(){if(L.qQ)J;if($(\'es-er\'))$(\'es-er\').3D()},yI:I(){qL.1I({b1:L.7Y.1k("tR"),1J:"kv"});L.qX();L.qM();N t=1q 4b.9D(L.aT,{2b:L.hu,4I:L.qc.3a(L),1D:L.7Y.3B()});2s{if(1T.6P.qG)t.2v.tE=\'tF-1o\'}2o(e){}},vB:I(){qL.1I({b1:L.7Y.1k("tR"),1J:"lb"});L.qX();L.qM();1q 4b.9D(L.aT,{2b:L.hu,dO:1t,4I:L.qc.3a(L),1D:L.7Y.3B(),tC:1i})},qc:I(2v){L.tn();N 4d;N i5;N qy="EG, it xO 1V gL EE 9W 2F EB! EC %s by EH iS or F5 in gL EI!";N qD="ts j3 tj";if(1v.8L&&1v.8L[tk]){qy=1v.8L[tk];qD=1v.8L[EN]}i5=qy.2j("%s","<a 9i=\'eL:1o.a8.ts()\' 1L=\'5H-EO: EM;\'>"+qD+"</a>");N 81=2v.hP();if(1T.6P.i7&&2v.5w&&2v.5w.3i&&2v.5w.3i.4s=="EL"){4d="qp 6g : \\n"+2v.5w.3i.4q.km}1h if(1T.6P.IE&&2v.5w&&2v.5w.qq&&2v.5w.qq.EK!=0){4d="qp 5o : \\n"+2v.5w.qq.Gl}1h if(81.2z("5H/3l")>-1&&2v.5w==1p){4d="EJ qp 5o!"}1h if(81.2z("5H/3l")==-1&&81.2z("aI/3n")==-1&&2v.5n.2z("<b>EA 6g</b>")>-1){4d=2v.5n.2j("<br />","")}1h if(2v.87==z7){4d="ED EF 5o: xh ve 5i gL d9 EP EQ to 3V qP\'s F1 F4!"}if(4d){if(4d.bD("pf i9 8X oY to t9 L ny."))4d=i5;if(5t)5t.pb("pd",4d);1h 7S(4d)}if(2v.5w&&2v.5w.3i){N sW=gG(2v.5w.3i,"F3");if(sW&&5t){N cX=5t.sI.bu();if(cX){5t.sI.ES(cX);cX.ai()}4r.7J().sH(\'ER\');4r.7J().sH(\'iz\')}N dq=gG(2v.5w.3i,"4d");if(dq){N ha=dq.3b("1J").7H();N gZ=ET.EU(dq);if(gZ=="pf i9 8X oY to t9 L ny.")gZ=i5;if(5t){5t.pb(ha,gZ)}1h{if(ha=="pd"){7S(ha+":"+gZ)}}if(ha=="Ec")dq.2E.8K(dq)}}if(L.4I){L.4I(2v)}1o.8c("5t:xZ",L)},Eb:I(5A,aW,uE,4I,d3,e9){if(!4I)4I=I(){};if(!d3)d3=I(){};if(!e9)e9=I(){};N 4x=4r.Ee.1k(\'6u\')+\'&\'+uE;N 5s=L.u7(4x,4I,d3,e9);if(1v.sz){L.sn(5s,5A,aW)}1h if(1v.v0){N pG=1q v0();pG.pC=I(e){L.oJ(5s,5A.1C,e.2w.1B,aW)}.3a(L);pG.Ea(5A)}1h if(5A.uW){L.oJ(5s,5A.1C,5A.uW(),aW)}},u7:I(4x,4I,d3,e9){N 5s=1q pQ();N jP=5s.jP;jP.6t("E9",I(e){if(!e.E4)J;e9(e)},1t);5s.e8=I(){if(5s.6A==4){if(5s.87===qR){4I(5s)}1h{d3(5s)}}}.3a(L);jP.tX=I(){d3(5s)};5s.g6("Fn",4x,1i);J 5s},sn:I(5s,5A,aW){N oK=1q sz();oK.Fo(aW,5A);5s.so(oK)},oJ:I(5s,9t,rU,aW){N gf=\'----FA\'+(1q aZ()).FC();5s.rZ("dV-gA","FB/2Q-3x, gf="+gf);N 2W="--"+gf+"\\r\\n";2W+="dV-Fw: 2Q-3x; 1C=\'"+aW+"\'; xV=\'"+Fv(fe(9t))+"\'\\r\\n";2W+="dV-gA: aI/Fq-Fp\\r\\n\\r\\n";2W+=rU+"\\r\\n";2W+="--"+gf+"--\\r\\n";5s.Fs(2W)},nW:I(9t,q5,z9){if(1v.d0&&1v.d0.1D.1k("g3")&&9t.2z("?")==-1){9t+="?v="+1v.d0.1D.1k("g3")}N l6=(L.kc?L.kc+\'/\'+9t:9t);1q 4b.9D(l6,{2b:\'1k\',dO:(z9?1i:1t),lx:1t,4I:I(2v){if(2v.5n){2s{N 6w=2v.5n;if(1v.yV){1v.yV(6w)}1h{1v.yT=6w;N lp=1o.4D(\'6w\');lp.1J=\'5H/eL\';lp.7v=\'b9(1v.yT)\';1o.7o(\'gj\')[0].89(lp)}if(q5!=1p)q5()}2o(e){7S(\'6g wg \'+9t+\':\'+e.4d)}}1o.8c("5t:xZ")}})}});4G.Cz=I(kL){if(kL==1p||kL.3i==1p)J 1t;N 3J=kL.3i.8e;N h9=[];N 6g=1t;4G.wu=1p;1x(N i=0;i<3J.Y;i++){if(3J[i].2h=="4d"){N pj="Cx 4d";if(3J[i].4q)pj=3J[i].4q.eC;4r.pb(3J[i].3b(\'1J\'),pj);if(3J[i].3b(\'1J\')==\'pd\')6g=1i}1h if(3J[i].2h=="CF"){N 4d=gG(3J[i],"4d").4q.eC;N yx=gG(3J[i],"3x").4q.eC;N 3n=yx.8W();N hh=1q 1f(\'1w\').4w(3n["CR"]);iP.CS(iP.yt?iP.yt:1o.2W,hh,I(){if(3n["ds"]["yF"]){N 6x=$H();$A(3n["ds"]["yF"]).2T(I(pM){6x.1F(pM,hh.9y(\'3O[1C="\'+pM+\'"]\').6K())});N ib=1q 4G();ib.yG(6x);if(3n["ds"]["dk"]){ib.4I=I(){b9(3n["ds"]["dk"])}}ib.yI()}1h{if(3n["ds"]["dk"]){b9(3n["ds"]["dk"])}}J 1i},I(){if(3n["yo"]["dk"]){b9(3n["yo"]["dk"])}J 1i});2f 1q 5o()}1h if(3J[i].2h=="CT"){N pJ=3J[i].3b(\'1m\');if(pJ==\'3x\'){N 1W=3J[i].3b(\'1W\');if(1W){h9.1I(1W)}1h{N 5A=3J[i].3b(\'5A\');if(5A){4r.qF().CO(5A)}h9.1I(4r.yh())}}1h if(pJ==\'CN\'){4r.CI()}}1h if(3J[i].4s==\'CH\'){N dm=4r.qF();N hZ=pp(3J[i],"aF/aX");N hI=pp(3J[i],"d7/aX");N hD=pp(3J[i],"4w/aX");if(hZ&&hZ.Y){hZ.2T(I(r){N p=r.3b("xV");N d6=1q gq(p);N n=d6.gr(dm.bu(),1S);if(n){n.yS().8K(n)}})}if(hI&&hI.Y&&dm.hF().hY){hI.2T(I(aX){N 6S=dm.hF().hY(aX);N hW=1q gq(dJ(6S.dI()));N 2c=hW.gr(dm.bu(),1S);if(!2c&&dJ(6S.dI())=="")2c=dm.bu();if(2c){2c.ya(6S);if(dm.yh()==2c&&!1v.zk){dm.za([6S],{})}}})}if(hD&&hD.Y&&dm.hF().hY){hD.2T(I(aX){N 6S=dm.hF().hY(aX);N f2=6S.yf().1k("y8");N d6,n;if(f2&&f2!=6S.dI()&&dJ(f2)!=dJ(6S.dI())){d6=1q gq(f2);n=d6.gr(dm.bu(),1S);if(n){n.yS().8K(n)}N hW=1q gq(dJ(6S.dI()));N 2c=hW.gr(dm.bu(),1S);if(!2c&&dJ(6S.dI())=="")2c=dm.bu();if(2c){6S.yf().1F("y8",1S);2c.ya(6S)}}1h{d6=1q gq(f2);n=d6.gr(dm.bu(),1S);if(n){6S.yW=n.yW;n.Co(6S,"C2");if(!1v.zk)dm.za([n],{})}}})}}1h if(3J[i].2h=="C0"){if(3J[i].3b("7j")){4G.4T=3J[i].3b("7j");N jc=BZ.BV(1v.ax);N fG=1v.ax.4L("?7j");1v.ax=fG[0]+"?7j="+4G.4T;if(jc)1v.ax+="&jc="+jc;d0.1D.1F(\'6u\',1v.ax)}if($("aE")&&$("aE").9y(".ls")){$("aE").9y(".ls").aF()}N 1B=3J[i].3b(\'U\');N aA=1t;if(1B==\'1\'){2s{iP.C8(1p);Ck(1i);if(3J[i].3b(\'vS\')&&3J[i].3b(\'vY\')){N iz=3J[i].3b(\'vS\');N wo=3J[i].3b(\'vY\');Cl(iz,wo)}}2o(e){if(b6)b6.7T(\'5o cY iz, Cn Cm 5V wg!\',e)}4r.vb()}1h if(1B==\'0\'||1B==\'-1\'){aA=vH}1h if(1B==\'2\'){4r.vb()}1h if(1B==\'-2\'){aA=vH}1h if(1B==\'-3\'){aA=Ca}1h if(1B==\'-4\'){aA=C9}if(aA){6g=1i;4G.wu=aA;if($("aE")&&$("aE").d5()&&$("aE").9y("1w.xp")){$("aE").9y("1w.xp").5T({4E:\'<1w 3z="ls" 1L="9G-bm: #Cc;4f: g8;bA-5W: Cd;bm: t2;3v-fP: ew;3s: oR CW;">\'+8L[aA]+\'</1w>\'});fl.DF($("aE").9y(\'.ls\'))}1h{7S(8L[aA])}}}1h if(3J[i].2h=="DG"){N 1C=3J[i].3b("1C");N qZ=3J[i].3b("qZ");N 1D={};1x(N j=0;j<3J[i].8e.Y;j++){N jH=3J[i].8e[j];if(jH.2h==\'DU\'){1D[jH.3b("1C")]=jH.3b("U")}}4r.7J().wD().DX(1C,1D,qZ);4r.7J().wD().2C()}}if(h9.Y){4r.qF().DZ(h9)}J!6g};3F.2u("ns",{1D:$H({}),3T:I(x2){L.1D=$H(x2);L.w5();if(L.1D.1k("x8")){1v.9o(I(){7S(L.1D.1k("x8"))}.3a(L),0)}2B.4H(1o,\'hC:df\',I(){L.xx(L.1D.1k(\'lX\'));N qv=1t;2s{if(1v.ql&&1v.ql.d0){L.1D=1v.ql.d0.1D;N iE=1o.a8.9i.d1();if(iE[\'wU\']){L.1D.1F(\'d2\',{1J:iE[\'wU\'],3x:iE})}1h{if(L.1D.1k(\'d2\')){L.1D.cZ(\'d2\')}}L.ih(1q 4G());qv=1i}}2o(e){if(1v.b6&&b6.7T)b6.7T(e)}if(!qv){L.wE()}}.3a(L));1o.4H("5t:DM",I(e){N wV=$(L.1D.1k(\'lX\'));N 1r=wV.3b("DO").8W(1t);if(1r.wZ&&1r.wZ==\'2I\'){N iN=0;if(1r.wW){2s{iN=7d(b9(1r.wW))}2o(e){}}if(1r.hz==\'1v\')1r.hz=1v;1h 1r.hz=$(1r.hz);DR($(L.1D.1k(\'lX\')),1r.hz,iN,1i)}}.3a(L));1o.4H("5t:DQ",I(){if(!L.1D.1k("d2")&&4r.7J().jf.1k("h0")){if(4r.7J().jf.9R){4r.7J().jf.cZ("h0")}1h{4r.7J().jf[\'3w\']("h0")}4r.7J().Dt();4r.7J().Ds()}1h if(L.1D.1k("d2")){4r.7J().x5.1F("5A","h0")}}.3a(L));1o.4H("5t:df",I(e){L.xa();if(L.1D.1k("d2")){4r.7J().x5.1F("5A","h0");4r.7J().D7=1q 6Y(L.1D.1k("d2"))}}.3a(L));1v.D6=L},wE:I(){if(L.1D.1k(\'wB\')){L.1D.4w(L.1D.1k(\'wB\'));if(L.1D.1k(\'4T\')){4G.4T=L.1D.1k(\'4T\')}if(L.1D.1k(\'aD\')){L.1D.1F(\'5I\',L.1D.1k(\'aD\')+L.1D.1k(\'5I\'));L.1D.1F(\'6u\',L.1D.1k(\'aD\')+L.1D.1k(\'6u\')+\'?\'+(4G.4T?\'7j=\'+4G.4T:\'\'))}1h{L.1D.1F(\'6u\',L.1D.1k(\'6u\')+\'?\'+(4G.4T?\'7j=\'+4G.4T:\'\'))}if(L.1D.1k(\'iT\')){L.1D.1F(\'6u\',L.1D.1k(\'6u\')+\'&\'+L.1D.1k(\'iT\')+\'&\')}L.ih(1q 4G());J}N 4x=L.1D.1k(\'y0\')+(L.1D.1k("iB")?\'&D8=1i\':\'\');if(L.1D.1k(\'aD\')){4x+=\'&D9=\'+L.1D.1k(\'aD\').2j(/\\.\\.\\//g,"Db/")}N aY=1q 4G(4x);aY.4I=I(2v){if(2v.5w&&2v.5w.3i&&2v.5w.3i.4s=="aX"){N 7S=gG(2v.5w.3i,"4d");1v.7S(\'wM lR by aI : \'+7S.4q.eC);J}N db;2s{N 3x=2v.5n.8W()}2o(e){db=\'5o 1N Da 7n 5v : \'+e.4d}if(!2d 3x=="1m"){db=\'wM Gc by aI : \'+2v.5n}if(db){1o.eR(db);if(db.2z(\'<b>xP</b>\')>-1||db.2z(\'<b>xL D4</b>\')>-1){1v.7S(\'CZ CY xj, it xO 1V xP or xL i9 xj, xh CX D0 D1 j3 Dc 5o Dd Dn!\')}J}L.1D.4w(3x);if(L.1D.1k(\'4T\')){4G.4T=L.1D.1k(\'4T\')}if(L.1D.1k(\'aD\')){L.1D.1F(\'5I\',L.1D.1k(\'aD\')+L.1D.1k(\'5I\'));L.1D.1F(\'6u\',L.1D.1k(\'aD\')+L.1D.1k(\'6u\')+\'?\'+(4G.4T?\'7j=\'+4G.4T:\'\'))}1h{L.1D.1F(\'6u\',L.1D.1k(\'6u\')+\'?\'+(4G.4T?\'7j=\'+4G.4T:\'\'))}if(L.1D.1k(\'iT\')){L.1D.1F(\'6u\',L.1D.1k(\'6u\')+\'&\'+L.1D.1k(\'iT\')+\'&\')}L.ih(aY)}.3a(L);aY.vB()},ih:I(aY){if(L.1D.1k(\'4T\')&&!4G.4T){4G.4T=L.1D.1k(\'4T\')}1v.ax=L.1D.1k(\'6u\');N lE=L.1D.1k("Dp");if(lE)lE.2T(L.wK.3a(L));if(L.1D.1k(\'5I\')){aY.kc=L.1D.1k(\'5I\')+"/js";1v.5I=L.1D.1k(\'5I\')+"/Dq/"+L.1D.1k("vj")}if(L.1D.1k(\'vg\')){aY.nW(L.1D.1k(\'vg?v=\'+L.1D.1k("g3")),1p,1i)}L.yJ();1v.8L=L.1D.1k("Dk");if(!1c.1Z(8L).Y){7S(\'Df, L ve 8X Dh, gL 4d 5A is 9P!\')}1x(N 1b in 8L){8L[1b]=8L[1b].2j("\\\\n","\\n")}1v.vP=L.1D.1k("vP");1v.vQ=L.1D.1k("vQ");N nS=I(){1o.8c("5t:Gb");1v.4r=1v.5t=1q g9(J9.IW(L.1D));if(L.1D.1k("nI")){1v.5t.nI=L.1D.1k("nI")}$(\'mf\').4w(\' - iu \'+L.1D.1k("g3")+\' - \'+L.1D.1k("Ix"));1v.5t.It()}.3a(L);if(!L.1D.1k("iB")){aY.nW("4r.7I.js?v="+L.1D.1k("g3"),nS,1i)}1h{nS()}},w5:I(){$$(\'6w\').2T(I(d4){if(d4.5c.1n("/js/nw")||d4.5c.1n("/js/ui/1z/3z.ns.js")){if(d4.5c.1n("/js/nw")){L.1D.1F("iB",1t)}1h{L.1D.1F("iB",1i)}N 5c=d4.5c.2j(\'/js/ui/1z/3z.ns.js\',\'\').2j(\'/js/nw.js\',\'\').2j(\'/js/GO.js\',\'\');if(5c.2z("?")!=-1)5c=5c.4L("?")[0];L.1D.1F("5I",5c)}}.3a(L));if(L.1D.1k("5I")){1v.5I=L.1D.1k("5I")}1h{7S("hJ 3V ny GQ")}N aP=L.1D.1k("y0");if(aP.2z("?")>-1){aP=aP.d8(0,aP.2z("?"))}L.1D.1F(\'ax\',aP);L.1D.1F(\'GR\',aP);1v.ax=aP},yJ:I(eY,ot){N 3Z=\'<1w id="jr" 1L="9G-bm:#GM;6q: 0.2;"></1w>\';if(L.1D.1k(\'dK\')){2s{L.1D.1F(\'dK\',GG(L.1D.1k(\'dK\')))}2o(e){L.1D.1F(\'dK\',\'\')}}if(L.1D.1k(\'dK\')){3Z+=L.1D.1k(\'dK\')}1h{N 6r;if(ot){6r=ot}1h{6r=L.1D.1k("6r")}3Z+=\'	<1w id="aH" 3z="sY" 1L="2r: GJ;4f:g8;2M:30%;z-1l:GS;2t:40%;1U: 6V;9G-bm: #H7;3s: 0;">\';3Z+=\'	<1w vO="2t" 3z="hh" 1L="9G-jZ:7Z; bA-5W: H9;mU-2I: 1.tu;3v-fP: ew;3s: 0; 3v-2r:0">\';N jY=6r.jY||5I+\'/../../../H0.GF\';if(6r.z2){jY=L.1D.1k("6u")+"&"+6r.z2}N 9X=6r.9X||"g9";N mv=6r.mv||\'rV\';N s1=6r.BR||\'rV\';N rs=(6r.s3?\'2I:\'+6r.s3+\';\':\'\');3Z+=\' <1w 3z="sL" 1L="3v-4E:0; 4k-4E:mH; bA-5W:\'+s1+\';bA-Gj:Gf; 9G-5W: 9w%; 9G-jZ:4x(\\\'\'+(L.1D.1k("aD")||\'\')+jY+\'\\\');9G-1U:2t Gr;9G-eo:no-eo;3s-2t:\'+mv+\';\'+rs+\'bm:#Hv;3v-fP:ew ew 0 0;">\'+(6r.He?\'\':9X)+\'</1w>\';if(6r.us){3Z+=\'<1w id="Hf" 1L="bA-5W: t7;mU-2I: 1.Gy;3s:qN;">\'+6r.us.2j(1q 2K("\\n","g"),"<br>")+\'</1w>\'}1h{3Z+=\'\'}N hx="iw-mS";if(L.1D.1k("mY-1J"))hx=L.1D.1k("mY-1J");if(hx=="Ge-v6"){3Z+=\'<1w 1L="2I: GE;1U: 6s;" id="jU"><1w 3z="v6" 1L="2r: 0;2I: 0;3v: Hb H8 GT(0, Ja, I8);3v-fP: tU;1U: 6V;I7: bj(mH, tU, II, mH);2t: IH;2M: ty;bm: t2;bA-5W: t7;">.</1w></1w>\'}1h if(hx=="Iz-IA"){3Z+=\'<1w 1L="1U: 6s;" id="jU" 3z="Ic"><1w 3z="Ji"></1w><1w 3z="Jg"></1w><1w 3z="Jr"></1w><1w 3z="IZ"></1w><1w 3z="J8"></1w></1w>\'}1h if(hx=="iw-mS"){3Z+=\'<1w 1L="1U: 6s;" id="jU" 3z="mS-mY"><1w 3z="iw-J6"></1w><1w 3z="iw-J2"></1w></1w>\'}3Z+=\'<1w 1L="3s:J4;bA-5W: ty;mU-2I: 1.tu;" 3z="D5" id="s0">\';if(6r.9X.3c()!="5t"){3Z+=\'	<1w 1L="3s:pv tv;1U: 6s;"><1w>g9 z5 zE<8z id="mf"></8z></1w>\'}1h{3Z+=\'	<1w 1L="3s:pv tv;1U: 6s;"><1w>zA gL 8p 4t! <8z id="mf"></8z></1w>\'}3Z+=\'	At C. du xT y4-AW - AS AM\';3Z+=\'<1w id="AP" 1L="kf:2t; 4f: 7Z;">AH...</1w>\';3Z+=\'	<1w id="Aw" 1L="4k-2M:ew; 4k-2t: Ax;4f: 7Z;"><8z id="fE"></8z></1w>\';3Z+=\'<1w id="BB" 1L="2I:qN;4f: 7Z;"></1w>\';3Z+=\'</1w></1w></1w>\'}N ff;if(!eY){eY=$$(\'2W\')[0];ff=1o.aV.8T()}1h{ff=eY.8T()}eY.5T(3Z);N aH=eY.9y(\'#aH\');aH.5p({2t:7d(2R.ah((ff.2r-aH.9v())/2,0))+"px",2M:7d(2R.ah((ff.2I-aH.a5())/3,0))+"px"});N lH=I(){1o.6C(\'5t:vM\');1q fl.zw([1q fl.o4($(\'jr\'),{lb:1i,4U:1.0,to:0.0,nz:0.5}),1q fl.o4($(\'jU\'),{lb:1i,4U:1,to:0,nz:0.5}),1q fl.o4($(\'s0\'),{lb:1i,4U:1,to:0,nz:0.5})],{AD:I(){if($(\'jr\'))$(\'jr\').aF();if($(\'aH\'))$(\'aH\').3D()}})};if(!1v.An){N 1r={nu:1t,iI:1t,2r:AX,nX:1v.5I+\'/fX/wb.fS\',7E:1v.5I+\'/fX/wm.fS\',2I:11,i3:I(nJ){if(nJ.vn()>=80){lH();J 1t}J 1i}};L.fE=1q j4.vf($(\'fE\'),0,1r)}1o.4H(\'5t:vM\',I(e){N p=e.5r.Bx;if(L.fE){L.fE.j6(p*9w)}1h if(p>=0.8){lH()}}.3a(L))},xa:I(){if(!L.1D.1k("wJ"))J;N 3x=L.1D.1k("wJ");1v.gY=1v.gY||[];1v.gY.1I([\'zX\',3x.id]);if(3x.gW)1v.gY.1I([\'zJ\',3x.gW]);1v.gY.1I([\'zu\']);1v.Ad=3x.1G;1v.9o(I(){N 5c=(\'fu:\'==1o.a8.ij?\'fu://zC\':\'Aa://x1\')+\'.zW-Ai.qk/ga.js\';N ga=1q 1f("6w",{1J:\'5H/eL\',kv:\'1i\',5c:5c});($$(\'gj\')[0]||$$(\'2W\')[0]).5T(ga)},qR)},wK:I(9t){N gj=$$(\'gj\')[0];N xB=1q 1f(\'qH\',{1J:\'5H/9u\',A5:\'A6\',9i:L.1D.1k("5I")+\'/\'+9t,Ae:\'Af\'});gj.5T(xB)},xx:I(pB){N 1g=1q 1f("1w",{1L:"1U: 6V;z-1l: zK; 4E: 0; 4l: 0; bm: #rl;5H-vO: 4l;3s: pv; 3s-4l: qN;bA-5W: AT;3v-fP: ew 0 0 0;"});if(1o.aV.9v()<z7){1g.4w(\'g9 z5 &r1; C. du xT y4-Bq\')}1h{1g.4w(\'g9, g6 3G 5A Bl - zB / zZ rW zF - <a 2w="AB" 1L="bm: #rl;" 9i="fu://4r.qk/">fu://4r.qk/</a>\')}$(pB).5T({cY:1g});if($(\'t1\'))J;$(pB).5T({cY:\'<1w id="t1">\\<1w id="aE"3z="sY"><1w 3z="sL"></1w><1w 3z="hh"></1w></1w>\\<1w id="A8"1L="4f:7Z;"></1w>\\<1w id="A2"1L="1U:6V;2t:-A4;"></1w>\\</1w>\'})}});',62,2818,'||||||||||||||||||||||||||||||||||||||||||||function|return||this|element|var|||||||value||||length||||||||||||require|key|Object|def||Element|elem|else|true|context|get|index|object|match|document|null|new|options|HasherUtils|false|call|window|div|for|exports|prototype|module|result|name|parameters|iterator|set|event|entry|push|type|results|style|arguments|while|extend|modules|iter|args|undefined|Prototype|position|that|node|record|array|keys|||||||||||className|method|parent|typeof|content|throw|slice|tagName|eventName|replace|es6|selector|assert|property|catch|uid|proto|width|try|left|create|transport|target|cof|String|indexOf|isFunction|Event|next|string|parentNode|has|Array|arg|height|values|RegExp|methods|top|case|Methods|nodeType|form|Math|properties|each|select|filter|body|apply|ctx|test|||||||||||bind|getAttribute|toLowerCase|event_name|expression|elements|isObject|global|documentElement|pattern|entries|xml|include|json|isUndefined|toString|Expr|len|padding|iterable|seed|border|delete|data|Sizzle|class|break|toObject|str|hide|responder|Class|source|Form|map|childs|step|join|inspect|tokens|input|getStyle|use|Symbol|handler|initialize|offset|find|NAME|GLOBAL|strict|html|||||||||||clone|Ajax|whitespace|message|attributes|display|setDesc|pair|number|res|margin|right|support|cache|start|assertObject|firstChild|pydio|nodeName|box|end|matcher|update|url|constructor|code|klass|attribute|tag|createElement|bottom|desc|Connexion|observe|onComplete|invoke|Selector|split|safe|DIV|wrap|isString|callback|TypeError|names|SECURE_TOKEN|from|abs|obj|_getEv|Number|getDesc|||||||||||ancestor|core|src|argument|self|expando|val|Base|check|react|concat|wks|done|responseText|Error|setStyle|collection|memo|xhr|ajaxplorer|species|response|responseXML|arrayProto|doc|styles|file|arr|valueL|defer|valueT|table|dir|text|ajxpResourcesFolder|wrapper|isArray|md5_ff|md5_gg|targetPercentage|hash|md5_ii|md5_hh|weak|addMethods|insert|then|registry|size|getPixelValue|replacement|_observers|||||||||||Klass|docEl|attr|isFrozen|matches|Iterators|error|matchIndexes|prev|toLength|floor|define|matcherOut|ret|diff|first|opacity|customWording|relative|addEventListener|ajxpServerAccess|_each|script|params|toArray|IS_MAP|readyState|continue|stopObserving|assertDefined|delegate|queue|WEAK|receiver|cur|state|getValue|propertyKey|soFar|count|request|Browser|rbuggyQSA|switch|newNode|contains|percentage|absolute|storage|offsetParent|Hash|checked|||||||||||defineProperty|scrollTop|Layout|parseInt|scrollLeft|toIndex|promise|nextSibling|es7|secure_token|item|matched|TAG|JSON|getElementsByTagName|attachEvent|expr|last|DESC|resolve|__implements|innerHTML|searchString|super|finallyLoc|includes|store|Function|isBuggy|fromCharCode|barImage|exp|getUniqueElementID|toUpperCase|min|getController|HIDDEN|ownerDocument|__method|toImplement|getOffsetParent|getElementsByClassName|rej|ByTag|alert|log|disabled|charCodeAt|kind|chrsz|_parameters|none||headers|gsub|process|enc|ITER|cached|status|markFunction|appendChild|__proto__|preferredDoc|fire|reject|childNodes|useNative|toJSON|container|Offset|_preComputing|ATTRIBUTE_TRANSLATIONS|descendants|stripScripts|child|Node|own|opt|tryEntries|unscope|runtime|pseudos|InterfaK|postFinder|lang|partial|span|instanceof|positionedOffset|without|offsetWidth|strip|methodize|emptyFunction|isElement|toQueryString|delta|removeChild|MessageHash|operator|detect|forOf|dirruns|matchers|temp|chain|getDimensions|wrapObjectMethod|FIRST|evalJSON|not|documentIsHTML|bool|setAttribute|strong|defineProperties|getNames|every|currentStyle|some|_||||toHTML|isFinite|forEach|layout|toPaddedString|SYMBOL_ITERATOR|tags|href|originalStyles|ceil|hasOwnProperty|Constructor|getOwnPropertyDescriptor|setTimeout|leakStore|getSymbols|getProto|Infinity|fileName|css|getWidth|100|all|down|cumulativeOffset|bup|info|statics|Request|safe_add|binarray|background|docElem|inject|pop|groups|unmatched|toElement|compareDocumentPosition|isXML|empty|setDocument|_object|charAt|nodeIndex|frequency|classof|token|title|ADDER|err|sortInput|button|dispatchException|blank|sign|getHeight|findAll|subclass|location|runescape|TYPE|funescape||point|selected|MSIE|valueOf|max|clear|finallyEntry|tryLoc|inst|pow||out||parseFloat|timer|||overflow|measure|isNumber|ajxpServerAccessPath|getLayout|tmp|errorId|viewportOffset|_prototypeUID|SERVER_PREFIX_URI|generic_dialog_box|remove|shift|progressBox|application|generator|getConstructor|toInteger|outerCache|hasOwn|postFilter|booterUrl|submit|iterated|Storage|_baseUrl|hidden|viewport|fileParameterName|tree|connexion|Date|querySelectorAll|action|bubble|core_md5|setMatched|replacer|console|show|splice|eval|descendantOf|exec|rbuggyMatches|FF_ITERATOR||notify|_objectEventSetup|lastValue|_end|rect|_isButton||color|curPercentage|port||numPreloaded||unquoted|Enumerable|getRootNode|endsWith|stop|tbody||toISOString|font|bound|reverse|startsWith|assertFunction|pseudo|round|evalScripts|getStorage|createPositionalPseudo|hasAttribute|ownDesc|running|callbackfn|ES5Object|DEFAULT|num|O1|_default|str2binl|P2|PROMISE|getEntry|expm1|LAST|newImage|pluck||PROPERTIES|Properties|offsetHeight|before|hasLayout|whole|Simulated|decay|insertion||classNames|writeAttribute|setOpacity|getBoundingClientRect|characterEncoding|checkbox|Abstract|preFilter|readAttribute|hasDuplicate|strundefined||currentTarget|high|nid|compare|pointer|success|escape|found|genFun||locs|completion|stack|GeneratorFunction|assign|AllSymbols|configurable|getOwnPropertyNames|getKeys|task|iframe|_toString|observer|unshift|times|succ|close|getAttributeNode|lastIndexOf|regexp|observeOnce|isNaN|collected_return_values|setProto|setMatchers|root|after|unset|ajxpBootstrap|toQueryParams|SELECTOR_DATA|onError|scriptTag|visible|fake|add|substring|web||phpError|offsetTop|getElements|proceed|loaded|offsetLeft|complete|ELEMENT_CACHE|getHeader|EVAL|tryLocsList||inner_callback||arrayMethod|messageNode|truncation|OK|interpret||expressions|newPercentage|SPECIES|Responders|recursivelyCollect|innerFn|sqrt|nodes|exception|elems|bits|Opera|LABEL|getPath|getRepName|customWelcomeScreen|siblings|bHeight|_begin|asynchronous|bWidth|handle|catchLoc|INSERTION_TRANSLATIONS|camelize|instance|Content|bitmap|OO_ObjectsRegistry|bkey|IteratorPrototype|subclasses|COMPUTATIONS|interpolate|docElement|MAX_SAFE_INTEGER|retrieve|MODE|which|onreadystatechange|onProgress|optionValue|bin|EPSILON|visibility|isInteger|md5_cmn|insertions|larg|unfilterJSON|SIZE|getPrototypeOf||ELEMENT_NODE|fireContentLoadedEvent|repeat|iframeDocument||loader|AjxpConnexion|template|destination|pageXOffset|3px|setFilters|img|exclusive|onclick|elementMatchers|nodeValue|excess||actualEventName|fill|stringify|flags|getText|rnative|javascript|merge|extendElements|elemLang|holder|Attributes|write|Promise|reset|post|len1|NodeList|collect|targetContainer|matchedCount|htmlFor|outermost|original|Heading|_has|navigator|extras|nth|existing|paramName|SymbolRegistry|read|outermostContext|capitalize|encodeURIComponent|viewPort|hasClassName|ContinueSentinel|getOpacity|rtrim|enumerable|Effect|extendElementWith||auto|EPSILON32|ElementExtensions|UInt16|styleFloat|condense|https|utftext||afterLoc|HAS_UNIQUE_ID_PROPERTY|b64||static|pageYOffset|ctor|loaderProgress|newSelector|parts|old|GeneratorFunctionPrototype|odd|onRejected|absolutize|RECORD|xcomp|ycomp|radius|TIMER|with|gif|raw|reflect|ofType|previousSibling|images|option|HTML|isExtensible|setPrototypeOf|getElementById|ajxpVersion|relativize|cumulativeScrollOffset|open|pos|block|Pydio||fixed|oldCache|forElement|matcherIn|boundary|newWidth|superclass||head|dimensions|default|Generator|tryCatch|ROOT|BrowserFeatures|AjxpNode|findInArbo|mix||GenStateCompleted|initial|proc|findIndex|findElement|isIELegacyEvent|Type|HTMLElement|core_hmac_md5|previous|IS_INCLUDES|registerCallback|XPathSelectSingleNode|toSelector|backIndex|newBackIndex|_percentImage|your|setter|forProp|matchExpr|postMessage|fillWith|classProp|isHash|currentlyExecuting|Template|sym|domain|128|_gaq|messageContent|ext_select|||||getStatus|onTimerEvent|delay|createMethod|reloadNodes|messageType|BUGGY|WeakMap|purgeElement|compile|contentType|fixMethod|dialogContent|isGlobal|getContentFromAnonymousElement|IS_WEAK|run|any|tabIndex|serialize|isRight|_getFlag|tokenize|IE_PROTO|createDict|_method|responders|getOwnPropertySymbols|spinnerType|EventObserver|fitParent|engine|keys1|dom|updates|preFilters|getAjxpNodeProvider|isDetached|ClassNames|adds|Cannot|hasCompare|dispatch|callTick|stripTags|setTag|getAllResponseHeaders|setStatics|addHandle|Serializers|GenStateSuspendedYield|initialPerc|isHtml|parentFake|initVisuals|parseAjxpNode|removes|isSameOrigin|IS_EVERY|VALUES|onTick|MOUSEENTER_MOUSELEAVE_EVENTS_SUPPORTED|tokenMessage|destroyCache_IE|Gecko|sortBy|are|onunload|conn|enum||currentValue|||refreshContextVariablesAndInit|matchIndex|protocol|defaultValue|attrHandle|||returnValue|aup|headerJSON|wrapNative|||Version|defineGeneratorMethod|double|scrollTo|isBody|login|els|debugMode|preventExtensions|existingDescriptor|qParams|detachEvent|findFrozen|focus|showText|LEAK|items|amd|newContext|marginBottom|UID|modal|inputs|toggle|refresh|SERVER_PERMANENT_PARAMS|_actual_sizzle|getDOMEventName|onCreate|removeAttribute|createCache|uniqueID|getUniqueElementID_IE|even|buggyZero|the|JS_BRAMUS|eachSlice|setPercentage|booleans|arrayLength|extractScripts|processQueue|clonePosition|minisite_session|initialPos|register|actions|remaining|isJSON|createEvent|outerFn|evaluate|outer_callback|mode|attrId|typeName|specified|CACHE|loading_overlay||copyWithin|CHILD|counter|resultName|getOrCreateRegistryFor|isCustomEvent|TO_STRING|SpecificElementExtensions|flatten|nextLoc|MessageChannel|clearTask|ownKeys|setTask|paramChild|channel|TBODY|elementClassName|0x3f|nextSiblings|runtimeStyle|elementMatcher|upload|setMatcher|firstDescendant|previousSiblings|pargs|loader_round_progress|mergeMethods|regExpCache|immediateDescendants|icon|image|EXTENDED|RangeError|MIN32|IS_DONTENUM_BUGGY|timeout|elementStyle|cssText|OBJECT_TYPE|inc|STANDARD_CSS_OPACITY_SUPPORTED|cssFloat|useCache|_libUrl|matcherFromTokens|bySet|float|removeClassName|addClassName|setDescs|destroyRegistryForElement|onlyIfAbsent|IE8_DOM_DEFINE|textContent|Str|UNSCOPABLES|enumKeys|argumentNames|asinh|Empty|mapping|setUnscope|async|removeEvent|HAS_EXTENDED_CREATE_ELEMENT_SYNTAX|ScriptFragment|sibling|binl2hex|mask|valueSelector|insertBefore|binl2b64|postMap|bounds|accumulator|testContext|removeEventListener|sort|xmlResponse|preCompute|tempIndex|character|selectMany|TEXT_NODE|prototype_made_clipping|pointerX|pointerY|checkNonElements|idx|newCache|oldElement|selectOne|METHOD|sortOrder|Context|inputSelector|wheel|pRect|only|path|must|forward|_setPrepared|interfaceName|sync|normal|leadingRelative|interface|addCombinator|getRawStyle|checkContext|_recursivelyFind|compiled|maximumLength|binl2str|pTop|workaround|rsibling|script_tag|force|uniq|ajxp_login_error||radio|UNDEFINED|pRight|evalJS|pLeft||pBottom|classes|time|PSEUDO|cssRes|_original_property|doneName|loaderEndCallback|implicitRelative|preexisting|createObjectToArray|preMap|random|byElement|superMatcher|contextBackup|dirrunsUnique|caught|newUnmatched|contexts|ArrayValues|submitted|_original_define|MAIN_ELEMENT|ITERATOR|freeze|compilerCache|combinator|tokenCache|parseOnly|enabled|sent|SLICE|purge|cleanWhitespace|descendantOf_DOM|ancestors|getRegExpForClassName|prepareReplacement|adjacent|deep|version_span|LINK_ELEMENT_INNERHTML_BUGGY|INSPECT_ATTRIBUTES|updater|range|escapedString|chr|replaceChild|specialChar|onclickValue|setInterval|identify|_hasOwnProperty|ARRAY_CLASS|toggleClassName|dim|iconWidth|alpha|stripAlphaFromFilter_IE|STRING_CLASS|NUMBER_CLASS|bindAsEventListener|curry|extensions|_methodized|_getAttr2|isDate|nop|0px|failure|toColorPart|toTemplateReplacements|toQueryPair|grep|criteria|activeRequestCount|trues|falses|queryValues|bounce|_reverse|line|zip|partition|compact|spinner|inGroupsOf|intersect|slices|onStateChange|parse|sub|scan|Complete|Response|decodeURIComponent|getResponseHeader|statusText|truncate|escapeHTML|dasherize|userAgent|encoding|underscore|respondToReadyState|unescapeHTML|_complete|getOpacity_IE|elementIsExtended|fakeDefine|GenStateSuspendedStart||GenStateExecuting|returnMethod|callNext|AjxpBootstrap|identifier|animate|getScrollOffsets|ajaxplorer_boot|makePositioned|resource|duration|undoPositioned|makeClipping|getRootElement|isDocument|undoClipping|escaped|finally|matchesSelector|currentLanguage|pbObj|duplicates|nodeNameSelector|ATTR|classCache|CLASS|siblingCheck|adown|MAX_NEGATIVE|masterClassLoaded|attrs|defaultView|inModule|loadLibrary|boxImage|setHeight|setWidth|isPercentage||||Opacity|resetTryEntry|isHorizontal|isVertical|prototype_original_styles|getContentWidth|tempStyles|ELEMENT_PROTOTYPE|addMethodsToTagName|isSupported|propertyIsEnumerable||_class|isOpera|TableSection|trans||TD|_compute||_set|iteratorMethod|prototype_made_positioned||doneResult|passedParameters|setLeft|iteratorSymbol|pageXY|setTop|docBody|bodyScrollNode|rootRecord|hasCatch|hasFinally|tempName|newStyles|selfOrBody|inline|simple|getById|xhrSendAsBinary|formData|_native|isRightClick|visualsInitialized|isLeftClick|isMiddleClick|tmp_arr|2px|checkPreloadedImages|ipad|opad|len2|stringl|56320|allowed|mouseenter|utf8_encode|sum|mouseleave|pxPerPercent|_isButtonForDOMEvents|_setBgPosition|prepare|classNameToRemove|baseUrl|_isButtonForLegacyEvents|_isFinite|displayMessage|_element|ERROR|createDefiner|You|tpl|processQueueEntry|simpleSet|messageTxt|common||fail|custom_event|hex_md5|XPathSelectNodes|hex_tab||cnt|0xFF|fireEvent|4px|unregister||isThenable|onlosecapture|classNameToAdd|desktopNode|onload|dataavailable|endPosition|ondataavailable|fileReader|executor|handlerGiven|obName|65536|setIterator|fName|FunctionProto|55296|mapfn|XMLHttpRequest|asap|lsw|riter|bit_rol|isUnhandled|inner_observer|SAFE_CLOSING|0xFFFF|onFulfilled|cond|Position|isSafeInteger|msg2|msg1|onLoadedCode|Enumerate|IS_FIND_INDEX|arrayMethodFix|toNumber|within|listner|applyComplete|buggy|fastKey|checkReadyState|interf|pollDoScroll|symbolStatics|textarea|com|opener|enable|objectOrClass|createGetKeys|Parsing|parseError|matchingInputs|ObjectProto|binary|keys2|startedFromOpener|firstByIndex|isPrimitive|tok1|disable|ONREADYSTATECHANGE|keysLen1|interfaces|tok2|execute|getContextHolder|IE10|link|date|_length|toPrimitive|PydioLog|showLoader|10px|rest|what|discrete|200|toks|toStringTag|methodKey|paramValue|KEY|addSecureToken|NUMBER|messageId|onElementEvent|copy|TimedObserver|offsetcache|createArrayReduce|fin|cbrt|00001|hasLayout_IE|HTMLOBJECTELEMENT_PROTOTYPE_BUGGY|endPos|normalizeStyleName_IE|normalizeStyleName|FUNCTION_CLASS||hasNativeIsArray|fromIndex|Arguments|setOpacity_IE|arrayLike|getStyle_IE|7a7a7a|DATE_CLASS|partArgs|atanh|DONT_ENUMS|acosh|checkElementPrototypeDeficiency|titleDivSize|NATIVE_JSON_STRINGIFY_SUPPORT|brokenDate|TH|getRawStyle_IE|str_md5|hex_hmac_md5|isViewport|b64_md5|rStyle|_classCallCheck|boxWidth|b64_hmac_md5|thrown|TEXTAREA|SELECT|base64_encode|pctString|getComputedStyle|str_hmac_md5|toDecimal|sinh|serializeElements|trunc|isDisplayed|positionedWidth|pLayout|_isPrepared|fileData|35px|supported|decimal|tanh|setRequestHeader|loader_dialog_footer|fontSize|zoom|iconHeight|addFormMethods|log2|isPrototypeOf|md5_vm_test|NULL_TYPE|toLocaleString|Boolean|Null|Undefined|UNDEFINED_TYPE|BOOLEAN_TYPE|fround|cosh|clz32|BOOLEAN_CLASS|roundTiesToEven|NUMBER_TYPE|STRING_TYPE|MobileSafari|sendFileUsingFormData|send|127|TableCell|imul|findDOMClass|log10|log1p|_getAttrNode|TR|MAX32|Mod|FormData|TableCol|THEAD|hypot|TFOOT|extend_IE8|Iterator|trim|fireAction|_contextHolder|evalResponse|setIter|dialogTitle|Events|onException|assertInstance|alt|requestHeaders|parseJSON|2005|NATIVE_JSON_PARSE_SUPPORT|CHAIN|_percentText|authNode|clearQueue|dialogBox|120|sanitizeJSON|all_forms|white|updateContent|b64pad|sanitize|_getResponseJSON|20px|getStatusText|access|visualStyle|IS_SET|Image||preloadImages|_getHeaderJSON|hParameters|addParameter|CONCAT_ARGUMENTS_BUGGY|page|437|IS_FILTER|NO_HOLES|hideLoader||condition|IS_SOME||reload|regenerator|5em|7px|sorted|callee|11px|shim|_babelPolyfill|radix|msxmldoctype|getTransport|responseType|msxml|Pattern|setRequestHeaders|overrideMimeType|comp|XMLHTTP|ActiveXObject|ObjectRange|collections|stat|lambda|Try|get_action|these|hexcase|50px|oldc|oldd|onerror|oldb|olda|idCounter|isNonEmptyRegExp|part|__g|__e|512|matchOne|initializeXHRForUpload|prototype_element_layout_prepared|matchAll||descendantOf_contains|descendantOf_compareDocumentPosition|PROBLEMATIC_ATTRIBUTE_READING|readAttribute_IE|getUTCMonth|getUTCDate|getUTCHours||getUTCFullYear|sid|CAMEL_CASED_ATTRIBUTE_NAMES|getOwnDescriptor||getUTCMinutes||getUTCSeconds|PROBLEMATIC_HAS_ATTRIBUTE_WITH_CHECKBOXES|welcomeMessage|readAttribute_Opera|hasAttribute_IE|isStatic|1000|regExp|msw|purgeCollection_IE|SCRIPT_ELEMENT_REJECTS_TEXTNODE_APPENDING|TABLE_ELEMENT_INNERHTML_BUGGY|SELECT_ELEMENT_INNERHTML_BUGGY|ANY_INNERHTML_BUGGY|queryStringParams|useDoubleQuotes|SYM|JSONFilter|tBodies|boolean|FORCE|lastText|updateComplete|triplet|Updater|tab|shouldUseCreationCache|ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789|0xF|separator|getIter|nextNode|getAsBinary|amp|purgeCollection|cloneNode|FileReader|ext|replace_IE|outerHTML|fragments|1_|rotating|insertContentAt|isContent|_getAttr|Can|loadXmlRegistry|math|eventType|should|jsProgressBar|additional_js_resource|HTMLEvents|dispatchEvent|theme|rpseudo|cacheLength|ends|getPercentage|handleEvent|msg|fireEvent_IE|accept|primitives|fireEvent_DOM|getFireTarget|stopObservingStandardEvent|observeCustomEvent|hasFocus|clearImmediate|eventNameGiven|observeStandardEvent|sendSync|rinputs|rheader|setImmediate|unsupported|ridentifier|285|stopObservingCustomEvent|es5|fromCodePoint|stopObservingEventName|loader_state_update|stopObservingElement|align|zipEnabled|multipleFilesDownloadEnabled|regeneratorRuntime|remember_login|clearTimeout|_isExtensible|getElementsByName|createResponder|relatedTarget|remember_pass|_createResponder|sourceIndex|load|rescape|rquickExpr|writable|detectBaseParameters|construct|enumerate|deleteProperty|argumentsList|qsa|progress_box|symbol|regExpBroken|onmouseenter|rattributeQuotes|loading|disconnectedMatch|starts|Handler|onmouseleave|descriptors|progress_bar|immediate|pass|createMouseEnterLeaveResponder|Reflect|_isCustomEvent|isSimulatedMouseEnterLeaveEvent|createResponderForCustomEvent|LAST_ERROR_ID|EVENT_TRANSLATIONS|registerFormCallbacks|needsContext|Map|unscopables|Observer|PRELOADED_BOOT_CONF|sortStable|getBackgroundTasksManager|loadBootConfig|matcherFromGroupMatchers|getOwnPropertyDescriptors|uniqueSort|can|googleAnalyticsData|loadCSSResource|description|Exception|keyOf|keyFor|PeriodicalExecuter|detectDuplicates|keyof|scope|findFirstElement|external_selector_type|desktop|fitMarginBottom|serializers|encodedKey|fit|activate|www|startParameters|div1|sortDetached|defaultActions|selectedIndex|one|ALERT|single|insertAnalytics|legacyButtonMap|_extendedByPrototype|rcombinators|rcomma|_relatedTarget|preventDefault|you|base|detected|stopPropagation||reduce||reduceRight|dialogLegend|mouseover|mouseout|additionalMethods|pageY|createButtonPseudo|createInputPseudo|pageX|insertBasicSkeleton|callSite|click|isEntries|cssNode|_isButtonForWebKit|WebKit|metaKey|matchAnyContext|matchContext|sln|clientLeft|mapped|Set|Strict|clientTop|postSelector|seems|Notice|multipleContexts|push_native|timers|Jeu|The|filename|paddingRight|rootElement|_invoke|server_answer|BOOTER_URL|outer_observer|borderRightWidth|borderLeftWidth|2008|Control|paddingLeft|DOCUMENT_NODE|original_path|pWidth|addChild|XPath|instanceMethods|Method|mWidth|getMetadata|madePositioned|getContextNode|opera|parentElement|IS_OLD_OPERA||NaN||CANCEL|pOffset|stopped|relativeTo|pageScrollXY|messageBox|eOffset|Microsoft|prototype_absolutize_original_styles|jsonData|madeClipping|isSealed|nextTick|seal|void|MIN_SAFE_INTEGER|pushTryEntry|GET_FIELDS|setParameters|loc|sendAsync|insertLoaderProgress|rootEntry|9007199254740991|zIndex|isInline|detail|prop|wheelDelta|defined|getParent|my_code|includeScrollOffsets|execScript|_isLoaded|bRight|withinIncludingScrolloffsets|deltaX|abrupt|x00|icon_binary_url|deltaY|bLeft|Community|0x10000|500|rval|aSync|setSelectedNodes|escapedWhitespace|bBottom|bTop|COMPOSITE_PROPERTIES|cssNameFor|mTop|displayName|multiple|race|currentLightBox|mLeft|mRight|pHeight|makeInvokeMethod|callThrow|mHeight|mBottom|readonly|65535|_trackPageview|isConcatSpreadable|Parallel|polyfill|statement|delegateYield|Build|Free|ssl|LN10|Edition|edition|useSetter|useSimple|finish|_setDomainName|10000|IE10plus|WeakSet|111|babel|hasInstance|convert|MODULE_NOT_FOUND|LN2|parseQuery|0b1|leak|google|_setAccount|MAX_VALUE|Non|MIN_VALUE|search|hidden_forms|member|1000px|rel|stylesheet|illegal|hidden_frames|Count|http|attempt|POSITIVE_INFINITY|_gaTrackEvents|media|screen|negative|NEGATIVE_INFINITY|analytics|valid|25T07|06|999Z|ajxpThemeSkipLoaderProgress|07|0385|now|5e13|0o1|Copyright|Invalid|getUTCMilliseconds|progressBarContainer|126px|codePointAt|LOG2E|126|_blank|9999|afterFinish|00000|already|mark|Booting|01|suspendedStart|isGeneratorFunction|callable|License|completed|contentWindow|progressState|executing|Accessors|AGPL|12px|56319|Reduce|2014|154|57343|importScripts|onmessage|port1|port2|clearInterval|reference|Cyclic|Mobile|u0000|0000|Apple|SelectorsAPI|querySelector|ufff0|HTMLDivElement|suspendedYield|uffff|KHTML|turn|1024|Badly|value2|sharing|SyntaxError|value1|AppleWebKit|NET4|2013|cycle|ufeff|u206f|emit|1114111|bfnrt|percent|unhandledRejection|u00|x1f|progressBarHeighter|rejection|Unhandled|u00ad|u0600|u200f|u2028|u202f|u2060|u200c|u17b5|u0604|secure|u070f|u17b4|formed|titleFontSize|Top|Bottom|After|detectMinisiteSession|Before|childOf|Insertion|PydioApi|logging_result|horizontal|override|vertical|overlap|deprecated|instead|Toggle|setCloseValidation|386|366|initEvent|D33131|9px|cancelBubble|srcElement|createEventObject|unspec|doScroll|DOMContentLoaded|hideLightBox|storeRememberData|prevent|could|replaceBy|realOffset|positionUnder|setBounds|destroy|frameborder|Alpha|progid|DXImageTransform|No|__className|parseXmlMessage|missing|implement|Warning|Reference|unknown|prompt|IframeShim|nodes_diff|reloadRepositoriesList|findChildElements|matchElements|_getElementsByXPath|findElements|repository_list|setPendingSelection|mousewheel|DOMMouseScroll|DIALOG|showSimpleModal|reload_instruction|mouse|fromElement|6px|may|errors|Php|consider|changing|password|filters|Standards|dialogFooter|pydioBootstrap|selectorData|debug|server_prefix_uri|parsing|_UP_|PHP|Reporting|createPseudo|Ooups|selectors|happen|Syntax|unrecognized|i18nMessages|lastChild|header|level|activeElement|cssResources|themes|innerText|fireSelectionChange|fireContextChange|KEY_DOWN|KEY_DELETE|KEY_HOME|KEY_RIGHT|KEY_UP|KEY_ESC|KEY_LEFT|KEY_END|KEY_PAGEUP|clientX|clientY|ErrorShake|trigger_bg_action|KEY_PAGEDOWN|KEY_INSERT|KEY_RETURN|KEY_TAB||before_gui_load|focusFirstElement|ajxpOptions|getInputs|actions_loaded|fitHeightToBottom|setValue|present|param|KEY_BACKSPACE|change|queueAction|Field|multipleNodesReload|getByName|getByInterface|0x36363636|0x5C5C5C5C|lengthComputable|343485551|718787259|145523070|1120210379|progress|readAsBinaryString|uploadFile|SUCCESS|0x3F|Parameters|0123456789ABCDEF|0123456789abcdef|1309151649|1560198380|995338651|198630844|1126891415|530742520|421815835|76029189|640364487|1416354905|57434055|1873313359|30611744|2054922799|1051523|1700485571|1894986606|imgWidth|onabort|Fatal|expired|Please|Internal|security|Server|Ooops|hitting|browser|Unknown|errorCode|parsererror|underline|438|decoration|server|logs|logout|setContextNode|XMLUtils|getDomNodeText|percentImage|percentText|backgroundPosition|backgroundImage|40000|loadingImage|going|setMethod|require_auth|wrong||722521979|358537222|271733879|1732584194|271733878|1732584193|0x80|abc|900150983cd24fb0d6963f7d28e17f72|680876936|389564586|1473231341|45705983|1200080426|176418897|606105819|1044525330|POST|append|stream|octet|instantiate|sendAsBinary|objectImplements|Interface|unescape|Disposition|192|224|2048|MultiPartFormBoundary|multipart|getTime|1770035416|1958414417|1735328473|1926607734|378558|51403784|1444681467|187363961|1163531501|2022574463|1839030562|1094730640|681279174|155497632|1272893353|35309556|1530992060|1019803690|568446438||1502002290|1236535329|40341101|1804603682|42063|1990404162|165796510|1069501632|660478335|405537848|38016083|701558691|643717713|373897302|boot_loaded|uncaught|160|planet|bold|BUTTON|INPUT|pixelLeft|weight|toCSS|reason|toHash|Property|toCSSPixels||FORM|center|cellpadding|FrameSet|FRAMESET|TableRow|COLGROUP|IFRAME|3em|childElements|getElementsBySelector|anonymous_element_|label|IFrame|85px|png|customFuncDecode|createContextualFragment|currentLayout|320px|TABLE|selectNode|555555|BODY|ajaxplorer_boot_protolegacy|createRange|folder|serverAccessPath|2002|rgb|borderBottomWidth|marginTop|borderTopWidth|paddingBottom|paddingTop|marginLeft|PydioLogo250|||||||fff|solid|13px|marginRight|24px|cellPadding|COL|iconOnly|progressCustomMessage|ondblclick|onmousedown|onmouseup|frameBorder|applet|OptGroup|TextArea|OPTGROUP|embed|longDesc|onmouseover|onmousemove|onselect|onreset|getStyle_Opera|0077b3|onchange|onsubmit|onkeyup|onfocus|onmouseout|onblur|onkeypress|onkeydown|readOnly|maxLength|Quote|INS|colSpan|rowSpan|vAlign|DEL|cellSpacing|cellspacing|TableCaption|CAPTION|IMG|Anchor|dateTime|Directory|FieldSet|UL|FIELDSET|Paragraph|encType|UList|OL|DIR|DList|accessKey|OList|SCRIPT|Webkit|clip|219|Connection|charset|PeriodicalUpdater|rect_spinners|version|webkitMatchesSelector|300|createComment|unload|0xDC00|0x3FF|UTF|0x|postBody|Requested|qsaError|Accept|With|mozMatchesSelector|304|init|Loading|Loaded|java|ajxpVersionDate|ecma|stretch|rectangles|Uninitialized|Interactive|||msMatchesSelector|204|131px|100px|1223|Success|Failure|responseJSON|getAllHeaders|oMatchesSelector|urlencoded|0xD800|extendElement|COMMENT_NODE|DOCUMENT_TYPE_NODE|DOCUMENT_FRAGMENT_NODE|sizzle|hash2map|ENTITY_NODE|Msxml2|rect4|clientHeight|NOTATION_NODE|bounce2|OPTION|5px|createTextNode|bounce1|clientWidth|rect5|ProtoCompat|123|ENTITY_REFERENCE_NODE|PROCESSING_INSTRUCTION_NODE|CDATA_SECTION_NODE|autofocus|scoped|rect2|xa0|rect1|native|ATTRIBUTE_NODE|required|x20|ismap|controls|loop|autoplay|rect3'.split('|'),0,{}))
+eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('(I e(t,n,r){I s(o,u){if(!n[o]){if(!t[o]){M a=2d 1a=="I"&&1a;if(!u&&a)J a(o,!0);if(i)J i(o,!0);M f=1p 5q("kq 3S 1z \'"+o+"\'");2f f.4s="Fk",f}M l=n[o]={1x:{}};t[o][0].1s(l.1x,I(e){M n=t[o][1][e];J s(n?n:e)},l,l.1x,e,t,n,r)}J n[o].1x}M i=2d 1a=="I"&&1a;1w(M o=0;o<r.Y;o++)s(r[o]);J s})({1:[I(1a,1z,1x){(I(3d){"3N 3Y";1a("4X-js/tP");1a("tO/8p");if(3d.tQ){2f 1p 5q("iD xT dF of Fo/Fp is pC")}3d.tQ=1k}).1s(N,2d 3d!=="1R"?3d:2d 5f!=="1R"?5f:2d 1u!=="1R"?1u:{})},{"4X-js/tP":78,"tO/8p":79}],2:[I(1a,1z,1x){"3N 3Y";M $=1a("./$");1z.1x=I(f8){J I(el){M O=$.3B(N),Y=$.5U(O.Y),1l=$.7j(1L[1],Y),U;if(f8&&el!=el)1M(Y>1l){U=O[1l++];if(U!=U)J 1k}1h 1w(;Y>1l;1l++)if(f8||1l in O){if(O[1l]===el)J f8||1l}J!f8&&-1}}},{"./$":21}],3:[I(1a,1z,1x){"3N 3Y";M $=1a("./$"),2X=1a("./$.2X");1z.1x=I(a7){M 6v=a7==1,tN=a7==2,tS=a7==3,jC=a7==4,m0=a7==6,tR=a7==5||m0;J I(cR){M O=1c($.6C(N)),5f=$.cz(O),f=2X(cR,1L[1],3),Y=$.5U(5f.Y),1l=0,1A=6v?2H(Y):tN?[]:1R,5g,4i;1w(;Y>1l;1l++)if(tR||1l in 5f){5g=5f[1l];4i=f(5g,1l,O);if(a7){if(6v)1A[1l]=4i;1h if(4i)6T(a7){2L 3:J 1k;2L 5:J 5g;2L 6:J 1l;2L 2:1A.1I(5g)}1h if(jC)J 1t}}J m0?-1:tS||jC?jC:1A}}},{"./$":21,"./$.2X":11}],4:[I(1a,1z,1x){M $=1a("./$");I 2m(tV,lB,lA){if(!tV)2f 4P(lA?lB+lA:lB)}2m.1d=$.6C;2m.fn=I(it){if(!$.2z(it))2f 4P(it+" is 8u a I!");J it};2m.4R=I(it){if(!$.3e(it))2f 4P(it+" is 8u an 1m!");J it};2m.ai=I(it,9l,1D){if(!(it 8d 9l))2f 4P(1D+": 3N kr \'1p\' 8I!");J it};1z.1x=2m},{"./$":21}],5:[I(1a,1z,1x){M $=1a("./$"),k4=1a("./$.kh-2a");1z.1x=1c.bF||I bF(2x,3E){M T=1c($.6C(2x)),l=1L.Y,i=1;1M(l>i){M S=$.cz(1L[i++]),2a=k4(S),Y=2a.Y,j=0,1b;1M(Y>j)T[1b=2a[j++]]=S[1b]}J T}},{"./$":21,"./$.kh-2a":13}],6:[I(1a,1z,1x){M $=1a("./$"),7k=1a("./$.5k")("lf"),3x={}.3x;I 2u(it){J 3x.1s(it).2g(8,-1)}2u.9O=I(it){M O,T;J it==1R?it===1R?"uU":"uV":2d(T=(O=1c(it))[7k])=="2B"?T:2u(O)};2u.1F=I(it,4y,tM){if(it&&!$.2F(it=tM?it:it.1y,7k))$.3C(it,7k,4y)};1z.1x=2u},{"./$":21,"./$.5k":32}],7:[I(1a,1z,1x){"3N 3Y";M $=1a("./$"),2X=1a("./$.2X"),4I=1a("./$.2p").4I,2m=1a("./$.2m"),8R=1a("./$.1w-of"),3O=1a("./$.1Q").3O,2F=$.2F,1F=$.1F,3e=$.3e,3C=$.3C,6a=1c.6a||$.4X.1c.6a,ID=4I("id"),bJ=4I("bJ"),cQ=4I("6Z"),8K=4I("6m"),8c=4I("1Q"),dL=$.7A?4I("5W"):"5W",id=0;I lD(it,2t){if(!3e(it))J(2d it=="2B"?"S":"P")+it;if(6a(it))J"F";if(!2F(it,ID)){if(!2t)J"E";3C(it,ID,++id)}J"O"+it[ID]}I c9(1U,1b){M 1l=lD(1b),1H;if(1l!="F")J 1U[bJ][1l];1w(1H=1U[8K];1H;1H=1H.n){if(1H.k==1b)J 1H}}1z.1x={bB:I(3U,6v,ag){I C(){M 1U=2m.ai(N,C,3U),3t=1L[0];1F(1U,bJ,$.2t(1r));1F(1U,dL,0);1F(1U,cQ,1R);1F(1U,8K,1R);if(3t!=1R)8R(3t,6v,1U[ag],1U)}$.gm(C.1y,{9Q:I 9Q(){1w(M 1U=N,3s=1U[bJ],1H=1U[8K];1H;1H=1H.n){1H.r=1k;if(1H.p)1H.p=1H.p.n=1R;3q 3s[1H.i]}1U[8K]=1U[cQ]=1R;1U[dL]=0},"3q":I(1b){M 1U=N,1H=c9(1U,1b);if(1H){M 2C=1H.n,6b=1H.p;3q 1U[bJ][1H.i];1H.r=1k;if(6b)6b.n=2C;if(2C)2C.p=6b;if(1U[8K]==1H)1U[8K]=2C;if(1U[cQ]==1H)1U[cQ]=6b;1U[dL]--}J!!1H},8Y:I 8Y(cR){M f=2X(cR,1L[1],3),1H;1M(1H=1H?1H.n:N[8K]){f(1H.v,1H.k,N);1M(1H&&1H.r)1H=1H.p}},2F:I 2F(1b){J!!c9(N,1b)}});if($.7A)$.4f(C.1y,"5W",{1j:I(){J 2m.1d(N[dL])}});J C},1d:I(1U,1b,U){M 1H=c9(1U,1b),6b,1l;if(1H){1H.v=U}1h{1U[cQ]=1H={i:1l=lD(1b,1k),k:1b,v:U,p:6b=1U[cQ],n:1R,r:1t};if(!1U[8K])1U[8K]=1H;if(6b)6b.n=1H;1U[dL]++;if(1l!="F")1U[bJ][1l]=1H}J 1U},c9:c9,tG:I(C,3U,6v){1a("./$.1Q-6j")(C,3U,I(bf,89){1F(N,8c,{o:bf,k:89})},I(){M 1Q=N[8c],89=1Q.k,1H=1Q.l;1M(1H&&1H.r)1H=1H.p;if(!1Q.o||!(1Q.l=1H=1H?1H.n:1Q.o[8K])){1Q.o=1R;J 3O(1)}if(89=="2a")J 3O(0,1H.k);if(89=="2I")J 3O(0,1H.v);J 3O(0,[1H.k,1H.v])},6v?"3k":"2I",!6v,1k)}}},{"./$":21,"./$.2m":4,"./$.2X":11,"./$.1w-of":14,"./$.1Q":20,"./$.1Q-6j":18,"./$.2p":30}],8:[I(1a,1z,1x){M $1d=1a("./$.1d"),8R=1a("./$.1w-of");1z.1x=I(3U){$1d($1d.P,3U,{7X:I 7X(){M 5u=[];8R(N,1t,5u.1I,5u);J 5u}})}},{"./$.1d":12,"./$.1w-of":14}],9:[I(1a,1z,1x){"3N 3Y";M $=1a("./$"),4I=1a("./$.2p").4I,2m=1a("./$.2m"),8R=1a("./$.1w-of"),e3=$.2F,3e=$.3e,3C=$.3C,6a=1c.6a||$.4X.1c.6a,id=0,ID=4I("id"),6L=4I("5R"),hZ=4I("E3"),2b=1a("./$.1Y-2K"),3S=2b(5),gI=2b(6);I hM(7H,1b){J 3S.1s(7H.1Y,I(it){J it[0]===1b})}I 9b(1U){J 1U[hZ]||3C(1U,hZ,{1Y:[],1j:I(1b){M 1H=hM(N,1b);if(1H)J 1H[1]},2F:I(1b){J!!hM(N,1b)},1F:I(1b,U){M 1H=hM(N,1b);if(1H)1H[1]=U;1h N.1Y.1I([1b,U])},"3q":I(1b){M 1l=gI.1s(N.1Y,I(it){J it[0]===1b});if(~1l)N.1Y.ey(1l,1);J!!~1l}})[hZ]}1z.1x={bB:I(3U,6v,ag){I C(){$.1F(2m.ai(N,C,3U),ID,id++);M 3t=1L[0];if(3t!=1R)8R(3t,6v,N[ag],N)}$.gm(C.1y,{"3q":I(1b){if(!3e(1b))J 1t;if(6a(1b))J 9b(N)["3q"](1b);J e3(1b,6L)&&e3(1b[6L],N[ID])&&3q 1b[6L][N[ID]]},2F:I 2F(1b){if(!3e(1b))J 1t;if(6a(1b))J 9b(N).2F(1b);J e3(1b,6L)&&e3(1b[6L],N[ID])}});J C},1d:I(1U,1b,U){if(6a(2m.4R(1b))){9b(1U).1F(1b,U)}1h{e3(1b,6L)||3C(1b,6L,{});1b[6L][1U[ID]]=U}J 1U},9b:9b,6L:6L,ID:ID}},{"./$":21,"./$.1Y-2K":3,"./$.2m":4,"./$.1w-of":14,"./$.2p":30}],10:[I(1a,1z,1x){"3N 3Y";M $=1a("./$"),$1d=1a("./$.1d"),gb=1a("./$.1Q").gb,8R=1a("./$.1w-of"),5s=1a("./$.5s"),tB=1a("./$.2m").ai;1z.1x=I(3U,2K,nO,6v,fQ){M 5i=$.g[3U],C=5i,ag=6v?"1F":"cm",2q=C&&C.1y,O={};I fC(lg,tC){M 2b=2q[lg];if($.FW)2q[lg]=I(a,b){M 1A=2b.1s(N,a===0?0:a,b);J tC?N:1A}}if(!$.2z(C)||!(fQ||!gb&&2q.8Y&&2q.3k)){C=nO.bB(3U,6v,ag);$.gm(C.1y,2K)}1h{M ai=1p C,8L=ai[ag](fQ?{}:-0,1),jg;if(!1a("./$.1Q-8G")(I(1Q){1p C(1Q)})){C=I(){tB(N,C,3U);M 1U=1p 5i,3t=1L[0];if(3t!=1R)8R(3t,6v,1U[ag],1U);J 1U};C.1y=2q;if($.FW)2q.4E=C}fQ||ai.8Y(I(5g,1b){jg=1/1b===-9j});if(jg){fC("3q");fC("2F");6v&&fC("1j")}if(jg||8L!==ai)fC(ag,1k)}1a("./$.2u").1F(C,3U);O[3U]=C;$1d($1d.G+$1d.W+$1d.F*(C!=5i),O);5s(C);5s($.4X[3U]);if(!fQ)nO.tG(C,3U,6v);J C}},{"./$":21,"./$.2m":4,"./$.2u":6,"./$.1d":12,"./$.1w-of":14,"./$.1Q":20,"./$.1Q-8G":19,"./$.5s":27}],11:[I(1a,1z,1x){M b5=1a("./$.2m").fn;1z.1x=I(fn,1U,Y){b5(fn);if(~Y&&1U===1R)J fn;6T(Y){2L 1:J I(a){J fn.1s(1U,a)};2L 2:J I(a,b){J fn.1s(1U,a,b)};2L 3:J I(a,b,c){J fn.1s(1U,a,b,c)}}J I(){J fn.2W(1U,1L)}}},{"./$.2m":4}],12:[I(1a,1z,1x){M $=1a("./$"),3d=$.g,4X=$.4X,2z=$.2z;I 2X(fn,1U){J I(){J fn.2W(1U,1L)}}3d.4X=4X;$1d.F=1;$1d.G=2;$1d.S=4;$1d.P=8;$1d.B=16;$1d.W=32;I $1d(1J,1D,3E){M 1b,7Y,ab,7M,fd=1J&$1d.G,2x=fd?3d:1J&$1d.S?3d[1D]:(3d[1D]||{}).1y,1x=fd?4X:4X[1D]||(4X[1D]={});if(fd)3E=1D;1w(1b in 3E){7Y=!(1J&$1d.F)&&2x&&1b in 2x;ab=(7Y?2x:3E)[1b];if(1J&$1d.B&&7Y)7M=2X(ab,3d);1h 7M=1J&$1d.P&&2z(ab)?2X(7G.1s,ab):ab;if(2x&&!7Y){if(fd)2x[1b]=ab;1h 3q 2x[1b]&&$.3C(2x,1b,ab)}if(1x[1b]!=ab)$.3C(1x,1b,7M)}}1z.1x=$1d},{"./$":21}],13:[I(1a,1z,1x){M $=1a("./$");1z.1x=I(it){M 2a=$.cI(it),4W=$.4W,9n=$.9n;if(9n)$.2S.1s(9n(it),I(1b){if(4W(it,1b).h8)2a.1I(1b)});J 2a}},{"./$":21}],14:[I(1a,1z,1x){M 2X=1a("./$.2X"),1j=1a("./$.1Q").1j,1s=1a("./$.1Q-1s");1z.1x=I(3t,3k,fn,1U){M 1E=1j(3t),f=2X(fn,1U,3k?2:1),3O;1M(!(3O=1E.2C()).5m){if(1s(1E,f,3O.U,3k)===1t){J 1s.bQ(1E)}}}},{"./$.2X":11,"./$.1Q":20,"./$.1Q-1s":17}],15:[I(1a,1z,1x){1z.1x=I($){$.FW=1k;$.j3=$.g;J $}},{}],16:[I(1a,1z,1x){1z.1x=I(fn,1S,1U){M un=1U===1R;6T(1S.Y){2L 0:J un?fn():fn.1s(1U);2L 1:J un?fn(1S[0]):fn.1s(1U,1S[0]);2L 2:J un?fn(1S[0],1S[1]):fn.1s(1U,1S[0],1S[1]);2L 3:J un?fn(1S[0],1S[1],1S[2]):fn.1s(1U,1S[0],1S[1],1S[2]);2L 4:J un?fn(1S[0],1S[1],1S[2],1S[3]):fn.1s(1U,1S[0],1S[1],1S[2],1S[3]);2L 5:J un?fn(1S[0],1S[1],1S[2],1S[3],1S[4]):fn.1s(1U,1S[0],1S[1],1S[2],1S[3],1S[4])}J fn.2W(1U,1S)}},{}],17:[I(1a,1z,1x){M 4q=1a("./$.2m").4R;I bQ(1E){M 6q=1E["J"];if(6q!==1R)4q(6q.1s(1E))}I 1s(1E,fn,U,3k){2r{J 3k?fn(4q(U)[0],U[1]):fn(U)}2o(e){bQ(1E);2f e}}1s.bQ=bQ;1z.1x=1s},{"./$.2m":4}],18:[I(1a,1z,1x){M $1d=1a("./$.1d"),$=1a("./$"),2u=1a("./$.2u"),$1Q=1a("./$.1Q"),97=1a("./$.5k")("1E"),aO="@@1E",j5="2I",6f=$1Q.6f;1z.1x=I(5i,3U,9l,2C,cO,tJ,tW){$1Q.2t(9l,3U,2C);I eZ(89){J I(){J 1p 9l(N,89)}}M 7k=3U+" ug",2q=5i.1y,nr=2q[97]||2q[aO]||cO&&2q[cO],cw=nr||eZ(cO),2K,1b;if(nr){M e7=$.9G(cw.1s(1p 5i));2u.1F(e7,7k,1k);if($.FW&&$.2F(2q,aO))$1Q.1F(e7,$.1U)}if($.FW)$1Q.1F(2q,cw);6f[3U]=cw;6f[7k]=$.1U;if(cO){2K={2a:tJ?cw:eZ("2a"),2I:cO==j5?cw:eZ(j5),3k:cO!=j5?cw:eZ("3k")};if(tW)1w(1b in 2K){if(!(1b in 2q))$.3C(2q,1b,2K[1b])}1h $1d($1d.P+$1d.F*$1Q.gb,3U,2K)}}},{"./$":21,"./$.2u":6,"./$.1d":12,"./$.1Q":20,"./$.5k":32}],19:[I(1a,1z,1x){M 97=1a("./$.5k")("1E"),ow=1t;2r{M ov=[7][97]();ov["J"]=I(){ow=1k};2H.4S(ov,I(){2f 2})}2o(e){}1z.1x=I(b4){if(!ow)J 1t;M 4I=1t;2r{M 5u=[7],1Q=5u[97]();1Q.2C=I(){4I=1k};5u[97]=I(){J 1Q};b4(5u)}2o(e){}J 4I}},{"./$.5k":32}],20:[I(1a,1z,1x){"3N 3Y";M $=1a("./$"),2u=1a("./$.2u"),4q=1a("./$.2m").4R,97=1a("./$.5k")("1E"),aO="@@1E",6f={},e7={};oF(e7,$.1U);I oF(O,U){$.3C(O,97,U);if(aO in[])$.3C(O,aO,U)}1z.1x={gb:"2a"in[]&&!("2C"in[].2a()),6f:6f,3O:I(5m,U){J{U:U,5m:!!5m}},is:I(it){M O=1c(it),3P=$.g.3P,ue=3P&&3P.1E||aO;J ue in O||97 in O||$.2F(6f,2u.9O(O))},1j:I(it){M 3P=$.g.3P,ud=it[3P&&3P.1E||aO],uc=ud||it[97]||6f[2u.9O(it)];J 4q(uc.1s(it))},1F:oF,2t:I(9l,3U,2C,2q){9l.1y=$.2t(2q||e7,{2C:$.4z(1,2C)});2u.1F(9l,3U+" ug")}}},{"./$":21,"./$.2m":4,"./$.2u":6,"./$.5k":32}],21:[I(1a,1z,1x){"3N 3Y";M 3d=2d 5f!="1R"?5f:7G("J N")(),4X={},7d=1c.7d,9f={}.9f,96=2T.96,6u=2T.6u,a3=2T.a3,7x=2T.7x;M 7A=!!I(){2r{J 7d({},"a",{1j:I(){J 2}}).a==2}2o(e){}}();M 3C=od(1);I b6(it){J bI(it=+it)?0:(it>0?6u:96)(it)}I 4z(e0,U){J{h8:!(e0&1),cC:!(e0&2),tb:!(e0&4),U:U}}I nj(1m,1b,U){1m[1b]=U;J 1m}I od(e0){J 7A?I(1m,1b,U){J $.4f(1m,1b,4z(e0,U))}:nj}I 3e(it){J it!==1r&&(2d it=="1m"||2d it=="I")}I 2z(it){J 2d it=="I"}I 6C(it){if(it==1R)2f 4P("tt\'t 1s 2b on  "+it);J it}M $=1z.1x=1a("./$.fw")({g:3d,4X:4X,3X:3d.1o&&1o.3h,3e:3e,2z:2z,it:I(it){J it},1U:I(){J N},b6:b6,5U:I(it){J it>0?7x(b6(it),tq):0},7j:I(1l,Y){1l=b6(1l);J 1l<0?a3(1l+Y,0):7x(1l,Y)},2F:I(it,1b){J 9f.1s(it,1b)},2t:1c.2t,9G:1c.dP,7A:7A,4z:4z,4W:1c.9p,4f:7d,k3:1c.8s,cI:1c.2a,8E:1c.cs,9n:1c.hl,6C:6C,cz:1c,3B:I(it){J $.cz(6C(it))},3C:3C,1d:od(0),1F:3d.3P?nj:3C,gm:I(2x,5w){1w(M 1b in 5w)3C(2x,1b,5w[1b]);J 2x},2S:[].8Y});if(2d uk!="1R")uk=4X;if(2d uj!="1R")uj=3d},{"./$.fw":15}],22:[I(1a,1z,1x){M $=1a("./$");1z.1x=I(1m,el){M O=$.3B(1m),2a=$.cI(O),Y=2a.Y,1l=0,1b;1M(Y>1l)if(O[1b=2a[1l++]]===el)J 1b}},{"./$":21}],23:[I(1a,1z,1x){M $=1a("./$"),4q=1a("./$.2m").4R;1z.1x=I l1(it){4q(it);M 2a=$.8E(it),9n=$.9n;J 9n?2a.5o(9n(it)):2a}},{"./$":21,"./$.2m":4}],24:[I(1a,1z,1x){"3N 3Y";M $=1a("./$"),4G=1a("./$.4G"),b5=1a("./$.2m").fn;1z.1x=I(){M fn=b5(N),Y=1L.Y,kM=2H(Y),i=0,9w=$.j3.9w,eN=1t;1M(Y>i)if((kM[i]=1L[i++])===9w)eN=1k;J I(){M 1U=N,mq=1L.Y,j=0,k=0,1S;if(!eN&&!mq)J 4G(fn,kM,1U);1S=kM.2g();if(eN)1w(;Y>j;j++)if(1S[j]===9w)1S[j]=1L[k++];1M(mq>k)1S.1I(1L[k++]);J 4G(fn,1S,1U)}}},{"./$":21,"./$.2m":4,"./$.4G":16}],25:[I(1a,1z,1x){"3N 3Y";1z.1x=I(u8,2i,u9){M b3=2i===1c(2i)?I(uh){J 2i[uh]}:2i;J I(it){J 2w(u9?it:N).2i(u8,b3)}}},{}],26:[I(1a,1z,1x){M $=1a("./$"),2m=1a("./$.2m");I 5r(O,2q){2m.4R(O);2m(2q===1r||$.3e(2q),2q,": vs\'t 1F as 1y!")}1z.1x={1F:1c.gu||("7T"in{}?I(mr,1F){2r{1F=1a("./$.2X")(7G.1s,$.4W(1c.1y,"7T").1F,2);1F({},[])}2o(e){mr=1k}J I gu(O,2q){5r(O,2q);if(mr)O.7T=2q;1h 1F(O,2q);J O}}():1R),5r:5r}},{"./$":21,"./$.2m":4,"./$.2X":11}],27:[I(1a,1z,1x){M $=1a("./$"),e1=1a("./$.5k")("5s");1z.1x=I(C){if($.7A&&!(e1 in C))$.4f(C,e1,{cC:1k,1j:$.1U})}},{"./$":21,"./$.5k":32}],28:[I(1a,1z,1x){"3N 3Y";M $=1a("./$");1z.1x=I(kQ){J I(fr){M s=2w($.6C(N)),i=$.b6(fr),l=s.Y,a,b;if(i<0||i>=l)J kQ?"":1R;a=s.7U(i);J a<lQ||a>Az||i+1===l||(b=s.7U(i+1))<lK||b>AZ?kQ?s.ak(i):a:kQ?s.2g(i,i+2):(a-lQ<<10)+(b-lK)+m1}}},{"./$":21}],29:[I(1a,1z,1x){"3N 3Y";M $=1a("./$"),2X=1a("./$.2X"),2u=1a("./$.2u"),4G=1a("./$.4G"),3d=$.g,2z=$.2z,3X=$.3X,1o=3d.1o,8e=3d.8e,kD=3d.vG,la=3d.vz,fI=3d.fI,6r=3d.6r,kT=3d.kT,kX=0,eJ={},mo="ee",5D,kz,az;I fK(){M id=+N;if($.2F(eJ,id)){M fn=eJ[id];3q eJ[id];fn()}}I mA(1G){fK.1s(1G.3s)}if(!2z(kD)||!2z(la)){kD=I(fn){M 1S=[],i=1;1M(1L.Y>i)1S.1I(1L[i++]);eJ[++kX]=I(){4G(2z(fn)?fn:7G(fn),1S)};5D(kX);J kX};la=I(id){3q eJ[id]};if(2u(8e)=="8e"){5D=I(id){8e.tw(2X(fK,id,1))}}1h if(6r&&2z(fI)&&!3d.AB){5D=I(id){fI(id,"*")};6r("4b",mA,1t)}1h if(2z(kT)){kz=1p kT;az=kz.za;kz.z5.zb=mA;5D=2X(az.fI,az,1)}1h if(1o&&mo in 1o.4x("6B")){5D=I(id){3X.7O(1o.4x("6B"))[mo]=I(){3X.8y(N);fK.1s(id)}}}1h{5D=I(id){bX(2X(fK,id,1),0)}}}1z.1x={1F:kD,9Q:la}},{"./$":21,"./$.2u":6,"./$.2X":11,"./$.4G":16}],30:[I(1a,1z,1x){M tZ=0;I 2p(1b){J"3P("+1b+")9w"+(++tZ+2T.lw()).3x(36)}2p.4I=1a("./$").g.3P||2p;1z.1x=2p},{"./$":21}],31:[I(1a,1z,1x){M $=1a("./$"),jJ=1a("./$.5k")("va");if($.FW&&!(jJ in[]))$.3C(2H.1y,jJ,{});1z.1x=I(1b){if($.FW)[][jJ][1b]=1k}},{"./$":21,"./$.5k":32}],32:[I(1a,1z,1x){M 3d=1a("./$").g,7H={};1z.1x=I(1D){J 7H[1D]||(7H[1D]=3d.3P&&3d.3P[1D]||1a("./$.2p").4I("3P."+1D))}},{"./$":21,"./$.2p":30}],33:[I(1a,1z,1x){M $=1a("./$"),2u=1a("./$.2u"),$1d=1a("./$.1d"),4G=1a("./$.4G"),db=1a("./$.1Y-2K"),fR=1a("./$.2p").4I("7T"),2m=1a("./$.2m"),4q=2m.4R,n2=1c.1y,A=[],2g=A.2g,2v=A.2v,9O=2u.9O,2F=$.2F,7d=$.4f,u3=$.4W,8s=$.k3,2z=$.2z,3B=$.3B,5U=$.5U,jF=1t;if(!$.7A){2r{jF=7d(1o.4x("1v"),"x",{1j:I(){J 8}}).x==8}2o(e){}$.4f=I(O,P,dg){if(jF)2r{J 7d(O,P,dg)}2o(e){}if("1j"in dg||"1F"in dg)2f 4P("zl 8u tD!");if("U"in dg)4q(O)[P]=dg.U;J O};$.4W=I(O,P){if(jF)2r{J u3(O,P)}2o(e){}if(2F(O,P))J $.4z(!n2.nI.1s(O,P),O[P])};$.k3=8s=I(O,cD){4q(O);M 2a=$.cI(cD),Y=2a.Y,i=0,P;1M(Y>i)$.4f(O,P=2a[i++],cD[P]);J O}}$1d($1d.S+$1d.F*!$.7A,"1c",{9p:$.4W,7d:$.4f,8s:8s});M f1=("4E,9f,vR,nI,"+"uS,3x,9M").4K(","),n4=f1.5o("Y","1y"),ne=f1.Y;M eY=I(){M bK=1o.4x("bK"),i=ne,gt=">",dq;bK.1N.4e="86";$.3X.7O(bK);bK.5w="eB:";dq=bK.yN.1o;dq.g5();dq.dv("<6B>1o.F=1c</6B"+gt);dq.bQ();eY=dq.F;1M(i--)3q eY.1y[f1[i]];J eY()};I nc(4Q,Y){J I(1m){M O=3B(1m),i=0,1A=[],1b;1w(1b in O)if(1b!=fR)2F(O,1b)&&1A.1I(1b);1M(Y>i)if(2F(O,1b=4Q[i++])){~2v.1s(1A,1b)||1A.1I(1b)}J 1A}}I n1(it){J!$.3e(it)}I jB(){}$1d($1d.S,"1c",{dP:$.9G=$.9G||I(O){O=1c(2m.1d(O));if(2F(O,fR))J O[fR];if(2z(O.4E)&&O 8d O.4E){J O.4E.1y}J O 8d 1c?n2:1r},cs:$.8E=$.8E||nc(n4,n4.Y,1k),2t:$.2t=$.2t||I(O,cD){M 1A;if(O!==1r){jB.1y=4q(O);1A=1p jB;jB.1y=1r;1A[fR]=O}1h 1A=eY();J cD===1R?1A:8s(1A,cD)},2a:$.cI=$.cI||nc(f1,ne,1t),tv:$.it,lI:$.it,kU:$.it,ty:n1,6a:n1,gQ:$.3e});$1d($1d.P,"7G",{3o:I(1U){M fn=2m.fn(N),u5=2g.1s(1L,1);I ax(){M 1S=u5.5o(2g.1s(1L));J 4G(fn,1S,N 8d ax?$.2t(fn.1y):1U)}if(fn.1y)ax.1y=fn.1y;J ax}});I mI(fn){J I(){J fn.2W($.cz(N),1L)}}if(!(0 in 1c("z")&&"z"[0]=="z")){$.cz=I(it){J 2u(it)=="2w"?it.4K(""):1c(it)}}$1d($1d.P+$1d.F*($.cz!=1c),"2H",{2g:mI(2g),3K:mI(A.3K)});$1d($1d.S,"2H",{5J:I(2G){J 2u(2G)=="2H"}});I n0(f6){J I(cR,5l){2m.fn(cR);M O=3B(N),Y=5U(O.Y),1l=f6?Y-1:0,i=f6?-1:1;if(1L.Y<2)1w(;;){if(1l in O){5l=O[1l];1l+=i;3A}1l+=i;2m(f6?1l>=0:Y>1l,"zV of 9o 1Y h6 no g3 U")}1w(;f6?1l>=0:Y>1l;1l+=i)if(1l in O){5l=cR(5l,O[1l],1l,N)}J 5l}}$1d($1d.P,"2H",{8Y:$.2S=$.2S||db(0),3F:db(1),2U:db(2),90:db(3),91:db(4),vP:n0(1t),vO:n0(1k),2v:2v=2v||1a("./$.1Y-7t")(1t),bG:I(el,tA){M O=3B(N),Y=5U(O.Y),1l=Y-1;if(1L.Y>1)1l=2T.7x(1l,$.b6(tA));if(1l<0)1l=5U(Y+1l);1w(;1l>=0;1l--)if(1l in O)if(O[1l]===el)J 1l;J-1}});$1d($1d.P,"2w",{rc:1a("./$.b3")(/^\\s*([\\s\\S]*\\S)?\\s*$/,"$1")});$1d($1d.S,"b1",{zu:I(){J+1p b1}});I lz(bU){J bU>9?bU:"0"+bU}M na=1p b1(-zr-1),tz=!(na.b0&&na.b0()=="zo-zv-zx:zz:39.AN");$1d($1d.P+$1d.F*tz,"b1",{b0:I(){if(!94(N))2f i6("CK lU U");M d=N,y=d.qN(),m=d.CS(),s=y<0?"-":y>CZ?"+":"";J s+("D0"+2T.4O(y)).2g(s?-6:-4)+"-"+lz(d.qP()+1)+"-"+lz(d.qW())+"T"+lz(d.r2())+":"+lz(d.r0())+":"+lz(d.qX())+"."+(m>99?m:"0"+lz(m))+"Z"}});if(9O(I(){J 1L}())=="1c")2u.9O=I(it){M 4y=9O(it);J 4y=="1c"&&2z(it.sj)?"t0":4y}},{"./$":21,"./$.1Y-7t":2,"./$.1Y-2K":3,"./$.2m":4,"./$.2u":6,"./$.1d":12,"./$.4G":16,"./$.b3":25,"./$.2p":30}],34:[I(1a,1z,1x){"3N 3Y";M $=1a("./$"),$1d=1a("./$.1d"),7j=$.7j;$1d($1d.P,"2H",{kH:I kH(2x,4p){M O=1c($.6C(N)),3r=$.5U(O.Y),to=7j(2x,3r),4S=7j(4p,3r),4u=1L[2],t3=4u===1R?3r:7j(4u,3r),6M=2T.7x(t3-4S,3r-to),jH=1;if(4S<to&&to<4S+6M){jH=-1;4S=4S+6M-1;to=to+6M-1}1M(6M-->0){if(4S in O)O[to]=O[4S];1h 3q O[to];to+=jH;4S+=jH}J O}});1a("./$.8a")("kH")},{"./$":21,"./$.1d":12,"./$.8a":31}],35:[I(1a,1z,1x){"3N 3Y";M $=1a("./$"),$1d=1a("./$.1d"),7j=$.7j;$1d($1d.P,"2H",{dH:I dH(U){M O=1c($.6C(N)),Y=$.5U(O.Y),1l=7j(1L[1],Y),4u=1L[2],t2=4u===1R?Y:7j(4u,Y);1M(t2>1l)O[1l++]=U;J O}});1a("./$.8a")("dH")},{"./$":21,"./$.1d":12,"./$.8a":31}],36:[I(1a,1z,1x){M $1d=1a("./$.1d");$1d($1d.P,"2H",{gI:1a("./$.1Y-2K")(6)});1a("./$.8a")("gI")},{"./$.1Y-2K":3,"./$.1d":12,"./$.8a":31}],37:[I(1a,1z,1x){M $1d=1a("./$.1d");$1d($1d.P,"2H",{3S:1a("./$.1Y-2K")(5)});1a("./$.8a")("3S")},{"./$.1Y-2K":3,"./$.1d":12,"./$.8a":31}],38:[I(1a,1z,1x){M $=1a("./$"),2X=1a("./$.2X"),$1d=1a("./$.1d"),$1Q=1a("./$.1Q"),1s=1a("./$.1Q-1s");$1d($1d.S+$1d.F*!1a("./$.1Q-8G")(I(1Q){2H.4S(1Q)}),"2H",{4S:I 4S(t1){M O=1c($.6C(t1)),me=1L[1],l2=me!==1R,f=l2?2X(me,1L[2],2):1R,1l=0,Y,1A,3O,1E;if($1Q.is(O)){1E=$1Q.1j(O);1A=1p(2d N=="I"?N:2H);1w(;!(3O=1E.2C()).5m;1l++){1A[1l]=l2?1s(1E,f,[3O.U,1l],1k):3O.U}}1h{1A=1p(2d N=="I"?N:2H)(Y=$.5U(O.Y));1w(;Y>1l;1l++){1A[1l]=l2?f(O[1l],1l):O[1l]}}1A.Y=1l;J 1A}})},{"./$":21,"./$.2X":11,"./$.1d":12,"./$.1Q":20,"./$.1Q-1s":17,"./$.1Q-8G":19}],39:[I(1a,1z,1x){M $=1a("./$"),lb=1a("./$.8a"),8c=1a("./$.2p").4I("1Q"),$1Q=1a("./$.1Q"),3O=$1Q.3O,6f=$1Q.6f;1a("./$.1Q-6j")(2H,"2H",I(bf,89){$.1F(N,8c,{o:$.3B(bf),i:0,k:89})},I(){M 1Q=N[8c],O=1Q.o,89=1Q.k,1l=1Q.i++;if(!O||1l>=O.Y){1Q.o=1R;J 3O(1)}if(89=="2a")J 3O(0,1l);if(89=="2I")J 3O(0,O[1l]);J 3O(0,[1l,O[1l]])},"2I");6f.t0=6f.2H;lb("2a");lb("2I");lb("3k")},{"./$":21,"./$.1Q":20,"./$.1Q-6j":18,"./$.2p":30,"./$.8a":31}],40:[I(1a,1z,1x){M $1d=1a("./$.1d");$1d($1d.S,"2H",{of:I of(){M 1l=0,Y=1L.Y,1A=1p(2d N=="I"?N:2H)(Y);1M(Y>1l)1A[1l]=1L[1l++];1A.Y=Y;J 1A}})},{"./$.1d":12}],41:[I(1a,1z,1x){1a("./$.5s")(2H)},{"./$.5s":27}],42:[I(1a,1z,1x){"3N 3Y";M $=1a("./$"),3U="1D",4f=$.4f,m7=7G.1y;3U in m7||$.FW&&$.7A&&4f(m7,3U,{cC:1k,1j:I(){M 1n=2w(N).1n(/^\\s*I ([^ (]*)/),1D=1n?1n[1]:"";$.2F(N,3U)||4f(N,3U,$.4z(5,1D));J 1D},1F:I(U){$.2F(N,3U)||4f(N,3U,$.4z(0,U))}})},{"./$":21}],43:[I(1a,1z,1x){"3N 3Y";M 8v=1a("./$.5h-8v");1a("./$.5h")("vu",{1j:I 1j(1b){M 1H=8v.c9(N,1b);J 1H&&1H.v},1F:I 1F(1b,U){J 8v.1d(N,1b===0?0:1b,U)}},8v,1k)},{"./$.5h":10,"./$.5h-8v":7}],44:[I(1a,1z,1x){M 9j=1/0,$1d=1a("./$.1d"),E=2T.E,a1=2T.a1,4O=2T.4O,7M=2T.7M,7V=2T.7V,ek=2T.ek,96=2T.96,6u=2T.6u,eF=a1(2,-52),hi=a1(2,-23),sR=a1(2,wO)*(2-hi),kA=a1(2,-By);I sY(n){J n+1/eF-1/eF}I ah(x){J(x=+x)==0||x!=x?x:x<0?-1:1}I kY(x){J!94(x=+x)||x==0?x:x<0?-kY(-x):7V(x+ek(x*x+1))}I cW(x){J(x=+x)==0?x:x>-1e-6&&x<1e-6?x+x*x/2:7M(x)-1}$1d($1d.S,"2T",{t4:I t4(x){J(x=+x)<1?ts:94(x)?7V(x/E+ek(x+1)*ek(x-1)/E)+1:x},kY:kY,t5:I t5(x){J(x=+x)==0?x:7V((1+x)/(1-x))/2},t8:I t8(x){J ah(x=+x)*a1(4O(x),1/3)},t7:I t7(x){J(x>>>=0)?31-6u(7V(x+.5)*2T.BO):32},t6:I t6(x){J(7M(x=+x)+7M(-x))/2},cW:cW,sZ:I sZ(x){M $4O=4O(x),$ah=ah(x),a,1A;if($4O<kA)J $ah*sY($4O/kA/hi)*kA*hi;a=(1+hi/eF)*$4O;1A=a-(a-$4O);if(1A>sR||1A!=1A)J $ah*9j;J $ah*1A},sQ:I sQ(zc,Aq){M oh=0,eT=1L.Y,mw=eT,1S=2H(eT),ej=-9j,2G;1M(eT--){2G=1S[eT]=+1L[eT];if(2G==9j||2G==-9j)J 9j;if(2G>ej)ej=2G}ej=2G||1;1M(mw--)oh+=a1(1S[mw]/ej,2);J ej*ek(oh)},sS:I sS(x,y){M gR=Au,xn=+x,yn=+y,xl=gR&xn,yl=gR&yn;J 0|xl*yl+((gR&xn>>>16)*yl+xl*(gR&yn>>>16)<<16>>>0)},sX:I sX(x){J(x=+x)>-1e-8&&x<1e-8?x-x*x/2:7V(1+x)},sW:I sW(x){J 7V(x)/2T.EC},sV:I sV(x){J 7V(x)/2T.HO},ah:ah,sU:I sU(x){J 4O(x=+x)<1?(cW(x)-cW(-x))/2:(7M(x-1)-7M(-x-1))*(E/2)},t9:I t9(x){M a=cW(x=+x),b=cW(-x);J a==9j?1:b==9j?-1:(a-b)/(7M(x)+7M(-x))},ta:I ta(it){J(it>0?6u:96)(it)}})},{"./$.1d":12}],45:[I(1a,1z,1x){"3N 3Y";M $=1a("./$"),3e=$.3e,2z=$.2z,nq="4Z",4Z=$.g[nq],5i=4Z,2q=4Z.1y;I lk(it){M fn,5g;if(2z(fn=it.9M)&&!3e(5g=fn.1s(it)))J 5g;if(2z(fn=it.3x)&&!3e(5g=fn.1s(it)))J 5g;2f 4P("tt\'t yS 1m to 4g")}I nA(it){if(3e(it))it=lk(it);if(2d it=="2B"&&it.Y>2&&it.7U(0)==48){M nx=1t;6T(it.7U(1)){2L 66:2L 98:nx=1k;2L 79:2L yU:J aI(it.2g(2),nx?2:8)}}J+it}if($.FW&&!(4Z("zm")&&4Z("zM"))){4Z=I 4Z(it){J N 8d 4Z?1p 5i(nA(it)):nA(it)};$.2S.1s($.7A?$.8E(5i):("zT,zR,ts,CA,CC,"+"eF,94,e5,bI,nG,ec,"+"tp,9L,aI,e5").4K(","),I(1b){if($.2F(5i,1b)&&!$.2F(4Z,1b)){$.4f(4Z,1b,$.4W(5i,1b))}});4Z.1y=2q;2q.4E=4Z;$.3C($.g,nq,4Z)}},{"./$":21}],46:[I(1a,1z,1x){M $=1a("./$"),$1d=1a("./$.1d"),4O=2T.4O,6u=2T.6u,nE=$.g.94,ec=tq;I e5(it){J!$.3e(it)&&nE(it)&&6u(it)===it}$1d($1d.S,"4Z",{eF:2T.a1(2,-52),94:I 94(it){J 2d it=="4g"&&nE(it)},e5:e5,bI:I bI(4g){J 4g!=4g},nG:I nG(4g){J e5(4g)&&4O(4g)<=ec},ec:ec,tp:-ec,9L:9L,aI:aI})},{"./$":21,"./$.1d":12}],47:[I(1a,1z,1x){M $1d=1a("./$.1d");$1d($1d.S,"1c",{bF:1a("./$.bF")})},{"./$.bF":5,"./$.1d":12}],48:[I(1a,1z,1x){M $1d=1a("./$.1d");$1d($1d.S,"1c",{is:I is(x,y){J x===y?x!==0||1/x===1/y:x!=x&&y!=y}})},{"./$.1d":12}],49:[I(1a,1z,1x){M $1d=1a("./$.1d");$1d($1d.S,"1c",{gu:1a("./$.1F-2q").1F})},{"./$.1d":12,"./$.1F-2q":26}],50:[I(1a,1z,1x){M $=1a("./$"),$1d=1a("./$.1d"),3e=$.3e,3B=$.3B;I 8P(ip,eM){M fn=($.4X.1c||{})[ip]||1c[ip],f=0,o={};o[ip]=eM==1?I(it){J 3e(it)?fn(it):it}:eM==2?I(it){J 3e(it)?fn(it):1k}:eM==3?I(it){J 3e(it)?fn(it):1t}:eM==4?I 9p(it,1b){J fn(3B(it),1b)}:eM==5?I dP(it){J fn(1c($.6C(it)))}:I(it){J fn(3B(it))};2r{fn("z")}2o(e){f=1}$1d($1d.S+$1d.F*f,"1c",o)}8P("lI",1);8P("tv",1);8P("kU",1);8P("6a",2);8P("ty",2);8P("gQ",3);8P("9p",4);8P("dP",5);8P("2a");8P("cs")},{"./$":21,"./$.1d":12}],51:[I(1a,1z,1x){"3N 3Y";M $=1a("./$"),2u=1a("./$.2u"),9K={};9K[1a("./$.5k")("lf")]="z";if($.FW&&2u(9K)!="z")$.3C(1c.1y,"3x",I 3x(){J"[1m "+2u.9O(N)+"]"})},{"./$":21,"./$.2u":6,"./$.5k":32}],52:[I(1a,1z,1x){"3N 3Y";M $=1a("./$"),2X=1a("./$.2X"),2u=1a("./$.2u"),$1d=1a("./$.1d"),2m=1a("./$.2m"),8R=1a("./$.1w-of"),bN=1a("./$.1F-2q").1F,5s=1a("./$.5s"),e1=1a("./$.5k")("5s"),gL=1a("./$.2p").4I("1W"),bS="eL",3d=$.g,8e=3d.8e,nL=8e&&8e.tw||1a("./$.bM").1F,P=3d[bS],2z=$.2z,3e=$.3e,b5=2m.fn,4q=2m.4R,2Z;M 8k=2z(P)&&2z(P.7L)&&P.7L(2Z=1p P(I(){}))==2Z;I cE(x){M 5f=1p P(x);bN(5f,cE.1y);J 5f}if(8k){2r{bN(cE,P);cE.1y=$.2t(P.1y,{4E:{U:cE}});if(!(cE.7L(5).5M(I(){})8d cE)){8k=1t}}2o(e){8k=1t}}I bB(C){M S=4q(C)[e1];J S!=1R?S:C}I lj(it){M 5M;if(3e(it))5M=it.5M;J 2z(5M)?5M:1t}I aM(1W){M 8L=1W.c;if(8L.Y)nL(I(){M U=1W.v,ok=1W.s==1,i=0;1M(8L.Y>i)!I(5p){M cb=ok?5p.ok:5p.lx,6q,5M;2r{if(cb){if(!ok)1W.h=1k;6q=cb===1k?U:cb(U);if(6q===5p.P){5p.7I(4P("eL-8L BR"))}1h if(5M=lj(6q)){5M.1s(6q,5p.4i,5p.7I)}1h 5p.4i(6q)}1h 5p.7I(U)}2o(9U){5p.7I(9U)}}(8L[i++]);8L.Y=0})}I le(7h){M 1W=7h[gL],8L=1W.a,i=0,5p;if(1W.h)J 1t;1M(8L.Y>i){5p=8L[i++];if(5p.lx||!le(5p.P))J 1t}J 1k}I $7Q(U){M 1W=N,7h;if(1W.d)J;1W.d=1k;1W=1W.r||1W;1W.v=U;1W.s=2;nL(I(){bX(I(){if(le(7h=1W.p)){if(2u(8e)=="8e"){8e.BW("BV",U,7h)}1h if(3d.bs&&2z(bs.6d)){bs.6d("BU 7h C6",U)}}},1)});aM(1W)}I $7L(U){M 1W=N,5M,5P;if(1W.d)J;1W.d=1k;1W=1W.r||1W;2r{if(5M=lj(U)){5P={r:1W,d:1t};5M.1s(U,2X($7L,5P,1),2X($7Q,5P,1))}1h{1W.v=U;1W.s=1;aM(1W)}}2o(9U){$7Q.1s(5P||{r:1W,d:1t},9U)}}if(!8k){P=I eL(lZ){b5(lZ);M 1W={p:2m.ai(N,P,bS),c:[],a:[],s:0,d:1t,v:1R,h:1t};$.3C(N,gL,1W);2r{lZ(2X($7L,1W,1),2X($7Q,1W,1))}2o(9U){$7Q.1s(1W,9U)}};$.gm(P.1y,{5M:I 5M(lG,gP){M S=4q(4q(N).4E)[e1];M 5p={ok:2z(lG)?lG:1k,lx:2z(gP)?gP:1t};M 7h=5p.P=1p(S!=1R?S:P)(I(4i,7I){5p.4i=b5(4i);5p.7I=b5(7I)});M 1W=N[gL];1W.a.1I(5p);1W.c.1I(5p);1W.s&&aM(1W);J 7h},"2o":I(gP){J N.5M(1R,gP)}})}$1d($1d.G+$1d.W+$1d.F*!8k,{eL:P});2u.1F(P,bS);5s(P);5s($.4X[bS]);$1d($1d.S+$1d.F*!8k,bS,{7Q:I 7Q(r){J 1p(bB(N))(I(4i,7I){7I(r)})},7L:I 7L(x){J 3e(x)&&gL in x&&$.9G(x)===N.1y?x:1p(bB(N))(I(4i){4i(x)})}});$1d($1d.S+$1d.F*!(8k&&1a("./$.1Q-8G")(I(1Q){P.9h(1Q)["2o"](I(){})})),bS,{9h:I 9h(3t){M C=bB(N),2I=[];J 1p C(I(4i,7I){8R(3t,1t,2I.1I,2I);M hV=2I.Y,1K=2H(hV);if(hV)$.2S.1s(2I,I(7h,1l){C.7L(7h).5M(I(U){1K[1l]=U;--hV||4i(1K)},7I)});1h 4i(1K)})},te:I te(3t){M C=bB(N);J 1p C(I(4i,7I){8R(3t,1t,I(7h){C.7L(7h).5M(4i,7I)})})}})},{"./$":21,"./$.2m":4,"./$.2u":6,"./$.2X":11,"./$.1d":12,"./$.1w-of":14,"./$.1Q-8G":19,"./$.1F-2q":26,"./$.5s":27,"./$.bM":29,"./$.2p":30,"./$.5k":32}],53:[I(1a,1z,1x){M $=1a("./$"),$1d=1a("./$.1d"),bN=1a("./$.1F-2q"),$1Q=1a("./$.1Q"),8c=1a("./$.2p").4I("1Q"),3O=$1Q.3O,2m=1a("./$.2m"),3e=$.3e,4W=$.4W,4f=$.4f,9G=$.9G,2W=7G.2W,4q=2m.4R,ti=1c.gQ||$.it;I ln(bf){$.1F(N,8c,{o:bf,k:1R,i:0})}$1Q.2t(ln,"1c",I(){M 1Q=N[8c],2a=1Q.k,1b;if(2a==1R){1Q.k=2a=[];1w(1b in 1Q.o)2a.1I(1b)}do{if(1Q.i>=2a.Y)J 3O(1)}1M(!((1b=2a[1Q.i++])in 1Q.o));J 3O(0,1b)});I 4T(fn){J I(it){4q(it);2r{fn.2W(1R,1L);J 1k}2o(e){J 1t}}}I 1j(2x,6P){M 6D=1L.Y<3?2x:1L[2],4z=4W(4q(2x),6P),2q;if(4z)J $.2F(4z,"U")?4z.U:4z.1j===1R?1R:4z.1j.1s(6D);J 3e(2q=9G(2x))?1j(2q,6P,6D):1R}I 1F(2x,6P,V){M 6D=1L.Y<4?2x:1L[3],c3=4W(4q(2x),6P),hX,2q;if(!c3){if(3e(2q=9G(2x))){J 1F(2q,6P,V,6D)}c3=$.4z(0)}if($.2F(c3,"U")){if(c3.tb===1t||!3e(6D))J 1t;hX=4W(6D,6P)||$.4z(0);hX.U=V;4f(6D,6P,hX);J 1k}J c3.1F===1R?1t:(c3.1F.1s(6D,V),1k)}M gY={2W:1a("./$.2X")(7G.1s,2W,3),tg:I tg(2x,th){M 2q=2m.fn(1L.Y<3?2x:1L[2]).1y,dF=$.2t(3e(2q)?2q:1c.1y),1A=2W.1s(2x,dF,th);J 3e(1A)?1A:dF},7d:4T(4f),tl:I tl(2x,6P){M 4z=4W(4q(2x),6P);J 4z&&!4z.cC?1t:3q 2x[6P]},tk:I tk(2x){J 1p ln(4q(2x))},1j:1j,9p:I 9p(2x,6P){J 4W(4q(2x),6P)},dP:I dP(2x){J 9G(4q(2x))},2F:I 2F(2x,6P){J 6P in 2x},gQ:I gQ(2x){J!!ti(4q(2x))},l1:1a("./$.7Y-2a"),kU:4T(1c.kU||$.it),1F:1F};if(bN)gY.gu=I gu(2x,2q){bN.5r(2x,2q);2r{bN.1F(2x,2q);J 1k}2o(e){J 1t}};$1d($1d.G,{vo:{}});$1d($1d.S,"vo",gY)},{"./$":21,"./$.2m":4,"./$.2X":11,"./$.1d":12,"./$.1Q":20,"./$.7Y-2a":23,"./$.1F-2q":26,"./$.2p":30}],54:[I(1a,1z,1x){M $=1a("./$"),2u=1a("./$.2u"),2J=$.g.2J,5i=2J,2q=2J.1y;I vn(){2r{M a=/a/g;if(a===1p 2J(a)){J 1k}J 2J(/a/g,"i")!="/a/i"}2o(e){J 1k}}if($.FW&&$.7A){if(vn()){2J=I 2J(3g,dk){J 1p 5i(2u(3g)=="2J"?3g.3E:3g,dk===1R?3g.dk:dk)};$.2S.1s($.8E(5i),I(1b){1b in 2J||$.4f(2J,1b,{cC:1k,1j:I(){J 5i[1b]},1F:I(it){5i[1b]=it}})});2q.4E=2J;2J.1y=2q;$.3C($.g,"2J",2J)}if(/./g.dk!="g")$.4f(2q,"dk",{cC:1k,1j:1a("./$.b3")(/^.*\\/(\\w*)$/,"$1")})}1a("./$.5s")(2J)},{"./$":21,"./$.2u":6,"./$.b3":25,"./$.5s":27}],55:[I(1a,1z,1x){"3N 3Y";M 8v=1a("./$.5h-8v");1a("./$.5h")("vN",{cm:I cm(U){J 8v.1d(N,U=U===0?0:U,U)}},8v)},{"./$.5h":10,"./$.5h-8v":7}],56:[I(1a,1z,1x){M $1d=1a("./$.1d");$1d($1d.P,"2w",{BG:1a("./$.2B-at")(1t)})},{"./$.1d":12,"./$.2B-at":28}],57:[I(1a,1z,1x){"3N 3Y";M $=1a("./$"),2u=1a("./$.2u"),$1d=1a("./$.1d"),5U=$.5U;$1d($1d.P,"2w",{aN:I aN(7F){if(2u(7F)=="2J")2f 4P();M 1U=2w($.6C(N)),lS=1L[1],3r=5U(1U.Y),4u=lS===1R?3r:2T.7x(5U(lS),3r);7F+="";J 1U.2g(4u-7F.Y,4u)===7F}})},{"./$":21,"./$.2u":6,"./$.1d":12}],58:[I(1a,1z,1x){M $1d=1a("./$.1d"),7j=1a("./$").7j,7p=2w.7p;$1d($1d.S,"2w",{vl:I vl(x){M 4i=[],3r=1L.Y,i=0,4s;1M(3r>i){4s=+1L[i++];if(7j(4s,BL)!==4s)2f i6(4s+" is 8u a BF 4s 9W");4i.1I(4s<m1?7p(4s):7p(((4s-=m1)>>10)+lQ,4s%Bx+lK))}J 4i.3K("")}})},{"./$":21,"./$.1d":12}],59:[I(1a,1z,1x){"3N 3Y";M $=1a("./$"),2u=1a("./$.2u"),$1d=1a("./$.1d");$1d($1d.P,"2w",{7t:I 7t(7F){if(2u(7F)=="2J")2f 4P();J!!~2w($.6C(N)).2v(7F,1L[1])}})},{"./$":21,"./$.2u":6,"./$.1d":12}],60:[I(1a,1z,1x){M 1F=1a("./$").1F,at=1a("./$.2B-at")(1k),8c=1a("./$.2p").4I("1Q"),$1Q=1a("./$.1Q"),3O=$1Q.3O;1a("./$.1Q-6j")(2w,"2w",I(bf){1F(N,8c,{o:2w(bf),i:0})},I(){M 1Q=N[8c],O=1Q.o,1l=1Q.i,9W;if(1l>=O.Y)J 3O(1);9W=at.1s(O,1l);1Q.i+=9W.Y;J 3O(0,9W)})},{"./$":21,"./$.1Q":20,"./$.1Q-6j":18,"./$.2B-at":28,"./$.2p":30}],61:[I(1a,1z,1x){M $=1a("./$"),$1d=1a("./$.1d");$1d($1d.S,"2w",{gV:I gV(vp){M ld=$.3B(vp.gV),3r=$.5U(ld.Y),vq=1L.Y,4i=[],i=0;1M(3r>i){4i.1I(2w(ld[i++]));if(i<vq)4i.1I(2w(1L[i]))}J 4i.3K("")}})},{"./$":21,"./$.1d":12}],62:[I(1a,1z,1x){"3N 3Y";M $=1a("./$"),$1d=1a("./$.1d");$1d($1d.P,"2w",{dc:I dc(6M){M 3y=2w($.6C(N)),4i="",n=$.b6(6M);if(n<0||n==9j)2f i6("De vs\'t be Dg");1w(;n>0;(n>>>=1)&&(3y+=3y))if(n&1)4i+=3y;J 4i}})},{"./$":21,"./$.1d":12}],63:[I(1a,1z,1x){"3N 3Y";M $=1a("./$"),2u=1a("./$.2u"),$1d=1a("./$.1d");$1d($1d.P,"2w",{aT:I aT(7F){if(2u(7F)=="2J")2f 4P();M 1U=2w($.6C(N)),1l=$.5U(2T.7x(1L[1],1U.Y));7F+="";J 1U.2g(1l,1l+7F.Y)===7F}})},{"./$":21,"./$.2u":6,"./$.1d":12}],64:[I(1a,1z,1x){"3N 3Y";M $=1a("./$"),kc=1a("./$.2u").1F,2p=1a("./$.2p"),$1d=1a("./$.1d"),vb=1a("./$.vg"),k4=1a("./$.kh-2a"),4q=1a("./$.2m").4R,2F=$.2F,$2t=$.2t,4W=$.4W,4f=$.4f,4z=$.4z,8E=$.8E,3B=$.3B,3P=$.g.3P,hm=1t,7k=2p("4y"),7K=2p("bb"),gX={},cS={},8k=$.2z(3P);I 4T(4y){M hf=cS[4y]=$.1F($2t(3P.1y),7k,4y);$.7A&&hm&&4f(1c.1y,4y,{cC:1k,1F:I(U){if(2F(N,7K)&&2F(N[7K],4y))N[7K][4y]=1t;4f(N,4y,4z(1,U))}});J hf}I 7d(it,1b,D){if(D&&2F(cS,1b)){if(!D.h8){if(!2F(it,7K))4f(it,7K,4z(1,{}));it[7K][1b]=1k}1h{if(2F(it,7K)&&it[7K][1b])it[7K][1b]=1t;D.h8=1t}}J 4f(it,1b,D)}I 8s(it,P){4q(it);M 2a=k4(P=3B(P)),i=0,l=2a.Y,1b;1M(l>i)7d(it,1b=2a[i++],P[1b]);J it}I 2t(it,P){J P===1R?$2t(it):8s($2t(it),P)}I 9p(it,1b){M D=4W(it=3B(it),1b);if(D&&2F(cS,1b)&&!(2F(it,7K)&&it[7K][1b]))D.h8=1k;J D}I cs(it){M 4Q=8E(3B(it)),1A=[],i=0,1b;1M(4Q.Y>i)if(!2F(cS,1b=4Q[i++])&&1b!=7K)1A.1I(1b);J 1A}I hl(it){M 4Q=8E(3B(it)),1A=[],i=0,1b;1M(4Q.Y>i)if(2F(cS,1b=4Q[i++]))1A.1I(cS[1b]);J 1A}if(!8k){3P=I 3P(vj){if(N 8d 3P)2f 4P("3P is 8u a 4E");J 4T(2p(vj))};$.3C(3P.1y,"3x",I(){J N[7k]});$.2t=2t;$.4f=7d;$.4W=9p;$.k3=8s;$.8E=cs;$.9n=hl}M lm={"1w":I(1b){J 2F(gX,1b+="")?gX[1b]:gX[1b]=3P(1b)},vc:I vc(1b){J vb(gX,1b)},Dz:I(){hm=1k},DB:I(){hm=1t}};$.2S.1s(("DA,Du,1E,1n,2i,Dt,"+"5s,4K,lk,lf,va").4K(","),I(it){M hf=1a("./$.5k")(it);lm[it]=8k?hf:4T(hf)});hm=1k;$1d($1d.G+$1d.W,{3P:3P});$1d($1d.S,"3P",lm);$1d($1d.S+$1d.F*!8k,"1c",{2t:2t,7d:7d,8s:8s,9p:9p,cs:cs,hl:hl});kc(3P,"3P");kc(2T,"2T",1k);kc($.g.7i,"7i",1k)},{"./$":21,"./$.2m":4,"./$.2u":6,"./$.1d":12,"./$.kh-2a":13,"./$.vg":22,"./$.2p":30,"./$.5k":32}],65:[I(1a,1z,1x){"3N 3Y";M $=1a("./$"),5R=1a("./$.5h-5R"),9b=5R.9b,ID=5R.ID,6L=5R.6L,2F=$.2F,3e=$.3e,6a=1c.6a||$.4X.1c.6a,9K={};M gl=1a("./$.5h")("gl",{1j:I 1j(1b){if(3e(1b)){if(6a(1b))J 9b(N).1j(1b);if(2F(1b,6L))J 1b[6L][N[ID]]}},1F:I 1F(1b,U){J 5R.1d(N,1b,U)}},5R,1k,1k);if($.FW&&(1p gl).1F((1c.lI||1c)(9K),7).1j(9K)!=7){$.2S.1s(["3q","2F","1j","1F"],I(1b){M 2b=gl.1y[1b];gl.1y[1b]=I(a,b){if(3e(a)&&6a(a)){M 1A=9b(N)[1b](a,b);J 1b=="1F"?N:1A}J 2b.1s(N,a,b)}})}},{"./$":21,"./$.5h":10,"./$.5h-5R":9}],66:[I(1a,1z,1x){"3N 3Y";M 5R=1a("./$.5h-5R");1a("./$.5h")("Cy",{cm:I cm(U){J 5R.1d(N,U,1k)}},5R,1t,1k)},{"./$.5h":10,"./$.5h-5R":9}],67:[I(1a,1z,1x){M $1d=1a("./$.1d");$1d($1d.P,"2H",{7t:1a("./$.1Y-7t")(1k)});1a("./$.8a")("7t")},{"./$.1Y-7t":2,"./$.1d":12,"./$.8a":31}],68:[I(1a,1z,1x){1a("./$.5h-to-3l")("vu")},{"./$.5h-to-3l":8}],69:[I(1a,1z,1x){M $=1a("./$"),$1d=1a("./$.1d"),l1=1a("./$.7Y-2a");$1d($1d.S,"1c",{vv:I vv(1m){M O=$.3B(1m),1A={};$.2S.1s(l1(O),I(1b){$.4f(1A,1b,$.4z(0,$.4W(O,1b)))});J 1A}})},{"./$":21,"./$.1d":12,"./$.7Y-2a":23}],70:[I(1a,1z,1x){M $=1a("./$"),$1d=1a("./$.1d");I lX(vI){J I(1m){M O=$.3B(1m),2a=$.cI(O),Y=2a.Y,i=0,1A=2H(Y),1b;if(vI)1M(Y>i)1A[i]=[1b=2a[i++],O[1b]];1h 1M(Y>i)1A[i]=O[2a[i++]];J 1A}}$1d($1d.S,"1c",{2I:lX(1t),3k:lX(1k)})},{"./$":21,"./$.1d":12}],71:[I(1a,1z,1x){M $1d=1a("./$.1d");$1d($1d.S,"2J",{c4:1a("./$.b3")(/([\\\\\\-[\\]{}()*+?.,^$|])/g,"\\\\$1",1k)})},{"./$.1d":12,"./$.b3":25}],72:[I(1a,1z,1x){1a("./$.5h-to-3l")("vN")},{"./$.5h-to-3l":8}],73:[I(1a,1z,1x){M $1d=1a("./$.1d");$1d($1d.P,"2w",{at:1a("./$.2B-at")(1k)})},{"./$.1d":12,"./$.2B-at":28}],74:[I(1a,1z,1x){M $=1a("./$"),$1d=1a("./$.1d"),$2H=$.4X.2H||2H,9y={};I kE(2a,Y){$.2S.1s(2a.4K(","),I(1b){if(Y==1R&&1b in $2H)9y[1b]=$2H[1b];1h if(1b in[])9y[1b]=1a("./$.2X")(7G.1s,[][1b],Y)})}kE("9D,aL,aW,2a,2I,3k",1);kE("2v,91,90,8Y,3F,2U,3S,gI,7t",3);kE("3K,2g,5o,1I,ey,bY,kf,bG,"+"vP,vO,kH,dH,DC");$1d($1d.S,"2H",9y)},{"./$":21,"./$.2X":11,"./$.1d":12}],75:[I(1a,1z,1x){1a("./2j.1Y.1E");M $=1a("./$"),6f=1a("./$.1Q").6f,lH=1a("./$.5k")("1E"),m2=6f.2H,dl=$.g.dl;if($.FW&&dl&&!(lH in dl.1y)){$.3C(dl.1y,lH,m2)}6f.dl=m2},{"./$":21,"./$.1Q":20,"./$.5k":32,"./2j.1Y.1E":39}],76:[I(1a,1z,1x){M $1d=1a("./$.1d"),$bM=1a("./$.bM");$1d($1d.G+$1d.B,{vG:$bM.1F,vz:$bM.9Q})},{"./$.1d":12,"./$.bM":29}],77:[I(1a,1z,1x){M $=1a("./$"),$1d=1a("./$.1d"),4G=1a("./$.4G"),7S=1a("./$.7S"),ev=$.g.ev,9P=!!ev&&/9P .\\./.2Z(ev.mE);I 4T(1F){J 9P?I(fn,lU){J 1F(4G(7S,[].2g.1s(1L,2),$.2z(fn)?fn:7G(fn)),lU)}:1F}$1d($1d.G+$1d.B+$1d.F*9P,{bX:4T($.g.bX),nC:4T($.g.nC)})},{"./$":21,"./$.1d":12,"./$.4G":16,"./$.7S":24}],78:[I(1a,1z,1x){1a("./1P/vy");1a("./1P/2j.v8");1a("./1P/2j.1m.bF");1a("./1P/2j.1m.is");1a("./1P/2j.1m.1F-1y-of");1a("./1P/2j.1m.to-2B");1a("./1P/2j.1m.9y-vB-vF");1a("./1P/2j.I.1D");1a("./1P/2j.4g.4E");1a("./1P/2j.4g.9y");1a("./1P/2j.vw");1a("./1P/2j.2B.4S-4s-9W");1a("./1P/2j.2B.gV");1a("./1P/2j.2B.1E");1a("./1P/2j.2B.4s-9W-at");1a("./1P/2j.2B.vE-h6");1a("./1P/2j.2B.7t");1a("./1P/2j.2B.dc");1a("./1P/2j.2B.vC-h6");1a("./1P/2j.1Y.4S");1a("./1P/2j.1Y.of");1a("./1P/2j.1Y.1E");1a("./1P/2j.1Y.5s");1a("./1P/2j.1Y.qa-pZ");1a("./1P/2j.1Y.dH");1a("./1P/2j.1Y.3S");1a("./1P/2j.1Y.3S-1l");1a("./1P/2j.co");1a("./1P/2j.7h");1a("./1P/2j.3F");1a("./1P/2j.1F");1a("./1P/2j.5R-3F");1a("./1P/2j.5R-1F");1a("./1P/2j.gY");1a("./1P/7a.1Y.7t");1a("./1P/7a.2B.at");1a("./1P/7a.co.c4");1a("./1P/7a.1m.1j-7Y-2n-v7");1a("./1P/7a.1m.to-1Y");1a("./1P/7a.3F.to-3l");1a("./1P/7a.1F.to-3l");1a("./1P/js.1Y.9y");1a("./1P/bH.uB");1a("./1P/bH.uC");1a("./1P/bH.hL.3t");1z.1x=1a("./1P/$").4X},{"./1P/$":21,"./1P/vy":33,"./1P/2j.1Y.qa-pZ":34,"./1P/2j.1Y.dH":35,"./1P/2j.1Y.3S":37,"./1P/2j.1Y.3S-1l":36,"./1P/2j.1Y.4S":38,"./1P/2j.1Y.1E":39,"./1P/2j.1Y.of":40,"./1P/2j.1Y.5s":41,"./1P/2j.I.1D":42,"./1P/2j.3F":43,"./1P/2j.vw":44,"./1P/2j.4g.4E":45,"./1P/2j.4g.9y":46,"./1P/2j.1m.bF":47,"./1P/2j.1m.is":48,"./1P/2j.1m.1F-1y-of":49,"./1P/2j.1m.9y-vB-vF":50,"./1P/2j.1m.to-2B":51,"./1P/2j.7h":52,"./1P/2j.gY":53,"./1P/2j.co":54,"./1P/2j.1F":55,"./1P/2j.2B.4s-9W-at":56,"./1P/2j.2B.vE-h6":57,"./1P/2j.2B.4S-4s-9W":58,"./1P/2j.2B.7t":59,"./1P/2j.2B.1E":60,"./1P/2j.2B.gV":61,"./1P/2j.2B.dc":62,"./1P/2j.2B.vC-h6":63,"./1P/2j.v8":64,"./1P/2j.5R-3F":65,"./1P/2j.5R-1F":66,"./1P/7a.1Y.7t":67,"./1P/7a.3F.to-3l":68,"./1P/7a.1m.1j-7Y-2n-v7":69,"./1P/7a.1m.to-1Y":70,"./1P/7a.co.c4":71,"./1P/7a.1F.to-3l":72,"./1P/7a.2B.at":73,"./1P/js.1Y.9y":74,"./1P/bH.hL.3t":75,"./1P/bH.uC":76,"./1P/bH.uB":77}],79:[I(1a,1z,1x){(I(3d){!I(3d){"3N 3Y";M bt=1c.1y.9f;M 1R;M lT=2d 3P==="I"&&3P.1E||"@@1E";M ll=2d 1z==="1m";M 8p=3d.uG;if(8p){if(ll){1z.1x=8p}J}8p=3d.uG=ll?1z.1x:{};I 4T(eP,hy,5f,e6){M b2=1c.2t((hy||gN).1y);b2.uy=us(eP,5f||1r,1p iJ(e6||[]));J b2}8p.4T=4T;I gC(fn,4R,2G){2r{J{1J:"iA",2G:fn.1s(4R,2G)}}2o(9U){J{1J:"2f",2G:9U}}}M lr="AM";M iS="AL";M ls="AO";M gB="AP";M h0={};I gN(){}I c2(){}I gg(){}M Gp=gg.1y=gN.1y;c2.1y=Gp.4E=gg;gg.4E=c2;c2.uJ="c2";8p.AR=I(bW){M gn=2d bW==="I"&&bW.4E;J gn?gn===c2||(gn.uJ||gn.1D)==="c2":1t};8p.AD=I(bW){bW.7T=gg;bW.1y=1c.2t(Gp);J bW};8p.kV=I(eP,hy,5f,e6){J 1p eL(I(7L,7Q){M b2=4T(eP,hy,5f,e6);M ly=3O.3o(b2,"2C");M uz=3O.3o(b2,"2f");I 3O(2b,2G){M 1W=gC(b2[2b],b2,2G);if(1W.1J==="2f"){7Q(1W.2G);J}M 92=1W.2G;if(92.5m){7L(92.U)}1h{eL.7L(92.U).5M(ly,uz)}}ly()})};I us(eP,5f,1i){M 6K=lr;J I 4G(2b,2G){if(6K===ls){2f 1p 5q("gN is B4 B7")}if(6K===gB){J lE()}1M(1k){M 6l=1i.6l;if(6l){if(2b==="J"||2b==="2f"&&6l.1E[2b]===1R){1i.6l=1r;M lp=6l.1E["J"];if(lp){M 1W=gC(lp,6l.1E,2G);if(1W.1J==="2f"){2b="2f";2G=1W.2G;6i}}if(2b==="J"){6i}}M 1W=gC(6l.1E[2b],6l.1E,2G);if(1W.1J==="2f"){1i.6l=1r;2b="2f";2G=1W.2G;6i}2b="2C";2G=1R;M 92=1W.2G;if(92.5m){1i[6l.iH]=92.U;1i.2C=6l.iF}1h{6K=iS;J 92}1i.6l=1r}if(2b==="2C"){if(6K===iS){1i.lR=2G}1h{3q 1i.lR}}1h if(2b==="2f"){if(6K===lr){6K=gB;2f 2G}if(1i.a8(2G)){2b="2C";2G=1R}}1h if(2b==="J"){1i.uY("J",2G)}6K=ls;M 1W=gC(eP,5f,1i);if(1W.1J==="iA"){6K=1i.5m?gB:iS;M 92={U:1W.2G,5m:1i.5m};if(1W.2G===h0){if(1i.6l&&2b==="2C"){2G=1R}}1h{J 92}}1h if(1W.1J==="2f"){6K=gB;2b="2f";2G=1W.2G}}}}I iK(2b){Gp[2b]=I(2G){J N.uy(2b,2G)}}iK("2C");iK("2f");iK("J");Gp[lT]=I(){J N};Gp.3x=I(){J"[1m gN]"};I sN(bL){M 1H={9J:bL[0]};if(1 in bL){1H.em=bL[1]}if(2 in bL){1H.7v=bL[2];1H.hd=bL[3]}N.7P.1I(1H)}I nM(1H){M 1W=1H.cv||{};1W.1J="iA";3q 1W.2G;1H.cv=1W}I iJ(e6){N.7P=[{9J:"cT"}];e6.8Y(sN,N);N.d4()}8p.2a=I(1m){M 2a=[];1w(M 1b in 1m){2a.1I(1b)}2a.aL();J I 2C(){1M(2a.Y){M 1b=2a.9D();if(1b in 1m){2C.U=1b;2C.5m=1t;J 2C}}2C.5m=1k;J 2C}};I 2I(3t){if(3t){M lL=3t[lT];if(lL){J lL.1s(3t)}if(2d 3t.2C==="I"){J 3t}if(!bI(3t.Y)){M i=-1,2C=I 2C(){1M(++i<3t.Y){if(bt.1s(3t,i)){2C.U=3t[i];2C.5m=1t;J 2C}}2C.U=1R;2C.5m=1k;J 2C};J 2C.2C=2C}}J{2C:lE}}8p.2I=2I;I lE(){J{U:1R,5m:1k}}iJ.1y={4E:iJ,d4:I(){N.6b=0;N.2C=0;N.lR=1R;N.5m=1t;N.6l=1r;N.7P.8Y(nM);1w(M i3=0,lV;bt.1s(N,lV="t"+i3)||i3<20;++i3){N[lV]=1r}},aA:I(){N.5m=1k;M uL=N.7P[0];M m3=uL.cv;if(m3.1J==="2f"){2f m3.2G}J N.v6},a8:I(ed){if(N.5m){2f ed}M 1i=N;I eh(v0,oT){1W.1J="2f";1W.2G=ed;1i.2C=v0;J!!oT}1w(M i=N.7P.Y-1;i>=0;--i){M 1H=N.7P[i];M 1W=1H.cv;if(1H.9J==="cT"){J eh("4u")}if(1H.9J<=N.6b){M lv=bt.1s(1H,"em");M li=bt.1s(1H,"7v");if(lv&&li){if(N.6b<1H.em){J eh(1H.em,1k)}1h if(N.6b<1H.7v){J eh(1H.7v)}}1h if(lv){if(N.6b<1H.em){J eh(1H.em,1k)}}1h if(li){if(N.6b<1H.7v){J eh(1H.7v)}}1h{2f 1p 5q("2r A5 8J 2o or nX")}}}},uY:I(1J,2G){1w(M i=N.7P.Y-1;i>=0;--i){M 1H=N.7P[i];if(1H.9J<=N.6b&&bt.1s(1H,"7v")&&N.6b<1H.7v){M 9X=1H;3A}}if(9X&&(1J==="3A"||1J==="6i")&&9X.9J<=2G&&2G<=9X.7v){9X=1r}M 1W=9X?9X.cv:{};1W.1J=1J;1W.2G=2G;if(9X){N.2C=9X.7v}1h{N.fY(1W)}J h0},fY:I(1W,hd){if(1W.1J==="2f"){2f 1W.2G}if(1W.1J==="3A"||1W.1J==="6i"){N.2C=1W.2G}1h if(1W.1J==="J"){N.v6=1W.2G;N.2C="4u"}1h if(1W.1J==="iA"&&hd){N.2C=hd}J h0},As:I(7v){1w(M i=N.7P.Y-1;i>=0;--i){M 1H=N.7P[i];if(1H.7v===7v){J N.fY(1H.cv,1H.hd)}}},"2o":I(9J){1w(M i=N.7P.Y-1;i>=0;--i){M 1H=N.7P[i];if(1H.9J===9J){M 1W=1H.cv;if(1W.1J==="2f"){M uO=1W.2G;nM(1H)}J uO}}2f 1p 5q("Al 2o Am")},Ap:I(3t,iH,iF){N.6l={1E:2I(3t),iH:iH,iF:iF};J h0}}}(2d 3d==="1m"?3d:2d 1u==="1m"?1u:2d 5f==="1m"?5f:N)}).1s(N,2d 3d!=="1R"?3d:2d 5f!=="1R"?5f:2d 1u!=="1R"?1u:{})},{}]},{},[1]);M 1T={jV:\'1.7.3\',6W:(I(){M ua=ev.mE;M nK=1c.1y.3x.1s(1u.wp)==\'[1m eb]\';J{hv:!!1u.7n&&!nK,pg:ua.2v(\'9P 10\')>-1,GV:ua.2v(\'9P 10\')>-1||ua.2v(\'9P 11\')>-1||ua.2v(\'9P 12\')>-1||ua.2v(\'9P 13\')>-1||ua.2v(\'.GZ.0\')>-1,eb:nK,xz:ua.2v(\'H0/\')>-1,hs:ua.2v(\'hs\')>-1&&ua.2v(\'GU\')===-1,uR:/GT.*GN/.2Z(ua)}})(),fs:{wq:!!1o.hR,GL:!!1o.GO,fa:(I(){M 4E=1u.1f||1u.fc;J!!(4E&&4E.1y)})(),k7:(I(){if(2d 1u.GP!==\'1R\')J 1k;M 1v=1o.4x(\'1v\'),2P=1o.4x(\'2P\'),nJ=1t;if(1v[\'7T\']&&(1v[\'7T\']!==2P[\'7T\'])){nJ=1k}1v=2P=1r;J nJ})()},i1:\'<6B[^>]*>([\\\\S\\\\s]*?)<\\/6B\\\\s*>\',r9:/^\\/\\*-GR-([\\s\\S]*)\\*\\/\\s*$/,8D:I(){},K:I(x){J x}};if(1T.6W.uR)1T.fs.k7=1t;M 3G=(I(){M i4=(I(){1w(M p in{3x:1}){if(p===\'3x\')J 1t}J 1k})();I a0(){};I 2t(){M 2c=1r,2R=$A(1L);if(1c.2z(2R[0]))2c=2R.aW();I 4t(){N.3W.2W(N,1L)}1c.1O(4t,3G.2N);4t.fU=2c;4t.de=[];if(2c){a0.1y=2c.1y;4t.1y=1p a0;2c.de.1I(4t)}1w(M i=0,Y=2R.Y;i<Y;i++)4t.5Q(2R[i]);if(!4t.1y.3W)4t.1y.3W=1T.8D;4t.1y.4E=4t;J 4t}I 5Q(3E){M 5b=N.fU&&N.fU.1y,2R=1c.2a(3E);if(i4){if(3E.3x!=1c.1y.3x)2R.1I("3x");if(3E.9M!=1c.1y.9M)2R.1I("9M")}1w(M i=0,Y=2R.Y;i<Y;i++){M 2n=2R[i],U=3E[2n];if(5b&&1c.2z(U)&&U.jf()[0]=="$7E"){M 2b=U;U=(I(m){J I(){J 5b[m].2W(N,1L)}})(2n).4T(2b);U.9M=(I(2b){J I(){J 2b.9M.1s(2b)}})(2b);U.3x=(I(2b){J I(){J 2b.3x.1s(2b)}})(2b)}N.1y[2n]=U}J N}J{2t:2t,2N:{5Q:5Q}}})();(I(){M cK=1c.1y.3x,nT=1c.1y.9f,qL=\'uV\',qI=\'uU\',qB=\'uT\',qE=\'4Z\',qJ=\'2w\',i2=\'1c\',rg=\'[1m 7G]\',qK=\'[1m uT]\',nS=\'[1m 4Z]\',nR=\'[1m 2w]\',nQ=\'[1m 2H]\',rk=\'[1m b1]\',rh=1u.7i&&2d 7i.ez===\'I\'&&7i.ez(0)===\'0\'&&2d 7i.ez(1T.K)===\'1R\';M r7=[\'3x\',\'uS\',\'9M\',\'9f\',\'vR\',\'nI\',\'4E\'];M i4=(I(){1w(M p in{3x:1}){if(p===\'3x\')J 1t}J 1k})();I gk(o){6T(o){2L 1r:J qL;2L(wa 0):J qI}M 1J=2d o;6T(1J){2L\'rI\':J qB;2L\'4g\':J qE;2L\'2B\':J qJ}J i2}I 1O(d6,3E){1w(M 2n in 3E)d6[2n]=3E[2n];J d6}I 3Q(1m){2r{if(3n(1m))J\'1R\';if(1m===1r)J\'1r\';J 1m.3Q?1m.3Q():2w(1m)}2o(e){if(e 8d i6)J\'...\';2f e}}I 7X(U){J i5(\'\',{\'\':U},[])}I i5(1b,eN,cM){M U=eN[1b];if(gk(U)===i2&&2d U.7X===\'I\'){U=U.7X(1b)}M nV=cK.1s(U);6T(nV){2L nS:2L qK:2L nR:U=U.9M()}6T(U){2L 1r:J\'1r\';2L 1k:J\'1k\';2L 1t:J\'1t\'}M 1J=2d U;6T(1J){2L\'2B\':J U.3Q(1k);2L\'4g\':J 94(U)?2w(U):\'1r\';2L\'1m\':1w(M i=0,Y=cM.Y;i<Y;i++){if(cM[i]===U){2f 1p 4P("Hg Hf to \'"+U+"\' in 1m")}}cM.1I(U);M 7S=[];if(nV===nQ){1w(M i=0,Y=U.Y;i<Y;i++){M 3y=i5(i,U,cM);7S.1I(2d 3y===\'1R\'?\'1r\':3y)}7S=\'[\'+7S.3K(\',\')+\']\'}1h{M 2a=1c.2a(U);1w(M i=0,Y=2a.Y;i<Y;i++){M 1b=2a[i],3y=i5(1b,U,cM);if(2d 3y!=="1R"){7S.1I(1b.3Q(1k)+\':\'+3y)}}7S=\'{\'+7S.3K(\',\')+\'}\'}cM.9D();J 7S}}I ez(1m){J 7i.ez(1m)}I 8Q(1m){J $H(1m).8Q()}I 9u(1m){J 1m&&1m.9u?1m.9u():2w.d1(1m)}I 2a(1m){if(gk(1m)!==i2){2f 1p 4P()}M 1K=[];1w(M 2n in 1m){if(nT.1s(1m,2n))1K.1I(2n)}if(i4){1w(M i=0;2n=r7[i];i++){if(nT.1s(1m,2n))1K.1I(2n)}}J 1K}I 2I(1m){M 1K=[];1w(M 2n in 1m)1K.1I(1m[2n]);J 1K}I 3Z(1m){J 1O({},1m)}I 8S(1m){J!!(1m&&1m.2Q==1)}I 5J(1m){J cK.1s(1m)===nQ}M rf=(2d 2H.5J==\'I\')&&2H.5J([])&&!2H.5J({});if(rf){5J=2H.5J}I hg(1m){J 1m 8d 6F}I 2z(1m){J cK.1s(1m)===rg}I 4N(1m){J cK.1s(1m)===nR}I a9(1m){J cK.1s(1m)===nS}I ns(1m){J cK.1s(1m)===rk}I 3n(1m){J 2d 1m==="1R"}1O(1c,{1O:1O,3Q:3Q,7X:rh?ez:7X,8Q:8Q,9u:9u,2a:1c.2a||2a,2I:2I,3Z:3Z,8S:8S,5J:5J,hg:hg,2z:2z,4N:4N,a9:a9,ns:ns,3n:3n})})();1c.1O(7G.1y,(I(){M 2g=2H.1y.2g;I 4L(1Y,1S){M hP=1Y.Y,Y=1S.Y;1M(Y--)1Y[hP+Y]=1S[Y];J 1Y}I eR(1Y,1S){1Y=2g.1s(1Y,0);J 4L(1Y,1S)}I jf(){M 4Q=N.3x().1n(/^[\\s\\(]*I[^(]*\\(([^)]*)\\)/)[1].2i(/\\/\\/.*?[\\r\\n]|\\/\\*(?:.|[\\r\\n])*?\\*\\//g,\'\').2i(/\\s+/g,\'\').4K(\',\');J 4Q.Y==1&&!4Q[0]?[]:4Q}I 3o(1i){if(1L.Y<2&&1c.3n(1L[0]))J N;if(!1c.2z(N))2f 1p 4P("wV 1m is 8u Gd.");M nt=I(){};M 7C=N,1S=2g.1s(1L,1);M ax=I(){M a=eR(1S,1L);M c=N 8d ax?N:1i;J 7C.2W(c,a)};nt.1y=N.1y;ax.1y=1p nt();J ax}I nn(1i){M 7C=N,1S=2g.1s(1L,1);J I(1G){M a=4L([1G||1u.1G],1S);J 7C.2W(1i,a)}}I nv(){if(!1L.Y)J N;M 7C=N,1S=2g.1s(1L,0);J I(){M a=eR(1S,1L);J 7C.2W(N,a)}}I gH(ji){M 7C=N,1S=2g.1s(1L,1);ji=ji*qZ;J 1u.bX(I(){J 7C.2W(7C,1S)},ji)}I 5D(){M 1S=4L([0.GD],1L);J N.gH.2W(N,1S)}I 4T(5P){M 7C=N;J I(){M a=4L([7C.3o(N)],1L);J 5P.2W(N,a)}}I 8M(){if(N.nl)J N.nl;M 7C=N;J N.nl=I(){M a=4L([N],1L);J 7C.2W(1r,a)}}M nB={jf:jf,nn:nn,nv:nv,gH:gH,5D:5D,4T:4T,8M:8M};if(!7G.1y.3o)nB.3o=3o;J nB})());(I(2q){I b0(){J N.qN()+\'-\'+(N.qP()+1).95(2)+\'-\'+N.qW().95(2)+\'T\'+N.r2().95(2)+\':\'+N.r0().95(2)+\':\'+N.qX().95(2)+\'Z\'}I 7X(){J N.b0()}if(!2q.b0)2q.b0=b0;if(!2q.7X)2q.7X=7X})(b1.1y);2J.1y.1n=2J.1y.2Z;2J.c4=I(3y){J 2w(3y).2i(/([.*+?^=!:${}()|[\\]\\/\\\\])/g,\'\\\\$1\')};M xQ=3G.2t({3W:I(4U,aq){N.4U=4U;N.aq=aq;N.gK=1t;N.fE()},fE:I(){N.dI=nC(N.gD.3o(N),N.aq*qZ)},q9:I(){N.4U(N)},aA:I(){if(!N.dI)J;Ig(N.dI);N.dI=1r},gD:I(){if(!N.gK){2r{N.gK=1k;N.q9();N.gK=1t}2o(e){N.gK=1t;2f e}}}});1c.1O(2w,{d1:I(U){J U==1r?\'\':2w(U)},ou:{\'\\b\':\'\\\\b\',\'\\t\':\'\\\\t\',\'\\n\':\'\\\\n\',\'\\f\':\'\\\\f\',\'\\r\':\'\\\\r\',\'\\\\\':\'\\\\\\\\\'}});1c.1O(2w.1y,(I(){M qH=1u.7i&&2d 7i.os===\'I\'&&7i.os(\'{"2Z": 1k}\').2Z;I nD(6e){if(1c.2z(6e))J 6e;M dY=1p gy(6e);J I(1n){J dY.hR(1n)}}I r1(co){J co.3E&&co.3E!==\'(?:)\'}I 8q(3g,6e){M 1A=\'\',3E=N,1n;6e=nD(6e);if(1c.4N(3g))3g=2J.c4(3g);if(!(3g.Y||r1(3g))){6e=6e(\'\');J 6e+3E.4K(\'\').3K(6e)+6e}1M(3E.Y>0){1n=3E.1n(3g);if(1n&&1n[0].Y>0){1A+=3E.2g(0,1n.1l);1A+=2w.d1(6e(1n));3E=3E.2g(1n.1l+1n[0].Y)}1h{1A+=3E,3E=\'\'}}J 1A}I oo(3g,6e,6M){6e=nD(6e);6M=1c.3n(6M)?1:6M;J N.8q(3g,I(1n){if(--6M<0)J 1n[0];J 6e(1n)})}I op(3g,1E){N.8q(3g,1E);J 2w(N)}I oq(Y,e8){Y=Y||30;e8=1c.3n(e8)?\'...\':e8;J N.Y>Y?N.2g(0,Y-e8.Y)+e8:2w(N)}I 8F(){J N.2i(/^\\s+/,\'\').2i(/\\s+$/,\'\')}I jj(){J N.2i(/<\\w+(\\s+("[^"]*"|\'[^\']*\'|[^>])+)?(\\/)?>|<\\/\\w+>/gi,\'\')}I 85(){J N.2i(1p 2J(1T.i1,\'gU\'),\'\')}I hT(){M qQ=1p 2J(1T.i1,\'gU\'),qU=1p 2J(1T.i1,\'im\');J(N.1n(qQ)||[]).3F(I(cP){J(cP.1n(qU)||[\'\',\'\'])[1]})}I aF(){J N.hT().3F(I(6B){J bv(6B)})}I ox(){J N.2i(/&/g,\'&qS;\').2i(/</g,\'&lt;\').2i(/>/g,\'&gt;\')}I oE(){J N.jj().2i(/&lt;/g,\'<\').2i(/&gt;/g,\'>\').2i(/&qS;/g,\'&\')}I c0(r4){M 1n=N.8F().1n(/([^?#]*)(#.*)?$/);if(!1n)J{};J 1n[1].4K(r4||\'&\').9H({},I(5I,4h){if((4h=4h.4K(\'=\'))[0]){M 1b=m5(4h.aW()),U=4h.Y>1?4h.3K(\'=\'):4h[0];if(U!=1R){U=U.8q(\'+\',\' \');U=m5(U)}if(1b in 5I){if(!1c.5J(5I[1b]))5I[1b]=[5I[1b]];5I[1b].1I(U)}1h 5I[1b]=U}J 5I})}I 6t(){J N.4K(\'\')}I ch(){J N.2g(0,N.Y-1)+2w.7p(N.7U(N.Y-1)+1)}I c7(6M){J 6M<1?\'\':1p 2H(6M+1).3K(N)}I cZ(){J N.2i(/-+(.)?/g,I(1n,m4){J m4?m4.7D():\'\'})}I h9(){J N.ak(0).7D()+N.gq(1).3b()}I oD(){J N.2i(/::/g,\'/\').2i(/([A-Z]+)([A-Z][a-z])/g,\'$rj$2\').2i(/([a-z\\d])([A-Z])/g,\'$rj$2\').2i(/-/g,\'9w\').3b()}I oz(){J N.2i(/9w/g,\'-\')}I 3Q(r8){M ot=N.2i(/[\\wj-\\Il\\\\]/g,I(j0){if(j0 in 2w.ou){J 2w.ou[j0]}J\'\\\\Iy\'+j0.7U().95(2,16)});if(r8)J\'"\'+ot.2i(/"/g,\'\\\\"\')+\'"\';J"\'"+ot.2i(/\'/g,\'\\\\\\\'\')+"\'"}I eH(2U){J N.2i(2U||1T.r9,\'$1\')}I hS(){M 3y=N;if(3y.ao())J 1t;3y=3y.2i(/\\\\(?:["\\\\\\/IB]|u[0-9a-fA-F]{4})/g,\'@\');3y=3y.2i(/"[^"\\\\\\n\\r]*"|1k|1t|1r|-?\\d+(?:\\.\\d*)?(?:[eE][+\\-]?\\d+)?/g,\']\');3y=3y.2i(/(?:^|:|,)(?:\\s*\\[)+/g,\'\');J(/^[\\],:{}\\s]*$/).2Z(3y)}I 8B(ra){M 3l=N.eH(),cx=/[\\Io\\In-\\Iq\\Ir\\It\\Is\\Iz-\\I3\\HE-\\HD\\HC-\\HF\\HG\\HI-\\HH\\HB]/g;if(cx.2Z(3l)){3l=3l.2i(cx,I(a){J\'\\\\u\'+(\'Ht\'+a.7U(0).3x(16)).2g(-4)})}2r{if(!ra||3l.hS())J bv(\'(\'+3l+\')\')}2o(e){}2f 1p Hv(\'Hw Hz 7i 2B: \'+N.3Q())}I qG(){M 3l=N.eH();J 7i.os(3l)}I 3j(3g){J N.2v(3g)>-1}I aT(3g,1X){1X=1c.a9(1X)?1X:0;J N.bG(3g,1X)===1X}I aN(3g,1X){3g=2w(3g);1X=1c.a9(1X)?1X:N.Y;if(1X<0)1X=0;if(1X>N.Y)1X=N.Y;M d=1X-3g.Y;J d>=0&&N.2v(3g,d)===d}I 9o(){J N==\'\'}I ao(){J/^\\s*$/.2Z(N)}I dw(1m,3g){J 1p gy(N,3g).hR(1m)}J{8q:8q,oo:oo,op:op,oq:oq,8F:2w.1y.rc||8F,jj:jj,85:85,hT:hT,aF:aF,ox:ox,oE:oE,c0:c0,HZ:c0,6t:6t,ch:ch,c7:c7,cZ:cZ,h9:h9,oD:oD,oz:oz,3Q:3Q,eH:eH,hS:hS,8B:qH?qG:8B,3j:3j,aT:2w.1y.aT||aT,aN:2w.1y.aN||aN,9o:9o,ao:ao,dw:dw}})());M gy=3G.2t({3W:I(dY,3g){N.dY=dY.3x();N.3g=3g||gy.qz},hR:I(1m){if(1m&&1c.2z(1m.mv))1m=1m.mv();J N.dY.8q(N.3g,I(1n){if(1m==1r)J(1n[1]+\'\');M cr=1n[1]||\'\';if(cr==\'\\\\\')J 1n[2];M 2X=1m,7l=1n[3],3g=/^([^.[]+|\\[((?:.*?[^\\\\])?)\\])(\\.|\\[|$)/;1n=3g.b4(7l);if(1n==1r)J cr;1M(1n!=1r){M qF=1n[1].aT(\'[\')?1n[2].2i(/\\\\\\\\]/g,\']\'):1n[1];2X=2X[qF];if(1r==2X||\'\'==1n[3])3A;7l=7l.gq(\'[\'==1n[3]?1n[1].Y:1n[0].Y);1n=3g.b4(7l)}J cr+2w.d1(2X)})}});gy.qz=/(^|.|\\r|\\n)(#\\{(.*?)\\})/;M $3A={};M aV=(I(){I 2S(1E,1i){2r{N.6p(1E,1i)}2o(e){if(e!=$3A)2f e}J N}I hK(4g,1E,1i){M 1l=-4g,ol=[],1Y=N.6t();if(4g<1)J 1Y;1M((1l+=4g)<1Y.Y)ol.1I(1Y.2g(1l,1l+4g));J ol.dS(1E,1i)}I 9h(1E,1i){1E=1E||1T.K;M 1A=1k;N.2S(I(U,1l){1A=1A&&!!1E.1s(1i,U,1l,N);if(!1A)2f $3A},N);J 1A}I hb(1E,1i){1E=1E||1T.K;M 1A=1t;N.2S(I(U,1l){if(1A=!!1E.1s(1i,U,1l,N))2f $3A},N);J 1A}I dS(1E,1i){1E=1E||1T.K;M 1K=[];N.2S(I(U,1l){1K.1I(1E.1s(1i,U,1l,N))},N);J 1K}I 8G(1E,1i){M 1A;N.2S(I(U,1l){if(1E.1s(1i,U,1l,N)){1A=U;2f $3A}},N);J 1A}I 9T(1E,1i){M 1K=[];N.2S(I(U,1l){if(1E.1s(1i,U,1l,N))1K.1I(U)},N);J 1K}I o6(2U,1E,1i){1E=1E||1T.K;M 1K=[];if(1c.4N(2U))2U=1p 2J(2J.c4(2U));N.2S(I(U,1l){if(2U.1n(U))1K.1I(1E.1s(1i,U,1l,N))},N);J 1K}I 3j(1m){if(1c.2z(N.2v)&&N.2v(1m)!=-1)J 1k;M cJ=1t;N.2S(I(U){if(U==1m){cJ=1k;2f $3A}});J cJ}I o5(4g,gh){gh=1c.3n(gh)?1r:gh;J N.hK(4g,I(2g){1M(2g.Y<4g)2g.1I(gh);J 2g})}I 9H(5l,1E,1i){N.2S(I(U,1l){5l=1E.1s(1i,5l,U,1l,N)},N);J 5l}I 4G(2b){M 1S=$A(1L).2g(1);J N.3F(I(U){J U[2b].2W(U,1S)})}I a3(1E,1i){1E=1E||1T.K;M 1A;N.2S(I(U,1l){U=1E.1s(1i,U,1l,N);if(1A==1r||U>=1A)1A=U},N);J 1A}I 7x(1E,1i){1E=1E||1T.K;M 1A;N.2S(I(U,1l){U=1E.1s(1i,U,1l,N);if(1A==1r||U<1A)1A=U},N);J 1A}I nZ(1E,1i){1E=1E||1T.K;M o7=[],o8=[];N.2S(I(U,1l){(1E.1s(1i,U,1l,N)?o7:o8).1I(U)},N);J[o7,o8]}I bC(2n){M 1K=[];N.2S(I(U){1K.1I(U[2n])});J 1K}I 7Q(1E,1i){M 1K=[];N.2S(I(U,1l){if(!1E.1s(1i,U,1l,N))1K.1I(U)},N);J 1K}I kL(1E,1i){J N.3F(I(U,1l){J{U:U,o9:1E.1s(1i,U,1l,N)}},N).kf(I(2s,4k){M a=2s.o9,b=4k.o9;J a<b?-1:a>b?1:0}).bC(\'U\')}I 6t(){J N.3F()}I oi(){M 1E=1T.K,1S=$A(1L);if(1c.2z(1S.6Z()))1E=1S.9D();M sl=[N].5o(1S).3F($A);J N.3F(I(U,1l){J 1E(sl.bC(1l))})}I 5W(){J N.6t().Y}I 3Q(){J\'#<aV:\'+N.6t().3Q()+\'>\'}J{2S:2S,hK:hK,9h:9h,91:9h,hb:hb,90:hb,dS:dS,3F:dS,8G:8G,9T:9T,2V:9T,2U:9T,o6:o6,3j:3j,Ex:3j,o5:o5,9H:9H,4G:4G,a3:a3,7x:7x,nZ:nZ,bC:bC,7Q:7Q,kL:kL,6t:6t,3k:6t,oi:oi,5W:5W,3Q:3Q,3S:8G}})();I $A(3t){if(!3t)J[];if(\'6t\'in 1c(3t))J 3t.6t();M Y=3t.Y||0,1K=1p 2H(Y);1M(Y--)1K[Y]=3t[Y];J 1K}I $w(2B){if(!1c.4N(2B))J[];2B=2B.8F();J 2B?2B.4K(/\\s+/):[]}2H.4S=$A;(I(){M 5B=2H.1y,2g=5B.2g,6p=5B.8Y;I 2S(1E,1i){1w(M i=0,Y=N.Y>>>0;i<Y;i++){if(i in N)1E.1s(1i,N[i],i,N)}}if(!6p)6p=2S;I 9Q(){N.Y=0;J N}I 6m(){J N[0]}I 6Z(){J N[N.Y-1]}I oc(){J N.2V(I(U){J U!=1r})}I hB(){J N.9H([],I(1Y,U){if(1c.5J(U))J 1Y.5o(U.hB());1Y.1I(U);J 1Y})}I 8J(){M 2I=2g.1s(1L,0);J N.2V(I(U){J!2I.3j(U)})}I aL(mf){J(mf===1t?N.6t():N).og()}I hA(sk){J N.9H([],I(1Y,U,1l){if(0==1l||(sk?1Y.6Z()!=U:!1Y.3j(U)))1Y.1I(U);J 1Y})}I oe(1Y){J N.hA().9T(I(7b){J 1Y.2v(7b)!==-1})}I 3Z(){J 2g.1s(N,0)}I 5W(){J N.Y}I 3Q(){J\'[\'+N.3F(1c.3Q).3K(\', \')+\']\'}I 2v(7b,i){if(N==1r)2f 1p 4P();M 1Y=1c(N),Y=1Y.Y>>>0;if(Y===0)J-1;i=4Z(i);if(bI(i)){i=0}1h if(i!==0&&94(i)){i=(i>0?1:-1)*2T.6u(2T.4O(i))}if(i>Y)J-1;M k=i>=0?i:2T.a3(Y-2T.4O(i),0);1w(;k<Y;k++)if(k in 1Y&&1Y[k]===7b)J k;J-1}I bG(7b,i){if(N==1r)2f 1p 4P();M 1Y=1c(N),Y=1Y.Y>>>0;if(Y===0)J-1;if(!1c.3n(i)){i=4Z(i);if(bI(i)){i=0}1h if(i!==0&&94(i)){i=(i>0?1:-1)*2T.6u(2T.4O(i))}}1h{i=Y}M k=i>=0?2T.7x(i,Y-1):Y-2T.4O(i);1w(;k>=0;k--)if(k in 1Y&&1Y[k]===7b)J k;J-1}I 5o(9w){M 1Y=[],hn=2g.1s(1L,0),7b,n=0;hn.bY(N);1w(M i=0,Y=hn.Y;i<Y;i++){7b=hn[i];if(1c.5J(7b)&&!(\'sj\'in 7b)){1w(M j=0,hP=7b.Y;j<hP;j++){if(j in 7b)1Y[n]=7b[j];n++}}1h{1Y[n++]=7b}}1Y.Y=n;J 1Y}I hI(2b){J I(){if(1L.Y===0){J 2b.1s(N,1T.K)}1h if(1L[0]===1R){M 1S=2g.1s(1L,1);1S.bY(1T.K);J 2b.2W(N,1S)}1h{J 2b.2W(N,1L)}}}I 3F(1E){if(N==1r)2f 1p 4P();1E=1E||1T.K;M 1m=1c(N);M 1K=[],1i=1L[1],n=0;1w(M i=0,Y=1m.Y>>>0;i<Y;i++){if(i in 1m){1K[n]=1E.1s(1i,1m[i],i,1m)}n++}1K.Y=n;J 1K}if(5B.3F){3F=hI(2H.1y.3F)}I 2U(1E){if(N==1r||!1c.2z(1E))2f 1p 4P();M 1m=1c(N);M 1K=[],1i=1L[1],U;1w(M i=0,Y=1m.Y>>>0;i<Y;i++){if(i in 1m){U=1m[i];if(1E.1s(1i,U,i,1m)){1K.1I(U)}}}J 1K}if(5B.2U){2U=2H.1y.2U}I 90(1E){if(N==1r)2f 1p 4P();1E=1E||1T.K;M 1i=1L[1];M 1m=1c(N);1w(M i=0,Y=1m.Y>>>0;i<Y;i++){if(i in 1m&&1E.1s(1i,1m[i],i,1m)){J 1k}}J 1t}if(5B.90){90=hI(2H.1y.90)}I 91(1E){if(N==1r)2f 1p 4P();1E=1E||1T.K;M 1i=1L[1];M 1m=1c(N);1w(M i=0,Y=1m.Y>>>0;i<Y;i++){if(i in 1m&&!1E.1s(1i,1m[i],i,1m)){J 1t}}J 1k}if(5B.91){91=hI(2H.1y.91)}1c.1O(5B,aV);if(5B.3k===aV.3k){3q 5B.3k}if(!5B.og)5B.og=5B.aL;1c.1O(5B,{6p:6p,3F:3F,dS:3F,2V:2U,2U:2U,9T:2U,90:90,hb:90,91:91,9h:91,9Q:9Q,6m:6m,6Z:6Z,oc:oc,hB:hB,8J:8J,aL:aL,hA:hA,oe:oe,3Z:3Z,6t:3Z,5W:5W,3Q:3Q});M sq=(I(){J[].5o(1L)[0][0]!==1})(1,2);if(sq)5B.5o=5o;if(!5B.2v)5B.2v=2v;if(!5B.bG)5B.bG=bG})();I $H(1m){J 1p 6F(1m)};M 6F=3G.2t(aV,(I(){I 3W(1m){N.9x=1c.hg(1m)?1m.3B():1c.3Z(1m)}I 6p(1E,1i){M i=0;1w(M 1b in N.9x){M U=N.9x[1b],4h=[1b,U];4h.1b=1b;4h.U=U;1E.1s(1i,4h,i);i++}}I 1F(1b,U){J N.9x[1b]=U}I 1j(1b){if(N.9x[1b]!==1c.1y[1b])J N.9x[1b]}I cg(1b){M U=N.9x[1b];3q N.9x[1b];J U}I 3B(){J 1c.3Z(N.9x)}I 2a(){J N.bC(\'1b\')}I 2I(){J N.bC(\'U\')}I 1l(U){M 1n=N.8G(I(4h){J 4h.U===U});J 1n&&1n.1b}I eR(1m){J N.3Z().4L(1m)}I 4L(1m){J 1p 6F(1m).9H(N,I(1A,4h){1A.1F(4h.1b,4h.U);J 1A})}I mu(1b,U){if(1c.3n(U))J 1b;U=2w.d1(U);U=U.8q(/(\\r)?\\n/,\'\\r\\n\');U=gj(U);U=U.8q(/%20/,\'+\');J 1b+\'=\'+U}I 8Q(){J N.9H([],I(1K,4h){M 1b=gj(4h.1b),2I=4h.U;if(2I&&2d 2I==\'1m\'){if(1c.5J(2I)){M nk=[];1w(M i=0,3r=2I.Y,U;i<3r;i++){U=2I[i];nk.1I(mu(1b,U))}J 1K.5o(nk)}}1h 1K.1I(mu(1b,2I));J 1K}).3K(\'&\')}I 3Q(){J\'#<6F:{\'+N.3F(I(4h){J 4h.3F(1c.3Q).3K(\': \')}).3K(\', \')+\'}>\'}I 3Z(){J 1p 6F(N)}J{3W:3W,6p:6p,1F:1F,1j:1j,cg:cg,3B:3B,mv:3B,2a:2a,2I:2I,1l:1l,eR:eR,4L:4L,8Q:8Q,3Q:3Q,7X:3B,3Z:3Z}})());6F.4S=$H;1c.1O(4Z.1y,(I(){I mt(){J N.95(2,16)}I ch(){J N+1}I c7(1E,1i){$R(0,N,1k).2S(1E,1i);J N}I 95(Y,sh){M 2B=N.3x(sh||10);J\'0\'.c7(Y-2B.Y)+2B}I 4O(){J 2T.4O(N)}I aG(){J 2T.aG(N)}I 96(){J 2T.96(N)}I 6u(){J 2T.6u(N)}J{mt:mt,ch:ch,c7:c7,95:95,4O:4O,aG:aG,96:96,6u:6u}})());I $R(4p,4u,eV){J 1p s8(4p,4u,eV)}M s8=3G.2t(aV,(I(){I 3W(4p,4u,eV){N.4p=4p;N.4u=4u;N.eV=eV}I 6p(1E,1i){M U=N.4p,i;1w(i=0;N.3j(U);i++){1E.1s(1i,U,i);U=U.ch()}}I 3j(U){if(U<N.4p)J 1t;if(N.eV)J U<N.4u;J U<=N.4u}J{3W:3W,6p:6p,3j:3j}})());M cj={};M sb={sc:I(){M i8;1w(M i=0,Y=1L.Y;i<Y;i++){M vS=1L[i];2r{i8=vS();3A}2o(e){}}J i8}};M 3V={sd:I(){J sb.sc(I(){J 1p oQ()},I(){J 1p sf(\'DJ.se\')},I(){J 1p sf(\'w3.se\')})||1t},mp:0};3V.eG={gW:[],6p:I(1E,1i){N.gW.6p(1E,1i)},ic:I(3D){if(!N.3j(3D))N.gW.1I(3D)},pB:I(3D){N.gW=N.gW.8J(3D)},ky:I(4U,6H,2y,3l){N.2S(I(3D){if(1c.2z(3D[4U])){2r{3D[4U].2W(3D,[6H,2y,3l])}2o(e){}}})}};1c.1O(3V.eG,aV);3V.eG.ic({kK:I(){3V.mp++},4B:I(){3V.mp--}});3V.5i=3G.2t({3W:I(1B){N.1B={2b:\'dR\',eA:1k,gs:\'b7/x-u0-2P-E8\',my:\'Eb-8\',1C:\'\',8B:1k,j7:1k};1c.1O(N.1B,1B||{});N.1B.2b=N.1B.2b.3b();if(1c.hg(N.1B.1C))N.1B.1C=N.1B.1C.3B()}});3V.9k=3G.2t(3V.5i,{mC:1t,3W:I($7E,4Y,1B){$7E(1B);N.2y=3V.sd();N.6H(4Y)},6H:I(4Y){N.4Y=4Y;N.2b=N.1B.2b;M 6k=1c.4N(N.1B.1C)?N.1B.1C:1c.8Q(N.1B.1C);if(![\'1j\',\'dR\'].3j(N.2b)){6k+=(6k?\'&\':\'\')+"hc="+N.2b;N.2b=\'dR\'}if(6k&&N.2b===\'1j\'){N.4Y+=(N.4Y.3j(\'?\')?\'&\':\'?\')+6k}N.1C=6k.c0();2r{M 5t=1p 3V.ma(N);if(N.1B.kK)N.1B.kK(5t);3V.eG.ky(\'kK\',N,5t);N.2y.g5(N.2b.7D(),N.4Y,N.1B.eA);if(N.1B.eA)N.mF.3o(N).5D(1);1h if(N.1B.so&&1T.6W.pg){2r{N.2y.rp=\'sa-1o\'}2o(e){}}N.2y.ee=N.mx.3o(N);N.sr();N.2Y=N.2b==\'dR\'?(N.1B.E7||6k):1r;N.2y.qY(N.2Y);if(!N.1B.eA&&N.2y.ss)N.mx()}2o(e){N.a8(e)}},mx:I(){M 6s=N.2y.6s;if(6s>1&&!((6s==4)&&N.mC))N.mF(N.2y.6s)},sr:I(){M 8l={\'X-DZ-DY\':\'oQ\',\'X-1T-jV\':1T.jV,\'E1\':\'5C/eB, 5C/3X, b7/3i, 5C/3i, */*\'};if(N.2b==\'dR\'){8l[\'ex-1J\']=N.1B.gs+(N.1B.my?\'; E2=\'+N.1B.my:\'\');if(N.2y.ss&&(ev.mE.1n(/hs\\/(\\d{4})/)||[0,sF])[1]<sF)8l[\'FI\']=\'bQ\'}if(2d N.1B.sH==\'1m\'){M es=N.1B.sH;if(1c.2z(es.1I))1w(M i=0,Y=es.Y;i<Y;i+=2)8l[es[i]]=es[i+1];1h $H(es).2S(I(4h){8l[4h.1b]=4h.U})}1w(M 1D in 8l)if(8l[1D]!=1r)N.2y.qR(1D,8l[1D])},ce:I(){M 8i=N.ge();J!8i||(8i>=qw&&8i<FK)||8i==FM},ge:I(){2r{if(N.2y.8i===FL)J FF;J N.2y.8i||0}2o(e){J 0}},mF:I(6s){M 6K=3V.9k.sw[6s],5t=1p 3V.ma(N);if(6K==\'mB\'){2r{N.mC=1k;(N.1B[\'on\'+5t.8i]||N.1B[\'on\'+(N.ce()?\'Fx\':\'Fw\')]||1T.8D)(5t,5t.ku)}2o(e){N.a8(e)}M gs=5t.dd(\'ex-1J\');if(N.1B.j7==\'jE\'||(N.1B.j7&&N.kF()&&gs&&gs.1n(/^\\s*(5C|b7)\\/(x-)?(FA|FD)6B(;.*)?\\s*$/i)))N.sK()}2r{(N.1B[\'on\'+6K]||1T.8D)(5t,5t.ku);3V.eG.ky(\'on\'+6K,N,5t,5t.ku)}2o(e){N.a8(e)}if(6K==\'mB\'){N.2y.ee=1T.8D}},kF:I(){M m=N.4Y.1n(/^\\s*fL?:\\/\\/[^\\/]*/);J!m||(m[0]==\'#{kw}//#{fy}#{az}\'.dw({kw:9R.kw,fy:1o.fy,az:9R.az?\':\'+9R.az:\'\'}))},dd:I(1D){2r{J N.2y.m8(1D)||1r}2o(e){J 1r}},sK:I(){2r{J bv((N.2y.5j||\'\').eH())}2o(e){N.a8(e)}},a8:I(ed){(N.1B.sC||1T.8D)(N,ed);3V.eG.ky(\'sC\',N,ed)}});3V.9k.sw=[\'G5\',\'G4\',\'FY\',\'FX\',\'mB\'];3V.ma=3G.2t({3W:I(6H){N.6H=6H;M 2y=N.2y=6H.2y,6s=N.6s=2y.6s;if((6s>2&&!1T.6W.hv)||6s==4){N.8i=N.ge();N.m9=N.st();N.5j=2w.d1(2y.5j);N.ku=N.sx()}if(6s==4){M 3i=2y.5v;N.5v=1c.3n(3i)?1r:3i;N.FS=N.sy()}},8i:0,m9:\'\',ge:3V.9k.1y.ge,st:I(){2r{J N.2y.m9||\'\'}2o(e){J\'\'}},dd:3V.9k.1y.dd,FU:I(){2r{J N.hN()}2o(e){J 1r}},m8:I(1D){J N.2y.m8(1D)},hN:I(){J N.2y.hN()},sx:I(){M 3l=N.dd(\'X-7i\');if(!3l)J 1r;2r{3l=m5(c4(3l))}2o(e){}2r{J 3l.8B(N.6H.1B.sB||!N.6H.kF())}2o(e){N.6H.a8(e)}},sy:I(){M 1B=N.6H.1B;if(!1B.8B||(1B.8B!=\'jE\'&&!(N.dd(\'ex-1J\')||\'\').3j(\'b7/3l\'))||N.5j.ao())J 1r;2r{J N.5j.8B(1B.sB||!N.6H.kF())}2o(e){N.6H.a8(e)}}});3V.rD=3G.2t(3V.9k,{3W:I($7E,8o,4Y,1B){N.8o={ce:(8o.ce||8o),m6:(8o.m6||(8o.ce?1r:8o))};1B=1c.3Z(1B);M 4B=1B.4B;1B.4B=(I(5t,3l){N.sz(5t.5j);if(1c.2z(4B))4B(5t,3l)}).3o(N);$7E(4Y,1B)},sz:I(5j){M 6D=N.8o[N.ce()?\'ce\':\'m6\'],1B=N.1B;if(!1B.aF)5j=5j.85();if(6D=$(6D)){if(1B.cc){if(1c.4N(1B.cc)){M cc={};cc[1B.cc]=5j;6D.5K(cc)}1h 1B.cc(6D,5j)}1h 6D.4L(5j)}}});3V.EW=3G.2t(3V.5i,{3W:I($7E,8o,4Y,1B){$7E(1B);N.4B=N.1B.4B;N.aq=(N.1B.aq||2);N.bD=(N.1B.bD||1);N.mk={};N.8o=8o;N.4Y=4Y;N.4p()},4p:I(){N.1B.4B=N.s5.3o(N);N.gD()},aA:I(){N.mk.1B.4B=1R;yc(N.dI);(N.4B||1T.8D).2W(N,1L)},s5:I(5t){if(N.1B.bD){N.bD=(5t.5j==N.rE?N.bD*N.1B.bD:1);N.rE=5t.5j}N.dI=N.gD.3o(N).gH(N.bD*N.aq)},gD:I(){N.mk=1p 3V.rD(N.8o,N.4Y,N.1B)}});(I(4a){M ks;M n6=2H.1y.2g;M 4H=1o.4x(\'1v\');I $(L){if(1L.Y>1){1w(M i=0,3f=[],Y=1L.Y;i<Y;i++)3f.1I($(1L[i]));J 3f}if(1c.4N(L))L=1o.fk(L);J 1f.1O(L)}4a.$=$;if(!4a.82)4a.82={};if(!4a.82.d8){1c.1O(4a.82,{d8:1,Fr:2,l4:3,Ft:4,Fs:5,Fm:6,Fl:7,Ff:8,wv:9,Fe:10,Fd:11,Fg:12})}M d7={};I rF(2k,4d){if(2k===\'2V\')J 1t;if(\'1J\'in 4d)J 1t;J 1k}M jX=(I(){2r{M el=1o.4x(\'<3J 1D="x">\');J el.2k.3b()===\'3J\'&&el.1D===\'x\'}2o(9U){J 1t}})();M l3=4a.1f;I 1f(2k,4d){4d=4d||{};2k=2k.3b();if(jX&&4d.1D){2k=\'<\'+2k+\' 1D="\'+4d.1D+\'">\';3q 4d.1D;J 1f.cA(1o.4x(2k),4d)}if(!d7[2k])d7[2k]=1f.1O(1o.4x(2k));M 1V=rF(2k,4d)?d7[2k].rw(1t):1o.4x(2k);J 1f.cA(1V,4d)}4a.1f=1f;1c.1O(4a.1f,l3||{});if(l3)4a.1f.1y=l3.1y;1f.2N={7B:{},cY:{}};M 2K={};M mm={id:\'id\',1Z:\'3I\'};I 3Q(L){L=$(L);M 1A=\'<\'+L.2k.3b();M 4A,U;1w(M 2n in mm){4A=mm[2n];U=(L[2n]||\'\').3x();if(U)1A+=\' \'+4A+\'=\'+U.3Q(1k)}J 1A+\'>\'}2K.3Q=3Q;I ci(L){J $(L).3M(\'4e\')!==\'86\'}I hu(L,8N){L=$(L);if(2d 8N!==\'rI\')8N=!1f.ci(L);1f[8N?\'aX\':\'3C\'](L);J L}I 3C(L){L=$(L);L.1N.4e=\'86\';J L}I aX(L){L=$(L);L.1N.4e=\'\';J L}1c.1O(2K,{ci:ci,hu:hu,3C:3C,aX:aX});I aH(L){L=$(L);L.2E.8y(L);J L}M rA=(I(){M el=1o.4x("2V"),7w=1k;el.7o="<g8 U=\\"2Z\\">2Z</g8>";if(el.1B&&el.1B[0]){7w=el.1B[0].4o.7D()!=="yR"}el=1r;J 7w})();M rz=(I(){2r{M el=1o.4x("5G");if(el&&el.rH){el.7o="<aB><tr><td>2Z</td></tr></aB>";M 7w=2d el.rH[0]=="1R";el=1r;J 7w}}2o(e){J 1k}})();M mh=(I(){2r{M el=1o.4x(\'1v\');el.7o="<q1 />";M 7w=(el.9C.Y===0);el=1r;J 7w}2o(e){J 1k}})();M rs=rA||rz||mh;M rt=(I(){M s=1o.4x("6B"),7w=1t;2r{s.7O(1o.Fa(""));7w=!s.4m||s.4m&&s.4m.2Q!==3}2o(e){7w=1k}s=1r;J 7w})();I 4L(L,2e){L=$(L);M 8b=L.7m(\'*\'),i=8b.Y;1M(i--)gJ(8b[i]);if(2e&&2e.9c)2e=2e.9c();if(1c.8S(2e))J L.4L().5K(2e);2e=1c.9u(2e);M 2k=L.2k.7D();if(2k===\'F3\'&&rt){L.5C=2e;J L}if(rs){if(2k in dh.9g){1M(L.4m)L.8y(L.4m);M eQ=gO(2k,2e.85());1w(M i=0,1V;1V=eQ[i];i++)L.7O(1V)}1h if(mh&&1c.4N(2e)&&2e.2v(\'<q1\')>-1){1M(L.4m)L.8y(L.4m);M eQ=gO(2k,2e.85(),1k);1w(M i=0,1V;1V=eQ[i];i++)L.7O(1V)}1h{L.7o=2e.85()}}1h{L.7o=2e.85()}2e.aF.3o(2e).5D();J L}I 2i(L,2e){L=$(L);if(2e&&2e.9c){2e=2e.9c()}1h if(!1c.8S(2e)){2e=1c.9u(2e);M mG=L.7u.FR();mG.FZ(L);2e.aF.3o(2e).5D();2e=mG.FE(2e.85())}L.2E.mH(2e,L);J L}M dh={cr:I(L,1V){L.2E.lc(1V,L)},2M:I(L,1V){L.lc(1V,L.4m)},4C:I(L,1V){L.7O(1V)},cN:I(L,1V){L.2E.lc(1V,L.6Y)},9g:{FJ:[\'<5G>\',\'</5G>\',1],k6:[\'<5G><aB>\',\'</aB></5G>\',2],yL:[\'<5G><aB><tr>\',\'</tr></aB></5G>\',3],mT:[\'<5G><aB><tr><td>\',\'</td></tr></aB></5G>\',4],wS:[\'<2V>\',\'</2V>\',1]}};M 9g=dh.9g;1c.1O(9g,{yJ:9g.k6,yH:9g.k6,yF:9g.mT});I ru(L,2e){L=$(L);if(2e&&2e.9c)2e=2e.9c();if(1c.8S(2e)){L.2E.mH(2e,L);J L}2e=1c.9u(2e);M 2c=L.2E,2k=2c.2k.7D();if(2k in dh.9g){M 6Y=1f.2C(L);M rr=gO(2k,2e.85());2c.8y(L);M 1E;if(6Y)1E=I(1V){2c.lc(1V,6Y)};1h 1E=I(1V){2c.7O(1V)};rr.2S(1E)}1h{L.rq=2e.85()}2e.aF.3o(2e).5D();J L}if(\'rq\'in 1o.3h)2i=ru;I rv(2e){if(1c.3n(2e)||2e===1r)J 1t;if(1c.4N(2e)||1c.a9(2e))J 1k;if(1c.8S(2e))J 1k;if(2e.9c||2e.9u)J 1k;J 1t}I ry(L,2e,1X){1X=1X.3b();M 2b=dh[1X];if(2e&&2e.9c)2e=2e.9c();if(1c.8S(2e)){2b(L,2e);J L}2e=1c.9u(2e);M 2k=((1X===\'cr\'||1X===\'cN\')?L.2E:L).2k.7D();M 9C=gO(2k,2e.85());if(1X===\'2M\'||1X===\'cN\')9C.aL();1w(M i=0,1V;1V=9C[i];i++)2b(L,1V);2e.aF.3o(2e).5D()}I 5K(L,dj){L=$(L);if(rv(dj))dj={4C:dj};1w(M 1X in dj)ry(L,dj[1X],1X);J L}I 4T(L,5P,4d){L=$(L);if(1c.8S(5P)){$(5P).cA(4d||{})}1h if(1c.4N(5P)){5P=1p 1f(5P,4d)}1h{5P=1p 1f(\'1v\',5P)}if(L.2E)L.2E.mH(5P,L);5P.7O(L);J 5P}I n8(L){L=$(L);M 1V=L.4m;1M(1V){M rx=1V.6Y;if(1V.2Q===82.l4&&!/\\S/.2Z(1V.dz))L.8y(1V);1V=rx}J L}I 9o(L){J $(L).7o.ao()}I gO(2k,3X,jE){M t=dh.9g[2k],1v=4H;M jG=!!t;if(!jG&&jE){jG=1k;t=[\'\',\'\',0]}if(jG){1v.7o=\'&#HP;\'+t[0]+3X+t[1];1v.8y(1v.4m);1w(M i=t[2];i--;)1v=1v.4m}1h{1v.7o=3X}J $A(1v.9C)}I 3Z(L,n7){if(!(L=$(L)))J;M 3Z=L.rw(n7);if(!h5){3Z.al=ks;if(n7){M 8b=1f.2V(3Z,\'*\'),i=8b.Y;1M(i--)8b[i].al=ks}}J 1f.1O(3Z)}I gJ(L){M 2p=7y(L);if(2p){1f.6x(L);if(!h5)L.al=ks;3q 1f.bm[2p]}}I rK(3f){M i=3f.Y;1M(i--)gJ(3f[i])}I rL(3f){M i=3f.Y,L,2p;1M(i--){L=3f[i];2p=7y(L);3q 1f.bm[2p];3q 2A.4j[2p]}}if(h5){rK=rL}I n9(L){if(!(L=$(L)))J;gJ(L);M 8b=L.7m(\'*\'),i=8b.Y;1M(i--)gJ(8b[i]);J 1r}1c.1O(2K,{aH:aH,4L:4L,2i:2i,5K:5K,4T:4T,n8:n8,9o:9o,3Z:3Z,n9:n9});I df(L,2n,jQ){L=$(L);jQ=jQ||-1;M 3f=[];1M(L=L[2n]){if(L.2Q===82.d8)3f.1I(1f.1O(L));if(3f.Y===jQ)3A}J 3f}I n3(L){J df(L,\'2E\')}I 8b(L){J 1f.2V(L,\'*\')}I jl(L){L=$(L).4m;1M(L&&L.2Q!==82.d8)L=L.6Y;J $(L)}I jx(L){M 1K=[],7N=$(L).4m;1M(7N){if(7N.2Q===82.d8)1K.1I(1f.1O(7N));7N=7N.6Y}J 1K}I jt(L){J df(L,\'ff\')}I jA(L){J df(L,\'6Y\')}I dM(L){L=$(L);M gf=jt(L),2C=jA(L);J gf.aL().5o(2C)}I 1n(L,2l){L=$(L);if(1c.4N(2l))J 1T.4M.1n(L,2l);J 2l.1n(L)}I jP(L,2n,3c,1l){L=$(L),3c=3c||0,1l=1l||0;if(1c.a9(3c)){1l=3c,3c=1r}1M(L=L[2n]){if(L.2Q!==1)6i;if(3c&&!1T.4M.1n(L,3c))6i;if(--1l>=0)6i;J 1f.1O(L)}}I up(L,3c,1l){L=$(L);if(1L.Y===1)J $(L.2E);J jP(L,\'2E\',3c,1l)}I 9r(L,3c,1l){if(1L.Y===1)J jl(L);L=$(L),3c=3c||0,1l=1l||0;if(1c.a9(3c))1l=3c,3c=\'*\';M 1V=1T.4M.2V(3c,L)[1l];J 1f.1O(1V)}I gf(L,3c,1l){J jP(L,\'ff\',3c,1l)}I 2C(L,3c,1l){J jP(L,\'6Y\',3c,1l)}I 2V(L){L=$(L);M eC=n6.1s(1L,1).3K(\', \');J 1T.4M.2V(eC,L)}I nh(L){L=$(L);M eC=n6.1s(1L,1).3K(\', \');M dM=1f.dM(L),1K=[];1w(M i=0,jO;jO=dM[i];i++){if(1T.4M.1n(jO,eC))1K.1I(jO)}J 1K}I n5(L,5b){L=$(L),5b=$(5b);if(!L||!5b)J 1t;1M(L=L.2E)if(L===5b)J 1k;J 1t}I rY(L,5b){L=$(L),5b=$(5b);if(!L||!5b)J 1t;if(!5b.6N)J n5(L,5b);J 5b.6N(L)&&5b!==L}I rZ(L,5b){L=$(L),5b=$(5b);if(!L||!5b)J 1t;J(L.9d(5b)&8)===8}M aP;if(4H.9d){aP=rZ}1h if(4H.6N){aP=rY}1h{aP=n5}1c.1O(2K,{df:df,n3:n3,8b:8b,jl:jl,jx:jx,jt:jt,jA:jA,dM:dM,1n:1n,up:up,9r:9r,gf:gf,2C:2C,2V:2V,nh:nh,aP:aP,Ha:2V,Hp:jx});M rX=1;I mN(L){L=$(L);M id=1f.bP(L,\'id\');if(id)J id;do{id=\'H8\'+rX++}1M($(id));1f.cA(L,\'id\',id);J id}I bP(L,1D){J $(L).3m(1D)}I s1(L,1D){L=$(L);M 5G=88.fh;if(5G.2I[1D])J 5G.2I[1D](L,1D);if(5G.4Q[1D])1D=5G.4Q[1D];if(1D.3j(\':\')){if(!L.4d||!L.4d[1D])J 1r;J L.4d[1D].U}J L.3m(1D)}I s4(L,1D){if(1D===\'aU\')J L.aU;J L.3m(1D)}M s0=(I(){4H.8U(\'dQ\',[]);M U=4H.3m(\'dQ\');M 2z=1c.5J(U);4H.iZ(\'dQ\');J 2z})();if(s0){bP=s1}1h if(1T.6W.eb){bP=s4}I cA(L,1D,U){L=$(L);M 4d={},5G=88.dv;if(2d 1D===\'1m\'){4d=1D}1h{4d[1D]=1c.3n(U)?1k:U}1w(M 5X in 4d){1D=5G.4Q[5X]||5X;U=4d[5X];if(5G.2I[5X]){U=5G.2I[5X](L,U);if(1c.3n(U))6i}if(U===1t||U===1r)L.iZ(1D);1h if(U===1k)L.8U(1D,1D);1h L.8U(1D,U)}J L}M s3=(I(){if(!jX){J 1t}M c8=1o.4x(\'<3J 1J="c8">\');c8.6I=1k;M 1V=c8.cp(\'6I\');J!1V||!1V.l8})();I bA(L,4A){4A=88.2F[4A]||4A;M 1V=$(L).cp(4A);J!!(1V&&1V.l8)}I s2(L,4A){if(4A===\'6I\'){J L.6I}J bA(L,4A)}4a.1f.2N.cY.bA=s3?s2:bA;I c6(L){J 1p 1f.kR(L)}M jT={};I ni(1Z){if(jT[1Z])J jT[1Z];M re=1p 2J("(^|\\\\s+)"+1Z+"(\\\\s+|$)");jT[1Z]=re;J re}I gc(L,1Z){if(!(L=$(L)))J;M jU=L.1Z;if(jU.Y===0)J 1t;if(jU===1Z)J 1k;J ni(1Z).2Z(jU)}I kp(L,1Z){if(!(L=$(L)))J;if(!gc(L,1Z))L.1Z+=(L.1Z?\' \':\'\')+1Z;J L}I kl(L,1Z){if(!(L=$(L)))J;L.1Z=L.1Z.2i(ni(1Z),\' \').8F();J L}I mL(L,1Z,8N){if(!(L=$(L)))J;if(1c.3n(8N))8N=!gc(L,1Z);M 2b=1f[8N?\'kp\':\'kl\'];J 2b(L,1Z)}M 88={};M gv=\'1Z\',gw=\'1w\';4H.8U(gv,\'x\');if(4H.1Z!==\'x\'){4H.8U(\'3I\',\'x\');if(4H.1Z===\'x\')gv=\'3I\'}M dB=1o.4x(\'zY\');dB.8U(gw,\'x\');if(dB.dE!==\'x\'){dB.8U(\'dE\',\'x\');if(dB.dE===\'x\')gw=\'dE\'}dB=1r;I rV(L,4A){J L.3m(4A)}I nd(L,4A){J L.3m(4A,2)}I rP(L,4A){M 1V=L.cp(4A);J 1V?1V.U:\'\'}I go(L,4A){J $(L).bA(4A)?4A:1r}4H.dQ=1T.8D;M ng=4H.3m(\'dQ\');M 5d;if(2w(ng).2v(\'{\')>-1){5d=I(L,4A){M U=L.3m(4A);if(!U)J 1r;U=U.3x();U=U.4K(\'{\')[1];U=U.4K(\'}\')[0];J U.8F()}}1h if(ng===\'\'){5d=I(L,4A){M U=L.3m(4A);if(!U)J 1r;J U.8F()}}88.fh={4Q:{\'3I\':gv,\'1Z\':gv,\'1w\':gw,\'dE\':gw},2I:{1N:I(L){J L.1N.ka.3b()},aU:I(L){J L.aU}}};88.dv={4Q:{1Z:\'3I\',dE:\'1w\',zD:\'zB\',Bc:\'CL\'},2I:{6I:I(L,U){U=!!U;L.6I=U;J U?\'6I\':1r},1N:I(L,U){L.1N.ka=U?U:\'\'}}};88.2F={4Q:{}};1c.1O(88.dv.4Q,88.fh.4Q);M rW=$w(\'CM CT CY CX \'+\'CU fD CV CI Cz CH CF\');1w(M i=0,5X;5X=rW[i];i++){88.dv.4Q[5X.3b()]=5X;88.2F.4Q[5X.3b()]=5X}1c.1O(88.fh.2I,{9I:nd,5w:nd,1J:rV,aY:rP,7W:go,6I:go,wf:go,wg:go,rd:5d,iR:5d,dQ:5d,Cp:5d,BC:5d,BD:5d,BK:5d,BI:5d,Bk:5d,Bh:5d,Bg:5d,Bl:5d,Br:5d,Bq:5d,BN:5d,Cd:5d,Cc:5d,C9:5d});1c.1O(2K,{mN:mN,bP:bP,cA:cA,c6:c6,gc:gc,kp:kp,kl:kl,mL:mL});I rO(1N){if(1N===\'l9\'||1N===\'gS\')J\'km\';J 1N.cZ()}I rN(1N){if(1N===\'l9\'||1N===\'km\')J\'gS\';J 1N.cZ()}I 5n(L,5x){L=$(L);M kb=L.1N,1n;if(1c.4N(5x)){kb.ka+=\';\'+5x;if(5x.3j(\'6y\')){M 6y=5x.1n(/6y:\\s*(\\d?\\.?\\d*)/)[1];1f.cu(L,6y)}J L}1w(M 2n in 5x){if(2n===\'6y\'){1f.cu(L,5x[2n])}1h{M U=5x[2n];if(2n===\'l9\'||2n===\'km\'){2n=1c.3n(kb.gS)?\'km\':\'gS\'}2r{kb[2n]=U}2o(e){}}}J L}I 3M(L,1N){L=$(L);1N=rO(1N);M U=L.1N[1N];if(!U||U===\'fo\'){M 9t=1o.nz.wK(L,1r);U=9t?9t[1N]:1r}if(1N===\'6y\')J U?9L(U):1.0;J U===\'fo\'?1r:U}I FH(L,1N){6T(1N){2L\'2O\':2L\'2D\':if(!1f.ci(L))J 1r;M mJ=aI(3M(L,1N),10);if(mJ!==L[\'3T\'+1N.h9()])J mJ+\'px\';J 1f.ar(L,1N);f3:J 3M(L,1N)}}I rR(L,1N){L=$(L);1N=rN(1N);M U=L.1N[1N];if(!U&&L.9m){U=L.9m[1N]}if(1N===\'6y\'){if(!jY)J mZ(L);1h J U?9L(U):1.0}if(U===\'fo\'){if((1N===\'2D\'||1N===\'2O\')&&1f.ci(L))J 1f.ar(L,1N)+\'px\';J 1r}J U}I mX(2U){J(2U||\'\').2i(/mY\\([^\\)]*\\)/gi,\'\')}I rM(L){if(!L.9m||!L.9m.cf)L.1N.wF=1;J L}M jY=(I(){4H.1N.ka="6y:.55";J/^0.55/.2Z(4H.1N.6y)})();I cu(L,U){L=$(L);if(U==1||U===\'\')U=\'\';1h if(U<0.rQ)U=0;L.1N.6y=U;J L}I rU(L,U){if(jY)J cu(L,U);L=rM($(L));M 2U=1f.3M(L,\'2U\'),1N=L.1N;if(U==1||U===\'\'){2U=mX(2U);if(2U)1N.2U=2U;1h 1N.iZ(\'2U\');J L}if(U<0.rQ)U=0;1N.2U=mX(2U)+\' mY(6y=\'+(U*kW)+\')\';J L}I gT(L){J 1f.3M(L,\'6y\')}I mZ(L){if(jY)J gT(L);M 2U=1f.3M(L,\'2U\');if(2U.Y===0)J 1.0;M 1n=(2U||\'\').1n(/mY\\(6y=(.*)\\)/i);if(1n&&1n[1])J 9L(1n[1])/kW;J 1.0}1c.1O(2K,{5n:5n,3M:3M,cu:cu,gT:gT});if(\'gS\'in 4H.1N){2K.3M=rR;2K.cu=rU;2K.gT=mZ}M ib=0;4a.1f.bm={ib:1};I 7y(L){if(L===1u)J 0;if(2d L.al===\'1R\')L.al=1f.bm.ib++;J L.al}I ij(L){if(L===1u)J 0;if(L==1o)J 1;J L.il}M h5=(\'il\'in 4H);if(h5)7y=ij;I aC(L){if(!(L=$(L)))J;M 2p=7y(L);if(!1f.bm[2p])1f.bm[2p]=$H();J 1f.bm[2p]}I 7H(L,1b,U){if(!(L=$(L)))J;M 6O=aC(L);if(1L.Y===2){6O.4L(1b)}1h{6O.1F(1b,U)}J L}I dy(L,1b,jN){if(!(L=$(L)))J;M 6O=aC(L),U=6O.1j(1b);if(1c.3n(U)){6O.1F(1b,jN);U=jN}J U}1c.1O(2K,{aC:aC,7H:7H,dy:dy});M 2N={},7B=1f.2N.7B,F=1T.fs;if(!F.fa&&(\'7T\'in 4H)){4a.fc={};4a.fc.1y=4H[\'7T\'];F.fa=1k}I rT(2k){if(2d 1u.1f===\'1R\')J 1t;if(!jX)J 1t;M 2q=1u.1f.1y;if(2q){M id=\'9w\'+(2T.lw()+\'\').2g(2),el=1o.4x(2k);2q[id]=\'x\';M 7w=(el[id]!==\'x\');3q 2q[id];el=1r;J 7w}J 1t}M rS=rT(\'1m\');I he(L,2K){1w(M 2n in 2K){M U=2K[2n];if(1c.2z(U)&&!(2n in L))L[2n]=U.8M()}}M k2={};I mW(L){M 2p=7y(L);J(2p in k2)}I 1O(L){if(!L||mW(L))J L;if(L.2Q!==82.d8||L==1u)J L;M 2K=1c.3Z(2N),2k=L.2k.7D();if(7B[2k])1c.1O(2K,7B[2k]);he(L,2K);k2[7y(L)]=1k;J L}I uw(L){if(!L||mW(L))J L;M t=L.2k;if(t&&(/^(?:1m|DW|E4)$/i.2Z(t))){he(L,1f.2N);he(L,1f.2N.cY);he(L,1f.2N.7B[t.7D()])}J L}if(F.k7){1O=rS?uw:1T.K}I nY(2k,2K){2k=2k.7D();if(!7B[2k])7B[2k]={};1c.1O(7B[2k],2K)}I k9(d6,2K,k8){if(1c.3n(k8))k8=1t;1w(M 2n in 2K){M U=2K[2n];if(!1c.2z(U))6i;if(!k8||!(2n in d6))d6[2n]=U.8M()}}I wL(2k){M 4t;M mU={"G3":"F6","wR":"F2","P":"EU","Aw":"FO","FN":"En","IC":"zZ","DL":"Cm","EV":"EA","H1":"d5","H2":"d5","H3":"d5","H4":"d5","H5":"d5","H6":"d5","Q":"GQ","Gw":"yK","Gz":"yK","A":"I1","HN":"EQ","DV":"DU","DH":"yI","DI":"yI","yJ":"mS","yH":"mS","k6":"mS","yL":"Fi","yF":"wN","mT":"wN","Fh":"Fq","Fn":"EZ"};if(mU[2k])4t=\'fg\'+mU[2k]+\'1f\';if(1u[4t])J 1u[4t];4t=\'fg\'+2k+\'1f\';if(1u[4t])J 1u[4t];4t=\'fg\'+2k.h9()+\'1f\';if(1u[4t])J 1u[4t];M L=1o.4x(2k),2q=L[\'7T\']||L.4E.1y;L=1r;J 2q}I 5Q(2K){if(1L.Y===0)wP();if(1L.Y===2){M 2k=2K;2K=1L[1]}if(!2k){1c.1O(1f.2N,2K||{})}1h{if(1c.5J(2k)){1w(M i=0,4y;4y=2k[i];i++)nY(4y,2K)}1h{nY(2k,2K)}}M mV=1u.fc?fc.1y:1f.1y;if(F.fa){k9(mV,1f.2N);k9(mV,1f.2N.cY,1k)}if(F.k7){1w(M 4y in 1f.2N.7B){M 4t=wL(4y);if(1c.3n(4t))6i;k9(4t.1y,7B[4y])}}1c.1O(1f,1f.2N);1c.1O(1f,1f.2N.cY);3q 1f.7B;3q 1f.cY;1f.1O.jR();d7={}}1c.1O(4a.1f,{1O:1O,5Q:5Q});if(1O===1T.K){4a.1f.1O.jR=1T.8D}1h{4a.1f.1O.jR=I(){if(1T.fs.fa)J;1c.1O(2N,1f.2N);1c.1O(2N,1f.2N.cY);k2={}}}I wP(){1c.1O(3H,3H.2N);1c.1O(3H.1f,3H.1f.2N);1c.1O(1f.2N.7B,{"F4":1c.3Z(3H.2N),"Fu":1c.3Z(3H.1f.2N),"wS":1c.3Z(3H.1f.2N),"wR":1c.3Z(3H.1f.2N),"FP":1c.3Z(3H.1f.2N)})}1f.5Q(2K);I iO(){4H=1r;d7=1r}if(1u.7n)1u.7n(\'iR\',iO)})(N);(I(){I wA(wQ){M 1n=wQ.1n(/^(\\d+)%?$/i);if(!1n)J 1r;J(4Z(1n[1])/kW)}I kn(L,1N){L=$(L);M U=L.1N[1N];if(!U||U===\'fo\'){M 9t=1o.nz.wK(L,1r);U=9t?9t[1N]:1r}if(1N===\'6y\')J U?9L(U):1.0;J U===\'fo\'?1r:U}I wD(L,1N){M U=L.1N[1N];if(!U&&L.9m){U=L.9m[1N]}J U}I mP(L,1i){M wJ=L.8t;M bl=6g(L,\'w4\',1i)||0;M br=6g(L,\'w8\',1i)||0;M pl=6g(L,\'w6\',1i)||0;M pr=6g(L,\'w5\',1i)||0;J wJ-bl-br-pl-pr}if(!1c.3n(1o.3h.9m)&&!1T.6W.eb){kn=wD}I 6g(U,2n,1i){M L=1r;if(1c.8S(U)){L=U;U=kn(L,2n)}if(U===1r||1c.3n(U)){J 1r}if((/^(?:-)?\\d+(\\.\\d+)?(px)?$/i).2Z(U)){J 1u.9L(U)}M mR=U.3j(\'%\'),wC=(1i===1o.aS);if(/\\d/.2Z(U)&&L&&L.jZ&&!(mR&&wC)){M 1N=L.1N.2s,wB=L.jZ.2s;L.jZ.2s=L.9m.2s;L.1N.2s=U||0;U=L.1N.FG;L.1N.2s=1N;L.jZ.2s=wB;J U}if(L&&mR){1i=1i||L.2E;M wE=wA(U),cy=1r;M mQ=2n.3j(\'2s\')||2n.3j(\'4k\')||2n.3j(\'2D\');M mK=2n.3j(\'2M\')||2n.3j(\'4C\')||2n.3j(\'2O\');if(1i===1o.aS){if(mQ){cy=1o.aS.9A()}1h if(mK){cy=1o.aS.a2()}}1h{if(mQ){cy=$(1i).ar(\'2D\')}1h if(mK){cy=$(1i).ar(\'2O\')}}J(cy===1r)?0:cy*wE}J 0}I DX(4g){if(1c.4N(4g)&&4g.aN(\'px\'))J 4g;J 4g+\'px\'}I wT(L){1M(L&&L.2E){M 4e=L.3M(\'4e\');if(4e===\'86\'){J 1t}L=$(L.2E)}J 1k}M cf=1T.K;if(\'9m\'in 1o.3h){cf=I(L){if(!L.9m.cf){L.1N.wF=1}J L}}I xb(1b){if(1b.3j(\'3u\'))1b=1b+\'-2D\';J 1b.cZ()}1f.7g=3G.2t(6F,{3W:I($7E,L,jK){$7E();N.L=$(L);1f.7g.cl.2S(I(2n){N.nb(2n,1r)},N);if(jK){N.8m=1k;N.dx();1f.7g.cl.2S(N.nf,N);N.aK();N.8m=1t}},nb:I(2n,U){J 6F.1y.1F.1s(N,2n,U)},1F:I(2n,U){2f"cD of 1f.7g l6 fh-iD."},1j:I($7E,2n){M U=$7E(2n);J U===1r?N.nf(2n):U},dx:I(){if(N.xd())J;M L=N.L;if(wT(L)){N.jy(1k);J}M 9F={1X:L.1N.1X||\'\',2D:L.1N.2D||\'\',di:L.1N.di||\'\',4e:L.1N.4e||\'\'};L.7H(\'mO\',9F);M 1X=kn(L,\'1X\'),2D=L.8t;if(2D===0||2D===1r){L.1N.4e=\'gE\';2D=L.8t}M 1i=(1X===\'fM\')?1o.aS:L.2E;M mM={di:\'bb\',4e:\'gE\'};if(1X!==\'fM\')mM.1X=\'7e\';L.5n(mM);M x7=L.8t,fi;if(2D&&(x7===2D)){fi=mP(L,1i)}1h if(1X===\'7e\'||1X===\'fM\'){fi=mP(L,1i)}1h{M 2c=L.2E,x9=$(2c).af();fi=x9.1j(\'2D\')-N.1j(\'4w-2s\')-N.1j(\'3u-2s\')-N.1j(\'3z-2s\')-N.1j(\'3z-4k\')-N.1j(\'3u-4k\')-N.1j(\'4w-4k\')}L.5n({2D:fi+\'px\'});N.jy(1k)},aK:I(){M L=N.L;M 9F=L.dy(\'mO\');L.7H(\'mO\',1r);L.5n(9F);N.jy(1t)},nf:I(2n){M dt=1f.7g.dt;if(!(2n in dt)){2f"DQ 8u cJ."}J N.nb(2n,dt[2n].1s(N,N.L))},xd:I(){J N.L.dy(\'xc\',1t)},jy:I(8N){J N.L.7H(\'xc\',8N)},3B:I(){M 1S=$A(1L);M 2a=(1S.Y===0)?1f.7g.cl:1S.3K(\' \').4K(\' \');M 4R={};2a.2S(I(1b){if(!1f.7g.cl.3j(1b))J;M U=N.1j(1b);if(U!=1r)4R[1b]=U},N);J 4R},EI:I(){M 4R=N.3B.2W(N,1L);J 1p 6F(4R)},EP:I(){M 1S=$A(1L);M 2a=(1S.Y===0)?1f.7g.cl:1S.3K(\' \').4K(\' \');M 9t={};2a.2S(I(1b){if(!1f.7g.cl.3j(1b))J;if(1f.7g.x5.3j(1b))J;M U=N.1j(1b);if(U!=1r)9t[xb(1b)]=U+\'px\'},N);J 9t},3Q:I(){J"#<1f.7g>"}});1c.1O(1f.7g,{cl:$w(\'2O 2D 2M 2s 4k 4C 3u-2s 3u-4k 3u-2M 3u-4C 3z-2s 3z-4k 3z-2M 3z-4C 4w-2M 4w-4C 4w-2s 4w-4k 3z-4v-2D 3z-4v-2O 3u-4v-2D 3u-4v-2O 4w-4v-2D 4w-4v-2O\'),x5:$w(\'3z-4v-2D 3z-4v-2O 4w-4v-2D 4w-4v-2O 3u-4v-2D 3u-4v-2O\'),dt:{\'2O\':I(L){if(!N.8m)N.dx();M dC=N.1j(\'3u-4v-2O\');if(dC<=0){if(!N.8m)N.aK();J 0}M x4=N.1j(\'3u-2M\'),wY=N.1j(\'3u-4C\');M jn=N.1j(\'3z-2M\'),jm=N.1j(\'3z-4C\');if(!N.8m)N.aK();J dC-x4-wY-jn-jm},\'2D\':I(L){if(!N.8m)N.dx();M dr=N.1j(\'3u-4v-2D\');if(dr<=0){if(!N.8m)N.aK();J 0}M wX=N.1j(\'3u-2s\'),wW=N.1j(\'3u-4k\');M jr=N.1j(\'3z-2s\'),jq=N.1j(\'3z-4k\');if(!N.8m)N.aK();J dr-wX-wW-jr-jq},\'3z-4v-2O\':I(L){M 2O=N.1j(\'2O\'),jn=N.1j(\'3z-2M\'),jm=N.1j(\'3z-4C\');J 2O+jn+jm},\'3z-4v-2D\':I(L){M 2D=N.1j(\'2D\'),jr=N.1j(\'3z-2s\'),jq=N.1j(\'3z-4k\');J 2D+jr+jq},\'3u-4v-2O\':I(L){if(!N.8m)N.dx();M 2O=L.bO;if(!N.8m)N.aK();J 2O},\'3u-4v-2D\':I(L){if(!N.8m)N.dx();M 2D=L.8t;if(!N.8m)N.aK();J 2D},\'4w-4v-2O\':I(L){M dC=N.1j(\'3u-4v-2O\'),wZ=N.1j(\'4w-2M\'),x0=N.1j(\'4w-4C\');if(dC<=0)J 0;J dC+wZ+x0},\'4w-4v-2D\':I(L){M dr=N.1j(\'3u-4v-2D\'),x3=N.1j(\'4w-2s\'),x2=N.1j(\'4w-4k\');if(dr<=0)J 0;J dr+x3+x2},\'2M\':I(L){M 3T=L.8H();J 3T.2M},\'4C\':I(L){M 3T=L.8H(),2c=L.7s(),x1=2c.ar(\'2O\');M wz=N.1j(\'3u-4v-2O\');J x1-wz-3T.2M},\'2s\':I(L){M 3T=L.8H();J 3T.2s},\'4k\':I(L){M 3T=L.8H(),2c=L.7s(),wy=2c.ar(\'2D\');M w7=N.1j(\'3u-4v-2D\');J wy-w7-3T.2s},\'3z-2M\':I(L){J 6g(L,\'HJ\')},\'3z-4C\':I(L){J 6g(L,\'Hy\')},\'3z-2s\':I(L){J 6g(L,\'w6\')},\'3z-4k\':I(L){J 6g(L,\'w5\')},\'3u-2M\':I(L){J 6g(L,\'IA\')},\'3u-4C\':I(L){J 6g(L,\'Iw\')},\'3u-2s\':I(L){J 6g(L,\'w4\')},\'3u-4k\':I(L){J 6g(L,\'w8\')},\'4w-2M\':I(L){J 6g(L,\'I9\')},\'4w-4C\':I(L){J 6g(L,\'kO\')},\'4w-2s\':I(L){J 6g(L,\'I7\')},\'4w-4k\':I(L){J 6g(L,\'I5\')}}});if(\'cd\'in 1o.3h){1c.1O(1f.7g.dt,{\'4k\':I(L){M 2c=cf(L.7s());M ba=L.cd(),jL=2c.cd();J(jL.4k-ba.4k).aG()},\'4C\':I(L){M 2c=cf(L.7s());M ba=L.cd(),jL=2c.cd();J(jL.4C-ba.4C).aG()}})}1f.7Z=3G.2t({3W:I(2s,2M){N.2s=2s.aG();N.2M=2M.aG();N[0]=N.2s;N[1]=N.2M},vW:I(3T){J 1p 1f.7Z(N.2s-3T.2s,N.2M-3T.2M)},3Q:I(){J"#<1f.7Z 2s: #{2s} 2M: #{2M}>".dw(N)},3x:I(){J"[#{2s}, #{2M}]".dw(N)},6t:I(){J[N.2s,N.2M]}});I af(L,jK){J 1p 1f.7g(L,jK)}I ar(L,2n){J $(L).af().1j(2n)}I a2(L){J 1f.8V(L).2O}I 9A(L){J 1f.8V(L).2D}I 8V(L){L=$(L);M 4e=1f.3M(L,\'4e\');if(4e&&4e!==\'86\'){J{2D:L.8t,2O:L.bO}}M 1N=L.1N;M 9F={di:1N.di,1X:1N.1X,4e:1N.4e};M mg={di:\'bb\',4e:\'gE\'};if(9F.1X!==\'fM\')mg.1X=\'7e\';1f.5n(L,mg);M fP={2D:L.8t,2O:L.bO};1f.5n(L,9F);J fP}I 7s(L){L=$(L);I mi(L){J hG(L)?$(1o.2Y):$(L)}if(o0(L)||hU(L)||hJ(L)||hG(L))J $(1o.2Y);M wb=(1f.3M(L,\'4e\')===\'mf\');if(!wb&&L.6J)J mi(L.6J);1M((L=L.2E)&&L!==1o.2Y){if(1f.3M(L,\'1X\')!==\'fJ\'){J mi(L)}}J $(1o.2Y)}I 9E(L){L=$(L);M 5E=0,5F=0;if(L.2E){do{5E+=L.eK||0;5F+=L.ep||0;L=L.6J}1M(L)}J 1p 1f.7Z(5F,5E)}I 8H(L){L=$(L);M 9v=L.af();M 5E=0,5F=0;do{5E+=L.eK||0;5F+=L.ep||0;L=L.6J;if(L){if(hJ(L))3A;M p=1f.3M(L,\'1X\');if(p!==\'fJ\')3A}}1M(L);5F-=9v.1j(\'4w-2s\');5E-=9v.1j(\'4w-2M\');J 1p 1f.7Z(5F,5E)}I fz(L){M 5E=0,5F=0;do{if(L===1o.2Y){M mj=1o.3h||1o.2Y.2E||1o.2Y;5E+=!1c.3n(1u.g7)?1u.g7:mj.7c||0;5F+=!1c.3n(1u.e9)?1u.e9:mj.6X||0;3A}1h{5E+=L.7c||0;5F+=L.6X||0;L=L.2E}}1M(L);J 1p 1f.7Z(5F,5E)}I ae(fB){M 5E=0,5F=0,ml=1o.2Y;fB=$(fB);M L=fB;do{5E+=L.eK||0;5F+=L.ep||0;if(L.6J==ml&&1f.3M(L,\'1X\')==\'7e\')3A}1M(L=L.6J);L=fB;do{if(L!=ml){5E-=L.7c||0;5F-=L.6X||0}}1M(L=L.2E);J 1p 1f.7Z(5F,5E)}I g1(L){L=$(L);if(1f.3M(L,\'1X\')===\'7e\'){J L}M 6J=7s(L);M w2=L.ae(),vV=6J.ae();M 3T=w2.vW(vV);M 9v=L.af();L.7H(\'vU\',{1X:L.3M(\'1X\'),2s:L.3M(\'2s\'),2M:L.3M(\'2M\'),2D:L.3M(\'2D\'),2O:L.3M(\'2O\')});L.5n({1X:\'7e\',2M:3T.2M+\'px\',2s:3T.2s+\'px\',2D:9v.1j(\'2D\')+\'px\',2O:9v.1j(\'2O\')+\'px\'});J L}I fO(L){L=$(L);if(1f.3M(L,\'1X\')===\'6z\'){J L}M 9F=L.dy(\'vU\');if(9F)L.5n(9F);J L}I hp(L){L=$(L);M fr=1f.9E(L);1u.hp(fr.2s,fr.2M);J L}I oj(L){L=$(L);M 1X=1f.3M(L,\'1X\'),5x={};if(1X===\'fJ\'||!1X){5x.1X=\'6z\';if(1T.6W.eb){5x.2M=0;5x.2s=0}1f.5n(L,5x);1f.7H(L,\'md\',1k)}J L}I ob(L){L=$(L);M 6O=1f.aC(L),vT=6O.1j(\'md\');if(vT){6O.cg(\'md\');1f.5n(L,{1X:\'\',2M:\'\',4C:\'\',2s:\'\',4k:\'\'})}J L}I oa(L){L=$(L);M 6O=1f.aC(L),vY=6O.1j(\'kC\');if(1c.3n(vY)){M 9Y=1f.3M(L,\'9Y\');6O.1F(\'kC\',9Y);if(9Y!==\'bb\')L.1N.9Y=\'bb\'}J L}I o4(L){L=$(L);M 6O=1f.aC(L),9Y=6O.1j(\'kC\');if(!1c.3n(9Y)){6O.cg(\'kC\');L.1N.9Y=9Y||\'\'}J L}I hD(L,3E,1B){1B=1c.1O({mc:1k,mb:1k,mz:1k,mD:1k,eK:0,ep:0},1B||{});M 6h=1o.3h;3E=$(3E);L=$(L);M p,8A,9v,5x={};if(1B.mc||1B.mb){p=1f.ae(3E);8A=[0,0];if(1f.3M(L,\'1X\')===\'7e\'){M 2c=1f.7s(L);if(2c!==1o.2Y)8A=1f.ae(2c)}}I vZ(){M x=0,y=0;if(1c.a9(1u.e9)){x=1u.e9;y=1u.g7}1h if(1o.2Y&&(1o.2Y.6X||1o.2Y.7c)){x=1o.2Y.6X;y=1o.2Y.7c}1h if(6h&&(6h.6X||6h.7c)){x=6h.6X;y=6h.7c}J{x:x,y:y}}M mn=vZ();if(1B.mz||1B.mD){9v=1f.af(3E)}if(1B.mc)5x.2s=(p[0]+mn.x-8A[0]+1B.ep)+\'px\';if(1B.mb)5x.2M=(p[1]+mn.y-8A[1]+1B.eK)+\'px\';M Hc=L.af();if(1B.mz){5x.2D=9v.1j(\'2D\')+\'px\'}if(1B.mD){5x.2O=9v.1j(\'2O\')+\'px\'}J 1f.5n(L,5x)}if(1T.6W.hv){7s=7s.4T(I(eS,L){L=$(L);if(o0(L)||hU(L)||hJ(L)||hG(L))J $(1o.2Y);M 1X=L.3M(\'1X\');if(1X!==\'fJ\')J eS(L);L.5n({1X:\'6z\'});M U=eS(L);L.5n({1X:1X});J U});8H=8H.4T(I(eS,L){L=$(L);if(!L.2E)J 1p 1f.7Z(0,0);M 1X=L.3M(\'1X\');if(1X!==\'fJ\')J eS(L);M 6J=L.7s();if(6J&&6J.3M(\'1X\')===\'fM\')cf(6J);L.5n({1X:\'6z\'});M U=eS(L);L.5n({1X:1X});J U})}1h if(1T.6W.Hl){9E=I(L){L=$(L);M 5E=0,5F=0;do{5E+=L.eK||0;5F+=L.ep||0;if(L.6J==1o.2Y){if(1f.3M(L,\'1X\')==\'7e\')3A}L=L.6J}1M(L);J 1p 1f.7Z(5F,5E)}}1f.5Q({af:af,ar:ar,9A:9A,a2:a2,8V:8V,7s:7s,9E:9E,8H:8H,fz:fz,ae:ae,g1:g1,fO:fO,hp:hp,oj:oj,ob:ob,oa:oa,o4:o4,hD:hD});I hJ(L){J L.4o.7D()===\'Ai\'}I hG(L){J L.4o.7D()===\'fg\'}I o0(L){J L.2Q===82.wv}I hU(L){J L!==1o.2Y&&!1f.aP(L,1o.2Y)}if(\'cd\'in 1o.3h){1f.5Q({ae:I(L){L=$(L);if(hU(L))J 1p 1f.7Z(0,0);M ba=L.cd(),6h=1o.3h;J 1p 1f.7Z(ba.2s-6h.xu,ba.2M-6h.xv)}})}})();(I(){M wo=1T.6W.eb&&(1u.9L(1u.wp.Ah())<9.5);M fT=1r;I om(){if(fT)J fT;fT=wo?1o.2Y:1o.3h;J fT}I 8V(){J{2D:N.9A(),2O:N.a2()}}I 9A(){J om().A2}I a2(){J om().A1}I oB(){M x=1u.e9||1o.3h.6X||1o.2Y.6X;M y=1u.g7||1o.3h.7c||1o.2Y.7c;J 1p 1f.7Z(x,y)}1o.aS={8V:8V,9A:9A,a2:a2,oB:oB}})();1u.$$=I(){M 3c=$A(1L).3K(\', \');J 1T.4M.2V(3c,1o)};1T.4M=(I(){I 2V(){2f 1p 5q(\'wi "1T.4M.2V" jz be wh.\')}I 1n(){2f 1p 5q(\'wi "1T.4M.1n" jz be wh.\')}I 3S(3f,3c,1l){1l=1l||0;M 1n=1T.4M.1n,Y=3f.Y,kJ=0,i;1w(i=0;i<Y;i++){if(1n(3f[i],3c)&&1l==kJ++){J 1f.1O(3f[i])}}}I dn(3f){1w(M i=0,Y=3f.Y;i<Y;i++){1f.1O(3f[i])}J 3f}M K=1T.K;J{2V:2V,1n:1n,3S:3S,dn:(1f.1O===K)?K:dn,AX:1f.1O}})();1T.qr=1u.3p;(I(){I oA(fn){1T.l5=fn()}oA.l0=1k;if(2d 6j!==\'1R\'&&6j.l0){1T.qh=6j;1T.l5=1r;1u.6j=oA}})();(I(1u){M i,4n,3w,dX,9e,f0,2V,f2,9V,cB,9q,1o,8X,8w,6G,aw,5V,6N,5e="AV"+ -(1p b1()),84=1u.1o,8O=0,5m=0,nP=iT(),lM=iT(),ms=iT(),kg=I(a,b){if(a===b){cB=1k}J 0},ct=2d 1R,nw=1<<31,bt=({}).9f,5u=[],9D=5u.9D,wl=5u.1I,1I=5u.1I,2g=5u.2g,2v=5u.2v||I(1g){M i=0,3r=N.Y;1w(;i<3r;i++){if(N[i]===1g){J i}}J-1},jM="6I|aj|kV|Ba|B8|B5|5D|7W|bb|AT|AG|wg|g5|wf|AJ|AK",4c="[\\\\AQ\\\\t\\\\r\\\\n\\\\f]",cq="(?:\\\\\\\\.|[\\\\w-]|[^\\\\wj-\\\\Bb])+",oC=cq.2i("w","w#"),4d="\\\\["+4c+"*("+cq+")"+4c+"*(?:([*^$|!~]?=)"+4c+"*(?:([\'\\"])((?:\\\\\\\\.|[^\\\\\\\\])*?)\\\\3|("+oC+")|)|)"+4c+"*\\\\]",8r=":("+cq+")(?:\\\\((([\'\\"])((?:\\\\\\\\.|[^\\\\\\\\])*?)\\\\3|((?:\\\\\\\\.|[^\\\\\\\\()[\\\\]]|"+4d.2i(3,8)+")*)|.*)\\\\)|)",fF=1p 2J("^"+4c+"+|((?:^|[^\\\\\\\\])(?:\\\\\\\\.)*)"+4c+"+$","g"),xk=1p 2J("^"+4c+"*,"+4c+"*"),xm=1p 2J("^"+4c+"*([>+~]|"+4c+")"+4c+"*"),yj=1p 2J("="+4c+"*([^\\\\]\'\\"]*?)"+4c+"*\\\\]","g"),yo=1p 2J(8r),xt=1p 2J("^"+oC+"$"),f4={"ID":1p 2J("^#("+cq+")"),"nW":1p 2J("^\\\\.("+cq+")"),"7k":1p 2J("^("+cq.2i("w","w*")+")"),"nH":1p 2J("^"+4d),"oG":1p 2J("^"+8r),"i7":1p 2J("^:(iD|6m|6Z|dT|dT-6Z)-(7N|of-1J)(?:\\\\("+4c+"*(i9|g2|(([+-]|)(\\\\d*)n|)"+4c+"*(?:([+-]|)"+4c+"*(\\\\d+)|))"+4c+"*\\\\)|)","i"),"8N":1p 2J("^(?:"+jM+")$","i"),"xK":1p 2J("^"+4c+"*[>+~]|:(i9|g2|eq|gt|lt|dT|6m|6Z)(?:\\\\("+4c+"*((?:-\\\\d)?\\\\d*)"+4c+"*\\\\)|)(?=[^-]|$)","i")},xj=/^(?:3J|2V|q6|aa)$/i,xr=/^h\\d$/i,er=/^[^{]+\\{\\s*\\[zk \\w/,xe=/^(?:#([\\w-]+)|(\\w+)|\\.([\\w-]+))$/,ke=/[+~]/,xf=/\'|\\\\/g,a4=1p 2J("\\\\\\\\([\\\\da-f]{1,6}"+4c+"?|("+4c+")|.)","ig"),a5=I(9w,oy,wn){M cG="z1"+oy-wm;J cG!==cG||wn?oy:cG<0?2w.7p(cG+wm):2w.7p(cG>>10|zI,cG&zU|zQ)};2r{1I.2W((5u=2g.1s(84.9C)),84.9C);5u[84.9C.Y].2Q}2o(e){1I={2W:5u.Y?I(2x,iW){wl.2W(2x,2g.1s(iW))}:I(2x,iW){M j=2x.Y,i=0;1M((2x[j++]=iW[i++])){}2x.Y=j-1}}}I 3p(2l,1i,1K,3v){M 1n,1g,m,2Q,i,8Z,f7,cH,iX,fW;if((1i?1i.7u||1i:84)!==1o){9q(1i)}1i=1i||1o;1K=1K||[];if(!2l||2d 2l!=="2B"){J 1K}if((2Q=1i.2Q)!==1&&2Q!==9){J[]}if(8w&&!3v){if((1n=xe.b4(2l))){if((m=1n[1])){if(2Q===9){1g=1i.fk(m);if(1g&&1g.2E){if(1g.id===m){1K.1I(1g);J 1K}}1h{J 1K}}1h{if(1i.7u&&(1g=1i.7u.fk(m))&&6N(1i,1g)&&1g.id===m){1K.1I(1g);J 1K}}}1h if(1n[2]){1I.2W(1K,1i.7m(2l));J 1K}1h if((m=1n[3])&&4n.7J&&1i.7J){1I.2W(1K,1i.7J(m));J 1K}}if(4n.y4&&(!6G||!6G.2Z(2l))){cH=f7=5e;iX=1i;fW=2Q===9&&2l;if(2Q===1&&1i.4o.3b()!=="1m"){8Z=f5(2l);if((f7=1i.3m("id"))){cH=f7.2i(xf,"\\\\$&")}1h{1i.8U("id",cH)}cH="[id=\'"+cH+"\'] ";i=8Z.Y;1M(i--){8Z[i]=cH+fj(8Z[i])}iX=ke.2Z(2l)&&kd(1i.2E)||1i;fW=8Z.3K(",")}if(fW){2r{1I.2W(1K,iX.au(fW));J 1K}2o(CR){}nX{if(!f7){1i.iZ("id")}}}}}J 2V(2l.2i(fF,"$1"),1i,1K,3v)}I iT(){M 2a=[];I 4j(1b,U){if(2a.1I(1b+" ")>3w.yv){3q 4j[2a.aW()]}J(4j[1b+" "]=U)}J 4j}I 8f(fn){fn[5e]=1k;J fn}I 2m(fn){M 1v=1o.4x("1v");2r{J!!fn(1v)}2o(e){J 1t}nX{if(1v.2E){1v.2E.8y(1v)}1v=1r}}I jS(ny,3R){M 5u=ny.4K("|"),i=ny.Y;1M(i--){3w.ie[5u[i]]=3R}}I nm(a,b){M 6U=b&&a,6o=6U&&a.2Q===1&&b.2Q===1&&(~b.y9||nw)-(~a.y9||nw);if(6o){J 6o}if(6U){1M((6U=6U.6Y)){if(6U===b){J-1}}}J a?1:-1}I xh(1J){J I(1g){M 1D=1g.4o.3b();J 1D==="3J"&&1g.1J===1J}}I xg(1J){J I(1g){M 1D=1g.4o.3b();J(1D==="3J"||1D==="aa")&&1g.1J===1J}}I bk(fn){J 8f(I(5a){5a=+5a;J 8f(I(3v,5V){M j,5Y=fn([],3v.Y,5a),i=5Y.Y;1M(i--){if(3v[(j=5Y[i])]){3v[j]=!(5V[j]=3v[j])}}})})}I kd(1i){J 1i&&2d 1i.7m!==ct&&1i}4n=3p.4n={};9e=3p.9e=I(1g){M 3h=1g&&(1g.7u||1g).3h;J 3h?3h.4o!=="fg":1t};9q=3p.9q=I(1V){M je,5z=1V?1V.7u||1V:84,2c=5z.nz;if(5z===1o||5z.2Q!==9||!5z.3h){J 1o}1o=5z;8X=5z.3h;8w=!9e(5z);if(2c&&2c!==2c.2M){if(2c.6r){2c.6r("Cw",I(){9q()},1t)}1h if(2c.7n){2c.7n("iR",I(){9q()})}}4n.4d=2m(I(1v){1v.1Z="i";J!1v.3m("1Z")});4n.7m=2m(I(1v){1v.7O(5z.Cs(""));J!1v.7m("*").Y});4n.7J=er.2Z(5z.7J)&&2m(I(1v){1v.7o="<1v 3I=\'a\'></1v><1v 3I=\'a i\'></1v>";1v.4m.1Z="i";J 1v.7J("i").Y===2});4n.qx=2m(I(1v){8X.7O(1v).id=5e;J!5z.y1||!5z.y1(5e).Y});if(4n.qx){3w.3S["ID"]=I(id,1i){if(2d 1i.fk!==ct&&8w){M m=1i.fk(id);J m&&m.2E?[m]:[]}};3w.2U["ID"]=I(id){M iP=id.2i(a4,a5);J I(1g){J 1g.3m("id")===iP}}}1h{3q 3w.3S["ID"];3w.2U["ID"]=I(id){M iP=id.2i(a4,a5);J I(1g){M 1V=2d 1g.cp!==ct&&1g.cp("id");J 1V&&1V.U===iP}}}3w.3S["7k"]=4n.7m?I(4y,1i){if(2d 1i.7m!==ct){J 1i.7m(4y)}}:I(4y,1i){M 1g,9K=[],i=0,1K=1i.7m(4y);if(4y==="*"){1M((1g=1K[i++])){if(1g.2Q===1){9K.1I(1g)}}J 9K}J 1K};3w.3S["nW"]=4n.7J&&I(1Z,1i){if(2d 1i.7J!==ct&&8w){J 1i.7J(1Z)}};aw=[];6G=[];if((4n.y4=er.2Z(5z.au))){2m(I(1v){1v.7o="<2V t=\'\'><g8 aj=\'\'></g8></2V>";if(1v.au("[t^=\'\']").Y){6G.1I("[*^$]="+4c+"*(?:\'\'|\\"\\")")}if(!1v.au("[aj]").Y){6G.1I("\\\\["+4c+"*(?:U|"+jM+")")}if(!1v.au(":6I").Y){6G.1I(":6I")}});2m(I(1v){M 3J=5z.4x("3J");3J.8U("1J","bb");1v.7O(3J).8U("1D","D");if(1v.au("[1D=d]").Y){6G.1I("1D"+4c+"*[*^$|!~]?=")}if(!1v.au(":lo").Y){6G.1I(":lo",":7W")}1v.au("*,:x");6G.1I(",.*:")})}if((4n.np=er.2Z((5V=8X.Dy||8X.Dv||8X.Dw||8X.Dk)))){2m(I(1v){4n.yA=5V.1s(1v,"1v");5V.1s(1v,"[s!=\'\']:x");aw.1I("!=",8r)})}6G=6G.Y&&1p 2J(6G.3K("|"));aw=aw.Y&&1p 2J(aw.3K("|"));je=er.2Z(8X.9d);6N=je||er.2Z(8X.6N)?I(a,b){M nu=a.2Q===9?a.3h:a,8W=b&&b.2E;J a===8W||!!(8W&&8W.2Q===1&&(nu.6N?nu.6N(8W):a.9d&&a.9d(8W)&16))}:I(a,b){if(b){1M((b=b.2E)){if(b===a){J 1k}}}J 1t};kg=je?I(a,b){if(a===b){cB=1k;J 0}M cV=!a.9d-!b.9d;if(cV){J cV}cV=(a.7u||a)===(b.7u||b)?a.9d(b):1;if(cV&1||(!4n.xJ&&b.9d(a)===cV)){if(a===5z||a.7u===84&&6N(84,a)){J-1}if(b===5z||b.7u===84&&6N(84,b)){J 1}J 9V?(2v.1s(9V,a)-2v.1s(9V,b)):0}J cV&4?-1:1}:I(a,b){if(a===b){cB=1k;J 0}M 6U,i=0,jc=a.2E,8W=b.2E,ap=[a],bp=[b];if(!jc||!8W){J a===5z?-1:b===5z?1:jc?-1:8W?1:9V?(2v.1s(9V,a)-2v.1s(9V,b)):0}1h if(jc===8W){J nm(a,b)}6U=a;1M((6U=6U.2E)){ap.bY(6U)}6U=b;1M((6U=6U.2E)){bp.bY(6U)}1M(ap[i]===bp[i]){i++}J i?nm(ap[i],bp[i]):ap[i]===84?-1:bp[i]===84?1:0};J 5z};3p.5V=I(7l,3f){J 3p(7l,1r,1r,3f)};3p.np=I(1g,7l){if((1g.7u||1g)!==1o){9q(1g)}7l=7l.2i(yj,"=\'$1\']");if(4n.np&&8w&&(!aw||!aw.2Z(7l))&&(!6G||!6G.2Z(7l))){2r{M 6q=5V.1s(1g,7l);if(6q||4n.yA||1g.1o&&1g.1o.2Q!==11){J 6q}}2o(e){}}J 3p(7l,1o,1r,[1g]).Y>0};3p.6N=I(1i,1g){if((1i.7u||1i)!==1o){9q(1i)}J 6N(1i,1g)};3p.5X=I(1g,1D){if((1g.7u||1g)!==1o){9q(1g)}M fn=3w.ie[1D.3b()],5g=fn&&bt.1s(3w.ie,1D.3b())?fn(1g,1D,!8w):1R;J 5g!==1R?5g:4n.4d||!8w?1g.3m(1D):(5g=1g.cp(1D))&&5g.l8?5g.U:1r};3p.6d=I(yD){2f 1p 5q("Bv 6d, Bi 3c: "+yD)};3p.xF=I(1K){M 1g,nF=[],j=0,i=0;cB=!4n.xM;9V=!4n.xL&&1K.2g(0);1K.kf(kg);if(cB){1M((1g=1K[i++])){if(1g===1K[i]){j=nF.1I(i)}}1M(j--){1K.ey(nF[j],1)}}9V=1r;J 1K};dX=3p.dX=I(1g){M 1V,6q="",i=0,2Q=1g.2Q;if(!2Q){1M((1V=1g[i++])){6q+=dX(1V)}}1h if(2Q===1||2Q===9||2Q===11){if(2d 1g.ht==="2B"){J 1g.ht}1h{1w(1g=1g.4m;1g;1g=1g.6Y){6q+=dX(1g)}}}1h if(2Q===3||2Q===4){J 1g.dz}J 6q};3w=3p.Bd={yv:50,Bt:8f,1n:f4,ie:{},3S:{},6z:{">":{5H:"2E",6m:1k}," ":{5H:"2E"},"+":{5H:"ff",6m:1k},"~":{5H:"ff"}},c5:{"nH":I(1n){1n[1]=1n[1].2i(a4,a5);1n[3]=(1n[4]||1n[5]||"").2i(a4,a5);if(1n[2]==="~="){1n[3]=" "+1n[3]+" "}J 1n.2g(0,4)},"i7":I(1n){1n[1]=1n[1].3b();if(1n[1].2g(0,3)==="dT"){if(!1n[3]){3p.6d(1n[0])}1n[4]=+(1n[4]?1n[5]+(1n[6]||1):2*(1n[3]==="i9"||1n[3]==="g2"));1n[5]=+((1n[7]+1n[8])||1n[3]==="g2")}1h if(1n[3]){3p.6d(1n[0])}J 1n},"oG":I(1n){M eW,bu=!1n[5]&&1n[2];if(f4["i7"].2Z(1n[0])){J 1r}if(1n[3]&&1n[4]!==1R){1n[2]=1n[4]}1h if(bu&&yo.2Z(bu)&&(eW=f5(bu,1k))&&(eW=bu.2v(")",bu.Y-eW)-bu.Y)){1n[0]=1n[0].2g(0,eW);1n[2]=bu.2g(0,eW)}J 1n.2g(0,3)}},2U:{"7k":I(nU){M 4o=nU.2i(a4,a5).3b();J nU==="*"?I(){J 1k}:I(1g){J 1g.4o&&1g.4o.3b()===4o}},"nW":I(1Z){M 3g=nP[1Z+" "];J 3g||(3g=1p 2J("(^|"+4c+")"+1Z+"("+4c+"|$)"))&&nP(1Z,I(1g){J 3g.2Z(2d 1g.1Z==="2B"&&1g.1Z||2d 1g.3m!==ct&&1g.3m("3I")||"")})},"nH":I(1D,8I,5r){J I(1g){M 1A=3p.5X(1g,1D);if(1A==1r){J 8I==="!="}if(!8I){J 1k}1A+="";J 8I==="="?1A===5r:8I==="!="?1A!==5r:8I==="^="?5r&&1A.2v(5r)===0:8I==="*="?5r&&1A.2v(5r)>-1:8I==="$="?5r&&1A.2g(-5r.Y)===5r:8I==="~="?(" "+1A+" ").2v(5r)>-1:8I==="|="?1A===5r||1A.2g(0,5r.Y+1)===5r+"-":1t}},"i7":I(1J,pu,5a,6m,6Z){M nN=1J.2g(0,3)!=="dT",iC=1J.2g(-4)!=="6Z",fX=pu==="of-1J";J 6m===1&&6Z===0?I(1g){J!!1g.2E}:I(1g,1i,3i){M 4j,bh,1V,6o,9N,4p,5H=nN!==iC?"6Y":"ff",2c=1g.2E,1D=fX&&1g.4o.3b(),iG=!3i&&!fX;if(2c){if(nN){1M(5H){1V=1g;1M((1V=1V[5H])){if(fX?1V.4o.3b()===1D:1V.2Q===1){J 1t}}4p=5H=1J==="iD"&&!4p&&"6Y"}J 1k}4p=[iC?2c.4m:2c.Ds];if(iC&&iG){bh=2c[5e]||(2c[5e]={});4j=bh[1J]||[];9N=4j[0]===8O&&4j[1];6o=4j[0]===8O&&4j[2];1V=9N&&2c.9C[9N];1M((1V=++9N&&1V&&1V[5H]||(6o=9N=0)||4p.9D())){if(1V.2Q===1&&++6o&&1V===1g){bh[1J]=[8O,9N,6o];3A}}}1h if(iG&&(4j=(1g[5e]||(1g[5e]={}))[1J])&&4j[0]===8O){6o=4j[1]}1h{1M((1V=++9N&&1V&&1V[5H]||(6o=9N=0)||4p.9D())){if((fX?1V.4o.3b()===1D:1V.2Q===1)&&++6o){if(iG){(1V[5e]||(1V[5e]={}))[1J]=[8O,6o]}if(1V===1g){3A}}}}6o-=6Z;J 6o===6m||(6o%6m===0&&6o/6m>=0)}}},"oG":I(bi,5a){M 1S,fn=3w.8r[bi]||3w.dU[bi.3b()]||3p.6d("xx bi: "+bi);if(fn[5e]){J fn(5a)}if(fn.Y>1){1S=[bi,bi,"",5a];J 3w.dU.9f(bi.3b())?8f(I(3v,5V){M ir,7f=fn(3v,5a),i=7f.Y;1M(i--){ir=2v.1s(3v,7f[i]);3v[ir]=!(5V[ir]=7f[i])}}):I(1g){J fn(1g,0,1S)}}J fn}},8r:{"8u":8f(I(2l){M 3J=[],1K=[],4r=f0(2l.2i(fF,"$1"));J 4r[5e]?8f(I(3v,5V,1i,3i){M 1g,9s=4r(3v,1r,3i,[]),i=3v.Y;1M(i--){if((1g=9s[i])){3v[i]=!(5V[i]=1g)}}}):I(1g,1i,3i){3J[0]=1g;4r(3J,1r,3i,1K);J!1K.9D()}}),"2F":8f(I(2l){J I(1g){J 3p(2l,1g).Y>0}}),"6N":8f(I(5C){J I(1g){J(1g.ht||1g.Ic||dX(1g)).2v(5C)>-1}}),"8n":8f(I(8n){if(!xt.2Z(8n||"")){3p.6d("xx 8n: "+8n)}8n=8n.2i(a4,a5).3b();J I(1g){M en;do{if((en=8w?1g.8n:1g.3m("3i:8n")||1g.3m("8n"))){en=en.3b();J en===8n||en.2v(8n+"-")===0}}1M((1g=1g.2E)&&1g.2Q===1);J 1t}}),"2x":I(1g){M 5I=1u.9R&&1u.9R.5I;J 5I&&5I.2g(1)===1g.id},"cT":I(1g){J 1g===8X},"hz":I(1g){J 1g===1o.Fc&&(!1o.xA||1o.xA())&&!!(1g.1J||1g.9I||~1g.fD)},"lo":I(1g){J 1g.7W===1t},"7W":I(1g){J 1g.7W===1k},"6I":I(1g){M 4o=1g.4o.3b();J(4o==="3J"&&!!1g.6I)||(4o==="g8"&&!!1g.aj)},"aj":I(1g){if(1g.2E){1g.2E.xP}J 1g.aj===1k},"9o":I(1g){1w(1g=1g.4m;1g;1g=1g.6Y){if(1g.2Q<6){J 1t}}J 1k},"2c":I(1g){J!3w.8r["9o"](1g)},"z0":I(1g){J xr.2Z(1g.4o)},"3J":I(1g){J xj.2Z(1g.4o)},"aa":I(1g){M 1D=1g.4o.3b();J 1D==="3J"&&1g.1J==="aa"||1D==="aa"},"5C":I(1g){M 5X;J 1g.4o.3b()==="3J"&&1g.1J==="5C"&&((5X=1g.3m("1J"))==1r||5X.3b()==="5C")},"6m":bk(I(){J[0]}),"6Z":bk(I(5Y,Y){J[Y-1]}),"eq":bk(I(5Y,Y,5a){J[5a<0?5a+Y:5a]}),"i9":bk(I(5Y,Y){M i=0;1w(;i<Y;i+=2){5Y.1I(i)}J 5Y}),"g2":bk(I(5Y,Y){M i=1;1w(;i<Y;i+=2){5Y.1I(i)}J 5Y}),"lt":bk(I(5Y,Y,5a){M i=5a<0?5a+Y:5a;1w(;--i>=0;){5Y.1I(i)}J 5Y}),"gt":bk(I(5Y,Y,5a){M i=5a<0?5a+Y:5a;1w(;++i<Y;){5Y.1I(i)}J 5Y})}};3w.8r["dT"]=3w.8r["eq"];1w(i in{iy:1k,c8:1k,5y:1k,CN:1k,pG:1k}){3w.8r[i]=xh(i)}1w(i in{bz:1k,d4:1k}){3w.8r[i]=xg(i)}I dU(){}dU.1y=3w.zH=3w.8r;3w.dU=1p dU();I f5(2l,lJ){M 7f,1n,3L,1J,6Q,8Z,j8,8g=lM[2l+" "];if(8g){J lJ?0:8g.2g(0)}6Q=2l;8Z=[];j8=3w.c5;1M(6Q){if(!7f||(1n=xk.b4(6Q))){if(1n){6Q=6Q.2g(1n[0].Y)||6Q}8Z.1I((3L=[]))}7f=1t;if((1n=xm.b4(6Q))){7f=1n.aW();3L.1I({U:7f,1J:1n[0].2i(fF," ")});6Q=6Q.2g(7f.Y)}1w(1J in 3w.2U){if((1n=f4[1J].b4(6Q))&&(!j8[1J]||(1n=j8[1J](1n)))){7f=1n.aW();3L.1I({U:7f,1J:1J,5V:1n});6Q=6Q.2g(7f.Y)}}if(!7f){3A}}J lJ?6Q.Y:6Q?3p.6d(2l):lM(2l,8Z).2g(0)}I fj(3L){M i=0,3r=3L.Y,2l="";1w(;i<3r;i++){2l+=3L[i].U}J 2l}I ho(4r,lO,xq){M 5H=lO.5H,jd=xq&&5H==="2E",lW=5m++;J lO.6m?I(1g,1i,3i){1M((1g=1g[5H])){if(1g.2Q===1||jd){J 4r(1g,1i,3i)}}}:I(1g,1i,3i){M fv,bh,iQ=[8O,lW];if(3i){1M((1g=1g[5H])){if(1g.2Q===1||jd){if(4r(1g,1i,3i)){J 1k}}}}1h{1M((1g=1g[5H])){if(1g.2Q===1||jd){bh=1g[5e]||(1g[5e]={});if((fv=bh[5H])&&fv[0]===8O&&fv[1]===lW){J(iQ[2]=fv[2])}1h{bh[5H]=iQ;if((iQ[2]=4r(1g,1i,3i))){J 1k}}}}}}}I kP(8x){J 8x.Y>1?I(1g,1i,3i){M i=8x.Y;1M(i--){if(!8x[i](1g,1i,3i)){J 1t}}J 1k}:8x[0]}I xC(2l,lq,1K){M i=0,3r=lq.Y;1w(;i<3r;i++){3p(2l,lq[i],1K)}J 1K}I g4(9s,3F,2U,1i,3i){M 1g,lh=[],i=0,3r=9s.Y,xp=3F!=1r;1w(;i<3r;i++){if((1g=9s[i])){if(!2U||2U(1g,1i,3i)){lh.1I(1g);if(xp){3F.1I(i)}}}}J lh}I iN(c5,2l,4r,bg,83,xo){if(bg&&!bg[5e]){bg=iN(bg)}if(83&&!83[5e]){83=iN(83,xo)}J 8f(I(3v,1K,1i,3i){M 8C,i,1g,lF=[],iY=[],lP=1K.Y,dK=3v||xC(2l||"*",1i.2Q?[1i]:1i,[]),fN=c5&&(3v||!2l)?g4(dK,lF,c5,1i,3i):dK,6n=4r?83||(3v?c5:lP||bg)?[]:1K:fN;if(4r){4r(fN,6n,1i,3i)}if(bg){8C=g4(6n,iY);bg(8C,[],1i,3i);i=8C.Y;1M(i--){if((1g=8C[i])){6n[iY[i]]=!(fN[iY[i]]=1g)}}}if(3v){if(83||c5){if(83){8C=[];i=6n.Y;1M(i--){if((1g=6n[i])){8C.1I((fN[i]=1g))}}83(1r,(6n=[]),8C,3i)}i=6n.Y;1M(i--){if((1g=6n[i])&&(8C=83?2v.1s(3v,1g):lF[i])>-1){3v[8C]=!(1K[8C]=1g)}}}}1h{6n=g4(6n===1K?6n.ey(lP,6n.Y):6n);if(83){83(1r,1K,6n,3i)}1h{1I.2W(1K,6n)}}})}I k5(3L){M hC,4r,j,3r=3L.Y,hW=3w.6z[3L[0].1J],oH=hW||3w.6z[" "],i=hW?1:0,xW=ho(I(1g){J 1g===hC},oH,1k),xV=ho(I(1g){J 2v.1s(hC,1g)>-1},oH,1k),8x=[I(1g,1i,3i){J(!hW&&(3i||1i!==f2))||((hC=1i).2Q?xW(1g,1i,3i):xV(1g,1i,3i))}];1w(;i<3r;i++){if((4r=3w.6z[3L[i].1J])){8x=[ho(kP(8x),4r)]}1h{4r=3w.2U[3L[i].1J].2W(1r,3L[i].5V);if(4r[5e]){j=++i;1w(;j<3r;j++){if(3w.6z[3L[j].1J]){3A}}J iN(i>1&&kP(8x),i>1&&fj(3L.2g(0,i-1).5o({U:3L[i-2].1J===" "?"*":""})).2i(fF,"$1"),4r,i<j&&k5(3L.2g(i,j)),j<3r&&k5((3L=3L.2g(j))),j<3r&&fj(3L))}8x.1I(4r)}}J kP(8x)}I s7(d2,cL){M k1=cL.Y>0,lC=d2.Y>0,lu=I(3v,1i,3i,1K,dp){M 1g,j,4r,ds=0,i="0",9s=3v&&[],bn=[],lY=f2,dK=3v||lC&&3w.3S["7k"]("*",dp),lN=(8O+=lY==1r?1:2T.lw()||0.1),3r=dK.Y;if(dp){f2=1i!==1o&&1i}1w(;i!==3r&&(1g=dK[i])!=1r;i++){if(lC&&1g){j=0;1M((4r=d2[j++])){if(4r(1g,1i,3i)){1K.1I(1g);3A}}if(dp){8O=lN}}if(k1){if((1g=!4r&&1g)){ds--}if(3v){9s.1I(1g)}}}ds+=i;if(k1&&i!==ds){j=0;1M((4r=cL[j++])){4r(9s,bn,1i,3i)}if(3v){if(ds>0){1M(i--){if(!(9s[i]||bn[i])){bn[i]=9D.1s(1K)}}}bn=g4(bn)}1I.2W(1K,bn);if(dp&&!3v&&bn.Y>0&&(ds+cL.Y)>1){3p.xF(1K)}}if(dp){8O=lN;f2=lY}J 9s};J k1?8f(lu):lu}f0=3p.f0=I(2l,1n){M i,cL=[],d2=[],8g=ms[2l+" "];if(!8g){if(!1n){1n=f5(2l)}i=1n.Y;1M(i--){8g=k5(1n[i]);if(8g[5e]){cL.1I(8g)}1h{d2.1I(8g)}}8g=ms(2l,s7(d2,cL));8g.2l=2l}J 8g};2V=3p.2V=I(2l,1i,1K,3v){M i,3L,ad,1J,3S,ko=2d 2l==="I"&&2l,1n=!3v&&f5((2l=ko.2l||2l));1K=1K||[];if(1n.Y===1){3L=1n[0]=1n[0].2g(0);if(3L.Y>2&&(ad=3L[0]).1J==="ID"&&4n.qx&&1i.2Q===9&&8w&&3w.6z[3L[1].1J]){1i=(3w.3S["ID"](ad.5V[0].2i(a4,a5),1i)||[])[0];if(!1i){J 1K}1h if(ko){1i=1i.2E}2l=2l.2g(3L.aW().U.Y)}i=f4["xK"].2Z(2l)?0:3L.Y;1M(i--){ad=3L[i];if(3w.6z[(1J=ad.1J)]){3A}if((3S=3w.3S[1J])){if((3v=3S(ad.5V[0].2i(a4,a5),ke.2Z(3L[0].1J)&&kd(1i.2E)||1i))){3L.ey(i,1);2l=3v.Y&&fj(3L);if(!2l){1I.2W(1K,3v);J 1K}3A}}}}(ko||f0(2l,1n))(3v,1i,!8w,1K,ke.2Z(2l)&&kd(1i.2E)||1i);J 1K};4n.xL=5e.4K("").kf(kg).3K("")===5e;4n.xM=!!cB;9q();4n.xJ=2m(I(xI){J xI.9d(1o.4x("1v"))&1});if(!2m(I(1v){1v.7o="<a 9I=\'#\'></a>";J 1v.4m.3m("9I")==="#"})){jS("1J|9I|2O|2D",I(1g,1D,9e){if(!9e){J 1g.3m(1D,1D.3b()==="1J"?1:2)}})}if(!4n.4d||!2m(I(1v){1v.7o="<3J/>";1v.4m.8U("U","");J 1v.4m.3m("U")===""})){jS("U",I(1g,1D,9e){if(!9e&&1g.4o.3b()==="3J"){J 1g.jN}})}if(!2m(I(1v){J 1v.3m("7W")==1r})){jS(jM,I(1g,1D,9e){M 5g;if(!9e){J 1g[1D]===1k?1D.3b():(5g=1g.cp(1D))&&5g.l8?5g.U:1r}})}if(2d 6j==="I"&&6j.l0){6j(I(){J 3p})}1h if(2d 1z!=="1R"&&1z.1x){1z.1x=3p}1h{1u.3p=3p}})(1u);(I(){if(2d 3p!==\'1R\'){J}if(2d 6j!==\'1R\'&&6j.l0){1u.3p=1T.l5;1u.6j=1T.qh;3q 1T.l5;3q 1T.qh}1h if(2d 1z!==\'1R\'&&1z.1x){1u.3p=1z.1x;1z.1x={}}})();(I(g0){M dn=1T.4M.dn;I 2V(2l,xE){J dn(g0(2l,xE||1o))}I 1n(L,2l){J g0.5V(2l,[L]).Y==1}1T.4M.g0=g0;1T.4M.2V=2V;1T.4M.1n=1n})(3p);1u.3p=1T.qr;3q 1T.qr;M 3H={d4:I(2P){2P=$(2P);2P.d4();J 2P},xH:I(3f,1B){if(2d 1B!=\'1m\')1B={5I:!!1B};1h if(1c.3n(1B.5I))1B.5I=1k;M 1b,U,qs=1t,bz=1B.bz,kx,g3;if(1B.5I){g3={};kx=I(1A,1b,U){if(1b in 1A){if(!1c.5J(1A[1b]))1A[1b]=[1A[1b]];1A[1b]=1A[1b].5o(U)}1h 1A[1b]=U;J 1A}}1h{g3=\'\';kx=I(1A,1b,2I){if(!1c.5J(2I)){2I=[2I]}if(!2I.Y){J 1A}M xG=gj(1b).8q(/%20/,\'+\');J 1A+(1A?"&":"")+2I.3F(I(U){U=U.8q(/(\\r)?\\n/,\'\\r\\n\');U=gj(U);U=U.8q(/%20/,\'+\');J xG+"="+U}).3K("&")}}J 3f.9H(g3,I(1A,L){if(!L.7W&&L.1D){1b=L.1D;U=$(L).6R();if(U!=1r&&L.1J!=\'5y\'&&(L.1J!=\'bz\'||(!qs&&bz!==1t&&(!bz||1b==bz)&&(qs=1k)))){1A=kx(1A,1b,U)}}J 1A})}};3H.2N={ft:I(2P,1B){J 3H.xH(3H.eO(2P),1B)},eO:I(2P){M 3f=$(2P).7m(\'*\');M L,1K=[],xN=3H.1f.hQ;1w(M i=0;L=3f[i];i++){if(xN[L.2k.3b()])1K.1I(1f.1O(L))}J 1K},Fz:I(2P,kS,1D){2P=$(2P);M kI=2P.7m(\'3J\');if(!kS&&!1D)J $A(kI).3F(1f.1O);1w(M i=0,qg=[],Y=kI.Y;i<Y;i++){M 3J=kI[i];if((kS&&3J.1J!=kS)||(1D&&3J.1D!=1D))6i;qg.1I(1f.1O(3J))}J qg},pU:I(2P){2P=$(2P);3H.eO(2P).4G(\'pU\');J 2P},qb:I(2P){2P=$(2P);3H.eO(2P).4G(\'qb\');J 2P},xO:I(2P){M 3f=$(2P).eO().9T(I(L){J\'bb\'!=L.1J&&!L.7W});M q0=3f.9T(I(L){J L.bA(\'fD\')&&L.fD>=0}).kL(I(L){J L.fD}).6m();J q0?q0:3f.3S(I(L){J/^(?:3J|2V|q6)$/i.2Z(L.2k)})},ES:I(2P){2P=$(2P);M L=2P.xO();if(L)L.xU();J 2P},6H:I(2P,1B){2P=$(2P),1B=1c.3Z(1B||{});M 6k=1B.1C,aY=2P.bP(\'aY\')||\'\';if(aY.ao())aY=1u.9R.9I;1B.1C=2P.ft(1k);if(6k){if(1c.4N(6k))6k=6k.c0();1c.1O(1B.1C,6k)}if(2P.bA(\'2b\')&&!1B.2b)1B.2b=2P.2b;J 1p 3V.9k(aY,1B)}};3H.1f={hz:I(L){$(L).hz();J L},2V:I(L){$(L).2V();J L}};3H.1f.2N={ft:I(L){L=$(L);if(!L.7W&&L.1D){M U=L.6R();if(U!=1R){M 4h={};4h[L.1D]=U;J 1c.8Q(4h)}}J\'\'},6R:I(L){L=$(L);M 2b=L.2k.3b();J 3H.1f.hQ[2b](L)},E6:I(L,U){L=$(L);M 2b=L.2k.3b();3H.1f.hQ[2b](L,U);J L},9Q:I(L){$(L).U=\'\';J L},Ee:I(L){J $(L).U!=\'\'},xU:I(L){L=$(L);2r{L.hz();if(L.2V&&(L.2k.3b()!=\'3J\'||!(/^(?:aa|d4|bz)$/i.2Z(L.1J))))L.2V()}2o(e){}J L},pU:I(L){L=$(L);L.7W=1k;J L},qb:I(L){L=$(L);L.7W=1t;J L}};M DP=3H.1f;M $F=3H.1f.2N.6R;3H.1f.hQ=(I(){I 3J(L,U){6T(L.1J.3b()){2L\'c8\':2L\'iy\':J i0(L,U);f3:J hw(L,U)}}I i0(L,U){if(1c.3n(U))J L.6I?L.U:1r;1h L.6I=!!U}I hw(L,U){if(1c.3n(U))J L.U;1h L.U=U}I 2V(L,U){if(1c.3n(U))J(L.1J===\'2V-xT\'?hr:hq)(L);M 80,hH,xS=!1c.5J(U);1w(M i=0,Y=L.Y;i<Y;i++){80=L.1B[i];hH=N.ew(80);if(xS){if(hH==U){80.aj=1k;J}}1h 80.aj=U.3j(hH)}}I hr(L){M 1l=L.xP;J 1l>=0?ew(L.1B[1l]):1r}I hq(L){M 2I,Y=L.Y;if(!Y)J 1r;1w(M i=0,2I=[];i<Y;i++){M 80=L.1B[i];if(80.aj)2I.1I(ew(80))}J 2I}I ew(80){J 1f.bA(80,\'U\')?80.U:80.5C}J{3J:3J,i0:i0,q6:hw,2V:2V,hr:hr,hq:hq,ew:ew,aa:hw}})();cj.qd=3G.2t(xQ,{3W:I($7E,L,aq,4U){$7E(4U,aq);N.L=$(L);N.b9=N.6R()},q9:I(){M U=N.6R();if(1c.4N(N.b9)&&1c.4N(U)?N.b9!=U:2w(N.b9)!=2w(U)){N.4U(N.L,U);N.b9=U}}});3H.1f.xR=3G.2t(cj.qd,{6R:I(){J 3H.1f.6R(N.L)}});3H.xR=3G.2t(cj.qd,{6R:I(){J 3H.ft(N.L)}});cj.fu=3G.2t({3W:I(L,4U){N.L=$(L);N.4U=4U;N.b9=N.6R();if(N.L.2k.3b()==\'2P\')N.xD();1h N.fE(N.L)},pT:I(){M U=N.6R();if(N.b9!=U){N.4U(N.L,U);N.b9=U}},xD:I(){3H.eO(N.L).2S(N.fE,N)},fE:I(L){if(L.1J){6T(L.1J.3b()){2L\'c8\':2L\'iy\':2A.4F(L,\'xy\',N.pT.3o(N));3A;f3:2A.4F(L,\'Ia\',N.pT.3o(N));3A}}}});3H.1f.fu=3G.2t(cj.fu,{6R:I(){J 3H.1f.6R(N.L)}});3H.fu=3G.2t(cj.fu,{6R:I(){J 3H.ft(N.L)}});(I(4a){M 4H=1o.4x(\'1v\');M 6h=1o.3h;M iM=\'y2\'in 6h&&\'y8\'in 6h;M 2A={Gt:8,Gl:9,Hb:13,GM:27,Ax:37,Ag:38,B1:39,ze:40,yZ:46,yM:36,zJ:35,Dq:33,Bu:34,Ca:45};M fe=I(1G){J 1t};if(1u.7n){if(1u.6r){fe=I(1G){J!(1G 8d 1u.2A)}}1h{fe=I(1G){J 1k}}}M bx;I p9(1G,4s){J 1G.eg?(1G.eg===4s+1):(1G.aa===4s)}M xi={0:1,1:4,2:2};I pe(1G,4s){J 1G.aa===xi[4s]}I xB(1G,4s){6T(4s){2L 0:J 1G.eg==1&&!1G.xs;2L 1:J 1G.eg==2||(1G.eg==1&&1G.xs);2L 2:J 1G.eg==3;f3:J 1t}}if(1u.7n){if(!1u.6r){bx=pe}1h{bx=I(1G,4s){J fe(1G)?pe(1G,4s):p9(1G,4s)}}}1h if(1T.6W.xz){bx=xB}1h{bx=p9}I oM(1G){J bx(1G,0)}I oL(1G){J bx(1G,1)}I oI(1G){J bx(1G,2)}I L(1G){J 1f.1O(oZ(1G))}I oZ(1G){1G=2A.1O(1G);M 1V=1G.2x,1J=1G.1J,cX=1G.cX;if(cX&&cX.2k){if(1J===\'wk\'||1J===\'6d\'||(1J===\'xy\'&&cX.2k.3b()===\'3J\'&&cX.1J===\'iy\'))1V=cX}J 1V.2Q==82.l4?1V.2E:1V}I fG(1G,3c){M L=oZ(1G),2l=1T.4M;if(!3c)J 1f.1O(L);1M(L){if(1c.8S(L)&&2l.1n(L,3c))J 1f.1O(L);L=L.2E}}I cU(1G){J{x:iE(1G),y:iB(1G)}}I iE(1G){M dV=1o.3h,2Y=1o.2Y||{6X:0};J 1G.yt||(1G.B3+(dV.6X||2Y.6X)-(dV.xu||0))}I iB(1G){M dV=1o.3h,2Y=1o.2Y||{7c:0};J 1G.yu||(1G.zf+(dV.7c||2Y.7c)-(dV.xv||0))}I aA(1G){2A.1O(1G);1G.xX();1G.xw();1G.vX=1k}2A.2N={oM:oM,oL:oL,oI:oI,L:L,fG:fG,cU:cU,iE:iE,iB:iB,aA:aA};M 2K=1c.2a(2A.2N).9H({},I(m,1D){m[1D]=2A.2N[1D].8M();J m});if(1u.7n){I ys(1G){M L;6T(1G.1J){2L\'yq\':2L\'pv\':L=1G.Ch;3A;2L\'yk\':2L\'pi\':L=1G.9c;3A;f3:J 1r}J 1f.1O(L)}M yr={xw:I(){N.BZ=1k},xX:I(){N.i8=1t},3Q:I(){J\'[1m 2A]\'}};2A.1O=I(1G,L){if(!1G)J 1t;if(!fe(1G))J 1G;if(1G.xY)J 1G;1G.xY=1T.8D;M cU=2A.cU(1G);1c.1O(1G,{2x:1G.C4||L,yd:ys(1G),yt:cU.x,yu:cU.y});1c.1O(1G,2K);1c.1O(1G,yr);J 1G}}1h{2A.1O=1T.K}if(1u.6r){2A.1y=1u.2A.1y||1o.j2(\'yi\').7T;1c.1O(2A.1y,2K)}M ym={pv:\'yq\',pi:\'yk\'};I j9(2h){J ym[2h]||2h}if(iM)j9=1T.K;I 7y(L){if(L===1u)J 0;if(2d L.al===\'1R\')L.al=1f.bm.ib++;J L.al}I ij(L){if(L===1u)J 0;if(L==1o)J 1;J L.il}if(\'il\'in 4H)7y=ij;I jh(2h){J 2h.3j(\':\')}2A.yf=jh;I j4(L,2p){M ii=4a.2A.4j;if(1c.3n(2p))2p=7y(L);if(!ii[2p])ii[2p]={L:L};J ii[2p]}I ja(L,2p){if(1c.3n(2p))2p=7y(L);3q 4a.2A.4j[2p]}I ic(L,2h,3R){M 5L=j4(L);if(!5L[2h])5L[2h]=[];M 3k=5L[2h];M i=3k.Y;1M(i--)if(3k[i].3R===3R)J 1r;M 2p=7y(L);M 3D=4a.2A.ya(2p,2h,3R);M 1H={3D:3D,3R:3R};3k.1I(1H);J 1H}I pB(L,2h,3R){M 5L=j4(L);M 3k=5L[2h]||[];M i=3k.Y,1H;1M(i--){if(3k[i].3R===3R){1H=3k[i];3A}}if(1H){M 1l=3k.2v(1H);3k.ey(1l,1)}if(3k.Y===0){3q 5L[2h];if(1c.2a(5L).Y===1&&(\'L\'in 5L))ja(L)}J 1H}I 4F(L,2h,3R){L=$(L);M 1H=ic(L,2h,3R);if(1H===1r)J L;M 3D=1H.3D;if(jh(2h))yw(L,2h,3D);1h yp(L,2h,3D);J L}I yp(L,2h,3D){M eI=j9(2h);if(L.6r){L.6r(eI,3D,1t)}1h{L.7n(\'on\'+eI,3D)}}I yw(L,2h,3D){if(L.6r){L.6r(\'pL\',3D,1t)}1h{L.7n(\'pz\',3D);L.7n(\'pn\',3D)}}I 6x(L,2h,3R){L=$(L);M pH=!1c.3n(3R),yC=!1c.3n(2h);if(!yC&&!pH){yE(L);J L}if(!pH){yB(L,2h);J L}M 1H=pB(L,2h,3R);if(!1H)J L;jb(L,2h,1H.3D);J L}I yy(L,2h,3D){M eI=j9(2h);if(L.j6){L.j6(eI,3D,1t)}1h{L.iV(\'on\'+eI,3D)}}I yx(L,2h,3D){if(L.j6){L.j6(\'pL\',3D,1t)}1h{L.iV(\'pz\',3D);L.iV(\'pn\',3D)}}I yE(L){M 2p=7y(L),5L=4a.2A.4j[2p];if(!5L)J;ja(L,2p);M 3k,i;1w(M 2h in 5L){if(2h===\'L\')6i;3k=5L[2h];i=3k.Y;1M(i--)jb(L,2h,3k[i].3D)}}I yB(L,2h){M 5L=j4(L);M 3k=5L[2h];if(3k){3q 5L[2h]}3k=3k||[];M i=3k.Y;1M(i--)jb(L,2h,3k[i].3D);1w(M 1D in 5L){if(1D===\'L\')6i;J}ja(L)}I jb(L,2h,3R){if(jh(2h))yx(L,2h,3R);1h yy(L,2h,3R)}I yz(L){if(L!==1o)J L;if(1o.j2&&!L.y5)J 1o.3h;J L}I 8j(L,2h,5l,ay){L=yz($(L));if(1c.3n(ay))ay=1k;5l=5l||{};M 1G=pm(L,2h,5l,ay);J 2A.1O(1G)}I y7(L,2h,5l,ay){M 1G=1o.j2(\'yi\');1G.Dj(\'pL\',ay,1k);1G.2h=2h;1G.5l=5l;L.y5(1G);J 1G}I y3(L,2h,5l,ay){M 1G=1o.D7();1G.y6=ay?\'pz\':\'pn\';1G.2h=2h;1G.5l=5l;2r{L.pm(1G.y6,1G)}2o(D8){}J 1G}M pm=1o.j2?y7:y3;2A.y0=3G.2t({3W:I(L,2h,2l,4U){N.L=$(L);N.2h=2h;N.2l=2l;N.4U=4U;N.3R=N.xZ.3o(N)},4p:I(){2A.4F(N.L,N.2h,N.3R);J N},aA:I(){2A.6x(N.L,N.2h,N.3R);J N},xZ:I(1G){M L=2A.fG(1G,N.2l);if(L)N.4U.1s(N.L,1G,L)}});I on(L,2h,2l,4U){L=$(L);if(1c.2z(2l)&&1c.3n(4U)){4U=2l,2l=1r}J 1p 2A.y0(L,2h,2l,4U).4p()}1c.1O(2A,2A.2N);1c.1O(2A,{8j:8j,4F:4F,6x:6x,on:on});1f.5Q({8j:8j,4F:4F,6x:6x,on:on});1c.1O(1o,{8j:8j.8M(),4F:4F.8M(),6x:6x.8M(),on:on.8M(),dG:1t});if(4a.2A)1c.1O(1u.2A,2A);1h 4a.2A=2A;4a.2A.4j={};I iO(){4a.2A.4j=1r}if(1u.7n)1u.7n(\'iR\',iO);4H=1r;6h=1r})(N);(I(4a){M 6h=1o.3h;M iM=\'y2\'in 6h&&\'y8\'in 6h;I yg(2h){J!iM&&(2h===\'pv\'||2h===\'pi\')}I yb(2p,2h,3R){if(2A.yf(2h))J yh(2p,2h,3R);if(yg(2h))J ye(2p,2h,3R);J I(1G){if(!2A.4j)J;M L=2A.4j[2p].L;2A.1O(1G,L);3R.1s(L,1G)}}I yh(2p,2h,3R){J I(1G){M 4j=2A.4j[2p];M L=4j&&4j.L;if(1c.3n(1G.2h))J 1t;if(1G.2h!==2h)J 1t;2A.1O(1G,L);3R.1s(L,1G)}}I ye(2p,2h,3R){J I(1G){M L=2A.4j[2p].L;2A.1O(1G,L);M 2c=1G.yd;1M(2c&&2c!==L){2r{2c=2c.2E}2o(e){2c=L}}if(2c===L)J;3R.1s(L,1G)}}4a.2A.ya=yb;6h=1r})(N);(I(4a){M fS;I dW(){if(1o.dG)J;if(fS)1u.yc(fS);1o.dG=1k;1o.8j(\'hL:dG\')}I oW(){if(1o.6s===\'fY\'){1o.iV(\'ee\',oW);dW()}}I oP(){2r{1o.3h.zs(\'2s\')}2o(e){fS=oP.5D();J}dW()}if(1o.6s===\'fY\'){dW();J}if(1o.6r){1o.6r(\'zO\',dW,1t)}1h{1o.7n(\'ee\',oW);if(1u==2M)fS=oP.5D()}2A.4F(1u,\'wk\',dW)})(N);1f.5Q();6F.8Q=1c.8Q;M z7={4e:1f.hu};1f.5Q({z8:1f.2N.aP});M AU={A9:I(L,2e){J 1f.5K(L,{cr:2e})},A7:I(L,2e){J 1f.5K(L,{2M:2e})},A0:I(L,2e){J 1f.5K(L,{4C:2e})},A4:I(L,2e){J 1f.5K(L,{cN:2e})}};M $6i=1p 5q(\'"2f $6i" is At, 3N "J" Av\');M qv={yG:1t,qq:I(){N.wx=1u.e9||1o.3h.6X||1o.2Y.6X||0;N.wu=1u.g7||1o.3h.7c||1o.2Y.7c||0},pZ:I(L,x,y){if(N.yG)J N.ww(L,x,y);N.g6=x;N.g9=y;N.3T=1f.9E(L);J(y>=N.3T[1]&&y<N.3T[1]+L.bO&&x>=N.3T[0]&&x<N.3T[0]+L.8t)},ww:I(L,x,y){M pS=1f.fz(L);N.g6=x+pS[0]-N.wx;N.g9=y+pS[1]-N.wu;N.3T=1f.9E(L);J(N.g9>=N.3T[1]&&N.g9<N.3T[1]+L.bO&&N.g6>=N.3T[0]&&N.g6<N.3T[0]+L.8t)},DD:I(hF,L){if(!hF)J 0;if(hF==\'GY\')J((N.3T[1]+L.bO)-N.g9)/L.bO;if(hF==\'H7\')J((N.3T[0]+L.8t)-N.g6)/L.8t},9E:1f.2N.9E,8H:1f.2N.8H,g1:I(L){qv.qq();J 1f.g1(L)},fO:I(L){qv.qq();J 1f.fO(L)},GS:1f.2N.fz,6J:1f.2N.7s,sn:1f.2N.ae,3Z:I(3E,2x,1B){1B=1B||{};J 1f.hD(2x,3E,1B)}};if(!1o.7J)1o.7J=I(wt){I 1Q(1D){J 1D.ao()?1r:"[6N(5o(\' \', @3I, \' \'), \' "+1D+" \')]"}wt.7J=1T.fs.wq?I(L,1Z){1Z=1Z.3x().8F();M qo=/\\s/.2Z(1Z)?$w(1Z).3F(1Q).3K(\'\'):1Q(1Z);J qo?1o.H9(\'.//*\'+qo,L):[]}:I(L,1Z){1Z=1Z.3x().8F();M 3f=[],c6=(/\\s/.2Z(1Z)?$w(1Z):1r);if(!c6&&!1Z)J 3f;M eQ=$(L).7m(\'*\');1Z=\' \'+1Z+\' \';1w(M i=0,7N,cn;7N=eQ[i];i++){if(7N.1Z&&(cn=\' \'+7N.1Z+\' \')&&(cn.3j(1Z)||(c6&&c6.9h(I(1D){J!1D.3x().ao()&&cn.3j(\' \'+1D+\' \')}))))3f.1I(1f.1O(7N))}J 3f};J I(1Z,wr){J $(wr||1o.2Y).7J(1Z)}}(1f.2N);1f.kR=3G.2t();1f.kR.1y={3W:I(L){N.L=$(L)},6p:I(1E,1i){N.L.1Z.4K(/\\s+/).2V(I(1D){J 1D.Y>0}).6p(1E,1i)},1F:I(1Z){N.L.1Z=1Z},cm:I(qp){if(N.3j(qp))J;N.1F($A(N).5o(qp).3K(\' \'))},aH:I(qn){if(!N.3j(qn))J;N.1F($A(N).8J(qn).3K(\' \'))},3x:I(){J $A(N).3K(\' \')}};1c.1O(1f.kR.1y,aV);(I(){1u.4M=3G.2t({3W:I(3c){N.3c=3c.8F()},Hn:I(ws){J 1T.4M.2V(N.3c,ws)},1n:I(L){J 1T.4M.1n(L,N.3c)},3x:I(){J N.3c},3Q:I(){J"#<4M: "+N.3c+">"}});1c.1O(4M,{Hi:I(3f,3c){M 1n=1T.4M.1n,1K=[];1w(M i=0,Y=3f.Y;i<Y;i++){M L=3f[i];if(1n(L,3c)){1K.1I(1f.1O(L))}}J 1K},fG:I(3f,3c,1l){1l=1l||0;M kJ=0,L;1w(M i=0,Y=3f.Y;i<Y;i++){L=3f[i];if(1T.4M.1n(L,3c)&&1l===kJ++){J 1f.1O(L)}}},Hh:I(L,eC){M 2l=eC.6t().3K(\', \');J 1T.4M.2V(2l,L||1o)}})})();if(2d(we)==\'1R\')we={};M $fH=I(fH){J 2d(fH)==\'I\'?fH:I(){J fH}};M $U=I(U){J 2d(U)==\'I\'?U():U};1c.2A={1O:I(1m){1m.aE=I(3a){N.5Z=N.5Z||{};N.5Z[3a]=N.5Z[3a]||[]};1m.4F=I(3a,bZ){if(2d(3a)==\'2B\'&&2d(bZ)!=\'1R\'){N.aE(3a);if(!N.5Z[3a].3j(bZ))N.5Z[3a].1I(bZ)}1h{1w(M e in 3a)N.4F(e,3a[e])}};1m.6x=I(3a,bZ){N.aE(3a);if(3a&&bZ)N.5Z[3a]=N.5Z[3a].8J(bZ);1h if(3a)N.5Z[3a]=[];1h N.5Z={}};1m.bT=I(3a,wd){M q3=I(){wd.2W(N,1L);N.6x(3a,q3)}.3o(N);N.aE(3a);N.5Z[3a].1I(q3)};1m.aM=I(3a){N.aE(3a);M bR=[];M 1S=$A(1L).2g(1);2r{1w(M i=0;i<N.5Z[3a].Y;++i)bR.1I(N.5Z[3a][i].2W(N.5Z[3a][i],1S)||1r)}2o(e){if(e==$3A)J 1t;1h 2f e}J bR};if(1m.1y){1m.1y.aE=1m.aE;1m.1y.4F=1m.4F;1m.1y.6x=1m.6x;1m.1y.bT=1m.bT;1m.1y.aM=I(3a){if(1m.aM){M 1S=$A(1L).2g(1);1S.bY(N);1S.bY(3a);1m.aM.2W(1m,1S)}N.aE(3a);M 1S=$A(1L).2g(1);M bR=[];2r{if(N.1B&&N.1B[3a]&&2d(N.1B[3a])==\'I\')bR.1I(N.1B[3a].2W(N,1S)||1r);1w(M i=0;i<N.5Z[3a].Y;++i)bR.1I(N.5Z[3a][i].2W(N.5Z[3a][i],1S)||1r)}2o(e){if(e==$3A)J 1t;1h 2f e}J bR}}}};(I(){I bT(1o,3a,kG){M d0=I(){kG.2W(N,1L);1f.6x(1o,3a,d0)};1f.4F(1o,3a,d0)}1c.1O(1o,{bT:bT.8M()})})();1f.5Q({bT:I(L,3a,kG){M d0=I(){kG.2W(N,1L);1f.6x(L,3a,d0)};1f.4F(L,3a,d0)}});(I(){I l7(1G){M 8A,L,pV;if(1G.w0){8A=1G.w0/ Gi} 1h if (1G.w1) {              8A =- 1G.w1 /3}if(!8A){J}L=2A.1O(1G).2x;L=1f.1O(L.2Q===82.l4?L.2E:L);2r{pV=L.8j(\'Gm:l7\',{8A:8A});if(pV.vX){2A.aA(1G);J 1t}}2o(e){J 1t}}1o.4F(\'G9\',l7);1o.4F(\'G8\',l7)})();M Gb=3G.2t({3W:I(){N.L=1p 1f(\'bK\',{1N:\'1X:7e;2U:Gf:Gu.w3.Gs(6y=0);4e:86\',5w:\'eB:wa(0);\',Gy:0});$(1o.2Y).5K(N.L)},3C:I(){N.L.3C();J N},aX:I(){N.L.aX();J N},Gx:I(L){M L=$(L);M 3T=L.9E();M fP=L.8V();N.L.5n({2s:3T[0]+\'px\',2M:3T[1]+\'px\',2D:fP.2D+\'px\',2O:fP.2O+\'px\',wc:L.3M(\'wc\')-1}).aX();J N},Hr:I(jI){1w(w9 in jI)jI[w9]+=\'px\';N.L.5n(jI);J N},Ih:I(){if(N.L)N.L.aH();J N}});$$dA={jp:1p 6F(),pJ:1p 6F()};3G.2t=I(){M 2c=1r,2R=$A(1L),$$1Z=1r,7q=[];1w(M i=0;i<2R.Y;i++){if(1c.4N(2R[i])){$$1Z=2R[i];2R=2R.8J(2R[i])}if(1c.2z(2R[i])){2c=2R[i];2R=2R.8J(2R[i])}if(2d(2R[i])=="1m"&&2R[i].7r){if(1c.4N(2R[i].7r)){2R[i].7r=[2R[i].7r]}7q=7q.5o(2R[i].7r)}}if(2c&&2c.7r){7q=7q.5o(2c.7r)}I 6c(){N.Ii=$$1Z;N.3W.2W(N,1L);if(7q.Y){N.7r=7q}}1c.1O(6c,3G.2N);1c.2A.1O(6c);6c.fU=2c;6c.de=[];if(2c){M a0=I(){};a0.1y=2c.1y;6c.1y=1p a0;2c.de.1I(6c)}1w(i=0;i<2R.Y;i++)6c.5Q(2R[i]);if(7q.Y){6c.7r=7q;1w(M j=0;j<7q.Y;j++){M pa=$$dA.pJ.1j(7q[j]);M 4b;if(!pa){4b="Ik to an I6 jv \'"+7q[j]+"\' in 3I \'"+$$1Z+"\'";7z(4b);2f 1p 5q(4b)}1w(M pw in pa.1y){if(!6c.1y[pw]){4b="I4, kr 3I \'"+$$1Z+"\' jz HU 9h 2b of jv \'"+7q[j]+"\'. wV 2b \'"+pw+"\' is HR!";7z(4b);2f 1p 5q(4b)}}}}if(!6c.1y.3W)6c.1y.3W=1T.8D;6c.1y.4E=6c;if($$1Z){$$dA.jp.1F($$1Z,6c);1u[$$1Z]=6c}J 6c};3G.I2=I(1Z){J $$dA.jp.1j(1Z)};3G.G7=I(ju){M cJ=[];M 4R=$$dA.jp.3B();1w(M 1b in 4R){if(4R.9f(1b)&&4R[1b].7r&&$A(4R[1b].7r).3S(I(U){J(U==ju)})){cJ.1I(1b)}}J cJ};3G.Er=I(ps,ju){J ps.7r&&$A(ps.7r).3S(I(U){J(U==ju)})};M EK=(I(){I 2t(){M 2c=1r,2R=$A(1L),$$1Z=1r;1w(M i=0;i<2R.Y;i++){if(1c.4N(2R[i])){$$1Z=2R[i];2R=2R.8J(2R[i])}1h if(1c.2z(2R[i])){2c=2R[i];2R=2R.8J(2R[i])}}if(!$$1Z){2f 1p 5q("pO jz 1F an jv 1D!")}I 87(){2f 1p 5q("kq ED an jv ("+$$1Z+")!")}1c.1O(87,3G.2N);87.fU=2c;87.de=[];if(2c){M a0=I(){};a0.1y=2c.1y;87.1y=1p a0;2c.de.1I(87)}1w(i=0;i<2R.Y;i++)87.5Q(2R[i]);87.1y.4E=87;$$dA.pJ.1F($$1Z,87);1u[$$1Z]=87;J 87}J{2t:2t,2N:{5Q:3G.2N.5Q}}})();\'3N 3Y\';I xa(dF,9l){if(!(dF 8d 9l)){2f 1p 4P(\'kq 1s a 3I as a I\')}}M 1q=(I(){I 1q(){xa(N,1q)}1q.qk=I qk(s){J 1q.kZ(1q.aD(1q.bV(s),s.Y*1q.7R))};1q.x6=I x6(s){J 1q.kt(1q.aD(1q.bV(s),s.Y*1q.7R))};1q.x8=I x8(s){J 1q.kB(1q.aD(1q.bV(s),s.Y*1q.7R))};1q.wU=I wU(1b,3s){J 1q.kZ(1q.gz(1b,3s))};1q.wG=I wG(1b,3s){J 1q.kt(1q.gz(1b,3s))};1q.wH=I wH(1b,3s){J 1q.kB(1q.gz(1b,3s))};1q.wI=I wI(3s){M fl="sv+/=";M o1,o2,o3,h1,h2,h3,h4,d9,i=0,ac=0,8h,p2=[];if(!3s){J 3s}3s=1q.p0(3s+\'\');do{o1=3s.7U(i++);o2=3s.7U(i++);o3=3s.7U(i++);d9=o1<<16|o2<<8|o3;h1=d9>>18&k0;h2=d9>>12&k0;h3=d9>>6&k0;h4=d9&k0;p2[ac++]=fl.ak(h1)+fl.ak(h2)+fl.ak(h3)+fl.ak(h4)}1M(i<3s.Y);8h=p2.3K(\'\');6T(3s.Y%3){2L 1:8h=8h.2g(0,-2)+\'==\';3A;2L 2:8h=8h.2g(0,-1)+\'=\';3A}J 8h};1q.p0=I p0(2B){2B=(2B+\'\').2i(/\\r\\n/g,"\\n").2i(/\\r/g,"\\n");M f9="";M 4p,4u;M p3;4p=4u=0;p3=2B.Y;1w(M n=0;n<p3;n++){M c1=2B.7U(n);M 8h=1r;if(c1<gM){4u++}1h if(c1>wO&&c1<F7){8h=2w.7p(c1>>6|F8)+2w.7p(c1&63|gM)}1h{8h=2w.7p(c1>>12|F9)+2w.7p(c1>>6&63|gM)+2w.7p(c1&63|gM)}if(8h!=1r){if(4u>4p){f9+=2B.gq(4p,4u)}f9+=8h;4p=4u=n+1}}if(4u>4p){f9+=2B.gq(4p,2B.Y)}J f9};1q.wM=I wM(){J 1q.qk("EX")=="F0"};1q.aD=I aD(x,3r){x[3r>>5]|=Fj<<3r%32;x[(3r+64>>>9<<4)+14]=3r;M a=ET;M b=-Ak;M c=-G0;M d=G1;1w(M i=0;i<x.Y;i+=16){M rJ=a;M rG=b;M rB=c;M rC=d;a=1q.5S(a,b,c,d,x[i+0],7,-FB);d=1q.5S(d,a,b,c,x[i+1],12,-DO);c=1q.5S(c,d,a,b,x[i+2],17,DT);b=1q.5S(b,c,d,a,x[i+3],22,-Ev);a=1q.5S(a,b,c,d,x[i+4],7,-HA);d=1q.5S(d,a,b,c,x[i+5],12,Ip);c=1q.5S(c,d,a,b,x[i+6],17,-Iu);b=1q.5S(b,c,d,a,x[i+7],22,-Iv);a=1q.5S(a,b,c,d,x[i+8],7,Gv);d=1q.5S(d,a,b,c,x[i+9],12,-yT);c=1q.5S(c,d,a,b,x[i+10],17,-yV);b=1q.5S(b,c,d,a,x[i+11],22,-zP);a=1q.5S(a,b,c,d,x[i+12],7,zS);d=1q.5S(d,a,b,c,x[i+13],12,-CQ);c=1q.5S(c,d,a,b,x[i+14],17,-Ez);b=1q.5S(b,c,d,a,x[i+15],22,zN);a=1q.5T(a,b,c,d,x[i+1],5,-C0);d=1q.5T(d,a,b,c,x[i+6],9,-C2);c=1q.5T(c,d,a,b,x[i+11],14,C3);b=1q.5T(b,c,d,a,x[i+0],20,-BY);a=1q.5T(a,b,c,d,x[i+5],5,-BP);d=1q.5T(d,a,b,c,x[i+10],9,Cl);c=1q.5T(c,d,a,b,x[i+15],14,-Df);b=1q.5T(b,c,d,a,x[i+4],20,-Dd);a=1q.5T(a,b,c,d,x[i+9],5,Da);d=1q.5T(d,a,b,c,x[i+14],9,-Dm);c=1q.5T(c,d,a,b,x[i+3],14,-Dr);b=1q.5T(b,c,d,a,x[i+8],20,zC);a=1q.5T(a,b,c,d,x[i+13],5,-zp);d=1q.5T(d,a,b,c,x[i+2],9,-zF);c=1q.5T(c,d,a,b,x[i+7],14,zX);b=1q.5T(b,c,d,a,x[i+12],20,-z4);a=1q.5O(a,b,c,d,x[i+5],4,-AC);d=1q.5O(d,a,b,c,x[i+8],11,-AF);c=1q.5O(c,d,a,b,x[i+11],16,Ab);b=1q.5O(b,c,d,a,x[i+14],23,-Ay);a=1q.5O(a,b,c,d,x[i+1],4,-Hm);d=1q.5O(d,a,b,c,x[i+4],11,Hd);c=1q.5O(c,d,a,b,x[i+7],16,-GJ);b=1q.5O(b,c,d,a,x[i+10],23,-Gj);a=1q.5O(a,b,c,d,x[i+13],4,Gh);d=1q.5O(d,a,b,c,x[i+0],11,-Gg);c=1q.5O(c,d,a,b,x[i+3],16,-Ga);b=1q.5O(b,c,d,a,x[i+6],23,Gc);a=1q.5O(a,b,c,d,x[i+9],4,-Ge);d=1q.5O(d,a,b,c,x[i+12],11,-Gr);c=1q.5O(c,d,a,b,x[i+15],16,GH);b=1q.5O(b,c,d,a,x[i+2],23,-Hq);a=1q.5N(a,b,c,d,x[i+0],6,-If);d=1q.5N(d,a,b,c,x[i+7],10,Ix);c=1q.5N(c,d,a,b,x[i+14],15,-Hs);b=1q.5N(b,c,d,a,x[i+5],21,-HK);a=1q.5N(a,b,c,d,x[i+12],6,HW);d=1q.5N(d,a,b,c,x[i+3],10,-I0);c=1q.5N(c,d,a,b,x[i+10],15,-HT);b=1q.5N(b,c,d,a,x[i+1],21,-Ew);a=1q.5N(a,b,c,d,x[i+8],6,Ek);d=1q.5N(d,a,b,c,x[i+15],10,-El);c=1q.5N(c,d,a,b,x[i+6],15,-Ey);b=1q.5N(b,c,d,a,x[i+13],21,Ef);a=1q.5N(a,b,c,d,x[i+4],6,-DS);d=1q.5N(d,a,b,c,x[i+11],10,-DN);c=1q.5N(c,d,a,b,x[i+2],15,DM);b=1q.5N(b,c,d,a,x[i+9],21,-FT);a=1q.9B(a,rJ);b=1q.9B(b,rG);c=1q.9B(c,rB);d=1q.9B(d,rC)}J[a,b,c,d]};1q.dJ=I dJ(q,a,b,x,s,t){J 1q.9B(1q.p1(1q.9B(1q.9B(a,q),1q.9B(x,t)),s),b)};1q.5S=I 5S(a,b,c,d,x,s,t){J 1q.dJ(b&c|~b&d,a,b,x,s,t)};1q.5T=I 5T(a,b,c,d,x,s,t){J 1q.dJ(b&d|c&~d,a,b,x,s,t)};1q.5O=I 5O(a,b,c,d,x,s,t){J 1q.dJ(b^c^d,a,b,x,s,t)};1q.5N=I 5N(a,b,c,d,x,s,t){J 1q.dJ(c^(b|~d),a,b,x,s,t)};1q.gz=I gz(1b,3s){M dO=1q.bV(1b);if(dO.Y>16)dO=1q.aD(dO,1b.Y*1q.7R);M qi=1p 2H(16),qt=1p 2H(16);1w(M i=0;i<16;i++){qi[i]=dO[i]^Fb;qt[i]=dO[i]^EY}M 5I=1q.aD(qi.5o(1q.bV(3s)),s6+3s.Y*1q.7R);J 1q.aD(qt.5o(5I),s6+gM)};1q.9B=I 9B(x,y){M p6=(x&p4)+(y&p4);M sA=(x>>16)+(y>>16)+(p6>>16);J sA<<16|p6&p4};1q.p1=I p1(bU,p7){J bU<<p7|bU>>>32-p7};1q.bV=I bV(3y){M d3=[];M kv=(1<<1q.7R)-1;1w(M i=0;i<3y.Y*1q.7R;i+=1q.7R)d3[i>>5]|=(3y.7U(i/1q.7R)&kv)<<i%32;J d3};1q.kB=I kB(d3){M 3y="";M kv=(1<<1q.7R)-1;1w(M i=0;i<d3.Y*32;i+=1q.7R)3y+=2w.7p(d3[i>>5]>>>i%32&kv);J 3y};1q.kZ=I kZ(9z){M pd=1q.sL?"Fv":"FV";M 3y="";1w(M i=0;i<9z.Y*4;i++){3y+=pd.ak(9z[i>>2]>>i%4*8+4&su)+pd.ak(9z[i>>2]>>i%4*8&su)}J 3y};1q.kt=I kt(9z){M sD="sv+/";M 3y="";1w(M i=0;i<9z.Y*4;i+=3){M sJ=(9z[i>>2]>>8*(i%4)&pb)<<16|(9z[i+1>>2]>>8*((i+1)%4)&pb)<<8|9z[i+2>>2]>>8*((i+2)%4)&pb;1w(M j=0;j<4;j++){if(i*8+j*6>9z.Y*32)3y+=1q.sI;1h 3y+=sD.ak(sJ>>6*(3-j)&FC)}}J 3y};J 1q})();1q.sL=0;1q.sI="";1q.7R=8;M pF=$A();3G.2t("4D",{pf:1t,3W:I(oJ){N.aZ=1u.a6;if(oJ)N.aZ=oJ;N.jw=1u.6A+\'/js\';N.81=1p 6F();N.hc=\'dR\'},sG:I(et,oK){if(N.81.1j(et)&&et.aN(\'[]\')){M eu=N.81.1j(et);if(1c.4N(eu))eu=[eu];eu.1I(oK);N.81.1F(et,eu)}1h{N.81.1F(et,oK)}},uQ:I(sE){N.81=$H(sE)},ER:I(2b){N.hc=2b},pE:I(){if(4D.4V&&N.aZ.2v(\'6V\')==-1&&!N.81.1j(\'6V\')){N.sG(\'6V\',4D.4V)}1h if(N.aZ.2v(\'6V=\')!==-1){M gp=N.aZ.4K(\'6V=\');M oX=gp[1].4K(\'&\');M ad=oX.aW();M oU=oX.3K(\'&\');N.aZ=gp[0]+(oU?\'&\'+oU:\'\');N.81.1F(\'6V\',ad)}},pD:I(){if(N.pf)J;if(!$(\'eX-eU\')&&1u.bq.1C.1j("vh")){M 9i=1p 1f("9i",{id:\'eX-eU\',1N:\'1X:7e;2M:qc;4k:qc;z-1l:Ed;4e:86;\'});M gU=1p 1f("gU",{5w:6A+"/Ec/E9.Ea"});9i.5K(gU);$$(\'2Y\')[0].5K(9i)}if($(\'eX-eU\'))$(\'eX-eU\').aX()},sp:I(){if(N.pf)J;if($(\'eX-eU\'))$(\'eX-eU\').3C()},uM:I(){pF.1I({aY:N.81.1j("sg"),1J:"kV"});N.pE();N.pD();M t=1p 3V.9k(N.aZ,{2b:N.hc,4B:N.pP.3o(N),1C:N.81.3B()});2r{if(1T.6W.pg)t.2y.rp=\'sa-1o\'}2o(e){}},vf:I(){pF.1I({aY:N.81.1j("sg"),1J:"kj"});N.pE();N.pD();1p 3V.9k(N.aZ,{2b:N.hc,eA:1t,4B:N.pP.3o(N),1C:N.81.3B(),so:1k})},pP:I(2y){N.sp();M 4b;M hE;M ph="Eg, it vQ 1U gr EF ad 2F EG! EH %s by EE jR or F5 in gr EB!";M pp="si kr sn";if(1u.8z&&1u.8z[sm]){ph=1u.8z[sm];pp=1u.8z[EJ]}hE=ph.2i("%s","<a 9I=\'eB:1o.9R.si()\' 1N=\'5C-EO: EN;\'>"+pp+"</a>");M 8l=2y.hN();if(1T.6W.hs&&2y.5v&&2y.5v.3h&&2y.5v.3h.4o=="EL"){4b="py 6d : \\n"+2y.5v.3h.4m.ht}1h if(1T.6W.hv&&2y.5v&&2y.5v.pq&&2y.5v.pq.EM!=0){4b="py 5q : \\n"+2y.5v.pq.Em}1h if(8l.2v("5C/3i")>-1&&2y.5v==1r){4b="Eo py 5q!"}1h if(8l.2v("5C/3i")==-1&&8l.2v("b7/3l")==-1&&2y.5j.2v("<b>Eh 6d</b>")>-1){4b=2y.5j.2i("<br />","")}1h if(2y.8i==tH){4b="Ei Ej 5q: vL ve 5r gr bH Ep Eq to 3S pu\'s Eu Es!"}if(4b){if(4b.aT("pO l6 8u pC to qy N pM."))4b=hE;if(5A)5A.q5("q8",4b);1h 7z(4b)}if(2y.5v&&2y.5v.3h){M sM=hh(2y.5v.3h,"Et");if(sM&&5A){M cT=5A.r3.bw();if(cT){5A.r3.HQ(cT);cT.9Q()}4J.8T().qD(\'HS\');4J.8T().qD(\'j1\')}M dZ=hh(2y.5v.3h,"4b");if(dZ){M gG=dZ.3m("1J").7D();M gA=HL.HM(dZ);if(gA=="pO l6 8u pC to qy N pM.")gA=hE;if(5A){5A.q5(gG,gA)}1h{if(gG=="q8"){7z(gG+":"+gA)}}if(gG=="HY")dZ.2E.8y(dZ)}}if(N.4B){N.4B(2y)}1o.8j("5A:rn",N)},HV:I(5y,av,ro,4B,cF,ei,aQ){if(aQ===1R)aQ={};if(!4B)4B=I(){};if(!cF)cF=I(){};if(!ei)ei=I(){};M 5c=N.r6(ro,4B,cF,ei,aQ);if(1u.qV){N.qO(5c,5y,av)}1h if(1u.rb){M oR=1p rb();oR.rd=I(e){N.qm(5c,5y.1D,e.2x.1A,av)}.3o(N);oR.Hx(5y)}1h if(5y.qM){N.qm(5c,5y.1D,5y.qM(),av)}J 5c},r6:I(4Y,4B,cF,ei,aQ){if(aQ===1R)aQ={};M 5c=1p oQ();M iL=5c.iL;if(aQ.rm){5c.rm=1k}iL.6r("Ib",I(e){if(!e.I8)J;ei(e)},1t);5c.ee=I(){if(5c.6s==4){if(5c.8i===qw){4B(5c)}1h{cF(5c)}}}.3o(N);iL.Id=I(){cF(5c)};5c.g5("Ij",4Y,1k);J 5c},qO:I(5c,5y,av){M p5=1p qV();p5.Ie(av,5y);5c.qY(p5)},qm:I(5c,93,qT,av){M gd=\'----GA\'+(1p b1()).GB();5c.qR("ex-gk","GI/2P-3s, gd="+gd);M 2Y="--"+gd+"\\r\\n";2Y+="ex-GG: 2P-3s; 1D=\'"+av+"\'; uP=\'"+GF(gj(93))+"\'\\r\\n";2Y+="ex-gk: b7/GC-GE\\r\\n\\r\\n";2Y+=qT+"\\r\\n";2Y+="--"+gd+"--\\r\\n";5c.Gq(2Y)},pk:I(93,pY,r5){if(1u.bq&&1u.bq.1C.1j("h7")&&93.2v("?")==-1){93+="?v="+1u.bq.1C.1j("h7")}M j3=(N.jw?N.jw+\'/\'+93:93);1p 3V.9k(j3,{2b:\'1j\',eA:(r5?1k:1t),j7:1t,4B:I(2y){if(2y.5j){2r{M 6B=2y.5j;if(1u.ri){1u.ri(6B)}1h{1u.rl=6B;M iI=1o.4x(\'6B\');iI.1J=\'5C/eB\';iI.7o=\'bv(1u.rl)\';1o.7m(\'fZ\')[0].7O(iI)}if(pY!=1r)pY()}2o(e){7z(\'6d uu \'+93+\':\'+e.4b)}}1o.8j("5A:rn")}})}});4D.Gn=I(ia){if(ia==1r||ia.3h==1r)J 1t;M 4l=ia.3h.9C;M gF=[];M 6d=1t;4D.uq=1r;1w(M i=0;i<4l.Y;i++){if(4l[i].2k=="4b"){M q7="Go 4b";if(4l[i].4m)q7=4l[i].4m.dz;4J.q5(4l[i].3m(\'1J\'),q7);if(4l[i].3m(\'1J\')==\'q8\')6d=1k}1h if(4l[i].2k=="Gk"){M 4b=hh(4l[i],"4b").4m.dz;M qA=hh(4l[i],"3s").4m.dz;M 3l=qA.8B();M fV=1p 1f(\'1v\').4L(3l["GK"]);ih.He(ih.qC?ih.qC:1o.2Y,fV,I(){if(3l["e4"]["s9"]){M 6k=$H();$A(3l["e4"]["s9"]).2S(I(qj){6k.1F(qj,fV.9r(\'3J[1D="\'+qj+\'"]\').6R())});M io=1p 4D();io.uQ(6k);if(3l["e4"]["eD"]){io.4B=I(){bv(3l["e4"]["eD"])}}io.uM()}1h{if(3l["e4"]["eD"]){bv(3l["e4"]["eD"])}}J 1k},I(){if(3l["uN"]["eD"]){bv(3l["uN"]["eD"])}J 1k});2f 1p 5q()}1h if(4l[i].2k=="GX"){M pX=4l[i].3m(\'1m\');if(pX==\'3s\'){M 1V=4l[i].3m(\'1V\');if(1V){gF.1I(1V)}1h{M 5y=4l[i].3m(\'5y\');if(5y){4J.pQ().G6(5y)}gF.1I(4J.uW())}}1h if(pX==\'An\'){4J.Ao()}}1h if(4l[i].4o==\'Aj\'){M dm=4J.pQ();M iu=pW(4l[i],"aH/bd");M iq=pW(4l[i],"cm/bd");M iv=pW(4l[i],"4L/bd");if(iu&&iu.Y){iu.2S(I(r){M p=r.3m("uP");M ck=1p hj(p);M n=ck.hk(dm.bw(),1R);if(n){n.uX().8y(n)}})}if(iq&&iq.Y&&dm.iw().ix){iq.2S(I(bd){M 6E=dm.iw().ix(bd);M iz=1p hj(e2(6E.ef()));M 2c=iz.hk(dm.bw(),1R);if(!2c&&e2(6E.ef())=="")2c=dm.bw();if(2c){2c.v3(6E);if(dm.uW()==2c&&!1u.uZ){dm.v1([6E],{})}}})}if(iv&&iv.Y&&dm.iw().ix){iv.2S(I(bd){M 6E=dm.iw().ix(bd);M ea=6E.v4().1j("v5");M ck,n;if(ea&&ea!=6E.ef()&&e2(ea)!=e2(6E.ef())){ck=1p hj(ea);n=ck.hk(dm.bw(),1R);if(n){n.uX().8y(n)}M iz=1p hj(e2(6E.ef()));M 2c=iz.hk(dm.bw(),1R);if(!2c&&e2(6E.ef())=="")2c=dm.bw();if(2c){6E.v4().1F("v5",1R);2c.v3(6E)}}1h{ck=1p hj(ea);n=ck.hk(dm.bw(),1R);if(n){6E.v2=n.v2;n.A6(6E,"A3");if(!1u.uZ)dm.v1([n],{})}}})}}1h if(4l[i].2k=="A8"){if(4l[i].3m("6V")){4D.4V=4l[i].3m("6V");M ik=Ae.Af(1u.a6);M gp=1u.a6.4K("?6V");1u.a6=gp[0]+"?6V="+4D.4V;if(ik)1u.a6+="&ik="+ik;bq.1C.1F(\'6S\',1u.a6)}if($("9Z")&&$("9Z").9r(".iU")){$("9Z").9r(".iU").aH()}M 1A=4l[i].3m(\'U\');M am=1t;if(1A==\'1\'){2r{ih.Ad(1r);Ac(1k);if(4l[i].3m(\'uK\')&&4l[i].3m(\'uv\')){M j1=4l[i].3m(\'uK\');M ux=4l[i].3m(\'uv\');AA(j1,ux)}}2o(e){if(bs)bs.7V(\'5q cN j1, B0 AY 5L uu!\',e)}4J.ut()}1h if(1A==\'0\'||1A==\'-1\'){am=uo}1h if(1A==\'2\'){4J.ut()}1h if(1A==\'-2\'){am=uo}1h if(1A==\'-3\'){am=B2}1h if(1A==\'-4\'){am=B9}if(am){6d=1k;4D.uq=am;if($("9Z")&&$("9Z").ci()&&$("9Z").9r("1v.ur")){$("9Z").9r("1v.ur").5K({4C:\'<1v 3I="iU" 1N="bj-bo: #B6;4e: gE;aR-5W: AS;bo: tx;3u-fp: eo;3z: qc AH;">\'+8z[am]+\'</1v>\'});fm.AI($("9Z").9r(\'.iU\'))}1h{7z(8z[am])}}}}if(gF.Y){4J.pQ().AE(gF)}J!6d};3G.2t("pA",{1C:$H({}),3W:I(uA){N.1C=$H(uA);N.vk();if(N.1C.1j("uH")){1u.bX(I(){7z(N.1C.1j("uH"))}.3o(N),0)}2A.4F(1o,\'hL:dG\',I(){N.ub(N.1C.1j(\'oY\'));M pR=1t;2r{if(1u.hO&&1u.hO.bq&&N.1C.1j(\'pN\')===1u.hO.bq.1C.1j(\'pN\')){N.1C=1u.hO.bq.1C;M hY=1o.9R.9I.c0();if(hY[\'uI\']){N.1C.1F(\'ca\',{1J:hY[\'uI\'],3s:hY})}1h{if(N.1C.1j(\'ca\')){N.1C.cg(\'ca\')}}N.jo(1p 4D());pR=1k}}2o(e){if(1u.bs&&bs.7V)bs.7V(e)}if(!pR){N.vA()}}.3o(N));1o.4F("5A:zL",I(e){M uF=$(N.1C.1j(\'oY\'));M 1B=uF.3m("z6").8B(1t);if(1B.uD&&1B.uD==\'2O\'){M kO=0;if(1B.uE){2r{kO=aI(bv(1B.uE))}2o(e){}}if(1B.ha==\'1u\')1B.ha=1u;1h 1B.ha=$(1B.ha);yP($(N.1C.1j(\'oY\')),1B.ha,kO,1k)}}.3o(N));1o.4F("5A:yO",I(){if(!N.1C.1j("ca")&&4J.8T().kN.1j("gZ")){if(4J.8T().kN.9x){4J.8T().kN.cg("gZ")}1h{4J.8T().kN[\'3q\']("gZ")}4J.8T().yQ();4J.8T().yY()}1h if(N.1C.1j("ca")){4J.8T().vD.1F("5y","gZ")}}.3o(N));1o.4F("5A:dG",I(e){N.u2();if(N.1C.1j("ca")){4J.8T().vD.1F("5y","gZ");4J.8T().zK=1p 6F(N.1C.1j("ca"))}}.3o(N));1u.zG=N},vA:I(){if(N.1C.1j(\'vx\')){N.1C.4L(N.1C.1j(\'vx\'));if(N.1C.1j(\'4V\')){4D.4V=N.1C.1j(\'4V\')}if(N.1C.1j(\'9S\')){N.1C.1F(\'6A\',N.1C.1j(\'9S\')+N.1C.1j(\'6A\'));N.1C.1F(\'6S\',N.1C.1j(\'9S\')+N.1C.1j(\'6S\')+\'?\'+(4D.4V?\'6V=\'+4D.4V:\'\'))}1h{N.1C.1F(\'6S\',N.1C.1j(\'6S\')+\'?\'+(4D.4V?\'6V=\'+4D.4V:\'\'))}if(N.1C.1j(\'jD\')){N.1C.1F(\'6S\',N.1C.1j(\'6S\')+\'&\'+N.1C.1j(\'jD\')+\'&\')}N.jo(1p 4D());J}M 4Y=N.1C.1j(\'vr\')+(N.1C.1j("kk")?\'&zE=1k\':\'\');if(N.1C.1j(\'9S\')){4Y+=\'&zt=\'+N.1C.1j(\'9S\').2i(/\\.\\.\\//g,"zq/")}M b8=1p 4D(4Y);b8.4B=I(2y){if(2y.5v&&2y.5v.3h&&2y.5v.3h.4o=="bd"){M 7z=hh(2y.5v.3h,"4b");1u.7z(\'vH oT by b7 : \'+7z.4m.dz);J}M bE;2r{M 3s=2y.5j.8B()}2o(e){bE=\'5q 1M zw 7i 5t : \'+e.4b}if(!2d 3s=="1m"){bE=\'vH zA by b7 : \'+2y.5j}if(bE){1o.dv(bE);if(bE.2v(\'<b>vM</b>\')>-1||bE.2v(\'<b>vJ zy</b>\')>-1){1u.7z(\'CP CO vK, it vQ 1U vM or vJ l6 vK, vL CW CJ Cx kr Cv 5q Cu Cr!\')}J}N.1C.4L(3s);if(N.1C.1j(\'4V\')){4D.4V=N.1C.1j(\'4V\')}if(N.1C.1j(\'9S\')){N.1C.1F(\'6A\',N.1C.1j(\'9S\')+N.1C.1j(\'6A\'));N.1C.1F(\'6S\',N.1C.1j(\'9S\')+N.1C.1j(\'6S\')+\'?\'+(4D.4V?\'6V=\'+4D.4V:\'\'))}1h{N.1C.1F(\'6S\',N.1C.1j(\'6S\')+\'?\'+(4D.4V?\'6V=\'+4D.4V:\'\'))}if(N.1C.1j(\'jD\')){N.1C.1F(\'6S\',N.1C.1j(\'6S\')+\'&\'+N.1C.1j(\'jD\')+\'&\')}N.jo(b8)}.3o(N);b8.vf()},jo:I(b8){if(N.1C.1j(\'4V\')&&!4D.4V){4D.4V=N.1C.1j(\'4V\')}1u.a6=N.1C.1j(\'6S\');M pt=N.1C.1j("Ct");if(pt)pt.2S(N.u1.3o(N));if(N.1C.1j(\'6A\')){b8.jw=N.1C.1j(\'6A\')+"/js";1u.6A=N.1C.1j(\'6A\')+"/CG/"+N.1C.1j("vh")}if(N.1C.1j(\'vi\')){b8.pk(N.1C.1j(\'vi?v=\'+N.1C.1j("h7")),1r,1k)}N.vt();1u.8z=N.1C.1j("CE");if(!1c.2a(8z).Y){7z(\'CB, N ve 8u CD, gr 4b 5y is 9o!\')}1w(M 1b in 8z){8z[1b]=8z[1b].2i("\\\\n","\\n")}1u.vd=N.1C.1j("vd");1u.v9=N.1C.1j("v9");M po=I(){1o.8j("5A:Dp");1u.4J=1u.5A=1p fq(Dn.Do(N.1C));if(N.1C.1j("pj")){1u.5A.pj=N.1C.1j("pj")}$(\'p8\').4L(\' - jV \'+N.1C.1j("h7")+\' - \'+N.1C.1j("Dx"));1u.5A.Dl()}.3o(N);if(!N.1C.1j("kk")){b8.pk("4J.7x.js?v="+N.1C.1j("h7"),po,1k)}1h{po()}},vk:I(){$$(\'6B\').2S(I(cP){if(cP.5w.1n("/js/pK")||cP.5w.1n("/js/ui/1y/3I.pA.js")){if(cP.5w.1n("/js/pK")){N.1C.1F("kk",1t)}1h{N.1C.1F("kk",1k)}M 5w=cP.5w.2i(\'/js/ui/1y/3I.pA.js\',\'\').2i(\'/js/pK.js\',\'\').2i(\'/js/Db.js\',\'\');if(5w.2v("?")!=-1)5w=5w.4K("?")[0];N.1C.1F("6A",5w)}}.3o(N));if(N.1C.1j("6A")){1u.6A=N.1C.1j("6A")}1h{7z("kq 3S pM Di")}M bc=N.1C.1j("vr");if(bc.2v("?")>-1){bc=bc.gq(0,bc.2v("?"))}N.1C.1F(\'a6\',bc);N.1C.1F(\'pN\',bc);1u.a6=bc},vt:I(dD,pI){M 3X=\'<1v id="ki" 1N="bj-bo:#Cq;6y: 0.2;"></1v>\';if(N.1C.1j(\'dN\')){2r{N.1C.1F(\'dN\',BB(N.1C.1j(\'dN\')))}2o(e){N.1C.1F(\'dN\',\'\')}}if(N.1C.1j(\'dN\')){3X+=N.1C.1j(\'dN\')}1h{M 6w;if(pI){6w=pI}1h{6w=N.1C.1j("6w")}3X+=\'	<1v id="aJ" 3I="tT" 1N="2D: BA;4e:gE;2M:30%;z-1l:Bw;2s:40%;1X: 7e;bj-bo: #BE;3z: 0;">\';3X+=\'	<1v tX="2s" 3I="fV" 1N="bj-pG:86; aR-5W: BM;pc-2O: 1.sO;3u-fp: eo;3z: 0; 3u-2D:0">\';M jk=6w.jk||6A+\'/../../../BJ.BH\';if(6w.vm){jk=N.1C.1j("6S")+"&"+6w.vm}M aU=6w.aU||"fq";M oS=6w.oS||\'um\';M tj=6w.Bj||\'um\';M tc=(6w.ul?\'2O:\'+6w.ul+\';\':\'\');3X+=\' <1v 3I="tU" 1N="3u-4C:0; 4w-4C:oV; aR-5W:\'+tj+\';aR-Be:Bf; bj-5W: kW%; bj-pG:4Y(\\\'\'+(N.1C.1j("9S")||\'\')+jk+\'\\\');bj-1X:2s Bm;bj-dc:no-dc;3z-2s:\'+oS+\';\'+tc+\'bo:#Ce;3u-fp:eo eo 0 0;">\'+(6w.Cf?\'\':aU)+\'</1v>\';if(6w.tf){3X+=\'<1v id="Cb" 1N="aR-5W: tu;pc-2O: 1.C8;3z:qe;">\'+6w.tf.2i(1p 2J("\\n","g"),"<br>")+\'</1v>\'}1h{3X+=\'\'}M gx="hx-oO";if(N.1C.1j("oN-1J"))gx=N.1C.1j("oN-1J");if(gx=="Cn-tm"){3X+=\'<1v 1N="2O: Co;1X: 6z;" id="jW"><1v 3I="tm" 1N="2D: 0;2O: 0;3u: Ci Cj Ck(0, C7, BT);3u-fp: tn;1X: 7e;BS: ba(oV, tn, BQ, oV);2s: C5;2M: sT;bo: tx;aR-5W: tu;">.</1v></1v>\'}1h if(gx=="C1-GW"){3X+=\'<1v 1N="1X: 6z;" id="jW" 3I="Cg"><1v 3I="Bp"></1v><1v 3I="Bo"></1v><1v 3I="Bn"></1v><1v 3I="D4"></1v><1v 3I="D1"></1v></1v>\'}1h if(gx=="hx-oO"){3X+=\'<1v 1N="1X: 6z;" id="jW" 3I="oO-oN"><1v 3I="hx-AW"></1v><1v 3I="hx-Aa"></1v></1v>\'}3X+=\'<1v 1N="3z:HX;aR-5W: sT;pc-2O: 1.sO;" 3I="Fy" id="u4">\';if(6w.aU.3b()!="5A"){3X+=\'	<1v 1N="3z:q4 sP;1X: 6z;"><1v>fq tI DR<9i id="p8"></9i></1v>\'}1h{3X+=\'	<1v 1N="3z:q4 sP;1X: 6z;"><1v>BX gr 7Y 4v! <9i id="p8"></9i></1v>\'}3X+=\'	Bs C. du tK tF-Bz - Dh Dc\';3X+=\'<1v id="D5" 1N="l9:2s; 4e: 86;">D3...</1v>\';3X+=\'	<1v id="D6" 1N="4w-2M:eo; 4w-2s: D9;4e: 86;"><9i id="D2"></9i></1v>\';3X+=\'<1v id="zn" 1N="2O:qe;4e: 86;"></1v>\';3X+=\'</1v></1v></1v>\'}M fb;if(!dD){dD=$$(\'2Y\')[0];fb=1o.aS.8V()}1h{fb=dD.8V()}dD.5K(3X);M aJ=dD.9r(\'#aJ\');aJ.5n({2s:aI(2T.a3((fb.2D-aJ.9A())/2,0))+"px",2M:aI(2T.a3((fb.2O-aJ.a2())/3,0))+"px"});M u7=I(){1o.6x(\'5A:u6\');1p fm.zW([1p fm.qu($(\'ki\'),{kj:1k,4S:1.0,to:0.0,ql:0.5}),1p fm.qu($(\'jW\'),{kj:1k,4S:1,to:0,ql:0.5}),1p fm.qu($(\'u4\'),{kj:1k,4S:1,to:0,ql:0.5})],{yW:I(){if($(\'ki\'))$(\'ki\').aH();if($(\'aJ\'))$(\'aJ\').3C()}})};1o.4F(\'5A:u6\',I(e){if(e.5l.yX>=0.8){u7()}}.3o(N))},u2:I(){if(!N.1C.1j("tY"))J;M 3s=N.1C.1j("tY");1u.fx=1u.fx||[];1u.fx.1I([\'z2\',3s.id]);if(3s.fy)1u.fx.1I([\'zd\',3s.fy]);1u.fx.1I([\'zg\']);1u.zh=3s.1G;1u.bX(I(){M 5w=(\'fL:\'==1o.9R.kw?\'fL://zj\':\'zi://u0\')+\'.z3-z9.q2/ga.js\';M ga=1p 1f("6B",{1J:\'5C/eB\',kV:\'1k\',5w:5w});($$(\'fZ\')[0]||$$(\'2Y\')[0]).5K(ga)},qw)},u1:I(93){M fZ=$$(\'fZ\')[0];M uf=1p 1f(\'q1\',{1J:\'5C/9t\',Ar:\'Hk\',9I:N.1C.1j("6A")+\'/\'+93,Hj:\'Ho\'});fZ.5K(uf)},ub:I(qf){M 1g=1p 1f("1v",{1N:"1X: 7e;z-1l: Im; 4C: 0; 4k: 0; bo: #tE;5C-tX: 4k;3z: q4; 3z-4k: qe;aR-5W: Hu;3u-fp: eo 0 0 0;"});if(1o.aS.9A()<tH){1g.4L(\'fq tI &qa; C. du tK tF-DG\')}1h{1g.4L(\'fq, g5 3E 5y DF - DE / DK tD E0 - <a 2x="E5" 1N="bo: #tE;" 9I="fL://4J.q2/">fL://4J.q2/</a>\')}$(qf).5K({cN:1g});if($(\'tL\'))J;$(qf).5K({cN:\'<1v id="tL">\\<1v id="9Z"3I="tT"><1v 3I="tU"></1v><1v 3I="fV"></1v></1v>\\<1v id="G2"1N="4e:86;"></1v>\\<1v id="FQ"1N="1X:7e;2s:-F1;"></1v>\\</1v>\'})}});',62,2768,'||||||||||||||||||||||||||||||||||||||||||||function|return||element|var|this|||||||value||||length||||||||||||require|key|Object|def||Element|elem|else|context|get|true|index|object|match|document|new|HasherUtils|null|call|false|window|div|for|exports|prototype|module|result|options|parameters|name|iterator|set|event|entry|push|type|results|arguments|while|style|extend|modules|iter|undefined|args|Prototype|that|node|record|position|array|className|||||||||||keys|method|parent|typeof|content|throw|slice|eventName|replace|es6|tagName|selector|assert|property|catch|uid|proto|try|left|create|cof|indexOf|String|target|transport|isFunction|Event|string|next|width|parentNode|has|arg|Array|values|RegExp|methods|case|top|Methods|height|form|nodeType|properties|each|Math|filter|select|apply|ctx|body|test|||||||||||event_name|toLowerCase|expression|global|isObject|elements|pattern|documentElement|xml|include|entries|json|getAttribute|isUndefined|bind|Sizzle|delete|len|data|iterable|border|seed|Expr|toString|str|padding|break|toObject|hide|responder|source|map|Class|Form|class|input|join|tokens|getStyle|use|step|Symbol|inspect|handler|find|offset|NAME|Ajax|initialize|html|strict|clone|||||||||||GLOBAL|message|whitespace|attributes|display|setDesc|number|pair|res|cache|right|childs|firstChild|support|nodeName|start|assertObject|matcher|code|klass|end|box|margin|createElement|tag|desc|attribute|onComplete|bottom|Connexion|constructor|observe|invoke|DIV|safe|pydio|split|update|Selector|isString|abs|TypeError|names|obj|from|wrap|callback|SECURE_TOKEN|getDesc|core|url|Number|||||||||||argument|ancestor|xhr|_getEv|expando|self|val|collection|Base|responseText|wks|memo|done|setStyle|concat|react|Error|check|species|response|arr|responseXML|src|styles|file|doc|ajaxplorer|arrayProto|text|defer|valueT|valueL|table|dir|hash|isArray|insert|registry|then|md5_ii|md5_hh|wrapper|addMethods|weak|md5_ff|md5_gg|toLength|matches|size|attr|matchIndexes|_observers|||||||||||isFrozen|prev|Klass|error|replacement|Iterators|getPixelValue|docEl|continue|define|params|delegate|first|matcherOut|diff|_each|ret|addEventListener|readyState|toArray|floor|IS_MAP|customWording|stopObserving|opacity|relative|ajxpResourcesFolder|script|assertDefined|receiver|newNode|Hash|rbuggyQSA|request|checked|offsetParent|state|WEAK|count|contains|storage|propertyKey|soFar|getValue|ajxpServerAccess|switch|cur|secure_token|Browser|scrollLeft|nextSibling|last|||||||||||es7|item|scrollTop|defineProperty|absolute|matched|Layout|promise|JSON|toIndex|TAG|expr|getElementsByTagName|attachEvent|innerHTML|fromCharCode|toImplement|__implements|getOffsetParent|includes|ownerDocument|finallyLoc|isBuggy|min|getUniqueElementID|alert|DESC|ByTag|__method|toUpperCase|super|searchString|Function|store|rej|getElementsByClassName|HIDDEN|resolve|exp|child|appendChild|tryEntries|reject|chrsz|partial|__proto__|charCodeAt|log|disabled|toJSON|own|Offset|opt|_parameters|Node|postFinder|preferredDoc|stripScripts|none|InterfaK|ATTRIBUTE_TRANSLATIONS|kind|unscope|descendants|ITER|instanceof|process|markFunction|cached|enc|status|fire|useNative|headers|_preComputing|lang|container|runtime|gsub|pseudos|defineProperties|offsetWidth|not|strong|documentIsHTML|matchers|removeChild|MessageHash|delta|evalJSON|temp|emptyFunction|getNames|strip|detect|positionedOffset|operator|without|FIRST|chain|methodize|bool|dirruns|wrapObjectMethod|toQueryString|forOf|isElement|getController|setAttribute|getDimensions|bup|docElem|forEach|groups|some|every|info|fileName|isFinite|toPaddedString|ceil|SYMBOL_ITERATOR||||leakStore|toElement|compareDocumentPosition|isXML|hasOwnProperty|tags|all|span|Infinity|Request|Constructor|currentStyle|getSymbols|empty|getOwnPropertyDescriptor|setDocument|down|unmatched|css|toHTML|layout|_|_object|statics|binarray|getWidth|safe_add|childNodes|pop|cumulativeOffset|originalStyles|getProto|inject|href|tryLoc|tmp|parseFloat|valueOf|nodeIndex|classof|MSIE|clear|location|SERVER_PREFIX_URI|findAll|err|sortInput|point|finallyEntry|overflow|generic_dialog_box|subclass|pow|getHeight|max|runescape|funescape|ajxpServerAccessPath|TYPE|dispatchException|isNumber|button|out||token|viewportOffset|getLayout|ADDER|sign|inst|selected|charAt|_prototypeUID|errorId||blank||frequency|measure|||querySelectorAll|fileParameterName|rbuggyMatches|bound|bubble|port|stop|tbody|getStorage|core_md5|_objectEventSetup|evalScripts|round|remove|parseInt|progressBox|_end|reverse|notify|endsWith|FF_ITERATOR|descendantOf|xhrSettings|font|viewport|startsWith|title|Enumerable|shift|show|action|_baseUrl|toISOString|Date|generator|replacer|exec|assertFunction|toInteger|application|connexion|lastValue|rect|hidden|booterUrl|tree||iterated|postFilter|outerCache|pseudo|background|createPositionalPseudo||Storage|setMatched|color||ajxpBootstrap||console|hasOwn|unquoted|eval|getRootNode|_isButton||submit|hasAttribute|getConstructor|pluck|decay|phpError|assign|lastIndexOf|web|isNaN|O1|iframe|locs|task|setProto|offsetHeight|readAttribute|close|collected_return_values|PROMISE|observeOnce|num|str2binl|genFun|setTimeout|unshift|observer|toQueryParams||GeneratorFunction|ownDesc|escape|preFilter|classNames|times|checkbox|getEntry|SELECTOR_DATA||insertion|getBoundingClientRect|success|hasLayout|unset|succ|visible|Abstract|fake|PROPERTIES|add||regexp|getAttributeNode|characterEncoding|before|getOwnPropertyNames|strundefined|setOpacity|completion|_default||whole|ES5Object|writeAttribute|hasDuplicate|configurable|Properties|P2|onError|high|nid|getKeys|found|_toString|setMatchers|stack|after|DEFAULT|scriptTag|LAST|callbackfn|AllSymbols|root|pointer|compare|expm1|currentTarget|Simulated|camelize|inner_callback|interpret|elementMatchers|bin|reset|Heading|destination|ELEMENT_CACHE|ELEMENT_NODE|bits||arrayMethod|repeat|getHeader|subclasses|recursivelyCollect|Attributes|INSERTION_TRANSLATIONS|visibility|insertions|flags|NodeList||extendElements||outermost|iframeDocument|bWidth|matchedCount|COMPUTATIONS||write|interpolate|_begin|retrieve|nodeValue|OO_ObjectsRegistry|LABEL|bHeight|targetContainer|htmlFor|instance|loaded|fill|timer|md5_cmn|elems|SIZE|siblings|customWelcomeScreen|bkey|getPrototypeOf|onclick|post|collect|nth|setFilters|docElement|fireContentLoadedEvent|getText|template|messageNode|bitmap|SPECIES|getRepName|_has|OK|isInteger|tryLocsList|IteratorPrototype|truncation|pageXOffset|original|Opera|MAX_SAFE_INTEGER|exception|onreadystatechange|getPath|which|handle|onProgress|larg|sqrt||catchLoc|elemLang|3px|offsetLeft||rnative|extras|paramName|existing|navigator|optionValue|Content|splice|stringify|asynchronous|javascript|expressions|EVAL||EPSILON|Responders|unfilterJSON|actualEventName|queue|offsetTop|Promise|MODE|holder|getElements|innerFn|nodes|merge|proceed|len1|loader|exclusive|excess|AjxpConnexion|createDict|createMethod|compile|keys1|outermostContext|default|matchExpr|tokenize|isRight|old|IS_INCLUDES|utftext|ElementExtensions|viewPort|HTMLElement|isGlobal|isIELegacyEvent|previousSibling|HTML|read|newWidth|toSelector|getElementById|b64|Effect||auto|radius|Pydio|pos|BrowserFeatures|serialize|EventObserver|oldCache||_gaq|domain|cumulativeScrollOffset||forElement|fixMethod|tabIndex|registerCallback|rtrim|findElement|proc|postMessage|static|run|https|fixed|matcherIn|relativize|dimensions|IS_WEAK|IE_PROTO|TIMER|ROOT|superclass|dialogContent|newSelector|ofType|complete|head|engine|absolutize|odd|initial|condense|open|xcomp|pageYOffset|option|ycomp||BUGGY|hasClassName|boundary|getStatus|previous|GeneratorFunctionPrototype|fillWith||encodeURIComponent|Type|WeakMap|mix|ctor|_getFlag|parts|substring|your|contentType||setPrototypeOf|classProp|forProp|spinnerType|Template|core_hmac_md5|messageContent|GenStateCompleted|tryCatch|onTimerEvent|block|reloadNodes|messageType|delay|findIndex|purgeElement|currentlyExecuting|RECORD|128|Generator|getContentFromAnonymousElement|onRejected|isExtensible|UInt16|styleFloat|getOpacity|img|raw|responders|SymbolRegistry|reflect|ext_select|ContinueSentinel|||||HAS_UNIQUE_ID_PROPERTY|with|ajxpVersion|enumerable|capitalize|fitParent|any|_method|afterLoc|extendElementWith|sym|isHash|XPathSelectSingleNode|EPSILON32|AjxpNode|findInArbo|getOwnPropertySymbols|setter|items|addCombinator|scrollTo|selectMany|selectOne|Gecko|textContent|toggle|IE|valueSelector|double|outerFn|focus|uniq|flatten|checkContext|clonePosition|tokenMessage|mode|isHtml|currentValue|wrapNative|isBody|eachSlice|dom|findFrozen|getAllResponseHeaders|opener|arrayLength|Serializers|evaluate|isJSON|extractScripts|isDetached|remaining|leadingRelative|existingDescriptor|qParams|LEAK|inputSelector|ScriptFragment|OBJECT_TYPE|tempIndex|IS_DONTENUM_BUGGY|Str|RangeError|CHILD|returnValue|even|xmlResponse|UID|register||attrHandle|||modal|CACHE|getUniqueElementID_IE|minisite_session|uniqueID|||conn|METHOD|adds|idx|||removes|updates|getAjxpNodeProvider|parseAjxpNode|radio|parentFake|normal|pointerY|forward|only|pointerX|nextLoc|useCache|resultName|script_tag|Context|defineGeneratorMethod|upload|MOUSEENTER_MOUSELEAVE_EVENTS_SUPPORTED|setMatcher|destroyCache_IE|attrId|newCache|onunload|GenStateSuspendedYield|createCache|ajxp_login_error|detachEvent|els|newContext|postMap|removeAttribute|character|login|createEvent|path|getOrCreateRegistryFor|VALUES|removeEventListener|evalJS|preFilters|getDOMEventName|destroyRegistryForElement|removeEvent|aup|checkNonElements|hasCompare|argumentNames|buggyZero|isCustomEvent|timeout|stripTags|icon|firstDescendant|pBottom|pTop|refreshContextVariablesAndInit|classes|pRight|pLeft||previousSiblings|interfaceName|interface|_libUrl|immediateDescendants|_setPrepared|must|nextSiblings|Empty|IS_EVERY|SERVER_PERMANENT_PARAMS|force|IE8_DOM_DEFINE|workaround|inc|bounds|UNSCOPABLES|preCompute|pRect|booleans|defaultValue|sibling|_recursivelyFind|maximumLength|refresh|addHandle|regExpCache|elementClassName|Version|loader_round_progress|HAS_EXTENDED_CREATE_ELEMENT_SYNTAX|STANDARD_CSS_OPACITY_SUPPORTED|runtimeStyle|0x3f|bySet|EXTENDED|setDescs|enumKeys|matcherFromTokens|TBODY|SpecificElementExtensions|onlyIfAbsent|mergeMethods|cssText|elementStyle|setTag|testContext|rsibling|sort|sortOrder|enum|loading_overlay|sync|debugMode|removeClassName|cssFloat|getRawStyle|compiled|addClassName|Cannot|the|UNDEFINED|binl2b64|headerJSON|mask|protocol|accumulator|dispatch|channel|MIN32|binl2str|prototype_made_clipping|setTask|setStatics|isSameOrigin|outer_callback|copyWithin|inputs|matchIndex|onCreate|sortBy|pargs|actions|marginBottom|elementMatcher|TO_STRING|ClassNames|typeName|MessageChannel|preventExtensions|async|100|counter|asinh|binl2hex|amd|ownKeys|mapping|oldElement|TEXT_NODE|_actual_sizzle|are|wheel|specified|float|clearTask|setUnscope|insertBefore|tpl|isUnhandled|toStringTag|KEY|newUnmatched|hasFinally|isThenable|toPrimitive|inModule|symbolStatics|Enumerate|enabled|returnMethod|contexts|GenStateSuspendedStart|GenStateExecuting||superMatcher|hasCatch|random|fail|callNext||msg2|msg1|byElement|fastKey|doneResult|preMap|onFulfilled|ITERATOR|freeze|parseOnly|56320|iteratorMethod|tokenCache|dirrunsUnique|combinator|preexisting|55296|sent|endPosition|iteratorSymbol|time|tempName|doneName|createObjectToArray|contextBackup|executor|IS_FIND_INDEX|65536|ArrayValues|rootRecord|chr|decodeURIComponent|failure|FunctionProto|getResponseHeader|statusText|Response|setTop|setLeft|prototype_made_positioned|mapfn|inline|newStyles|LINK_ELEMENT_INNERHTML_BUGGY|selfOrBody|bodyScrollNode|updater|docBody|INSPECT_ATTRIBUTES|pageXY|ONREADYSTATECHANGE|activeRequestCount|_length|buggy|compilerCache|toColorPart|toQueryPair|toTemplateReplacements|len2|onStateChange|encoding|setWidth|listner|Complete|_complete|setHeight|userAgent|respondToReadyState|range|replaceChild|arrayMethodFix|dim|isVertical|toggleClassName|tempStyles|identify|prototype_original_styles|getContentWidth|isHorizontal|isPercentage|TableSection|TD|trans|ELEMENT_PROTOTYPE|elementIsExtended|stripAlphaFromFilter_IE|alpha|getOpacity_IE|createArrayReduce|isPrimitive|ObjectProto|ancestors|keys2|descendantOf_DOM|SLICE|deep|cleanWhitespace|purge|date|_set|createGetKeys|_getAttr2|keysLen1|_compute|onclickValue|adjacent|getRegExpForClassName|simpleSet|queryValues|_methodized|siblingCheck|bindAsEventListener||matchesSelector|NUMBER|_native|isDate|nop|adown|curry|MAX_NEGATIVE|binary|attrs|defaultView|toNumber|extensions|setInterval|prepareReplacement|_isFinite|duplicates|isSafeInteger|ATTR|propertyIsEnumerable|isSupported|isOpera|asap|resetTryEntry|simple|common|classCache|ARRAY_CLASS|STRING_CLASS|NUMBER_CLASS|_hasOwnProperty|nodeNameSelector|_class|CLASS|finally|addMethodsToTagName|partition|isDocument||||undoClipping|inGroupsOf|grep|trues|falses|criteria|makeClipping|undoPositioned|compact|createDefiner|intersect||_reverse|sum|zip|makePositioned||slices|getRootElement||sub|scan|truncate||parse|escapedString|specialChar|riter|SAFE_CLOSING|escapeHTML|escaped|dasherize|fakeDefine|getScrollOffsets|identifier|underscore|unescapeHTML|setIterator|PSEUDO|implicitRelative|isRightClick|baseUrl|paramValue|isMiddleClick|isLeftClick|spinner|bounce|pollDoScroll|XMLHttpRequest|fileReader|iconWidth|caught|rest|0px|checkReadyState|toks|MAIN_ELEMENT|_element|utf8_encode|bit_rol|tmp_arr|stringl|0xFFFF|formData|lsw|cnt|version_span|_isButtonForDOMEvents|interf|0xFF|line|hex_tab|_isButtonForLegacyEvents|discrete|IE10|tok1|mouseleave|currentLanguage|loadLibrary||fireEvent|onlosecapture|masterClassLoaded|tok2|parseError||objectOrClass|cssRes|what|mouseenter|methodKey||Parsing|ondataavailable|AjxpBootstrap|unregister|allowed|showLoader|addSecureToken|PydioLog|image|handlerGiven|passedParameters|interfaces|ajaxplorer_boot|dataavailable|resource|serverAccessPath|You|applyComplete|getContextHolder|startedFromOpener|offsetcache|onElementEvent|disable|custom_event|XPathSelectNodes|obName|onLoadedCode|within|firstByIndex|link|com|inner_observer|4px|displayMessage|textarea|messageTxt|ERROR|execute|copy|enable|2px|TimedObserver|10px|desktopNode|matchingInputs|_original_define|ipad|fName|hex_md5|duration|xhrSendAsBinary|classNameToRemove|cond|classNameToAdd|prepare|_original_property|submitted|opad|Opacity|Position|200|getById|access|Pattern|jsonData|BOOLEAN_TYPE|messageBox|fireAction|NUMBER_TYPE|comp|parseJSON|NATIVE_JSON_PARSE_SUPPORT|UNDEFINED_TYPE|STRING_TYPE|BOOLEAN_CLASS|NULL_TYPE|getAsBinary|getUTCFullYear|sendFileUsingFormData|getUTCMonth|matchAll|setRequestHeader|amp|fileData|matchOne|FormData|getUTCDate|getUTCSeconds|send|1000|getUTCMinutes|isNonEmptyRegExp|getUTCHours|_contextHolder|separator|aSync|initializeXHRForUpload|DONT_ENUMS|useDoubleQuotes|JSONFilter|sanitize|FileReader|trim|onload||hasNativeIsArray|FUNCTION_CLASS|NATIVE_JSON_STRINGIFY_SUPPORT|execScript|1_|DATE_CLASS|my_code|withCredentials|server_answer|uploadUrl|responseType|outerHTML|fragments|ANY_INNERHTML_BUGGY|SCRIPT_ELEMENT_REJECTS_TEXTNODE_APPENDING|replace_IE|isContent|cloneNode|nextNode|insertContentAt|TABLE_ELEMENT_INNERHTML_BUGGY|SELECT_ELEMENT_INNERHTML_BUGGY|oldc|oldd|Updater|lastText|shouldUseCreationCache|oldb|tBodies|boolean|olda|purgeCollection|purgeCollection_IE|hasLayout_IE|normalizeStyleName_IE|normalizeStyleName|_getAttrNode|00001|getStyle_IE|HTMLOBJECTELEMENT_PROTOTYPE_BUGGY|checkElementPrototypeDeficiency|setOpacity_IE|_getAttr|CAMEL_CASED_ATTRIBUTE_NAMES|idCounter|descendantOf_contains|descendantOf_compareDocumentPosition|PROBLEMATIC_ATTRIBUTE_READING|readAttribute_IE|hasAttribute_IE|PROBLEMATIC_HAS_ATTRIBUTE_WITH_CHECKBOXES|readAttribute_Opera|updateComplete|512|matcherFromGroupMatchers|ObjectRange|GET_FIELDS|msxml|Try|these|getTransport|XMLHTTP|ActiveXObject|get_action|radix|reload|callee|sorted|collections|437|page|msxmldoctype|hideLoader|CONCAT_ARGUMENTS_BUGGY|setRequestHeaders|overrideMimeType|getStatusText|0xF|ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789|Events|_getHeaderJSON|_getResponseJSON|updateContent|msw|sanitizeJSON|onException|tab|hParameters|2005|addParameter|requestHeaders|b64pad|triplet|evalResponse|hexcase|authNode|pushTryEntry|5em|7px|hypot|MAX32|imul|11px|sinh|log2|log10|log1p|roundTiesToEven|fround|Arguments|arrayLike|endPos|fin|acosh|atanh|cosh|clz32|cbrt|tanh|trunc|writable|titleDivSize||race|welcomeMessage|construct|argumentsList|_isExtensible|fontSize|enumerate|deleteProperty|rotating|50px||MIN_SAFE_INTEGER|9007199254740991||NaN|Can|20px|seal|nextTick|white|isSealed|brokenDate|fromIndex|assertInstance|CHAIN|supported|7a7a7a|2008|setIter|500|Community|IS_SET|Jeu|all_forms|stat|IS_FILTER|regenerator|shim|_babelPolyfill|NO_HOLES|IS_SOME|dialogBox|dialogTitle|condition|FORCE|align|googleAnalyticsData|sid|www|loadCSSResource|insertAnalytics|getOwnDescriptor|loader_dialog_footer|partArgs|loader_state_update|loaderEndCallback|regExp|isStatic||insertBasicSkeleton|getIter|ext|SYM|cssNode|Iterator|part||__g|__e|iconHeight|35px||285||LAST_ERROR_ID|dialogLegend|makeInvokeMethod|loadXmlRegistry|loading|remember_pass|extend_IE8|pass|_invoke|callThrow|startParameters|timers|immediate|fit|fitMarginBottom|desktop|regeneratorRuntime|ALERT|external_selector_type|displayName|remember_login|rootEntry|sendAsync|CANCEL|thrown|filename|setParameters|MobileSafari|toLocaleString|Boolean|Undefined|Null|getContextNode|getParent|abrupt|currentLightBox|loc|setSelectedNodes|_isLoaded|addChild|getMetadata|original_path|rval|descriptors|symbol|multipleFilesDownloadEnabled|unscopables|keyOf|keyFor|zipEnabled|should|sendSync|keyof|theme|additional_js_resource|description|detectBaseParameters|fromCodePoint|icon_binary_url|regExpBroken|Reflect|callSite|sln|BOOTER_URL|can|insertLoaderProgress|Map|getOwnPropertyDescriptors|math|PRELOADED_BOOT_CONF|es5|clearImmediate|loadBootConfig|accept|starts|defaultActions|ends|primitives|setImmediate|Exception|isEntries|Strict|detected|you|Notice|Set|reduceRight|reduce|seems|isPrototypeOf|lambda|madePositioned|prototype_absolutize_original_styles|pOffset|relativeTo|stopped|madeClipping|pageScrollXY|wheelDelta|detail|eOffset|Microsoft|borderLeftWidth|paddingRight|paddingLeft|mWidth|borderRightWidth|prop|void|isInline|zIndex|outer_observer|Control|readonly|multiple|defined|Method|x00|load|push_native|0x10000|escapedWhitespace|IS_OLD_OPERA|opera|XPath|parentElement|rootElement|instanceMethods|deltaY|DOCUMENT_NODE|withinIncludingScrolloffsets|deltaX|pWidth|mHeight|toDecimal|rStyle|isViewport|getRawStyle_IE|decimal|zoom|b64_hmac_md5|str_hmac_md5|base64_encode|boxWidth|getComputedStyle|findDOMClass|md5_vm_test|TableCell|127|addFormMethods|pctString|TEXTAREA|SELECT|isDisplayed|hex_hmac_md5|The|bRight|bLeft|bBottom|mTop|mBottom|pHeight|mRight|mLeft|bTop|COMPOSITE_PROPERTIES|b64_md5|positionedWidth|str_md5|pLayout|_classCallCheck|cssNameFor|prototype_element_layout_prepared|_isPrepared|rquickExpr|rescape|createButtonPseudo|createInputPseudo|legacyButtonMap|rinputs|rcomma||rcombinators||postSelector|mapped|base|rheader|metaKey|ridentifier|clientLeft|clientTop|stopPropagation|unsupported|click|WebKit|hasFocus|_isButtonForWebKit|multipleContexts|registerFormCallbacks|scope|uniqueSort|encodedKey|serializeElements|div1|sortDetached|needsContext|sortStable|detectDuplicates|serializers|findFirstElement|selectedIndex|PeriodicalExecuter|Observer|single|one|activate|matchAnyContext|matchContext|preventDefault|_extendedByPrototype|handleEvent|Handler|getElementsByName|onmouseenter|fireEvent_IE|qsa|dispatchEvent|eventType|fireEvent_DOM|onmouseleave|sourceIndex|_createResponder|createResponder|clearTimeout|relatedTarget|createMouseEnterLeaveResponder|_isCustomEvent|isSimulatedMouseEnterLeaveEvent|createResponderForCustomEvent|HTMLEvents|rattributeQuotes|mouseout||EVENT_TRANSLATIONS||rpseudo|observeStandardEvent|mouseover|additionalMethods|_relatedTarget|pageX|pageY|cacheLength|observeCustomEvent|stopObservingCustomEvent|stopObservingStandardEvent|getFireTarget|disconnectedMatch|stopObservingEventName|eventNameGiven|msg|stopObservingElement|TH|includeScrollOffsets|TFOOT|TableCol|THEAD|Mod|TR|KEY_HOME|contentWindow|actions_loaded|fitHeightToBottom|fireContextChange|OPTION|convert|1958414417|111|42063|afterFinish|percent|fireSelectionChange|KEY_DELETE|header|0x|_setAccount|google|1926607734|port1|ajxpOptions|Toggle|childOf|analytics|port2|onmessage|value1|_setDomainName|KEY_DOWN|clientY|_trackPageview|_gaTrackEvents|http|ssl|native|Accessors|0o1|progressBarHeighter|0385|1444681467|_UP_|5e13|doScroll|server_prefix_uri|now|07|parsing|25T07|Standards|06|uncaught|cellPadding|1163531501|cellpadding|debug|51403784|pydioBootstrap|filters|0xD800|KEY_END|selectorData|before_gui_load|0b1|1236535329|DOMContentLoaded|1990404162|0xDC00|MIN_VALUE|1804603682|MAX_VALUE|0x3FF|Reduce|Parallel|1735328473|label|OList|Bottom|clientHeight|clientWidth|override|After|statement|replaceBy|Top|logging_result|Before|bounce2|1839030562|hideLightBox|setCloseValidation|PydioApi|detectMinisiteSession|KEY_UP|version|BODY|nodes_diff|271733879|illegal|attempt|repository_list|reloadRepositoriesList|delegateYield|value2|rel|finish|deprecated|65535|instead|FIELDSET|KEY_LEFT|35309556|56319|storeRememberData|importScripts|378558|mark|multipleNodesReload|2022574463|loop|6px|ErrorShake|required|scoped|suspendedYield|suspendedStart|999Z|executing|completed|x20|isGeneratorFunction|9px|ismap|Insertion|sizzle|bounce1|extendElement|prevent|57343|could|KEY_RIGHT|366|clientX|already|controls|D33131|running|autoplay|386|autofocus|xa0|cellspacing|selectors|weight|bold|onblur|onfocus|unrecognized|titleFontSize|onmouseout|onkeypress|center|rect3|rect2|rect1|onkeyup|onkeydown|Copyright|createPseudo|KEY_PAGEDOWN|Syntax|2002|1024|126|2014|320px|customFuncDecode|onmousedown|onmouseup|fff|valid|codePointAt|png|onmousemove|PydioLogo250|onmouseover|1114111|13px|onsubmit|LOG2E|701558691|100px|cycle|clip|219|Unhandled|unhandledRejection|emit|Build|373897302|cancelBubble|165796510|stretch|1069501632|643717713|srcElement|131px|rejection|123|3em|onchange|KEY_INSERT|progressCustomMessage|onselect|onreset|0077b3|iconOnly|rect_spinners|fromElement|24px|solid|rgb|38016083|DList|planet|85px|ondblclick|555555|level|createComment|cssResources|Reporting|PHP|unload|changing|WeakSet|readOnly|NEGATIVE_INFINITY|Ooups|POSITIVE_INFINITY|happen|i18nMessages|frameBorder|themes|longDesc|maxLength|consider|Invalid|cellSpacing|colSpan|password|errors|Php|40341101|qsaError|getUTCMilliseconds|rowSpan|accessKey|encType|may|dateTime|vAlign|9999|00000|rect5|loaderProgress|Booting|rect4|progressState|progressBarContainer|createEventObject|unspec|126px|568446438|ajaxplorer_boot_protolegacy|License|405537848|Count|660478335|negative|AGPL|folder|initEvent|msMatchesSelector|init|1019803690|ProtoCompat|hash2map|boot_loaded|KEY_PAGEUP|187363961|lastChild|search|isConcatSpreadable|mozMatchesSelector|oMatchesSelector|ajxpVersionDate|webkitMatchesSelector|useSetter|hasInstance|useSimple|turn|overlap|Free|sharing|2013|COL|COLGROUP|Msxml2|Non||718787259|1120210379|389564586|Field|Property|Edition|145523070|606105819|TableCaption|CAPTION|applet|toCSSPixels|With|Requested|edition|Accept|charset|leak|embed|_blank|setValue|postBody|urlencoded|loadingImage|gif|UTF|images|40000|present|1309151649|Ooops|Fatal|Internal|Server|1873313359|30611744|reason|UList|Unknown|server|logs|objectImplements|wrong|require_auth|going|1044525330|2054922799|member|1560198380|1502002290|Directory|browser|LN10|instantiate|hitting|security|expired|Please|toHash|438|Interface|parsererror|errorCode|underline|decoration|toCSS|Image|setMethod|focusFirstElement|1732584193|Paragraph|DIR|PeriodicalUpdater|abc|0x5C5C5C5C|IFrame|900150983cd24fb0d6963f7d28e17f72|1000px|TextArea|SCRIPT|FORM||OptGroup|2048|192|224|createTextNode|0x36363636|activeElement|DOCUMENT_FRAGMENT_NODE|DOCUMENT_TYPE_NODE|COMMENT_NODE|NOTATION_NODE|FRAMESET|TableRow|0x80|MODULE_NOT_FOUND|PROCESSING_INSTRUCTION_NODE|ENTITY_NODE|IFRAME|babel|polyfill|FrameSet|ATTRIBUTE_NODE|ENTITY_REFERENCE_NODE|CDATA_SECTION_NODE|INPUT|0123456789ABCDEF|Failure|Success|dialogFooter|getInputs|java|680876936|0x3F|ecma|createContextualFragment|204|pixelLeft|getStyle_Opera|Connection|TABLE|300|1223|304|UL|FieldSet|BUTTON|hidden_forms|createRange|responseJSON|343485551|getAllHeaders|0123456789abcdef||Interactive|Loaded|selectNode|1732584194|271733878|hidden_frames|OPTGROUP|Loading|Uninitialized|setPendingSelection|getByInterface|DOMMouseScroll|mousewheel|722521979|IframeShim|76029189|callable|640364487|progid|358537222|681279174|120|1094730640|prompt|KEY_TAB|mouse|parseXmlMessage|No||sendAsBinary|421815835|Alpha|KEY_BACKSPACE|DXImageTransform|1770035416|INS|positionUnder|frameborder|DEL|MultiPartFormBoundary|getTime|octet|01|stream|unescape|Disposition|530742520|multipart|155497632|DIALOG|SelectorsAPI|KEY_ESC|Mobile|querySelector|HTMLDivElement|Quote|secure|realOffset|Apple|KHTML|IE10plus|rectangles|reload_instruction|vertical|NET4|AppleWebKit|||||||horizontal|anonymous_element_|_getElementsByXPath|getElementsBySelector|KEY_RETURN|currentLayout|1272893353|showSimpleModal|reference|Cyclic|findChildElements|matchElements|media|stylesheet|Webkit|1530992060|findElements|screen|childElements|995338651|setBounds|1416354905|0000|12px|SyntaxError|Badly|readAsBinaryString|paddingBottom|formed|176418897|u0000|u2060|u202f|u2028|u206f|ufeff|uffff|ufff0|paddingTop|57434055|XMLUtils|getDomNodeText|IMG|LN2|160|setContextNode|missing|logout|1051523|implement|uploadFile|1700485571|5px|SUCCESS|parseQuery|1894986606|Anchor|getByName|u200f|Warning|marginRight|unknown|marginLeft|lengthComputable|marginTop|change|progress|innerText|onerror|append|198630844|clearInterval|destroy|__className|POST|Reference|x1f|10000|u0600|u00ad|1200080426|u0604|u070f|u17b5|u17b4|1473231341|45705983|borderBottomWidth|1126891415|u00|u200c|borderTopWidth|bfnrt|OL|'.split('|'),0,{}))
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer_boot_list.txt b/core/src/plugins/gui.ajax/res/js/ajaxplorer_boot_list.txt
index 5128f67b78..aa42df2175 100644
--- a/core/src/plugins/gui.ajax/res/js/ajaxplorer_boot_list.txt
+++ b/core/src/plugins/gui.ajax/res/js/ajaxplorer_boot_list.txt
@@ -3,6 +3,5 @@ js/vendor/prototype/prototype.js
 js/vendor/prototype/prototype.livepipe.js
 js/vendor/prototype/prototype.oo.js
 js/core/util/HasherUtils.js
-js/vendor/prototype/jsProgressBarHandler.js
 js/ui/prototype/http/class.Connexion.js
 js/ui/prototype/class.AjxpBootstrap.js
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer_core.txt b/core/src/plugins/gui.ajax/res/js/ajaxplorer_core.txt
index 6192686011..8d836b8027 100644
--- a/core/src/plugins/gui.ajax/res/js/ajaxplorer_core.txt
+++ b/core/src/plugins/gui.ajax/res/js/ajaxplorer_core.txt
@@ -15,7 +15,6 @@ js/core/http/PydioUsersApi.js
 js/core/model/RemoteNodeProvider.js
 js/core/model/EmptyNodeProvider.js
 js/core/model/Repository.js
-js/core/model/BackgroundTasksManager.js
 js/core/http/PydioApi.js
 js/core/http/MetaCacheService.js
 js/core/model/Action.js
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer_ui.txt b/core/src/plugins/gui.ajax/res/js/ajaxplorer_ui.txt
index 1af117906e..d82f49ee3d 100644
--- a/core/src/plugins/gui.ajax/res/js/ajaxplorer_ui.txt
+++ b/core/src/plugins/gui.ajax/res/js/ajaxplorer_ui.txt
@@ -21,7 +21,6 @@ js/vendor/scriptaculous/src/controls.js
 js/vendor/scriptaculous/src/slider.js
 js/vendor/prototype/cssfx.js
 js/vendor/prototype/proto.scroller.js
-js/vendor/prototype/carousel.js
 js/vendor/prototype/accordion.js
 js/vendor/webfx/xtree.js
 js/vendor/webfx/ajxptree.js
@@ -43,7 +42,6 @@ js/ui/prototype/class.AjxpUsersCompleter.js
 js/ui/prototype/class.TreeSelector.js
 js/ui/prototype/class.SliderInput.js
 js/ui/prototype/class.ActionsToolbar.js
-js/ui/prototype/class.BackgroundManagerPane.js
 js/ui/prototype/class.HeaderResizer.js
 js/ui/prototype/class.PreviewFactory.js
 js/ui/prototype/class.FilesList.js
diff --git a/core/src/plugins/gui.ajax/res/js/es6/Pydio.es6 b/core/src/plugins/gui.ajax/res/js/es6/Pydio.es6
index d060079558..f429df2707 100644
--- a/core/src/plugins/gui.ajax/res/js/es6/Pydio.es6
+++ b/core/src/plugins/gui.ajax/res/js/es6/Pydio.es6
@@ -178,8 +178,9 @@ class Pydio extends Observable{
             if(!repositoryObject){
                 if(this.user.lock){
                     this.Controller.loadActionsFromRegistry(this.getXmlRegistry());
+                    let lock = this.user.lock.split(",").shift();
                     window.setTimeout(function(){
-                        this.Controller.fireAction(this.user.lock);
+                        this.Controller.fireAction(lock);
                     }.bind(this), 50);
                     return;
                 }
@@ -289,6 +290,7 @@ class Pydio extends Observable{
                 && nodeOrPath.getAjxpMime() != "repository" && nodeOrPath.getAjxpMime() != "repository_editable"){
                 if(this.user){
                     this.user.setPreference("pending_folder", nodeOrPath.getPath());
+                    this._initLoadRep = nodeOrPath.getPath();
                 }
                 this.triggerRepositoryChange(nodeOrPath.getMetadata().get("repository_id"));
                 return;
@@ -341,6 +343,14 @@ class Pydio extends Observable{
         return this.Registry.getPluginConfigs(pluginQuery);
     }
 
+    listLanguagesWithCallback(callback){
+        let langs = this.Parameters.get("availableLanguages") || {"en":"Default"};
+        let current = this.currentLanguage;
+        Object.keys(langs).sort().map(function(key){
+            callback(key, langs[key], (current === key));
+        });
+    }
+
     /**
      * Reload all messages from server and trigger updateI18nTags
      * @param newLanguage String
diff --git a/core/src/plugins/gui.ajax/res/js/es6/http/MetaCacheService.es6 b/core/src/plugins/gui.ajax/res/js/es6/http/MetaCacheService.es6
index 7e8db7cdbb..fc40f4441b 100644
--- a/core/src/plugins/gui.ajax/res/js/es6/http/MetaCacheService.es6
+++ b/core/src/plugins/gui.ajax/res/js/es6/http/MetaCacheService.es6
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 /**
  * API Client
diff --git a/core/src/plugins/gui.ajax/res/js/es6/http/PydioApi.es6 b/core/src/plugins/gui.ajax/res/js/es6/http/PydioApi.es6
index ddf140301e..2be43b28b2 100644
--- a/core/src/plugins/gui.ajax/res/js/es6/http/PydioApi.es6
+++ b/core/src/plugins/gui.ajax/res/js/es6/http/PydioApi.es6
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 /**
  * API Client
@@ -81,22 +81,47 @@ class PydioApi{
         }
     }
 
-    uploadFile(file, fileParameterName, queryStringParams='', onComplete=function(){}, onError=function(){}, onProgress=function(){}){
+    /**
+     * 
+     * @param file
+     * @param fileParameterName
+     * @param queryStringParams
+     * @param onComplete
+     * @param onError
+     * @param onProgress
+     * @returns XHR Handle to abort transfer
+     */
+    uploadFile(file, fileParameterName, queryStringParams='', onComplete=function(){}, onError=function(){}, onProgress=function(){}, uploadUrl='', xhrSettings={}){
+
+        if(!uploadUrl){
+            uploadUrl = pydio.Parameters.get('ajxpServerAccess');
+        }
+        if(queryStringParams){
+            uploadUrl += (uploadUrl.indexOf('?') === -1 ? '?' : '&') + queryStringParams;
+        }
 
         if(window.Connexion){
+            // Warning, avoid double error
+            let errorSent = false;
+            let localError = function(xhr){
+                if(!errorSent) onError('Request failed with status :' + xhr.status);
+                errorSent = true;
+            };
             var c = new Connexion();
-            c.uploadFile(file, fileParameterName, queryStringParams, onComplete, onError, onProgress);
+            return c.uploadFile(file, fileParameterName, uploadUrl, onComplete, localError, onProgress, xhrSettings);
+
         }else if(window.jQuery){
+
             var formData = new FormData();
             formData.append(fileParameterName, file);
-            queryStringParams += '&secure_token' + this._secureToken;
-            jQuery.ajax(this._baseUrl + '&' + queryStringParams, {
+            return jQuery.ajax(uploadUrl, {
                 method:'POST',
                 data:formData,
                 complete:onComplete,
                 error:onError,
                 progress:onProgress
             });
+
         }
 
     }
@@ -154,6 +179,22 @@ class PydioApi{
 
     }
 
+    postPlainTextContent(filePath, content, finishedCallback){
+
+        this.request({
+            get_action:'put_content',
+            file: filePath,
+            content: content
+        }, function(transport){
+            var success = this.parseXmlMessage(transport.responseXML);
+            finishedCallback(success);
+        }.bind(this), function(){
+            finishedCallback(false);
+        });
+
+
+    }
+
     /**
      * Detect a minisite_session parameter in the URL
      * @param serverAccess
@@ -313,13 +354,16 @@ class PydioApi{
 
     }
 
-    applyCheckHook(node, hookName, hookArg, completeCallback){
+    applyCheckHook(node, hookName, hookArg, completeCallback, additionalParams){
         var params = {
             get_action : "apply_check_hook",
             file       : node.getPath(),
             hook_name  : hookName,
             hook_arg   : hookArg
         };
+        if(additionalParams){
+            params = LangUtils.objectMerge(params, additionalParams);
+        }
         this.request(params, completeCallback, null, {async:false});
     }
 
@@ -412,7 +456,7 @@ class PydioApi{
             } else if(childs[i].nodeName == 'nodes_diff') {
                 var dm = this._pydioObject.getContextHolder();
                 if(dm.getAjxpNodeProvider().parseAjxpNodesDiffs){
-                    dm.getAjxpNodeProvider().parseAjxpNodesDiffs(childs[i], dm, !window.currentLightBox);
+                    dm.getAjxpNodeProvider().parseAjxpNodesDiffs(childs[i], dm, this._pydioObject.user.activeRepository, !window.currentLightBox);
                 }
             }
             else if(childs[i].tagName == "logging_result")
@@ -486,16 +530,18 @@ class PydioApi{
                     var paramChild = childs[i].childNodes[j];
                     if(paramChild.tagName == 'param'){
                         parameters[paramChild.getAttribute("name")] = paramChild.getAttribute("value");
+                    }else if(paramChild.tagName == 'clientCallback' && paramChild.firstChild && paramChild.firstChild.nodeValue){
+                        var callbackCode = paramChild.firstChild.nodeValue;
+                        var callback = new Function(callbackCode);
                     }
                 }
-                var bgManager = this._pydioObject.getController().getBackgroundTasksManager();
-                if(bgManager){
-                    bgManager.queueAction(name, parameters, messageId);
-                    bgManager.next();
+                if(name == "javascript_instruction" && callback){
+                    callback();
                 }
             }
 
         }
+        this._pydioObject.notify("response.xml", xmlResponse);
         if(reloadNodes.length){
             this._pydioObject.getContextHolder().multipleNodesReload(reloadNodes);
         }
diff --git a/core/src/plugins/gui.ajax/res/js/es6/http/PydioUsersApi.es6 b/core/src/plugins/gui.ajax/res/js/es6/http/PydioUsersApi.es6
index dc1c82b8c6..30edcdae4a 100644
--- a/core/src/plugins/gui.ajax/res/js/es6/http/PydioUsersApi.es6
+++ b/core/src/plugins/gui.ajax/res/js/es6/http/PydioUsersApi.es6
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 (function(global) {
 
diff --git a/core/src/plugins/gui.ajax/res/js/es6/http/ResourcesManager.es6 b/core/src/plugins/gui.ajax/res/js/es6/http/ResourcesManager.es6
index 87f5c20302..a62595e4a7 100644
--- a/core/src/plugins/gui.ajax/res/js/es6/http/ResourcesManager.es6
+++ b/core/src/plugins/gui.ajax/res/js/es6/http/ResourcesManager.es6
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
diff --git a/core/src/plugins/gui.ajax/res/js/es6/model/Action.es6 b/core/src/plugins/gui.ajax/res/js/es6/model/Action.es6
index ec2347a119..de9dafc00b 100644
--- a/core/src/plugins/gui.ajax/res/js/es6/model/Action.es6
+++ b/core/src/plugins/gui.ajax/res/js/es6/model/Action.es6
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /** 
diff --git a/core/src/plugins/gui.ajax/res/js/es6/model/BackgroundTasksManager.es6 b/core/src/plugins/gui.ajax/res/js/es6/model/BackgroundTasksManager.es6
deleted file mode 100644
index 2778205024..0000000000
--- a/core/src/plugins/gui.ajax/res/js/es6/model/BackgroundTasksManager.es6
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-/**
- * Manage background tasks
- */
-class BackgroundTasksManager extends Observable {
-
-	/**
-	 * Constructor
-	 * @param actionManager ActionManager
-	 */
-	constructor(actionManager){
-        super();
-        this.queue = [];
-		this.actionManager = actionManager;
-		this.working = false;
-	}
-	/**
-	 * Add an action to the queue
-	 * @param actionName String Name of the action
-	 * @param parameters Object Parameters of the action, NOT HASH
-	 * @param messageId String An i18n id of the message to be displayed during the action
-	 */
-	queueAction(actionName, parameters,messageId){
-		var actionDef = {};
-		actionDef['name'] = actionName;
-		actionDef['messageId'] = messageId;
-		actionDef['parameters'] = parameters;
-		this.queue.push(actionDef);
-	}
-	
-	/**
-	 * Processes the next action in the queue
-	 */
-	next(){
-		if(!this.queue.length){
-			 this.finished();
-			 return;
-		}
-		if(this.working) return;
-		var actionDef = this.queue[0];
-        if(actionDef['name'] == "javascript_instruction" && actionDef['parameters']['callback']){
-            var cb = actionDef['parameters']['callback'];
-            this.notify("update_message", actionDef['messageId']);
-    		this.queue.shift();
-            cb();
-            this.working = false;
-            this.next();
-        }else{
-            var client = PydioApi.getClient();
-            var params = {get_action: actionDef['name']};
-            for(var k in actionDef['parameters']){
-                if(actionDef['parameters'].hasOwnProperty(k)) params[k] = actionDef['parameters'][k];
-            }
-            client.request(params, function(transport){
-                var xmlResponse = transport.responseXML;
-                if(xmlResponse == null || xmlResponse.documentElement == null) {
-                    this.working = false;
-                    this.next();
-                    return;
-                }
-                this.parseAnswer(transport.responseXML);
-                this.working = false;
-            }.bind(this), null, {method: 'POST'});
-            this.notify("update_message", actionDef['messageId']);
-    		this.queue.shift();
-    		this.working = true;
-        }
-	}
-
-	/**
-	 * Parses the response. Should probably use the actionBar parser instead.
-	 * @param xmlResponse XMLDocument
-	 */
-	parseAnswer(xmlResponse){
-		var childs = xmlResponse.documentElement.childNodes;	
-		var delay = 0;
-		for(var i=0; i<childs.length;i++)
-		{
-			if(childs[i].tagName == "message")
-			{
-				var type = childs[i].getAttribute('type');
-				if(type != 'SUCCESS'){
-					this.interruptOnError(childs[i].firstChild.nodeValue);
-				}
-			} else if(childs[i].nodeName == 'nodes_diff') {
-                var dm = this.actionManager.getDataModel();
-                if(dm.getAjxpNodeProvider().parseAjxpNodesDiffs){
-                    dm.getAjxpNodeProvider().parseAjxpNodesDiffs(childs[i], dm, !window.currentLightBox);
-                }
-            } else if(childs[i].nodeName == "trigger_bg_action"){
-				var name = childs[i].getAttribute("name");
-				var messageId = childs[i].getAttribute("messageId");
-                delay = parseInt(childs[i].getAttribute("delay"));
-				var parameters = {};
-				for(var j=0;j<childs[i].childNodes.length;j++){
-					var paramChild = childs[i].childNodes[j];
-					if(paramChild.tagName == 'param'){
-						parameters[paramChild.getAttribute("name")] = paramChild.getAttribute("value");
-					}else if(paramChild.tagName == 'clientCallback'){
-                        var callbackCode = paramChild.firstChild.nodeValue;
-                        var callback = new Function(callbackCode);
-                    }
-				}
-				if(name == "reload_node"){
-                    if(delay){
-                        window.setTimeout(function(){
-                            this.actionManager.getDataModel().requireContextChange(this.actionManager.getDataModel().getContextNode(), true);
-                            this.next();
-                        }.bind(this), delay*1000);
-                        return;
-                    }
-                    this.actionManager.getDataModel().requireContextChange(this.actionManager.getDataModel().getContextNode(), true);
-                }else if(name == "info_message"){
-                    this.notify("update_message", messageId);
-                }else if(name == "javascript_instruction" && callback){
-                    parameters["callback"] = callback;
-                    this.queueAction('javascript_instruction', parameters, messageId);
-				}else{
-					this.queueAction(name, parameters, messageId);
-				}
-			}
-		}
-		this.working = false;
-        if(delay){
-            window.setTimeout(this.next.bind(this), delay*1000);
-        }else{
-            this.next();
-        }
-	}
-	/**
-	 * Interrupt the task on error
-	 * @param errorMessage String
-	 */
-	interruptOnError(errorMessage){
-		if(this.queue.length) this.queue = [];
-		this.notify("update_message_error", errorMessage);
-		this.working = false;
-	}
-	/**
-	 * All tasks are processed
-	 */
-	finished(){
-		this.working = false;
-        this.notify("tasks_finished");
-	}
-	
-	/**
-	 * Create a stub action with not parameter.
-	 */
-	addStub(){
-		this.queueAction('local_to_remote', {}, 'Stubing a 10s bg action');
-	}
-}
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/js/es6/model/Controller.es6 b/core/src/plugins/gui.ajax/res/js/es6/model/Controller.es6
index 395c332675..963c9a0b55 100644
--- a/core/src/plugins/gui.ajax/res/js/es6/model/Controller.es6
+++ b/core/src/plugins/gui.ajax/res/js/es6/model/Controller.es6
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
@@ -115,14 +115,7 @@ class Controller extends Observable{
             value.refreshFromI18NHash();
         });
     }
-
-    getBackgroundTasksManager(){
-        if(!Controller._bgManager){
-            Controller._bgManager = new BackgroundTasksManager(this);
-        }
-        return Controller._bgManager;
-    }
-
+    
     getDataModel(){
         return this._dataModel;
     }
diff --git a/core/src/plugins/gui.ajax/res/js/es6/model/PydioDataModel.es6 b/core/src/plugins/gui.ajax/res/js/es6/model/PydioDataModel.es6
index 9697c1e2fd..57b4269f64 100644
--- a/core/src/plugins/gui.ajax/res/js/es6/model/PydioDataModel.es6
+++ b/core/src/plugins/gui.ajax/res/js/es6/model/PydioDataModel.es6
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
@@ -685,13 +685,13 @@ class PydioDataModel extends Observable{
 
 	}
 
-    applyCheckHook (node){
-        "use strict";
+    applyCheckHook (node, additionalParams = null){
+        
         var client = PydioApi.getClient();
         var result;
         client.applyCheckHook(node, "before_create", node.getMetadata().get("filesize") || -1, function(transport){
             result = client.parseXmlMessage(transport.responseXML);
-        });
+        }, additionalParams);
         if(result === false){
             throw new Error("Check failed");
         }
diff --git a/core/src/plugins/gui.ajax/res/js/es6/model/Registry.es6 b/core/src/plugins/gui.ajax/res/js/es6/model/Registry.es6
index 3a86e3c930..a4ca5a6ffc 100644
--- a/core/src/plugins/gui.ajax/res/js/es6/model/Registry.es6
+++ b/core/src/plugins/gui.ajax/res/js/es6/model/Registry.es6
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 class Registry{
 
@@ -178,6 +178,7 @@ class Registry{
                 }catch(e){
                     Logger.error("Ignoring Error in extensionOnInit code:");
                     Logger.error(extensionOnInit.firstChild.nodeValue);
+                    Logger.error(e.message);
                 }
             }
             var dialogOnOpen = XMLUtils.XPathSelectSingleNode(xmlNode, 'processing/dialogOnOpen');
diff --git a/core/src/plugins/gui.ajax/res/js/es6/model/RemoteNodeProvider.es6 b/core/src/plugins/gui.ajax/res/js/es6/model/RemoteNodeProvider.es6
index df53210dda..55c2b11f89 100644
--- a/core/src/plugins/gui.ajax/res/js/es6/model/RemoteNodeProvider.es6
+++ b/core/src/plugins/gui.ajax/res/js/es6/model/RemoteNodeProvider.es6
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
@@ -261,7 +261,7 @@ class RemoteNodeProvider{
         }
     }
 
-    parseAjxpNodesDiffs(xmlElement, targetDataModel, setContextChildrenSelected=false){
+    parseAjxpNodesDiffs(xmlElement, targetDataModel, targetRepositoryId, setContextChildrenSelected=false){
         let removes = XMLUtils.XPathSelectNodes(xmlElement, "remove/tree");
         let adds = XMLUtils.XPathSelectNodes(xmlElement, "add/tree");
         let updates = XMLUtils.XPathSelectNodes(xmlElement, "update/tree");
@@ -269,6 +269,9 @@ class RemoteNodeProvider{
         if(removes && removes.length){
             removes.forEach(function(r){
                 var p = r.getAttribute("filename");
+                if(r.getAttribute("node_repository_id") && r.getAttribute("node_repository_id") !== targetRepositoryId){
+                    return;
+                }
                 var imTime = parseInt(r.getAttribute("ajxp_im_time"));
                 targetDataModel.removeNodeByPath(p, imTime);
                 notifyServerChange.push(p);
@@ -276,6 +279,9 @@ class RemoteNodeProvider{
         }
         if(adds && adds.length && targetDataModel.getAjxpNodeProvider().parseAjxpNode){
             adds.forEach(function(tree){
+                if(tree.getAttribute("node_repository_id") && tree.getAttribute("node_repository_id") !== targetRepositoryId){
+                    return;
+                }
                 var newNode = targetDataModel.getAjxpNodeProvider().parseAjxpNode(tree);
                 targetDataModel.addNode(newNode, setContextChildrenSelected);
                 notifyServerChange.push(newNode.getPath());
@@ -283,6 +289,9 @@ class RemoteNodeProvider{
         }
         if(updates && updates.length && targetDataModel.getAjxpNodeProvider().parseAjxpNode){
             updates.forEach(function(tree){
+                if(tree.getAttribute("node_repository_id") && tree.getAttribute("node_repository_id") !== targetRepositoryId){
+                    return;
+                }
                 var newNode = targetDataModel.getAjxpNodeProvider().parseAjxpNode(tree);
                 let original = newNode.getMetadata().get("original_path");
                 targetDataModel.updateNode(newNode, setContextChildrenSelected);
diff --git a/core/src/plugins/gui.ajax/res/js/es6/model/Repository.es6 b/core/src/plugins/gui.ajax/res/js/es6/model/Repository.es6
index de43746f3d..a9a93a4c5a 100644
--- a/core/src/plugins/gui.ajax/res/js/es6/model/Repository.es6
+++ b/core/src/plugins/gui.ajax/res/js/es6/model/Repository.es6
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /** 
diff --git a/core/src/plugins/gui.ajax/res/js/es6/model/Router.es6 b/core/src/plugins/gui.ajax/res/js/es6/model/Router.es6
index c98c3e25d6..9d06ff9c20 100644
--- a/core/src/plugins/gui.ajax/res/js/es6/model/Router.es6
+++ b/core/src/plugins/gui.ajax/res/js/es6/model/Router.es6
@@ -35,6 +35,7 @@ class Router{
                         pydioObject.goTo(path);
                     }, 100);
                 }
+                pydio.notify("routechange", {workspace:workspace,path:path});
             }
 
         });
diff --git a/core/src/plugins/gui.ajax/res/js/es6/model/User.es6 b/core/src/plugins/gui.ajax/res/js/es6/model/User.es6
index 7f8beb777a..1ace4d8c1c 100644
--- a/core/src/plugins/gui.ajax/res/js/es6/model/User.es6
+++ b/core/src/plugins/gui.ajax/res/js/es6/model/User.es6
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
diff --git a/core/src/plugins/gui.ajax/res/js/es6/util/LangUtils.es6 b/core/src/plugins/gui.ajax/res/js/es6/util/LangUtils.es6
index c9cd623162..1ff8870079 100644
--- a/core/src/plugins/gui.ajax/res/js/es6/util/LangUtils.es6
+++ b/core/src/plugins/gui.ajax/res/js/es6/util/LangUtils.es6
@@ -143,6 +143,24 @@ class LangUtils{
         return results;
     }
 
+    static trimLeft(string, charlist) {
+        if (charlist === undefined) {
+            charlist = "\s";
+        }
+        return string.replace(new RegExp("^[" + charlist + "]+"), "");
+    };
+
+    static trimRight(string, charlist) {
+        if (charlist === undefined) {
+            charlist = "\s";
+        }
+        return string.replace(new RegExp("[" + charlist + "]+$"), "");
+    };
+
+    static trim(string, charlist){
+        return LangUtils.trimLeft(LangUtils.trimRight(string, charlist), charlist);
+    }
+
 }
 
 LangUtils.slugTable = [
diff --git a/core/src/plugins/gui.ajax/res/js/es6/util/XMLUtils.es6 b/core/src/plugins/gui.ajax/res/js/es6/util/XMLUtils.es6
index 925457cd2b..88ddca1245 100644
--- a/core/src/plugins/gui.ajax/res/js/es6/util/XMLUtils.es6
+++ b/core/src/plugins/gui.ajax/res/js/es6/util/XMLUtils.es6
@@ -37,10 +37,12 @@ class XMLUtils{
      * @signature function(element, query)
      */
     static XPathSelectSingleNode(element, query){
-        try{
-            var res = element.selectSingleNode(query);
-            if(res) return res;
-        }catch(e){}
+        if(typeof element.selectSingleNode === "function"){
+            try{
+                var res = element.selectSingleNode(query);
+                if(res) return res;
+            }catch(e){}
+        }
 
         if(!XMLUtils.__xpe) {
             try{
@@ -74,17 +76,19 @@ class XMLUtils{
      * @signature function(element, query)
      */
     static XPathSelectNodes(element, query){
-        try{
+        if(typeof element.selectNodes === "function"){
             try{
-                if(element.ownerDocument){
-                    element.ownerDocument.setProperty("SelectionLanguage", "XPath");
-                }else{
-                    element.setProperty("SelectionLanguage", "XPath");
-                }
+                try{
+                    if(element.ownerDocument && element.ownerDocument.setProperty){
+                        element.ownerDocument.setProperty("SelectionLanguage", "XPath");
+                    }else if(element.setProperty){
+                        element.setProperty("SelectionLanguage", "XPath");
+                    }
+                }catch(e){}
+                var res = Array.from(element.selectNodes(query));
+                if(res) return res;
             }catch(e){}
-            var res = Array.from(element.selectNodes(query));
-            if(res) return res;
-        }catch(e){}
+        }
 
         var xpe = XMLUtils.__xpe;
 
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AbstractEditor.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AbstractEditor.js
index cb0fe73e88..8795137d72 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AbstractEditor.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AbstractEditor.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
@@ -46,7 +46,7 @@ Class.create("AbstractEditor" , {
 	 */
 	editorOptions:null,
     /**
-     * @var An AjxpNode or an array of nodes
+     * @var Node or an array of nodes
      */
     inputNode : null,
 	
@@ -282,7 +282,7 @@ Class.create("AbstractEditor" , {
 	 */
 	updateTitle : function(title){
 		if(this.filenameSpan) {
-            this.filenameSpan.update(title);
+            this.filenameSpan.update(he.escape(title));
         }
 		if(this.fullScreenMode){
 			this.refreshFullScreenTitle();
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.ActionsToolbar.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.ActionsToolbar.js
index e5d5f59609..b2c507c6c2 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.ActionsToolbar.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.ActionsToolbar.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
@@ -35,10 +35,8 @@ Class.create("ActionsToolbar", AjxpPane, {
 		this.element.ajxpPaneObject = this;
 		this.options = Object.extend({
 			buttonRenderer : 'this',
-            skipBubbling: true,
 			toolbarsList : $A(['default', 'put', 'get', 'change', 'user', 'remote']),
             groupOtherToolbars : $A([]),
-            skipCarousel : true,
             manager:null,
             dataModelElementId:null
 		}, options || {});
@@ -49,9 +47,6 @@ Class.create("ActionsToolbar", AjxpPane, {
 			this.options.buttonRenderer = new renderer();
 		}
 		this.toolbars = $H();
-        if(!this.options.skipCarousel){
-            this.initCarousel();
-        }
         if(this.options.styles){
             this.buildActionBarStylingMenu();
             this.style = this.options.defaultStyle;
@@ -238,9 +233,6 @@ Class.create("ActionsToolbar", AjxpPane, {
 			if(hasVisibleActions) sep.show();
 			else sep.hide();
 		}.bind(this) );
-        if(!this.options.skipCarousel){
-		    this.refreshSlides();
-        }
 	},
 	
 	/**
@@ -292,39 +284,7 @@ Class.create("ActionsToolbar", AjxpPane, {
 		}.bind(this));
 		this.toolbars = new Hash();
 	},
-	
-	/**
-	 * Initialize a caroussel to scroll the buttons on small screens
-	 */
-	initCarousel : function(){
-		this.outer = this.element;
-		var origHeight = this.outer.getHeight()-1;
-		this.prev = new Element("a", {className:'carousel-control', rel:'prev', style:'height:'+origHeight+'px;'}).update(new Element('img', {src:ajxpResourcesFolder+'/images/arrow_left.png'}));
-		this.next = new Element("a", {className:'carousel-control', rel:'next', style:'float:right;height:'+origHeight+'px;'}).update(new Element('img', {src:ajxpResourcesFolder+'/images/arrow_right.png'}));
-		this.inner = new Element("div", {id:'buttons_inner', style:'width:1000px;'});
-		this.outer.insert({before:this.prev});
-		this.outer.insert({before:this.next});
-		this.outer.insert(this.inner);		
-		if(Prototype.Browser.IE) this.outer.setStyle({cssFloat:'left'});
-		this.element = this.inner;
-		
-		this.carousel = new Carousel(this.outer, [], $A([this.prev,this.next]), {
-			duration:0.1
-		});
-	},
-	
-	/**
-	 * Refreshes the caroussel slides 
-	 */
-	refreshSlides : function(){
-		var allSlides = $A();
-		this.inner.select('a').each(function(a){
-			if(a.visible()) allSlides.push(a);
-		});
-        this.carousel.refreshSlides(allSlides);
-		this.resize();
-	},
-	
+    
 	/**
 	 * Render an Action for the toolbar
 	 * @param action Action The action
@@ -383,17 +343,7 @@ Class.create("ActionsToolbar", AjxpPane, {
                 button.insert(arrowDiv);
             }
 
-		}else if(!this.options.skipBubbling) {
-			button.observe("mouseover", function(){
-				this.buttonStateHover(button, action);
-			}.bind(this) );
-			button.observe("mouseout", function(){
-				this.buttonStateOut(button, action);
-			}.bind(this) );
 		}
-        if(!this.options.skipBubbling){
-            img.setStyle("width:18px;height:18px;margin-top:8px;");
-        }
         button.hideButton = function(){
             this.hide();
             this.removeClassName("action_visible");
@@ -516,14 +466,12 @@ Class.create("ActionsToolbar", AjxpPane, {
 		});	
 		subMenu.options.beforeShow = function(){
 			button.addClassName("menuAnchorSelected");
-			if(!this.options.skipBubbling) this.buttonStateHover(button, action);
 		  	if(action.subMenuItems.dynamicBuilder){
 		  		action.subMenuItems.dynamicBuilder(subMenu);
 		  	}
 		}.bind(this);		
 		subMenu.options.beforeHide = function(){
 			button.removeClassName("menuAnchorSelected");
-			if(!this.options.skipBubbling) this.buttonStateOut(button, action);
 		}.bind(this);
 		if(!this.element.subMenus) this.element.subMenus = $A([]);
 		this.element.subMenus.push(subMenu);
@@ -613,39 +561,6 @@ Class.create("ActionsToolbar", AjxpPane, {
 
     },
 
-	/**
-	 * Listener for mouseover on the button
-	 * @param button HTMLElement The button
-	 * @param action Action its associated action
-	 */
-	buttonStateHover : function(button, action){		
-		if(button.hasClassName('disabled')) return;
-		if(button.hideTimeout) clearTimeout(button.hideTimeout);
-		new Effect.Morph(button.select('img[id="'+action.options.name +'_button_icon"]')[0], {
-			style:'width:22px; height:22px;margin-top:3px;',
-			duration:0.08,
-			transition:Effect.Transitions.sinoidal,
-			afterFinish: function(){this.updateTitleSpan(button.select('span')[0], 'big');}.bind(this)
-		});
-	},
-	
-	/**
-	 * Listener for mouseout on the button
-	 * @param button HTMLElement The button
-	 * @param action Action its associated action
-	 */
-	buttonStateOut : function(button, action){
-		if(button.hasClassName('disabled')) return;
-		button.hideTimeout = setTimeout(function(){				
-			new Effect.Morph(button.select('img[id="'+action.options.name +'_button_icon"]')[0], {
-				style:'width:18px; height:18px;margin-top:8px;',
-				duration:0.2,
-				transition:Effect.Transitions.sinoidal,
-				afterFinish: function(){this.updateTitleSpan(button.select('span')[0], 'small');}.bind(this)
-			});	
-		}.bind(this), 10);
-	},
-	
 	/**
 	 * Updates the button label
 	 * @param span HTMLElement <span>
@@ -660,44 +575,6 @@ Class.create("ActionsToolbar", AjxpPane, {
 		span.setStyle({fontSize:(state=='big'?'11px':'9px')});
 	},	
 	
-	/**
-	 * Resize the widget. May trigger the apparition/disparition of the Carousel buttons.
-	 */
-	resize : function($super){
-        $super();
-        if(this.options.skipCarousel) {
-            return;
-        }
-		var innerSize = 0;
-		var parentWidth = $(this.outer).parentNode.getWidth();
-		if(Prototype.Browser.IE){
-			parentWidth = $(this.outer).getOffsetParent().getWidth()-4;//document.viewport.getWidth();
-		}
-		var visibles = [];
-		var buttons = this.inner.select('a');
-		buttons.each(function(a){
-			if(a.visible()) visibles.push(a);
-		});
-		if(visibles.length){
-			var last = visibles[visibles.length-1];
-			innerSize = last.cumulativeOffset()[0] + last.getWidth();
-		}
-		if(innerSize > parentWidth){
-            var h = parseInt(this.element.up("div.action_bar").getHeight()) - 1;
-            var m = parseInt( (h - 10) / 2);
-            h = h - m;
-            this.prev.setStyle({height:h+'px',paddingTop:m+'px'});
-            this.next.setStyle({height:h+'px',paddingTop:m+'px'});
-			this.prev.show();
-			this.next.show();
-			this.outer.setStyle({width:(parentWidth-this.prev.getWidth()-this.next.getWidth()) + 'px'});
-		}else{
-			this.prev.hide();
-			this.next.hide();
-			this.carousel.first();
-			this.outer.setStyle({width:parentWidth + 'px'});
-		}
-	},
 	/**
 	 * IAjxpWidget Implementation. Empty.
 	 * @param show Boolean
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.ActivityMonitor.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.ActivityMonitor.js
index 6bdd17ca4e..f37d88ee7b 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.ActivityMonitor.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.ActivityMonitor.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpAutoCompleter.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpAutoCompleter.js
index b8b68e61b4..5fe1d2c518 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpAutoCompleter.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpAutoCompleter.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpBootstrap.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpBootstrap.js
index e82b8350da..1ef12979af 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpBootstrap.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpBootstrap.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
@@ -41,7 +41,7 @@ Class.create("AjxpBootstrap", {
 			this.insertBasicSkeleton(this.parameters.get('MAIN_ELEMENT'));
             var startedFromOpener = false;
             try{
-                if(window.opener && window.opener.ajxpBootstrap){
+                if(window.opener && window.opener.ajxpBootstrap && this.parameters.get('serverAccessPath') === window.opener.ajxpBootstrap.parameters.get('serverAccessPath')){
                     this.parameters = window.opener.ajxpBootstrap.parameters;
                     // Handle queryString case, as it's not passed via get_boot_conf
                     var qParams = document.location.href.toQueryParams();
@@ -321,29 +321,8 @@ Class.create("AjxpBootstrap", {
                     if($('progressBox')) $('progressBox').hide();
                 }});
         };
-        if(!window.ajxpThemeSkipLoaderProgress){
-            var options = {
-                animate		: false,										// Animate the progress? - default: true
-                showText	: false,									// show text with percentage in next to the progressbar? - default : true
-                width		: 154,										// Width of the progressbar - don't forget to adjust your image too!!!
-                boxImage	: window.ajxpResourcesFolder+'/images/progress_box.gif',			// boxImage : image around the progress bar
-                barImage	: window.ajxpResourcesFolder+'/images/progress_bar.gif',	// Image to use in the progressbar. Can be an array of images too.
-                height		: 11,										// Height of the progressbar - don't forget to adjust your image too!!!
-                onTick		: function(pbObj) {
-                    if(pbObj.getPercentage() >= 80){
-                        loaderEndCallback();
-                        return false;
-                    }
-                    return true ;
-                }
-            };
-            this.loaderProgress = new JS_BRAMUS.jsProgressBar($('loaderProgress'), 0, options);
-        }
         document.observe('ajaxplorer:loader_state_update', function(e){
-            var p = e.memo.percent;
-            if(this.loaderProgress){
-                this.loaderProgress.setPercentage(p*100);
-            }else if(p >= 0.8){
+            if(e.memo.percent >= 0.8){
                 loaderEndCallback();
             }
         }.bind(this));
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpDraggable.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpDraggable.js
index 0201da9132..a880554e6a 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpDraggable.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpDraggable.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 
@@ -156,7 +156,7 @@ Class.create("AjxpDraggable", Draggable, {
 			var max = Math.min(nodes.length,5);
 			var maxWidth = 0;
 			for(var i=0;i<max;i++){
-				var text = nodes[i].getLabel() + (i<max-1?",<br>":"");
+				var text = he.escape(nodes[i].getLabel()) + (i<max-1?",<br>":"");
 				maxWidth = Math.max(maxWidth, testStringWidth(text));
 				this._clone.insert(text);
 			}
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpPane.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpPane.js
index 9879774d5b..ad85bf8447 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpPane.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpPane.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpReactComponent.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpReactComponent.js
index cf34a7cebd..3cdb85f89b 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpReactComponent.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpReactComponent.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpReactDialogLoader.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpReactDialogLoader.js
index cfd065c60e..7cd7e8e2a4 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpReactDialogLoader.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpReactDialogLoader.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpSimpleTabs.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpSimpleTabs.js
index d3a2796904..c0d3a575ed 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpSimpleTabs.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpSimpleTabs.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 Class.create("AjxpSimpleTabs", AjxpPane, {
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpSortable.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpSortable.js
index c5d258ba21..af019f41ce 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpSortable.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpSortable.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpTabulator.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpTabulator.js
index 662d672b4e..97e906d84a 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpTabulator.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpTabulator.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 Class.create("AjxpTabulator", AjxpPane, {
@@ -102,6 +102,14 @@ Class.create("AjxpTabulator", AjxpPane, {
             document.observe("ajaxplorer:user_logged", this.loadState.bind(this));
             this.loadState();
         }
+        if(this.options.route){
+            var routeOptions = this.options.route;
+            if(pydio.Router) {
+                this._bindToRouter(routeOptions);
+            } else pydio.observeOnce("loaded", function(){
+                if(pydio.Router) this._bindToRouter(routeOptions);
+            }.bind(this));
+        }
 
 	},
 
@@ -125,6 +133,8 @@ Class.create("AjxpTabulator", AjxpPane, {
                 label = MessageHash[tabInfo.label] || tabInfo.label;
             }
             var title = MessageHash[tabInfo.title] || label.stripTags();
+            title = he.escape(title);
+            label = he.escape(label);
             var options = {className:'toggleHeader toggleInactive'};
             if(!this.options.tabsTips){ options.title = title; }
             td = new Element('span', options);
@@ -165,6 +175,7 @@ Class.create("AjxpTabulator", AjxpPane, {
         if(label && label.innerHTML !== undefined){
             if(label.down('.filenameSpan')){
                 var cont = label.down('.filenameSpan').innerHTML;
+                cont = he.escape(cont);
                 if(cont.length > 25){
                     cont = cont.substr(0,7)+"[...]"+cont.substr(-13);
                     label.down('.filenameSpan').update(cont);
@@ -172,7 +183,7 @@ Class.create("AjxpTabulator", AjxpPane, {
             }
             return label;
         }
-        if(label.stripTags() != label) return label;
+        label = label.stripTags();
         if(!label || !label.length) return '';
         if(label.length > 25){
             return label.substr(0,7)+"[...]"+label.substr(-13);
@@ -481,7 +492,29 @@ Class.create("AjxpTabulator", AjxpPane, {
         this._eventPath = cNode.getPath();
     },
 
-	/**
+    _bindToRouter: function(routeOptions){
+        this.observe("switch", function(tabId){
+            if(tabId){
+                pydio.Router.router.navigate(routeOptions.base + "/" + tabId);
+            }
+        });
+        this._routerObserver = function(object){
+            if('/' + object.workspace === routeOptions.base){
+                var tabId = PathUtils.getBasename(object.path);
+                if(tabId) {
+                    this.switchTabulator(tabId);
+                }else{
+                    this.switchTabulator(this.tabulatorData.first().id);
+                }
+            }
+        }.bind(this);
+        pydio.observe("routechange", this._routerObserver);
+        window.setTimeout(function(){
+            this.notify("switch", this.tabulatorData.first().id);
+        }.bind(this), 500);
+    },
+
+    /**
 	 * Resizes the widget
 	 */
 	resize : function(size, loop){
@@ -601,6 +634,9 @@ Class.create("AjxpTabulator", AjxpPane, {
 		this.htmlElement.update("");
         try{pydio.UI.removeInstanceFromCache(this.htmlElement.id);}catch(e){}
 		this.htmlElement = null;
+        if(this._routerObserver){
+            pydio.stopObserving("routechange", this._routerObserver);
+        }
 	},
 	
 	
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpUsersCompleter.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpUsersCompleter.js
index 1bb3701610..a7ef2b050e 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpUsersCompleter.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpUsersCompleter.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 Class.create("AjxpUsersCompleter", Ajax.Autocompleter, {
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.BackgroundManagerPane.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.BackgroundManagerPane.js
deleted file mode 100644
index d6caaa9315..0000000000
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.BackgroundManagerPane.js
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-/**
- * Bind to the BackgroundTasksManager to display its state.
- */
-Class.create("BackgroundManagerPane", {
-
-	/**
-	 * Constructor
-	 * @param actionManager ActionManager
-	 */
-	initialize:function(actionManager){
-        if(!actionManager){
-            actionManager = pydio.getController();
-        }
-        this.bgManager = actionManager.getBackgroundTasksManager();
-        if(!this.bgManager) return;
-
-        this.insertPanel();
-
-        this.bgManager.observe("update_message", this.updatePanelMessage.bind(this));
-        this.bgManager.observe("update_message_error", this.updatePanelError.bind(this));
-        this.bgManager.observe("tasks_finished", this.hidePanel.bind(this));
-	},
-
-    insertPanel: function(){
-        this.panel = new Element('div').addClassName('backgroundPanel');
-        if(Prototype.Browser.IE){
-            this.panel.setStyle({width:'35%'});
-        }
-        this.panel.hide();
-        document.body.insert(this.panel);
-    },
-
-    updatePanelMessage : function(message){
-        var imgString = '<img src="'+ajxpResourcesFolder+'/images/loadingImage.gif" width="16" align="absmiddle">';
-        this.panel.update(imgString+' '+message);
-        Effect.Appear(this.panel);
-    },
-
-	/**
-	 * Interrupt the task on error
-	 * @param errorMessage String
-	 */
-	updatePanelError:function(errorMessage){
-		this.panel.update(errorMessage);
-		this.panel.insert(this.makeCloseLink());
-	},
-	/**
-	 * All tasks are processed
-	 */
-	hidePanel:function(){
-        Effect.SwitchOff(this.panel);
-	},
-	
-	/**
-	 * Create a "Close" link
-	 */
-	makeCloseLink:function(){
-		return new Element('a', {href:'#'}).update('Close').observe('click', function(e){
-			Event.stop(e);
-            this.hidePanel();
-		}.bind(this));
-	}
-});
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.BookmarksBar.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.BookmarksBar.js
index 15c19bec91..9be44daa35 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.BookmarksBar.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.BookmarksBar.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.Breadcrumb.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.Breadcrumb.js
index 4499dea02b..6dc00d4265 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.Breadcrumb.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.Breadcrumb.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
@@ -86,15 +86,15 @@ Class.create("Breadcrumb", AjxpPane, {
                         refresh = '<i class="icon-refresh ajxp-goto-refresh" title="'+MessageHash[149]+'"></i>';
                     }
                     var first = pos == 0 ? ' first-bread':'';
-                    clickPath += "<li><span class='ajxp-goto "+first+"' data-goTo='"+pair.key+"'><em>"+pair.value+"</em></span></li>";
+                    clickPath += "<li><span class='ajxp-goto "+first+"' data-goTo='"+he.escape(pair.key)+"'><em>"+he.escape(pair.value)+"</em></span></li>";
                     if(refresh){
-                        clickPath += "<li><i class='ajxp-goto' data-goTo='"+pair.key+"'>"+refresh+"</i></li>";
+                        clickPath += "<li><i class='ajxp-goto' data-goTo='"+he.escape(pair.key)+"'>"+refresh+"</i></li>";
                     }
                 }else{
                     if(pos == length-1){
                         refresh = '<span class="icon-refresh ajxp-goto-refresh" title="'+MessageHash[149]+'"></span>';
                     }
-                    clickPath += (pair.value != pos == 0 || !this.options['hide_home_icon'] ? chevron : "") + "<span class='ajxp-goto' data-goTo='"+pair.key+"'>"+pair.value+refresh+"</span>";
+                    clickPath += (pair.value != pos == 0 || !this.options['hide_home_icon'] ? chevron : "") + "<span class='ajxp-goto' data-goTo='"+he.escape(pair.key)+"'>"+he.escape(pair.value)+refresh+"</span>";
                 }
                 pos ++;
             }.bind(this));
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.DataModelProperty.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.DataModelProperty.js
index 7c1dc92fd1..11f023d9c6 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.DataModelProperty.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.DataModelProperty.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 Class.create("DataModelProperty", {
@@ -42,7 +42,7 @@ Class.create("DataModelProperty", {
                     element.update(l?l:'');
                     break;
                 case "root_label":
-                    element.update(dm.getRootNode().getLabel());
+                    element.update(he.escape(dm.getRootNode().getLabel()));
                     break;
                 case "metadata":
                     if(options.metadata_sum){
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FetchedResultPane.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FetchedResultPane.js
index 50e6b27e80..718bae62bc 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FetchedResultPane.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FetchedResultPane.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FilesList.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FilesList.js
index 8d71c00f9f..b28493c814 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FilesList.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FilesList.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
@@ -257,7 +257,13 @@ Class.create("FilesList", SelectableElements, {
 	getDomNode : function(){
 		return this.htmlElement;
 	},
-	
+
+    reSort: function(){
+        if(this._sortableTable){
+            this._sortableTable.sort(0, !!this.descending);
+        }
+    },
+
 	/**
 	 * Implementation of the IAjxpWidget methods
 	 */
@@ -343,12 +349,12 @@ Class.create("FilesList", SelectableElements, {
 	 */
 	contextObserver : function(e){
 		if(!this.crtContext || !this.htmlElement) return;
-		//console.log('FILES LIST : FILL');
-        var base = getBaseName(this.crtContext.getLabel());
-        if(!base){
-            try{base = ajaxplorer.user.repositories.get(ajaxplorer.repositoryId).getLabel();}catch(e){}
-        }
         if(!this.options.muteUpdateTitleEvent){
+            //console.log('FILES LIST : FILL');
+            var base = getBaseName(this.crtContext.getLabel());
+            if(!base){
+                try{base = ajaxplorer.user.repositories.get(ajaxplorer.repositoryId).getLabel();}catch(e){}
+            }
             this.htmlElement.fire("editor:updateTitle", base);
         }
         this.empty();
@@ -1403,9 +1409,7 @@ Class.create("FilesList", SelectableElements, {
     flushBulkUpdatingMode:function(){
         this.bulkUpdating = false;
         this.initRows();
-        if(this._sortableTable){
-            this._sortableTable.sort(0);
-        }
+        this.reSort();
     },
 
     getRenderer : function(){
@@ -1788,7 +1792,7 @@ Class.create("FilesList", SelectableElements, {
                 var textLabel = new Element("span", {
                     id          :'ajxp_label',
                     className   :'text_label'+fullview
-                }).update(metaData.get('text'));
+                }).update(he.escape(metaData.get('text')));
 
                 if(metaData.get('fonticon') && pydio.currentThemeUsesIconFonts){
                     textLabel.insert({top: new Element('span', {className: 'mimefont mdi mdi-' + metaData.get('fonticon')})});
@@ -1935,7 +1939,7 @@ Class.create("FilesList", SelectableElements, {
 		var label = new Element('div', {
 			className:"thumbLabel",
 			title:textNode.stripTags()
-		}).update(textNode);
+		}).update(he.escape(textNode));
 		
 		innerSpan.insert({"bottom":img});
 		innerSpan.insert({"bottom":label});
@@ -2031,7 +2035,7 @@ Class.create("FilesList", SelectableElements, {
 		var label = new Element('div', {
 			className:"thumbLabel",
 			title:textNode.stripTags()
-		}).update(textNode);
+		}).update(he.escape(textNode));
 
 		innerSpan.insert({"bottom":img});
 		//newRow.insert({"bottom":label});
@@ -2199,16 +2203,7 @@ Class.create("FilesList", SelectableElements, {
 		var percent = parseInt( parseInt(ajxpNode.getMetadata().get("bytesize")) / parseInt(ajxpNode.getMetadata().get("target_bytesize")) * 100  );
 		var uuid = "ajxp_"+(new Date()).getTime();
 		var div = new Element('div', {style:'padding-left:3px;', className:'text_label'}).update('<span class="percent_text" style="line-height:19px;padding-left:5px;">'+percent+'%</span>');
-		var span = new Element('span', {id:uuid}).update('0%');		
-		var options = {
-			animate		: true,										// Animate the progress? - default: true
-			showText	: false,									// show text with percentage in next to the progressbar? - default : true
-			width		: 80,										// Width of the progressbar - don't forget to adjust your image too!!!
-			boxImage	: window.ajxpResourcesFolder+'/images/progress_box_80.gif',			// boxImage : image around the progress bar
-			barImage	: window.ajxpResourcesFolder+'/images/progress_bar_80.gif',	// Image to use in the progressbar. Can be an array of images too.
-			height		: 8,										// Height of the progressbar - don't forget to adjust your image too!!!
-            visualStyle : 'position:relative;'
-		};
+		var span = new Element('span', {id:uuid, className:'partSizeRender'}).update('0%');
         if(type == "detail" && element.down(".thumbnail_cell_metadata")){
             element.down(".thumbnail_cell_metadata").update(div);
         }else{
@@ -2239,7 +2234,6 @@ Class.create("FilesList", SelectableElements, {
 		}
 		span.setAttribute('data-target_size', ajxpNode.getMetadata().get("target_bytesize"));
 		window.setTimeout(function(){
-			span.pgBar = new JS_BRAMUS.jsProgressBar(span, percent, options);
 			var pe = new PeriodicalExecuter(function(){
 				if(!$(uuid)){ 
 					pe.stop();
@@ -2257,7 +2251,7 @@ Class.create("FilesList", SelectableElements, {
 						pydio.getController().fireAction("refresh");
 					}else{
 						var newPercentage = parseInt( parseInt(transport.responseText)/parseInt($(uuid).getAttribute('data-target_size'))*100 );
-						$(uuid).pgBar.setPercentage(newPercentage);
+						$(uuid).setStyle({backgroundSize:newPercentage + '% 100%'});
 						$(uuid).next('span.percent_text').update(newPercentage+"%");
 					}
 				};
@@ -2284,7 +2278,7 @@ Class.create("FilesList", SelectableElements, {
 		elList.each(function(element){
 
             try{
-                var image_element = element.IMAGE_ELEMENT || element.down('img');
+                var image_element = element.IMAGE_ELEMENT /*|| element.down('img')*/;
                 var label_element = element.LABEL_ELEMENT || element.down('.thumbLabel');
             }catch(e){
                 return;
@@ -2399,6 +2393,9 @@ Class.create("FilesList", SelectableElements, {
 				rows[i].remove();
 			}
 		}
+        this.htmlElement.select("div[data-groupByValue] > h3").map(function(head){
+            head.remove();
+        });
 		if(!skipFireChange) this.fireChange();
         this.notify("rows:didClear");
 	},
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FoldersTree.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FoldersTree.js
index b8a8d6c333..0867d14f5b 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FoldersTree.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FoldersTree.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
@@ -286,7 +286,7 @@ Class.create("FoldersTree", AjxpPane, {
 	 * @param newIcon String
 	 */
 	changeNodeLabel: function(nodeId, newLabel, newIcon){	
-		$(nodeId+'-label').update(newLabel);
+		$(nodeId+'-label').update(he.escape(newLabel));
 		if(newIcon){
 			var realNode = webFXTreeHandler.all[nodeId];
 			realNode.icon = newIcon;
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FormManager.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FormManager.js
index a4c483ff29..d75c0a29f2 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FormManager.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.FormManager.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
@@ -139,9 +139,9 @@ Class.create("FormManager", {
                     conn.onComplete = function(transport){
                         element.removeClassName('SF_inlineButtonWorking');
                         if(transport.responseText.startsWith('SUCCESS:')){
-                            ajaxplorer.displayMessage("SUCCESS", transport.responseText.replace("SUCCESS:", ""));
+                            pydio.displayMessage("SUCCESS", transport.responseText.replace("SUCCESS:", ""));
                         }else{
-                            ajaxplorer.displayMessage("ERROR", transport.responseText.replace("ERROR:", ""));
+                            pydio.displayMessage("ERROR", transport.responseText.replace("ERROR:", ""));
                         }
                         element.siblings().each(function(el){
                             if(el.pe) el.pe.onTimerEvent();
@@ -215,17 +215,14 @@ Class.create("FormManager", {
                         choices = ["loading|"+MessageHash[466]+"..."];
                         json_file = param.get("choices").split(":")[1];
                     }else if(param.get("choices") == "AJXP_AVAILABLE_LANGUAGES"){
-                        var object = window.ajxpBootstrap.parameters.get("availableLanguages");
                         choices = [];
-                        for(key in object){
-                            if(object.hasOwnProperty(key)){
-                                choices.push(key + "|" + object[key]);
-                            }
-                        }
+                        pydio.listLanguagesWithCallback(function(key, label){
+                            choices.push(key + '|' + label);
+                        });
                     }else if(param.get("choices") == "AJXP_AVAILABLE_REPOSITORIES"){
                         choices = [];
-                        if(ajaxplorer.user){
-                            ProtoCompat.map2hash(ajaxplorer.user.repositories).each(function(pair){
+                        if(pydio.user){
+                            ProtoCompat.map2hash(pydio.user.repositories).each(function(pair){
                                 choices.push(pair.value.getId() + '|' + pair.value.getLabel());
                             });
                         }
@@ -253,7 +250,7 @@ Class.create("FormManager", {
                     }else{
                         selectedString = (defaultValue == cValue ? ' selected' : '');
                     }
-                    element += '<option value="'+cValue+'"'+selectedString+'>'+cLabel+'</option>';
+                    element += '<option value="'+cValue+'"'+selectedString+'>'+he.escape(cLabel)+'</option>';
                 }
                 element += '</select><span class="select-styler"></span>';
             }else if(type == "image" && param.get("uploadAction")){
@@ -428,7 +425,11 @@ Class.create("FormManager", {
                                 var opt = new Element("OPTGROUP", {label:key});
                                 element.insert(opt);
                                 for (var index=0;index<json.LIST[key].length;index++){
-                                    element.insert(new Element("OPTION").update(json.LIST[key][index].action));
+                                    var option = new Element("OPTION").update(json.LIST[key][index].action);
+                                    if(json.LIST[key][index].action == defaultValue) {
+                                        option.setAttribute("selected", "true");
+                                    }
+                                    element.insert(option);
                                 }
                             }
                         }
@@ -436,7 +437,9 @@ Class.create("FormManager", {
                         for (key in json.LIST){
                             if(json.LIST.hasOwnProperty(key)){
                                 var option = new Element("OPTION", {value:key}).update(json.LIST[key]);
-                                if(key == defaultValue) option.setAttribute("selected", "true");
+                                if(key == defaultValue) {
+                                    option.setAttribute("selected", "true");
+                                }
                                 element.insert(option);
                             }
                         }
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.HeaderResizer.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.HeaderResizer.js
index e22e518222..0ceac6a9da 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.HeaderResizer.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.HeaderResizer.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.InfoPanel.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.InfoPanel.js
index 01475ae5b8..fa1cfa8bac 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.InfoPanel.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.InfoPanel.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
@@ -141,6 +141,9 @@ Class.create("InfoPanel", AjxpPane, {
             this.htmlElement.select(".class-FetchedResultPane").each(function(el){
                 el.ajxpPaneObject.destroy();
             });
+            this.htmlElement.select(".infopanel-destroyable-pane").each(function(el){
+                el.destroy();
+            });
         }
 		this.setContent('');
 	},
@@ -245,8 +248,13 @@ Class.create("InfoPanel", AjxpPane, {
         }else{
             uniqNode = passedNode;
         }
+        if(this._currentObservedNode){
+            this._currentObservedNode.stopObserving("node_replaced", this.updateHandler);
+        }
+        this._currentObservedNode = uniqNode;
+        this._currentObservedNode.observeOnce("node_replaced", this.updateHandler);
 
-        this.updateTitle(uniqNode.getLabel());
+        this.updateTitle(he.escape(uniqNode.getLabel()));
 		var isFile = false;
 		if(uniqNode) isFile = uniqNode.isLeaf();
         if(!isFile && uniqNode && uniqNode.isRoot()){
@@ -433,9 +441,9 @@ Class.create("InfoPanel", AjxpPane, {
                 }
 				tAttributes.each(function(attName){
 					if(attName == 'basename' && metadata.get('filename')){
-						this[attName] = getBaseName(metadata.get('filename'));
+						this[attName] = he.escape(getBaseName(metadata.get('filename')));
                         if(metadata.get('text')){
-                            this[attName] = metadata.get('text');
+                            this[attName] = he.escape(metadata.get('text'));
                         }
 					} else if(attName == 'compute_image_dimensions'){
 						if(metadata.get('image_width') && metadata.get('image_height')){
@@ -455,10 +463,10 @@ Class.create("InfoPanel", AjxpPane, {
 					} else if(attName == 'preview_simple'){
                         if(multipleNodes){
                             var s ='';
-                            var simpleTpl = new Template('<div class="info_panel_multiple_tile"><div class="tile_preview">#{preview}</div><div class="tile_label">#{label}</div></div>');
+                            var simpleTpl = new Template('<div class="info_panel_multiple_tile"><div class="tile_preview_container"><div class="tile_preview">#{preview}</div></div><div class="tile_label">#{label}</div></div>');
                             multipleNodes.each(function(n){
                                 var p = oThis.getPreviewElement(n, false, false);
-                                var args = {label:getBaseName(n.getMetadata().get('filename'))};
+                                var args = {label:he.escape(PathUtils.getBasename(n.getMetadata().get('filename')))};
                                 if(Object.isString(p)) args['preview']=p;
                                 else if(Object.isElement(p) && p.outerHTML) args['preview']= p.outerHTML;
                                 s += simpleTpl.evaluate(args);
@@ -489,7 +497,7 @@ Class.create("InfoPanel", AjxpPane, {
 						}
 						this[attName] = url;
 					} else if(metadata.get(attName)){
-						this[attName] = metadata.get(attName);
+						this[attName] = he.escape(metadata.get(attName));
 					} else{
 						this[attName] = '';
 					}
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.LocationBar.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.LocationBar.js
index b91aa8c3ae..fe0f4c0384 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.LocationBar.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.LocationBar.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
@@ -235,7 +235,7 @@ Class.create("LocationBar", {
 		this.realPath = newPath;
 		this.currentLabel = this.realPath;
 		if(getBaseName(newPath) != newNode.getLabel()){
-			this.currentLabel = getRepName(newPath) + '/' + newNode.getLabel();
+			this.currentLabel = getRepName(newPath) + '/' + he.escape(newNode.getLabel());
 		}
 		this.label.update(this.currentLabel);
 		this.currentPath.value = this.realPath;
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.LogoWidget.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.LogoWidget.js
index 324b2688cd..1e8bd5d9d8 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.LogoWidget.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.LogoWidget.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 Class.create("LogoWidget", AjxpPane, {
 
@@ -202,8 +202,9 @@ Class.create("LogoWidget", AjxpPane, {
             this.titleDiv.setStyle({
                 position:'absolute',
                 left : (imgW + 16) + 'px',
-                top : (htHeight - (has_by?42:39)) + 'px',
-                fontSize : '19px'
+                top : (htHeight - (has_by?42:36)) + 'px',
+                fontSize : (has_by?'19px':'22px'),
+                fontWeight: 300
             });
         }
 
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.Modal.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.Modal.js
index c1b7aca559..f294ac0feb 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.Modal.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.Modal.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
@@ -710,7 +710,7 @@ Class.create("Modal", {
 			this.messageBox.update(this.messageContent);
 			this.messageBox.observe("click", this.closeMessageDiv.bind(this));
 		}
-		message = message.stripScripts();
+		message = he.escape(message);
 		message = message.replace(new RegExp("(\\n)", "g"), "<br>");
 		if(messageType == "ERROR"){ this.messageBox.removeClassName('logMessage');  this.messageBox.addClassName('errorMessage');}
 		else { this.messageBox.removeClassName('errorMessage');  this.messageBox.addClassName('logMessage');}
@@ -732,14 +732,11 @@ Class.create("Modal", {
         }else {
 			container = $(ajxpBootstrap.parameters.get("MAIN_ELEMENT"));
 		}
-		var containerOffset = Position.cumulativeOffset(container);
-		var containerDimensions = container.getDimensions();
-		var boxWidth = parseInt(containerDimensions.width * 90/100);
-		var leftPosition = containerOffset[0] + parseInt(containerDimensions.width*5/100);
+        var boxPosition = this.computeMessageBoxPosition(container);
 		this.messageBox.setStyle({
 			bottom:'20px',
-			left:leftPosition+'px',
-			width:boxWidth+'px'
+			left:boxPosition.left+'px',
+			width:boxPosition.width+'px'
 		});
 		new Effect.MessageAppear(this.messageBox);
         if(window.console){
@@ -748,6 +745,27 @@ Class.create("Modal", {
         }
 		this.tempoMessageDivClosing();
 	},
+
+    computeMessageBoxPosition: function(container){
+
+        var dim = container.getDimensions();
+        if(!container.visible()) dim = {width:0, height: 0};
+        while((!dim.width || !dim.height) && container.parentNode){
+            container = container.parentNode;
+            if(!container.visible()) continue;
+            if(container === window.document) {
+                dim = document.viewport.getDimensions();
+            } else {
+                dim = container.getDimensions();
+            }
+        }
+        var offset = Position.cumulativeOffset(container);
+        var boxWidth = parseInt(dim.width * 90/100);
+        var leftPosition = offset[0] + parseInt(dim.width*5/100);
+        return {left: leftPosition, width: boxWidth};
+        
+    },
+
 	/**
 	 * Bootloader helper. Sets total steps
 	 * @param count Integer
@@ -808,7 +826,13 @@ Class.create("Modal", {
 			Event.stopObserving(window, "resize", this.currentResizeListener);
             this.currentResizeListener = null;
 		}
-	}
+	},
+    /**
+     * Encapsulate HideLightBox call
+     */
+    dismiss: function(){
+        hideLightBox();
+    }
 });
 	
 var modal = new Modal();
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.MultiDownloader.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.MultiDownloader.js
index d25829536c..fca0c6d1ac 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.MultiDownloader.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.MultiDownloader.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
@@ -56,8 +56,9 @@
 		var new_row = new Element( 'div' );
 
 		var new_row_button = new Element('a');
-		new_row_button.href= this.downloadUrl + fileName;		
-		new_row_button.insert('<img src="'+ajxpResourcesFolder+'/images/actions/16/download_manager.png" height="16" width="16" align="absmiddle" border="0"> '+(label?label:getBaseName(fileName)));
+		new_row_button.href= this.downloadUrl + fileName;
+        var display = he.escape(label?label:getBaseName(fileName));
+		new_row_button.insert('<span class="mdi mdi-download"></span> '+ display);
 
 		new_row_button.multidownloader = this;
 		
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.PreviewFactory.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.PreviewFactory.js
index 0ecc469ac1..595fc197aa 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.PreviewFactory.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.PreviewFactory.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.PropertyPanel.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.PropertyPanel.js
index e978b2b92d..3e7c0fc6e5 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.PropertyPanel.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.PropertyPanel.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.PydioUI.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.PydioUI.js
index d366f5e312..5db491112c 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.PydioUI.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.PydioUI.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 Class.create("PydioUI", {
 
@@ -91,6 +91,13 @@ Class.create("PydioUI", {
         }
     },
 
+    getSharedPreviewTemplateForEditor: function(editorData, node){
+        if(Class.getByName(editorData.editorClass).prototype.getSharedPreviewTemplate) {
+            return Class.getByName(editorData.editorClass).prototype.getSharedPreviewTemplate(node);
+        }
+        return null;
+    },
+
     registerAsMessageBoxReference: function(element){
         this._messageBoxReference = element;
     },
@@ -248,8 +255,6 @@ Class.create("PydioUI", {
             this.initTabNavigation();
             this.blockShortcuts = false;
             this.blockNavigation = false;
-            // TODO : ADD TO XML TEMPLATES INSTEAD
-            this.bgManagerPane = new BackgroundManagerPane();
             modal.updateLoadingProgress('Navigation loaded');
         }.bind(this));
 
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.RepositorySelect.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.RepositorySelect.js
index 20a7483cc3..fe3555f41e 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.RepositorySelect.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.RepositorySelect.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
@@ -135,11 +135,11 @@ Class.create("RepositorySelect", {
                     return;
                 }
 
-                var label =  repoObject.getHtmlBadge() + '<span class="menu_label">' + repoObject.getLabel() + '</span>';
-                var alt = repoObject.getLabel();
+                var label =  repoObject.getHtmlBadge() + '<span class="menu_label">' + he.escape(repoObject.getLabel()) + '</span>';
+                var alt = he.escape(repoObject.getLabel());
                 if(repoObject.getDescription()){
-                    label += '<span class="menu_description">' + repoObject.getDescription() + '</span>';
-                    alt += '-' + repoObject.getDescription();
+                    label += '<span class="menu_description">' + he.escape(repoObject.getDescription()) + '</span>';
+                    alt += '-' + he.escape(repoObject.getDescription());
                 }else{
                     alt += (repoObject.getOwner() ? " ("+MessageHash[413]+" " + repoObject.getOwner()+ ")":"");
                 }
@@ -166,7 +166,7 @@ Class.create("RepositorySelect", {
 					actions.push(actionData);
 				}				
 				if(key == repositoryId){
-					if(this.label) this.label.setValue(repoObject.getLabel());
+					if(this.label) this.label.setValue(he.escape(repoObject.getLabel()));
                     if(this.icon) this.icon.src = repoObject.getIcon();
 				}
 			}.bind(this));
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.RepositorySimpleLabel.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.RepositorySimpleLabel.js
index 56eeff805e..c44ee52625 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.RepositorySimpleLabel.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.RepositorySimpleLabel.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
@@ -69,9 +69,9 @@ Class.create("RepositorySimpleLabel", AjxpPane, {
             if(repositoryList && repositoryList.size()){
                 var repoObject = repositoryList.get(repositoryId);
                 if(repoObject){
-                    this.htmlElement.down("div.repository_title").update(repoObject.getLabel());
+                    this.htmlElement.down("div.repository_title").update(he.escape(repoObject.getLabel()));
                     if(this.options.displayWorkspaceDescription){
-                        this.htmlElement.down("div.repository_description").update(repoObject.getDescription());
+                        this.htmlElement.down("div.repository_description").update(he.escape(repoObject.getDescription()));
                     }
                 }
             }
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.SearchEngine.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.SearchEngine.js
index ba3024e5e3..3b96a18d9f 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.SearchEngine.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.SearchEngine.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
@@ -524,10 +524,8 @@ Class.create("SearchEngine", AjxpPane, {
         }else{
             $(this._ajxpOptions.toggleResultsVisibility).setStyle({display:'none'});
         }
-        if(this._fileList) {
-            this._fileList.showElement(show);
-            this._dataModel.setSelectedNodes([]);
-        }
+        this._fileList.showElement(show);
+        this._dataModel.setSelectedNodes([]);
     },
 
 	/**
@@ -569,9 +567,7 @@ Class.create("SearchEngine", AjxpPane, {
             }
         }
 
-        if(this._fileList){
-            this._fileList.resize();
-        }
+        this._fileList.resize();
 
 		if(this.htmlElement && this.htmlElement.visible()){
 			//this._inputBox.setStyle({width:Math.max((this.htmlElement.getWidth() - this.htmlElement.getStyle("paddingLeft")- this.htmlElement.getStyle("paddingRight") -70),70) + "px"});
@@ -579,11 +575,9 @@ Class.create("SearchEngine", AjxpPane, {
 	},
 	
 	destroy : function(){
-        if(this._fileList){
-            pydio.UI.unregisterFocusable(this._fileList);
-            this._fileList.destroy();
-            this._fileList = null;
-        }
+        pydio.UI.unregisterFocusable(this._fileList);
+        this._fileList.destroy();
+        this._fileList = null;
         if(this.htmlElement) {
             var ajxpId = this.htmlElement.id;
             this.htmlElement.update('');
@@ -703,12 +697,16 @@ Class.create("SearchEngine", AjxpPane, {
 	 * Perform search
 	 */
 	search : function(limit, skipClear){
+        if(this._state === 'searching' || this._state === 'interrupt'){
+            return;
+        }
         if(!limit){
             this.currentLimitDefault = true;
             limit = 100;
         }else{
             this.currentLimitDefault = false;
         }
+        this.showRecycleResults = false;
 		var text = this._inputBox.value.toLowerCase();
         var searchQuery;
         var metadata = this.parseMetadataForm();
@@ -752,7 +750,7 @@ Class.create("SearchEngine", AjxpPane, {
         if(this._ajxpOptions.toggleResultsVisibility){
             if(!$(this._ajxpOptions.toggleResultsVisibility).down("div.panelHeader.toggleResults")){
                 $(this._ajxpOptions.toggleResultsVisibility).insert({top:"<div class='panelHeader toggleResults'><span class='results_string'>Results</span><span class='close_results mdi mdi-close'></span><div id='display_toolbar'></div></div>"});
-                this.tb = new ActionsToolbar($(this._ajxpOptions.toggleResultsVisibility).down("#display_toolbar"), {submenuClassName:"panelHeaderMenu",submenuPosition:"bottom right",toolbarsList:["ajxp-search-result-bar"],skipBubbling:true, skipCarousel:true,submenuOffsetTop:2});
+                this.tb = new ActionsToolbar($(this._ajxpOptions.toggleResultsVisibility).down("#display_toolbar"), {submenuClassName:"panelHeaderMenu",submenuPosition:"bottom right",toolbarsList:["ajxp-search-result-bar"],submenuOffsetTop:2});
                 this.tb.actionsLoaded({memo:pydio.getController().actions});
                 this.tb.element.select('a').invoke('show');
                 this.resultsDraggable = new Draggable(this._ajxpOptions.toggleResultsVisibility, {
@@ -814,9 +812,7 @@ Class.create("SearchEngine", AjxpPane, {
 		// Clear the results
         this.hasResults = false;
         this._rootNode.clear();
-        if(this._fileList) {
-            this._fileList.empty(true);
-        }
+        this._fileList.empty(true);
         this._even = false;
 	},
 	/**
@@ -829,60 +825,12 @@ Class.create("SearchEngine", AjxpPane, {
 
         var noRes =  $(this._resultsBoxId).down('#no-results-found');
         if(noRes) noRes.remove();
-
-        if(this._rootNode){
-            try{
-                // Some derived hooks can trigger errors, ignore them.
-                this._rootNode.addChild(ajxpNode);
-            }catch(e){}
-            return;
-        }
-
-		var fileName = ajxpNode.getLabel();
-		var icon = ajxpNode.getIcon();
-		// Display the result in the results box.
-		if(folderName == "") folderName = "/";
-        if(this._searchMode == "remote"){
-            folderName = getRepName(ajxpNode.getPath());
-        }
-		var isFolder = false;
-		if(icon == null) // FOLDER CASE
-		{
-			isFolder = true;
-			icon = 'folder.png';
-			if(folderName != "/") folderName += "/";
-			folderName += fileName;
-		}
-        var imgPath = resolveImageSource(icon, '/images/mimes/16', 16);
-		var imageString = '<img align="absmiddle" width="16" height="16" src="'+imgPath+'"> ';
-		var stringToDisplay;
-		if(metaFound){
-			stringToDisplay = fileName + ' (' + this.highlight(metaFound, this.crtText, 20)+ ') ';
-		}else{
-			stringToDisplay = this.highlight(fileName, this.crtText);
-		}
-		
-		var divElement = new Element('div', {title:MessageHash[224]+' '+ folderName, className:(this._even?'even':'')}).update(imageString+stringToDisplay);
-        this._even = !this._even;
-		$(this._resultsBoxId).insert(divElement);
-        if(this._searchMode == 'remote' && ajxpNode.getMetadata().get("search_score")){
-            /*divElement.insert(new Element('a', {className:"searchUnindex"}).update("X"));*/
-            divElement.insert(new Element('span', {className:"searchScore"}).update("SCORE "+ajxpNode.getMetadata().get("search_score")));
-        }
-		if(isFolder)
-		{
-			divElement.observe("click", function(e){
-				ajaxplorer.goTo(folderName);
-			});
-		}
-		else
-		{
-			divElement.observe("click", function(e){
-				ajaxplorer.goTo(folderName+"/"+fileName);
-			});
-		}
-        this.hasResults = true;
-	},
+        try{
+            // Some derived hooks can trigger errors, ignore them.
+            this._rootNode.addChild(ajxpNode);
+        }catch(e){}
+    },
+    
     addNoResultString : function(){
         if(!$(this._resultsBoxId).down('#no-results-found') && !(this._rootNode && ProtoCompat.map2values(this._rootNode.getChildren()).length)){
             $(this._resultsBoxId).insert({top: new Element('div', {id:'no-results-found'}).update(MessageHash[478])});
@@ -1024,17 +972,14 @@ Class.create("SearchEngine", AjxpPane, {
 			var nodes = XPathSelectNodes(oXmlDoc.documentElement, "tree");
 			for (var i = 0; i < nodes.length; i++) 
 			{
-				if (nodes[i].tagName == "tree") 
-				{
-					var node = this.parseAjxpNode(nodes[i]);					
-					this._searchNode(node, currentFolder);
-					if(!node.isLeaf())
-					{
-						var newPath = node.getPath();
-						this.appendFolderToQueue(newPath, node.getMetadata().get("remote_indexation"));
-					}
-				}
-			}		
+                var node = this.parseAjxpNode(nodes[i]);
+                this._searchNode(node, currentFolder);
+                if(!node.isLeaf())
+                {
+                    var newPath = node.getPath();
+                    this.appendFolderToQueue(newPath, node.getMetadata().get("remote_indexation"));
+                }
+			}
 		}
 	},
 	
@@ -1043,19 +988,11 @@ Class.create("SearchEngine", AjxpPane, {
 			this.updateStateFinished();
 			return;
 		}
-        var paginationNode = XMLUtils.XPathSelectSingleNode(oXmlDoc.documentElement, "pagination");
         var showAllDiv = this.htmlElement.down('#search_show_all');
         if(showAllDiv) showAllDiv.remove();
-        if(paginationNode && this.currentLimitDefault){
-            var totalCount = parseInt(paginationNode.getAttribute("count"));
-            showAllDiv = new Element('div', {id:'search_show_all'}).update(pydio.MessageHash['543'].replace('%s', 100) + ' ');
-            var showAllLink = new Element('a').update(pydio.MessageHash['544']);
-            showAllLink.observe("click", function(){
-                this.search(-1, true);
-            }.bind(this));
-            showAllDiv.insert(showAllLink);
-            this.htmlElement.down("#basic_search").insert(showAllDiv);
-        }
+        var recycleDiv = this.htmlElement.down('#search_recycle_hidden');
+        if(recycleDiv) recycleDiv.remove();
+
 		var nodes = XMLUtils.XPathSelectNodes(oXmlDoc.documentElement, "tree");
         if(!nodes.length){
             this.addNoResultString();
@@ -1063,39 +1000,65 @@ Class.create("SearchEngine", AjxpPane, {
             var noRes =  $(this._resultsBoxId).down('#no-results-found');
             if(noRes) noRes.remove();
         }
-        if(this._fileList){
-            this._fileList.setBulkUpdatingMode();
-        }
+        this._fileList.setBulkUpdatingMode();
         var resultsCount = 0;
-		for (var i = 0; i < nodes.length; i++) 
+        var recycleCount = 0;
+        var recycle = pydio.getContextHolder().getRootNode().getMetadata().get("repo_has_recycle");
+		for (var i = 0; i < nodes.length; i++)
 		{
-			if (nodes[i].tagName == "tree")
-			{
-				var ajxpNode = this.parseAjxpNode(nodes[i]);
-                if(this.hasMetaSearch()){
-                    var searchCols = this.getSearchColumns();
-                    var added = false;
-                    for(var k=0;k<searchCols.length;k++){
-                        var meta = ajxpNode.getMetadata().get(searchCols[k]);
-                        if(meta && meta.toLowerCase().indexOf(this.crtText) != -1){
-                            this.addResult(currentFolder, ajxpNode, meta);
-                            added = true;
-                        }
-                    }
-                    if(!added){
-                        this.addResult(currentFolder, ajxpNode);
+            var ajxpNode = this.parseAjxpNode(nodes[i]);
+            if(recycle && ajxpNode.getPath().startsWith(recycle)){
+                recycleCount ++;
+                if(!this.showRecycleResults) continue;
+            }
+            if(this.hasMetaSearch()){
+                var searchCols = this.getSearchColumns();
+                var added = false;
+                for(var k=0;k<searchCols.length;k++){
+                    var meta = ajxpNode.getMetadata().get(searchCols[k]);
+                    if(meta && meta.toLowerCase().indexOf(this.crtText) != -1){
+                        this.addResult(currentFolder, ajxpNode, meta);
+                        resultsCount ++;
+                        added = true;
                     }
-                }else{
-				    this.addResult(currentFolder, ajxpNode);
                 }
-			}
+                if(!added){
+                    this.addResult(currentFolder, ajxpNode);
+                    resultsCount ++;
+                }
+            }else{
+                this.addResult(currentFolder, ajxpNode);
+                resultsCount ++;
+            }
 		}
-		if(this._fileList){
-            //this._fileList.reload();
-            this._fileList.flushBulkUpdatingMode();
-            this._fileList._sortableTable.sort(0);
+        this._fileList.flushBulkUpdatingMode();
+
+        if(recycleCount /*&& !this.showRecycleResults*/){
+            recycleDiv = new Element('div', {id:'search_recycle_hidden',className:'results-parser-filter'}).update(pydio.MessageHash['554'].replace('%s', recycleCount) + ' - ');
+            var recycleLink = new Element('a').update(pydio.MessageHash[this.showRecycleResults ? '514': '513']);
+            recycleLink.observe("click", function(){
+                this.showRecycleResults = !this.showRecycleResults;
+                if(!this.showRecycleResults) this.clearResults();
+                this._parseResults(oXmlDoc, currentFolder);
+
+            }.bind(this));
+            recycleDiv.insert(recycleLink);
+            this.htmlElement.down("#basic_search").insert(recycleDiv);
         }
-	},
+
+        var paginationNode = XMLUtils.XPathSelectSingleNode(oXmlDoc.documentElement, "pagination");
+        if(paginationNode && this.currentLimitDefault){
+            showAllDiv = new Element('div', {id:'search_show_all',className:'results-parser-filter'}).update(pydio.MessageHash['543'].replace('%s', resultsCount-1) + ' ');
+            var showAllLink = new Element('a').update(pydio.MessageHash['544']);
+            showAllLink.observe("click", function(){
+                this.search(-1, true);
+            }.bind(this));
+            showAllDiv.insert(showAllLink);
+            this.htmlElement.down("#basic_search").insert(showAllDiv);
+        }
+
+
+    },
 	
 	_searchNode : function(ajxpNode, currentFolder){
 		var searchFileName = true;
@@ -1108,10 +1071,7 @@ Class.create("SearchEngine", AjxpPane, {
 		}
 		if(searchFileName && ajxpNode.getLabel().toLowerCase().indexOf(this.crtText) != -1){
 			this.addResult(currentFolder, ajxpNode);
-            if(this._fileList){
-                //this._fileList.reload();
-                this._fileList._sortableTable.sort(0);
-            }
+            this._fileList.reSort();
             return;
 		}
 		if(!searchCols) return;
@@ -1119,10 +1079,7 @@ Class.create("SearchEngine", AjxpPane, {
 			var meta = ajxpNode.getMetadata().get(searchCols[i]);
 			if(meta && meta.toLowerCase().indexOf(this.crtText) != -1){
 				this.addResult(currentFolder, ajxpNode, meta);
-                if(this._fileList){
-                    //this._fileList.reload();
-                    this._fileList._sortableTable.sort(0);
-                }
+                this._fileList.reSort();
                 return;
 			}
 		}
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.SliderInput.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.SliderInput.js
index a0984dab0a..8f7e140cc0 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.SliderInput.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.SliderInput.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.TreeSelector.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.TreeSelector.js
index 8014aed015..49c08ae250 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.TreeSelector.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.TreeSelector.js
@@ -15,13 +15,15 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
  * Independant widget for opening a form with a Tree in it
  */
 Class.create("TreeSelector", {
+
+    _selectedNode: null,
 	/**
 	 * Constructor
 	 * @param oElement HTMLElement
@@ -34,6 +36,7 @@ Class.create("TreeSelector", {
 			targetField : 'input[name="dest"]',
 			targetNode: 'input[name="dest_node"]',
 			treeContainer : '.treeCopyContainer',
+            createFolder:'a#selector_create_folder',
             nodeFilter : function(ajxpNode){
                 return (!ajxpNode.isLeaf());
             }
@@ -47,13 +50,19 @@ Class.create("TreeSelector", {
 		if(webFXTreeHandler && webFXTreeHandler.selected){
 			this.__initialWebFXSelection = webFXTreeHandler.selected;
 		}
-		this.filterSelector = this.htmlElement.select(this.options.filterSelectorId)[0];
-		var target = this.targetField = this.htmlElement.select(this.options.targetField)[0];
-		var targetNode = this.targetNode = this.htmlElement.select(this.options.targetNode)[0];
-		this.treeContainer = this.htmlElement.select(this.options.treeContainer)[0];
+		this.filterSelector = this.htmlElement.down(this.options.filterSelectorId);
+		var target = this.targetField = this.htmlElement.down(this.options.targetField);
+		var targetNode = this.targetNode = this.htmlElement.down(this.options.targetNode);
+        var createButton = this.htmlElement.down(this.options.createFolder);
+        if(createButton){
+            this.bindFolderCreateButton(createButton);
+        }
+		this.treeContainer = this.htmlElement.down(this.options.treeContainer);
 		this.filterSelector.hide();
+        var oThis = this;
 		this._nodeActionCallback = function(e){
 			// Warning, this is the tree object
+            oThis._selectedNode = this.ajxpNode;
 			target.value = this.ajxpNode.getPath();
 			targetNode.value = this.ajxpNode.getPath();
  			this.select();			
@@ -71,6 +80,40 @@ Class.create("TreeSelector", {
 		this.treeCopy.setAjxpRootNode(rootNode);
 		
 	},
+
+    bindFolderCreateButton: function(button){
+        this._createListener = function(){
+            var currentNode = this._selectedNode || this.treeCopy.ajxpNode;
+            currentNode.load();
+            var currentPath = currentNode.getPath();
+
+            var newFolderName = window.prompt(pydio.MessageHash[155], "New Folder");
+            if(!newFolderName) return;
+            if(currentNode.getChildren().get(currentPath + "/" + newFolderName)){
+                pydio.displayMessage("ERROR", pydio.MessageHash[40]);
+                return;
+            }
+
+            var parameters = {
+                get_action:'mkdir',
+                dir:currentPath,
+                dirname:newFolderName
+            };
+            if(this.treeCopy.ajxpNode._iNodeProvider && this.treeCopy.ajxpNode._iNodeProvider.properties.get('tmp_repository_id')){
+                parameters["tmp_repository_id"] = this.treeCopy.ajxpNode._iNodeProvider.properties.get('tmp_repository_id');
+            }
+
+            PydioApi.getClient().request(parameters, function(){
+                var newFullPath = currentPath + "/" + newFolderName;
+                currentNode.addChild(new AjxpNode(newFullPath, false, newFolderName));
+                window.setTimeout(function(){
+                    this.htmlElement.down('div[data-node-path="'+newFullPath+'"]').click();
+                }.bind(this), 250);
+            }.bind(this));
+        }.bind(this);
+        button.observe("click", this._createListener);
+    },
+
 	/**
 	 * Clear the widget
 	 */
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.UserWidget.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.UserWidget.js
index d4e72f7985..0fbdf089c6 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.UserWidget.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.UserWidget.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 /**
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.VisibilityToggler.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.VisibilityToggler.js
index 190527ad12..d5e66d2c25 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.VisibilityToggler.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.VisibilityToggler.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 Class.create("VisibilityToggler", AjxpPane, {
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/http/class.Connexion.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/http/class.Connexion.js
index bd2d93f220..94a8151684 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/http/class.Connexion.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/http/class.Connexion.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 var PydioLog = $A();
 /**
@@ -217,13 +217,14 @@ Class.create("Connexion", {
 		document.fire("ajaxplorer:server_answer", this);
 	},
 
-    uploadFile: function(file, fileParameterName, queryStringParams, onComplete, onError, onProgress){
+    uploadFile: function(file, fileParameterName, uploadUrl, onComplete, onError, onProgress, xhrSettings){
+
+        if(xhrSettings === undefined) xhrSettings = {};
 
         if(!onComplete) onComplete = function(){};
         if(!onError) onError = function(){};
         if(!onProgress) onProgress = function(){};
-        var url = pydio.Parameters.get('ajxpServerAccess') + '&' +  queryStringParams;
-        var xhr = this.initializeXHRForUpload(url, onComplete, onError, onProgress);
+        var xhr = this.initializeXHRForUpload(uploadUrl, onComplete, onError, onProgress, xhrSettings);
         if(window.FormData){
             this.sendFileUsingFormData(xhr, file, fileParameterName);
         }else if(window.FileReader){
@@ -235,12 +236,19 @@ Class.create("Connexion", {
         }else if(file.getAsBinary){
             this.xhrSendAsBinary(xhr, file.name, file.getAsBinary(), fileParameterName)
         }
+        return xhr;
 
     },
 
-    initializeXHRForUpload : function(url, onComplete, onError, onProgress){
+    initializeXHRForUpload : function(url, onComplete, onError, onProgress, xhrSettings){
+
+        if(xhrSettings === undefined) xhrSettings = {};
+
         var xhr = new XMLHttpRequest();
         var upload = xhr.upload;
+        if(xhrSettings.withCredentials){
+            xhr.withCredentials = true;
+        }
         upload.addEventListener("progress", function(e){
             if (!e.lengthComputable) return;
             onProgress(e);
@@ -527,18 +535,6 @@ Connexion.parseXmlMessage = function(xmlResponse){
                 }
             }
 
-        }else if(childs[i].tagName == "trigger_bg_action"){
-            var name = childs[i].getAttribute("name");
-            var messageId = childs[i].getAttribute("messageId");
-            var parameters = {};
-            for(var j=0;j<childs[i].childNodes.length;j++){
-                var paramChild = childs[i].childNodes[j];
-                if(paramChild.tagName == 'param'){
-                    parameters[paramChild.getAttribute("name")] = paramChild.getAttribute("value");
-                }
-            }
-            pydio.getController().getBackgroundTasksManager().queueAction(name, parameters, messageId);
-            pydio.getController().getBackgroundTasksManager().next();
         }
 
     }
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/interfaces/class.IActionProvider.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/interfaces/class.IActionProvider.js
index dd800e9b31..83b9aa35c5 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/interfaces/class.IActionProvider.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/interfaces/class.IActionProvider.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  * 
  * Description : a widget that can append it's own actions to the GUI.
  */
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/interfaces/class.IAjxpNodeProvider.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/interfaces/class.IAjxpNodeProvider.js
index 43889ce9c4..8f23bd6005 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/interfaces/class.IAjxpNodeProvider.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/interfaces/class.IAjxpNodeProvider.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  *
  * Description : base for nodes provider
  */
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/interfaces/class.IAjxpWidget.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/interfaces/class.IAjxpWidget.js
index 38884a39cd..807826e42d 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/interfaces/class.IAjxpWidget.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/interfaces/class.IAjxpWidget.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  * Description : AjxpPane interface
  */
 Interface.create("IAjxpWidget", {		
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/interfaces/class.IContextMenuable.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/interfaces/class.IContextMenuable.js
index c2cff67475..6059969306 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/interfaces/class.IContextMenuable.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/interfaces/class.IContextMenuable.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  *
  * Description : focusable component / Tab navigation
  */
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/interfaces/class.IFocusable.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/interfaces/class.IFocusable.js
index 2cf37218bc..2e8248a5d4 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/interfaces/class.IFocusable.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/interfaces/class.IFocusable.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  *
  * Description : focusable component / Tab navigation
  */
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/util/ajxp_utils.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/util/ajxp_utils.js
index b3174809f6..678afda78f 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/prototype/util/ajxp_utils.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/prototype/util/ajxp_utils.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  * Description : Various functions used statically very often.
  */
 function getBaseName(fileName){
diff --git a/core/src/plugins/gui.ajax/res/js/ui/reactjs/jsx/ReactFormComponents.js b/core/src/plugins/gui.ajax/res/js/ui/reactjs/jsx/ReactFormComponents.js
index 7f8ee83b21..647fafecec 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/reactjs/jsx/ReactFormComponents.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/reactjs/jsx/ReactFormComponents.js
@@ -50,7 +50,7 @@
         },
 
         bufferChanges:function(newValue, oldValue){
-            this.props.onChange(newValue, oldValue);
+            this.triggerPropsOnChange(newValue, oldValue);
         },
 
         onChange:function(event, value){
@@ -60,16 +60,29 @@
             }
             var newValue = value, oldValue = this.state.value;
             if(this.props.skipBufferChanges){
-                this.props.onChange(newValue, oldValue);
+                this.triggerPropsOnChange(newValue, oldValue);
             }
             this.setState({
                 dirty:true,
                 value:newValue
             });
             if(!this.props.skipBufferChanges) {
+                let timerLength = 250;
+                if(this.props.attributes['type'] === 'password'){
+                    timerLength = 1200;
+                }
                 this.changeTimeout = global.setTimeout(function () {
                     this.bufferChanges(newValue, oldValue);
-                }.bind(this), 250);
+                }.bind(this), timerLength);
+            }
+        },
+
+        triggerPropsOnChange:function(newValue, oldValue){
+            if(this.props.attributes['type'] === 'password'){
+                this.toggleEditMode();
+                this.props.onChange(newValue, oldValue, {type:this.props.attributes['type']});
+            }else{
+                this.props.onChange(newValue, oldValue);
             }
         },
 
@@ -143,12 +156,9 @@
                     this.setState({choices:newOutput});
                 }.bind(this));
             }else if(choices == "AJXP_AVAILABLE_LANGUAGES"){
-                var object = global.pydio.Parameters.get("availableLanguages");
-                for(var key in object){
-                    if(object.hasOwnProperty(key)){
-                        output.set(key, object[key]);
-                    }
-                }
+                global.pydio.listLanguagesWithCallback(function(key, label){
+                    output.set(key, label);
+                });
             }else if(choices == "AJXP_AVAILABLE_REPOSITORIES"){
                 if(global.pydio.user){
                     global.pydio.user.repositories.forEach(function(repository){
@@ -197,23 +207,35 @@
 
         render:function(){
             if(this.isDisplayGrid() && !this.state.editMode){
-                var value = this.state.value;
+                let value = this.state.value;
+                if(this.props.attributes['type'] === 'password' && value){
+                    value = '***********';
+                }else{
+                    value = this.state.value;
+                }
                 return <div onClick={this.props.disabled?function(){}:this.toggleEditMode} className={value?'':'paramValue-empty'}>{!value?'Empty':value}</div>;
             }else{
-                return(
-                    <span>
-                        <ReactMUI.TextField
-                            floatingLabelText={this.isDisplayForm()?this.props.attributes.label:null}
-                            value={this.state.value}
-                            onChange={this.onChange}
-                            onKeyDown={this.enterToToggle}
-                            type={this.props.attributes['type'] == 'password'?'password':null}
-                            multiLine={this.props.attributes['type'] == 'textarea'}
-                            disabled={this.props.disabled}
-                            errorText={this.props.errorText}
-                        />
-                    </span>
+                let field = (
+                    <ReactMUI.TextField
+                        floatingLabelText={this.isDisplayForm()?this.props.attributes.label:null}
+                        value={this.state.value}
+                        onChange={this.onChange}
+                        onKeyDown={this.enterToToggle}
+                        type={this.props.attributes['type'] == 'password'?'password':null}
+                        multiLine={this.props.attributes['type'] == 'textarea'}
+                        disabled={this.props.disabled}
+                        errorText={this.props.errorText}
+                    />
                 );
+                if(this.props.attributes['type'] === 'password'){
+                    return (
+                        <form autoComplete="off" style={{display:'inline'}}>{field}</form>
+                    );
+                }else{
+                    return(
+                        <span>{field}</span>
+                    );
+                }
             }
         }
 
@@ -349,6 +371,79 @@
 
     });
 
+    var AutocompleteBox = React.createClass({
+
+        mixins:[FormMixin],
+
+        onSuggestionSelected: function(value, event){
+            this.onChange(event, value);
+        },
+
+        getInitialState:function(){
+            return {loading : 0};
+        },
+
+        suggestionLoader:function(input, callback) {
+
+            this.setState({loading:true});
+            let values = {};
+            if(this.state.choices){
+                this.state.choices.forEach(function(v){
+                    if(v.indexOf(input) === 0){
+                        values[v] = v;
+                    }
+                });
+            }
+            callback(null, LangUtils.objectValues(values));
+            this.setState({loading:false});
+
+        },
+
+        getSuggestions(input, callback){
+            bufferCallback('suggestion-loader-search', 350, function(){
+                this.suggestionLoader(input, callback);
+            }.bind(this));
+        },
+
+        suggestionValue: function(suggestion){
+            return '';
+        },
+
+        renderSuggestion(value){
+            return <span>{value}</span>;
+        },
+
+        render: function(){
+
+            const inputAttributes = {
+                id: 'pydioform-autosuggest',
+                name: 'pydioform-autosuggest',
+                className: 'react-autosuggest__input',
+                placeholder: this.props.attributes['label'],
+                /*onBlur: event => pydio.UI.enableAllKeyBindings(),*/
+                onFocus: event => pydio.UI.disableAllKeyBindings(),
+                value: this.state.value   // Initial value
+            };
+            return (
+                <div className="pydioform_autocomplete">
+                    <span className={"suggest-search icon-" + (this.state.loading ? 'refresh rotating' : 'search')}/>
+                    <ReactAutoSuggest
+                        ref="autosuggest"
+                        cache={true}
+                        showWhen = {input => true }
+                        inputAttributes={inputAttributes}
+                        suggestions={this.getSuggestions}
+                        suggestionRenderer={this.renderSuggestion}
+                        suggestionValue={this.suggestionValue}
+                        onSuggestionSelected={this.onSuggestionSelected}
+                    />
+                </div>
+
+            );
+        }
+
+    });
+
     /**
      * Select box input conforming to Pydio standard form parameter.
      */
@@ -829,6 +924,17 @@
             this.refs.fileInput.getDOMNode().click();
         },
 
+        onFolderPicked: function(e){
+            if(this.props.onFolderPicked){
+                this.props.onFolderPicked(e.target.files);
+            }
+        },
+
+        openFolderPicker: function(){
+            this.refs.folderInput.getDOMNode().setAttribute("webkitdirectory", "true");
+            this.refs.folderInput.getDOMNode().click();
+        },
+
         render: function() {
 
             var className = this.props.className || 'dropzone';
@@ -844,10 +950,13 @@
             if(this.props.style){
                 style = LangUtils.objectMerge(this.props.style, style);
             }
-
+            if(this.props.enableFolders){
+                var folderInput = <input style={{display:'none'}} name="userfolder" type="file" ref="folderInput" onChange={this.onFolderPicked}/>;
+            }
             return (
                 <div className={className} style={style} onClick={this.onClick} onDragLeave={this.onDragLeave} onDragOver={this.onDragOver} onDrop={this.onDrop}>
                     <input style={{display:'none'}} name="userfile" type="file" multiple={this.props.multiple} ref="fileInput" onChange={this.onDrop} accept={this.props.accept}/>
+                    {folderInput}
                 {this.props.children}
                 </div>
             );
@@ -1212,6 +1321,7 @@
                 return (
                     <PydioFormPanel
                         {...this.props}
+                        tabs={null}
                         key={index}
                         values={subValues}
                         onChange={null}
@@ -1277,6 +1387,7 @@
                 bottom:React.PropTypes.array
             }),
             tabs:React.PropTypes.array,
+            onTabChange:React.PropTypes.func,
             accordionizeIfGroupsMoreThan:React.PropTypes.number,
             onScrollCallback:React.PropTypes.func,
 
@@ -1287,6 +1398,16 @@
 
         },
 
+        externallySelectTab:function(index){
+            try{
+                let t = this.refs.tabs;
+                let c = this.refs.tabs.props.children[index];
+                t.handleTouchTap(index, c);
+            }catch(e){
+                if(global.console) global.console.log(e);
+            }
+        },
+
         getDefaultProps:function(){
             return { depth:0, values:{} };
         },
@@ -1470,14 +1591,17 @@
                         }
                         var mandatoryMissing = false;
                         var classLegend = "form-legend";
-                        if( attributes['mandatory'] && (attributes['mandatory'] === "true" || attributes['mandatory'] === true) ){
+                        if(attributes['errorText']) {
+                            classLegend = "form-legend mandatory-missing";
+                        }else if(attributes['warningText']){
+                            classLegend = "form-legend warning-message";
+                        }else if( attributes['mandatory'] && (attributes['mandatory'] === "true" || attributes['mandatory'] === true) ){
                             if(['string', 'textarea', 'image', 'integer'].indexOf(attributes['type']) !== -1 && !values[paramName]){
                                 mandatoryMissing = true;
                                 classLegend = "form-legend mandatory-missing";
                             }
                         }
 
-
                         var props = {
                             ref:"formElement",
                             attributes:attributes,
@@ -1491,13 +1615,13 @@
                             binary_context:this.props.binary_context,
                             displayContext:'form',
                             applyButtonAction:this.applyButtonAction,
-                            errorText:mandatoryMissing?'Field cannot be empty':null
+                            errorText:mandatoryMissing?'Field cannot be empty':(attributes.errorText?attributes.errorText:null)
                         };
 
                         field = (
                             <div key={paramName} className={'form-entry-' + attributes['type']}>
                                 {PydioForm.createFormElement(props)}
-                                <div className={classLegend}>{attributes['description']} {helperMark}</div>
+                                <div className={classLegend}>{attributes['warningText'] ? attributes['warningText'] : attributes['description']} {helperMark}</div>
                             </div>
                         );
                     }else{
@@ -1596,9 +1720,14 @@
 
             if(this.props.tabs){
                 var className = this.props.className;
+                let initialSelectedIndex = 0;
+                let i = 0;
                 var tabs = this.props.tabs.map(function(tDef){
                     var label = tDef['label'];
                     var groups = tDef['groups'];
+                    if(tDef['selected']){
+                        initialSelectedIndex = i;
+                    }
                     var panes = groups.map(function(gId){
                         if(groupPanes[gId]){
                             return groupPanes[gId];
@@ -1606,6 +1735,7 @@
                             return null;
                         }
                     });
+                    i++;
                     return(
                         <ReactMUI.Tab label={label} key={label}>
                             <div className={(className?className+' ':' ') + 'pydio-form-panel' + (panes.length % 2 ? ' form-panel-odd':'')}>
@@ -1613,10 +1743,10 @@
                             </div>
                         </ReactMUI.Tab>
                     );
-                });
+                }.bind(this));
                 return (
                     <div className="layout-fill vertical-layout tab-vertical-layout">
-                        <ReactMUI.Tabs>
+                        <ReactMUI.Tabs ref="tabs" initialSelectedIndex={initialSelectedIndex} onChange={this.props.onTabChange}>
                             {tabs}
                         </ReactMUI.Tabs>
                     </div>
@@ -1729,6 +1859,9 @@
                 case 'select':
                     value = <InputSelectBox {...props}/>;
                     break;
+                case 'autocomplete':
+                    value = <AutocompleteBox {...props}/>;
+                    break;
                 case 'legend':
                     value = null;
                     break;
@@ -1892,10 +2025,12 @@
     PydioForm.InputButton = InputButton;
     PydioForm.MonitoringLabel = MonitoringLabel;
     PydioForm.InputSelectBox = InputSelectBox;
+    PydioForm.AutocompleteBox = AutocompleteBox;
     PydioForm.InputImage = InputImage;
     PydioForm.FormPanel = PydioFormPanel;
     PydioForm.PydioHelper = PydioFormHelper;
     PydioForm.HelperMixin = HelperMixin;
+    PydioForm.FileDropZone = FileDropzone;
 
     global.PydioForm = PydioForm;
 
diff --git a/core/src/plugins/gui.ajax/res/js/ui/reactjs/jsx/ReactPydioComponents.js b/core/src/plugins/gui.ajax/res/js/ui/reactjs/jsx/ReactPydioComponents.js
index ed0936043d..e223eec4c6 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/reactjs/jsx/ReactPydioComponents.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/reactjs/jsx/ReactPydioComponents.js
@@ -655,6 +655,7 @@
 
         propTypes: {
             label:React.PropTypes.string,
+            labelElement:React.PropTypes.object,
             tooltip:React.PropTypes.string,
             tooltipClassName:React.PropTypes.string,
             className:React.PropTypes.string,
@@ -670,19 +671,21 @@
 
         render:function(){
             if(this.props.tooltip){
-                var tooltipStyle={};
-                if(this.props.label){
+                let tooltipStyle={};
+                if(this.props.label || this.props.labelElement){
                     if(this.state.show){
                         tooltipStyle = {bottom: -10, top: 'inherit'};
                     }
                 }else{
                     tooltipStyle = {position:'relative'};
                 }
-                var label;
+                let label;
                 if(this.props.label){
                     label = <span className="ellipsis-label">{this.props.label}</span>;
+                }else if(this.props.labelElement){
+                    label = this.props.labelElement;
                 }
-                var style = this.props.style || {position:'relative'};
+                let style = this.props.style || {position:'relative'};
 
                 return (
                     <span onMouseEnter={this.show} onMouseLeave={this.hide} style={style} className={this.props.className}>
@@ -692,8 +695,13 @@
                     </span>
                 );
             }else{
-                if(this.props.label) return (<span>{this.props.label}</span>);
-                else return (<span>this.props.children</span>);
+                if(this.props.label) {
+                    return <span>{this.props.label}</span>;
+                } else if(this.props.labelElement) {
+                    return this.props.labelElement;
+                } else {
+                    return <span>{this.props.children}</span>;
+                }
             }
         }
 
@@ -1127,6 +1135,9 @@
             }
             if(this.props.node){
                 additionalClassName += ' listentry' + this.props.node.getPath().replace(/\//g, '_') + ' ' + ' ajxp_node_' + (this.props.node.isLeaf()?'leaf':'collection') + ' ';
+                if(this.props.node.getAjxpMime()){
+                    additionalClassName += ' ajxp_mime_' + this.props.node.getAjxpMime() + ' ';
+                }
             }
             return (
                 <div onClick={this.onClick} className={additionalClassName + "material-list-entry material-list-entry-" + (this.props.thirdLine?3:this.props.secondLine?2:1) + "-lines"+ (this.props.selected? " selected":"")}>
@@ -1192,21 +1203,28 @@
         propTypes:{
             tableKeys:React.PropTypes.object.isRequired,
             loading:React.PropTypes.bool,
-            reload:React.PropTypes.func
+            reload:React.PropTypes.func,
+            dm:React.PropTypes.instanceOf(PydioDataModel),
+            node:React.PropTypes.instanceOf(AjxpNode)
         },
 
         render: function(){
-            var cells = [];
+            let cells = [];
             for(var key in this.props.tableKeys){
                 if(!this.props.tableKeys.hasOwnProperty(key)) continue;
                 var data = this.props.tableKeys[key];
                 var style = data['width']?{width:data['width']}:null;
                 cells.push(<span key={key} className={'cell header_cell cell-' + key} style={style}>{data['label']}</span>);
             }
+            let paginator;
+            if(this.props.node.getMetadata().get("paginationData")){
+                paginator = <ListPaginator dataModel={this.props.dm} node={this.props.node}/>;
+            }
             return (
                 <ReactMUI.Toolbar className="toolbarTableHeader">
                     <ReactMUI.ToolbarGroup float="left">{cells}</ReactMUI.ToolbarGroup>
                     <ReactMUI.ToolbarGroup float="right">
+                        {paginator}
                         <ReactMUI.FontIcon
                             key={1}
                             tooltip={this.context.getMessage('149', '')}
@@ -1560,8 +1578,8 @@
         },
 
         getActionsForNode: function(dm, node){
-            var cacheKey = node.isLeaf() ? 'file':'dir';
-
+            var cacheKey = node.isLeaf() ? 'file-' + node.getAjxpMime() :'folder';
+            var selectionType = node.isLeaf() ? 'file' : 'dir';
             var nodeActions = [];
             if(this.actionsCache[cacheKey]) {
                 nodeActions = this.actionsCache[cacheKey];
@@ -1569,9 +1587,9 @@
                 dm.setSelectedNodes([node]);
                 global.pydio.Controller.actions.forEach(function(a){
                     a.fireContextChange(dm, true, global.pydio.user);
-                    //a.fireSelectionChange(dm);
-                    if(a.context.selection && a.context.actionBar && a.selectionContext[cacheKey] && !a.deny && a.options.icon_class
+                    if(a.context.selection && a.context.actionBar && a.selectionContext[selectionType] && !a.deny && a.options.icon_class
                         && (!this.props.actionBarGroups || this.props.actionBarGroups.indexOf(a.context.actionBarGroup) !== -1)
+                        && (!a.selectionContext.allowedMimes.length || a.selectionContext.allowedMimes.indexOf(node.getAjxpMime()) !== -1)
                     ) {
                         nodeActions.push(a);
                         if(node.isLeaf() &&  a.selectionContext.unique === false) {
@@ -1581,7 +1599,6 @@
                 }.bind(this));
                 this.actionsCache[cacheKey] = nodeActions;
             }
-
             return nodeActions;
         },
 
@@ -1948,6 +1965,8 @@
                     loading={this.state.loading}
                     reload={this.reload}
                     ref="loading_indicator"
+                    dm={this.props.dataModel}
+                    node={this.props.node}
                 />
             }else{
                 toolbar = this.props.customToolbar ? this.props.customToolbar : this.renderToolbar();
@@ -2056,6 +2075,7 @@
                         dataModel={this.state.dataModel}
                         actionBarGroups={this.props.actionBarGroups}
                         skipParentNavigation={true}
+                        observeNodeReload={true}
                     />
                 </div>
             );
diff --git a/core/src/plugins/gui.ajax/res/js/ui/reactjs/jsx/UsersCompleter.js b/core/src/plugins/gui.ajax/res/js/ui/reactjs/jsx/UsersCompleter.js
index 91b1449c03..8072dcb5a8 100644
--- a/core/src/plugins/gui.ajax/res/js/ui/reactjs/jsx/UsersCompleter.js
+++ b/core/src/plugins/gui.ajax/res/js/ui/reactjs/jsx/UsersCompleter.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 (function(global) {
 
@@ -57,6 +57,10 @@
                         return excludes.indexOf(user.getId()) == -1;
                     });
                 }
+                // Hack : force suggestions display
+                if(this.refs.autosuggest.lastSuggestionsInputValue && this.refs.autosuggest.lastSuggestionsInputValue.indexOf(input) === 0){
+                    this.refs.autosuggest.lastSuggestionsInputValue = input;
+                }
                 callback(null, users);
             }.bind(this), this.props.usersOnly, this.props.existingOnly);
         },
diff --git a/core/src/plugins/gui.ajax/res/js/vendor/nodejs/export.js b/core/src/plugins/gui.ajax/res/js/vendor/nodejs/export.js
index c718867c44..98df7066c3 100644
--- a/core/src/plugins/gui.ajax/res/js/vendor/nodejs/export.js
+++ b/core/src/plugins/gui.ajax/res/js/vendor/nodejs/export.js
@@ -15,4 +15,5 @@ window.classNames = require('classnames');
 window.ReactAutoSuggest = require('react-autosuggest');
 window.Clipboard = require('clipboard');
 window.ReactQRCode = require('qrcode.react');
+window.Cronstrue = require("cronstrue");
 window.injectTapEventPlugin();
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/js/vendor/prototype/carousel.js b/core/src/plugins/gui.ajax/res/js/vendor/prototype/carousel.js
deleted file mode 100644
index 3857b8cf79..0000000000
--- a/core/src/plugins/gui.ajax/res/js/vendor/prototype/carousel.js
+++ /dev/null
@@ -1,354 +0,0 @@
-/*
-Copyright (c) 2009 Victor Stanciu - http://www.victorstanciu.ro
-
-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.
-*/
-
-Class.create('Carousel', Abstract, {
-	initialize: function (scroller, slides, controls, options) {
-		this.scrolling	= false;
-		this.scroller	= $(scroller);
-		this.slides		= slides;
-		this.controls	= controls;
-
-		this.options    = Object.extend({
-            duration:           1,
-            auto:               false,
-            frequency:          3,
-            visibleSlides:      1,
-            controlClassName:   'carousel-control',
-            jumperClassName:    'carousel-jumper',
-            disabledClassName:  'carousel-disabled',
-            selectedClassName:  'carousel-selected',
-            circular:           false,
-            wheel:              true,
-            effect:             'scroll',
-            transition:         'sinoidal'
-        }, options || {});
-        
-        if (this.options.effect == 'fade') {
-            this.options.circular = true;
-        }
-
-		this.slides.each(function(slide, index) {
-			slide._index = index;
-        });
-
-		if (this.controls) {
-            this.controls.invoke('observe', 'click', this.click.bind(this));
-        }
-        
-        if (this.options.wheel) {            
-            this.scroller.observe('mousewheel', this.wheel.bindAsEventListener(this)).observe('DOMMouseScroll', this.wheel.bindAsEventListener(this));
-        }
-
-        if (this.options.auto) {
-            this.start();
-        }
-
-		if (this.options.initial) {
-			var initialIndex = this.slides.indexOf($(this.options.initial));
-			if (initialIndex > (this.options.visibleSlides - 1) && this.options.visibleSlides > 1) {               
-				if (initialIndex > this.slides.length - (this.options.visibleSlides + 1)) {
-					initialIndex = this.slides.length - this.options.visibleSlides;
-				}
-			}
-            this.moveTo(this.slides[initialIndex]);
-		}
-	},
-	
-	refreshSlides : function(slides){		
-		this.slides = slides;
-		this.slides.each(function(slide, index) {
-			slide._index = index;
-        });
-        if(this.current){
-        	// try to find current in new slides
-        	var newCurrent = this.slides.find(function(el){
-        		return (el.id == this.current.id);
-        	}.bind(this) );        	
-        }
-        if(newCurrent){
-        	this.moveTo(newCurrent);
-        }else{
-	        this.first();		
-        }
-	},
-
-	click: function (event) {
-		this.stop();
-
-		var element = event.findElement('a');
-
-		if (!element.hasClassName(this.options.disabledClassName)) {
-			if (element.hasClassName(this.options.controlClassName)) {
-				eval("this." + element.rel + "()");
-            } else if (element.hasClassName(this.options.jumperClassName)) {
-                this.moveTo(element.rel);
-                if (this.options.selectedClassName) {
-                    this.controls.invoke('removeClassName', this.options.selectedClassName);
-                    element.addClassName(this.options.selectedClassName);
-                }
-            }
-        }
-
-		this.deactivateControls();
-
-		event.stop();
-    },
-
-	moveTo: function (element) {
-		if (this.options.beforeMove && (typeof this.options.beforeMove == 'function')) {
-			this.options.beforeMove();
-        }
-        
-		this.previous = this.current ? this.current : this.slides[0];
-		this.current  = $(element);		
-		if(!this.current) return false;
-
-		var scrollerOffset = this.scroller.cumulativeOffset();
-		var elementOffset  = this.current.cumulativeOffset();
-		var previousNode = this.current.previous();
-		if(previousNode && previousNode.hasClassName('separator')){
-			elementOffset  = previousNode.cumulativeOffset();
-		}
-
-		if (this.scrolling) {
-			this.scrolling.cancel();
-		}
-
-        switch (this.options.effect) {
-            case 'fade':               
-                this.scrolling = new Effect.Opacity(this.scroller, {
-                    from:   1.0,
-                    to:     0,
-                    duration: this.options.duration,
-                    afterFinish: function () {
-                        this.scroller.scrollLeft = elementOffset[0] - scrollerOffset[0];
-                        this.scroller.scrollTop  = elementOffset[1] - scrollerOffset[1];
-
-                        new Effect.Opacity(this.scroller, {
-                            from: 0,
-                            to: 1.0,
-                            duration: this.options.duration,
-                            afterFinish: (function () {
-                                if (this.controls) {
-                                    this.activateControls();
-                                }
-                                if (this.options.afterMove && (typeof this.options.afterMove == 'function')) {
-                                    this.options.afterMove();
-                                }
-                            }).bind(this)
-                        });
-                    }.bind(this)
-                });
-            break;
-            case 'scroll':
-            default:
-                var transition;
-                switch (this.options.transition) {
-                    case 'spring':
-                        transition = Effect.Transitions.spring;
-                        break;
-                    case 'sinoidal':
-                    default:
-                        transition = Effect.Transitions.sinoidal;
-                        break;
-                }
-
-                this.scrolling = new Effect.SmoothScroll(this.scroller, {
-                    duration: this.options.duration,
-                    x: (elementOffset[0] - scrollerOffset[0]),
-                    y: (elementOffset[1] - scrollerOffset[1]),
-                    transition: transition,
-                    afterFinish: function () {
-                        if (this.controls) {
-                            this.activateControls();
-                        }
-                        if (this.options.afterMove && (typeof this.options.afterMove == 'function')) {
-                            this.options.afterMove();
-                        }                        
-                        this.scrolling = false;
-                    }.bind(this)});
-            break;
-        }
-
-		return false;
-	},
-
-	prev: function () {
-        var prevIndex;
-		if (this.current) {
-			var currentIndex = this.current._index;
-			prevIndex = (currentIndex == 0) ? (this.options.circular ? this.slides.length - 1 : 0) : currentIndex - 1;
-        } else {
-            prevIndex = (this.options.circular ? this.slides.length - 1 : 0);
-        }
-
-		if (prevIndex == (this.slides.length - 1) && this.options.circular && this.options.effect != 'fade') {
-			this.scroller.scrollLeft =  (this.slides.length - 1) * this.slides.first().getWidth();
-			this.scroller.scrollTop =  (this.slides.length - 1) * this.slides.first().getHeight();
-			prevIndex = this.slides.length - 2;
-        }
-
-		this.moveTo(this.slides[prevIndex]);
-	},
-
-	next: function () {
-        var nextIndex;
-		if (this.current) {
-			var currentIndex = this.current._index;
-			nextIndex = (this.slides.length - 1 == currentIndex) ? (this.options.circular ? 0 : currentIndex) : currentIndex + 1;
-        } else {
-            nextIndex = 1;
-        }
-
-		if (nextIndex == 0 && this.options.circular && this.options.effect != 'fade') {
-			this.scroller.scrollLeft = 0;
-			this.scroller.scrollTop  = 0;
-			nextIndex = 1;
-        }
-
-		if (nextIndex > this.slides.length - (this.options.visibleSlides + 1)) {
-			nextIndex = this.slides.length - this.options.visibleSlides;
-		}		
-		if(!this.slides[nextIndex] || !this.slides[nextIndex].visible()){
-			nextIndex ++;
-		}
-		this.moveTo(this.slides[nextIndex]);
-	},
-
-	first: function () {
-		this.moveTo(this.slides[0]);
-    },
-
-	last: function () {
-		this.moveTo(this.slides[this.slides.length - 1]);
-    },
-
-	toggle: function () {
-		if (this.previous) {
-			this.moveTo(this.slides[this.previous._index]);
-        } else {
-            return;
-        }
-    },
-
-	stop: function () {
-		if (this.timer) {
-			clearTimeout(this.timer);
-		}
-	},
-
-	start: function () { 
-        this.periodicallyUpdate();
-    },
-
-	pause: function () {
-		this.stop();
-		this.activateControls();
-    },
-
-	resume: function (event) {
-		if (event) {
-			var related = event.relatedTarget || event.toElement;
-			if (!related || (!this.slides.include(related) && !this.slides.any(function (slide) { return related.descendantOf(slide); }))) {
-				this.start();
-            }
-        } else {
-            this.start();
-        }
-    },
-
-	periodicallyUpdate: function () {
-		if (this.timer != null) {
-			clearTimeout(this.timer);
-			this.next();
-        }
-		this.timer = setTimeout(this.periodicallyUpdate.bind(this), this.options.frequency * 1000);
-    },
-    
-    wheel: function (event) {
-        event.cancelBubble = true;
-        event.stop();
-        
-		var delta = 0;
-		if (!event) {
-            event = window.event;
-        }
-		if (event.wheelDelta) {
-			delta = event.wheelDelta / 120; 
-		} else if (event.detail) { 
-            delta = -event.detail / 3;	
-        }        
-       
-        if (!this.scrolling) {
-            this.deactivateControls();
-            if (delta > 0) {
-                this.prev();
-            } else {
-                this.next();
-            }            
-        }
-        
-		return Math.round(delta); //Safari Round
-    },
-
-	deactivateControls: function () {
-		this.controls.invoke('addClassName', this.options.disabledClassName);
-    },
-
-	activateControls: function () {
-		this.controls.invoke('removeClassName', this.options.disabledClassName);
-    }
-});
-
-
-Effect.SmoothScroll = Class.create();
-Object.extend(Object.extend(Effect.SmoothScroll.prototype, Effect.Base.prototype), {
-	initialize: function (element) {
-		this.element = $(element);
-		var options = Object.extend({ x: 0, y: 0, mode: 'absolute' } , arguments[1] || {});
-		this.start(options);
-    },
-
-	setup: function () {
-		if (this.options.continuous && !this.element._ext) {
-			this.element.cleanWhitespace();
-			this.element._ext = true;
-			this.element.appendChild(this.element.firstChild);
-        }
-
-		this.originalLeft = this.element.scrollLeft;
-		this.originalTop  = this.element.scrollTop;
-
-		if (this.options.mode == 'absolute') {
-			this.options.x -= this.originalLeft;
-			this.options.y -= this.originalTop;
-        }
-    },
-
-	update: function (position) {
-		this.element.scrollLeft = this.options.x * position + this.originalLeft;
-		this.element.scrollTop  = this.options.y * position + this.originalTop;
-    }
-});
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/js/vendor/prototype/cssfx.js b/core/src/plugins/gui.ajax/res/js/vendor/prototype/cssfx.js
index 971e1113c0..c40f32b8bf 100644
--- a/core/src/plugins/gui.ajax/res/js/vendor/prototype/cssfx.js
+++ b/core/src/plugins/gui.ajax/res/js/vendor/prototype/cssfx.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 
diff --git a/core/src/plugins/gui.ajax/res/js/vendor/prototype/jsProgressBarHandler.js b/core/src/plugins/gui.ajax/res/js/vendor/prototype/jsProgressBarHandler.js
deleted file mode 100644
index 0f571e48b4..0000000000
--- a/core/src/plugins/gui.ajax/res/js/vendor/prototype/jsProgressBarHandler.js
+++ /dev/null
@@ -1,393 +0,0 @@
-/*****************************************************************
- *
- * jsProgressBarHandler 0.3.3 - by Bramus! - http://www.bram.us/
- *
- * v 0.3.3 - 2008.11.10 - UPD: fixed IE compatibility issue (thanks Kevin - Sep 19 2008 / 6pm)
- *                      - UPD: setPercentage now parses the targetPercentage to an Integer to avoid infinite loop (thanks Jack - Sep 07 2008 / 9pm)
- *                      - UPD: Moved from Event.Observe(window, 'load', fn) to document.observe('dom:loaded', fn) in order to force people to use an up to date Prototype release.
- *                      - UPD: setPercentage now takes an overrideQueue param. If set the current queue is cleared.
- *                      - ADD: Added onTick callback event which gets called when the percentage is updated.
- *                      - ADD: Added stable (as in "non-crashing") versions of the additions which first surfaced in the (unreleased) 0.3.2 release
- *                             Preloading support partially implemented in IE as all versions (IE6,7&8) are quite hard to tame (one time they work, the next reload they don't anymore)
- * v 0.3.2 - 2008.04.09 (*UNRELEASED*)
- *                      - ADD: implemented preloading of images to avoid slight flicker when switching images (BUGGY!)
- *                      - ADD: percentage image now has class percentImage and percentage Text now has class percentText; This allows you to style the output easily.
- * v 0.3.1 - 2008.02.20 - UPD: fixed queue bug when animate was set to false (thanks Jamie Chong)
- *                      - UPD: update Prototype to version 1.6.0.2
- * v 0.3.0 - 2008.02.01 - ADD: animation queue, prevents from the progressbar getting stuck when multiple calls are made during an animation
- *                      - UPD: multiple barImages now work properly in Safari
- * v 0.2.1 - 2007.12.20 - ADD: option : set boxImage
- *                        ADD: option : set barImage (one or more)
- *                        ADD: option : showText
- * v 0.2   - 2007.12.13 - SYS: rewrite in 2 classs including optimisations
- *                        ADD: Config options
- * v 0.1   - 2007.08.02 - initial release
- *
- * @see http://www.barenakedapp.com/the-design/displaying-percentages on how to create a progressBar Background Image!
- *
- * Licensed under the Creative Commons Attribution 2.5 License - http://creativecommons.org/licenses/by/2.5/
- *
- *****************************************************************/
-/**
- * JS_BRAMUS Object
- * -------------------------------------------------------------
- */
-
-if (!JS_BRAMUS) { var JS_BRAMUS = {}; }
-
-
-JS_BRAMUS.jsProgressBar = Class.create({
-	 
-		el				: null,
-		id				: null,
-		percentage		: null,
-		options			: null,
-		initialPos		: null,
-		initialPerc		: null,
-		pxPerPercent	: null,
-		backIndex		: null,
-		numPreloaded	: null,
-		running			: null,
-		queue			: false,
-
-
-    /**
-     * Constructor
-     *
-     * @return void
-     * -------------------------------------------------------------
-     * @param el
-     * @param percentage
-     * @param options
-     */
-	 
-		initialize : function(el, percentage, options) {
-
-			this.options = Object.extend({
-				animate		: true,										
-				showText	: true,										
-				width		: 120,
-				boxImage	: 'images/progress_box.gif',	
-				barImage	: 'images/progress_bar.gif',
-				height		: 12,
-                visualStyle : '',
-				onTick		: function(pbObj) { return true; }
-			}, options || {});
-
-			// datamembers from arguments
-			this.el				= $(el);
-			this.id				= $(el).id;
-			this.percentage		= 0;							// Set to 0 intially, we'll change this later.
-			this.backIndex		= 0;							// Set to 0 initially
-			this.numPreloaded	= 0;							// Set to 0 initially
-			this.running		= false;						// Set to false initially
-			this.queue			= [];						// Set to empty Array initially
-			this.visualsInitialized = false;
-
-			// datamembers which are calculatef
-			this.imgWidth		= this.options.width * 2;		// define the width of the image (twice the width of the progressbar)
-			this.initialPos		= this.options.width * (-1);	// Initial postion of the background in the progressbar (0% is the middle of our image!)
-			this.pxPerPercent	= this.options.width / 100;		// Define how much pixels go into 1%
-			this.initialPerc	= percentage;					// Store this, we'll need it later.
-
-			// enfore backimage array
-			if (this.options.barImage.constructor != Array) { 	// used to be (but doesn't work in Safari): if (this.options.barImage.constructor.toString().indexOf("Array") == -1) {
-				this.options.barImage = [this.options.barImage];
-			}
-
-			// preload Images
-			this.preloadImages();
-
-		},
-
-
-	/**
-	 * Preloads the images needed for the progressbar
-	 *
-	 * @return void
-	 * -------------------------------------------------------------
-	 */
-
-		preloadImages	: function() {
-
-			// loop all barimages
-			for (var i = 0; i < this.options.barImage.length; i++) {
-
-				// create new image ref
-				var newImage = null;
-				newImage = new Image();
-
-				// set onload, onerror and onabort functions
-				newImage.onload		= function() { this.numPreloaded++; }.bind(this);
-				newImage.onerror	= function() { this.numPreloaded++; }.bind(this);
-				newImage.onabort	= function() { this.numPreloaded++; }.bind(this);
-
-				// set image source (preload it!)
-				newImage.src = this.options.barImage[i];
-
-				// image is in cache
-				if (newImage.complete) {
-					this.numPreloaded++;
-				}
-				
-			}
-
-			// if not IE, check if they're loaded
-			if (!Prototype.Browser.IE) {
-				this.checkPreloadedImages();
-
-			// if IE, just init the visuals as it's quite hard to tame all IE's
-			} else {
-				this.initVisuals();
-			}
-
-		},
-
-
-	/**
-	 * Check whether all images are preloaded and loads the percentage if so
-	 *
-	 * @return void
-	 * -------------------------------------------------------------
-	 */
-
-	 	checkPreloadedImages	: function() {
-
-			// all images are loaded, go init the visuals
-			if (parseInt(this.numPreloaded,10) >= parseInt(this.options.barImage.length,10) ) {
-
-				// initVisuals
-				this.initVisuals();
-
-			// not all images are loaded ... wait a little and then retry
-			} else {
-
-				if ( parseInt(this.numPreloaded,10) <= parseInt(this.options.barImage.length,10) ) {
-					// $(this.el).update(this.id + ' : ' + this.numPreloaded + '/' + this.options.barImage.length);
-					setTimeout(function() { this.checkPreloadedImages(); }.bind(this), 100);
-				}
-
-			}
-
-		},
-
-
-	/**
-	 * Intializes the visual output and sets the percentage
-	 *
-	 * @return void
-	 * -------------------------------------------------------------
-	 */				
-		
-		initVisuals		: function () {
-
-			// create the visual aspect of the progressBar
-			$(this.el).update(
-				'<img id="' + this.id + '_percentImage" src="' + this.options.boxImage + '" alt="0%" style="position:absolute;width: ' + this.options.width + 'px; height: ' + this.options.height + 'px; background-position: ' + this.initialPos + 'px 50%; background-image: url(' + this.options.barImage[this.backIndex] + '); padding: 0; margin: 0; '+this.options.visualStyle+'" class="percentImage" />' +
-				((this.options.showText == true)?'<span id="' + this.id + '_percentText" class="percentText">0%</span>':''));
-		
-			this.visualsInitialized = true;
-			// set the percentage
-			this.setPercentage(this.initialPerc);
-		},
-
-
-    /**
-     * Sets the percentage of the progressbar
-     *
-     * @return void
-     * -------------------------------------------------------------
-     * @param targetPercentage
-     * @param clearQueue
-     */
-		setPercentage	: function(targetPercentage, clearQueue) {
-
-        if(!this.visualsInitialized){
-				this.initialPerc = targetPercentage;
-				this.initVisuals();
-				return;
-			}
-			// if clearQueue is set, empty the queue and then set the percentage
-			if (clearQueue) {
-				
-				this.percentage = (this.queue.length != 0) ? this.queue[0] : targetPercentage;
-				this.timer		= null;
-				this.queue 		= [];
-				
-				setTimeout(function() { this.setPercentage(targetPercentage); }.bind(this), 10);
-				
-			// no clearQueue defined, set the percentage
-			} else {
-			
-				// add the percentage on the queue
-				this.queue.push(targetPercentage);
-				
-				// process the queue (if not running already)
-				if (this.running == false) {
-					this.processQueue();
-				}
-			}
-			
-		},
-	
-	
-	/**
-	 * Processes the queue
-	 *
-	 * @return void
-	 * -------------------------------------------------------------
-	 */
-		
-		processQueue	: function() {
-			
-			// stuff on queue?
-			if (this.queue.length > 0) {
-				
-				// tell the world that we're busy
-				this.running = true;
-				// process the entry
-				this.processQueueEntry(this.queue[0]);
-				
-			// no stuff on queue
-			} else {
-					
-				// return;
-
-			}
-			
-		},
-
-
-    /**
-     * Processes an entry from the queue (viz. animates it)
-     *
-     * @return void
-     * -------------------------------------------------------------
-     * @param targetPercentage
-     */
-		
-		processQueueEntry	: function(targetPercentage) {
-								
-			// get the current percentage
-			var curPercentage	= parseInt(this.percentage,10);
-			
-			// define the new percentage
-			if ((targetPercentage.toString().substring(0,1) == "+") || (targetPercentage.toString().substring(0,1) == "-")) {
-				targetPercentage	= curPercentage + parseInt(targetPercentage);
-			}
-		
-			// min and max percentages
-			if (targetPercentage < 0)		targetPercentage = 0;
-			if (targetPercentage > 100)		targetPercentage = 100;
-			
-			// if we don't need to animate, just change the background position right now and return
-			if (this.options.animate == false) {
-				
-				// remove the entry from the queue 
-				this.queue.splice(0,1);	// @see: http://www.bram.us/projects/js_bramus/jsprogressbarhandler/#comment-174878
-				
-				// Change the background position (and update this.percentage)
-				this._setBgPosition(targetPercentage);
-			
-				// call onTick
-				if (!this.options.onTick(this)) {
-					return;	
-				}
-				
-				// we're not running anymore
-				this.running = false;
-				
-				// continue processing the queue
-				this.processQueue();
-				
-				// we're done!
-				return;
-			}
-
-            var newPercentage, callTick;
-			// define if we need to add/subtract something to the current percentage in order to reach the target percentage
-			if (targetPercentage != curPercentage) {
-				if (curPercentage < targetPercentage) {
-					newPercentage = curPercentage + 1;
-				} else {
-					newPercentage = curPercentage - 1;	
-				}						
-				callTick = true;						
-			} else {
-				newPercentage = curPercentage;
-				callTick = false;
-			}											
-									
-			// Change the background position (and update this.percentage)
-			this._setBgPosition(newPercentage);
-			
-			// call onTick
-			if (callTick && !this.options.onTick(this)) {
-				return;	
-			}
-			
-			// Percentage not reached yet : continue processing entry
-			if (curPercentage != newPercentage) {
-				
-				this.timer = setTimeout(function() { this.processQueueEntry(targetPercentage); }.bind(this), 3);
-				
-			// Percentage reached!
-			} else {
-												  
-				// remove the entry from the queue
-				this.queue.splice(0,1);
-				
-				// we're not running anymore
-				this.running = false;	
-				
-				// unset timer
-				this.timer = null;
-				
-				// process the rest of the queue
-				this.processQueue();
-				
-			}
-			
-		},
-	
-	
-	/**
-	 * Gets the percentage of the progressbar
-	 *
-	 * @return int
-	 */
-		getPercentage : function(id) {
-			return this.percentage;
-		},
-	
-	
-	/**
-	 * Set the background position
-	 *
-	 * @param percentage int
-	 */
-		_setBgPosition		: function(percentage) {
-			// adjust the background position
-				$(this.id + "_percentImage").style.backgroundPosition 	= (this.initialPos + (percentage * this.pxPerPercent)) + "px 50%";
-										
-			// adjust the background image and backIndex
-				var newBackIndex										= Math.floor((percentage-1) / (100/this.options.barImage.length));
-				
-				if ((newBackIndex != this.backIndex) && (this.options.barImage[newBackIndex] != undefined)) {
-					$(this.id + "_percentImage").style.backgroundImage 	= "url(" + this.options.barImage[newBackIndex] + ")";
-				}
-				
-				this.backIndex											= newBackIndex;
-			
-			// Adjust the alt & title of the image
-				$(this.id + "_percentImage").alt 						= percentage + "%";
-				$(this.id + "_percentImage").title 						= percentage + "%";
-				
-			// Update the text
-				if (this.options.showText == true) {
-					$(this.id + "_percentText").update("" + percentage + "%");
-				}
-			// adjust datamember to stock the percentage
-				this.percentage	= percentage;
-		}
-});
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/js/vendor/prototype/proto.menu.js b/core/src/plugins/gui.ajax/res/js/vendor/prototype/proto.menu.js
index e7a951a8b9..402b8a36ba 100644
--- a/core/src/plugins/gui.ajax/res/js/vendor/prototype/proto.menu.js
+++ b/core/src/plugins/gui.ajax/res/js/vendor/prototype/proto.menu.js
@@ -20,7 +20,6 @@ Proto.Menu = Class.create({
 			pageOffset: 25,
 			topOffset:0,
 			leftOffset:0,
-			submenuArrow:ajxpResourcesFolder+'/images/arrow_right.png',
 			position:'bottom',
 			menuTitle:'',
             detailedItems: false,
@@ -213,10 +212,9 @@ Proto.Menu = Class.create({
 			}
 			if(item.subMenu){
 				var arrowContainer = new Element('div', {
-                    className:'menuActions' + (window.ajaxplorer.currentThemeUsesIconFonts?' icon-caret-right':''),
+                    className:'menuActions icon-caret-right',
                     style:'padding-right:7px;'
                 });
-				arrowContainer.insert(new Element('img', {src:this.options.submenuArrow, width:6,height:10}));
 				newItem.insert(arrowContainer);
                 newItem.setStyle({position:"relative"});
 			}
@@ -230,7 +228,7 @@ Proto.Menu = Class.create({
                 item.title = actionObject.options.title;
             }
             var img = '';
-            if(item.icon_class && window.ajaxplorer.currentThemeUsesIconFonts){
+            if(item.icon_class){
                 img = new Element('span', {
                     className:item.icon_class + ' ajxp_icon_span',
                     title:item.alt
diff --git a/core/src/plugins/gui.ajax/res/js/vendor/prototype/prototype.oo.js b/core/src/plugins/gui.ajax/res/js/vendor/prototype/prototype.oo.js
index a332887495..490d438c26 100644
--- a/core/src/plugins/gui.ajax/res/js/vendor/prototype/prototype.oo.js
+++ b/core/src/plugins/gui.ajax/res/js/vendor/prototype/prototype.oo.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 
diff --git a/core/src/plugins/gui.ajax/res/js/vendor/webfx/ajxptree.js b/core/src/plugins/gui.ajax/res/js/vendor/webfx/ajxptree.js
index eb6535328d..6a40dbae15 100644
--- a/core/src/plugins/gui.ajax/res/js/vendor/webfx/ajxptree.js
+++ b/core/src/plugins/gui.ajax/res/js/vendor/webfx/ajxptree.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 webFXTreeConfig.loadingText = "Loading...";
diff --git a/core/src/plugins/gui.ajax/res/js/vendor/webfx/xtree.js b/core/src/plugins/gui.ajax/res/js/vendor/webfx/xtree.js
index a3e51c89de..fc6a0f4d77 100644
--- a/core/src/plugins/gui.ajax/res/js/vendor/webfx/xtree.js
+++ b/core/src/plugins/gui.ajax/res/js/vendor/webfx/xtree.js
@@ -49,22 +49,22 @@
 | Created 2000-12-11 | All changes are in the log above. | Updated 2006-05-26 |
 \----------------------------------------------------------------------------*/
 var	webFXTreeConfig = {
-		rootIcon        : '/images/foldericon.png',
-		openRootIcon    : '/images/openfoldericon.png',
-		folderIcon      : '/images/foldericon.png',
-		openFolderIcon  : '/images/openfoldericon.png',
-		fileIcon        : '/images/foldericon.png',
-		iIcon           : '/images/I.png',
-		lIcon           : '/images/L.png',
-		lMinusIcon      : '/images/Lminus.png',
-		lPlusIcon       : '/images/Lplus.png',
-		lMinusIconActive: '/images/Lminus-active.png',
-		lPlusIconActive : '/images/Lplus-active.png',
-		tIcon           : '/images/T.png',
-		tMinusIcon      : '/images/Tminus.png',
-		tPlusIcon       : '/images/Tplus.png',
-		tMinusIconActive: '/images/Tminus-active.png',
-		tPlusIconActive : '/images/Tplus-active.png',
+		rootIcon        : '/images/xtree/foldericon.png',
+		openRootIcon    : '/images/xtree/openfoldericon.png',
+		folderIcon      : '/images/xtree/foldericon.png',
+		openFolderIcon  : '/images/xtree/openfoldericon.png',
+		fileIcon        : '/images/xtree/foldericon.png',
+		iIcon           : '/images/xtree/I.png',
+		lIcon           : '/images/xtree/L.png',
+		lMinusIcon      : '/images/xtree/Lminus.png',
+		lPlusIcon       : '/images/xtree/Lplus.png',
+		lMinusIconActive: '/images/xtree/Lminus-active.png',
+		lPlusIconActive : '/images/xtree/Lplus-active.png',
+		tIcon           : '/images/xtree/T.png',
+		tMinusIcon      : '/images/xtree/Tminus.png',
+		tPlusIcon       : '/images/xtree/Tplus.png',
+		tMinusIconActive: '/images/xtree/Tminus-active.png',
+		tPlusIconActive : '/images/xtree/Tplus-active.png',
 		blankIcon       : '/images/blank.png',
 		defaultText     : 'Tree Item',
 		defaultAction   : function(e){},
@@ -74,22 +74,22 @@ var	webFXTreeConfig = {
 };
 Event.observe(document, 'ajaxplorer:boot_loaded', function(){
 	var resourcesFolder = window.ajxpResourcesFolder;
-	webFXTreeConfig.rootIcon        = resourcesFolder+'/images/foldericon.png';
-	webFXTreeConfig.openRootIcon    = resourcesFolder+'/images/openfoldericon.png';
-	webFXTreeConfig.folderIcon      = resourcesFolder+'/images/foldericon.png';
-	webFXTreeConfig.openFolderIcon  = resourcesFolder+'/images/openfoldericon.png';
-	webFXTreeConfig.fileIcon        = resourcesFolder+'/images/foldericon.png';
-	webFXTreeConfig.iIcon           = resourcesFolder+'/images/I.png';
-	webFXTreeConfig.lIcon           = resourcesFolder+'/images/L.png';
-	webFXTreeConfig.lMinusIcon      = resourcesFolder+'/images/Lminus.png';
-	webFXTreeConfig.lPlusIcon       = resourcesFolder+'/images/Lplus.png';
-	webFXTreeConfig.lMinusIconActive= resourcesFolder+'/images/Lminus-active.png';
-	webFXTreeConfig.lPlusIconActive = resourcesFolder+'/images/Lplus-active.png';
-	webFXTreeConfig.tIcon           = resourcesFolder+'/images/T.png';
-	webFXTreeConfig.tMinusIcon      = resourcesFolder+'/images/Tminus.png';
-	webFXTreeConfig.tPlusIcon       = resourcesFolder+'/images/Tplus.png';
-	webFXTreeConfig.tMinusIconActive= resourcesFolder+'/images/Tminus-active.png';
-	webFXTreeConfig.tPlusIconActive = resourcesFolder+'/images/Tplus-active.png';
+	webFXTreeConfig.rootIcon        = resourcesFolder+'/images/xtree/foldericon.png';
+	webFXTreeConfig.openRootIcon    = resourcesFolder+'/images/xtree/openfoldericon.png';
+	webFXTreeConfig.folderIcon      = resourcesFolder+'/images/xtree/foldericon.png';
+	webFXTreeConfig.openFolderIcon  = resourcesFolder+'/images/xtree/openfoldericon.png';
+	webFXTreeConfig.fileIcon        = resourcesFolder+'/images/xtree/foldericon.png';
+	webFXTreeConfig.iIcon           = resourcesFolder+'/images/xtree/I.png';
+	webFXTreeConfig.lIcon           = resourcesFolder+'/images/xtree/L.png';
+	webFXTreeConfig.lMinusIcon      = resourcesFolder+'/images/xtree/Lminus.png';
+	webFXTreeConfig.lPlusIcon       = resourcesFolder+'/images/xtree/Lplus.png';
+	webFXTreeConfig.lMinusIconActive= resourcesFolder+'/images/xtree/Lminus-active.png';
+	webFXTreeConfig.lPlusIconActive = resourcesFolder+'/images/xtree/Lplus-active.png';
+	webFXTreeConfig.tIcon           = resourcesFolder+'/images/xtree/T.png';
+	webFXTreeConfig.tMinusIcon      = resourcesFolder+'/images/xtree/Tminus.png';
+	webFXTreeConfig.tPlusIcon       = resourcesFolder+'/images/xtree/Tplus.png';
+	webFXTreeConfig.tMinusIconActive= resourcesFolder+'/images/xtree/Tminus-active.png';
+	webFXTreeConfig.tPlusIconActive = resourcesFolder+'/images/xtree/Tplus-active.png';
 	webFXTreeConfig.blankIcon       = resourcesFolder+'/images/blank.png';
 });
 
@@ -156,12 +156,13 @@ WebFXCookie.prototype.getCookie = function (key) {
  */
 
 function WebFXTreeAbstractNode(sText, sAction) {
-	this.childNodes  = [];
-	this.id     = webFXTreeHandler.getId();
-	this.text   = sText || webFXTreeConfig.defaultText;
-	this.action = sAction || null;
-	this.url 	= "/";
-	this._last  = false;
+	this.childNodes         = [];
+    this.childrenPathes     = {};
+	this.id             = webFXTreeHandler.getId();
+	this.text           = sText || webFXTreeConfig.defaultText;
+	this.action         = sAction || null;
+	this.url 	        = "/";
+	this._last          = false;
 	webFXTreeHandler.all[this.id] = this;
 }
 
@@ -192,7 +193,10 @@ WebFXTreeAbstractNode.prototype.add = function (node, bNoIdent) {
 		node.action = node.parentNode.action;
 	}
 	
-	this.childNodes[this.childNodes.length] = node;
+	this.childNodes.push(node);
+    if(node.ajxpNode){
+        this.childrenPathes[node.ajxpNode.getPath()] = node.id;
+    }
 	var root = this;
 	if (this.childNodes.length >= 2) {
 		this.childNodes[this.childNodes.length - 2]._last = false;
@@ -216,7 +220,22 @@ WebFXTreeAbstractNode.prototype.add = function (node, bNoIdent) {
 			foo = foo.parentNode;
 		}
 		$(this.id + '-cont').insert(node.toString());
-		$(node.id).ajxpNode = node.ajxpNode;
+        var addedBloc = $(this.id + '-cont').down('#' + node.id);
+        var addedCont = $(this.id + '-cont').down('#' + node.id + '-cont');
+        if(this.childNodes.length > 2 && node.ajxpNode && node.ajxpNode.getAjxpMime() !== 'ajxp_recycle'){
+            var sorted = Object.keys(this.childrenPathes).sort(function(a,b){
+                return a.toLowerCase().localeCompare(b.toLowerCase());
+            });
+            var sortedIndex = sorted.indexOf(node.ajxpNode.getPath());
+            if(sortedIndex < sorted.length-1){
+                var nextId = this.childrenPathes[sorted[sortedIndex + 1]];
+                if($(this.id + '-cont').down('#' + nextId)){
+                    $(this.id + '-cont').down('#' + nextId).insert({before: addedBloc});
+                    if(addedCont) addedBloc.insert({after: addedCont});
+                }
+            }
+        }
+		addedBloc.ajxpNode = node.ajxpNode;
 		if(!node.inZip){
             window.setTimeout(function(){
                 if(!$(node.id)) return;
@@ -225,19 +244,19 @@ WebFXTreeAbstractNode.prototype.add = function (node, bNoIdent) {
 		}
 		//new Draggable(node.id, {revert:true,ghosting:true,constraint:'vertical'});
 		if(webFXTreeHandler.contextMenu){
-			Event.observe(node.id+'','contextmenu', function(event){
+			Event.observe(addedBloc,'contextmenu', function(event){
 				this.select();
 				this.action();
 				Event.stop(event);
 			}.bind(node));
 			 webFXTreeHandler.contextMenu.addElements('#'+node.id+'');
 		}
-		Event.observe(node.id,'click', function(event){
+		Event.observe(addedBloc,'click', function(event){
 			this.select();
 			this.action();
 			Event.stop(event);
 		}.bind(node));
-		Event.observe(node.id,'dblclick', function(event){
+		Event.observe(addedBloc,'dblclick', function(event){
 			this.toggle();
 			Event.stop(event);
 		}.bind(node));
@@ -271,7 +290,16 @@ WebFXTreeAbstractNode.prototype.add = function (node, bNoIdent) {
 
 
 WebFXTreeAbstractNode.prototype.updateLabel = function(label){
-	if($(this.id+'-label')) $(this.id+'-label').update(label);	
+	if($(this.id+'-label')) $(this.id+'-label').update(he.escape(label));
+};
+
+WebFXTreeAbstractNode.prototype.updateIcon = function(icon, openIcon, overlayIcon, overlayClasses){
+    if(openIcon) this.openIcon = openIcon;
+    else this.openIcon = icon;
+    this.icon = icon;
+    this.overlayIcon = overlayIcon ? overlayIcon : [];
+    this.overlayClasses = overlayClasses ? overlayClasses : [];
+    this.setLabelIcon((this.open && webFXTreeHandler.behavior != 'classic'?this.openIcon:icon));
 };
 
 WebFXTreeAbstractNode.prototype.updateIcon = function(icon, openIcon, overlayIcon, overlayClasses){
@@ -660,6 +688,9 @@ WebFXTreeItem.prototype._remove = function() {
 			break;
 	}	}
 	//webFXTreeHandler.all[this.id] = null;
+    if(this.ajxpNode && this.parentNode.childrenPathes[this.ajxpNode.getPath()]){
+       delete this.parentNode.childrenPathes[this.ajxpNode.getPath()];
+    }
 	delete(webFXTreeHandler.all[this.id]);
 	var tmp = $(this.id);
 	if (tmp) { tmp.parentNode.removeChild(tmp); }
@@ -801,7 +832,7 @@ WebFXTreeItem.prototype.toString = function (nItem, nItemCount) {
         }
     }
 	var label = this.text.replace(/</g, '&lt;').replace(/>/g, '&gt;') + d;
-	var str = "<div id=\"" + this.id + "\" class=\"webfx-tree-item\" onkeydown=\"return webFXTreeHandler.keydown(this, event)\" data-node-icon=\"" + getBaseName((this.open?this.openIcon:this.icon)) + "\">" +
+	var str = "<div id=\"" + this.id + "\" class=\"webfx-tree-item\" onkeydown=\"return webFXTreeHandler.keydown(this, event)\" data-node-path=\""+(this.ajxpNode?this.ajxpNode.getPath():"")+"\" data-node-icon=\"" + getBaseName((this.open?this.openIcon:this.icon)) + "\">" +
 		indent +
 		"<img  width=\"19\" height=\"25\" id=\"" + this.id + "-plus\" src=\"" + ((this.folder)?((this.open)?((this.parentNode._last)?webFXTreeConfig.lMinusIcon:webFXTreeConfig.tMinusIcon):((this.parentNode._last)?webFXTreeConfig.lPlusIcon:webFXTreeConfig.tPlusIcon)):((this.parentNode._last)?webFXTreeConfig.lIcon:webFXTreeConfig.tIcon)) + "\">" +
 		"<a href=\"" + this.url + "\" id=\"" + this.id + "-anchor\" onkeydown=\"return webFXTreeHandler.linkKeyPress(this, event);\" onfocus=\"webFXTreeHandler.focus(this);\" onblur=\"webFXTreeHandler.blur(this);\"" +
diff --git a/core/src/plugins/gui.ajax/res/mui/custom.less b/core/src/plugins/gui.ajax/res/mui/custom.less
index 4de525adf2..62081c651a 100644
--- a/core/src/plugins/gui.ajax/res/mui/custom.less
+++ b/core/src/plugins/gui.ajax/res/mui/custom.less
@@ -18,7 +18,9 @@
     border-color: @primary-color !important;
   }
   .mui-text-field .mui-text-field-error{
-    right: 0;
+    bottom: auto;
+    line-height: 15px;
+    margin-top: -2px;
   }
 
   /*************/
@@ -308,6 +310,9 @@
           color: rgba(0, 0, 0, 0.53);
         }
       }
+      &.warning-message{
+        color: lighten(@primary-color, 0.1);
+      }
     }
 
     .form-entry-string .form-legend,
@@ -316,7 +321,7 @@
       margin-top: -5px;
       transition: margin-top 550ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;
       &.mandatory-missing {
-        margin-top: 12px;
+        opacity: 0;
       }
     }
     .form-entry-button {
diff --git a/core/src/plugins/gui.ajax/res/mui/pydio-mui.css b/core/src/plugins/gui.ajax/res/mui/pydio-mui.css
index 8fc4cd4724..a54a0475fc 100644
--- a/core/src/plugins/gui.ajax/res/mui/pydio-mui.css
+++ b/core/src/plugins/gui.ajax/res/mui/pydio-mui.css
@@ -2788,7 +2788,9 @@
   border-color: #009688 !important;
 }
 .react-mui-context .mui-text-field .mui-text-field-error {
-  right: 0;
+  bottom: auto;
+  line-height: 15px;
+  margin-top: -2px;
 }
 .react-mui-context .main-layout-nav-to-stack,
 .react-mui-context .horizontal-layout,
@@ -3061,6 +3063,9 @@
 .react-mui-context .pydio-form-panel .form-legend .icon-question-sign:hover {
   color: rgba(0, 0, 0, 0.53);
 }
+.react-mui-context .pydio-form-panel .form-legend.warning-message {
+  color: #009788;
+}
 .react-mui-context .pydio-form-panel .form-entry-string .form-legend,
 .react-mui-context .pydio-form-panel .form-entry-integer .form-legend,
 .react-mui-context .pydio-form-panel .form-entry-textarea .form-legend {
@@ -3070,7 +3075,7 @@
 .react-mui-context .pydio-form-panel .form-entry-string .form-legend.mandatory-missing,
 .react-mui-context .pydio-form-panel .form-entry-integer .form-legend.mandatory-missing,
 .react-mui-context .pydio-form-panel .form-entry-textarea .form-legend.mandatory-missing {
-  margin-top: 12px;
+  opacity: 0;
 }
 .react-mui-context .pydio-form-panel .form-entry-button {
   display: inline-block;
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/allz.css b/core/src/plugins/gui.ajax/res/themes/orbit/css/allz.css
deleted file mode 100644
index 83ab39efd5..0000000000
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/allz.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/*!
- *  Font Awesome 3.2.1
- *  the iconic font designed for Bootstrap
- *  ------------------------------------------------------------------------------
- *  The full suite of pictographic icons, examples, and documentation can be
- *  found at http://fontawesome.io.  Stay up to date on Twitter at
- *  http://twitter.com/fontawesome.
- *
- *  License
- *  ------------------------------------------------------------------------------
- *  - The Font Awesome font is licensed under SIL OFL 1.1 -
- *    http://scripts.sil.org/OFL
- *  - Font Awesome CSS, LESS, and SASS files are licensed under MIT License -
- *    http://opensource.org/licenses/mit-license.html
- *  - Font Awesome documentation licensed under CC BY 3.0 -
- *    http://creativecommons.org/licenses/by/3.0/
- *  - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
- *    "Font Awesome by Dave Gandy - http://fontawesome.io"
- *
- *  Author - Dave Gandy
- *  ------------------------------------------------------------------------------
- *  Email: dave@fontawesome.io
- *  Twitter: http://twitter.com/davegandy
- *  Work: Lead Product Designer @ Kyruus - http://kyruus.com
- */.SF_input,select.SF_input{max-width:450px!important}[class*=" icon-"]:before,[class^=icon-]:before{text-decoration:inherit;display:inline-block;speak:none}.icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em}a [class*=" icon-"],a [class^=icon-]{display:inline}[class*=" icon-"].icon-fixed-width,[class^=icon-].icon-fixed-width{display:inline-block;width:1.1428571428571428em;text-align:right;padding-right:.2857142857142857em}[class*=" icon-"].icon-fixed-width.icon-large,[class^=icon-].icon-fixed-width.icon-large{width:1.4285714285714286em}.icons-ul{margin-left:2.142857142857143em;list-style-type:none}.icons-ul>li{position:relative}.icons-ul .icon-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;text-align:center;line-height:inherit}[class*=" icon-"].hide,[class^=icon-].hide{display:none}.icon-muted{color:#eee}.icon-light{color:#fff}.icon-dark{color:#333}.icon-border{border:1px solid #eee;padding:.2em .25em .15em;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.icon-2x{font-size:2em}.icon-2x.icon-border{border-width:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.icon-3x{font-size:3em}.icon-3x.icon-border{border-width:3px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.icon-4x{font-size:4em}.icon-4x.icon-border{border-width:4px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.icon-5x{font-size:5em}.icon-5x.icon-border{border-width:5px;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.pull-right{float:right}.pull-left{float:left}[class*=" icon-"].pull-left,[class^=icon-].pull-left{margin-right:.3em}[class*=" icon-"].pull-right,[class^=icon-].pull-right{margin-left:.3em}[class*=" icon-"],[class^=icon-]{font-family:FontAwesome;font-weight:400;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;display:inline;width:auto;height:auto;line-height:normal;vertical-align:baseline;background-image:none;background-position:0 0;background-repeat:repeat;margin-top:0}.btn [class*=" icon-"].icon-spin,.btn [class^=icon-].icon-spin,.icon-stack,.nav [class*=" icon-"].icon-spin,.nav [class^=icon-].icon-spin{display:inline-block}.btn [class*=" icon-"].icon-large,.btn [class^=icon-].icon-large,.nav [class*=" icon-"].icon-large,.nav [class^=icon-].icon-large,.nav-pills [class*=" icon-"],.nav-pills [class*=" icon-"].icon-large,.nav-pills [class^=icon-],.nav-pills [class^=icon-].icon-large,.nav-tabs [class*=" icon-"],.nav-tabs [class*=" icon-"].icon-large,.nav-tabs [class^=icon-],.nav-tabs [class^=icon-].icon-large{line-height:.9em}.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-menu>.active>a>[class^=icon-],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^=icon-],.dropdown-submenu:hover>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^=icon-],.icon-white,.nav-list>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^=icon-],.nav-pills>.active>a>[class*=" icon-"],.nav-pills>.active>a>[class^=icon-],.navbar-inverse .nav>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^=icon-]{background-image:none}.btn [class*=" icon-"].pull-left.icon-2x,.btn [class*=" icon-"].pull-right.icon-2x,.btn [class^=icon-].pull-left.icon-2x,.btn [class^=icon-].pull-right.icon-2x{margin-top:.18em}.btn [class*=" icon-"].icon-spin.icon-large,.btn [class^=icon-].icon-spin.icon-large{line-height:.8em}.btn.btn-small [class*=" icon-"].pull-left.icon-2x,.btn.btn-small [class*=" icon-"].pull-right.icon-2x,.btn.btn-small [class^=icon-].pull-left.icon-2x,.btn.btn-small [class^=icon-].pull-right.icon-2x{margin-top:.25em}.btn.btn-large [class*=" icon-"],.btn.btn-large [class^=icon-]{margin-top:0}.btn.btn-large [class*=" icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x,.btn.btn-large [class^=icon-].pull-left.icon-2x,.btn.btn-large [class^=icon-].pull-right.icon-2x{margin-top:.05em}.btn.btn-large [class*=" icon-"].pull-left.icon-2x,.btn.btn-large [class^=icon-].pull-left.icon-2x{margin-right:.2em}.btn.btn-large [class*=" icon-"].pull-right.icon-2x,.btn.btn-large [class^=icon-].pull-right.icon-2x{margin-left:.2em}.nav-list [class*=" icon-"],.nav-list [class^=icon-]{line-height:inherit}.icon-stack{position:relative;width:2em;height:2em;line-height:2em;vertical-align:-35%}.icon-stack [class*=" icon-"],.icon-stack [class^=icon-]{display:block;text-align:center;position:absolute;width:100%;height:100%;font-size:1em;line-height:inherit}.icon-spin,.kbd,.mdi,a .icon-flip-horizontal:before,a .icon-flip-vertical:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .icon-rotate-90:before,kbd,span.letter_badge{display:inline-block}.icon-stack .icon-stack-base{font-size:2em}.icon-spin{-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;-webkit-animation:spin 2s infinite linear;animation:spin 2s infinite linear}.animated,.icon-spinner,.rotating{-webkit-animation-duration:1s;-moz-animation-duration:1s;-ms-animation-duration:1s;-o-animation-duration:1s}a .icon-spin,a .icon-stack{display:inline-block;text-decoration:none}@-moz-keyframes spin{0%{-moz-transform:rotate(0)}100%{-moz-transform:rotate(359deg)}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0)}100%{-webkit-transform:rotate(359deg)}}@-o-keyframes spin{0%{-o-transform:rotate(0)}100%{-o-transform:rotate(359deg)}}@-ms-keyframes spin{0%{-ms-transform:rotate(0)}100%{-ms-transform:rotate(359deg)}}@keyframes spin{0%{transform:rotate(0)}100%{transform:rotate(359deg)}}.icon-rotate-90:before{-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg);filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1)}.icon-rotate-180:before{-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg);filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2)}.icon-rotate-270:before{-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg);filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3)}.icon-flip-horizontal:before{-webkit-transform:scale(-1,1);-moz-transform:scale(-1,1);-ms-transform:scale(-1,1);-o-transform:scale(-1,1);transform:scale(-1,1)}.icon-flip-vertical:before{-webkit-transform:scale(1,-1);-moz-transform:scale(1,-1);-ms-transform:scale(1,-1);-o-transform:scale(1,-1);transform:scale(1,-1)}.icon-glass:before{content:"\f000"}.icon-music:before{content:"\f001"}.icon-search:before{content:"\f002"}.icon-envelope-alt:before{content:"\f003"}.icon-heart:before{content:"\f004"}.icon-star:before{content:"\f005"}.icon-star-empty:before{content:"\f006"}.icon-user:before{content:"\f007"}.icon-film:before{content:"\f008"}.icon-th-large:before{content:"\f009"}.icon-th:before{content:"\f00a"}.icon-th-list:before{content:"\f00b"}.icon-ok:before{content:"\f00c"}.icon-remove:before{content:"\f00d"}.icon-zoom-in:before{content:"\f00e"}.icon-zoom-out:before{content:"\f010"}.icon-off:before,.icon-power-off:before{content:"\f011"}.icon-signal:before{content:"\f012"}.icon-cog:before,.icon-gear:before{content:"\f013"}.icon-trash:before{content:"\f014"}.icon-home:before{content:"\f015"}.icon-file-alt:before{content:"\f016"}.icon-time:before{content:"\f017"}.icon-road:before{content:"\f018"}.icon-download-alt:before{content:"\f019"}.icon-download:before{content:"\f01a"}.icon-upload:before{content:"\f01b"}.icon-inbox:before{content:"\f01c"}.icon-play-circle:before{content:"\f01d"}.icon-repeat:before,.icon-rotate-right:before{content:"\f01e"}.icon-refresh:before{content:"\f021"}.icon-list-alt:before{content:"\f022"}.icon-lock:before{content:"\f023"}.icon-flag:before{content:"\f024"}.icon-headphones:before{content:"\f025"}.icon-volume-off:before{content:"\f026"}.icon-volume-down:before{content:"\f027"}.icon-volume-up:before{content:"\f028"}.icon-qrcode:before{content:"\f029"}.icon-barcode:before{content:"\f02a"}.icon-tag:before{content:"\f02b"}.icon-tags:before{content:"\f02c"}.icon-book:before{content:"\f02d"}.icon-bookmark:before{content:"\f02e"}.icon-print:before{content:"\f02f"}.icon-camera:before{content:"\f030"}.icon-font:before{content:"\f031"}.icon-bold:before{content:"\f032"}.icon-italic:before{content:"\f033"}.icon-text-height:before{content:"\f034"}.icon-text-width:before{content:"\f035"}.icon-align-left:before{content:"\f036"}.icon-align-center:before{content:"\f037"}.icon-align-right:before{content:"\f038"}.icon-align-justify:before{content:"\f039"}.icon-list:before{content:"\f03a"}.icon-indent-left:before{content:"\f03b"}.icon-indent-right:before{content:"\f03c"}.icon-facetime-video:before{content:"\f03d"}.icon-picture:before{content:"\f03e"}.icon-pencil:before{content:"\f040"}.icon-map-marker:before{content:"\f041"}.icon-adjust:before{content:"\f042"}.icon-tint:before{content:"\f043"}.icon-edit:before{content:"\f044"}.icon-share:before{content:"\f045"}.icon-check:before{content:"\f046"}.icon-move:before{content:"\f047"}.icon-step-backward:before{content:"\f048"}.icon-fast-backward:before{content:"\f049"}.icon-backward:before{content:"\f04a"}.icon-play:before{content:"\f04b"}.icon-pause:before{content:"\f04c"}.icon-stop:before{content:"\f04d"}.icon-forward:before{content:"\f04e"}.icon-fast-forward:before{content:"\f050"}.icon-step-forward:before{content:"\f051"}.icon-eject:before{content:"\f052"}.icon-chevron-left:before{content:"\f053"}.icon-chevron-right:before{content:"\f054"}.icon-plus-sign:before{content:"\f055"}.icon-minus-sign:before{content:"\f056"}.icon-remove-sign:before{content:"\f057"}.icon-ok-sign:before{content:"\f058"}.icon-question-sign:before{content:"\f059"}.icon-info-sign:before{content:"\f05a"}.icon-screenshot:before{content:"\f05b"}.icon-remove-circle:before{content:"\f05c"}.icon-ok-circle:before{content:"\f05d"}.icon-ban-circle:before{content:"\f05e"}.icon-arrow-left:before{content:"\f060"}.icon-arrow-right:before{content:"\f061"}.icon-arrow-up:before{content:"\f062"}.icon-arrow-down:before{content:"\f063"}.icon-mail-forward:before,.icon-share-alt:before{content:"\f064"}.icon-resize-full:before{content:"\f065"}.icon-resize-small:before{content:"\f066"}.icon-plus:before{content:"\f067"}.icon-minus:before{content:"\f068"}.icon-asterisk:before{content:"\f069"}.icon-exclamation-sign:before{content:"\f06a"}.icon-gift:before{content:"\f06b"}.icon-leaf:before{content:"\f06c"}.icon-fire:before{content:"\f06d"}.icon-eye-open:before{content:"\f06e"}.icon-eye-close:before{content:"\f070"}.icon-warning-sign:before{content:"\f071"}.icon-plane:before{content:"\f072"}.icon-calendar:before{content:"\f073"}.icon-random:before{content:"\f074"}.icon-comment:before{content:"\f075"}.icon-magnet:before{content:"\f076"}.icon-chevron-up:before{content:"\f077"}.icon-chevron-down:before{content:"\f078"}.icon-retweet:before{content:"\f079"}.icon-shopping-cart:before{content:"\f07a"}.icon-folder-close:before{content:"\f07b"}.icon-folder-open:before{content:"\f07c"}.icon-resize-vertical:before{content:"\f07d"}.icon-resize-horizontal:before{content:"\f07e"}.icon-bar-chart:before{content:"\f080"}.icon-twitter-sign:before{content:"\f081"}.icon-facebook-sign:before{content:"\f082"}.icon-camera-retro:before{content:"\f083"}.icon-key:before{content:"\f084"}.icon-cogs:before,.icon-gears:before{content:"\f085"}.icon-comments:before{content:"\f086"}.icon-thumbs-up-alt:before{content:"\f087"}.icon-thumbs-down-alt:before{content:"\f088"}.icon-star-half:before{content:"\f089"}.icon-heart-empty:before{content:"\f08a"}.icon-signout:before{content:"\f08b"}.icon-linkedin-sign:before{content:"\f08c"}.icon-pushpin:before{content:"\f08d"}.icon-external-link:before{content:"\f08e"}.icon-signin:before{content:"\f090"}.icon-trophy:before{content:"\f091"}.icon-github-sign:before{content:"\f092"}.icon-upload-alt:before{content:"\f093"}.icon-lemon:before{content:"\f094"}.icon-phone:before{content:"\f095"}.icon-check-empty:before,.icon-unchecked:before{content:"\f096"}.icon-bookmark-empty:before{content:"\f097"}.icon-phone-sign:before{content:"\f098"}.icon-twitter:before{content:"\f099"}.icon-facebook:before{content:"\f09a"}.icon-github:before{content:"\f09b"}.icon-unlock:before{content:"\f09c"}.icon-credit-card:before{content:"\f09d"}.icon-rss:before{content:"\f09e"}.icon-hdd:before{content:"\f0a0"}.icon-bullhorn:before{content:"\f0a1"}.icon-bell:before{content:"\f0a2"}.icon-certificate:before{content:"\f0a3"}.icon-hand-right:before{content:"\f0a4"}.icon-hand-left:before{content:"\f0a5"}.icon-hand-up:before{content:"\f0a6"}.icon-hand-down:before{content:"\f0a7"}.icon-circle-arrow-left:before{content:"\f0a8"}.icon-circle-arrow-right:before{content:"\f0a9"}.icon-circle-arrow-up:before{content:"\f0aa"}.icon-circle-arrow-down:before{content:"\f0ab"}.icon-globe:before{content:"\f0ac"}.icon-wrench:before{content:"\f0ad"}.icon-tasks:before{content:"\f0ae"}.icon-filter:before{content:"\f0b0"}.icon-briefcase:before{content:"\f0b1"}.icon-fullscreen:before{content:"\f0b2"}.icon-group:before{content:"\f0c0"}.icon-link:before{content:"\f0c1"}.icon-cloud:before{content:"\f0c2"}.icon-beaker:before{content:"\f0c3"}.icon-cut:before{content:"\f0c4"}.icon-copy:before{content:"\f0c5"}.icon-paper-clip:before,.icon-paperclip:before{content:"\f0c6"}.icon-save:before{content:"\f0c7"}.icon-sign-blank:before{content:"\f0c8"}.icon-reorder:before{content:"\f0c9"}.icon-list-ul:before{content:"\f0ca"}.icon-list-ol:before{content:"\f0cb"}.icon-strikethrough:before{content:"\f0cc"}.icon-underline:before{content:"\f0cd"}.icon-table:before{content:"\f0ce"}.icon-magic:before{content:"\f0d0"}.icon-truck:before{content:"\f0d1"}.icon-pinterest:before{content:"\f0d2"}.icon-pinterest-sign:before{content:"\f0d3"}.icon-google-plus-sign:before{content:"\f0d4"}.icon-google-plus:before{content:"\f0d5"}.icon-money:before{content:"\f0d6"}.icon-caret-down:before{content:"\f0d7"}.icon-caret-up:before{content:"\f0d8"}.icon-caret-left:before{content:"\f0d9"}.icon-caret-right:before{content:"\f0da"}.icon-columns:before{content:"\f0db"}.icon-sort:before{content:"\f0dc"}.icon-sort-down:before{content:"\f0dd"}.icon-sort-up:before{content:"\f0de"}.icon-envelope:before{content:"\f0e0"}.icon-linkedin:before{content:"\f0e1"}.icon-rotate-left:before,.icon-undo:before{content:"\f0e2"}.icon-legal:before{content:"\f0e3"}.icon-dashboard:before{content:"\f0e4"}.icon-comment-alt:before{content:"\f0e5"}.icon-comments-alt:before{content:"\f0e6"}.icon-bolt:before{content:"\f0e7"}.icon-sitemap:before{content:"\f0e8"}.icon-umbrella:before{content:"\f0e9"}.icon-paste:before{content:"\f0ea"}.icon-lightbulb:before{content:"\f0eb"}.icon-exchange:before{content:"\f0ec"}.icon-cloud-download:before{content:"\f0ed"}.icon-cloud-upload:before{content:"\f0ee"}.icon-user-md:before{content:"\f0f0"}.icon-stethoscope:before{content:"\f0f1"}.icon-suitcase:before{content:"\f0f2"}.icon-bell-alt:before{content:"\f0f3"}.icon-coffee:before{content:"\f0f4"}.icon-food:before{content:"\f0f5"}.icon-file-text-alt:before{content:"\f0f6"}.icon-building:before{content:"\f0f7"}.icon-hospital:before{content:"\f0f8"}.icon-ambulance:before{content:"\f0f9"}.icon-medkit:before{content:"\f0fa"}.icon-fighter-jet:before{content:"\f0fb"}.icon-beer:before{content:"\f0fc"}.icon-h-sign:before{content:"\f0fd"}.icon-plus-sign-alt:before{content:"\f0fe"}.icon-double-angle-left:before{content:"\f100"}.icon-double-angle-right:before{content:"\f101"}.icon-double-angle-up:before{content:"\f102"}.icon-double-angle-down:before{content:"\f103"}.icon-angle-left:before{content:"\f104"}.icon-angle-right:before{content:"\f105"}.icon-angle-up:before{content:"\f106"}.icon-angle-down:before{content:"\f107"}.icon-desktop:before{content:"\f108"}.icon-laptop:before{content:"\f109"}.icon-tablet:before{content:"\f10a"}.icon-mobile-phone:before{content:"\f10b"}.icon-circle-blank:before{content:"\f10c"}.icon-quote-left:before{content:"\f10d"}.icon-quote-right:before{content:"\f10e"}.icon-spinner:before{content:"\f110"}.icon-circle:before{content:"\f111"}.icon-mail-reply:before,.icon-reply:before{content:"\f112"}.icon-github-alt:before{content:"\f113"}.icon-folder-close-alt:before{content:"\f114"}.icon-folder-open-alt:before{content:"\f115"}.icon-expand-alt:before{content:"\f116"}.icon-collapse-alt:before{content:"\f117"}.icon-smile:before{content:"\f118"}.icon-frown:before{content:"\f119"}.icon-meh:before{content:"\f11a"}.icon-gamepad:before{content:"\f11b"}.icon-keyboard:before{content:"\f11c"}.icon-flag-alt:before{content:"\f11d"}.icon-flag-checkered:before{content:"\f11e"}.icon-terminal:before{content:"\f120"}.icon-code:before{content:"\f121"}.icon-mail-reply-all:before,.icon-reply-all:before{content:"\f122"}.icon-star-half-empty:before,.icon-star-half-full:before{content:"\f123"}.icon-location-arrow:before{content:"\f124"}.icon-crop:before{content:"\f125"}.icon-code-fork:before{content:"\f126"}.icon-unlink:before{content:"\f127"}.icon-question:before{content:"\f128"}#files_list_header #display_toolbar a span.icon-caret-left:before,.icon-info:before{content:"\f129"}.icon-exclamation:before{content:"\f12a"}.icon-superscript:before{content:"\f12b"}.icon-subscript:before{content:"\f12c"}.icon-eraser:before{content:"\f12d"}.icon-puzzle-piece:before{content:"\f12e"}.icon-microphone:before{content:"\f130"}.icon-microphone-off:before{content:"\f131"}.icon-shield:before{content:"\f132"}.icon-calendar-empty:before{content:"\f133"}.icon-fire-extinguisher:before{content:"\f134"}.icon-rocket:before{content:"\f135"}.icon-maxcdn:before{content:"\f136"}.icon-chevron-sign-left:before{content:"\f137"}.icon-chevron-sign-right:before{content:"\f138"}.icon-chevron-sign-up:before{content:"\f139"}.icon-chevron-sign-down:before{content:"\f13a"}.icon-html5:before{content:"\f13b"}.icon-css3:before{content:"\f13c"}.icon-anchor:before{content:"\f13d"}.icon-unlock-alt:before{content:"\f13e"}.icon-bullseye:before{content:"\f140"}.icon-ellipsis-horizontal:before{content:"\f141"}.icon-ellipsis-vertical:before{content:"\f142"}.icon-rss-sign:before{content:"\f143"}.icon-play-sign:before{content:"\f144"}.icon-ticket:before{content:"\f145"}.icon-minus-sign-alt:before{content:"\f146"}.icon-check-minus:before{content:"\f147"}.icon-level-up:before{content:"\f148"}.icon-level-down:before{content:"\f149"}.icon-check-sign:before{content:"\f14a"}.icon-edit-sign:before{content:"\f14b"}.icon-external-link-sign:before{content:"\f14c"}.icon-share-sign:before{content:"\f14d"}.icon-compass:before{content:"\f14e"}.icon-collapse:before{content:"\f150"}.icon-collapse-top:before{content:"\f151"}.icon-expand:before{content:"\f152"}.icon-eur:before,.icon-euro:before{content:"\f153"}.icon-gbp:before{content:"\f154"}.icon-dollar:before,.icon-usd:before{content:"\f155"}.icon-inr:before,.icon-rupee:before{content:"\f156"}.icon-jpy:before,.icon-yen:before{content:"\f157"}.icon-cny:before,.icon-renminbi:before{content:"\f158"}.icon-krw:before,.icon-won:before{content:"\f159"}.icon-bitcoin:before,.icon-btc:before{content:"\f15a"}.icon-file:before{content:"\f15b"}.icon-file-text:before{content:"\f15c"}.icon-sort-by-alphabet:before{content:"\f15d"}.icon-sort-by-alphabet-alt:before{content:"\f15e"}.icon-sort-by-attributes:before{content:"\f160"}.icon-sort-by-attributes-alt:before{content:"\f161"}.icon-sort-by-order:before{content:"\f162"}.icon-sort-by-order-alt:before{content:"\f163"}.icon-thumbs-up:before{content:"\f164"}.icon-thumbs-down:before{content:"\f165"}.icon-youtube-sign:before{content:"\f166"}.icon-youtube:before{content:"\f167"}.icon-xing:before{content:"\f168"}.icon-xing-sign:before{content:"\f169"}.icon-youtube-play:before{content:"\f16a"}.icon-dropbox:before{content:"\f16b"}.icon-stackexchange:before{content:"\f16c"}.icon-instagram:before{content:"\f16d"}.icon-flickr:before{content:"\f16e"}.icon-adn:before{content:"\f170"}.icon-bitbucket:before{content:"\f171"}.icon-bitbucket-sign:before{content:"\f172"}.icon-tumblr:before{content:"\f173"}.icon-tumblr-sign:before{content:"\f174"}.icon-long-arrow-down:before{content:"\f175"}.icon-long-arrow-up:before{content:"\f176"}.icon-long-arrow-left:before{content:"\f177"}.icon-long-arrow-right:before{content:"\f178"}.icon-apple:before{content:"\f179"}.icon-windows:before{content:"\f17a"}.icon-android:before{content:"\f17b"}.icon-linux:before{content:"\f17c"}.icon-dribbble:before{content:"\f17d"}.icon-skype:before{content:"\f17e"}.icon-foursquare:before{content:"\f180"}.icon-trello:before{content:"\f181"}.icon-female:before{content:"\f182"}.icon-male:before{content:"\f183"}.icon-gittip:before{content:"\f184"}.icon-sun:before{content:"\f185"}.icon-moon:before{content:"\f186"}.icon-archive:before{content:"\f187"}.icon-bug:before{content:"\f188"}.icon-vk:before{content:"\f189"}.icon-weibo:before{content:"\f18a"}.icon-renren:before{content:"\f18b"}.mdi{font:normal normal normal 24px/1 "Material Design Icons";font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;transform:translate(0,0)}.mdi-download:before{content:"\f2cf"}.mdi-file:before{content:"\f309"}.mdi-file-multiple:before{content:"\f317"}.mdi-folder-plus:before{content:"\f34c"}.mdi-folder:before{content:"\f340"}.mdi-share:before{content:"\f585"}.mdi-share-variant:before{content:"\f586"}.mdi-upload:before{content:"\f63f"}.mdi-account-network:before{content:"\f110"}.mdi-calendar:before{content:"\f1e3"}.mdi-close:before{content:"\f24c"}.mdi-close-box:before{content:"\f24d"}.mdi-close-box-outline:before{content:"\f24e"}.mdi-close-circle:before{content:"\f24f"}.mdi-close-circle-outline:before{content:"\f250"}.mdi-archive:before{content:"\f13a"}.mdi-drawing-box:before{content:"\f2d4"}.mdi-delete:before{content:"\f2b5"}.mdi-file-document:before{content:"\f30e"}.mdi-file-excel:before{content:"\f310"}.mdi-file-image:before{content:"\f314"}.mdi-file-music:before{content:"\f318"}.mdi-file-pdf:before{content:"\f31a"}.mdi-file-powerpoint:before{content:"\f31c"}.mdi-file-video:before{content:"\f320"}.mdi-file-word:before{content:"\f321"}.mdi-file-xml:before{content:"\f323"}.mdi-language-css3:before{content:"\f40e"}.mdi-language-html5:before{content:"\f40f"}.mdi-language-javascript:before{content:"\f410"}.mdi-language-php:before{content:"\f411"}.mdi-movie:before{content:"\f472"}.mdi-timer:before{content:"\f609"}.mdi-link:before{content:"\f429"}.mdi-web:before{content:"\f68c"}.mdi-comment-multiple-outline:before{content:"\f277"}.mdi-cloud-download:before{content:"\f258"}.mdi-file-import:before{content:"\f315"}.mdi-qrcode:before{content:"\f521"}.mdi-qrcode-scan:before{content:"\f522"}.react-mui-context *{font-family:Roboto,sans-serif}.react-mui-context [class*=" icon-"],.react-mui-context [class^=icon-]{font-family:FontAwesome}.react-mui-context [class*=" mdi-"],.react-mui-context [class^=mdi-]{font-family:"Material Design Icons"}.react-mui-context .mui-tabs-container .mui-tab-item-container{background-color:#424242!important}.react-mui-context .mui-tabs-container .mui-ink-bar{background-color:#ff9e80}@font-face{font-family:FontAwesome;src:url(../fonts/awesome/fontawesome-webfont.eot?v=3.2.1);src:url(../fonts/awesome/fontawesome-webfont.eot?#iefix&v=3.2.1) format('embedded-opentype'),url(../fonts/awesome/fontawesome-webfont.woff?v=3.2.1) format('woff'),url(../fonts/awesome/fontawesome-webfont.ttf?v=3.2.1) format('truetype'),url(../fonts/awesome/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1) format('svg');font-weight:400;font-style:normal}@font-face{font-family:'Open Sans Regular';src:url(../fonts/open-sans-fontfacekit/opensans_regular/OpenSans-Regular-webfont.eot);src:url(../fonts/open-sans-fontfacekit/opensans_regular/OpenSans-Regular-webfont.eot?iefix) format('eot'),url(../fonts/open-sans-fontfacekit/opensans_regular/OpenSans-Regular-webfont.woff) format('woff'),url(../fonts/open-sans-fontfacekit/opensans_regular/OpenSans-Regular-webfont.ttf) format('truetype'),url(../fonts/open-sans-fontfacekit/opensans_regular/OpenSans-Regular-webfont.svg#webfont) format('svg')}@font-face{font-family:'Open Sans Light';src:url(../fonts/open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.eot);src:url(../fonts/open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.eot?iefix) format('eot'),url(../fonts/open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.woff) format('woff'),url(../fonts/open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.ttf) format('truetype'),url(../fonts/open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.svg#webfont) format('svg')}@font-face{font-family:Roboto;font-weight:300;src:url(../fonts/roboto-font/roboto-light.woff2) format('woff2'),url(../fonts/roboto-font/roboto-light.woff) format('woff')}@font-face{font-family:Roboto;font-weight:400;src:url(../fonts/roboto-font/roboto.woff2) format('woff2'),url(../fonts/roboto-font/roboto.woff) format('woff')}@font-face{font-family:Roboto;font-weight:500;src:url(../fonts/roboto-font/roboto-medium.woff2) format('woff2'),url(../fonts/roboto-font/roboto-medium.woff) format('woff')}@font-face{font-family:"Material Design Icons";src:url(../fonts/mdi/materialdesignicons-webfont.eot?v=1.4.57);src:url(../fonts/mdi/materialdesignicons-webfont.eot?#iefix&v=1.4.57) format("embedded-opentype"),url(../fonts/mdi/materialdesignicons-webfont.woff2?v=1.4.57) format("woff2"),url(../fonts/mdi/materialdesignicons-webfont.woff?v=1.4.57) format("woff"),url(../fonts/mdi/materialdesignicons-webfont.ttf?v=1.4.57) format("truetype"),url(../fonts/mdi/materialdesignicons-webfont.svg?v=1.4.57#materialdesigniconsregular) format("svg");font-weight:400;font-style:normal}:focus{outline:0}body{font-family:Roboto,sans-serif}h3{font-weight:500}a:active,a:focus,a:hover,a:link,a:visited{text-decoration:none;outline:0;color:#333}.linked{cursor:pointer;z-index:10}body,html{margin:0;padding:0;background-color:#333}*{-moz-user-select:-moz-none;-khtml-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none}.selectable,input,textarea{font-family:"Open Sans Light",HelveticaNeue-Light,"Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;-moz-user-select:text;-khtml-user-select:auto;-webkit-user-select:auto;-ms-user-select:auto;user-select:auto}::-moz-focus-inner{border:none}.no_select_bg::-moz-selection{background:0 0}.no_select_bg::selection{background:0 0}.selected{background-color:#CCC!important;text-decoration:none}.selected-focus,.selected-focus span.text_label{color:#fff!important}.no_select_bg::-moz-selection{background-color:transparent}.css_boxshadow{box-shadow:1px 1px 4px rgba(100,100,100,.7)}span.letter_badge{float:left;width:32px;background-color:#111;border-radius:34px;color:#fff;text-align:center;padding:7px 0;font-size:.8em;font-family:"Open Sans Regular","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif}.kbd,kbd{padding:.1em .6em;border:1px solid #ccc;font-size:11px;font-family:Arial,sans-serif;background-color:#f7f7f7;box-shadow:0 1px 0 rgba(0,0,0,.2),0 0 0 2px #fff inset;border-radius:3px;margin:0 .1em;text-shadow:0 1px 0 #fff;line-height:1.4;white-space:nowrap}.resizableHandle{position:absolute;width:10px;height:10px;background-image:url(../images/resize_handle.png);opacity:.5;cursor:nwse-resize}.flexbox body{position:absolute;top:0;bottom:0;left:0;right:0}.vertical_layout{display:-webkit-flex;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;-webkit-flex-direction:column}.flexbox,.horizontal_layout{display:-webkit-flex;display:-ms-flexbox}.vertical_layout>*{-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0}.horizontal_layout{display:flex;-ms-flex-direction:row;flex-direction:row;-webkit-flex-direction:row;-ms-flex-align:stretch;align-items:stretch;-webkit-align-items:stretch}.vertical_fit{-ms-flex:1;flex:1;-webkit-flex:1;overflow-y:hidden}.fit_background_height{background-size:auto 100%!important}.table{display:table}.table>div{display:table-row}.table>div>div{display:table-cell}.flexbox{display:flex;-webkit-flex-flow:column;-ms-flex-flow:column;flex-flow:column}.flexbox .row{-webkit-flex:0 1 30px;-ms-flex:0 1 30px;flex:0 1 30px}.flexbox .row.header{-webkit-flex:0 1 auto;-ms-flex:0 1 auto;flex:0 1 auto}.flexbox .row.content{-webkit-flex:1 1 auto;-ms-flex:1 1 auto;flex:1 1 auto;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.text-right{text-align:right}.text-left{text-align:left}.text-center{text-align:center}#container,.leightbox{width:50%;text-align:left}#container{margin:0 auto}.footer{background-color:#000;padding:.5em}.leightbox{color:#333;display:none;position:absolute;top:45%;left:45%;height:50%;padding:1em;border:1em solid #B8B8B8;background-color:#fff;z-index:1040;overflow:auto}#element_overlay,#loading_overlay,#overlay{top:0;width:100%;height:100%;position:absolute;left:0}#loading_overlay,#overlay{display:none;z-index:1040;background-color:#000;-moz-opacity:.6;opacity:.2;filter:alpha(opacity=60)}#loading_overlay{display:block;z-index:2000;-moz-opacity:1;opacity:1;filter:alpha(opacity=100)!important;background-color:rgba(0,0,0,.83)!important}#element_overlay{z-index:1000;background-color:#EEE;-moz-opacity:0;opacity:0;filter:alpha(opacity=0);text-align:center;overflow:hidden;padding:0!important;margin:0!important}div.dialogBox div#element_overlay{background-color:#252525;opacity:0;transition:opacity .4s ease}#element_overlay img{margin-top:30%}.webfx-tree-container,.webfx-tree-item{margin:0;font-size:11px;white-space:nowrap}#element_iframe{position:absolute;width:80%;height:80%;z-index:1010;background-color:#eee;border:1px solid #000}#overlay[id],.lightbox[id]{position:fixed}.webfx-tree-container{padding:0}.webfx-tree-item{padding:5px 4px;height:27px;position:relative}.webfx-tree-item a,.webfx-tree-item a:active,.webfx-tree-item a:hover,.webfx-tree-item a:link{margin-left:0;outline:0;cursor:default;text-decoration:none;color:#ddd}.webfx-tree-item a.selected-focus,.webfx-tree-item a:active.selected-focus,.webfx-tree-item a:hover.selected-focus,.webfx-tree-item a:link.selected-focus,.webfx-tree-item.selected-webfx-tree-item{color:#fff}.webfx-tree-item a span,.webfx-tree-item a:active span,.webfx-tree-item a:hover span,.webfx-tree-item a:link span{display:inline-block;line-height:19px;margin-top:4px;padding-left:30px;background-position:4px 1px;background-repeat:no-repeat;font-size:13px;background-size:16px}.webfx-tree-item a span span.treeLabelPaginationWrapper,.webfx-tree-item a:active span span.treeLabelPaginationWrapper,.webfx-tree-item a:hover span span.treeLabelPaginationWrapper,.webfx-tree-item a:link span span.treeLabelPaginationWrapper{display:inline;padding:0;margin:0}.webfx-tree-item a span span.treeLabelPaginationWrapper span.treeLabelPaginationPadding,.webfx-tree-item a:active span span.treeLabelPaginationWrapper span.treeLabelPaginationPadding,.webfx-tree-item a:hover span span.treeLabelPaginationWrapper span.treeLabelPaginationPadding,.webfx-tree-item a:link span span.treeLabelPaginationWrapper span.treeLabelPaginationPadding{display:inline-block;margin-right:8px;padding:0}.webfx-tree-item a span span.treeLabelPaginationWrapper a.treeLabelPagination,.webfx-tree-item a:active span span.treeLabelPaginationWrapper a.treeLabelPagination,.webfx-tree-item a:hover span span.treeLabelPaginationWrapper a.treeLabelPagination,.webfx-tree-item a:link span span.treeLabelPaginationWrapper a.treeLabelPagination{display:inline-block;margin:0 3px;cursor:pointer}.flat_tree_pane .webfx-tree-item img,.flat_tree_pane div#tree_container>.webfx-tree-container>.webfx-tree-item a span:before,.flat_tree_pane div#tree_container>.webfx-tree-item{display:none}.webfx-tree-item img{width:24px;vertical-align:middle;border:0;float:left;visibility:hidden}.webfx-tree-item:hover{background-color:#666}.webfx-tree-item.selected-webfx-tree-item a{color:#fff!important;text-decoration:none}.webfx-tree-item.selected-webfx-tree-item-inactive{text-decoration:none}.webfx-tree-item.selected{background:#ddd;color:#fff;text-decoration:none}.webfx-tree-item .webfx-tree-icon{width:16px;height:16px;margin-right:3px}.flat_tree_pane div#tree_container{border:0;background-color:transparent}.flat_tree_pane div#tree_container>.webfx-tree-container>.webfx-tree-item{margin-top:10px}.flat_tree_pane div#tree_container>.webfx-tree-container>.webfx-tree-item a span{color:rgba(255,255,255,.55);background-image:none!important;padding-left:0;margin-top:5px;font-size:10px;letter-spacing:1px;text-transform:uppercase}.flat_tree_pane .webfx-tree-item{background-color:transparent;cursor:pointer;padding:4px 20px}.flat_tree_pane .webfx-tree-item a{color:rgba(255,255,255,.9)!important;cursor:pointer;letter-spacing:1px}.flat_tree_pane .webfx-tree-item a span{padding-left:33px;background-position:13px 4px!important;background-repeat:no-repeat;font-size:13px;background-size:12px;padding-top:1px}.flat_tree_pane div.webfx-tree-item.selected-webfx-tree-item,.flat_tree_pane div.webfx-tree-item.selected-webfx-tree-item-inactive{background-color:rgba(255,255,255,.15)!important}.flat_tree_pane div.webfx-tree-item.selected-webfx-tree-item a,.flat_tree_pane div.webfx-tree-item.selected-webfx-tree-item-inactive a{text-shadow:none;color:#fff!important}.flat_tree_pane div.scrolling div.webfx-tree-container.first_container,.flat_tree_pane div.webfx-tree-container.first_container{padding:0}.flat_tree_pane div.webfx-tree-container>.webfx-tree-container>.webfx-tree-container{margin-bottom:0;box-shadow:none}.flat_tree_pane div.webfx-tree-container>.webfx-tree-container>.webfx-tree-item{background-color:transparent;border-top:0}.flat_tree_pane div.webfx-tree-container>.webfx-tree-container>.webfx-tree-container div.webfx-tree-item{padding-left:40px}.flat_tree_pane div.webfx-tree-container>.webfx-tree-container>.webfx-tree-container>.webfx-tree-container div.webfx-tree-item{padding-left:60px}.flat_tree_pane div.webfx-tree-container>.webfx-tree-container>.webfx-tree-container>.webfx-tree-container>.webfx-tree-container div.webfx-tree-item{padding-left:80px}div#tree_container>div:first-child{padding-left:16px}div#tree_container>div.first_container{margin-left:-11px}div#tree_container div[data-node-icon]>a>span,div#tree_container>div:first-child>a>span{background-image:none!important;padding-left:4px}div#tree_container div[data-node-icon]>a>span:before,div#tree_container>div:first-child>a>span:before{content:"\f015";font-size:1.2em;padding-right:18px;font-family:FontAwesome;font-weight:400;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased}div#tree_container div[data-node-icon]>a>span:before{content:"\f07b"}div#tree_container div[data-node-icon="zip.png"]>a>span:before{content:"\f187"}div#tree_container div[data-node-icon="trashcan_full.png"]>a>span:before,div#tree_container div[data-node-icon="trashcan.png"]>a>span:before{content:"\f014"}#folder_pane{margin-left:-4px}#folder_pane.show_first_level div#tree_container>div.webfx-tree-container>div.webfx-tree-container{display:none!important}div.selected-webfx-tree-item-inactive{background-color:#666!important}.selected-focus,div.selected-webfx-tree-item{background-color:#ff764b!important}.settings_main_pane div.selected-focus,.settings_main_pane div.selected-webfx-tree-item,.settings_main_pane tr.selected-focus{background-color:#4ea7a5}div.treeCopyContainer div.webfx-tree-item a{color:#555!important}.webfx-tree-item.selected-webfx-tree-item div.overlay_icon_div span.overlay-class-span,div.treeCopyContainer div.selected-webfx-tree-item a,div.treeCopyContainer div.selected-webfx-tree-item-inactive a,div.treeCopyContainer div.webfx-tree-item:hover a{color:#fff!important}.webfx-tree-item div.overlay_icon_div{display:inline}.webfx-tree-item div.overlay_icon_div span.overlay-class-span{margin:0!important;padding:0 0 0 8px!important;font-size:11px!important;opacity:.73}.class-FilesList .sort-table{font-size:11px;color:rgba(0,0,0,.53)}.class-FilesList .sort-table td{padding:8px 0;border:0}.class-FilesList .sort-table tr:nth-child(even){background-color:rgba(0,0,0,.02)}.no-flexbox .class-FilesList .sort-table td{padding:3px 0}.class-FilesList .sort-table #last_header{border-right:0 solid #ddd;width:auto!important}.class-FilesList .sort-table tr h3{padding:5px 10px 10px;font-size:1.8em;margin:10px 0 -7px;border-bottom:1px solid #999}.class-FilesList .text_label{display:block;overflow:hidden;padding-left:6px;padding-top:4px;height:18px;line-height:17px;white-space:nowrap;text-overflow:ellipsis}.class-FilesList .text_label .full{height:auto;white-space:normal}.class-FilesList span.overlay-class-span{color:rgba(0,0,0,.87);margin-left:5px;padding:0!important;margin-top:0!important}.class-FilesList .overlay_icon_div{position:absolute;background:0 0!important;height:12px!important;bottom:0!important;width:auto!important;top:9px!important;right:10px!important;font-size:11px}.class-FilesList .overlay_icon_div span.overlay-class-span{margin-left:10px}.class-FilesList .selected span.overlay-class-span{color:#fff}.class-FilesList .thumbnail_selectable_cell{width:110px;height:100px;float:left;text-align:center;margin:4px;border-radius:2px;padding:4px 6px;color:rgba(0,0,0,.87)}.class-FilesList .thumbnail_selectable_cell div.thumbnail_cell_metadata span.metadata_chunk span.text_label{margin-left:0;display:inline}.class-FilesList .thumbnail_selectable_cell div.thumbnail_cell_metadata span.metadata_chunk{display:inline;margin-right:5px}.class-FilesList .thumbnail_selectable_cell .mimefont{color:#607d8b;line-height:38px}.class-FilesList .thumbnail_selectable_cell.selected-focus .mimefont{color:#fff}.class-FilesList .thumbnail_selectable_cell .thumbLabel{white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.class-FilesList .thumbnail_selectable_cell>div>div.overlay_icon_div{top:27px!important;right:21px!important;font-size:16px;transition:top .6s ease}.class-FilesList .thumbnail_selectable_cell.detailed{margin:0!important;margin-bottom:2px;width:100%;display:block;height:auto;position:relative;border-radius:0;padding:7px 4px;border-bottom:1px solid rgba(0,0,0,.03)}.class-FilesList .thumbnail_selectable_cell.detailed div.thumbnail_selectable_cell{margin-right:11px;background-color:transparent}.class-FilesList .thumbnail_selectable_cell.detailed div.thumbLabel{font-size:15px;text-align:left;padding-top:9px;padding-bottom:0;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.class-FilesList .thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata{text-align:left;padding-top:1px;font-size:13px;white-space:nowrap;margin-top:1px;opacity:.5}.class-FilesList .thumbnail_selectable_cell.detailed.selected-focus div.thumbLabel{font-weight:500}.class-FilesList .thumbnail_selectable_cell.detailed.selected-focus div.thumbnail_cell_metadata{opacity:.8}.class-FilesList .thumbnail_selectable_cell.detailed:hover{background-color:#f7f7f7}.class-FilesList .thumbnail_selectable_cell.detailed:last-child{border-bottom:0}.class-FilesList .thumbnail_selectable_cell.detailed.metadata_empty div.thumbLabel{padding-top:18px}.class-FilesList.paginated div.scroller_track{top:30px}.class-FilesList.fl-displayMode-list.fl-showFilterPane div.scroller_track{top:50px!important}.class-FilesList.fl-displayMode-list div.scroller_track{top:26px}.class-FilesList.fl-displayMode-list.paginated div.scroller_track{top:56px}.class-FilesList.fl-displayMode-list .table_rows_container span.list_selectable_span span.text_label{font-size:13px;background-position:5px 4px;color:rgba(0,0,0,.87)}.class-FilesList.fl-displayMode-list .table_rows_container span.list_selectable_span span.text_label .mimefont{display:inline-block;float:left;margin:0 5px 0 2px;font-size:17px;color:#607d8b}.class-FilesList.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata,.class-FilesList.fl-displayMode-thumb div.thumbnail_selectable_cell.fl-displayMode-thumbsize-small div.thumbLabel,.class-FilesList>div.panelHeader{display:none}.class-FilesList.fl-displayMode-list .table_rows_container .selected-focus span.list_selectable_span span.text_label .mimefont{color:#fff}.class-FilesList.fl-displayMode-list .table_rows_container span#ajxp_label{font-weight:400;background-size:16px;font-family:"Open Sans Regular","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif}.dialogBox,.dialogBox .dialogContent div.SF_material div,.dialogBox .dialogContent div.SF_material input,.dialogBox .dialogContent div.SF_material select,.messageBox #message_content{font-family:Roboto,sans-serif}.class-FilesList.fl-displayMode-list .table_rows_container tr.even:hover,.class-FilesList.fl-displayMode-list .table_rows_container tr:hover{background-color:#fdfce4}.class-FilesList.fl-displayMode-thumb div.thumbnail_selectable_cell{margin:1px;background-color:#fafafa;border-radius:0;padding:0 0 3px;background-size:cover;background-position:center;box-sizing:border-box;position:relative}.class-FilesList.fl-displayMode-thumb div.thumbnail_selectable_cell div.thumbLabel{text-align:left;opacity:1;background-color:rgba(0,0,0,.45);padding:12px 16px;color:#fff;font-weight:500;position:absolute;bottom:0;right:0;left:0}.class-FilesList.fl-displayMode-thumb div.thumbnail_selectable_cell div.overlay_icon_div{top:14px!important;right:17px!important}.class-FilesList.fl-displayMode-thumb div.thumbnail_selectable_cell div.overlay_icon_div span.overlay-class-span{color:#fff!important;font-size:14px}.class-FilesList.fl-displayMode-thumb div.thumbnail_selectable_cell.fl-displayMode-thumbsize-medium div.thumbLabel{padding:6px 8px;margin-top:-15px;font-size:.8em}.class-FilesList.fl-displayMode-thumb div.thumbnail_selectable_cell.fl-displayMode-thumbsize-medium div.thumbLabel div.overlay_icon_div{top:8px!important;right:10px!important}.class-FilesList.fl-displayMode-thumb div.thumbnail_selectable_cell.fl-displayMode-thumbsize-large div.thumbLabel{font-size:.9em}.class-FilesList.fl-displayMode-thumb div.thumbnail_selectable_cell.selected-focus{border:2px solid #ff764b}.class-FilesList.fl-displayMode-thumb div.thumbnail_selectable_cell.selected-focus div.overlay_icon_div{right:15px!important}.class-FilesList.fl-displayMode-thumb div.thumbnail_selectable_cell.selected-focus.fl-displayMode-thumbsize-small{background-color:#ff764b!important}.class-FilesList.fl-displayMode-thumb div.thumbnail_selectable_cell.selected-focus div.thumbLabel{padding:12px 14px 10px}.class-FilesList.fl-displayMode-thumb div.thumbnail_selectable_cell.selected-focus.fl-displayMode-thumbsize-medium div.thumbLabel{padding:6px 8px 4px 6px!important}.class-FilesList.fl-displayMode-thumb div.thumbnail_selectable_cell.selected-focus.fl-displayMode-thumbsize-medium div.thumbLabel div.overlay_icon_div{top:8px!important;right:8px!important}.class-FilesList.fl-displayMode-thumb div.thumbnail_selectable_cell.selected-focus span.overlay-class-span{color:#ff764b}.class-FilesList .list_selectable_span img{float:left}.class-FilesList .paginator{background-color:#fffce8;border:0;font-size:12px;padding:5px;text-align:center}.class-FilesList .paginator .paginatorInput{width:21px;padding:0 2px;height:17px;text-align:right;border:1px solid #CCC;margin-right:2px;margin-left:5px}.class-FilesList.class-FetchedResultPane div.overlay_icon_div{top:16px!important;font-size:13px}.class-FilesList.class-FetchedResultPane div.thumbnail_selectable_cell.detailed{padding:2px 12px;border-bottom:0}.class-FilesList.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_selectable_cell img{width:16px!important;height:16px!important;margin-top:4px!important}.class-FilesList.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_selectable_cell{margin:0;padding:1px 7px 6px 6px;height:22px!important}.class-FilesList.class-FetchedResultPane div.class-FetchedResultPane.display_metadata div.thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata{display:inherit}.class-FilesList.class-FetchedResultPane div.ajxpNodeProvider.selected-focus{background-color:#fff!important}.class-FilesList.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbLabel{font-size:13px;padding-top:4px}.class-FilesList.class-FetchedResultPane div.thumbnail_selectable_cell.detailed span.text_label{padding-top:0}.class-FilesList #no-results-found{text-align:center;margin-top:10%}.class-FilesList div.header_resizer{overflow:hidden;border-bottom:1px solid rgba(0,0,0,.1);opacity:.85;max-height:26px}.class-FilesList div.header_resizer .column_resize_grabber{display:block;width:3px;float:right;height:23px;font-size:0;cursor:e-resize}.class-FilesList div.header_resizer div.header_cell{float:left;overflow:hidden;width:90px;white-space:nowrap;border:0!important;cursor:pointer}.class-FilesList div.header_resizer div.header_cell span.ajxp-order-icon{display:none;float:right;padding-top:1px}.class-FilesList div.header_resizer div.header_cell.ascending span.icon-caret-up,.class-FilesList div.header_resizer div.header_cell.descending span.icon-caret-down{display:inline-block}.class-FilesList div.header_resizer div.header_cell.ascending div.header_label,.class-FilesList div.header_resizer div.header_cell.descending div.header_label{background-color:rgba(0,0,0,.05)}.class-FilesList div.header_resizer div.header_cell input[type=text]{margin-left:0;width:96%;border:0;background:0 0}.class-FilesList div.header_resizer.sort-table-filter{display:none}.class-FilesList div.header_resizer.sort-table-filter div.header_cell{border-right:1px solid #ccc!important;box-shadow:inset 1px 1px 1px rgba(0,0,0,.37)}.class-FilesList div.header_resizer.sort-table-filter div.header_cell:last-child{border-right:0!important}.class-FilesList div.header_resizer div.header_label{font-size:11px;padding:5px 5px 4px;background-color:#fff;color:rgba(0,0,0,.87);border-bottom:0;height:18px;overflow:hidden}.class-FilesList div.header_resizer div.resizer{float:left;width:1px;background-color:#ebedf0;height:26px;cursor:e-resize;border:0}.class-FilesList div.header_resizer div.resizer_sortable{background-color:#fff}.class-FilesList div.header_resizer div.dragging{background-color:#bbb;border-left:1px solid #bbb}.class-FilesList div.resizeGhost{width:1px;border-right:1px solid #ccc;position:absolute;z-index:1017;opacity:.7}.class-FilesList.fl-showFilterPane div.sort-table-filter{display:block}.class-FilesList .pg_cancel_button{background-color:#C33;display:inline-block;border-radius:20px;-moz-border-radius:20px;-webkit-border-radius:20px;cursor:pointer;float:right;margin-right:8px;font-weight:700;color:#fff!important;height:12px;width:8px;padding-left:4px;line-height:13px;font-size:7px;margin-top:2px}input,select,textarea{font-size:13px;margin-left:10px;margin-top:1px;padding:2px}input,select{border-radius:2px;border:1px solid #aaa}textarea{-moz-border-radius:2px;-webkit-border-radius:2px;background-color:#fff;border-radius:2px;border:1px solid #aaa}div.oneFieldForm{background-color:#eee;border-radius:4px;margin-bottom:13px;margin-top:10px;padding:3px 6px}div.oneFieldForm input.SF_input{background:#fff!important}.SF_input.SF_inlineButton,.largeButton{background:rgba(107,107,107,.87);border-radius:5px;color:#fff;cursor:pointer;display:inline-block;float:left;font-size:13px;margin-left:12px;overflow:visible;padding:7px 6px!important;text-align:center;outline:0}.largeButton img{height:16px;margin-right:5px;margin-top:3px;position:relative;top:-2px;vertical-align:middle;width:16px}.SF_input.SF_inlineButton{font-weight:500}.SF_disabled img{-moz-opacity:.3;cursor:default;filter:alpha(opacity=30);opacity:.3}div.wizard-pane{display:none!important}div.wizard-pane.wizard-panel-active{display:block!important}div.wizard_panel_title{font-size:24px;margin:5px 0}div.wizard_buttons{margin-top:30px;text-align:center}div.wizard_buttons div{display:inline-block!important;float:none!important;margin-left:10px!important;width:70px}.SF_input.SF_inlineButton.wizard_next.disabled,.SF_input.SF_inlineButton.wizard_previous.disabled{display:none!important}div.wizard_progress{display:-webkit-flex!important;display:-ms-flexbox!important;display:flex!important}.wizard_next,.wizard_previous{background-color:#f47561!important}span.wizard_progress_element{background-color:#fff;border-bottom:3px solid #D8D7D7;color:#555;-webkit-flex:1;-ms-flex:1;flex:1;font-size:11px;padding:28px 0 14px;position:relative;text-align:center}span.wizard_progress_element.wizard_progress_passed{border-bottom:3px solid #f47561;color:#f47561}span.progress_number{background-color:#ABAAAA;border-radius:50%;bottom:-9px;color:#fff;display:inline-block;font-size:11px;font-weight:700;height:16px;left:43%;position:absolute;text-align:center;width:16px;line-height:17px}.wizard_progress_passed span.progress_number{background-color:#f47561}label{font-size:13px;margin:0 5px}.checkbox_left{clear:left;float:left;margin:0 4px 5px 0!important}label.checkbox_label_left{display:inline-block;float:left}div.SF_element{clear:left;margin:0 2%;padding-top:5px;width:96%}div.SF_element div.SF_element{margin:0}div.SF_disabled{color:#ccc;font-style:italic}div.SF_label{line-height:22px!important;margin-top:3px;width:100%!important}input.SF_fieldCheckBox{margin-top:7px!important}.no-flexbox div.SF_label{padding-right:3px!important}.SF_input{margin-left:0;padding:1%!important;width:97%}.SF_element div.SF_image_block,.SF_element select,.SF_element textarea{background-color:#fff;margin-left:0!important;max-width:450px!important;width:97%!important}div.SF_element.SF_largeLabel>input.SF_input.SF_number,input.SF_input.SF_number{text-align:right;width:30px!important}select.SF_input{box-sizing:border-box;padding:0 0 0 5px!important;width:99%!important}.SF_box{width:20px!important}.SF_fieldCheckBox{float:left;margin:5px}.SF_elementWithCheckbox>.SF_input{width:50%!important}.SF_replication_Add,.SF_replication_Remove{display:block;height:20px;left:0;width:20px;bottom:0}.SF_inlineButton{background-image:url(../../images/grid_tl.png);margin:3px 0!important;padding:4px!important}.SF_inlineButton span[class^=icon-]{margin-right:3px}.SF_inlineMonitoring{padding:7px 4px!important}.SF_inlineMonitoring.SF_inlineMonitoringWorking:after{content:" [reloading]"}.SF_inlineButton.SF_inlineButtonWorking{box-shadow:inset 1px 1px 0 rgba(0,0,0,.35);padding-bottom:8px!important;padding-top:10px!important}.dialogBox,div.autocomplete{box-shadow:0 3px 6px rgba(0,0,0,.16),0 3px 6px rgba(0,0,0,.23)}.SF_failed{border:1px solid #d8b0b0!important}.SF_replicableGroup{background-color:#eee;border-radius:5px;clear:both;margin-bottom:5px;margin-top:8px;padding-bottom:20px;position:relative;padding-left:10px;margin-left:-10px;max-width:490px}.SF_replication_Add{background:url(../images/0.gif) 5px 6px no-repeat;position:absolute}.SF_replication_Remove{background:url(../images/1.gif) 5px 6px no-repeat;position:absolute;top:0}.SF_rgClear{clear:left;height:3px}.SF_horizontal_fieldsRow,.SF_horizontal_labelRow{clear:both}.SF_image_block{float:left;max-width:80px}.SF_image.small{max-height:80px;max-width:80px}#user_profile_form img.SF_image.small{border-radius:40px}.SF_image_link{cursor:pointer;display:inline-block;text-align:center;width:80px}.accordion_toggle_failed{background-color:#d8b0b0!important}.SF_horizontal_labelRow div.SF_label{float:left;margin-right:5px;overflow:hidden;padding:0 5px 0 3px;text-align:left;text-overflow:ellipsis;white-space:nowrap}.SF_horizontal_fieldsRow input{float:left;font-size:13px;margin-right:5px;padding:3px 4px 3px 2px!important}.SF_horizontal_fieldsRow input.SF_number{text-align:left}.SF_horizontal_actions{float:left;font-size:15px;padding:5px 2px}.SF_horizontal_actions span{cursor:pointer;margin-right:0}.SF_horizontal_pastilles{float:none;font-size:11px;padding:1px 8px}.SF_horizontal_pastilles span{margin-right:10px}.SF_horizontal_pastilles span>span{margin:0}.SF_horizontal_action_destructive{color:#a00}.dialogBox .dialogContent div.SF_material div.SF_element{margin:0;width:auto}.dialogBox .dialogContent div.SF_material div.SF_element span.select-styler{border-top:1px solid #e2e2e2;display:block;width:98%}.dialogBox .dialogContent div.SF_material div.SF_label{color:#8c8c8c;font-size:11px;line-height:14px!important;margin-left:0;margin-top:17px;text-transform:none}.dialogBox .dialogContent div.SF_material input,.dialogBox .dialogContent div.SF_material textarea{border-radius:0;border:0;font-size:14px;margin:1px 0 0;padding:4px 1% 0 0!important;border-bottom:1px solid #ddd}.dialogBox .dialogContent div.SF_material select{border-radius:0;border:0;font-size:14px;margin:1px 0 0;padding:4px 1% 0 0!important}.dialogBox .dialogContent div.SF_material select.SF_input{border:0;box-sizing:border-box;padding:0!important;width:98%!important}.dialogBox .dialogContent div.SF_material .dialogLegend{font-size:12px;line-height:inherit;padding:7px 0}.dialogBox .dialogContent div.SF_material input.SF_failed{border:0!important;border-bottom:1px solid #d8b0b0!important}.dialogBox .dialogContent div.SF_material div.SF_input.SF_inlineButton.disabled{opacity:.5}.dialogBox .dialogContent div.reset-pydio-forms input{border:0;margin:0;padding:0;border-radius:0;height:inherit;font-size:inherit;background-color:transparent}.dialogBox .dialogContent div.reset-pydio-forms input:disabled{background-color:transparent!important}.dialogBox .dialogContent div.reset-pydio-forms .mui-text-field.mui-has-floating-labels .mui-text-field-input{padding-top:24px!important}.dialogBox .dialogContent div.reset-pydio-forms .dialogContent input[type=radio],.dialogBox .dialogContent div.reset-pydio-forms input[type=checkbox]{height:100%;width:100%}#all_forms{background-color:#fff}#all_forms>div{display:none}#all_forms form{display:inline}#all_forms div.shadow_class{display:block}div.shadow_class{border-radius:5px}.dialogBox{-webkit-font-smoothing:antialiased;display:none;font-size:11px;left:30%;min-width:420px;padding:0;position:absolute;top:30%;z-index:1048}.dialogBox .dialogTitle{background-color:#fff;color:rgba(0,0,0,.87);padding:24px 24px 10px;font-weight:500;cursor:move}.dialogBox .dialogTitle span.ajxp_icon_span{display:none;font-size:15px;padding-right:8px;padding-top:2px}.dialogBox .dialogTitle span#modalCloseBtn{color:rgba(0,0,0,.87);display:none;font-size:15px;margin-top:0;padding:7px 12px}.dialogBox .dialogTitle span.string-only-title{display:inline-block;font-size:21px}.dialogBox .dialogContent{background-color:#fff;font-size:16px;color:rgba(0,0,0,.53);padding:10px 24px 24px;line-height:22px;padding-bottom:76px;border-top:0}.dialogBox .dialogContent .dialogLegend{font-size:13px;line-height:16px}.dialogBox .dialogContent .dialogContentMainTitle{color:rgba(0,0,0,.73);font-size:20px;margin-bottom:10px;padding-bottom:0}.dialogBox .dialogContent .dialogButtons{position:absolute;box-sizing:border-box;bottom:0;left:0;right:0;height:52px;padding:8px;text-align:right}.dialogBox .dialogContent .dialogButtons .dialogButton{font-family:Roboto,sans-serif;font-weight:500;font-size:15px;color:#009688;text-transform:uppercase;background-color:transparent;border:0;border-radius:2px;height:32px;margin-left:8px;padding:2px 8px;transition:all 550ms cubic-bezier(.23,1,.32,1) 0s;cursor:pointer}.dialogBox .dialogContent .dialogButtons .dialogButton:focus{background-color:#d8fffb}.dialogBox .dialogContent .dialogButtons .dialogButton:hover{background-color:#bffff9}.dialogBox .dialogContent .dialogButtons fieldSet input.dialogButton{background-color:transparent;border:0;height:32px;margin-left:3px;padding:2px 0;width:32px}.dialogBox .dialogContent .dialogButtons fieldSet input.dialogButton:focus{background-color:transparent;border:0}.dialogBox .dialogContent .dialogButtons .dialogButtonsCheckbox{float:left;margin-top:9px}.dialogBox .dialogContent .dialogButtons .dialogButtonsCheckbox label{cursor:pointer}.dialogBox .dialogContent .dialogButtons.inlineEdition input{box-shadow:none;height:22px;margin-left:6px;padding:0}.dialogBox .dialogContent form{display:inline;margin:0}.dialogBox .dialogContent .SF_label{text-transform:none;font-size:12px;margin-bottom:-3px}.dialogBox .dialogContent input[type=text],.dialogBox .dialogContent input[type=password]{box-sizing:border-box;width:100%;height:30px;border-radius:0;border:solid #aaa;border-width:0 0 1px;margin-left:0;margin-bottom:8px;font-size:16px;padding:0!important}.dialogBox .dialogContent input[type=text]:focus,.dialogBox .dialogContent input[type=password]:focus{border-color:#009688}.dialogBox .dialogContent input[type=text]:disabled,.dialogBox .dialogContent input[type=password]:disabled{background:#eee}.dialogBox .dialogContent input[type=checkbox],.dialogBox .dialogContent input[type=radio]{background:0 0;border-radius:0;border:none;-webkit-filter:none;filter:none;height:auto;margin-right:0;width:auto}.dialogBox .dialogContent select{border-radius:0;background-color:#fff;border:0 solid #aaa;font-size:13px;height:30px;margin-left:0;box-sizing:border-box;width:100%}#activity_monitor_warning,.dialogBox .dialogArrow{font-size:16px;font-weight:700}.dialogBox .dialogContent select[multiple]{height:66px!important}.dialogBox .dialogContent option:disabled,.dialogBox .dialogContent textarea:disabled{background:#eee}.dialogBox div.dialogBox.css_boxshadow{background-color:#fff;border-radius:4px!important;border:0;left:10px;min-width:400px;top:19%;width:96%}.dialogBox div.dialogBox.css_boxshadow>div{background-color:transparent}#activity_monitor_warning{box-shadow:none;cursor:pointer;left:35%;position:absolute;text-align:center;top:30%;width:20%}#activity_monitor_warning div.dialogContent{border-radius:10px;box-shadow:1px 1px 46px rgba(0,0,0,.67)}#activity_monitor_warning span.click_anywhere{color:#676965;display:block;font-size:12px;font-weight:400;padding-top:15px}#activity_monitor_warning span.warning_timer{color:#0077b3}.messageBox{position:absolute;z-index:1500;cursor:pointer;border-radius:2px;background-color:#454545;color:#fff;box-shadow:1px 1px 1px rgba(0,0,0,.5)}.messageBox.errorMessage>div#message_content::before{color:#ff8585;content:'\f071'}.messageBox.logMessage>div#message_content::before{color:#54da7c;content:'\f058'}.messageBox #message_content{-webkit-font-smoothing:antialiased;font-size:14px;margin:18px;overflow-y:auto;max-height:120px;line-height:18px}.down_arrow_tip:after,.top_arrow_tip:after{content:" ";height:0;position:absolute;pointer-events:none;left:50%;margin-left:-5px}.messageBox #message_content::before{font-weight:400;font-style:normal;font-family:FontAwesome;display:block;padding:0 6px;margin-right:5px;font-size:18px;margin-top:2px;float:left}.tooltipped{background-color:#ffffc0}.left_arrow_tip,.right_arrow_tip{color:#fff;background-color:rgba(69,77,85,.86)}.simple_tooltip{position:absolute;width:150px;z-index:10000;font-size:13px;padding:5px 10px}.simple_tooltip_observer{cursor:help}.simple_tooltip_title{padding-top:2px;padding-bottom:1px;text-transform:uppercase;font-weight:700;font-size:1.1em}.down_arrow_tip,.top_arrow_tip{background:rgba(69,77,85,.86);color:#fff;border:0;border-radius:2px}.down_arrow_tip:after{top:100%;border:solid transparent;width:0;border-color:transparent;border-top-color:rgba(69,77,85,.86);border-width:5px}.top_arrow_tip{width:100px}.top_arrow_tip:after{bottom:100%;border:solid transparent;width:0;border-color:rgba(111,123,136,0);border-bottom-color:rgba(69,77,85,.86);border-width:5px}.arrow_tip_arrow_left:after{left:8%}.left_arrow_tip:after,.left_arrow_tip:before,.right_arrow_tip:after,.right_arrow_tip:before{left:100%;content:" ";height:0;width:0;pointer-events:none;position:absolute}.right_arrow_tip{border-radius:4px;border:0}.right_arrow_tip:after,.right_arrow_tip:before{border:solid transparent;border-color:transparent;border-left-color:rgba(69,77,85,.86);border-width:5px;top:50%;margin-top:-5px}.left_arrow_tip{border-radius:4px;border:0}.left_arrow_tip:after,.left_arrow_tip:before{border:solid transparent}.left_arrow_tip:before{border-color:transparent;border-right-color:rgba(69,77,85,.86);border-width:5px;top:50%;left:-10px;margin-top:-5px}div.accordion_toggle{color:#75808b;cursor:pointer;background:url(../images/Tplus.png) no-repeat;background-position-x:-6px;background-position-y:-3px;padding-left:15px;font-size:16px;margin-bottom:0;margin-top:10px;padding-bottom:2px;border-bottom:0}div.accordion_toggle_active{background-image:url(../images/Tminus.png)}div.accordion_content{overflow:hidden;padding:5px}div.accordion_content div.dialogLegend{text-align:justify;color:#AFAFB1;clear:left;padding:30px 0 0;max-width:450px;font-size:15px;font-weight:300;line-height:1.4em;font-style:italic}div.autocomplete{position:absolute;width:250px;background-color:#fff;border:0;margin:8px 0 0;padding:0;border-radius:0;max-height:180px;overflow-y:auto}div.autocomplete ul{list-style-type:none;margin:0;padding:0}div.autocomplete ul li{list-style-type:none;display:block;margin:0;padding:7px;cursor:pointer}div.autocomplete ul li.selected{background-color:#f0f8ff!important}a.carousel-control{border-left:1px solid #c4c7c1;border-right:1px solid #c4c7c1;border-bottom:1px solid #c4c7c1;background-color:#fff;display:block;float:left;font-size:10px;height:51px;padding-top:0;text-align:center;cursor:pointer;width:8px!important;margin:0!important}a.carousel-disabled{background-color:transparent}#flashframe{border:0;width:450px;height:300px;overflow:hidden;margin-top:-9px}div#multiple_download_container,div#upload_files_list{overflow:auto;height:350px;text-align:left;border-radius:2px;background-color:rgba(239,239,239,.52)}.droparea{background:url(../../../../../../index.php?get_action=get_drop_bg) left bottom no-repeat}.fakeOptionButton,.uploadFilesList.droparea{background-position:center}.dropareaHover{background-color:#FAF3ED!important}#content_pane.dropareaHover div.thumbnail_selectable_cell{background-color:transparent!important}#uploader_chooser{width:100%}#uploader_chooser ul{margin:0;padding:0;list-style:none;display:block;position:relative;border-bottom:1px solid #ff5722;background-color:#fff}#uploader_chooser ul li{display:inline-block;padding:12px 14px;margin:0;border-bottom:0;cursor:pointer;font-size:13px}#uploader_chooser ul li:hover{background-color:#f5f5f5;border-bottom:2px solid #f5f5f5}#uploader_chooser ul li.current{font-weight:500;cursor:default;border-bottom:3px solid #ff5722}div#uploader_options_pane{position:absolute;right:10px;box-shadow:0 1px 6px rgba(0,0,0,.16),0 1px 6px rgba(0,0,0,.23);background-color:#fff;font-size:11px;height:59px;overflow:hidden;padding:12px 20px 20px;text-align:right;display:none;margin-bottom:11px;margin-top:-2px;margin-right:2px;z-index:2}.dotted_container_item_mixin,div#upload_files_list div{padding-top:10px;padding-bottom:10px;padding-left:14px;position:relative;font-size:14px;color:rgba(0,0,0,.87);height:20px;background-image:url(../images//dl_bg.png);background-repeat:no-repeat;background-size:0 100%;border-bottom:1px solid rgba(0,0,0,.09);overflow:hidden}div#total_files_list{display:none!important}div#uploader_options_pane input{width:15px;margin-right:0;margin-left:0;margin-top:5px}.dotted_container_item_mixin rect{fill:#fff}div#upload_files_list div rect{fill:#fff}div#upload_files_list span.item_relative_path{color:#5f5f5f;margin-left:15px;font-size:.8em}div#upload_files_list img{margin-right:6px}div#upload_files_list img.fakeUploadButton{display:none}div#upload_files_list div a{color:#ddd;font-style:italic}div#upload_files_list span.percentText,div#upload_files_list span.statusText{font-size:10px;display:inline-block;padding:0 6px;color:rgba(0,0,0,.53)}div#upload_files_list #upload_files_list span.statusText.loaded,div#upload_files_list span.statusText.new{display:none}div#upload_files_list span.icon-folder-close{margin-right:2px}div#upload_files_list span.icon-file-alt{display:inline-block;margin:0 6px 0 2px}div#upload_files_list span.item-indent{display:inline-block;margin-right:3px}div#upload_files_list span.icon-ok,div#upload_files_list span.icon-remove-sign,div#upload_files_list span.mdi-close{color:rgba(0,0,0,.53);display:block;position:absolute;padding:12px;right:5px;top:2px;cursor:pointer}div#upload_files_list span.icon-remove-sign:hover,div#upload_files_list span.mdi-close:hover{color:#d00}div#multiple_download_container div{overflow:hidden;padding-top:10px;padding-bottom:10px;padding-left:14px;height:20px;position:relative;background-image:url(../images//dl_bg.png);background-repeat:no-repeat;background-size:0 100%;font-size:14px;border-bottom:1px solid rgba(0,0,0,.09);color:rgba(0,0,0,.87)}div#multiple_download_container div rect{fill:#fff}div#multiple_download_container div div a{display:block}div#multiple_download_container div div a:hover{text-decoration:none;color:#aaa}#fileInputContainer{position:relative}#fileInputContainer #fileInputContainerDiv{margin:0;padding:0;position:relative;display:inline-block;overflow:hidden;vertical-align:top;height:47px;width:272px;cursor:pointer}#fileInputContainer #fileInputContainerDiv.folder_upload_button .fakeUploadButton{background-color:#fefefe;width:130px;color:rgba(0,0,0,.76)}#fileInputContainer input{opacity:0;-moz-opacity:0;position:absolute;font-size:60px;top:0;left:0;z-index:10000;height:30px;cursor:pointer!important;filter:alpha(opacity=0);width:250px}#fileInputContainer #fileInputPos,#fileInputContainer .fakeUploadButton{width:250px;text-align:left;cursor:pointer;top:0;overflow:hidden;position:absolute}#fileInputContainer #fileInputPos{height:30px;z-index:9999}#fileInputContainer .fakeUploadButton{padding:6px;vertical-align:middle;font-size:14px;font-weight:500;background-color:#c9fffa;color:#00776c;box-shadow:0 1px 2px rgba(0,0,0,.1),0 1px 2px rgba(0,0,0,.33);text-transform:uppercase;white-space:nowrap;text-overflow:ellipsis;left:0;margin:0}#fileInputContainer .fakeUploadButton span.icon-desktop,#fileInputContainer .fakeUploadButton span.icon-folder-open-alt{font-size:20px;display:block;float:left;padding:2px 10px 0 6px}#fileInputContainer .fakeUploadButton span.icon-folder-open-alt{font-size:18px;padding:3px 10px 0 6px}#fileInputContainer .fakeUploadButton .disabled{-moz-opacity:.5;opacity:.5;filter:alpha(opacity=50);cursor:default}#fileInputContainer .fakeUploadButton img{margin-bottom:3px}#uploaderTextActions{position:absolute;bottom:6px;right:8px;color:#cbccce;font-size:12px}#uploaderTextActions span{cursor:pointer}#uploaderTextActions span:hover{color:#5C5C5C}.fakeOptionButton{padding-top:3px;padding-bottom:3px;margin-bottom:0;margin-top:5px;border-radius:5px}#uploaderTextActions span.disabled{display:none}#uploadFilesListContainer{vertical-align:top;font-size:11px}.slider-pane{background-color:#ebedf0;padding:5px 2px;position:absolute;width:11px;z-index:10000;border-radius:2px;box-shadow:1px 1px 4px rgba(0,0,0,.75)}.slider-handle,.slider-pane div.selected{background-image:url(../images/slider-handle-vert.png)!important;background-position:top center;background-repeat:no-repeat!important;background-color:transparent!important;height:15px;width:10px}.slider-tracker{background-image:url(../images/slider-track-bottom.png);background-position:bottom center;background-repeat:no-repeat}.slider-tracker-top{background-position:top center;background-repeat:no-repeat}.action_bar{line-height:15px;overflow:hidden;padding:0}.action_bar span.actionbar_button_label{cursor:pointer;display:inline-block;padding:4px 3px 3px}.action_bar div.actionbar_arrow_div{position:absolute;right:-3px;top:10px}.action_bar a.enabled{-moz-opacity:1;filter:alpha(opacity=100);opacity:1}.action_bar a{background:#fff;border-radius:3px;display:inline-block;float:left;font-size:11px;margin:5px 2px 0 1px;outline:0;overflow:visible;padding:5px 10px 7px 9px;text-align:center}.action_bar a.separator,.action_bar.editor_action_bar div.separator,.action_bar.text_only a img{display:none}.action_bar a img{display:none;margin:2px 5px 2px 0}.action_bar a.disabled{-moz-opacity:1;filter:alpha(opacity=100);opacity:1}.action_bar a.disabled:hover{cursor:default}.action_bar a.disabled img,.action_bar a.disabled span{-moz-opacity:.3;filter:alpha(opacity=30);opacity:.3}.action_bar span.ajxp_icon_span{float:left;font-size:1.2em;padding-right:2px;padding-top:4px}.action_bar.editor_action_bar{background-color:transparent;height:34px;position:absolute;right:3px;z-index:10}.action_bar.editor_action_bar a{background-color:transparent;padding:3px 8px!important;margin-top:4px;text-transform:uppercase;margin-left:2px;transition:background-color 550ms cubic-bezier(.23,1,.32,1) 0s}.action_bar.editor_action_bar a:hover{background-color:rgba(255,255,255,.65)}.action_bar.editor_action_bar a.disabled:hover{background-color:transparent}.action_bar.editor_action_bar.icons_only a{padding:4px 8px!important;font-size:18px}.action_bar.editor_action_bar span.actionbar_button_label{font-size:11px!important;font-weight:500;font-family:Roboto,sans-serif}.action_bar.editor_action_bar.full_width_action_bar{background-color:#ddd;padding-left:5px;position:relative;right:0}.action_bar.editor_action_bar.full_width_action_bar a{border:0}.action_bar.text_only{height:38px;line-height:16px}.action_bar.text_only a{margin-top:5px;padding-bottom:3px;padding-top:2px}.action_bar.text_only a.menuAnchorSelected,.action_bar.text_only a:hover{margin-top:4px}.action_bar.text_only span.actionbar_button_label{font-size:11px}.action_bar.icons_only{height:40px;line-height:0}.action_bar.icons_only div.actionbar_arrow_div{position:absolute;right:6px;top:23px}.action_bar.icons_only div.actionbar_arrow_div img{height:6px;width:10px}.action_bar.icons_only a{background-color:transparent;cursor:pointer;display:inline-block;float:left;font-size:1.5em;margin-left:0;margin-right:0;padding:3px 6px 2px}.action_bar.icons_only span.actionbar_button_label{display:none}.action_bar.icons_only img.actionbar_button_icon{display:none;height:22px;width:22px}.action_bar.icon_text img.actionbar_button_icon{float:left;height:12px;width:12px}.action_bar.floatingBar{background-color:#333!important;border-radius:3px;cursor:move;opacity:.9;padding-left:10px;padding-right:10px;position:absolute}.action_bar.floatingBar a{background-color:transparent!important}.action_bar.floatingBar a.separator,.action_bar.floatingBar div.separator{border-right:1px solid #949494;display:block!important;float:left;font-size:10px;height:29px;margin:2px 5px 4px 2px;padding-top:0;text-align:center;width:0}.action_bar.floatingBar.icons_only a{color:#fff}.action_bar.floatingBar.icons_only a.disabled{opacity:.5}div.editor_header{height:auto}div.editor_header>div.editor_action_bar{background:0 0;height:42px;padding-left:10px;padding-right:8px;padding-top:15px;position:absolute;right:20px;border-bottom:0}div.editor_header>div.editor_action_bar>div.separator{display:none!important}div.editor_header>span.header_label{color:#6f7b88;display:inline-block;font-size:24px;overflow:visible;padding:15px 0 0 62px;text-shadow:1px 1px 5px #000;width:100%}.inlineBarButton,.inlineBarButtonLeft,.inlineBarButtonRight{cursor:pointer;float:left;height:22px;padding:0 1px}div.FL-inlineToolbar{text-align:left}div.FL-inlineToolbar a{margin:0 5px}div.FL-inlineToolbar a span.actionbar_button_label{margin-left:5px}div.FL-inlineToolbar.FL-inlineToolbarUnique{display:none}div.selected div.FL-inlineToolbar.FL-inlineToolbarUnique{display:block}tr div.FL-inlineToolbar.FL-inlineToolbarMultiple,tr.selected div.FL-inlineToolbar.FL-inlineToolbarUnique{display:inline-block;position:absolute;top:0}.selected div.FL-inlineToolbar a{color:#fff}div.detailed div.FL-inlineToolbar{margin-left:50px;margin-top:2px}div.detailed div.FL-inlineToolbar a span.actionbar_button_label{display:inline-block!important}div.detailed div.FL-inlineToolbar div.toolbarGroup{min-width:400px}.inlineBarButton{display:inline}.inlineBarButton img{border:0;display:inline;margin-top:3px}.inlineBarButtonLeft{border-left-width:0;display:inline}.inlineBarButtonLeft img{border:0;display:inline;margin-top:3px}.inlineBarButtonRight{border-right-width:0;display:inline}.inlineBarButtonRight img{border:0;display:inline;margin-top:3px}#logging_string div.inlineBarButtonLeft,#logging_string span.ajxp_icon_arrow,#logging_string.disabled,.panelHeader img{display:none}.inlineBarButton img.simple_button_arrow{bottom:1px;display:none;position:absolute;right:0}.scroller_track{position:absolute;width:7px;background-color:transparent;cursor:ns-resize;right:0;z-index:1000;opacity:.7;padding-right:1px;top:0}#search_container,.panelHeader.panelHeaderWithIcon{position:relative}.flexbox div.scroller_track{bottom:0}.scroller_handle{border-radius:5px;background:#bebebe!important;transition:background-color .3s ease,height .1s ease}.scroller_handle:hover{background:#6e6e6e!important}.panelHeader{border:none;vertical-align:middle;background-color:transparent}.panelHeader img.panelHeaderCloseIcon{left:auto;right:6px;cursor:pointer}#logging_string{color:#fff;float:right;margin-top:12px}#logging_string i{font-style:normal}#logging_string i img{border-radius:22px;cursor:pointer;float:right;font-style:normal;margin-left:10px;margin-top:-12px}#logging_string .user_widget_label{cursor:pointer;float:left;font-size:13px;font-weight:300;padding:4px 10px 9px 7px}#logging_string span.icon-reorder{float:right;font-size:15px;display:inline-block;margin:0 0 0 12px}#logging_string .user_widget_label.withImage{padding:0;position:relative}#logging_string .user_widget_label.withImage span.icon-reorder{display:none}#logging_string .user_widget_label.withImage i{display:inline-block;font-size:13px;font-weight:300;padding:6px 0 0 8px;color:rgba(255,255,255,.9)}#logging_string .user_widget_label.withImage i:hover{color:#fff}#logging_string div.user_widget_mini{float:right;width:39px;height:39px;margin-top:-14px;margin-left:14px;border-radius:100%;background-position:center center;background-size:100%;vertical-align:middle}.droppableZone,.thumbnail_selectable_cell.detailed.droppableZone{background-color:#c3d9ff!important}div.multiple_selection_draggable{display:block;color:#000;background-color:#fff;padding:5px;border:1px solid #c3d9ff;font-size:12px;cursor:default;overflow:hidden;border-radius:3px}div.selection_ctrl_key{background:url(../images/0.gif) bottom right no-repeat}#search_container{float:right;text-align:right;overflow:visible;z-index:1015}#search_container span.search_advanced_direct_access{display:block;opacity:0;position:absolute;bottom:1px;right:5px;font-size:9px;cursor:default;transition:opacity ease .5s}#search_container.search_active div#search_form input{width:100%;background:#fff;border:0;text-align:left;padding-right:0;font-size:40px;font-family:"Open Sans Regular","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif}#breadcrumb,div.menu{font-family:Roboto,sans-serif;-webkit-font-smoothing:antialiased}#search_container.search_active div#search_form a{font-size:1.6em;top:17px;right:16px}#search_container.search_active span.search_advanced_direct_access{display:block;opacity:1;cursor:pointer}#search_container #search_panel{overflow:visible}#search_container #search_form{padding-right:0;height:33px;overflow:visible}#search_container #search_form input{float:right!important;margin:0;height:58px;background:0 0;font-size:1em;color:#8a95a0;padding-left:5px;width:80px;border:0 #f5f5f5;text-align:right;padding-right:30px;transition:border-color .5s ease,width .5s ease;border-radius:0}#search_container #search_form a{display:inline-block;width:18px;cursor:pointer;font-size:1em;padding-top:0;color:rgba(0,0,0,.33);position:absolute;right:9px;top:21px;transition:font-size ease .5s,top ease .5s,right ease .5s}.left-panel,.left-panel .section-title,.left-panel .simple-provider .icon-refresh{transition:all 550ms cubic-bezier(.23,1,.32,1) 0s}#search_container #search_form a.disabled{display:none}#search_container #search_form a img{margin-top:2px;vertical-align:top;display:none}#search_container #search_results_cont{display:none;position:absolute;z-index:1010;background-color:#eceff1;text-align:left;box-shadow:inset 0 1px 3px rgba(0,0,0,.43)}#search_container #search_results_cont span.results_string{display:none}#search_container #search_results_cont div#search_show_all{text-align:center;font-size:12px;color:#747474;font-style:italic;display:inline-block;margin-left:10px}#search_container #search_results_cont div#search_show_all a{text-decoration:underline;color:#393939;cursor:pointer}#search_container #search_results_cont .search_label.open{display:none;padding:2px;height:20px}#search_container #search_results_cont .search_label.close{display:block;font-size:20px;padding:15px 10px 14px;border-bottom:1px solid #eee;border-right:1px solid #eee}#search_container #search_results_cont span.icon-save{font-size:.8em;display:inline-block;margin:0 5px}#search_container #search_results_cont .close_results.icon-remove-sign,#search_container #search_results_cont .close_results.mdi-close{position:absolute;display:inline-block;right:13px;cursor:pointer;font-size:1.4em;color:#999;top:9px;z-index:10}#search_container #search_results_cont #basic_search{padding:8px;min-height:27px}#search_container #search_results_cont #basic_search span#search_meta_options{display:none}#search_container #search_results_cont #basic_search span.toggle_button.close,#search_container #search_results_cont #basic_search span.toggle_button.open{transition:all 550ms cubic-bezier(.23,1,.32,1) 0s;display:inline-block;padding:5px 16px;font-weight:500;font-size:14px;cursor:pointer;border-radius:1px}#search_container #search_results_cont #basic_search span.toggle_button.close,#search_container #search_results_cont #basic_search span.toggle_button.close span.icon-chevron-left,#search_container #search_results_cont #basic_search span.toggle_button.open span.icon-chevron-left,#search_container #search_results_cont #search_results div.panelHeader{display:none}#search_container #search_results_cont #basic_search span.toggle_button.open,#search_container #search_results_cont #basic_search.toggle_open span.toggle_button.close{background:0 0;color:#009688;text-transform:uppercase}#search_container #search_results_cont #basic_search.toggle_open span.toggle_button.open{background-color:#fff}#search_container #search_results_cont #search_results{margin-left:0;width:100%}.flexbox #search_container #search_results_cont #search_results{display:-webkit-flex!important;display:-ms-flexbox!important;display:flex!important}#search_container #search_results_cont #search_results.fl-displayMode-detail div.scroller_track{top:42px}#search_container #search_results_cont #search_results div[data-groupByValue]{clear:left;overflow:hidden;margin-bottom:10px;margin-left:12px;margin-right:7px}#search_container #search_results_cont #search_results div[data-groupByValue] h3{font-size:13px;width:60%;min-width:80%;margin:10px auto;color:rgba(0,0,0,.73);font-weight:500;padding:5px 0}#search_container #search_results_cont #search_results div#element_overlay{background-color:rgba(255,255,255,.2);opacity:1}#search_container #search_results_cont #search_results div#element_overlay img{width:20px;margin-top:16px!important}#search_container #search_results_cont #search_results div.thumbnail_selectable_cell.detailed{cursor:pointer;border-radius:1px;width:60%;min-width:80%;float:none;margin:10px auto!important;box-sizing:border-box;padding:0;overflow:hidden;border-bottom:none;background-color:#fff;height:102px;box-shadow:0 1px 2px rgba(0,0,0,.1),0 1px 2px rgba(0,0,0,.33)}#search_container #search_results_cont #search_results div.thumbnail_selectable_cell.detailed span.text_label{padding-top:0}#search_container #search_results_cont #search_results div.thumbnail_selectable_cell.detailed div.thumbLabel{font-size:14px!important;font-weight:500;color:rgba(0,0,0,.73);padding:16px 0 5px}#search_container #search_results_cont #search_results div.thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata{opacity:1}#search_container #search_results_cont #search_results div.thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata span.metadata_chunk{padding:0;font-size:12px;font-weight:500;color:rgba(0,0,0,.43)}#search_container #search_results_cont #search_results div.thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata span.metadata_chunk.metadata_chunk_ajxp_dirname{padding:16px 0;color:#009688;text-transform:uppercase}#search_container #search_results_cont #search_results div.thumbnail_selectable_cell.detailed div.thumbnail_selectable_cell{margin:0 20px 0 0;padding:16px 20px;border-right:1px solid #e8e8e8;height:100%!important}#search_container #search_results_cont #search_results div.thumbnail_selectable_cell.detailed div.thumbnail_selectable_cell div.overlay_icon_div{display:none!important}#search_container #search_results_cont #search_results div.thumbnail_selectable_cell.detailed.selected-focus div.thumbnail_cell_metadata,#search_container #search_results_cont #search_results div.thumbnail_selectable_cell.detailed:hover div.thumbnail_cell_metadata{opacity:1}#search_container #search_results_cont #search_results span.metadata_chunk.metadata_chunk_standard,#search_container #search_results_cont #search_results span.metadata_chunk.metadata_chunk_standard span.text_label{display:block}#search_container #search_results_cont #search_meta.toggle_open span.search_label.open,#search_container #search_results_cont #search_results span.metadata_chunk span.icon-angle-right,#search_container #search_results_cont #search_results span.metadata_chunk.metadata_chunk_standard.metadata_chunk_mimestring_id{display:none}#search_container #search_results_cont #search_results span.metadata_chunk span.text_label{padding-left:0}#search_container #search_results_cont #search_results div.ajxpNodeProvider:hover{background-color:#f9f9f9!important}#search_container #search_results_cont #search_meta{font-size:12px;background-color:#fff;color:#424242;padding:0;float:left;width:0;overflow:hidden;margin-left:0;transition:width 1s ease,margin-left 1s ease;margin-top:-62px;position:relative}#search_container #search_results_cont #search_meta>div{width:250px}#search_container #search_results_cont #search_meta.toggle_open{margin-left:-250px;width:250px}#search_container #search_results_cont #search_meta #refresh_search_button{cursor:pointer;font-size:.8em;float:right;margin-top:5px;margin-right:5px}#search_container #search_results_cont #search_meta input.c3,#search_container #search_results_cont #search_meta span.c3{margin-left:0;margin-right:0;border-radius:0;border-width:0;border-bottom:1px solid #eee;background-color:#fff;padding:4px 0;width:90%!important}#search_container #search_results_cont #search_meta input.c3:focus,#search_container #search_results_cont #search_meta span.c3:focus{border-bottom:2px solid #009688}#search_container #search_results_cont #search_meta select.select_meta_selector{margin-left:0;width:93%;height:26px}#search_container #search_results_cont #search_meta input.c3:disabled{opacity:.35}#search_container #search_results_cont #search_meta span.c3{cursor:pointer}#search_container #search_results_cont #search_meta span#ajxp_folder.c3{color:#009688;font-weight:500;text-transform:uppercase;padding:6px 16px;border-bottom:0;background-color:rgba(238,238,238,.63);border-radius:1px}#search_container #search_results_cont #search_meta input.c3:focus{background-color:#fff}#search_container #search_results_cont #search_meta #modiftime_fixed_radio span.c3{color:#009688;font-weight:500;text-transform:uppercase;padding:6px 12px;border-bottom:0;background-color:rgba(238,238,238,.63);border-radius:1px;margin-right:5px;font-size:.9em}#search_container #search_results_cont #search_meta div#modiftime_fixed_radio{margin-top:16px;color:#333}#search_container #search_results_cont #search_meta span.c3.selected{background-color:#8a95a0!important;color:#fff}#search_container #search_results_cont #search_meta span.c4{padding-right:2%}#search_container #search_results_cont #search_meta span.c6{clear:left;float:left;padding-right:2%}#search_container #search_results_cont #search_meta span.c4,#search_container #search_results_cont #search_meta span.c6{display:block;width:100%!important;text-align:left;line-height:17px;padding-top:2px;color:#009688;font-weight:500;font-size:10px}#search_container #search_results_cont #search_meta div.advanced_search_section span[class*=" icon-"],#search_container #search_results_cont #search_meta div.advanced_search_section span[class^=icon-]{display:none}#search_container #search_results_cont #search_meta.toggle_open #basic_search{border-bottom:1px solid #8fa2b6}#search_container #search_results_cont #search_meta_detailed{padding:5px 0 10px;line-height:28px;overflow:hidden}#search_container #search_results_cont #search_meta div.advanced_search_section{padding:5px 5px 15px 10px;line-height:29px;display:none}#search_container #search_results_cont #search_meta div.advanced_search_section.visible{display:block}#search_container #search_results_cont #search_meta div.advanced_search_section_title{font-size:13px;font-weight:500;border-top:1px solid rgba(255,255,255,.3);padding:8px 8px 9px 10px;margin:0;display:block;clear:left}#search_container #search_results_cont #search_meta div.advanced_search_section_title span.icon-circle,#search_container #search_results_cont #search_meta span.search_meta_opt>span{display:none}#search_container #search_results_cont #search_meta span.search_meta_opt{cursor:pointer}#search_container #search_results_cont #search_meta span.search_meta_opt.checked>span{display:inline}#vertical_splitter{overflow:hidden}#vertical_splitter>div{top:0}.vsplitbar{width:3px;z-index:1014}.vsplitbar:hover{background:center no-repeat #474e50}.hsplitbar.active,.vsplitbar.active{background-color:#474e50}.hsplitbar.folded,.vsplitbar.folded{opacity:0;cursor:default!important}.hsplitbar{height:4px;background-image:url(../images/hgrabber.gif);background-repeat:no-repeat;background-position:center;z-index:1014}#docDiv div.title{font-size:13px;font-weight:700}#docDiv div.subtitle{color:#5e7c90;font-size:25px}#docDiv a{color:#39c0be!important;text-decoration:underline}#info_panel a:hover,.breadcrumbs-one span,.form-ip_content_info_panel a:hover,div.menu li a{text-decoration:none}.backgroundPanel{position:absolute;bottom:-1px;padding:4px 7px 6px;color:#fff;background-color:rgba(119,184,226,.62);z-index:10000;border-radius:3px 3px 0 0;width:25%;margin-left:40%;text-align:center;border:1px solid rgba(119,184,226,.62)}.tabrow,.tabrow li{position:relative;margin:0}div.tabbed_editor div.innerTitle{margin:10px!important;padding:8px!important}span.toggleHeader{display:inline-block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;padding:10px 17px 6px;transition:border-color .3s ease;color:#555;font-size:12px;border-bottom:3px solid #ff5722}.flat_tabulator span.toggleHeader{border-bottom-color:#3d8180}span.toggleHeader.toggleInactive{cursor:pointer;border-bottom-color:transparent}span.toggleHeader span[class*=" icon-"],span.toggleHeader span[class^=icon-]{margin-right:9px;display:none}.flat_tabulator span.toggleHeader span[class*=" icon-"],.flat_tabulator span.toggleHeader span[class^=icon-]{margin-right:4px;display:inline}div.tabulatorContainer{padding:0;height:37px;overflow:hidden}div.tabulator-vertical div{display:none}div.tabulator-vertical div.tabulatorContainer{display:block;height:100%}div.tabulator-vertical div.toolbarGroup{display:block;height:24px;font-size:1.4em}div.tabulatorContainer.icons_only span.tab_label{display:none}div.tabulatorContainer.icons_only span[class*=" icon-"],div.tabulatorContainer.icons_only span[class^=icon-]{display:inline;font-size:1.2em}div.tabulatorContainer.icons_only div.toggleInactive span[class*=" icon-"],div.tabulatorContainer.icons_only div.toggleInactive span[class^=icon-],div.tabulatorContainer.icons_only div.toolbarGroup span[class*=" icon-"],div.tabulatorContainer.icons_only div.toolbarGroup span[class^=icon-]{display:inline;font-size:1em}div.tabulatorContainer span.tab_close_button{margin-left:6px;cursor:pointer;display:inline-block}div.tabulatorContainer span.toggleInactive span.tab_close_button{color:#707f8f}div.tabulatorContainer span.toggleInactive span.tab_close_button:hover{color:#fff}.tabrow{list-style:none;padding:2px 0;line-height:24px;overflow:hidden;font-size:13px;background-color:#4ea7a5}.tabpanes{background-color:#f8f8f8}.tabrow li{border:0;display:inline-block;padding:9px 10px;cursor:pointer;color:rgba(255,255,255,.61);text-align:center;line-height:16px}.tabrow li.selected{color:#fff;background-color:transparent!important}.innerTabulator div.panelHeader{font-size:11px;padding:3px 16px 4px 8px;height:35px;background-color:#ddd;color:#6f7b88;border-right:0;overflow:hidden}.innerTabulator div.panelHeader.tabulatorContainer{padding:0;height:26px}.innerTabulator span.toggleHeader{padding:4px 7px;border-right:1px dotted #6f7b88;background-color:#ebedf0;color:#6f7b88;font-size:11px}.innerTabulator span.toggleHeader.toggleInactive{background-color:#fff}div.innerTabulator>div.tabulatorContainer>#display_toolbar a,div.innerTabulator>div.tabulatorContainer>#display_toolbar a:hover{color:#333!important}#cpane_tabs span.toggleInactiveBeforeActive{border-right:0}.flat_tabulator div.panelHeader.tabulatorContainer{padding:2px 0 0;background-color:#fff;border-bottom:0}.flat_tabulator span.toggleHeader{font-size:13px}.flat_tabulator span.toggleHeader:first-of-type{color:#4ea7a5}div.flat_tabulator>div.tabulatorContainer>#display_toolbar a,div.flat_tabulator>div.tabulatorContainer>#display_toolbar a:hover{color:#6f7b88!important}div.flat_tabulator span.toggleInactive span.tab_close_button{opacity:.25}.horizontal_tabulator div.tabulatorContainer{float:left;width:240px;padding:0;background-color:#30383a}.flexbox div.horizontal_tabulator{-ms-flex-direction:row;flex-direction:row;-webkit-flex-direction:row}.flexbox div.horizontal_tabulator div.tabulatorContainer{float:none;height:auto;-ms-flex:0 0 240px;flex:0 0 240px;-webkit-flex:0 0 240px}div.horizontal_tabulator>div>div.horizontal_tabulator div.tabulatorContainer{background-color:#30383a}.horizontal_tabulator span.toggleHeader{padding:12px 0 12px 16px;background-color:#ff5722!important;color:#fff!important;border:0;display:block;font-size:13px}.horizontal_tabulator span.toggleInactive{width:auto!important;border-width:0!important;background-color:transparent!important;color:#fff!important;text-shadow:none}.no-flexbox div.horizontal_tabulator>div:not(.tabulatorContainer){float:left;padding:0!important;width:78%}.flexbox div.horizontal_tabulator>div.tabulatorPanelsContainer{-ms-flex:1;flex:1;-webkit-flex:1}#breadcrumb{border-radius:0 40px 40px 0;color:rgba(0,0,0,.67);display:block;float:left;margin-top:0;overflow:hidden}#breadcrumb div.inner_bread{width:5000px}.breadcrumbs-one{overflow:hidden;width:100%}.breadcrumbs-one ul{list-style:none;margin:0;padding:0}.breadcrumbs-one em{font-style:normal;font-weight:500}.breadcrumbs-one li{font-size:13px;line-height:22px;float:left}.breadcrumbs-one li:first-child{font-size:16px;line-height:20px}.breadcrumbs-one li:first-child span{background-color:#222;border-radius:0;color:#fff;font-weight:500;padding-left:1em;width:171px}.breadcrumbs-one li:first-child span em{font-weight:500}.breadcrumbs-one li:first-child span::after{border-left-color:#222}.breadcrumbs-one li:nth-child(1) span:before{border-left-color:#f5f5f5}.breadcrumbs-one span{background-color:#f5f5f5;color:rgba(0,0,0,.67);float:left;height:20px;padding:22px 15px 20px 35px;position:relative}.breadcrumbs-one span:hover{background:#fff;cursor:pointer}.breadcrumbs-one span:hover::after{border-left-color:#fff}.breadcrumbs-one span::after,.breadcrumbs-one span::before{content:"";position:absolute;top:50%;margin-top:-33px;border-top:33px solid transparent;border-bottom:33px solid transparent;border-left:1em solid;right:-1em}.breadcrumbs-one span::after{z-index:2;border-left-color:#f5f5f5}.breadcrumbs-one span::before{border-left-color:#e0e0e0;right:-1.08em;z-index:1}.breadcrumbs-one .current,.breadcrumbs-one .current:hover{background:0 0;font-weight:700}.breadcrumbs-one .current::after,.breadcrumbs-one .current::before{content:normal}.breadcrumbs-one i.ajxp-goto{color:#e0e0e0;cursor:pointer;display:inline-block;padding:22px 25px}.breadcrumbs-one i.ajxp-goto:hover{color:#ff764b}.breadcrumbs-one span.reduced{height:20px;padding:20px 10px;width:4px}.breadcrumbs-one span.reduced em{visibility:hidden}.breadcrumbs-one span.reduced.first-bread em,.breadcrumbs-one span.reduced:hover em{visibility:visible}.breadcrumbs-one span.reduced:hover{padding:20px 15px 20px 35px;transition:padding 550ms cubic-bezier(.23,1,.32,1) 0s;width:auto}.breadcrumbs-one span.reduced.first-bread{height:auto;padding:20px 15px 20px 1em;transition:none;width:171px}span.first-bread em{display:inline-block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:100%}@-webkit-keyframes rotate{from{-webkit-transform:rotate(0)}to{-webkit-transform:rotate(360deg)}}.icon-spinner,.rotating{-webkit-transform-origin:50% 50%;-webkit-animation-name:rotate;-webkit-animation-iteration-count:infinite;-webkit-animation-timing-function:linear;-moz-transform-origin:50% 50%;-moz-animation-name:rotate;-moz-animation-iteration-count:infinite;-moz-animation-timing-function:linear;-ms-transform-origin:50% 50%;-ms-animation-name:rotate;-ms-animation-iteration-count:infinite;-ms-animation-timing-function:linear;-o-transform-origin:50% 50%;-o-animation-name:rotate;-o-animation-iteration-count:infinite;-o-animation-timing-function:linear}.icon-spinner{display:block!important;text-align:center}.icon-spinner.spinner_large{font-size:22px}#progressBox{z-index:2002;border-radius:5px;width:305px!important;padding:3px;display:block;top:30%;left:40%;position:absolute;min-width:305px;box-shadow:2px 2px 4px rgba(0,0,0,.23);-webkit-box-shadow:2px 2px 4px rgba(0,0,0,.23);-moz-box-shadow:2px 2px 4px rgba(0,0,0,.23)}#progressBox div.dialogTitle,.csstransitions #AjxpConnexion-loader img{display:none}#progressBox .bounce-spinner{width:50px;height:50px;position:relative;margin:30px auto}#progressBox .double-bounce1,#progressBox .double-bounce2{width:100%;height:100%;border-radius:50%;background-color:#009688;opacity:.6;position:absolute;top:0;left:0;-webkit-animation:bounce 2s infinite ease-in-out;animation:bounce 2s infinite ease-in-out}#progressBox .double-bounce2{-webkit-animation-delay:-1s;animation-delay:-1s}@-webkit-keyframes bounce{0%,100%{-webkit-transform:scale(0)}50%{-webkit-transform:scale(1)}}@keyframes bounce{0%,100%{transform:scale(0);-webkit-transform:scale(0)}50%{transform:scale(1);-webkit-transform:scale(1)}}.csstransitions #AjxpConnexion-loader{left:0!important;top:0!important;z-index:1022!important;height:2px;width:100%;position:relative;overflow:hidden}.csstransitions #AjxpConnexion-loader:before{display:block;position:absolute;content:"";left:-200px;width:200px;height:4px;background-color:#03A9F4;-webkit-animation:connexionLoading 1.5s linear infinite;animation:connexionLoading 1.5s linear infinite}@-webkit-keyframes connexionLoading{from{left:-200px;width:30%}50%{width:30%}70%{width:70%}80%{left:50%}95%{left:120%}to{left:100%}}@keyframes connexionLoading{from{left:-200px;width:30%}50%{width:30%}70%{width:70%}80%{left:50%}95%{left:120%}to{left:100%}}.no-csstransitions #AjxpConnexion-loader{left:49%!important;top:7px!important;width:30px}.no-csstransitions #AjxpConnexion-loader img{height:6px}div.menu{position:absolute;top:0;left:0;border-radius:1px;box-shadow:0 1px 6px rgba(0,0,0,.16),0 1px 6px rgba(0,0,0,.23)}div.menu li,div.menu ul{margin:0;padding:0;list-style:none;overflow-x:hidden}div.menu li{list-style-position:outside}div.menu li a{display:block;cursor:default;outline:0;font-size:13px}div.menu li.menuTitle{display:none}div.menu li.separator{height:1px;padding:0;overflow:hidden;display:block;font-size:1px}div.menu .menuActions{position:absolute;right:16px;top:1px;text-align:right;padding-right:3px!important;margin-top:5px!important}div.menu .menuActions a{width:18px;padding:1px;display:inline-block!important;filter:alpha(opacity=30);opacity:.3;-moz-opacity:.3;cursor:pointer!important;height:16px}div.menu .menuActions a:hover{filter:alpha(opacity=100);opacity:1;-moz-opacity:1}div.menu .menuActions.moreActions{margin-top:0!important;z-index:1}div.menu .menuActions.moreActions span{color:#fff;cursor:pointer;width:16px;display:inline-block;text-align:left;font-size:1.2em;text-shadow:1px 1px 1px #676767}div.menu.desktop li a.enabled:hover u,div.menu.desktop li.menuAnchorSelected a u{font-family:Arial,sans-serif;box-shadow:0 1px 0 rgba(0,0,0,.2),0 0 0 2px #fff inset;text-shadow:0 1px 0 #fff;white-space:nowrap}div.menu .menuActions img{display:none}div.menu .menuActions.icon-caret-right{padding-top:10px;color:rgba(0,0,0,.53)}div.menu.desktop{width:14em;padding:0 0 1px;background-color:#fff}div.menu.desktop span.ajxp_icon_span{font-size:15px;padding-right:16px;color:rgba(0,0,0,.87);opacity:.7}div.menu.desktop .invertSelection{background-color:rgba(0,0,0,.07);color:rgba(0,0,0,.87)!important}div.menu.desktop .invertSelection span.ajxp_icon_span{color:rgba(0,0,0,.87);opacity:1}div.menu.desktop li{padding:0;overflow-y:hidden}div.menu.desktop li.separator{padding:0;height:0;border-bottom:1px solid #eee;margin:0;line-height:1px!important}div.menu.desktop li a:hover .menuActions.icon-caret-right,div.menu.desktop li.menuAnchorSelected .menuActions.icon-caret-right{color:rgba(0,0,0,.87)!important}div.menu.desktop li.menuAnchorSelected a{background-color:rgba(0,0,0,.07);color:rgba(0,0,0,.87)!important}div.menu.desktop li.menuAnchorSelected a span.ajxp_icon_span{color:rgba(0,0,0,.87);opacity:1}div.menu.desktop li.menuAnchorSelected a u{border:1px solid #ccc;background-color:#f7f7f7;border-radius:3px;display:inline-block;margin:0 .1em;font-size:1em;padding:0 1px;line-height:22px;color:rgba(0,0,0,.87)}div.menu.desktop li a{color:rgba(0,0,0,.87);padding:12px 16px;margin:0;font-size:13px;line-height:22px}div.menu.desktop li a u{text-decoration:none;display:inline-block;border:1px solid #fff;border-radius:3px}div.menu.desktop li a img{margin-right:9px;margin-top:-5px}div.menu.desktop li a.menu_item_default{font-weight:500!important}div.menu.desktop li a.menu_item_default span.ajxp_icon_span{opacity:.8}div.menu.desktop li a.disabled{opacity:.25;filter:alpha(opacity=25);zoom:1}div.menu.desktop li a.enabled:hover{background-color:rgba(0,0,0,.07);color:rgba(0,0,0,.87)!important}div.menu.desktop li a.enabled:hover span.ajxp_icon_span{color:rgba(0,0,0,.87);opacity:1}div.menu.desktop li a.enabled:hover u{border:1px solid #ccc;background-color:#f7f7f7;border-radius:3px;display:inline-block;margin:0 .1em;font-size:1em;padding:0 1px;line-height:22px;color:rgba(0,0,0,.87)}div.menu.desktop.toolbarmenu{padding-bottom:0;width:auto;width:expression("150px");min-width:15em}div.menu.desktop.textual{width:7em}div.menu.desktop.textual img{margin-right:6px}div.menu.desktop.panelHeaderMenu li.menuTitle{display:block;font-size:13px;color:rgba(0,0,0,.87);border-bottom:1px solid #eee;padding:11px 7px;text-align:left;background-color:#f2f2f2}div.menu.menuDetails a{line-height:17px;padding:10px 5px}div.menu.menuDetails img{display:none}div.menu.menuDetails span.menu_label{font-size:20px;display:block}div.menu.menuDetails span.ajxp_icon_span{float:left;padding:3px 9px 23px 4px;font-size:18px}div.menu.menuDetails span.menu_description{display:block;line-height:16px;font-size:11px;color:#fff;padding-top:8px}div.menu.menuDetails.workspacesMenu{border-radius:0;left:0!important}div.menu.menuDetails.workspacesMenu span.ajxp_icon_span,div.menu.menuDetails.workspacesMenu span.menu_description{display:none}div.menu.menuDetails.workspacesMenu span.menu_label{margin-top:0}div.menu.menuDetails.workspacesMenu li a{padding:20px 10px 20px 20px;line-height:22px}div.menu.menuDetails.workspacesMenu li.menuTitle{padding:20px 14px 10px!important}div.menu.menuDetails.workspacesMenu span.letter_badge{margin:-6px 13px 0 5px;font-size:1em;background-color:#000}div.menu.rightAlignMenu{width:180px!important}div.menu.rightAlignMenu a{padding:8px 5px 7px 20px;text-align:right}div.menu.rightAlignMenu a img,div.menu.rightAlignMenu span.ajxp_icon_span{margin-right:0;margin-left:9px;display:inline-block;float:right;margin-top:2px}div.menu.rootDirChooser{position:absolute;z-index:1500;width:250px!important;width:expression("250px");background-color:#333;box-shadow:none!important;-webkit-font-smoothing:antialiased}div.menu.rootDirChooser li.menuTitle{color:#fff;padding:13px 8px 15px;text-align:left;font-size:22px;text-transform:uppercase;display:block}div.menu.rootDirChooser li.separator{border-top:1px solid rgba(255,255,255,.75);line-height:1px!important;height:0!important}div.menu.rootDirChooser li.separator.menuTitle{height:auto!important;line-height:14px!important;border-top:none;padding-top:7px!important;width:100%}div.menu.rootDirChooser a{display:block;padding:8px 5px 8px 6px;color:#fff}div.menu.rootDirChooser a img{margin-right:5px;border:0}div.menu.rootDirChooser a span.ajxp_icon_span{display:inline-block;padding:0 16px 30px 10px;margin-top:-1px;font-size:1.4em}div.menu.rootDirChooser a.disabled img{filter:alpha(opacity=30);opacity:.3;-moz-opacity:.3}div.menu.rootDirChooser a.hovered,div.menu.rootDirChooser a:hover{background-color:#ff764b;color:#fff}div.menu.rootDirChooser span.rootDirTitle{display:block;font-size:12px;font-weight:700;padding-top:1px;padding-left:5px;padding-right:50px;color:#ccc;border-bottom:0 solid #ddd;text-align:left;font-style:italic}.form-ip_content_info_panel .panelContent{background-color:#fff!important}#info_panel,.form-ip_content_info_panel{font-family:Roboto,sans-serif;-webkit-font-smoothing:antialiased;font-weight:300}#info_panel #modalCloseBtn,.form-ip_content_info_panel #modalCloseBtn{display:block!important;padding-top:3px!important}#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_selectable_cell,#info_panel div.folded_icons,.form-ip_content_info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_selectable_cell,.form-ip_content_info_panel div.folded_icons{display:none}#info_panel div#display_toolbar,.form-ip_content_info_panel div#display_toolbar{float:left;text-align:left;min-width:20px;height:10px}#info_panel div#display_toolbar a,.form-ip_content_info_panel div#display_toolbar a{background:0 0;border:none;margin-right:0}#info_panel a.sm2_link,.form-ip_content_info_panel a.sm2_link{visibility:hidden}#info_panel a img,.form-ip_content_info_panel a img{margin-right:5px}#info_panel div.folderImage,.form-ip_content_info_panel div.folderImage{text-align:center;padding-bottom:10px}#info_panel .infoPanelImagePreview,.form-ip_content_info_panel .infoPanelImagePreview{text-align:center;position:relative;margin:10px 16px;border-radius:5px}#info_panel .infoPanelImagePreview img,.form-ip_content_info_panel .infoPanelImagePreview img{margin-top:0!important;margin-bottom:0!important}#info_panel .infoPanelImagePreview img.thumbnail_iconlike_shadow,.form-ip_content_info_panel .infoPanelImagePreview img.thumbnail_iconlike_shadow{box-shadow:0 3px 6px rgba(0,0,0,.16),0 3px 6px rgba(0,0,0,.23)}#info_panel .infoPanelImagePreview div.infoPanelBasenameTitle,.form-ip_content_info_panel .infoPanelImagePreview div.infoPanelBasenameTitle{color:#ff796b;font-weight:500;font-size:16px;margin-bottom:20px;line-height:1.5em;text-align:left;word-break:break-all}#info_panel .infoPanelImagePreview div.mimefont,.form-ip_content_info_panel .infoPanelImagePreview div.mimefont{font-size:80px!important;color:#607d8b}#info_panel .infoPanelTable,#info_panel div.infoPanelRow,.form-ip_content_info_panel .infoPanelTable,.form-ip_content_info_panel div.infoPanelRow{font-size:13px;width:100%}#info_panel div.infoPanelLabel,#info_panel td.infoPanelLabel,.form-ip_content_info_panel div.infoPanelLabel,.form-ip_content_info_panel td.infoPanelLabel{width:50%;color:#aaa;font-size:.9em;font-weight:500}#info_panel div.infoPanelValue,#info_panel td.infoPanelValue,.form-ip_content_info_panel div.infoPanelValue,.form-ip_content_info_panel td.infoPanelValue{padding:0 0 10px;font-size:1em;color:#222;line-height:1.3em;vertical-align:top}#info_panel div.infoPanelValue[data-metatype=css_label],#info_panel td.infoPanelValue[data-metatype=css_label],.form-ip_content_info_panel div.infoPanelValue[data-metatype=css_label],.form-ip_content_info_panel td.infoPanelValue[data-metatype=css_label]{padding:5px;border-radius:2px;margin-bottom:10px}#info_panel div.class-FetchedResultPane,.form-ip_content_info_panel div.class-FetchedResultPane{font-size:13px}#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed,.form-ip_content_info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed{padding:0;cursor:default}#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbLabel,.form-ip_content_info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbLabel{font-size:1.1em;color:#222;white-space:normal;line-height:1.5em;padding-top:0;padding-bottom:8px}#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbLabel small,.form-ip_content_info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbLabel small{color:#666;display:block;font-size:.8em;line-height:15px}#info_panel div.class-FetchedResultPane.leaf_activity div.thumbnail_selectable_cell.detailed div.thumbLabel,.form-ip_content_info_panel div.class-FetchedResultPane.leaf_activity div.thumbnail_selectable_cell.detailed div.thumbLabel{color:#555;display:block;font-size:13px;line-height:17px}#info_panel div.class-FetchedResultPane div.ajxpNodeProvider.selected-focus,#info_panel div.class-FetchedResultPane div.ajxpNodeProvider:hover,.form-ip_content_info_panel div.class-FetchedResultPane div.ajxpNodeProvider.selected-focus,.form-ip_content_info_panel div.class-FetchedResultPane div.ajxpNodeProvider:hover{background-color:transparent!important}#info_panel div.ip_geo_cell,.form-ip_content_info_panel div.ip_geo_cell{position:absolute;right:17px;margin-top:-36px}#info_panel td.ip_geo_cell,.form-ip_content_info_panel td.ip_geo_cell{padding-right:12px!important}#info_panel #ajxp_workspace_info_panel_content,.form-ip_content_info_panel #ajxp_workspace_info_panel_content{font-size:13px;margin-bottom:15px}#info_panel .infopanel_loading,.form-ip_content_info_panel .infopanel_loading{opacity:0;transition:opacity ease .2s}#info_panel .infopanel_loading_finished,.form-ip_content_info_panel .infopanel_loading_finished{opacity:1}#info_panel .infoPanelActions,.form-ip_content_info_panel .infoPanelActions{padding:5px;font-size:11px;text-align:right}#info_panel .panelContent,.form-ip_content_info_panel .panelContent{overflow:hidden;background-color:#f8f8f8;padding-bottom:15px;-webkit-font-smoothing:antialiased}#info_panel .panelContent div.panelHeader,.form-ip_content_info_panel .panelContent div.panelHeader{font-size:13px;padding:8px 0 16px;color:#333;font-weight:500}#info_panel .panelContent div.panelHeader span.user_meta_change,.form-ip_content_info_panel .panelContent div.panelHeader span.user_meta_change{color:#222;text-transform:uppercase;font-size:10px;padding:4px 10px 3px;margin-top:-5px;display:inline-block!important;float:right;cursor:pointer;font-weight:300}#info_panel .panelContent a#open_with_button span.ajxp_icon_span,#info_panel .panelContent div.panelHeader span[data-ajxpAction],#info_panel .panelContent span#open_with_button_label,.form-ip_content_info_panel .panelContent a#open_with_button span.ajxp_icon_span,.form-ip_content_info_panel .panelContent div.panelHeader span[data-ajxpAction],.form-ip_content_info_panel .panelContent span#open_with_button_label{display:none}#info_panel .panelContent div.panelHeader span.user_meta_change:hover,.form-ip_content_info_panel .panelContent div.panelHeader span.user_meta_change:hover{background-color:#fff}#info_panel .panelContent i,.form-ip_content_info_panel .panelContent i{font-size:13px;font-style:normal;color:#b4b8be;text-shadow:1px 1px 0 #fff}#info_panel .panelContent span.ajxp_icon_span,.form-ip_content_info_panel .panelContent span.ajxp_icon_span{color:#fff;margin-right:5px}#info_panel .panelContent.scrolling td.infoPanelValue,.form-ip_content_info_panel .panelContent.scrolling td.infoPanelValue{padding-right:18px}#info_panel .panelContent .infoPanelGroup,.form-ip_content_info_panel .panelContent .infoPanelGroup{border-radius:0;padding:1px}#info_panel .panelContent div.info_panel_primary_multiple,.form-ip_content_info_panel .panelContent div.info_panel_primary_multiple{margin-top:0!important;border-top:0}#info_panel .panelContent .info_panel_multiple_tile,.form-ip_content_info_panel .panelContent .info_panel_multiple_tile{width:27%;height:76px;float:left;padding:7px 2%;background-color:#fff;margin:0 1% 6px;position:relative;text-align:center;border-radius:0;box-shadow:0 1px 2px rgba(0,0,0,.1),0 1px 2px rgba(0,0,0,.33)}#info_panel .panelContent .info_panel_multiple_tile div.tile_preview img,.form-ip_content_info_panel .panelContent .info_panel_multiple_tile div.tile_preview img{max-width:90%;max-height:60px}#info_panel .panelContent .info_panel_multiple_tile div.tile_label,.form-ip_content_info_panel .panelContent .info_panel_multiple_tile div.tile_label{position:absolute;bottom:1px;font-size:.7em;overflow:hidden;width:89%;text-overflow:ellipsis;padding:2px 2px 0;text-align:center;color:#646464;white-space:nowrap}#info_panel .panelContent div.toolbar_placeholder,.form-ip_content_info_panel .panelContent div.toolbar_placeholder{margin-top:25px;display:inline-block}#info_panel .panelContent div.one_has_many,.form-ip_content_info_panel .panelContent div.one_has_many{margin-top:10px}#info_panel .panelContent div.one_has_many div.toolbar_placeholder,.form-ip_content_info_panel .panelContent div.one_has_many div.toolbar_placeholder{margin-top:0}#info_panel .panelContent div.toolbarGroup,.form-ip_content_info_panel .panelContent div.toolbarGroup{text-align:center}#info_panel div[data-metatype=stars_rate],.form-ip_content_info_panel div[data-metatype=stars_rate]{padding:3px 0 30px}#info_panel div.infoPanelLabel,.form-ip_content_info_panel div.infoPanelLabel{width:100%}#info_panel div.dimension_card_width,.form-ip_content_info_panel div.dimension_card_width{text-align:center}#info_panel div.dimension_card_height,.form-ip_content_info_panel div.dimension_card_height{float:left;height:37px;width:28%;padding-top:59px;text-align:right}#info_panel div.dimension_card_rectangle,.form-ip_content_info_panel div.dimension_card_rectangle{float:left;height:95px;width:67%;border-radius:5px;margin-top:5px;margin-left:2%;border:1px solid #AAA}#info_panel div.infoPanelAllMetadata>div,.form-ip_content_info_panel div.infoPanelAllMetadata>div{border-top:1px solid #ddd;padding:6px 16px}#info_panel div.infoPanelAllMetadata>div#info_panel_primary,.form-ip_content_info_panel div.infoPanelAllMetadata>div#info_panel_primary{padding-top:12px}#info_panel div.infoPanelAllMetadata>div#info_panel_primary.empty,.form-ip_content_info_panel div.infoPanelAllMetadata>div#info_panel_primary.empty{display:none}#info_panel div.triple div.infoPanelAllMetadata>div,.form-ip_content_info_panel div.triple div.infoPanelAllMetadata>div{float:left;margin:2%;width:46%}#info_panel div.infoPanelAllMetadata span.meta_user_tag_block,.form-ip_content_info_panel div.infoPanelAllMetadata span.meta_user_tag_block{display:inline-block;background-color:rgba(52,94,121,.78);color:#fff;padding:2px 5px;border-radius:4px;margin-right:5px;font-weight:500}#info_panel .ipanel_no_selection_select,.form-ip_content_info_panel .ipanel_no_selection_select{padding:30px;color:#969aa0}#info_panel .ipanel_no_selection_select span.icon-info-sign,.form-ip_content_info_panel .ipanel_no_selection_select span.icon-info-sign{opacity:.4;display:block;text-align:center;font-size:120px;padding:50px 0 20px}#info_panel #no-results-found,.form-ip_content_info_panel #no-results-found{color:#b4b8be;text-shadow:1px 1px 0 #fff}#info_panel .ipanel_no_selection_select span.label,.form-ip_content_info_panel .ipanel_no_selection_select span.label{display:block;text-align:center;font-size:13px}#info_panel .ipanel_no_selection_data,.form-ip_content_info_panel .ipanel_no_selection_data{display:none}#info_panel .infoPanelTable tr:last-child td,.form-ip_content_info_panel .infoPanelTable tr:last-child td{border-bottom:0}.workspace-entry.workspace-access-inbox span.access-icon:before{font-family:FontAwesome;content:'\f01c'}.left-panel{background-color:#353535;position:absolute;top:109px;left:0;bottom:0;width:250px;z-index:1001;font-family:Roboto,sans-serif;-webkit-font-smoothing:antialiased;font-size:13px;color:#ddd;overflow-y:auto;box-sizing:border-box;box-shadow:0 3px 6px rgba(0,0,0,.16),0 3px 6px rgba(0,0,0,.23)}.left-panel .nav-list-entry:hover,.left-panel .workspaces .workspace-entry:hover{background-color:rgba(255,255,255,.25)}.left-panel .nav-list-entry-label,.left-panel .section-title,.left-panel .workspaces .workspace-entry .workspace-label{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.left-panel *{box-sizing:border-box}.left-panel .section-title{padding:16px;font-weight:500;border-top:1px solid rgba(221,221,221,.3);margin-top:10px}.left-panel .navigation-title{display:none;height:62px;border-bottom:1px solid #f8f8ff;padding-left:16px;font-size:2em;line-height:62px}.left-panel .nav-list-entry{padding:6px 1px 6px 16px;display:-webkit-flex;display:-ms-flexbox;display:flex;line-height:24px;cursor:pointer}.left-panel .nav-list-entry-icon{-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;display:inline-block;width:24px;height:24px;margin-right:16px;text-align:center}.left-panel .workspaces .workspace-entry{padding:6px 1px 6px 16px;display:-webkit-flex;display:-ms-flexbox;display:flex;line-height:24px;cursor:pointer}.left-panel .workspaces .workspace-entry .workspace-badge{-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;display:inline-block;width:24px;height:24px;margin-right:16px;text-align:center;font-size:.9em;font-weight:500;background-color:#ddd;color:#353535;border-radius:50%;position:relative}.left-panel .workspaces .workspace-entry .workspace-badge span.badge-overlay{display:none}.left-panel .workspaces .workspace-entry .workspace-label .workspace-new,.left-panel .workspaces .workspace-entry .workspace-label .workspace-num-badge{display:inline-block;font-size:10px;font-weight:500;border-radius:3px;margin-left:5px;height:13px;line-height:13px;padding:0 3px;background-color:#fff;color:rgba(0,0,0,.63);text-transform:uppercase}.left-panel .workspaces .workspace-entry .workspace-description{display:none}.left-panel .workspaces .workspace-entry .workspace-additional-action{padding:6px 0 0 8px}.left-panel .workspaces .workspace-entry.workspace-current{opacity:.4}.left-panel .workspaces .workspace-entry.workspace-access-inbox{margin-bottom:10px}.left-panel .workspaces .workspace-entry.workspace-access-inbox .workspace-label{text-transform:uppercase;color:#fff}.left-panel .simple-provider{position:relative}.left-panel .simple-provider .infinite-parent-smooth-height>div{overflow-y:auto!important}.left-panel .simple-provider .material-list-entry{padding:6px 1px 6px 16px;display:-webkit-flex;display:-ms-flexbox;display:flex;line-height:24px;cursor:pointer}.left-panel .simple-provider .material-list-entry:hover{background-color:rgba(255,255,255,.25)}.left-panel .simple-provider .material-list-entry .material-list-icon{-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;display:inline-block;width:24px;height:24px;margin-right:16px;text-align:center;font-size:1.2em}.left-panel .simple-provider .material-list-entry .material-list-text{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.left-panel .simple-provider .material-list-entry .material-list-actions{position:absolute;right:16px;opacity:.5}.left-panel .simple-provider .material-list-entry .material-list-actions:hover{opacity:1}.left-panel .simple-provider .mui-toolbar{position:absolute;top:16px;right:60px;color:#919191}.left-panel .simple-provider .toggle-button{cursor:pointer;float:right;color:#919191}.left-panel .simple-provider .toggle-button:hover{color:#ddd}.left-panel .simple-provider .section-title{border-top:0;margin-top:0}.left-panel .simple-provider .alerts_number_badge{background-color:#f5c781;color:#555;border-radius:2px;display:inline-block;padding:0 3px}.left-panel .simple-provider .icon-refresh{cursor:pointer}.left-panel .simple-provider .icon-refresh.rotating{opacity:.2}.left-panel .simple-provider .emptyMessage{display:inline-block;padding:0 16px 8px;opacity:.7}.left-panel .simple-provider.closed .section-title{padding-bottom:6px}.left-panel .simple-provider.closed .emptyMessage,.left-panel .simple-provider.closed .material-list{display:none}.left-panel.hidden{left:-255px}div.form-login_form,div.form-login_form_dynamic,div.form-reset-password,div.form-reset-password-ask,div.form-switch_language_form{box-shadow:none;top:0!important;left:0!important;bottom:0!important;background-color:rgba(34,34,34,.4);border-radius:0}div.form-login_form div.dialogTitle,div.form-login_form_dynamic div.dialogTitle,div.form-reset-password div.dialogTitle,div.form-reset-password-ask div.dialogTitle,div.form-switch_language_form div.dialogTitle{display:block!important;position:absolute;top:0;height:90%!important;right:-113%;background-color:transparent}div.form-login_form div.dialogContent,div.form-login_form_dynamic div.dialogContent,div.form-reset-password div.dialogContent,div.form-reset-password-ask div.dialogContent,div.form-switch_language_form div.dialogContent{height:100%;background-color:transparent;color:#fff;transition:padding-top .5s;-webkit-transition:padding-top .5s}div.form-login_form div.dialogContent select#language_selector,div.form-login_form_dynamic div.dialogContent select#language_selector,div.form-reset-password div.dialogContent select#language_selector,div.form-reset-password-ask div.dialogContent select#language_selector,div.form-switch_language_form div.dialogContent select#language_selector{width:280px!important}div.form-login_form div.dialogContent div#progressCustomMessage,div.form-login_form_dynamic div.dialogContent div#progressCustomMessage,div.form-reset-password div.dialogContent div#progressCustomMessage,div.form-reset-password-ask div.dialogContent div#progressCustomMessage,div.form-switch_language_form div.dialogContent div#progressCustomMessage{font-size:30px!important;text-align:center}div.form-login_form div.dialogContent a.icon-flag,div.form-login_form_dynamic div.dialogContent a.icon-flag,div.form-reset-password div.dialogContent a.icon-flag,div.form-reset-password-ask div.dialogContent a.icon-flag,div.form-switch_language_form div.dialogContent a.icon-flag{position:absolute;top:10px;right:10px;font-size:20px!important;color:#fff!important}div.form-login_form div.dialogContent div.dialogLegend,div.form-login_form_dynamic div.dialogContent div.dialogLegend,div.form-reset-password div.dialogContent div.dialogLegend,div.form-reset-password-ask div.dialogContent div.dialogLegend,div.form-switch_language_form div.dialogContent div.dialogLegend{text-align:center;font-style:italic;color:#ddd}div.form-login_form div.dialogContent #switch_language_form div.dialogLegend,div.form-login_form_dynamic div.dialogContent #switch_language_form div.dialogLegend,div.form-reset-password div.dialogContent #switch_language_form div.dialogLegend,div.form-reset-password-ask div.dialogContent #switch_language_form div.dialogLegend,div.form-switch_language_form div.dialogContent #switch_language_form div.dialogLegend{font-style:normal;text-align:left;margin-top:16px;margin-bottom:5px}div.form-login_form div.dialogContent a.forgot-password-link,div.form-login_form_dynamic div.dialogContent a.forgot-password-link,div.form-reset-password div.dialogContent a.forgot-password-link,div.form-reset-password-ask div.dialogContent a.forgot-password-link,div.form-switch_language_form div.dialogContent a.forgot-password-link{color:#fff!important;margin-right:45px;margin-top:6px;text-decoration:underline;font-size:13px;text-align:right;display:block;float:right}div.form-login_form div.dialogContent .captcha_container,div.form-login_form_dynamic div.dialogContent .captcha_container,div.form-reset-password div.dialogContent .captcha_container,div.form-reset-password-ask div.dialogContent .captcha_container,div.form-switch_language_form div.dialogContent .captcha_container{text-align:center}div.form-login_form div.dialogContent .captcha_container img,div.form-login_form_dynamic div.dialogContent .captcha_container img,div.form-reset-password div.dialogContent .captcha_container img,div.form-reset-password-ask div.dialogContent .captcha_container img,div.form-switch_language_form div.dialogContent .captcha_container img{margin:5px 0 0 2px;border:1px solid #ddd}div.form-login_form div.dialogContent .ajxp_login_error,div.form-login_form_dynamic div.dialogContent .ajxp_login_error,div.form-reset-password div.dialogContent .ajxp_login_error,div.form-reset-password-ask div.dialogContent .ajxp_login_error,div.form-switch_language_form div.dialogContent .ajxp_login_error{margin:12px 27px 6px;font-size:14px!important;background-color:rgba(180,57,57,.45)!important;color:#fff!important;padding:7px!important}div.form-login_form div.dialogContent .ajxp_password_auth div.SF_element:first-of-type,div.form-login_form_dynamic div.dialogContent .ajxp_password_auth div.SF_element:first-of-type,div.form-reset-password div.dialogContent .ajxp_password_auth div.SF_element:first-of-type,div.form-reset-password-ask div.dialogContent .ajxp_password_auth div.SF_element:first-of-type,div.form-switch_language_form div.dialogContent .ajxp_password_auth div.SF_element:first-of-type{display:none!important}div.form-login_form div.dialogContent div.SF_element,div.form-login_form_dynamic div.dialogContent div.SF_element,div.form-reset-password div.dialogContent div.SF_element,div.form-reset-password-ask div.dialogContent div.SF_element,div.form-switch_language_form div.dialogContent div.SF_element{padding-left:20px}div.form-login_form div.dialogContent div.SF_element div.SF_label,div.form-login_form_dynamic div.dialogContent div.SF_element div.SF_label,div.form-reset-password div.dialogContent div.SF_element div.SF_label,div.form-reset-password-ask div.dialogContent div.SF_element div.SF_label,div.form-switch_language_form div.dialogContent div.SF_element div.SF_label{padding-left:4px;text-transform:uppercase}div.form-login_form div.dialogContent div.dialogButtons,div.form-login_form_dynamic div.dialogContent div.dialogButtons,div.form-reset-password div.dialogContent div.dialogButtons,div.form-reset-password-ask div.dialogContent div.dialogButtons,div.form-switch_language_form div.dialogContent div.dialogButtons{margin-top:30px;text-align:center;position:relative}div.form-login_form div.dialogContent div.dialogButtons input.dialogButton,div.form-login_form_dynamic div.dialogContent div.dialogButtons input.dialogButton,div.form-reset-password div.dialogContent div.dialogButtons input.dialogButton,div.form-reset-password-ask div.dialogContent div.dialogButtons input.dialogButton,div.form-switch_language_form div.dialogContent div.dialogButtons input.dialogButton{padding:0 15px;margin-right:5px;background-color:rgba(255,255,255,.39);color:#fff}div.form-login_form div.dialogContent div.dialogButtons input.dialogButton:focus,div.form-login_form div.dialogContent div.dialogButtons input.dialogButton:hover,div.form-login_form_dynamic div.dialogContent div.dialogButtons input.dialogButton:focus,div.form-login_form_dynamic div.dialogContent div.dialogButtons input.dialogButton:hover,div.form-reset-password div.dialogContent div.dialogButtons input.dialogButton:focus,div.form-reset-password div.dialogContent div.dialogButtons input.dialogButton:hover,div.form-reset-password-ask div.dialogContent div.dialogButtons input.dialogButton:focus,div.form-reset-password-ask div.dialogContent div.dialogButtons input.dialogButton:hover,div.form-switch_language_form div.dialogContent div.dialogButtons input.dialogButton:focus,div.form-switch_language_form div.dialogContent div.dialogButtons input.dialogButton:hover{background-color:rgba(255,255,255,.48)}div.form-login_form.overlay,div.form-login_form_dynamic.overlay,div.form-reset-password-ask.overlay,div.form-reset-password.overlay,div.form-switch_language_form.overlay{opacity:0;background-image:none!important;background-color:transparent!important}.ajxp_guest_enabled div.form-login_form.overlay,.ajxp_guest_enabled div.form-login_form_dynamic.overlay,.ajxp_guest_enabled div.form-reset-password-ask.overlay,.ajxp_guest_enabled div.form-reset-password.overlay,.ajxp_guest_enabled div.form-switch_language_form.overlay{opacity:1!important;background-color:inherit!important}div.dialogBox.form-login_form form,div.dialogBox.form-login_form_dynamic form{margin:0 40px;font-size:15px;padding-top:20px;padding-bottom:20px}div.dialogBox.form-login_form form.no_placeholder div.SF_label,div.dialogBox.form-login_form_dynamic form.no_placeholder div.SF_label{display:block;text-align:left;padding:0 4px}div.dialogBox.form-login_form form.no_placeholder div.SF_input,div.dialogBox.form-login_form_dynamic form.no_placeholder div.SF_input{clear:left}div.dialogBox.form-login_form form div.SF_input>input,div.dialogBox.form-login_form_dynamic form div.SF_input>input{width:280px!important;padding:7px!important;font-size:17px;height:inherit;border:0!important}div#properties_box{margin:20px auto;width:250px}input#ajxp_link_container{width:340px!important}textarea#myCode{border:1px solid #5C5C5C;border-right-color:#ccc;border-left-color:#ccc}.create_file_alt_link{font-family:"Open Sans Regular","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;font-style:italic;cursor:pointer}#ajxp_link_form span.icon-envelope-alt{font-size:1.3em}#ajxp_link_form img{display:none}div.dialogBox.form-diaporama_box div.dialogContent{background-color:#555;border:0}.no-flexbox div#mailer_message{width:380px!important}div#copymove_form{box-sizing:border-box}div#copymove_form>div{box-sizing:border-box;width:100%!important;height:auto!important}div#copymove_form select#external_repository{box-sizing:border-box;width:100%!important;height:30px!important}div#copymove_form div#treeCopy{height:254px!important}div#copymove_form>input{box-sizing:border-box;width:100%!important;background-color:#fff;padding:5px}div#external_download>div{padding:10px 24px 52px!important}div#external_download>div .dialoglegend{font-size:14px;display:block;padding-bottom:20px}div#external_download>div input{width:380px!important}div.dialogBox.form-external_download #modalCloseBtn,div.dialogBox.form-history_box #modalCloseBtn,div.dialogBox.form-jumploader_form #modalCloseBtn,div.dialogBox.form-originalUploadForm #modalCloseBtn,div.dialogBox.form-pdf_box #modalCloseBtn,div.dialogBox.form-plupload_form #modalCloseBtn,div.dialogBox.form-smplayer_editor #modalCloseBtn,div.dialogBox.form-svnlog_box #modalCloseBtn,div.dialogBox.form-videojs_previewer #modalCloseBtn{display:block;color:rgba(0,0,0,.53)}div.dialogBox.form-user_create_repository_form div#user_tpl_container{border:0!important;font-size:13px;background-color:#fff!important;padding-bottom:52px}div.dialogBox.form-user_create_repository_form div#user_tpl_container div.panelHeader{padding-left:20px;border-bottom:1px solid rgba(0,0,0,.05)}.toolbars_buttons_mixin,.toolbars_round_button_mixin{font-size:12px;font-weight:500;color:#555;-webkit-font-smoothing:auto;padding:5px 8px;margin:0 2px 0 0;text-align:center;font-family:Roboto,sans-serif}div.dialogBox.form-user_create_repository_form div.dialogButtons{background-color:#fff;border-top:1px solid rgba(0,0,0,.05)}div.dialogBox.form-installer_form div#progressCustomMessage{display:none}div.dialogButtons.inlineEdition input{text-align:center;cursor:pointer;width:auto!important;min-width:44px;font-weight:500;font-family:Roboto,sans-serif}.toolbars_buttons_mixin{box-sizing:border-box;height:30px;text-transform:uppercase;border-radius:3px;background:0 0;display:inline-block;transition:all 550ms cubic-bezier(.23,1,.32,1) 0s}#files_list_header #display_toolbar a,.toolbars_round_button_mixin{box-sizing:border-box;transition:all 550ms cubic-bezier(.23,1,.32,1) 0s;border-radius:50%;text-transform:uppercase}.toolbars_buttons_mixin:hover{background-color:rgba(255,255,255,.9)}.toolbars_round_button_mixin{background:0 0;display:inline-block;width:27px;height:27px;background-color:rgba(255,255,255,.66);margin-left:5px}.toolbars_round_button_mixin:hover{background-color:rgba(255,255,255,.9)}.toolbars_round_button_mixin span.ajxp_icon_span{display:inline-block;color:#777;font-size:13px;-webkit-font-smoothing:antialiased}.toolbars_round_button_mixin:hover span.ajxp_icon_span{color:#ff796b}.toolbars_round_button_mixin span.actionbar_button_label{display:none}.toolbarGroup{display:inline-block}.actionbar_button_label u{text-decoration:none}#global_toolbar{display:none;height:47px;overflow:hidden}#global_toolbar #clickable_home,#global_toolbar div.custom_top_title,#global_toolbar img.custom_logo_image.linked{display:none;z-index:1022}#ajxp_desktop[class*=" ajxp_ws-"] #global_toolbar,#ajxp_desktop[class^=ajxp_ws-] #global_toolbar{height:47px;padding:0 15px 0 5px;background:7px 7px no-repeat #009688;box-shadow:0 2px 3px rgba(0,0,0,.16),0 2px 3px rgba(0,0,0,.43);z-index:1021;display:block}#ajxp_desktop[class*=" ajxp_ws-"] #global_toolbar #clickable_home,#ajxp_desktop[class*=" ajxp_ws-"] #global_toolbar div.custom_top_title,#ajxp_desktop[class*=" ajxp_ws-"] #global_toolbar img.custom_logo_image.linked,#ajxp_desktop[class^=ajxp_ws-] #global_toolbar #clickable_home,#ajxp_desktop[class^=ajxp_ws-] #global_toolbar div.custom_top_title,#ajxp_desktop[class^=ajxp_ws-] #global_toolbar img.custom_logo_image.linked{display:inherit}#ajxp_desktop[class*=" ajxp_ws-"] #global_toolbar #clickable_home,#ajxp_desktop[class^=ajxp_ws-] #global_toolbar #clickable_home{position:absolute;width:150px;height:47px;cursor:pointer}#ajxp_desktop[class*=" ajxp_ws-"] #global_toolbar .custom_top_title,#ajxp_desktop[class^=ajxp_ws-] #global_toolbar .custom_top_title{color:#fff}#ajxp_desktop[class*=" ajxp_ws-"] #global_toolbar #top_toolbar,#ajxp_desktop[class^=ajxp_ws-] #global_toolbar #top_toolbar{float:right;margin-top:11px}#ajxp_desktop[class*=" ajxp_ws-"] #global_toolbar #top_toolbar a,#ajxp_desktop[class^=ajxp_ws-] #global_toolbar #top_toolbar a{font-size:13px;padding:7px 24px;font-weight:300;color:rgba(255,255,255,.9);display:inline-block}#ajxp_desktop[class*=" ajxp_ws-"] #global_toolbar #top_toolbar a span.ajxp_icon_arrow,#ajxp_desktop[class*=" ajxp_ws-"] #global_toolbar #top_toolbar a span.ajxp_icon_span,#ajxp_desktop[class^=ajxp_ws-] #global_toolbar #top_toolbar a span.ajxp_icon_arrow,#ajxp_desktop[class^=ajxp_ws-] #global_toolbar #top_toolbar a span.ajxp_icon_span{font-size:1em;display:inline-block;padding:0 4px}#ajxp_desktop[class*=" ajxp_ws-"] #global_toolbar #top_toolbar a img,#ajxp_desktop[class^=ajxp_ws-] #global_toolbar #top_toolbar a img{display:none}#ajxp_desktop.ajxp_ws-welcome #global_toolbar{position:absolute;display:block;width:99%;background:0 0;background-image:none!important;box-shadow:none}#ajxp_desktop.ajxp_ws-welcome #global_toolbar #clickable_home,#ajxp_desktop.ajxp_ws-welcome #global_toolbar div.custom_top_title,#ajxp_desktop.ajxp_ws-welcome #global_toolbar img.custom_logo_image.linked{display:none}#files_list_header{font-size:11px;padding:3px 12px 4px 8px;height:35px;background-color:#e8e8e8;color:#6f7b88;border-right:0;overflow:hidden}#files_list_header #display_toolbar{float:right;display:inline-block;min-width:60px;text-align:right;padding-top:4px}#files_list_header #display_toolbar a{font-family:Roboto,sans-serif;font-size:12px;font-weight:500;color:#555;-webkit-font-smoothing:auto;background:0 0;padding:5px 8px;display:inline-block;margin:0 2px 0 0;width:27px;height:27px;background-color:rgba(255,255,255,.66);text-align:center;margin-left:5px}#files_list_header #display_toolbar a:hover{background-color:rgba(255,255,255,.9)}#files_list_header #display_toolbar a span.ajxp_icon_span{display:inline-block;color:#777;font-size:13px;-webkit-font-smoothing:antialiased}#files_list_header #display_toolbar a span.actionbar_button_label,#files_list_header #display_toolbar a span.icon-caret-down.ajxp_icon_arrow,#files_list_header #display_toolbar a.disabled,#files_list_header #info_panel_share_toolbar,#files_list_header #info_panel_share_toolbar #open_with_unique_button,#files_list_header #info_panel_share_toolbar a.disabled,#files_list_header #info_panel_toolbar,#files_list_header #info_panel_toolbar #open_with_unique_button,#files_list_header #info_panel_toolbar a.disabled{display:none}#buttons_bar a,#buttons_bar_top a,#info_panel .toolbarGroup a{box-sizing:border-box;height:30px;-webkit-font-smoothing:auto;border-radius:3px;font-weight:500;transition:all 550ms cubic-bezier(.23,1,.32,1) 0s;font-family:Roboto,sans-serif;text-align:center}#files_list_header #display_toolbar a:hover span.ajxp_icon_span{color:#ff796b}#files_list_header #info_panel_share_toolbar a,#files_list_header #info_panel_toolbar a{color:#009688}#files_list_header #info_panel_share_toolbar a:hover,#files_list_header #info_panel_toolbar a:hover{background-color:#c9fffa}#files_list_pane.infoPanelFolded #info_panel_share_toolbar,#files_list_pane.infoPanelFolded #info_panel_toolbar{display:inline-block}#files_list_pane.infoPanelFolded #info_panel_share_toolbar{border-right:1px solid #d1d1d1}@media only screen and (max-width:1000px){#files_list_pane.infoPanelFolded div.toolbarGroup a{padding-left:2px;padding-right:2px}}@media only screen and (max-width:860px){#files_list_pane.infoPanelFolded div.toolbarGroup a{padding-left:8px;padding-right:8px}#files_list_pane.infoPanelFolded div.toolbarGroup a span.actionbar_button_label{display:none}#files_list_pane.infoPanelFolded div.toolbarGroup a span.ajxp_icon_span{display:inline-block}}@media only screen and (max-width:700px){#files_list_pane.infoPanelFolded div.toolbarGroup a{padding-left:4px;padding-right:4px}}#info_panel .toolbarGroup{margin-bottom:10px}#info_panel .toolbarGroup a{font-size:12px;text-transform:uppercase;color:#555;background:0 0;padding:5px 8px;display:inline-block;margin:0 2px 0 0;margin-right:5px;background-color:transparent}#buttons_bar,#buttons_bar_top{padding-left:0;overflow:hidden}#info_panel .toolbarGroup a span.actionbar_button_label{display:block;text-transform:none;font-size:12px;font-weight:500;padding-top:3px}#info_panel .toolbarGroup a span.ajxp_icon_span{display:block;color:inherit;font-size:18px}#info_panel .toolbarGroup a:hover{background-color:transparent;color:#ff796b}#info_panel .toolbarGroup a:hover span.ajxp_icon_span{color:#ff796b}#info_panel .toolbarGroup a#open_with_button{position:absolute;margin-left:-25px}#info_panel div#info_panel_share_toolbar a:hover,#info_panel div#info_panel_share_toolbar a:hover span.ajxp_icon_span{color:#4aceb0}#default_toolbar a span.ajxp_icon_span{margin-right:1px}#default_toolbar span.icon-caret-down.ajxp_icon_arrow{color:#797979;margin-left:3px}#buttons_bar{padding-top:3px}#buttons_bar a,#buttons_bar_top a{font-size:12px;text-transform:uppercase;color:#555;background:0 0;padding:5px 8px;display:inline-block;margin:0 2px 0 0;overflow:visible;outline:0;float:left}#buttons_bar a:hover,#buttons_bar_top a:hover{background-color:rgba(255,255,255,.9)}#buttons_bar_top{padding-top:1px}#buttons_bar span.ajxp_icon_span{display:none}#buttons_bar #navigation_toolbar{padding:0 6px}#buttons_bar a#up_dir_button span.ajxp_icon_span{display:inline-block}#buttons_bar a#up_dir_button span#up_dir_button_label{display:none}#search_engine_cont{margin-top:6px!important}#search_engine_cont #put_toolbar a{background-color:transparent;font-size:11px;font-weight:500;height:50px;margin-right:6px;border-radius:0;border-left:1px solid #ddd;text-transform:none}#search_engine_cont #put_toolbar a span.ajxp_icon_span{font-size:18px;display:block;float:none}#search_engine_cont #put_toolbar a:hover{color:#ff796b}#search_engine_cont #put_toolbar div.separator{margin-right:10px}#workspace_toolbar{padding:0;overflow:hidden;background-color:#f5f5f5;height:62px}#workspace_toolbar a#ls_button{display:none}#workspace_toolbar #breadcrumb{height:62px}#topPane div.FL-inlineToolbar{position:absolute;top:6px;right:40px;margin:0;display:none}#topPane div.thumbnail_selectable_cell:hover div.FL-inlineToolbar{display:block}#topPane div.FL-inlineToolbar div.toolbarGroup{min-width:0}#topPane div.FL-inlineToolbar span.ajxp_icon_span{color:#eee}#topPane div.FL-inlineToolbar span.actionbar_button_label{display:none!important}#repo_chooser{background-color:#222;float:left;font-size:15px;color:#fff;font-weight:400;margin-top:0;cursor:pointer;padding:21px 15px;border-right:2px solid #333;height:20px;width:15px;transition:all 550ms cubic-bezier(.23,1,.32,1) 0s}#repo_chooser.open,#repo_chooser:hover{background-color:#353535}#repo_chooser:hover{color:#fff}#repo_chooser.disabled{display:none}#repo_chooser span.icon-sitemap{font-size:1em;padding-right:5px;padding-top:5px;display:inline-block}#repo_chooser span.ws-label{display:inline-block;padding-top:0;line-height:20px}#repo_chooser span.icon-caret-down{display:inline-block;padding-left:3px}#browser{clear:left;line-height:18px}.flexbox #browser{-ms-flex-direction:row;flex-direction:row;-webkit-flex-direction:row;-ms-flex-align:stretch;align-items:stretch;-webkit-align-items:stretch}#browser #topPane{width:250px;background-color:#333}.no-flexbox #browser #topPane{float:left}#browser #topPane #tree_container{overflow-x:hidden!important;font-family:Roboto,sans-serif;-webkit-font-smoothing:antialiased}#browser #topPane h3{font-size:13px;padding:13px 8px 11px 17px;margin:0;display:block;clear:left;font-weight:500}#browser #topPane h3 small{cursor:pointer;display:none;float:right;color:#aaa;background-color:#555;border-radius:5px;text-transform:lowercase;padding:0 8px;font-weight:400;font-size:10px;margin-left:3px}#browser #topPane h3 small.simple-toggler-show,#browser #topPane h3:hover small{display:inline-block}#browser #topPane h3 small.expand_button_hide span.expand_label_show,#browser #topPane h3 span.expand_label_hide{display:none}#browser #topPane h3 small.expand_button_hide span.expand_label_hide{display:inline}#browser #cpane_container #cpane_tabs #content_pane.class-FilesList div.thumbnail_selectable_cell span.metadata_chunk.metadata_chunk_standard,#browser #cpane_container #cpane_tabs #content_pane.class-FilesList div.thumbnail_selectable_cell span.metadata_chunk.metadata_chunk_standard.metadata_chunk_ajxp_modiftime,#browser #topPane div.thumbnail_selectable_cell.detailed>div.thumbnail_selectable_cell{display:none}#browser #topPane div.scrolling h3{padding-right:16px}#browser #topPane div.droppableZone{background-color:rgba(255,255,255,.2)!important}#browser #topPane div.thumbnail_selectable_cell.detailed.selected,#browser #topPane div.thumbnail_selectable_cell.detailed.selected.selected-focus,#browser #topPane div.thumbnail_selectable_cell.detailed:hover{background-color:rgba(255,255,255,.15)!important}#browser #topPane div.thumbnail_selectable_cell.detailed div.thumbLabel{color:#ccc}#browser #topPane div.thumbnail_selectable_cell.detailed.selected.selected-focus div.thumbLabel{color:#fff}#browser #topPane div.no-results-found{padding:0 24px;font-size:12px;font-style:italic;color:#ccc}#browser #topPane div.thumbnail_selectable_cell.detailed div.thumbLabel{padding-top:7px;padding-bottom:7px;font-weight:300}#browser #topPane div.thumbnail_selectable_cell.detailed div.thumbLabel:before{content:"\f114";font-size:1.3em;font-family:FontAwesome;padding:13px;font-weight:400;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased}#browser #topPane div.thumbnail_selectable_cell.detailed.ajxpNodeLeaf div.thumbLabel:before{content:"\f016"}.no-flexbox #browser #cpane_container{position:absolute;left:250px}#browser #cpane_container #cpane_tabs>div.tabulatorContainer{border-bottom:0;box-shadow:inset 0 2px 4px rgba(0,0,0,.15);background-color:#f7f7f7}#browser #cpane_container #cpane_tabs[data-ajxptabscount="1"]>div.tabulatorContainer{height:0}#browser #cpane_container #cpane_tabs #content_pane.class-FilesList{background-color:#fff;font-family:Roboto,sans-serif;-webkit-font-smoothing:antialiased}#browser #cpane_container #cpane_tabs #content_pane.class-FilesList div.thumbnail_selectable_cell.selected span.metadata_chunk.metadata_chunk_standard,#browser #cpane_container #cpane_tabs #content_pane.class-FilesList div.thumbnail_selectable_cell.selected-focus span.metadata_chunk.metadata_chunk_standard,#browser #cpane_container #cpane_tabs #content_pane.class-FilesList div.thumbnail_selectable_cell:hover span.metadata_chunk.metadata_chunk_standard{display:inline}#browser #cpane_container #cpane_tabs #content_pane.class-FilesList div.panelHeader{display:none}.menu.desktop a#action_instance_share-edit-shared.enabled:hover,.menu.desktop a#action_instance_share-file-minisite.enabled:hover,.menu.desktop a#action_instance_share-folder-minisite-public.enabled:hover{background-color:#4aceb0}span#alerts_number{display:inline-block;font-size:13px;background-color:#f5c781;color:#000;border-radius:20px;padding:0 6px}#action_instance_user_create_repository{font-size:14px;line-height:21px}.colorcode-alert,span.overlay-class-span.icon-eye-open{color:#f5c781}.colorcode-shared,span.overlay-class-span.icon-share-sign,span.overlay-class-span.mdi.mdi-share-variant{color:#4aceb0}.selected .colorcode-shared,.selected span.overlay-class-span.icon-share-sign,.selected span.overlay-class-span.mdi.mdi-share-variant{color:#fff}.colorcode-bookmark,span.overlay-class-span.icon-bookmark,span.overlay-class-span.icon-bookmark-empty{color:#77b8e2}.colorcode-folder{color:#ff796b}#repo_list,#users_list{height:299px;width:200px;float:left;padding-top:5px;overflow:auto}#repo_detail_panel,#users_detail_panel{width:438px;height:299px;float:left;border-left:1px solid #bbb;overflow:auto}#repo_list{height:294px}#repo_detail_panel fieldset{margin:10px;font-size:13px}.metaPane{margin-bottom:5px;margin-top:2px;padding:0 5px 31px;width:96%}.user,.users_list_title{padding-left:5px;border-bottom:1px solid #fff}.metaPane img,img.metaPaneTitle{float:right;cursor:pointer;margin-left:3px}img.metaPaneTitle{display:none}div.accordion_toggle_active img.metaPaneTitle{display:inline}.metaPane span.title{font-weight:700}.users_list_title{font-size:20px;font-weight:700;color:#fff;background-color:#bbb}.user,.user_data{background-color:#fff}.user{padding-top:15px;padding-bottom:15px;border-top:1px solid #fff;border-left:1px solid #fff;margin-left:5px}.password,.repository,.user_data,.user_id{font-size:11px}.config_subblock{border:1px dotted #ccc;padding:5px 10px;margin-bottom:10px}fieldset{border:1px solid #ccc;padding:10px;padding-top:5px;margin-bottom:5px}legend{color:#5C5C5C}legend a{text-decoration:none;cursor:pointer}legend a.active{background-color:transparent;color:#87A9C4;text-decoration:none;cursor:default;font-size:1.1em}.password td,.repository,.repository td{padding:1px}.repository td{vertical-align:bottom;line-height:19px;padding:6px 0 5px 6px}.repository input,.user_delete_confirm{border:none;margin-left:1px;margin-top:0;padding:0}.user_data{padding:10px}.user_id{cursor:pointer;font-size:17px}.user_id b{color:#5C5C5C}#log_chooser,#repo_create_form,#user_admin_bar{padding:15px;font-size:12px;border:0 solid #ddd;background-color:#ddd;border-bottom:1px solid #bbb}#user_admin_bar input,.password input{height:18px;width:90px;font-size:12px;padding:0;margin-left:0;margin-right:5px}#options_pane .submit_button,#user_admin_bar .submit_button,.password .submit_button{width:30px}#log_chooser b,#repo_create_form b,#user_admin_bar b{font-size:15px;color:#5C5C5C}#user_pref_form input{width:65px;padding:0;margin-right:5px}#user_pref_form input.radio{width:20px;border:0;background-image:none}#repo_create_form select{border:1px solid #5E7C90;height:20px;width:160px}#user_acl{font-size:1.1em}div#available_roles,div#user_roles{padding:0;border:1px solid #aaa;width:100%;height:110px;overflow:auto;border-radius:3px}div#rights_pane{border:1px solid #aaa;max-height:150px;overflow:auto;margin-top:5px;padding:2px 0;width:100%}div.ajxp_role{background-color:#FFF;border-left:7px solid #DDD;cursor:move;margin:2px;padding:3px 5px;border-radius:2px}div.user_role{opacity:1!important;-moz-opacity:1!important;filter:alpha(opacity=100)!important}.roles_hover{border:1px solid #ffffef}.share_info_panel_main_legend{padding:10px 0;font-size:1.5em;color:#555;line-height:1.4em}input.share_info_panel_link{margin:0;width:96%;padding:5px;text-align:center;font-size:1em;background-color:transparent;border-color:#ccc}input.share_info_panel_link_expired{color:#999;text-decoration:line-through}textarea.editor{background-color:#fff;font-family:monospace;font-size:13px;line-height:16px}.diaporamaButton{filter:alpha(opacity=40);opacity:.4;-moz-opacity:.4}.diaporamaButton:hover,.diaporamaButtonActive{filter:alpha(opacity=100);opacity:1;-moz-opacity:1}#diaporamaMetadataContainer{background-color:#757575}#diaporamaMetadataContainer div.panelContent{background-color:#ebedf0;margin-right:3px}#diaporamaMetadataContainer div.infoPanelImagePreview{border-radius:7px}#diaporamaSplitter div.vsplitbar{background-color:#757575}#diaporamaMetadataContainer div.scroller_track{right:3px}#diaporamaMetadataContainer div.imagePreviewOverlay{background-color:rgba(0,0,0,.2)!important;opacity:1!important}div.icons_only.diaporama_toolbar{height:33px!important;width:470px;max-width:80%}div.diaporama_toolbar div#diaporama_legend{display:none}div.diaporama_toolbar div#diaporama_input_boxes{margin-top:6px!important}#diaporama_box{position:relative}.editor_container{background-color:#fff}#codemirror_box div.action_bar.editor_action_bar{right:0;padding:4px}.video-js-box{margin-left:10px!important}#cpane_tabs div.video-js-box,.video-js-box.vjs-fullscreen{margin-left:0!important}#sm2-container{position:absolute;top:-1000px}.animated{-webkit-animation-fill-mode:both;-moz-animation-fill-mode:both;-ms-animation-fill-mode:both;-o-animation-fill-mode:both;animation-fill-mode:both;animation-duration:1s}.animated.hinge{-webkit-animation-duration:1s;-moz-animation-duration:1s;-ms-animation-duration:1s;-o-animation-duration:1s;animation-duration:1s}.animated.quick,.animated.super-quick{-webkit-animation-duration:.15s;animation-duration:.3s}.animated.long{-webkit-animation-duration:2s;animation-duration:2s}@-webkit-keyframes fadeIn{0%{opacity:0}100%{opacity:1}}@-moz-keyframes fadeIn{0%{opacity:0}100%{opacity:1}}@-o-keyframes fadeIn{0%{opacity:0}100%{opacity:1}}@keyframes fadeIn{0%{opacity:0}100%{opacity:1}}.fadeIn{-webkit-animation-name:fadeIn;-moz-animation-name:fadeIn;-o-animation-name:fadeIn;animation-name:fadeIn}@-webkit-keyframes fadeInLeft{0%{opacity:0;-webkit-transform:translateX(-20px)}100%{opacity:1;-webkit-transform:translateX(0)}}@-moz-keyframes fadeInLeft{0%{opacity:0;-moz-transform:translateX(-20px)}100%{opacity:1;-moz-transform:translateX(0)}}@-o-keyframes fadeInLeft{0%{opacity:0;-o-transform:translateX(-20px)}100%{opacity:1;-o-transform:translateX(0)}}@keyframes fadeInLeft{0%{opacity:0;transform:translateX(-20px)}100%{opacity:1;transform:translateX(0)}}.fadeInLeft{-webkit-animation-name:fadeInLeft;-moz-animation-name:fadeInLeft;-o-animation-name:fadeInLeft;animation-name:fadeInLeft}@-webkit-keyframes fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0)}}@-moz-keyframes fadeInUpBig{0%{opacity:0;-moz-transform:translateY(2000px)}100%{opacity:1;-moz-transform:translateY(0)}}@-o-keyframes fadeInUpBig{0%{opacity:0;-o-transform:translateY(2000px)}100%{opacity:1;-o-transform:translateY(0)}}@keyframes fadeInUpBig{0%{opacity:0;transform:translateY(2000px)}100%{opacity:1;transform:translateY(0)}}.fadeInUpBig{-webkit-animation-name:fadeInUpBig;-moz-animation-name:fadeInUpBig;-o-animation-name:fadeInUpBig;animation-name:fadeInUpBig}@-webkit-keyframes fadeOutDownBig{0%{opacity:1;-webkit-transform:translateY(0)}100%{opacity:0;-webkit-transform:translateY(2000px)}}@-moz-keyframes fadeOutDownBig{0%{opacity:1;-moz-transform:translateY(0)}100%{opacity:0;-moz-transform:translateY(2000px)}}@-o-keyframes fadeOutDownBig{0%{opacity:1;-o-transform:translateY(0)}100%{opacity:0;-o-transform:translateY(2000px)}}@keyframes fadeOutDownBig{0%{opacity:1;transform:translateY(0)}100%{opacity:0;transform:translateY(2000px)}}.fadeOutDownBig{-webkit-animation-name:fadeOutDownBig;-moz-animation-name:fadeOutDownBig;-o-animation-name:fadeOutDownBig;animation-name:fadeOutDownBig}@-webkit-keyframes bounceOutLeft{0%{-webkit-transform:translateX(0)}20%{opacity:1;-webkit-transform:translateX(20px)}100%{opacity:0;-webkit-transform:translateX(-2000px)}}@-moz-keyframes bounceOutLeft{0%{-moz-transform:translateX(0)}20%{opacity:1;-moz-transform:translateX(20px)}100%{opacity:0;-moz-transform:translateX(-2000px)}}@-o-keyframes bounceOutLeft{0%{-o-transform:translateX(0)}20%{opacity:1;-o-transform:translateX(20px)}100%{opacity:0;-o-transform:translateX(-2000px)}}@keyframes bounceOutLeft{0%{transform:translateX(0)}20%{opacity:1;transform:translateX(20px)}100%{opacity:0;transform:translateX(-2000px)}}.bounceOutLeft{-webkit-animation-name:bounceOutLeft;-moz-animation-name:bounceOutLeft;-o-animation-name:bounceOutLeft;animation-name:bounceOutLeft}@-webkit-keyframes shake{0%,100%{transform:translate3d(0,0,0)}10%,30%,50%,70%,90%{transform:translate3d(-10px,0,0)}20%,40%,60%,80%{transform:translate3d(10px,0,0)}}@-moz-keyframes shake{0%,100%{transform:translate3d(0,0,0)}10%,30%,50%,70%,90%{transform:translate3d(-10px,0,0)}20%,40%,60%,80%{transform:translate3d(10px,0,0)}}@-o-keyframes shake{0%,100%{transform:translate3d(0,0,0)}10%,30%,50%,70%,90%{transform:translate3d(-10px,0,0)}20%,40%,60%,80%{transform:translate3d(10px,0,0)}}@keyframes shake{0%,100%{transform:translate3d(0,0,0)}10%,30%,50%,70%,90%{transform:translate3d(-10px,0,0)}20%,40%,60%,80%{transform:translate3d(10px,0,0)}}.shake{-webkit-animation-name:shake;-moz-animation-name:shake;-o-animation-name:shake;animation-name:shake}/*!
-Chosen, a Select Box Enhancer for jQuery and Prototype
-by Patrick Filler for Harvest, http://getharvest.com
-
-Version 1.2.0
-Full source at https://github.com/harvesthq/chosen
-Copyright (c) 2011-2014 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.
-*/.chosen-container{position:relative;display:inline-block;vertical-align:middle;font-size:13px;zoom:1;-webkit-user-select:none;-moz-user-select:none;user-select:none;max-width:466px;width:99%!important}.chosen-container *{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.chosen-container .chosen-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,.15)}.chosen-container.chosen-with-drop .chosen-drop{left:0}.chosen-container a{cursor:pointer}.chosen-container-single .chosen-single{position:relative;display:block;overflow:hidden;padding:2px 0 0 8px;height:30px;border:1px solid #aaa;border-radius:5px;background-color:#fff;background:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#fff),color-stop(50%,#f6f6f6),color-stop(52%,#eee),color-stop(100%,#f4f4f4));background:-webkit-linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:-moz-linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:-o-linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background:linear-gradient(top,#fff 20%,#f6f6f6 50%,#eee 52%,#f4f4f4 100%);background-clip:padding-box;box-shadow:0 0 3px #fff inset,0 1px 1px rgba(0,0,0,.1);color:#444;text-decoration:none;white-space:nowrap;line-height:24px}.chosen-container-single .chosen-default{color:#999}.chosen-container-single .chosen-single span{display:block;overflow:hidden;margin-right:26px;text-overflow:ellipsis;white-space:nowrap}.chosen-container-single .chosen-single-with-deselect span{margin-right:38px}.chosen-container-single .chosen-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}.chosen-container-single .chosen-single abbr:hover,.chosen-container-single.chosen-disabled .chosen-single abbr:hover{background-position:-42px -10px}.chosen-container-single .chosen-single div{position:absolute;top:0;right:0;display:block;width:18px;height:100%}.chosen-container-single .chosen-single div b{display:block;width:100%;height:100%;background:url(chosen-sprite.png) 0 6px no-repeat}.chosen-container-single .chosen-search{position:relative;z-index:1010;margin:0;padding:3px 4px;white-space:nowrap}.chosen-container-single .chosen-search input[type=text]{margin:1px 0;padding:4px 20px 4px 5px;width:100%;height:auto;outline:0;border:1px solid #aaa;background:url(chosen-sprite.png) 100% -20px no-repeat #fff;background:url(chosen-sprite.png) 100% -20px no-repeat;font-size:1em;font-family:sans-serif;line-height:normal;border-radius:0}.chosen-container-single .chosen-drop{margin-top:-1px;border-radius:0 0 4px 4px;background-clip:padding-box}.chosen-container-single.chosen-container-single-nosearch .chosen-search{position:absolute;left:-9999px}.chosen-container .chosen-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}.chosen-container .chosen-results li{display:none;margin:0;padding:5px 6px;list-style:none;line-height:15px;word-wrap:break-word;-webkit-touch-callout:none}.chosen-container .chosen-results li.active-result{display:list-item;cursor:pointer}.chosen-container .chosen-results li.disabled-result{display:list-item;color:#ccc;cursor:default}.chosen-container .chosen-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}.chosen-container .chosen-results li.no-results{color:#777;display:list-item;background:#f4f4f4}.chosen-container .chosen-results li.group-result{display:list-item;font-weight:700;cursor:default;font-family:"Open Sans Regular";text-transform:uppercase}.chosen-container .chosen-results li.group-option{padding-left:15px}.chosen-container .chosen-results li em{font-style:normal;text-decoration:underline}.chosen-container-multi .chosen-choices{position:relative;overflow:hidden;margin:0;padding:0 5px;width:100%;height:auto!important;height:1%;border:1px solid #aaa;background-color:#fff;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(1%,#eee),color-stop(15%,#fff));background-image:-webkit-linear-gradient(#eee 1%,#fff 15%);background-image:-moz-linear-gradient(#eee 1%,#fff 15%);background-image:-o-linear-gradient(#eee 1%,#fff 15%);background-image:linear-gradient(#eee 1%,#fff 15%);cursor:text}.chosen-container-multi .chosen-choices li{float:left;list-style:none}.chosen-container-multi .chosen-choices li.search-field{margin:0;padding:0;white-space:nowrap}.chosen-container-multi .chosen-choices li.search-field input[type=text]{margin:1px 0;padding:0;height:25px;outline:0;border:0!important;background:0 0!important;box-shadow:none;color:#999;font-size:100%;font-family:sans-serif;line-height:normal;border-radius:0}.chosen-container-multi .chosen-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:#eee;background-image:-webkit-gradient(linear,50% 0,50% 100%,color-stop(20%,#f4f4f4),color-stop(50%,#f0f0f0),color-stop(52%,#e8e8e8),color-stop(100%,#eee));background-image:-webkit-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-moz-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-o-linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:linear-gradient(#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-size:100% 19px;background-repeat:repeat-x;background-clip:padding-box;box-shadow:0 0 2px #fff inset,0 1px 0 rgba(0,0,0,.05);color:#333;line-height:13px;cursor:default}.chosen-container-multi .chosen-choices li.search-choice span{word-wrap:break-word}.chosen-container-multi .chosen-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}.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover{background-position:-42px -10px}.chosen-container-multi .chosen-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%,#eee));background-image:-webkit-linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-moz-linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:-o-linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);background-image:linear-gradient(top,#f4f4f4 20%,#f0f0f0 50%,#e8e8e8 52%,#eee 100%);color:#666}.chosen-container-multi .chosen-choices li.search-choice-focus{background:#d4d4d4}.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close{background-position:-42px -10px}.chosen-container-multi .chosen-results{margin:0;padding:0}.chosen-container-multi .chosen-drop .result-selected{display:list-item;color:#ccc;cursor:default}.chosen-container-active .chosen-single{border:1px solid #5897fb;box-shadow:0 0 5px rgba(0,0,0,.3)}.chosen-container-active.chosen-with-drop .chosen-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%,#eee),color-stop(80%,#fff));background-image:-webkit-linear-gradient(#eee 20%,#fff 80%);background-image:-moz-linear-gradient(#eee 20%,#fff 80%);background-image:-o-linear-gradient(#eee 20%,#fff 80%);background-image:linear-gradient(#eee 20%,#fff 80%);box-shadow:0 1px 0 #fff inset}.chosen-container-active.chosen-with-drop .chosen-single div{border-left:none;background:0 0}.chosen-container-active.chosen-with-drop .chosen-single div b{background-position:-18px 6px}.chosen-container-active .chosen-choices{border:1px solid #5897fb;box-shadow:0 0 5px rgba(0,0,0,.3)}.chosen-container-active .chosen-choices li.search-field input[type=text]{color:#222!important}.chosen-disabled{opacity:.5!important;cursor:default}.chosen-disabled .chosen-choices .search-choice .search-choice-close,.chosen-disabled .chosen-single{cursor:default}.chosen-rtl{text-align:right}.chosen-rtl .chosen-single{overflow:visible;padding:0 8px 0 0}.chosen-rtl .chosen-single span{margin-right:0;margin-left:26px;direction:rtl}.chosen-rtl .chosen-single-with-deselect span{margin-left:38px}.chosen-rtl .chosen-single div{right:auto;left:3px}.chosen-rtl .chosen-single abbr{right:auto;left:26px}.chosen-rtl .chosen-choices li{float:right}.chosen-rtl .chosen-choices li.search-field input[type=text]{direction:rtl}.chosen-rtl .chosen-choices li.search-choice{margin:3px 5px 3px 0;padding:3px 5px 3px 19px}.chosen-rtl .chosen-choices li.search-choice .search-choice-close{right:auto;left:4px}.chosen-rtl .chosen-drop,.chosen-rtl.chosen-container-single-nosearch .chosen-search{left:9999px}.chosen-rtl.chosen-container-single .chosen-results{margin:0 0 4px 4px;padding:0 4px 0 0}.chosen-rtl .chosen-results li.group-option{padding-right:15px;padding-left:0}.chosen-rtl.chosen-container-active.chosen-with-drop .chosen-single div{border-right:none}.chosen-rtl .chosen-search input[type=text]{padding:4px 5px 4px 20px;background:url(chosen-sprite.png) -30px -20px no-repeat #fff;background:url(chosen-sprite.png) -30px -20px no-repeat;direction:rtl}.chosen-rtl.chosen-container-single .chosen-single div b{background-position:6px 2px}.chosen-rtl.chosen-container-single.chosen-with-drop .chosen-single div b{background-position:-12px 2px}@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min-resolution:144dpi){.chosen-container .chosen-results-scroll-down span,.chosen-container .chosen-results-scroll-up span,.chosen-container-multi .chosen-choices .search-choice .search-choice-close,.chosen-container-single .chosen-search input[type=text],.chosen-container-single .chosen-single abbr,.chosen-container-single .chosen-single div b,.chosen-rtl .chosen-search input[type=text]{background-image:url(chosen-sprite@2x.png)!important;background-size:52px 37px!important;background-repeat:no-repeat!important}}@media only screen and (max-height:500px){div.dialogBox.form-login_form div.dialogContent,div.dialogBox.form-login_form_dynamic div.dialogContent,div.dialogBox.form-reset-password div.dialogContent,div.dialogBox.form-reset-password-ask div.dialogContent,div.dialogBox.form-switch_language_form div.dialogContent{top:22%}}@media only screen and (max-width :800px){.custom_top_title{width:23%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}#search_results div.thumbnail_selectable_cell.detailed{width:95%}}@media only screen and (max-width :1000px){#display_toolbar span.actionbar_button_label,#display_toolbar span.icon-caret-down.ajxp_icon_arrow{display:none!important}#display_toolbar span.ajxp_icon_span{display:inline-block!important}}@media only screen and (max-width :720px){#get_my_feed_button_label,#global_toolbar span.icon-caret-down,#logging_string [ajxp_message_id],#search_form a,.action_bar span.actionbar_button_label,.ws-label,span.actionbar_button_label{display:none!important}#logging_string{margin-top:7px;height:33px;overflow:hidden}#logging_string div.user_widget_mini{margin-top:-5px;height:32px;width:32px}#logging_string div.user_widget_label:not(withImage){padding-top:10px}#logging_string div.user_widget_label:not(withImage) i{display:none}div.toolbarGroup a span.ajxp_icon_span,div.toolbarGroup span.ajxp_icon_span{display:inline-block!important}div.toolbarGroup a{padding-bottom:2px!important}#group_more_action_button{padding-top:6px!important;padding-bottom:4px!important}#simple_repository_label{font-size:16px;width:100px!important}#simple_repository_label div.repository_legend{visibility:hidden}#workspace_toolbar{padding-top:0}.user_widget_label.withImage i{width:30px;overflow:hidden}#search_meta>div,#topPane{width:200px}.thumbnail_selectable_cell>div>div.overlay_icon_div{top:32px!important}.thumbnail_selectable_cell.selected-focus:not(.ajxpNodeLeaf)>div>div.overlay_icon_div{display:none}#cpane_container{left:200px}#search_meta.toggle_open{margin-left:-200px;width:200px}.breadcrumbs-arrow span.reduced.first-bread,.breadcrumbs-one span.reduced.first-bread{width:121px;white-space:nowrap;text-overflow:ellipsis}div#dl_toolbar{margin:220px auto!important;width:300px!important}#ajxp_unique_dl a#share_current_page_button{padding:10px!important}}@media only screen and (max-width :420px){#topPane,#userdashboard_myparams_title,div.repository_legend{display:none}#topPane{width:0}#cpane_container{left:0}#simple_repository_label{display:none;font-size:12px;width:100%!important;padding:0 20px;height:auto}#workspace_toolbar,div#userdashboard_main_tab.horizontal_tabulator div.tabulatorContainer{padding-top:0}#buttons_bar_cont{margin-left:0}.tabulatorContainer.panelHeader.icons_only{width:37px}#userdashboard_main_tab.horizontal_tabulator div.tabulatorContainer{width:40px!important;flex:0 0 40px;-webkit-flex:0 0 40px}div#userdashboard_main_tab.horizontal_tabulator span.toggleHeader{text-align:left;padding:8px 12px;color:#fff!important;border:0;display:block;font-size:20px;font-weight:lighter;text-transform:uppercase;margin:0}div.dialogBox{min-width:99%}div.dialogContent div.SF_element{margin:0 10px}#login_form,#login_form_dynamic{margin:0}#login_form div.SF_element,#login_form_dynamic div.SF_element{padding-left:0!important}#global_toolbar{z-index:1000}}
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/allz_list.txt b/core/src/plugins/gui.ajax/res/themes/orbit/css/allz_list.txt
index dc017977ee..1d0ae5101f 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/allz_list.txt
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/allz_list.txt
@@ -1,4 +1,4 @@
 themes/orbit/css/pydio.css
 themes/orbit/css/animate-custom.css
 themes/orbit/css/chosen.css#NO_MINI
-themes/orbit/css/media.css#NO_MINI
+themes/orbit/css/media.css#NO_MINI
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/animate-custom.css b/core/src/plugins/gui.ajax/res/themes/orbit/css/animate-custom.css
index 2b59bb117f..c12633e61a 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/animate-custom.css
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/animate-custom.css
@@ -11,8 +11,8 @@
 }
 
 .animated.long {
-    -webkit-animation-duration: 2s;
-    animation-duration: 2s;
+    -webkit-animation-duration: 0.5s;
+    animation-duration: 0.5s;
 }
 
 @-webkit-keyframes fadeIn {
@@ -97,7 +97,7 @@
 @-webkit-keyframes fadeInUpBig {
 	0% {
 		opacity: 0;
-		-webkit-transform: translateY(2000px);
+		-webkit-transform: translateY(400px);
 	}
 	
 	100% {
@@ -109,7 +109,7 @@
 @-moz-keyframes fadeInUpBig {
 	0% {
 		opacity: 0;
-		-moz-transform: translateY(2000px);
+		-moz-transform: translateY(400px);
 	}
 	
 	100% {
@@ -121,7 +121,7 @@
 @-o-keyframes fadeInUpBig {
 	0% {
 		opacity: 0;
-		-o-transform: translateY(2000px);
+		-o-transform: translateY(400px);
 	}
 	
 	100% {
@@ -133,7 +133,7 @@
 @keyframes fadeInUpBig {
 	0% {
 		opacity: 0;
-		transform: translateY(2000px);
+		transform: translateY(400px);
 	}
 	
 	100% {
@@ -156,7 +156,7 @@
 	
 	100% {
 		opacity: 0;
-		-webkit-transform: translateY(2000px);
+		-webkit-transform: translateY(400px);
 	}
 }
 
@@ -168,7 +168,7 @@
 	
 	100% {
 		opacity: 0;
-		-moz-transform: translateY(2000px);
+		-moz-transform: translateY(400px);
 	}
 }
 
@@ -180,7 +180,7 @@
 	
 	100% {
 		opacity: 0;
-		-o-transform: translateY(2000px);
+		-o-transform: translateY(400px);
 	}
 }
 
@@ -192,7 +192,7 @@
 	
 	100% {
 		opacity: 0;
-		transform: translateY(2000px);
+		transform: translateY(400px);
 	}
 }
 
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/base/body.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/base/body.less
index b2c76bb2a5..f8426a0237 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/base/body.less
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/base/body.less
@@ -28,7 +28,8 @@ body, html
 {
   margin: 0;
   padding: 0;
-  background-color: #333;
+  background-color: #fcfcff;
+  overflow-x: hidden;
 }
 
 *{
@@ -39,13 +40,16 @@ body, html
 }
 
 input, textarea, .selectable{
-  font-family: @fontStandard;
   -moz-user-select: text;
   -khtml-user-select: auto;
   -webkit-user-select: auto;
   user-select: auto;
 }
 
+input{
+  font-weight: 300;
+}
+
 *::-moz-focus-inner {
   border: none;
 }
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/chosen.css b/core/src/plugins/gui.ajax/res/themes/orbit/css/chosen.css
index 3eb67e556c..7d026d4c9a 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/chosen.css
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/chosen.css
@@ -192,7 +192,7 @@ This file is generated by `grunt build`, do not edit it by hand.
   display: list-item;
   font-weight: bold;
   cursor: default;
-  font-family: "Open Sans Regular";
+  font-family: Roboto;
   text-transform: uppercase;
 }
 .chosen-container .chosen-results li.group-option {
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/activity.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/activity.less
index 2a46531c77..5d64295690 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/activity.less
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/activity.less
@@ -14,7 +14,8 @@
   width:20%;
 
   div.dialogContent {
-    border-radius: 10px;
+    border-radius: 2px;
+    padding: 30px;
     box-shadow: @activity_box_shadow;
   }
   span.click_anywhere {
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/complete.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/complete.less
index bb24c32a7e..1103debc67 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/complete.less
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/complete.less
@@ -32,3 +32,58 @@ div.autocomplete
     }
   }
 }
+
+@width0: 300px;
+div.react-autosuggest {
+  padding-left: 1px;
+  li.react-autosuggest__suggestion{
+    display: block;
+  }
+  .react-autosuggest__suggestion--focused {
+    background-color: aliceblue;
+  }
+  input.react-autosuggest__input {
+    width: @width0;
+  }
+  .react-autosuggest__suggestions {
+    background-color: white;
+    box-shadow: 1px 1px 5px rgba(0,0,0,0.63);
+    display: block;
+    margin-top: 1px;
+    max-height: 300px;
+    overflow-y: auto;
+    position: absolute;
+    width: @width0;
+    z-index: 20;
+    .list-force-hide &{
+      display: none !important;
+    }
+  }
+  input#users-autosuggest {
+    font-size: 18px;
+    padding-bottom: 9px !important;
+    padding-left: 4px !important;
+  }
+  input#pydioform-autosuggest{
+    font-size: 16px;
+    padding-bottom: 5px !important;
+    border-bottom: 1px solid #e0e0e0;
+    &:focus{
+      border-bottom: 2px solid @primary-1-color;
+    }
+  }
+}
+
+div.pydioform_autocomplete{
+  .suggest-search{
+    position: absolute;
+    right:36px;
+    padding-top: 2px;
+    color: #e0e0e0;
+  }
+  .react-autosuggest__suggestions li{
+    padding: 8px 6px;
+    font-size: 16px;
+    cursor: pointer;
+  }
+}
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/dialog.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/dialog.less
index 2b68253848..79b1621a67 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/dialog.less
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/dialog.less
@@ -215,6 +215,10 @@ div.shadow_class
       margin-right: 0;
       width: auto;
     }
+    .react-mui-context .mui-enhanced-switch .mui-enhanced-switch-input{
+      width: 100%;
+      height: 100%;
+    }
 
     select {
       border-radius: @dialog_fields_border_radius;
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/dragdrop.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/dragdrop.less
index bb4a7a72d2..72903bd904 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/dragdrop.less
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/dragdrop.less
@@ -13,15 +13,22 @@ div.multiple_selection_draggable
   display: block;
   color: #000;
   background-color: @dnd_draggable_bg_color;
-  padding: 5px;
+  padding: 8px;
+  box-shadow: @reactBoxShadowDepthMini;
   border: @dnd_draggable_border;
   font-size: 12px;
   cursor:default;
   overflow:hidden;
   border-radius: 3px;
-}
-
-div.selection_ctrl_key
-{
-  background: url('@{imagePath}0.gif') no-repeat bottom right;
-}
+  line-height: 20px;
+  &.selection_ctrl_key{
+    &:before{
+      font-family: FontAwesome;
+      content: "\f067";
+      display: block;
+      position: absolute;
+      bottom:5px;
+      right: 5px;
+    }
+  }
+}
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/forms.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/forms.less
index 68c93cc0dd..2529c05c76 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/forms.less
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/forms.less
@@ -297,23 +297,32 @@ select.SF_input {
   max-width: 490px;
 }
 .SF_replication_Add {
-  background: url('@{imagePath}0.gif') no-repeat 5px 6px;
-  bottom: 0;
+  bottom: -2px;
   display: block;
   height: 20px;
-  left: 0;
+  left: 5px;
   position:absolute;
   width: 20px;
+  cursor: pointer;
+  color: @primary-1-color;
+  font-family: FontAwesome;
+  &:before{
+    content: "\f067";
+  }
 }
 .SF_replication_Remove {
-  background: url('@{imagePath}1.gif') no-repeat 5px 6px;
-  bottom: 0;
+  font-family: FontAwesome;
   display: block;
   height: 20px;
-  left: 0;
+  left: 5px;
   position:absolute;
-  top: 0;
+  top: 5px;
   width: 20px;
+  cursor: pointer;
+  color: @primary-1-color;
+  &:before{
+    content: "\f068";
+  }
 }
 .SF_rgClear {
   clear:left;
@@ -326,6 +335,9 @@ select.SF_input {
 .SF_image.small {
   max-height: 80px;
   max-width: 80px;
+  &[src*="default_avatar"]{
+    background-color: #B0BEC5;
+  }
 }
 #user_profile_form {
   img.SF_image.small {
@@ -423,7 +435,6 @@ select.SF_input {
         border-radius: 0;
         border: 0;
         font-size: 14px;
-        margin:1px 0 0 0;
         padding: 4px 1% 0 0 !important;
         border-bottom: 1px solid #dddddd;
       }
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/infopanel.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/infopanel.less
index ba21964b74..b2bd8e15e5 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/infopanel.less
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/infopanel.less
@@ -6,7 +6,7 @@
 @infopanel_values_color:#555;
 @infopanel_quick_button_border:1px dotted #999;
 
-@infopanel_fetchedpane_text_color: #222;
+@infopanel_fetchedpane_text_color: #666;
 @infopanel_fetchedpane_legend_color: #666;
 
 @infopanel_toolbar_buttons_radius:0;
@@ -119,20 +119,18 @@
 
   div.class-FetchedResultPane{
 
-    font-size: 13px;
     div.thumbnail_selectable_cell.detailed{
-      padding: 0;
+      padding: 0 0 16px;
       cursor: default;
       div.thumbnail_selectable_cell{
         display: none;
       }
       div.thumbLabel{
-        font-size: 1.1em;
+        font-size: 15px;
         color: @infopanel_fetchedpane_text_color;
         white-space: normal;
-        line-height: 1.5em;
         padding-top: 0;
-        padding-bottom: 8px;
+        font-weight: 400;
         small {
           color: @infopanel_fetchedpane_legend_color;
           display: block;
@@ -140,6 +138,28 @@
           line-height: 15px;
         }
       }
+      div.thumbnail_cell_metadata{
+        display: block;
+        opacity: 0.9;
+        .metadata_chunk.metadata_chunk_description{
+          font-size: 12px;
+          opacity: 1 !important;
+          color: @infopanel_fetchedpane_legend_color !important;
+          white-space: normal;
+        }
+        .metadata_chunk.metadata_chunk_standard{
+          display: none;
+        }
+      }
+      &.selected-focus{
+        div.thumbnail_cell_metadata{
+          opacity: 0.9;
+        }
+        div.thumbLabel{
+          color: @infopanel_fetchedpane_text_color;
+          font-weight: 400;
+        }
+      }
     }
     &.leaf_activity div.thumbnail_selectable_cell.detailed div.thumbLabel
     {
@@ -175,7 +195,7 @@
   }
   .infopanel_loading{
     opacity: 0;
-    transition: opacity ease 0.2s;
+    transition: opacity ease 0.1s;
   }
   .infopanel_loading_finished{
     opacity: 1;
@@ -262,25 +282,35 @@
       text-align: center;
       border-radius: 0;
       box-shadow: @reactBoxShadowDepthMini;
+      div.tile_preview_container{
+        display: flex;
+        align-items: center;
+        height: 60px;
+        div.tile_preview{
+          margin: auto;
+          .mimefont{
+            color: @thumbnail_mimefont_color;
+          }
+          img {
+            max-width: 90%;
+            max-height: 60px;
+          }
+        }
+      }
+      div.tile_label {
+        position: absolute;
+        bottom: 1px;
+        font-size: 0.7em;
+        overflow: hidden;
+        width: 89%;
+        text-overflow: ellipsis;
+        padding: 2px 2px 0;
+        text-align: center;
+        color: #646464;
+        white-space: nowrap;
+      }
     }
 
-    .info_panel_multiple_tile div.tile_preview img {
-      max-width: 90%;
-      max-height: 60px;
-    }
-
-    .info_panel_multiple_tile div.tile_label {
-      position: absolute;
-      bottom: 1px;
-      font-size: 0.7em;
-      overflow: hidden;
-      width: 89%;
-      text-overflow: ellipsis;
-      padding: 2px 2px 0;
-      text-align: center;
-      color: #646464;
-      white-space: nowrap;
-    }
 
     div.toolbar_placeholder{
       margin-top: 25px;
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/leftpanel.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/leftpanel.less
index c444370f3d..8078188741 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/leftpanel.less
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/leftpanel.less
@@ -141,12 +141,15 @@
         font-size: 1.2em;
       }
       .material-list-text{
-        .nav-list-entry-label();
+        flex: 1;
+        overflow: hidden;
+        .material-list-line-1 > div{
+          .nav-list-entry-label();
+        }
       }
       .material-list-actions{
-        position:absolute;
-        right: 16px;
-        opacity: 0.5;
+        padding: 0 12px 0 6px;
+        opacity: 0.1;
         &:hover{
           opacity: 1;
         }
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/loader.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/loader.less
index 2e530b3268..2f2db1f40a 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/loader.less
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/loader.less
@@ -114,3 +114,201 @@
   }
 
 }
+
+.radial-progress{
+
+  display: inline-block;
+
+  .size(@w, @h) {
+    height: @h;
+    width: @w;
+  }
+
+  *,
+  *:before,
+  *:after {
+    box-sizing: border-box;
+  }
+
+  .charts-container:after {
+    clear: both;
+    content: "";
+    display: table;
+  }
+
+  @bg: #ffffff;
+  @pie-main: @teal-500;
+  @size: 16px;
+
+  .pie-wrapper {
+    .size(@size, @size);
+    float: left;
+    margin: 13px 8px 0 0;
+    position: relative;
+
+    &:nth-child(3n+1) {
+      clear: both;
+    }
+
+    .pie {
+      .size(100%, 100%);
+      clip: rect(0, @size, @size, @size / 2);
+      left: 0;
+      position: absolute;
+      top: 0;
+
+      .half-circle {
+        .size(100%, 100%);
+        border: @size / 10 solid #3498db;
+        border-radius: 50%;
+        clip: rect(0, @size / 2, @size, 0);
+        left: 0;
+        position: absolute;
+        top: 0;
+      }
+    }
+
+    .label {
+      @font-size: @size / 4;
+      @font-size-redo: @size * 4;
+
+      background: @bg;
+      border-radius: 50%;
+      bottom: @font-size-redo / 10;
+      color: #ecf0f1;
+      cursor: default;
+      display: block;
+      font-size: @font-size;
+      left: @font-size-redo / 10;
+      line-height: @font-size-redo * .65;
+      position: absolute;
+      right: @font-size-redo / 10;
+      text-align: center;
+      top: @font-size-redo / 10;
+
+      .smaller {
+        color: #bdc3c7;
+        font-size: .45em;
+        padding-bottom: 20px;
+        vertical-align: super;
+      }
+    }
+
+    .shadow {
+      .size(100%, 100%);
+      border: @size / 10 solid #bdc3c7;
+      border-radius: 50%;
+    }
+
+    &.style-2 {
+      .label {
+        background: none;
+        color: #7f8c8d;
+
+        .smaller {
+          color: #bdc3c7;
+        }
+      }
+    }
+
+    &.progress-30 {
+      .draw-progress(30, #3498db);
+    }
+
+    &.progress-60 {
+      .draw-progress(60, #9b59b6);
+    }
+
+    &.progress-90 {
+      .draw-progress(90, #e67e22);
+    }
+
+    &.progress-45 {
+      .draw-progress(45, #1abc9c);
+    }
+
+    &.progress-75 {
+      .draw-progress(75, #8e44ad);
+    }
+
+    &.progress-95 {
+      .draw-progress(95, #e74c3c);
+    }
+  }
+
+  .pie-wrapper--solid {
+    border-radius: 50%;
+    overflow: hidden;
+
+    &:before {
+      border-radius: 0 100% 100% 0 / 50%;
+      content: '';
+      display: block;
+      height: 100%;
+      margin-left: 50%;
+      transform-origin: left;
+    }
+
+    .label {
+      background: transparent;
+    }
+
+    // GENERATE ALL VALUES FROM 1 to 100
+    .loop(@name, @progressValue) when (@progressValue <= 100){
+      .loop(@name; (@progressValue + 1));
+      &.@{name}-@{progressValue} { .draw-progress--solid(@progressValue, @pie-main, @bg); }
+    }
+    .loop(progress, 0);
+  }
+
+  // --
+  .draw-progress(@progress, @color) when (@progress <= 50) {
+    .pie {
+      .right-side {
+        display: none;
+      }
+    }
+  }
+
+  .draw-progress(@progress, @color) when (@progress > 50) {
+    .pie {
+      clip: rect(auto, auto, auto, auto);
+
+      .right-side {
+        transform: rotate(180deg);
+      }
+    }
+  }
+
+  .draw-progress(@progress, @color) {
+    .pie {
+      .half-circle {
+        border-color: @color;
+      }
+
+      .left-side {
+        @rotate: @progress * 3.6;
+        transform: rotate(~'@{rotate}deg');
+      }
+    }
+  }
+
+  .draw-progress--solid(@progress, @color, @bg) when (@progress <= 50) {
+    &:before {
+      background: @bg;
+      transform: rotate((100 - (50 - @progress)) / 100 * 360deg * -1);
+    }
+  }
+
+  .draw-progress--solid(@progress, @color, @bg) when (@progress > 50) {
+    &:before {
+      background: @color;
+      transform: rotate((100 - @progress) / 100 * 360deg);
+    }
+  }
+
+  .draw-progress--solid(@progress, @color, @bg) {
+    background: linear-gradient(to right, @color 50%, @bg 50%);
+  }
+}
+
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/searchengine.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/searchengine.less
index 66c38623ca..a2f2b20233 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/searchengine.less
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/searchengine.less
@@ -113,7 +113,7 @@
       display: none;
     }
 
-    div#search_show_all{
+    div.results-parser-filter{
       text-align: center;
       font-size: 12px;
       color: #747474;
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/selectablelist.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/selectablelist.less
index 89e2899a12..95893cf1a6 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/selectablelist.less
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/selectablelist.less
@@ -488,6 +488,18 @@
   /*******************************************/
   /* INLINE PROGRESS BAR INSIDE FILE LIST    */
   /*******************************************/
+  .partSizeRender{
+    display: inline-block;
+    width: 80px;
+    height: 20px;
+    background-image: url('@{imagePath}dl_bg.png');
+    background-repeat: no-repeat;
+    background-size: 0 100%;
+    font-size: 14px;
+    border: 1px solid rgba(0, 0, 0, 0.09);
+    color: rgba(0,0,0,0.87);
+  }
+
   .pg_cancel_button{
     background-color: #C33;
     display: inline-block;
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/slider.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/slider.less
index f0c530992f..ace622e19c 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/slider.less
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/slider.less
@@ -7,33 +7,27 @@
 .slider-pane{
 
   background-color: @slider_background_color;
-  padding: 5px 2px;
+  padding: 10px 2px;
   position:absolute;
-  width:11px;
+  width:22px;
   z-index:10000;
   border-radius: 2px;
   box-shadow: @slider_box_shadow;
-
-}
-
-.slider-handle,
-.slider-pane div.selected
-{
-  background-image: url('@{imagePath}slider-handle-vert.png') !important;
-  background-position:top center;
-  background-repeat: no-repeat !important;
-  background-color: transparent !important;
-  height:15px;
-  width:10px;
-}
-
-.slider-tracker {
-  background-image : url("@{imagePath}slider-track-bottom.png");
-  background-position:bottom center;
-  background-repeat:no-repeat;
-}
-
-.slider-tracker-top {
-  background-position:top center;
-  background-repeat:no-repeat;
+  .slider-tracker {
+    background-color: @primary-1-color;
+    width: 2px !important;
+    margin-left: 10px;
+    .slider-handle
+    {
+      background-color: @primary-1-color !important;
+      height: 10px;
+      width: 10px;
+      margin-left: -4px;
+      border-radius: 50%;
+      cursor: pointer;
+    }
+    .slider-tracker-top {
+      display: none;
+    }
+  }
 }
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/spinner.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/spinner.less
index 800fc06bf8..17f9c84a96 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/spinner.less
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/spinner.less
@@ -20,7 +20,7 @@
   to { -o-transform:rotate(360deg); }
 }
 
-.rotating, .icon-spinner {
+.rotating, .icon-spinner, .mdi.mdi-radar{
   -webkit-transform-origin: 50% 50%;
   -webkit-animation-name: rotate;
   -webkit-animation-duration: 1.0s;
@@ -47,6 +47,10 @@
   display: block !important;
   text-align: center;
 }
+.mdi.mdi-radar{
+  display: inline-block;
+  text-align: center;
+}
 
 .icon-spinner.spinner_large{
   font-size: 22px;
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/splitter.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/splitter.less
index 8996f40b4d..5d930eb099 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/splitter.less
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/splitter.less
@@ -25,9 +25,6 @@
 
 .hsplitbar{
   height: 4px;
-  background-image: url('@{imagePath}hgrabber.gif');
-  background-repeat: no-repeat;
-  background-position: center;
   z-index: 1014;
   &.active{
     background-color: @splitter_activebar_color;
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/tasks.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/tasks.less
new file mode 100644
index 0000000000..1b859c42d4
--- /dev/null
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/tasks.less
@@ -0,0 +1,49 @@
+@pydio-task-panel-height: 60px;
+@pydio-task-panel-width: 356px;
+@pydio-task-panel-margin: 20px;
+
+div.pydio-tasks-panel{
+  position: absolute;
+  width: @pydio-task-panel-width;
+  height: @pydio-task-panel-height;
+  bottom: @pydio-task-panel-margin;
+  right: @pydio-task-panel-margin;
+  overflow-y: auto;
+  overflow-x: hidden;
+  background-color: white;
+  box-shadow: @reactBoxShadowDepth1;
+  z-index: 20001;
+  transition: @bezier_transition;
+  &.invisible{
+    right: -@pydio-task-panel-width - 5px;
+  }
+  div.task{
+    padding: 10px;
+    border-bottom: 1px solid #f2f2f2;
+    display: flex;
+    flex-direction: row;
+    .task_texts{
+      flex: 5;
+      max-width: @pydio-task-panel-width - 60px;
+      div{
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+      }
+    }
+    .task_actions{
+      cursor: pointer;
+      > span{
+        display: inline-block;
+        margin-top: 15px;
+        margin-left: 10px;
+        color: @teal-500;
+      }
+    }
+    &.task-status-8{ /* error status */
+      .task_texts .status_message, .task_actions > span{
+        color: #d32f2f;
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/tooltips.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/tooltips.less
index 650ffa9a95..43a67ac69c 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/tooltips.less
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/tooltips.less
@@ -1,8 +1,8 @@
-@tooltip_background_color:rgba(69, 77, 85, 0.86);
+@tooltip_background_color:rgba(69, 77, 85, 0.72);
 @tooltip_border_color:rgba(0,0,0,0);
 @tooltip_font_color:@white;
-@tooltip_font_size:13px;
-@tooltip_title_font_size:1.1em;
+@tooltip_font_size:12px;
+@tooltip_title_font_size:14px;
 
 .tooltipped
 {
@@ -11,18 +11,20 @@
 .simple_tooltip
 {
   position: absolute;
-  width: 150px;
+  width: 210px;
   z-index: 10000;
+  font-weight: 300;
+  line-height: 19px;
   font-size: @tooltip_font_size;
-  padding: 5px 10px;
+  padding: 8px 11px;
   &_observer {
     cursor: help;
   }
   &_title{
-    padding-top: 2px;
-    padding-bottom: 1px;
-    text-transform: uppercase;
-    font-weight: bold;
+    padding-top: 1px;
+    padding-bottom: 6px;
+    border-bottom: 1px solid rgba(255, 255, 255, 0.7);
+    margin-bottom: 6px;
     font-size: @tooltip_title_font_size;
   }
 }
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/tree.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/tree.less
index 67c4002c44..3ba3b70d43 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/tree.less
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/tree.less
@@ -281,6 +281,10 @@ div.treeCopyContainer div.selected-webfx-tree-item-inactive a
       padding: 0 0 0 8px !important;
       font-size: 11px !important;
       opacity: 0.73;
+      &.mdi-radar{
+        padding: 0 !important;
+        margin: 0 5px !important;
+      }
     }
   }
   &.selected-webfx-tree-item{
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/uploaders.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/uploaders.less
index 0d9252ffbb..e3645c36b1 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/uploaders.less
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/uploaders.less
@@ -21,8 +21,37 @@ div#upload_files_list, div#multiple_download_container
   overflow: auto;
   height: 350px;
   text-align: left;
-  border-radius: 2px;
-  background-color: rgba(239, 239, 239, 0.52);
+  border-radius: 1px;
+}
+
+div#multi_download_form{
+  a#dl_form_submit{
+    border-radius: 2px;
+    display: inline-block;
+    margin-top: 4px;
+    margin-left: 5px;
+    padding: 5px 12px;
+    cursor: pointer;
+    font-weight: 500;
+    font-size: 15px;
+    color: #009688;
+    text-transform: uppercase;
+    &:hover{
+      background-color: #bffff9;
+    }
+  }
+}
+
+div#multiple_download_container{
+  width: 100%;
+  a{
+    font-size: 16px;
+    span.mdi-download{
+      font-size: 14px;
+      display: inline-block;
+      margin-right: 5px;
+    }
+  }
 }
 
 .droparea {
@@ -74,46 +103,47 @@ div#upload_files_list, div#multiple_download_container
 
 }
 
-div#uploader_options_pane {
+div.upload-options-pane{
   position: absolute;
-  right: 10px;
+  top: 0;
+  right: 0;
   box-shadow: 0 1px 6px rgba(0, 0, 0, 0.16), 0 1px 6px rgba(0, 0, 0, 0.23);
-  background-color: white;
-  font-size: 11px;
-  height: 59px;
-  overflow: hidden;
-  padding: 12px 20px 20px;
-  text-align: right;
-  display: none;
-  margin-bottom: 11px;
-  margin-top: -2px;
-  margin-right: 2px;
-  z-index: 2;
+  padding: 16px;
+  .option-row{
+    padding: 8px 0;
+  }
+  .close-options{
+    float: right;
+    cursor: pointer;
+    display: inline-block;
+  }
+  .mui-radio-button{
+    margin: 12px 0;
+  }
 }
-div#total_files_list{
-  display:none !important;
+
+div.uploader-action-bar{
+  margin-bottom: 10px;
+  > button, > div{
+    margin-right: 5px;
+  }
 }
 
-div#uploader_options_pane input {
-  width: 15px;
-  margin-right: 0;
-  margin-left: 0;
-  margin-top: 5px;
+div#total_files_list{
+  display:none !important;
 }
 
 .dotted_container_item_mixin{
   overflow: hidden;
-  padding-top: 10px;
-  padding-bottom: 10px;
-  padding-left: 14px;
+  padding: 16px 14px;
   height: 20px;
   position: relative;
-  background-image: url('@{imagePath}/dl_bg.png');
+  background-image: url('@{imagePath}dl_bg.png');
   /*background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg'><rect x='0' y='0' width='100%' height='100%' stroke='transparent' fill='@{uploader_dialog_progress_color}' fill-opacity='1'/></svg>");*/
   background-repeat: no-repeat;
   background-size: 0 100%;
   font-size: 14px;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.09);
+  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
   color: rgba(0,0,0,0.87);
   rect{
     fill:@uploader_dialog_header_tint;
@@ -122,8 +152,58 @@ div#uploader_options_pane input {
 
 div#upload_files_list{
 
-  div {
+  border: 1px solid rgba(0,0,0,0.13);
+
+  > div {
     .dotted_container_item_mixin();
+    &.header{
+      padding: 8px 14px;
+      font-weight: 500;
+      font-size: 13px;
+      color: #636e75;
+      border-bottom: 0;
+    }
+    span.mdi.mdi-file, span.mdi.mdi-folder{
+      margin: 0 8px 0 0;
+    }
+    span.status, span.path{
+      font-size: 11px;
+      display: inline-block;
+      margin: 0 6px;
+      color: rgba(0,0,0,0.53);
+    }
+    span.stop-button{
+      cursor: pointer;
+      color: #6b7781;
+      float: right;
+      display: inline-block;
+      margin: 4px 10px;
+    }
+    div.uploader-pgbar{
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      background-color: @primary-1-color;
+      height: 2px;
+      width: 0;
+      transition: all 550ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;
+    }
+    &.section-processed, &.header{
+      display: none;
+    }
+    &.upload-error{
+      display: block;
+      color: #d32f2f;
+      span.status{
+        color: #d32f2f;
+      }
+    }
+  }
+
+  &.show-processed{
+    > div.section-processed, > div.header{
+      display: block;
+    }
   }
 
   span.item_relative_path{
@@ -131,10 +211,6 @@ div#upload_files_list{
     margin-left: 15px;
     font-size: 0.8em;
   }
-  img {
-    margin-right: 6px;
-  }
-
   img.fakeUploadButton {
     display: none;
   }
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/userwidget.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/userwidget.less
index ec4940bd44..cbb370f222 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/userwidget.less
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/userwidget.less
@@ -1,9 +1,13 @@
-@userwidget_font_color: @white;
-@userwidget_font_size:12px;
-@userwidget_font_weight:300;
+@userwidget_font_color: @topbar_buttons_color;
+@userwidget_font_color_hover: @topbar_buttons_color_hover;
+@userwidget_font_size:@topbar_buttons_font_size;
+@userwidget_font_weight:@topbar_buttons_font_weight;
 
 #logging_string {
   color:@userwidget_font_color;
+  &:hover{
+    color: @userwidget_font_color_hover;
+  }
   float: right;
   margin-top: 12px;
   div.inlineBarButtonLeft {
@@ -50,10 +54,10 @@
       display: inline-block;
       font-size: @userwidget_font_size;
       font-weight: @userwidget_font_weight;
-      padding: 6px 0 0 8px;
-      color: rgba(255,255,255,0.9);
+      padding: 4px 0 0 8px;
+      color: @userwidget_font_color;
       &:hover{
-        color: white;
+        color: @userwidget_font_color_hover;
       }
       img {
       }
@@ -63,7 +67,7 @@
     float: right;
     width: 39px;
     height: 39px;
-    margin-top: -14px;
+    margin-top: -12px;
     margin-left: 14px;
     border-radius: 100%;
     background-position: center center;
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/fonts/fontfaces.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/fonts/fontfaces.less
index 09db8b7e06..f638aabcdc 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/fonts/fontfaces.less
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/fonts/fontfaces.less
@@ -6,24 +6,6 @@
     font-style: normal;
 }
 
-@font-face{
-    font-family: 'Open Sans Regular';
-    src: url('@{fontsPath}open-sans-fontfacekit/opensans_regular/OpenSans-Regular-webfont.eot');
-    src: url('@{fontsPath}open-sans-fontfacekit/opensans_regular/OpenSans-Regular-webfont.eot?iefix') format('eot'),
-    url('@{fontsPath}open-sans-fontfacekit/opensans_regular/OpenSans-Regular-webfont.woff') format('woff'),
-    url('@{fontsPath}open-sans-fontfacekit/opensans_regular/OpenSans-Regular-webfont.ttf') format('truetype'),
-    url('@{fontsPath}open-sans-fontfacekit/opensans_regular/OpenSans-Regular-webfont.svg#webfont') format('svg');
-}
-
-@font-face{
-    font-family: 'Open Sans Light';
-    src: url('@{fontsPath}open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.eot');
-    src: url('@{fontsPath}open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.eot?iefix') format('eot'),
-    url('@{fontsPath}open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.woff') format('woff'),
-    url('@{fontsPath}open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.ttf') format('truetype'),
-    url('@{fontsPath}open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.svg#webfont') format('svg');
-}
-
 @font-face {
     font-family: 'Roboto';
     font-weight: 300;
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/fonts/mdi-subset.css b/core/src/plugins/gui.ajax/res/themes/orbit/css/fonts/mdi-subset.css
index d5c9a3d944..40c206afe1 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/fonts/mdi-subset.css
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/fonts/mdi-subset.css
@@ -68,6 +68,10 @@
     content: "\f250";
 }
 
+.mdi-radar:before {
+    content: "\f526";
+}
+
 .mdi-archive:before {
     content: "\f13a";
 }
@@ -166,3 +170,95 @@
 .mdi-qrcode-scan:before {
     content: "\f522";
 }
+
+.mdi-server-plus:before {
+    content: "\f57f";
+}
+
+.mdi-account:before {
+    content: "\f103";
+}
+
+.mdi-account-alert:before {
+    content: "\f104";
+}
+
+.mdi-account-box:before {
+    content: "\f105";
+}
+
+.mdi-account-box-outline:before {
+    content: "\f106";
+}
+
+.mdi-account-check:before {
+    content: "\f107";
+}
+
+.mdi-account-circle:before {
+    content: "\f108";
+}
+
+.mdi-account-convert:before {
+    content: "\f109";
+}
+
+.mdi-account-key:before {
+    content: "\f10a";
+}
+
+.mdi-account-location:before {
+    content: "\f10b";
+}
+
+.mdi-account-minus:before {
+    content: "\f10c";
+}
+
+.mdi-account-multiple:before {
+    content: "\f10d";
+}
+
+.mdi-account-multiple-outline:before {
+    content: "\f10e";
+}
+
+.mdi-account-multiple-plus:before {
+    content: "\f10f";
+}
+
+.mdi-account-network:before {
+    content: "\f110";
+}
+
+.mdi-account-off:before {
+    content: "\f111";
+}
+
+.mdi-account-outline:before {
+    content: "\f112";
+}
+
+.mdi-account-plus:before {
+    content: "\f113";
+}
+
+.mdi-account-remove:before {
+    content: "\f114";
+}
+
+.mdi-account-search:before {
+    content: "\f115";
+}
+
+.mdi-account-star:before {
+    content: "\f116";
+}
+
+.mdi-account-star-variant:before {
+    content: "\f117";
+}
+
+.mdi-account-switch:before {
+    content: "\f118";
+}
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/media.css b/core/src/plugins/gui.ajax/res/themes/orbit/css/media.css
index 56344449ee..c7ada58ab2 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/media.css
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/media.css
@@ -164,32 +164,6 @@ and (max-width : 420px){
         width: 37px;
     }
 
-    #userdashboard_myparams_title{
-        display: none;
-    }
-
-    #userdashboard_main_tab.horizontal_tabulator div.tabulatorContainer {
-        width: 40px !important;
-        flex: 0 0 40px;
-        -webkit-flex: 0 0 40px;
-    }
-
-    div#userdashboard_main_tab.horizontal_tabulator div.tabulatorContainer {
-        padding-top: 0;
-    }
-
-    div#userdashboard_main_tab.horizontal_tabulator span.toggleHeader {
-        text-align: left;
-        padding: 8px 12px;
-        color: #ffffff !important;
-        border: 0;
-        display: block;
-        font-size: 20px;
-        font-weight: lighter;
-        text-transform: uppercase;
-        margin: 0 0;
-    }
-
     div.dialogBox{
         min-width: 99%;
     }
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/modal.jpg b/core/src/plugins/gui.ajax/res/themes/orbit/css/modal.jpg
deleted file mode 100644
index 34eafe3d02..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/css/modal.jpg and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/pydio.css b/core/src/plugins/gui.ajax/res/themes/orbit/css/pydio.css
index aa72ea8431..037a017592 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/pydio.css
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/pydio.css
@@ -24,16 +24,6 @@
   font-weight: normal;
   font-style: normal;
 }
-@font-face {
-  font-family: 'Open Sans Regular';
-  src: url('../fonts/open-sans-fontfacekit/opensans_regular/OpenSans-Regular-webfont.eot');
-  src: url('../fonts/open-sans-fontfacekit/opensans_regular/OpenSans-Regular-webfont.eot?iefix') format('eot'), url('../fonts/open-sans-fontfacekit/opensans_regular/OpenSans-Regular-webfont.woff') format('woff'), url('../fonts/open-sans-fontfacekit/opensans_regular/OpenSans-Regular-webfont.ttf') format('truetype'), url('../fonts/open-sans-fontfacekit/opensans_regular/OpenSans-Regular-webfont.svg#webfont') format('svg');
-}
-@font-face {
-  font-family: 'Open Sans Light';
-  src: url('../fonts/open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.eot');
-  src: url('../fonts/open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.eot?iefix') format('eot'), url('../fonts/open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.woff') format('woff'), url('../fonts/open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.ttf') format('truetype'), url('../fonts/open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.svg#webfont') format('svg');
-}
 @font-face {
   font-family: 'Roboto';
   font-weight: 300;
@@ -86,7 +76,8 @@ body,
 html {
   margin: 0;
   padding: 0;
-  background-color: #333;
+  background-color: #fcfcff;
+  overflow-x: hidden;
 }
 * {
   -moz-user-select: -moz-none;
@@ -98,13 +89,15 @@ html {
 input,
 textarea,
 .selectable {
-  font-family: "Open Sans Light", "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
   -moz-user-select: text;
   -khtml-user-select: auto;
   -webkit-user-select: auto;
   -ms-user-select: auto;
       user-select: auto;
 }
+input {
+  font-weight: 300;
+}
 *::-moz-focus-inner {
   border: none;
 }
@@ -138,7 +131,7 @@ span.letter_badge {
   text-align: center;
   padding: 7px 0;
   font-size: 0.8em;
-  font-family: "Open Sans Regular", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+  font-family: Roboto, sans-serif;
 }
 .kbd {
   padding: .1em .6em;
@@ -591,6 +584,10 @@ div.treeCopyContainer div.selected-webfx-tree-item-inactive a {
   font-size: 11px !important;
   opacity: 0.73;
 }
+.webfx-tree-item div.overlay_icon_div span.overlay-class-span.mdi-radar {
+  padding: 0 !important;
+  margin: 0 5px !important;
+}
 .webfx-tree-item.selected-webfx-tree-item div.overlay_icon_div span.overlay-class-span {
   color: white !important;
 }
@@ -780,7 +777,7 @@ div.treeCopyContainer div.selected-webfx-tree-item-inactive a {
   background-color: #fdfce4;
 }
 .class-FilesList.fl-displayMode-list .table_rows_container span#ajxp_label {
-  font-family: "Open Sans Regular", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+  font-family: Roboto, sans-serif;
 }
 .class-FilesList.fl-displayMode-thumb div.thumbnail_selectable_cell {
   margin: 1px;
@@ -998,6 +995,17 @@ div.treeCopyContainer div.selected-webfx-tree-item-inactive a {
 .class-FilesList.fl-showFilterPane div.sort-table-filter {
   display: block;
 }
+.class-FilesList .partSizeRender {
+  display: inline-block;
+  width: 80px;
+  height: 20px;
+  background-image: url('../images/dl_bg.png');
+  background-repeat: no-repeat;
+  background-size: 0 100%;
+  font-size: 14px;
+  border: 1px solid rgba(0, 0, 0, 0.09);
+  color: rgba(0, 0, 0, 0.87);
+}
 .class-FilesList .pg_cancel_button {
   background-color: #C33;
   display: inline-block;
@@ -1289,23 +1297,32 @@ select.SF_input {
   max-width: 490px;
 }
 .SF_replication_Add {
-  background: url('../images/0.gif') no-repeat 5px 6px;
-  bottom: 0;
+  bottom: -2px;
   display: block;
   height: 20px;
-  left: 0;
+  left: 5px;
   position: absolute;
   width: 20px;
+  cursor: pointer;
+  color: #009688;
+  font-family: FontAwesome;
+}
+.SF_replication_Add:before {
+  content: "\f067";
 }
 .SF_replication_Remove {
-  background: url('../images/1.gif') no-repeat 5px 6px;
-  bottom: 0;
+  font-family: FontAwesome;
   display: block;
   height: 20px;
-  left: 0;
+  left: 5px;
   position: absolute;
-  top: 0;
+  top: 5px;
   width: 20px;
+  cursor: pointer;
+  color: #009688;
+}
+.SF_replication_Remove:before {
+  content: "\f068";
 }
 .SF_rgClear {
   clear: left;
@@ -1319,6 +1336,9 @@ select.SF_input {
   max-height: 80px;
   max-width: 80px;
 }
+.SF_image.small[src*="default_avatar"] {
+  background-color: #B0BEC5;
+}
 #user_profile_form img.SF_image.small {
   border-radius: 40px;
 }
@@ -1412,7 +1432,6 @@ select.SF_input {
   border-radius: 0;
   border: 0;
   font-size: 14px;
-  margin: 1px 0 0 0;
   padding: 4px 1% 0 0 !important;
   border-bottom: 1px solid #dddddd;
 }
@@ -1638,6 +1657,10 @@ div.shadow_class {
   margin-right: 0;
   width: auto;
 }
+.dialogBox .dialogContent .react-mui-context .mui-enhanced-switch .mui-enhanced-switch-input {
+  width: 100%;
+  height: 100%;
+}
 .dialogBox .dialogContent select {
   border-radius: 0;
   background-color: #ffffff;
@@ -1685,7 +1708,8 @@ div.shadow_class {
   width: 20%;
 }
 #activity_monitor_warning div.dialogContent {
-  border-radius: 10px;
+  border-radius: 2px;
+  padding: 30px;
   box-shadow: 1px 1px 46px rgba(0, 0, 0, 0.67);
 }
 #activity_monitor_warning span.click_anywhere {
@@ -1749,24 +1773,26 @@ div.shadow_class {
 }
 .simple_tooltip {
   position: absolute;
-  width: 150px;
+  width: 210px;
   z-index: 10000;
-  font-size: 13px;
-  padding: 5px 10px;
+  font-weight: 300;
+  line-height: 19px;
+  font-size: 12px;
+  padding: 8px 11px;
 }
 .simple_tooltip_observer {
   cursor: help;
 }
 .simple_tooltip_title {
-  padding-top: 2px;
-  padding-bottom: 1px;
-  text-transform: uppercase;
-  font-weight: bold;
-  font-size: 1.1em;
+  padding-top: 1px;
+  padding-bottom: 6px;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.7);
+  margin-bottom: 6px;
+  font-size: 14px;
 }
 .down_arrow_tip,
 .top_arrow_tip {
-  background: rgba(69, 77, 85, 0.86);
+  background: rgba(69, 77, 85, 0.72);
   color: #ffffff;
   border: 0;
   border-radius: 2px;
@@ -1780,7 +1806,7 @@ div.shadow_class {
   position: absolute;
   pointer-events: none;
   border-color: rgba(0, 0, 0, 0);
-  border-top-color: rgba(69, 77, 85, 0.86);
+  border-top-color: rgba(69, 77, 85, 0.72);
   border-width: 5px;
   left: 50%;
   margin-left: -5px;
@@ -1799,7 +1825,7 @@ div.shadow_class {
 }
 .top_arrow_tip:after {
   border-color: rgba(111, 123, 136, 0);
-  border-bottom-color: rgba(69, 77, 85, 0.86);
+  border-bottom-color: rgba(69, 77, 85, 0.72);
   border-width: 5px;
   left: 50%;
   margin-left: -5px;
@@ -1810,7 +1836,7 @@ div.shadow_class {
 .right_arrow_tip {
   color: #ffffff;
   border-radius: 4px;
-  background-color: rgba(69, 77, 85, 0.86);
+  background-color: rgba(69, 77, 85, 0.72);
   border: 0;
 }
 .right_arrow_tip:after,
@@ -1825,14 +1851,14 @@ div.shadow_class {
 }
 .right_arrow_tip:after {
   border-color: rgba(0, 0, 0, 0);
-  border-left-color: rgba(69, 77, 85, 0.86);
+  border-left-color: rgba(69, 77, 85, 0.72);
   border-width: 5px;
   top: 50%;
   margin-top: -5px;
 }
 .right_arrow_tip:before {
   border-color: rgba(0, 0, 0, 0);
-  border-left-color: rgba(69, 77, 85, 0.86);
+  border-left-color: rgba(69, 77, 85, 0.72);
   border-width: 5px;
   top: 50%;
   margin-top: -5px;
@@ -1840,7 +1866,7 @@ div.shadow_class {
 .left_arrow_tip {
   color: #ffffff;
   border-radius: 4px;
-  background-color: rgba(69, 77, 85, 0.86);
+  background-color: rgba(69, 77, 85, 0.72);
   border: 0;
 }
 .left_arrow_tip:after,
@@ -1855,7 +1881,7 @@ div.shadow_class {
 }
 .left_arrow_tip:before {
   border-color: rgba(0, 0, 0, 0);
-  border-right-color: rgba(69, 77, 85, 0.86);
+  border-right-color: rgba(69, 77, 85, 0.72);
   border-width: 5px;
   top: 50%;
   left: -10px;
@@ -1923,6 +1949,56 @@ div.autocomplete ul li {
 div.autocomplete ul li.selected {
   background-color: aliceblue !important;
 }
+div.react-autosuggest {
+  padding-left: 1px;
+}
+div.react-autosuggest li.react-autosuggest__suggestion {
+  display: block;
+}
+div.react-autosuggest .react-autosuggest__suggestion--focused {
+  background-color: aliceblue;
+}
+div.react-autosuggest input.react-autosuggest__input {
+  width: 300px;
+}
+div.react-autosuggest .react-autosuggest__suggestions {
+  background-color: white;
+  box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.63);
+  display: block;
+  margin-top: 1px;
+  max-height: 300px;
+  overflow-y: auto;
+  position: absolute;
+  width: 300px;
+  z-index: 20;
+}
+.list-force-hide div.react-autosuggest .react-autosuggest__suggestions {
+  display: none !important;
+}
+div.react-autosuggest input#users-autosuggest {
+  font-size: 18px;
+  padding-bottom: 9px !important;
+  padding-left: 4px !important;
+}
+div.react-autosuggest input#pydioform-autosuggest {
+  font-size: 16px;
+  padding-bottom: 5px !important;
+  border-bottom: 1px solid #e0e0e0;
+}
+div.react-autosuggest input#pydioform-autosuggest:focus {
+  border-bottom: 2px solid #009688;
+}
+div.pydioform_autocomplete .suggest-search {
+  position: absolute;
+  right: 36px;
+  padding-top: 2px;
+  color: #e0e0e0;
+}
+div.pydioform_autocomplete .react-autosuggest__suggestions li {
+  padding: 8px 6px;
+  font-size: 16px;
+  cursor: pointer;
+}
 a.carousel-control {
   border-left: 1px solid #c4c7c1;
   border-right: 1px solid #c4c7c1;
@@ -1956,8 +2032,33 @@ div#multiple_download_container {
   overflow: auto;
   height: 350px;
   text-align: left;
+  border-radius: 1px;
+}
+div#multi_download_form a#dl_form_submit {
   border-radius: 2px;
-  background-color: rgba(239, 239, 239, 0.52);
+  display: inline-block;
+  margin-top: 4px;
+  margin-left: 5px;
+  padding: 5px 12px;
+  cursor: pointer;
+  font-weight: 500;
+  font-size: 15px;
+  color: #009688;
+  text-transform: uppercase;
+}
+div#multi_download_form a#dl_form_submit:hover {
+  background-color: #bffff9;
+}
+div#multiple_download_container {
+  width: 100%;
+}
+div#multiple_download_container a {
+  font-size: 16px;
+}
+div#multiple_download_container a span.mdi-download {
+  font-size: 14px;
+  display: inline-block;
+  margin-right: 5px;
 }
 .droparea {
   background: url("../../../../../../index.php?get_action=get_drop_bg") no-repeat scroll left bottom transparent;
@@ -2000,75 +2101,123 @@ div#multiple_download_container {
   cursor: default;
   border-bottom: 3px solid #ff5722;
 }
-div#uploader_options_pane {
+div.upload-options-pane {
   position: absolute;
-  right: 10px;
+  top: 0;
+  right: 0;
   box-shadow: 0 1px 6px rgba(0, 0, 0, 0.16), 0 1px 6px rgba(0, 0, 0, 0.23);
-  background-color: white;
-  font-size: 11px;
-  height: 59px;
-  overflow: hidden;
-  padding: 12px 20px 20px;
-  text-align: right;
-  display: none;
-  margin-bottom: 11px;
-  margin-top: -2px;
-  margin-right: 2px;
-  z-index: 2;
+  padding: 16px;
+}
+div.upload-options-pane .option-row {
+  padding: 8px 0;
+}
+div.upload-options-pane .close-options {
+  float: right;
+  cursor: pointer;
+  display: inline-block;
+}
+div.upload-options-pane .mui-radio-button {
+  margin: 12px 0;
+}
+div.uploader-action-bar {
+  margin-bottom: 10px;
+}
+div.uploader-action-bar > button,
+div.uploader-action-bar > div {
+  margin-right: 5px;
 }
 div#total_files_list {
   display: none !important;
 }
-div#uploader_options_pane input {
-  width: 15px;
-  margin-right: 0;
-  margin-left: 0;
-  margin-top: 5px;
-}
 .dotted_container_item_mixin {
   overflow: hidden;
-  padding-top: 10px;
-  padding-bottom: 10px;
-  padding-left: 14px;
+  padding: 16px 14px;
   height: 20px;
   position: relative;
-  background-image: url('../images//dl_bg.png');
+  background-image: url('../images/dl_bg.png');
   /*background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg'><rect x='0' y='0' width='100%' height='100%' stroke='transparent' fill='@{uploader_dialog_progress_color}' fill-opacity='1'/></svg>");*/
   background-repeat: no-repeat;
   background-size: 0 100%;
   font-size: 14px;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.09);
+  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
   color: rgba(0, 0, 0, 0.87);
 }
 .dotted_container_item_mixin rect {
   fill: #ffffff;
 }
-div#upload_files_list div {
+div#upload_files_list {
+  border: 1px solid rgba(0, 0, 0, 0.13);
+}
+div#upload_files_list > div {
   overflow: hidden;
-  padding-top: 10px;
-  padding-bottom: 10px;
-  padding-left: 14px;
+  padding: 16px 14px;
   height: 20px;
   position: relative;
-  background-image: url('../images//dl_bg.png');
+  background-image: url('../images/dl_bg.png');
   /*background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg'><rect x='0' y='0' width='100%' height='100%' stroke='transparent' fill='@{uploader_dialog_progress_color}' fill-opacity='1'/></svg>");*/
   background-repeat: no-repeat;
   background-size: 0 100%;
   font-size: 14px;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.09);
+  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
   color: rgba(0, 0, 0, 0.87);
 }
-div#upload_files_list div rect {
+div#upload_files_list > div rect {
   fill: #ffffff;
 }
+div#upload_files_list > div.header {
+  padding: 8px 14px;
+  font-weight: 500;
+  font-size: 13px;
+  color: #636e75;
+  border-bottom: 0;
+}
+div#upload_files_list > div span.mdi.mdi-file,
+div#upload_files_list > div span.mdi.mdi-folder {
+  margin: 0 8px 0 0;
+}
+div#upload_files_list > div span.status,
+div#upload_files_list > div span.path {
+  font-size: 11px;
+  display: inline-block;
+  margin: 0 6px;
+  color: rgba(0, 0, 0, 0.53);
+}
+div#upload_files_list > div span.stop-button {
+  cursor: pointer;
+  color: #6b7781;
+  float: right;
+  display: inline-block;
+  margin: 4px 10px;
+}
+div#upload_files_list > div div.uploader-pgbar {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  background-color: #009688;
+  height: 2px;
+  width: 0;
+  transition: all 550ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;
+}
+div#upload_files_list > div.section-processed,
+div#upload_files_list > div.header {
+  display: none;
+}
+div#upload_files_list > div.upload-error {
+  display: block;
+  color: #d32f2f;
+}
+div#upload_files_list > div.upload-error span.status {
+  color: #d32f2f;
+}
+div#upload_files_list.show-processed > div.section-processed,
+div#upload_files_list.show-processed > div.header {
+  display: block;
+}
 div#upload_files_list span.item_relative_path {
   color: #5f5f5f;
   margin-left: 15px;
   font-size: 0.8em;
 }
-div#upload_files_list img {
-  margin-right: 6px;
-}
 div#upload_files_list img.fakeUploadButton {
   display: none;
 }
@@ -2115,17 +2264,15 @@ div#upload_files_list span.mdi-close:hover {
 }
 div#multiple_download_container div {
   overflow: hidden;
-  padding-top: 10px;
-  padding-bottom: 10px;
-  padding-left: 14px;
+  padding: 16px 14px;
   height: 20px;
   position: relative;
-  background-image: url('../images//dl_bg.png');
+  background-image: url('../images/dl_bg.png');
   /*background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg'><rect x='0' y='0' width='100%' height='100%' stroke='transparent' fill='@{uploader_dialog_progress_color}' fill-opacity='1'/></svg>");*/
   background-repeat: no-repeat;
   background-size: 0 100%;
   font-size: 14px;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.09);
+  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
   color: rgba(0, 0, 0, 0.87);
 }
 div#multiple_download_container div rect {
@@ -2193,7 +2340,7 @@ div#multiple_download_container div div a:hover {
   font-weight: 500;
   background-color: #c9fffa;
   color: #00776c;
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.33);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(0, 0, 0, 0.33);
   position: absolute;
   text-transform: uppercase;
   white-space: nowrap;
@@ -2255,31 +2402,29 @@ div#multiple_download_container div div a:hover {
 /* SLIDER*/
 /*********************************/
 .slider-pane {
-  background-color: #ebedf0;
-  padding: 5px 2px;
+  background-color: #ffffff;
+  padding: 10px 2px;
   position: absolute;
-  width: 11px;
+  width: 22px;
   z-index: 10000;
   border-radius: 2px;
   box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.75);
 }
-.slider-handle,
-.slider-pane div.selected {
-  background-image: url('../images/slider-handle-vert.png') !important;
-  background-position: top center;
-  background-repeat: no-repeat !important;
-  background-color: transparent !important;
-  height: 15px;
-  width: 10px;
+.slider-pane .slider-tracker {
+  background-color: #009688;
+  width: 2px !important;
+  margin-left: 10px;
 }
-.slider-tracker {
-  background-image: url("../images/slider-track-bottom.png");
-  background-position: bottom center;
-  background-repeat: no-repeat;
+.slider-pane .slider-tracker .slider-handle {
+  background-color: #009688 !important;
+  height: 10px;
+  width: 10px;
+  margin-left: -4px;
+  border-radius: 50%;
+  cursor: pointer;
 }
-.slider-tracker-top {
-  background-position: top center;
-  background-repeat: no-repeat;
+.slider-pane .slider-tracker .slider-tracker-top {
+  display: none;
 }
 .action_bar {
   line-height: 15px;
@@ -2634,10 +2779,13 @@ div.detailed div.FL-inlineToolbar div.toolbarGroup {
   cursor: pointer;
 }
 #logging_string {
-  color: #ffffff;
+  color: rgba(255, 255, 255, 0.98);
   float: right;
   margin-top: 12px;
 }
+#logging_string:hover {
+  color: #ffffff;
+}
 #logging_string div.inlineBarButtonLeft {
   display: none;
 }
@@ -2682,17 +2830,17 @@ div.detailed div.FL-inlineToolbar div.toolbarGroup {
   display: inline-block;
   font-size: 13px;
   font-weight: 300;
-  padding: 6px 0 0 8px;
-  color: rgba(255, 255, 255, 0.9);
+  padding: 4px 0 0 8px;
+  color: rgba(255, 255, 255, 0.98);
 }
 #logging_string .user_widget_label.withImage i:hover {
-  color: white;
+  color: #ffffff;
 }
 #logging_string div.user_widget_mini {
   float: right;
   width: 39px;
   height: 39px;
-  margin-top: -14px;
+  margin-top: -12px;
   margin-left: 14px;
   border-radius: 100%;
   background-position: center center;
@@ -2707,15 +2855,22 @@ div.multiple_selection_draggable {
   display: block;
   color: #000;
   background-color: #ffffff;
-  padding: 5px;
-  border: 1px solid #c3d9ff;
+  padding: 8px;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(0, 0, 0, 0.33);
+  border: 0;
   font-size: 12px;
   cursor: default;
   overflow: hidden;
   border-radius: 3px;
+  line-height: 20px;
 }
-div.selection_ctrl_key {
-  background: url('../images/0.gif') no-repeat bottom right;
+div.multiple_selection_draggable.selection_ctrl_key:before {
+  font-family: FontAwesome;
+  content: "\f067";
+  display: block;
+  position: absolute;
+  bottom: 5px;
+  right: 5px;
 }
 #search_container {
   float: right;
@@ -2741,7 +2896,7 @@ div.selection_ctrl_key {
   text-align: left;
   padding-right: 0;
   font-size: 40px;
-  font-family: "Open Sans Regular", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+  font-family: Roboto, sans-serif;
 }
 #search_container.search_active div#search_form a {
   font-size: 1.6em;
@@ -2807,7 +2962,7 @@ div.selection_ctrl_key {
 #search_container #search_results_cont span.results_string {
   display: none;
 }
-#search_container #search_results_cont div#search_show_all {
+#search_container #search_results_cont div.results-parser-filter {
   text-align: center;
   font-size: 12px;
   color: #747474;
@@ -2815,7 +2970,7 @@ div.selection_ctrl_key {
   display: inline-block;
   margin-left: 10px;
 }
-#search_container #search_results_cont div#search_show_all a {
+#search_container #search_results_cont div.results-parser-filter a {
   text-decoration: underline;
   color: #393939;
   cursor: pointer;
@@ -2933,7 +3088,7 @@ div.selection_ctrl_key {
   border-bottom: none;
   background-color: white;
   height: 102px;
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.33);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(0, 0, 0, 0.33);
 }
 #search_container #search_results_cont #search_results div.thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata {
   /*opacity: 1;*/
@@ -3167,9 +3322,6 @@ div.selection_ctrl_key {
 }
 .hsplitbar {
   height: 4px;
-  background-image: url('../images/hgrabber.gif');
-  background-repeat: no-repeat;
-  background-position: center;
   z-index: 1014;
 }
 .hsplitbar.active {
@@ -3559,7 +3711,8 @@ span.first-bread em {
   }
 }
 .rotating,
-.icon-spinner {
+.icon-spinner,
+.mdi.mdi-radar {
   -webkit-transform-origin: 50% 50%;
   -webkit-animation-name: rotate;
   -webkit-animation-duration: 1.0s;
@@ -3585,6 +3738,10 @@ span.first-bread em {
   display: block !important;
   text-align: center;
 }
+.mdi.mdi-radar {
+  display: inline-block;
+  text-align: center;
+}
 .icon-spinner.spinner_large {
   font-size: 22px;
 }
@@ -3724,51 +3881,1026 @@ span.first-bread em {
 .no-csstransitions #AjxpConnexion-loader img {
   height: 6px;
 }
-/************************/
-/* CONTEXT MENU STYLES  */
-/************************/
-div.menu {
-  font-family: Roboto, sans-serif;
-  -webkit-font-smoothing: antialiased;
-  position: absolute;
-  top: 0;
-  left: 0;
-  border-radius: 1px;
-  box-shadow: 0px 1px 6px rgba(0, 0, 0, 0.16), 0px 1px 6px rgba(0, 0, 0, 0.23);
-}
-div.menu ul,
-div.menu li {
-  margin: 0;
-  padding: 0;
-  list-style: none;
-  overflow-x: hidden;
+.radial-progress {
+  display: inline-block;
 }
-div.menu li {
-  list-style-position: outside;
+.radial-progress *,
+.radial-progress *:before,
+.radial-progress *:after {
+  box-sizing: border-box;
 }
-div.menu li a {
-  display: block;
-  text-decoration: none;
-  cursor: default;
-  outline: none;
-  font-size: 13px;
+.radial-progress .charts-container:after {
+  clear: both;
+  content: "";
+  display: table;
 }
-div.menu li.menuTitle {
-  display: none;
+.radial-progress .pie-wrapper {
+  height: 16px;
+  width: 16px;
+  float: left;
+  margin: 13px 8px 0 0;
+  position: relative;
 }
-div.menu li.separator {
-  height: 1px;
-  padding: 0;
-  overflow: hidden;
-  display: block;
-  font-size: 1px;
+.radial-progress .pie-wrapper:nth-child(3n+1) {
+  clear: both;
 }
-div.menu .menuActions {
+.radial-progress .pie-wrapper .pie {
+  height: 100%;
+  width: 100%;
+  clip: rect(0, 16px, 16px, 8px);
+  left: 0;
   position: absolute;
-  right: 16px;
-  top: 1px;
-  text-align: right;
-  padding-right: 3px !important;
+  top: 0;
+}
+.radial-progress .pie-wrapper .pie .half-circle {
+  height: 100%;
+  width: 100%;
+  border: 1.6px solid #3498db;
+  border-radius: 50%;
+  clip: rect(0, 8px, 16px, 0);
+  left: 0;
+  position: absolute;
+  top: 0;
+}
+.radial-progress .pie-wrapper .label {
+  background: #ffffff;
+  border-radius: 50%;
+  bottom: 6.4px;
+  color: #ecf0f1;
+  cursor: default;
+  display: block;
+  font-size: 4px;
+  left: 6.4px;
+  line-height: 41.6px;
+  position: absolute;
+  right: 6.4px;
+  text-align: center;
+  top: 6.4px;
+}
+.radial-progress .pie-wrapper .label .smaller {
+  color: #bdc3c7;
+  font-size: .45em;
+  padding-bottom: 20px;
+  vertical-align: super;
+}
+.radial-progress .pie-wrapper .shadow {
+  height: 100%;
+  width: 100%;
+  border: 1.6px solid #bdc3c7;
+  border-radius: 50%;
+}
+.radial-progress .pie-wrapper.style-2 .label {
+  background: none;
+  color: #7f8c8d;
+}
+.radial-progress .pie-wrapper.style-2 .label .smaller {
+  color: #bdc3c7;
+}
+.radial-progress .pie-wrapper.progress-30 .pie .right-side {
+  display: none;
+}
+.radial-progress .pie-wrapper.progress-30 .pie .half-circle {
+  border-color: #3498db;
+}
+.radial-progress .pie-wrapper.progress-30 .pie .left-side {
+  -webkit-transform: rotate(108deg);
+          transform: rotate(108deg);
+}
+.radial-progress .pie-wrapper.progress-60 .pie {
+  clip: rect(auto, auto, auto, auto);
+}
+.radial-progress .pie-wrapper.progress-60 .pie .right-side {
+  -webkit-transform: rotate(180deg);
+          transform: rotate(180deg);
+}
+.radial-progress .pie-wrapper.progress-60 .pie .half-circle {
+  border-color: #9b59b6;
+}
+.radial-progress .pie-wrapper.progress-60 .pie .left-side {
+  -webkit-transform: rotate(216deg);
+          transform: rotate(216deg);
+}
+.radial-progress .pie-wrapper.progress-90 .pie {
+  clip: rect(auto, auto, auto, auto);
+}
+.radial-progress .pie-wrapper.progress-90 .pie .right-side {
+  -webkit-transform: rotate(180deg);
+          transform: rotate(180deg);
+}
+.radial-progress .pie-wrapper.progress-90 .pie .half-circle {
+  border-color: #e67e22;
+}
+.radial-progress .pie-wrapper.progress-90 .pie .left-side {
+  -webkit-transform: rotate(324deg);
+          transform: rotate(324deg);
+}
+.radial-progress .pie-wrapper.progress-45 .pie .right-side {
+  display: none;
+}
+.radial-progress .pie-wrapper.progress-45 .pie .half-circle {
+  border-color: #1abc9c;
+}
+.radial-progress .pie-wrapper.progress-45 .pie .left-side {
+  -webkit-transform: rotate(162deg);
+          transform: rotate(162deg);
+}
+.radial-progress .pie-wrapper.progress-75 .pie {
+  clip: rect(auto, auto, auto, auto);
+}
+.radial-progress .pie-wrapper.progress-75 .pie .right-side {
+  -webkit-transform: rotate(180deg);
+          transform: rotate(180deg);
+}
+.radial-progress .pie-wrapper.progress-75 .pie .half-circle {
+  border-color: #8e44ad;
+}
+.radial-progress .pie-wrapper.progress-75 .pie .left-side {
+  -webkit-transform: rotate(270deg);
+          transform: rotate(270deg);
+}
+.radial-progress .pie-wrapper.progress-95 .pie {
+  clip: rect(auto, auto, auto, auto);
+}
+.radial-progress .pie-wrapper.progress-95 .pie .right-side {
+  -webkit-transform: rotate(180deg);
+          transform: rotate(180deg);
+}
+.radial-progress .pie-wrapper.progress-95 .pie .half-circle {
+  border-color: #e74c3c;
+}
+.radial-progress .pie-wrapper.progress-95 .pie .left-side {
+  -webkit-transform: rotate(342deg);
+          transform: rotate(342deg);
+}
+.radial-progress .pie-wrapper--solid {
+  border-radius: 50%;
+  overflow: hidden;
+}
+.radial-progress .pie-wrapper--solid:before {
+  border-radius: 0 100% 100% 0%;
+  content: '';
+  display: block;
+  height: 100%;
+  margin-left: 50%;
+  -webkit-transform-origin: left;
+          transform-origin: left;
+}
+.radial-progress .pie-wrapper--solid .label {
+  background: transparent;
+}
+.radial-progress .pie-wrapper--solid.progress-100 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-100:before {
+  background: #009688;
+  -webkit-transform: rotate(0deg);
+          transform: rotate(0deg);
+}
+.radial-progress .pie-wrapper--solid.progress-99 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-99:before {
+  background: #009688;
+  -webkit-transform: rotate(3.6deg);
+          transform: rotate(3.6deg);
+}
+.radial-progress .pie-wrapper--solid.progress-98 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-98:before {
+  background: #009688;
+  -webkit-transform: rotate(7.2deg);
+          transform: rotate(7.2deg);
+}
+.radial-progress .pie-wrapper--solid.progress-97 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-97:before {
+  background: #009688;
+  -webkit-transform: rotate(10.8deg);
+          transform: rotate(10.8deg);
+}
+.radial-progress .pie-wrapper--solid.progress-96 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-96:before {
+  background: #009688;
+  -webkit-transform: rotate(14.4deg);
+          transform: rotate(14.4deg);
+}
+.radial-progress .pie-wrapper--solid.progress-95 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-95:before {
+  background: #009688;
+  -webkit-transform: rotate(18deg);
+          transform: rotate(18deg);
+}
+.radial-progress .pie-wrapper--solid.progress-94 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-94:before {
+  background: #009688;
+  -webkit-transform: rotate(21.6deg);
+          transform: rotate(21.6deg);
+}
+.radial-progress .pie-wrapper--solid.progress-93 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-93:before {
+  background: #009688;
+  -webkit-transform: rotate(25.2deg);
+          transform: rotate(25.2deg);
+}
+.radial-progress .pie-wrapper--solid.progress-92 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-92:before {
+  background: #009688;
+  -webkit-transform: rotate(28.8deg);
+          transform: rotate(28.8deg);
+}
+.radial-progress .pie-wrapper--solid.progress-91 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-91:before {
+  background: #009688;
+  -webkit-transform: rotate(32.4deg);
+          transform: rotate(32.4deg);
+}
+.radial-progress .pie-wrapper--solid.progress-90 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-90:before {
+  background: #009688;
+  -webkit-transform: rotate(36deg);
+          transform: rotate(36deg);
+}
+.radial-progress .pie-wrapper--solid.progress-89 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-89:before {
+  background: #009688;
+  -webkit-transform: rotate(39.6deg);
+          transform: rotate(39.6deg);
+}
+.radial-progress .pie-wrapper--solid.progress-88 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-88:before {
+  background: #009688;
+  -webkit-transform: rotate(43.2deg);
+          transform: rotate(43.2deg);
+}
+.radial-progress .pie-wrapper--solid.progress-87 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-87:before {
+  background: #009688;
+  -webkit-transform: rotate(46.8deg);
+          transform: rotate(46.8deg);
+}
+.radial-progress .pie-wrapper--solid.progress-86 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-86:before {
+  background: #009688;
+  -webkit-transform: rotate(50.4deg);
+          transform: rotate(50.4deg);
+}
+.radial-progress .pie-wrapper--solid.progress-85 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-85:before {
+  background: #009688;
+  -webkit-transform: rotate(54deg);
+          transform: rotate(54deg);
+}
+.radial-progress .pie-wrapper--solid.progress-84 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-84:before {
+  background: #009688;
+  -webkit-transform: rotate(57.6deg);
+          transform: rotate(57.6deg);
+}
+.radial-progress .pie-wrapper--solid.progress-83 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-83:before {
+  background: #009688;
+  -webkit-transform: rotate(61.2deg);
+          transform: rotate(61.2deg);
+}
+.radial-progress .pie-wrapper--solid.progress-82 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-82:before {
+  background: #009688;
+  -webkit-transform: rotate(64.8deg);
+          transform: rotate(64.8deg);
+}
+.radial-progress .pie-wrapper--solid.progress-81 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-81:before {
+  background: #009688;
+  -webkit-transform: rotate(68.4deg);
+          transform: rotate(68.4deg);
+}
+.radial-progress .pie-wrapper--solid.progress-80 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-80:before {
+  background: #009688;
+  -webkit-transform: rotate(72deg);
+          transform: rotate(72deg);
+}
+.radial-progress .pie-wrapper--solid.progress-79 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-79:before {
+  background: #009688;
+  -webkit-transform: rotate(75.6deg);
+          transform: rotate(75.6deg);
+}
+.radial-progress .pie-wrapper--solid.progress-78 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-78:before {
+  background: #009688;
+  -webkit-transform: rotate(79.2deg);
+          transform: rotate(79.2deg);
+}
+.radial-progress .pie-wrapper--solid.progress-77 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-77:before {
+  background: #009688;
+  -webkit-transform: rotate(82.8deg);
+          transform: rotate(82.8deg);
+}
+.radial-progress .pie-wrapper--solid.progress-76 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-76:before {
+  background: #009688;
+  -webkit-transform: rotate(86.4deg);
+          transform: rotate(86.4deg);
+}
+.radial-progress .pie-wrapper--solid.progress-75 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-75:before {
+  background: #009688;
+  -webkit-transform: rotate(90deg);
+          transform: rotate(90deg);
+}
+.radial-progress .pie-wrapper--solid.progress-74 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-74:before {
+  background: #009688;
+  -webkit-transform: rotate(93.6deg);
+          transform: rotate(93.6deg);
+}
+.radial-progress .pie-wrapper--solid.progress-73 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-73:before {
+  background: #009688;
+  -webkit-transform: rotate(97.2deg);
+          transform: rotate(97.2deg);
+}
+.radial-progress .pie-wrapper--solid.progress-72 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-72:before {
+  background: #009688;
+  -webkit-transform: rotate(100.8deg);
+          transform: rotate(100.8deg);
+}
+.radial-progress .pie-wrapper--solid.progress-71 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-71:before {
+  background: #009688;
+  -webkit-transform: rotate(104.4deg);
+          transform: rotate(104.4deg);
+}
+.radial-progress .pie-wrapper--solid.progress-70 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-70:before {
+  background: #009688;
+  -webkit-transform: rotate(108deg);
+          transform: rotate(108deg);
+}
+.radial-progress .pie-wrapper--solid.progress-69 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-69:before {
+  background: #009688;
+  -webkit-transform: rotate(111.6deg);
+          transform: rotate(111.6deg);
+}
+.radial-progress .pie-wrapper--solid.progress-68 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-68:before {
+  background: #009688;
+  -webkit-transform: rotate(115.2deg);
+          transform: rotate(115.2deg);
+}
+.radial-progress .pie-wrapper--solid.progress-67 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-67:before {
+  background: #009688;
+  -webkit-transform: rotate(118.8deg);
+          transform: rotate(118.8deg);
+}
+.radial-progress .pie-wrapper--solid.progress-66 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-66:before {
+  background: #009688;
+  -webkit-transform: rotate(122.4deg);
+          transform: rotate(122.4deg);
+}
+.radial-progress .pie-wrapper--solid.progress-65 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-65:before {
+  background: #009688;
+  -webkit-transform: rotate(126deg);
+          transform: rotate(126deg);
+}
+.radial-progress .pie-wrapper--solid.progress-64 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-64:before {
+  background: #009688;
+  -webkit-transform: rotate(129.6deg);
+          transform: rotate(129.6deg);
+}
+.radial-progress .pie-wrapper--solid.progress-63 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-63:before {
+  background: #009688;
+  -webkit-transform: rotate(133.2deg);
+          transform: rotate(133.2deg);
+}
+.radial-progress .pie-wrapper--solid.progress-62 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-62:before {
+  background: #009688;
+  -webkit-transform: rotate(136.8deg);
+          transform: rotate(136.8deg);
+}
+.radial-progress .pie-wrapper--solid.progress-61 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-61:before {
+  background: #009688;
+  -webkit-transform: rotate(140.4deg);
+          transform: rotate(140.4deg);
+}
+.radial-progress .pie-wrapper--solid.progress-60 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-60:before {
+  background: #009688;
+  -webkit-transform: rotate(144deg);
+          transform: rotate(144deg);
+}
+.radial-progress .pie-wrapper--solid.progress-59 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-59:before {
+  background: #009688;
+  -webkit-transform: rotate(147.6deg);
+          transform: rotate(147.6deg);
+}
+.radial-progress .pie-wrapper--solid.progress-58 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-58:before {
+  background: #009688;
+  -webkit-transform: rotate(151.2deg);
+          transform: rotate(151.2deg);
+}
+.radial-progress .pie-wrapper--solid.progress-57 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-57:before {
+  background: #009688;
+  -webkit-transform: rotate(154.8deg);
+          transform: rotate(154.8deg);
+}
+.radial-progress .pie-wrapper--solid.progress-56 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-56:before {
+  background: #009688;
+  -webkit-transform: rotate(158.4deg);
+          transform: rotate(158.4deg);
+}
+.radial-progress .pie-wrapper--solid.progress-55 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-55:before {
+  background: #009688;
+  -webkit-transform: rotate(162deg);
+          transform: rotate(162deg);
+}
+.radial-progress .pie-wrapper--solid.progress-54 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-54:before {
+  background: #009688;
+  -webkit-transform: rotate(165.6deg);
+          transform: rotate(165.6deg);
+}
+.radial-progress .pie-wrapper--solid.progress-53 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-53:before {
+  background: #009688;
+  -webkit-transform: rotate(169.2deg);
+          transform: rotate(169.2deg);
+}
+.radial-progress .pie-wrapper--solid.progress-52 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-52:before {
+  background: #009688;
+  -webkit-transform: rotate(172.8deg);
+          transform: rotate(172.8deg);
+}
+.radial-progress .pie-wrapper--solid.progress-51 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-51:before {
+  background: #009688;
+  -webkit-transform: rotate(176.4deg);
+          transform: rotate(176.4deg);
+}
+.radial-progress .pie-wrapper--solid.progress-50 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-50:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-360deg);
+          transform: rotate(-360deg);
+}
+.radial-progress .pie-wrapper--solid.progress-49 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-49:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-356.4deg);
+          transform: rotate(-356.4deg);
+}
+.radial-progress .pie-wrapper--solid.progress-48 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-48:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-352.8deg);
+          transform: rotate(-352.8deg);
+}
+.radial-progress .pie-wrapper--solid.progress-47 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-47:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-349.2deg);
+          transform: rotate(-349.2deg);
+}
+.radial-progress .pie-wrapper--solid.progress-46 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-46:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-345.6deg);
+          transform: rotate(-345.6deg);
+}
+.radial-progress .pie-wrapper--solid.progress-45 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-45:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-342deg);
+          transform: rotate(-342deg);
+}
+.radial-progress .pie-wrapper--solid.progress-44 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-44:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-338.4deg);
+          transform: rotate(-338.4deg);
+}
+.radial-progress .pie-wrapper--solid.progress-43 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-43:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-334.8deg);
+          transform: rotate(-334.8deg);
+}
+.radial-progress .pie-wrapper--solid.progress-42 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-42:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-331.2deg);
+          transform: rotate(-331.2deg);
+}
+.radial-progress .pie-wrapper--solid.progress-41 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-41:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-327.6deg);
+          transform: rotate(-327.6deg);
+}
+.radial-progress .pie-wrapper--solid.progress-40 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-40:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-324deg);
+          transform: rotate(-324deg);
+}
+.radial-progress .pie-wrapper--solid.progress-39 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-39:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-320.4deg);
+          transform: rotate(-320.4deg);
+}
+.radial-progress .pie-wrapper--solid.progress-38 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-38:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-316.8deg);
+          transform: rotate(-316.8deg);
+}
+.radial-progress .pie-wrapper--solid.progress-37 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-37:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-313.2deg);
+          transform: rotate(-313.2deg);
+}
+.radial-progress .pie-wrapper--solid.progress-36 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-36:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-309.6deg);
+          transform: rotate(-309.6deg);
+}
+.radial-progress .pie-wrapper--solid.progress-35 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-35:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-306deg);
+          transform: rotate(-306deg);
+}
+.radial-progress .pie-wrapper--solid.progress-34 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-34:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-302.4deg);
+          transform: rotate(-302.4deg);
+}
+.radial-progress .pie-wrapper--solid.progress-33 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-33:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-298.8deg);
+          transform: rotate(-298.8deg);
+}
+.radial-progress .pie-wrapper--solid.progress-32 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-32:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-295.2deg);
+          transform: rotate(-295.2deg);
+}
+.radial-progress .pie-wrapper--solid.progress-31 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-31:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-291.6deg);
+          transform: rotate(-291.6deg);
+}
+.radial-progress .pie-wrapper--solid.progress-30 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-30:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-288deg);
+          transform: rotate(-288deg);
+}
+.radial-progress .pie-wrapper--solid.progress-29 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-29:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-284.4deg);
+          transform: rotate(-284.4deg);
+}
+.radial-progress .pie-wrapper--solid.progress-28 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-28:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-280.8deg);
+          transform: rotate(-280.8deg);
+}
+.radial-progress .pie-wrapper--solid.progress-27 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-27:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-277.2deg);
+          transform: rotate(-277.2deg);
+}
+.radial-progress .pie-wrapper--solid.progress-26 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-26:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-273.6deg);
+          transform: rotate(-273.6deg);
+}
+.radial-progress .pie-wrapper--solid.progress-25 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-25:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-270deg);
+          transform: rotate(-270deg);
+}
+.radial-progress .pie-wrapper--solid.progress-24 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-24:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-266.4deg);
+          transform: rotate(-266.4deg);
+}
+.radial-progress .pie-wrapper--solid.progress-23 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-23:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-262.8deg);
+          transform: rotate(-262.8deg);
+}
+.radial-progress .pie-wrapper--solid.progress-22 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-22:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-259.2deg);
+          transform: rotate(-259.2deg);
+}
+.radial-progress .pie-wrapper--solid.progress-21 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-21:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-255.6deg);
+          transform: rotate(-255.6deg);
+}
+.radial-progress .pie-wrapper--solid.progress-20 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-20:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-252deg);
+          transform: rotate(-252deg);
+}
+.radial-progress .pie-wrapper--solid.progress-19 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-19:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-248.4deg);
+          transform: rotate(-248.4deg);
+}
+.radial-progress .pie-wrapper--solid.progress-18 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-18:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-244.8deg);
+          transform: rotate(-244.8deg);
+}
+.radial-progress .pie-wrapper--solid.progress-17 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-17:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-241.2deg);
+          transform: rotate(-241.2deg);
+}
+.radial-progress .pie-wrapper--solid.progress-16 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-16:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-237.6deg);
+          transform: rotate(-237.6deg);
+}
+.radial-progress .pie-wrapper--solid.progress-15 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-15:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-234deg);
+          transform: rotate(-234deg);
+}
+.radial-progress .pie-wrapper--solid.progress-14 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-14:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-230.4deg);
+          transform: rotate(-230.4deg);
+}
+.radial-progress .pie-wrapper--solid.progress-13 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-13:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-226.8deg);
+          transform: rotate(-226.8deg);
+}
+.radial-progress .pie-wrapper--solid.progress-12 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-12:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-223.2deg);
+          transform: rotate(-223.2deg);
+}
+.radial-progress .pie-wrapper--solid.progress-11 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-11:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-219.6deg);
+          transform: rotate(-219.6deg);
+}
+.radial-progress .pie-wrapper--solid.progress-10 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-10:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-216deg);
+          transform: rotate(-216deg);
+}
+.radial-progress .pie-wrapper--solid.progress-9 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-9:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-212.4deg);
+          transform: rotate(-212.4deg);
+}
+.radial-progress .pie-wrapper--solid.progress-8 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-8:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-208.8deg);
+          transform: rotate(-208.8deg);
+}
+.radial-progress .pie-wrapper--solid.progress-7 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-7:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-205.2deg);
+          transform: rotate(-205.2deg);
+}
+.radial-progress .pie-wrapper--solid.progress-6 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-6:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-201.6deg);
+          transform: rotate(-201.6deg);
+}
+.radial-progress .pie-wrapper--solid.progress-5 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-5:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-198deg);
+          transform: rotate(-198deg);
+}
+.radial-progress .pie-wrapper--solid.progress-4 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-4:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-194.4deg);
+          transform: rotate(-194.4deg);
+}
+.radial-progress .pie-wrapper--solid.progress-3 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-3:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-190.8deg);
+          transform: rotate(-190.8deg);
+}
+.radial-progress .pie-wrapper--solid.progress-2 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-2:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-187.2deg);
+          transform: rotate(-187.2deg);
+}
+.radial-progress .pie-wrapper--solid.progress-1 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-1:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-183.6deg);
+          transform: rotate(-183.6deg);
+}
+.radial-progress .pie-wrapper--solid.progress-0 {
+  background: linear-gradient(to right, #009688 50%, #ffffff 50%);
+}
+.radial-progress .pie-wrapper--solid.progress-0:before {
+  background: #ffffff;
+  -webkit-transform: rotate(-180deg);
+          transform: rotate(-180deg);
+}
+/************************/
+/* CONTEXT MENU STYLES  */
+/************************/
+div.menu {
+  font-family: Roboto, sans-serif;
+  -webkit-font-smoothing: antialiased;
+  position: absolute;
+  top: 0;
+  left: 0;
+  border-radius: 1px;
+  box-shadow: 0px 1px 6px rgba(0, 0, 0, 0.16), 0px 1px 6px rgba(0, 0, 0, 0.23);
+}
+div.menu ul,
+div.menu li {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+  overflow-x: hidden;
+}
+div.menu li {
+  list-style-position: outside;
+}
+div.menu li a {
+  display: block;
+  text-decoration: none;
+  cursor: default;
+  outline: none;
+  font-size: 13px;
+}
+div.menu li.menuTitle {
+  display: none;
+}
+div.menu li.separator {
+  height: 1px;
+  padding: 0;
+  overflow: hidden;
+  display: block;
+  font-size: 1px;
+}
+div.menu .menuActions {
+  position: absolute;
+  right: 16px;
+  top: 1px;
+  text-align: right;
+  padding-right: 3px !important;
   margin-top: 5px !important;
 }
 div.menu .menuActions a {
@@ -4190,13 +5322,9 @@ div.menu.rootDirChooser span.rootDirTitle {
 .form-ip_content_info_panel div.folded_icons {
   display: none;
 }
-#info_panel div.class-FetchedResultPane,
-.form-ip_content_info_panel div.class-FetchedResultPane {
-  font-size: 13px;
-}
 #info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed,
 .form-ip_content_info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed {
-  padding: 0;
+  padding: 0 0 16px;
   cursor: default;
 }
 #info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_selectable_cell,
@@ -4205,12 +5333,11 @@ div.menu.rootDirChooser span.rootDirTitle {
 }
 #info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbLabel,
 .form-ip_content_info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbLabel {
-  font-size: 1.1em;
-  color: #222222;
+  font-size: 15px;
+  color: #666666;
   white-space: normal;
-  line-height: 1.5em;
   padding-top: 0;
-  padding-bottom: 8px;
+  font-weight: 400;
 }
 #info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbLabel small,
 .form-ip_content_info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbLabel small {
@@ -4219,6 +5346,31 @@ div.menu.rootDirChooser span.rootDirTitle {
   font-size: 0.8em;
   line-height: 15px;
 }
+#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata,
+.form-ip_content_info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata {
+  display: block;
+  opacity: 0.9;
+}
+#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata .metadata_chunk.metadata_chunk_description,
+.form-ip_content_info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata .metadata_chunk.metadata_chunk_description {
+  font-size: 12px;
+  opacity: 1 !important;
+  color: #666666 !important;
+  white-space: normal;
+}
+#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata .metadata_chunk.metadata_chunk_standard,
+.form-ip_content_info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata .metadata_chunk.metadata_chunk_standard {
+  display: none;
+}
+#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed.selected-focus div.thumbnail_cell_metadata,
+.form-ip_content_info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed.selected-focus div.thumbnail_cell_metadata {
+  opacity: 0.9;
+}
+#info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed.selected-focus div.thumbLabel,
+.form-ip_content_info_panel div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed.selected-focus div.thumbLabel {
+  color: #666666;
+  font-weight: 400;
+}
 #info_panel div.class-FetchedResultPane.leaf_activity div.thumbnail_selectable_cell.detailed div.thumbLabel,
 .form-ip_content_info_panel div.class-FetchedResultPane.leaf_activity div.thumbnail_selectable_cell.detailed div.thumbLabel {
   color: #555555;
@@ -4252,7 +5404,7 @@ div.menu.rootDirChooser span.rootDirTitle {
 #info_panel .infopanel_loading,
 .form-ip_content_info_panel .infopanel_loading {
   opacity: 0;
-  transition: opacity ease 0.2s;
+  transition: opacity ease 0.1s;
 }
 #info_panel .infopanel_loading_finished,
 .form-ip_content_info_panel .infopanel_loading_finished {
@@ -4341,10 +5493,28 @@ div.menu.rootDirChooser span.rootDirTitle {
   position: relative;
   text-align: center;
   border-radius: 0;
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.33);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(0, 0, 0, 0.33);
+}
+#info_panel .panelContent .info_panel_multiple_tile div.tile_preview_container,
+.form-ip_content_info_panel .panelContent .info_panel_multiple_tile div.tile_preview_container {
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
+  height: 60px;
 }
-#info_panel .panelContent .info_panel_multiple_tile div.tile_preview img,
-.form-ip_content_info_panel .panelContent .info_panel_multiple_tile div.tile_preview img {
+#info_panel .panelContent .info_panel_multiple_tile div.tile_preview_container div.tile_preview,
+.form-ip_content_info_panel .panelContent .info_panel_multiple_tile div.tile_preview_container div.tile_preview {
+  margin: auto;
+}
+#info_panel .panelContent .info_panel_multiple_tile div.tile_preview_container div.tile_preview .mimefont,
+.form-ip_content_info_panel .panelContent .info_panel_multiple_tile div.tile_preview_container div.tile_preview .mimefont {
+  color: #607d8b;
+}
+#info_panel .panelContent .info_panel_multiple_tile div.tile_preview_container div.tile_preview img,
+.form-ip_content_info_panel .panelContent .info_panel_multiple_tile div.tile_preview_container div.tile_preview img {
   max-width: 90%;
   max-height: 60px;
 }
@@ -4632,14 +5802,19 @@ div.menu.rootDirChooser span.rootDirTitle {
   font-size: 1.2em;
 }
 .left-panel .simple-provider .material-list-entry .material-list-text {
+  -webkit-flex: 1;
+      -ms-flex: 1;
+          flex: 1;
+  overflow: hidden;
+}
+.left-panel .simple-provider .material-list-entry .material-list-text .material-list-line-1 > div {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
 }
 .left-panel .simple-provider .material-list-entry .material-list-actions {
-  position: absolute;
-  right: 16px;
-  opacity: 0.5;
+  padding: 0 12px 0 6px;
+  opacity: 0.1;
 }
 .left-panel .simple-provider .material-list-entry .material-list-actions:hover {
   opacity: 1;
@@ -4693,6 +5868,59 @@ div.menu.rootDirChooser span.rootDirTitle {
 .left-panel.hidden {
   left: -255px;
 }
+div.pydio-tasks-panel {
+  position: absolute;
+  width: 356px;
+  height: 60px;
+  bottom: 20px;
+  right: 20px;
+  overflow-y: auto;
+  overflow-x: hidden;
+  background-color: white;
+  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
+  z-index: 20001;
+  transition: all 550ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;
+}
+div.pydio-tasks-panel.invisible {
+  right: -361px;
+}
+div.pydio-tasks-panel div.task {
+  padding: 10px;
+  border-bottom: 1px solid #f2f2f2;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: row;
+      -ms-flex-direction: row;
+          flex-direction: row;
+}
+div.pydio-tasks-panel div.task .task_texts {
+  -webkit-flex: 5;
+      -ms-flex: 5;
+          flex: 5;
+  max-width: 296px;
+}
+div.pydio-tasks-panel div.task .task_texts div {
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+}
+div.pydio-tasks-panel div.task .task_actions {
+  cursor: pointer;
+}
+div.pydio-tasks-panel div.task .task_actions > span {
+  display: inline-block;
+  margin-top: 15px;
+  margin-left: 10px;
+  color: #009688;
+}
+div.pydio-tasks-panel div.task.task-status-8 {
+  /* error status */
+}
+div.pydio-tasks-panel div.task.task-status-8 .task_texts .status_message,
+div.pydio-tasks-panel div.task.task-status-8 .task_actions > span {
+  color: #d32f2f;
+}
 /**********************/
 /* MASTER VARIABLES
 /**********************/
@@ -4718,7 +5946,7 @@ div.menu.rootDirChooser span.rootDirTitle {
 /* tooltips */
 /* tree */
 /* uploaders */
-/* user widget */
+/* user widget && top toolbar actions */
 /* menus */
 /* InfoPanel */
 /* Left PAnel */
@@ -4789,8 +6017,11 @@ div.form-switch_language_form div.dialogContent div.dialogLegend,
 div.form-reset-password div.dialogContent div.dialogLegend,
 div.form-reset-password-ask div.dialogContent div.dialogLegend {
   text-align: center;
-  font-style: italic;
-  color: #ddd;
+  font-size: 15px;
+  font-weight: 500;
+  color: #ffffff;
+  padding: 0 40px;
+  line-height: 18px;
 }
 div.form-login_form div.dialogContent #switch_language_form div.dialogLegend,
 div.form-login_form_dynamic div.dialogContent #switch_language_form div.dialogLegend,
@@ -4802,19 +6033,40 @@ div.form-reset-password-ask div.dialogContent #switch_language_form div.dialogLe
   margin-top: 16px;
   margin-bottom: 5px;
 }
-div.form-login_form div.dialogContent a.forgot-password-link,
-div.form-login_form_dynamic div.dialogContent a.forgot-password-link,
-div.form-switch_language_form div.dialogContent a.forgot-password-link,
-div.form-reset-password div.dialogContent a.forgot-password-link,
-div.form-reset-password-ask div.dialogContent a.forgot-password-link {
-  color: white !important;
-  margin-right: 45px;
-  margin-top: 6px;
-  text-decoration: underline;
+div.form-login_form div.dialogContent div.SF_element,
+div.form-login_form_dynamic div.dialogContent div.SF_element,
+div.form-switch_language_form div.dialogContent div.SF_element,
+div.form-reset-password div.dialogContent div.SF_element,
+div.form-reset-password-ask div.dialogContent div.SF_element {
+  padding-left: 20px;
   font-size: 13px;
-  text-align: right;
-  display: block;
-  float: right;
+  color: rgba(255, 255, 255, 0.93);
+}
+div.form-login_form div.dialogContent div.SF_element div.SF_label,
+div.form-login_form_dynamic div.dialogContent div.SF_element div.SF_label,
+div.form-switch_language_form div.dialogContent div.SF_element div.SF_label,
+div.form-reset-password div.dialogContent div.SF_element div.SF_label,
+div.form-reset-password-ask div.dialogContent div.SF_element div.SF_label {
+  padding-left: 4px;
+  font-size: 13px;
+  font-weight: 500;
+  text-transform: uppercase;
+  color: #ffffff;
+}
+div.form-login_form div.dialogContent div.SF_element span.icon-question-sign,
+div.form-login_form_dynamic div.dialogContent div.SF_element span.icon-question-sign,
+div.form-switch_language_form div.dialogContent div.SF_element span.icon-question-sign,
+div.form-reset-password div.dialogContent div.SF_element span.icon-question-sign,
+div.form-reset-password-ask div.dialogContent div.SF_element span.icon-question-sign {
+  display: inline-block;
+  margin: 0 6px 0 13px;
+}
+div.form-login_form div.dialogContent div.SF_element a.forgot-password-link,
+div.form-login_form_dynamic div.dialogContent div.SF_element a.forgot-password-link,
+div.form-switch_language_form div.dialogContent div.SF_element a.forgot-password-link,
+div.form-reset-password div.dialogContent div.SF_element a.forgot-password-link,
+div.form-reset-password-ask div.dialogContent div.SF_element a.forgot-password-link {
+  color: rgba(255, 255, 255, 0.93) !important;
 }
 div.form-login_form div.dialogContent .captcha_container,
 div.form-login_form_dynamic div.dialogContent .captcha_container,
@@ -4849,21 +6101,6 @@ div.form-reset-password div.dialogContent .ajxp_password_auth div.SF_element:fir
 div.form-reset-password-ask div.dialogContent .ajxp_password_auth div.SF_element:first-of-type {
   display: none !important;
 }
-div.form-login_form div.dialogContent div.SF_element,
-div.form-login_form_dynamic div.dialogContent div.SF_element,
-div.form-switch_language_form div.dialogContent div.SF_element,
-div.form-reset-password div.dialogContent div.SF_element,
-div.form-reset-password-ask div.dialogContent div.SF_element {
-  padding-left: 20px;
-}
-div.form-login_form div.dialogContent div.SF_element div.SF_label,
-div.form-login_form_dynamic div.dialogContent div.SF_element div.SF_label,
-div.form-switch_language_form div.dialogContent div.SF_element div.SF_label,
-div.form-reset-password div.dialogContent div.SF_element div.SF_label,
-div.form-reset-password-ask div.dialogContent div.SF_element div.SF_label {
-  padding-left: 4px;
-  text-transform: uppercase;
-}
 div.form-login_form div.dialogContent div.dialogButtons,
 div.form-login_form_dynamic div.dialogContent div.dialogButtons,
 div.form-switch_language_form div.dialogContent div.dialogButtons,
@@ -4918,7 +6155,7 @@ div.dialogBox.form-login_form form,
 div.dialogBox.form-login_form_dynamic form {
   margin: 0 40px;
   font-size: 15px;
-  padding-top: 20px;
+  padding-top: 0;
   padding-bottom: 20px;
 }
 div.dialogBox.form-login_form form.no_placeholder div.SF_label,
@@ -4955,7 +6192,7 @@ textarea#myCode {
   border-left-color: #ccc;
 }
 .create_file_alt_link {
-  font-family: "Open Sans Regular", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+  font-family: Roboto, sans-serif;
   font-style: italic;
   cursor: pointer;
 }
@@ -4990,9 +6227,18 @@ div#copymove_form div#treeCopy {
 }
 div#copymove_form > input {
   box-sizing: border-box;
-  width: 100% !important;
+  width: 338px !important;
   background-color: #fff;
   padding: 5px;
+  border: 0 !important;
+  border-bottom: 1px solid #cccccc !important;
+}
+div#copymove_form a#selector_create_folder {
+  cursor: pointer;
+  display: inline-block;
+  padding: 4px 6px 2px;
+  border: 0px solid #cccccc;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(0, 0, 0, 0.33);
 }
 div#external_download > div {
   padding: 10px 24px 52px !important;
@@ -5006,6 +6252,7 @@ div#external_download > div input {
   width: 380px !important;
 }
 div.dialogBox.form-originalUploadForm #modalCloseBtn,
+div.dialogBox.form-upload_main_container #modalCloseBtn,
 div.dialogBox.form-jumploader_form #modalCloseBtn,
 div.dialogBox.form-external_download #modalCloseBtn,
 div.dialogBox.form-smplayer_editor #modalCloseBtn,
@@ -5118,6 +6365,7 @@ div.dialogButtons.inlineEdition input {
 }
 #ajxp_desktop[class^="ajxp_ws-"] #global_toolbar,
 #ajxp_desktop[class*=" ajxp_ws-"] #global_toolbar {
+  position: relative;
   height: 47px;
   padding: 0 15px 0 5px;
   background: #009688 no-repeat 7px 7px;
@@ -5152,18 +6400,22 @@ div.dialogButtons.inlineEdition input {
 #ajxp_desktop[class^="ajxp_ws-"] #global_toolbar #top_toolbar a,
 #ajxp_desktop[class*=" ajxp_ws-"] #global_toolbar #top_toolbar a {
   font-size: 13px;
-  padding: 7px 24px;
+  padding: 5px 20px;
   font-weight: 300;
-  color: rgba(255, 255, 255, 0.9);
+  color: rgba(255, 255, 255, 0.98);
   display: inline-block;
 }
+#ajxp_desktop[class^="ajxp_ws-"] #global_toolbar #top_toolbar a:hover,
+#ajxp_desktop[class*=" ajxp_ws-"] #global_toolbar #top_toolbar a:hover {
+  color: #ffffff;
+}
 #ajxp_desktop[class^="ajxp_ws-"] #global_toolbar #top_toolbar a span.ajxp_icon_span,
 #ajxp_desktop[class*=" ajxp_ws-"] #global_toolbar #top_toolbar a span.ajxp_icon_span,
 #ajxp_desktop[class^="ajxp_ws-"] #global_toolbar #top_toolbar a span.ajxp_icon_arrow,
 #ajxp_desktop[class*=" ajxp_ws-"] #global_toolbar #top_toolbar a span.ajxp_icon_arrow {
   font-size: 1.0em;
   display: inline-block;
-  padding: 0 4px;
+  padding: 0 8px;
 }
 #ajxp_desktop[class^="ajxp_ws-"] #global_toolbar #top_toolbar a img,
 #ajxp_desktop[class*=" ajxp_ws-"] #global_toolbar #top_toolbar a img {
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/pydio.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/pydio.less
index 508605265c..058a05528c 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/pydio.less
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/pydio.less
@@ -8,8 +8,8 @@
 @import "fonts/font-awesome.css";
 @import "fonts/mdi-subset.css";
 
-@fontStandard:"Open Sans Light", "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-@fontBold:"Open Sans Regular", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+@fontStandard:Roboto, sans-serif;
+@fontBold:Roboto, sans-serif;
 @fontMachine:Arial, sans-serif;
 @fontReact:Roboto, sans-serif;
 @fontAwesome: FontAwesome;
@@ -47,6 +47,7 @@
 @import "components/menus";
 @import "components/infopanel";
 @import "components/leftpanel";
+@import "components/tasks";
 
 @import "theme/variables";
 
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/theme/dialogs.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/theme/dialogs.less
index 6d3405d7e0..b020229fc6 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/theme/dialogs.less
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/theme/dialogs.less
@@ -62,9 +62,18 @@ div#copymove_form{
   }
   > input{
     box-sizing: border-box;
-    width: 100% !important;
+    width: 338px !important;
     background-color: #fff;
     padding: 5px;
+    border:0 !important;
+    border-bottom: 1px solid #cccccc !important;
+  }
+  a#selector_create_folder{
+    cursor: pointer;
+    display: inline-block;
+    padding: 4px 6px 2px;
+    border: 0px solid #cccccc;
+    box-shadow: @reactBoxShadowDepthMini;
   }
 }
 
@@ -83,6 +92,7 @@ div#external_download{
 }
 
 div.dialogBox.form-originalUploadForm,
+div.dialogBox.form-upload_main_container,
 div.dialogBox.form-jumploader_form,
 div.dialogBox.form-external_download,
 div.dialogBox.form-smplayer_editor,
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/theme/login.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/theme/login.less
index 58f48cabc2..8a78dc6f8d 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/theme/login.less
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/theme/login.less
@@ -45,8 +45,11 @@ div.form-reset-password-ask
 
     div.dialogLegend {
       text-align: center;
-      font-style: italic;
-      color: #ddd;
+      font-size: 15px;
+      font-weight: 500;
+      color: rgba(255,255,255,1);
+      padding:0 40px;
+      line-height: 18px;
     }
     #switch_language_form div.dialogLegend{
       font-style: normal;
@@ -55,15 +58,25 @@ div.form-reset-password-ask
       margin-bottom: 5px;
     }
 
-    a.forgot-password-link {
-      color: white !important;
-      margin-right: 45px;
-      margin-top: 6px;
-      text-decoration: underline;
+    div.SF_element{
+
+      padding-left: 20px;
       font-size: 13px;
-      text-align: right;
-      display: block;
-      float: right;
+      color: rgba(255,255,255,0.93);
+      div.SF_label{
+        padding-left: 4px;
+        font-size:13px;
+        font-weight: 500;
+        text-transform: uppercase;
+        color: rgba(255,255,255,1);
+      }
+      span.icon-question-sign{
+        display: inline-block;
+        margin: 0 6px 0 13px;
+      }
+      a.forgot-password-link {
+        color: rgba(255,255,255,0.93) !important;
+      }
     }
 
     .captcha_container {
@@ -86,15 +99,6 @@ div.form-reset-password-ask
       display: none !important;
     }
 
-    div.SF_element{
-      padding-left: 20px;
-
-      div.SF_label{
-        padding-left: 4px;
-        text-transform: uppercase;
-      }
-    }
-
     div.dialogButtons
     {
       margin-top: 30px;
@@ -133,7 +137,7 @@ div.dialogBox.form-login_form_dynamic{
   form {
     margin: 0 40px;
     font-size: 15px;
-    padding-top: 20px;
+    padding-top: 0;
     padding-bottom: 20px;
     &.no_placeholder div.SF_label {
       display: block;
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/theme/toolbars.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/theme/toolbars.less
index 7d2407da46..514b5b792e 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/theme/toolbars.less
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/theme/toolbars.less
@@ -68,6 +68,7 @@
 
 #ajxp_desktop[class^="ajxp_ws-"] #global_toolbar,
 #ajxp_desktop[class*=" ajxp_ws-"] #global_toolbar {
+  position: relative;
   height: @globalToolbarHeight;
   padding: 0 15px 0 5px;
   background: @topBarBackgroundColor no-repeat 7px 7px;
@@ -93,17 +94,20 @@
 
     a
     {
-      font-size: 13px;
-      padding: 7px 24px;
-      font-weight: 300;
-      color: rgba(255, 255, 255, 0.9);
+      font-size: @topbar_buttons_font_size;
+      padding: 5px 20px;
+      font-weight: @topbar_buttons_font_weight;
+      color: @topbar_buttons_color;
+      &:hover{
+        color: @topbar_buttons_color_hover;
+      }
       display: inline-block;
 
       span.ajxp_icon_span,
       span.ajxp_icon_arrow{
         font-size: 1.0em;
         display:inline-block;
-        padding: 0 4px;
+        padding: 0 8px;
       }
       img{
         display:none;
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/theme/variables.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/theme/variables.less
index af2c0d733f..c763ae8550 100644
--- a/core/src/plugins/gui.ajax/res/themes/orbit/css/theme/variables.less
+++ b/core/src/plugins/gui.ajax/res/themes/orbit/css/theme/variables.less
@@ -6,7 +6,7 @@
 
 @reactBoxShadowDepth1:0 3px 6px rgba(0,0,0,.16),0 3px 6px rgba(0,0,0,.23);
 @reactBoxShadowDepthHalf:0 2px 3px rgba(0,0,0,.16),0 2px 3px rgba(0,0,0,.43);
-@reactBoxShadowDepthMini:0 1px 2px rgba(0,0,0,.10),0 1px 2px rgba(0,0,0,.33);
+@reactBoxShadowDepthMini:0 1px 2px rgba(0,0,0,.10),0 1px 1px rgba(0,0,0,.33);
 
 @leftColumnWidth: 250px;
 @leftColumnBackgroundColor:#333;
@@ -92,7 +92,7 @@
 
 /* dnd */
 @dnd_dropzone_color:#c3d9ff;
-@dnd_draggable_border:1px solid #c3d9ff;
+@dnd_draggable_border:0;
 @dnd_draggable_bg_color:#ffffff;
 
 /* forms */
@@ -158,7 +158,7 @@
 @filelist_resizer_label_size:11px;
 
 /* slider */
-@slider_background_color:#ebedf0;
+@slider_background_color:#fff;
 @slider_box_shadow:1px 1px 4px rgba(0,0,0,0.75);
 
 /* splitter */
@@ -171,11 +171,11 @@
 @tabs_horizontal_selected_tab_color:@applicationSecondaryColor;
 
 /* tooltips */
-@tooltip_background_color:rgba(69, 77, 85, 0.86);
+@tooltip_background_color:rgba(69, 77, 85, 0.72);
 @tooltip_border_color:rgba(0,0,0,0);
 @tooltip_font_color:@white;
-@tooltip_font_size:13px;
-@tooltip_title_font_size:1.1em;
+@tooltip_font_size:12px;
+@tooltip_title_font_size:14px;
 
 /* tree */
 @tree_item_selected_bg:#666;
@@ -193,10 +193,11 @@
 @uploader_dialog_chooser_secondary:@applicationSecondaryColor;
 @uploader_dialog_progress_color: lighten(@uploader_dialog_chooser_secondary, 28);
 
-/* user widget */
-@userwidget_font_color: @white;
-@userwidget_font_size:13px;
-@userwidget_font_weight:300;
+/* user widget && top toolbar actions */
+@topbar_buttons_color: rgba(255,255,255,0.98);
+@topbar_buttons_color_hover: rgba(255,255,255,1);
+@topbar_buttons_font_size: 13px;
+@topbar_buttons_font_weight: 300;
 
 /* menus */
 @menu_box_shadow:0px 1px 6px rgba(0, 0, 0, 0.16), 0px 1px 6px rgba(0, 0, 0, 0.23);
@@ -228,7 +229,7 @@
 @infopanel_quick_button_border:1px dotted #999;
 @infopanel_section_title_color:#333;
 
-@infopanel_fetchedpane_text_color: #222;
+@infopanel_fetchedpane_text_color: #666;
 @infopanel_fetchedpane_legend_color: #666;
 @infopanel_share_button_tint:@colorCodeShared;
 
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/fonts/open-sans-fontfacekit/Apache.txt b/core/src/plugins/gui.ajax/res/themes/orbit/fonts/open-sans-fontfacekit/Apache.txt
deleted file mode 100644
index 989e2c59e9..0000000000
--- a/core/src/plugins/gui.ajax/res/themes/orbit/fonts/open-sans-fontfacekit/Apache.txt
+++ /dev/null
@@ -1,201 +0,0 @@
-Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/fonts/open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.eot b/core/src/plugins/gui.ajax/res/themes/orbit/fonts/open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.eot
deleted file mode 100644
index 47b7992f49..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/fonts/open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.eot and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/fonts/open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.svg b/core/src/plugins/gui.ajax/res/themes/orbit/fonts/open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.svg
deleted file mode 100644
index fd8662829e..0000000000
--- a/core/src/plugins/gui.ajax/res/themes/orbit/fonts/open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.svg
+++ /dev/null
@@ -1,19649 +0,0 @@
-<?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></metadata>
-<defs>
-<font id="open_sanslight" horiz-adv-x="1169" >
-<font-face units-per-em="2048" ascent="1638" descent="-410" />
-<missing-glyph horiz-adv-x="532" />
-<glyph unicode="ff" horiz-adv-x="1229" d="M29 0zM586 1001h-256v-1001h-99v1001h-202v58l202 37v84q0 200 73.5 293.5t240.5 93.5q90 0 180 -27l-23 -86q-80 25 -159 25q-116 0 -164.5 -68.5t-48.5 -222.5v-101h256v-86zM1200 1001h-256v-1001h-99v1001h-202v58l202 37v84q0 200 73.5 293.5t240.5 93.5 q90 0 180 -27l-23 -86q-80 25 -159 25q-116 0 -164.5 -68.5t-48.5 -222.5v-101h256v-86z" />
-<glyph unicode="&#xfb01;" horiz-adv-x="1077" d="M29 0zM586 1001h-256v-1001h-99v1001h-202v58l202 37v84q0 200 73.5 293.5t240.5 93.5q90 0 180 -27l-23 -86q-80 25 -159 25q-116 0 -164.5 -68.5t-48.5 -222.5v-101h256v-86zM895 0h-99v1087h99v-1087zM782 1389q0 96 63 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71 t-48.5 -26q-63 0 -63 97z" />
-<glyph unicode="&#xfb02;" horiz-adv-x="1077" d="M29 0zM586 1001h-256v-1001h-99v1001h-202v58l202 37v84q0 200 73.5 293.5t240.5 93.5q90 0 180 -27l-23 -86q-80 25 -159 25q-116 0 -164.5 -68.5t-48.5 -222.5v-101h256v-86zM895 0h-99v1556h99v-1556z" />
-<glyph unicode="&#xfb03;" horiz-adv-x="1692" d="M29 0zM586 1001h-256v-1001h-99v1001h-202v58l202 37v84q0 200 73.5 293.5t240.5 93.5q90 0 180 -27l-23 -86q-80 25 -159 25q-116 0 -164.5 -68.5t-48.5 -222.5v-101h256v-86zM1200 1001h-256v-1001h-99v1001h-202v58l202 37v84q0 200 73.5 293.5t240.5 93.5 q90 0 180 -27l-23 -86q-80 25 -159 25q-116 0 -164.5 -68.5t-48.5 -222.5v-101h256v-86zM1510 0h-99v1087h99v-1087zM1397 1389q0 96 63 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-63 0 -63 97z" />
-<glyph unicode="&#xfb04;" horiz-adv-x="1692" d="M29 0zM586 1001h-256v-1001h-99v1001h-202v58l202 37v84q0 200 73.5 293.5t240.5 93.5q90 0 180 -27l-23 -86q-80 25 -159 25q-116 0 -164.5 -68.5t-48.5 -222.5v-101h256v-86zM1200 1001h-256v-1001h-99v1001h-202v58l202 37v84q0 200 73.5 293.5t240.5 93.5 q90 0 180 -27l-23 -86q-80 25 -159 25q-116 0 -164.5 -68.5t-48.5 -222.5v-101h256v-86zM1510 0h-99v1556h99v-1556z" />
-<glyph unicode="&#xd;" horiz-adv-x="1044" />
-<glyph unicode=" "  horiz-adv-x="532" />
-<glyph unicode="&#x09;" horiz-adv-x="532" />
-<glyph unicode="&#xa0;" horiz-adv-x="532" />
-<glyph unicode="!" horiz-adv-x="492" d="M276 377h-61l-29 1085h119zM164 78q0 98 80 98q82 0 82 -98t-82 -98q-80 0 -80 98z" />
-<glyph unicode="&#x22;" horiz-adv-x="723" d="M260 1462l-33 -528h-61l-33 528h127zM590 1462l-33 -528h-61l-33 528h127z" />
-<glyph unicode="#" horiz-adv-x="1323" d="M967 928l-76 -398h303v-79h-320l-86 -451h-90l88 451h-360l-86 -451h-88l86 451h-283v79h299l76 398h-297v80h311l86 454h91l-89 -454h365l88 454h86l-88 -454h285v-80h-301zM440 530h363l78 398h-363z" />
-<glyph unicode="$" d="M991 440q0 -133 -99 -217t-274 -106v-236h-81v232q-92 2 -200.5 22.5t-172.5 50.5v103q75 -36 179.5 -61t193.5 -25v508q-145 44 -215 88t-102 104t-32 146q0 124 94.5 208.5t254.5 104.5v192h81v-190q197 -9 351 -72l-33 -90q-141 62 -318 72v-486q213 -66 293 -144 t80 -204zM881 444q0 85 -63 140.5t-200 95.5v-471q122 13 192.5 75t70.5 160zM297 1049q0 -86 57 -141t183 -93v453q-119 -16 -179.5 -76t-60.5 -143z" />
-<glyph unicode="%" horiz-adv-x="1653" d="M211 1026q0 -186 45 -279.5t141 -93.5q193 0 193 373q0 184 -49.5 276.5t-143.5 92.5q-96 0 -141 -92.5t-45 -276.5zM688 1026q0 -226 -75 -343.5t-216 -117.5q-133 0 -208.5 120.5t-75.5 340.5q0 223 72 340t212 117q139 0 215 -120.5t76 -336.5zM1063 438 q0 -185 45 -277.5t141 -92.5q193 0 193 370q0 369 -193 369q-96 0 -141 -91.5t-45 -277.5zM1540 438q0 -226 -74 -343.5t-215 -117.5q-136 0 -211 121.5t-75 339.5q0 225 73.5 341t212.5 116q137 0 213 -120t76 -337zM1280 1462l-811 -1462h-96l811 1462h96z" />
-<glyph unicode="&#x26;" horiz-adv-x="1460" d="M123 371q0 138 73.5 235t274.5 205l-75 82q-66 71 -98 139t-32 142q0 143 95.5 227t256.5 84q155 0 245.5 -81t90.5 -224q0 -105 -70 -192.5t-253 -194.5l452 -457q61 72 104 157t75 201h96q-63 -246 -209 -426l266 -268h-135l-193 197q-92 -90 -164 -131.5t-157.5 -63.5 t-194.5 -22q-209 0 -328.5 103t-119.5 288zM578 70q128 0 234.5 43.5t209.5 146.5l-483 485q-136 -72 -196.5 -122.5t-88 -109.5t-27.5 -138q0 -143 93 -224t258 -81zM373 1176q0 -79 40 -146t152 -174q159 85 221 159t62 169q0 94 -62 152.5t-168 58.5q-114 0 -179.5 -58 t-65.5 -161z" />
-<glyph unicode="'" horiz-adv-x="393" d="M260 1462l-33 -528h-61l-33 528h127z" />
-<glyph unicode="(" horiz-adv-x="557" d="M82 561q0 265 77.5 496t223.5 405h113q-148 -182 -227 -412.5t-79 -486.5q0 -483 304 -887h-111q-147 170 -224 397t-77 488z" />
-<glyph unicode=")" horiz-adv-x="557" d="M475 561q0 -263 -77.5 -490t-223.5 -395h-111q304 404 304 887q0 257 -79 487.5t-227 411.5h113q147 -175 224 -406.5t77 -494.5z" />
-<glyph unicode="*" horiz-adv-x="1128" d="M631 1556l-37 -405l405 104l21 -131l-395 -39l247 -340l-124 -71l-191 379l-180 -379l-125 71l242 340l-390 39l19 131l401 -104l-39 405h146z" />
-<glyph unicode="+" d="M625 764h434v-82h-434v-432h-82v432h-432v82h432v434h82v-434z" />
-<glyph unicode="," horiz-adv-x="440" d="M295 238l12 -21q-75 -265 -174 -481h-65q77 275 110 502h117z" />
-<glyph unicode="-" horiz-adv-x="659" d="M92 512v82h475v-82h-475z" />
-<glyph unicode="." horiz-adv-x="487" d="M162 78q0 98 80 98q82 0 82 -98t-82 -98q-80 0 -80 98z" />
-<glyph unicode="/" horiz-adv-x="698" d="M674 1462l-545 -1462h-104l544 1462h105z" />
-<glyph unicode="0" d="M1055 735q0 -385 -117.5 -570t-355.5 -185q-229 0 -348 190.5t-119 564.5q0 382 115.5 566t351.5 184q231 0 352 -190.5t121 -559.5zM223 735q0 -340 89 -502.5t270 -162.5q189 0 275.5 168t86.5 497q0 324 -86.5 492t-275.5 168t-274 -168t-85 -492z" />
-<glyph unicode="1" d="M682 0h-98v1065q0 145 12 301q-15 -15 -31 -29t-309 -243l-57 71l397 297h86v-1462z" />
-<glyph unicode="2" d="M1028 0h-915v88l389 406q164 170 230 260t97 172t31 172q0 131 -86 213t-223 82q-183 0 -350 -133l-54 69q183 154 406 154q191 0 300.5 -102t109.5 -281q0 -145 -73.5 -280.5t-268.5 -334.5l-375 -385v-4h782v-96z" />
-<glyph unicode="3" d="M979 1118q0 -136 -85.5 -229t-229.5 -119v-6q176 -22 268 -112t92 -242q0 -205 -139.5 -317.5t-401.5 -112.5q-223 0 -389 83v99q84 -44 188.5 -69t196.5 -25q221 0 332 89.5t111 252.5q0 145 -113.5 223t-333.5 78h-158v96h160q182 0 288.5 86.5t106.5 234.5 q0 122 -86.5 195.5t-226.5 73.5q-109 0 -199 -30.5t-202 -104.5l-49 67q85 71 205 112.5t243 41.5q202 0 312 -95.5t110 -269.5z" />
-<glyph unicode="4" d="M1141 373h-252v-373h-94v373h-752v67l725 1030h121v-1011h252v-86zM795 459v418q0 302 14 507h-8q-20 -37 -123 -188l-516 -737h633z" />
-<glyph unicode="5" d="M537 879q234 0 368.5 -113t134.5 -311q0 -225 -140 -350t-386 -125q-109 0 -207 21.5t-164 61.5v103q108 -55 192 -76.5t179 -21.5q192 0 308 101.5t116 274.5q0 163 -113 256t-307 93q-130 0 -272 -39l-60 39l58 669h704v-96h-610l-45 -516q156 29 244 29z" />
-<glyph unicode="6" d="M131 623q0 285 77.5 479.5t220 288.5t343.5 94q94 0 172 -23v-88q-73 27 -176 27q-247 0 -384.5 -178t-154.5 -518h13q76 98 174 148t207 50q205 0 320.5 -117t115.5 -323q0 -224 -121.5 -353.5t-327.5 -129.5q-222 0 -350.5 169.5t-128.5 473.5zM610 68q164 0 255 103 t91 294q0 168 -90 262t-245 94q-102 0 -189.5 -45t-139.5 -119.5t-52 -152.5q0 -111 49.5 -213.5t134 -162.5t186.5 -60z" />
-<glyph unicode="7" d="M334 0l602 1366h-827v96h946v-73l-604 -1389h-117z" />
-<glyph unicode="8" d="M582 1487q186 0 299.5 -95t113.5 -257q0 -112 -70.5 -198t-228.5 -159q192 -79 270 -173t78 -228q0 -181 -126.5 -289t-339.5 -108q-221 0 -339 101t-118 294q0 131 83 230t257 169q-161 76 -227 160.5t-66 202.5q0 105 53 184.5t148.5 122.5t212.5 43zM223 360 q0 -138 93.5 -214t261.5 -76q164 0 264 80.5t100 218.5q0 124 -78.5 201.5t-302.5 162.5q-184 -71 -261 -157t-77 -216zM580 1397q-141 0 -226.5 -69.5t-85.5 -190.5q0 -70 31.5 -123.5t91 -97t199.5 -101.5q163 63 234 139t71 183q0 120 -84.5 190t-230.5 70z" />
-<glyph unicode="9" d="M1036 842q0 -288 -75.5 -482t-220 -287t-349.5 -93q-104 0 -192 26v86q43 -14 103.5 -21.5t92.5 -7.5q247 0 387 178.5t156 520.5h-12q-73 -96 -174 -147.5t-211 -51.5q-203 0 -316.5 112t-113.5 318q0 220 124.5 356t323.5 136q144 0 252 -75.5t166.5 -221.5t58.5 -346z M559 1397q-158 0 -252 -106.5t-94 -291.5q0 -174 87 -264t249 -90q101 0 188.5 45t139 119.5t51.5 151.5q0 117 -46.5 219t-130 159.5t-192.5 57.5z" />
-<glyph unicode=":" horiz-adv-x="487" d="M162 78q0 98 80 98q82 0 82 -98t-82 -98q-80 0 -80 98zM162 971q0 98 80 98q82 0 82 -98q0 -53 -23.5 -76t-58.5 -23q-34 0 -57 23t-23 76z" />
-<glyph unicode=";" horiz-adv-x="487" d="M303 238l12 -21q-75 -265 -174 -481h-65q29 97 62 245.5t48 256.5h117zM162 971q0 98 80 98q82 0 82 -98q0 -53 -23.5 -76t-58.5 -23q-34 0 -57 23t-23 76z" />
-<glyph unicode="&#x3c;" d="M1059 266l-948 416v61l948 474v-95l-823 -405l823 -355v-96z" />
-<glyph unicode="=" d="M111 885v82h948v-82h-948zM111 477v82h948v-82h-948z" />
-<glyph unicode="&#x3e;" d="M111 362l823 355l-823 405v95l948 -474v-61l-948 -416v96z" />
-<glyph unicode="?" horiz-adv-x="862" d="M293 377v37q0 123 37.5 201t138.5 167l91 79q72 61 103 121t31 138q0 127 -83.5 202t-219.5 75q-79 0 -148 -17.5t-149 -56.5l-37 80q110 48 184.5 64t153.5 16q183 0 288 -98.5t105 -270.5q0 -68 -18 -119t-50.5 -94.5t-78.5 -84t-102 -87.5q-64 -54 -98.5 -98.5 t-50 -93.5t-15.5 -146v-14h-82zM260 78q0 98 80 98q82 0 82 -98t-82 -98q-80 0 -80 98z" />
-<glyph unicode="@" horiz-adv-x="1815" d="M1702 725q0 -228 -90.5 -366t-245.5 -138q-89 0 -144.5 54t-64.5 147h-4q-43 -100 -124 -150.5t-189 -50.5q-148 0 -229 96.5t-81 270.5q0 202 120.5 330.5t314.5 128.5q138 0 286 -41l-22 -464v-30q0 -104 35 -156.5t116 -52.5q103 0 168.5 116.5t65.5 303.5 q0 194 -79 340t-225.5 224.5t-334.5 78.5q-230 0 -405.5 -99.5t-270 -281.5t-94.5 -418q0 -322 167 -497.5t474 -175.5q93 0 188.5 18t231.5 70v-99q-203 -80 -414 -80q-349 0 -544 200.5t-195 557.5q0 256 108.5 460.5t307 317.5t448.5 113q215 0 380.5 -89t255 -254.5 t89.5 -383.5zM633 590q0 -143 55 -215t174 -72q255 0 273 346l16 291q-79 27 -193 27q-149 0 -237 -102.5t-88 -274.5z" />
-<glyph unicode="A" horiz-adv-x="1229" d="M911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174z" />
-<glyph unicode="B" horiz-adv-x="1284" d="M207 1462h401q271 0 398 -92t127 -278q0 -127 -77.5 -211.5t-226.5 -108.5v-6q175 -26 257.5 -110.5t82.5 -235.5q0 -202 -134 -311t-380 -109h-448v1462zM309 811h322q206 0 299.5 68.5t93.5 214.5t-105.5 212t-314.5 66h-295v-561zM309 721v-631h344q406 0 406 330 q0 301 -428 301h-322z" />
-<glyph unicode="C" horiz-adv-x="1272" d="M831 1391q-275 0 -433 -176t-158 -482q0 -313 149 -486t426 -173q184 0 338 47v-90q-145 -51 -362 -51q-308 0 -485 199t-177 556q0 223 84.5 393t243 262.5t368.5 92.5q214 0 383 -80l-41 -92q-160 80 -336 80z" />
-<glyph unicode="D" horiz-adv-x="1446" d="M1317 745q0 -368 -193 -556.5t-567 -188.5h-350v1462h395q350 0 532.5 -183t182.5 -534zM1206 741q0 314 -159.5 472.5t-468.5 158.5h-269v-1282h242q655 0 655 651z" />
-<glyph unicode="E" horiz-adv-x="1130" d="M1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94z" />
-<glyph unicode="F" horiz-adv-x="1028" d="M309 0h-102v1462h801v-94h-699v-620h660v-95h-660v-653z" />
-<glyph unicode="G" horiz-adv-x="1481" d="M782 737h539v-667q-212 -90 -477 -90q-346 0 -530.5 195.5t-184.5 553.5q0 223 91.5 395.5t262 266.5t391.5 94q239 0 429 -88l-41 -92q-190 88 -394 88q-289 0 -458.5 -178.5t-169.5 -481.5q0 -330 161 -496.5t473 -166.5q202 0 343 57v514h-435v96z" />
-<glyph unicode="H" horiz-adv-x="1473" d="M1266 0h-103v719h-854v-719h-102v1462h102v-649h854v649h103v-1462z" />
-<glyph unicode="I" horiz-adv-x="516" d="M207 0v1462h102v-1462h-102z" />
-<glyph unicode="J" horiz-adv-x="506" d="M-33 -369q-92 0 -151 27v88q78 -20 149 -20q242 0 242 264v1472h102v-1462q0 -369 -342 -369z" />
-<glyph unicode="K" horiz-adv-x="1190" d="M1190 0h-125l-561 772l-195 -172v-600h-102v1462h102v-760l162 162l573 598h130l-599 -618z" />
-<glyph unicode="L" horiz-adv-x="1051" d="M207 0v1462h102v-1366h697v-96h-799z" />
-<glyph unicode="M" horiz-adv-x="1767" d="M850 0l-545 1350h-8q8 -124 8 -254v-1096h-98v1462h158l518 -1286h6l518 1286h154v-1462h-103v1108q0 116 12 240h-8l-547 -1348h-65z" />
-<glyph unicode="N" horiz-adv-x="1477" d="M1270 0h-103l-866 1298h-8q12 -232 12 -350v-948h-98v1462h102l865 -1296h6q-9 180 -9 342v954h99v-1462z" />
-<glyph unicode="O" horiz-adv-x="1565" d="M1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170 t-141.5 -483z" />
-<glyph unicode="P" horiz-adv-x="1198" d="M1087 1042q0 -212 -144 -325t-408 -113h-226v-604h-102v1462h358q522 0 522 -420zM309 692h201q247 0 357 81.5t110 264.5q0 169 -104 250.5t-322 81.5h-242v-678z" />
-<glyph unicode="Q" horiz-adv-x="1565" d="M1436 733q0 -294 -126 -486.5t-349 -246.5l333 -348h-166l-282 330l-33 -2h-31q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5 t-401.5 168.5q-261 0 -402.5 -170t-141.5 -483z" />
-<glyph unicode="R" horiz-adv-x="1217" d="M309 637v-637h-102v1462h348q272 0 402 -100.5t130 -302.5q0 -147 -77.5 -248t-235.5 -145l397 -666h-122l-377 637h-363zM309 725h279q185 0 287 82.5t102 243.5q0 167 -100 243t-326 76h-242v-645z" />
-<glyph unicode="S" horiz-adv-x="1116" d="M1014 377q0 -183 -134.5 -290t-357.5 -107q-268 0 -411 59v102q158 -67 403 -67q180 0 285.5 82.5t105.5 216.5q0 83 -35 137.5t-114 99.5t-232 97q-224 77 -309.5 166.5t-85.5 238.5q0 164 128.5 267.5t330.5 103.5q206 0 387 -78l-37 -88q-182 76 -348 76 q-162 0 -258 -75t-96 -204q0 -81 29.5 -133t96.5 -93.5t230 -99.5q171 -59 257 -114.5t125.5 -126t39.5 -170.5z" />
-<glyph unicode="T" horiz-adv-x="1073" d="M588 0h-103v1366h-475v96h1053v-96h-475v-1366z" />
-<glyph unicode="U" horiz-adv-x="1473" d="M1282 1462v-946q0 -252 -146 -394t-407 -142q-254 0 -396.5 142.5t-142.5 397.5v942h103v-946q0 -211 117 -328.5t331 -117.5q209 0 324 115.5t115 320.5v956h102z" />
-<glyph unicode="V" horiz-adv-x="1182" d="M1071 1462h111l-547 -1462h-90l-545 1462h109l368 -995q84 -225 113 -338q20 75 79 233z" />
-<glyph unicode="W" horiz-adv-x="1827" d="M1372 0h-84l-321 1128q-40 139 -60 228q-16 -87 -45.5 -200t-322.5 -1156h-86l-402 1462h107l256 -942q15 -57 28 -105.5t23.5 -91t19 -82t15.5 -79.5q24 136 102 413l250 887h113l293 -1018q51 -176 73 -284q13 72 33.5 153t308.5 1149h103z" />
-<glyph unicode="X" horiz-adv-x="1102" d="M1102 0h-117l-432 682l-440 -682h-113l492 762l-447 700h115l395 -626l401 626h109l-453 -698z" />
-<glyph unicode="Y" horiz-adv-x="1081" d="M543 662l428 800h110l-487 -897v-565h-105v557l-489 905h117z" />
-<glyph unicode="Z" horiz-adv-x="1180" d="M1098 0h-1016v76l856 1290h-817v96h954v-76l-858 -1290h881v-96z" />
-<glyph unicode="[" horiz-adv-x="653" d="M602 -324h-428v1786h428v-94h-330v-1597h330v-95z" />
-<glyph unicode="\" horiz-adv-x="698" d="M127 1462l547 -1462h-103l-546 1462h102z" />
-<glyph unicode="]" horiz-adv-x="653" d="M51 -229h330v1597h-330v94h428v-1786h-428v95z" />
-<glyph unicode="^" d="M88 561l465 912h68l460 -912h-100l-395 791l-398 -791h-100z" />
-<glyph unicode="_" horiz-adv-x="842" d="M846 -266h-850v82h850v-82z" />
-<glyph unicode="`" horiz-adv-x="1182" d="M776 1241h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
-<glyph unicode="a" horiz-adv-x="1085" d="M842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5z" />
-<glyph unicode="b" horiz-adv-x="1219" d="M641 1108q228 0 343.5 -143.5t115.5 -419.5q0 -271 -121.5 -418t-341.5 -147q-116 0 -209 48t-147 136h-9l-28 -164h-62v1556h99v-391q0 -88 -4 -162l-3 -85h7q62 98 149.5 144t210.5 46zM639 1018q-192 0 -275 -110t-83 -363v-17q0 -246 86.5 -353t269.5 -107 q178 0 268 124.5t90 354.5q0 471 -356 471z" />
-<glyph unicode="c" horiz-adv-x="973" d="M616 -20q-233 0 -365 147t-132 410q0 270 137 420.5t375 150.5q141 0 270 -49l-27 -88q-141 47 -245 47q-200 0 -303 -123.5t-103 -355.5q0 -220 103 -344.5t288 -124.5q148 0 275 53v-92q-104 -51 -273 -51z" />
-<glyph unicode="d" horiz-adv-x="1219" d="M580 1108q118 0 204 -43t154 -147h6q-6 126 -6 247v391h98v-1556h-65l-25 166h-8q-124 -186 -356 -186q-225 0 -344 140t-119 408q0 282 118 431t343 149zM580 1018q-178 0 -267.5 -125t-89.5 -363q0 -462 359 -462q184 0 270 107t86 353v17q0 252 -84.5 362.5 t-273.5 110.5z" />
-<glyph unicode="e" horiz-adv-x="1124" d="M621 -20q-237 0 -369.5 146t-132.5 409q0 260 128 416.5t345 156.5q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5zM592 1020q-157 0 -252 -103.5t-111 -298.5h672q0 189 -82 295.5 t-227 106.5z" />
-<glyph unicode="f" horiz-adv-x="614" d="M586 1001h-256v-1001h-99v1001h-202v58l202 37v84q0 200 73.5 293.5t240.5 93.5q90 0 180 -27l-23 -86q-80 25 -159 25q-116 0 -164.5 -68.5t-48.5 -222.5v-101h256v-86z" />
-<glyph unicode="g" horiz-adv-x="1071" d="M1030 1087v-69l-225 -14q90 -112 90 -246q0 -157 -104.5 -254.5t-280.5 -97.5q-74 0 -104 6q-59 -31 -90 -73t-31 -89q0 -52 39.5 -76t132.5 -24h190q177 0 271 -71.5t94 -211.5q0 -172 -139.5 -265.5t-397.5 -93.5q-205 0 -317.5 79t-112.5 220q0 112 69.5 186 t188.5 101q-49 21 -78.5 59.5t-29.5 88.5q0 109 139 192q-95 39 -148 122.5t-53 191.5q0 163 103.5 261.5t279.5 98.5q107 0 166 -21h348zM150 -184q0 -224 333 -224q428 0 428 273q0 98 -67 142t-217 44h-178q-299 0 -299 -235zM233 748q0 -126 76.5 -195.5t204.5 -69.5 q136 0 208.5 69t72.5 200q0 139 -74.5 208.5t-208.5 69.5q-130 0 -204.5 -74.5t-74.5 -207.5z" />
-<glyph unicode="h" horiz-adv-x="1208" d="M940 0v705q0 164 -69 238.5t-214 74.5q-195 0 -285.5 -98.5t-90.5 -319.5v-600h-99v1556h99v-495l-5 -139h7q61 98 154 142t231 44q370 0 370 -397v-711h-98z" />
-<glyph unicode="i" horiz-adv-x="463" d="M281 0h-99v1087h99v-1087zM168 1389q0 96 63 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-63 0 -63 97z" />
-<glyph unicode="j" horiz-adv-x="463" d="M37 -492q-80 0 -135 25v86q69 -20 129 -20q151 0 151 176v1312h99v-1298q0 -135 -63.5 -208t-180.5 -73zM168 1389q0 96 63 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-63 0 -63 97z" />
-<glyph unicode="k" horiz-adv-x="991" d="M279 477l555 610h120l-428 -464l465 -623h-119l-413 549l-178 -162v-387h-99v1556h99v-780l-7 -299h5z" />
-<glyph unicode="l" horiz-adv-x="463" d="M281 0h-99v1556h99v-1556z" />
-<glyph unicode="m" horiz-adv-x="1808" d="M1540 0v713q0 159 -62 232t-190 73q-167 0 -247 -92t-80 -289v-637h-101v743q0 275 -252 275q-171 0 -249 -99.5t-78 -318.5v-600h-99v1087h82l21 -149h6q45 81 128 125.5t183 44.5q257 0 330 -193h4q53 93 142.5 143t203.5 50q178 0 267 -95t89 -302v-711h-98z" />
-<glyph unicode="n" horiz-adv-x="1208" d="M940 0v705q0 164 -69 238.5t-214 74.5q-195 0 -285.5 -98.5t-90.5 -319.5v-600h-99v1087h84l19 -149h6q106 170 377 170q370 0 370 -397v-711h-98z" />
-<glyph unicode="o" horiz-adv-x="1200" d="M1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5t-97.5 -349.5z " />
-<glyph unicode="p" horiz-adv-x="1219" d="M647 -20q-251 0 -366 188h-7l3 -84q4 -74 4 -162v-414h-99v1579h84l19 -155h6q112 176 358 176q220 0 335.5 -144.5t115.5 -420.5q0 -268 -121.5 -415.5t-331.5 -147.5zM645 68q167 0 258.5 124t91.5 347q0 479 -346 479q-190 0 -279 -104.5t-89 -340.5v-32 q0 -255 85.5 -364t278.5 -109z" />
-<glyph unicode="q" horiz-adv-x="1219" d="M569 -20q-214 0 -332 142t-118 410q0 275 118 425.5t338 150.5q236 0 353 -174h6l18 153h84v-1579h-98v414q0 122 6 248h-6q-118 -190 -369 -190zM571 68q198 0 282.5 109t84.5 366v12q0 245 -85 354t-271 109q-176 0 -267.5 -124t-91.5 -364q0 -229 89.5 -345.5 t258.5 -116.5z" />
-<glyph unicode="r" horiz-adv-x="797" d="M610 1108q69 0 148 -14l-19 -95q-68 17 -141 17q-139 0 -228 -118t-89 -298v-600h-99v1087h84l10 -196h7q67 120 143 168.5t184 48.5z" />
-<glyph unicode="s" horiz-adv-x="954" d="M856 283q0 -146 -111 -224.5t-315 -78.5q-218 0 -346 67v107q164 -82 346 -82q161 0 244.5 53.5t83.5 142.5q0 82 -66.5 138t-218.5 110q-163 59 -229 101.5t-99.5 96t-33.5 130.5q0 122 102.5 193t286.5 71q176 0 334 -66l-37 -90q-160 66 -297 66q-133 0 -211 -44 t-78 -122q0 -85 60.5 -136t236.5 -114q147 -53 214 -95.5t100.5 -96.5t33.5 -127z" />
-<glyph unicode="t" horiz-adv-x="686" d="M469 68q94 0 164 16v-80q-72 -24 -166 -24q-144 0 -212.5 77t-68.5 242v702h-161v58l161 45l50 246h51v-263h319v-86h-319v-688q0 -125 44 -185t138 -60z" />
-<glyph unicode="u" horiz-adv-x="1208" d="M268 1087v-704q0 -164 69 -238.5t214 -74.5q194 0 285.5 98t91.5 319v600h98v-1087h-84l-18 150h-6q-106 -170 -377 -170q-371 0 -371 397v710h98z" />
-<glyph unicode="v" horiz-adv-x="940" d="M420 0l-420 1087h102l281 -739q56 -142 84 -248h6q41 136 84 250l281 737h102l-420 -1087h-100z" />
-<glyph unicode="w" horiz-adv-x="1481" d="M1051 0l-238 727q-23 74 -59 217h-6l-21 -74l-45 -145l-242 -725h-98l-311 1087h106l174 -630q61 -234 80 -344h6q59 234 86 311l224 663h90l213 -661q72 -235 88 -311h6q8 65 80 348l166 624h100l-295 -1087h-104z" />
-<glyph unicode="x" horiz-adv-x="1020" d="M449 559l-379 528h114l324 -458l321 458h109l-373 -528l400 -559h-115l-342 485l-344 -485h-109z" />
-<glyph unicode="y" horiz-adv-x="940" d="M0 1087h102l230 -610q105 -281 133 -379h6q42 129 137 385l230 604h102l-487 -1263q-59 -154 -99 -208t-93.5 -81t-129.5 -27q-57 0 -127 21v86q58 -16 125 -16q51 0 90 24t70.5 74.5t73 160t53.5 142.5z" />
-<glyph unicode="z" horiz-adv-x="944" d="M858 0h-776v63l645 936h-598v88h727v-63l-649 -936h651v-88z" />
-<glyph unicode="{" horiz-adv-x="723" d="M389 -27q0 -102 59.5 -152.5t202.5 -53.5v-91q-195 0 -277.5 75t-82.5 231v337q0 205 -230 209v80q122 2 176 51t54 148v350q0 299 360 305v-90q-138 -5 -200 -58t-62 -157v-305q0 -130 -44 -194t-142 -85v-8q97 -20 141.5 -83.5t44.5 -186.5v-322z" />
-<glyph unicode="|" horiz-adv-x="1108" d="M508 1561h92v-2067h-92v2067z" />
-<glyph unicode="}" horiz-adv-x="723" d="M334 295q0 123 44.5 186.5t141.5 83.5v8q-97 20 -141.5 84t-44.5 195v305q0 103 -61.5 156.5t-200.5 58.5v90q174 0 267 -77.5t93 -227.5v-350q0 -100 54.5 -148.5t175.5 -50.5v-80q-230 -4 -230 -209v-337q0 -155 -82.5 -230.5t-277.5 -75.5v91q141 2 201.5 52.5 t60.5 153.5v322z" />
-<glyph unicode="~" d="M334 745q-49 0 -108 -30.5t-115 -89.5v94q108 110 233 110q61 0 115 -13.5t155 -57.5q126 -58 220 -58q56 0 109.5 30.5t115.5 94.5v-96q-48 -49 -104.5 -81t-129.5 -32q-116 0 -270 72q-124 57 -221 57z" />
-<glyph unicode="&#xa1;" horiz-adv-x="492" d="M215 711h61l29 -1086h-119zM166 1010q0 98 80 98q82 0 82 -98q0 -53 -23.5 -76t-58.5 -23q-34 0 -57 23t-23 76z" />
-<glyph unicode="&#xa2;" d="M602 190q-186 30 -288.5 175t-102.5 380q0 232 102.5 381.5t288.5 182.5v174h82v-166h14q131 0 275 -55l-31 -84q-134 51 -237 51q-187 0 -288.5 -122.5t-101.5 -358.5q0 -225 100.5 -349.5t280.5 -124.5q131 0 267 58v-92q-110 -56 -267 -56h-12v-204h-82v210z" />
-<glyph unicode="&#xa3;" d="M412 676v-256q0 -116 -35 -196t-113 -128h809v-96h-995v84q110 21 171.5 110t61.5 224v258h-211v82h211v297q0 204 98 315t281 111q175 0 330 -68l-35 -86q-157 66 -295 66q-141 0 -209.5 -81t-68.5 -253v-301h411v-82h-411z" />
-<glyph unicode="&#xa4;" d="M991 723q0 -151 -90 -256l139 -141l-59 -60l-137 142q-110 -93 -260 -93q-153 0 -260 93l-138 -142l-59 60l139 141q-90 106 -90 256q0 147 90 258l-139 141l59 60l138 -142q103 93 260 93q155 0 260 -93l137 142l59 -60l-139 -141q90 -111 90 -258zM584 395 q134 0 228.5 95.5t94.5 232.5q0 136 -95 233t-228 97q-134 0 -229 -97t-95 -233t94.5 -232t229.5 -96z" />
-<glyph unicode="&#xa5;" d="M586 666l428 796h110l-432 -788h283v-82h-338v-205h338v-82h-338v-305h-105v305h-337v82h337v205h-337v82h278l-430 788h117z" />
-<glyph unicode="&#xa6;" horiz-adv-x="1108" d="M508 1561h92v-764h-92v764zM508 258h92v-764h-92v764z" />
-<glyph unicode="&#xa7;" horiz-adv-x="1057" d="M145 813q0 83 50.5 152.5t138.5 107.5q-86 47 -125 102t-39 136q0 117 101.5 183.5t275.5 66.5q175 0 336 -64l-35 -80q-91 34 -158.5 47t-144.5 13q-134 0 -205.5 -44.5t-71.5 -119.5q0 -54 25.5 -88.5t85.5 -65.5t188 -74q192 -64 264 -132.5t72 -170.5 q0 -173 -186 -274q86 -42 129 -96t43 -136q0 -135 -113 -207.5t-311 -72.5q-92 0 -171 15t-165 52v95q182 -78 332 -78q162 0 247 49.5t85 140.5q0 55 -25 87.5t-88.5 65.5t-190.5 79q-200 73 -272 141.5t-72 169.5zM246 825q0 -65 31.5 -104t105.5 -75t250 -99 q82 41 126 98t44 121q0 62 -32 102t-108.5 77t-236.5 87q-81 -23 -130.5 -79t-49.5 -128z" />
-<glyph unicode="&#xa8;" horiz-adv-x="1182" d="M336 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM717 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#xa9;" horiz-adv-x="1704" d="M897 1092q-142 0 -222.5 -94.5t-80.5 -264.5q0 -186 74.5 -275t220.5 -89q84 0 198 43v-88q-102 -45 -208 -45q-187 0 -288.5 115t-101.5 331q0 208 111 332.5t297 124.5q119 0 227 -52l-37 -83q-98 45 -190 45zM100 731q0 200 100 375t275 276t377 101q200 0 375 -100 t276 -275t101 -377q0 -197 -97 -370t-272 -277t-383 -104q-207 0 -382 103.5t-272.5 276.5t-97.5 371zM193 731q0 -178 88.5 -329.5t240.5 -240.5t330 -89t329.5 88.5t240.5 240.5t89 330q0 174 -85.5 325t-239 243t-334.5 92q-176 0 -328.5 -88.5t-241.5 -242.5t-89 -329z " />
-<glyph unicode="&#xaa;" horiz-adv-x="686" d="M512 813l-25 72q-84 -84 -202 -84q-95 0 -151 49t-56 139q0 100 80 151.5t241 59.5l95 4v43q0 77 -38 114.5t-106 37.5q-87 0 -196 -49l-33 73q117 56 231 56q228 0 228 -215v-451h-68zM168 993q0 -54 35 -85t96 -31q90 0 142.5 50t52.5 142v64l-88 -5 q-116 -6 -177 -36.5t-61 -98.5z" />
-<glyph unicode="&#xab;" horiz-adv-x="885" d="M82 543l309 393l62 -43l-254 -363l254 -362l-62 -43l-309 391v27zM442 543l310 393l61 -43l-254 -363l254 -362l-61 -43l-310 391v27z" />
-<glyph unicode="&#xac;" d="M1038 764v-494h-82v412h-845v82h927z" />
-<glyph unicode="&#xad;" horiz-adv-x="659" d="M92 512zM92 512v82h475v-82h-475z" />
-<glyph unicode="&#xae;" horiz-adv-x="1704" d="M709 731h112q91 0 143 46.5t52 135.5q0 172 -197 172h-110v-354zM1120 918q0 -79 -38.5 -139.5t-110.5 -94.5l237 -393h-121l-210 360h-168v-360h-101v880h211q143 0 222 -62t79 -191zM100 731q0 200 100 375t275 276t377 101q200 0 375 -100t276 -275t101 -377 q0 -197 -97 -370t-272 -277t-383 -104q-207 0 -382 103.5t-272.5 276.5t-97.5 371zM193 731q0 -178 88.5 -329.5t240.5 -240.5t330 -89t329.5 88.5t240.5 240.5t89 330q0 174 -85.5 325t-239 243t-334.5 92q-176 0 -328.5 -88.5t-241.5 -242.5t-89 -329z" />
-<glyph unicode="&#xaf;" horiz-adv-x="1024" d="M1030 1556h-1036v82h1036v-82z" />
-<glyph unicode="&#xb0;" horiz-adv-x="877" d="M139 1184q0 132 86.5 215.5t212.5 83.5t212.5 -83.5t86.5 -215.5t-86.5 -215.5t-212.5 -83.5q-130 0 -214.5 83t-84.5 216zM229 1184q0 -91 61 -154t148 -63q86 0 147.5 62t61.5 155q0 92 -60 154.5t-149 62.5q-90 0 -149.5 -64t-59.5 -153z" />
-<glyph unicode="&#xb1;" d="M111 1zM111 1v82h948v-82h-948zM625 764h434v-82h-434v-432h-82v432h-432v82h432v434h82v-434z" />
-<glyph unicode="&#xb2;" horiz-adv-x="688" d="M629 586h-576v78l242 237q125 121 172 193t47 149q0 71 -46.5 112.5t-123.5 41.5q-108 0 -217 -82l-49 65q119 103 270 103q124 0 194 -63.5t70 -174.5q0 -47 -13 -89t-40 -85.5t-68.5 -90t-308.5 -306.5h447v-88z" />
-<glyph unicode="&#xb3;" horiz-adv-x="688" d="M616 1260q0 -78 -44 -131.5t-117 -75.5q186 -45 186 -211q0 -130 -88.5 -201.5t-247.5 -71.5q-144 0 -264 60v88q136 -62 266 -62q115 0 174.5 49t59.5 136q0 83 -59.5 122t-178.5 39h-131v84h135q105 0 158 43.5t53 120.5q0 67 -47 107.5t-127 40.5q-128 0 -246 -78 l-47 70q130 94 293 94q127 0 199.5 -60t72.5 -163z" />
-<glyph unicode="&#xb4;" horiz-adv-x="1182" d="M393 1257q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#xb5;" horiz-adv-x="1221" d="M281 1087v-704q0 -164 69 -238.5t213 -74.5q194 0 285.5 98t91.5 319v600h98v-1087h-84l-18 150h-6q-50 -77 -150 -123.5t-217 -46.5q-99 0 -167.5 27.5t-119.5 84.5q5 -92 5 -170v-414h-99v1579h99z" />
-<glyph unicode="&#xb6;" horiz-adv-x="1341" d="M1106 -260h-100v1722h-228v-1722h-100v819q-64 -18 -146 -18q-216 0 -317.5 125t-101.5 376q0 260 109 387t341 127h543v-1816z" />
-<glyph unicode="&#xb7;" horiz-adv-x="487" d="M162 623zM162 721q0 98 80 98q82 0 82 -98t-82 -98q-80 0 -80 98z" />
-<glyph unicode="&#xb8;" horiz-adv-x="420" d="M393 -291q0 -100 -67.5 -150.5t-188.5 -50.5q-68 0 -94 11v88q30 -10 92 -10q78 0 119 28t41 80q0 94 -193 121l93 174h96l-66 -117q168 -37 168 -174z" />
-<glyph unicode="&#xb9;" horiz-adv-x="688" d="M350 1462h92v-876h-98v547q0 99 12 233q-26 -23 -233 -145l-47 77z" />
-<glyph unicode="&#xba;" horiz-adv-x="739" d="M670 1141q0 -161 -80 -250.5t-223 -89.5t-220 86t-77 254q0 162 78 250t223 88q142 0 220.5 -87t78.5 -251zM160 1141q0 -264 209 -264t209 264q0 131 -50 194.5t-159 63.5t-159 -63.5t-50 -194.5z" />
-<glyph unicode="&#xbb;" horiz-adv-x="885" d="M803 518l-309 -393l-62 43l254 362l-254 363l62 43l309 -391v-27zM442 518l-309 -393l-61 43l254 362l-254 363l61 43l309 -391v-27z" />
-<glyph unicode="&#xbc;" horiz-adv-x="1516" d="M59 0zM333 1462h92v-876h-98v547q0 99 12 233q-26 -23 -233 -145l-47 77zM1148 1462l-811 -1462h-94l811 1462h94zM1392 242h-129v-241h-90v241h-413v60l407 581h96v-563h129v-78zM1173 320v221q0 132 8 232q-6 -12 -21.5 -35.5t-295.5 -417.5h309z" />
-<glyph unicode="&#xbd;" horiz-adv-x="1516" d="M11 0zM285 1462h92v-876h-98v547q0 99 12 233q-26 -23 -233 -145l-47 77zM1073 1462l-811 -1462h-94l811 1462h94zM1403 1h-576v78l242 237q125 121 172 193t47 149q0 71 -46.5 112.5t-123.5 41.5q-108 0 -217 -82l-49 65q119 103 270 103q124 0 194 -63.5t70 -174.5 q0 -47 -13 -89t-40 -85.5t-68.5 -90t-308.5 -306.5h447v-88z" />
-<glyph unicode="&#xbe;" horiz-adv-x="1516" d="M41 0zM616 1260q0 -78 -44 -131.5t-117 -75.5q186 -45 186 -211q0 -130 -88.5 -201.5t-247.5 -71.5q-144 0 -264 60v88q136 -62 266 -62q115 0 174.5 49t59.5 136q0 83 -59.5 122t-178.5 39h-131v84h135q105 0 158 43.5t53 120.5q0 67 -47 107.5t-127 40.5 q-128 0 -246 -78l-47 70q130 94 293 94q127 0 199.5 -60t72.5 -163zM1300 1462l-811 -1462h-94l811 1462h94zM1495 242h-129v-241h-90v241h-413v60l407 581h96v-563h129v-78zM1276 320v221q0 132 8 232q-6 -12 -21.5 -35.5t-295.5 -417.5h309z" />
-<glyph unicode="&#xbf;" horiz-adv-x="862" d="M569 711v-37q0 -125 -39.5 -204.5t-136.5 -164.5l-90 -79q-73 -61 -104 -120.5t-31 -138.5q0 -124 82 -200t221 -76q125 0 233 46l64 27l37 -79q-111 -48 -185.5 -64t-152.5 -16q-184 0 -288.5 99t-104.5 269q0 70 20 124t58.5 102t171.5 159q64 53 98.5 98.5t49.5 94 t15 145.5v15h82zM440 1010q0 98 80 98q82 0 82 -98q0 -53 -23.5 -76t-58.5 -23q-34 0 -57 23t-23 76z" />
-<glyph unicode="&#xc0;" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM720 1579h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
-<glyph unicode="&#xc1;" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM504 1595q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#xc2;" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM328 1595q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#xc3;" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM784 1581q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73q10 111 63 174.5t137 63.5q48 0 88 -25t82 -59 q34 -28 66 -50t61 -22q46 0 77 36.5t48 119.5h76q-16 -116 -69 -177t-132 -61z" />
-<glyph unicode="&#xc4;" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM367 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM748 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#xc5;" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM836 1610q0 -97 -60 -155t-157 -58t-157 58t-60 155q0 94 60 152.5t157 58.5t157 -59t60 -152zM482 1610q0 -66 37.5 -103.5t99.5 -37.5 t99.5 37.5t37.5 103.5q0 64 -39 101.5t-98 37.5q-62 0 -99.5 -38t-37.5 -101z" />
-<glyph unicode="&#xc6;" horiz-adv-x="1653" d="M1528 0h-717v516h-475l-227 -516h-111l653 1462h877v-94h-615v-553h576v-94h-576v-627h615v-94zM377 608h434v760h-100z" />
-<glyph unicode="&#xc7;" horiz-adv-x="1272" d="M129 0zM831 1391q-275 0 -433 -176t-158 -482q0 -313 149 -486t426 -173q184 0 338 47v-90q-145 -51 -362 -51q-308 0 -485 199t-177 556q0 223 84.5 393t243 262.5t368.5 92.5q214 0 383 -80l-41 -92q-160 80 -336 80zM911 -291q0 -100 -67.5 -150.5t-188.5 -50.5 q-68 0 -94 11v88q30 -10 92 -10q78 0 119 28t41 80q0 94 -193 121l93 174h96l-66 -117q168 -37 168 -174z" />
-<glyph unicode="&#xc8;" horiz-adv-x="1130" d="M207 0zM1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94zM697 1579h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
-<glyph unicode="&#xc9;" horiz-adv-x="1130" d="M207 0zM1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94zM463 1595q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#xca;" horiz-adv-x="1130" d="M207 0zM1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94zM315 1595q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#xcb;" horiz-adv-x="1130" d="M207 0zM1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94zM354 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM735 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#xcc;" horiz-adv-x="516" d="M0 0zM207 0v1462h102v-1462h-102zM320 1579h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
-<glyph unicode="&#xcd;" horiz-adv-x="516" d="M191 0zM207 0v1462h102v-1462h-102zM191 1595q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#xce;" horiz-adv-x="516" d="M0 0zM207 0v1462h102v-1462h-102zM-32 1595q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#xcf;" horiz-adv-x="516" d="M5 0zM207 0v1462h102v-1462h-102zM5 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM386 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#xd0;" horiz-adv-x="1466" d="M1317 745q0 -368 -193 -556.5t-567 -188.5h-350v678h-160v94h160v690h395q350 0 532.5 -183t182.5 -534zM1206 741q0 314 -159.5 472.5t-468.5 158.5h-269v-600h406v-94h-406v-588h242q655 0 655 651z" />
-<glyph unicode="&#xd1;" horiz-adv-x="1477" d="M207 0zM1270 0h-103l-866 1298h-8q12 -232 12 -350v-948h-98v1462h102l865 -1296h6q-9 180 -9 342v954h99v-1462zM897 1581q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73q10 111 63 174.5t137 63.5q48 0 88 -25t82 -59 q34 -28 66 -50t61 -22q46 0 77 36.5t48 119.5h76q-16 -116 -69 -177t-132 -61z" />
-<glyph unicode="&#xd2;" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170 t-141.5 -483zM885 1579h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
-<glyph unicode="&#xd3;" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170 t-141.5 -483zM686 1595q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#xd4;" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170 t-141.5 -483zM492 1595q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#xd5;" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170 t-141.5 -483zM940 1581q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73q10 111 63 174.5t137 63.5q48 0 88 -25t82 -59q34 -28 66 -50t61 -22q46 0 77 36.5t48 119.5h76q-16 -116 -69 -177t-132 -61z" />
-<glyph unicode="&#xd6;" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170 t-141.5 -483zM529 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM910 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#xd7;" d="M584 780l409 408l58 -58l-408 -407l406 -408l-58 -57l-407 408l-406 -408l-57 57l405 408l-407 407l57 58z" />
-<glyph unicode="&#xd8;" horiz-adv-x="1565" d="M1436 733q0 -348 -174 -550.5t-480 -202.5q-236 0 -395 120l-86 -120l-74 59l90 127q-188 200 -188 569q0 349 175.5 549.5t479.5 200.5q232 0 392 -121l108 152l72 -60l-111 -153q191 -207 191 -570zM1325 733q0 315 -139 486l-742 -1037q133 -106 338 -106 q264 0 403.5 170t139.5 487zM240 733q0 -312 139 -483l739 1034q-133 102 -334 102q-261 0 -402.5 -170t-141.5 -483z" />
-<glyph unicode="&#xd9;" horiz-adv-x="1473" d="M190 0zM1282 1462v-946q0 -252 -146 -394t-407 -142q-254 0 -396.5 142.5t-142.5 397.5v942h103v-946q0 -211 117 -328.5t331 -117.5q209 0 324 115.5t115 320.5v956h102zM833 1579h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
-<glyph unicode="&#xda;" horiz-adv-x="1473" d="M190 0zM1282 1462v-946q0 -252 -146 -394t-407 -142q-254 0 -396.5 142.5t-142.5 397.5v942h103v-946q0 -211 117 -328.5t331 -117.5q209 0 324 115.5t115 320.5v956h102zM633 1595q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#xdb;" horiz-adv-x="1473" d="M190 0zM1282 1462v-946q0 -252 -146 -394t-407 -142q-254 0 -396.5 142.5t-142.5 397.5v942h103v-946q0 -211 117 -328.5t331 -117.5q209 0 324 115.5t115 320.5v956h102zM444 1595q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207 q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#xdc;" horiz-adv-x="1473" d="M190 0zM1282 1462v-946q0 -252 -146 -394t-407 -142q-254 0 -396.5 142.5t-142.5 397.5v942h103v-946q0 -211 117 -328.5t331 -117.5q209 0 324 115.5t115 320.5v956h102zM481 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM862 1727q0 46 15.5 66 t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#xdd;" horiz-adv-x="1081" d="M0 0zM543 662l428 800h110l-487 -897v-565h-105v557l-489 905h117zM434 1595q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#xde;" horiz-adv-x="1198" d="M1087 778q0 -212 -144 -325t-408 -113h-226v-340h-102v1462h102v-264h256q522 0 522 -420zM309 428h201q247 0 357 81.5t110 264.5q0 169 -104 250.5t-322 81.5h-242v-678z" />
-<glyph unicode="&#xdf;" horiz-adv-x="1194" d="M961 1284q0 -139 -139 -250q-81 -64 -110.5 -100.5t-29.5 -75.5q0 -44 14.5 -68t51.5 -57t102 -78q106 -75 151.5 -124.5t68 -103t22.5 -120.5q0 -156 -88 -241.5t-246 -85.5q-95 0 -174.5 18.5t-126.5 48.5v107q65 -38 148.5 -62t152.5 -24q114 0 174.5 54.5t60.5 160.5 q0 83 -39 144t-149 136q-127 87 -175 147t-48 146q0 60 32.5 110t106.5 108q74 57 106.5 105.5t32.5 106.5q0 93 -70 143t-202 50q-145 0 -226 -69t-81 -196v-1214h-99v1206q0 173 103.5 267t292.5 94q188 0 285.5 -72.5t97.5 -210.5z" />
-<glyph unicode="&#xe0;" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM638 1241h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
-<glyph unicode="&#xe1;" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM422 1257q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#xe2;" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM251 1257q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#xe3;" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM697 1243q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73q10 111 63 174.5t137 63.5q48 0 88 -25t82 -59q34 -28 66 -50t61 -22q46 0 77 36.5t48 119.5 h76q-16 -116 -69 -177t-132 -61z" />
-<glyph unicode="&#xe4;" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM282 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM663 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#xe5;" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM759 1456q0 -97 -60 -155t-157 -58t-157 58t-60 155q0 94 60 152.5t157 58.5t157 -59t60 -152zM405 1456q0 -66 37.5 -103.5t99.5 -37.5t99.5 37.5t37.5 103.5q0 64 -39 101.5t-98 37.5 q-62 0 -99.5 -38t-37.5 -101z" />
-<glyph unicode="&#xe6;" horiz-adv-x="1731" d="M1243 -20q-295 0 -397 256q-68 -133 -168 -194.5t-252 -61.5q-156 0 -242 82.5t-86 226.5q0 154 125 243t377 97l201 6v72q0 155 -61.5 234t-198.5 79q-148 0 -305 -84l-37 86q173 84 346 84q261 0 325 -211q111 213 347 213q184 0 289.5 -134.5t105.5 -363.5v-80h-715 q0 -460 348 -460q85 0 150 12t174 57v-90q-92 -41 -165 -55t-161 -14zM434 70q169 0 266 99.5t97 276.5v107l-187 -8q-219 -11 -313 -71.5t-94 -188.5q0 -102 61 -158.5t170 -56.5zM1217 1020q-284 0 -314 -402h604q0 188 -77.5 295t-212.5 107z" />
-<glyph unicode="&#xe7;" horiz-adv-x="973" d="M119 0zM616 -20q-233 0 -365 147t-132 410q0 270 137 420.5t375 150.5q141 0 270 -49l-27 -88q-141 47 -245 47q-200 0 -303 -123.5t-103 -355.5q0 -220 103 -344.5t288 -124.5q148 0 275 53v-92q-104 -51 -273 -51zM723 -291q0 -100 -67.5 -150.5t-188.5 -50.5 q-68 0 -94 11v88q30 -10 92 -10q78 0 119 28t41 80q0 94 -193 121l93 174h96l-66 -117q168 -37 168 -174z" />
-<glyph unicode="&#xe8;" horiz-adv-x="1124" d="M119 0zM621 -20q-237 0 -369.5 146t-132.5 409q0 260 128 416.5t345 156.5q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5zM592 1020q-157 0 -252 -103.5t-111 -298.5h672q0 189 -82 295.5 t-227 106.5zM685 1241h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
-<glyph unicode="&#xe9;" horiz-adv-x="1124" d="M119 0zM621 -20q-237 0 -369.5 146t-132.5 409q0 260 128 416.5t345 156.5q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5zM592 1020q-157 0 -252 -103.5t-111 -298.5h672q0 189 -82 295.5 t-227 106.5zM452 1257q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#xea;" horiz-adv-x="1124" d="M119 0zM621 -20q-237 0 -369.5 146t-132.5 409q0 260 128 416.5t345 156.5q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5zM592 1020q-157 0 -252 -103.5t-111 -298.5h672q0 189 -82 295.5 t-227 106.5zM290 1257q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#xeb;" horiz-adv-x="1124" d="M119 0zM621 -20q-237 0 -369.5 146t-132.5 409q0 260 128 416.5t345 156.5q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5zM592 1020q-157 0 -252 -103.5t-111 -298.5h672q0 189 -82 295.5 t-227 106.5zM331 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM712 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#xec;" horiz-adv-x="463" d="M0 0zM281 0h-99v1087h99v-1087zM349 1241h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
-<glyph unicode="&#xed;" horiz-adv-x="463" d="M107 0zM281 0h-99v1087h99v-1087zM107 1257q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#xee;" horiz-adv-x="463" d="M0 0zM281 0h-99v1087h99v-1087zM-58 1257q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#xef;" horiz-adv-x="463" d="M0 0zM281 0h-99v1087h99v-1087zM-21 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM360 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#xf0;" horiz-adv-x="1174" d="M1055 559q0 -276 -124 -427.5t-349 -151.5q-214 0 -339.5 130t-125.5 361q0 228 126.5 357.5t342.5 129.5q108 0 187.5 -33t148.5 -96l4 2q-64 270 -269 459l-270 -157l-49 77l244 146q-86 62 -199 119l45 81q147 -69 248 -145l225 137l49 -84l-202 -121 q154 -151 230.5 -353t76.5 -431zM950 557q0 146 -97 228.5t-267 82.5q-185 0 -275 -100.5t-90 -304.5q0 -186 94.5 -289.5t268.5 -103.5q179 0 272.5 123t93.5 364z" />
-<glyph unicode="&#xf1;" horiz-adv-x="1208" d="M182 0zM940 0v705q0 164 -69 238.5t-214 74.5q-195 0 -285.5 -98.5t-90.5 -319.5v-600h-99v1087h84l19 -149h6q106 170 377 170q370 0 370 -397v-711h-98zM779 1243q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73q10 111 63 174.5 t137 63.5q48 0 88 -25t82 -59q34 -28 66 -50t61 -22q46 0 77 36.5t48 119.5h76q-16 -116 -69 -177t-132 -61z" />
-<glyph unicode="&#xf2;" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5 t-97.5 -349.5zM718 1241h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
-<glyph unicode="&#xf3;" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5 t-97.5 -349.5zM499 1257q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#xf4;" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5 t-97.5 -349.5zM309 1257q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#xf5;" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5 t-97.5 -349.5zM761 1243q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73q10 111 63 174.5t137 63.5q48 0 88 -25t82 -59q34 -28 66 -50t61 -22q46 0 77 36.5t48 119.5h76q-16 -116 -69 -177t-132 -61z" />
-<glyph unicode="&#xf6;" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5 t-97.5 -349.5zM346 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM727 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#xf7;" d="M111 682v82h948v-82h-948zM504 1075q0 99 80 99q82 0 82 -99q0 -52 -23.5 -75t-58.5 -23q-34 0 -57 23t-23 75zM504 371q0 98 80 98q82 0 82 -98q0 -53 -23.5 -76t-58.5 -23q-34 0 -57 23t-23 76z" />
-<glyph unicode="&#xf8;" horiz-adv-x="1200" d="M1081 545q0 -266 -129 -415.5t-356 -149.5q-173 0 -291 98l-86 -113l-72 58l93 120q-121 153 -121 402q0 266 129 414.5t354 148.5q179 0 301 -104l96 124l74 -55l-104 -137q112 -147 112 -391zM223 545q0 -200 78 -322l543 705q-98 90 -246 90q-180 0 -277.5 -123.5 t-97.5 -349.5zM977 545q0 190 -72 309l-543 -702q94 -82 238 -82q180 0 278.5 125.5t98.5 349.5z" />
-<glyph unicode="&#xf9;" horiz-adv-x="1208" d="M170 0zM268 1087v-704q0 -164 69 -238.5t214 -74.5q194 0 285.5 98t91.5 319v600h98v-1087h-84l-18 150h-6q-106 -170 -377 -170q-371 0 -371 397v710h98zM687 1241h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
-<glyph unicode="&#xfa;" horiz-adv-x="1208" d="M170 0zM268 1087v-704q0 -164 69 -238.5t214 -74.5q194 0 285.5 98t91.5 319v600h98v-1087h-84l-18 150h-6q-106 -170 -377 -170q-371 0 -371 397v710h98zM495 1257q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#xfb;" horiz-adv-x="1208" d="M170 0zM268 1087v-704q0 -164 69 -238.5t214 -74.5q194 0 285.5 98t91.5 319v600h98v-1087h-84l-18 150h-6q-106 -170 -377 -170q-371 0 -371 397v710h98zM313 1257q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70 v16z" />
-<glyph unicode="&#xfc;" horiz-adv-x="1208" d="M170 0zM268 1087v-704q0 -164 69 -238.5t214 -74.5q194 0 285.5 98t91.5 319v600h98v-1087h-84l-18 150h-6q-106 -170 -377 -170q-371 0 -371 397v710h98zM350 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM731 1389q0 46 15.5 66t47.5 20q64 0 64 -86 t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#xfd;" horiz-adv-x="940" d="M0 0zM0 1087h102l230 -610q105 -281 133 -379h6q42 129 137 385l230 604h102l-487 -1263q-59 -154 -99 -208t-93.5 -81t-129.5 -27q-57 0 -127 21v86q58 -16 125 -16q51 0 90 24t70.5 74.5t73 160t53.5 142.5zM361 1257q73 79 144.5 171.5t97.5 140.5h141v-17 q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#xfe;" horiz-adv-x="1219" d="M281 918q114 190 368 190q220 0 335.5 -144.5t115.5 -420.5q0 -268 -121.5 -415.5t-331.5 -147.5q-251 0 -366 188h-7l3 -84q4 -74 4 -162v-414h-99v2048h99v-391l-7 -247h7zM645 68q167 0 258.5 124t91.5 347q0 479 -348 479q-193 0 -279.5 -105t-86.5 -354v-18 q0 -255 85.5 -364t278.5 -109z" />
-<glyph unicode="&#xff;" horiz-adv-x="940" d="M0 0zM0 1087h102l230 -610q105 -281 133 -379h6q42 129 137 385l230 604h102l-487 -1263q-59 -154 -99 -208t-93.5 -81t-129.5 -27q-57 0 -127 21v86q58 -16 125 -16q51 0 90 24t70.5 74.5t73 160t53.5 142.5zM214 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86 q-63 0 -63 86zM595 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x100;" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM342 1671h555v-82h-555v82z" />
-<glyph unicode="&#x101;" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM274 1333h555v-82h-555v82z" />
-<glyph unicode="&#x102;" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM617 1579q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5t134.5 37.5t61.5 124.5h80q-30 -246 -278 -246z" />
-<glyph unicode="&#x103;" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM552 1241q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5t134.5 37.5t61.5 124.5h80q-30 -246 -278 -246z" />
-<glyph unicode="&#x104;" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM1061 -248q0 -110 106 -110q49 0 82 12v-84q-40 -16 -104 -16q-84 0 -133.5 47.5t-49.5 134.5q0 70 40 139t112 125h90q-72 -63 -107.5 -119.5 t-35.5 -128.5z" />
-<glyph unicode="&#x105;" horiz-adv-x="1085" d="M772 -248q0 -110 106 -110q49 0 82 12v-84q-40 -16 -104 -16q-84 0 -133.5 47.5t-49.5 134.5q0 70 40 139q38 67 127 138l-23 159h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79 q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723q-72 -63 -107.5 -119.5t-35.5 -128.5zM442 70q174 0 274.5 99.5t100.5 276.5v107l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5z" />
-<glyph unicode="&#x106;" horiz-adv-x="1272" d="M129 0zM831 1391q-275 0 -433 -176t-158 -482q0 -313 149 -486t426 -173q184 0 338 47v-90q-145 -51 -362 -51q-308 0 -485 199t-177 556q0 223 84.5 393t243 262.5t368.5 92.5q214 0 383 -80l-41 -92q-160 80 -336 80zM657 1595q73 79 144.5 171.5t97.5 140.5h141v-17 q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x107;" horiz-adv-x="973" d="M119 0zM616 -20q-233 0 -365 147t-132 410q0 270 137 420.5t375 150.5q141 0 270 -49l-27 -88q-141 47 -245 47q-200 0 -303 -123.5t-103 -355.5q0 -220 103 -344.5t288 -124.5q148 0 275 53v-92q-104 -51 -273 -51zM444 1257q73 79 144.5 171.5t97.5 140.5h141v-17 q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x108;" horiz-adv-x="1272" d="M129 0zM831 1391q-275 0 -433 -176t-158 -482q0 -313 149 -486t426 -173q184 0 338 47v-90q-145 -51 -362 -51q-308 0 -485 199t-177 556q0 223 84.5 393t243 262.5t368.5 92.5q214 0 383 -80l-41 -92q-160 80 -336 80zM473 1595q62 67 131.5 156t110.5 156h98 q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#x109;" horiz-adv-x="973" d="M119 0zM616 -20q-233 0 -365 147t-132 410q0 270 137 420.5t375 150.5q141 0 270 -49l-27 -88q-141 47 -245 47q-200 0 -303 -123.5t-103 -355.5q0 -220 103 -344.5t288 -124.5q148 0 275 53v-92q-104 -51 -273 -51zM290 1257q62 67 131.5 156t110.5 156h98 q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#x10a;" horiz-adv-x="1272" d="M129 0zM831 1391q-275 0 -433 -176t-158 -482q0 -313 149 -486t426 -173q184 0 338 47v-90q-145 -51 -362 -51q-308 0 -485 199t-177 556q0 223 84.5 393t243 262.5t368.5 92.5q214 0 383 -80l-41 -92q-160 80 -336 80zM717 1727q0 96 64 96q31 0 48 -25t17 -71 q0 -45 -17 -71t-48 -26q-64 0 -64 97z" />
-<glyph unicode="&#x10b;" horiz-adv-x="973" d="M119 0zM616 -20q-233 0 -365 147t-132 410q0 270 137 420.5t375 150.5q141 0 270 -49l-27 -88q-141 47 -245 47q-200 0 -303 -123.5t-103 -355.5q0 -220 103 -344.5t288 -124.5q148 0 275 53v-92q-104 -51 -273 -51zM522 1389q0 96 64 96q31 0 48 -25t17 -71 q0 -45 -17 -71t-48 -26q-64 0 -64 97z" />
-<glyph unicode="&#x10c;" horiz-adv-x="1272" d="M129 0zM831 1391q-275 0 -433 -176t-158 -482q0 -313 149 -486t426 -173q184 0 338 47v-90q-145 -51 -362 -51q-308 0 -485 199t-177 556q0 223 84.5 393t243 262.5t368.5 92.5q214 0 383 -80l-41 -92q-160 80 -336 80zM1051 1890q-170 -188 -242 -311h-98 q-76 128 -242 311v17h70q114 -94 221 -207q108 114 221 207h70v-17z" />
-<glyph unicode="&#x10d;" horiz-adv-x="973" d="M119 0zM616 -20q-233 0 -365 147t-132 410q0 270 137 420.5t375 150.5q141 0 270 -49l-27 -88q-141 47 -245 47q-200 0 -303 -123.5t-103 -355.5q0 -220 103 -344.5t288 -124.5q148 0 275 53v-92q-104 -51 -273 -51zM872 1552q-170 -188 -242 -311h-98q-76 128 -242 311 v17h70q114 -94 221 -207q108 114 221 207h70v-17z" />
-<glyph unicode="&#x10e;" horiz-adv-x="1446" d="M207 0zM1317 745q0 -368 -193 -556.5t-567 -188.5h-350v1462h395q350 0 532.5 -183t182.5 -534zM1206 741q0 314 -159.5 472.5t-468.5 158.5h-269v-1282h242q655 0 655 651zM961 1890q-170 -188 -242 -311h-98q-76 128 -242 311v17h70q114 -94 221 -207q108 114 221 207 h70v-17z" />
-<glyph unicode="&#x10f;" horiz-adv-x="1219" d="M119 0zM580 1108q118 0 204 -43t154 -147h6q-6 126 -6 247v391h98v-1556h-65l-25 166h-8q-124 -186 -356 -186q-225 0 -344 140t-119 408q0 282 118 431t343 149zM580 1018q-178 0 -267.5 -125t-89.5 -363q0 -462 359 -462q184 0 270 107t86 353v17q0 252 -84.5 362.5 t-273.5 110.5zM1141 1245q21 45 48 139.5t38 171.5h112v-14q-15 -60 -53.5 -147t-91.5 -166h-53v16z" />
-<glyph unicode="&#x110;" horiz-adv-x="1466" d="M47 0zM1317 745q0 -368 -193 -556.5t-567 -188.5h-350v678h-160v94h160v690h395q350 0 532.5 -183t182.5 -534zM1206 741q0 314 -159.5 472.5t-468.5 158.5h-269v-600h406v-94h-406v-588h242q655 0 655 651z" />
-<glyph unicode="&#x111;" horiz-adv-x="1219" d="M580 1108q118 0 204 -43t154 -147h6q-6 126 -6 247v107h-473v82h473v202h98v-202h156v-82h-156v-1272h-65l-25 166h-8q-124 -186 -356 -186q-225 0 -344 140t-119 408q0 282 118 431t343 149zM580 1018q-178 0 -267.5 -125t-89.5 -363q0 -462 359 -462q184 0 270 107 t86 353v17q0 252 -84.5 362.5t-273.5 110.5z" />
-<glyph unicode="&#x112;" horiz-adv-x="1130" d="M207 0zM1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94zM322 1671h555v-82h-555v82z" />
-<glyph unicode="&#x113;" horiz-adv-x="1124" d="M119 0zM621 -20q-237 0 -369.5 146t-132.5 409q0 260 128 416.5t345 156.5q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5zM592 1020q-157 0 -252 -103.5t-111 -298.5h672q0 189 -82 295.5 t-227 106.5zM309 1333h555v-82h-555v82z" />
-<glyph unicode="&#x114;" horiz-adv-x="1130" d="M207 0zM1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94zM596 1579q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5t134.5 37.5t61.5 124.5h80q-30 -246 -278 -246z" />
-<glyph unicode="&#x115;" horiz-adv-x="1124" d="M119 0zM621 -20q-237 0 -369.5 146t-132.5 409q0 260 128 416.5t345 156.5q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5zM592 1020q-157 0 -252 -103.5t-111 -298.5h672q0 189 -82 295.5 t-227 106.5zM581 1241q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5t134.5 37.5t61.5 124.5h80q-30 -246 -278 -246z" />
-<glyph unicode="&#x116;" horiz-adv-x="1130" d="M207 0zM1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94zM543 1698q0 96 64 96q31 0 48 -25t17 -71q0 -45 -17 -71t-48 -26q-64 0 -64 97z" />
-<glyph unicode="&#x117;" horiz-adv-x="1124" d="M119 0zM621 -20q-237 0 -369.5 146t-132.5 409q0 260 128 416.5t345 156.5q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5zM592 1020q-157 0 -252 -103.5t-111 -298.5h672q0 189 -82 295.5 t-227 106.5zM512 1389q0 96 64 96q31 0 48 -25t17 -71q0 -45 -17 -71t-48 -26q-64 0 -64 97z" />
-<glyph unicode="&#x118;" horiz-adv-x="1130" d="M207 0zM1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94zM754 -248q0 -110 106 -110q49 0 82 12v-84q-40 -16 -104 -16q-84 0 -133.5 47.5t-49.5 134.5q0 70 40 139t112 125h90q-72 -63 -107.5 -119.5t-35.5 -128.5z" />
-<glyph unicode="&#x119;" horiz-adv-x="1124" d="M119 0zM621 -20q-237 0 -369.5 146t-132.5 409q0 260 128 416.5t345 156.5q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5zM592 1020q-157 0 -252 -103.5t-111 -298.5h672q0 189 -82 295.5 t-227 106.5zM752 -211q0 -110 106 -110q49 0 82 12v-84q-40 -16 -104 -16q-84 0 -133.5 47.5t-49.5 134.5q0 70 40 139t112 125h90q-72 -63 -107.5 -119.5t-35.5 -128.5z" />
-<glyph unicode="&#x11a;" horiz-adv-x="1130" d="M207 0zM1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94zM889 1890q-170 -188 -242 -311h-98q-76 128 -242 311v17h70q114 -94 221 -207q108 114 221 207h70v-17z" />
-<glyph unicode="&#x11b;" horiz-adv-x="1124" d="M119 0zM621 -20q-237 0 -369.5 146t-132.5 409q0 260 128 416.5t345 156.5q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5zM592 1020q-157 0 -252 -103.5t-111 -298.5h672q0 189 -82 295.5 t-227 106.5zM866 1552q-170 -188 -242 -311h-98q-76 128 -242 311v17h70q114 -94 221 -207q108 114 221 207h70v-17z" />
-<glyph unicode="&#x11c;" horiz-adv-x="1481" d="M129 0zM782 737h539v-667q-212 -90 -477 -90q-346 0 -530.5 195.5t-184.5 553.5q0 223 91.5 395.5t262 266.5t391.5 94q239 0 429 -88l-41 -92q-190 88 -394 88q-289 0 -458.5 -178.5t-169.5 -481.5q0 -330 161 -496.5t473 -166.5q202 0 343 57v514h-435v96zM512 1595 q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#x11d;" horiz-adv-x="1071" d="M45 0zM1030 1087v-69l-225 -14q90 -112 90 -246q0 -157 -104.5 -254.5t-280.5 -97.5q-74 0 -104 6q-59 -31 -90 -73t-31 -89q0 -52 39.5 -76t132.5 -24h190q177 0 271 -71.5t94 -211.5q0 -172 -139.5 -265.5t-397.5 -93.5q-205 0 -317.5 79t-112.5 220q0 112 69.5 186 t188.5 101q-49 21 -78.5 59.5t-29.5 88.5q0 109 139 192q-95 39 -148 122.5t-53 191.5q0 163 103.5 261.5t279.5 98.5q107 0 166 -21h348zM150 -184q0 -224 333 -224q428 0 428 273q0 98 -67 142t-217 44h-178q-299 0 -299 -235zM233 748q0 -126 76.5 -195.5t204.5 -69.5 q136 0 208.5 69t72.5 200q0 139 -74.5 208.5t-208.5 69.5q-130 0 -204.5 -74.5t-74.5 -207.5zM230 1257q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#x11e;" horiz-adv-x="1481" d="M129 0zM782 737h539v-667q-212 -90 -477 -90q-346 0 -530.5 195.5t-184.5 553.5q0 223 91.5 395.5t262 266.5t391.5 94q239 0 429 -88l-41 -92q-190 88 -394 88q-289 0 -458.5 -178.5t-169.5 -481.5q0 -330 161 -496.5t473 -166.5q202 0 343 57v514h-435v96zM799 1579 q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5t134.5 37.5t61.5 124.5h80q-30 -246 -278 -246z" />
-<glyph unicode="&#x11f;" horiz-adv-x="1071" d="M45 0zM1030 1087v-69l-225 -14q90 -112 90 -246q0 -157 -104.5 -254.5t-280.5 -97.5q-74 0 -104 6q-59 -31 -90 -73t-31 -89q0 -52 39.5 -76t132.5 -24h190q177 0 271 -71.5t94 -211.5q0 -172 -139.5 -265.5t-397.5 -93.5q-205 0 -317.5 79t-112.5 220q0 112 69.5 186 t188.5 101q-49 21 -78.5 59.5t-29.5 88.5q0 109 139 192q-95 39 -148 122.5t-53 191.5q0 163 103.5 261.5t279.5 98.5q107 0 166 -21h348zM150 -184q0 -224 333 -224q428 0 428 273q0 98 -67 142t-217 44h-178q-299 0 -299 -235zM233 748q0 -126 76.5 -195.5t204.5 -69.5 q136 0 208.5 69t72.5 200q0 139 -74.5 208.5t-208.5 69.5q-130 0 -204.5 -74.5t-74.5 -207.5zM513 1241q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5t134.5 37.5t61.5 124.5h80q-30 -246 -278 -246z" />
-<glyph unicode="&#x120;" horiz-adv-x="1481" d="M129 0zM782 737h539v-667q-212 -90 -477 -90q-346 0 -530.5 195.5t-184.5 553.5q0 223 91.5 395.5t262 266.5t391.5 94q239 0 429 -88l-41 -92q-190 88 -394 88q-289 0 -458.5 -178.5t-169.5 -481.5q0 -330 161 -496.5t473 -166.5q202 0 343 57v514h-435v96zM753 1727 q0 96 64 96q31 0 48 -25t17 -71q0 -45 -17 -71t-48 -26q-64 0 -64 97z" />
-<glyph unicode="&#x121;" horiz-adv-x="1071" d="M45 0zM1030 1087v-69l-225 -14q90 -112 90 -246q0 -157 -104.5 -254.5t-280.5 -97.5q-74 0 -104 6q-59 -31 -90 -73t-31 -89q0 -52 39.5 -76t132.5 -24h190q177 0 271 -71.5t94 -211.5q0 -172 -139.5 -265.5t-397.5 -93.5q-205 0 -317.5 79t-112.5 220q0 112 69.5 186 t188.5 101q-49 21 -78.5 59.5t-29.5 88.5q0 109 139 192q-95 39 -148 122.5t-53 191.5q0 163 103.5 261.5t279.5 98.5q107 0 166 -21h348zM150 -184q0 -224 333 -224q428 0 428 273q0 98 -67 142t-217 44h-178q-299 0 -299 -235zM233 748q0 -126 76.5 -195.5t204.5 -69.5 q136 0 208.5 69t72.5 200q0 139 -74.5 208.5t-208.5 69.5q-130 0 -204.5 -74.5t-74.5 -207.5zM463 1389q0 96 64 96q31 0 48 -25t17 -71q0 -45 -17 -71t-48 -26q-64 0 -64 97z" />
-<glyph unicode="&#x122;" horiz-adv-x="1481" d="M129 0zM782 737h539v-667q-212 -90 -477 -90q-346 0 -530.5 195.5t-184.5 553.5q0 223 91.5 395.5t262 266.5t391.5 94q239 0 429 -88l-41 -92q-190 88 -394 88q-289 0 -458.5 -178.5t-169.5 -481.5q0 -330 161 -496.5t473 -166.5q202 0 343 57v514h-435v96zM682 -436 q25 54 50 145t36 166h113v-14q-23 -82 -63.5 -167.5t-81.5 -146.5h-54v17z" />
-<glyph unicode="&#x123;" horiz-adv-x="1071" d="M45 0zM1030 1087v-69l-225 -14q90 -112 90 -246q0 -157 -104.5 -254.5t-280.5 -97.5q-74 0 -104 6q-59 -31 -90 -73t-31 -89q0 -52 39.5 -76t132.5 -24h190q177 0 271 -71.5t94 -211.5q0 -172 -139.5 -265.5t-397.5 -93.5q-205 0 -317.5 79t-112.5 220q0 112 69.5 186 t188.5 101q-49 21 -78.5 59.5t-29.5 88.5q0 109 139 192q-95 39 -148 122.5t-53 191.5q0 163 103.5 261.5t279.5 98.5q107 0 166 -21h348zM150 -184q0 -224 333 -224q428 0 428 273q0 98 -67 142t-217 44h-178q-299 0 -299 -235zM233 748q0 -126 76.5 -195.5t204.5 -69.5 q136 0 208.5 69t72.5 200q0 139 -74.5 208.5t-208.5 69.5q-130 0 -204.5 -74.5t-74.5 -207.5zM669 1552q-27 -58 -53.5 -159t-32.5 -152h-112v14q20 77 61.5 165t83.5 149h53v-17z" />
-<glyph unicode="&#x124;" horiz-adv-x="1473" d="M207 0zM1266 0h-103v719h-854v-719h-102v1462h102v-649h854v649h103v-1462zM444 1595q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#x125;" horiz-adv-x="1208" d="M182 0zM940 0v705q0 164 -69 238.5t-214 74.5q-195 0 -285.5 -98.5t-90.5 -319.5v-600h-99v1556h99v-495l-5 -139h7q61 98 154 142t231 44q370 0 370 -397v-711h-98zM313 1650q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207 q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#x126;" horiz-adv-x="1473" d="M207 1192v270h102v-270h854v270h103v-270h207v-94h-207v-1098h-103v719h-854v-719h-102v1098h-207v94h207zM1163 813v285h-854v-285h854z" />
-<glyph unicode="&#x127;" horiz-adv-x="1208" d="M940 0v674q0 164 -69 238.5t-214 74.5q-197 0 -286.5 -98t-89.5 -320v-569h-99v1272h-155v82h155v202h99v-202h473v-82h-473v-242l-5 -139h7q61 98 154 142t231 44q370 0 370 -397v-680h-98z" />
-<glyph unicode="&#x128;" horiz-adv-x="516" d="M0 0zM207 0v1462h102v-1462h-102zM419 1581q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73q10 111 63 174.5t137 63.5q48 0 88 -25t82 -59q34 -28 66 -50t61 -22q46 0 77 36.5t48 119.5h76q-16 -116 -69 -177t-132 -61z" />
-<glyph unicode="&#x129;" horiz-adv-x="463" d="M0 0zM281 0h-99v1087h99v-1087zM390 1243q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73q10 111 63 174.5t137 63.5q48 0 88 -25t82 -59q34 -28 66 -50t61 -22q46 0 77 36.5t48 119.5h76q-16 -116 -69 -177t-132 -61z" />
-<glyph unicode="&#x12a;" horiz-adv-x="516" d="M0 0zM207 0v1462h102v-1462h-102zM-17 1671h555v-82h-555v82z" />
-<glyph unicode="&#x12b;" horiz-adv-x="463" d="M0 0zM281 0h-99v1087h99v-1087zM-44 1333h555v-82h-555v82z" />
-<glyph unicode="&#x12c;" horiz-adv-x="516" d="M0 0zM207 0v1462h102v-1462h-102zM257 1579q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5t134.5 37.5t61.5 124.5h80q-30 -246 -278 -246z" />
-<glyph unicode="&#x12d;" horiz-adv-x="463" d="M0 0zM281 0h-99v1087h99v-1087zM231 1241q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5t134.5 37.5t61.5 124.5h80q-30 -246 -278 -246z" />
-<glyph unicode="&#x12e;" horiz-adv-x="516" d="M65 0zM207 0v1462h102v-1462h-102zM164 -248q0 -110 106 -110q49 0 82 12v-84q-40 -16 -104 -16q-84 0 -133.5 47.5t-49.5 134.5q0 70 40 139t112 125h90q-72 -63 -107.5 -119.5t-35.5 -128.5z" />
-<glyph unicode="&#x12f;" horiz-adv-x="463" d="M39 0zM281 0h-99v1087h99v-1087zM168 1389q0 96 63 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-63 0 -63 97zM138 -248q0 -110 106 -110q49 0 82 12v-84q-40 -16 -104 -16q-84 0 -133.5 47.5t-49.5 134.5q0 70 40 139t112 125h90q-72 -63 -107.5 -119.5 t-35.5 -128.5z" />
-<glyph unicode="&#x130;" horiz-adv-x="516" d="M194 0zM207 0v1462h102v-1462h-102zM194 1727q0 96 64 96q31 0 48 -25t17 -71q0 -45 -17 -71t-48 -26q-64 0 -64 97z" />
-<glyph unicode="&#x131;" horiz-adv-x="463" d="M281 0h-99v1087h99v-1087z" />
-<glyph unicode="&#x132;" horiz-adv-x="1022" d="M207 0zM207 0v1462h102v-1462h-102zM483 -369q-92 0 -151 27v88q78 -20 149 -20q242 0 242 264v1472h102v-1462q0 -369 -342 -369z" />
-<glyph unicode="&#x133;" horiz-adv-x="926" d="M168 0zM281 0h-99v1087h99v-1087zM168 1389q0 96 63 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-63 0 -63 97zM500 -492q-80 0 -135 25v86q69 -20 129 -20q151 0 151 176v1312h99v-1298q0 -135 -63.5 -208t-180.5 -73zM631 1389q0 96 63 96q31 0 48.5 -25 t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-63 0 -63 97z" />
-<glyph unicode="&#x134;" horiz-adv-x="506" d="M0 0zM-33 -369q-92 0 -151 27v88q78 -20 149 -20q242 0 242 264v1472h102v-1462q0 -369 -342 -369zM-34 1595q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#x135;" horiz-adv-x="463" d="M0 0zM37 -492q-80 0 -135 25v86q69 -20 129 -20q151 0 151 176v1312h99v-1298q0 -135 -63.5 -208t-180.5 -73zM-58 1257q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#x136;" horiz-adv-x="1190" d="M207 0zM1190 0h-125l-561 772l-195 -172v-600h-102v1462h102v-760l162 162l573 598h130l-599 -618zM524 -436q25 54 50 145t36 166h113v-14q-23 -82 -63.5 -167.5t-81.5 -146.5h-54v17z" />
-<glyph unicode="&#x137;" horiz-adv-x="991" d="M182 0zM279 477l555 610h120l-428 -464l465 -623h-119l-413 549l-178 -162v-387h-99v1556h99v-780l-7 -299h5zM436 -436q25 54 50 145t36 166h113v-14q-23 -82 -63.5 -167.5t-81.5 -146.5h-54v17z" />
-<glyph unicode="&#x138;" horiz-adv-x="991" d="M279 477l555 610h120l-428 -464l465 -623h-119l-413 549l-178 -162v-387h-99v1087h99v-311l-7 -299h5z" />
-<glyph unicode="&#x139;" horiz-adv-x="1051" d="M207 0zM207 0v1462h102v-1366h697v-96h-799zM226 1595q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x13a;" horiz-adv-x="463" d="M136 0zM281 0h-99v1556h99v-1556zM136 1652q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x13b;" horiz-adv-x="1051" d="M207 0zM207 0v1462h102v-1366h697v-96h-799zM461 -436q25 54 50 145t36 166h113v-14q-23 -82 -63.5 -167.5t-81.5 -146.5h-54v17z" />
-<glyph unicode="&#x13c;" horiz-adv-x="463" d="M97 0zM281 0h-99v1556h99v-1556zM97 -436q25 54 50 145t36 166h113v-14q-23 -82 -63.5 -167.5t-81.5 -146.5h-54v17z" />
-<glyph unicode="&#x13d;" horiz-adv-x="1051" d="M207 0zM207 0v1462h102v-1366h697v-96h-799zM676 1152q21 45 48 139.5t38 171.5h112v-14q-15 -60 -53.5 -147t-91.5 -166h-53v16z" />
-<glyph unicode="&#x13e;" horiz-adv-x="463" d="M182 0zM281 0h-99v1556h99v-1556zM386 1245q21 45 48 139.5t38 171.5h112v-14q-15 -60 -53.5 -147t-91.5 -166h-53v16z" />
-<glyph unicode="&#x13f;" horiz-adv-x="1051" d="M207 0zM207 0v1462h102v-1366h697v-96h-799zM692 728q0 96 64 96q31 0 48 -25t17 -71q0 -45 -17 -71t-48 -26q-64 0 -64 97z" />
-<glyph unicode="&#x140;" horiz-adv-x="477" d="M182 0zM281 0h-99v1556h99v-1556zM405 677q0 96 64 96q31 0 48 -25t17 -71q0 -45 -17 -71t-48 -26q-64 0 -64 97z" />
-<glyph unicode="&#x141;" horiz-adv-x="1051" d="M207 0v551l-137 -86l-41 74l178 112v811h102v-747l324 205l47 -76l-371 -230v-518h697v-96h-799z" />
-<glyph unicode="&#x142;" horiz-adv-x="463" d="M281 817l153 103l43 -70l-196 -131v-719h-99v653l-129 -86l-45 72l174 115v802h99v-739z" />
-<glyph unicode="&#x143;" horiz-adv-x="1477" d="M207 0zM1270 0h-103l-866 1298h-8q12 -232 12 -350v-948h-98v1462h102l865 -1296h6q-9 180 -9 342v954h99v-1462zM618 1595q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x144;" horiz-adv-x="1208" d="M182 0zM940 0v705q0 164 -69 238.5t-214 74.5q-195 0 -285.5 -98.5t-90.5 -319.5v-600h-99v1087h84l19 -149h6q106 170 377 170q370 0 370 -397v-711h-98zM489 1257q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x145;" horiz-adv-x="1477" d="M207 0zM1270 0h-103l-866 1298h-8q12 -232 12 -350v-948h-98v1462h102l865 -1296h6q-9 180 -9 342v954h99v-1462zM598 -436q25 54 50 145t36 166h113v-14q-23 -82 -63.5 -167.5t-81.5 -146.5h-54v17z" />
-<glyph unicode="&#x146;" horiz-adv-x="1208" d="M182 0zM940 0v705q0 164 -69 238.5t-214 74.5q-195 0 -285.5 -98.5t-90.5 -319.5v-600h-99v1087h84l19 -149h6q106 170 377 170q370 0 370 -397v-711h-98zM475 -436q25 54 50 145t36 166h113v-14q-23 -82 -63.5 -167.5t-81.5 -146.5h-54v17z" />
-<glyph unicode="&#x147;" horiz-adv-x="1477" d="M207 0zM1270 0h-103l-866 1298h-8q12 -232 12 -350v-948h-98v1462h102l865 -1296h6q-9 180 -9 342v954h99v-1462zM1028 1890q-170 -188 -242 -311h-98q-76 128 -242 311v17h70q114 -94 221 -207q108 114 221 207h70v-17z" />
-<glyph unicode="&#x148;" horiz-adv-x="1208" d="M182 0zM940 0v705q0 164 -69 238.5t-214 74.5q-195 0 -285.5 -98.5t-90.5 -319.5v-600h-99v1087h84l19 -149h6q106 170 377 170q370 0 370 -397v-711h-98zM895 1552q-170 -188 -242 -311h-98q-76 128 -242 311v17h70q114 -94 221 -207q108 114 221 207h70v-17z" />
-<glyph unicode="&#x149;" horiz-adv-x="1284" d="M1 0zM1016 0v705q0 164 -69 238.5t-214 74.5q-195 0 -285.5 -98.5t-90.5 -319.5v-600h-99v1087h84l19 -149h6q106 170 377 170q370 0 370 -397v-711h-98zM228 1462l12 -20q-75 -265 -174 -481h-65q29 96 61 241.5t49 259.5h117z" />
-<glyph unicode="&#x14a;" horiz-adv-x="1477" d="M1270 0q0 -369 -342 -369q-93 0 -152 27v88q78 -20 150 -20q241 0 241 264v10l-866 1298h-8q12 -232 12 -350v-948h-98v1462h102l865 -1296h6q-9 180 -9 342v954h99v-1462z" />
-<glyph unicode="&#x14b;" horiz-adv-x="1208" d="M795 -492q-79 0 -136 25v86q69 -20 129 -20q152 0 152 176v930q0 164 -72.5 238.5t-224.5 74.5q-189 0 -275.5 -99.5t-86.5 -318.5v-600h-99v1087h84l19 -149h6q54 87 147 128.5t205 41.5q201 0 298 -99t97 -298v-922q0 -134 -62.5 -207.5t-180.5 -73.5z" />
-<glyph unicode="&#x14c;" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170 t-141.5 -483zM506 1671h555v-82h-555v82z" />
-<glyph unicode="&#x14d;" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5 t-97.5 -349.5zM324 1333h555v-82h-555v82z" />
-<glyph unicode="&#x14e;" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170 t-141.5 -483zM781 1579q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5t134.5 37.5t61.5 124.5h80q-30 -246 -278 -246z" />
-<glyph unicode="&#x14f;" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5 t-97.5 -349.5zM598 1241q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5t134.5 37.5t61.5 124.5h80q-30 -246 -278 -246z" />
-<glyph unicode="&#x150;" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170 t-141.5 -483zM534 1595q31 33 67 90t121 222h136v-17q-135 -202 -254 -311h-70v16zM872 1595q31 33 67 90t121 222h136v-17q-135 -202 -254 -311h-70v16z" />
-<glyph unicode="&#x151;" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5 t-97.5 -349.5zM342 1257q31 33 67 90t121 222h136v-17q-135 -202 -254 -311h-70v16zM680 1257q31 33 67 90t121 222h136v-17q-135 -202 -254 -311h-70v16z" />
-<glyph unicode="&#x152;" horiz-adv-x="1839" d="M1714 0h-756q-76 -16 -176 -16q-305 0 -479 200t-174 551q0 347 174.5 545.5t480.5 198.5q78 0 183 -17h747v-94h-655v-553h616v-94h-616v-627h655v-94zM782 80q109 0 174 18v1266q-62 16 -172 16q-262 0 -403 -167.5t-141 -479.5q0 -315 140.5 -484t401.5 -169z" />
-<glyph unicode="&#x153;" horiz-adv-x="1942" d="M1438 -20q-156 0 -266.5 67.5t-165.5 198.5q-59 -128 -158 -197t-252 -69q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q151 0 251 -70t157 -209q110 279 399 279q192 0 303 -134t111 -364v-80h-762q2 -230 100.5 -345t276.5 -115q93 0 163.5 13t178.5 56 v-90q-92 -40 -170 -54.5t-172 -14.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5q174 0 265 122.5t91 352.5q0 224 -93 348.5t-265 124.5q-180 0 -277.5 -123.5t-97.5 -349.5zM1409 1020q-155 0 -242 -104t-102 -298h653q0 189 -82 295.5t-227 106.5z" />
-<glyph unicode="&#x154;" horiz-adv-x="1217" d="M207 0zM309 637v-637h-102v1462h348q272 0 402 -100.5t130 -302.5q0 -147 -77.5 -248t-235.5 -145l397 -666h-122l-377 637h-363zM309 725h279q185 0 287 82.5t102 243.5q0 167 -100 243t-326 76h-242v-645zM491 1595q73 79 144.5 171.5t97.5 140.5h141v-17 q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x155;" horiz-adv-x="797" d="M182 0zM610 1108q69 0 148 -14l-19 -95q-68 17 -141 17q-139 0 -228 -118t-89 -298v-600h-99v1087h84l10 -196h7q67 120 143 168.5t184 48.5zM339 1257q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x156;" horiz-adv-x="1217" d="M207 0zM309 637v-637h-102v1462h348q272 0 402 -100.5t130 -302.5q0 -147 -77.5 -248t-235.5 -145l397 -666h-122l-377 637h-363zM309 725h279q185 0 287 82.5t102 243.5q0 167 -100 243t-326 76h-242v-645zM524 -436q25 54 50 145t36 166h113v-14q-23 -82 -63.5 -167.5 t-81.5 -146.5h-54v17z" />
-<glyph unicode="&#x157;" horiz-adv-x="797" d="M109 0zM610 1108q69 0 148 -14l-19 -95q-68 17 -141 17q-139 0 -228 -118t-89 -298v-600h-99v1087h84l10 -196h7q67 120 143 168.5t184 48.5zM109 -436q25 54 50 145t36 166h113v-14q-23 -82 -63.5 -167.5t-81.5 -146.5h-54v17z" />
-<glyph unicode="&#x158;" horiz-adv-x="1217" d="M207 0zM309 637v-637h-102v1462h348q272 0 402 -100.5t130 -302.5q0 -147 -77.5 -248t-235.5 -145l397 -666h-122l-377 637h-363zM309 725h279q185 0 287 82.5t102 243.5q0 167 -100 243t-326 76h-242v-645zM895 1890q-170 -188 -242 -311h-98q-76 128 -242 311v17h70 q114 -94 221 -207q108 114 221 207h70v-17z" />
-<glyph unicode="&#x159;" horiz-adv-x="797" d="M163 0zM610 1108q69 0 148 -14l-19 -95q-68 17 -141 17q-139 0 -228 -118t-89 -298v-600h-99v1087h84l10 -196h7q67 120 143 168.5t184 48.5zM745 1552q-170 -188 -242 -311h-98q-76 128 -242 311v17h70q114 -94 221 -207q108 114 221 207h70v-17z" />
-<glyph unicode="&#x15a;" horiz-adv-x="1116" d="M111 0zM1014 377q0 -183 -134.5 -290t-357.5 -107q-268 0 -411 59v102q158 -67 403 -67q180 0 285.5 82.5t105.5 216.5q0 83 -35 137.5t-114 99.5t-232 97q-224 77 -309.5 166.5t-85.5 238.5q0 164 128.5 267.5t330.5 103.5q206 0 387 -78l-37 -88q-182 76 -348 76 q-162 0 -258 -75t-96 -204q0 -81 29.5 -133t96.5 -93.5t230 -99.5q171 -59 257 -114.5t125.5 -126t39.5 -170.5zM456 1595q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x15b;" horiz-adv-x="954" d="M84 0zM856 283q0 -146 -111 -224.5t-315 -78.5q-218 0 -346 67v107q164 -82 346 -82q161 0 244.5 53.5t83.5 142.5q0 82 -66.5 138t-218.5 110q-163 59 -229 101.5t-99.5 96t-33.5 130.5q0 122 102.5 193t286.5 71q176 0 334 -66l-37 -90q-160 66 -297 66 q-133 0 -211 -44t-78 -122q0 -85 60.5 -136t236.5 -114q147 -53 214 -95.5t100.5 -96.5t33.5 -127zM351 1257q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x15c;" horiz-adv-x="1116" d="M111 0zM1014 377q0 -183 -134.5 -290t-357.5 -107q-268 0 -411 59v102q158 -67 403 -67q180 0 285.5 82.5t105.5 216.5q0 83 -35 137.5t-114 99.5t-232 97q-224 77 -309.5 166.5t-85.5 238.5q0 164 128.5 267.5t330.5 103.5q206 0 387 -78l-37 -88q-182 76 -348 76 q-162 0 -258 -75t-96 -204q0 -81 29.5 -133t96.5 -93.5t230 -99.5q171 -59 257 -114.5t125.5 -126t39.5 -170.5zM280 1595q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#x15d;" horiz-adv-x="954" d="M84 0zM856 283q0 -146 -111 -224.5t-315 -78.5q-218 0 -346 67v107q164 -82 346 -82q161 0 244.5 53.5t83.5 142.5q0 82 -66.5 138t-218.5 110q-163 59 -229 101.5t-99.5 96t-33.5 130.5q0 122 102.5 193t286.5 71q176 0 334 -66l-37 -90q-160 66 -297 66 q-133 0 -211 -44t-78 -122q0 -85 60.5 -136t236.5 -114q147 -53 214 -95.5t100.5 -96.5t33.5 -127zM196 1257q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#x15e;" horiz-adv-x="1116" d="M111 0zM1014 377q0 -183 -134.5 -290t-357.5 -107q-268 0 -411 59v102q158 -67 403 -67q180 0 285.5 82.5t105.5 216.5q0 83 -35 137.5t-114 99.5t-232 97q-224 77 -309.5 166.5t-85.5 238.5q0 164 128.5 267.5t330.5 103.5q206 0 387 -78l-37 -88q-182 76 -348 76 q-162 0 -258 -75t-96 -204q0 -81 29.5 -133t96.5 -93.5t230 -99.5q171 -59 257 -114.5t125.5 -126t39.5 -170.5zM719 -291q0 -100 -67.5 -150.5t-188.5 -50.5q-68 0 -94 11v88q30 -10 92 -10q78 0 119 28t41 80q0 94 -193 121l93 174h96l-66 -117q168 -37 168 -174z" />
-<glyph unicode="&#x15f;" horiz-adv-x="954" d="M84 0zM856 283q0 -146 -111 -224.5t-315 -78.5q-218 0 -346 67v107q164 -82 346 -82q161 0 244.5 53.5t83.5 142.5q0 82 -66.5 138t-218.5 110q-163 59 -229 101.5t-99.5 96t-33.5 130.5q0 122 102.5 193t286.5 71q176 0 334 -66l-37 -90q-160 66 -297 66 q-133 0 -211 -44t-78 -122q0 -85 60.5 -136t236.5 -114q147 -53 214 -95.5t100.5 -96.5t33.5 -127zM629 -291q0 -100 -67.5 -150.5t-188.5 -50.5q-68 0 -94 11v88q30 -10 92 -10q78 0 119 28t41 80q0 94 -193 121l93 174h96l-66 -117q168 -37 168 -174z" />
-<glyph unicode="&#x160;" horiz-adv-x="1116" d="M111 0zM1014 377q0 -183 -134.5 -290t-357.5 -107q-268 0 -411 59v102q158 -67 403 -67q180 0 285.5 82.5t105.5 216.5q0 83 -35 137.5t-114 99.5t-232 97q-224 77 -309.5 166.5t-85.5 238.5q0 164 128.5 267.5t330.5 103.5q206 0 387 -78l-37 -88q-182 76 -348 76 q-162 0 -258 -75t-96 -204q0 -81 29.5 -133t96.5 -93.5t230 -99.5q171 -59 257 -114.5t125.5 -126t39.5 -170.5zM859 1890q-170 -188 -242 -311h-98q-76 128 -242 311v17h70q114 -94 221 -207q108 114 221 207h70v-17z" />
-<glyph unicode="&#x161;" horiz-adv-x="954" d="M84 0zM856 283q0 -146 -111 -224.5t-315 -78.5q-218 0 -346 67v107q164 -82 346 -82q161 0 244.5 53.5t83.5 142.5q0 82 -66.5 138t-218.5 110q-163 59 -229 101.5t-99.5 96t-33.5 130.5q0 122 102.5 193t286.5 71q176 0 334 -66l-37 -90q-160 66 -297 66 q-133 0 -211 -44t-78 -122q0 -85 60.5 -136t236.5 -114q147 -53 214 -95.5t100.5 -96.5t33.5 -127zM759 1552q-170 -188 -242 -311h-98q-76 128 -242 311v17h70q114 -94 221 -207q108 114 221 207h70v-17z" />
-<glyph unicode="&#x162;" horiz-adv-x="1073" d="M10 0zM588 0h-103v1366h-475v96h1053v-96h-475v-1366zM686 -291q0 -100 -67.5 -150.5t-188.5 -50.5q-68 0 -94 11v88q30 -10 92 -10q78 0 119 28t41 80q0 94 -193 121l93 174h96l-66 -117q168 -37 168 -174z" />
-<glyph unicode="&#x163;" horiz-adv-x="686" d="M25 0zM469 68q94 0 164 16v-80q-72 -24 -166 -24q-144 0 -212.5 77t-68.5 242v702h-161v58l161 45l50 246h51v-263h319v-86h-319v-688q0 -125 44 -185t138 -60zM590 -291q0 -100 -67.5 -150.5t-188.5 -50.5q-68 0 -94 11v88q30 -10 92 -10q78 0 119 28t41 80 q0 94 -193 121l93 174h96l-66 -117q168 -37 168 -174z" />
-<glyph unicode="&#x164;" horiz-adv-x="1073" d="M10 0zM588 0h-103v1366h-475v96h1053v-96h-475v-1366zM829 1890q-170 -188 -242 -311h-98q-76 128 -242 311v17h70q114 -94 221 -207q108 114 221 207h70v-17z" />
-<glyph unicode="&#x165;" horiz-adv-x="686" d="M25 0zM469 68q94 0 164 16v-80q-72 -24 -166 -24q-144 0 -212.5 77t-68.5 242v702h-161v58l161 45l50 246h51v-263h319v-86h-319v-688q0 -125 44 -185t138 -60zM480 1245q21 45 48 139.5t38 171.5h112v-14q-15 -60 -53.5 -147t-91.5 -166h-53v16z" />
-<glyph unicode="&#x166;" horiz-adv-x="1073" d="M588 793h354v-95h-354v-698h-103v698h-358v95h358v573h-475v96h1053v-96h-475v-573z" />
-<glyph unicode="&#x167;" horiz-adv-x="686" d="M41 688h145v313h-161v58l161 45l50 246h51v-263h319v-86h-319v-313h309v-86h-309v-289q0 -125 44 -185t138 -60t164 16v-80q-72 -24 -166 -24q-144 0 -212.5 77t-68.5 242v303h-145v86z" />
-<glyph unicode="&#x168;" horiz-adv-x="1473" d="M190 0zM1282 1462v-946q0 -252 -146 -394t-407 -142q-254 0 -396.5 142.5t-142.5 397.5v942h103v-946q0 -211 117 -328.5t331 -117.5q209 0 324 115.5t115 320.5v956h102zM893 1581q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73 q10 111 63 174.5t137 63.5q48 0 88 -25t82 -59q34 -28 66 -50t61 -22q46 0 77 36.5t48 119.5h76q-16 -116 -69 -177t-132 -61z" />
-<glyph unicode="&#x169;" horiz-adv-x="1208" d="M170 0zM268 1087v-704q0 -164 69 -238.5t214 -74.5q194 0 285.5 98t91.5 319v600h98v-1087h-84l-18 150h-6q-106 -170 -377 -170q-371 0 -371 397v710h98zM765 1243q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73q10 111 63 174.5 t137 63.5q48 0 88 -25t82 -59q34 -28 66 -50t61 -22q46 0 77 36.5t48 119.5h76q-16 -116 -69 -177t-132 -61z" />
-<glyph unicode="&#x16a;" horiz-adv-x="1473" d="M190 0zM1282 1462v-946q0 -252 -146 -394t-407 -142q-254 0 -396.5 142.5t-142.5 397.5v942h103v-946q0 -211 117 -328.5t331 -117.5q209 0 324 115.5t115 320.5v956h102zM459 1671h555v-82h-555v82z" />
-<glyph unicode="&#x16b;" horiz-adv-x="1208" d="M170 0zM268 1087v-704q0 -164 69 -238.5t214 -74.5q194 0 285.5 98t91.5 319v600h98v-1087h-84l-18 150h-6q-106 -170 -377 -170q-371 0 -371 397v710h98zM328 1333h555v-82h-555v82z" />
-<glyph unicode="&#x16c;" horiz-adv-x="1473" d="M190 0zM1282 1462v-946q0 -252 -146 -394t-407 -142q-254 0 -396.5 142.5t-142.5 397.5v942h103v-946q0 -211 117 -328.5t331 -117.5q209 0 324 115.5t115 320.5v956h102zM733 1579q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5t134.5 37.5t61.5 124.5h80 q-30 -246 -278 -246z" />
-<glyph unicode="&#x16d;" horiz-adv-x="1208" d="M170 0zM268 1087v-704q0 -164 69 -238.5t214 -74.5q194 0 285.5 98t91.5 319v600h98v-1087h-84l-18 150h-6q-106 -170 -377 -170q-371 0 -371 397v710h98zM602 1241q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5t134.5 37.5t61.5 124.5h80q-30 -246 -278 -246z " />
-<glyph unicode="&#x16e;" horiz-adv-x="1473" d="M190 0zM1282 1462v-946q0 -252 -146 -394t-407 -142q-254 0 -396.5 142.5t-142.5 397.5v942h103v-946q0 -211 117 -328.5t331 -117.5q209 0 324 115.5t115 320.5v956h102zM952 1794q0 -97 -60 -155t-157 -58t-157 58t-60 155q0 94 60 152.5t157 58.5t157 -59t60 -152z M598 1794q0 -66 37.5 -103.5t99.5 -37.5t99.5 37.5t37.5 103.5q0 64 -39 101.5t-98 37.5q-62 0 -99.5 -38t-37.5 -101z" />
-<glyph unicode="&#x16f;" horiz-adv-x="1208" d="M170 0zM268 1087v-704q0 -164 69 -238.5t214 -74.5q194 0 285.5 98t91.5 319v600h98v-1087h-84l-18 150h-6q-106 -170 -377 -170q-371 0 -371 397v710h98zM821 1456q0 -97 -60 -155t-157 -58t-157 58t-60 155q0 94 60 152.5t157 58.5t157 -59t60 -152zM467 1456 q0 -66 37.5 -103.5t99.5 -37.5t99.5 37.5t37.5 103.5q0 64 -39 101.5t-98 37.5q-62 0 -99.5 -38t-37.5 -101z" />
-<glyph unicode="&#x170;" horiz-adv-x="1473" d="M190 0zM1282 1462v-946q0 -252 -146 -394t-407 -142q-254 0 -396.5 142.5t-142.5 397.5v942h103v-946q0 -211 117 -328.5t331 -117.5q209 0 324 115.5t115 320.5v956h102zM475 1595q31 33 67 90t121 222h136v-17q-135 -202 -254 -311h-70v16zM813 1595q31 33 67 90 t121 222h136v-17q-135 -202 -254 -311h-70v16z" />
-<glyph unicode="&#x171;" horiz-adv-x="1208" d="M170 0zM268 1087v-704q0 -164 69 -238.5t214 -74.5q194 0 285.5 98t91.5 319v600h98v-1087h-84l-18 150h-6q-106 -170 -377 -170q-371 0 -371 397v710h98zM346 1257q31 33 67 90t121 222h136v-17q-135 -202 -254 -311h-70v16zM684 1257q31 33 67 90t121 222h136v-17 q-135 -202 -254 -311h-70v16z" />
-<glyph unicode="&#x172;" horiz-adv-x="1473" d="M190 0zM1282 1462v-946q0 -252 -146 -394t-407 -142q-254 0 -396.5 142.5t-142.5 397.5v942h103v-946q0 -211 117 -328.5t331 -117.5q209 0 324 115.5t115 320.5v956h102zM697 -248q0 -110 106 -110q49 0 82 12v-84q-40 -16 -104 -16q-84 0 -133.5 47.5t-49.5 134.5 q0 70 40 139t112 125h90q-72 -63 -107.5 -119.5t-35.5 -128.5z" />
-<glyph unicode="&#x173;" horiz-adv-x="1208" d="M268 1087v-704q0 -164 69 -238.5t214 -74.5q194 0 285.5 98t91.5 319v600h98v-1087q-72 -63 -107.5 -119.5t-35.5 -128.5q0 -110 106 -110q49 0 82 12v-84q-40 -16 -104 -16q-84 0 -133.5 47.5t-49.5 134.5q0 70 40 139q39 69 117 129l-17 146h-6q-106 -170 -377 -170 q-186 0 -278.5 99t-92.5 298v710h98z" />
-<glyph unicode="&#x174;" horiz-adv-x="1827" d="M51 0zM1372 0h-84l-321 1128q-40 139 -60 228q-16 -87 -45.5 -200t-322.5 -1156h-86l-402 1462h107l256 -942q15 -57 28 -105.5t23.5 -91t19 -82t15.5 -79.5q24 136 102 413l250 887h113l293 -1018q51 -176 73 -284q13 72 33.5 153t308.5 1149h103zM618 1595 q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#x175;" horiz-adv-x="1481" d="M31 0zM1051 0l-238 727q-23 74 -59 217h-6l-21 -74l-45 -145l-242 -725h-98l-311 1087h106l174 -630q61 -234 80 -344h6q59 234 86 311l224 663h90l213 -661q72 -235 88 -311h6q8 65 80 348l166 624h100l-295 -1087h-104zM459 1257q62 67 131.5 156t110.5 156h98 q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#x176;" horiz-adv-x="1081" d="M0 0zM543 662l428 800h110l-487 -897v-565h-105v557l-489 905h117zM251 1595q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#x177;" horiz-adv-x="940" d="M0 0zM0 1087h102l230 -610q105 -281 133 -379h6q42 129 137 385l230 604h102l-487 -1263q-59 -154 -99 -208t-93.5 -81t-129.5 -27q-57 0 -127 21v86q58 -16 125 -16q51 0 90 24t70.5 74.5t73 160t53.5 142.5zM179 1257q62 67 131.5 156t110.5 156h98q68 -120 242 -312 v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#x178;" horiz-adv-x="1081" d="M0 0zM543 662l428 800h110l-487 -897v-565h-105v557l-489 905h117zM288 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM669 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x179;" horiz-adv-x="1180" d="M82 0zM1098 0h-1016v76l856 1290h-817v96h954v-76l-858 -1290h881v-96zM481 1595q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x17a;" horiz-adv-x="944" d="M82 0zM858 0h-776v63l645 936h-598v88h727v-63l-649 -936h651v-88zM380 1257q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x17b;" horiz-adv-x="1180" d="M82 0zM1098 0h-1016v76l856 1290h-817v96h954v-76l-858 -1290h881v-96zM526 1727q0 96 64 96q31 0 48 -25t17 -71q0 -45 -17 -71t-48 -26q-64 0 -64 97z" />
-<glyph unicode="&#x17c;" horiz-adv-x="944" d="M82 0zM858 0h-776v63l645 936h-598v88h727v-63l-649 -936h651v-88zM426 1389q0 96 64 96q31 0 48 -25t17 -71q0 -45 -17 -71t-48 -26q-64 0 -64 97z" />
-<glyph unicode="&#x17d;" horiz-adv-x="1180" d="M82 0zM1098 0h-1016v76l856 1290h-817v96h954v-76l-858 -1290h881v-96zM891 1890q-170 -188 -242 -311h-98q-76 128 -242 311v17h70q114 -94 221 -207q108 114 221 207h70v-17z" />
-<glyph unicode="&#x17e;" horiz-adv-x="944" d="M82 0zM858 0h-776v63l645 936h-598v88h727v-63l-649 -936h651v-88zM780 1552q-170 -188 -242 -311h-98q-76 128 -242 311v17h70q114 -94 221 -207q108 114 221 207h70v-17z" />
-<glyph unicode="&#x17f;" horiz-adv-x="627" d="M281 0h-99v1180q0 203 74.5 295t239.5 92q90 0 180 -27l-23 -86q-80 25 -159 25q-116 0 -164.5 -68.5t-48.5 -222.5v-1188z" />
-<glyph unicode="&#x192;" d="M303 854v59l207 37v146q0 201 76.5 294t240.5 93q82 0 183 -31l-25 -86q-89 29 -160 29q-115 0 -166 -67.5t-51 -223.5v-162h281v-88h-281v-1028q0 -155 -71 -236.5t-207 -81.5q-85 0 -140 19v90q78 -18 144 -18q176 0 176 217v1038h-207z" />
-<glyph unicode="&#x1a0;" horiz-adv-x="1565" d="M1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q330 0 500 -230q81 21 120.5 92t39.5 209h104l13 -18q-10 -147 -67.5 -232t-164.5 -120q107 -182 107 -453zM240 733q0 -314 140 -485.5t402 -171.5 q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170t-141.5 -483z" />
-<glyph unicode="&#x1a1;" horiz-adv-x="1200" d="M1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q219 0 348 -147q72 24 107.5 92t38.5 202h100l12 -18q-11 -144 -62 -225t-147 -119q82 -137 82 -348zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5 t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5t-97.5 -349.5z" />
-<glyph unicode="&#x1af;" horiz-adv-x="1497" d="M1282 1462v-207q89 19 130.5 89t41.5 212h105l12 -18q-12 -167 -85.5 -254.5t-203.5 -112.5v-655q0 -252 -146 -394t-407 -142q-254 0 -396.5 142.5t-142.5 397.5v942h103v-946q0 -211 117 -328.5t331 -117.5q209 0 324 115.5t115 320.5v956h102z" />
-<glyph unicode="&#x1b0;" horiz-adv-x="1262" d="M268 1087v-704q0 -164 72.5 -238.5t224.5 -74.5q189 0 276 99t87 318v600h98v-122q66 11 104.5 44t55 90t16.5 167h101l12 -19q-9 -123 -41 -190t-91.5 -113t-156.5 -63v-881h-84l-18 150h-6q-52 -82 -143.5 -126t-209.5 -44q-201 0 -298 98t-97 299v710h98z" />
-<glyph unicode="&#x1f0;" horiz-adv-x="463" d="M0 0zM37 -492q-80 0 -135 25v86q69 -20 129 -20q151 0 151 176v1312h99v-1298q0 -135 -63.5 -208t-180.5 -73zM524 1552q-170 -188 -242 -311h-98q-76 128 -242 311v17h70q114 -94 221 -207q108 114 221 207h70v-17z" />
-<glyph unicode="&#x1fa;" horiz-adv-x="1229" d="M836 1411q0 -81 -41 -133t-109 -72l553 -1206h-115l-200 446h-617l-209 -446h-110l565 1206q-68 17 -110 69t-42 136q0 94 60 152.5t157 58.5q98 0 158 -58t60 -153zM885 539l-207 454q-24 52 -60 154q-23 -70 -63 -160l-209 -448h539zM481 1411q0 -66 38 -103.5 t99 -37.5q62 0 100 37.5t38 103.5q0 64 -39 101.5t-99 37.5t-98.5 -38t-38.5 -101zM561 1690q103 111 191 272h141v-16q-44 -61 -121.5 -141t-140.5 -132h-70v17z" />
-<glyph unicode="&#x1fb;" horiz-adv-x="1085" d="M842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM467 1712q48 50 101.5 123t86.5 127h138v-14q-35 -45 -112.5 -120t-145.5 -128h-68v12zM758 1413q0 -97 -60 -155t-157 -58t-157 58t-60 155q0 94 60 152.5t157 58.5t157 -59t60 -152z M403 1413q0 -66 38 -103.5t100 -37.5t99.5 37.5t37.5 103.5q0 64 -39 101.5t-98 37.5q-60 0 -99 -37.5t-39 -101.5z" />
-<glyph unicode="&#x1fc;" horiz-adv-x="1653" d="M0 0zM1528 0h-717v516h-475l-227 -516h-111l653 1462h877v-94h-615v-553h576v-94h-576v-627h615v-94zM377 608h434v760h-100zM891 1595q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x1fd;" horiz-adv-x="1731" d="M98 0zM1243 -20q-295 0 -397 256q-68 -133 -168 -194.5t-252 -61.5q-156 0 -242 82.5t-86 226.5q0 154 125 243t377 97l201 6v72q0 155 -61.5 234t-198.5 79q-148 0 -305 -84l-37 86q173 84 346 84q261 0 325 -211q111 213 347 213q184 0 289.5 -134.5t105.5 -363.5v-80 h-715q0 -460 348 -460q85 0 150 12t174 57v-90q-92 -41 -165 -55t-161 -14zM434 70q169 0 266 99.5t97 276.5v107l-187 -8q-219 -11 -313 -71.5t-94 -188.5q0 -102 61 -158.5t170 -56.5zM1217 1020q-284 0 -314 -402h604q0 188 -77.5 295t-212.5 107zM774 1257 q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x1fe;" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-236 0 -395 120l-86 -120l-74 59l90 127q-188 200 -188 569q0 349 175.5 549.5t479.5 200.5q232 0 392 -121l108 152l72 -60l-111 -153q191 -207 191 -570zM1325 733q0 315 -139 486l-742 -1037q133 -106 338 -106 q264 0 403.5 170t139.5 487zM240 733q0 -312 139 -483l739 1034q-133 102 -334 102q-261 0 -402.5 -170t-141.5 -483zM686 1595q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x1ff;" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-173 0 -291 98l-86 -113l-72 58l93 120q-121 153 -121 402q0 266 129 414.5t354 148.5q179 0 301 -104l96 124l74 -55l-104 -137q112 -147 112 -391zM223 545q0 -200 78 -322l543 705q-98 90 -246 90 q-180 0 -277.5 -123.5t-97.5 -349.5zM977 545q0 190 -72 309l-543 -702q94 -82 238 -82q180 0 278.5 125.5t98.5 349.5zM499 1257q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x218;" horiz-adv-x="1116" d="M111 0zM1014 377q0 -183 -134.5 -290t-357.5 -107q-268 0 -411 59v102q158 -67 403 -67q180 0 285.5 82.5t105.5 216.5q0 83 -35 137.5t-114 99.5t-232 97q-224 77 -309.5 166.5t-85.5 238.5q0 164 128.5 267.5t330.5 103.5q206 0 387 -78l-37 -88q-182 76 -348 76 q-162 0 -258 -75t-96 -204q0 -81 29.5 -133t96.5 -93.5t230 -99.5q171 -59 257 -114.5t125.5 -126t39.5 -170.5zM428 -436q25 54 50 145t36 166h113v-14q-23 -82 -63.5 -167.5t-81.5 -146.5h-54v17z" />
-<glyph unicode="&#x219;" horiz-adv-x="954" d="M84 0zM856 283q0 -146 -111 -224.5t-315 -78.5q-218 0 -346 67v107q164 -82 346 -82q161 0 244.5 53.5t83.5 142.5q0 82 -66.5 138t-218.5 110q-163 59 -229 101.5t-99.5 96t-33.5 130.5q0 122 102.5 193t286.5 71q176 0 334 -66l-37 -90q-160 66 -297 66 q-133 0 -211 -44t-78 -122q0 -85 60.5 -136t236.5 -114q147 -53 214 -95.5t100.5 -96.5t33.5 -127zM326 -436q25 54 50 145t36 166h113v-14q-23 -82 -63.5 -167.5t-81.5 -146.5h-54v17z" />
-<glyph unicode="&#x21a;" horiz-adv-x="1073" d="M10 0zM588 0h-103v1366h-475v96h1053v-96h-475v-1366zM403 -436q25 54 50 145t36 166h113v-14q-23 -82 -63.5 -167.5t-81.5 -146.5h-54v17z" />
-<glyph unicode="&#x21b;" horiz-adv-x="686" d="M25 0zM469 68q94 0 164 16v-80q-72 -24 -166 -24q-144 0 -212.5 77t-68.5 242v702h-161v58l161 45l50 246h51v-263h319v-86h-319v-688q0 -125 44 -185t138 -60zM263 -436q25 54 50 145t36 166h113v-14q-23 -82 -63.5 -167.5t-81.5 -146.5h-54v17z" />
-<glyph unicode="&#x237;" horiz-adv-x="463" d="M37 -492q-80 0 -135 25v86q69 -20 129 -20q151 0 151 176v1312h99v-1298q0 -135 -63.5 -208t-180.5 -73z" />
-<glyph unicode="&#x2bc;" horiz-adv-x="297" d="M29 961zM256 1462l12 -20q-75 -265 -174 -481h-65q29 96 61 241.5t49 259.5h117z" />
-<glyph unicode="&#x2c6;" horiz-adv-x="1182" d="M299 1257q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#x2c7;" horiz-adv-x="1182" d="M881 1552q-170 -188 -242 -311h-98q-76 128 -242 311v17h70q114 -94 221 -207q108 114 221 207h70v-17z" />
-<glyph unicode="&#x2c9;" horiz-adv-x="1141" d="M293 1333h555v-82h-555v82z" />
-<glyph unicode="&#x2d8;" horiz-adv-x="1182" d="M586 1241q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5t134.5 37.5t61.5 124.5h80q-30 -246 -278 -246z" />
-<glyph unicode="&#x2d9;" horiz-adv-x="483" d="M178 1389q0 96 64 96q31 0 48 -25t17 -71q0 -45 -17 -71t-48 -26q-64 0 -64 97z" />
-<glyph unicode="&#x2da;" horiz-adv-x="1182" d="M805 1456q0 -97 -60 -155t-157 -58t-157 58t-60 155q0 94 60 152.5t157 58.5t157 -59t60 -152zM451 1456q0 -66 37.5 -103.5t99.5 -37.5t99.5 37.5t37.5 103.5q0 64 -39 101.5t-98 37.5q-62 0 -99.5 -38t-37.5 -101z" />
-<glyph unicode="&#x2db;" horiz-adv-x="356" d="M162 -248q0 -110 106 -110q49 0 82 12v-84q-40 -16 -104 -16q-84 0 -133.5 47.5t-49.5 134.5q0 70 40 139t112 125h90q-72 -63 -107.5 -119.5t-35.5 -128.5z" />
-<glyph unicode="&#x2dc;" horiz-adv-x="1182" d="M780 1243q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73q10 111 63 174.5t137 63.5q48 0 88 -25t82 -59q34 -28 66 -50t61 -22q46 0 77 36.5t48 119.5h76q-16 -116 -69 -177t-132 -61z" />
-<glyph unicode="&#x2dd;" horiz-adv-x="1182" d="M258 1257q31 33 67 90t121 222h136v-17q-135 -202 -254 -311h-70v16zM596 1257q31 33 67 90t121 222h136v-17q-135 -202 -254 -311h-70v16z" />
-<glyph unicode="&#x2f3;" horiz-adv-x="682" d="M557 -338q0 -97 -60 -155t-157 -58t-157 58t-60 155q0 94 60 152.5t157 58.5t157 -59t60 -152zM203 -338q0 -66 37.5 -103.5t99.5 -37.5t99.5 37.5t37.5 103.5q0 64 -39 101.5t-98 37.5q-62 0 -99.5 -38t-37.5 -101z" />
-<glyph unicode="&#x300;" horiz-adv-x="0" d="M-501 1241zM-501 1241h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
-<glyph unicode="&#x301;" horiz-adv-x="0" d="M-325 1241zM-708 1257q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x303;" horiz-adv-x="0" d="M-245 1243zM-446 1243q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73q10 111 63 174.5t137 63.5q48 0 88 -25t82 -59q34 -28 66 -50t61 -22q46 0 77 36.5t48 119.5h76q-16 -116 -69 -177t-132 -61z" />
-<glyph unicode="&#x309;" horiz-adv-x="0" d="M-412 1505q0 -140 -168 -176l-10 -121h-80l-10 178q89 15 129.5 43t40.5 72q0 48 -33.5 72t-111.5 24q-48 0 -93 -8v78q52 12 107 12q108 0 168.5 -45.5t60.5 -128.5z" />
-<glyph unicode="&#x30f;" horiz-adv-x="0" d="M-350 1241h-70q-57 50 -131.5 142.5t-122.5 168.5v17h135q79 -154 118 -216t71 -96v-16zM-688 1241h-70q-57 50 -131.5 142.5t-122.5 168.5v17h135q76 -148 115.5 -212t73.5 -100v-16z" />
-<glyph unicode="&#x323;" horiz-adv-x="0" d="M-662 -227q0 96 64 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-64 0 -64 97z" />
-<glyph unicode="&#x384;" horiz-adv-x="1182" d="M530 1257q29 75 57 184t42 210h119v-17q-18 -77 -63 -191t-97 -202h-58v16z" />
-<glyph unicode="&#x385;" horiz-adv-x="1182" d="M526 1405q75 164 115 311h117v-18q-21 -52 -72.5 -145t-101.5 -164h-58v16zM309 1389q0 86 64 86q63 0 63 -86t-63 -86q-64 0 -64 86zM745 1389q0 86 64 86q63 0 63 -86t-63 -86q-64 0 -64 86z" />
-<glyph unicode="&#x386;" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM76 1152q29 75 57 184t42 210h119v-17q-18 -77 -63 -191t-97 -202h-58v16z" />
-<glyph unicode="&#x387;" horiz-adv-x="487" d="M162 623zM162 721q0 98 80 98q82 0 82 -98t-82 -98q-80 0 -80 98z" />
-<glyph unicode="&#x388;" horiz-adv-x="1221" d="M0 0zM1096 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94zM-40 1152q29 75 57 184t42 210h119v-17q-18 -77 -63 -191t-97 -202h-58v16z" />
-<glyph unicode="&#x389;" horiz-adv-x="1563" d="M0 0zM1356 0h-103v719h-854v-719h-102v1462h102v-649h854v649h103v-1462zM-40 1152q29 75 57 184t42 210h119v-17q-18 -77 -63 -191t-97 -202h-58v16z" />
-<glyph unicode="&#x38a;" horiz-adv-x="602" d="M0 0zM293 0v1462h102v-1462h-102zM-40 1152q29 75 57 184t42 210h119v-17q-18 -77 -63 -191t-97 -202h-58v16z" />
-<glyph unicode="&#x38c;" horiz-adv-x="1577" d="M0 0zM1448 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM252 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170 t-141.5 -483zM-40 1152q29 75 57 184t42 210h119v-17q-18 -77 -63 -191t-97 -202h-58v16z" />
-<glyph unicode="&#x38e;" horiz-adv-x="1321" d="M0 0zM783 662l428 800h110l-487 -897v-565h-105v557l-489 905h117zM-40 1152q29 75 57 184t42 210h119v-17q-18 -77 -63 -191t-97 -202h-58v16z" />
-<glyph unicode="&#x38f;" horiz-adv-x="1608" d="M0 0zM813 1393q-251 0 -399 -151.5t-148 -412.5q0 -226 90.5 -397.5t312.5 -359.5v-72h-567v94h407q-133 118 -205.5 224.5t-110.5 232t-38 270.5q0 200 80 351t229.5 232t348.5 81q311 0 485 -174t174 -488q0 -209 -80.5 -384t-269.5 -345h403v-94h-565v72 q215 175 308 350t93 405q0 262 -146 414t-402 152zM-40 1152q29 75 57 184t42 210h119v-17q-18 -77 -63 -191t-97 -202h-58v16z" />
-<glyph unicode="&#x390;" horiz-adv-x="629" d="M0 0zM264 1087v-774q0 -134 46.5 -189.5t152.5 -55.5q65 0 129 16v-84q-20 -7 -61 -13.5t-78 -6.5q-152 0 -219.5 80t-67.5 243v784h98zM167 1405q75 164 115 311h117v-18q-21 -52 -72.5 -145t-101.5 -164h-58v16zM-50 1389q0 86 64 86q63 0 63 -86t-63 -86q-64 0 -64 86 zM386 1389q0 86 64 86q63 0 63 -86t-63 -86q-64 0 -64 86z" />
-<glyph unicode="&#x391;" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174z" />
-<glyph unicode="&#x392;" horiz-adv-x="1284" d="M207 0zM207 1462h401q271 0 398 -92t127 -278q0 -127 -77.5 -211.5t-226.5 -108.5v-6q175 -26 257.5 -110.5t82.5 -235.5q0 -202 -134 -311t-380 -109h-448v1462zM309 811h322q206 0 299.5 68.5t93.5 214.5t-105.5 212t-314.5 66h-295v-561zM309 721v-631h344 q406 0 406 330q0 301 -428 301h-322z" />
-<glyph unicode="&#x393;" horiz-adv-x="1028" d="M309 0h-102v1462h801v-94h-699v-1368z" />
-<glyph unicode="&#x394;" d="M20 0zM20 59l521 1403h80l528 -1405v-57h-1129v59zM580 1315q-53 -153 -441 -1219h889q-391 1054 -448 1219z" />
-<glyph unicode="&#x395;" horiz-adv-x="1130" d="M207 0zM1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94z" />
-<glyph unicode="&#x396;" horiz-adv-x="1180" d="M82 0zM1098 0h-1016v76l856 1290h-817v96h954v-76l-858 -1290h881v-96z" />
-<glyph unicode="&#x397;" horiz-adv-x="1473" d="M207 0zM1266 0h-103v719h-854v-719h-102v1462h102v-649h854v649h103v-1462z" />
-<glyph unicode="&#x398;" horiz-adv-x="1565" d="M449 793h665v-95h-665v95zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5 q-261 0 -402.5 -170t-141.5 -483z" />
-<glyph unicode="&#x399;" horiz-adv-x="516" d="M207 0zM207 0v1462h102v-1462h-102z" />
-<glyph unicode="&#x39a;" horiz-adv-x="1190" d="M207 0zM1190 0h-125l-561 772l-195 -172v-600h-102v1462h102v-760l162 162l573 598h130l-599 -618z" />
-<glyph unicode="&#x39b;" horiz-adv-x="1229" d="M113 0h-113l596 1468h49l584 -1468h-115l-436 1120q-23 60 -60 172q-29 -100 -59 -174z" />
-<glyph unicode="&#x39c;" horiz-adv-x="1767" d="M207 0zM850 0l-545 1350h-8q8 -124 8 -254v-1096h-98v1462h158l518 -1286h6l518 1286h154v-1462h-103v1108q0 116 12 240h-8l-547 -1348h-65z" />
-<glyph unicode="&#x39d;" horiz-adv-x="1477" d="M207 0zM1270 0h-103l-866 1298h-8q12 -232 12 -350v-948h-98v1462h102l865 -1296h6q-9 180 -9 342v954h99v-1462z" />
-<glyph unicode="&#x39e;" horiz-adv-x="1087" d="M164 815h760v-94h-760v94zM82 1462h924v-94h-924v94zM1047 94v-94h-1006v94h1006z" />
-<glyph unicode="&#x39f;" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170 t-141.5 -483z" />
-<glyph unicode="&#x3a0;" horiz-adv-x="1462" d="M1255 0h-102v1366h-844v-1366h-102v1462h1048v-1462z" />
-<glyph unicode="&#x3a1;" horiz-adv-x="1198" d="M207 0zM1087 1042q0 -212 -144 -325t-408 -113h-226v-604h-102v1462h358q522 0 522 -420zM309 692h201q247 0 357 81.5t110 264.5q0 169 -104 250.5t-322 81.5h-242v-678z" />
-<glyph unicode="&#x3a3;" horiz-adv-x="1128" d="M61 0v84l533 676l-520 620v82h964v-94h-647l-182 2l514 -604l-530 -672h905v-94h-1037z" />
-<glyph unicode="&#x3a4;" horiz-adv-x="1073" d="M10 0zM588 0h-103v1366h-475v96h1053v-96h-475v-1366z" />
-<glyph unicode="&#x3a5;" horiz-adv-x="1081" d="M0 0zM543 662l428 800h110l-487 -897v-565h-105v557l-489 905h117z" />
-<glyph unicode="&#x3a6;" horiz-adv-x="1561" d="M729 1483h102v-180h43q275 0 425.5 -141t150.5 -392q0 -174 -69.5 -301t-206 -195.5t-332.5 -68.5h-11v-225h-102v225h-18q-193 0 -327.5 68t-203.5 191t-69 294q0 156 70 281.5t201 194.5t310 69h37v180zM831 289h15q236 0 364.5 124.5t128.5 352.5q0 219 -120 336 t-345 117h-43v-930zM729 1219h-41q-219 0 -343 -122t-124 -333q0 -227 128.5 -351t363.5 -124h16v930z" />
-<glyph unicode="&#x3a7;" horiz-adv-x="1102" d="M0 0zM1102 0h-117l-432 682l-440 -682h-113l492 762l-447 700h115l395 -626l401 626h109l-453 -698z" />
-<glyph unicode="&#x3a8;" horiz-adv-x="1565" d="M823 0h-102v453h-27q-280 0 -425.5 130.5t-145.5 395.5v483h102v-479q0 -226 117 -333t356 -107h23v919h102v-919h23q239 0 356 107t117 333v479h102v-483q0 -265 -146 -395.5t-425 -130.5h-27v-453z" />
-<glyph unicode="&#x3a9;" horiz-adv-x="1587" d="M793 1393q-251 0 -399 -151.5t-148 -412.5q0 -226 90.5 -397.5t312.5 -359.5v-72h-567v94h407q-133 118 -205.5 224.5t-110.5 232t-38 270.5q0 200 80 351t229.5 232t348.5 81q311 0 485 -174t174 -488q0 -209 -80.5 -384t-269.5 -345h403v-94h-565v72q215 175 308 350 t93 405q0 262 -146 414t-402 152z" />
-<glyph unicode="&#x3aa;" horiz-adv-x="516" d="M5 0zM207 0v1462h102v-1462h-102zM5 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM386 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x3ab;" horiz-adv-x="1081" d="M0 0zM543 662l428 800h110l-487 -897v-565h-105v557l-489 905h117zM288 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM669 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x3ac;" horiz-adv-x="1208" d="M119 0zM578 68q180 0 265 108.5t85 353.5v35q0 237 -85.5 345t-267.5 108q-169 0 -260.5 -123.5t-91.5 -353.5q0 -473 355 -473zM578 -20q-226 0 -342.5 143t-116.5 416q0 275 120.5 422t346.5 147q128 0 216 -56.5t142 -177.5h6q4 52 18.5 119.5t24.5 93.5h74 q-41 -134 -41 -391v-495q0 -142 90 -142q37 0 64 11v-72q-29 -18 -82 -18q-146 0 -164 188h-8q-63 -98 -148 -143t-200 -45zM567 1257q29 75 57 184t42 210h119v-17q-18 -77 -63 -191t-97 -202h-58v16z" />
-<glyph unicode="&#x3ad;" horiz-adv-x="928" d="M94 0zM672 618v-86h-140q-169 0 -251 -62.5t-82 -174.5q0 -105 87 -165t244 -60q76 0 140 14t174 66v-93q-135 -77 -322 -77q-202 0 -315 81t-113 226q0 224 248 284v9q-215 63 -215 239q0 133 103 211t282 78q96 0 174.5 -15.5t165.5 -52.5l-37 -84q-148 64 -303 64 q-142 0 -211.5 -53t-69.5 -150q0 -199 326 -199h115zM451 1257q29 75 57 184t42 210h119v-17q-18 -77 -63 -191t-97 -202h-58v16z" />
-<glyph unicode="&#x3ae;" horiz-adv-x="1208" d="M182 0zM940 -492v1197q0 164 -72.5 238.5t-224.5 74.5q-189 0 -275.5 -99.5t-86.5 -318.5v-600h-99v1087h84l19 -149h6q54 87 147 128.5t205 41.5q201 0 298 -99t97 -298v-1203h-98zM561 1257q29 75 57 184t42 210h119v-17q-18 -77 -63 -191t-97 -202h-58v16z" />
-<glyph unicode="&#x3af;" horiz-adv-x="629" d="M166 0zM264 1087v-774q0 -134 46.5 -189.5t152.5 -55.5q65 0 129 16v-84q-20 -7 -61 -13.5t-78 -6.5q-152 0 -219.5 80t-67.5 243v784h98zM171 1257q29 75 57 184t42 210h119v-17q-18 -77 -63 -191t-97 -202h-58v16z" />
-<glyph unicode="&#x3b0;" horiz-adv-x="1219" d="M166 0zM602 -20q-219 0 -327.5 125t-108.5 387v595h98v-606q0 -201 82.5 -307t263.5 -106q189 0 282 132t93 404q0 127 -13 237t-46 246h98q31 -116 46 -231.5t15 -259.5q0 -318 -121.5 -467t-361.5 -149zM542 1405q75 164 115 311h117v-18q-21 -52 -72.5 -145 t-101.5 -164h-58v16zM325 1389q0 86 64 86q63 0 63 -86t-63 -86q-64 0 -64 86zM761 1389q0 86 64 86q63 0 63 -86t-63 -86q-64 0 -64 86z" />
-<glyph unicode="&#x3b1;" horiz-adv-x="1208" d="M578 68q180 0 265 108.5t85 353.5v35q0 237 -85.5 345t-267.5 108q-169 0 -260.5 -123.5t-91.5 -353.5q0 -473 355 -473zM578 -20q-226 0 -342.5 143t-116.5 416q0 275 120.5 422t346.5 147q128 0 216 -56.5t142 -177.5h6q4 52 18.5 119.5t24.5 93.5h74 q-41 -134 -41 -391v-495q0 -142 90 -142q37 0 64 11v-72q-29 -18 -82 -18q-146 0 -164 188h-8q-63 -98 -148 -143t-200 -45z" />
-<glyph unicode="&#x3b2;" horiz-adv-x="1245" d="M649 1567q204 0 319 -102t115 -283q0 -140 -72.5 -232.5t-213.5 -118.5v-6q176 -24 261 -124t85 -287q0 -201 -132 -313.5t-358 -112.5q-183 0 -372 100v-580h-99v1586q0 224 121 348.5t346 124.5zM647 1479q-182 0 -274 -97t-92 -284v-928q109 -58 194 -81t176 -23 q187 0 292.5 91t105.5 255q0 364 -392 364h-118v88h106q164 0 249 81.5t85 238.5q0 139 -87 217t-245 78z" />
-<glyph unicode="&#x3b3;" horiz-adv-x="983" d="M459 -492h-99q0 92 30 238.5t73 265.5l-453 1075h103l268 -645l125 -313h6l86 238l272 720h103l-404 -1040q-44 -116 -74.5 -269t-35.5 -270z" />
-<glyph unicode="&#x3b4;" horiz-adv-x="1190" d="M573 940q-158 89 -220 169.5t-62 180.5q0 122 93.5 199.5t242.5 77.5q97 0 187.5 -20.5t213.5 -80.5l-45 -86q-112 57 -191.5 78t-162.5 21q-109 0 -172.5 -50.5t-63.5 -134.5t53 -141.5t238 -165.5q166 -95 241 -165.5t110.5 -153.5t35.5 -197q0 -229 -126.5 -360 t-350.5 -131q-217 0 -347 124.5t-130 329.5q0 195 109.5 319t346.5 187zM967 473q0 135 -70.5 232t-237.5 182q-148 -36 -222.5 -75.5t-120.5 -92t-70.5 -123t-24.5 -162.5q0 -166 101.5 -266t273.5 -100q177 0 274 104.5t97 300.5z" />
-<glyph unicode="&#x3b5;" horiz-adv-x="928" d="M672 618v-86h-140q-169 0 -251 -62.5t-82 -174.5q0 -105 87 -165t244 -60q76 0 140 14t174 66v-93q-135 -77 -322 -77q-202 0 -315 81t-113 226q0 224 248 284v9q-215 63 -215 239q0 133 103 211t282 78q96 0 174.5 -15.5t165.5 -52.5l-37 -84q-148 64 -303 64 q-142 0 -211.5 -53t-69.5 -150q0 -199 326 -199h115z" />
-<glyph unicode="&#x3b6;" horiz-adv-x="956" d="M182 1470v86h717v-75q-256 -236 -401.5 -407.5t-210 -313.5t-64.5 -297q0 -113 29 -176.5t95 -103t198 -68.5q153 -33 216.5 -62t92.5 -72t29 -110q0 -60 -25 -123t-88 -149h-96q114 155 114 258q0 49 -26 76.5t-85 49.5t-165 42q-209 38 -301 142t-92 292 q0 100 25.5 192t71.5 179.5t112.5 175t154 181.5t293.5 290q-105 -7 -364 -7h-230z" />
-<glyph unicode="&#x3b7;" horiz-adv-x="1208" d="M940 -492v1197q0 164 -72.5 238.5t-224.5 74.5q-189 0 -275.5 -99.5t-86.5 -318.5v-600h-99v1087h84l19 -149h6q54 87 147 128.5t205 41.5q201 0 298 -99t97 -298v-1203h-98z" />
-<glyph unicode="&#x3b8;" horiz-adv-x="1167" d="M1049 782q0 -399 -118 -600.5t-351 -201.5q-461 0 -461 800q0 392 119.5 595.5t347.5 203.5q463 0 463 -797zM582 68q353 0 368 692h-733q12 -692 365 -692zM580 1491q-176 0 -263.5 -164.5t-99.5 -480.5h731q-12 328 -103 486.5t-265 158.5z" />
-<glyph unicode="&#x3b9;" horiz-adv-x="629" d="M264 1087v-774q0 -134 46.5 -189.5t152.5 -55.5q65 0 129 16v-84q-20 -7 -61 -13.5t-78 -6.5q-152 0 -219.5 80t-67.5 243v784h98z" />
-<glyph unicode="&#x3ba;" horiz-adv-x="991" d="M182 0zM279 477l555 610h120l-428 -464l465 -623h-119l-413 549l-178 -162v-387h-99v1087h99v-311l-7 -299h5z" />
-<glyph unicode="&#x3bb;" horiz-adv-x="1030" d="M-12 0l477 1092l-55 165q-35 107 -60 148.5t-58 62.5t-81 21q-44 0 -102 -12v75q63 17 114 17q68 0 112 -23t78 -76.5t81 -185.5l401 -1139q15 -43 33 -64.5t47 -21.5q31 0 55 11v-74q-30 -16 -78 -16q-52 0 -85.5 32t-59.5 105l-172 489q-96 280 -123 389h-4 q-32 -95 -76.5 -202t-339.5 -793h-104z" />
-<glyph unicode="&#x3bc;" horiz-adv-x="1221" d="M182 0zM281 1087v-704q0 -164 69 -238.5t213 -74.5q194 0 285.5 98t91.5 319v600h98v-1087h-84l-18 150h-6q-50 -77 -150 -123.5t-217 -46.5q-99 0 -167.5 27.5t-119.5 84.5q5 -92 5 -170v-414h-99v1579h99z" />
-<glyph unicode="&#x3bd;" horiz-adv-x="1051" d="M-2 1087h102q290 -781 318 -858.5t49 -140.5h6q399 369 399 999h95q0 -352 -110 -607.5t-349 -479.5h-102z" />
-<glyph unicode="&#x3be;" horiz-adv-x="940" d="M809 780h-150q-200 0 -318 -96.5t-118 -255.5q0 -93 32.5 -152.5t98.5 -97t230 -72.5q174 -38 236.5 -89t62.5 -148q0 -119 -113 -270h-96q114 157 114 256q0 50 -26.5 79t-85 50t-164.5 41q-207 38 -300 137t-93 260q0 144 80 247.5t225 145.5v10q-121 36 -178.5 107 t-57.5 182q0 131 85 226.5t245 138.5q-69 -9 -248 -9h-88v86h670v-79h-16q-155 0 -286 -47t-201 -128.5t-70 -183.5q0 -254 380 -254h150v-84z" />
-<glyph unicode="&#x3bf;" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5 t-97.5 -349.5z" />
-<glyph unicode="&#x3c0;" horiz-adv-x="1253" d="M1085 68q42 0 68 12v-84q-37 -16 -82 -16q-91 0 -142.5 58t-51.5 171v792h-533v-1001h-98v1001h-221v58l165 28h1006v-86h-221v-778q0 -155 110 -155z" />
-<glyph unicode="&#x3c1;" horiz-adv-x="1196" d="M1077 547q0 -279 -124.5 -423t-366.5 -144q-84 0 -167.5 26.5t-148.5 79.5h-2l3 -94l3 -187v-297h-98v1059q0 268 114 404.5t337 136.5q221 0 335.5 -142t114.5 -419zM618 1018q-179 0 -261.5 -110.5t-82.5 -344.5v-373q68 -61 142.5 -91.5t171.5 -30.5q195 0 290 117.5 t95 361.5q0 232 -85.5 351.5t-269.5 119.5z" />
-<glyph unicode="&#x3c2;" horiz-adv-x="973" d="M223 514q0 -141 35 -213t114 -120t218 -77q161 -34 227 -86t66 -147q0 -44 -12.5 -85.5t-31 -78.5t-69.5 -108h-96q55 74 84.5 142t29.5 118q0 65 -59 100t-207 64q-157 31 -241.5 92t-123 160.5t-38.5 232.5q0 286 134 443t380 157q138 0 268 -49l-27 -88 q-69 23 -136 35t-109 12q-406 0 -406 -504z" />
-<glyph unicode="&#x3c3;" horiz-adv-x="1202" d="M1073 518q0 -249 -127.5 -393.5t-353.5 -144.5q-222 0 -347.5 142.5t-125.5 391.5q0 282 149.5 427.5t436.5 145.5h448v-86h-254q174 -200 174 -483zM223 514q0 -209 97 -326.5t276 -117.5q177 0 275 116t98 318q0 297 -181 497h-79q-246 0 -366 -119t-120 -368z" />
-<glyph unicode="&#x3c4;" horiz-adv-x="913" d="M848 1087v-86h-430v-677q0 -131 54.5 -194.5t174.5 -63.5q75 0 146 20v-84q-57 -22 -168 -22q-153 0 -230.5 85t-77.5 246v690h-297v58l162 28h666z" />
-<glyph unicode="&#x3c5;" horiz-adv-x="1219" d="M602 -20q-219 0 -327.5 125t-108.5 387v595h98v-606q0 -201 82.5 -307t263.5 -106q189 0 282 132t93 404q0 127 -13 237t-46 246h98q31 -116 46 -231.5t15 -259.5q0 -318 -121.5 -467t-361.5 -149z" />
-<glyph unicode="&#x3c6;" horiz-adv-x="1389" d="M637 -492v472q-256 17 -387 161.5t-131 411.5q0 290 200 537l80 -56q-102 -138 -139 -248t-37 -233q0 -221 103 -344t311 -141v682q0 358 283 358q165 0 257.5 -140.5t92.5 -385.5q0 -180 -66 -311.5t-186.5 -205.5t-282.5 -85v-472h-98zM1165 580q0 204 -69.5 321 t-182.5 117q-88 0 -133 -69.5t-45 -196.5v-684q128 11 226.5 75.5t151 175.5t52.5 261z" />
-<glyph unicode="&#x3c7;" horiz-adv-x="1053" d="M143 1102q40 0 68 -14.5t50 -43.5t42 -77t217 -545l344 665h111l-406 -765l193 -472q54 -134 79 -178t51 -63t62 -19q42 0 80 9v-76q-37 -15 -96 -15q-58 0 -98.5 24.5t-74 77t-89.5 193.5l-170 428l-414 -723h-112l477 826l-228 563q-27 67 -53 96t-61 29q-29 0 -66 -8 v71q46 17 94 17z" />
-<glyph unicode="&#x3c8;" horiz-adv-x="1477" d="M788 1554v-1480q224 17 339.5 147.5t115.5 364.5q0 126 -11.5 236.5t-47.5 264.5h96q63 -226 63 -491q0 -278 -142.5 -437.5t-412.5 -176.5v-474h-98v474q-257 12 -390.5 155.5t-133.5 411.5v538h98v-540q0 -221 110 -340.5t316 -132.5v1480h98z" />
-<glyph unicode="&#x3c9;" horiz-adv-x="1503" d="M1034 -20q-113 0 -177 51.5t-99 146.5h-10q-39 -103 -104.5 -150.5t-170.5 -47.5q-168 0 -261 140t-93 402q0 161 29 295t94 270h102q-66 -154 -93.5 -286.5t-27.5 -282.5q0 -219 67 -333.5t191 -114.5q107 0 164 74.5t57 215.5v324h99v-324q0 -136 58.5 -213t168.5 -77 q124 0 188 116t64 332q0 153 -27.5 283.5t-93.5 285.5h103q63 -132 92.5 -266.5t29.5 -298.5q0 -258 -91 -400t-259 -142z" />
-<glyph unicode="&#x3ca;" horiz-adv-x="629" d="M3 0zM264 1087v-774q0 -134 46.5 -189.5t152.5 -55.5q65 0 129 16v-84q-20 -7 -61 -13.5t-78 -6.5q-152 0 -219.5 80t-67.5 243v784h98zM3 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM384 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86 q-63 0 -63 86z" />
-<glyph unicode="&#x3cb;" horiz-adv-x="1219" d="M166 0zM602 -20q-219 0 -327.5 125t-108.5 387v595h98v-606q0 -201 82.5 -307t263.5 -106q189 0 282 132t93 404q0 127 -13 237t-46 246h98q31 -116 46 -231.5t15 -259.5q0 -318 -121.5 -467t-361.5 -149zM346 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86 q-63 0 -63 86zM727 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x3cc;" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5 t-97.5 -349.5zM553 1257q29 75 57 184t42 210h119v-17q-18 -77 -63 -191t-97 -202h-58v16z" />
-<glyph unicode="&#x3cd;" horiz-adv-x="1219" d="M166 0zM602 -20q-219 0 -327.5 125t-108.5 387v595h98v-606q0 -201 82.5 -307t263.5 -106q189 0 282 132t93 404q0 127 -13 237t-46 246h98q31 -116 46 -231.5t15 -259.5q0 -318 -121.5 -467t-361.5 -149zM553 1257q29 75 57 184t42 210h119v-17q-18 -77 -63 -191 t-97 -202h-58v16z" />
-<glyph unicode="&#x3ce;" horiz-adv-x="1503" d="M119 0zM1034 -20q-113 0 -177 51.5t-99 146.5h-10q-39 -103 -104.5 -150.5t-170.5 -47.5q-168 0 -261 140t-93 402q0 161 29 295t94 270h102q-66 -154 -93.5 -286.5t-27.5 -282.5q0 -219 67 -333.5t191 -114.5q107 0 164 74.5t57 215.5v324h99v-324q0 -136 58.5 -213 t168.5 -77q124 0 188 116t64 332q0 153 -27.5 283.5t-93.5 285.5h103q63 -132 92.5 -266.5t29.5 -298.5q0 -258 -91 -400t-259 -142zM692 1257q29 75 57 184t42 210h119v-17q-18 -77 -63 -191t-97 -202h-58v16z" />
-<glyph unicode="&#x3d1;" horiz-adv-x="1208" d="M1042 862q5 -65 5 -104q0 -375 -130 -576.5t-372 -201.5q-179 0 -272 87.5t-93 262.5q0 62 16 182q15 119 15 156q0 55 -22.5 79.5t-57.5 24.5q-39 0 -94 -22l-27 75q62 31 135 31q80 0 124 -47.5t44 -140.5q0 -52 -15 -158q-15 -107 -15 -186q0 -254 258 -254 q401 0 401 686q0 56 -4 108q-332 3 -511 108t-179 300q0 143 85.5 225t231.5 82q187 0 309 -161.5t162 -465.5h142v-90h-136zM930 952q-32 252 -127.5 394.5t-231.5 142.5q-108 0 -167.5 -55t-59.5 -156q0 -157 151.5 -240.5t434.5 -85.5z" />
-<glyph unicode="&#x3d2;" horiz-adv-x="1104" d="M543 662l50 113q140 320 210 461t121 190t118 49q31 0 62 -11v-90q-26 6 -51 6q-42 0 -78.5 -43.5t-96 -162t-130 -274.5t-154.5 -357v-543h-105v557l-489 905h117z" />
-<glyph unicode="&#x3d6;" horiz-adv-x="1587" d="M1059 -20q-106 0 -174.5 49t-108.5 159h-4q-37 -107 -103 -157.5t-180 -50.5q-171 0 -259.5 114.5t-88.5 337.5q0 142 41.5 271.5t139.5 297.5h-302v58l168 28h1334v-86h-267q81 -143 116.5 -273t35.5 -296q0 -221 -88.5 -336.5t-259.5 -115.5zM1303 432q0 155 -32.5 296 t-115.5 273h-737q-172 -293 -172 -569q0 -185 62.5 -273.5t193.5 -88.5q109 0 166 76t57 208v221h98v-221q0 -134 60.5 -209t167.5 -75q252 0 252 362z" />
-<glyph unicode="&#x400;" horiz-adv-x="1130" d="M207 0zM1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94zM697 1579h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
-<glyph unicode="&#x401;" horiz-adv-x="1130" d="M207 0zM1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94zM354 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM735 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x402;" horiz-adv-x="1425" d="M928 -20q-94 0 -142 18v100q58 -18 142 -18q109 0 168 71.5t59 204.5v160q0 146 -69.5 207t-227.5 61h-409v-784h-103v1366h-336v96h955v-96h-516v-487h438q190 0 281.5 -88t91.5 -271v-160q0 -183 -86 -281.5t-246 -98.5z" />
-<glyph unicode="&#x403;" horiz-adv-x="1028" d="M207 0zM309 0h-102v1462h801v-94h-699v-1368zM483 1595q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x404;" horiz-adv-x="1272" d="M831 1391q-256 0 -412.5 -153t-176.5 -425h776v-94h-780q6 -311 156 -478t421 -167q184 0 338 47v-90q-145 -51 -362 -51q-308 0 -485 199t-177 556q0 223 84.5 393t243 262.5t368.5 92.5q214 0 383 -80l-41 -92q-160 80 -336 80z" />
-<glyph unicode="&#x405;" horiz-adv-x="1116" d="M111 0zM1014 377q0 -183 -134.5 -290t-357.5 -107q-268 0 -411 59v102q158 -67 403 -67q180 0 285.5 82.5t105.5 216.5q0 83 -35 137.5t-114 99.5t-232 97q-224 77 -309.5 166.5t-85.5 238.5q0 164 128.5 267.5t330.5 103.5q206 0 387 -78l-37 -88q-182 76 -348 76 q-162 0 -258 -75t-96 -204q0 -81 29.5 -133t96.5 -93.5t230 -99.5q171 -59 257 -114.5t125.5 -126t39.5 -170.5z" />
-<glyph unicode="&#x406;" horiz-adv-x="516" d="M207 0zM207 0v1462h102v-1462h-102z" />
-<glyph unicode="&#x407;" horiz-adv-x="516" d="M5 0zM207 0v1462h102v-1462h-102zM5 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM386 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x408;" horiz-adv-x="506" d="M0 0zM-33 -369q-92 0 -151 27v88q78 -20 149 -20q242 0 242 264v1472h102v-1462q0 -369 -342 -369z" />
-<glyph unicode="&#x409;" horiz-adv-x="1874" d="M1761 424q0 -205 -126 -314.5t-355 -109.5h-315v1366h-402q-71 -507 -112 -763.5t-79.5 -385.5t-97.5 -184.5t-157 -55.5q-62 0 -117 25v92q61 -22 109 -22q68 0 107 51t73 184.5t80 415t108 739.5h590v-645h195q250 0 374.5 -94t124.5 -299zM1067 90h190q202 0 298 80.5 t96 253.5q0 161 -94 232t-314 71h-176v-637z" />
-<glyph unicode="&#x40a;" horiz-adv-x="1939" d="M1133 817h194q249 0 374.5 -94t125.5 -299q0 -204 -126 -314t-355 -110h-316v723h-721v-723h-102v1462h102v-645h721v645h103v-645zM1133 90h190q201 0 297 79.5t96 254.5q0 161 -94 232t-313 71h-176v-637z" />
-<glyph unicode="&#x40b;" horiz-adv-x="1430" d="M449 879h450q189 0 275 -85t86 -274v-520h-105v526q0 145 -60 201.5t-210 56.5h-436v-784h-103v1366h-336v96h981v-96h-542v-487z" />
-<glyph unicode="&#x40c;" horiz-adv-x="1171" d="M207 0zM1171 0h-139l-723 745v-745h-102v1462h102v-708l703 708h135l-707 -708zM553 1595q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x40d;" horiz-adv-x="1477" d="M207 0zM207 1462h98v-956q0 -102 -8 -342h6l864 1298h103v-1462h-99v950q0 162 13 350h-8l-867 -1300h-102v1462zM852 1579h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
-<glyph unicode="&#x40e;" horiz-adv-x="1204" d="M10 0zM276 -20q-119 0 -192 30v103q86 -37 182 -37q72 0 123.5 24.5t95.5 79t107 182.5l-582 1100h121l447 -854q35 -69 63 -143h4l25 61l420 936h114l-469 -1028q-45 -99 -86 -182.5t-91 -143.5t-117 -94t-165 -34zM623 1579q-149 0 -227 66.5t-91 214.5h88 q15 -110 68 -155.5t164 -45.5q110 0 163.5 47t65.5 154h88q-21 -281 -319 -281z" />
-<glyph unicode="&#x40f;" horiz-adv-x="1462" d="M1255 0h-475v-369h-98v369h-475v1462h102v-1366h844v1366h102v-1462z" />
-<glyph unicode="&#x410;" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174z" />
-<glyph unicode="&#x411;" horiz-adv-x="1219" d="M602 817q252 0 378 -95.5t126 -301.5q0 -202 -124.5 -311t-356.5 -109h-418v1462h821v-96h-719v-549h293zM309 90h299q197 0 292 79.5t95 250.5q0 165 -96 236t-311 71h-279v-637z" />
-<glyph unicode="&#x412;" horiz-adv-x="1284" d="M207 0zM207 1462h401q271 0 398 -92t127 -278q0 -127 -77.5 -211.5t-226.5 -108.5v-6q175 -26 257.5 -110.5t82.5 -235.5q0 -202 -134 -311t-380 -109h-448v1462zM309 811h322q206 0 299.5 68.5t93.5 214.5t-105.5 212t-314.5 66h-295v-561zM309 721v-631h344 q406 0 406 330q0 301 -428 301h-322z" />
-<glyph unicode="&#x413;" horiz-adv-x="1028" d="M207 0zM309 0h-102v1462h801v-94h-699v-1368z" />
-<glyph unicode="&#x414;" horiz-adv-x="1337" d="M1276 -369h-98v369h-1065v-369h-99v465h105q148 257 260 652.5t125 713.5h622v-1366h150v-465zM1022 96v1270h-430q-24 -315 -126 -679t-233 -591h789z" />
-<glyph unicode="&#x415;" horiz-adv-x="1130" d="M207 0zM1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94z" />
-<glyph unicode="&#x416;" horiz-adv-x="1597" d="M625 745l-592 717h127l588 -708v708h102v-708l588 708h127l-594 -710l626 -752h-135l-612 741v-741h-102v741l-613 -741h-135z" />
-<glyph unicode="&#x417;" horiz-adv-x="1145" d="M1001 1120q0 -286 -303 -352v-6q332 -71 332 -356q0 -201 -141.5 -313.5t-399.5 -112.5q-242 0 -407 86v104q95 -46 203 -71t204 -25q200 0 315.5 86.5t115.5 242.5q0 152 -112.5 230t-336.5 78h-217v96h225q212 0 313 80t101 227q0 125 -92.5 200t-241.5 75 q-111 0 -204 -31.5t-201 -108.5l-58 80q202 154 463 154q205 0 323.5 -98t118.5 -265z" />
-<glyph unicode="&#x418;" horiz-adv-x="1477" d="M207 1462h98v-956q0 -102 -8 -342h6l864 1298h103v-1462h-99v950q0 162 13 350h-8l-867 -1300h-102v1462z" />
-<glyph unicode="&#x419;" horiz-adv-x="1477" d="M207 0zM207 1462h98v-956q0 -102 -8 -342h6l864 1298h103v-1462h-99v950q0 162 13 350h-8l-867 -1300h-102v1462zM737 1579q-149 0 -227 66.5t-91 214.5h88q15 -110 68 -155.5t164 -45.5q110 0 163.5 47t65.5 154h88q-21 -281 -319 -281z" />
-<glyph unicode="&#x41a;" horiz-adv-x="1171" d="M1171 0h-139l-723 745v-745h-102v1462h102v-708l703 708h135l-707 -708z" />
-<glyph unicode="&#x41b;" horiz-adv-x="1395" d="M1188 0h-103v1366h-530q-41 -339 -87 -643t-77.5 -433t-66 -191.5t-83.5 -92t-124 -29.5q-67 0 -117 25v92q61 -22 113 -22q87 0 135.5 108t106 466t114.5 816h719v-1462z" />
-<glyph unicode="&#x41c;" horiz-adv-x="1767" d="M207 0zM850 0l-545 1350h-8q8 -124 8 -254v-1096h-98v1462h158l518 -1286h6l518 1286h154v-1462h-103v1108q0 116 12 240h-8l-547 -1348h-65z" />
-<glyph unicode="&#x41d;" horiz-adv-x="1473" d="M207 0zM1266 0h-103v719h-854v-719h-102v1462h102v-649h854v649h103v-1462z" />
-<glyph unicode="&#x41e;" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170 t-141.5 -483z" />
-<glyph unicode="&#x41f;" horiz-adv-x="1462" d="M207 0zM1255 0h-102v1366h-844v-1366h-102v1462h1048v-1462z" />
-<glyph unicode="&#x420;" horiz-adv-x="1198" d="M207 0zM1087 1042q0 -212 -144 -325t-408 -113h-226v-604h-102v1462h358q522 0 522 -420zM309 692h201q247 0 357 81.5t110 264.5q0 169 -104 250.5t-322 81.5h-242v-678z" />
-<glyph unicode="&#x421;" horiz-adv-x="1272" d="M129 0zM831 1391q-275 0 -433 -176t-158 -482q0 -313 149 -486t426 -173q184 0 338 47v-90q-145 -51 -362 -51q-308 0 -485 199t-177 556q0 223 84.5 393t243 262.5t368.5 92.5q214 0 383 -80l-41 -92q-160 80 -336 80z" />
-<glyph unicode="&#x422;" horiz-adv-x="1073" d="M10 0zM588 0h-103v1366h-475v96h1053v-96h-475v-1366z" />
-<glyph unicode="&#x423;" horiz-adv-x="1204" d="M276 -20q-119 0 -192 30v103q86 -37 182 -37q72 0 123.5 24.5t95.5 79t107 182.5l-582 1100h121l447 -854q35 -69 63 -143h4l25 61l420 936h114l-469 -1028q-45 -99 -86 -182.5t-91 -143.5t-117 -94t-165 -34z" />
-<glyph unicode="&#x424;" horiz-adv-x="1561" d="M111 0zM729 1483h102v-180h43q275 0 425.5 -141t150.5 -392q0 -174 -69.5 -301t-206 -195.5t-332.5 -68.5h-11v-225h-102v225h-18q-193 0 -327.5 68t-203.5 191t-69 294q0 156 70 281.5t201 194.5t310 69h37v180zM831 289h15q236 0 364.5 124.5t128.5 352.5 q0 219 -120 336t-345 117h-43v-930zM729 1219h-41q-219 0 -343 -122t-124 -333q0 -227 128.5 -351t363.5 -124h16v930z" />
-<glyph unicode="&#x425;" horiz-adv-x="1102" d="M0 0zM1102 0h-117l-432 682l-440 -682h-113l492 762l-447 700h115l395 -626l401 626h109l-453 -698z" />
-<glyph unicode="&#x426;" horiz-adv-x="1473" d="M1255 96h156v-465h-98v369h-1106v1462h102v-1366h844v1366h102v-1366z" />
-<glyph unicode="&#x427;" horiz-adv-x="1372" d="M1165 0h-102v635q-261 -103 -461 -103q-204 0 -312 90.5t-108 276.5v563h103v-567q0 -266 325 -266q96 0 192 17.5t261 76.5v739h102v-1462z" />
-<glyph unicode="&#x428;" horiz-adv-x="2060" d="M1853 0h-1646v1462h102v-1366h670v1366h102v-1366h670v1366h102v-1462z" />
-<glyph unicode="&#x429;" horiz-adv-x="2071" d="M207 0v1462h102v-1366h670v1366h102v-1366h670v1366h102v-1366h156v-465h-98v369h-1704z" />
-<glyph unicode="&#x42a;" horiz-adv-x="1348" d="M346 0v1366h-336v96h439v-645h282q252 0 378 -95.5t126 -301.5q0 -202 -124.5 -311t-356.5 -109h-408zM449 90h288q197 0 292 79.5t95 250.5q0 165 -96 236t-311 71h-268v-637z" />
-<glyph unicode="&#x42b;" horiz-adv-x="1669" d="M1462 0h-102v1462h102v-1462zM309 817h283q251 0 377.5 -95.5t126.5 -301.5q0 -202 -124 -311t-358 -109h-407v1462h102v-645zM309 90h289q204 0 295.5 83t91.5 247q0 163 -95 235t-312 72h-269v-637z" />
-<glyph unicode="&#x42c;" horiz-adv-x="1219" d="M309 817h295q252 0 378 -95.5t126 -301.5q0 -203 -124 -311.5t-357 -108.5h-420v1462h102v-645zM309 90h301q197 0 292 79.5t95 250.5q0 165 -96 236t-311 71h-281v-637z" />
-<glyph unicode="&#x42d;" horiz-adv-x="1266" d="M434 1391q-80 0 -154.5 -17.5t-162.5 -60.5l-41 92q164 78 368 78q324 0 508.5 -192t184.5 -525q0 -239 -83 -417t-239.5 -273.5t-361.5 -95.5q-238 0 -383 51v94q167 -51 364 -51q270 0 425 169t169 476h-774v94h772q-22 278 -174.5 428t-417.5 150z" />
-<glyph unicode="&#x42e;" horiz-adv-x="2105" d="M1976 733q0 -348 -166 -550.5t-460 -202.5q-293 0 -459 199.5t-168 539.5h-414v-719h-102v1462h102v-649h416q19 312 185 492t442 180q293 0 458.5 -201.5t165.5 -550.5zM834 733q0 -313 133 -485t383 -172t383 170.5t133 486.5q0 315 -132.5 484t-381.5 169 q-248 0 -383 -170t-135 -483z" />
-<glyph unicode="&#x42f;" horiz-adv-x="1202" d="M545 637l-391 -637h-123l411 657q-153 30 -237 131t-84 254q0 420 526 420h348v-1462h-102v637h-348zM893 1370h-242q-221 0 -320.5 -76.5t-99.5 -246.5q0 -160 98 -241t287 -81h277v645z" />
-<glyph unicode="&#x430;" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5z" />
-<glyph unicode="&#x431;" horiz-adv-x="1176" d="M123 653q0 708 399 807q140 35 268.5 59.5t227.5 43.5l18 -86l-120 -23q-297 -56 -392 -86q-135 -39 -211.5 -187t-87.5 -405h6q107 127 208 181.5t208 54.5q200 0 306 -129t106 -367q0 -253 -122 -394.5t-343 -141.5q-224 0 -347.5 175t-123.5 498zM602 70 q171 0 261.5 114t90.5 328q0 203 -80.5 306.5t-236.5 103.5q-116 0 -224.5 -72.5t-189.5 -200.5q0 -179 44.5 -314t129.5 -200t205 -65z" />
-<glyph unicode="&#x432;" horiz-adv-x="1159" d="M1016 825q0 -103 -51 -161.5t-166 -81.5v-7q131 -15 189.5 -75.5t58.5 -173.5q0 -157 -103.5 -241.5t-302.5 -84.5h-459v1087h461q186 0 279.5 -67t93.5 -195zM942 328q0 200 -307 200h-354v-434h368q293 0 293 234zM911 817q0 95 -68 135.5t-204 40.5h-358v-372h346 q152 0 218 47t66 149z" />
-<glyph unicode="&#x433;" horiz-adv-x="862" d="M821 1001h-540v-1001h-99v1087h639v-86z" />
-<glyph unicode="&#x434;" horiz-adv-x="1118" d="M1069 -369h-98v369h-832v-369h-98v463h72q136 191 210 443t78 550h523v-993h145v-463zM825 94v901h-338q-24 -541 -262 -901h600z" />
-<glyph unicode="&#x435;" horiz-adv-x="1124" d="M119 0zM621 -20q-237 0 -369.5 146t-132.5 409q0 260 128 416.5t345 156.5q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5zM592 1020q-157 0 -252 -103.5t-111 -298.5h672q0 189 -82 295.5 t-227 106.5z" />
-<glyph unicode="&#x436;" horiz-adv-x="1362" d="M631 1087h100v-528l467 528h121l-471 -528l508 -559h-127l-498 551v-551h-100v551l-498 -551h-127l506 555l-469 532h121l467 -528v528z" />
-<glyph unicode="&#x437;" horiz-adv-x="926" d="M387 618q295 0 295 203q0 97 -68 148t-194 51q-80 0 -149 -18.5t-148 -53.5l-37 82q174 78 338 78q178 0 270 -74t92 -205q0 -189 -194 -241v-6q121 -30 176 -99.5t55 -177.5q0 -151 -110.5 -238t-306.5 -87q-106 0 -193.5 20.5t-144.5 54.5v99q103 -49 178 -66.5 t160 -17.5q148 0 230.5 62.5t82.5 178.5q0 113 -79 167t-237 54h-151v86h135z" />
-<glyph unicode="&#x438;" horiz-adv-x="1229" d="M276 1087v-786l-6 -205l645 991h132v-1087h-95v781l4 210l-645 -991h-129v1087h94z" />
-<glyph unicode="&#x439;" horiz-adv-x="1229" d="M182 0zM276 1087v-786l-6 -205l645 991h132v-1087h-95v781l4 210l-645 -991h-129v1087h94zM615 1241q-149 0 -227 66.5t-91 214.5h88q15 -110 68 -155.5t164 -45.5q110 0 163.5 47t65.5 154h88q-21 -281 -319 -281z" />
-<glyph unicode="&#x43a;" horiz-adv-x="940" d="M772 1087h123l-487 -526l522 -561h-133l-514 551v-551h-101v1087h101v-528z" />
-<glyph unicode="&#x43b;" horiz-adv-x="1116" d="M934 0h-98v995h-385q-30 -395 -73.5 -602.5t-112 -305t-177.5 -97.5q-39 0 -68 8v90q19 -6 54 -6q113 0 182.5 238.5t105.5 766.5h572v-1087z" />
-<glyph unicode="&#x43c;" horiz-adv-x="1382" d="M688 106l62 175l313 806h137v-1087h-94v967q-22 -63 -46.5 -129t-326.5 -838h-88l-301 764q-19 46 -35.5 97t-36.5 110v-971h-90v1087h131l314 -800q37 -97 61 -181z" />
-<glyph unicode="&#x43d;" horiz-adv-x="1251" d="M281 1087v-477h690v477h98v-1087h-98v524h-690v-524h-99v1087h99z" />
-<glyph unicode="&#x43e;" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5 t-97.5 -349.5z" />
-<glyph unicode="&#x43f;" horiz-adv-x="1231" d="M281 0h-99v1087h867v-1087h-99v993h-669v-993z" />
-<glyph unicode="&#x440;" horiz-adv-x="1219" d="M182 0zM647 -20q-251 0 -366 188h-7l3 -84q4 -74 4 -162v-414h-99v1579h84l19 -155h6q112 176 358 176q220 0 335.5 -144.5t115.5 -420.5q0 -268 -121.5 -415.5t-331.5 -147.5zM645 68q167 0 258.5 124t91.5 347q0 479 -346 479q-190 0 -279 -104.5t-89 -340.5v-32 q0 -255 85.5 -364t278.5 -109z" />
-<glyph unicode="&#x441;" horiz-adv-x="973" d="M119 0zM616 -20q-233 0 -365 147t-132 410q0 270 137 420.5t375 150.5q141 0 270 -49l-27 -88q-141 47 -245 47q-200 0 -303 -123.5t-103 -355.5q0 -220 103 -344.5t288 -124.5q148 0 275 53v-92q-104 -51 -273 -51z" />
-<glyph unicode="&#x442;" horiz-adv-x="913" d="M872 1001h-362v-1001h-98v1001h-371v86h831v-86z" />
-<glyph unicode="&#x443;" horiz-adv-x="940" d="M0 0zM0 1087h102l230 -610q105 -281 133 -379h6q42 129 137 385l230 604h102l-487 -1263q-59 -154 -99 -208t-93.5 -81t-129.5 -27q-57 0 -127 21v86q58 -16 125 -16q51 0 90 24t70.5 74.5t73 160t53.5 142.5z" />
-<glyph unicode="&#x444;" horiz-adv-x="1372" d="M1253 545q0 -251 -135.5 -399t-380.5 -166v-472h-98v472q-244 14 -382 162t-138 403q0 251 136 398t384 165v448h98v-448q246 -18 381 -165t135 -398zM223 545q0 -213 108.5 -335.5t307.5 -137.5v944q-205 -17 -310.5 -138.5t-105.5 -332.5zM1149 545q0 209 -107 331.5 t-305 139.5v-944q200 17 306 142t106 331z" />
-<glyph unicode="&#x445;" horiz-adv-x="1020" d="M55 0zM449 559l-379 528h114l324 -458l321 458h109l-373 -528l400 -559h-115l-342 485l-344 -485h-109z" />
-<glyph unicode="&#x446;" horiz-adv-x="1223" d="M1174 -369h-99v369h-893v1087h99v-993h649v993h98v-993h146v-463z" />
-<glyph unicode="&#x447;" horiz-adv-x="1188" d="M262 1087v-364q0 -138 67 -199t206 -61q98 0 187 35t185 112v477h99v-1087h-99v516q-100 -77 -196.5 -110t-208.5 -33q-167 0 -252.5 87t-85.5 251v376h98z" />
-<glyph unicode="&#x448;" horiz-adv-x="1745" d="M922 94h542v993h99v-1087h-1381v1087h99v-993h542v993h99v-993z" />
-<glyph unicode="&#x449;" horiz-adv-x="1757" d="M922 94h542v993h99v-993h145v-463h-98v369h-1428v1087h99v-993h542v993h99v-993z" />
-<glyph unicode="&#x44a;" horiz-adv-x="1323" d="M469 629h352q383 0 383 -301q0 -155 -107 -241.5t-306 -86.5h-420v1001h-330v86h428v-458zM469 535v-441h338q144 0 218.5 62t74.5 176q0 106 -67 154.5t-232 48.5h-332z" />
-<glyph unicode="&#x44b;" horiz-adv-x="1481" d="M281 629h346q383 0 383 -301q0 -155 -107 -241.5t-307 -86.5h-414v1087h99v-458zM281 535v-441h331q141 0 217 59t76 177q0 108 -67 156.5t-232 48.5h-325zM1298 0h-98v1087h98v-1087z" />
-<glyph unicode="&#x44c;" horiz-adv-x="1165" d="M281 629h383q383 0 383 -301q0 -155 -107 -241.5t-307 -86.5h-451v1087h99v-458zM281 535v-441h368q142 0 217.5 60t75.5 176q0 108 -67 156.5t-232 48.5h-362z" />
-<glyph unicode="&#x44d;" horiz-adv-x="1006" d="M358 -20q-92 0 -171 15t-119 36v92q127 -53 284 -53q196 0 313 124.5t119 335.5h-620v88h616q-17 197 -119.5 298.5t-281.5 101.5q-106 0 -266 -60l-29 89q56 23 140 42t153 19q244 0 377 -144t133 -407q0 -269 -141.5 -423t-387.5 -154z" />
-<glyph unicode="&#x44e;" horiz-adv-x="1634" d="M1516 545q0 -266 -119.5 -415.5t-327.5 -149.5q-196 0 -315.5 147t-122.5 397h-350v-524h-99v1087h99v-477h352q14 235 130.5 366.5t311.5 131.5q204 0 322.5 -150.5t118.5 -412.5zM735 545q0 -224 88.5 -349.5t249.5 -125.5t249.5 126t88.5 349q0 224 -89 348.5 t-251 124.5q-161 0 -248.5 -123.5t-87.5 -349.5z" />
-<glyph unicode="&#x44f;" horiz-adv-x="1083" d="M166 0h-125l328 469q-150 28 -216.5 104t-66.5 195q0 148 99.5 233.5t267.5 85.5h448v-1087h-98v457h-332zM190 772q0 -112 72.5 -166.5t218.5 -54.5h322v442h-352q-124 0 -192.5 -56.5t-68.5 -164.5z" />
-<glyph unicode="&#x450;" horiz-adv-x="1124" d="M119 0zM621 -20q-237 0 -369.5 146t-132.5 409q0 260 128 416.5t345 156.5q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5zM592 1020q-157 0 -252 -103.5t-111 -298.5h672q0 189 -82 295.5 t-227 106.5zM685 1241h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
-<glyph unicode="&#x451;" horiz-adv-x="1124" d="M119 0zM621 -20q-237 0 -369.5 146t-132.5 409q0 260 128 416.5t345 156.5q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5zM592 1020q-157 0 -252 -103.5t-111 -298.5h672q0 189 -82 295.5 t-227 106.5zM331 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM712 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x452;" horiz-adv-x="1208" d="M795 -492q-79 0 -136 25v86q69 -20 129 -20q152 0 152 176v899q0 164 -68.5 238.5t-214.5 74.5q-197 0 -286.5 -98.5t-89.5 -319.5v-569h-99v1272h-155v82h155v202h99v-202h473v-82h-473v-242l-5 -139h7q61 98 154 142t231 44q370 0 370 -397v-891q0 -134 -62.5 -207.5 t-180.5 -73.5z" />
-<glyph unicode="&#x453;" horiz-adv-x="862" d="M182 0zM821 1001h-540v-1001h-99v1087h639v-86zM378 1257q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x454;" horiz-adv-x="993" d="M627 -20q-237 0 -372.5 149.5t-135.5 407.5q0 265 140.5 418t381.5 153q62 0 142.5 -13t138.5 -36l-29 -88q-59 21 -132.5 34t-121.5 13q-185 0 -291 -105t-123 -295h625v-88h-629q2 -217 111 -338.5t293 -121.5q157 0 284 53v-92q-46 -23 -121 -37t-161 -14z" />
-<glyph unicode="&#x455;" horiz-adv-x="954" d="M84 0zM856 283q0 -146 -111 -224.5t-315 -78.5q-218 0 -346 67v107q164 -82 346 -82q161 0 244.5 53.5t83.5 142.5q0 82 -66.5 138t-218.5 110q-163 59 -229 101.5t-99.5 96t-33.5 130.5q0 122 102.5 193t286.5 71q176 0 334 -66l-37 -90q-160 66 -297 66 q-133 0 -211 -44t-78 -122q0 -85 60.5 -136t236.5 -114q147 -53 214 -95.5t100.5 -96.5t33.5 -127z" />
-<glyph unicode="&#x456;" horiz-adv-x="463" d="M168 0zM281 0h-99v1087h99v-1087zM168 1389q0 96 63 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-63 0 -63 97z" />
-<glyph unicode="&#x457;" horiz-adv-x="463" d="M0 0zM281 0h-99v1087h99v-1087zM-21 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM360 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x458;" horiz-adv-x="463" d="M0 0zM37 -492q-80 0 -135 25v86q69 -20 129 -20q151 0 151 176v1312h99v-1298q0 -135 -63.5 -208t-180.5 -73zM168 1389q0 96 63 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-63 0 -63 97z" />
-<glyph unicode="&#x459;" horiz-adv-x="1655" d="M862 621h285q205 0 297 -71.5t92 -225.5q0 -324 -420 -324h-352v995h-313q-29 -394 -72.5 -603t-113.5 -305.5t-181 -96.5q-37 0 -64 8v90q20 -6 52 -6q114 0 183 231t107 774h500v-466zM862 526v-432h271q154 0 226.5 57.5t72.5 176.5q0 74 -28 116.5t-86.5 62 t-191.5 19.5h-264z" />
-<glyph unicode="&#x45a;" horiz-adv-x="1759" d="M967 1087v-466h295q196 0 287 -71t91 -226q0 -161 -104.5 -242.5t-304.5 -81.5h-363v526h-587v-526h-99v1087h99v-466h587v466h99zM967 526v-432h280q142 0 215.5 54.5t73.5 177.5q0 75 -28 118.5t-86.5 62.5t-180.5 19h-274z" />
-<glyph unicode="&#x45b;" horiz-adv-x="1208" d="M27 0zM940 0v674q0 164 -69 238.5t-214 74.5q-197 0 -286.5 -98t-89.5 -320v-569h-99v1272h-155v82h155v202h99v-202h473v-82h-473v-242l-5 -139h7q61 98 154 142t231 44q370 0 370 -397v-680h-98z" />
-<glyph unicode="&#x45c;" horiz-adv-x="940" d="M182 0zM772 1087h123l-487 -526l522 -561h-133l-514 551v-551h-101v1087h101v-528zM422 1257q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x45d;" horiz-adv-x="1229" d="M182 0zM276 1087v-786l-6 -205l645 991h132v-1087h-95v781l4 210l-645 -991h-129v1087h94zM720 1241h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
-<glyph unicode="&#x45e;" horiz-adv-x="940" d="M0 0zM0 1087h102l230 -610q105 -281 133 -379h6q42 129 137 385l230 604h102l-487 -1263q-59 -154 -99 -208t-93.5 -81t-129.5 -27q-57 0 -127 21v86q58 -16 125 -16q51 0 90 24t70.5 74.5t73 160t53.5 142.5zM470 1241q-149 0 -227 66.5t-91 214.5h88q15 -110 68 -155.5 t164 -45.5q110 0 163.5 47t65.5 154h88q-21 -281 -319 -281z" />
-<glyph unicode="&#x45f;" horiz-adv-x="1231" d="M567 0h-385v1087h99v-993h669v993h99v-1087h-383v-369h-99v369z" />
-<glyph unicode="&#x460;" horiz-adv-x="1987" d="M674 76q165 0 268 80v506h102v-504q110 -82 289 -82q196 0 305 180.5t109 501.5q0 193 -41.5 335.5t-118.5 217.5t-180 75q-63 0 -110.5 -17t-94.5 -42l-43 94q68 36 125.5 50t128.5 14q212 0 328.5 -190.5t116.5 -534.5q0 -367 -135 -573.5t-382 -206.5 q-111 0 -189.5 21.5t-156.5 74.5h-4q-76 -53 -153.5 -74.5t-188.5 -21.5q-250 0 -385 205.5t-135 574.5q0 340 124 532.5t341 192.5q73 0 131 -14.5t123 -49.5l-43 -94q-72 36 -118 47.5t-93 11.5q-107 0 -187.5 -74t-123.5 -216.5t-43 -337.5q0 -324 114.5 -503t319.5 -179 z" />
-<glyph unicode="&#x461;" horiz-adv-x="1548" d="M754 526l-30 -65q-37 -82 -46 -101t-184 -360h-103l-391 1087h104l209 -577q39 -106 136 -408h6q34 77 74.5 159.5t187.5 365.5l-166 460h102l209 -577l148 -422h6q178 178 266 422.5t88 576.5h94q0 -367 -99 -618.5t-314 -468.5h-101z" />
-<glyph unicode="&#x462;" horiz-adv-x="1378" d="M31 1239h336v317h102v-317h481v-84h-481v-338h287q252 0 381 -97.5t129 -299.5q0 -199 -128 -309.5t-364 -110.5h-407v1155h-336v84zM469 88h289q205 0 301 84t96 248q0 158 -98 231.5t-320 73.5h-268v-637z" />
-<glyph unicode="&#x463;" horiz-adv-x="1241" d="M356 1087h398v-81h-398v-377h383q383 0 383 -301q0 -155 -107 -241.5t-306 -86.5h-451v1006h-227v81h227v232h98v-232zM356 535v-441h369q142 0 217.5 60t75.5 176q0 108 -69 156.5t-236 48.5h-357z" />
-<glyph unicode="&#x464;" horiz-adv-x="1866" d="M1425 1391q-256 0 -412.5 -153t-176.5 -425h776v-94h-781q6 -309 155.5 -477t422.5 -168q184 0 338 47v-90q-145 -51 -363 -51q-304 0 -480.5 195t-180.5 544h-414v-719h-102v1462h102v-649h416q23 308 209.5 489t484.5 181q214 0 383 -80l-41 -92q-160 80 -336 80z" />
-<glyph unicode="&#x465;" horiz-adv-x="1487" d="M1128 -20q-237 0 -365 142.5t-130 405.5h-352v-528h-99v1087h99v-473h356q19 232 153 363t351 131q61 0 141.5 -13.5t132.5 -35.5l-29 -88q-54 21 -123 34t-122 13q-178 0 -281.5 -106t-120.5 -298h584v-88h-588q2 -213 106 -334.5t289 -121.5q148 0 273 53v-92 q-45 -23 -118.5 -37t-156.5 -14z" />
-<glyph unicode="&#x466;" horiz-adv-x="1286" d="M887 690h-195v-690h-98v690h-191l-292 -690h-111l627 1468h49l610 -1468h-115zM442 784h406q-82 198 -126 304t-73 204q-16 -52 -33 -96t-174 -412z" />
-<glyph unicode="&#x467;" horiz-adv-x="1022" d="M561 1087l451 -1087h-101l-209 500h-143v-500h-98v500h-142l-206 -500h-103l453 1087h98zM352 582h318q-116 287 -156 409h-6q-25 -81 -48.5 -147t-107.5 -262z" />
-<glyph unicode="&#x468;" horiz-adv-x="1763" d="M1352 719h-183v-719h-98v719h-178l-305 -719h-111l307 719h-475v-719h-102v1462h102v-649h516l279 655h49l610 -1468h-114zM932 813h381l-121 293q-34 85 -66 186q-16 -51 -32.5 -94.5t-161.5 -384.5z" />
-<glyph unicode="&#x469;" horiz-adv-x="1395" d="M934 1087l450 -1087h-100l-221 532h-131v-532h-98v532h-127l-222 -532h-102l221 528h-323v-528h-99v1087h99v-473h358l197 473h98zM739 614h291q-114 281 -143 377h-6q-25 -80 -48.5 -145.5t-93.5 -231.5z" />
-<glyph unicode="&#x46a;" horiz-adv-x="1419" d="M1260 1462v-86l-439 -545q121 -3 200.5 -38t131.5 -104t98 -218t144 -471h-105l-147 483q-45 148 -118 204t-230 56h-35v-743h-103v743h-34q-109 0 -171 -23.5t-103 -78t-73 -158.5l-147 -483h-104l139 457q47 158 99 228.5t132.5 106.5t200.5 39l-438 545v86h1102z M1133 1368h-848l424 -526z" />
-<glyph unicode="&#x46b;" horiz-adv-x="1241" d="M1083 1087v-83l-342 -373q93 -7 155.5 -35t107 -81.5t98.5 -186.5l129 -328h-105l-133 344q-44 115 -106.5 157t-179.5 42h-37v-543h-99v543h-34q-119 0 -181.5 -42t-105.5 -155l-135 -346h-105l129 328q48 124 93 181t108.5 86.5t159.5 35.5l-344 373v83h927zM965 1001 h-691l347 -380z" />
-<glyph unicode="&#x46c;" horiz-adv-x="1929" d="M1769 1462v-86l-438 -559q126 -4 206.5 -38t132 -104t95.5 -218l140 -457h-105l-147 483q-44 144 -115.5 195t-232.5 51h-35v-729h-103v729h-34q-117 0 -178.5 -22.5t-100.5 -75t-68 -148.5l-147 -483h-104l139 457q28 94 61 161t86 111h-512v-729h-102v1462h102v-639 h805l-446 553v86h1101zM1642 1368h-847l428 -539z" />
-<glyph unicode="&#x46d;" horiz-adv-x="1636" d="M1479 1087v-83l-355 -388q100 0 166.5 -26.5t111 -79t95.5 -182.5l129 -328h-104l-133 344q-42 109 -100 146.5t-181 37.5h-43v-528h-98v528h-43q-124 0 -182 -37.5t-99 -144.5l-135 -346h-102l129 328q24 62 51 112.5t69 87.5h-374v-528h-99v1087h99v-473h630l-360 390 v83h928zM1360 1001h-690l346 -380z" />
-<glyph unicode="&#x46e;" horiz-adv-x="1145" d="M1001 1120q0 -286 -303 -352v-6q163 -31 247.5 -115t84.5 -237q0 -193 -126 -285t-415 -109q-157 -9 -226.5 -44t-69.5 -111q0 -146 198 -146q82 0 191 9q109 8 186 8q127 0 201 -35v-105q-44 26 -98 36t-126 10q-80 0 -171.5 -8.5t-182.5 -8.5q-150 0 -229.5 60.5 t-79.5 179.5q0 118 98.5 181.5t313.5 76.5q236 13 327.5 79.5t91.5 213.5q0 299 -442 299h-217v96h225q212 0 313 80t101 227q0 125 -92.5 200t-241.5 75q-111 0 -204 -31.5t-201 -108.5l-58 80q74 58 175 98.5t200 49.5q-65 75 -235 245v17h75q108 -77 236 -203 q91 113 153.5 156t122.5 43q41 0 76 -13v-84q-26 11 -55 11q-51 0 -103.5 -37t-122.5 -131q181 -17 282 -113t101 -248z" />
-<glyph unicode="&#x46f;" horiz-adv-x="926" d="M387 618q295 0 295 203q0 97 -68 148t-194 51q-80 0 -149 -18.5t-148 -53.5l-37 82q145 65 272 76q-25 29 -55 61t-166 168v17h76q115 -84 236 -203q93 116 155 157.5t121 41.5q35 0 76 -13v-84q-29 11 -56 11q-51 0 -102 -35t-117 -125q260 -44 260 -273 q0 -189 -194 -241v-6q123 -28 177 -91t54 -167q0 -145 -99 -221.5t-308 -98.5q-156 -16 -216.5 -45.5t-60.5 -91.5q0 -55 43.5 -79t139.5 -24q64 0 274 13l84 2q70 0 145 -31v-102q-67 39 -166 39l-81 -2q-215 -13 -265 -13q-136 0 -207 49.5t-71 145.5q0 107 88 160t285 73 q175 19 243 72t68 158q0 108 -79 156t-237 48h-151v86h135z" />
-<glyph unicode="&#x470;" horiz-adv-x="1565" d="M123 0zM823 0h-102v453h-27q-280 0 -425.5 130.5t-145.5 395.5v483h102v-479q0 -226 117 -333t356 -107h23v919h102v-919h23q239 0 356 107t117 333v479h102v-483q0 -265 -146 -395.5t-425 -130.5h-27v-453z" />
-<glyph unicode="&#x471;" horiz-adv-x="1477" d="M166 0zM788 1554v-1480q224 17 339.5 147.5t115.5 364.5q0 126 -11.5 236.5t-47.5 264.5h96q63 -226 63 -491q0 -278 -142.5 -437.5t-412.5 -176.5v-474h-98v474q-257 12 -390.5 155.5t-133.5 411.5v538h98v-540q0 -221 110 -340.5t316 -132.5v1480h98z" />
-<glyph unicode="&#x472;" horiz-adv-x="1565" d="M1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM782 76q256 0 395.5 160t147.5 462h-1085q8 -299 147.5 -460.5t394.5 -161.5zM784 1386q-250 0 -389 -153.5t-153 -439.5h1081 q-13 288 -152.5 440.5t-386.5 152.5z" />
-<glyph unicode="&#x473;" horiz-adv-x="1200" d="M1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM600 70q174 0 272.5 118.5t104.5 333.5h-754q4 -211 103 -331.5t274 -120.5zM598 1018q-165 0 -262 -107.5t-111 -300.5h750 q-16 196 -114.5 302t-262.5 106z" />
-<glyph unicode="&#x474;" horiz-adv-x="1210" d="M1210 1384q-49 0 -80 -26t-60.5 -87.5t-80.5 -209.5l-354 -1061h-94l-541 1462h109l358 -968q85 -234 121 -355q44 164 125 402l176 532q64 192 104 265t87.5 105t121.5 32q48 0 90 -15v-90q-42 14 -82 14z" />
-<glyph unicode="&#x475;" horiz-adv-x="973" d="M420 0l-420 1087h102l279 -733q73 -187 96 -270h6q37 130 115 365l125 372q36 109 70.5 171t72.5 89t97 27q30 0 59 -8v-88q-29 8 -57 8q-45 0 -79 -48.5t-73 -166.5l-272 -805h-121z" />
-<glyph unicode="&#x476;" horiz-adv-x="1210" d="M0 0zM1210 1384q-49 0 -80 -26t-60.5 -87.5t-80.5 -209.5l-354 -1061h-94l-541 1462h109l358 -968q85 -234 121 -355q44 164 125 402l176 532q64 192 104 265t87.5 105t121.5 32q48 0 90 -15v-90q-42 14 -82 14zM842 1579h-70q-57 50 -131.5 142.5t-122.5 168.5v17h135 q79 -154 118 -216t71 -96v-16zM504 1579h-70q-57 50 -131.5 142.5t-122.5 168.5v17h135q76 -148 115.5 -212t73.5 -100v-16z" />
-<glyph unicode="&#x477;" horiz-adv-x="973" d="M0 0zM420 0l-420 1087h102l279 -733q73 -187 96 -270h6q37 130 115 365l125 372q36 109 70.5 171t72.5 89t97 27q30 0 59 -8v-88q-29 8 -57 8q-45 0 -79 -48.5t-73 -166.5l-272 -805h-121zM727 1241h-70q-57 50 -131.5 142.5t-122.5 168.5v17h135q79 -154 118 -216 t71 -96v-16zM389 1241h-70q-57 50 -131.5 142.5t-122.5 168.5v17h135q76 -148 115.5 -212t73.5 -100v-16z" />
-<glyph unicode="&#x478;" horiz-adv-x="2335" d="M1292 733q0 -350 -156 -551.5t-427 -201.5q-276 0 -428 198t-152 557q0 348 156 549t428 201q277 0 428 -200t151 -552zM240 733q0 -317 119.5 -487t349.5 -170q232 0 352.5 167.5t120.5 489.5q0 320 -120 486.5t-349 166.5q-232 0 -352.5 -167t-120.5 -486zM1395 1087 h102q169 -450 256 -679.5t107 -309.5h6q10 35 53.5 156.5t312.5 832.5h103l-488 -1263q-53 -142 -94 -201t-95 -87t-132 -28q-57 0 -127 21v86q58 -16 125 -16q51 0 89.5 23.5t69.5 72t72 155.5l55 150z" />
-<glyph unicode="&#x479;" horiz-adv-x="2093" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5 t-97.5 -349.5zM1153 1087h102l230 -610q105 -281 133 -379h6q42 129 137 385l230 604h102l-487 -1263q-59 -154 -99 -208t-93.5 -81t-129.5 -27q-57 0 -127 21v86q58 -16 125 -16q51 0 90 24t70.5 74.5t73 160t53.5 142.5z" />
-<glyph unicode="&#x47a;" horiz-adv-x="1626" d="M1497 733q0 -319 -155 -518t-433 -229q-21 -74 -96 -74q-73 0 -94 74q-280 29 -435 228.5t-155 520.5q0 318 156.5 516.5t433.5 227.5q21 69 94 69q75 0 96 -69q278 -30 433 -228t155 -518zM240 733q0 -285 123 -454.5t354 -198.5q17 80 96 80t96 -78q234 29 355.5 196.5 t121.5 454.5q0 286 -122 452t-353 195q-9 -42 -36 -61t-62 -19q-79 0 -96 80q-228 -29 -352.5 -194.5t-124.5 -452.5z" />
-<glyph unicode="&#x47b;" horiz-adv-x="1241" d="M1122 545q0 -238 -108.5 -383t-302.5 -174q-19 -72 -93 -72q-68 0 -88 70q-190 29 -300.5 177t-110.5 382q0 237 108 382.5t301 174.5q14 76 90 76q77 0 95 -76q195 -29 302 -176t107 -381zM223 545q0 -196 80 -317t225 -150q19 72 90 72q74 0 93 -72q148 30 227.5 152 t79.5 315t-80 314t-229 151q-21 -66 -91 -66q-67 0 -88 66q-149 -28 -228 -148.5t-79 -316.5z" />
-<glyph unicode="&#x47c;" horiz-adv-x="1987" d="M674 76q94 0 169.5 30t149.5 91q84 -63 164.5 -92t175.5 -29q196 0 304 179t108 503q0 294 -91 461t-247 167q-63 0 -110.5 -17t-94.5 -42l-43 94q68 36 125.5 50t128.5 14q212 0 328.5 -190.5t116.5 -534.5q0 -367 -135 -573.5t-382 -206.5q-111 0 -189.5 21.5 t-156.5 74.5h-4q-76 -53 -153.5 -74.5t-188.5 -21.5q-250 0 -385 205.5t-135 574.5q0 340 124 532.5t341 192.5q73 0 131 -14.5t123 -49.5l-43 -94q-72 36 -118 47.5t-93 11.5q-164 0 -258 -166t-94 -462q0 -326 113.5 -504t318.5 -178zM1116 1761q0 -83 -51 -134.5 t-154 -80.5v56q127 38 127 106q0 24 -14.5 35t-32.5 20t-32.5 20.5t-14.5 37.5q0 31 20 49t52 18q46 0 73 -35t27 -92zM1401 1886h-12q-112 0 -239 49l-67 25q-84 32 -117.5 39.5t-70.5 7.5q-56 0 -87.5 -29t-31.5 -104v-8h-90v8q0 104 52.5 161.5t154.5 57.5q50 0 98 -13 t178 -65q117 -47 232 -47v-82z" />
-<glyph unicode="&#x47d;" horiz-adv-x="1569" d="M780 37q-98 -57 -219 -57q-214 0 -328 142.5t-114 414.5q0 180 43.5 308t126 195.5t192.5 67.5q123 0 205 -45l-33 -86q-82 43 -157 43q-133 0 -203 -123.5t-70 -357.5q0 -236 90 -352.5t256 -116.5q109 0 215 67q110 -67 220 -67q166 0 254 116.5t88 352.5 q0 233 -65 357t-187 124q-78 0 -160 -43l-31 86q82 45 205 45q104 0 181.5 -67t119 -196t41.5 -308q0 -268 -115 -412.5t-327 -144.5q-128 0 -228 57zM895 1452q0 -84 -51.5 -135t-153.5 -80v55q57 17 92 44.5t35 62.5q0 24 -14.5 35t-32.5 19.5t-32.5 20.5t-14.5 37 q0 31 20 49.5t52 18.5q46 0 73 -35t27 -92zM1180 1577h-13q-113 0 -239 49q-150 57 -184.5 64.5t-69.5 7.5q-56 0 -87.5 -29t-31.5 -104v-9h-90v9q0 104 52.5 161.5t154.5 57.5q50 0 98 -13t178 -65q117 -47 232 -47v-82z" />
-<glyph unicode="&#x47e;" horiz-adv-x="1987" d="M1403 1796v-27l-80 -172h-12l-54 117h-202l-56 -117h-12l-55 117h-203l-53 -117h-12l-80 172v27h819zM674 76q165 0 268 80v506h102v-504q110 -82 289 -82q196 0 305 180.5t109 501.5q0 193 -41.5 335.5t-118.5 217.5t-180 75q-63 0 -110.5 -17t-94.5 -42l-43 94 q68 36 125.5 50t128.5 14q212 0 328.5 -190.5t116.5 -534.5q0 -367 -135 -573.5t-382 -206.5q-111 0 -189.5 21.5t-156.5 74.5h-4q-76 -53 -153.5 -74.5t-188.5 -21.5q-250 0 -385 205.5t-135 574.5q0 340 124 532.5t341 192.5q73 0 131 -14.5t123 -49.5l-43 -94 q-72 36 -118 47.5t-93 11.5q-107 0 -187.5 -74t-123.5 -216.5t-43 -337.5q0 -324 114.5 -503t319.5 -179z" />
-<glyph unicode="&#x47f;" horiz-adv-x="1548" d="M1180 1444v-27l-80 -172h-13l-53 117h-203l-55 -117h-12l-55 117h-203l-53 -117h-13l-80 172v27h820zM754 526l-30 -65q-37 -82 -46 -101t-184 -360h-103l-391 1087h104l209 -577q39 -106 136 -408h6q34 77 74.5 159.5t187.5 365.5l-166 460h102l209 -577l148 -422h6 q178 178 266 422.5t88 576.5h94q0 -367 -99 -618.5t-314 -468.5h-101z" />
-<glyph unicode="&#x480;" horiz-adv-x="1272" d="M831 1391q-275 0 -433 -176t-158 -482q0 -316 157 -486.5t441 -170.5q69 0 127 10v-578h-103v472h-33q-338 0 -519 195t-181 560q0 223 84.5 393t243 262.5t368.5 92.5q214 0 383 -80l-41 -92q-160 80 -336 80z" />
-<glyph unicode="&#x481;" horiz-adv-x="973" d="M635 72q76 0 147 20v-584h-100v469h-43q-249 0 -384.5 143.5t-135.5 416.5q0 270 137 420.5t375 150.5q141 0 270 -49l-27 -88q-141 47 -245 47q-200 0 -303 -123.5t-103 -355.5q0 -223 106.5 -345t305.5 -122z" />
-<glyph unicode="&#x482;" horiz-adv-x="1239" d="M500 348l-197 -342l-82 45l197 342l-303 178l41 74l303 -180l237 407l-307 181l43 73l305 -180l195 334l80 -45l-197 -336l309 -178l-45 -74l-305 180l-233 -407l305 -180l-39 -74z" />
-<glyph unicode="&#x483;" horiz-adv-x="1141" d="M219 1264q0 49 24.5 66.5t73.5 17.5h441q6 51 24.5 71.5t57.5 20.5q40 0 60 -18.5t20 -67.5q0 -46 -22 -64t-77 -18h-440q-6 -51 -25 -72.5t-57 -21.5q-40 0 -60 18t-20 68z" />
-<glyph unicode="&#x484;" horiz-adv-x="1182" d="M260 1356q61 0 122 13t173 58q57 23 108 38.5t105 15.5q100 0 153.5 -56.5t53.5 -162.5v-9h-90v9q0 75 -31.5 104t-87.5 29q-38 0 -74.5 -8.5t-180.5 -63.5q-126 -49 -239 -49h-12v82z" />
-<glyph unicode="&#x485;" horiz-adv-x="1182" d="M485 1462q0 57 27 92t74 35q32 0 51.5 -18t19.5 -49q0 -26 -14.5 -37.5t-32.5 -20.5t-32.5 -20t-14.5 -35q0 -68 127 -106v-56q-102 29 -153.5 80.5t-51.5 134.5z" />
-<glyph unicode="&#x486;" horiz-adv-x="1182" d="M696 1462q0 -83 -51 -134.5t-153 -80.5v56q126 38 126 106q0 24 -14.5 35t-32.5 20t-32.5 20.5t-14.5 37.5q0 31 20 49t52 18q46 0 73 -35t27 -92z" />
-<glyph unicode="&#x488;" horiz-adv-x="2025" d="M1135 1231q-7 57 -45 82.5t-89 25.5q-61 0 -93.5 -24t-39.5 -84h-75q11 194 208 194q93 0 149.5 -50.5t63.5 -143.5h-79zM1135 -319q-7 57 -45 82.5t-89 25.5q-61 0 -93.5 -24t-39.5 -84h-75q5 89 55 141.5t153 52.5q92 0 149.5 -51t63.5 -143h-79zM1714 -41 q-6 57 -44 83t-89 26q-62 0 -94.5 -24.5t-38.5 -84.5h-76q5 90 55.5 142.5t153.5 52.5q92 0 149.5 -51t63.5 -144h-80zM561 -41q-6 57 -44 83t-89 26q-62 0 -94.5 -24.5t-38.5 -84.5h-76q5 90 55.5 142.5t153.5 52.5q92 0 149.5 -51t63.5 -144h-80zM1714 946q-6 57 -44 83 t-89 26q-62 0 -94.5 -24.5t-38.5 -84.5h-76q5 90 55.5 142.5t153.5 52.5q92 0 149.5 -51t63.5 -144h-80zM561 946q-6 57 -44 83t-89 26q-62 0 -94.5 -24.5t-38.5 -84.5h-76q5 90 55.5 142.5t153.5 52.5q92 0 149.5 -51t63.5 -144h-80zM1905 459q-7 57 -44.5 82.5t-88.5 25.5 q-62 0 -94.5 -24t-39.5 -84h-75q11 194 209 194q92 0 149.5 -52t63.5 -142h-80zM383 459q-5 51 -39.5 79.5t-93.5 28.5q-62 0 -94.5 -24t-38.5 -84h-76q5 90 55.5 142t153.5 52q92 0 149.5 -51t63.5 -143h-80z" />
-<glyph unicode="&#x489;" horiz-adv-x="1958" d="M1069 -35l10 -14q-40 -156 -123 -336h-75q55 230 71 350h117zM891 1141l-10 14q43 162 123 336h75q-55 -230 -71 -350h-117zM1567 641l14 10q86 -23 180.5 -59t155.5 -64v-75q-230 55 -350 71v117zM391 463l-14 -8q-171 44 -336 120v76q230 -55 350 -71v-117zM1458 180 l19 -4q77 -131 149 -323l-53 -54q-124 199 -197 299zM502 885l-19 4q-77 131 -149 323l53 54q138 -222 197 -299zM1331 1010l4 18q134 79 324 150l53 -54q-208 -129 -299 -196zM627 53l-4 -16q-73 -42 -163.5 -83.5t-160.5 -68.5l-53 54q208 129 299 196z" />
-<glyph unicode="&#x48a;" horiz-adv-x="1477" d="M305 1462v-956q0 -102 -8 -342h6l864 1298h103v-1368h127l-142 -463h-116l131 369h-99v950q0 162 13 350h-8l-867 -1300h-102v1462h98zM737 1579q-149 0 -227 66.5t-90 214.5h88q14 -109 66.5 -155t164.5 -46t165 48t65 153h88q-23 -281 -320 -281z" />
-<glyph unicode="&#x48b;" horiz-adv-x="1229" d="M276 1087v-786l-6 -205l645 991h132v-993h127l-142 -463h-117l132 369h-95v781l4 210l-645 -991h-129v1087h94zM614 1241q-149 0 -227 66.5t-90 214.5h88q14 -109 66.5 -155t164.5 -46t165 48t65 153h88q-21 -281 -320 -281z" />
-<glyph unicode="&#x48c;" horiz-adv-x="1219" d="M207 1155h-160v84h160v223h102v-223h424v-84h-424v-338h299q250 0 375 -95.5t125 -301.5q0 -203 -124 -311.5t-357 -108.5h-420v1155zM309 90h301q198 0 292.5 79.5t94.5 250.5q0 164 -96.5 235.5t-310.5 71.5h-281v-637z" />
-<glyph unicode="&#x48d;" horiz-adv-x="1165" d="M281 1292h352v-82h-352v-581h383q383 0 383 -301q0 -155 -107 -241.5t-307 -86.5h-451v1210h-155v82h155v264h99v-264zM281 535v-441h368q142 0 217.5 60t75.5 176q0 108 -69 156.5t-236 48.5h-356z" />
-<glyph unicode="&#x48e;" horiz-adv-x="1198" d="M1087 1042q0 -128 -56 -222.5t-163 -149.5l121 -168l-69 -53l-136 188q-101 -33 -249 -33h-226v-604h-102v1462h358q522 0 522 -420zM309 692h205q129 0 217 21l-117 164l70 51l131 -185q82 39 122 110t40 185q0 169 -104 250.5t-322 81.5h-242v-678z" />
-<glyph unicode="&#x48f;" horiz-adv-x="1219" d="M647 -20q-251 0 -366 188h-7l3 -84q4 -74 4 -162v-414h-99v1579h84l19 -155h6q112 176 358 176q220 0 335.5 -144.5t115.5 -420.5q0 -319 -172 -465l121 -168l-70 -53l-123 172q-90 -49 -209 -49zM645 68q88 0 158 34l-129 183l69 51l129 -182q123 123 123 385 q0 479 -346 479q-190 0 -279 -104.5t-89 -340.5v-32q0 -255 85.5 -364t278.5 -109z" />
-<glyph unicode="&#x490;" horiz-adv-x="1028" d="M909 1462v301h99v-395h-699v-1368h-102v1462h702z" />
-<glyph unicode="&#x491;" horiz-adv-x="862" d="M821 1001h-540v-1001h-99v1087h543v330h96v-416z" />
-<glyph unicode="&#x492;" horiz-adv-x="1028" d="M309 772h439v-94h-439v-678h-102v678h-160v94h160v690h801v-94h-699v-596z" />
-<glyph unicode="&#x493;" horiz-adv-x="862" d="M821 1001h-540v-409h366v-86h-366v-506h-99v506h-164v86h164v495h639v-86z" />
-<glyph unicode="&#x494;" horiz-adv-x="1292" d="M1028 1462v-94h-719v-588q115 23 223 23q203 0 349.5 -79t222.5 -226t76 -344q0 -320 -133.5 -493t-380.5 -173q-144 0 -258 49v101q131 -56 258 -56q193 0 298 151t105 423q0 263 -146.5 409t-410.5 146q-108 0 -203 -23v-688h-102v1462h821z" />
-<glyph unicode="&#x495;" horiz-adv-x="1049" d="M838 1001h-557v-391q93 27 194 27q248 0 377 -149t129 -431q0 -265 -103 -412t-286 -147q-138 0 -225 58v100q112 -68 229 -68q134 0 207.5 124t73.5 347q0 241 -104 364.5t-308 123.5q-98 0 -184 -35v-512h-99v1087h656v-86z" />
-<glyph unicode="&#x496;" horiz-adv-x="1642" d="M625 745l-592 717h127l588 -708v708h102v-708l588 708h127l-594 -710l547 -658h94v-463h-99v369h-51l-612 741v-741h-102v741l-613 -741h-135z" />
-<glyph unicode="&#x497;" horiz-adv-x="1411" d="M631 1087h100v-528l467 528h121l-471 -528l422 -465h110v-463h-98v369h-53l-498 551v-551h-100v551l-498 -551h-127l506 555l-469 532h121l467 -528v528z" />
-<glyph unicode="&#x498;" horiz-adv-x="1145" d="M82 0zM1001 1120q0 -286 -303 -352v-6q332 -71 332 -356q0 -201 -141.5 -313.5t-399.5 -112.5q-242 0 -407 86v104q95 -46 203 -71t204 -25q200 0 315.5 86.5t115.5 242.5q0 152 -112.5 230t-336.5 78h-217v96h225q212 0 313 80t101 227q0 125 -92.5 200t-241.5 75 q-111 0 -204 -31.5t-201 -108.5l-58 80q202 154 463 154q205 0 323.5 -98t118.5 -265zM588 -248q0 72 -35.5 128.5t-108.5 119.5h91q151 -118 151 -260q0 -87 -51 -136.5t-137 -49.5q-56 0 -99 16v84q34 -12 82 -12q107 0 107 110z" />
-<glyph unicode="&#x499;" horiz-adv-x="926" d="M68 0zM387 618q295 0 295 203q0 97 -68 148t-194 51q-80 0 -149 -18.5t-148 -53.5l-37 82q174 78 338 78q178 0 270 -74t92 -205q0 -189 -194 -241v-6q121 -30 176 -99.5t55 -177.5q0 -151 -110.5 -238t-306.5 -87q-106 0 -193.5 20.5t-144.5 54.5v99q103 -49 178 -66.5 t160 -17.5q148 0 230.5 62.5t82.5 178.5q0 113 -79 167t-237 54h-151v86h135zM488 -248q0 72 -35.5 128.5t-108.5 119.5h91q151 -118 151 -260q0 -87 -51 -136.5t-137 -49.5q-56 0 -99 16v84q34 -12 82 -12q107 0 107 110z" />
-<glyph unicode="&#x49a;" horiz-adv-x="1278" d="M1120 94h127v-463h-98v369h-84l-561 772l-195 -172v-600h-102v1462h102v-760l162 162l573 598h130l-599 -618z" />
-<glyph unicode="&#x49b;" horiz-adv-x="989" d="M772 1087h123l-487 -526l434 -467h116v-463h-98v369h-63l-514 551v-551h-101v1087h101v-528z" />
-<glyph unicode="&#x49c;" horiz-adv-x="1190" d="M1190 0h-125l-508 700v-389h-86v432l-162 -143v-600h-102v1462h102v-760l162 162v355h86v-267l487 510h130l-599 -618z" />
-<glyph unicode="&#x49d;" horiz-adv-x="940" d="M412 698v316h86v-223l274 296h123l-397 -428v-194l432 -465h-133l-299 322v-216h-86v308l-129 137v-551h-101v1087h101v-528z" />
-<glyph unicode="&#x49e;" horiz-adv-x="1190" d="M49 1274h158v188h102v-188h250v-94h-250v-478l162 162l573 598h130l-599 -618l615 -844h-125l-561 772l-195 -172v-600h-102v1180h-158v94z" />
-<glyph unicode="&#x49f;" horiz-adv-x="991" d="M27 1356h155v200h99v-200h385v-86h-385v-494l-7 -299h5l555 610h120l-428 -464l465 -623h-119l-413 549l-178 -162v-387h-99v1270h-155v86z" />
-<glyph unicode="&#x4a0;" horiz-adv-x="1319" d="M1319 0h-125l-561 772l-195 -172v-600h-102v1366h-326v96h428v-760l162 162l574 598h129l-598 -618z" />
-<glyph unicode="&#x4a1;" horiz-adv-x="1118" d="M950 1087h123l-487 -526l522 -561h-133l-514 551v-551h-101v1001h-319v86h420v-528z" />
-<glyph unicode="&#x4a2;" horiz-adv-x="1483" d="M1266 94h118v-463h-98v369h-123v719h-854v-719h-102v1462h102v-649h854v649h103v-1368z" />
-<glyph unicode="&#x4a3;" horiz-adv-x="1251" d="M281 1087v-477h690v477h98v-993h119v-463h-98v369h-119v524h-690v-524h-99v1087h99z" />
-<glyph unicode="&#x4a4;" horiz-adv-x="1602" d="M1591 1366h-325v-1366h-103v719h-854v-719h-102v1462h102v-649h854v649h428v-96z" />
-<glyph unicode="&#x4a5;" horiz-adv-x="1430" d="M281 1087v-477h690v477h418v-86h-320v-1001h-98v524h-690v-524h-99v1087h99z" />
-<glyph unicode="&#x4a6;" horiz-adv-x="2146" d="M1184 0h-103v1366h-772v-1366h-102v1462h977v-682q113 23 223 23q194 0 336 -79.5t216.5 -226.5t74.5 -343q0 -321 -136 -493.5t-382 -172.5q-145 0 -259 49v101q134 -56 259 -56q192 0 299.5 150.5t107.5 423.5q0 261 -139 408t-389 147q-116 0 -211 -23v-688z" />
-<glyph unicode="&#x4a7;" horiz-adv-x="1737" d="M989 610q93 27 174 27q250 0 378 -146t128 -434q0 -267 -96 -413t-275 -146q-138 0 -225 58v100q114 -68 221 -68q132 0 201.5 123.5t69.5 347.5q0 488 -412 488q-91 0 -164 -27v-520h-98v993h-610v-993h-99v1087h807v-477z" />
-<glyph unicode="&#x4a8;" horiz-adv-x="1565" d="M1436 678q0 -185 -78.5 -348.5t-212.5 -251.5q89 -68 196 -68q74 0 129 21v-92q-42 -23 -139 -23t-169.5 30.5t-131.5 73.5q-100 -40 -252 -40q-196 0 -344.5 92.5t-226.5 262t-78 390.5q0 361 163 560.5t460 199.5q130 0 209 -27l-27 -96q-75 24 -186 24 q-508 0 -508 -663q0 -311 143.5 -479t404.5 -168q38 0 85.5 5.5t74.5 14.5q-105 98 -163 250t-58 332q0 245 94.5 380.5t257.5 135.5q173 0 265 -132.5t92 -383.5zM1329 680q0 416 -250 416q-115 0 -181.5 -109.5t-66.5 -308.5q0 -350 224 -543q132 72 203 215t71 330z" />
-<glyph unicode="&#x4a9;" horiz-adv-x="1239" d="M686 496q0 -122 39.5 -208t114.5 -151q78 51 126 145t48 220q0 139 -36.5 210.5t-121.5 71.5q-170 0 -170 -288zM1067 -53q-126 0 -240 76q-86 -43 -227 -43q-145 0 -254 70.5t-168 197.5t-59 287q0 266 117 419.5t329 153.5q82 0 146 -18l-21 -91q-69 19 -129 19 q-162 0 -250 -124.5t-88 -358.5q0 -139 47.5 -245t138 -163t218.5 -57q78 0 127 22q-172 154 -172 406q0 178 72 277t202 99q128 0 195 -96t67 -276q0 -132 -53 -241.5t-150 -178.5q24 -18 68 -32.5t84 -14.5q62 0 107 14v-88q-44 -14 -107 -14z" />
-<glyph unicode="&#x4aa;" horiz-adv-x="1272" d="M129 0zM831 1391q-275 0 -433 -176t-158 -482q0 -313 149 -486t426 -173q184 0 338 47v-90q-145 -51 -362 -51q-308 0 -485 199t-177 556q0 223 84.5 393t243 262.5t368.5 92.5q214 0 383 -80l-41 -92q-160 80 -336 80zM795 -248q0 72 -35.5 128.5t-108.5 119.5h91 q151 -118 151 -260q0 -87 -51 -136.5t-137 -49.5q-56 0 -99 16v84q34 -12 82 -12q107 0 107 110z" />
-<glyph unicode="&#x4ab;" horiz-adv-x="973" d="M119 0zM616 -20q-233 0 -365 147t-132 410q0 270 137 420.5t375 150.5q141 0 270 -49l-27 -88q-141 47 -245 47q-200 0 -303 -123.5t-103 -355.5q0 -220 103 -344.5t288 -124.5q148 0 275 53v-92q-104 -51 -273 -51zM621 -248q0 72 -35.5 128.5t-108.5 119.5h91 q151 -118 151 -260q0 -87 -51 -136.5t-137 -49.5q-56 0 -99 16v84q34 -12 82 -12q107 0 107 110z" />
-<glyph unicode="&#x4ac;" horiz-adv-x="1073" d="M588 94h119v-463h-99v369h-123v1366h-475v96h1053v-96h-475v-1272z" />
-<glyph unicode="&#x4ad;" horiz-adv-x="913" d="M872 1001h-362v-907h119v-463h-99v369h-118v1001h-371v86h831v-86z" />
-<glyph unicode="&#x4ae;" horiz-adv-x="1081" d="M0 0zM543 662l428 800h110l-487 -897v-565h-105v557l-489 905h117z" />
-<glyph unicode="&#x4af;" horiz-adv-x="940" d="M518 -4v-488h-98v492l-420 1087h102l281 -739q56 -142 84 -248h6q41 136 84 250l281 737h102z" />
-<glyph unicode="&#x4b0;" horiz-adv-x="1081" d="M543 662l428 800h110l-487 -897v-67h315v-95h-315v-403h-105v403h-317v95h317v59l-489 905h117z" />
-<glyph unicode="&#x4b1;" horiz-adv-x="940" d="M520 0h307v-86h-309v-406h-98v406h-309v86h309l-420 1087h102l281 -739q56 -142 84 -248h6q41 136 84 250l281 737h102z" />
-<glyph unicode="&#x4b2;" horiz-adv-x="1171" d="M1040 94h101v-463h-99v369h-57l-432 682l-440 -682h-113l492 762l-447 700h115l395 -626l401 626h109l-453 -698z" />
-<glyph unicode="&#x4b3;" horiz-adv-x="1036" d="M508 485l-344 -485h-109l394 559l-379 528h114l324 -458l321 458h109l-373 -528l332 -465h109v-463h-99v369h-57z" />
-<glyph unicode="&#x4b4;" horiz-adv-x="1720" d="M1503 96h156v-465h-98v369h-1106v1366h-445v96h1073v-96h-526v-1270h844v1366h102v-1366z" />
-<glyph unicode="&#x4b5;" horiz-adv-x="1411" d="M862 1001h-393v-907h649v993h99v-993h145v-463h-98v369h-893v1001h-330v86h821v-86z" />
-<glyph unicode="&#x4b6;" horiz-adv-x="1372" d="M1165 94h119v-463h-98v369h-123v635q-261 -103 -461 -103q-204 0 -312 90.5t-108 276.5v563h103v-567q0 -266 325 -266q96 0 192 17.5t261 76.5v739h102v-1368z" />
-<glyph unicode="&#x4b7;" horiz-adv-x="1188" d="M262 1087v-364q0 -138 67 -199t206 -61q98 0 187 35t185 112v477h99v-993h118v-463h-98v369h-119v516q-100 -77 -196.5 -110t-208.5 -33q-167 0 -252.5 87t-85.5 251v376h98z" />
-<glyph unicode="&#x4b8;" horiz-adv-x="1372" d="M1165 0h-102v635q-174 -72 -352 -96v-326h-86v319h-23q-204 0 -312 90.5t-108 276.5v563h103v-567q0 -266 325 -266h15v370h86v-366q73 7 147.5 25t204.5 65v739h102v-1462z" />
-<glyph unicode="&#x4b9;" horiz-adv-x="1188" d="M262 1087v-364q0 -138 67 -199t206 -61h2v311h86v-305q142 25 284 141v477h99v-1087h-99v516q-144 -108 -284 -133v-252h-86v242h-35q-167 0 -252.5 87t-85.5 251v376h98z" />
-<glyph unicode="&#x4ba;" horiz-adv-x="1352" d="M207 1462h102v-635q274 111 461 111q205 0 312.5 -94t107.5 -281v-563h-103v567q0 138 -83 206.5t-242 68.5q-70 0 -130.5 -9t-115 -24t-105.5 -33.5t-102 -36.5v-739h-102v1462z" />
-<glyph unicode="&#x4bb;" horiz-adv-x="1167" d="M926 0v365q0 138 -67 199t-206 61q-93 0 -183.5 -34t-188.5 -114v-477h-99v1087h99v-516q100 77 196.5 110.5t208.5 33.5q167 0 252.5 -87t85.5 -251v-377h-98z" />
-<glyph unicode="&#x4bc;" horiz-adv-x="1636" d="M61 909q0 66 21 111h100q-18 -50 -18 -107q0 -66 39 -97.5t121 -31.5q9 209 90.5 368.5t224.5 246t324 86.5q268 0 407 -185t139 -546v-66h-1077q19 -315 168.5 -463.5t429.5 -148.5q94 0 181.5 15t201.5 52v-96q-179 -67 -403 -67q-326 0 -498.5 179t-187.5 529 q-129 2 -196 58.5t-67 162.5zM958 1389q-237 0 -373 -157t-153 -450h967q0 298 -112 452.5t-329 154.5z" />
-<glyph unicode="&#x4bd;" horiz-adv-x="1303" d="M799 -20q-235 0 -367.5 144t-134.5 404q-126 7 -185 66t-59 156q0 65 21 110h100q-18 -50 -18 -106q0 -127 145 -133q22 225 147 356t322 131q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5 zM770 1020q-160 0 -254 -106.5t-108 -295.5h671q0 189 -82 295.5t-227 106.5z" />
-<glyph unicode="&#x4be;" horiz-adv-x="1636" d="M61 909q0 66 21 111h100q-18 -50 -18 -107q0 -66 39 -97.5t121 -31.5q9 209 90.5 368.5t224.5 246t324 86.5q268 0 407 -185t139 -546v-66h-1077q19 -315 168.5 -463.5t429.5 -148.5q94 0 181.5 15t201.5 52v-96q-179 -67 -403 -67v-349h-99v353q-559 52 -587 704 q-129 2 -196 58.5t-67 162.5zM958 1389q-237 0 -373 -157t-153 -450h967q0 298 -112 452.5t-329 154.5z" />
-<glyph unicode="&#x4bf;" horiz-adv-x="1303" d="M797 -369h-99v357q-189 29 -294 168t-107 372q-126 7 -185 66t-59 156q0 65 21 110h100q-18 -50 -18 -106q0 -127 145 -133q22 225 147 356t322 131q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5 t-174 -14.5v-349zM770 1020q-160 0 -254 -106.5t-108 -295.5h671q0 189 -82 295.5t-227 106.5z" />
-<glyph unicode="&#x4c0;" horiz-adv-x="516" d="M207 0zM207 0v1462h102v-1462h-102z" />
-<glyph unicode="&#x4c1;" horiz-adv-x="1597" d="M0 0zM625 745l-592 717h127l588 -708v708h102v-708l588 708h127l-594 -710l626 -752h-135l-612 741v-741h-102v741l-613 -741h-135zM799 1591q-149 0 -227 66.5t-91 214.5h88q15 -110 68 -155.5t164 -45.5q110 0 163.5 47t65.5 154h88q-21 -281 -319 -281z" />
-<glyph unicode="&#x4c2;" horiz-adv-x="1362" d="M6 0zM631 1087h100v-528l467 528h121l-471 -528l508 -559h-127l-498 551v-551h-100v551l-498 -551h-127l506 555l-469 532h121l467 -528v528zM680 1241q-149 0 -227 66.5t-91 214.5h88q15 -110 68 -155.5t164 -45.5q110 0 163.5 47t65.5 154h88q-21 -281 -319 -281z" />
-<glyph unicode="&#x4c3;" horiz-adv-x="1341" d="M309 0h-102v1462h102v-727l725 727h129l-694 -692q54 12 100 12q322 0 491 -159.5t169 -468.5q0 -323 -136 -494.5t-391 -171.5q-135 0 -249 49v101q134 -56 249 -56q202 0 309 149t107 425q0 262 -146.5 396t-428.5 134q-143 0 -234 -41v-645z" />
-<glyph unicode="&#x4c4;" horiz-adv-x="1087" d="M281 0h-99v1087h99v-528l520 528h123l-482 -481q288 0 433 -138.5t145 -410.5q0 -177 -49 -302.5t-140 -191t-213 -65.5q-126 0 -217 58v100q47 -28 98.5 -48t121.5 -20q142 0 218 120.5t76 350.5q0 225 -117.5 342t-344.5 117q-92 0 -172 -26v-492z" />
-<glyph unicode="&#x4c5;" horiz-adv-x="1395" d="M1188 94h153l-147 -463h-117l131 369h-123v1366h-530q-41 -339 -87 -643t-77.5 -433t-66 -191.5t-83.5 -92t-124 -29.5q-67 0 -117 25v92q61 -22 113 -22q87 0 135.5 108t106 466t114.5 816h719v-1368z" />
-<glyph unicode="&#x4c6;" horiz-adv-x="1116" d="M934 94h153l-147 -463h-117l131 369h-118v995h-385q-30 -395 -73.5 -602.5t-112 -305t-177.5 -97.5q-39 0 -68 8v90q19 -6 54 -6q113 0 182.5 238.5t105.5 766.5h572v-993z" />
-<glyph unicode="&#x4c7;" horiz-adv-x="1473" d="M1266 147q0 -331 -123 -495t-383 -164q-76 0 -135 10.5t-131 40.5v94q134 -51 256 -51q208 0 310.5 137.5t102.5 427.5v574h-854v-721h-102v1462h102v-647h854v647h103v-1315z" />
-<glyph unicode="&#x4c8;" horiz-adv-x="1251" d="M281 1087v-475h690v475h98v-1052q0 -270 -81 -398.5t-261 -128.5q-126 0 -213 54v98q97 -61 205 -61q132 0 192 108.5t60 327.5v491h-690v-526h-99v1087h99z" />
-<glyph unicode="&#x4c9;" horiz-adv-x="1473" d="M1266 94h153l-147 -463h-117l131 369h-123v719h-854v-719h-102v1462h102v-649h854v649h103v-1368z" />
-<glyph unicode="&#x4ca;" horiz-adv-x="1251" d="M281 1087v-479h690v479h98v-993h154l-148 -463h-117l132 369h-119v522h-690v-522h-99v1087h99z" />
-<glyph unicode="&#x4cb;" horiz-adv-x="1372" d="M1165 0h-123v-369h-98v463h119v541q-261 -103 -461 -103q-204 0 -312 90.5t-108 276.5v563h103v-567q0 -266 325 -266q96 0 192 17.5t261 76.5v739h102v-1462z" />
-<glyph unicode="&#x4cc;" horiz-adv-x="1188" d="M262 1087v-364q0 -138 67 -199t206 -61q98 0 187 35t185 112v477h99v-1087h-119v-369h-99v463h119v422q-100 -77 -196.5 -110t-208.5 -33q-167 0 -252.5 87t-85.5 251v376h98z" />
-<glyph unicode="&#x4cd;" horiz-adv-x="1767" d="M850 0l-545 1350h-8q8 -124 8 -254v-1096h-98v1462h158l518 -1286h6l518 1286h154v-1368h153l-147 -463h-117l131 369h-123v1108q0 116 12 240h-8l-547 -1348h-65z" />
-<glyph unicode="&#x4ce;" horiz-adv-x="1382" d="M688 106l62 175l313 806h137v-993h154l-148 -463h-116l131 369h-115v967q-22 -63 -46.5 -129t-326.5 -838h-88l-301 764q-19 46 -35.5 97t-36.5 110v-971h-90v1087h131l314 -800q37 -97 61 -181z" />
-<glyph unicode="&#x4cf;" horiz-adv-x="516" d="M207 0zM207 0v1462h102v-1462h-102z" />
-<glyph unicode="&#x4d0;" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM619 1579q-149 0 -227 66.5t-91 214.5h88q15 -110 68 -155.5t164 -45.5q110 0 163.5 47t65.5 154h88q-21 -281 -319 -281z" />
-<glyph unicode="&#x4d1;" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM546 1241q-149 0 -227 66.5t-91 214.5h88q15 -110 68 -155.5t164 -45.5q110 0 163.5 47t65.5 154h88q-21 -281 -319 -281z" />
-<glyph unicode="&#x4d2;" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM367 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM748 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x4d3;" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM282 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM663 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x4d4;" horiz-adv-x="1653" d="M0 0zM1528 0h-717v516h-475l-227 -516h-111l653 1462h877v-94h-615v-553h576v-94h-576v-627h615v-94zM377 608h434v760h-100z" />
-<glyph unicode="&#x4d5;" horiz-adv-x="1731" d="M98 0zM1243 -20q-295 0 -397 256q-68 -133 -168 -194.5t-252 -61.5q-156 0 -242 82.5t-86 226.5q0 154 125 243t377 97l201 6v72q0 155 -61.5 234t-198.5 79q-148 0 -305 -84l-37 86q173 84 346 84q261 0 325 -211q111 213 347 213q184 0 289.5 -134.5t105.5 -363.5v-80 h-715q0 -460 348 -460q85 0 150 12t174 57v-90q-92 -41 -165 -55t-161 -14zM434 70q169 0 266 99.5t97 276.5v107l-187 -8q-219 -11 -313 -71.5t-94 -188.5q0 -102 61 -158.5t170 -56.5zM1217 1020q-284 0 -314 -402h604q0 188 -77.5 295t-212.5 107z" />
-<glyph unicode="&#x4d6;" horiz-adv-x="1130" d="M207 0zM1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94zM592 1579q-149 0 -227 66.5t-91 214.5h88q15 -110 68 -155.5t164 -45.5q110 0 163.5 47t65.5 154h88q-21 -281 -319 -281z" />
-<glyph unicode="&#x4d7;" horiz-adv-x="1124" d="M119 0zM621 -20q-237 0 -369.5 146t-132.5 409q0 260 128 416.5t345 156.5q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5zM592 1020q-157 0 -252 -103.5t-111 -298.5h672q0 189 -82 295.5 t-227 106.5zM579 1241q-149 0 -227 66.5t-91 214.5h88q15 -110 68 -155.5t164 -45.5q110 0 163.5 47t65.5 154h88q-21 -281 -319 -281z" />
-<glyph unicode="&#x4d8;" horiz-adv-x="1442" d="M639 1386q-189 0 -416 -73v100q128 43 220.5 57.5t195.5 14.5q329 0 501.5 -195.5t172.5 -560.5q0 -224 -75 -394t-217 -262.5t-335 -92.5q-275 0 -417 185.5t-142 549.5v61h1077q-34 610 -565 610zM690 76q227 0 363.5 160.5t150.5 445.5h-966q0 -295 115.5 -450.5 t336.5 -155.5z" />
-<glyph unicode="&#x4d9;" horiz-adv-x="1124" d="M504 1108q237 0 369.5 -146t132.5 -409q0 -172 -59 -303.5t-167 -200.5t-248 -69q-191 0 -302 133.5t-111 363.5v80h782q-2 223 -103.5 342t-293.5 119q-89 0 -162.5 -14t-179.5 -56v90q90 39 165.5 54.5t176.5 15.5zM532 68q157 0 252 104t111 297h-672 q0 -186 81.5 -293.5t227.5 -107.5z" />
-<glyph unicode="&#x4da;" horiz-adv-x="1442" d="M127 0zM639 1386q-189 0 -416 -73v100q128 43 220.5 57.5t195.5 14.5q329 0 501.5 -195.5t172.5 -560.5q0 -224 -75 -394t-217 -262.5t-335 -92.5q-275 0 -417 185.5t-142 549.5v61h1077q-34 610 -565 610zM690 76q227 0 363.5 160.5t150.5 445.5h-966 q0 -295 115.5 -450.5t336.5 -155.5zM488 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM869 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x4db;" horiz-adv-x="1124" d="M119 0zM504 1108q237 0 369.5 -146t132.5 -409q0 -172 -59 -303.5t-167 -200.5t-248 -69q-191 0 -302 133.5t-111 363.5v80h782q-2 223 -103.5 342t-293.5 119q-89 0 -162.5 -14t-179.5 -56v90q90 39 165.5 54.5t176.5 15.5zM532 68q157 0 252 104t111 297h-672 q0 -186 81.5 -293.5t227.5 -107.5zM310 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM691 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x4dc;" horiz-adv-x="1597" d="M0 0zM625 745l-592 717h127l588 -708v708h102v-708l588 708h127l-594 -710l626 -752h-135l-612 741v-741h-102v741l-613 -741h-135zM545 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM926 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z " />
-<glyph unicode="&#x4dd;" horiz-adv-x="1362" d="M6 0zM631 1087h100v-528l467 528h121l-471 -528l508 -559h-127l-498 551v-551h-100v551l-498 -551h-127l506 555l-469 532h121l467 -528v528zM426 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM807 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86 q-63 0 -63 86z" />
-<glyph unicode="&#x4de;" horiz-adv-x="1145" d="M82 0zM1001 1120q0 -286 -303 -352v-6q332 -71 332 -356q0 -201 -141.5 -313.5t-399.5 -112.5q-242 0 -407 86v104q95 -46 203 -71t204 -25q200 0 315.5 86.5t115.5 242.5q0 152 -112.5 230t-336.5 78h-217v96h225q212 0 313 80t101 227q0 125 -92.5 200t-241.5 75 q-111 0 -204 -31.5t-201 -108.5l-58 80q202 154 463 154q205 0 323.5 -98t118.5 -265zM310 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM691 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x4df;" horiz-adv-x="926" d="M68 0zM387 618q295 0 295 203q0 97 -68 148t-194 51q-80 0 -149 -18.5t-148 -53.5l-37 82q174 78 338 78q178 0 270 -74t92 -205q0 -189 -194 -241v-6q121 -30 176 -99.5t55 -177.5q0 -151 -110.5 -238t-306.5 -87q-106 0 -193.5 20.5t-144.5 54.5v99q103 -49 178 -66.5 t160 -17.5q148 0 230.5 62.5t82.5 178.5q0 113 -79 167t-237 54h-151v86h135zM194 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM575 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x4e0;" horiz-adv-x="1153" d="M442 815q286 0 441 -107t155 -302q0 -207 -142 -316.5t-407 -109.5q-248 0 -407 83v109q198 -96 414 -96q206 0 319 85t113 240q0 151 -122 231.5t-351 80.5h-152v86l565 567h-749v96h882v-96z" />
-<glyph unicode="&#x4e1;" horiz-adv-x="942" d="M319 436q291 -3 423 -112t132 -324q0 -148 -62 -260.5t-174.5 -172t-254.5 -59.5q-209 0 -352 68v102q90 -43 174 -61t174 -18q181 0 286 108t105 293q0 172 -110.5 259t-342.5 87h-124v80l507 573h-645v88h781v-73z" />
-<glyph unicode="&#x4e2;" horiz-adv-x="1477" d="M207 0zM207 1462h98v-956q0 -102 -8 -342h6l864 1298h103v-1462h-99v950q0 162 13 350h-8l-867 -1300h-102v1462zM461 1671h555v-82h-555v82z" />
-<glyph unicode="&#x4e3;" horiz-adv-x="1229" d="M182 0zM276 1087v-786l-6 -205l645 991h132v-1087h-95v781l4 210l-645 -991h-129v1087h94zM338 1333h555v-82h-555v82z" />
-<glyph unicode="&#x4e4;" horiz-adv-x="1477" d="M207 0zM207 1462h98v-956q0 -102 -8 -342h6l864 1298h103v-1462h-99v950q0 162 13 350h-8l-867 -1300h-102v1462zM483 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM864 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x4e5;" horiz-adv-x="1229" d="M182 0zM276 1087v-786l-6 -205l645 991h132v-1087h-95v781l4 210l-645 -991h-129v1087h94zM361 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM742 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x4e6;" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170 t-141.5 -483zM529 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM910 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x4e7;" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5 t-97.5 -349.5zM346 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM727 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x4e8;" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM782 76q256 0 395.5 160t147.5 462h-1085q8 -299 147.5 -460.5t394.5 -161.5zM784 1386q-250 0 -389 -153.5t-153 -439.5 h1081q-13 288 -152.5 440.5t-386.5 152.5z" />
-<glyph unicode="&#x4e9;" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM600 70q174 0 272.5 118.5t104.5 333.5h-754q4 -211 103 -331.5t274 -120.5zM598 1018q-165 0 -262 -107.5t-111 -300.5 h750q-16 196 -114.5 302t-262.5 106z" />
-<glyph unicode="&#x4ea;" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM782 76q256 0 395.5 160t147.5 462h-1085q8 -299 147.5 -460.5t394.5 -161.5zM784 1386q-250 0 -389 -153.5t-153 -439.5 h1081q-13 288 -152.5 440.5t-386.5 152.5zM529 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM910 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x4eb;" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM600 70q174 0 272.5 118.5t104.5 333.5h-754q4 -211 103 -331.5t274 -120.5zM598 1018q-165 0 -262 -107.5t-111 -300.5 h750q-16 196 -114.5 302t-262.5 106zM346 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM727 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x4ec;" horiz-adv-x="1266" d="M70 0zM434 1391q-80 0 -154.5 -17.5t-162.5 -60.5l-41 92q164 78 368 78q324 0 508.5 -192t184.5 -525q0 -239 -83 -417t-239.5 -273.5t-361.5 -95.5q-238 0 -383 51v94q167 -51 364 -51q270 0 425 169t169 476h-774v94h772q-22 278 -174.5 428t-417.5 150zM329 1727 q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM710 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x4ed;" horiz-adv-x="1006" d="M68 0zM358 -20q-92 0 -171 15t-119 36v92q127 -53 284 -53q196 0 313 124.5t119 335.5h-620v88h616q-17 197 -119.5 298.5t-281.5 101.5q-106 0 -266 -60l-29 89q56 23 140 42t153 19q244 0 377 -144t133 -407q0 -269 -141.5 -423t-387.5 -154zM214 1389q0 46 15.5 66 t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM595 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x4ee;" horiz-adv-x="1204" d="M10 0zM276 -20q-119 0 -192 30v103q86 -37 182 -37q72 0 123.5 24.5t95.5 79t107 182.5l-582 1100h121l447 -854q35 -69 63 -143h4l25 61l420 936h114l-469 -1028q-45 -99 -86 -182.5t-91 -143.5t-117 -94t-165 -34zM338 1671h555v-82h-555v82z" />
-<glyph unicode="&#x4ef;" horiz-adv-x="940" d="M0 0zM0 1087h102l230 -610q105 -281 133 -379h6q42 129 137 385l230 604h102l-487 -1263q-59 -154 -99 -208t-93.5 -81t-129.5 -27q-57 0 -127 21v86q58 -16 125 -16q51 0 90 24t70.5 74.5t73 160t53.5 142.5zM194 1333h555v-82h-555v82z" />
-<glyph unicode="&#x4f0;" horiz-adv-x="1204" d="M10 0zM276 -20q-119 0 -192 30v103q86 -37 182 -37q72 0 123.5 24.5t95.5 79t107 182.5l-582 1100h121l447 -854q35 -69 63 -143h4l25 61l420 936h114l-469 -1028q-45 -99 -86 -182.5t-91 -143.5t-117 -94t-165 -34zM365 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86 q-63 0 -63 86zM746 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x4f1;" horiz-adv-x="940" d="M0 0zM0 1087h102l230 -610q105 -281 133 -379h6q42 129 137 385l230 604h102l-487 -1263q-59 -154 -99 -208t-93.5 -81t-129.5 -27q-57 0 -127 21v86q58 -16 125 -16q51 0 90 24t70.5 74.5t73 160t53.5 142.5zM214 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86 q-63 0 -63 86zM595 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x4f2;" horiz-adv-x="1204" d="M10 0zM276 -20q-119 0 -192 30v103q86 -37 182 -37q72 0 123.5 24.5t95.5 79t107 182.5l-582 1100h121l447 -854q35 -69 63 -143h4l25 61l420 936h114l-469 -1028q-45 -99 -86 -182.5t-91 -143.5t-117 -94t-165 -34zM367 1595q31 33 67 90t121 222h136v-17 q-135 -202 -254 -311h-70v16zM705 1595q31 33 67 90t121 222h136v-17q-135 -202 -254 -311h-70v16z" />
-<glyph unicode="&#x4f3;" horiz-adv-x="940" d="M0 0zM0 1087h102l230 -610q105 -281 133 -379h6q42 129 137 385l230 604h102l-487 -1263q-59 -154 -99 -208t-93.5 -81t-129.5 -27q-57 0 -127 21v86q58 -16 125 -16q51 0 90 24t70.5 74.5t73 160t53.5 142.5zM212 1257q31 33 67 90t121 222h136v-17q-135 -202 -254 -311 h-70v16zM550 1257q31 33 67 90t121 222h136v-17q-135 -202 -254 -311h-70v16z" />
-<glyph unicode="&#x4f4;" horiz-adv-x="1372" d="M182 0zM1165 0h-102v635q-261 -103 -461 -103q-204 0 -312 90.5t-108 276.5v563h103v-567q0 -266 325 -266q96 0 192 17.5t261 76.5v739h102v-1462zM420 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM801 1727q0 46 15.5 66t47.5 20q64 0 64 -86 t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x4f5;" horiz-adv-x="1188" d="M164 0zM262 1087v-364q0 -138 67 -199t206 -61q98 0 187 35t185 112v477h99v-1087h-99v516q-100 -77 -196.5 -110t-208.5 -33q-167 0 -252.5 87t-85.5 251v376h98zM331 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM712 1389q0 46 15.5 66t47.5 20 q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x4f6;" horiz-adv-x="1028" d="M207 1462h801v-94h-699v-1274h99v-463h-99v369h-102v1462z" />
-<glyph unicode="&#x4f7;" horiz-adv-x="862" d="M182 1087h639v-86h-540v-907h98v-463h-98v369h-99v1087z" />
-<glyph unicode="&#x4f8;" horiz-adv-x="1669" d="M207 0zM1462 0h-102v1462h102v-1462zM309 817h283q251 0 377.5 -95.5t126.5 -301.5q0 -202 -124 -311t-358 -109h-407v1462h102v-645zM309 90h289q204 0 295.5 83t91.5 247q0 163 -95 235t-312 72h-269v-637zM576 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86 q-63 0 -63 86zM957 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x4f9;" horiz-adv-x="1481" d="M182 0zM281 629h346q383 0 383 -301q0 -155 -107 -241.5t-307 -86.5h-414v1087h99v-458zM281 535v-441h331q141 0 217 59t76 177q0 108 -67 156.5t-232 48.5h-325zM1298 0h-98v1087h98v-1087zM486 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM867 1389 q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x4fa;" horiz-adv-x="1028" d="M309 772h439v-94h-439v-584h119v-244q0 -104 -46 -161.5t-136 -57.5q-57 0 -99 21v92q45 -18 84 -18q99 0 99 124v150h-123v678h-160v94h160v690h801v-94h-699v-596z" />
-<glyph unicode="&#x4fb;" horiz-adv-x="862" d="M821 1001h-540v-409h366v-86h-366v-412h118v-244q0 -104 -46 -161.5t-136 -57.5q-59 0 -98 21v92q45 -18 84 -18q98 0 98 124v150h-119v506h-164v86h164v495h639v-86z" />
-<glyph unicode="&#x4fc;" horiz-adv-x="1192" d="M1042 94h119v-244q0 -104 -46 -161.5t-136 -57.5q-59 0 -98 21v92q45 -18 84 -18q98 0 98 124v150h-78l-432 682l-440 -682h-113l492 762l-447 700h115l395 -626l401 626h109l-453 -698z" />
-<glyph unicode="&#x4fd;" horiz-adv-x="1036" d="M449 559l-379 528h114l324 -458l321 458h109l-373 -528l332 -465h109v-244q0 -104 -46 -161.5t-137 -57.5q-59 0 -98 21v92q45 -18 84 -18q98 0 98 124v150h-57l-342 485l-344 -485h-109z" />
-<glyph unicode="&#x4fe;" horiz-adv-x="1102" d="M147 831h299l-401 631h115l395 -626l401 626h109l-410 -631h303v-90h-331l475 -741h-117l-432 682l-440 -682h-113l477 741h-330v90z" />
-<glyph unicode="&#x4ff;" horiz-adv-x="1020" d="M123 608h291l-344 479h114l324 -458l321 458h109l-338 -479h297v-82h-309l377 -526h-115l-342 485l-344 -485h-109l371 526h-303v82z" />
-<glyph unicode="&#x500;" horiz-adv-x="1219" d="M909 1462h103v-1462h-420q-233 0 -357 108.5t-124 311.5q0 206 126 301.5t377 95.5h295v645zM909 727h-280q-217 0 -312.5 -71.5t-95.5 -235.5t91.5 -247t295.5 -83h301v637z" />
-<glyph unicode="&#x501;" horiz-adv-x="1219" d="M119 0zM580 1108q118 0 204 -43t154 -147h6q-6 126 -6 247v391h98v-1556h-65l-25 166h-8q-124 -186 -356 -186q-225 0 -344 140t-119 408q0 282 118 431t343 149zM580 1018q-178 0 -267.5 -125t-89.5 -363q0 -462 359 -462q184 0 270 107t86 353v17q0 252 -84.5 362.5 t-273.5 110.5z" />
-<glyph unicode="&#x502;" horiz-adv-x="1759" d="M547 -20q-207 0 -320.5 105t-113.5 300q0 210 144.5 321t408.5 111h190v645h102v-1083q0 -303 273 -303q116 0 175.5 75t59.5 222v475h103v-481q0 -184 -89.5 -285.5t-254.5 -101.5q-236 0 -330 182q-121 -182 -348 -182zM856 725h-197q-436 0 -436 -334 q0 -156 85.5 -238.5t246.5 -82.5q142 0 221.5 79t79.5 213v363z" />
-<glyph unicode="&#x503;" horiz-adv-x="1769" d="M580 1108q112 0 192 -47t135 -143h6q-6 126 -6 247v391h99v-1142q0 -177 61 -261.5t197 -84.5q109 0 173 73.5t64 231.5v327h98v-333q0 -189 -88 -288t-256 -99q-249 0 -315 223h-6q-109 -223 -352 -223q-225 0 -344 140t-119 408q0 282 118 431t343 149zM580 1018 q-178 0 -267.5 -125t-89.5 -363q0 -462 359 -462q166 0 245.5 111t79.5 349v17q0 242 -77 357.5t-250 115.5z" />
-<glyph unicode="&#x504;" horiz-adv-x="1774" d="M434 711h-194v96h194q199 0 301.5 79.5t102.5 227.5q0 126 -85 200.5t-221 74.5q-103 0 -192 -30.5t-201 -109.5l-57 80q112 82 218 118t232 36q194 0 304 -98t110 -265q0 -141 -78 -231t-223 -121v-6q171 -37 246 -124.5t86 -250.5q12 -175 71 -243t193 -68 q121 0 180.5 73t59.5 222v477h102v-481q0 -188 -88 -287.5t-254 -99.5q-191 0 -279.5 97.5t-97.5 307.5q-7 172 -108 249t-322 77z" />
-<glyph unicode="&#x505;" horiz-adv-x="1546" d="M389 532h-143v86h112q141 0 215 52t74 151q0 93 -65 146t-185 53q-123 0 -280 -72l-37 82q80 35 157.5 56.5t165.5 21.5q165 0 257 -74t92 -209q0 -91 -49.5 -152.5t-145.5 -84.5v-6q113 -24 165.5 -83t68.5 -173q13 -98 40.5 -154t72.5 -80t138 -24q236 0 236 305v327 h98v-333q0 -189 -85 -288t-249 -99q-116 0 -185.5 33t-108 103.5t-58.5 209.5q-15 111 -81 158.5t-220 47.5z" />
-<glyph unicode="&#x506;" horiz-adv-x="1184" d="M987 1120q0 -141 -77 -230.5t-226 -121.5v-6q171 -35 244 -118t73 -238v-312h119v-463h-98v369h-123v403q0 155 -112.5 231.5t-340.5 76.5h-206v96h225q212 0 313 80t101 227q0 125 -92.5 200t-241.5 75q-112 0 -205.5 -32t-200.5 -108l-57 80q202 154 463 154 q205 0 323.5 -99t118.5 -264z" />
-<glyph unicode="&#x507;" horiz-adv-x="983" d="M387 618q295 0 295 203q0 97 -68 148t-194 51q-80 0 -149 -18.5t-148 -53.5l-37 82q174 78 338 78q178 0 270 -74t92 -205q0 -189 -194 -241v-6q122 -31 170.5 -95t48.5 -174v-219h119v-463h-99v369h-118v319q0 109 -78 161t-236 52h-147v86h135z" />
-<glyph unicode="&#x508;" horiz-adv-x="1907" d="M1006 1366h-443l-36 -258q-30 -216 -69 -463.5t-80 -398.5t-99.5 -210t-157.5 -59q-66 0 -121 25v92q61 -22 111 -22q51 0 85 31.5t58 88t59 220.5t76.5 435.5t87.5 614.5h631v-1079q0 -167 61 -237t195 -70q250 0 250 297v475h102v-481q0 -184 -93.5 -285.5 t-258.5 -101.5q-186 0 -272 99t-86 302v985z" />
-<glyph unicode="&#x509;" horiz-adv-x="1667" d="M903 369q0 -301 256 -301q111 0 175.5 71.5t64.5 225.5v335h98v-333q0 -188 -86.5 -287.5t-251.5 -99.5q-354 0 -354 401v614h-354q-30 -400 -73.5 -607t-114 -302.5t-181.5 -95.5q-33 0 -62 8v90q20 -6 50 -6q115 0 184.5 233t107.5 772h541v-718z" />
-<glyph unicode="&#x50a;" horiz-adv-x="2023" d="M1225 373q0 -153 60.5 -226t195.5 -73q250 0 250 288v486h102v-481q0 -184 -91.5 -285.5t-260.5 -101.5q-184 0 -271.5 100.5t-87.5 300.5v338h-813v-719h-102v1462h102v-649h813v649h103v-1089z" />
-<glyph unicode="&#x50b;" horiz-adv-x="1802" d="M281 1087v-477h659v477h98v-714q0 -305 254 -305q118 0 180 75.5t62 221.5v335h98v-333q0 -189 -87.5 -288t-252.5 -99q-176 0 -264 99t-88 302v143h-659v-524h-99v1087h99z" />
-<glyph unicode="&#x50c;" horiz-adv-x="1503" d="M866 733h518v-88q0 -335 -146 -500t-441 -165q-313 0 -490.5 200t-177.5 553q0 229 90.5 399t259.5 260.5t391 90.5q102 0 214.5 -21t197.5 -57l-39 -94q-80 35 -180.5 57.5t-196.5 22.5q-290 0 -458 -174t-168 -484q0 -311 148 -486t413 -175q243 0 359 137.5t116 427.5 h-410v96z" />
-<glyph unicode="&#x50d;" horiz-adv-x="1257" d="M676 547h477v-68q0 -246 -122 -372.5t-361 -126.5q-260 0 -405.5 147.5t-145.5 411.5q0 173 70.5 302.5t205 198t320.5 68.5q207 0 370 -68l-32 -88q-150 66 -336 66q-234 0 -364 -123.5t-130 -351.5t116 -350.5t333 -122.5q383 0 383 391h-379v86z" />
-<glyph unicode="&#x50e;" horiz-adv-x="1386" d="M10 1366v96h1057v-96h-479v-983q0 -161 62.5 -235t203.5 -74q240 0 240 299v475h102v-481q0 -187 -90 -287t-252 -100q-187 0 -278 98.5t-91 302.5v985h-475z" />
-<glyph unicode="&#x50f;" horiz-adv-x="1264" d="M862 1001h-362v-618q0 -315 256 -315q239 0 239 305v327h99v-333q0 -188 -86.5 -287.5t-251.5 -99.5q-355 0 -355 401v620h-360v86h821v-86z" />
-<glyph unicode="&#x510;" horiz-adv-x="1159" d="M158 1108q0 108 57 194.5t162 133.5t237 47q273 0 463 -111l-51 -90q-181 107 -412 107q-154 0 -251 -77t-97 -210q0 -143 126.5 -219t346.5 -76h166v-96h-196q-233 0 -357.5 -84.5t-124.5 -243.5q0 -151 110 -230t318 -79q238 0 414 86v-101q-151 -79 -414 -79 q-262 0 -401 104.5t-139 300.5q0 146 100.5 245.5t280.5 131.5v6q-166 29 -252 116t-86 224z" />
-<glyph unicode="&#x511;" horiz-adv-x="928" d="M94 0zM672 618v-86h-140q-169 0 -251 -62.5t-82 -174.5q0 -105 87 -165t244 -60q76 0 140 14t174 66v-93q-135 -77 -322 -77q-202 0 -315 81t-113 226q0 224 248 284v9q-215 63 -215 239q0 133 103 211t282 78q96 0 174.5 -15.5t165.5 -52.5l-37 -84q-148 64 -303 64 q-142 0 -211.5 -53t-69.5 -150q0 -199 326 -199h115z" />
-<glyph unicode="&#x512;" horiz-adv-x="1395" d="M1085 1366h-530q-41 -339 -87 -643t-77.5 -433t-66 -191.5t-83.5 -92t-124 -29.5q-67 0 -117 25v92q61 -22 113 -22q87 0 135.5 108t106 466t114.5 816h719v-1368h119v-244q0 -104 -46 -161.5t-137 -57.5q-56 0 -98 21v92q45 -18 84 -18q98 0 98 124v150h-123v1366z" />
-<glyph unicode="&#x513;" horiz-adv-x="1116" d="M836 995h-385q-30 -395 -73.5 -602.5t-112 -305t-177.5 -97.5q-39 0 -68 8v90q19 -6 54 -6q113 0 182.5 238.5t105.5 766.5h572v-993h119v-244q0 -104 -46 -161.5t-137 -57.5q-56 0 -98 21v92q45 -18 84 -18q98 0 98 124v150h-118v995z" />
-<glyph unicode="&#x1e00;" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM831 -338q0 -97 -60 -155t-157 -58t-157 58t-60 155q0 94 60 152.5t157 58.5t157 -59t60 -152zM477 -338q0 -66 37.5 -103.5t99.5 -37.5 t99.5 37.5t37.5 103.5q0 64 -39 101.5t-98 37.5q-62 0 -99.5 -38t-37.5 -101z" />
-<glyph unicode="&#x1e01;" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM737 -338q0 -97 -60 -155t-157 -58t-157 58t-60 155q0 94 60 152.5t157 58.5t157 -59t60 -152zM383 -338q0 -66 37.5 -103.5t99.5 -37.5t99.5 37.5t37.5 103.5q0 64 -39 101.5t-98 37.5 q-62 0 -99.5 -38t-37.5 -101z" />
-<glyph unicode="&#x1e3e;" horiz-adv-x="1767" d="M207 0zM850 0l-545 1350h-8q8 -124 8 -254v-1096h-98v1462h158l518 -1286h6l518 1286h154v-1462h-103v1108q0 116 12 240h-8l-547 -1348h-65zM778 1597q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x1e3f;" horiz-adv-x="1808" d="M182 0zM1540 0v713q0 159 -62 232t-190 73q-167 0 -247 -92t-80 -289v-637h-101v743q0 275 -252 275q-171 0 -249 -99.5t-78 -318.5v-600h-99v1087h82l21 -149h6q45 81 128 125.5t183 44.5q257 0 330 -193h4q53 93 142.5 143t203.5 50q178 0 267 -95t89 -302v-711h-98z M837 1257q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x1e80;" horiz-adv-x="1827" d="M51 0zM1372 0h-84l-321 1128q-40 139 -60 228q-16 -87 -45.5 -200t-322.5 -1156h-86l-402 1462h107l256 -942q15 -57 28 -105.5t23.5 -91t19 -82t15.5 -79.5q24 136 102 413l250 887h113l293 -1018q51 -176 73 -284q13 72 33.5 153t308.5 1149h103zM1028 1579h-69 q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
-<glyph unicode="&#x1e81;" horiz-adv-x="1481" d="M31 0zM1051 0l-238 727q-23 74 -59 217h-6l-21 -74l-45 -145l-242 -725h-98l-311 1087h106l174 -630q61 -234 80 -344h6q59 234 86 311l224 663h90l213 -661q72 -235 88 -311h6q8 65 80 348l166 624h100l-295 -1087h-104zM864 1241h-69q-96 79 -188.5 171.5t-125.5 139.5 v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
-<glyph unicode="&#x1e82;" horiz-adv-x="1827" d="M51 0zM1372 0h-84l-321 1128q-40 139 -60 228q-16 -87 -45.5 -200t-322.5 -1156h-86l-402 1462h107l256 -942q15 -57 28 -105.5t23.5 -91t19 -82t15.5 -79.5q24 136 102 413l250 887h113l293 -1018q51 -176 73 -284q13 72 33.5 153t308.5 1149h103zM815 1595 q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x1e83;" horiz-adv-x="1481" d="M31 0zM1051 0l-238 727q-23 74 -59 217h-6l-21 -74l-45 -145l-242 -725h-98l-311 1087h106l174 -630q61 -234 80 -344h6q59 234 86 311l224 663h90l213 -661q72 -235 88 -311h6q8 65 80 348l166 624h100l-295 -1087h-104zM661 1257q73 79 144.5 171.5t97.5 140.5h141v-17 q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x1e84;" horiz-adv-x="1827" d="M51 0zM1372 0h-84l-321 1128q-40 139 -60 228q-16 -87 -45.5 -200t-322.5 -1156h-86l-402 1462h107l256 -942q15 -57 28 -105.5t23.5 -91t19 -82t15.5 -79.5q24 136 102 413l250 887h113l293 -1018q51 -176 73 -284q13 72 33.5 153t308.5 1149h103zM655 1727 q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM1036 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x1e85;" horiz-adv-x="1481" d="M31 0zM1051 0l-238 727q-23 74 -59 217h-6l-21 -74l-45 -145l-242 -725h-98l-311 1087h106l174 -630q61 -234 80 -344h6q59 234 86 311l224 663h90l213 -661q72 -235 88 -311h6q8 65 80 348l166 624h100l-295 -1087h-104zM498 1389q0 46 15.5 66t47.5 20q64 0 64 -86 t-64 -86q-63 0 -63 86zM879 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph unicode="&#x1ea0;" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM548 -227q0 96 64 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-64 0 -64 97z" />
-<glyph unicode="&#x1ea1;" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM448 -227q0 96 64 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-64 0 -64 97z" />
-<glyph unicode="&#x1ea2;" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM837 1843q0 -140 -168 -176l-10 -121h-80l-10 178q89 15 129.5 43t40.5 72q0 48 -33.5 72t-111.5 24q-48 0 -93 -8v78q52 12 107 12 q108 0 168.5 -45.5t60.5 -128.5z" />
-<glyph unicode="&#x1ea3;" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM731 1505q0 -140 -168 -176l-10 -121h-80l-10 178q89 15 129.5 43t40.5 72q0 48 -33.5 72t-111.5 24q-48 0 -93 -8v78q52 12 107 12q108 0 168.5 -45.5t60.5 -128.5z" />
-<glyph unicode="&#x1ea4;" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM674 1856q101 -135 229 -261v-16h-67q-128 93 -217 176q-89 -83 -217 -176h-68v16q141 136 234 261h106zM824 1790q42 54 65.5 90t69.5 121h125 v-16q-90 -121 -193 -211h-67v16z" />
-<glyph unicode="&#x1ea5;" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM588 1518q101 -135 229 -261v-16h-67q-128 93 -217 176q-89 -83 -217 -176h-68v16q141 136 234 261h106zM738 1452q42 54 65.5 90t69.5 121h125v-16q-90 -121 -193 -211h-67v16z" />
-<glyph unicode="&#x1ea6;" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM674 1856q101 -135 229 -261v-16h-67q-128 93 -217 176q-89 -83 -217 -176h-68v16q141 136 234 261h106zM418 1774h-67q-115 100 -193 211v16h125 q47 -86 69 -119.5t66 -91.5v-16z" />
-<glyph unicode="&#x1ea7;" horiz-adv-x="1085" d="M72 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM588 1518q101 -135 229 -261v-16h-67q-128 93 -217 176q-89 -83 -217 -176h-68v16q141 136 234 261h106zM332 1436h-67q-115 100 -193 211v16h125q47 -86 69 -119.5t66 -91.5v-16z" />
-<glyph unicode="&#x1ea8;" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM1086 1987q0 -107 -131 -136l-4 -81h-68l-10 131q63 11 94 28t31 56q0 37 -29 50t-76 13q-31 0 -71 -6v72q34 8 86 8q84 0 131 -36t47 -99z M674 1856q101 -135 229 -261v-16h-67q-128 93 -217 176q-89 -83 -217 -176h-68v16q141 136 234 261h106z" />
-<glyph unicode="&#x1ea9;" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM1000 1649q0 -107 -131 -136l-4 -81h-68l-10 131q63 11 94 28t31 56q0 37 -29 50t-76 13q-31 0 -71 -6v72q34 8 86 8q84 0 131 -36t47 -99zM588 1518q101 -135 229 -261v-16h-67 q-128 93 -217 176q-89 -83 -217 -176h-68v16q141 136 234 261h106z" />
-<glyph unicode="&#x1eaa;" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM754 1935q-39 0 -74.5 20t-67.5 43.5t-61 43.5t-55 20q-80 0 -105 -129h-73q14 97 60 154t124 57q39 0 73.5 -19.5t66 -43t60.5 -43t58 -19.5 q75 0 98 127h76q-11 -101 -58.5 -156t-121.5 -55zM674 1856q101 -135 229 -261v-16h-67q-128 93 -217 176q-89 -83 -217 -176h-68v16q141 136 234 261h106z" />
-<glyph unicode="&#x1eab;" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM668 1597q-39 0 -74.5 20t-67.5 43.5t-61 43.5t-55 20q-80 0 -105 -129h-73q14 97 60 154t124 57q39 0 73.5 -19.5t66 -43t60.5 -43t58 -19.5q75 0 98 127h76q-11 -101 -58.5 -156t-121.5 -55z M588 1518q101 -135 229 -261v-16h-67q-128 93 -217 176q-89 -83 -217 -176h-68v16q141 136 234 261h106z" />
-<glyph unicode="&#x1eac;" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM548 -227q0 96 64 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-64 0 -64 97zM328 1595q62 67 131.5 156t110.5 156h98 q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#x1ead;" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM251 1257q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16zM448 -227q0 96 64 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26 q-64 0 -64 97z" />
-<glyph unicode="&#x1eae;" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM617 1579q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5t134.5 37.5t61.5 124.5h80q-30 -246 -278 -246zM555 1856q34 42 59.5 80t75.5 131 h125v-17q-37 -53 -93 -113.5t-99 -97.5h-68v17z" />
-<glyph unicode="&#x1eaf;" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM551 1241q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5t134.5 37.5t61.5 124.5h80q-30 -246 -278 -246zM489 1518q34 42 59.5 80t75.5 131h125v-17q-37 -53 -93 -113.5t-99 -97.5h-68 v17z" />
-<glyph unicode="&#x1eb0;" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM670 1839h-68q-42 37 -99 98.5t-93 112.5v17h125q51 -94 70 -122.5t65 -88.5v-17zM617 1579q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5 t134.5 37.5t61.5 124.5h80q-30 -246 -278 -246z" />
-<glyph unicode="&#x1eb1;" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM604 1501h-68q-42 37 -99 98.5t-93 112.5v17h125q51 -94 70 -122.5t65 -88.5v-17zM551 1241q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5t134.5 37.5t61.5 124.5h80 q-30 -246 -278 -246z" />
-<glyph unicode="&#x1eb2;" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM760 1999q0 -107 -127 -131l-6 -43h-70l-10 90q62 11 93.5 28.5t31.5 55.5q0 63 -98 63q-39 0 -78 -6v72q34 8 90 8q80 0 127 -37t47 -100z M617 1579q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5t134.5 37.5t61.5 124.5h80q-30 -246 -278 -246z" />
-<glyph unicode="&#x1eb3;" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM694 1661q0 -107 -127 -131l-6 -43h-70l-10 90q62 11 93.5 28.5t31.5 55.5q0 63 -98 63q-39 0 -78 -6v72q34 8 90 8q80 0 127 -37t47 -100zM551 1241q-253 0 -275 246h82q14 -87 60.5 -124.5 t134.5 -37.5t134.5 37.5t61.5 124.5h80q-30 -246 -278 -246z" />
-<glyph unicode="&#x1eb4;" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM617 1579q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5t134.5 37.5t61.5 124.5h80q-30 -246 -278 -246zM758 1925q-39 0 -74.5 20 t-67.5 43.5t-61 43.5t-55 20q-80 0 -105 -129h-73q14 97 60 154t124 57q39 0 73.5 -19.5t66 -43t60.5 -43t58 -19.5q45 0 66 35t32 92h76q-11 -101 -58.5 -156t-121.5 -55z" />
-<glyph unicode="&#x1eb5;" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM551 1241q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5t134.5 37.5t61.5 124.5h80q-30 -246 -278 -246zM692 1587q-39 0 -74.5 20t-67.5 43.5t-61 43.5t-55 20q-80 0 -105 -129h-73 q14 97 60 154t124 57q39 0 73.5 -19.5t66 -43t60.5 -43t58 -19.5q45 0 66 35t32 92h76q-11 -101 -58.5 -156t-121.5 -55z" />
-<glyph unicode="&#x1eb6;" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM617 1579q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5t134.5 37.5t61.5 124.5h80q-30 -246 -278 -246zM548 -227q0 96 64 96 q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-64 0 -64 97z" />
-<glyph unicode="&#x1eb7;" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM552 1241q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5t134.5 37.5t61.5 124.5h80q-30 -246 -278 -246zM448 -227q0 96 64 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26 q-64 0 -64 97z" />
-<glyph unicode="&#x1eb8;" horiz-adv-x="1130" d="M207 0zM1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94zM544 -227q0 96 64 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-64 0 -64 97z" />
-<glyph unicode="&#x1eb9;" horiz-adv-x="1124" d="M119 0zM621 -20q-237 0 -369.5 146t-132.5 409q0 260 128 416.5t345 156.5q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5zM592 1020q-157 0 -252 -103.5t-111 -298.5h672q0 189 -82 295.5 t-227 106.5zM512 -227q0 96 64 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-64 0 -64 97z" />
-<glyph unicode="&#x1eba;" horiz-adv-x="1130" d="M207 0zM1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94zM798 1843q0 -140 -168 -176l-10 -121h-80l-10 178q89 15 129.5 43t40.5 72q0 48 -33.5 72t-111.5 24q-48 0 -93 -8v78q52 12 107 12q108 0 168.5 -45.5t60.5 -128.5z" />
-<glyph unicode="&#x1ebb;" horiz-adv-x="1124" d="M119 0zM621 -20q-237 0 -369.5 146t-132.5 409q0 260 128 416.5t345 156.5q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5zM592 1020q-157 0 -252 -103.5t-111 -298.5h672q0 189 -82 295.5 t-227 106.5zM786 1505q0 -140 -168 -176l-10 -121h-80l-10 178q89 15 129.5 43t40.5 72q0 48 -33.5 72t-111.5 24q-48 0 -93 -8v78q52 12 107 12q108 0 168.5 -45.5t60.5 -128.5z" />
-<glyph unicode="&#x1ebc;" horiz-adv-x="1130" d="M207 0zM1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94zM754 1581q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73q10 111 63 174.5t137 63.5q48 0 88 -25t82 -59q34 -28 66 -50t61 -22q46 0 77 36.5t48 119.5h76 q-16 -116 -69 -177t-132 -61z" />
-<glyph unicode="&#x1ebd;" horiz-adv-x="1124" d="M119 0zM621 -20q-237 0 -369.5 146t-132.5 409q0 260 128 416.5t345 156.5q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5zM592 1020q-157 0 -252 -103.5t-111 -298.5h672q0 189 -82 295.5 t-227 106.5zM738 1243q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73q10 111 63 174.5t137 63.5q48 0 88 -25t82 -59q34 -28 66 -50t61 -22q46 0 77 36.5t48 119.5h76q-16 -116 -69 -177t-132 -61z" />
-<glyph unicode="&#x1ebe;" horiz-adv-x="1130" d="M207 0zM1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94zM659 1856q101 -135 229 -261v-16h-67q-128 93 -217 176q-89 -83 -217 -176h-68v16q141 136 234 261h106zM809 1790q42 54 65.5 90t69.5 121h125v-16q-90 -121 -193 -211h-67v16z" />
-<glyph unicode="&#x1ebf;" horiz-adv-x="1124" d="M119 0zM621 -20q-237 0 -369.5 146t-132.5 409q0 260 128 416.5t345 156.5q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5zM592 1020q-157 0 -252 -103.5t-111 -298.5h672q0 189 -82 295.5 t-227 106.5zM623 1518q101 -135 229 -261v-16h-67q-128 93 -217 176q-89 -83 -217 -176h-68v16q141 136 234 261h106zM773 1452q42 54 65.5 90t69.5 121h125v-16q-90 -121 -193 -211h-67v16z" />
-<glyph unicode="&#x1ec0;" horiz-adv-x="1130" d="M145 0zM1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94zM661 1856q101 -135 229 -261v-16h-67q-128 93 -217 176q-89 -83 -217 -176h-68v16q141 136 234 261h106zM405 1774h-67q-115 100 -193 211v16h125q47 -86 69 -119.5t66 -91.5v-16z" />
-<glyph unicode="&#x1ec1;" horiz-adv-x="1124" d="M107 0zM621 -20q-237 0 -369.5 146t-132.5 409q0 260 128 416.5t345 156.5q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5zM592 1020q-157 0 -252 -103.5t-111 -298.5h672q0 189 -82 295.5 t-227 106.5zM623 1518q101 -135 229 -261v-16h-67q-128 93 -217 176q-89 -83 -217 -176h-68v16q141 136 234 261h106zM367 1436h-67q-115 100 -193 211v16h125q47 -86 69 -119.5t66 -91.5v-16z" />
-<glyph unicode="&#x1ec2;" horiz-adv-x="1130" d="M207 0zM1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94zM1073 1987q0 -107 -131 -136l-4 -81h-68l-10 131q63 11 94 28t31 56q0 37 -29 50t-76 13q-31 0 -71 -6v72q34 8 86 8q84 0 131 -36t47 -99zM661 1856q101 -135 229 -261v-16h-67q-128 93 -217 176 q-89 -83 -217 -176h-68v16q141 136 234 261h106z" />
-<glyph unicode="&#x1ec3;" horiz-adv-x="1124" d="M119 0zM621 -20q-237 0 -369.5 146t-132.5 409q0 260 128 416.5t345 156.5q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5zM592 1020q-157 0 -252 -103.5t-111 -298.5h672q0 189 -82 295.5 t-227 106.5zM1035 1649q0 -107 -131 -136l-4 -81h-68l-10 131q63 11 94 28t31 56q0 37 -29 50t-76 13q-31 0 -71 -6v72q34 8 86 8q84 0 131 -36t47 -99zM623 1518q101 -135 229 -261v-16h-67q-128 93 -217 176q-89 -83 -217 -176h-68v16q141 136 234 261h106z" />
-<glyph unicode="&#x1ec4;" horiz-adv-x="1130" d="M207 0zM1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94zM741 1935q-39 0 -74.5 20t-67.5 43.5t-61 43.5t-55 20q-80 0 -105 -129h-73q14 97 60 154t124 57q39 0 73.5 -19.5t66 -43t60.5 -43t58 -19.5q75 0 98 127h76q-11 -101 -58.5 -156t-121.5 -55z M661 1856q101 -135 229 -261v-16h-67q-128 93 -217 176q-89 -83 -217 -176h-68v16q141 136 234 261h106z" />
-<glyph unicode="&#x1ec5;" horiz-adv-x="1124" d="M119 0zM621 -20q-237 0 -369.5 146t-132.5 409q0 260 128 416.5t345 156.5q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5zM592 1020q-157 0 -252 -103.5t-111 -298.5h672q0 189 -82 295.5 t-227 106.5zM713 1597q-39 0 -74.5 20t-67.5 43.5t-61 43.5t-55 20q-80 0 -105 -129h-73q14 97 60 154t124 57q39 0 73.5 -19.5t66 -43t60.5 -43t58 -19.5q75 0 98 127h76q-11 -101 -58.5 -156t-121.5 -55zM633 1518q101 -135 229 -261v-16h-67q-128 93 -217 176 q-89 -83 -217 -176h-68v16q141 136 234 261h106z" />
-<glyph unicode="&#x1ec6;" horiz-adv-x="1130" d="M207 0zM1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94zM544 -227q0 96 64 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-64 0 -64 97zM315 1595q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207 q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#x1ec7;" horiz-adv-x="1124" d="M119 0zM621 -20q-237 0 -369.5 146t-132.5 409q0 260 128 416.5t345 156.5q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5zM592 1020q-157 0 -252 -103.5t-111 -298.5h672q0 189 -82 295.5 t-227 106.5zM290 1257q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16zM512 -227q0 96 64 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-64 0 -64 97z" />
-<glyph unicode="&#x1ec8;" horiz-adv-x="516" d="M133 0zM207 0v1462h102v-1462h-102zM469 1843q0 -140 -168 -176l-10 -121h-80l-10 178q89 15 129.5 43t40.5 72q0 48 -33.5 72t-111.5 24q-48 0 -93 -8v78q52 12 107 12q108 0 168.5 -45.5t60.5 -128.5z" />
-<glyph unicode="&#x1ec9;" horiz-adv-x="463" d="M112 0zM281 0h-99v1087h99v-1087zM448 1505q0 -140 -168 -176l-10 -121h-80l-10 178q89 15 129.5 43t40.5 72q0 48 -33.5 72t-111.5 24q-48 0 -93 -8v78q52 12 107 12q108 0 168.5 -45.5t60.5 -128.5z" />
-<glyph unicode="&#x1eca;" horiz-adv-x="516" d="M192 0zM207 0v1462h102v-1462h-102zM192 -227q0 96 64 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-64 0 -64 97z" />
-<glyph unicode="&#x1ecb;" horiz-adv-x="463" d="M165 0zM281 0h-99v1087h99v-1087zM168 1389q0 96 63 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-63 0 -63 97zM165 -227q0 96 64 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-64 0 -64 97z" />
-<glyph unicode="&#x1ecc;" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170 t-141.5 -483zM716 -227q0 96 64 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-64 0 -64 97z" />
-<glyph unicode="&#x1ecd;" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5 t-97.5 -349.5zM534 -227q0 96 64 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-64 0 -64 97z" />
-<glyph unicode="&#x1ece;" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170 t-141.5 -483zM974 1843q0 -140 -168 -176l-10 -121h-80l-10 178q89 15 129.5 43t40.5 72q0 48 -33.5 72t-111.5 24q-48 0 -93 -8v78q52 12 107 12q108 0 168.5 -45.5t60.5 -128.5z" />
-<glyph unicode="&#x1ecf;" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5 t-97.5 -349.5zM792 1505q0 -140 -168 -176l-10 -121h-80l-10 178q89 15 129.5 43t40.5 72q0 48 -33.5 72t-111.5 24q-48 0 -93 -8v78q52 12 107 12q108 0 168.5 -45.5t60.5 -128.5z" />
-<glyph unicode="&#x1ed0;" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170 t-141.5 -483zM838 1856q101 -135 229 -261v-16h-67q-128 93 -217 176q-89 -83 -217 -176h-68v16q141 136 234 261h106zM988 1790q42 54 65.5 90t69.5 121h125v-16q-90 -121 -193 -211h-67v16z" />
-<glyph unicode="&#x1ed1;" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5 t-97.5 -349.5zM655 1518q101 -135 229 -261v-16h-67q-128 93 -217 176q-89 -83 -217 -176h-68v16q141 136 234 261h106zM805 1452q42 54 65.5 90t69.5 121h125v-16q-90 -121 -193 -211h-67v16z" />
-<glyph unicode="&#x1ed2;" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170 t-141.5 -483zM838 1856q101 -135 229 -261v-16h-67q-128 93 -217 176q-89 -83 -217 -176h-68v16q141 136 234 261h106zM582 1774h-67q-115 100 -193 211v16h125q47 -86 69 -119.5t66 -91.5v-16z" />
-<glyph unicode="&#x1ed3;" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5 t-97.5 -349.5zM655 1518q101 -135 229 -261v-16h-67q-128 93 -217 176q-89 -83 -217 -176h-68v16q141 136 234 261h106zM399 1436h-67q-115 100 -193 211v16h125q47 -86 69 -119.5t66 -91.5v-16z" />
-<glyph unicode="&#x1ed4;" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170 t-141.5 -483zM1250 1987q0 -107 -131 -136l-4 -81h-68l-10 131q63 11 94 28t31 56q0 37 -29 50t-76 13q-31 0 -71 -6v72q34 8 86 8q84 0 131 -36t47 -99zM838 1856q101 -135 229 -261v-16h-67q-128 93 -217 176q-89 -83 -217 -176h-68v16q141 136 234 261h106z" />
-<glyph unicode="&#x1ed5;" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5 t-97.5 -349.5zM1067 1649q0 -107 -131 -136l-4 -81h-68l-10 131q63 11 94 28t31 56q0 37 -29 50t-76 13q-31 0 -71 -6v72q34 8 86 8q84 0 131 -36t47 -99zM655 1518q101 -135 229 -261v-16h-67q-128 93 -217 176q-89 -83 -217 -176h-68v16q141 136 234 261h106z" />
-<glyph unicode="&#x1ed6;" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170 t-141.5 -483zM918 1935q-39 0 -74.5 20t-67.5 43.5t-61 43.5t-55 20q-80 0 -105 -129h-73q14 97 60 154t124 57q39 0 73.5 -19.5t66 -43t60.5 -43t58 -19.5q75 0 98 127h76q-11 -101 -58.5 -156t-121.5 -55zM838 1856q101 -135 229 -261v-16h-67q-128 93 -217 176 q-89 -83 -217 -176h-68v16q141 136 234 261h106z" />
-<glyph unicode="&#x1ed7;" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5 t-97.5 -349.5zM735 1597q-39 0 -74.5 20t-67.5 43.5t-61 43.5t-55 20q-80 0 -105 -129h-73q14 97 60 154t124 57q39 0 73.5 -19.5t66 -43t60.5 -43t58 -19.5q75 0 98 127h76q-11 -101 -58.5 -156t-121.5 -55zM655 1518q101 -135 229 -261v-16h-67q-128 93 -217 176 q-89 -83 -217 -176h-68v16q141 136 234 261h106z" />
-<glyph unicode="&#x1ed8;" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170 t-141.5 -483zM716 -227q0 96 64 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-64 0 -64 97zM492 1595q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#x1ed9;" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5 t-97.5 -349.5zM534 -227q0 96 64 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-64 0 -64 97zM309 1257q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
-<glyph unicode="&#x1eda;" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q330 0 500 -230q81 21 120.5 92t39.5 209h104l13 -18q-10 -147 -67.5 -232t-164.5 -120q107 -182 107 -453zM240 733q0 -314 140 -485.5t402 -171.5 q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170t-141.5 -483zM686 1595q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x1edb;" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q219 0 348 -147q72 24 107.5 92t38.5 202h100l12 -18q-11 -144 -62 -225t-147 -119q82 -137 82 -348zM223 545q0 -224 98.5 -349.5t278.5 -125.5 t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5t-97.5 -349.5zM499 1257q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x1edc;" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q330 0 500 -230q81 21 120.5 92t39.5 209h104l13 -18q-10 -147 -67.5 -232t-164.5 -120q107 -182 107 -453zM240 733q0 -314 140 -485.5t402 -171.5 q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170t-141.5 -483zM885 1579h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
-<glyph unicode="&#x1edd;" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q219 0 348 -147q72 24 107.5 92t38.5 202h100l12 -18q-11 -144 -62 -225t-147 -119q82 -137 82 -348zM223 545q0 -224 98.5 -349.5t278.5 -125.5 t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5t-97.5 -349.5zM718 1241h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
-<glyph unicode="&#x1ede;" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q330 0 500 -230q81 21 120.5 92t39.5 209h104l13 -18q-10 -147 -67.5 -232t-164.5 -120q107 -182 107 -453zM240 733q0 -314 140 -485.5t402 -171.5 q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170t-141.5 -483zM974 1843q0 -140 -168 -176l-10 -121h-80l-10 178q89 15 129.5 43t40.5 72q0 48 -33.5 72t-111.5 24q-48 0 -93 -8v78q52 12 107 12q108 0 168.5 -45.5t60.5 -128.5z" />
-<glyph unicode="&#x1edf;" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q219 0 348 -147q72 24 107.5 92t38.5 202h100l12 -18q-11 -144 -62 -225t-147 -119q82 -137 82 -348zM223 545q0 -224 98.5 -349.5t278.5 -125.5 t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5t-97.5 -349.5zM792 1505q0 -140 -168 -176l-10 -121h-80l-10 178q89 15 129.5 43t40.5 72q0 48 -33.5 72t-111.5 24q-48 0 -93 -8v78q52 12 107 12q108 0 168.5 -45.5t60.5 -128.5z" />
-<glyph unicode="&#x1ee0;" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q330 0 500 -230q81 21 120.5 92t39.5 209h104l13 -18q-10 -147 -67.5 -232t-164.5 -120q107 -182 107 -453zM240 733q0 -314 140 -485.5t402 -171.5 q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170t-141.5 -483zM940 1581q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73q10 111 63 174.5t137 63.5q48 0 88 -25t82 -59q34 -28 66 -50t61 -22 q46 0 77 36.5t48 119.5h76q-16 -116 -69 -177t-132 -61z" />
-<glyph unicode="&#x1ee1;" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q219 0 348 -147q72 24 107.5 92t38.5 202h100l12 -18q-11 -144 -62 -225t-147 -119q82 -137 82 -348zM223 545q0 -224 98.5 -349.5t278.5 -125.5 t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5t-97.5 -349.5zM761 1243q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73q10 111 63 174.5t137 63.5q48 0 88 -25t82 -59q34 -28 66 -50t61 -22q46 0 77 36.5 t48 119.5h76q-16 -116 -69 -177t-132 -61z" />
-<glyph unicode="&#x1ee2;" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q330 0 500 -230q81 21 120.5 92t39.5 209h104l13 -18q-10 -147 -67.5 -232t-164.5 -120q107 -182 107 -453zM240 733q0 -314 140 -485.5t402 -171.5 q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170t-141.5 -483zM716 -227q0 96 64 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-64 0 -64 97z" />
-<glyph unicode="&#x1ee3;" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q219 0 348 -147q72 24 107.5 92t38.5 202h100l12 -18q-11 -144 -62 -225t-147 -119q82 -137 82 -348zM223 545q0 -224 98.5 -349.5t278.5 -125.5 t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5t-97.5 -349.5zM534 -227q0 96 64 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-64 0 -64 97z" />
-<glyph unicode="&#x1ee4;" horiz-adv-x="1473" d="M190 0zM1282 1462v-946q0 -252 -146 -394t-407 -142q-254 0 -396.5 142.5t-142.5 397.5v942h103v-946q0 -211 117 -328.5t331 -117.5q209 0 324 115.5t115 320.5v956h102zM669 -227q0 96 64 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-64 0 -64 97z" />
-<glyph unicode="&#x1ee5;" horiz-adv-x="1208" d="M170 0zM268 1087v-704q0 -164 69 -238.5t214 -74.5q194 0 285.5 98t91.5 319v600h98v-1087h-84l-18 150h-6q-106 -170 -377 -170q-371 0 -371 397v710h98zM526 -227q0 96 64 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-64 0 -64 97z" />
-<glyph unicode="&#x1ee6;" horiz-adv-x="1473" d="M190 0zM1282 1462v-946q0 -252 -146 -394t-407 -142q-254 0 -396.5 142.5t-142.5 397.5v942h103v-946q0 -211 117 -328.5t331 -117.5q209 0 324 115.5t115 320.5v956h102zM923 1843q0 -140 -168 -176l-10 -121h-80l-10 178q89 15 129.5 43t40.5 72q0 48 -33.5 72 t-111.5 24q-48 0 -93 -8v78q52 12 107 12q108 0 168.5 -45.5t60.5 -128.5z" />
-<glyph unicode="&#x1ee7;" horiz-adv-x="1208" d="M170 0zM268 1087v-704q0 -164 69 -238.5t214 -74.5q194 0 285.5 98t91.5 319v600h98v-1087h-84l-18 150h-6q-106 -170 -377 -170q-371 0 -371 397v710h98zM802 1505q0 -140 -168 -176l-10 -121h-80l-10 178q89 15 129.5 43t40.5 72q0 48 -33.5 72t-111.5 24q-48 0 -93 -8 v78q52 12 107 12q108 0 168.5 -45.5t60.5 -128.5z" />
-<glyph unicode="&#x1ee8;" horiz-adv-x="1497" d="M190 0zM1282 1462v-207q89 19 130.5 89t41.5 212h105l12 -18q-12 -167 -85.5 -254.5t-203.5 -112.5v-655q0 -252 -146 -394t-407 -142q-254 0 -396.5 142.5t-142.5 397.5v942h103v-946q0 -211 117 -328.5t331 -117.5q209 0 324 115.5t115 320.5v956h102zM633 1595 q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x1ee9;" horiz-adv-x="1262" d="M170 0zM268 1087v-704q0 -164 72.5 -238.5t224.5 -74.5q189 0 276 99t87 318v600h98v-122q66 11 104.5 44t55 90t16.5 167h101l12 -19q-9 -123 -41 -190t-91.5 -113t-156.5 -63v-881h-84l-18 150h-6q-52 -82 -143.5 -126t-209.5 -44q-201 0 -298 98t-97 299v710h98z M495 1257q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph unicode="&#x1eea;" horiz-adv-x="1497" d="M190 0zM1282 1462v-207q89 19 130.5 89t41.5 212h105l12 -18q-12 -167 -85.5 -254.5t-203.5 -112.5v-655q0 -252 -146 -394t-407 -142q-254 0 -396.5 142.5t-142.5 397.5v942h103v-946q0 -211 117 -328.5t331 -117.5q209 0 324 115.5t115 320.5v956h102zM833 1579h-69 q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
-<glyph unicode="&#x1eeb;" horiz-adv-x="1262" d="M170 0zM268 1087v-704q0 -164 72.5 -238.5t224.5 -74.5q189 0 276 99t87 318v600h98v-122q66 11 104.5 44t55 90t16.5 167h101l12 -19q-9 -123 -41 -190t-91.5 -113t-156.5 -63v-881h-84l-18 150h-6q-52 -82 -143.5 -126t-209.5 -44q-201 0 -298 98t-97 299v710h98z M687 1241h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
-<glyph unicode="&#x1eec;" horiz-adv-x="1497" d="M190 0zM1282 1462v-207q89 19 130.5 89t41.5 212h105l12 -18q-12 -167 -85.5 -254.5t-203.5 -112.5v-655q0 -252 -146 -394t-407 -142q-254 0 -396.5 142.5t-142.5 397.5v942h103v-946q0 -211 117 -328.5t331 -117.5q209 0 324 115.5t115 320.5v956h102zM923 1843 q0 -140 -168 -176l-10 -121h-80l-10 178q89 15 129.5 43t40.5 72q0 48 -33.5 72t-111.5 24q-48 0 -93 -8v78q52 12 107 12q108 0 168.5 -45.5t60.5 -128.5z" />
-<glyph unicode="&#x1eed;" horiz-adv-x="1262" d="M170 0zM268 1087v-704q0 -164 72.5 -238.5t224.5 -74.5q189 0 276 99t87 318v600h98v-122q66 11 104.5 44t55 90t16.5 167h101l12 -19q-9 -123 -41 -190t-91.5 -113t-156.5 -63v-881h-84l-18 150h-6q-52 -82 -143.5 -126t-209.5 -44q-201 0 -298 98t-97 299v710h98z M802 1505q0 -140 -168 -176l-10 -121h-80l-10 178q89 15 129.5 43t40.5 72q0 48 -33.5 72t-111.5 24q-48 0 -93 -8v78q52 12 107 12q108 0 168.5 -45.5t60.5 -128.5z" />
-<glyph unicode="&#x1eee;" horiz-adv-x="1497" d="M190 0zM1282 1462v-207q89 19 130.5 89t41.5 212h105l12 -18q-12 -167 -85.5 -254.5t-203.5 -112.5v-655q0 -252 -146 -394t-407 -142q-254 0 -396.5 142.5t-142.5 397.5v942h103v-946q0 -211 117 -328.5t331 -117.5q209 0 324 115.5t115 320.5v956h102zM893 1581 q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73q10 111 63 174.5t137 63.5q48 0 88 -25t82 -59q34 -28 66 -50t61 -22q46 0 77 36.5t48 119.5h76q-16 -116 -69 -177t-132 -61z" />
-<glyph unicode="&#x1eef;" horiz-adv-x="1262" d="M170 0zM268 1087v-704q0 -164 72.5 -238.5t224.5 -74.5q189 0 276 99t87 318v600h98v-122q66 11 104.5 44t55 90t16.5 167h101l12 -19q-9 -123 -41 -190t-91.5 -113t-156.5 -63v-881h-84l-18 150h-6q-52 -82 -143.5 -126t-209.5 -44q-201 0 -298 98t-97 299v710h98z M765 1243q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73q10 111 63 174.5t137 63.5q48 0 88 -25t82 -59q34 -28 66 -50t61 -22q46 0 77 36.5t48 119.5h76q-16 -116 -69 -177t-132 -61z" />
-<glyph unicode="&#x1ef0;" horiz-adv-x="1497" d="M190 0zM1282 1462v-207q89 19 130.5 89t41.5 212h105l12 -18q-12 -167 -85.5 -254.5t-203.5 -112.5v-655q0 -252 -146 -394t-407 -142q-254 0 -396.5 142.5t-142.5 397.5v942h103v-946q0 -211 117 -328.5t331 -117.5q209 0 324 115.5t115 320.5v956h102zM669 -227 q0 96 64 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-64 0 -64 97z" />
-<glyph unicode="&#x1ef1;" horiz-adv-x="1262" d="M170 0zM268 1087v-704q0 -164 72.5 -238.5t224.5 -74.5q189 0 276 99t87 318v600h98v-122q66 11 104.5 44t55 90t16.5 167h101l12 -19q-9 -123 -41 -190t-91.5 -113t-156.5 -63v-881h-84l-18 150h-6q-52 -82 -143.5 -126t-209.5 -44q-201 0 -298 98t-97 299v710h98z M526 -227q0 96 64 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-64 0 -64 97z" />
-<glyph unicode="&#x1ef2;" horiz-adv-x="1081" d="M0 0zM543 662l428 800h110l-487 -897v-565h-105v557l-489 905h117zM646 1579h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
-<glyph unicode="&#x1ef3;" horiz-adv-x="940" d="M0 0zM0 1087h102l230 -610q105 -281 133 -379h6q42 129 137 385l230 604h102l-487 -1263q-59 -154 -99 -208t-93.5 -81t-129.5 -27q-57 0 -127 21v86q58 -16 125 -16q51 0 90 24t70.5 74.5t73 160t53.5 142.5zM564 1241h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142 q26 -48 98.5 -142t142.5 -170v-16z" />
-<glyph unicode="&#x1ef4;" horiz-adv-x="1081" d="M0 0zM543 662l428 800h110l-487 -897v-565h-105v557l-489 905h117zM475 -227q0 96 64 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-64 0 -64 97z" />
-<glyph unicode="&#x1ef5;" horiz-adv-x="940" d="M0 0zM0 1087h102l230 -610q105 -281 133 -379h6q42 129 137 385l230 604h102l-487 -1263q-59 -154 -99 -208t-93.5 -81t-129.5 -27q-57 0 -127 21v86q58 -16 125 -16q51 0 90 24t70.5 74.5t73 160t53.5 142.5zM702 -244q0 96 64 96q31 0 48.5 -25t17.5 -71 q0 -45 -17.5 -71t-48.5 -26q-64 0 -64 97z" />
-<glyph unicode="&#x1ef6;" horiz-adv-x="1081" d="M0 0zM543 662l428 800h110l-487 -897v-565h-105v557l-489 905h117zM745 1843q0 -140 -168 -176l-10 -121h-80l-10 178q89 15 129.5 43t40.5 72q0 48 -33.5 72t-111.5 24q-48 0 -93 -8v78q52 12 107 12q108 0 168.5 -45.5t60.5 -128.5z" />
-<glyph unicode="&#x1ef7;" horiz-adv-x="940" d="M0 0zM0 1087h102l230 -610q105 -281 133 -379h6q42 129 137 385l230 604h102l-487 -1263q-59 -154 -99 -208t-93.5 -81t-129.5 -27q-57 0 -127 21v86q58 -16 125 -16q51 0 90 24t70.5 74.5t73 160t53.5 142.5zM661 1505q0 -140 -168 -176l-10 -121h-80l-10 178 q89 15 129.5 43t40.5 72q0 48 -33.5 72t-111.5 24q-48 0 -93 -8v78q52 12 107 12q108 0 168.5 -45.5t60.5 -128.5z" />
-<glyph unicode="&#x1ef8;" horiz-adv-x="1081" d="M0 0zM543 662l428 800h110l-487 -897v-565h-105v557l-489 905h117zM701 1581q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73q10 111 63 174.5t137 63.5q48 0 88 -25t82 -59q34 -28 66 -50t61 -22q46 0 77 36.5t48 119.5h76 q-16 -116 -69 -177t-132 -61z" />
-<glyph unicode="&#x1ef9;" horiz-adv-x="940" d="M0 0zM0 1087h102l230 -610q105 -281 133 -379h6q42 129 137 385l230 604h102l-487 -1263q-59 -154 -99 -208t-93.5 -81t-129.5 -27q-57 0 -127 21v86q58 -16 125 -16q51 0 90 24t70.5 74.5t73 160t53.5 142.5zM629 1243q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46 t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73q10 111 63 174.5t137 63.5q48 0 88 -25t82 -59q34 -28 66 -50t61 -22q46 0 77 36.5t48 119.5h76q-16 -116 -69 -177t-132 -61z" />
-<glyph unicode="&#x1f4d;" horiz-adv-x="1632" d="M7 1151q87 179 123 311h115v-18q-31 -67 -84 -155t-102 -154h-52v16zM-259 1255q0 84 51.5 135t153.5 80v-55q-127 -38 -127 -106q0 -24 14.5 -35t32.5 -20t32.5 -21t14.5 -37q0 -31 -20 -49.5t-52 -18.5q-46 0 -73 35t-27 92zM1504 733q0 -348 -174 -550.5t-480 -202.5 q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM308 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170t-141.5 -483z" />
-<glyph unicode="&#x1fde;" horiz-adv-x="819" d="M440 1151q87 179 123 311h115v-18q-31 -67 -84 -155t-102 -154h-52v16zM174 1255q0 84 51.5 135t153.5 80v-55q-127 -38 -127 -106q0 -24 14.5 -35t32.5 -20t32.5 -21t14.5 -37q0 -31 -20 -49.5t-52 -18.5q-46 0 -73 35t-27 92z" />
-<glyph unicode="&#x2000;" horiz-adv-x="1024" />
-<glyph unicode="&#x2001;" horiz-adv-x="2048" />
-<glyph unicode="&#x2002;" horiz-adv-x="1024" />
-<glyph unicode="&#x2003;" horiz-adv-x="2048" />
-<glyph unicode="&#x2004;" horiz-adv-x="682" />
-<glyph unicode="&#x2005;" horiz-adv-x="512" />
-<glyph unicode="&#x2006;" horiz-adv-x="342" />
-<glyph unicode="&#x2007;" horiz-adv-x="1145" />
-<glyph unicode="&#x2008;" horiz-adv-x="530" />
-<glyph unicode="&#x2009;" horiz-adv-x="410" />
-<glyph unicode="&#x200a;" horiz-adv-x="205" />
-<glyph unicode="&#x200b;" horiz-adv-x="0" />
-<glyph unicode="&#x2010;" horiz-adv-x="659" d="M92 512v82h475v-82h-475z" />
-<glyph unicode="&#x2011;" horiz-adv-x="659" d="M92 512v82h475v-82h-475z" />
-<glyph unicode="&#x2012;" horiz-adv-x="659" d="M92 512v82h475v-82h-475z" />
-<glyph unicode="&#x2013;" horiz-adv-x="1024" d="M82 512v82h860v-82h-860z" />
-<glyph unicode="&#x2014;" horiz-adv-x="2048" d="M82 512v82h1884v-82h-1884z" />
-<glyph unicode="&#x2015;" horiz-adv-x="2048" d="M82 512zM82 512v82h1884v-82h-1884z" />
-<glyph unicode="&#x2017;" horiz-adv-x="842" d="M0 -45zM846 -127h-850v82h850v-82zM846 -404h-850v82h850v-82z" />
-<glyph unicode="&#x2018;" horiz-adv-x="297" d="M41 961l-12 20q32 112 81.5 251t92.5 230h65q-30 -101 -64.5 -257t-45.5 -244h-117z" />
-<glyph unicode="&#x2019;" horiz-adv-x="297" d="M256 1462l12 -20q-75 -265 -174 -481h-65q29 96 61 241.5t49 259.5h117z" />
-<glyph unicode="&#x201a;" horiz-adv-x="451" d="M68 0zM295 238l12 -20q-75 -265 -174 -481h-65q29 96 61 241.5t49 259.5h117z" />
-<glyph unicode="&#x201b;" horiz-adv-x="297" d="M158 1462q11 -87 45.5 -243t64.5 -258h-65q-40 84 -89.5 220.5t-84.5 260.5l12 20h117z" />
-<glyph unicode="&#x201c;" horiz-adv-x="614" d="M358 961l-12 20q34 120 83 255t91 226h66q-30 -98 -63 -248.5t-48 -252.5h-117zM41 961l-12 20q32 112 81.5 251t92.5 230h65q-30 -101 -64.5 -257t-45.5 -244h-117z" />
-<glyph unicode="&#x201d;" horiz-adv-x="614" d="M256 1462l12 -20q-75 -265 -174 -481h-65q29 96 61 241.5t49 259.5h117zM573 1462l13 -20q-36 -128 -85 -261t-89 -220h-66q30 98 63 248.5t48 252.5h116z" />
-<glyph unicode="&#x201e;" horiz-adv-x="768" d="M68 0zM295 238l12 -20q-75 -265 -174 -481h-65q29 96 61 241.5t49 259.5h117zM612 238l13 -20q-36 -128 -85 -261t-89 -220h-66q30 98 63 248.5t48 252.5h116z" />
-<glyph unicode="&#x2020;" horiz-adv-x="1006" d="M883 1055l-359 20l27 -1075h-117l27 1075l-338 -20v112l338 -28l-27 417h117l-27 -417l359 28v-112z" />
-<glyph unicode="&#x2021;" horiz-adv-x="1006" d="M524 461l359 24v-112l-359 24l27 -397h-117l27 397l-338 -24v112l338 -24l-17 325l17 293l-338 -24v112l338 -24l-27 413h117l-27 -413l359 24v-112l-359 24l17 -293z" />
-<glyph unicode="&#x2022;" horiz-adv-x="770" d="M231 748q0 89 40.5 134.5t113.5 45.5t113.5 -47t40.5 -133q0 -85 -41 -133t-113 -48t-113 47t-41 134z" />
-<glyph unicode="&#x2026;" horiz-adv-x="1466" d="M162 0zM162 78q0 98 80 98q82 0 82 -98t-82 -98q-80 0 -80 98zM651 78q0 98 80 98q82 0 82 -98t-82 -98q-80 0 -80 98zM1141 78q0 98 80 98q82 0 82 -98t-82 -98q-80 0 -80 98z" />
-<glyph unicode="&#x202f;" horiz-adv-x="429" />
-<glyph unicode="&#x2030;" horiz-adv-x="2331" d="M211 1026q0 -186 45 -279.5t141 -93.5q193 0 193 373q0 184 -49.5 276.5t-143.5 92.5q-96 0 -141 -92.5t-45 -276.5zM688 1026q0 -226 -75 -343.5t-216 -117.5q-133 0 -208.5 120.5t-75.5 340.5q0 223 72 340t212 117q139 0 215 -120.5t76 -336.5zM1063 438 q0 -185 45 -277.5t141 -92.5q193 0 193 370q0 369 -193 369q-96 0 -141 -91.5t-45 -277.5zM1540 438q0 -226 -74 -343.5t-215 -117.5q-136 0 -211 121.5t-75 339.5q0 225 73.5 341t212.5 116q137 0 213 -120t76 -337zM1280 1462l-811 -1462h-96l811 1462h96zM1741 438 q0 -185 45 -277.5t141 -92.5q193 0 193 370q0 369 -193 369q-96 0 -141 -91.5t-45 -277.5zM2218 438q0 -226 -74 -343.5t-215 -117.5q-135 0 -211 120.5t-76 340.5q0 225 73.5 341t213.5 116q137 0 213 -120t76 -337z" />
-<glyph unicode="&#x2032;" horiz-adv-x="393" d="M133 934zM260 1462l-33 -528h-61l-33 528h127z" />
-<glyph unicode="&#x2033;" horiz-adv-x="723" d="M133 934zM260 1462l-33 -528h-61l-33 528h127zM590 1462l-33 -528h-61l-33 528h127z" />
-<glyph unicode="&#x2039;" horiz-adv-x="524" d="M82 543l309 393l62 -43l-254 -363l254 -362l-62 -43l-309 391v27z" />
-<glyph unicode="&#x203a;" horiz-adv-x="524" d="M442 518l-309 -393l-61 43l254 362l-254 363l61 43l309 -391v-27z" />
-<glyph unicode="&#x203c;" horiz-adv-x="918" d="M164 0zM276 377h-61l-29 1085h119zM164 78q0 98 80 98q82 0 82 -98t-82 -98q-80 0 -80 98zM702 377h-61l-29 1085h119zM590 78q0 98 80 98q82 0 82 -98t-82 -98q-80 0 -80 98z" />
-<glyph unicode="&#x2044;" horiz-adv-x="246" d="M573 1462l-811 -1462h-94l811 1462h94z" />
-<glyph unicode="&#x205f;" horiz-adv-x="536" />
-<glyph unicode="&#x2070;" horiz-adv-x="688" d="M147 1028q0 -190 45.5 -281.5t151.5 -91.5q104 0 150.5 91t46.5 282q0 187 -46.5 278t-150.5 91q-106 0 -151.5 -91t-45.5 -278zM639 1026q0 -230 -72.5 -343.5t-220.5 -113.5q-154 0 -225.5 112.5t-71.5 344.5q0 457 297 457q149 0 221 -112t72 -345z" />
-<glyph unicode="&#x2074;" horiz-adv-x="688" d="M657 827h-129v-241h-90v241h-413v60l407 581h96v-563h129v-78zM438 905v221q0 132 8 232q-6 -12 -21.5 -35.5t-295.5 -417.5h309z" />
-<glyph unicode="&#x2075;" horiz-adv-x="688" d="M324 1122q145 0 229 -71.5t84 -194.5q0 -132 -87 -209.5t-239 -77.5q-65 0 -133 16t-110 42v94q120 -66 245 -66q107 0 166.5 51.5t59.5 147.5q0 85 -58.5 133.5t-171.5 48.5q-74 0 -162 -24l-51 39l31 411h475v-88h-389l-18 -266q56 14 129 14z" />
-<glyph unicode="&#x2076;" horiz-adv-x="688" d="M647 874q0 -131 -83.5 -218t-211.5 -87q-142 0 -225.5 92.5t-83.5 251.5q0 211 125 353t379 221l35 -80q-194 -57 -298 -145.5t-139 -223.5h7q89 113 227 113q119 0 193.5 -75.5t74.5 -201.5zM352 655q88 0 142.5 61t54.5 156q0 91 -50 142t-141 51q-92 0 -153.5 -50.5 t-61.5 -125.5q0 -109 58 -171.5t151 -62.5z" />
-<glyph unicode="&#x2077;" horiz-adv-x="688" d="M164 586l364 788h-467v88h576v-67l-363 -809h-110z" />
-<glyph unicode="&#x2078;" horiz-adv-x="688" d="M344 1483q121 0 193.5 -62t72.5 -164q0 -136 -172 -206q100 -38 149.5 -98t49.5 -136q0 -111 -79.5 -179.5t-215.5 -68.5t-213.5 64.5t-77.5 177.5q0 75 44.5 136t131.5 102q-86 47 -118.5 92.5t-32.5 111.5q0 101 74.5 165.5t193.5 64.5zM150 811q0 -71 52.5 -113.5 t141.5 -42.5q93 0 142 41.5t49 114.5q0 59 -42.5 103t-150.5 85l-20 9q-93 -35 -132.5 -83t-39.5 -114zM342 1397q-75 0 -119.5 -38.5t-44.5 -103.5q0 -54 36.5 -93t129.5 -72q86 30 126 70.5t40 96.5q0 63 -45 101.5t-123 38.5z" />
-<glyph unicode="&#x2079;" horiz-adv-x="688" d="M641 1108q0 -282 -103.5 -410.5t-314.5 -128.5q-76 0 -129 17v90q54 -21 131 -21q148 0 231.5 90.5t92.5 274.5h-8q-37 -52 -98 -82.5t-128 -30.5q-130 0 -204 75t-74 204q0 135 81 215t212 80q91 0 162.5 -44.5t110 -129.5t38.5 -199zM324 1397q-91 0 -143 -55.5 t-52 -149.5q0 -91 46.5 -145t143.5 -54q95 0 158.5 50t63.5 120q0 102 -59.5 168t-157.5 66z" />
-<glyph unicode="&#x207f;" horiz-adv-x="766" d="M573 813v414q0 93 -42.5 133.5t-127.5 40.5q-108 0 -154 -55t-46 -179v-354h-90v655h75l11 -90h6q70 101 211 101q248 0 248 -250v-416h-91z" />
-<glyph unicode="&#x20a3;" d="M387 381h373v-82h-373v-299h-102v299h-181v82h181v1081h759v-94h-657v-610h619v-94h-619v-283z" />
-<glyph unicode="&#x20a4;" d="M412 799v-215h411v-82h-411v-82q0 -116 -35 -196t-113 -128h809v-96h-995v84q110 21 171.5 110t61.5 224v84h-211v82h211v215h-211v82h211v174q0 204 98 315t281 111q175 0 330 -68l-35 -86q-157 66 -295 66q-141 0 -209.5 -81t-68.5 -253v-178h411v-82h-411z" />
-<glyph unicode="&#x20a7;" horiz-adv-x="1501" d="M1319 66q58 0 108 12v-82q-48 -16 -131 -16q-227 0 -227 253v527h-160v59l160 43l39 195h61v-211h234v-86h-234v-502q0 -106 35 -149t115 -43zM872 1042q0 -448 -555 -448h-45v-594h-102v1462h195q507 0 507 -420zM272 682h58q225 0 329.5 85t104.5 271q0 172 -98 252 t-308 80h-86v-688z" />
-<glyph unicode="&#x20ab;" horiz-adv-x="1219" d="M119 0zM580 1108q118 0 204 -43t154 -147h6q-6 126 -6 247v107h-473v82h473v202h98v-202h156v-82h-156v-1272h-65l-25 166h-8q-124 -186 -356 -186q-225 0 -344 140t-119 408q0 282 118 431t343 149zM580 1018q-178 0 -267.5 -125t-89.5 -363q0 -462 359 -462 q184 0 270 107t86 353v17q0 252 -84.5 362.5t-273.5 110.5zM1036 -266h-850v82h850v-82z" />
-<glyph unicode="&#x20ac;" d="M803 1397q-174 0 -288 -125.5t-155 -364.5h502v-82h-510l-4 -104v-24q0 -65 4 -87h449v-82h-443q30 -217 147.5 -338.5t301.5 -121.5q148 0 287 65v-94q-81 -34 -150.5 -46.5t-140.5 -12.5q-228 0 -367.5 140t-181.5 408h-180v82h172q-4 38 -4 113l4 102h-172v82h184 q39 272 183 425t362 153q88 0 161 -17t148 -57l-39 -86q-132 72 -270 72z" />
-<glyph unicode="&#x2105;" horiz-adv-x="1645" d="M1501 334q0 -160 -78.5 -251t-220.5 -91q-140 0 -217.5 91.5t-77.5 250.5q0 162 80.5 252t220.5 90t216.5 -91.5t76.5 -250.5zM1006 334q0 -124 51.5 -189t148.5 -65q95 0 146 66t51 188q0 124 -50.5 189t-146.5 65q-99 0 -149.5 -65t-50.5 -189zM475 788q-160 0 -246 90 t-86 250q0 159 93.5 252t252.5 93q100 0 193 -31l-29 -88q-85 30 -161 30q-121 0 -185.5 -65t-64.5 -189q0 -131 59 -192t184 -61q100 0 185 32v-84q-86 -37 -195 -37zM1272 1462l-811 -1462h-94l811 1462h94z" />
-<glyph unicode="&#x2113;" horiz-adv-x="1024" d="M602 72q171 0 197 229h78q-5 -146 -82.5 -232.5t-204.5 -86.5q-143 0 -210 82.5t-67 246.5v285q-104 -43 -198 -64v84q106 28 198 66v506q0 144 62.5 219.5t177.5 75.5q116 0 181 -76.5t65 -216.5q0 -188 -99 -330.5t-288 -228.5v-301q0 -134 44 -196t146 -62zM705 1188 q0 105 -40.5 158t-111.5 53q-73 0 -107 -48t-34 -163v-463q152 77 222.5 190t70.5 273z" />
-<glyph unicode="&#x2116;" horiz-adv-x="2073" d="M1208 0h-104l-803 1296h-8q12 -232 12 -348v-948h-98v1462h102l803 -1290h6q-8 232 -8 336v954h98v-1462zM1958 610q0 -166 -79.5 -251t-217.5 -85q-135 0 -213 85t-78 251q0 164 79 253t218 89q138 0 214.5 -90t76.5 -252zM1468 610q0 -123 50 -185.5t147 -62.5 q94 0 144.5 63.5t50.5 184.5q0 124 -49.5 189t-145.5 65q-197 0 -197 -254zM1425 0v86h473v-86h-473z" />
-<glyph unicode="&#x2120;" horiz-adv-x="1552" d="M565 938q0 -92 -74.5 -148.5t-197.5 -56.5q-139 0 -201 31v78q99 -33 203 -33q180 0 180 121q0 59 -29.5 88t-142.5 69q-112 39 -154.5 83.5t-42.5 123.5q0 78 67 128.5t171 50.5q122 0 209 -33l-31 -76q-80 33 -174 33q-69 0 -112 -27t-43 -74q0 -50 29.5 -78t139.5 -69 q94 -36 131.5 -62t54.5 -61t17 -88zM981 733l-221 608h-6l4 -200v-408h-82v721h125l221 -606l223 606h125v-721h-86v397l4 207h-6l-227 -604h-74z" />
-<glyph unicode="&#x2122;" horiz-adv-x="1485" d="M313 741h-86v643h-217v78h522v-78h-219v-643zM913 741l-221 609h-6l4 -201v-408h-82v721h125l221 -606l224 606h125v-721h-86v398l4 207h-7l-227 -605h-74z" />
-<glyph unicode="&#x2126;" horiz-adv-x="1587" d="M82 0zM793 1393q-251 0 -399 -151.5t-148 -412.5q0 -226 90.5 -397.5t312.5 -359.5v-72h-567v94h407q-133 118 -205.5 224.5t-110.5 232t-38 270.5q0 200 80 351t229.5 232t348.5 81q311 0 485 -174t174 -488q0 -209 -80.5 -384t-269.5 -345h403v-94h-565v72 q215 175 308 350t93 405q0 262 -146 414t-402 152z" />
-<glyph unicode="&#x212e;" horiz-adv-x="1268" d="M633 -35q-157 0 -277.5 73.5t-187 204t-66.5 287.5q0 171 69 298.5t191 197.5t271 70q152 0 273.5 -71t189 -200.5t67.5 -294.5h-827v-356q49 -53 132 -88t165 -35q131 0 222.5 52.5t172.5 181.5l72 -41q-98 -155 -206.5 -217t-260.5 -62zM932 616v277q-50 53 -131.5 86 t-169.5 33q-173 0 -295 -117v-279h596z" />
-<glyph unicode="&#x215b;" horiz-adv-x="1516" d="M22 0zM1106 894q121 0 193.5 -62t72.5 -164q0 -136 -172 -206q100 -38 149.5 -98t49.5 -136q0 -111 -79.5 -179.5t-215.5 -68.5t-213.5 64.5t-77.5 177.5q0 75 44.5 136t131.5 102q-86 47 -118.5 92.5t-32.5 111.5q0 101 74.5 165.5t193.5 64.5zM912 222 q0 -71 52.5 -113.5t141.5 -42.5q93 0 142 41.5t49 114.5q0 59 -42.5 103t-150.5 85l-20 9q-93 -35 -132.5 -83t-39.5 -114zM1104 808q-75 0 -119.5 -38.5t-44.5 -103.5q0 -54 36.5 -93t129.5 -72q86 30 126 70.5t40 96.5q0 63 -45 101.5t-123 38.5zM1085 1462l-811 -1462 h-94l811 1462h94zM296 1462h92v-876h-98v547q0 99 12 233q-26 -23 -233 -145l-47 77z" />
-<glyph unicode="&#x215c;" horiz-adv-x="1516" d="M32 0zM1190 894q121 0 193.5 -62t72.5 -164q0 -136 -172 -206q100 -38 149.5 -98t49.5 -136q0 -111 -79.5 -179.5t-215.5 -68.5t-213.5 64.5t-77.5 177.5q0 75 44.5 136t131.5 102q-86 47 -118.5 92.5t-32.5 111.5q0 101 74.5 165.5t193.5 64.5zM996 222 q0 -71 52.5 -113.5t141.5 -42.5q93 0 142 41.5t49 114.5q0 59 -42.5 103t-150.5 85l-20 9q-93 -35 -132.5 -83t-39.5 -114zM1188 808q-75 0 -119.5 -38.5t-44.5 -103.5q0 -54 36.5 -93t129.5 -72q86 30 126 70.5t40 96.5q0 63 -45 101.5t-123 38.5zM1218 1462l-811 -1462 h-94l811 1462h94zM607 1260q0 -78 -44 -131.5t-117 -75.5q186 -45 186 -211q0 -130 -88.5 -201.5t-247.5 -71.5q-144 0 -264 60v88q136 -62 266 -62q115 0 174.5 49t59.5 136q0 83 -59.5 122t-178.5 39h-131v84h135q105 0 158 43.5t53 120.5q0 67 -47 107.5t-127 40.5 q-128 0 -246 -78l-47 70q130 94 293 94q127 0 199.5 -60t72.5 -163z" />
-<glyph unicode="&#x215d;" horiz-adv-x="1516" d="M53 0zM309 1122q145 0 229 -71.5t84 -194.5q0 -132 -87 -209.5t-239 -77.5q-65 0 -133 16t-110 42v94q120 -66 245 -66q107 0 166.5 51.5t59.5 147.5q0 85 -58.5 133.5t-171.5 48.5q-74 0 -162 -24l-51 39l31 411h475v-88h-389l-18 -266q56 14 129 14zM1206 1462 l-811 -1462h-94l811 1462h94zM1173 894q121 0 193.5 -62t72.5 -164q0 -136 -172 -206q100 -38 149.5 -98t49.5 -136q0 -111 -79.5 -179.5t-215.5 -68.5t-213.5 64.5t-77.5 177.5q0 75 44.5 136t131.5 102q-86 47 -118.5 92.5t-32.5 111.5q0 101 74.5 165.5t193.5 64.5z M979 222q0 -71 52.5 -113.5t141.5 -42.5q93 0 142 41.5t49 114.5q0 59 -42.5 103t-150.5 85l-20 9q-93 -35 -132.5 -83t-39.5 -114zM1171 808q-75 0 -119.5 -38.5t-44.5 -103.5q0 -54 36.5 -93t129.5 -72q86 30 126 70.5t40 96.5q0 63 -45 101.5t-123 38.5z" />
-<glyph unicode="&#x215e;" horiz-adv-x="1516" d="M90 0zM1153 894q121 0 193.5 -62t72.5 -164q0 -136 -172 -206q100 -38 149.5 -98t49.5 -136q0 -111 -79.5 -179.5t-215.5 -68.5t-213.5 64.5t-77.5 177.5q0 75 44.5 136t131.5 102q-86 47 -118.5 92.5t-32.5 111.5q0 101 74.5 165.5t193.5 64.5zM959 222 q0 -71 52.5 -113.5t141.5 -42.5q93 0 142 41.5t49 114.5q0 59 -42.5 103t-150.5 85l-20 9q-93 -35 -132.5 -83t-39.5 -114zM1151 808q-75 0 -119.5 -38.5t-44.5 -103.5q0 -54 36.5 -93t129.5 -72q86 30 126 70.5t40 96.5q0 63 -45 101.5t-123 38.5zM1097 1462l-811 -1462 h-94l811 1462h94zM193 586l364 788h-467v88h576v-67l-363 -809h-110z" />
-<glyph unicode="&#x2202;" d="M463 -20q-165 0 -254.5 102.5t-89.5 284.5q0 175 68.5 330t181.5 234t258 79q205 0 301 -226q8 75 8 144q0 236 -73 350.5t-228 114.5q-61 0 -127 -16.5t-115 -41.5v99q128 51 256 51q389 0 389 -549q0 -266 -77 -496.5t-205.5 -345t-292.5 -114.5zM465 72 q159 0 278.5 166t163.5 428q-39 123 -109 187.5t-165 64.5q-118 0 -210.5 -70.5t-148 -203.5t-55.5 -277q0 -139 64 -217t182 -78z" />
-<glyph unicode="&#x2206;" d="M20 59l521 1403h80l528 -1405v-57h-1129v59zM580 1315q-53 -153 -441 -1219h889q-391 1054 -448 1219z" />
-<glyph unicode="&#x220f;" horiz-adv-x="1501" d="M1192 -510v1876h-883v-1876h-102v1972h1087v-1972h-102z" />
-<glyph unicode="&#x2211;" horiz-adv-x="1272" d="M86 -510v70l664 970l-648 863v69h1041v-94h-897l628 -829l-649 -955h985v-94h-1124z" />
-<glyph unicode="&#x2212;" d="M111 682v82h948v-82h-948z" />
-<glyph unicode="&#x221a;" horiz-adv-x="1124" d="M610 -14h-110l-281 798h-182v88h250l270 -768l541 1561h94z" />
-<glyph unicode="&#x221e;" horiz-adv-x="1434" d="M416 1034q91 0 163.5 -53.5t137.5 -175.5q63 120 135 174.5t166 54.5q127 0 210 -88.5t83 -222.5q0 -135 -83.5 -223t-209.5 -88q-94 0 -166 54.5t-135 174.5q-66 -123 -138.5 -176t-162.5 -53q-127 0 -210 88.5t-83 222.5q0 135 83.5 223t209.5 88zM1018 938 q-80 0 -137.5 -54t-112.5 -161q55 -107 112.5 -161t137.5 -54q88 0 140 59.5t52 155.5q0 97 -52.5 156t-139.5 59zM416 938q-87 0 -140 -59t-53 -156t53 -156t140 -59q74 0 131.5 49t118.5 166q-60 116 -118 165.5t-132 49.5z" />
-<glyph unicode="&#x222b;" horiz-adv-x="745" d="M315 1169q0 387 293 387q48 0 90 -12v-90q-46 12 -90 12q-97 0 -145.5 -68t-48.5 -224v-1278q0 -198 -71.5 -293t-217.5 -95q-66 0 -121 19v90q52 -18 125 -18q186 0 186 288v1282z" />
-<glyph unicode="&#x2248;" d="M334 940q-48 0 -105.5 -29t-117.5 -92v94q107 111 233 111q64 0 121 -15t149 -57q124 -57 220 -57q110 0 225 125v-96q-108 -113 -234 -113q-116 0 -270 72q-124 57 -221 57zM334 571q-49 0 -108 -30.5t-115 -89.5v94q108 110 233 110q61 0 115 -13.5t155 -57.5 q126 -58 220 -58q56 0 109.5 30.5t115.5 94.5v-96q-108 -113 -234 -113q-116 0 -270 72q-124 57 -221 57z" />
-<glyph unicode="&#x2260;" d="M514 477l-139 -299l-76 37l123 262h-311v82h350l153 326h-503v82h542l144 305l73 -39l-125 -266h314v-82h-352l-154 -326h506v-82h-545z" />
-<glyph unicode="&#x2264;" d="M111 1zM1059 266l-948 416v61l948 474v-95l-823 -405l823 -355v-96zM111 1v82h948v-82h-948z" />
-<glyph unicode="&#x2265;" d="M111 1zM111 362l823 355l-823 405v95l948 -474v-61l-948 -416v96zM111 1v82h948v-82h-948z" />
-<glyph unicode="&#x2400;" horiz-adv-x="0" />
-<glyph unicode="&#x25ca;" horiz-adv-x="1188" d="M119 735l450 740h49l451 -740l-451 -735h-49zM969 735l-375 621l-375 -621l375 -614z" />
-<glyph unicode="&#xe000;" horiz-adv-x="1085" d="M0 1085h1085v-1085h-1085v1085z" />
-<glyph unicode="&#xfeff;" horiz-adv-x="0" />
-<glyph unicode="&#xfffc;" horiz-adv-x="2048" d="M84 1214v304h303v-111h-192v-193h-111zM1681 1407v111h304v-304h-109v193h-195zM84 -383v303h111v-194h192v-109h-303zM1681 -383v109h195v194h109v-303h-304zM1290 -383v109h273v-109h-273zM508 -383v109h270v-109h-270zM508 1407v111h270v-111h-270zM1985 39h-109v270 h109v-270zM1985 823h-109v271h109v-271zM899 -383v109h272v-109h-272zM195 39h-111v270h111v-270zM899 1407v111h272v-111h-272zM1290 1407v111h273v-111h-273zM195 430h-111v272h111v-272zM195 823h-111v271h111v-271zM1985 430h-109v272h109v-272zM864 629 q0 -145 -67.5 -223t-194.5 -78t-194.5 78t-67.5 223q0 146 67.5 223.5t194.5 77.5q126 0 194 -77t68 -224zM467 629q0 -197 135 -197t135 197q0 196 -135 196t-135 -196zM948 922h172q109 0 165 -33.5t56 -116.5q0 -49 -23 -83t-67 -42v-4q59 -13 83 -47t24 -90 q0 -81 -54.5 -125.5t-148.5 -44.5h-207v586zM1071 690h66q46 0 64 17t18 49q0 34 -21 48.5t-68 14.5h-59v-129zM1071 592v-154h74q49 0 67.5 21.5t18.5 58.5q0 74 -90 74h-70zM1491 330q-52 0 -80 10v102q43 -8 68 -8q86 0 86 86v402h125v-398q0 -95 -52.5 -144.5 t-146.5 -49.5z" />
-<glyph unicode="&#xfffd;" horiz-adv-x="2048" d="M1022 1556l940 -938l-940 -937l-938 937zM1087 367v47q0 50 22 82.5t87 81.5q103 82 139.5 145t36.5 151q0 135 -93.5 212t-258.5 77q-79 0 -172 -28t-164 -70l82 -178q160 80 250 80q63 0 94 -29t31 -76q0 -53 -24.5 -90.5t-96.5 -91.5q-84 -68 -113.5 -124t-29.5 -130 v-59h210zM850 92q0 -63 35.5 -99t105.5 -36q66 0 102.5 36.5t36.5 98.5q0 64 -36 100.5t-103 36.5q-72 0 -106.5 -36t-34.5 -101z" />
-<glyph horiz-adv-x="623" d="M532 0h-442v66l170 20v1290l-170 21v65h442v-65l-170 -21v-1290l170 -20v-66z" />
-<glyph horiz-adv-x="623" d="M52 0zM532 0h-442v66l170 20v1290l-170 21v65h442v-65l-170 -21v-1290l170 -20v-66zM435 1579h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
-<glyph horiz-adv-x="623" d="M90 0zM532 0h-442v66l170 20v1290l-170 21v65h442v-65l-170 -21v-1290l170 -20v-66zM224 1595q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
-<glyph horiz-adv-x="623" d="M21 0zM532 0h-442v66l170 20v1290l-170 21v65h442v-65l-170 -21v-1290l170 -20v-66zM21 1595q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
-<glyph horiz-adv-x="623" d="M58 0zM532 0h-442v66l170 20v1290l-170 21v65h442v-65l-170 -21v-1290l170 -20v-66zM58 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM439 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph horiz-adv-x="623" d="M0 0zM532 0h-442v66l170 20v1290l-170 21v65h442v-65l-170 -21v-1290l170 -20v-66zM472 1581q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73q10 111 63 174.5t137 63.5q48 0 88 -25t82 -59q34 -28 66 -50t61 -22q46 0 77 36.5 t48 119.5h76q-16 -116 -69 -177t-132 -61z" />
-<glyph horiz-adv-x="623" d="M36 0zM532 0h-442v66l170 20v1290l-170 21v65h442v-65l-170 -21v-1290l170 -20v-66zM36 1671h555v-82h-555v82z" />
-<glyph horiz-adv-x="623" d="M36 0zM532 0h-442v66l170 20v1290l-170 21v65h442v-65l-170 -21v-1290l170 -20v-66zM311 1579q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5t134.5 37.5t61.5 124.5h80q-30 -246 -278 -246z" />
-<glyph horiz-adv-x="623" d="M90 0zM532 0h-442v66l170 20v1290l-170 21v65h442v-65l-170 -21v-1290l170 -20v-66zM264 -248q0 -110 106 -110q49 0 82 12v-84q-40 -16 -104 -16q-84 0 -133.5 47.5t-49.5 134.5q0 70 40 139t112 125h90q-72 -63 -107.5 -119.5t-35.5 -128.5z" />
-<glyph horiz-adv-x="623" d="M90 0zM532 0h-442v66l170 20v1290l-170 21v65h442v-65l-170 -21v-1290l170 -20v-66zM248 1727q0 96 64 96q31 0 48 -25t17 -71q0 -45 -17 -71t-48 -26q-64 0 -64 97z" />
-<glyph horiz-adv-x="1128" d="M90 0zM532 0h-442v66l170 20v1290l-170 21v65h442v-65l-170 -21v-1290l170 -20v-66zM590 -369q-92 0 -151 27v88q78 -20 149 -20q242 0 242 264v1472h102v-1462q0 -369 -342 -369z" />
-<glyph horiz-adv-x="801" d="M0 0zM710 0h-442v66l170 20v1290l-170 21v65h442v-65l-170 -21v-1290l170 -20v-66zM-40 1152q29 75 57 184t42 210h119v-17q-18 -77 -63 -191t-97 -202h-58v16z" />
-<glyph horiz-adv-x="623" d="M90 0zM532 0h-442v66l170 20v1290l-170 21v65h442v-65l-170 -21v-1290l170 -20v-66z" />
-<glyph horiz-adv-x="623" d="M58 0zM532 0h-442v66l170 20v1290l-170 21v65h442v-65l-170 -21v-1290l170 -20v-66zM58 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM439 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph horiz-adv-x="623" d="M90 0zM532 0h-442v66l170 20v1290l-170 21v65h442v-65l-170 -21v-1290l170 -20v-66z" />
-<glyph horiz-adv-x="623" d="M58 0zM532 0h-442v66l170 20v1290l-170 21v65h442v-65l-170 -21v-1290l170 -20v-66zM58 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM439 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
-<glyph horiz-adv-x="1182" d="M590 1241q-149 0 -227 66.5t-91 214.5h88q15 -110 68 -155.5t164 -45.5q110 0 163.5 47t65.5 154h88q-21 -281 -319 -281z" />
-<glyph horiz-adv-x="1024" d="M412 1245q21 45 48 139.5t38 171.5h112v-14q-15 -60 -53.5 -147t-91.5 -166h-53v16z" />
-<glyph horiz-adv-x="1024" d="M395 -436q25 54 50 145t36 166h113v-14q-23 -82 -63.5 -167.5t-81.5 -146.5h-54v17z" />
-<glyph horiz-adv-x="1024" d="M606 1552q-27 -58 -53.5 -159t-32.5 -152h-112v14q20 77 61.5 165t83.5 149h53v-17z" />
-<glyph horiz-adv-x="623" d="M90 0zM532 0h-442v66l170 20v1290l-170 21v65h442v-65l-170 -21v-1290l170 -20v-66z" />
-<glyph horiz-adv-x="623" d="M90 0zM532 0h-442v66l170 20v1290l-170 21v65h442v-65l-170 -21v-1290l170 -20v-66z" />
-<glyph horiz-adv-x="623" d="M90 0zM532 0h-442v66l170 20v1290l-170 21v65h442v-65l-170 -21v-1290l170 -20v-66zM522 1843q0 -140 -168 -176l-10 -121h-80l-10 178q89 15 129.5 43t40.5 72q0 48 -33.5 72t-111.5 24q-48 0 -93 -8v78q52 12 107 12q108 0 168.5 -45.5t60.5 -128.5z" />
-<glyph horiz-adv-x="623" d="M90 0zM532 0h-442v66l170 20v1290l-170 21v65h442v-65l-170 -21v-1290l170 -20v-66zM245 -227q0 96 64 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-64 0 -64 97z" />
-<glyph horiz-adv-x="0" d="M-551 1518q101 -135 229 -261v-16h-67q-128 93 -217 176q-89 -83 -217 -176h-68v16q141 136 234 261h106zM-401 1452q42 54 65.5 90t69.5 121h125v-16q-90 -121 -193 -211h-67v16z" />
-<glyph horiz-adv-x="0" d="M-551 1518q101 -135 229 -261v-16h-67q-128 93 -217 176q-89 -83 -217 -176h-68v16q141 136 234 261h106zM-807 1436h-67q-115 100 -193 211v16h125q47 -86 69 -119.5t66 -91.5v-16z" />
-<glyph horiz-adv-x="0" d="M-139 1649q0 -107 -131 -136l-4 -81h-68l-10 131q63 11 94 28t31 56q0 37 -29 50t-76 13q-31 0 -71 -6v72q34 8 86 8q84 0 131 -36t47 -99zM-551 1518q101 -135 229 -261v-16h-67q-128 93 -217 176q-89 -83 -217 -176h-68v16q141 136 234 261h106z" />
-<glyph horiz-adv-x="0" d="M-471 1597q-39 0 -74.5 20t-67.5 43.5t-61 43.5t-55 20q-80 0 -105 -129h-73q14 97 60 154t124 57q39 0 73.5 -19.5t66 -43t60.5 -43t58 -19.5q75 0 98 127h76q-11 -101 -58.5 -156t-121.5 -55zM-551 1518q101 -135 229 -261v-16h-67q-128 93 -217 176q-89 -83 -217 -176 h-68v16q141 136 234 261h106z" />
-<glyph horiz-adv-x="0" d="M-612 1241q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5t134.5 37.5t61.5 124.5h80q-30 -246 -278 -246zM-674 1518q34 42 59.5 80t75.5 131h125v-17q-37 -53 -93 -113.5t-99 -97.5h-68v17z" />
-<glyph horiz-adv-x="0" d="M-559 1501h-68q-42 37 -99 98.5t-93 112.5v17h125q51 -94 70 -122.5t65 -88.5v-17zM-612 1241q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5t134.5 37.5t61.5 124.5h80q-30 -246 -278 -246z" />
-<glyph horiz-adv-x="0" d="M-469 1661q0 -107 -127 -131l-6 -43h-70l-10 90q62 11 93.5 28.5t31.5 55.5q0 63 -98 63q-39 0 -78 -6v72q34 8 90 8q80 0 127 -37t47 -100zM-612 1241q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5t134.5 37.5t61.5 124.5h80q-30 -246 -278 -246z" />
-<glyph horiz-adv-x="0" d="M-612 1241q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5t134.5 37.5t61.5 124.5h80q-30 -246 -278 -246zM-471 1587q-39 0 -74.5 20t-67.5 43.5t-61 43.5t-55 20q-80 0 -105 -129h-73q14 97 60 154t124 57q39 0 73.5 -19.5t66 -43t60.5 -43t58 -19.5q45 0 66 35 t32 92h76q-11 -101 -58.5 -156t-121.5 -55z" />
-<glyph horiz-adv-x="418" d="M248 -248q0 72 -35.5 128.5t-108.5 119.5h91q151 -118 151 -260q0 -87 -51 -136.5t-137 -49.5q-56 0 -99 16v84q34 -12 82 -12q107 0 107 110z" />
-<glyph horiz-adv-x="420" d="M211 94h119v-244q0 -104 -46 -161.5t-137 -57.5q-56 0 -98 21v92q45 -18 84 -18q98 0 98 124v150h-20v94z" />
-<glyph horiz-adv-x="420" d="M211 94h119v-244q0 -104 -46 -161.5t-137 -57.5q-56 0 -98 21v92q45 -18 84 -18q98 0 98 124v150h-20v94z" />
-<glyph horiz-adv-x="745" d="M547 0h-98v1065q0 145 12 301q-15 -15 -31 -29t-309 -243l-58 71l398 297h86v-1462z" />
-<glyph d="M1051 561q0 -276 -124 -428.5t-347 -152.5q-216 0 -338.5 152.5t-122.5 428.5q0 277 124 427.5t343 150.5t342 -151t123 -427zM223 561q0 -239 91.5 -365t269.5 -126q362 0 362 491q0 243 -92 365.5t-272 122.5q-177 0 -268 -122t-91 -366z" />
-<glyph horiz-adv-x="717" d="M535 0h-99v721q0 132 13 301q-39 -37 -79.5 -70.5t-265.5 -189.5l-53 72l402 284h82v-1118z" />
-<glyph horiz-adv-x="1018" d="M946 0h-895v88l393 299q153 115 216 178.5t90.5 121.5t27.5 130q0 108 -78 170t-211 62q-188 0 -350 -134l-53 70q181 154 424 154q170 0 270.5 -86.5t100.5 -235.5q0 -118 -61.5 -210.5t-244.5 -231.5l-364 -277l2 -2h733v-96z" />
-<glyph horiz-adv-x="1053" d="M927 775q0 -136 -85.5 -229t-229.5 -119v-6q176 -22 268 -112t92 -242q0 -205 -139.5 -317.5t-401.5 -112.5q-223 0 -389 83v99q84 -44 188.5 -69t196.5 -25q221 0 332 89.5t111 252.5q0 145 -113.5 223t-333.5 78h-158v96h160q182 0 288.5 86.5t106.5 234.5 q0 122 -86.5 195.5t-226.5 73.5q-109 0 -199 -30.5t-202 -104.5l-49 67q85 71 205 112.5t243 41.5q202 0 312 -95.5t110 -269.5z" />
-<glyph horiz-adv-x="1161" d="M1120 37h-252v-381h-94v381h-751v67l725 1014h120v-995h252v-86zM774 123v401q0 298 14 508h-8q-23 -44 -123 -188l-516 -721h633z" />
-<glyph horiz-adv-x="1124" d="M524 536q234 0 368.5 -113t134.5 -311q0 -225 -140 -350t-386 -125q-109 0 -207 21.5t-164 61.5v103q108 -55 192 -76.5t179 -21.5q192 0 308 101.5t116 274.5q0 163 -113 256t-307 93q-130 0 -272 -39l-60 39l58 669h704v-96h-610l-45 -516q156 29 244 29z" />
-<glyph d="M131 0zM131 623q0 285 77.5 479.5t220 288.5t343.5 94q94 0 172 -23v-88q-73 27 -176 27q-247 0 -384.5 -178t-154.5 -518h13q76 98 174 148t207 50q205 0 320.5 -117t115.5 -323q0 -224 -121.5 -353.5t-327.5 -129.5q-222 0 -350.5 169.5t-128.5 473.5zM610 68 q164 0 255 103t91 294q0 168 -90 262t-245 94q-102 0 -189.5 -45t-139.5 -119.5t-52 -152.5q0 -111 49.5 -213.5t134 -162.5t186.5 -60z" />
-<glyph horiz-adv-x="1069" d="M272 -343l602 1366h-827v96h946v-73l-604 -1389h-117z" />
-<glyph d="M123 0zM584 1487q186 0 299.5 -95t113.5 -257q0 -112 -70.5 -198t-228.5 -159q192 -79 270 -173t78 -228q0 -181 -126.5 -289t-339.5 -108q-221 0 -339 101t-118 294q0 131 83 230t257 169q-161 76 -227 160.5t-66 202.5q0 105 53 184.5t148.5 122.5t212.5 43zM225 360 q0 -138 93.5 -214t261.5 -76q164 0 264 80.5t100 218.5q0 124 -78.5 201.5t-302.5 162.5q-184 -71 -261 -157t-77 -216zM582 1397q-141 0 -226.5 -69.5t-85.5 -190.5q0 -70 31.5 -123.5t91 -97t199.5 -101.5q163 63 234 139t71 183q0 120 -84.5 190t-230.5 70z" />
-<glyph d="M1040 499q0 -288 -75.5 -482t-220 -287t-349.5 -93q-104 0 -192 26v86q43 -14 103.5 -21.5t92.5 -7.5q247 0 387 178.5t156 520.5h-12q-73 -96 -174 -147.5t-211 -51.5q-203 0 -316.5 112t-113.5 318q0 220 124.5 356t323.5 136q144 0 252 -75.5t166.5 -221.5t58.5 -346z M563 1054q-158 0 -252 -106.5t-94 -291.5q0 -174 87 -264t249 -90q101 0 188.5 45t139 119.5t51.5 151.5q0 117 -46.5 219t-130 159.5t-192.5 57.5z" />
-<glyph horiz-adv-x="1219" d="M938 -2q0 118 6 172h-6q-118 -190 -369 -190q-214 0 -332 142t-118 410q0 275 118 425.5t338 150.5q236 0 353 -174h6l18 153h84v-1107q0 -214 -122 -343t-326 -129q-221 0 -377 70v107q166 -88 383 -88q160 0 252 100t92 280v21zM571 68q198 0 282.5 109t84.5 366v12 q0 245 -85 354t-271 109q-176 0 -267.5 -124t-91.5 -364q0 -229 89.5 -345.5t258.5 -116.5z" />
-<glyph horiz-adv-x="1219" d="M119 0zM938 -2q0 118 6 172h-6q-118 -190 -369 -190q-214 0 -332 142t-118 410q0 275 118 425.5t338 150.5q236 0 353 -174h6l18 153h84v-1107q0 -214 -122 -343t-326 -129q-221 0 -377 70v107q166 -88 383 -88q160 0 252 100t92 280v21zM571 68q198 0 282.5 109 t84.5 366v12q0 245 -85 354t-271 109q-176 0 -267.5 -124t-91.5 -364q0 -229 89.5 -345.5t258.5 -116.5zM292 1257q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
-<glyph horiz-adv-x="1219" d="M119 0zM938 -2q0 118 6 172h-6q-118 -190 -369 -190q-214 0 -332 142t-118 410q0 275 118 425.5t338 150.5q236 0 353 -174h6l18 153h84v-1107q0 -214 -122 -343t-326 -129q-221 0 -377 70v107q166 -88 383 -88q160 0 252 100t92 280v21zM571 68q198 0 282.5 109 t84.5 366v12q0 245 -85 354t-271 109q-176 0 -267.5 -124t-91.5 -364q0 -229 89.5 -345.5t258.5 -116.5zM575 1241q-253 0 -275 246h82q14 -87 60.5 -124.5t134.5 -37.5t134.5 37.5t61.5 124.5h80q-30 -246 -278 -246z" />
-<glyph horiz-adv-x="1219" d="M119 0zM938 -2q0 118 6 172h-6q-118 -190 -369 -190q-214 0 -332 142t-118 410q0 275 118 425.5t338 150.5q236 0 353 -174h6l18 153h84v-1107q0 -214 -122 -343t-326 -129q-221 0 -377 70v107q166 -88 383 -88q160 0 252 100t92 280v21zM571 68q198 0 282.5 109 t84.5 366v12q0 245 -85 354t-271 109q-176 0 -267.5 -124t-91.5 -364q0 -229 89.5 -345.5t258.5 -116.5zM514 1389q0 96 64 96q31 0 48 -25t17 -71q0 -45 -17 -71t-48 -26q-64 0 -64 97z" />
-<glyph horiz-adv-x="1219" d="M119 0zM938 -2q0 118 6 172h-6q-118 -190 -369 -190q-214 0 -332 142t-118 410q0 275 118 425.5t338 150.5q236 0 353 -174h6l18 153h84v-1107q0 -214 -122 -343t-326 -129q-221 0 -377 70v107q166 -88 383 -88q160 0 252 100t92 280v21zM571 68q198 0 282.5 109 t84.5 366v12q0 245 -85 354t-271 109q-176 0 -267.5 -124t-91.5 -364q0 -229 89.5 -345.5t258.5 -116.5zM731 1552q-27 -58 -53.5 -159t-32.5 -152h-112v14q20 77 61.5 165t83.5 149h53v-17z" />
-<glyph horiz-adv-x="1219" d="M0 0z" />
-<hkern u1="&#x22;" u2="&#x1ef8;" k="-20" />
-<hkern u1="&#x22;" u2="&#x1ef6;" k="-20" />
-<hkern u1="&#x22;" u2="&#x1ef4;" k="-20" />
-<hkern u1="&#x22;" u2="&#x1ef2;" k="-20" />
-<hkern u1="&#x22;" u2="&#x1ef1;" k="61" />
-<hkern u1="&#x22;" u2="&#x1eef;" k="61" />
-<hkern u1="&#x22;" u2="&#x1eed;" k="61" />
-<hkern u1="&#x22;" u2="&#x1eeb;" k="61" />
-<hkern u1="&#x22;" u2="&#x1ee9;" k="61" />
-<hkern u1="&#x22;" u2="&#x1ee7;" k="61" />
-<hkern u1="&#x22;" u2="&#x1ee5;" k="61" />
-<hkern u1="&#x22;" u2="&#x1ee3;" k="123" />
-<hkern u1="&#x22;" u2="&#x1ee1;" k="123" />
-<hkern u1="&#x22;" u2="&#x1edf;" k="123" />
-<hkern u1="&#x22;" u2="&#x1edd;" k="123" />
-<hkern u1="&#x22;" u2="&#x1edb;" k="123" />
-<hkern u1="&#x22;" u2="&#x1ed9;" k="123" />
-<hkern u1="&#x22;" u2="&#x1ed7;" k="123" />
-<hkern u1="&#x22;" u2="&#x1ed5;" k="123" />
-<hkern u1="&#x22;" u2="&#x1ed1;" k="123" />
-<hkern u1="&#x22;" u2="&#x1ecf;" k="123" />
-<hkern u1="&#x22;" u2="&#x1ecd;" k="123" />
-<hkern u1="&#x22;" u2="&#x1ec7;" k="123" />
-<hkern u1="&#x22;" u2="&#x1ec5;" k="123" />
-<hkern u1="&#x22;" u2="&#x1ec3;" k="123" />
-<hkern u1="&#x22;" u2="&#x1ebf;" k="123" />
-<hkern u1="&#x22;" u2="&#x1ebd;" k="123" />
-<hkern u1="&#x22;" u2="&#x1ebb;" k="123" />
-<hkern u1="&#x22;" u2="&#x1eb9;" k="123" />
-<hkern u1="&#x22;" u2="&#x1eb7;" k="82" />
-<hkern u1="&#x22;" u2="&#x1eb6;" k="143" />
-<hkern u1="&#x22;" u2="&#x1eb5;" k="82" />
-<hkern u1="&#x22;" u2="&#x1eb4;" k="143" />
-<hkern u1="&#x22;" u2="&#x1eb3;" k="82" />
-<hkern u1="&#x22;" u2="&#x1eb2;" k="143" />
-<hkern u1="&#x22;" u2="&#x1eb1;" k="82" />
-<hkern u1="&#x22;" u2="&#x1eb0;" k="143" />
-<hkern u1="&#x22;" u2="&#x1eaf;" k="82" />
-<hkern u1="&#x22;" u2="&#x1eae;" k="143" />
-<hkern u1="&#x22;" u2="&#x1ead;" k="82" />
-<hkern u1="&#x22;" u2="&#x1eac;" k="143" />
-<hkern u1="&#x22;" u2="&#x1eab;" k="82" />
-<hkern u1="&#x22;" u2="&#x1eaa;" k="143" />
-<hkern u1="&#x22;" u2="&#x1ea9;" k="82" />
-<hkern u1="&#x22;" u2="&#x1ea8;" k="143" />
-<hkern u1="&#x22;" u2="&#x1ea6;" k="143" />
-<hkern u1="&#x22;" u2="&#x1ea5;" k="82" />
-<hkern u1="&#x22;" u2="&#x1ea4;" k="143" />
-<hkern u1="&#x22;" u2="&#x1ea3;" k="82" />
-<hkern u1="&#x22;" u2="&#x1ea2;" k="143" />
-<hkern u1="&#x22;" u2="&#x1ea1;" k="82" />
-<hkern u1="&#x22;" u2="&#x1ea0;" k="143" />
-<hkern u1="&#x22;" u2="&#x1e84;" k="-41" />
-<hkern u1="&#x22;" u2="&#x1e82;" k="-41" />
-<hkern u1="&#x22;" u2="&#x1e80;" k="-41" />
-<hkern u1="&#x22;" u2="&#x1e3f;" k="61" />
-<hkern u1="&#x22;" u2="&#x1e01;" k="82" />
-<hkern u1="&#x22;" u2="&#x1e00;" k="143" />
-<hkern u1="&#x22;" u2="&#x513;" k="143" />
-<hkern u1="&#x22;" u2="&#x512;" k="123" />
-<hkern u1="&#x22;" u2="&#x511;" k="123" />
-<hkern u1="&#x22;" u2="&#x50d;" k="123" />
-<hkern u1="&#x22;" u2="&#x509;" k="143" />
-<hkern u1="&#x22;" u2="&#x508;" k="123" />
-<hkern u1="&#x22;" u2="&#x503;" k="123" />
-<hkern u1="&#x22;" u2="&#x502;" k="143" />
-<hkern u1="&#x22;" u2="&#x501;" k="123" />
-<hkern u1="&#x22;" u2="&#x500;" k="143" />
-<hkern u1="&#x22;" u2="&#x4eb;" k="123" />
-<hkern u1="&#x22;" u2="&#x4e9;" k="123" />
-<hkern u1="&#x22;" u2="&#x4e7;" k="123" />
-<hkern u1="&#x22;" u2="&#x4db;" k="41" />
-<hkern u1="&#x22;" u2="&#x4d9;" k="41" />
-<hkern u1="&#x22;" u2="&#x4d7;" k="123" />
-<hkern u1="&#x22;" u2="&#x4d5;" k="41" />
-<hkern u1="&#x22;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x22;" u2="&#x4d3;" k="41" />
-<hkern u1="&#x22;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x22;" u2="&#x4d1;" k="41" />
-<hkern u1="&#x22;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x22;" u2="&#x4c6;" k="143" />
-<hkern u1="&#x22;" u2="&#x4c5;" k="123" />
-<hkern u1="&#x22;" u2="&#x4ab;" k="123" />
-<hkern u1="&#x22;" u2="&#x4a9;" k="123" />
-<hkern u1="&#x22;" u2="&#x481;" k="123" />
-<hkern u1="&#x22;" u2="&#x47d;" k="123" />
-<hkern u1="&#x22;" u2="&#x47b;" k="123" />
-<hkern u1="&#x22;" u2="&#x479;" k="123" />
-<hkern u1="&#x22;" u2="&#x473;" k="123" />
-<hkern u1="&#x22;" u2="&#x471;" k="20" />
-<hkern u1="&#x22;" u2="&#x467;" k="143" />
-<hkern u1="&#x22;" u2="&#x466;" k="143" />
-<hkern u1="&#x22;" u2="&#x459;" k="143" />
-<hkern u1="&#x22;" u2="&#x455;" k="61" />
-<hkern u1="&#x22;" u2="&#x454;" k="123" />
-<hkern u1="&#x22;" u2="&#x451;" k="123" />
-<hkern u1="&#x22;" u2="&#x450;" k="123" />
-<hkern u1="&#x22;" u2="&#x444;" k="123" />
-<hkern u1="&#x22;" u2="&#x441;" k="123" />
-<hkern u1="&#x22;" u2="&#x43e;" k="123" />
-<hkern u1="&#x22;" u2="&#x43b;" k="143" />
-<hkern u1="&#x22;" u2="&#x435;" k="123" />
-<hkern u1="&#x22;" u2="&#x434;" k="143" />
-<hkern u1="&#x22;" u2="&#x430;" k="41" />
-<hkern u1="&#x22;" u2="&#x41b;" k="123" />
-<hkern u1="&#x22;" u2="&#x414;" k="123" />
-<hkern u1="&#x22;" u2="&#x410;" k="143" />
-<hkern u1="&#x22;" u2="&#x409;" k="123" />
-<hkern u1="&#x22;" u2="&#x3cc;" k="82" />
-<hkern u1="&#x22;" u2="&#x3c6;" k="82" />
-<hkern u1="&#x22;" u2="&#x3c3;" k="82" />
-<hkern u1="&#x22;" u2="&#x3c2;" k="82" />
-<hkern u1="&#x22;" u2="&#x3c1;" k="61" />
-<hkern u1="&#x22;" u2="&#x3bf;" k="82" />
-<hkern u1="&#x22;" u2="&#x3bc;" k="41" />
-<hkern u1="&#x22;" u2="&#x3ba;" k="41" />
-<hkern u1="&#x22;" u2="&#x3b7;" k="41" />
-<hkern u1="&#x22;" u2="&#x3b6;" k="41" />
-<hkern u1="&#x22;" u2="&#x3b5;" k="41" />
-<hkern u1="&#x22;" u2="&#x3b4;" k="61" />
-<hkern u1="&#x22;" u2="&#x3b1;" k="82" />
-<hkern u1="&#x22;" u2="&#x3ae;" k="41" />
-<hkern u1="&#x22;" u2="&#x3ad;" k="41" />
-<hkern u1="&#x22;" u2="&#x3ac;" k="82" />
-<hkern u1="&#x22;" u2="&#x39b;" k="143" />
-<hkern u1="&#x22;" u2="&#x394;" k="143" />
-<hkern u1="&#x22;" u2="&#x391;" k="143" />
-<hkern u1="&#x22;" u2="&#x386;" k="143" />
-<hkern u1="&#x22;" u2="&#x21a;" k="-41" />
-<hkern u1="&#x22;" u2="&#x219;" k="61" />
-<hkern u1="&#x22;" u2="&#x1ff;" k="123" />
-<hkern u1="&#x22;" u2="&#x1fd;" k="82" />
-<hkern u1="&#x22;" u2="&#x1fb;" k="82" />
-<hkern u1="&#x22;" u2="&#x1fa;" k="143" />
-<hkern u1="&#x22;" u2="&#x1b0;" k="61" />
-<hkern u1="&#x22;" u2="&#x1a1;" k="123" />
-<hkern u1="&#x22;" u2="&#x178;" k="-20" />
-<hkern u1="&#x22;" u2="&#x176;" k="-20" />
-<hkern u1="&#x22;" u2="&#x174;" k="-41" />
-<hkern u1="&#x22;" u2="&#x173;" k="61" />
-<hkern u1="&#x22;" u2="&#x171;" k="61" />
-<hkern u1="&#x22;" u2="&#x16f;" k="61" />
-<hkern u1="&#x22;" u2="&#x16d;" k="61" />
-<hkern u1="&#x22;" u2="&#x16b;" k="61" />
-<hkern u1="&#x22;" u2="&#x169;" k="61" />
-<hkern u1="&#x22;" u2="&#x164;" k="-41" />
-<hkern u1="&#x22;" u2="&#x162;" k="-41" />
-<hkern u1="&#x22;" u2="&#x15f;" k="61" />
-<hkern u1="&#x22;" u2="&#x15b;" k="61" />
-<hkern u1="&#x22;" u2="&#x157;" k="61" />
-<hkern u1="&#x22;" u2="&#x155;" k="61" />
-<hkern u1="&#x22;" u2="&#x153;" k="123" />
-<hkern u1="&#x22;" u2="&#x151;" k="123" />
-<hkern u1="&#x22;" u2="&#x14f;" k="123" />
-<hkern u1="&#x22;" u2="&#x14d;" k="123" />
-<hkern u1="&#x22;" u2="&#x14b;" k="61" />
-<hkern u1="&#x22;" u2="&#x146;" k="61" />
-<hkern u1="&#x22;" u2="&#x144;" k="61" />
-<hkern u1="&#x22;" u2="&#x138;" k="61" />
-<hkern u1="&#x22;" u2="&#x123;" k="61" />
-<hkern u1="&#x22;" u2="&#x121;" k="61" />
-<hkern u1="&#x22;" u2="&#x11f;" k="61" />
-<hkern u1="&#x22;" u2="&#x11d;" k="61" />
-<hkern u1="&#x22;" u2="&#x11b;" k="123" />
-<hkern u1="&#x22;" u2="&#x119;" k="123" />
-<hkern u1="&#x22;" u2="&#x117;" k="123" />
-<hkern u1="&#x22;" u2="&#x115;" k="123" />
-<hkern u1="&#x22;" u2="&#x113;" k="123" />
-<hkern u1="&#x22;" u2="&#x111;" k="123" />
-<hkern u1="&#x22;" u2="&#x10f;" k="123" />
-<hkern u1="&#x22;" u2="&#x10d;" k="123" />
-<hkern u1="&#x22;" u2="&#x10b;" k="123" />
-<hkern u1="&#x22;" u2="&#x109;" k="123" />
-<hkern u1="&#x22;" u2="&#x107;" k="123" />
-<hkern u1="&#x22;" u2="&#x105;" k="82" />
-<hkern u1="&#x22;" u2="&#x104;" k="143" />
-<hkern u1="&#x22;" u2="&#x103;" k="82" />
-<hkern u1="&#x22;" u2="&#x102;" k="143" />
-<hkern u1="&#x22;" u2="&#x101;" k="82" />
-<hkern u1="&#x22;" u2="&#x100;" k="143" />
-<hkern u1="&#x22;" u2="&#xfc;" k="61" />
-<hkern u1="&#x22;" u2="&#xfb;" k="61" />
-<hkern u1="&#x22;" u2="&#xfa;" k="61" />
-<hkern u1="&#x22;" u2="&#xf9;" k="61" />
-<hkern u1="&#x22;" u2="&#xf8;" k="123" />
-<hkern u1="&#x22;" u2="&#xf6;" k="123" />
-<hkern u1="&#x22;" u2="&#xf5;" k="123" />
-<hkern u1="&#x22;" u2="&#xf4;" k="123" />
-<hkern u1="&#x22;" u2="&#xf3;" k="123" />
-<hkern u1="&#x22;" u2="&#xf2;" k="123" />
-<hkern u1="&#x22;" u2="&#xeb;" k="123" />
-<hkern u1="&#x22;" u2="&#xea;" k="123" />
-<hkern u1="&#x22;" u2="&#xe9;" k="123" />
-<hkern u1="&#x22;" u2="&#xe8;" k="123" />
-<hkern u1="&#x22;" u2="&#xe7;" k="123" />
-<hkern u1="&#x22;" u2="&#xe6;" k="82" />
-<hkern u1="&#x22;" u2="&#xe5;" k="82" />
-<hkern u1="&#x22;" u2="&#xe4;" k="82" />
-<hkern u1="&#x22;" u2="&#xe3;" k="82" />
-<hkern u1="&#x22;" u2="&#xe2;" k="82" />
-<hkern u1="&#x22;" u2="&#xe1;" k="82" />
-<hkern u1="&#x22;" u2="&#xe0;" k="123" />
-<hkern u1="&#x22;" u2="&#xdd;" k="-20" />
-<hkern u1="&#x22;" u2="&#xc5;" k="143" />
-<hkern u1="&#x22;" u2="&#xc4;" k="143" />
-<hkern u1="&#x22;" u2="&#xc3;" k="143" />
-<hkern u1="&#x22;" u2="&#xc2;" k="143" />
-<hkern u1="&#x22;" u2="&#xc1;" k="143" />
-<hkern u1="&#x22;" u2="&#xc0;" k="143" />
-<hkern u1="&#x22;" u2="u" k="61" />
-<hkern u1="&#x22;" u2="s" k="61" />
-<hkern u1="&#x22;" u2="r" k="61" />
-<hkern u1="&#x22;" u2="q" k="123" />
-<hkern u1="&#x22;" u2="p" k="61" />
-<hkern u1="&#x22;" u2="o" k="123" />
-<hkern u1="&#x22;" u2="n" k="61" />
-<hkern u1="&#x22;" u2="m" k="61" />
-<hkern u1="&#x22;" u2="g" k="61" />
-<hkern u1="&#x22;" u2="e" k="123" />
-<hkern u1="&#x22;" u2="d" k="123" />
-<hkern u1="&#x22;" u2="c" k="123" />
-<hkern u1="&#x22;" u2="a" k="82" />
-<hkern u1="&#x22;" u2="Y" k="-20" />
-<hkern u1="&#x22;" u2="W" k="-41" />
-<hkern u1="&#x22;" u2="V" k="-41" />
-<hkern u1="&#x22;" u2="T" k="-41" />
-<hkern u1="&#x22;" u2="A" k="143" />
-<hkern u1="&#x27;" u2="&#x1ef8;" k="-20" />
-<hkern u1="&#x27;" u2="&#x1ef6;" k="-20" />
-<hkern u1="&#x27;" u2="&#x1ef4;" k="-20" />
-<hkern u1="&#x27;" u2="&#x1ef2;" k="-20" />
-<hkern u1="&#x27;" u2="&#x1ef1;" k="61" />
-<hkern u1="&#x27;" u2="&#x1eef;" k="61" />
-<hkern u1="&#x27;" u2="&#x1eed;" k="61" />
-<hkern u1="&#x27;" u2="&#x1eeb;" k="61" />
-<hkern u1="&#x27;" u2="&#x1ee9;" k="61" />
-<hkern u1="&#x27;" u2="&#x1ee7;" k="61" />
-<hkern u1="&#x27;" u2="&#x1ee5;" k="61" />
-<hkern u1="&#x27;" u2="&#x1ee3;" k="123" />
-<hkern u1="&#x27;" u2="&#x1ee1;" k="123" />
-<hkern u1="&#x27;" u2="&#x1edf;" k="123" />
-<hkern u1="&#x27;" u2="&#x1edd;" k="123" />
-<hkern u1="&#x27;" u2="&#x1edb;" k="123" />
-<hkern u1="&#x27;" u2="&#x1ed9;" k="123" />
-<hkern u1="&#x27;" u2="&#x1ed7;" k="123" />
-<hkern u1="&#x27;" u2="&#x1ed5;" k="123" />
-<hkern u1="&#x27;" u2="&#x1ed1;" k="123" />
-<hkern u1="&#x27;" u2="&#x1ecf;" k="123" />
-<hkern u1="&#x27;" u2="&#x1ecd;" k="123" />
-<hkern u1="&#x27;" u2="&#x1ec7;" k="123" />
-<hkern u1="&#x27;" u2="&#x1ec5;" k="123" />
-<hkern u1="&#x27;" u2="&#x1ec3;" k="123" />
-<hkern u1="&#x27;" u2="&#x1ebf;" k="123" />
-<hkern u1="&#x27;" u2="&#x1ebd;" k="123" />
-<hkern u1="&#x27;" u2="&#x1ebb;" k="123" />
-<hkern u1="&#x27;" u2="&#x1eb9;" k="123" />
-<hkern u1="&#x27;" u2="&#x1eb7;" k="82" />
-<hkern u1="&#x27;" u2="&#x1eb6;" k="143" />
-<hkern u1="&#x27;" u2="&#x1eb5;" k="82" />
-<hkern u1="&#x27;" u2="&#x1eb4;" k="143" />
-<hkern u1="&#x27;" u2="&#x1eb3;" k="82" />
-<hkern u1="&#x27;" u2="&#x1eb2;" k="143" />
-<hkern u1="&#x27;" u2="&#x1eb1;" k="82" />
-<hkern u1="&#x27;" u2="&#x1eb0;" k="143" />
-<hkern u1="&#x27;" u2="&#x1eaf;" k="82" />
-<hkern u1="&#x27;" u2="&#x1eae;" k="143" />
-<hkern u1="&#x27;" u2="&#x1ead;" k="82" />
-<hkern u1="&#x27;" u2="&#x1eac;" k="143" />
-<hkern u1="&#x27;" u2="&#x1eab;" k="82" />
-<hkern u1="&#x27;" u2="&#x1eaa;" k="143" />
-<hkern u1="&#x27;" u2="&#x1ea9;" k="82" />
-<hkern u1="&#x27;" u2="&#x1ea8;" k="143" />
-<hkern u1="&#x27;" u2="&#x1ea6;" k="143" />
-<hkern u1="&#x27;" u2="&#x1ea5;" k="82" />
-<hkern u1="&#x27;" u2="&#x1ea4;" k="143" />
-<hkern u1="&#x27;" u2="&#x1ea3;" k="82" />
-<hkern u1="&#x27;" u2="&#x1ea2;" k="143" />
-<hkern u1="&#x27;" u2="&#x1ea1;" k="82" />
-<hkern u1="&#x27;" u2="&#x1ea0;" k="143" />
-<hkern u1="&#x27;" u2="&#x1e84;" k="-41" />
-<hkern u1="&#x27;" u2="&#x1e82;" k="-41" />
-<hkern u1="&#x27;" u2="&#x1e80;" k="-41" />
-<hkern u1="&#x27;" u2="&#x1e3f;" k="61" />
-<hkern u1="&#x27;" u2="&#x1e01;" k="82" />
-<hkern u1="&#x27;" u2="&#x1e00;" k="143" />
-<hkern u1="&#x27;" u2="&#x513;" k="143" />
-<hkern u1="&#x27;" u2="&#x512;" k="123" />
-<hkern u1="&#x27;" u2="&#x511;" k="123" />
-<hkern u1="&#x27;" u2="&#x50d;" k="123" />
-<hkern u1="&#x27;" u2="&#x509;" k="143" />
-<hkern u1="&#x27;" u2="&#x508;" k="123" />
-<hkern u1="&#x27;" u2="&#x503;" k="123" />
-<hkern u1="&#x27;" u2="&#x502;" k="143" />
-<hkern u1="&#x27;" u2="&#x501;" k="123" />
-<hkern u1="&#x27;" u2="&#x500;" k="143" />
-<hkern u1="&#x27;" u2="&#x4eb;" k="123" />
-<hkern u1="&#x27;" u2="&#x4e9;" k="123" />
-<hkern u1="&#x27;" u2="&#x4e7;" k="123" />
-<hkern u1="&#x27;" u2="&#x4db;" k="41" />
-<hkern u1="&#x27;" u2="&#x4d9;" k="41" />
-<hkern u1="&#x27;" u2="&#x4d7;" k="123" />
-<hkern u1="&#x27;" u2="&#x4d5;" k="41" />
-<hkern u1="&#x27;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x27;" u2="&#x4d3;" k="41" />
-<hkern u1="&#x27;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x27;" u2="&#x4d1;" k="41" />
-<hkern u1="&#x27;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x27;" u2="&#x4c6;" k="143" />
-<hkern u1="&#x27;" u2="&#x4c5;" k="123" />
-<hkern u1="&#x27;" u2="&#x4ab;" k="123" />
-<hkern u1="&#x27;" u2="&#x4a9;" k="123" />
-<hkern u1="&#x27;" u2="&#x481;" k="123" />
-<hkern u1="&#x27;" u2="&#x47d;" k="123" />
-<hkern u1="&#x27;" u2="&#x47b;" k="123" />
-<hkern u1="&#x27;" u2="&#x479;" k="123" />
-<hkern u1="&#x27;" u2="&#x473;" k="123" />
-<hkern u1="&#x27;" u2="&#x471;" k="20" />
-<hkern u1="&#x27;" u2="&#x467;" k="143" />
-<hkern u1="&#x27;" u2="&#x466;" k="143" />
-<hkern u1="&#x27;" u2="&#x459;" k="143" />
-<hkern u1="&#x27;" u2="&#x455;" k="61" />
-<hkern u1="&#x27;" u2="&#x454;" k="123" />
-<hkern u1="&#x27;" u2="&#x451;" k="123" />
-<hkern u1="&#x27;" u2="&#x450;" k="123" />
-<hkern u1="&#x27;" u2="&#x444;" k="123" />
-<hkern u1="&#x27;" u2="&#x441;" k="123" />
-<hkern u1="&#x27;" u2="&#x43e;" k="123" />
-<hkern u1="&#x27;" u2="&#x43b;" k="143" />
-<hkern u1="&#x27;" u2="&#x435;" k="123" />
-<hkern u1="&#x27;" u2="&#x434;" k="143" />
-<hkern u1="&#x27;" u2="&#x430;" k="41" />
-<hkern u1="&#x27;" u2="&#x41b;" k="123" />
-<hkern u1="&#x27;" u2="&#x414;" k="123" />
-<hkern u1="&#x27;" u2="&#x410;" k="143" />
-<hkern u1="&#x27;" u2="&#x409;" k="123" />
-<hkern u1="&#x27;" u2="&#x3cc;" k="82" />
-<hkern u1="&#x27;" u2="&#x3c6;" k="82" />
-<hkern u1="&#x27;" u2="&#x3c3;" k="82" />
-<hkern u1="&#x27;" u2="&#x3c2;" k="82" />
-<hkern u1="&#x27;" u2="&#x3c1;" k="61" />
-<hkern u1="&#x27;" u2="&#x3bf;" k="82" />
-<hkern u1="&#x27;" u2="&#x3bc;" k="41" />
-<hkern u1="&#x27;" u2="&#x3ba;" k="41" />
-<hkern u1="&#x27;" u2="&#x3b7;" k="41" />
-<hkern u1="&#x27;" u2="&#x3b6;" k="41" />
-<hkern u1="&#x27;" u2="&#x3b5;" k="41" />
-<hkern u1="&#x27;" u2="&#x3b4;" k="61" />
-<hkern u1="&#x27;" u2="&#x3b1;" k="82" />
-<hkern u1="&#x27;" u2="&#x3ae;" k="41" />
-<hkern u1="&#x27;" u2="&#x3ad;" k="41" />
-<hkern u1="&#x27;" u2="&#x3ac;" k="82" />
-<hkern u1="&#x27;" u2="&#x39b;" k="143" />
-<hkern u1="&#x27;" u2="&#x394;" k="143" />
-<hkern u1="&#x27;" u2="&#x391;" k="143" />
-<hkern u1="&#x27;" u2="&#x386;" k="143" />
-<hkern u1="&#x27;" u2="&#x21a;" k="-41" />
-<hkern u1="&#x27;" u2="&#x219;" k="61" />
-<hkern u1="&#x27;" u2="&#x1ff;" k="123" />
-<hkern u1="&#x27;" u2="&#x1fd;" k="82" />
-<hkern u1="&#x27;" u2="&#x1fb;" k="82" />
-<hkern u1="&#x27;" u2="&#x1fa;" k="143" />
-<hkern u1="&#x27;" u2="&#x1b0;" k="61" />
-<hkern u1="&#x27;" u2="&#x1a1;" k="123" />
-<hkern u1="&#x27;" u2="&#x178;" k="-20" />
-<hkern u1="&#x27;" u2="&#x176;" k="-20" />
-<hkern u1="&#x27;" u2="&#x174;" k="-41" />
-<hkern u1="&#x27;" u2="&#x173;" k="61" />
-<hkern u1="&#x27;" u2="&#x171;" k="61" />
-<hkern u1="&#x27;" u2="&#x16f;" k="61" />
-<hkern u1="&#x27;" u2="&#x16d;" k="61" />
-<hkern u1="&#x27;" u2="&#x16b;" k="61" />
-<hkern u1="&#x27;" u2="&#x169;" k="61" />
-<hkern u1="&#x27;" u2="&#x164;" k="-41" />
-<hkern u1="&#x27;" u2="&#x162;" k="-41" />
-<hkern u1="&#x27;" u2="&#x15f;" k="61" />
-<hkern u1="&#x27;" u2="&#x15b;" k="61" />
-<hkern u1="&#x27;" u2="&#x157;" k="61" />
-<hkern u1="&#x27;" u2="&#x155;" k="61" />
-<hkern u1="&#x27;" u2="&#x153;" k="123" />
-<hkern u1="&#x27;" u2="&#x151;" k="123" />
-<hkern u1="&#x27;" u2="&#x14f;" k="123" />
-<hkern u1="&#x27;" u2="&#x14d;" k="123" />
-<hkern u1="&#x27;" u2="&#x14b;" k="61" />
-<hkern u1="&#x27;" u2="&#x146;" k="61" />
-<hkern u1="&#x27;" u2="&#x144;" k="61" />
-<hkern u1="&#x27;" u2="&#x138;" k="61" />
-<hkern u1="&#x27;" u2="&#x123;" k="61" />
-<hkern u1="&#x27;" u2="&#x121;" k="61" />
-<hkern u1="&#x27;" u2="&#x11f;" k="61" />
-<hkern u1="&#x27;" u2="&#x11d;" k="61" />
-<hkern u1="&#x27;" u2="&#x11b;" k="123" />
-<hkern u1="&#x27;" u2="&#x119;" k="123" />
-<hkern u1="&#x27;" u2="&#x117;" k="123" />
-<hkern u1="&#x27;" u2="&#x115;" k="123" />
-<hkern u1="&#x27;" u2="&#x113;" k="123" />
-<hkern u1="&#x27;" u2="&#x111;" k="123" />
-<hkern u1="&#x27;" u2="&#x10f;" k="123" />
-<hkern u1="&#x27;" u2="&#x10d;" k="123" />
-<hkern u1="&#x27;" u2="&#x10b;" k="123" />
-<hkern u1="&#x27;" u2="&#x109;" k="123" />
-<hkern u1="&#x27;" u2="&#x107;" k="123" />
-<hkern u1="&#x27;" u2="&#x105;" k="82" />
-<hkern u1="&#x27;" u2="&#x104;" k="143" />
-<hkern u1="&#x27;" u2="&#x103;" k="82" />
-<hkern u1="&#x27;" u2="&#x102;" k="143" />
-<hkern u1="&#x27;" u2="&#x101;" k="82" />
-<hkern u1="&#x27;" u2="&#x100;" k="143" />
-<hkern u1="&#x27;" u2="&#xfc;" k="61" />
-<hkern u1="&#x27;" u2="&#xfb;" k="61" />
-<hkern u1="&#x27;" u2="&#xfa;" k="61" />
-<hkern u1="&#x27;" u2="&#xf9;" k="61" />
-<hkern u1="&#x27;" u2="&#xf8;" k="123" />
-<hkern u1="&#x27;" u2="&#xf6;" k="123" />
-<hkern u1="&#x27;" u2="&#xf5;" k="123" />
-<hkern u1="&#x27;" u2="&#xf4;" k="123" />
-<hkern u1="&#x27;" u2="&#xf3;" k="123" />
-<hkern u1="&#x27;" u2="&#xf2;" k="123" />
-<hkern u1="&#x27;" u2="&#xeb;" k="123" />
-<hkern u1="&#x27;" u2="&#xea;" k="123" />
-<hkern u1="&#x27;" u2="&#xe9;" k="123" />
-<hkern u1="&#x27;" u2="&#xe8;" k="123" />
-<hkern u1="&#x27;" u2="&#xe7;" k="123" />
-<hkern u1="&#x27;" u2="&#xe6;" k="82" />
-<hkern u1="&#x27;" u2="&#xe5;" k="82" />
-<hkern u1="&#x27;" u2="&#xe4;" k="82" />
-<hkern u1="&#x27;" u2="&#xe3;" k="82" />
-<hkern u1="&#x27;" u2="&#xe2;" k="82" />
-<hkern u1="&#x27;" u2="&#xe1;" k="82" />
-<hkern u1="&#x27;" u2="&#xe0;" k="123" />
-<hkern u1="&#x27;" u2="&#xdd;" k="-20" />
-<hkern u1="&#x27;" u2="&#xc5;" k="143" />
-<hkern u1="&#x27;" u2="&#xc4;" k="143" />
-<hkern u1="&#x27;" u2="&#xc3;" k="143" />
-<hkern u1="&#x27;" u2="&#xc2;" k="143" />
-<hkern u1="&#x27;" u2="&#xc1;" k="143" />
-<hkern u1="&#x27;" u2="&#xc0;" k="143" />
-<hkern u1="&#x27;" u2="u" k="61" />
-<hkern u1="&#x27;" u2="s" k="61" />
-<hkern u1="&#x27;" u2="r" k="61" />
-<hkern u1="&#x27;" u2="q" k="123" />
-<hkern u1="&#x27;" u2="p" k="61" />
-<hkern u1="&#x27;" u2="o" k="123" />
-<hkern u1="&#x27;" u2="n" k="61" />
-<hkern u1="&#x27;" u2="m" k="61" />
-<hkern u1="&#x27;" u2="g" k="61" />
-<hkern u1="&#x27;" u2="e" k="123" />
-<hkern u1="&#x27;" u2="d" k="123" />
-<hkern u1="&#x27;" u2="c" k="123" />
-<hkern u1="&#x27;" u2="a" k="82" />
-<hkern u1="&#x27;" u2="Y" k="-20" />
-<hkern u1="&#x27;" u2="W" k="-41" />
-<hkern u1="&#x27;" u2="V" k="-41" />
-<hkern u1="&#x27;" u2="T" k="-41" />
-<hkern u1="&#x27;" u2="A" k="143" />
-<hkern u1="&#x28;" u2="J" k="-184" />
-<hkern u1="&#x2c;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x2c;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x2c;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x2c;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x2c;" u2="&#x1ef0;" k="41" />
-<hkern u1="&#x2c;" u2="&#x1eee;" k="41" />
-<hkern u1="&#x2c;" u2="&#x1eec;" k="41" />
-<hkern u1="&#x2c;" u2="&#x1eea;" k="41" />
-<hkern u1="&#x2c;" u2="&#x1ee8;" k="41" />
-<hkern u1="&#x2c;" u2="&#x1ee6;" k="41" />
-<hkern u1="&#x2c;" u2="&#x1ee4;" k="41" />
-<hkern u1="&#x2c;" u2="&#x1ee2;" k="102" />
-<hkern u1="&#x2c;" u2="&#x1ee0;" k="102" />
-<hkern u1="&#x2c;" u2="&#x1ede;" k="102" />
-<hkern u1="&#x2c;" u2="&#x1edc;" k="102" />
-<hkern u1="&#x2c;" u2="&#x1eda;" k="102" />
-<hkern u1="&#x2c;" u2="&#x1ed8;" k="102" />
-<hkern u1="&#x2c;" u2="&#x1ed6;" k="102" />
-<hkern u1="&#x2c;" u2="&#x1ed4;" k="102" />
-<hkern u1="&#x2c;" u2="&#x1ed2;" k="102" />
-<hkern u1="&#x2c;" u2="&#x1ed0;" k="102" />
-<hkern u1="&#x2c;" u2="&#x1ece;" k="102" />
-<hkern u1="&#x2c;" u2="&#x1ecc;" k="102" />
-<hkern u1="&#x2c;" u2="&#x1e84;" k="123" />
-<hkern u1="&#x2c;" u2="&#x1e82;" k="123" />
-<hkern u1="&#x2c;" u2="&#x1e80;" k="123" />
-<hkern u1="&#x2c;" u2="&#x50f;" k="102" />
-<hkern u1="&#x2c;" u2="&#x50e;" k="143" />
-<hkern u1="&#x2c;" u2="&#x50c;" k="102" />
-<hkern u1="&#x2c;" u2="&#x507;" k="102" />
-<hkern u1="&#x2c;" u2="&#x506;" k="123" />
-<hkern u1="&#x2c;" u2="&#x505;" k="102" />
-<hkern u1="&#x2c;" u2="&#x504;" k="123" />
-<hkern u1="&#x2c;" u2="&#x4f5;" k="123" />
-<hkern u1="&#x2c;" u2="&#x4f4;" k="164" />
-<hkern u1="&#x2c;" u2="&#x4ea;" k="102" />
-<hkern u1="&#x2c;" u2="&#x4e8;" k="102" />
-<hkern u1="&#x2c;" u2="&#x4e6;" k="102" />
-<hkern u1="&#x2c;" u2="&#x4cc;" k="123" />
-<hkern u1="&#x2c;" u2="&#x4cb;" k="164" />
-<hkern u1="&#x2c;" u2="&#x4be;" k="123" />
-<hkern u1="&#x2c;" u2="&#x4bc;" k="123" />
-<hkern u1="&#x2c;" u2="&#x4b9;" k="123" />
-<hkern u1="&#x2c;" u2="&#x4b8;" k="164" />
-<hkern u1="&#x2c;" u2="&#x4b7;" k="123" />
-<hkern u1="&#x2c;" u2="&#x4b6;" k="164" />
-<hkern u1="&#x2c;" u2="&#x4b5;" k="102" />
-<hkern u1="&#x2c;" u2="&#x4b4;" k="143" />
-<hkern u1="&#x2c;" u2="&#x4b0;" k="123" />
-<hkern u1="&#x2c;" u2="&#x4ae;" k="123" />
-<hkern u1="&#x2c;" u2="&#x4ad;" k="102" />
-<hkern u1="&#x2c;" u2="&#x4ac;" k="143" />
-<hkern u1="&#x2c;" u2="&#x4aa;" k="102" />
-<hkern u1="&#x2c;" u2="&#x4a8;" k="102" />
-<hkern u1="&#x2c;" u2="&#x4a1;" k="102" />
-<hkern u1="&#x2c;" u2="&#x4a0;" k="143" />
-<hkern u1="&#x2c;" u2="&#x480;" k="102" />
-<hkern u1="&#x2c;" u2="&#x47e;" k="102" />
-<hkern u1="&#x2c;" u2="&#x47c;" k="102" />
-<hkern u1="&#x2c;" u2="&#x47a;" k="102" />
-<hkern u1="&#x2c;" u2="&#x478;" k="102" />
-<hkern u1="&#x2c;" u2="&#x476;" k="123" />
-<hkern u1="&#x2c;" u2="&#x474;" k="123" />
-<hkern u1="&#x2c;" u2="&#x472;" k="102" />
-<hkern u1="&#x2c;" u2="&#x470;" k="164" />
-<hkern u1="&#x2c;" u2="&#x460;" k="102" />
-<hkern u1="&#x2c;" u2="&#x44a;" k="102" />
-<hkern u1="&#x2c;" u2="&#x447;" k="123" />
-<hkern u1="&#x2c;" u2="&#x442;" k="102" />
-<hkern u1="&#x2c;" u2="&#x42a;" k="143" />
-<hkern u1="&#x2c;" u2="&#x427;" k="164" />
-<hkern u1="&#x2c;" u2="&#x424;" k="82" />
-<hkern u1="&#x2c;" u2="&#x422;" k="143" />
-<hkern u1="&#x2c;" u2="&#x421;" k="102" />
-<hkern u1="&#x2c;" u2="&#x41e;" k="102" />
-<hkern u1="&#x2c;" u2="&#x40b;" k="143" />
-<hkern u1="&#x2c;" u2="&#x404;" k="102" />
-<hkern u1="&#x2c;" u2="&#x402;" k="143" />
-<hkern u1="&#x2c;" u2="&#x3d2;" k="123" />
-<hkern u1="&#x2c;" u2="&#x3b8;" k="41" />
-<hkern u1="&#x2c;" u2="&#x3ab;" k="123" />
-<hkern u1="&#x2c;" u2="&#x3a8;" k="123" />
-<hkern u1="&#x2c;" u2="&#x3a6;" k="102" />
-<hkern u1="&#x2c;" u2="&#x3a5;" k="123" />
-<hkern u1="&#x2c;" u2="&#x3a4;" k="143" />
-<hkern u1="&#x2c;" u2="&#x39f;" k="82" />
-<hkern u1="&#x2c;" u2="&#x398;" k="82" />
-<hkern u1="&#x2c;" u2="&#x21a;" k="143" />
-<hkern u1="&#x2c;" u2="&#x1fe;" k="102" />
-<hkern u1="&#x2c;" u2="&#x1af;" k="41" />
-<hkern u1="&#x2c;" u2="&#x1a0;" k="102" />
-<hkern u1="&#x2c;" u2="&#x178;" k="123" />
-<hkern u1="&#x2c;" u2="&#x176;" k="123" />
-<hkern u1="&#x2c;" u2="&#x174;" k="123" />
-<hkern u1="&#x2c;" u2="&#x172;" k="41" />
-<hkern u1="&#x2c;" u2="&#x170;" k="41" />
-<hkern u1="&#x2c;" u2="&#x16e;" k="41" />
-<hkern u1="&#x2c;" u2="&#x16c;" k="41" />
-<hkern u1="&#x2c;" u2="&#x16a;" k="41" />
-<hkern u1="&#x2c;" u2="&#x168;" k="41" />
-<hkern u1="&#x2c;" u2="&#x164;" k="143" />
-<hkern u1="&#x2c;" u2="&#x162;" k="143" />
-<hkern u1="&#x2c;" u2="&#x152;" k="102" />
-<hkern u1="&#x2c;" u2="&#x150;" k="102" />
-<hkern u1="&#x2c;" u2="&#x14e;" k="102" />
-<hkern u1="&#x2c;" u2="&#x14c;" k="102" />
-<hkern u1="&#x2c;" u2="&#x122;" k="102" />
-<hkern u1="&#x2c;" u2="&#x120;" k="102" />
-<hkern u1="&#x2c;" u2="&#x11e;" k="102" />
-<hkern u1="&#x2c;" u2="&#x11c;" k="102" />
-<hkern u1="&#x2c;" u2="&#x10c;" k="102" />
-<hkern u1="&#x2c;" u2="&#x10a;" k="102" />
-<hkern u1="&#x2c;" u2="&#x108;" k="102" />
-<hkern u1="&#x2c;" u2="&#x106;" k="102" />
-<hkern u1="&#x2c;" u2="&#xdd;" k="123" />
-<hkern u1="&#x2c;" u2="&#xdc;" k="41" />
-<hkern u1="&#x2c;" u2="&#xdb;" k="41" />
-<hkern u1="&#x2c;" u2="&#xda;" k="41" />
-<hkern u1="&#x2c;" u2="&#xd9;" k="41" />
-<hkern u1="&#x2c;" u2="&#xd8;" k="102" />
-<hkern u1="&#x2c;" u2="&#xd6;" k="102" />
-<hkern u1="&#x2c;" u2="&#xd5;" k="102" />
-<hkern u1="&#x2c;" u2="&#xd4;" k="102" />
-<hkern u1="&#x2c;" u2="&#xd3;" k="102" />
-<hkern u1="&#x2c;" u2="&#xd2;" k="102" />
-<hkern u1="&#x2c;" u2="&#xc7;" k="102" />
-<hkern u1="&#x2c;" u2="Y" k="123" />
-<hkern u1="&#x2c;" u2="W" k="123" />
-<hkern u1="&#x2c;" u2="V" k="123" />
-<hkern u1="&#x2c;" u2="U" k="41" />
-<hkern u1="&#x2c;" u2="T" k="143" />
-<hkern u1="&#x2c;" u2="Q" k="102" />
-<hkern u1="&#x2c;" u2="O" k="102" />
-<hkern u1="&#x2c;" u2="G" k="102" />
-<hkern u1="&#x2c;" u2="C" k="102" />
-<hkern u1="&#x2d;" u2="&#x50f;" k="41" />
-<hkern u1="&#x2d;" u2="&#x50e;" k="82" />
-<hkern u1="&#x2d;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x2d;" u2="&#x4b4;" k="82" />
-<hkern u1="&#x2d;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x2d;" u2="&#x4ac;" k="82" />
-<hkern u1="&#x2d;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x2d;" u2="&#x4a0;" k="82" />
-<hkern u1="&#x2d;" u2="&#x44a;" k="41" />
-<hkern u1="&#x2d;" u2="&#x442;" k="41" />
-<hkern u1="&#x2d;" u2="&#x42a;" k="82" />
-<hkern u1="&#x2d;" u2="&#x422;" k="82" />
-<hkern u1="&#x2d;" u2="&#x40b;" k="82" />
-<hkern u1="&#x2d;" u2="&#x402;" k="82" />
-<hkern u1="&#x2d;" u2="&#x3a4;" k="82" />
-<hkern u1="&#x2d;" u2="&#x21a;" k="82" />
-<hkern u1="&#x2d;" u2="&#x164;" k="82" />
-<hkern u1="&#x2d;" u2="&#x162;" k="82" />
-<hkern u1="&#x2d;" u2="T" k="82" />
-<hkern u1="&#x2e;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x2e;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x2e;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x2e;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x2e;" u2="&#x1ef0;" k="41" />
-<hkern u1="&#x2e;" u2="&#x1eee;" k="41" />
-<hkern u1="&#x2e;" u2="&#x1eec;" k="41" />
-<hkern u1="&#x2e;" u2="&#x1eea;" k="41" />
-<hkern u1="&#x2e;" u2="&#x1ee8;" k="41" />
-<hkern u1="&#x2e;" u2="&#x1ee6;" k="41" />
-<hkern u1="&#x2e;" u2="&#x1ee4;" k="41" />
-<hkern u1="&#x2e;" u2="&#x1ee2;" k="102" />
-<hkern u1="&#x2e;" u2="&#x1ee0;" k="102" />
-<hkern u1="&#x2e;" u2="&#x1ede;" k="102" />
-<hkern u1="&#x2e;" u2="&#x1edc;" k="102" />
-<hkern u1="&#x2e;" u2="&#x1eda;" k="102" />
-<hkern u1="&#x2e;" u2="&#x1ed8;" k="102" />
-<hkern u1="&#x2e;" u2="&#x1ed6;" k="102" />
-<hkern u1="&#x2e;" u2="&#x1ed4;" k="102" />
-<hkern u1="&#x2e;" u2="&#x1ed2;" k="102" />
-<hkern u1="&#x2e;" u2="&#x1ed0;" k="102" />
-<hkern u1="&#x2e;" u2="&#x1ece;" k="102" />
-<hkern u1="&#x2e;" u2="&#x1ecc;" k="102" />
-<hkern u1="&#x2e;" u2="&#x1e84;" k="123" />
-<hkern u1="&#x2e;" u2="&#x1e82;" k="123" />
-<hkern u1="&#x2e;" u2="&#x1e80;" k="123" />
-<hkern u1="&#x2e;" u2="&#x50f;" k="102" />
-<hkern u1="&#x2e;" u2="&#x50e;" k="143" />
-<hkern u1="&#x2e;" u2="&#x50c;" k="102" />
-<hkern u1="&#x2e;" u2="&#x507;" k="102" />
-<hkern u1="&#x2e;" u2="&#x506;" k="123" />
-<hkern u1="&#x2e;" u2="&#x505;" k="102" />
-<hkern u1="&#x2e;" u2="&#x504;" k="123" />
-<hkern u1="&#x2e;" u2="&#x4f5;" k="123" />
-<hkern u1="&#x2e;" u2="&#x4f4;" k="164" />
-<hkern u1="&#x2e;" u2="&#x4ea;" k="102" />
-<hkern u1="&#x2e;" u2="&#x4e8;" k="102" />
-<hkern u1="&#x2e;" u2="&#x4e6;" k="102" />
-<hkern u1="&#x2e;" u2="&#x4cc;" k="123" />
-<hkern u1="&#x2e;" u2="&#x4cb;" k="164" />
-<hkern u1="&#x2e;" u2="&#x4be;" k="123" />
-<hkern u1="&#x2e;" u2="&#x4bc;" k="123" />
-<hkern u1="&#x2e;" u2="&#x4b9;" k="123" />
-<hkern u1="&#x2e;" u2="&#x4b8;" k="164" />
-<hkern u1="&#x2e;" u2="&#x4b7;" k="123" />
-<hkern u1="&#x2e;" u2="&#x4b6;" k="164" />
-<hkern u1="&#x2e;" u2="&#x4b5;" k="102" />
-<hkern u1="&#x2e;" u2="&#x4b4;" k="143" />
-<hkern u1="&#x2e;" u2="&#x4b0;" k="123" />
-<hkern u1="&#x2e;" u2="&#x4ae;" k="123" />
-<hkern u1="&#x2e;" u2="&#x4ad;" k="102" />
-<hkern u1="&#x2e;" u2="&#x4ac;" k="143" />
-<hkern u1="&#x2e;" u2="&#x4aa;" k="102" />
-<hkern u1="&#x2e;" u2="&#x4a8;" k="102" />
-<hkern u1="&#x2e;" u2="&#x4a1;" k="102" />
-<hkern u1="&#x2e;" u2="&#x4a0;" k="143" />
-<hkern u1="&#x2e;" u2="&#x480;" k="102" />
-<hkern u1="&#x2e;" u2="&#x47e;" k="102" />
-<hkern u1="&#x2e;" u2="&#x47c;" k="102" />
-<hkern u1="&#x2e;" u2="&#x47a;" k="102" />
-<hkern u1="&#x2e;" u2="&#x478;" k="102" />
-<hkern u1="&#x2e;" u2="&#x476;" k="123" />
-<hkern u1="&#x2e;" u2="&#x474;" k="123" />
-<hkern u1="&#x2e;" u2="&#x472;" k="102" />
-<hkern u1="&#x2e;" u2="&#x470;" k="164" />
-<hkern u1="&#x2e;" u2="&#x460;" k="102" />
-<hkern u1="&#x2e;" u2="&#x44a;" k="102" />
-<hkern u1="&#x2e;" u2="&#x447;" k="123" />
-<hkern u1="&#x2e;" u2="&#x442;" k="102" />
-<hkern u1="&#x2e;" u2="&#x42a;" k="143" />
-<hkern u1="&#x2e;" u2="&#x427;" k="164" />
-<hkern u1="&#x2e;" u2="&#x424;" k="82" />
-<hkern u1="&#x2e;" u2="&#x422;" k="143" />
-<hkern u1="&#x2e;" u2="&#x421;" k="102" />
-<hkern u1="&#x2e;" u2="&#x41e;" k="102" />
-<hkern u1="&#x2e;" u2="&#x40b;" k="143" />
-<hkern u1="&#x2e;" u2="&#x404;" k="102" />
-<hkern u1="&#x2e;" u2="&#x402;" k="143" />
-<hkern u1="&#x2e;" u2="&#x3d2;" k="123" />
-<hkern u1="&#x2e;" u2="&#x3b8;" k="41" />
-<hkern u1="&#x2e;" u2="&#x3ab;" k="123" />
-<hkern u1="&#x2e;" u2="&#x3a8;" k="123" />
-<hkern u1="&#x2e;" u2="&#x3a6;" k="102" />
-<hkern u1="&#x2e;" u2="&#x3a5;" k="123" />
-<hkern u1="&#x2e;" u2="&#x3a4;" k="143" />
-<hkern u1="&#x2e;" u2="&#x39f;" k="82" />
-<hkern u1="&#x2e;" u2="&#x398;" k="82" />
-<hkern u1="&#x2e;" u2="&#x21a;" k="143" />
-<hkern u1="&#x2e;" u2="&#x1fe;" k="102" />
-<hkern u1="&#x2e;" u2="&#x1af;" k="41" />
-<hkern u1="&#x2e;" u2="&#x1a0;" k="102" />
-<hkern u1="&#x2e;" u2="&#x178;" k="123" />
-<hkern u1="&#x2e;" u2="&#x176;" k="123" />
-<hkern u1="&#x2e;" u2="&#x174;" k="123" />
-<hkern u1="&#x2e;" u2="&#x172;" k="41" />
-<hkern u1="&#x2e;" u2="&#x170;" k="41" />
-<hkern u1="&#x2e;" u2="&#x16e;" k="41" />
-<hkern u1="&#x2e;" u2="&#x16c;" k="41" />
-<hkern u1="&#x2e;" u2="&#x16a;" k="41" />
-<hkern u1="&#x2e;" u2="&#x168;" k="41" />
-<hkern u1="&#x2e;" u2="&#x164;" k="143" />
-<hkern u1="&#x2e;" u2="&#x162;" k="143" />
-<hkern u1="&#x2e;" u2="&#x152;" k="102" />
-<hkern u1="&#x2e;" u2="&#x150;" k="102" />
-<hkern u1="&#x2e;" u2="&#x14e;" k="102" />
-<hkern u1="&#x2e;" u2="&#x14c;" k="102" />
-<hkern u1="&#x2e;" u2="&#x122;" k="102" />
-<hkern u1="&#x2e;" u2="&#x120;" k="102" />
-<hkern u1="&#x2e;" u2="&#x11e;" k="102" />
-<hkern u1="&#x2e;" u2="&#x11c;" k="102" />
-<hkern u1="&#x2e;" u2="&#x10c;" k="102" />
-<hkern u1="&#x2e;" u2="&#x10a;" k="102" />
-<hkern u1="&#x2e;" u2="&#x108;" k="102" />
-<hkern u1="&#x2e;" u2="&#x106;" k="102" />
-<hkern u1="&#x2e;" u2="&#xdd;" k="123" />
-<hkern u1="&#x2e;" u2="&#xdc;" k="41" />
-<hkern u1="&#x2e;" u2="&#xdb;" k="41" />
-<hkern u1="&#x2e;" u2="&#xda;" k="41" />
-<hkern u1="&#x2e;" u2="&#xd9;" k="41" />
-<hkern u1="&#x2e;" u2="&#xd8;" k="102" />
-<hkern u1="&#x2e;" u2="&#xd6;" k="102" />
-<hkern u1="&#x2e;" u2="&#xd5;" k="102" />
-<hkern u1="&#x2e;" u2="&#xd4;" k="102" />
-<hkern u1="&#x2e;" u2="&#xd3;" k="102" />
-<hkern u1="&#x2e;" u2="&#xd2;" k="102" />
-<hkern u1="&#x2e;" u2="&#xc7;" k="102" />
-<hkern u1="&#x2e;" u2="Y" k="123" />
-<hkern u1="&#x2e;" u2="W" k="123" />
-<hkern u1="&#x2e;" u2="V" k="123" />
-<hkern u1="&#x2e;" u2="U" k="41" />
-<hkern u1="&#x2e;" u2="T" k="143" />
-<hkern u1="&#x2e;" u2="Q" k="102" />
-<hkern u1="&#x2e;" u2="O" k="102" />
-<hkern u1="&#x2e;" u2="G" k="102" />
-<hkern u1="&#x2e;" u2="C" k="102" />
-<hkern u1="A" u2="&#x201d;" k="143" />
-<hkern u1="A" u2="&#x2019;" k="143" />
-<hkern u1="A" u2="&#x1ef8;" k="123" />
-<hkern u1="A" u2="&#x1ef6;" k="123" />
-<hkern u1="A" u2="&#x1ef4;" k="123" />
-<hkern u1="A" u2="&#x1ef2;" k="123" />
-<hkern u1="A" u2="&#x1ee2;" k="41" />
-<hkern u1="A" u2="&#x1ee0;" k="41" />
-<hkern u1="A" u2="&#x1ede;" k="41" />
-<hkern u1="A" u2="&#x1edc;" k="41" />
-<hkern u1="A" u2="&#x1eda;" k="41" />
-<hkern u1="A" u2="&#x1ed8;" k="41" />
-<hkern u1="A" u2="&#x1ed6;" k="41" />
-<hkern u1="A" u2="&#x1ed4;" k="41" />
-<hkern u1="A" u2="&#x1ed2;" k="41" />
-<hkern u1="A" u2="&#x1ed0;" k="41" />
-<hkern u1="A" u2="&#x1ece;" k="41" />
-<hkern u1="A" u2="&#x1ecc;" k="41" />
-<hkern u1="A" u2="&#x1e84;" k="82" />
-<hkern u1="A" u2="&#x1e82;" k="82" />
-<hkern u1="A" u2="&#x1e80;" k="82" />
-<hkern u1="A" u2="&#x21a;" k="143" />
-<hkern u1="A" u2="&#x1fe;" k="41" />
-<hkern u1="A" u2="&#x1a0;" k="41" />
-<hkern u1="A" u2="&#x178;" k="123" />
-<hkern u1="A" u2="&#x176;" k="123" />
-<hkern u1="A" u2="&#x174;" k="82" />
-<hkern u1="A" u2="&#x164;" k="143" />
-<hkern u1="A" u2="&#x162;" k="143" />
-<hkern u1="A" u2="&#x152;" k="41" />
-<hkern u1="A" u2="&#x150;" k="41" />
-<hkern u1="A" u2="&#x14e;" k="41" />
-<hkern u1="A" u2="&#x14c;" k="41" />
-<hkern u1="A" u2="&#x122;" k="41" />
-<hkern u1="A" u2="&#x120;" k="41" />
-<hkern u1="A" u2="&#x11e;" k="41" />
-<hkern u1="A" u2="&#x11c;" k="41" />
-<hkern u1="A" u2="&#x10c;" k="41" />
-<hkern u1="A" u2="&#x10a;" k="41" />
-<hkern u1="A" u2="&#x108;" k="41" />
-<hkern u1="A" u2="&#x106;" k="41" />
-<hkern u1="A" u2="&#xdd;" k="123" />
-<hkern u1="A" u2="&#xd8;" k="41" />
-<hkern u1="A" u2="&#xd6;" k="41" />
-<hkern u1="A" u2="&#xd5;" k="41" />
-<hkern u1="A" u2="&#xd4;" k="41" />
-<hkern u1="A" u2="&#xd3;" k="41" />
-<hkern u1="A" u2="&#xd2;" k="41" />
-<hkern u1="A" u2="&#xc7;" k="41" />
-<hkern u1="A" u2="Y" k="123" />
-<hkern u1="A" u2="W" k="82" />
-<hkern u1="A" u2="V" k="82" />
-<hkern u1="A" u2="T" k="143" />
-<hkern u1="A" u2="Q" k="41" />
-<hkern u1="A" u2="O" k="41" />
-<hkern u1="A" u2="J" k="-266" />
-<hkern u1="A" u2="G" k="41" />
-<hkern u1="A" u2="C" k="41" />
-<hkern u1="A" u2="&#x27;" k="143" />
-<hkern u1="A" u2="&#x22;" k="143" />
-<hkern u1="B" u2="&#x201e;" k="82" />
-<hkern u1="B" u2="&#x201a;" k="82" />
-<hkern u1="B" u2="&#x1ef8;" k="20" />
-<hkern u1="B" u2="&#x1ef6;" k="20" />
-<hkern u1="B" u2="&#x1ef4;" k="20" />
-<hkern u1="B" u2="&#x1ef2;" k="20" />
-<hkern u1="B" u2="&#x1eb6;" k="41" />
-<hkern u1="B" u2="&#x1eb4;" k="41" />
-<hkern u1="B" u2="&#x1eb2;" k="41" />
-<hkern u1="B" u2="&#x1eb0;" k="41" />
-<hkern u1="B" u2="&#x1eae;" k="41" />
-<hkern u1="B" u2="&#x1eac;" k="41" />
-<hkern u1="B" u2="&#x1eaa;" k="41" />
-<hkern u1="B" u2="&#x1ea8;" k="41" />
-<hkern u1="B" u2="&#x1ea6;" k="41" />
-<hkern u1="B" u2="&#x1ea4;" k="41" />
-<hkern u1="B" u2="&#x1ea2;" k="41" />
-<hkern u1="B" u2="&#x1ea0;" k="41" />
-<hkern u1="B" u2="&#x1e84;" k="20" />
-<hkern u1="B" u2="&#x1e82;" k="20" />
-<hkern u1="B" u2="&#x1e80;" k="20" />
-<hkern u1="B" u2="&#x1e00;" k="41" />
-<hkern u1="B" u2="&#x405;" k="20" />
-<hkern u1="B" u2="&#x21a;" k="61" />
-<hkern u1="B" u2="&#x1fa;" k="41" />
-<hkern u1="B" u2="&#x17d;" k="20" />
-<hkern u1="B" u2="&#x17b;" k="20" />
-<hkern u1="B" u2="&#x179;" k="20" />
-<hkern u1="B" u2="&#x178;" k="20" />
-<hkern u1="B" u2="&#x176;" k="20" />
-<hkern u1="B" u2="&#x174;" k="20" />
-<hkern u1="B" u2="&#x164;" k="61" />
-<hkern u1="B" u2="&#x162;" k="61" />
-<hkern u1="B" u2="&#x104;" k="41" />
-<hkern u1="B" u2="&#x102;" k="41" />
-<hkern u1="B" u2="&#x100;" k="41" />
-<hkern u1="B" u2="&#xdd;" k="20" />
-<hkern u1="B" u2="&#xc5;" k="41" />
-<hkern u1="B" u2="&#xc4;" k="41" />
-<hkern u1="B" u2="&#xc3;" k="41" />
-<hkern u1="B" u2="&#xc2;" k="41" />
-<hkern u1="B" u2="&#xc1;" k="41" />
-<hkern u1="B" u2="&#xc0;" k="41" />
-<hkern u1="B" u2="Z" k="20" />
-<hkern u1="B" u2="Y" k="20" />
-<hkern u1="B" u2="X" k="41" />
-<hkern u1="B" u2="W" k="20" />
-<hkern u1="B" u2="V" k="20" />
-<hkern u1="B" u2="T" k="61" />
-<hkern u1="B" u2="A" k="41" />
-<hkern u1="B" u2="&#x2e;" k="82" />
-<hkern u1="B" u2="&#x2c;" k="82" />
-<hkern u1="C" u2="&#x1ee2;" k="41" />
-<hkern u1="C" u2="&#x1ee0;" k="41" />
-<hkern u1="C" u2="&#x1ede;" k="41" />
-<hkern u1="C" u2="&#x1edc;" k="41" />
-<hkern u1="C" u2="&#x1eda;" k="41" />
-<hkern u1="C" u2="&#x1ed8;" k="41" />
-<hkern u1="C" u2="&#x1ed6;" k="41" />
-<hkern u1="C" u2="&#x1ed4;" k="41" />
-<hkern u1="C" u2="&#x1ed2;" k="41" />
-<hkern u1="C" u2="&#x1ed0;" k="41" />
-<hkern u1="C" u2="&#x1ece;" k="41" />
-<hkern u1="C" u2="&#x1ecc;" k="41" />
-<hkern u1="C" u2="&#x1fe;" k="41" />
-<hkern u1="C" u2="&#x1a0;" k="41" />
-<hkern u1="C" u2="&#x152;" k="41" />
-<hkern u1="C" u2="&#x150;" k="41" />
-<hkern u1="C" u2="&#x14e;" k="41" />
-<hkern u1="C" u2="&#x14c;" k="41" />
-<hkern u1="C" u2="&#x122;" k="41" />
-<hkern u1="C" u2="&#x120;" k="41" />
-<hkern u1="C" u2="&#x11e;" k="41" />
-<hkern u1="C" u2="&#x11c;" k="41" />
-<hkern u1="C" u2="&#x10c;" k="41" />
-<hkern u1="C" u2="&#x10a;" k="41" />
-<hkern u1="C" u2="&#x108;" k="41" />
-<hkern u1="C" u2="&#x106;" k="41" />
-<hkern u1="C" u2="&#xd8;" k="41" />
-<hkern u1="C" u2="&#xd6;" k="41" />
-<hkern u1="C" u2="&#xd5;" k="41" />
-<hkern u1="C" u2="&#xd4;" k="41" />
-<hkern u1="C" u2="&#xd3;" k="41" />
-<hkern u1="C" u2="&#xd2;" k="41" />
-<hkern u1="C" u2="&#xc7;" k="41" />
-<hkern u1="C" u2="Q" k="41" />
-<hkern u1="C" u2="O" k="41" />
-<hkern u1="C" u2="G" k="41" />
-<hkern u1="C" u2="C" k="41" />
-<hkern u1="D" u2="&#x201e;" k="82" />
-<hkern u1="D" u2="&#x201a;" k="82" />
-<hkern u1="D" u2="&#x1ef8;" k="20" />
-<hkern u1="D" u2="&#x1ef6;" k="20" />
-<hkern u1="D" u2="&#x1ef4;" k="20" />
-<hkern u1="D" u2="&#x1ef2;" k="20" />
-<hkern u1="D" u2="&#x1eb6;" k="41" />
-<hkern u1="D" u2="&#x1eb4;" k="41" />
-<hkern u1="D" u2="&#x1eb2;" k="41" />
-<hkern u1="D" u2="&#x1eb0;" k="41" />
-<hkern u1="D" u2="&#x1eae;" k="41" />
-<hkern u1="D" u2="&#x1eac;" k="41" />
-<hkern u1="D" u2="&#x1eaa;" k="41" />
-<hkern u1="D" u2="&#x1ea8;" k="41" />
-<hkern u1="D" u2="&#x1ea6;" k="41" />
-<hkern u1="D" u2="&#x1ea4;" k="41" />
-<hkern u1="D" u2="&#x1ea2;" k="41" />
-<hkern u1="D" u2="&#x1ea0;" k="41" />
-<hkern u1="D" u2="&#x1e84;" k="20" />
-<hkern u1="D" u2="&#x1e82;" k="20" />
-<hkern u1="D" u2="&#x1e80;" k="20" />
-<hkern u1="D" u2="&#x1e00;" k="41" />
-<hkern u1="D" u2="&#x405;" k="20" />
-<hkern u1="D" u2="&#x21a;" k="61" />
-<hkern u1="D" u2="&#x1fa;" k="41" />
-<hkern u1="D" u2="&#x17d;" k="20" />
-<hkern u1="D" u2="&#x17b;" k="20" />
-<hkern u1="D" u2="&#x179;" k="20" />
-<hkern u1="D" u2="&#x178;" k="20" />
-<hkern u1="D" u2="&#x176;" k="20" />
-<hkern u1="D" u2="&#x174;" k="20" />
-<hkern u1="D" u2="&#x164;" k="61" />
-<hkern u1="D" u2="&#x162;" k="61" />
-<hkern u1="D" u2="&#x104;" k="41" />
-<hkern u1="D" u2="&#x102;" k="41" />
-<hkern u1="D" u2="&#x100;" k="41" />
-<hkern u1="D" u2="&#xdd;" k="20" />
-<hkern u1="D" u2="&#xc5;" k="41" />
-<hkern u1="D" u2="&#xc4;" k="41" />
-<hkern u1="D" u2="&#xc3;" k="41" />
-<hkern u1="D" u2="&#xc2;" k="41" />
-<hkern u1="D" u2="&#xc1;" k="41" />
-<hkern u1="D" u2="&#xc0;" k="41" />
-<hkern u1="D" u2="Z" k="20" />
-<hkern u1="D" u2="Y" k="20" />
-<hkern u1="D" u2="X" k="41" />
-<hkern u1="D" u2="W" k="20" />
-<hkern u1="D" u2="V" k="20" />
-<hkern u1="D" u2="T" k="61" />
-<hkern u1="D" u2="A" k="41" />
-<hkern u1="D" u2="&#x2e;" k="82" />
-<hkern u1="D" u2="&#x2c;" k="82" />
-<hkern u1="E" u2="J" k="-123" />
-<hkern u1="F" u2="&#x201e;" k="123" />
-<hkern u1="F" u2="&#x201a;" k="123" />
-<hkern u1="F" u2="&#x1eb6;" k="41" />
-<hkern u1="F" u2="&#x1eb4;" k="41" />
-<hkern u1="F" u2="&#x1eb2;" k="41" />
-<hkern u1="F" u2="&#x1eb0;" k="41" />
-<hkern u1="F" u2="&#x1eae;" k="41" />
-<hkern u1="F" u2="&#x1eac;" k="41" />
-<hkern u1="F" u2="&#x1eaa;" k="41" />
-<hkern u1="F" u2="&#x1ea8;" k="41" />
-<hkern u1="F" u2="&#x1ea6;" k="41" />
-<hkern u1="F" u2="&#x1ea4;" k="41" />
-<hkern u1="F" u2="&#x1ea2;" k="41" />
-<hkern u1="F" u2="&#x1ea0;" k="41" />
-<hkern u1="F" u2="&#x1e00;" k="41" />
-<hkern u1="F" u2="&#x1fa;" k="41" />
-<hkern u1="F" u2="&#x104;" k="41" />
-<hkern u1="F" u2="&#x102;" k="41" />
-<hkern u1="F" u2="&#x100;" k="41" />
-<hkern u1="F" u2="&#xc5;" k="41" />
-<hkern u1="F" u2="&#xc4;" k="41" />
-<hkern u1="F" u2="&#xc3;" k="41" />
-<hkern u1="F" u2="&#xc2;" k="41" />
-<hkern u1="F" u2="&#xc1;" k="41" />
-<hkern u1="F" u2="&#xc0;" k="41" />
-<hkern u1="F" u2="A" k="41" />
-<hkern u1="F" u2="&#x3f;" k="-41" />
-<hkern u1="F" u2="&#x2e;" k="123" />
-<hkern u1="F" u2="&#x2c;" k="123" />
-<hkern u1="K" u2="&#x1ee2;" k="41" />
-<hkern u1="K" u2="&#x1ee0;" k="41" />
-<hkern u1="K" u2="&#x1ede;" k="41" />
-<hkern u1="K" u2="&#x1edc;" k="41" />
-<hkern u1="K" u2="&#x1eda;" k="41" />
-<hkern u1="K" u2="&#x1ed8;" k="41" />
-<hkern u1="K" u2="&#x1ed6;" k="41" />
-<hkern u1="K" u2="&#x1ed4;" k="41" />
-<hkern u1="K" u2="&#x1ed2;" k="41" />
-<hkern u1="K" u2="&#x1ed0;" k="41" />
-<hkern u1="K" u2="&#x1ece;" k="41" />
-<hkern u1="K" u2="&#x1ecc;" k="41" />
-<hkern u1="K" u2="&#x1fe;" k="41" />
-<hkern u1="K" u2="&#x1a0;" k="41" />
-<hkern u1="K" u2="&#x152;" k="41" />
-<hkern u1="K" u2="&#x150;" k="41" />
-<hkern u1="K" u2="&#x14e;" k="41" />
-<hkern u1="K" u2="&#x14c;" k="41" />
-<hkern u1="K" u2="&#x122;" k="41" />
-<hkern u1="K" u2="&#x120;" k="41" />
-<hkern u1="K" u2="&#x11e;" k="41" />
-<hkern u1="K" u2="&#x11c;" k="41" />
-<hkern u1="K" u2="&#x10c;" k="41" />
-<hkern u1="K" u2="&#x10a;" k="41" />
-<hkern u1="K" u2="&#x108;" k="41" />
-<hkern u1="K" u2="&#x106;" k="41" />
-<hkern u1="K" u2="&#xd8;" k="41" />
-<hkern u1="K" u2="&#xd6;" k="41" />
-<hkern u1="K" u2="&#xd5;" k="41" />
-<hkern u1="K" u2="&#xd4;" k="41" />
-<hkern u1="K" u2="&#xd3;" k="41" />
-<hkern u1="K" u2="&#xd2;" k="41" />
-<hkern u1="K" u2="&#xc7;" k="41" />
-<hkern u1="K" u2="Q" k="41" />
-<hkern u1="K" u2="O" k="41" />
-<hkern u1="K" u2="G" k="41" />
-<hkern u1="K" u2="C" k="41" />
-<hkern u1="L" u2="&#x201d;" k="164" />
-<hkern u1="L" u2="&#x2019;" k="164" />
-<hkern u1="L" u2="&#x1ef8;" k="61" />
-<hkern u1="L" u2="&#x1ef6;" k="61" />
-<hkern u1="L" u2="&#x1ef4;" k="61" />
-<hkern u1="L" u2="&#x1ef2;" k="61" />
-<hkern u1="L" u2="&#x1ef0;" k="20" />
-<hkern u1="L" u2="&#x1eee;" k="20" />
-<hkern u1="L" u2="&#x1eec;" k="20" />
-<hkern u1="L" u2="&#x1eea;" k="20" />
-<hkern u1="L" u2="&#x1ee8;" k="20" />
-<hkern u1="L" u2="&#x1ee6;" k="20" />
-<hkern u1="L" u2="&#x1ee4;" k="20" />
-<hkern u1="L" u2="&#x1ee2;" k="41" />
-<hkern u1="L" u2="&#x1ee0;" k="41" />
-<hkern u1="L" u2="&#x1ede;" k="41" />
-<hkern u1="L" u2="&#x1edc;" k="41" />
-<hkern u1="L" u2="&#x1eda;" k="41" />
-<hkern u1="L" u2="&#x1ed8;" k="41" />
-<hkern u1="L" u2="&#x1ed6;" k="41" />
-<hkern u1="L" u2="&#x1ed4;" k="41" />
-<hkern u1="L" u2="&#x1ed2;" k="41" />
-<hkern u1="L" u2="&#x1ed0;" k="41" />
-<hkern u1="L" u2="&#x1ece;" k="41" />
-<hkern u1="L" u2="&#x1ecc;" k="41" />
-<hkern u1="L" u2="&#x1e84;" k="41" />
-<hkern u1="L" u2="&#x1e82;" k="41" />
-<hkern u1="L" u2="&#x1e80;" k="41" />
-<hkern u1="L" u2="&#x21a;" k="41" />
-<hkern u1="L" u2="&#x1fe;" k="41" />
-<hkern u1="L" u2="&#x1af;" k="20" />
-<hkern u1="L" u2="&#x1a0;" k="41" />
-<hkern u1="L" u2="&#x178;" k="61" />
-<hkern u1="L" u2="&#x176;" k="61" />
-<hkern u1="L" u2="&#x174;" k="41" />
-<hkern u1="L" u2="&#x172;" k="20" />
-<hkern u1="L" u2="&#x170;" k="20" />
-<hkern u1="L" u2="&#x16e;" k="20" />
-<hkern u1="L" u2="&#x16c;" k="20" />
-<hkern u1="L" u2="&#x16a;" k="20" />
-<hkern u1="L" u2="&#x168;" k="20" />
-<hkern u1="L" u2="&#x164;" k="41" />
-<hkern u1="L" u2="&#x162;" k="41" />
-<hkern u1="L" u2="&#x152;" k="41" />
-<hkern u1="L" u2="&#x150;" k="41" />
-<hkern u1="L" u2="&#x14e;" k="41" />
-<hkern u1="L" u2="&#x14c;" k="41" />
-<hkern u1="L" u2="&#x122;" k="41" />
-<hkern u1="L" u2="&#x120;" k="41" />
-<hkern u1="L" u2="&#x11e;" k="41" />
-<hkern u1="L" u2="&#x11c;" k="41" />
-<hkern u1="L" u2="&#x10c;" k="41" />
-<hkern u1="L" u2="&#x10a;" k="41" />
-<hkern u1="L" u2="&#x108;" k="41" />
-<hkern u1="L" u2="&#x106;" k="41" />
-<hkern u1="L" u2="&#xdd;" k="61" />
-<hkern u1="L" u2="&#xdc;" k="20" />
-<hkern u1="L" u2="&#xdb;" k="20" />
-<hkern u1="L" u2="&#xda;" k="20" />
-<hkern u1="L" u2="&#xd9;" k="20" />
-<hkern u1="L" u2="&#xd8;" k="41" />
-<hkern u1="L" u2="&#xd6;" k="41" />
-<hkern u1="L" u2="&#xd5;" k="41" />
-<hkern u1="L" u2="&#xd4;" k="41" />
-<hkern u1="L" u2="&#xd3;" k="41" />
-<hkern u1="L" u2="&#xd2;" k="41" />
-<hkern u1="L" u2="&#xc7;" k="41" />
-<hkern u1="L" u2="Y" k="61" />
-<hkern u1="L" u2="W" k="41" />
-<hkern u1="L" u2="V" k="41" />
-<hkern u1="L" u2="U" k="20" />
-<hkern u1="L" u2="T" k="41" />
-<hkern u1="L" u2="Q" k="41" />
-<hkern u1="L" u2="O" k="41" />
-<hkern u1="L" u2="G" k="41" />
-<hkern u1="L" u2="C" k="41" />
-<hkern u1="L" u2="&#x27;" k="164" />
-<hkern u1="L" u2="&#x22;" k="164" />
-<hkern u1="O" u2="&#x201e;" k="82" />
-<hkern u1="O" u2="&#x201a;" k="82" />
-<hkern u1="O" u2="&#x1ef8;" k="20" />
-<hkern u1="O" u2="&#x1ef6;" k="20" />
-<hkern u1="O" u2="&#x1ef4;" k="20" />
-<hkern u1="O" u2="&#x1ef2;" k="20" />
-<hkern u1="O" u2="&#x1eb6;" k="41" />
-<hkern u1="O" u2="&#x1eb4;" k="41" />
-<hkern u1="O" u2="&#x1eb2;" k="41" />
-<hkern u1="O" u2="&#x1eb0;" k="41" />
-<hkern u1="O" u2="&#x1eae;" k="41" />
-<hkern u1="O" u2="&#x1eac;" k="41" />
-<hkern u1="O" u2="&#x1eaa;" k="41" />
-<hkern u1="O" u2="&#x1ea8;" k="41" />
-<hkern u1="O" u2="&#x1ea6;" k="41" />
-<hkern u1="O" u2="&#x1ea4;" k="41" />
-<hkern u1="O" u2="&#x1ea2;" k="41" />
-<hkern u1="O" u2="&#x1ea0;" k="41" />
-<hkern u1="O" u2="&#x1e84;" k="20" />
-<hkern u1="O" u2="&#x1e82;" k="20" />
-<hkern u1="O" u2="&#x1e80;" k="20" />
-<hkern u1="O" u2="&#x1e00;" k="41" />
-<hkern u1="O" u2="&#x405;" k="20" />
-<hkern u1="O" u2="&#x21a;" k="61" />
-<hkern u1="O" u2="&#x1fa;" k="41" />
-<hkern u1="O" u2="&#x17d;" k="20" />
-<hkern u1="O" u2="&#x17b;" k="20" />
-<hkern u1="O" u2="&#x179;" k="20" />
-<hkern u1="O" u2="&#x178;" k="20" />
-<hkern u1="O" u2="&#x176;" k="20" />
-<hkern u1="O" u2="&#x174;" k="20" />
-<hkern u1="O" u2="&#x164;" k="61" />
-<hkern u1="O" u2="&#x162;" k="61" />
-<hkern u1="O" u2="&#x104;" k="41" />
-<hkern u1="O" u2="&#x102;" k="41" />
-<hkern u1="O" u2="&#x100;" k="41" />
-<hkern u1="O" u2="&#xdd;" k="20" />
-<hkern u1="O" u2="&#xc5;" k="41" />
-<hkern u1="O" u2="&#xc4;" k="41" />
-<hkern u1="O" u2="&#xc3;" k="41" />
-<hkern u1="O" u2="&#xc2;" k="41" />
-<hkern u1="O" u2="&#xc1;" k="41" />
-<hkern u1="O" u2="&#xc0;" k="41" />
-<hkern u1="O" u2="Z" k="20" />
-<hkern u1="O" u2="Y" k="20" />
-<hkern u1="O" u2="X" k="41" />
-<hkern u1="O" u2="W" k="20" />
-<hkern u1="O" u2="V" k="20" />
-<hkern u1="O" u2="T" k="61" />
-<hkern u1="O" u2="A" k="41" />
-<hkern u1="O" u2="&#x2e;" k="82" />
-<hkern u1="O" u2="&#x2c;" k="82" />
-<hkern u1="P" u2="&#x201e;" k="266" />
-<hkern u1="P" u2="&#x201a;" k="266" />
-<hkern u1="P" u2="&#x1eb6;" k="102" />
-<hkern u1="P" u2="&#x1eb4;" k="102" />
-<hkern u1="P" u2="&#x1eb2;" k="102" />
-<hkern u1="P" u2="&#x1eb0;" k="102" />
-<hkern u1="P" u2="&#x1eae;" k="102" />
-<hkern u1="P" u2="&#x1eac;" k="102" />
-<hkern u1="P" u2="&#x1eaa;" k="102" />
-<hkern u1="P" u2="&#x1ea8;" k="102" />
-<hkern u1="P" u2="&#x1ea6;" k="102" />
-<hkern u1="P" u2="&#x1ea4;" k="102" />
-<hkern u1="P" u2="&#x1ea2;" k="102" />
-<hkern u1="P" u2="&#x1ea0;" k="102" />
-<hkern u1="P" u2="&#x1e00;" k="102" />
-<hkern u1="P" u2="&#x1fa;" k="102" />
-<hkern u1="P" u2="&#x17d;" k="20" />
-<hkern u1="P" u2="&#x17b;" k="20" />
-<hkern u1="P" u2="&#x179;" k="20" />
-<hkern u1="P" u2="&#x104;" k="102" />
-<hkern u1="P" u2="&#x102;" k="102" />
-<hkern u1="P" u2="&#x100;" k="102" />
-<hkern u1="P" u2="&#xc5;" k="102" />
-<hkern u1="P" u2="&#xc4;" k="102" />
-<hkern u1="P" u2="&#xc3;" k="102" />
-<hkern u1="P" u2="&#xc2;" k="102" />
-<hkern u1="P" u2="&#xc1;" k="102" />
-<hkern u1="P" u2="&#xc0;" k="102" />
-<hkern u1="P" u2="Z" k="20" />
-<hkern u1="P" u2="X" k="41" />
-<hkern u1="P" u2="A" k="102" />
-<hkern u1="P" u2="&#x2e;" k="266" />
-<hkern u1="P" u2="&#x2c;" k="266" />
-<hkern u1="Q" u2="&#x201e;" k="82" />
-<hkern u1="Q" u2="&#x201a;" k="82" />
-<hkern u1="Q" u2="&#x1ef8;" k="20" />
-<hkern u1="Q" u2="&#x1ef6;" k="20" />
-<hkern u1="Q" u2="&#x1ef4;" k="20" />
-<hkern u1="Q" u2="&#x1ef2;" k="20" />
-<hkern u1="Q" u2="&#x1eb6;" k="41" />
-<hkern u1="Q" u2="&#x1eb4;" k="41" />
-<hkern u1="Q" u2="&#x1eb2;" k="41" />
-<hkern u1="Q" u2="&#x1eb0;" k="41" />
-<hkern u1="Q" u2="&#x1eae;" k="41" />
-<hkern u1="Q" u2="&#x1eac;" k="41" />
-<hkern u1="Q" u2="&#x1eaa;" k="41" />
-<hkern u1="Q" u2="&#x1ea8;" k="41" />
-<hkern u1="Q" u2="&#x1ea6;" k="41" />
-<hkern u1="Q" u2="&#x1ea4;" k="41" />
-<hkern u1="Q" u2="&#x1ea2;" k="41" />
-<hkern u1="Q" u2="&#x1ea0;" k="41" />
-<hkern u1="Q" u2="&#x1e84;" k="20" />
-<hkern u1="Q" u2="&#x1e82;" k="20" />
-<hkern u1="Q" u2="&#x1e80;" k="20" />
-<hkern u1="Q" u2="&#x1e00;" k="41" />
-<hkern u1="Q" u2="&#x405;" k="20" />
-<hkern u1="Q" u2="&#x21a;" k="61" />
-<hkern u1="Q" u2="&#x1fa;" k="41" />
-<hkern u1="Q" u2="&#x17d;" k="20" />
-<hkern u1="Q" u2="&#x17b;" k="20" />
-<hkern u1="Q" u2="&#x179;" k="20" />
-<hkern u1="Q" u2="&#x178;" k="20" />
-<hkern u1="Q" u2="&#x176;" k="20" />
-<hkern u1="Q" u2="&#x174;" k="20" />
-<hkern u1="Q" u2="&#x164;" k="61" />
-<hkern u1="Q" u2="&#x162;" k="61" />
-<hkern u1="Q" u2="&#x104;" k="41" />
-<hkern u1="Q" u2="&#x102;" k="41" />
-<hkern u1="Q" u2="&#x100;" k="41" />
-<hkern u1="Q" u2="&#xdd;" k="20" />
-<hkern u1="Q" u2="&#xc5;" k="41" />
-<hkern u1="Q" u2="&#xc4;" k="41" />
-<hkern u1="Q" u2="&#xc3;" k="41" />
-<hkern u1="Q" u2="&#xc2;" k="41" />
-<hkern u1="Q" u2="&#xc1;" k="41" />
-<hkern u1="Q" u2="&#xc0;" k="41" />
-<hkern u1="Q" u2="Z" k="20" />
-<hkern u1="Q" u2="Y" k="20" />
-<hkern u1="Q" u2="X" k="41" />
-<hkern u1="Q" u2="W" k="20" />
-<hkern u1="Q" u2="V" k="20" />
-<hkern u1="Q" u2="T" k="61" />
-<hkern u1="Q" u2="A" k="41" />
-<hkern u1="Q" u2="&#x2e;" k="82" />
-<hkern u1="Q" u2="&#x2c;" k="82" />
-<hkern u1="T" u2="&#x201e;" k="123" />
-<hkern u1="T" u2="&#x201a;" k="123" />
-<hkern u1="T" u2="&#x2015;" k="82" />
-<hkern u1="T" u2="&#x2014;" k="82" />
-<hkern u1="T" u2="&#x2013;" k="82" />
-<hkern u1="T" u2="&#x1ef5;" k="41" />
-<hkern u1="T" u2="&#x1ef1;" k="102" />
-<hkern u1="T" u2="&#x1eef;" k="102" />
-<hkern u1="T" u2="&#x1eed;" k="102" />
-<hkern u1="T" u2="&#x1eeb;" k="102" />
-<hkern u1="T" u2="&#x1ee9;" k="102" />
-<hkern u1="T" u2="&#x1ee7;" k="102" />
-<hkern u1="T" u2="&#x1ee5;" k="102" />
-<hkern u1="T" u2="&#x1ee3;" k="143" />
-<hkern u1="T" u2="&#x1ee2;" k="41" />
-<hkern u1="T" u2="&#x1ee1;" k="143" />
-<hkern u1="T" u2="&#x1ee0;" k="41" />
-<hkern u1="T" u2="&#x1edf;" k="143" />
-<hkern u1="T" u2="&#x1ede;" k="41" />
-<hkern u1="T" u2="&#x1edd;" k="143" />
-<hkern u1="T" u2="&#x1edc;" k="41" />
-<hkern u1="T" u2="&#x1edb;" k="143" />
-<hkern u1="T" u2="&#x1eda;" k="41" />
-<hkern u1="T" u2="&#x1ed9;" k="143" />
-<hkern u1="T" u2="&#x1ed8;" k="41" />
-<hkern u1="T" u2="&#x1ed7;" k="143" />
-<hkern u1="T" u2="&#x1ed6;" k="41" />
-<hkern u1="T" u2="&#x1ed5;" k="143" />
-<hkern u1="T" u2="&#x1ed4;" k="41" />
-<hkern u1="T" u2="&#x1ed2;" k="41" />
-<hkern u1="T" u2="&#x1ed1;" k="143" />
-<hkern u1="T" u2="&#x1ed0;" k="41" />
-<hkern u1="T" u2="&#x1ecf;" k="143" />
-<hkern u1="T" u2="&#x1ece;" k="41" />
-<hkern u1="T" u2="&#x1ecd;" k="143" />
-<hkern u1="T" u2="&#x1ecc;" k="41" />
-<hkern u1="T" u2="&#x1ec7;" k="143" />
-<hkern u1="T" u2="&#x1ec5;" k="143" />
-<hkern u1="T" u2="&#x1ec3;" k="143" />
-<hkern u1="T" u2="&#x1ebf;" k="143" />
-<hkern u1="T" u2="&#x1ebd;" k="143" />
-<hkern u1="T" u2="&#x1ebb;" k="143" />
-<hkern u1="T" u2="&#x1eb9;" k="143" />
-<hkern u1="T" u2="&#x1eb7;" k="164" />
-<hkern u1="T" u2="&#x1eb6;" k="143" />
-<hkern u1="T" u2="&#x1eb5;" k="164" />
-<hkern u1="T" u2="&#x1eb4;" k="143" />
-<hkern u1="T" u2="&#x1eb3;" k="164" />
-<hkern u1="T" u2="&#x1eb2;" k="143" />
-<hkern u1="T" u2="&#x1eb1;" k="164" />
-<hkern u1="T" u2="&#x1eb0;" k="143" />
-<hkern u1="T" u2="&#x1eaf;" k="164" />
-<hkern u1="T" u2="&#x1eae;" k="143" />
-<hkern u1="T" u2="&#x1ead;" k="164" />
-<hkern u1="T" u2="&#x1eac;" k="143" />
-<hkern u1="T" u2="&#x1eab;" k="164" />
-<hkern u1="T" u2="&#x1eaa;" k="143" />
-<hkern u1="T" u2="&#x1ea9;" k="164" />
-<hkern u1="T" u2="&#x1ea8;" k="143" />
-<hkern u1="T" u2="&#x1ea6;" k="143" />
-<hkern u1="T" u2="&#x1ea5;" k="164" />
-<hkern u1="T" u2="&#x1ea4;" k="143" />
-<hkern u1="T" u2="&#x1ea3;" k="164" />
-<hkern u1="T" u2="&#x1ea2;" k="143" />
-<hkern u1="T" u2="&#x1ea1;" k="164" />
-<hkern u1="T" u2="&#x1ea0;" k="143" />
-<hkern u1="T" u2="&#x1e83;" k="41" />
-<hkern u1="T" u2="&#x1e81;" k="41" />
-<hkern u1="T" u2="&#x1e3f;" k="102" />
-<hkern u1="T" u2="&#x1e01;" k="164" />
-<hkern u1="T" u2="&#x1e00;" k="143" />
-<hkern u1="T" u2="&#x21a;" k="-41" />
-<hkern u1="T" u2="&#x219;" k="123" />
-<hkern u1="T" u2="&#x1ff;" k="143" />
-<hkern u1="T" u2="&#x1fe;" k="41" />
-<hkern u1="T" u2="&#x1fd;" k="164" />
-<hkern u1="T" u2="&#x1fb;" k="164" />
-<hkern u1="T" u2="&#x1fa;" k="143" />
-<hkern u1="T" u2="&#x1b0;" k="102" />
-<hkern u1="T" u2="&#x1a1;" k="143" />
-<hkern u1="T" u2="&#x1a0;" k="41" />
-<hkern u1="T" u2="&#x17e;" k="82" />
-<hkern u1="T" u2="&#x17c;" k="82" />
-<hkern u1="T" u2="&#x17a;" k="82" />
-<hkern u1="T" u2="&#x175;" k="41" />
-<hkern u1="T" u2="&#x173;" k="102" />
-<hkern u1="T" u2="&#x171;" k="102" />
-<hkern u1="T" u2="&#x16f;" k="102" />
-<hkern u1="T" u2="&#x16d;" k="102" />
-<hkern u1="T" u2="&#x16b;" k="102" />
-<hkern u1="T" u2="&#x169;" k="102" />
-<hkern u1="T" u2="&#x164;" k="-41" />
-<hkern u1="T" u2="&#x162;" k="-41" />
-<hkern u1="T" u2="&#x15f;" k="123" />
-<hkern u1="T" u2="&#x15b;" k="123" />
-<hkern u1="T" u2="&#x157;" k="102" />
-<hkern u1="T" u2="&#x155;" k="102" />
-<hkern u1="T" u2="&#x153;" k="143" />
-<hkern u1="T" u2="&#x152;" k="41" />
-<hkern u1="T" u2="&#x151;" k="143" />
-<hkern u1="T" u2="&#x150;" k="41" />
-<hkern u1="T" u2="&#x14f;" k="143" />
-<hkern u1="T" u2="&#x14e;" k="41" />
-<hkern u1="T" u2="&#x14d;" k="143" />
-<hkern u1="T" u2="&#x14c;" k="41" />
-<hkern u1="T" u2="&#x14b;" k="102" />
-<hkern u1="T" u2="&#x146;" k="102" />
-<hkern u1="T" u2="&#x144;" k="102" />
-<hkern u1="T" u2="&#x138;" k="102" />
-<hkern u1="T" u2="&#x123;" k="143" />
-<hkern u1="T" u2="&#x122;" k="41" />
-<hkern u1="T" u2="&#x121;" k="143" />
-<hkern u1="T" u2="&#x120;" k="41" />
-<hkern u1="T" u2="&#x11f;" k="143" />
-<hkern u1="T" u2="&#x11e;" k="41" />
-<hkern u1="T" u2="&#x11d;" k="143" />
-<hkern u1="T" u2="&#x11c;" k="41" />
-<hkern u1="T" u2="&#x11b;" k="143" />
-<hkern u1="T" u2="&#x119;" k="143" />
-<hkern u1="T" u2="&#x117;" k="143" />
-<hkern u1="T" u2="&#x115;" k="143" />
-<hkern u1="T" u2="&#x113;" k="143" />
-<hkern u1="T" u2="&#x111;" k="143" />
-<hkern u1="T" u2="&#x10f;" k="143" />
-<hkern u1="T" u2="&#x10d;" k="143" />
-<hkern u1="T" u2="&#x10c;" k="41" />
-<hkern u1="T" u2="&#x10b;" k="143" />
-<hkern u1="T" u2="&#x10a;" k="41" />
-<hkern u1="T" u2="&#x109;" k="143" />
-<hkern u1="T" u2="&#x108;" k="41" />
-<hkern u1="T" u2="&#x107;" k="143" />
-<hkern u1="T" u2="&#x106;" k="41" />
-<hkern u1="T" u2="&#x105;" k="164" />
-<hkern u1="T" u2="&#x104;" k="143" />
-<hkern u1="T" u2="&#x103;" k="164" />
-<hkern u1="T" u2="&#x102;" k="143" />
-<hkern u1="T" u2="&#x101;" k="164" />
-<hkern u1="T" u2="&#x100;" k="143" />
-<hkern u1="T" u2="&#xfd;" k="41" />
-<hkern u1="T" u2="&#xfc;" k="102" />
-<hkern u1="T" u2="&#xfb;" k="102" />
-<hkern u1="T" u2="&#xfa;" k="102" />
-<hkern u1="T" u2="&#xf9;" k="102" />
-<hkern u1="T" u2="&#xf8;" k="143" />
-<hkern u1="T" u2="&#xf6;" k="143" />
-<hkern u1="T" u2="&#xf5;" k="143" />
-<hkern u1="T" u2="&#xf4;" k="143" />
-<hkern u1="T" u2="&#xf3;" k="143" />
-<hkern u1="T" u2="&#xf2;" k="143" />
-<hkern u1="T" u2="&#xeb;" k="143" />
-<hkern u1="T" u2="&#xea;" k="143" />
-<hkern u1="T" u2="&#xe9;" k="143" />
-<hkern u1="T" u2="&#xe8;" k="143" />
-<hkern u1="T" u2="&#xe7;" k="143" />
-<hkern u1="T" u2="&#xe6;" k="164" />
-<hkern u1="T" u2="&#xe5;" k="164" />
-<hkern u1="T" u2="&#xe4;" k="164" />
-<hkern u1="T" u2="&#xe3;" k="164" />
-<hkern u1="T" u2="&#xe2;" k="164" />
-<hkern u1="T" u2="&#xe1;" k="164" />
-<hkern u1="T" u2="&#xe0;" k="143" />
-<hkern u1="T" u2="&#xd8;" k="41" />
-<hkern u1="T" u2="&#xd6;" k="41" />
-<hkern u1="T" u2="&#xd5;" k="41" />
-<hkern u1="T" u2="&#xd4;" k="41" />
-<hkern u1="T" u2="&#xd3;" k="41" />
-<hkern u1="T" u2="&#xd2;" k="41" />
-<hkern u1="T" u2="&#xc7;" k="41" />
-<hkern u1="T" u2="&#xc5;" k="143" />
-<hkern u1="T" u2="&#xc4;" k="143" />
-<hkern u1="T" u2="&#xc3;" k="143" />
-<hkern u1="T" u2="&#xc2;" k="143" />
-<hkern u1="T" u2="&#xc1;" k="143" />
-<hkern u1="T" u2="&#xc0;" k="143" />
-<hkern u1="T" u2="z" k="82" />
-<hkern u1="T" u2="y" k="41" />
-<hkern u1="T" u2="x" k="41" />
-<hkern u1="T" u2="w" k="41" />
-<hkern u1="T" u2="v" k="41" />
-<hkern u1="T" u2="u" k="102" />
-<hkern u1="T" u2="s" k="123" />
-<hkern u1="T" u2="r" k="102" />
-<hkern u1="T" u2="q" k="143" />
-<hkern u1="T" u2="p" k="102" />
-<hkern u1="T" u2="o" k="143" />
-<hkern u1="T" u2="n" k="102" />
-<hkern u1="T" u2="m" k="102" />
-<hkern u1="T" u2="g" k="143" />
-<hkern u1="T" u2="e" k="143" />
-<hkern u1="T" u2="d" k="143" />
-<hkern u1="T" u2="c" k="143" />
-<hkern u1="T" u2="a" k="164" />
-<hkern u1="T" u2="T" k="-41" />
-<hkern u1="T" u2="Q" k="41" />
-<hkern u1="T" u2="O" k="41" />
-<hkern u1="T" u2="G" k="41" />
-<hkern u1="T" u2="C" k="41" />
-<hkern u1="T" u2="A" k="143" />
-<hkern u1="T" u2="&#x3f;" k="-41" />
-<hkern u1="T" u2="&#x2e;" k="123" />
-<hkern u1="T" u2="&#x2d;" k="82" />
-<hkern u1="T" u2="&#x2c;" k="123" />
-<hkern u1="U" u2="&#x201e;" k="41" />
-<hkern u1="U" u2="&#x201a;" k="41" />
-<hkern u1="U" u2="&#x1eb6;" k="20" />
-<hkern u1="U" u2="&#x1eb4;" k="20" />
-<hkern u1="U" u2="&#x1eb2;" k="20" />
-<hkern u1="U" u2="&#x1eb0;" k="20" />
-<hkern u1="U" u2="&#x1eae;" k="20" />
-<hkern u1="U" u2="&#x1eac;" k="20" />
-<hkern u1="U" u2="&#x1eaa;" k="20" />
-<hkern u1="U" u2="&#x1ea8;" k="20" />
-<hkern u1="U" u2="&#x1ea6;" k="20" />
-<hkern u1="U" u2="&#x1ea4;" k="20" />
-<hkern u1="U" u2="&#x1ea2;" k="20" />
-<hkern u1="U" u2="&#x1ea0;" k="20" />
-<hkern u1="U" u2="&#x1e00;" k="20" />
-<hkern u1="U" u2="&#x1fa;" k="20" />
-<hkern u1="U" u2="&#x104;" k="20" />
-<hkern u1="U" u2="&#x102;" k="20" />
-<hkern u1="U" u2="&#x100;" k="20" />
-<hkern u1="U" u2="&#xc5;" k="20" />
-<hkern u1="U" u2="&#xc4;" k="20" />
-<hkern u1="U" u2="&#xc3;" k="20" />
-<hkern u1="U" u2="&#xc2;" k="20" />
-<hkern u1="U" u2="&#xc1;" k="20" />
-<hkern u1="U" u2="&#xc0;" k="20" />
-<hkern u1="U" u2="A" k="20" />
-<hkern u1="U" u2="&#x2e;" k="41" />
-<hkern u1="U" u2="&#x2c;" k="41" />
-<hkern u1="V" u2="&#x201e;" k="102" />
-<hkern u1="V" u2="&#x201a;" k="102" />
-<hkern u1="V" u2="&#x1ef1;" k="20" />
-<hkern u1="V" u2="&#x1eef;" k="20" />
-<hkern u1="V" u2="&#x1eed;" k="20" />
-<hkern u1="V" u2="&#x1eeb;" k="20" />
-<hkern u1="V" u2="&#x1ee9;" k="20" />
-<hkern u1="V" u2="&#x1ee7;" k="20" />
-<hkern u1="V" u2="&#x1ee5;" k="20" />
-<hkern u1="V" u2="&#x1ee3;" k="41" />
-<hkern u1="V" u2="&#x1ee2;" k="20" />
-<hkern u1="V" u2="&#x1ee1;" k="41" />
-<hkern u1="V" u2="&#x1ee0;" k="20" />
-<hkern u1="V" u2="&#x1edf;" k="41" />
-<hkern u1="V" u2="&#x1ede;" k="20" />
-<hkern u1="V" u2="&#x1edd;" k="41" />
-<hkern u1="V" u2="&#x1edc;" k="20" />
-<hkern u1="V" u2="&#x1edb;" k="41" />
-<hkern u1="V" u2="&#x1eda;" k="20" />
-<hkern u1="V" u2="&#x1ed9;" k="41" />
-<hkern u1="V" u2="&#x1ed8;" k="20" />
-<hkern u1="V" u2="&#x1ed7;" k="41" />
-<hkern u1="V" u2="&#x1ed6;" k="20" />
-<hkern u1="V" u2="&#x1ed5;" k="41" />
-<hkern u1="V" u2="&#x1ed4;" k="20" />
-<hkern u1="V" u2="&#x1ed2;" k="20" />
-<hkern u1="V" u2="&#x1ed1;" k="41" />
-<hkern u1="V" u2="&#x1ed0;" k="20" />
-<hkern u1="V" u2="&#x1ecf;" k="41" />
-<hkern u1="V" u2="&#x1ece;" k="20" />
-<hkern u1="V" u2="&#x1ecd;" k="41" />
-<hkern u1="V" u2="&#x1ecc;" k="20" />
-<hkern u1="V" u2="&#x1ec7;" k="41" />
-<hkern u1="V" u2="&#x1ec5;" k="41" />
-<hkern u1="V" u2="&#x1ec3;" k="41" />
-<hkern u1="V" u2="&#x1ebf;" k="41" />
-<hkern u1="V" u2="&#x1ebd;" k="41" />
-<hkern u1="V" u2="&#x1ebb;" k="41" />
-<hkern u1="V" u2="&#x1eb9;" k="41" />
-<hkern u1="V" u2="&#x1eb7;" k="41" />
-<hkern u1="V" u2="&#x1eb6;" k="82" />
-<hkern u1="V" u2="&#x1eb5;" k="41" />
-<hkern u1="V" u2="&#x1eb4;" k="82" />
-<hkern u1="V" u2="&#x1eb3;" k="41" />
-<hkern u1="V" u2="&#x1eb2;" k="82" />
-<hkern u1="V" u2="&#x1eb1;" k="41" />
-<hkern u1="V" u2="&#x1eb0;" k="82" />
-<hkern u1="V" u2="&#x1eaf;" k="41" />
-<hkern u1="V" u2="&#x1eae;" k="82" />
-<hkern u1="V" u2="&#x1ead;" k="41" />
-<hkern u1="V" u2="&#x1eac;" k="82" />
-<hkern u1="V" u2="&#x1eab;" k="41" />
-<hkern u1="V" u2="&#x1eaa;" k="82" />
-<hkern u1="V" u2="&#x1ea9;" k="41" />
-<hkern u1="V" u2="&#x1ea8;" k="82" />
-<hkern u1="V" u2="&#x1ea6;" k="82" />
-<hkern u1="V" u2="&#x1ea5;" k="41" />
-<hkern u1="V" u2="&#x1ea4;" k="82" />
-<hkern u1="V" u2="&#x1ea3;" k="41" />
-<hkern u1="V" u2="&#x1ea2;" k="82" />
-<hkern u1="V" u2="&#x1ea1;" k="41" />
-<hkern u1="V" u2="&#x1ea0;" k="82" />
-<hkern u1="V" u2="&#x1e3f;" k="20" />
-<hkern u1="V" u2="&#x1e01;" k="41" />
-<hkern u1="V" u2="&#x1e00;" k="82" />
-<hkern u1="V" u2="&#x219;" k="20" />
-<hkern u1="V" u2="&#x1ff;" k="41" />
-<hkern u1="V" u2="&#x1fe;" k="20" />
-<hkern u1="V" u2="&#x1fd;" k="41" />
-<hkern u1="V" u2="&#x1fb;" k="41" />
-<hkern u1="V" u2="&#x1fa;" k="82" />
-<hkern u1="V" u2="&#x1b0;" k="20" />
-<hkern u1="V" u2="&#x1a1;" k="41" />
-<hkern u1="V" u2="&#x1a0;" k="20" />
-<hkern u1="V" u2="&#x173;" k="20" />
-<hkern u1="V" u2="&#x171;" k="20" />
-<hkern u1="V" u2="&#x16f;" k="20" />
-<hkern u1="V" u2="&#x16d;" k="20" />
-<hkern u1="V" u2="&#x16b;" k="20" />
-<hkern u1="V" u2="&#x169;" k="20" />
-<hkern u1="V" u2="&#x15f;" k="20" />
-<hkern u1="V" u2="&#x15b;" k="20" />
-<hkern u1="V" u2="&#x157;" k="20" />
-<hkern u1="V" u2="&#x155;" k="20" />
-<hkern u1="V" u2="&#x153;" k="41" />
-<hkern u1="V" u2="&#x152;" k="20" />
-<hkern u1="V" u2="&#x151;" k="41" />
-<hkern u1="V" u2="&#x150;" k="20" />
-<hkern u1="V" u2="&#x14f;" k="41" />
-<hkern u1="V" u2="&#x14e;" k="20" />
-<hkern u1="V" u2="&#x14d;" k="41" />
-<hkern u1="V" u2="&#x14c;" k="20" />
-<hkern u1="V" u2="&#x14b;" k="20" />
-<hkern u1="V" u2="&#x146;" k="20" />
-<hkern u1="V" u2="&#x144;" k="20" />
-<hkern u1="V" u2="&#x138;" k="20" />
-<hkern u1="V" u2="&#x123;" k="20" />
-<hkern u1="V" u2="&#x122;" k="20" />
-<hkern u1="V" u2="&#x121;" k="20" />
-<hkern u1="V" u2="&#x120;" k="20" />
-<hkern u1="V" u2="&#x11f;" k="20" />
-<hkern u1="V" u2="&#x11e;" k="20" />
-<hkern u1="V" u2="&#x11d;" k="20" />
-<hkern u1="V" u2="&#x11c;" k="20" />
-<hkern u1="V" u2="&#x11b;" k="41" />
-<hkern u1="V" u2="&#x119;" k="41" />
-<hkern u1="V" u2="&#x117;" k="41" />
-<hkern u1="V" u2="&#x115;" k="41" />
-<hkern u1="V" u2="&#x113;" k="41" />
-<hkern u1="V" u2="&#x111;" k="41" />
-<hkern u1="V" u2="&#x10f;" k="41" />
-<hkern u1="V" u2="&#x10d;" k="41" />
-<hkern u1="V" u2="&#x10c;" k="20" />
-<hkern u1="V" u2="&#x10b;" k="41" />
-<hkern u1="V" u2="&#x10a;" k="20" />
-<hkern u1="V" u2="&#x109;" k="41" />
-<hkern u1="V" u2="&#x108;" k="20" />
-<hkern u1="V" u2="&#x107;" k="41" />
-<hkern u1="V" u2="&#x106;" k="20" />
-<hkern u1="V" u2="&#x105;" k="41" />
-<hkern u1="V" u2="&#x104;" k="82" />
-<hkern u1="V" u2="&#x103;" k="41" />
-<hkern u1="V" u2="&#x102;" k="82" />
-<hkern u1="V" u2="&#x101;" k="41" />
-<hkern u1="V" u2="&#x100;" k="82" />
-<hkern u1="V" u2="&#xfc;" k="20" />
-<hkern u1="V" u2="&#xfb;" k="20" />
-<hkern u1="V" u2="&#xfa;" k="20" />
-<hkern u1="V" u2="&#xf9;" k="20" />
-<hkern u1="V" u2="&#xf8;" k="41" />
-<hkern u1="V" u2="&#xf6;" k="41" />
-<hkern u1="V" u2="&#xf5;" k="41" />
-<hkern u1="V" u2="&#xf4;" k="41" />
-<hkern u1="V" u2="&#xf3;" k="41" />
-<hkern u1="V" u2="&#xf2;" k="41" />
-<hkern u1="V" u2="&#xeb;" k="41" />
-<hkern u1="V" u2="&#xea;" k="41" />
-<hkern u1="V" u2="&#xe9;" k="41" />
-<hkern u1="V" u2="&#xe8;" k="41" />
-<hkern u1="V" u2="&#xe7;" k="41" />
-<hkern u1="V" u2="&#xe6;" k="41" />
-<hkern u1="V" u2="&#xe5;" k="41" />
-<hkern u1="V" u2="&#xe4;" k="41" />
-<hkern u1="V" u2="&#xe3;" k="41" />
-<hkern u1="V" u2="&#xe2;" k="41" />
-<hkern u1="V" u2="&#xe1;" k="41" />
-<hkern u1="V" u2="&#xe0;" k="41" />
-<hkern u1="V" u2="&#xd8;" k="20" />
-<hkern u1="V" u2="&#xd6;" k="20" />
-<hkern u1="V" u2="&#xd5;" k="20" />
-<hkern u1="V" u2="&#xd4;" k="20" />
-<hkern u1="V" u2="&#xd3;" k="20" />
-<hkern u1="V" u2="&#xd2;" k="20" />
-<hkern u1="V" u2="&#xc7;" k="20" />
-<hkern u1="V" u2="&#xc5;" k="82" />
-<hkern u1="V" u2="&#xc4;" k="82" />
-<hkern u1="V" u2="&#xc3;" k="82" />
-<hkern u1="V" u2="&#xc2;" k="82" />
-<hkern u1="V" u2="&#xc1;" k="82" />
-<hkern u1="V" u2="&#xc0;" k="82" />
-<hkern u1="V" u2="u" k="20" />
-<hkern u1="V" u2="s" k="20" />
-<hkern u1="V" u2="r" k="20" />
-<hkern u1="V" u2="q" k="41" />
-<hkern u1="V" u2="p" k="20" />
-<hkern u1="V" u2="o" k="41" />
-<hkern u1="V" u2="n" k="20" />
-<hkern u1="V" u2="m" k="20" />
-<hkern u1="V" u2="g" k="20" />
-<hkern u1="V" u2="e" k="41" />
-<hkern u1="V" u2="d" k="41" />
-<hkern u1="V" u2="c" k="41" />
-<hkern u1="V" u2="a" k="41" />
-<hkern u1="V" u2="Q" k="20" />
-<hkern u1="V" u2="O" k="20" />
-<hkern u1="V" u2="G" k="20" />
-<hkern u1="V" u2="C" k="20" />
-<hkern u1="V" u2="A" k="82" />
-<hkern u1="V" u2="&#x3f;" k="-41" />
-<hkern u1="V" u2="&#x2e;" k="102" />
-<hkern u1="V" u2="&#x2c;" k="102" />
-<hkern u1="W" u2="&#x201e;" k="102" />
-<hkern u1="W" u2="&#x201a;" k="102" />
-<hkern u1="W" u2="&#x1ef1;" k="20" />
-<hkern u1="W" u2="&#x1eef;" k="20" />
-<hkern u1="W" u2="&#x1eed;" k="20" />
-<hkern u1="W" u2="&#x1eeb;" k="20" />
-<hkern u1="W" u2="&#x1ee9;" k="20" />
-<hkern u1="W" u2="&#x1ee7;" k="20" />
-<hkern u1="W" u2="&#x1ee5;" k="20" />
-<hkern u1="W" u2="&#x1ee3;" k="41" />
-<hkern u1="W" u2="&#x1ee2;" k="20" />
-<hkern u1="W" u2="&#x1ee1;" k="41" />
-<hkern u1="W" u2="&#x1ee0;" k="20" />
-<hkern u1="W" u2="&#x1edf;" k="41" />
-<hkern u1="W" u2="&#x1ede;" k="20" />
-<hkern u1="W" u2="&#x1edd;" k="41" />
-<hkern u1="W" u2="&#x1edc;" k="20" />
-<hkern u1="W" u2="&#x1edb;" k="41" />
-<hkern u1="W" u2="&#x1eda;" k="20" />
-<hkern u1="W" u2="&#x1ed9;" k="41" />
-<hkern u1="W" u2="&#x1ed8;" k="20" />
-<hkern u1="W" u2="&#x1ed7;" k="41" />
-<hkern u1="W" u2="&#x1ed6;" k="20" />
-<hkern u1="W" u2="&#x1ed5;" k="41" />
-<hkern u1="W" u2="&#x1ed4;" k="20" />
-<hkern u1="W" u2="&#x1ed2;" k="20" />
-<hkern u1="W" u2="&#x1ed1;" k="41" />
-<hkern u1="W" u2="&#x1ed0;" k="20" />
-<hkern u1="W" u2="&#x1ecf;" k="41" />
-<hkern u1="W" u2="&#x1ece;" k="20" />
-<hkern u1="W" u2="&#x1ecd;" k="41" />
-<hkern u1="W" u2="&#x1ecc;" k="20" />
-<hkern u1="W" u2="&#x1ec7;" k="41" />
-<hkern u1="W" u2="&#x1ec5;" k="41" />
-<hkern u1="W" u2="&#x1ec3;" k="41" />
-<hkern u1="W" u2="&#x1ebf;" k="41" />
-<hkern u1="W" u2="&#x1ebd;" k="41" />
-<hkern u1="W" u2="&#x1ebb;" k="41" />
-<hkern u1="W" u2="&#x1eb9;" k="41" />
-<hkern u1="W" u2="&#x1eb7;" k="41" />
-<hkern u1="W" u2="&#x1eb6;" k="82" />
-<hkern u1="W" u2="&#x1eb5;" k="41" />
-<hkern u1="W" u2="&#x1eb4;" k="82" />
-<hkern u1="W" u2="&#x1eb3;" k="41" />
-<hkern u1="W" u2="&#x1eb2;" k="82" />
-<hkern u1="W" u2="&#x1eb1;" k="41" />
-<hkern u1="W" u2="&#x1eb0;" k="82" />
-<hkern u1="W" u2="&#x1eaf;" k="41" />
-<hkern u1="W" u2="&#x1eae;" k="82" />
-<hkern u1="W" u2="&#x1ead;" k="41" />
-<hkern u1="W" u2="&#x1eac;" k="82" />
-<hkern u1="W" u2="&#x1eab;" k="41" />
-<hkern u1="W" u2="&#x1eaa;" k="82" />
-<hkern u1="W" u2="&#x1ea9;" k="41" />
-<hkern u1="W" u2="&#x1ea8;" k="82" />
-<hkern u1="W" u2="&#x1ea6;" k="82" />
-<hkern u1="W" u2="&#x1ea5;" k="41" />
-<hkern u1="W" u2="&#x1ea4;" k="82" />
-<hkern u1="W" u2="&#x1ea3;" k="41" />
-<hkern u1="W" u2="&#x1ea2;" k="82" />
-<hkern u1="W" u2="&#x1ea1;" k="41" />
-<hkern u1="W" u2="&#x1ea0;" k="82" />
-<hkern u1="W" u2="&#x1e3f;" k="20" />
-<hkern u1="W" u2="&#x1e01;" k="41" />
-<hkern u1="W" u2="&#x1e00;" k="82" />
-<hkern u1="W" u2="&#x219;" k="20" />
-<hkern u1="W" u2="&#x1ff;" k="41" />
-<hkern u1="W" u2="&#x1fe;" k="20" />
-<hkern u1="W" u2="&#x1fd;" k="41" />
-<hkern u1="W" u2="&#x1fb;" k="41" />
-<hkern u1="W" u2="&#x1fa;" k="82" />
-<hkern u1="W" u2="&#x1b0;" k="20" />
-<hkern u1="W" u2="&#x1a1;" k="41" />
-<hkern u1="W" u2="&#x1a0;" k="20" />
-<hkern u1="W" u2="&#x173;" k="20" />
-<hkern u1="W" u2="&#x171;" k="20" />
-<hkern u1="W" u2="&#x16f;" k="20" />
-<hkern u1="W" u2="&#x16d;" k="20" />
-<hkern u1="W" u2="&#x16b;" k="20" />
-<hkern u1="W" u2="&#x169;" k="20" />
-<hkern u1="W" u2="&#x15f;" k="20" />
-<hkern u1="W" u2="&#x15b;" k="20" />
-<hkern u1="W" u2="&#x157;" k="20" />
-<hkern u1="W" u2="&#x155;" k="20" />
-<hkern u1="W" u2="&#x153;" k="41" />
-<hkern u1="W" u2="&#x152;" k="20" />
-<hkern u1="W" u2="&#x151;" k="41" />
-<hkern u1="W" u2="&#x150;" k="20" />
-<hkern u1="W" u2="&#x14f;" k="41" />
-<hkern u1="W" u2="&#x14e;" k="20" />
-<hkern u1="W" u2="&#x14d;" k="41" />
-<hkern u1="W" u2="&#x14c;" k="20" />
-<hkern u1="W" u2="&#x14b;" k="20" />
-<hkern u1="W" u2="&#x146;" k="20" />
-<hkern u1="W" u2="&#x144;" k="20" />
-<hkern u1="W" u2="&#x138;" k="20" />
-<hkern u1="W" u2="&#x123;" k="20" />
-<hkern u1="W" u2="&#x122;" k="20" />
-<hkern u1="W" u2="&#x121;" k="20" />
-<hkern u1="W" u2="&#x120;" k="20" />
-<hkern u1="W" u2="&#x11f;" k="20" />
-<hkern u1="W" u2="&#x11e;" k="20" />
-<hkern u1="W" u2="&#x11d;" k="20" />
-<hkern u1="W" u2="&#x11c;" k="20" />
-<hkern u1="W" u2="&#x11b;" k="41" />
-<hkern u1="W" u2="&#x119;" k="41" />
-<hkern u1="W" u2="&#x117;" k="41" />
-<hkern u1="W" u2="&#x115;" k="41" />
-<hkern u1="W" u2="&#x113;" k="41" />
-<hkern u1="W" u2="&#x111;" k="41" />
-<hkern u1="W" u2="&#x10f;" k="41" />
-<hkern u1="W" u2="&#x10d;" k="41" />
-<hkern u1="W" u2="&#x10c;" k="20" />
-<hkern u1="W" u2="&#x10b;" k="41" />
-<hkern u1="W" u2="&#x10a;" k="20" />
-<hkern u1="W" u2="&#x109;" k="41" />
-<hkern u1="W" u2="&#x108;" k="20" />
-<hkern u1="W" u2="&#x107;" k="41" />
-<hkern u1="W" u2="&#x106;" k="20" />
-<hkern u1="W" u2="&#x105;" k="41" />
-<hkern u1="W" u2="&#x104;" k="82" />
-<hkern u1="W" u2="&#x103;" k="41" />
-<hkern u1="W" u2="&#x102;" k="82" />
-<hkern u1="W" u2="&#x101;" k="41" />
-<hkern u1="W" u2="&#x100;" k="82" />
-<hkern u1="W" u2="&#xfc;" k="20" />
-<hkern u1="W" u2="&#xfb;" k="20" />
-<hkern u1="W" u2="&#xfa;" k="20" />
-<hkern u1="W" u2="&#xf9;" k="20" />
-<hkern u1="W" u2="&#xf8;" k="41" />
-<hkern u1="W" u2="&#xf6;" k="41" />
-<hkern u1="W" u2="&#xf5;" k="41" />
-<hkern u1="W" u2="&#xf4;" k="41" />
-<hkern u1="W" u2="&#xf3;" k="41" />
-<hkern u1="W" u2="&#xf2;" k="41" />
-<hkern u1="W" u2="&#xeb;" k="41" />
-<hkern u1="W" u2="&#xea;" k="41" />
-<hkern u1="W" u2="&#xe9;" k="41" />
-<hkern u1="W" u2="&#xe8;" k="41" />
-<hkern u1="W" u2="&#xe7;" k="41" />
-<hkern u1="W" u2="&#xe6;" k="41" />
-<hkern u1="W" u2="&#xe5;" k="41" />
-<hkern u1="W" u2="&#xe4;" k="41" />
-<hkern u1="W" u2="&#xe3;" k="41" />
-<hkern u1="W" u2="&#xe2;" k="41" />
-<hkern u1="W" u2="&#xe1;" k="41" />
-<hkern u1="W" u2="&#xe0;" k="41" />
-<hkern u1="W" u2="&#xd8;" k="20" />
-<hkern u1="W" u2="&#xd6;" k="20" />
-<hkern u1="W" u2="&#xd5;" k="20" />
-<hkern u1="W" u2="&#xd4;" k="20" />
-<hkern u1="W" u2="&#xd3;" k="20" />
-<hkern u1="W" u2="&#xd2;" k="20" />
-<hkern u1="W" u2="&#xc7;" k="20" />
-<hkern u1="W" u2="&#xc5;" k="82" />
-<hkern u1="W" u2="&#xc4;" k="82" />
-<hkern u1="W" u2="&#xc3;" k="82" />
-<hkern u1="W" u2="&#xc2;" k="82" />
-<hkern u1="W" u2="&#xc1;" k="82" />
-<hkern u1="W" u2="&#xc0;" k="82" />
-<hkern u1="W" u2="u" k="20" />
-<hkern u1="W" u2="s" k="20" />
-<hkern u1="W" u2="r" k="20" />
-<hkern u1="W" u2="q" k="41" />
-<hkern u1="W" u2="p" k="20" />
-<hkern u1="W" u2="o" k="41" />
-<hkern u1="W" u2="n" k="20" />
-<hkern u1="W" u2="m" k="20" />
-<hkern u1="W" u2="g" k="20" />
-<hkern u1="W" u2="e" k="41" />
-<hkern u1="W" u2="d" k="41" />
-<hkern u1="W" u2="c" k="41" />
-<hkern u1="W" u2="a" k="41" />
-<hkern u1="W" u2="Q" k="20" />
-<hkern u1="W" u2="O" k="20" />
-<hkern u1="W" u2="G" k="20" />
-<hkern u1="W" u2="C" k="20" />
-<hkern u1="W" u2="A" k="82" />
-<hkern u1="W" u2="&#x3f;" k="-41" />
-<hkern u1="W" u2="&#x2e;" k="102" />
-<hkern u1="W" u2="&#x2c;" k="102" />
-<hkern u1="X" u2="&#x1ee2;" k="41" />
-<hkern u1="X" u2="&#x1ee0;" k="41" />
-<hkern u1="X" u2="&#x1ede;" k="41" />
-<hkern u1="X" u2="&#x1edc;" k="41" />
-<hkern u1="X" u2="&#x1eda;" k="41" />
-<hkern u1="X" u2="&#x1ed8;" k="41" />
-<hkern u1="X" u2="&#x1ed6;" k="41" />
-<hkern u1="X" u2="&#x1ed4;" k="41" />
-<hkern u1="X" u2="&#x1ed2;" k="41" />
-<hkern u1="X" u2="&#x1ed0;" k="41" />
-<hkern u1="X" u2="&#x1ece;" k="41" />
-<hkern u1="X" u2="&#x1ecc;" k="41" />
-<hkern u1="X" u2="&#x1fe;" k="41" />
-<hkern u1="X" u2="&#x1a0;" k="41" />
-<hkern u1="X" u2="&#x152;" k="41" />
-<hkern u1="X" u2="&#x150;" k="41" />
-<hkern u1="X" u2="&#x14e;" k="41" />
-<hkern u1="X" u2="&#x14c;" k="41" />
-<hkern u1="X" u2="&#x122;" k="41" />
-<hkern u1="X" u2="&#x120;" k="41" />
-<hkern u1="X" u2="&#x11e;" k="41" />
-<hkern u1="X" u2="&#x11c;" k="41" />
-<hkern u1="X" u2="&#x10c;" k="41" />
-<hkern u1="X" u2="&#x10a;" k="41" />
-<hkern u1="X" u2="&#x108;" k="41" />
-<hkern u1="X" u2="&#x106;" k="41" />
-<hkern u1="X" u2="&#xd8;" k="41" />
-<hkern u1="X" u2="&#xd6;" k="41" />
-<hkern u1="X" u2="&#xd5;" k="41" />
-<hkern u1="X" u2="&#xd4;" k="41" />
-<hkern u1="X" u2="&#xd3;" k="41" />
-<hkern u1="X" u2="&#xd2;" k="41" />
-<hkern u1="X" u2="&#xc7;" k="41" />
-<hkern u1="X" u2="Q" k="41" />
-<hkern u1="X" u2="O" k="41" />
-<hkern u1="X" u2="G" k="41" />
-<hkern u1="X" u2="C" k="41" />
-<hkern u1="Y" u2="&#x201e;" k="123" />
-<hkern u1="Y" u2="&#x201a;" k="123" />
-<hkern u1="Y" u2="&#x1ef1;" k="61" />
-<hkern u1="Y" u2="&#x1eef;" k="61" />
-<hkern u1="Y" u2="&#x1eed;" k="61" />
-<hkern u1="Y" u2="&#x1eeb;" k="61" />
-<hkern u1="Y" u2="&#x1ee9;" k="61" />
-<hkern u1="Y" u2="&#x1ee7;" k="61" />
-<hkern u1="Y" u2="&#x1ee5;" k="61" />
-<hkern u1="Y" u2="&#x1ee3;" k="102" />
-<hkern u1="Y" u2="&#x1ee2;" k="41" />
-<hkern u1="Y" u2="&#x1ee1;" k="102" />
-<hkern u1="Y" u2="&#x1ee0;" k="41" />
-<hkern u1="Y" u2="&#x1edf;" k="102" />
-<hkern u1="Y" u2="&#x1ede;" k="41" />
-<hkern u1="Y" u2="&#x1edd;" k="102" />
-<hkern u1="Y" u2="&#x1edc;" k="41" />
-<hkern u1="Y" u2="&#x1edb;" k="102" />
-<hkern u1="Y" u2="&#x1eda;" k="41" />
-<hkern u1="Y" u2="&#x1ed9;" k="102" />
-<hkern u1="Y" u2="&#x1ed8;" k="41" />
-<hkern u1="Y" u2="&#x1ed7;" k="102" />
-<hkern u1="Y" u2="&#x1ed6;" k="41" />
-<hkern u1="Y" u2="&#x1ed5;" k="102" />
-<hkern u1="Y" u2="&#x1ed4;" k="41" />
-<hkern u1="Y" u2="&#x1ed2;" k="41" />
-<hkern u1="Y" u2="&#x1ed1;" k="102" />
-<hkern u1="Y" u2="&#x1ed0;" k="41" />
-<hkern u1="Y" u2="&#x1ecf;" k="102" />
-<hkern u1="Y" u2="&#x1ece;" k="41" />
-<hkern u1="Y" u2="&#x1ecd;" k="102" />
-<hkern u1="Y" u2="&#x1ecc;" k="41" />
-<hkern u1="Y" u2="&#x1ec7;" k="102" />
-<hkern u1="Y" u2="&#x1ec5;" k="102" />
-<hkern u1="Y" u2="&#x1ec3;" k="102" />
-<hkern u1="Y" u2="&#x1ebf;" k="102" />
-<hkern u1="Y" u2="&#x1ebd;" k="102" />
-<hkern u1="Y" u2="&#x1ebb;" k="102" />
-<hkern u1="Y" u2="&#x1eb9;" k="102" />
-<hkern u1="Y" u2="&#x1eb7;" k="102" />
-<hkern u1="Y" u2="&#x1eb6;" k="123" />
-<hkern u1="Y" u2="&#x1eb5;" k="102" />
-<hkern u1="Y" u2="&#x1eb4;" k="123" />
-<hkern u1="Y" u2="&#x1eb3;" k="102" />
-<hkern u1="Y" u2="&#x1eb2;" k="123" />
-<hkern u1="Y" u2="&#x1eb1;" k="102" />
-<hkern u1="Y" u2="&#x1eb0;" k="123" />
-<hkern u1="Y" u2="&#x1eaf;" k="102" />
-<hkern u1="Y" u2="&#x1eae;" k="123" />
-<hkern u1="Y" u2="&#x1ead;" k="102" />
-<hkern u1="Y" u2="&#x1eac;" k="123" />
-<hkern u1="Y" u2="&#x1eab;" k="102" />
-<hkern u1="Y" u2="&#x1eaa;" k="123" />
-<hkern u1="Y" u2="&#x1ea9;" k="102" />
-<hkern u1="Y" u2="&#x1ea8;" k="123" />
-<hkern u1="Y" u2="&#x1ea6;" k="123" />
-<hkern u1="Y" u2="&#x1ea5;" k="102" />
-<hkern u1="Y" u2="&#x1ea4;" k="123" />
-<hkern u1="Y" u2="&#x1ea3;" k="102" />
-<hkern u1="Y" u2="&#x1ea2;" k="123" />
-<hkern u1="Y" u2="&#x1ea1;" k="102" />
-<hkern u1="Y" u2="&#x1ea0;" k="123" />
-<hkern u1="Y" u2="&#x1e3f;" k="61" />
-<hkern u1="Y" u2="&#x1e01;" k="102" />
-<hkern u1="Y" u2="&#x1e00;" k="123" />
-<hkern u1="Y" u2="&#x219;" k="82" />
-<hkern u1="Y" u2="&#x1ff;" k="102" />
-<hkern u1="Y" u2="&#x1fe;" k="41" />
-<hkern u1="Y" u2="&#x1fd;" k="102" />
-<hkern u1="Y" u2="&#x1fb;" k="102" />
-<hkern u1="Y" u2="&#x1fa;" k="123" />
-<hkern u1="Y" u2="&#x1b0;" k="61" />
-<hkern u1="Y" u2="&#x1a1;" k="102" />
-<hkern u1="Y" u2="&#x1a0;" k="41" />
-<hkern u1="Y" u2="&#x17e;" k="41" />
-<hkern u1="Y" u2="&#x17c;" k="41" />
-<hkern u1="Y" u2="&#x17a;" k="41" />
-<hkern u1="Y" u2="&#x173;" k="61" />
-<hkern u1="Y" u2="&#x171;" k="61" />
-<hkern u1="Y" u2="&#x16f;" k="61" />
-<hkern u1="Y" u2="&#x16d;" k="61" />
-<hkern u1="Y" u2="&#x16b;" k="61" />
-<hkern u1="Y" u2="&#x169;" k="61" />
-<hkern u1="Y" u2="&#x15f;" k="82" />
-<hkern u1="Y" u2="&#x15b;" k="82" />
-<hkern u1="Y" u2="&#x157;" k="61" />
-<hkern u1="Y" u2="&#x155;" k="61" />
-<hkern u1="Y" u2="&#x153;" k="102" />
-<hkern u1="Y" u2="&#x152;" k="41" />
-<hkern u1="Y" u2="&#x151;" k="102" />
-<hkern u1="Y" u2="&#x150;" k="41" />
-<hkern u1="Y" u2="&#x14f;" k="102" />
-<hkern u1="Y" u2="&#x14e;" k="41" />
-<hkern u1="Y" u2="&#x14d;" k="102" />
-<hkern u1="Y" u2="&#x14c;" k="41" />
-<hkern u1="Y" u2="&#x14b;" k="61" />
-<hkern u1="Y" u2="&#x146;" k="61" />
-<hkern u1="Y" u2="&#x144;" k="61" />
-<hkern u1="Y" u2="&#x138;" k="61" />
-<hkern u1="Y" u2="&#x123;" k="41" />
-<hkern u1="Y" u2="&#x122;" k="41" />
-<hkern u1="Y" u2="&#x121;" k="41" />
-<hkern u1="Y" u2="&#x120;" k="41" />
-<hkern u1="Y" u2="&#x11f;" k="41" />
-<hkern u1="Y" u2="&#x11e;" k="41" />
-<hkern u1="Y" u2="&#x11d;" k="41" />
-<hkern u1="Y" u2="&#x11c;" k="41" />
-<hkern u1="Y" u2="&#x11b;" k="102" />
-<hkern u1="Y" u2="&#x119;" k="102" />
-<hkern u1="Y" u2="&#x117;" k="102" />
-<hkern u1="Y" u2="&#x115;" k="102" />
-<hkern u1="Y" u2="&#x113;" k="102" />
-<hkern u1="Y" u2="&#x111;" k="102" />
-<hkern u1="Y" u2="&#x10f;" k="102" />
-<hkern u1="Y" u2="&#x10d;" k="102" />
-<hkern u1="Y" u2="&#x10c;" k="41" />
-<hkern u1="Y" u2="&#x10b;" k="102" />
-<hkern u1="Y" u2="&#x10a;" k="41" />
-<hkern u1="Y" u2="&#x109;" k="102" />
-<hkern u1="Y" u2="&#x108;" k="41" />
-<hkern u1="Y" u2="&#x107;" k="102" />
-<hkern u1="Y" u2="&#x106;" k="41" />
-<hkern u1="Y" u2="&#x105;" k="102" />
-<hkern u1="Y" u2="&#x104;" k="123" />
-<hkern u1="Y" u2="&#x103;" k="102" />
-<hkern u1="Y" u2="&#x102;" k="123" />
-<hkern u1="Y" u2="&#x101;" k="102" />
-<hkern u1="Y" u2="&#x100;" k="123" />
-<hkern u1="Y" u2="&#xfc;" k="61" />
-<hkern u1="Y" u2="&#xfb;" k="61" />
-<hkern u1="Y" u2="&#xfa;" k="61" />
-<hkern u1="Y" u2="&#xf9;" k="61" />
-<hkern u1="Y" u2="&#xf8;" k="102" />
-<hkern u1="Y" u2="&#xf6;" k="102" />
-<hkern u1="Y" u2="&#xf5;" k="102" />
-<hkern u1="Y" u2="&#xf4;" k="102" />
-<hkern u1="Y" u2="&#xf3;" k="102" />
-<hkern u1="Y" u2="&#xf2;" k="102" />
-<hkern u1="Y" u2="&#xeb;" k="102" />
-<hkern u1="Y" u2="&#xea;" k="102" />
-<hkern u1="Y" u2="&#xe9;" k="102" />
-<hkern u1="Y" u2="&#xe8;" k="102" />
-<hkern u1="Y" u2="&#xe7;" k="102" />
-<hkern u1="Y" u2="&#xe6;" k="102" />
-<hkern u1="Y" u2="&#xe5;" k="102" />
-<hkern u1="Y" u2="&#xe4;" k="102" />
-<hkern u1="Y" u2="&#xe3;" k="102" />
-<hkern u1="Y" u2="&#xe2;" k="102" />
-<hkern u1="Y" u2="&#xe1;" k="102" />
-<hkern u1="Y" u2="&#xe0;" k="102" />
-<hkern u1="Y" u2="&#xd8;" k="41" />
-<hkern u1="Y" u2="&#xd6;" k="41" />
-<hkern u1="Y" u2="&#xd5;" k="41" />
-<hkern u1="Y" u2="&#xd4;" k="41" />
-<hkern u1="Y" u2="&#xd3;" k="41" />
-<hkern u1="Y" u2="&#xd2;" k="41" />
-<hkern u1="Y" u2="&#xc7;" k="41" />
-<hkern u1="Y" u2="&#xc5;" k="123" />
-<hkern u1="Y" u2="&#xc4;" k="123" />
-<hkern u1="Y" u2="&#xc3;" k="123" />
-<hkern u1="Y" u2="&#xc2;" k="123" />
-<hkern u1="Y" u2="&#xc1;" k="123" />
-<hkern u1="Y" u2="&#xc0;" k="123" />
-<hkern u1="Y" u2="z" k="41" />
-<hkern u1="Y" u2="u" k="61" />
-<hkern u1="Y" u2="s" k="82" />
-<hkern u1="Y" u2="r" k="61" />
-<hkern u1="Y" u2="q" k="102" />
-<hkern u1="Y" u2="p" k="61" />
-<hkern u1="Y" u2="o" k="102" />
-<hkern u1="Y" u2="n" k="61" />
-<hkern u1="Y" u2="m" k="61" />
-<hkern u1="Y" u2="g" k="41" />
-<hkern u1="Y" u2="e" k="102" />
-<hkern u1="Y" u2="d" k="102" />
-<hkern u1="Y" u2="c" k="102" />
-<hkern u1="Y" u2="a" k="102" />
-<hkern u1="Y" u2="Q" k="41" />
-<hkern u1="Y" u2="O" k="41" />
-<hkern u1="Y" u2="G" k="41" />
-<hkern u1="Y" u2="C" k="41" />
-<hkern u1="Y" u2="A" k="123" />
-<hkern u1="Y" u2="&#x3f;" k="-41" />
-<hkern u1="Y" u2="&#x2e;" k="123" />
-<hkern u1="Y" u2="&#x2c;" k="123" />
-<hkern u1="Z" u2="&#x1ee2;" k="20" />
-<hkern u1="Z" u2="&#x1ee0;" k="20" />
-<hkern u1="Z" u2="&#x1ede;" k="20" />
-<hkern u1="Z" u2="&#x1edc;" k="20" />
-<hkern u1="Z" u2="&#x1eda;" k="20" />
-<hkern u1="Z" u2="&#x1ed8;" k="20" />
-<hkern u1="Z" u2="&#x1ed6;" k="20" />
-<hkern u1="Z" u2="&#x1ed4;" k="20" />
-<hkern u1="Z" u2="&#x1ed2;" k="20" />
-<hkern u1="Z" u2="&#x1ed0;" k="20" />
-<hkern u1="Z" u2="&#x1ece;" k="20" />
-<hkern u1="Z" u2="&#x1ecc;" k="20" />
-<hkern u1="Z" u2="&#x1fe;" k="20" />
-<hkern u1="Z" u2="&#x1a0;" k="20" />
-<hkern u1="Z" u2="&#x152;" k="20" />
-<hkern u1="Z" u2="&#x150;" k="20" />
-<hkern u1="Z" u2="&#x14e;" k="20" />
-<hkern u1="Z" u2="&#x14c;" k="20" />
-<hkern u1="Z" u2="&#x122;" k="20" />
-<hkern u1="Z" u2="&#x120;" k="20" />
-<hkern u1="Z" u2="&#x11e;" k="20" />
-<hkern u1="Z" u2="&#x11c;" k="20" />
-<hkern u1="Z" u2="&#x10c;" k="20" />
-<hkern u1="Z" u2="&#x10a;" k="20" />
-<hkern u1="Z" u2="&#x108;" k="20" />
-<hkern u1="Z" u2="&#x106;" k="20" />
-<hkern u1="Z" u2="&#xd8;" k="20" />
-<hkern u1="Z" u2="&#xd6;" k="20" />
-<hkern u1="Z" u2="&#xd5;" k="20" />
-<hkern u1="Z" u2="&#xd4;" k="20" />
-<hkern u1="Z" u2="&#xd3;" k="20" />
-<hkern u1="Z" u2="&#xd2;" k="20" />
-<hkern u1="Z" u2="&#xc7;" k="20" />
-<hkern u1="Z" u2="Q" k="20" />
-<hkern u1="Z" u2="O" k="20" />
-<hkern u1="Z" u2="G" k="20" />
-<hkern u1="Z" u2="C" k="20" />
-<hkern u1="[" u2="J" k="-184" />
-<hkern u1="a" u2="&#x201d;" k="20" />
-<hkern u1="a" u2="&#x2019;" k="20" />
-<hkern u1="a" u2="&#x27;" k="20" />
-<hkern u1="a" u2="&#x22;" k="20" />
-<hkern u1="b" u2="&#x201d;" k="20" />
-<hkern u1="b" u2="&#x2019;" k="20" />
-<hkern u1="b" u2="&#x1ef5;" k="41" />
-<hkern u1="b" u2="&#x1e83;" k="41" />
-<hkern u1="b" u2="&#x1e81;" k="41" />
-<hkern u1="b" u2="&#x17e;" k="20" />
-<hkern u1="b" u2="&#x17c;" k="20" />
-<hkern u1="b" u2="&#x17a;" k="20" />
-<hkern u1="b" u2="&#x175;" k="41" />
-<hkern u1="b" u2="&#xfd;" k="41" />
-<hkern u1="b" u2="z" k="20" />
-<hkern u1="b" u2="y" k="41" />
-<hkern u1="b" u2="x" k="41" />
-<hkern u1="b" u2="w" k="41" />
-<hkern u1="b" u2="v" k="41" />
-<hkern u1="b" u2="&#x27;" k="20" />
-<hkern u1="b" u2="&#x22;" k="20" />
-<hkern u1="c" u2="&#x201d;" k="-41" />
-<hkern u1="c" u2="&#x2019;" k="-41" />
-<hkern u1="c" u2="&#x27;" k="-41" />
-<hkern u1="c" u2="&#x22;" k="-41" />
-<hkern u1="e" u2="&#x201d;" k="20" />
-<hkern u1="e" u2="&#x2019;" k="20" />
-<hkern u1="e" u2="&#x1ef5;" k="41" />
-<hkern u1="e" u2="&#x1e83;" k="41" />
-<hkern u1="e" u2="&#x1e81;" k="41" />
-<hkern u1="e" u2="&#x17e;" k="20" />
-<hkern u1="e" u2="&#x17c;" k="20" />
-<hkern u1="e" u2="&#x17a;" k="20" />
-<hkern u1="e" u2="&#x175;" k="41" />
-<hkern u1="e" u2="&#xfd;" k="41" />
-<hkern u1="e" u2="z" k="20" />
-<hkern u1="e" u2="y" k="41" />
-<hkern u1="e" u2="x" k="41" />
-<hkern u1="e" u2="w" k="41" />
-<hkern u1="e" u2="v" k="41" />
-<hkern u1="e" u2="&#x27;" k="20" />
-<hkern u1="e" u2="&#x22;" k="20" />
-<hkern u1="f" u2="&#x201d;" k="-123" />
-<hkern u1="f" u2="&#x2019;" k="-123" />
-<hkern u1="f" u2="&#x27;" k="-123" />
-<hkern u1="f" u2="&#x22;" k="-123" />
-<hkern u1="h" u2="&#x201d;" k="20" />
-<hkern u1="h" u2="&#x2019;" k="20" />
-<hkern u1="h" u2="&#x27;" k="20" />
-<hkern u1="h" u2="&#x22;" k="20" />
-<hkern u1="k" u2="&#x1ee3;" k="41" />
-<hkern u1="k" u2="&#x1ee1;" k="41" />
-<hkern u1="k" u2="&#x1edf;" k="41" />
-<hkern u1="k" u2="&#x1edd;" k="41" />
-<hkern u1="k" u2="&#x1edb;" k="41" />
-<hkern u1="k" u2="&#x1ed9;" k="41" />
-<hkern u1="k" u2="&#x1ed7;" k="41" />
-<hkern u1="k" u2="&#x1ed5;" k="41" />
-<hkern u1="k" u2="&#x1ed1;" k="41" />
-<hkern u1="k" u2="&#x1ecf;" k="41" />
-<hkern u1="k" u2="&#x1ecd;" k="41" />
-<hkern u1="k" u2="&#x1ec7;" k="41" />
-<hkern u1="k" u2="&#x1ec5;" k="41" />
-<hkern u1="k" u2="&#x1ec3;" k="41" />
-<hkern u1="k" u2="&#x1ebf;" k="41" />
-<hkern u1="k" u2="&#x1ebd;" k="41" />
-<hkern u1="k" u2="&#x1ebb;" k="41" />
-<hkern u1="k" u2="&#x1eb9;" k="41" />
-<hkern u1="k" u2="&#x1ff;" k="41" />
-<hkern u1="k" u2="&#x1a1;" k="41" />
-<hkern u1="k" u2="&#x153;" k="41" />
-<hkern u1="k" u2="&#x151;" k="41" />
-<hkern u1="k" u2="&#x14f;" k="41" />
-<hkern u1="k" u2="&#x14d;" k="41" />
-<hkern u1="k" u2="&#x11b;" k="41" />
-<hkern u1="k" u2="&#x119;" k="41" />
-<hkern u1="k" u2="&#x117;" k="41" />
-<hkern u1="k" u2="&#x115;" k="41" />
-<hkern u1="k" u2="&#x113;" k="41" />
-<hkern u1="k" u2="&#x111;" k="41" />
-<hkern u1="k" u2="&#x10f;" k="41" />
-<hkern u1="k" u2="&#x10d;" k="41" />
-<hkern u1="k" u2="&#x10b;" k="41" />
-<hkern u1="k" u2="&#x109;" k="41" />
-<hkern u1="k" u2="&#x107;" k="41" />
-<hkern u1="k" u2="&#xf8;" k="41" />
-<hkern u1="k" u2="&#xf6;" k="41" />
-<hkern u1="k" u2="&#xf5;" k="41" />
-<hkern u1="k" u2="&#xf4;" k="41" />
-<hkern u1="k" u2="&#xf3;" k="41" />
-<hkern u1="k" u2="&#xf2;" k="41" />
-<hkern u1="k" u2="&#xeb;" k="41" />
-<hkern u1="k" u2="&#xea;" k="41" />
-<hkern u1="k" u2="&#xe9;" k="41" />
-<hkern u1="k" u2="&#xe8;" k="41" />
-<hkern u1="k" u2="&#xe7;" k="41" />
-<hkern u1="k" u2="&#xe0;" k="41" />
-<hkern u1="k" u2="q" k="41" />
-<hkern u1="k" u2="o" k="41" />
-<hkern u1="k" u2="e" k="41" />
-<hkern u1="k" u2="d" k="41" />
-<hkern u1="k" u2="c" k="41" />
-<hkern u1="m" u2="&#x201d;" k="20" />
-<hkern u1="m" u2="&#x2019;" k="20" />
-<hkern u1="m" u2="&#x27;" k="20" />
-<hkern u1="m" u2="&#x22;" k="20" />
-<hkern u1="n" u2="&#x201d;" k="20" />
-<hkern u1="n" u2="&#x2019;" k="20" />
-<hkern u1="n" u2="&#x27;" k="20" />
-<hkern u1="n" u2="&#x22;" k="20" />
-<hkern u1="o" u2="&#x201d;" k="20" />
-<hkern u1="o" u2="&#x2019;" k="20" />
-<hkern u1="o" u2="&#x1ef5;" k="41" />
-<hkern u1="o" u2="&#x1e83;" k="41" />
-<hkern u1="o" u2="&#x1e81;" k="41" />
-<hkern u1="o" u2="&#x17e;" k="20" />
-<hkern u1="o" u2="&#x17c;" k="20" />
-<hkern u1="o" u2="&#x17a;" k="20" />
-<hkern u1="o" u2="&#x175;" k="41" />
-<hkern u1="o" u2="&#xfd;" k="41" />
-<hkern u1="o" u2="z" k="20" />
-<hkern u1="o" u2="y" k="41" />
-<hkern u1="o" u2="x" k="41" />
-<hkern u1="o" u2="w" k="41" />
-<hkern u1="o" u2="v" k="41" />
-<hkern u1="o" u2="&#x27;" k="20" />
-<hkern u1="o" u2="&#x22;" k="20" />
-<hkern u1="p" u2="&#x201d;" k="20" />
-<hkern u1="p" u2="&#x2019;" k="20" />
-<hkern u1="p" u2="&#x1ef5;" k="41" />
-<hkern u1="p" u2="&#x1e83;" k="41" />
-<hkern u1="p" u2="&#x1e81;" k="41" />
-<hkern u1="p" u2="&#x17e;" k="20" />
-<hkern u1="p" u2="&#x17c;" k="20" />
-<hkern u1="p" u2="&#x17a;" k="20" />
-<hkern u1="p" u2="&#x175;" k="41" />
-<hkern u1="p" u2="&#xfd;" k="41" />
-<hkern u1="p" u2="z" k="20" />
-<hkern u1="p" u2="y" k="41" />
-<hkern u1="p" u2="x" k="41" />
-<hkern u1="p" u2="w" k="41" />
-<hkern u1="p" u2="v" k="41" />
-<hkern u1="p" u2="&#x27;" k="20" />
-<hkern u1="p" u2="&#x22;" k="20" />
-<hkern u1="r" u2="&#x201d;" k="-82" />
-<hkern u1="r" u2="&#x2019;" k="-82" />
-<hkern u1="r" u2="&#x1ee3;" k="41" />
-<hkern u1="r" u2="&#x1ee1;" k="41" />
-<hkern u1="r" u2="&#x1edf;" k="41" />
-<hkern u1="r" u2="&#x1edd;" k="41" />
-<hkern u1="r" u2="&#x1edb;" k="41" />
-<hkern u1="r" u2="&#x1ed9;" k="41" />
-<hkern u1="r" u2="&#x1ed7;" k="41" />
-<hkern u1="r" u2="&#x1ed5;" k="41" />
-<hkern u1="r" u2="&#x1ed1;" k="41" />
-<hkern u1="r" u2="&#x1ecf;" k="41" />
-<hkern u1="r" u2="&#x1ecd;" k="41" />
-<hkern u1="r" u2="&#x1ec7;" k="41" />
-<hkern u1="r" u2="&#x1ec5;" k="41" />
-<hkern u1="r" u2="&#x1ec3;" k="41" />
-<hkern u1="r" u2="&#x1ebf;" k="41" />
-<hkern u1="r" u2="&#x1ebd;" k="41" />
-<hkern u1="r" u2="&#x1ebb;" k="41" />
-<hkern u1="r" u2="&#x1eb9;" k="41" />
-<hkern u1="r" u2="&#x1eb7;" k="41" />
-<hkern u1="r" u2="&#x1eb5;" k="41" />
-<hkern u1="r" u2="&#x1eb3;" k="41" />
-<hkern u1="r" u2="&#x1eb1;" k="41" />
-<hkern u1="r" u2="&#x1eaf;" k="41" />
-<hkern u1="r" u2="&#x1ead;" k="41" />
-<hkern u1="r" u2="&#x1eab;" k="41" />
-<hkern u1="r" u2="&#x1ea9;" k="41" />
-<hkern u1="r" u2="&#x1ea5;" k="41" />
-<hkern u1="r" u2="&#x1ea3;" k="41" />
-<hkern u1="r" u2="&#x1ea1;" k="41" />
-<hkern u1="r" u2="&#x1e01;" k="41" />
-<hkern u1="r" u2="&#x1ff;" k="41" />
-<hkern u1="r" u2="&#x1fd;" k="41" />
-<hkern u1="r" u2="&#x1fb;" k="41" />
-<hkern u1="r" u2="&#x1a1;" k="41" />
-<hkern u1="r" u2="&#x153;" k="41" />
-<hkern u1="r" u2="&#x151;" k="41" />
-<hkern u1="r" u2="&#x14f;" k="41" />
-<hkern u1="r" u2="&#x14d;" k="41" />
-<hkern u1="r" u2="&#x123;" k="20" />
-<hkern u1="r" u2="&#x121;" k="20" />
-<hkern u1="r" u2="&#x11f;" k="20" />
-<hkern u1="r" u2="&#x11d;" k="20" />
-<hkern u1="r" u2="&#x11b;" k="41" />
-<hkern u1="r" u2="&#x119;" k="41" />
-<hkern u1="r" u2="&#x117;" k="41" />
-<hkern u1="r" u2="&#x115;" k="41" />
-<hkern u1="r" u2="&#x113;" k="41" />
-<hkern u1="r" u2="&#x111;" k="41" />
-<hkern u1="r" u2="&#x10f;" k="41" />
-<hkern u1="r" u2="&#x10d;" k="41" />
-<hkern u1="r" u2="&#x10b;" k="41" />
-<hkern u1="r" u2="&#x109;" k="41" />
-<hkern u1="r" u2="&#x107;" k="41" />
-<hkern u1="r" u2="&#x105;" k="41" />
-<hkern u1="r" u2="&#x103;" k="41" />
-<hkern u1="r" u2="&#x101;" k="41" />
-<hkern u1="r" u2="&#xf8;" k="41" />
-<hkern u1="r" u2="&#xf6;" k="41" />
-<hkern u1="r" u2="&#xf5;" k="41" />
-<hkern u1="r" u2="&#xf4;" k="41" />
-<hkern u1="r" u2="&#xf3;" k="41" />
-<hkern u1="r" u2="&#xf2;" k="41" />
-<hkern u1="r" u2="&#xeb;" k="41" />
-<hkern u1="r" u2="&#xea;" k="41" />
-<hkern u1="r" u2="&#xe9;" k="41" />
-<hkern u1="r" u2="&#xe8;" k="41" />
-<hkern u1="r" u2="&#xe7;" k="41" />
-<hkern u1="r" u2="&#xe6;" k="41" />
-<hkern u1="r" u2="&#xe5;" k="41" />
-<hkern u1="r" u2="&#xe4;" k="41" />
-<hkern u1="r" u2="&#xe3;" k="41" />
-<hkern u1="r" u2="&#xe2;" k="41" />
-<hkern u1="r" u2="&#xe1;" k="41" />
-<hkern u1="r" u2="&#xe0;" k="41" />
-<hkern u1="r" u2="q" k="41" />
-<hkern u1="r" u2="o" k="41" />
-<hkern u1="r" u2="g" k="20" />
-<hkern u1="r" u2="e" k="41" />
-<hkern u1="r" u2="d" k="41" />
-<hkern u1="r" u2="c" k="41" />
-<hkern u1="r" u2="a" k="41" />
-<hkern u1="r" u2="&#x27;" k="-82" />
-<hkern u1="r" u2="&#x22;" k="-82" />
-<hkern u1="t" u2="&#x201d;" k="-41" />
-<hkern u1="t" u2="&#x2019;" k="-41" />
-<hkern u1="t" u2="&#x27;" k="-41" />
-<hkern u1="t" u2="&#x22;" k="-41" />
-<hkern u1="v" u2="&#x201e;" k="82" />
-<hkern u1="v" u2="&#x201d;" k="-82" />
-<hkern u1="v" u2="&#x201a;" k="82" />
-<hkern u1="v" u2="&#x2019;" k="-82" />
-<hkern u1="v" u2="&#x3f;" k="-41" />
-<hkern u1="v" u2="&#x2e;" k="82" />
-<hkern u1="v" u2="&#x2c;" k="82" />
-<hkern u1="v" u2="&#x27;" k="-82" />
-<hkern u1="v" u2="&#x22;" k="-82" />
-<hkern u1="w" u2="&#x201e;" k="82" />
-<hkern u1="w" u2="&#x201d;" k="-82" />
-<hkern u1="w" u2="&#x201a;" k="82" />
-<hkern u1="w" u2="&#x2019;" k="-82" />
-<hkern u1="w" u2="&#x3f;" k="-41" />
-<hkern u1="w" u2="&#x2e;" k="82" />
-<hkern u1="w" u2="&#x2c;" k="82" />
-<hkern u1="w" u2="&#x27;" k="-82" />
-<hkern u1="w" u2="&#x22;" k="-82" />
-<hkern u1="x" u2="&#x1ee3;" k="41" />
-<hkern u1="x" u2="&#x1ee1;" k="41" />
-<hkern u1="x" u2="&#x1edf;" k="41" />
-<hkern u1="x" u2="&#x1edd;" k="41" />
-<hkern u1="x" u2="&#x1edb;" k="41" />
-<hkern u1="x" u2="&#x1ed9;" k="41" />
-<hkern u1="x" u2="&#x1ed7;" k="41" />
-<hkern u1="x" u2="&#x1ed5;" k="41" />
-<hkern u1="x" u2="&#x1ed1;" k="41" />
-<hkern u1="x" u2="&#x1ecf;" k="41" />
-<hkern u1="x" u2="&#x1ecd;" k="41" />
-<hkern u1="x" u2="&#x1ec7;" k="41" />
-<hkern u1="x" u2="&#x1ec5;" k="41" />
-<hkern u1="x" u2="&#x1ec3;" k="41" />
-<hkern u1="x" u2="&#x1ebf;" k="41" />
-<hkern u1="x" u2="&#x1ebd;" k="41" />
-<hkern u1="x" u2="&#x1ebb;" k="41" />
-<hkern u1="x" u2="&#x1eb9;" k="41" />
-<hkern u1="x" u2="&#x1ff;" k="41" />
-<hkern u1="x" u2="&#x1a1;" k="41" />
-<hkern u1="x" u2="&#x153;" k="41" />
-<hkern u1="x" u2="&#x151;" k="41" />
-<hkern u1="x" u2="&#x14f;" k="41" />
-<hkern u1="x" u2="&#x14d;" k="41" />
-<hkern u1="x" u2="&#x11b;" k="41" />
-<hkern u1="x" u2="&#x119;" k="41" />
-<hkern u1="x" u2="&#x117;" k="41" />
-<hkern u1="x" u2="&#x115;" k="41" />
-<hkern u1="x" u2="&#x113;" k="41" />
-<hkern u1="x" u2="&#x111;" k="41" />
-<hkern u1="x" u2="&#x10f;" k="41" />
-<hkern u1="x" u2="&#x10d;" k="41" />
-<hkern u1="x" u2="&#x10b;" k="41" />
-<hkern u1="x" u2="&#x109;" k="41" />
-<hkern u1="x" u2="&#x107;" k="41" />
-<hkern u1="x" u2="&#xf8;" k="41" />
-<hkern u1="x" u2="&#xf6;" k="41" />
-<hkern u1="x" u2="&#xf5;" k="41" />
-<hkern u1="x" u2="&#xf4;" k="41" />
-<hkern u1="x" u2="&#xf3;" k="41" />
-<hkern u1="x" u2="&#xf2;" k="41" />
-<hkern u1="x" u2="&#xeb;" k="41" />
-<hkern u1="x" u2="&#xea;" k="41" />
-<hkern u1="x" u2="&#xe9;" k="41" />
-<hkern u1="x" u2="&#xe8;" k="41" />
-<hkern u1="x" u2="&#xe7;" k="41" />
-<hkern u1="x" u2="&#xe0;" k="41" />
-<hkern u1="x" u2="q" k="41" />
-<hkern u1="x" u2="o" k="41" />
-<hkern u1="x" u2="e" k="41" />
-<hkern u1="x" u2="d" k="41" />
-<hkern u1="x" u2="c" k="41" />
-<hkern u1="y" u2="&#x201e;" k="82" />
-<hkern u1="y" u2="&#x201d;" k="-82" />
-<hkern u1="y" u2="&#x201a;" k="82" />
-<hkern u1="y" u2="&#x2019;" k="-82" />
-<hkern u1="y" u2="&#x3f;" k="-41" />
-<hkern u1="y" u2="&#x2e;" k="82" />
-<hkern u1="y" u2="&#x2c;" k="82" />
-<hkern u1="y" u2="&#x27;" k="-82" />
-<hkern u1="y" u2="&#x22;" k="-82" />
-<hkern u1="&#x7b;" u2="J" k="-184" />
-<hkern u1="&#xc0;" u2="&#x201d;" k="143" />
-<hkern u1="&#xc0;" u2="&#x2019;" k="143" />
-<hkern u1="&#xc0;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#xc0;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#xc0;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#xc0;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#xc0;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#xc0;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#xc0;" u2="&#x1ede;" k="41" />
-<hkern u1="&#xc0;" u2="&#x1edc;" k="41" />
-<hkern u1="&#xc0;" u2="&#x1eda;" k="41" />
-<hkern u1="&#xc0;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#xc0;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#xc0;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#xc0;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#xc0;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#xc0;" u2="&#x1ece;" k="41" />
-<hkern u1="&#xc0;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#xc0;" u2="&#x1e84;" k="82" />
-<hkern u1="&#xc0;" u2="&#x1e82;" k="82" />
-<hkern u1="&#xc0;" u2="&#x1e80;" k="82" />
-<hkern u1="&#xc0;" u2="&#x21a;" k="143" />
-<hkern u1="&#xc0;" u2="&#x1fe;" k="41" />
-<hkern u1="&#xc0;" u2="&#x1a0;" k="41" />
-<hkern u1="&#xc0;" u2="&#x178;" k="123" />
-<hkern u1="&#xc0;" u2="&#x176;" k="123" />
-<hkern u1="&#xc0;" u2="&#x174;" k="82" />
-<hkern u1="&#xc0;" u2="&#x164;" k="143" />
-<hkern u1="&#xc0;" u2="&#x162;" k="143" />
-<hkern u1="&#xc0;" u2="&#x152;" k="41" />
-<hkern u1="&#xc0;" u2="&#x150;" k="41" />
-<hkern u1="&#xc0;" u2="&#x14e;" k="41" />
-<hkern u1="&#xc0;" u2="&#x14c;" k="41" />
-<hkern u1="&#xc0;" u2="&#x122;" k="41" />
-<hkern u1="&#xc0;" u2="&#x120;" k="41" />
-<hkern u1="&#xc0;" u2="&#x11e;" k="41" />
-<hkern u1="&#xc0;" u2="&#x11c;" k="41" />
-<hkern u1="&#xc0;" u2="&#x10c;" k="41" />
-<hkern u1="&#xc0;" u2="&#x10a;" k="41" />
-<hkern u1="&#xc0;" u2="&#x108;" k="41" />
-<hkern u1="&#xc0;" u2="&#x106;" k="41" />
-<hkern u1="&#xc0;" u2="&#xdd;" k="123" />
-<hkern u1="&#xc0;" u2="&#xd8;" k="41" />
-<hkern u1="&#xc0;" u2="&#xd6;" k="41" />
-<hkern u1="&#xc0;" u2="&#xd5;" k="41" />
-<hkern u1="&#xc0;" u2="&#xd4;" k="41" />
-<hkern u1="&#xc0;" u2="&#xd3;" k="41" />
-<hkern u1="&#xc0;" u2="&#xd2;" k="41" />
-<hkern u1="&#xc0;" u2="&#xc7;" k="41" />
-<hkern u1="&#xc0;" u2="Y" k="123" />
-<hkern u1="&#xc0;" u2="W" k="82" />
-<hkern u1="&#xc0;" u2="V" k="82" />
-<hkern u1="&#xc0;" u2="T" k="143" />
-<hkern u1="&#xc0;" u2="Q" k="41" />
-<hkern u1="&#xc0;" u2="O" k="41" />
-<hkern u1="&#xc0;" u2="J" k="-266" />
-<hkern u1="&#xc0;" u2="G" k="41" />
-<hkern u1="&#xc0;" u2="C" k="41" />
-<hkern u1="&#xc0;" u2="&#x27;" k="143" />
-<hkern u1="&#xc0;" u2="&#x22;" k="143" />
-<hkern u1="&#xc1;" u2="&#x201d;" k="143" />
-<hkern u1="&#xc1;" u2="&#x2019;" k="143" />
-<hkern u1="&#xc1;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#xc1;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#xc1;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#xc1;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#xc1;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#xc1;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#xc1;" u2="&#x1ede;" k="41" />
-<hkern u1="&#xc1;" u2="&#x1edc;" k="41" />
-<hkern u1="&#xc1;" u2="&#x1eda;" k="41" />
-<hkern u1="&#xc1;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#xc1;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#xc1;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#xc1;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#xc1;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#xc1;" u2="&#x1ece;" k="41" />
-<hkern u1="&#xc1;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#xc1;" u2="&#x1e84;" k="82" />
-<hkern u1="&#xc1;" u2="&#x1e82;" k="82" />
-<hkern u1="&#xc1;" u2="&#x1e80;" k="82" />
-<hkern u1="&#xc1;" u2="&#x21a;" k="143" />
-<hkern u1="&#xc1;" u2="&#x1fe;" k="41" />
-<hkern u1="&#xc1;" u2="&#x1a0;" k="41" />
-<hkern u1="&#xc1;" u2="&#x178;" k="123" />
-<hkern u1="&#xc1;" u2="&#x176;" k="123" />
-<hkern u1="&#xc1;" u2="&#x174;" k="82" />
-<hkern u1="&#xc1;" u2="&#x164;" k="143" />
-<hkern u1="&#xc1;" u2="&#x162;" k="143" />
-<hkern u1="&#xc1;" u2="&#x152;" k="41" />
-<hkern u1="&#xc1;" u2="&#x150;" k="41" />
-<hkern u1="&#xc1;" u2="&#x14e;" k="41" />
-<hkern u1="&#xc1;" u2="&#x14c;" k="41" />
-<hkern u1="&#xc1;" u2="&#x122;" k="41" />
-<hkern u1="&#xc1;" u2="&#x120;" k="41" />
-<hkern u1="&#xc1;" u2="&#x11e;" k="41" />
-<hkern u1="&#xc1;" u2="&#x11c;" k="41" />
-<hkern u1="&#xc1;" u2="&#x10c;" k="41" />
-<hkern u1="&#xc1;" u2="&#x10a;" k="41" />
-<hkern u1="&#xc1;" u2="&#x108;" k="41" />
-<hkern u1="&#xc1;" u2="&#x106;" k="41" />
-<hkern u1="&#xc1;" u2="&#xdd;" k="123" />
-<hkern u1="&#xc1;" u2="&#xd8;" k="41" />
-<hkern u1="&#xc1;" u2="&#xd6;" k="41" />
-<hkern u1="&#xc1;" u2="&#xd5;" k="41" />
-<hkern u1="&#xc1;" u2="&#xd4;" k="41" />
-<hkern u1="&#xc1;" u2="&#xd3;" k="41" />
-<hkern u1="&#xc1;" u2="&#xd2;" k="41" />
-<hkern u1="&#xc1;" u2="&#xc7;" k="41" />
-<hkern u1="&#xc1;" u2="Y" k="123" />
-<hkern u1="&#xc1;" u2="W" k="82" />
-<hkern u1="&#xc1;" u2="V" k="82" />
-<hkern u1="&#xc1;" u2="T" k="143" />
-<hkern u1="&#xc1;" u2="Q" k="41" />
-<hkern u1="&#xc1;" u2="O" k="41" />
-<hkern u1="&#xc1;" u2="J" k="-266" />
-<hkern u1="&#xc1;" u2="G" k="41" />
-<hkern u1="&#xc1;" u2="C" k="41" />
-<hkern u1="&#xc1;" u2="&#x27;" k="143" />
-<hkern u1="&#xc1;" u2="&#x22;" k="143" />
-<hkern u1="&#xc2;" u2="&#x201d;" k="143" />
-<hkern u1="&#xc2;" u2="&#x2019;" k="143" />
-<hkern u1="&#xc2;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#xc2;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#xc2;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#xc2;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#xc2;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#xc2;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#xc2;" u2="&#x1ede;" k="41" />
-<hkern u1="&#xc2;" u2="&#x1edc;" k="41" />
-<hkern u1="&#xc2;" u2="&#x1eda;" k="41" />
-<hkern u1="&#xc2;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#xc2;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#xc2;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#xc2;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#xc2;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#xc2;" u2="&#x1ece;" k="41" />
-<hkern u1="&#xc2;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#xc2;" u2="&#x1e84;" k="82" />
-<hkern u1="&#xc2;" u2="&#x1e82;" k="82" />
-<hkern u1="&#xc2;" u2="&#x1e80;" k="82" />
-<hkern u1="&#xc2;" u2="&#x21a;" k="143" />
-<hkern u1="&#xc2;" u2="&#x1fe;" k="41" />
-<hkern u1="&#xc2;" u2="&#x1a0;" k="41" />
-<hkern u1="&#xc2;" u2="&#x178;" k="123" />
-<hkern u1="&#xc2;" u2="&#x176;" k="123" />
-<hkern u1="&#xc2;" u2="&#x174;" k="82" />
-<hkern u1="&#xc2;" u2="&#x164;" k="143" />
-<hkern u1="&#xc2;" u2="&#x162;" k="143" />
-<hkern u1="&#xc2;" u2="&#x152;" k="41" />
-<hkern u1="&#xc2;" u2="&#x150;" k="41" />
-<hkern u1="&#xc2;" u2="&#x14e;" k="41" />
-<hkern u1="&#xc2;" u2="&#x14c;" k="41" />
-<hkern u1="&#xc2;" u2="&#x122;" k="41" />
-<hkern u1="&#xc2;" u2="&#x120;" k="41" />
-<hkern u1="&#xc2;" u2="&#x11e;" k="41" />
-<hkern u1="&#xc2;" u2="&#x11c;" k="41" />
-<hkern u1="&#xc2;" u2="&#x10c;" k="41" />
-<hkern u1="&#xc2;" u2="&#x10a;" k="41" />
-<hkern u1="&#xc2;" u2="&#x108;" k="41" />
-<hkern u1="&#xc2;" u2="&#x106;" k="41" />
-<hkern u1="&#xc2;" u2="&#xdd;" k="123" />
-<hkern u1="&#xc2;" u2="&#xd8;" k="41" />
-<hkern u1="&#xc2;" u2="&#xd6;" k="41" />
-<hkern u1="&#xc2;" u2="&#xd5;" k="41" />
-<hkern u1="&#xc2;" u2="&#xd4;" k="41" />
-<hkern u1="&#xc2;" u2="&#xd3;" k="41" />
-<hkern u1="&#xc2;" u2="&#xd2;" k="41" />
-<hkern u1="&#xc2;" u2="&#xc7;" k="41" />
-<hkern u1="&#xc2;" u2="Y" k="123" />
-<hkern u1="&#xc2;" u2="W" k="82" />
-<hkern u1="&#xc2;" u2="V" k="82" />
-<hkern u1="&#xc2;" u2="T" k="143" />
-<hkern u1="&#xc2;" u2="Q" k="41" />
-<hkern u1="&#xc2;" u2="O" k="41" />
-<hkern u1="&#xc2;" u2="J" k="-266" />
-<hkern u1="&#xc2;" u2="G" k="41" />
-<hkern u1="&#xc2;" u2="C" k="41" />
-<hkern u1="&#xc2;" u2="&#x27;" k="143" />
-<hkern u1="&#xc2;" u2="&#x22;" k="143" />
-<hkern u1="&#xc3;" u2="&#x201d;" k="143" />
-<hkern u1="&#xc3;" u2="&#x2019;" k="143" />
-<hkern u1="&#xc3;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#xc3;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#xc3;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#xc3;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#xc3;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#xc3;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#xc3;" u2="&#x1ede;" k="41" />
-<hkern u1="&#xc3;" u2="&#x1edc;" k="41" />
-<hkern u1="&#xc3;" u2="&#x1eda;" k="41" />
-<hkern u1="&#xc3;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#xc3;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#xc3;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#xc3;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#xc3;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#xc3;" u2="&#x1ece;" k="41" />
-<hkern u1="&#xc3;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#xc3;" u2="&#x1e84;" k="82" />
-<hkern u1="&#xc3;" u2="&#x1e82;" k="82" />
-<hkern u1="&#xc3;" u2="&#x1e80;" k="82" />
-<hkern u1="&#xc3;" u2="&#x21a;" k="143" />
-<hkern u1="&#xc3;" u2="&#x1fe;" k="41" />
-<hkern u1="&#xc3;" u2="&#x1a0;" k="41" />
-<hkern u1="&#xc3;" u2="&#x178;" k="123" />
-<hkern u1="&#xc3;" u2="&#x176;" k="123" />
-<hkern u1="&#xc3;" u2="&#x174;" k="82" />
-<hkern u1="&#xc3;" u2="&#x164;" k="143" />
-<hkern u1="&#xc3;" u2="&#x162;" k="143" />
-<hkern u1="&#xc3;" u2="&#x152;" k="41" />
-<hkern u1="&#xc3;" u2="&#x150;" k="41" />
-<hkern u1="&#xc3;" u2="&#x14e;" k="41" />
-<hkern u1="&#xc3;" u2="&#x14c;" k="41" />
-<hkern u1="&#xc3;" u2="&#x122;" k="41" />
-<hkern u1="&#xc3;" u2="&#x120;" k="41" />
-<hkern u1="&#xc3;" u2="&#x11e;" k="41" />
-<hkern u1="&#xc3;" u2="&#x11c;" k="41" />
-<hkern u1="&#xc3;" u2="&#x10c;" k="41" />
-<hkern u1="&#xc3;" u2="&#x10a;" k="41" />
-<hkern u1="&#xc3;" u2="&#x108;" k="41" />
-<hkern u1="&#xc3;" u2="&#x106;" k="41" />
-<hkern u1="&#xc3;" u2="&#xdd;" k="123" />
-<hkern u1="&#xc3;" u2="&#xd8;" k="41" />
-<hkern u1="&#xc3;" u2="&#xd6;" k="41" />
-<hkern u1="&#xc3;" u2="&#xd5;" k="41" />
-<hkern u1="&#xc3;" u2="&#xd4;" k="41" />
-<hkern u1="&#xc3;" u2="&#xd3;" k="41" />
-<hkern u1="&#xc3;" u2="&#xd2;" k="41" />
-<hkern u1="&#xc3;" u2="&#xc7;" k="41" />
-<hkern u1="&#xc3;" u2="Y" k="123" />
-<hkern u1="&#xc3;" u2="W" k="82" />
-<hkern u1="&#xc3;" u2="V" k="82" />
-<hkern u1="&#xc3;" u2="T" k="143" />
-<hkern u1="&#xc3;" u2="Q" k="41" />
-<hkern u1="&#xc3;" u2="O" k="41" />
-<hkern u1="&#xc3;" u2="J" k="-266" />
-<hkern u1="&#xc3;" u2="G" k="41" />
-<hkern u1="&#xc3;" u2="C" k="41" />
-<hkern u1="&#xc3;" u2="&#x27;" k="143" />
-<hkern u1="&#xc3;" u2="&#x22;" k="143" />
-<hkern u1="&#xc4;" u2="&#x201d;" k="143" />
-<hkern u1="&#xc4;" u2="&#x2019;" k="143" />
-<hkern u1="&#xc4;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#xc4;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#xc4;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#xc4;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#xc4;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#xc4;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#xc4;" u2="&#x1ede;" k="41" />
-<hkern u1="&#xc4;" u2="&#x1edc;" k="41" />
-<hkern u1="&#xc4;" u2="&#x1eda;" k="41" />
-<hkern u1="&#xc4;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#xc4;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#xc4;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#xc4;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#xc4;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#xc4;" u2="&#x1ece;" k="41" />
-<hkern u1="&#xc4;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#xc4;" u2="&#x1e84;" k="82" />
-<hkern u1="&#xc4;" u2="&#x1e82;" k="82" />
-<hkern u1="&#xc4;" u2="&#x1e80;" k="82" />
-<hkern u1="&#xc4;" u2="&#x21a;" k="143" />
-<hkern u1="&#xc4;" u2="&#x1fe;" k="41" />
-<hkern u1="&#xc4;" u2="&#x1a0;" k="41" />
-<hkern u1="&#xc4;" u2="&#x178;" k="123" />
-<hkern u1="&#xc4;" u2="&#x176;" k="123" />
-<hkern u1="&#xc4;" u2="&#x174;" k="82" />
-<hkern u1="&#xc4;" u2="&#x164;" k="143" />
-<hkern u1="&#xc4;" u2="&#x162;" k="143" />
-<hkern u1="&#xc4;" u2="&#x152;" k="41" />
-<hkern u1="&#xc4;" u2="&#x150;" k="41" />
-<hkern u1="&#xc4;" u2="&#x14e;" k="41" />
-<hkern u1="&#xc4;" u2="&#x14c;" k="41" />
-<hkern u1="&#xc4;" u2="&#x122;" k="41" />
-<hkern u1="&#xc4;" u2="&#x120;" k="41" />
-<hkern u1="&#xc4;" u2="&#x11e;" k="41" />
-<hkern u1="&#xc4;" u2="&#x11c;" k="41" />
-<hkern u1="&#xc4;" u2="&#x10c;" k="41" />
-<hkern u1="&#xc4;" u2="&#x10a;" k="41" />
-<hkern u1="&#xc4;" u2="&#x108;" k="41" />
-<hkern u1="&#xc4;" u2="&#x106;" k="41" />
-<hkern u1="&#xc4;" u2="&#xdd;" k="123" />
-<hkern u1="&#xc4;" u2="&#xd8;" k="41" />
-<hkern u1="&#xc4;" u2="&#xd6;" k="41" />
-<hkern u1="&#xc4;" u2="&#xd5;" k="41" />
-<hkern u1="&#xc4;" u2="&#xd4;" k="41" />
-<hkern u1="&#xc4;" u2="&#xd3;" k="41" />
-<hkern u1="&#xc4;" u2="&#xd2;" k="41" />
-<hkern u1="&#xc4;" u2="&#xc7;" k="41" />
-<hkern u1="&#xc4;" u2="Y" k="123" />
-<hkern u1="&#xc4;" u2="W" k="82" />
-<hkern u1="&#xc4;" u2="V" k="82" />
-<hkern u1="&#xc4;" u2="T" k="143" />
-<hkern u1="&#xc4;" u2="Q" k="41" />
-<hkern u1="&#xc4;" u2="O" k="41" />
-<hkern u1="&#xc4;" u2="J" k="-266" />
-<hkern u1="&#xc4;" u2="G" k="41" />
-<hkern u1="&#xc4;" u2="C" k="41" />
-<hkern u1="&#xc4;" u2="&#x27;" k="143" />
-<hkern u1="&#xc4;" u2="&#x22;" k="143" />
-<hkern u1="&#xc5;" u2="&#x201d;" k="143" />
-<hkern u1="&#xc5;" u2="&#x2019;" k="143" />
-<hkern u1="&#xc5;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#xc5;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#xc5;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#xc5;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#xc5;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#xc5;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#xc5;" u2="&#x1ede;" k="41" />
-<hkern u1="&#xc5;" u2="&#x1edc;" k="41" />
-<hkern u1="&#xc5;" u2="&#x1eda;" k="41" />
-<hkern u1="&#xc5;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#xc5;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#xc5;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#xc5;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#xc5;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#xc5;" u2="&#x1ece;" k="41" />
-<hkern u1="&#xc5;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#xc5;" u2="&#x1e84;" k="82" />
-<hkern u1="&#xc5;" u2="&#x1e82;" k="82" />
-<hkern u1="&#xc5;" u2="&#x1e80;" k="82" />
-<hkern u1="&#xc5;" u2="&#x21a;" k="143" />
-<hkern u1="&#xc5;" u2="&#x1fe;" k="41" />
-<hkern u1="&#xc5;" u2="&#x1a0;" k="41" />
-<hkern u1="&#xc5;" u2="&#x178;" k="123" />
-<hkern u1="&#xc5;" u2="&#x176;" k="123" />
-<hkern u1="&#xc5;" u2="&#x174;" k="82" />
-<hkern u1="&#xc5;" u2="&#x164;" k="143" />
-<hkern u1="&#xc5;" u2="&#x162;" k="143" />
-<hkern u1="&#xc5;" u2="&#x152;" k="41" />
-<hkern u1="&#xc5;" u2="&#x150;" k="41" />
-<hkern u1="&#xc5;" u2="&#x14e;" k="41" />
-<hkern u1="&#xc5;" u2="&#x14c;" k="41" />
-<hkern u1="&#xc5;" u2="&#x122;" k="41" />
-<hkern u1="&#xc5;" u2="&#x120;" k="41" />
-<hkern u1="&#xc5;" u2="&#x11e;" k="41" />
-<hkern u1="&#xc5;" u2="&#x11c;" k="41" />
-<hkern u1="&#xc5;" u2="&#x10c;" k="41" />
-<hkern u1="&#xc5;" u2="&#x10a;" k="41" />
-<hkern u1="&#xc5;" u2="&#x108;" k="41" />
-<hkern u1="&#xc5;" u2="&#x106;" k="41" />
-<hkern u1="&#xc5;" u2="&#xdd;" k="123" />
-<hkern u1="&#xc5;" u2="&#xd8;" k="41" />
-<hkern u1="&#xc5;" u2="&#xd6;" k="41" />
-<hkern u1="&#xc5;" u2="&#xd5;" k="41" />
-<hkern u1="&#xc5;" u2="&#xd4;" k="41" />
-<hkern u1="&#xc5;" u2="&#xd3;" k="41" />
-<hkern u1="&#xc5;" u2="&#xd2;" k="41" />
-<hkern u1="&#xc5;" u2="&#xc7;" k="41" />
-<hkern u1="&#xc5;" u2="Y" k="123" />
-<hkern u1="&#xc5;" u2="W" k="82" />
-<hkern u1="&#xc5;" u2="V" k="82" />
-<hkern u1="&#xc5;" u2="T" k="143" />
-<hkern u1="&#xc5;" u2="Q" k="41" />
-<hkern u1="&#xc5;" u2="O" k="41" />
-<hkern u1="&#xc5;" u2="J" k="-266" />
-<hkern u1="&#xc5;" u2="G" k="41" />
-<hkern u1="&#xc5;" u2="C" k="41" />
-<hkern u1="&#xc5;" u2="&#x27;" k="143" />
-<hkern u1="&#xc5;" u2="&#x22;" k="143" />
-<hkern u1="&#xc6;" u2="J" k="-123" />
-<hkern u1="&#xc7;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#xc7;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#xc7;" u2="&#x1ede;" k="41" />
-<hkern u1="&#xc7;" u2="&#x1edc;" k="41" />
-<hkern u1="&#xc7;" u2="&#x1eda;" k="41" />
-<hkern u1="&#xc7;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#xc7;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#xc7;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#xc7;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#xc7;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#xc7;" u2="&#x1ece;" k="41" />
-<hkern u1="&#xc7;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#xc7;" u2="&#x1fe;" k="41" />
-<hkern u1="&#xc7;" u2="&#x1a0;" k="41" />
-<hkern u1="&#xc7;" u2="&#x152;" k="41" />
-<hkern u1="&#xc7;" u2="&#x150;" k="41" />
-<hkern u1="&#xc7;" u2="&#x14e;" k="41" />
-<hkern u1="&#xc7;" u2="&#x14c;" k="41" />
-<hkern u1="&#xc7;" u2="&#x122;" k="41" />
-<hkern u1="&#xc7;" u2="&#x120;" k="41" />
-<hkern u1="&#xc7;" u2="&#x11e;" k="41" />
-<hkern u1="&#xc7;" u2="&#x11c;" k="41" />
-<hkern u1="&#xc7;" u2="&#x10c;" k="41" />
-<hkern u1="&#xc7;" u2="&#x10a;" k="41" />
-<hkern u1="&#xc7;" u2="&#x108;" k="41" />
-<hkern u1="&#xc7;" u2="&#x106;" k="41" />
-<hkern u1="&#xc7;" u2="&#xd8;" k="41" />
-<hkern u1="&#xc7;" u2="&#xd6;" k="41" />
-<hkern u1="&#xc7;" u2="&#xd5;" k="41" />
-<hkern u1="&#xc7;" u2="&#xd4;" k="41" />
-<hkern u1="&#xc7;" u2="&#xd3;" k="41" />
-<hkern u1="&#xc7;" u2="&#xd2;" k="41" />
-<hkern u1="&#xc7;" u2="&#xc7;" k="41" />
-<hkern u1="&#xc7;" u2="Q" k="41" />
-<hkern u1="&#xc7;" u2="O" k="41" />
-<hkern u1="&#xc7;" u2="G" k="41" />
-<hkern u1="&#xc7;" u2="C" k="41" />
-<hkern u1="&#xc8;" u2="J" k="-123" />
-<hkern u1="&#xc9;" u2="J" k="-123" />
-<hkern u1="&#xca;" u2="J" k="-123" />
-<hkern u1="&#xcb;" u2="J" k="-123" />
-<hkern u1="&#xd0;" u2="&#x201e;" k="82" />
-<hkern u1="&#xd0;" u2="&#x201a;" k="82" />
-<hkern u1="&#xd0;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#xd0;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#xd0;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#xd0;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#xd0;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#xd0;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#xd0;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#xd0;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#xd0;" u2="&#x1eae;" k="41" />
-<hkern u1="&#xd0;" u2="&#x1eac;" k="41" />
-<hkern u1="&#xd0;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#xd0;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#xd0;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#xd0;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#xd0;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#xd0;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#xd0;" u2="&#x1e84;" k="20" />
-<hkern u1="&#xd0;" u2="&#x1e82;" k="20" />
-<hkern u1="&#xd0;" u2="&#x1e80;" k="20" />
-<hkern u1="&#xd0;" u2="&#x1e00;" k="41" />
-<hkern u1="&#xd0;" u2="&#x405;" k="20" />
-<hkern u1="&#xd0;" u2="&#x21a;" k="61" />
-<hkern u1="&#xd0;" u2="&#x1fa;" k="41" />
-<hkern u1="&#xd0;" u2="&#x17d;" k="20" />
-<hkern u1="&#xd0;" u2="&#x17b;" k="20" />
-<hkern u1="&#xd0;" u2="&#x179;" k="20" />
-<hkern u1="&#xd0;" u2="&#x178;" k="20" />
-<hkern u1="&#xd0;" u2="&#x176;" k="20" />
-<hkern u1="&#xd0;" u2="&#x174;" k="20" />
-<hkern u1="&#xd0;" u2="&#x164;" k="61" />
-<hkern u1="&#xd0;" u2="&#x162;" k="61" />
-<hkern u1="&#xd0;" u2="&#x104;" k="41" />
-<hkern u1="&#xd0;" u2="&#x102;" k="41" />
-<hkern u1="&#xd0;" u2="&#x100;" k="41" />
-<hkern u1="&#xd0;" u2="&#xdd;" k="20" />
-<hkern u1="&#xd0;" u2="&#xc5;" k="41" />
-<hkern u1="&#xd0;" u2="&#xc4;" k="41" />
-<hkern u1="&#xd0;" u2="&#xc3;" k="41" />
-<hkern u1="&#xd0;" u2="&#xc2;" k="41" />
-<hkern u1="&#xd0;" u2="&#xc1;" k="41" />
-<hkern u1="&#xd0;" u2="&#xc0;" k="41" />
-<hkern u1="&#xd0;" u2="Z" k="20" />
-<hkern u1="&#xd0;" u2="Y" k="20" />
-<hkern u1="&#xd0;" u2="X" k="41" />
-<hkern u1="&#xd0;" u2="W" k="20" />
-<hkern u1="&#xd0;" u2="V" k="20" />
-<hkern u1="&#xd0;" u2="T" k="61" />
-<hkern u1="&#xd0;" u2="A" k="41" />
-<hkern u1="&#xd0;" u2="&#x2e;" k="82" />
-<hkern u1="&#xd0;" u2="&#x2c;" k="82" />
-<hkern u1="&#xd2;" u2="&#x201e;" k="82" />
-<hkern u1="&#xd2;" u2="&#x201a;" k="82" />
-<hkern u1="&#xd2;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#xd2;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#xd2;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#xd2;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#xd2;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#xd2;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#xd2;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#xd2;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#xd2;" u2="&#x1eae;" k="41" />
-<hkern u1="&#xd2;" u2="&#x1eac;" k="41" />
-<hkern u1="&#xd2;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#xd2;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#xd2;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#xd2;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#xd2;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#xd2;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#xd2;" u2="&#x1e84;" k="20" />
-<hkern u1="&#xd2;" u2="&#x1e82;" k="20" />
-<hkern u1="&#xd2;" u2="&#x1e80;" k="20" />
-<hkern u1="&#xd2;" u2="&#x1e00;" k="41" />
-<hkern u1="&#xd2;" u2="&#x405;" k="20" />
-<hkern u1="&#xd2;" u2="&#x21a;" k="61" />
-<hkern u1="&#xd2;" u2="&#x1fa;" k="41" />
-<hkern u1="&#xd2;" u2="&#x17d;" k="20" />
-<hkern u1="&#xd2;" u2="&#x17b;" k="20" />
-<hkern u1="&#xd2;" u2="&#x179;" k="20" />
-<hkern u1="&#xd2;" u2="&#x178;" k="20" />
-<hkern u1="&#xd2;" u2="&#x176;" k="20" />
-<hkern u1="&#xd2;" u2="&#x174;" k="20" />
-<hkern u1="&#xd2;" u2="&#x164;" k="61" />
-<hkern u1="&#xd2;" u2="&#x162;" k="61" />
-<hkern u1="&#xd2;" u2="&#x104;" k="41" />
-<hkern u1="&#xd2;" u2="&#x102;" k="41" />
-<hkern u1="&#xd2;" u2="&#x100;" k="41" />
-<hkern u1="&#xd2;" u2="&#xdd;" k="20" />
-<hkern u1="&#xd2;" u2="&#xc5;" k="41" />
-<hkern u1="&#xd2;" u2="&#xc4;" k="41" />
-<hkern u1="&#xd2;" u2="&#xc3;" k="41" />
-<hkern u1="&#xd2;" u2="&#xc2;" k="41" />
-<hkern u1="&#xd2;" u2="&#xc1;" k="41" />
-<hkern u1="&#xd2;" u2="&#xc0;" k="41" />
-<hkern u1="&#xd2;" u2="Z" k="20" />
-<hkern u1="&#xd2;" u2="Y" k="20" />
-<hkern u1="&#xd2;" u2="X" k="41" />
-<hkern u1="&#xd2;" u2="W" k="20" />
-<hkern u1="&#xd2;" u2="V" k="20" />
-<hkern u1="&#xd2;" u2="T" k="61" />
-<hkern u1="&#xd2;" u2="A" k="41" />
-<hkern u1="&#xd2;" u2="&#x2e;" k="82" />
-<hkern u1="&#xd2;" u2="&#x2c;" k="82" />
-<hkern u1="&#xd3;" u2="&#x201e;" k="82" />
-<hkern u1="&#xd3;" u2="&#x201a;" k="82" />
-<hkern u1="&#xd3;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#xd3;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#xd3;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#xd3;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#xd3;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#xd3;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#xd3;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#xd3;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#xd3;" u2="&#x1eae;" k="41" />
-<hkern u1="&#xd3;" u2="&#x1eac;" k="41" />
-<hkern u1="&#xd3;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#xd3;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#xd3;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#xd3;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#xd3;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#xd3;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#xd3;" u2="&#x1e84;" k="20" />
-<hkern u1="&#xd3;" u2="&#x1e82;" k="20" />
-<hkern u1="&#xd3;" u2="&#x1e80;" k="20" />
-<hkern u1="&#xd3;" u2="&#x1e00;" k="41" />
-<hkern u1="&#xd3;" u2="&#x405;" k="20" />
-<hkern u1="&#xd3;" u2="&#x21a;" k="61" />
-<hkern u1="&#xd3;" u2="&#x1fa;" k="41" />
-<hkern u1="&#xd3;" u2="&#x17d;" k="20" />
-<hkern u1="&#xd3;" u2="&#x17b;" k="20" />
-<hkern u1="&#xd3;" u2="&#x179;" k="20" />
-<hkern u1="&#xd3;" u2="&#x178;" k="20" />
-<hkern u1="&#xd3;" u2="&#x176;" k="20" />
-<hkern u1="&#xd3;" u2="&#x174;" k="20" />
-<hkern u1="&#xd3;" u2="&#x164;" k="61" />
-<hkern u1="&#xd3;" u2="&#x162;" k="61" />
-<hkern u1="&#xd3;" u2="&#x104;" k="41" />
-<hkern u1="&#xd3;" u2="&#x102;" k="41" />
-<hkern u1="&#xd3;" u2="&#x100;" k="41" />
-<hkern u1="&#xd3;" u2="&#xdd;" k="20" />
-<hkern u1="&#xd3;" u2="&#xc5;" k="41" />
-<hkern u1="&#xd3;" u2="&#xc4;" k="41" />
-<hkern u1="&#xd3;" u2="&#xc3;" k="41" />
-<hkern u1="&#xd3;" u2="&#xc2;" k="41" />
-<hkern u1="&#xd3;" u2="&#xc1;" k="41" />
-<hkern u1="&#xd3;" u2="&#xc0;" k="41" />
-<hkern u1="&#xd3;" u2="Z" k="20" />
-<hkern u1="&#xd3;" u2="Y" k="20" />
-<hkern u1="&#xd3;" u2="X" k="41" />
-<hkern u1="&#xd3;" u2="W" k="20" />
-<hkern u1="&#xd3;" u2="V" k="20" />
-<hkern u1="&#xd3;" u2="T" k="61" />
-<hkern u1="&#xd3;" u2="A" k="41" />
-<hkern u1="&#xd3;" u2="&#x2e;" k="82" />
-<hkern u1="&#xd3;" u2="&#x2c;" k="82" />
-<hkern u1="&#xd4;" u2="&#x201e;" k="82" />
-<hkern u1="&#xd4;" u2="&#x201a;" k="82" />
-<hkern u1="&#xd4;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#xd4;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#xd4;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#xd4;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#xd4;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#xd4;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#xd4;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#xd4;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#xd4;" u2="&#x1eae;" k="41" />
-<hkern u1="&#xd4;" u2="&#x1eac;" k="41" />
-<hkern u1="&#xd4;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#xd4;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#xd4;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#xd4;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#xd4;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#xd4;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#xd4;" u2="&#x1e84;" k="20" />
-<hkern u1="&#xd4;" u2="&#x1e82;" k="20" />
-<hkern u1="&#xd4;" u2="&#x1e80;" k="20" />
-<hkern u1="&#xd4;" u2="&#x1e00;" k="41" />
-<hkern u1="&#xd4;" u2="&#x405;" k="20" />
-<hkern u1="&#xd4;" u2="&#x21a;" k="61" />
-<hkern u1="&#xd4;" u2="&#x1fa;" k="41" />
-<hkern u1="&#xd4;" u2="&#x17d;" k="20" />
-<hkern u1="&#xd4;" u2="&#x17b;" k="20" />
-<hkern u1="&#xd4;" u2="&#x179;" k="20" />
-<hkern u1="&#xd4;" u2="&#x178;" k="20" />
-<hkern u1="&#xd4;" u2="&#x176;" k="20" />
-<hkern u1="&#xd4;" u2="&#x174;" k="20" />
-<hkern u1="&#xd4;" u2="&#x164;" k="61" />
-<hkern u1="&#xd4;" u2="&#x162;" k="61" />
-<hkern u1="&#xd4;" u2="&#x104;" k="41" />
-<hkern u1="&#xd4;" u2="&#x102;" k="41" />
-<hkern u1="&#xd4;" u2="&#x100;" k="41" />
-<hkern u1="&#xd4;" u2="&#xdd;" k="20" />
-<hkern u1="&#xd4;" u2="&#xc5;" k="41" />
-<hkern u1="&#xd4;" u2="&#xc4;" k="41" />
-<hkern u1="&#xd4;" u2="&#xc3;" k="41" />
-<hkern u1="&#xd4;" u2="&#xc2;" k="41" />
-<hkern u1="&#xd4;" u2="&#xc1;" k="41" />
-<hkern u1="&#xd4;" u2="&#xc0;" k="41" />
-<hkern u1="&#xd4;" u2="Z" k="20" />
-<hkern u1="&#xd4;" u2="Y" k="20" />
-<hkern u1="&#xd4;" u2="X" k="41" />
-<hkern u1="&#xd4;" u2="W" k="20" />
-<hkern u1="&#xd4;" u2="V" k="20" />
-<hkern u1="&#xd4;" u2="T" k="61" />
-<hkern u1="&#xd4;" u2="A" k="41" />
-<hkern u1="&#xd4;" u2="&#x2e;" k="82" />
-<hkern u1="&#xd4;" u2="&#x2c;" k="82" />
-<hkern u1="&#xd5;" u2="&#x201e;" k="82" />
-<hkern u1="&#xd5;" u2="&#x201a;" k="82" />
-<hkern u1="&#xd5;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#xd5;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#xd5;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#xd5;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#xd5;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#xd5;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#xd5;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#xd5;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#xd5;" u2="&#x1eae;" k="41" />
-<hkern u1="&#xd5;" u2="&#x1eac;" k="41" />
-<hkern u1="&#xd5;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#xd5;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#xd5;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#xd5;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#xd5;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#xd5;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#xd5;" u2="&#x1e84;" k="20" />
-<hkern u1="&#xd5;" u2="&#x1e82;" k="20" />
-<hkern u1="&#xd5;" u2="&#x1e80;" k="20" />
-<hkern u1="&#xd5;" u2="&#x1e00;" k="41" />
-<hkern u1="&#xd5;" u2="&#x405;" k="20" />
-<hkern u1="&#xd5;" u2="&#x21a;" k="61" />
-<hkern u1="&#xd5;" u2="&#x1fa;" k="41" />
-<hkern u1="&#xd5;" u2="&#x17d;" k="20" />
-<hkern u1="&#xd5;" u2="&#x17b;" k="20" />
-<hkern u1="&#xd5;" u2="&#x179;" k="20" />
-<hkern u1="&#xd5;" u2="&#x178;" k="20" />
-<hkern u1="&#xd5;" u2="&#x176;" k="20" />
-<hkern u1="&#xd5;" u2="&#x174;" k="20" />
-<hkern u1="&#xd5;" u2="&#x164;" k="61" />
-<hkern u1="&#xd5;" u2="&#x162;" k="61" />
-<hkern u1="&#xd5;" u2="&#x104;" k="41" />
-<hkern u1="&#xd5;" u2="&#x102;" k="41" />
-<hkern u1="&#xd5;" u2="&#x100;" k="41" />
-<hkern u1="&#xd5;" u2="&#xdd;" k="20" />
-<hkern u1="&#xd5;" u2="&#xc5;" k="41" />
-<hkern u1="&#xd5;" u2="&#xc4;" k="41" />
-<hkern u1="&#xd5;" u2="&#xc3;" k="41" />
-<hkern u1="&#xd5;" u2="&#xc2;" k="41" />
-<hkern u1="&#xd5;" u2="&#xc1;" k="41" />
-<hkern u1="&#xd5;" u2="&#xc0;" k="41" />
-<hkern u1="&#xd5;" u2="Z" k="20" />
-<hkern u1="&#xd5;" u2="Y" k="20" />
-<hkern u1="&#xd5;" u2="X" k="41" />
-<hkern u1="&#xd5;" u2="W" k="20" />
-<hkern u1="&#xd5;" u2="V" k="20" />
-<hkern u1="&#xd5;" u2="T" k="61" />
-<hkern u1="&#xd5;" u2="A" k="41" />
-<hkern u1="&#xd5;" u2="&#x2e;" k="82" />
-<hkern u1="&#xd5;" u2="&#x2c;" k="82" />
-<hkern u1="&#xd6;" u2="&#x201e;" k="82" />
-<hkern u1="&#xd6;" u2="&#x201a;" k="82" />
-<hkern u1="&#xd6;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#xd6;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#xd6;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#xd6;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#xd6;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#xd6;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#xd6;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#xd6;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#xd6;" u2="&#x1eae;" k="41" />
-<hkern u1="&#xd6;" u2="&#x1eac;" k="41" />
-<hkern u1="&#xd6;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#xd6;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#xd6;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#xd6;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#xd6;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#xd6;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#xd6;" u2="&#x1e84;" k="20" />
-<hkern u1="&#xd6;" u2="&#x1e82;" k="20" />
-<hkern u1="&#xd6;" u2="&#x1e80;" k="20" />
-<hkern u1="&#xd6;" u2="&#x1e00;" k="41" />
-<hkern u1="&#xd6;" u2="&#x405;" k="20" />
-<hkern u1="&#xd6;" u2="&#x21a;" k="61" />
-<hkern u1="&#xd6;" u2="&#x1fa;" k="41" />
-<hkern u1="&#xd6;" u2="&#x17d;" k="20" />
-<hkern u1="&#xd6;" u2="&#x17b;" k="20" />
-<hkern u1="&#xd6;" u2="&#x179;" k="20" />
-<hkern u1="&#xd6;" u2="&#x178;" k="20" />
-<hkern u1="&#xd6;" u2="&#x176;" k="20" />
-<hkern u1="&#xd6;" u2="&#x174;" k="20" />
-<hkern u1="&#xd6;" u2="&#x164;" k="61" />
-<hkern u1="&#xd6;" u2="&#x162;" k="61" />
-<hkern u1="&#xd6;" u2="&#x104;" k="41" />
-<hkern u1="&#xd6;" u2="&#x102;" k="41" />
-<hkern u1="&#xd6;" u2="&#x100;" k="41" />
-<hkern u1="&#xd6;" u2="&#xdd;" k="20" />
-<hkern u1="&#xd6;" u2="&#xc5;" k="41" />
-<hkern u1="&#xd6;" u2="&#xc4;" k="41" />
-<hkern u1="&#xd6;" u2="&#xc3;" k="41" />
-<hkern u1="&#xd6;" u2="&#xc2;" k="41" />
-<hkern u1="&#xd6;" u2="&#xc1;" k="41" />
-<hkern u1="&#xd6;" u2="&#xc0;" k="41" />
-<hkern u1="&#xd6;" u2="Z" k="20" />
-<hkern u1="&#xd6;" u2="Y" k="20" />
-<hkern u1="&#xd6;" u2="X" k="41" />
-<hkern u1="&#xd6;" u2="W" k="20" />
-<hkern u1="&#xd6;" u2="V" k="20" />
-<hkern u1="&#xd6;" u2="T" k="61" />
-<hkern u1="&#xd6;" u2="A" k="41" />
-<hkern u1="&#xd6;" u2="&#x2e;" k="82" />
-<hkern u1="&#xd6;" u2="&#x2c;" k="82" />
-<hkern u1="&#xd8;" u2="&#x201e;" k="82" />
-<hkern u1="&#xd8;" u2="&#x201a;" k="82" />
-<hkern u1="&#xd8;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#xd8;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#xd8;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#xd8;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#xd8;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#xd8;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#xd8;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#xd8;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#xd8;" u2="&#x1eae;" k="41" />
-<hkern u1="&#xd8;" u2="&#x1eac;" k="41" />
-<hkern u1="&#xd8;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#xd8;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#xd8;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#xd8;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#xd8;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#xd8;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#xd8;" u2="&#x1e84;" k="20" />
-<hkern u1="&#xd8;" u2="&#x1e82;" k="20" />
-<hkern u1="&#xd8;" u2="&#x1e80;" k="20" />
-<hkern u1="&#xd8;" u2="&#x1e00;" k="41" />
-<hkern u1="&#xd8;" u2="&#x405;" k="20" />
-<hkern u1="&#xd8;" u2="&#x21a;" k="61" />
-<hkern u1="&#xd8;" u2="&#x1fa;" k="41" />
-<hkern u1="&#xd8;" u2="&#x17d;" k="20" />
-<hkern u1="&#xd8;" u2="&#x17b;" k="20" />
-<hkern u1="&#xd8;" u2="&#x179;" k="20" />
-<hkern u1="&#xd8;" u2="&#x178;" k="20" />
-<hkern u1="&#xd8;" u2="&#x176;" k="20" />
-<hkern u1="&#xd8;" u2="&#x174;" k="20" />
-<hkern u1="&#xd8;" u2="&#x164;" k="61" />
-<hkern u1="&#xd8;" u2="&#x162;" k="61" />
-<hkern u1="&#xd8;" u2="&#x104;" k="41" />
-<hkern u1="&#xd8;" u2="&#x102;" k="41" />
-<hkern u1="&#xd8;" u2="&#x100;" k="41" />
-<hkern u1="&#xd8;" u2="&#xdd;" k="20" />
-<hkern u1="&#xd8;" u2="&#xc5;" k="41" />
-<hkern u1="&#xd8;" u2="&#xc4;" k="41" />
-<hkern u1="&#xd8;" u2="&#xc3;" k="41" />
-<hkern u1="&#xd8;" u2="&#xc2;" k="41" />
-<hkern u1="&#xd8;" u2="&#xc1;" k="41" />
-<hkern u1="&#xd8;" u2="&#xc0;" k="41" />
-<hkern u1="&#xd8;" u2="Z" k="20" />
-<hkern u1="&#xd8;" u2="Y" k="20" />
-<hkern u1="&#xd8;" u2="X" k="41" />
-<hkern u1="&#xd8;" u2="W" k="20" />
-<hkern u1="&#xd8;" u2="V" k="20" />
-<hkern u1="&#xd8;" u2="T" k="61" />
-<hkern u1="&#xd8;" u2="A" k="41" />
-<hkern u1="&#xd8;" u2="&#x2e;" k="82" />
-<hkern u1="&#xd8;" u2="&#x2c;" k="82" />
-<hkern u1="&#xd9;" u2="&#x201e;" k="41" />
-<hkern u1="&#xd9;" u2="&#x201a;" k="41" />
-<hkern u1="&#xd9;" u2="&#x1eb6;" k="20" />
-<hkern u1="&#xd9;" u2="&#x1eb4;" k="20" />
-<hkern u1="&#xd9;" u2="&#x1eb2;" k="20" />
-<hkern u1="&#xd9;" u2="&#x1eb0;" k="20" />
-<hkern u1="&#xd9;" u2="&#x1eae;" k="20" />
-<hkern u1="&#xd9;" u2="&#x1eac;" k="20" />
-<hkern u1="&#xd9;" u2="&#x1eaa;" k="20" />
-<hkern u1="&#xd9;" u2="&#x1ea8;" k="20" />
-<hkern u1="&#xd9;" u2="&#x1ea6;" k="20" />
-<hkern u1="&#xd9;" u2="&#x1ea4;" k="20" />
-<hkern u1="&#xd9;" u2="&#x1ea2;" k="20" />
-<hkern u1="&#xd9;" u2="&#x1ea0;" k="20" />
-<hkern u1="&#xd9;" u2="&#x1e00;" k="20" />
-<hkern u1="&#xd9;" u2="&#x1fa;" k="20" />
-<hkern u1="&#xd9;" u2="&#x104;" k="20" />
-<hkern u1="&#xd9;" u2="&#x102;" k="20" />
-<hkern u1="&#xd9;" u2="&#x100;" k="20" />
-<hkern u1="&#xd9;" u2="&#xc5;" k="20" />
-<hkern u1="&#xd9;" u2="&#xc4;" k="20" />
-<hkern u1="&#xd9;" u2="&#xc3;" k="20" />
-<hkern u1="&#xd9;" u2="&#xc2;" k="20" />
-<hkern u1="&#xd9;" u2="&#xc1;" k="20" />
-<hkern u1="&#xd9;" u2="&#xc0;" k="20" />
-<hkern u1="&#xd9;" u2="A" k="20" />
-<hkern u1="&#xd9;" u2="&#x2e;" k="41" />
-<hkern u1="&#xd9;" u2="&#x2c;" k="41" />
-<hkern u1="&#xda;" u2="&#x201e;" k="41" />
-<hkern u1="&#xda;" u2="&#x201a;" k="41" />
-<hkern u1="&#xda;" u2="&#x1eb6;" k="20" />
-<hkern u1="&#xda;" u2="&#x1eb4;" k="20" />
-<hkern u1="&#xda;" u2="&#x1eb2;" k="20" />
-<hkern u1="&#xda;" u2="&#x1eb0;" k="20" />
-<hkern u1="&#xda;" u2="&#x1eae;" k="20" />
-<hkern u1="&#xda;" u2="&#x1eac;" k="20" />
-<hkern u1="&#xda;" u2="&#x1eaa;" k="20" />
-<hkern u1="&#xda;" u2="&#x1ea8;" k="20" />
-<hkern u1="&#xda;" u2="&#x1ea6;" k="20" />
-<hkern u1="&#xda;" u2="&#x1ea4;" k="20" />
-<hkern u1="&#xda;" u2="&#x1ea2;" k="20" />
-<hkern u1="&#xda;" u2="&#x1ea0;" k="20" />
-<hkern u1="&#xda;" u2="&#x1e00;" k="20" />
-<hkern u1="&#xda;" u2="&#x1fa;" k="20" />
-<hkern u1="&#xda;" u2="&#x104;" k="20" />
-<hkern u1="&#xda;" u2="&#x102;" k="20" />
-<hkern u1="&#xda;" u2="&#x100;" k="20" />
-<hkern u1="&#xda;" u2="&#xc5;" k="20" />
-<hkern u1="&#xda;" u2="&#xc4;" k="20" />
-<hkern u1="&#xda;" u2="&#xc3;" k="20" />
-<hkern u1="&#xda;" u2="&#xc2;" k="20" />
-<hkern u1="&#xda;" u2="&#xc1;" k="20" />
-<hkern u1="&#xda;" u2="&#xc0;" k="20" />
-<hkern u1="&#xda;" u2="A" k="20" />
-<hkern u1="&#xda;" u2="&#x2e;" k="41" />
-<hkern u1="&#xda;" u2="&#x2c;" k="41" />
-<hkern u1="&#xdb;" u2="&#x201e;" k="41" />
-<hkern u1="&#xdb;" u2="&#x201a;" k="41" />
-<hkern u1="&#xdb;" u2="&#x1eb6;" k="20" />
-<hkern u1="&#xdb;" u2="&#x1eb4;" k="20" />
-<hkern u1="&#xdb;" u2="&#x1eb2;" k="20" />
-<hkern u1="&#xdb;" u2="&#x1eb0;" k="20" />
-<hkern u1="&#xdb;" u2="&#x1eae;" k="20" />
-<hkern u1="&#xdb;" u2="&#x1eac;" k="20" />
-<hkern u1="&#xdb;" u2="&#x1eaa;" k="20" />
-<hkern u1="&#xdb;" u2="&#x1ea8;" k="20" />
-<hkern u1="&#xdb;" u2="&#x1ea6;" k="20" />
-<hkern u1="&#xdb;" u2="&#x1ea4;" k="20" />
-<hkern u1="&#xdb;" u2="&#x1ea2;" k="20" />
-<hkern u1="&#xdb;" u2="&#x1ea0;" k="20" />
-<hkern u1="&#xdb;" u2="&#x1e00;" k="20" />
-<hkern u1="&#xdb;" u2="&#x1fa;" k="20" />
-<hkern u1="&#xdb;" u2="&#x104;" k="20" />
-<hkern u1="&#xdb;" u2="&#x102;" k="20" />
-<hkern u1="&#xdb;" u2="&#x100;" k="20" />
-<hkern u1="&#xdb;" u2="&#xc5;" k="20" />
-<hkern u1="&#xdb;" u2="&#xc4;" k="20" />
-<hkern u1="&#xdb;" u2="&#xc3;" k="20" />
-<hkern u1="&#xdb;" u2="&#xc2;" k="20" />
-<hkern u1="&#xdb;" u2="&#xc1;" k="20" />
-<hkern u1="&#xdb;" u2="&#xc0;" k="20" />
-<hkern u1="&#xdb;" u2="A" k="20" />
-<hkern u1="&#xdb;" u2="&#x2e;" k="41" />
-<hkern u1="&#xdb;" u2="&#x2c;" k="41" />
-<hkern u1="&#xdc;" u2="&#x201e;" k="41" />
-<hkern u1="&#xdc;" u2="&#x201a;" k="41" />
-<hkern u1="&#xdc;" u2="&#x1eb6;" k="20" />
-<hkern u1="&#xdc;" u2="&#x1eb4;" k="20" />
-<hkern u1="&#xdc;" u2="&#x1eb2;" k="20" />
-<hkern u1="&#xdc;" u2="&#x1eb0;" k="20" />
-<hkern u1="&#xdc;" u2="&#x1eae;" k="20" />
-<hkern u1="&#xdc;" u2="&#x1eac;" k="20" />
-<hkern u1="&#xdc;" u2="&#x1eaa;" k="20" />
-<hkern u1="&#xdc;" u2="&#x1ea8;" k="20" />
-<hkern u1="&#xdc;" u2="&#x1ea6;" k="20" />
-<hkern u1="&#xdc;" u2="&#x1ea4;" k="20" />
-<hkern u1="&#xdc;" u2="&#x1ea2;" k="20" />
-<hkern u1="&#xdc;" u2="&#x1ea0;" k="20" />
-<hkern u1="&#xdc;" u2="&#x1e00;" k="20" />
-<hkern u1="&#xdc;" u2="&#x1fa;" k="20" />
-<hkern u1="&#xdc;" u2="&#x104;" k="20" />
-<hkern u1="&#xdc;" u2="&#x102;" k="20" />
-<hkern u1="&#xdc;" u2="&#x100;" k="20" />
-<hkern u1="&#xdc;" u2="&#xc5;" k="20" />
-<hkern u1="&#xdc;" u2="&#xc4;" k="20" />
-<hkern u1="&#xdc;" u2="&#xc3;" k="20" />
-<hkern u1="&#xdc;" u2="&#xc2;" k="20" />
-<hkern u1="&#xdc;" u2="&#xc1;" k="20" />
-<hkern u1="&#xdc;" u2="&#xc0;" k="20" />
-<hkern u1="&#xdc;" u2="A" k="20" />
-<hkern u1="&#xdc;" u2="&#x2e;" k="41" />
-<hkern u1="&#xdc;" u2="&#x2c;" k="41" />
-<hkern u1="&#xdd;" u2="&#x201e;" k="123" />
-<hkern u1="&#xdd;" u2="&#x201a;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1ef1;" k="61" />
-<hkern u1="&#xdd;" u2="&#x1eef;" k="61" />
-<hkern u1="&#xdd;" u2="&#x1eed;" k="61" />
-<hkern u1="&#xdd;" u2="&#x1eeb;" k="61" />
-<hkern u1="&#xdd;" u2="&#x1ee9;" k="61" />
-<hkern u1="&#xdd;" u2="&#x1ee7;" k="61" />
-<hkern u1="&#xdd;" u2="&#x1ee5;" k="61" />
-<hkern u1="&#xdd;" u2="&#x1ee3;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#xdd;" u2="&#x1ee1;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#xdd;" u2="&#x1edf;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ede;" k="41" />
-<hkern u1="&#xdd;" u2="&#x1edd;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1edc;" k="41" />
-<hkern u1="&#xdd;" u2="&#x1edb;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1eda;" k="41" />
-<hkern u1="&#xdd;" u2="&#x1ed9;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#xdd;" u2="&#x1ed7;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#xdd;" u2="&#x1ed5;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#xdd;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#xdd;" u2="&#x1ed1;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#xdd;" u2="&#x1ecf;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ece;" k="41" />
-<hkern u1="&#xdd;" u2="&#x1ecd;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#xdd;" u2="&#x1ec7;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ec5;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ec3;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ebf;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ebd;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ebb;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1eb9;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1eb7;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1eb6;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1eb5;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1eb4;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1eb3;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1eb2;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1eb1;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1eb0;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1eaf;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1eae;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1ead;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1eac;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1eab;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1eaa;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1ea9;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ea8;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1ea6;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1ea5;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ea4;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1ea3;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ea2;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1ea1;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ea0;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1e3f;" k="61" />
-<hkern u1="&#xdd;" u2="&#x1e01;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1e00;" k="123" />
-<hkern u1="&#xdd;" u2="&#x219;" k="82" />
-<hkern u1="&#xdd;" u2="&#x1ff;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1fe;" k="41" />
-<hkern u1="&#xdd;" u2="&#x1fd;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1fb;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1fa;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1b0;" k="61" />
-<hkern u1="&#xdd;" u2="&#x1a1;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1a0;" k="41" />
-<hkern u1="&#xdd;" u2="&#x17e;" k="41" />
-<hkern u1="&#xdd;" u2="&#x17c;" k="41" />
-<hkern u1="&#xdd;" u2="&#x17a;" k="41" />
-<hkern u1="&#xdd;" u2="&#x173;" k="61" />
-<hkern u1="&#xdd;" u2="&#x171;" k="61" />
-<hkern u1="&#xdd;" u2="&#x16f;" k="61" />
-<hkern u1="&#xdd;" u2="&#x16d;" k="61" />
-<hkern u1="&#xdd;" u2="&#x16b;" k="61" />
-<hkern u1="&#xdd;" u2="&#x169;" k="61" />
-<hkern u1="&#xdd;" u2="&#x15f;" k="82" />
-<hkern u1="&#xdd;" u2="&#x15b;" k="82" />
-<hkern u1="&#xdd;" u2="&#x157;" k="61" />
-<hkern u1="&#xdd;" u2="&#x155;" k="61" />
-<hkern u1="&#xdd;" u2="&#x153;" k="102" />
-<hkern u1="&#xdd;" u2="&#x152;" k="41" />
-<hkern u1="&#xdd;" u2="&#x151;" k="102" />
-<hkern u1="&#xdd;" u2="&#x150;" k="41" />
-<hkern u1="&#xdd;" u2="&#x14f;" k="102" />
-<hkern u1="&#xdd;" u2="&#x14e;" k="41" />
-<hkern u1="&#xdd;" u2="&#x14d;" k="102" />
-<hkern u1="&#xdd;" u2="&#x14c;" k="41" />
-<hkern u1="&#xdd;" u2="&#x14b;" k="61" />
-<hkern u1="&#xdd;" u2="&#x146;" k="61" />
-<hkern u1="&#xdd;" u2="&#x144;" k="61" />
-<hkern u1="&#xdd;" u2="&#x138;" k="61" />
-<hkern u1="&#xdd;" u2="&#x123;" k="41" />
-<hkern u1="&#xdd;" u2="&#x122;" k="41" />
-<hkern u1="&#xdd;" u2="&#x121;" k="41" />
-<hkern u1="&#xdd;" u2="&#x120;" k="41" />
-<hkern u1="&#xdd;" u2="&#x11f;" k="41" />
-<hkern u1="&#xdd;" u2="&#x11e;" k="41" />
-<hkern u1="&#xdd;" u2="&#x11d;" k="41" />
-<hkern u1="&#xdd;" u2="&#x11c;" k="41" />
-<hkern u1="&#xdd;" u2="&#x11b;" k="102" />
-<hkern u1="&#xdd;" u2="&#x119;" k="102" />
-<hkern u1="&#xdd;" u2="&#x117;" k="102" />
-<hkern u1="&#xdd;" u2="&#x115;" k="102" />
-<hkern u1="&#xdd;" u2="&#x113;" k="102" />
-<hkern u1="&#xdd;" u2="&#x111;" k="102" />
-<hkern u1="&#xdd;" u2="&#x10f;" k="102" />
-<hkern u1="&#xdd;" u2="&#x10d;" k="102" />
-<hkern u1="&#xdd;" u2="&#x10c;" k="41" />
-<hkern u1="&#xdd;" u2="&#x10b;" k="102" />
-<hkern u1="&#xdd;" u2="&#x10a;" k="41" />
-<hkern u1="&#xdd;" u2="&#x109;" k="102" />
-<hkern u1="&#xdd;" u2="&#x108;" k="41" />
-<hkern u1="&#xdd;" u2="&#x107;" k="102" />
-<hkern u1="&#xdd;" u2="&#x106;" k="41" />
-<hkern u1="&#xdd;" u2="&#x105;" k="102" />
-<hkern u1="&#xdd;" u2="&#x104;" k="123" />
-<hkern u1="&#xdd;" u2="&#x103;" k="102" />
-<hkern u1="&#xdd;" u2="&#x102;" k="123" />
-<hkern u1="&#xdd;" u2="&#x101;" k="102" />
-<hkern u1="&#xdd;" u2="&#x100;" k="123" />
-<hkern u1="&#xdd;" u2="&#xfc;" k="61" />
-<hkern u1="&#xdd;" u2="&#xfb;" k="61" />
-<hkern u1="&#xdd;" u2="&#xfa;" k="61" />
-<hkern u1="&#xdd;" u2="&#xf9;" k="61" />
-<hkern u1="&#xdd;" u2="&#xf8;" k="102" />
-<hkern u1="&#xdd;" u2="&#xf6;" k="102" />
-<hkern u1="&#xdd;" u2="&#xf5;" k="102" />
-<hkern u1="&#xdd;" u2="&#xf4;" k="102" />
-<hkern u1="&#xdd;" u2="&#xf3;" k="102" />
-<hkern u1="&#xdd;" u2="&#xf2;" k="102" />
-<hkern u1="&#xdd;" u2="&#xeb;" k="102" />
-<hkern u1="&#xdd;" u2="&#xea;" k="102" />
-<hkern u1="&#xdd;" u2="&#xe9;" k="102" />
-<hkern u1="&#xdd;" u2="&#xe8;" k="102" />
-<hkern u1="&#xdd;" u2="&#xe7;" k="102" />
-<hkern u1="&#xdd;" u2="&#xe6;" k="102" />
-<hkern u1="&#xdd;" u2="&#xe5;" k="102" />
-<hkern u1="&#xdd;" u2="&#xe4;" k="102" />
-<hkern u1="&#xdd;" u2="&#xe3;" k="102" />
-<hkern u1="&#xdd;" u2="&#xe2;" k="102" />
-<hkern u1="&#xdd;" u2="&#xe1;" k="102" />
-<hkern u1="&#xdd;" u2="&#xe0;" k="102" />
-<hkern u1="&#xdd;" u2="&#xd8;" k="41" />
-<hkern u1="&#xdd;" u2="&#xd6;" k="41" />
-<hkern u1="&#xdd;" u2="&#xd5;" k="41" />
-<hkern u1="&#xdd;" u2="&#xd4;" k="41" />
-<hkern u1="&#xdd;" u2="&#xd3;" k="41" />
-<hkern u1="&#xdd;" u2="&#xd2;" k="41" />
-<hkern u1="&#xdd;" u2="&#xc7;" k="41" />
-<hkern u1="&#xdd;" u2="&#xc5;" k="123" />
-<hkern u1="&#xdd;" u2="&#xc4;" k="123" />
-<hkern u1="&#xdd;" u2="&#xc3;" k="123" />
-<hkern u1="&#xdd;" u2="&#xc2;" k="123" />
-<hkern u1="&#xdd;" u2="&#xc1;" k="123" />
-<hkern u1="&#xdd;" u2="&#xc0;" k="123" />
-<hkern u1="&#xdd;" u2="z" k="41" />
-<hkern u1="&#xdd;" u2="u" k="61" />
-<hkern u1="&#xdd;" u2="s" k="82" />
-<hkern u1="&#xdd;" u2="r" k="61" />
-<hkern u1="&#xdd;" u2="q" k="102" />
-<hkern u1="&#xdd;" u2="p" k="61" />
-<hkern u1="&#xdd;" u2="o" k="102" />
-<hkern u1="&#xdd;" u2="n" k="61" />
-<hkern u1="&#xdd;" u2="m" k="61" />
-<hkern u1="&#xdd;" u2="g" k="41" />
-<hkern u1="&#xdd;" u2="e" k="102" />
-<hkern u1="&#xdd;" u2="d" k="102" />
-<hkern u1="&#xdd;" u2="c" k="102" />
-<hkern u1="&#xdd;" u2="a" k="102" />
-<hkern u1="&#xdd;" u2="Q" k="41" />
-<hkern u1="&#xdd;" u2="O" k="41" />
-<hkern u1="&#xdd;" u2="G" k="41" />
-<hkern u1="&#xdd;" u2="C" k="41" />
-<hkern u1="&#xdd;" u2="A" k="123" />
-<hkern u1="&#xdd;" u2="&#x3f;" k="-41" />
-<hkern u1="&#xdd;" u2="&#x2e;" k="123" />
-<hkern u1="&#xdd;" u2="&#x2c;" k="123" />
-<hkern u1="&#xde;" u2="&#x201e;" k="266" />
-<hkern u1="&#xde;" u2="&#x201a;" k="266" />
-<hkern u1="&#xde;" u2="&#x1eb6;" k="102" />
-<hkern u1="&#xde;" u2="&#x1eb4;" k="102" />
-<hkern u1="&#xde;" u2="&#x1eb2;" k="102" />
-<hkern u1="&#xde;" u2="&#x1eb0;" k="102" />
-<hkern u1="&#xde;" u2="&#x1eae;" k="102" />
-<hkern u1="&#xde;" u2="&#x1eac;" k="102" />
-<hkern u1="&#xde;" u2="&#x1eaa;" k="102" />
-<hkern u1="&#xde;" u2="&#x1ea8;" k="102" />
-<hkern u1="&#xde;" u2="&#x1ea6;" k="102" />
-<hkern u1="&#xde;" u2="&#x1ea4;" k="102" />
-<hkern u1="&#xde;" u2="&#x1ea2;" k="102" />
-<hkern u1="&#xde;" u2="&#x1ea0;" k="102" />
-<hkern u1="&#xde;" u2="&#x1e00;" k="102" />
-<hkern u1="&#xde;" u2="&#x1fa;" k="102" />
-<hkern u1="&#xde;" u2="&#x17d;" k="20" />
-<hkern u1="&#xde;" u2="&#x17b;" k="20" />
-<hkern u1="&#xde;" u2="&#x179;" k="20" />
-<hkern u1="&#xde;" u2="&#x104;" k="102" />
-<hkern u1="&#xde;" u2="&#x102;" k="102" />
-<hkern u1="&#xde;" u2="&#x100;" k="102" />
-<hkern u1="&#xde;" u2="&#xc5;" k="102" />
-<hkern u1="&#xde;" u2="&#xc4;" k="102" />
-<hkern u1="&#xde;" u2="&#xc3;" k="102" />
-<hkern u1="&#xde;" u2="&#xc2;" k="102" />
-<hkern u1="&#xde;" u2="&#xc1;" k="102" />
-<hkern u1="&#xde;" u2="&#xc0;" k="102" />
-<hkern u1="&#xde;" u2="Z" k="20" />
-<hkern u1="&#xde;" u2="X" k="41" />
-<hkern u1="&#xde;" u2="A" k="102" />
-<hkern u1="&#xde;" u2="&#x2e;" k="266" />
-<hkern u1="&#xde;" u2="&#x2c;" k="266" />
-<hkern u1="&#xe0;" u2="&#x201d;" k="20" />
-<hkern u1="&#xe0;" u2="&#x2019;" k="20" />
-<hkern u1="&#xe0;" u2="&#x27;" k="20" />
-<hkern u1="&#xe0;" u2="&#x22;" k="20" />
-<hkern u1="&#xe1;" u2="&#x201d;" k="20" />
-<hkern u1="&#xe1;" u2="&#x2019;" k="20" />
-<hkern u1="&#xe1;" u2="&#x27;" k="20" />
-<hkern u1="&#xe1;" u2="&#x22;" k="20" />
-<hkern u1="&#xe2;" u2="&#x201d;" k="20" />
-<hkern u1="&#xe2;" u2="&#x2019;" k="20" />
-<hkern u1="&#xe2;" u2="&#x27;" k="20" />
-<hkern u1="&#xe2;" u2="&#x22;" k="20" />
-<hkern u1="&#xe3;" u2="&#x201d;" k="20" />
-<hkern u1="&#xe3;" u2="&#x2019;" k="20" />
-<hkern u1="&#xe3;" u2="&#x27;" k="20" />
-<hkern u1="&#xe3;" u2="&#x22;" k="20" />
-<hkern u1="&#xe4;" u2="&#x201d;" k="20" />
-<hkern u1="&#xe4;" u2="&#x2019;" k="20" />
-<hkern u1="&#xe4;" u2="&#x27;" k="20" />
-<hkern u1="&#xe4;" u2="&#x22;" k="20" />
-<hkern u1="&#xe5;" u2="&#x201d;" k="20" />
-<hkern u1="&#xe5;" u2="&#x2019;" k="20" />
-<hkern u1="&#xe5;" u2="&#x27;" k="20" />
-<hkern u1="&#xe5;" u2="&#x22;" k="20" />
-<hkern u1="&#xe8;" u2="&#x201d;" k="20" />
-<hkern u1="&#xe8;" u2="&#x2019;" k="20" />
-<hkern u1="&#xe8;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#xe8;" u2="&#x1e83;" k="41" />
-<hkern u1="&#xe8;" u2="&#x1e81;" k="41" />
-<hkern u1="&#xe8;" u2="&#x17e;" k="20" />
-<hkern u1="&#xe8;" u2="&#x17c;" k="20" />
-<hkern u1="&#xe8;" u2="&#x17a;" k="20" />
-<hkern u1="&#xe8;" u2="&#x175;" k="41" />
-<hkern u1="&#xe8;" u2="&#xfd;" k="41" />
-<hkern u1="&#xe8;" u2="z" k="20" />
-<hkern u1="&#xe8;" u2="y" k="41" />
-<hkern u1="&#xe8;" u2="x" k="41" />
-<hkern u1="&#xe8;" u2="w" k="41" />
-<hkern u1="&#xe8;" u2="v" k="41" />
-<hkern u1="&#xe8;" u2="&#x27;" k="20" />
-<hkern u1="&#xe8;" u2="&#x22;" k="20" />
-<hkern u1="&#xe9;" u2="&#x201d;" k="20" />
-<hkern u1="&#xe9;" u2="&#x2019;" k="20" />
-<hkern u1="&#xe9;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#xe9;" u2="&#x1e83;" k="41" />
-<hkern u1="&#xe9;" u2="&#x1e81;" k="41" />
-<hkern u1="&#xe9;" u2="&#x17e;" k="20" />
-<hkern u1="&#xe9;" u2="&#x17c;" k="20" />
-<hkern u1="&#xe9;" u2="&#x17a;" k="20" />
-<hkern u1="&#xe9;" u2="&#x175;" k="41" />
-<hkern u1="&#xe9;" u2="&#xfd;" k="41" />
-<hkern u1="&#xe9;" u2="z" k="20" />
-<hkern u1="&#xe9;" u2="y" k="41" />
-<hkern u1="&#xe9;" u2="x" k="41" />
-<hkern u1="&#xe9;" u2="w" k="41" />
-<hkern u1="&#xe9;" u2="v" k="41" />
-<hkern u1="&#xe9;" u2="&#x27;" k="20" />
-<hkern u1="&#xe9;" u2="&#x22;" k="20" />
-<hkern u1="&#xea;" u2="&#x201d;" k="20" />
-<hkern u1="&#xea;" u2="&#x2019;" k="20" />
-<hkern u1="&#xea;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#xea;" u2="&#x1e83;" k="41" />
-<hkern u1="&#xea;" u2="&#x1e81;" k="41" />
-<hkern u1="&#xea;" u2="&#x17e;" k="20" />
-<hkern u1="&#xea;" u2="&#x17c;" k="20" />
-<hkern u1="&#xea;" u2="&#x17a;" k="20" />
-<hkern u1="&#xea;" u2="&#x175;" k="41" />
-<hkern u1="&#xea;" u2="&#xfd;" k="41" />
-<hkern u1="&#xea;" u2="z" k="20" />
-<hkern u1="&#xea;" u2="y" k="41" />
-<hkern u1="&#xea;" u2="x" k="41" />
-<hkern u1="&#xea;" u2="w" k="41" />
-<hkern u1="&#xea;" u2="v" k="41" />
-<hkern u1="&#xea;" u2="&#x27;" k="20" />
-<hkern u1="&#xea;" u2="&#x22;" k="20" />
-<hkern u1="&#xeb;" u2="&#x201d;" k="20" />
-<hkern u1="&#xeb;" u2="&#x2019;" k="20" />
-<hkern u1="&#xeb;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#xeb;" u2="&#x1e83;" k="41" />
-<hkern u1="&#xeb;" u2="&#x1e81;" k="41" />
-<hkern u1="&#xeb;" u2="&#x17e;" k="20" />
-<hkern u1="&#xeb;" u2="&#x17c;" k="20" />
-<hkern u1="&#xeb;" u2="&#x17a;" k="20" />
-<hkern u1="&#xeb;" u2="&#x175;" k="41" />
-<hkern u1="&#xeb;" u2="&#xfd;" k="41" />
-<hkern u1="&#xeb;" u2="z" k="20" />
-<hkern u1="&#xeb;" u2="y" k="41" />
-<hkern u1="&#xeb;" u2="x" k="41" />
-<hkern u1="&#xeb;" u2="w" k="41" />
-<hkern u1="&#xeb;" u2="v" k="41" />
-<hkern u1="&#xeb;" u2="&#x27;" k="20" />
-<hkern u1="&#xeb;" u2="&#x22;" k="20" />
-<hkern u1="&#xf0;" u2="&#x201d;" k="20" />
-<hkern u1="&#xf0;" u2="&#x2019;" k="20" />
-<hkern u1="&#xf0;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#xf0;" u2="&#x1e83;" k="41" />
-<hkern u1="&#xf0;" u2="&#x1e81;" k="41" />
-<hkern u1="&#xf0;" u2="&#x17e;" k="20" />
-<hkern u1="&#xf0;" u2="&#x17c;" k="20" />
-<hkern u1="&#xf0;" u2="&#x17a;" k="20" />
-<hkern u1="&#xf0;" u2="&#x175;" k="41" />
-<hkern u1="&#xf0;" u2="&#xfd;" k="41" />
-<hkern u1="&#xf0;" u2="z" k="20" />
-<hkern u1="&#xf0;" u2="y" k="41" />
-<hkern u1="&#xf0;" u2="x" k="41" />
-<hkern u1="&#xf0;" u2="w" k="41" />
-<hkern u1="&#xf0;" u2="v" k="41" />
-<hkern u1="&#xf0;" u2="&#x27;" k="20" />
-<hkern u1="&#xf0;" u2="&#x22;" k="20" />
-<hkern u1="&#xf2;" u2="&#x201d;" k="20" />
-<hkern u1="&#xf2;" u2="&#x2019;" k="20" />
-<hkern u1="&#xf2;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#xf2;" u2="&#x1e83;" k="41" />
-<hkern u1="&#xf2;" u2="&#x1e81;" k="41" />
-<hkern u1="&#xf2;" u2="&#x17e;" k="20" />
-<hkern u1="&#xf2;" u2="&#x17c;" k="20" />
-<hkern u1="&#xf2;" u2="&#x17a;" k="20" />
-<hkern u1="&#xf2;" u2="&#x175;" k="41" />
-<hkern u1="&#xf2;" u2="&#xfd;" k="41" />
-<hkern u1="&#xf2;" u2="z" k="20" />
-<hkern u1="&#xf2;" u2="y" k="41" />
-<hkern u1="&#xf2;" u2="x" k="41" />
-<hkern u1="&#xf2;" u2="w" k="41" />
-<hkern u1="&#xf2;" u2="v" k="41" />
-<hkern u1="&#xf2;" u2="&#x27;" k="20" />
-<hkern u1="&#xf2;" u2="&#x22;" k="20" />
-<hkern u1="&#xf3;" u2="&#x201d;" k="20" />
-<hkern u1="&#xf3;" u2="&#x2019;" k="20" />
-<hkern u1="&#xf3;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#xf3;" u2="&#x1e83;" k="41" />
-<hkern u1="&#xf3;" u2="&#x1e81;" k="41" />
-<hkern u1="&#xf3;" u2="&#x17e;" k="20" />
-<hkern u1="&#xf3;" u2="&#x17c;" k="20" />
-<hkern u1="&#xf3;" u2="&#x17a;" k="20" />
-<hkern u1="&#xf3;" u2="&#x175;" k="41" />
-<hkern u1="&#xf3;" u2="&#xfd;" k="41" />
-<hkern u1="&#xf3;" u2="z" k="20" />
-<hkern u1="&#xf3;" u2="y" k="41" />
-<hkern u1="&#xf3;" u2="x" k="41" />
-<hkern u1="&#xf3;" u2="w" k="41" />
-<hkern u1="&#xf3;" u2="v" k="41" />
-<hkern u1="&#xf3;" u2="&#x27;" k="20" />
-<hkern u1="&#xf3;" u2="&#x22;" k="20" />
-<hkern u1="&#xf4;" u2="&#x201d;" k="20" />
-<hkern u1="&#xf4;" u2="&#x2019;" k="20" />
-<hkern u1="&#xf4;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#xf4;" u2="&#x1e83;" k="41" />
-<hkern u1="&#xf4;" u2="&#x1e81;" k="41" />
-<hkern u1="&#xf4;" u2="&#x17e;" k="20" />
-<hkern u1="&#xf4;" u2="&#x17c;" k="20" />
-<hkern u1="&#xf4;" u2="&#x17a;" k="20" />
-<hkern u1="&#xf4;" u2="&#x175;" k="41" />
-<hkern u1="&#xf4;" u2="&#xfd;" k="41" />
-<hkern u1="&#xf4;" u2="z" k="20" />
-<hkern u1="&#xf4;" u2="y" k="41" />
-<hkern u1="&#xf4;" u2="x" k="41" />
-<hkern u1="&#xf4;" u2="w" k="41" />
-<hkern u1="&#xf4;" u2="v" k="41" />
-<hkern u1="&#xf4;" u2="&#x27;" k="20" />
-<hkern u1="&#xf4;" u2="&#x22;" k="20" />
-<hkern u1="&#xf6;" u2="&#x201d;" k="41" />
-<hkern u1="&#xf6;" u2="&#x2019;" k="41" />
-<hkern u1="&#xf6;" u2="&#x27;" k="41" />
-<hkern u1="&#xf6;" u2="&#x22;" k="41" />
-<hkern u1="&#xf8;" u2="&#x201d;" k="20" />
-<hkern u1="&#xf8;" u2="&#x2019;" k="20" />
-<hkern u1="&#xf8;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#xf8;" u2="&#x1e83;" k="41" />
-<hkern u1="&#xf8;" u2="&#x1e81;" k="41" />
-<hkern u1="&#xf8;" u2="&#x17e;" k="20" />
-<hkern u1="&#xf8;" u2="&#x17c;" k="20" />
-<hkern u1="&#xf8;" u2="&#x17a;" k="20" />
-<hkern u1="&#xf8;" u2="&#x175;" k="41" />
-<hkern u1="&#xf8;" u2="&#xfd;" k="41" />
-<hkern u1="&#xf8;" u2="z" k="20" />
-<hkern u1="&#xf8;" u2="y" k="41" />
-<hkern u1="&#xf8;" u2="x" k="41" />
-<hkern u1="&#xf8;" u2="w" k="41" />
-<hkern u1="&#xf8;" u2="v" k="41" />
-<hkern u1="&#xf8;" u2="&#x27;" k="20" />
-<hkern u1="&#xf8;" u2="&#x22;" k="20" />
-<hkern u1="&#xfd;" u2="&#x201e;" k="82" />
-<hkern u1="&#xfd;" u2="&#x201d;" k="-82" />
-<hkern u1="&#xfd;" u2="&#x201a;" k="82" />
-<hkern u1="&#xfd;" u2="&#x2019;" k="-82" />
-<hkern u1="&#xfd;" u2="&#x3f;" k="-41" />
-<hkern u1="&#xfd;" u2="&#x2e;" k="82" />
-<hkern u1="&#xfd;" u2="&#x2c;" k="82" />
-<hkern u1="&#xfd;" u2="&#x27;" k="-82" />
-<hkern u1="&#xfd;" u2="&#x22;" k="-82" />
-<hkern u1="&#xfe;" u2="&#x201d;" k="20" />
-<hkern u1="&#xfe;" u2="&#x2019;" k="20" />
-<hkern u1="&#xfe;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#xfe;" u2="&#x1e83;" k="41" />
-<hkern u1="&#xfe;" u2="&#x1e81;" k="41" />
-<hkern u1="&#xfe;" u2="&#x17e;" k="20" />
-<hkern u1="&#xfe;" u2="&#x17c;" k="20" />
-<hkern u1="&#xfe;" u2="&#x17a;" k="20" />
-<hkern u1="&#xfe;" u2="&#x175;" k="41" />
-<hkern u1="&#xfe;" u2="&#xfd;" k="41" />
-<hkern u1="&#xfe;" u2="z" k="20" />
-<hkern u1="&#xfe;" u2="y" k="41" />
-<hkern u1="&#xfe;" u2="x" k="41" />
-<hkern u1="&#xfe;" u2="w" k="41" />
-<hkern u1="&#xfe;" u2="v" k="41" />
-<hkern u1="&#xfe;" u2="&#x27;" k="20" />
-<hkern u1="&#xfe;" u2="&#x22;" k="20" />
-<hkern u1="&#xff;" u2="&#x201e;" k="82" />
-<hkern u1="&#xff;" u2="&#x201d;" k="-82" />
-<hkern u1="&#xff;" u2="&#x201a;" k="82" />
-<hkern u1="&#xff;" u2="&#x2019;" k="-82" />
-<hkern u1="&#xff;" u2="&#x3f;" k="-41" />
-<hkern u1="&#xff;" u2="&#x2e;" k="82" />
-<hkern u1="&#xff;" u2="&#x2c;" k="82" />
-<hkern u1="&#xff;" u2="&#x27;" k="-82" />
-<hkern u1="&#xff;" u2="&#x22;" k="-82" />
-<hkern u1="&#x100;" u2="&#x201d;" k="143" />
-<hkern u1="&#x100;" u2="&#x2019;" k="143" />
-<hkern u1="&#x100;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x100;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x100;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x100;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x100;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x100;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x100;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x100;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x100;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x100;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x100;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x100;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x100;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x100;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x100;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x100;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x100;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x100;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x100;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x100;" u2="&#x21a;" k="143" />
-<hkern u1="&#x100;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x100;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x100;" u2="&#x178;" k="123" />
-<hkern u1="&#x100;" u2="&#x176;" k="123" />
-<hkern u1="&#x100;" u2="&#x174;" k="82" />
-<hkern u1="&#x100;" u2="&#x164;" k="143" />
-<hkern u1="&#x100;" u2="&#x162;" k="143" />
-<hkern u1="&#x100;" u2="&#x152;" k="41" />
-<hkern u1="&#x100;" u2="&#x150;" k="41" />
-<hkern u1="&#x100;" u2="&#x14e;" k="41" />
-<hkern u1="&#x100;" u2="&#x14c;" k="41" />
-<hkern u1="&#x100;" u2="&#x122;" k="41" />
-<hkern u1="&#x100;" u2="&#x120;" k="41" />
-<hkern u1="&#x100;" u2="&#x11e;" k="41" />
-<hkern u1="&#x100;" u2="&#x11c;" k="41" />
-<hkern u1="&#x100;" u2="&#x10c;" k="41" />
-<hkern u1="&#x100;" u2="&#x10a;" k="41" />
-<hkern u1="&#x100;" u2="&#x108;" k="41" />
-<hkern u1="&#x100;" u2="&#x106;" k="41" />
-<hkern u1="&#x100;" u2="&#xdd;" k="123" />
-<hkern u1="&#x100;" u2="&#xd8;" k="41" />
-<hkern u1="&#x100;" u2="&#xd6;" k="41" />
-<hkern u1="&#x100;" u2="&#xd5;" k="41" />
-<hkern u1="&#x100;" u2="&#xd4;" k="41" />
-<hkern u1="&#x100;" u2="&#xd3;" k="41" />
-<hkern u1="&#x100;" u2="&#xd2;" k="41" />
-<hkern u1="&#x100;" u2="&#xc7;" k="41" />
-<hkern u1="&#x100;" u2="Y" k="123" />
-<hkern u1="&#x100;" u2="W" k="82" />
-<hkern u1="&#x100;" u2="V" k="82" />
-<hkern u1="&#x100;" u2="T" k="143" />
-<hkern u1="&#x100;" u2="Q" k="41" />
-<hkern u1="&#x100;" u2="O" k="41" />
-<hkern u1="&#x100;" u2="J" k="-266" />
-<hkern u1="&#x100;" u2="G" k="41" />
-<hkern u1="&#x100;" u2="C" k="41" />
-<hkern u1="&#x100;" u2="&#x27;" k="143" />
-<hkern u1="&#x100;" u2="&#x22;" k="143" />
-<hkern u1="&#x101;" u2="&#x201d;" k="20" />
-<hkern u1="&#x101;" u2="&#x2019;" k="20" />
-<hkern u1="&#x101;" u2="&#x27;" k="20" />
-<hkern u1="&#x101;" u2="&#x22;" k="20" />
-<hkern u1="&#x102;" u2="&#x201d;" k="143" />
-<hkern u1="&#x102;" u2="&#x2019;" k="143" />
-<hkern u1="&#x102;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x102;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x102;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x102;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x102;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x102;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x102;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x102;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x102;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x102;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x102;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x102;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x102;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x102;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x102;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x102;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x102;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x102;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x102;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x102;" u2="&#x21a;" k="143" />
-<hkern u1="&#x102;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x102;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x102;" u2="&#x178;" k="123" />
-<hkern u1="&#x102;" u2="&#x176;" k="123" />
-<hkern u1="&#x102;" u2="&#x174;" k="82" />
-<hkern u1="&#x102;" u2="&#x164;" k="143" />
-<hkern u1="&#x102;" u2="&#x162;" k="143" />
-<hkern u1="&#x102;" u2="&#x152;" k="41" />
-<hkern u1="&#x102;" u2="&#x150;" k="41" />
-<hkern u1="&#x102;" u2="&#x14e;" k="41" />
-<hkern u1="&#x102;" u2="&#x14c;" k="41" />
-<hkern u1="&#x102;" u2="&#x122;" k="41" />
-<hkern u1="&#x102;" u2="&#x120;" k="41" />
-<hkern u1="&#x102;" u2="&#x11e;" k="41" />
-<hkern u1="&#x102;" u2="&#x11c;" k="41" />
-<hkern u1="&#x102;" u2="&#x10c;" k="41" />
-<hkern u1="&#x102;" u2="&#x10a;" k="41" />
-<hkern u1="&#x102;" u2="&#x108;" k="41" />
-<hkern u1="&#x102;" u2="&#x106;" k="41" />
-<hkern u1="&#x102;" u2="&#xdd;" k="123" />
-<hkern u1="&#x102;" u2="&#xd8;" k="41" />
-<hkern u1="&#x102;" u2="&#xd6;" k="41" />
-<hkern u1="&#x102;" u2="&#xd5;" k="41" />
-<hkern u1="&#x102;" u2="&#xd4;" k="41" />
-<hkern u1="&#x102;" u2="&#xd3;" k="41" />
-<hkern u1="&#x102;" u2="&#xd2;" k="41" />
-<hkern u1="&#x102;" u2="&#xc7;" k="41" />
-<hkern u1="&#x102;" u2="Y" k="123" />
-<hkern u1="&#x102;" u2="W" k="82" />
-<hkern u1="&#x102;" u2="V" k="82" />
-<hkern u1="&#x102;" u2="T" k="143" />
-<hkern u1="&#x102;" u2="Q" k="41" />
-<hkern u1="&#x102;" u2="O" k="41" />
-<hkern u1="&#x102;" u2="J" k="-266" />
-<hkern u1="&#x102;" u2="G" k="41" />
-<hkern u1="&#x102;" u2="C" k="41" />
-<hkern u1="&#x102;" u2="&#x27;" k="143" />
-<hkern u1="&#x102;" u2="&#x22;" k="143" />
-<hkern u1="&#x103;" u2="&#x201d;" k="20" />
-<hkern u1="&#x103;" u2="&#x2019;" k="20" />
-<hkern u1="&#x103;" u2="&#x27;" k="20" />
-<hkern u1="&#x103;" u2="&#x22;" k="20" />
-<hkern u1="&#x104;" u2="&#x201d;" k="143" />
-<hkern u1="&#x104;" u2="&#x2019;" k="143" />
-<hkern u1="&#x104;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x104;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x104;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x104;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x104;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x104;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x104;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x104;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x104;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x104;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x104;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x104;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x104;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x104;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x104;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x104;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x104;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x104;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x104;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x104;" u2="&#x21a;" k="143" />
-<hkern u1="&#x104;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x104;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x104;" u2="&#x178;" k="123" />
-<hkern u1="&#x104;" u2="&#x176;" k="123" />
-<hkern u1="&#x104;" u2="&#x174;" k="82" />
-<hkern u1="&#x104;" u2="&#x164;" k="143" />
-<hkern u1="&#x104;" u2="&#x162;" k="143" />
-<hkern u1="&#x104;" u2="&#x152;" k="41" />
-<hkern u1="&#x104;" u2="&#x150;" k="41" />
-<hkern u1="&#x104;" u2="&#x14e;" k="41" />
-<hkern u1="&#x104;" u2="&#x14c;" k="41" />
-<hkern u1="&#x104;" u2="&#x122;" k="41" />
-<hkern u1="&#x104;" u2="&#x120;" k="41" />
-<hkern u1="&#x104;" u2="&#x11e;" k="41" />
-<hkern u1="&#x104;" u2="&#x11c;" k="41" />
-<hkern u1="&#x104;" u2="&#x10c;" k="41" />
-<hkern u1="&#x104;" u2="&#x10a;" k="41" />
-<hkern u1="&#x104;" u2="&#x108;" k="41" />
-<hkern u1="&#x104;" u2="&#x106;" k="41" />
-<hkern u1="&#x104;" u2="&#xdd;" k="123" />
-<hkern u1="&#x104;" u2="&#xd8;" k="41" />
-<hkern u1="&#x104;" u2="&#xd6;" k="41" />
-<hkern u1="&#x104;" u2="&#xd5;" k="41" />
-<hkern u1="&#x104;" u2="&#xd4;" k="41" />
-<hkern u1="&#x104;" u2="&#xd3;" k="41" />
-<hkern u1="&#x104;" u2="&#xd2;" k="41" />
-<hkern u1="&#x104;" u2="&#xc7;" k="41" />
-<hkern u1="&#x104;" u2="Y" k="123" />
-<hkern u1="&#x104;" u2="W" k="82" />
-<hkern u1="&#x104;" u2="V" k="82" />
-<hkern u1="&#x104;" u2="T" k="143" />
-<hkern u1="&#x104;" u2="Q" k="41" />
-<hkern u1="&#x104;" u2="O" k="41" />
-<hkern u1="&#x104;" u2="J" k="-266" />
-<hkern u1="&#x104;" u2="G" k="41" />
-<hkern u1="&#x104;" u2="C" k="41" />
-<hkern u1="&#x104;" u2="&#x27;" k="143" />
-<hkern u1="&#x104;" u2="&#x22;" k="143" />
-<hkern u1="&#x105;" u2="&#x201d;" k="20" />
-<hkern u1="&#x105;" u2="&#x2019;" k="20" />
-<hkern u1="&#x105;" u2="&#x27;" k="20" />
-<hkern u1="&#x105;" u2="&#x22;" k="20" />
-<hkern u1="&#x106;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x106;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x106;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x106;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x106;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x106;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x106;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x106;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x106;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x106;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x106;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x106;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x106;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x106;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x106;" u2="&#x152;" k="41" />
-<hkern u1="&#x106;" u2="&#x150;" k="41" />
-<hkern u1="&#x106;" u2="&#x14e;" k="41" />
-<hkern u1="&#x106;" u2="&#x14c;" k="41" />
-<hkern u1="&#x106;" u2="&#x122;" k="41" />
-<hkern u1="&#x106;" u2="&#x120;" k="41" />
-<hkern u1="&#x106;" u2="&#x11e;" k="41" />
-<hkern u1="&#x106;" u2="&#x11c;" k="41" />
-<hkern u1="&#x106;" u2="&#x10c;" k="41" />
-<hkern u1="&#x106;" u2="&#x10a;" k="41" />
-<hkern u1="&#x106;" u2="&#x108;" k="41" />
-<hkern u1="&#x106;" u2="&#x106;" k="41" />
-<hkern u1="&#x106;" u2="&#xd8;" k="41" />
-<hkern u1="&#x106;" u2="&#xd6;" k="41" />
-<hkern u1="&#x106;" u2="&#xd5;" k="41" />
-<hkern u1="&#x106;" u2="&#xd4;" k="41" />
-<hkern u1="&#x106;" u2="&#xd3;" k="41" />
-<hkern u1="&#x106;" u2="&#xd2;" k="41" />
-<hkern u1="&#x106;" u2="&#xc7;" k="41" />
-<hkern u1="&#x106;" u2="Q" k="41" />
-<hkern u1="&#x106;" u2="O" k="41" />
-<hkern u1="&#x106;" u2="G" k="41" />
-<hkern u1="&#x106;" u2="C" k="41" />
-<hkern u1="&#x108;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x108;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x108;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x108;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x108;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x108;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x108;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x108;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x108;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x108;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x108;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x108;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x108;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x108;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x108;" u2="&#x152;" k="41" />
-<hkern u1="&#x108;" u2="&#x150;" k="41" />
-<hkern u1="&#x108;" u2="&#x14e;" k="41" />
-<hkern u1="&#x108;" u2="&#x14c;" k="41" />
-<hkern u1="&#x108;" u2="&#x122;" k="41" />
-<hkern u1="&#x108;" u2="&#x120;" k="41" />
-<hkern u1="&#x108;" u2="&#x11e;" k="41" />
-<hkern u1="&#x108;" u2="&#x11c;" k="41" />
-<hkern u1="&#x108;" u2="&#x10c;" k="41" />
-<hkern u1="&#x108;" u2="&#x10a;" k="41" />
-<hkern u1="&#x108;" u2="&#x108;" k="41" />
-<hkern u1="&#x108;" u2="&#x106;" k="41" />
-<hkern u1="&#x108;" u2="&#xd8;" k="41" />
-<hkern u1="&#x108;" u2="&#xd6;" k="41" />
-<hkern u1="&#x108;" u2="&#xd5;" k="41" />
-<hkern u1="&#x108;" u2="&#xd4;" k="41" />
-<hkern u1="&#x108;" u2="&#xd3;" k="41" />
-<hkern u1="&#x108;" u2="&#xd2;" k="41" />
-<hkern u1="&#x108;" u2="&#xc7;" k="41" />
-<hkern u1="&#x108;" u2="Q" k="41" />
-<hkern u1="&#x108;" u2="O" k="41" />
-<hkern u1="&#x108;" u2="G" k="41" />
-<hkern u1="&#x108;" u2="C" k="41" />
-<hkern u1="&#x10a;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x10a;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x10a;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x10a;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x10a;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x10a;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x10a;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x10a;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x10a;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x10a;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x10a;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x10a;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x10a;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x10a;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x10a;" u2="&#x152;" k="41" />
-<hkern u1="&#x10a;" u2="&#x150;" k="41" />
-<hkern u1="&#x10a;" u2="&#x14e;" k="41" />
-<hkern u1="&#x10a;" u2="&#x14c;" k="41" />
-<hkern u1="&#x10a;" u2="&#x122;" k="41" />
-<hkern u1="&#x10a;" u2="&#x120;" k="41" />
-<hkern u1="&#x10a;" u2="&#x11e;" k="41" />
-<hkern u1="&#x10a;" u2="&#x11c;" k="41" />
-<hkern u1="&#x10a;" u2="&#x10c;" k="41" />
-<hkern u1="&#x10a;" u2="&#x10a;" k="41" />
-<hkern u1="&#x10a;" u2="&#x108;" k="41" />
-<hkern u1="&#x10a;" u2="&#x106;" k="41" />
-<hkern u1="&#x10a;" u2="&#xd8;" k="41" />
-<hkern u1="&#x10a;" u2="&#xd6;" k="41" />
-<hkern u1="&#x10a;" u2="&#xd5;" k="41" />
-<hkern u1="&#x10a;" u2="&#xd4;" k="41" />
-<hkern u1="&#x10a;" u2="&#xd3;" k="41" />
-<hkern u1="&#x10a;" u2="&#xd2;" k="41" />
-<hkern u1="&#x10a;" u2="&#xc7;" k="41" />
-<hkern u1="&#x10a;" u2="Q" k="41" />
-<hkern u1="&#x10a;" u2="O" k="41" />
-<hkern u1="&#x10a;" u2="G" k="41" />
-<hkern u1="&#x10a;" u2="C" k="41" />
-<hkern u1="&#x10c;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x10c;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x10c;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x10c;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x10c;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x10c;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x10c;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x10c;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x10c;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x10c;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x10c;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x10c;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x10c;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x10c;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x10c;" u2="&#x152;" k="41" />
-<hkern u1="&#x10c;" u2="&#x150;" k="41" />
-<hkern u1="&#x10c;" u2="&#x14e;" k="41" />
-<hkern u1="&#x10c;" u2="&#x14c;" k="41" />
-<hkern u1="&#x10c;" u2="&#x122;" k="41" />
-<hkern u1="&#x10c;" u2="&#x120;" k="41" />
-<hkern u1="&#x10c;" u2="&#x11e;" k="41" />
-<hkern u1="&#x10c;" u2="&#x11c;" k="41" />
-<hkern u1="&#x10c;" u2="&#x10c;" k="41" />
-<hkern u1="&#x10c;" u2="&#x10a;" k="41" />
-<hkern u1="&#x10c;" u2="&#x108;" k="41" />
-<hkern u1="&#x10c;" u2="&#x106;" k="41" />
-<hkern u1="&#x10c;" u2="&#xd8;" k="41" />
-<hkern u1="&#x10c;" u2="&#xd6;" k="41" />
-<hkern u1="&#x10c;" u2="&#xd5;" k="41" />
-<hkern u1="&#x10c;" u2="&#xd4;" k="41" />
-<hkern u1="&#x10c;" u2="&#xd3;" k="41" />
-<hkern u1="&#x10c;" u2="&#xd2;" k="41" />
-<hkern u1="&#x10c;" u2="&#xc7;" k="41" />
-<hkern u1="&#x10c;" u2="Q" k="41" />
-<hkern u1="&#x10c;" u2="O" k="41" />
-<hkern u1="&#x10c;" u2="G" k="41" />
-<hkern u1="&#x10c;" u2="C" k="41" />
-<hkern u1="&#x10e;" u2="&#x201e;" k="82" />
-<hkern u1="&#x10e;" u2="&#x201a;" k="82" />
-<hkern u1="&#x10e;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#x10e;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#x10e;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#x10e;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#x10e;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#x10e;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#x10e;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#x10e;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#x10e;" u2="&#x1eae;" k="41" />
-<hkern u1="&#x10e;" u2="&#x1eac;" k="41" />
-<hkern u1="&#x10e;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#x10e;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#x10e;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#x10e;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#x10e;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#x10e;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#x10e;" u2="&#x1e84;" k="20" />
-<hkern u1="&#x10e;" u2="&#x1e82;" k="20" />
-<hkern u1="&#x10e;" u2="&#x1e80;" k="20" />
-<hkern u1="&#x10e;" u2="&#x1e00;" k="41" />
-<hkern u1="&#x10e;" u2="&#x405;" k="20" />
-<hkern u1="&#x10e;" u2="&#x21a;" k="61" />
-<hkern u1="&#x10e;" u2="&#x1fa;" k="41" />
-<hkern u1="&#x10e;" u2="&#x17d;" k="20" />
-<hkern u1="&#x10e;" u2="&#x17b;" k="20" />
-<hkern u1="&#x10e;" u2="&#x179;" k="20" />
-<hkern u1="&#x10e;" u2="&#x178;" k="20" />
-<hkern u1="&#x10e;" u2="&#x176;" k="20" />
-<hkern u1="&#x10e;" u2="&#x174;" k="20" />
-<hkern u1="&#x10e;" u2="&#x164;" k="61" />
-<hkern u1="&#x10e;" u2="&#x162;" k="61" />
-<hkern u1="&#x10e;" u2="&#x104;" k="41" />
-<hkern u1="&#x10e;" u2="&#x102;" k="41" />
-<hkern u1="&#x10e;" u2="&#x100;" k="41" />
-<hkern u1="&#x10e;" u2="&#xdd;" k="20" />
-<hkern u1="&#x10e;" u2="&#xc5;" k="41" />
-<hkern u1="&#x10e;" u2="&#xc4;" k="41" />
-<hkern u1="&#x10e;" u2="&#xc3;" k="41" />
-<hkern u1="&#x10e;" u2="&#xc2;" k="41" />
-<hkern u1="&#x10e;" u2="&#xc1;" k="41" />
-<hkern u1="&#x10e;" u2="&#xc0;" k="41" />
-<hkern u1="&#x10e;" u2="Z" k="20" />
-<hkern u1="&#x10e;" u2="Y" k="20" />
-<hkern u1="&#x10e;" u2="X" k="41" />
-<hkern u1="&#x10e;" u2="W" k="20" />
-<hkern u1="&#x10e;" u2="V" k="20" />
-<hkern u1="&#x10e;" u2="T" k="61" />
-<hkern u1="&#x10e;" u2="A" k="41" />
-<hkern u1="&#x10e;" u2="&#x2e;" k="82" />
-<hkern u1="&#x10e;" u2="&#x2c;" k="82" />
-<hkern u1="&#x10f;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x10f;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x10f;" u2="&#x127;" k="-123" />
-<hkern u1="&#x10f;" u2="&#x125;" k="-61" />
-<hkern u1="&#x10f;" u2="&#x7d;" k="-143" />
-<hkern u1="&#x10f;" u2="l" k="-61" />
-<hkern u1="&#x10f;" u2="k" k="-61" />
-<hkern u1="&#x10f;" u2="h" k="-61" />
-<hkern u1="&#x10f;" u2="b" k="-61" />
-<hkern u1="&#x10f;" u2="]" k="-143" />
-<hkern u1="&#x10f;" u2="&#x3f;" k="-164" />
-<hkern u1="&#x10f;" u2="&#x29;" k="-143" />
-<hkern u1="&#x10f;" u2="&#x27;" k="-82" />
-<hkern u1="&#x10f;" u2="&#x22;" k="-82" />
-<hkern u1="&#x110;" u2="&#x201e;" k="82" />
-<hkern u1="&#x110;" u2="&#x201a;" k="82" />
-<hkern u1="&#x110;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#x110;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#x110;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#x110;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#x110;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#x110;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#x110;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#x110;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#x110;" u2="&#x1eae;" k="41" />
-<hkern u1="&#x110;" u2="&#x1eac;" k="41" />
-<hkern u1="&#x110;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#x110;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#x110;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#x110;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#x110;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#x110;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#x110;" u2="&#x1e84;" k="20" />
-<hkern u1="&#x110;" u2="&#x1e82;" k="20" />
-<hkern u1="&#x110;" u2="&#x1e80;" k="20" />
-<hkern u1="&#x110;" u2="&#x1e00;" k="41" />
-<hkern u1="&#x110;" u2="&#x405;" k="20" />
-<hkern u1="&#x110;" u2="&#x21a;" k="61" />
-<hkern u1="&#x110;" u2="&#x1fa;" k="41" />
-<hkern u1="&#x110;" u2="&#x17d;" k="20" />
-<hkern u1="&#x110;" u2="&#x17b;" k="20" />
-<hkern u1="&#x110;" u2="&#x179;" k="20" />
-<hkern u1="&#x110;" u2="&#x178;" k="20" />
-<hkern u1="&#x110;" u2="&#x176;" k="20" />
-<hkern u1="&#x110;" u2="&#x174;" k="20" />
-<hkern u1="&#x110;" u2="&#x164;" k="61" />
-<hkern u1="&#x110;" u2="&#x162;" k="61" />
-<hkern u1="&#x110;" u2="&#x104;" k="41" />
-<hkern u1="&#x110;" u2="&#x102;" k="41" />
-<hkern u1="&#x110;" u2="&#x100;" k="41" />
-<hkern u1="&#x110;" u2="&#xdd;" k="20" />
-<hkern u1="&#x110;" u2="&#xc5;" k="41" />
-<hkern u1="&#x110;" u2="&#xc4;" k="41" />
-<hkern u1="&#x110;" u2="&#xc3;" k="41" />
-<hkern u1="&#x110;" u2="&#xc2;" k="41" />
-<hkern u1="&#x110;" u2="&#xc1;" k="41" />
-<hkern u1="&#x110;" u2="&#xc0;" k="41" />
-<hkern u1="&#x110;" u2="Z" k="20" />
-<hkern u1="&#x110;" u2="Y" k="20" />
-<hkern u1="&#x110;" u2="X" k="41" />
-<hkern u1="&#x110;" u2="W" k="20" />
-<hkern u1="&#x110;" u2="V" k="20" />
-<hkern u1="&#x110;" u2="T" k="61" />
-<hkern u1="&#x110;" u2="A" k="41" />
-<hkern u1="&#x110;" u2="&#x2e;" k="82" />
-<hkern u1="&#x110;" u2="&#x2c;" k="82" />
-<hkern u1="&#x112;" u2="J" k="-123" />
-<hkern u1="&#x113;" u2="&#x201d;" k="20" />
-<hkern u1="&#x113;" u2="&#x2019;" k="20" />
-<hkern u1="&#x113;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x113;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x113;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x113;" u2="&#x17e;" k="20" />
-<hkern u1="&#x113;" u2="&#x17c;" k="20" />
-<hkern u1="&#x113;" u2="&#x17a;" k="20" />
-<hkern u1="&#x113;" u2="&#x175;" k="41" />
-<hkern u1="&#x113;" u2="&#xfd;" k="41" />
-<hkern u1="&#x113;" u2="z" k="20" />
-<hkern u1="&#x113;" u2="y" k="41" />
-<hkern u1="&#x113;" u2="x" k="41" />
-<hkern u1="&#x113;" u2="w" k="41" />
-<hkern u1="&#x113;" u2="v" k="41" />
-<hkern u1="&#x113;" u2="&#x27;" k="20" />
-<hkern u1="&#x113;" u2="&#x22;" k="20" />
-<hkern u1="&#x114;" u2="J" k="-123" />
-<hkern u1="&#x115;" u2="&#x201d;" k="20" />
-<hkern u1="&#x115;" u2="&#x2019;" k="20" />
-<hkern u1="&#x115;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x115;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x115;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x115;" u2="&#x17e;" k="20" />
-<hkern u1="&#x115;" u2="&#x17c;" k="20" />
-<hkern u1="&#x115;" u2="&#x17a;" k="20" />
-<hkern u1="&#x115;" u2="&#x175;" k="41" />
-<hkern u1="&#x115;" u2="&#xfd;" k="41" />
-<hkern u1="&#x115;" u2="z" k="20" />
-<hkern u1="&#x115;" u2="y" k="41" />
-<hkern u1="&#x115;" u2="x" k="41" />
-<hkern u1="&#x115;" u2="w" k="41" />
-<hkern u1="&#x115;" u2="v" k="41" />
-<hkern u1="&#x115;" u2="&#x27;" k="20" />
-<hkern u1="&#x115;" u2="&#x22;" k="20" />
-<hkern u1="&#x116;" u2="J" k="-123" />
-<hkern u1="&#x117;" u2="&#x201d;" k="20" />
-<hkern u1="&#x117;" u2="&#x2019;" k="20" />
-<hkern u1="&#x117;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x117;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x117;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x117;" u2="&#x17e;" k="20" />
-<hkern u1="&#x117;" u2="&#x17c;" k="20" />
-<hkern u1="&#x117;" u2="&#x17a;" k="20" />
-<hkern u1="&#x117;" u2="&#x175;" k="41" />
-<hkern u1="&#x117;" u2="&#xfd;" k="41" />
-<hkern u1="&#x117;" u2="z" k="20" />
-<hkern u1="&#x117;" u2="y" k="41" />
-<hkern u1="&#x117;" u2="x" k="41" />
-<hkern u1="&#x117;" u2="w" k="41" />
-<hkern u1="&#x117;" u2="v" k="41" />
-<hkern u1="&#x117;" u2="&#x27;" k="20" />
-<hkern u1="&#x117;" u2="&#x22;" k="20" />
-<hkern u1="&#x118;" u2="J" k="-123" />
-<hkern u1="&#x119;" u2="&#x201d;" k="20" />
-<hkern u1="&#x119;" u2="&#x2019;" k="20" />
-<hkern u1="&#x119;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x119;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x119;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x119;" u2="&#x17e;" k="20" />
-<hkern u1="&#x119;" u2="&#x17c;" k="20" />
-<hkern u1="&#x119;" u2="&#x17a;" k="20" />
-<hkern u1="&#x119;" u2="&#x175;" k="41" />
-<hkern u1="&#x119;" u2="&#xfd;" k="41" />
-<hkern u1="&#x119;" u2="z" k="20" />
-<hkern u1="&#x119;" u2="y" k="41" />
-<hkern u1="&#x119;" u2="x" k="41" />
-<hkern u1="&#x119;" u2="w" k="41" />
-<hkern u1="&#x119;" u2="v" k="41" />
-<hkern u1="&#x119;" u2="&#x27;" k="20" />
-<hkern u1="&#x119;" u2="&#x22;" k="20" />
-<hkern u1="&#x11a;" u2="J" k="-123" />
-<hkern u1="&#x11b;" u2="&#x201d;" k="20" />
-<hkern u1="&#x11b;" u2="&#x2019;" k="20" />
-<hkern u1="&#x11b;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x11b;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x11b;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x11b;" u2="&#x17e;" k="20" />
-<hkern u1="&#x11b;" u2="&#x17c;" k="20" />
-<hkern u1="&#x11b;" u2="&#x17a;" k="20" />
-<hkern u1="&#x11b;" u2="&#x175;" k="41" />
-<hkern u1="&#x11b;" u2="&#xfd;" k="41" />
-<hkern u1="&#x11b;" u2="z" k="20" />
-<hkern u1="&#x11b;" u2="y" k="41" />
-<hkern u1="&#x11b;" u2="x" k="41" />
-<hkern u1="&#x11b;" u2="w" k="41" />
-<hkern u1="&#x11b;" u2="v" k="41" />
-<hkern u1="&#x11b;" u2="&#x27;" k="20" />
-<hkern u1="&#x11b;" u2="&#x22;" k="20" />
-<hkern u1="&#x125;" u2="&#x201d;" k="20" />
-<hkern u1="&#x125;" u2="&#x2019;" k="20" />
-<hkern u1="&#x125;" u2="&#x27;" k="20" />
-<hkern u1="&#x125;" u2="&#x22;" k="20" />
-<hkern u1="&#x136;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x136;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x136;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x136;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x136;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x136;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x136;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x136;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x136;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x136;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x136;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x136;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x136;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x136;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x136;" u2="&#x152;" k="41" />
-<hkern u1="&#x136;" u2="&#x150;" k="41" />
-<hkern u1="&#x136;" u2="&#x14e;" k="41" />
-<hkern u1="&#x136;" u2="&#x14c;" k="41" />
-<hkern u1="&#x136;" u2="&#x122;" k="41" />
-<hkern u1="&#x136;" u2="&#x120;" k="41" />
-<hkern u1="&#x136;" u2="&#x11e;" k="41" />
-<hkern u1="&#x136;" u2="&#x11c;" k="41" />
-<hkern u1="&#x136;" u2="&#x10c;" k="41" />
-<hkern u1="&#x136;" u2="&#x10a;" k="41" />
-<hkern u1="&#x136;" u2="&#x108;" k="41" />
-<hkern u1="&#x136;" u2="&#x106;" k="41" />
-<hkern u1="&#x136;" u2="&#xd8;" k="41" />
-<hkern u1="&#x136;" u2="&#xd6;" k="41" />
-<hkern u1="&#x136;" u2="&#xd5;" k="41" />
-<hkern u1="&#x136;" u2="&#xd4;" k="41" />
-<hkern u1="&#x136;" u2="&#xd3;" k="41" />
-<hkern u1="&#x136;" u2="&#xd2;" k="41" />
-<hkern u1="&#x136;" u2="&#xc7;" k="41" />
-<hkern u1="&#x136;" u2="Q" k="41" />
-<hkern u1="&#x136;" u2="O" k="41" />
-<hkern u1="&#x136;" u2="G" k="41" />
-<hkern u1="&#x136;" u2="C" k="41" />
-<hkern u1="&#x137;" u2="&#x1ee3;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ee1;" k="41" />
-<hkern u1="&#x137;" u2="&#x1edf;" k="41" />
-<hkern u1="&#x137;" u2="&#x1edd;" k="41" />
-<hkern u1="&#x137;" u2="&#x1edb;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ed9;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ed7;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ed5;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ed1;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ecf;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ecd;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ec7;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ec5;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ec3;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ebf;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ebd;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ebb;" k="41" />
-<hkern u1="&#x137;" u2="&#x1eb9;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ff;" k="41" />
-<hkern u1="&#x137;" u2="&#x1a1;" k="41" />
-<hkern u1="&#x137;" u2="&#x153;" k="41" />
-<hkern u1="&#x137;" u2="&#x151;" k="41" />
-<hkern u1="&#x137;" u2="&#x14f;" k="41" />
-<hkern u1="&#x137;" u2="&#x14d;" k="41" />
-<hkern u1="&#x137;" u2="&#x11b;" k="41" />
-<hkern u1="&#x137;" u2="&#x119;" k="41" />
-<hkern u1="&#x137;" u2="&#x117;" k="41" />
-<hkern u1="&#x137;" u2="&#x115;" k="41" />
-<hkern u1="&#x137;" u2="&#x113;" k="41" />
-<hkern u1="&#x137;" u2="&#x111;" k="41" />
-<hkern u1="&#x137;" u2="&#x10f;" k="41" />
-<hkern u1="&#x137;" u2="&#x10d;" k="41" />
-<hkern u1="&#x137;" u2="&#x10b;" k="41" />
-<hkern u1="&#x137;" u2="&#x109;" k="41" />
-<hkern u1="&#x137;" u2="&#x107;" k="41" />
-<hkern u1="&#x137;" u2="&#xf8;" k="41" />
-<hkern u1="&#x137;" u2="&#xf6;" k="41" />
-<hkern u1="&#x137;" u2="&#xf5;" k="41" />
-<hkern u1="&#x137;" u2="&#xf4;" k="41" />
-<hkern u1="&#x137;" u2="&#xf3;" k="41" />
-<hkern u1="&#x137;" u2="&#xf2;" k="41" />
-<hkern u1="&#x137;" u2="&#xeb;" k="41" />
-<hkern u1="&#x137;" u2="&#xea;" k="41" />
-<hkern u1="&#x137;" u2="&#xe9;" k="41" />
-<hkern u1="&#x137;" u2="&#xe8;" k="41" />
-<hkern u1="&#x137;" u2="&#xe7;" k="41" />
-<hkern u1="&#x137;" u2="&#xe0;" k="41" />
-<hkern u1="&#x137;" u2="q" k="41" />
-<hkern u1="&#x137;" u2="o" k="41" />
-<hkern u1="&#x137;" u2="e" k="41" />
-<hkern u1="&#x137;" u2="d" k="41" />
-<hkern u1="&#x137;" u2="c" k="41" />
-<hkern u1="&#x138;" u2="&#x1ee3;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ee1;" k="41" />
-<hkern u1="&#x138;" u2="&#x1edf;" k="41" />
-<hkern u1="&#x138;" u2="&#x1edd;" k="41" />
-<hkern u1="&#x138;" u2="&#x1edb;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ed9;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ed7;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ed5;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ed1;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ecf;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ecd;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ec7;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ec5;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ec3;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ebf;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ebd;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ebb;" k="41" />
-<hkern u1="&#x138;" u2="&#x1eb9;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ff;" k="41" />
-<hkern u1="&#x138;" u2="&#x1a1;" k="41" />
-<hkern u1="&#x138;" u2="&#x153;" k="41" />
-<hkern u1="&#x138;" u2="&#x151;" k="41" />
-<hkern u1="&#x138;" u2="&#x14f;" k="41" />
-<hkern u1="&#x138;" u2="&#x14d;" k="41" />
-<hkern u1="&#x138;" u2="&#x11b;" k="41" />
-<hkern u1="&#x138;" u2="&#x119;" k="41" />
-<hkern u1="&#x138;" u2="&#x117;" k="41" />
-<hkern u1="&#x138;" u2="&#x115;" k="41" />
-<hkern u1="&#x138;" u2="&#x113;" k="41" />
-<hkern u1="&#x138;" u2="&#x111;" k="41" />
-<hkern u1="&#x138;" u2="&#x10f;" k="41" />
-<hkern u1="&#x138;" u2="&#x10d;" k="41" />
-<hkern u1="&#x138;" u2="&#x10b;" k="41" />
-<hkern u1="&#x138;" u2="&#x109;" k="41" />
-<hkern u1="&#x138;" u2="&#x107;" k="41" />
-<hkern u1="&#x138;" u2="&#xf8;" k="41" />
-<hkern u1="&#x138;" u2="&#xf6;" k="41" />
-<hkern u1="&#x138;" u2="&#xf5;" k="41" />
-<hkern u1="&#x138;" u2="&#xf4;" k="41" />
-<hkern u1="&#x138;" u2="&#xf3;" k="41" />
-<hkern u1="&#x138;" u2="&#xf2;" k="41" />
-<hkern u1="&#x138;" u2="&#xeb;" k="41" />
-<hkern u1="&#x138;" u2="&#xea;" k="41" />
-<hkern u1="&#x138;" u2="&#xe9;" k="41" />
-<hkern u1="&#x138;" u2="&#xe8;" k="41" />
-<hkern u1="&#x138;" u2="&#xe7;" k="41" />
-<hkern u1="&#x138;" u2="&#xe0;" k="41" />
-<hkern u1="&#x138;" u2="q" k="41" />
-<hkern u1="&#x138;" u2="o" k="41" />
-<hkern u1="&#x138;" u2="e" k="41" />
-<hkern u1="&#x138;" u2="d" k="41" />
-<hkern u1="&#x138;" u2="c" k="41" />
-<hkern u1="&#x139;" u2="&#x201d;" k="164" />
-<hkern u1="&#x139;" u2="&#x2019;" k="164" />
-<hkern u1="&#x139;" u2="&#x1ef8;" k="61" />
-<hkern u1="&#x139;" u2="&#x1ef6;" k="61" />
-<hkern u1="&#x139;" u2="&#x1ef4;" k="61" />
-<hkern u1="&#x139;" u2="&#x1ef2;" k="61" />
-<hkern u1="&#x139;" u2="&#x1ef0;" k="20" />
-<hkern u1="&#x139;" u2="&#x1eee;" k="20" />
-<hkern u1="&#x139;" u2="&#x1eec;" k="20" />
-<hkern u1="&#x139;" u2="&#x1eea;" k="20" />
-<hkern u1="&#x139;" u2="&#x1ee8;" k="20" />
-<hkern u1="&#x139;" u2="&#x1ee6;" k="20" />
-<hkern u1="&#x139;" u2="&#x1ee4;" k="20" />
-<hkern u1="&#x139;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x139;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x139;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x139;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x139;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x139;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x139;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x139;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x139;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x139;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x139;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x139;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x139;" u2="&#x1e84;" k="41" />
-<hkern u1="&#x139;" u2="&#x1e82;" k="41" />
-<hkern u1="&#x139;" u2="&#x1e80;" k="41" />
-<hkern u1="&#x139;" u2="&#x21a;" k="41" />
-<hkern u1="&#x139;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x139;" u2="&#x1af;" k="20" />
-<hkern u1="&#x139;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x139;" u2="&#x178;" k="61" />
-<hkern u1="&#x139;" u2="&#x176;" k="61" />
-<hkern u1="&#x139;" u2="&#x174;" k="41" />
-<hkern u1="&#x139;" u2="&#x172;" k="20" />
-<hkern u1="&#x139;" u2="&#x170;" k="20" />
-<hkern u1="&#x139;" u2="&#x16e;" k="20" />
-<hkern u1="&#x139;" u2="&#x16c;" k="20" />
-<hkern u1="&#x139;" u2="&#x16a;" k="20" />
-<hkern u1="&#x139;" u2="&#x168;" k="20" />
-<hkern u1="&#x139;" u2="&#x164;" k="41" />
-<hkern u1="&#x139;" u2="&#x162;" k="41" />
-<hkern u1="&#x139;" u2="&#x152;" k="41" />
-<hkern u1="&#x139;" u2="&#x150;" k="41" />
-<hkern u1="&#x139;" u2="&#x14e;" k="41" />
-<hkern u1="&#x139;" u2="&#x14c;" k="41" />
-<hkern u1="&#x139;" u2="&#x122;" k="41" />
-<hkern u1="&#x139;" u2="&#x120;" k="41" />
-<hkern u1="&#x139;" u2="&#x11e;" k="41" />
-<hkern u1="&#x139;" u2="&#x11c;" k="41" />
-<hkern u1="&#x139;" u2="&#x10c;" k="41" />
-<hkern u1="&#x139;" u2="&#x10a;" k="41" />
-<hkern u1="&#x139;" u2="&#x108;" k="41" />
-<hkern u1="&#x139;" u2="&#x106;" k="41" />
-<hkern u1="&#x139;" u2="&#xdd;" k="61" />
-<hkern u1="&#x139;" u2="&#xdc;" k="20" />
-<hkern u1="&#x139;" u2="&#xdb;" k="20" />
-<hkern u1="&#x139;" u2="&#xda;" k="20" />
-<hkern u1="&#x139;" u2="&#xd9;" k="20" />
-<hkern u1="&#x139;" u2="&#xd8;" k="41" />
-<hkern u1="&#x139;" u2="&#xd6;" k="41" />
-<hkern u1="&#x139;" u2="&#xd5;" k="41" />
-<hkern u1="&#x139;" u2="&#xd4;" k="41" />
-<hkern u1="&#x139;" u2="&#xd3;" k="41" />
-<hkern u1="&#x139;" u2="&#xd2;" k="41" />
-<hkern u1="&#x139;" u2="&#xc7;" k="41" />
-<hkern u1="&#x139;" u2="Y" k="61" />
-<hkern u1="&#x139;" u2="W" k="41" />
-<hkern u1="&#x139;" u2="V" k="41" />
-<hkern u1="&#x139;" u2="U" k="20" />
-<hkern u1="&#x139;" u2="T" k="41" />
-<hkern u1="&#x139;" u2="Q" k="41" />
-<hkern u1="&#x139;" u2="O" k="41" />
-<hkern u1="&#x139;" u2="G" k="41" />
-<hkern u1="&#x139;" u2="C" k="41" />
-<hkern u1="&#x139;" u2="&#x27;" k="164" />
-<hkern u1="&#x139;" u2="&#x22;" k="164" />
-<hkern u1="&#x13b;" u2="&#x201d;" k="164" />
-<hkern u1="&#x13b;" u2="&#x2019;" k="164" />
-<hkern u1="&#x13b;" u2="&#x1ef8;" k="61" />
-<hkern u1="&#x13b;" u2="&#x1ef6;" k="61" />
-<hkern u1="&#x13b;" u2="&#x1ef4;" k="61" />
-<hkern u1="&#x13b;" u2="&#x1ef2;" k="61" />
-<hkern u1="&#x13b;" u2="&#x1ef0;" k="20" />
-<hkern u1="&#x13b;" u2="&#x1eee;" k="20" />
-<hkern u1="&#x13b;" u2="&#x1eec;" k="20" />
-<hkern u1="&#x13b;" u2="&#x1eea;" k="20" />
-<hkern u1="&#x13b;" u2="&#x1ee8;" k="20" />
-<hkern u1="&#x13b;" u2="&#x1ee6;" k="20" />
-<hkern u1="&#x13b;" u2="&#x1ee4;" k="20" />
-<hkern u1="&#x13b;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1e84;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1e82;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1e80;" k="41" />
-<hkern u1="&#x13b;" u2="&#x21a;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1af;" k="20" />
-<hkern u1="&#x13b;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x13b;" u2="&#x178;" k="61" />
-<hkern u1="&#x13b;" u2="&#x176;" k="61" />
-<hkern u1="&#x13b;" u2="&#x174;" k="41" />
-<hkern u1="&#x13b;" u2="&#x172;" k="20" />
-<hkern u1="&#x13b;" u2="&#x170;" k="20" />
-<hkern u1="&#x13b;" u2="&#x16e;" k="20" />
-<hkern u1="&#x13b;" u2="&#x16c;" k="20" />
-<hkern u1="&#x13b;" u2="&#x16a;" k="20" />
-<hkern u1="&#x13b;" u2="&#x168;" k="20" />
-<hkern u1="&#x13b;" u2="&#x164;" k="41" />
-<hkern u1="&#x13b;" u2="&#x162;" k="41" />
-<hkern u1="&#x13b;" u2="&#x152;" k="41" />
-<hkern u1="&#x13b;" u2="&#x150;" k="41" />
-<hkern u1="&#x13b;" u2="&#x14e;" k="41" />
-<hkern u1="&#x13b;" u2="&#x14c;" k="41" />
-<hkern u1="&#x13b;" u2="&#x122;" k="41" />
-<hkern u1="&#x13b;" u2="&#x120;" k="41" />
-<hkern u1="&#x13b;" u2="&#x11e;" k="41" />
-<hkern u1="&#x13b;" u2="&#x11c;" k="41" />
-<hkern u1="&#x13b;" u2="&#x10c;" k="41" />
-<hkern u1="&#x13b;" u2="&#x10a;" k="41" />
-<hkern u1="&#x13b;" u2="&#x108;" k="41" />
-<hkern u1="&#x13b;" u2="&#x106;" k="41" />
-<hkern u1="&#x13b;" u2="&#xdd;" k="61" />
-<hkern u1="&#x13b;" u2="&#xdc;" k="20" />
-<hkern u1="&#x13b;" u2="&#xdb;" k="20" />
-<hkern u1="&#x13b;" u2="&#xda;" k="20" />
-<hkern u1="&#x13b;" u2="&#xd9;" k="20" />
-<hkern u1="&#x13b;" u2="&#xd8;" k="41" />
-<hkern u1="&#x13b;" u2="&#xd6;" k="41" />
-<hkern u1="&#x13b;" u2="&#xd5;" k="41" />
-<hkern u1="&#x13b;" u2="&#xd4;" k="41" />
-<hkern u1="&#x13b;" u2="&#xd3;" k="41" />
-<hkern u1="&#x13b;" u2="&#xd2;" k="41" />
-<hkern u1="&#x13b;" u2="&#xc7;" k="41" />
-<hkern u1="&#x13b;" u2="Y" k="61" />
-<hkern u1="&#x13b;" u2="W" k="41" />
-<hkern u1="&#x13b;" u2="V" k="41" />
-<hkern u1="&#x13b;" u2="U" k="20" />
-<hkern u1="&#x13b;" u2="T" k="41" />
-<hkern u1="&#x13b;" u2="Q" k="41" />
-<hkern u1="&#x13b;" u2="O" k="41" />
-<hkern u1="&#x13b;" u2="G" k="41" />
-<hkern u1="&#x13b;" u2="C" k="41" />
-<hkern u1="&#x13b;" u2="&#x27;" k="164" />
-<hkern u1="&#x13b;" u2="&#x22;" k="164" />
-<hkern u1="&#x13d;" u2="&#x201d;" k="164" />
-<hkern u1="&#x13d;" u2="&#x2019;" k="164" />
-<hkern u1="&#x13d;" u2="&#x1ef8;" k="61" />
-<hkern u1="&#x13d;" u2="&#x1ef6;" k="61" />
-<hkern u1="&#x13d;" u2="&#x1ef4;" k="61" />
-<hkern u1="&#x13d;" u2="&#x1ef2;" k="61" />
-<hkern u1="&#x13d;" u2="&#x1ef0;" k="20" />
-<hkern u1="&#x13d;" u2="&#x1eee;" k="20" />
-<hkern u1="&#x13d;" u2="&#x1eec;" k="20" />
-<hkern u1="&#x13d;" u2="&#x1eea;" k="20" />
-<hkern u1="&#x13d;" u2="&#x1ee8;" k="20" />
-<hkern u1="&#x13d;" u2="&#x1ee6;" k="20" />
-<hkern u1="&#x13d;" u2="&#x1ee4;" k="20" />
-<hkern u1="&#x13d;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1e84;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1e82;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1e80;" k="41" />
-<hkern u1="&#x13d;" u2="&#x21a;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1af;" k="20" />
-<hkern u1="&#x13d;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x13d;" u2="&#x178;" k="61" />
-<hkern u1="&#x13d;" u2="&#x176;" k="61" />
-<hkern u1="&#x13d;" u2="&#x174;" k="41" />
-<hkern u1="&#x13d;" u2="&#x172;" k="20" />
-<hkern u1="&#x13d;" u2="&#x170;" k="20" />
-<hkern u1="&#x13d;" u2="&#x16e;" k="20" />
-<hkern u1="&#x13d;" u2="&#x16c;" k="20" />
-<hkern u1="&#x13d;" u2="&#x16a;" k="20" />
-<hkern u1="&#x13d;" u2="&#x168;" k="20" />
-<hkern u1="&#x13d;" u2="&#x164;" k="41" />
-<hkern u1="&#x13d;" u2="&#x162;" k="41" />
-<hkern u1="&#x13d;" u2="&#x152;" k="41" />
-<hkern u1="&#x13d;" u2="&#x150;" k="41" />
-<hkern u1="&#x13d;" u2="&#x14e;" k="41" />
-<hkern u1="&#x13d;" u2="&#x14c;" k="41" />
-<hkern u1="&#x13d;" u2="&#x122;" k="41" />
-<hkern u1="&#x13d;" u2="&#x120;" k="41" />
-<hkern u1="&#x13d;" u2="&#x11e;" k="41" />
-<hkern u1="&#x13d;" u2="&#x11c;" k="41" />
-<hkern u1="&#x13d;" u2="&#x10c;" k="41" />
-<hkern u1="&#x13d;" u2="&#x10a;" k="41" />
-<hkern u1="&#x13d;" u2="&#x108;" k="41" />
-<hkern u1="&#x13d;" u2="&#x106;" k="41" />
-<hkern u1="&#x13d;" u2="&#xdd;" k="61" />
-<hkern u1="&#x13d;" u2="&#xdc;" k="20" />
-<hkern u1="&#x13d;" u2="&#xdb;" k="20" />
-<hkern u1="&#x13d;" u2="&#xda;" k="20" />
-<hkern u1="&#x13d;" u2="&#xd9;" k="20" />
-<hkern u1="&#x13d;" u2="&#xd8;" k="41" />
-<hkern u1="&#x13d;" u2="&#xd6;" k="41" />
-<hkern u1="&#x13d;" u2="&#xd5;" k="41" />
-<hkern u1="&#x13d;" u2="&#xd4;" k="41" />
-<hkern u1="&#x13d;" u2="&#xd3;" k="41" />
-<hkern u1="&#x13d;" u2="&#xd2;" k="41" />
-<hkern u1="&#x13d;" u2="&#xc7;" k="41" />
-<hkern u1="&#x13d;" u2="Y" k="61" />
-<hkern u1="&#x13d;" u2="W" k="41" />
-<hkern u1="&#x13d;" u2="V" k="41" />
-<hkern u1="&#x13d;" u2="U" k="20" />
-<hkern u1="&#x13d;" u2="T" k="41" />
-<hkern u1="&#x13d;" u2="Q" k="41" />
-<hkern u1="&#x13d;" u2="O" k="41" />
-<hkern u1="&#x13d;" u2="G" k="41" />
-<hkern u1="&#x13d;" u2="C" k="41" />
-<hkern u1="&#x13d;" u2="&#x27;" k="164" />
-<hkern u1="&#x13d;" u2="&#x22;" k="164" />
-<hkern u1="&#x13e;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x13e;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x13e;" u2="&#x127;" k="-143" />
-<hkern u1="&#x13e;" u2="&#x125;" k="-61" />
-<hkern u1="&#x13e;" u2="&#x7d;" k="-143" />
-<hkern u1="&#x13e;" u2="l" k="-61" />
-<hkern u1="&#x13e;" u2="k" k="-61" />
-<hkern u1="&#x13e;" u2="h" k="-61" />
-<hkern u1="&#x13e;" u2="b" k="-61" />
-<hkern u1="&#x13e;" u2="]" k="-143" />
-<hkern u1="&#x13e;" u2="&#x3f;" k="-143" />
-<hkern u1="&#x13e;" u2="&#x29;" k="-143" />
-<hkern u1="&#x13e;" u2="&#x27;" k="-82" />
-<hkern u1="&#x13e;" u2="&#x22;" k="-82" />
-<hkern u1="&#x13f;" u2="&#x201d;" k="164" />
-<hkern u1="&#x13f;" u2="&#x2019;" k="164" />
-<hkern u1="&#x13f;" u2="&#x1ef8;" k="61" />
-<hkern u1="&#x13f;" u2="&#x1ef6;" k="61" />
-<hkern u1="&#x13f;" u2="&#x1ef4;" k="61" />
-<hkern u1="&#x13f;" u2="&#x1ef2;" k="61" />
-<hkern u1="&#x13f;" u2="&#x1ef0;" k="20" />
-<hkern u1="&#x13f;" u2="&#x1eee;" k="20" />
-<hkern u1="&#x13f;" u2="&#x1eec;" k="20" />
-<hkern u1="&#x13f;" u2="&#x1eea;" k="20" />
-<hkern u1="&#x13f;" u2="&#x1ee8;" k="20" />
-<hkern u1="&#x13f;" u2="&#x1ee6;" k="20" />
-<hkern u1="&#x13f;" u2="&#x1ee4;" k="20" />
-<hkern u1="&#x13f;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1e84;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1e82;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1e80;" k="41" />
-<hkern u1="&#x13f;" u2="&#x21a;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1af;" k="20" />
-<hkern u1="&#x13f;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x13f;" u2="&#x178;" k="61" />
-<hkern u1="&#x13f;" u2="&#x176;" k="61" />
-<hkern u1="&#x13f;" u2="&#x174;" k="41" />
-<hkern u1="&#x13f;" u2="&#x172;" k="20" />
-<hkern u1="&#x13f;" u2="&#x170;" k="20" />
-<hkern u1="&#x13f;" u2="&#x16e;" k="20" />
-<hkern u1="&#x13f;" u2="&#x16c;" k="20" />
-<hkern u1="&#x13f;" u2="&#x16a;" k="20" />
-<hkern u1="&#x13f;" u2="&#x168;" k="20" />
-<hkern u1="&#x13f;" u2="&#x164;" k="41" />
-<hkern u1="&#x13f;" u2="&#x162;" k="41" />
-<hkern u1="&#x13f;" u2="&#x152;" k="41" />
-<hkern u1="&#x13f;" u2="&#x150;" k="41" />
-<hkern u1="&#x13f;" u2="&#x14e;" k="41" />
-<hkern u1="&#x13f;" u2="&#x14c;" k="41" />
-<hkern u1="&#x13f;" u2="&#x122;" k="41" />
-<hkern u1="&#x13f;" u2="&#x120;" k="41" />
-<hkern u1="&#x13f;" u2="&#x11e;" k="41" />
-<hkern u1="&#x13f;" u2="&#x11c;" k="41" />
-<hkern u1="&#x13f;" u2="&#x10c;" k="41" />
-<hkern u1="&#x13f;" u2="&#x10a;" k="41" />
-<hkern u1="&#x13f;" u2="&#x108;" k="41" />
-<hkern u1="&#x13f;" u2="&#x106;" k="41" />
-<hkern u1="&#x13f;" u2="&#xdd;" k="61" />
-<hkern u1="&#x13f;" u2="&#xdc;" k="20" />
-<hkern u1="&#x13f;" u2="&#xdb;" k="20" />
-<hkern u1="&#x13f;" u2="&#xda;" k="20" />
-<hkern u1="&#x13f;" u2="&#xd9;" k="20" />
-<hkern u1="&#x13f;" u2="&#xd8;" k="41" />
-<hkern u1="&#x13f;" u2="&#xd6;" k="41" />
-<hkern u1="&#x13f;" u2="&#xd5;" k="41" />
-<hkern u1="&#x13f;" u2="&#xd4;" k="41" />
-<hkern u1="&#x13f;" u2="&#xd3;" k="41" />
-<hkern u1="&#x13f;" u2="&#xd2;" k="41" />
-<hkern u1="&#x13f;" u2="&#xc7;" k="41" />
-<hkern u1="&#x13f;" u2="Y" k="61" />
-<hkern u1="&#x13f;" u2="W" k="41" />
-<hkern u1="&#x13f;" u2="V" k="41" />
-<hkern u1="&#x13f;" u2="U" k="20" />
-<hkern u1="&#x13f;" u2="T" k="41" />
-<hkern u1="&#x13f;" u2="Q" k="41" />
-<hkern u1="&#x13f;" u2="O" k="41" />
-<hkern u1="&#x13f;" u2="G" k="41" />
-<hkern u1="&#x13f;" u2="C" k="41" />
-<hkern u1="&#x13f;" u2="&#x27;" k="164" />
-<hkern u1="&#x13f;" u2="&#x22;" k="164" />
-<hkern u1="&#x141;" u2="&#x201d;" k="164" />
-<hkern u1="&#x141;" u2="&#x2019;" k="164" />
-<hkern u1="&#x141;" u2="&#x1ef8;" k="61" />
-<hkern u1="&#x141;" u2="&#x1ef6;" k="61" />
-<hkern u1="&#x141;" u2="&#x1ef4;" k="61" />
-<hkern u1="&#x141;" u2="&#x1ef2;" k="61" />
-<hkern u1="&#x141;" u2="&#x1ef0;" k="20" />
-<hkern u1="&#x141;" u2="&#x1eee;" k="20" />
-<hkern u1="&#x141;" u2="&#x1eec;" k="20" />
-<hkern u1="&#x141;" u2="&#x1eea;" k="20" />
-<hkern u1="&#x141;" u2="&#x1ee8;" k="20" />
-<hkern u1="&#x141;" u2="&#x1ee6;" k="20" />
-<hkern u1="&#x141;" u2="&#x1ee4;" k="20" />
-<hkern u1="&#x141;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x141;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x141;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x141;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x141;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x141;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x141;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x141;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x141;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x141;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x141;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x141;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x141;" u2="&#x1e84;" k="41" />
-<hkern u1="&#x141;" u2="&#x1e82;" k="41" />
-<hkern u1="&#x141;" u2="&#x1e80;" k="41" />
-<hkern u1="&#x141;" u2="&#x21a;" k="41" />
-<hkern u1="&#x141;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x141;" u2="&#x1af;" k="20" />
-<hkern u1="&#x141;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x141;" u2="&#x178;" k="61" />
-<hkern u1="&#x141;" u2="&#x176;" k="61" />
-<hkern u1="&#x141;" u2="&#x174;" k="41" />
-<hkern u1="&#x141;" u2="&#x172;" k="20" />
-<hkern u1="&#x141;" u2="&#x170;" k="20" />
-<hkern u1="&#x141;" u2="&#x16e;" k="20" />
-<hkern u1="&#x141;" u2="&#x16c;" k="20" />
-<hkern u1="&#x141;" u2="&#x16a;" k="20" />
-<hkern u1="&#x141;" u2="&#x168;" k="20" />
-<hkern u1="&#x141;" u2="&#x164;" k="41" />
-<hkern u1="&#x141;" u2="&#x162;" k="41" />
-<hkern u1="&#x141;" u2="&#x152;" k="41" />
-<hkern u1="&#x141;" u2="&#x150;" k="41" />
-<hkern u1="&#x141;" u2="&#x14e;" k="41" />
-<hkern u1="&#x141;" u2="&#x14c;" k="41" />
-<hkern u1="&#x141;" u2="&#x122;" k="41" />
-<hkern u1="&#x141;" u2="&#x120;" k="41" />
-<hkern u1="&#x141;" u2="&#x11e;" k="41" />
-<hkern u1="&#x141;" u2="&#x11c;" k="41" />
-<hkern u1="&#x141;" u2="&#x10c;" k="41" />
-<hkern u1="&#x141;" u2="&#x10a;" k="41" />
-<hkern u1="&#x141;" u2="&#x108;" k="41" />
-<hkern u1="&#x141;" u2="&#x106;" k="41" />
-<hkern u1="&#x141;" u2="&#xdd;" k="61" />
-<hkern u1="&#x141;" u2="&#xdc;" k="20" />
-<hkern u1="&#x141;" u2="&#xdb;" k="20" />
-<hkern u1="&#x141;" u2="&#xda;" k="20" />
-<hkern u1="&#x141;" u2="&#xd9;" k="20" />
-<hkern u1="&#x141;" u2="&#xd8;" k="41" />
-<hkern u1="&#x141;" u2="&#xd6;" k="41" />
-<hkern u1="&#x141;" u2="&#xd5;" k="41" />
-<hkern u1="&#x141;" u2="&#xd4;" k="41" />
-<hkern u1="&#x141;" u2="&#xd3;" k="41" />
-<hkern u1="&#x141;" u2="&#xd2;" k="41" />
-<hkern u1="&#x141;" u2="&#xc7;" k="41" />
-<hkern u1="&#x141;" u2="Y" k="61" />
-<hkern u1="&#x141;" u2="W" k="41" />
-<hkern u1="&#x141;" u2="V" k="41" />
-<hkern u1="&#x141;" u2="U" k="20" />
-<hkern u1="&#x141;" u2="T" k="41" />
-<hkern u1="&#x141;" u2="Q" k="41" />
-<hkern u1="&#x141;" u2="O" k="41" />
-<hkern u1="&#x141;" u2="G" k="41" />
-<hkern u1="&#x141;" u2="C" k="41" />
-<hkern u1="&#x141;" u2="&#x27;" k="164" />
-<hkern u1="&#x141;" u2="&#x22;" k="164" />
-<hkern u1="&#x146;" u2="&#x201d;" k="20" />
-<hkern u1="&#x146;" u2="&#x2019;" k="20" />
-<hkern u1="&#x146;" u2="&#x27;" k="20" />
-<hkern u1="&#x146;" u2="&#x22;" k="20" />
-<hkern u1="&#x14c;" u2="&#x201e;" k="82" />
-<hkern u1="&#x14c;" u2="&#x201a;" k="82" />
-<hkern u1="&#x14c;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#x14c;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#x14c;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#x14c;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#x14c;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#x14c;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#x14c;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#x14c;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#x14c;" u2="&#x1eae;" k="41" />
-<hkern u1="&#x14c;" u2="&#x1eac;" k="41" />
-<hkern u1="&#x14c;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#x14c;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#x14c;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#x14c;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#x14c;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#x14c;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#x14c;" u2="&#x1e84;" k="20" />
-<hkern u1="&#x14c;" u2="&#x1e82;" k="20" />
-<hkern u1="&#x14c;" u2="&#x1e80;" k="20" />
-<hkern u1="&#x14c;" u2="&#x1e00;" k="41" />
-<hkern u1="&#x14c;" u2="&#x405;" k="20" />
-<hkern u1="&#x14c;" u2="&#x21a;" k="61" />
-<hkern u1="&#x14c;" u2="&#x1fa;" k="41" />
-<hkern u1="&#x14c;" u2="&#x17d;" k="20" />
-<hkern u1="&#x14c;" u2="&#x17b;" k="20" />
-<hkern u1="&#x14c;" u2="&#x179;" k="20" />
-<hkern u1="&#x14c;" u2="&#x178;" k="20" />
-<hkern u1="&#x14c;" u2="&#x176;" k="20" />
-<hkern u1="&#x14c;" u2="&#x174;" k="20" />
-<hkern u1="&#x14c;" u2="&#x164;" k="61" />
-<hkern u1="&#x14c;" u2="&#x162;" k="61" />
-<hkern u1="&#x14c;" u2="&#x104;" k="41" />
-<hkern u1="&#x14c;" u2="&#x102;" k="41" />
-<hkern u1="&#x14c;" u2="&#x100;" k="41" />
-<hkern u1="&#x14c;" u2="&#xdd;" k="20" />
-<hkern u1="&#x14c;" u2="&#xc5;" k="41" />
-<hkern u1="&#x14c;" u2="&#xc4;" k="41" />
-<hkern u1="&#x14c;" u2="&#xc3;" k="41" />
-<hkern u1="&#x14c;" u2="&#xc2;" k="41" />
-<hkern u1="&#x14c;" u2="&#xc1;" k="41" />
-<hkern u1="&#x14c;" u2="&#xc0;" k="41" />
-<hkern u1="&#x14c;" u2="Z" k="20" />
-<hkern u1="&#x14c;" u2="Y" k="20" />
-<hkern u1="&#x14c;" u2="X" k="41" />
-<hkern u1="&#x14c;" u2="W" k="20" />
-<hkern u1="&#x14c;" u2="V" k="20" />
-<hkern u1="&#x14c;" u2="T" k="61" />
-<hkern u1="&#x14c;" u2="A" k="41" />
-<hkern u1="&#x14c;" u2="&#x2e;" k="82" />
-<hkern u1="&#x14c;" u2="&#x2c;" k="82" />
-<hkern u1="&#x14e;" u2="&#x201e;" k="82" />
-<hkern u1="&#x14e;" u2="&#x201a;" k="82" />
-<hkern u1="&#x14e;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#x14e;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#x14e;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#x14e;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#x14e;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#x14e;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#x14e;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#x14e;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#x14e;" u2="&#x1eae;" k="41" />
-<hkern u1="&#x14e;" u2="&#x1eac;" k="41" />
-<hkern u1="&#x14e;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#x14e;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#x14e;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#x14e;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#x14e;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#x14e;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#x14e;" u2="&#x1e84;" k="20" />
-<hkern u1="&#x14e;" u2="&#x1e82;" k="20" />
-<hkern u1="&#x14e;" u2="&#x1e80;" k="20" />
-<hkern u1="&#x14e;" u2="&#x1e00;" k="41" />
-<hkern u1="&#x14e;" u2="&#x405;" k="20" />
-<hkern u1="&#x14e;" u2="&#x21a;" k="61" />
-<hkern u1="&#x14e;" u2="&#x1fa;" k="41" />
-<hkern u1="&#x14e;" u2="&#x17d;" k="20" />
-<hkern u1="&#x14e;" u2="&#x17b;" k="20" />
-<hkern u1="&#x14e;" u2="&#x179;" k="20" />
-<hkern u1="&#x14e;" u2="&#x178;" k="20" />
-<hkern u1="&#x14e;" u2="&#x176;" k="20" />
-<hkern u1="&#x14e;" u2="&#x174;" k="20" />
-<hkern u1="&#x14e;" u2="&#x164;" k="61" />
-<hkern u1="&#x14e;" u2="&#x162;" k="61" />
-<hkern u1="&#x14e;" u2="&#x104;" k="41" />
-<hkern u1="&#x14e;" u2="&#x102;" k="41" />
-<hkern u1="&#x14e;" u2="&#x100;" k="41" />
-<hkern u1="&#x14e;" u2="&#xdd;" k="20" />
-<hkern u1="&#x14e;" u2="&#xc5;" k="41" />
-<hkern u1="&#x14e;" u2="&#xc4;" k="41" />
-<hkern u1="&#x14e;" u2="&#xc3;" k="41" />
-<hkern u1="&#x14e;" u2="&#xc2;" k="41" />
-<hkern u1="&#x14e;" u2="&#xc1;" k="41" />
-<hkern u1="&#x14e;" u2="&#xc0;" k="41" />
-<hkern u1="&#x14e;" u2="Z" k="20" />
-<hkern u1="&#x14e;" u2="Y" k="20" />
-<hkern u1="&#x14e;" u2="X" k="41" />
-<hkern u1="&#x14e;" u2="W" k="20" />
-<hkern u1="&#x14e;" u2="V" k="20" />
-<hkern u1="&#x14e;" u2="T" k="61" />
-<hkern u1="&#x14e;" u2="A" k="41" />
-<hkern u1="&#x14e;" u2="&#x2e;" k="82" />
-<hkern u1="&#x14e;" u2="&#x2c;" k="82" />
-<hkern u1="&#x150;" u2="&#x201e;" k="82" />
-<hkern u1="&#x150;" u2="&#x201a;" k="82" />
-<hkern u1="&#x150;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#x150;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#x150;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#x150;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#x150;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#x150;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#x150;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#x150;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#x150;" u2="&#x1eae;" k="41" />
-<hkern u1="&#x150;" u2="&#x1eac;" k="41" />
-<hkern u1="&#x150;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#x150;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#x150;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#x150;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#x150;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#x150;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#x150;" u2="&#x1e84;" k="20" />
-<hkern u1="&#x150;" u2="&#x1e82;" k="20" />
-<hkern u1="&#x150;" u2="&#x1e80;" k="20" />
-<hkern u1="&#x150;" u2="&#x1e00;" k="41" />
-<hkern u1="&#x150;" u2="&#x405;" k="20" />
-<hkern u1="&#x150;" u2="&#x21a;" k="61" />
-<hkern u1="&#x150;" u2="&#x1fa;" k="41" />
-<hkern u1="&#x150;" u2="&#x17d;" k="20" />
-<hkern u1="&#x150;" u2="&#x17b;" k="20" />
-<hkern u1="&#x150;" u2="&#x179;" k="20" />
-<hkern u1="&#x150;" u2="&#x178;" k="20" />
-<hkern u1="&#x150;" u2="&#x176;" k="20" />
-<hkern u1="&#x150;" u2="&#x174;" k="20" />
-<hkern u1="&#x150;" u2="&#x164;" k="61" />
-<hkern u1="&#x150;" u2="&#x162;" k="61" />
-<hkern u1="&#x150;" u2="&#x104;" k="41" />
-<hkern u1="&#x150;" u2="&#x102;" k="41" />
-<hkern u1="&#x150;" u2="&#x100;" k="41" />
-<hkern u1="&#x150;" u2="&#xdd;" k="20" />
-<hkern u1="&#x150;" u2="&#xc5;" k="41" />
-<hkern u1="&#x150;" u2="&#xc4;" k="41" />
-<hkern u1="&#x150;" u2="&#xc3;" k="41" />
-<hkern u1="&#x150;" u2="&#xc2;" k="41" />
-<hkern u1="&#x150;" u2="&#xc1;" k="41" />
-<hkern u1="&#x150;" u2="&#xc0;" k="41" />
-<hkern u1="&#x150;" u2="Z" k="20" />
-<hkern u1="&#x150;" u2="Y" k="20" />
-<hkern u1="&#x150;" u2="X" k="41" />
-<hkern u1="&#x150;" u2="W" k="20" />
-<hkern u1="&#x150;" u2="V" k="20" />
-<hkern u1="&#x150;" u2="T" k="61" />
-<hkern u1="&#x150;" u2="A" k="41" />
-<hkern u1="&#x150;" u2="&#x2e;" k="82" />
-<hkern u1="&#x150;" u2="&#x2c;" k="82" />
-<hkern u1="&#x152;" u2="J" k="-123" />
-<hkern u1="&#x155;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x155;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x155;" u2="&#x1ee3;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ee1;" k="41" />
-<hkern u1="&#x155;" u2="&#x1edf;" k="41" />
-<hkern u1="&#x155;" u2="&#x1edd;" k="41" />
-<hkern u1="&#x155;" u2="&#x1edb;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ed9;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ed7;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ed5;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ed1;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ecf;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ecd;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ec7;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ec5;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ec3;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ebf;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ebd;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ebb;" k="41" />
-<hkern u1="&#x155;" u2="&#x1eb9;" k="41" />
-<hkern u1="&#x155;" u2="&#x1eb7;" k="41" />
-<hkern u1="&#x155;" u2="&#x1eb5;" k="41" />
-<hkern u1="&#x155;" u2="&#x1eb3;" k="41" />
-<hkern u1="&#x155;" u2="&#x1eb1;" k="41" />
-<hkern u1="&#x155;" u2="&#x1eaf;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ead;" k="41" />
-<hkern u1="&#x155;" u2="&#x1eab;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ea9;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ea5;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ea3;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ea1;" k="41" />
-<hkern u1="&#x155;" u2="&#x1e01;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ff;" k="41" />
-<hkern u1="&#x155;" u2="&#x1fd;" k="41" />
-<hkern u1="&#x155;" u2="&#x1fb;" k="41" />
-<hkern u1="&#x155;" u2="&#x1a1;" k="41" />
-<hkern u1="&#x155;" u2="&#x153;" k="41" />
-<hkern u1="&#x155;" u2="&#x151;" k="41" />
-<hkern u1="&#x155;" u2="&#x14f;" k="41" />
-<hkern u1="&#x155;" u2="&#x14d;" k="41" />
-<hkern u1="&#x155;" u2="&#x123;" k="20" />
-<hkern u1="&#x155;" u2="&#x121;" k="20" />
-<hkern u1="&#x155;" u2="&#x11f;" k="20" />
-<hkern u1="&#x155;" u2="&#x11d;" k="20" />
-<hkern u1="&#x155;" u2="&#x11b;" k="41" />
-<hkern u1="&#x155;" u2="&#x119;" k="41" />
-<hkern u1="&#x155;" u2="&#x117;" k="41" />
-<hkern u1="&#x155;" u2="&#x115;" k="41" />
-<hkern u1="&#x155;" u2="&#x113;" k="41" />
-<hkern u1="&#x155;" u2="&#x111;" k="41" />
-<hkern u1="&#x155;" u2="&#x10f;" k="41" />
-<hkern u1="&#x155;" u2="&#x10d;" k="41" />
-<hkern u1="&#x155;" u2="&#x10b;" k="41" />
-<hkern u1="&#x155;" u2="&#x109;" k="41" />
-<hkern u1="&#x155;" u2="&#x107;" k="41" />
-<hkern u1="&#x155;" u2="&#x105;" k="41" />
-<hkern u1="&#x155;" u2="&#x103;" k="41" />
-<hkern u1="&#x155;" u2="&#x101;" k="41" />
-<hkern u1="&#x155;" u2="&#xf8;" k="41" />
-<hkern u1="&#x155;" u2="&#xf6;" k="41" />
-<hkern u1="&#x155;" u2="&#xf5;" k="41" />
-<hkern u1="&#x155;" u2="&#xf4;" k="41" />
-<hkern u1="&#x155;" u2="&#xf3;" k="41" />
-<hkern u1="&#x155;" u2="&#xf2;" k="41" />
-<hkern u1="&#x155;" u2="&#xeb;" k="41" />
-<hkern u1="&#x155;" u2="&#xea;" k="41" />
-<hkern u1="&#x155;" u2="&#xe9;" k="41" />
-<hkern u1="&#x155;" u2="&#xe8;" k="41" />
-<hkern u1="&#x155;" u2="&#xe7;" k="41" />
-<hkern u1="&#x155;" u2="&#xe6;" k="41" />
-<hkern u1="&#x155;" u2="&#xe5;" k="41" />
-<hkern u1="&#x155;" u2="&#xe4;" k="41" />
-<hkern u1="&#x155;" u2="&#xe3;" k="41" />
-<hkern u1="&#x155;" u2="&#xe2;" k="41" />
-<hkern u1="&#x155;" u2="&#xe1;" k="41" />
-<hkern u1="&#x155;" u2="&#xe0;" k="41" />
-<hkern u1="&#x155;" u2="q" k="41" />
-<hkern u1="&#x155;" u2="o" k="41" />
-<hkern u1="&#x155;" u2="g" k="20" />
-<hkern u1="&#x155;" u2="e" k="41" />
-<hkern u1="&#x155;" u2="d" k="41" />
-<hkern u1="&#x155;" u2="c" k="41" />
-<hkern u1="&#x155;" u2="a" k="41" />
-<hkern u1="&#x155;" u2="&#x27;" k="-82" />
-<hkern u1="&#x155;" u2="&#x22;" k="-82" />
-<hkern u1="&#x157;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x157;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x157;" u2="&#x1ee3;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ee1;" k="41" />
-<hkern u1="&#x157;" u2="&#x1edf;" k="41" />
-<hkern u1="&#x157;" u2="&#x1edd;" k="41" />
-<hkern u1="&#x157;" u2="&#x1edb;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ed9;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ed7;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ed5;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ed1;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ecf;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ecd;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ec7;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ec5;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ec3;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ebf;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ebd;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ebb;" k="41" />
-<hkern u1="&#x157;" u2="&#x1eb9;" k="41" />
-<hkern u1="&#x157;" u2="&#x1eb7;" k="41" />
-<hkern u1="&#x157;" u2="&#x1eb5;" k="41" />
-<hkern u1="&#x157;" u2="&#x1eb3;" k="41" />
-<hkern u1="&#x157;" u2="&#x1eb1;" k="41" />
-<hkern u1="&#x157;" u2="&#x1eaf;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ead;" k="41" />
-<hkern u1="&#x157;" u2="&#x1eab;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ea9;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ea5;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ea3;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ea1;" k="41" />
-<hkern u1="&#x157;" u2="&#x1e01;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ff;" k="41" />
-<hkern u1="&#x157;" u2="&#x1fd;" k="41" />
-<hkern u1="&#x157;" u2="&#x1fb;" k="41" />
-<hkern u1="&#x157;" u2="&#x1a1;" k="41" />
-<hkern u1="&#x157;" u2="&#x153;" k="41" />
-<hkern u1="&#x157;" u2="&#x151;" k="41" />
-<hkern u1="&#x157;" u2="&#x14f;" k="41" />
-<hkern u1="&#x157;" u2="&#x14d;" k="41" />
-<hkern u1="&#x157;" u2="&#x123;" k="20" />
-<hkern u1="&#x157;" u2="&#x121;" k="20" />
-<hkern u1="&#x157;" u2="&#x11f;" k="20" />
-<hkern u1="&#x157;" u2="&#x11d;" k="20" />
-<hkern u1="&#x157;" u2="&#x11b;" k="41" />
-<hkern u1="&#x157;" u2="&#x119;" k="41" />
-<hkern u1="&#x157;" u2="&#x117;" k="41" />
-<hkern u1="&#x157;" u2="&#x115;" k="41" />
-<hkern u1="&#x157;" u2="&#x113;" k="41" />
-<hkern u1="&#x157;" u2="&#x111;" k="41" />
-<hkern u1="&#x157;" u2="&#x10f;" k="41" />
-<hkern u1="&#x157;" u2="&#x10d;" k="41" />
-<hkern u1="&#x157;" u2="&#x10b;" k="41" />
-<hkern u1="&#x157;" u2="&#x109;" k="41" />
-<hkern u1="&#x157;" u2="&#x107;" k="41" />
-<hkern u1="&#x157;" u2="&#x105;" k="41" />
-<hkern u1="&#x157;" u2="&#x103;" k="41" />
-<hkern u1="&#x157;" u2="&#x101;" k="41" />
-<hkern u1="&#x157;" u2="&#xf8;" k="41" />
-<hkern u1="&#x157;" u2="&#xf6;" k="41" />
-<hkern u1="&#x157;" u2="&#xf5;" k="41" />
-<hkern u1="&#x157;" u2="&#xf4;" k="41" />
-<hkern u1="&#x157;" u2="&#xf3;" k="41" />
-<hkern u1="&#x157;" u2="&#xf2;" k="41" />
-<hkern u1="&#x157;" u2="&#xeb;" k="41" />
-<hkern u1="&#x157;" u2="&#xea;" k="41" />
-<hkern u1="&#x157;" u2="&#xe9;" k="41" />
-<hkern u1="&#x157;" u2="&#xe8;" k="41" />
-<hkern u1="&#x157;" u2="&#xe7;" k="41" />
-<hkern u1="&#x157;" u2="&#xe6;" k="41" />
-<hkern u1="&#x157;" u2="&#xe5;" k="41" />
-<hkern u1="&#x157;" u2="&#xe4;" k="41" />
-<hkern u1="&#x157;" u2="&#xe3;" k="41" />
-<hkern u1="&#x157;" u2="&#xe2;" k="41" />
-<hkern u1="&#x157;" u2="&#xe1;" k="41" />
-<hkern u1="&#x157;" u2="&#xe0;" k="41" />
-<hkern u1="&#x157;" u2="q" k="41" />
-<hkern u1="&#x157;" u2="o" k="41" />
-<hkern u1="&#x157;" u2="g" k="20" />
-<hkern u1="&#x157;" u2="e" k="41" />
-<hkern u1="&#x157;" u2="d" k="41" />
-<hkern u1="&#x157;" u2="c" k="41" />
-<hkern u1="&#x157;" u2="a" k="41" />
-<hkern u1="&#x157;" u2="&#x27;" k="-82" />
-<hkern u1="&#x157;" u2="&#x22;" k="-82" />
-<hkern u1="&#x159;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x159;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x159;" u2="&#x1ee3;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ee1;" k="41" />
-<hkern u1="&#x159;" u2="&#x1edf;" k="41" />
-<hkern u1="&#x159;" u2="&#x1edd;" k="41" />
-<hkern u1="&#x159;" u2="&#x1edb;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ed9;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ed7;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ed5;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ed1;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ecf;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ecd;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ec7;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ec5;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ec3;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ebf;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ebd;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ebb;" k="41" />
-<hkern u1="&#x159;" u2="&#x1eb9;" k="41" />
-<hkern u1="&#x159;" u2="&#x1eb7;" k="41" />
-<hkern u1="&#x159;" u2="&#x1eb5;" k="41" />
-<hkern u1="&#x159;" u2="&#x1eb3;" k="41" />
-<hkern u1="&#x159;" u2="&#x1eb1;" k="41" />
-<hkern u1="&#x159;" u2="&#x1eaf;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ead;" k="41" />
-<hkern u1="&#x159;" u2="&#x1eab;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ea9;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ea5;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ea3;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ea1;" k="41" />
-<hkern u1="&#x159;" u2="&#x1e01;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ff;" k="41" />
-<hkern u1="&#x159;" u2="&#x1fd;" k="41" />
-<hkern u1="&#x159;" u2="&#x1fb;" k="41" />
-<hkern u1="&#x159;" u2="&#x1a1;" k="41" />
-<hkern u1="&#x159;" u2="&#x153;" k="41" />
-<hkern u1="&#x159;" u2="&#x151;" k="41" />
-<hkern u1="&#x159;" u2="&#x14f;" k="41" />
-<hkern u1="&#x159;" u2="&#x14d;" k="41" />
-<hkern u1="&#x159;" u2="&#x123;" k="20" />
-<hkern u1="&#x159;" u2="&#x121;" k="20" />
-<hkern u1="&#x159;" u2="&#x11f;" k="20" />
-<hkern u1="&#x159;" u2="&#x11d;" k="20" />
-<hkern u1="&#x159;" u2="&#x11b;" k="41" />
-<hkern u1="&#x159;" u2="&#x119;" k="41" />
-<hkern u1="&#x159;" u2="&#x117;" k="41" />
-<hkern u1="&#x159;" u2="&#x115;" k="41" />
-<hkern u1="&#x159;" u2="&#x113;" k="41" />
-<hkern u1="&#x159;" u2="&#x111;" k="41" />
-<hkern u1="&#x159;" u2="&#x10f;" k="41" />
-<hkern u1="&#x159;" u2="&#x10d;" k="41" />
-<hkern u1="&#x159;" u2="&#x10b;" k="41" />
-<hkern u1="&#x159;" u2="&#x109;" k="41" />
-<hkern u1="&#x159;" u2="&#x107;" k="41" />
-<hkern u1="&#x159;" u2="&#x105;" k="41" />
-<hkern u1="&#x159;" u2="&#x103;" k="41" />
-<hkern u1="&#x159;" u2="&#x101;" k="41" />
-<hkern u1="&#x159;" u2="&#xf8;" k="41" />
-<hkern u1="&#x159;" u2="&#xf6;" k="41" />
-<hkern u1="&#x159;" u2="&#xf5;" k="41" />
-<hkern u1="&#x159;" u2="&#xf4;" k="41" />
-<hkern u1="&#x159;" u2="&#xf3;" k="41" />
-<hkern u1="&#x159;" u2="&#xf2;" k="41" />
-<hkern u1="&#x159;" u2="&#xeb;" k="41" />
-<hkern u1="&#x159;" u2="&#xea;" k="41" />
-<hkern u1="&#x159;" u2="&#xe9;" k="41" />
-<hkern u1="&#x159;" u2="&#xe8;" k="41" />
-<hkern u1="&#x159;" u2="&#xe7;" k="41" />
-<hkern u1="&#x159;" u2="&#xe6;" k="41" />
-<hkern u1="&#x159;" u2="&#xe5;" k="41" />
-<hkern u1="&#x159;" u2="&#xe4;" k="41" />
-<hkern u1="&#x159;" u2="&#xe3;" k="41" />
-<hkern u1="&#x159;" u2="&#xe2;" k="41" />
-<hkern u1="&#x159;" u2="&#xe1;" k="41" />
-<hkern u1="&#x159;" u2="&#xe0;" k="41" />
-<hkern u1="&#x159;" u2="q" k="41" />
-<hkern u1="&#x159;" u2="o" k="41" />
-<hkern u1="&#x159;" u2="g" k="20" />
-<hkern u1="&#x159;" u2="e" k="41" />
-<hkern u1="&#x159;" u2="d" k="41" />
-<hkern u1="&#x159;" u2="c" k="41" />
-<hkern u1="&#x159;" u2="a" k="41" />
-<hkern u1="&#x159;" u2="&#x27;" k="-82" />
-<hkern u1="&#x159;" u2="&#x22;" k="-82" />
-<hkern u1="&#x162;" u2="&#x201e;" k="123" />
-<hkern u1="&#x162;" u2="&#x201a;" k="123" />
-<hkern u1="&#x162;" u2="&#x2015;" k="82" />
-<hkern u1="&#x162;" u2="&#x2014;" k="82" />
-<hkern u1="&#x162;" u2="&#x2013;" k="82" />
-<hkern u1="&#x162;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x162;" u2="&#x1ef1;" k="102" />
-<hkern u1="&#x162;" u2="&#x1eef;" k="102" />
-<hkern u1="&#x162;" u2="&#x1eed;" k="102" />
-<hkern u1="&#x162;" u2="&#x1eeb;" k="102" />
-<hkern u1="&#x162;" u2="&#x1ee9;" k="102" />
-<hkern u1="&#x162;" u2="&#x1ee7;" k="102" />
-<hkern u1="&#x162;" u2="&#x1ee5;" k="102" />
-<hkern u1="&#x162;" u2="&#x1ee3;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x162;" u2="&#x1ee1;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x162;" u2="&#x1edf;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x162;" u2="&#x1edd;" k="143" />
-<hkern u1="&#x162;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x162;" u2="&#x1edb;" k="143" />
-<hkern u1="&#x162;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x162;" u2="&#x1ed9;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x162;" u2="&#x1ed7;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x162;" u2="&#x1ed5;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x162;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x162;" u2="&#x1ed1;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x162;" u2="&#x1ecf;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x162;" u2="&#x1ecd;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x162;" u2="&#x1ec7;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ec5;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ec3;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ebf;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ebd;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ebb;" k="143" />
-<hkern u1="&#x162;" u2="&#x1eb9;" k="143" />
-<hkern u1="&#x162;" u2="&#x1eb7;" k="164" />
-<hkern u1="&#x162;" u2="&#x1eb6;" k="143" />
-<hkern u1="&#x162;" u2="&#x1eb5;" k="164" />
-<hkern u1="&#x162;" u2="&#x1eb4;" k="143" />
-<hkern u1="&#x162;" u2="&#x1eb3;" k="164" />
-<hkern u1="&#x162;" u2="&#x1eb2;" k="143" />
-<hkern u1="&#x162;" u2="&#x1eb1;" k="164" />
-<hkern u1="&#x162;" u2="&#x1eb0;" k="143" />
-<hkern u1="&#x162;" u2="&#x1eaf;" k="164" />
-<hkern u1="&#x162;" u2="&#x1eae;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ead;" k="164" />
-<hkern u1="&#x162;" u2="&#x1eac;" k="143" />
-<hkern u1="&#x162;" u2="&#x1eab;" k="164" />
-<hkern u1="&#x162;" u2="&#x1eaa;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ea9;" k="164" />
-<hkern u1="&#x162;" u2="&#x1ea8;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ea6;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ea5;" k="164" />
-<hkern u1="&#x162;" u2="&#x1ea4;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ea3;" k="164" />
-<hkern u1="&#x162;" u2="&#x1ea2;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ea1;" k="164" />
-<hkern u1="&#x162;" u2="&#x1ea0;" k="143" />
-<hkern u1="&#x162;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x162;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x162;" u2="&#x1e3f;" k="102" />
-<hkern u1="&#x162;" u2="&#x1e01;" k="164" />
-<hkern u1="&#x162;" u2="&#x1e00;" k="143" />
-<hkern u1="&#x162;" u2="&#x21a;" k="-41" />
-<hkern u1="&#x162;" u2="&#x219;" k="123" />
-<hkern u1="&#x162;" u2="&#x1ff;" k="143" />
-<hkern u1="&#x162;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x162;" u2="&#x1fd;" k="164" />
-<hkern u1="&#x162;" u2="&#x1fb;" k="164" />
-<hkern u1="&#x162;" u2="&#x1fa;" k="143" />
-<hkern u1="&#x162;" u2="&#x1b0;" k="102" />
-<hkern u1="&#x162;" u2="&#x1a1;" k="143" />
-<hkern u1="&#x162;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x162;" u2="&#x17e;" k="82" />
-<hkern u1="&#x162;" u2="&#x17c;" k="82" />
-<hkern u1="&#x162;" u2="&#x17a;" k="82" />
-<hkern u1="&#x162;" u2="&#x175;" k="41" />
-<hkern u1="&#x162;" u2="&#x173;" k="102" />
-<hkern u1="&#x162;" u2="&#x171;" k="102" />
-<hkern u1="&#x162;" u2="&#x16f;" k="102" />
-<hkern u1="&#x162;" u2="&#x16d;" k="102" />
-<hkern u1="&#x162;" u2="&#x16b;" k="102" />
-<hkern u1="&#x162;" u2="&#x169;" k="102" />
-<hkern u1="&#x162;" u2="&#x164;" k="-41" />
-<hkern u1="&#x162;" u2="&#x162;" k="-41" />
-<hkern u1="&#x162;" u2="&#x15f;" k="123" />
-<hkern u1="&#x162;" u2="&#x15b;" k="123" />
-<hkern u1="&#x162;" u2="&#x157;" k="102" />
-<hkern u1="&#x162;" u2="&#x155;" k="102" />
-<hkern u1="&#x162;" u2="&#x153;" k="143" />
-<hkern u1="&#x162;" u2="&#x152;" k="41" />
-<hkern u1="&#x162;" u2="&#x151;" k="143" />
-<hkern u1="&#x162;" u2="&#x150;" k="41" />
-<hkern u1="&#x162;" u2="&#x14f;" k="143" />
-<hkern u1="&#x162;" u2="&#x14e;" k="41" />
-<hkern u1="&#x162;" u2="&#x14d;" k="143" />
-<hkern u1="&#x162;" u2="&#x14c;" k="41" />
-<hkern u1="&#x162;" u2="&#x14b;" k="102" />
-<hkern u1="&#x162;" u2="&#x146;" k="102" />
-<hkern u1="&#x162;" u2="&#x144;" k="102" />
-<hkern u1="&#x162;" u2="&#x138;" k="102" />
-<hkern u1="&#x162;" u2="&#x123;" k="143" />
-<hkern u1="&#x162;" u2="&#x122;" k="41" />
-<hkern u1="&#x162;" u2="&#x121;" k="143" />
-<hkern u1="&#x162;" u2="&#x120;" k="41" />
-<hkern u1="&#x162;" u2="&#x11f;" k="143" />
-<hkern u1="&#x162;" u2="&#x11e;" k="41" />
-<hkern u1="&#x162;" u2="&#x11d;" k="143" />
-<hkern u1="&#x162;" u2="&#x11c;" k="41" />
-<hkern u1="&#x162;" u2="&#x11b;" k="143" />
-<hkern u1="&#x162;" u2="&#x119;" k="143" />
-<hkern u1="&#x162;" u2="&#x117;" k="143" />
-<hkern u1="&#x162;" u2="&#x115;" k="143" />
-<hkern u1="&#x162;" u2="&#x113;" k="143" />
-<hkern u1="&#x162;" u2="&#x111;" k="143" />
-<hkern u1="&#x162;" u2="&#x10f;" k="143" />
-<hkern u1="&#x162;" u2="&#x10d;" k="143" />
-<hkern u1="&#x162;" u2="&#x10c;" k="41" />
-<hkern u1="&#x162;" u2="&#x10b;" k="143" />
-<hkern u1="&#x162;" u2="&#x10a;" k="41" />
-<hkern u1="&#x162;" u2="&#x109;" k="143" />
-<hkern u1="&#x162;" u2="&#x108;" k="41" />
-<hkern u1="&#x162;" u2="&#x107;" k="143" />
-<hkern u1="&#x162;" u2="&#x106;" k="41" />
-<hkern u1="&#x162;" u2="&#x105;" k="164" />
-<hkern u1="&#x162;" u2="&#x104;" k="143" />
-<hkern u1="&#x162;" u2="&#x103;" k="164" />
-<hkern u1="&#x162;" u2="&#x102;" k="143" />
-<hkern u1="&#x162;" u2="&#x101;" k="164" />
-<hkern u1="&#x162;" u2="&#x100;" k="143" />
-<hkern u1="&#x162;" u2="&#xfd;" k="41" />
-<hkern u1="&#x162;" u2="&#xfc;" k="102" />
-<hkern u1="&#x162;" u2="&#xfb;" k="102" />
-<hkern u1="&#x162;" u2="&#xfa;" k="102" />
-<hkern u1="&#x162;" u2="&#xf9;" k="102" />
-<hkern u1="&#x162;" u2="&#xf8;" k="143" />
-<hkern u1="&#x162;" u2="&#xf6;" k="143" />
-<hkern u1="&#x162;" u2="&#xf5;" k="143" />
-<hkern u1="&#x162;" u2="&#xf4;" k="143" />
-<hkern u1="&#x162;" u2="&#xf3;" k="143" />
-<hkern u1="&#x162;" u2="&#xf2;" k="143" />
-<hkern u1="&#x162;" u2="&#xeb;" k="143" />
-<hkern u1="&#x162;" u2="&#xea;" k="143" />
-<hkern u1="&#x162;" u2="&#xe9;" k="143" />
-<hkern u1="&#x162;" u2="&#xe8;" k="143" />
-<hkern u1="&#x162;" u2="&#xe7;" k="143" />
-<hkern u1="&#x162;" u2="&#xe6;" k="164" />
-<hkern u1="&#x162;" u2="&#xe5;" k="164" />
-<hkern u1="&#x162;" u2="&#xe4;" k="164" />
-<hkern u1="&#x162;" u2="&#xe3;" k="164" />
-<hkern u1="&#x162;" u2="&#xe2;" k="164" />
-<hkern u1="&#x162;" u2="&#xe1;" k="164" />
-<hkern u1="&#x162;" u2="&#xe0;" k="143" />
-<hkern u1="&#x162;" u2="&#xd8;" k="41" />
-<hkern u1="&#x162;" u2="&#xd6;" k="41" />
-<hkern u1="&#x162;" u2="&#xd5;" k="41" />
-<hkern u1="&#x162;" u2="&#xd4;" k="41" />
-<hkern u1="&#x162;" u2="&#xd3;" k="41" />
-<hkern u1="&#x162;" u2="&#xd2;" k="41" />
-<hkern u1="&#x162;" u2="&#xc7;" k="41" />
-<hkern u1="&#x162;" u2="&#xc5;" k="143" />
-<hkern u1="&#x162;" u2="&#xc4;" k="143" />
-<hkern u1="&#x162;" u2="&#xc3;" k="143" />
-<hkern u1="&#x162;" u2="&#xc2;" k="143" />
-<hkern u1="&#x162;" u2="&#xc1;" k="143" />
-<hkern u1="&#x162;" u2="&#xc0;" k="143" />
-<hkern u1="&#x162;" u2="z" k="82" />
-<hkern u1="&#x162;" u2="y" k="41" />
-<hkern u1="&#x162;" u2="x" k="41" />
-<hkern u1="&#x162;" u2="w" k="41" />
-<hkern u1="&#x162;" u2="v" k="41" />
-<hkern u1="&#x162;" u2="u" k="102" />
-<hkern u1="&#x162;" u2="s" k="123" />
-<hkern u1="&#x162;" u2="r" k="102" />
-<hkern u1="&#x162;" u2="q" k="143" />
-<hkern u1="&#x162;" u2="p" k="102" />
-<hkern u1="&#x162;" u2="o" k="143" />
-<hkern u1="&#x162;" u2="n" k="102" />
-<hkern u1="&#x162;" u2="m" k="102" />
-<hkern u1="&#x162;" u2="g" k="143" />
-<hkern u1="&#x162;" u2="e" k="143" />
-<hkern u1="&#x162;" u2="d" k="143" />
-<hkern u1="&#x162;" u2="c" k="143" />
-<hkern u1="&#x162;" u2="a" k="164" />
-<hkern u1="&#x162;" u2="T" k="-41" />
-<hkern u1="&#x162;" u2="Q" k="41" />
-<hkern u1="&#x162;" u2="O" k="41" />
-<hkern u1="&#x162;" u2="G" k="41" />
-<hkern u1="&#x162;" u2="C" k="41" />
-<hkern u1="&#x162;" u2="A" k="143" />
-<hkern u1="&#x162;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x162;" u2="&#x2e;" k="123" />
-<hkern u1="&#x162;" u2="&#x2d;" k="82" />
-<hkern u1="&#x162;" u2="&#x2c;" k="123" />
-<hkern u1="&#x163;" u2="&#x201d;" k="-41" />
-<hkern u1="&#x163;" u2="&#x2019;" k="-41" />
-<hkern u1="&#x163;" u2="&#x27;" k="-41" />
-<hkern u1="&#x163;" u2="&#x22;" k="-41" />
-<hkern u1="&#x164;" u2="&#x201e;" k="123" />
-<hkern u1="&#x164;" u2="&#x201a;" k="123" />
-<hkern u1="&#x164;" u2="&#x2015;" k="82" />
-<hkern u1="&#x164;" u2="&#x2014;" k="82" />
-<hkern u1="&#x164;" u2="&#x2013;" k="82" />
-<hkern u1="&#x164;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x164;" u2="&#x1ef1;" k="102" />
-<hkern u1="&#x164;" u2="&#x1eef;" k="102" />
-<hkern u1="&#x164;" u2="&#x1eed;" k="102" />
-<hkern u1="&#x164;" u2="&#x1eeb;" k="102" />
-<hkern u1="&#x164;" u2="&#x1ee9;" k="102" />
-<hkern u1="&#x164;" u2="&#x1ee7;" k="102" />
-<hkern u1="&#x164;" u2="&#x1ee5;" k="102" />
-<hkern u1="&#x164;" u2="&#x1ee3;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x164;" u2="&#x1ee1;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x164;" u2="&#x1edf;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x164;" u2="&#x1edd;" k="143" />
-<hkern u1="&#x164;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x164;" u2="&#x1edb;" k="143" />
-<hkern u1="&#x164;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x164;" u2="&#x1ed9;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x164;" u2="&#x1ed7;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x164;" u2="&#x1ed5;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x164;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x164;" u2="&#x1ed1;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x164;" u2="&#x1ecf;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x164;" u2="&#x1ecd;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x164;" u2="&#x1ec7;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ec5;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ec3;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ebf;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ebd;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ebb;" k="143" />
-<hkern u1="&#x164;" u2="&#x1eb9;" k="143" />
-<hkern u1="&#x164;" u2="&#x1eb7;" k="164" />
-<hkern u1="&#x164;" u2="&#x1eb6;" k="143" />
-<hkern u1="&#x164;" u2="&#x1eb5;" k="164" />
-<hkern u1="&#x164;" u2="&#x1eb4;" k="143" />
-<hkern u1="&#x164;" u2="&#x1eb3;" k="164" />
-<hkern u1="&#x164;" u2="&#x1eb2;" k="143" />
-<hkern u1="&#x164;" u2="&#x1eb1;" k="164" />
-<hkern u1="&#x164;" u2="&#x1eb0;" k="143" />
-<hkern u1="&#x164;" u2="&#x1eaf;" k="164" />
-<hkern u1="&#x164;" u2="&#x1eae;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ead;" k="164" />
-<hkern u1="&#x164;" u2="&#x1eac;" k="143" />
-<hkern u1="&#x164;" u2="&#x1eab;" k="164" />
-<hkern u1="&#x164;" u2="&#x1eaa;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ea9;" k="164" />
-<hkern u1="&#x164;" u2="&#x1ea8;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ea6;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ea5;" k="164" />
-<hkern u1="&#x164;" u2="&#x1ea4;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ea3;" k="164" />
-<hkern u1="&#x164;" u2="&#x1ea2;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ea1;" k="164" />
-<hkern u1="&#x164;" u2="&#x1ea0;" k="143" />
-<hkern u1="&#x164;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x164;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x164;" u2="&#x1e3f;" k="102" />
-<hkern u1="&#x164;" u2="&#x1e01;" k="164" />
-<hkern u1="&#x164;" u2="&#x1e00;" k="143" />
-<hkern u1="&#x164;" u2="&#x21a;" k="-41" />
-<hkern u1="&#x164;" u2="&#x219;" k="123" />
-<hkern u1="&#x164;" u2="&#x1ff;" k="143" />
-<hkern u1="&#x164;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x164;" u2="&#x1fd;" k="164" />
-<hkern u1="&#x164;" u2="&#x1fb;" k="164" />
-<hkern u1="&#x164;" u2="&#x1fa;" k="143" />
-<hkern u1="&#x164;" u2="&#x1b0;" k="102" />
-<hkern u1="&#x164;" u2="&#x1a1;" k="143" />
-<hkern u1="&#x164;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x164;" u2="&#x17e;" k="82" />
-<hkern u1="&#x164;" u2="&#x17c;" k="82" />
-<hkern u1="&#x164;" u2="&#x17a;" k="82" />
-<hkern u1="&#x164;" u2="&#x175;" k="41" />
-<hkern u1="&#x164;" u2="&#x173;" k="102" />
-<hkern u1="&#x164;" u2="&#x171;" k="102" />
-<hkern u1="&#x164;" u2="&#x16f;" k="102" />
-<hkern u1="&#x164;" u2="&#x16d;" k="102" />
-<hkern u1="&#x164;" u2="&#x16b;" k="102" />
-<hkern u1="&#x164;" u2="&#x169;" k="102" />
-<hkern u1="&#x164;" u2="&#x164;" k="-41" />
-<hkern u1="&#x164;" u2="&#x162;" k="-41" />
-<hkern u1="&#x164;" u2="&#x15f;" k="123" />
-<hkern u1="&#x164;" u2="&#x15b;" k="123" />
-<hkern u1="&#x164;" u2="&#x157;" k="102" />
-<hkern u1="&#x164;" u2="&#x155;" k="102" />
-<hkern u1="&#x164;" u2="&#x153;" k="143" />
-<hkern u1="&#x164;" u2="&#x152;" k="41" />
-<hkern u1="&#x164;" u2="&#x151;" k="143" />
-<hkern u1="&#x164;" u2="&#x150;" k="41" />
-<hkern u1="&#x164;" u2="&#x14f;" k="143" />
-<hkern u1="&#x164;" u2="&#x14e;" k="41" />
-<hkern u1="&#x164;" u2="&#x14d;" k="143" />
-<hkern u1="&#x164;" u2="&#x14c;" k="41" />
-<hkern u1="&#x164;" u2="&#x14b;" k="102" />
-<hkern u1="&#x164;" u2="&#x146;" k="102" />
-<hkern u1="&#x164;" u2="&#x144;" k="102" />
-<hkern u1="&#x164;" u2="&#x138;" k="102" />
-<hkern u1="&#x164;" u2="&#x123;" k="143" />
-<hkern u1="&#x164;" u2="&#x122;" k="41" />
-<hkern u1="&#x164;" u2="&#x121;" k="143" />
-<hkern u1="&#x164;" u2="&#x120;" k="41" />
-<hkern u1="&#x164;" u2="&#x11f;" k="143" />
-<hkern u1="&#x164;" u2="&#x11e;" k="41" />
-<hkern u1="&#x164;" u2="&#x11d;" k="143" />
-<hkern u1="&#x164;" u2="&#x11c;" k="41" />
-<hkern u1="&#x164;" u2="&#x11b;" k="143" />
-<hkern u1="&#x164;" u2="&#x119;" k="143" />
-<hkern u1="&#x164;" u2="&#x117;" k="143" />
-<hkern u1="&#x164;" u2="&#x115;" k="143" />
-<hkern u1="&#x164;" u2="&#x113;" k="143" />
-<hkern u1="&#x164;" u2="&#x111;" k="143" />
-<hkern u1="&#x164;" u2="&#x10f;" k="143" />
-<hkern u1="&#x164;" u2="&#x10d;" k="143" />
-<hkern u1="&#x164;" u2="&#x10c;" k="41" />
-<hkern u1="&#x164;" u2="&#x10b;" k="143" />
-<hkern u1="&#x164;" u2="&#x10a;" k="41" />
-<hkern u1="&#x164;" u2="&#x109;" k="143" />
-<hkern u1="&#x164;" u2="&#x108;" k="41" />
-<hkern u1="&#x164;" u2="&#x107;" k="143" />
-<hkern u1="&#x164;" u2="&#x106;" k="41" />
-<hkern u1="&#x164;" u2="&#x105;" k="164" />
-<hkern u1="&#x164;" u2="&#x104;" k="143" />
-<hkern u1="&#x164;" u2="&#x103;" k="164" />
-<hkern u1="&#x164;" u2="&#x102;" k="143" />
-<hkern u1="&#x164;" u2="&#x101;" k="164" />
-<hkern u1="&#x164;" u2="&#x100;" k="143" />
-<hkern u1="&#x164;" u2="&#xfd;" k="41" />
-<hkern u1="&#x164;" u2="&#xfc;" k="102" />
-<hkern u1="&#x164;" u2="&#xfb;" k="102" />
-<hkern u1="&#x164;" u2="&#xfa;" k="102" />
-<hkern u1="&#x164;" u2="&#xf9;" k="102" />
-<hkern u1="&#x164;" u2="&#xf8;" k="143" />
-<hkern u1="&#x164;" u2="&#xf6;" k="143" />
-<hkern u1="&#x164;" u2="&#xf5;" k="143" />
-<hkern u1="&#x164;" u2="&#xf4;" k="143" />
-<hkern u1="&#x164;" u2="&#xf3;" k="143" />
-<hkern u1="&#x164;" u2="&#xf2;" k="143" />
-<hkern u1="&#x164;" u2="&#xeb;" k="143" />
-<hkern u1="&#x164;" u2="&#xea;" k="143" />
-<hkern u1="&#x164;" u2="&#xe9;" k="143" />
-<hkern u1="&#x164;" u2="&#xe8;" k="143" />
-<hkern u1="&#x164;" u2="&#xe7;" k="143" />
-<hkern u1="&#x164;" u2="&#xe6;" k="164" />
-<hkern u1="&#x164;" u2="&#xe5;" k="164" />
-<hkern u1="&#x164;" u2="&#xe4;" k="164" />
-<hkern u1="&#x164;" u2="&#xe3;" k="164" />
-<hkern u1="&#x164;" u2="&#xe2;" k="164" />
-<hkern u1="&#x164;" u2="&#xe1;" k="164" />
-<hkern u1="&#x164;" u2="&#xe0;" k="143" />
-<hkern u1="&#x164;" u2="&#xd8;" k="41" />
-<hkern u1="&#x164;" u2="&#xd6;" k="41" />
-<hkern u1="&#x164;" u2="&#xd5;" k="41" />
-<hkern u1="&#x164;" u2="&#xd4;" k="41" />
-<hkern u1="&#x164;" u2="&#xd3;" k="41" />
-<hkern u1="&#x164;" u2="&#xd2;" k="41" />
-<hkern u1="&#x164;" u2="&#xc7;" k="41" />
-<hkern u1="&#x164;" u2="&#xc5;" k="143" />
-<hkern u1="&#x164;" u2="&#xc4;" k="143" />
-<hkern u1="&#x164;" u2="&#xc3;" k="143" />
-<hkern u1="&#x164;" u2="&#xc2;" k="143" />
-<hkern u1="&#x164;" u2="&#xc1;" k="143" />
-<hkern u1="&#x164;" u2="&#xc0;" k="143" />
-<hkern u1="&#x164;" u2="z" k="82" />
-<hkern u1="&#x164;" u2="y" k="41" />
-<hkern u1="&#x164;" u2="x" k="41" />
-<hkern u1="&#x164;" u2="w" k="41" />
-<hkern u1="&#x164;" u2="v" k="41" />
-<hkern u1="&#x164;" u2="u" k="102" />
-<hkern u1="&#x164;" u2="s" k="123" />
-<hkern u1="&#x164;" u2="r" k="102" />
-<hkern u1="&#x164;" u2="q" k="143" />
-<hkern u1="&#x164;" u2="p" k="102" />
-<hkern u1="&#x164;" u2="o" k="143" />
-<hkern u1="&#x164;" u2="n" k="102" />
-<hkern u1="&#x164;" u2="m" k="102" />
-<hkern u1="&#x164;" u2="g" k="143" />
-<hkern u1="&#x164;" u2="e" k="143" />
-<hkern u1="&#x164;" u2="d" k="143" />
-<hkern u1="&#x164;" u2="c" k="143" />
-<hkern u1="&#x164;" u2="a" k="164" />
-<hkern u1="&#x164;" u2="T" k="-41" />
-<hkern u1="&#x164;" u2="Q" k="41" />
-<hkern u1="&#x164;" u2="O" k="41" />
-<hkern u1="&#x164;" u2="G" k="41" />
-<hkern u1="&#x164;" u2="C" k="41" />
-<hkern u1="&#x164;" u2="A" k="143" />
-<hkern u1="&#x164;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x164;" u2="&#x2e;" k="123" />
-<hkern u1="&#x164;" u2="&#x2d;" k="82" />
-<hkern u1="&#x164;" u2="&#x2c;" k="123" />
-<hkern u1="&#x165;" u2="&#x201d;" k="-41" />
-<hkern u1="&#x165;" u2="&#x2019;" k="-41" />
-<hkern u1="&#x165;" u2="&#x27;" k="-41" />
-<hkern u1="&#x165;" u2="&#x22;" k="-41" />
-<hkern u1="&#x166;" u2="&#x201e;" k="123" />
-<hkern u1="&#x166;" u2="&#x201a;" k="123" />
-<hkern u1="&#x166;" u2="&#x2015;" k="82" />
-<hkern u1="&#x166;" u2="&#x2014;" k="82" />
-<hkern u1="&#x166;" u2="&#x2013;" k="82" />
-<hkern u1="&#x166;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x166;" u2="&#x1ef1;" k="102" />
-<hkern u1="&#x166;" u2="&#x1eef;" k="102" />
-<hkern u1="&#x166;" u2="&#x1eed;" k="102" />
-<hkern u1="&#x166;" u2="&#x1eeb;" k="102" />
-<hkern u1="&#x166;" u2="&#x1ee9;" k="102" />
-<hkern u1="&#x166;" u2="&#x1ee7;" k="102" />
-<hkern u1="&#x166;" u2="&#x1ee5;" k="102" />
-<hkern u1="&#x166;" u2="&#x1ee3;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x166;" u2="&#x1ee1;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x166;" u2="&#x1edf;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x166;" u2="&#x1edd;" k="143" />
-<hkern u1="&#x166;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x166;" u2="&#x1edb;" k="143" />
-<hkern u1="&#x166;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x166;" u2="&#x1ed9;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x166;" u2="&#x1ed7;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x166;" u2="&#x1ed5;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x166;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x166;" u2="&#x1ed1;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x166;" u2="&#x1ecf;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x166;" u2="&#x1ecd;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x166;" u2="&#x1ec7;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ec5;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ec3;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ebf;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ebd;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ebb;" k="143" />
-<hkern u1="&#x166;" u2="&#x1eb9;" k="143" />
-<hkern u1="&#x166;" u2="&#x1eb7;" k="164" />
-<hkern u1="&#x166;" u2="&#x1eb6;" k="143" />
-<hkern u1="&#x166;" u2="&#x1eb5;" k="164" />
-<hkern u1="&#x166;" u2="&#x1eb4;" k="143" />
-<hkern u1="&#x166;" u2="&#x1eb3;" k="164" />
-<hkern u1="&#x166;" u2="&#x1eb2;" k="143" />
-<hkern u1="&#x166;" u2="&#x1eb1;" k="164" />
-<hkern u1="&#x166;" u2="&#x1eb0;" k="143" />
-<hkern u1="&#x166;" u2="&#x1eaf;" k="164" />
-<hkern u1="&#x166;" u2="&#x1eae;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ead;" k="164" />
-<hkern u1="&#x166;" u2="&#x1eac;" k="143" />
-<hkern u1="&#x166;" u2="&#x1eab;" k="164" />
-<hkern u1="&#x166;" u2="&#x1eaa;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ea9;" k="164" />
-<hkern u1="&#x166;" u2="&#x1ea8;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ea6;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ea5;" k="164" />
-<hkern u1="&#x166;" u2="&#x1ea4;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ea3;" k="164" />
-<hkern u1="&#x166;" u2="&#x1ea2;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ea1;" k="164" />
-<hkern u1="&#x166;" u2="&#x1ea0;" k="143" />
-<hkern u1="&#x166;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x166;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x166;" u2="&#x1e3f;" k="102" />
-<hkern u1="&#x166;" u2="&#x1e01;" k="164" />
-<hkern u1="&#x166;" u2="&#x1e00;" k="143" />
-<hkern u1="&#x166;" u2="&#x21a;" k="-41" />
-<hkern u1="&#x166;" u2="&#x219;" k="123" />
-<hkern u1="&#x166;" u2="&#x1ff;" k="143" />
-<hkern u1="&#x166;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x166;" u2="&#x1fd;" k="164" />
-<hkern u1="&#x166;" u2="&#x1fb;" k="164" />
-<hkern u1="&#x166;" u2="&#x1fa;" k="143" />
-<hkern u1="&#x166;" u2="&#x1b0;" k="102" />
-<hkern u1="&#x166;" u2="&#x1a1;" k="143" />
-<hkern u1="&#x166;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x166;" u2="&#x17e;" k="82" />
-<hkern u1="&#x166;" u2="&#x17c;" k="82" />
-<hkern u1="&#x166;" u2="&#x17a;" k="82" />
-<hkern u1="&#x166;" u2="&#x175;" k="41" />
-<hkern u1="&#x166;" u2="&#x173;" k="102" />
-<hkern u1="&#x166;" u2="&#x171;" k="102" />
-<hkern u1="&#x166;" u2="&#x16f;" k="102" />
-<hkern u1="&#x166;" u2="&#x16d;" k="102" />
-<hkern u1="&#x166;" u2="&#x16b;" k="102" />
-<hkern u1="&#x166;" u2="&#x169;" k="102" />
-<hkern u1="&#x166;" u2="&#x164;" k="-41" />
-<hkern u1="&#x166;" u2="&#x162;" k="-41" />
-<hkern u1="&#x166;" u2="&#x15f;" k="123" />
-<hkern u1="&#x166;" u2="&#x15b;" k="123" />
-<hkern u1="&#x166;" u2="&#x157;" k="102" />
-<hkern u1="&#x166;" u2="&#x155;" k="102" />
-<hkern u1="&#x166;" u2="&#x153;" k="143" />
-<hkern u1="&#x166;" u2="&#x152;" k="41" />
-<hkern u1="&#x166;" u2="&#x151;" k="143" />
-<hkern u1="&#x166;" u2="&#x150;" k="41" />
-<hkern u1="&#x166;" u2="&#x14f;" k="143" />
-<hkern u1="&#x166;" u2="&#x14e;" k="41" />
-<hkern u1="&#x166;" u2="&#x14d;" k="143" />
-<hkern u1="&#x166;" u2="&#x14c;" k="41" />
-<hkern u1="&#x166;" u2="&#x14b;" k="102" />
-<hkern u1="&#x166;" u2="&#x146;" k="102" />
-<hkern u1="&#x166;" u2="&#x144;" k="102" />
-<hkern u1="&#x166;" u2="&#x138;" k="102" />
-<hkern u1="&#x166;" u2="&#x123;" k="143" />
-<hkern u1="&#x166;" u2="&#x122;" k="41" />
-<hkern u1="&#x166;" u2="&#x121;" k="143" />
-<hkern u1="&#x166;" u2="&#x120;" k="41" />
-<hkern u1="&#x166;" u2="&#x11f;" k="143" />
-<hkern u1="&#x166;" u2="&#x11e;" k="41" />
-<hkern u1="&#x166;" u2="&#x11d;" k="143" />
-<hkern u1="&#x166;" u2="&#x11c;" k="41" />
-<hkern u1="&#x166;" u2="&#x11b;" k="143" />
-<hkern u1="&#x166;" u2="&#x119;" k="143" />
-<hkern u1="&#x166;" u2="&#x117;" k="143" />
-<hkern u1="&#x166;" u2="&#x115;" k="143" />
-<hkern u1="&#x166;" u2="&#x113;" k="143" />
-<hkern u1="&#x166;" u2="&#x111;" k="143" />
-<hkern u1="&#x166;" u2="&#x10f;" k="143" />
-<hkern u1="&#x166;" u2="&#x10d;" k="143" />
-<hkern u1="&#x166;" u2="&#x10c;" k="41" />
-<hkern u1="&#x166;" u2="&#x10b;" k="143" />
-<hkern u1="&#x166;" u2="&#x10a;" k="41" />
-<hkern u1="&#x166;" u2="&#x109;" k="143" />
-<hkern u1="&#x166;" u2="&#x108;" k="41" />
-<hkern u1="&#x166;" u2="&#x107;" k="143" />
-<hkern u1="&#x166;" u2="&#x106;" k="41" />
-<hkern u1="&#x166;" u2="&#x105;" k="164" />
-<hkern u1="&#x166;" u2="&#x104;" k="143" />
-<hkern u1="&#x166;" u2="&#x103;" k="164" />
-<hkern u1="&#x166;" u2="&#x102;" k="143" />
-<hkern u1="&#x166;" u2="&#x101;" k="164" />
-<hkern u1="&#x166;" u2="&#x100;" k="143" />
-<hkern u1="&#x166;" u2="&#xfd;" k="41" />
-<hkern u1="&#x166;" u2="&#xfc;" k="102" />
-<hkern u1="&#x166;" u2="&#xfb;" k="102" />
-<hkern u1="&#x166;" u2="&#xfa;" k="102" />
-<hkern u1="&#x166;" u2="&#xf9;" k="102" />
-<hkern u1="&#x166;" u2="&#xf8;" k="143" />
-<hkern u1="&#x166;" u2="&#xf6;" k="143" />
-<hkern u1="&#x166;" u2="&#xf5;" k="143" />
-<hkern u1="&#x166;" u2="&#xf4;" k="143" />
-<hkern u1="&#x166;" u2="&#xf3;" k="143" />
-<hkern u1="&#x166;" u2="&#xf2;" k="143" />
-<hkern u1="&#x166;" u2="&#xeb;" k="143" />
-<hkern u1="&#x166;" u2="&#xea;" k="143" />
-<hkern u1="&#x166;" u2="&#xe9;" k="143" />
-<hkern u1="&#x166;" u2="&#xe8;" k="143" />
-<hkern u1="&#x166;" u2="&#xe7;" k="143" />
-<hkern u1="&#x166;" u2="&#xe6;" k="164" />
-<hkern u1="&#x166;" u2="&#xe5;" k="164" />
-<hkern u1="&#x166;" u2="&#xe4;" k="164" />
-<hkern u1="&#x166;" u2="&#xe3;" k="164" />
-<hkern u1="&#x166;" u2="&#xe2;" k="164" />
-<hkern u1="&#x166;" u2="&#xe1;" k="164" />
-<hkern u1="&#x166;" u2="&#xe0;" k="143" />
-<hkern u1="&#x166;" u2="&#xd8;" k="41" />
-<hkern u1="&#x166;" u2="&#xd6;" k="41" />
-<hkern u1="&#x166;" u2="&#xd5;" k="41" />
-<hkern u1="&#x166;" u2="&#xd4;" k="41" />
-<hkern u1="&#x166;" u2="&#xd3;" k="41" />
-<hkern u1="&#x166;" u2="&#xd2;" k="41" />
-<hkern u1="&#x166;" u2="&#xc7;" k="41" />
-<hkern u1="&#x166;" u2="&#xc5;" k="143" />
-<hkern u1="&#x166;" u2="&#xc4;" k="143" />
-<hkern u1="&#x166;" u2="&#xc3;" k="143" />
-<hkern u1="&#x166;" u2="&#xc2;" k="143" />
-<hkern u1="&#x166;" u2="&#xc1;" k="143" />
-<hkern u1="&#x166;" u2="&#xc0;" k="143" />
-<hkern u1="&#x166;" u2="z" k="82" />
-<hkern u1="&#x166;" u2="y" k="41" />
-<hkern u1="&#x166;" u2="x" k="41" />
-<hkern u1="&#x166;" u2="w" k="41" />
-<hkern u1="&#x166;" u2="v" k="41" />
-<hkern u1="&#x166;" u2="u" k="102" />
-<hkern u1="&#x166;" u2="s" k="123" />
-<hkern u1="&#x166;" u2="r" k="102" />
-<hkern u1="&#x166;" u2="q" k="143" />
-<hkern u1="&#x166;" u2="p" k="102" />
-<hkern u1="&#x166;" u2="o" k="143" />
-<hkern u1="&#x166;" u2="n" k="102" />
-<hkern u1="&#x166;" u2="m" k="102" />
-<hkern u1="&#x166;" u2="g" k="143" />
-<hkern u1="&#x166;" u2="e" k="143" />
-<hkern u1="&#x166;" u2="d" k="143" />
-<hkern u1="&#x166;" u2="c" k="143" />
-<hkern u1="&#x166;" u2="a" k="164" />
-<hkern u1="&#x166;" u2="T" k="-41" />
-<hkern u1="&#x166;" u2="Q" k="41" />
-<hkern u1="&#x166;" u2="O" k="41" />
-<hkern u1="&#x166;" u2="G" k="41" />
-<hkern u1="&#x166;" u2="C" k="41" />
-<hkern u1="&#x166;" u2="A" k="143" />
-<hkern u1="&#x166;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x166;" u2="&#x2e;" k="123" />
-<hkern u1="&#x166;" u2="&#x2d;" k="82" />
-<hkern u1="&#x166;" u2="&#x2c;" k="123" />
-<hkern u1="&#x168;" u2="&#x201e;" k="41" />
-<hkern u1="&#x168;" u2="&#x201a;" k="41" />
-<hkern u1="&#x168;" u2="&#x1eb6;" k="20" />
-<hkern u1="&#x168;" u2="&#x1eb4;" k="20" />
-<hkern u1="&#x168;" u2="&#x1eb2;" k="20" />
-<hkern u1="&#x168;" u2="&#x1eb0;" k="20" />
-<hkern u1="&#x168;" u2="&#x1eae;" k="20" />
-<hkern u1="&#x168;" u2="&#x1eac;" k="20" />
-<hkern u1="&#x168;" u2="&#x1eaa;" k="20" />
-<hkern u1="&#x168;" u2="&#x1ea8;" k="20" />
-<hkern u1="&#x168;" u2="&#x1ea6;" k="20" />
-<hkern u1="&#x168;" u2="&#x1ea4;" k="20" />
-<hkern u1="&#x168;" u2="&#x1ea2;" k="20" />
-<hkern u1="&#x168;" u2="&#x1ea0;" k="20" />
-<hkern u1="&#x168;" u2="&#x1e00;" k="20" />
-<hkern u1="&#x168;" u2="&#x1fa;" k="20" />
-<hkern u1="&#x168;" u2="&#x104;" k="20" />
-<hkern u1="&#x168;" u2="&#x102;" k="20" />
-<hkern u1="&#x168;" u2="&#x100;" k="20" />
-<hkern u1="&#x168;" u2="&#xc5;" k="20" />
-<hkern u1="&#x168;" u2="&#xc4;" k="20" />
-<hkern u1="&#x168;" u2="&#xc3;" k="20" />
-<hkern u1="&#x168;" u2="&#xc2;" k="20" />
-<hkern u1="&#x168;" u2="&#xc1;" k="20" />
-<hkern u1="&#x168;" u2="&#xc0;" k="20" />
-<hkern u1="&#x168;" u2="A" k="20" />
-<hkern u1="&#x168;" u2="&#x2e;" k="41" />
-<hkern u1="&#x168;" u2="&#x2c;" k="41" />
-<hkern u1="&#x16a;" u2="&#x201e;" k="41" />
-<hkern u1="&#x16a;" u2="&#x201a;" k="41" />
-<hkern u1="&#x16a;" u2="&#x1eb6;" k="20" />
-<hkern u1="&#x16a;" u2="&#x1eb4;" k="20" />
-<hkern u1="&#x16a;" u2="&#x1eb2;" k="20" />
-<hkern u1="&#x16a;" u2="&#x1eb0;" k="20" />
-<hkern u1="&#x16a;" u2="&#x1eae;" k="20" />
-<hkern u1="&#x16a;" u2="&#x1eac;" k="20" />
-<hkern u1="&#x16a;" u2="&#x1eaa;" k="20" />
-<hkern u1="&#x16a;" u2="&#x1ea8;" k="20" />
-<hkern u1="&#x16a;" u2="&#x1ea6;" k="20" />
-<hkern u1="&#x16a;" u2="&#x1ea4;" k="20" />
-<hkern u1="&#x16a;" u2="&#x1ea2;" k="20" />
-<hkern u1="&#x16a;" u2="&#x1ea0;" k="20" />
-<hkern u1="&#x16a;" u2="&#x1e00;" k="20" />
-<hkern u1="&#x16a;" u2="&#x1fa;" k="20" />
-<hkern u1="&#x16a;" u2="&#x104;" k="20" />
-<hkern u1="&#x16a;" u2="&#x102;" k="20" />
-<hkern u1="&#x16a;" u2="&#x100;" k="20" />
-<hkern u1="&#x16a;" u2="&#xc5;" k="20" />
-<hkern u1="&#x16a;" u2="&#xc4;" k="20" />
-<hkern u1="&#x16a;" u2="&#xc3;" k="20" />
-<hkern u1="&#x16a;" u2="&#xc2;" k="20" />
-<hkern u1="&#x16a;" u2="&#xc1;" k="20" />
-<hkern u1="&#x16a;" u2="&#xc0;" k="20" />
-<hkern u1="&#x16a;" u2="A" k="20" />
-<hkern u1="&#x16a;" u2="&#x2e;" k="41" />
-<hkern u1="&#x16a;" u2="&#x2c;" k="41" />
-<hkern u1="&#x16c;" u2="&#x201e;" k="41" />
-<hkern u1="&#x16c;" u2="&#x201a;" k="41" />
-<hkern u1="&#x16c;" u2="&#x1eb6;" k="20" />
-<hkern u1="&#x16c;" u2="&#x1eb4;" k="20" />
-<hkern u1="&#x16c;" u2="&#x1eb2;" k="20" />
-<hkern u1="&#x16c;" u2="&#x1eb0;" k="20" />
-<hkern u1="&#x16c;" u2="&#x1eae;" k="20" />
-<hkern u1="&#x16c;" u2="&#x1eac;" k="20" />
-<hkern u1="&#x16c;" u2="&#x1eaa;" k="20" />
-<hkern u1="&#x16c;" u2="&#x1ea8;" k="20" />
-<hkern u1="&#x16c;" u2="&#x1ea6;" k="20" />
-<hkern u1="&#x16c;" u2="&#x1ea4;" k="20" />
-<hkern u1="&#x16c;" u2="&#x1ea2;" k="20" />
-<hkern u1="&#x16c;" u2="&#x1ea0;" k="20" />
-<hkern u1="&#x16c;" u2="&#x1e00;" k="20" />
-<hkern u1="&#x16c;" u2="&#x1fa;" k="20" />
-<hkern u1="&#x16c;" u2="&#x104;" k="20" />
-<hkern u1="&#x16c;" u2="&#x102;" k="20" />
-<hkern u1="&#x16c;" u2="&#x100;" k="20" />
-<hkern u1="&#x16c;" u2="&#xc5;" k="20" />
-<hkern u1="&#x16c;" u2="&#xc4;" k="20" />
-<hkern u1="&#x16c;" u2="&#xc3;" k="20" />
-<hkern u1="&#x16c;" u2="&#xc2;" k="20" />
-<hkern u1="&#x16c;" u2="&#xc1;" k="20" />
-<hkern u1="&#x16c;" u2="&#xc0;" k="20" />
-<hkern u1="&#x16c;" u2="A" k="20" />
-<hkern u1="&#x16c;" u2="&#x2e;" k="41" />
-<hkern u1="&#x16c;" u2="&#x2c;" k="41" />
-<hkern u1="&#x16e;" u2="&#x201e;" k="41" />
-<hkern u1="&#x16e;" u2="&#x201a;" k="41" />
-<hkern u1="&#x16e;" u2="&#x1eb6;" k="20" />
-<hkern u1="&#x16e;" u2="&#x1eb4;" k="20" />
-<hkern u1="&#x16e;" u2="&#x1eb2;" k="20" />
-<hkern u1="&#x16e;" u2="&#x1eb0;" k="20" />
-<hkern u1="&#x16e;" u2="&#x1eae;" k="20" />
-<hkern u1="&#x16e;" u2="&#x1eac;" k="20" />
-<hkern u1="&#x16e;" u2="&#x1eaa;" k="20" />
-<hkern u1="&#x16e;" u2="&#x1ea8;" k="20" />
-<hkern u1="&#x16e;" u2="&#x1ea6;" k="20" />
-<hkern u1="&#x16e;" u2="&#x1ea4;" k="20" />
-<hkern u1="&#x16e;" u2="&#x1ea2;" k="20" />
-<hkern u1="&#x16e;" u2="&#x1ea0;" k="20" />
-<hkern u1="&#x16e;" u2="&#x1e00;" k="20" />
-<hkern u1="&#x16e;" u2="&#x1fa;" k="20" />
-<hkern u1="&#x16e;" u2="&#x104;" k="20" />
-<hkern u1="&#x16e;" u2="&#x102;" k="20" />
-<hkern u1="&#x16e;" u2="&#x100;" k="20" />
-<hkern u1="&#x16e;" u2="&#xc5;" k="20" />
-<hkern u1="&#x16e;" u2="&#xc4;" k="20" />
-<hkern u1="&#x16e;" u2="&#xc3;" k="20" />
-<hkern u1="&#x16e;" u2="&#xc2;" k="20" />
-<hkern u1="&#x16e;" u2="&#xc1;" k="20" />
-<hkern u1="&#x16e;" u2="&#xc0;" k="20" />
-<hkern u1="&#x16e;" u2="A" k="20" />
-<hkern u1="&#x16e;" u2="&#x2e;" k="41" />
-<hkern u1="&#x16e;" u2="&#x2c;" k="41" />
-<hkern u1="&#x170;" u2="&#x201e;" k="41" />
-<hkern u1="&#x170;" u2="&#x201a;" k="41" />
-<hkern u1="&#x170;" u2="&#x1eb6;" k="20" />
-<hkern u1="&#x170;" u2="&#x1eb4;" k="20" />
-<hkern u1="&#x170;" u2="&#x1eb2;" k="20" />
-<hkern u1="&#x170;" u2="&#x1eb0;" k="20" />
-<hkern u1="&#x170;" u2="&#x1eae;" k="20" />
-<hkern u1="&#x170;" u2="&#x1eac;" k="20" />
-<hkern u1="&#x170;" u2="&#x1eaa;" k="20" />
-<hkern u1="&#x170;" u2="&#x1ea8;" k="20" />
-<hkern u1="&#x170;" u2="&#x1ea6;" k="20" />
-<hkern u1="&#x170;" u2="&#x1ea4;" k="20" />
-<hkern u1="&#x170;" u2="&#x1ea2;" k="20" />
-<hkern u1="&#x170;" u2="&#x1ea0;" k="20" />
-<hkern u1="&#x170;" u2="&#x1e00;" k="20" />
-<hkern u1="&#x170;" u2="&#x1fa;" k="20" />
-<hkern u1="&#x170;" u2="&#x104;" k="20" />
-<hkern u1="&#x170;" u2="&#x102;" k="20" />
-<hkern u1="&#x170;" u2="&#x100;" k="20" />
-<hkern u1="&#x170;" u2="&#xc5;" k="20" />
-<hkern u1="&#x170;" u2="&#xc4;" k="20" />
-<hkern u1="&#x170;" u2="&#xc3;" k="20" />
-<hkern u1="&#x170;" u2="&#xc2;" k="20" />
-<hkern u1="&#x170;" u2="&#xc1;" k="20" />
-<hkern u1="&#x170;" u2="&#xc0;" k="20" />
-<hkern u1="&#x170;" u2="A" k="20" />
-<hkern u1="&#x170;" u2="&#x2e;" k="41" />
-<hkern u1="&#x170;" u2="&#x2c;" k="41" />
-<hkern u1="&#x172;" u2="&#x201e;" k="41" />
-<hkern u1="&#x172;" u2="&#x201a;" k="41" />
-<hkern u1="&#x172;" u2="&#x1eb6;" k="20" />
-<hkern u1="&#x172;" u2="&#x1eb4;" k="20" />
-<hkern u1="&#x172;" u2="&#x1eb2;" k="20" />
-<hkern u1="&#x172;" u2="&#x1eb0;" k="20" />
-<hkern u1="&#x172;" u2="&#x1eae;" k="20" />
-<hkern u1="&#x172;" u2="&#x1eac;" k="20" />
-<hkern u1="&#x172;" u2="&#x1eaa;" k="20" />
-<hkern u1="&#x172;" u2="&#x1ea8;" k="20" />
-<hkern u1="&#x172;" u2="&#x1ea6;" k="20" />
-<hkern u1="&#x172;" u2="&#x1ea4;" k="20" />
-<hkern u1="&#x172;" u2="&#x1ea2;" k="20" />
-<hkern u1="&#x172;" u2="&#x1ea0;" k="20" />
-<hkern u1="&#x172;" u2="&#x1e00;" k="20" />
-<hkern u1="&#x172;" u2="&#x1fa;" k="20" />
-<hkern u1="&#x172;" u2="&#x104;" k="20" />
-<hkern u1="&#x172;" u2="&#x102;" k="20" />
-<hkern u1="&#x172;" u2="&#x100;" k="20" />
-<hkern u1="&#x172;" u2="&#xc5;" k="20" />
-<hkern u1="&#x172;" u2="&#xc4;" k="20" />
-<hkern u1="&#x172;" u2="&#xc3;" k="20" />
-<hkern u1="&#x172;" u2="&#xc2;" k="20" />
-<hkern u1="&#x172;" u2="&#xc1;" k="20" />
-<hkern u1="&#x172;" u2="&#xc0;" k="20" />
-<hkern u1="&#x172;" u2="A" k="20" />
-<hkern u1="&#x172;" u2="&#x2e;" k="41" />
-<hkern u1="&#x172;" u2="&#x2c;" k="41" />
-<hkern u1="&#x174;" u2="&#x201e;" k="102" />
-<hkern u1="&#x174;" u2="&#x201a;" k="102" />
-<hkern u1="&#x174;" u2="&#x1ef1;" k="20" />
-<hkern u1="&#x174;" u2="&#x1eef;" k="20" />
-<hkern u1="&#x174;" u2="&#x1eed;" k="20" />
-<hkern u1="&#x174;" u2="&#x1eeb;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ee9;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ee7;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ee5;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ee3;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ee2;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ee1;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ee0;" k="20" />
-<hkern u1="&#x174;" u2="&#x1edf;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ede;" k="20" />
-<hkern u1="&#x174;" u2="&#x1edd;" k="41" />
-<hkern u1="&#x174;" u2="&#x1edc;" k="20" />
-<hkern u1="&#x174;" u2="&#x1edb;" k="41" />
-<hkern u1="&#x174;" u2="&#x1eda;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ed9;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ed8;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ed7;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ed6;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ed5;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ed4;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ed2;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ed1;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ed0;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ecf;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ece;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ecd;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ecc;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ec7;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ec5;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ec3;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ebf;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ebd;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ebb;" k="41" />
-<hkern u1="&#x174;" u2="&#x1eb9;" k="41" />
-<hkern u1="&#x174;" u2="&#x1eb7;" k="41" />
-<hkern u1="&#x174;" u2="&#x1eb6;" k="82" />
-<hkern u1="&#x174;" u2="&#x1eb5;" k="41" />
-<hkern u1="&#x174;" u2="&#x1eb4;" k="82" />
-<hkern u1="&#x174;" u2="&#x1eb3;" k="41" />
-<hkern u1="&#x174;" u2="&#x1eb2;" k="82" />
-<hkern u1="&#x174;" u2="&#x1eb1;" k="41" />
-<hkern u1="&#x174;" u2="&#x1eb0;" k="82" />
-<hkern u1="&#x174;" u2="&#x1eaf;" k="41" />
-<hkern u1="&#x174;" u2="&#x1eae;" k="82" />
-<hkern u1="&#x174;" u2="&#x1ead;" k="41" />
-<hkern u1="&#x174;" u2="&#x1eac;" k="82" />
-<hkern u1="&#x174;" u2="&#x1eab;" k="41" />
-<hkern u1="&#x174;" u2="&#x1eaa;" k="82" />
-<hkern u1="&#x174;" u2="&#x1ea9;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ea8;" k="82" />
-<hkern u1="&#x174;" u2="&#x1ea6;" k="82" />
-<hkern u1="&#x174;" u2="&#x1ea5;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ea4;" k="82" />
-<hkern u1="&#x174;" u2="&#x1ea3;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ea2;" k="82" />
-<hkern u1="&#x174;" u2="&#x1ea1;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ea0;" k="82" />
-<hkern u1="&#x174;" u2="&#x1e3f;" k="20" />
-<hkern u1="&#x174;" u2="&#x1e01;" k="41" />
-<hkern u1="&#x174;" u2="&#x1e00;" k="82" />
-<hkern u1="&#x174;" u2="&#x219;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ff;" k="41" />
-<hkern u1="&#x174;" u2="&#x1fe;" k="20" />
-<hkern u1="&#x174;" u2="&#x1fd;" k="41" />
-<hkern u1="&#x174;" u2="&#x1fb;" k="41" />
-<hkern u1="&#x174;" u2="&#x1fa;" k="82" />
-<hkern u1="&#x174;" u2="&#x1b0;" k="20" />
-<hkern u1="&#x174;" u2="&#x1a1;" k="41" />
-<hkern u1="&#x174;" u2="&#x1a0;" k="20" />
-<hkern u1="&#x174;" u2="&#x173;" k="20" />
-<hkern u1="&#x174;" u2="&#x171;" k="20" />
-<hkern u1="&#x174;" u2="&#x16f;" k="20" />
-<hkern u1="&#x174;" u2="&#x16d;" k="20" />
-<hkern u1="&#x174;" u2="&#x16b;" k="20" />
-<hkern u1="&#x174;" u2="&#x169;" k="20" />
-<hkern u1="&#x174;" u2="&#x15f;" k="20" />
-<hkern u1="&#x174;" u2="&#x15b;" k="20" />
-<hkern u1="&#x174;" u2="&#x157;" k="20" />
-<hkern u1="&#x174;" u2="&#x155;" k="20" />
-<hkern u1="&#x174;" u2="&#x153;" k="41" />
-<hkern u1="&#x174;" u2="&#x152;" k="20" />
-<hkern u1="&#x174;" u2="&#x151;" k="41" />
-<hkern u1="&#x174;" u2="&#x150;" k="20" />
-<hkern u1="&#x174;" u2="&#x14f;" k="41" />
-<hkern u1="&#x174;" u2="&#x14e;" k="20" />
-<hkern u1="&#x174;" u2="&#x14d;" k="41" />
-<hkern u1="&#x174;" u2="&#x14c;" k="20" />
-<hkern u1="&#x174;" u2="&#x14b;" k="20" />
-<hkern u1="&#x174;" u2="&#x146;" k="20" />
-<hkern u1="&#x174;" u2="&#x144;" k="20" />
-<hkern u1="&#x174;" u2="&#x138;" k="20" />
-<hkern u1="&#x174;" u2="&#x123;" k="20" />
-<hkern u1="&#x174;" u2="&#x122;" k="20" />
-<hkern u1="&#x174;" u2="&#x121;" k="20" />
-<hkern u1="&#x174;" u2="&#x120;" k="20" />
-<hkern u1="&#x174;" u2="&#x11f;" k="20" />
-<hkern u1="&#x174;" u2="&#x11e;" k="20" />
-<hkern u1="&#x174;" u2="&#x11d;" k="20" />
-<hkern u1="&#x174;" u2="&#x11c;" k="20" />
-<hkern u1="&#x174;" u2="&#x11b;" k="41" />
-<hkern u1="&#x174;" u2="&#x119;" k="41" />
-<hkern u1="&#x174;" u2="&#x117;" k="41" />
-<hkern u1="&#x174;" u2="&#x115;" k="41" />
-<hkern u1="&#x174;" u2="&#x113;" k="41" />
-<hkern u1="&#x174;" u2="&#x111;" k="41" />
-<hkern u1="&#x174;" u2="&#x10f;" k="41" />
-<hkern u1="&#x174;" u2="&#x10d;" k="41" />
-<hkern u1="&#x174;" u2="&#x10c;" k="20" />
-<hkern u1="&#x174;" u2="&#x10b;" k="41" />
-<hkern u1="&#x174;" u2="&#x10a;" k="20" />
-<hkern u1="&#x174;" u2="&#x109;" k="41" />
-<hkern u1="&#x174;" u2="&#x108;" k="20" />
-<hkern u1="&#x174;" u2="&#x107;" k="41" />
-<hkern u1="&#x174;" u2="&#x106;" k="20" />
-<hkern u1="&#x174;" u2="&#x105;" k="41" />
-<hkern u1="&#x174;" u2="&#x104;" k="82" />
-<hkern u1="&#x174;" u2="&#x103;" k="41" />
-<hkern u1="&#x174;" u2="&#x102;" k="82" />
-<hkern u1="&#x174;" u2="&#x101;" k="41" />
-<hkern u1="&#x174;" u2="&#x100;" k="82" />
-<hkern u1="&#x174;" u2="&#xfc;" k="20" />
-<hkern u1="&#x174;" u2="&#xfb;" k="20" />
-<hkern u1="&#x174;" u2="&#xfa;" k="20" />
-<hkern u1="&#x174;" u2="&#xf9;" k="20" />
-<hkern u1="&#x174;" u2="&#xf8;" k="41" />
-<hkern u1="&#x174;" u2="&#xf6;" k="41" />
-<hkern u1="&#x174;" u2="&#xf5;" k="41" />
-<hkern u1="&#x174;" u2="&#xf4;" k="41" />
-<hkern u1="&#x174;" u2="&#xf3;" k="41" />
-<hkern u1="&#x174;" u2="&#xf2;" k="41" />
-<hkern u1="&#x174;" u2="&#xeb;" k="41" />
-<hkern u1="&#x174;" u2="&#xea;" k="41" />
-<hkern u1="&#x174;" u2="&#xe9;" k="41" />
-<hkern u1="&#x174;" u2="&#xe8;" k="41" />
-<hkern u1="&#x174;" u2="&#xe7;" k="41" />
-<hkern u1="&#x174;" u2="&#xe6;" k="41" />
-<hkern u1="&#x174;" u2="&#xe5;" k="41" />
-<hkern u1="&#x174;" u2="&#xe4;" k="41" />
-<hkern u1="&#x174;" u2="&#xe3;" k="41" />
-<hkern u1="&#x174;" u2="&#xe2;" k="41" />
-<hkern u1="&#x174;" u2="&#xe1;" k="41" />
-<hkern u1="&#x174;" u2="&#xe0;" k="41" />
-<hkern u1="&#x174;" u2="&#xd8;" k="20" />
-<hkern u1="&#x174;" u2="&#xd6;" k="20" />
-<hkern u1="&#x174;" u2="&#xd5;" k="20" />
-<hkern u1="&#x174;" u2="&#xd4;" k="20" />
-<hkern u1="&#x174;" u2="&#xd3;" k="20" />
-<hkern u1="&#x174;" u2="&#xd2;" k="20" />
-<hkern u1="&#x174;" u2="&#xc7;" k="20" />
-<hkern u1="&#x174;" u2="&#xc5;" k="82" />
-<hkern u1="&#x174;" u2="&#xc4;" k="82" />
-<hkern u1="&#x174;" u2="&#xc3;" k="82" />
-<hkern u1="&#x174;" u2="&#xc2;" k="82" />
-<hkern u1="&#x174;" u2="&#xc1;" k="82" />
-<hkern u1="&#x174;" u2="&#xc0;" k="82" />
-<hkern u1="&#x174;" u2="u" k="20" />
-<hkern u1="&#x174;" u2="s" k="20" />
-<hkern u1="&#x174;" u2="r" k="20" />
-<hkern u1="&#x174;" u2="q" k="41" />
-<hkern u1="&#x174;" u2="p" k="20" />
-<hkern u1="&#x174;" u2="o" k="41" />
-<hkern u1="&#x174;" u2="n" k="20" />
-<hkern u1="&#x174;" u2="m" k="20" />
-<hkern u1="&#x174;" u2="g" k="20" />
-<hkern u1="&#x174;" u2="e" k="41" />
-<hkern u1="&#x174;" u2="d" k="41" />
-<hkern u1="&#x174;" u2="c" k="41" />
-<hkern u1="&#x174;" u2="a" k="41" />
-<hkern u1="&#x174;" u2="Q" k="20" />
-<hkern u1="&#x174;" u2="O" k="20" />
-<hkern u1="&#x174;" u2="G" k="20" />
-<hkern u1="&#x174;" u2="C" k="20" />
-<hkern u1="&#x174;" u2="A" k="82" />
-<hkern u1="&#x174;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x174;" u2="&#x2e;" k="102" />
-<hkern u1="&#x174;" u2="&#x2c;" k="102" />
-<hkern u1="&#x175;" u2="&#x201e;" k="82" />
-<hkern u1="&#x175;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x175;" u2="&#x201a;" k="82" />
-<hkern u1="&#x175;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x175;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x175;" u2="&#x2e;" k="82" />
-<hkern u1="&#x175;" u2="&#x2c;" k="82" />
-<hkern u1="&#x175;" u2="&#x27;" k="-82" />
-<hkern u1="&#x175;" u2="&#x22;" k="-82" />
-<hkern u1="&#x176;" u2="&#x201e;" k="123" />
-<hkern u1="&#x176;" u2="&#x201a;" k="123" />
-<hkern u1="&#x176;" u2="&#x1ef1;" k="61" />
-<hkern u1="&#x176;" u2="&#x1eef;" k="61" />
-<hkern u1="&#x176;" u2="&#x1eed;" k="61" />
-<hkern u1="&#x176;" u2="&#x1eeb;" k="61" />
-<hkern u1="&#x176;" u2="&#x1ee9;" k="61" />
-<hkern u1="&#x176;" u2="&#x1ee7;" k="61" />
-<hkern u1="&#x176;" u2="&#x1ee5;" k="61" />
-<hkern u1="&#x176;" u2="&#x1ee3;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x176;" u2="&#x1ee1;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x176;" u2="&#x1edf;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x176;" u2="&#x1edd;" k="102" />
-<hkern u1="&#x176;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x176;" u2="&#x1edb;" k="102" />
-<hkern u1="&#x176;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x176;" u2="&#x1ed9;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x176;" u2="&#x1ed7;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x176;" u2="&#x1ed5;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x176;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x176;" u2="&#x1ed1;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x176;" u2="&#x1ecf;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x176;" u2="&#x1ecd;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x176;" u2="&#x1ec7;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ec5;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ec3;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ebf;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ebd;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ebb;" k="102" />
-<hkern u1="&#x176;" u2="&#x1eb9;" k="102" />
-<hkern u1="&#x176;" u2="&#x1eb7;" k="102" />
-<hkern u1="&#x176;" u2="&#x1eb6;" k="123" />
-<hkern u1="&#x176;" u2="&#x1eb5;" k="102" />
-<hkern u1="&#x176;" u2="&#x1eb4;" k="123" />
-<hkern u1="&#x176;" u2="&#x1eb3;" k="102" />
-<hkern u1="&#x176;" u2="&#x1eb2;" k="123" />
-<hkern u1="&#x176;" u2="&#x1eb1;" k="102" />
-<hkern u1="&#x176;" u2="&#x1eb0;" k="123" />
-<hkern u1="&#x176;" u2="&#x1eaf;" k="102" />
-<hkern u1="&#x176;" u2="&#x1eae;" k="123" />
-<hkern u1="&#x176;" u2="&#x1ead;" k="102" />
-<hkern u1="&#x176;" u2="&#x1eac;" k="123" />
-<hkern u1="&#x176;" u2="&#x1eab;" k="102" />
-<hkern u1="&#x176;" u2="&#x1eaa;" k="123" />
-<hkern u1="&#x176;" u2="&#x1ea9;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ea8;" k="123" />
-<hkern u1="&#x176;" u2="&#x1ea6;" k="123" />
-<hkern u1="&#x176;" u2="&#x1ea5;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ea4;" k="123" />
-<hkern u1="&#x176;" u2="&#x1ea3;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ea2;" k="123" />
-<hkern u1="&#x176;" u2="&#x1ea1;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ea0;" k="123" />
-<hkern u1="&#x176;" u2="&#x1e3f;" k="61" />
-<hkern u1="&#x176;" u2="&#x1e01;" k="102" />
-<hkern u1="&#x176;" u2="&#x1e00;" k="123" />
-<hkern u1="&#x176;" u2="&#x219;" k="82" />
-<hkern u1="&#x176;" u2="&#x1ff;" k="102" />
-<hkern u1="&#x176;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x176;" u2="&#x1fd;" k="102" />
-<hkern u1="&#x176;" u2="&#x1fb;" k="102" />
-<hkern u1="&#x176;" u2="&#x1fa;" k="123" />
-<hkern u1="&#x176;" u2="&#x1b0;" k="61" />
-<hkern u1="&#x176;" u2="&#x1a1;" k="102" />
-<hkern u1="&#x176;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x176;" u2="&#x17e;" k="41" />
-<hkern u1="&#x176;" u2="&#x17c;" k="41" />
-<hkern u1="&#x176;" u2="&#x17a;" k="41" />
-<hkern u1="&#x176;" u2="&#x173;" k="61" />
-<hkern u1="&#x176;" u2="&#x171;" k="61" />
-<hkern u1="&#x176;" u2="&#x16f;" k="61" />
-<hkern u1="&#x176;" u2="&#x16d;" k="61" />
-<hkern u1="&#x176;" u2="&#x16b;" k="61" />
-<hkern u1="&#x176;" u2="&#x169;" k="61" />
-<hkern u1="&#x176;" u2="&#x15f;" k="82" />
-<hkern u1="&#x176;" u2="&#x15b;" k="82" />
-<hkern u1="&#x176;" u2="&#x157;" k="61" />
-<hkern u1="&#x176;" u2="&#x155;" k="61" />
-<hkern u1="&#x176;" u2="&#x153;" k="102" />
-<hkern u1="&#x176;" u2="&#x152;" k="41" />
-<hkern u1="&#x176;" u2="&#x151;" k="102" />
-<hkern u1="&#x176;" u2="&#x150;" k="41" />
-<hkern u1="&#x176;" u2="&#x14f;" k="102" />
-<hkern u1="&#x176;" u2="&#x14e;" k="41" />
-<hkern u1="&#x176;" u2="&#x14d;" k="102" />
-<hkern u1="&#x176;" u2="&#x14c;" k="41" />
-<hkern u1="&#x176;" u2="&#x14b;" k="61" />
-<hkern u1="&#x176;" u2="&#x146;" k="61" />
-<hkern u1="&#x176;" u2="&#x144;" k="61" />
-<hkern u1="&#x176;" u2="&#x138;" k="61" />
-<hkern u1="&#x176;" u2="&#x123;" k="41" />
-<hkern u1="&#x176;" u2="&#x122;" k="41" />
-<hkern u1="&#x176;" u2="&#x121;" k="41" />
-<hkern u1="&#x176;" u2="&#x120;" k="41" />
-<hkern u1="&#x176;" u2="&#x11f;" k="41" />
-<hkern u1="&#x176;" u2="&#x11e;" k="41" />
-<hkern u1="&#x176;" u2="&#x11d;" k="41" />
-<hkern u1="&#x176;" u2="&#x11c;" k="41" />
-<hkern u1="&#x176;" u2="&#x11b;" k="102" />
-<hkern u1="&#x176;" u2="&#x119;" k="102" />
-<hkern u1="&#x176;" u2="&#x117;" k="102" />
-<hkern u1="&#x176;" u2="&#x115;" k="102" />
-<hkern u1="&#x176;" u2="&#x113;" k="102" />
-<hkern u1="&#x176;" u2="&#x111;" k="102" />
-<hkern u1="&#x176;" u2="&#x10f;" k="102" />
-<hkern u1="&#x176;" u2="&#x10d;" k="102" />
-<hkern u1="&#x176;" u2="&#x10c;" k="41" />
-<hkern u1="&#x176;" u2="&#x10b;" k="102" />
-<hkern u1="&#x176;" u2="&#x10a;" k="41" />
-<hkern u1="&#x176;" u2="&#x109;" k="102" />
-<hkern u1="&#x176;" u2="&#x108;" k="41" />
-<hkern u1="&#x176;" u2="&#x107;" k="102" />
-<hkern u1="&#x176;" u2="&#x106;" k="41" />
-<hkern u1="&#x176;" u2="&#x105;" k="102" />
-<hkern u1="&#x176;" u2="&#x104;" k="123" />
-<hkern u1="&#x176;" u2="&#x103;" k="102" />
-<hkern u1="&#x176;" u2="&#x102;" k="123" />
-<hkern u1="&#x176;" u2="&#x101;" k="102" />
-<hkern u1="&#x176;" u2="&#x100;" k="123" />
-<hkern u1="&#x176;" u2="&#xfc;" k="61" />
-<hkern u1="&#x176;" u2="&#xfb;" k="61" />
-<hkern u1="&#x176;" u2="&#xfa;" k="61" />
-<hkern u1="&#x176;" u2="&#xf9;" k="61" />
-<hkern u1="&#x176;" u2="&#xf8;" k="102" />
-<hkern u1="&#x176;" u2="&#xf6;" k="102" />
-<hkern u1="&#x176;" u2="&#xf5;" k="102" />
-<hkern u1="&#x176;" u2="&#xf4;" k="102" />
-<hkern u1="&#x176;" u2="&#xf3;" k="102" />
-<hkern u1="&#x176;" u2="&#xf2;" k="102" />
-<hkern u1="&#x176;" u2="&#xeb;" k="102" />
-<hkern u1="&#x176;" u2="&#xea;" k="102" />
-<hkern u1="&#x176;" u2="&#xe9;" k="102" />
-<hkern u1="&#x176;" u2="&#xe8;" k="102" />
-<hkern u1="&#x176;" u2="&#xe7;" k="102" />
-<hkern u1="&#x176;" u2="&#xe6;" k="102" />
-<hkern u1="&#x176;" u2="&#xe5;" k="102" />
-<hkern u1="&#x176;" u2="&#xe4;" k="102" />
-<hkern u1="&#x176;" u2="&#xe3;" k="102" />
-<hkern u1="&#x176;" u2="&#xe2;" k="102" />
-<hkern u1="&#x176;" u2="&#xe1;" k="102" />
-<hkern u1="&#x176;" u2="&#xe0;" k="102" />
-<hkern u1="&#x176;" u2="&#xd8;" k="41" />
-<hkern u1="&#x176;" u2="&#xd6;" k="41" />
-<hkern u1="&#x176;" u2="&#xd5;" k="41" />
-<hkern u1="&#x176;" u2="&#xd4;" k="41" />
-<hkern u1="&#x176;" u2="&#xd3;" k="41" />
-<hkern u1="&#x176;" u2="&#xd2;" k="41" />
-<hkern u1="&#x176;" u2="&#xc7;" k="41" />
-<hkern u1="&#x176;" u2="&#xc5;" k="123" />
-<hkern u1="&#x176;" u2="&#xc4;" k="123" />
-<hkern u1="&#x176;" u2="&#xc3;" k="123" />
-<hkern u1="&#x176;" u2="&#xc2;" k="123" />
-<hkern u1="&#x176;" u2="&#xc1;" k="123" />
-<hkern u1="&#x176;" u2="&#xc0;" k="123" />
-<hkern u1="&#x176;" u2="z" k="41" />
-<hkern u1="&#x176;" u2="u" k="61" />
-<hkern u1="&#x176;" u2="s" k="82" />
-<hkern u1="&#x176;" u2="r" k="61" />
-<hkern u1="&#x176;" u2="q" k="102" />
-<hkern u1="&#x176;" u2="p" k="61" />
-<hkern u1="&#x176;" u2="o" k="102" />
-<hkern u1="&#x176;" u2="n" k="61" />
-<hkern u1="&#x176;" u2="m" k="61" />
-<hkern u1="&#x176;" u2="g" k="41" />
-<hkern u1="&#x176;" u2="e" k="102" />
-<hkern u1="&#x176;" u2="d" k="102" />
-<hkern u1="&#x176;" u2="c" k="102" />
-<hkern u1="&#x176;" u2="a" k="102" />
-<hkern u1="&#x176;" u2="Q" k="41" />
-<hkern u1="&#x176;" u2="O" k="41" />
-<hkern u1="&#x176;" u2="G" k="41" />
-<hkern u1="&#x176;" u2="C" k="41" />
-<hkern u1="&#x176;" u2="A" k="123" />
-<hkern u1="&#x176;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x176;" u2="&#x2e;" k="123" />
-<hkern u1="&#x176;" u2="&#x2c;" k="123" />
-<hkern u1="&#x177;" u2="&#x201e;" k="82" />
-<hkern u1="&#x177;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x177;" u2="&#x201a;" k="82" />
-<hkern u1="&#x177;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x177;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x177;" u2="&#x2e;" k="82" />
-<hkern u1="&#x177;" u2="&#x2c;" k="82" />
-<hkern u1="&#x177;" u2="&#x27;" k="-82" />
-<hkern u1="&#x177;" u2="&#x22;" k="-82" />
-<hkern u1="&#x178;" u2="&#x201e;" k="123" />
-<hkern u1="&#x178;" u2="&#x201a;" k="123" />
-<hkern u1="&#x178;" u2="&#x1ef1;" k="61" />
-<hkern u1="&#x178;" u2="&#x1eef;" k="61" />
-<hkern u1="&#x178;" u2="&#x1eed;" k="61" />
-<hkern u1="&#x178;" u2="&#x1eeb;" k="61" />
-<hkern u1="&#x178;" u2="&#x1ee9;" k="61" />
-<hkern u1="&#x178;" u2="&#x1ee7;" k="61" />
-<hkern u1="&#x178;" u2="&#x1ee5;" k="61" />
-<hkern u1="&#x178;" u2="&#x1ee3;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x178;" u2="&#x1ee1;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x178;" u2="&#x1edf;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x178;" u2="&#x1edd;" k="102" />
-<hkern u1="&#x178;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x178;" u2="&#x1edb;" k="102" />
-<hkern u1="&#x178;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x178;" u2="&#x1ed9;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x178;" u2="&#x1ed7;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x178;" u2="&#x1ed5;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x178;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x178;" u2="&#x1ed1;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x178;" u2="&#x1ecf;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x178;" u2="&#x1ecd;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x178;" u2="&#x1ec7;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ec5;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ec3;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ebf;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ebd;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ebb;" k="102" />
-<hkern u1="&#x178;" u2="&#x1eb9;" k="102" />
-<hkern u1="&#x178;" u2="&#x1eb7;" k="102" />
-<hkern u1="&#x178;" u2="&#x1eb6;" k="123" />
-<hkern u1="&#x178;" u2="&#x1eb5;" k="102" />
-<hkern u1="&#x178;" u2="&#x1eb4;" k="123" />
-<hkern u1="&#x178;" u2="&#x1eb3;" k="102" />
-<hkern u1="&#x178;" u2="&#x1eb2;" k="123" />
-<hkern u1="&#x178;" u2="&#x1eb1;" k="102" />
-<hkern u1="&#x178;" u2="&#x1eb0;" k="123" />
-<hkern u1="&#x178;" u2="&#x1eaf;" k="102" />
-<hkern u1="&#x178;" u2="&#x1eae;" k="123" />
-<hkern u1="&#x178;" u2="&#x1ead;" k="102" />
-<hkern u1="&#x178;" u2="&#x1eac;" k="123" />
-<hkern u1="&#x178;" u2="&#x1eab;" k="102" />
-<hkern u1="&#x178;" u2="&#x1eaa;" k="123" />
-<hkern u1="&#x178;" u2="&#x1ea9;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ea8;" k="123" />
-<hkern u1="&#x178;" u2="&#x1ea6;" k="123" />
-<hkern u1="&#x178;" u2="&#x1ea5;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ea4;" k="123" />
-<hkern u1="&#x178;" u2="&#x1ea3;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ea2;" k="123" />
-<hkern u1="&#x178;" u2="&#x1ea1;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ea0;" k="123" />
-<hkern u1="&#x178;" u2="&#x1e3f;" k="61" />
-<hkern u1="&#x178;" u2="&#x1e01;" k="102" />
-<hkern u1="&#x178;" u2="&#x1e00;" k="123" />
-<hkern u1="&#x178;" u2="&#x219;" k="82" />
-<hkern u1="&#x178;" u2="&#x1ff;" k="102" />
-<hkern u1="&#x178;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x178;" u2="&#x1fd;" k="102" />
-<hkern u1="&#x178;" u2="&#x1fb;" k="102" />
-<hkern u1="&#x178;" u2="&#x1fa;" k="123" />
-<hkern u1="&#x178;" u2="&#x1b0;" k="61" />
-<hkern u1="&#x178;" u2="&#x1a1;" k="102" />
-<hkern u1="&#x178;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x178;" u2="&#x17e;" k="41" />
-<hkern u1="&#x178;" u2="&#x17c;" k="41" />
-<hkern u1="&#x178;" u2="&#x17a;" k="41" />
-<hkern u1="&#x178;" u2="&#x173;" k="61" />
-<hkern u1="&#x178;" u2="&#x171;" k="61" />
-<hkern u1="&#x178;" u2="&#x16f;" k="61" />
-<hkern u1="&#x178;" u2="&#x16d;" k="61" />
-<hkern u1="&#x178;" u2="&#x16b;" k="61" />
-<hkern u1="&#x178;" u2="&#x169;" k="61" />
-<hkern u1="&#x178;" u2="&#x15f;" k="82" />
-<hkern u1="&#x178;" u2="&#x15b;" k="82" />
-<hkern u1="&#x178;" u2="&#x157;" k="61" />
-<hkern u1="&#x178;" u2="&#x155;" k="61" />
-<hkern u1="&#x178;" u2="&#x153;" k="102" />
-<hkern u1="&#x178;" u2="&#x152;" k="41" />
-<hkern u1="&#x178;" u2="&#x151;" k="102" />
-<hkern u1="&#x178;" u2="&#x150;" k="41" />
-<hkern u1="&#x178;" u2="&#x14f;" k="102" />
-<hkern u1="&#x178;" u2="&#x14e;" k="41" />
-<hkern u1="&#x178;" u2="&#x14d;" k="102" />
-<hkern u1="&#x178;" u2="&#x14c;" k="41" />
-<hkern u1="&#x178;" u2="&#x14b;" k="61" />
-<hkern u1="&#x178;" u2="&#x146;" k="61" />
-<hkern u1="&#x178;" u2="&#x144;" k="61" />
-<hkern u1="&#x178;" u2="&#x138;" k="61" />
-<hkern u1="&#x178;" u2="&#x123;" k="41" />
-<hkern u1="&#x178;" u2="&#x122;" k="41" />
-<hkern u1="&#x178;" u2="&#x121;" k="41" />
-<hkern u1="&#x178;" u2="&#x120;" k="41" />
-<hkern u1="&#x178;" u2="&#x11f;" k="41" />
-<hkern u1="&#x178;" u2="&#x11e;" k="41" />
-<hkern u1="&#x178;" u2="&#x11d;" k="41" />
-<hkern u1="&#x178;" u2="&#x11c;" k="41" />
-<hkern u1="&#x178;" u2="&#x11b;" k="102" />
-<hkern u1="&#x178;" u2="&#x119;" k="102" />
-<hkern u1="&#x178;" u2="&#x117;" k="102" />
-<hkern u1="&#x178;" u2="&#x115;" k="102" />
-<hkern u1="&#x178;" u2="&#x113;" k="102" />
-<hkern u1="&#x178;" u2="&#x111;" k="102" />
-<hkern u1="&#x178;" u2="&#x10f;" k="102" />
-<hkern u1="&#x178;" u2="&#x10d;" k="102" />
-<hkern u1="&#x178;" u2="&#x10c;" k="41" />
-<hkern u1="&#x178;" u2="&#x10b;" k="102" />
-<hkern u1="&#x178;" u2="&#x10a;" k="41" />
-<hkern u1="&#x178;" u2="&#x109;" k="102" />
-<hkern u1="&#x178;" u2="&#x108;" k="41" />
-<hkern u1="&#x178;" u2="&#x107;" k="102" />
-<hkern u1="&#x178;" u2="&#x106;" k="41" />
-<hkern u1="&#x178;" u2="&#x105;" k="102" />
-<hkern u1="&#x178;" u2="&#x104;" k="123" />
-<hkern u1="&#x178;" u2="&#x103;" k="102" />
-<hkern u1="&#x178;" u2="&#x102;" k="123" />
-<hkern u1="&#x178;" u2="&#x101;" k="102" />
-<hkern u1="&#x178;" u2="&#x100;" k="123" />
-<hkern u1="&#x178;" u2="&#xfc;" k="61" />
-<hkern u1="&#x178;" u2="&#xfb;" k="61" />
-<hkern u1="&#x178;" u2="&#xfa;" k="61" />
-<hkern u1="&#x178;" u2="&#xf9;" k="61" />
-<hkern u1="&#x178;" u2="&#xf8;" k="102" />
-<hkern u1="&#x178;" u2="&#xf6;" k="102" />
-<hkern u1="&#x178;" u2="&#xf5;" k="102" />
-<hkern u1="&#x178;" u2="&#xf4;" k="102" />
-<hkern u1="&#x178;" u2="&#xf3;" k="102" />
-<hkern u1="&#x178;" u2="&#xf2;" k="102" />
-<hkern u1="&#x178;" u2="&#xeb;" k="102" />
-<hkern u1="&#x178;" u2="&#xea;" k="102" />
-<hkern u1="&#x178;" u2="&#xe9;" k="102" />
-<hkern u1="&#x178;" u2="&#xe8;" k="102" />
-<hkern u1="&#x178;" u2="&#xe7;" k="102" />
-<hkern u1="&#x178;" u2="&#xe6;" k="102" />
-<hkern u1="&#x178;" u2="&#xe5;" k="102" />
-<hkern u1="&#x178;" u2="&#xe4;" k="102" />
-<hkern u1="&#x178;" u2="&#xe3;" k="102" />
-<hkern u1="&#x178;" u2="&#xe2;" k="102" />
-<hkern u1="&#x178;" u2="&#xe1;" k="102" />
-<hkern u1="&#x178;" u2="&#xe0;" k="102" />
-<hkern u1="&#x178;" u2="&#xd8;" k="41" />
-<hkern u1="&#x178;" u2="&#xd6;" k="41" />
-<hkern u1="&#x178;" u2="&#xd5;" k="41" />
-<hkern u1="&#x178;" u2="&#xd4;" k="41" />
-<hkern u1="&#x178;" u2="&#xd3;" k="41" />
-<hkern u1="&#x178;" u2="&#xd2;" k="41" />
-<hkern u1="&#x178;" u2="&#xc7;" k="41" />
-<hkern u1="&#x178;" u2="&#xc5;" k="123" />
-<hkern u1="&#x178;" u2="&#xc4;" k="123" />
-<hkern u1="&#x178;" u2="&#xc3;" k="123" />
-<hkern u1="&#x178;" u2="&#xc2;" k="123" />
-<hkern u1="&#x178;" u2="&#xc1;" k="123" />
-<hkern u1="&#x178;" u2="&#xc0;" k="123" />
-<hkern u1="&#x178;" u2="z" k="41" />
-<hkern u1="&#x178;" u2="u" k="61" />
-<hkern u1="&#x178;" u2="s" k="82" />
-<hkern u1="&#x178;" u2="r" k="61" />
-<hkern u1="&#x178;" u2="q" k="102" />
-<hkern u1="&#x178;" u2="p" k="61" />
-<hkern u1="&#x178;" u2="o" k="102" />
-<hkern u1="&#x178;" u2="n" k="61" />
-<hkern u1="&#x178;" u2="m" k="61" />
-<hkern u1="&#x178;" u2="g" k="41" />
-<hkern u1="&#x178;" u2="e" k="102" />
-<hkern u1="&#x178;" u2="d" k="102" />
-<hkern u1="&#x178;" u2="c" k="102" />
-<hkern u1="&#x178;" u2="a" k="102" />
-<hkern u1="&#x178;" u2="Q" k="41" />
-<hkern u1="&#x178;" u2="O" k="41" />
-<hkern u1="&#x178;" u2="G" k="41" />
-<hkern u1="&#x178;" u2="C" k="41" />
-<hkern u1="&#x178;" u2="A" k="123" />
-<hkern u1="&#x178;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x178;" u2="&#x2e;" k="123" />
-<hkern u1="&#x178;" u2="&#x2c;" k="123" />
-<hkern u1="&#x179;" u2="&#x1ee2;" k="20" />
-<hkern u1="&#x179;" u2="&#x1ee0;" k="20" />
-<hkern u1="&#x179;" u2="&#x1ede;" k="20" />
-<hkern u1="&#x179;" u2="&#x1edc;" k="20" />
-<hkern u1="&#x179;" u2="&#x1eda;" k="20" />
-<hkern u1="&#x179;" u2="&#x1ed8;" k="20" />
-<hkern u1="&#x179;" u2="&#x1ed6;" k="20" />
-<hkern u1="&#x179;" u2="&#x1ed4;" k="20" />
-<hkern u1="&#x179;" u2="&#x1ed2;" k="20" />
-<hkern u1="&#x179;" u2="&#x1ed0;" k="20" />
-<hkern u1="&#x179;" u2="&#x1ece;" k="20" />
-<hkern u1="&#x179;" u2="&#x1ecc;" k="20" />
-<hkern u1="&#x179;" u2="&#x1fe;" k="20" />
-<hkern u1="&#x179;" u2="&#x1a0;" k="20" />
-<hkern u1="&#x179;" u2="&#x152;" k="20" />
-<hkern u1="&#x179;" u2="&#x150;" k="20" />
-<hkern u1="&#x179;" u2="&#x14e;" k="20" />
-<hkern u1="&#x179;" u2="&#x14c;" k="20" />
-<hkern u1="&#x179;" u2="&#x122;" k="20" />
-<hkern u1="&#x179;" u2="&#x120;" k="20" />
-<hkern u1="&#x179;" u2="&#x11e;" k="20" />
-<hkern u1="&#x179;" u2="&#x11c;" k="20" />
-<hkern u1="&#x179;" u2="&#x10c;" k="20" />
-<hkern u1="&#x179;" u2="&#x10a;" k="20" />
-<hkern u1="&#x179;" u2="&#x108;" k="20" />
-<hkern u1="&#x179;" u2="&#x106;" k="20" />
-<hkern u1="&#x179;" u2="&#xd8;" k="20" />
-<hkern u1="&#x179;" u2="&#xd6;" k="20" />
-<hkern u1="&#x179;" u2="&#xd5;" k="20" />
-<hkern u1="&#x179;" u2="&#xd4;" k="20" />
-<hkern u1="&#x179;" u2="&#xd3;" k="20" />
-<hkern u1="&#x179;" u2="&#xd2;" k="20" />
-<hkern u1="&#x179;" u2="&#xc7;" k="20" />
-<hkern u1="&#x179;" u2="Q" k="20" />
-<hkern u1="&#x179;" u2="O" k="20" />
-<hkern u1="&#x179;" u2="G" k="20" />
-<hkern u1="&#x179;" u2="C" k="20" />
-<hkern u1="&#x17b;" u2="&#x1ee2;" k="20" />
-<hkern u1="&#x17b;" u2="&#x1ee0;" k="20" />
-<hkern u1="&#x17b;" u2="&#x1ede;" k="20" />
-<hkern u1="&#x17b;" u2="&#x1edc;" k="20" />
-<hkern u1="&#x17b;" u2="&#x1eda;" k="20" />
-<hkern u1="&#x17b;" u2="&#x1ed8;" k="20" />
-<hkern u1="&#x17b;" u2="&#x1ed6;" k="20" />
-<hkern u1="&#x17b;" u2="&#x1ed4;" k="20" />
-<hkern u1="&#x17b;" u2="&#x1ed2;" k="20" />
-<hkern u1="&#x17b;" u2="&#x1ed0;" k="20" />
-<hkern u1="&#x17b;" u2="&#x1ece;" k="20" />
-<hkern u1="&#x17b;" u2="&#x1ecc;" k="20" />
-<hkern u1="&#x17b;" u2="&#x1fe;" k="20" />
-<hkern u1="&#x17b;" u2="&#x1a0;" k="20" />
-<hkern u1="&#x17b;" u2="&#x152;" k="20" />
-<hkern u1="&#x17b;" u2="&#x150;" k="20" />
-<hkern u1="&#x17b;" u2="&#x14e;" k="20" />
-<hkern u1="&#x17b;" u2="&#x14c;" k="20" />
-<hkern u1="&#x17b;" u2="&#x122;" k="20" />
-<hkern u1="&#x17b;" u2="&#x120;" k="20" />
-<hkern u1="&#x17b;" u2="&#x11e;" k="20" />
-<hkern u1="&#x17b;" u2="&#x11c;" k="20" />
-<hkern u1="&#x17b;" u2="&#x10c;" k="20" />
-<hkern u1="&#x17b;" u2="&#x10a;" k="20" />
-<hkern u1="&#x17b;" u2="&#x108;" k="20" />
-<hkern u1="&#x17b;" u2="&#x106;" k="20" />
-<hkern u1="&#x17b;" u2="&#xd8;" k="20" />
-<hkern u1="&#x17b;" u2="&#xd6;" k="20" />
-<hkern u1="&#x17b;" u2="&#xd5;" k="20" />
-<hkern u1="&#x17b;" u2="&#xd4;" k="20" />
-<hkern u1="&#x17b;" u2="&#xd3;" k="20" />
-<hkern u1="&#x17b;" u2="&#xd2;" k="20" />
-<hkern u1="&#x17b;" u2="&#xc7;" k="20" />
-<hkern u1="&#x17b;" u2="Q" k="20" />
-<hkern u1="&#x17b;" u2="O" k="20" />
-<hkern u1="&#x17b;" u2="G" k="20" />
-<hkern u1="&#x17b;" u2="C" k="20" />
-<hkern u1="&#x17d;" u2="&#x1ee2;" k="20" />
-<hkern u1="&#x17d;" u2="&#x1ee0;" k="20" />
-<hkern u1="&#x17d;" u2="&#x1ede;" k="20" />
-<hkern u1="&#x17d;" u2="&#x1edc;" k="20" />
-<hkern u1="&#x17d;" u2="&#x1eda;" k="20" />
-<hkern u1="&#x17d;" u2="&#x1ed8;" k="20" />
-<hkern u1="&#x17d;" u2="&#x1ed6;" k="20" />
-<hkern u1="&#x17d;" u2="&#x1ed4;" k="20" />
-<hkern u1="&#x17d;" u2="&#x1ed2;" k="20" />
-<hkern u1="&#x17d;" u2="&#x1ed0;" k="20" />
-<hkern u1="&#x17d;" u2="&#x1ece;" k="20" />
-<hkern u1="&#x17d;" u2="&#x1ecc;" k="20" />
-<hkern u1="&#x17d;" u2="&#x1fe;" k="20" />
-<hkern u1="&#x17d;" u2="&#x1a0;" k="20" />
-<hkern u1="&#x17d;" u2="&#x152;" k="20" />
-<hkern u1="&#x17d;" u2="&#x150;" k="20" />
-<hkern u1="&#x17d;" u2="&#x14e;" k="20" />
-<hkern u1="&#x17d;" u2="&#x14c;" k="20" />
-<hkern u1="&#x17d;" u2="&#x122;" k="20" />
-<hkern u1="&#x17d;" u2="&#x120;" k="20" />
-<hkern u1="&#x17d;" u2="&#x11e;" k="20" />
-<hkern u1="&#x17d;" u2="&#x11c;" k="20" />
-<hkern u1="&#x17d;" u2="&#x10c;" k="20" />
-<hkern u1="&#x17d;" u2="&#x10a;" k="20" />
-<hkern u1="&#x17d;" u2="&#x108;" k="20" />
-<hkern u1="&#x17d;" u2="&#x106;" k="20" />
-<hkern u1="&#x17d;" u2="&#xd8;" k="20" />
-<hkern u1="&#x17d;" u2="&#xd6;" k="20" />
-<hkern u1="&#x17d;" u2="&#xd5;" k="20" />
-<hkern u1="&#x17d;" u2="&#xd4;" k="20" />
-<hkern u1="&#x17d;" u2="&#xd3;" k="20" />
-<hkern u1="&#x17d;" u2="&#xd2;" k="20" />
-<hkern u1="&#x17d;" u2="&#xc7;" k="20" />
-<hkern u1="&#x17d;" u2="Q" k="20" />
-<hkern u1="&#x17d;" u2="O" k="20" />
-<hkern u1="&#x17d;" u2="G" k="20" />
-<hkern u1="&#x17d;" u2="C" k="20" />
-<hkern u1="&#x1a1;" g2="uniFB04" k="-82" />
-<hkern u1="&#x1a1;" g2="uniFB03" k="-82" />
-<hkern u1="&#x1a1;" g2="uniFB02" k="-82" />
-<hkern u1="&#x1a1;" g2="uniFB01" k="-82" />
-<hkern u1="&#x1a1;" g2="ff" k="-82" />
-<hkern u1="&#x1a1;" u2="&#x1ef5;" k="-102" />
-<hkern u1="&#x1a1;" u2="&#x1e83;" k="-102" />
-<hkern u1="&#x1a1;" u2="&#x1e81;" k="-102" />
-<hkern u1="&#x1a1;" u2="&#x21b;" k="-82" />
-<hkern u1="&#x1a1;" u2="&#x175;" k="-102" />
-<hkern u1="&#x1a1;" u2="&#x165;" k="-82" />
-<hkern u1="&#x1a1;" u2="&#x163;" k="-82" />
-<hkern u1="&#x1a1;" u2="&#xfd;" k="-102" />
-<hkern u1="&#x1a1;" u2="y" k="-102" />
-<hkern u1="&#x1a1;" u2="x" k="-102" />
-<hkern u1="&#x1a1;" u2="w" k="-102" />
-<hkern u1="&#x1a1;" u2="v" k="-102" />
-<hkern u1="&#x1a1;" u2="t" k="-82" />
-<hkern u1="&#x1a1;" u2="f" k="-82" />
-<hkern u1="&#x1b0;" g2="uniFB04" k="-102" />
-<hkern u1="&#x1b0;" g2="uniFB03" k="-102" />
-<hkern u1="&#x1b0;" g2="uniFB02" k="-102" />
-<hkern u1="&#x1b0;" g2="uniFB01" k="-102" />
-<hkern u1="&#x1b0;" g2="ff" k="-102" />
-<hkern u1="&#x1b0;" u2="&#x1ef5;" k="-102" />
-<hkern u1="&#x1b0;" u2="&#x1e83;" k="-102" />
-<hkern u1="&#x1b0;" u2="&#x1e81;" k="-102" />
-<hkern u1="&#x1b0;" u2="&#x21b;" k="-102" />
-<hkern u1="&#x1b0;" u2="&#x175;" k="-102" />
-<hkern u1="&#x1b0;" u2="&#x165;" k="-102" />
-<hkern u1="&#x1b0;" u2="&#x163;" k="-102" />
-<hkern u1="&#x1b0;" u2="&#xfd;" k="-102" />
-<hkern u1="&#x1b0;" u2="y" k="-102" />
-<hkern u1="&#x1b0;" u2="x" k="-102" />
-<hkern u1="&#x1b0;" u2="w" k="-102" />
-<hkern u1="&#x1b0;" u2="v" k="-102" />
-<hkern u1="&#x1b0;" u2="t" k="-102" />
-<hkern u1="&#x1b0;" u2="f" k="-102" />
-<hkern u1="&#x1fa;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1fa;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1fa;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1fa;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1fa;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1fa;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1fa;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1fa;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1fa;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1fa;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1fa;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x178;" k="123" />
-<hkern u1="&#x1fa;" u2="&#x176;" k="123" />
-<hkern u1="&#x1fa;" u2="&#x174;" k="82" />
-<hkern u1="&#x1fa;" u2="&#x164;" k="143" />
-<hkern u1="&#x1fa;" u2="&#x162;" k="143" />
-<hkern u1="&#x1fa;" u2="&#x152;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x150;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x122;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x120;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x108;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x106;" k="41" />
-<hkern u1="&#x1fa;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1fa;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1fa;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1fa;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1fa;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1fa;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1fa;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1fa;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1fa;" u2="Y" k="123" />
-<hkern u1="&#x1fa;" u2="W" k="82" />
-<hkern u1="&#x1fa;" u2="V" k="82" />
-<hkern u1="&#x1fa;" u2="T" k="143" />
-<hkern u1="&#x1fa;" u2="Q" k="41" />
-<hkern u1="&#x1fa;" u2="O" k="41" />
-<hkern u1="&#x1fa;" u2="J" k="-266" />
-<hkern u1="&#x1fa;" u2="G" k="41" />
-<hkern u1="&#x1fa;" u2="C" k="41" />
-<hkern u1="&#x1fa;" u2="&#x27;" k="143" />
-<hkern u1="&#x1fa;" u2="&#x22;" k="143" />
-<hkern u1="&#x1fb;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1fb;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1fb;" u2="&#x27;" k="20" />
-<hkern u1="&#x1fb;" u2="&#x22;" k="20" />
-<hkern u1="&#x1fc;" u2="J" k="-123" />
-<hkern u1="&#x1fe;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1fe;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1fe;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x1eae;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x1eac;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x1e84;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x1e82;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x1e80;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x1e00;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x405;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x21a;" k="61" />
-<hkern u1="&#x1fe;" u2="&#x1fa;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x17d;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x17b;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x179;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x178;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x176;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x174;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x164;" k="61" />
-<hkern u1="&#x1fe;" u2="&#x162;" k="61" />
-<hkern u1="&#x1fe;" u2="&#x104;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x102;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x100;" k="41" />
-<hkern u1="&#x1fe;" u2="&#xdd;" k="20" />
-<hkern u1="&#x1fe;" u2="&#xc5;" k="41" />
-<hkern u1="&#x1fe;" u2="&#xc4;" k="41" />
-<hkern u1="&#x1fe;" u2="&#xc3;" k="41" />
-<hkern u1="&#x1fe;" u2="&#xc2;" k="41" />
-<hkern u1="&#x1fe;" u2="&#xc1;" k="41" />
-<hkern u1="&#x1fe;" u2="&#xc0;" k="41" />
-<hkern u1="&#x1fe;" u2="Z" k="20" />
-<hkern u1="&#x1fe;" u2="Y" k="20" />
-<hkern u1="&#x1fe;" u2="X" k="41" />
-<hkern u1="&#x1fe;" u2="W" k="20" />
-<hkern u1="&#x1fe;" u2="V" k="20" />
-<hkern u1="&#x1fe;" u2="T" k="61" />
-<hkern u1="&#x1fe;" u2="A" k="41" />
-<hkern u1="&#x1fe;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1fe;" u2="&#x2c;" k="82" />
-<hkern u1="&#x21a;" u2="&#x201e;" k="123" />
-<hkern u1="&#x21a;" u2="&#x201a;" k="123" />
-<hkern u1="&#x21a;" u2="&#x2015;" k="82" />
-<hkern u1="&#x21a;" u2="&#x2014;" k="82" />
-<hkern u1="&#x21a;" u2="&#x2013;" k="82" />
-<hkern u1="&#x21a;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1ef1;" k="102" />
-<hkern u1="&#x21a;" u2="&#x1eef;" k="102" />
-<hkern u1="&#x21a;" u2="&#x1eed;" k="102" />
-<hkern u1="&#x21a;" u2="&#x1eeb;" k="102" />
-<hkern u1="&#x21a;" u2="&#x1ee9;" k="102" />
-<hkern u1="&#x21a;" u2="&#x1ee7;" k="102" />
-<hkern u1="&#x21a;" u2="&#x1ee5;" k="102" />
-<hkern u1="&#x21a;" u2="&#x1ee3;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1ee1;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1edf;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1edd;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1edb;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1ed9;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1ed7;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1ed5;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1ed1;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1ecf;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1ecd;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1ec7;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ec5;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ec3;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ebf;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ebd;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ebb;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1eb9;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1eb7;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1eb6;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1eb5;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1eb4;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1eb3;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1eb2;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1eb1;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1eb0;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1eaf;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1eae;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ead;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1eac;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1eab;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1eaa;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ea9;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1ea8;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ea6;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ea5;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1ea4;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ea3;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1ea2;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ea1;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1ea0;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1e3f;" k="102" />
-<hkern u1="&#x21a;" u2="&#x1e01;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1e00;" k="143" />
-<hkern u1="&#x21a;" u2="&#x21a;" k="-41" />
-<hkern u1="&#x21a;" u2="&#x219;" k="123" />
-<hkern u1="&#x21a;" u2="&#x1ff;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1fd;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1fb;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1fa;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1b0;" k="102" />
-<hkern u1="&#x21a;" u2="&#x1a1;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x21a;" u2="&#x17e;" k="82" />
-<hkern u1="&#x21a;" u2="&#x17c;" k="82" />
-<hkern u1="&#x21a;" u2="&#x17a;" k="82" />
-<hkern u1="&#x21a;" u2="&#x175;" k="41" />
-<hkern u1="&#x21a;" u2="&#x173;" k="102" />
-<hkern u1="&#x21a;" u2="&#x171;" k="102" />
-<hkern u1="&#x21a;" u2="&#x16f;" k="102" />
-<hkern u1="&#x21a;" u2="&#x16d;" k="102" />
-<hkern u1="&#x21a;" u2="&#x16b;" k="102" />
-<hkern u1="&#x21a;" u2="&#x169;" k="102" />
-<hkern u1="&#x21a;" u2="&#x164;" k="-41" />
-<hkern u1="&#x21a;" u2="&#x162;" k="-41" />
-<hkern u1="&#x21a;" u2="&#x15f;" k="123" />
-<hkern u1="&#x21a;" u2="&#x15b;" k="123" />
-<hkern u1="&#x21a;" u2="&#x157;" k="102" />
-<hkern u1="&#x21a;" u2="&#x155;" k="102" />
-<hkern u1="&#x21a;" u2="&#x153;" k="143" />
-<hkern u1="&#x21a;" u2="&#x152;" k="41" />
-<hkern u1="&#x21a;" u2="&#x151;" k="143" />
-<hkern u1="&#x21a;" u2="&#x150;" k="41" />
-<hkern u1="&#x21a;" u2="&#x14f;" k="143" />
-<hkern u1="&#x21a;" u2="&#x14e;" k="41" />
-<hkern u1="&#x21a;" u2="&#x14d;" k="143" />
-<hkern u1="&#x21a;" u2="&#x14c;" k="41" />
-<hkern u1="&#x21a;" u2="&#x14b;" k="102" />
-<hkern u1="&#x21a;" u2="&#x146;" k="102" />
-<hkern u1="&#x21a;" u2="&#x144;" k="102" />
-<hkern u1="&#x21a;" u2="&#x138;" k="102" />
-<hkern u1="&#x21a;" u2="&#x123;" k="143" />
-<hkern u1="&#x21a;" u2="&#x122;" k="41" />
-<hkern u1="&#x21a;" u2="&#x121;" k="143" />
-<hkern u1="&#x21a;" u2="&#x120;" k="41" />
-<hkern u1="&#x21a;" u2="&#x11f;" k="143" />
-<hkern u1="&#x21a;" u2="&#x11e;" k="41" />
-<hkern u1="&#x21a;" u2="&#x11d;" k="143" />
-<hkern u1="&#x21a;" u2="&#x11c;" k="41" />
-<hkern u1="&#x21a;" u2="&#x11b;" k="143" />
-<hkern u1="&#x21a;" u2="&#x119;" k="143" />
-<hkern u1="&#x21a;" u2="&#x117;" k="143" />
-<hkern u1="&#x21a;" u2="&#x115;" k="143" />
-<hkern u1="&#x21a;" u2="&#x113;" k="143" />
-<hkern u1="&#x21a;" u2="&#x111;" k="143" />
-<hkern u1="&#x21a;" u2="&#x10f;" k="143" />
-<hkern u1="&#x21a;" u2="&#x10d;" k="143" />
-<hkern u1="&#x21a;" u2="&#x10c;" k="41" />
-<hkern u1="&#x21a;" u2="&#x10b;" k="143" />
-<hkern u1="&#x21a;" u2="&#x10a;" k="41" />
-<hkern u1="&#x21a;" u2="&#x109;" k="143" />
-<hkern u1="&#x21a;" u2="&#x108;" k="41" />
-<hkern u1="&#x21a;" u2="&#x107;" k="143" />
-<hkern u1="&#x21a;" u2="&#x106;" k="41" />
-<hkern u1="&#x21a;" u2="&#x105;" k="164" />
-<hkern u1="&#x21a;" u2="&#x104;" k="143" />
-<hkern u1="&#x21a;" u2="&#x103;" k="164" />
-<hkern u1="&#x21a;" u2="&#x102;" k="143" />
-<hkern u1="&#x21a;" u2="&#x101;" k="164" />
-<hkern u1="&#x21a;" u2="&#x100;" k="143" />
-<hkern u1="&#x21a;" u2="&#xfd;" k="41" />
-<hkern u1="&#x21a;" u2="&#xfc;" k="102" />
-<hkern u1="&#x21a;" u2="&#xfb;" k="102" />
-<hkern u1="&#x21a;" u2="&#xfa;" k="102" />
-<hkern u1="&#x21a;" u2="&#xf9;" k="102" />
-<hkern u1="&#x21a;" u2="&#xf8;" k="143" />
-<hkern u1="&#x21a;" u2="&#xf6;" k="143" />
-<hkern u1="&#x21a;" u2="&#xf5;" k="143" />
-<hkern u1="&#x21a;" u2="&#xf4;" k="143" />
-<hkern u1="&#x21a;" u2="&#xf3;" k="143" />
-<hkern u1="&#x21a;" u2="&#xf2;" k="143" />
-<hkern u1="&#x21a;" u2="&#xeb;" k="143" />
-<hkern u1="&#x21a;" u2="&#xea;" k="143" />
-<hkern u1="&#x21a;" u2="&#xe9;" k="143" />
-<hkern u1="&#x21a;" u2="&#xe8;" k="143" />
-<hkern u1="&#x21a;" u2="&#xe7;" k="143" />
-<hkern u1="&#x21a;" u2="&#xe6;" k="164" />
-<hkern u1="&#x21a;" u2="&#xe5;" k="164" />
-<hkern u1="&#x21a;" u2="&#xe4;" k="164" />
-<hkern u1="&#x21a;" u2="&#xe3;" k="164" />
-<hkern u1="&#x21a;" u2="&#xe2;" k="164" />
-<hkern u1="&#x21a;" u2="&#xe1;" k="164" />
-<hkern u1="&#x21a;" u2="&#xe0;" k="143" />
-<hkern u1="&#x21a;" u2="&#xd8;" k="41" />
-<hkern u1="&#x21a;" u2="&#xd6;" k="41" />
-<hkern u1="&#x21a;" u2="&#xd5;" k="41" />
-<hkern u1="&#x21a;" u2="&#xd4;" k="41" />
-<hkern u1="&#x21a;" u2="&#xd3;" k="41" />
-<hkern u1="&#x21a;" u2="&#xd2;" k="41" />
-<hkern u1="&#x21a;" u2="&#xc7;" k="41" />
-<hkern u1="&#x21a;" u2="&#xc5;" k="143" />
-<hkern u1="&#x21a;" u2="&#xc4;" k="143" />
-<hkern u1="&#x21a;" u2="&#xc3;" k="143" />
-<hkern u1="&#x21a;" u2="&#xc2;" k="143" />
-<hkern u1="&#x21a;" u2="&#xc1;" k="143" />
-<hkern u1="&#x21a;" u2="&#xc0;" k="143" />
-<hkern u1="&#x21a;" u2="z" k="82" />
-<hkern u1="&#x21a;" u2="y" k="41" />
-<hkern u1="&#x21a;" u2="x" k="41" />
-<hkern u1="&#x21a;" u2="w" k="41" />
-<hkern u1="&#x21a;" u2="v" k="41" />
-<hkern u1="&#x21a;" u2="u" k="102" />
-<hkern u1="&#x21a;" u2="s" k="123" />
-<hkern u1="&#x21a;" u2="r" k="102" />
-<hkern u1="&#x21a;" u2="q" k="143" />
-<hkern u1="&#x21a;" u2="p" k="102" />
-<hkern u1="&#x21a;" u2="o" k="143" />
-<hkern u1="&#x21a;" u2="n" k="102" />
-<hkern u1="&#x21a;" u2="m" k="102" />
-<hkern u1="&#x21a;" u2="g" k="143" />
-<hkern u1="&#x21a;" u2="e" k="143" />
-<hkern u1="&#x21a;" u2="d" k="143" />
-<hkern u1="&#x21a;" u2="c" k="143" />
-<hkern u1="&#x21a;" u2="a" k="164" />
-<hkern u1="&#x21a;" u2="T" k="-41" />
-<hkern u1="&#x21a;" u2="Q" k="41" />
-<hkern u1="&#x21a;" u2="O" k="41" />
-<hkern u1="&#x21a;" u2="G" k="41" />
-<hkern u1="&#x21a;" u2="C" k="41" />
-<hkern u1="&#x21a;" u2="A" k="143" />
-<hkern u1="&#x21a;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x21a;" u2="&#x2e;" k="123" />
-<hkern u1="&#x21a;" u2="&#x2d;" k="82" />
-<hkern u1="&#x21a;" u2="&#x2c;" k="123" />
-<hkern u1="&#x21b;" u2="&#x201d;" k="-41" />
-<hkern u1="&#x21b;" u2="&#x2019;" k="-41" />
-<hkern u1="&#x21b;" u2="&#x27;" k="-41" />
-<hkern u1="&#x21b;" u2="&#x22;" k="-41" />
-<hkern u1="&#x386;" u2="&#x201d;" k="143" />
-<hkern u1="&#x386;" u2="&#x2019;" k="143" />
-<hkern u1="&#x386;" u2="&#x3d2;" k="123" />
-<hkern u1="&#x386;" u2="&#x3ab;" k="123" />
-<hkern u1="&#x386;" u2="&#x3a8;" k="82" />
-<hkern u1="&#x386;" u2="&#x3a6;" k="41" />
-<hkern u1="&#x386;" u2="&#x3a5;" k="123" />
-<hkern u1="&#x386;" u2="&#x3a4;" k="143" />
-<hkern u1="&#x386;" u2="&#x39f;" k="41" />
-<hkern u1="&#x386;" u2="&#x398;" k="41" />
-<hkern u1="&#x386;" u2="&#x27;" k="143" />
-<hkern u1="&#x386;" u2="&#x22;" k="143" />
-<hkern u1="&#x38c;" u2="&#x201e;" k="82" />
-<hkern u1="&#x38c;" u2="&#x201a;" k="82" />
-<hkern u1="&#x38c;" u2="&#x3d2;" k="20" />
-<hkern u1="&#x38c;" u2="&#x3bb;" k="20" />
-<hkern u1="&#x38c;" u2="&#x3ab;" k="20" />
-<hkern u1="&#x38c;" u2="&#x3a8;" k="20" />
-<hkern u1="&#x38c;" u2="&#x3a7;" k="41" />
-<hkern u1="&#x38c;" u2="&#x3a5;" k="20" />
-<hkern u1="&#x38c;" u2="&#x3a4;" k="61" />
-<hkern u1="&#x38c;" u2="&#x3a3;" k="20" />
-<hkern u1="&#x38c;" u2="&#x39b;" k="41" />
-<hkern u1="&#x38c;" u2="&#x396;" k="20" />
-<hkern u1="&#x38c;" u2="&#x394;" k="41" />
-<hkern u1="&#x38c;" u2="&#x391;" k="41" />
-<hkern u1="&#x38c;" u2="&#x386;" k="41" />
-<hkern u1="&#x38c;" u2="&#x2e;" k="82" />
-<hkern u1="&#x38c;" u2="&#x2c;" k="82" />
-<hkern u1="&#x38e;" u2="&#x2126;" k="20" />
-<hkern u1="&#x38e;" u2="&#x201e;" k="123" />
-<hkern u1="&#x38e;" u2="&#x201a;" k="123" />
-<hkern u1="&#x38e;" u2="&#x3ce;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3cd;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3cc;" k="102" />
-<hkern u1="&#x38e;" u2="&#x3cb;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3c9;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3c8;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3c6;" k="102" />
-<hkern u1="&#x38e;" u2="&#x3c5;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3c3;" k="102" />
-<hkern u1="&#x38e;" u2="&#x3c2;" k="102" />
-<hkern u1="&#x38e;" u2="&#x3c1;" k="102" />
-<hkern u1="&#x38e;" u2="&#x3bf;" k="102" />
-<hkern u1="&#x38e;" u2="&#x3bc;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3ba;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3b9;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3b7;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3b5;" k="82" />
-<hkern u1="&#x38e;" u2="&#x3b4;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3b1;" k="102" />
-<hkern u1="&#x38e;" u2="&#x3b0;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3af;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3ae;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3ad;" k="82" />
-<hkern u1="&#x38e;" u2="&#x3ac;" k="102" />
-<hkern u1="&#x38e;" u2="&#x3a9;" k="20" />
-<hkern u1="&#x38e;" u2="&#x3a6;" k="61" />
-<hkern u1="&#x38e;" u2="&#x39f;" k="41" />
-<hkern u1="&#x38e;" u2="&#x39b;" k="123" />
-<hkern u1="&#x38e;" u2="&#x398;" k="41" />
-<hkern u1="&#x38e;" u2="&#x394;" k="123" />
-<hkern u1="&#x38e;" u2="&#x391;" k="123" />
-<hkern u1="&#x38e;" u2="&#x386;" k="123" />
-<hkern u1="&#x38e;" u2="&#x2e;" k="123" />
-<hkern u1="&#x38e;" u2="&#x2c;" k="123" />
-<hkern u1="&#x38f;" u2="&#x3d2;" k="20" />
-<hkern u1="&#x38f;" u2="&#x3ab;" k="20" />
-<hkern u1="&#x38f;" u2="&#x3a5;" k="20" />
-<hkern u1="&#x38f;" u2="&#x3a4;" k="41" />
-<hkern u1="&#x390;" u2="&#x201d;" k="41" />
-<hkern u1="&#x390;" u2="&#x2019;" k="41" />
-<hkern u1="&#x390;" u2="&#x27;" k="41" />
-<hkern u1="&#x390;" u2="&#x22;" k="41" />
-<hkern u1="&#x391;" u2="&#x201d;" k="143" />
-<hkern u1="&#x391;" u2="&#x2019;" k="143" />
-<hkern u1="&#x391;" u2="&#x3d2;" k="123" />
-<hkern u1="&#x391;" u2="&#x3ab;" k="123" />
-<hkern u1="&#x391;" u2="&#x3a8;" k="82" />
-<hkern u1="&#x391;" u2="&#x3a6;" k="41" />
-<hkern u1="&#x391;" u2="&#x3a5;" k="123" />
-<hkern u1="&#x391;" u2="&#x3a4;" k="143" />
-<hkern u1="&#x391;" u2="&#x39f;" k="41" />
-<hkern u1="&#x391;" u2="&#x398;" k="41" />
-<hkern u1="&#x391;" u2="&#x27;" k="143" />
-<hkern u1="&#x391;" u2="&#x22;" k="143" />
-<hkern u1="&#x392;" u2="&#x201e;" k="82" />
-<hkern u1="&#x392;" u2="&#x201a;" k="82" />
-<hkern u1="&#x392;" u2="&#x3a7;" k="41" />
-<hkern u1="&#x392;" u2="&#x39b;" k="41" />
-<hkern u1="&#x392;" u2="&#x394;" k="41" />
-<hkern u1="&#x392;" u2="&#x391;" k="41" />
-<hkern u1="&#x392;" u2="&#x386;" k="41" />
-<hkern u1="&#x392;" u2="&#x2e;" k="82" />
-<hkern u1="&#x392;" u2="&#x2c;" k="82" />
-<hkern u1="&#x393;" u2="&#x2126;" k="61" />
-<hkern u1="&#x393;" u2="&#x201e;" k="123" />
-<hkern u1="&#x393;" u2="&#x201a;" k="123" />
-<hkern u1="&#x393;" u2="&#x2015;" k="82" />
-<hkern u1="&#x393;" u2="&#x2014;" k="82" />
-<hkern u1="&#x393;" u2="&#x2013;" k="82" />
-<hkern u1="&#x393;" u2="&#x3d1;" k="41" />
-<hkern u1="&#x393;" u2="&#x3ce;" k="102" />
-<hkern u1="&#x393;" u2="&#x3cd;" k="102" />
-<hkern u1="&#x393;" u2="&#x3cc;" k="143" />
-<hkern u1="&#x393;" u2="&#x3cb;" k="102" />
-<hkern u1="&#x393;" u2="&#x3c9;" k="102" />
-<hkern u1="&#x393;" u2="&#x3c8;" k="102" />
-<hkern u1="&#x393;" u2="&#x3c7;" k="41" />
-<hkern u1="&#x393;" u2="&#x3c6;" k="143" />
-<hkern u1="&#x393;" u2="&#x3c5;" k="102" />
-<hkern u1="&#x393;" u2="&#x3c3;" k="143" />
-<hkern u1="&#x393;" u2="&#x3c2;" k="143" />
-<hkern u1="&#x393;" u2="&#x3c1;" k="102" />
-<hkern u1="&#x393;" u2="&#x3bf;" k="143" />
-<hkern u1="&#x393;" u2="&#x3bd;" k="41" />
-<hkern u1="&#x393;" u2="&#x3bc;" k="102" />
-<hkern u1="&#x393;" u2="&#x3ba;" k="102" />
-<hkern u1="&#x393;" u2="&#x3b9;" k="82" />
-<hkern u1="&#x393;" u2="&#x3b7;" k="102" />
-<hkern u1="&#x393;" u2="&#x3b5;" k="102" />
-<hkern u1="&#x393;" u2="&#x3b4;" k="61" />
-<hkern u1="&#x393;" u2="&#x3b3;" k="41" />
-<hkern u1="&#x393;" u2="&#x3b1;" k="143" />
-<hkern u1="&#x393;" u2="&#x3b0;" k="102" />
-<hkern u1="&#x393;" u2="&#x3af;" k="82" />
-<hkern u1="&#x393;" u2="&#x3ae;" k="102" />
-<hkern u1="&#x393;" u2="&#x3ad;" k="102" />
-<hkern u1="&#x393;" u2="&#x3ac;" k="143" />
-<hkern u1="&#x393;" u2="&#x3a9;" k="61" />
-<hkern u1="&#x393;" u2="&#x3a6;" k="102" />
-<hkern u1="&#x393;" u2="&#x39f;" k="61" />
-<hkern u1="&#x393;" u2="&#x39b;" k="164" />
-<hkern u1="&#x393;" u2="&#x398;" k="61" />
-<hkern u1="&#x393;" u2="&#x394;" k="164" />
-<hkern u1="&#x393;" u2="&#x391;" k="164" />
-<hkern u1="&#x393;" u2="&#x386;" k="164" />
-<hkern u1="&#x393;" u2="&#x2e;" k="123" />
-<hkern u1="&#x393;" u2="&#x2d;" k="82" />
-<hkern u1="&#x393;" u2="&#x2c;" k="123" />
-<hkern u1="&#x394;" u2="&#x201d;" k="143" />
-<hkern u1="&#x394;" u2="&#x2019;" k="143" />
-<hkern u1="&#x394;" u2="&#x3d2;" k="123" />
-<hkern u1="&#x394;" u2="&#x3ab;" k="123" />
-<hkern u1="&#x394;" u2="&#x3a8;" k="82" />
-<hkern u1="&#x394;" u2="&#x3a6;" k="41" />
-<hkern u1="&#x394;" u2="&#x3a5;" k="123" />
-<hkern u1="&#x394;" u2="&#x3a4;" k="143" />
-<hkern u1="&#x394;" u2="&#x39f;" k="41" />
-<hkern u1="&#x394;" u2="&#x398;" k="41" />
-<hkern u1="&#x394;" u2="&#x27;" k="143" />
-<hkern u1="&#x394;" u2="&#x22;" k="143" />
-<hkern u1="&#x396;" u2="&#x3a6;" k="61" />
-<hkern u1="&#x396;" u2="&#x39f;" k="20" />
-<hkern u1="&#x396;" u2="&#x398;" k="20" />
-<hkern u1="&#x398;" u2="&#x201e;" k="82" />
-<hkern u1="&#x398;" u2="&#x201a;" k="82" />
-<hkern u1="&#x398;" u2="&#x3d2;" k="20" />
-<hkern u1="&#x398;" u2="&#x3bb;" k="20" />
-<hkern u1="&#x398;" u2="&#x3ab;" k="20" />
-<hkern u1="&#x398;" u2="&#x3a8;" k="20" />
-<hkern u1="&#x398;" u2="&#x3a7;" k="41" />
-<hkern u1="&#x398;" u2="&#x3a5;" k="20" />
-<hkern u1="&#x398;" u2="&#x3a4;" k="61" />
-<hkern u1="&#x398;" u2="&#x3a3;" k="20" />
-<hkern u1="&#x398;" u2="&#x39b;" k="41" />
-<hkern u1="&#x398;" u2="&#x396;" k="20" />
-<hkern u1="&#x398;" u2="&#x394;" k="41" />
-<hkern u1="&#x398;" u2="&#x391;" k="41" />
-<hkern u1="&#x398;" u2="&#x386;" k="41" />
-<hkern u1="&#x398;" u2="&#x2e;" k="82" />
-<hkern u1="&#x398;" u2="&#x2c;" k="82" />
-<hkern u1="&#x39a;" u2="&#x3c4;" k="20" />
-<hkern u1="&#x39a;" u2="&#x3c0;" k="20" />
-<hkern u1="&#x39a;" u2="&#x3a6;" k="61" />
-<hkern u1="&#x39a;" u2="&#x39f;" k="41" />
-<hkern u1="&#x39a;" u2="&#x398;" k="41" />
-<hkern u1="&#x39b;" u2="&#x201d;" k="143" />
-<hkern u1="&#x39b;" u2="&#x2019;" k="143" />
-<hkern u1="&#x39b;" u2="&#x3d2;" k="123" />
-<hkern u1="&#x39b;" u2="&#x3ab;" k="123" />
-<hkern u1="&#x39b;" u2="&#x3a8;" k="82" />
-<hkern u1="&#x39b;" u2="&#x3a6;" k="41" />
-<hkern u1="&#x39b;" u2="&#x3a5;" k="123" />
-<hkern u1="&#x39b;" u2="&#x3a4;" k="143" />
-<hkern u1="&#x39b;" u2="&#x39f;" k="41" />
-<hkern u1="&#x39b;" u2="&#x398;" k="41" />
-<hkern u1="&#x39b;" u2="&#x27;" k="143" />
-<hkern u1="&#x39b;" u2="&#x22;" k="143" />
-<hkern u1="&#x39f;" u2="&#x201e;" k="82" />
-<hkern u1="&#x39f;" u2="&#x201a;" k="82" />
-<hkern u1="&#x39f;" u2="&#x3d2;" k="20" />
-<hkern u1="&#x39f;" u2="&#x3bb;" k="20" />
-<hkern u1="&#x39f;" u2="&#x3ab;" k="20" />
-<hkern u1="&#x39f;" u2="&#x3a8;" k="20" />
-<hkern u1="&#x39f;" u2="&#x3a7;" k="41" />
-<hkern u1="&#x39f;" u2="&#x3a5;" k="20" />
-<hkern u1="&#x39f;" u2="&#x3a4;" k="61" />
-<hkern u1="&#x39f;" u2="&#x3a3;" k="20" />
-<hkern u1="&#x39f;" u2="&#x39b;" k="41" />
-<hkern u1="&#x39f;" u2="&#x396;" k="20" />
-<hkern u1="&#x39f;" u2="&#x394;" k="41" />
-<hkern u1="&#x39f;" u2="&#x391;" k="41" />
-<hkern u1="&#x39f;" u2="&#x386;" k="41" />
-<hkern u1="&#x39f;" u2="&#x2e;" k="82" />
-<hkern u1="&#x39f;" u2="&#x2c;" k="82" />
-<hkern u1="&#x3a1;" u2="&#x201e;" k="266" />
-<hkern u1="&#x3a1;" u2="&#x201a;" k="266" />
-<hkern u1="&#x3a1;" u2="&#x3bb;" k="41" />
-<hkern u1="&#x3a1;" u2="&#x3a7;" k="41" />
-<hkern u1="&#x3a1;" u2="&#x39b;" k="102" />
-<hkern u1="&#x3a1;" u2="&#x396;" k="20" />
-<hkern u1="&#x3a1;" u2="&#x394;" k="102" />
-<hkern u1="&#x3a1;" u2="&#x391;" k="102" />
-<hkern u1="&#x3a1;" u2="&#x386;" k="102" />
-<hkern u1="&#x3a1;" u2="&#x2e;" k="266" />
-<hkern u1="&#x3a1;" u2="&#x2c;" k="266" />
-<hkern u1="&#x3a4;" u2="&#x2126;" k="61" />
-<hkern u1="&#x3a4;" u2="&#x201e;" k="123" />
-<hkern u1="&#x3a4;" u2="&#x201a;" k="123" />
-<hkern u1="&#x3a4;" u2="&#x2015;" k="82" />
-<hkern u1="&#x3a4;" u2="&#x2014;" k="82" />
-<hkern u1="&#x3a4;" u2="&#x2013;" k="82" />
-<hkern u1="&#x3a4;" u2="&#x3d1;" k="41" />
-<hkern u1="&#x3a4;" u2="&#x3ce;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3cd;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3cc;" k="143" />
-<hkern u1="&#x3a4;" u2="&#x3cb;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3c9;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3c8;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3c7;" k="41" />
-<hkern u1="&#x3a4;" u2="&#x3c6;" k="143" />
-<hkern u1="&#x3a4;" u2="&#x3c5;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3c3;" k="143" />
-<hkern u1="&#x3a4;" u2="&#x3c2;" k="143" />
-<hkern u1="&#x3a4;" u2="&#x3c1;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3bf;" k="143" />
-<hkern u1="&#x3a4;" u2="&#x3bd;" k="41" />
-<hkern u1="&#x3a4;" u2="&#x3bc;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3ba;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3b9;" k="82" />
-<hkern u1="&#x3a4;" u2="&#x3b7;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3b5;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3b4;" k="61" />
-<hkern u1="&#x3a4;" u2="&#x3b3;" k="41" />
-<hkern u1="&#x3a4;" u2="&#x3b1;" k="143" />
-<hkern u1="&#x3a4;" u2="&#x3b0;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3af;" k="82" />
-<hkern u1="&#x3a4;" u2="&#x3ae;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3ad;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3ac;" k="143" />
-<hkern u1="&#x3a4;" u2="&#x3a9;" k="61" />
-<hkern u1="&#x3a4;" u2="&#x3a6;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x39f;" k="61" />
-<hkern u1="&#x3a4;" u2="&#x39b;" k="164" />
-<hkern u1="&#x3a4;" u2="&#x398;" k="61" />
-<hkern u1="&#x3a4;" u2="&#x394;" k="164" />
-<hkern u1="&#x3a4;" u2="&#x391;" k="164" />
-<hkern u1="&#x3a4;" u2="&#x386;" k="164" />
-<hkern u1="&#x3a4;" u2="&#x2e;" k="123" />
-<hkern u1="&#x3a4;" u2="&#x2d;" k="82" />
-<hkern u1="&#x3a4;" u2="&#x2c;" k="123" />
-<hkern u1="&#x3a5;" u2="&#x2126;" k="20" />
-<hkern u1="&#x3a5;" u2="&#x201e;" k="123" />
-<hkern u1="&#x3a5;" u2="&#x201a;" k="123" />
-<hkern u1="&#x3a5;" u2="&#x3ce;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3cd;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3cc;" k="102" />
-<hkern u1="&#x3a5;" u2="&#x3cb;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3c9;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3c8;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3c6;" k="102" />
-<hkern u1="&#x3a5;" u2="&#x3c5;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3c3;" k="102" />
-<hkern u1="&#x3a5;" u2="&#x3c2;" k="102" />
-<hkern u1="&#x3a5;" u2="&#x3c1;" k="102" />
-<hkern u1="&#x3a5;" u2="&#x3bf;" k="102" />
-<hkern u1="&#x3a5;" u2="&#x3bc;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3ba;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3b9;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3b7;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3b5;" k="82" />
-<hkern u1="&#x3a5;" u2="&#x3b4;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3b1;" k="102" />
-<hkern u1="&#x3a5;" u2="&#x3b0;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3af;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3ae;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3ad;" k="82" />
-<hkern u1="&#x3a5;" u2="&#x3ac;" k="102" />
-<hkern u1="&#x3a5;" u2="&#x3a9;" k="20" />
-<hkern u1="&#x3a5;" u2="&#x3a6;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x39f;" k="41" />
-<hkern u1="&#x3a5;" u2="&#x39b;" k="123" />
-<hkern u1="&#x3a5;" u2="&#x398;" k="41" />
-<hkern u1="&#x3a5;" u2="&#x394;" k="123" />
-<hkern u1="&#x3a5;" u2="&#x391;" k="123" />
-<hkern u1="&#x3a5;" u2="&#x386;" k="123" />
-<hkern u1="&#x3a5;" u2="&#x2e;" k="123" />
-<hkern u1="&#x3a5;" u2="&#x2c;" k="123" />
-<hkern u1="&#x3a6;" u2="&#x201e;" k="102" />
-<hkern u1="&#x3a6;" u2="&#x201a;" k="102" />
-<hkern u1="&#x3a6;" u2="&#x3d2;" k="61" />
-<hkern u1="&#x3a6;" u2="&#x3bb;" k="20" />
-<hkern u1="&#x3a6;" u2="&#x3ab;" k="61" />
-<hkern u1="&#x3a6;" u2="&#x3a7;" k="20" />
-<hkern u1="&#x3a6;" u2="&#x3a5;" k="61" />
-<hkern u1="&#x3a6;" u2="&#x3a4;" k="82" />
-<hkern u1="&#x3a6;" u2="&#x3a3;" k="20" />
-<hkern u1="&#x3a6;" u2="&#x39b;" k="41" />
-<hkern u1="&#x3a6;" u2="&#x396;" k="61" />
-<hkern u1="&#x3a6;" u2="&#x394;" k="41" />
-<hkern u1="&#x3a6;" u2="&#x391;" k="41" />
-<hkern u1="&#x3a6;" u2="&#x386;" k="41" />
-<hkern u1="&#x3a6;" u2="&#x2e;" k="102" />
-<hkern u1="&#x3a6;" u2="&#x2c;" k="102" />
-<hkern u1="&#x3a7;" u2="&#x3c4;" k="20" />
-<hkern u1="&#x3a7;" u2="&#x3c0;" k="20" />
-<hkern u1="&#x3a7;" u2="&#x3a6;" k="61" />
-<hkern u1="&#x3a7;" u2="&#x39f;" k="41" />
-<hkern u1="&#x3a7;" u2="&#x398;" k="41" />
-<hkern u1="&#x3a8;" u2="&#x201e;" k="123" />
-<hkern u1="&#x3a8;" u2="&#x201a;" k="123" />
-<hkern u1="&#x3a8;" u2="&#x39f;" k="20" />
-<hkern u1="&#x3a8;" u2="&#x39b;" k="82" />
-<hkern u1="&#x3a8;" u2="&#x398;" k="20" />
-<hkern u1="&#x3a8;" u2="&#x394;" k="82" />
-<hkern u1="&#x3a8;" u2="&#x391;" k="82" />
-<hkern u1="&#x3a8;" u2="&#x386;" k="82" />
-<hkern u1="&#x3a8;" u2="&#x2e;" k="123" />
-<hkern u1="&#x3a8;" u2="&#x2c;" k="123" />
-<hkern u1="&#x3a9;" u2="&#x3d2;" k="20" />
-<hkern u1="&#x3a9;" u2="&#x3ab;" k="20" />
-<hkern u1="&#x3a9;" u2="&#x3a5;" k="20" />
-<hkern u1="&#x3a9;" u2="&#x3a4;" k="41" />
-<hkern u1="&#x3ab;" u2="&#x2126;" k="20" />
-<hkern u1="&#x3ab;" u2="&#x201e;" k="123" />
-<hkern u1="&#x3ab;" u2="&#x201a;" k="123" />
-<hkern u1="&#x3ab;" u2="&#x3ce;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3cd;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3cc;" k="102" />
-<hkern u1="&#x3ab;" u2="&#x3cb;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3c9;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3c8;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3c6;" k="102" />
-<hkern u1="&#x3ab;" u2="&#x3c5;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3c3;" k="102" />
-<hkern u1="&#x3ab;" u2="&#x3c2;" k="102" />
-<hkern u1="&#x3ab;" u2="&#x3c1;" k="102" />
-<hkern u1="&#x3ab;" u2="&#x3bf;" k="102" />
-<hkern u1="&#x3ab;" u2="&#x3bc;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3ba;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3b9;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3b7;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3b5;" k="82" />
-<hkern u1="&#x3ab;" u2="&#x3b4;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3b1;" k="102" />
-<hkern u1="&#x3ab;" u2="&#x3b0;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3af;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3ae;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3ad;" k="82" />
-<hkern u1="&#x3ab;" u2="&#x3ac;" k="102" />
-<hkern u1="&#x3ab;" u2="&#x3a9;" k="20" />
-<hkern u1="&#x3ab;" u2="&#x3a6;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x39f;" k="41" />
-<hkern u1="&#x3ab;" u2="&#x39b;" k="123" />
-<hkern u1="&#x3ab;" u2="&#x398;" k="41" />
-<hkern u1="&#x3ab;" u2="&#x394;" k="123" />
-<hkern u1="&#x3ab;" u2="&#x391;" k="123" />
-<hkern u1="&#x3ab;" u2="&#x386;" k="123" />
-<hkern u1="&#x3ab;" u2="&#x2e;" k="123" />
-<hkern u1="&#x3ab;" u2="&#x2c;" k="123" />
-<hkern u1="&#x3ac;" u2="&#x3bb;" k="-41" />
-<hkern u1="&#x3ae;" u2="&#x201d;" k="20" />
-<hkern u1="&#x3ae;" u2="&#x2019;" k="20" />
-<hkern u1="&#x3ae;" u2="&#x27;" k="20" />
-<hkern u1="&#x3ae;" u2="&#x22;" k="20" />
-<hkern u1="&#x3af;" u2="&#x201d;" k="82" />
-<hkern u1="&#x3af;" u2="&#x2019;" k="82" />
-<hkern u1="&#x3af;" u2="&#x3c4;" k="20" />
-<hkern u1="&#x3af;" u2="&#x3c0;" k="20" />
-<hkern u1="&#x3af;" u2="&#x27;" k="82" />
-<hkern u1="&#x3af;" u2="&#x22;" k="82" />
-<hkern u1="&#x3b1;" u2="&#x3bb;" k="-41" />
-<hkern u1="&#x3b3;" u2="&#x201e;" k="82" />
-<hkern u1="&#x3b3;" u2="&#x201a;" k="82" />
-<hkern u1="&#x3b3;" u2="&#x3bb;" k="20" />
-<hkern u1="&#x3b3;" u2="&#x2e;" k="82" />
-<hkern u1="&#x3b3;" u2="&#x2c;" k="82" />
-<hkern u1="&#x3b6;" u2="&#x2015;" k="102" />
-<hkern u1="&#x3b6;" u2="&#x2014;" k="102" />
-<hkern u1="&#x3b6;" u2="&#x2013;" k="102" />
-<hkern u1="&#x3b6;" u2="&#x3cc;" k="41" />
-<hkern u1="&#x3b6;" u2="&#x3c6;" k="41" />
-<hkern u1="&#x3b6;" u2="&#x3c4;" k="41" />
-<hkern u1="&#x3b6;" u2="&#x3c3;" k="41" />
-<hkern u1="&#x3b6;" u2="&#x3c2;" k="41" />
-<hkern u1="&#x3b6;" u2="&#x3c0;" k="41" />
-<hkern u1="&#x3b6;" u2="&#x3bf;" k="41" />
-<hkern u1="&#x3b6;" u2="&#x3b4;" k="41" />
-<hkern u1="&#x3b6;" u2="&#x3b1;" k="41" />
-<hkern u1="&#x3b6;" u2="&#x3ac;" k="41" />
-<hkern u1="&#x3b6;" u2="&#x2d;" k="102" />
-<hkern u1="&#x3b7;" u2="&#x201d;" k="20" />
-<hkern u1="&#x3b7;" u2="&#x2019;" k="20" />
-<hkern u1="&#x3b7;" u2="&#x27;" k="20" />
-<hkern u1="&#x3b7;" u2="&#x22;" k="20" />
-<hkern u1="&#x3b8;" u2="&#x201e;" k="41" />
-<hkern u1="&#x3b8;" u2="&#x201a;" k="41" />
-<hkern u1="&#x3b8;" u2="&#x2e;" k="41" />
-<hkern u1="&#x3b8;" u2="&#x2c;" k="41" />
-<hkern u1="&#x3b9;" u2="&#x201d;" k="82" />
-<hkern u1="&#x3b9;" u2="&#x2019;" k="82" />
-<hkern u1="&#x3b9;" u2="&#x3c4;" k="20" />
-<hkern u1="&#x3b9;" u2="&#x3c0;" k="20" />
-<hkern u1="&#x3b9;" u2="&#x27;" k="82" />
-<hkern u1="&#x3b9;" u2="&#x22;" k="82" />
-<hkern u1="&#x3ba;" u2="&#x3cc;" k="41" />
-<hkern u1="&#x3ba;" u2="&#x3c6;" k="41" />
-<hkern u1="&#x3ba;" u2="&#x3c3;" k="41" />
-<hkern u1="&#x3ba;" u2="&#x3c2;" k="41" />
-<hkern u1="&#x3ba;" u2="&#x3bf;" k="41" />
-<hkern u1="&#x3ba;" u2="&#x3b1;" k="41" />
-<hkern u1="&#x3ba;" u2="&#x3ac;" k="41" />
-<hkern u1="&#x3bb;" u2="&#x201d;" k="123" />
-<hkern u1="&#x3bb;" u2="&#x2019;" k="123" />
-<hkern u1="&#x3bb;" u2="&#x3cc;" k="20" />
-<hkern u1="&#x3bb;" u2="&#x3c6;" k="20" />
-<hkern u1="&#x3bb;" u2="&#x3c4;" k="41" />
-<hkern u1="&#x3bb;" u2="&#x3c3;" k="20" />
-<hkern u1="&#x3bb;" u2="&#x3c2;" k="20" />
-<hkern u1="&#x3bb;" u2="&#x3c0;" k="41" />
-<hkern u1="&#x3bb;" u2="&#x3bf;" k="20" />
-<hkern u1="&#x3bb;" u2="&#x3bd;" k="41" />
-<hkern u1="&#x3bb;" u2="&#x3b3;" k="41" />
-<hkern u1="&#x3bb;" u2="&#x3b1;" k="20" />
-<hkern u1="&#x3bb;" u2="&#x3ac;" k="20" />
-<hkern u1="&#x3bb;" u2="&#x27;" k="123" />
-<hkern u1="&#x3bb;" u2="&#x22;" k="123" />
-<hkern u1="&#x3bd;" u2="&#x201e;" k="82" />
-<hkern u1="&#x3bd;" u2="&#x201a;" k="82" />
-<hkern u1="&#x3bd;" u2="&#x3bb;" k="20" />
-<hkern u1="&#x3bd;" u2="&#x2e;" k="82" />
-<hkern u1="&#x3bd;" u2="&#x2c;" k="82" />
-<hkern u1="&#x3bf;" u2="&#x201d;" k="20" />
-<hkern u1="&#x3bf;" u2="&#x2019;" k="20" />
-<hkern u1="&#x3bf;" u2="&#x3bd;" k="41" />
-<hkern u1="&#x3bf;" u2="&#x3b3;" k="41" />
-<hkern u1="&#x3bf;" u2="&#x27;" k="20" />
-<hkern u1="&#x3bf;" u2="&#x22;" k="20" />
-<hkern u1="&#x3c1;" u2="&#x201d;" k="20" />
-<hkern u1="&#x3c1;" u2="&#x2019;" k="20" />
-<hkern u1="&#x3c1;" u2="&#x3bd;" k="41" />
-<hkern u1="&#x3c1;" u2="&#x3b3;" k="41" />
-<hkern u1="&#x3c1;" u2="&#x27;" k="20" />
-<hkern u1="&#x3c1;" u2="&#x22;" k="20" />
-<hkern u1="&#x3c3;" u2="&#x201e;" k="20" />
-<hkern u1="&#x3c3;" u2="&#x201a;" k="20" />
-<hkern u1="&#x3c3;" u2="&#x2e;" k="20" />
-<hkern u1="&#x3c3;" u2="&#x2c;" k="20" />
-<hkern u1="&#x3c6;" u2="&#x201d;" k="20" />
-<hkern u1="&#x3c6;" u2="&#x2019;" k="20" />
-<hkern u1="&#x3c6;" u2="&#x3bd;" k="41" />
-<hkern u1="&#x3c6;" u2="&#x3b3;" k="41" />
-<hkern u1="&#x3c6;" u2="&#x27;" k="20" />
-<hkern u1="&#x3c6;" u2="&#x22;" k="20" />
-<hkern u1="&#x3c7;" u2="&#x201e;" k="61" />
-<hkern u1="&#x3c7;" u2="&#x201a;" k="61" />
-<hkern u1="&#x3c7;" u2="&#x2015;" k="41" />
-<hkern u1="&#x3c7;" u2="&#x2014;" k="41" />
-<hkern u1="&#x3c7;" u2="&#x2013;" k="41" />
-<hkern u1="&#x3c7;" u2="&#x3cc;" k="41" />
-<hkern u1="&#x3c7;" u2="&#x3c6;" k="41" />
-<hkern u1="&#x3c7;" u2="&#x3c3;" k="41" />
-<hkern u1="&#x3c7;" u2="&#x3c2;" k="41" />
-<hkern u1="&#x3c7;" u2="&#x3bf;" k="41" />
-<hkern u1="&#x3c7;" u2="&#x3b4;" k="41" />
-<hkern u1="&#x3c7;" u2="&#x3b1;" k="41" />
-<hkern u1="&#x3c7;" u2="&#x3ac;" k="41" />
-<hkern u1="&#x3c7;" u2="&#x2e;" k="61" />
-<hkern u1="&#x3c7;" u2="&#x2d;" k="41" />
-<hkern u1="&#x3c7;" u2="&#x2c;" k="61" />
-<hkern u1="&#x3ca;" u2="&#x201d;" k="41" />
-<hkern u1="&#x3ca;" u2="&#x2019;" k="41" />
-<hkern u1="&#x3ca;" u2="&#x27;" k="41" />
-<hkern u1="&#x3ca;" u2="&#x22;" k="41" />
-<hkern u1="&#x3cc;" u2="&#x201d;" k="20" />
-<hkern u1="&#x3cc;" u2="&#x2019;" k="20" />
-<hkern u1="&#x3cc;" u2="&#x3bd;" k="41" />
-<hkern u1="&#x3cc;" u2="&#x3b3;" k="41" />
-<hkern u1="&#x3cc;" u2="&#x27;" k="20" />
-<hkern u1="&#x3cc;" u2="&#x22;" k="20" />
-<hkern u1="&#x3d1;" u2="&#x201e;" k="61" />
-<hkern u1="&#x3d1;" u2="&#x201a;" k="61" />
-<hkern u1="&#x3d1;" u2="&#x2e;" k="61" />
-<hkern u1="&#x3d1;" u2="&#x2c;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x2126;" k="20" />
-<hkern u1="&#x3d2;" u2="&#x201e;" k="123" />
-<hkern u1="&#x3d2;" u2="&#x201a;" k="123" />
-<hkern u1="&#x3d2;" u2="&#x3ce;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3cd;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3cc;" k="102" />
-<hkern u1="&#x3d2;" u2="&#x3cb;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3c9;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3c8;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3c6;" k="102" />
-<hkern u1="&#x3d2;" u2="&#x3c5;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3c3;" k="102" />
-<hkern u1="&#x3d2;" u2="&#x3c2;" k="102" />
-<hkern u1="&#x3d2;" u2="&#x3c1;" k="102" />
-<hkern u1="&#x3d2;" u2="&#x3bf;" k="102" />
-<hkern u1="&#x3d2;" u2="&#x3bc;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3ba;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3b9;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3b7;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3b5;" k="82" />
-<hkern u1="&#x3d2;" u2="&#x3b4;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3b1;" k="102" />
-<hkern u1="&#x3d2;" u2="&#x3b0;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3af;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3ae;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3ad;" k="82" />
-<hkern u1="&#x3d2;" u2="&#x3ac;" k="102" />
-<hkern u1="&#x3d2;" u2="&#x3a9;" k="20" />
-<hkern u1="&#x3d2;" u2="&#x3a6;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x39f;" k="41" />
-<hkern u1="&#x3d2;" u2="&#x39b;" k="123" />
-<hkern u1="&#x3d2;" u2="&#x398;" k="41" />
-<hkern u1="&#x3d2;" u2="&#x394;" k="123" />
-<hkern u1="&#x3d2;" u2="&#x391;" k="123" />
-<hkern u1="&#x3d2;" u2="&#x386;" k="123" />
-<hkern u1="&#x3d2;" u2="&#x2e;" k="123" />
-<hkern u1="&#x3d2;" u2="&#x2c;" k="123" />
-<hkern u1="&#x402;" u2="&#x201d;" k="82" />
-<hkern u1="&#x402;" u2="&#x2019;" k="82" />
-<hkern u1="&#x402;" u2="&#x50f;" k="41" />
-<hkern u1="&#x402;" u2="&#x50e;" k="123" />
-<hkern u1="&#x402;" u2="&#x507;" k="61" />
-<hkern u1="&#x402;" u2="&#x506;" k="102" />
-<hkern u1="&#x402;" u2="&#x505;" k="61" />
-<hkern u1="&#x402;" u2="&#x504;" k="102" />
-<hkern u1="&#x402;" u2="&#x4fa;" k="82" />
-<hkern u1="&#x402;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x402;" u2="&#x4f4;" k="102" />
-<hkern u1="&#x402;" u2="&#x4f3;" k="41" />
-<hkern u1="&#x402;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x402;" u2="&#x4f1;" k="41" />
-<hkern u1="&#x402;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x402;" u2="&#x4ef;" k="41" />
-<hkern u1="&#x402;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x402;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x402;" u2="&#x4cb;" k="102" />
-<hkern u1="&#x402;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x402;" u2="&#x4b8;" k="102" />
-<hkern u1="&#x402;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x402;" u2="&#x4b6;" k="102" />
-<hkern u1="&#x402;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x402;" u2="&#x4b4;" k="123" />
-<hkern u1="&#x402;" u2="&#x4b1;" k="41" />
-<hkern u1="&#x402;" u2="&#x4b0;" k="102" />
-<hkern u1="&#x402;" u2="&#x4af;" k="41" />
-<hkern u1="&#x402;" u2="&#x4ae;" k="102" />
-<hkern u1="&#x402;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x402;" u2="&#x4ac;" k="102" />
-<hkern u1="&#x402;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x402;" u2="&#x4a0;" k="123" />
-<hkern u1="&#x402;" u2="&#x49e;" k="82" />
-<hkern u1="&#x402;" u2="&#x492;" k="82" />
-<hkern u1="&#x402;" u2="&#x48c;" k="82" />
-<hkern u1="&#x402;" u2="&#x476;" k="82" />
-<hkern u1="&#x402;" u2="&#x474;" k="82" />
-<hkern u1="&#x402;" u2="&#x470;" k="102" />
-<hkern u1="&#x402;" u2="&#x462;" k="82" />
-<hkern u1="&#x402;" u2="&#x45e;" k="41" />
-<hkern u1="&#x402;" u2="&#x44a;" k="41" />
-<hkern u1="&#x402;" u2="&#x447;" k="41" />
-<hkern u1="&#x402;" u2="&#x443;" k="41" />
-<hkern u1="&#x402;" u2="&#x442;" k="41" />
-<hkern u1="&#x402;" u2="&#x42a;" k="123" />
-<hkern u1="&#x402;" u2="&#x427;" k="102" />
-<hkern u1="&#x402;" u2="&#x423;" k="41" />
-<hkern u1="&#x402;" u2="&#x422;" k="102" />
-<hkern u1="&#x402;" u2="&#x40e;" k="41" />
-<hkern u1="&#x402;" u2="&#x40b;" k="123" />
-<hkern u1="&#x402;" u2="&#x402;" k="123" />
-<hkern u1="&#x402;" u2="&#x27;" k="82" />
-<hkern u1="&#x402;" u2="&#x22;" k="82" />
-<hkern u1="&#x403;" u2="&#x201e;" k="123" />
-<hkern u1="&#x403;" u2="&#x201a;" k="123" />
-<hkern u1="&#x403;" u2="&#x2015;" k="82" />
-<hkern u1="&#x403;" u2="&#x2014;" k="82" />
-<hkern u1="&#x403;" u2="&#x2013;" k="82" />
-<hkern u1="&#x403;" u2="&#x513;" k="123" />
-<hkern u1="&#x403;" u2="&#x512;" k="102" />
-<hkern u1="&#x403;" u2="&#x511;" k="143" />
-<hkern u1="&#x403;" u2="&#x50f;" k="82" />
-<hkern u1="&#x403;" u2="&#x50d;" k="143" />
-<hkern u1="&#x403;" u2="&#x50c;" k="41" />
-<hkern u1="&#x403;" u2="&#x50b;" k="102" />
-<hkern u1="&#x403;" u2="&#x509;" k="123" />
-<hkern u1="&#x403;" u2="&#x508;" k="102" />
-<hkern u1="&#x403;" u2="&#x507;" k="102" />
-<hkern u1="&#x403;" u2="&#x505;" k="102" />
-<hkern u1="&#x403;" u2="&#x503;" k="143" />
-<hkern u1="&#x403;" u2="&#x502;" k="143" />
-<hkern u1="&#x403;" u2="&#x501;" k="143" />
-<hkern u1="&#x403;" u2="&#x500;" k="143" />
-<hkern u1="&#x403;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x403;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x403;" u2="&#x4f9;" k="102" />
-<hkern u1="&#x403;" u2="&#x4f7;" k="102" />
-<hkern u1="&#x403;" u2="&#x4f5;" k="102" />
-<hkern u1="&#x403;" u2="&#x4f3;" k="82" />
-<hkern u1="&#x403;" u2="&#x4f1;" k="82" />
-<hkern u1="&#x403;" u2="&#x4ef;" k="82" />
-<hkern u1="&#x403;" u2="&#x4ed;" k="41" />
-<hkern u1="&#x403;" u2="&#x4eb;" k="143" />
-<hkern u1="&#x403;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x403;" u2="&#x4e9;" k="143" />
-<hkern u1="&#x403;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x403;" u2="&#x4e7;" k="143" />
-<hkern u1="&#x403;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x403;" u2="&#x4e5;" k="102" />
-<hkern u1="&#x403;" u2="&#x4e3;" k="102" />
-<hkern u1="&#x403;" u2="&#x4e1;" k="61" />
-<hkern u1="&#x403;" u2="&#x4df;" k="41" />
-<hkern u1="&#x403;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x403;" u2="&#x4d7;" k="143" />
-<hkern u1="&#x403;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x403;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x403;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x403;" u2="&#x4ce;" k="102" />
-<hkern u1="&#x403;" u2="&#x4cc;" k="102" />
-<hkern u1="&#x403;" u2="&#x4ca;" k="102" />
-<hkern u1="&#x403;" u2="&#x4c8;" k="102" />
-<hkern u1="&#x403;" u2="&#x4c6;" k="123" />
-<hkern u1="&#x403;" u2="&#x4c5;" k="102" />
-<hkern u1="&#x403;" u2="&#x4c4;" k="102" />
-<hkern u1="&#x403;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x403;" u2="&#x4bf;" k="143" />
-<hkern u1="&#x403;" u2="&#x4be;" k="102" />
-<hkern u1="&#x403;" u2="&#x4bd;" k="143" />
-<hkern u1="&#x403;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x403;" u2="&#x4bb;" k="102" />
-<hkern u1="&#x403;" u2="&#x4b9;" k="102" />
-<hkern u1="&#x403;" u2="&#x4b7;" k="102" />
-<hkern u1="&#x403;" u2="&#x4b5;" k="82" />
-<hkern u1="&#x403;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x403;" u2="&#x4b1;" k="82" />
-<hkern u1="&#x403;" u2="&#x4af;" k="82" />
-<hkern u1="&#x403;" u2="&#x4ad;" k="82" />
-<hkern u1="&#x403;" u2="&#x4ac;" k="-41" />
-<hkern u1="&#x403;" u2="&#x4ab;" k="143" />
-<hkern u1="&#x403;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x403;" u2="&#x4a9;" k="143" />
-<hkern u1="&#x403;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x403;" u2="&#x4a7;" k="102" />
-<hkern u1="&#x403;" u2="&#x4a5;" k="102" />
-<hkern u1="&#x403;" u2="&#x4a3;" k="102" />
-<hkern u1="&#x403;" u2="&#x4a1;" k="82" />
-<hkern u1="&#x403;" u2="&#x49d;" k="102" />
-<hkern u1="&#x403;" u2="&#x49b;" k="102" />
-<hkern u1="&#x403;" u2="&#x499;" k="41" />
-<hkern u1="&#x403;" u2="&#x497;" k="41" />
-<hkern u1="&#x403;" u2="&#x495;" k="102" />
-<hkern u1="&#x403;" u2="&#x491;" k="102" />
-<hkern u1="&#x403;" u2="&#x48f;" k="102" />
-<hkern u1="&#x403;" u2="&#x48b;" k="102" />
-<hkern u1="&#x403;" u2="&#x481;" k="143" />
-<hkern u1="&#x403;" u2="&#x480;" k="41" />
-<hkern u1="&#x403;" u2="&#x47f;" k="41" />
-<hkern u1="&#x403;" u2="&#x47e;" k="41" />
-<hkern u1="&#x403;" u2="&#x47d;" k="143" />
-<hkern u1="&#x403;" u2="&#x47c;" k="41" />
-<hkern u1="&#x403;" u2="&#x47b;" k="143" />
-<hkern u1="&#x403;" u2="&#x47a;" k="41" />
-<hkern u1="&#x403;" u2="&#x479;" k="143" />
-<hkern u1="&#x403;" u2="&#x478;" k="41" />
-<hkern u1="&#x403;" u2="&#x477;" k="41" />
-<hkern u1="&#x403;" u2="&#x475;" k="41" />
-<hkern u1="&#x403;" u2="&#x473;" k="143" />
-<hkern u1="&#x403;" u2="&#x472;" k="41" />
-<hkern u1="&#x403;" u2="&#x471;" k="102" />
-<hkern u1="&#x403;" u2="&#x46d;" k="102" />
-<hkern u1="&#x403;" u2="&#x46b;" k="102" />
-<hkern u1="&#x403;" u2="&#x469;" k="102" />
-<hkern u1="&#x403;" u2="&#x467;" k="123" />
-<hkern u1="&#x403;" u2="&#x466;" k="143" />
-<hkern u1="&#x403;" u2="&#x465;" k="102" />
-<hkern u1="&#x403;" u2="&#x461;" k="41" />
-<hkern u1="&#x403;" u2="&#x460;" k="41" />
-<hkern u1="&#x403;" u2="&#x45f;" k="102" />
-<hkern u1="&#x403;" u2="&#x45e;" k="82" />
-<hkern u1="&#x403;" u2="&#x45d;" k="102" />
-<hkern u1="&#x403;" u2="&#x45c;" k="102" />
-<hkern u1="&#x403;" u2="&#x45a;" k="102" />
-<hkern u1="&#x403;" u2="&#x459;" k="123" />
-<hkern u1="&#x403;" u2="&#x455;" k="123" />
-<hkern u1="&#x403;" u2="&#x454;" k="143" />
-<hkern u1="&#x403;" u2="&#x453;" k="102" />
-<hkern u1="&#x403;" u2="&#x451;" k="143" />
-<hkern u1="&#x403;" u2="&#x450;" k="143" />
-<hkern u1="&#x403;" u2="&#x44f;" k="61" />
-<hkern u1="&#x403;" u2="&#x44e;" k="102" />
-<hkern u1="&#x403;" u2="&#x44d;" k="41" />
-<hkern u1="&#x403;" u2="&#x44c;" k="102" />
-<hkern u1="&#x403;" u2="&#x44b;" k="102" />
-<hkern u1="&#x403;" u2="&#x44a;" k="82" />
-<hkern u1="&#x403;" u2="&#x449;" k="102" />
-<hkern u1="&#x403;" u2="&#x448;" k="102" />
-<hkern u1="&#x403;" u2="&#x447;" k="102" />
-<hkern u1="&#x403;" u2="&#x446;" k="102" />
-<hkern u1="&#x403;" u2="&#x445;" k="41" />
-<hkern u1="&#x403;" u2="&#x444;" k="143" />
-<hkern u1="&#x403;" u2="&#x443;" k="82" />
-<hkern u1="&#x403;" u2="&#x442;" k="82" />
-<hkern u1="&#x403;" u2="&#x441;" k="143" />
-<hkern u1="&#x403;" u2="&#x440;" k="102" />
-<hkern u1="&#x403;" u2="&#x43f;" k="102" />
-<hkern u1="&#x403;" u2="&#x43e;" k="143" />
-<hkern u1="&#x403;" u2="&#x43d;" k="102" />
-<hkern u1="&#x403;" u2="&#x43c;" k="102" />
-<hkern u1="&#x403;" u2="&#x43b;" k="123" />
-<hkern u1="&#x403;" u2="&#x43a;" k="102" />
-<hkern u1="&#x403;" u2="&#x439;" k="102" />
-<hkern u1="&#x403;" u2="&#x438;" k="102" />
-<hkern u1="&#x403;" u2="&#x437;" k="41" />
-<hkern u1="&#x403;" u2="&#x436;" k="41" />
-<hkern u1="&#x403;" u2="&#x435;" k="143" />
-<hkern u1="&#x403;" u2="&#x434;" k="123" />
-<hkern u1="&#x403;" u2="&#x433;" k="102" />
-<hkern u1="&#x403;" u2="&#x432;" k="102" />
-<hkern u1="&#x403;" u2="&#x424;" k="82" />
-<hkern u1="&#x403;" u2="&#x422;" k="-41" />
-<hkern u1="&#x403;" u2="&#x421;" k="41" />
-<hkern u1="&#x403;" u2="&#x41e;" k="41" />
-<hkern u1="&#x403;" u2="&#x41b;" k="102" />
-<hkern u1="&#x403;" u2="&#x414;" k="102" />
-<hkern u1="&#x403;" u2="&#x410;" k="143" />
-<hkern u1="&#x403;" u2="&#x409;" k="102" />
-<hkern u1="&#x403;" u2="&#x404;" k="41" />
-<hkern u1="&#x403;" u2="&#x2e;" k="123" />
-<hkern u1="&#x403;" u2="&#x2d;" k="82" />
-<hkern u1="&#x403;" u2="&#x2c;" k="123" />
-<hkern u1="&#x404;" u2="&#x50c;" k="41" />
-<hkern u1="&#x404;" u2="&#x507;" k="41" />
-<hkern u1="&#x404;" u2="&#x505;" k="41" />
-<hkern u1="&#x404;" u2="&#x502;" k="41" />
-<hkern u1="&#x404;" u2="&#x500;" k="41" />
-<hkern u1="&#x404;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x404;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x404;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x404;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x404;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x404;" u2="&#x4be;" k="41" />
-<hkern u1="&#x404;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x404;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x404;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x404;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x404;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x404;" u2="&#x480;" k="41" />
-<hkern u1="&#x404;" u2="&#x47e;" k="41" />
-<hkern u1="&#x404;" u2="&#x47c;" k="41" />
-<hkern u1="&#x404;" u2="&#x47a;" k="41" />
-<hkern u1="&#x404;" u2="&#x478;" k="41" />
-<hkern u1="&#x404;" u2="&#x472;" k="41" />
-<hkern u1="&#x404;" u2="&#x460;" k="41" />
-<hkern u1="&#x404;" u2="&#x447;" k="41" />
-<hkern u1="&#x404;" u2="&#x424;" k="41" />
-<hkern u1="&#x404;" u2="&#x421;" k="41" />
-<hkern u1="&#x404;" u2="&#x41e;" k="41" />
-<hkern u1="&#x404;" u2="&#x404;" k="41" />
-<hkern u1="&#x405;" u2="&#x507;" k="41" />
-<hkern u1="&#x405;" u2="&#x505;" k="41" />
-<hkern u1="&#x409;" u2="&#x201d;" k="82" />
-<hkern u1="&#x409;" u2="&#x2019;" k="82" />
-<hkern u1="&#x409;" u2="&#x50f;" k="41" />
-<hkern u1="&#x409;" u2="&#x50e;" k="123" />
-<hkern u1="&#x409;" u2="&#x507;" k="61" />
-<hkern u1="&#x409;" u2="&#x506;" k="102" />
-<hkern u1="&#x409;" u2="&#x505;" k="61" />
-<hkern u1="&#x409;" u2="&#x504;" k="102" />
-<hkern u1="&#x409;" u2="&#x4fa;" k="82" />
-<hkern u1="&#x409;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x409;" u2="&#x4f4;" k="102" />
-<hkern u1="&#x409;" u2="&#x4f3;" k="41" />
-<hkern u1="&#x409;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x409;" u2="&#x4f1;" k="41" />
-<hkern u1="&#x409;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x409;" u2="&#x4ef;" k="41" />
-<hkern u1="&#x409;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x409;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x409;" u2="&#x4cb;" k="102" />
-<hkern u1="&#x409;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x409;" u2="&#x4b8;" k="102" />
-<hkern u1="&#x409;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x409;" u2="&#x4b6;" k="102" />
-<hkern u1="&#x409;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x409;" u2="&#x4b4;" k="123" />
-<hkern u1="&#x409;" u2="&#x4b1;" k="41" />
-<hkern u1="&#x409;" u2="&#x4b0;" k="102" />
-<hkern u1="&#x409;" u2="&#x4af;" k="41" />
-<hkern u1="&#x409;" u2="&#x4ae;" k="102" />
-<hkern u1="&#x409;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x409;" u2="&#x4ac;" k="102" />
-<hkern u1="&#x409;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x409;" u2="&#x4a0;" k="123" />
-<hkern u1="&#x409;" u2="&#x49e;" k="82" />
-<hkern u1="&#x409;" u2="&#x492;" k="82" />
-<hkern u1="&#x409;" u2="&#x48c;" k="82" />
-<hkern u1="&#x409;" u2="&#x476;" k="82" />
-<hkern u1="&#x409;" u2="&#x474;" k="82" />
-<hkern u1="&#x409;" u2="&#x470;" k="102" />
-<hkern u1="&#x409;" u2="&#x462;" k="82" />
-<hkern u1="&#x409;" u2="&#x45e;" k="41" />
-<hkern u1="&#x409;" u2="&#x44a;" k="41" />
-<hkern u1="&#x409;" u2="&#x447;" k="41" />
-<hkern u1="&#x409;" u2="&#x443;" k="41" />
-<hkern u1="&#x409;" u2="&#x442;" k="41" />
-<hkern u1="&#x409;" u2="&#x42a;" k="123" />
-<hkern u1="&#x409;" u2="&#x427;" k="102" />
-<hkern u1="&#x409;" u2="&#x423;" k="41" />
-<hkern u1="&#x409;" u2="&#x422;" k="102" />
-<hkern u1="&#x409;" u2="&#x40e;" k="41" />
-<hkern u1="&#x409;" u2="&#x40b;" k="123" />
-<hkern u1="&#x409;" u2="&#x402;" k="123" />
-<hkern u1="&#x409;" u2="&#x27;" k="82" />
-<hkern u1="&#x409;" u2="&#x22;" k="82" />
-<hkern u1="&#x40a;" u2="&#x201d;" k="82" />
-<hkern u1="&#x40a;" u2="&#x2019;" k="82" />
-<hkern u1="&#x40a;" u2="&#x50f;" k="41" />
-<hkern u1="&#x40a;" u2="&#x50e;" k="123" />
-<hkern u1="&#x40a;" u2="&#x507;" k="61" />
-<hkern u1="&#x40a;" u2="&#x506;" k="102" />
-<hkern u1="&#x40a;" u2="&#x505;" k="61" />
-<hkern u1="&#x40a;" u2="&#x504;" k="102" />
-<hkern u1="&#x40a;" u2="&#x4fa;" k="82" />
-<hkern u1="&#x40a;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4f4;" k="102" />
-<hkern u1="&#x40a;" u2="&#x4f3;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4f1;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4ef;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4cb;" k="102" />
-<hkern u1="&#x40a;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4b8;" k="102" />
-<hkern u1="&#x40a;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4b6;" k="102" />
-<hkern u1="&#x40a;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4b4;" k="123" />
-<hkern u1="&#x40a;" u2="&#x4b1;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4b0;" k="102" />
-<hkern u1="&#x40a;" u2="&#x4af;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4ae;" k="102" />
-<hkern u1="&#x40a;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4ac;" k="102" />
-<hkern u1="&#x40a;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4a0;" k="123" />
-<hkern u1="&#x40a;" u2="&#x49e;" k="82" />
-<hkern u1="&#x40a;" u2="&#x492;" k="82" />
-<hkern u1="&#x40a;" u2="&#x48c;" k="82" />
-<hkern u1="&#x40a;" u2="&#x476;" k="82" />
-<hkern u1="&#x40a;" u2="&#x474;" k="82" />
-<hkern u1="&#x40a;" u2="&#x470;" k="102" />
-<hkern u1="&#x40a;" u2="&#x462;" k="82" />
-<hkern u1="&#x40a;" u2="&#x45e;" k="41" />
-<hkern u1="&#x40a;" u2="&#x44a;" k="41" />
-<hkern u1="&#x40a;" u2="&#x447;" k="41" />
-<hkern u1="&#x40a;" u2="&#x443;" k="41" />
-<hkern u1="&#x40a;" u2="&#x442;" k="41" />
-<hkern u1="&#x40a;" u2="&#x42a;" k="123" />
-<hkern u1="&#x40a;" u2="&#x427;" k="102" />
-<hkern u1="&#x40a;" u2="&#x423;" k="41" />
-<hkern u1="&#x40a;" u2="&#x422;" k="102" />
-<hkern u1="&#x40a;" u2="&#x40e;" k="41" />
-<hkern u1="&#x40a;" u2="&#x40b;" k="123" />
-<hkern u1="&#x40a;" u2="&#x402;" k="123" />
-<hkern u1="&#x40a;" u2="&#x27;" k="82" />
-<hkern u1="&#x40a;" u2="&#x22;" k="82" />
-<hkern u1="&#x40b;" u2="&#x201d;" k="82" />
-<hkern u1="&#x40b;" u2="&#x2019;" k="82" />
-<hkern u1="&#x40b;" u2="&#x50f;" k="41" />
-<hkern u1="&#x40b;" u2="&#x50e;" k="123" />
-<hkern u1="&#x40b;" u2="&#x507;" k="61" />
-<hkern u1="&#x40b;" u2="&#x506;" k="102" />
-<hkern u1="&#x40b;" u2="&#x505;" k="61" />
-<hkern u1="&#x40b;" u2="&#x504;" k="102" />
-<hkern u1="&#x40b;" u2="&#x4fa;" k="82" />
-<hkern u1="&#x40b;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4f4;" k="102" />
-<hkern u1="&#x40b;" u2="&#x4f3;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4f1;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4ef;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4cb;" k="102" />
-<hkern u1="&#x40b;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4b8;" k="102" />
-<hkern u1="&#x40b;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4b6;" k="102" />
-<hkern u1="&#x40b;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4b4;" k="123" />
-<hkern u1="&#x40b;" u2="&#x4b1;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4b0;" k="102" />
-<hkern u1="&#x40b;" u2="&#x4af;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4ae;" k="102" />
-<hkern u1="&#x40b;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4ac;" k="102" />
-<hkern u1="&#x40b;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4a0;" k="123" />
-<hkern u1="&#x40b;" u2="&#x49e;" k="82" />
-<hkern u1="&#x40b;" u2="&#x492;" k="82" />
-<hkern u1="&#x40b;" u2="&#x48c;" k="82" />
-<hkern u1="&#x40b;" u2="&#x476;" k="82" />
-<hkern u1="&#x40b;" u2="&#x474;" k="82" />
-<hkern u1="&#x40b;" u2="&#x470;" k="102" />
-<hkern u1="&#x40b;" u2="&#x462;" k="82" />
-<hkern u1="&#x40b;" u2="&#x45e;" k="41" />
-<hkern u1="&#x40b;" u2="&#x44a;" k="41" />
-<hkern u1="&#x40b;" u2="&#x447;" k="41" />
-<hkern u1="&#x40b;" u2="&#x443;" k="41" />
-<hkern u1="&#x40b;" u2="&#x442;" k="41" />
-<hkern u1="&#x40b;" u2="&#x42a;" k="123" />
-<hkern u1="&#x40b;" u2="&#x427;" k="102" />
-<hkern u1="&#x40b;" u2="&#x423;" k="41" />
-<hkern u1="&#x40b;" u2="&#x422;" k="102" />
-<hkern u1="&#x40b;" u2="&#x40e;" k="41" />
-<hkern u1="&#x40b;" u2="&#x40b;" k="123" />
-<hkern u1="&#x40b;" u2="&#x402;" k="123" />
-<hkern u1="&#x40b;" u2="&#x27;" k="82" />
-<hkern u1="&#x40b;" u2="&#x22;" k="82" />
-<hkern u1="&#x40c;" u2="&#x510;" k="20" />
-<hkern u1="&#x40c;" u2="&#x50c;" k="41" />
-<hkern u1="&#x40c;" u2="&#x507;" k="41" />
-<hkern u1="&#x40c;" u2="&#x505;" k="41" />
-<hkern u1="&#x40c;" u2="&#x502;" k="41" />
-<hkern u1="&#x40c;" u2="&#x500;" k="41" />
-<hkern u1="&#x40c;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x40c;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x40c;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x40c;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x40c;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x40c;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x40c;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x40c;" u2="&#x4be;" k="102" />
-<hkern u1="&#x40c;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x40c;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x40c;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x40c;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x40c;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x40c;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x40c;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x40c;" u2="&#x480;" k="41" />
-<hkern u1="&#x40c;" u2="&#x47e;" k="41" />
-<hkern u1="&#x40c;" u2="&#x47c;" k="41" />
-<hkern u1="&#x40c;" u2="&#x47a;" k="41" />
-<hkern u1="&#x40c;" u2="&#x478;" k="41" />
-<hkern u1="&#x40c;" u2="&#x472;" k="41" />
-<hkern u1="&#x40c;" u2="&#x470;" k="41" />
-<hkern u1="&#x40c;" u2="&#x460;" k="41" />
-<hkern u1="&#x40c;" u2="&#x447;" k="41" />
-<hkern u1="&#x40c;" u2="&#x427;" k="41" />
-<hkern u1="&#x40c;" u2="&#x424;" k="41" />
-<hkern u1="&#x40c;" u2="&#x421;" k="41" />
-<hkern u1="&#x40c;" u2="&#x41e;" k="41" />
-<hkern u1="&#x40c;" u2="&#x404;" k="41" />
-<hkern u1="&#x40e;" u2="&#x201e;" k="123" />
-<hkern u1="&#x40e;" u2="&#x201a;" k="123" />
-<hkern u1="&#x40e;" u2="&#x513;" k="82" />
-<hkern u1="&#x40e;" u2="&#x512;" k="102" />
-<hkern u1="&#x40e;" u2="&#x511;" k="41" />
-<hkern u1="&#x40e;" u2="&#x50d;" k="41" />
-<hkern u1="&#x40e;" u2="&#x50c;" k="20" />
-<hkern u1="&#x40e;" u2="&#x509;" k="82" />
-<hkern u1="&#x40e;" u2="&#x508;" k="102" />
-<hkern u1="&#x40e;" u2="&#x503;" k="41" />
-<hkern u1="&#x40e;" u2="&#x502;" k="143" />
-<hkern u1="&#x40e;" u2="&#x501;" k="41" />
-<hkern u1="&#x40e;" u2="&#x500;" k="143" />
-<hkern u1="&#x40e;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x40e;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x40e;" u2="&#x4ea;" k="20" />
-<hkern u1="&#x40e;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x40e;" u2="&#x4e8;" k="20" />
-<hkern u1="&#x40e;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x40e;" u2="&#x4e6;" k="20" />
-<hkern u1="&#x40e;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x40e;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x40e;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x40e;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x40e;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x40e;" u2="&#x4c6;" k="82" />
-<hkern u1="&#x40e;" u2="&#x4c5;" k="102" />
-<hkern u1="&#x40e;" u2="&#x4bf;" k="61" />
-<hkern u1="&#x40e;" u2="&#x4be;" k="41" />
-<hkern u1="&#x40e;" u2="&#x4bd;" k="61" />
-<hkern u1="&#x40e;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x40e;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x40e;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x40e;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x40e;" u2="&#x4aa;" k="20" />
-<hkern u1="&#x40e;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x40e;" u2="&#x4a8;" k="20" />
-<hkern u1="&#x40e;" u2="&#x49f;" k="-102" />
-<hkern u1="&#x40e;" u2="&#x48d;" k="-102" />
-<hkern u1="&#x40e;" u2="&#x481;" k="41" />
-<hkern u1="&#x40e;" u2="&#x480;" k="20" />
-<hkern u1="&#x40e;" u2="&#x47e;" k="20" />
-<hkern u1="&#x40e;" u2="&#x47d;" k="41" />
-<hkern u1="&#x40e;" u2="&#x47c;" k="20" />
-<hkern u1="&#x40e;" u2="&#x47b;" k="41" />
-<hkern u1="&#x40e;" u2="&#x47a;" k="20" />
-<hkern u1="&#x40e;" u2="&#x479;" k="41" />
-<hkern u1="&#x40e;" u2="&#x478;" k="20" />
-<hkern u1="&#x40e;" u2="&#x473;" k="41" />
-<hkern u1="&#x40e;" u2="&#x472;" k="20" />
-<hkern u1="&#x40e;" u2="&#x467;" k="82" />
-<hkern u1="&#x40e;" u2="&#x466;" k="143" />
-<hkern u1="&#x40e;" u2="&#x460;" k="20" />
-<hkern u1="&#x40e;" u2="&#x45b;" k="-102" />
-<hkern u1="&#x40e;" u2="&#x459;" k="82" />
-<hkern u1="&#x40e;" u2="&#x455;" k="20" />
-<hkern u1="&#x40e;" u2="&#x454;" k="41" />
-<hkern u1="&#x40e;" u2="&#x452;" k="-102" />
-<hkern u1="&#x40e;" u2="&#x451;" k="41" />
-<hkern u1="&#x40e;" u2="&#x450;" k="41" />
-<hkern u1="&#x40e;" u2="&#x447;" k="41" />
-<hkern u1="&#x40e;" u2="&#x444;" k="41" />
-<hkern u1="&#x40e;" u2="&#x441;" k="41" />
-<hkern u1="&#x40e;" u2="&#x43e;" k="41" />
-<hkern u1="&#x40e;" u2="&#x43b;" k="82" />
-<hkern u1="&#x40e;" u2="&#x435;" k="41" />
-<hkern u1="&#x40e;" u2="&#x434;" k="82" />
-<hkern u1="&#x40e;" u2="&#x42f;" k="20" />
-<hkern u1="&#x40e;" u2="&#x424;" k="61" />
-<hkern u1="&#x40e;" u2="&#x421;" k="20" />
-<hkern u1="&#x40e;" u2="&#x41e;" k="20" />
-<hkern u1="&#x40e;" u2="&#x41b;" k="102" />
-<hkern u1="&#x40e;" u2="&#x414;" k="102" />
-<hkern u1="&#x40e;" u2="&#x410;" k="143" />
-<hkern u1="&#x40e;" u2="&#x409;" k="102" />
-<hkern u1="&#x40e;" u2="&#x404;" k="20" />
-<hkern u1="&#x40e;" u2="&#x2e;" k="123" />
-<hkern u1="&#x40e;" u2="&#x2c;" k="123" />
-<hkern u1="&#x410;" u2="&#x201d;" k="143" />
-<hkern u1="&#x410;" u2="&#x2019;" k="143" />
-<hkern u1="&#x410;" u2="&#x50f;" k="41" />
-<hkern u1="&#x410;" u2="&#x50e;" k="102" />
-<hkern u1="&#x410;" u2="&#x507;" k="41" />
-<hkern u1="&#x410;" u2="&#x506;" k="143" />
-<hkern u1="&#x410;" u2="&#x505;" k="41" />
-<hkern u1="&#x410;" u2="&#x504;" k="143" />
-<hkern u1="&#x410;" u2="&#x4fa;" k="41" />
-<hkern u1="&#x410;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x410;" u2="&#x4f4;" k="102" />
-<hkern u1="&#x410;" u2="&#x4da;" k="41" />
-<hkern u1="&#x410;" u2="&#x4d8;" k="41" />
-<hkern u1="&#x410;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x410;" u2="&#x4cb;" k="102" />
-<hkern u1="&#x410;" u2="&#x4be;" k="102" />
-<hkern u1="&#x410;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x410;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x410;" u2="&#x4b8;" k="102" />
-<hkern u1="&#x410;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x410;" u2="&#x4b6;" k="102" />
-<hkern u1="&#x410;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x410;" u2="&#x4b4;" k="102" />
-<hkern u1="&#x410;" u2="&#x4b0;" k="123" />
-<hkern u1="&#x410;" u2="&#x4ae;" k="123" />
-<hkern u1="&#x410;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x410;" u2="&#x4ac;" k="143" />
-<hkern u1="&#x410;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x410;" u2="&#x4a0;" k="102" />
-<hkern u1="&#x410;" u2="&#x49e;" k="41" />
-<hkern u1="&#x410;" u2="&#x492;" k="41" />
-<hkern u1="&#x410;" u2="&#x48c;" k="41" />
-<hkern u1="&#x410;" u2="&#x476;" k="82" />
-<hkern u1="&#x410;" u2="&#x474;" k="82" />
-<hkern u1="&#x410;" u2="&#x470;" k="102" />
-<hkern u1="&#x410;" u2="&#x462;" k="41" />
-<hkern u1="&#x410;" u2="&#x44a;" k="41" />
-<hkern u1="&#x410;" u2="&#x447;" k="41" />
-<hkern u1="&#x410;" u2="&#x442;" k="41" />
-<hkern u1="&#x410;" u2="&#x42a;" k="102" />
-<hkern u1="&#x410;" u2="&#x427;" k="102" />
-<hkern u1="&#x410;" u2="&#x424;" k="41" />
-<hkern u1="&#x410;" u2="&#x422;" k="143" />
-<hkern u1="&#x410;" u2="&#x40b;" k="102" />
-<hkern u1="&#x410;" u2="&#x402;" k="102" />
-<hkern u1="&#x410;" u2="&#x27;" k="143" />
-<hkern u1="&#x410;" u2="&#x22;" k="143" />
-<hkern u1="&#x411;" u2="&#x201d;" k="41" />
-<hkern u1="&#x411;" u2="&#x2019;" k="41" />
-<hkern u1="&#x411;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x411;" u2="&#x4d4;" k="20" />
-<hkern u1="&#x411;" u2="&#x4d2;" k="20" />
-<hkern u1="&#x411;" u2="&#x4d0;" k="20" />
-<hkern u1="&#x411;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x411;" u2="&#x4be;" k="41" />
-<hkern u1="&#x411;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x411;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x411;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x411;" u2="&#x470;" k="41" />
-<hkern u1="&#x411;" u2="&#x466;" k="20" />
-<hkern u1="&#x411;" u2="&#x427;" k="41" />
-<hkern u1="&#x411;" u2="&#x410;" k="20" />
-<hkern u1="&#x411;" u2="&#x27;" k="41" />
-<hkern u1="&#x411;" u2="&#x22;" k="41" />
-<hkern u1="&#x412;" u2="&#x201e;" k="82" />
-<hkern u1="&#x412;" u2="&#x201a;" k="82" />
-<hkern u1="&#x412;" u2="&#x506;" k="41" />
-<hkern u1="&#x412;" u2="&#x504;" k="41" />
-<hkern u1="&#x412;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x412;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x412;" u2="&#x476;" k="20" />
-<hkern u1="&#x412;" u2="&#x474;" k="20" />
-<hkern u1="&#x412;" u2="&#x2e;" k="82" />
-<hkern u1="&#x412;" u2="&#x2c;" k="82" />
-<hkern u1="&#x413;" u2="&#x201e;" k="123" />
-<hkern u1="&#x413;" u2="&#x201a;" k="123" />
-<hkern u1="&#x413;" u2="&#x2015;" k="82" />
-<hkern u1="&#x413;" u2="&#x2014;" k="82" />
-<hkern u1="&#x413;" u2="&#x2013;" k="82" />
-<hkern u1="&#x413;" u2="&#x513;" k="123" />
-<hkern u1="&#x413;" u2="&#x512;" k="102" />
-<hkern u1="&#x413;" u2="&#x511;" k="143" />
-<hkern u1="&#x413;" u2="&#x50f;" k="82" />
-<hkern u1="&#x413;" u2="&#x50d;" k="143" />
-<hkern u1="&#x413;" u2="&#x50c;" k="41" />
-<hkern u1="&#x413;" u2="&#x50b;" k="102" />
-<hkern u1="&#x413;" u2="&#x509;" k="123" />
-<hkern u1="&#x413;" u2="&#x508;" k="102" />
-<hkern u1="&#x413;" u2="&#x507;" k="102" />
-<hkern u1="&#x413;" u2="&#x505;" k="102" />
-<hkern u1="&#x413;" u2="&#x503;" k="143" />
-<hkern u1="&#x413;" u2="&#x502;" k="143" />
-<hkern u1="&#x413;" u2="&#x501;" k="143" />
-<hkern u1="&#x413;" u2="&#x500;" k="143" />
-<hkern u1="&#x413;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x413;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x413;" u2="&#x4f9;" k="102" />
-<hkern u1="&#x413;" u2="&#x4f7;" k="102" />
-<hkern u1="&#x413;" u2="&#x4f5;" k="102" />
-<hkern u1="&#x413;" u2="&#x4f3;" k="82" />
-<hkern u1="&#x413;" u2="&#x4f1;" k="82" />
-<hkern u1="&#x413;" u2="&#x4ef;" k="82" />
-<hkern u1="&#x413;" u2="&#x4ed;" k="41" />
-<hkern u1="&#x413;" u2="&#x4eb;" k="143" />
-<hkern u1="&#x413;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x413;" u2="&#x4e9;" k="143" />
-<hkern u1="&#x413;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x413;" u2="&#x4e7;" k="143" />
-<hkern u1="&#x413;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x413;" u2="&#x4e5;" k="102" />
-<hkern u1="&#x413;" u2="&#x4e3;" k="102" />
-<hkern u1="&#x413;" u2="&#x4e1;" k="61" />
-<hkern u1="&#x413;" u2="&#x4df;" k="41" />
-<hkern u1="&#x413;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x413;" u2="&#x4d7;" k="143" />
-<hkern u1="&#x413;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x413;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x413;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x413;" u2="&#x4ce;" k="102" />
-<hkern u1="&#x413;" u2="&#x4cc;" k="102" />
-<hkern u1="&#x413;" u2="&#x4ca;" k="102" />
-<hkern u1="&#x413;" u2="&#x4c8;" k="102" />
-<hkern u1="&#x413;" u2="&#x4c6;" k="123" />
-<hkern u1="&#x413;" u2="&#x4c5;" k="102" />
-<hkern u1="&#x413;" u2="&#x4c4;" k="102" />
-<hkern u1="&#x413;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x413;" u2="&#x4bf;" k="143" />
-<hkern u1="&#x413;" u2="&#x4be;" k="102" />
-<hkern u1="&#x413;" u2="&#x4bd;" k="143" />
-<hkern u1="&#x413;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x413;" u2="&#x4bb;" k="102" />
-<hkern u1="&#x413;" u2="&#x4b9;" k="102" />
-<hkern u1="&#x413;" u2="&#x4b7;" k="102" />
-<hkern u1="&#x413;" u2="&#x4b5;" k="82" />
-<hkern u1="&#x413;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x413;" u2="&#x4b1;" k="82" />
-<hkern u1="&#x413;" u2="&#x4af;" k="82" />
-<hkern u1="&#x413;" u2="&#x4ad;" k="82" />
-<hkern u1="&#x413;" u2="&#x4ac;" k="-41" />
-<hkern u1="&#x413;" u2="&#x4ab;" k="143" />
-<hkern u1="&#x413;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x413;" u2="&#x4a9;" k="143" />
-<hkern u1="&#x413;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x413;" u2="&#x4a7;" k="102" />
-<hkern u1="&#x413;" u2="&#x4a5;" k="102" />
-<hkern u1="&#x413;" u2="&#x4a3;" k="102" />
-<hkern u1="&#x413;" u2="&#x4a1;" k="82" />
-<hkern u1="&#x413;" u2="&#x49d;" k="102" />
-<hkern u1="&#x413;" u2="&#x49b;" k="102" />
-<hkern u1="&#x413;" u2="&#x499;" k="41" />
-<hkern u1="&#x413;" u2="&#x497;" k="41" />
-<hkern u1="&#x413;" u2="&#x495;" k="102" />
-<hkern u1="&#x413;" u2="&#x491;" k="102" />
-<hkern u1="&#x413;" u2="&#x48f;" k="102" />
-<hkern u1="&#x413;" u2="&#x48b;" k="102" />
-<hkern u1="&#x413;" u2="&#x481;" k="143" />
-<hkern u1="&#x413;" u2="&#x480;" k="41" />
-<hkern u1="&#x413;" u2="&#x47f;" k="41" />
-<hkern u1="&#x413;" u2="&#x47e;" k="41" />
-<hkern u1="&#x413;" u2="&#x47d;" k="143" />
-<hkern u1="&#x413;" u2="&#x47c;" k="41" />
-<hkern u1="&#x413;" u2="&#x47b;" k="143" />
-<hkern u1="&#x413;" u2="&#x47a;" k="41" />
-<hkern u1="&#x413;" u2="&#x479;" k="143" />
-<hkern u1="&#x413;" u2="&#x478;" k="41" />
-<hkern u1="&#x413;" u2="&#x477;" k="41" />
-<hkern u1="&#x413;" u2="&#x475;" k="41" />
-<hkern u1="&#x413;" u2="&#x473;" k="143" />
-<hkern u1="&#x413;" u2="&#x472;" k="41" />
-<hkern u1="&#x413;" u2="&#x471;" k="102" />
-<hkern u1="&#x413;" u2="&#x46d;" k="102" />
-<hkern u1="&#x413;" u2="&#x46b;" k="102" />
-<hkern u1="&#x413;" u2="&#x469;" k="102" />
-<hkern u1="&#x413;" u2="&#x467;" k="123" />
-<hkern u1="&#x413;" u2="&#x466;" k="143" />
-<hkern u1="&#x413;" u2="&#x465;" k="102" />
-<hkern u1="&#x413;" u2="&#x461;" k="41" />
-<hkern u1="&#x413;" u2="&#x460;" k="41" />
-<hkern u1="&#x413;" u2="&#x45f;" k="102" />
-<hkern u1="&#x413;" u2="&#x45e;" k="82" />
-<hkern u1="&#x413;" u2="&#x45d;" k="102" />
-<hkern u1="&#x413;" u2="&#x45c;" k="102" />
-<hkern u1="&#x413;" u2="&#x45a;" k="102" />
-<hkern u1="&#x413;" u2="&#x459;" k="123" />
-<hkern u1="&#x413;" u2="&#x455;" k="123" />
-<hkern u1="&#x413;" u2="&#x454;" k="143" />
-<hkern u1="&#x413;" u2="&#x453;" k="102" />
-<hkern u1="&#x413;" u2="&#x451;" k="143" />
-<hkern u1="&#x413;" u2="&#x450;" k="143" />
-<hkern u1="&#x413;" u2="&#x44f;" k="61" />
-<hkern u1="&#x413;" u2="&#x44e;" k="102" />
-<hkern u1="&#x413;" u2="&#x44d;" k="41" />
-<hkern u1="&#x413;" u2="&#x44c;" k="102" />
-<hkern u1="&#x413;" u2="&#x44b;" k="102" />
-<hkern u1="&#x413;" u2="&#x44a;" k="82" />
-<hkern u1="&#x413;" u2="&#x449;" k="102" />
-<hkern u1="&#x413;" u2="&#x448;" k="102" />
-<hkern u1="&#x413;" u2="&#x447;" k="102" />
-<hkern u1="&#x413;" u2="&#x446;" k="102" />
-<hkern u1="&#x413;" u2="&#x445;" k="41" />
-<hkern u1="&#x413;" u2="&#x444;" k="143" />
-<hkern u1="&#x413;" u2="&#x443;" k="82" />
-<hkern u1="&#x413;" u2="&#x442;" k="82" />
-<hkern u1="&#x413;" u2="&#x441;" k="143" />
-<hkern u1="&#x413;" u2="&#x440;" k="102" />
-<hkern u1="&#x413;" u2="&#x43f;" k="102" />
-<hkern u1="&#x413;" u2="&#x43e;" k="143" />
-<hkern u1="&#x413;" u2="&#x43d;" k="102" />
-<hkern u1="&#x413;" u2="&#x43c;" k="102" />
-<hkern u1="&#x413;" u2="&#x43b;" k="123" />
-<hkern u1="&#x413;" u2="&#x43a;" k="102" />
-<hkern u1="&#x413;" u2="&#x439;" k="102" />
-<hkern u1="&#x413;" u2="&#x438;" k="102" />
-<hkern u1="&#x413;" u2="&#x437;" k="41" />
-<hkern u1="&#x413;" u2="&#x436;" k="41" />
-<hkern u1="&#x413;" u2="&#x435;" k="143" />
-<hkern u1="&#x413;" u2="&#x434;" k="123" />
-<hkern u1="&#x413;" u2="&#x433;" k="102" />
-<hkern u1="&#x413;" u2="&#x432;" k="102" />
-<hkern u1="&#x413;" u2="&#x424;" k="82" />
-<hkern u1="&#x413;" u2="&#x422;" k="-41" />
-<hkern u1="&#x413;" u2="&#x421;" k="41" />
-<hkern u1="&#x413;" u2="&#x41e;" k="41" />
-<hkern u1="&#x413;" u2="&#x41b;" k="102" />
-<hkern u1="&#x413;" u2="&#x414;" k="102" />
-<hkern u1="&#x413;" u2="&#x410;" k="143" />
-<hkern u1="&#x413;" u2="&#x409;" k="102" />
-<hkern u1="&#x413;" u2="&#x404;" k="41" />
-<hkern u1="&#x413;" u2="&#x2e;" k="123" />
-<hkern u1="&#x413;" u2="&#x2d;" k="82" />
-<hkern u1="&#x413;" u2="&#x2c;" k="123" />
-<hkern u1="&#x414;" u2="&#x507;" k="41" />
-<hkern u1="&#x414;" u2="&#x505;" k="41" />
-<hkern u1="&#x414;" u2="&#x4e1;" k="-41" />
-<hkern u1="&#x414;" u2="&#x408;" k="-225" />
-<hkern u1="&#x416;" u2="&#x510;" k="20" />
-<hkern u1="&#x416;" u2="&#x50c;" k="41" />
-<hkern u1="&#x416;" u2="&#x507;" k="41" />
-<hkern u1="&#x416;" u2="&#x505;" k="41" />
-<hkern u1="&#x416;" u2="&#x502;" k="41" />
-<hkern u1="&#x416;" u2="&#x500;" k="41" />
-<hkern u1="&#x416;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x416;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x416;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x416;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x416;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x416;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x416;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x416;" u2="&#x4be;" k="102" />
-<hkern u1="&#x416;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x416;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x416;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x416;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x416;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x416;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x416;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x416;" u2="&#x480;" k="41" />
-<hkern u1="&#x416;" u2="&#x47e;" k="41" />
-<hkern u1="&#x416;" u2="&#x47c;" k="41" />
-<hkern u1="&#x416;" u2="&#x47a;" k="41" />
-<hkern u1="&#x416;" u2="&#x478;" k="41" />
-<hkern u1="&#x416;" u2="&#x472;" k="41" />
-<hkern u1="&#x416;" u2="&#x470;" k="41" />
-<hkern u1="&#x416;" u2="&#x460;" k="41" />
-<hkern u1="&#x416;" u2="&#x447;" k="41" />
-<hkern u1="&#x416;" u2="&#x427;" k="41" />
-<hkern u1="&#x416;" u2="&#x424;" k="41" />
-<hkern u1="&#x416;" u2="&#x421;" k="41" />
-<hkern u1="&#x416;" u2="&#x41e;" k="41" />
-<hkern u1="&#x416;" u2="&#x404;" k="41" />
-<hkern u1="&#x417;" u2="&#x201e;" k="82" />
-<hkern u1="&#x417;" u2="&#x201a;" k="82" />
-<hkern u1="&#x417;" u2="&#x506;" k="41" />
-<hkern u1="&#x417;" u2="&#x504;" k="41" />
-<hkern u1="&#x417;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x417;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x417;" u2="&#x476;" k="20" />
-<hkern u1="&#x417;" u2="&#x474;" k="20" />
-<hkern u1="&#x417;" u2="&#x2e;" k="82" />
-<hkern u1="&#x417;" u2="&#x2c;" k="82" />
-<hkern u1="&#x41a;" u2="&#x510;" k="20" />
-<hkern u1="&#x41a;" u2="&#x50c;" k="41" />
-<hkern u1="&#x41a;" u2="&#x507;" k="41" />
-<hkern u1="&#x41a;" u2="&#x505;" k="41" />
-<hkern u1="&#x41a;" u2="&#x502;" k="41" />
-<hkern u1="&#x41a;" u2="&#x500;" k="41" />
-<hkern u1="&#x41a;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x41a;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x41a;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x41a;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x41a;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x41a;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x41a;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x41a;" u2="&#x4be;" k="102" />
-<hkern u1="&#x41a;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x41a;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x41a;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x41a;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x41a;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x41a;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x41a;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x41a;" u2="&#x480;" k="41" />
-<hkern u1="&#x41a;" u2="&#x47e;" k="41" />
-<hkern u1="&#x41a;" u2="&#x47c;" k="41" />
-<hkern u1="&#x41a;" u2="&#x47a;" k="41" />
-<hkern u1="&#x41a;" u2="&#x478;" k="41" />
-<hkern u1="&#x41a;" u2="&#x472;" k="41" />
-<hkern u1="&#x41a;" u2="&#x470;" k="41" />
-<hkern u1="&#x41a;" u2="&#x460;" k="41" />
-<hkern u1="&#x41a;" u2="&#x447;" k="41" />
-<hkern u1="&#x41a;" u2="&#x427;" k="41" />
-<hkern u1="&#x41a;" u2="&#x424;" k="41" />
-<hkern u1="&#x41a;" u2="&#x421;" k="41" />
-<hkern u1="&#x41a;" u2="&#x41e;" k="41" />
-<hkern u1="&#x41a;" u2="&#x404;" k="41" />
-<hkern u1="&#x41e;" u2="&#x201e;" k="82" />
-<hkern u1="&#x41e;" u2="&#x201a;" k="82" />
-<hkern u1="&#x41e;" u2="&#x513;" k="20" />
-<hkern u1="&#x41e;" u2="&#x512;" k="41" />
-<hkern u1="&#x41e;" u2="&#x50e;" k="20" />
-<hkern u1="&#x41e;" u2="&#x509;" k="20" />
-<hkern u1="&#x41e;" u2="&#x508;" k="41" />
-<hkern u1="&#x41e;" u2="&#x506;" k="41" />
-<hkern u1="&#x41e;" u2="&#x504;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x41e;" u2="&#x4de;" k="20" />
-<hkern u1="&#x41e;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x41e;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x41e;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x41e;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x41e;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x41e;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x41e;" u2="&#x498;" k="20" />
-<hkern u1="&#x41e;" u2="&#x496;" k="41" />
-<hkern u1="&#x41e;" u2="&#x476;" k="20" />
-<hkern u1="&#x41e;" u2="&#x474;" k="20" />
-<hkern u1="&#x41e;" u2="&#x470;" k="41" />
-<hkern u1="&#x41e;" u2="&#x46e;" k="20" />
-<hkern u1="&#x41e;" u2="&#x467;" k="20" />
-<hkern u1="&#x41e;" u2="&#x466;" k="41" />
-<hkern u1="&#x41e;" u2="&#x459;" k="20" />
-<hkern u1="&#x41e;" u2="&#x43b;" k="20" />
-<hkern u1="&#x41e;" u2="&#x434;" k="20" />
-<hkern u1="&#x41e;" u2="&#x42d;" k="20" />
-<hkern u1="&#x41e;" u2="&#x42a;" k="20" />
-<hkern u1="&#x41e;" u2="&#x427;" k="41" />
-<hkern u1="&#x41e;" u2="&#x425;" k="41" />
-<hkern u1="&#x41e;" u2="&#x423;" k="41" />
-<hkern u1="&#x41e;" u2="&#x422;" k="61" />
-<hkern u1="&#x41e;" u2="&#x41b;" k="41" />
-<hkern u1="&#x41e;" u2="&#x417;" k="20" />
-<hkern u1="&#x41e;" u2="&#x416;" k="41" />
-<hkern u1="&#x41e;" u2="&#x414;" k="41" />
-<hkern u1="&#x41e;" u2="&#x410;" k="41" />
-<hkern u1="&#x41e;" u2="&#x40e;" k="41" />
-<hkern u1="&#x41e;" u2="&#x40b;" k="20" />
-<hkern u1="&#x41e;" u2="&#x409;" k="41" />
-<hkern u1="&#x41e;" u2="&#x402;" k="20" />
-<hkern u1="&#x41e;" u2="&#x2e;" k="82" />
-<hkern u1="&#x41e;" u2="&#x2c;" k="82" />
-<hkern u1="&#x420;" u2="&#x201e;" k="266" />
-<hkern u1="&#x420;" u2="&#x201a;" k="266" />
-<hkern u1="&#x420;" u2="&#x513;" k="102" />
-<hkern u1="&#x420;" u2="&#x512;" k="123" />
-<hkern u1="&#x420;" u2="&#x509;" k="102" />
-<hkern u1="&#x420;" u2="&#x508;" k="123" />
-<hkern u1="&#x420;" u2="&#x502;" k="82" />
-<hkern u1="&#x420;" u2="&#x500;" k="82" />
-<hkern u1="&#x420;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x420;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x420;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x420;" u2="&#x4d4;" k="102" />
-<hkern u1="&#x420;" u2="&#x4d2;" k="102" />
-<hkern u1="&#x420;" u2="&#x4d0;" k="102" />
-<hkern u1="&#x420;" u2="&#x4c6;" k="102" />
-<hkern u1="&#x420;" u2="&#x4c5;" k="123" />
-<hkern u1="&#x420;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x420;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x420;" u2="&#x496;" k="41" />
-<hkern u1="&#x420;" u2="&#x46a;" k="20" />
-<hkern u1="&#x420;" u2="&#x467;" k="102" />
-<hkern u1="&#x420;" u2="&#x466;" k="102" />
-<hkern u1="&#x420;" u2="&#x459;" k="102" />
-<hkern u1="&#x420;" u2="&#x43b;" k="102" />
-<hkern u1="&#x420;" u2="&#x434;" k="102" />
-<hkern u1="&#x420;" u2="&#x425;" k="41" />
-<hkern u1="&#x420;" u2="&#x41b;" k="123" />
-<hkern u1="&#x420;" u2="&#x416;" k="41" />
-<hkern u1="&#x420;" u2="&#x414;" k="123" />
-<hkern u1="&#x420;" u2="&#x410;" k="102" />
-<hkern u1="&#x420;" u2="&#x409;" k="123" />
-<hkern u1="&#x420;" u2="&#x2e;" k="266" />
-<hkern u1="&#x420;" u2="&#x2c;" k="266" />
-<hkern u1="&#x421;" u2="&#x50c;" k="41" />
-<hkern u1="&#x421;" u2="&#x507;" k="41" />
-<hkern u1="&#x421;" u2="&#x505;" k="41" />
-<hkern u1="&#x421;" u2="&#x502;" k="41" />
-<hkern u1="&#x421;" u2="&#x500;" k="41" />
-<hkern u1="&#x421;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x421;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x421;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x421;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x421;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x421;" u2="&#x4be;" k="41" />
-<hkern u1="&#x421;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x421;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x421;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x421;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x421;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x421;" u2="&#x480;" k="41" />
-<hkern u1="&#x421;" u2="&#x47e;" k="41" />
-<hkern u1="&#x421;" u2="&#x47c;" k="41" />
-<hkern u1="&#x421;" u2="&#x47a;" k="41" />
-<hkern u1="&#x421;" u2="&#x478;" k="41" />
-<hkern u1="&#x421;" u2="&#x472;" k="41" />
-<hkern u1="&#x421;" u2="&#x460;" k="41" />
-<hkern u1="&#x421;" u2="&#x447;" k="41" />
-<hkern u1="&#x421;" u2="&#x424;" k="41" />
-<hkern u1="&#x421;" u2="&#x421;" k="41" />
-<hkern u1="&#x421;" u2="&#x41e;" k="41" />
-<hkern u1="&#x421;" u2="&#x404;" k="41" />
-<hkern u1="&#x422;" u2="&#x201e;" k="123" />
-<hkern u1="&#x422;" u2="&#x201a;" k="123" />
-<hkern u1="&#x422;" u2="&#x2015;" k="82" />
-<hkern u1="&#x422;" u2="&#x2014;" k="82" />
-<hkern u1="&#x422;" u2="&#x2013;" k="82" />
-<hkern u1="&#x422;" u2="&#x513;" k="123" />
-<hkern u1="&#x422;" u2="&#x512;" k="102" />
-<hkern u1="&#x422;" u2="&#x511;" k="143" />
-<hkern u1="&#x422;" u2="&#x50f;" k="82" />
-<hkern u1="&#x422;" u2="&#x50d;" k="143" />
-<hkern u1="&#x422;" u2="&#x50c;" k="41" />
-<hkern u1="&#x422;" u2="&#x50b;" k="102" />
-<hkern u1="&#x422;" u2="&#x509;" k="123" />
-<hkern u1="&#x422;" u2="&#x508;" k="102" />
-<hkern u1="&#x422;" u2="&#x507;" k="102" />
-<hkern u1="&#x422;" u2="&#x505;" k="102" />
-<hkern u1="&#x422;" u2="&#x503;" k="143" />
-<hkern u1="&#x422;" u2="&#x502;" k="143" />
-<hkern u1="&#x422;" u2="&#x501;" k="143" />
-<hkern u1="&#x422;" u2="&#x500;" k="143" />
-<hkern u1="&#x422;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x422;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x422;" u2="&#x4f9;" k="102" />
-<hkern u1="&#x422;" u2="&#x4f7;" k="102" />
-<hkern u1="&#x422;" u2="&#x4f5;" k="102" />
-<hkern u1="&#x422;" u2="&#x4f3;" k="82" />
-<hkern u1="&#x422;" u2="&#x4f1;" k="82" />
-<hkern u1="&#x422;" u2="&#x4ef;" k="82" />
-<hkern u1="&#x422;" u2="&#x4ed;" k="41" />
-<hkern u1="&#x422;" u2="&#x4eb;" k="143" />
-<hkern u1="&#x422;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x422;" u2="&#x4e9;" k="143" />
-<hkern u1="&#x422;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x422;" u2="&#x4e7;" k="143" />
-<hkern u1="&#x422;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x422;" u2="&#x4e5;" k="102" />
-<hkern u1="&#x422;" u2="&#x4e3;" k="102" />
-<hkern u1="&#x422;" u2="&#x4e1;" k="61" />
-<hkern u1="&#x422;" u2="&#x4df;" k="41" />
-<hkern u1="&#x422;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x422;" u2="&#x4d7;" k="143" />
-<hkern u1="&#x422;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x422;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x422;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x422;" u2="&#x4ce;" k="102" />
-<hkern u1="&#x422;" u2="&#x4cc;" k="102" />
-<hkern u1="&#x422;" u2="&#x4ca;" k="102" />
-<hkern u1="&#x422;" u2="&#x4c8;" k="102" />
-<hkern u1="&#x422;" u2="&#x4c6;" k="123" />
-<hkern u1="&#x422;" u2="&#x4c5;" k="102" />
-<hkern u1="&#x422;" u2="&#x4c4;" k="102" />
-<hkern u1="&#x422;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x422;" u2="&#x4bf;" k="143" />
-<hkern u1="&#x422;" u2="&#x4be;" k="102" />
-<hkern u1="&#x422;" u2="&#x4bd;" k="143" />
-<hkern u1="&#x422;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x422;" u2="&#x4bb;" k="102" />
-<hkern u1="&#x422;" u2="&#x4b9;" k="102" />
-<hkern u1="&#x422;" u2="&#x4b7;" k="102" />
-<hkern u1="&#x422;" u2="&#x4b5;" k="82" />
-<hkern u1="&#x422;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x422;" u2="&#x4b1;" k="82" />
-<hkern u1="&#x422;" u2="&#x4af;" k="82" />
-<hkern u1="&#x422;" u2="&#x4ad;" k="82" />
-<hkern u1="&#x422;" u2="&#x4ac;" k="-41" />
-<hkern u1="&#x422;" u2="&#x4ab;" k="143" />
-<hkern u1="&#x422;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x422;" u2="&#x4a9;" k="143" />
-<hkern u1="&#x422;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x422;" u2="&#x4a7;" k="102" />
-<hkern u1="&#x422;" u2="&#x4a5;" k="102" />
-<hkern u1="&#x422;" u2="&#x4a3;" k="102" />
-<hkern u1="&#x422;" u2="&#x4a1;" k="82" />
-<hkern u1="&#x422;" u2="&#x49d;" k="102" />
-<hkern u1="&#x422;" u2="&#x49b;" k="102" />
-<hkern u1="&#x422;" u2="&#x499;" k="41" />
-<hkern u1="&#x422;" u2="&#x497;" k="41" />
-<hkern u1="&#x422;" u2="&#x495;" k="102" />
-<hkern u1="&#x422;" u2="&#x491;" k="102" />
-<hkern u1="&#x422;" u2="&#x48f;" k="102" />
-<hkern u1="&#x422;" u2="&#x48b;" k="102" />
-<hkern u1="&#x422;" u2="&#x481;" k="143" />
-<hkern u1="&#x422;" u2="&#x480;" k="41" />
-<hkern u1="&#x422;" u2="&#x47f;" k="41" />
-<hkern u1="&#x422;" u2="&#x47e;" k="41" />
-<hkern u1="&#x422;" u2="&#x47d;" k="143" />
-<hkern u1="&#x422;" u2="&#x47c;" k="41" />
-<hkern u1="&#x422;" u2="&#x47b;" k="143" />
-<hkern u1="&#x422;" u2="&#x47a;" k="41" />
-<hkern u1="&#x422;" u2="&#x479;" k="143" />
-<hkern u1="&#x422;" u2="&#x478;" k="41" />
-<hkern u1="&#x422;" u2="&#x477;" k="41" />
-<hkern u1="&#x422;" u2="&#x475;" k="41" />
-<hkern u1="&#x422;" u2="&#x473;" k="143" />
-<hkern u1="&#x422;" u2="&#x472;" k="41" />
-<hkern u1="&#x422;" u2="&#x471;" k="102" />
-<hkern u1="&#x422;" u2="&#x46d;" k="102" />
-<hkern u1="&#x422;" u2="&#x46b;" k="102" />
-<hkern u1="&#x422;" u2="&#x469;" k="102" />
-<hkern u1="&#x422;" u2="&#x467;" k="123" />
-<hkern u1="&#x422;" u2="&#x466;" k="143" />
-<hkern u1="&#x422;" u2="&#x465;" k="102" />
-<hkern u1="&#x422;" u2="&#x461;" k="41" />
-<hkern u1="&#x422;" u2="&#x460;" k="41" />
-<hkern u1="&#x422;" u2="&#x45f;" k="102" />
-<hkern u1="&#x422;" u2="&#x45e;" k="82" />
-<hkern u1="&#x422;" u2="&#x45d;" k="102" />
-<hkern u1="&#x422;" u2="&#x45c;" k="102" />
-<hkern u1="&#x422;" u2="&#x45a;" k="102" />
-<hkern u1="&#x422;" u2="&#x459;" k="123" />
-<hkern u1="&#x422;" u2="&#x455;" k="123" />
-<hkern u1="&#x422;" u2="&#x454;" k="143" />
-<hkern u1="&#x422;" u2="&#x453;" k="102" />
-<hkern u1="&#x422;" u2="&#x451;" k="143" />
-<hkern u1="&#x422;" u2="&#x450;" k="143" />
-<hkern u1="&#x422;" u2="&#x44f;" k="61" />
-<hkern u1="&#x422;" u2="&#x44e;" k="102" />
-<hkern u1="&#x422;" u2="&#x44d;" k="41" />
-<hkern u1="&#x422;" u2="&#x44c;" k="102" />
-<hkern u1="&#x422;" u2="&#x44b;" k="102" />
-<hkern u1="&#x422;" u2="&#x44a;" k="82" />
-<hkern u1="&#x422;" u2="&#x449;" k="102" />
-<hkern u1="&#x422;" u2="&#x448;" k="102" />
-<hkern u1="&#x422;" u2="&#x447;" k="102" />
-<hkern u1="&#x422;" u2="&#x446;" k="102" />
-<hkern u1="&#x422;" u2="&#x445;" k="41" />
-<hkern u1="&#x422;" u2="&#x444;" k="143" />
-<hkern u1="&#x422;" u2="&#x443;" k="82" />
-<hkern u1="&#x422;" u2="&#x442;" k="82" />
-<hkern u1="&#x422;" u2="&#x441;" k="143" />
-<hkern u1="&#x422;" u2="&#x440;" k="102" />
-<hkern u1="&#x422;" u2="&#x43f;" k="102" />
-<hkern u1="&#x422;" u2="&#x43e;" k="143" />
-<hkern u1="&#x422;" u2="&#x43d;" k="102" />
-<hkern u1="&#x422;" u2="&#x43c;" k="102" />
-<hkern u1="&#x422;" u2="&#x43b;" k="123" />
-<hkern u1="&#x422;" u2="&#x43a;" k="102" />
-<hkern u1="&#x422;" u2="&#x439;" k="102" />
-<hkern u1="&#x422;" u2="&#x438;" k="102" />
-<hkern u1="&#x422;" u2="&#x437;" k="41" />
-<hkern u1="&#x422;" u2="&#x436;" k="41" />
-<hkern u1="&#x422;" u2="&#x435;" k="143" />
-<hkern u1="&#x422;" u2="&#x434;" k="123" />
-<hkern u1="&#x422;" u2="&#x433;" k="102" />
-<hkern u1="&#x422;" u2="&#x432;" k="102" />
-<hkern u1="&#x422;" u2="&#x424;" k="82" />
-<hkern u1="&#x422;" u2="&#x422;" k="-41" />
-<hkern u1="&#x422;" u2="&#x421;" k="41" />
-<hkern u1="&#x422;" u2="&#x41e;" k="41" />
-<hkern u1="&#x422;" u2="&#x41b;" k="102" />
-<hkern u1="&#x422;" u2="&#x414;" k="102" />
-<hkern u1="&#x422;" u2="&#x410;" k="143" />
-<hkern u1="&#x422;" u2="&#x409;" k="102" />
-<hkern u1="&#x422;" u2="&#x404;" k="41" />
-<hkern u1="&#x422;" u2="&#x2e;" k="123" />
-<hkern u1="&#x422;" u2="&#x2d;" k="82" />
-<hkern u1="&#x422;" u2="&#x2c;" k="123" />
-<hkern u1="&#x423;" u2="&#x201e;" k="123" />
-<hkern u1="&#x423;" u2="&#x201a;" k="123" />
-<hkern u1="&#x423;" u2="&#x513;" k="82" />
-<hkern u1="&#x423;" u2="&#x512;" k="102" />
-<hkern u1="&#x423;" u2="&#x511;" k="41" />
-<hkern u1="&#x423;" u2="&#x50d;" k="41" />
-<hkern u1="&#x423;" u2="&#x50c;" k="20" />
-<hkern u1="&#x423;" u2="&#x509;" k="82" />
-<hkern u1="&#x423;" u2="&#x508;" k="102" />
-<hkern u1="&#x423;" u2="&#x503;" k="41" />
-<hkern u1="&#x423;" u2="&#x502;" k="143" />
-<hkern u1="&#x423;" u2="&#x501;" k="41" />
-<hkern u1="&#x423;" u2="&#x500;" k="143" />
-<hkern u1="&#x423;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x423;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x423;" u2="&#x4ea;" k="20" />
-<hkern u1="&#x423;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x423;" u2="&#x4e8;" k="20" />
-<hkern u1="&#x423;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x423;" u2="&#x4e6;" k="20" />
-<hkern u1="&#x423;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x423;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x423;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x423;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x423;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x423;" u2="&#x4c6;" k="82" />
-<hkern u1="&#x423;" u2="&#x4c5;" k="102" />
-<hkern u1="&#x423;" u2="&#x4bf;" k="61" />
-<hkern u1="&#x423;" u2="&#x4be;" k="41" />
-<hkern u1="&#x423;" u2="&#x4bd;" k="61" />
-<hkern u1="&#x423;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x423;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x423;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x423;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x423;" u2="&#x4aa;" k="20" />
-<hkern u1="&#x423;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x423;" u2="&#x4a8;" k="20" />
-<hkern u1="&#x423;" u2="&#x49f;" k="-102" />
-<hkern u1="&#x423;" u2="&#x48d;" k="-102" />
-<hkern u1="&#x423;" u2="&#x481;" k="41" />
-<hkern u1="&#x423;" u2="&#x480;" k="20" />
-<hkern u1="&#x423;" u2="&#x47e;" k="20" />
-<hkern u1="&#x423;" u2="&#x47d;" k="41" />
-<hkern u1="&#x423;" u2="&#x47c;" k="20" />
-<hkern u1="&#x423;" u2="&#x47b;" k="41" />
-<hkern u1="&#x423;" u2="&#x47a;" k="20" />
-<hkern u1="&#x423;" u2="&#x479;" k="41" />
-<hkern u1="&#x423;" u2="&#x478;" k="20" />
-<hkern u1="&#x423;" u2="&#x473;" k="41" />
-<hkern u1="&#x423;" u2="&#x472;" k="20" />
-<hkern u1="&#x423;" u2="&#x467;" k="82" />
-<hkern u1="&#x423;" u2="&#x466;" k="143" />
-<hkern u1="&#x423;" u2="&#x460;" k="20" />
-<hkern u1="&#x423;" u2="&#x45b;" k="-102" />
-<hkern u1="&#x423;" u2="&#x459;" k="82" />
-<hkern u1="&#x423;" u2="&#x455;" k="20" />
-<hkern u1="&#x423;" u2="&#x454;" k="41" />
-<hkern u1="&#x423;" u2="&#x452;" k="-102" />
-<hkern u1="&#x423;" u2="&#x451;" k="41" />
-<hkern u1="&#x423;" u2="&#x450;" k="41" />
-<hkern u1="&#x423;" u2="&#x447;" k="41" />
-<hkern u1="&#x423;" u2="&#x444;" k="41" />
-<hkern u1="&#x423;" u2="&#x441;" k="41" />
-<hkern u1="&#x423;" u2="&#x43e;" k="41" />
-<hkern u1="&#x423;" u2="&#x43b;" k="82" />
-<hkern u1="&#x423;" u2="&#x435;" k="41" />
-<hkern u1="&#x423;" u2="&#x434;" k="82" />
-<hkern u1="&#x423;" u2="&#x42f;" k="20" />
-<hkern u1="&#x423;" u2="&#x424;" k="61" />
-<hkern u1="&#x423;" u2="&#x421;" k="20" />
-<hkern u1="&#x423;" u2="&#x41e;" k="20" />
-<hkern u1="&#x423;" u2="&#x41b;" k="102" />
-<hkern u1="&#x423;" u2="&#x414;" k="102" />
-<hkern u1="&#x423;" u2="&#x410;" k="143" />
-<hkern u1="&#x423;" u2="&#x409;" k="102" />
-<hkern u1="&#x423;" u2="&#x404;" k="20" />
-<hkern u1="&#x423;" u2="&#x2e;" k="123" />
-<hkern u1="&#x423;" u2="&#x2c;" k="123" />
-<hkern u1="&#x424;" u2="&#x201e;" k="82" />
-<hkern u1="&#x424;" u2="&#x201a;" k="82" />
-<hkern u1="&#x424;" u2="&#x513;" k="20" />
-<hkern u1="&#x424;" u2="&#x512;" k="41" />
-<hkern u1="&#x424;" u2="&#x50e;" k="41" />
-<hkern u1="&#x424;" u2="&#x509;" k="20" />
-<hkern u1="&#x424;" u2="&#x508;" k="41" />
-<hkern u1="&#x424;" u2="&#x506;" k="41" />
-<hkern u1="&#x424;" u2="&#x504;" k="41" />
-<hkern u1="&#x424;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x424;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x424;" u2="&#x4f2;" k="61" />
-<hkern u1="&#x424;" u2="&#x4f0;" k="61" />
-<hkern u1="&#x424;" u2="&#x4ee;" k="61" />
-<hkern u1="&#x424;" u2="&#x4ec;" k="41" />
-<hkern u1="&#x424;" u2="&#x4de;" k="41" />
-<hkern u1="&#x424;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x424;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x424;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x424;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x424;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x424;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x424;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x424;" u2="&#x4b4;" k="41" />
-<hkern u1="&#x424;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x424;" u2="&#x4b0;" k="61" />
-<hkern u1="&#x424;" u2="&#x4ae;" k="61" />
-<hkern u1="&#x424;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x424;" u2="&#x4a0;" k="41" />
-<hkern u1="&#x424;" u2="&#x498;" k="41" />
-<hkern u1="&#x424;" u2="&#x496;" k="41" />
-<hkern u1="&#x424;" u2="&#x476;" k="20" />
-<hkern u1="&#x424;" u2="&#x474;" k="20" />
-<hkern u1="&#x424;" u2="&#x46e;" k="41" />
-<hkern u1="&#x424;" u2="&#x467;" k="20" />
-<hkern u1="&#x424;" u2="&#x466;" k="41" />
-<hkern u1="&#x424;" u2="&#x459;" k="20" />
-<hkern u1="&#x424;" u2="&#x43b;" k="20" />
-<hkern u1="&#x424;" u2="&#x434;" k="20" />
-<hkern u1="&#x424;" u2="&#x42d;" k="41" />
-<hkern u1="&#x424;" u2="&#x42a;" k="41" />
-<hkern u1="&#x424;" u2="&#x425;" k="41" />
-<hkern u1="&#x424;" u2="&#x423;" k="61" />
-<hkern u1="&#x424;" u2="&#x422;" k="61" />
-<hkern u1="&#x424;" u2="&#x41b;" k="41" />
-<hkern u1="&#x424;" u2="&#x417;" k="41" />
-<hkern u1="&#x424;" u2="&#x416;" k="41" />
-<hkern u1="&#x424;" u2="&#x414;" k="41" />
-<hkern u1="&#x424;" u2="&#x410;" k="41" />
-<hkern u1="&#x424;" u2="&#x40e;" k="61" />
-<hkern u1="&#x424;" u2="&#x40b;" k="41" />
-<hkern u1="&#x424;" u2="&#x409;" k="41" />
-<hkern u1="&#x424;" u2="&#x402;" k="41" />
-<hkern u1="&#x424;" u2="&#x2e;" k="82" />
-<hkern u1="&#x424;" u2="&#x2c;" k="82" />
-<hkern u1="&#x425;" u2="&#x510;" k="20" />
-<hkern u1="&#x425;" u2="&#x50c;" k="41" />
-<hkern u1="&#x425;" u2="&#x507;" k="41" />
-<hkern u1="&#x425;" u2="&#x505;" k="41" />
-<hkern u1="&#x425;" u2="&#x502;" k="41" />
-<hkern u1="&#x425;" u2="&#x500;" k="41" />
-<hkern u1="&#x425;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x425;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x425;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x425;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x425;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x425;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x425;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x425;" u2="&#x4be;" k="102" />
-<hkern u1="&#x425;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x425;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x425;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x425;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x425;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x425;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x425;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x425;" u2="&#x480;" k="41" />
-<hkern u1="&#x425;" u2="&#x47e;" k="41" />
-<hkern u1="&#x425;" u2="&#x47c;" k="41" />
-<hkern u1="&#x425;" u2="&#x47a;" k="41" />
-<hkern u1="&#x425;" u2="&#x478;" k="41" />
-<hkern u1="&#x425;" u2="&#x472;" k="41" />
-<hkern u1="&#x425;" u2="&#x470;" k="41" />
-<hkern u1="&#x425;" u2="&#x460;" k="41" />
-<hkern u1="&#x425;" u2="&#x447;" k="41" />
-<hkern u1="&#x425;" u2="&#x427;" k="41" />
-<hkern u1="&#x425;" u2="&#x424;" k="41" />
-<hkern u1="&#x425;" u2="&#x421;" k="41" />
-<hkern u1="&#x425;" u2="&#x41e;" k="41" />
-<hkern u1="&#x425;" u2="&#x404;" k="41" />
-<hkern u1="&#x426;" u2="&#x507;" k="41" />
-<hkern u1="&#x426;" u2="&#x505;" k="41" />
-<hkern u1="&#x426;" u2="&#x4e1;" k="-41" />
-<hkern u1="&#x426;" u2="&#x408;" k="-225" />
-<hkern u1="&#x429;" u2="&#x507;" k="41" />
-<hkern u1="&#x429;" u2="&#x505;" k="41" />
-<hkern u1="&#x429;" u2="&#x4e1;" k="-41" />
-<hkern u1="&#x429;" u2="&#x408;" k="-225" />
-<hkern u1="&#x42a;" u2="&#x201d;" k="82" />
-<hkern u1="&#x42a;" u2="&#x2019;" k="82" />
-<hkern u1="&#x42a;" u2="&#x50f;" k="41" />
-<hkern u1="&#x42a;" u2="&#x50e;" k="123" />
-<hkern u1="&#x42a;" u2="&#x507;" k="61" />
-<hkern u1="&#x42a;" u2="&#x506;" k="102" />
-<hkern u1="&#x42a;" u2="&#x505;" k="61" />
-<hkern u1="&#x42a;" u2="&#x504;" k="102" />
-<hkern u1="&#x42a;" u2="&#x4fa;" k="82" />
-<hkern u1="&#x42a;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4f4;" k="102" />
-<hkern u1="&#x42a;" u2="&#x4f3;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4f1;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4ef;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4cb;" k="102" />
-<hkern u1="&#x42a;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4b8;" k="102" />
-<hkern u1="&#x42a;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4b6;" k="102" />
-<hkern u1="&#x42a;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4b4;" k="123" />
-<hkern u1="&#x42a;" u2="&#x4b1;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4b0;" k="102" />
-<hkern u1="&#x42a;" u2="&#x4af;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4ae;" k="102" />
-<hkern u1="&#x42a;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4ac;" k="102" />
-<hkern u1="&#x42a;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4a0;" k="123" />
-<hkern u1="&#x42a;" u2="&#x49e;" k="82" />
-<hkern u1="&#x42a;" u2="&#x492;" k="82" />
-<hkern u1="&#x42a;" u2="&#x48c;" k="82" />
-<hkern u1="&#x42a;" u2="&#x476;" k="82" />
-<hkern u1="&#x42a;" u2="&#x474;" k="82" />
-<hkern u1="&#x42a;" u2="&#x470;" k="102" />
-<hkern u1="&#x42a;" u2="&#x462;" k="82" />
-<hkern u1="&#x42a;" u2="&#x45e;" k="41" />
-<hkern u1="&#x42a;" u2="&#x44a;" k="41" />
-<hkern u1="&#x42a;" u2="&#x447;" k="41" />
-<hkern u1="&#x42a;" u2="&#x443;" k="41" />
-<hkern u1="&#x42a;" u2="&#x442;" k="41" />
-<hkern u1="&#x42a;" u2="&#x42a;" k="123" />
-<hkern u1="&#x42a;" u2="&#x427;" k="102" />
-<hkern u1="&#x42a;" u2="&#x423;" k="41" />
-<hkern u1="&#x42a;" u2="&#x422;" k="102" />
-<hkern u1="&#x42a;" u2="&#x40e;" k="41" />
-<hkern u1="&#x42a;" u2="&#x40b;" k="123" />
-<hkern u1="&#x42a;" u2="&#x402;" k="123" />
-<hkern u1="&#x42a;" u2="&#x27;" k="82" />
-<hkern u1="&#x42a;" u2="&#x22;" k="82" />
-<hkern u1="&#x42c;" u2="&#x201d;" k="82" />
-<hkern u1="&#x42c;" u2="&#x2019;" k="82" />
-<hkern u1="&#x42c;" u2="&#x50f;" k="41" />
-<hkern u1="&#x42c;" u2="&#x50e;" k="123" />
-<hkern u1="&#x42c;" u2="&#x507;" k="61" />
-<hkern u1="&#x42c;" u2="&#x506;" k="102" />
-<hkern u1="&#x42c;" u2="&#x505;" k="61" />
-<hkern u1="&#x42c;" u2="&#x504;" k="102" />
-<hkern u1="&#x42c;" u2="&#x4fa;" k="82" />
-<hkern u1="&#x42c;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4f4;" k="102" />
-<hkern u1="&#x42c;" u2="&#x4f3;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4f1;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4ef;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4cb;" k="102" />
-<hkern u1="&#x42c;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4b8;" k="102" />
-<hkern u1="&#x42c;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4b6;" k="102" />
-<hkern u1="&#x42c;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4b4;" k="123" />
-<hkern u1="&#x42c;" u2="&#x4b1;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4b0;" k="102" />
-<hkern u1="&#x42c;" u2="&#x4af;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4ae;" k="102" />
-<hkern u1="&#x42c;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4ac;" k="102" />
-<hkern u1="&#x42c;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4a0;" k="123" />
-<hkern u1="&#x42c;" u2="&#x49e;" k="82" />
-<hkern u1="&#x42c;" u2="&#x492;" k="82" />
-<hkern u1="&#x42c;" u2="&#x48c;" k="82" />
-<hkern u1="&#x42c;" u2="&#x476;" k="82" />
-<hkern u1="&#x42c;" u2="&#x474;" k="82" />
-<hkern u1="&#x42c;" u2="&#x470;" k="102" />
-<hkern u1="&#x42c;" u2="&#x462;" k="82" />
-<hkern u1="&#x42c;" u2="&#x45e;" k="41" />
-<hkern u1="&#x42c;" u2="&#x44a;" k="41" />
-<hkern u1="&#x42c;" u2="&#x447;" k="41" />
-<hkern u1="&#x42c;" u2="&#x443;" k="41" />
-<hkern u1="&#x42c;" u2="&#x442;" k="41" />
-<hkern u1="&#x42c;" u2="&#x42a;" k="123" />
-<hkern u1="&#x42c;" u2="&#x427;" k="102" />
-<hkern u1="&#x42c;" u2="&#x423;" k="41" />
-<hkern u1="&#x42c;" u2="&#x422;" k="102" />
-<hkern u1="&#x42c;" u2="&#x40e;" k="41" />
-<hkern u1="&#x42c;" u2="&#x40b;" k="123" />
-<hkern u1="&#x42c;" u2="&#x402;" k="123" />
-<hkern u1="&#x42c;" u2="&#x27;" k="82" />
-<hkern u1="&#x42c;" u2="&#x22;" k="82" />
-<hkern u1="&#x42d;" u2="&#x201e;" k="82" />
-<hkern u1="&#x42d;" u2="&#x201a;" k="82" />
-<hkern u1="&#x42d;" u2="&#x513;" k="20" />
-<hkern u1="&#x42d;" u2="&#x512;" k="41" />
-<hkern u1="&#x42d;" u2="&#x50e;" k="20" />
-<hkern u1="&#x42d;" u2="&#x509;" k="20" />
-<hkern u1="&#x42d;" u2="&#x508;" k="41" />
-<hkern u1="&#x42d;" u2="&#x506;" k="41" />
-<hkern u1="&#x42d;" u2="&#x504;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x42d;" u2="&#x4de;" k="20" />
-<hkern u1="&#x42d;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x42d;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x42d;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x42d;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x42d;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x42d;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x42d;" u2="&#x498;" k="20" />
-<hkern u1="&#x42d;" u2="&#x496;" k="41" />
-<hkern u1="&#x42d;" u2="&#x476;" k="20" />
-<hkern u1="&#x42d;" u2="&#x474;" k="20" />
-<hkern u1="&#x42d;" u2="&#x470;" k="41" />
-<hkern u1="&#x42d;" u2="&#x46e;" k="20" />
-<hkern u1="&#x42d;" u2="&#x467;" k="20" />
-<hkern u1="&#x42d;" u2="&#x466;" k="41" />
-<hkern u1="&#x42d;" u2="&#x459;" k="20" />
-<hkern u1="&#x42d;" u2="&#x43b;" k="20" />
-<hkern u1="&#x42d;" u2="&#x434;" k="20" />
-<hkern u1="&#x42d;" u2="&#x42d;" k="20" />
-<hkern u1="&#x42d;" u2="&#x42a;" k="20" />
-<hkern u1="&#x42d;" u2="&#x427;" k="41" />
-<hkern u1="&#x42d;" u2="&#x425;" k="41" />
-<hkern u1="&#x42d;" u2="&#x423;" k="41" />
-<hkern u1="&#x42d;" u2="&#x422;" k="61" />
-<hkern u1="&#x42d;" u2="&#x41b;" k="41" />
-<hkern u1="&#x42d;" u2="&#x417;" k="20" />
-<hkern u1="&#x42d;" u2="&#x416;" k="41" />
-<hkern u1="&#x42d;" u2="&#x414;" k="41" />
-<hkern u1="&#x42d;" u2="&#x410;" k="41" />
-<hkern u1="&#x42d;" u2="&#x40e;" k="41" />
-<hkern u1="&#x42d;" u2="&#x40b;" k="20" />
-<hkern u1="&#x42d;" u2="&#x409;" k="41" />
-<hkern u1="&#x42d;" u2="&#x402;" k="20" />
-<hkern u1="&#x42d;" u2="&#x2e;" k="82" />
-<hkern u1="&#x42d;" u2="&#x2c;" k="82" />
-<hkern u1="&#x42e;" u2="&#x201e;" k="82" />
-<hkern u1="&#x42e;" u2="&#x201a;" k="82" />
-<hkern u1="&#x42e;" u2="&#x513;" k="20" />
-<hkern u1="&#x42e;" u2="&#x512;" k="41" />
-<hkern u1="&#x42e;" u2="&#x50e;" k="20" />
-<hkern u1="&#x42e;" u2="&#x509;" k="20" />
-<hkern u1="&#x42e;" u2="&#x508;" k="41" />
-<hkern u1="&#x42e;" u2="&#x506;" k="41" />
-<hkern u1="&#x42e;" u2="&#x504;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x42e;" u2="&#x4de;" k="20" />
-<hkern u1="&#x42e;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x42e;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x42e;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x42e;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x42e;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x42e;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x42e;" u2="&#x498;" k="20" />
-<hkern u1="&#x42e;" u2="&#x496;" k="41" />
-<hkern u1="&#x42e;" u2="&#x476;" k="20" />
-<hkern u1="&#x42e;" u2="&#x474;" k="20" />
-<hkern u1="&#x42e;" u2="&#x470;" k="41" />
-<hkern u1="&#x42e;" u2="&#x46e;" k="20" />
-<hkern u1="&#x42e;" u2="&#x467;" k="20" />
-<hkern u1="&#x42e;" u2="&#x466;" k="41" />
-<hkern u1="&#x42e;" u2="&#x459;" k="20" />
-<hkern u1="&#x42e;" u2="&#x43b;" k="20" />
-<hkern u1="&#x42e;" u2="&#x434;" k="20" />
-<hkern u1="&#x42e;" u2="&#x42d;" k="20" />
-<hkern u1="&#x42e;" u2="&#x42a;" k="20" />
-<hkern u1="&#x42e;" u2="&#x427;" k="41" />
-<hkern u1="&#x42e;" u2="&#x425;" k="41" />
-<hkern u1="&#x42e;" u2="&#x423;" k="41" />
-<hkern u1="&#x42e;" u2="&#x422;" k="61" />
-<hkern u1="&#x42e;" u2="&#x41b;" k="41" />
-<hkern u1="&#x42e;" u2="&#x417;" k="20" />
-<hkern u1="&#x42e;" u2="&#x416;" k="41" />
-<hkern u1="&#x42e;" u2="&#x414;" k="41" />
-<hkern u1="&#x42e;" u2="&#x410;" k="41" />
-<hkern u1="&#x42e;" u2="&#x40e;" k="41" />
-<hkern u1="&#x42e;" u2="&#x40b;" k="20" />
-<hkern u1="&#x42e;" u2="&#x409;" k="41" />
-<hkern u1="&#x42e;" u2="&#x402;" k="20" />
-<hkern u1="&#x42e;" u2="&#x2e;" k="82" />
-<hkern u1="&#x42e;" u2="&#x2c;" k="82" />
-<hkern u1="&#x430;" u2="&#x201d;" k="20" />
-<hkern u1="&#x430;" u2="&#x2019;" k="20" />
-<hkern u1="&#x430;" u2="&#x27;" k="20" />
-<hkern u1="&#x430;" u2="&#x22;" k="20" />
-<hkern u1="&#x432;" u2="&#x44f;" k="-41" />
-<hkern u1="&#x433;" u2="&#x201e;" k="102" />
-<hkern u1="&#x433;" u2="&#x201a;" k="102" />
-<hkern u1="&#x433;" u2="&#x2015;" k="41" />
-<hkern u1="&#x433;" u2="&#x2014;" k="41" />
-<hkern u1="&#x433;" u2="&#x2013;" k="41" />
-<hkern u1="&#x433;" u2="&#x513;" k="61" />
-<hkern u1="&#x433;" u2="&#x511;" k="20" />
-<hkern u1="&#x433;" u2="&#x50d;" k="20" />
-<hkern u1="&#x433;" u2="&#x509;" k="61" />
-<hkern u1="&#x433;" u2="&#x503;" k="20" />
-<hkern u1="&#x433;" u2="&#x501;" k="20" />
-<hkern u1="&#x433;" u2="&#x4eb;" k="20" />
-<hkern u1="&#x433;" u2="&#x4e9;" k="20" />
-<hkern u1="&#x433;" u2="&#x4e7;" k="20" />
-<hkern u1="&#x433;" u2="&#x4d7;" k="20" />
-<hkern u1="&#x433;" u2="&#x4c6;" k="61" />
-<hkern u1="&#x433;" u2="&#x4ab;" k="20" />
-<hkern u1="&#x433;" u2="&#x4a9;" k="20" />
-<hkern u1="&#x433;" u2="&#x481;" k="20" />
-<hkern u1="&#x433;" u2="&#x47d;" k="20" />
-<hkern u1="&#x433;" u2="&#x47b;" k="20" />
-<hkern u1="&#x433;" u2="&#x479;" k="20" />
-<hkern u1="&#x433;" u2="&#x473;" k="20" />
-<hkern u1="&#x433;" u2="&#x467;" k="61" />
-<hkern u1="&#x433;" u2="&#x459;" k="61" />
-<hkern u1="&#x433;" u2="&#x454;" k="20" />
-<hkern u1="&#x433;" u2="&#x451;" k="20" />
-<hkern u1="&#x433;" u2="&#x450;" k="20" />
-<hkern u1="&#x433;" u2="&#x444;" k="20" />
-<hkern u1="&#x433;" u2="&#x441;" k="20" />
-<hkern u1="&#x433;" u2="&#x43e;" k="20" />
-<hkern u1="&#x433;" u2="&#x43b;" k="61" />
-<hkern u1="&#x433;" u2="&#x435;" k="20" />
-<hkern u1="&#x433;" u2="&#x434;" k="61" />
-<hkern u1="&#x433;" u2="&#x2e;" k="102" />
-<hkern u1="&#x433;" u2="&#x2d;" k="41" />
-<hkern u1="&#x433;" u2="&#x2c;" k="102" />
-<hkern u1="&#x434;" u2="&#x201d;" k="20" />
-<hkern u1="&#x434;" u2="&#x2019;" k="20" />
-<hkern u1="&#x434;" u2="&#x27;" k="20" />
-<hkern u1="&#x434;" u2="&#x22;" k="20" />
-<hkern u1="&#x435;" u2="&#x201d;" k="20" />
-<hkern u1="&#x435;" u2="&#x2019;" k="20" />
-<hkern u1="&#x435;" u2="&#x27;" k="20" />
-<hkern u1="&#x435;" u2="&#x22;" k="20" />
-<hkern u1="&#x436;" u2="&#x511;" k="41" />
-<hkern u1="&#x436;" u2="&#x50d;" k="41" />
-<hkern u1="&#x436;" u2="&#x503;" k="41" />
-<hkern u1="&#x436;" u2="&#x501;" k="41" />
-<hkern u1="&#x436;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x436;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x436;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x436;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x436;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x436;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x436;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x436;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x436;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x436;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x436;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x436;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x436;" u2="&#x481;" k="41" />
-<hkern u1="&#x436;" u2="&#x47d;" k="41" />
-<hkern u1="&#x436;" u2="&#x47b;" k="41" />
-<hkern u1="&#x436;" u2="&#x479;" k="41" />
-<hkern u1="&#x436;" u2="&#x473;" k="41" />
-<hkern u1="&#x436;" u2="&#x454;" k="41" />
-<hkern u1="&#x436;" u2="&#x451;" k="41" />
-<hkern u1="&#x436;" u2="&#x450;" k="41" />
-<hkern u1="&#x436;" u2="&#x447;" k="41" />
-<hkern u1="&#x436;" u2="&#x444;" k="41" />
-<hkern u1="&#x436;" u2="&#x441;" k="41" />
-<hkern u1="&#x436;" u2="&#x43e;" k="41" />
-<hkern u1="&#x436;" u2="&#x435;" k="41" />
-<hkern u1="&#x437;" u2="&#x44f;" k="-41" />
-<hkern u1="&#x43a;" u2="&#x511;" k="41" />
-<hkern u1="&#x43a;" u2="&#x50d;" k="41" />
-<hkern u1="&#x43a;" u2="&#x503;" k="41" />
-<hkern u1="&#x43a;" u2="&#x501;" k="41" />
-<hkern u1="&#x43a;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x43a;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x43a;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x43a;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x43a;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x43a;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x43a;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x43a;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x43a;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x43a;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x43a;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x43a;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x43a;" u2="&#x481;" k="41" />
-<hkern u1="&#x43a;" u2="&#x47d;" k="41" />
-<hkern u1="&#x43a;" u2="&#x47b;" k="41" />
-<hkern u1="&#x43a;" u2="&#x479;" k="41" />
-<hkern u1="&#x43a;" u2="&#x473;" k="41" />
-<hkern u1="&#x43a;" u2="&#x454;" k="41" />
-<hkern u1="&#x43a;" u2="&#x451;" k="41" />
-<hkern u1="&#x43a;" u2="&#x450;" k="41" />
-<hkern u1="&#x43a;" u2="&#x447;" k="41" />
-<hkern u1="&#x43a;" u2="&#x444;" k="41" />
-<hkern u1="&#x43a;" u2="&#x441;" k="41" />
-<hkern u1="&#x43a;" u2="&#x43e;" k="41" />
-<hkern u1="&#x43a;" u2="&#x435;" k="41" />
-<hkern u1="&#x43e;" u2="&#x201d;" k="20" />
-<hkern u1="&#x43e;" u2="&#x2019;" k="20" />
-<hkern u1="&#x43e;" u2="&#x50f;" k="20" />
-<hkern u1="&#x43e;" u2="&#x507;" k="20" />
-<hkern u1="&#x43e;" u2="&#x505;" k="20" />
-<hkern u1="&#x43e;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x43e;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x43e;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x43e;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x43e;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x43e;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x43e;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x43e;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x43e;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x43e;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x43e;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x43e;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x43e;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x43e;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x43e;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x43e;" u2="&#x497;" k="41" />
-<hkern u1="&#x43e;" u2="&#x45e;" k="20" />
-<hkern u1="&#x43e;" u2="&#x44a;" k="20" />
-<hkern u1="&#x43e;" u2="&#x447;" k="20" />
-<hkern u1="&#x43e;" u2="&#x445;" k="41" />
-<hkern u1="&#x43e;" u2="&#x443;" k="20" />
-<hkern u1="&#x43e;" u2="&#x442;" k="20" />
-<hkern u1="&#x43e;" u2="&#x436;" k="41" />
-<hkern u1="&#x43e;" u2="&#x27;" k="20" />
-<hkern u1="&#x43e;" u2="&#x22;" k="20" />
-<hkern u1="&#x440;" u2="&#x201d;" k="20" />
-<hkern u1="&#x440;" u2="&#x2019;" k="20" />
-<hkern u1="&#x440;" u2="&#x50f;" k="20" />
-<hkern u1="&#x440;" u2="&#x507;" k="20" />
-<hkern u1="&#x440;" u2="&#x505;" k="20" />
-<hkern u1="&#x440;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x440;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x440;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x440;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x440;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x440;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x440;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x440;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x440;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x440;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x440;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x440;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x440;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x440;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x440;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x440;" u2="&#x497;" k="41" />
-<hkern u1="&#x440;" u2="&#x45e;" k="20" />
-<hkern u1="&#x440;" u2="&#x44a;" k="20" />
-<hkern u1="&#x440;" u2="&#x447;" k="20" />
-<hkern u1="&#x440;" u2="&#x445;" k="41" />
-<hkern u1="&#x440;" u2="&#x443;" k="20" />
-<hkern u1="&#x440;" u2="&#x442;" k="20" />
-<hkern u1="&#x440;" u2="&#x436;" k="41" />
-<hkern u1="&#x440;" u2="&#x27;" k="20" />
-<hkern u1="&#x440;" u2="&#x22;" k="20" />
-<hkern u1="&#x442;" u2="&#x201e;" k="102" />
-<hkern u1="&#x442;" u2="&#x201a;" k="102" />
-<hkern u1="&#x442;" u2="&#x2015;" k="41" />
-<hkern u1="&#x442;" u2="&#x2014;" k="41" />
-<hkern u1="&#x442;" u2="&#x2013;" k="41" />
-<hkern u1="&#x442;" u2="&#x513;" k="61" />
-<hkern u1="&#x442;" u2="&#x511;" k="20" />
-<hkern u1="&#x442;" u2="&#x50d;" k="20" />
-<hkern u1="&#x442;" u2="&#x509;" k="61" />
-<hkern u1="&#x442;" u2="&#x503;" k="20" />
-<hkern u1="&#x442;" u2="&#x501;" k="20" />
-<hkern u1="&#x442;" u2="&#x4eb;" k="20" />
-<hkern u1="&#x442;" u2="&#x4e9;" k="20" />
-<hkern u1="&#x442;" u2="&#x4e7;" k="20" />
-<hkern u1="&#x442;" u2="&#x4d7;" k="20" />
-<hkern u1="&#x442;" u2="&#x4c6;" k="61" />
-<hkern u1="&#x442;" u2="&#x4ab;" k="20" />
-<hkern u1="&#x442;" u2="&#x4a9;" k="20" />
-<hkern u1="&#x442;" u2="&#x481;" k="20" />
-<hkern u1="&#x442;" u2="&#x47d;" k="20" />
-<hkern u1="&#x442;" u2="&#x47b;" k="20" />
-<hkern u1="&#x442;" u2="&#x479;" k="20" />
-<hkern u1="&#x442;" u2="&#x473;" k="20" />
-<hkern u1="&#x442;" u2="&#x467;" k="61" />
-<hkern u1="&#x442;" u2="&#x459;" k="61" />
-<hkern u1="&#x442;" u2="&#x454;" k="20" />
-<hkern u1="&#x442;" u2="&#x451;" k="20" />
-<hkern u1="&#x442;" u2="&#x450;" k="20" />
-<hkern u1="&#x442;" u2="&#x444;" k="20" />
-<hkern u1="&#x442;" u2="&#x441;" k="20" />
-<hkern u1="&#x442;" u2="&#x43e;" k="20" />
-<hkern u1="&#x442;" u2="&#x43b;" k="61" />
-<hkern u1="&#x442;" u2="&#x435;" k="20" />
-<hkern u1="&#x442;" u2="&#x434;" k="61" />
-<hkern u1="&#x442;" u2="&#x2e;" k="102" />
-<hkern u1="&#x442;" u2="&#x2d;" k="41" />
-<hkern u1="&#x442;" u2="&#x2c;" k="102" />
-<hkern u1="&#x443;" u2="&#x201e;" k="82" />
-<hkern u1="&#x443;" u2="&#x201a;" k="82" />
-<hkern u1="&#x443;" u2="&#x513;" k="41" />
-<hkern u1="&#x443;" u2="&#x509;" k="41" />
-<hkern u1="&#x443;" u2="&#x4c6;" k="41" />
-<hkern u1="&#x443;" u2="&#x467;" k="41" />
-<hkern u1="&#x443;" u2="&#x459;" k="41" />
-<hkern u1="&#x443;" u2="&#x43b;" k="41" />
-<hkern u1="&#x443;" u2="&#x434;" k="41" />
-<hkern u1="&#x443;" u2="&#x2e;" k="82" />
-<hkern u1="&#x443;" u2="&#x2c;" k="82" />
-<hkern u1="&#x444;" u2="&#x201d;" k="20" />
-<hkern u1="&#x444;" u2="&#x2019;" k="20" />
-<hkern u1="&#x444;" u2="&#x50f;" k="20" />
-<hkern u1="&#x444;" u2="&#x507;" k="20" />
-<hkern u1="&#x444;" u2="&#x505;" k="20" />
-<hkern u1="&#x444;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x444;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x444;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x444;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x444;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x444;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x444;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x444;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x444;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x444;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x444;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x444;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x444;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x444;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x444;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x444;" u2="&#x497;" k="41" />
-<hkern u1="&#x444;" u2="&#x45e;" k="20" />
-<hkern u1="&#x444;" u2="&#x44a;" k="20" />
-<hkern u1="&#x444;" u2="&#x447;" k="20" />
-<hkern u1="&#x444;" u2="&#x445;" k="41" />
-<hkern u1="&#x444;" u2="&#x443;" k="20" />
-<hkern u1="&#x444;" u2="&#x442;" k="20" />
-<hkern u1="&#x444;" u2="&#x436;" k="41" />
-<hkern u1="&#x444;" u2="&#x27;" k="20" />
-<hkern u1="&#x444;" u2="&#x22;" k="20" />
-<hkern u1="&#x445;" u2="&#x511;" k="41" />
-<hkern u1="&#x445;" u2="&#x50d;" k="41" />
-<hkern u1="&#x445;" u2="&#x503;" k="41" />
-<hkern u1="&#x445;" u2="&#x501;" k="41" />
-<hkern u1="&#x445;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x445;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x445;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x445;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x445;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x445;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x445;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x445;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x445;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x445;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x445;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x445;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x445;" u2="&#x481;" k="41" />
-<hkern u1="&#x445;" u2="&#x47d;" k="41" />
-<hkern u1="&#x445;" u2="&#x47b;" k="41" />
-<hkern u1="&#x445;" u2="&#x479;" k="41" />
-<hkern u1="&#x445;" u2="&#x473;" k="41" />
-<hkern u1="&#x445;" u2="&#x454;" k="41" />
-<hkern u1="&#x445;" u2="&#x451;" k="41" />
-<hkern u1="&#x445;" u2="&#x450;" k="41" />
-<hkern u1="&#x445;" u2="&#x447;" k="41" />
-<hkern u1="&#x445;" u2="&#x444;" k="41" />
-<hkern u1="&#x445;" u2="&#x441;" k="41" />
-<hkern u1="&#x445;" u2="&#x43e;" k="41" />
-<hkern u1="&#x445;" u2="&#x435;" k="41" />
-<hkern u1="&#x446;" u2="&#x201d;" k="20" />
-<hkern u1="&#x446;" u2="&#x2019;" k="20" />
-<hkern u1="&#x446;" u2="&#x27;" k="20" />
-<hkern u1="&#x446;" u2="&#x22;" k="20" />
-<hkern u1="&#x449;" u2="&#x201d;" k="20" />
-<hkern u1="&#x449;" u2="&#x2019;" k="20" />
-<hkern u1="&#x449;" u2="&#x27;" k="20" />
-<hkern u1="&#x449;" u2="&#x22;" k="20" />
-<hkern u1="&#x44a;" u2="&#x201d;" k="123" />
-<hkern u1="&#x44a;" u2="&#x2019;" k="123" />
-<hkern u1="&#x44a;" u2="&#x50f;" k="102" />
-<hkern u1="&#x44a;" u2="&#x507;" k="102" />
-<hkern u1="&#x44a;" u2="&#x505;" k="102" />
-<hkern u1="&#x44a;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x44a;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x44a;" u2="&#x4f5;" k="82" />
-<hkern u1="&#x44a;" u2="&#x4f3;" k="61" />
-<hkern u1="&#x44a;" u2="&#x4f1;" k="61" />
-<hkern u1="&#x44a;" u2="&#x4ef;" k="61" />
-<hkern u1="&#x44a;" u2="&#x4e1;" k="41" />
-<hkern u1="&#x44a;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x44a;" u2="&#x4cc;" k="82" />
-<hkern u1="&#x44a;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x44a;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x44a;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x44a;" u2="&#x4b9;" k="82" />
-<hkern u1="&#x44a;" u2="&#x4b7;" k="82" />
-<hkern u1="&#x44a;" u2="&#x4b5;" k="102" />
-<hkern u1="&#x44a;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x44a;" u2="&#x4b1;" k="61" />
-<hkern u1="&#x44a;" u2="&#x4af;" k="61" />
-<hkern u1="&#x44a;" u2="&#x4ad;" k="102" />
-<hkern u1="&#x44a;" u2="&#x4a1;" k="102" />
-<hkern u1="&#x44a;" u2="&#x497;" k="41" />
-<hkern u1="&#x44a;" u2="&#x47f;" k="41" />
-<hkern u1="&#x44a;" u2="&#x477;" k="41" />
-<hkern u1="&#x44a;" u2="&#x475;" k="41" />
-<hkern u1="&#x44a;" u2="&#x461;" k="41" />
-<hkern u1="&#x44a;" u2="&#x45e;" k="61" />
-<hkern u1="&#x44a;" u2="&#x44a;" k="102" />
-<hkern u1="&#x44a;" u2="&#x447;" k="82" />
-<hkern u1="&#x44a;" u2="&#x445;" k="41" />
-<hkern u1="&#x44a;" u2="&#x443;" k="61" />
-<hkern u1="&#x44a;" u2="&#x442;" k="102" />
-<hkern u1="&#x44a;" u2="&#x436;" k="41" />
-<hkern u1="&#x44a;" u2="&#x27;" k="123" />
-<hkern u1="&#x44a;" u2="&#x22;" k="123" />
-<hkern u1="&#x44c;" u2="&#x201d;" k="123" />
-<hkern u1="&#x44c;" u2="&#x2019;" k="123" />
-<hkern u1="&#x44c;" u2="&#x50f;" k="102" />
-<hkern u1="&#x44c;" u2="&#x507;" k="102" />
-<hkern u1="&#x44c;" u2="&#x505;" k="102" />
-<hkern u1="&#x44c;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x44c;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x44c;" u2="&#x4f5;" k="82" />
-<hkern u1="&#x44c;" u2="&#x4f3;" k="61" />
-<hkern u1="&#x44c;" u2="&#x4f1;" k="61" />
-<hkern u1="&#x44c;" u2="&#x4ef;" k="61" />
-<hkern u1="&#x44c;" u2="&#x4e1;" k="41" />
-<hkern u1="&#x44c;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x44c;" u2="&#x4cc;" k="82" />
-<hkern u1="&#x44c;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x44c;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x44c;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x44c;" u2="&#x4b9;" k="82" />
-<hkern u1="&#x44c;" u2="&#x4b7;" k="82" />
-<hkern u1="&#x44c;" u2="&#x4b5;" k="102" />
-<hkern u1="&#x44c;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x44c;" u2="&#x4b1;" k="61" />
-<hkern u1="&#x44c;" u2="&#x4af;" k="61" />
-<hkern u1="&#x44c;" u2="&#x4ad;" k="102" />
-<hkern u1="&#x44c;" u2="&#x4a1;" k="102" />
-<hkern u1="&#x44c;" u2="&#x497;" k="41" />
-<hkern u1="&#x44c;" u2="&#x47f;" k="41" />
-<hkern u1="&#x44c;" u2="&#x477;" k="41" />
-<hkern u1="&#x44c;" u2="&#x475;" k="41" />
-<hkern u1="&#x44c;" u2="&#x461;" k="41" />
-<hkern u1="&#x44c;" u2="&#x45e;" k="61" />
-<hkern u1="&#x44c;" u2="&#x44a;" k="102" />
-<hkern u1="&#x44c;" u2="&#x447;" k="82" />
-<hkern u1="&#x44c;" u2="&#x445;" k="41" />
-<hkern u1="&#x44c;" u2="&#x443;" k="61" />
-<hkern u1="&#x44c;" u2="&#x442;" k="102" />
-<hkern u1="&#x44c;" u2="&#x436;" k="41" />
-<hkern u1="&#x44c;" u2="&#x27;" k="123" />
-<hkern u1="&#x44c;" u2="&#x22;" k="123" />
-<hkern u1="&#x44d;" u2="&#x201d;" k="20" />
-<hkern u1="&#x44d;" u2="&#x2019;" k="20" />
-<hkern u1="&#x44d;" u2="&#x50f;" k="20" />
-<hkern u1="&#x44d;" u2="&#x507;" k="20" />
-<hkern u1="&#x44d;" u2="&#x505;" k="20" />
-<hkern u1="&#x44d;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x44d;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x44d;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x44d;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x44d;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x44d;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x44d;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x44d;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x44d;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x44d;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x44d;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x44d;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x44d;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x44d;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x44d;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x44d;" u2="&#x497;" k="41" />
-<hkern u1="&#x44d;" u2="&#x45e;" k="20" />
-<hkern u1="&#x44d;" u2="&#x44a;" k="20" />
-<hkern u1="&#x44d;" u2="&#x447;" k="20" />
-<hkern u1="&#x44d;" u2="&#x445;" k="41" />
-<hkern u1="&#x44d;" u2="&#x443;" k="20" />
-<hkern u1="&#x44d;" u2="&#x442;" k="20" />
-<hkern u1="&#x44d;" u2="&#x436;" k="41" />
-<hkern u1="&#x44d;" u2="&#x27;" k="20" />
-<hkern u1="&#x44d;" u2="&#x22;" k="20" />
-<hkern u1="&#x44e;" u2="&#x201d;" k="20" />
-<hkern u1="&#x44e;" u2="&#x2019;" k="20" />
-<hkern u1="&#x44e;" u2="&#x50f;" k="20" />
-<hkern u1="&#x44e;" u2="&#x507;" k="20" />
-<hkern u1="&#x44e;" u2="&#x505;" k="20" />
-<hkern u1="&#x44e;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x44e;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x44e;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x44e;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x44e;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x44e;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x44e;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x44e;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x44e;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x44e;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x44e;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x44e;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x44e;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x44e;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x44e;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x44e;" u2="&#x497;" k="41" />
-<hkern u1="&#x44e;" u2="&#x45e;" k="20" />
-<hkern u1="&#x44e;" u2="&#x44a;" k="20" />
-<hkern u1="&#x44e;" u2="&#x447;" k="20" />
-<hkern u1="&#x44e;" u2="&#x445;" k="41" />
-<hkern u1="&#x44e;" u2="&#x443;" k="20" />
-<hkern u1="&#x44e;" u2="&#x442;" k="20" />
-<hkern u1="&#x44e;" u2="&#x436;" k="41" />
-<hkern u1="&#x44e;" u2="&#x27;" k="20" />
-<hkern u1="&#x44e;" u2="&#x22;" k="20" />
-<hkern u1="&#x450;" u2="&#x201d;" k="20" />
-<hkern u1="&#x450;" u2="&#x2019;" k="20" />
-<hkern u1="&#x450;" u2="&#x27;" k="20" />
-<hkern u1="&#x450;" u2="&#x22;" k="20" />
-<hkern u1="&#x451;" u2="&#x201d;" k="20" />
-<hkern u1="&#x451;" u2="&#x2019;" k="20" />
-<hkern u1="&#x451;" u2="&#x27;" k="20" />
-<hkern u1="&#x451;" u2="&#x22;" k="20" />
-<hkern u1="&#x452;" u2="&#x201d;" k="20" />
-<hkern u1="&#x452;" u2="&#x2019;" k="20" />
-<hkern u1="&#x452;" u2="&#x507;" k="41" />
-<hkern u1="&#x452;" u2="&#x505;" k="41" />
-<hkern u1="&#x452;" u2="&#x27;" k="20" />
-<hkern u1="&#x452;" u2="&#x22;" k="20" />
-<hkern u1="&#x453;" u2="&#x201e;" k="102" />
-<hkern u1="&#x453;" u2="&#x201a;" k="102" />
-<hkern u1="&#x453;" u2="&#x2015;" k="41" />
-<hkern u1="&#x453;" u2="&#x2014;" k="41" />
-<hkern u1="&#x453;" u2="&#x2013;" k="41" />
-<hkern u1="&#x453;" u2="&#x513;" k="61" />
-<hkern u1="&#x453;" u2="&#x511;" k="20" />
-<hkern u1="&#x453;" u2="&#x50d;" k="20" />
-<hkern u1="&#x453;" u2="&#x509;" k="61" />
-<hkern u1="&#x453;" u2="&#x503;" k="20" />
-<hkern u1="&#x453;" u2="&#x501;" k="20" />
-<hkern u1="&#x453;" u2="&#x4eb;" k="20" />
-<hkern u1="&#x453;" u2="&#x4e9;" k="20" />
-<hkern u1="&#x453;" u2="&#x4e7;" k="20" />
-<hkern u1="&#x453;" u2="&#x4d7;" k="20" />
-<hkern u1="&#x453;" u2="&#x4c6;" k="61" />
-<hkern u1="&#x453;" u2="&#x4ab;" k="20" />
-<hkern u1="&#x453;" u2="&#x4a9;" k="20" />
-<hkern u1="&#x453;" u2="&#x481;" k="20" />
-<hkern u1="&#x453;" u2="&#x47d;" k="20" />
-<hkern u1="&#x453;" u2="&#x47b;" k="20" />
-<hkern u1="&#x453;" u2="&#x479;" k="20" />
-<hkern u1="&#x453;" u2="&#x473;" k="20" />
-<hkern u1="&#x453;" u2="&#x467;" k="61" />
-<hkern u1="&#x453;" u2="&#x459;" k="61" />
-<hkern u1="&#x453;" u2="&#x454;" k="20" />
-<hkern u1="&#x453;" u2="&#x451;" k="20" />
-<hkern u1="&#x453;" u2="&#x450;" k="20" />
-<hkern u1="&#x453;" u2="&#x444;" k="20" />
-<hkern u1="&#x453;" u2="&#x441;" k="20" />
-<hkern u1="&#x453;" u2="&#x43e;" k="20" />
-<hkern u1="&#x453;" u2="&#x43b;" k="61" />
-<hkern u1="&#x453;" u2="&#x435;" k="20" />
-<hkern u1="&#x453;" u2="&#x434;" k="61" />
-<hkern u1="&#x453;" u2="&#x2e;" k="102" />
-<hkern u1="&#x453;" u2="&#x2d;" k="41" />
-<hkern u1="&#x453;" u2="&#x2c;" k="102" />
-<hkern u1="&#x459;" u2="&#x201d;" k="123" />
-<hkern u1="&#x459;" u2="&#x2019;" k="123" />
-<hkern u1="&#x459;" u2="&#x50f;" k="102" />
-<hkern u1="&#x459;" u2="&#x507;" k="102" />
-<hkern u1="&#x459;" u2="&#x505;" k="102" />
-<hkern u1="&#x459;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x459;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x459;" u2="&#x4f5;" k="82" />
-<hkern u1="&#x459;" u2="&#x4f3;" k="61" />
-<hkern u1="&#x459;" u2="&#x4f1;" k="61" />
-<hkern u1="&#x459;" u2="&#x4ef;" k="61" />
-<hkern u1="&#x459;" u2="&#x4e1;" k="41" />
-<hkern u1="&#x459;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x459;" u2="&#x4cc;" k="82" />
-<hkern u1="&#x459;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x459;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x459;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x459;" u2="&#x4b9;" k="82" />
-<hkern u1="&#x459;" u2="&#x4b7;" k="82" />
-<hkern u1="&#x459;" u2="&#x4b5;" k="102" />
-<hkern u1="&#x459;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x459;" u2="&#x4b1;" k="61" />
-<hkern u1="&#x459;" u2="&#x4af;" k="61" />
-<hkern u1="&#x459;" u2="&#x4ad;" k="102" />
-<hkern u1="&#x459;" u2="&#x4a1;" k="102" />
-<hkern u1="&#x459;" u2="&#x497;" k="41" />
-<hkern u1="&#x459;" u2="&#x47f;" k="41" />
-<hkern u1="&#x459;" u2="&#x477;" k="41" />
-<hkern u1="&#x459;" u2="&#x475;" k="41" />
-<hkern u1="&#x459;" u2="&#x461;" k="41" />
-<hkern u1="&#x459;" u2="&#x45e;" k="61" />
-<hkern u1="&#x459;" u2="&#x44a;" k="102" />
-<hkern u1="&#x459;" u2="&#x447;" k="82" />
-<hkern u1="&#x459;" u2="&#x445;" k="41" />
-<hkern u1="&#x459;" u2="&#x443;" k="61" />
-<hkern u1="&#x459;" u2="&#x442;" k="102" />
-<hkern u1="&#x459;" u2="&#x436;" k="41" />
-<hkern u1="&#x459;" u2="&#x27;" k="123" />
-<hkern u1="&#x459;" u2="&#x22;" k="123" />
-<hkern u1="&#x45a;" u2="&#x201d;" k="123" />
-<hkern u1="&#x45a;" u2="&#x2019;" k="123" />
-<hkern u1="&#x45a;" u2="&#x50f;" k="102" />
-<hkern u1="&#x45a;" u2="&#x507;" k="102" />
-<hkern u1="&#x45a;" u2="&#x505;" k="102" />
-<hkern u1="&#x45a;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x45a;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x45a;" u2="&#x4f5;" k="82" />
-<hkern u1="&#x45a;" u2="&#x4f3;" k="61" />
-<hkern u1="&#x45a;" u2="&#x4f1;" k="61" />
-<hkern u1="&#x45a;" u2="&#x4ef;" k="61" />
-<hkern u1="&#x45a;" u2="&#x4e1;" k="41" />
-<hkern u1="&#x45a;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x45a;" u2="&#x4cc;" k="82" />
-<hkern u1="&#x45a;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x45a;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x45a;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x45a;" u2="&#x4b9;" k="82" />
-<hkern u1="&#x45a;" u2="&#x4b7;" k="82" />
-<hkern u1="&#x45a;" u2="&#x4b5;" k="102" />
-<hkern u1="&#x45a;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x45a;" u2="&#x4b1;" k="61" />
-<hkern u1="&#x45a;" u2="&#x4af;" k="61" />
-<hkern u1="&#x45a;" u2="&#x4ad;" k="102" />
-<hkern u1="&#x45a;" u2="&#x4a1;" k="102" />
-<hkern u1="&#x45a;" u2="&#x497;" k="41" />
-<hkern u1="&#x45a;" u2="&#x47f;" k="41" />
-<hkern u1="&#x45a;" u2="&#x477;" k="41" />
-<hkern u1="&#x45a;" u2="&#x475;" k="41" />
-<hkern u1="&#x45a;" u2="&#x461;" k="41" />
-<hkern u1="&#x45a;" u2="&#x45e;" k="61" />
-<hkern u1="&#x45a;" u2="&#x44a;" k="102" />
-<hkern u1="&#x45a;" u2="&#x447;" k="82" />
-<hkern u1="&#x45a;" u2="&#x445;" k="41" />
-<hkern u1="&#x45a;" u2="&#x443;" k="61" />
-<hkern u1="&#x45a;" u2="&#x442;" k="102" />
-<hkern u1="&#x45a;" u2="&#x436;" k="41" />
-<hkern u1="&#x45a;" u2="&#x27;" k="123" />
-<hkern u1="&#x45a;" u2="&#x22;" k="123" />
-<hkern u1="&#x45b;" u2="&#x201d;" k="20" />
-<hkern u1="&#x45b;" u2="&#x2019;" k="20" />
-<hkern u1="&#x45b;" u2="&#x507;" k="41" />
-<hkern u1="&#x45b;" u2="&#x505;" k="41" />
-<hkern u1="&#x45b;" u2="&#x27;" k="20" />
-<hkern u1="&#x45b;" u2="&#x22;" k="20" />
-<hkern u1="&#x45c;" u2="&#x511;" k="41" />
-<hkern u1="&#x45c;" u2="&#x50d;" k="41" />
-<hkern u1="&#x45c;" u2="&#x503;" k="41" />
-<hkern u1="&#x45c;" u2="&#x501;" k="41" />
-<hkern u1="&#x45c;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x45c;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x45c;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x45c;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x45c;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x45c;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x45c;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x45c;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x45c;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x45c;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x45c;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x45c;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x45c;" u2="&#x481;" k="41" />
-<hkern u1="&#x45c;" u2="&#x47d;" k="41" />
-<hkern u1="&#x45c;" u2="&#x47b;" k="41" />
-<hkern u1="&#x45c;" u2="&#x479;" k="41" />
-<hkern u1="&#x45c;" u2="&#x473;" k="41" />
-<hkern u1="&#x45c;" u2="&#x454;" k="41" />
-<hkern u1="&#x45c;" u2="&#x451;" k="41" />
-<hkern u1="&#x45c;" u2="&#x450;" k="41" />
-<hkern u1="&#x45c;" u2="&#x447;" k="41" />
-<hkern u1="&#x45c;" u2="&#x444;" k="41" />
-<hkern u1="&#x45c;" u2="&#x441;" k="41" />
-<hkern u1="&#x45c;" u2="&#x43e;" k="41" />
-<hkern u1="&#x45c;" u2="&#x435;" k="41" />
-<hkern u1="&#x45e;" u2="&#x201e;" k="82" />
-<hkern u1="&#x45e;" u2="&#x201a;" k="82" />
-<hkern u1="&#x45e;" u2="&#x513;" k="41" />
-<hkern u1="&#x45e;" u2="&#x509;" k="41" />
-<hkern u1="&#x45e;" u2="&#x4c6;" k="41" />
-<hkern u1="&#x45e;" u2="&#x467;" k="41" />
-<hkern u1="&#x45e;" u2="&#x459;" k="41" />
-<hkern u1="&#x45e;" u2="&#x43b;" k="41" />
-<hkern u1="&#x45e;" u2="&#x434;" k="41" />
-<hkern u1="&#x45e;" u2="&#x2e;" k="82" />
-<hkern u1="&#x45e;" u2="&#x2c;" k="82" />
-<hkern u1="&#x460;" u2="&#x201e;" k="82" />
-<hkern u1="&#x460;" u2="&#x201a;" k="82" />
-<hkern u1="&#x460;" u2="&#x513;" k="20" />
-<hkern u1="&#x460;" u2="&#x512;" k="41" />
-<hkern u1="&#x460;" u2="&#x50e;" k="20" />
-<hkern u1="&#x460;" u2="&#x509;" k="20" />
-<hkern u1="&#x460;" u2="&#x508;" k="41" />
-<hkern u1="&#x460;" u2="&#x506;" k="41" />
-<hkern u1="&#x460;" u2="&#x504;" k="41" />
-<hkern u1="&#x460;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x460;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x460;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x460;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x460;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x460;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x460;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x460;" u2="&#x4de;" k="20" />
-<hkern u1="&#x460;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x460;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x460;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x460;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x460;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x460;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x460;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x460;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x460;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x460;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x460;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x460;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x460;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x460;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x460;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x460;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x460;" u2="&#x498;" k="20" />
-<hkern u1="&#x460;" u2="&#x496;" k="41" />
-<hkern u1="&#x460;" u2="&#x476;" k="20" />
-<hkern u1="&#x460;" u2="&#x474;" k="20" />
-<hkern u1="&#x460;" u2="&#x470;" k="41" />
-<hkern u1="&#x460;" u2="&#x46e;" k="20" />
-<hkern u1="&#x460;" u2="&#x467;" k="20" />
-<hkern u1="&#x460;" u2="&#x466;" k="41" />
-<hkern u1="&#x460;" u2="&#x459;" k="20" />
-<hkern u1="&#x460;" u2="&#x43b;" k="20" />
-<hkern u1="&#x460;" u2="&#x434;" k="20" />
-<hkern u1="&#x460;" u2="&#x42d;" k="20" />
-<hkern u1="&#x460;" u2="&#x42a;" k="20" />
-<hkern u1="&#x460;" u2="&#x427;" k="41" />
-<hkern u1="&#x460;" u2="&#x425;" k="41" />
-<hkern u1="&#x460;" u2="&#x423;" k="41" />
-<hkern u1="&#x460;" u2="&#x422;" k="61" />
-<hkern u1="&#x460;" u2="&#x41b;" k="41" />
-<hkern u1="&#x460;" u2="&#x417;" k="20" />
-<hkern u1="&#x460;" u2="&#x416;" k="41" />
-<hkern u1="&#x460;" u2="&#x414;" k="41" />
-<hkern u1="&#x460;" u2="&#x410;" k="41" />
-<hkern u1="&#x460;" u2="&#x40e;" k="41" />
-<hkern u1="&#x460;" u2="&#x40b;" k="20" />
-<hkern u1="&#x460;" u2="&#x409;" k="41" />
-<hkern u1="&#x460;" u2="&#x402;" k="20" />
-<hkern u1="&#x460;" u2="&#x2e;" k="82" />
-<hkern u1="&#x460;" u2="&#x2c;" k="82" />
-<hkern u1="&#x461;" u2="&#x201e;" k="82" />
-<hkern u1="&#x461;" u2="&#x201a;" k="82" />
-<hkern u1="&#x461;" u2="&#x513;" k="41" />
-<hkern u1="&#x461;" u2="&#x509;" k="41" />
-<hkern u1="&#x461;" u2="&#x4c6;" k="41" />
-<hkern u1="&#x461;" u2="&#x467;" k="41" />
-<hkern u1="&#x461;" u2="&#x459;" k="41" />
-<hkern u1="&#x461;" u2="&#x43b;" k="41" />
-<hkern u1="&#x461;" u2="&#x434;" k="41" />
-<hkern u1="&#x461;" u2="&#x2e;" k="82" />
-<hkern u1="&#x461;" u2="&#x2c;" k="82" />
-<hkern u1="&#x462;" u2="&#x201d;" k="82" />
-<hkern u1="&#x462;" u2="&#x2019;" k="82" />
-<hkern u1="&#x462;" u2="&#x50f;" k="41" />
-<hkern u1="&#x462;" u2="&#x50e;" k="41" />
-<hkern u1="&#x462;" u2="&#x506;" k="102" />
-<hkern u1="&#x462;" u2="&#x504;" k="102" />
-<hkern u1="&#x462;" u2="&#x4f4;" k="82" />
-<hkern u1="&#x462;" u2="&#x4cb;" k="82" />
-<hkern u1="&#x462;" u2="&#x4b8;" k="82" />
-<hkern u1="&#x462;" u2="&#x4b6;" k="82" />
-<hkern u1="&#x462;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x462;" u2="&#x4b4;" k="41" />
-<hkern u1="&#x462;" u2="&#x4b0;" k="61" />
-<hkern u1="&#x462;" u2="&#x4ae;" k="61" />
-<hkern u1="&#x462;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x462;" u2="&#x4ac;" k="82" />
-<hkern u1="&#x462;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x462;" u2="&#x4a0;" k="41" />
-<hkern u1="&#x462;" u2="&#x476;" k="61" />
-<hkern u1="&#x462;" u2="&#x474;" k="61" />
-<hkern u1="&#x462;" u2="&#x470;" k="82" />
-<hkern u1="&#x462;" u2="&#x44a;" k="41" />
-<hkern u1="&#x462;" u2="&#x442;" k="41" />
-<hkern u1="&#x462;" u2="&#x42a;" k="41" />
-<hkern u1="&#x462;" u2="&#x427;" k="82" />
-<hkern u1="&#x462;" u2="&#x422;" k="82" />
-<hkern u1="&#x462;" u2="&#x40b;" k="41" />
-<hkern u1="&#x462;" u2="&#x402;" k="41" />
-<hkern u1="&#x462;" u2="&#x27;" k="82" />
-<hkern u1="&#x462;" u2="&#x22;" k="82" />
-<hkern u1="&#x463;" u2="&#x201d;" k="123" />
-<hkern u1="&#x463;" u2="&#x2019;" k="123" />
-<hkern u1="&#x463;" u2="&#x50f;" k="102" />
-<hkern u1="&#x463;" u2="&#x507;" k="102" />
-<hkern u1="&#x463;" u2="&#x505;" k="102" />
-<hkern u1="&#x463;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x463;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x463;" u2="&#x4f5;" k="82" />
-<hkern u1="&#x463;" u2="&#x4f3;" k="61" />
-<hkern u1="&#x463;" u2="&#x4f1;" k="61" />
-<hkern u1="&#x463;" u2="&#x4ef;" k="61" />
-<hkern u1="&#x463;" u2="&#x4e1;" k="41" />
-<hkern u1="&#x463;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x463;" u2="&#x4cc;" k="82" />
-<hkern u1="&#x463;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x463;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x463;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x463;" u2="&#x4b9;" k="82" />
-<hkern u1="&#x463;" u2="&#x4b7;" k="82" />
-<hkern u1="&#x463;" u2="&#x4b5;" k="102" />
-<hkern u1="&#x463;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x463;" u2="&#x4b1;" k="61" />
-<hkern u1="&#x463;" u2="&#x4af;" k="61" />
-<hkern u1="&#x463;" u2="&#x4ad;" k="102" />
-<hkern u1="&#x463;" u2="&#x4a1;" k="102" />
-<hkern u1="&#x463;" u2="&#x497;" k="41" />
-<hkern u1="&#x463;" u2="&#x47f;" k="41" />
-<hkern u1="&#x463;" u2="&#x477;" k="41" />
-<hkern u1="&#x463;" u2="&#x475;" k="41" />
-<hkern u1="&#x463;" u2="&#x461;" k="41" />
-<hkern u1="&#x463;" u2="&#x45e;" k="61" />
-<hkern u1="&#x463;" u2="&#x44a;" k="102" />
-<hkern u1="&#x463;" u2="&#x447;" k="82" />
-<hkern u1="&#x463;" u2="&#x445;" k="41" />
-<hkern u1="&#x463;" u2="&#x443;" k="61" />
-<hkern u1="&#x463;" u2="&#x442;" k="102" />
-<hkern u1="&#x463;" u2="&#x436;" k="41" />
-<hkern u1="&#x463;" u2="&#x27;" k="123" />
-<hkern u1="&#x463;" u2="&#x22;" k="123" />
-<hkern u1="&#x464;" u2="&#x50c;" k="41" />
-<hkern u1="&#x464;" u2="&#x507;" k="41" />
-<hkern u1="&#x464;" u2="&#x505;" k="41" />
-<hkern u1="&#x464;" u2="&#x502;" k="41" />
-<hkern u1="&#x464;" u2="&#x500;" k="41" />
-<hkern u1="&#x464;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x464;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x464;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x464;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x464;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x464;" u2="&#x4be;" k="41" />
-<hkern u1="&#x464;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x464;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x464;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x464;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x464;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x464;" u2="&#x480;" k="41" />
-<hkern u1="&#x464;" u2="&#x47e;" k="41" />
-<hkern u1="&#x464;" u2="&#x47c;" k="41" />
-<hkern u1="&#x464;" u2="&#x47a;" k="41" />
-<hkern u1="&#x464;" u2="&#x478;" k="41" />
-<hkern u1="&#x464;" u2="&#x472;" k="41" />
-<hkern u1="&#x464;" u2="&#x460;" k="41" />
-<hkern u1="&#x464;" u2="&#x447;" k="41" />
-<hkern u1="&#x464;" u2="&#x424;" k="41" />
-<hkern u1="&#x464;" u2="&#x421;" k="41" />
-<hkern u1="&#x464;" u2="&#x41e;" k="41" />
-<hkern u1="&#x464;" u2="&#x404;" k="41" />
-<hkern u1="&#x466;" u2="&#x201d;" k="143" />
-<hkern u1="&#x466;" u2="&#x2019;" k="143" />
-<hkern u1="&#x466;" u2="&#x50f;" k="41" />
-<hkern u1="&#x466;" u2="&#x50e;" k="102" />
-<hkern u1="&#x466;" u2="&#x507;" k="41" />
-<hkern u1="&#x466;" u2="&#x506;" k="143" />
-<hkern u1="&#x466;" u2="&#x505;" k="41" />
-<hkern u1="&#x466;" u2="&#x504;" k="143" />
-<hkern u1="&#x466;" u2="&#x4fa;" k="41" />
-<hkern u1="&#x466;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x466;" u2="&#x4f4;" k="102" />
-<hkern u1="&#x466;" u2="&#x4da;" k="41" />
-<hkern u1="&#x466;" u2="&#x4d8;" k="41" />
-<hkern u1="&#x466;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x466;" u2="&#x4cb;" k="102" />
-<hkern u1="&#x466;" u2="&#x4be;" k="102" />
-<hkern u1="&#x466;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x466;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x466;" u2="&#x4b8;" k="102" />
-<hkern u1="&#x466;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x466;" u2="&#x4b6;" k="102" />
-<hkern u1="&#x466;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x466;" u2="&#x4b4;" k="102" />
-<hkern u1="&#x466;" u2="&#x4b0;" k="123" />
-<hkern u1="&#x466;" u2="&#x4ae;" k="123" />
-<hkern u1="&#x466;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x466;" u2="&#x4ac;" k="143" />
-<hkern u1="&#x466;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x466;" u2="&#x4a0;" k="102" />
-<hkern u1="&#x466;" u2="&#x49e;" k="41" />
-<hkern u1="&#x466;" u2="&#x492;" k="41" />
-<hkern u1="&#x466;" u2="&#x48c;" k="41" />
-<hkern u1="&#x466;" u2="&#x476;" k="82" />
-<hkern u1="&#x466;" u2="&#x474;" k="82" />
-<hkern u1="&#x466;" u2="&#x470;" k="102" />
-<hkern u1="&#x466;" u2="&#x462;" k="41" />
-<hkern u1="&#x466;" u2="&#x44a;" k="41" />
-<hkern u1="&#x466;" u2="&#x447;" k="41" />
-<hkern u1="&#x466;" u2="&#x442;" k="41" />
-<hkern u1="&#x466;" u2="&#x42a;" k="102" />
-<hkern u1="&#x466;" u2="&#x427;" k="102" />
-<hkern u1="&#x466;" u2="&#x424;" k="41" />
-<hkern u1="&#x466;" u2="&#x422;" k="143" />
-<hkern u1="&#x466;" u2="&#x40b;" k="102" />
-<hkern u1="&#x466;" u2="&#x402;" k="102" />
-<hkern u1="&#x466;" u2="&#x27;" k="143" />
-<hkern u1="&#x466;" u2="&#x22;" k="143" />
-<hkern u1="&#x467;" u2="&#x201d;" k="143" />
-<hkern u1="&#x467;" u2="&#x2019;" k="143" />
-<hkern u1="&#x467;" u2="&#x511;" k="41" />
-<hkern u1="&#x467;" u2="&#x50f;" k="102" />
-<hkern u1="&#x467;" u2="&#x50d;" k="41" />
-<hkern u1="&#x467;" u2="&#x507;" k="123" />
-<hkern u1="&#x467;" u2="&#x505;" k="123" />
-<hkern u1="&#x467;" u2="&#x503;" k="41" />
-<hkern u1="&#x467;" u2="&#x501;" k="41" />
-<hkern u1="&#x467;" u2="&#x4f5;" k="61" />
-<hkern u1="&#x467;" u2="&#x4f3;" k="61" />
-<hkern u1="&#x467;" u2="&#x4f1;" k="61" />
-<hkern u1="&#x467;" u2="&#x4ef;" k="61" />
-<hkern u1="&#x467;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x467;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x467;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x467;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x467;" u2="&#x4cc;" k="61" />
-<hkern u1="&#x467;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x467;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x467;" u2="&#x4b9;" k="61" />
-<hkern u1="&#x467;" u2="&#x4b7;" k="61" />
-<hkern u1="&#x467;" u2="&#x4b5;" k="102" />
-<hkern u1="&#x467;" u2="&#x4b1;" k="41" />
-<hkern u1="&#x467;" u2="&#x4af;" k="41" />
-<hkern u1="&#x467;" u2="&#x4ad;" k="102" />
-<hkern u1="&#x467;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x467;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x467;" u2="&#x4a1;" k="102" />
-<hkern u1="&#x467;" u2="&#x481;" k="41" />
-<hkern u1="&#x467;" u2="&#x47f;" k="41" />
-<hkern u1="&#x467;" u2="&#x47d;" k="41" />
-<hkern u1="&#x467;" u2="&#x47b;" k="41" />
-<hkern u1="&#x467;" u2="&#x479;" k="41" />
-<hkern u1="&#x467;" u2="&#x477;" k="41" />
-<hkern u1="&#x467;" u2="&#x475;" k="41" />
-<hkern u1="&#x467;" u2="&#x473;" k="41" />
-<hkern u1="&#x467;" u2="&#x471;" k="20" />
-<hkern u1="&#x467;" u2="&#x461;" k="41" />
-<hkern u1="&#x467;" u2="&#x45e;" k="61" />
-<hkern u1="&#x467;" u2="&#x454;" k="41" />
-<hkern u1="&#x467;" u2="&#x451;" k="41" />
-<hkern u1="&#x467;" u2="&#x450;" k="41" />
-<hkern u1="&#x467;" u2="&#x44a;" k="102" />
-<hkern u1="&#x467;" u2="&#x447;" k="61" />
-<hkern u1="&#x467;" u2="&#x444;" k="41" />
-<hkern u1="&#x467;" u2="&#x443;" k="61" />
-<hkern u1="&#x467;" u2="&#x442;" k="102" />
-<hkern u1="&#x467;" u2="&#x441;" k="41" />
-<hkern u1="&#x467;" u2="&#x43e;" k="41" />
-<hkern u1="&#x467;" u2="&#x435;" k="41" />
-<hkern u1="&#x467;" u2="&#x27;" k="143" />
-<hkern u1="&#x467;" u2="&#x22;" k="143" />
-<hkern u1="&#x468;" u2="&#x201d;" k="143" />
-<hkern u1="&#x468;" u2="&#x2019;" k="143" />
-<hkern u1="&#x468;" u2="&#x50f;" k="41" />
-<hkern u1="&#x468;" u2="&#x50e;" k="102" />
-<hkern u1="&#x468;" u2="&#x507;" k="41" />
-<hkern u1="&#x468;" u2="&#x506;" k="143" />
-<hkern u1="&#x468;" u2="&#x505;" k="41" />
-<hkern u1="&#x468;" u2="&#x504;" k="143" />
-<hkern u1="&#x468;" u2="&#x4fa;" k="41" />
-<hkern u1="&#x468;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x468;" u2="&#x4f4;" k="102" />
-<hkern u1="&#x468;" u2="&#x4da;" k="41" />
-<hkern u1="&#x468;" u2="&#x4d8;" k="41" />
-<hkern u1="&#x468;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x468;" u2="&#x4cb;" k="102" />
-<hkern u1="&#x468;" u2="&#x4be;" k="102" />
-<hkern u1="&#x468;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x468;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x468;" u2="&#x4b8;" k="102" />
-<hkern u1="&#x468;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x468;" u2="&#x4b6;" k="102" />
-<hkern u1="&#x468;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x468;" u2="&#x4b4;" k="102" />
-<hkern u1="&#x468;" u2="&#x4b0;" k="123" />
-<hkern u1="&#x468;" u2="&#x4ae;" k="123" />
-<hkern u1="&#x468;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x468;" u2="&#x4ac;" k="143" />
-<hkern u1="&#x468;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x468;" u2="&#x4a0;" k="102" />
-<hkern u1="&#x468;" u2="&#x49e;" k="41" />
-<hkern u1="&#x468;" u2="&#x492;" k="41" />
-<hkern u1="&#x468;" u2="&#x48c;" k="41" />
-<hkern u1="&#x468;" u2="&#x476;" k="82" />
-<hkern u1="&#x468;" u2="&#x474;" k="82" />
-<hkern u1="&#x468;" u2="&#x470;" k="102" />
-<hkern u1="&#x468;" u2="&#x462;" k="41" />
-<hkern u1="&#x468;" u2="&#x44a;" k="41" />
-<hkern u1="&#x468;" u2="&#x447;" k="41" />
-<hkern u1="&#x468;" u2="&#x442;" k="41" />
-<hkern u1="&#x468;" u2="&#x42a;" k="102" />
-<hkern u1="&#x468;" u2="&#x427;" k="102" />
-<hkern u1="&#x468;" u2="&#x424;" k="41" />
-<hkern u1="&#x468;" u2="&#x422;" k="143" />
-<hkern u1="&#x468;" u2="&#x40b;" k="102" />
-<hkern u1="&#x468;" u2="&#x402;" k="102" />
-<hkern u1="&#x468;" u2="&#x27;" k="143" />
-<hkern u1="&#x468;" u2="&#x22;" k="143" />
-<hkern u1="&#x469;" u2="&#x201d;" k="143" />
-<hkern u1="&#x469;" u2="&#x2019;" k="143" />
-<hkern u1="&#x469;" u2="&#x511;" k="41" />
-<hkern u1="&#x469;" u2="&#x50f;" k="102" />
-<hkern u1="&#x469;" u2="&#x50d;" k="41" />
-<hkern u1="&#x469;" u2="&#x507;" k="123" />
-<hkern u1="&#x469;" u2="&#x505;" k="123" />
-<hkern u1="&#x469;" u2="&#x503;" k="41" />
-<hkern u1="&#x469;" u2="&#x501;" k="41" />
-<hkern u1="&#x469;" u2="&#x4f5;" k="61" />
-<hkern u1="&#x469;" u2="&#x4f3;" k="61" />
-<hkern u1="&#x469;" u2="&#x4f1;" k="61" />
-<hkern u1="&#x469;" u2="&#x4ef;" k="61" />
-<hkern u1="&#x469;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x469;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x469;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x469;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x469;" u2="&#x4cc;" k="61" />
-<hkern u1="&#x469;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x469;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x469;" u2="&#x4b9;" k="61" />
-<hkern u1="&#x469;" u2="&#x4b7;" k="61" />
-<hkern u1="&#x469;" u2="&#x4b5;" k="102" />
-<hkern u1="&#x469;" u2="&#x4b1;" k="41" />
-<hkern u1="&#x469;" u2="&#x4af;" k="41" />
-<hkern u1="&#x469;" u2="&#x4ad;" k="102" />
-<hkern u1="&#x469;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x469;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x469;" u2="&#x4a1;" k="102" />
-<hkern u1="&#x469;" u2="&#x481;" k="41" />
-<hkern u1="&#x469;" u2="&#x47f;" k="41" />
-<hkern u1="&#x469;" u2="&#x47d;" k="41" />
-<hkern u1="&#x469;" u2="&#x47b;" k="41" />
-<hkern u1="&#x469;" u2="&#x479;" k="41" />
-<hkern u1="&#x469;" u2="&#x477;" k="41" />
-<hkern u1="&#x469;" u2="&#x475;" k="41" />
-<hkern u1="&#x469;" u2="&#x473;" k="41" />
-<hkern u1="&#x469;" u2="&#x471;" k="20" />
-<hkern u1="&#x469;" u2="&#x461;" k="41" />
-<hkern u1="&#x469;" u2="&#x45e;" k="61" />
-<hkern u1="&#x469;" u2="&#x454;" k="41" />
-<hkern u1="&#x469;" u2="&#x451;" k="41" />
-<hkern u1="&#x469;" u2="&#x450;" k="41" />
-<hkern u1="&#x469;" u2="&#x44a;" k="102" />
-<hkern u1="&#x469;" u2="&#x447;" k="61" />
-<hkern u1="&#x469;" u2="&#x444;" k="41" />
-<hkern u1="&#x469;" u2="&#x443;" k="61" />
-<hkern u1="&#x469;" u2="&#x442;" k="102" />
-<hkern u1="&#x469;" u2="&#x441;" k="41" />
-<hkern u1="&#x469;" u2="&#x43e;" k="41" />
-<hkern u1="&#x469;" u2="&#x435;" k="41" />
-<hkern u1="&#x469;" u2="&#x27;" k="143" />
-<hkern u1="&#x469;" u2="&#x22;" k="143" />
-<hkern u1="&#x46a;" u2="&#x506;" k="20" />
-<hkern u1="&#x46a;" u2="&#x504;" k="20" />
-<hkern u1="&#x46c;" u2="&#x506;" k="20" />
-<hkern u1="&#x46c;" u2="&#x504;" k="20" />
-<hkern u1="&#x46e;" u2="&#x201e;" k="82" />
-<hkern u1="&#x46e;" u2="&#x201a;" k="82" />
-<hkern u1="&#x46e;" u2="&#x506;" k="41" />
-<hkern u1="&#x46e;" u2="&#x504;" k="41" />
-<hkern u1="&#x46e;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x46e;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x46e;" u2="&#x476;" k="20" />
-<hkern u1="&#x46e;" u2="&#x474;" k="20" />
-<hkern u1="&#x46e;" u2="&#x2e;" k="82" />
-<hkern u1="&#x46e;" u2="&#x2c;" k="82" />
-<hkern u1="&#x470;" u2="&#x201e;" k="143" />
-<hkern u1="&#x470;" u2="&#x201a;" k="143" />
-<hkern u1="&#x470;" u2="&#x513;" k="41" />
-<hkern u1="&#x470;" u2="&#x512;" k="61" />
-<hkern u1="&#x470;" u2="&#x509;" k="41" />
-<hkern u1="&#x470;" u2="&#x508;" k="61" />
-<hkern u1="&#x470;" u2="&#x502;" k="82" />
-<hkern u1="&#x470;" u2="&#x500;" k="82" />
-<hkern u1="&#x470;" u2="&#x4d4;" k="82" />
-<hkern u1="&#x470;" u2="&#x4d2;" k="82" />
-<hkern u1="&#x470;" u2="&#x4d0;" k="82" />
-<hkern u1="&#x470;" u2="&#x4c6;" k="41" />
-<hkern u1="&#x470;" u2="&#x4c5;" k="61" />
-<hkern u1="&#x470;" u2="&#x467;" k="41" />
-<hkern u1="&#x470;" u2="&#x466;" k="82" />
-<hkern u1="&#x470;" u2="&#x459;" k="41" />
-<hkern u1="&#x470;" u2="&#x43b;" k="41" />
-<hkern u1="&#x470;" u2="&#x434;" k="41" />
-<hkern u1="&#x470;" u2="&#x41b;" k="61" />
-<hkern u1="&#x470;" u2="&#x414;" k="61" />
-<hkern u1="&#x470;" u2="&#x410;" k="82" />
-<hkern u1="&#x470;" u2="&#x409;" k="61" />
-<hkern u1="&#x470;" u2="&#x2e;" k="143" />
-<hkern u1="&#x470;" u2="&#x2c;" k="143" />
-<hkern u1="&#x471;" u2="&#x201d;" k="20" />
-<hkern u1="&#x471;" u2="&#x2019;" k="20" />
-<hkern u1="&#x471;" u2="&#x50f;" k="20" />
-<hkern u1="&#x471;" u2="&#x507;" k="20" />
-<hkern u1="&#x471;" u2="&#x505;" k="20" />
-<hkern u1="&#x471;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x471;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x471;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x471;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x471;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x471;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x471;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x471;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x471;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x471;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x471;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x471;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x471;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x471;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x471;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x471;" u2="&#x497;" k="41" />
-<hkern u1="&#x471;" u2="&#x45e;" k="20" />
-<hkern u1="&#x471;" u2="&#x44a;" k="20" />
-<hkern u1="&#x471;" u2="&#x447;" k="20" />
-<hkern u1="&#x471;" u2="&#x445;" k="41" />
-<hkern u1="&#x471;" u2="&#x443;" k="20" />
-<hkern u1="&#x471;" u2="&#x442;" k="20" />
-<hkern u1="&#x471;" u2="&#x436;" k="41" />
-<hkern u1="&#x471;" u2="&#x27;" k="20" />
-<hkern u1="&#x471;" u2="&#x22;" k="20" />
-<hkern u1="&#x472;" u2="&#x201e;" k="82" />
-<hkern u1="&#x472;" u2="&#x201a;" k="82" />
-<hkern u1="&#x472;" u2="&#x513;" k="20" />
-<hkern u1="&#x472;" u2="&#x512;" k="41" />
-<hkern u1="&#x472;" u2="&#x50e;" k="20" />
-<hkern u1="&#x472;" u2="&#x509;" k="20" />
-<hkern u1="&#x472;" u2="&#x508;" k="41" />
-<hkern u1="&#x472;" u2="&#x506;" k="41" />
-<hkern u1="&#x472;" u2="&#x504;" k="41" />
-<hkern u1="&#x472;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x472;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x472;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x472;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x472;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x472;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x472;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x472;" u2="&#x4de;" k="20" />
-<hkern u1="&#x472;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x472;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x472;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x472;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x472;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x472;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x472;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x472;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x472;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x472;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x472;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x472;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x472;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x472;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x472;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x472;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x472;" u2="&#x498;" k="20" />
-<hkern u1="&#x472;" u2="&#x496;" k="41" />
-<hkern u1="&#x472;" u2="&#x476;" k="20" />
-<hkern u1="&#x472;" u2="&#x474;" k="20" />
-<hkern u1="&#x472;" u2="&#x470;" k="41" />
-<hkern u1="&#x472;" u2="&#x46e;" k="20" />
-<hkern u1="&#x472;" u2="&#x467;" k="20" />
-<hkern u1="&#x472;" u2="&#x466;" k="41" />
-<hkern u1="&#x472;" u2="&#x459;" k="20" />
-<hkern u1="&#x472;" u2="&#x43b;" k="20" />
-<hkern u1="&#x472;" u2="&#x434;" k="20" />
-<hkern u1="&#x472;" u2="&#x42d;" k="20" />
-<hkern u1="&#x472;" u2="&#x42a;" k="20" />
-<hkern u1="&#x472;" u2="&#x427;" k="41" />
-<hkern u1="&#x472;" u2="&#x425;" k="41" />
-<hkern u1="&#x472;" u2="&#x423;" k="41" />
-<hkern u1="&#x472;" u2="&#x422;" k="61" />
-<hkern u1="&#x472;" u2="&#x41b;" k="41" />
-<hkern u1="&#x472;" u2="&#x417;" k="20" />
-<hkern u1="&#x472;" u2="&#x416;" k="41" />
-<hkern u1="&#x472;" u2="&#x414;" k="41" />
-<hkern u1="&#x472;" u2="&#x410;" k="41" />
-<hkern u1="&#x472;" u2="&#x40e;" k="41" />
-<hkern u1="&#x472;" u2="&#x40b;" k="20" />
-<hkern u1="&#x472;" u2="&#x409;" k="41" />
-<hkern u1="&#x472;" u2="&#x402;" k="20" />
-<hkern u1="&#x472;" u2="&#x2e;" k="82" />
-<hkern u1="&#x472;" u2="&#x2c;" k="82" />
-<hkern u1="&#x473;" u2="&#x201d;" k="20" />
-<hkern u1="&#x473;" u2="&#x2019;" k="20" />
-<hkern u1="&#x473;" u2="&#x50f;" k="20" />
-<hkern u1="&#x473;" u2="&#x507;" k="20" />
-<hkern u1="&#x473;" u2="&#x505;" k="20" />
-<hkern u1="&#x473;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x473;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x473;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x473;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x473;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x473;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x473;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x473;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x473;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x473;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x473;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x473;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x473;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x473;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x473;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x473;" u2="&#x497;" k="41" />
-<hkern u1="&#x473;" u2="&#x45e;" k="20" />
-<hkern u1="&#x473;" u2="&#x44a;" k="20" />
-<hkern u1="&#x473;" u2="&#x447;" k="20" />
-<hkern u1="&#x473;" u2="&#x445;" k="41" />
-<hkern u1="&#x473;" u2="&#x443;" k="20" />
-<hkern u1="&#x473;" u2="&#x442;" k="20" />
-<hkern u1="&#x473;" u2="&#x436;" k="41" />
-<hkern u1="&#x473;" u2="&#x27;" k="20" />
-<hkern u1="&#x473;" u2="&#x22;" k="20" />
-<hkern u1="&#x474;" u2="&#x201e;" k="123" />
-<hkern u1="&#x474;" u2="&#x201a;" k="123" />
-<hkern u1="&#x474;" u2="&#x513;" k="82" />
-<hkern u1="&#x474;" u2="&#x512;" k="102" />
-<hkern u1="&#x474;" u2="&#x511;" k="41" />
-<hkern u1="&#x474;" u2="&#x50d;" k="41" />
-<hkern u1="&#x474;" u2="&#x50c;" k="20" />
-<hkern u1="&#x474;" u2="&#x509;" k="82" />
-<hkern u1="&#x474;" u2="&#x508;" k="102" />
-<hkern u1="&#x474;" u2="&#x503;" k="41" />
-<hkern u1="&#x474;" u2="&#x502;" k="143" />
-<hkern u1="&#x474;" u2="&#x501;" k="41" />
-<hkern u1="&#x474;" u2="&#x500;" k="143" />
-<hkern u1="&#x474;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x474;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x474;" u2="&#x4ea;" k="20" />
-<hkern u1="&#x474;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x474;" u2="&#x4e8;" k="20" />
-<hkern u1="&#x474;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x474;" u2="&#x4e6;" k="20" />
-<hkern u1="&#x474;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x474;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x474;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x474;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x474;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x474;" u2="&#x4c6;" k="82" />
-<hkern u1="&#x474;" u2="&#x4c5;" k="102" />
-<hkern u1="&#x474;" u2="&#x4bf;" k="61" />
-<hkern u1="&#x474;" u2="&#x4be;" k="41" />
-<hkern u1="&#x474;" u2="&#x4bd;" k="61" />
-<hkern u1="&#x474;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x474;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x474;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x474;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x474;" u2="&#x4aa;" k="20" />
-<hkern u1="&#x474;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x474;" u2="&#x4a8;" k="20" />
-<hkern u1="&#x474;" u2="&#x49f;" k="-102" />
-<hkern u1="&#x474;" u2="&#x48d;" k="-102" />
-<hkern u1="&#x474;" u2="&#x481;" k="41" />
-<hkern u1="&#x474;" u2="&#x480;" k="20" />
-<hkern u1="&#x474;" u2="&#x47e;" k="20" />
-<hkern u1="&#x474;" u2="&#x47d;" k="41" />
-<hkern u1="&#x474;" u2="&#x47c;" k="20" />
-<hkern u1="&#x474;" u2="&#x47b;" k="41" />
-<hkern u1="&#x474;" u2="&#x47a;" k="20" />
-<hkern u1="&#x474;" u2="&#x479;" k="41" />
-<hkern u1="&#x474;" u2="&#x478;" k="20" />
-<hkern u1="&#x474;" u2="&#x473;" k="41" />
-<hkern u1="&#x474;" u2="&#x472;" k="20" />
-<hkern u1="&#x474;" u2="&#x467;" k="82" />
-<hkern u1="&#x474;" u2="&#x466;" k="143" />
-<hkern u1="&#x474;" u2="&#x460;" k="20" />
-<hkern u1="&#x474;" u2="&#x45b;" k="-102" />
-<hkern u1="&#x474;" u2="&#x459;" k="82" />
-<hkern u1="&#x474;" u2="&#x455;" k="20" />
-<hkern u1="&#x474;" u2="&#x454;" k="41" />
-<hkern u1="&#x474;" u2="&#x452;" k="-102" />
-<hkern u1="&#x474;" u2="&#x451;" k="41" />
-<hkern u1="&#x474;" u2="&#x450;" k="41" />
-<hkern u1="&#x474;" u2="&#x447;" k="41" />
-<hkern u1="&#x474;" u2="&#x444;" k="41" />
-<hkern u1="&#x474;" u2="&#x441;" k="41" />
-<hkern u1="&#x474;" u2="&#x43e;" k="41" />
-<hkern u1="&#x474;" u2="&#x43b;" k="82" />
-<hkern u1="&#x474;" u2="&#x435;" k="41" />
-<hkern u1="&#x474;" u2="&#x434;" k="82" />
-<hkern u1="&#x474;" u2="&#x42f;" k="20" />
-<hkern u1="&#x474;" u2="&#x424;" k="61" />
-<hkern u1="&#x474;" u2="&#x421;" k="20" />
-<hkern u1="&#x474;" u2="&#x41e;" k="20" />
-<hkern u1="&#x474;" u2="&#x41b;" k="102" />
-<hkern u1="&#x474;" u2="&#x414;" k="102" />
-<hkern u1="&#x474;" u2="&#x410;" k="143" />
-<hkern u1="&#x474;" u2="&#x409;" k="102" />
-<hkern u1="&#x474;" u2="&#x404;" k="20" />
-<hkern u1="&#x474;" u2="&#x2e;" k="123" />
-<hkern u1="&#x474;" u2="&#x2c;" k="123" />
-<hkern u1="&#x475;" u2="&#x201e;" k="82" />
-<hkern u1="&#x475;" u2="&#x201a;" k="82" />
-<hkern u1="&#x475;" u2="&#x513;" k="41" />
-<hkern u1="&#x475;" u2="&#x509;" k="41" />
-<hkern u1="&#x475;" u2="&#x4c6;" k="41" />
-<hkern u1="&#x475;" u2="&#x467;" k="41" />
-<hkern u1="&#x475;" u2="&#x459;" k="41" />
-<hkern u1="&#x475;" u2="&#x43b;" k="41" />
-<hkern u1="&#x475;" u2="&#x434;" k="41" />
-<hkern u1="&#x475;" u2="&#x2e;" k="82" />
-<hkern u1="&#x475;" u2="&#x2c;" k="82" />
-<hkern u1="&#x476;" u2="&#x201e;" k="123" />
-<hkern u1="&#x476;" u2="&#x201a;" k="123" />
-<hkern u1="&#x476;" u2="&#x513;" k="82" />
-<hkern u1="&#x476;" u2="&#x512;" k="102" />
-<hkern u1="&#x476;" u2="&#x511;" k="41" />
-<hkern u1="&#x476;" u2="&#x50d;" k="41" />
-<hkern u1="&#x476;" u2="&#x50c;" k="20" />
-<hkern u1="&#x476;" u2="&#x509;" k="82" />
-<hkern u1="&#x476;" u2="&#x508;" k="102" />
-<hkern u1="&#x476;" u2="&#x503;" k="41" />
-<hkern u1="&#x476;" u2="&#x502;" k="143" />
-<hkern u1="&#x476;" u2="&#x501;" k="41" />
-<hkern u1="&#x476;" u2="&#x500;" k="143" />
-<hkern u1="&#x476;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x476;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x476;" u2="&#x4ea;" k="20" />
-<hkern u1="&#x476;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x476;" u2="&#x4e8;" k="20" />
-<hkern u1="&#x476;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x476;" u2="&#x4e6;" k="20" />
-<hkern u1="&#x476;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x476;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x476;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x476;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x476;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x476;" u2="&#x4c6;" k="82" />
-<hkern u1="&#x476;" u2="&#x4c5;" k="102" />
-<hkern u1="&#x476;" u2="&#x4bf;" k="61" />
-<hkern u1="&#x476;" u2="&#x4be;" k="41" />
-<hkern u1="&#x476;" u2="&#x4bd;" k="61" />
-<hkern u1="&#x476;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x476;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x476;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x476;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x476;" u2="&#x4aa;" k="20" />
-<hkern u1="&#x476;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x476;" u2="&#x4a8;" k="20" />
-<hkern u1="&#x476;" u2="&#x49f;" k="-102" />
-<hkern u1="&#x476;" u2="&#x48d;" k="-102" />
-<hkern u1="&#x476;" u2="&#x481;" k="41" />
-<hkern u1="&#x476;" u2="&#x480;" k="20" />
-<hkern u1="&#x476;" u2="&#x47e;" k="20" />
-<hkern u1="&#x476;" u2="&#x47d;" k="41" />
-<hkern u1="&#x476;" u2="&#x47c;" k="20" />
-<hkern u1="&#x476;" u2="&#x47b;" k="41" />
-<hkern u1="&#x476;" u2="&#x47a;" k="20" />
-<hkern u1="&#x476;" u2="&#x479;" k="41" />
-<hkern u1="&#x476;" u2="&#x478;" k="20" />
-<hkern u1="&#x476;" u2="&#x473;" k="41" />
-<hkern u1="&#x476;" u2="&#x472;" k="20" />
-<hkern u1="&#x476;" u2="&#x467;" k="82" />
-<hkern u1="&#x476;" u2="&#x466;" k="143" />
-<hkern u1="&#x476;" u2="&#x460;" k="20" />
-<hkern u1="&#x476;" u2="&#x45b;" k="-102" />
-<hkern u1="&#x476;" u2="&#x459;" k="82" />
-<hkern u1="&#x476;" u2="&#x455;" k="20" />
-<hkern u1="&#x476;" u2="&#x454;" k="41" />
-<hkern u1="&#x476;" u2="&#x452;" k="-102" />
-<hkern u1="&#x476;" u2="&#x451;" k="41" />
-<hkern u1="&#x476;" u2="&#x450;" k="41" />
-<hkern u1="&#x476;" u2="&#x447;" k="41" />
-<hkern u1="&#x476;" u2="&#x444;" k="41" />
-<hkern u1="&#x476;" u2="&#x441;" k="41" />
-<hkern u1="&#x476;" u2="&#x43e;" k="41" />
-<hkern u1="&#x476;" u2="&#x43b;" k="82" />
-<hkern u1="&#x476;" u2="&#x435;" k="41" />
-<hkern u1="&#x476;" u2="&#x434;" k="82" />
-<hkern u1="&#x476;" u2="&#x42f;" k="20" />
-<hkern u1="&#x476;" u2="&#x424;" k="61" />
-<hkern u1="&#x476;" u2="&#x421;" k="20" />
-<hkern u1="&#x476;" u2="&#x41e;" k="20" />
-<hkern u1="&#x476;" u2="&#x41b;" k="102" />
-<hkern u1="&#x476;" u2="&#x414;" k="102" />
-<hkern u1="&#x476;" u2="&#x410;" k="143" />
-<hkern u1="&#x476;" u2="&#x409;" k="102" />
-<hkern u1="&#x476;" u2="&#x404;" k="20" />
-<hkern u1="&#x476;" u2="&#x2e;" k="123" />
-<hkern u1="&#x476;" u2="&#x2c;" k="123" />
-<hkern u1="&#x477;" u2="&#x201e;" k="82" />
-<hkern u1="&#x477;" u2="&#x201a;" k="82" />
-<hkern u1="&#x477;" u2="&#x513;" k="41" />
-<hkern u1="&#x477;" u2="&#x509;" k="41" />
-<hkern u1="&#x477;" u2="&#x4c6;" k="41" />
-<hkern u1="&#x477;" u2="&#x467;" k="41" />
-<hkern u1="&#x477;" u2="&#x459;" k="41" />
-<hkern u1="&#x477;" u2="&#x43b;" k="41" />
-<hkern u1="&#x477;" u2="&#x434;" k="41" />
-<hkern u1="&#x477;" u2="&#x2e;" k="82" />
-<hkern u1="&#x477;" u2="&#x2c;" k="82" />
-<hkern u1="&#x478;" u2="&#x201e;" k="82" />
-<hkern u1="&#x478;" u2="&#x201a;" k="82" />
-<hkern u1="&#x478;" u2="&#x513;" k="41" />
-<hkern u1="&#x478;" u2="&#x509;" k="41" />
-<hkern u1="&#x478;" u2="&#x4c6;" k="41" />
-<hkern u1="&#x478;" u2="&#x467;" k="41" />
-<hkern u1="&#x478;" u2="&#x459;" k="41" />
-<hkern u1="&#x478;" u2="&#x43b;" k="41" />
-<hkern u1="&#x478;" u2="&#x434;" k="41" />
-<hkern u1="&#x478;" u2="&#x2e;" k="82" />
-<hkern u1="&#x478;" u2="&#x2c;" k="82" />
-<hkern u1="&#x479;" u2="&#x201e;" k="82" />
-<hkern u1="&#x479;" u2="&#x201a;" k="82" />
-<hkern u1="&#x479;" u2="&#x513;" k="41" />
-<hkern u1="&#x479;" u2="&#x509;" k="41" />
-<hkern u1="&#x479;" u2="&#x4c6;" k="41" />
-<hkern u1="&#x479;" u2="&#x467;" k="41" />
-<hkern u1="&#x479;" u2="&#x459;" k="41" />
-<hkern u1="&#x479;" u2="&#x43b;" k="41" />
-<hkern u1="&#x479;" u2="&#x434;" k="41" />
-<hkern u1="&#x479;" u2="&#x2e;" k="82" />
-<hkern u1="&#x479;" u2="&#x2c;" k="82" />
-<hkern u1="&#x47a;" u2="&#x201e;" k="82" />
-<hkern u1="&#x47a;" u2="&#x201a;" k="82" />
-<hkern u1="&#x47a;" u2="&#x513;" k="20" />
-<hkern u1="&#x47a;" u2="&#x512;" k="41" />
-<hkern u1="&#x47a;" u2="&#x50e;" k="20" />
-<hkern u1="&#x47a;" u2="&#x509;" k="20" />
-<hkern u1="&#x47a;" u2="&#x508;" k="41" />
-<hkern u1="&#x47a;" u2="&#x506;" k="41" />
-<hkern u1="&#x47a;" u2="&#x504;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x47a;" u2="&#x4de;" k="20" />
-<hkern u1="&#x47a;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x47a;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x47a;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x47a;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x47a;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x47a;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x47a;" u2="&#x498;" k="20" />
-<hkern u1="&#x47a;" u2="&#x496;" k="41" />
-<hkern u1="&#x47a;" u2="&#x476;" k="20" />
-<hkern u1="&#x47a;" u2="&#x474;" k="20" />
-<hkern u1="&#x47a;" u2="&#x470;" k="41" />
-<hkern u1="&#x47a;" u2="&#x46e;" k="20" />
-<hkern u1="&#x47a;" u2="&#x467;" k="20" />
-<hkern u1="&#x47a;" u2="&#x466;" k="41" />
-<hkern u1="&#x47a;" u2="&#x459;" k="20" />
-<hkern u1="&#x47a;" u2="&#x43b;" k="20" />
-<hkern u1="&#x47a;" u2="&#x434;" k="20" />
-<hkern u1="&#x47a;" u2="&#x42d;" k="20" />
-<hkern u1="&#x47a;" u2="&#x42a;" k="20" />
-<hkern u1="&#x47a;" u2="&#x427;" k="41" />
-<hkern u1="&#x47a;" u2="&#x425;" k="41" />
-<hkern u1="&#x47a;" u2="&#x423;" k="41" />
-<hkern u1="&#x47a;" u2="&#x422;" k="61" />
-<hkern u1="&#x47a;" u2="&#x41b;" k="41" />
-<hkern u1="&#x47a;" u2="&#x417;" k="20" />
-<hkern u1="&#x47a;" u2="&#x416;" k="41" />
-<hkern u1="&#x47a;" u2="&#x414;" k="41" />
-<hkern u1="&#x47a;" u2="&#x410;" k="41" />
-<hkern u1="&#x47a;" u2="&#x40e;" k="41" />
-<hkern u1="&#x47a;" u2="&#x40b;" k="20" />
-<hkern u1="&#x47a;" u2="&#x409;" k="41" />
-<hkern u1="&#x47a;" u2="&#x402;" k="20" />
-<hkern u1="&#x47a;" u2="&#x2e;" k="82" />
-<hkern u1="&#x47a;" u2="&#x2c;" k="82" />
-<hkern u1="&#x47b;" u2="&#x201d;" k="20" />
-<hkern u1="&#x47b;" u2="&#x2019;" k="20" />
-<hkern u1="&#x47b;" u2="&#x50f;" k="20" />
-<hkern u1="&#x47b;" u2="&#x507;" k="20" />
-<hkern u1="&#x47b;" u2="&#x505;" k="20" />
-<hkern u1="&#x47b;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x47b;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x47b;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x47b;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x47b;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x47b;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x47b;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x47b;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x47b;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x47b;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x47b;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x47b;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x47b;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x47b;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x47b;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x47b;" u2="&#x497;" k="41" />
-<hkern u1="&#x47b;" u2="&#x45e;" k="20" />
-<hkern u1="&#x47b;" u2="&#x44a;" k="20" />
-<hkern u1="&#x47b;" u2="&#x447;" k="20" />
-<hkern u1="&#x47b;" u2="&#x445;" k="41" />
-<hkern u1="&#x47b;" u2="&#x443;" k="20" />
-<hkern u1="&#x47b;" u2="&#x442;" k="20" />
-<hkern u1="&#x47b;" u2="&#x436;" k="41" />
-<hkern u1="&#x47b;" u2="&#x27;" k="20" />
-<hkern u1="&#x47b;" u2="&#x22;" k="20" />
-<hkern u1="&#x47c;" u2="&#x201e;" k="82" />
-<hkern u1="&#x47c;" u2="&#x201a;" k="82" />
-<hkern u1="&#x47c;" u2="&#x513;" k="20" />
-<hkern u1="&#x47c;" u2="&#x512;" k="41" />
-<hkern u1="&#x47c;" u2="&#x50e;" k="20" />
-<hkern u1="&#x47c;" u2="&#x509;" k="20" />
-<hkern u1="&#x47c;" u2="&#x508;" k="41" />
-<hkern u1="&#x47c;" u2="&#x506;" k="41" />
-<hkern u1="&#x47c;" u2="&#x504;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x47c;" u2="&#x4de;" k="20" />
-<hkern u1="&#x47c;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x47c;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x47c;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x47c;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x47c;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x47c;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x47c;" u2="&#x498;" k="20" />
-<hkern u1="&#x47c;" u2="&#x496;" k="41" />
-<hkern u1="&#x47c;" u2="&#x476;" k="20" />
-<hkern u1="&#x47c;" u2="&#x474;" k="20" />
-<hkern u1="&#x47c;" u2="&#x470;" k="41" />
-<hkern u1="&#x47c;" u2="&#x46e;" k="20" />
-<hkern u1="&#x47c;" u2="&#x467;" k="20" />
-<hkern u1="&#x47c;" u2="&#x466;" k="41" />
-<hkern u1="&#x47c;" u2="&#x459;" k="20" />
-<hkern u1="&#x47c;" u2="&#x43b;" k="20" />
-<hkern u1="&#x47c;" u2="&#x434;" k="20" />
-<hkern u1="&#x47c;" u2="&#x42d;" k="20" />
-<hkern u1="&#x47c;" u2="&#x42a;" k="20" />
-<hkern u1="&#x47c;" u2="&#x427;" k="41" />
-<hkern u1="&#x47c;" u2="&#x425;" k="41" />
-<hkern u1="&#x47c;" u2="&#x423;" k="41" />
-<hkern u1="&#x47c;" u2="&#x422;" k="61" />
-<hkern u1="&#x47c;" u2="&#x41b;" k="41" />
-<hkern u1="&#x47c;" u2="&#x417;" k="20" />
-<hkern u1="&#x47c;" u2="&#x416;" k="41" />
-<hkern u1="&#x47c;" u2="&#x414;" k="41" />
-<hkern u1="&#x47c;" u2="&#x410;" k="41" />
-<hkern u1="&#x47c;" u2="&#x40e;" k="41" />
-<hkern u1="&#x47c;" u2="&#x40b;" k="20" />
-<hkern u1="&#x47c;" u2="&#x409;" k="41" />
-<hkern u1="&#x47c;" u2="&#x402;" k="20" />
-<hkern u1="&#x47c;" u2="&#x2e;" k="82" />
-<hkern u1="&#x47c;" u2="&#x2c;" k="82" />
-<hkern u1="&#x47d;" u2="&#x201d;" k="20" />
-<hkern u1="&#x47d;" u2="&#x2019;" k="20" />
-<hkern u1="&#x47d;" u2="&#x50f;" k="20" />
-<hkern u1="&#x47d;" u2="&#x507;" k="20" />
-<hkern u1="&#x47d;" u2="&#x505;" k="20" />
-<hkern u1="&#x47d;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x47d;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x47d;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x47d;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x47d;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x47d;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x47d;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x47d;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x47d;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x47d;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x47d;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x47d;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x47d;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x47d;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x47d;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x47d;" u2="&#x497;" k="41" />
-<hkern u1="&#x47d;" u2="&#x45e;" k="20" />
-<hkern u1="&#x47d;" u2="&#x44a;" k="20" />
-<hkern u1="&#x47d;" u2="&#x447;" k="20" />
-<hkern u1="&#x47d;" u2="&#x445;" k="41" />
-<hkern u1="&#x47d;" u2="&#x443;" k="20" />
-<hkern u1="&#x47d;" u2="&#x442;" k="20" />
-<hkern u1="&#x47d;" u2="&#x436;" k="41" />
-<hkern u1="&#x47d;" u2="&#x27;" k="20" />
-<hkern u1="&#x47d;" u2="&#x22;" k="20" />
-<hkern u1="&#x47e;" u2="&#x201e;" k="82" />
-<hkern u1="&#x47e;" u2="&#x201a;" k="82" />
-<hkern u1="&#x47e;" u2="&#x513;" k="20" />
-<hkern u1="&#x47e;" u2="&#x512;" k="41" />
-<hkern u1="&#x47e;" u2="&#x50e;" k="20" />
-<hkern u1="&#x47e;" u2="&#x509;" k="20" />
-<hkern u1="&#x47e;" u2="&#x508;" k="41" />
-<hkern u1="&#x47e;" u2="&#x506;" k="41" />
-<hkern u1="&#x47e;" u2="&#x504;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x47e;" u2="&#x4de;" k="20" />
-<hkern u1="&#x47e;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x47e;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x47e;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x47e;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x47e;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x47e;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x47e;" u2="&#x498;" k="20" />
-<hkern u1="&#x47e;" u2="&#x496;" k="41" />
-<hkern u1="&#x47e;" u2="&#x476;" k="20" />
-<hkern u1="&#x47e;" u2="&#x474;" k="20" />
-<hkern u1="&#x47e;" u2="&#x470;" k="41" />
-<hkern u1="&#x47e;" u2="&#x46e;" k="20" />
-<hkern u1="&#x47e;" u2="&#x467;" k="20" />
-<hkern u1="&#x47e;" u2="&#x466;" k="41" />
-<hkern u1="&#x47e;" u2="&#x459;" k="20" />
-<hkern u1="&#x47e;" u2="&#x43b;" k="20" />
-<hkern u1="&#x47e;" u2="&#x434;" k="20" />
-<hkern u1="&#x47e;" u2="&#x42d;" k="20" />
-<hkern u1="&#x47e;" u2="&#x42a;" k="20" />
-<hkern u1="&#x47e;" u2="&#x427;" k="41" />
-<hkern u1="&#x47e;" u2="&#x425;" k="41" />
-<hkern u1="&#x47e;" u2="&#x423;" k="41" />
-<hkern u1="&#x47e;" u2="&#x422;" k="61" />
-<hkern u1="&#x47e;" u2="&#x41b;" k="41" />
-<hkern u1="&#x47e;" u2="&#x417;" k="20" />
-<hkern u1="&#x47e;" u2="&#x416;" k="41" />
-<hkern u1="&#x47e;" u2="&#x414;" k="41" />
-<hkern u1="&#x47e;" u2="&#x410;" k="41" />
-<hkern u1="&#x47e;" u2="&#x40e;" k="41" />
-<hkern u1="&#x47e;" u2="&#x40b;" k="20" />
-<hkern u1="&#x47e;" u2="&#x409;" k="41" />
-<hkern u1="&#x47e;" u2="&#x402;" k="20" />
-<hkern u1="&#x47e;" u2="&#x2e;" k="82" />
-<hkern u1="&#x47e;" u2="&#x2c;" k="82" />
-<hkern u1="&#x47f;" u2="&#x201e;" k="82" />
-<hkern u1="&#x47f;" u2="&#x201a;" k="82" />
-<hkern u1="&#x47f;" u2="&#x513;" k="41" />
-<hkern u1="&#x47f;" u2="&#x509;" k="41" />
-<hkern u1="&#x47f;" u2="&#x4c6;" k="41" />
-<hkern u1="&#x47f;" u2="&#x467;" k="41" />
-<hkern u1="&#x47f;" u2="&#x459;" k="41" />
-<hkern u1="&#x47f;" u2="&#x43b;" k="41" />
-<hkern u1="&#x47f;" u2="&#x434;" k="41" />
-<hkern u1="&#x47f;" u2="&#x2e;" k="82" />
-<hkern u1="&#x47f;" u2="&#x2c;" k="82" />
-<hkern u1="&#x480;" u2="&#x50c;" k="41" />
-<hkern u1="&#x480;" u2="&#x507;" k="41" />
-<hkern u1="&#x480;" u2="&#x505;" k="41" />
-<hkern u1="&#x480;" u2="&#x502;" k="41" />
-<hkern u1="&#x480;" u2="&#x500;" k="41" />
-<hkern u1="&#x480;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x480;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x480;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x480;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x480;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x480;" u2="&#x4be;" k="41" />
-<hkern u1="&#x480;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x480;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x480;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x480;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x480;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x480;" u2="&#x480;" k="41" />
-<hkern u1="&#x480;" u2="&#x47e;" k="41" />
-<hkern u1="&#x480;" u2="&#x47c;" k="41" />
-<hkern u1="&#x480;" u2="&#x47a;" k="41" />
-<hkern u1="&#x480;" u2="&#x478;" k="41" />
-<hkern u1="&#x480;" u2="&#x472;" k="41" />
-<hkern u1="&#x480;" u2="&#x460;" k="41" />
-<hkern u1="&#x480;" u2="&#x447;" k="41" />
-<hkern u1="&#x480;" u2="&#x424;" k="41" />
-<hkern u1="&#x480;" u2="&#x421;" k="41" />
-<hkern u1="&#x480;" u2="&#x41e;" k="41" />
-<hkern u1="&#x480;" u2="&#x404;" k="41" />
-<hkern u1="&#x48a;" u2="&#x507;" k="41" />
-<hkern u1="&#x48a;" u2="&#x505;" k="41" />
-<hkern u1="&#x48a;" u2="&#x4e1;" k="-41" />
-<hkern u1="&#x48a;" u2="&#x408;" k="-225" />
-<hkern u1="&#x48b;" u2="&#x201d;" k="20" />
-<hkern u1="&#x48b;" u2="&#x2019;" k="20" />
-<hkern u1="&#x48b;" u2="&#x27;" k="20" />
-<hkern u1="&#x48b;" u2="&#x22;" k="20" />
-<hkern u1="&#x48c;" u2="&#x201d;" k="82" />
-<hkern u1="&#x48c;" u2="&#x2019;" k="82" />
-<hkern u1="&#x48c;" u2="&#x50f;" k="41" />
-<hkern u1="&#x48c;" u2="&#x50e;" k="41" />
-<hkern u1="&#x48c;" u2="&#x506;" k="102" />
-<hkern u1="&#x48c;" u2="&#x504;" k="102" />
-<hkern u1="&#x48c;" u2="&#x4f4;" k="82" />
-<hkern u1="&#x48c;" u2="&#x4cb;" k="82" />
-<hkern u1="&#x48c;" u2="&#x4b8;" k="82" />
-<hkern u1="&#x48c;" u2="&#x4b6;" k="82" />
-<hkern u1="&#x48c;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x48c;" u2="&#x4b4;" k="41" />
-<hkern u1="&#x48c;" u2="&#x4b0;" k="61" />
-<hkern u1="&#x48c;" u2="&#x4ae;" k="61" />
-<hkern u1="&#x48c;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x48c;" u2="&#x4ac;" k="82" />
-<hkern u1="&#x48c;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x48c;" u2="&#x4a0;" k="41" />
-<hkern u1="&#x48c;" u2="&#x476;" k="61" />
-<hkern u1="&#x48c;" u2="&#x474;" k="61" />
-<hkern u1="&#x48c;" u2="&#x470;" k="82" />
-<hkern u1="&#x48c;" u2="&#x44a;" k="41" />
-<hkern u1="&#x48c;" u2="&#x442;" k="41" />
-<hkern u1="&#x48c;" u2="&#x42a;" k="41" />
-<hkern u1="&#x48c;" u2="&#x427;" k="82" />
-<hkern u1="&#x48c;" u2="&#x422;" k="82" />
-<hkern u1="&#x48c;" u2="&#x40b;" k="41" />
-<hkern u1="&#x48c;" u2="&#x402;" k="41" />
-<hkern u1="&#x48c;" u2="&#x27;" k="82" />
-<hkern u1="&#x48c;" u2="&#x22;" k="82" />
-<hkern u1="&#x48d;" u2="&#x201d;" k="123" />
-<hkern u1="&#x48d;" u2="&#x2019;" k="123" />
-<hkern u1="&#x48d;" u2="&#x50f;" k="102" />
-<hkern u1="&#x48d;" u2="&#x507;" k="102" />
-<hkern u1="&#x48d;" u2="&#x505;" k="102" />
-<hkern u1="&#x48d;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x48d;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x48d;" u2="&#x4f5;" k="82" />
-<hkern u1="&#x48d;" u2="&#x4f3;" k="61" />
-<hkern u1="&#x48d;" u2="&#x4f1;" k="61" />
-<hkern u1="&#x48d;" u2="&#x4ef;" k="61" />
-<hkern u1="&#x48d;" u2="&#x4e1;" k="41" />
-<hkern u1="&#x48d;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x48d;" u2="&#x4cc;" k="82" />
-<hkern u1="&#x48d;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x48d;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x48d;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x48d;" u2="&#x4b9;" k="82" />
-<hkern u1="&#x48d;" u2="&#x4b7;" k="82" />
-<hkern u1="&#x48d;" u2="&#x4b5;" k="102" />
-<hkern u1="&#x48d;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x48d;" u2="&#x4b1;" k="61" />
-<hkern u1="&#x48d;" u2="&#x4af;" k="61" />
-<hkern u1="&#x48d;" u2="&#x4ad;" k="102" />
-<hkern u1="&#x48d;" u2="&#x4a1;" k="102" />
-<hkern u1="&#x48d;" u2="&#x497;" k="41" />
-<hkern u1="&#x48d;" u2="&#x47f;" k="41" />
-<hkern u1="&#x48d;" u2="&#x477;" k="41" />
-<hkern u1="&#x48d;" u2="&#x475;" k="41" />
-<hkern u1="&#x48d;" u2="&#x461;" k="41" />
-<hkern u1="&#x48d;" u2="&#x45e;" k="61" />
-<hkern u1="&#x48d;" u2="&#x44a;" k="102" />
-<hkern u1="&#x48d;" u2="&#x447;" k="82" />
-<hkern u1="&#x48d;" u2="&#x445;" k="41" />
-<hkern u1="&#x48d;" u2="&#x443;" k="61" />
-<hkern u1="&#x48d;" u2="&#x442;" k="102" />
-<hkern u1="&#x48d;" u2="&#x436;" k="41" />
-<hkern u1="&#x48d;" u2="&#x27;" k="123" />
-<hkern u1="&#x48d;" u2="&#x22;" k="123" />
-<hkern u1="&#x48e;" u2="&#x201e;" k="266" />
-<hkern u1="&#x48e;" u2="&#x201a;" k="266" />
-<hkern u1="&#x48e;" u2="&#x513;" k="102" />
-<hkern u1="&#x48e;" u2="&#x512;" k="123" />
-<hkern u1="&#x48e;" u2="&#x509;" k="102" />
-<hkern u1="&#x48e;" u2="&#x508;" k="123" />
-<hkern u1="&#x48e;" u2="&#x502;" k="82" />
-<hkern u1="&#x48e;" u2="&#x500;" k="82" />
-<hkern u1="&#x48e;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x48e;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x48e;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x48e;" u2="&#x4d4;" k="102" />
-<hkern u1="&#x48e;" u2="&#x4d2;" k="102" />
-<hkern u1="&#x48e;" u2="&#x4d0;" k="102" />
-<hkern u1="&#x48e;" u2="&#x4c6;" k="102" />
-<hkern u1="&#x48e;" u2="&#x4c5;" k="123" />
-<hkern u1="&#x48e;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x48e;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x48e;" u2="&#x496;" k="41" />
-<hkern u1="&#x48e;" u2="&#x46a;" k="20" />
-<hkern u1="&#x48e;" u2="&#x467;" k="102" />
-<hkern u1="&#x48e;" u2="&#x466;" k="102" />
-<hkern u1="&#x48e;" u2="&#x459;" k="102" />
-<hkern u1="&#x48e;" u2="&#x43b;" k="102" />
-<hkern u1="&#x48e;" u2="&#x434;" k="102" />
-<hkern u1="&#x48e;" u2="&#x425;" k="41" />
-<hkern u1="&#x48e;" u2="&#x41b;" k="123" />
-<hkern u1="&#x48e;" u2="&#x416;" k="41" />
-<hkern u1="&#x48e;" u2="&#x414;" k="123" />
-<hkern u1="&#x48e;" u2="&#x410;" k="102" />
-<hkern u1="&#x48e;" u2="&#x409;" k="123" />
-<hkern u1="&#x48e;" u2="&#x2e;" k="266" />
-<hkern u1="&#x48e;" u2="&#x2c;" k="266" />
-<hkern u1="&#x48f;" u2="&#x201d;" k="20" />
-<hkern u1="&#x48f;" u2="&#x2019;" k="20" />
-<hkern u1="&#x48f;" u2="&#x50f;" k="20" />
-<hkern u1="&#x48f;" u2="&#x507;" k="20" />
-<hkern u1="&#x48f;" u2="&#x505;" k="20" />
-<hkern u1="&#x48f;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x48f;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x48f;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x48f;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x48f;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x48f;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x48f;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x48f;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x48f;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x48f;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x48f;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x48f;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x48f;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x48f;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x48f;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x48f;" u2="&#x497;" k="41" />
-<hkern u1="&#x48f;" u2="&#x45e;" k="20" />
-<hkern u1="&#x48f;" u2="&#x44a;" k="20" />
-<hkern u1="&#x48f;" u2="&#x447;" k="20" />
-<hkern u1="&#x48f;" u2="&#x445;" k="41" />
-<hkern u1="&#x48f;" u2="&#x443;" k="20" />
-<hkern u1="&#x48f;" u2="&#x442;" k="20" />
-<hkern u1="&#x48f;" u2="&#x436;" k="41" />
-<hkern u1="&#x48f;" u2="&#x27;" k="20" />
-<hkern u1="&#x48f;" u2="&#x22;" k="20" />
-<hkern u1="&#x490;" u2="&#x201e;" k="123" />
-<hkern u1="&#x490;" u2="&#x201a;" k="123" />
-<hkern u1="&#x490;" u2="&#x2015;" k="82" />
-<hkern u1="&#x490;" u2="&#x2014;" k="82" />
-<hkern u1="&#x490;" u2="&#x2013;" k="82" />
-<hkern u1="&#x490;" u2="&#x513;" k="123" />
-<hkern u1="&#x490;" u2="&#x512;" k="102" />
-<hkern u1="&#x490;" u2="&#x511;" k="143" />
-<hkern u1="&#x490;" u2="&#x50f;" k="82" />
-<hkern u1="&#x490;" u2="&#x50d;" k="143" />
-<hkern u1="&#x490;" u2="&#x50c;" k="41" />
-<hkern u1="&#x490;" u2="&#x50b;" k="102" />
-<hkern u1="&#x490;" u2="&#x509;" k="123" />
-<hkern u1="&#x490;" u2="&#x508;" k="102" />
-<hkern u1="&#x490;" u2="&#x507;" k="102" />
-<hkern u1="&#x490;" u2="&#x505;" k="102" />
-<hkern u1="&#x490;" u2="&#x503;" k="143" />
-<hkern u1="&#x490;" u2="&#x502;" k="143" />
-<hkern u1="&#x490;" u2="&#x501;" k="143" />
-<hkern u1="&#x490;" u2="&#x500;" k="143" />
-<hkern u1="&#x490;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x490;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x490;" u2="&#x4f9;" k="102" />
-<hkern u1="&#x490;" u2="&#x4f7;" k="102" />
-<hkern u1="&#x490;" u2="&#x4f5;" k="102" />
-<hkern u1="&#x490;" u2="&#x4f3;" k="82" />
-<hkern u1="&#x490;" u2="&#x4f1;" k="82" />
-<hkern u1="&#x490;" u2="&#x4ef;" k="82" />
-<hkern u1="&#x490;" u2="&#x4ed;" k="41" />
-<hkern u1="&#x490;" u2="&#x4eb;" k="143" />
-<hkern u1="&#x490;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x490;" u2="&#x4e9;" k="143" />
-<hkern u1="&#x490;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x490;" u2="&#x4e7;" k="143" />
-<hkern u1="&#x490;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x490;" u2="&#x4e5;" k="102" />
-<hkern u1="&#x490;" u2="&#x4e3;" k="102" />
-<hkern u1="&#x490;" u2="&#x4e1;" k="61" />
-<hkern u1="&#x490;" u2="&#x4df;" k="41" />
-<hkern u1="&#x490;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x490;" u2="&#x4d7;" k="143" />
-<hkern u1="&#x490;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x490;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x490;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x490;" u2="&#x4ce;" k="102" />
-<hkern u1="&#x490;" u2="&#x4cc;" k="102" />
-<hkern u1="&#x490;" u2="&#x4ca;" k="102" />
-<hkern u1="&#x490;" u2="&#x4c8;" k="102" />
-<hkern u1="&#x490;" u2="&#x4c6;" k="123" />
-<hkern u1="&#x490;" u2="&#x4c5;" k="102" />
-<hkern u1="&#x490;" u2="&#x4c4;" k="102" />
-<hkern u1="&#x490;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x490;" u2="&#x4bf;" k="143" />
-<hkern u1="&#x490;" u2="&#x4be;" k="102" />
-<hkern u1="&#x490;" u2="&#x4bd;" k="143" />
-<hkern u1="&#x490;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x490;" u2="&#x4bb;" k="102" />
-<hkern u1="&#x490;" u2="&#x4b9;" k="102" />
-<hkern u1="&#x490;" u2="&#x4b7;" k="102" />
-<hkern u1="&#x490;" u2="&#x4b5;" k="82" />
-<hkern u1="&#x490;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x490;" u2="&#x4b1;" k="82" />
-<hkern u1="&#x490;" u2="&#x4af;" k="82" />
-<hkern u1="&#x490;" u2="&#x4ad;" k="82" />
-<hkern u1="&#x490;" u2="&#x4ac;" k="-41" />
-<hkern u1="&#x490;" u2="&#x4ab;" k="143" />
-<hkern u1="&#x490;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x490;" u2="&#x4a9;" k="143" />
-<hkern u1="&#x490;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x490;" u2="&#x4a7;" k="102" />
-<hkern u1="&#x490;" u2="&#x4a5;" k="102" />
-<hkern u1="&#x490;" u2="&#x4a3;" k="102" />
-<hkern u1="&#x490;" u2="&#x4a1;" k="82" />
-<hkern u1="&#x490;" u2="&#x49d;" k="102" />
-<hkern u1="&#x490;" u2="&#x49b;" k="102" />
-<hkern u1="&#x490;" u2="&#x499;" k="41" />
-<hkern u1="&#x490;" u2="&#x497;" k="41" />
-<hkern u1="&#x490;" u2="&#x495;" k="102" />
-<hkern u1="&#x490;" u2="&#x491;" k="102" />
-<hkern u1="&#x490;" u2="&#x48f;" k="102" />
-<hkern u1="&#x490;" u2="&#x48b;" k="102" />
-<hkern u1="&#x490;" u2="&#x481;" k="143" />
-<hkern u1="&#x490;" u2="&#x480;" k="41" />
-<hkern u1="&#x490;" u2="&#x47f;" k="41" />
-<hkern u1="&#x490;" u2="&#x47e;" k="41" />
-<hkern u1="&#x490;" u2="&#x47d;" k="143" />
-<hkern u1="&#x490;" u2="&#x47c;" k="41" />
-<hkern u1="&#x490;" u2="&#x47b;" k="143" />
-<hkern u1="&#x490;" u2="&#x47a;" k="41" />
-<hkern u1="&#x490;" u2="&#x479;" k="143" />
-<hkern u1="&#x490;" u2="&#x478;" k="41" />
-<hkern u1="&#x490;" u2="&#x477;" k="41" />
-<hkern u1="&#x490;" u2="&#x475;" k="41" />
-<hkern u1="&#x490;" u2="&#x473;" k="143" />
-<hkern u1="&#x490;" u2="&#x472;" k="41" />
-<hkern u1="&#x490;" u2="&#x471;" k="102" />
-<hkern u1="&#x490;" u2="&#x46d;" k="102" />
-<hkern u1="&#x490;" u2="&#x46b;" k="102" />
-<hkern u1="&#x490;" u2="&#x469;" k="102" />
-<hkern u1="&#x490;" u2="&#x467;" k="123" />
-<hkern u1="&#x490;" u2="&#x466;" k="143" />
-<hkern u1="&#x490;" u2="&#x465;" k="102" />
-<hkern u1="&#x490;" u2="&#x461;" k="41" />
-<hkern u1="&#x490;" u2="&#x460;" k="41" />
-<hkern u1="&#x490;" u2="&#x45f;" k="102" />
-<hkern u1="&#x490;" u2="&#x45e;" k="82" />
-<hkern u1="&#x490;" u2="&#x45d;" k="102" />
-<hkern u1="&#x490;" u2="&#x45c;" k="102" />
-<hkern u1="&#x490;" u2="&#x45a;" k="102" />
-<hkern u1="&#x490;" u2="&#x459;" k="123" />
-<hkern u1="&#x490;" u2="&#x455;" k="123" />
-<hkern u1="&#x490;" u2="&#x454;" k="143" />
-<hkern u1="&#x490;" u2="&#x453;" k="102" />
-<hkern u1="&#x490;" u2="&#x451;" k="143" />
-<hkern u1="&#x490;" u2="&#x450;" k="143" />
-<hkern u1="&#x490;" u2="&#x44f;" k="61" />
-<hkern u1="&#x490;" u2="&#x44e;" k="102" />
-<hkern u1="&#x490;" u2="&#x44d;" k="41" />
-<hkern u1="&#x490;" u2="&#x44c;" k="102" />
-<hkern u1="&#x490;" u2="&#x44b;" k="102" />
-<hkern u1="&#x490;" u2="&#x44a;" k="82" />
-<hkern u1="&#x490;" u2="&#x449;" k="102" />
-<hkern u1="&#x490;" u2="&#x448;" k="102" />
-<hkern u1="&#x490;" u2="&#x447;" k="102" />
-<hkern u1="&#x490;" u2="&#x446;" k="102" />
-<hkern u1="&#x490;" u2="&#x445;" k="41" />
-<hkern u1="&#x490;" u2="&#x444;" k="143" />
-<hkern u1="&#x490;" u2="&#x443;" k="82" />
-<hkern u1="&#x490;" u2="&#x442;" k="82" />
-<hkern u1="&#x490;" u2="&#x441;" k="143" />
-<hkern u1="&#x490;" u2="&#x440;" k="102" />
-<hkern u1="&#x490;" u2="&#x43f;" k="102" />
-<hkern u1="&#x490;" u2="&#x43e;" k="143" />
-<hkern u1="&#x490;" u2="&#x43d;" k="102" />
-<hkern u1="&#x490;" u2="&#x43c;" k="102" />
-<hkern u1="&#x490;" u2="&#x43b;" k="123" />
-<hkern u1="&#x490;" u2="&#x43a;" k="102" />
-<hkern u1="&#x490;" u2="&#x439;" k="102" />
-<hkern u1="&#x490;" u2="&#x438;" k="102" />
-<hkern u1="&#x490;" u2="&#x437;" k="41" />
-<hkern u1="&#x490;" u2="&#x436;" k="41" />
-<hkern u1="&#x490;" u2="&#x435;" k="143" />
-<hkern u1="&#x490;" u2="&#x434;" k="123" />
-<hkern u1="&#x490;" u2="&#x433;" k="102" />
-<hkern u1="&#x490;" u2="&#x432;" k="102" />
-<hkern u1="&#x490;" u2="&#x424;" k="82" />
-<hkern u1="&#x490;" u2="&#x422;" k="-41" />
-<hkern u1="&#x490;" u2="&#x421;" k="41" />
-<hkern u1="&#x490;" u2="&#x41e;" k="41" />
-<hkern u1="&#x490;" u2="&#x41b;" k="102" />
-<hkern u1="&#x490;" u2="&#x414;" k="102" />
-<hkern u1="&#x490;" u2="&#x410;" k="143" />
-<hkern u1="&#x490;" u2="&#x409;" k="102" />
-<hkern u1="&#x490;" u2="&#x404;" k="41" />
-<hkern u1="&#x490;" u2="&#x2e;" k="123" />
-<hkern u1="&#x490;" u2="&#x2d;" k="82" />
-<hkern u1="&#x490;" u2="&#x2c;" k="123" />
-<hkern u1="&#x491;" u2="&#x201e;" k="102" />
-<hkern u1="&#x491;" u2="&#x201a;" k="102" />
-<hkern u1="&#x491;" u2="&#x2015;" k="41" />
-<hkern u1="&#x491;" u2="&#x2014;" k="41" />
-<hkern u1="&#x491;" u2="&#x2013;" k="41" />
-<hkern u1="&#x491;" u2="&#x513;" k="61" />
-<hkern u1="&#x491;" u2="&#x511;" k="20" />
-<hkern u1="&#x491;" u2="&#x50d;" k="20" />
-<hkern u1="&#x491;" u2="&#x509;" k="61" />
-<hkern u1="&#x491;" u2="&#x503;" k="20" />
-<hkern u1="&#x491;" u2="&#x501;" k="20" />
-<hkern u1="&#x491;" u2="&#x4eb;" k="20" />
-<hkern u1="&#x491;" u2="&#x4e9;" k="20" />
-<hkern u1="&#x491;" u2="&#x4e7;" k="20" />
-<hkern u1="&#x491;" u2="&#x4d7;" k="20" />
-<hkern u1="&#x491;" u2="&#x4c6;" k="61" />
-<hkern u1="&#x491;" u2="&#x4ab;" k="20" />
-<hkern u1="&#x491;" u2="&#x4a9;" k="20" />
-<hkern u1="&#x491;" u2="&#x481;" k="20" />
-<hkern u1="&#x491;" u2="&#x47d;" k="20" />
-<hkern u1="&#x491;" u2="&#x47b;" k="20" />
-<hkern u1="&#x491;" u2="&#x479;" k="20" />
-<hkern u1="&#x491;" u2="&#x473;" k="20" />
-<hkern u1="&#x491;" u2="&#x467;" k="61" />
-<hkern u1="&#x491;" u2="&#x459;" k="61" />
-<hkern u1="&#x491;" u2="&#x454;" k="20" />
-<hkern u1="&#x491;" u2="&#x451;" k="20" />
-<hkern u1="&#x491;" u2="&#x450;" k="20" />
-<hkern u1="&#x491;" u2="&#x444;" k="20" />
-<hkern u1="&#x491;" u2="&#x441;" k="20" />
-<hkern u1="&#x491;" u2="&#x43e;" k="20" />
-<hkern u1="&#x491;" u2="&#x43b;" k="61" />
-<hkern u1="&#x491;" u2="&#x435;" k="20" />
-<hkern u1="&#x491;" u2="&#x434;" k="61" />
-<hkern u1="&#x491;" u2="&#x2e;" k="102" />
-<hkern u1="&#x491;" u2="&#x2d;" k="41" />
-<hkern u1="&#x491;" u2="&#x2c;" k="102" />
-<hkern u1="&#x492;" u2="&#x201e;" k="102" />
-<hkern u1="&#x492;" u2="&#x201a;" k="102" />
-<hkern u1="&#x492;" u2="&#x2015;" k="41" />
-<hkern u1="&#x492;" u2="&#x2014;" k="41" />
-<hkern u1="&#x492;" u2="&#x2013;" k="41" />
-<hkern u1="&#x492;" u2="&#x513;" k="102" />
-<hkern u1="&#x492;" u2="&#x512;" k="82" />
-<hkern u1="&#x492;" u2="&#x511;" k="82" />
-<hkern u1="&#x492;" u2="&#x50e;" k="-41" />
-<hkern u1="&#x492;" u2="&#x50d;" k="82" />
-<hkern u1="&#x492;" u2="&#x50c;" k="41" />
-<hkern u1="&#x492;" u2="&#x50b;" k="61" />
-<hkern u1="&#x492;" u2="&#x509;" k="102" />
-<hkern u1="&#x492;" u2="&#x508;" k="82" />
-<hkern u1="&#x492;" u2="&#x507;" k="41" />
-<hkern u1="&#x492;" u2="&#x505;" k="41" />
-<hkern u1="&#x492;" u2="&#x503;" k="82" />
-<hkern u1="&#x492;" u2="&#x502;" k="102" />
-<hkern u1="&#x492;" u2="&#x501;" k="82" />
-<hkern u1="&#x492;" u2="&#x500;" k="102" />
-<hkern u1="&#x492;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x492;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x492;" u2="&#x4f9;" k="61" />
-<hkern u1="&#x492;" u2="&#x4f7;" k="61" />
-<hkern u1="&#x492;" u2="&#x4f5;" k="102" />
-<hkern u1="&#x492;" u2="&#x4ed;" k="41" />
-<hkern u1="&#x492;" u2="&#x4eb;" k="82" />
-<hkern u1="&#x492;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x492;" u2="&#x4e9;" k="82" />
-<hkern u1="&#x492;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x492;" u2="&#x4e7;" k="82" />
-<hkern u1="&#x492;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x492;" u2="&#x4e5;" k="61" />
-<hkern u1="&#x492;" u2="&#x4e3;" k="61" />
-<hkern u1="&#x492;" u2="&#x4df;" k="41" />
-<hkern u1="&#x492;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x492;" u2="&#x4d7;" k="82" />
-<hkern u1="&#x492;" u2="&#x4d4;" k="123" />
-<hkern u1="&#x492;" u2="&#x4d2;" k="123" />
-<hkern u1="&#x492;" u2="&#x4d0;" k="123" />
-<hkern u1="&#x492;" u2="&#x4ce;" k="61" />
-<hkern u1="&#x492;" u2="&#x4cc;" k="102" />
-<hkern u1="&#x492;" u2="&#x4ca;" k="61" />
-<hkern u1="&#x492;" u2="&#x4c8;" k="61" />
-<hkern u1="&#x492;" u2="&#x4c6;" k="102" />
-<hkern u1="&#x492;" u2="&#x4c5;" k="82" />
-<hkern u1="&#x492;" u2="&#x4c4;" k="61" />
-<hkern u1="&#x492;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x492;" u2="&#x4bf;" k="61" />
-<hkern u1="&#x492;" u2="&#x4be;" k="41" />
-<hkern u1="&#x492;" u2="&#x4bd;" k="61" />
-<hkern u1="&#x492;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x492;" u2="&#x4bb;" k="61" />
-<hkern u1="&#x492;" u2="&#x4b9;" k="102" />
-<hkern u1="&#x492;" u2="&#x4b7;" k="102" />
-<hkern u1="&#x492;" u2="&#x4b4;" k="-41" />
-<hkern u1="&#x492;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x492;" u2="&#x4ac;" k="-41" />
-<hkern u1="&#x492;" u2="&#x4ab;" k="82" />
-<hkern u1="&#x492;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x492;" u2="&#x4a9;" k="82" />
-<hkern u1="&#x492;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x492;" u2="&#x4a7;" k="61" />
-<hkern u1="&#x492;" u2="&#x4a5;" k="61" />
-<hkern u1="&#x492;" u2="&#x4a3;" k="61" />
-<hkern u1="&#x492;" u2="&#x4a0;" k="-41" />
-<hkern u1="&#x492;" u2="&#x49f;" k="-41" />
-<hkern u1="&#x492;" u2="&#x49d;" k="61" />
-<hkern u1="&#x492;" u2="&#x49b;" k="61" />
-<hkern u1="&#x492;" u2="&#x499;" k="41" />
-<hkern u1="&#x492;" u2="&#x497;" k="41" />
-<hkern u1="&#x492;" u2="&#x495;" k="61" />
-<hkern u1="&#x492;" u2="&#x491;" k="61" />
-<hkern u1="&#x492;" u2="&#x48f;" k="61" />
-<hkern u1="&#x492;" u2="&#x48d;" k="-41" />
-<hkern u1="&#x492;" u2="&#x48b;" k="61" />
-<hkern u1="&#x492;" u2="&#x481;" k="82" />
-<hkern u1="&#x492;" u2="&#x480;" k="41" />
-<hkern u1="&#x492;" u2="&#x47e;" k="41" />
-<hkern u1="&#x492;" u2="&#x47d;" k="82" />
-<hkern u1="&#x492;" u2="&#x47c;" k="41" />
-<hkern u1="&#x492;" u2="&#x47b;" k="82" />
-<hkern u1="&#x492;" u2="&#x47a;" k="41" />
-<hkern u1="&#x492;" u2="&#x479;" k="82" />
-<hkern u1="&#x492;" u2="&#x478;" k="41" />
-<hkern u1="&#x492;" u2="&#x473;" k="82" />
-<hkern u1="&#x492;" u2="&#x472;" k="41" />
-<hkern u1="&#x492;" u2="&#x471;" k="61" />
-<hkern u1="&#x492;" u2="&#x46d;" k="61" />
-<hkern u1="&#x492;" u2="&#x46b;" k="41" />
-<hkern u1="&#x492;" u2="&#x469;" k="61" />
-<hkern u1="&#x492;" u2="&#x467;" k="102" />
-<hkern u1="&#x492;" u2="&#x466;" k="123" />
-<hkern u1="&#x492;" u2="&#x465;" k="61" />
-<hkern u1="&#x492;" u2="&#x460;" k="41" />
-<hkern u1="&#x492;" u2="&#x45f;" k="61" />
-<hkern u1="&#x492;" u2="&#x45d;" k="61" />
-<hkern u1="&#x492;" u2="&#x45c;" k="61" />
-<hkern u1="&#x492;" u2="&#x45b;" k="-41" />
-<hkern u1="&#x492;" u2="&#x45a;" k="61" />
-<hkern u1="&#x492;" u2="&#x459;" k="102" />
-<hkern u1="&#x492;" u2="&#x455;" k="61" />
-<hkern u1="&#x492;" u2="&#x454;" k="82" />
-<hkern u1="&#x492;" u2="&#x453;" k="61" />
-<hkern u1="&#x492;" u2="&#x452;" k="-41" />
-<hkern u1="&#x492;" u2="&#x451;" k="82" />
-<hkern u1="&#x492;" u2="&#x450;" k="82" />
-<hkern u1="&#x492;" u2="&#x44e;" k="61" />
-<hkern u1="&#x492;" u2="&#x44d;" k="41" />
-<hkern u1="&#x492;" u2="&#x44c;" k="61" />
-<hkern u1="&#x492;" u2="&#x44b;" k="61" />
-<hkern u1="&#x492;" u2="&#x449;" k="61" />
-<hkern u1="&#x492;" u2="&#x448;" k="61" />
-<hkern u1="&#x492;" u2="&#x447;" k="102" />
-<hkern u1="&#x492;" u2="&#x446;" k="61" />
-<hkern u1="&#x492;" u2="&#x445;" k="41" />
-<hkern u1="&#x492;" u2="&#x444;" k="82" />
-<hkern u1="&#x492;" u2="&#x441;" k="82" />
-<hkern u1="&#x492;" u2="&#x440;" k="61" />
-<hkern u1="&#x492;" u2="&#x43f;" k="61" />
-<hkern u1="&#x492;" u2="&#x43e;" k="82" />
-<hkern u1="&#x492;" u2="&#x43d;" k="61" />
-<hkern u1="&#x492;" u2="&#x43c;" k="61" />
-<hkern u1="&#x492;" u2="&#x43b;" k="102" />
-<hkern u1="&#x492;" u2="&#x43a;" k="61" />
-<hkern u1="&#x492;" u2="&#x439;" k="61" />
-<hkern u1="&#x492;" u2="&#x438;" k="61" />
-<hkern u1="&#x492;" u2="&#x437;" k="41" />
-<hkern u1="&#x492;" u2="&#x436;" k="41" />
-<hkern u1="&#x492;" u2="&#x435;" k="82" />
-<hkern u1="&#x492;" u2="&#x434;" k="102" />
-<hkern u1="&#x492;" u2="&#x433;" k="61" />
-<hkern u1="&#x492;" u2="&#x432;" k="61" />
-<hkern u1="&#x492;" u2="&#x42a;" k="-41" />
-<hkern u1="&#x492;" u2="&#x424;" k="61" />
-<hkern u1="&#x492;" u2="&#x422;" k="-41" />
-<hkern u1="&#x492;" u2="&#x421;" k="41" />
-<hkern u1="&#x492;" u2="&#x41e;" k="41" />
-<hkern u1="&#x492;" u2="&#x41b;" k="82" />
-<hkern u1="&#x492;" u2="&#x414;" k="82" />
-<hkern u1="&#x492;" u2="&#x410;" k="123" />
-<hkern u1="&#x492;" u2="&#x40b;" k="-41" />
-<hkern u1="&#x492;" u2="&#x409;" k="82" />
-<hkern u1="&#x492;" u2="&#x404;" k="41" />
-<hkern u1="&#x492;" u2="&#x402;" k="-41" />
-<hkern u1="&#x492;" u2="&#x2e;" k="102" />
-<hkern u1="&#x492;" u2="&#x2d;" k="41" />
-<hkern u1="&#x492;" u2="&#x2c;" k="102" />
-<hkern u1="&#x493;" u2="&#x201e;" k="61" />
-<hkern u1="&#x493;" u2="&#x201a;" k="61" />
-<hkern u1="&#x493;" u2="&#x513;" k="61" />
-<hkern u1="&#x493;" u2="&#x511;" k="41" />
-<hkern u1="&#x493;" u2="&#x50d;" k="41" />
-<hkern u1="&#x493;" u2="&#x509;" k="61" />
-<hkern u1="&#x493;" u2="&#x503;" k="41" />
-<hkern u1="&#x493;" u2="&#x501;" k="41" />
-<hkern u1="&#x493;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x493;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x493;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x493;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x493;" u2="&#x4c6;" k="61" />
-<hkern u1="&#x493;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x493;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x493;" u2="&#x481;" k="41" />
-<hkern u1="&#x493;" u2="&#x47d;" k="41" />
-<hkern u1="&#x493;" u2="&#x47b;" k="41" />
-<hkern u1="&#x493;" u2="&#x479;" k="41" />
-<hkern u1="&#x493;" u2="&#x473;" k="41" />
-<hkern u1="&#x493;" u2="&#x467;" k="61" />
-<hkern u1="&#x493;" u2="&#x459;" k="61" />
-<hkern u1="&#x493;" u2="&#x454;" k="41" />
-<hkern u1="&#x493;" u2="&#x451;" k="41" />
-<hkern u1="&#x493;" u2="&#x450;" k="41" />
-<hkern u1="&#x493;" u2="&#x444;" k="41" />
-<hkern u1="&#x493;" u2="&#x441;" k="41" />
-<hkern u1="&#x493;" u2="&#x43e;" k="41" />
-<hkern u1="&#x493;" u2="&#x43b;" k="61" />
-<hkern u1="&#x493;" u2="&#x435;" k="41" />
-<hkern u1="&#x493;" u2="&#x434;" k="61" />
-<hkern u1="&#x493;" u2="&#x2e;" k="61" />
-<hkern u1="&#x493;" u2="&#x2c;" k="61" />
-<hkern u1="&#x494;" u2="&#x201d;" k="61" />
-<hkern u1="&#x494;" u2="&#x2019;" k="61" />
-<hkern u1="&#x494;" u2="&#x50f;" k="41" />
-<hkern u1="&#x494;" u2="&#x50e;" k="61" />
-<hkern u1="&#x494;" u2="&#x507;" k="61" />
-<hkern u1="&#x494;" u2="&#x506;" k="41" />
-<hkern u1="&#x494;" u2="&#x505;" k="61" />
-<hkern u1="&#x494;" u2="&#x504;" k="41" />
-<hkern u1="&#x494;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x494;" u2="&#x4f4;" k="82" />
-<hkern u1="&#x494;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x494;" u2="&#x4cb;" k="82" />
-<hkern u1="&#x494;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x494;" u2="&#x4b8;" k="82" />
-<hkern u1="&#x494;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x494;" u2="&#x4b6;" k="82" />
-<hkern u1="&#x494;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x494;" u2="&#x4b4;" k="61" />
-<hkern u1="&#x494;" u2="&#x4b0;" k="41" />
-<hkern u1="&#x494;" u2="&#x4ae;" k="41" />
-<hkern u1="&#x494;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x494;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x494;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x494;" u2="&#x4a0;" k="61" />
-<hkern u1="&#x494;" u2="&#x476;" k="61" />
-<hkern u1="&#x494;" u2="&#x474;" k="61" />
-<hkern u1="&#x494;" u2="&#x470;" k="82" />
-<hkern u1="&#x494;" u2="&#x44a;" k="41" />
-<hkern u1="&#x494;" u2="&#x447;" k="41" />
-<hkern u1="&#x494;" u2="&#x442;" k="41" />
-<hkern u1="&#x494;" u2="&#x42a;" k="61" />
-<hkern u1="&#x494;" u2="&#x427;" k="82" />
-<hkern u1="&#x494;" u2="&#x422;" k="61" />
-<hkern u1="&#x494;" u2="&#x40b;" k="61" />
-<hkern u1="&#x494;" u2="&#x408;" k="-102" />
-<hkern u1="&#x494;" u2="&#x402;" k="61" />
-<hkern u1="&#x494;" u2="&#x27;" k="61" />
-<hkern u1="&#x494;" u2="&#x22;" k="61" />
-<hkern u1="&#x495;" u2="&#x201d;" k="61" />
-<hkern u1="&#x495;" u2="&#x2019;" k="61" />
-<hkern u1="&#x495;" u2="&#x507;" k="41" />
-<hkern u1="&#x495;" u2="&#x505;" k="41" />
-<hkern u1="&#x495;" u2="&#x27;" k="61" />
-<hkern u1="&#x495;" u2="&#x22;" k="61" />
-<hkern u1="&#x496;" u2="&#x50f;" k="41" />
-<hkern u1="&#x496;" u2="&#x50c;" k="41" />
-<hkern u1="&#x496;" u2="&#x507;" k="41" />
-<hkern u1="&#x496;" u2="&#x505;" k="41" />
-<hkern u1="&#x496;" u2="&#x4f5;" k="82" />
-<hkern u1="&#x496;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x496;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x496;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x496;" u2="&#x4cc;" k="82" />
-<hkern u1="&#x496;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x496;" u2="&#x4be;" k="61" />
-<hkern u1="&#x496;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x496;" u2="&#x4bc;" k="61" />
-<hkern u1="&#x496;" u2="&#x4b9;" k="82" />
-<hkern u1="&#x496;" u2="&#x4b7;" k="82" />
-<hkern u1="&#x496;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x496;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x496;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x496;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x496;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x496;" u2="&#x480;" k="41" />
-<hkern u1="&#x496;" u2="&#x47e;" k="41" />
-<hkern u1="&#x496;" u2="&#x47c;" k="41" />
-<hkern u1="&#x496;" u2="&#x47a;" k="41" />
-<hkern u1="&#x496;" u2="&#x478;" k="41" />
-<hkern u1="&#x496;" u2="&#x472;" k="41" />
-<hkern u1="&#x496;" u2="&#x471;" k="20" />
-<hkern u1="&#x496;" u2="&#x46f;" k="-61" />
-<hkern u1="&#x496;" u2="&#x460;" k="41" />
-<hkern u1="&#x496;" u2="&#x44a;" k="41" />
-<hkern u1="&#x496;" u2="&#x447;" k="82" />
-<hkern u1="&#x496;" u2="&#x442;" k="41" />
-<hkern u1="&#x496;" u2="&#x424;" k="61" />
-<hkern u1="&#x496;" u2="&#x421;" k="41" />
-<hkern u1="&#x496;" u2="&#x41e;" k="41" />
-<hkern u1="&#x496;" u2="&#x408;" k="-225" />
-<hkern u1="&#x496;" u2="&#x404;" k="41" />
-<hkern u1="&#x497;" u2="&#x511;" k="20" />
-<hkern u1="&#x497;" u2="&#x50d;" k="20" />
-<hkern u1="&#x497;" u2="&#x507;" k="41" />
-<hkern u1="&#x497;" u2="&#x505;" k="41" />
-<hkern u1="&#x497;" u2="&#x503;" k="20" />
-<hkern u1="&#x497;" u2="&#x501;" k="20" />
-<hkern u1="&#x497;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x497;" u2="&#x4eb;" k="20" />
-<hkern u1="&#x497;" u2="&#x4e9;" k="20" />
-<hkern u1="&#x497;" u2="&#x4e7;" k="20" />
-<hkern u1="&#x497;" u2="&#x4d7;" k="20" />
-<hkern u1="&#x497;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x497;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x497;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x497;" u2="&#x4ab;" k="20" />
-<hkern u1="&#x497;" u2="&#x4a9;" k="20" />
-<hkern u1="&#x497;" u2="&#x481;" k="20" />
-<hkern u1="&#x497;" u2="&#x47d;" k="20" />
-<hkern u1="&#x497;" u2="&#x47b;" k="20" />
-<hkern u1="&#x497;" u2="&#x479;" k="20" />
-<hkern u1="&#x497;" u2="&#x473;" k="20" />
-<hkern u1="&#x497;" u2="&#x454;" k="20" />
-<hkern u1="&#x497;" u2="&#x451;" k="20" />
-<hkern u1="&#x497;" u2="&#x450;" k="20" />
-<hkern u1="&#x497;" u2="&#x447;" k="20" />
-<hkern u1="&#x497;" u2="&#x444;" k="20" />
-<hkern u1="&#x497;" u2="&#x441;" k="20" />
-<hkern u1="&#x497;" u2="&#x43e;" k="20" />
-<hkern u1="&#x497;" u2="&#x435;" k="20" />
-<hkern u1="&#x498;" u2="&#x201e;" k="82" />
-<hkern u1="&#x498;" u2="&#x201a;" k="82" />
-<hkern u1="&#x498;" u2="&#x506;" k="41" />
-<hkern u1="&#x498;" u2="&#x504;" k="41" />
-<hkern u1="&#x498;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x498;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x498;" u2="&#x476;" k="20" />
-<hkern u1="&#x498;" u2="&#x474;" k="20" />
-<hkern u1="&#x498;" u2="&#x2e;" k="82" />
-<hkern u1="&#x498;" u2="&#x2c;" k="82" />
-<hkern u1="&#x499;" u2="&#x44f;" k="-41" />
-<hkern u1="&#x49a;" u2="&#x50f;" k="41" />
-<hkern u1="&#x49a;" u2="&#x50c;" k="41" />
-<hkern u1="&#x49a;" u2="&#x507;" k="41" />
-<hkern u1="&#x49a;" u2="&#x505;" k="41" />
-<hkern u1="&#x49a;" u2="&#x4f5;" k="82" />
-<hkern u1="&#x49a;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x49a;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x49a;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x49a;" u2="&#x4cc;" k="82" />
-<hkern u1="&#x49a;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x49a;" u2="&#x4be;" k="61" />
-<hkern u1="&#x49a;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x49a;" u2="&#x4bc;" k="61" />
-<hkern u1="&#x49a;" u2="&#x4b9;" k="82" />
-<hkern u1="&#x49a;" u2="&#x4b7;" k="82" />
-<hkern u1="&#x49a;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x49a;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x49a;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x49a;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x49a;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x49a;" u2="&#x480;" k="41" />
-<hkern u1="&#x49a;" u2="&#x47e;" k="41" />
-<hkern u1="&#x49a;" u2="&#x47c;" k="41" />
-<hkern u1="&#x49a;" u2="&#x47a;" k="41" />
-<hkern u1="&#x49a;" u2="&#x478;" k="41" />
-<hkern u1="&#x49a;" u2="&#x472;" k="41" />
-<hkern u1="&#x49a;" u2="&#x471;" k="20" />
-<hkern u1="&#x49a;" u2="&#x46f;" k="-61" />
-<hkern u1="&#x49a;" u2="&#x460;" k="41" />
-<hkern u1="&#x49a;" u2="&#x44a;" k="41" />
-<hkern u1="&#x49a;" u2="&#x447;" k="82" />
-<hkern u1="&#x49a;" u2="&#x442;" k="41" />
-<hkern u1="&#x49a;" u2="&#x424;" k="61" />
-<hkern u1="&#x49a;" u2="&#x421;" k="41" />
-<hkern u1="&#x49a;" u2="&#x41e;" k="41" />
-<hkern u1="&#x49a;" u2="&#x408;" k="-225" />
-<hkern u1="&#x49a;" u2="&#x404;" k="41" />
-<hkern u1="&#x49b;" u2="&#x511;" k="20" />
-<hkern u1="&#x49b;" u2="&#x50d;" k="20" />
-<hkern u1="&#x49b;" u2="&#x507;" k="41" />
-<hkern u1="&#x49b;" u2="&#x505;" k="41" />
-<hkern u1="&#x49b;" u2="&#x503;" k="20" />
-<hkern u1="&#x49b;" u2="&#x501;" k="20" />
-<hkern u1="&#x49b;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x49b;" u2="&#x4eb;" k="20" />
-<hkern u1="&#x49b;" u2="&#x4e9;" k="20" />
-<hkern u1="&#x49b;" u2="&#x4e7;" k="20" />
-<hkern u1="&#x49b;" u2="&#x4d7;" k="20" />
-<hkern u1="&#x49b;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x49b;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x49b;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x49b;" u2="&#x4ab;" k="20" />
-<hkern u1="&#x49b;" u2="&#x4a9;" k="20" />
-<hkern u1="&#x49b;" u2="&#x481;" k="20" />
-<hkern u1="&#x49b;" u2="&#x47d;" k="20" />
-<hkern u1="&#x49b;" u2="&#x47b;" k="20" />
-<hkern u1="&#x49b;" u2="&#x479;" k="20" />
-<hkern u1="&#x49b;" u2="&#x473;" k="20" />
-<hkern u1="&#x49b;" u2="&#x454;" k="20" />
-<hkern u1="&#x49b;" u2="&#x451;" k="20" />
-<hkern u1="&#x49b;" u2="&#x450;" k="20" />
-<hkern u1="&#x49b;" u2="&#x447;" k="20" />
-<hkern u1="&#x49b;" u2="&#x444;" k="20" />
-<hkern u1="&#x49b;" u2="&#x441;" k="20" />
-<hkern u1="&#x49b;" u2="&#x43e;" k="20" />
-<hkern u1="&#x49b;" u2="&#x435;" k="20" />
-<hkern u1="&#x49c;" u2="&#x510;" k="20" />
-<hkern u1="&#x49c;" u2="&#x50c;" k="41" />
-<hkern u1="&#x49c;" u2="&#x507;" k="41" />
-<hkern u1="&#x49c;" u2="&#x505;" k="41" />
-<hkern u1="&#x49c;" u2="&#x502;" k="41" />
-<hkern u1="&#x49c;" u2="&#x500;" k="41" />
-<hkern u1="&#x49c;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x49c;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x49c;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x49c;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x49c;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x49c;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x49c;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x49c;" u2="&#x4be;" k="102" />
-<hkern u1="&#x49c;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x49c;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x49c;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x49c;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x49c;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x49c;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x49c;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x49c;" u2="&#x480;" k="41" />
-<hkern u1="&#x49c;" u2="&#x47e;" k="41" />
-<hkern u1="&#x49c;" u2="&#x47c;" k="41" />
-<hkern u1="&#x49c;" u2="&#x47a;" k="41" />
-<hkern u1="&#x49c;" u2="&#x478;" k="41" />
-<hkern u1="&#x49c;" u2="&#x472;" k="41" />
-<hkern u1="&#x49c;" u2="&#x470;" k="41" />
-<hkern u1="&#x49c;" u2="&#x460;" k="41" />
-<hkern u1="&#x49c;" u2="&#x447;" k="41" />
-<hkern u1="&#x49c;" u2="&#x427;" k="41" />
-<hkern u1="&#x49c;" u2="&#x424;" k="41" />
-<hkern u1="&#x49c;" u2="&#x421;" k="41" />
-<hkern u1="&#x49c;" u2="&#x41e;" k="41" />
-<hkern u1="&#x49c;" u2="&#x404;" k="41" />
-<hkern u1="&#x49d;" u2="&#x511;" k="41" />
-<hkern u1="&#x49d;" u2="&#x50d;" k="41" />
-<hkern u1="&#x49d;" u2="&#x503;" k="41" />
-<hkern u1="&#x49d;" u2="&#x501;" k="41" />
-<hkern u1="&#x49d;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x49d;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x49d;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x49d;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x49d;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x49d;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x49d;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x49d;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x49d;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x49d;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x49d;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x49d;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x49d;" u2="&#x481;" k="41" />
-<hkern u1="&#x49d;" u2="&#x47d;" k="41" />
-<hkern u1="&#x49d;" u2="&#x47b;" k="41" />
-<hkern u1="&#x49d;" u2="&#x479;" k="41" />
-<hkern u1="&#x49d;" u2="&#x473;" k="41" />
-<hkern u1="&#x49d;" u2="&#x454;" k="41" />
-<hkern u1="&#x49d;" u2="&#x451;" k="41" />
-<hkern u1="&#x49d;" u2="&#x450;" k="41" />
-<hkern u1="&#x49d;" u2="&#x447;" k="41" />
-<hkern u1="&#x49d;" u2="&#x444;" k="41" />
-<hkern u1="&#x49d;" u2="&#x441;" k="41" />
-<hkern u1="&#x49d;" u2="&#x43e;" k="41" />
-<hkern u1="&#x49d;" u2="&#x435;" k="41" />
-<hkern u1="&#x49e;" u2="&#x510;" k="20" />
-<hkern u1="&#x49e;" u2="&#x50c;" k="41" />
-<hkern u1="&#x49e;" u2="&#x507;" k="41" />
-<hkern u1="&#x49e;" u2="&#x505;" k="41" />
-<hkern u1="&#x49e;" u2="&#x502;" k="41" />
-<hkern u1="&#x49e;" u2="&#x500;" k="41" />
-<hkern u1="&#x49e;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x49e;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x49e;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x49e;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x49e;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x49e;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x49e;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x49e;" u2="&#x4be;" k="102" />
-<hkern u1="&#x49e;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x49e;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x49e;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x49e;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x49e;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x49e;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x49e;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x49e;" u2="&#x480;" k="41" />
-<hkern u1="&#x49e;" u2="&#x47e;" k="41" />
-<hkern u1="&#x49e;" u2="&#x47c;" k="41" />
-<hkern u1="&#x49e;" u2="&#x47a;" k="41" />
-<hkern u1="&#x49e;" u2="&#x478;" k="41" />
-<hkern u1="&#x49e;" u2="&#x472;" k="41" />
-<hkern u1="&#x49e;" u2="&#x470;" k="41" />
-<hkern u1="&#x49e;" u2="&#x460;" k="41" />
-<hkern u1="&#x49e;" u2="&#x447;" k="41" />
-<hkern u1="&#x49e;" u2="&#x427;" k="41" />
-<hkern u1="&#x49e;" u2="&#x424;" k="41" />
-<hkern u1="&#x49e;" u2="&#x421;" k="41" />
-<hkern u1="&#x49e;" u2="&#x41e;" k="41" />
-<hkern u1="&#x49e;" u2="&#x404;" k="41" />
-<hkern u1="&#x49f;" u2="&#x511;" k="41" />
-<hkern u1="&#x49f;" u2="&#x50d;" k="41" />
-<hkern u1="&#x49f;" u2="&#x503;" k="41" />
-<hkern u1="&#x49f;" u2="&#x501;" k="41" />
-<hkern u1="&#x49f;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x49f;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x49f;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x49f;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x49f;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x49f;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x49f;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x49f;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x49f;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x49f;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x49f;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x49f;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x49f;" u2="&#x481;" k="41" />
-<hkern u1="&#x49f;" u2="&#x47d;" k="41" />
-<hkern u1="&#x49f;" u2="&#x47b;" k="41" />
-<hkern u1="&#x49f;" u2="&#x479;" k="41" />
-<hkern u1="&#x49f;" u2="&#x473;" k="41" />
-<hkern u1="&#x49f;" u2="&#x454;" k="41" />
-<hkern u1="&#x49f;" u2="&#x451;" k="41" />
-<hkern u1="&#x49f;" u2="&#x450;" k="41" />
-<hkern u1="&#x49f;" u2="&#x447;" k="41" />
-<hkern u1="&#x49f;" u2="&#x444;" k="41" />
-<hkern u1="&#x49f;" u2="&#x441;" k="41" />
-<hkern u1="&#x49f;" u2="&#x43e;" k="41" />
-<hkern u1="&#x49f;" u2="&#x435;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x510;" k="20" />
-<hkern u1="&#x4a0;" u2="&#x50c;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x507;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x505;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x502;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x500;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x4be;" k="102" />
-<hkern u1="&#x4a0;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x4a0;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x480;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x47e;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x47c;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x47a;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x478;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x472;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x470;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x460;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x447;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x427;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x424;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x421;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x41e;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x404;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x511;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x50d;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x503;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x501;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x481;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x47d;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x47b;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x479;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x473;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x454;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x451;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x450;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x447;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x444;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x441;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x43e;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x435;" k="41" />
-<hkern u1="&#x4a2;" u2="&#x507;" k="41" />
-<hkern u1="&#x4a2;" u2="&#x505;" k="41" />
-<hkern u1="&#x4a2;" u2="&#x4e1;" k="-41" />
-<hkern u1="&#x4a2;" u2="&#x408;" k="-225" />
-<hkern u1="&#x4a3;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4a3;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4a3;" u2="&#x27;" k="20" />
-<hkern u1="&#x4a3;" u2="&#x22;" k="20" />
-<hkern u1="&#x4a4;" u2="&#x201e;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x201a;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x2015;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x2014;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x2013;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x513;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x512;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x511;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x50e;" k="-41" />
-<hkern u1="&#x4a4;" u2="&#x50d;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x50c;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x50b;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x509;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x508;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x507;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x505;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x503;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x502;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x501;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x500;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4f9;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4f7;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4f5;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x4ed;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4eb;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4e9;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4e7;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4e5;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4e3;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4df;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4d7;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x4d4;" k="123" />
-<hkern u1="&#x4a4;" u2="&#x4d2;" k="123" />
-<hkern u1="&#x4a4;" u2="&#x4d0;" k="123" />
-<hkern u1="&#x4a4;" u2="&#x4ce;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4cc;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x4ca;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4c8;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4c6;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x4c5;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x4c4;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4bf;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4be;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4bd;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4bb;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4b9;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x4b7;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x4b4;" k="-41" />
-<hkern u1="&#x4a4;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4ac;" k="-41" />
-<hkern u1="&#x4a4;" u2="&#x4ab;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4a9;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4a7;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4a5;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4a3;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4a0;" k="-41" />
-<hkern u1="&#x4a4;" u2="&#x49f;" k="-41" />
-<hkern u1="&#x4a4;" u2="&#x49d;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x49b;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x499;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x497;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x495;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x491;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x48f;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x48d;" k="-41" />
-<hkern u1="&#x4a4;" u2="&#x48b;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x481;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x480;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x47e;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x47d;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x47c;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x47b;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x47a;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x479;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x478;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x473;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x472;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x471;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x46d;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x46b;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x469;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x467;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x466;" k="123" />
-<hkern u1="&#x4a4;" u2="&#x465;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x460;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x45f;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x45d;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x45c;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x45b;" k="-41" />
-<hkern u1="&#x4a4;" u2="&#x45a;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x459;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x455;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x454;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x453;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x452;" k="-41" />
-<hkern u1="&#x4a4;" u2="&#x451;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x450;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x44e;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x44d;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x44c;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x44b;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x449;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x448;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x447;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x446;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x445;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x444;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x441;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x440;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x43f;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x43e;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x43d;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x43c;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x43b;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x43a;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x439;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x438;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x437;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x436;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x435;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x434;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x433;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x432;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x42a;" k="-41" />
-<hkern u1="&#x4a4;" u2="&#x424;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x422;" k="-41" />
-<hkern u1="&#x4a4;" u2="&#x421;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x41e;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x41b;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x414;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x410;" k="123" />
-<hkern u1="&#x4a4;" u2="&#x40b;" k="-41" />
-<hkern u1="&#x4a4;" u2="&#x409;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x404;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x402;" k="-41" />
-<hkern u1="&#x4a4;" u2="&#x2e;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x2d;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x2c;" k="102" />
-<hkern u1="&#x4a5;" u2="&#x201e;" k="102" />
-<hkern u1="&#x4a5;" u2="&#x201a;" k="102" />
-<hkern u1="&#x4a5;" u2="&#x2015;" k="41" />
-<hkern u1="&#x4a5;" u2="&#x2014;" k="41" />
-<hkern u1="&#x4a5;" u2="&#x2013;" k="41" />
-<hkern u1="&#x4a5;" u2="&#x513;" k="61" />
-<hkern u1="&#x4a5;" u2="&#x511;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x50d;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x509;" k="61" />
-<hkern u1="&#x4a5;" u2="&#x503;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x501;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x4eb;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x4e9;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x4e7;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x4d7;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x4c6;" k="61" />
-<hkern u1="&#x4a5;" u2="&#x4ab;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x4a9;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x481;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x47d;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x47b;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x479;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x473;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x467;" k="61" />
-<hkern u1="&#x4a5;" u2="&#x459;" k="61" />
-<hkern u1="&#x4a5;" u2="&#x454;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x451;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x450;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x444;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x441;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x43e;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x43b;" k="61" />
-<hkern u1="&#x4a5;" u2="&#x435;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x434;" k="61" />
-<hkern u1="&#x4a5;" u2="&#x2e;" k="102" />
-<hkern u1="&#x4a5;" u2="&#x2d;" k="41" />
-<hkern u1="&#x4a5;" u2="&#x2c;" k="102" />
-<hkern u1="&#x4a6;" u2="&#x201d;" k="164" />
-<hkern u1="&#x4a6;" u2="&#x2019;" k="164" />
-<hkern u1="&#x4a6;" u2="&#x50f;" k="82" />
-<hkern u1="&#x4a6;" u2="&#x50e;" k="102" />
-<hkern u1="&#x4a6;" u2="&#x507;" k="82" />
-<hkern u1="&#x4a6;" u2="&#x506;" k="184" />
-<hkern u1="&#x4a6;" u2="&#x505;" k="82" />
-<hkern u1="&#x4a6;" u2="&#x504;" k="184" />
-<hkern u1="&#x4a6;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4a6;" u2="&#x4f4;" k="123" />
-<hkern u1="&#x4a6;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4a6;" u2="&#x4cb;" k="123" />
-<hkern u1="&#x4a6;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x4a6;" u2="&#x4be;" k="61" />
-<hkern u1="&#x4a6;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x4a6;" u2="&#x4bc;" k="61" />
-<hkern u1="&#x4a6;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4a6;" u2="&#x4b8;" k="123" />
-<hkern u1="&#x4a6;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4a6;" u2="&#x4b6;" k="123" />
-<hkern u1="&#x4a6;" u2="&#x4b5;" k="82" />
-<hkern u1="&#x4a6;" u2="&#x4b4;" k="102" />
-<hkern u1="&#x4a6;" u2="&#x4b0;" k="102" />
-<hkern u1="&#x4a6;" u2="&#x4ae;" k="102" />
-<hkern u1="&#x4a6;" u2="&#x4ad;" k="82" />
-<hkern u1="&#x4a6;" u2="&#x4ac;" k="184" />
-<hkern u1="&#x4a6;" u2="&#x4a1;" k="82" />
-<hkern u1="&#x4a6;" u2="&#x4a0;" k="102" />
-<hkern u1="&#x4a6;" u2="&#x476;" k="143" />
-<hkern u1="&#x4a6;" u2="&#x474;" k="143" />
-<hkern u1="&#x4a6;" u2="&#x470;" k="123" />
-<hkern u1="&#x4a6;" u2="&#x44a;" k="82" />
-<hkern u1="&#x4a6;" u2="&#x447;" k="41" />
-<hkern u1="&#x4a6;" u2="&#x442;" k="82" />
-<hkern u1="&#x4a6;" u2="&#x42a;" k="102" />
-<hkern u1="&#x4a6;" u2="&#x427;" k="123" />
-<hkern u1="&#x4a6;" u2="&#x422;" k="184" />
-<hkern u1="&#x4a6;" u2="&#x40b;" k="102" />
-<hkern u1="&#x4a6;" u2="&#x408;" k="-102" />
-<hkern u1="&#x4a6;" u2="&#x402;" k="102" />
-<hkern u1="&#x4a6;" u2="&#x27;" k="164" />
-<hkern u1="&#x4a6;" u2="&#x22;" k="164" />
-<hkern u1="&#x4a7;" u2="&#x201d;" k="143" />
-<hkern u1="&#x4a7;" u2="&#x2019;" k="143" />
-<hkern u1="&#x4a7;" u2="&#x50f;" k="102" />
-<hkern u1="&#x4a7;" u2="&#x507;" k="143" />
-<hkern u1="&#x4a7;" u2="&#x505;" k="143" />
-<hkern u1="&#x4a7;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4a7;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4a7;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x4a7;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x4a7;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4a7;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4a7;" u2="&#x4b5;" k="102" />
-<hkern u1="&#x4a7;" u2="&#x4b1;" k="41" />
-<hkern u1="&#x4a7;" u2="&#x4af;" k="41" />
-<hkern u1="&#x4a7;" u2="&#x4ad;" k="102" />
-<hkern u1="&#x4a7;" u2="&#x4a1;" k="102" />
-<hkern u1="&#x4a7;" u2="&#x47f;" k="41" />
-<hkern u1="&#x4a7;" u2="&#x477;" k="41" />
-<hkern u1="&#x4a7;" u2="&#x475;" k="41" />
-<hkern u1="&#x4a7;" u2="&#x461;" k="41" />
-<hkern u1="&#x4a7;" u2="&#x44a;" k="102" />
-<hkern u1="&#x4a7;" u2="&#x447;" k="41" />
-<hkern u1="&#x4a7;" u2="&#x442;" k="102" />
-<hkern u1="&#x4a7;" u2="&#x27;" k="143" />
-<hkern u1="&#x4a7;" u2="&#x22;" k="143" />
-<hkern u1="&#x4a8;" u2="&#x50e;" k="41" />
-<hkern u1="&#x4a8;" u2="&#x506;" k="41" />
-<hkern u1="&#x4a8;" u2="&#x504;" k="41" />
-<hkern u1="&#x4a8;" u2="&#x4b4;" k="41" />
-<hkern u1="&#x4a8;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x4a8;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x4a8;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x4a8;" u2="&#x4a0;" k="41" />
-<hkern u1="&#x4a8;" u2="&#x476;" k="20" />
-<hkern u1="&#x4a8;" u2="&#x474;" k="20" />
-<hkern u1="&#x4a8;" u2="&#x42a;" k="41" />
-<hkern u1="&#x4a8;" u2="&#x422;" k="61" />
-<hkern u1="&#x4a8;" u2="&#x40b;" k="41" />
-<hkern u1="&#x4a8;" u2="&#x402;" k="41" />
-<hkern u1="&#x4a9;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x50f;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x507;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x505;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x4a9;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x4a9;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x4a9;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x4a9;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x4a9;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x497;" k="41" />
-<hkern u1="&#x4a9;" u2="&#x45e;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x44a;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x447;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x445;" k="41" />
-<hkern u1="&#x4a9;" u2="&#x443;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x442;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x436;" k="41" />
-<hkern u1="&#x4a9;" u2="&#x27;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x22;" k="20" />
-<hkern u1="&#x4aa;" u2="&#x50c;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x507;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x505;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x502;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x500;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x4be;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x480;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x47e;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x47c;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x47a;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x478;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x472;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x460;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x447;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x424;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x421;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x41e;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x404;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x201e;" k="123" />
-<hkern u1="&#x4ac;" u2="&#x201a;" k="123" />
-<hkern u1="&#x4ac;" u2="&#x2015;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x2014;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x2013;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x513;" k="123" />
-<hkern u1="&#x4ac;" u2="&#x512;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x511;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x50f;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x50d;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x50c;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x50b;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x509;" k="123" />
-<hkern u1="&#x4ac;" u2="&#x508;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x507;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x505;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x503;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x502;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x501;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x500;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x4f9;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4f7;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4f5;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4f3;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x4f1;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x4ef;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x4ed;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x4eb;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x4e9;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x4e7;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x4e5;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4e3;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4e1;" k="61" />
-<hkern u1="&#x4ac;" u2="&#x4df;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x4d7;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x4ce;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4cc;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4ca;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4c8;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4c6;" k="123" />
-<hkern u1="&#x4ac;" u2="&#x4c5;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4c4;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x4bf;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x4be;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4bd;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4bb;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4b9;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4b7;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4b5;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x4b1;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x4af;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x4ad;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x4ac;" k="-41" />
-<hkern u1="&#x4ac;" u2="&#x4ab;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x4a9;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x4a7;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4a5;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4a3;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4a1;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x49d;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x49b;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x499;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x497;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x495;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x491;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x48f;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x48b;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x481;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x480;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x47f;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x47e;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x47d;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x47c;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x47b;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x47a;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x479;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x478;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x477;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x475;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x473;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x472;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x471;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x46d;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x46b;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x469;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x467;" k="123" />
-<hkern u1="&#x4ac;" u2="&#x466;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x465;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x461;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x460;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x45f;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x45e;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x45d;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x45c;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x45a;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x459;" k="123" />
-<hkern u1="&#x4ac;" u2="&#x455;" k="123" />
-<hkern u1="&#x4ac;" u2="&#x454;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x453;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x451;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x450;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x44f;" k="61" />
-<hkern u1="&#x4ac;" u2="&#x44e;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x44d;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x44c;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x44b;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x44a;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x449;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x448;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x447;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x446;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x445;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x444;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x443;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x442;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x441;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x440;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x43f;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x43e;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x43d;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x43c;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x43b;" k="123" />
-<hkern u1="&#x4ac;" u2="&#x43a;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x439;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x438;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x437;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x436;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x435;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x434;" k="123" />
-<hkern u1="&#x4ac;" u2="&#x433;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x432;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x424;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x422;" k="-41" />
-<hkern u1="&#x4ac;" u2="&#x421;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x41e;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x41b;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x414;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x410;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x409;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x404;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x2e;" k="123" />
-<hkern u1="&#x4ac;" u2="&#x2d;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x2c;" k="123" />
-<hkern u1="&#x4ad;" u2="&#x201e;" k="102" />
-<hkern u1="&#x4ad;" u2="&#x201a;" k="102" />
-<hkern u1="&#x4ad;" u2="&#x2015;" k="41" />
-<hkern u1="&#x4ad;" u2="&#x2014;" k="41" />
-<hkern u1="&#x4ad;" u2="&#x2013;" k="41" />
-<hkern u1="&#x4ad;" u2="&#x513;" k="61" />
-<hkern u1="&#x4ad;" u2="&#x511;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x50d;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x509;" k="61" />
-<hkern u1="&#x4ad;" u2="&#x503;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x501;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x4eb;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x4e9;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x4e7;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x4d7;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x4c6;" k="61" />
-<hkern u1="&#x4ad;" u2="&#x4ab;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x4a9;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x481;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x47d;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x47b;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x479;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x473;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x467;" k="61" />
-<hkern u1="&#x4ad;" u2="&#x459;" k="61" />
-<hkern u1="&#x4ad;" u2="&#x454;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x451;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x450;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x444;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x441;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x43e;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x43b;" k="61" />
-<hkern u1="&#x4ad;" u2="&#x435;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x434;" k="61" />
-<hkern u1="&#x4ad;" u2="&#x2e;" k="102" />
-<hkern u1="&#x4ad;" u2="&#x2d;" k="41" />
-<hkern u1="&#x4ad;" u2="&#x2c;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x201e;" k="123" />
-<hkern u1="&#x4ae;" u2="&#x201a;" k="123" />
-<hkern u1="&#x4ae;" u2="&#x513;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x512;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x511;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x510;" k="20" />
-<hkern u1="&#x4ae;" u2="&#x50d;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x50c;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x50b;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x509;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x508;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x507;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x505;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x503;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x502;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x501;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x500;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x4f9;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x4f7;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x4f5;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x4eb;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x4e9;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x4e7;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x4e5;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x4e3;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x4db;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x4da;" k="20" />
-<hkern u1="&#x4ae;" u2="&#x4d9;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x4d8;" k="20" />
-<hkern u1="&#x4ae;" u2="&#x4d7;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x4d5;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x4d4;" k="123" />
-<hkern u1="&#x4ae;" u2="&#x4d3;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x4d2;" k="123" />
-<hkern u1="&#x4ae;" u2="&#x4d1;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x4d0;" k="123" />
-<hkern u1="&#x4ae;" u2="&#x4ce;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x4cc;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x4ca;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x4c8;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x4c6;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x4c5;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x4c4;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x4bf;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x4bd;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x4bb;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x4b9;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x4b7;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x4ab;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x4a9;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x4a7;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x4a5;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x4a3;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x49f;" k="-41" />
-<hkern u1="&#x4ae;" u2="&#x49d;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x49b;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x495;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x491;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x48f;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x48d;" k="-41" />
-<hkern u1="&#x4ae;" u2="&#x48b;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x481;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x480;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x47e;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x47d;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x47c;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x47b;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x47a;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x479;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x478;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x473;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x472;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x471;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x46d;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x46b;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x469;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x467;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x466;" k="123" />
-<hkern u1="&#x4ae;" u2="&#x465;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x460;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x45f;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x45d;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x45c;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x45b;" k="-41" />
-<hkern u1="&#x4ae;" u2="&#x45a;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x459;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x455;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x454;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x453;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x452;" k="-41" />
-<hkern u1="&#x4ae;" u2="&#x451;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x450;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x44f;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x44e;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x44c;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x44b;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x449;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x448;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x447;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x446;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x444;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x441;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x440;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x43f;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x43e;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x43d;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x43c;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x43b;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x43a;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x439;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x438;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x435;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x434;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x433;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x432;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x430;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x424;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x421;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x41e;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x41b;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x414;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x410;" k="123" />
-<hkern u1="&#x4ae;" u2="&#x409;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x404;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x2e;" k="123" />
-<hkern u1="&#x4ae;" u2="&#x2c;" k="123" />
-<hkern u1="&#x4af;" u2="&#x201e;" k="82" />
-<hkern u1="&#x4af;" u2="&#x201a;" k="82" />
-<hkern u1="&#x4af;" u2="&#x513;" k="20" />
-<hkern u1="&#x4af;" u2="&#x509;" k="20" />
-<hkern u1="&#x4af;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x4af;" u2="&#x467;" k="20" />
-<hkern u1="&#x4af;" u2="&#x459;" k="20" />
-<hkern u1="&#x4af;" u2="&#x43b;" k="20" />
-<hkern u1="&#x4af;" u2="&#x434;" k="20" />
-<hkern u1="&#x4af;" u2="&#x2e;" k="82" />
-<hkern u1="&#x4af;" u2="&#x2c;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x201e;" k="123" />
-<hkern u1="&#x4b0;" u2="&#x201a;" k="123" />
-<hkern u1="&#x4b0;" u2="&#x513;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x512;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x511;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x510;" k="20" />
-<hkern u1="&#x4b0;" u2="&#x50d;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x50c;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x50b;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x509;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x508;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x507;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x505;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x503;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x502;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x501;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x500;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x4f9;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x4f7;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x4f5;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x4eb;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x4e9;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x4e7;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x4e5;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x4e3;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x4db;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x4da;" k="20" />
-<hkern u1="&#x4b0;" u2="&#x4d9;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x4d8;" k="20" />
-<hkern u1="&#x4b0;" u2="&#x4d7;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x4d5;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x4d4;" k="123" />
-<hkern u1="&#x4b0;" u2="&#x4d3;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x4d2;" k="123" />
-<hkern u1="&#x4b0;" u2="&#x4d1;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x4d0;" k="123" />
-<hkern u1="&#x4b0;" u2="&#x4ce;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x4cc;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x4ca;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x4c8;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x4c6;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x4c5;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x4c4;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x4bf;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x4bd;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x4bb;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x4b9;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x4b7;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x4ab;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x4a9;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x4a7;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x4a5;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x4a3;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x49f;" k="-41" />
-<hkern u1="&#x4b0;" u2="&#x49d;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x49b;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x495;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x491;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x48f;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x48d;" k="-41" />
-<hkern u1="&#x4b0;" u2="&#x48b;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x481;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x480;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x47e;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x47d;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x47c;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x47b;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x47a;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x479;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x478;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x473;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x472;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x471;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x46d;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x46b;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x469;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x467;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x466;" k="123" />
-<hkern u1="&#x4b0;" u2="&#x465;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x460;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x45f;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x45d;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x45c;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x45b;" k="-41" />
-<hkern u1="&#x4b0;" u2="&#x45a;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x459;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x455;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x454;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x453;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x452;" k="-41" />
-<hkern u1="&#x4b0;" u2="&#x451;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x450;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x44f;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x44e;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x44c;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x44b;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x449;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x448;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x447;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x446;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x444;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x441;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x440;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x43f;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x43e;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x43d;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x43c;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x43b;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x43a;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x439;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x438;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x435;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x434;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x433;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x432;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x430;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x424;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x421;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x41e;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x41b;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x414;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x410;" k="123" />
-<hkern u1="&#x4b0;" u2="&#x409;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x404;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x2e;" k="123" />
-<hkern u1="&#x4b0;" u2="&#x2c;" k="123" />
-<hkern u1="&#x4b1;" u2="&#x201e;" k="82" />
-<hkern u1="&#x4b1;" u2="&#x201a;" k="82" />
-<hkern u1="&#x4b1;" u2="&#x513;" k="20" />
-<hkern u1="&#x4b1;" u2="&#x509;" k="20" />
-<hkern u1="&#x4b1;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x4b1;" u2="&#x467;" k="20" />
-<hkern u1="&#x4b1;" u2="&#x459;" k="20" />
-<hkern u1="&#x4b1;" u2="&#x43b;" k="20" />
-<hkern u1="&#x4b1;" u2="&#x434;" k="20" />
-<hkern u1="&#x4b1;" u2="&#x2e;" k="82" />
-<hkern u1="&#x4b1;" u2="&#x2c;" k="82" />
-<hkern u1="&#x4b2;" u2="&#x50f;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x50c;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x507;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x505;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x4f5;" k="82" />
-<hkern u1="&#x4b2;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x4cc;" k="82" />
-<hkern u1="&#x4b2;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x4be;" k="61" />
-<hkern u1="&#x4b2;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x4bc;" k="61" />
-<hkern u1="&#x4b2;" u2="&#x4b9;" k="82" />
-<hkern u1="&#x4b2;" u2="&#x4b7;" k="82" />
-<hkern u1="&#x4b2;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x480;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x47e;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x47c;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x47a;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x478;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x472;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x471;" k="20" />
-<hkern u1="&#x4b2;" u2="&#x46f;" k="-61" />
-<hkern u1="&#x4b2;" u2="&#x460;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x44a;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x447;" k="82" />
-<hkern u1="&#x4b2;" u2="&#x442;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x424;" k="61" />
-<hkern u1="&#x4b2;" u2="&#x421;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x41e;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x408;" k="-225" />
-<hkern u1="&#x4b2;" u2="&#x404;" k="41" />
-<hkern u1="&#x4b3;" u2="&#x511;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x50d;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x507;" k="41" />
-<hkern u1="&#x4b3;" u2="&#x505;" k="41" />
-<hkern u1="&#x4b3;" u2="&#x503;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x501;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x4eb;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x4e9;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x4e7;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x4d7;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x4ab;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x4a9;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x481;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x47d;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x47b;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x479;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x473;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x454;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x451;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x450;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x447;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x444;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x441;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x43e;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x435;" k="20" />
-<hkern u1="&#x4b4;" u2="&#x507;" k="41" />
-<hkern u1="&#x4b4;" u2="&#x505;" k="41" />
-<hkern u1="&#x4b4;" u2="&#x4e1;" k="-41" />
-<hkern u1="&#x4b4;" u2="&#x408;" k="-225" />
-<hkern u1="&#x4b5;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4b5;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4b5;" u2="&#x27;" k="20" />
-<hkern u1="&#x4b5;" u2="&#x22;" k="20" />
-<hkern u1="&#x4b6;" u2="&#x507;" k="41" />
-<hkern u1="&#x4b6;" u2="&#x505;" k="41" />
-<hkern u1="&#x4b6;" u2="&#x4e1;" k="-41" />
-<hkern u1="&#x4b6;" u2="&#x408;" k="-225" />
-<hkern u1="&#x4b7;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4b7;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4b7;" u2="&#x27;" k="20" />
-<hkern u1="&#x4b7;" u2="&#x22;" k="20" />
-<hkern u1="&#x4ba;" u2="&#x201d;" k="61" />
-<hkern u1="&#x4ba;" u2="&#x2019;" k="61" />
-<hkern u1="&#x4ba;" u2="&#x50f;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x50e;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x507;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x506;" k="82" />
-<hkern u1="&#x4ba;" u2="&#x505;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x504;" k="82" />
-<hkern u1="&#x4ba;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x4ba;" u2="&#x4f4;" k="82" />
-<hkern u1="&#x4ba;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x4ba;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x4ba;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x4ba;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x4ba;" u2="&#x4cb;" k="82" />
-<hkern u1="&#x4ba;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x4ba;" u2="&#x4b8;" k="82" />
-<hkern u1="&#x4ba;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x4ba;" u2="&#x4b6;" k="82" />
-<hkern u1="&#x4ba;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x4b4;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x4b0;" k="102" />
-<hkern u1="&#x4ba;" u2="&#x4ae;" k="102" />
-<hkern u1="&#x4ba;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x4ac;" k="123" />
-<hkern u1="&#x4ba;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x4a0;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x476;" k="61" />
-<hkern u1="&#x4ba;" u2="&#x474;" k="61" />
-<hkern u1="&#x4ba;" u2="&#x470;" k="82" />
-<hkern u1="&#x4ba;" u2="&#x45e;" k="20" />
-<hkern u1="&#x4ba;" u2="&#x44a;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x447;" k="20" />
-<hkern u1="&#x4ba;" u2="&#x443;" k="20" />
-<hkern u1="&#x4ba;" u2="&#x442;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x42a;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x427;" k="82" />
-<hkern u1="&#x4ba;" u2="&#x422;" k="123" />
-<hkern u1="&#x4ba;" u2="&#x40b;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x402;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x27;" k="61" />
-<hkern u1="&#x4ba;" u2="&#x22;" k="61" />
-<hkern u1="&#x4bb;" u2="&#x201d;" k="102" />
-<hkern u1="&#x4bb;" u2="&#x2019;" k="102" />
-<hkern u1="&#x4bb;" u2="&#x50f;" k="41" />
-<hkern u1="&#x4bb;" u2="&#x507;" k="82" />
-<hkern u1="&#x4bb;" u2="&#x505;" k="82" />
-<hkern u1="&#x4bb;" u2="&#x4f3;" k="41" />
-<hkern u1="&#x4bb;" u2="&#x4f1;" k="41" />
-<hkern u1="&#x4bb;" u2="&#x4ef;" k="41" />
-<hkern u1="&#x4bb;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x4bb;" u2="&#x4b1;" k="41" />
-<hkern u1="&#x4bb;" u2="&#x4af;" k="41" />
-<hkern u1="&#x4bb;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x4bb;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x4bb;" u2="&#x45e;" k="41" />
-<hkern u1="&#x4bb;" u2="&#x44a;" k="41" />
-<hkern u1="&#x4bb;" u2="&#x443;" k="41" />
-<hkern u1="&#x4bb;" u2="&#x442;" k="41" />
-<hkern u1="&#x4bb;" u2="&#x27;" k="102" />
-<hkern u1="&#x4bb;" u2="&#x22;" k="102" />
-<hkern u1="&#x4bc;" u2="&#x506;" k="20" />
-<hkern u1="&#x4bc;" u2="&#x504;" k="20" />
-<hkern u1="&#x4bc;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x4bc;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x4bc;" u2="&#x4ac;" k="41" />
-<hkern u1="&#x4bc;" u2="&#x476;" k="20" />
-<hkern u1="&#x4bc;" u2="&#x474;" k="20" />
-<hkern u1="&#x4bc;" u2="&#x422;" k="41" />
-<hkern u1="&#x4bd;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4bd;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4bd;" u2="&#x27;" k="20" />
-<hkern u1="&#x4bd;" u2="&#x22;" k="20" />
-<hkern u1="&#x4be;" u2="&#x506;" k="20" />
-<hkern u1="&#x4be;" u2="&#x504;" k="20" />
-<hkern u1="&#x4be;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x4be;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x4be;" u2="&#x4ac;" k="41" />
-<hkern u1="&#x4be;" u2="&#x476;" k="20" />
-<hkern u1="&#x4be;" u2="&#x474;" k="20" />
-<hkern u1="&#x4be;" u2="&#x422;" k="41" />
-<hkern u1="&#x4bf;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4bf;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4bf;" u2="&#x27;" k="20" />
-<hkern u1="&#x4bf;" u2="&#x22;" k="20" />
-<hkern u1="&#x4c1;" u2="&#x510;" k="20" />
-<hkern u1="&#x4c1;" u2="&#x50c;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x507;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x505;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x502;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x500;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x4be;" k="102" />
-<hkern u1="&#x4c1;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x4c1;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x480;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x47e;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x47c;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x47a;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x478;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x472;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x470;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x460;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x447;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x427;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x424;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x421;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x41e;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x404;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x511;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x50d;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x503;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x501;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x481;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x47d;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x47b;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x479;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x473;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x454;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x451;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x450;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x447;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x444;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x441;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x43e;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x435;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x201d;" k="61" />
-<hkern u1="&#x4c3;" u2="&#x2019;" k="61" />
-<hkern u1="&#x4c3;" u2="&#x50f;" k="61" />
-<hkern u1="&#x4c3;" u2="&#x507;" k="61" />
-<hkern u1="&#x4c3;" u2="&#x506;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x505;" k="61" />
-<hkern u1="&#x4c3;" u2="&#x504;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x4f4;" k="82" />
-<hkern u1="&#x4c3;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x4cb;" k="82" />
-<hkern u1="&#x4c3;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x4be;" k="61" />
-<hkern u1="&#x4c3;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x4bc;" k="61" />
-<hkern u1="&#x4c3;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x4b8;" k="82" />
-<hkern u1="&#x4c3;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x4b6;" k="82" />
-<hkern u1="&#x4c3;" u2="&#x4b5;" k="61" />
-<hkern u1="&#x4c3;" u2="&#x4b1;" k="20" />
-<hkern u1="&#x4c3;" u2="&#x4b0;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x4af;" k="20" />
-<hkern u1="&#x4c3;" u2="&#x4ae;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x4ad;" k="61" />
-<hkern u1="&#x4c3;" u2="&#x4ac;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x4a1;" k="61" />
-<hkern u1="&#x4c3;" u2="&#x47f;" k="20" />
-<hkern u1="&#x4c3;" u2="&#x477;" k="20" />
-<hkern u1="&#x4c3;" u2="&#x476;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x475;" k="20" />
-<hkern u1="&#x4c3;" u2="&#x474;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x470;" k="82" />
-<hkern u1="&#x4c3;" u2="&#x461;" k="20" />
-<hkern u1="&#x4c3;" u2="&#x44a;" k="61" />
-<hkern u1="&#x4c3;" u2="&#x447;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x442;" k="61" />
-<hkern u1="&#x4c3;" u2="&#x427;" k="82" />
-<hkern u1="&#x4c3;" u2="&#x424;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x422;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x408;" k="-102" />
-<hkern u1="&#x4c3;" u2="&#x27;" k="61" />
-<hkern u1="&#x4c3;" u2="&#x22;" k="61" />
-<hkern u1="&#x4c4;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4c4;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4c4;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4c4;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4c4;" u2="&#x447;" k="41" />
-<hkern u1="&#x4c5;" u2="&#x507;" k="41" />
-<hkern u1="&#x4c5;" u2="&#x505;" k="41" />
-<hkern u1="&#x4c5;" u2="&#x4e1;" k="-41" />
-<hkern u1="&#x4c5;" u2="&#x408;" k="-225" />
-<hkern u1="&#x4c6;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4c6;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4c6;" u2="&#x27;" k="20" />
-<hkern u1="&#x4c6;" u2="&#x22;" k="20" />
-<hkern u1="&#x4c9;" u2="&#x507;" k="41" />
-<hkern u1="&#x4c9;" u2="&#x505;" k="41" />
-<hkern u1="&#x4c9;" u2="&#x4e1;" k="-41" />
-<hkern u1="&#x4c9;" u2="&#x408;" k="-225" />
-<hkern u1="&#x4ca;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4ca;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4ca;" u2="&#x27;" k="20" />
-<hkern u1="&#x4ca;" u2="&#x22;" k="20" />
-<hkern u1="&#x4cd;" u2="&#x507;" k="41" />
-<hkern u1="&#x4cd;" u2="&#x505;" k="41" />
-<hkern u1="&#x4cd;" u2="&#x4e1;" k="-41" />
-<hkern u1="&#x4cd;" u2="&#x408;" k="-225" />
-<hkern u1="&#x4ce;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4ce;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4ce;" u2="&#x27;" k="20" />
-<hkern u1="&#x4ce;" u2="&#x22;" k="20" />
-<hkern u1="&#x4d0;" u2="&#x201d;" k="143" />
-<hkern u1="&#x4d0;" u2="&#x2019;" k="143" />
-<hkern u1="&#x4d0;" u2="&#x50f;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x50e;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x507;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x506;" k="143" />
-<hkern u1="&#x4d0;" u2="&#x505;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x504;" k="143" />
-<hkern u1="&#x4d0;" u2="&#x4fa;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x4f4;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x4da;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x4d8;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x4cb;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x4be;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x4b8;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x4b6;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x4b4;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x4b0;" k="123" />
-<hkern u1="&#x4d0;" u2="&#x4ae;" k="123" />
-<hkern u1="&#x4d0;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x4ac;" k="143" />
-<hkern u1="&#x4d0;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x4a0;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x49e;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x492;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x48c;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x476;" k="82" />
-<hkern u1="&#x4d0;" u2="&#x474;" k="82" />
-<hkern u1="&#x4d0;" u2="&#x470;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x462;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x44a;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x447;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x442;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x42a;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x427;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x424;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x422;" k="143" />
-<hkern u1="&#x4d0;" u2="&#x40b;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x402;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x27;" k="143" />
-<hkern u1="&#x4d0;" u2="&#x22;" k="143" />
-<hkern u1="&#x4d1;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4d1;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4d1;" u2="&#x27;" k="20" />
-<hkern u1="&#x4d1;" u2="&#x22;" k="20" />
-<hkern u1="&#x4d2;" u2="&#x201d;" k="143" />
-<hkern u1="&#x4d2;" u2="&#x2019;" k="143" />
-<hkern u1="&#x4d2;" u2="&#x50f;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x50e;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x507;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x506;" k="143" />
-<hkern u1="&#x4d2;" u2="&#x505;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x504;" k="143" />
-<hkern u1="&#x4d2;" u2="&#x4fa;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x4f4;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x4da;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x4d8;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x4cb;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x4be;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x4b8;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x4b6;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x4b4;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x4b0;" k="123" />
-<hkern u1="&#x4d2;" u2="&#x4ae;" k="123" />
-<hkern u1="&#x4d2;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x4ac;" k="143" />
-<hkern u1="&#x4d2;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x4a0;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x49e;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x492;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x48c;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x476;" k="82" />
-<hkern u1="&#x4d2;" u2="&#x474;" k="82" />
-<hkern u1="&#x4d2;" u2="&#x470;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x462;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x44a;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x447;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x442;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x42a;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x427;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x424;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x422;" k="143" />
-<hkern u1="&#x4d2;" u2="&#x40b;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x402;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x27;" k="143" />
-<hkern u1="&#x4d2;" u2="&#x22;" k="143" />
-<hkern u1="&#x4d3;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4d3;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4d3;" u2="&#x27;" k="20" />
-<hkern u1="&#x4d3;" u2="&#x22;" k="20" />
-<hkern u1="&#x4d5;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4d5;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4d5;" u2="&#x27;" k="20" />
-<hkern u1="&#x4d5;" u2="&#x22;" k="20" />
-<hkern u1="&#x4d7;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4d7;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4d7;" u2="&#x27;" k="20" />
-<hkern u1="&#x4d7;" u2="&#x22;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x201e;" k="82" />
-<hkern u1="&#x4d8;" u2="&#x201a;" k="82" />
-<hkern u1="&#x4d8;" u2="&#x513;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x512;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x50e;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x509;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x508;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x506;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x504;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x4de;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x4d8;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x498;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x496;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x476;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x474;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x470;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x46e;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x467;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x466;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x459;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x43b;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x434;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x42d;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x42a;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x427;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x425;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x423;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x422;" k="61" />
-<hkern u1="&#x4d8;" u2="&#x41b;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x417;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x416;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x414;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x410;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x40e;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x40b;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x409;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x402;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x2e;" k="82" />
-<hkern u1="&#x4d8;" u2="&#x2c;" k="82" />
-<hkern u1="&#x4d9;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x50f;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x507;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x505;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x4d9;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x4d9;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x4d9;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x4d9;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x4d9;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x497;" k="41" />
-<hkern u1="&#x4d9;" u2="&#x45e;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x44a;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x447;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x445;" k="41" />
-<hkern u1="&#x4d9;" u2="&#x443;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x442;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x436;" k="41" />
-<hkern u1="&#x4d9;" u2="&#x27;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x22;" k="20" />
-<hkern u1="&#x4da;" u2="&#x201e;" k="82" />
-<hkern u1="&#x4da;" u2="&#x201a;" k="82" />
-<hkern u1="&#x4da;" u2="&#x513;" k="20" />
-<hkern u1="&#x4da;" u2="&#x512;" k="41" />
-<hkern u1="&#x4da;" u2="&#x50e;" k="20" />
-<hkern u1="&#x4da;" u2="&#x509;" k="20" />
-<hkern u1="&#x4da;" u2="&#x508;" k="41" />
-<hkern u1="&#x4da;" u2="&#x506;" k="41" />
-<hkern u1="&#x4da;" u2="&#x504;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x4da;" u2="&#x4de;" k="20" />
-<hkern u1="&#x4da;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x4da;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x4da;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x4da;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x4da;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x4da;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x4da;" u2="&#x498;" k="20" />
-<hkern u1="&#x4da;" u2="&#x496;" k="41" />
-<hkern u1="&#x4da;" u2="&#x476;" k="20" />
-<hkern u1="&#x4da;" u2="&#x474;" k="20" />
-<hkern u1="&#x4da;" u2="&#x470;" k="41" />
-<hkern u1="&#x4da;" u2="&#x46e;" k="20" />
-<hkern u1="&#x4da;" u2="&#x467;" k="20" />
-<hkern u1="&#x4da;" u2="&#x466;" k="41" />
-<hkern u1="&#x4da;" u2="&#x459;" k="20" />
-<hkern u1="&#x4da;" u2="&#x43b;" k="20" />
-<hkern u1="&#x4da;" u2="&#x434;" k="20" />
-<hkern u1="&#x4da;" u2="&#x42d;" k="20" />
-<hkern u1="&#x4da;" u2="&#x42a;" k="20" />
-<hkern u1="&#x4da;" u2="&#x427;" k="41" />
-<hkern u1="&#x4da;" u2="&#x425;" k="41" />
-<hkern u1="&#x4da;" u2="&#x423;" k="41" />
-<hkern u1="&#x4da;" u2="&#x422;" k="61" />
-<hkern u1="&#x4da;" u2="&#x41b;" k="41" />
-<hkern u1="&#x4da;" u2="&#x417;" k="20" />
-<hkern u1="&#x4da;" u2="&#x416;" k="41" />
-<hkern u1="&#x4da;" u2="&#x414;" k="41" />
-<hkern u1="&#x4da;" u2="&#x410;" k="41" />
-<hkern u1="&#x4da;" u2="&#x40e;" k="41" />
-<hkern u1="&#x4da;" u2="&#x40b;" k="20" />
-<hkern u1="&#x4da;" u2="&#x409;" k="41" />
-<hkern u1="&#x4da;" u2="&#x402;" k="20" />
-<hkern u1="&#x4da;" u2="&#x2e;" k="82" />
-<hkern u1="&#x4da;" u2="&#x2c;" k="82" />
-<hkern u1="&#x4db;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4db;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4db;" u2="&#x50f;" k="20" />
-<hkern u1="&#x4db;" u2="&#x507;" k="20" />
-<hkern u1="&#x4db;" u2="&#x505;" k="20" />
-<hkern u1="&#x4db;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x4db;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x4db;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x4db;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x4db;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x4db;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x4db;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x4db;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x4db;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x4db;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x4db;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x4db;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x4db;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x4db;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x4db;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x4db;" u2="&#x497;" k="41" />
-<hkern u1="&#x4db;" u2="&#x45e;" k="20" />
-<hkern u1="&#x4db;" u2="&#x44a;" k="20" />
-<hkern u1="&#x4db;" u2="&#x447;" k="20" />
-<hkern u1="&#x4db;" u2="&#x445;" k="41" />
-<hkern u1="&#x4db;" u2="&#x443;" k="20" />
-<hkern u1="&#x4db;" u2="&#x442;" k="20" />
-<hkern u1="&#x4db;" u2="&#x436;" k="41" />
-<hkern u1="&#x4db;" u2="&#x27;" k="20" />
-<hkern u1="&#x4db;" u2="&#x22;" k="20" />
-<hkern u1="&#x4dc;" u2="&#x510;" k="20" />
-<hkern u1="&#x4dc;" u2="&#x50c;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x507;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x505;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x502;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x500;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x4be;" k="102" />
-<hkern u1="&#x4dc;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x4dc;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x480;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x47e;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x47c;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x47a;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x478;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x472;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x470;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x460;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x447;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x427;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x424;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x421;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x41e;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x404;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x511;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x50d;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x503;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x501;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x481;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x47d;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x47b;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x479;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x473;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x454;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x451;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x450;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x447;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x444;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x441;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x43e;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x435;" k="41" />
-<hkern u1="&#x4de;" u2="&#x201e;" k="82" />
-<hkern u1="&#x4de;" u2="&#x201a;" k="82" />
-<hkern u1="&#x4de;" u2="&#x506;" k="41" />
-<hkern u1="&#x4de;" u2="&#x504;" k="41" />
-<hkern u1="&#x4de;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x4de;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x4de;" u2="&#x476;" k="20" />
-<hkern u1="&#x4de;" u2="&#x474;" k="20" />
-<hkern u1="&#x4de;" u2="&#x2e;" k="82" />
-<hkern u1="&#x4de;" u2="&#x2c;" k="82" />
-<hkern u1="&#x4df;" u2="&#x44f;" k="-41" />
-<hkern u1="&#x4e0;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4e0;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4e0;" u2="&#x507;" k="41" />
-<hkern u1="&#x4e0;" u2="&#x505;" k="41" />
-<hkern u1="&#x4e0;" u2="&#x27;" k="20" />
-<hkern u1="&#x4e0;" u2="&#x22;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x201e;" k="82" />
-<hkern u1="&#x4e6;" u2="&#x201a;" k="82" />
-<hkern u1="&#x4e6;" u2="&#x513;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x512;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x50e;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x509;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x508;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x506;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x504;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x4de;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x4e6;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x498;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x496;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x476;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x474;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x470;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x46e;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x467;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x466;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x459;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x43b;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x434;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x42d;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x42a;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x427;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x425;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x423;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x422;" k="61" />
-<hkern u1="&#x4e6;" u2="&#x41b;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x417;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x416;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x414;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x410;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x40e;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x40b;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x409;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x402;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x2e;" k="82" />
-<hkern u1="&#x4e6;" u2="&#x2c;" k="82" />
-<hkern u1="&#x4e7;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x50f;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x507;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x505;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x4e7;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x4e7;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x4e7;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x4e7;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x4e7;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x497;" k="41" />
-<hkern u1="&#x4e7;" u2="&#x45e;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x44a;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x447;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x445;" k="41" />
-<hkern u1="&#x4e7;" u2="&#x443;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x442;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x436;" k="41" />
-<hkern u1="&#x4e7;" u2="&#x27;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x22;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x201e;" k="82" />
-<hkern u1="&#x4e8;" u2="&#x201a;" k="82" />
-<hkern u1="&#x4e8;" u2="&#x513;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x512;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x50e;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x509;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x508;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x506;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x504;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x4de;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x4e8;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x498;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x496;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x476;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x474;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x470;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x46e;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x467;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x466;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x459;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x43b;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x434;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x42d;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x42a;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x427;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x425;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x423;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x422;" k="61" />
-<hkern u1="&#x4e8;" u2="&#x41b;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x417;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x416;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x414;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x410;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x40e;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x40b;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x409;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x402;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x2e;" k="82" />
-<hkern u1="&#x4e8;" u2="&#x2c;" k="82" />
-<hkern u1="&#x4e9;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x50f;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x507;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x505;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x4e9;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x4e9;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x4e9;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x4e9;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x4e9;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x497;" k="41" />
-<hkern u1="&#x4e9;" u2="&#x45e;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x44a;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x447;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x445;" k="41" />
-<hkern u1="&#x4e9;" u2="&#x443;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x442;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x436;" k="41" />
-<hkern u1="&#x4e9;" u2="&#x27;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x22;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x201e;" k="82" />
-<hkern u1="&#x4ea;" u2="&#x201a;" k="82" />
-<hkern u1="&#x4ea;" u2="&#x513;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x512;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x50e;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x509;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x508;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x506;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x504;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x4de;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x4ea;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x498;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x496;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x476;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x474;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x470;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x46e;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x467;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x466;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x459;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x43b;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x434;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x42d;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x42a;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x427;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x425;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x423;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x422;" k="61" />
-<hkern u1="&#x4ea;" u2="&#x41b;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x417;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x416;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x414;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x410;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x40e;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x40b;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x409;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x402;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x2e;" k="82" />
-<hkern u1="&#x4ea;" u2="&#x2c;" k="82" />
-<hkern u1="&#x4eb;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x50f;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x507;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x505;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x4eb;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x4eb;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x4eb;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x4eb;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x4eb;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x497;" k="41" />
-<hkern u1="&#x4eb;" u2="&#x45e;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x44a;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x447;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x445;" k="41" />
-<hkern u1="&#x4eb;" u2="&#x443;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x442;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x436;" k="41" />
-<hkern u1="&#x4eb;" u2="&#x27;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x22;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x201e;" k="82" />
-<hkern u1="&#x4ec;" u2="&#x201a;" k="82" />
-<hkern u1="&#x4ec;" u2="&#x513;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x512;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x50e;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x509;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x508;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x506;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x504;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x4de;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x4ec;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x498;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x496;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x476;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x474;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x470;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x46e;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x467;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x466;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x459;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x43b;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x434;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x42d;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x42a;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x427;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x425;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x423;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x422;" k="61" />
-<hkern u1="&#x4ec;" u2="&#x41b;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x417;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x416;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x414;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x410;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x40e;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x40b;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x409;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x402;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x2e;" k="82" />
-<hkern u1="&#x4ec;" u2="&#x2c;" k="82" />
-<hkern u1="&#x4ed;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x50f;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x507;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x505;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x4ed;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x4ed;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x4ed;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x4ed;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x4ed;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x497;" k="41" />
-<hkern u1="&#x4ed;" u2="&#x45e;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x44a;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x447;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x445;" k="41" />
-<hkern u1="&#x4ed;" u2="&#x443;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x442;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x436;" k="41" />
-<hkern u1="&#x4ed;" u2="&#x27;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x22;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x201e;" k="123" />
-<hkern u1="&#x4ee;" u2="&#x201a;" k="123" />
-<hkern u1="&#x4ee;" u2="&#x513;" k="82" />
-<hkern u1="&#x4ee;" u2="&#x512;" k="102" />
-<hkern u1="&#x4ee;" u2="&#x511;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x50d;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x50c;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x509;" k="82" />
-<hkern u1="&#x4ee;" u2="&#x508;" k="102" />
-<hkern u1="&#x4ee;" u2="&#x503;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x502;" k="143" />
-<hkern u1="&#x4ee;" u2="&#x501;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x500;" k="143" />
-<hkern u1="&#x4ee;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x4ea;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x4e8;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x4e6;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x4ee;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x4ee;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x4ee;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x4c6;" k="82" />
-<hkern u1="&#x4ee;" u2="&#x4c5;" k="102" />
-<hkern u1="&#x4ee;" u2="&#x4bf;" k="61" />
-<hkern u1="&#x4ee;" u2="&#x4be;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x4bd;" k="61" />
-<hkern u1="&#x4ee;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x4aa;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x4a8;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x49f;" k="-102" />
-<hkern u1="&#x4ee;" u2="&#x48d;" k="-102" />
-<hkern u1="&#x4ee;" u2="&#x481;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x480;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x47e;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x47d;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x47c;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x47b;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x47a;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x479;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x478;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x473;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x472;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x467;" k="82" />
-<hkern u1="&#x4ee;" u2="&#x466;" k="143" />
-<hkern u1="&#x4ee;" u2="&#x460;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x45b;" k="-102" />
-<hkern u1="&#x4ee;" u2="&#x459;" k="82" />
-<hkern u1="&#x4ee;" u2="&#x455;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x454;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x452;" k="-102" />
-<hkern u1="&#x4ee;" u2="&#x451;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x450;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x447;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x444;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x441;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x43e;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x43b;" k="82" />
-<hkern u1="&#x4ee;" u2="&#x435;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x434;" k="82" />
-<hkern u1="&#x4ee;" u2="&#x42f;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x424;" k="61" />
-<hkern u1="&#x4ee;" u2="&#x421;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x41e;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x41b;" k="102" />
-<hkern u1="&#x4ee;" u2="&#x414;" k="102" />
-<hkern u1="&#x4ee;" u2="&#x410;" k="143" />
-<hkern u1="&#x4ee;" u2="&#x409;" k="102" />
-<hkern u1="&#x4ee;" u2="&#x404;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x2e;" k="123" />
-<hkern u1="&#x4ee;" u2="&#x2c;" k="123" />
-<hkern u1="&#x4ef;" u2="&#x201e;" k="82" />
-<hkern u1="&#x4ef;" u2="&#x201a;" k="82" />
-<hkern u1="&#x4ef;" u2="&#x513;" k="41" />
-<hkern u1="&#x4ef;" u2="&#x509;" k="41" />
-<hkern u1="&#x4ef;" u2="&#x4c6;" k="41" />
-<hkern u1="&#x4ef;" u2="&#x467;" k="41" />
-<hkern u1="&#x4ef;" u2="&#x459;" k="41" />
-<hkern u1="&#x4ef;" u2="&#x43b;" k="41" />
-<hkern u1="&#x4ef;" u2="&#x434;" k="41" />
-<hkern u1="&#x4ef;" u2="&#x2e;" k="82" />
-<hkern u1="&#x4ef;" u2="&#x2c;" k="82" />
-<hkern u1="&#x4f0;" u2="&#x201e;" k="123" />
-<hkern u1="&#x4f0;" u2="&#x201a;" k="123" />
-<hkern u1="&#x4f0;" u2="&#x513;" k="82" />
-<hkern u1="&#x4f0;" u2="&#x512;" k="102" />
-<hkern u1="&#x4f0;" u2="&#x511;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x50d;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x50c;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x509;" k="82" />
-<hkern u1="&#x4f0;" u2="&#x508;" k="102" />
-<hkern u1="&#x4f0;" u2="&#x503;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x502;" k="143" />
-<hkern u1="&#x4f0;" u2="&#x501;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x500;" k="143" />
-<hkern u1="&#x4f0;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x4ea;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x4e8;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x4e6;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x4f0;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x4f0;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x4f0;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x4c6;" k="82" />
-<hkern u1="&#x4f0;" u2="&#x4c5;" k="102" />
-<hkern u1="&#x4f0;" u2="&#x4bf;" k="61" />
-<hkern u1="&#x4f0;" u2="&#x4be;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x4bd;" k="61" />
-<hkern u1="&#x4f0;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x4aa;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x4a8;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x49f;" k="-102" />
-<hkern u1="&#x4f0;" u2="&#x48d;" k="-102" />
-<hkern u1="&#x4f0;" u2="&#x481;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x480;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x47e;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x47d;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x47c;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x47b;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x47a;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x479;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x478;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x473;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x472;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x467;" k="82" />
-<hkern u1="&#x4f0;" u2="&#x466;" k="143" />
-<hkern u1="&#x4f0;" u2="&#x460;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x45b;" k="-102" />
-<hkern u1="&#x4f0;" u2="&#x459;" k="82" />
-<hkern u1="&#x4f0;" u2="&#x455;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x454;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x452;" k="-102" />
-<hkern u1="&#x4f0;" u2="&#x451;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x450;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x447;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x444;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x441;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x43e;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x43b;" k="82" />
-<hkern u1="&#x4f0;" u2="&#x435;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x434;" k="82" />
-<hkern u1="&#x4f0;" u2="&#x42f;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x424;" k="61" />
-<hkern u1="&#x4f0;" u2="&#x421;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x41e;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x41b;" k="102" />
-<hkern u1="&#x4f0;" u2="&#x414;" k="102" />
-<hkern u1="&#x4f0;" u2="&#x410;" k="143" />
-<hkern u1="&#x4f0;" u2="&#x409;" k="102" />
-<hkern u1="&#x4f0;" u2="&#x404;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x2e;" k="123" />
-<hkern u1="&#x4f0;" u2="&#x2c;" k="123" />
-<hkern u1="&#x4f1;" u2="&#x201e;" k="82" />
-<hkern u1="&#x4f1;" u2="&#x201a;" k="82" />
-<hkern u1="&#x4f1;" u2="&#x513;" k="41" />
-<hkern u1="&#x4f1;" u2="&#x509;" k="41" />
-<hkern u1="&#x4f1;" u2="&#x4c6;" k="41" />
-<hkern u1="&#x4f1;" u2="&#x467;" k="41" />
-<hkern u1="&#x4f1;" u2="&#x459;" k="41" />
-<hkern u1="&#x4f1;" u2="&#x43b;" k="41" />
-<hkern u1="&#x4f1;" u2="&#x434;" k="41" />
-<hkern u1="&#x4f1;" u2="&#x2e;" k="82" />
-<hkern u1="&#x4f1;" u2="&#x2c;" k="82" />
-<hkern u1="&#x4f2;" u2="&#x201e;" k="123" />
-<hkern u1="&#x4f2;" u2="&#x201a;" k="123" />
-<hkern u1="&#x4f2;" u2="&#x513;" k="82" />
-<hkern u1="&#x4f2;" u2="&#x512;" k="102" />
-<hkern u1="&#x4f2;" u2="&#x511;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x50d;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x50c;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x509;" k="82" />
-<hkern u1="&#x4f2;" u2="&#x508;" k="102" />
-<hkern u1="&#x4f2;" u2="&#x503;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x502;" k="143" />
-<hkern u1="&#x4f2;" u2="&#x501;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x500;" k="143" />
-<hkern u1="&#x4f2;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x4ea;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x4e8;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x4e6;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x4f2;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x4f2;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x4f2;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x4c6;" k="82" />
-<hkern u1="&#x4f2;" u2="&#x4c5;" k="102" />
-<hkern u1="&#x4f2;" u2="&#x4bf;" k="61" />
-<hkern u1="&#x4f2;" u2="&#x4be;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x4bd;" k="61" />
-<hkern u1="&#x4f2;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x4aa;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x4a8;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x49f;" k="-102" />
-<hkern u1="&#x4f2;" u2="&#x48d;" k="-102" />
-<hkern u1="&#x4f2;" u2="&#x481;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x480;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x47e;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x47d;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x47c;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x47b;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x47a;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x479;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x478;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x473;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x472;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x467;" k="82" />
-<hkern u1="&#x4f2;" u2="&#x466;" k="143" />
-<hkern u1="&#x4f2;" u2="&#x460;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x45b;" k="-102" />
-<hkern u1="&#x4f2;" u2="&#x459;" k="82" />
-<hkern u1="&#x4f2;" u2="&#x455;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x454;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x452;" k="-102" />
-<hkern u1="&#x4f2;" u2="&#x451;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x450;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x447;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x444;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x441;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x43e;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x43b;" k="82" />
-<hkern u1="&#x4f2;" u2="&#x435;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x434;" k="82" />
-<hkern u1="&#x4f2;" u2="&#x42f;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x424;" k="61" />
-<hkern u1="&#x4f2;" u2="&#x421;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x41e;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x41b;" k="102" />
-<hkern u1="&#x4f2;" u2="&#x414;" k="102" />
-<hkern u1="&#x4f2;" u2="&#x410;" k="143" />
-<hkern u1="&#x4f2;" u2="&#x409;" k="102" />
-<hkern u1="&#x4f2;" u2="&#x404;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x2e;" k="123" />
-<hkern u1="&#x4f2;" u2="&#x2c;" k="123" />
-<hkern u1="&#x4f3;" u2="&#x201e;" k="82" />
-<hkern u1="&#x4f3;" u2="&#x201a;" k="82" />
-<hkern u1="&#x4f3;" u2="&#x513;" k="41" />
-<hkern u1="&#x4f3;" u2="&#x509;" k="41" />
-<hkern u1="&#x4f3;" u2="&#x4c6;" k="41" />
-<hkern u1="&#x4f3;" u2="&#x467;" k="41" />
-<hkern u1="&#x4f3;" u2="&#x459;" k="41" />
-<hkern u1="&#x4f3;" u2="&#x43b;" k="41" />
-<hkern u1="&#x4f3;" u2="&#x434;" k="41" />
-<hkern u1="&#x4f3;" u2="&#x2e;" k="82" />
-<hkern u1="&#x4f3;" u2="&#x2c;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x201e;" k="123" />
-<hkern u1="&#x4f6;" u2="&#x201a;" k="123" />
-<hkern u1="&#x4f6;" u2="&#x2015;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x2014;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x2013;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x513;" k="123" />
-<hkern u1="&#x4f6;" u2="&#x512;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x511;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x50f;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x50d;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x50c;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x50b;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x509;" k="123" />
-<hkern u1="&#x4f6;" u2="&#x508;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x507;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x505;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x503;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x502;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x501;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x500;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x4f9;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4f7;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4f5;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4f3;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x4f1;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x4ef;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x4ed;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x4eb;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x4e9;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x4e7;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x4e5;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4e3;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4e1;" k="61" />
-<hkern u1="&#x4f6;" u2="&#x4df;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x4d7;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x4ce;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4cc;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4ca;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4c8;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4c6;" k="123" />
-<hkern u1="&#x4f6;" u2="&#x4c5;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4c4;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x4bf;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x4be;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4bd;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4bb;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4b9;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4b7;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4b5;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x4b1;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x4af;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x4ad;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x4ac;" k="-41" />
-<hkern u1="&#x4f6;" u2="&#x4ab;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x4a9;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x4a7;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4a5;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4a3;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4a1;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x49d;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x49b;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x499;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x497;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x495;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x491;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x48f;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x48b;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x481;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x480;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x47f;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x47e;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x47d;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x47c;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x47b;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x47a;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x479;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x478;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x477;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x475;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x473;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x472;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x471;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x46d;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x46b;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x469;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x467;" k="123" />
-<hkern u1="&#x4f6;" u2="&#x466;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x465;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x461;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x460;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x45f;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x45e;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x45d;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x45c;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x45a;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x459;" k="123" />
-<hkern u1="&#x4f6;" u2="&#x455;" k="123" />
-<hkern u1="&#x4f6;" u2="&#x454;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x453;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x451;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x450;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x44f;" k="61" />
-<hkern u1="&#x4f6;" u2="&#x44e;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x44d;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x44c;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x44b;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x44a;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x449;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x448;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x447;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x446;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x445;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x444;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x443;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x442;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x441;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x440;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x43f;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x43e;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x43d;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x43c;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x43b;" k="123" />
-<hkern u1="&#x4f6;" u2="&#x43a;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x439;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x438;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x437;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x436;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x435;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x434;" k="123" />
-<hkern u1="&#x4f6;" u2="&#x433;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x432;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x424;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x422;" k="-41" />
-<hkern u1="&#x4f6;" u2="&#x421;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x41e;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x41b;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x414;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x410;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x409;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x404;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x2e;" k="123" />
-<hkern u1="&#x4f6;" u2="&#x2d;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x2c;" k="123" />
-<hkern u1="&#x4f7;" u2="&#x201e;" k="102" />
-<hkern u1="&#x4f7;" u2="&#x201a;" k="102" />
-<hkern u1="&#x4f7;" u2="&#x2015;" k="41" />
-<hkern u1="&#x4f7;" u2="&#x2014;" k="41" />
-<hkern u1="&#x4f7;" u2="&#x2013;" k="41" />
-<hkern u1="&#x4f7;" u2="&#x513;" k="61" />
-<hkern u1="&#x4f7;" u2="&#x511;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x50d;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x509;" k="61" />
-<hkern u1="&#x4f7;" u2="&#x503;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x501;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x4eb;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x4e9;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x4e7;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x4d7;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x4c6;" k="61" />
-<hkern u1="&#x4f7;" u2="&#x4ab;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x4a9;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x481;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x47d;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x47b;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x479;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x473;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x467;" k="61" />
-<hkern u1="&#x4f7;" u2="&#x459;" k="61" />
-<hkern u1="&#x4f7;" u2="&#x454;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x451;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x450;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x444;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x441;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x43e;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x43b;" k="61" />
-<hkern u1="&#x4f7;" u2="&#x435;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x434;" k="61" />
-<hkern u1="&#x4f7;" u2="&#x2e;" k="102" />
-<hkern u1="&#x4f7;" u2="&#x2d;" k="41" />
-<hkern u1="&#x4f7;" u2="&#x2c;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x201e;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x201a;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x2015;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x2014;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x2013;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x513;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x512;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x511;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x50e;" k="-41" />
-<hkern u1="&#x4fa;" u2="&#x50d;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x50c;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x50b;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x509;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x508;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x507;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x505;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x503;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x502;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x501;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x500;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4f9;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4f7;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4f5;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x4ed;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4eb;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4e9;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4e7;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4e5;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4e3;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4df;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4d7;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x4d4;" k="123" />
-<hkern u1="&#x4fa;" u2="&#x4d2;" k="123" />
-<hkern u1="&#x4fa;" u2="&#x4d0;" k="123" />
-<hkern u1="&#x4fa;" u2="&#x4ce;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4cc;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x4ca;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4c8;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4c6;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x4c5;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x4c4;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4bf;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4be;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4bd;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4bb;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4b9;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x4b7;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x4b4;" k="-41" />
-<hkern u1="&#x4fa;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4ac;" k="-41" />
-<hkern u1="&#x4fa;" u2="&#x4ab;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4a9;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4a7;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4a5;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4a3;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4a0;" k="-41" />
-<hkern u1="&#x4fa;" u2="&#x49f;" k="-41" />
-<hkern u1="&#x4fa;" u2="&#x49d;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x49b;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x499;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x497;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x495;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x491;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x48f;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x48d;" k="-41" />
-<hkern u1="&#x4fa;" u2="&#x48b;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x481;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x480;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x47e;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x47d;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x47c;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x47b;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x47a;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x479;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x478;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x473;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x472;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x471;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x46d;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x46b;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x469;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x467;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x466;" k="123" />
-<hkern u1="&#x4fa;" u2="&#x465;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x460;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x45f;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x45d;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x45c;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x45b;" k="-41" />
-<hkern u1="&#x4fa;" u2="&#x45a;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x459;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x455;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x454;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x453;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x452;" k="-41" />
-<hkern u1="&#x4fa;" u2="&#x451;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x450;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x44e;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x44d;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x44c;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x44b;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x449;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x448;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x447;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x446;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x445;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x444;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x441;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x440;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x43f;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x43e;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x43d;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x43c;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x43b;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x43a;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x439;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x438;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x437;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x436;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x435;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x434;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x433;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x432;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x42a;" k="-41" />
-<hkern u1="&#x4fa;" u2="&#x424;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x422;" k="-41" />
-<hkern u1="&#x4fa;" u2="&#x421;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x41e;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x41b;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x414;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x410;" k="123" />
-<hkern u1="&#x4fa;" u2="&#x40b;" k="-41" />
-<hkern u1="&#x4fa;" u2="&#x409;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x404;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x402;" k="-41" />
-<hkern u1="&#x4fa;" u2="&#x2e;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x2d;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x2c;" k="102" />
-<hkern u1="&#x4fb;" u2="&#x201e;" k="61" />
-<hkern u1="&#x4fb;" u2="&#x201a;" k="61" />
-<hkern u1="&#x4fb;" u2="&#x513;" k="61" />
-<hkern u1="&#x4fb;" u2="&#x511;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x50d;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x509;" k="61" />
-<hkern u1="&#x4fb;" u2="&#x503;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x501;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x4c6;" k="61" />
-<hkern u1="&#x4fb;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x481;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x47d;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x47b;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x479;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x473;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x467;" k="61" />
-<hkern u1="&#x4fb;" u2="&#x459;" k="61" />
-<hkern u1="&#x4fb;" u2="&#x454;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x451;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x450;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x444;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x441;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x43e;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x43b;" k="61" />
-<hkern u1="&#x4fb;" u2="&#x435;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x434;" k="61" />
-<hkern u1="&#x4fb;" u2="&#x2e;" k="61" />
-<hkern u1="&#x4fb;" u2="&#x2c;" k="61" />
-<hkern u1="&#x4fc;" u2="&#x50f;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x50c;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x507;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x505;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x4f5;" k="82" />
-<hkern u1="&#x4fc;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x4cc;" k="82" />
-<hkern u1="&#x4fc;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x4be;" k="61" />
-<hkern u1="&#x4fc;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x4bc;" k="61" />
-<hkern u1="&#x4fc;" u2="&#x4b9;" k="82" />
-<hkern u1="&#x4fc;" u2="&#x4b7;" k="82" />
-<hkern u1="&#x4fc;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x480;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x47e;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x47c;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x47a;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x478;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x472;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x471;" k="20" />
-<hkern u1="&#x4fc;" u2="&#x46f;" k="-61" />
-<hkern u1="&#x4fc;" u2="&#x460;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x44a;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x447;" k="82" />
-<hkern u1="&#x4fc;" u2="&#x442;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x424;" k="61" />
-<hkern u1="&#x4fc;" u2="&#x421;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x41e;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x408;" k="-225" />
-<hkern u1="&#x4fc;" u2="&#x404;" k="41" />
-<hkern u1="&#x4fd;" u2="&#x511;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x50d;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x507;" k="41" />
-<hkern u1="&#x4fd;" u2="&#x505;" k="41" />
-<hkern u1="&#x4fd;" u2="&#x503;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x501;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x4eb;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x4e9;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x4e7;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x4d7;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x4ab;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x4a9;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x481;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x47d;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x47b;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x479;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x473;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x454;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x451;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x450;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x447;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x444;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x441;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x43e;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x435;" k="20" />
-<hkern u1="&#x4fe;" u2="&#x510;" k="20" />
-<hkern u1="&#x4fe;" u2="&#x50c;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x507;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x505;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x502;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x500;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x4be;" k="102" />
-<hkern u1="&#x4fe;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x4fe;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x480;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x47e;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x47c;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x47a;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x478;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x472;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x470;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x460;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x447;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x427;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x424;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x421;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x41e;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x404;" k="41" />
-<hkern u1="&#x4ff;" u2="&#x511;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x50d;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x507;" k="41" />
-<hkern u1="&#x4ff;" u2="&#x505;" k="41" />
-<hkern u1="&#x4ff;" u2="&#x503;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x501;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x4eb;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x4e9;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x4e7;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x4d7;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x4ab;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x4a9;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x481;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x47d;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x47b;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x479;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x473;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x454;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x451;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x450;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x447;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x444;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x441;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x43e;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x435;" k="20" />
-<hkern u1="&#x502;" u2="&#x201d;" k="102" />
-<hkern u1="&#x502;" u2="&#x2019;" k="102" />
-<hkern u1="&#x502;" u2="&#x50f;" k="61" />
-<hkern u1="&#x502;" u2="&#x50e;" k="82" />
-<hkern u1="&#x502;" u2="&#x507;" k="41" />
-<hkern u1="&#x502;" u2="&#x506;" k="41" />
-<hkern u1="&#x502;" u2="&#x505;" k="41" />
-<hkern u1="&#x502;" u2="&#x504;" k="41" />
-<hkern u1="&#x502;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x502;" u2="&#x4fe;" k="61" />
-<hkern u1="&#x502;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x502;" u2="&#x4fc;" k="61" />
-<hkern u1="&#x502;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x502;" u2="&#x4f4;" k="61" />
-<hkern u1="&#x502;" u2="&#x4f2;" k="61" />
-<hkern u1="&#x502;" u2="&#x4f0;" k="61" />
-<hkern u1="&#x502;" u2="&#x4ee;" k="61" />
-<hkern u1="&#x502;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x502;" u2="&#x4dc;" k="61" />
-<hkern u1="&#x502;" u2="&#x4d4;" k="61" />
-<hkern u1="&#x502;" u2="&#x4d2;" k="61" />
-<hkern u1="&#x502;" u2="&#x4d0;" k="61" />
-<hkern u1="&#x502;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x502;" u2="&#x4cb;" k="61" />
-<hkern u1="&#x502;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x502;" u2="&#x4c1;" k="61" />
-<hkern u1="&#x502;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x502;" u2="&#x4b8;" k="61" />
-<hkern u1="&#x502;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x502;" u2="&#x4b6;" k="61" />
-<hkern u1="&#x502;" u2="&#x4b5;" k="61" />
-<hkern u1="&#x502;" u2="&#x4b4;" k="82" />
-<hkern u1="&#x502;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x502;" u2="&#x4b2;" k="61" />
-<hkern u1="&#x502;" u2="&#x4b0;" k="61" />
-<hkern u1="&#x502;" u2="&#x4ae;" k="61" />
-<hkern u1="&#x502;" u2="&#x4ad;" k="61" />
-<hkern u1="&#x502;" u2="&#x4ac;" k="143" />
-<hkern u1="&#x502;" u2="&#x4a1;" k="61" />
-<hkern u1="&#x502;" u2="&#x4a0;" k="82" />
-<hkern u1="&#x502;" u2="&#x497;" k="41" />
-<hkern u1="&#x502;" u2="&#x496;" k="61" />
-<hkern u1="&#x502;" u2="&#x476;" k="61" />
-<hkern u1="&#x502;" u2="&#x474;" k="61" />
-<hkern u1="&#x502;" u2="&#x470;" k="61" />
-<hkern u1="&#x502;" u2="&#x46a;" k="41" />
-<hkern u1="&#x502;" u2="&#x466;" k="61" />
-<hkern u1="&#x502;" u2="&#x44a;" k="61" />
-<hkern u1="&#x502;" u2="&#x447;" k="41" />
-<hkern u1="&#x502;" u2="&#x445;" k="41" />
-<hkern u1="&#x502;" u2="&#x442;" k="61" />
-<hkern u1="&#x502;" u2="&#x436;" k="41" />
-<hkern u1="&#x502;" u2="&#x42a;" k="82" />
-<hkern u1="&#x502;" u2="&#x427;" k="61" />
-<hkern u1="&#x502;" u2="&#x425;" k="61" />
-<hkern u1="&#x502;" u2="&#x423;" k="61" />
-<hkern u1="&#x502;" u2="&#x422;" k="143" />
-<hkern u1="&#x502;" u2="&#x416;" k="61" />
-<hkern u1="&#x502;" u2="&#x410;" k="61" />
-<hkern u1="&#x502;" u2="&#x40e;" k="61" />
-<hkern u1="&#x502;" u2="&#x40b;" k="82" />
-<hkern u1="&#x502;" u2="&#x402;" k="82" />
-<hkern u1="&#x502;" u2="&#x27;" k="102" />
-<hkern u1="&#x502;" u2="&#x22;" k="102" />
-<hkern u1="&#x503;" u2="&#x201d;" k="102" />
-<hkern u1="&#x503;" u2="&#x2019;" k="102" />
-<hkern u1="&#x503;" u2="&#x50f;" k="61" />
-<hkern u1="&#x503;" u2="&#x507;" k="102" />
-<hkern u1="&#x503;" u2="&#x505;" k="102" />
-<hkern u1="&#x503;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x503;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x503;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x503;" u2="&#x4f3;" k="41" />
-<hkern u1="&#x503;" u2="&#x4f1;" k="41" />
-<hkern u1="&#x503;" u2="&#x4ef;" k="41" />
-<hkern u1="&#x503;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x503;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x503;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x503;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x503;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x503;" u2="&#x4b5;" k="61" />
-<hkern u1="&#x503;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x503;" u2="&#x4ad;" k="61" />
-<hkern u1="&#x503;" u2="&#x4a1;" k="61" />
-<hkern u1="&#x503;" u2="&#x497;" k="41" />
-<hkern u1="&#x503;" u2="&#x45e;" k="41" />
-<hkern u1="&#x503;" u2="&#x44a;" k="61" />
-<hkern u1="&#x503;" u2="&#x447;" k="41" />
-<hkern u1="&#x503;" u2="&#x445;" k="41" />
-<hkern u1="&#x503;" u2="&#x443;" k="41" />
-<hkern u1="&#x503;" u2="&#x442;" k="61" />
-<hkern u1="&#x503;" u2="&#x436;" k="41" />
-<hkern u1="&#x503;" u2="&#x27;" k="102" />
-<hkern u1="&#x503;" u2="&#x22;" k="102" />
-<hkern u1="&#x504;" u2="&#x201d;" k="102" />
-<hkern u1="&#x504;" u2="&#x2019;" k="102" />
-<hkern u1="&#x504;" u2="&#x50f;" k="61" />
-<hkern u1="&#x504;" u2="&#x50e;" k="82" />
-<hkern u1="&#x504;" u2="&#x507;" k="41" />
-<hkern u1="&#x504;" u2="&#x506;" k="41" />
-<hkern u1="&#x504;" u2="&#x505;" k="41" />
-<hkern u1="&#x504;" u2="&#x504;" k="41" />
-<hkern u1="&#x504;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x504;" u2="&#x4fe;" k="61" />
-<hkern u1="&#x504;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x504;" u2="&#x4fc;" k="61" />
-<hkern u1="&#x504;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x504;" u2="&#x4f4;" k="61" />
-<hkern u1="&#x504;" u2="&#x4f2;" k="61" />
-<hkern u1="&#x504;" u2="&#x4f0;" k="61" />
-<hkern u1="&#x504;" u2="&#x4ee;" k="61" />
-<hkern u1="&#x504;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x504;" u2="&#x4dc;" k="61" />
-<hkern u1="&#x504;" u2="&#x4d4;" k="61" />
-<hkern u1="&#x504;" u2="&#x4d2;" k="61" />
-<hkern u1="&#x504;" u2="&#x4d0;" k="61" />
-<hkern u1="&#x504;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x504;" u2="&#x4cb;" k="61" />
-<hkern u1="&#x504;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x504;" u2="&#x4c1;" k="61" />
-<hkern u1="&#x504;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x504;" u2="&#x4b8;" k="61" />
-<hkern u1="&#x504;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x504;" u2="&#x4b6;" k="61" />
-<hkern u1="&#x504;" u2="&#x4b5;" k="61" />
-<hkern u1="&#x504;" u2="&#x4b4;" k="82" />
-<hkern u1="&#x504;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x504;" u2="&#x4b2;" k="61" />
-<hkern u1="&#x504;" u2="&#x4b0;" k="61" />
-<hkern u1="&#x504;" u2="&#x4ae;" k="61" />
-<hkern u1="&#x504;" u2="&#x4ad;" k="61" />
-<hkern u1="&#x504;" u2="&#x4ac;" k="143" />
-<hkern u1="&#x504;" u2="&#x4a1;" k="61" />
-<hkern u1="&#x504;" u2="&#x4a0;" k="82" />
-<hkern u1="&#x504;" u2="&#x497;" k="41" />
-<hkern u1="&#x504;" u2="&#x496;" k="61" />
-<hkern u1="&#x504;" u2="&#x476;" k="61" />
-<hkern u1="&#x504;" u2="&#x474;" k="61" />
-<hkern u1="&#x504;" u2="&#x470;" k="61" />
-<hkern u1="&#x504;" u2="&#x46a;" k="41" />
-<hkern u1="&#x504;" u2="&#x466;" k="61" />
-<hkern u1="&#x504;" u2="&#x44a;" k="61" />
-<hkern u1="&#x504;" u2="&#x447;" k="41" />
-<hkern u1="&#x504;" u2="&#x445;" k="41" />
-<hkern u1="&#x504;" u2="&#x442;" k="61" />
-<hkern u1="&#x504;" u2="&#x436;" k="41" />
-<hkern u1="&#x504;" u2="&#x42a;" k="82" />
-<hkern u1="&#x504;" u2="&#x427;" k="61" />
-<hkern u1="&#x504;" u2="&#x425;" k="61" />
-<hkern u1="&#x504;" u2="&#x423;" k="61" />
-<hkern u1="&#x504;" u2="&#x422;" k="143" />
-<hkern u1="&#x504;" u2="&#x416;" k="61" />
-<hkern u1="&#x504;" u2="&#x410;" k="61" />
-<hkern u1="&#x504;" u2="&#x40e;" k="61" />
-<hkern u1="&#x504;" u2="&#x40b;" k="82" />
-<hkern u1="&#x504;" u2="&#x402;" k="82" />
-<hkern u1="&#x504;" u2="&#x27;" k="102" />
-<hkern u1="&#x504;" u2="&#x22;" k="102" />
-<hkern u1="&#x505;" u2="&#x201d;" k="102" />
-<hkern u1="&#x505;" u2="&#x2019;" k="102" />
-<hkern u1="&#x505;" u2="&#x50f;" k="61" />
-<hkern u1="&#x505;" u2="&#x507;" k="102" />
-<hkern u1="&#x505;" u2="&#x505;" k="102" />
-<hkern u1="&#x505;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x505;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x505;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x505;" u2="&#x4f3;" k="41" />
-<hkern u1="&#x505;" u2="&#x4f1;" k="41" />
-<hkern u1="&#x505;" u2="&#x4ef;" k="41" />
-<hkern u1="&#x505;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x505;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x505;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x505;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x505;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x505;" u2="&#x4b5;" k="61" />
-<hkern u1="&#x505;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x505;" u2="&#x4ad;" k="61" />
-<hkern u1="&#x505;" u2="&#x4a1;" k="61" />
-<hkern u1="&#x505;" u2="&#x497;" k="41" />
-<hkern u1="&#x505;" u2="&#x45e;" k="41" />
-<hkern u1="&#x505;" u2="&#x44a;" k="61" />
-<hkern u1="&#x505;" u2="&#x447;" k="41" />
-<hkern u1="&#x505;" u2="&#x445;" k="41" />
-<hkern u1="&#x505;" u2="&#x443;" k="41" />
-<hkern u1="&#x505;" u2="&#x442;" k="61" />
-<hkern u1="&#x505;" u2="&#x436;" k="41" />
-<hkern u1="&#x505;" u2="&#x27;" k="102" />
-<hkern u1="&#x505;" u2="&#x22;" k="102" />
-<hkern u1="&#x506;" u2="&#x507;" k="41" />
-<hkern u1="&#x506;" u2="&#x505;" k="41" />
-<hkern u1="&#x506;" u2="&#x4e1;" k="-41" />
-<hkern u1="&#x506;" u2="&#x408;" k="-225" />
-<hkern u1="&#x507;" u2="&#x201d;" k="20" />
-<hkern u1="&#x507;" u2="&#x2019;" k="20" />
-<hkern u1="&#x507;" u2="&#x27;" k="20" />
-<hkern u1="&#x507;" u2="&#x22;" k="20" />
-<hkern u1="&#x508;" u2="&#x201d;" k="102" />
-<hkern u1="&#x508;" u2="&#x2019;" k="102" />
-<hkern u1="&#x508;" u2="&#x50f;" k="61" />
-<hkern u1="&#x508;" u2="&#x50e;" k="82" />
-<hkern u1="&#x508;" u2="&#x507;" k="41" />
-<hkern u1="&#x508;" u2="&#x506;" k="41" />
-<hkern u1="&#x508;" u2="&#x505;" k="41" />
-<hkern u1="&#x508;" u2="&#x504;" k="41" />
-<hkern u1="&#x508;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x508;" u2="&#x4fe;" k="61" />
-<hkern u1="&#x508;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x508;" u2="&#x4fc;" k="61" />
-<hkern u1="&#x508;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x508;" u2="&#x4f4;" k="61" />
-<hkern u1="&#x508;" u2="&#x4f2;" k="61" />
-<hkern u1="&#x508;" u2="&#x4f0;" k="61" />
-<hkern u1="&#x508;" u2="&#x4ee;" k="61" />
-<hkern u1="&#x508;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x508;" u2="&#x4dc;" k="61" />
-<hkern u1="&#x508;" u2="&#x4d4;" k="61" />
-<hkern u1="&#x508;" u2="&#x4d2;" k="61" />
-<hkern u1="&#x508;" u2="&#x4d0;" k="61" />
-<hkern u1="&#x508;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x508;" u2="&#x4cb;" k="61" />
-<hkern u1="&#x508;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x508;" u2="&#x4c1;" k="61" />
-<hkern u1="&#x508;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x508;" u2="&#x4b8;" k="61" />
-<hkern u1="&#x508;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x508;" u2="&#x4b6;" k="61" />
-<hkern u1="&#x508;" u2="&#x4b5;" k="61" />
-<hkern u1="&#x508;" u2="&#x4b4;" k="82" />
-<hkern u1="&#x508;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x508;" u2="&#x4b2;" k="61" />
-<hkern u1="&#x508;" u2="&#x4b0;" k="61" />
-<hkern u1="&#x508;" u2="&#x4ae;" k="61" />
-<hkern u1="&#x508;" u2="&#x4ad;" k="61" />
-<hkern u1="&#x508;" u2="&#x4ac;" k="143" />
-<hkern u1="&#x508;" u2="&#x4a1;" k="61" />
-<hkern u1="&#x508;" u2="&#x4a0;" k="82" />
-<hkern u1="&#x508;" u2="&#x497;" k="41" />
-<hkern u1="&#x508;" u2="&#x496;" k="61" />
-<hkern u1="&#x508;" u2="&#x476;" k="61" />
-<hkern u1="&#x508;" u2="&#x474;" k="61" />
-<hkern u1="&#x508;" u2="&#x470;" k="61" />
-<hkern u1="&#x508;" u2="&#x46a;" k="41" />
-<hkern u1="&#x508;" u2="&#x466;" k="61" />
-<hkern u1="&#x508;" u2="&#x44a;" k="61" />
-<hkern u1="&#x508;" u2="&#x447;" k="41" />
-<hkern u1="&#x508;" u2="&#x445;" k="41" />
-<hkern u1="&#x508;" u2="&#x442;" k="61" />
-<hkern u1="&#x508;" u2="&#x436;" k="41" />
-<hkern u1="&#x508;" u2="&#x42a;" k="82" />
-<hkern u1="&#x508;" u2="&#x427;" k="61" />
-<hkern u1="&#x508;" u2="&#x425;" k="61" />
-<hkern u1="&#x508;" u2="&#x423;" k="61" />
-<hkern u1="&#x508;" u2="&#x422;" k="143" />
-<hkern u1="&#x508;" u2="&#x416;" k="61" />
-<hkern u1="&#x508;" u2="&#x410;" k="61" />
-<hkern u1="&#x508;" u2="&#x40e;" k="61" />
-<hkern u1="&#x508;" u2="&#x40b;" k="82" />
-<hkern u1="&#x508;" u2="&#x402;" k="82" />
-<hkern u1="&#x508;" u2="&#x27;" k="102" />
-<hkern u1="&#x508;" u2="&#x22;" k="102" />
-<hkern u1="&#x509;" u2="&#x201d;" k="102" />
-<hkern u1="&#x509;" u2="&#x2019;" k="102" />
-<hkern u1="&#x509;" u2="&#x50f;" k="61" />
-<hkern u1="&#x509;" u2="&#x507;" k="102" />
-<hkern u1="&#x509;" u2="&#x505;" k="102" />
-<hkern u1="&#x509;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x509;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x509;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x509;" u2="&#x4f3;" k="41" />
-<hkern u1="&#x509;" u2="&#x4f1;" k="41" />
-<hkern u1="&#x509;" u2="&#x4ef;" k="41" />
-<hkern u1="&#x509;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x509;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x509;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x509;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x509;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x509;" u2="&#x4b5;" k="61" />
-<hkern u1="&#x509;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x509;" u2="&#x4ad;" k="61" />
-<hkern u1="&#x509;" u2="&#x4a1;" k="61" />
-<hkern u1="&#x509;" u2="&#x497;" k="41" />
-<hkern u1="&#x509;" u2="&#x45e;" k="41" />
-<hkern u1="&#x509;" u2="&#x44a;" k="61" />
-<hkern u1="&#x509;" u2="&#x447;" k="41" />
-<hkern u1="&#x509;" u2="&#x445;" k="41" />
-<hkern u1="&#x509;" u2="&#x443;" k="41" />
-<hkern u1="&#x509;" u2="&#x442;" k="61" />
-<hkern u1="&#x509;" u2="&#x436;" k="41" />
-<hkern u1="&#x509;" u2="&#x27;" k="102" />
-<hkern u1="&#x509;" u2="&#x22;" k="102" />
-<hkern u1="&#x50a;" u2="&#x201d;" k="102" />
-<hkern u1="&#x50a;" u2="&#x2019;" k="102" />
-<hkern u1="&#x50a;" u2="&#x50f;" k="61" />
-<hkern u1="&#x50a;" u2="&#x50e;" k="82" />
-<hkern u1="&#x50a;" u2="&#x507;" k="41" />
-<hkern u1="&#x50a;" u2="&#x506;" k="41" />
-<hkern u1="&#x50a;" u2="&#x505;" k="41" />
-<hkern u1="&#x50a;" u2="&#x504;" k="41" />
-<hkern u1="&#x50a;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x50a;" u2="&#x4fe;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x50a;" u2="&#x4fc;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x50a;" u2="&#x4f4;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4f2;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4f0;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4ee;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x50a;" u2="&#x4dc;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4d4;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4d2;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4d0;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x50a;" u2="&#x4cb;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x50a;" u2="&#x4c1;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x50a;" u2="&#x4b8;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x50a;" u2="&#x4b6;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4b5;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4b4;" k="82" />
-<hkern u1="&#x50a;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x50a;" u2="&#x4b2;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4b0;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4ae;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4ad;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4ac;" k="143" />
-<hkern u1="&#x50a;" u2="&#x4a1;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4a0;" k="82" />
-<hkern u1="&#x50a;" u2="&#x497;" k="41" />
-<hkern u1="&#x50a;" u2="&#x496;" k="61" />
-<hkern u1="&#x50a;" u2="&#x476;" k="61" />
-<hkern u1="&#x50a;" u2="&#x474;" k="61" />
-<hkern u1="&#x50a;" u2="&#x470;" k="61" />
-<hkern u1="&#x50a;" u2="&#x46a;" k="41" />
-<hkern u1="&#x50a;" u2="&#x466;" k="61" />
-<hkern u1="&#x50a;" u2="&#x44a;" k="61" />
-<hkern u1="&#x50a;" u2="&#x447;" k="41" />
-<hkern u1="&#x50a;" u2="&#x445;" k="41" />
-<hkern u1="&#x50a;" u2="&#x442;" k="61" />
-<hkern u1="&#x50a;" u2="&#x436;" k="41" />
-<hkern u1="&#x50a;" u2="&#x42a;" k="82" />
-<hkern u1="&#x50a;" u2="&#x427;" k="61" />
-<hkern u1="&#x50a;" u2="&#x425;" k="61" />
-<hkern u1="&#x50a;" u2="&#x423;" k="61" />
-<hkern u1="&#x50a;" u2="&#x422;" k="143" />
-<hkern u1="&#x50a;" u2="&#x416;" k="61" />
-<hkern u1="&#x50a;" u2="&#x410;" k="61" />
-<hkern u1="&#x50a;" u2="&#x40e;" k="61" />
-<hkern u1="&#x50a;" u2="&#x40b;" k="82" />
-<hkern u1="&#x50a;" u2="&#x402;" k="82" />
-<hkern u1="&#x50a;" u2="&#x27;" k="102" />
-<hkern u1="&#x50a;" u2="&#x22;" k="102" />
-<hkern u1="&#x50b;" u2="&#x201d;" k="102" />
-<hkern u1="&#x50b;" u2="&#x2019;" k="102" />
-<hkern u1="&#x50b;" u2="&#x50f;" k="61" />
-<hkern u1="&#x50b;" u2="&#x507;" k="102" />
-<hkern u1="&#x50b;" u2="&#x505;" k="102" />
-<hkern u1="&#x50b;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x50b;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x50b;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x50b;" u2="&#x4f3;" k="41" />
-<hkern u1="&#x50b;" u2="&#x4f1;" k="41" />
-<hkern u1="&#x50b;" u2="&#x4ef;" k="41" />
-<hkern u1="&#x50b;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x50b;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x50b;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x50b;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x50b;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x50b;" u2="&#x4b5;" k="61" />
-<hkern u1="&#x50b;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x50b;" u2="&#x4ad;" k="61" />
-<hkern u1="&#x50b;" u2="&#x4a1;" k="61" />
-<hkern u1="&#x50b;" u2="&#x497;" k="41" />
-<hkern u1="&#x50b;" u2="&#x45e;" k="41" />
-<hkern u1="&#x50b;" u2="&#x44a;" k="61" />
-<hkern u1="&#x50b;" u2="&#x447;" k="41" />
-<hkern u1="&#x50b;" u2="&#x445;" k="41" />
-<hkern u1="&#x50b;" u2="&#x443;" k="41" />
-<hkern u1="&#x50b;" u2="&#x442;" k="61" />
-<hkern u1="&#x50b;" u2="&#x436;" k="41" />
-<hkern u1="&#x50b;" u2="&#x27;" k="102" />
-<hkern u1="&#x50b;" u2="&#x22;" k="102" />
-<hkern u1="&#x50c;" u2="&#x201e;" k="82" />
-<hkern u1="&#x50c;" u2="&#x201a;" k="82" />
-<hkern u1="&#x50c;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x50c;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x50c;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x50c;" u2="&#x4d4;" k="20" />
-<hkern u1="&#x50c;" u2="&#x4d2;" k="20" />
-<hkern u1="&#x50c;" u2="&#x4d0;" k="20" />
-<hkern u1="&#x50c;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x50c;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x50c;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x50c;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x50c;" u2="&#x4ac;" k="41" />
-<hkern u1="&#x50c;" u2="&#x496;" k="41" />
-<hkern u1="&#x50c;" u2="&#x476;" k="20" />
-<hkern u1="&#x50c;" u2="&#x474;" k="20" />
-<hkern u1="&#x50c;" u2="&#x466;" k="20" />
-<hkern u1="&#x50c;" u2="&#x425;" k="41" />
-<hkern u1="&#x50c;" u2="&#x422;" k="41" />
-<hkern u1="&#x50c;" u2="&#x416;" k="41" />
-<hkern u1="&#x50c;" u2="&#x410;" k="20" />
-<hkern u1="&#x50c;" u2="&#x2e;" k="82" />
-<hkern u1="&#x50c;" u2="&#x2c;" k="82" />
-<hkern u1="&#x50d;" u2="&#x201d;" k="41" />
-<hkern u1="&#x50d;" u2="&#x2019;" k="41" />
-<hkern u1="&#x50d;" u2="&#x507;" k="41" />
-<hkern u1="&#x50d;" u2="&#x505;" k="41" />
-<hkern u1="&#x50d;" u2="&#x4ff;" k="20" />
-<hkern u1="&#x50d;" u2="&#x4fd;" k="20" />
-<hkern u1="&#x50d;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x50d;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x50d;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x50d;" u2="&#x4dd;" k="20" />
-<hkern u1="&#x50d;" u2="&#x4c2;" k="20" />
-<hkern u1="&#x50d;" u2="&#x4b3;" k="20" />
-<hkern u1="&#x50d;" u2="&#x497;" k="20" />
-<hkern u1="&#x50d;" u2="&#x45e;" k="20" />
-<hkern u1="&#x50d;" u2="&#x445;" k="20" />
-<hkern u1="&#x50d;" u2="&#x443;" k="20" />
-<hkern u1="&#x50d;" u2="&#x436;" k="20" />
-<hkern u1="&#x50d;" u2="&#x27;" k="41" />
-<hkern u1="&#x50d;" u2="&#x22;" k="41" />
-<hkern u1="&#x50e;" u2="&#x201d;" k="82" />
-<hkern u1="&#x50e;" u2="&#x2019;" k="82" />
-<hkern u1="&#x50e;" u2="&#x50f;" k="41" />
-<hkern u1="&#x50e;" u2="&#x50e;" k="61" />
-<hkern u1="&#x50e;" u2="&#x506;" k="41" />
-<hkern u1="&#x50e;" u2="&#x504;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4b4;" k="61" />
-<hkern u1="&#x50e;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4b0;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4ae;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x50e;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4a0;" k="61" />
-<hkern u1="&#x50e;" u2="&#x496;" k="41" />
-<hkern u1="&#x50e;" u2="&#x476;" k="41" />
-<hkern u1="&#x50e;" u2="&#x474;" k="41" />
-<hkern u1="&#x50e;" u2="&#x470;" k="41" />
-<hkern u1="&#x50e;" u2="&#x466;" k="41" />
-<hkern u1="&#x50e;" u2="&#x44a;" k="41" />
-<hkern u1="&#x50e;" u2="&#x442;" k="41" />
-<hkern u1="&#x50e;" u2="&#x42a;" k="61" />
-<hkern u1="&#x50e;" u2="&#x427;" k="41" />
-<hkern u1="&#x50e;" u2="&#x425;" k="41" />
-<hkern u1="&#x50e;" u2="&#x422;" k="61" />
-<hkern u1="&#x50e;" u2="&#x416;" k="41" />
-<hkern u1="&#x50e;" u2="&#x410;" k="41" />
-<hkern u1="&#x50e;" u2="&#x40b;" k="61" />
-<hkern u1="&#x50e;" u2="&#x402;" k="61" />
-<hkern u1="&#x50e;" u2="&#x27;" k="82" />
-<hkern u1="&#x50e;" u2="&#x22;" k="82" />
-<hkern u1="&#x50f;" u2="&#x201d;" k="102" />
-<hkern u1="&#x50f;" u2="&#x2019;" k="102" />
-<hkern u1="&#x50f;" u2="&#x50f;" k="61" />
-<hkern u1="&#x50f;" u2="&#x507;" k="102" />
-<hkern u1="&#x50f;" u2="&#x505;" k="102" />
-<hkern u1="&#x50f;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x50f;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x50f;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x50f;" u2="&#x4f3;" k="41" />
-<hkern u1="&#x50f;" u2="&#x4f1;" k="41" />
-<hkern u1="&#x50f;" u2="&#x4ef;" k="41" />
-<hkern u1="&#x50f;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x50f;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x50f;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x50f;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x50f;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x50f;" u2="&#x4b5;" k="61" />
-<hkern u1="&#x50f;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x50f;" u2="&#x4ad;" k="61" />
-<hkern u1="&#x50f;" u2="&#x4a1;" k="61" />
-<hkern u1="&#x50f;" u2="&#x497;" k="41" />
-<hkern u1="&#x50f;" u2="&#x45e;" k="41" />
-<hkern u1="&#x50f;" u2="&#x44a;" k="61" />
-<hkern u1="&#x50f;" u2="&#x447;" k="41" />
-<hkern u1="&#x50f;" u2="&#x445;" k="41" />
-<hkern u1="&#x50f;" u2="&#x443;" k="41" />
-<hkern u1="&#x50f;" u2="&#x442;" k="61" />
-<hkern u1="&#x50f;" u2="&#x436;" k="41" />
-<hkern u1="&#x50f;" u2="&#x27;" k="102" />
-<hkern u1="&#x50f;" u2="&#x22;" k="102" />
-<hkern u1="&#x510;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x510;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x510;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x510;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x510;" u2="&#x447;" k="41" />
-<hkern u1="&#x512;" u2="&#x507;" k="41" />
-<hkern u1="&#x512;" u2="&#x505;" k="41" />
-<hkern u1="&#x512;" u2="&#x4e1;" k="-41" />
-<hkern u1="&#x512;" u2="&#x408;" k="-225" />
-<hkern u1="&#x513;" u2="&#x201d;" k="20" />
-<hkern u1="&#x513;" u2="&#x2019;" k="20" />
-<hkern u1="&#x513;" u2="&#x27;" k="20" />
-<hkern u1="&#x513;" u2="&#x22;" k="20" />
-<hkern u1="&#x1e00;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1e00;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1e00;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1e00;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1e00;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1e00;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1e00;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1e00;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1e00;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1e00;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1e00;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x178;" k="123" />
-<hkern u1="&#x1e00;" u2="&#x176;" k="123" />
-<hkern u1="&#x1e00;" u2="&#x174;" k="82" />
-<hkern u1="&#x1e00;" u2="&#x164;" k="143" />
-<hkern u1="&#x1e00;" u2="&#x162;" k="143" />
-<hkern u1="&#x1e00;" u2="&#x152;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x150;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x122;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x120;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x108;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x106;" k="41" />
-<hkern u1="&#x1e00;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1e00;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1e00;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1e00;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1e00;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1e00;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1e00;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1e00;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1e00;" u2="Y" k="123" />
-<hkern u1="&#x1e00;" u2="W" k="82" />
-<hkern u1="&#x1e00;" u2="V" k="82" />
-<hkern u1="&#x1e00;" u2="T" k="143" />
-<hkern u1="&#x1e00;" u2="Q" k="41" />
-<hkern u1="&#x1e00;" u2="O" k="41" />
-<hkern u1="&#x1e00;" u2="J" k="-266" />
-<hkern u1="&#x1e00;" u2="G" k="41" />
-<hkern u1="&#x1e00;" u2="C" k="41" />
-<hkern u1="&#x1e00;" u2="&#x27;" k="143" />
-<hkern u1="&#x1e00;" u2="&#x22;" k="143" />
-<hkern u1="&#x1e01;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1e01;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1e01;" u2="&#x27;" k="20" />
-<hkern u1="&#x1e01;" u2="&#x22;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x201e;" k="102" />
-<hkern u1="&#x1e80;" u2="&#x201a;" k="102" />
-<hkern u1="&#x1e80;" u2="&#x1ef1;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1eef;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1eed;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1eeb;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ee9;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ee7;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ee5;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ee3;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ee2;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ee1;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ee0;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1edf;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ede;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1edd;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1edc;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1edb;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1eda;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ed9;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ed8;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ed7;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ed6;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ed5;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ed4;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ed2;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ed1;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ed0;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ecf;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ece;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ecd;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ecc;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ec7;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ec5;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ec3;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ebf;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ebd;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ebb;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1eb9;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1eb7;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1eb6;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x1eb5;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1eb4;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x1eb3;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1eb2;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x1eb1;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1eb0;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x1eaf;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1eae;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x1ead;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1eac;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x1eab;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1eaa;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x1ea9;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ea8;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x1ea6;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x1ea5;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ea4;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x1ea3;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ea2;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x1ea1;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ea0;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x1e3f;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1e01;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1e00;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x219;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ff;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1fe;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1fd;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1fb;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1fa;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x1b0;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1a1;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1a0;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x173;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x171;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x16f;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x16d;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x16b;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x169;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x15f;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x15b;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x157;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x155;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x153;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x152;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x151;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x150;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x14f;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x14e;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x14d;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x14c;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x14b;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x146;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x144;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x138;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x123;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x122;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x121;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x120;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x11f;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x11e;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x11d;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x11c;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x11b;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x119;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x117;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x115;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x113;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x111;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x10f;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x10d;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x10c;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x10b;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x10a;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x109;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x108;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x107;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x106;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x105;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x104;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x103;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x102;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x101;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x100;" k="82" />
-<hkern u1="&#x1e80;" u2="&#xfc;" k="20" />
-<hkern u1="&#x1e80;" u2="&#xfb;" k="20" />
-<hkern u1="&#x1e80;" u2="&#xfa;" k="20" />
-<hkern u1="&#x1e80;" u2="&#xf9;" k="20" />
-<hkern u1="&#x1e80;" u2="&#xf8;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xf6;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xf5;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xf4;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xf3;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xf2;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xeb;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xea;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xe9;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xe8;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xe7;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xe6;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xe5;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xe4;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xe3;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xe2;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xe1;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xe0;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xd8;" k="20" />
-<hkern u1="&#x1e80;" u2="&#xd6;" k="20" />
-<hkern u1="&#x1e80;" u2="&#xd5;" k="20" />
-<hkern u1="&#x1e80;" u2="&#xd4;" k="20" />
-<hkern u1="&#x1e80;" u2="&#xd3;" k="20" />
-<hkern u1="&#x1e80;" u2="&#xd2;" k="20" />
-<hkern u1="&#x1e80;" u2="&#xc7;" k="20" />
-<hkern u1="&#x1e80;" u2="&#xc5;" k="82" />
-<hkern u1="&#x1e80;" u2="&#xc4;" k="82" />
-<hkern u1="&#x1e80;" u2="&#xc3;" k="82" />
-<hkern u1="&#x1e80;" u2="&#xc2;" k="82" />
-<hkern u1="&#x1e80;" u2="&#xc1;" k="82" />
-<hkern u1="&#x1e80;" u2="&#xc0;" k="82" />
-<hkern u1="&#x1e80;" u2="u" k="20" />
-<hkern u1="&#x1e80;" u2="s" k="20" />
-<hkern u1="&#x1e80;" u2="r" k="20" />
-<hkern u1="&#x1e80;" u2="q" k="41" />
-<hkern u1="&#x1e80;" u2="p" k="20" />
-<hkern u1="&#x1e80;" u2="o" k="41" />
-<hkern u1="&#x1e80;" u2="n" k="20" />
-<hkern u1="&#x1e80;" u2="m" k="20" />
-<hkern u1="&#x1e80;" u2="g" k="20" />
-<hkern u1="&#x1e80;" u2="e" k="41" />
-<hkern u1="&#x1e80;" u2="d" k="41" />
-<hkern u1="&#x1e80;" u2="c" k="41" />
-<hkern u1="&#x1e80;" u2="a" k="41" />
-<hkern u1="&#x1e80;" u2="Q" k="20" />
-<hkern u1="&#x1e80;" u2="O" k="20" />
-<hkern u1="&#x1e80;" u2="G" k="20" />
-<hkern u1="&#x1e80;" u2="C" k="20" />
-<hkern u1="&#x1e80;" u2="A" k="82" />
-<hkern u1="&#x1e80;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1e80;" u2="&#x2e;" k="102" />
-<hkern u1="&#x1e80;" u2="&#x2c;" k="102" />
-<hkern u1="&#x1e81;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1e81;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x1e81;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1e81;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x1e81;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1e81;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1e81;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1e81;" u2="&#x27;" k="-82" />
-<hkern u1="&#x1e81;" u2="&#x22;" k="-82" />
-<hkern u1="&#x1e82;" u2="&#x201e;" k="102" />
-<hkern u1="&#x1e82;" u2="&#x201a;" k="102" />
-<hkern u1="&#x1e82;" u2="&#x1ef1;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1eef;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1eed;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1eeb;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ee9;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ee7;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ee5;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ee3;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ee2;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ee1;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ee0;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1edf;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ede;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1edd;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1edc;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1edb;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1eda;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ed9;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ed8;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ed7;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ed6;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ed5;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ed4;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ed2;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ed1;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ed0;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ecf;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ece;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ecd;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ecc;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ec7;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ec5;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ec3;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ebf;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ebd;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ebb;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1eb9;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1eb7;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1eb6;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x1eb5;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1eb4;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x1eb3;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1eb2;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x1eb1;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1eb0;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x1eaf;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1eae;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x1ead;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1eac;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x1eab;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1eaa;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x1ea9;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ea8;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x1ea6;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x1ea5;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ea4;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x1ea3;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ea2;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x1ea1;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ea0;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x1e3f;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1e01;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1e00;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x219;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ff;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1fe;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1fd;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1fb;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1fa;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x1b0;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1a1;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1a0;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x173;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x171;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x16f;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x16d;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x16b;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x169;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x15f;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x15b;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x157;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x155;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x153;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x152;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x151;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x150;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x14f;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x14e;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x14d;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x14c;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x14b;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x146;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x144;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x138;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x123;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x122;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x121;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x120;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x11f;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x11e;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x11d;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x11c;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x11b;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x119;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x117;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x115;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x113;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x111;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x10f;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x10d;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x10c;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x10b;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x10a;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x109;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x108;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x107;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x106;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x105;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x104;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x103;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x102;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x101;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x100;" k="82" />
-<hkern u1="&#x1e82;" u2="&#xfc;" k="20" />
-<hkern u1="&#x1e82;" u2="&#xfb;" k="20" />
-<hkern u1="&#x1e82;" u2="&#xfa;" k="20" />
-<hkern u1="&#x1e82;" u2="&#xf9;" k="20" />
-<hkern u1="&#x1e82;" u2="&#xf8;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xf6;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xf5;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xf4;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xf3;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xf2;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xeb;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xea;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xe9;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xe8;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xe7;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xe6;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xe5;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xe4;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xe3;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xe2;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xe1;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xe0;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xd8;" k="20" />
-<hkern u1="&#x1e82;" u2="&#xd6;" k="20" />
-<hkern u1="&#x1e82;" u2="&#xd5;" k="20" />
-<hkern u1="&#x1e82;" u2="&#xd4;" k="20" />
-<hkern u1="&#x1e82;" u2="&#xd3;" k="20" />
-<hkern u1="&#x1e82;" u2="&#xd2;" k="20" />
-<hkern u1="&#x1e82;" u2="&#xc7;" k="20" />
-<hkern u1="&#x1e82;" u2="&#xc5;" k="82" />
-<hkern u1="&#x1e82;" u2="&#xc4;" k="82" />
-<hkern u1="&#x1e82;" u2="&#xc3;" k="82" />
-<hkern u1="&#x1e82;" u2="&#xc2;" k="82" />
-<hkern u1="&#x1e82;" u2="&#xc1;" k="82" />
-<hkern u1="&#x1e82;" u2="&#xc0;" k="82" />
-<hkern u1="&#x1e82;" u2="u" k="20" />
-<hkern u1="&#x1e82;" u2="s" k="20" />
-<hkern u1="&#x1e82;" u2="r" k="20" />
-<hkern u1="&#x1e82;" u2="q" k="41" />
-<hkern u1="&#x1e82;" u2="p" k="20" />
-<hkern u1="&#x1e82;" u2="o" k="41" />
-<hkern u1="&#x1e82;" u2="n" k="20" />
-<hkern u1="&#x1e82;" u2="m" k="20" />
-<hkern u1="&#x1e82;" u2="g" k="20" />
-<hkern u1="&#x1e82;" u2="e" k="41" />
-<hkern u1="&#x1e82;" u2="d" k="41" />
-<hkern u1="&#x1e82;" u2="c" k="41" />
-<hkern u1="&#x1e82;" u2="a" k="41" />
-<hkern u1="&#x1e82;" u2="Q" k="20" />
-<hkern u1="&#x1e82;" u2="O" k="20" />
-<hkern u1="&#x1e82;" u2="G" k="20" />
-<hkern u1="&#x1e82;" u2="C" k="20" />
-<hkern u1="&#x1e82;" u2="A" k="82" />
-<hkern u1="&#x1e82;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1e82;" u2="&#x2e;" k="102" />
-<hkern u1="&#x1e82;" u2="&#x2c;" k="102" />
-<hkern u1="&#x1e83;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1e83;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x1e83;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1e83;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x1e83;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1e83;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1e83;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1e83;" u2="&#x27;" k="-82" />
-<hkern u1="&#x1e83;" u2="&#x22;" k="-82" />
-<hkern u1="&#x1e84;" u2="&#x201e;" k="102" />
-<hkern u1="&#x1e84;" u2="&#x201a;" k="102" />
-<hkern u1="&#x1e84;" u2="&#x1ef1;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1eef;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1eed;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1eeb;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ee9;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ee7;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ee5;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ee3;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ee2;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ee1;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ee0;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1edf;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ede;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1edd;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1edc;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1edb;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1eda;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ed9;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ed8;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ed7;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ed6;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ed5;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ed4;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ed2;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ed1;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ed0;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ecf;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ece;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ecd;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ecc;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ec7;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ec5;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ec3;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ebf;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ebd;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ebb;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1eb9;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1eb7;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1eb6;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x1eb5;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1eb4;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x1eb3;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1eb2;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x1eb1;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1eb0;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x1eaf;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1eae;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x1ead;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1eac;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x1eab;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1eaa;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x1ea9;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ea8;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x1ea6;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x1ea5;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ea4;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x1ea3;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ea2;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x1ea1;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ea0;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x1e3f;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1e01;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1e00;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x219;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ff;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1fe;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1fd;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1fb;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1fa;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x1b0;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1a1;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1a0;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x173;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x171;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x16f;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x16d;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x16b;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x169;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x15f;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x15b;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x157;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x155;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x153;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x152;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x151;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x150;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x14f;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x14e;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x14d;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x14c;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x14b;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x146;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x144;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x138;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x123;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x122;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x121;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x120;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x11f;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x11e;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x11d;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x11c;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x11b;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x119;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x117;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x115;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x113;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x111;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x10f;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x10d;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x10c;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x10b;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x10a;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x109;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x108;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x107;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x106;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x105;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x104;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x103;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x102;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x101;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x100;" k="82" />
-<hkern u1="&#x1e84;" u2="&#xfc;" k="20" />
-<hkern u1="&#x1e84;" u2="&#xfb;" k="20" />
-<hkern u1="&#x1e84;" u2="&#xfa;" k="20" />
-<hkern u1="&#x1e84;" u2="&#xf9;" k="20" />
-<hkern u1="&#x1e84;" u2="&#xf8;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xf6;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xf5;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xf4;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xf3;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xf2;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xeb;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xea;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xe9;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xe8;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xe7;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xe6;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xe5;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xe4;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xe3;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xe2;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xe1;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xe0;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xd8;" k="20" />
-<hkern u1="&#x1e84;" u2="&#xd6;" k="20" />
-<hkern u1="&#x1e84;" u2="&#xd5;" k="20" />
-<hkern u1="&#x1e84;" u2="&#xd4;" k="20" />
-<hkern u1="&#x1e84;" u2="&#xd3;" k="20" />
-<hkern u1="&#x1e84;" u2="&#xd2;" k="20" />
-<hkern u1="&#x1e84;" u2="&#xc7;" k="20" />
-<hkern u1="&#x1e84;" u2="&#xc5;" k="82" />
-<hkern u1="&#x1e84;" u2="&#xc4;" k="82" />
-<hkern u1="&#x1e84;" u2="&#xc3;" k="82" />
-<hkern u1="&#x1e84;" u2="&#xc2;" k="82" />
-<hkern u1="&#x1e84;" u2="&#xc1;" k="82" />
-<hkern u1="&#x1e84;" u2="&#xc0;" k="82" />
-<hkern u1="&#x1e84;" u2="u" k="20" />
-<hkern u1="&#x1e84;" u2="s" k="20" />
-<hkern u1="&#x1e84;" u2="r" k="20" />
-<hkern u1="&#x1e84;" u2="q" k="41" />
-<hkern u1="&#x1e84;" u2="p" k="20" />
-<hkern u1="&#x1e84;" u2="o" k="41" />
-<hkern u1="&#x1e84;" u2="n" k="20" />
-<hkern u1="&#x1e84;" u2="m" k="20" />
-<hkern u1="&#x1e84;" u2="g" k="20" />
-<hkern u1="&#x1e84;" u2="e" k="41" />
-<hkern u1="&#x1e84;" u2="d" k="41" />
-<hkern u1="&#x1e84;" u2="c" k="41" />
-<hkern u1="&#x1e84;" u2="a" k="41" />
-<hkern u1="&#x1e84;" u2="Q" k="20" />
-<hkern u1="&#x1e84;" u2="O" k="20" />
-<hkern u1="&#x1e84;" u2="G" k="20" />
-<hkern u1="&#x1e84;" u2="C" k="20" />
-<hkern u1="&#x1e84;" u2="A" k="82" />
-<hkern u1="&#x1e84;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1e84;" u2="&#x2e;" k="102" />
-<hkern u1="&#x1e84;" u2="&#x2c;" k="102" />
-<hkern u1="&#x1e85;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1e85;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x1e85;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1e85;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x1e85;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1e85;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1e85;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1e85;" u2="&#x27;" k="-82" />
-<hkern u1="&#x1e85;" u2="&#x22;" k="-82" />
-<hkern u1="&#x1ea0;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1ea0;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1ea0;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1ea0;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1ea0;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1ea0;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1ea0;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1ea0;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1ea0;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1ea0;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1ea0;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x178;" k="123" />
-<hkern u1="&#x1ea0;" u2="&#x176;" k="123" />
-<hkern u1="&#x1ea0;" u2="&#x174;" k="82" />
-<hkern u1="&#x1ea0;" u2="&#x164;" k="143" />
-<hkern u1="&#x1ea0;" u2="&#x162;" k="143" />
-<hkern u1="&#x1ea0;" u2="&#x152;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x150;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x122;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x120;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x108;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x106;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1ea0;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1ea0;" u2="Y" k="123" />
-<hkern u1="&#x1ea0;" u2="W" k="82" />
-<hkern u1="&#x1ea0;" u2="V" k="82" />
-<hkern u1="&#x1ea0;" u2="T" k="143" />
-<hkern u1="&#x1ea0;" u2="Q" k="41" />
-<hkern u1="&#x1ea0;" u2="O" k="41" />
-<hkern u1="&#x1ea0;" u2="J" k="-266" />
-<hkern u1="&#x1ea0;" u2="G" k="41" />
-<hkern u1="&#x1ea0;" u2="C" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x27;" k="143" />
-<hkern u1="&#x1ea0;" u2="&#x22;" k="143" />
-<hkern u1="&#x1ea1;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ea1;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ea1;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ea1;" u2="&#x22;" k="20" />
-<hkern u1="&#x1ea2;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1ea2;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1ea2;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1ea2;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1ea2;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1ea2;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1ea2;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1ea2;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1ea2;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1ea2;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1ea2;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x178;" k="123" />
-<hkern u1="&#x1ea2;" u2="&#x176;" k="123" />
-<hkern u1="&#x1ea2;" u2="&#x174;" k="82" />
-<hkern u1="&#x1ea2;" u2="&#x164;" k="143" />
-<hkern u1="&#x1ea2;" u2="&#x162;" k="143" />
-<hkern u1="&#x1ea2;" u2="&#x152;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x150;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x122;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x120;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x108;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x106;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1ea2;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1ea2;" u2="Y" k="123" />
-<hkern u1="&#x1ea2;" u2="W" k="82" />
-<hkern u1="&#x1ea2;" u2="V" k="82" />
-<hkern u1="&#x1ea2;" u2="T" k="143" />
-<hkern u1="&#x1ea2;" u2="Q" k="41" />
-<hkern u1="&#x1ea2;" u2="O" k="41" />
-<hkern u1="&#x1ea2;" u2="J" k="-266" />
-<hkern u1="&#x1ea2;" u2="G" k="41" />
-<hkern u1="&#x1ea2;" u2="C" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x27;" k="143" />
-<hkern u1="&#x1ea2;" u2="&#x22;" k="143" />
-<hkern u1="&#x1ea3;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ea3;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ea3;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ea3;" u2="&#x22;" k="20" />
-<hkern u1="&#x1ea4;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1ea4;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1ea4;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1ea4;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1ea4;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1ea4;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1ea4;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1ea4;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1ea4;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1ea4;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1ea4;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x178;" k="123" />
-<hkern u1="&#x1ea4;" u2="&#x176;" k="123" />
-<hkern u1="&#x1ea4;" u2="&#x174;" k="82" />
-<hkern u1="&#x1ea4;" u2="&#x164;" k="143" />
-<hkern u1="&#x1ea4;" u2="&#x162;" k="143" />
-<hkern u1="&#x1ea4;" u2="&#x152;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x150;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x122;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x120;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x108;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x106;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1ea4;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1ea4;" u2="Y" k="123" />
-<hkern u1="&#x1ea4;" u2="W" k="82" />
-<hkern u1="&#x1ea4;" u2="V" k="82" />
-<hkern u1="&#x1ea4;" u2="T" k="143" />
-<hkern u1="&#x1ea4;" u2="Q" k="41" />
-<hkern u1="&#x1ea4;" u2="O" k="41" />
-<hkern u1="&#x1ea4;" u2="J" k="-266" />
-<hkern u1="&#x1ea4;" u2="G" k="41" />
-<hkern u1="&#x1ea4;" u2="C" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x27;" k="143" />
-<hkern u1="&#x1ea4;" u2="&#x22;" k="143" />
-<hkern u1="&#x1ea5;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ea5;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ea5;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ea5;" u2="&#x22;" k="20" />
-<hkern u1="&#x1ea6;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1ea6;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1ea6;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1ea6;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1ea6;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1ea6;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1ea6;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1ea6;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1ea6;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1ea6;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1ea6;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x178;" k="123" />
-<hkern u1="&#x1ea6;" u2="&#x176;" k="123" />
-<hkern u1="&#x1ea6;" u2="&#x174;" k="82" />
-<hkern u1="&#x1ea6;" u2="&#x164;" k="143" />
-<hkern u1="&#x1ea6;" u2="&#x162;" k="143" />
-<hkern u1="&#x1ea6;" u2="&#x152;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x150;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x122;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x120;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x108;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x106;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1ea6;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1ea6;" u2="Y" k="123" />
-<hkern u1="&#x1ea6;" u2="W" k="82" />
-<hkern u1="&#x1ea6;" u2="V" k="82" />
-<hkern u1="&#x1ea6;" u2="T" k="143" />
-<hkern u1="&#x1ea6;" u2="Q" k="41" />
-<hkern u1="&#x1ea6;" u2="O" k="41" />
-<hkern u1="&#x1ea6;" u2="J" k="-266" />
-<hkern u1="&#x1ea6;" u2="G" k="41" />
-<hkern u1="&#x1ea6;" u2="C" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x27;" k="143" />
-<hkern u1="&#x1ea6;" u2="&#x22;" k="143" />
-<hkern u1="&#x1ea7;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ea7;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ea7;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ea7;" u2="&#x22;" k="20" />
-<hkern u1="&#x1ea8;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1ea8;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1ea8;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1ea8;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1ea8;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1ea8;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1ea8;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1ea8;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1ea8;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1ea8;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1ea8;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x178;" k="123" />
-<hkern u1="&#x1ea8;" u2="&#x176;" k="123" />
-<hkern u1="&#x1ea8;" u2="&#x174;" k="82" />
-<hkern u1="&#x1ea8;" u2="&#x164;" k="143" />
-<hkern u1="&#x1ea8;" u2="&#x162;" k="143" />
-<hkern u1="&#x1ea8;" u2="&#x152;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x150;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x122;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x120;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x108;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x106;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1ea8;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1ea8;" u2="Y" k="123" />
-<hkern u1="&#x1ea8;" u2="W" k="82" />
-<hkern u1="&#x1ea8;" u2="V" k="82" />
-<hkern u1="&#x1ea8;" u2="T" k="143" />
-<hkern u1="&#x1ea8;" u2="Q" k="41" />
-<hkern u1="&#x1ea8;" u2="O" k="41" />
-<hkern u1="&#x1ea8;" u2="J" k="-266" />
-<hkern u1="&#x1ea8;" u2="G" k="41" />
-<hkern u1="&#x1ea8;" u2="C" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x27;" k="143" />
-<hkern u1="&#x1ea8;" u2="&#x22;" k="143" />
-<hkern u1="&#x1ea9;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ea9;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ea9;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ea9;" u2="&#x22;" k="20" />
-<hkern u1="&#x1eaa;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1eaa;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1eaa;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1eaa;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1eaa;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1eaa;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1eaa;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1eaa;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1eaa;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1eaa;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1eaa;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x178;" k="123" />
-<hkern u1="&#x1eaa;" u2="&#x176;" k="123" />
-<hkern u1="&#x1eaa;" u2="&#x174;" k="82" />
-<hkern u1="&#x1eaa;" u2="&#x164;" k="143" />
-<hkern u1="&#x1eaa;" u2="&#x162;" k="143" />
-<hkern u1="&#x1eaa;" u2="&#x152;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x150;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x122;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x120;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x108;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x106;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1eaa;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1eaa;" u2="Y" k="123" />
-<hkern u1="&#x1eaa;" u2="W" k="82" />
-<hkern u1="&#x1eaa;" u2="V" k="82" />
-<hkern u1="&#x1eaa;" u2="T" k="143" />
-<hkern u1="&#x1eaa;" u2="Q" k="41" />
-<hkern u1="&#x1eaa;" u2="O" k="41" />
-<hkern u1="&#x1eaa;" u2="J" k="-266" />
-<hkern u1="&#x1eaa;" u2="G" k="41" />
-<hkern u1="&#x1eaa;" u2="C" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x27;" k="143" />
-<hkern u1="&#x1eaa;" u2="&#x22;" k="143" />
-<hkern u1="&#x1eab;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1eab;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1eab;" u2="&#x27;" k="20" />
-<hkern u1="&#x1eab;" u2="&#x22;" k="20" />
-<hkern u1="&#x1eac;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1eac;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1eac;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1eac;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1eac;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1eac;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1eac;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1eac;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1eac;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1eac;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1eac;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x178;" k="123" />
-<hkern u1="&#x1eac;" u2="&#x176;" k="123" />
-<hkern u1="&#x1eac;" u2="&#x174;" k="82" />
-<hkern u1="&#x1eac;" u2="&#x164;" k="143" />
-<hkern u1="&#x1eac;" u2="&#x162;" k="143" />
-<hkern u1="&#x1eac;" u2="&#x152;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x150;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x122;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x120;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x108;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x106;" k="41" />
-<hkern u1="&#x1eac;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1eac;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1eac;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1eac;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1eac;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1eac;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1eac;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1eac;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1eac;" u2="Y" k="123" />
-<hkern u1="&#x1eac;" u2="W" k="82" />
-<hkern u1="&#x1eac;" u2="V" k="82" />
-<hkern u1="&#x1eac;" u2="T" k="143" />
-<hkern u1="&#x1eac;" u2="Q" k="41" />
-<hkern u1="&#x1eac;" u2="O" k="41" />
-<hkern u1="&#x1eac;" u2="J" k="-266" />
-<hkern u1="&#x1eac;" u2="G" k="41" />
-<hkern u1="&#x1eac;" u2="C" k="41" />
-<hkern u1="&#x1eac;" u2="&#x27;" k="143" />
-<hkern u1="&#x1eac;" u2="&#x22;" k="143" />
-<hkern u1="&#x1ead;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ead;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ead;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ead;" u2="&#x22;" k="20" />
-<hkern u1="&#x1eae;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1eae;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1eae;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1eae;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1eae;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1eae;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1eae;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1eae;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1eae;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1eae;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1eae;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x178;" k="123" />
-<hkern u1="&#x1eae;" u2="&#x176;" k="123" />
-<hkern u1="&#x1eae;" u2="&#x174;" k="82" />
-<hkern u1="&#x1eae;" u2="&#x164;" k="143" />
-<hkern u1="&#x1eae;" u2="&#x162;" k="143" />
-<hkern u1="&#x1eae;" u2="&#x152;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x150;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x122;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x120;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x108;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x106;" k="41" />
-<hkern u1="&#x1eae;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1eae;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1eae;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1eae;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1eae;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1eae;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1eae;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1eae;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1eae;" u2="Y" k="123" />
-<hkern u1="&#x1eae;" u2="W" k="82" />
-<hkern u1="&#x1eae;" u2="V" k="82" />
-<hkern u1="&#x1eae;" u2="T" k="143" />
-<hkern u1="&#x1eae;" u2="Q" k="41" />
-<hkern u1="&#x1eae;" u2="O" k="41" />
-<hkern u1="&#x1eae;" u2="J" k="-266" />
-<hkern u1="&#x1eae;" u2="G" k="41" />
-<hkern u1="&#x1eae;" u2="C" k="41" />
-<hkern u1="&#x1eae;" u2="&#x27;" k="143" />
-<hkern u1="&#x1eae;" u2="&#x22;" k="143" />
-<hkern u1="&#x1eaf;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1eaf;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1eaf;" u2="&#x27;" k="20" />
-<hkern u1="&#x1eaf;" u2="&#x22;" k="20" />
-<hkern u1="&#x1eb0;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1eb0;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1eb0;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1eb0;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1eb0;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1eb0;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1eb0;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1eb0;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1eb0;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1eb0;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1eb0;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x178;" k="123" />
-<hkern u1="&#x1eb0;" u2="&#x176;" k="123" />
-<hkern u1="&#x1eb0;" u2="&#x174;" k="82" />
-<hkern u1="&#x1eb0;" u2="&#x164;" k="143" />
-<hkern u1="&#x1eb0;" u2="&#x162;" k="143" />
-<hkern u1="&#x1eb0;" u2="&#x152;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x150;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x122;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x120;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x108;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x106;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1eb0;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1eb0;" u2="Y" k="123" />
-<hkern u1="&#x1eb0;" u2="W" k="82" />
-<hkern u1="&#x1eb0;" u2="V" k="82" />
-<hkern u1="&#x1eb0;" u2="T" k="143" />
-<hkern u1="&#x1eb0;" u2="Q" k="41" />
-<hkern u1="&#x1eb0;" u2="O" k="41" />
-<hkern u1="&#x1eb0;" u2="J" k="-266" />
-<hkern u1="&#x1eb0;" u2="G" k="41" />
-<hkern u1="&#x1eb0;" u2="C" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x27;" k="143" />
-<hkern u1="&#x1eb0;" u2="&#x22;" k="143" />
-<hkern u1="&#x1eb1;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1eb1;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1eb1;" u2="&#x27;" k="20" />
-<hkern u1="&#x1eb1;" u2="&#x22;" k="20" />
-<hkern u1="&#x1eb2;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1eb2;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1eb2;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1eb2;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1eb2;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1eb2;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1eb2;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1eb2;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1eb2;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1eb2;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1eb2;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x178;" k="123" />
-<hkern u1="&#x1eb2;" u2="&#x176;" k="123" />
-<hkern u1="&#x1eb2;" u2="&#x174;" k="82" />
-<hkern u1="&#x1eb2;" u2="&#x164;" k="143" />
-<hkern u1="&#x1eb2;" u2="&#x162;" k="143" />
-<hkern u1="&#x1eb2;" u2="&#x152;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x150;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x122;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x120;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x108;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x106;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1eb2;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1eb2;" u2="Y" k="123" />
-<hkern u1="&#x1eb2;" u2="W" k="82" />
-<hkern u1="&#x1eb2;" u2="V" k="82" />
-<hkern u1="&#x1eb2;" u2="T" k="143" />
-<hkern u1="&#x1eb2;" u2="Q" k="41" />
-<hkern u1="&#x1eb2;" u2="O" k="41" />
-<hkern u1="&#x1eb2;" u2="J" k="-266" />
-<hkern u1="&#x1eb2;" u2="G" k="41" />
-<hkern u1="&#x1eb2;" u2="C" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x27;" k="143" />
-<hkern u1="&#x1eb2;" u2="&#x22;" k="143" />
-<hkern u1="&#x1eb3;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1eb3;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1eb3;" u2="&#x27;" k="20" />
-<hkern u1="&#x1eb3;" u2="&#x22;" k="20" />
-<hkern u1="&#x1eb4;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1eb4;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1eb4;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1eb4;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1eb4;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1eb4;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1eb4;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1eb4;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1eb4;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1eb4;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1eb4;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x178;" k="123" />
-<hkern u1="&#x1eb4;" u2="&#x176;" k="123" />
-<hkern u1="&#x1eb4;" u2="&#x174;" k="82" />
-<hkern u1="&#x1eb4;" u2="&#x164;" k="143" />
-<hkern u1="&#x1eb4;" u2="&#x162;" k="143" />
-<hkern u1="&#x1eb4;" u2="&#x152;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x150;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x122;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x120;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x108;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x106;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1eb4;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1eb4;" u2="Y" k="123" />
-<hkern u1="&#x1eb4;" u2="W" k="82" />
-<hkern u1="&#x1eb4;" u2="V" k="82" />
-<hkern u1="&#x1eb4;" u2="T" k="143" />
-<hkern u1="&#x1eb4;" u2="Q" k="41" />
-<hkern u1="&#x1eb4;" u2="O" k="41" />
-<hkern u1="&#x1eb4;" u2="J" k="-266" />
-<hkern u1="&#x1eb4;" u2="G" k="41" />
-<hkern u1="&#x1eb4;" u2="C" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x27;" k="143" />
-<hkern u1="&#x1eb4;" u2="&#x22;" k="143" />
-<hkern u1="&#x1eb5;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1eb5;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1eb5;" u2="&#x27;" k="20" />
-<hkern u1="&#x1eb5;" u2="&#x22;" k="20" />
-<hkern u1="&#x1eb6;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1eb6;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1eb6;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1eb6;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1eb6;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1eb6;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1eb6;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1eb6;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1eb6;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1eb6;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1eb6;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x178;" k="123" />
-<hkern u1="&#x1eb6;" u2="&#x176;" k="123" />
-<hkern u1="&#x1eb6;" u2="&#x174;" k="82" />
-<hkern u1="&#x1eb6;" u2="&#x164;" k="143" />
-<hkern u1="&#x1eb6;" u2="&#x162;" k="143" />
-<hkern u1="&#x1eb6;" u2="&#x152;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x150;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x122;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x120;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x108;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x106;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1eb6;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1eb6;" u2="Y" k="123" />
-<hkern u1="&#x1eb6;" u2="W" k="82" />
-<hkern u1="&#x1eb6;" u2="V" k="82" />
-<hkern u1="&#x1eb6;" u2="T" k="143" />
-<hkern u1="&#x1eb6;" u2="Q" k="41" />
-<hkern u1="&#x1eb6;" u2="O" k="41" />
-<hkern u1="&#x1eb6;" u2="J" k="-266" />
-<hkern u1="&#x1eb6;" u2="G" k="41" />
-<hkern u1="&#x1eb6;" u2="C" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x27;" k="143" />
-<hkern u1="&#x1eb6;" u2="&#x22;" k="143" />
-<hkern u1="&#x1eb7;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1eb7;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1eb7;" u2="&#x27;" k="20" />
-<hkern u1="&#x1eb7;" u2="&#x22;" k="20" />
-<hkern u1="&#x1eb8;" u2="J" k="-123" />
-<hkern u1="&#x1eb9;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1eb9;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1eb9;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x1eb9;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x1eb9;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x1eb9;" u2="&#x17e;" k="20" />
-<hkern u1="&#x1eb9;" u2="&#x17c;" k="20" />
-<hkern u1="&#x1eb9;" u2="&#x17a;" k="20" />
-<hkern u1="&#x1eb9;" u2="&#x175;" k="41" />
-<hkern u1="&#x1eb9;" u2="&#xfd;" k="41" />
-<hkern u1="&#x1eb9;" u2="z" k="20" />
-<hkern u1="&#x1eb9;" u2="y" k="41" />
-<hkern u1="&#x1eb9;" u2="x" k="41" />
-<hkern u1="&#x1eb9;" u2="w" k="41" />
-<hkern u1="&#x1eb9;" u2="v" k="41" />
-<hkern u1="&#x1eb9;" u2="&#x27;" k="20" />
-<hkern u1="&#x1eb9;" u2="&#x22;" k="20" />
-<hkern u1="&#x1eba;" u2="J" k="-123" />
-<hkern u1="&#x1ebb;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ebb;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ebb;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x1ebb;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x1ebb;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x1ebb;" u2="&#x17e;" k="20" />
-<hkern u1="&#x1ebb;" u2="&#x17c;" k="20" />
-<hkern u1="&#x1ebb;" u2="&#x17a;" k="20" />
-<hkern u1="&#x1ebb;" u2="&#x175;" k="41" />
-<hkern u1="&#x1ebb;" u2="&#xfd;" k="41" />
-<hkern u1="&#x1ebb;" u2="z" k="20" />
-<hkern u1="&#x1ebb;" u2="y" k="41" />
-<hkern u1="&#x1ebb;" u2="x" k="41" />
-<hkern u1="&#x1ebb;" u2="w" k="41" />
-<hkern u1="&#x1ebb;" u2="v" k="41" />
-<hkern u1="&#x1ebb;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ebb;" u2="&#x22;" k="20" />
-<hkern u1="&#x1ebc;" u2="J" k="-123" />
-<hkern u1="&#x1ebd;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ebd;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ebd;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x1ebd;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x1ebd;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x1ebd;" u2="&#x17e;" k="20" />
-<hkern u1="&#x1ebd;" u2="&#x17c;" k="20" />
-<hkern u1="&#x1ebd;" u2="&#x17a;" k="20" />
-<hkern u1="&#x1ebd;" u2="&#x175;" k="41" />
-<hkern u1="&#x1ebd;" u2="&#xfd;" k="41" />
-<hkern u1="&#x1ebd;" u2="z" k="20" />
-<hkern u1="&#x1ebd;" u2="y" k="41" />
-<hkern u1="&#x1ebd;" u2="x" k="41" />
-<hkern u1="&#x1ebd;" u2="w" k="41" />
-<hkern u1="&#x1ebd;" u2="v" k="41" />
-<hkern u1="&#x1ebd;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ebd;" u2="&#x22;" k="20" />
-<hkern u1="&#x1ebe;" u2="J" k="-123" />
-<hkern u1="&#x1ebf;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ebf;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ebf;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x1ebf;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x1ebf;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x1ebf;" u2="&#x17e;" k="20" />
-<hkern u1="&#x1ebf;" u2="&#x17c;" k="20" />
-<hkern u1="&#x1ebf;" u2="&#x17a;" k="20" />
-<hkern u1="&#x1ebf;" u2="&#x175;" k="41" />
-<hkern u1="&#x1ebf;" u2="&#xfd;" k="41" />
-<hkern u1="&#x1ebf;" u2="z" k="20" />
-<hkern u1="&#x1ebf;" u2="y" k="41" />
-<hkern u1="&#x1ebf;" u2="x" k="41" />
-<hkern u1="&#x1ebf;" u2="w" k="41" />
-<hkern u1="&#x1ebf;" u2="v" k="41" />
-<hkern u1="&#x1ebf;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ebf;" u2="&#x22;" k="20" />
-<hkern u1="&#x1ec0;" u2="J" k="-123" />
-<hkern u1="&#x1ec1;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ec1;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ec1;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x1ec1;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x1ec1;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x1ec1;" u2="&#x17e;" k="20" />
-<hkern u1="&#x1ec1;" u2="&#x17c;" k="20" />
-<hkern u1="&#x1ec1;" u2="&#x17a;" k="20" />
-<hkern u1="&#x1ec1;" u2="&#x175;" k="41" />
-<hkern u1="&#x1ec1;" u2="&#xfd;" k="41" />
-<hkern u1="&#x1ec1;" u2="z" k="20" />
-<hkern u1="&#x1ec1;" u2="y" k="41" />
-<hkern u1="&#x1ec1;" u2="x" k="41" />
-<hkern u1="&#x1ec1;" u2="w" k="41" />
-<hkern u1="&#x1ec1;" u2="v" k="41" />
-<hkern u1="&#x1ec1;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ec1;" u2="&#x22;" k="20" />
-<hkern u1="&#x1ec2;" u2="J" k="-123" />
-<hkern u1="&#x1ec3;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ec3;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ec3;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x1ec3;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x1ec3;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x1ec3;" u2="&#x17e;" k="20" />
-<hkern u1="&#x1ec3;" u2="&#x17c;" k="20" />
-<hkern u1="&#x1ec3;" u2="&#x17a;" k="20" />
-<hkern u1="&#x1ec3;" u2="&#x175;" k="41" />
-<hkern u1="&#x1ec3;" u2="&#xfd;" k="41" />
-<hkern u1="&#x1ec3;" u2="z" k="20" />
-<hkern u1="&#x1ec3;" u2="y" k="41" />
-<hkern u1="&#x1ec3;" u2="x" k="41" />
-<hkern u1="&#x1ec3;" u2="w" k="41" />
-<hkern u1="&#x1ec3;" u2="v" k="41" />
-<hkern u1="&#x1ec3;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ec3;" u2="&#x22;" k="20" />
-<hkern u1="&#x1ec4;" u2="J" k="-123" />
-<hkern u1="&#x1ec5;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ec5;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ec5;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x1ec5;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x1ec5;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x1ec5;" u2="&#x17e;" k="20" />
-<hkern u1="&#x1ec5;" u2="&#x17c;" k="20" />
-<hkern u1="&#x1ec5;" u2="&#x17a;" k="20" />
-<hkern u1="&#x1ec5;" u2="&#x175;" k="41" />
-<hkern u1="&#x1ec5;" u2="&#xfd;" k="41" />
-<hkern u1="&#x1ec5;" u2="z" k="20" />
-<hkern u1="&#x1ec5;" u2="y" k="41" />
-<hkern u1="&#x1ec5;" u2="x" k="41" />
-<hkern u1="&#x1ec5;" u2="w" k="41" />
-<hkern u1="&#x1ec5;" u2="v" k="41" />
-<hkern u1="&#x1ec5;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ec5;" u2="&#x22;" k="20" />
-<hkern u1="&#x1ec6;" u2="J" k="-123" />
-<hkern u1="&#x1ec7;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ec7;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ec7;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x1ec7;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x1ec7;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x1ec7;" u2="&#x17e;" k="20" />
-<hkern u1="&#x1ec7;" u2="&#x17c;" k="20" />
-<hkern u1="&#x1ec7;" u2="&#x17a;" k="20" />
-<hkern u1="&#x1ec7;" u2="&#x175;" k="41" />
-<hkern u1="&#x1ec7;" u2="&#xfd;" k="41" />
-<hkern u1="&#x1ec7;" u2="z" k="20" />
-<hkern u1="&#x1ec7;" u2="y" k="41" />
-<hkern u1="&#x1ec7;" u2="x" k="41" />
-<hkern u1="&#x1ec7;" u2="w" k="41" />
-<hkern u1="&#x1ec7;" u2="v" k="41" />
-<hkern u1="&#x1ec7;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ec7;" u2="&#x22;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1ecc;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1ecc;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x1eae;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x1eac;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x1e84;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x1e82;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x1e80;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x1e00;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x405;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x21a;" k="61" />
-<hkern u1="&#x1ecc;" u2="&#x1fa;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x17d;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x17b;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x179;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x178;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x176;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x174;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x164;" k="61" />
-<hkern u1="&#x1ecc;" u2="&#x162;" k="61" />
-<hkern u1="&#x1ecc;" u2="&#x104;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x102;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x100;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#xdd;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#xc5;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#xc4;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#xc3;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#xc2;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#xc1;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#xc0;" k="41" />
-<hkern u1="&#x1ecc;" u2="Z" k="20" />
-<hkern u1="&#x1ecc;" u2="Y" k="20" />
-<hkern u1="&#x1ecc;" u2="X" k="41" />
-<hkern u1="&#x1ecc;" u2="W" k="20" />
-<hkern u1="&#x1ecc;" u2="V" k="20" />
-<hkern u1="&#x1ecc;" u2="T" k="61" />
-<hkern u1="&#x1ecc;" u2="A" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1ecc;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1ecd;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ecd;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ecd;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x1ecd;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x1ecd;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x1ecd;" u2="&#x17e;" k="20" />
-<hkern u1="&#x1ecd;" u2="&#x17c;" k="20" />
-<hkern u1="&#x1ecd;" u2="&#x17a;" k="20" />
-<hkern u1="&#x1ecd;" u2="&#x175;" k="41" />
-<hkern u1="&#x1ecd;" u2="&#xfd;" k="41" />
-<hkern u1="&#x1ecd;" u2="z" k="20" />
-<hkern u1="&#x1ecd;" u2="y" k="41" />
-<hkern u1="&#x1ecd;" u2="x" k="41" />
-<hkern u1="&#x1ecd;" u2="w" k="41" />
-<hkern u1="&#x1ecd;" u2="v" k="41" />
-<hkern u1="&#x1ecd;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ecd;" u2="&#x22;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1ece;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1ece;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x1eae;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x1eac;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x1e84;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x1e82;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x1e80;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x1e00;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x405;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x21a;" k="61" />
-<hkern u1="&#x1ece;" u2="&#x1fa;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x17d;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x17b;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x179;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x178;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x176;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x174;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x164;" k="61" />
-<hkern u1="&#x1ece;" u2="&#x162;" k="61" />
-<hkern u1="&#x1ece;" u2="&#x104;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x102;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x100;" k="41" />
-<hkern u1="&#x1ece;" u2="&#xdd;" k="20" />
-<hkern u1="&#x1ece;" u2="&#xc5;" k="41" />
-<hkern u1="&#x1ece;" u2="&#xc4;" k="41" />
-<hkern u1="&#x1ece;" u2="&#xc3;" k="41" />
-<hkern u1="&#x1ece;" u2="&#xc2;" k="41" />
-<hkern u1="&#x1ece;" u2="&#xc1;" k="41" />
-<hkern u1="&#x1ece;" u2="&#xc0;" k="41" />
-<hkern u1="&#x1ece;" u2="Z" k="20" />
-<hkern u1="&#x1ece;" u2="Y" k="20" />
-<hkern u1="&#x1ece;" u2="X" k="41" />
-<hkern u1="&#x1ece;" u2="W" k="20" />
-<hkern u1="&#x1ece;" u2="V" k="20" />
-<hkern u1="&#x1ece;" u2="T" k="61" />
-<hkern u1="&#x1ece;" u2="A" k="41" />
-<hkern u1="&#x1ece;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1ece;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1ecf;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ecf;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ecf;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x1ecf;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x1ecf;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x1ecf;" u2="&#x17e;" k="20" />
-<hkern u1="&#x1ecf;" u2="&#x17c;" k="20" />
-<hkern u1="&#x1ecf;" u2="&#x17a;" k="20" />
-<hkern u1="&#x1ecf;" u2="&#x175;" k="41" />
-<hkern u1="&#x1ecf;" u2="&#xfd;" k="41" />
-<hkern u1="&#x1ecf;" u2="z" k="20" />
-<hkern u1="&#x1ecf;" u2="y" k="41" />
-<hkern u1="&#x1ecf;" u2="x" k="41" />
-<hkern u1="&#x1ecf;" u2="w" k="41" />
-<hkern u1="&#x1ecf;" u2="v" k="41" />
-<hkern u1="&#x1ecf;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ecf;" u2="&#x22;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1ed0;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1ed0;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x1eae;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x1eac;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x1e84;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x1e82;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x1e80;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x1e00;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x405;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x21a;" k="61" />
-<hkern u1="&#x1ed0;" u2="&#x1fa;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x17d;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x17b;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x179;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x178;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x176;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x174;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x164;" k="61" />
-<hkern u1="&#x1ed0;" u2="&#x162;" k="61" />
-<hkern u1="&#x1ed0;" u2="&#x104;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x102;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x100;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#xdd;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#xc5;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#xc4;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#xc3;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#xc2;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#xc1;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#xc0;" k="41" />
-<hkern u1="&#x1ed0;" u2="Z" k="20" />
-<hkern u1="&#x1ed0;" u2="Y" k="20" />
-<hkern u1="&#x1ed0;" u2="X" k="41" />
-<hkern u1="&#x1ed0;" u2="W" k="20" />
-<hkern u1="&#x1ed0;" u2="V" k="20" />
-<hkern u1="&#x1ed0;" u2="T" k="61" />
-<hkern u1="&#x1ed0;" u2="A" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1ed0;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1ed2;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1ed2;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1ed2;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x1eae;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x1eac;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x1e84;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x1e82;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x1e80;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x1e00;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x405;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x21a;" k="61" />
-<hkern u1="&#x1ed2;" u2="&#x1fa;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x17d;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x17b;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x179;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x178;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x176;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x174;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x164;" k="61" />
-<hkern u1="&#x1ed2;" u2="&#x162;" k="61" />
-<hkern u1="&#x1ed2;" u2="&#x104;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x102;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x100;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#xdd;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#xc5;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#xc4;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#xc3;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#xc2;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#xc1;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#xc0;" k="41" />
-<hkern u1="&#x1ed2;" u2="Z" k="20" />
-<hkern u1="&#x1ed2;" u2="Y" k="20" />
-<hkern u1="&#x1ed2;" u2="X" k="41" />
-<hkern u1="&#x1ed2;" u2="W" k="20" />
-<hkern u1="&#x1ed2;" u2="V" k="20" />
-<hkern u1="&#x1ed2;" u2="T" k="61" />
-<hkern u1="&#x1ed2;" u2="A" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1ed2;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1ed4;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1ed4;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1ed4;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x1eae;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x1eac;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x1e84;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x1e82;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x1e80;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x1e00;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x405;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x21a;" k="61" />
-<hkern u1="&#x1ed4;" u2="&#x1fa;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x17d;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x17b;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x179;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x178;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x176;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x174;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x164;" k="61" />
-<hkern u1="&#x1ed4;" u2="&#x162;" k="61" />
-<hkern u1="&#x1ed4;" u2="&#x104;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x102;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x100;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#xdd;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#xc5;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#xc4;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#xc3;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#xc2;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#xc1;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#xc0;" k="41" />
-<hkern u1="&#x1ed4;" u2="Z" k="20" />
-<hkern u1="&#x1ed4;" u2="Y" k="20" />
-<hkern u1="&#x1ed4;" u2="X" k="41" />
-<hkern u1="&#x1ed4;" u2="W" k="20" />
-<hkern u1="&#x1ed4;" u2="V" k="20" />
-<hkern u1="&#x1ed4;" u2="T" k="61" />
-<hkern u1="&#x1ed4;" u2="A" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1ed4;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1ed6;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1ed6;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1ed6;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x1eae;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x1eac;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x1e84;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x1e82;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x1e80;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x1e00;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x405;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x21a;" k="61" />
-<hkern u1="&#x1ed6;" u2="&#x1fa;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x17d;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x17b;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x179;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x178;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x176;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x174;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x164;" k="61" />
-<hkern u1="&#x1ed6;" u2="&#x162;" k="61" />
-<hkern u1="&#x1ed6;" u2="&#x104;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x102;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x100;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#xdd;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#xc5;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#xc4;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#xc3;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#xc2;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#xc1;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#xc0;" k="41" />
-<hkern u1="&#x1ed6;" u2="Z" k="20" />
-<hkern u1="&#x1ed6;" u2="Y" k="20" />
-<hkern u1="&#x1ed6;" u2="X" k="41" />
-<hkern u1="&#x1ed6;" u2="W" k="20" />
-<hkern u1="&#x1ed6;" u2="V" k="20" />
-<hkern u1="&#x1ed6;" u2="T" k="61" />
-<hkern u1="&#x1ed6;" u2="A" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1ed6;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1ed8;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1ed8;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1ed8;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x1eae;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x1eac;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x1e84;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x1e82;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x1e80;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x1e00;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x405;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x21a;" k="61" />
-<hkern u1="&#x1ed8;" u2="&#x1fa;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x17d;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x17b;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x179;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x178;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x176;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x174;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x164;" k="61" />
-<hkern u1="&#x1ed8;" u2="&#x162;" k="61" />
-<hkern u1="&#x1ed8;" u2="&#x104;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x102;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x100;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#xdd;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#xc5;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#xc4;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#xc3;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#xc2;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#xc1;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#xc0;" k="41" />
-<hkern u1="&#x1ed8;" u2="Z" k="20" />
-<hkern u1="&#x1ed8;" u2="Y" k="20" />
-<hkern u1="&#x1ed8;" u2="X" k="41" />
-<hkern u1="&#x1ed8;" u2="W" k="20" />
-<hkern u1="&#x1ed8;" u2="V" k="20" />
-<hkern u1="&#x1ed8;" u2="T" k="61" />
-<hkern u1="&#x1ed8;" u2="A" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1ed8;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1edb;" g2="uniFB04" k="-82" />
-<hkern u1="&#x1edb;" g2="uniFB03" k="-82" />
-<hkern u1="&#x1edb;" g2="uniFB02" k="-82" />
-<hkern u1="&#x1edb;" g2="uniFB01" k="-82" />
-<hkern u1="&#x1edb;" g2="ff" k="-82" />
-<hkern u1="&#x1edb;" u2="&#x1ef5;" k="-102" />
-<hkern u1="&#x1edb;" u2="&#x1e83;" k="-102" />
-<hkern u1="&#x1edb;" u2="&#x1e81;" k="-102" />
-<hkern u1="&#x1edb;" u2="&#x21b;" k="-82" />
-<hkern u1="&#x1edb;" u2="&#x175;" k="-102" />
-<hkern u1="&#x1edb;" u2="&#x165;" k="-82" />
-<hkern u1="&#x1edb;" u2="&#x163;" k="-82" />
-<hkern u1="&#x1edb;" u2="&#xfd;" k="-102" />
-<hkern u1="&#x1edb;" u2="y" k="-102" />
-<hkern u1="&#x1edb;" u2="x" k="-102" />
-<hkern u1="&#x1edb;" u2="w" k="-102" />
-<hkern u1="&#x1edb;" u2="v" k="-102" />
-<hkern u1="&#x1edb;" u2="t" k="-82" />
-<hkern u1="&#x1edb;" u2="f" k="-82" />
-<hkern u1="&#x1edd;" g2="uniFB04" k="-82" />
-<hkern u1="&#x1edd;" g2="uniFB03" k="-82" />
-<hkern u1="&#x1edd;" g2="uniFB02" k="-82" />
-<hkern u1="&#x1edd;" g2="uniFB01" k="-82" />
-<hkern u1="&#x1edd;" g2="ff" k="-82" />
-<hkern u1="&#x1edd;" u2="&#x1ef5;" k="-102" />
-<hkern u1="&#x1edd;" u2="&#x1e83;" k="-102" />
-<hkern u1="&#x1edd;" u2="&#x1e81;" k="-102" />
-<hkern u1="&#x1edd;" u2="&#x21b;" k="-82" />
-<hkern u1="&#x1edd;" u2="&#x175;" k="-102" />
-<hkern u1="&#x1edd;" u2="&#x165;" k="-82" />
-<hkern u1="&#x1edd;" u2="&#x163;" k="-82" />
-<hkern u1="&#x1edd;" u2="&#xfd;" k="-102" />
-<hkern u1="&#x1edd;" u2="y" k="-102" />
-<hkern u1="&#x1edd;" u2="x" k="-102" />
-<hkern u1="&#x1edd;" u2="w" k="-102" />
-<hkern u1="&#x1edd;" u2="v" k="-102" />
-<hkern u1="&#x1edd;" u2="t" k="-82" />
-<hkern u1="&#x1edd;" u2="f" k="-82" />
-<hkern u1="&#x1edf;" g2="uniFB04" k="-82" />
-<hkern u1="&#x1edf;" g2="uniFB03" k="-82" />
-<hkern u1="&#x1edf;" g2="uniFB02" k="-82" />
-<hkern u1="&#x1edf;" g2="uniFB01" k="-82" />
-<hkern u1="&#x1edf;" g2="ff" k="-82" />
-<hkern u1="&#x1edf;" u2="&#x1ef5;" k="-102" />
-<hkern u1="&#x1edf;" u2="&#x1e83;" k="-102" />
-<hkern u1="&#x1edf;" u2="&#x1e81;" k="-102" />
-<hkern u1="&#x1edf;" u2="&#x21b;" k="-82" />
-<hkern u1="&#x1edf;" u2="&#x175;" k="-102" />
-<hkern u1="&#x1edf;" u2="&#x165;" k="-82" />
-<hkern u1="&#x1edf;" u2="&#x163;" k="-82" />
-<hkern u1="&#x1edf;" u2="&#xfd;" k="-102" />
-<hkern u1="&#x1edf;" u2="y" k="-102" />
-<hkern u1="&#x1edf;" u2="x" k="-102" />
-<hkern u1="&#x1edf;" u2="w" k="-102" />
-<hkern u1="&#x1edf;" u2="v" k="-102" />
-<hkern u1="&#x1edf;" u2="t" k="-82" />
-<hkern u1="&#x1edf;" u2="f" k="-82" />
-<hkern u1="&#x1ee1;" g2="uniFB04" k="-82" />
-<hkern u1="&#x1ee1;" g2="uniFB03" k="-82" />
-<hkern u1="&#x1ee1;" g2="uniFB02" k="-82" />
-<hkern u1="&#x1ee1;" g2="uniFB01" k="-82" />
-<hkern u1="&#x1ee1;" g2="ff" k="-82" />
-<hkern u1="&#x1ee1;" u2="&#x1ef5;" k="-102" />
-<hkern u1="&#x1ee1;" u2="&#x1e83;" k="-102" />
-<hkern u1="&#x1ee1;" u2="&#x1e81;" k="-102" />
-<hkern u1="&#x1ee1;" u2="&#x21b;" k="-82" />
-<hkern u1="&#x1ee1;" u2="&#x175;" k="-102" />
-<hkern u1="&#x1ee1;" u2="&#x165;" k="-82" />
-<hkern u1="&#x1ee1;" u2="&#x163;" k="-82" />
-<hkern u1="&#x1ee1;" u2="&#xfd;" k="-102" />
-<hkern u1="&#x1ee1;" u2="y" k="-102" />
-<hkern u1="&#x1ee1;" u2="x" k="-102" />
-<hkern u1="&#x1ee1;" u2="w" k="-102" />
-<hkern u1="&#x1ee1;" u2="v" k="-102" />
-<hkern u1="&#x1ee1;" u2="t" k="-82" />
-<hkern u1="&#x1ee1;" u2="f" k="-82" />
-<hkern u1="&#x1ee3;" g2="uniFB04" k="-82" />
-<hkern u1="&#x1ee3;" g2="uniFB03" k="-82" />
-<hkern u1="&#x1ee3;" g2="uniFB02" k="-82" />
-<hkern u1="&#x1ee3;" g2="uniFB01" k="-82" />
-<hkern u1="&#x1ee3;" g2="ff" k="-82" />
-<hkern u1="&#x1ee3;" u2="&#x1ef5;" k="-102" />
-<hkern u1="&#x1ee3;" u2="&#x1e83;" k="-102" />
-<hkern u1="&#x1ee3;" u2="&#x1e81;" k="-102" />
-<hkern u1="&#x1ee3;" u2="&#x21b;" k="-82" />
-<hkern u1="&#x1ee3;" u2="&#x175;" k="-102" />
-<hkern u1="&#x1ee3;" u2="&#x165;" k="-82" />
-<hkern u1="&#x1ee3;" u2="&#x163;" k="-82" />
-<hkern u1="&#x1ee3;" u2="&#xfd;" k="-102" />
-<hkern u1="&#x1ee3;" u2="y" k="-102" />
-<hkern u1="&#x1ee3;" u2="x" k="-102" />
-<hkern u1="&#x1ee3;" u2="w" k="-102" />
-<hkern u1="&#x1ee3;" u2="v" k="-102" />
-<hkern u1="&#x1ee3;" u2="t" k="-82" />
-<hkern u1="&#x1ee3;" u2="f" k="-82" />
-<hkern u1="&#x1ee4;" u2="&#x201e;" k="41" />
-<hkern u1="&#x1ee4;" u2="&#x201a;" k="41" />
-<hkern u1="&#x1ee4;" u2="&#x1eb6;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x1eb4;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x1eb2;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x1eb0;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x1eae;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x1eac;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x1eaa;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x1ea8;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x1ea6;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x1ea4;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x1ea2;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x1ea0;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x1e00;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x1fa;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x104;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x102;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x100;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#xc5;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#xc4;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#xc3;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#xc2;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#xc1;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#xc0;" k="20" />
-<hkern u1="&#x1ee4;" u2="A" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x2e;" k="41" />
-<hkern u1="&#x1ee4;" u2="&#x2c;" k="41" />
-<hkern u1="&#x1ee9;" g2="uniFB04" k="-102" />
-<hkern u1="&#x1ee9;" g2="uniFB03" k="-102" />
-<hkern u1="&#x1ee9;" g2="uniFB02" k="-102" />
-<hkern u1="&#x1ee9;" g2="uniFB01" k="-102" />
-<hkern u1="&#x1ee9;" g2="ff" k="-102" />
-<hkern u1="&#x1ee9;" u2="&#x1ef5;" k="-102" />
-<hkern u1="&#x1ee9;" u2="&#x1e83;" k="-102" />
-<hkern u1="&#x1ee9;" u2="&#x1e81;" k="-102" />
-<hkern u1="&#x1ee9;" u2="&#x21b;" k="-102" />
-<hkern u1="&#x1ee9;" u2="&#x175;" k="-102" />
-<hkern u1="&#x1ee9;" u2="&#x165;" k="-102" />
-<hkern u1="&#x1ee9;" u2="&#x163;" k="-102" />
-<hkern u1="&#x1ee9;" u2="&#xfd;" k="-102" />
-<hkern u1="&#x1ee9;" u2="y" k="-102" />
-<hkern u1="&#x1ee9;" u2="x" k="-102" />
-<hkern u1="&#x1ee9;" u2="w" k="-102" />
-<hkern u1="&#x1ee9;" u2="v" k="-102" />
-<hkern u1="&#x1ee9;" u2="t" k="-102" />
-<hkern u1="&#x1ee9;" u2="f" k="-102" />
-<hkern u1="&#x1eeb;" g2="uniFB04" k="-102" />
-<hkern u1="&#x1eeb;" g2="uniFB03" k="-102" />
-<hkern u1="&#x1eeb;" g2="uniFB02" k="-102" />
-<hkern u1="&#x1eeb;" g2="uniFB01" k="-102" />
-<hkern u1="&#x1eeb;" g2="ff" k="-102" />
-<hkern u1="&#x1eeb;" u2="&#x1ef5;" k="-102" />
-<hkern u1="&#x1eeb;" u2="&#x1e83;" k="-102" />
-<hkern u1="&#x1eeb;" u2="&#x1e81;" k="-102" />
-<hkern u1="&#x1eeb;" u2="&#x21b;" k="-102" />
-<hkern u1="&#x1eeb;" u2="&#x175;" k="-102" />
-<hkern u1="&#x1eeb;" u2="&#x165;" k="-102" />
-<hkern u1="&#x1eeb;" u2="&#x163;" k="-102" />
-<hkern u1="&#x1eeb;" u2="&#xfd;" k="-102" />
-<hkern u1="&#x1eeb;" u2="y" k="-102" />
-<hkern u1="&#x1eeb;" u2="x" k="-102" />
-<hkern u1="&#x1eeb;" u2="w" k="-102" />
-<hkern u1="&#x1eeb;" u2="v" k="-102" />
-<hkern u1="&#x1eeb;" u2="t" k="-102" />
-<hkern u1="&#x1eeb;" u2="f" k="-102" />
-<hkern u1="&#x1eed;" g2="uniFB04" k="-102" />
-<hkern u1="&#x1eed;" g2="uniFB03" k="-102" />
-<hkern u1="&#x1eed;" g2="uniFB02" k="-102" />
-<hkern u1="&#x1eed;" g2="uniFB01" k="-102" />
-<hkern u1="&#x1eed;" g2="ff" k="-102" />
-<hkern u1="&#x1eed;" u2="&#x1ef5;" k="-102" />
-<hkern u1="&#x1eed;" u2="&#x1e83;" k="-102" />
-<hkern u1="&#x1eed;" u2="&#x1e81;" k="-102" />
-<hkern u1="&#x1eed;" u2="&#x21b;" k="-102" />
-<hkern u1="&#x1eed;" u2="&#x175;" k="-102" />
-<hkern u1="&#x1eed;" u2="&#x165;" k="-102" />
-<hkern u1="&#x1eed;" u2="&#x163;" k="-102" />
-<hkern u1="&#x1eed;" u2="&#xfd;" k="-102" />
-<hkern u1="&#x1eed;" u2="y" k="-102" />
-<hkern u1="&#x1eed;" u2="x" k="-102" />
-<hkern u1="&#x1eed;" u2="w" k="-102" />
-<hkern u1="&#x1eed;" u2="v" k="-102" />
-<hkern u1="&#x1eed;" u2="t" k="-102" />
-<hkern u1="&#x1eed;" u2="f" k="-102" />
-<hkern u1="&#x1eef;" g2="uniFB04" k="-102" />
-<hkern u1="&#x1eef;" g2="uniFB03" k="-102" />
-<hkern u1="&#x1eef;" g2="uniFB02" k="-102" />
-<hkern u1="&#x1eef;" g2="uniFB01" k="-102" />
-<hkern u1="&#x1eef;" g2="ff" k="-102" />
-<hkern u1="&#x1eef;" u2="&#x1ef5;" k="-102" />
-<hkern u1="&#x1eef;" u2="&#x1e83;" k="-102" />
-<hkern u1="&#x1eef;" u2="&#x1e81;" k="-102" />
-<hkern u1="&#x1eef;" u2="&#x21b;" k="-102" />
-<hkern u1="&#x1eef;" u2="&#x175;" k="-102" />
-<hkern u1="&#x1eef;" u2="&#x165;" k="-102" />
-<hkern u1="&#x1eef;" u2="&#x163;" k="-102" />
-<hkern u1="&#x1eef;" u2="&#xfd;" k="-102" />
-<hkern u1="&#x1eef;" u2="y" k="-102" />
-<hkern u1="&#x1eef;" u2="x" k="-102" />
-<hkern u1="&#x1eef;" u2="w" k="-102" />
-<hkern u1="&#x1eef;" u2="v" k="-102" />
-<hkern u1="&#x1eef;" u2="t" k="-102" />
-<hkern u1="&#x1eef;" u2="f" k="-102" />
-<hkern u1="&#x1ef1;" g2="uniFB04" k="-102" />
-<hkern u1="&#x1ef1;" g2="uniFB03" k="-102" />
-<hkern u1="&#x1ef1;" g2="uniFB02" k="-102" />
-<hkern u1="&#x1ef1;" g2="uniFB01" k="-102" />
-<hkern u1="&#x1ef1;" g2="ff" k="-102" />
-<hkern u1="&#x1ef1;" u2="&#x1ef5;" k="-102" />
-<hkern u1="&#x1ef1;" u2="&#x1e83;" k="-102" />
-<hkern u1="&#x1ef1;" u2="&#x1e81;" k="-102" />
-<hkern u1="&#x1ef1;" u2="&#x21b;" k="-102" />
-<hkern u1="&#x1ef1;" u2="&#x175;" k="-102" />
-<hkern u1="&#x1ef1;" u2="&#x165;" k="-102" />
-<hkern u1="&#x1ef1;" u2="&#x163;" k="-102" />
-<hkern u1="&#x1ef1;" u2="&#xfd;" k="-102" />
-<hkern u1="&#x1ef1;" u2="y" k="-102" />
-<hkern u1="&#x1ef1;" u2="x" k="-102" />
-<hkern u1="&#x1ef1;" u2="w" k="-102" />
-<hkern u1="&#x1ef1;" u2="v" k="-102" />
-<hkern u1="&#x1ef1;" u2="t" k="-102" />
-<hkern u1="&#x1ef1;" u2="f" k="-102" />
-<hkern u1="&#x1ef2;" u2="&#x201e;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x201a;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1ef1;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x1eef;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x1eed;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x1eeb;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x1ee9;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x1ee7;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x1ee5;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x1ee3;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x1ee1;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x1edf;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x1edd;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x1edb;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x1ed9;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x1ed7;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x1ed5;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x1ed1;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x1ecf;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x1ecd;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x1ec7;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ec5;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ec3;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ebf;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ebd;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ebb;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1eb9;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1eb7;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1eb6;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1eb5;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1eb4;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1eb3;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1eb2;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1eb1;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1eb0;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1eaf;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1eae;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1ead;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1eac;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1eab;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1eaa;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1ea9;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ea8;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1ea6;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1ea5;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ea4;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1ea3;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ea2;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1ea1;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ea0;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1e3f;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x1e01;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1e00;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x219;" k="82" />
-<hkern u1="&#x1ef2;" u2="&#x1ff;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x1fd;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1fb;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1fa;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1b0;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x1a1;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x17e;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x17c;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x17a;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x173;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x171;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x16f;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x16d;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x16b;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x169;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x15f;" k="82" />
-<hkern u1="&#x1ef2;" u2="&#x15b;" k="82" />
-<hkern u1="&#x1ef2;" u2="&#x157;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x155;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x153;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x152;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x151;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x150;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x14f;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x14d;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x14b;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x146;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x144;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x138;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x123;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x122;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x121;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x120;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x11f;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x11d;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x11b;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x119;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x117;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x115;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x113;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x111;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x10f;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x10d;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x10b;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x109;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x108;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x107;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x106;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x105;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x104;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x103;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x102;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x101;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x100;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#xfc;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#xfb;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#xfa;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#xf9;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#xf8;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xf6;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xf5;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xf4;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xf3;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xf2;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xeb;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xea;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xe9;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xe8;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xe7;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xe6;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xe5;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xe4;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xe3;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xe2;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xe1;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xe0;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#xc5;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#xc4;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#xc3;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#xc2;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#xc1;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#xc0;" k="123" />
-<hkern u1="&#x1ef2;" u2="z" k="41" />
-<hkern u1="&#x1ef2;" u2="u" k="61" />
-<hkern u1="&#x1ef2;" u2="s" k="82" />
-<hkern u1="&#x1ef2;" u2="r" k="61" />
-<hkern u1="&#x1ef2;" u2="q" k="102" />
-<hkern u1="&#x1ef2;" u2="p" k="61" />
-<hkern u1="&#x1ef2;" u2="o" k="102" />
-<hkern u1="&#x1ef2;" u2="n" k="61" />
-<hkern u1="&#x1ef2;" u2="m" k="61" />
-<hkern u1="&#x1ef2;" u2="g" k="41" />
-<hkern u1="&#x1ef2;" u2="e" k="102" />
-<hkern u1="&#x1ef2;" u2="d" k="102" />
-<hkern u1="&#x1ef2;" u2="c" k="102" />
-<hkern u1="&#x1ef2;" u2="a" k="102" />
-<hkern u1="&#x1ef2;" u2="Q" k="41" />
-<hkern u1="&#x1ef2;" u2="O" k="41" />
-<hkern u1="&#x1ef2;" u2="G" k="41" />
-<hkern u1="&#x1ef2;" u2="C" k="41" />
-<hkern u1="&#x1ef2;" u2="A" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1ef2;" u2="&#x2e;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x2c;" k="123" />
-<hkern u1="&#x1ef3;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1ef3;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x1ef3;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1ef3;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x1ef3;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1ef3;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1ef3;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1ef3;" u2="&#x27;" k="-82" />
-<hkern u1="&#x1ef3;" u2="&#x22;" k="-82" />
-<hkern u1="&#x1ef4;" u2="&#x201e;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x201a;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1ef1;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x1eef;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x1eed;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x1eeb;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x1ee9;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x1ee7;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x1ee5;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x1ee3;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x1ee1;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x1edf;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x1edd;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x1edb;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x1ed9;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x1ed7;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x1ed5;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x1ed1;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x1ecf;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x1ecd;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x1ec7;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ec5;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ec3;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ebf;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ebd;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ebb;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1eb9;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1eb7;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1eb6;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1eb5;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1eb4;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1eb3;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1eb2;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1eb1;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1eb0;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1eaf;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1eae;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1ead;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1eac;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1eab;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1eaa;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1ea9;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ea8;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1ea6;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1ea5;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ea4;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1ea3;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ea2;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1ea1;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ea0;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1e3f;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x1e01;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1e00;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x219;" k="82" />
-<hkern u1="&#x1ef4;" u2="&#x1ff;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x1fd;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1fb;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1fa;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1b0;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x1a1;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x17e;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x17c;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x17a;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x173;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x171;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x16f;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x16d;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x16b;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x169;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x15f;" k="82" />
-<hkern u1="&#x1ef4;" u2="&#x15b;" k="82" />
-<hkern u1="&#x1ef4;" u2="&#x157;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x155;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x153;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x152;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x151;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x150;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x14f;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x14d;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x14b;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x146;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x144;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x138;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x123;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x122;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x121;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x120;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x11f;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x11d;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x11b;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x119;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x117;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x115;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x113;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x111;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x10f;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x10d;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x10b;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x109;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x108;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x107;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x106;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x105;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x104;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x103;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x102;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x101;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x100;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#xfc;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#xfb;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#xfa;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#xf9;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#xf8;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xf6;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xf5;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xf4;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xf3;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xf2;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xeb;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xea;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xe9;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xe8;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xe7;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xe6;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xe5;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xe4;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xe3;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xe2;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xe1;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xe0;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#xc5;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#xc4;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#xc3;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#xc2;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#xc1;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#xc0;" k="123" />
-<hkern u1="&#x1ef4;" u2="z" k="41" />
-<hkern u1="&#x1ef4;" u2="u" k="61" />
-<hkern u1="&#x1ef4;" u2="s" k="82" />
-<hkern u1="&#x1ef4;" u2="r" k="61" />
-<hkern u1="&#x1ef4;" u2="q" k="102" />
-<hkern u1="&#x1ef4;" u2="p" k="61" />
-<hkern u1="&#x1ef4;" u2="o" k="102" />
-<hkern u1="&#x1ef4;" u2="n" k="61" />
-<hkern u1="&#x1ef4;" u2="m" k="61" />
-<hkern u1="&#x1ef4;" u2="g" k="41" />
-<hkern u1="&#x1ef4;" u2="e" k="102" />
-<hkern u1="&#x1ef4;" u2="d" k="102" />
-<hkern u1="&#x1ef4;" u2="c" k="102" />
-<hkern u1="&#x1ef4;" u2="a" k="102" />
-<hkern u1="&#x1ef4;" u2="Q" k="41" />
-<hkern u1="&#x1ef4;" u2="O" k="41" />
-<hkern u1="&#x1ef4;" u2="G" k="41" />
-<hkern u1="&#x1ef4;" u2="C" k="41" />
-<hkern u1="&#x1ef4;" u2="A" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1ef4;" u2="&#x2e;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x2c;" k="123" />
-<hkern u1="&#x1ef5;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1ef5;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x1ef5;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1ef5;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x1ef5;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1ef5;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1ef5;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1ef5;" u2="&#x27;" k="-82" />
-<hkern u1="&#x1ef5;" u2="&#x22;" k="-82" />
-<hkern u1="&#x1ef6;" u2="&#x201e;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x201a;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1ef1;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x1eef;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x1eed;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x1eeb;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x1ee9;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x1ee7;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x1ee5;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x1ee3;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x1ee1;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x1edf;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x1edd;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x1edb;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x1ed9;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x1ed7;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x1ed5;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x1ed1;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x1ecf;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x1ecd;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x1ec7;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ec5;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ec3;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ebf;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ebd;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ebb;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1eb9;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1eb7;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1eb6;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1eb5;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1eb4;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1eb3;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1eb2;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1eb1;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1eb0;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1eaf;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1eae;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1ead;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1eac;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1eab;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1eaa;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1ea9;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ea8;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1ea6;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1ea5;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ea4;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1ea3;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ea2;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1ea1;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ea0;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1e3f;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x1e01;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1e00;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x219;" k="82" />
-<hkern u1="&#x1ef6;" u2="&#x1ff;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x1fd;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1fb;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1fa;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1b0;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x1a1;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x17e;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x17c;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x17a;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x173;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x171;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x16f;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x16d;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x16b;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x169;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x15f;" k="82" />
-<hkern u1="&#x1ef6;" u2="&#x15b;" k="82" />
-<hkern u1="&#x1ef6;" u2="&#x157;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x155;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x153;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x152;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x151;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x150;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x14f;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x14d;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x14b;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x146;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x144;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x138;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x123;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x122;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x121;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x120;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x11f;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x11d;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x11b;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x119;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x117;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x115;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x113;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x111;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x10f;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x10d;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x10b;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x109;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x108;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x107;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x106;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x105;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x104;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x103;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x102;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x101;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x100;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#xfc;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#xfb;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#xfa;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#xf9;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#xf8;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xf6;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xf5;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xf4;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xf3;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xf2;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xeb;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xea;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xe9;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xe8;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xe7;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xe6;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xe5;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xe4;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xe3;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xe2;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xe1;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xe0;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#xc5;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#xc4;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#xc3;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#xc2;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#xc1;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#xc0;" k="123" />
-<hkern u1="&#x1ef6;" u2="z" k="41" />
-<hkern u1="&#x1ef6;" u2="u" k="61" />
-<hkern u1="&#x1ef6;" u2="s" k="82" />
-<hkern u1="&#x1ef6;" u2="r" k="61" />
-<hkern u1="&#x1ef6;" u2="q" k="102" />
-<hkern u1="&#x1ef6;" u2="p" k="61" />
-<hkern u1="&#x1ef6;" u2="o" k="102" />
-<hkern u1="&#x1ef6;" u2="n" k="61" />
-<hkern u1="&#x1ef6;" u2="m" k="61" />
-<hkern u1="&#x1ef6;" u2="g" k="41" />
-<hkern u1="&#x1ef6;" u2="e" k="102" />
-<hkern u1="&#x1ef6;" u2="d" k="102" />
-<hkern u1="&#x1ef6;" u2="c" k="102" />
-<hkern u1="&#x1ef6;" u2="a" k="102" />
-<hkern u1="&#x1ef6;" u2="Q" k="41" />
-<hkern u1="&#x1ef6;" u2="O" k="41" />
-<hkern u1="&#x1ef6;" u2="G" k="41" />
-<hkern u1="&#x1ef6;" u2="C" k="41" />
-<hkern u1="&#x1ef6;" u2="A" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1ef6;" u2="&#x2e;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x2c;" k="123" />
-<hkern u1="&#x1ef7;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1ef7;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x1ef7;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1ef7;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x1ef7;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1ef7;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1ef7;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1ef7;" u2="&#x27;" k="-82" />
-<hkern u1="&#x1ef7;" u2="&#x22;" k="-82" />
-<hkern u1="&#x1ef8;" u2="&#x201e;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x201a;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1ef1;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x1eef;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x1eed;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x1eeb;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x1ee9;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x1ee7;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x1ee5;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x1ee3;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x1ee1;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x1edf;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x1edd;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x1edb;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x1ed9;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x1ed7;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x1ed5;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x1ed1;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x1ecf;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x1ecd;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x1ec7;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ec5;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ec3;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ebf;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ebd;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ebb;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1eb9;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1eb7;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1eb6;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1eb5;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1eb4;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1eb3;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1eb2;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1eb1;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1eb0;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1eaf;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1eae;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1ead;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1eac;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1eab;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1eaa;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1ea9;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ea8;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1ea6;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1ea5;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ea4;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1ea3;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ea2;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1ea1;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ea0;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1e3f;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x1e01;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1e00;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x219;" k="82" />
-<hkern u1="&#x1ef8;" u2="&#x1ff;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x1fd;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1fb;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1fa;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1b0;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x1a1;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x17e;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x17c;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x17a;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x173;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x171;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x16f;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x16d;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x16b;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x169;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x15f;" k="82" />
-<hkern u1="&#x1ef8;" u2="&#x15b;" k="82" />
-<hkern u1="&#x1ef8;" u2="&#x157;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x155;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x153;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x152;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x151;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x150;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x14f;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x14d;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x14b;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x146;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x144;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x138;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x123;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x122;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x121;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x120;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x11f;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x11d;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x11b;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x119;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x117;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x115;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x113;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x111;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x10f;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x10d;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x10b;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x109;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x108;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x107;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x106;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x105;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x104;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x103;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x102;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x101;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x100;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#xfc;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#xfb;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#xfa;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#xf9;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#xf8;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xf6;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xf5;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xf4;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xf3;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xf2;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xeb;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xea;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xe9;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xe8;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xe7;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xe6;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xe5;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xe4;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xe3;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xe2;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xe1;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xe0;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#xc5;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#xc4;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#xc3;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#xc2;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#xc1;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#xc0;" k="123" />
-<hkern u1="&#x1ef8;" u2="z" k="41" />
-<hkern u1="&#x1ef8;" u2="u" k="61" />
-<hkern u1="&#x1ef8;" u2="s" k="82" />
-<hkern u1="&#x1ef8;" u2="r" k="61" />
-<hkern u1="&#x1ef8;" u2="q" k="102" />
-<hkern u1="&#x1ef8;" u2="p" k="61" />
-<hkern u1="&#x1ef8;" u2="o" k="102" />
-<hkern u1="&#x1ef8;" u2="n" k="61" />
-<hkern u1="&#x1ef8;" u2="m" k="61" />
-<hkern u1="&#x1ef8;" u2="g" k="41" />
-<hkern u1="&#x1ef8;" u2="e" k="102" />
-<hkern u1="&#x1ef8;" u2="d" k="102" />
-<hkern u1="&#x1ef8;" u2="c" k="102" />
-<hkern u1="&#x1ef8;" u2="a" k="102" />
-<hkern u1="&#x1ef8;" u2="Q" k="41" />
-<hkern u1="&#x1ef8;" u2="O" k="41" />
-<hkern u1="&#x1ef8;" u2="G" k="41" />
-<hkern u1="&#x1ef8;" u2="C" k="41" />
-<hkern u1="&#x1ef8;" u2="A" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1ef8;" u2="&#x2e;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x2c;" k="123" />
-<hkern u1="&#x1ef9;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1ef9;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x1ef9;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1ef9;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x1ef9;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1ef9;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1ef9;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1ef9;" u2="&#x27;" k="-82" />
-<hkern u1="&#x1ef9;" u2="&#x22;" k="-82" />
-<hkern u1="&#x1f4d;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1f4d;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1f4d;" u2="&#x3d2;" k="20" />
-<hkern u1="&#x1f4d;" u2="&#x3bb;" k="20" />
-<hkern u1="&#x1f4d;" u2="&#x3ab;" k="20" />
-<hkern u1="&#x1f4d;" u2="&#x3a8;" k="20" />
-<hkern u1="&#x1f4d;" u2="&#x3a7;" k="41" />
-<hkern u1="&#x1f4d;" u2="&#x3a5;" k="20" />
-<hkern u1="&#x1f4d;" u2="&#x3a4;" k="61" />
-<hkern u1="&#x1f4d;" u2="&#x3a3;" k="20" />
-<hkern u1="&#x1f4d;" u2="&#x39b;" k="41" />
-<hkern u1="&#x1f4d;" u2="&#x396;" k="20" />
-<hkern u1="&#x1f4d;" u2="&#x394;" k="41" />
-<hkern u1="&#x1f4d;" u2="&#x391;" k="41" />
-<hkern u1="&#x1f4d;" u2="&#x386;" k="41" />
-<hkern u1="&#x1f4d;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1f4d;" u2="&#x2c;" k="82" />
-<hkern u1="&#x2013;" u2="&#x50f;" k="41" />
-<hkern u1="&#x2013;" u2="&#x50e;" k="82" />
-<hkern u1="&#x2013;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x2013;" u2="&#x4b4;" k="82" />
-<hkern u1="&#x2013;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x2013;" u2="&#x4ac;" k="82" />
-<hkern u1="&#x2013;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x2013;" u2="&#x4a0;" k="82" />
-<hkern u1="&#x2013;" u2="&#x44a;" k="41" />
-<hkern u1="&#x2013;" u2="&#x442;" k="41" />
-<hkern u1="&#x2013;" u2="&#x42a;" k="82" />
-<hkern u1="&#x2013;" u2="&#x422;" k="82" />
-<hkern u1="&#x2013;" u2="&#x40b;" k="82" />
-<hkern u1="&#x2013;" u2="&#x402;" k="82" />
-<hkern u1="&#x2013;" u2="&#x3a4;" k="82" />
-<hkern u1="&#x2013;" u2="&#x21a;" k="82" />
-<hkern u1="&#x2013;" u2="&#x164;" k="82" />
-<hkern u1="&#x2013;" u2="&#x162;" k="82" />
-<hkern u1="&#x2013;" u2="T" k="82" />
-<hkern u1="&#x2014;" u2="&#x50f;" k="41" />
-<hkern u1="&#x2014;" u2="&#x50e;" k="82" />
-<hkern u1="&#x2014;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x2014;" u2="&#x4b4;" k="82" />
-<hkern u1="&#x2014;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x2014;" u2="&#x4ac;" k="82" />
-<hkern u1="&#x2014;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x2014;" u2="&#x4a0;" k="82" />
-<hkern u1="&#x2014;" u2="&#x44a;" k="41" />
-<hkern u1="&#x2014;" u2="&#x442;" k="41" />
-<hkern u1="&#x2014;" u2="&#x42a;" k="82" />
-<hkern u1="&#x2014;" u2="&#x422;" k="82" />
-<hkern u1="&#x2014;" u2="&#x40b;" k="82" />
-<hkern u1="&#x2014;" u2="&#x402;" k="82" />
-<hkern u1="&#x2014;" u2="&#x3a4;" k="82" />
-<hkern u1="&#x2014;" u2="&#x21a;" k="82" />
-<hkern u1="&#x2014;" u2="&#x164;" k="82" />
-<hkern u1="&#x2014;" u2="&#x162;" k="82" />
-<hkern u1="&#x2014;" u2="T" k="82" />
-<hkern u1="&#x2015;" u2="&#x50f;" k="41" />
-<hkern u1="&#x2015;" u2="&#x50e;" k="82" />
-<hkern u1="&#x2015;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x2015;" u2="&#x4b4;" k="82" />
-<hkern u1="&#x2015;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x2015;" u2="&#x4ac;" k="82" />
-<hkern u1="&#x2015;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x2015;" u2="&#x4a0;" k="82" />
-<hkern u1="&#x2015;" u2="&#x44a;" k="41" />
-<hkern u1="&#x2015;" u2="&#x442;" k="41" />
-<hkern u1="&#x2015;" u2="&#x42a;" k="82" />
-<hkern u1="&#x2015;" u2="&#x422;" k="82" />
-<hkern u1="&#x2015;" u2="&#x40b;" k="82" />
-<hkern u1="&#x2015;" u2="&#x402;" k="82" />
-<hkern u1="&#x2015;" u2="&#x3a4;" k="82" />
-<hkern u1="&#x2015;" u2="&#x21a;" k="82" />
-<hkern u1="&#x2015;" u2="&#x164;" k="82" />
-<hkern u1="&#x2015;" u2="&#x162;" k="82" />
-<hkern u1="&#x2015;" u2="T" k="82" />
-<hkern u1="&#x2018;" u2="&#x1ef8;" k="-20" />
-<hkern u1="&#x2018;" u2="&#x1ef6;" k="-20" />
-<hkern u1="&#x2018;" u2="&#x1ef4;" k="-20" />
-<hkern u1="&#x2018;" u2="&#x1ef2;" k="-20" />
-<hkern u1="&#x2018;" u2="&#x1ef1;" k="61" />
-<hkern u1="&#x2018;" u2="&#x1eef;" k="61" />
-<hkern u1="&#x2018;" u2="&#x1eed;" k="61" />
-<hkern u1="&#x2018;" u2="&#x1eeb;" k="61" />
-<hkern u1="&#x2018;" u2="&#x1ee9;" k="61" />
-<hkern u1="&#x2018;" u2="&#x1ee7;" k="61" />
-<hkern u1="&#x2018;" u2="&#x1ee5;" k="61" />
-<hkern u1="&#x2018;" u2="&#x1ee3;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1ee1;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1edf;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1edd;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1edb;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1ed9;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1ed7;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1ed5;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1ed1;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1ecf;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1ecd;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1ec7;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1ec5;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1ec3;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1ebf;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1ebd;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1ebb;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1eb9;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1eb7;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1eb6;" k="143" />
-<hkern u1="&#x2018;" u2="&#x1eb5;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1eb4;" k="143" />
-<hkern u1="&#x2018;" u2="&#x1eb3;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1eb2;" k="143" />
-<hkern u1="&#x2018;" u2="&#x1eb1;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1eb0;" k="143" />
-<hkern u1="&#x2018;" u2="&#x1eaf;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1eae;" k="143" />
-<hkern u1="&#x2018;" u2="&#x1ead;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1eac;" k="143" />
-<hkern u1="&#x2018;" u2="&#x1eab;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1eaa;" k="143" />
-<hkern u1="&#x2018;" u2="&#x1ea9;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1ea8;" k="143" />
-<hkern u1="&#x2018;" u2="&#x1ea6;" k="143" />
-<hkern u1="&#x2018;" u2="&#x1ea5;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1ea4;" k="143" />
-<hkern u1="&#x2018;" u2="&#x1ea3;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1ea2;" k="143" />
-<hkern u1="&#x2018;" u2="&#x1ea1;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1ea0;" k="143" />
-<hkern u1="&#x2018;" u2="&#x1e84;" k="-41" />
-<hkern u1="&#x2018;" u2="&#x1e82;" k="-41" />
-<hkern u1="&#x2018;" u2="&#x1e80;" k="-41" />
-<hkern u1="&#x2018;" u2="&#x1e3f;" k="61" />
-<hkern u1="&#x2018;" u2="&#x1e01;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1e00;" k="143" />
-<hkern u1="&#x2018;" u2="&#x513;" k="143" />
-<hkern u1="&#x2018;" u2="&#x512;" k="123" />
-<hkern u1="&#x2018;" u2="&#x511;" k="123" />
-<hkern u1="&#x2018;" u2="&#x50d;" k="123" />
-<hkern u1="&#x2018;" u2="&#x509;" k="143" />
-<hkern u1="&#x2018;" u2="&#x508;" k="123" />
-<hkern u1="&#x2018;" u2="&#x503;" k="123" />
-<hkern u1="&#x2018;" u2="&#x502;" k="143" />
-<hkern u1="&#x2018;" u2="&#x501;" k="123" />
-<hkern u1="&#x2018;" u2="&#x500;" k="143" />
-<hkern u1="&#x2018;" u2="&#x4eb;" k="123" />
-<hkern u1="&#x2018;" u2="&#x4e9;" k="123" />
-<hkern u1="&#x2018;" u2="&#x4e7;" k="123" />
-<hkern u1="&#x2018;" u2="&#x4db;" k="41" />
-<hkern u1="&#x2018;" u2="&#x4d9;" k="41" />
-<hkern u1="&#x2018;" u2="&#x4d7;" k="123" />
-<hkern u1="&#x2018;" u2="&#x4d5;" k="41" />
-<hkern u1="&#x2018;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x2018;" u2="&#x4d3;" k="41" />
-<hkern u1="&#x2018;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x2018;" u2="&#x4d1;" k="41" />
-<hkern u1="&#x2018;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x2018;" u2="&#x4c6;" k="143" />
-<hkern u1="&#x2018;" u2="&#x4c5;" k="123" />
-<hkern u1="&#x2018;" u2="&#x4ab;" k="123" />
-<hkern u1="&#x2018;" u2="&#x4a9;" k="123" />
-<hkern u1="&#x2018;" u2="&#x481;" k="123" />
-<hkern u1="&#x2018;" u2="&#x47d;" k="123" />
-<hkern u1="&#x2018;" u2="&#x47b;" k="123" />
-<hkern u1="&#x2018;" u2="&#x479;" k="123" />
-<hkern u1="&#x2018;" u2="&#x473;" k="123" />
-<hkern u1="&#x2018;" u2="&#x471;" k="20" />
-<hkern u1="&#x2018;" u2="&#x467;" k="143" />
-<hkern u1="&#x2018;" u2="&#x466;" k="143" />
-<hkern u1="&#x2018;" u2="&#x459;" k="143" />
-<hkern u1="&#x2018;" u2="&#x455;" k="61" />
-<hkern u1="&#x2018;" u2="&#x454;" k="123" />
-<hkern u1="&#x2018;" u2="&#x451;" k="123" />
-<hkern u1="&#x2018;" u2="&#x450;" k="123" />
-<hkern u1="&#x2018;" u2="&#x444;" k="123" />
-<hkern u1="&#x2018;" u2="&#x441;" k="123" />
-<hkern u1="&#x2018;" u2="&#x43e;" k="123" />
-<hkern u1="&#x2018;" u2="&#x43b;" k="143" />
-<hkern u1="&#x2018;" u2="&#x435;" k="123" />
-<hkern u1="&#x2018;" u2="&#x434;" k="143" />
-<hkern u1="&#x2018;" u2="&#x430;" k="41" />
-<hkern u1="&#x2018;" u2="&#x41b;" k="123" />
-<hkern u1="&#x2018;" u2="&#x414;" k="123" />
-<hkern u1="&#x2018;" u2="&#x410;" k="143" />
-<hkern u1="&#x2018;" u2="&#x409;" k="123" />
-<hkern u1="&#x2018;" u2="&#x3cc;" k="82" />
-<hkern u1="&#x2018;" u2="&#x3c6;" k="82" />
-<hkern u1="&#x2018;" u2="&#x3c3;" k="82" />
-<hkern u1="&#x2018;" u2="&#x3c2;" k="82" />
-<hkern u1="&#x2018;" u2="&#x3c1;" k="61" />
-<hkern u1="&#x2018;" u2="&#x3bf;" k="82" />
-<hkern u1="&#x2018;" u2="&#x3bc;" k="41" />
-<hkern u1="&#x2018;" u2="&#x3ba;" k="41" />
-<hkern u1="&#x2018;" u2="&#x3b7;" k="41" />
-<hkern u1="&#x2018;" u2="&#x3b6;" k="41" />
-<hkern u1="&#x2018;" u2="&#x3b5;" k="41" />
-<hkern u1="&#x2018;" u2="&#x3b4;" k="61" />
-<hkern u1="&#x2018;" u2="&#x3b1;" k="82" />
-<hkern u1="&#x2018;" u2="&#x3ae;" k="41" />
-<hkern u1="&#x2018;" u2="&#x3ad;" k="41" />
-<hkern u1="&#x2018;" u2="&#x3ac;" k="82" />
-<hkern u1="&#x2018;" u2="&#x39b;" k="143" />
-<hkern u1="&#x2018;" u2="&#x394;" k="143" />
-<hkern u1="&#x2018;" u2="&#x391;" k="143" />
-<hkern u1="&#x2018;" u2="&#x386;" k="143" />
-<hkern u1="&#x2018;" u2="&#x21a;" k="-41" />
-<hkern u1="&#x2018;" u2="&#x219;" k="61" />
-<hkern u1="&#x2018;" u2="&#x1ff;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1fd;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1fb;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1fa;" k="143" />
-<hkern u1="&#x2018;" u2="&#x1b0;" k="61" />
-<hkern u1="&#x2018;" u2="&#x1a1;" k="123" />
-<hkern u1="&#x2018;" u2="&#x178;" k="-20" />
-<hkern u1="&#x2018;" u2="&#x176;" k="-20" />
-<hkern u1="&#x2018;" u2="&#x174;" k="-41" />
-<hkern u1="&#x2018;" u2="&#x173;" k="61" />
-<hkern u1="&#x2018;" u2="&#x171;" k="61" />
-<hkern u1="&#x2018;" u2="&#x16f;" k="61" />
-<hkern u1="&#x2018;" u2="&#x16d;" k="61" />
-<hkern u1="&#x2018;" u2="&#x16b;" k="61" />
-<hkern u1="&#x2018;" u2="&#x169;" k="61" />
-<hkern u1="&#x2018;" u2="&#x164;" k="-41" />
-<hkern u1="&#x2018;" u2="&#x162;" k="-41" />
-<hkern u1="&#x2018;" u2="&#x15f;" k="61" />
-<hkern u1="&#x2018;" u2="&#x15b;" k="61" />
-<hkern u1="&#x2018;" u2="&#x157;" k="61" />
-<hkern u1="&#x2018;" u2="&#x155;" k="61" />
-<hkern u1="&#x2018;" u2="&#x153;" k="123" />
-<hkern u1="&#x2018;" u2="&#x151;" k="123" />
-<hkern u1="&#x2018;" u2="&#x14f;" k="123" />
-<hkern u1="&#x2018;" u2="&#x14d;" k="123" />
-<hkern u1="&#x2018;" u2="&#x14b;" k="61" />
-<hkern u1="&#x2018;" u2="&#x146;" k="61" />
-<hkern u1="&#x2018;" u2="&#x144;" k="61" />
-<hkern u1="&#x2018;" u2="&#x138;" k="61" />
-<hkern u1="&#x2018;" u2="&#x123;" k="61" />
-<hkern u1="&#x2018;" u2="&#x121;" k="61" />
-<hkern u1="&#x2018;" u2="&#x11f;" k="61" />
-<hkern u1="&#x2018;" u2="&#x11d;" k="61" />
-<hkern u1="&#x2018;" u2="&#x11b;" k="123" />
-<hkern u1="&#x2018;" u2="&#x119;" k="123" />
-<hkern u1="&#x2018;" u2="&#x117;" k="123" />
-<hkern u1="&#x2018;" u2="&#x115;" k="123" />
-<hkern u1="&#x2018;" u2="&#x113;" k="123" />
-<hkern u1="&#x2018;" u2="&#x111;" k="123" />
-<hkern u1="&#x2018;" u2="&#x10f;" k="123" />
-<hkern u1="&#x2018;" u2="&#x10d;" k="123" />
-<hkern u1="&#x2018;" u2="&#x10b;" k="123" />
-<hkern u1="&#x2018;" u2="&#x109;" k="123" />
-<hkern u1="&#x2018;" u2="&#x107;" k="123" />
-<hkern u1="&#x2018;" u2="&#x105;" k="82" />
-<hkern u1="&#x2018;" u2="&#x104;" k="143" />
-<hkern u1="&#x2018;" u2="&#x103;" k="82" />
-<hkern u1="&#x2018;" u2="&#x102;" k="143" />
-<hkern u1="&#x2018;" u2="&#x101;" k="82" />
-<hkern u1="&#x2018;" u2="&#x100;" k="143" />
-<hkern u1="&#x2018;" u2="&#xfc;" k="61" />
-<hkern u1="&#x2018;" u2="&#xfb;" k="61" />
-<hkern u1="&#x2018;" u2="&#xfa;" k="61" />
-<hkern u1="&#x2018;" u2="&#xf9;" k="61" />
-<hkern u1="&#x2018;" u2="&#xf8;" k="123" />
-<hkern u1="&#x2018;" u2="&#xf6;" k="123" />
-<hkern u1="&#x2018;" u2="&#xf5;" k="123" />
-<hkern u1="&#x2018;" u2="&#xf4;" k="123" />
-<hkern u1="&#x2018;" u2="&#xf3;" k="123" />
-<hkern u1="&#x2018;" u2="&#xf2;" k="123" />
-<hkern u1="&#x2018;" u2="&#xeb;" k="123" />
-<hkern u1="&#x2018;" u2="&#xea;" k="123" />
-<hkern u1="&#x2018;" u2="&#xe9;" k="123" />
-<hkern u1="&#x2018;" u2="&#xe8;" k="123" />
-<hkern u1="&#x2018;" u2="&#xe7;" k="123" />
-<hkern u1="&#x2018;" u2="&#xe6;" k="82" />
-<hkern u1="&#x2018;" u2="&#xe5;" k="82" />
-<hkern u1="&#x2018;" u2="&#xe4;" k="82" />
-<hkern u1="&#x2018;" u2="&#xe3;" k="82" />
-<hkern u1="&#x2018;" u2="&#xe2;" k="82" />
-<hkern u1="&#x2018;" u2="&#xe1;" k="82" />
-<hkern u1="&#x2018;" u2="&#xe0;" k="123" />
-<hkern u1="&#x2018;" u2="&#xdd;" k="-20" />
-<hkern u1="&#x2018;" u2="&#xc5;" k="143" />
-<hkern u1="&#x2018;" u2="&#xc4;" k="143" />
-<hkern u1="&#x2018;" u2="&#xc3;" k="143" />
-<hkern u1="&#x2018;" u2="&#xc2;" k="143" />
-<hkern u1="&#x2018;" u2="&#xc1;" k="143" />
-<hkern u1="&#x2018;" u2="&#xc0;" k="143" />
-<hkern u1="&#x2018;" u2="u" k="61" />
-<hkern u1="&#x2018;" u2="s" k="61" />
-<hkern u1="&#x2018;" u2="r" k="61" />
-<hkern u1="&#x2018;" u2="q" k="123" />
-<hkern u1="&#x2018;" u2="p" k="61" />
-<hkern u1="&#x2018;" u2="o" k="123" />
-<hkern u1="&#x2018;" u2="n" k="61" />
-<hkern u1="&#x2018;" u2="m" k="61" />
-<hkern u1="&#x2018;" u2="g" k="61" />
-<hkern u1="&#x2018;" u2="e" k="123" />
-<hkern u1="&#x2018;" u2="d" k="123" />
-<hkern u1="&#x2018;" u2="c" k="123" />
-<hkern u1="&#x2018;" u2="a" k="82" />
-<hkern u1="&#x2018;" u2="Y" k="-20" />
-<hkern u1="&#x2018;" u2="W" k="-41" />
-<hkern u1="&#x2018;" u2="V" k="-41" />
-<hkern u1="&#x2018;" u2="T" k="-41" />
-<hkern u1="&#x2018;" u2="A" k="143" />
-<hkern u1="&#x2019;" u2="&#x1ef8;" k="-20" />
-<hkern u1="&#x2019;" u2="&#x1ef6;" k="-20" />
-<hkern u1="&#x2019;" u2="&#x1ef4;" k="-20" />
-<hkern u1="&#x2019;" u2="&#x1ef2;" k="-20" />
-<hkern u1="&#x2019;" u2="&#x1ef1;" k="61" />
-<hkern u1="&#x2019;" u2="&#x1eef;" k="61" />
-<hkern u1="&#x2019;" u2="&#x1eed;" k="61" />
-<hkern u1="&#x2019;" u2="&#x1eeb;" k="61" />
-<hkern u1="&#x2019;" u2="&#x1ee9;" k="61" />
-<hkern u1="&#x2019;" u2="&#x1ee7;" k="61" />
-<hkern u1="&#x2019;" u2="&#x1ee5;" k="61" />
-<hkern u1="&#x2019;" u2="&#x1ee3;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1ee1;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1edf;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1edd;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1edb;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1ed9;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1ed7;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1ed5;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1ed1;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1ecf;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1ecd;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1ec7;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1ec5;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1ec3;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1ebf;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1ebd;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1ebb;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1eb9;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1eb7;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1eb6;" k="143" />
-<hkern u1="&#x2019;" u2="&#x1eb5;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1eb4;" k="143" />
-<hkern u1="&#x2019;" u2="&#x1eb3;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1eb2;" k="143" />
-<hkern u1="&#x2019;" u2="&#x1eb1;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1eb0;" k="143" />
-<hkern u1="&#x2019;" u2="&#x1eaf;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1eae;" k="143" />
-<hkern u1="&#x2019;" u2="&#x1ead;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1eac;" k="143" />
-<hkern u1="&#x2019;" u2="&#x1eab;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1eaa;" k="143" />
-<hkern u1="&#x2019;" u2="&#x1ea9;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1ea8;" k="143" />
-<hkern u1="&#x2019;" u2="&#x1ea6;" k="143" />
-<hkern u1="&#x2019;" u2="&#x1ea5;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1ea4;" k="143" />
-<hkern u1="&#x2019;" u2="&#x1ea3;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1ea2;" k="143" />
-<hkern u1="&#x2019;" u2="&#x1ea1;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1ea0;" k="143" />
-<hkern u1="&#x2019;" u2="&#x1e84;" k="-41" />
-<hkern u1="&#x2019;" u2="&#x1e82;" k="-41" />
-<hkern u1="&#x2019;" u2="&#x1e80;" k="-41" />
-<hkern u1="&#x2019;" u2="&#x1e3f;" k="61" />
-<hkern u1="&#x2019;" u2="&#x1e01;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1e00;" k="143" />
-<hkern u1="&#x2019;" u2="&#x513;" k="143" />
-<hkern u1="&#x2019;" u2="&#x512;" k="123" />
-<hkern u1="&#x2019;" u2="&#x511;" k="123" />
-<hkern u1="&#x2019;" u2="&#x50d;" k="123" />
-<hkern u1="&#x2019;" u2="&#x509;" k="143" />
-<hkern u1="&#x2019;" u2="&#x508;" k="123" />
-<hkern u1="&#x2019;" u2="&#x503;" k="123" />
-<hkern u1="&#x2019;" u2="&#x502;" k="143" />
-<hkern u1="&#x2019;" u2="&#x501;" k="123" />
-<hkern u1="&#x2019;" u2="&#x500;" k="143" />
-<hkern u1="&#x2019;" u2="&#x4eb;" k="123" />
-<hkern u1="&#x2019;" u2="&#x4e9;" k="123" />
-<hkern u1="&#x2019;" u2="&#x4e7;" k="123" />
-<hkern u1="&#x2019;" u2="&#x4db;" k="41" />
-<hkern u1="&#x2019;" u2="&#x4d9;" k="41" />
-<hkern u1="&#x2019;" u2="&#x4d7;" k="123" />
-<hkern u1="&#x2019;" u2="&#x4d5;" k="41" />
-<hkern u1="&#x2019;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x2019;" u2="&#x4d3;" k="41" />
-<hkern u1="&#x2019;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x2019;" u2="&#x4d1;" k="41" />
-<hkern u1="&#x2019;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x2019;" u2="&#x4c6;" k="143" />
-<hkern u1="&#x2019;" u2="&#x4c5;" k="123" />
-<hkern u1="&#x2019;" u2="&#x4ab;" k="123" />
-<hkern u1="&#x2019;" u2="&#x4a9;" k="123" />
-<hkern u1="&#x2019;" u2="&#x481;" k="123" />
-<hkern u1="&#x2019;" u2="&#x47d;" k="123" />
-<hkern u1="&#x2019;" u2="&#x47b;" k="123" />
-<hkern u1="&#x2019;" u2="&#x479;" k="123" />
-<hkern u1="&#x2019;" u2="&#x473;" k="123" />
-<hkern u1="&#x2019;" u2="&#x471;" k="20" />
-<hkern u1="&#x2019;" u2="&#x467;" k="143" />
-<hkern u1="&#x2019;" u2="&#x466;" k="143" />
-<hkern u1="&#x2019;" u2="&#x459;" k="143" />
-<hkern u1="&#x2019;" u2="&#x455;" k="61" />
-<hkern u1="&#x2019;" u2="&#x454;" k="123" />
-<hkern u1="&#x2019;" u2="&#x451;" k="123" />
-<hkern u1="&#x2019;" u2="&#x450;" k="123" />
-<hkern u1="&#x2019;" u2="&#x444;" k="123" />
-<hkern u1="&#x2019;" u2="&#x441;" k="123" />
-<hkern u1="&#x2019;" u2="&#x43e;" k="123" />
-<hkern u1="&#x2019;" u2="&#x43b;" k="143" />
-<hkern u1="&#x2019;" u2="&#x435;" k="123" />
-<hkern u1="&#x2019;" u2="&#x434;" k="143" />
-<hkern u1="&#x2019;" u2="&#x430;" k="41" />
-<hkern u1="&#x2019;" u2="&#x41b;" k="123" />
-<hkern u1="&#x2019;" u2="&#x414;" k="123" />
-<hkern u1="&#x2019;" u2="&#x410;" k="143" />
-<hkern u1="&#x2019;" u2="&#x409;" k="123" />
-<hkern u1="&#x2019;" u2="&#x3cc;" k="82" />
-<hkern u1="&#x2019;" u2="&#x3c6;" k="82" />
-<hkern u1="&#x2019;" u2="&#x3c3;" k="82" />
-<hkern u1="&#x2019;" u2="&#x3c2;" k="82" />
-<hkern u1="&#x2019;" u2="&#x3c1;" k="61" />
-<hkern u1="&#x2019;" u2="&#x3bf;" k="82" />
-<hkern u1="&#x2019;" u2="&#x3bc;" k="41" />
-<hkern u1="&#x2019;" u2="&#x3ba;" k="41" />
-<hkern u1="&#x2019;" u2="&#x3b7;" k="41" />
-<hkern u1="&#x2019;" u2="&#x3b6;" k="41" />
-<hkern u1="&#x2019;" u2="&#x3b5;" k="41" />
-<hkern u1="&#x2019;" u2="&#x3b4;" k="61" />
-<hkern u1="&#x2019;" u2="&#x3b1;" k="82" />
-<hkern u1="&#x2019;" u2="&#x3ae;" k="41" />
-<hkern u1="&#x2019;" u2="&#x3ad;" k="41" />
-<hkern u1="&#x2019;" u2="&#x3ac;" k="82" />
-<hkern u1="&#x2019;" u2="&#x39b;" k="143" />
-<hkern u1="&#x2019;" u2="&#x394;" k="143" />
-<hkern u1="&#x2019;" u2="&#x391;" k="143" />
-<hkern u1="&#x2019;" u2="&#x386;" k="143" />
-<hkern u1="&#x2019;" u2="&#x21a;" k="-41" />
-<hkern u1="&#x2019;" u2="&#x219;" k="61" />
-<hkern u1="&#x2019;" u2="&#x1ff;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1fd;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1fb;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1fa;" k="143" />
-<hkern u1="&#x2019;" u2="&#x1b0;" k="61" />
-<hkern u1="&#x2019;" u2="&#x1a1;" k="123" />
-<hkern u1="&#x2019;" u2="&#x178;" k="-20" />
-<hkern u1="&#x2019;" u2="&#x176;" k="-20" />
-<hkern u1="&#x2019;" u2="&#x174;" k="-41" />
-<hkern u1="&#x2019;" u2="&#x173;" k="61" />
-<hkern u1="&#x2019;" u2="&#x171;" k="61" />
-<hkern u1="&#x2019;" u2="&#x16f;" k="61" />
-<hkern u1="&#x2019;" u2="&#x16d;" k="61" />
-<hkern u1="&#x2019;" u2="&#x16b;" k="61" />
-<hkern u1="&#x2019;" u2="&#x169;" k="61" />
-<hkern u1="&#x2019;" u2="&#x164;" k="-41" />
-<hkern u1="&#x2019;" u2="&#x162;" k="-41" />
-<hkern u1="&#x2019;" u2="&#x15f;" k="61" />
-<hkern u1="&#x2019;" u2="&#x15b;" k="61" />
-<hkern u1="&#x2019;" u2="&#x157;" k="61" />
-<hkern u1="&#x2019;" u2="&#x155;" k="61" />
-<hkern u1="&#x2019;" u2="&#x153;" k="123" />
-<hkern u1="&#x2019;" u2="&#x151;" k="123" />
-<hkern u1="&#x2019;" u2="&#x14f;" k="123" />
-<hkern u1="&#x2019;" u2="&#x14d;" k="123" />
-<hkern u1="&#x2019;" u2="&#x14b;" k="61" />
-<hkern u1="&#x2019;" u2="&#x146;" k="61" />
-<hkern u1="&#x2019;" u2="&#x144;" k="61" />
-<hkern u1="&#x2019;" u2="&#x138;" k="61" />
-<hkern u1="&#x2019;" u2="&#x123;" k="61" />
-<hkern u1="&#x2019;" u2="&#x121;" k="61" />
-<hkern u1="&#x2019;" u2="&#x11f;" k="61" />
-<hkern u1="&#x2019;" u2="&#x11d;" k="61" />
-<hkern u1="&#x2019;" u2="&#x11b;" k="123" />
-<hkern u1="&#x2019;" u2="&#x119;" k="123" />
-<hkern u1="&#x2019;" u2="&#x117;" k="123" />
-<hkern u1="&#x2019;" u2="&#x115;" k="123" />
-<hkern u1="&#x2019;" u2="&#x113;" k="123" />
-<hkern u1="&#x2019;" u2="&#x111;" k="123" />
-<hkern u1="&#x2019;" u2="&#x10f;" k="123" />
-<hkern u1="&#x2019;" u2="&#x10d;" k="123" />
-<hkern u1="&#x2019;" u2="&#x10b;" k="123" />
-<hkern u1="&#x2019;" u2="&#x109;" k="123" />
-<hkern u1="&#x2019;" u2="&#x107;" k="123" />
-<hkern u1="&#x2019;" u2="&#x105;" k="82" />
-<hkern u1="&#x2019;" u2="&#x104;" k="143" />
-<hkern u1="&#x2019;" u2="&#x103;" k="82" />
-<hkern u1="&#x2019;" u2="&#x102;" k="143" />
-<hkern u1="&#x2019;" u2="&#x101;" k="82" />
-<hkern u1="&#x2019;" u2="&#x100;" k="143" />
-<hkern u1="&#x2019;" u2="&#xfc;" k="61" />
-<hkern u1="&#x2019;" u2="&#xfb;" k="61" />
-<hkern u1="&#x2019;" u2="&#xfa;" k="61" />
-<hkern u1="&#x2019;" u2="&#xf9;" k="61" />
-<hkern u1="&#x2019;" u2="&#xf8;" k="123" />
-<hkern u1="&#x2019;" u2="&#xf6;" k="123" />
-<hkern u1="&#x2019;" u2="&#xf5;" k="123" />
-<hkern u1="&#x2019;" u2="&#xf4;" k="123" />
-<hkern u1="&#x2019;" u2="&#xf3;" k="123" />
-<hkern u1="&#x2019;" u2="&#xf2;" k="123" />
-<hkern u1="&#x2019;" u2="&#xeb;" k="123" />
-<hkern u1="&#x2019;" u2="&#xea;" k="123" />
-<hkern u1="&#x2019;" u2="&#xe9;" k="123" />
-<hkern u1="&#x2019;" u2="&#xe8;" k="123" />
-<hkern u1="&#x2019;" u2="&#xe7;" k="123" />
-<hkern u1="&#x2019;" u2="&#xe6;" k="82" />
-<hkern u1="&#x2019;" u2="&#xe5;" k="82" />
-<hkern u1="&#x2019;" u2="&#xe4;" k="82" />
-<hkern u1="&#x2019;" u2="&#xe3;" k="82" />
-<hkern u1="&#x2019;" u2="&#xe2;" k="82" />
-<hkern u1="&#x2019;" u2="&#xe1;" k="82" />
-<hkern u1="&#x2019;" u2="&#xe0;" k="123" />
-<hkern u1="&#x2019;" u2="&#xdd;" k="-20" />
-<hkern u1="&#x2019;" u2="&#xc5;" k="143" />
-<hkern u1="&#x2019;" u2="&#xc4;" k="143" />
-<hkern u1="&#x2019;" u2="&#xc3;" k="143" />
-<hkern u1="&#x2019;" u2="&#xc2;" k="143" />
-<hkern u1="&#x2019;" u2="&#xc1;" k="143" />
-<hkern u1="&#x2019;" u2="&#xc0;" k="143" />
-<hkern u1="&#x2019;" u2="u" k="61" />
-<hkern u1="&#x2019;" u2="s" k="61" />
-<hkern u1="&#x2019;" u2="r" k="61" />
-<hkern u1="&#x2019;" u2="q" k="123" />
-<hkern u1="&#x2019;" u2="p" k="61" />
-<hkern u1="&#x2019;" u2="o" k="123" />
-<hkern u1="&#x2019;" u2="n" k="61" />
-<hkern u1="&#x2019;" u2="m" k="61" />
-<hkern u1="&#x2019;" u2="g" k="61" />
-<hkern u1="&#x2019;" u2="e" k="123" />
-<hkern u1="&#x2019;" u2="d" k="123" />
-<hkern u1="&#x2019;" u2="c" k="123" />
-<hkern u1="&#x2019;" u2="a" k="82" />
-<hkern u1="&#x2019;" u2="Y" k="-20" />
-<hkern u1="&#x2019;" u2="W" k="-41" />
-<hkern u1="&#x2019;" u2="V" k="-41" />
-<hkern u1="&#x2019;" u2="T" k="-41" />
-<hkern u1="&#x2019;" u2="A" k="143" />
-<hkern u1="&#x201a;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x201a;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x201a;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x201a;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x201a;" u2="&#x1ef0;" k="41" />
-<hkern u1="&#x201a;" u2="&#x1eee;" k="41" />
-<hkern u1="&#x201a;" u2="&#x1eec;" k="41" />
-<hkern u1="&#x201a;" u2="&#x1eea;" k="41" />
-<hkern u1="&#x201a;" u2="&#x1ee8;" k="41" />
-<hkern u1="&#x201a;" u2="&#x1ee6;" k="41" />
-<hkern u1="&#x201a;" u2="&#x1ee4;" k="41" />
-<hkern u1="&#x201a;" u2="&#x1ee2;" k="102" />
-<hkern u1="&#x201a;" u2="&#x1ee0;" k="102" />
-<hkern u1="&#x201a;" u2="&#x1ede;" k="102" />
-<hkern u1="&#x201a;" u2="&#x1edc;" k="102" />
-<hkern u1="&#x201a;" u2="&#x1eda;" k="102" />
-<hkern u1="&#x201a;" u2="&#x1ed8;" k="102" />
-<hkern u1="&#x201a;" u2="&#x1ed6;" k="102" />
-<hkern u1="&#x201a;" u2="&#x1ed4;" k="102" />
-<hkern u1="&#x201a;" u2="&#x1ed2;" k="102" />
-<hkern u1="&#x201a;" u2="&#x1ed0;" k="102" />
-<hkern u1="&#x201a;" u2="&#x1ece;" k="102" />
-<hkern u1="&#x201a;" u2="&#x1ecc;" k="102" />
-<hkern u1="&#x201a;" u2="&#x1e84;" k="123" />
-<hkern u1="&#x201a;" u2="&#x1e82;" k="123" />
-<hkern u1="&#x201a;" u2="&#x1e80;" k="123" />
-<hkern u1="&#x201a;" u2="&#x50f;" k="102" />
-<hkern u1="&#x201a;" u2="&#x50e;" k="143" />
-<hkern u1="&#x201a;" u2="&#x50c;" k="102" />
-<hkern u1="&#x201a;" u2="&#x507;" k="102" />
-<hkern u1="&#x201a;" u2="&#x506;" k="123" />
-<hkern u1="&#x201a;" u2="&#x505;" k="102" />
-<hkern u1="&#x201a;" u2="&#x504;" k="123" />
-<hkern u1="&#x201a;" u2="&#x4f5;" k="123" />
-<hkern u1="&#x201a;" u2="&#x4f4;" k="164" />
-<hkern u1="&#x201a;" u2="&#x4ea;" k="102" />
-<hkern u1="&#x201a;" u2="&#x4e8;" k="102" />
-<hkern u1="&#x201a;" u2="&#x4e6;" k="102" />
-<hkern u1="&#x201a;" u2="&#x4cc;" k="123" />
-<hkern u1="&#x201a;" u2="&#x4cb;" k="164" />
-<hkern u1="&#x201a;" u2="&#x4be;" k="123" />
-<hkern u1="&#x201a;" u2="&#x4bc;" k="123" />
-<hkern u1="&#x201a;" u2="&#x4b9;" k="123" />
-<hkern u1="&#x201a;" u2="&#x4b8;" k="164" />
-<hkern u1="&#x201a;" u2="&#x4b7;" k="123" />
-<hkern u1="&#x201a;" u2="&#x4b6;" k="164" />
-<hkern u1="&#x201a;" u2="&#x4b5;" k="102" />
-<hkern u1="&#x201a;" u2="&#x4b4;" k="143" />
-<hkern u1="&#x201a;" u2="&#x4b0;" k="123" />
-<hkern u1="&#x201a;" u2="&#x4ae;" k="123" />
-<hkern u1="&#x201a;" u2="&#x4ad;" k="102" />
-<hkern u1="&#x201a;" u2="&#x4ac;" k="143" />
-<hkern u1="&#x201a;" u2="&#x4aa;" k="102" />
-<hkern u1="&#x201a;" u2="&#x4a8;" k="102" />
-<hkern u1="&#x201a;" u2="&#x4a1;" k="102" />
-<hkern u1="&#x201a;" u2="&#x4a0;" k="143" />
-<hkern u1="&#x201a;" u2="&#x480;" k="102" />
-<hkern u1="&#x201a;" u2="&#x47e;" k="102" />
-<hkern u1="&#x201a;" u2="&#x47c;" k="102" />
-<hkern u1="&#x201a;" u2="&#x47a;" k="102" />
-<hkern u1="&#x201a;" u2="&#x478;" k="102" />
-<hkern u1="&#x201a;" u2="&#x476;" k="123" />
-<hkern u1="&#x201a;" u2="&#x474;" k="123" />
-<hkern u1="&#x201a;" u2="&#x472;" k="102" />
-<hkern u1="&#x201a;" u2="&#x470;" k="164" />
-<hkern u1="&#x201a;" u2="&#x460;" k="102" />
-<hkern u1="&#x201a;" u2="&#x44a;" k="102" />
-<hkern u1="&#x201a;" u2="&#x447;" k="123" />
-<hkern u1="&#x201a;" u2="&#x442;" k="102" />
-<hkern u1="&#x201a;" u2="&#x42a;" k="143" />
-<hkern u1="&#x201a;" u2="&#x427;" k="164" />
-<hkern u1="&#x201a;" u2="&#x424;" k="82" />
-<hkern u1="&#x201a;" u2="&#x422;" k="143" />
-<hkern u1="&#x201a;" u2="&#x421;" k="102" />
-<hkern u1="&#x201a;" u2="&#x41e;" k="102" />
-<hkern u1="&#x201a;" u2="&#x40b;" k="143" />
-<hkern u1="&#x201a;" u2="&#x404;" k="102" />
-<hkern u1="&#x201a;" u2="&#x402;" k="143" />
-<hkern u1="&#x201a;" u2="&#x3d2;" k="123" />
-<hkern u1="&#x201a;" u2="&#x3b8;" k="41" />
-<hkern u1="&#x201a;" u2="&#x3ab;" k="123" />
-<hkern u1="&#x201a;" u2="&#x3a8;" k="123" />
-<hkern u1="&#x201a;" u2="&#x3a6;" k="102" />
-<hkern u1="&#x201a;" u2="&#x3a5;" k="123" />
-<hkern u1="&#x201a;" u2="&#x3a4;" k="143" />
-<hkern u1="&#x201a;" u2="&#x39f;" k="82" />
-<hkern u1="&#x201a;" u2="&#x398;" k="82" />
-<hkern u1="&#x201a;" u2="&#x21a;" k="143" />
-<hkern u1="&#x201a;" u2="&#x1fe;" k="102" />
-<hkern u1="&#x201a;" u2="&#x1af;" k="41" />
-<hkern u1="&#x201a;" u2="&#x1a0;" k="102" />
-<hkern u1="&#x201a;" u2="&#x178;" k="123" />
-<hkern u1="&#x201a;" u2="&#x176;" k="123" />
-<hkern u1="&#x201a;" u2="&#x174;" k="123" />
-<hkern u1="&#x201a;" u2="&#x172;" k="41" />
-<hkern u1="&#x201a;" u2="&#x170;" k="41" />
-<hkern u1="&#x201a;" u2="&#x16e;" k="41" />
-<hkern u1="&#x201a;" u2="&#x16c;" k="41" />
-<hkern u1="&#x201a;" u2="&#x16a;" k="41" />
-<hkern u1="&#x201a;" u2="&#x168;" k="41" />
-<hkern u1="&#x201a;" u2="&#x164;" k="143" />
-<hkern u1="&#x201a;" u2="&#x162;" k="143" />
-<hkern u1="&#x201a;" u2="&#x152;" k="102" />
-<hkern u1="&#x201a;" u2="&#x150;" k="102" />
-<hkern u1="&#x201a;" u2="&#x14e;" k="102" />
-<hkern u1="&#x201a;" u2="&#x14c;" k="102" />
-<hkern u1="&#x201a;" u2="&#x122;" k="102" />
-<hkern u1="&#x201a;" u2="&#x120;" k="102" />
-<hkern u1="&#x201a;" u2="&#x11e;" k="102" />
-<hkern u1="&#x201a;" u2="&#x11c;" k="102" />
-<hkern u1="&#x201a;" u2="&#x10c;" k="102" />
-<hkern u1="&#x201a;" u2="&#x10a;" k="102" />
-<hkern u1="&#x201a;" u2="&#x108;" k="102" />
-<hkern u1="&#x201a;" u2="&#x106;" k="102" />
-<hkern u1="&#x201a;" u2="&#xdd;" k="123" />
-<hkern u1="&#x201a;" u2="&#xdc;" k="41" />
-<hkern u1="&#x201a;" u2="&#xdb;" k="41" />
-<hkern u1="&#x201a;" u2="&#xda;" k="41" />
-<hkern u1="&#x201a;" u2="&#xd9;" k="41" />
-<hkern u1="&#x201a;" u2="&#xd8;" k="102" />
-<hkern u1="&#x201a;" u2="&#xd6;" k="102" />
-<hkern u1="&#x201a;" u2="&#xd5;" k="102" />
-<hkern u1="&#x201a;" u2="&#xd4;" k="102" />
-<hkern u1="&#x201a;" u2="&#xd3;" k="102" />
-<hkern u1="&#x201a;" u2="&#xd2;" k="102" />
-<hkern u1="&#x201a;" u2="&#xc7;" k="102" />
-<hkern u1="&#x201a;" u2="Y" k="123" />
-<hkern u1="&#x201a;" u2="W" k="123" />
-<hkern u1="&#x201a;" u2="V" k="123" />
-<hkern u1="&#x201a;" u2="U" k="41" />
-<hkern u1="&#x201a;" u2="T" k="143" />
-<hkern u1="&#x201a;" u2="Q" k="102" />
-<hkern u1="&#x201a;" u2="O" k="102" />
-<hkern u1="&#x201a;" u2="G" k="102" />
-<hkern u1="&#x201a;" u2="C" k="102" />
-<hkern u1="&#x201c;" u2="&#x1ef8;" k="-20" />
-<hkern u1="&#x201c;" u2="&#x1ef6;" k="-20" />
-<hkern u1="&#x201c;" u2="&#x1ef4;" k="-20" />
-<hkern u1="&#x201c;" u2="&#x1ef2;" k="-20" />
-<hkern u1="&#x201c;" u2="&#x1ef1;" k="61" />
-<hkern u1="&#x201c;" u2="&#x1eef;" k="61" />
-<hkern u1="&#x201c;" u2="&#x1eed;" k="61" />
-<hkern u1="&#x201c;" u2="&#x1eeb;" k="61" />
-<hkern u1="&#x201c;" u2="&#x1ee9;" k="61" />
-<hkern u1="&#x201c;" u2="&#x1ee7;" k="61" />
-<hkern u1="&#x201c;" u2="&#x1ee5;" k="61" />
-<hkern u1="&#x201c;" u2="&#x1ee3;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1ee1;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1edf;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1edd;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1edb;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1ed9;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1ed7;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1ed5;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1ed1;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1ecf;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1ecd;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1ec7;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1ec5;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1ec3;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1ebf;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1ebd;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1ebb;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1eb9;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1eb7;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1eb6;" k="143" />
-<hkern u1="&#x201c;" u2="&#x1eb5;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1eb4;" k="143" />
-<hkern u1="&#x201c;" u2="&#x1eb3;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1eb2;" k="143" />
-<hkern u1="&#x201c;" u2="&#x1eb1;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1eb0;" k="143" />
-<hkern u1="&#x201c;" u2="&#x1eaf;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1eae;" k="143" />
-<hkern u1="&#x201c;" u2="&#x1ead;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1eac;" k="143" />
-<hkern u1="&#x201c;" u2="&#x1eab;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1eaa;" k="143" />
-<hkern u1="&#x201c;" u2="&#x1ea9;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1ea8;" k="143" />
-<hkern u1="&#x201c;" u2="&#x1ea6;" k="143" />
-<hkern u1="&#x201c;" u2="&#x1ea5;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1ea4;" k="143" />
-<hkern u1="&#x201c;" u2="&#x1ea3;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1ea2;" k="143" />
-<hkern u1="&#x201c;" u2="&#x1ea1;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1ea0;" k="143" />
-<hkern u1="&#x201c;" u2="&#x1e84;" k="-41" />
-<hkern u1="&#x201c;" u2="&#x1e82;" k="-41" />
-<hkern u1="&#x201c;" u2="&#x1e80;" k="-41" />
-<hkern u1="&#x201c;" u2="&#x1e3f;" k="61" />
-<hkern u1="&#x201c;" u2="&#x1e01;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1e00;" k="143" />
-<hkern u1="&#x201c;" u2="&#x513;" k="143" />
-<hkern u1="&#x201c;" u2="&#x512;" k="123" />
-<hkern u1="&#x201c;" u2="&#x511;" k="123" />
-<hkern u1="&#x201c;" u2="&#x50d;" k="123" />
-<hkern u1="&#x201c;" u2="&#x509;" k="143" />
-<hkern u1="&#x201c;" u2="&#x508;" k="123" />
-<hkern u1="&#x201c;" u2="&#x503;" k="123" />
-<hkern u1="&#x201c;" u2="&#x502;" k="143" />
-<hkern u1="&#x201c;" u2="&#x501;" k="123" />
-<hkern u1="&#x201c;" u2="&#x500;" k="143" />
-<hkern u1="&#x201c;" u2="&#x4eb;" k="123" />
-<hkern u1="&#x201c;" u2="&#x4e9;" k="123" />
-<hkern u1="&#x201c;" u2="&#x4e7;" k="123" />
-<hkern u1="&#x201c;" u2="&#x4db;" k="41" />
-<hkern u1="&#x201c;" u2="&#x4d9;" k="41" />
-<hkern u1="&#x201c;" u2="&#x4d7;" k="123" />
-<hkern u1="&#x201c;" u2="&#x4d5;" k="41" />
-<hkern u1="&#x201c;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x201c;" u2="&#x4d3;" k="41" />
-<hkern u1="&#x201c;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x201c;" u2="&#x4d1;" k="41" />
-<hkern u1="&#x201c;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x201c;" u2="&#x4c6;" k="143" />
-<hkern u1="&#x201c;" u2="&#x4c5;" k="123" />
-<hkern u1="&#x201c;" u2="&#x4ab;" k="123" />
-<hkern u1="&#x201c;" u2="&#x4a9;" k="123" />
-<hkern u1="&#x201c;" u2="&#x481;" k="123" />
-<hkern u1="&#x201c;" u2="&#x47d;" k="123" />
-<hkern u1="&#x201c;" u2="&#x47b;" k="123" />
-<hkern u1="&#x201c;" u2="&#x479;" k="123" />
-<hkern u1="&#x201c;" u2="&#x473;" k="123" />
-<hkern u1="&#x201c;" u2="&#x471;" k="20" />
-<hkern u1="&#x201c;" u2="&#x467;" k="143" />
-<hkern u1="&#x201c;" u2="&#x466;" k="143" />
-<hkern u1="&#x201c;" u2="&#x459;" k="143" />
-<hkern u1="&#x201c;" u2="&#x455;" k="61" />
-<hkern u1="&#x201c;" u2="&#x454;" k="123" />
-<hkern u1="&#x201c;" u2="&#x451;" k="123" />
-<hkern u1="&#x201c;" u2="&#x450;" k="123" />
-<hkern u1="&#x201c;" u2="&#x444;" k="123" />
-<hkern u1="&#x201c;" u2="&#x441;" k="123" />
-<hkern u1="&#x201c;" u2="&#x43e;" k="123" />
-<hkern u1="&#x201c;" u2="&#x43b;" k="143" />
-<hkern u1="&#x201c;" u2="&#x435;" k="123" />
-<hkern u1="&#x201c;" u2="&#x434;" k="143" />
-<hkern u1="&#x201c;" u2="&#x430;" k="41" />
-<hkern u1="&#x201c;" u2="&#x41b;" k="123" />
-<hkern u1="&#x201c;" u2="&#x414;" k="123" />
-<hkern u1="&#x201c;" u2="&#x410;" k="143" />
-<hkern u1="&#x201c;" u2="&#x409;" k="123" />
-<hkern u1="&#x201c;" u2="&#x3cc;" k="82" />
-<hkern u1="&#x201c;" u2="&#x3c6;" k="82" />
-<hkern u1="&#x201c;" u2="&#x3c3;" k="82" />
-<hkern u1="&#x201c;" u2="&#x3c2;" k="82" />
-<hkern u1="&#x201c;" u2="&#x3c1;" k="61" />
-<hkern u1="&#x201c;" u2="&#x3bf;" k="82" />
-<hkern u1="&#x201c;" u2="&#x3bc;" k="41" />
-<hkern u1="&#x201c;" u2="&#x3ba;" k="41" />
-<hkern u1="&#x201c;" u2="&#x3b7;" k="41" />
-<hkern u1="&#x201c;" u2="&#x3b6;" k="41" />
-<hkern u1="&#x201c;" u2="&#x3b5;" k="41" />
-<hkern u1="&#x201c;" u2="&#x3b4;" k="61" />
-<hkern u1="&#x201c;" u2="&#x3b1;" k="82" />
-<hkern u1="&#x201c;" u2="&#x3ae;" k="41" />
-<hkern u1="&#x201c;" u2="&#x3ad;" k="41" />
-<hkern u1="&#x201c;" u2="&#x3ac;" k="82" />
-<hkern u1="&#x201c;" u2="&#x39b;" k="143" />
-<hkern u1="&#x201c;" u2="&#x394;" k="143" />
-<hkern u1="&#x201c;" u2="&#x391;" k="143" />
-<hkern u1="&#x201c;" u2="&#x386;" k="143" />
-<hkern u1="&#x201c;" u2="&#x21a;" k="-41" />
-<hkern u1="&#x201c;" u2="&#x219;" k="61" />
-<hkern u1="&#x201c;" u2="&#x1ff;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1fd;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1fb;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1fa;" k="143" />
-<hkern u1="&#x201c;" u2="&#x1b0;" k="61" />
-<hkern u1="&#x201c;" u2="&#x1a1;" k="123" />
-<hkern u1="&#x201c;" u2="&#x178;" k="-20" />
-<hkern u1="&#x201c;" u2="&#x176;" k="-20" />
-<hkern u1="&#x201c;" u2="&#x174;" k="-41" />
-<hkern u1="&#x201c;" u2="&#x173;" k="61" />
-<hkern u1="&#x201c;" u2="&#x171;" k="61" />
-<hkern u1="&#x201c;" u2="&#x16f;" k="61" />
-<hkern u1="&#x201c;" u2="&#x16d;" k="61" />
-<hkern u1="&#x201c;" u2="&#x16b;" k="61" />
-<hkern u1="&#x201c;" u2="&#x169;" k="61" />
-<hkern u1="&#x201c;" u2="&#x164;" k="-41" />
-<hkern u1="&#x201c;" u2="&#x162;" k="-41" />
-<hkern u1="&#x201c;" u2="&#x15f;" k="61" />
-<hkern u1="&#x201c;" u2="&#x15b;" k="61" />
-<hkern u1="&#x201c;" u2="&#x157;" k="61" />
-<hkern u1="&#x201c;" u2="&#x155;" k="61" />
-<hkern u1="&#x201c;" u2="&#x153;" k="123" />
-<hkern u1="&#x201c;" u2="&#x151;" k="123" />
-<hkern u1="&#x201c;" u2="&#x14f;" k="123" />
-<hkern u1="&#x201c;" u2="&#x14d;" k="123" />
-<hkern u1="&#x201c;" u2="&#x14b;" k="61" />
-<hkern u1="&#x201c;" u2="&#x146;" k="61" />
-<hkern u1="&#x201c;" u2="&#x144;" k="61" />
-<hkern u1="&#x201c;" u2="&#x138;" k="61" />
-<hkern u1="&#x201c;" u2="&#x123;" k="61" />
-<hkern u1="&#x201c;" u2="&#x121;" k="61" />
-<hkern u1="&#x201c;" u2="&#x11f;" k="61" />
-<hkern u1="&#x201c;" u2="&#x11d;" k="61" />
-<hkern u1="&#x201c;" u2="&#x11b;" k="123" />
-<hkern u1="&#x201c;" u2="&#x119;" k="123" />
-<hkern u1="&#x201c;" u2="&#x117;" k="123" />
-<hkern u1="&#x201c;" u2="&#x115;" k="123" />
-<hkern u1="&#x201c;" u2="&#x113;" k="123" />
-<hkern u1="&#x201c;" u2="&#x111;" k="123" />
-<hkern u1="&#x201c;" u2="&#x10f;" k="123" />
-<hkern u1="&#x201c;" u2="&#x10d;" k="123" />
-<hkern u1="&#x201c;" u2="&#x10b;" k="123" />
-<hkern u1="&#x201c;" u2="&#x109;" k="123" />
-<hkern u1="&#x201c;" u2="&#x107;" k="123" />
-<hkern u1="&#x201c;" u2="&#x105;" k="82" />
-<hkern u1="&#x201c;" u2="&#x104;" k="143" />
-<hkern u1="&#x201c;" u2="&#x103;" k="82" />
-<hkern u1="&#x201c;" u2="&#x102;" k="143" />
-<hkern u1="&#x201c;" u2="&#x101;" k="82" />
-<hkern u1="&#x201c;" u2="&#x100;" k="143" />
-<hkern u1="&#x201c;" u2="&#xfc;" k="61" />
-<hkern u1="&#x201c;" u2="&#xfb;" k="61" />
-<hkern u1="&#x201c;" u2="&#xfa;" k="61" />
-<hkern u1="&#x201c;" u2="&#xf9;" k="61" />
-<hkern u1="&#x201c;" u2="&#xf8;" k="123" />
-<hkern u1="&#x201c;" u2="&#xf6;" k="123" />
-<hkern u1="&#x201c;" u2="&#xf5;" k="123" />
-<hkern u1="&#x201c;" u2="&#xf4;" k="123" />
-<hkern u1="&#x201c;" u2="&#xf3;" k="123" />
-<hkern u1="&#x201c;" u2="&#xf2;" k="123" />
-<hkern u1="&#x201c;" u2="&#xeb;" k="123" />
-<hkern u1="&#x201c;" u2="&#xea;" k="123" />
-<hkern u1="&#x201c;" u2="&#xe9;" k="123" />
-<hkern u1="&#x201c;" u2="&#xe8;" k="123" />
-<hkern u1="&#x201c;" u2="&#xe7;" k="123" />
-<hkern u1="&#x201c;" u2="&#xe6;" k="82" />
-<hkern u1="&#x201c;" u2="&#xe5;" k="82" />
-<hkern u1="&#x201c;" u2="&#xe4;" k="82" />
-<hkern u1="&#x201c;" u2="&#xe3;" k="82" />
-<hkern u1="&#x201c;" u2="&#xe2;" k="82" />
-<hkern u1="&#x201c;" u2="&#xe1;" k="82" />
-<hkern u1="&#x201c;" u2="&#xe0;" k="123" />
-<hkern u1="&#x201c;" u2="&#xdd;" k="-20" />
-<hkern u1="&#x201c;" u2="&#xc5;" k="143" />
-<hkern u1="&#x201c;" u2="&#xc4;" k="143" />
-<hkern u1="&#x201c;" u2="&#xc3;" k="143" />
-<hkern u1="&#x201c;" u2="&#xc2;" k="143" />
-<hkern u1="&#x201c;" u2="&#xc1;" k="143" />
-<hkern u1="&#x201c;" u2="&#xc0;" k="143" />
-<hkern u1="&#x201c;" u2="u" k="61" />
-<hkern u1="&#x201c;" u2="s" k="61" />
-<hkern u1="&#x201c;" u2="r" k="61" />
-<hkern u1="&#x201c;" u2="q" k="123" />
-<hkern u1="&#x201c;" u2="p" k="61" />
-<hkern u1="&#x201c;" u2="o" k="123" />
-<hkern u1="&#x201c;" u2="n" k="61" />
-<hkern u1="&#x201c;" u2="m" k="61" />
-<hkern u1="&#x201c;" u2="g" k="61" />
-<hkern u1="&#x201c;" u2="e" k="123" />
-<hkern u1="&#x201c;" u2="d" k="123" />
-<hkern u1="&#x201c;" u2="c" k="123" />
-<hkern u1="&#x201c;" u2="a" k="82" />
-<hkern u1="&#x201c;" u2="Y" k="-20" />
-<hkern u1="&#x201c;" u2="W" k="-41" />
-<hkern u1="&#x201c;" u2="V" k="-41" />
-<hkern u1="&#x201c;" u2="T" k="-41" />
-<hkern u1="&#x201c;" u2="A" k="143" />
-<hkern u1="&#x201e;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x201e;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x201e;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x201e;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x201e;" u2="&#x1ef0;" k="41" />
-<hkern u1="&#x201e;" u2="&#x1eee;" k="41" />
-<hkern u1="&#x201e;" u2="&#x1eec;" k="41" />
-<hkern u1="&#x201e;" u2="&#x1eea;" k="41" />
-<hkern u1="&#x201e;" u2="&#x1ee8;" k="41" />
-<hkern u1="&#x201e;" u2="&#x1ee6;" k="41" />
-<hkern u1="&#x201e;" u2="&#x1ee4;" k="41" />
-<hkern u1="&#x201e;" u2="&#x1ee2;" k="102" />
-<hkern u1="&#x201e;" u2="&#x1ee0;" k="102" />
-<hkern u1="&#x201e;" u2="&#x1ede;" k="102" />
-<hkern u1="&#x201e;" u2="&#x1edc;" k="102" />
-<hkern u1="&#x201e;" u2="&#x1eda;" k="102" />
-<hkern u1="&#x201e;" u2="&#x1ed8;" k="102" />
-<hkern u1="&#x201e;" u2="&#x1ed6;" k="102" />
-<hkern u1="&#x201e;" u2="&#x1ed4;" k="102" />
-<hkern u1="&#x201e;" u2="&#x1ed2;" k="102" />
-<hkern u1="&#x201e;" u2="&#x1ed0;" k="102" />
-<hkern u1="&#x201e;" u2="&#x1ece;" k="102" />
-<hkern u1="&#x201e;" u2="&#x1ecc;" k="102" />
-<hkern u1="&#x201e;" u2="&#x1e84;" k="123" />
-<hkern u1="&#x201e;" u2="&#x1e82;" k="123" />
-<hkern u1="&#x201e;" u2="&#x1e80;" k="123" />
-<hkern u1="&#x201e;" u2="&#x50f;" k="102" />
-<hkern u1="&#x201e;" u2="&#x50e;" k="143" />
-<hkern u1="&#x201e;" u2="&#x50c;" k="102" />
-<hkern u1="&#x201e;" u2="&#x507;" k="102" />
-<hkern u1="&#x201e;" u2="&#x506;" k="123" />
-<hkern u1="&#x201e;" u2="&#x505;" k="102" />
-<hkern u1="&#x201e;" u2="&#x504;" k="123" />
-<hkern u1="&#x201e;" u2="&#x4f5;" k="123" />
-<hkern u1="&#x201e;" u2="&#x4f4;" k="164" />
-<hkern u1="&#x201e;" u2="&#x4ea;" k="102" />
-<hkern u1="&#x201e;" u2="&#x4e8;" k="102" />
-<hkern u1="&#x201e;" u2="&#x4e6;" k="102" />
-<hkern u1="&#x201e;" u2="&#x4cc;" k="123" />
-<hkern u1="&#x201e;" u2="&#x4cb;" k="164" />
-<hkern u1="&#x201e;" u2="&#x4be;" k="123" />
-<hkern u1="&#x201e;" u2="&#x4bc;" k="123" />
-<hkern u1="&#x201e;" u2="&#x4b9;" k="123" />
-<hkern u1="&#x201e;" u2="&#x4b8;" k="164" />
-<hkern u1="&#x201e;" u2="&#x4b7;" k="123" />
-<hkern u1="&#x201e;" u2="&#x4b6;" k="164" />
-<hkern u1="&#x201e;" u2="&#x4b5;" k="102" />
-<hkern u1="&#x201e;" u2="&#x4b4;" k="143" />
-<hkern u1="&#x201e;" u2="&#x4b0;" k="123" />
-<hkern u1="&#x201e;" u2="&#x4ae;" k="123" />
-<hkern u1="&#x201e;" u2="&#x4ad;" k="102" />
-<hkern u1="&#x201e;" u2="&#x4ac;" k="143" />
-<hkern u1="&#x201e;" u2="&#x4aa;" k="102" />
-<hkern u1="&#x201e;" u2="&#x4a8;" k="102" />
-<hkern u1="&#x201e;" u2="&#x4a1;" k="102" />
-<hkern u1="&#x201e;" u2="&#x4a0;" k="143" />
-<hkern u1="&#x201e;" u2="&#x480;" k="102" />
-<hkern u1="&#x201e;" u2="&#x47e;" k="102" />
-<hkern u1="&#x201e;" u2="&#x47c;" k="102" />
-<hkern u1="&#x201e;" u2="&#x47a;" k="102" />
-<hkern u1="&#x201e;" u2="&#x478;" k="102" />
-<hkern u1="&#x201e;" u2="&#x476;" k="123" />
-<hkern u1="&#x201e;" u2="&#x474;" k="123" />
-<hkern u1="&#x201e;" u2="&#x472;" k="102" />
-<hkern u1="&#x201e;" u2="&#x470;" k="164" />
-<hkern u1="&#x201e;" u2="&#x460;" k="102" />
-<hkern u1="&#x201e;" u2="&#x44a;" k="102" />
-<hkern u1="&#x201e;" u2="&#x447;" k="123" />
-<hkern u1="&#x201e;" u2="&#x442;" k="102" />
-<hkern u1="&#x201e;" u2="&#x42a;" k="143" />
-<hkern u1="&#x201e;" u2="&#x427;" k="164" />
-<hkern u1="&#x201e;" u2="&#x424;" k="82" />
-<hkern u1="&#x201e;" u2="&#x422;" k="143" />
-<hkern u1="&#x201e;" u2="&#x421;" k="102" />
-<hkern u1="&#x201e;" u2="&#x41e;" k="102" />
-<hkern u1="&#x201e;" u2="&#x40b;" k="143" />
-<hkern u1="&#x201e;" u2="&#x404;" k="102" />
-<hkern u1="&#x201e;" u2="&#x402;" k="143" />
-<hkern u1="&#x201e;" u2="&#x3d2;" k="123" />
-<hkern u1="&#x201e;" u2="&#x3b8;" k="41" />
-<hkern u1="&#x201e;" u2="&#x3ab;" k="123" />
-<hkern u1="&#x201e;" u2="&#x3a8;" k="123" />
-<hkern u1="&#x201e;" u2="&#x3a6;" k="102" />
-<hkern u1="&#x201e;" u2="&#x3a5;" k="123" />
-<hkern u1="&#x201e;" u2="&#x3a4;" k="143" />
-<hkern u1="&#x201e;" u2="&#x39f;" k="82" />
-<hkern u1="&#x201e;" u2="&#x398;" k="82" />
-<hkern u1="&#x201e;" u2="&#x21a;" k="143" />
-<hkern u1="&#x201e;" u2="&#x1fe;" k="102" />
-<hkern u1="&#x201e;" u2="&#x1af;" k="41" />
-<hkern u1="&#x201e;" u2="&#x1a0;" k="102" />
-<hkern u1="&#x201e;" u2="&#x178;" k="123" />
-<hkern u1="&#x201e;" u2="&#x176;" k="123" />
-<hkern u1="&#x201e;" u2="&#x174;" k="123" />
-<hkern u1="&#x201e;" u2="&#x172;" k="41" />
-<hkern u1="&#x201e;" u2="&#x170;" k="41" />
-<hkern u1="&#x201e;" u2="&#x16e;" k="41" />
-<hkern u1="&#x201e;" u2="&#x16c;" k="41" />
-<hkern u1="&#x201e;" u2="&#x16a;" k="41" />
-<hkern u1="&#x201e;" u2="&#x168;" k="41" />
-<hkern u1="&#x201e;" u2="&#x164;" k="143" />
-<hkern u1="&#x201e;" u2="&#x162;" k="143" />
-<hkern u1="&#x201e;" u2="&#x152;" k="102" />
-<hkern u1="&#x201e;" u2="&#x150;" k="102" />
-<hkern u1="&#x201e;" u2="&#x14e;" k="102" />
-<hkern u1="&#x201e;" u2="&#x14c;" k="102" />
-<hkern u1="&#x201e;" u2="&#x122;" k="102" />
-<hkern u1="&#x201e;" u2="&#x120;" k="102" />
-<hkern u1="&#x201e;" u2="&#x11e;" k="102" />
-<hkern u1="&#x201e;" u2="&#x11c;" k="102" />
-<hkern u1="&#x201e;" u2="&#x10c;" k="102" />
-<hkern u1="&#x201e;" u2="&#x10a;" k="102" />
-<hkern u1="&#x201e;" u2="&#x108;" k="102" />
-<hkern u1="&#x201e;" u2="&#x106;" k="102" />
-<hkern u1="&#x201e;" u2="&#xdd;" k="123" />
-<hkern u1="&#x201e;" u2="&#xdc;" k="41" />
-<hkern u1="&#x201e;" u2="&#xdb;" k="41" />
-<hkern u1="&#x201e;" u2="&#xda;" k="41" />
-<hkern u1="&#x201e;" u2="&#xd9;" k="41" />
-<hkern u1="&#x201e;" u2="&#xd8;" k="102" />
-<hkern u1="&#x201e;" u2="&#xd6;" k="102" />
-<hkern u1="&#x201e;" u2="&#xd5;" k="102" />
-<hkern u1="&#x201e;" u2="&#xd4;" k="102" />
-<hkern u1="&#x201e;" u2="&#xd3;" k="102" />
-<hkern u1="&#x201e;" u2="&#xd2;" k="102" />
-<hkern u1="&#x201e;" u2="&#xc7;" k="102" />
-<hkern u1="&#x201e;" u2="Y" k="123" />
-<hkern u1="&#x201e;" u2="W" k="123" />
-<hkern u1="&#x201e;" u2="V" k="123" />
-<hkern u1="&#x201e;" u2="U" k="41" />
-<hkern u1="&#x201e;" u2="T" k="143" />
-<hkern u1="&#x201e;" u2="Q" k="102" />
-<hkern u1="&#x201e;" u2="O" k="102" />
-<hkern u1="&#x201e;" u2="G" k="102" />
-<hkern u1="&#x201e;" u2="C" k="102" />
-<hkern u1="&#x2126;" u2="&#x3d2;" k="20" />
-<hkern u1="&#x2126;" u2="&#x3ab;" k="20" />
-<hkern u1="&#x2126;" u2="&#x3a5;" k="20" />
-<hkern u1="&#x2126;" u2="&#x3a4;" k="41" />
-<hkern g1="ff" u2="&#x201d;" k="-123" />
-<hkern g1="ff" u2="&#x2019;" k="-123" />
-<hkern g1="ff" u2="&#x27;" k="-123" />
-<hkern g1="ff" u2="&#x22;" k="-123" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/fonts/open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.ttf b/core/src/plugins/gui.ajax/res/themes/orbit/fonts/open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.ttf
deleted file mode 100644
index bf6b36931c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/fonts/open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.ttf and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/fonts/open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.woff b/core/src/plugins/gui.ajax/res/themes/orbit/fonts/open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.woff
deleted file mode 100644
index 0021dd9a66..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/fonts/open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.woff and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/fonts/open-sans-fontfacekit/opensans_regular/OpenSans-Regular-webfont.eot b/core/src/plugins/gui.ajax/res/themes/orbit/fonts/open-sans-fontfacekit/opensans_regular/OpenSans-Regular-webfont.eot
deleted file mode 100644
index 1393f6f7bf..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/fonts/open-sans-fontfacekit/opensans_regular/OpenSans-Regular-webfont.eot and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/fonts/open-sans-fontfacekit/opensans_regular/OpenSans-Regular-webfont.svg b/core/src/plugins/gui.ajax/res/themes/orbit/fonts/open-sans-fontfacekit/opensans_regular/OpenSans-Regular-webfont.svg
deleted file mode 100644
index 097feaca1c..0000000000
--- a/core/src/plugins/gui.ajax/res/themes/orbit/fonts/open-sans-fontfacekit/opensans_regular/OpenSans-Regular-webfont.svg
+++ /dev/null
@@ -1,19649 +0,0 @@
-<?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></metadata>
-<defs>
-<font id="open_sansregular" horiz-adv-x="1139" >
-<font-face units-per-em="2048" ascent="1638" descent="-410" />
-<missing-glyph horiz-adv-x="532" />
-<glyph unicode="ff" horiz-adv-x="1389" d="M29 0zM1364 967h-279v-967h-166v967h-196v75l196 60v61q0 404 353 404q87 0 204 -35l-43 -133q-96 31 -164 31q-94 0 -139 -62.5t-45 -200.5v-71h279v-129zM670 967h-279v-967h-166v967h-196v75l196 60v61q0 404 353 404q87 0 204 -35l-43 -133q-96 31 -164 31 q-94 0 -139 -62.5t-45 -200.5v-71h279v-129z" />
-<glyph unicode="&#xfb01;" horiz-adv-x="1212" d="M29 0zM670 967h-279v-967h-166v967h-196v75l196 60v61q0 404 353 404q87 0 204 -35l-43 -133q-96 31 -164 31q-94 0 -139 -62.5t-45 -200.5v-71h279v-129zM1036 0h-166v1096h166v-1096zM856 1393q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5 q-42 0 -70 27.5t-28 83.5z" />
-<glyph unicode="&#xfb02;" horiz-adv-x="1212" d="M29 0zM670 967h-279v-967h-166v967h-196v75l196 60v61q0 404 353 404q87 0 204 -35l-43 -133q-96 31 -164 31q-94 0 -139 -62.5t-45 -200.5v-71h279v-129zM1036 0h-166v1556h166v-1556z" />
-<glyph unicode="&#xfb03;" horiz-adv-x="1909" d="M29 0zM1358 967h-279v-967h-166v967h-196v75l196 60v61q0 404 353 404q87 0 204 -35l-43 -133q-96 31 -164 31q-94 0 -139 -62.5t-45 -200.5v-71h279v-129zM670 967h-279v-967h-166v967h-196v75l196 60v61q0 404 353 404q87 0 204 -35l-43 -133q-96 31 -164 31 q-94 0 -139 -62.5t-45 -200.5v-71h279v-129zM1731 0h-166v1096h166v-1096zM1551 1393q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5z" />
-<glyph unicode="&#xfb04;" horiz-adv-x="1909" d="M29 0zM1358 967h-279v-967h-166v967h-196v75l196 60v61q0 404 353 404q87 0 204 -35l-43 -133q-96 31 -164 31q-94 0 -139 -62.5t-45 -200.5v-71h279v-129zM670 967h-279v-967h-166v967h-196v75l196 60v61q0 404 353 404q87 0 204 -35l-43 -133q-96 31 -164 31 q-94 0 -139 -62.5t-45 -200.5v-71h279v-129zM1731 0h-166v1556h166v-1556z" />
-<glyph unicode="&#xd;" horiz-adv-x="1044" />
-<glyph unicode=" "  horiz-adv-x="532" />
-<glyph unicode="&#x09;" horiz-adv-x="532" />
-<glyph unicode="&#xa0;" horiz-adv-x="532" />
-<glyph unicode="!" horiz-adv-x="547" d="M326 403h-105l-51 1059h207zM152 106q0 136 120 136q58 0 89.5 -35t31.5 -101q0 -64 -32 -99.5t-89 -35.5q-52 0 -86 31.5t-34 103.5z" />
-<glyph unicode="&#x22;" horiz-adv-x="821" d="M319 1462l-40 -528h-105l-41 528h186zM688 1462l-41 -528h-104l-41 528h186z" />
-<glyph unicode="#" horiz-adv-x="1323" d="M981 899l-66 -340h283v-129h-307l-84 -430h-137l84 430h-303l-82 -430h-136l80 430h-262v129h287l68 340h-277v127h299l82 436h139l-82 -436h305l84 436h134l-84 -436h264v-127h-289zM475 559h303l66 340h-303z" />
-<glyph unicode="$" horiz-adv-x="1171" d="M1036 449q0 -136 -102 -224.5t-285 -111.5v-232h-129v223q-112 0 -217 17.5t-172 48.5v156q83 -37 191.5 -60.5t197.5 -23.5v440q-205 65 -287.5 151t-82.5 222q0 131 101.5 215t268.5 102v182h129v-180q184 -5 355 -74l-52 -131q-149 59 -303 70v-434q157 -50 235 -97.5 t115 -109t37 -149.5zM866 436q0 72 -44.5 116.5t-172.5 88.5v-389q217 30 217 184zM319 1057q0 -76 45 -122t156 -87v387q-99 -16 -150 -62.5t-51 -115.5z" />
-<glyph unicode="%" horiz-adv-x="1686" d="M242 1026q0 -170 37 -255t120 -85q164 0 164 340q0 338 -164 338q-83 0 -120 -84t-37 -254zM700 1026q0 -228 -76.5 -344.5t-224.5 -116.5q-140 0 -217.5 119t-77.5 342q0 227 74.5 342t220.5 115q145 0 223 -119t78 -338zM1122 440q0 -171 37 -255.5t121 -84.5t124 83.5 t40 256.5q0 171 -40 253.5t-124 82.5t-121 -82.5t-37 -253.5zM1581 440q0 -227 -76.5 -343.5t-224.5 -116.5q-142 0 -218.5 119t-76.5 341q0 227 74.5 342t220.5 115q142 0 221.5 -117.5t79.5 -339.5zM1323 1462l-811 -1462h-147l811 1462h147z" />
-<glyph unicode="&#x26;" horiz-adv-x="1495" d="M414 1171q0 -69 36 -131.5t123 -150.5q129 75 179.5 138.5t50.5 146.5q0 77 -51.5 125.5t-137.5 48.5q-89 0 -144.5 -48t-55.5 -129zM569 129q241 0 400 154l-437 424q-111 -68 -157 -112.5t-68 -95.5t-22 -116q0 -117 77.5 -185.5t206.5 -68.5zM113 379q0 130 69.5 230 t249.5 202q-85 95 -115.5 144t-48.5 102t-18 110q0 150 98 234t273 84q162 0 255 -83.5t93 -232.5q0 -107 -68 -197.5t-225 -183.5l407 -391q56 62 89.5 145.5t56.5 182.5h168q-68 -286 -205 -434l299 -291h-229l-185 178q-118 -106 -240 -152t-272 -46q-215 0 -333.5 106 t-118.5 293z" />
-<glyph unicode="'" horiz-adv-x="453" d="M319 1462l-40 -528h-105l-41 528h186z" />
-<glyph unicode="(" horiz-adv-x="606" d="M82 561q0 265 77.5 496t223.5 405h162q-144 -193 -216.5 -424t-72.5 -475q0 -240 74 -469t213 -418h-160q-147 170 -224 397t-77 488z" />
-<glyph unicode=")" horiz-adv-x="606" d="M524 561q0 -263 -77.5 -490t-223.5 -395h-160q139 188 213 417.5t74 469.5q0 244 -72.5 475t-216.5 424h162q147 -175 224 -406.5t77 -494.5z" />
-<glyph unicode="*" horiz-adv-x="1130" d="M657 1556l-43 -395l398 111l26 -182l-381 -31l248 -326l-172 -94l-176 362l-160 -362l-176 94l242 326l-377 31l29 182l391 -111l-43 395h194z" />
-<glyph unicode="+" horiz-adv-x="1171" d="M653 791h412v-138h-412v-426h-139v426h-410v138h410v428h139v-428z" />
-<glyph unicode="," horiz-adv-x="502" d="M350 238l15 -23q-26 -100 -75 -232.5t-102 -246.5h-125q27 104 59.5 257t45.5 245h182z" />
-<glyph unicode="-" horiz-adv-x="659" d="M84 473v152h491v-152h-491z" />
-<glyph unicode="." horiz-adv-x="545" d="M152 106q0 67 30.5 101.5t87.5 34.5q58 0 90.5 -34.5t32.5 -101.5q0 -65 -33 -100t-90 -35q-51 0 -84.5 31.5t-33.5 103.5z" />
-<glyph unicode="/" horiz-adv-x="752" d="M731 1462l-545 -1462h-166l545 1462h166z" />
-<glyph unicode="0" horiz-adv-x="1171" d="M1069 733q0 -379 -119.5 -566t-365.5 -187q-236 0 -359 191.5t-123 561.5q0 382 119 567t363 185q238 0 361.5 -193t123.5 -559zM270 733q0 -319 75 -464.5t239 -145.5q166 0 240.5 147.5t74.5 462.5t-74.5 461.5t-240.5 146.5q-164 0 -239 -144.5t-75 -463.5z" />
-<glyph unicode="1" horiz-adv-x="1171" d="M715 0h-162v1042q0 130 8 246q-21 -21 -47 -44t-238 -195l-88 114l387 299h140v-1462z" />
-<glyph unicode="2" horiz-adv-x="1171" d="M1061 0h-961v143l385 387q176 178 232 254t84 148t28 155q0 117 -71 185.5t-197 68.5q-91 0 -172.5 -30t-181.5 -109l-88 113q202 168 440 168q206 0 323 -105.5t117 -283.5q0 -139 -78 -275t-292 -344l-320 -313v-8h752v-154z" />
-<glyph unicode="3" horiz-adv-x="1171" d="M1006 1118q0 -140 -78.5 -229t-222.5 -119v-8q176 -22 261 -112t85 -236q0 -209 -145 -321.5t-412 -112.5q-116 0 -212.5 17.5t-187.5 61.5v158q95 -47 202.5 -71.5t203.5 -24.5q379 0 379 297q0 266 -418 266h-144v143h146q171 0 271 75.5t100 209.5q0 107 -73.5 168 t-199.5 61q-96 0 -181 -26t-194 -96l-84 112q90 71 207.5 111.5t247.5 40.5q213 0 331 -97.5t118 -267.5z" />
-<glyph unicode="4" horiz-adv-x="1171" d="M1130 336h-217v-336h-159v336h-711v145l694 989h176v-983h217v-151zM754 487v486q0 143 10 323h-8q-48 -96 -90 -159l-457 -650h545z" />
-<glyph unicode="5" horiz-adv-x="1171" d="M557 893q231 0 363.5 -114.5t132.5 -313.5q0 -227 -144.5 -356t-398.5 -129q-247 0 -377 79v160q70 -45 174 -70.5t205 -25.5q176 0 273.5 83t97.5 240q0 306 -375 306q-95 0 -254 -29l-86 55l55 684h727v-153h-585l-37 -439q115 23 229 23z" />
-<glyph unicode="6" horiz-adv-x="1171" d="M117 625q0 431 167.5 644.5t495.5 213.5q113 0 178 -19v-143q-77 25 -176 25q-235 0 -359 -146.5t-136 -460.5h12q110 172 348 172q197 0 310.5 -119t113.5 -323q0 -228 -124.5 -358.5t-336.5 -130.5q-227 0 -360 170.5t-133 474.5zM608 121q142 0 220.5 89.5t78.5 258.5 q0 145 -73 228t-218 83q-90 0 -165 -37t-119.5 -102t-44.5 -135q0 -103 40 -192t113.5 -141t167.5 -52z" />
-<glyph unicode="7" horiz-adv-x="1171" d="M285 0l606 1309h-797v153h973v-133l-598 -1329h-184z" />
-<glyph unicode="8" horiz-adv-x="1171" d="M584 1483q200 0 317 -93t117 -257q0 -108 -67 -197t-214 -162q178 -85 253 -178.5t75 -216.5q0 -182 -127 -290.5t-348 -108.5q-234 0 -360 102.5t-126 290.5q0 251 306 391q-138 78 -198 168.5t-60 202.5q0 159 117.5 253.5t314.5 94.5zM268 369q0 -120 83.5 -187 t234.5 -67q149 0 232 70t83 192q0 97 -78 172.5t-272 146.5q-149 -64 -216 -141.5t-67 -185.5zM582 1348q-125 0 -196 -60t-71 -160q0 -92 59 -158t218 -132q143 60 202.5 129t59.5 161q0 101 -72.5 160.5t-199.5 59.5z" />
-<glyph unicode="9" horiz-adv-x="1171" d="M1061 838q0 -858 -664 -858q-116 0 -184 20v143q80 -26 182 -26q240 0 362.5 148.5t133.5 455.5h-12q-55 -83 -146 -126.5t-205 -43.5q-194 0 -308 116t-114 324q0 228 127.5 360t335.5 132q149 0 260.5 -76.5t171.5 -223t60 -345.5zM569 1341q-143 0 -221 -92t-78 -256 q0 -144 72 -226.5t219 -82.5q91 0 167.5 37t120.5 101t44 134q0 105 -41 194t-114.5 140t-168.5 51z" />
-<glyph unicode=":" horiz-adv-x="545" d="M152 106q0 67 30.5 101.5t87.5 34.5q58 0 90.5 -34.5t32.5 -101.5q0 -65 -33 -100t-90 -35q-51 0 -84.5 31.5t-33.5 103.5zM152 989q0 135 118 135q123 0 123 -135q0 -65 -33 -100t-90 -35q-51 0 -84.5 31.5t-33.5 103.5z" />
-<glyph unicode=";" horiz-adv-x="545" d="M350 238l15 -23q-26 -100 -75 -232.5t-102 -246.5h-125q27 104 59.5 257t45.5 245h182zM147 989q0 135 119 135q123 0 123 -135q0 -65 -33 -100t-90 -35q-58 0 -88.5 35t-30.5 100z" />
-<glyph unicode="&#x3c;" horiz-adv-x="1171" d="M1065 242l-961 422v98l961 479v-149l-782 -371l782 -328v-151z" />
-<glyph unicode="=" horiz-adv-x="1171" d="M119 858v137h930v-137h-930zM119 449v137h930v-137h-930z" />
-<glyph unicode="&#x3e;" horiz-adv-x="1171" d="M104 393l783 326l-783 373v149l961 -479v-98l-961 -422v151z" />
-<glyph unicode="?" horiz-adv-x="879" d="M289 403v54q0 117 36 192.5t134 159.5q136 115 171.5 173t35.5 140q0 102 -65.5 157.5t-188.5 55.5q-79 0 -154 -18.5t-172 -67.5l-59 135q189 99 395 99q191 0 297 -94t106 -265q0 -73 -19.5 -128.5t-57.5 -105t-164 -159.5q-101 -86 -133.5 -143t-32.5 -152v-33h-129z M240 106q0 136 120 136q58 0 89.5 -35t31.5 -101q0 -64 -32 -99.5t-89 -35.5q-52 0 -86 31.5t-34 103.5z" />
-<glyph unicode="@" horiz-adv-x="1841" d="M1720 729q0 -142 -44 -260t-124 -183t-184 -65q-86 0 -145 52t-70 133h-8q-40 -87 -114.5 -136t-176.5 -49q-150 0 -234.5 102.5t-84.5 278.5q0 204 118 331.5t310 127.5q68 0 154 -12.5t155 -34.5l-25 -470v-22q0 -178 133 -178q91 0 148 107.5t57 279.5q0 181 -74 317 t-210.5 209.5t-313.5 73.5q-223 0 -388 -92.5t-252 -264t-87 -396.5q0 -305 161 -469t464 -164q210 0 436 86v-133q-192 -84 -436 -84q-363 0 -563.5 199.5t-200.5 557.5q0 260 107 463t305 314.5t454 111.5q215 0 382.5 -90.5t259 -257t91.5 -383.5zM686 598 q0 -254 195 -254q207 0 225 313l14 261q-72 20 -157 20q-130 0 -203.5 -90t-73.5 -250z" />
-<glyph unicode="A" horiz-adv-x="1296" d="M1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473z" />
-<glyph unicode="B" horiz-adv-x="1327" d="M201 1462h413q291 0 421 -87t130 -275q0 -130 -72.5 -214.5t-211.5 -109.5v-10q333 -57 333 -350q0 -196 -132.5 -306t-370.5 -110h-510v1462zM371 836h280q180 0 259 56.5t79 190.5q0 123 -88 177.5t-280 54.5h-250v-479zM371 692v-547h305q177 0 266.5 68.5t89.5 214.5 q0 136 -91.5 200t-278.5 64h-291z" />
-<glyph unicode="C" horiz-adv-x="1292" d="M827 1331q-241 0 -380.5 -160.5t-139.5 -439.5q0 -287 134.5 -443.5t383.5 -156.5q153 0 349 55v-149q-152 -57 -375 -57q-323 0 -498.5 196t-175.5 557q0 226 84.5 396t244 262t375.5 92q230 0 402 -84l-72 -146q-166 78 -332 78z" />
-<glyph unicode="D" horiz-adv-x="1493" d="M1368 745q0 -362 -196.5 -553.5t-565.5 -191.5h-405v1462h448q341 0 530 -189t189 -528zM1188 739q0 286 -143.5 431t-426.5 145h-247v-1168h207q304 0 457 149.5t153 442.5z" />
-<glyph unicode="E" d="M1016 0h-815v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152z" />
-<glyph unicode="F" horiz-adv-x="1057" d="M371 0h-170v1462h815v-151h-645v-535h606v-151h-606v-625z" />
-<glyph unicode="G" horiz-adv-x="1491" d="M844 766h497v-711q-116 -37 -236 -56t-278 -19q-332 0 -517 197.5t-185 553.5q0 228 91.5 399.5t263.5 262t403 90.5q234 0 436 -86l-66 -150q-198 84 -381 84q-267 0 -417 -159t-150 -441q0 -296 144.5 -449t424.5 -153q152 0 297 35v450h-327v152z" />
-<glyph unicode="H" horiz-adv-x="1511" d="M1311 0h-170v688h-770v-688h-170v1462h170v-622h770v622h170v-1462z" />
-<glyph unicode="I" horiz-adv-x="571" d="M201 0v1462h170v-1462h-170z" />
-<glyph unicode="J" horiz-adv-x="547" d="M-12 -385q-94 0 -148 27v145q71 -20 148 -20q99 0 150.5 60t51.5 173v1462h170v-1448q0 -190 -96 -294.5t-276 -104.5z" />
-<glyph unicode="K" horiz-adv-x="1257" d="M1257 0h-200l-533 709l-153 -136v-573h-170v1462h170v-725l663 725h201l-588 -635z" />
-<glyph unicode="L" horiz-adv-x="1063" d="M201 0v1462h170v-1308h645v-154h-815z" />
-<glyph unicode="M" horiz-adv-x="1849" d="M848 0l-496 1296h-8q14 -154 14 -366v-930h-157v1462h256l463 -1206h8l467 1206h254v-1462h-170v942q0 162 14 352h-8l-500 -1294h-137z" />
-<glyph unicode="N" horiz-adv-x="1544" d="M1343 0h-194l-799 1227h-8q16 -216 16 -396v-831h-157v1462h192l797 -1222h8q-2 27 -9 173.5t-5 209.5v839h159v-1462z" />
-<glyph unicode="O" horiz-adv-x="1595" d="M1470 733q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5 t-126.5 -446.5z" />
-<glyph unicode="P" horiz-adv-x="1233" d="M1128 1036q0 -222 -151.5 -341.5t-433.5 -119.5h-172v-575h-170v1462h379q548 0 548 -426zM371 721h153q226 0 327 73t101 234q0 145 -95 216t-296 71h-190v-594z" />
-<glyph unicode="Q" horiz-adv-x="1595" d="M1470 733q0 -281 -113 -467t-319 -252l348 -362h-247l-285 330l-55 -2q-323 0 -498.5 197.5t-175.5 557.5q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5 q-243 0 -369.5 -153.5t-126.5 -446.5z" />
-<glyph unicode="R" horiz-adv-x="1266" d="M371 608v-608h-170v1462h401q269 0 397.5 -103t128.5 -310q0 -290 -294 -392l397 -657h-201l-354 608h-305zM371 754h233q180 0 264 71.5t84 214.5q0 145 -85.5 209t-274.5 64h-221v-559z" />
-<glyph unicode="S" horiz-adv-x="1124" d="M1026 389q0 -193 -140 -301t-380 -108q-260 0 -400 67v164q90 -38 196 -60t210 -22q170 0 256 64.5t86 179.5q0 76 -30.5 124.5t-102 89.5t-217.5 93q-204 73 -291.5 173t-87.5 261q0 169 127 269t336 100q218 0 401 -80l-53 -148q-181 76 -352 76q-135 0 -211 -58 t-76 -161q0 -76 28 -124.5t94.5 -89t203.5 -89.5q230 -82 316.5 -176t86.5 -244z" />
-<glyph unicode="T" horiz-adv-x="1133" d="M651 0h-170v1311h-463v151h1096v-151h-463v-1311z" />
-<glyph unicode="U" horiz-adv-x="1491" d="M1305 1462v-946q0 -250 -151 -393t-415 -143t-408.5 144t-144.5 396v942h170v-954q0 -183 100 -281t294 -98q185 0 285 98.5t100 282.5v952h170z" />
-<glyph unicode="V" horiz-adv-x="1219" d="M1036 1462h183l-527 -1462h-168l-524 1462h180l336 -946q58 -163 92 -317q36 162 94 323z" />
-<glyph unicode="W" horiz-adv-x="1896" d="M1477 0h-168l-295 979q-21 65 -47 164t-27 119q-22 -132 -70 -289l-286 -973h-168l-389 1462h180l231 -903q48 -190 70 -344q27 183 80 358l262 889h180l275 -897q48 -155 81 -350q19 142 72 346l230 901h180z" />
-<glyph unicode="X" horiz-adv-x="1182" d="M1174 0h-193l-393 643l-400 -643h-180l486 764l-453 698h188l363 -579l366 579h181l-453 -692z" />
-<glyph unicode="Y" horiz-adv-x="1147" d="M573 731l390 731h184l-488 -895v-567h-172v559l-487 903h186z" />
-<glyph unicode="Z" horiz-adv-x="1169" d="M1087 0h-1005v133l776 1176h-752v153h959v-133l-776 -1175h798v-154z" />
-<glyph unicode="[" horiz-adv-x="674" d="M623 -324h-457v1786h457v-141h-289v-1503h289v-142z" />
-<glyph unicode="\" horiz-adv-x="752" d="M186 1462l547 -1462h-166l-544 1462h163z" />
-<glyph unicode="]" horiz-adv-x="674" d="M51 -182h289v1503h-289v141h457v-1786h-457v142z" />
-<glyph unicode="^" horiz-adv-x="1110" d="M49 551l434 922h99l477 -922h-152l-372 745l-334 -745h-152z" />
-<glyph unicode="_" horiz-adv-x="918" d="M922 -315h-926v131h926v-131z" />
-<glyph unicode="`" horiz-adv-x="1182" d="M786 1241h-110q-65 52 -154 148t-129 159v21h203q32 -69 89 -159.5t101 -143.5v-25z" />
-<glyph unicode="a" d="M850 0l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123zM475 117q155 0 243.5 85t88.5 238 v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5q0 -90 54.5 -137t152.5 -47z" />
-<glyph unicode="b" horiz-adv-x="1255" d="M686 1114q216 0 335.5 -147.5t119.5 -417.5t-120.5 -419.5t-334.5 -149.5q-107 0 -195.5 39.5t-148.5 121.5h-12l-35 -141h-119v1556h166v-378q0 -127 -8 -228h8q116 164 344 164zM662 975q-170 0 -245 -97.5t-75 -328.5t77 -330.5t247 -99.5q153 0 228 111.5t75 320.5 q0 214 -75 319t-232 105z" />
-<glyph unicode="c" horiz-adv-x="975" d="M614 -20q-238 0 -368.5 146.5t-130.5 414.5q0 275 132.5 425t377.5 150q79 0 158 -17t124 -40l-51 -141q-55 22 -120 36.5t-115 14.5q-334 0 -334 -426q0 -202 81.5 -310t241.5 -108q137 0 281 59v-147q-110 -57 -277 -57z" />
-<glyph unicode="d" horiz-adv-x="1255" d="M922 147h-9q-115 -167 -344 -167q-215 0 -334.5 147t-119.5 418t120 421t334 150q223 0 342 -162h13l-7 79l-4 77v446h166v-1556h-135zM590 119q170 0 246.5 92.5t76.5 298.5v35q0 233 -77.5 332.5t-247.5 99.5q-146 0 -223.5 -113.5t-77.5 -320.5q0 -210 77 -317 t226 -107z" />
-<glyph unicode="e" horiz-adv-x="1149" d="M639 -20q-243 0 -383.5 148t-140.5 411q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5zM594 977q-132 0 -210.5 -86t-92.5 -238h573q0 157 -70 240.5t-200 83.5z " />
-<glyph unicode="f" horiz-adv-x="694" d="M670 967h-279v-967h-166v967h-196v75l196 60v61q0 404 353 404q87 0 204 -35l-43 -133q-96 31 -164 31q-94 0 -139 -62.5t-45 -200.5v-71h279v-129z" />
-<glyph unicode="g" horiz-adv-x="1122" d="M1073 1096v-105l-203 -24q28 -35 50 -91.5t22 -127.5q0 -161 -110 -257t-302 -96q-49 0 -92 8q-106 -56 -106 -141q0 -45 37 -66.5t127 -21.5h194q178 0 273.5 -75t95.5 -218q0 -182 -146 -277.5t-426 -95.5q-215 0 -331.5 80t-116.5 226q0 100 64 173t180 99 q-42 19 -70.5 59t-28.5 93q0 60 32 105t101 87q-85 35 -138.5 119t-53.5 192q0 180 108 277.5t306 97.5q86 0 155 -20h379zM199 -184q0 -89 75 -135t215 -46q209 0 309.5 62.5t100.5 169.5q0 89 -55 123.5t-207 34.5h-199q-113 0 -176 -54t-63 -155zM289 745q0 -115 65 -174 t181 -59q243 0 243 236q0 247 -246 247q-117 0 -180 -63t-63 -187z" />
-<glyph unicode="h" horiz-adv-x="1257" d="M926 0v709q0 134 -61 200t-191 66q-173 0 -252.5 -94t-79.5 -308v-573h-166v1556h166v-471q0 -85 -8 -141h10q49 79 139.5 124.5t206.5 45.5q201 0 301.5 -95.5t100.5 -303.5v-715h-166z" />
-<glyph unicode="i" horiz-adv-x="518" d="M342 0h-166v1096h166v-1096zM162 1393q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5z" />
-<glyph unicode="j" horiz-adv-x="518" d="M43 -492q-95 0 -154 25v135q69 -20 136 -20q78 0 114.5 42.5t36.5 129.5v1276h166v-1264q0 -324 -299 -324zM162 1393q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5z" />
-<glyph unicode="k" horiz-adv-x="1075" d="M340 561q43 61 131 160l354 375h197l-444 -467l475 -629h-201l-387 518l-125 -108v-410h-164v1556h164v-825q0 -55 -8 -170h8z" />
-<glyph unicode="l" horiz-adv-x="518" d="M342 0h-166v1556h166v-1556z" />
-<glyph unicode="m" horiz-adv-x="1905" d="M1573 0v713q0 131 -56 196.5t-174 65.5q-155 0 -229 -89t-74 -274v-612h-166v713q0 131 -56 196.5t-175 65.5q-156 0 -228.5 -93.5t-72.5 -306.5v-575h-166v1096h135l27 -150h8q47 80 132.5 125t191.5 45q257 0 336 -186h8q49 86 142 136t212 50q186 0 278.5 -95.5 t92.5 -305.5v-715h-166z" />
-<glyph unicode="n" horiz-adv-x="1257" d="M926 0v709q0 134 -61 200t-191 66q-172 0 -252 -93t-80 -307v-575h-166v1096h135l27 -150h8q51 81 143 125.5t205 44.5q198 0 298 -95.5t100 -305.5v-715h-166z" />
-<glyph unicode="o" horiz-adv-x="1237" d="M1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414zM287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319z" />
-<glyph unicode="p" horiz-adv-x="1255" d="M686 -20q-107 0 -195.5 39.5t-148.5 121.5h-12q12 -96 12 -182v-451h-166v1588h135l23 -150h8q64 90 149 130t195 40q218 0 336.5 -149t118.5 -418q0 -270 -120.5 -419.5t-334.5 -149.5zM662 975q-168 0 -243 -93t-77 -296v-37q0 -231 77 -330.5t247 -99.5 q142 0 222.5 115t80.5 317q0 205 -80.5 314.5t-226.5 109.5z" />
-<glyph unicode="q" horiz-adv-x="1255" d="M590 119q166 0 242 89t81 300v37q0 230 -78 331t-247 101q-146 0 -223.5 -113.5t-77.5 -320.5t76.5 -315.5t226.5 -108.5zM565 -20q-212 0 -331 149t-119 416q0 269 120 420t334 151q225 0 346 -170h9l24 150h131v-1588h-166v469q0 100 11 170h-13q-115 -167 -346 -167z " />
-<glyph unicode="r" horiz-adv-x="836" d="M676 1116q73 0 131 -12l-23 -154q-68 15 -120 15q-133 0 -227.5 -108t-94.5 -269v-588h-166v1096h137l19 -203h8q61 107 147 165t189 58z" />
-<glyph unicode="s" horiz-adv-x="977" d="M883 299q0 -153 -114 -236t-320 -83q-218 0 -340 69v154q79 -40 169.5 -63t174.5 -23q130 0 200 41.5t70 126.5q0 64 -55.5 109.5t-216.5 107.5q-153 57 -217.5 99.5t-96 96.5t-31.5 129q0 134 109 211.5t299 77.5q177 0 346 -72l-59 -135q-165 68 -299 68 q-118 0 -178 -37t-60 -102q0 -44 22.5 -75t72.5 -59t192 -81q195 -71 263.5 -143t68.5 -181z" />
-<glyph unicode="t" horiz-adv-x="723" d="M530 117q44 0 85 6.5t65 13.5v-127q-27 -13 -79.5 -21.5t-94.5 -8.5q-318 0 -318 335v652h-157v80l157 69l70 234h96v-254h318v-129h-318v-645q0 -99 47 -152t129 -53z" />
-<glyph unicode="u" horiz-adv-x="1257" d="M332 1096v-711q0 -134 61 -200t191 -66q172 0 251.5 94t79.5 307v576h166v-1096h-137l-24 147h-9q-51 -81 -141.5 -124t-206.5 -43q-200 0 -299.5 95t-99.5 304v717h168z" />
-<glyph unicode="v" horiz-adv-x="1026" d="M416 0l-416 1096h178l236 -650q80 -228 94 -296h8q11 53 69.5 219.5t262.5 726.5h178l-416 -1096h-194z" />
-<glyph unicode="w" horiz-adv-x="1593" d="M1071 0l-201 643q-19 59 -71 268h-8q-40 -175 -70 -270l-207 -641h-192l-299 1096h174q106 -413 161.5 -629t63.5 -291h8q11 57 35.5 147.5t42.5 143.5l201 629h180l196 -629q56 -172 76 -289h8q4 36 21.5 111t208.5 807h172l-303 -1096h-197z" />
-<glyph unicode="x" horiz-adv-x="1073" d="M440 561l-381 535h189l289 -420l288 420h187l-381 -535l401 -561h-188l-307 444l-310 -444h-188z" />
-<glyph unicode="y" horiz-adv-x="1032" d="M2 1096h178l240 -625q79 -214 98 -309h8q13 51 54.5 174.5t271.5 759.5h178l-471 -1248q-70 -185 -163.5 -262.5t-229.5 -77.5q-76 0 -150 17v133q55 -12 123 -12q171 0 244 192l61 156z" />
-<glyph unicode="z" horiz-adv-x="958" d="M877 0h-795v113l598 854h-561v129h743v-129l-590 -838h605v-129z" />
-<glyph unicode="{" horiz-adv-x="776" d="M475 12q0 -102 58.5 -148t171.5 -48v-140q-190 2 -294 87t-104 239v303q0 104 -63 148.5t-183 44.5v141q130 2 188 48t58 142v306q0 155 108 241t290 86v-139q-230 -6 -230 -199v-295q0 -215 -223 -254v-12q223 -39 223 -254v-297z" />
-<glyph unicode="|" horiz-adv-x="1128" d="M494 1556h141v-2052h-141v2052z" />
-<glyph unicode="}" horiz-adv-x="776" d="M522 575q-223 39 -223 254v295q0 193 -227 199v139q184 0 289.5 -87t105.5 -240v-306q0 -97 59 -142.5t189 -47.5v-141q-122 0 -185 -44.5t-63 -148.5v-303q0 -153 -102.5 -238.5t-292.5 -87.5v140q111 2 169 48t58 148v297q0 114 55 174t168 80v12z" />
-<glyph unicode="~" horiz-adv-x="1171" d="M338 713q-53 0 -116.5 -33.5t-117.5 -87.5v151q100 109 244 109q68 0 124.5 -14t145.5 -52q66 -28 115 -41.5t96 -13.5q54 0 118 32t118 89v-150q-102 -110 -244 -110q-72 0 -135 16.5t-135 48.5q-75 32 -120 44t-93 12z" />
-<glyph unicode="&#xa1;" horiz-adv-x="547" d="M219 684h105l51 -1057h-207zM393 983q0 -135 -121 -135q-60 0 -90 35.5t-30 99.5q0 63 31.5 99t88.5 36q51 0 86 -32t35 -103z" />
-<glyph unicode="&#xa2;" horiz-adv-x="1171" d="M971 240q-105 -54 -252 -60v-200h-133v206q-203 32 -299.5 168.5t-96.5 386.5q0 508 396 570v172h135v-164q75 -3 146 -19.5t120 -39.5l-49 -140q-133 51 -242 51q-172 0 -253 -105.5t-81 -322.5q0 -212 79.5 -313.5t246.5 -101.5q141 0 283 59v-147z" />
-<glyph unicode="&#xa3;" horiz-adv-x="1171" d="M682 1481q190 0 360 -84l-61 -133q-154 77 -297 77q-123 0 -185.5 -62t-62.5 -202v-295h422v-127h-422v-221q0 -100 -32.5 -168t-106.5 -112h795v-154h-1029v141q205 47 205 291v223h-198v127h198v316q0 178 112 280.5t302 102.5z" />
-<glyph unicode="&#xa4;" horiz-adv-x="1171" d="M184 723q0 122 74 229l-135 140l94 92l135 -133q104 73 234 73q127 0 229 -73l137 133l95 -92l-134 -138q74 -113 74 -231q0 -131 -74 -234l131 -135l-92 -92l-137 133q-102 -71 -229 -71q-134 0 -234 73l-135 -133l-92 92l133 136q-74 107 -74 231zM313 723 q0 -112 78.5 -192t194.5 -80t195 79.5t79 192.5q0 114 -80 195t-194 81q-116 0 -194.5 -82t-78.5 -194z" />
-<glyph unicode="&#xa5;" horiz-adv-x="1171" d="M584 735l379 727h174l-416 -770h262v-127h-317v-170h317v-127h-317v-268h-164v268h-316v127h316v170h-316v127h256l-411 770h178z" />
-<glyph unicode="&#xa6;" horiz-adv-x="1128" d="M494 1556h141v-776h-141v776zM494 281h141v-777h-141v777z" />
-<glyph unicode="&#xa7;" horiz-adv-x="1057" d="M139 809q0 86 43 154.5t121 105.5q-74 40 -116 95.5t-42 140.5q0 121 103.5 190.5t300.5 69.5q94 0 173.5 -14.5t176.5 -53.5l-53 -131q-98 39 -165.5 52.5t-143.5 13.5q-116 0 -174 -29.5t-58 -93.5q0 -60 61.5 -102t215.5 -97q186 -68 261 -143.5t75 -182.5 q0 -90 -41 -160.5t-115 -111.5q153 -81 153 -227q0 -140 -117 -216.5t-329 -76.5q-218 0 -346 65v148q78 -37 175 -59.5t179 -22.5q134 0 204.5 38t70.5 109q0 46 -24 75t-78 58t-169 72q-142 52 -209 97t-100 102t-33 135zM285 829q0 -77 66 -129.5t233 -113.5l49 -19 q137 80 137 191q0 83 -73.5 139t-258.5 113q-68 -19 -110.5 -69t-42.5 -112z" />
-<glyph unicode="&#xa8;" horiz-adv-x="1182" d="M309 1393q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM690 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#xa9;" horiz-adv-x="1704" d="M893 1059q-125 0 -192.5 -87t-67.5 -241q0 -168 63.5 -249t194.5 -81q86 0 211 45v-124q-48 -20 -98.5 -34t-120.5 -14q-194 0 -298 120.5t-104 336.5q0 209 110.5 332t301.5 123q128 0 246 -60l-58 -118q-108 51 -188 51zM100 731q0 200 100 375t275 276t377 101 q200 0 375 -100t276 -275t101 -377q0 -197 -97 -370t-272 -277t-383 -104q-207 0 -382 103.5t-272.5 276.5t-97.5 371zM205 731q0 -173 87 -323.5t237.5 -237t322.5 -86.5q174 0 323 87t236.5 235.5t87.5 324.5q0 174 -87 323t-235.5 236.5t-324.5 87.5q-174 0 -323 -87 t-236.5 -235.5t-87.5 -324.5z" />
-<glyph unicode="&#xaa;" horiz-adv-x="725" d="M532 801l-24 84q-92 -97 -232 -97q-95 0 -150.5 49.5t-55.5 151.5t77 154.5t242 58.5l117 4v39q0 133 -148 133q-100 0 -204 -51l-43 96q114 56 247 56q130 0 198.5 -52.5t68.5 -173.5v-452h-93zM193 989q0 -100 112 -100q201 0 201 180v49l-98 -4q-112 -4 -163.5 -32.5 t-51.5 -92.5z" />
-<glyph unicode="&#xab;" horiz-adv-x="1018" d="M82 551l342 407l119 -69l-289 -350l289 -351l-119 -71l-342 407v27zM477 551l344 407l117 -69l-287 -350l287 -351l-117 -71l-344 407v27z" />
-<glyph unicode="&#xac;" horiz-adv-x="1171" d="M1065 791v-527h-137v389h-824v138h961z" />
-<glyph unicode="&#xad;" horiz-adv-x="659" d="M84 473zM84 473v152h491v-152h-491z" />
-<glyph unicode="&#xae;" horiz-adv-x="1704" d="M723 762h108q80 0 128.5 41.5t48.5 105.5q0 75 -43 107.5t-136 32.5h-106v-287zM1157 913q0 -80 -42.5 -141.5t-119.5 -91.5l238 -395h-168l-207 354h-135v-354h-148v891h261q166 0 243.5 -65t77.5 -198zM100 731q0 200 100 375t275 276t377 101q200 0 375 -100t276 -275 t101 -377q0 -197 -97 -370t-272 -277t-383 -104q-207 0 -382 103.5t-272.5 276.5t-97.5 371zM205 731q0 -173 87 -323.5t237.5 -237t322.5 -86.5q174 0 323 87t236.5 235.5t87.5 324.5q0 174 -87 323t-235.5 236.5t-324.5 87.5q-174 0 -323 -87t-236.5 -235.5t-87.5 -324.5z " />
-<glyph unicode="&#xaf;" horiz-adv-x="1024" d="M1030 1556h-1036v127h1036v-127z" />
-<glyph unicode="&#xb0;" horiz-adv-x="877" d="M127 1171q0 130 90.5 221t220.5 91t221 -90.5t91 -221.5q0 -84 -41 -155.5t-114 -113.5t-157 -42q-130 0 -220.5 90t-90.5 221zM242 1171q0 -82 58.5 -139t139.5 -57q80 0 137.5 56.5t57.5 139.5q0 84 -56.5 140.5t-138.5 56.5q-83 0 -140.5 -57t-57.5 -140z" />
-<glyph unicode="&#xb1;" horiz-adv-x="1171" d="M104 1zM653 791h412v-138h-412v-426h-139v426h-410v138h410v428h139v-428zM104 1v138h961v-138h-961z" />
-<glyph unicode="&#xb2;" horiz-adv-x="711" d="M653 586h-604v104l236 230q89 86 130 134.5t57.5 86.5t16.5 92q0 68 -40 102.5t-103 34.5q-52 0 -101 -19t-118 -69l-66 88q131 111 283 111q132 0 205.5 -65t73.5 -177q0 -80 -44.5 -155.5t-191.5 -213.5l-174 -165h440v-119z" />
-<glyph unicode="&#xb3;" horiz-adv-x="711" d="M627 1255q0 -80 -41 -131.5t-109 -74.5q176 -47 176 -209q0 -128 -92 -199.5t-260 -71.5q-152 0 -268 56v123q147 -68 270 -68q211 0 211 162q0 145 -231 145h-117v107h119q103 0 152.5 39.5t49.5 107.5q0 61 -40 95t-107 34q-66 0 -122 -21.5t-112 -56.5l-69 90 q63 45 133 72t164 27q136 0 214.5 -59.5t78.5 -166.5z" />
-<glyph unicode="&#xb4;" horiz-adv-x="1182" d="M393 1266q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#xb5;" horiz-adv-x="1268" d="M342 381q0 -262 254 -262q171 0 250.5 94.5t79.5 306.5v576h166v-1096h-136l-26 147h-10q-111 -167 -340 -167q-150 0 -238 92h-10q10 -84 10 -244v-320h-166v1588h166v-715z" />
-<glyph unicode="&#xb6;" horiz-adv-x="1341" d="M1120 -260h-114v1712h-213v-1712h-115v819q-62 -18 -146 -18q-216 0 -317.5 125t-101.5 376q0 260 109 387t341 127h557v-1816z" />
-<glyph unicode="&#xb7;" horiz-adv-x="545" d="M152 723q0 66 31 100.5t87 34.5q58 0 90.5 -34.5t32.5 -100.5q0 -65 -33 -100t-90 -35q-51 0 -84.5 31.5t-33.5 103.5z" />
-<glyph unicode="&#xb8;" horiz-adv-x="465" d="M436 -289q0 -97 -76.5 -150t-226.5 -53q-51 0 -96 9v106q45 -8 104 -8q79 0 119.5 20t40.5 74q0 43 -39.5 69.5t-148.5 43.5l88 178h110l-55 -115q180 -39 180 -174z" />
-<glyph unicode="&#xb9;" horiz-adv-x="711" d="M338 1462h143v-876h-133v579q0 91 6 181q-22 -22 -49 -44.5t-162 -117.5l-67 96z" />
-<glyph unicode="&#xba;" horiz-adv-x="768" d="M702 1135q0 -164 -85.5 -255.5t-235.5 -91.5q-146 0 -230.5 93t-84.5 254q0 163 84 253.5t235 90.5q152 0 234.5 -91t82.5 -253zM188 1135q0 -122 45.5 -183t149.5 -61q105 0 151 61t46 183q0 123 -46 182t-151 59q-103 0 -149 -59t-46 -182z" />
-<glyph unicode="&#xbb;" horiz-adv-x="1018" d="M936 524l-344 -407l-117 71l287 351l-287 350l117 69l344 -407v-27zM541 524l-344 -407l-117 71l287 351l-287 350l117 69l344 -407v-27z" />
-<glyph unicode="&#xbc;" horiz-adv-x="1597" d="M75 0zM1298 1462l-903 -1462h-143l903 1462h143zM337 1462h143v-876h-133v579q0 91 6 181q-22 -22 -49 -44.5t-162 -117.5l-67 96zM1489 203h-125v-202h-145v202h-402v101l408 579h139v-563h125v-117zM1219 320v195q0 134 6 209q-5 -12 -17 -31.5t-27 -42l-30 -45 t-26 -39.5l-168 -246h262z" />
-<glyph unicode="&#xbd;" horiz-adv-x="1597" d="M46 0zM1230 1462l-903 -1462h-143l903 1462h143zM308 1462h143v-876h-133v579q0 91 6 181q-22 -22 -49 -44.5t-162 -117.5l-67 96zM1499 1h-604v104l236 230q89 86 130 134.5t57.5 86.5t16.5 92q0 68 -40 102.5t-103 34.5q-52 0 -101 -19t-118 -69l-66 88 q131 111 283 111q132 0 205.5 -65t73.5 -177q0 -80 -44.5 -155.5t-191.5 -213.5l-174 -165h440v-119z" />
-<glyph unicode="&#xbe;" horiz-adv-x="1597" d="M26 0zM620 1255q0 -80 -41 -131.5t-109 -74.5q176 -47 176 -209q0 -128 -92 -199.5t-260 -71.5q-152 0 -268 56v123q147 -68 270 -68q211 0 211 162q0 145 -231 145h-117v107h119q103 0 152.5 39.5t49.5 107.5q0 61 -40 95t-107 34q-66 0 -122 -21.5t-112 -56.5l-69 90 q63 45 133 72t164 27q136 0 214.5 -59.5t78.5 -166.5zM1390 1462l-903 -1462h-143l903 1462h143zM1569 203h-125v-202h-145v202h-402v101l408 579h139v-563h125v-117zM1299 320v195q0 134 6 209q-5 -12 -17 -31.5t-27 -42l-30 -45t-26 -39.5l-168 -246h262z" />
-<glyph unicode="&#xbf;" horiz-adv-x="879" d="M590 684v-51q0 -122 -37.5 -196t-134.5 -158q-121 -106 -151.5 -143.5t-43 -76t-12.5 -94.5q0 -100 66 -156.5t188 -56.5q80 0 155 19t173 67l59 -135q-197 -96 -395 -96q-190 0 -298 93t-108 263q0 70 17.5 122.5t49.5 97t76.5 85.5t98.5 88q101 88 133.5 146t32.5 151 v31h131zM639 983q0 -135 -121 -135q-59 0 -90 34.5t-31 100.5q0 64 33 99.5t88 35.5q51 0 86 -32t35 -103z" />
-<glyph unicode="&#xc0;" horiz-adv-x="1296" d="M0 0zM1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473zM724 1579h-110q-65 52 -154 148t-129 159v21h203q32 -69 89 -159.5t101 -143.5v-25z" />
-<glyph unicode="&#xc1;" horiz-adv-x="1296" d="M0 0zM1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473zM526 1604q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#xc2;" horiz-adv-x="1296" d="M0 0zM1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473zM303 1602q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186 h-115v23z" />
-<glyph unicode="&#xc3;" horiz-adv-x="1296" d="M0 0zM1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473zM792 1581q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5q-50 0 -75.5 -30t-39.5 -91h-98q13 121 70.5 189.5t148.5 68.5 q46 0 89 -18.5t82 -41t75 -41t68 -18.5q49 0 73 29.5t39 91.5h99q-13 -121 -69.5 -189.5t-150.5 -68.5z" />
-<glyph unicode="&#xc4;" horiz-adv-x="1296" d="M0 0zM1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473zM364 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5z M745 1731q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#xc5;" horiz-adv-x="1296" d="M0 0zM1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473zM870 1587q0 -98 -61.5 -157.5t-163.5 -59.5q-101 0 -161 58.5t-60 156.5t60.5 155.5t160.5 57.5q101 0 163 -59.5t62 -151.5z M762 1585q0 56 -33 86.5t-84 30.5t-84 -30.5t-33 -86.5t30 -86.5t87 -30.5q52 0 84.5 30.5t32.5 86.5z" />
-<glyph unicode="&#xc6;" horiz-adv-x="1788" d="M1665 0h-750v465h-514l-227 -465h-176l698 1462h969v-151h-580v-471h541v-150h-541v-538h580v-152zM469 618h446v693h-118z" />
-<glyph unicode="&#xc7;" horiz-adv-x="1292" d="M125 0zM827 1331q-241 0 -380.5 -160.5t-139.5 -439.5q0 -287 134.5 -443.5t383.5 -156.5q153 0 349 55v-149q-152 -57 -375 -57q-323 0 -498.5 196t-175.5 557q0 226 84.5 396t244 262t375.5 92q230 0 402 -84l-72 -146q-166 78 -332 78zM950 -289q0 -97 -76.5 -150 t-226.5 -53q-51 0 -96 9v106q45 -8 104 -8q79 0 119.5 20t40.5 74q0 43 -39.5 69.5t-148.5 43.5l88 178h110l-55 -115q180 -39 180 -174z" />
-<glyph unicode="&#xc8;" d="M201 0zM1016 0h-815v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152zM713 1579h-110q-65 52 -154 148t-129 159v21h203q32 -69 89 -159.5t101 -143.5v-25z" />
-<glyph unicode="&#xc9;" d="M201 0zM1016 0h-815v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152zM456 1604q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#xca;" d="M201 0zM1016 0h-815v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152zM263 1602q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#xcb;" d="M201 0zM1016 0h-815v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152zM327 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM708 1731q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5 t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#xcc;" horiz-adv-x="571" d="M5 0zM201 0v1462h170v-1462h-170zM398 1579h-110q-65 52 -154 148t-129 159v21h203q32 -69 89 -159.5t101 -143.5v-25z" />
-<glyph unicode="&#xcd;" horiz-adv-x="571" d="M179 0zM201 0v1462h170v-1462h-170zM179 1604q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#xce;" horiz-adv-x="571" d="M0 0zM201 0v1462h170v-1462h-170zM-57 1602q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#xcf;" horiz-adv-x="571" d="M5 0zM201 0v1462h170v-1462h-170zM5 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM386 1731q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#xd0;" horiz-adv-x="1479" d="M1352 745q0 -362 -196.5 -553.5t-565.5 -191.5h-389v649h-154v150h154v663h434q337 0 527 -187.5t190 -529.5zM1171 739q0 576 -569 576h-231v-516h379v-150h-379v-502h190q610 0 610 592z" />
-<glyph unicode="&#xd1;" horiz-adv-x="1544" d="M201 0zM1343 0h-194l-799 1227h-8q16 -216 16 -396v-831h-157v1462h192l797 -1222h8q-2 27 -9 173.5t-5 209.5v839h159v-1462zM935 1581q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5q-50 0 -75.5 -30t-39.5 -91h-98q13 121 70.5 189.5t148.5 68.5q46 0 89 -18.5t82 -41 t75 -41t68 -18.5q49 0 73 29.5t39 91.5h99q-13 -121 -69.5 -189.5t-150.5 -68.5z" />
-<glyph unicode="&#xd2;" horiz-adv-x="1595" d="M125 0zM1470 733q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5 t-126.5 -446.5zM907 1579h-110q-65 52 -154 148t-129 159v21h203q32 -69 89 -159.5t101 -143.5v-25z" />
-<glyph unicode="&#xd3;" horiz-adv-x="1595" d="M125 0zM1470 733q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5 t-126.5 -446.5zM659 1604q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#xd4;" horiz-adv-x="1595" d="M125 0zM1470 733q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5 t-126.5 -446.5zM448 1602q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#xd5;" horiz-adv-x="1595" d="M125 0zM1470 733q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5 t-126.5 -446.5zM942 1581q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5q-50 0 -75.5 -30t-39.5 -91h-98q13 121 70.5 189.5t148.5 68.5q46 0 89 -18.5t82 -41t75 -41t68 -18.5q49 0 73 29.5t39 91.5h99q-13 -121 -69.5 -189.5t-150.5 -68.5z" />
-<glyph unicode="&#xd6;" horiz-adv-x="1595" d="M125 0zM1470 733q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5 t-126.5 -446.5zM522 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM903 1731q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#xd7;" horiz-adv-x="1171" d="M940 1176l96 -99l-352 -354l350 -352l-96 -99l-354 351l-348 -351l-101 99l350 352l-352 352l100 101l353 -355z" />
-<glyph unicode="&#xd8;" horiz-adv-x="1595" d="M1470 733q0 -351 -177.5 -552t-493.5 -201q-235 0 -383 100l-101 -141l-120 79l108 154q-178 198 -178 563q0 357 176 553.5t500 196.5q209 0 366 -94l97 135l120 -80l-106 -148q192 -202 192 -565zM1290 733q0 272 -110 426l-672 -948q115 -82 291 -82q243 0 367 153 t124 451zM305 733q0 -262 101 -416l669 943q-106 73 -274 73q-243 0 -369.5 -153.5t-126.5 -446.5z" />
-<glyph unicode="&#xd9;" horiz-adv-x="1491" d="M186 0zM1305 1462v-946q0 -250 -151 -393t-415 -143t-408.5 144t-144.5 396v942h170v-954q0 -183 100 -281t294 -98q185 0 285 98.5t100 282.5v952h170zM856 1579h-110q-65 52 -154 148t-129 159v21h203q32 -69 89 -159.5t101 -143.5v-25z" />
-<glyph unicode="&#xda;" horiz-adv-x="1491" d="M186 0zM1305 1462v-946q0 -250 -151 -393t-415 -143t-408.5 144t-144.5 396v942h170v-954q0 -183 100 -281t294 -98q185 0 285 98.5t100 282.5v952h170zM600 1604q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#xdb;" horiz-adv-x="1491" d="M186 0zM1305 1462v-946q0 -250 -151 -393t-415 -143t-408.5 144t-144.5 396v942h170v-954q0 -183 100 -281t294 -98q185 0 285 98.5t100 282.5v952h170zM393 1602q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186 q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#xdc;" horiz-adv-x="1491" d="M186 0zM1305 1462v-946q0 -250 -151 -393t-415 -143t-408.5 144t-144.5 396v942h170v-954q0 -183 100 -281t294 -98q185 0 285 98.5t100 282.5v952h170zM461 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5 t-26.5 74.5zM842 1731q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#xdd;" horiz-adv-x="1147" d="M0 0zM573 731l390 731h184l-488 -895v-567h-172v559l-487 903h186zM442 1604q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#xde;" horiz-adv-x="1251" d="M1145 784q0 -227 -151.5 -346t-438.5 -119h-184v-319h-170v1462h170v-256h215q281 0 420 -103.5t139 -318.5zM371 465h168q226 0 327 71.5t101 235.5q0 149 -95 218t-297 69h-204v-594z" />
-<glyph unicode="&#xdf;" horiz-adv-x="1274" d="M1049 1266q0 -135 -143 -250q-88 -70 -116 -103.5t-28 -66.5q0 -32 13.5 -53t49 -49.5t113.5 -79.5q140 -95 191 -173.5t51 -179.5q0 -160 -97 -245.5t-276 -85.5q-188 0 -295 69v154q63 -39 141 -62.5t150 -23.5q215 0 215 182q0 75 -41.5 128.5t-151.5 123.5 q-127 82 -175 143.5t-48 145.5q0 63 34.5 116t105.5 106q75 57 107 102t32 98q0 80 -68 122.5t-195 42.5q-276 0 -276 -223v-1204h-166v1202q0 178 110 271.5t332 93.5q206 0 318.5 -78.5t112.5 -222.5z" />
-<glyph unicode="&#xe0;" d="M94 0zM850 0l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123zM475 117q155 0 243.5 85 t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5q0 -90 54.5 -137t152.5 -47zM672 1241h-110q-65 52 -154 148t-129 159v21h203q32 -69 89 -159.5t101 -143.5v-25z" />
-<glyph unicode="&#xe1;" d="M94 0zM850 0l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123zM475 117q155 0 243.5 85 t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5q0 -90 54.5 -137t152.5 -47zM436 1266q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#xe2;" d="M94 0zM850 0l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123zM475 117q155 0 243.5 85 t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5q0 -90 54.5 -137t152.5 -47zM228 1264q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#xe3;" d="M94 0zM850 0l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123zM475 117q155 0 243.5 85 t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5q0 -90 54.5 -137t152.5 -47zM721 1243q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5q-50 0 -75.5 -30t-39.5 -91h-98q13 121 70.5 189.5t148.5 68.5q46 0 89 -18.5t82 -41t75 -41t68 -18.5q49 0 73 29.5t39 91.5h99 q-13 -121 -69.5 -189.5t-150.5 -68.5z" />
-<glyph unicode="&#xe4;" d="M94 0zM850 0l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123zM475 117q155 0 243.5 85 t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5q0 -90 54.5 -137t152.5 -47zM279 1393q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM660 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75 q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#xe5;" d="M94 0zM850 0l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123zM475 117q155 0 243.5 85 t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5q0 -90 54.5 -137t152.5 -47zM804 1458q0 -98 -61.5 -157.5t-163.5 -59.5q-101 0 -161 58.5t-60 156.5t60.5 155.5t160.5 57.5q101 0 163 -59.5t62 -151.5zM696 1456q0 56 -33 86.5t-84 30.5t-84 -30.5t-33 -86.5 t30 -86.5t87 -30.5q52 0 84.5 30.5t32.5 86.5z" />
-<glyph unicode="&#xe6;" horiz-adv-x="1757" d="M94 303q0 161 124 250.5t378 97.5l184 6v68q0 129 -58 190.5t-177 61.5q-144 0 -307 -84l-52 127q74 41 173.5 67.5t197.5 26.5q130 0 212.5 -43.5t123.5 -138.5q53 88 138.5 136t195.5 48q192 0 308 -133.5t116 -355.5v-107h-701q8 -395 322 -395q91 0 169.5 17.5 t162.5 56.5v-148q-86 -38 -160.5 -54.5t-175.5 -16.5q-289 0 -414 233q-81 -127 -179.5 -180t-232.5 -53q-163 0 -255.5 85t-92.5 238zM268 301q0 -95 53.5 -139.5t141.5 -44.5q145 0 229 84.5t84 238.5v99l-158 -7q-186 -8 -268 -62.5t-82 -168.5zM1225 977 q-121 0 -190.5 -83t-80.5 -241h519q0 156 -64 240t-184 84z" />
-<glyph unicode="&#xe7;" horiz-adv-x="975" d="M115 0zM614 -20q-238 0 -368.5 146.5t-130.5 414.5q0 275 132.5 425t377.5 150q79 0 158 -17t124 -40l-51 -141q-55 22 -120 36.5t-115 14.5q-334 0 -334 -426q0 -202 81.5 -310t241.5 -108q137 0 281 59v-147q-110 -57 -277 -57zM762 -289q0 -97 -76.5 -150t-226.5 -53 q-51 0 -96 9v106q45 -8 104 -8q79 0 119.5 20t40.5 74q0 43 -39.5 69.5t-148.5 43.5l88 178h110l-55 -115q180 -39 180 -174z" />
-<glyph unicode="&#xe8;" horiz-adv-x="1149" d="M115 0zM639 -20q-243 0 -383.5 148t-140.5 411q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5zM594 977q-132 0 -210.5 -86t-92.5 -238h573q0 157 -70 240.5 t-200 83.5zM711 1241h-110q-65 52 -154 148t-129 159v21h203q32 -69 89 -159.5t101 -143.5v-25z" />
-<glyph unicode="&#xe9;" horiz-adv-x="1149" d="M115 0zM639 -20q-243 0 -383.5 148t-140.5 411q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5zM594 977q-132 0 -210.5 -86t-92.5 -238h573q0 157 -70 240.5 t-200 83.5zM471 1266q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#xea;" horiz-adv-x="1149" d="M115 0zM639 -20q-243 0 -383.5 148t-140.5 411q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5zM594 977q-132 0 -210.5 -86t-92.5 -238h573q0 157 -70 240.5 t-200 83.5zM259 1264q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#xeb;" horiz-adv-x="1149" d="M115 0zM639 -20q-243 0 -383.5 148t-140.5 411q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5zM594 977q-132 0 -210.5 -86t-92.5 -238h573q0 157 -70 240.5 t-200 83.5zM319 1393q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM700 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#xec;" horiz-adv-x="518" d="M0 0zM342 0h-166v1096h166v-1096zM355 1241h-110q-65 52 -154 148t-129 159v21h203q32 -69 89 -159.5t101 -143.5v-25z" />
-<glyph unicode="&#xed;" horiz-adv-x="518" d="M169 0zM342 0h-166v1096h166v-1096zM169 1266q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#xee;" horiz-adv-x="518" d="M0 0zM342 0h-166v1096h166v-1096zM-77 1264q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#xef;" horiz-adv-x="518" d="M0 0zM342 0h-166v1096h166v-1096zM-20 1393q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM361 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#xf0;" horiz-adv-x="1221" d="M1122 563q0 -281 -130.5 -432t-377.5 -151q-222 0 -361.5 134.5t-139.5 360.5q0 230 131.5 361t351.5 131q226 0 326 -121l8 4q-57 214 -262 405l-271 -155l-73 108l233 133q-92 62 -186 111l69 117q156 -73 258 -148l238 138l76 -107l-207 -119q152 -143 234.5 -342 t82.5 -428zM954 512q0 147 -90 232t-246 85q-337 0 -337 -360q0 -167 87.5 -258.5t249.5 -91.5q175 0 255.5 100.5t80.5 292.5z" />
-<glyph unicode="&#xf1;" horiz-adv-x="1257" d="M176 0zM926 0v709q0 134 -61 200t-191 66q-172 0 -252 -93t-80 -307v-575h-166v1096h135l27 -150h8q51 81 143 125.5t205 44.5q198 0 298 -95.5t100 -305.5v-715h-166zM802 1243q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5q-50 0 -75.5 -30t-39.5 -91h-98 q13 121 70.5 189.5t148.5 68.5q46 0 89 -18.5t82 -41t75 -41t68 -18.5q49 0 73 29.5t39 91.5h99q-13 -121 -69.5 -189.5t-150.5 -68.5z" />
-<glyph unicode="&#xf2;" horiz-adv-x="1237" d="M115 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414zM287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319z M742 1241h-110q-65 52 -154 148t-129 159v21h203q32 -69 89 -159.5t101 -143.5v-25z" />
-<glyph unicode="&#xf3;" horiz-adv-x="1237" d="M115 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414zM287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319z M479 1266q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#xf4;" horiz-adv-x="1237" d="M115 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414zM287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319z M282 1264q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#xf5;" horiz-adv-x="1237" d="M115 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414zM287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319z M773 1243q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5q-50 0 -75.5 -30t-39.5 -91h-98q13 121 70.5 189.5t148.5 68.5q46 0 89 -18.5t82 -41t75 -41t68 -18.5q49 0 73 29.5t39 91.5h99q-13 -121 -69.5 -189.5t-150.5 -68.5z" />
-<glyph unicode="&#xf6;" horiz-adv-x="1237" d="M115 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414zM287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319z M336 1393q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM717 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#xf7;" horiz-adv-x="1171" d="M104 653v138h961v-138h-961zM471 373q0 60 29.5 90.5t83.5 30.5q52 0 81 -31.5t29 -89.5q0 -57 -29.5 -89t-80.5 -32q-52 0 -82.5 31.5t-30.5 89.5zM471 1071q0 60 29.5 90.5t83.5 30.5q52 0 81 -31.5t29 -89.5q0 -57 -29.5 -89t-80.5 -32q-52 0 -82.5 31.5t-30.5 89.5z " />
-<glyph unicode="&#xf8;" horiz-adv-x="1237" d="M1122 549q0 -268 -135 -418.5t-373 -150.5q-154 0 -266 69l-84 -117l-114 78l94 131q-129 152 -129 408q0 268 134 417.5t372 149.5q154 0 270 -76l84 119l117 -76l-97 -133q127 -152 127 -401zM287 549q0 -171 53 -273l465 646q-75 53 -189 53q-163 0 -246 -107 t-83 -319zM950 549q0 164 -51 264l-465 -643q71 -51 184 -51q163 0 247.5 109.5t84.5 320.5z" />
-<glyph unicode="&#xf9;" horiz-adv-x="1257" d="M164 0zM332 1096v-711q0 -134 61 -200t191 -66q172 0 251.5 94t79.5 307v576h166v-1096h-137l-24 147h-9q-51 -81 -141.5 -124t-206.5 -43q-200 0 -299.5 95t-99.5 304v717h168zM726 1241h-110q-65 52 -154 148t-129 159v21h203q32 -69 89 -159.5t101 -143.5v-25z" />
-<glyph unicode="&#xfa;" horiz-adv-x="1257" d="M164 0zM332 1096v-711q0 -134 61 -200t191 -66q172 0 251.5 94t79.5 307v576h166v-1096h-137l-24 147h-9q-51 -81 -141.5 -124t-206.5 -43q-200 0 -299.5 95t-99.5 304v717h168zM506 1266q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#xfb;" horiz-adv-x="1257" d="M164 0zM332 1096v-711q0 -134 61 -200t191 -66q172 0 251.5 94t79.5 307v576h166v-1096h-137l-24 147h-9q-51 -81 -141.5 -124t-206.5 -43q-200 0 -299.5 95t-99.5 304v717h168zM286 1264q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119 q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#xfc;" horiz-adv-x="1257" d="M164 0zM332 1096v-711q0 -134 61 -200t191 -66q172 0 251.5 94t79.5 307v576h166v-1096h-137l-24 147h-9q-51 -81 -141.5 -124t-206.5 -43q-200 0 -299.5 95t-99.5 304v717h168zM342 1393q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5 q-37 0 -63.5 24.5t-26.5 74.5zM723 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#xfd;" horiz-adv-x="1032" d="M2 0zM2 1096h178l240 -625q79 -214 98 -309h8q13 51 54.5 174.5t271.5 759.5h178l-471 -1248q-70 -185 -163.5 -262.5t-229.5 -77.5q-76 0 -150 17v133q55 -12 123 -12q171 0 244 192l61 156zM411 1266q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147 h-111v25z" />
-<glyph unicode="&#xfe;" horiz-adv-x="1255" d="M344 948q66 89 151 128.5t191 39.5q215 0 335 -150t120 -417q0 -268 -120.5 -418.5t-334.5 -150.5q-222 0 -344 161h-12l4 -34q8 -77 8 -140v-459h-166v2048h166v-466q0 -52 -6 -142h8zM664 975q-168 0 -244 -92t-78 -293v-41q0 -231 77 -330.5t247 -99.5q303 0 303 432 q0 215 -74 319.5t-231 104.5z" />
-<glyph unicode="&#xff;" horiz-adv-x="1032" d="M2 0zM2 1096h178l240 -625q79 -214 98 -309h8q13 51 54.5 174.5t271.5 759.5h178l-471 -1248q-70 -185 -163.5 -262.5t-229.5 -77.5q-76 0 -150 17v133q55 -12 123 -12q171 0 244 192l61 156zM234 1393q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5 t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM615 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x100;" horiz-adv-x="1296" d="M0 0zM1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473zM364 1716h600v-137h-600v137z" />
-<glyph unicode="&#x101;" d="M94 0zM850 0l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123zM475 117q155 0 243.5 85 t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5q0 -90 54.5 -137t152.5 -47zM290 1378h600v-137h-600v137z" />
-<glyph unicode="&#x102;" horiz-adv-x="1296" d="M0 0zM1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473zM641 1579q-140 0 -218 68.5t-87 199.5h104q6 -49 26.5 -77t57 -41t121.5 -13q101 0 149 32t58 99h104q-10 -126 -93.5 -197 t-221.5 -71z" />
-<glyph unicode="&#x103;" d="M94 0zM850 0l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123zM475 117q155 0 243.5 85 t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5q0 -90 54.5 -137t152.5 -47zM570 1241q-140 0 -218 68.5t-87 199.5h104q6 -49 26.5 -77t57 -41t121.5 -13q101 0 149 32t58 99h104q-10 -126 -93.5 -197t-221.5 -71z" />
-<glyph unicode="&#x104;" horiz-adv-x="1296" d="M0 0zM1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473zM1106 -238q0 -94 94 -94q42 0 97 13v-109q-65 -18 -125 -18q-207 0 -207 188q0 70 43 137.5t115 120.5h120 q-68 -66 -102.5 -120.5t-34.5 -117.5z" />
-<glyph unicode="&#x105;" d="M94 0zM850 0l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123zM475 117q155 0 243.5 85 t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5q0 -90 54.5 -137t152.5 -47zM833 -238q0 -94 94 -94q42 0 97 13v-109q-65 -18 -125 -18q-207 0 -207 188q0 70 43 137.5t115 120.5h120q-68 -66 -102.5 -120.5t-34.5 -117.5z" />
-<glyph unicode="&#x106;" horiz-adv-x="1292" d="M125 0zM827 1331q-241 0 -380.5 -160.5t-139.5 -439.5q0 -287 134.5 -443.5t383.5 -156.5q153 0 349 55v-149q-152 -57 -375 -57q-323 0 -498.5 196t-175.5 557q0 226 84.5 396t244 262t375.5 92q230 0 402 -84l-72 -146q-166 78 -332 78zM657 1604q48 62 103.5 150 t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x107;" horiz-adv-x="975" d="M115 0zM614 -20q-238 0 -368.5 146.5t-130.5 414.5q0 275 132.5 425t377.5 150q79 0 158 -17t124 -40l-51 -141q-55 22 -120 36.5t-115 14.5q-334 0 -334 -426q0 -202 81.5 -310t241.5 -108q137 0 281 59v-147q-110 -57 -277 -57zM461 1266q48 62 103.5 150t87.5 153h202 v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x108;" horiz-adv-x="1292" d="M125 0zM827 1331q-241 0 -380.5 -160.5t-139.5 -439.5q0 -287 134.5 -443.5t383.5 -156.5q153 0 349 55v-149q-152 -57 -375 -57q-323 0 -498.5 196t-175.5 557q0 226 84.5 396t244 262t375.5 92q230 0 402 -84l-72 -146q-166 78 -332 78zM440 1602q127 136 178 200 t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#x109;" horiz-adv-x="975" d="M115 0zM614 -20q-238 0 -368.5 146.5t-130.5 414.5q0 275 132.5 425t377.5 150q79 0 158 -17t124 -40l-51 -141q-55 22 -120 36.5t-115 14.5q-334 0 -334 -426q0 -202 81.5 -310t241.5 -108q137 0 281 59v-147q-110 -57 -277 -57zM224 1264q127 136 178 200t74 105h166 q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#x10a;" horiz-adv-x="1292" d="M125 0zM827 1331q-241 0 -380.5 -160.5t-139.5 -439.5q0 -287 134.5 -443.5t383.5 -156.5q153 0 349 55v-149q-152 -57 -375 -57q-323 0 -498.5 196t-175.5 557q0 226 84.5 396t244 262t375.5 92q230 0 402 -84l-72 -146q-166 78 -332 78zM701 1731q0 57 28 83.5t70 26.5 q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5z" />
-<glyph unicode="&#x10b;" horiz-adv-x="975" d="M115 0zM614 -20q-238 0 -368.5 146.5t-130.5 414.5q0 275 132.5 425t377.5 150q79 0 158 -17t124 -40l-51 -141q-55 22 -120 36.5t-115 14.5q-334 0 -334 -426q0 -202 81.5 -310t241.5 -108q137 0 281 59v-147q-110 -57 -277 -57zM498 1393q0 57 28 83.5t70 26.5 q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5z" />
-<glyph unicode="&#x10c;" horiz-adv-x="1292" d="M125 0zM827 1331q-241 0 -380.5 -160.5t-139.5 -439.5q0 -287 134.5 -443.5t383.5 -156.5q153 0 349 55v-149q-152 -57 -375 -57q-323 0 -498.5 196t-175.5 557q0 226 84.5 396t244 262t375.5 92q230 0 402 -84l-72 -146q-166 78 -332 78zM461 1907h115q114 -74 219 -189 q130 130 221 189h119v-25l-66 -68q-144 -148 -190 -235h-166q-23 41 -74 104t-178 199v25z" />
-<glyph unicode="&#x10d;" horiz-adv-x="975" d="M115 0zM614 -20q-238 0 -368.5 146.5t-130.5 414.5q0 275 132.5 425t377.5 150q79 0 158 -17t124 -40l-51 -141q-55 22 -120 36.5t-115 14.5q-334 0 -334 -426q0 -202 81.5 -310t241.5 -108q137 0 281 59v-147q-110 -57 -277 -57zM255 1569h115q114 -74 219 -189 q130 130 221 189h119v-25l-66 -68q-144 -148 -190 -235h-166q-23 41 -74 104t-178 199v25z" />
-<glyph unicode="&#x10e;" horiz-adv-x="1493" d="M201 0zM1368 745q0 -362 -196.5 -553.5t-565.5 -191.5h-405v1462h448q341 0 530 -189t189 -528zM1188 739q0 286 -143.5 431t-426.5 145h-247v-1168h207q304 0 457 149.5t153 442.5zM356 1907h115q114 -74 219 -189q130 130 221 189h119v-25l-66 -68q-144 -148 -190 -235 h-166q-23 41 -74 104t-178 199v25z" />
-<glyph unicode="&#x10f;" horiz-adv-x="1255" d="M115 0zM922 147h-9q-115 -167 -344 -167q-215 0 -334.5 147t-119.5 418t120 421t334 150q223 0 342 -162h13l-7 79l-4 77v446h166v-1556h-135zM590 119q170 0 246.5 92.5t76.5 298.5v35q0 233 -77.5 332.5t-247.5 99.5q-146 0 -223.5 -113.5t-77.5 -320.5q0 -210 77 -317 t226 -107zM1173 1253q19 55 38.5 138.5t29.5 164.5h168v-18q-11 -51 -55 -145t-91 -164h-90v24z" />
-<glyph unicode="&#x110;" horiz-adv-x="1479" d="M47 0zM1352 745q0 -362 -196.5 -553.5t-565.5 -191.5h-389v649h-154v150h154v663h434q337 0 527 -187.5t190 -529.5zM1171 739q0 576 -569 576h-231v-516h379v-150h-379v-502h190q610 0 610 592z" />
-<glyph unicode="&#x111;" horiz-adv-x="1255" d="M922 147h-9q-115 -167 -344 -167q-215 0 -334.5 147t-119.5 418t120 421t334 150q223 0 342 -162h13q-11 83 -11 156v133h-448v129h448v184h166v-184h156v-129h-156v-1243h-135zM590 119q170 0 246.5 92.5t76.5 298.5v35q0 233 -77.5 332.5t-247.5 99.5 q-146 0 -223.5 -113.5t-77.5 -320.5q0 -210 77 -317t226 -107z" />
-<glyph unicode="&#x112;" d="M201 0zM1016 0h-815v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152zM319 1716h600v-137h-600v137z" />
-<glyph unicode="&#x113;" horiz-adv-x="1149" d="M115 0zM639 -20q-243 0 -383.5 148t-140.5 411q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5zM594 977q-132 0 -210.5 -86t-92.5 -238h573q0 157 -70 240.5 t-200 83.5zM311 1378h600v-137h-600v137z" />
-<glyph unicode="&#x114;" d="M201 0zM1016 0h-815v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152zM614 1579q-140 0 -218 68.5t-87 199.5h104q6 -49 26.5 -77t57 -41t121.5 -13q101 0 149 32t58 99h104q-10 -126 -93.5 -197t-221.5 -71z" />
-<glyph unicode="&#x115;" horiz-adv-x="1149" d="M115 0zM639 -20q-243 0 -383.5 148t-140.5 411q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5zM594 977q-132 0 -210.5 -86t-92.5 -238h573q0 157 -70 240.5 t-200 83.5zM593 1241q-140 0 -218 68.5t-87 199.5h104q6 -49 26.5 -77t57 -41t121.5 -13q101 0 149 32t58 99h104q-10 -126 -93.5 -197t-221.5 -71z" />
-<glyph unicode="&#x116;" d="M201 0zM1016 0h-815v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152zM529 1702q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5z" />
-<glyph unicode="&#x117;" horiz-adv-x="1149" d="M115 0zM639 -20q-243 0 -383.5 148t-140.5 411q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5zM594 977q-132 0 -210.5 -86t-92.5 -238h573q0 157 -70 240.5 t-200 83.5zM502 1393q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5z" />
-<glyph unicode="&#x118;" d="M201 0zM1016 0h-815v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152zM805 -238q0 -94 94 -94q42 0 97 13v-109q-65 -18 -125 -18q-207 0 -207 188q0 70 43 137.5t115 120.5h120q-68 -66 -102.5 -120.5t-34.5 -117.5z" />
-<glyph unicode="&#x119;" horiz-adv-x="1149" d="M115 0zM639 -20q-243 0 -383.5 148t-140.5 411q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5zM594 977q-132 0 -210.5 -86t-92.5 -238h573q0 157 -70 240.5 t-200 83.5zM792 -207q0 -94 94 -94q42 0 97 13v-109q-65 -18 -125 -18q-207 0 -207 188q0 70 43 137.5t115 120.5h120q-68 -66 -102.5 -120.5t-34.5 -117.5z" />
-<glyph unicode="&#x11a;" d="M201 0zM1016 0h-815v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152zM284 1907h115q114 -74 219 -189q130 130 221 189h119v-25l-66 -68q-144 -148 -190 -235h-166q-23 41 -74 104t-178 199v25z" />
-<glyph unicode="&#x11b;" horiz-adv-x="1149" d="M115 0zM639 -20q-243 0 -383.5 148t-140.5 411q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5zM594 977q-132 0 -210.5 -86t-92.5 -238h573q0 157 -70 240.5 t-200 83.5zM263 1569h115q114 -74 219 -189q130 130 221 189h119v-25l-66 -68q-144 -148 -190 -235h-166q-23 41 -74 104t-178 199v25z" />
-<glyph unicode="&#x11c;" horiz-adv-x="1491" d="M125 0zM844 766h497v-711q-116 -37 -236 -56t-278 -19q-332 0 -517 197.5t-185 553.5q0 228 91.5 399.5t263.5 262t403 90.5q234 0 436 -86l-66 -150q-198 84 -381 84q-267 0 -417 -159t-150 -441q0 -296 144.5 -449t424.5 -153q152 0 297 35v450h-327v152zM501 1602 q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#x11d;" horiz-adv-x="1122" d="M39 0zM1073 1096v-105l-203 -24q28 -35 50 -91.5t22 -127.5q0 -161 -110 -257t-302 -96q-49 0 -92 8q-106 -56 -106 -141q0 -45 37 -66.5t127 -21.5h194q178 0 273.5 -75t95.5 -218q0 -182 -146 -277.5t-426 -95.5q-215 0 -331.5 80t-116.5 226q0 100 64 173t180 99 q-42 19 -70.5 59t-28.5 93q0 60 32 105t101 87q-85 35 -138.5 119t-53.5 192q0 180 108 277.5t306 97.5q86 0 155 -20h379zM199 -184q0 -89 75 -135t215 -46q209 0 309.5 62.5t100.5 169.5q0 89 -55 123.5t-207 34.5h-199q-113 0 -176 -54t-63 -155zM289 745q0 -115 65 -174 t181 -59q243 0 243 236q0 247 -246 247q-117 0 -180 -63t-63 -187zM214 1264q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#x11e;" horiz-adv-x="1491" d="M125 0zM844 766h497v-711q-116 -37 -236 -56t-278 -19q-332 0 -517 197.5t-185 553.5q0 228 91.5 399.5t263.5 262t403 90.5q234 0 436 -86l-66 -150q-198 84 -381 84q-267 0 -417 -159t-150 -441q0 -296 144.5 -449t424.5 -153q152 0 297 35v450h-327v152zM854 1579 q-140 0 -218 68.5t-87 199.5h104q6 -49 26.5 -77t57 -41t121.5 -13q101 0 149 32t58 99h104q-10 -126 -93.5 -197t-221.5 -71z" />
-<glyph unicode="&#x11f;" horiz-adv-x="1122" d="M39 0zM1073 1096v-105l-203 -24q28 -35 50 -91.5t22 -127.5q0 -161 -110 -257t-302 -96q-49 0 -92 8q-106 -56 -106 -141q0 -45 37 -66.5t127 -21.5h194q178 0 273.5 -75t95.5 -218q0 -182 -146 -277.5t-426 -95.5q-215 0 -331.5 80t-116.5 226q0 100 64 173t180 99 q-42 19 -70.5 59t-28.5 93q0 60 32 105t101 87q-85 35 -138.5 119t-53.5 192q0 180 108 277.5t306 97.5q86 0 155 -20h379zM199 -184q0 -89 75 -135t215 -46q209 0 309.5 62.5t100.5 169.5q0 89 -55 123.5t-207 34.5h-199q-113 0 -176 -54t-63 -155zM289 745q0 -115 65 -174 t181 -59q243 0 243 236q0 247 -246 247q-117 0 -180 -63t-63 -187zM548 1241q-140 0 -218 68.5t-87 199.5h104q6 -49 26.5 -77t57 -41t121.5 -13q101 0 149 32t58 99h104q-10 -126 -93.5 -197t-221.5 -71z" />
-<glyph unicode="&#x120;" horiz-adv-x="1491" d="M125 0zM844 766h497v-711q-116 -37 -236 -56t-278 -19q-332 0 -517 197.5t-185 553.5q0 228 91.5 399.5t263.5 262t403 90.5q234 0 436 -86l-66 -150q-198 84 -381 84q-267 0 -417 -159t-150 -441q0 -296 144.5 -449t424.5 -153q152 0 297 35v450h-327v152zM774 1731 q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5z" />
-<glyph unicode="&#x121;" horiz-adv-x="1122" d="M39 0zM1073 1096v-105l-203 -24q28 -35 50 -91.5t22 -127.5q0 -161 -110 -257t-302 -96q-49 0 -92 8q-106 -56 -106 -141q0 -45 37 -66.5t127 -21.5h194q178 0 273.5 -75t95.5 -218q0 -182 -146 -277.5t-426 -95.5q-215 0 -331.5 80t-116.5 226q0 100 64 173t180 99 q-42 19 -70.5 59t-28.5 93q0 60 32 105t101 87q-85 35 -138.5 119t-53.5 192q0 180 108 277.5t306 97.5q86 0 155 -20h379zM199 -184q0 -89 75 -135t215 -46q209 0 309.5 62.5t100.5 169.5q0 89 -55 123.5t-207 34.5h-199q-113 0 -176 -54t-63 -155zM289 745q0 -115 65 -174 t181 -59q243 0 243 236q0 247 -246 247q-117 0 -180 -63t-63 -187zM449 1393q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5z" />
-<glyph unicode="&#x122;" horiz-adv-x="1491" d="M125 0zM844 766h497v-711q-116 -37 -236 -56t-278 -19q-332 0 -517 197.5t-185 553.5q0 228 91.5 399.5t263.5 262t403 90.5q234 0 436 -86l-66 -150q-198 84 -381 84q-267 0 -417 -159t-150 -441q0 -296 144.5 -449t424.5 -153q152 0 297 35v450h-327v152zM664 -428 q28 64 53.5 157t32.5 146h168v-18q-11 -51 -60 -147.5t-104 -162.5h-90v25z" />
-<glyph unicode="&#x123;" horiz-adv-x="1122" d="M39 0zM1073 1096v-105l-203 -24q28 -35 50 -91.5t22 -127.5q0 -161 -110 -257t-302 -96q-49 0 -92 8q-106 -56 -106 -141q0 -45 37 -66.5t127 -21.5h194q178 0 273.5 -75t95.5 -218q0 -182 -146 -277.5t-426 -95.5q-215 0 -331.5 80t-116.5 226q0 100 64 173t180 99 q-42 19 -70.5 59t-28.5 93q0 60 32 105t101 87q-85 35 -138.5 119t-53.5 192q0 180 108 277.5t306 97.5q86 0 155 -20h379zM199 -184q0 -89 75 -135t215 -46q209 0 309.5 62.5t100.5 169.5q0 89 -55 123.5t-207 34.5h-199q-113 0 -176 -54t-63 -155zM289 745q0 -115 65 -174 t181 -59q243 0 243 236q0 247 -246 247q-117 0 -180 -63t-63 -187zM707 1544q-29 -61 -55.5 -157.5t-32.5 -145.5h-166v19q14 61 63.5 156.5t98.5 152.5h92v-25z" />
-<glyph unicode="&#x124;" horiz-adv-x="1511" d="M201 0zM1311 0h-170v688h-770v-688h-170v1462h170v-622h770v622h170v-1462zM418 1602q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#x125;" horiz-adv-x="1257" d="M176 0zM926 0v709q0 134 -61 200t-191 66q-173 0 -252.5 -94t-79.5 -308v-573h-166v1556h166v-471q0 -85 -8 -141h10q49 79 139.5 124.5t206.5 45.5q201 0 301.5 -95.5t100.5 -303.5v-715h-166zM299 1657q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5 v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#x126;" horiz-adv-x="1511" d="M201 1214v248h170v-248h770v248h170v-248h200v-141h-200v-1073h-170v688h-770v-688h-170v1073h-201v141h201zM1141 840v233h-770v-233h770z" />
-<glyph unicode="&#x127;" horiz-adv-x="1257" d="M926 0v670q0 134 -61 200t-191 66q-174 0 -253 -93t-79 -306v-537h-166v1243h-156v127h156v186h166v-186h449v-127h-449v-196q0 -84 -8 -140h10q49 79 139.5 124.5t206.5 45.5q201 0 301.5 -95.5t100.5 -305.5v-676h-166z" />
-<glyph unicode="&#x128;" horiz-adv-x="571" d="M0 0zM201 0v1462h170v-1462h-170zM439 1581q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5q-50 0 -75.5 -30t-39.5 -91h-98q13 121 70.5 189.5t148.5 68.5q46 0 89 -18.5t82 -41t75 -41t68 -18.5q49 0 73 29.5t39 91.5h99q-13 -121 -69.5 -189.5t-150.5 -68.5z" />
-<glyph unicode="&#x129;" horiz-adv-x="518" d="M0 0zM342 0h-166v1096h166v-1096zM412 1243q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5q-50 0 -75.5 -30t-39.5 -91h-98q13 121 70.5 189.5t148.5 68.5q46 0 89 -18.5t82 -41t75 -41t68 -18.5q49 0 73 29.5t39 91.5h99q-13 -121 -69.5 -189.5t-150.5 -68.5z" />
-<glyph unicode="&#x12a;" horiz-adv-x="571" d="M0 0zM201 0v1462h170v-1462h-170zM-13 1716h600v-137h-600v137z" />
-<glyph unicode="&#x12b;" horiz-adv-x="518" d="M0 0zM342 0h-166v1096h166v-1096zM-38 1378h600v-137h-600v137z" />
-<glyph unicode="&#x12c;" horiz-adv-x="571" d="M0 0zM201 0v1462h170v-1462h-170zM280 1579q-140 0 -218 68.5t-87 199.5h104q6 -49 26.5 -77t57 -41t121.5 -13q101 0 149 32t58 99h104q-10 -126 -93.5 -197t-221.5 -71z" />
-<glyph unicode="&#x12d;" horiz-adv-x="518" d="M0 0zM342 0h-166v1096h166v-1096zM253 1241q-140 0 -218 68.5t-87 199.5h104q6 -49 26.5 -77t57 -41t121.5 -13q101 0 149 32t58 99h104q-10 -126 -93.5 -197t-221.5 -71z" />
-<glyph unicode="&#x12e;" horiz-adv-x="571" d="M86 0zM201 0v1462h170v-1462h-170zM227 -238q0 -94 94 -94q42 0 97 13v-109q-65 -18 -125 -18q-207 0 -207 188q0 70 43 137.5t115 120.5h120q-68 -66 -102.5 -120.5t-34.5 -117.5z" />
-<glyph unicode="&#x12f;" horiz-adv-x="518" d="M53 0zM342 0h-166v1096h166v-1096zM162 1393q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5zM194 -238q0 -94 94 -94q42 0 97 13v-109q-65 -18 -125 -18q-207 0 -207 188q0 70 43 137.5t115 120.5h120q-68 -66 -102.5 -120.5 t-34.5 -117.5z" />
-<glyph unicode="&#x130;" horiz-adv-x="571" d="M187 0zM201 0v1462h170v-1462h-170zM187 1731q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5z" />
-<glyph unicode="&#x131;" horiz-adv-x="518" d="M342 0h-166v1096h166v-1096z" />
-<glyph unicode="&#x132;" horiz-adv-x="1118" d="M201 0zM201 0v1462h170v-1462h-170zM559 -385q-94 0 -148 27v145q71 -20 148 -20q99 0 150.5 60t51.5 173v1462h170v-1448q0 -190 -96 -294.5t-276 -104.5z" />
-<glyph unicode="&#x133;" horiz-adv-x="1036" d="M162 0zM342 0h-166v1096h166v-1096zM162 1393q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5zM561 -492q-95 0 -154 25v135q69 -20 136 -20q78 0 114.5 42.5t36.5 129.5v1276h166v-1264q0 -324 -299 -324zM680 1393 q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5z" />
-<glyph unicode="&#x134;" horiz-adv-x="547" d="M0 0zM-12 -385q-94 0 -148 27v145q71 -20 148 -20q99 0 150.5 60t51.5 173v1462h170v-1448q0 -190 -96 -294.5t-276 -104.5zM-61 1602q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#x135;" horiz-adv-x="518" d="M0 0zM43 -492q-95 0 -154 25v135q69 -20 136 -20q78 0 114.5 42.5t36.5 129.5v1276h166v-1264q0 -324 -299 -324zM-83 1264q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#x136;" horiz-adv-x="1257" d="M201 0zM1257 0h-200l-533 709l-153 -136v-573h-170v1462h170v-725l663 725h201l-588 -635zM506 -428q28 64 53.5 157t32.5 146h168v-18q-11 -51 -60 -147.5t-104 -162.5h-90v25z" />
-<glyph unicode="&#x137;" horiz-adv-x="1075" d="M176 0zM340 561q43 61 131 160l354 375h197l-444 -467l475 -629h-201l-387 518l-125 -108v-410h-164v1556h164v-825q0 -55 -8 -170h8zM412 -428q28 64 53.5 157t32.5 146h168v-18q-11 -51 -60 -147.5t-104 -162.5h-90v25z" />
-<glyph unicode="&#x138;" horiz-adv-x="1061" d="M815 1094h207l-414 -482l443 -612h-201l-361 504l-135 -113v-391h-178v1094h178v-283q0 -166 -12 -279z" />
-<glyph unicode="&#x139;" horiz-adv-x="1063" d="M201 0zM201 0v1462h170v-1308h645v-154h-815zM236 1604q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x13a;" horiz-adv-x="518" d="M163 0zM342 0h-166v1556h166v-1556zM163 1661q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x13b;" horiz-adv-x="1063" d="M201 0zM201 0v1462h170v-1308h645v-154h-815zM418 -428q28 64 53.5 157t32.5 146h168v-18q-11 -51 -60 -147.5t-104 -162.5h-90v25z" />
-<glyph unicode="&#x13c;" horiz-adv-x="518" d="M89 0zM342 0h-166v1556h166v-1556zM89 -428q28 64 53.5 157t32.5 146h168v-18q-11 -51 -60 -147.5t-104 -162.5h-90v25z" />
-<glyph unicode="&#x13d;" horiz-adv-x="1063" d="M201 0zM201 0v1462h170v-1308h645v-154h-815zM678 1160q19 55 38.5 138.5t29.5 164.5h168v-18q-11 -51 -55 -145t-91 -164h-90v24z" />
-<glyph unicode="&#x13e;" horiz-adv-x="518" d="M176 0zM342 0h-166v1556h166v-1556zM436 1253q19 55 38.5 138.5t29.5 164.5h168v-18q-11 -51 -55 -145t-91 -164h-90v24z" />
-<glyph unicode="&#x13f;" horiz-adv-x="1063" d="M201 0zM201 0v1462h170v-1308h645v-154h-815zM678 728q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5z" />
-<glyph unicode="&#x140;" horiz-adv-x="643" d="M176 0zM342 0h-166v1556h166v-1556zM484 681q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5z" />
-<glyph unicode="&#x141;" horiz-adv-x="1071" d="M201 0v508l-105 -59l-67 114l172 101v798h170v-698l297 174l67 -121l-364 -211v-452h645v-154h-815z" />
-<glyph unicode="&#x142;" horiz-adv-x="535" d="M342 864l137 94l72 -112l-209 -141v-705h-166v596l-110 -72l-70 113l180 119v800h166v-692z" />
-<glyph unicode="&#x143;" horiz-adv-x="1544" d="M201 0zM1343 0h-194l-799 1227h-8q16 -216 16 -396v-831h-157v1462h192l797 -1222h8q-2 27 -9 173.5t-5 209.5v839h159v-1462zM651 1604q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x144;" horiz-adv-x="1257" d="M176 0zM926 0v709q0 134 -61 200t-191 66q-172 0 -252 -93t-80 -307v-575h-166v1096h135l27 -150h8q51 81 143 125.5t205 44.5q198 0 298 -95.5t100 -305.5v-715h-166zM514 1266q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x145;" horiz-adv-x="1544" d="M201 0zM1343 0h-194l-799 1227h-8q16 -216 16 -396v-831h-157v1462h192l797 -1222h8q-2 27 -9 173.5t-5 209.5v839h159v-1462zM574 -428q28 64 53.5 157t32.5 146h168v-18q-11 -51 -60 -147.5t-104 -162.5h-90v25z" />
-<glyph unicode="&#x146;" horiz-adv-x="1257" d="M176 0zM926 0v709q0 134 -61 200t-191 66q-172 0 -252 -93t-80 -307v-575h-166v1096h135l27 -150h8q51 81 143 125.5t205 44.5q198 0 298 -95.5t100 -305.5v-715h-166zM455 -428q28 64 53.5 157t32.5 146h168v-18q-11 -51 -60 -147.5t-104 -162.5h-90v25z" />
-<glyph unicode="&#x147;" horiz-adv-x="1544" d="M201 0zM1343 0h-194l-799 1227h-8q16 -216 16 -396v-831h-157v1462h192l797 -1222h8q-2 27 -9 173.5t-5 209.5v839h159v-1462zM434 1907h115q114 -74 219 -189q130 130 221 189h119v-25l-66 -68q-144 -148 -190 -235h-166q-23 41 -74 104t-178 199v25z" />
-<glyph unicode="&#x148;" horiz-adv-x="1257" d="M176 0zM926 0v709q0 134 -61 200t-191 66q-172 0 -252 -93t-80 -307v-575h-166v1096h135l27 -150h8q51 81 143 125.5t205 44.5q198 0 298 -95.5t100 -305.5v-715h-166zM299 1569h115q114 -74 219 -189q130 130 221 189h119v-25l-66 -68q-144 -148 -190 -235h-166 q-23 41 -74 104t-178 199v25z" />
-<glyph unicode="&#x149;" horiz-adv-x="1395" d="M1 0zM1061 0v709q0 134 -61 200t-191 66q-172 0 -252 -93t-80 -307v-575h-166v1096h135l27 -150h8q51 81 143 125.5t205 44.5q198 0 298 -95.5t100 -305.5v-715h-166zM285 1462l15 -22q-26 -100 -75 -232.5t-102 -246.5h-122q70 285 102 501h182z" />
-<glyph unicode="&#x14a;" horiz-adv-x="1544" d="M969 -385q-98 0 -152 27v145q71 -20 154 -20q105 0 158 61t53 172l-832 1227h-8q16 -264 16 -422v-805h-157v1462h192l797 -1202h8q-14 149 -14 373v829h159v-1448q0 -195 -96.5 -297t-277.5 -102z" />
-<glyph unicode="&#x14b;" horiz-adv-x="1257" d="M805 -492q-86 0 -141 25v135q60 -20 122 -20q140 0 140 172v889q0 134 -61 200t-191 66q-172 0 -252 -93t-80 -307v-575h-166v1096h135l27 -150h10q52 82 142 126t200 44q203 0 302.5 -95.5t99.5 -305.5v-883q0 -154 -70 -239t-217 -85z" />
-<glyph unicode="&#x14c;" horiz-adv-x="1595" d="M125 0zM1470 733q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5 t-126.5 -446.5zM500 1716h600v-137h-600v137z" />
-<glyph unicode="&#x14d;" horiz-adv-x="1237" d="M115 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414zM287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319z M319 1378h600v-137h-600v137z" />
-<glyph unicode="&#x14e;" horiz-adv-x="1595" d="M125 0zM1470 733q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5 t-126.5 -446.5zM791 1579q-140 0 -218 68.5t-87 199.5h104q6 -49 26.5 -77t57 -41t121.5 -13q101 0 149 32t58 99h104q-10 -126 -93.5 -197t-221.5 -71z" />
-<glyph unicode="&#x14f;" horiz-adv-x="1237" d="M115 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414zM287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319z M612 1241q-140 0 -218 68.5t-87 199.5h104q6 -49 26.5 -77t57 -41t121.5 -13q101 0 149 32t58 99h104q-10 -126 -93.5 -197t-221.5 -71z" />
-<glyph unicode="&#x150;" horiz-adv-x="1595" d="M125 0zM1470 733q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5 t-126.5 -446.5zM507 1604q36 48 91 141t86 162h186v-21q-37 -63 -122.5 -161t-143.5 -146h-97v25zM864 1604q49 68 99.5 156.5t76.5 146.5h186v-21q-37 -63 -122.5 -161t-143.5 -146h-96v25z" />
-<glyph unicode="&#x151;" horiz-adv-x="1237" d="M115 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414zM287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319z M321 1266q36 48 91 141t86 162h186v-21q-37 -63 -122.5 -161t-143.5 -146h-97v25zM678 1266q49 68 99.5 156.5t76.5 146.5h186v-21q-37 -63 -122.5 -161t-143.5 -146h-96v25z" />
-<glyph unicode="&#x152;" horiz-adv-x="1890" d="M1767 0h-768q-102 -20 -194 -20q-327 0 -503.5 196.5t-176.5 558.5q0 360 174 555t494 195q102 0 192 -23h782v-151h-589v-471h551v-150h-551v-538h589v-152zM811 1333q-249 0 -377.5 -152.5t-128.5 -447.5q0 -297 128.5 -450.5t375.5 -153.5q112 0 199 33v1141 q-87 30 -197 30z" />
-<glyph unicode="&#x153;" horiz-adv-x="1929" d="M1430 -20q-293 0 -418 235q-62 -116 -166.5 -175.5t-241.5 -59.5q-223 0 -357 152.5t-134 416.5q0 265 131 415t366 150q131 0 233.5 -59.5t164.5 -173.5q58 112 154 172.5t222 60.5q201 0 320 -132.5t119 -358.5v-105h-729q8 -393 338 -393q94 0 174.5 17.5t167.5 56.5 v-148q-88 -39 -164 -55t-180 -16zM287 549q0 -211 76 -320.5t243 -109.5q163 0 239.5 106.5t76.5 315.5q0 221 -77.5 327.5t-242.5 106.5q-166 0 -240.5 -108t-74.5 -318zM1382 975q-127 0 -199.5 -82t-84.5 -240h544q0 158 -66 240t-194 82z" />
-<glyph unicode="&#x154;" horiz-adv-x="1266" d="M201 0zM371 608v-608h-170v1462h401q269 0 397.5 -103t128.5 -310q0 -290 -294 -392l397 -657h-201l-354 608h-305zM371 754h233q180 0 264 71.5t84 214.5q0 145 -85.5 209t-274.5 64h-221v-559zM514 1604q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147 h-111v25z" />
-<glyph unicode="&#x155;" horiz-adv-x="836" d="M176 0zM676 1116q73 0 131 -12l-23 -154q-68 15 -120 15q-133 0 -227.5 -108t-94.5 -269v-588h-166v1096h137l19 -203h8q61 107 147 165t189 58zM357 1266q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x156;" horiz-adv-x="1266" d="M201 0zM371 608v-608h-170v1462h401q269 0 397.5 -103t128.5 -310q0 -290 -294 -392l397 -657h-201l-354 608h-305zM371 754h233q180 0 264 71.5t84 214.5q0 145 -85.5 209t-274.5 64h-221v-559zM494 -428q28 64 53.5 157t32.5 146h168v-18q-11 -51 -60 -147.5 t-104 -162.5h-90v25z" />
-<glyph unicode="&#x157;" horiz-adv-x="836" d="M96 0zM676 1116q73 0 131 -12l-23 -154q-68 15 -120 15q-133 0 -227.5 -108t-94.5 -269v-588h-166v1096h137l19 -203h8q61 107 147 165t189 58zM96 -428q28 64 53.5 157t32.5 146h168v-18q-11 -51 -60 -147.5t-104 -162.5h-90v25z" />
-<glyph unicode="&#x158;" horiz-adv-x="1266" d="M201 0zM371 608v-608h-170v1462h401q269 0 397.5 -103t128.5 -310q0 -290 -294 -392l397 -657h-201l-354 608h-305zM371 754h233q180 0 264 71.5t84 214.5q0 145 -85.5 209t-274.5 64h-221v-559zM295 1907h115q114 -74 219 -189q130 130 221 189h119v-25l-66 -68 q-144 -148 -190 -235h-166q-23 41 -74 104t-178 199v25z" />
-<glyph unicode="&#x159;" horiz-adv-x="836" d="M130 0zM676 1116q73 0 131 -12l-23 -154q-68 15 -120 15q-133 0 -227.5 -108t-94.5 -269v-588h-166v1096h137l19 -203h8q61 107 147 165t189 58zM130 1569h115q114 -74 219 -189q130 130 221 189h119v-25l-66 -68q-144 -148 -190 -235h-166q-23 41 -74 104t-178 199v25z " />
-<glyph unicode="&#x15a;" horiz-adv-x="1124" d="M106 0zM1026 389q0 -193 -140 -301t-380 -108q-260 0 -400 67v164q90 -38 196 -60t210 -22q170 0 256 64.5t86 179.5q0 76 -30.5 124.5t-102 89.5t-217.5 93q-204 73 -291.5 173t-87.5 261q0 169 127 269t336 100q218 0 401 -80l-53 -148q-181 76 -352 76 q-135 0 -211 -58t-76 -161q0 -76 28 -124.5t94.5 -89t203.5 -89.5q230 -82 316.5 -176t86.5 -244zM473 1604q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x15b;" horiz-adv-x="977" d="M106 0zM883 299q0 -153 -114 -236t-320 -83q-218 0 -340 69v154q79 -40 169.5 -63t174.5 -23q130 0 200 41.5t70 126.5q0 64 -55.5 109.5t-216.5 107.5q-153 57 -217.5 99.5t-96 96.5t-31.5 129q0 134 109 211.5t299 77.5q177 0 346 -72l-59 -135q-165 68 -299 68 q-118 0 -178 -37t-60 -102q0 -44 22.5 -75t72.5 -59t192 -81q195 -71 263.5 -143t68.5 -181zM371 1266q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x15c;" horiz-adv-x="1124" d="M106 0zM1026 389q0 -193 -140 -301t-380 -108q-260 0 -400 67v164q90 -38 196 -60t210 -22q170 0 256 64.5t86 179.5q0 76 -30.5 124.5t-102 89.5t-217.5 93q-204 73 -291.5 173t-87.5 261q0 169 127 269t336 100q218 0 401 -80l-53 -148q-181 76 -352 76 q-135 0 -211 -58t-76 -161q0 -76 28 -124.5t94.5 -89t203.5 -89.5q230 -82 316.5 -176t86.5 -244zM246 1602q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#x15d;" horiz-adv-x="977" d="M106 0zM883 299q0 -153 -114 -236t-320 -83q-218 0 -340 69v154q79 -40 169.5 -63t174.5 -23q130 0 200 41.5t70 126.5q0 64 -55.5 109.5t-216.5 107.5q-153 57 -217.5 99.5t-96 96.5t-31.5 129q0 134 109 211.5t299 77.5q177 0 346 -72l-59 -135q-165 68 -299 68 q-118 0 -178 -37t-60 -102q0 -44 22.5 -75t72.5 -59t192 -81q195 -71 263.5 -143t68.5 -181zM163 1264q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#x15e;" horiz-adv-x="1124" d="M106 0zM1026 389q0 -193 -140 -301t-380 -108q-260 0 -400 67v164q90 -38 196 -60t210 -22q170 0 256 64.5t86 179.5q0 76 -30.5 124.5t-102 89.5t-217.5 93q-204 73 -291.5 173t-87.5 261q0 169 127 269t336 100q218 0 401 -80l-53 -148q-181 76 -352 76 q-135 0 -211 -58t-76 -161q0 -76 28 -124.5t94.5 -89t203.5 -89.5q230 -82 316.5 -176t86.5 -244zM731 -289q0 -97 -76.5 -150t-226.5 -53q-51 0 -96 9v106q45 -8 104 -8q79 0 119.5 20t40.5 74q0 43 -39.5 69.5t-148.5 43.5l88 178h110l-55 -115q180 -39 180 -174z" />
-<glyph unicode="&#x15f;" horiz-adv-x="977" d="M106 0zM883 299q0 -153 -114 -236t-320 -83q-218 0 -340 69v154q79 -40 169.5 -63t174.5 -23q130 0 200 41.5t70 126.5q0 64 -55.5 109.5t-216.5 107.5q-153 57 -217.5 99.5t-96 96.5t-31.5 129q0 134 109 211.5t299 77.5q177 0 346 -72l-59 -135q-165 68 -299 68 q-118 0 -178 -37t-60 -102q0 -44 22.5 -75t72.5 -59t192 -81q195 -71 263.5 -143t68.5 -181zM649 -289q0 -97 -76.5 -150t-226.5 -53q-51 0 -96 9v106q45 -8 104 -8q79 0 119.5 20t40.5 74q0 43 -39.5 69.5t-148.5 43.5l88 178h110l-55 -115q180 -39 180 -174z" />
-<glyph unicode="&#x160;" horiz-adv-x="1124" d="M106 0zM1026 389q0 -193 -140 -301t-380 -108q-260 0 -400 67v164q90 -38 196 -60t210 -22q170 0 256 64.5t86 179.5q0 76 -30.5 124.5t-102 89.5t-217.5 93q-204 73 -291.5 173t-87.5 261q0 169 127 269t336 100q218 0 401 -80l-53 -148q-181 76 -352 76 q-135 0 -211 -58t-76 -161q0 -76 28 -124.5t94.5 -89t203.5 -89.5q230 -82 316.5 -176t86.5 -244zM240 1907h115q114 -74 219 -189q130 130 221 189h119v-25l-66 -68q-144 -148 -190 -235h-166q-23 41 -74 104t-178 199v25z" />
-<glyph unicode="&#x161;" horiz-adv-x="977" d="M106 0zM883 299q0 -153 -114 -236t-320 -83q-218 0 -340 69v154q79 -40 169.5 -63t174.5 -23q130 0 200 41.5t70 126.5q0 64 -55.5 109.5t-216.5 107.5q-153 57 -217.5 99.5t-96 96.5t-31.5 129q0 134 109 211.5t299 77.5q177 0 346 -72l-59 -135q-165 68 -299 68 q-118 0 -178 -37t-60 -102q0 -44 22.5 -75t72.5 -59t192 -81q195 -71 263.5 -143t68.5 -181zM165 1569h115q114 -74 219 -189q130 130 221 189h119v-25l-66 -68q-144 -148 -190 -235h-166q-23 41 -74 104t-178 199v25z" />
-<glyph unicode="&#x162;" horiz-adv-x="1133" d="M18 0zM651 0h-170v1311h-463v151h1096v-151h-463v-1311zM755 -289q0 -97 -76.5 -150t-226.5 -53q-51 0 -96 9v106q45 -8 104 -8q79 0 119.5 20t40.5 74q0 43 -39.5 69.5t-148.5 43.5l88 178h110l-55 -115q180 -39 180 -174z" />
-<glyph unicode="&#x163;" horiz-adv-x="723" d="M31 0zM530 117q44 0 85 6.5t65 13.5v-127q-27 -13 -79.5 -21.5t-94.5 -8.5q-318 0 -318 335v652h-157v80l157 69l70 234h96v-254h318v-129h-318v-645q0 -99 47 -152t129 -53zM633 -289q0 -97 -76.5 -150t-226.5 -53q-51 0 -96 9v106q45 -8 104 -8q79 0 119.5 20t40.5 74 q0 43 -39.5 69.5t-148.5 43.5l88 178h110l-55 -115q180 -39 180 -174z" />
-<glyph unicode="&#x164;" horiz-adv-x="1133" d="M18 0zM651 0h-170v1311h-463v151h1096v-151h-463v-1311zM232 1907h115q114 -74 219 -189q130 130 221 189h119v-25l-66 -68q-144 -148 -190 -235h-166q-23 41 -74 104t-178 199v25z" />
-<glyph unicode="&#x165;" horiz-adv-x="723" d="M31 0zM530 117q44 0 85 6.5t65 13.5v-127q-27 -13 -79.5 -21.5t-94.5 -8.5q-318 0 -318 335v652h-157v80l157 69l70 234h96v-254h318v-129h-318v-645q0 -99 47 -152t129 -53zM491 1253q19 55 38.5 138.5t29.5 164.5h168v-18q-11 -51 -55 -145t-91 -164h-90v24z" />
-<glyph unicode="&#x166;" horiz-adv-x="1133" d="M481 815v496h-463v151h1096v-151h-463v-496h310v-141h-310v-674h-170v674h-313v141h313z" />
-<glyph unicode="&#x167;" horiz-adv-x="723" d="M535 117q85 0 145 20v-127q-32 -14 -85 -22t-95 -8q-312 0 -312 348v254h-141v129h141v256h-157v80l157 69l70 234h96v-254h318v-129h-318v-256h301v-129h-301v-244q0 -221 181 -221z" />
-<glyph unicode="&#x168;" horiz-adv-x="1491" d="M186 0zM1305 1462v-946q0 -250 -151 -393t-415 -143t-408.5 144t-144.5 396v942h170v-954q0 -183 100 -281t294 -98q185 0 285 98.5t100 282.5v952h170zM899 1581q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5q-50 0 -75.5 -30t-39.5 -91h-98q13 121 70.5 189.5 t148.5 68.5q46 0 89 -18.5t82 -41t75 -41t68 -18.5q49 0 73 29.5t39 91.5h99q-13 -121 -69.5 -189.5t-150.5 -68.5z" />
-<glyph unicode="&#x169;" horiz-adv-x="1257" d="M164 0zM332 1096v-711q0 -134 61 -200t191 -66q172 0 251.5 94t79.5 307v576h166v-1096h-137l-24 147h-9q-51 -81 -141.5 -124t-206.5 -43q-200 0 -299.5 95t-99.5 304v717h168zM779 1243q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5q-50 0 -75.5 -30t-39.5 -91h-98 q13 121 70.5 189.5t148.5 68.5q46 0 89 -18.5t82 -41t75 -41t68 -18.5q49 0 73 29.5t39 91.5h99q-13 -121 -69.5 -189.5t-150.5 -68.5z" />
-<glyph unicode="&#x16a;" horiz-adv-x="1491" d="M186 0zM1305 1462v-946q0 -250 -151 -393t-415 -143t-408.5 144t-144.5 396v942h170v-954q0 -183 100 -281t294 -98q185 0 285 98.5t100 282.5v952h170zM446 1716h600v-137h-600v137z" />
-<glyph unicode="&#x16b;" horiz-adv-x="1257" d="M164 0zM332 1096v-711q0 -134 61 -200t191 -66q172 0 251.5 94t79.5 307v576h166v-1096h-137l-24 147h-9q-51 -81 -141.5 -124t-206.5 -43q-200 0 -299.5 95t-99.5 304v717h168zM326 1378h600v-137h-600v137z" />
-<glyph unicode="&#x16c;" horiz-adv-x="1491" d="M186 0zM1305 1462v-946q0 -250 -151 -393t-415 -143t-408.5 144t-144.5 396v942h170v-954q0 -183 100 -281t294 -98q185 0 285 98.5t100 282.5v952h170zM737 1579q-140 0 -218 68.5t-87 199.5h104q6 -49 26.5 -77t57 -41t121.5 -13q101 0 149 32t58 99h104 q-10 -126 -93.5 -197t-221.5 -71z" />
-<glyph unicode="&#x16d;" horiz-adv-x="1257" d="M164 0zM332 1096v-711q0 -134 61 -200t191 -66q172 0 251.5 94t79.5 307v576h166v-1096h-137l-24 147h-9q-51 -81 -141.5 -124t-206.5 -43q-200 0 -299.5 95t-99.5 304v717h168zM616 1241q-140 0 -218 68.5t-87 199.5h104q6 -49 26.5 -77t57 -41t121.5 -13q101 0 149 32 t58 99h104q-10 -126 -93.5 -197t-221.5 -71z" />
-<glyph unicode="&#x16e;" horiz-adv-x="1491" d="M186 0zM1305 1462v-946q0 -250 -151 -393t-415 -143t-408.5 144t-144.5 396v942h170v-954q0 -183 100 -281t294 -98q185 0 285 98.5t100 282.5v952h170zM969 1796q0 -98 -61.5 -157.5t-163.5 -59.5q-101 0 -161 58.5t-60 156.5t60.5 155.5t160.5 57.5q101 0 163 -59.5 t62 -151.5zM861 1794q0 56 -33 86.5t-84 30.5t-84 -30.5t-33 -86.5t30 -86.5t87 -30.5q52 0 84.5 30.5t32.5 86.5z" />
-<glyph unicode="&#x16f;" horiz-adv-x="1257" d="M164 0zM332 1096v-711q0 -134 61 -200t191 -66q172 0 251.5 94t79.5 307v576h166v-1096h-137l-24 147h-9q-51 -81 -141.5 -124t-206.5 -43q-200 0 -299.5 95t-99.5 304v717h168zM848 1458q0 -98 -61.5 -157.5t-163.5 -59.5q-101 0 -161 58.5t-60 156.5t60.5 155.5 t160.5 57.5q101 0 163 -59.5t62 -151.5zM740 1456q0 56 -33 86.5t-84 30.5t-84 -30.5t-33 -86.5t30 -86.5t87 -30.5q52 0 84.5 30.5t32.5 86.5z" />
-<glyph unicode="&#x170;" horiz-adv-x="1491" d="M186 0zM1305 1462v-946q0 -250 -151 -393t-415 -143t-408.5 144t-144.5 396v942h170v-954q0 -183 100 -281t294 -98q185 0 285 98.5t100 282.5v952h170zM456 1604q36 48 91 141t86 162h186v-21q-37 -63 -122.5 -161t-143.5 -146h-97v25zM813 1604q49 68 99.5 156.5 t76.5 146.5h186v-21q-37 -63 -122.5 -161t-143.5 -146h-96v25z" />
-<glyph unicode="&#x171;" horiz-adv-x="1257" d="M164 0zM332 1096v-711q0 -134 61 -200t191 -66q172 0 251.5 94t79.5 307v576h166v-1096h-137l-24 147h-9q-51 -81 -141.5 -124t-206.5 -43q-200 0 -299.5 95t-99.5 304v717h168zM335 1266q36 48 91 141t86 162h186v-21q-37 -63 -122.5 -161t-143.5 -146h-97v25zM692 1266 q49 68 99.5 156.5t76.5 146.5h186v-21q-37 -63 -122.5 -161t-143.5 -146h-96v25z" />
-<glyph unicode="&#x172;" horiz-adv-x="1491" d="M186 0zM1305 1462v-946q0 -250 -151 -393t-415 -143t-408.5 144t-144.5 396v942h170v-954q0 -183 100 -281t294 -98q185 0 285 98.5t100 282.5v952h170zM723 -238q0 -94 94 -94q42 0 97 13v-109q-65 -18 -125 -18q-207 0 -207 188q0 70 43 137.5t115 120.5h120 q-68 -66 -102.5 -120.5t-34.5 -117.5z" />
-<glyph unicode="&#x173;" horiz-adv-x="1257" d="M164 0zM332 1096v-711q0 -134 61 -200t191 -66q172 0 251.5 94t79.5 307v576h166v-1096h-137l-24 147h-9q-51 -81 -141.5 -124t-206.5 -43q-200 0 -299.5 95t-99.5 304v717h168zM934 -238q0 -94 94 -94q42 0 97 13v-109q-65 -18 -125 -18q-207 0 -207 188q0 70 43 137.5 t115 120.5h120q-68 -66 -102.5 -120.5t-34.5 -117.5z" />
-<glyph unicode="&#x174;" horiz-adv-x="1896" d="M27 0zM1477 0h-168l-295 979q-21 65 -47 164t-27 119q-22 -132 -70 -289l-286 -973h-168l-389 1462h180l231 -903q48 -190 70 -344q27 183 80 358l262 889h180l275 -897q48 -155 81 -350q19 142 72 346l230 901h180zM608 1602q127 136 178 200t74 105h166 q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#x175;" horiz-adv-x="1593" d="M23 0zM1071 0l-201 643q-19 59 -71 268h-8q-40 -175 -70 -270l-207 -641h-192l-299 1096h174q106 -413 161.5 -629t63.5 -291h8q11 57 35.5 147.5t42.5 143.5l201 629h180l196 -629q56 -172 76 -289h8q4 36 21.5 111t208.5 807h172l-303 -1096h-197zM461 1264 q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#x176;" horiz-adv-x="1147" d="M0 0zM573 731l390 731h184l-488 -895v-567h-172v559l-487 903h186zM236 1602q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#x177;" horiz-adv-x="1032" d="M2 0zM2 1096h178l240 -625q79 -214 98 -309h8q13 51 54.5 174.5t271.5 759.5h178l-471 -1248q-70 -185 -163.5 -262.5t-229.5 -77.5q-76 0 -150 17v133q55 -12 123 -12q171 0 244 192l61 156zM185 1264q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23 h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#x178;" horiz-adv-x="1147" d="M0 0zM573 731l390 731h184l-488 -895v-567h-172v559l-487 903h186zM294 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM675 1731q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5 t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x179;" horiz-adv-x="1169" d="M82 0zM1087 0h-1005v133l776 1176h-752v153h959v-133l-776 -1175h798v-154zM459 1604q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x17a;" horiz-adv-x="958" d="M82 0zM877 0h-795v113l598 854h-561v129h743v-129l-590 -838h605v-129zM369 1266q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x17b;" horiz-adv-x="1169" d="M82 0zM1087 0h-1005v133l776 1176h-752v153h959v-133l-776 -1175h798v-154zM486 1731q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5z" />
-<glyph unicode="&#x17c;" horiz-adv-x="958" d="M82 0zM877 0h-795v113l598 854h-561v129h743v-129l-590 -838h605v-129zM385 1393q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5z" />
-<glyph unicode="&#x17d;" horiz-adv-x="1169" d="M82 0zM1087 0h-1005v133l776 1176h-752v153h959v-133l-776 -1175h798v-154zM249 1907h115q114 -74 219 -189q130 130 221 189h119v-25l-66 -68q-144 -148 -190 -235h-166q-23 41 -74 104t-178 199v25z" />
-<glyph unicode="&#x17e;" horiz-adv-x="958" d="M82 0zM877 0h-795v113l598 854h-561v129h743v-129l-590 -838h605v-129zM146 1569h115q114 -74 219 -189q130 130 221 189h119v-25l-66 -68q-144 -148 -190 -235h-166q-23 41 -74 104t-178 199v25z" />
-<glyph unicode="&#x17f;" horiz-adv-x="655" d="M342 0h-166v1180q0 387 359 387q96 0 196 -37l-43 -133q-87 30 -160 30q-97 0 -141.5 -61.5t-44.5 -183.5v-1182z" />
-<glyph unicode="&#x192;" horiz-adv-x="1182" d="M328 -492q-69 0 -133 19v139q70 -18 131 -18q95 0 133.5 51t38.5 164v973h-222v75l222 60v139q0 195 81 284t263 89q85 0 205 -43l-22 -64l-21 -65q-102 32 -162 32q-98 0 -138 -52.5t-40 -176.5v-149h282v-129h-278v-969q0 -184 -79 -271.5t-261 -87.5z" />
-<glyph unicode="&#x1a0;" horiz-adv-x="1597" d="M1468 733q0 -354 -177.5 -553.5t-491.5 -199.5q-323 0 -498.5 196.5t-175.5 558.5q0 360 176.5 555t499.5 195q325 0 504 -215q50 12 79 45.5t42.5 84.5t13.5 156h182l14 -22q-29 -155 -94.5 -241.5t-169.5 -125.5q96 -176 96 -434zM305 733q0 -298 125 -451t369 -153 q243 0 366 152.5t123 451.5q0 295 -122.5 447.5t-364.5 152.5q-243 0 -369.5 -151.5t-126.5 -448.5z" />
-<glyph unicode="&#x1a1;" horiz-adv-x="1247" d="M1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q217 0 354 -141q51 15 80 47.5t42 82t13 159.5h180l15 -23q-31 -156 -91.5 -243.5t-162.5 -125.5q71 -138 71 -323zM287 549q0 -211 79 -320.5t252 -109.5 q175 0 253.5 109.5t78.5 320.5q0 210 -79.5 318t-254.5 108q-173 0 -251 -108t-78 -318z" />
-<glyph unicode="&#x1af;" horiz-adv-x="1573" d="M1305 1462v-198q58 8 93 39t50.5 87t15.5 166h181l14 -22q-33 -182 -119 -274t-235 -117v-627q0 -258 -143.5 -397t-407.5 -139q-268 0 -418 143.5t-150 396.5v942h170v-954q0 -183 102 -281t300 -98q184 0 280.5 96.5t96.5 284.5v952h170z" />
-<glyph unicode="&#x1b0;" horiz-adv-x="1362" d="M332 1094v-709q0 -134 61 -200t191 -66q172 0 251.5 94t79.5 307v574h166v-121q82 11 119 75t37 218h178l15 -23q-32 -186 -120 -281.5t-229 -109.5v-852h-137l-24 147h-9q-52 -82 -142.5 -124.5t-201.5 -42.5q-203 0 -303 95t-100 304v715h168z" />
-<glyph unicode="&#x1f0;" horiz-adv-x="518" d="M0 0zM43 -492q-95 0 -154 25v135q69 -20 136 -20q78 0 114.5 42.5t36.5 129.5v1276h166v-1264q0 -324 -299 -324zM-75 1569h115q114 -74 219 -189q130 130 221 189h119v-25l-66 -68q-144 -148 -190 -235h-166q-23 41 -74 104t-178 199v25z" />
-<glyph unicode="&#x1fa;" horiz-adv-x="1300" d="M872 1430q0 -133 -104 -189l532 -1241h-174l-176 401h-610l-166 -401h-174l532 1239q-106 52 -106 188q0 101 61 158t160 57q100 0 162.5 -58.5t62.5 -153.5zM899 555l-178 432q-25 58 -72 203q-14 -48 -38 -115.5t-33 -91.5l-177 -428h498zM553 1712q49 59 100 133.5 t74 116.5h203v-16q-32 -46 -116 -126.5t-150 -125.5h-111v18zM764 1427q0 57 -33 87t-84 30t-84 -30t-33 -87q0 -55 30 -85.5t87 -30.5q53 0 85 30.5t32 85.5z" />
-<glyph unicode="&#x1fb;" d="M471 1753v16q46 42 99 102t75 91h260v-12q-21 -24 -103 -76.5t-210 -120.5h-121zM850 0l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239q0 332 537 348l180 6v68q0 130 -59.5 191t-192.5 61q-96 0 -179.5 -26t-154.5 -58l-55 127 q84 43 188 68.5t205 25.5q209 0 309.5 -87t100.5 -279v-748h-123zM475 117q155 0 243.5 85t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5q0 -90 54.5 -137t152.5 -47zM803 1458q0 -98 -61.5 -157.5t-163.5 -59.5q-101 0 -161.5 58t-60.5 157q0 98 60.5 155.5 t161.5 57.5t163 -59.5t62 -151.5zM694 1456q0 56 -32.5 86.5t-83.5 30.5t-84 -30.5t-33 -86.5t30 -86.5t87 -30.5q52 0 84 30.5t32 86.5z" />
-<glyph unicode="&#x1fc;" horiz-adv-x="1788" d="M0 0zM1665 0h-750v465h-514l-227 -465h-176l698 1462h969v-151h-580v-471h541v-150h-541v-538h580v-152zM469 618h446v693h-118zM981 1604q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x1fd;" horiz-adv-x="1757" d="M94 0zM94 303q0 161 124 250.5t378 97.5l184 6v68q0 129 -58 190.5t-177 61.5q-144 0 -307 -84l-52 127q74 41 173.5 67.5t197.5 26.5q130 0 212.5 -43.5t123.5 -138.5q53 88 138.5 136t195.5 48q192 0 308 -133.5t116 -355.5v-107h-701q8 -395 322 -395q91 0 169.5 17.5 t162.5 56.5v-148q-86 -38 -160.5 -54.5t-175.5 -16.5q-289 0 -414 233q-81 -127 -179.5 -180t-232.5 -53q-163 0 -255.5 85t-92.5 238zM268 301q0 -95 53.5 -139.5t141.5 -44.5q145 0 229 84.5t84 238.5v99l-158 -7q-186 -8 -268 -62.5t-82 -168.5zM1225 977 q-121 0 -190.5 -83t-80.5 -241h519q0 156 -64 240t-184 84zM782 1266q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x1fe;" horiz-adv-x="1595" d="M125 0zM1470 733q0 -351 -177.5 -552t-493.5 -201q-235 0 -383 100l-101 -141l-120 79l108 154q-178 198 -178 563q0 357 176 553.5t500 196.5q209 0 366 -94l97 135l120 -80l-106 -148q192 -202 192 -565zM1290 733q0 272 -110 426l-672 -948q115 -82 291 -82 q243 0 367 153t124 451zM305 733q0 -262 101 -416l669 943q-106 73 -274 73q-243 0 -369.5 -153.5t-126.5 -446.5zM674 1604q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x1ff;" horiz-adv-x="1237" d="M115 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-154 0 -266 69l-84 -117l-114 78l94 131q-129 152 -129 408q0 268 134 417.5t372 149.5q154 0 270 -76l84 119l117 -76l-97 -133q127 -152 127 -401zM287 549q0 -171 53 -273l465 646q-75 53 -189 53q-163 0 -246 -107 t-83 -319zM950 549q0 164 -51 264l-465 -643q71 -51 184 -51q163 0 247.5 109.5t84.5 320.5zM479 1266q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x218;" horiz-adv-x="1124" d="M106 0zM1026 389q0 -193 -140 -301t-380 -108q-260 0 -400 67v164q90 -38 196 -60t210 -22q170 0 256 64.5t86 179.5q0 76 -30.5 124.5t-102 89.5t-217.5 93q-204 73 -291.5 173t-87.5 261q0 169 127 269t336 100q218 0 401 -80l-53 -148q-181 76 -352 76 q-135 0 -211 -58t-76 -161q0 -76 28 -124.5t94.5 -89t203.5 -89.5q230 -82 316.5 -176t86.5 -244zM375 -428q28 64 53.5 157t32.5 146h168v-18q-11 -51 -60 -147.5t-104 -162.5h-90v25z" />
-<glyph unicode="&#x219;" horiz-adv-x="977" d="M106 0zM883 299q0 -153 -114 -236t-320 -83q-218 0 -340 69v154q79 -40 169.5 -63t174.5 -23q130 0 200 41.5t70 126.5q0 64 -55.5 109.5t-216.5 107.5q-153 57 -217.5 99.5t-96 96.5t-31.5 129q0 134 109 211.5t299 77.5q177 0 346 -72l-59 -135q-165 68 -299 68 q-118 0 -178 -37t-60 -102q0 -44 22.5 -75t72.5 -59t192 -81q195 -71 263.5 -143t68.5 -181zM298 -428q28 64 53.5 157t32.5 146h168v-18q-11 -51 -60 -147.5t-104 -162.5h-90v25z" />
-<glyph unicode="&#x21a;" horiz-adv-x="1133" d="M18 0zM651 0h-170v1311h-463v151h1096v-151h-463v-1311zM394 -428q28 64 53.5 157t32.5 146h168v-18q-11 -51 -60 -147.5t-104 -162.5h-90v25z" />
-<glyph unicode="&#x21b;" horiz-adv-x="723" d="M31 0zM530 117q44 0 85 6.5t65 13.5v-127q-27 -13 -79.5 -21.5t-94.5 -8.5q-318 0 -318 335v652h-157v80l157 69l70 234h96v-254h318v-129h-318v-645q0 -99 47 -152t129 -53zM243 -428q28 64 53.5 157t32.5 146h168v-18q-11 -51 -60 -147.5t-104 -162.5h-90v25z" />
-<glyph unicode="&#x237;" horiz-adv-x="518" d="M43 -492q-95 0 -154 25v135q69 -20 136 -20q78 0 114.5 42.5t36.5 129.5v1276h166v-1264q0 -324 -299 -324z" />
-<glyph unicode="&#x2bc;" horiz-adv-x="348" d="M25 961zM309 1462l15 -22q-26 -100 -75 -232.5t-102 -246.5h-122q70 285 102 501h182z" />
-<glyph unicode="&#x2c6;" horiz-adv-x="1212" d="M268 1264q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#x2c7;" horiz-adv-x="1212" d="M268 1569h115q114 -74 219 -189q130 130 221 189h119v-25l-66 -68q-144 -148 -190 -235h-166q-23 41 -74 104t-178 199v25z" />
-<glyph unicode="&#x2c9;" horiz-adv-x="1202" d="M301 1378h600v-137h-600v137z" />
-<glyph unicode="&#x2d8;" horiz-adv-x="1212" d="M598 1241q-140 0 -218 68.5t-87 199.5h104q6 -49 26.5 -77t57 -41t121.5 -13q101 0 149 32t58 99h104q-10 -126 -93.5 -197t-221.5 -71z" />
-<glyph unicode="&#x2d9;" horiz-adv-x="518" d="M162 1393q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5z" />
-<glyph unicode="&#x2da;" horiz-adv-x="1182" d="M813 1458q0 -98 -61.5 -157.5t-163.5 -59.5q-101 0 -161 58.5t-60 156.5t60.5 155.5t160.5 57.5q101 0 163 -59.5t62 -151.5zM705 1456q0 56 -33 86.5t-84 30.5t-84 -30.5t-33 -86.5t30 -86.5t87 -30.5q52 0 84.5 30.5t32.5 86.5z" />
-<glyph unicode="&#x2db;" horiz-adv-x="403" d="M178 -238q0 -94 94 -94q42 0 97 13v-109q-65 -18 -125 -18q-207 0 -207 188q0 70 43 137.5t115 120.5h120q-68 -66 -102.5 -120.5t-34.5 -117.5z" />
-<glyph unicode="&#x2dc;" horiz-adv-x="1212" d="M788 1243q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5q-50 0 -75.5 -30t-39.5 -91h-98q13 121 70.5 189.5t148.5 68.5q46 0 89 -18.5t82 -41t75 -41t68 -18.5q49 0 73 29.5t39 91.5h99q-13 -121 -69.5 -189.5t-150.5 -68.5z" />
-<glyph unicode="&#x2dd;" horiz-adv-x="1182" d="M231 1266q36 48 91 141t86 162h186v-21q-37 -63 -122.5 -161t-143.5 -146h-97v25zM588 1266q49 68 99.5 156.5t76.5 146.5h186v-21q-37 -63 -122.5 -161t-143.5 -146h-96v25z" />
-<glyph unicode="&#x2f3;" horiz-adv-x="682" d="M565 -338q0 -97 -62.5 -157t-164.5 -60q-101 0 -161 58.5t-60 156.5t60 156.5t161 58.5t164 -59t63 -154zM455 -340q0 57 -33 87t-84 30t-84 -30t-33 -87q0 -56 30 -86.5t87 -30.5q53 0 85 30.5t32 86.5z" />
-<glyph unicode="&#x300;" horiz-adv-x="0" d="M-548 1241zM-548 1241h-110q-65 52 -154 148t-129 159v21h203q32 -69 89 -159.5t101 -143.5v-25z" />
-<glyph unicode="&#x301;" horiz-adv-x="0" d="M-362 1241zM-755 1266q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x303;" horiz-adv-x="0" d="M-255 1241zM-475 1243q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5q-50 0 -75.5 -30t-39.5 -91h-98q13 121 70.5 189.5t148.5 68.5q46 0 89 -18.5t82 -41t75 -41t68 -18.5q49 0 73 29.5t39 91.5h99q-13 -121 -69.5 -189.5t-150.5 -68.5z" />
-<glyph unicode="&#x309;" horiz-adv-x="0" d="M-397 1495q0 -140 -166 -174l-10 -113h-105l-12 176q86 14 125 39t39 68t-33.5 63.5t-106.5 20.5q-62 0 -94 -6v100q38 10 107 10q256 0 256 -184z" />
-<glyph unicode="&#x30f;" horiz-adv-x="0" d="M-332 1241h-96q-52 42 -140.5 143t-125.5 164v21h186q28 -61 77.5 -148t98.5 -155v-25zM-688 1241h-96q-56 44 -143 144t-124 163v21h187q28 -61 77.5 -148t98.5 -155v-25z" />
-<glyph unicode="&#x323;" horiz-adv-x="0" d="M-709 -242q0 57 29.5 84t71.5 27q40 0 69 -27t29 -84q0 -55 -29 -82.5t-69 -27.5q-42 0 -71.5 27.5t-29.5 82.5z" />
-<glyph unicode="&#x384;" horiz-adv-x="1182" d="M508 1270q27 72 53.5 185.5t38.5 195.5h184v-23q-18 -74 -72.5 -192.5t-103.5 -194.5h-100v29z" />
-<glyph unicode="&#x385;" horiz-adv-x="1182" d="M512 1413q65 169 96 303h189v-20q-33 -67 -93.5 -156.5t-111.5 -150.5h-80v24zM283 1393q0 52 26 75t64 23q41 0 65.5 -26t24.5 -72q0 -50 -27.5 -74.5t-62.5 -24.5q-38 0 -64 24.5t-26 74.5zM719 1393q0 52 26 75t64 23q41 0 65.5 -26t24.5 -72q0 -50 -27.5 -74.5 t-62.5 -24.5q-38 0 -64 24.5t-26 74.5z" />
-<glyph unicode="&#x386;" horiz-adv-x="1296" d="M0 0zM1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473zM28 1165q27 72 53.5 185.5t38.5 195.5h184v-23q-18 -74 -72.5 -192.5t-103.5 -194.5h-100v29z" />
-<glyph unicode="&#x387;" horiz-adv-x="545" d="M152 588zM152 723q0 66 31 100.5t87 34.5q58 0 90.5 -34.5t32.5 -100.5q0 -65 -33 -100t-90 -35q-51 0 -84.5 31.5t-33.5 103.5z" />
-<glyph unicode="&#x388;" horiz-adv-x="1266" d="M0 0zM1141 0h-815v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152zM-44 1165q27 72 53.5 185.5t38.5 195.5h184v-23q-18 -74 -72.5 -192.5t-103.5 -194.5h-100v29z" />
-<glyph unicode="&#x389;" horiz-adv-x="1661" d="M0 0zM1461 0h-170v688h-770v-688h-170v1462h170v-622h770v622h170v-1462zM-44 1165q27 72 53.5 185.5t38.5 195.5h184v-23q-18 -74 -72.5 -192.5t-103.5 -194.5h-100v29z" />
-<glyph unicode="&#x38a;" horiz-adv-x="741" d="M0 0zM371 0v1462h170v-1462h-170zM-28 1165q27 72 53.5 185.5t38.5 195.5h184v-23q-18 -74 -72.5 -192.5t-103.5 -194.5h-100v29z" />
-<glyph unicode="&#x38c;" horiz-adv-x="1665" d="M0 0zM1538 733q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552zM373 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5 t-126.5 -446.5zM-28 1165q27 72 53.5 185.5t38.5 195.5h184v-23q-18 -74 -72.5 -192.5t-103.5 -194.5h-100v29z" />
-<glyph unicode="&#x38e;" horiz-adv-x="1413" d="M0 0zM839 731l390 731h184l-488 -895v-567h-172v559l-487 903h186zM-44 1165q27 72 53.5 185.5t38.5 195.5h184v-23q-18 -74 -72.5 -192.5t-103.5 -194.5h-100v29z" />
-<glyph unicode="&#x38f;" horiz-adv-x="1665" d="M0 0zM864 1333q-238 0 -363 -128.5t-125 -381.5q0 -225 86.5 -391.5t266.5 -298.5v-133h-586v152h364q-151 118 -231 293t-80 378q0 310 177 486t491 176q315 0 492 -173.5t177 -486.5q0 -207 -79 -380t-230 -293h363v-152h-586v133q183 134 267.5 301t84.5 389 q0 252 -124.5 381t-364.5 129zM-28 1165q27 72 53.5 185.5t38.5 195.5h184v-23q-18 -74 -72.5 -192.5t-103.5 -194.5h-100v29z" />
-<glyph unicode="&#x390;" horiz-adv-x="694" d="M0 0zM334 1096v-774q0 -104 36.5 -154.5t123.5 -50.5q37 0 87.5 6.5t77.5 13.5v-127q-31 -13 -83.5 -21.5t-102.5 -8.5q-160 0 -232.5 84t-72.5 253v779h166zM206 1413q65 169 96 303h189v-20q-33 -67 -93.5 -156.5t-111.5 -150.5h-80v24zM-23 1393q0 52 26 75t64 23 q41 0 65.5 -26t24.5 -72q0 -50 -27.5 -74.5t-62.5 -24.5q-38 0 -64 24.5t-26 74.5zM413 1393q0 52 26 75t64 23q41 0 65.5 -26t24.5 -72q0 -50 -27.5 -74.5t-62.5 -24.5q-38 0 -64 24.5t-26 74.5z" />
-<glyph unicode="&#x391;" horiz-adv-x="1296" d="M0 0zM1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473z" />
-<glyph unicode="&#x392;" horiz-adv-x="1327" d="M201 0zM201 1462h413q291 0 421 -87t130 -275q0 -130 -72.5 -214.5t-211.5 -109.5v-10q333 -57 333 -350q0 -196 -132.5 -306t-370.5 -110h-510v1462zM371 836h280q180 0 259 56.5t79 190.5q0 123 -88 177.5t-280 54.5h-250v-479zM371 692v-547h305q177 0 266.5 68.5 t89.5 214.5q0 136 -91.5 200t-278.5 64h-291z" />
-<glyph unicode="&#x393;" horiz-adv-x="1065" d="M1016 1462v-153h-645v-1309h-170v1462h815z" />
-<glyph unicode="&#x394;" horiz-adv-x="1171" d="M39 0zM39 104l463 1358h166l465 -1360v-102h-1094v104zM584 1268q-61 -225 -101 -346l-260 -770h721l-258 761q-68 202 -102 355z" />
-<glyph unicode="&#x395;" d="M201 0zM1016 0h-815v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152z" />
-<glyph unicode="&#x396;" horiz-adv-x="1169" d="M82 0zM1087 0h-1005v133l776 1176h-752v153h959v-133l-776 -1175h798v-154z" />
-<glyph unicode="&#x397;" horiz-adv-x="1511" d="M201 0zM1311 0h-170v688h-770v-688h-170v1462h170v-622h770v622h170v-1462z" />
-<glyph unicode="&#x398;" horiz-adv-x="1595" d="M483 819h629v-149h-629v149zM1470 733q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552zM305 733q0 -296 125 -450t369 -154q243 0 367 152t124 452q0 298 -123.5 449t-365.5 151 q-245 0 -370.5 -153t-125.5 -447z" />
-<glyph unicode="&#x399;" horiz-adv-x="571" d="M201 0zM201 0v1462h170v-1462h-170z" />
-<glyph unicode="&#x39a;" horiz-adv-x="1257" d="M201 0zM1257 0h-200l-533 709l-153 -136v-573h-170v1462h170v-725l663 725h201l-588 -635z" />
-<glyph unicode="&#x39b;" horiz-adv-x="1235" d="M1235 0h-182l-330 928q-87 252 -109 342q-33 -139 -104 -340l-328 -930h-182l528 1462h177z" />
-<glyph unicode="&#x39c;" horiz-adv-x="1849" d="M201 0zM848 0l-496 1296h-8q14 -154 14 -366v-930h-157v1462h256l463 -1206h8l467 1206h254v-1462h-170v942q0 162 14 352h-8l-500 -1294h-137z" />
-<glyph unicode="&#x39d;" horiz-adv-x="1544" d="M201 0zM1343 0h-194l-799 1227h-8q16 -216 16 -396v-831h-157v1462h192l797 -1222h8q-2 27 -9 173.5t-5 209.5v839h159v-1462z" />
-<glyph unicode="&#x39e;" horiz-adv-x="1133" d="M195 840h743v-150h-743v150zM113 1462h907v-151h-907v151zM1061 152v-152h-989v152h989z" />
-<glyph unicode="&#x39f;" horiz-adv-x="1595" d="M125 0zM1470 733q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5 t-126.5 -446.5z" />
-<glyph unicode="&#x3a0;" horiz-adv-x="1493" d="M1292 0h-170v1311h-751v-1311h-170v1462h1091v-1462z" />
-<glyph unicode="&#x3a1;" horiz-adv-x="1233" d="M201 0zM1128 1036q0 -222 -151.5 -341.5t-433.5 -119.5h-172v-575h-170v1462h379q548 0 548 -426zM371 721h153q226 0 327 73t101 234q0 145 -95 216t-296 71h-190v-594z" />
-<glyph unicode="&#x3a3;" horiz-adv-x="1161" d="M74 0v141l481 623l-469 555v143h971v-153h-676l-96 2l460 -545l-481 -614h852v-152h-1042z" />
-<glyph unicode="&#x3a4;" horiz-adv-x="1133" d="M18 0zM651 0h-170v1311h-463v151h1096v-151h-463v-1311z" />
-<glyph unicode="&#x3a5;" horiz-adv-x="1147" d="M0 0zM573 731l390 731h184l-488 -895v-567h-172v559l-487 903h186z" />
-<glyph unicode="&#x3a6;" horiz-adv-x="1634" d="M731 1483h172v-180h70q171 0 296.5 -68t192 -192t66.5 -283q0 -166 -74.5 -295.5t-204 -194.5t-305.5 -65h-41v-225h-172v225h-45q-176 0 -305 66t-202 196t-73 291q0 158 67.5 282t193.5 193.5t297 69.5h67v180zM903 348h25q201 0 312.5 109.5t111.5 304.5 q0 185 -103 290t-288 105h-58v-809zM731 1157h-57q-182 0 -286.5 -106t-104.5 -289q0 -197 111 -305.5t313 -108.5h24v809z" />
-<glyph unicode="&#x3a7;" horiz-adv-x="1182" d="M8 0zM1174 0h-193l-393 643l-400 -643h-180l486 764l-453 698h188l363 -579l366 579h181l-453 -692z" />
-<glyph unicode="&#x3a8;" horiz-adv-x="1630" d="M899 0h-170v446h-45q-176 0 -303.5 61t-199.5 184.5t-72 287.5v483h174v-479q0 -188 103.5 -288.5t315.5 -100.5h27v868h170v-868h29q211 0 314.5 99t103.5 286v483h176v-481q0 -165 -72 -288.5t-201.5 -185t-304.5 -61.5h-45v-446z" />
-<glyph unicode="&#x3a9;" horiz-adv-x="1602" d="M801 1333q-238 0 -363 -128.5t-125 -381.5q0 -225 86.5 -391.5t266.5 -298.5v-133h-586v152h364q-151 118 -231 293t-80 378q0 310 177 486t491 176q315 0 492 -173.5t177 -486.5q0 -207 -79 -380t-230 -293h363v-152h-586v133q183 134 267.5 301t84.5 389 q0 252 -124.5 381t-364.5 129z" />
-<glyph unicode="&#x3aa;" horiz-adv-x="571" d="M5 0zM201 0v1462h170v-1462h-170zM5 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM386 1731q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x3ab;" horiz-adv-x="1147" d="M0 0zM573 731l390 731h184l-488 -895v-567h-172v559l-487 903h186zM292 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM673 1731q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5 t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x3ac;" horiz-adv-x="1251" d="M115 0zM592 119q169 0 244 97.5t75 315.5v15q0 229 -76 328.5t-245 99.5q-303 0 -303 -432q0 -212 73.5 -318t231.5 -106zM567 -20q-214 0 -333 148.5t-119 416.5q0 274 122 422.5t347 148.5q121 0 201.5 -42t134.5 -126h12q24 92 65 148h129q-21 -66 -35 -189t-14 -239 v-439q0 -114 84 -114q29 0 62 10v-119q-46 -26 -111 -26q-81 0 -125.5 40.5t-62.5 126.5h-13q-59 -86 -142.5 -126.5t-201.5 -40.5zM537 1270q27 72 53.5 185.5t38.5 195.5h184v-23q-18 -74 -72.5 -192.5t-103.5 -194.5h-100v29z" />
-<glyph unicode="&#x3ad;" horiz-adv-x="973" d="M90 0zM715 641v-141h-148q-311 0 -311 -195q0 -90 73.5 -139t219.5 -49q84 0 167 19.5t183 66.5v-148q-137 -75 -358 -75q-210 0 -330.5 84.5t-120.5 232.5q0 98 55 163.5t185 106.5v11q-98 28 -151.5 91.5t-53.5 155.5q0 133 112 212t304 79q97 0 179.5 -16.5 t182.5 -61.5l-63 -133q-94 42 -159 56t-144 14q-250 0 -250 -162q0 -172 317 -172h111zM452 1270q27 72 53.5 185.5t38.5 195.5h184v-23q-18 -74 -72.5 -192.5t-103.5 -194.5h-100v29z" />
-<glyph unicode="&#x3ae;" horiz-adv-x="1257" d="M176 0zM926 -492v1201q0 134 -61 200t-191 66q-172 0 -252 -93t-80 -307v-575h-166v1096h135l27 -150h8q51 81 143 125.5t205 44.5q198 0 298 -95.5t100 -305.5v-1207h-166zM567 1270q27 72 53.5 185.5t38.5 195.5h184v-23q-18 -74 -72.5 -192.5t-103.5 -194.5h-100v29z " />
-<glyph unicode="&#x3af;" horiz-adv-x="694" d="M168 0zM334 1096v-774q0 -104 36.5 -154.5t123.5 -50.5q37 0 87.5 6.5t77.5 13.5v-127q-31 -13 -83.5 -21.5t-102.5 -8.5q-160 0 -232.5 84t-72.5 253v779h166zM192 1270q27 72 53.5 185.5t38.5 195.5h184v-23q-18 -74 -72.5 -192.5t-103.5 -194.5h-100v29z" />
-<glyph unicode="&#x3b0;" horiz-adv-x="1247" d="M164 0zM627 -20q-231 0 -347 125t-116 391v600h166v-592q0 -192 79 -289.5t232 -97.5q167 0 247.5 119t80.5 370q0 130 -14 242t-48 248h166q36 -144 50 -251t14 -247q0 -318 -129 -468t-381 -150zM571 1413q65 169 96 303h189v-20q-33 -67 -93.5 -156.5t-111.5 -150.5 h-80v24zM342 1393q0 52 26 75t64 23q41 0 65.5 -26t24.5 -72q0 -50 -27.5 -74.5t-62.5 -24.5q-38 0 -64 24.5t-26 74.5zM778 1393q0 52 26 75t64 23q41 0 65.5 -26t24.5 -72q0 -50 -27.5 -74.5t-62.5 -24.5q-38 0 -64 24.5t-26 74.5z" />
-<glyph unicode="&#x3b1;" horiz-adv-x="1251" d="M592 119q169 0 244 97.5t75 315.5v15q0 229 -76 328.5t-245 99.5q-303 0 -303 -432q0 -212 73.5 -318t231.5 -106zM567 -20q-214 0 -333 148.5t-119 416.5q0 274 122 422.5t347 148.5q121 0 201.5 -42t134.5 -126h12q24 92 65 148h129q-21 -66 -35 -189t-14 -239v-439 q0 -114 84 -114q29 0 62 10v-119q-46 -26 -111 -26q-81 0 -125.5 40.5t-62.5 126.5h-13q-59 -86 -142.5 -126.5t-201.5 -40.5z" />
-<glyph unicode="&#x3b2;" horiz-adv-x="1286" d="M659 1567q220 0 344.5 -104t124.5 -287q0 -294 -313 -345v-8q377 -42 377 -409q0 -209 -132 -321.5t-370 -112.5q-109 0 -189 15.5t-159 53.5v-541h-166v1588q0 225 126.5 348t356.5 123zM657 1427q-158 0 -236.5 -86t-78.5 -251v-887q93 -49 173.5 -67.5t166.5 -18.5 q171 0 257.5 75t86.5 232t-95 239t-272 82h-112v142h92q155 0 236 73.5t81 210.5q0 123 -78 189.5t-221 66.5z" />
-<glyph unicode="&#x3b3;" horiz-adv-x="1049" d="M532 -492h-180q0 96 32 243t75 261l-449 1084h172l240 -584q94 -235 113 -338h8q5 30 25.5 101t42 135.5t255.5 685.5h172l-405 -1069q-48 -124 -74.5 -270t-26.5 -249z" />
-<glyph unicode="&#x3b4;" horiz-adv-x="1188" d="M545 936q-140 78 -198 157.5t-58 178.5q0 130 97 206t261 76q103 0 197.5 -22.5t220.5 -85.5l-72 -135q-112 62 -191.5 84t-160.5 22q-85 0 -133.5 -39.5t-48.5 -105.5q0 -71 53.5 -126.5t220.5 -146.5q210 -115 298.5 -235.5t88.5 -284.5q0 -235 -136 -367t-372 -132 q-227 0 -363 124t-136 334q0 177 113 307.5t319 190.5zM948 479q0 128 -61.5 219.5t-202.5 165.5q-206 -53 -301.5 -161.5t-95.5 -268.5q0 -144 89 -229.5t236 -85.5q162 0 249 93t87 267z" />
-<glyph unicode="&#x3b5;" horiz-adv-x="973" d="M715 641v-141h-148q-311 0 -311 -195q0 -90 73.5 -139t219.5 -49q84 0 167 19.5t183 66.5v-148q-137 -75 -358 -75q-210 0 -330.5 84.5t-120.5 232.5q0 98 55 163.5t185 106.5v11q-98 28 -151.5 91.5t-53.5 155.5q0 133 112 212t304 79q97 0 179.5 -16.5t182.5 -61.5 l-63 -133q-94 42 -159 56t-144 14q-250 0 -250 -162q0 -172 317 -172h111z" />
-<glyph unicode="&#x3b6;" horiz-adv-x="989" d="M176 1415v141h752v-129q-215 -180 -359 -341.5t-213 -306t-69 -310.5q0 -98 29.5 -157t92 -95.5t234.5 -73.5q149 -31 217 -85.5t68 -145.5q0 -149 -127 -313h-166q125 161 125 268q0 56 -55.5 86.5t-198.5 56.5q-203 36 -297 145.5t-94 303.5q0 114 29.5 218t85.5 201.5 t156.5 212t342.5 332.5q-40 -8 -311 -8h-242z" />
-<glyph unicode="&#x3b7;" horiz-adv-x="1257" d="M926 -492v1201q0 134 -61 200t-191 66q-172 0 -252 -93t-80 -307v-575h-166v1096h135l27 -150h8q51 81 143 125.5t205 44.5q198 0 298 -95.5t100 -305.5v-1207h-166z" />
-<glyph unicode="&#x3b8;" horiz-adv-x="1212" d="M1098 780q0 -406 -122 -603t-372 -197q-240 0 -364.5 201.5t-124.5 598.5q0 407 122.5 603t366.5 196t369 -202.5t125 -596.5zM604 119q164 0 242 152.5t84 459.5h-647q4 -304 79 -458t242 -154zM604 1440q-161 0 -236 -143.5t-85 -424.5h645q-11 281 -87 424.5 t-237 143.5z" />
-<glyph unicode="&#x3b9;" horiz-adv-x="694" d="M334 1096v-774q0 -104 36.5 -154.5t123.5 -50.5q37 0 87.5 6.5t77.5 13.5v-127q-31 -13 -83.5 -21.5t-102.5 -8.5q-160 0 -232.5 84t-72.5 253v779h166z" />
-<glyph unicode="&#x3ba;" horiz-adv-x="1061" d="M176 0zM815 1094h207l-414 -482l443 -612h-201l-361 504l-135 -113v-391h-178v1094h178v-283q0 -166 -12 -279z" />
-<glyph unicode="&#x3bb;" horiz-adv-x="1094" d="M-14 0l473 1079l-58 162q-30 85 -55 120t-58.5 53t-82.5 18q-58 0 -115 -13v133q68 17 131 17q91 0 151.5 -30t104.5 -95t98 -217l363 -1012q19 -49 40 -74.5t56 -25.5q27 0 60 10v-121q-48 -24 -109 -24q-74 0 -115.5 38t-70.5 121l-156 436q-84 240 -106 336h-9 q-28 -116 -116 -325l-254 -586h-172z" />
-<glyph unicode="&#x3bc;" horiz-adv-x="1268" d="M176 0zM342 381q0 -262 254 -262q171 0 250.5 94.5t79.5 306.5v576h166v-1096h-136l-26 147h-10q-111 -167 -340 -167q-150 0 -238 92h-10q10 -84 10 -244v-320h-166v1588h166v-715z" />
-<glyph unicode="&#x3bd;" horiz-adv-x="1110" d="M0 1096h172l219 -590q26 -67 67.5 -186t57.5 -181h8q177 175 256.5 397.5t79.5 559.5h166q0 -363 -103.5 -617t-328.5 -479h-186z" />
-<glyph unicode="&#x3be;" horiz-adv-x="973" d="M854 754h-178q-176 0 -282.5 -89t-106.5 -231q0 -80 25 -129t72.5 -79.5t115 -48.5t151.5 -36q142 -29 209.5 -84t67.5 -145q0 -65 -27 -139.5t-94 -173.5h-156q53 71 86 144.5t33 125.5q0 55 -57.5 85.5t-200.5 55.5q-200 34 -299.5 134t-99.5 276q0 140 79 245t207 144 v12q-217 64 -217 281q0 117 69.5 196t235.5 129q-128 -12 -243 -12h-68v141h698v-131h-51q-130 0 -242 -40t-175.5 -112t-63.5 -167q0 -115 83.5 -169t258.5 -54h170v-129z" />
-<glyph unicode="&#x3bf;" horiz-adv-x="1237" d="M115 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414zM287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319z" />
-<glyph unicode="&#x3c0;" horiz-adv-x="1331" d="M1149 117q38 0 86 18v-131q-43 -24 -127 -24q-219 0 -219 253v721h-477v-954h-166v954h-221v74l143 68h1100v-142h-213v-708q0 -74 25.5 -101.5t68.5 -27.5z" />
-<glyph unicode="&#x3c1;" horiz-adv-x="1237" d="M1122 549q0 -271 -128 -420t-361 -149q-179 0 -299 94h-8q8 -61 8 -273v-293h-168v1055q0 266 125.5 409.5t359.5 143.5q219 0 345 -151.5t126 -415.5zM643 975q-158 0 -233.5 -103.5t-75.5 -312.5v-338q122 -102 305 -102q159 0 235 104t76 326q0 214 -72 320t-235 106z " />
-<glyph unicode="&#x3c2;" horiz-adv-x="987" d="M287 522q0 -135 29.5 -201t101 -106t231.5 -74q148 -32 213.5 -85.5t65.5 -143.5q0 -66 -27 -142t-94 -171h-156q54 70 87.5 144t33.5 124q0 40 -25.5 63.5t-80.5 42.5t-152 37q-204 37 -301.5 164t-97.5 346q0 286 138 441t386 155q79 0 158 -16.5t133 -40.5l-53 -141 q-130 51 -244 51q-176 0 -261 -109t-85 -338z" />
-<glyph unicode="&#x3c3;" horiz-adv-x="1255" d="M1120 508q0 -157 -61.5 -277.5t-176 -185.5t-268.5 -65q-235 0 -367 144t-132 398q0 574 592 574h499v-142h-264q178 -167 178 -446zM287 522q0 -194 85 -298.5t246 -104.5q159 0 244.5 98.5t85.5 280.5q0 270 -174 456h-65q-222 0 -322 -104t-100 -328z" />
-<glyph unicode="&#x3c4;" horiz-adv-x="969" d="M915 1096v-142h-432v-618q0 -223 205 -223q47 0 96 6.5t76 13.5v-125q-35 -15 -90.5 -24t-103.5 -9q-181 0 -266 85t-85 255v639h-297v74l148 68h749z" />
-<glyph unicode="&#x3c5;" horiz-adv-x="1247" d="M627 -20q-231 0 -347 125t-116 391v600h166v-592q0 -192 79 -289.5t232 -97.5q167 0 247.5 119t80.5 370q0 130 -14 242t-48 248h166q36 -144 50 -251t14 -247q0 -318 -129 -468t-381 -150z" />
-<glyph unicode="&#x3c6;" horiz-adv-x="1470" d="M643 -492v474q-260 11 -394 156.5t-134 416.5q0 296 207 549l131 -90q-89 -117 -129.5 -229t-40.5 -236q0 -395 360 -430v620q0 187 83 282t232 95q180 0 289 -146.5t109 -396.5q0 -178 -68 -308.5t-192 -202.5t-289 -80v-474h-164zM1184 571q0 185 -62 294.5t-164 109.5 q-73 0 -112 -60t-39 -174v-622q179 16 278 134t99 318z" />
-<glyph unicode="&#x3c7;" horiz-adv-x="1118" d="M178 1102q54 0 93 -21.5t70 -67t75 -157.5l145 -369l318 609h180l-428 -772l190 -484q48 -122 89 -159t104 -37q45 0 90 8v-129q-60 -15 -119 -15q-115 0 -185.5 59t-129.5 218l-150 387l-362 -664h-178l464 836l-172 444q-38 99 -73 139t-78 40q-37 0 -64 -11v129 q49 17 121 17z" />
-<glyph unicode="&#x3c8;" horiz-adv-x="1542" d="M858 1554v-1431q188 15 289.5 130.5t101.5 319.5q0 120 -13 237.5t-50 285.5h166q63 -272 63 -516q0 -276 -142.5 -429t-414.5 -169v-474h-164v474q-264 9 -397 154t-133 417v543h166v-549q0 -195 90 -304t274 -122v1433h164z" />
-<glyph unicode="&#x3c9;" horiz-adv-x="1583" d="M500 -20q-182 0 -283.5 148t-101.5 402q0 156 27.5 284.5t95.5 281.5h172q-68 -156 -96.5 -283.5t-28.5 -284.5q0 -193 60 -301t167 -108q94 0 146.5 71.5t52.5 196.5v311h161v-311q0 -128 53 -198t146 -70q107 0 167 108t60 301q0 151 -27.5 281t-96.5 287h172 q65 -146 93.5 -277.5t28.5 -288.5q0 -252 -101.5 -401t-283.5 -149q-220 0 -288 182h-9q-65 -182 -286 -182z" />
-<glyph unicode="&#x3ca;" horiz-adv-x="694" d="M9 0zM334 1096v-774q0 -104 36.5 -154.5t123.5 -50.5q37 0 87.5 6.5t77.5 13.5v-127q-31 -13 -83.5 -21.5t-102.5 -8.5q-160 0 -232.5 84t-72.5 253v779h166zM9 1393q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5 t-26.5 74.5zM390 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x3cb;" horiz-adv-x="1247" d="M164 0zM627 -20q-231 0 -347 125t-116 391v600h166v-592q0 -192 79 -289.5t232 -97.5q167 0 247.5 119t80.5 370q0 130 -14 242t-48 248h166q36 -144 50 -251t14 -247q0 -318 -129 -468t-381 -150zM366 1393q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75 q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM747 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x3cc;" horiz-adv-x="1237" d="M115 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414zM287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319z M541 1270q27 72 53.5 185.5t38.5 195.5h184v-23q-18 -74 -72.5 -192.5t-103.5 -194.5h-100v29z" />
-<glyph unicode="&#x3cd;" horiz-adv-x="1247" d="M164 0zM627 -20q-231 0 -347 125t-116 391v600h166v-592q0 -192 79 -289.5t232 -97.5q167 0 247.5 119t80.5 370q0 130 -14 242t-48 248h166q36 -144 50 -251t14 -247q0 -318 -129 -468t-381 -150zM547 1270q27 72 53.5 185.5t38.5 195.5h184v-23q-18 -74 -72.5 -192.5 t-103.5 -194.5h-100v29z" />
-<glyph unicode="&#x3ce;" horiz-adv-x="1583" d="M115 0zM500 -20q-182 0 -283.5 148t-101.5 402q0 156 27.5 284.5t95.5 281.5h172q-68 -156 -96.5 -283.5t-28.5 -284.5q0 -193 60 -301t167 -108q94 0 146.5 71.5t52.5 196.5v311h161v-311q0 -128 53 -198t146 -70q107 0 167 108t60 301q0 151 -27.5 281t-96.5 287h172 q65 -146 93.5 -277.5t28.5 -288.5q0 -252 -101.5 -401t-283.5 -149q-220 0 -288 182h-9q-65 -182 -286 -182zM709 1270q27 72 53.5 185.5t38.5 195.5h184v-23q-18 -74 -72.5 -192.5t-103.5 -194.5h-100v29z" />
-<glyph unicode="&#x3d1;" horiz-adv-x="1274" d="M1110 846q4 -46 4 -111q0 -353 -144 -554t-403 -201q-393 0 -393 344q0 57 16 180q15 122 15 145q0 47 -18 64.5t-50 17.5q-25 0 -52 -7.5t-42 -16.5l-33 118q83 39 178 39q88 0 134.5 -46.5t46.5 -139.5q0 -35 -15 -166q-16 -132 -16 -190q0 -207 233 -207 q375 0 375 624q0 63 -4 107q-223 2 -378.5 54.5t-235.5 146.5t-80 225q0 144 91 225.5t259 81.5q208 0 336 -153.5t170 -450.5h143v-129h-137zM934 975q-28 211 -119.5 339t-214.5 128q-93 0 -141.5 -47.5t-48.5 -122.5q0 -141 137.5 -218t386.5 -79z" />
-<glyph unicode="&#x3d2;" horiz-adv-x="1157" d="M569 717q122 291 192.5 446.5t109 209.5t84.5 78t104 24q48 0 88 -15v-135q-26 6 -57 6q-40 0 -69.5 -28t-72.5 -108.5t-105 -206.5t-112.5 -244t-81.5 -203v-541h-172v559l-477 903h186z" />
-<glyph unicode="&#x3d6;" horiz-adv-x="1720" d="M553 -20q-186 0 -285.5 115.5t-99.5 355.5t135 503h-285v74l142 68h1495v-142h-250q117 -252 117 -503q0 -240 -100 -355.5t-285 -115.5q-221 0 -289 182h-8q-68 -182 -287 -182zM467 954q-63 -132 -96 -261t-33 -232q0 -174 54 -258t171 -84q93 0 147 71.5t54 196.5v188 h162v-188q0 -122 53.5 -195t146.5 -73q117 0 171.5 84.5t54.5 257.5q0 254 -111 493h-774z" />
-<glyph unicode="&#x400;" d="M201 0zM1016 0h-815v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152zM746 1579h-110q-65 52 -154 148t-129 159v21h203q32 -69 89 -159.5t101 -143.5v-25z" />
-<glyph unicode="&#x401;" d="M201 0zM1016 0h-815v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152zM348 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM729 1731q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5 t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x402;" horiz-adv-x="1503" d="M975 -20q-96 0 -150 22v150q55 -19 146 -19q101 0 153 62t52 174v131q0 128 -65.5 184.5t-205.5 56.5h-381v-741h-170v1311h-336v151h951v-151h-445v-418h396q205 0 315.5 -95.5t110.5 -273.5v-143q0 -190 -98 -295.5t-273 -105.5z" />
-<glyph unicode="&#x403;" horiz-adv-x="1065" d="M201 0zM1016 1462v-153h-645v-1309h-170v1462h815zM483 1604q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x404;" horiz-adv-x="1309" d="M834 1331q-226 0 -360.5 -125t-164.5 -366h723v-150h-727q10 -274 143.5 -416.5t382.5 -142.5q162 0 363 55v-149q-161 -57 -387 -57q-332 0 -507 194t-175 559q0 351 188.5 551.5t522.5 200.5q237 0 415 -88l-71 -148q-169 82 -346 82z" />
-<glyph unicode="&#x405;" horiz-adv-x="1124" d="M106 0zM1026 389q0 -193 -140 -301t-380 -108q-260 0 -400 67v164q90 -38 196 -60t210 -22q170 0 256 64.5t86 179.5q0 76 -30.5 124.5t-102 89.5t-217.5 93q-204 73 -291.5 173t-87.5 261q0 169 127 269t336 100q218 0 401 -80l-53 -148q-181 76 -352 76 q-135 0 -211 -58t-76 -161q0 -76 28 -124.5t94.5 -89t203.5 -89.5q230 -82 316.5 -176t86.5 -244z" />
-<glyph unicode="&#x406;" horiz-adv-x="571" d="M201 0zM201 0v1462h170v-1462h-170z" />
-<glyph unicode="&#x407;" horiz-adv-x="571" d="M5 0zM201 0v1462h170v-1462h-170zM5 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM386 1731q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x408;" horiz-adv-x="547" d="M0 0zM-12 -385q-94 0 -148 27v145q71 -20 148 -20q99 0 150.5 60t51.5 173v1462h170v-1448q0 -190 -96 -294.5t-276 -104.5z" />
-<glyph unicode="&#x409;" horiz-adv-x="1903" d="M1827 426q0 -206 -137.5 -316t-397.5 -110h-327v1311h-365q-57 -440 -99 -701t-82 -386.5t-109.5 -186t-176.5 -60.5q-69 0 -133 25v143q50 -26 113 -26q48 0 80.5 31t54 82.5t49 176.5t61.5 348t99 705h678v-624h122q570 0 570 -412zM1135 147h133q198 0 289.5 69.5 t91.5 209.5q0 138 -96 200t-316 62h-102v-541z" />
-<glyph unicode="&#x40a;" horiz-adv-x="1952" d="M1876 426q0 -206 -136 -316t-397 -110h-329v688h-643v-688h-170v1462h170v-622h643v622h172v-624h121q569 0 569 -412zM1186 147h133q196 0 288.5 69.5t92.5 209.5q0 137 -96.5 199.5t-315.5 62.5h-102v-541z" />
-<glyph unicode="&#x40b;" horiz-adv-x="1503" d="M524 893h400q205 0 313.5 -94t108.5 -275v-524h-170v502q0 126 -62.5 182.5t-202.5 56.5h-387v-741h-170v1311h-336v151h1014v-151h-508v-418z" />
-<glyph unicode="&#x40c;" horiz-adv-x="1253" d="M201 0zM1253 0h-206l-676 741v-741h-170v1462h170v-708l659 708h195l-647 -710zM555 1604q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x40d;" horiz-adv-x="1561" d="M203 0zM203 1462h159v-813q0 -225 -14 -407h8l820 1220h186v-1462h-160v805q0 201 17 422h-9l-821 -1227h-186v1462zM890 1579h-110q-65 52 -154 148t-129 159v21h203q32 -69 89 -159.5t101 -143.5v-25z" />
-<glyph unicode="&#x40e;" horiz-adv-x="1272" d="M27 0zM293 -20q-111 0 -195 30v166q93 -43 189 -43q110 0 176.5 50.5t132.5 189.5l-569 1089h188l432 -831q25 -49 39 -96h8q28 84 39 106l359 821h180l-467 -1046q-84 -187 -151.5 -272t-152 -124.5t-208.5 -39.5zM652 1579q-185 0 -270 71.5t-95 235.5h156 q9 -104 54.5 -145t158.5 -41q103 0 152.5 44t60.5 142h157q-12 -158 -101 -232.5t-273 -74.5z" />
-<glyph unicode="&#x40f;" horiz-adv-x="1493" d="M1292 0h-465v-381h-176v381h-450v1462h170v-1308h751v1308h170v-1462z" />
-<glyph unicode="&#x410;" horiz-adv-x="1296" d="M0 0zM1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473z" />
-<glyph unicode="&#x411;" horiz-adv-x="1255" d="M1149 426q0 -218 -129.5 -322t-390.5 -104h-428v1462h862v-151h-692v-473h227q193 0 314 -44.5t179 -131.5t58 -236zM371 147h239q190 0 276.5 65t86.5 214q0 142 -88 202t-307 60h-207v-541z" />
-<glyph unicode="&#x412;" horiz-adv-x="1327" d="M201 0zM201 1462h413q291 0 421 -87t130 -275q0 -130 -72.5 -214.5t-211.5 -109.5v-10q333 -57 333 -350q0 -196 -132.5 -306t-370.5 -110h-510v1462zM371 836h280q180 0 259 56.5t79 190.5q0 123 -88 177.5t-280 54.5h-250v-479zM371 692v-547h305q177 0 266.5 68.5 t89.5 214.5q0 136 -91.5 200t-278.5 64h-291z" />
-<glyph unicode="&#x413;" horiz-adv-x="1065" d="M201 0zM1016 1462v-153h-645v-1309h-170v1462h815z" />
-<glyph unicode="&#x414;" horiz-adv-x="1399" d="M1354 -381h-162v381h-1016v-381h-162v535h113q154 259 263.5 630t121.5 678h657v-1308h185v-535zM999 154v1155h-333q-18 -242 -121 -581.5t-240 -573.5h694z" />
-<glyph unicode="&#x415;" d="M201 0zM1016 0h-815v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152z" />
-<glyph unicode="&#x416;" horiz-adv-x="1729" d="M598 752l-575 710h190l569 -708v708h164v-708l570 708h190l-576 -708l594 -754h-196l-582 741v-741h-164v741l-581 -741h-199z" />
-<glyph unicode="&#x417;" horiz-adv-x="1190" d="M1049 1120q0 -144 -91.5 -234t-252.5 -114v-8q183 -25 277.5 -115t94.5 -235q0 -205 -153 -319.5t-432 -114.5q-255 0 -418 79v158q96 -46 207.5 -71t214.5 -25q198 0 299.5 75t101.5 216q0 134 -112.5 203t-335.5 69h-218v143h209q205 0 317.5 73.5t112.5 205.5 q0 107 -81 171t-218 64q-110 0 -199 -25t-206 -99l-84 114q101 75 226.5 113.5t260.5 38.5q225 0 352.5 -98.5t127.5 -264.5z" />
-<glyph unicode="&#x418;" horiz-adv-x="1561" d="M203 1462h159v-813q0 -225 -14 -407h8l820 1220h186v-1462h-160v805q0 201 17 422h-9l-821 -1227h-186v1462z" />
-<glyph unicode="&#x419;" horiz-adv-x="1561" d="M203 0zM203 1462h159v-813q0 -225 -14 -407h8l820 1220h186v-1462h-160v805q0 201 17 422h-9l-821 -1227h-186v1462zM809 1579q-185 0 -270 71.5t-95 235.5h156q9 -104 54.5 -145t158.5 -41q103 0 152.5 44t60.5 142h157q-12 -158 -101 -232.5t-273 -74.5z" />
-<glyph unicode="&#x41a;" horiz-adv-x="1253" d="M1253 0h-206l-676 741v-741h-170v1462h170v-708l659 708h195l-647 -710z" />
-<glyph unicode="&#x41b;" horiz-adv-x="1442" d="M1241 0h-170v1311h-475l-31 -240q-61 -479 -107.5 -700.5t-122.5 -308.5t-202 -85q-74 0 -133 25v143q54 -26 113 -26q53 0 92.5 43.5t70 151t77 408t102.5 740.5h786v-1462z" />
-<glyph unicode="&#x41c;" horiz-adv-x="1849" d="M201 0zM848 0l-496 1296h-8q14 -154 14 -366v-930h-157v1462h256l463 -1206h8l467 1206h254v-1462h-170v942q0 162 14 352h-8l-500 -1294h-137z" />
-<glyph unicode="&#x41d;" horiz-adv-x="1511" d="M201 0zM1311 0h-170v688h-770v-688h-170v1462h170v-622h770v622h170v-1462z" />
-<glyph unicode="&#x41e;" horiz-adv-x="1595" d="M125 0zM1470 733q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5 t-126.5 -446.5z" />
-<glyph unicode="&#x41f;" horiz-adv-x="1493" d="M201 0zM1292 0h-170v1311h-751v-1311h-170v1462h1091v-1462z" />
-<glyph unicode="&#x420;" horiz-adv-x="1233" d="M201 0zM1128 1036q0 -222 -151.5 -341.5t-433.5 -119.5h-172v-575h-170v1462h379q548 0 548 -426zM371 721h153q226 0 327 73t101 234q0 145 -95 216t-296 71h-190v-594z" />
-<glyph unicode="&#x421;" horiz-adv-x="1292" d="M125 0zM827 1331q-241 0 -380.5 -160.5t-139.5 -439.5q0 -287 134.5 -443.5t383.5 -156.5q153 0 349 55v-149q-152 -57 -375 -57q-323 0 -498.5 196t-175.5 557q0 226 84.5 396t244 262t375.5 92q230 0 402 -84l-72 -146q-166 78 -332 78z" />
-<glyph unicode="&#x422;" horiz-adv-x="1133" d="M18 0zM651 0h-170v1311h-463v151h1096v-151h-463v-1311z" />
-<glyph unicode="&#x423;" horiz-adv-x="1272" d="M293 -20q-111 0 -195 30v166q93 -43 189 -43q110 0 176.5 50.5t132.5 189.5l-569 1089h188l432 -831q25 -49 39 -96h8q28 84 39 106l359 821h180l-467 -1046q-84 -187 -151.5 -272t-152 -124.5t-208.5 -39.5z" />
-<glyph unicode="&#x424;" horiz-adv-x="1634" d="M106 0zM731 1483h172v-180h70q171 0 296.5 -68t192 -192t66.5 -283q0 -166 -74.5 -295.5t-204 -194.5t-305.5 -65h-41v-225h-172v225h-45q-176 0 -305 66t-202 196t-73 291q0 158 67.5 282t193.5 193.5t297 69.5h67v180zM903 348h25q201 0 312.5 109.5t111.5 304.5 q0 185 -103 290t-288 105h-58v-809zM731 1157h-57q-182 0 -286.5 -106t-104.5 -289q0 -197 111 -305.5t313 -108.5h24v809z" />
-<glyph unicode="&#x425;" horiz-adv-x="1182" d="M8 0zM1174 0h-193l-393 643l-400 -643h-180l486 764l-453 698h188l363 -579l366 579h181l-453 -692z" />
-<glyph unicode="&#x426;" horiz-adv-x="1509" d="M1292 154h172v-535h-161v381h-1102v1462h170v-1308h751v1308h170v-1308z" />
-<glyph unicode="&#x427;" horiz-adv-x="1423" d="M1223 0h-170v604q-149 -53 -248 -72.5t-205 -19.5q-207 0 -318.5 95t-111.5 274v581h170v-561q0 -121 63.5 -179t206.5 -58q97 0 185.5 14.5t257.5 69.5v714h170v-1462z" />
-<glyph unicode="&#x428;" horiz-adv-x="2114" d="M1913 0h-1712v1462h170v-1308h600v1308h170v-1308h600v1308h172v-1462z" />
-<glyph unicode="&#x429;" horiz-adv-x="2116" d="M201 0v1462h170v-1308h583v1308h172v-1308h584v1308h170v-1308h172v-535h-162v381h-1689z" />
-<glyph unicode="&#x42a;" horiz-adv-x="1409" d="M1303 426q0 -206 -129.5 -316t-378.5 -110h-441v1311h-336v151h506v-624h244q261 0 398 -102.5t137 -309.5zM524 147h252q181 0 265.5 69.5t84.5 209.5q0 136 -87.5 199t-290.5 63h-224v-541z" />
-<glyph unicode="&#x42b;" horiz-adv-x="1747" d="M201 0v1462h170v-624h239q261 0 398 -102.5t137 -309.5q0 -206 -129.5 -316t-378.5 -110h-436zM371 145h247q181 0 266 70.5t85 210.5q0 137 -89.5 198.5t-289.5 61.5h-219v-541zM1546 0h-170v1462h170v-1462z" />
-<glyph unicode="&#x42c;" horiz-adv-x="1317" d="M1210 426q0 -203 -135.5 -314.5t-386.5 -111.5h-487v1462h170v-624h291q267 0 407.5 -105.5t140.5 -306.5zM371 147h299q364 0 364 279q0 135 -93.5 198.5t-299.5 63.5h-270v-541z" />
-<glyph unicode="&#x42d;" horiz-adv-x="1290" d="M467 1331q-172 0 -334 -76l-72 144q172 84 408 84q217 0 373.5 -88t237.5 -251t81 -384q0 -376 -182 -578t-524 -202q-227 0 -383 57v149q83 -21 169 -38t185 -17q271 0 409 144.5t146 416.5h-719v152h717q-22 229 -157.5 358t-354.5 129z" />
-<glyph unicode="&#x42e;" horiz-adv-x="2150" d="M2023 733q0 -354 -170.5 -553.5t-474.5 -199.5q-301 0 -471.5 183.5t-181.5 524.5h-354v-688h-170v1462h170v-622h356q23 311 191.5 478t455.5 167q307 0 478 -200.5t171 -551.5zM903 733q0 -296 119 -450t350 -154q234 0 352.5 153t118.5 451t-117.5 449t-349.5 151 q-233 0 -353 -152.5t-120 -447.5z" />
-<glyph unicode="&#x42f;" horiz-adv-x="1303" d="M635 610l-383 -610h-201l410 639q-161 51 -234 154.5t-73 261.5q0 196 135.5 301.5t410.5 105.5h402v-1462h-170v610h-297zM932 1315h-227q-183 0 -278 -63t-95 -205q0 -291 379 -291h221v559z" />
-<glyph unicode="&#x430;" d="M94 0zM850 0l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123zM475 117q155 0 243.5 85 t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5q0 -90 54.5 -137t152.5 -47z" />
-<glyph unicode="&#x431;" horiz-adv-x="1221" d="M119 657q0 360 106 561.5t336 251.5q286 61 504 99l31 -146q-347 -58 -496 -92q-145 -33 -217.5 -156t-79.5 -335h12q62 84 160 132t205 48q202 0 315 -131t113 -363q0 -257 -131 -401.5t-365 -144.5q-231 0 -362 177t-131 500zM627 119q305 0 305 389q0 371 -277 371 q-76 0 -146.5 -31.5t-129 -83.5t-90.5 -107q0 -263 83 -400.5t255 -137.5z" />
-<glyph unicode="&#x432;" horiz-adv-x="1165" d="M1065 821q0 -107 -61.5 -162.5t-172.5 -74.5v-9q140 -19 204.5 -82t64.5 -174q0 -153 -112.5 -236t-328.5 -83h-483v1096h481q408 0 408 -275zM934 330q0 89 -67.5 129.5t-223.5 40.5h-301v-361h305q287 0 287 191zM903 805q0 80 -61.5 113.5t-186.5 33.5h-313v-309h281 q154 0 217 38t63 124z" />
-<glyph unicode="&#x433;" horiz-adv-x="877" d="M836 954h-494v-954h-166v1096h660v-142z" />
-<glyph unicode="&#x434;" horiz-adv-x="1171" d="M1128 -379h-161v379h-766v-379h-160v522h86q134 182 210 427t79 526h555v-953h157v-522zM811 143v822h-246q-13 -222 -85.5 -449.5t-180.5 -372.5h512z" />
-<glyph unicode="&#x435;" horiz-adv-x="1149" d="M115 0zM639 -20q-243 0 -383.5 148t-140.5 411q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5zM594 977q-132 0 -210.5 -86t-92.5 -238h573q0 157 -70 240.5 t-200 83.5z" />
-<glyph unicode="&#x436;" horiz-adv-x="1507" d="M676 1094h153v-531l453 531h182l-458 -531l497 -563h-192l-482 555v-555h-153v555l-481 -555h-191l496 563l-457 531h182l451 -531v531z" />
-<glyph unicode="&#x437;" horiz-adv-x="989" d="M385 641q311 0 311 172q0 162 -252 162q-77 0 -140 -14t-165 -56l-59 135q170 76 371 76q189 0 298 -77.5t109 -211.5q0 -184 -205 -241v-8q126 -37 184 -105.5t58 -171.5q0 -152 -122.5 -236.5t-338.5 -84.5q-237 0 -366 71v152q183 -86 370 -86q144 0 217.5 49.5 t73.5 142.5q0 191 -311 191h-152v141h119z" />
-<glyph unicode="&#x438;" horiz-adv-x="1298" d="M332 1096v-695l-7 -182l-3 -57l593 934h207v-1096h-155v670l3 132l5 130l-592 -932h-207v1096h156z" />
-<glyph unicode="&#x439;" horiz-adv-x="1298" d="M176 0zM332 1096v-695l-7 -182l-3 -57l593 934h207v-1096h-155v670l3 132l5 130l-592 -932h-207v1096h156zM645 1241q-185 0 -270 71.5t-95 235.5h156q9 -104 54.5 -145t158.5 -41q103 0 152.5 44t60.5 142h157q-12 -158 -101 -232.5t-273 -74.5z" />
-<glyph unicode="&#x43a;" horiz-adv-x="1063" d="M815 1096h182l-473 -529l512 -567h-194l-500 555v-555h-166v1096h166v-533z" />
-<glyph unicode="&#x43b;" horiz-adv-x="1169" d="M993 0h-168v954h-329q-27 -356 -75 -565t-124.5 -306t-194.5 -97q-54 0 -86 12v123q22 -6 50 -6q115 0 183 243t103 738h641v-1096z" />
-<glyph unicode="&#x43c;" horiz-adv-x="1505" d="M745 160l31 93l43 118l297 723h211v-1094h-147v905l-20 -58l-58 -153l-283 -694h-139l-283 696q-53 134 -73 209v-905h-148v1094h203l287 -695q43 -110 79 -239z" />
-<glyph unicode="&#x43d;" horiz-adv-x="1298" d="M342 1096v-459h614v459h166v-1096h-166v494h-614v-494h-166v1096h166z" />
-<glyph unicode="&#x43e;" horiz-adv-x="1237" d="M115 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414zM287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319z" />
-<glyph unicode="&#x43f;" horiz-adv-x="1272" d="M342 0h-166v1096h920v-1096h-168v952h-586v-952z" />
-<glyph unicode="&#x440;" horiz-adv-x="1255" d="M176 0zM686 -20q-107 0 -195.5 39.5t-148.5 121.5h-12q12 -96 12 -182v-451h-166v1588h135l23 -150h8q64 90 149 130t195 40q218 0 336.5 -149t118.5 -418q0 -270 -120.5 -419.5t-334.5 -149.5zM662 975q-168 0 -243 -93t-77 -296v-37q0 -231 77 -330.5t247 -99.5 q142 0 222.5 115t80.5 317q0 205 -80.5 314.5t-226.5 109.5z" />
-<glyph unicode="&#x441;" horiz-adv-x="975" d="M115 0zM614 -20q-238 0 -368.5 146.5t-130.5 414.5q0 275 132.5 425t377.5 150q79 0 158 -17t124 -40l-51 -141q-55 22 -120 36.5t-115 14.5q-334 0 -334 -426q0 -202 81.5 -310t241.5 -108q137 0 281 59v-147q-110 -57 -277 -57z" />
-<glyph unicode="&#x442;" horiz-adv-x="956" d="M915 954h-356v-954h-166v954h-352v142h874v-142z" />
-<glyph unicode="&#x443;" horiz-adv-x="1032" d="M2 0zM2 1096h178l240 -625q79 -214 98 -309h8q13 51 54.5 174.5t271.5 759.5h178l-471 -1248q-70 -185 -163.5 -262.5t-229.5 -77.5q-76 0 -150 17v133q55 -12 123 -12q171 0 244 192l61 156z" />
-<glyph unicode="&#x444;" horiz-adv-x="1464" d="M1350 549q0 -249 -141.5 -396.5t-395.5 -168.5v-476h-164v476q-248 19 -392 170t-144 395q0 249 143.5 396t398.5 167v444h158v-444q251 -23 394 -173t143 -390zM287 549q0 -192 88 -301t280 -127v852q-185 -17 -276.5 -120.5t-91.5 -303.5zM1178 549q0 383 -365 422 v-850q190 19 277.5 128t87.5 300z" />
-<glyph unicode="&#x445;" horiz-adv-x="1073" d="M39 0zM440 561l-381 535h189l289 -420l288 420h187l-381 -535l401 -561h-188l-307 444l-310 -444h-188z" />
-<glyph unicode="&#x446;" horiz-adv-x="1282" d="M1245 -379h-166v379h-903v1096h166v-953h582v953h166v-953h155v-522z" />
-<glyph unicode="&#x447;" horiz-adv-x="1245" d="M322 1096v-400q0 -192 219 -192q91 0 174 28t188 95v469h166v-1096h-166v496q-105 -72 -194.5 -101.5t-202.5 -29.5q-164 0 -257 86t-93 233v412h166z" />
-<glyph unicode="&#x448;" horiz-adv-x="1823" d="M993 143h486v953h168v-1096h-1471v1096h166v-953h485v953h166v-953z" />
-<glyph unicode="&#x449;" horiz-adv-x="1837" d="M993 143h486v951h166v-951h157v-520h-168v377h-1458v1094h166v-951h485v951h166v-951z" />
-<glyph unicode="&#x44a;" horiz-adv-x="1423" d="M557 643h313q224 0 331.5 -77t107.5 -232q0 -166 -111.5 -250t-331.5 -84h-475v954h-350v142h516v-453zM1145 324q0 93 -62 134.5t-219 41.5h-307v-361h313q275 0 275 185z" />
-<glyph unicode="&#x44b;" horiz-adv-x="1577" d="M342 643h299q209 0 309.5 -77.5t100.5 -231.5q0 -165 -106.5 -249.5t-313.5 -84.5h-455v1096h166v-453zM1401 0h-166v1096h166v-1096zM342 500v-361h281q264 0 264 185q0 92 -61 134t-208 42h-276z" />
-<glyph unicode="&#x44c;" horiz-adv-x="1212" d="M342 643h338q420 0 420 -309q0 -162 -109.5 -248t-320.5 -86h-494v1096h166v-453zM342 500v-361h320q132 0 202 46t70 139q0 91 -64.5 133.5t-212.5 42.5h-315z" />
-<glyph unicode="&#x44d;" horiz-adv-x="1008" d="M342 -20q-167 0 -285 57v147q60 -23 130 -41t161 -18q174 0 268.5 93t104.5 278h-555v141h553q-16 172 -100.5 252t-245.5 80q-103 0 -254 -54l-47 140q55 26 137 43.5t162 17.5q256 0 389 -146.5t133 -422.5q0 -269 -144.5 -418t-406.5 -149z" />
-<glyph unicode="&#x44e;" horiz-adv-x="1702" d="M1587 549q0 -269 -128.5 -419t-352.5 -150q-213 0 -338 133.5t-139 380.5h-287v-494h-166v1096h166v-459h289q20 228 146 353.5t333 125.5q220 0 348.5 -152.5t128.5 -414.5zM801 549q0 -211 73 -320.5t234 -109.5q158 0 232.5 106.5t74.5 323.5q0 210 -73 318t-234 108 t-234 -108t-73 -318z" />
-<glyph unicode="&#x44f;" horiz-adv-x="1137" d="M231 0h-194l315 463q-127 28 -194.5 108.5t-67.5 202.5q0 150 101 236t282 86h488v-1096h-166v438h-277zM252 772q0 -190 276 -190h267v370h-301q-242 0 -242 -180z" />
-<glyph unicode="&#x450;" horiz-adv-x="1149" d="M115 0zM639 -20q-243 0 -383.5 148t-140.5 411q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5zM594 977q-132 0 -210.5 -86t-92.5 -238h573q0 157 -70 240.5 t-200 83.5zM713 1241h-110q-65 52 -154 148t-129 159v21h203q32 -69 89 -159.5t101 -143.5v-25z" />
-<glyph unicode="&#x451;" horiz-adv-x="1149" d="M115 0zM639 -20q-243 0 -383.5 148t-140.5 411q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5zM594 977q-132 0 -210.5 -86t-92.5 -238h573q0 157 -70 240.5 t-200 83.5zM317 1393q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM698 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x452;" horiz-adv-x="1257" d="M815 -492q-79 0 -131 25v137q58 -20 113 -20q129 0 129 170v850q0 134 -61 200t-191 66q-173 0 -251.5 -94t-78.5 -305v-537h-168v1243h-156v127h156v186h166v-186h401v-127h-401v-196q0 -84 -8 -140h10q49 79 139.5 124.5t206.5 45.5q201 0 301.5 -95.5t100.5 -305.5 v-842q0 -156 -68.5 -241t-208.5 -85z" />
-<glyph unicode="&#x453;" horiz-adv-x="877" d="M176 0zM836 954h-494v-954h-166v1096h660v-142zM378 1266q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x454;" horiz-adv-x="1008" d="M633 -20q-248 0 -383 145.5t-135 417.5q0 275 137.5 424t388.5 149q82 0 161 -16t136 -41l-49 -141q-143 51 -252 51q-164 0 -249 -81.5t-101 -250.5h553v-141h-555q9 -190 94 -280.5t252 -90.5q140 0 291 59v-147q-116 -57 -289 -57z" />
-<glyph unicode="&#x455;" horiz-adv-x="977" d="M106 0zM883 299q0 -153 -114 -236t-320 -83q-218 0 -340 69v154q79 -40 169.5 -63t174.5 -23q130 0 200 41.5t70 126.5q0 64 -55.5 109.5t-216.5 107.5q-153 57 -217.5 99.5t-96 96.5t-31.5 129q0 134 109 211.5t299 77.5q177 0 346 -72l-59 -135q-165 68 -299 68 q-118 0 -178 -37t-60 -102q0 -44 22.5 -75t72.5 -59t192 -81q195 -71 263.5 -143t68.5 -181z" />
-<glyph unicode="&#x456;" horiz-adv-x="518" d="M162 0zM342 0h-166v1096h166v-1096zM162 1393q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5z" />
-<glyph unicode="&#x457;" horiz-adv-x="518" d="M0 0zM342 0h-166v1096h166v-1096zM-20 1393q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM361 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x458;" horiz-adv-x="518" d="M0 0zM43 -492q-95 0 -154 25v135q69 -20 136 -20q78 0 114.5 42.5t36.5 129.5v1276h166v-1264q0 -324 -299 -324zM162 1393q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5z" />
-<glyph unicode="&#x459;" horiz-adv-x="1714" d="M944 643h244q211 0 312.5 -77.5t101.5 -231.5q0 -334 -437 -334h-411v954h-258q-40 -518 -130.5 -743t-261.5 -225q-56 0 -88 12v123q22 -6 50 -6q115 0 183 243t103 738h592v-453zM1436 324q0 91 -62.5 133.5t-220.5 42.5h-231v-361h237q277 0 277 185z" />
-<glyph unicode="&#x45a;" horiz-adv-x="1815" d="M1024 1094v-453h256q217 0 318.5 -76.5t101.5 -230.5q0 -334 -434 -334h-416v494h-502v-494h-172v1094h172v-457h506v457h170zM1020 500v-361h240q276 0 276 185q0 92 -64 134t-217 42h-235z" />
-<glyph unicode="&#x45b;" horiz-adv-x="1257" d="M20 0zM926 0v670q0 134 -61 200t-191 66q-174 0 -253 -93t-79 -306v-537h-166v1243h-156v127h156v186h166v-186h449v-127h-449v-196q0 -84 -8 -140h10q49 79 139.5 124.5t206.5 45.5q201 0 301.5 -95.5t100.5 -305.5v-676h-166z" />
-<glyph unicode="&#x45c;" horiz-adv-x="1063" d="M176 0zM815 1096h182l-473 -529l512 -567h-194l-500 555v-555h-166v1096h166v-533zM444 1266q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x45d;" horiz-adv-x="1298" d="M176 0zM332 1096v-695l-7 -182l-3 -57l593 934h207v-1096h-155v670l3 132l5 130l-592 -932h-207v1096h156zM750 1241h-110q-65 52 -154 148t-129 159v21h203q32 -69 89 -159.5t101 -143.5v-25z" />
-<glyph unicode="&#x45e;" horiz-adv-x="1032" d="M2 0zM2 1096h178l240 -625q79 -214 98 -309h8q13 51 54.5 174.5t271.5 759.5h178l-471 -1248q-70 -185 -163.5 -262.5t-229.5 -77.5q-76 0 -150 17v133q55 -12 123 -12q171 0 244 192l61 156zM511 1241q-185 0 -270 71.5t-95 235.5h156q9 -104 54.5 -145t158.5 -41 q103 0 152.5 44t60.5 142h157q-12 -158 -101 -232.5t-273 -74.5z" />
-<glyph unicode="&#x45f;" horiz-adv-x="1272" d="M559 0h-383v1094h166v-951h586v951h166v-1094h-369v-377h-166v377z" />
-<glyph unicode="&#x460;" horiz-adv-x="2071" d="M1444 1327q-60 0 -107 -20.5t-92 -51.5l-69 146q126 80 276 80q228 0 356.5 -188t128.5 -527q0 -371 -141.5 -578.5t-396.5 -207.5q-108 0 -194 22.5t-169 73.5h-8q-80 -50 -164.5 -73t-191.5 -23q-256 0 -397.5 205.5t-141.5 580.5q0 339 127.5 527t355.5 188 q153 0 277 -80l-70 -146q-45 31 -91.5 51.5t-106.5 20.5q-147 0 -229.5 -148.5t-82.5 -414.5q0 -301 103.5 -468t290.5 -167q139 0 241 76v457h170v-457q102 -76 244 -76q187 0 290 165.5t103 469.5q0 267 -82.5 415t-228.5 148z" />
-<glyph unicode="&#x461;" horiz-adv-x="1677" d="M807 457q-10 -26 -20 -51.5t-189 -405.5h-213l-385 1096h172l246 -695q32 -93 78 -282h8q19 53 56 134.5t179 373.5l-172 469h178q265 -769 287.5 -841t32.5 -116h8q173 184 249.5 401.5t76.5 555.5h166q0 -362 -97.5 -614.5t-316.5 -481.5h-182l-125 346q-33 92 -37 111 z" />
-<glyph unicode="&#x462;" horiz-adv-x="1382" d="M23 1274h319v282h172v-282h418v-148h-418v-288h201q561 0 561 -412q0 -208 -132.5 -317t-393.5 -109h-408v1126h-319v148zM514 145h213q192 0 282.5 68.5t90.5 212.5q0 138 -93 199t-311 61h-182v-541z" />
-<glyph unicode="&#x463;" horiz-adv-x="1294" d="M424 1096h344v-140h-344v-315h319q437 0 437 -307q0 -166 -111.5 -250t-331.5 -84h-479v956h-235v140h235v223h166v-223zM424 500v-361h305q287 0 287 185q0 92 -67.5 134t-223.5 42h-301z" />
-<glyph unicode="&#x464;" horiz-adv-x="1882" d="M1423 1331q-227 0 -357 -125t-161 -366h703v-150h-707q8 -273 140.5 -416t379.5 -143q154 0 348 55v-149q-152 -57 -374 -57q-319 0 -492.5 184t-181.5 524h-350v-688h-170v1462h170v-622h356q30 307 214.5 474t488.5 169q213 0 395 -92l-72 -146q-100 48 -178.5 67 t-151.5 19z" />
-<glyph unicode="&#x465;" horiz-adv-x="1507" d="M1143 -20q-235 0 -369 133t-145 381h-287v-494h-166v1096h166v-461h289q24 235 158.5 358t357.5 123q81 0 158 -16t131 -41l-50 -141q-138 51 -239 51q-163 0 -246.5 -82t-99.5 -252h536v-141h-538q9 -188 93.5 -278.5t248.5 -90.5q61 0 120.5 11t157.5 48v-147 q-110 -57 -276 -57z" />
-<glyph unicode="&#x466;" horiz-adv-x="1389" d="M920 682h-148v-682h-156v682h-149l-289 -682h-178l616 1462h158l615 -1462h-183zM530 831h332l-82 207q-56 144 -86 244q-24 -98 -88 -262z" />
-<glyph unicode="&#x467;" horiz-adv-x="1155" d="M680 1096l465 -1096h-172l-207 489h-113v-489h-151v489h-115l-205 -489h-172l465 1096h205zM442 629h271q-43 108 -71 177t-62 175h-9q-28 -92 -129 -352z" />
-<glyph unicode="&#x468;" horiz-adv-x="1886" d="M1413 688h-143v-688h-154v688h-147l-285 -688h-186l290 688h-417v-688h-170v1462h170v-622h481l262 622h158l614 -1462h-188zM1032 840h318q-118 309 -132 352t-26 90q-19 -67 -36.5 -119t-123.5 -323z" />
-<glyph unicode="&#x469;" horiz-adv-x="1569" d="M1094 1096l462 -1096h-170l-208 494h-113v-494h-152v494h-110l-209 -494h-172l209 494h-289v-494h-166v1096h166v-461h350l197 461h205zM993 981h-8q-10 -34 -26 -81.5t-105 -264.5h268z" />
-<glyph unicode="&#x46a;" horiz-adv-x="1477" d="M1321 1462v-133l-422 -495q118 -6 195 -42t127 -105.5t100 -233.5l133 -453h-174l-137 457q-35 111 -69 159t-84.5 67t-139.5 19h-27v-702h-170v702h-26q-91 0 -140.5 -19.5t-82 -67t-64.5 -158.5l-135 -457h-185l136 453q47 159 96.5 230t124 107.5t192.5 43.5l-411 495 v133h1163zM1116 1309h-758l379 -455z" />
-<glyph unicode="&#x46b;" horiz-adv-x="1315" d="M1163 1096v-105l-338 -352q87 -7 142.5 -31t92 -64t61 -92.5t179.5 -451.5h-172l-133 336q-34 87 -63 122.5t-71 49.5t-118 14h-10v-522h-153v522h-11q-75 0 -116 -13t-69 -45t-67 -126l-135 -338h-170l131 336q24 61 48 113.5t60.5 92t91.5 64.5t142 33l-335 352v105 h1013zM950 956h-588l293 -319z" />
-<glyph unicode="&#x46c;" horiz-adv-x="1995" d="M1853 1462v-133l-419 -498q120 -6 196.5 -42t127 -108t95.5 -228l136 -453h-168l-138 457q-31 104 -66 153.5t-87.5 69.5t-147.5 20h-24v-700h-172v700h-25q-94 0 -144 -20t-83 -67.5t-66 -155.5l-135 -457h-178l135 446q55 184 111 242h-430v-688h-170v1462h170v-622 h727l-408 489v133h1163zM1651 1309h-758l379 -457z" />
-<glyph unicode="&#x46d;" horiz-adv-x="1733" d="M1585 1096v-105l-338 -354q88 -7 143.5 -31.5t92 -63.5t60.5 -91.5t179 -450.5h-172l-133 336q-34 86 -63 121t-72 49t-117 14h-10v-520h-154v520h-10q-75 0 -117 -13.5t-69.5 -45t-65.5 -123.5l-135 -338h-170l131 336q47 120 84 160h-307v-496h-166v1096h166v-459h565 l-336 354v105h1014zM1372 956h-588l293 -313z" />
-<glyph unicode="&#x46e;" horiz-adv-x="1192" d="M240 -137q0 -55 43.5 -80t132.5 -25q97 0 217 7q120 6 190 6q155 0 226 -39v-166q-80 51 -240 51q-68 0 -173 -5t-210 -5q-179 0 -271 62.5t-92 195.5q0 126 108.5 190.5t340.5 73.5q204 8 294.5 77t90.5 210q0 268 -448 268h-218v143h209q205 0 317.5 73.5t112.5 205.5 q0 107 -81 171t-218 64q-106 0 -199.5 -27.5t-203.5 -96.5l-86 114q168 114 358 142q-57 66 -174 187l-49 52v27h123q92 -59 223 -195q92 115 157.5 158t129.5 43q50 0 98 -14v-113q-24 10 -67 10q-44 0 -99.5 -41t-103.5 -112q178 -23 274.5 -117.5t96.5 -237.5 q0 -140 -95.5 -232t-265.5 -118v-8q186 -24 287.5 -113t101.5 -233q0 -208 -141.5 -314.5t-423.5 -115.5q-138 -5 -205 -32.5t-67 -90.5z" />
-<glyph unicode="&#x46f;" horiz-adv-x="989" d="M760 1358q51 0 96 -15v-112q-24 10 -65 10q-47 0 -98.5 -39.5t-96.5 -101.5q122 -28 192 -97t70 -176q0 -184 -211 -241v-8q248 -71 248 -273q0 -148 -121 -232t-346 -87q-93 -2 -147.5 -13.5t-78.5 -32.5t-24 -65q0 -49 37.5 -70.5t126.5 -21.5q86 0 208 5l175 5 q125 0 164 -39v-143q-21 19 -63 31t-97 12l-179 -5q-130 -5 -222 -5q-144 0 -223.5 59.5t-79.5 171.5q0 116 95 178.5t275 65.5q334 4 334 194q0 97 -78 142t-237 45h-148v141h119q311 0 311 172q0 162 -252 162q-74 0 -145.5 -17t-159.5 -53l-59 135q124 55 250 70 q-92 117 -195 215v27h123q75 -52 215 -189q88 110 155 152.5t132 42.5z" />
-<glyph unicode="&#x470;" horiz-adv-x="1630" d="M109 0zM899 0h-170v446h-45q-176 0 -303.5 61t-199.5 184.5t-72 287.5v483h174v-479q0 -188 103.5 -288.5t315.5 -100.5h27v868h170v-868h29q211 0 314.5 99t103.5 286v483h176v-481q0 -165 -72 -288.5t-201.5 -185t-304.5 -61.5h-45v-446z" />
-<glyph unicode="&#x471;" horiz-adv-x="1542" d="M164 0zM858 1554v-1431q188 15 289.5 130.5t101.5 319.5q0 120 -13 237.5t-50 285.5h166q63 -272 63 -516q0 -276 -142.5 -429t-414.5 -169v-474h-164v474q-264 9 -397 154t-133 417v543h166v-549q0 -195 90 -304t274 -122v1433h164z" />
-<glyph unicode="&#x472;" horiz-adv-x="1597" d="M1470 733q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552zM799 129q229 0 352.5 136.5t136.5 404.5h-981q13 -267 137.5 -404t354.5 -137zM801 1333q-224 0 -349.5 -129t-144.5 -385h979 q-17 254 -139 384t-346 130z" />
-<glyph unicode="&#x473;" horiz-adv-x="1237" d="M1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414zM618 119q158 0 240 92t92 283h-663q9 -186 89 -280.5t242 -94.5zM616 975q-156 0 -235 -86.5t-92 -253.5h659q-15 168 -95.5 254 t-236.5 86z" />
-<glyph unicode="&#x474;" horiz-adv-x="1282" d="M1249 1335q-59 0 -98 -51.5t-96 -232.5l-328 -1051h-197l-530 1462h180l338 -938q72 -199 107 -342q32 144 102 367l162 518q59 191 101 267t97 108.5t144 32.5q42 0 121 -19v-141q-56 20 -103 20z" />
-<glyph unicode="&#x475;" horiz-adv-x="1036" d="M406 0l-406 1096h174l225 -613q100 -268 119 -368h8q23 118 105 385l96 309q37 122 72.5 183.5t81 87.5t129.5 26q45 0 75 -10v-127q-29 8 -67 8q-47 0 -76 -42t-57 -134l-248 -801h-231z" />
-<glyph unicode="&#x476;" horiz-adv-x="1282" d="M0 0zM1249 1335q-59 0 -98 -51.5t-96 -232.5l-328 -1051h-197l-530 1462h180l338 -938q72 -199 107 -342q32 144 102 367l162 518q59 191 101 267t97 108.5t144 32.5q42 0 121 -19v-141q-56 20 -103 20zM907 1579h-96q-52 42 -140.5 143t-125.5 164v21h186 q28 -61 77.5 -148t98.5 -155v-25zM551 1579h-96q-56 44 -143 144t-124 163v21h187q28 -61 77.5 -148t98.5 -155v-25z" />
-<glyph unicode="&#x477;" horiz-adv-x="1036" d="M0 0zM406 0l-406 1096h174l225 -613q100 -268 119 -368h8q23 118 105 385l96 309q37 122 72.5 183.5t81 87.5t129.5 26q45 0 75 -10v-127q-29 8 -67 8q-47 0 -76 -42t-57 -134l-248 -801h-231zM792 1241h-96q-52 42 -140.5 143t-125.5 164v21h186q28 -61 77.5 -148 t98.5 -155v-25zM436 1241h-96q-56 44 -143 144t-124 163v21h187q28 -61 77.5 -148t98.5 -155v-25z" />
-<glyph unicode="&#x478;" horiz-adv-x="2476" d="M1364 733q0 -352 -163.5 -552.5t-455.5 -200.5q-297 0 -458.5 197.5t-161.5 557.5q0 358 161.5 554t461.5 196q291 0 453.5 -200t162.5 -552zM305 733q0 -297 111.5 -450.5t328.5 -153.5q218 0 328.5 152.5t110.5 451.5q0 297 -110 448.5t-326 151.5q-218 0 -330.5 -151 t-112.5 -449zM1440 1096h176l246 -629q78 -207 98 -309h8q11 44 52.5 169.5t269.5 768.5h176l-469 -1248q-69 -182 -163 -261t-230 -79q-76 0 -150 17v133q55 -12 121 -12q94 0 152.5 51.5t93.5 140.5l61 156z" />
-<glyph unicode="&#x479;" horiz-adv-x="2173" d="M115 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414zM287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319z M1143 1096h178l240 -625q79 -214 98 -309h8q13 51 54.5 174.5t271.5 759.5h178l-471 -1248q-70 -185 -163.5 -262.5t-229.5 -77.5q-76 0 -150 17v133q55 -12 123 -12q171 0 244 192l61 156z" />
-<glyph unicode="&#x47a;" horiz-adv-x="1677" d="M1552 733q0 -302 -151.5 -500.5t-415.5 -242.5q-26 -111 -145 -111q-124 0 -144 111q-268 41 -419.5 238t-151.5 507q0 305 149.5 499.5t421.5 238.5q20 108 144 108q121 0 143 -108q268 -44 418.5 -242.5t150.5 -497.5zM305 733q0 -244 101 -396.5t290 -193.5 q17 48 53.5 67t90.5 19q110 0 141 -86q189 41 290 193.5t101 396.5t-101 395.5t-290 190.5q-31 -88 -141 -88q-113 0 -144 86q-189 -39 -290 -189.5t-101 -394.5z" />
-<glyph unicode="&#x47b;" horiz-adv-x="1346" d="M1231 549q0 -233 -112 -377.5t-316 -181.5q-9 -54 -41 -76.5t-88 -22.5q-57 0 -87.5 21.5t-39.5 77.5q-203 36 -317.5 183t-114.5 376q0 233 112 377t320 180q8 56 39 77t88 21q56 0 88 -21.5t41 -78.5q202 -38 315 -184t113 -371zM287 549q0 -177 62.5 -282t199.5 -136 q12 42 42 59t83 17q103 0 127 -74q134 31 196 136t62 280q0 352 -260 414q-13 -42 -43.5 -58t-81.5 -16q-53 0 -83 16t-42 60q-137 -31 -199.5 -135.5t-62.5 -280.5z" />
-<glyph unicode="&#x47c;" horiz-adv-x="2046" d="M1442 1991v-121h-17q-84 0 -155 18t-131 39.5t-111 39.5t-94 18q-47 0 -77 -26t-30 -77v-16h-125v28q0 103 58 158t170 55q58 0 114 -18t115.5 -40t126 -40t144.5 -18h12zM702 129q88 0 173.5 33t146.5 96q55 -57 140.5 -93t178.5 -36q188 0 293 167t105 468 q0 267 -82.5 415t-229.5 148q-60 0 -107.5 -21.5t-90.5 -52.5l-70 146q121 82 275 82q228 0 356.5 -188t128.5 -527q0 -372 -144 -579t-403 -207q-104 0 -189 20t-161 68q-75 -45 -158.5 -66.5t-193.5 -21.5q-260 0 -402.5 206.5t-142.5 579.5q0 341 128.5 528t356.5 187 q154 0 275 -82l-70 -146q-43 31 -90 52.5t-107 21.5q-148 0 -230.5 -147.5t-82.5 -415.5q0 -303 105 -469t292 -166zM1155 1769q0 -162 -237 -223v72q120 41 120 94q0 20 -15.5 29t-33.5 17.5t-33.5 21.5t-15.5 41q0 73 92 73q56 0 89.5 -34t33.5 -91z" />
-<glyph unicode="&#x47d;" horiz-adv-x="1655" d="M1067 -20q-148 0 -242 65q-92 -65 -235 -65q-225 0 -350 145.5t-125 415.5q0 279 103.5 427t289.5 148q62 0 121.5 -16t99.5 -41l-57 -139q-89 51 -160 51q-116 0 -170.5 -107t-54.5 -321q0 -418 305 -418q123 0 235 80q62 -42 117.5 -61t122.5 -19q301 0 301 418 q0 214 -55 321t-170 107q-71 0 -160 -51l-57 139q40 25 99.5 41t121.5 16q187 0 290 -148.5t103 -426.5q0 -267 -123.5 -414t-349.5 -147zM1212 1681v-120h-16q-84 0 -155.5 18t-131.5 39t-110.5 39t-93.5 18q-107 0 -107 -102v-17h-125v31q0 100 57.5 155.5t169.5 55.5 q58 0 114.5 -18.5t115.5 -40t124.5 -40t143.5 -18.5h14zM926 1460q0 -161 -238 -223v72q119 40 119 96q0 20 -15 28.5t-33 17t-33 21t-15 39.5q0 74 92 74q56 0 89.5 -34t33.5 -91z" />
-<glyph unicode="&#x47e;" horiz-adv-x="2015" d="M1419 1796v-27l-80 -172h-32l-50 103h-186l-49 -103h-33l-49 103h-188l-47 -103h-33l-80 172v27h827zM1427 1327q-60 0 -106.5 -20.5t-91.5 -51.5l-70 146q124 80 277 80q228 0 355.5 -188t127.5 -527q0 -373 -143 -579.5t-402 -206.5q-116 0 -202 24t-162 72h-9 q-78 -49 -164 -72.5t-198 -23.5q-260 0 -402.5 208t-142.5 578q0 341 128.5 528t357.5 187q150 0 276 -80l-70 -146q-45 31 -91.5 51.5t-106.5 20.5q-147 0 -229.5 -148.5t-82.5 -414.5q0 -303 105 -469t295 -166q65 0 130 19t116 57v457h170v-457q102 -76 247 -76 q188 0 294 165t106 470q0 267 -82.5 415t-229.5 148z" />
-<glyph unicode="&#x47f;" horiz-adv-x="1677" d="M1206 1444v-27l-82 -172h-30l-50 103h-188l-49 -103h-31l-49 103h-188l-50 -103h-30l-80 172v27h827zM807 457l-39 -95l-170 -362h-213l-385 1096h172l246 -695q39 -111 80 -282h8q12 35 29.5 75.5t203.5 432.5l-172 469h178q265 -769 287.5 -841t32.5 -116h8 q173 184 249.5 401.5t76.5 555.5h166q0 -362 -97.5 -614.5t-316.5 -481.5h-182l-125 346q-33 92 -37 111z" />
-<glyph unicode="&#x480;" horiz-adv-x="1309" d="M840 1331q-245 0 -389 -160t-144 -440q0 -294 133 -444t391 -150q111 0 168 23v-652h-170v472h-20q-331 0 -507.5 194t-176.5 559q0 224 87.5 395t251.5 263t380 92q237 0 407 -84l-71 -146q-171 78 -340 78z" />
-<glyph unicode="&#x481;" horiz-adv-x="999" d="M629 -20q-254 0 -384 143.5t-130 417.5q0 276 136.5 425.5t387.5 149.5q79 0 161 -17t130 -40l-49 -141q-142 51 -246 51q-177 0 -262.5 -102.5t-85.5 -323.5q0 -220 85.5 -320t256.5 -100q53 0 93 8.5t97 34.5v-658h-166v472h-24z" />
-<glyph unicode="&#x482;" horiz-adv-x="1247" d="M514 313l-182 -317l-121 67l182 322l-287 166l66 115l289 -168l205 356l-289 166l67 117l289 -168l185 317l118 -67l-184 -320l289 -166l-68 -115l-287 166l-204 -354l286 -168l-65 -115z" />
-<glyph unicode="&#x483;" horiz-adv-x="1141" d="M391 1264q-6 -45 -27 -70t-69 -25q-51 0 -71.5 25t-20.5 78t21 73.5t75 20.5h449q6 46 27.5 70t68.5 24q51 0 73.5 -24.5t22.5 -75.5q0 -56 -22 -76t-76 -20h-451z" />
-<glyph unicode="&#x484;" horiz-adv-x="1182" d="M260 1378q120 0 270 59q149 58 230 58q111 0 169 -55.5t58 -155.5v-31h-125v17q0 102 -106 102q-43 0 -94 -18t-111.5 -39.5t-131.5 -39.5t-155 -18h-16v121h12z" />
-<glyph unicode="&#x485;" horiz-adv-x="1182" d="M479 1464q0 56 33.5 90.5t89.5 34.5q92 0 92 -76q0 -27 -15 -39.5t-33 -20.5t-33 -17t-15 -29q0 -54 119 -94v-74q-238 64 -238 225z" />
-<glyph unicode="&#x486;" horiz-adv-x="1182" d="M719 1464q0 -161 -238 -225v74q119 40 119 94q0 20 -15 29t-33 17t-33 20.5t-15 39.5q0 76 92 76q56 0 89.5 -34.5t33.5 -90.5z" />
-<glyph unicode="&#x488;" horiz-adv-x="2025" d="M1135 1231q-5 44 -35 66t-99 22q-78 0 -103 -20.5t-30 -67.5h-75q11 194 208 194q93 0 149.5 -50.5t63.5 -143.5h-79zM1135 -319q-5 44 -35 66t-99 22q-78 0 -103 -20.5t-30 -67.5h-75q5 89 55 141.5t153 52.5q92 0 149.5 -51t63.5 -143h-79zM1714 -41q-5 45 -35 66.5 t-98 21.5q-78 0 -103 -19.5t-30 -68.5h-76q5 90 55.5 142.5t153.5 52.5q92 0 149.5 -51t63.5 -144h-80zM561 -41q-5 45 -35 66.5t-98 21.5q-78 0 -103 -19.5t-30 -68.5h-76q5 90 55.5 142.5t153.5 52.5q92 0 149.5 -51t63.5 -144h-80zM1714 946q-5 45 -35 66.5t-98 21.5 q-78 0 -103 -19.5t-30 -68.5h-76q5 90 55.5 142.5t153.5 52.5q92 0 149.5 -51t63.5 -144h-80zM561 946q-5 45 -35 66.5t-98 21.5q-78 0 -103 -19.5t-30 -68.5h-76q5 90 55.5 142.5t153.5 52.5q92 0 149.5 -51t63.5 -144h-80zM1905 459q-5 44 -35 66t-98 22q-78 0 -103.5 -20 t-30.5 -68h-75q11 194 209 194q92 0 149.5 -52t63.5 -142h-80zM383 459q-5 45 -35 66.5t-98 21.5q-78 0 -103 -19.5t-30 -68.5h-76q5 90 55.5 142t153.5 52q92 0 149.5 -51t63.5 -143h-80z" />
-<glyph unicode="&#x489;" horiz-adv-x="1958" d="M1079 -35l11 -14q-17 -66 -52 -161.5t-71 -174.5h-97q53 221 70 350h139zM881 1141l-11 14q19 71 55.5 171t67.5 165h97q-52 -220 -70 -350h-139zM1567 651l14 11q71 -19 171 -55.5t165 -67.5v-97q-221 53 -350 70v139zM391 453l-14 -11q-66 17 -161.5 52t-174.5 71v97 q221 -53 350 -70v-139zM1325 1018l2 16q67 39 162 83t162 69l69 -68q-177 -110 -297 -198zM633 45l-2 -16q-155 -89 -324 -152l-69 68q177 110 297 198zM492 877l-17 2q-82 140 -151 323l67 70q123 -198 199 -297zM1464 184l17 -2q39 -69 84 -166t67 -157l-67 -70 q-31 50 -96 147.5t-103 149.5z" />
-<glyph unicode="&#x48a;" horiz-adv-x="1577" d="M201 1462h161v-815q0 -118 -10 -324l-4 -83h8l820 1222h184v-1310h184l-143 -533h-197l156 381h-160v805q0 175 19 422h-9l-823 -1227h-186v1462zM780 1579q-186 0 -270 71.5t-94 235.5h155q10 -108 56.5 -147t156.5 -39q105 0 154.5 46.5t58.5 139.5h158 q-12 -159 -102.5 -233t-272.5 -74z" />
-<glyph unicode="&#x48b;" horiz-adv-x="1317" d="M332 1096v-662q0 -136 -10 -272l593 934h207v-953h176l-129 -520h-172l125 377h-155v672q0 158 8 262l-594 -934h-205v1096h156zM668 1241q-185 0 -270 71.5t-95 235.5h156q7 -102 52 -144t161 -42q103 0 153 45t60 141h157q-12 -158 -101 -232.5t-273 -74.5z" />
-<glyph unicode="&#x48c;" horiz-adv-x="1255" d="M47 1276h154v186h170v-186h342v-150h-342v-288h192q586 0 586 -412q0 -210 -138 -318t-409 -108h-401v1126h-154v150zM371 145h221q379 0 379 281q0 132 -92 196t-293 64h-215v-541z" />
-<glyph unicode="&#x48d;" horiz-adv-x="1212" d="M342 1311h295v-129h-295v-539h320q223 0 330.5 -77t107.5 -232q0 -164 -112 -249t-333 -85h-479v1182h-156v129h156v245h166v-245zM342 500v-361h305q287 0 287 185q0 92 -66 134t-225 42h-301z" />
-<glyph unicode="&#x48e;" horiz-adv-x="1251" d="M1145 1036q0 -127 -57.5 -227.5t-165.5 -157.5l120 -157l-100 -84l-149 192q-102 -27 -238 -27h-184v-575h-170v1462h393q274 0 412.5 -107.5t138.5 -318.5zM371 721h166q87 0 163 10l-108 141l108 82l140 -176q127 72 127 250q0 145 -97 216t-299 71h-200v-594z" />
-<glyph unicode="&#x48f;" horiz-adv-x="1255" d="M686 -20q-107 0 -195.5 39.5t-148.5 121.5h-12q12 -148 12 -182v-451h-166v1588h135l25 -150h8q64 90 148.5 130t193.5 40q218 0 336.5 -149t118.5 -418q0 -338 -183 -483l115 -156l-100 -80l-131 174q-71 -24 -156 -24zM662 975q-168 0 -243 -93t-77 -296v-37 q0 -231 77 -330.5t247 -99.5q47 0 88 12l-121 158l106 80l129 -170q101 103 101 352q0 215 -75 319.5t-232 104.5z" />
-<glyph unicode="&#x490;" horiz-adv-x="1079" d="M870 1462v301h162v-454h-661v-1309h-170v1462h669z" />
-<glyph unicode="&#x491;" horiz-adv-x="877" d="M836 967h-494v-967h-166v1096h494v321h166v-450z" />
-<glyph unicode="&#x492;" horiz-adv-x="1079" d="M1032 1462v-153h-661v-510h424v-150h-424v-649h-170v649h-154v150h154v663h831z" />
-<glyph unicode="&#x493;" horiz-adv-x="877" d="M834 956h-492v-344h346v-127h-346v-485h-166v485h-158v127h158v484h658v-140z" />
-<glyph unicode="&#x494;" horiz-adv-x="1315" d="M561 655q-100 0 -190 -12v-643h-170v1462h841v-153h-671v-516q90 10 211 10q320 0 490.5 -169.5t170.5 -483.5q0 -315 -143 -488.5t-402 -173.5q-83 0 -145.5 10.5t-132.5 38.5v152q123 -49 260 -49q383 0 383 510q0 245 -128 375t-374 130z" />
-<glyph unicode="&#x495;" horiz-adv-x="1075" d="M582 -502q-145 0 -246 60v149q116 -63 239 -63q133 0 201 101t68 316q0 223 -89 327t-270 104q-69 0 -143 -17v-475h-166v1096h666v-142h-500v-329q82 12 141 12q272 0 403.5 -141.5t131.5 -436.5q0 -267 -114 -414t-322 -147z" />
-<glyph unicode="&#x496;" horiz-adv-x="1823" d="M598 752l-575 710h190l569 -708v708h164v-708l570 708h190l-576 -708l474 -600h180v-535h-162v381h-94l-582 741v-741h-164v741l-581 -741h-199z" />
-<glyph unicode="&#x497;" horiz-adv-x="1597" d="M676 1096h153v-531l453 531h182l-458 -531l368 -422h193v-520h-162v377h-94l-482 557v-557h-153v557l-481 -557h-191l496 565l-457 531h182l451 -531v531z" />
-<glyph unicode="&#x498;" horiz-adv-x="1190" d="M74 0zM1049 1120q0 -144 -91.5 -234t-252.5 -114v-8q183 -25 277.5 -115t94.5 -235q0 -205 -153 -319.5t-432 -114.5q-255 0 -418 79v158q96 -46 207.5 -71t214.5 -25q198 0 299.5 75t101.5 216q0 134 -112.5 203t-335.5 69h-218v143h209q205 0 317.5 73.5t112.5 205.5 q0 107 -81 171t-218 64q-110 0 -199 -25t-206 -99l-84 114q101 75 226.5 113.5t260.5 38.5q225 0 352.5 -98.5t127.5 -264.5zM567 -238q0 103 -139 238h123q158 -120 158 -252q0 -91 -51 -142.5t-150 -51.5q-65 0 -115 16v108q32 -10 86 -10q37 0 62.5 24t25.5 70z" />
-<glyph unicode="&#x499;" horiz-adv-x="989" d="M68 0zM385 641q311 0 311 172q0 162 -252 162q-77 0 -140 -14t-165 -56l-59 135q170 76 371 76q189 0 298 -77.5t109 -211.5q0 -184 -205 -241v-8q126 -37 184 -105.5t58 -171.5q0 -152 -122.5 -236.5t-338.5 -84.5q-237 0 -366 71v152q183 -86 370 -86q144 0 217.5 49.5 t73.5 142.5q0 191 -311 191h-152v141h119zM487 -238q0 103 -139 238h123q158 -120 158 -252q0 -91 -51 -142.5t-150 -51.5q-65 0 -115 16v108q32 -10 86 -10q37 0 62.5 24t25.5 70z" />
-<glyph unicode="&#x49a;" horiz-adv-x="1354" d="M1151 154h172v-535h-162v381h-102l-535 709l-153 -136v-573h-170v1462h170v-725l663 725h201l-588 -635z" />
-<glyph unicode="&#x49b;" horiz-adv-x="1116" d="M815 1096h182l-473 -529l383 -424h178v-522h-159v379h-84l-500 555v-555h-166v1096h166v-533z" />
-<glyph unicode="&#x49c;" horiz-adv-x="1257" d="M496 680l-125 -107v-573h-170v1462h170v-731l125 139v349h125v-211l411 454h203l-588 -635l610 -827h-200l-436 604v-305h-125v381z" />
-<glyph unicode="&#x49d;" horiz-adv-x="1092" d="M461 434l-119 121v-555h-166v1096h166v-533l119 121v330h131v-205l270 287h182l-452 -475v-107l491 -514h-194l-299 315v-221h-129v340z" />
-<glyph unicode="&#x49e;" horiz-adv-x="1257" d="M47 1284h154v178h170v-178h221v-151h-221v-402l661 731h203l-588 -635l610 -827h-206l-527 709l-153 -134v-575h-170v1133h-154v151z" />
-<glyph unicode="&#x49f;" horiz-adv-x="1059" d="M20 1370h156v186h164v-186h381v-127h-381v-536l-3 -91l-3 -55h8l18 24q55 74 75 98t388 413h199l-444 -467l473 -629h-199l-387 516l-125 -106v-410h-164v1243h-156v127z" />
-<glyph unicode="&#x4a0;" horiz-adv-x="1411" d="M16 1462h508v-731l662 731h203l-588 -635l610 -827h-201l-532 709l-154 -136v-573h-170v1309h-338v153z" />
-<glyph unicode="&#x4a1;" horiz-adv-x="1260" d="M41 1096h514v-533l475 533h182l-473 -531l512 -565h-194l-502 555v-555h-164v956h-350v140z" />
-<glyph unicode="&#x4a2;" horiz-adv-x="1528" d="M1311 154h162v-535h-162v381h-170v688h-770v-688h-170v1462h170v-622h770v622h170v-1308z" />
-<glyph unicode="&#x4a3;" horiz-adv-x="1327" d="M342 1096v-459h614v459h166v-953h150v-520h-166v377h-150v494h-614v-494h-166v1096h166z" />
-<glyph unicode="&#x4a4;" horiz-adv-x="1665" d="M1647 1309h-336v-1309h-172v688h-768v-688h-170v1462h170v-622h768v622h508v-153z" />
-<glyph unicode="&#x4a5;" horiz-adv-x="1507" d="M342 1096v-459h614v459h517v-140h-351v-956h-166v494h-614v-494h-166v1096h166z" />
-<glyph unicode="&#x4a6;" horiz-adv-x="2185" d="M1241 0h-170v1309h-700v-1309h-170v1462h1040v-671q68 12 193 12q306 0 474.5 -172t168.5 -484q0 -313 -141.5 -486t-399.5 -173q-156 0 -279 49v152q134 -49 261 -49q378 0 378 510q0 242 -115 372.5t-347 130.5q-42 0 -105.5 -3.5t-87.5 -8.5v-641z" />
-<glyph unicode="&#x4a7;" horiz-adv-x="1772" d="M1303 -502q-131 0 -228 60v149q109 -63 217 -63q240 0 240 417q0 223 -83 327t-255 104q-67 0 -139 -21v-471h-168v952h-545v-952h-166v1096h879v-473q75 14 141 14q246 0 377 -148.5t131 -429.5q0 -268 -104.5 -414.5t-296.5 -146.5z" />
-<glyph unicode="&#x4a8;" horiz-adv-x="1595" d="M1464 678q0 -181 -69 -335.5t-185 -240.5q66 -30 156 -30q78 0 139 22v-153q-56 -25 -147 -25q-178 0 -326 100q-102 -36 -246 -36q-310 0 -485.5 196.5t-175.5 538.5q0 376 164.5 573t478.5 197q127 0 219 -35l-47 -145q-84 28 -174 28q-461 0 -461 -610 q0 -288 127.5 -441t362.5 -153q54 0 100 10q-86 103 -132 245t-46 302q0 244 99 377t274 133q181 0 277.5 -133t96.5 -385zM1288 672q0 177 -51.5 279t-144.5 102q-94 0 -145.5 -100.5t-51.5 -276.5q0 -140 46.5 -267t129.5 -212q102 67 159.5 194.5t57.5 280.5z" />
-<glyph unicode="&#x4a9;" horiz-adv-x="1311" d="M750 498q0 -94 34 -174.5t97 -133.5q68 44 109.5 123t41.5 189q0 235 -135 235q-72 0 -109.5 -62.5t-37.5 -176.5zM1108 -57q-147 0 -277 77q-96 -40 -219 -40q-149 0 -262 69.5t-174 196.5t-61 291q0 275 124 427t351 152q91 0 168 -22l-37 -138q-54 19 -133 19 q-156 0 -228.5 -104.5t-72.5 -335.5q0 -206 85 -311t249 -105q37 0 63.5 4.5t32.5 7.5q-139 148 -139 373q0 173 84 269.5t235 96.5q148 0 226.5 -94.5t78.5 -271.5q0 -125 -53.5 -229.5t-147.5 -168.5q52 -26 119 -26q66 0 115 14v-137q-39 -14 -127 -14z" />
-<glyph unicode="&#x4aa;" horiz-adv-x="1292" d="M125 0zM827 1331q-241 0 -380.5 -160.5t-139.5 -439.5q0 -287 134.5 -443.5t383.5 -156.5q153 0 349 55v-149q-152 -57 -375 -57q-323 0 -498.5 196t-175.5 557q0 226 84.5 396t244 262t375.5 92q230 0 402 -84l-72 -146q-166 78 -332 78zM772 -238q0 103 -139 238h123 q158 -120 158 -252q0 -91 -51 -142.5t-150 -51.5q-65 0 -115 16v108q32 -10 86 -10q37 0 62.5 24t25.5 70z" />
-<glyph unicode="&#x4ab;" horiz-adv-x="975" d="M115 0zM614 -20q-238 0 -368.5 146.5t-130.5 414.5q0 275 132.5 425t377.5 150q79 0 158 -17t124 -40l-51 -141q-55 22 -120 36.5t-115 14.5q-334 0 -334 -426q0 -202 81.5 -310t241.5 -108q137 0 281 59v-147q-110 -57 -277 -57zM610 -238q0 103 -139 238h123 q158 -120 158 -252q0 -91 -51 -142.5t-150 -51.5q-65 0 -115 16v108q32 -10 86 -10q37 0 62.5 24t25.5 70z" />
-<glyph unicode="&#x4ac;" horiz-adv-x="1133" d="M479 1309h-463v153h1098v-153h-463v-1155h162v-535h-162v381h-172v1309z" />
-<glyph unicode="&#x4ad;" horiz-adv-x="956" d="M393 956h-352v140h872v-140h-354v-813h150v-520h-166v377h-150v956z" />
-<glyph unicode="&#x4ae;" horiz-adv-x="1147" d="M0 0zM573 731l390 731h184l-488 -895v-567h-172v559l-487 903h186z" />
-<glyph unicode="&#x4af;" horiz-adv-x="1026" d="M596 -492h-166v488l-430 1100h172l236 -613q83 -222 102 -319h8q33 138 103 319l233 613h172l-430 -1100v-488z" />
-<glyph unicode="&#x4b0;" horiz-adv-x="1147" d="M573 731l390 731h184l-488 -895v-59h299v-152h-299v-356h-172v356h-301v152h301v51l-487 903h186z" />
-<glyph unicode="&#x4b1;" horiz-adv-x="1026" d="M596 -129v-363h-166v363h-278v129h276l-428 1096h172l236 -613q83 -222 102 -319h8q33 138 103 319l233 613h172l-428 -1096h274v-129h-276z" />
-<glyph unicode="&#x4b2;" horiz-adv-x="1268" d="M1075 154h162v-535h-162v381h-94l-393 643l-400 -643h-180l486 764l-453 698h188l363 -579l366 579h181l-453 -692z" />
-<glyph unicode="&#x4b3;" horiz-adv-x="1110" d="M440 561l-381 535h189l289 -420l288 420h187l-381 -535l299 -418h149v-522h-166v379h-69l-307 444l-310 -444h-188z" />
-<glyph unicode="&#x4b4;" horiz-adv-x="1751" d="M1534 154h170v-535h-162v381h-1100v1309h-426v153h1071v-153h-475v-1155h752v1308h170v-1308z" />
-<glyph unicode="&#x4b5;" horiz-adv-x="1468" d="M889 954h-361v-811h582v951h166v-951h156v-520h-166v377h-904v954h-321v140h848v-140z" />
-<glyph unicode="&#x4b6;" horiz-adv-x="1417" d="M1223 154h161v-535h-161v381h-170v604q-149 -53 -248 -72.5t-205 -19.5q-207 0 -318.5 95t-111.5 274v581h170v-561q0 -121 63.5 -179t206.5 -58q97 0 185.5 14.5t257.5 69.5v714h170v-1308z" />
-<glyph unicode="&#x4b7;" horiz-adv-x="1247" d="M322 1096v-400q0 -192 219 -192q91 0 174 28t188 95v469h166v-953h150v-522h-166v379h-150v496q-105 -72 -194.5 -101.5t-202.5 -29.5q-164 0 -257 86t-93 233v412h166z" />
-<glyph unicode="&#x4b8;" horiz-adv-x="1423" d="M629 512q-459 0 -459 369v581h170v-561q0 -119 67.5 -178t221.5 -59v348h125v-342q134 13 297 73v719h172v-1462h-172v600q-168 -65 -297 -82v-305h-125v299z" />
-<glyph unicode="&#x4b9;" horiz-adv-x="1229" d="M322 1096v-400q0 -186 200 -192v301h119v-291q113 24 246 113v469h166v-1096h-166v496q-128 -91 -246 -117v-248h-119v234h-22q-160 0 -252 85t-92 234v412h166z" />
-<glyph unicode="&#x4ba;" horiz-adv-x="1423" d="M201 1462h170v-604q256 92 452 92q207 0 318.5 -95.5t111.5 -272.5v-582h-170v561q0 120 -63.5 179t-206.5 59q-107 0 -200 -17t-242 -67v-715h-170v1462z" />
-<glyph unicode="&#x4bb;" horiz-adv-x="1198" d="M922 0v397q0 193 -217 193q-88 0 -166 -24.5t-197 -98.5v-467h-166v1096h166v-498q95 69 188 100t207 31q163 0 258 -84t95 -235v-410h-168z" />
-<glyph unicode="&#x4bc;" horiz-adv-x="1716" d="M61 903q0 73 27 127h145q-20 -50 -20 -110q0 -103 113 -103h34l5 43q29 298 195.5 461.5t445.5 163.5q297 0 445 -189.5t148 -558.5v-69h-1060q14 -264 144.5 -400.5t377.5 -136.5q101 0 202 15.5t242 58.5v-156q-114 -39 -224.5 -54t-240.5 -15q-314 0 -488.5 178 t-193.5 510q-142 0 -219.5 59t-77.5 176zM1004 1333q-209 0 -329 -133.5t-136 -382.5h878q0 265 -101.5 390.5t-311.5 125.5z" />
-<glyph unicode="&#x4bd;" horiz-adv-x="1350" d="M842 -20q-243 0 -381 143t-144 395q-266 4 -266 225q0 69 25 119h141q-20 -47 -20 -106q0 -103 106 -103h21l6 35q34 202 159 314t308 112q207 0 327.5 -132.5t120.5 -358.5v-105h-756q6 -198 92 -295.5t259 -97.5q101 0 180.5 16t177.5 58v-148q-88 -38 -166.5 -54.5 t-189.5 -16.5zM793 975q-134 0 -209.5 -82t-89.5 -240h573q0 157 -70 239.5t-204 82.5z" />
-<glyph unicode="&#x4be;" horiz-adv-x="1716" d="M928 -12q-258 29 -404.5 202t-165.5 478q-142 0 -219.5 59t-77.5 176q0 73 27 127h145q-20 -50 -20 -110q0 -103 113 -103h34l5 43q29 298 195.5 461.5t445.5 163.5q297 0 445 -189.5t148 -558.5v-69h-1060q14 -264 144.5 -400.5t377.5 -136.5q101 0 202 15.5t242 58.5 v-156q-176 -62 -411 -67v-363h-166v369zM1004 1333q-209 0 -329 -133.5t-136 -382.5h878q0 265 -101.5 390.5t-311.5 125.5z" />
-<glyph unicode="&#x4bf;" horiz-adv-x="1350" d="M725 -10q-191 31 -296.5 167.5t-111.5 360.5q-266 4 -266 225q0 69 25 119h141q-20 -47 -20 -106q0 -103 106 -103h21l6 35q34 202 159 314t308 112q207 0 327.5 -132.5t120.5 -358.5v-105h-756q6 -198 92 -295.5t259 -97.5q101 0 180.5 16t177.5 58v-148 q-142 -65 -307 -69v-359h-166v367zM793 975q-134 0 -209.5 -82t-89.5 -240h573q0 157 -70 239.5t-204 82.5z" />
-<glyph unicode="&#x4c0;" horiz-adv-x="571" d="M201 0zM201 0v1462h170v-1462h-170z" />
-<glyph unicode="&#x4c1;" horiz-adv-x="1729" d="M2 0zM598 752l-575 710h190l569 -708v708h164v-708l570 708h190l-576 -708l594 -754h-196l-582 741v-741h-164v741l-581 -741h-199zM856 1581q-185 0 -270 71.5t-95 235.5h156q9 -104 54.5 -145t158.5 -41q103 0 152.5 44t60.5 142h157q-12 -158 -101 -232.5t-273 -74.5z " />
-<glyph unicode="&#x4c2;" horiz-adv-x="1507" d="M4 0zM676 1094h153v-531l453 531h182l-458 -531l497 -563h-192l-482 555v-555h-153v555l-481 -555h-191l496 563l-457 531h182l451 -531v531zM748 1241q-185 0 -270 71.5t-95 235.5h156q9 -104 54.5 -145t158.5 -41q103 0 152.5 44t60.5 142h157q-12 -158 -101 -232.5 t-273 -74.5z" />
-<glyph unicode="&#x4c3;" horiz-adv-x="1411" d="M606 635q-140 0 -235 -31v-604h-170v1462h170v-708l649 708h205l-635 -684l26 2q335 0 512 -162.5t177 -467.5q0 -314 -147.5 -488t-414.5 -174q-82 0 -144 10t-132 39v152q122 -49 274 -49q187 0 287 134.5t100 375.5q0 232 -138.5 358.5t-383.5 126.5z" />
-<glyph unicode="&#x4c4;" horiz-adv-x="1124" d="M340 0h-164v1096h164v-518l483 518h183l-457 -482q256 -4 382 -146t126 -409q0 -177 -55 -303t-157 -192t-235 -66q-136 0 -231 60v145q46 -25 100 -44t125 -19q135 0 211 108.5t76 308.5q0 211 -93.5 314.5t-283.5 103.5q-82 0 -174 -24v-451z" />
-<glyph unicode="&#x4c5;" horiz-adv-x="1446" d="M1241 154h184l-143 -535h-197l156 381h-170v1311h-475l-31 -240q-61 -479 -107.5 -700.5t-122.5 -308.5t-202 -85q-74 0 -133 25v143q54 -26 113 -26q53 0 92.5 43.5t70 151t77 408t102.5 740.5h786v-1308z" />
-<glyph unicode="&#x4c6;" horiz-adv-x="1171" d="M991 143h176l-129 -520h-172l125 377h-166v952h-331q-28 -360 -75 -566t-123 -302t-194 -96q-58 0 -86 10v127q22 -6 50 -6q113 0 181.5 236.5t102.5 738.5h641v-951z" />
-<glyph unicode="&#x4c7;" horiz-adv-x="1489" d="M1311 150q0 -318 -141 -490t-402 -172q-82 0 -143 9.5t-138 39.5v150q123 -49 258 -49q396 0 396 503v547h-770v-688h-170v1462h170v-622h770v622h170v-1312z" />
-<glyph unicode="&#x4c8;" horiz-adv-x="1262" d="M723 -502q-132 0 -225 58v149q111 -61 213 -61q125 0 184 99t59 306v445h-612v-494h-166v1096h166v-459h612v459h168v-1045q0 -268 -103.5 -410.5t-295.5 -142.5z" />
-<glyph unicode="&#x4c9;" horiz-adv-x="1526" d="M1311 154h184l-145 -535h-197l158 381h-170v688h-770v-688h-170v1462h170v-622h770v622h170v-1308z" />
-<glyph unicode="&#x4ca;" horiz-adv-x="1337" d="M342 1094v-457h614v457h166v-951h176l-129 -520h-172l125 377h-166v494h-614v-494h-166v1094h166z" />
-<glyph unicode="&#x4cb;" horiz-adv-x="1423" d="M1223 0h-170v-381h-162v535h162v450q-149 -53 -248 -72.5t-205 -19.5q-207 0 -318.5 95t-111.5 274v581h170v-561q0 -121 63.5 -179t206.5 -58q97 0 185.5 14.5t257.5 69.5v714h170v-1462z" />
-<glyph unicode="&#x4cc;" horiz-adv-x="1245" d="M322 1096v-400q0 -192 219 -192q91 0 174 28t188 95v469h166v-1096h-149v-379h-166v522h149v353q-105 -72 -194.5 -101.5t-202.5 -29.5q-164 0 -257 86t-93 233v412h166z" />
-<glyph unicode="&#x4cd;" horiz-adv-x="1851" d="M848 0l-496 1296h-8l7 -127q7 -192 7 -239v-930h-157v1462h256l465 -1206h8l465 1206h254v-1308h184l-143 -535h-199l158 381h-170v942q0 132 14 352h-8l-500 -1294h-137z" />
-<glyph unicode="&#x4ce;" horiz-adv-x="1507" d="M745 160l31 93l43 118l297 723h211v-951h176l-129 -520h-172l125 377h-147v905l-20 -58l-58 -153l-283 -694h-139l-283 696q-53 134 -73 209v-905h-148v1094h203l297 -723q45 -110 69 -211z" />
-<glyph unicode="&#x4cf;" horiz-adv-x="571" d="M201 0zM201 0v1462h170v-1462h-170z" />
-<glyph unicode="&#x4d0;" horiz-adv-x="1296" d="M0 0zM1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473zM641 1579q-185 0 -270 71.5t-95 235.5h156q9 -104 54.5 -145t158.5 -41q103 0 152.5 44t60.5 142h157q-12 -158 -101 -232.5 t-273 -74.5z" />
-<glyph unicode="&#x4d1;" d="M94 0zM850 0l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123zM475 117q155 0 243.5 85 t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5q0 -90 54.5 -137t152.5 -47zM560 1241q-185 0 -270 71.5t-95 235.5h156q9 -104 54.5 -145t158.5 -41q103 0 152.5 44t60.5 142h157q-12 -158 -101 -232.5t-273 -74.5z" />
-<glyph unicode="&#x4d2;" horiz-adv-x="1296" d="M0 0zM1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473zM370 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5z M751 1731q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x4d3;" d="M94 0zM850 0l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123zM475 117q155 0 243.5 85 t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5q0 -90 54.5 -137t152.5 -47zM296 1393q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM677 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75 q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x4d4;" horiz-adv-x="1788" d="M0 0zM1665 0h-750v465h-514l-227 -465h-176l698 1462h969v-151h-580v-471h541v-150h-541v-538h580v-152zM469 618h446v693h-118z" />
-<glyph unicode="&#x4d5;" horiz-adv-x="1757" d="M94 0zM94 303q0 161 124 250.5t378 97.5l184 6v68q0 129 -58 190.5t-177 61.5q-144 0 -307 -84l-52 127q74 41 173.5 67.5t197.5 26.5q130 0 212.5 -43.5t123.5 -138.5q53 88 138.5 136t195.5 48q192 0 308 -133.5t116 -355.5v-107h-701q8 -395 322 -395q91 0 169.5 17.5 t162.5 56.5v-148q-86 -38 -160.5 -54.5t-175.5 -16.5q-289 0 -414 233q-81 -127 -179.5 -180t-232.5 -53q-163 0 -255.5 85t-92.5 238zM268 301q0 -95 53.5 -139.5t141.5 -44.5q145 0 229 84.5t84 238.5v99l-158 -7q-186 -8 -268 -62.5t-82 -168.5zM1225 977 q-121 0 -190.5 -83t-80.5 -241h519q0 156 -64 240t-184 84z" />
-<glyph unicode="&#x4d6;" d="M201 0zM1016 0h-815v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152zM600 1579q-185 0 -270 71.5t-95 235.5h156q9 -104 54.5 -145t158.5 -41q103 0 152.5 44t60.5 142h157q-12 -158 -101 -232.5t-273 -74.5z" />
-<glyph unicode="&#x4d7;" horiz-adv-x="1149" d="M115 0zM639 -20q-243 0 -383.5 148t-140.5 411q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5zM594 977q-132 0 -210.5 -86t-92.5 -238h573q0 157 -70 240.5 t-200 83.5zM596 1241q-185 0 -270 71.5t-95 235.5h156q9 -104 54.5 -145t158.5 -41q103 0 152.5 44t60.5 142h157q-12 -158 -101 -232.5t-273 -74.5z" />
-<glyph unicode="&#x4d8;" horiz-adv-x="1495" d="M664 1333q-227 0 -453 -76v158q115 38 220 54t239 16q331 0 514.5 -199.5t183.5 -556.5q0 -350 -173 -549.5t-482 -199.5q-596 0 -596 747v70h1071q-17 266 -148.5 401t-375.5 135zM713 131q210 0 334.5 134.5t140.5 381.5h-889q0 -264 102 -390t312 -126z" />
-<glyph unicode="&#x4d9;" horiz-adv-x="1145" d="M506 1116q245 0 384.5 -150t139.5 -411q0 -264 -129.5 -419.5t-347.5 -155.5q-208 0 -329.5 134t-121.5 359v105h756q-5 204 -94.5 297.5t-255.5 93.5q-98 0 -180.5 -16.5t-177.5 -57.5v147q89 40 170 57t186 17zM555 119q133 0 210 82.5t89 238.5h-573q0 -157 70.5 -239 t203.5 -82z" />
-<glyph unicode="&#x4da;" horiz-adv-x="1495" d="M117 0zM664 1333q-227 0 -453 -76v158q115 38 220 54t239 16q331 0 514.5 -199.5t183.5 -556.5q0 -350 -173 -549.5t-482 -199.5q-596 0 -596 747v70h1071q-17 266 -148.5 401t-375.5 135zM713 131q210 0 334.5 134.5t140.5 381.5h-889q0 -264 102 -390t312 -126z M456 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM837 1731q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x4db;" horiz-adv-x="1145" d="M102 0zM506 1116q245 0 384.5 -150t139.5 -411q0 -264 -129.5 -419.5t-347.5 -155.5q-208 0 -329.5 134t-121.5 359v105h756q-5 204 -94.5 297.5t-255.5 93.5q-98 0 -180.5 -16.5t-177.5 -57.5v147q89 40 170 57t186 17zM555 119q133 0 210 82.5t89 238.5h-573 q0 -157 70.5 -239t203.5 -82zM287 1393q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM668 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x4dc;" horiz-adv-x="1729" d="M2 0zM598 752l-575 710h190l569 -708v708h164v-708l570 708h190l-576 -708l594 -754h-196l-582 741v-741h-164v741l-581 -741h-199zM581 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM962 1731 q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x4dd;" horiz-adv-x="1507" d="M4 0zM676 1094h153v-531l453 531h182l-458 -531l497 -563h-192l-482 555v-555h-153v555l-481 -555h-191l496 563l-457 531h182l451 -531v531zM471 1393q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5z M852 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x4de;" horiz-adv-x="1190" d="M74 0zM1049 1120q0 -144 -91.5 -234t-252.5 -114v-8q183 -25 277.5 -115t94.5 -235q0 -205 -153 -319.5t-432 -114.5q-255 0 -418 79v158q96 -46 207.5 -71t214.5 -25q198 0 299.5 75t101.5 216q0 134 -112.5 203t-335.5 69h-218v143h209q205 0 317.5 73.5t112.5 205.5 q0 107 -81 171t-218 64q-110 0 -199 -25t-206 -99l-84 114q101 75 226.5 113.5t260.5 38.5q225 0 352.5 -98.5t127.5 -264.5zM296 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM677 1731q0 52 26.5 75 t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x4df;" horiz-adv-x="989" d="M68 0zM385 641q311 0 311 172q0 162 -252 162q-77 0 -140 -14t-165 -56l-59 135q170 76 371 76q189 0 298 -77.5t109 -211.5q0 -184 -205 -241v-8q126 -37 184 -105.5t58 -171.5q0 -152 -122.5 -236.5t-338.5 -84.5q-237 0 -366 71v152q183 -86 370 -86q144 0 217.5 49.5 t73.5 142.5q0 191 -311 191h-152v141h119zM201 1393q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM582 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z " />
-<glyph unicode="&#x4e0;" horiz-adv-x="1194" d="M508 831q279 -9 425 -114.5t146 -298.5q0 -206 -153.5 -322t-431.5 -116q-257 0 -420 79v158q96 -46 207 -71t217 -25q199 0 300 76.5t101 220.5q0 134 -112.5 203t-335.5 69h-140v141l494 478h-690v153h903v-139z" />
-<glyph unicode="&#x4e1;" horiz-adv-x="1001" d="M428 463q149 -7 264 -64t178.5 -158t63.5 -237q0 -222 -148 -359t-387 -137q-234 0 -372 70v154q183 -86 383 -86q161 0 259.5 95t98.5 255q0 164 -107 249t-309 85h-121v114l453 510h-631v142h824v-123z" />
-<glyph unicode="&#x4e2;" horiz-adv-x="1561" d="M203 0zM203 1462h159v-813q0 -225 -14 -407h8l820 1220h186v-1462h-160v805q0 201 17 422h-9l-821 -1227h-186v1462zM481 1716h600v-137h-600v137z" />
-<glyph unicode="&#x4e3;" horiz-adv-x="1298" d="M176 0zM332 1096v-695l-7 -182l-3 -57l593 934h207v-1096h-155v670l3 132l5 130l-592 -932h-207v1096h156zM350 1378h600v-137h-600v137z" />
-<glyph unicode="&#x4e4;" horiz-adv-x="1561" d="M203 0zM203 1462h159v-813q0 -225 -14 -407h8l820 1220h186v-1462h-160v805q0 201 17 422h-9l-821 -1227h-186v1462zM499 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM880 1731q0 52 26.5 75t63.5 23 t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x4e5;" horiz-adv-x="1298" d="M176 0zM332 1096v-695l-7 -182l-3 -57l593 934h207v-1096h-155v670l3 132l5 130l-592 -932h-207v1096h156zM370 1393q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM751 1393q0 52 26.5 75t63.5 23t64.5 -23 t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x4e6;" horiz-adv-x="1595" d="M125 0zM1470 733q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5 t-126.5 -446.5zM518 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM899 1731q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x4e7;" horiz-adv-x="1237" d="M115 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414zM287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319z M338 1393q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM719 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x4e8;" horiz-adv-x="1597" d="M125 0zM1470 733q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552zM799 129q229 0 352.5 136.5t136.5 404.5h-981q13 -267 137.5 -404t354.5 -137zM801 1333q-224 0 -349.5 -129t-144.5 -385h979 q-17 254 -139 384t-346 130z" />
-<glyph unicode="&#x4e9;" horiz-adv-x="1237" d="M115 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414zM618 119q158 0 240 92t92 283h-663q9 -186 89 -280.5t242 -94.5zM616 975q-156 0 -235 -86.5t-92 -253.5h659 q-15 168 -95.5 254t-236.5 86z" />
-<glyph unicode="&#x4ea;" horiz-adv-x="1597" d="M125 0zM1470 733q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552zM799 129q229 0 352.5 136.5t136.5 404.5h-981q13 -267 137.5 -404t354.5 -137zM801 1333q-224 0 -349.5 -129t-144.5 -385h979 q-17 254 -139 384t-346 130zM518 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM899 1731q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x4eb;" horiz-adv-x="1237" d="M115 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414zM618 119q158 0 240 92t92 283h-663q9 -186 89 -280.5t242 -94.5zM616 975q-156 0 -235 -86.5t-92 -253.5h659 q-15 168 -95.5 254t-236.5 86zM336 1393q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM717 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x4ec;" horiz-adv-x="1290" d="M61 0zM467 1331q-172 0 -334 -76l-72 144q172 84 408 84q217 0 373.5 -88t237.5 -251t81 -384q0 -376 -182 -578t-524 -202q-227 0 -383 57v149q83 -21 169 -38t185 -17q271 0 409 144.5t146 416.5h-719v152h717q-22 229 -157.5 358t-354.5 129zM290 1731q0 52 26.5 75 t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM671 1731q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x4ed;" horiz-adv-x="1008" d="M57 0zM342 -20q-167 0 -285 57v147q60 -23 130 -41t161 -18q174 0 268.5 93t104.5 278h-555v141h553q-16 172 -100.5 252t-245.5 80q-103 0 -254 -54l-47 140q55 26 137 43.5t162 17.5q256 0 389 -146.5t133 -422.5q0 -269 -144.5 -418t-406.5 -149zM195 1393 q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM576 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x4ee;" horiz-adv-x="1272" d="M27 0zM293 -20q-111 0 -195 30v166q93 -43 189 -43q110 0 176.5 50.5t132.5 189.5l-569 1089h188l432 -831q25 -49 39 -96h8q28 84 39 106l359 821h180l-467 -1046q-84 -187 -151.5 -272t-152 -124.5t-208.5 -39.5zM348 1716h600v-137h-600v137z" />
-<glyph unicode="&#x4ef;" horiz-adv-x="1032" d="M2 0zM2 1096h178l240 -625q79 -214 98 -309h8q13 51 54.5 174.5t271.5 759.5h178l-471 -1248q-70 -185 -163.5 -262.5t-229.5 -77.5q-76 0 -150 17v133q55 -12 123 -12q171 0 244 192l61 156zM218 1378h600v-137h-600v137z" />
-<glyph unicode="&#x4f0;" horiz-adv-x="1272" d="M27 0zM293 -20q-111 0 -195 30v166q93 -43 189 -43q110 0 176.5 50.5t132.5 189.5l-569 1089h188l432 -831q25 -49 39 -96h8q28 84 39 106l359 821h180l-467 -1046q-84 -187 -151.5 -272t-152 -124.5t-208.5 -39.5zM368 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23 t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM749 1731q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x4f1;" horiz-adv-x="1032" d="M2 0zM2 1096h178l240 -625q79 -214 98 -309h8q13 51 54.5 174.5t271.5 759.5h178l-471 -1248q-70 -185 -163.5 -262.5t-229.5 -77.5q-76 0 -150 17v133q55 -12 123 -12q171 0 244 192l61 156zM236 1393q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5 t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM617 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x4f2;" horiz-adv-x="1272" d="M27 0zM293 -20q-111 0 -195 30v166q93 -43 189 -43q110 0 176.5 50.5t132.5 189.5l-569 1089h188l432 -831q25 -49 39 -96h8q28 84 39 106l359 821h180l-467 -1046q-84 -187 -151.5 -272t-152 -124.5t-208.5 -39.5zM372 1604q36 48 91 141t86 162h186v-21 q-37 -63 -122.5 -161t-143.5 -146h-97v25zM729 1604q49 68 99.5 156.5t76.5 146.5h186v-21q-37 -63 -122.5 -161t-143.5 -146h-96v25z" />
-<glyph unicode="&#x4f3;" horiz-adv-x="1032" d="M2 0zM2 1096h178l240 -625q79 -214 98 -309h8q13 51 54.5 174.5t271.5 759.5h178l-471 -1248q-70 -185 -163.5 -262.5t-229.5 -77.5q-76 0 -150 17v133q55 -12 123 -12q171 0 244 192l61 156zM235 1266q36 48 91 141t86 162h186v-21q-37 -63 -122.5 -161t-143.5 -146h-97 v25zM592 1266q49 68 99.5 156.5t76.5 146.5h186v-21q-37 -63 -122.5 -161t-143.5 -146h-96v25z" />
-<glyph unicode="&#x4f4;" horiz-adv-x="1423" d="M170 0zM1223 0h-170v604q-149 -53 -248 -72.5t-205 -19.5q-207 0 -318.5 95t-111.5 274v581h170v-561q0 -121 63.5 -179t206.5 -58q97 0 185.5 14.5t257.5 69.5v714h170v-1462zM415 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5 q-37 0 -63.5 24.5t-26.5 74.5zM796 1731q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x4f5;" horiz-adv-x="1245" d="M156 0zM322 1096v-400q0 -192 219 -192q91 0 174 28t188 95v469h166v-1096h-166v496q-105 -72 -194.5 -101.5t-202.5 -29.5q-164 0 -257 86t-93 233v412h166zM332 1393q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5 t-26.5 74.5zM713 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x4f6;" horiz-adv-x="1079" d="M201 1462h831v-153h-661v-1155h161v-535h-161v381h-170v1462z" />
-<glyph unicode="&#x4f7;" horiz-adv-x="877" d="M176 1094h658v-140h-492v-811h150v-520h-166v377h-150v1094z" />
-<glyph unicode="&#x4f8;" horiz-adv-x="1747" d="M201 0zM201 0v1462h170v-624h239q261 0 398 -102.5t137 -309.5q0 -206 -129.5 -316t-378.5 -110h-436zM371 145h247q181 0 266 70.5t85 210.5q0 137 -89.5 198.5t-289.5 61.5h-219v-541zM1546 0h-170v1462h170v-1462zM592 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23 t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM973 1731q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x4f9;" horiz-adv-x="1577" d="M176 0zM342 643h299q209 0 309.5 -77.5t100.5 -231.5q0 -165 -106.5 -249.5t-313.5 -84.5h-455v1096h166v-453zM1401 0h-166v1096h166v-1096zM342 500v-361h281q264 0 264 185q0 92 -61 134t-208 42h-276zM506 1393q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75 q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM887 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x4fa;" horiz-adv-x="1079" d="M47 0zM1032 1462v-153h-661v-510h424v-150h-424v-649h-170v649h-154v150h154v663h831zM516 154v-289q0 -260 -228 -260q-56 0 -116 24v140q41 -19 102 -19q94 0 94 100v304h148z" />
-<glyph unicode="&#x4fb;" horiz-adv-x="877" d="M18 0zM834 956h-492v-344h346v-127h-346v-485h-166v485h-158v127h158v484h658v-140zM486 143v-278q0 -260 -228 -260q-56 0 -116 24v140q41 -19 102 -19q94 0 94 100v293h148z" />
-<glyph unicode="&#x4fc;" horiz-adv-x="1272" d="M8 0zM1174 0h-193l-393 643l-400 -643h-180l486 764l-453 698h188l363 -579l366 579h181l-453 -692zM1225 154v-289q0 -260 -228 -260q-56 0 -116 24v140q41 -19 102 -19q94 0 94 100v304h148z" />
-<glyph unicode="&#x4fd;" horiz-adv-x="1106" d="M39 0zM440 561l-381 535h189l289 -420l288 420h187l-381 -535l401 -561h-188l-307 444l-310 -444h-188zM1076 143v-278q0 -260 -228 -260q-56 0 -116 24v140q41 -19 102 -19q94 0 94 100v293h148z" />
-<glyph unicode="&#x4fe;" horiz-adv-x="1182" d="M127 852h307l-393 610h188l363 -581l364 581h183l-400 -610h316v-152h-326l445 -700h-193l-393 643l-400 -643h-182l447 700h-326v152z" />
-<glyph unicode="&#x4ff;" horiz-adv-x="1073" d="M117 631h274l-332 465h189l289 -420l288 420h187l-334 -465h280v-129h-286l360 -502h-188l-307 444l-310 -444h-188l358 502h-280v129z" />
-<glyph unicode="&#x500;" horiz-adv-x="1255" d="M131 420q0 212 146 315t434 103h198v624h170v-1462h-413q-267 0 -401 106.5t-134 313.5zM909 688h-186q-222 0 -319 -62t-97 -204q0 -143 91 -209t294 -66h217v541z" />
-<glyph unicode="&#x501;" horiz-adv-x="1255" d="M115 0zM922 147h-9q-115 -167 -344 -167q-215 0 -334.5 147t-119.5 418t120 421t334 150q223 0 342 -162h13l-7 79l-4 77v446h166v-1556h-135zM590 119q170 0 246.5 92.5t76.5 298.5v35q0 233 -77.5 332.5t-247.5 99.5q-146 0 -223.5 -113.5t-77.5 -320.5q0 -210 77 -317 t226 -107z" />
-<glyph unicode="&#x502;" horiz-adv-x="1841" d="M590 -18q-226 0 -342.5 104.5t-116.5 312.5q0 217 149 328t439 111h145v624h170v-1097q0 -236 230 -236q100 0 160.5 61.5t60.5 171.5v486h170v-488q0 -174 -103.5 -277t-287.5 -103q-118 0 -197.5 41t-130.5 131q-113 -170 -346 -170zM864 686h-151q-212 0 -309 -69.5 t-97 -219.5q0 -268 289 -268q127 0 197.5 59.5t70.5 171.5v326z" />
-<glyph unicode="&#x503;" horiz-adv-x="1835" d="M1278 119q118 0 171.5 66t53.5 202v313h168v-323q0 -200 -100 -298.5t-289 -98.5q-129 0 -208 45.5t-122 158.5h-8q-75 -113 -167.5 -158.5t-221.5 -45.5q-208 0 -324 148.5t-116 416.5t115.5 419.5t322.5 151.5q106 0 185.5 -38.5t142.5 -123.5h12q-2 17 -6 73t-4 83 v446h166v-1140q0 -160 54.5 -228.5t174.5 -68.5zM575 119q162 0 235 92.5t73 298.5v35q0 231 -74 331.5t-236 100.5q-286 0 -286 -434q0 -214 69.5 -319t218.5 -105z" />
-<glyph unicode="&#x504;" horiz-adv-x="1851" d="M430 684h-201v143h193q192 0 298.5 73.5t106.5 205.5q0 108 -77 171.5t-205 63.5q-103 0 -191.5 -27.5t-191.5 -96.5l-84 114q93 72 216 112t253 40q214 0 336.5 -98t122.5 -265q0 -141 -89 -232.5t-245 -117.5v-8q354 -51 360 -354q2 -150 56 -213.5t178 -63.5 q119 0 175 60.5t56 195.5v461h168v-471q0 -198 -105 -297.5t-294 -99.5q-202 0 -306 104.5t-106 304.5q-2 150 -104.5 222.5t-319.5 72.5z" />
-<glyph unicode="&#x505;" horiz-adv-x="1642" d="M1090 119q221 0 221 268v313h166v-323q0 -202 -93.5 -299.5t-289.5 -97.5q-378 0 -394 333q-5 99 -75.5 143t-218.5 44h-140v141h111q289 0 289 172q0 162 -242 162q-75 0 -142.5 -18t-144.5 -52l-57 135q85 40 166.5 58t185.5 18q184 0 289.5 -77.5t105.5 -211.5 q0 -184 -192 -241v-8q99 -20 160.5 -81t66.5 -167q9 -211 228 -211z" />
-<glyph unicode="&#x506;" horiz-adv-x="1280" d="M899 412q0 133 -114.5 202.5t-340.5 69.5h-217v143h209q205 0 317.5 73.5t112.5 205.5q0 107 -82 171t-217 64q-105 0 -202.5 -29t-202.5 -95l-84 114q97 74 224 113t259 39q220 0 346.5 -98t126.5 -265q0 -140 -94.5 -231.5t-257.5 -116.5v-8q184 -25 281.5 -114.5 t97.5 -237.5v-258h172v-535h-162v381h-172v412z" />
-<glyph unicode="&#x507;" horiz-adv-x="1071" d="M725 301q0 199 -309 199h-150v141h117q313 0 313 172q0 82 -66.5 122t-185.5 40q-153 0 -303 -70l-61 135q161 74 364 74q191 0 297.5 -77t106.5 -212q0 -182 -203 -239v-11q126 -37 182 -105.5t56 -170.5v-156h157v-520h-166v377h-149v301z" />
-<glyph unicode="&#x508;" horiz-adv-x="2009" d="M1036 1311h-440l-31 -240q-43 -338 -81 -560t-79.5 -327t-106.5 -156t-165 -51q-69 0 -133 25v143q50 -26 113 -26q49 0 81 31t54 83t50 181t65 373.5t92 674.5h751v-1073q0 -137 55.5 -197.5t170.5 -60.5q112 0 168.5 60.5t56.5 195.5v461h168v-471q0 -193 -102.5 -295 t-290.5 -102q-196 0 -296 102t-100 299v930z" />
-<glyph unicode="&#x509;" horiz-adv-x="1743" d="M975 387q0 -137 52 -202.5t171 -65.5q213 0 213 266v315h166v-323q0 -202 -93.5 -299.5t-283.5 -97.5q-188 0 -289.5 98t-101.5 301v573h-315q-28 -360 -75 -566t-123 -302t-194 -96q-58 0 -86 10v127q22 -6 50 -6q113 0 181.5 236.5t102.5 738.5h625v-707z" />
-<glyph unicode="&#x50a;" horiz-adv-x="2073" d="M1270 389q0 -137 55 -197.5t170 -60.5q112 0 168.5 60.5t56.5 195.5v461h166v-471q0 -191 -100 -294t-291 -103q-195 0 -295 101.5t-100 299.5v307h-729v-688h-170v1462h170v-622h729v622h170v-1073z" />
-<glyph unicode="&#x50b;" horiz-adv-x="1870" d="M342 1096v-459h592v459h166v-707q0 -137 53 -203.5t172 -66.5q213 0 213 268v313h166v-323q0 -202 -93.5 -299.5t-285.5 -97.5q-186 0 -288.5 99t-102.5 300v115h-592v-494h-166v1096h166z" />
-<glyph unicode="&#x50c;" horiz-adv-x="1548" d="M870 752h564v-86q0 -351 -154 -518.5t-465 -167.5q-325 0 -507.5 200.5t-182.5 552.5q0 229 89.5 399t260 260.5t404.5 90.5q120 0 238.5 -24.5t201.5 -63.5l-66 -148q-90 38 -197 61t-194 23q-267 0 -412 -157.5t-145 -442.5t133.5 -443.5t380.5 -158.5q436 0 436 471 h-385v152z" />
-<glyph unicode="&#x50d;" horiz-adv-x="1311" d="M690 575h510v-67q0 -528 -514 -528q-274 0 -422.5 147.5t-148.5 419.5q0 270 161.5 419.5t450.5 149.5q212 0 387 -80l-59 -131q-168 74 -334 74q-205 0 -319.5 -111t-114.5 -321q0 -207 102 -318.5t299 -111.5q169 0 256.5 80t87.5 237h-342v141z" />
-<glyph unicode="&#x50e;" horiz-adv-x="1454" d="M16 1309v153h1084v-153h-465v-920q0 -137 59.5 -198.5t173.5 -61.5q232 0 232 256v463h168v-471q0 -192 -105.5 -294.5t-294.5 -102.5q-198 0 -300.5 103t-102.5 298v928h-449z" />
-<glyph unicode="&#x50f;" horiz-adv-x="1325" d="M897 954h-346v-567q0 -137 54.5 -202.5t172.5 -65.5q215 0 215 260v321h166v-323q0 -202 -94.5 -299.5t-286.5 -97.5t-292.5 101.5t-100.5 297.5v575h-344v140h856v-140z" />
-<glyph unicode="&#x510;" horiz-adv-x="1194" d="M156 1116q0 169 132 268t357 99q258 0 467 -144l-94 -120q-105 68 -195.5 94t-191.5 26q-140 0 -219.5 -61.5t-79.5 -175.5q0 -128 104.5 -201.5t304.5 -73.5h217v-141h-213q-222 0 -338 -71t-116 -209q0 -142 101 -212.5t284 -70.5q233 0 432 92v-158q-175 -77 -436 -77 q-268 0 -414.5 110t-146.5 307q0 151 103.5 247t291.5 118v8q-170 25 -260 114t-90 232z" />
-<glyph unicode="&#x511;" horiz-adv-x="973" d="M90 0zM715 641v-141h-148q-311 0 -311 -195q0 -90 73.5 -139t219.5 -49q84 0 167 19.5t183 66.5v-148q-137 -75 -358 -75q-210 0 -330.5 84.5t-120.5 232.5q0 98 55 163.5t185 106.5v11q-98 28 -151.5 91.5t-53.5 155.5q0 133 112 212t304 79q97 0 179.5 -16.5 t182.5 -61.5l-63 -133q-94 42 -159 56t-144 14q-250 0 -250 -162q0 -172 317 -172h111z" />
-<glyph unicode="&#x512;" horiz-adv-x="1434" d="M0 0zM1241 0h-170v1311h-475l-31 -240q-61 -479 -107.5 -700.5t-122.5 -308.5t-202 -85q-74 0 -133 25v143q54 -26 113 -26q53 0 92.5 43.5t70 151t77 408t102.5 740.5h786v-1462zM1387 154v-289q0 -260 -228 -260q-56 0 -116 24v140q41 -19 102 -19q94 0 94 100v304h148 z" />
-<glyph unicode="&#x513;" horiz-adv-x="1169" d="M16 0zM993 0h-168v954h-329q-27 -356 -75 -565t-124.5 -306t-194.5 -97q-54 0 -86 12v123q22 -6 50 -6q115 0 183 243t103 738h641v-1096zM1139 143v-278q0 -260 -228 -260q-56 0 -116 24v140q41 -19 102 -19q94 0 94 100v293h148z" />
-<glyph unicode="&#x1e00;" horiz-adv-x="1296" d="M0 0zM1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473zM874 -338q0 -97 -62.5 -157t-164.5 -60q-101 0 -161 58.5t-60 156.5t60 156.5t161 58.5t164 -59t63 -154zM764 -340 q0 57 -33 87t-84 30t-84 -30t-33 -87q0 -56 30 -86.5t87 -30.5q53 0 85 30.5t32 86.5z" />
-<glyph unicode="&#x1e01;" d="M94 0zM850 0l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123zM475 117q155 0 243.5 85 t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5q0 -90 54.5 -137t152.5 -47zM764 -338q0 -97 -62.5 -157t-164.5 -60q-101 0 -161 58.5t-60 156.5t60 156.5t161 58.5t164 -59t63 -154zM654 -340q0 57 -33 87t-84 30t-84 -30t-33 -87q0 -56 30 -86.5t87 -30.5 q53 0 85 30.5t32 86.5z" />
-<glyph unicode="&#x1e3e;" horiz-adv-x="1849" d="M201 0zM848 0l-496 1296h-8q14 -154 14 -366v-930h-157v1462h256l463 -1206h8l467 1206h254v-1462h-170v942q0 162 14 352h-8l-500 -1294h-137zM805 1606q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x1e3f;" horiz-adv-x="1905" d="M176 0zM1573 0v713q0 131 -56 196.5t-174 65.5q-155 0 -229 -89t-74 -274v-612h-166v713q0 131 -56 196.5t-175 65.5q-156 0 -228.5 -93.5t-72.5 -306.5v-575h-166v1096h135l27 -150h8q47 80 132.5 125t191.5 45q257 0 336 -186h8q49 86 142 136t212 50 q186 0 278.5 -95.5t92.5 -305.5v-715h-166zM854 1266q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x1e80;" horiz-adv-x="1896" d="M27 0zM1477 0h-168l-295 979q-21 65 -47 164t-27 119q-22 -132 -70 -289l-286 -973h-168l-389 1462h180l231 -903q48 -190 70 -344q27 183 80 358l262 889h180l275 -897q48 -155 81 -350q19 142 72 346l230 901h180zM1065 1579h-110q-65 52 -154 148t-129 159v21h203 q32 -69 89 -159.5t101 -143.5v-25z" />
-<glyph unicode="&#x1e81;" horiz-adv-x="1593" d="M23 0zM1071 0l-201 643q-19 59 -71 268h-8q-40 -175 -70 -270l-207 -641h-192l-299 1096h174q106 -413 161.5 -629t63.5 -291h8q11 57 35.5 147.5t42.5 143.5l201 629h180l196 -629q56 -172 76 -289h8q4 36 21.5 111t208.5 807h172l-303 -1096h-197zM901 1241h-110 q-65 52 -154 148t-129 159v21h203q32 -69 89 -159.5t101 -143.5v-25z" />
-<glyph unicode="&#x1e82;" horiz-adv-x="1896" d="M27 0zM1477 0h-168l-295 979q-21 65 -47 164t-27 119q-22 -132 -70 -289l-286 -973h-168l-389 1462h180l231 -903q48 -190 70 -344q27 183 80 358l262 889h180l275 -897q48 -155 81 -350q19 142 72 346l230 901h180zM825 1604q48 62 103.5 150t87.5 153h202v-21 q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x1e83;" horiz-adv-x="1593" d="M23 0zM1071 0l-201 643q-19 59 -71 268h-8q-40 -175 -70 -270l-207 -641h-192l-299 1096h174q106 -413 161.5 -629t63.5 -291h8q11 57 35.5 147.5t42.5 143.5l201 629h180l196 -629q56 -172 76 -289h8q4 36 21.5 111t208.5 807h172l-303 -1096h-197zM676 1266 q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x1e84;" horiz-adv-x="1896" d="M27 0zM1477 0h-168l-295 979q-21 65 -47 164t-27 119q-22 -132 -70 -289l-286 -973h-168l-389 1462h180l231 -903q48 -190 70 -344q27 183 80 358l262 889h180l275 -897q48 -155 81 -350q19 142 72 346l230 901h180zM665 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23 t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM1046 1731q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x1e85;" horiz-adv-x="1593" d="M23 0zM1071 0l-201 643q-19 59 -71 268h-8q-40 -175 -70 -270l-207 -641h-192l-299 1096h174q106 -413 161.5 -629t63.5 -291h8q11 57 35.5 147.5t42.5 143.5l201 629h180l196 -629q56 -172 76 -289h8q4 36 21.5 111t208.5 807h172l-303 -1096h-197zM516 1393 q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM897 1393q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph unicode="&#x1ea0;" horiz-adv-x="1296" d="M0 0zM1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473zM548 -242q0 57 29.5 84t71.5 27q40 0 69 -27t29 -84q0 -55 -29 -82.5t-69 -27.5q-42 0 -71.5 27.5t-29.5 82.5z" />
-<glyph unicode="&#x1ea1;" d="M94 0zM850 0l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123zM475 117q155 0 243.5 85 t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5q0 -90 54.5 -137t152.5 -47zM436 -242q0 57 29.5 84t71.5 27q40 0 69 -27t29 -84q0 -55 -29 -82.5t-69 -27.5q-42 0 -71.5 27.5t-29.5 82.5z" />
-<glyph unicode="&#x1ea2;" horiz-adv-x="1296" d="M0 0zM1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473zM879 1833q0 -140 -166 -174l-10 -113h-105l-12 176q86 14 125 39t39 68t-33.5 63.5t-106.5 20.5q-62 0 -94 -6v100 q38 10 107 10q256 0 256 -184z" />
-<glyph unicode="&#x1ea3;" d="M94 0zM850 0l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123zM475 117q155 0 243.5 85 t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5q0 -90 54.5 -137t152.5 -47zM793 1495q0 -140 -166 -174l-10 -113h-105l-12 176q86 14 125 39t39 68t-33.5 63.5t-106.5 20.5q-62 0 -94 -6v100q38 10 107 10q256 0 256 -184z" />
-<glyph unicode="&#x1ea4;" horiz-adv-x="1296" d="M0 0zM1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473zM952 1579h-94q-112 75 -211 166q-114 -101 -211 -166h-94v25l53 60q112 123 164 200h176q66 -94 217 -260v-25zM872 1798 q73 91 127 203h172v-21q-83 -110 -203 -206h-96v24z" />
-<glyph unicode="&#x1ea5;" d="M94 0zM850 0l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123zM475 117q155 0 243.5 85 t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5q0 -90 54.5 -137t152.5 -47zM870 1241h-94q-112 75 -211 166q-114 -101 -211 -166h-94v25l53 60q112 123 164 200h176q66 -94 217 -260v-25zM790 1460q73 91 127 203h172v-21q-83 -110 -203 -206h-96v24z" />
-<glyph unicode="&#x1ea6;" horiz-adv-x="1296" d="M0 0zM1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473zM948 1579h-94q-97 65 -211 166q-106 -96 -211 -166h-94v23l53 60q112 123 164 200h176q66 -94 217 -260v-23zM418 1774h-95 q-120 94 -204 206v21h172q52 -108 127 -205v-22z" />
-<glyph unicode="&#x1ea7;" d="M45 0zM850 0l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123zM475 117q155 0 243.5 85 t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5q0 -90 54.5 -137t152.5 -47zM874 1241h-94q-97 65 -211 166q-106 -96 -211 -166h-94v23l53 60q112 123 164 200h176q66 -94 217 -260v-23zM344 1436h-95q-120 94 -204 206v21h172q52 -108 127 -205v-22z" />
-<glyph unicode="&#x1ea8;" horiz-adv-x="1296" d="M0 0zM1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473zM940 1579h-94q-112 75 -211 166q-114 -101 -211 -166h-94v25l53 60q112 123 164 200h176q66 -94 217 -260v-25zM1108 1983 q0 -103 -127 -132l-6 -81h-80l-10 131q57 9 88.5 25t31.5 54q0 37 -28.5 49.5t-71.5 12.5q-46 0 -72 -6v80q25 6 80 6q195 0 195 -139z" />
-<glyph unicode="&#x1ea9;" d="M94 0zM850 0l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123zM475 117q155 0 243.5 85 t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5q0 -90 54.5 -137t152.5 -47zM879 1241h-94q-112 75 -211 166q-114 -101 -211 -166h-94v25l53 60q112 123 164 200h176q66 -94 217 -260v-25zM1047 1645q0 -103 -127 -132l-6 -81h-80l-10 131q57 9 88.5 25t31.5 54 q0 37 -28.5 49.5t-71.5 12.5q-46 0 -72 -6v80q25 6 80 6q195 0 195 -139z" />
-<glyph unicode="&#x1eaa;" horiz-adv-x="1296" d="M0 0zM1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473zM786 1927q-37 0 -72.5 15t-69 33.5t-65 33.5t-59.5 15q-40 0 -61 -24.5t-35 -74.5h-91q13 106 63.5 162.5t125.5 56.5 q37 0 73.5 -15t70 -33t64.5 -33t58 -15q40 0 61 24.5t33 73.5h90q-11 -104 -60.5 -161.5t-125.5 -57.5zM956 1579h-94q-97 65 -211 166q-106 -96 -211 -166h-94v23l53 60q112 123 164 200h176q66 -94 217 -260v-23z" />
-<glyph unicode="&#x1eab;" d="M94 0zM850 0l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123zM475 117q155 0 243.5 85 t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5q0 -90 54.5 -137t152.5 -47zM702 1589q-37 0 -72.5 15t-69 33.5t-65 33.5t-59.5 15q-40 0 -61 -24.5t-35 -74.5h-91q13 106 63.5 162.5t125.5 56.5q37 0 73.5 -15t70 -33t64.5 -33t58 -15q40 0 61 24.5t33 73.5h90 q-11 -104 -60.5 -161.5t-125.5 -57.5zM872 1241h-94q-97 65 -211 166q-106 -96 -211 -166h-94v23l53 60q112 123 164 200h176q66 -94 217 -260v-23z" />
-<glyph unicode="&#x1eac;" horiz-adv-x="1296" d="M0 0zM1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473zM548 -242q0 57 29.5 84t71.5 27q40 0 69 -27t29 -84q0 -55 -29 -82.5t-69 -27.5q-42 0 -71.5 27.5t-29.5 82.5zM311 1602 q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#x1ead;" d="M94 0zM850 0l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123zM475 117q155 0 243.5 85 t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5q0 -90 54.5 -137t152.5 -47zM436 -242q0 57 29.5 84t71.5 27q40 0 69 -27t29 -84q0 -55 -29 -82.5t-69 -27.5q-42 0 -71.5 27.5t-29.5 82.5zM224 1264q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5 v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#x1eae;" horiz-adv-x="1296" d="M0 0zM1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473zM586 1862q80 104 129 205h172v-21q-86 -114 -205 -207h-96v23zM648 1579q-276 0 -291 260h102q9 -72 47 -100.5t144 -28.5 q98 0 141 32.5t51 96.5h105q-11 -120 -85.5 -190t-213.5 -70z" />
-<glyph unicode="&#x1eaf;" d="M94 0zM850 0l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123zM475 117q155 0 243.5 85 t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5q0 -90 54.5 -137t152.5 -47zM504 1524q80 104 129 205h172v-21q-86 -114 -205 -207h-96v23zM566 1241q-276 0 -291 260h102q9 -72 47 -100.5t144 -28.5q98 0 141 32.5t51 96.5h105q-11 -120 -85.5 -190t-213.5 -70z " />
-<glyph unicode="&#x1eb0;" horiz-adv-x="1296" d="M0 0zM1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473zM698 1839h-94q-119 93 -205 207v21h172q52 -108 127 -205v-23zM645 1579q-276 0 -291 260h102q9 -72 47 -100.5t144 -28.5 q98 0 141 32.5t51 96.5h105q-11 -120 -85.5 -190t-213.5 -70z" />
-<glyph unicode="&#x1eb1;" d="M94 0zM850 0l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123zM475 117q155 0 243.5 85 t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5q0 -90 54.5 -137t152.5 -47zM617 1501h-94q-119 93 -205 207v21h172q52 -108 127 -205v-23zM564 1241q-276 0 -291 260h102q9 -72 47 -100.5t144 -28.5q98 0 141 32.5t51 96.5h105q-11 -120 -85.5 -190t-213.5 -70z " />
-<glyph unicode="&#x1eb2;" horiz-adv-x="1296" d="M0 0zM1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473zM794 1995q0 -100 -127 -129l-6 -41h-82l-10 90q57 9 90 25t33 53t-28.5 50t-72.5 13q-37 0 -73 -6v78q22 8 84 8 q192 0 192 -141zM645 1579q-276 0 -291 260h102q9 -72 47 -100.5t144 -28.5q98 0 141 32.5t51 96.5h105q-11 -120 -85.5 -190t-213.5 -70z" />
-<glyph unicode="&#x1eb3;" d="M94 0zM850 0l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123zM475 117q155 0 243.5 85 t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5q0 -90 54.5 -137t152.5 -47zM721 1657q0 -100 -127 -129l-6 -41h-82l-10 90q57 9 90 25t33 53t-28.5 50t-72.5 13q-37 0 -73 -6v78q22 8 84 8q192 0 192 -141zM572 1241q-276 0 -291 260h102q9 -72 47 -100.5 t144 -28.5q98 0 141 32.5t51 96.5h105q-11 -120 -85.5 -190t-213.5 -70z" />
-<glyph unicode="&#x1eb4;" horiz-adv-x="1296" d="M0 0zM1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473zM784 1925q-37 0 -72.5 15t-69 33t-65 33t-59.5 15q-40 0 -61 -24t-35 -74h-91q13 104 63 160.5t126 56.5q37 0 73.5 -15 t70 -33t64.5 -33t58 -15q40 0 61 24.5t33 73.5h90q-11 -103 -60.5 -160t-125.5 -57zM639 1579q-276 0 -291 260h102q9 -72 47 -100.5t144 -28.5q98 0 141 32.5t51 96.5h105q-11 -120 -85.5 -190t-213.5 -70z" />
-<glyph unicode="&#x1eb5;" d="M94 0zM850 0l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123zM475 117q155 0 243.5 85 t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5q0 -90 54.5 -137t152.5 -47zM709 1587q-37 0 -72.5 15t-69 33t-65 33t-59.5 15q-40 0 -61 -24t-35 -74h-91q13 104 63 160.5t126 56.5q37 0 73.5 -15t70 -33t64.5 -33t58 -15q40 0 61 24.5t33 73.5h90 q-11 -103 -60.5 -160t-125.5 -57zM564 1241q-276 0 -291 260h102q9 -72 47 -100.5t144 -28.5q98 0 141 32.5t51 96.5h105q-11 -120 -85.5 -190t-213.5 -70z" />
-<glyph unicode="&#x1eb6;" horiz-adv-x="1296" d="M0 0zM1120 0l-182 465h-586l-180 -465h-172l578 1468h143l575 -1468h-176zM885 618l-170 453q-33 86 -68 211q-22 -96 -63 -211l-172 -453h473zM643 1597q-140 0 -218 68.5t-87 199.5h104q6 -49 26.5 -77t57 -41t121.5 -13q101 0 149 32t58 99h104q-10 -126 -93.5 -197 t-221.5 -71zM548 -242q0 57 29.5 84t71.5 27q40 0 69 -27t29 -84q0 -55 -29 -82.5t-69 -27.5q-42 0 -71.5 27.5t-29.5 82.5z" />
-<glyph unicode="&#x1eb7;" d="M94 0zM850 0l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123zM475 117q155 0 243.5 85 t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5q0 -90 54.5 -137t152.5 -47zM558 1241q-140 0 -218 68.5t-87 199.5h104q6 -49 26.5 -77t57 -41t121.5 -13q101 0 149 32t58 99h104q-10 -126 -93.5 -197t-221.5 -71zM436 -242q0 57 29.5 84t71.5 27q40 0 69 -27 t29 -84q0 -55 -29 -82.5t-69 -27.5q-42 0 -71.5 27.5t-29.5 82.5z" />
-<glyph unicode="&#x1eb8;" d="M201 0zM1016 0h-815v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152zM508 -242q0 57 29.5 84t71.5 27q40 0 69 -27t29 -84q0 -55 -29 -82.5t-69 -27.5q-42 0 -71.5 27.5t-29.5 82.5z" />
-<glyph unicode="&#x1eb9;" horiz-adv-x="1149" d="M115 0zM639 -20q-243 0 -383.5 148t-140.5 411q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5zM594 977q-132 0 -210.5 -86t-92.5 -238h573q0 157 -70 240.5 t-200 83.5zM499 -242q0 57 29.5 84t71.5 27q40 0 69 -27t29 -84q0 -55 -29 -82.5t-69 -27.5q-42 0 -71.5 27.5t-29.5 82.5z" />
-<glyph unicode="&#x1eba;" d="M201 0zM1016 0h-815v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152zM836 1833q0 -140 -166 -174l-10 -113h-105l-12 176q86 14 125 39t39 68t-33.5 63.5t-106.5 20.5q-62 0 -94 -6v100q38 10 107 10q256 0 256 -184z" />
-<glyph unicode="&#x1ebb;" horiz-adv-x="1149" d="M115 0zM639 -20q-243 0 -383.5 148t-140.5 411q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5zM594 977q-132 0 -210.5 -86t-92.5 -238h573q0 157 -70 240.5 t-200 83.5zM828 1495q0 -140 -166 -174l-10 -113h-105l-12 176q86 14 125 39t39 68t-33.5 63.5t-106.5 20.5q-62 0 -94 -6v100q38 10 107 10q256 0 256 -184z" />
-<glyph unicode="&#x1ebc;" d="M201 0zM1016 0h-815v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152zM760 1581q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5q-50 0 -75.5 -30t-39.5 -91h-98q13 121 70.5 189.5t148.5 68.5q46 0 89 -18.5t82 -41t75 -41t68 -18.5q49 0 73 29.5t39 91.5h99 q-13 -121 -69.5 -189.5t-150.5 -68.5z" />
-<glyph unicode="&#x1ebd;" horiz-adv-x="1149" d="M115 0zM639 -20q-243 0 -383.5 148t-140.5 411q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5zM594 977q-132 0 -210.5 -86t-92.5 -238h573q0 157 -70 240.5 t-200 83.5zM740 1243q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5q-50 0 -75.5 -30t-39.5 -91h-98q13 121 70.5 189.5t148.5 68.5q46 0 89 -18.5t82 -41t75 -41t68 -18.5q49 0 73 29.5t39 91.5h99q-13 -121 -69.5 -189.5t-150.5 -68.5z" />
-<glyph unicode="&#x1ebe;" d="M201 0zM1016 0h-815v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152zM916 1579h-94q-112 75 -211 166q-114 -101 -211 -166h-94v25l53 60q112 123 164 200h176q66 -94 217 -260v-25zM836 1798q73 91 127 203h172v-21q-83 -110 -203 -206h-96v24z" />
-<glyph unicode="&#x1ebf;" horiz-adv-x="1149" d="M115 0zM639 -20q-243 0 -383.5 148t-140.5 411q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5zM594 977q-132 0 -210.5 -86t-92.5 -238h573q0 157 -70 240.5 t-200 83.5zM897 1241h-94q-112 75 -211 166q-114 -101 -211 -166h-94v25l53 60q112 123 164 200h176q66 -94 217 -260v-25zM817 1460q73 91 127 203h172v-21q-83 -110 -203 -206h-96v24z" />
-<glyph unicode="&#x1ec0;" d="M93 0zM1016 0h-815v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152zM922 1579h-94q-97 65 -211 166q-106 -96 -211 -166h-94v23l53 60q112 123 164 200h176q66 -94 217 -260v-23zM392 1774h-95q-120 94 -204 206v21h172q52 -108 127 -205v-22z" />
-<glyph unicode="&#x1ec1;" horiz-adv-x="1149" d="M74 0zM639 -20q-243 0 -383.5 148t-140.5 411q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5zM594 977q-132 0 -210.5 -86t-92.5 -238h573q0 157 -70 240.5 t-200 83.5zM903 1241h-94q-97 65 -211 166q-106 -96 -211 -166h-94v23l53 60q112 123 164 200h176q66 -94 217 -260v-23zM373 1436h-95q-120 94 -204 206v21h172q52 -108 127 -205v-22z" />
-<glyph unicode="&#x1ec2;" d="M201 0zM1016 0h-815v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152zM913 1579h-94q-112 75 -211 166q-114 -101 -211 -166h-94v25l53 60q112 123 164 200h176q66 -94 217 -260v-25zM1081 1983q0 -103 -127 -132l-6 -81h-80l-10 131q57 9 88.5 25t31.5 54 q0 37 -28.5 49.5t-71.5 12.5q-46 0 -72 -6v80q25 6 80 6q195 0 195 -139z" />
-<glyph unicode="&#x1ec3;" horiz-adv-x="1149" d="M115 0zM639 -20q-243 0 -383.5 148t-140.5 411q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5zM594 977q-132 0 -210.5 -86t-92.5 -238h573q0 157 -70 240.5 t-200 83.5zM885 1241h-94q-112 75 -211 166q-114 -101 -211 -166h-94v25l53 60q112 123 164 200h176q66 -94 217 -260v-25zM1053 1645q0 -103 -127 -132l-6 -81h-80l-10 131q57 9 88.5 25t31.5 54q0 37 -28.5 49.5t-71.5 12.5q-46 0 -72 -6v80q25 6 80 6q195 0 195 -139z " />
-<glyph unicode="&#x1ec4;" d="M201 0zM1016 0h-815v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152zM741 1927q-37 0 -72.5 15t-69 33.5t-65 33.5t-59.5 15q-40 0 -61 -24.5t-35 -74.5h-91q13 106 63.5 162.5t125.5 56.5q37 0 73.5 -15t70 -33t64.5 -33t58 -15q40 0 61 24.5t33 73.5h90 q-11 -104 -60.5 -161.5t-125.5 -57.5zM911 1579h-94q-97 65 -211 166q-106 -96 -211 -166h-94v23l53 60q112 123 164 200h176q66 -94 217 -260v-23z" />
-<glyph unicode="&#x1ec5;" horiz-adv-x="1149" d="M115 0zM639 -20q-243 0 -383.5 148t-140.5 411q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5zM594 977q-132 0 -210.5 -86t-92.5 -238h573q0 157 -70 240.5 t-200 83.5zM719 1589q-37 0 -72.5 15t-69 33.5t-65 33.5t-59.5 15q-40 0 -61 -24.5t-35 -74.5h-91q13 106 63.5 162.5t125.5 56.5q37 0 73.5 -15t70 -33t64.5 -33t58 -15q40 0 61 24.5t33 73.5h90q-11 -104 -60.5 -161.5t-125.5 -57.5zM889 1241h-94q-97 65 -211 166 q-106 -96 -211 -166h-94v23l53 60q112 123 164 200h176q66 -94 217 -260v-23z" />
-<glyph unicode="&#x1ec6;" d="M201 0zM1016 0h-815v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152zM505 -242q0 57 29.5 84t71.5 27q40 0 69 -27t29 -84q0 -55 -29 -82.5t-69 -27.5q-42 0 -71.5 27.5t-29.5 82.5zM270 1602q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23 h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#x1ec7;" horiz-adv-x="1149" d="M115 0zM639 -20q-243 0 -383.5 148t-140.5 411q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5zM594 977q-132 0 -210.5 -86t-92.5 -238h573q0 157 -70 240.5 t-200 83.5zM491 -242q0 57 29.5 84t71.5 27q40 0 69 -27t29 -84q0 -55 -29 -82.5t-69 -27.5q-42 0 -71.5 27.5t-29.5 82.5zM253 1264q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#x1ec8;" horiz-adv-x="571" d="M153 0zM201 0v1462h170v-1462h-170zM516 1833q0 -140 -166 -174l-10 -113h-105l-12 176q86 14 125 39t39 68t-33.5 63.5t-106.5 20.5q-62 0 -94 -6v100q38 10 107 10q256 0 256 -184z" />
-<glyph unicode="&#x1ec9;" horiz-adv-x="518" d="M123 0zM342 0h-166v1096h166v-1096zM486 1495q0 -140 -166 -174l-10 -113h-105l-12 176q86 14 125 39t39 68t-33.5 63.5t-106.5 20.5q-62 0 -94 -6v100q38 10 107 10q256 0 256 -184z" />
-<glyph unicode="&#x1eca;" horiz-adv-x="571" d="M184 0zM201 0v1462h170v-1462h-170zM184 -242q0 57 29.5 84t71.5 27q40 0 69 -27t29 -84q0 -55 -29 -82.5t-69 -27.5q-42 0 -71.5 27.5t-29.5 82.5z" />
-<glyph unicode="&#x1ecb;" horiz-adv-x="518" d="M157 0zM342 0h-166v1096h166v-1096zM162 1393q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5zM157 -242q0 57 29.5 84t71.5 27q40 0 69 -27t29 -84q0 -55 -29 -82.5t-69 -27.5q-42 0 -71.5 27.5t-29.5 82.5z" />
-<glyph unicode="&#x1ecc;" horiz-adv-x="1595" d="M125 0zM1470 733q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5 t-126.5 -446.5zM698 -242q0 57 29.5 84t71.5 27q40 0 69 -27t29 -84q0 -55 -29 -82.5t-69 -27.5q-42 0 -71.5 27.5t-29.5 82.5z" />
-<glyph unicode="&#x1ecd;" horiz-adv-x="1237" d="M115 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414zM287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319z M516 -242q0 57 29.5 84t71.5 27q40 0 69 -27t29 -84q0 -55 -29 -82.5t-69 -27.5q-42 0 -71.5 27.5t-29.5 82.5z" />
-<glyph unicode="&#x1ece;" horiz-adv-x="1595" d="M125 0zM1470 733q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5 t-126.5 -446.5zM1026 1833q0 -140 -166 -174l-10 -113h-105l-12 176q86 14 125 39t39 68t-33.5 63.5t-106.5 20.5q-62 0 -94 -6v100q38 10 107 10q256 0 256 -184z" />
-<glyph unicode="&#x1ecf;" horiz-adv-x="1237" d="M115 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414zM287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319z M844 1495q0 -140 -166 -174l-10 -113h-105l-12 176q86 14 125 39t39 68t-33.5 63.5t-106.5 20.5q-62 0 -94 -6v100q38 10 107 10q256 0 256 -184z" />
-<glyph unicode="&#x1ed0;" horiz-adv-x="1595" d="M125 0zM1470 733q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5 t-126.5 -446.5zM1104 1579h-94q-112 75 -211 166q-114 -101 -211 -166h-94v25l53 60q112 123 164 200h176q66 -94 217 -260v-25zM1024 1798q73 91 127 203h172v-21q-83 -110 -203 -206h-96v24z" />
-<glyph unicode="&#x1ed1;" horiz-adv-x="1237" d="M115 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414zM287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319z M922 1241h-94q-112 75 -211 166q-114 -101 -211 -166h-94v25l53 60q112 123 164 200h176q66 -94 217 -260v-25zM842 1460q73 91 127 203h172v-21q-83 -110 -203 -206h-96v24z" />
-<glyph unicode="&#x1ed2;" horiz-adv-x="1595" d="M125 0zM1470 733q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5 t-126.5 -446.5zM1108 1579h-94q-97 65 -211 166q-106 -96 -211 -166h-94v23l53 60q112 123 164 200h176q66 -94 217 -260v-23zM578 1774h-95q-120 94 -204 206v21h172q52 -108 127 -205v-22z" />
-<glyph unicode="&#x1ed3;" horiz-adv-x="1237" d="M97 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414zM287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319z M926 1241h-94q-97 65 -211 166q-106 -96 -211 -166h-94v23l53 60q112 123 164 200h176q66 -94 217 -260v-23zM396 1436h-95q-120 94 -204 206v21h172q52 -108 127 -205v-22z" />
-<glyph unicode="&#x1ed4;" horiz-adv-x="1595" d="M125 0zM1470 733q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5 t-126.5 -446.5zM1102 1579h-94q-112 75 -211 166q-114 -101 -211 -166h-94v25l53 60q112 123 164 200h176q66 -94 217 -260v-25zM1270 1983q0 -103 -127 -132l-6 -81h-80l-10 131q57 9 88.5 25t31.5 54q0 37 -28.5 49.5t-71.5 12.5q-46 0 -72 -6v80q25 6 80 6 q195 0 195 -139z" />
-<glyph unicode="&#x1ed5;" horiz-adv-x="1237" d="M115 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414zM287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319z M922 1241h-94q-112 75 -211 166q-114 -101 -211 -166h-94v25l53 60q112 123 164 200h176q66 -94 217 -260v-25zM1090 1645q0 -103 -127 -132l-6 -81h-80l-10 131q57 9 88.5 25t31.5 54q0 37 -28.5 49.5t-71.5 12.5q-46 0 -72 -6v80q25 6 80 6q195 0 195 -139z" />
-<glyph unicode="&#x1ed6;" horiz-adv-x="1595" d="M125 0zM1470 733q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5 t-126.5 -446.5zM934 1927q-37 0 -72.5 15t-69 33.5t-65 33.5t-59.5 15q-40 0 -61 -24.5t-35 -74.5h-91q13 106 63.5 162.5t125.5 56.5q37 0 73.5 -15t70 -33t64.5 -33t58 -15q40 0 61 24.5t33 73.5h90q-11 -104 -60.5 -161.5t-125.5 -57.5zM1104 1579h-94q-97 65 -211 166 q-106 -96 -211 -166h-94v23l53 60q112 123 164 200h176q66 -94 217 -260v-23z" />
-<glyph unicode="&#x1ed7;" horiz-adv-x="1237" d="M115 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414zM287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319z M754 1589q-37 0 -72.5 15t-69 33.5t-65 33.5t-59.5 15q-40 0 -61 -24.5t-35 -74.5h-91q13 106 63.5 162.5t125.5 56.5q37 0 73.5 -15t70 -33t64.5 -33t58 -15q40 0 61 24.5t33 73.5h90q-11 -104 -60.5 -161.5t-125.5 -57.5zM924 1241h-94q-97 65 -211 166 q-106 -96 -211 -166h-94v23l53 60q112 123 164 200h176q66 -94 217 -260v-23z" />
-<glyph unicode="&#x1ed8;" horiz-adv-x="1595" d="M125 0zM1470 733q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5 t-126.5 -446.5zM698 -242q0 57 29.5 84t71.5 27q40 0 69 -27t29 -84q0 -55 -29 -82.5t-69 -27.5q-42 0 -71.5 27.5t-29.5 82.5zM461 1602q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#x1ed9;" horiz-adv-x="1237" d="M115 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414zM287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319z M520 -242q0 57 29.5 84t71.5 27q40 0 69 -27t29 -84q0 -55 -29 -82.5t-69 -27.5q-42 0 -71.5 27.5t-29.5 82.5zM282 1264q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph unicode="&#x1eda;" horiz-adv-x="1597" d="M125 0zM1468 733q0 -354 -177.5 -553.5t-491.5 -199.5q-323 0 -498.5 196.5t-175.5 558.5q0 360 176.5 555t499.5 195q325 0 504 -215q50 12 79 45.5t42.5 84.5t13.5 156h182l14 -22q-29 -155 -94.5 -241.5t-169.5 -125.5q96 -176 96 -434zM305 733q0 -298 125 -451 t369 -153q243 0 366 152.5t123 451.5q0 295 -122.5 447.5t-364.5 152.5q-243 0 -369.5 -151.5t-126.5 -448.5zM692 1604q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x1edb;" horiz-adv-x="1247" d="M115 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q217 0 354 -141q51 15 80 47.5t42 82t13 159.5h180l15 -23q-31 -156 -91.5 -243.5t-162.5 -125.5q71 -138 71 -323zM287 549q0 -211 79 -320.5t252 -109.5 q175 0 253.5 109.5t78.5 320.5q0 210 -79.5 318t-254.5 108q-173 0 -251 -108t-78 -318zM502 1266q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x1edc;" horiz-adv-x="1597" d="M125 0zM1468 733q0 -354 -177.5 -553.5t-491.5 -199.5q-323 0 -498.5 196.5t-175.5 558.5q0 360 176.5 555t499.5 195q325 0 504 -215q50 12 79 45.5t42.5 84.5t13.5 156h182l14 -22q-29 -155 -94.5 -241.5t-169.5 -125.5q96 -176 96 -434zM305 733q0 -298 125 -451 t369 -153q243 0 366 152.5t123 451.5q0 295 -122.5 447.5t-364.5 152.5q-243 0 -369.5 -151.5t-126.5 -448.5zM921 1579h-110q-65 52 -154 148t-129 159v21h203q32 -69 89 -159.5t101 -143.5v-25z" />
-<glyph unicode="&#x1edd;" horiz-adv-x="1247" d="M115 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q217 0 354 -141q51 15 80 47.5t42 82t13 159.5h180l15 -23q-31 -156 -91.5 -243.5t-162.5 -125.5q71 -138 71 -323zM287 549q0 -211 79 -320.5t252 -109.5 q175 0 253.5 109.5t78.5 320.5q0 210 -79.5 318t-254.5 108q-173 0 -251 -108t-78 -318zM742 1241h-110q-65 52 -154 148t-129 159v21h203q32 -69 89 -159.5t101 -143.5v-25z" />
-<glyph unicode="&#x1ede;" horiz-adv-x="1597" d="M125 0zM1468 733q0 -354 -177.5 -553.5t-491.5 -199.5q-323 0 -498.5 196.5t-175.5 558.5q0 360 176.5 555t499.5 195q325 0 504 -215q50 12 79 45.5t42.5 84.5t13.5 156h182l14 -22q-29 -155 -94.5 -241.5t-169.5 -125.5q96 -176 96 -434zM305 733q0 -298 125 -451 t369 -153q243 0 366 152.5t123 451.5q0 295 -122.5 447.5t-364.5 152.5q-243 0 -369.5 -151.5t-126.5 -448.5zM1026 1833q0 -140 -166 -174l-10 -113h-105l-12 176q86 14 125 39t39 68t-33.5 63.5t-106.5 20.5q-62 0 -94 -6v100q38 10 107 10q256 0 256 -184z" />
-<glyph unicode="&#x1edf;" horiz-adv-x="1247" d="M115 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q217 0 354 -141q51 15 80 47.5t42 82t13 159.5h180l15 -23q-31 -156 -91.5 -243.5t-162.5 -125.5q71 -138 71 -323zM287 549q0 -211 79 -320.5t252 -109.5 q175 0 253.5 109.5t78.5 320.5q0 210 -79.5 318t-254.5 108q-173 0 -251 -108t-78 -318zM844 1495q0 -140 -166 -174l-10 -113h-105l-12 176q86 14 125 39t39 68t-33.5 63.5t-106.5 20.5q-62 0 -94 -6v100q38 10 107 10q256 0 256 -184z" />
-<glyph unicode="&#x1ee0;" horiz-adv-x="1597" d="M125 0zM1468 733q0 -354 -177.5 -553.5t-491.5 -199.5q-323 0 -498.5 196.5t-175.5 558.5q0 360 176.5 555t499.5 195q325 0 504 -215q50 12 79 45.5t42.5 84.5t13.5 156h182l14 -22q-29 -155 -94.5 -241.5t-169.5 -125.5q96 -176 96 -434zM305 733q0 -298 125 -451 t369 -153q243 0 366 152.5t123 451.5q0 295 -122.5 447.5t-364.5 152.5q-243 0 -369.5 -151.5t-126.5 -448.5zM948 1581q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5q-50 0 -75.5 -30t-39.5 -91h-98q13 121 70.5 189.5t148.5 68.5q46 0 89 -18.5t82 -41t75 -41t68 -18.5 q49 0 73 29.5t39 91.5h99q-13 -121 -69.5 -189.5t-150.5 -68.5z" />
-<glyph unicode="&#x1ee1;" horiz-adv-x="1247" d="M115 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q217 0 354 -141q51 15 80 47.5t42 82t13 159.5h180l15 -23q-31 -156 -91.5 -243.5t-162.5 -125.5q71 -138 71 -323zM287 549q0 -211 79 -320.5t252 -109.5 q175 0 253.5 109.5t78.5 320.5q0 210 -79.5 318t-254.5 108q-173 0 -251 -108t-78 -318zM777 1243q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5q-50 0 -75.5 -30t-39.5 -91h-98q13 121 70.5 189.5t148.5 68.5q46 0 89 -18.5t82 -41t75 -41t68 -18.5q49 0 73 29.5t39 91.5h99 q-13 -121 -69.5 -189.5t-150.5 -68.5z" />
-<glyph unicode="&#x1ee2;" horiz-adv-x="1597" d="M125 0zM1468 733q0 -354 -177.5 -553.5t-491.5 -199.5q-323 0 -498.5 196.5t-175.5 558.5q0 360 176.5 555t499.5 195q325 0 504 -215q50 12 79 45.5t42.5 84.5t13.5 156h182l14 -22q-29 -155 -94.5 -241.5t-169.5 -125.5q96 -176 96 -434zM305 733q0 -298 125 -451 t369 -153q243 0 366 152.5t123 451.5q0 295 -122.5 447.5t-364.5 152.5q-243 0 -369.5 -151.5t-126.5 -448.5zM694 -242q0 57 29.5 84t71.5 27q40 0 69 -27t29 -84q0 -55 -29 -82.5t-69 -27.5q-42 0 -71.5 27.5t-29.5 82.5z" />
-<glyph unicode="&#x1ee3;" horiz-adv-x="1247" d="M115 0zM1122 549q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302q0 268 134 417.5t372 149.5q217 0 354 -141q51 15 80 47.5t42 82t13 159.5h180l15 -23q-31 -156 -91.5 -243.5t-162.5 -125.5q71 -138 71 -323zM287 549q0 -211 79 -320.5t252 -109.5 q175 0 253.5 109.5t78.5 320.5q0 210 -79.5 318t-254.5 108q-173 0 -251 -108t-78 -318zM516 -242q0 57 29.5 84t71.5 27q40 0 69 -27t29 -84q0 -55 -29 -82.5t-69 -27.5q-42 0 -71.5 27.5t-29.5 82.5z" />
-<glyph unicode="&#x1ee4;" horiz-adv-x="1491" d="M186 0zM1305 1462v-946q0 -250 -151 -393t-415 -143t-408.5 144t-144.5 396v942h170v-954q0 -183 100 -281t294 -98q185 0 285 98.5t100 282.5v952h170zM645 -242q0 57 29.5 84t71.5 27q40 0 69 -27t29 -84q0 -55 -29 -82.5t-69 -27.5q-42 0 -71.5 27.5t-29.5 82.5z" />
-<glyph unicode="&#x1ee5;" horiz-adv-x="1257" d="M164 0zM332 1096v-711q0 -134 61 -200t191 -66q172 0 251.5 94t79.5 307v576h166v-1096h-137l-24 147h-9q-51 -81 -141.5 -124t-206.5 -43q-200 0 -299.5 95t-99.5 304v717h168zM499 -242q0 57 29.5 84t71.5 27q40 0 69 -27t29 -84q0 -55 -29 -82.5t-69 -27.5 q-42 0 -71.5 27.5t-29.5 82.5z" />
-<glyph unicode="&#x1ee6;" horiz-adv-x="1491" d="M186 0zM1305 1462v-946q0 -250 -151 -393t-415 -143t-408.5 144t-144.5 396v942h170v-954q0 -183 100 -281t294 -98q185 0 285 98.5t100 282.5v952h170zM967 1833q0 -140 -166 -174l-10 -113h-105l-12 176q86 14 125 39t39 68t-33.5 63.5t-106.5 20.5q-62 0 -94 -6v100 q38 10 107 10q256 0 256 -184z" />
-<glyph unicode="&#x1ee7;" horiz-adv-x="1257" d="M164 0zM332 1096v-711q0 -134 61 -200t191 -66q172 0 251.5 94t79.5 307v576h166v-1096h-137l-24 147h-9q-51 -81 -141.5 -124t-206.5 -43q-200 0 -299.5 95t-99.5 304v717h168zM840 1495q0 -140 -166 -174l-10 -113h-105l-12 176q86 14 125 39t39 68t-33.5 63.5 t-106.5 20.5q-62 0 -94 -6v100q38 10 107 10q256 0 256 -184z" />
-<glyph unicode="&#x1ee8;" horiz-adv-x="1573" d="M186 0zM1305 1462v-198q58 8 93 39t50.5 87t15.5 166h181l14 -22q-33 -182 -119 -274t-235 -117v-627q0 -258 -143.5 -397t-407.5 -139q-268 0 -418 143.5t-150 396.5v942h170v-954q0 -183 102 -281t300 -98q184 0 280.5 96.5t96.5 284.5v952h170zM631 1604 q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x1ee9;" horiz-adv-x="1362" d="M164 0zM332 1094v-709q0 -134 61 -200t191 -66q172 0 251.5 94t79.5 307v574h166v-121q82 11 119 75t37 218h178l15 -23q-32 -186 -120 -281.5t-229 -109.5v-852h-137l-24 147h-9q-52 -82 -142.5 -124.5t-201.5 -42.5q-203 0 -303 95t-100 304v715h168zM514 1266 q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph unicode="&#x1eea;" horiz-adv-x="1573" d="M186 0zM1305 1462v-198q58 8 93 39t50.5 87t15.5 166h181l14 -22q-33 -182 -119 -274t-235 -117v-627q0 -258 -143.5 -397t-407.5 -139q-268 0 -418 143.5t-150 396.5v942h170v-954q0 -183 102 -281t300 -98q184 0 280.5 96.5t96.5 284.5v952h170zM876 1579h-110 q-65 52 -154 148t-129 159v21h203q32 -69 89 -159.5t101 -143.5v-25z" />
-<glyph unicode="&#x1eeb;" horiz-adv-x="1362" d="M164 0zM332 1094v-709q0 -134 61 -200t191 -66q172 0 251.5 94t79.5 307v574h166v-121q82 11 119 75t37 218h178l15 -23q-32 -186 -120 -281.5t-229 -109.5v-852h-137l-24 147h-9q-52 -82 -142.5 -124.5t-201.5 -42.5q-203 0 -303 95t-100 304v715h168zM717 1241h-110 q-65 52 -154 148t-129 159v21h203q32 -69 89 -159.5t101 -143.5v-25z" />
-<glyph unicode="&#x1eec;" horiz-adv-x="1573" d="M186 0zM1305 1462v-198q58 8 93 39t50.5 87t15.5 166h181l14 -22q-33 -182 -119 -274t-235 -117v-627q0 -258 -143.5 -397t-407.5 -139q-268 0 -418 143.5t-150 396.5v942h170v-954q0 -183 102 -281t300 -98q184 0 280.5 96.5t96.5 284.5v952h170zM979 1833 q0 -140 -166 -174l-10 -113h-105l-12 176q86 14 125 39t39 68t-33.5 63.5t-106.5 20.5q-62 0 -94 -6v100q38 10 107 10q256 0 256 -184z" />
-<glyph unicode="&#x1eed;" horiz-adv-x="1362" d="M164 0zM332 1094v-709q0 -134 61 -200t191 -66q172 0 251.5 94t79.5 307v574h166v-121q82 11 119 75t37 218h178l15 -23q-32 -186 -120 -281.5t-229 -109.5v-852h-137l-24 147h-9q-52 -82 -142.5 -124.5t-201.5 -42.5q-203 0 -303 95t-100 304v715h168zM846 1495 q0 -140 -166 -174l-10 -113h-105l-12 176q86 14 125 39t39 68t-33.5 63.5t-106.5 20.5q-62 0 -94 -6v100q38 10 107 10q256 0 256 -184z" />
-<glyph unicode="&#x1eee;" horiz-adv-x="1573" d="M186 0zM1305 1462v-198q58 8 93 39t50.5 87t15.5 166h181l14 -22q-33 -182 -119 -274t-235 -117v-627q0 -258 -143.5 -397t-407.5 -139q-268 0 -418 143.5t-150 396.5v942h170v-954q0 -183 102 -281t300 -98q184 0 280.5 96.5t96.5 284.5v952h170zM915 1581 q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5q-50 0 -75.5 -30t-39.5 -91h-98q13 121 70.5 189.5t148.5 68.5q46 0 89 -18.5t82 -41t75 -41t68 -18.5q49 0 73 29.5t39 91.5h99q-13 -121 -69.5 -189.5t-150.5 -68.5z" />
-<glyph unicode="&#x1eef;" horiz-adv-x="1362" d="M164 0zM332 1094v-709q0 -134 61 -200t191 -66q172 0 251.5 94t79.5 307v574h166v-121q82 11 119 75t37 218h178l15 -23q-32 -186 -120 -281.5t-229 -109.5v-852h-137l-24 147h-9q-52 -82 -142.5 -124.5t-201.5 -42.5q-203 0 -303 95t-100 304v715h168zM787 1243 q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5q-50 0 -75.5 -30t-39.5 -91h-98q13 121 70.5 189.5t148.5 68.5q46 0 89 -18.5t82 -41t75 -41t68 -18.5q49 0 73 29.5t39 91.5h99q-13 -121 -69.5 -189.5t-150.5 -68.5z" />
-<glyph unicode="&#x1ef0;" horiz-adv-x="1573" d="M186 0zM1305 1462v-198q58 8 93 39t50.5 87t15.5 166h181l14 -22q-33 -182 -119 -274t-235 -117v-627q0 -258 -143.5 -397t-407.5 -139q-268 0 -418 143.5t-150 396.5v942h170v-954q0 -183 102 -281t300 -98q184 0 280.5 96.5t96.5 284.5v952h170zM647 -242q0 57 29.5 84 t71.5 27q40 0 69 -27t29 -84q0 -55 -29 -82.5t-69 -27.5q-42 0 -71.5 27.5t-29.5 82.5z" />
-<glyph unicode="&#x1ef1;" horiz-adv-x="1362" d="M164 0zM332 1094v-709q0 -134 61 -200t191 -66q172 0 251.5 94t79.5 307v574h166v-121q82 11 119 75t37 218h178l15 -23q-32 -186 -120 -281.5t-229 -109.5v-852h-137l-24 147h-9q-52 -82 -142.5 -124.5t-201.5 -42.5q-203 0 -303 95t-100 304v715h168zM493 -242 q0 57 29.5 84t71.5 27q40 0 69 -27t29 -84q0 -55 -29 -82.5t-69 -27.5q-42 0 -71.5 27.5t-29.5 82.5z" />
-<glyph unicode="&#x1ef2;" horiz-adv-x="1147" d="M0 0zM573 731l390 731h184l-488 -895v-567h-172v559l-487 903h186zM678 1579h-110q-65 52 -154 148t-129 159v21h203q32 -69 89 -159.5t101 -143.5v-25z" />
-<glyph unicode="&#x1ef3;" horiz-adv-x="1032" d="M2 0zM2 1096h178l240 -625q79 -214 98 -309h8q13 51 54.5 174.5t271.5 759.5h178l-471 -1248q-70 -185 -163.5 -262.5t-229.5 -77.5q-76 0 -150 17v133q55 -12 123 -12q171 0 244 192l61 156zM627 1241h-110q-65 52 -154 148t-129 159v21h203q32 -69 89 -159.5 t101 -143.5v-25z" />
-<glyph unicode="&#x1ef4;" horiz-adv-x="1147" d="M0 0zM573 731l390 731h184l-488 -895v-567h-172v559l-487 903h186zM471 -242q0 57 29.5 84t71.5 27q40 0 69 -27t29 -84q0 -55 -29 -82.5t-69 -27.5q-42 0 -71.5 27.5t-29.5 82.5z" />
-<glyph unicode="&#x1ef5;" horiz-adv-x="1032" d="M2 0zM2 1096h178l240 -625q79 -214 98 -309h8q13 51 54.5 174.5t271.5 759.5h178l-471 -1248q-70 -185 -163.5 -262.5t-229.5 -77.5q-76 0 -150 17v133q55 -12 123 -12q171 0 244 192l61 156zM729 -245q0 57 29.5 84t71.5 27q40 0 69 -27t29 -84q0 -55 -29 -82.5 t-69 -27.5q-42 0 -71.5 27.5t-29.5 82.5z" />
-<glyph unicode="&#x1ef6;" horiz-adv-x="1147" d="M0 0zM573 731l390 731h184l-488 -895v-567h-172v559l-487 903h186zM797 1833q0 -140 -166 -174l-10 -113h-105l-12 176q86 14 125 39t39 68t-33.5 63.5t-106.5 20.5q-62 0 -94 -6v100q38 10 107 10q256 0 256 -184z" />
-<glyph unicode="&#x1ef7;" horiz-adv-x="1032" d="M2 0zM2 1096h178l240 -625q79 -214 98 -309h8q13 51 54.5 174.5t271.5 759.5h178l-471 -1248q-70 -185 -163.5 -262.5t-229.5 -77.5q-76 0 -150 17v133q55 -12 123 -12q171 0 244 192l61 156zM733 1495q0 -140 -166 -174l-10 -113h-105l-12 176q86 14 125 39t39 68 t-33.5 63.5t-106.5 20.5q-62 0 -94 -6v100q38 10 107 10q256 0 256 -184z" />
-<glyph unicode="&#x1ef8;" horiz-adv-x="1147" d="M0 0zM573 731l390 731h184l-488 -895v-567h-172v559l-487 903h186zM726 1581q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5q-50 0 -75.5 -30t-39.5 -91h-98q13 121 70.5 189.5t148.5 68.5q46 0 89 -18.5t82 -41t75 -41t68 -18.5q49 0 73 29.5t39 91.5h99 q-13 -121 -69.5 -189.5t-150.5 -68.5z" />
-<glyph unicode="&#x1ef9;" horiz-adv-x="1032" d="M2 0zM2 1096h178l240 -625q79 -214 98 -309h8q13 51 54.5 174.5t271.5 759.5h178l-471 -1248q-70 -185 -163.5 -262.5t-229.5 -77.5q-76 0 -150 17v133q55 -12 123 -12q171 0 244 192l61 156zM670 1243q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5q-50 0 -75.5 -30 t-39.5 -91h-98q13 121 70.5 189.5t148.5 68.5q46 0 89 -18.5t82 -41t75 -41t68 -18.5q49 0 73 29.5t39 91.5h99q-13 -121 -69.5 -189.5t-150.5 -68.5z" />
-<glyph unicode="&#x1f4d;" horiz-adv-x="1618" d="M-9 1159q70 181 98 303h189v-20q-41 -78 -100.5 -164t-108.5 -143h-78v24zM-289 1253q0 163 237 224v-72q-121 -41 -121 -94q0 -20 15.5 -29.5t34 -17.5t34 -21t15.5 -41q0 -74 -93 -74q-55 0 -88.5 34t-33.5 91zM1490 733q0 -351 -177.5 -552t-493.5 -201 q-323 0 -498.5 197.5t-175.5 557.5q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552zM325 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5t-126.5 -446.5z" />
-<glyph unicode="&#x1fde;" horiz-adv-x="819" d="M432 1159q70 181 98 303h189v-20q-41 -78 -100.5 -164t-108.5 -143h-78v24zM152 1253q0 163 237 224v-72q-121 -41 -121 -94q0 -20 15.5 -29.5t34 -17.5t34 -21t15.5 -41q0 -74 -93 -74q-55 0 -88.5 34t-33.5 91z" />
-<glyph unicode="&#x2000;" horiz-adv-x="1024" />
-<glyph unicode="&#x2001;" horiz-adv-x="2048" />
-<glyph unicode="&#x2002;" horiz-adv-x="1024" />
-<glyph unicode="&#x2003;" horiz-adv-x="2048" />
-<glyph unicode="&#x2004;" horiz-adv-x="682" />
-<glyph unicode="&#x2005;" horiz-adv-x="512" />
-<glyph unicode="&#x2006;" horiz-adv-x="342" />
-<glyph unicode="&#x2007;" horiz-adv-x="1145" />
-<glyph unicode="&#x2008;" horiz-adv-x="545" />
-<glyph unicode="&#x2009;" horiz-adv-x="410" />
-<glyph unicode="&#x200a;" horiz-adv-x="205" />
-<glyph unicode="&#x200b;" horiz-adv-x="0" />
-<glyph unicode="&#x2010;" horiz-adv-x="659" d="M84 473v152h491v-152h-491z" />
-<glyph unicode="&#x2011;" horiz-adv-x="659" d="M84 473v152h491v-152h-491z" />
-<glyph unicode="&#x2012;" horiz-adv-x="659" d="M84 473v152h491v-152h-491z" />
-<glyph unicode="&#x2013;" horiz-adv-x="1024" d="M82 473v152h860v-152h-860z" />
-<glyph unicode="&#x2014;" horiz-adv-x="2048" d="M82 473v152h1884v-152h-1884z" />
-<glyph unicode="&#x2015;" horiz-adv-x="2048" d="M82 473zM82 473v152h1884v-152h-1884z" />
-<glyph unicode="&#x2017;" horiz-adv-x="842" d="M846 -463h-850v139h850v-139zM846 -184h-850v139h850v-139z" />
-<glyph unicode="&#x2018;" horiz-adv-x="348" d="M37 961l-12 22q22 90 71 224t105 255h123q-66 -254 -103 -501h-184z" />
-<glyph unicode="&#x2019;" horiz-adv-x="348" d="M309 1462l15 -22q-26 -100 -75 -232.5t-102 -246.5h-122q70 285 102 501h182z" />
-<glyph unicode="&#x201a;" horiz-adv-x="502" d="M63 0zM350 238l15 -23q-26 -100 -75 -232.5t-102 -246.5h-125q27 104 59.5 257t45.5 245h182z" />
-<glyph unicode="&#x201b;" horiz-adv-x="348" d="M223 1462q37 -251 103 -501h-123q-45 94 -99.5 236t-78.5 243l14 22h184z" />
-<glyph unicode="&#x201c;" horiz-adv-x="717" d="M406 961l-15 22q56 215 178 479h123q-30 -115 -59.5 -259.5t-42.5 -241.5h-184zM37 961l-12 22q22 90 71 224t105 255h123q-66 -254 -103 -501h-184z" />
-<glyph unicode="&#x201d;" horiz-adv-x="717" d="M309 1462l15 -22q-26 -100 -75 -232.5t-102 -246.5h-122q70 285 102 501h182zM678 1462l14 -22q-24 -91 -72 -224t-104 -255h-125q26 100 59 254t46 247h182z" />
-<glyph unicode="&#x201e;" horiz-adv-x="829" d="M25 0zM309 238l15 -22q-26 -100 -75 -232.5t-102 -246.5h-122q70 285 102 501h182zM678 238l14 -22q-24 -91 -72 -224t-104 -255h-125q26 100 59 254t46 247h182z" />
-<glyph unicode="&#x2020;" horiz-adv-x="1028" d="M905 999l-352 31l49 -1030h-196l49 1030l-332 -31v170l332 -30l-49 417h196l-49 -417l352 30v-170z" />
-<glyph unicode="&#x2021;" horiz-adv-x="1044" d="M569 487l353 31v-168l-353 29l49 -379h-198l49 379l-346 -29v168l346 -31l-43 299l43 283l-346 -31v168l346 -30l-49 380h198l-49 -380l353 30v-168l-353 31l43 -283z" />
-<glyph unicode="&#x2022;" horiz-adv-x="770" d="M164 748q0 121 56.5 184t164.5 63q105 0 163 -62t58 -185q0 -119 -57.5 -183.5t-163.5 -64.5q-107 0 -164 65.5t-57 182.5z" />
-<glyph unicode="&#x2026;" horiz-adv-x="1606" d="M152 0zM152 106q0 67 30.5 101.5t87.5 34.5q58 0 90.5 -34.5t32.5 -101.5q0 -65 -33 -100t-90 -35q-51 0 -84.5 31.5t-33.5 103.5zM682 106q0 67 30.5 101.5t87.5 34.5q58 0 90.5 -34.5t32.5 -101.5q0 -65 -33 -100t-90 -35q-51 0 -84.5 31.5t-33.5 103.5zM1213 106 q0 67 30.5 101.5t87.5 34.5q58 0 90.5 -34.5t32.5 -101.5q0 -65 -33 -100t-90 -35q-51 0 -84.5 31.5t-33.5 103.5z" />
-<glyph unicode="&#x202f;" horiz-adv-x="429" />
-<glyph unicode="&#x2030;" horiz-adv-x="2462" d="M236 1026q0 -170 41.5 -255t134.5 -85q180 0 180 340q0 338 -180 338q-93 0 -134.5 -84t-41.5 -254zM729 1026q0 -230 -80.5 -345.5t-236.5 -115.5q-149 0 -230.5 119t-81.5 342q0 457 312 457q152 0 234.5 -120t82.5 -337zM1346 1462l-811 -1462h-148l811 1462h148z M1870 440q0 -171 41.5 -255.5t134.5 -84.5q91 0 135.5 83.5t44.5 256.5q0 171 -44.5 253.5t-135.5 82.5q-93 0 -134.5 -82.5t-41.5 -253.5zM2363 440q0 -230 -81 -345t-236 -115q-148 0 -229.5 119.5t-81.5 340.5q0 457 311 457q150 0 233.5 -118t83.5 -339zM1139 440 q0 -171 40.5 -255.5t133.5 -84.5q91 0 135.5 83.5t44.5 256.5q0 171 -44.5 253.5t-135.5 82.5q-93 0 -133.5 -82.5t-40.5 -253.5zM1630 440q0 -230 -81 -345t-236 -115q-149 0 -230.5 119t-81.5 341q0 457 312 457q150 0 233.5 -118t83.5 -339z" />
-<glyph unicode="&#x2032;" horiz-adv-x="453" d="M133 934zM319 1462l-40 -528h-105l-41 528h186z" />
-<glyph unicode="&#x2033;" horiz-adv-x="805" d="M133 934zM319 1462l-40 -528h-105l-41 528h186zM688 1462l-41 -528h-104l-41 528h186z" />
-<glyph unicode="&#x2039;" horiz-adv-x="623" d="M82 551l342 407l119 -69l-289 -350l289 -351l-119 -71l-342 407v27z" />
-<glyph unicode="&#x203a;" horiz-adv-x="623" d="M541 524l-344 -407l-117 71l287 351l-287 350l117 69l344 -407v-27z" />
-<glyph unicode="&#x203c;" horiz-adv-x="995" d="M152 0zM326 403h-105l-51 1059h207zM152 106q0 136 120 136q58 0 89.5 -35t31.5 -101q0 -64 -32 -99.5t-89 -35.5q-52 0 -86 31.5t-34 103.5zM775 403h-105l-51 1059h207zM601 106q0 136 120 136q58 0 89.5 -35t31.5 -101q0 -64 -32 -99.5t-89 -35.5q-52 0 -86 31.5 t-34 103.5z" />
-<glyph unicode="&#x2044;" horiz-adv-x="266" d="M655 1462l-903 -1462h-143l903 1462h143z" />
-<glyph unicode="&#x205f;" horiz-adv-x="536" />
-<glyph unicode="&#x2070;" horiz-adv-x="711" d="M176 1024q0 -168 41 -251t135 -83t137 82.5t43 253.5q0 170 -43 252t-137 82t-135 -82.5t-41 -253.5zM670 1026q0 -457 -316 -457q-158 0 -236.5 118t-78.5 339q0 453 315 453q158 0 237 -116t79 -337z" />
-<glyph unicode="&#x2074;" horiz-adv-x="711" d="M692 788h-125v-202h-145v202h-402v101l408 579h139v-563h125v-117zM422 905v195q0 134 6 209q-5 -12 -17 -31.5t-27 -42l-30 -45t-26 -39.5l-168 -246h262z" />
-<glyph unicode="&#x2075;" horiz-adv-x="711" d="M328 1128q145 0 233 -71.5t88 -194.5q0 -140 -85 -217.5t-251 -77.5q-74 0 -143.5 15.5t-110.5 38.5v131q56 -34 126 -53t124 -19q95 0 150 41.5t55 130.5q0 78 -54.5 122t-156.5 44q-57 0 -95 -8.5t-69 -16.5l-59 41l33 416h495v-104h-381l-20 -230q62 12 121 12z" />
-<glyph unicode="&#x2076;" horiz-adv-x="711" d="M41 963q0 261 109.5 388.5t328.5 127.5q74 0 123 -15v-114q-52 18 -135 18q-141 0 -216 -76.5t-85 -242.5h8q29 43 85.5 72.5t141.5 29.5q125 0 199 -74t74 -200q0 -144 -83 -226t-224 -82q-153 0 -239.5 105t-86.5 289zM365 680q81 0 130.5 46.5t49.5 145.5 q0 79 -44 124.5t-130 45.5q-85 0 -141 -45t-56 -104q0 -89 53 -151t138 -62z" />
-<glyph unicode="&#x2077;" horiz-adv-x="711" d="M162 586l350 760h-455v116h598v-94l-352 -782h-141z" />
-<glyph unicode="&#x2078;" horiz-adv-x="711" d="M356 1479q124 0 199.5 -59t75.5 -163q0 -130 -148 -206q176 -74 176 -232q0 -113 -82.5 -181.5t-220.5 -68.5q-146 0 -225.5 64t-79.5 180q0 69 36.5 127t121.5 104q-74 46 -102.5 92.5t-28.5 114.5q0 102 78.5 165t199.5 63zM182 813q0 -60 42 -96.5t128 -36.5 q90 0 132 36.5t42 96.5q0 63 -46.5 102.5t-127.5 67.5l-28 10q-72 -34 -107 -76t-35 -104zM354 1370q-68 0 -105.5 -30t-37.5 -87q0 -47 34 -82.5t115 -68.5q140 54 140 151q0 57 -39 87t-107 30z" />
-<glyph unicode="&#x2079;" horiz-adv-x="711" d="M668 1094q0 -270 -109 -397.5t-321 -127.5q-83 0 -132 15v116q49 -20 142 -20q276 0 297 326h-10q-35 -51 -93 -77t-123 -26q-131 0 -207.5 73t-76.5 204q0 136 84.5 218.5t220.5 82.5q152 0 240 -101t88 -286zM340 1370q-81 0 -128.5 -47.5t-47.5 -134.5 q0 -81 42.5 -128.5t129.5 -47.5q84 0 141.5 42.5t57.5 104.5q0 97 -51.5 154t-143.5 57z" />
-<glyph unicode="&#x207f;" horiz-adv-x="807" d="M588 801v420q0 84 -39 119.5t-119 35.5q-114 0 -159.5 -52.5t-45.5 -174.5v-348h-116v665h96l14 -88h10q75 101 220 101q258 0 258 -250v-428h-119z" />
-<glyph unicode="&#x20a3;" horiz-adv-x="1171" d="M440 395h308v-129h-308v-266h-166v266h-176v129h176v1067h785v-151h-619v-535h580v-151h-580v-230z" />
-<glyph unicode="&#x20a4;" horiz-adv-x="1171" d="M688 1481q201 0 359 -80l-60 -131q-152 71 -299 71q-122 0 -185 -67.5t-63 -196.5v-186h420v-129h-420v-166h420v-129h-420v-33q0 -100 -32.5 -168t-106.5 -112h795v-154h-1028v141q206 48 206 291v35h-200v129h200v166h-200v129h200v207q0 178 112 280.5t302 102.5z" />
-<glyph unicode="&#x20a7;" horiz-adv-x="1563" d="M1358 117q34 0 77 7t54 11v-125q-60 -30 -170 -30q-109 0 -173.5 68t-64.5 206v463h-157v80l157 69l62 191h98v-211h221v-129h-221v-441q0 -77 26 -118t91 -41zM926 1036q0 -227 -138.5 -344t-404.5 -117h-64v-575h-165v1462h262q256 0 383 -105.5t127 -320.5zM319 721 h52q200 0 292.5 72.5t92.5 234.5q0 145 -86 216t-269 71h-82v-594z" />
-<glyph unicode="&#x20ab;" horiz-adv-x="1255" d="M115 0zM922 147h-9q-115 -167 -344 -167q-215 0 -334.5 147t-119.5 418t120 421t334 150q223 0 342 -162h13q-11 83 -11 156v133h-448v129h448v184h166v-184h156v-129h-156v-1243h-135zM590 119q170 0 246.5 92.5t76.5 298.5v35q0 233 -77.5 332.5t-247.5 99.5 q-146 0 -223.5 -113.5t-77.5 -320.5q0 -210 77 -317t226 -107zM1102 -315h-926v131h926v-131z" />
-<glyph unicode="&#x20ac;" horiz-adv-x="1208" d="M795 1333q-319 0 -398 -403h510v-129h-524l-2 -57v-64l2 -45h463v-129h-447q37 -180 138.5 -278.5t271.5 -98.5q156 0 309 66v-150q-146 -65 -317 -65q-237 0 -381.5 134.5t-190.5 391.5h-166v129h152l-2 42v44l2 80h-152v129h164q39 261 185 407t383 146q201 0 366 -97 l-71 -139q-166 86 -295 86z" />
-<glyph unicode="&#x2105;" horiz-adv-x="1688" d="M1311 1462l-811 -1462h-148l811 1462h148zM1546 334q0 -159 -84.5 -250.5t-232.5 -91.5q-139 0 -224 92.5t-85 249.5q0 158 83.5 250t231.5 92q141 0 226 -93t85 -249zM1055 334q0 -238 178 -238q176 0 176 238q0 235 -176 235q-178 0 -178 -235zM489 788 q-166 0 -257 88.5t-91 249.5q0 168 94 257.5t265 89.5q104 0 192 -35l-33 -103q-81 31 -161 31q-224 0 -224 -238q0 -235 220 -235q98 0 188 33v-101q-78 -37 -193 -37z" />
-<glyph unicode="&#x2113;" horiz-adv-x="1065" d="M637 111q174 0 192 213h95q-8 -166 -84.5 -255t-218.5 -89q-150 0 -230 90.5t-80 259.5v243q-96 -35 -192 -57v113q78 21 192 59v498q0 138 75 217.5t210 79.5q117 0 184.5 -80.5t67.5 -218.5q0 -185 -103 -337t-278 -226v-283q0 -104 41 -165.5t129 -61.5zM723 1178 q0 194 -127 194q-67 0 -98 -43t-31 -151v-437q256 137 256 437z" />
-<glyph unicode="&#x2116;" horiz-adv-x="2087" d="M1223 0h-187l-692 1227h-8q16 -288 16 -396v-831h-151v1462h194l682 -1222h8q-14 245 -14 383v839h152v-1462zM1987 621q0 -163 -80.5 -255t-227.5 -92q-139 0 -220 93.5t-81 253.5q0 163 80.5 253.5t227.5 90.5q139 0 220 -93.5t81 -250.5zM1509 621q0 -114 40.5 -173 t133.5 -59q91 0 130.5 58.5t39.5 173.5t-39.5 171t-130.5 56q-92 0 -133 -56t-41 -171zM1423 0v135h512v-135h-512z" />
-<glyph unicode="&#x2120;" horiz-adv-x="1626" d="M584 940q0 -98 -74.5 -152.5t-198.5 -54.5q-145 0 -219 33v108q106 -40 225 -40q148 0 148 100q0 33 -11.5 53t-38.5 36.5t-112 47.5q-120 44 -160.5 89.5t-40.5 121.5q0 86 71 138.5t181 52.5q125 0 217 -39l-34 -99q-100 37 -183 37q-60 0 -97.5 -23t-37.5 -63 q0 -29 9 -47t30.5 -32t116.5 -50q129 -50 169 -95t40 -122zM1006 741l-201 559h-8l6 -129v-430h-119v721h188l195 -559l203 559h180v-721h-127v420l6 137h-8l-211 -557h-104z" />
-<glyph unicode="&#x2122;" horiz-adv-x="1589" d="M369 741h-123v615h-209v106h543v-106h-211v-615zM969 741l-201 559h-8l6 -129v-430h-119v721h187l196 -559l203 559h180v-721h-127v420l6 137h-8l-211 -557h-104z" />
-<glyph unicode="&#x2126;" horiz-adv-x="1602" d="M80 0zM801 1333q-238 0 -363 -128.5t-125 -381.5q0 -225 86.5 -391.5t266.5 -298.5v-133h-586v152h364q-151 118 -231 293t-80 378q0 310 177 486t491 176q315 0 492 -173.5t177 -486.5q0 -207 -79 -380t-230 -293h363v-152h-586v133q183 134 267.5 301t84.5 389 q0 252 -124.5 381t-364.5 129z" />
-<glyph unicode="&#x212e;" horiz-adv-x="1268" d="M633 -35q-157 0 -277.5 73.5t-187 204t-66.5 287.5q0 171 69 298.5t191 197.5t271 70q152 0 273.5 -71t189 -200.5t67.5 -294.5h-827v-356q49 -53 132 -88t165 -35q131 0 222.5 52.5t172.5 181.5l72 -41q-98 -155 -206.5 -217t-260.5 -62zM932 616v277q-50 53 -131.5 86 t-169.5 33q-173 0 -295 -117v-279h596z" />
-<glyph unicode="&#x215b;" horiz-adv-x="1597" d="M71 0zM1259 1462l-903 -1462h-143l903 1462h143zM333 1462h143v-876h-133v579q0 91 6 181q-22 -22 -49 -44.5t-162 -117.5l-67 96zM1220 890q124 0 199.5 -59t75.5 -163q0 -130 -148 -206q176 -74 176 -232q0 -113 -82.5 -181.5t-220.5 -68.5q-146 0 -225.5 64t-79.5 180 q0 69 36.5 127t121.5 104q-74 46 -102.5 92.5t-28.5 114.5q0 102 78.5 165t199.5 63zM1046 224q0 -60 42 -96.5t128 -36.5q90 0 132 36.5t42 96.5q0 63 -46.5 102.5t-127.5 67.5l-28 10q-72 -34 -107 -76t-35 -104zM1218 781q-68 0 -105.5 -30t-37.5 -87q0 -47 34 -82.5 t115 -68.5q140 54 140 151q0 57 -39 87t-107 30z" />
-<glyph unicode="&#x215c;" horiz-adv-x="1597" d="M32 0zM1329 1462l-903 -1462h-143l903 1462h143zM1241 890q124 0 199.5 -59t75.5 -163q0 -130 -148 -206q176 -74 176 -232q0 -113 -82.5 -181.5t-220.5 -68.5q-146 0 -225.5 64t-79.5 180q0 69 36.5 127t121.5 104q-74 46 -102.5 92.5t-28.5 114.5q0 102 78.5 165 t199.5 63zM1067 224q0 -60 42 -96.5t128 -36.5q90 0 132 36.5t42 96.5q0 63 -46.5 102.5t-127.5 67.5l-28 10q-72 -34 -107 -76t-35 -104zM1239 781q-68 0 -105.5 -30t-37.5 -87q0 -47 34 -82.5t115 -68.5q140 54 140 151q0 57 -39 87t-107 30zM626 1255q0 -80 -41 -131.5 t-109 -74.5q176 -47 176 -209q0 -128 -92 -199.5t-260 -71.5q-152 0 -268 56v123q147 -68 270 -68q211 0 211 162q0 145 -231 145h-117v107h119q103 0 152.5 39.5t49.5 107.5q0 61 -40 95t-107 34q-66 0 -122 -21.5t-112 -56.5l-69 90q63 45 133 72t164 27 q136 0 214.5 -59.5t78.5 -166.5z" />
-<glyph unicode="&#x215d;" horiz-adv-x="1597" d="M71 0zM1323 1462l-903 -1462h-143l903 1462h143zM340 1128q145 0 233 -71.5t88 -194.5q0 -140 -85 -217.5t-251 -77.5q-74 0 -143.5 15.5t-110.5 38.5v131q56 -34 126 -53t124 -19q95 0 150 41.5t55 130.5q0 78 -54.5 122t-156.5 44q-57 0 -95 -8.5t-69 -16.5l-59 41 l33 416h495v-104h-381l-20 -230q62 12 121 12zM1237 890q124 0 199.5 -59t75.5 -163q0 -130 -148 -206q176 -74 176 -232q0 -113 -82.5 -181.5t-220.5 -68.5q-146 0 -225.5 64t-79.5 180q0 69 36.5 127t121.5 104q-74 46 -102.5 92.5t-28.5 114.5q0 102 78.5 165t199.5 63z M1063 224q0 -60 42 -96.5t128 -36.5q90 0 132 36.5t42 96.5q0 63 -46.5 102.5t-127.5 67.5l-28 10q-72 -34 -107 -76t-35 -104zM1235 781q-68 0 -105.5 -30t-37.5 -87q0 -47 34 -82.5t115 -68.5q140 54 140 151q0 57 -39 87t-107 30z" />
-<glyph unicode="&#x215e;" horiz-adv-x="1597" d="M106 0zM1237 1462l-903 -1462h-143l903 1462h143zM1233 890q124 0 199.5 -59t75.5 -163q0 -130 -148 -206q176 -74 176 -232q0 -113 -82.5 -181.5t-220.5 -68.5q-146 0 -225.5 64t-79.5 180q0 69 36.5 127t121.5 104q-74 46 -102.5 92.5t-28.5 114.5q0 102 78.5 165 t199.5 63zM1059 224q0 -60 42 -96.5t128 -36.5q90 0 132 36.5t42 96.5q0 63 -46.5 102.5t-127.5 67.5l-28 10q-72 -34 -107 -76t-35 -104zM1231 781q-68 0 -105.5 -30t-37.5 -87q0 -47 34 -82.5t115 -68.5q140 54 140 151q0 57 -39 87t-107 30zM211 586l350 760h-455v116 h598v-94l-352 -782h-141z" />
-<glyph unicode="&#x2202;" horiz-adv-x="1190" d="M1077 934q0 -262 -83.5 -491.5t-221.5 -346t-311 -116.5q-172 0 -265.5 100.5t-93.5 292.5q0 169 68 322.5t184 234t267 80.5q97 0 170 -46.5t116 -121.5l4 90q0 405 -282 405q-62 0 -134 -22t-120 -55v159q47 23 124.5 41.5t151.5 18.5q210 0 318 -138t108 -407z M471 121q95 0 178 72t143 201.5t82 279.5q-25 97 -89 151t-144 54q-101 0 -183.5 -66t-133 -191t-50.5 -253q0 -118 50.5 -183t146.5 -65z" />
-<glyph unicode="&#x2206;" horiz-adv-x="1171" d="M39 104l463 1358h166l465 -1360v-102h-1094v104zM584 1268q-61 -225 -101 -346l-260 -770h721l-258 761q-68 202 -102 355z" />
-<glyph unicode="&#x220f;" horiz-adv-x="1513" d="M1143 -496v1805h-772v-1805h-170v1958h1112v-1958h-170z" />
-<glyph unicode="&#x2211;" horiz-adv-x="1292" d="M76 -496v107l631 924l-615 819v108h1088v-151h-848l579 -772l-604 -883h938v-152h-1169z" />
-<glyph unicode="&#x2212;" horiz-adv-x="1171" d="M104 653v138h961v-138h-961z" />
-<glyph unicode="&#x221a;" horiz-adv-x="1124" d="M623 -14h-127l-279 782h-180v135h289l235 -684l514 1469h137z" />
-<glyph unicode="&#x221e;" horiz-adv-x="1444" d="M1325 719q0 -131 -83.5 -223.5t-211.5 -92.5q-93 0 -169.5 53t-141.5 169q-60 -104 -136.5 -160.5t-164.5 -56.5q-131 0 -215 86.5t-84 228.5q0 134 84 223.5t215 89.5q181 0 303 -219q124 215 309 215q133 0 214 -87.5t81 -225.5zM426 532q66 0 120.5 45.5t108.5 145.5 q-50 97 -104.5 143.5t-126.5 46.5q-76 0 -126 -52.5t-50 -139.5q0 -83 48.5 -136t129.5 -53zM1018 909q-66 0 -120.5 -46t-109.5 -144q51 -97 106 -144t126 -47q76 0 126 53.5t50 137.5q0 85 -50.5 137.5t-127.5 52.5z" />
-<glyph unicode="&#x222b;" horiz-adv-x="786" d="M637 1556q79 0 123 -16v-137q-49 22 -111 22q-176 0 -176 -243v-1311q0 -176 -82.5 -269.5t-245.5 -93.5q-74 0 -133 19v135q61 -22 119 -22q182 0 182 243v1311q0 362 324 362z" />
-<glyph unicode="&#x2248;" horiz-adv-x="1171" d="M336 512q-54 0 -117.5 -32t-120.5 -89v150q108 110 256 110q67 0 123 -14t144 -51q77 -33 122.5 -45.5t90.5 -12.5q53 0 117 33t118 90v-151q-101 -109 -254 -109q-67 0 -122.5 14.5t-143.5 51.5q-73 30 -118.5 42.5t-94.5 12.5zM336 918q-57 0 -121 -34t-117 -87v149 q106 109 256 109q69 0 127 -16t140 -50q69 -29 116.5 -42t96.5 -13q55 0 119.5 33t115.5 88v-150q-100 -110 -254 -110q-69 0 -128 16t-138 49q-84 34 -126.5 46t-86.5 12z" />
-<glyph unicode="&#x2260;" horiz-adv-x="1171" d="M381 449h-277v137h340l127 272h-467v137h531l135 287l125 -57l-109 -230h279v-137h-342l-129 -272h471v-137h-535l-131 -283l-125 55z" />
-<glyph unicode="&#x2264;" horiz-adv-x="1171" d="M104 1zM1065 242l-961 422v98l961 479v-149l-782 -371l782 -328v-151zM104 1v138h961v-138h-961z" />
-<glyph unicode="&#x2265;" horiz-adv-x="1171" d="M104 1zM104 393l783 326l-783 373v149l961 -479v-98l-961 -422v151zM104 1v138h961v-138h-961z" />
-<glyph unicode="&#x2400;" horiz-adv-x="0" />
-<glyph unicode="&#x25ca;" horiz-adv-x="1194" d="M111 735l450 740h72l452 -740l-452 -735h-72zM915 737l-317 531l-317 -531l317 -532z" />
-<glyph unicode="&#xe000;" horiz-adv-x="1095" d="M0 1095h1095v-1095h-1095v1095z" />
-<glyph unicode="&#xfeff;" horiz-adv-x="0" />
-<glyph unicode="&#xfffc;" horiz-adv-x="2048" d="M84 1214v304h303v-111h-192v-193h-111zM1681 1407v111h304v-304h-109v193h-195zM84 -383v303h111v-194h192v-109h-303zM1681 -383v109h195v194h109v-303h-304zM1290 -383v109h273v-109h-273zM508 -383v109h270v-109h-270zM508 1407v111h270v-111h-270zM1985 39h-109v270 h109v-270zM1985 823h-109v271h109v-271zM899 -383v109h272v-109h-272zM195 39h-111v270h111v-270zM899 1407v111h272v-111h-272zM1290 1407v111h273v-111h-273zM195 430h-111v272h111v-272zM195 823h-111v271h111v-271zM1985 430h-109v272h109v-272zM864 629 q0 -145 -67.5 -223t-194.5 -78t-194.5 78t-67.5 223q0 146 67.5 223.5t194.5 77.5q126 0 194 -77t68 -224zM467 629q0 -197 135 -197t135 197q0 196 -135 196t-135 -196zM948 922h172q109 0 165 -33.5t56 -116.5q0 -49 -23 -82t-67 -41v-8q61 -14 84 -48t23 -87 q0 -81 -54.5 -125.5t-148.5 -44.5h-207v586zM1071 690h66q46 0 64 17t18 49q0 34 -21 48.5t-68 14.5h-59v-129zM1071 592v-154h74q49 0 67.5 21.5t18.5 58.5q0 74 -90 74h-70zM1491 330q-52 0 -80 10v102q43 -8 68 -8q86 0 86 86v402h125v-398q0 -95 -52.5 -144.5 t-146.5 -49.5z" />
-<glyph unicode="&#xfffd;" horiz-adv-x="2048" d="M1022 1556l940 -938l-940 -937l-938 937zM1087 367v47q0 50 22 82.5t87 81.5q103 82 139.5 145t36.5 151q0 135 -93.5 212t-258.5 77q-79 0 -172 -28t-164 -70l82 -178q160 80 250 80q63 0 94 -29t31 -76q0 -53 -24.5 -90.5t-96.5 -91.5q-84 -68 -113.5 -124t-29.5 -130 v-59h210zM850 92q0 -63 35.5 -99t105.5 -36q66 0 102.5 36.5t36.5 98.5q0 64 -36 100.5t-103 36.5q-72 0 -106.5 -36t-34.5 -101z" />
-<glyph horiz-adv-x="682" d="M598 0h-514v98l172 35v1194l-172 37v98h514v-98l-172 -37v-1194l172 -35v-98z" />
-<glyph horiz-adv-x="682" d="M60 0zM598 0h-514v98l172 35v1194l-172 37v98h514v-98l-172 -37v-1194l172 -35v-98zM453 1579h-110q-65 52 -154 148t-129 159v21h203q32 -69 89 -159.5t101 -143.5v-25z" />
-<glyph horiz-adv-x="682" d="M84 0zM598 0h-514v98l172 35v1194l-172 37v98h514v-98l-172 -37v-1194l172 -35v-98zM234 1604q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111v25z" />
-<glyph horiz-adv-x="682" d="M0 0zM598 0h-514v98l172 35v1194l-172 37v98h514v-98l-172 -37v-1194l172 -35v-98zM-1 1602q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115v23z" />
-<glyph horiz-adv-x="682" d="M60 0zM598 0h-514v98l172 35v1194l-172 37v98h514v-98l-172 -37v-1194l172 -35v-98zM60 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM441 1731q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75 q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph horiz-adv-x="682" d="M0 0zM598 0h-514v98l172 35v1194l-172 37v98h514v-98l-172 -37v-1194l172 -35v-98zM494 1581q-43 0 -84 18.5t-80.5 41t-76 41t-70.5 18.5q-50 0 -75.5 -30t-39.5 -91h-98q13 121 70.5 189.5t148.5 68.5q46 0 89 -18.5t82 -41t75 -41t68 -18.5q49 0 73 29.5t39 91.5h99 q-13 -121 -69.5 -189.5t-150.5 -68.5z" />
-<glyph horiz-adv-x="682" d="M42 0zM598 0h-514v98l172 35v1194l-172 37v98h514v-98l-172 -37v-1194l172 -35v-98zM42 1716h600v-137h-600v137z" />
-<glyph horiz-adv-x="682" d="M30 0zM598 0h-514v98l172 35v1194l-172 37v98h514v-98l-172 -37v-1194l172 -35v-98zM335 1579q-140 0 -218 68.5t-87 199.5h104q6 -49 26.5 -77t57 -41t121.5 -13q101 0 149 32t58 99h104q-10 -126 -93.5 -197t-221.5 -71z" />
-<glyph horiz-adv-x="682" d="M84 0zM598 0h-514v98l172 35v1194l-172 37v98h514v-98l-172 -37v-1194l172 -35v-98zM282 -238q0 -94 94 -94q42 0 97 13v-109q-65 -18 -125 -18q-207 0 -207 188q0 70 43 137.5t115 120.5h120q-68 -66 -102.5 -120.5t-34.5 -117.5z" />
-<glyph horiz-adv-x="682" d="M84 0zM598 0h-514v98l172 35v1194l-172 37v98h514v-98l-172 -37v-1194l172 -35v-98zM242 1731q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5z" />
-<glyph horiz-adv-x="1229" d="M84 0zM598 0h-514v98l172 35v1194l-172 37v98h514v-98l-172 -37v-1194l172 -35v-98zM668 -385q-94 0 -148 27v145q71 -20 148 -20q99 0 150.5 60t51.5 173v1462h170v-1448q0 -190 -96 -294.5t-276 -104.5z" />
-<glyph horiz-adv-x="920" d="M0 0zM836 0h-514v98l172 35v1194l-172 37v98h514v-98l-172 -37v-1194l172 -35v-98zM-28 1165q27 72 53.5 185.5t38.5 195.5h184v-23q-18 -74 -72.5 -192.5t-103.5 -194.5h-100v29z" />
-<glyph horiz-adv-x="682" d="M84 0zM598 0h-514v98l172 35v1194l-172 37v98h514v-98l-172 -37v-1194l172 -35v-98z" />
-<glyph horiz-adv-x="682" d="M60 0zM598 0h-514v98l172 35v1194l-172 37v98h514v-98l-172 -37v-1194l172 -35v-98zM60 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM441 1731q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75 q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph horiz-adv-x="682" d="M84 0zM598 0h-514v98l172 35v1194l-172 37v98h514v-98l-172 -37v-1194l172 -35v-98z" />
-<glyph horiz-adv-x="682" d="M60 0zM598 0h-514v98l172 35v1194l-172 37v98h514v-98l-172 -37v-1194l172 -35v-98zM60 1731q0 52 26.5 75t63.5 23q38 0 65.5 -23t27.5 -75q0 -50 -27.5 -74.5t-65.5 -24.5q-37 0 -63.5 24.5t-26.5 74.5zM441 1731q0 52 26.5 75t63.5 23t64.5 -23t27.5 -75 q0 -50 -27.5 -74.5t-64.5 -24.5t-63.5 24.5t-26.5 74.5z" />
-<glyph horiz-adv-x="1182" d="M584 1241q-185 0 -270 71.5t-95 235.5h156q9 -104 54.5 -145t158.5 -41q103 0 152.5 44t60.5 142h157q-12 -158 -101 -232.5t-273 -74.5z" />
-<glyph horiz-adv-x="1024" d="M393 1253q19 55 38.5 138.5t29.5 164.5h168v-18q-11 -51 -55 -145t-91 -164h-90v24z" />
-<glyph horiz-adv-x="1024" d="M369 -428q28 64 53.5 157t32.5 146h168v-18q-11 -51 -60 -147.5t-104 -162.5h-90v25z" />
-<glyph horiz-adv-x="1024" d="M639 1544q-29 -61 -55.5 -157.5t-32.5 -145.5h-166v19q14 61 63.5 156.5t98.5 152.5h92v-25z" />
-<glyph horiz-adv-x="682" d="M84 0zM598 0h-514v98l172 35v1194l-172 37v98h514v-98l-172 -37v-1194l172 -35v-98z" />
-<glyph horiz-adv-x="682" d="M84 0zM598 0h-514v98l172 35v1194l-172 37v98h514v-98l-172 -37v-1194l172 -35v-98z" />
-<glyph horiz-adv-x="682" d="M84 0zM598 0h-514v98l172 35v1194l-172 37v98h514v-98l-172 -37v-1194l172 -35v-98zM572 1833q0 -140 -166 -174l-10 -113h-105l-12 176q86 14 125 39t39 68t-33.5 63.5t-106.5 20.5q-62 0 -94 -6v100q38 10 107 10q256 0 256 -184z" />
-<glyph horiz-adv-x="682" d="M84 0zM598 0h-514v98l172 35v1194l-172 37v98h514v-98l-172 -37v-1194l172 -35v-98zM239 -242q0 57 29.5 84t71.5 27q40 0 69 -27t29 -84q0 -55 -29 -82.5t-69 -27.5q-42 0 -71.5 27.5t-29.5 82.5z" />
-<glyph horiz-adv-x="0" d="M-301 1241h-94q-112 75 -211 166q-114 -101 -211 -166h-94v25l53 60q112 123 164 200h176q66 -94 217 -260v-25zM-381 1460q73 91 127 203h172v-21q-83 -110 -203 -206h-96v24z" />
-<glyph horiz-adv-x="0" d="M-297 1241h-94q-97 65 -211 166q-106 -96 -211 -166h-94v23l53 60q112 123 164 200h176q66 -94 217 -260v-23zM-827 1436h-95q-120 94 -204 206v21h172q52 -108 127 -205v-22z" />
-<glyph horiz-adv-x="0" d="M-301 1241h-94q-112 75 -211 166q-114 -101 -211 -166h-94v25l53 60q112 123 164 200h176q66 -94 217 -260v-25zM-133 1645q0 -103 -127 -132l-6 -81h-80l-10 131q57 9 88.5 25t31.5 54q0 37 -28.5 49.5t-71.5 12.5q-46 0 -72 -6v80q25 6 80 6q195 0 195 -139z" />
-<glyph horiz-adv-x="0" d="M-467 1589q-37 0 -72.5 15t-69 33.5t-65 33.5t-59.5 15q-40 0 -61 -24.5t-35 -74.5h-91q13 106 63.5 162.5t125.5 56.5q37 0 73.5 -15t70 -33t64.5 -33t58 -15q40 0 61 24.5t33 73.5h90q-11 -104 -60.5 -161.5t-125.5 -57.5zM-297 1241h-94q-97 65 -211 166 q-106 -96 -211 -166h-94v23l53 60q112 123 164 200h176q66 -94 217 -260v-23z" />
-<glyph horiz-adv-x="0" d="M-674 1524q80 104 129 205h172v-21q-86 -114 -205 -207h-96v23zM-612 1241q-276 0 -291 260h102q9 -72 47 -100.5t144 -28.5q98 0 141 32.5t51 96.5h105q-11 -120 -85.5 -190t-213.5 -70z" />
-<glyph horiz-adv-x="0" d="M-559 1501h-94q-119 93 -205 207v21h172q52 -108 127 -205v-23zM-612 1241q-276 0 -291 260h102q9 -72 47 -100.5t144 -28.5q98 0 141 32.5t51 96.5h105q-11 -120 -85.5 -190t-213.5 -70z" />
-<glyph horiz-adv-x="0" d="M-463 1657q0 -100 -127 -129l-6 -41h-82l-10 90q57 9 90 25t33 53t-28.5 50t-72.5 13q-37 0 -73 -6v78q22 8 84 8q192 0 192 -141zM-612 1241q-276 0 -291 260h102q9 -72 47 -100.5t144 -28.5q98 0 141 32.5t51 96.5h105q-11 -120 -85.5 -190t-213.5 -70z" />
-<glyph horiz-adv-x="0" d="M-467 1587q-37 0 -72.5 15t-69 33t-65 33t-59.5 15q-40 0 -61 -24t-35 -74h-91q13 104 63 160.5t126 56.5q37 0 73.5 -15t70 -33t64.5 -33t58 -15q40 0 61 24.5t33 73.5h90q-11 -103 -60.5 -160t-125.5 -57zM-612 1241q-276 0 -291 260h102q9 -72 47 -100.5t144 -28.5 q98 0 141 32.5t51 96.5h105q-11 -120 -85.5 -190t-213.5 -70z" />
-<glyph horiz-adv-x="420" d="M223 -238q0 103 -139 238h123q158 -120 158 -252q0 -91 -51 -142.5t-150 -51.5q-65 0 -115 16v108q32 -10 86 -10q37 0 62.5 24t25.5 70z" />
-<glyph horiz-adv-x="420" d="M369 154v-289q0 -260 -228 -260q-56 0 -116 24v140q41 -19 102 -19q94 0 94 100v304h148z" />
-<glyph horiz-adv-x="420" d="M369 143v-278q0 -260 -228 -260q-56 0 -116 24v140q41 -19 102 -19q94 0 94 100v293h148z" />
-<glyph horiz-adv-x="813" d="M52 0zM579 0h-162v1042q0 130 8 246q-21 -21 -47 -44t-238 -195l-88 114l387 299h140v-1462z" />
-<glyph horiz-adv-x="1161" d="M1047 559q0 -267 -123.5 -423t-345.5 -156q-217 0 -340 154.5t-123 424.5q0 271 124.5 425.5t342.5 154.5q216 0 340.5 -154.5t124.5 -425.5zM283 559q0 -208 77.5 -324t219.5 -116q141 0 220 117t79 323q0 204 -79 322t-222 118q-141 0 -218 -116.5t-77 -323.5z" />
-<glyph horiz-adv-x="756" d="M567 0h-161v561q0 239 8 379q-67 -67 -129 -115l-150 -112l-90 114l383 291h139v-1118z" />
-<glyph horiz-adv-x="1044" d="M983 0h-942v133l401 303q157 119 213.5 171t78.5 93.5t22 106.5q0 87 -69.5 138.5t-188.5 51.5q-88 0 -166 -30.5t-170 -104.5l-90 109q192 168 434 168q198 0 307 -84t109 -234q0 -115 -65 -208.5t-251 -221.5l-327 -231l2 -6h702v-154z" />
-<glyph horiz-adv-x="1171" d="M1006 775q0 -140 -78.5 -229t-222.5 -119v-8q176 -22 261 -112t85 -236q0 -209 -145 -321.5t-412 -112.5q-116 0 -212.5 17.5t-187.5 61.5v158q95 -47 202.5 -71.5t203.5 -24.5q379 0 379 297q0 266 -418 266h-144v143h146q171 0 271 75.5t100 209.5q0 107 -73.5 168 t-199.5 61q-96 0 -181 -26t-194 -96l-84 112q90 71 207.5 111.5t247.5 40.5q213 0 331 -97.5t118 -267.5z" />
-<glyph horiz-adv-x="1167" d="M1126 27h-217v-371h-168v371h-718v125l702 966h184v-956h217v-135zM748 162v348q0 218 12 440h-10q-41 -86 -109 -178l-455 -610h562z" />
-<glyph horiz-adv-x="1171" d="M557 550q231 0 363.5 -114.5t132.5 -313.5q0 -227 -144.5 -356t-398.5 -129q-247 0 -377 79v160q70 -45 174 -70.5t205 -25.5q176 0 273.5 83t97.5 240q0 306 -375 306q-94 0 -254 -29l-86 55l55 684h727v-153h-585l-37 -439q115 23 229 23z" />
-<glyph horiz-adv-x="1171" d="M117 0zM117 625q0 431 167.5 644.5t495.5 213.5q113 0 178 -19v-143q-77 25 -176 25q-235 0 -359 -146.5t-136 -460.5h12q110 172 348 172q197 0 310.5 -119t113.5 -323q0 -228 -124.5 -358.5t-336.5 -130.5q-227 0 -360 170.5t-133 474.5zM608 121q142 0 220.5 89.5 t78.5 258.5q0 145 -73 228t-218 83q-90 0 -165 -37t-119.5 -102t-44.5 -135q0 -103 40 -192t113.5 -141t167.5 -52z" />
-<glyph horiz-adv-x="1171" d="M285 -343l606 1309h-797v153h973v-133l-598 -1329h-184z" />
-<glyph horiz-adv-x="1171" d="M104 0zM584 1483q200 0 317 -93t117 -257q0 -108 -67 -197t-214 -162q178 -85 253 -178.5t75 -216.5q0 -182 -127 -290.5t-348 -108.5q-234 0 -360 102.5t-126 290.5q0 251 306 391q-138 78 -198 168.5t-60 202.5q0 159 117.5 253.5t314.5 94.5zM268 369 q0 -120 83.5 -187t234.5 -67q149 0 232 70t83 192q0 97 -78 172.5t-272 146.5q-149 -64 -216 -141.5t-67 -185.5zM582 1348q-125 0 -196 -60t-71 -160q0 -92 59 -158t218 -132q143 60 202.5 129t59.5 161q0 101 -72.5 160.5t-199.5 59.5z" />
-<glyph horiz-adv-x="1171" d="M1061 495q0 -858 -664 -858q-116 0 -184 20v143q80 -26 182 -26q240 0 362.5 148.5t133.5 455.5h-12q-55 -83 -146 -126.5t-205 -43.5q-194 0 -308 116t-114 324q0 228 127.5 360t335.5 132q149 0 260.5 -76.5t171.5 -223t60 -345.5zM569 998q-143 0 -221 -92t-78 -256 q0 -144 72 -226.5t219 -82.5q91 0 167.5 37t120.5 101t44 134q0 105 -41 194t-114.5 140t-168.5 51z" />
-<glyph horiz-adv-x="1255" d="M588 119q170 0 245.5 91.5t79.5 293.5v43q0 226 -79 328t-250 102q-144 0 -220.5 -112t-76.5 -320q0 -209 75.5 -317.5t225.5 -108.5zM913 12q0 36 9 135h-11q-112 -167 -342 -167q-217 0 -336.5 150.5t-119.5 416.5q0 264 121.5 416.5t332.5 152.5q223 0 346 -166h11 l24 146h131v-1116q0 -236 -118 -354t-367 -118q-242 0 -391 70v158q75 -42 180 -65t223 -23q142 0 224.5 84.5t82.5 230.5v49z" />
-<glyph horiz-adv-x="1255" d="M113 0zM588 119q170 0 245.5 91.5t79.5 293.5v43q0 226 -79 328t-250 102q-144 0 -220.5 -112t-76.5 -320q0 -209 75.5 -317.5t225.5 -108.5zM913 12q0 36 9 135h-11q-112 -167 -342 -167q-217 0 -336.5 150.5t-119.5 416.5q0 264 121.5 416.5t332.5 152.5 q223 0 346 -166h11l24 146h131v-1116q0 -236 -118 -354t-367 -118q-242 0 -391 70v158q75 -42 180 -65t223 -23q142 0 224.5 84.5t82.5 230.5v49zM274 1264q127 136 178 200t74 105h166q22 -42 76.5 -108.5t179.5 -196.5v-23h-119q-88 55 -221 186q-136 -134 -219 -186h-115 v23z" />
-<glyph horiz-adv-x="1255" d="M113 0zM588 119q170 0 245.5 91.5t79.5 293.5v43q0 226 -79 328t-250 102q-144 0 -220.5 -112t-76.5 -320q0 -209 75.5 -317.5t225.5 -108.5zM913 12q0 36 9 135h-11q-112 -167 -342 -167q-217 0 -336.5 150.5t-119.5 416.5q0 264 121.5 416.5t332.5 152.5 q223 0 346 -166h11l24 146h131v-1116q0 -236 -118 -354t-367 -118q-242 0 -391 70v158q75 -42 180 -65t223 -23q142 0 224.5 84.5t82.5 230.5v49zM610 1241q-140 0 -218 68.5t-87 199.5h104q6 -49 26.5 -77t57 -41t121.5 -13q101 0 149 32t58 99h104q-10 -126 -93.5 -197 t-221.5 -71z" />
-<glyph horiz-adv-x="1255" d="M113 0zM588 119q170 0 245.5 91.5t79.5 293.5v43q0 226 -79 328t-250 102q-144 0 -220.5 -112t-76.5 -320q0 -209 75.5 -317.5t225.5 -108.5zM913 12q0 36 9 135h-11q-112 -167 -342 -167q-217 0 -336.5 150.5t-119.5 416.5q0 264 121.5 416.5t332.5 152.5 q223 0 346 -166h11l24 146h131v-1116q0 -236 -118 -354t-367 -118q-242 0 -391 70v158q75 -42 180 -65t223 -23q142 0 224.5 84.5t82.5 230.5v49zM504 1393q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5z" />
-<glyph horiz-adv-x="1255" d="M113 0zM588 119q170 0 245.5 91.5t79.5 293.5v43q0 226 -79 328t-250 102q-144 0 -220.5 -112t-76.5 -320q0 -209 75.5 -317.5t225.5 -108.5zM913 12q0 36 9 135h-11q-112 -167 -342 -167q-217 0 -336.5 150.5t-119.5 416.5q0 264 121.5 416.5t332.5 152.5 q223 0 346 -166h11l24 146h131v-1116q0 -236 -118 -354t-367 -118q-242 0 -391 70v158q75 -42 180 -65t223 -23q142 0 224.5 84.5t82.5 230.5v49zM758 1544q-29 -61 -55.5 -157.5t-32.5 -145.5h-166v19q14 61 63.5 156.5t98.5 152.5h92v-25z" />
-<glyph horiz-adv-x="1255" d="M0 0z" />
-<hkern u1="&#x22;" u2="&#x1ef8;" k="-20" />
-<hkern u1="&#x22;" u2="&#x1ef6;" k="-20" />
-<hkern u1="&#x22;" u2="&#x1ef4;" k="-20" />
-<hkern u1="&#x22;" u2="&#x1ef2;" k="-20" />
-<hkern u1="&#x22;" u2="&#x1ef1;" k="61" />
-<hkern u1="&#x22;" u2="&#x1eef;" k="61" />
-<hkern u1="&#x22;" u2="&#x1eed;" k="61" />
-<hkern u1="&#x22;" u2="&#x1eeb;" k="61" />
-<hkern u1="&#x22;" u2="&#x1ee9;" k="61" />
-<hkern u1="&#x22;" u2="&#x1ee7;" k="61" />
-<hkern u1="&#x22;" u2="&#x1ee5;" k="61" />
-<hkern u1="&#x22;" u2="&#x1ee3;" k="123" />
-<hkern u1="&#x22;" u2="&#x1ee1;" k="123" />
-<hkern u1="&#x22;" u2="&#x1edf;" k="123" />
-<hkern u1="&#x22;" u2="&#x1edd;" k="123" />
-<hkern u1="&#x22;" u2="&#x1edb;" k="123" />
-<hkern u1="&#x22;" u2="&#x1ed9;" k="123" />
-<hkern u1="&#x22;" u2="&#x1ed7;" k="123" />
-<hkern u1="&#x22;" u2="&#x1ed5;" k="123" />
-<hkern u1="&#x22;" u2="&#x1ed1;" k="123" />
-<hkern u1="&#x22;" u2="&#x1ecf;" k="123" />
-<hkern u1="&#x22;" u2="&#x1ecd;" k="123" />
-<hkern u1="&#x22;" u2="&#x1ec7;" k="123" />
-<hkern u1="&#x22;" u2="&#x1ec5;" k="123" />
-<hkern u1="&#x22;" u2="&#x1ec3;" k="123" />
-<hkern u1="&#x22;" u2="&#x1ebf;" k="123" />
-<hkern u1="&#x22;" u2="&#x1ebd;" k="123" />
-<hkern u1="&#x22;" u2="&#x1ebb;" k="123" />
-<hkern u1="&#x22;" u2="&#x1eb9;" k="123" />
-<hkern u1="&#x22;" u2="&#x1eb7;" k="82" />
-<hkern u1="&#x22;" u2="&#x1eb6;" k="143" />
-<hkern u1="&#x22;" u2="&#x1eb5;" k="82" />
-<hkern u1="&#x22;" u2="&#x1eb4;" k="143" />
-<hkern u1="&#x22;" u2="&#x1eb3;" k="82" />
-<hkern u1="&#x22;" u2="&#x1eb2;" k="143" />
-<hkern u1="&#x22;" u2="&#x1eb1;" k="82" />
-<hkern u1="&#x22;" u2="&#x1eb0;" k="143" />
-<hkern u1="&#x22;" u2="&#x1eaf;" k="82" />
-<hkern u1="&#x22;" u2="&#x1eae;" k="143" />
-<hkern u1="&#x22;" u2="&#x1ead;" k="82" />
-<hkern u1="&#x22;" u2="&#x1eac;" k="143" />
-<hkern u1="&#x22;" u2="&#x1eab;" k="82" />
-<hkern u1="&#x22;" u2="&#x1eaa;" k="143" />
-<hkern u1="&#x22;" u2="&#x1ea9;" k="82" />
-<hkern u1="&#x22;" u2="&#x1ea8;" k="143" />
-<hkern u1="&#x22;" u2="&#x1ea6;" k="143" />
-<hkern u1="&#x22;" u2="&#x1ea5;" k="82" />
-<hkern u1="&#x22;" u2="&#x1ea4;" k="143" />
-<hkern u1="&#x22;" u2="&#x1ea3;" k="82" />
-<hkern u1="&#x22;" u2="&#x1ea2;" k="143" />
-<hkern u1="&#x22;" u2="&#x1ea1;" k="82" />
-<hkern u1="&#x22;" u2="&#x1ea0;" k="143" />
-<hkern u1="&#x22;" u2="&#x1e84;" k="-41" />
-<hkern u1="&#x22;" u2="&#x1e82;" k="-41" />
-<hkern u1="&#x22;" u2="&#x1e80;" k="-41" />
-<hkern u1="&#x22;" u2="&#x1e3f;" k="61" />
-<hkern u1="&#x22;" u2="&#x1e01;" k="82" />
-<hkern u1="&#x22;" u2="&#x1e00;" k="143" />
-<hkern u1="&#x22;" u2="&#x513;" k="143" />
-<hkern u1="&#x22;" u2="&#x512;" k="123" />
-<hkern u1="&#x22;" u2="&#x511;" k="123" />
-<hkern u1="&#x22;" u2="&#x50d;" k="123" />
-<hkern u1="&#x22;" u2="&#x509;" k="143" />
-<hkern u1="&#x22;" u2="&#x508;" k="123" />
-<hkern u1="&#x22;" u2="&#x503;" k="123" />
-<hkern u1="&#x22;" u2="&#x502;" k="143" />
-<hkern u1="&#x22;" u2="&#x501;" k="123" />
-<hkern u1="&#x22;" u2="&#x500;" k="143" />
-<hkern u1="&#x22;" u2="&#x4eb;" k="123" />
-<hkern u1="&#x22;" u2="&#x4e9;" k="123" />
-<hkern u1="&#x22;" u2="&#x4e7;" k="123" />
-<hkern u1="&#x22;" u2="&#x4db;" k="41" />
-<hkern u1="&#x22;" u2="&#x4d9;" k="41" />
-<hkern u1="&#x22;" u2="&#x4d7;" k="123" />
-<hkern u1="&#x22;" u2="&#x4d5;" k="41" />
-<hkern u1="&#x22;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x22;" u2="&#x4d3;" k="41" />
-<hkern u1="&#x22;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x22;" u2="&#x4d1;" k="41" />
-<hkern u1="&#x22;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x22;" u2="&#x4c6;" k="143" />
-<hkern u1="&#x22;" u2="&#x4c5;" k="123" />
-<hkern u1="&#x22;" u2="&#x4ab;" k="123" />
-<hkern u1="&#x22;" u2="&#x4a9;" k="123" />
-<hkern u1="&#x22;" u2="&#x481;" k="123" />
-<hkern u1="&#x22;" u2="&#x47d;" k="123" />
-<hkern u1="&#x22;" u2="&#x47b;" k="123" />
-<hkern u1="&#x22;" u2="&#x479;" k="123" />
-<hkern u1="&#x22;" u2="&#x473;" k="123" />
-<hkern u1="&#x22;" u2="&#x471;" k="20" />
-<hkern u1="&#x22;" u2="&#x467;" k="143" />
-<hkern u1="&#x22;" u2="&#x466;" k="143" />
-<hkern u1="&#x22;" u2="&#x459;" k="143" />
-<hkern u1="&#x22;" u2="&#x455;" k="61" />
-<hkern u1="&#x22;" u2="&#x454;" k="123" />
-<hkern u1="&#x22;" u2="&#x451;" k="123" />
-<hkern u1="&#x22;" u2="&#x450;" k="123" />
-<hkern u1="&#x22;" u2="&#x444;" k="123" />
-<hkern u1="&#x22;" u2="&#x441;" k="123" />
-<hkern u1="&#x22;" u2="&#x43e;" k="123" />
-<hkern u1="&#x22;" u2="&#x43b;" k="143" />
-<hkern u1="&#x22;" u2="&#x435;" k="123" />
-<hkern u1="&#x22;" u2="&#x434;" k="143" />
-<hkern u1="&#x22;" u2="&#x430;" k="41" />
-<hkern u1="&#x22;" u2="&#x41b;" k="123" />
-<hkern u1="&#x22;" u2="&#x414;" k="123" />
-<hkern u1="&#x22;" u2="&#x410;" k="143" />
-<hkern u1="&#x22;" u2="&#x409;" k="123" />
-<hkern u1="&#x22;" u2="&#x3cc;" k="82" />
-<hkern u1="&#x22;" u2="&#x3c6;" k="82" />
-<hkern u1="&#x22;" u2="&#x3c3;" k="82" />
-<hkern u1="&#x22;" u2="&#x3c2;" k="82" />
-<hkern u1="&#x22;" u2="&#x3c1;" k="61" />
-<hkern u1="&#x22;" u2="&#x3bf;" k="82" />
-<hkern u1="&#x22;" u2="&#x3bc;" k="41" />
-<hkern u1="&#x22;" u2="&#x3ba;" k="41" />
-<hkern u1="&#x22;" u2="&#x3b7;" k="41" />
-<hkern u1="&#x22;" u2="&#x3b6;" k="41" />
-<hkern u1="&#x22;" u2="&#x3b5;" k="41" />
-<hkern u1="&#x22;" u2="&#x3b4;" k="61" />
-<hkern u1="&#x22;" u2="&#x3b1;" k="82" />
-<hkern u1="&#x22;" u2="&#x3ae;" k="41" />
-<hkern u1="&#x22;" u2="&#x3ad;" k="41" />
-<hkern u1="&#x22;" u2="&#x3ac;" k="82" />
-<hkern u1="&#x22;" u2="&#x39b;" k="143" />
-<hkern u1="&#x22;" u2="&#x394;" k="143" />
-<hkern u1="&#x22;" u2="&#x391;" k="143" />
-<hkern u1="&#x22;" u2="&#x386;" k="143" />
-<hkern u1="&#x22;" u2="&#x21a;" k="-41" />
-<hkern u1="&#x22;" u2="&#x219;" k="61" />
-<hkern u1="&#x22;" u2="&#x1ff;" k="123" />
-<hkern u1="&#x22;" u2="&#x1fd;" k="82" />
-<hkern u1="&#x22;" u2="&#x1fb;" k="82" />
-<hkern u1="&#x22;" u2="&#x1fa;" k="143" />
-<hkern u1="&#x22;" u2="&#x1b0;" k="61" />
-<hkern u1="&#x22;" u2="&#x1a1;" k="123" />
-<hkern u1="&#x22;" u2="&#x178;" k="-20" />
-<hkern u1="&#x22;" u2="&#x176;" k="-20" />
-<hkern u1="&#x22;" u2="&#x174;" k="-41" />
-<hkern u1="&#x22;" u2="&#x173;" k="61" />
-<hkern u1="&#x22;" u2="&#x171;" k="61" />
-<hkern u1="&#x22;" u2="&#x16f;" k="61" />
-<hkern u1="&#x22;" u2="&#x16d;" k="61" />
-<hkern u1="&#x22;" u2="&#x16b;" k="61" />
-<hkern u1="&#x22;" u2="&#x169;" k="61" />
-<hkern u1="&#x22;" u2="&#x164;" k="-41" />
-<hkern u1="&#x22;" u2="&#x162;" k="-41" />
-<hkern u1="&#x22;" u2="&#x15f;" k="61" />
-<hkern u1="&#x22;" u2="&#x15b;" k="61" />
-<hkern u1="&#x22;" u2="&#x157;" k="61" />
-<hkern u1="&#x22;" u2="&#x155;" k="61" />
-<hkern u1="&#x22;" u2="&#x153;" k="123" />
-<hkern u1="&#x22;" u2="&#x151;" k="123" />
-<hkern u1="&#x22;" u2="&#x14f;" k="123" />
-<hkern u1="&#x22;" u2="&#x14d;" k="123" />
-<hkern u1="&#x22;" u2="&#x14b;" k="61" />
-<hkern u1="&#x22;" u2="&#x146;" k="61" />
-<hkern u1="&#x22;" u2="&#x144;" k="61" />
-<hkern u1="&#x22;" u2="&#x138;" k="61" />
-<hkern u1="&#x22;" u2="&#x123;" k="61" />
-<hkern u1="&#x22;" u2="&#x121;" k="61" />
-<hkern u1="&#x22;" u2="&#x11f;" k="61" />
-<hkern u1="&#x22;" u2="&#x11d;" k="61" />
-<hkern u1="&#x22;" u2="&#x11b;" k="123" />
-<hkern u1="&#x22;" u2="&#x119;" k="123" />
-<hkern u1="&#x22;" u2="&#x117;" k="123" />
-<hkern u1="&#x22;" u2="&#x115;" k="123" />
-<hkern u1="&#x22;" u2="&#x113;" k="123" />
-<hkern u1="&#x22;" u2="&#x111;" k="123" />
-<hkern u1="&#x22;" u2="&#x10f;" k="123" />
-<hkern u1="&#x22;" u2="&#x10d;" k="123" />
-<hkern u1="&#x22;" u2="&#x10b;" k="123" />
-<hkern u1="&#x22;" u2="&#x109;" k="123" />
-<hkern u1="&#x22;" u2="&#x107;" k="123" />
-<hkern u1="&#x22;" u2="&#x105;" k="82" />
-<hkern u1="&#x22;" u2="&#x104;" k="143" />
-<hkern u1="&#x22;" u2="&#x103;" k="82" />
-<hkern u1="&#x22;" u2="&#x102;" k="143" />
-<hkern u1="&#x22;" u2="&#x101;" k="82" />
-<hkern u1="&#x22;" u2="&#x100;" k="143" />
-<hkern u1="&#x22;" u2="&#xfc;" k="61" />
-<hkern u1="&#x22;" u2="&#xfb;" k="61" />
-<hkern u1="&#x22;" u2="&#xfa;" k="61" />
-<hkern u1="&#x22;" u2="&#xf9;" k="61" />
-<hkern u1="&#x22;" u2="&#xf8;" k="123" />
-<hkern u1="&#x22;" u2="&#xf6;" k="123" />
-<hkern u1="&#x22;" u2="&#xf5;" k="123" />
-<hkern u1="&#x22;" u2="&#xf4;" k="123" />
-<hkern u1="&#x22;" u2="&#xf3;" k="123" />
-<hkern u1="&#x22;" u2="&#xf2;" k="123" />
-<hkern u1="&#x22;" u2="&#xeb;" k="123" />
-<hkern u1="&#x22;" u2="&#xea;" k="123" />
-<hkern u1="&#x22;" u2="&#xe9;" k="123" />
-<hkern u1="&#x22;" u2="&#xe8;" k="123" />
-<hkern u1="&#x22;" u2="&#xe7;" k="123" />
-<hkern u1="&#x22;" u2="&#xe6;" k="82" />
-<hkern u1="&#x22;" u2="&#xe5;" k="82" />
-<hkern u1="&#x22;" u2="&#xe4;" k="82" />
-<hkern u1="&#x22;" u2="&#xe3;" k="82" />
-<hkern u1="&#x22;" u2="&#xe2;" k="82" />
-<hkern u1="&#x22;" u2="&#xe1;" k="82" />
-<hkern u1="&#x22;" u2="&#xe0;" k="123" />
-<hkern u1="&#x22;" u2="&#xdd;" k="-20" />
-<hkern u1="&#x22;" u2="&#xc5;" k="143" />
-<hkern u1="&#x22;" u2="&#xc4;" k="143" />
-<hkern u1="&#x22;" u2="&#xc3;" k="143" />
-<hkern u1="&#x22;" u2="&#xc2;" k="143" />
-<hkern u1="&#x22;" u2="&#xc1;" k="143" />
-<hkern u1="&#x22;" u2="&#xc0;" k="143" />
-<hkern u1="&#x22;" u2="u" k="61" />
-<hkern u1="&#x22;" u2="s" k="61" />
-<hkern u1="&#x22;" u2="r" k="61" />
-<hkern u1="&#x22;" u2="q" k="123" />
-<hkern u1="&#x22;" u2="p" k="61" />
-<hkern u1="&#x22;" u2="o" k="123" />
-<hkern u1="&#x22;" u2="n" k="61" />
-<hkern u1="&#x22;" u2="m" k="61" />
-<hkern u1="&#x22;" u2="g" k="61" />
-<hkern u1="&#x22;" u2="e" k="123" />
-<hkern u1="&#x22;" u2="d" k="123" />
-<hkern u1="&#x22;" u2="c" k="123" />
-<hkern u1="&#x22;" u2="a" k="82" />
-<hkern u1="&#x22;" u2="Y" k="-20" />
-<hkern u1="&#x22;" u2="W" k="-41" />
-<hkern u1="&#x22;" u2="V" k="-41" />
-<hkern u1="&#x22;" u2="T" k="-41" />
-<hkern u1="&#x22;" u2="A" k="143" />
-<hkern u1="&#x27;" u2="&#x1ef8;" k="-20" />
-<hkern u1="&#x27;" u2="&#x1ef6;" k="-20" />
-<hkern u1="&#x27;" u2="&#x1ef4;" k="-20" />
-<hkern u1="&#x27;" u2="&#x1ef2;" k="-20" />
-<hkern u1="&#x27;" u2="&#x1ef1;" k="61" />
-<hkern u1="&#x27;" u2="&#x1eef;" k="61" />
-<hkern u1="&#x27;" u2="&#x1eed;" k="61" />
-<hkern u1="&#x27;" u2="&#x1eeb;" k="61" />
-<hkern u1="&#x27;" u2="&#x1ee9;" k="61" />
-<hkern u1="&#x27;" u2="&#x1ee7;" k="61" />
-<hkern u1="&#x27;" u2="&#x1ee5;" k="61" />
-<hkern u1="&#x27;" u2="&#x1ee3;" k="123" />
-<hkern u1="&#x27;" u2="&#x1ee1;" k="123" />
-<hkern u1="&#x27;" u2="&#x1edf;" k="123" />
-<hkern u1="&#x27;" u2="&#x1edd;" k="123" />
-<hkern u1="&#x27;" u2="&#x1edb;" k="123" />
-<hkern u1="&#x27;" u2="&#x1ed9;" k="123" />
-<hkern u1="&#x27;" u2="&#x1ed7;" k="123" />
-<hkern u1="&#x27;" u2="&#x1ed5;" k="123" />
-<hkern u1="&#x27;" u2="&#x1ed1;" k="123" />
-<hkern u1="&#x27;" u2="&#x1ecf;" k="123" />
-<hkern u1="&#x27;" u2="&#x1ecd;" k="123" />
-<hkern u1="&#x27;" u2="&#x1ec7;" k="123" />
-<hkern u1="&#x27;" u2="&#x1ec5;" k="123" />
-<hkern u1="&#x27;" u2="&#x1ec3;" k="123" />
-<hkern u1="&#x27;" u2="&#x1ebf;" k="123" />
-<hkern u1="&#x27;" u2="&#x1ebd;" k="123" />
-<hkern u1="&#x27;" u2="&#x1ebb;" k="123" />
-<hkern u1="&#x27;" u2="&#x1eb9;" k="123" />
-<hkern u1="&#x27;" u2="&#x1eb7;" k="82" />
-<hkern u1="&#x27;" u2="&#x1eb6;" k="143" />
-<hkern u1="&#x27;" u2="&#x1eb5;" k="82" />
-<hkern u1="&#x27;" u2="&#x1eb4;" k="143" />
-<hkern u1="&#x27;" u2="&#x1eb3;" k="82" />
-<hkern u1="&#x27;" u2="&#x1eb2;" k="143" />
-<hkern u1="&#x27;" u2="&#x1eb1;" k="82" />
-<hkern u1="&#x27;" u2="&#x1eb0;" k="143" />
-<hkern u1="&#x27;" u2="&#x1eaf;" k="82" />
-<hkern u1="&#x27;" u2="&#x1eae;" k="143" />
-<hkern u1="&#x27;" u2="&#x1ead;" k="82" />
-<hkern u1="&#x27;" u2="&#x1eac;" k="143" />
-<hkern u1="&#x27;" u2="&#x1eab;" k="82" />
-<hkern u1="&#x27;" u2="&#x1eaa;" k="143" />
-<hkern u1="&#x27;" u2="&#x1ea9;" k="82" />
-<hkern u1="&#x27;" u2="&#x1ea8;" k="143" />
-<hkern u1="&#x27;" u2="&#x1ea6;" k="143" />
-<hkern u1="&#x27;" u2="&#x1ea5;" k="82" />
-<hkern u1="&#x27;" u2="&#x1ea4;" k="143" />
-<hkern u1="&#x27;" u2="&#x1ea3;" k="82" />
-<hkern u1="&#x27;" u2="&#x1ea2;" k="143" />
-<hkern u1="&#x27;" u2="&#x1ea1;" k="82" />
-<hkern u1="&#x27;" u2="&#x1ea0;" k="143" />
-<hkern u1="&#x27;" u2="&#x1e84;" k="-41" />
-<hkern u1="&#x27;" u2="&#x1e82;" k="-41" />
-<hkern u1="&#x27;" u2="&#x1e80;" k="-41" />
-<hkern u1="&#x27;" u2="&#x1e3f;" k="61" />
-<hkern u1="&#x27;" u2="&#x1e01;" k="82" />
-<hkern u1="&#x27;" u2="&#x1e00;" k="143" />
-<hkern u1="&#x27;" u2="&#x513;" k="143" />
-<hkern u1="&#x27;" u2="&#x512;" k="123" />
-<hkern u1="&#x27;" u2="&#x511;" k="123" />
-<hkern u1="&#x27;" u2="&#x50d;" k="123" />
-<hkern u1="&#x27;" u2="&#x509;" k="143" />
-<hkern u1="&#x27;" u2="&#x508;" k="123" />
-<hkern u1="&#x27;" u2="&#x503;" k="123" />
-<hkern u1="&#x27;" u2="&#x502;" k="143" />
-<hkern u1="&#x27;" u2="&#x501;" k="123" />
-<hkern u1="&#x27;" u2="&#x500;" k="143" />
-<hkern u1="&#x27;" u2="&#x4eb;" k="123" />
-<hkern u1="&#x27;" u2="&#x4e9;" k="123" />
-<hkern u1="&#x27;" u2="&#x4e7;" k="123" />
-<hkern u1="&#x27;" u2="&#x4db;" k="41" />
-<hkern u1="&#x27;" u2="&#x4d9;" k="41" />
-<hkern u1="&#x27;" u2="&#x4d7;" k="123" />
-<hkern u1="&#x27;" u2="&#x4d5;" k="41" />
-<hkern u1="&#x27;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x27;" u2="&#x4d3;" k="41" />
-<hkern u1="&#x27;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x27;" u2="&#x4d1;" k="41" />
-<hkern u1="&#x27;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x27;" u2="&#x4c6;" k="143" />
-<hkern u1="&#x27;" u2="&#x4c5;" k="123" />
-<hkern u1="&#x27;" u2="&#x4ab;" k="123" />
-<hkern u1="&#x27;" u2="&#x4a9;" k="123" />
-<hkern u1="&#x27;" u2="&#x481;" k="123" />
-<hkern u1="&#x27;" u2="&#x47d;" k="123" />
-<hkern u1="&#x27;" u2="&#x47b;" k="123" />
-<hkern u1="&#x27;" u2="&#x479;" k="123" />
-<hkern u1="&#x27;" u2="&#x473;" k="123" />
-<hkern u1="&#x27;" u2="&#x471;" k="20" />
-<hkern u1="&#x27;" u2="&#x467;" k="143" />
-<hkern u1="&#x27;" u2="&#x466;" k="143" />
-<hkern u1="&#x27;" u2="&#x459;" k="143" />
-<hkern u1="&#x27;" u2="&#x455;" k="61" />
-<hkern u1="&#x27;" u2="&#x454;" k="123" />
-<hkern u1="&#x27;" u2="&#x451;" k="123" />
-<hkern u1="&#x27;" u2="&#x450;" k="123" />
-<hkern u1="&#x27;" u2="&#x444;" k="123" />
-<hkern u1="&#x27;" u2="&#x441;" k="123" />
-<hkern u1="&#x27;" u2="&#x43e;" k="123" />
-<hkern u1="&#x27;" u2="&#x43b;" k="143" />
-<hkern u1="&#x27;" u2="&#x435;" k="123" />
-<hkern u1="&#x27;" u2="&#x434;" k="143" />
-<hkern u1="&#x27;" u2="&#x430;" k="41" />
-<hkern u1="&#x27;" u2="&#x41b;" k="123" />
-<hkern u1="&#x27;" u2="&#x414;" k="123" />
-<hkern u1="&#x27;" u2="&#x410;" k="143" />
-<hkern u1="&#x27;" u2="&#x409;" k="123" />
-<hkern u1="&#x27;" u2="&#x3cc;" k="82" />
-<hkern u1="&#x27;" u2="&#x3c6;" k="82" />
-<hkern u1="&#x27;" u2="&#x3c3;" k="82" />
-<hkern u1="&#x27;" u2="&#x3c2;" k="82" />
-<hkern u1="&#x27;" u2="&#x3c1;" k="61" />
-<hkern u1="&#x27;" u2="&#x3bf;" k="82" />
-<hkern u1="&#x27;" u2="&#x3bc;" k="41" />
-<hkern u1="&#x27;" u2="&#x3ba;" k="41" />
-<hkern u1="&#x27;" u2="&#x3b7;" k="41" />
-<hkern u1="&#x27;" u2="&#x3b6;" k="41" />
-<hkern u1="&#x27;" u2="&#x3b5;" k="41" />
-<hkern u1="&#x27;" u2="&#x3b4;" k="61" />
-<hkern u1="&#x27;" u2="&#x3b1;" k="82" />
-<hkern u1="&#x27;" u2="&#x3ae;" k="41" />
-<hkern u1="&#x27;" u2="&#x3ad;" k="41" />
-<hkern u1="&#x27;" u2="&#x3ac;" k="82" />
-<hkern u1="&#x27;" u2="&#x39b;" k="143" />
-<hkern u1="&#x27;" u2="&#x394;" k="143" />
-<hkern u1="&#x27;" u2="&#x391;" k="143" />
-<hkern u1="&#x27;" u2="&#x386;" k="143" />
-<hkern u1="&#x27;" u2="&#x21a;" k="-41" />
-<hkern u1="&#x27;" u2="&#x219;" k="61" />
-<hkern u1="&#x27;" u2="&#x1ff;" k="123" />
-<hkern u1="&#x27;" u2="&#x1fd;" k="82" />
-<hkern u1="&#x27;" u2="&#x1fb;" k="82" />
-<hkern u1="&#x27;" u2="&#x1fa;" k="143" />
-<hkern u1="&#x27;" u2="&#x1b0;" k="61" />
-<hkern u1="&#x27;" u2="&#x1a1;" k="123" />
-<hkern u1="&#x27;" u2="&#x178;" k="-20" />
-<hkern u1="&#x27;" u2="&#x176;" k="-20" />
-<hkern u1="&#x27;" u2="&#x174;" k="-41" />
-<hkern u1="&#x27;" u2="&#x173;" k="61" />
-<hkern u1="&#x27;" u2="&#x171;" k="61" />
-<hkern u1="&#x27;" u2="&#x16f;" k="61" />
-<hkern u1="&#x27;" u2="&#x16d;" k="61" />
-<hkern u1="&#x27;" u2="&#x16b;" k="61" />
-<hkern u1="&#x27;" u2="&#x169;" k="61" />
-<hkern u1="&#x27;" u2="&#x164;" k="-41" />
-<hkern u1="&#x27;" u2="&#x162;" k="-41" />
-<hkern u1="&#x27;" u2="&#x15f;" k="61" />
-<hkern u1="&#x27;" u2="&#x15b;" k="61" />
-<hkern u1="&#x27;" u2="&#x157;" k="61" />
-<hkern u1="&#x27;" u2="&#x155;" k="61" />
-<hkern u1="&#x27;" u2="&#x153;" k="123" />
-<hkern u1="&#x27;" u2="&#x151;" k="123" />
-<hkern u1="&#x27;" u2="&#x14f;" k="123" />
-<hkern u1="&#x27;" u2="&#x14d;" k="123" />
-<hkern u1="&#x27;" u2="&#x14b;" k="61" />
-<hkern u1="&#x27;" u2="&#x146;" k="61" />
-<hkern u1="&#x27;" u2="&#x144;" k="61" />
-<hkern u1="&#x27;" u2="&#x138;" k="61" />
-<hkern u1="&#x27;" u2="&#x123;" k="61" />
-<hkern u1="&#x27;" u2="&#x121;" k="61" />
-<hkern u1="&#x27;" u2="&#x11f;" k="61" />
-<hkern u1="&#x27;" u2="&#x11d;" k="61" />
-<hkern u1="&#x27;" u2="&#x11b;" k="123" />
-<hkern u1="&#x27;" u2="&#x119;" k="123" />
-<hkern u1="&#x27;" u2="&#x117;" k="123" />
-<hkern u1="&#x27;" u2="&#x115;" k="123" />
-<hkern u1="&#x27;" u2="&#x113;" k="123" />
-<hkern u1="&#x27;" u2="&#x111;" k="123" />
-<hkern u1="&#x27;" u2="&#x10f;" k="123" />
-<hkern u1="&#x27;" u2="&#x10d;" k="123" />
-<hkern u1="&#x27;" u2="&#x10b;" k="123" />
-<hkern u1="&#x27;" u2="&#x109;" k="123" />
-<hkern u1="&#x27;" u2="&#x107;" k="123" />
-<hkern u1="&#x27;" u2="&#x105;" k="82" />
-<hkern u1="&#x27;" u2="&#x104;" k="143" />
-<hkern u1="&#x27;" u2="&#x103;" k="82" />
-<hkern u1="&#x27;" u2="&#x102;" k="143" />
-<hkern u1="&#x27;" u2="&#x101;" k="82" />
-<hkern u1="&#x27;" u2="&#x100;" k="143" />
-<hkern u1="&#x27;" u2="&#xfc;" k="61" />
-<hkern u1="&#x27;" u2="&#xfb;" k="61" />
-<hkern u1="&#x27;" u2="&#xfa;" k="61" />
-<hkern u1="&#x27;" u2="&#xf9;" k="61" />
-<hkern u1="&#x27;" u2="&#xf8;" k="123" />
-<hkern u1="&#x27;" u2="&#xf6;" k="123" />
-<hkern u1="&#x27;" u2="&#xf5;" k="123" />
-<hkern u1="&#x27;" u2="&#xf4;" k="123" />
-<hkern u1="&#x27;" u2="&#xf3;" k="123" />
-<hkern u1="&#x27;" u2="&#xf2;" k="123" />
-<hkern u1="&#x27;" u2="&#xeb;" k="123" />
-<hkern u1="&#x27;" u2="&#xea;" k="123" />
-<hkern u1="&#x27;" u2="&#xe9;" k="123" />
-<hkern u1="&#x27;" u2="&#xe8;" k="123" />
-<hkern u1="&#x27;" u2="&#xe7;" k="123" />
-<hkern u1="&#x27;" u2="&#xe6;" k="82" />
-<hkern u1="&#x27;" u2="&#xe5;" k="82" />
-<hkern u1="&#x27;" u2="&#xe4;" k="82" />
-<hkern u1="&#x27;" u2="&#xe3;" k="82" />
-<hkern u1="&#x27;" u2="&#xe2;" k="82" />
-<hkern u1="&#x27;" u2="&#xe1;" k="82" />
-<hkern u1="&#x27;" u2="&#xe0;" k="123" />
-<hkern u1="&#x27;" u2="&#xdd;" k="-20" />
-<hkern u1="&#x27;" u2="&#xc5;" k="143" />
-<hkern u1="&#x27;" u2="&#xc4;" k="143" />
-<hkern u1="&#x27;" u2="&#xc3;" k="143" />
-<hkern u1="&#x27;" u2="&#xc2;" k="143" />
-<hkern u1="&#x27;" u2="&#xc1;" k="143" />
-<hkern u1="&#x27;" u2="&#xc0;" k="143" />
-<hkern u1="&#x27;" u2="u" k="61" />
-<hkern u1="&#x27;" u2="s" k="61" />
-<hkern u1="&#x27;" u2="r" k="61" />
-<hkern u1="&#x27;" u2="q" k="123" />
-<hkern u1="&#x27;" u2="p" k="61" />
-<hkern u1="&#x27;" u2="o" k="123" />
-<hkern u1="&#x27;" u2="n" k="61" />
-<hkern u1="&#x27;" u2="m" k="61" />
-<hkern u1="&#x27;" u2="g" k="61" />
-<hkern u1="&#x27;" u2="e" k="123" />
-<hkern u1="&#x27;" u2="d" k="123" />
-<hkern u1="&#x27;" u2="c" k="123" />
-<hkern u1="&#x27;" u2="a" k="82" />
-<hkern u1="&#x27;" u2="Y" k="-20" />
-<hkern u1="&#x27;" u2="W" k="-41" />
-<hkern u1="&#x27;" u2="V" k="-41" />
-<hkern u1="&#x27;" u2="T" k="-41" />
-<hkern u1="&#x27;" u2="A" k="143" />
-<hkern u1="&#x28;" u2="J" k="-184" />
-<hkern u1="&#x2c;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x2c;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x2c;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x2c;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x2c;" u2="&#x1ef0;" k="41" />
-<hkern u1="&#x2c;" u2="&#x1eee;" k="41" />
-<hkern u1="&#x2c;" u2="&#x1eec;" k="41" />
-<hkern u1="&#x2c;" u2="&#x1eea;" k="41" />
-<hkern u1="&#x2c;" u2="&#x1ee8;" k="41" />
-<hkern u1="&#x2c;" u2="&#x1ee6;" k="41" />
-<hkern u1="&#x2c;" u2="&#x1ee4;" k="41" />
-<hkern u1="&#x2c;" u2="&#x1ee2;" k="102" />
-<hkern u1="&#x2c;" u2="&#x1ee0;" k="102" />
-<hkern u1="&#x2c;" u2="&#x1ede;" k="102" />
-<hkern u1="&#x2c;" u2="&#x1edc;" k="102" />
-<hkern u1="&#x2c;" u2="&#x1eda;" k="102" />
-<hkern u1="&#x2c;" u2="&#x1ed8;" k="102" />
-<hkern u1="&#x2c;" u2="&#x1ed6;" k="102" />
-<hkern u1="&#x2c;" u2="&#x1ed4;" k="102" />
-<hkern u1="&#x2c;" u2="&#x1ed2;" k="102" />
-<hkern u1="&#x2c;" u2="&#x1ed0;" k="102" />
-<hkern u1="&#x2c;" u2="&#x1ece;" k="102" />
-<hkern u1="&#x2c;" u2="&#x1ecc;" k="102" />
-<hkern u1="&#x2c;" u2="&#x1e84;" k="123" />
-<hkern u1="&#x2c;" u2="&#x1e82;" k="123" />
-<hkern u1="&#x2c;" u2="&#x1e80;" k="123" />
-<hkern u1="&#x2c;" u2="&#x50f;" k="102" />
-<hkern u1="&#x2c;" u2="&#x50e;" k="143" />
-<hkern u1="&#x2c;" u2="&#x50c;" k="102" />
-<hkern u1="&#x2c;" u2="&#x507;" k="102" />
-<hkern u1="&#x2c;" u2="&#x506;" k="123" />
-<hkern u1="&#x2c;" u2="&#x505;" k="102" />
-<hkern u1="&#x2c;" u2="&#x504;" k="123" />
-<hkern u1="&#x2c;" u2="&#x4f5;" k="123" />
-<hkern u1="&#x2c;" u2="&#x4f4;" k="164" />
-<hkern u1="&#x2c;" u2="&#x4ea;" k="102" />
-<hkern u1="&#x2c;" u2="&#x4e8;" k="102" />
-<hkern u1="&#x2c;" u2="&#x4e6;" k="102" />
-<hkern u1="&#x2c;" u2="&#x4cc;" k="123" />
-<hkern u1="&#x2c;" u2="&#x4cb;" k="164" />
-<hkern u1="&#x2c;" u2="&#x4be;" k="123" />
-<hkern u1="&#x2c;" u2="&#x4bc;" k="123" />
-<hkern u1="&#x2c;" u2="&#x4b9;" k="123" />
-<hkern u1="&#x2c;" u2="&#x4b8;" k="164" />
-<hkern u1="&#x2c;" u2="&#x4b7;" k="123" />
-<hkern u1="&#x2c;" u2="&#x4b6;" k="164" />
-<hkern u1="&#x2c;" u2="&#x4b5;" k="102" />
-<hkern u1="&#x2c;" u2="&#x4b4;" k="143" />
-<hkern u1="&#x2c;" u2="&#x4b0;" k="123" />
-<hkern u1="&#x2c;" u2="&#x4ae;" k="123" />
-<hkern u1="&#x2c;" u2="&#x4ad;" k="102" />
-<hkern u1="&#x2c;" u2="&#x4ac;" k="143" />
-<hkern u1="&#x2c;" u2="&#x4aa;" k="102" />
-<hkern u1="&#x2c;" u2="&#x4a8;" k="102" />
-<hkern u1="&#x2c;" u2="&#x4a1;" k="102" />
-<hkern u1="&#x2c;" u2="&#x4a0;" k="143" />
-<hkern u1="&#x2c;" u2="&#x480;" k="102" />
-<hkern u1="&#x2c;" u2="&#x47e;" k="102" />
-<hkern u1="&#x2c;" u2="&#x47c;" k="102" />
-<hkern u1="&#x2c;" u2="&#x47a;" k="102" />
-<hkern u1="&#x2c;" u2="&#x478;" k="102" />
-<hkern u1="&#x2c;" u2="&#x476;" k="123" />
-<hkern u1="&#x2c;" u2="&#x474;" k="123" />
-<hkern u1="&#x2c;" u2="&#x472;" k="102" />
-<hkern u1="&#x2c;" u2="&#x470;" k="164" />
-<hkern u1="&#x2c;" u2="&#x460;" k="102" />
-<hkern u1="&#x2c;" u2="&#x44a;" k="102" />
-<hkern u1="&#x2c;" u2="&#x447;" k="123" />
-<hkern u1="&#x2c;" u2="&#x442;" k="102" />
-<hkern u1="&#x2c;" u2="&#x42a;" k="143" />
-<hkern u1="&#x2c;" u2="&#x427;" k="164" />
-<hkern u1="&#x2c;" u2="&#x424;" k="82" />
-<hkern u1="&#x2c;" u2="&#x422;" k="143" />
-<hkern u1="&#x2c;" u2="&#x421;" k="102" />
-<hkern u1="&#x2c;" u2="&#x41e;" k="102" />
-<hkern u1="&#x2c;" u2="&#x40b;" k="143" />
-<hkern u1="&#x2c;" u2="&#x404;" k="102" />
-<hkern u1="&#x2c;" u2="&#x402;" k="143" />
-<hkern u1="&#x2c;" u2="&#x3d2;" k="123" />
-<hkern u1="&#x2c;" u2="&#x3b8;" k="41" />
-<hkern u1="&#x2c;" u2="&#x3ab;" k="123" />
-<hkern u1="&#x2c;" u2="&#x3a8;" k="123" />
-<hkern u1="&#x2c;" u2="&#x3a6;" k="102" />
-<hkern u1="&#x2c;" u2="&#x3a5;" k="123" />
-<hkern u1="&#x2c;" u2="&#x3a4;" k="143" />
-<hkern u1="&#x2c;" u2="&#x39f;" k="82" />
-<hkern u1="&#x2c;" u2="&#x398;" k="82" />
-<hkern u1="&#x2c;" u2="&#x21a;" k="143" />
-<hkern u1="&#x2c;" u2="&#x1fe;" k="102" />
-<hkern u1="&#x2c;" u2="&#x1af;" k="41" />
-<hkern u1="&#x2c;" u2="&#x1a0;" k="102" />
-<hkern u1="&#x2c;" u2="&#x178;" k="123" />
-<hkern u1="&#x2c;" u2="&#x176;" k="123" />
-<hkern u1="&#x2c;" u2="&#x174;" k="123" />
-<hkern u1="&#x2c;" u2="&#x172;" k="41" />
-<hkern u1="&#x2c;" u2="&#x170;" k="41" />
-<hkern u1="&#x2c;" u2="&#x16e;" k="41" />
-<hkern u1="&#x2c;" u2="&#x16c;" k="41" />
-<hkern u1="&#x2c;" u2="&#x16a;" k="41" />
-<hkern u1="&#x2c;" u2="&#x168;" k="41" />
-<hkern u1="&#x2c;" u2="&#x164;" k="143" />
-<hkern u1="&#x2c;" u2="&#x162;" k="143" />
-<hkern u1="&#x2c;" u2="&#x152;" k="102" />
-<hkern u1="&#x2c;" u2="&#x150;" k="102" />
-<hkern u1="&#x2c;" u2="&#x14e;" k="102" />
-<hkern u1="&#x2c;" u2="&#x14c;" k="102" />
-<hkern u1="&#x2c;" u2="&#x122;" k="102" />
-<hkern u1="&#x2c;" u2="&#x120;" k="102" />
-<hkern u1="&#x2c;" u2="&#x11e;" k="102" />
-<hkern u1="&#x2c;" u2="&#x11c;" k="102" />
-<hkern u1="&#x2c;" u2="&#x10c;" k="102" />
-<hkern u1="&#x2c;" u2="&#x10a;" k="102" />
-<hkern u1="&#x2c;" u2="&#x108;" k="102" />
-<hkern u1="&#x2c;" u2="&#x106;" k="102" />
-<hkern u1="&#x2c;" u2="&#xdd;" k="123" />
-<hkern u1="&#x2c;" u2="&#xdc;" k="41" />
-<hkern u1="&#x2c;" u2="&#xdb;" k="41" />
-<hkern u1="&#x2c;" u2="&#xda;" k="41" />
-<hkern u1="&#x2c;" u2="&#xd9;" k="41" />
-<hkern u1="&#x2c;" u2="&#xd8;" k="102" />
-<hkern u1="&#x2c;" u2="&#xd6;" k="102" />
-<hkern u1="&#x2c;" u2="&#xd5;" k="102" />
-<hkern u1="&#x2c;" u2="&#xd4;" k="102" />
-<hkern u1="&#x2c;" u2="&#xd3;" k="102" />
-<hkern u1="&#x2c;" u2="&#xd2;" k="102" />
-<hkern u1="&#x2c;" u2="&#xc7;" k="102" />
-<hkern u1="&#x2c;" u2="Y" k="123" />
-<hkern u1="&#x2c;" u2="W" k="123" />
-<hkern u1="&#x2c;" u2="V" k="123" />
-<hkern u1="&#x2c;" u2="U" k="41" />
-<hkern u1="&#x2c;" u2="T" k="143" />
-<hkern u1="&#x2c;" u2="Q" k="102" />
-<hkern u1="&#x2c;" u2="O" k="102" />
-<hkern u1="&#x2c;" u2="G" k="102" />
-<hkern u1="&#x2c;" u2="C" k="102" />
-<hkern u1="&#x2d;" u2="&#x50f;" k="41" />
-<hkern u1="&#x2d;" u2="&#x50e;" k="82" />
-<hkern u1="&#x2d;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x2d;" u2="&#x4b4;" k="82" />
-<hkern u1="&#x2d;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x2d;" u2="&#x4ac;" k="82" />
-<hkern u1="&#x2d;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x2d;" u2="&#x4a0;" k="82" />
-<hkern u1="&#x2d;" u2="&#x44a;" k="41" />
-<hkern u1="&#x2d;" u2="&#x442;" k="41" />
-<hkern u1="&#x2d;" u2="&#x42a;" k="82" />
-<hkern u1="&#x2d;" u2="&#x422;" k="82" />
-<hkern u1="&#x2d;" u2="&#x40b;" k="82" />
-<hkern u1="&#x2d;" u2="&#x402;" k="82" />
-<hkern u1="&#x2d;" u2="&#x3a4;" k="82" />
-<hkern u1="&#x2d;" u2="&#x21a;" k="82" />
-<hkern u1="&#x2d;" u2="&#x164;" k="82" />
-<hkern u1="&#x2d;" u2="&#x162;" k="82" />
-<hkern u1="&#x2d;" u2="T" k="82" />
-<hkern u1="&#x2e;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x2e;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x2e;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x2e;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x2e;" u2="&#x1ef0;" k="41" />
-<hkern u1="&#x2e;" u2="&#x1eee;" k="41" />
-<hkern u1="&#x2e;" u2="&#x1eec;" k="41" />
-<hkern u1="&#x2e;" u2="&#x1eea;" k="41" />
-<hkern u1="&#x2e;" u2="&#x1ee8;" k="41" />
-<hkern u1="&#x2e;" u2="&#x1ee6;" k="41" />
-<hkern u1="&#x2e;" u2="&#x1ee4;" k="41" />
-<hkern u1="&#x2e;" u2="&#x1ee2;" k="102" />
-<hkern u1="&#x2e;" u2="&#x1ee0;" k="102" />
-<hkern u1="&#x2e;" u2="&#x1ede;" k="102" />
-<hkern u1="&#x2e;" u2="&#x1edc;" k="102" />
-<hkern u1="&#x2e;" u2="&#x1eda;" k="102" />
-<hkern u1="&#x2e;" u2="&#x1ed8;" k="102" />
-<hkern u1="&#x2e;" u2="&#x1ed6;" k="102" />
-<hkern u1="&#x2e;" u2="&#x1ed4;" k="102" />
-<hkern u1="&#x2e;" u2="&#x1ed2;" k="102" />
-<hkern u1="&#x2e;" u2="&#x1ed0;" k="102" />
-<hkern u1="&#x2e;" u2="&#x1ece;" k="102" />
-<hkern u1="&#x2e;" u2="&#x1ecc;" k="102" />
-<hkern u1="&#x2e;" u2="&#x1e84;" k="123" />
-<hkern u1="&#x2e;" u2="&#x1e82;" k="123" />
-<hkern u1="&#x2e;" u2="&#x1e80;" k="123" />
-<hkern u1="&#x2e;" u2="&#x50f;" k="102" />
-<hkern u1="&#x2e;" u2="&#x50e;" k="143" />
-<hkern u1="&#x2e;" u2="&#x50c;" k="102" />
-<hkern u1="&#x2e;" u2="&#x507;" k="102" />
-<hkern u1="&#x2e;" u2="&#x506;" k="123" />
-<hkern u1="&#x2e;" u2="&#x505;" k="102" />
-<hkern u1="&#x2e;" u2="&#x504;" k="123" />
-<hkern u1="&#x2e;" u2="&#x4f5;" k="123" />
-<hkern u1="&#x2e;" u2="&#x4f4;" k="164" />
-<hkern u1="&#x2e;" u2="&#x4ea;" k="102" />
-<hkern u1="&#x2e;" u2="&#x4e8;" k="102" />
-<hkern u1="&#x2e;" u2="&#x4e6;" k="102" />
-<hkern u1="&#x2e;" u2="&#x4cc;" k="123" />
-<hkern u1="&#x2e;" u2="&#x4cb;" k="164" />
-<hkern u1="&#x2e;" u2="&#x4be;" k="123" />
-<hkern u1="&#x2e;" u2="&#x4bc;" k="123" />
-<hkern u1="&#x2e;" u2="&#x4b9;" k="123" />
-<hkern u1="&#x2e;" u2="&#x4b8;" k="164" />
-<hkern u1="&#x2e;" u2="&#x4b7;" k="123" />
-<hkern u1="&#x2e;" u2="&#x4b6;" k="164" />
-<hkern u1="&#x2e;" u2="&#x4b5;" k="102" />
-<hkern u1="&#x2e;" u2="&#x4b4;" k="143" />
-<hkern u1="&#x2e;" u2="&#x4b0;" k="123" />
-<hkern u1="&#x2e;" u2="&#x4ae;" k="123" />
-<hkern u1="&#x2e;" u2="&#x4ad;" k="102" />
-<hkern u1="&#x2e;" u2="&#x4ac;" k="143" />
-<hkern u1="&#x2e;" u2="&#x4aa;" k="102" />
-<hkern u1="&#x2e;" u2="&#x4a8;" k="102" />
-<hkern u1="&#x2e;" u2="&#x4a1;" k="102" />
-<hkern u1="&#x2e;" u2="&#x4a0;" k="143" />
-<hkern u1="&#x2e;" u2="&#x480;" k="102" />
-<hkern u1="&#x2e;" u2="&#x47e;" k="102" />
-<hkern u1="&#x2e;" u2="&#x47c;" k="102" />
-<hkern u1="&#x2e;" u2="&#x47a;" k="102" />
-<hkern u1="&#x2e;" u2="&#x478;" k="102" />
-<hkern u1="&#x2e;" u2="&#x476;" k="123" />
-<hkern u1="&#x2e;" u2="&#x474;" k="123" />
-<hkern u1="&#x2e;" u2="&#x472;" k="102" />
-<hkern u1="&#x2e;" u2="&#x470;" k="164" />
-<hkern u1="&#x2e;" u2="&#x460;" k="102" />
-<hkern u1="&#x2e;" u2="&#x44a;" k="102" />
-<hkern u1="&#x2e;" u2="&#x447;" k="123" />
-<hkern u1="&#x2e;" u2="&#x442;" k="102" />
-<hkern u1="&#x2e;" u2="&#x42a;" k="143" />
-<hkern u1="&#x2e;" u2="&#x427;" k="164" />
-<hkern u1="&#x2e;" u2="&#x424;" k="82" />
-<hkern u1="&#x2e;" u2="&#x422;" k="143" />
-<hkern u1="&#x2e;" u2="&#x421;" k="102" />
-<hkern u1="&#x2e;" u2="&#x41e;" k="102" />
-<hkern u1="&#x2e;" u2="&#x40b;" k="143" />
-<hkern u1="&#x2e;" u2="&#x404;" k="102" />
-<hkern u1="&#x2e;" u2="&#x402;" k="143" />
-<hkern u1="&#x2e;" u2="&#x3d2;" k="123" />
-<hkern u1="&#x2e;" u2="&#x3b8;" k="41" />
-<hkern u1="&#x2e;" u2="&#x3ab;" k="123" />
-<hkern u1="&#x2e;" u2="&#x3a8;" k="123" />
-<hkern u1="&#x2e;" u2="&#x3a6;" k="102" />
-<hkern u1="&#x2e;" u2="&#x3a5;" k="123" />
-<hkern u1="&#x2e;" u2="&#x3a4;" k="143" />
-<hkern u1="&#x2e;" u2="&#x39f;" k="82" />
-<hkern u1="&#x2e;" u2="&#x398;" k="82" />
-<hkern u1="&#x2e;" u2="&#x21a;" k="143" />
-<hkern u1="&#x2e;" u2="&#x1fe;" k="102" />
-<hkern u1="&#x2e;" u2="&#x1af;" k="41" />
-<hkern u1="&#x2e;" u2="&#x1a0;" k="102" />
-<hkern u1="&#x2e;" u2="&#x178;" k="123" />
-<hkern u1="&#x2e;" u2="&#x176;" k="123" />
-<hkern u1="&#x2e;" u2="&#x174;" k="123" />
-<hkern u1="&#x2e;" u2="&#x172;" k="41" />
-<hkern u1="&#x2e;" u2="&#x170;" k="41" />
-<hkern u1="&#x2e;" u2="&#x16e;" k="41" />
-<hkern u1="&#x2e;" u2="&#x16c;" k="41" />
-<hkern u1="&#x2e;" u2="&#x16a;" k="41" />
-<hkern u1="&#x2e;" u2="&#x168;" k="41" />
-<hkern u1="&#x2e;" u2="&#x164;" k="143" />
-<hkern u1="&#x2e;" u2="&#x162;" k="143" />
-<hkern u1="&#x2e;" u2="&#x152;" k="102" />
-<hkern u1="&#x2e;" u2="&#x150;" k="102" />
-<hkern u1="&#x2e;" u2="&#x14e;" k="102" />
-<hkern u1="&#x2e;" u2="&#x14c;" k="102" />
-<hkern u1="&#x2e;" u2="&#x122;" k="102" />
-<hkern u1="&#x2e;" u2="&#x120;" k="102" />
-<hkern u1="&#x2e;" u2="&#x11e;" k="102" />
-<hkern u1="&#x2e;" u2="&#x11c;" k="102" />
-<hkern u1="&#x2e;" u2="&#x10c;" k="102" />
-<hkern u1="&#x2e;" u2="&#x10a;" k="102" />
-<hkern u1="&#x2e;" u2="&#x108;" k="102" />
-<hkern u1="&#x2e;" u2="&#x106;" k="102" />
-<hkern u1="&#x2e;" u2="&#xdd;" k="123" />
-<hkern u1="&#x2e;" u2="&#xdc;" k="41" />
-<hkern u1="&#x2e;" u2="&#xdb;" k="41" />
-<hkern u1="&#x2e;" u2="&#xda;" k="41" />
-<hkern u1="&#x2e;" u2="&#xd9;" k="41" />
-<hkern u1="&#x2e;" u2="&#xd8;" k="102" />
-<hkern u1="&#x2e;" u2="&#xd6;" k="102" />
-<hkern u1="&#x2e;" u2="&#xd5;" k="102" />
-<hkern u1="&#x2e;" u2="&#xd4;" k="102" />
-<hkern u1="&#x2e;" u2="&#xd3;" k="102" />
-<hkern u1="&#x2e;" u2="&#xd2;" k="102" />
-<hkern u1="&#x2e;" u2="&#xc7;" k="102" />
-<hkern u1="&#x2e;" u2="Y" k="123" />
-<hkern u1="&#x2e;" u2="W" k="123" />
-<hkern u1="&#x2e;" u2="V" k="123" />
-<hkern u1="&#x2e;" u2="U" k="41" />
-<hkern u1="&#x2e;" u2="T" k="143" />
-<hkern u1="&#x2e;" u2="Q" k="102" />
-<hkern u1="&#x2e;" u2="O" k="102" />
-<hkern u1="&#x2e;" u2="G" k="102" />
-<hkern u1="&#x2e;" u2="C" k="102" />
-<hkern u1="A" u2="&#x201d;" k="143" />
-<hkern u1="A" u2="&#x2019;" k="143" />
-<hkern u1="A" u2="&#x1ef8;" k="123" />
-<hkern u1="A" u2="&#x1ef6;" k="123" />
-<hkern u1="A" u2="&#x1ef4;" k="123" />
-<hkern u1="A" u2="&#x1ef2;" k="123" />
-<hkern u1="A" u2="&#x1ee2;" k="41" />
-<hkern u1="A" u2="&#x1ee0;" k="41" />
-<hkern u1="A" u2="&#x1ede;" k="41" />
-<hkern u1="A" u2="&#x1edc;" k="41" />
-<hkern u1="A" u2="&#x1eda;" k="41" />
-<hkern u1="A" u2="&#x1ed8;" k="41" />
-<hkern u1="A" u2="&#x1ed6;" k="41" />
-<hkern u1="A" u2="&#x1ed4;" k="41" />
-<hkern u1="A" u2="&#x1ed2;" k="41" />
-<hkern u1="A" u2="&#x1ed0;" k="41" />
-<hkern u1="A" u2="&#x1ece;" k="41" />
-<hkern u1="A" u2="&#x1ecc;" k="41" />
-<hkern u1="A" u2="&#x1e84;" k="82" />
-<hkern u1="A" u2="&#x1e82;" k="82" />
-<hkern u1="A" u2="&#x1e80;" k="82" />
-<hkern u1="A" u2="&#x21a;" k="143" />
-<hkern u1="A" u2="&#x1fe;" k="41" />
-<hkern u1="A" u2="&#x1a0;" k="41" />
-<hkern u1="A" u2="&#x178;" k="123" />
-<hkern u1="A" u2="&#x176;" k="123" />
-<hkern u1="A" u2="&#x174;" k="82" />
-<hkern u1="A" u2="&#x164;" k="143" />
-<hkern u1="A" u2="&#x162;" k="143" />
-<hkern u1="A" u2="&#x152;" k="41" />
-<hkern u1="A" u2="&#x150;" k="41" />
-<hkern u1="A" u2="&#x14e;" k="41" />
-<hkern u1="A" u2="&#x14c;" k="41" />
-<hkern u1="A" u2="&#x122;" k="41" />
-<hkern u1="A" u2="&#x120;" k="41" />
-<hkern u1="A" u2="&#x11e;" k="41" />
-<hkern u1="A" u2="&#x11c;" k="41" />
-<hkern u1="A" u2="&#x10c;" k="41" />
-<hkern u1="A" u2="&#x10a;" k="41" />
-<hkern u1="A" u2="&#x108;" k="41" />
-<hkern u1="A" u2="&#x106;" k="41" />
-<hkern u1="A" u2="&#xdd;" k="123" />
-<hkern u1="A" u2="&#xd8;" k="41" />
-<hkern u1="A" u2="&#xd6;" k="41" />
-<hkern u1="A" u2="&#xd5;" k="41" />
-<hkern u1="A" u2="&#xd4;" k="41" />
-<hkern u1="A" u2="&#xd3;" k="41" />
-<hkern u1="A" u2="&#xd2;" k="41" />
-<hkern u1="A" u2="&#xc7;" k="41" />
-<hkern u1="A" u2="Y" k="123" />
-<hkern u1="A" u2="W" k="82" />
-<hkern u1="A" u2="V" k="82" />
-<hkern u1="A" u2="T" k="143" />
-<hkern u1="A" u2="Q" k="41" />
-<hkern u1="A" u2="O" k="41" />
-<hkern u1="A" u2="J" k="-266" />
-<hkern u1="A" u2="G" k="41" />
-<hkern u1="A" u2="C" k="41" />
-<hkern u1="A" u2="&#x27;" k="143" />
-<hkern u1="A" u2="&#x22;" k="143" />
-<hkern u1="B" u2="&#x201e;" k="82" />
-<hkern u1="B" u2="&#x201a;" k="82" />
-<hkern u1="B" u2="&#x1ef8;" k="20" />
-<hkern u1="B" u2="&#x1ef6;" k="20" />
-<hkern u1="B" u2="&#x1ef4;" k="20" />
-<hkern u1="B" u2="&#x1ef2;" k="20" />
-<hkern u1="B" u2="&#x1eb6;" k="41" />
-<hkern u1="B" u2="&#x1eb4;" k="41" />
-<hkern u1="B" u2="&#x1eb2;" k="41" />
-<hkern u1="B" u2="&#x1eb0;" k="41" />
-<hkern u1="B" u2="&#x1eae;" k="41" />
-<hkern u1="B" u2="&#x1eac;" k="41" />
-<hkern u1="B" u2="&#x1eaa;" k="41" />
-<hkern u1="B" u2="&#x1ea8;" k="41" />
-<hkern u1="B" u2="&#x1ea6;" k="41" />
-<hkern u1="B" u2="&#x1ea4;" k="41" />
-<hkern u1="B" u2="&#x1ea2;" k="41" />
-<hkern u1="B" u2="&#x1ea0;" k="41" />
-<hkern u1="B" u2="&#x1e84;" k="20" />
-<hkern u1="B" u2="&#x1e82;" k="20" />
-<hkern u1="B" u2="&#x1e80;" k="20" />
-<hkern u1="B" u2="&#x1e00;" k="41" />
-<hkern u1="B" u2="&#x405;" k="20" />
-<hkern u1="B" u2="&#x21a;" k="61" />
-<hkern u1="B" u2="&#x1fa;" k="41" />
-<hkern u1="B" u2="&#x17d;" k="20" />
-<hkern u1="B" u2="&#x17b;" k="20" />
-<hkern u1="B" u2="&#x179;" k="20" />
-<hkern u1="B" u2="&#x178;" k="20" />
-<hkern u1="B" u2="&#x176;" k="20" />
-<hkern u1="B" u2="&#x174;" k="20" />
-<hkern u1="B" u2="&#x164;" k="61" />
-<hkern u1="B" u2="&#x162;" k="61" />
-<hkern u1="B" u2="&#x104;" k="41" />
-<hkern u1="B" u2="&#x102;" k="41" />
-<hkern u1="B" u2="&#x100;" k="41" />
-<hkern u1="B" u2="&#xdd;" k="20" />
-<hkern u1="B" u2="&#xc5;" k="41" />
-<hkern u1="B" u2="&#xc4;" k="41" />
-<hkern u1="B" u2="&#xc3;" k="41" />
-<hkern u1="B" u2="&#xc2;" k="41" />
-<hkern u1="B" u2="&#xc1;" k="41" />
-<hkern u1="B" u2="&#xc0;" k="41" />
-<hkern u1="B" u2="Z" k="20" />
-<hkern u1="B" u2="Y" k="20" />
-<hkern u1="B" u2="X" k="41" />
-<hkern u1="B" u2="W" k="20" />
-<hkern u1="B" u2="V" k="20" />
-<hkern u1="B" u2="T" k="61" />
-<hkern u1="B" u2="A" k="41" />
-<hkern u1="B" u2="&#x2e;" k="82" />
-<hkern u1="B" u2="&#x2c;" k="82" />
-<hkern u1="C" u2="&#x1ee2;" k="41" />
-<hkern u1="C" u2="&#x1ee0;" k="41" />
-<hkern u1="C" u2="&#x1ede;" k="41" />
-<hkern u1="C" u2="&#x1edc;" k="41" />
-<hkern u1="C" u2="&#x1eda;" k="41" />
-<hkern u1="C" u2="&#x1ed8;" k="41" />
-<hkern u1="C" u2="&#x1ed6;" k="41" />
-<hkern u1="C" u2="&#x1ed4;" k="41" />
-<hkern u1="C" u2="&#x1ed2;" k="41" />
-<hkern u1="C" u2="&#x1ed0;" k="41" />
-<hkern u1="C" u2="&#x1ece;" k="41" />
-<hkern u1="C" u2="&#x1ecc;" k="41" />
-<hkern u1="C" u2="&#x1fe;" k="41" />
-<hkern u1="C" u2="&#x1a0;" k="41" />
-<hkern u1="C" u2="&#x152;" k="41" />
-<hkern u1="C" u2="&#x150;" k="41" />
-<hkern u1="C" u2="&#x14e;" k="41" />
-<hkern u1="C" u2="&#x14c;" k="41" />
-<hkern u1="C" u2="&#x122;" k="41" />
-<hkern u1="C" u2="&#x120;" k="41" />
-<hkern u1="C" u2="&#x11e;" k="41" />
-<hkern u1="C" u2="&#x11c;" k="41" />
-<hkern u1="C" u2="&#x10c;" k="41" />
-<hkern u1="C" u2="&#x10a;" k="41" />
-<hkern u1="C" u2="&#x108;" k="41" />
-<hkern u1="C" u2="&#x106;" k="41" />
-<hkern u1="C" u2="&#xd8;" k="41" />
-<hkern u1="C" u2="&#xd6;" k="41" />
-<hkern u1="C" u2="&#xd5;" k="41" />
-<hkern u1="C" u2="&#xd4;" k="41" />
-<hkern u1="C" u2="&#xd3;" k="41" />
-<hkern u1="C" u2="&#xd2;" k="41" />
-<hkern u1="C" u2="&#xc7;" k="41" />
-<hkern u1="C" u2="Q" k="41" />
-<hkern u1="C" u2="O" k="41" />
-<hkern u1="C" u2="G" k="41" />
-<hkern u1="C" u2="C" k="41" />
-<hkern u1="D" u2="&#x201e;" k="82" />
-<hkern u1="D" u2="&#x201a;" k="82" />
-<hkern u1="D" u2="&#x1ef8;" k="20" />
-<hkern u1="D" u2="&#x1ef6;" k="20" />
-<hkern u1="D" u2="&#x1ef4;" k="20" />
-<hkern u1="D" u2="&#x1ef2;" k="20" />
-<hkern u1="D" u2="&#x1eb6;" k="41" />
-<hkern u1="D" u2="&#x1eb4;" k="41" />
-<hkern u1="D" u2="&#x1eb2;" k="41" />
-<hkern u1="D" u2="&#x1eb0;" k="41" />
-<hkern u1="D" u2="&#x1eae;" k="41" />
-<hkern u1="D" u2="&#x1eac;" k="41" />
-<hkern u1="D" u2="&#x1eaa;" k="41" />
-<hkern u1="D" u2="&#x1ea8;" k="41" />
-<hkern u1="D" u2="&#x1ea6;" k="41" />
-<hkern u1="D" u2="&#x1ea4;" k="41" />
-<hkern u1="D" u2="&#x1ea2;" k="41" />
-<hkern u1="D" u2="&#x1ea0;" k="41" />
-<hkern u1="D" u2="&#x1e84;" k="20" />
-<hkern u1="D" u2="&#x1e82;" k="20" />
-<hkern u1="D" u2="&#x1e80;" k="20" />
-<hkern u1="D" u2="&#x1e00;" k="41" />
-<hkern u1="D" u2="&#x405;" k="20" />
-<hkern u1="D" u2="&#x21a;" k="61" />
-<hkern u1="D" u2="&#x1fa;" k="41" />
-<hkern u1="D" u2="&#x17d;" k="20" />
-<hkern u1="D" u2="&#x17b;" k="20" />
-<hkern u1="D" u2="&#x179;" k="20" />
-<hkern u1="D" u2="&#x178;" k="20" />
-<hkern u1="D" u2="&#x176;" k="20" />
-<hkern u1="D" u2="&#x174;" k="20" />
-<hkern u1="D" u2="&#x164;" k="61" />
-<hkern u1="D" u2="&#x162;" k="61" />
-<hkern u1="D" u2="&#x104;" k="41" />
-<hkern u1="D" u2="&#x102;" k="41" />
-<hkern u1="D" u2="&#x100;" k="41" />
-<hkern u1="D" u2="&#xdd;" k="20" />
-<hkern u1="D" u2="&#xc5;" k="41" />
-<hkern u1="D" u2="&#xc4;" k="41" />
-<hkern u1="D" u2="&#xc3;" k="41" />
-<hkern u1="D" u2="&#xc2;" k="41" />
-<hkern u1="D" u2="&#xc1;" k="41" />
-<hkern u1="D" u2="&#xc0;" k="41" />
-<hkern u1="D" u2="Z" k="20" />
-<hkern u1="D" u2="Y" k="20" />
-<hkern u1="D" u2="X" k="41" />
-<hkern u1="D" u2="W" k="20" />
-<hkern u1="D" u2="V" k="20" />
-<hkern u1="D" u2="T" k="61" />
-<hkern u1="D" u2="A" k="41" />
-<hkern u1="D" u2="&#x2e;" k="82" />
-<hkern u1="D" u2="&#x2c;" k="82" />
-<hkern u1="E" u2="J" k="-123" />
-<hkern u1="F" u2="&#x201e;" k="123" />
-<hkern u1="F" u2="&#x201a;" k="123" />
-<hkern u1="F" u2="&#x1eb6;" k="41" />
-<hkern u1="F" u2="&#x1eb4;" k="41" />
-<hkern u1="F" u2="&#x1eb2;" k="41" />
-<hkern u1="F" u2="&#x1eb0;" k="41" />
-<hkern u1="F" u2="&#x1eae;" k="41" />
-<hkern u1="F" u2="&#x1eac;" k="41" />
-<hkern u1="F" u2="&#x1eaa;" k="41" />
-<hkern u1="F" u2="&#x1ea8;" k="41" />
-<hkern u1="F" u2="&#x1ea6;" k="41" />
-<hkern u1="F" u2="&#x1ea4;" k="41" />
-<hkern u1="F" u2="&#x1ea2;" k="41" />
-<hkern u1="F" u2="&#x1ea0;" k="41" />
-<hkern u1="F" u2="&#x1e00;" k="41" />
-<hkern u1="F" u2="&#x1fa;" k="41" />
-<hkern u1="F" u2="&#x104;" k="41" />
-<hkern u1="F" u2="&#x102;" k="41" />
-<hkern u1="F" u2="&#x100;" k="41" />
-<hkern u1="F" u2="&#xc5;" k="41" />
-<hkern u1="F" u2="&#xc4;" k="41" />
-<hkern u1="F" u2="&#xc3;" k="41" />
-<hkern u1="F" u2="&#xc2;" k="41" />
-<hkern u1="F" u2="&#xc1;" k="41" />
-<hkern u1="F" u2="&#xc0;" k="41" />
-<hkern u1="F" u2="A" k="41" />
-<hkern u1="F" u2="&#x3f;" k="-41" />
-<hkern u1="F" u2="&#x2e;" k="123" />
-<hkern u1="F" u2="&#x2c;" k="123" />
-<hkern u1="K" u2="&#x1ee2;" k="41" />
-<hkern u1="K" u2="&#x1ee0;" k="41" />
-<hkern u1="K" u2="&#x1ede;" k="41" />
-<hkern u1="K" u2="&#x1edc;" k="41" />
-<hkern u1="K" u2="&#x1eda;" k="41" />
-<hkern u1="K" u2="&#x1ed8;" k="41" />
-<hkern u1="K" u2="&#x1ed6;" k="41" />
-<hkern u1="K" u2="&#x1ed4;" k="41" />
-<hkern u1="K" u2="&#x1ed2;" k="41" />
-<hkern u1="K" u2="&#x1ed0;" k="41" />
-<hkern u1="K" u2="&#x1ece;" k="41" />
-<hkern u1="K" u2="&#x1ecc;" k="41" />
-<hkern u1="K" u2="&#x1fe;" k="41" />
-<hkern u1="K" u2="&#x1a0;" k="41" />
-<hkern u1="K" u2="&#x152;" k="41" />
-<hkern u1="K" u2="&#x150;" k="41" />
-<hkern u1="K" u2="&#x14e;" k="41" />
-<hkern u1="K" u2="&#x14c;" k="41" />
-<hkern u1="K" u2="&#x122;" k="41" />
-<hkern u1="K" u2="&#x120;" k="41" />
-<hkern u1="K" u2="&#x11e;" k="41" />
-<hkern u1="K" u2="&#x11c;" k="41" />
-<hkern u1="K" u2="&#x10c;" k="41" />
-<hkern u1="K" u2="&#x10a;" k="41" />
-<hkern u1="K" u2="&#x108;" k="41" />
-<hkern u1="K" u2="&#x106;" k="41" />
-<hkern u1="K" u2="&#xd8;" k="41" />
-<hkern u1="K" u2="&#xd6;" k="41" />
-<hkern u1="K" u2="&#xd5;" k="41" />
-<hkern u1="K" u2="&#xd4;" k="41" />
-<hkern u1="K" u2="&#xd3;" k="41" />
-<hkern u1="K" u2="&#xd2;" k="41" />
-<hkern u1="K" u2="&#xc7;" k="41" />
-<hkern u1="K" u2="Q" k="41" />
-<hkern u1="K" u2="O" k="41" />
-<hkern u1="K" u2="G" k="41" />
-<hkern u1="K" u2="C" k="41" />
-<hkern u1="L" u2="&#x201d;" k="164" />
-<hkern u1="L" u2="&#x2019;" k="164" />
-<hkern u1="L" u2="&#x1ef8;" k="61" />
-<hkern u1="L" u2="&#x1ef6;" k="61" />
-<hkern u1="L" u2="&#x1ef4;" k="61" />
-<hkern u1="L" u2="&#x1ef2;" k="61" />
-<hkern u1="L" u2="&#x1ef0;" k="20" />
-<hkern u1="L" u2="&#x1eee;" k="20" />
-<hkern u1="L" u2="&#x1eec;" k="20" />
-<hkern u1="L" u2="&#x1eea;" k="20" />
-<hkern u1="L" u2="&#x1ee8;" k="20" />
-<hkern u1="L" u2="&#x1ee6;" k="20" />
-<hkern u1="L" u2="&#x1ee4;" k="20" />
-<hkern u1="L" u2="&#x1ee2;" k="41" />
-<hkern u1="L" u2="&#x1ee0;" k="41" />
-<hkern u1="L" u2="&#x1ede;" k="41" />
-<hkern u1="L" u2="&#x1edc;" k="41" />
-<hkern u1="L" u2="&#x1eda;" k="41" />
-<hkern u1="L" u2="&#x1ed8;" k="41" />
-<hkern u1="L" u2="&#x1ed6;" k="41" />
-<hkern u1="L" u2="&#x1ed4;" k="41" />
-<hkern u1="L" u2="&#x1ed2;" k="41" />
-<hkern u1="L" u2="&#x1ed0;" k="41" />
-<hkern u1="L" u2="&#x1ece;" k="41" />
-<hkern u1="L" u2="&#x1ecc;" k="41" />
-<hkern u1="L" u2="&#x1e84;" k="41" />
-<hkern u1="L" u2="&#x1e82;" k="41" />
-<hkern u1="L" u2="&#x1e80;" k="41" />
-<hkern u1="L" u2="&#x21a;" k="41" />
-<hkern u1="L" u2="&#x1fe;" k="41" />
-<hkern u1="L" u2="&#x1af;" k="20" />
-<hkern u1="L" u2="&#x1a0;" k="41" />
-<hkern u1="L" u2="&#x178;" k="61" />
-<hkern u1="L" u2="&#x176;" k="61" />
-<hkern u1="L" u2="&#x174;" k="41" />
-<hkern u1="L" u2="&#x172;" k="20" />
-<hkern u1="L" u2="&#x170;" k="20" />
-<hkern u1="L" u2="&#x16e;" k="20" />
-<hkern u1="L" u2="&#x16c;" k="20" />
-<hkern u1="L" u2="&#x16a;" k="20" />
-<hkern u1="L" u2="&#x168;" k="20" />
-<hkern u1="L" u2="&#x164;" k="41" />
-<hkern u1="L" u2="&#x162;" k="41" />
-<hkern u1="L" u2="&#x152;" k="41" />
-<hkern u1="L" u2="&#x150;" k="41" />
-<hkern u1="L" u2="&#x14e;" k="41" />
-<hkern u1="L" u2="&#x14c;" k="41" />
-<hkern u1="L" u2="&#x122;" k="41" />
-<hkern u1="L" u2="&#x120;" k="41" />
-<hkern u1="L" u2="&#x11e;" k="41" />
-<hkern u1="L" u2="&#x11c;" k="41" />
-<hkern u1="L" u2="&#x10c;" k="41" />
-<hkern u1="L" u2="&#x10a;" k="41" />
-<hkern u1="L" u2="&#x108;" k="41" />
-<hkern u1="L" u2="&#x106;" k="41" />
-<hkern u1="L" u2="&#xdd;" k="61" />
-<hkern u1="L" u2="&#xdc;" k="20" />
-<hkern u1="L" u2="&#xdb;" k="20" />
-<hkern u1="L" u2="&#xda;" k="20" />
-<hkern u1="L" u2="&#xd9;" k="20" />
-<hkern u1="L" u2="&#xd8;" k="41" />
-<hkern u1="L" u2="&#xd6;" k="41" />
-<hkern u1="L" u2="&#xd5;" k="41" />
-<hkern u1="L" u2="&#xd4;" k="41" />
-<hkern u1="L" u2="&#xd3;" k="41" />
-<hkern u1="L" u2="&#xd2;" k="41" />
-<hkern u1="L" u2="&#xc7;" k="41" />
-<hkern u1="L" u2="Y" k="61" />
-<hkern u1="L" u2="W" k="41" />
-<hkern u1="L" u2="V" k="41" />
-<hkern u1="L" u2="U" k="20" />
-<hkern u1="L" u2="T" k="41" />
-<hkern u1="L" u2="Q" k="41" />
-<hkern u1="L" u2="O" k="41" />
-<hkern u1="L" u2="G" k="41" />
-<hkern u1="L" u2="C" k="41" />
-<hkern u1="L" u2="&#x27;" k="164" />
-<hkern u1="L" u2="&#x22;" k="164" />
-<hkern u1="O" u2="&#x201e;" k="82" />
-<hkern u1="O" u2="&#x201a;" k="82" />
-<hkern u1="O" u2="&#x1ef8;" k="20" />
-<hkern u1="O" u2="&#x1ef6;" k="20" />
-<hkern u1="O" u2="&#x1ef4;" k="20" />
-<hkern u1="O" u2="&#x1ef2;" k="20" />
-<hkern u1="O" u2="&#x1eb6;" k="41" />
-<hkern u1="O" u2="&#x1eb4;" k="41" />
-<hkern u1="O" u2="&#x1eb2;" k="41" />
-<hkern u1="O" u2="&#x1eb0;" k="41" />
-<hkern u1="O" u2="&#x1eae;" k="41" />
-<hkern u1="O" u2="&#x1eac;" k="41" />
-<hkern u1="O" u2="&#x1eaa;" k="41" />
-<hkern u1="O" u2="&#x1ea8;" k="41" />
-<hkern u1="O" u2="&#x1ea6;" k="41" />
-<hkern u1="O" u2="&#x1ea4;" k="41" />
-<hkern u1="O" u2="&#x1ea2;" k="41" />
-<hkern u1="O" u2="&#x1ea0;" k="41" />
-<hkern u1="O" u2="&#x1e84;" k="20" />
-<hkern u1="O" u2="&#x1e82;" k="20" />
-<hkern u1="O" u2="&#x1e80;" k="20" />
-<hkern u1="O" u2="&#x1e00;" k="41" />
-<hkern u1="O" u2="&#x405;" k="20" />
-<hkern u1="O" u2="&#x21a;" k="61" />
-<hkern u1="O" u2="&#x1fa;" k="41" />
-<hkern u1="O" u2="&#x17d;" k="20" />
-<hkern u1="O" u2="&#x17b;" k="20" />
-<hkern u1="O" u2="&#x179;" k="20" />
-<hkern u1="O" u2="&#x178;" k="20" />
-<hkern u1="O" u2="&#x176;" k="20" />
-<hkern u1="O" u2="&#x174;" k="20" />
-<hkern u1="O" u2="&#x164;" k="61" />
-<hkern u1="O" u2="&#x162;" k="61" />
-<hkern u1="O" u2="&#x104;" k="41" />
-<hkern u1="O" u2="&#x102;" k="41" />
-<hkern u1="O" u2="&#x100;" k="41" />
-<hkern u1="O" u2="&#xdd;" k="20" />
-<hkern u1="O" u2="&#xc5;" k="41" />
-<hkern u1="O" u2="&#xc4;" k="41" />
-<hkern u1="O" u2="&#xc3;" k="41" />
-<hkern u1="O" u2="&#xc2;" k="41" />
-<hkern u1="O" u2="&#xc1;" k="41" />
-<hkern u1="O" u2="&#xc0;" k="41" />
-<hkern u1="O" u2="Z" k="20" />
-<hkern u1="O" u2="Y" k="20" />
-<hkern u1="O" u2="X" k="41" />
-<hkern u1="O" u2="W" k="20" />
-<hkern u1="O" u2="V" k="20" />
-<hkern u1="O" u2="T" k="61" />
-<hkern u1="O" u2="A" k="41" />
-<hkern u1="O" u2="&#x2e;" k="82" />
-<hkern u1="O" u2="&#x2c;" k="82" />
-<hkern u1="P" u2="&#x201e;" k="266" />
-<hkern u1="P" u2="&#x201a;" k="266" />
-<hkern u1="P" u2="&#x1eb6;" k="102" />
-<hkern u1="P" u2="&#x1eb4;" k="102" />
-<hkern u1="P" u2="&#x1eb2;" k="102" />
-<hkern u1="P" u2="&#x1eb0;" k="102" />
-<hkern u1="P" u2="&#x1eae;" k="102" />
-<hkern u1="P" u2="&#x1eac;" k="102" />
-<hkern u1="P" u2="&#x1eaa;" k="102" />
-<hkern u1="P" u2="&#x1ea8;" k="102" />
-<hkern u1="P" u2="&#x1ea6;" k="102" />
-<hkern u1="P" u2="&#x1ea4;" k="102" />
-<hkern u1="P" u2="&#x1ea2;" k="102" />
-<hkern u1="P" u2="&#x1ea0;" k="102" />
-<hkern u1="P" u2="&#x1e00;" k="102" />
-<hkern u1="P" u2="&#x1fa;" k="102" />
-<hkern u1="P" u2="&#x17d;" k="20" />
-<hkern u1="P" u2="&#x17b;" k="20" />
-<hkern u1="P" u2="&#x179;" k="20" />
-<hkern u1="P" u2="&#x104;" k="102" />
-<hkern u1="P" u2="&#x102;" k="102" />
-<hkern u1="P" u2="&#x100;" k="102" />
-<hkern u1="P" u2="&#xc5;" k="102" />
-<hkern u1="P" u2="&#xc4;" k="102" />
-<hkern u1="P" u2="&#xc3;" k="102" />
-<hkern u1="P" u2="&#xc2;" k="102" />
-<hkern u1="P" u2="&#xc1;" k="102" />
-<hkern u1="P" u2="&#xc0;" k="102" />
-<hkern u1="P" u2="Z" k="20" />
-<hkern u1="P" u2="X" k="41" />
-<hkern u1="P" u2="A" k="102" />
-<hkern u1="P" u2="&#x2e;" k="266" />
-<hkern u1="P" u2="&#x2c;" k="266" />
-<hkern u1="Q" u2="&#x201e;" k="82" />
-<hkern u1="Q" u2="&#x201a;" k="82" />
-<hkern u1="Q" u2="&#x1ef8;" k="20" />
-<hkern u1="Q" u2="&#x1ef6;" k="20" />
-<hkern u1="Q" u2="&#x1ef4;" k="20" />
-<hkern u1="Q" u2="&#x1ef2;" k="20" />
-<hkern u1="Q" u2="&#x1eb6;" k="41" />
-<hkern u1="Q" u2="&#x1eb4;" k="41" />
-<hkern u1="Q" u2="&#x1eb2;" k="41" />
-<hkern u1="Q" u2="&#x1eb0;" k="41" />
-<hkern u1="Q" u2="&#x1eae;" k="41" />
-<hkern u1="Q" u2="&#x1eac;" k="41" />
-<hkern u1="Q" u2="&#x1eaa;" k="41" />
-<hkern u1="Q" u2="&#x1ea8;" k="41" />
-<hkern u1="Q" u2="&#x1ea6;" k="41" />
-<hkern u1="Q" u2="&#x1ea4;" k="41" />
-<hkern u1="Q" u2="&#x1ea2;" k="41" />
-<hkern u1="Q" u2="&#x1ea0;" k="41" />
-<hkern u1="Q" u2="&#x1e84;" k="20" />
-<hkern u1="Q" u2="&#x1e82;" k="20" />
-<hkern u1="Q" u2="&#x1e80;" k="20" />
-<hkern u1="Q" u2="&#x1e00;" k="41" />
-<hkern u1="Q" u2="&#x405;" k="20" />
-<hkern u1="Q" u2="&#x21a;" k="61" />
-<hkern u1="Q" u2="&#x1fa;" k="41" />
-<hkern u1="Q" u2="&#x17d;" k="20" />
-<hkern u1="Q" u2="&#x17b;" k="20" />
-<hkern u1="Q" u2="&#x179;" k="20" />
-<hkern u1="Q" u2="&#x178;" k="20" />
-<hkern u1="Q" u2="&#x176;" k="20" />
-<hkern u1="Q" u2="&#x174;" k="20" />
-<hkern u1="Q" u2="&#x164;" k="61" />
-<hkern u1="Q" u2="&#x162;" k="61" />
-<hkern u1="Q" u2="&#x104;" k="41" />
-<hkern u1="Q" u2="&#x102;" k="41" />
-<hkern u1="Q" u2="&#x100;" k="41" />
-<hkern u1="Q" u2="&#xdd;" k="20" />
-<hkern u1="Q" u2="&#xc5;" k="41" />
-<hkern u1="Q" u2="&#xc4;" k="41" />
-<hkern u1="Q" u2="&#xc3;" k="41" />
-<hkern u1="Q" u2="&#xc2;" k="41" />
-<hkern u1="Q" u2="&#xc1;" k="41" />
-<hkern u1="Q" u2="&#xc0;" k="41" />
-<hkern u1="Q" u2="Z" k="20" />
-<hkern u1="Q" u2="Y" k="20" />
-<hkern u1="Q" u2="X" k="41" />
-<hkern u1="Q" u2="W" k="20" />
-<hkern u1="Q" u2="V" k="20" />
-<hkern u1="Q" u2="T" k="61" />
-<hkern u1="Q" u2="A" k="41" />
-<hkern u1="Q" u2="&#x2e;" k="82" />
-<hkern u1="Q" u2="&#x2c;" k="82" />
-<hkern u1="T" u2="&#x201e;" k="123" />
-<hkern u1="T" u2="&#x201a;" k="123" />
-<hkern u1="T" u2="&#x2015;" k="82" />
-<hkern u1="T" u2="&#x2014;" k="82" />
-<hkern u1="T" u2="&#x2013;" k="82" />
-<hkern u1="T" u2="&#x1ef5;" k="41" />
-<hkern u1="T" u2="&#x1ef1;" k="102" />
-<hkern u1="T" u2="&#x1eef;" k="102" />
-<hkern u1="T" u2="&#x1eed;" k="102" />
-<hkern u1="T" u2="&#x1eeb;" k="102" />
-<hkern u1="T" u2="&#x1ee9;" k="102" />
-<hkern u1="T" u2="&#x1ee7;" k="102" />
-<hkern u1="T" u2="&#x1ee5;" k="102" />
-<hkern u1="T" u2="&#x1ee3;" k="143" />
-<hkern u1="T" u2="&#x1ee2;" k="41" />
-<hkern u1="T" u2="&#x1ee1;" k="143" />
-<hkern u1="T" u2="&#x1ee0;" k="41" />
-<hkern u1="T" u2="&#x1edf;" k="143" />
-<hkern u1="T" u2="&#x1ede;" k="41" />
-<hkern u1="T" u2="&#x1edd;" k="143" />
-<hkern u1="T" u2="&#x1edc;" k="41" />
-<hkern u1="T" u2="&#x1edb;" k="143" />
-<hkern u1="T" u2="&#x1eda;" k="41" />
-<hkern u1="T" u2="&#x1ed9;" k="143" />
-<hkern u1="T" u2="&#x1ed8;" k="41" />
-<hkern u1="T" u2="&#x1ed7;" k="143" />
-<hkern u1="T" u2="&#x1ed6;" k="41" />
-<hkern u1="T" u2="&#x1ed5;" k="143" />
-<hkern u1="T" u2="&#x1ed4;" k="41" />
-<hkern u1="T" u2="&#x1ed2;" k="41" />
-<hkern u1="T" u2="&#x1ed1;" k="143" />
-<hkern u1="T" u2="&#x1ed0;" k="41" />
-<hkern u1="T" u2="&#x1ecf;" k="143" />
-<hkern u1="T" u2="&#x1ece;" k="41" />
-<hkern u1="T" u2="&#x1ecd;" k="143" />
-<hkern u1="T" u2="&#x1ecc;" k="41" />
-<hkern u1="T" u2="&#x1ec7;" k="143" />
-<hkern u1="T" u2="&#x1ec5;" k="143" />
-<hkern u1="T" u2="&#x1ec3;" k="143" />
-<hkern u1="T" u2="&#x1ebf;" k="143" />
-<hkern u1="T" u2="&#x1ebd;" k="143" />
-<hkern u1="T" u2="&#x1ebb;" k="143" />
-<hkern u1="T" u2="&#x1eb9;" k="143" />
-<hkern u1="T" u2="&#x1eb7;" k="164" />
-<hkern u1="T" u2="&#x1eb6;" k="143" />
-<hkern u1="T" u2="&#x1eb5;" k="164" />
-<hkern u1="T" u2="&#x1eb4;" k="143" />
-<hkern u1="T" u2="&#x1eb3;" k="164" />
-<hkern u1="T" u2="&#x1eb2;" k="143" />
-<hkern u1="T" u2="&#x1eb1;" k="164" />
-<hkern u1="T" u2="&#x1eb0;" k="143" />
-<hkern u1="T" u2="&#x1eaf;" k="164" />
-<hkern u1="T" u2="&#x1eae;" k="143" />
-<hkern u1="T" u2="&#x1ead;" k="164" />
-<hkern u1="T" u2="&#x1eac;" k="143" />
-<hkern u1="T" u2="&#x1eab;" k="164" />
-<hkern u1="T" u2="&#x1eaa;" k="143" />
-<hkern u1="T" u2="&#x1ea9;" k="164" />
-<hkern u1="T" u2="&#x1ea8;" k="143" />
-<hkern u1="T" u2="&#x1ea6;" k="143" />
-<hkern u1="T" u2="&#x1ea5;" k="164" />
-<hkern u1="T" u2="&#x1ea4;" k="143" />
-<hkern u1="T" u2="&#x1ea3;" k="164" />
-<hkern u1="T" u2="&#x1ea2;" k="143" />
-<hkern u1="T" u2="&#x1ea1;" k="164" />
-<hkern u1="T" u2="&#x1ea0;" k="143" />
-<hkern u1="T" u2="&#x1e83;" k="41" />
-<hkern u1="T" u2="&#x1e81;" k="41" />
-<hkern u1="T" u2="&#x1e3f;" k="102" />
-<hkern u1="T" u2="&#x1e01;" k="164" />
-<hkern u1="T" u2="&#x1e00;" k="143" />
-<hkern u1="T" u2="&#x21a;" k="-41" />
-<hkern u1="T" u2="&#x219;" k="123" />
-<hkern u1="T" u2="&#x1ff;" k="143" />
-<hkern u1="T" u2="&#x1fe;" k="41" />
-<hkern u1="T" u2="&#x1fd;" k="164" />
-<hkern u1="T" u2="&#x1fb;" k="164" />
-<hkern u1="T" u2="&#x1fa;" k="143" />
-<hkern u1="T" u2="&#x1b0;" k="102" />
-<hkern u1="T" u2="&#x1a1;" k="143" />
-<hkern u1="T" u2="&#x1a0;" k="41" />
-<hkern u1="T" u2="&#x17e;" k="82" />
-<hkern u1="T" u2="&#x17c;" k="82" />
-<hkern u1="T" u2="&#x17a;" k="82" />
-<hkern u1="T" u2="&#x175;" k="41" />
-<hkern u1="T" u2="&#x173;" k="102" />
-<hkern u1="T" u2="&#x171;" k="102" />
-<hkern u1="T" u2="&#x16f;" k="102" />
-<hkern u1="T" u2="&#x16d;" k="102" />
-<hkern u1="T" u2="&#x16b;" k="102" />
-<hkern u1="T" u2="&#x169;" k="102" />
-<hkern u1="T" u2="&#x164;" k="-41" />
-<hkern u1="T" u2="&#x162;" k="-41" />
-<hkern u1="T" u2="&#x15f;" k="123" />
-<hkern u1="T" u2="&#x15b;" k="123" />
-<hkern u1="T" u2="&#x157;" k="102" />
-<hkern u1="T" u2="&#x155;" k="102" />
-<hkern u1="T" u2="&#x153;" k="143" />
-<hkern u1="T" u2="&#x152;" k="41" />
-<hkern u1="T" u2="&#x151;" k="143" />
-<hkern u1="T" u2="&#x150;" k="41" />
-<hkern u1="T" u2="&#x14f;" k="143" />
-<hkern u1="T" u2="&#x14e;" k="41" />
-<hkern u1="T" u2="&#x14d;" k="143" />
-<hkern u1="T" u2="&#x14c;" k="41" />
-<hkern u1="T" u2="&#x14b;" k="102" />
-<hkern u1="T" u2="&#x146;" k="102" />
-<hkern u1="T" u2="&#x144;" k="102" />
-<hkern u1="T" u2="&#x138;" k="102" />
-<hkern u1="T" u2="&#x123;" k="143" />
-<hkern u1="T" u2="&#x122;" k="41" />
-<hkern u1="T" u2="&#x121;" k="143" />
-<hkern u1="T" u2="&#x120;" k="41" />
-<hkern u1="T" u2="&#x11f;" k="143" />
-<hkern u1="T" u2="&#x11e;" k="41" />
-<hkern u1="T" u2="&#x11d;" k="143" />
-<hkern u1="T" u2="&#x11c;" k="41" />
-<hkern u1="T" u2="&#x11b;" k="143" />
-<hkern u1="T" u2="&#x119;" k="143" />
-<hkern u1="T" u2="&#x117;" k="143" />
-<hkern u1="T" u2="&#x115;" k="143" />
-<hkern u1="T" u2="&#x113;" k="143" />
-<hkern u1="T" u2="&#x111;" k="143" />
-<hkern u1="T" u2="&#x10f;" k="143" />
-<hkern u1="T" u2="&#x10d;" k="143" />
-<hkern u1="T" u2="&#x10c;" k="41" />
-<hkern u1="T" u2="&#x10b;" k="143" />
-<hkern u1="T" u2="&#x10a;" k="41" />
-<hkern u1="T" u2="&#x109;" k="143" />
-<hkern u1="T" u2="&#x108;" k="41" />
-<hkern u1="T" u2="&#x107;" k="143" />
-<hkern u1="T" u2="&#x106;" k="41" />
-<hkern u1="T" u2="&#x105;" k="164" />
-<hkern u1="T" u2="&#x104;" k="143" />
-<hkern u1="T" u2="&#x103;" k="164" />
-<hkern u1="T" u2="&#x102;" k="143" />
-<hkern u1="T" u2="&#x101;" k="164" />
-<hkern u1="T" u2="&#x100;" k="143" />
-<hkern u1="T" u2="&#xfd;" k="41" />
-<hkern u1="T" u2="&#xfc;" k="102" />
-<hkern u1="T" u2="&#xfb;" k="102" />
-<hkern u1="T" u2="&#xfa;" k="102" />
-<hkern u1="T" u2="&#xf9;" k="102" />
-<hkern u1="T" u2="&#xf8;" k="143" />
-<hkern u1="T" u2="&#xf6;" k="143" />
-<hkern u1="T" u2="&#xf5;" k="143" />
-<hkern u1="T" u2="&#xf4;" k="143" />
-<hkern u1="T" u2="&#xf3;" k="143" />
-<hkern u1="T" u2="&#xf2;" k="143" />
-<hkern u1="T" u2="&#xeb;" k="143" />
-<hkern u1="T" u2="&#xea;" k="143" />
-<hkern u1="T" u2="&#xe9;" k="143" />
-<hkern u1="T" u2="&#xe8;" k="143" />
-<hkern u1="T" u2="&#xe7;" k="143" />
-<hkern u1="T" u2="&#xe6;" k="164" />
-<hkern u1="T" u2="&#xe5;" k="164" />
-<hkern u1="T" u2="&#xe4;" k="164" />
-<hkern u1="T" u2="&#xe3;" k="164" />
-<hkern u1="T" u2="&#xe2;" k="164" />
-<hkern u1="T" u2="&#xe1;" k="164" />
-<hkern u1="T" u2="&#xe0;" k="143" />
-<hkern u1="T" u2="&#xd8;" k="41" />
-<hkern u1="T" u2="&#xd6;" k="41" />
-<hkern u1="T" u2="&#xd5;" k="41" />
-<hkern u1="T" u2="&#xd4;" k="41" />
-<hkern u1="T" u2="&#xd3;" k="41" />
-<hkern u1="T" u2="&#xd2;" k="41" />
-<hkern u1="T" u2="&#xc7;" k="41" />
-<hkern u1="T" u2="&#xc5;" k="143" />
-<hkern u1="T" u2="&#xc4;" k="143" />
-<hkern u1="T" u2="&#xc3;" k="143" />
-<hkern u1="T" u2="&#xc2;" k="143" />
-<hkern u1="T" u2="&#xc1;" k="143" />
-<hkern u1="T" u2="&#xc0;" k="143" />
-<hkern u1="T" u2="z" k="82" />
-<hkern u1="T" u2="y" k="41" />
-<hkern u1="T" u2="x" k="41" />
-<hkern u1="T" u2="w" k="41" />
-<hkern u1="T" u2="v" k="41" />
-<hkern u1="T" u2="u" k="102" />
-<hkern u1="T" u2="s" k="123" />
-<hkern u1="T" u2="r" k="102" />
-<hkern u1="T" u2="q" k="143" />
-<hkern u1="T" u2="p" k="102" />
-<hkern u1="T" u2="o" k="143" />
-<hkern u1="T" u2="n" k="102" />
-<hkern u1="T" u2="m" k="102" />
-<hkern u1="T" u2="g" k="143" />
-<hkern u1="T" u2="e" k="143" />
-<hkern u1="T" u2="d" k="143" />
-<hkern u1="T" u2="c" k="143" />
-<hkern u1="T" u2="a" k="164" />
-<hkern u1="T" u2="T" k="-41" />
-<hkern u1="T" u2="Q" k="41" />
-<hkern u1="T" u2="O" k="41" />
-<hkern u1="T" u2="G" k="41" />
-<hkern u1="T" u2="C" k="41" />
-<hkern u1="T" u2="A" k="143" />
-<hkern u1="T" u2="&#x3f;" k="-41" />
-<hkern u1="T" u2="&#x2e;" k="123" />
-<hkern u1="T" u2="&#x2d;" k="82" />
-<hkern u1="T" u2="&#x2c;" k="123" />
-<hkern u1="U" u2="&#x201e;" k="41" />
-<hkern u1="U" u2="&#x201a;" k="41" />
-<hkern u1="U" u2="&#x1eb6;" k="20" />
-<hkern u1="U" u2="&#x1eb4;" k="20" />
-<hkern u1="U" u2="&#x1eb2;" k="20" />
-<hkern u1="U" u2="&#x1eb0;" k="20" />
-<hkern u1="U" u2="&#x1eae;" k="20" />
-<hkern u1="U" u2="&#x1eac;" k="20" />
-<hkern u1="U" u2="&#x1eaa;" k="20" />
-<hkern u1="U" u2="&#x1ea8;" k="20" />
-<hkern u1="U" u2="&#x1ea6;" k="20" />
-<hkern u1="U" u2="&#x1ea4;" k="20" />
-<hkern u1="U" u2="&#x1ea2;" k="20" />
-<hkern u1="U" u2="&#x1ea0;" k="20" />
-<hkern u1="U" u2="&#x1e00;" k="20" />
-<hkern u1="U" u2="&#x1fa;" k="20" />
-<hkern u1="U" u2="&#x104;" k="20" />
-<hkern u1="U" u2="&#x102;" k="20" />
-<hkern u1="U" u2="&#x100;" k="20" />
-<hkern u1="U" u2="&#xc5;" k="20" />
-<hkern u1="U" u2="&#xc4;" k="20" />
-<hkern u1="U" u2="&#xc3;" k="20" />
-<hkern u1="U" u2="&#xc2;" k="20" />
-<hkern u1="U" u2="&#xc1;" k="20" />
-<hkern u1="U" u2="&#xc0;" k="20" />
-<hkern u1="U" u2="A" k="20" />
-<hkern u1="U" u2="&#x2e;" k="41" />
-<hkern u1="U" u2="&#x2c;" k="41" />
-<hkern u1="V" u2="&#x201e;" k="102" />
-<hkern u1="V" u2="&#x201a;" k="102" />
-<hkern u1="V" u2="&#x1ef1;" k="20" />
-<hkern u1="V" u2="&#x1eef;" k="20" />
-<hkern u1="V" u2="&#x1eed;" k="20" />
-<hkern u1="V" u2="&#x1eeb;" k="20" />
-<hkern u1="V" u2="&#x1ee9;" k="20" />
-<hkern u1="V" u2="&#x1ee7;" k="20" />
-<hkern u1="V" u2="&#x1ee5;" k="20" />
-<hkern u1="V" u2="&#x1ee3;" k="41" />
-<hkern u1="V" u2="&#x1ee2;" k="20" />
-<hkern u1="V" u2="&#x1ee1;" k="41" />
-<hkern u1="V" u2="&#x1ee0;" k="20" />
-<hkern u1="V" u2="&#x1edf;" k="41" />
-<hkern u1="V" u2="&#x1ede;" k="20" />
-<hkern u1="V" u2="&#x1edd;" k="41" />
-<hkern u1="V" u2="&#x1edc;" k="20" />
-<hkern u1="V" u2="&#x1edb;" k="41" />
-<hkern u1="V" u2="&#x1eda;" k="20" />
-<hkern u1="V" u2="&#x1ed9;" k="41" />
-<hkern u1="V" u2="&#x1ed8;" k="20" />
-<hkern u1="V" u2="&#x1ed7;" k="41" />
-<hkern u1="V" u2="&#x1ed6;" k="20" />
-<hkern u1="V" u2="&#x1ed5;" k="41" />
-<hkern u1="V" u2="&#x1ed4;" k="20" />
-<hkern u1="V" u2="&#x1ed2;" k="20" />
-<hkern u1="V" u2="&#x1ed1;" k="41" />
-<hkern u1="V" u2="&#x1ed0;" k="20" />
-<hkern u1="V" u2="&#x1ecf;" k="41" />
-<hkern u1="V" u2="&#x1ece;" k="20" />
-<hkern u1="V" u2="&#x1ecd;" k="41" />
-<hkern u1="V" u2="&#x1ecc;" k="20" />
-<hkern u1="V" u2="&#x1ec7;" k="41" />
-<hkern u1="V" u2="&#x1ec5;" k="41" />
-<hkern u1="V" u2="&#x1ec3;" k="41" />
-<hkern u1="V" u2="&#x1ebf;" k="41" />
-<hkern u1="V" u2="&#x1ebd;" k="41" />
-<hkern u1="V" u2="&#x1ebb;" k="41" />
-<hkern u1="V" u2="&#x1eb9;" k="41" />
-<hkern u1="V" u2="&#x1eb7;" k="41" />
-<hkern u1="V" u2="&#x1eb6;" k="82" />
-<hkern u1="V" u2="&#x1eb5;" k="41" />
-<hkern u1="V" u2="&#x1eb4;" k="82" />
-<hkern u1="V" u2="&#x1eb3;" k="41" />
-<hkern u1="V" u2="&#x1eb2;" k="82" />
-<hkern u1="V" u2="&#x1eb1;" k="41" />
-<hkern u1="V" u2="&#x1eb0;" k="82" />
-<hkern u1="V" u2="&#x1eaf;" k="41" />
-<hkern u1="V" u2="&#x1eae;" k="82" />
-<hkern u1="V" u2="&#x1ead;" k="41" />
-<hkern u1="V" u2="&#x1eac;" k="82" />
-<hkern u1="V" u2="&#x1eab;" k="41" />
-<hkern u1="V" u2="&#x1eaa;" k="82" />
-<hkern u1="V" u2="&#x1ea9;" k="41" />
-<hkern u1="V" u2="&#x1ea8;" k="82" />
-<hkern u1="V" u2="&#x1ea6;" k="82" />
-<hkern u1="V" u2="&#x1ea5;" k="41" />
-<hkern u1="V" u2="&#x1ea4;" k="82" />
-<hkern u1="V" u2="&#x1ea3;" k="41" />
-<hkern u1="V" u2="&#x1ea2;" k="82" />
-<hkern u1="V" u2="&#x1ea1;" k="41" />
-<hkern u1="V" u2="&#x1ea0;" k="82" />
-<hkern u1="V" u2="&#x1e3f;" k="20" />
-<hkern u1="V" u2="&#x1e01;" k="41" />
-<hkern u1="V" u2="&#x1e00;" k="82" />
-<hkern u1="V" u2="&#x219;" k="20" />
-<hkern u1="V" u2="&#x1ff;" k="41" />
-<hkern u1="V" u2="&#x1fe;" k="20" />
-<hkern u1="V" u2="&#x1fd;" k="41" />
-<hkern u1="V" u2="&#x1fb;" k="41" />
-<hkern u1="V" u2="&#x1fa;" k="82" />
-<hkern u1="V" u2="&#x1b0;" k="20" />
-<hkern u1="V" u2="&#x1a1;" k="41" />
-<hkern u1="V" u2="&#x1a0;" k="20" />
-<hkern u1="V" u2="&#x173;" k="20" />
-<hkern u1="V" u2="&#x171;" k="20" />
-<hkern u1="V" u2="&#x16f;" k="20" />
-<hkern u1="V" u2="&#x16d;" k="20" />
-<hkern u1="V" u2="&#x16b;" k="20" />
-<hkern u1="V" u2="&#x169;" k="20" />
-<hkern u1="V" u2="&#x15f;" k="20" />
-<hkern u1="V" u2="&#x15b;" k="20" />
-<hkern u1="V" u2="&#x157;" k="20" />
-<hkern u1="V" u2="&#x155;" k="20" />
-<hkern u1="V" u2="&#x153;" k="41" />
-<hkern u1="V" u2="&#x152;" k="20" />
-<hkern u1="V" u2="&#x151;" k="41" />
-<hkern u1="V" u2="&#x150;" k="20" />
-<hkern u1="V" u2="&#x14f;" k="41" />
-<hkern u1="V" u2="&#x14e;" k="20" />
-<hkern u1="V" u2="&#x14d;" k="41" />
-<hkern u1="V" u2="&#x14c;" k="20" />
-<hkern u1="V" u2="&#x14b;" k="20" />
-<hkern u1="V" u2="&#x146;" k="20" />
-<hkern u1="V" u2="&#x144;" k="20" />
-<hkern u1="V" u2="&#x138;" k="20" />
-<hkern u1="V" u2="&#x123;" k="20" />
-<hkern u1="V" u2="&#x122;" k="20" />
-<hkern u1="V" u2="&#x121;" k="20" />
-<hkern u1="V" u2="&#x120;" k="20" />
-<hkern u1="V" u2="&#x11f;" k="20" />
-<hkern u1="V" u2="&#x11e;" k="20" />
-<hkern u1="V" u2="&#x11d;" k="20" />
-<hkern u1="V" u2="&#x11c;" k="20" />
-<hkern u1="V" u2="&#x11b;" k="41" />
-<hkern u1="V" u2="&#x119;" k="41" />
-<hkern u1="V" u2="&#x117;" k="41" />
-<hkern u1="V" u2="&#x115;" k="41" />
-<hkern u1="V" u2="&#x113;" k="41" />
-<hkern u1="V" u2="&#x111;" k="41" />
-<hkern u1="V" u2="&#x10f;" k="41" />
-<hkern u1="V" u2="&#x10d;" k="41" />
-<hkern u1="V" u2="&#x10c;" k="20" />
-<hkern u1="V" u2="&#x10b;" k="41" />
-<hkern u1="V" u2="&#x10a;" k="20" />
-<hkern u1="V" u2="&#x109;" k="41" />
-<hkern u1="V" u2="&#x108;" k="20" />
-<hkern u1="V" u2="&#x107;" k="41" />
-<hkern u1="V" u2="&#x106;" k="20" />
-<hkern u1="V" u2="&#x105;" k="41" />
-<hkern u1="V" u2="&#x104;" k="82" />
-<hkern u1="V" u2="&#x103;" k="41" />
-<hkern u1="V" u2="&#x102;" k="82" />
-<hkern u1="V" u2="&#x101;" k="41" />
-<hkern u1="V" u2="&#x100;" k="82" />
-<hkern u1="V" u2="&#xfc;" k="20" />
-<hkern u1="V" u2="&#xfb;" k="20" />
-<hkern u1="V" u2="&#xfa;" k="20" />
-<hkern u1="V" u2="&#xf9;" k="20" />
-<hkern u1="V" u2="&#xf8;" k="41" />
-<hkern u1="V" u2="&#xf6;" k="41" />
-<hkern u1="V" u2="&#xf5;" k="41" />
-<hkern u1="V" u2="&#xf4;" k="41" />
-<hkern u1="V" u2="&#xf3;" k="41" />
-<hkern u1="V" u2="&#xf2;" k="41" />
-<hkern u1="V" u2="&#xeb;" k="41" />
-<hkern u1="V" u2="&#xea;" k="41" />
-<hkern u1="V" u2="&#xe9;" k="41" />
-<hkern u1="V" u2="&#xe8;" k="41" />
-<hkern u1="V" u2="&#xe7;" k="41" />
-<hkern u1="V" u2="&#xe6;" k="41" />
-<hkern u1="V" u2="&#xe5;" k="41" />
-<hkern u1="V" u2="&#xe4;" k="41" />
-<hkern u1="V" u2="&#xe3;" k="41" />
-<hkern u1="V" u2="&#xe2;" k="41" />
-<hkern u1="V" u2="&#xe1;" k="41" />
-<hkern u1="V" u2="&#xe0;" k="41" />
-<hkern u1="V" u2="&#xd8;" k="20" />
-<hkern u1="V" u2="&#xd6;" k="20" />
-<hkern u1="V" u2="&#xd5;" k="20" />
-<hkern u1="V" u2="&#xd4;" k="20" />
-<hkern u1="V" u2="&#xd3;" k="20" />
-<hkern u1="V" u2="&#xd2;" k="20" />
-<hkern u1="V" u2="&#xc7;" k="20" />
-<hkern u1="V" u2="&#xc5;" k="82" />
-<hkern u1="V" u2="&#xc4;" k="82" />
-<hkern u1="V" u2="&#xc3;" k="82" />
-<hkern u1="V" u2="&#xc2;" k="82" />
-<hkern u1="V" u2="&#xc1;" k="82" />
-<hkern u1="V" u2="&#xc0;" k="82" />
-<hkern u1="V" u2="u" k="20" />
-<hkern u1="V" u2="s" k="20" />
-<hkern u1="V" u2="r" k="20" />
-<hkern u1="V" u2="q" k="41" />
-<hkern u1="V" u2="p" k="20" />
-<hkern u1="V" u2="o" k="41" />
-<hkern u1="V" u2="n" k="20" />
-<hkern u1="V" u2="m" k="20" />
-<hkern u1="V" u2="g" k="20" />
-<hkern u1="V" u2="e" k="41" />
-<hkern u1="V" u2="d" k="41" />
-<hkern u1="V" u2="c" k="41" />
-<hkern u1="V" u2="a" k="41" />
-<hkern u1="V" u2="Q" k="20" />
-<hkern u1="V" u2="O" k="20" />
-<hkern u1="V" u2="G" k="20" />
-<hkern u1="V" u2="C" k="20" />
-<hkern u1="V" u2="A" k="82" />
-<hkern u1="V" u2="&#x3f;" k="-41" />
-<hkern u1="V" u2="&#x2e;" k="102" />
-<hkern u1="V" u2="&#x2c;" k="102" />
-<hkern u1="W" u2="&#x201e;" k="102" />
-<hkern u1="W" u2="&#x201a;" k="102" />
-<hkern u1="W" u2="&#x1ef1;" k="20" />
-<hkern u1="W" u2="&#x1eef;" k="20" />
-<hkern u1="W" u2="&#x1eed;" k="20" />
-<hkern u1="W" u2="&#x1eeb;" k="20" />
-<hkern u1="W" u2="&#x1ee9;" k="20" />
-<hkern u1="W" u2="&#x1ee7;" k="20" />
-<hkern u1="W" u2="&#x1ee5;" k="20" />
-<hkern u1="W" u2="&#x1ee3;" k="41" />
-<hkern u1="W" u2="&#x1ee2;" k="20" />
-<hkern u1="W" u2="&#x1ee1;" k="41" />
-<hkern u1="W" u2="&#x1ee0;" k="20" />
-<hkern u1="W" u2="&#x1edf;" k="41" />
-<hkern u1="W" u2="&#x1ede;" k="20" />
-<hkern u1="W" u2="&#x1edd;" k="41" />
-<hkern u1="W" u2="&#x1edc;" k="20" />
-<hkern u1="W" u2="&#x1edb;" k="41" />
-<hkern u1="W" u2="&#x1eda;" k="20" />
-<hkern u1="W" u2="&#x1ed9;" k="41" />
-<hkern u1="W" u2="&#x1ed8;" k="20" />
-<hkern u1="W" u2="&#x1ed7;" k="41" />
-<hkern u1="W" u2="&#x1ed6;" k="20" />
-<hkern u1="W" u2="&#x1ed5;" k="41" />
-<hkern u1="W" u2="&#x1ed4;" k="20" />
-<hkern u1="W" u2="&#x1ed2;" k="20" />
-<hkern u1="W" u2="&#x1ed1;" k="41" />
-<hkern u1="W" u2="&#x1ed0;" k="20" />
-<hkern u1="W" u2="&#x1ecf;" k="41" />
-<hkern u1="W" u2="&#x1ece;" k="20" />
-<hkern u1="W" u2="&#x1ecd;" k="41" />
-<hkern u1="W" u2="&#x1ecc;" k="20" />
-<hkern u1="W" u2="&#x1ec7;" k="41" />
-<hkern u1="W" u2="&#x1ec5;" k="41" />
-<hkern u1="W" u2="&#x1ec3;" k="41" />
-<hkern u1="W" u2="&#x1ebf;" k="41" />
-<hkern u1="W" u2="&#x1ebd;" k="41" />
-<hkern u1="W" u2="&#x1ebb;" k="41" />
-<hkern u1="W" u2="&#x1eb9;" k="41" />
-<hkern u1="W" u2="&#x1eb7;" k="41" />
-<hkern u1="W" u2="&#x1eb6;" k="82" />
-<hkern u1="W" u2="&#x1eb5;" k="41" />
-<hkern u1="W" u2="&#x1eb4;" k="82" />
-<hkern u1="W" u2="&#x1eb3;" k="41" />
-<hkern u1="W" u2="&#x1eb2;" k="82" />
-<hkern u1="W" u2="&#x1eb1;" k="41" />
-<hkern u1="W" u2="&#x1eb0;" k="82" />
-<hkern u1="W" u2="&#x1eaf;" k="41" />
-<hkern u1="W" u2="&#x1eae;" k="82" />
-<hkern u1="W" u2="&#x1ead;" k="41" />
-<hkern u1="W" u2="&#x1eac;" k="82" />
-<hkern u1="W" u2="&#x1eab;" k="41" />
-<hkern u1="W" u2="&#x1eaa;" k="82" />
-<hkern u1="W" u2="&#x1ea9;" k="41" />
-<hkern u1="W" u2="&#x1ea8;" k="82" />
-<hkern u1="W" u2="&#x1ea6;" k="82" />
-<hkern u1="W" u2="&#x1ea5;" k="41" />
-<hkern u1="W" u2="&#x1ea4;" k="82" />
-<hkern u1="W" u2="&#x1ea3;" k="41" />
-<hkern u1="W" u2="&#x1ea2;" k="82" />
-<hkern u1="W" u2="&#x1ea1;" k="41" />
-<hkern u1="W" u2="&#x1ea0;" k="82" />
-<hkern u1="W" u2="&#x1e3f;" k="20" />
-<hkern u1="W" u2="&#x1e01;" k="41" />
-<hkern u1="W" u2="&#x1e00;" k="82" />
-<hkern u1="W" u2="&#x219;" k="20" />
-<hkern u1="W" u2="&#x1ff;" k="41" />
-<hkern u1="W" u2="&#x1fe;" k="20" />
-<hkern u1="W" u2="&#x1fd;" k="41" />
-<hkern u1="W" u2="&#x1fb;" k="41" />
-<hkern u1="W" u2="&#x1fa;" k="82" />
-<hkern u1="W" u2="&#x1b0;" k="20" />
-<hkern u1="W" u2="&#x1a1;" k="41" />
-<hkern u1="W" u2="&#x1a0;" k="20" />
-<hkern u1="W" u2="&#x173;" k="20" />
-<hkern u1="W" u2="&#x171;" k="20" />
-<hkern u1="W" u2="&#x16f;" k="20" />
-<hkern u1="W" u2="&#x16d;" k="20" />
-<hkern u1="W" u2="&#x16b;" k="20" />
-<hkern u1="W" u2="&#x169;" k="20" />
-<hkern u1="W" u2="&#x15f;" k="20" />
-<hkern u1="W" u2="&#x15b;" k="20" />
-<hkern u1="W" u2="&#x157;" k="20" />
-<hkern u1="W" u2="&#x155;" k="20" />
-<hkern u1="W" u2="&#x153;" k="41" />
-<hkern u1="W" u2="&#x152;" k="20" />
-<hkern u1="W" u2="&#x151;" k="41" />
-<hkern u1="W" u2="&#x150;" k="20" />
-<hkern u1="W" u2="&#x14f;" k="41" />
-<hkern u1="W" u2="&#x14e;" k="20" />
-<hkern u1="W" u2="&#x14d;" k="41" />
-<hkern u1="W" u2="&#x14c;" k="20" />
-<hkern u1="W" u2="&#x14b;" k="20" />
-<hkern u1="W" u2="&#x146;" k="20" />
-<hkern u1="W" u2="&#x144;" k="20" />
-<hkern u1="W" u2="&#x138;" k="20" />
-<hkern u1="W" u2="&#x123;" k="20" />
-<hkern u1="W" u2="&#x122;" k="20" />
-<hkern u1="W" u2="&#x121;" k="20" />
-<hkern u1="W" u2="&#x120;" k="20" />
-<hkern u1="W" u2="&#x11f;" k="20" />
-<hkern u1="W" u2="&#x11e;" k="20" />
-<hkern u1="W" u2="&#x11d;" k="20" />
-<hkern u1="W" u2="&#x11c;" k="20" />
-<hkern u1="W" u2="&#x11b;" k="41" />
-<hkern u1="W" u2="&#x119;" k="41" />
-<hkern u1="W" u2="&#x117;" k="41" />
-<hkern u1="W" u2="&#x115;" k="41" />
-<hkern u1="W" u2="&#x113;" k="41" />
-<hkern u1="W" u2="&#x111;" k="41" />
-<hkern u1="W" u2="&#x10f;" k="41" />
-<hkern u1="W" u2="&#x10d;" k="41" />
-<hkern u1="W" u2="&#x10c;" k="20" />
-<hkern u1="W" u2="&#x10b;" k="41" />
-<hkern u1="W" u2="&#x10a;" k="20" />
-<hkern u1="W" u2="&#x109;" k="41" />
-<hkern u1="W" u2="&#x108;" k="20" />
-<hkern u1="W" u2="&#x107;" k="41" />
-<hkern u1="W" u2="&#x106;" k="20" />
-<hkern u1="W" u2="&#x105;" k="41" />
-<hkern u1="W" u2="&#x104;" k="82" />
-<hkern u1="W" u2="&#x103;" k="41" />
-<hkern u1="W" u2="&#x102;" k="82" />
-<hkern u1="W" u2="&#x101;" k="41" />
-<hkern u1="W" u2="&#x100;" k="82" />
-<hkern u1="W" u2="&#xfc;" k="20" />
-<hkern u1="W" u2="&#xfb;" k="20" />
-<hkern u1="W" u2="&#xfa;" k="20" />
-<hkern u1="W" u2="&#xf9;" k="20" />
-<hkern u1="W" u2="&#xf8;" k="41" />
-<hkern u1="W" u2="&#xf6;" k="41" />
-<hkern u1="W" u2="&#xf5;" k="41" />
-<hkern u1="W" u2="&#xf4;" k="41" />
-<hkern u1="W" u2="&#xf3;" k="41" />
-<hkern u1="W" u2="&#xf2;" k="41" />
-<hkern u1="W" u2="&#xeb;" k="41" />
-<hkern u1="W" u2="&#xea;" k="41" />
-<hkern u1="W" u2="&#xe9;" k="41" />
-<hkern u1="W" u2="&#xe8;" k="41" />
-<hkern u1="W" u2="&#xe7;" k="41" />
-<hkern u1="W" u2="&#xe6;" k="41" />
-<hkern u1="W" u2="&#xe5;" k="41" />
-<hkern u1="W" u2="&#xe4;" k="41" />
-<hkern u1="W" u2="&#xe3;" k="41" />
-<hkern u1="W" u2="&#xe2;" k="41" />
-<hkern u1="W" u2="&#xe1;" k="41" />
-<hkern u1="W" u2="&#xe0;" k="41" />
-<hkern u1="W" u2="&#xd8;" k="20" />
-<hkern u1="W" u2="&#xd6;" k="20" />
-<hkern u1="W" u2="&#xd5;" k="20" />
-<hkern u1="W" u2="&#xd4;" k="20" />
-<hkern u1="W" u2="&#xd3;" k="20" />
-<hkern u1="W" u2="&#xd2;" k="20" />
-<hkern u1="W" u2="&#xc7;" k="20" />
-<hkern u1="W" u2="&#xc5;" k="82" />
-<hkern u1="W" u2="&#xc4;" k="82" />
-<hkern u1="W" u2="&#xc3;" k="82" />
-<hkern u1="W" u2="&#xc2;" k="82" />
-<hkern u1="W" u2="&#xc1;" k="82" />
-<hkern u1="W" u2="&#xc0;" k="82" />
-<hkern u1="W" u2="u" k="20" />
-<hkern u1="W" u2="s" k="20" />
-<hkern u1="W" u2="r" k="20" />
-<hkern u1="W" u2="q" k="41" />
-<hkern u1="W" u2="p" k="20" />
-<hkern u1="W" u2="o" k="41" />
-<hkern u1="W" u2="n" k="20" />
-<hkern u1="W" u2="m" k="20" />
-<hkern u1="W" u2="g" k="20" />
-<hkern u1="W" u2="e" k="41" />
-<hkern u1="W" u2="d" k="41" />
-<hkern u1="W" u2="c" k="41" />
-<hkern u1="W" u2="a" k="41" />
-<hkern u1="W" u2="Q" k="20" />
-<hkern u1="W" u2="O" k="20" />
-<hkern u1="W" u2="G" k="20" />
-<hkern u1="W" u2="C" k="20" />
-<hkern u1="W" u2="A" k="82" />
-<hkern u1="W" u2="&#x3f;" k="-41" />
-<hkern u1="W" u2="&#x2e;" k="102" />
-<hkern u1="W" u2="&#x2c;" k="102" />
-<hkern u1="X" u2="&#x1ee2;" k="41" />
-<hkern u1="X" u2="&#x1ee0;" k="41" />
-<hkern u1="X" u2="&#x1ede;" k="41" />
-<hkern u1="X" u2="&#x1edc;" k="41" />
-<hkern u1="X" u2="&#x1eda;" k="41" />
-<hkern u1="X" u2="&#x1ed8;" k="41" />
-<hkern u1="X" u2="&#x1ed6;" k="41" />
-<hkern u1="X" u2="&#x1ed4;" k="41" />
-<hkern u1="X" u2="&#x1ed2;" k="41" />
-<hkern u1="X" u2="&#x1ed0;" k="41" />
-<hkern u1="X" u2="&#x1ece;" k="41" />
-<hkern u1="X" u2="&#x1ecc;" k="41" />
-<hkern u1="X" u2="&#x1fe;" k="41" />
-<hkern u1="X" u2="&#x1a0;" k="41" />
-<hkern u1="X" u2="&#x152;" k="41" />
-<hkern u1="X" u2="&#x150;" k="41" />
-<hkern u1="X" u2="&#x14e;" k="41" />
-<hkern u1="X" u2="&#x14c;" k="41" />
-<hkern u1="X" u2="&#x122;" k="41" />
-<hkern u1="X" u2="&#x120;" k="41" />
-<hkern u1="X" u2="&#x11e;" k="41" />
-<hkern u1="X" u2="&#x11c;" k="41" />
-<hkern u1="X" u2="&#x10c;" k="41" />
-<hkern u1="X" u2="&#x10a;" k="41" />
-<hkern u1="X" u2="&#x108;" k="41" />
-<hkern u1="X" u2="&#x106;" k="41" />
-<hkern u1="X" u2="&#xd8;" k="41" />
-<hkern u1="X" u2="&#xd6;" k="41" />
-<hkern u1="X" u2="&#xd5;" k="41" />
-<hkern u1="X" u2="&#xd4;" k="41" />
-<hkern u1="X" u2="&#xd3;" k="41" />
-<hkern u1="X" u2="&#xd2;" k="41" />
-<hkern u1="X" u2="&#xc7;" k="41" />
-<hkern u1="X" u2="Q" k="41" />
-<hkern u1="X" u2="O" k="41" />
-<hkern u1="X" u2="G" k="41" />
-<hkern u1="X" u2="C" k="41" />
-<hkern u1="Y" u2="&#x201e;" k="123" />
-<hkern u1="Y" u2="&#x201a;" k="123" />
-<hkern u1="Y" u2="&#x1ef1;" k="61" />
-<hkern u1="Y" u2="&#x1eef;" k="61" />
-<hkern u1="Y" u2="&#x1eed;" k="61" />
-<hkern u1="Y" u2="&#x1eeb;" k="61" />
-<hkern u1="Y" u2="&#x1ee9;" k="61" />
-<hkern u1="Y" u2="&#x1ee7;" k="61" />
-<hkern u1="Y" u2="&#x1ee5;" k="61" />
-<hkern u1="Y" u2="&#x1ee3;" k="102" />
-<hkern u1="Y" u2="&#x1ee2;" k="41" />
-<hkern u1="Y" u2="&#x1ee1;" k="102" />
-<hkern u1="Y" u2="&#x1ee0;" k="41" />
-<hkern u1="Y" u2="&#x1edf;" k="102" />
-<hkern u1="Y" u2="&#x1ede;" k="41" />
-<hkern u1="Y" u2="&#x1edd;" k="102" />
-<hkern u1="Y" u2="&#x1edc;" k="41" />
-<hkern u1="Y" u2="&#x1edb;" k="102" />
-<hkern u1="Y" u2="&#x1eda;" k="41" />
-<hkern u1="Y" u2="&#x1ed9;" k="102" />
-<hkern u1="Y" u2="&#x1ed8;" k="41" />
-<hkern u1="Y" u2="&#x1ed7;" k="102" />
-<hkern u1="Y" u2="&#x1ed6;" k="41" />
-<hkern u1="Y" u2="&#x1ed5;" k="102" />
-<hkern u1="Y" u2="&#x1ed4;" k="41" />
-<hkern u1="Y" u2="&#x1ed2;" k="41" />
-<hkern u1="Y" u2="&#x1ed1;" k="102" />
-<hkern u1="Y" u2="&#x1ed0;" k="41" />
-<hkern u1="Y" u2="&#x1ecf;" k="102" />
-<hkern u1="Y" u2="&#x1ece;" k="41" />
-<hkern u1="Y" u2="&#x1ecd;" k="102" />
-<hkern u1="Y" u2="&#x1ecc;" k="41" />
-<hkern u1="Y" u2="&#x1ec7;" k="102" />
-<hkern u1="Y" u2="&#x1ec5;" k="102" />
-<hkern u1="Y" u2="&#x1ec3;" k="102" />
-<hkern u1="Y" u2="&#x1ebf;" k="102" />
-<hkern u1="Y" u2="&#x1ebd;" k="102" />
-<hkern u1="Y" u2="&#x1ebb;" k="102" />
-<hkern u1="Y" u2="&#x1eb9;" k="102" />
-<hkern u1="Y" u2="&#x1eb7;" k="102" />
-<hkern u1="Y" u2="&#x1eb6;" k="123" />
-<hkern u1="Y" u2="&#x1eb5;" k="102" />
-<hkern u1="Y" u2="&#x1eb4;" k="123" />
-<hkern u1="Y" u2="&#x1eb3;" k="102" />
-<hkern u1="Y" u2="&#x1eb2;" k="123" />
-<hkern u1="Y" u2="&#x1eb1;" k="102" />
-<hkern u1="Y" u2="&#x1eb0;" k="123" />
-<hkern u1="Y" u2="&#x1eaf;" k="102" />
-<hkern u1="Y" u2="&#x1eae;" k="123" />
-<hkern u1="Y" u2="&#x1ead;" k="102" />
-<hkern u1="Y" u2="&#x1eac;" k="123" />
-<hkern u1="Y" u2="&#x1eab;" k="102" />
-<hkern u1="Y" u2="&#x1eaa;" k="123" />
-<hkern u1="Y" u2="&#x1ea9;" k="102" />
-<hkern u1="Y" u2="&#x1ea8;" k="123" />
-<hkern u1="Y" u2="&#x1ea6;" k="123" />
-<hkern u1="Y" u2="&#x1ea5;" k="102" />
-<hkern u1="Y" u2="&#x1ea4;" k="123" />
-<hkern u1="Y" u2="&#x1ea3;" k="102" />
-<hkern u1="Y" u2="&#x1ea2;" k="123" />
-<hkern u1="Y" u2="&#x1ea1;" k="102" />
-<hkern u1="Y" u2="&#x1ea0;" k="123" />
-<hkern u1="Y" u2="&#x1e3f;" k="61" />
-<hkern u1="Y" u2="&#x1e01;" k="102" />
-<hkern u1="Y" u2="&#x1e00;" k="123" />
-<hkern u1="Y" u2="&#x219;" k="82" />
-<hkern u1="Y" u2="&#x1ff;" k="102" />
-<hkern u1="Y" u2="&#x1fe;" k="41" />
-<hkern u1="Y" u2="&#x1fd;" k="102" />
-<hkern u1="Y" u2="&#x1fb;" k="102" />
-<hkern u1="Y" u2="&#x1fa;" k="123" />
-<hkern u1="Y" u2="&#x1b0;" k="61" />
-<hkern u1="Y" u2="&#x1a1;" k="102" />
-<hkern u1="Y" u2="&#x1a0;" k="41" />
-<hkern u1="Y" u2="&#x17e;" k="41" />
-<hkern u1="Y" u2="&#x17c;" k="41" />
-<hkern u1="Y" u2="&#x17a;" k="41" />
-<hkern u1="Y" u2="&#x173;" k="61" />
-<hkern u1="Y" u2="&#x171;" k="61" />
-<hkern u1="Y" u2="&#x16f;" k="61" />
-<hkern u1="Y" u2="&#x16d;" k="61" />
-<hkern u1="Y" u2="&#x16b;" k="61" />
-<hkern u1="Y" u2="&#x169;" k="61" />
-<hkern u1="Y" u2="&#x15f;" k="82" />
-<hkern u1="Y" u2="&#x15b;" k="82" />
-<hkern u1="Y" u2="&#x157;" k="61" />
-<hkern u1="Y" u2="&#x155;" k="61" />
-<hkern u1="Y" u2="&#x153;" k="102" />
-<hkern u1="Y" u2="&#x152;" k="41" />
-<hkern u1="Y" u2="&#x151;" k="102" />
-<hkern u1="Y" u2="&#x150;" k="41" />
-<hkern u1="Y" u2="&#x14f;" k="102" />
-<hkern u1="Y" u2="&#x14e;" k="41" />
-<hkern u1="Y" u2="&#x14d;" k="102" />
-<hkern u1="Y" u2="&#x14c;" k="41" />
-<hkern u1="Y" u2="&#x14b;" k="61" />
-<hkern u1="Y" u2="&#x146;" k="61" />
-<hkern u1="Y" u2="&#x144;" k="61" />
-<hkern u1="Y" u2="&#x138;" k="61" />
-<hkern u1="Y" u2="&#x123;" k="41" />
-<hkern u1="Y" u2="&#x122;" k="41" />
-<hkern u1="Y" u2="&#x121;" k="41" />
-<hkern u1="Y" u2="&#x120;" k="41" />
-<hkern u1="Y" u2="&#x11f;" k="41" />
-<hkern u1="Y" u2="&#x11e;" k="41" />
-<hkern u1="Y" u2="&#x11d;" k="41" />
-<hkern u1="Y" u2="&#x11c;" k="41" />
-<hkern u1="Y" u2="&#x11b;" k="102" />
-<hkern u1="Y" u2="&#x119;" k="102" />
-<hkern u1="Y" u2="&#x117;" k="102" />
-<hkern u1="Y" u2="&#x115;" k="102" />
-<hkern u1="Y" u2="&#x113;" k="102" />
-<hkern u1="Y" u2="&#x111;" k="102" />
-<hkern u1="Y" u2="&#x10f;" k="102" />
-<hkern u1="Y" u2="&#x10d;" k="102" />
-<hkern u1="Y" u2="&#x10c;" k="41" />
-<hkern u1="Y" u2="&#x10b;" k="102" />
-<hkern u1="Y" u2="&#x10a;" k="41" />
-<hkern u1="Y" u2="&#x109;" k="102" />
-<hkern u1="Y" u2="&#x108;" k="41" />
-<hkern u1="Y" u2="&#x107;" k="102" />
-<hkern u1="Y" u2="&#x106;" k="41" />
-<hkern u1="Y" u2="&#x105;" k="102" />
-<hkern u1="Y" u2="&#x104;" k="123" />
-<hkern u1="Y" u2="&#x103;" k="102" />
-<hkern u1="Y" u2="&#x102;" k="123" />
-<hkern u1="Y" u2="&#x101;" k="102" />
-<hkern u1="Y" u2="&#x100;" k="123" />
-<hkern u1="Y" u2="&#xfc;" k="61" />
-<hkern u1="Y" u2="&#xfb;" k="61" />
-<hkern u1="Y" u2="&#xfa;" k="61" />
-<hkern u1="Y" u2="&#xf9;" k="61" />
-<hkern u1="Y" u2="&#xf8;" k="102" />
-<hkern u1="Y" u2="&#xf6;" k="102" />
-<hkern u1="Y" u2="&#xf5;" k="102" />
-<hkern u1="Y" u2="&#xf4;" k="102" />
-<hkern u1="Y" u2="&#xf3;" k="102" />
-<hkern u1="Y" u2="&#xf2;" k="102" />
-<hkern u1="Y" u2="&#xeb;" k="102" />
-<hkern u1="Y" u2="&#xea;" k="102" />
-<hkern u1="Y" u2="&#xe9;" k="102" />
-<hkern u1="Y" u2="&#xe8;" k="102" />
-<hkern u1="Y" u2="&#xe7;" k="102" />
-<hkern u1="Y" u2="&#xe6;" k="102" />
-<hkern u1="Y" u2="&#xe5;" k="102" />
-<hkern u1="Y" u2="&#xe4;" k="102" />
-<hkern u1="Y" u2="&#xe3;" k="102" />
-<hkern u1="Y" u2="&#xe2;" k="102" />
-<hkern u1="Y" u2="&#xe1;" k="102" />
-<hkern u1="Y" u2="&#xe0;" k="102" />
-<hkern u1="Y" u2="&#xd8;" k="41" />
-<hkern u1="Y" u2="&#xd6;" k="41" />
-<hkern u1="Y" u2="&#xd5;" k="41" />
-<hkern u1="Y" u2="&#xd4;" k="41" />
-<hkern u1="Y" u2="&#xd3;" k="41" />
-<hkern u1="Y" u2="&#xd2;" k="41" />
-<hkern u1="Y" u2="&#xc7;" k="41" />
-<hkern u1="Y" u2="&#xc5;" k="123" />
-<hkern u1="Y" u2="&#xc4;" k="123" />
-<hkern u1="Y" u2="&#xc3;" k="123" />
-<hkern u1="Y" u2="&#xc2;" k="123" />
-<hkern u1="Y" u2="&#xc1;" k="123" />
-<hkern u1="Y" u2="&#xc0;" k="123" />
-<hkern u1="Y" u2="z" k="41" />
-<hkern u1="Y" u2="u" k="61" />
-<hkern u1="Y" u2="s" k="82" />
-<hkern u1="Y" u2="r" k="61" />
-<hkern u1="Y" u2="q" k="102" />
-<hkern u1="Y" u2="p" k="61" />
-<hkern u1="Y" u2="o" k="102" />
-<hkern u1="Y" u2="n" k="61" />
-<hkern u1="Y" u2="m" k="61" />
-<hkern u1="Y" u2="g" k="41" />
-<hkern u1="Y" u2="e" k="102" />
-<hkern u1="Y" u2="d" k="102" />
-<hkern u1="Y" u2="c" k="102" />
-<hkern u1="Y" u2="a" k="102" />
-<hkern u1="Y" u2="Q" k="41" />
-<hkern u1="Y" u2="O" k="41" />
-<hkern u1="Y" u2="G" k="41" />
-<hkern u1="Y" u2="C" k="41" />
-<hkern u1="Y" u2="A" k="123" />
-<hkern u1="Y" u2="&#x3f;" k="-41" />
-<hkern u1="Y" u2="&#x2e;" k="123" />
-<hkern u1="Y" u2="&#x2c;" k="123" />
-<hkern u1="Z" u2="&#x1ee2;" k="20" />
-<hkern u1="Z" u2="&#x1ee0;" k="20" />
-<hkern u1="Z" u2="&#x1ede;" k="20" />
-<hkern u1="Z" u2="&#x1edc;" k="20" />
-<hkern u1="Z" u2="&#x1eda;" k="20" />
-<hkern u1="Z" u2="&#x1ed8;" k="20" />
-<hkern u1="Z" u2="&#x1ed6;" k="20" />
-<hkern u1="Z" u2="&#x1ed4;" k="20" />
-<hkern u1="Z" u2="&#x1ed2;" k="20" />
-<hkern u1="Z" u2="&#x1ed0;" k="20" />
-<hkern u1="Z" u2="&#x1ece;" k="20" />
-<hkern u1="Z" u2="&#x1ecc;" k="20" />
-<hkern u1="Z" u2="&#x1fe;" k="20" />
-<hkern u1="Z" u2="&#x1a0;" k="20" />
-<hkern u1="Z" u2="&#x152;" k="20" />
-<hkern u1="Z" u2="&#x150;" k="20" />
-<hkern u1="Z" u2="&#x14e;" k="20" />
-<hkern u1="Z" u2="&#x14c;" k="20" />
-<hkern u1="Z" u2="&#x122;" k="20" />
-<hkern u1="Z" u2="&#x120;" k="20" />
-<hkern u1="Z" u2="&#x11e;" k="20" />
-<hkern u1="Z" u2="&#x11c;" k="20" />
-<hkern u1="Z" u2="&#x10c;" k="20" />
-<hkern u1="Z" u2="&#x10a;" k="20" />
-<hkern u1="Z" u2="&#x108;" k="20" />
-<hkern u1="Z" u2="&#x106;" k="20" />
-<hkern u1="Z" u2="&#xd8;" k="20" />
-<hkern u1="Z" u2="&#xd6;" k="20" />
-<hkern u1="Z" u2="&#xd5;" k="20" />
-<hkern u1="Z" u2="&#xd4;" k="20" />
-<hkern u1="Z" u2="&#xd3;" k="20" />
-<hkern u1="Z" u2="&#xd2;" k="20" />
-<hkern u1="Z" u2="&#xc7;" k="20" />
-<hkern u1="Z" u2="Q" k="20" />
-<hkern u1="Z" u2="O" k="20" />
-<hkern u1="Z" u2="G" k="20" />
-<hkern u1="Z" u2="C" k="20" />
-<hkern u1="[" u2="J" k="-184" />
-<hkern u1="a" u2="&#x201d;" k="20" />
-<hkern u1="a" u2="&#x2019;" k="20" />
-<hkern u1="a" u2="&#x27;" k="20" />
-<hkern u1="a" u2="&#x22;" k="20" />
-<hkern u1="b" u2="&#x201d;" k="20" />
-<hkern u1="b" u2="&#x2019;" k="20" />
-<hkern u1="b" u2="&#x1ef5;" k="41" />
-<hkern u1="b" u2="&#x1e83;" k="41" />
-<hkern u1="b" u2="&#x1e81;" k="41" />
-<hkern u1="b" u2="&#x17e;" k="20" />
-<hkern u1="b" u2="&#x17c;" k="20" />
-<hkern u1="b" u2="&#x17a;" k="20" />
-<hkern u1="b" u2="&#x175;" k="41" />
-<hkern u1="b" u2="&#xfd;" k="41" />
-<hkern u1="b" u2="z" k="20" />
-<hkern u1="b" u2="y" k="41" />
-<hkern u1="b" u2="x" k="41" />
-<hkern u1="b" u2="w" k="41" />
-<hkern u1="b" u2="v" k="41" />
-<hkern u1="b" u2="&#x27;" k="20" />
-<hkern u1="b" u2="&#x22;" k="20" />
-<hkern u1="c" u2="&#x201d;" k="-41" />
-<hkern u1="c" u2="&#x2019;" k="-41" />
-<hkern u1="c" u2="&#x27;" k="-41" />
-<hkern u1="c" u2="&#x22;" k="-41" />
-<hkern u1="e" u2="&#x201d;" k="20" />
-<hkern u1="e" u2="&#x2019;" k="20" />
-<hkern u1="e" u2="&#x1ef5;" k="41" />
-<hkern u1="e" u2="&#x1e83;" k="41" />
-<hkern u1="e" u2="&#x1e81;" k="41" />
-<hkern u1="e" u2="&#x17e;" k="20" />
-<hkern u1="e" u2="&#x17c;" k="20" />
-<hkern u1="e" u2="&#x17a;" k="20" />
-<hkern u1="e" u2="&#x175;" k="41" />
-<hkern u1="e" u2="&#xfd;" k="41" />
-<hkern u1="e" u2="z" k="20" />
-<hkern u1="e" u2="y" k="41" />
-<hkern u1="e" u2="x" k="41" />
-<hkern u1="e" u2="w" k="41" />
-<hkern u1="e" u2="v" k="41" />
-<hkern u1="e" u2="&#x27;" k="20" />
-<hkern u1="e" u2="&#x22;" k="20" />
-<hkern u1="f" u2="&#x201d;" k="-123" />
-<hkern u1="f" u2="&#x2019;" k="-123" />
-<hkern u1="f" u2="&#x27;" k="-123" />
-<hkern u1="f" u2="&#x22;" k="-123" />
-<hkern u1="h" u2="&#x201d;" k="20" />
-<hkern u1="h" u2="&#x2019;" k="20" />
-<hkern u1="h" u2="&#x27;" k="20" />
-<hkern u1="h" u2="&#x22;" k="20" />
-<hkern u1="k" u2="&#x1ee3;" k="41" />
-<hkern u1="k" u2="&#x1ee1;" k="41" />
-<hkern u1="k" u2="&#x1edf;" k="41" />
-<hkern u1="k" u2="&#x1edd;" k="41" />
-<hkern u1="k" u2="&#x1edb;" k="41" />
-<hkern u1="k" u2="&#x1ed9;" k="41" />
-<hkern u1="k" u2="&#x1ed7;" k="41" />
-<hkern u1="k" u2="&#x1ed5;" k="41" />
-<hkern u1="k" u2="&#x1ed1;" k="41" />
-<hkern u1="k" u2="&#x1ecf;" k="41" />
-<hkern u1="k" u2="&#x1ecd;" k="41" />
-<hkern u1="k" u2="&#x1ec7;" k="41" />
-<hkern u1="k" u2="&#x1ec5;" k="41" />
-<hkern u1="k" u2="&#x1ec3;" k="41" />
-<hkern u1="k" u2="&#x1ebf;" k="41" />
-<hkern u1="k" u2="&#x1ebd;" k="41" />
-<hkern u1="k" u2="&#x1ebb;" k="41" />
-<hkern u1="k" u2="&#x1eb9;" k="41" />
-<hkern u1="k" u2="&#x1ff;" k="41" />
-<hkern u1="k" u2="&#x1a1;" k="41" />
-<hkern u1="k" u2="&#x153;" k="41" />
-<hkern u1="k" u2="&#x151;" k="41" />
-<hkern u1="k" u2="&#x14f;" k="41" />
-<hkern u1="k" u2="&#x14d;" k="41" />
-<hkern u1="k" u2="&#x11b;" k="41" />
-<hkern u1="k" u2="&#x119;" k="41" />
-<hkern u1="k" u2="&#x117;" k="41" />
-<hkern u1="k" u2="&#x115;" k="41" />
-<hkern u1="k" u2="&#x113;" k="41" />
-<hkern u1="k" u2="&#x111;" k="41" />
-<hkern u1="k" u2="&#x10f;" k="41" />
-<hkern u1="k" u2="&#x10d;" k="41" />
-<hkern u1="k" u2="&#x10b;" k="41" />
-<hkern u1="k" u2="&#x109;" k="41" />
-<hkern u1="k" u2="&#x107;" k="41" />
-<hkern u1="k" u2="&#xf8;" k="41" />
-<hkern u1="k" u2="&#xf6;" k="41" />
-<hkern u1="k" u2="&#xf5;" k="41" />
-<hkern u1="k" u2="&#xf4;" k="41" />
-<hkern u1="k" u2="&#xf3;" k="41" />
-<hkern u1="k" u2="&#xf2;" k="41" />
-<hkern u1="k" u2="&#xeb;" k="41" />
-<hkern u1="k" u2="&#xea;" k="41" />
-<hkern u1="k" u2="&#xe9;" k="41" />
-<hkern u1="k" u2="&#xe8;" k="41" />
-<hkern u1="k" u2="&#xe7;" k="41" />
-<hkern u1="k" u2="&#xe0;" k="41" />
-<hkern u1="k" u2="q" k="41" />
-<hkern u1="k" u2="o" k="41" />
-<hkern u1="k" u2="e" k="41" />
-<hkern u1="k" u2="d" k="41" />
-<hkern u1="k" u2="c" k="41" />
-<hkern u1="m" u2="&#x201d;" k="20" />
-<hkern u1="m" u2="&#x2019;" k="20" />
-<hkern u1="m" u2="&#x27;" k="20" />
-<hkern u1="m" u2="&#x22;" k="20" />
-<hkern u1="n" u2="&#x201d;" k="20" />
-<hkern u1="n" u2="&#x2019;" k="20" />
-<hkern u1="n" u2="&#x27;" k="20" />
-<hkern u1="n" u2="&#x22;" k="20" />
-<hkern u1="o" u2="&#x201d;" k="20" />
-<hkern u1="o" u2="&#x2019;" k="20" />
-<hkern u1="o" u2="&#x1ef5;" k="41" />
-<hkern u1="o" u2="&#x1e83;" k="41" />
-<hkern u1="o" u2="&#x1e81;" k="41" />
-<hkern u1="o" u2="&#x17e;" k="20" />
-<hkern u1="o" u2="&#x17c;" k="20" />
-<hkern u1="o" u2="&#x17a;" k="20" />
-<hkern u1="o" u2="&#x175;" k="41" />
-<hkern u1="o" u2="&#xfd;" k="41" />
-<hkern u1="o" u2="z" k="20" />
-<hkern u1="o" u2="y" k="41" />
-<hkern u1="o" u2="x" k="41" />
-<hkern u1="o" u2="w" k="41" />
-<hkern u1="o" u2="v" k="41" />
-<hkern u1="o" u2="&#x27;" k="20" />
-<hkern u1="o" u2="&#x22;" k="20" />
-<hkern u1="p" u2="&#x201d;" k="20" />
-<hkern u1="p" u2="&#x2019;" k="20" />
-<hkern u1="p" u2="&#x1ef5;" k="41" />
-<hkern u1="p" u2="&#x1e83;" k="41" />
-<hkern u1="p" u2="&#x1e81;" k="41" />
-<hkern u1="p" u2="&#x17e;" k="20" />
-<hkern u1="p" u2="&#x17c;" k="20" />
-<hkern u1="p" u2="&#x17a;" k="20" />
-<hkern u1="p" u2="&#x175;" k="41" />
-<hkern u1="p" u2="&#xfd;" k="41" />
-<hkern u1="p" u2="z" k="20" />
-<hkern u1="p" u2="y" k="41" />
-<hkern u1="p" u2="x" k="41" />
-<hkern u1="p" u2="w" k="41" />
-<hkern u1="p" u2="v" k="41" />
-<hkern u1="p" u2="&#x27;" k="20" />
-<hkern u1="p" u2="&#x22;" k="20" />
-<hkern u1="r" u2="&#x201d;" k="-82" />
-<hkern u1="r" u2="&#x2019;" k="-82" />
-<hkern u1="r" u2="&#x1ee3;" k="41" />
-<hkern u1="r" u2="&#x1ee1;" k="41" />
-<hkern u1="r" u2="&#x1edf;" k="41" />
-<hkern u1="r" u2="&#x1edd;" k="41" />
-<hkern u1="r" u2="&#x1edb;" k="41" />
-<hkern u1="r" u2="&#x1ed9;" k="41" />
-<hkern u1="r" u2="&#x1ed7;" k="41" />
-<hkern u1="r" u2="&#x1ed5;" k="41" />
-<hkern u1="r" u2="&#x1ed1;" k="41" />
-<hkern u1="r" u2="&#x1ecf;" k="41" />
-<hkern u1="r" u2="&#x1ecd;" k="41" />
-<hkern u1="r" u2="&#x1ec7;" k="41" />
-<hkern u1="r" u2="&#x1ec5;" k="41" />
-<hkern u1="r" u2="&#x1ec3;" k="41" />
-<hkern u1="r" u2="&#x1ebf;" k="41" />
-<hkern u1="r" u2="&#x1ebd;" k="41" />
-<hkern u1="r" u2="&#x1ebb;" k="41" />
-<hkern u1="r" u2="&#x1eb9;" k="41" />
-<hkern u1="r" u2="&#x1eb7;" k="41" />
-<hkern u1="r" u2="&#x1eb5;" k="41" />
-<hkern u1="r" u2="&#x1eb3;" k="41" />
-<hkern u1="r" u2="&#x1eb1;" k="41" />
-<hkern u1="r" u2="&#x1eaf;" k="41" />
-<hkern u1="r" u2="&#x1ead;" k="41" />
-<hkern u1="r" u2="&#x1eab;" k="41" />
-<hkern u1="r" u2="&#x1ea9;" k="41" />
-<hkern u1="r" u2="&#x1ea5;" k="41" />
-<hkern u1="r" u2="&#x1ea3;" k="41" />
-<hkern u1="r" u2="&#x1ea1;" k="41" />
-<hkern u1="r" u2="&#x1e01;" k="41" />
-<hkern u1="r" u2="&#x1ff;" k="41" />
-<hkern u1="r" u2="&#x1fd;" k="41" />
-<hkern u1="r" u2="&#x1fb;" k="41" />
-<hkern u1="r" u2="&#x1a1;" k="41" />
-<hkern u1="r" u2="&#x153;" k="41" />
-<hkern u1="r" u2="&#x151;" k="41" />
-<hkern u1="r" u2="&#x14f;" k="41" />
-<hkern u1="r" u2="&#x14d;" k="41" />
-<hkern u1="r" u2="&#x123;" k="20" />
-<hkern u1="r" u2="&#x121;" k="20" />
-<hkern u1="r" u2="&#x11f;" k="20" />
-<hkern u1="r" u2="&#x11d;" k="20" />
-<hkern u1="r" u2="&#x11b;" k="41" />
-<hkern u1="r" u2="&#x119;" k="41" />
-<hkern u1="r" u2="&#x117;" k="41" />
-<hkern u1="r" u2="&#x115;" k="41" />
-<hkern u1="r" u2="&#x113;" k="41" />
-<hkern u1="r" u2="&#x111;" k="41" />
-<hkern u1="r" u2="&#x10f;" k="41" />
-<hkern u1="r" u2="&#x10d;" k="41" />
-<hkern u1="r" u2="&#x10b;" k="41" />
-<hkern u1="r" u2="&#x109;" k="41" />
-<hkern u1="r" u2="&#x107;" k="41" />
-<hkern u1="r" u2="&#x105;" k="41" />
-<hkern u1="r" u2="&#x103;" k="41" />
-<hkern u1="r" u2="&#x101;" k="41" />
-<hkern u1="r" u2="&#xf8;" k="41" />
-<hkern u1="r" u2="&#xf6;" k="41" />
-<hkern u1="r" u2="&#xf5;" k="41" />
-<hkern u1="r" u2="&#xf4;" k="41" />
-<hkern u1="r" u2="&#xf3;" k="41" />
-<hkern u1="r" u2="&#xf2;" k="41" />
-<hkern u1="r" u2="&#xeb;" k="41" />
-<hkern u1="r" u2="&#xea;" k="41" />
-<hkern u1="r" u2="&#xe9;" k="41" />
-<hkern u1="r" u2="&#xe8;" k="41" />
-<hkern u1="r" u2="&#xe7;" k="41" />
-<hkern u1="r" u2="&#xe6;" k="41" />
-<hkern u1="r" u2="&#xe5;" k="41" />
-<hkern u1="r" u2="&#xe4;" k="41" />
-<hkern u1="r" u2="&#xe3;" k="41" />
-<hkern u1="r" u2="&#xe2;" k="41" />
-<hkern u1="r" u2="&#xe1;" k="41" />
-<hkern u1="r" u2="&#xe0;" k="41" />
-<hkern u1="r" u2="q" k="41" />
-<hkern u1="r" u2="o" k="41" />
-<hkern u1="r" u2="g" k="20" />
-<hkern u1="r" u2="e" k="41" />
-<hkern u1="r" u2="d" k="41" />
-<hkern u1="r" u2="c" k="41" />
-<hkern u1="r" u2="a" k="41" />
-<hkern u1="r" u2="&#x27;" k="-82" />
-<hkern u1="r" u2="&#x22;" k="-82" />
-<hkern u1="t" u2="&#x201d;" k="-41" />
-<hkern u1="t" u2="&#x2019;" k="-41" />
-<hkern u1="t" u2="&#x27;" k="-41" />
-<hkern u1="t" u2="&#x22;" k="-41" />
-<hkern u1="v" u2="&#x201e;" k="82" />
-<hkern u1="v" u2="&#x201d;" k="-82" />
-<hkern u1="v" u2="&#x201a;" k="82" />
-<hkern u1="v" u2="&#x2019;" k="-82" />
-<hkern u1="v" u2="&#x3f;" k="-41" />
-<hkern u1="v" u2="&#x2e;" k="82" />
-<hkern u1="v" u2="&#x2c;" k="82" />
-<hkern u1="v" u2="&#x27;" k="-82" />
-<hkern u1="v" u2="&#x22;" k="-82" />
-<hkern u1="w" u2="&#x201e;" k="82" />
-<hkern u1="w" u2="&#x201d;" k="-82" />
-<hkern u1="w" u2="&#x201a;" k="82" />
-<hkern u1="w" u2="&#x2019;" k="-82" />
-<hkern u1="w" u2="&#x3f;" k="-41" />
-<hkern u1="w" u2="&#x2e;" k="82" />
-<hkern u1="w" u2="&#x2c;" k="82" />
-<hkern u1="w" u2="&#x27;" k="-82" />
-<hkern u1="w" u2="&#x22;" k="-82" />
-<hkern u1="x" u2="&#x1ee3;" k="41" />
-<hkern u1="x" u2="&#x1ee1;" k="41" />
-<hkern u1="x" u2="&#x1edf;" k="41" />
-<hkern u1="x" u2="&#x1edd;" k="41" />
-<hkern u1="x" u2="&#x1edb;" k="41" />
-<hkern u1="x" u2="&#x1ed9;" k="41" />
-<hkern u1="x" u2="&#x1ed7;" k="41" />
-<hkern u1="x" u2="&#x1ed5;" k="41" />
-<hkern u1="x" u2="&#x1ed1;" k="41" />
-<hkern u1="x" u2="&#x1ecf;" k="41" />
-<hkern u1="x" u2="&#x1ecd;" k="41" />
-<hkern u1="x" u2="&#x1ec7;" k="41" />
-<hkern u1="x" u2="&#x1ec5;" k="41" />
-<hkern u1="x" u2="&#x1ec3;" k="41" />
-<hkern u1="x" u2="&#x1ebf;" k="41" />
-<hkern u1="x" u2="&#x1ebd;" k="41" />
-<hkern u1="x" u2="&#x1ebb;" k="41" />
-<hkern u1="x" u2="&#x1eb9;" k="41" />
-<hkern u1="x" u2="&#x1ff;" k="41" />
-<hkern u1="x" u2="&#x1a1;" k="41" />
-<hkern u1="x" u2="&#x153;" k="41" />
-<hkern u1="x" u2="&#x151;" k="41" />
-<hkern u1="x" u2="&#x14f;" k="41" />
-<hkern u1="x" u2="&#x14d;" k="41" />
-<hkern u1="x" u2="&#x11b;" k="41" />
-<hkern u1="x" u2="&#x119;" k="41" />
-<hkern u1="x" u2="&#x117;" k="41" />
-<hkern u1="x" u2="&#x115;" k="41" />
-<hkern u1="x" u2="&#x113;" k="41" />
-<hkern u1="x" u2="&#x111;" k="41" />
-<hkern u1="x" u2="&#x10f;" k="41" />
-<hkern u1="x" u2="&#x10d;" k="41" />
-<hkern u1="x" u2="&#x10b;" k="41" />
-<hkern u1="x" u2="&#x109;" k="41" />
-<hkern u1="x" u2="&#x107;" k="41" />
-<hkern u1="x" u2="&#xf8;" k="41" />
-<hkern u1="x" u2="&#xf6;" k="41" />
-<hkern u1="x" u2="&#xf5;" k="41" />
-<hkern u1="x" u2="&#xf4;" k="41" />
-<hkern u1="x" u2="&#xf3;" k="41" />
-<hkern u1="x" u2="&#xf2;" k="41" />
-<hkern u1="x" u2="&#xeb;" k="41" />
-<hkern u1="x" u2="&#xea;" k="41" />
-<hkern u1="x" u2="&#xe9;" k="41" />
-<hkern u1="x" u2="&#xe8;" k="41" />
-<hkern u1="x" u2="&#xe7;" k="41" />
-<hkern u1="x" u2="&#xe0;" k="41" />
-<hkern u1="x" u2="q" k="41" />
-<hkern u1="x" u2="o" k="41" />
-<hkern u1="x" u2="e" k="41" />
-<hkern u1="x" u2="d" k="41" />
-<hkern u1="x" u2="c" k="41" />
-<hkern u1="y" u2="&#x201e;" k="82" />
-<hkern u1="y" u2="&#x201d;" k="-82" />
-<hkern u1="y" u2="&#x201a;" k="82" />
-<hkern u1="y" u2="&#x2019;" k="-82" />
-<hkern u1="y" u2="&#x3f;" k="-41" />
-<hkern u1="y" u2="&#x2e;" k="82" />
-<hkern u1="y" u2="&#x2c;" k="82" />
-<hkern u1="y" u2="&#x27;" k="-82" />
-<hkern u1="y" u2="&#x22;" k="-82" />
-<hkern u1="&#x7b;" u2="J" k="-184" />
-<hkern u1="&#xc0;" u2="&#x201d;" k="143" />
-<hkern u1="&#xc0;" u2="&#x2019;" k="143" />
-<hkern u1="&#xc0;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#xc0;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#xc0;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#xc0;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#xc0;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#xc0;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#xc0;" u2="&#x1ede;" k="41" />
-<hkern u1="&#xc0;" u2="&#x1edc;" k="41" />
-<hkern u1="&#xc0;" u2="&#x1eda;" k="41" />
-<hkern u1="&#xc0;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#xc0;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#xc0;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#xc0;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#xc0;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#xc0;" u2="&#x1ece;" k="41" />
-<hkern u1="&#xc0;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#xc0;" u2="&#x1e84;" k="82" />
-<hkern u1="&#xc0;" u2="&#x1e82;" k="82" />
-<hkern u1="&#xc0;" u2="&#x1e80;" k="82" />
-<hkern u1="&#xc0;" u2="&#x21a;" k="143" />
-<hkern u1="&#xc0;" u2="&#x1fe;" k="41" />
-<hkern u1="&#xc0;" u2="&#x1a0;" k="41" />
-<hkern u1="&#xc0;" u2="&#x178;" k="123" />
-<hkern u1="&#xc0;" u2="&#x176;" k="123" />
-<hkern u1="&#xc0;" u2="&#x174;" k="82" />
-<hkern u1="&#xc0;" u2="&#x164;" k="143" />
-<hkern u1="&#xc0;" u2="&#x162;" k="143" />
-<hkern u1="&#xc0;" u2="&#x152;" k="41" />
-<hkern u1="&#xc0;" u2="&#x150;" k="41" />
-<hkern u1="&#xc0;" u2="&#x14e;" k="41" />
-<hkern u1="&#xc0;" u2="&#x14c;" k="41" />
-<hkern u1="&#xc0;" u2="&#x122;" k="41" />
-<hkern u1="&#xc0;" u2="&#x120;" k="41" />
-<hkern u1="&#xc0;" u2="&#x11e;" k="41" />
-<hkern u1="&#xc0;" u2="&#x11c;" k="41" />
-<hkern u1="&#xc0;" u2="&#x10c;" k="41" />
-<hkern u1="&#xc0;" u2="&#x10a;" k="41" />
-<hkern u1="&#xc0;" u2="&#x108;" k="41" />
-<hkern u1="&#xc0;" u2="&#x106;" k="41" />
-<hkern u1="&#xc0;" u2="&#xdd;" k="123" />
-<hkern u1="&#xc0;" u2="&#xd8;" k="41" />
-<hkern u1="&#xc0;" u2="&#xd6;" k="41" />
-<hkern u1="&#xc0;" u2="&#xd5;" k="41" />
-<hkern u1="&#xc0;" u2="&#xd4;" k="41" />
-<hkern u1="&#xc0;" u2="&#xd3;" k="41" />
-<hkern u1="&#xc0;" u2="&#xd2;" k="41" />
-<hkern u1="&#xc0;" u2="&#xc7;" k="41" />
-<hkern u1="&#xc0;" u2="Y" k="123" />
-<hkern u1="&#xc0;" u2="W" k="82" />
-<hkern u1="&#xc0;" u2="V" k="82" />
-<hkern u1="&#xc0;" u2="T" k="143" />
-<hkern u1="&#xc0;" u2="Q" k="41" />
-<hkern u1="&#xc0;" u2="O" k="41" />
-<hkern u1="&#xc0;" u2="J" k="-266" />
-<hkern u1="&#xc0;" u2="G" k="41" />
-<hkern u1="&#xc0;" u2="C" k="41" />
-<hkern u1="&#xc0;" u2="&#x27;" k="143" />
-<hkern u1="&#xc0;" u2="&#x22;" k="143" />
-<hkern u1="&#xc1;" u2="&#x201d;" k="143" />
-<hkern u1="&#xc1;" u2="&#x2019;" k="143" />
-<hkern u1="&#xc1;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#xc1;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#xc1;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#xc1;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#xc1;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#xc1;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#xc1;" u2="&#x1ede;" k="41" />
-<hkern u1="&#xc1;" u2="&#x1edc;" k="41" />
-<hkern u1="&#xc1;" u2="&#x1eda;" k="41" />
-<hkern u1="&#xc1;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#xc1;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#xc1;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#xc1;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#xc1;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#xc1;" u2="&#x1ece;" k="41" />
-<hkern u1="&#xc1;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#xc1;" u2="&#x1e84;" k="82" />
-<hkern u1="&#xc1;" u2="&#x1e82;" k="82" />
-<hkern u1="&#xc1;" u2="&#x1e80;" k="82" />
-<hkern u1="&#xc1;" u2="&#x21a;" k="143" />
-<hkern u1="&#xc1;" u2="&#x1fe;" k="41" />
-<hkern u1="&#xc1;" u2="&#x1a0;" k="41" />
-<hkern u1="&#xc1;" u2="&#x178;" k="123" />
-<hkern u1="&#xc1;" u2="&#x176;" k="123" />
-<hkern u1="&#xc1;" u2="&#x174;" k="82" />
-<hkern u1="&#xc1;" u2="&#x164;" k="143" />
-<hkern u1="&#xc1;" u2="&#x162;" k="143" />
-<hkern u1="&#xc1;" u2="&#x152;" k="41" />
-<hkern u1="&#xc1;" u2="&#x150;" k="41" />
-<hkern u1="&#xc1;" u2="&#x14e;" k="41" />
-<hkern u1="&#xc1;" u2="&#x14c;" k="41" />
-<hkern u1="&#xc1;" u2="&#x122;" k="41" />
-<hkern u1="&#xc1;" u2="&#x120;" k="41" />
-<hkern u1="&#xc1;" u2="&#x11e;" k="41" />
-<hkern u1="&#xc1;" u2="&#x11c;" k="41" />
-<hkern u1="&#xc1;" u2="&#x10c;" k="41" />
-<hkern u1="&#xc1;" u2="&#x10a;" k="41" />
-<hkern u1="&#xc1;" u2="&#x108;" k="41" />
-<hkern u1="&#xc1;" u2="&#x106;" k="41" />
-<hkern u1="&#xc1;" u2="&#xdd;" k="123" />
-<hkern u1="&#xc1;" u2="&#xd8;" k="41" />
-<hkern u1="&#xc1;" u2="&#xd6;" k="41" />
-<hkern u1="&#xc1;" u2="&#xd5;" k="41" />
-<hkern u1="&#xc1;" u2="&#xd4;" k="41" />
-<hkern u1="&#xc1;" u2="&#xd3;" k="41" />
-<hkern u1="&#xc1;" u2="&#xd2;" k="41" />
-<hkern u1="&#xc1;" u2="&#xc7;" k="41" />
-<hkern u1="&#xc1;" u2="Y" k="123" />
-<hkern u1="&#xc1;" u2="W" k="82" />
-<hkern u1="&#xc1;" u2="V" k="82" />
-<hkern u1="&#xc1;" u2="T" k="143" />
-<hkern u1="&#xc1;" u2="Q" k="41" />
-<hkern u1="&#xc1;" u2="O" k="41" />
-<hkern u1="&#xc1;" u2="J" k="-266" />
-<hkern u1="&#xc1;" u2="G" k="41" />
-<hkern u1="&#xc1;" u2="C" k="41" />
-<hkern u1="&#xc1;" u2="&#x27;" k="143" />
-<hkern u1="&#xc1;" u2="&#x22;" k="143" />
-<hkern u1="&#xc2;" u2="&#x201d;" k="143" />
-<hkern u1="&#xc2;" u2="&#x2019;" k="143" />
-<hkern u1="&#xc2;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#xc2;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#xc2;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#xc2;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#xc2;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#xc2;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#xc2;" u2="&#x1ede;" k="41" />
-<hkern u1="&#xc2;" u2="&#x1edc;" k="41" />
-<hkern u1="&#xc2;" u2="&#x1eda;" k="41" />
-<hkern u1="&#xc2;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#xc2;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#xc2;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#xc2;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#xc2;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#xc2;" u2="&#x1ece;" k="41" />
-<hkern u1="&#xc2;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#xc2;" u2="&#x1e84;" k="82" />
-<hkern u1="&#xc2;" u2="&#x1e82;" k="82" />
-<hkern u1="&#xc2;" u2="&#x1e80;" k="82" />
-<hkern u1="&#xc2;" u2="&#x21a;" k="143" />
-<hkern u1="&#xc2;" u2="&#x1fe;" k="41" />
-<hkern u1="&#xc2;" u2="&#x1a0;" k="41" />
-<hkern u1="&#xc2;" u2="&#x178;" k="123" />
-<hkern u1="&#xc2;" u2="&#x176;" k="123" />
-<hkern u1="&#xc2;" u2="&#x174;" k="82" />
-<hkern u1="&#xc2;" u2="&#x164;" k="143" />
-<hkern u1="&#xc2;" u2="&#x162;" k="143" />
-<hkern u1="&#xc2;" u2="&#x152;" k="41" />
-<hkern u1="&#xc2;" u2="&#x150;" k="41" />
-<hkern u1="&#xc2;" u2="&#x14e;" k="41" />
-<hkern u1="&#xc2;" u2="&#x14c;" k="41" />
-<hkern u1="&#xc2;" u2="&#x122;" k="41" />
-<hkern u1="&#xc2;" u2="&#x120;" k="41" />
-<hkern u1="&#xc2;" u2="&#x11e;" k="41" />
-<hkern u1="&#xc2;" u2="&#x11c;" k="41" />
-<hkern u1="&#xc2;" u2="&#x10c;" k="41" />
-<hkern u1="&#xc2;" u2="&#x10a;" k="41" />
-<hkern u1="&#xc2;" u2="&#x108;" k="41" />
-<hkern u1="&#xc2;" u2="&#x106;" k="41" />
-<hkern u1="&#xc2;" u2="&#xdd;" k="123" />
-<hkern u1="&#xc2;" u2="&#xd8;" k="41" />
-<hkern u1="&#xc2;" u2="&#xd6;" k="41" />
-<hkern u1="&#xc2;" u2="&#xd5;" k="41" />
-<hkern u1="&#xc2;" u2="&#xd4;" k="41" />
-<hkern u1="&#xc2;" u2="&#xd3;" k="41" />
-<hkern u1="&#xc2;" u2="&#xd2;" k="41" />
-<hkern u1="&#xc2;" u2="&#xc7;" k="41" />
-<hkern u1="&#xc2;" u2="Y" k="123" />
-<hkern u1="&#xc2;" u2="W" k="82" />
-<hkern u1="&#xc2;" u2="V" k="82" />
-<hkern u1="&#xc2;" u2="T" k="143" />
-<hkern u1="&#xc2;" u2="Q" k="41" />
-<hkern u1="&#xc2;" u2="O" k="41" />
-<hkern u1="&#xc2;" u2="J" k="-266" />
-<hkern u1="&#xc2;" u2="G" k="41" />
-<hkern u1="&#xc2;" u2="C" k="41" />
-<hkern u1="&#xc2;" u2="&#x27;" k="143" />
-<hkern u1="&#xc2;" u2="&#x22;" k="143" />
-<hkern u1="&#xc3;" u2="&#x201d;" k="143" />
-<hkern u1="&#xc3;" u2="&#x2019;" k="143" />
-<hkern u1="&#xc3;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#xc3;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#xc3;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#xc3;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#xc3;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#xc3;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#xc3;" u2="&#x1ede;" k="41" />
-<hkern u1="&#xc3;" u2="&#x1edc;" k="41" />
-<hkern u1="&#xc3;" u2="&#x1eda;" k="41" />
-<hkern u1="&#xc3;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#xc3;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#xc3;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#xc3;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#xc3;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#xc3;" u2="&#x1ece;" k="41" />
-<hkern u1="&#xc3;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#xc3;" u2="&#x1e84;" k="82" />
-<hkern u1="&#xc3;" u2="&#x1e82;" k="82" />
-<hkern u1="&#xc3;" u2="&#x1e80;" k="82" />
-<hkern u1="&#xc3;" u2="&#x21a;" k="143" />
-<hkern u1="&#xc3;" u2="&#x1fe;" k="41" />
-<hkern u1="&#xc3;" u2="&#x1a0;" k="41" />
-<hkern u1="&#xc3;" u2="&#x178;" k="123" />
-<hkern u1="&#xc3;" u2="&#x176;" k="123" />
-<hkern u1="&#xc3;" u2="&#x174;" k="82" />
-<hkern u1="&#xc3;" u2="&#x164;" k="143" />
-<hkern u1="&#xc3;" u2="&#x162;" k="143" />
-<hkern u1="&#xc3;" u2="&#x152;" k="41" />
-<hkern u1="&#xc3;" u2="&#x150;" k="41" />
-<hkern u1="&#xc3;" u2="&#x14e;" k="41" />
-<hkern u1="&#xc3;" u2="&#x14c;" k="41" />
-<hkern u1="&#xc3;" u2="&#x122;" k="41" />
-<hkern u1="&#xc3;" u2="&#x120;" k="41" />
-<hkern u1="&#xc3;" u2="&#x11e;" k="41" />
-<hkern u1="&#xc3;" u2="&#x11c;" k="41" />
-<hkern u1="&#xc3;" u2="&#x10c;" k="41" />
-<hkern u1="&#xc3;" u2="&#x10a;" k="41" />
-<hkern u1="&#xc3;" u2="&#x108;" k="41" />
-<hkern u1="&#xc3;" u2="&#x106;" k="41" />
-<hkern u1="&#xc3;" u2="&#xdd;" k="123" />
-<hkern u1="&#xc3;" u2="&#xd8;" k="41" />
-<hkern u1="&#xc3;" u2="&#xd6;" k="41" />
-<hkern u1="&#xc3;" u2="&#xd5;" k="41" />
-<hkern u1="&#xc3;" u2="&#xd4;" k="41" />
-<hkern u1="&#xc3;" u2="&#xd3;" k="41" />
-<hkern u1="&#xc3;" u2="&#xd2;" k="41" />
-<hkern u1="&#xc3;" u2="&#xc7;" k="41" />
-<hkern u1="&#xc3;" u2="Y" k="123" />
-<hkern u1="&#xc3;" u2="W" k="82" />
-<hkern u1="&#xc3;" u2="V" k="82" />
-<hkern u1="&#xc3;" u2="T" k="143" />
-<hkern u1="&#xc3;" u2="Q" k="41" />
-<hkern u1="&#xc3;" u2="O" k="41" />
-<hkern u1="&#xc3;" u2="J" k="-266" />
-<hkern u1="&#xc3;" u2="G" k="41" />
-<hkern u1="&#xc3;" u2="C" k="41" />
-<hkern u1="&#xc3;" u2="&#x27;" k="143" />
-<hkern u1="&#xc3;" u2="&#x22;" k="143" />
-<hkern u1="&#xc4;" u2="&#x201d;" k="143" />
-<hkern u1="&#xc4;" u2="&#x2019;" k="143" />
-<hkern u1="&#xc4;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#xc4;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#xc4;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#xc4;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#xc4;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#xc4;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#xc4;" u2="&#x1ede;" k="41" />
-<hkern u1="&#xc4;" u2="&#x1edc;" k="41" />
-<hkern u1="&#xc4;" u2="&#x1eda;" k="41" />
-<hkern u1="&#xc4;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#xc4;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#xc4;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#xc4;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#xc4;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#xc4;" u2="&#x1ece;" k="41" />
-<hkern u1="&#xc4;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#xc4;" u2="&#x1e84;" k="82" />
-<hkern u1="&#xc4;" u2="&#x1e82;" k="82" />
-<hkern u1="&#xc4;" u2="&#x1e80;" k="82" />
-<hkern u1="&#xc4;" u2="&#x21a;" k="143" />
-<hkern u1="&#xc4;" u2="&#x1fe;" k="41" />
-<hkern u1="&#xc4;" u2="&#x1a0;" k="41" />
-<hkern u1="&#xc4;" u2="&#x178;" k="123" />
-<hkern u1="&#xc4;" u2="&#x176;" k="123" />
-<hkern u1="&#xc4;" u2="&#x174;" k="82" />
-<hkern u1="&#xc4;" u2="&#x164;" k="143" />
-<hkern u1="&#xc4;" u2="&#x162;" k="143" />
-<hkern u1="&#xc4;" u2="&#x152;" k="41" />
-<hkern u1="&#xc4;" u2="&#x150;" k="41" />
-<hkern u1="&#xc4;" u2="&#x14e;" k="41" />
-<hkern u1="&#xc4;" u2="&#x14c;" k="41" />
-<hkern u1="&#xc4;" u2="&#x122;" k="41" />
-<hkern u1="&#xc4;" u2="&#x120;" k="41" />
-<hkern u1="&#xc4;" u2="&#x11e;" k="41" />
-<hkern u1="&#xc4;" u2="&#x11c;" k="41" />
-<hkern u1="&#xc4;" u2="&#x10c;" k="41" />
-<hkern u1="&#xc4;" u2="&#x10a;" k="41" />
-<hkern u1="&#xc4;" u2="&#x108;" k="41" />
-<hkern u1="&#xc4;" u2="&#x106;" k="41" />
-<hkern u1="&#xc4;" u2="&#xdd;" k="123" />
-<hkern u1="&#xc4;" u2="&#xd8;" k="41" />
-<hkern u1="&#xc4;" u2="&#xd6;" k="41" />
-<hkern u1="&#xc4;" u2="&#xd5;" k="41" />
-<hkern u1="&#xc4;" u2="&#xd4;" k="41" />
-<hkern u1="&#xc4;" u2="&#xd3;" k="41" />
-<hkern u1="&#xc4;" u2="&#xd2;" k="41" />
-<hkern u1="&#xc4;" u2="&#xc7;" k="41" />
-<hkern u1="&#xc4;" u2="Y" k="123" />
-<hkern u1="&#xc4;" u2="W" k="82" />
-<hkern u1="&#xc4;" u2="V" k="82" />
-<hkern u1="&#xc4;" u2="T" k="143" />
-<hkern u1="&#xc4;" u2="Q" k="41" />
-<hkern u1="&#xc4;" u2="O" k="41" />
-<hkern u1="&#xc4;" u2="J" k="-266" />
-<hkern u1="&#xc4;" u2="G" k="41" />
-<hkern u1="&#xc4;" u2="C" k="41" />
-<hkern u1="&#xc4;" u2="&#x27;" k="143" />
-<hkern u1="&#xc4;" u2="&#x22;" k="143" />
-<hkern u1="&#xc5;" u2="&#x201d;" k="143" />
-<hkern u1="&#xc5;" u2="&#x2019;" k="143" />
-<hkern u1="&#xc5;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#xc5;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#xc5;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#xc5;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#xc5;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#xc5;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#xc5;" u2="&#x1ede;" k="41" />
-<hkern u1="&#xc5;" u2="&#x1edc;" k="41" />
-<hkern u1="&#xc5;" u2="&#x1eda;" k="41" />
-<hkern u1="&#xc5;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#xc5;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#xc5;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#xc5;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#xc5;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#xc5;" u2="&#x1ece;" k="41" />
-<hkern u1="&#xc5;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#xc5;" u2="&#x1e84;" k="82" />
-<hkern u1="&#xc5;" u2="&#x1e82;" k="82" />
-<hkern u1="&#xc5;" u2="&#x1e80;" k="82" />
-<hkern u1="&#xc5;" u2="&#x21a;" k="143" />
-<hkern u1="&#xc5;" u2="&#x1fe;" k="41" />
-<hkern u1="&#xc5;" u2="&#x1a0;" k="41" />
-<hkern u1="&#xc5;" u2="&#x178;" k="123" />
-<hkern u1="&#xc5;" u2="&#x176;" k="123" />
-<hkern u1="&#xc5;" u2="&#x174;" k="82" />
-<hkern u1="&#xc5;" u2="&#x164;" k="143" />
-<hkern u1="&#xc5;" u2="&#x162;" k="143" />
-<hkern u1="&#xc5;" u2="&#x152;" k="41" />
-<hkern u1="&#xc5;" u2="&#x150;" k="41" />
-<hkern u1="&#xc5;" u2="&#x14e;" k="41" />
-<hkern u1="&#xc5;" u2="&#x14c;" k="41" />
-<hkern u1="&#xc5;" u2="&#x122;" k="41" />
-<hkern u1="&#xc5;" u2="&#x120;" k="41" />
-<hkern u1="&#xc5;" u2="&#x11e;" k="41" />
-<hkern u1="&#xc5;" u2="&#x11c;" k="41" />
-<hkern u1="&#xc5;" u2="&#x10c;" k="41" />
-<hkern u1="&#xc5;" u2="&#x10a;" k="41" />
-<hkern u1="&#xc5;" u2="&#x108;" k="41" />
-<hkern u1="&#xc5;" u2="&#x106;" k="41" />
-<hkern u1="&#xc5;" u2="&#xdd;" k="123" />
-<hkern u1="&#xc5;" u2="&#xd8;" k="41" />
-<hkern u1="&#xc5;" u2="&#xd6;" k="41" />
-<hkern u1="&#xc5;" u2="&#xd5;" k="41" />
-<hkern u1="&#xc5;" u2="&#xd4;" k="41" />
-<hkern u1="&#xc5;" u2="&#xd3;" k="41" />
-<hkern u1="&#xc5;" u2="&#xd2;" k="41" />
-<hkern u1="&#xc5;" u2="&#xc7;" k="41" />
-<hkern u1="&#xc5;" u2="Y" k="123" />
-<hkern u1="&#xc5;" u2="W" k="82" />
-<hkern u1="&#xc5;" u2="V" k="82" />
-<hkern u1="&#xc5;" u2="T" k="143" />
-<hkern u1="&#xc5;" u2="Q" k="41" />
-<hkern u1="&#xc5;" u2="O" k="41" />
-<hkern u1="&#xc5;" u2="J" k="-266" />
-<hkern u1="&#xc5;" u2="G" k="41" />
-<hkern u1="&#xc5;" u2="C" k="41" />
-<hkern u1="&#xc5;" u2="&#x27;" k="143" />
-<hkern u1="&#xc5;" u2="&#x22;" k="143" />
-<hkern u1="&#xc6;" u2="J" k="-123" />
-<hkern u1="&#xc7;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#xc7;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#xc7;" u2="&#x1ede;" k="41" />
-<hkern u1="&#xc7;" u2="&#x1edc;" k="41" />
-<hkern u1="&#xc7;" u2="&#x1eda;" k="41" />
-<hkern u1="&#xc7;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#xc7;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#xc7;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#xc7;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#xc7;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#xc7;" u2="&#x1ece;" k="41" />
-<hkern u1="&#xc7;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#xc7;" u2="&#x1fe;" k="41" />
-<hkern u1="&#xc7;" u2="&#x1a0;" k="41" />
-<hkern u1="&#xc7;" u2="&#x152;" k="41" />
-<hkern u1="&#xc7;" u2="&#x150;" k="41" />
-<hkern u1="&#xc7;" u2="&#x14e;" k="41" />
-<hkern u1="&#xc7;" u2="&#x14c;" k="41" />
-<hkern u1="&#xc7;" u2="&#x122;" k="41" />
-<hkern u1="&#xc7;" u2="&#x120;" k="41" />
-<hkern u1="&#xc7;" u2="&#x11e;" k="41" />
-<hkern u1="&#xc7;" u2="&#x11c;" k="41" />
-<hkern u1="&#xc7;" u2="&#x10c;" k="41" />
-<hkern u1="&#xc7;" u2="&#x10a;" k="41" />
-<hkern u1="&#xc7;" u2="&#x108;" k="41" />
-<hkern u1="&#xc7;" u2="&#x106;" k="41" />
-<hkern u1="&#xc7;" u2="&#xd8;" k="41" />
-<hkern u1="&#xc7;" u2="&#xd6;" k="41" />
-<hkern u1="&#xc7;" u2="&#xd5;" k="41" />
-<hkern u1="&#xc7;" u2="&#xd4;" k="41" />
-<hkern u1="&#xc7;" u2="&#xd3;" k="41" />
-<hkern u1="&#xc7;" u2="&#xd2;" k="41" />
-<hkern u1="&#xc7;" u2="&#xc7;" k="41" />
-<hkern u1="&#xc7;" u2="Q" k="41" />
-<hkern u1="&#xc7;" u2="O" k="41" />
-<hkern u1="&#xc7;" u2="G" k="41" />
-<hkern u1="&#xc7;" u2="C" k="41" />
-<hkern u1="&#xc8;" u2="J" k="-123" />
-<hkern u1="&#xc9;" u2="J" k="-123" />
-<hkern u1="&#xca;" u2="J" k="-123" />
-<hkern u1="&#xcb;" u2="J" k="-123" />
-<hkern u1="&#xd0;" u2="&#x201e;" k="82" />
-<hkern u1="&#xd0;" u2="&#x201a;" k="82" />
-<hkern u1="&#xd0;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#xd0;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#xd0;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#xd0;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#xd0;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#xd0;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#xd0;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#xd0;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#xd0;" u2="&#x1eae;" k="41" />
-<hkern u1="&#xd0;" u2="&#x1eac;" k="41" />
-<hkern u1="&#xd0;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#xd0;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#xd0;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#xd0;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#xd0;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#xd0;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#xd0;" u2="&#x1e84;" k="20" />
-<hkern u1="&#xd0;" u2="&#x1e82;" k="20" />
-<hkern u1="&#xd0;" u2="&#x1e80;" k="20" />
-<hkern u1="&#xd0;" u2="&#x1e00;" k="41" />
-<hkern u1="&#xd0;" u2="&#x405;" k="20" />
-<hkern u1="&#xd0;" u2="&#x21a;" k="61" />
-<hkern u1="&#xd0;" u2="&#x1fa;" k="41" />
-<hkern u1="&#xd0;" u2="&#x17d;" k="20" />
-<hkern u1="&#xd0;" u2="&#x17b;" k="20" />
-<hkern u1="&#xd0;" u2="&#x179;" k="20" />
-<hkern u1="&#xd0;" u2="&#x178;" k="20" />
-<hkern u1="&#xd0;" u2="&#x176;" k="20" />
-<hkern u1="&#xd0;" u2="&#x174;" k="20" />
-<hkern u1="&#xd0;" u2="&#x164;" k="61" />
-<hkern u1="&#xd0;" u2="&#x162;" k="61" />
-<hkern u1="&#xd0;" u2="&#x104;" k="41" />
-<hkern u1="&#xd0;" u2="&#x102;" k="41" />
-<hkern u1="&#xd0;" u2="&#x100;" k="41" />
-<hkern u1="&#xd0;" u2="&#xdd;" k="20" />
-<hkern u1="&#xd0;" u2="&#xc5;" k="41" />
-<hkern u1="&#xd0;" u2="&#xc4;" k="41" />
-<hkern u1="&#xd0;" u2="&#xc3;" k="41" />
-<hkern u1="&#xd0;" u2="&#xc2;" k="41" />
-<hkern u1="&#xd0;" u2="&#xc1;" k="41" />
-<hkern u1="&#xd0;" u2="&#xc0;" k="41" />
-<hkern u1="&#xd0;" u2="Z" k="20" />
-<hkern u1="&#xd0;" u2="Y" k="20" />
-<hkern u1="&#xd0;" u2="X" k="41" />
-<hkern u1="&#xd0;" u2="W" k="20" />
-<hkern u1="&#xd0;" u2="V" k="20" />
-<hkern u1="&#xd0;" u2="T" k="61" />
-<hkern u1="&#xd0;" u2="A" k="41" />
-<hkern u1="&#xd0;" u2="&#x2e;" k="82" />
-<hkern u1="&#xd0;" u2="&#x2c;" k="82" />
-<hkern u1="&#xd2;" u2="&#x201e;" k="82" />
-<hkern u1="&#xd2;" u2="&#x201a;" k="82" />
-<hkern u1="&#xd2;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#xd2;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#xd2;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#xd2;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#xd2;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#xd2;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#xd2;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#xd2;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#xd2;" u2="&#x1eae;" k="41" />
-<hkern u1="&#xd2;" u2="&#x1eac;" k="41" />
-<hkern u1="&#xd2;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#xd2;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#xd2;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#xd2;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#xd2;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#xd2;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#xd2;" u2="&#x1e84;" k="20" />
-<hkern u1="&#xd2;" u2="&#x1e82;" k="20" />
-<hkern u1="&#xd2;" u2="&#x1e80;" k="20" />
-<hkern u1="&#xd2;" u2="&#x1e00;" k="41" />
-<hkern u1="&#xd2;" u2="&#x405;" k="20" />
-<hkern u1="&#xd2;" u2="&#x21a;" k="61" />
-<hkern u1="&#xd2;" u2="&#x1fa;" k="41" />
-<hkern u1="&#xd2;" u2="&#x17d;" k="20" />
-<hkern u1="&#xd2;" u2="&#x17b;" k="20" />
-<hkern u1="&#xd2;" u2="&#x179;" k="20" />
-<hkern u1="&#xd2;" u2="&#x178;" k="20" />
-<hkern u1="&#xd2;" u2="&#x176;" k="20" />
-<hkern u1="&#xd2;" u2="&#x174;" k="20" />
-<hkern u1="&#xd2;" u2="&#x164;" k="61" />
-<hkern u1="&#xd2;" u2="&#x162;" k="61" />
-<hkern u1="&#xd2;" u2="&#x104;" k="41" />
-<hkern u1="&#xd2;" u2="&#x102;" k="41" />
-<hkern u1="&#xd2;" u2="&#x100;" k="41" />
-<hkern u1="&#xd2;" u2="&#xdd;" k="20" />
-<hkern u1="&#xd2;" u2="&#xc5;" k="41" />
-<hkern u1="&#xd2;" u2="&#xc4;" k="41" />
-<hkern u1="&#xd2;" u2="&#xc3;" k="41" />
-<hkern u1="&#xd2;" u2="&#xc2;" k="41" />
-<hkern u1="&#xd2;" u2="&#xc1;" k="41" />
-<hkern u1="&#xd2;" u2="&#xc0;" k="41" />
-<hkern u1="&#xd2;" u2="Z" k="20" />
-<hkern u1="&#xd2;" u2="Y" k="20" />
-<hkern u1="&#xd2;" u2="X" k="41" />
-<hkern u1="&#xd2;" u2="W" k="20" />
-<hkern u1="&#xd2;" u2="V" k="20" />
-<hkern u1="&#xd2;" u2="T" k="61" />
-<hkern u1="&#xd2;" u2="A" k="41" />
-<hkern u1="&#xd2;" u2="&#x2e;" k="82" />
-<hkern u1="&#xd2;" u2="&#x2c;" k="82" />
-<hkern u1="&#xd3;" u2="&#x201e;" k="82" />
-<hkern u1="&#xd3;" u2="&#x201a;" k="82" />
-<hkern u1="&#xd3;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#xd3;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#xd3;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#xd3;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#xd3;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#xd3;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#xd3;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#xd3;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#xd3;" u2="&#x1eae;" k="41" />
-<hkern u1="&#xd3;" u2="&#x1eac;" k="41" />
-<hkern u1="&#xd3;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#xd3;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#xd3;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#xd3;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#xd3;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#xd3;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#xd3;" u2="&#x1e84;" k="20" />
-<hkern u1="&#xd3;" u2="&#x1e82;" k="20" />
-<hkern u1="&#xd3;" u2="&#x1e80;" k="20" />
-<hkern u1="&#xd3;" u2="&#x1e00;" k="41" />
-<hkern u1="&#xd3;" u2="&#x405;" k="20" />
-<hkern u1="&#xd3;" u2="&#x21a;" k="61" />
-<hkern u1="&#xd3;" u2="&#x1fa;" k="41" />
-<hkern u1="&#xd3;" u2="&#x17d;" k="20" />
-<hkern u1="&#xd3;" u2="&#x17b;" k="20" />
-<hkern u1="&#xd3;" u2="&#x179;" k="20" />
-<hkern u1="&#xd3;" u2="&#x178;" k="20" />
-<hkern u1="&#xd3;" u2="&#x176;" k="20" />
-<hkern u1="&#xd3;" u2="&#x174;" k="20" />
-<hkern u1="&#xd3;" u2="&#x164;" k="61" />
-<hkern u1="&#xd3;" u2="&#x162;" k="61" />
-<hkern u1="&#xd3;" u2="&#x104;" k="41" />
-<hkern u1="&#xd3;" u2="&#x102;" k="41" />
-<hkern u1="&#xd3;" u2="&#x100;" k="41" />
-<hkern u1="&#xd3;" u2="&#xdd;" k="20" />
-<hkern u1="&#xd3;" u2="&#xc5;" k="41" />
-<hkern u1="&#xd3;" u2="&#xc4;" k="41" />
-<hkern u1="&#xd3;" u2="&#xc3;" k="41" />
-<hkern u1="&#xd3;" u2="&#xc2;" k="41" />
-<hkern u1="&#xd3;" u2="&#xc1;" k="41" />
-<hkern u1="&#xd3;" u2="&#xc0;" k="41" />
-<hkern u1="&#xd3;" u2="Z" k="20" />
-<hkern u1="&#xd3;" u2="Y" k="20" />
-<hkern u1="&#xd3;" u2="X" k="41" />
-<hkern u1="&#xd3;" u2="W" k="20" />
-<hkern u1="&#xd3;" u2="V" k="20" />
-<hkern u1="&#xd3;" u2="T" k="61" />
-<hkern u1="&#xd3;" u2="A" k="41" />
-<hkern u1="&#xd3;" u2="&#x2e;" k="82" />
-<hkern u1="&#xd3;" u2="&#x2c;" k="82" />
-<hkern u1="&#xd4;" u2="&#x201e;" k="82" />
-<hkern u1="&#xd4;" u2="&#x201a;" k="82" />
-<hkern u1="&#xd4;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#xd4;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#xd4;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#xd4;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#xd4;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#xd4;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#xd4;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#xd4;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#xd4;" u2="&#x1eae;" k="41" />
-<hkern u1="&#xd4;" u2="&#x1eac;" k="41" />
-<hkern u1="&#xd4;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#xd4;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#xd4;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#xd4;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#xd4;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#xd4;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#xd4;" u2="&#x1e84;" k="20" />
-<hkern u1="&#xd4;" u2="&#x1e82;" k="20" />
-<hkern u1="&#xd4;" u2="&#x1e80;" k="20" />
-<hkern u1="&#xd4;" u2="&#x1e00;" k="41" />
-<hkern u1="&#xd4;" u2="&#x405;" k="20" />
-<hkern u1="&#xd4;" u2="&#x21a;" k="61" />
-<hkern u1="&#xd4;" u2="&#x1fa;" k="41" />
-<hkern u1="&#xd4;" u2="&#x17d;" k="20" />
-<hkern u1="&#xd4;" u2="&#x17b;" k="20" />
-<hkern u1="&#xd4;" u2="&#x179;" k="20" />
-<hkern u1="&#xd4;" u2="&#x178;" k="20" />
-<hkern u1="&#xd4;" u2="&#x176;" k="20" />
-<hkern u1="&#xd4;" u2="&#x174;" k="20" />
-<hkern u1="&#xd4;" u2="&#x164;" k="61" />
-<hkern u1="&#xd4;" u2="&#x162;" k="61" />
-<hkern u1="&#xd4;" u2="&#x104;" k="41" />
-<hkern u1="&#xd4;" u2="&#x102;" k="41" />
-<hkern u1="&#xd4;" u2="&#x100;" k="41" />
-<hkern u1="&#xd4;" u2="&#xdd;" k="20" />
-<hkern u1="&#xd4;" u2="&#xc5;" k="41" />
-<hkern u1="&#xd4;" u2="&#xc4;" k="41" />
-<hkern u1="&#xd4;" u2="&#xc3;" k="41" />
-<hkern u1="&#xd4;" u2="&#xc2;" k="41" />
-<hkern u1="&#xd4;" u2="&#xc1;" k="41" />
-<hkern u1="&#xd4;" u2="&#xc0;" k="41" />
-<hkern u1="&#xd4;" u2="Z" k="20" />
-<hkern u1="&#xd4;" u2="Y" k="20" />
-<hkern u1="&#xd4;" u2="X" k="41" />
-<hkern u1="&#xd4;" u2="W" k="20" />
-<hkern u1="&#xd4;" u2="V" k="20" />
-<hkern u1="&#xd4;" u2="T" k="61" />
-<hkern u1="&#xd4;" u2="A" k="41" />
-<hkern u1="&#xd4;" u2="&#x2e;" k="82" />
-<hkern u1="&#xd4;" u2="&#x2c;" k="82" />
-<hkern u1="&#xd5;" u2="&#x201e;" k="82" />
-<hkern u1="&#xd5;" u2="&#x201a;" k="82" />
-<hkern u1="&#xd5;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#xd5;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#xd5;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#xd5;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#xd5;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#xd5;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#xd5;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#xd5;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#xd5;" u2="&#x1eae;" k="41" />
-<hkern u1="&#xd5;" u2="&#x1eac;" k="41" />
-<hkern u1="&#xd5;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#xd5;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#xd5;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#xd5;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#xd5;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#xd5;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#xd5;" u2="&#x1e84;" k="20" />
-<hkern u1="&#xd5;" u2="&#x1e82;" k="20" />
-<hkern u1="&#xd5;" u2="&#x1e80;" k="20" />
-<hkern u1="&#xd5;" u2="&#x1e00;" k="41" />
-<hkern u1="&#xd5;" u2="&#x405;" k="20" />
-<hkern u1="&#xd5;" u2="&#x21a;" k="61" />
-<hkern u1="&#xd5;" u2="&#x1fa;" k="41" />
-<hkern u1="&#xd5;" u2="&#x17d;" k="20" />
-<hkern u1="&#xd5;" u2="&#x17b;" k="20" />
-<hkern u1="&#xd5;" u2="&#x179;" k="20" />
-<hkern u1="&#xd5;" u2="&#x178;" k="20" />
-<hkern u1="&#xd5;" u2="&#x176;" k="20" />
-<hkern u1="&#xd5;" u2="&#x174;" k="20" />
-<hkern u1="&#xd5;" u2="&#x164;" k="61" />
-<hkern u1="&#xd5;" u2="&#x162;" k="61" />
-<hkern u1="&#xd5;" u2="&#x104;" k="41" />
-<hkern u1="&#xd5;" u2="&#x102;" k="41" />
-<hkern u1="&#xd5;" u2="&#x100;" k="41" />
-<hkern u1="&#xd5;" u2="&#xdd;" k="20" />
-<hkern u1="&#xd5;" u2="&#xc5;" k="41" />
-<hkern u1="&#xd5;" u2="&#xc4;" k="41" />
-<hkern u1="&#xd5;" u2="&#xc3;" k="41" />
-<hkern u1="&#xd5;" u2="&#xc2;" k="41" />
-<hkern u1="&#xd5;" u2="&#xc1;" k="41" />
-<hkern u1="&#xd5;" u2="&#xc0;" k="41" />
-<hkern u1="&#xd5;" u2="Z" k="20" />
-<hkern u1="&#xd5;" u2="Y" k="20" />
-<hkern u1="&#xd5;" u2="X" k="41" />
-<hkern u1="&#xd5;" u2="W" k="20" />
-<hkern u1="&#xd5;" u2="V" k="20" />
-<hkern u1="&#xd5;" u2="T" k="61" />
-<hkern u1="&#xd5;" u2="A" k="41" />
-<hkern u1="&#xd5;" u2="&#x2e;" k="82" />
-<hkern u1="&#xd5;" u2="&#x2c;" k="82" />
-<hkern u1="&#xd6;" u2="&#x201e;" k="82" />
-<hkern u1="&#xd6;" u2="&#x201a;" k="82" />
-<hkern u1="&#xd6;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#xd6;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#xd6;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#xd6;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#xd6;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#xd6;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#xd6;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#xd6;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#xd6;" u2="&#x1eae;" k="41" />
-<hkern u1="&#xd6;" u2="&#x1eac;" k="41" />
-<hkern u1="&#xd6;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#xd6;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#xd6;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#xd6;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#xd6;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#xd6;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#xd6;" u2="&#x1e84;" k="20" />
-<hkern u1="&#xd6;" u2="&#x1e82;" k="20" />
-<hkern u1="&#xd6;" u2="&#x1e80;" k="20" />
-<hkern u1="&#xd6;" u2="&#x1e00;" k="41" />
-<hkern u1="&#xd6;" u2="&#x405;" k="20" />
-<hkern u1="&#xd6;" u2="&#x21a;" k="61" />
-<hkern u1="&#xd6;" u2="&#x1fa;" k="41" />
-<hkern u1="&#xd6;" u2="&#x17d;" k="20" />
-<hkern u1="&#xd6;" u2="&#x17b;" k="20" />
-<hkern u1="&#xd6;" u2="&#x179;" k="20" />
-<hkern u1="&#xd6;" u2="&#x178;" k="20" />
-<hkern u1="&#xd6;" u2="&#x176;" k="20" />
-<hkern u1="&#xd6;" u2="&#x174;" k="20" />
-<hkern u1="&#xd6;" u2="&#x164;" k="61" />
-<hkern u1="&#xd6;" u2="&#x162;" k="61" />
-<hkern u1="&#xd6;" u2="&#x104;" k="41" />
-<hkern u1="&#xd6;" u2="&#x102;" k="41" />
-<hkern u1="&#xd6;" u2="&#x100;" k="41" />
-<hkern u1="&#xd6;" u2="&#xdd;" k="20" />
-<hkern u1="&#xd6;" u2="&#xc5;" k="41" />
-<hkern u1="&#xd6;" u2="&#xc4;" k="41" />
-<hkern u1="&#xd6;" u2="&#xc3;" k="41" />
-<hkern u1="&#xd6;" u2="&#xc2;" k="41" />
-<hkern u1="&#xd6;" u2="&#xc1;" k="41" />
-<hkern u1="&#xd6;" u2="&#xc0;" k="41" />
-<hkern u1="&#xd6;" u2="Z" k="20" />
-<hkern u1="&#xd6;" u2="Y" k="20" />
-<hkern u1="&#xd6;" u2="X" k="41" />
-<hkern u1="&#xd6;" u2="W" k="20" />
-<hkern u1="&#xd6;" u2="V" k="20" />
-<hkern u1="&#xd6;" u2="T" k="61" />
-<hkern u1="&#xd6;" u2="A" k="41" />
-<hkern u1="&#xd6;" u2="&#x2e;" k="82" />
-<hkern u1="&#xd6;" u2="&#x2c;" k="82" />
-<hkern u1="&#xd8;" u2="&#x201e;" k="82" />
-<hkern u1="&#xd8;" u2="&#x201a;" k="82" />
-<hkern u1="&#xd8;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#xd8;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#xd8;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#xd8;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#xd8;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#xd8;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#xd8;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#xd8;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#xd8;" u2="&#x1eae;" k="41" />
-<hkern u1="&#xd8;" u2="&#x1eac;" k="41" />
-<hkern u1="&#xd8;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#xd8;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#xd8;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#xd8;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#xd8;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#xd8;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#xd8;" u2="&#x1e84;" k="20" />
-<hkern u1="&#xd8;" u2="&#x1e82;" k="20" />
-<hkern u1="&#xd8;" u2="&#x1e80;" k="20" />
-<hkern u1="&#xd8;" u2="&#x1e00;" k="41" />
-<hkern u1="&#xd8;" u2="&#x405;" k="20" />
-<hkern u1="&#xd8;" u2="&#x21a;" k="61" />
-<hkern u1="&#xd8;" u2="&#x1fa;" k="41" />
-<hkern u1="&#xd8;" u2="&#x17d;" k="20" />
-<hkern u1="&#xd8;" u2="&#x17b;" k="20" />
-<hkern u1="&#xd8;" u2="&#x179;" k="20" />
-<hkern u1="&#xd8;" u2="&#x178;" k="20" />
-<hkern u1="&#xd8;" u2="&#x176;" k="20" />
-<hkern u1="&#xd8;" u2="&#x174;" k="20" />
-<hkern u1="&#xd8;" u2="&#x164;" k="61" />
-<hkern u1="&#xd8;" u2="&#x162;" k="61" />
-<hkern u1="&#xd8;" u2="&#x104;" k="41" />
-<hkern u1="&#xd8;" u2="&#x102;" k="41" />
-<hkern u1="&#xd8;" u2="&#x100;" k="41" />
-<hkern u1="&#xd8;" u2="&#xdd;" k="20" />
-<hkern u1="&#xd8;" u2="&#xc5;" k="41" />
-<hkern u1="&#xd8;" u2="&#xc4;" k="41" />
-<hkern u1="&#xd8;" u2="&#xc3;" k="41" />
-<hkern u1="&#xd8;" u2="&#xc2;" k="41" />
-<hkern u1="&#xd8;" u2="&#xc1;" k="41" />
-<hkern u1="&#xd8;" u2="&#xc0;" k="41" />
-<hkern u1="&#xd8;" u2="Z" k="20" />
-<hkern u1="&#xd8;" u2="Y" k="20" />
-<hkern u1="&#xd8;" u2="X" k="41" />
-<hkern u1="&#xd8;" u2="W" k="20" />
-<hkern u1="&#xd8;" u2="V" k="20" />
-<hkern u1="&#xd8;" u2="T" k="61" />
-<hkern u1="&#xd8;" u2="A" k="41" />
-<hkern u1="&#xd8;" u2="&#x2e;" k="82" />
-<hkern u1="&#xd8;" u2="&#x2c;" k="82" />
-<hkern u1="&#xd9;" u2="&#x201e;" k="41" />
-<hkern u1="&#xd9;" u2="&#x201a;" k="41" />
-<hkern u1="&#xd9;" u2="&#x1eb6;" k="20" />
-<hkern u1="&#xd9;" u2="&#x1eb4;" k="20" />
-<hkern u1="&#xd9;" u2="&#x1eb2;" k="20" />
-<hkern u1="&#xd9;" u2="&#x1eb0;" k="20" />
-<hkern u1="&#xd9;" u2="&#x1eae;" k="20" />
-<hkern u1="&#xd9;" u2="&#x1eac;" k="20" />
-<hkern u1="&#xd9;" u2="&#x1eaa;" k="20" />
-<hkern u1="&#xd9;" u2="&#x1ea8;" k="20" />
-<hkern u1="&#xd9;" u2="&#x1ea6;" k="20" />
-<hkern u1="&#xd9;" u2="&#x1ea4;" k="20" />
-<hkern u1="&#xd9;" u2="&#x1ea2;" k="20" />
-<hkern u1="&#xd9;" u2="&#x1ea0;" k="20" />
-<hkern u1="&#xd9;" u2="&#x1e00;" k="20" />
-<hkern u1="&#xd9;" u2="&#x1fa;" k="20" />
-<hkern u1="&#xd9;" u2="&#x104;" k="20" />
-<hkern u1="&#xd9;" u2="&#x102;" k="20" />
-<hkern u1="&#xd9;" u2="&#x100;" k="20" />
-<hkern u1="&#xd9;" u2="&#xc5;" k="20" />
-<hkern u1="&#xd9;" u2="&#xc4;" k="20" />
-<hkern u1="&#xd9;" u2="&#xc3;" k="20" />
-<hkern u1="&#xd9;" u2="&#xc2;" k="20" />
-<hkern u1="&#xd9;" u2="&#xc1;" k="20" />
-<hkern u1="&#xd9;" u2="&#xc0;" k="20" />
-<hkern u1="&#xd9;" u2="A" k="20" />
-<hkern u1="&#xd9;" u2="&#x2e;" k="41" />
-<hkern u1="&#xd9;" u2="&#x2c;" k="41" />
-<hkern u1="&#xda;" u2="&#x201e;" k="41" />
-<hkern u1="&#xda;" u2="&#x201a;" k="41" />
-<hkern u1="&#xda;" u2="&#x1eb6;" k="20" />
-<hkern u1="&#xda;" u2="&#x1eb4;" k="20" />
-<hkern u1="&#xda;" u2="&#x1eb2;" k="20" />
-<hkern u1="&#xda;" u2="&#x1eb0;" k="20" />
-<hkern u1="&#xda;" u2="&#x1eae;" k="20" />
-<hkern u1="&#xda;" u2="&#x1eac;" k="20" />
-<hkern u1="&#xda;" u2="&#x1eaa;" k="20" />
-<hkern u1="&#xda;" u2="&#x1ea8;" k="20" />
-<hkern u1="&#xda;" u2="&#x1ea6;" k="20" />
-<hkern u1="&#xda;" u2="&#x1ea4;" k="20" />
-<hkern u1="&#xda;" u2="&#x1ea2;" k="20" />
-<hkern u1="&#xda;" u2="&#x1ea0;" k="20" />
-<hkern u1="&#xda;" u2="&#x1e00;" k="20" />
-<hkern u1="&#xda;" u2="&#x1fa;" k="20" />
-<hkern u1="&#xda;" u2="&#x104;" k="20" />
-<hkern u1="&#xda;" u2="&#x102;" k="20" />
-<hkern u1="&#xda;" u2="&#x100;" k="20" />
-<hkern u1="&#xda;" u2="&#xc5;" k="20" />
-<hkern u1="&#xda;" u2="&#xc4;" k="20" />
-<hkern u1="&#xda;" u2="&#xc3;" k="20" />
-<hkern u1="&#xda;" u2="&#xc2;" k="20" />
-<hkern u1="&#xda;" u2="&#xc1;" k="20" />
-<hkern u1="&#xda;" u2="&#xc0;" k="20" />
-<hkern u1="&#xda;" u2="A" k="20" />
-<hkern u1="&#xda;" u2="&#x2e;" k="41" />
-<hkern u1="&#xda;" u2="&#x2c;" k="41" />
-<hkern u1="&#xdb;" u2="&#x201e;" k="41" />
-<hkern u1="&#xdb;" u2="&#x201a;" k="41" />
-<hkern u1="&#xdb;" u2="&#x1eb6;" k="20" />
-<hkern u1="&#xdb;" u2="&#x1eb4;" k="20" />
-<hkern u1="&#xdb;" u2="&#x1eb2;" k="20" />
-<hkern u1="&#xdb;" u2="&#x1eb0;" k="20" />
-<hkern u1="&#xdb;" u2="&#x1eae;" k="20" />
-<hkern u1="&#xdb;" u2="&#x1eac;" k="20" />
-<hkern u1="&#xdb;" u2="&#x1eaa;" k="20" />
-<hkern u1="&#xdb;" u2="&#x1ea8;" k="20" />
-<hkern u1="&#xdb;" u2="&#x1ea6;" k="20" />
-<hkern u1="&#xdb;" u2="&#x1ea4;" k="20" />
-<hkern u1="&#xdb;" u2="&#x1ea2;" k="20" />
-<hkern u1="&#xdb;" u2="&#x1ea0;" k="20" />
-<hkern u1="&#xdb;" u2="&#x1e00;" k="20" />
-<hkern u1="&#xdb;" u2="&#x1fa;" k="20" />
-<hkern u1="&#xdb;" u2="&#x104;" k="20" />
-<hkern u1="&#xdb;" u2="&#x102;" k="20" />
-<hkern u1="&#xdb;" u2="&#x100;" k="20" />
-<hkern u1="&#xdb;" u2="&#xc5;" k="20" />
-<hkern u1="&#xdb;" u2="&#xc4;" k="20" />
-<hkern u1="&#xdb;" u2="&#xc3;" k="20" />
-<hkern u1="&#xdb;" u2="&#xc2;" k="20" />
-<hkern u1="&#xdb;" u2="&#xc1;" k="20" />
-<hkern u1="&#xdb;" u2="&#xc0;" k="20" />
-<hkern u1="&#xdb;" u2="A" k="20" />
-<hkern u1="&#xdb;" u2="&#x2e;" k="41" />
-<hkern u1="&#xdb;" u2="&#x2c;" k="41" />
-<hkern u1="&#xdc;" u2="&#x201e;" k="41" />
-<hkern u1="&#xdc;" u2="&#x201a;" k="41" />
-<hkern u1="&#xdc;" u2="&#x1eb6;" k="20" />
-<hkern u1="&#xdc;" u2="&#x1eb4;" k="20" />
-<hkern u1="&#xdc;" u2="&#x1eb2;" k="20" />
-<hkern u1="&#xdc;" u2="&#x1eb0;" k="20" />
-<hkern u1="&#xdc;" u2="&#x1eae;" k="20" />
-<hkern u1="&#xdc;" u2="&#x1eac;" k="20" />
-<hkern u1="&#xdc;" u2="&#x1eaa;" k="20" />
-<hkern u1="&#xdc;" u2="&#x1ea8;" k="20" />
-<hkern u1="&#xdc;" u2="&#x1ea6;" k="20" />
-<hkern u1="&#xdc;" u2="&#x1ea4;" k="20" />
-<hkern u1="&#xdc;" u2="&#x1ea2;" k="20" />
-<hkern u1="&#xdc;" u2="&#x1ea0;" k="20" />
-<hkern u1="&#xdc;" u2="&#x1e00;" k="20" />
-<hkern u1="&#xdc;" u2="&#x1fa;" k="20" />
-<hkern u1="&#xdc;" u2="&#x104;" k="20" />
-<hkern u1="&#xdc;" u2="&#x102;" k="20" />
-<hkern u1="&#xdc;" u2="&#x100;" k="20" />
-<hkern u1="&#xdc;" u2="&#xc5;" k="20" />
-<hkern u1="&#xdc;" u2="&#xc4;" k="20" />
-<hkern u1="&#xdc;" u2="&#xc3;" k="20" />
-<hkern u1="&#xdc;" u2="&#xc2;" k="20" />
-<hkern u1="&#xdc;" u2="&#xc1;" k="20" />
-<hkern u1="&#xdc;" u2="&#xc0;" k="20" />
-<hkern u1="&#xdc;" u2="A" k="20" />
-<hkern u1="&#xdc;" u2="&#x2e;" k="41" />
-<hkern u1="&#xdc;" u2="&#x2c;" k="41" />
-<hkern u1="&#xdd;" u2="&#x201e;" k="123" />
-<hkern u1="&#xdd;" u2="&#x201a;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1ef1;" k="61" />
-<hkern u1="&#xdd;" u2="&#x1eef;" k="61" />
-<hkern u1="&#xdd;" u2="&#x1eed;" k="61" />
-<hkern u1="&#xdd;" u2="&#x1eeb;" k="61" />
-<hkern u1="&#xdd;" u2="&#x1ee9;" k="61" />
-<hkern u1="&#xdd;" u2="&#x1ee7;" k="61" />
-<hkern u1="&#xdd;" u2="&#x1ee5;" k="61" />
-<hkern u1="&#xdd;" u2="&#x1ee3;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#xdd;" u2="&#x1ee1;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#xdd;" u2="&#x1edf;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ede;" k="41" />
-<hkern u1="&#xdd;" u2="&#x1edd;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1edc;" k="41" />
-<hkern u1="&#xdd;" u2="&#x1edb;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1eda;" k="41" />
-<hkern u1="&#xdd;" u2="&#x1ed9;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#xdd;" u2="&#x1ed7;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#xdd;" u2="&#x1ed5;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#xdd;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#xdd;" u2="&#x1ed1;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#xdd;" u2="&#x1ecf;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ece;" k="41" />
-<hkern u1="&#xdd;" u2="&#x1ecd;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#xdd;" u2="&#x1ec7;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ec5;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ec3;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ebf;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ebd;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ebb;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1eb9;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1eb7;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1eb6;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1eb5;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1eb4;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1eb3;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1eb2;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1eb1;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1eb0;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1eaf;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1eae;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1ead;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1eac;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1eab;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1eaa;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1ea9;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ea8;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1ea6;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1ea5;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ea4;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1ea3;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ea2;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1ea1;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1ea0;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1e3f;" k="61" />
-<hkern u1="&#xdd;" u2="&#x1e01;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1e00;" k="123" />
-<hkern u1="&#xdd;" u2="&#x219;" k="82" />
-<hkern u1="&#xdd;" u2="&#x1ff;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1fe;" k="41" />
-<hkern u1="&#xdd;" u2="&#x1fd;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1fb;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1fa;" k="123" />
-<hkern u1="&#xdd;" u2="&#x1b0;" k="61" />
-<hkern u1="&#xdd;" u2="&#x1a1;" k="102" />
-<hkern u1="&#xdd;" u2="&#x1a0;" k="41" />
-<hkern u1="&#xdd;" u2="&#x17e;" k="41" />
-<hkern u1="&#xdd;" u2="&#x17c;" k="41" />
-<hkern u1="&#xdd;" u2="&#x17a;" k="41" />
-<hkern u1="&#xdd;" u2="&#x173;" k="61" />
-<hkern u1="&#xdd;" u2="&#x171;" k="61" />
-<hkern u1="&#xdd;" u2="&#x16f;" k="61" />
-<hkern u1="&#xdd;" u2="&#x16d;" k="61" />
-<hkern u1="&#xdd;" u2="&#x16b;" k="61" />
-<hkern u1="&#xdd;" u2="&#x169;" k="61" />
-<hkern u1="&#xdd;" u2="&#x15f;" k="82" />
-<hkern u1="&#xdd;" u2="&#x15b;" k="82" />
-<hkern u1="&#xdd;" u2="&#x157;" k="61" />
-<hkern u1="&#xdd;" u2="&#x155;" k="61" />
-<hkern u1="&#xdd;" u2="&#x153;" k="102" />
-<hkern u1="&#xdd;" u2="&#x152;" k="41" />
-<hkern u1="&#xdd;" u2="&#x151;" k="102" />
-<hkern u1="&#xdd;" u2="&#x150;" k="41" />
-<hkern u1="&#xdd;" u2="&#x14f;" k="102" />
-<hkern u1="&#xdd;" u2="&#x14e;" k="41" />
-<hkern u1="&#xdd;" u2="&#x14d;" k="102" />
-<hkern u1="&#xdd;" u2="&#x14c;" k="41" />
-<hkern u1="&#xdd;" u2="&#x14b;" k="61" />
-<hkern u1="&#xdd;" u2="&#x146;" k="61" />
-<hkern u1="&#xdd;" u2="&#x144;" k="61" />
-<hkern u1="&#xdd;" u2="&#x138;" k="61" />
-<hkern u1="&#xdd;" u2="&#x123;" k="41" />
-<hkern u1="&#xdd;" u2="&#x122;" k="41" />
-<hkern u1="&#xdd;" u2="&#x121;" k="41" />
-<hkern u1="&#xdd;" u2="&#x120;" k="41" />
-<hkern u1="&#xdd;" u2="&#x11f;" k="41" />
-<hkern u1="&#xdd;" u2="&#x11e;" k="41" />
-<hkern u1="&#xdd;" u2="&#x11d;" k="41" />
-<hkern u1="&#xdd;" u2="&#x11c;" k="41" />
-<hkern u1="&#xdd;" u2="&#x11b;" k="102" />
-<hkern u1="&#xdd;" u2="&#x119;" k="102" />
-<hkern u1="&#xdd;" u2="&#x117;" k="102" />
-<hkern u1="&#xdd;" u2="&#x115;" k="102" />
-<hkern u1="&#xdd;" u2="&#x113;" k="102" />
-<hkern u1="&#xdd;" u2="&#x111;" k="102" />
-<hkern u1="&#xdd;" u2="&#x10f;" k="102" />
-<hkern u1="&#xdd;" u2="&#x10d;" k="102" />
-<hkern u1="&#xdd;" u2="&#x10c;" k="41" />
-<hkern u1="&#xdd;" u2="&#x10b;" k="102" />
-<hkern u1="&#xdd;" u2="&#x10a;" k="41" />
-<hkern u1="&#xdd;" u2="&#x109;" k="102" />
-<hkern u1="&#xdd;" u2="&#x108;" k="41" />
-<hkern u1="&#xdd;" u2="&#x107;" k="102" />
-<hkern u1="&#xdd;" u2="&#x106;" k="41" />
-<hkern u1="&#xdd;" u2="&#x105;" k="102" />
-<hkern u1="&#xdd;" u2="&#x104;" k="123" />
-<hkern u1="&#xdd;" u2="&#x103;" k="102" />
-<hkern u1="&#xdd;" u2="&#x102;" k="123" />
-<hkern u1="&#xdd;" u2="&#x101;" k="102" />
-<hkern u1="&#xdd;" u2="&#x100;" k="123" />
-<hkern u1="&#xdd;" u2="&#xfc;" k="61" />
-<hkern u1="&#xdd;" u2="&#xfb;" k="61" />
-<hkern u1="&#xdd;" u2="&#xfa;" k="61" />
-<hkern u1="&#xdd;" u2="&#xf9;" k="61" />
-<hkern u1="&#xdd;" u2="&#xf8;" k="102" />
-<hkern u1="&#xdd;" u2="&#xf6;" k="102" />
-<hkern u1="&#xdd;" u2="&#xf5;" k="102" />
-<hkern u1="&#xdd;" u2="&#xf4;" k="102" />
-<hkern u1="&#xdd;" u2="&#xf3;" k="102" />
-<hkern u1="&#xdd;" u2="&#xf2;" k="102" />
-<hkern u1="&#xdd;" u2="&#xeb;" k="102" />
-<hkern u1="&#xdd;" u2="&#xea;" k="102" />
-<hkern u1="&#xdd;" u2="&#xe9;" k="102" />
-<hkern u1="&#xdd;" u2="&#xe8;" k="102" />
-<hkern u1="&#xdd;" u2="&#xe7;" k="102" />
-<hkern u1="&#xdd;" u2="&#xe6;" k="102" />
-<hkern u1="&#xdd;" u2="&#xe5;" k="102" />
-<hkern u1="&#xdd;" u2="&#xe4;" k="102" />
-<hkern u1="&#xdd;" u2="&#xe3;" k="102" />
-<hkern u1="&#xdd;" u2="&#xe2;" k="102" />
-<hkern u1="&#xdd;" u2="&#xe1;" k="102" />
-<hkern u1="&#xdd;" u2="&#xe0;" k="102" />
-<hkern u1="&#xdd;" u2="&#xd8;" k="41" />
-<hkern u1="&#xdd;" u2="&#xd6;" k="41" />
-<hkern u1="&#xdd;" u2="&#xd5;" k="41" />
-<hkern u1="&#xdd;" u2="&#xd4;" k="41" />
-<hkern u1="&#xdd;" u2="&#xd3;" k="41" />
-<hkern u1="&#xdd;" u2="&#xd2;" k="41" />
-<hkern u1="&#xdd;" u2="&#xc7;" k="41" />
-<hkern u1="&#xdd;" u2="&#xc5;" k="123" />
-<hkern u1="&#xdd;" u2="&#xc4;" k="123" />
-<hkern u1="&#xdd;" u2="&#xc3;" k="123" />
-<hkern u1="&#xdd;" u2="&#xc2;" k="123" />
-<hkern u1="&#xdd;" u2="&#xc1;" k="123" />
-<hkern u1="&#xdd;" u2="&#xc0;" k="123" />
-<hkern u1="&#xdd;" u2="z" k="41" />
-<hkern u1="&#xdd;" u2="u" k="61" />
-<hkern u1="&#xdd;" u2="s" k="82" />
-<hkern u1="&#xdd;" u2="r" k="61" />
-<hkern u1="&#xdd;" u2="q" k="102" />
-<hkern u1="&#xdd;" u2="p" k="61" />
-<hkern u1="&#xdd;" u2="o" k="102" />
-<hkern u1="&#xdd;" u2="n" k="61" />
-<hkern u1="&#xdd;" u2="m" k="61" />
-<hkern u1="&#xdd;" u2="g" k="41" />
-<hkern u1="&#xdd;" u2="e" k="102" />
-<hkern u1="&#xdd;" u2="d" k="102" />
-<hkern u1="&#xdd;" u2="c" k="102" />
-<hkern u1="&#xdd;" u2="a" k="102" />
-<hkern u1="&#xdd;" u2="Q" k="41" />
-<hkern u1="&#xdd;" u2="O" k="41" />
-<hkern u1="&#xdd;" u2="G" k="41" />
-<hkern u1="&#xdd;" u2="C" k="41" />
-<hkern u1="&#xdd;" u2="A" k="123" />
-<hkern u1="&#xdd;" u2="&#x3f;" k="-41" />
-<hkern u1="&#xdd;" u2="&#x2e;" k="123" />
-<hkern u1="&#xdd;" u2="&#x2c;" k="123" />
-<hkern u1="&#xde;" u2="&#x201e;" k="266" />
-<hkern u1="&#xde;" u2="&#x201a;" k="266" />
-<hkern u1="&#xde;" u2="&#x1eb6;" k="102" />
-<hkern u1="&#xde;" u2="&#x1eb4;" k="102" />
-<hkern u1="&#xde;" u2="&#x1eb2;" k="102" />
-<hkern u1="&#xde;" u2="&#x1eb0;" k="102" />
-<hkern u1="&#xde;" u2="&#x1eae;" k="102" />
-<hkern u1="&#xde;" u2="&#x1eac;" k="102" />
-<hkern u1="&#xde;" u2="&#x1eaa;" k="102" />
-<hkern u1="&#xde;" u2="&#x1ea8;" k="102" />
-<hkern u1="&#xde;" u2="&#x1ea6;" k="102" />
-<hkern u1="&#xde;" u2="&#x1ea4;" k="102" />
-<hkern u1="&#xde;" u2="&#x1ea2;" k="102" />
-<hkern u1="&#xde;" u2="&#x1ea0;" k="102" />
-<hkern u1="&#xde;" u2="&#x1e00;" k="102" />
-<hkern u1="&#xde;" u2="&#x1fa;" k="102" />
-<hkern u1="&#xde;" u2="&#x17d;" k="20" />
-<hkern u1="&#xde;" u2="&#x17b;" k="20" />
-<hkern u1="&#xde;" u2="&#x179;" k="20" />
-<hkern u1="&#xde;" u2="&#x104;" k="102" />
-<hkern u1="&#xde;" u2="&#x102;" k="102" />
-<hkern u1="&#xde;" u2="&#x100;" k="102" />
-<hkern u1="&#xde;" u2="&#xc5;" k="102" />
-<hkern u1="&#xde;" u2="&#xc4;" k="102" />
-<hkern u1="&#xde;" u2="&#xc3;" k="102" />
-<hkern u1="&#xde;" u2="&#xc2;" k="102" />
-<hkern u1="&#xde;" u2="&#xc1;" k="102" />
-<hkern u1="&#xde;" u2="&#xc0;" k="102" />
-<hkern u1="&#xde;" u2="Z" k="20" />
-<hkern u1="&#xde;" u2="X" k="41" />
-<hkern u1="&#xde;" u2="A" k="102" />
-<hkern u1="&#xde;" u2="&#x2e;" k="266" />
-<hkern u1="&#xde;" u2="&#x2c;" k="266" />
-<hkern u1="&#xe0;" u2="&#x201d;" k="20" />
-<hkern u1="&#xe0;" u2="&#x2019;" k="20" />
-<hkern u1="&#xe0;" u2="&#x27;" k="20" />
-<hkern u1="&#xe0;" u2="&#x22;" k="20" />
-<hkern u1="&#xe1;" u2="&#x201d;" k="20" />
-<hkern u1="&#xe1;" u2="&#x2019;" k="20" />
-<hkern u1="&#xe1;" u2="&#x27;" k="20" />
-<hkern u1="&#xe1;" u2="&#x22;" k="20" />
-<hkern u1="&#xe2;" u2="&#x201d;" k="20" />
-<hkern u1="&#xe2;" u2="&#x2019;" k="20" />
-<hkern u1="&#xe2;" u2="&#x27;" k="20" />
-<hkern u1="&#xe2;" u2="&#x22;" k="20" />
-<hkern u1="&#xe3;" u2="&#x201d;" k="20" />
-<hkern u1="&#xe3;" u2="&#x2019;" k="20" />
-<hkern u1="&#xe3;" u2="&#x27;" k="20" />
-<hkern u1="&#xe3;" u2="&#x22;" k="20" />
-<hkern u1="&#xe4;" u2="&#x201d;" k="20" />
-<hkern u1="&#xe4;" u2="&#x2019;" k="20" />
-<hkern u1="&#xe4;" u2="&#x27;" k="20" />
-<hkern u1="&#xe4;" u2="&#x22;" k="20" />
-<hkern u1="&#xe5;" u2="&#x201d;" k="20" />
-<hkern u1="&#xe5;" u2="&#x2019;" k="20" />
-<hkern u1="&#xe5;" u2="&#x27;" k="20" />
-<hkern u1="&#xe5;" u2="&#x22;" k="20" />
-<hkern u1="&#xe8;" u2="&#x201d;" k="20" />
-<hkern u1="&#xe8;" u2="&#x2019;" k="20" />
-<hkern u1="&#xe8;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#xe8;" u2="&#x1e83;" k="41" />
-<hkern u1="&#xe8;" u2="&#x1e81;" k="41" />
-<hkern u1="&#xe8;" u2="&#x17e;" k="20" />
-<hkern u1="&#xe8;" u2="&#x17c;" k="20" />
-<hkern u1="&#xe8;" u2="&#x17a;" k="20" />
-<hkern u1="&#xe8;" u2="&#x175;" k="41" />
-<hkern u1="&#xe8;" u2="&#xfd;" k="41" />
-<hkern u1="&#xe8;" u2="z" k="20" />
-<hkern u1="&#xe8;" u2="y" k="41" />
-<hkern u1="&#xe8;" u2="x" k="41" />
-<hkern u1="&#xe8;" u2="w" k="41" />
-<hkern u1="&#xe8;" u2="v" k="41" />
-<hkern u1="&#xe8;" u2="&#x27;" k="20" />
-<hkern u1="&#xe8;" u2="&#x22;" k="20" />
-<hkern u1="&#xe9;" u2="&#x201d;" k="20" />
-<hkern u1="&#xe9;" u2="&#x2019;" k="20" />
-<hkern u1="&#xe9;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#xe9;" u2="&#x1e83;" k="41" />
-<hkern u1="&#xe9;" u2="&#x1e81;" k="41" />
-<hkern u1="&#xe9;" u2="&#x17e;" k="20" />
-<hkern u1="&#xe9;" u2="&#x17c;" k="20" />
-<hkern u1="&#xe9;" u2="&#x17a;" k="20" />
-<hkern u1="&#xe9;" u2="&#x175;" k="41" />
-<hkern u1="&#xe9;" u2="&#xfd;" k="41" />
-<hkern u1="&#xe9;" u2="z" k="20" />
-<hkern u1="&#xe9;" u2="y" k="41" />
-<hkern u1="&#xe9;" u2="x" k="41" />
-<hkern u1="&#xe9;" u2="w" k="41" />
-<hkern u1="&#xe9;" u2="v" k="41" />
-<hkern u1="&#xe9;" u2="&#x27;" k="20" />
-<hkern u1="&#xe9;" u2="&#x22;" k="20" />
-<hkern u1="&#xea;" u2="&#x201d;" k="20" />
-<hkern u1="&#xea;" u2="&#x2019;" k="20" />
-<hkern u1="&#xea;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#xea;" u2="&#x1e83;" k="41" />
-<hkern u1="&#xea;" u2="&#x1e81;" k="41" />
-<hkern u1="&#xea;" u2="&#x17e;" k="20" />
-<hkern u1="&#xea;" u2="&#x17c;" k="20" />
-<hkern u1="&#xea;" u2="&#x17a;" k="20" />
-<hkern u1="&#xea;" u2="&#x175;" k="41" />
-<hkern u1="&#xea;" u2="&#xfd;" k="41" />
-<hkern u1="&#xea;" u2="z" k="20" />
-<hkern u1="&#xea;" u2="y" k="41" />
-<hkern u1="&#xea;" u2="x" k="41" />
-<hkern u1="&#xea;" u2="w" k="41" />
-<hkern u1="&#xea;" u2="v" k="41" />
-<hkern u1="&#xea;" u2="&#x27;" k="20" />
-<hkern u1="&#xea;" u2="&#x22;" k="20" />
-<hkern u1="&#xeb;" u2="&#x201d;" k="20" />
-<hkern u1="&#xeb;" u2="&#x2019;" k="20" />
-<hkern u1="&#xeb;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#xeb;" u2="&#x1e83;" k="41" />
-<hkern u1="&#xeb;" u2="&#x1e81;" k="41" />
-<hkern u1="&#xeb;" u2="&#x17e;" k="20" />
-<hkern u1="&#xeb;" u2="&#x17c;" k="20" />
-<hkern u1="&#xeb;" u2="&#x17a;" k="20" />
-<hkern u1="&#xeb;" u2="&#x175;" k="41" />
-<hkern u1="&#xeb;" u2="&#xfd;" k="41" />
-<hkern u1="&#xeb;" u2="z" k="20" />
-<hkern u1="&#xeb;" u2="y" k="41" />
-<hkern u1="&#xeb;" u2="x" k="41" />
-<hkern u1="&#xeb;" u2="w" k="41" />
-<hkern u1="&#xeb;" u2="v" k="41" />
-<hkern u1="&#xeb;" u2="&#x27;" k="20" />
-<hkern u1="&#xeb;" u2="&#x22;" k="20" />
-<hkern u1="&#xf0;" u2="&#x201d;" k="20" />
-<hkern u1="&#xf0;" u2="&#x2019;" k="20" />
-<hkern u1="&#xf0;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#xf0;" u2="&#x1e83;" k="41" />
-<hkern u1="&#xf0;" u2="&#x1e81;" k="41" />
-<hkern u1="&#xf0;" u2="&#x17e;" k="20" />
-<hkern u1="&#xf0;" u2="&#x17c;" k="20" />
-<hkern u1="&#xf0;" u2="&#x17a;" k="20" />
-<hkern u1="&#xf0;" u2="&#x175;" k="41" />
-<hkern u1="&#xf0;" u2="&#xfd;" k="41" />
-<hkern u1="&#xf0;" u2="z" k="20" />
-<hkern u1="&#xf0;" u2="y" k="41" />
-<hkern u1="&#xf0;" u2="x" k="41" />
-<hkern u1="&#xf0;" u2="w" k="41" />
-<hkern u1="&#xf0;" u2="v" k="41" />
-<hkern u1="&#xf0;" u2="&#x27;" k="20" />
-<hkern u1="&#xf0;" u2="&#x22;" k="20" />
-<hkern u1="&#xf2;" u2="&#x201d;" k="20" />
-<hkern u1="&#xf2;" u2="&#x2019;" k="20" />
-<hkern u1="&#xf2;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#xf2;" u2="&#x1e83;" k="41" />
-<hkern u1="&#xf2;" u2="&#x1e81;" k="41" />
-<hkern u1="&#xf2;" u2="&#x17e;" k="20" />
-<hkern u1="&#xf2;" u2="&#x17c;" k="20" />
-<hkern u1="&#xf2;" u2="&#x17a;" k="20" />
-<hkern u1="&#xf2;" u2="&#x175;" k="41" />
-<hkern u1="&#xf2;" u2="&#xfd;" k="41" />
-<hkern u1="&#xf2;" u2="z" k="20" />
-<hkern u1="&#xf2;" u2="y" k="41" />
-<hkern u1="&#xf2;" u2="x" k="41" />
-<hkern u1="&#xf2;" u2="w" k="41" />
-<hkern u1="&#xf2;" u2="v" k="41" />
-<hkern u1="&#xf2;" u2="&#x27;" k="20" />
-<hkern u1="&#xf2;" u2="&#x22;" k="20" />
-<hkern u1="&#xf3;" u2="&#x201d;" k="20" />
-<hkern u1="&#xf3;" u2="&#x2019;" k="20" />
-<hkern u1="&#xf3;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#xf3;" u2="&#x1e83;" k="41" />
-<hkern u1="&#xf3;" u2="&#x1e81;" k="41" />
-<hkern u1="&#xf3;" u2="&#x17e;" k="20" />
-<hkern u1="&#xf3;" u2="&#x17c;" k="20" />
-<hkern u1="&#xf3;" u2="&#x17a;" k="20" />
-<hkern u1="&#xf3;" u2="&#x175;" k="41" />
-<hkern u1="&#xf3;" u2="&#xfd;" k="41" />
-<hkern u1="&#xf3;" u2="z" k="20" />
-<hkern u1="&#xf3;" u2="y" k="41" />
-<hkern u1="&#xf3;" u2="x" k="41" />
-<hkern u1="&#xf3;" u2="w" k="41" />
-<hkern u1="&#xf3;" u2="v" k="41" />
-<hkern u1="&#xf3;" u2="&#x27;" k="20" />
-<hkern u1="&#xf3;" u2="&#x22;" k="20" />
-<hkern u1="&#xf4;" u2="&#x201d;" k="20" />
-<hkern u1="&#xf4;" u2="&#x2019;" k="20" />
-<hkern u1="&#xf4;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#xf4;" u2="&#x1e83;" k="41" />
-<hkern u1="&#xf4;" u2="&#x1e81;" k="41" />
-<hkern u1="&#xf4;" u2="&#x17e;" k="20" />
-<hkern u1="&#xf4;" u2="&#x17c;" k="20" />
-<hkern u1="&#xf4;" u2="&#x17a;" k="20" />
-<hkern u1="&#xf4;" u2="&#x175;" k="41" />
-<hkern u1="&#xf4;" u2="&#xfd;" k="41" />
-<hkern u1="&#xf4;" u2="z" k="20" />
-<hkern u1="&#xf4;" u2="y" k="41" />
-<hkern u1="&#xf4;" u2="x" k="41" />
-<hkern u1="&#xf4;" u2="w" k="41" />
-<hkern u1="&#xf4;" u2="v" k="41" />
-<hkern u1="&#xf4;" u2="&#x27;" k="20" />
-<hkern u1="&#xf4;" u2="&#x22;" k="20" />
-<hkern u1="&#xf6;" u2="&#x201d;" k="41" />
-<hkern u1="&#xf6;" u2="&#x2019;" k="41" />
-<hkern u1="&#xf6;" u2="&#x27;" k="41" />
-<hkern u1="&#xf6;" u2="&#x22;" k="41" />
-<hkern u1="&#xf8;" u2="&#x201d;" k="20" />
-<hkern u1="&#xf8;" u2="&#x2019;" k="20" />
-<hkern u1="&#xf8;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#xf8;" u2="&#x1e83;" k="41" />
-<hkern u1="&#xf8;" u2="&#x1e81;" k="41" />
-<hkern u1="&#xf8;" u2="&#x17e;" k="20" />
-<hkern u1="&#xf8;" u2="&#x17c;" k="20" />
-<hkern u1="&#xf8;" u2="&#x17a;" k="20" />
-<hkern u1="&#xf8;" u2="&#x175;" k="41" />
-<hkern u1="&#xf8;" u2="&#xfd;" k="41" />
-<hkern u1="&#xf8;" u2="z" k="20" />
-<hkern u1="&#xf8;" u2="y" k="41" />
-<hkern u1="&#xf8;" u2="x" k="41" />
-<hkern u1="&#xf8;" u2="w" k="41" />
-<hkern u1="&#xf8;" u2="v" k="41" />
-<hkern u1="&#xf8;" u2="&#x27;" k="20" />
-<hkern u1="&#xf8;" u2="&#x22;" k="20" />
-<hkern u1="&#xfd;" u2="&#x201e;" k="82" />
-<hkern u1="&#xfd;" u2="&#x201d;" k="-82" />
-<hkern u1="&#xfd;" u2="&#x201a;" k="82" />
-<hkern u1="&#xfd;" u2="&#x2019;" k="-82" />
-<hkern u1="&#xfd;" u2="&#x3f;" k="-41" />
-<hkern u1="&#xfd;" u2="&#x2e;" k="82" />
-<hkern u1="&#xfd;" u2="&#x2c;" k="82" />
-<hkern u1="&#xfd;" u2="&#x27;" k="-82" />
-<hkern u1="&#xfd;" u2="&#x22;" k="-82" />
-<hkern u1="&#xfe;" u2="&#x201d;" k="20" />
-<hkern u1="&#xfe;" u2="&#x2019;" k="20" />
-<hkern u1="&#xfe;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#xfe;" u2="&#x1e83;" k="41" />
-<hkern u1="&#xfe;" u2="&#x1e81;" k="41" />
-<hkern u1="&#xfe;" u2="&#x17e;" k="20" />
-<hkern u1="&#xfe;" u2="&#x17c;" k="20" />
-<hkern u1="&#xfe;" u2="&#x17a;" k="20" />
-<hkern u1="&#xfe;" u2="&#x175;" k="41" />
-<hkern u1="&#xfe;" u2="&#xfd;" k="41" />
-<hkern u1="&#xfe;" u2="z" k="20" />
-<hkern u1="&#xfe;" u2="y" k="41" />
-<hkern u1="&#xfe;" u2="x" k="41" />
-<hkern u1="&#xfe;" u2="w" k="41" />
-<hkern u1="&#xfe;" u2="v" k="41" />
-<hkern u1="&#xfe;" u2="&#x27;" k="20" />
-<hkern u1="&#xfe;" u2="&#x22;" k="20" />
-<hkern u1="&#xff;" u2="&#x201e;" k="82" />
-<hkern u1="&#xff;" u2="&#x201d;" k="-82" />
-<hkern u1="&#xff;" u2="&#x201a;" k="82" />
-<hkern u1="&#xff;" u2="&#x2019;" k="-82" />
-<hkern u1="&#xff;" u2="&#x3f;" k="-41" />
-<hkern u1="&#xff;" u2="&#x2e;" k="82" />
-<hkern u1="&#xff;" u2="&#x2c;" k="82" />
-<hkern u1="&#xff;" u2="&#x27;" k="-82" />
-<hkern u1="&#xff;" u2="&#x22;" k="-82" />
-<hkern u1="&#x100;" u2="&#x201d;" k="143" />
-<hkern u1="&#x100;" u2="&#x2019;" k="143" />
-<hkern u1="&#x100;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x100;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x100;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x100;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x100;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x100;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x100;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x100;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x100;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x100;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x100;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x100;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x100;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x100;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x100;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x100;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x100;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x100;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x100;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x100;" u2="&#x21a;" k="143" />
-<hkern u1="&#x100;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x100;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x100;" u2="&#x178;" k="123" />
-<hkern u1="&#x100;" u2="&#x176;" k="123" />
-<hkern u1="&#x100;" u2="&#x174;" k="82" />
-<hkern u1="&#x100;" u2="&#x164;" k="143" />
-<hkern u1="&#x100;" u2="&#x162;" k="143" />
-<hkern u1="&#x100;" u2="&#x152;" k="41" />
-<hkern u1="&#x100;" u2="&#x150;" k="41" />
-<hkern u1="&#x100;" u2="&#x14e;" k="41" />
-<hkern u1="&#x100;" u2="&#x14c;" k="41" />
-<hkern u1="&#x100;" u2="&#x122;" k="41" />
-<hkern u1="&#x100;" u2="&#x120;" k="41" />
-<hkern u1="&#x100;" u2="&#x11e;" k="41" />
-<hkern u1="&#x100;" u2="&#x11c;" k="41" />
-<hkern u1="&#x100;" u2="&#x10c;" k="41" />
-<hkern u1="&#x100;" u2="&#x10a;" k="41" />
-<hkern u1="&#x100;" u2="&#x108;" k="41" />
-<hkern u1="&#x100;" u2="&#x106;" k="41" />
-<hkern u1="&#x100;" u2="&#xdd;" k="123" />
-<hkern u1="&#x100;" u2="&#xd8;" k="41" />
-<hkern u1="&#x100;" u2="&#xd6;" k="41" />
-<hkern u1="&#x100;" u2="&#xd5;" k="41" />
-<hkern u1="&#x100;" u2="&#xd4;" k="41" />
-<hkern u1="&#x100;" u2="&#xd3;" k="41" />
-<hkern u1="&#x100;" u2="&#xd2;" k="41" />
-<hkern u1="&#x100;" u2="&#xc7;" k="41" />
-<hkern u1="&#x100;" u2="Y" k="123" />
-<hkern u1="&#x100;" u2="W" k="82" />
-<hkern u1="&#x100;" u2="V" k="82" />
-<hkern u1="&#x100;" u2="T" k="143" />
-<hkern u1="&#x100;" u2="Q" k="41" />
-<hkern u1="&#x100;" u2="O" k="41" />
-<hkern u1="&#x100;" u2="J" k="-266" />
-<hkern u1="&#x100;" u2="G" k="41" />
-<hkern u1="&#x100;" u2="C" k="41" />
-<hkern u1="&#x100;" u2="&#x27;" k="143" />
-<hkern u1="&#x100;" u2="&#x22;" k="143" />
-<hkern u1="&#x101;" u2="&#x201d;" k="20" />
-<hkern u1="&#x101;" u2="&#x2019;" k="20" />
-<hkern u1="&#x101;" u2="&#x27;" k="20" />
-<hkern u1="&#x101;" u2="&#x22;" k="20" />
-<hkern u1="&#x102;" u2="&#x201d;" k="143" />
-<hkern u1="&#x102;" u2="&#x2019;" k="143" />
-<hkern u1="&#x102;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x102;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x102;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x102;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x102;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x102;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x102;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x102;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x102;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x102;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x102;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x102;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x102;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x102;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x102;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x102;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x102;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x102;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x102;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x102;" u2="&#x21a;" k="143" />
-<hkern u1="&#x102;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x102;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x102;" u2="&#x178;" k="123" />
-<hkern u1="&#x102;" u2="&#x176;" k="123" />
-<hkern u1="&#x102;" u2="&#x174;" k="82" />
-<hkern u1="&#x102;" u2="&#x164;" k="143" />
-<hkern u1="&#x102;" u2="&#x162;" k="143" />
-<hkern u1="&#x102;" u2="&#x152;" k="41" />
-<hkern u1="&#x102;" u2="&#x150;" k="41" />
-<hkern u1="&#x102;" u2="&#x14e;" k="41" />
-<hkern u1="&#x102;" u2="&#x14c;" k="41" />
-<hkern u1="&#x102;" u2="&#x122;" k="41" />
-<hkern u1="&#x102;" u2="&#x120;" k="41" />
-<hkern u1="&#x102;" u2="&#x11e;" k="41" />
-<hkern u1="&#x102;" u2="&#x11c;" k="41" />
-<hkern u1="&#x102;" u2="&#x10c;" k="41" />
-<hkern u1="&#x102;" u2="&#x10a;" k="41" />
-<hkern u1="&#x102;" u2="&#x108;" k="41" />
-<hkern u1="&#x102;" u2="&#x106;" k="41" />
-<hkern u1="&#x102;" u2="&#xdd;" k="123" />
-<hkern u1="&#x102;" u2="&#xd8;" k="41" />
-<hkern u1="&#x102;" u2="&#xd6;" k="41" />
-<hkern u1="&#x102;" u2="&#xd5;" k="41" />
-<hkern u1="&#x102;" u2="&#xd4;" k="41" />
-<hkern u1="&#x102;" u2="&#xd3;" k="41" />
-<hkern u1="&#x102;" u2="&#xd2;" k="41" />
-<hkern u1="&#x102;" u2="&#xc7;" k="41" />
-<hkern u1="&#x102;" u2="Y" k="123" />
-<hkern u1="&#x102;" u2="W" k="82" />
-<hkern u1="&#x102;" u2="V" k="82" />
-<hkern u1="&#x102;" u2="T" k="143" />
-<hkern u1="&#x102;" u2="Q" k="41" />
-<hkern u1="&#x102;" u2="O" k="41" />
-<hkern u1="&#x102;" u2="J" k="-266" />
-<hkern u1="&#x102;" u2="G" k="41" />
-<hkern u1="&#x102;" u2="C" k="41" />
-<hkern u1="&#x102;" u2="&#x27;" k="143" />
-<hkern u1="&#x102;" u2="&#x22;" k="143" />
-<hkern u1="&#x103;" u2="&#x201d;" k="20" />
-<hkern u1="&#x103;" u2="&#x2019;" k="20" />
-<hkern u1="&#x103;" u2="&#x27;" k="20" />
-<hkern u1="&#x103;" u2="&#x22;" k="20" />
-<hkern u1="&#x104;" u2="&#x201d;" k="143" />
-<hkern u1="&#x104;" u2="&#x2019;" k="143" />
-<hkern u1="&#x104;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x104;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x104;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x104;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x104;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x104;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x104;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x104;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x104;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x104;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x104;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x104;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x104;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x104;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x104;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x104;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x104;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x104;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x104;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x104;" u2="&#x21a;" k="143" />
-<hkern u1="&#x104;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x104;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x104;" u2="&#x178;" k="123" />
-<hkern u1="&#x104;" u2="&#x176;" k="123" />
-<hkern u1="&#x104;" u2="&#x174;" k="82" />
-<hkern u1="&#x104;" u2="&#x164;" k="143" />
-<hkern u1="&#x104;" u2="&#x162;" k="143" />
-<hkern u1="&#x104;" u2="&#x152;" k="41" />
-<hkern u1="&#x104;" u2="&#x150;" k="41" />
-<hkern u1="&#x104;" u2="&#x14e;" k="41" />
-<hkern u1="&#x104;" u2="&#x14c;" k="41" />
-<hkern u1="&#x104;" u2="&#x122;" k="41" />
-<hkern u1="&#x104;" u2="&#x120;" k="41" />
-<hkern u1="&#x104;" u2="&#x11e;" k="41" />
-<hkern u1="&#x104;" u2="&#x11c;" k="41" />
-<hkern u1="&#x104;" u2="&#x10c;" k="41" />
-<hkern u1="&#x104;" u2="&#x10a;" k="41" />
-<hkern u1="&#x104;" u2="&#x108;" k="41" />
-<hkern u1="&#x104;" u2="&#x106;" k="41" />
-<hkern u1="&#x104;" u2="&#xdd;" k="123" />
-<hkern u1="&#x104;" u2="&#xd8;" k="41" />
-<hkern u1="&#x104;" u2="&#xd6;" k="41" />
-<hkern u1="&#x104;" u2="&#xd5;" k="41" />
-<hkern u1="&#x104;" u2="&#xd4;" k="41" />
-<hkern u1="&#x104;" u2="&#xd3;" k="41" />
-<hkern u1="&#x104;" u2="&#xd2;" k="41" />
-<hkern u1="&#x104;" u2="&#xc7;" k="41" />
-<hkern u1="&#x104;" u2="Y" k="123" />
-<hkern u1="&#x104;" u2="W" k="82" />
-<hkern u1="&#x104;" u2="V" k="82" />
-<hkern u1="&#x104;" u2="T" k="143" />
-<hkern u1="&#x104;" u2="Q" k="41" />
-<hkern u1="&#x104;" u2="O" k="41" />
-<hkern u1="&#x104;" u2="J" k="-266" />
-<hkern u1="&#x104;" u2="G" k="41" />
-<hkern u1="&#x104;" u2="C" k="41" />
-<hkern u1="&#x104;" u2="&#x27;" k="143" />
-<hkern u1="&#x104;" u2="&#x22;" k="143" />
-<hkern u1="&#x105;" u2="&#x201d;" k="20" />
-<hkern u1="&#x105;" u2="&#x2019;" k="20" />
-<hkern u1="&#x105;" u2="&#x27;" k="20" />
-<hkern u1="&#x105;" u2="&#x22;" k="20" />
-<hkern u1="&#x106;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x106;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x106;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x106;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x106;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x106;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x106;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x106;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x106;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x106;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x106;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x106;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x106;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x106;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x106;" u2="&#x152;" k="41" />
-<hkern u1="&#x106;" u2="&#x150;" k="41" />
-<hkern u1="&#x106;" u2="&#x14e;" k="41" />
-<hkern u1="&#x106;" u2="&#x14c;" k="41" />
-<hkern u1="&#x106;" u2="&#x122;" k="41" />
-<hkern u1="&#x106;" u2="&#x120;" k="41" />
-<hkern u1="&#x106;" u2="&#x11e;" k="41" />
-<hkern u1="&#x106;" u2="&#x11c;" k="41" />
-<hkern u1="&#x106;" u2="&#x10c;" k="41" />
-<hkern u1="&#x106;" u2="&#x10a;" k="41" />
-<hkern u1="&#x106;" u2="&#x108;" k="41" />
-<hkern u1="&#x106;" u2="&#x106;" k="41" />
-<hkern u1="&#x106;" u2="&#xd8;" k="41" />
-<hkern u1="&#x106;" u2="&#xd6;" k="41" />
-<hkern u1="&#x106;" u2="&#xd5;" k="41" />
-<hkern u1="&#x106;" u2="&#xd4;" k="41" />
-<hkern u1="&#x106;" u2="&#xd3;" k="41" />
-<hkern u1="&#x106;" u2="&#xd2;" k="41" />
-<hkern u1="&#x106;" u2="&#xc7;" k="41" />
-<hkern u1="&#x106;" u2="Q" k="41" />
-<hkern u1="&#x106;" u2="O" k="41" />
-<hkern u1="&#x106;" u2="G" k="41" />
-<hkern u1="&#x106;" u2="C" k="41" />
-<hkern u1="&#x108;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x108;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x108;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x108;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x108;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x108;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x108;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x108;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x108;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x108;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x108;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x108;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x108;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x108;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x108;" u2="&#x152;" k="41" />
-<hkern u1="&#x108;" u2="&#x150;" k="41" />
-<hkern u1="&#x108;" u2="&#x14e;" k="41" />
-<hkern u1="&#x108;" u2="&#x14c;" k="41" />
-<hkern u1="&#x108;" u2="&#x122;" k="41" />
-<hkern u1="&#x108;" u2="&#x120;" k="41" />
-<hkern u1="&#x108;" u2="&#x11e;" k="41" />
-<hkern u1="&#x108;" u2="&#x11c;" k="41" />
-<hkern u1="&#x108;" u2="&#x10c;" k="41" />
-<hkern u1="&#x108;" u2="&#x10a;" k="41" />
-<hkern u1="&#x108;" u2="&#x108;" k="41" />
-<hkern u1="&#x108;" u2="&#x106;" k="41" />
-<hkern u1="&#x108;" u2="&#xd8;" k="41" />
-<hkern u1="&#x108;" u2="&#xd6;" k="41" />
-<hkern u1="&#x108;" u2="&#xd5;" k="41" />
-<hkern u1="&#x108;" u2="&#xd4;" k="41" />
-<hkern u1="&#x108;" u2="&#xd3;" k="41" />
-<hkern u1="&#x108;" u2="&#xd2;" k="41" />
-<hkern u1="&#x108;" u2="&#xc7;" k="41" />
-<hkern u1="&#x108;" u2="Q" k="41" />
-<hkern u1="&#x108;" u2="O" k="41" />
-<hkern u1="&#x108;" u2="G" k="41" />
-<hkern u1="&#x108;" u2="C" k="41" />
-<hkern u1="&#x10a;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x10a;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x10a;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x10a;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x10a;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x10a;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x10a;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x10a;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x10a;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x10a;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x10a;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x10a;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x10a;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x10a;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x10a;" u2="&#x152;" k="41" />
-<hkern u1="&#x10a;" u2="&#x150;" k="41" />
-<hkern u1="&#x10a;" u2="&#x14e;" k="41" />
-<hkern u1="&#x10a;" u2="&#x14c;" k="41" />
-<hkern u1="&#x10a;" u2="&#x122;" k="41" />
-<hkern u1="&#x10a;" u2="&#x120;" k="41" />
-<hkern u1="&#x10a;" u2="&#x11e;" k="41" />
-<hkern u1="&#x10a;" u2="&#x11c;" k="41" />
-<hkern u1="&#x10a;" u2="&#x10c;" k="41" />
-<hkern u1="&#x10a;" u2="&#x10a;" k="41" />
-<hkern u1="&#x10a;" u2="&#x108;" k="41" />
-<hkern u1="&#x10a;" u2="&#x106;" k="41" />
-<hkern u1="&#x10a;" u2="&#xd8;" k="41" />
-<hkern u1="&#x10a;" u2="&#xd6;" k="41" />
-<hkern u1="&#x10a;" u2="&#xd5;" k="41" />
-<hkern u1="&#x10a;" u2="&#xd4;" k="41" />
-<hkern u1="&#x10a;" u2="&#xd3;" k="41" />
-<hkern u1="&#x10a;" u2="&#xd2;" k="41" />
-<hkern u1="&#x10a;" u2="&#xc7;" k="41" />
-<hkern u1="&#x10a;" u2="Q" k="41" />
-<hkern u1="&#x10a;" u2="O" k="41" />
-<hkern u1="&#x10a;" u2="G" k="41" />
-<hkern u1="&#x10a;" u2="C" k="41" />
-<hkern u1="&#x10c;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x10c;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x10c;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x10c;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x10c;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x10c;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x10c;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x10c;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x10c;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x10c;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x10c;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x10c;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x10c;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x10c;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x10c;" u2="&#x152;" k="41" />
-<hkern u1="&#x10c;" u2="&#x150;" k="41" />
-<hkern u1="&#x10c;" u2="&#x14e;" k="41" />
-<hkern u1="&#x10c;" u2="&#x14c;" k="41" />
-<hkern u1="&#x10c;" u2="&#x122;" k="41" />
-<hkern u1="&#x10c;" u2="&#x120;" k="41" />
-<hkern u1="&#x10c;" u2="&#x11e;" k="41" />
-<hkern u1="&#x10c;" u2="&#x11c;" k="41" />
-<hkern u1="&#x10c;" u2="&#x10c;" k="41" />
-<hkern u1="&#x10c;" u2="&#x10a;" k="41" />
-<hkern u1="&#x10c;" u2="&#x108;" k="41" />
-<hkern u1="&#x10c;" u2="&#x106;" k="41" />
-<hkern u1="&#x10c;" u2="&#xd8;" k="41" />
-<hkern u1="&#x10c;" u2="&#xd6;" k="41" />
-<hkern u1="&#x10c;" u2="&#xd5;" k="41" />
-<hkern u1="&#x10c;" u2="&#xd4;" k="41" />
-<hkern u1="&#x10c;" u2="&#xd3;" k="41" />
-<hkern u1="&#x10c;" u2="&#xd2;" k="41" />
-<hkern u1="&#x10c;" u2="&#xc7;" k="41" />
-<hkern u1="&#x10c;" u2="Q" k="41" />
-<hkern u1="&#x10c;" u2="O" k="41" />
-<hkern u1="&#x10c;" u2="G" k="41" />
-<hkern u1="&#x10c;" u2="C" k="41" />
-<hkern u1="&#x10e;" u2="&#x201e;" k="82" />
-<hkern u1="&#x10e;" u2="&#x201a;" k="82" />
-<hkern u1="&#x10e;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#x10e;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#x10e;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#x10e;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#x10e;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#x10e;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#x10e;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#x10e;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#x10e;" u2="&#x1eae;" k="41" />
-<hkern u1="&#x10e;" u2="&#x1eac;" k="41" />
-<hkern u1="&#x10e;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#x10e;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#x10e;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#x10e;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#x10e;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#x10e;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#x10e;" u2="&#x1e84;" k="20" />
-<hkern u1="&#x10e;" u2="&#x1e82;" k="20" />
-<hkern u1="&#x10e;" u2="&#x1e80;" k="20" />
-<hkern u1="&#x10e;" u2="&#x1e00;" k="41" />
-<hkern u1="&#x10e;" u2="&#x405;" k="20" />
-<hkern u1="&#x10e;" u2="&#x21a;" k="61" />
-<hkern u1="&#x10e;" u2="&#x1fa;" k="41" />
-<hkern u1="&#x10e;" u2="&#x17d;" k="20" />
-<hkern u1="&#x10e;" u2="&#x17b;" k="20" />
-<hkern u1="&#x10e;" u2="&#x179;" k="20" />
-<hkern u1="&#x10e;" u2="&#x178;" k="20" />
-<hkern u1="&#x10e;" u2="&#x176;" k="20" />
-<hkern u1="&#x10e;" u2="&#x174;" k="20" />
-<hkern u1="&#x10e;" u2="&#x164;" k="61" />
-<hkern u1="&#x10e;" u2="&#x162;" k="61" />
-<hkern u1="&#x10e;" u2="&#x104;" k="41" />
-<hkern u1="&#x10e;" u2="&#x102;" k="41" />
-<hkern u1="&#x10e;" u2="&#x100;" k="41" />
-<hkern u1="&#x10e;" u2="&#xdd;" k="20" />
-<hkern u1="&#x10e;" u2="&#xc5;" k="41" />
-<hkern u1="&#x10e;" u2="&#xc4;" k="41" />
-<hkern u1="&#x10e;" u2="&#xc3;" k="41" />
-<hkern u1="&#x10e;" u2="&#xc2;" k="41" />
-<hkern u1="&#x10e;" u2="&#xc1;" k="41" />
-<hkern u1="&#x10e;" u2="&#xc0;" k="41" />
-<hkern u1="&#x10e;" u2="Z" k="20" />
-<hkern u1="&#x10e;" u2="Y" k="20" />
-<hkern u1="&#x10e;" u2="X" k="41" />
-<hkern u1="&#x10e;" u2="W" k="20" />
-<hkern u1="&#x10e;" u2="V" k="20" />
-<hkern u1="&#x10e;" u2="T" k="61" />
-<hkern u1="&#x10e;" u2="A" k="41" />
-<hkern u1="&#x10e;" u2="&#x2e;" k="82" />
-<hkern u1="&#x10e;" u2="&#x2c;" k="82" />
-<hkern u1="&#x10f;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x10f;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x10f;" u2="&#x127;" k="-123" />
-<hkern u1="&#x10f;" u2="&#x125;" k="-61" />
-<hkern u1="&#x10f;" u2="&#x7d;" k="-143" />
-<hkern u1="&#x10f;" u2="l" k="-61" />
-<hkern u1="&#x10f;" u2="k" k="-61" />
-<hkern u1="&#x10f;" u2="h" k="-61" />
-<hkern u1="&#x10f;" u2="b" k="-61" />
-<hkern u1="&#x10f;" u2="]" k="-143" />
-<hkern u1="&#x10f;" u2="&#x3f;" k="-164" />
-<hkern u1="&#x10f;" u2="&#x29;" k="-143" />
-<hkern u1="&#x10f;" u2="&#x27;" k="-82" />
-<hkern u1="&#x10f;" u2="&#x22;" k="-82" />
-<hkern u1="&#x110;" u2="&#x201e;" k="82" />
-<hkern u1="&#x110;" u2="&#x201a;" k="82" />
-<hkern u1="&#x110;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#x110;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#x110;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#x110;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#x110;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#x110;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#x110;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#x110;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#x110;" u2="&#x1eae;" k="41" />
-<hkern u1="&#x110;" u2="&#x1eac;" k="41" />
-<hkern u1="&#x110;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#x110;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#x110;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#x110;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#x110;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#x110;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#x110;" u2="&#x1e84;" k="20" />
-<hkern u1="&#x110;" u2="&#x1e82;" k="20" />
-<hkern u1="&#x110;" u2="&#x1e80;" k="20" />
-<hkern u1="&#x110;" u2="&#x1e00;" k="41" />
-<hkern u1="&#x110;" u2="&#x405;" k="20" />
-<hkern u1="&#x110;" u2="&#x21a;" k="61" />
-<hkern u1="&#x110;" u2="&#x1fa;" k="41" />
-<hkern u1="&#x110;" u2="&#x17d;" k="20" />
-<hkern u1="&#x110;" u2="&#x17b;" k="20" />
-<hkern u1="&#x110;" u2="&#x179;" k="20" />
-<hkern u1="&#x110;" u2="&#x178;" k="20" />
-<hkern u1="&#x110;" u2="&#x176;" k="20" />
-<hkern u1="&#x110;" u2="&#x174;" k="20" />
-<hkern u1="&#x110;" u2="&#x164;" k="61" />
-<hkern u1="&#x110;" u2="&#x162;" k="61" />
-<hkern u1="&#x110;" u2="&#x104;" k="41" />
-<hkern u1="&#x110;" u2="&#x102;" k="41" />
-<hkern u1="&#x110;" u2="&#x100;" k="41" />
-<hkern u1="&#x110;" u2="&#xdd;" k="20" />
-<hkern u1="&#x110;" u2="&#xc5;" k="41" />
-<hkern u1="&#x110;" u2="&#xc4;" k="41" />
-<hkern u1="&#x110;" u2="&#xc3;" k="41" />
-<hkern u1="&#x110;" u2="&#xc2;" k="41" />
-<hkern u1="&#x110;" u2="&#xc1;" k="41" />
-<hkern u1="&#x110;" u2="&#xc0;" k="41" />
-<hkern u1="&#x110;" u2="Z" k="20" />
-<hkern u1="&#x110;" u2="Y" k="20" />
-<hkern u1="&#x110;" u2="X" k="41" />
-<hkern u1="&#x110;" u2="W" k="20" />
-<hkern u1="&#x110;" u2="V" k="20" />
-<hkern u1="&#x110;" u2="T" k="61" />
-<hkern u1="&#x110;" u2="A" k="41" />
-<hkern u1="&#x110;" u2="&#x2e;" k="82" />
-<hkern u1="&#x110;" u2="&#x2c;" k="82" />
-<hkern u1="&#x112;" u2="J" k="-123" />
-<hkern u1="&#x113;" u2="&#x201d;" k="20" />
-<hkern u1="&#x113;" u2="&#x2019;" k="20" />
-<hkern u1="&#x113;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x113;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x113;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x113;" u2="&#x17e;" k="20" />
-<hkern u1="&#x113;" u2="&#x17c;" k="20" />
-<hkern u1="&#x113;" u2="&#x17a;" k="20" />
-<hkern u1="&#x113;" u2="&#x175;" k="41" />
-<hkern u1="&#x113;" u2="&#xfd;" k="41" />
-<hkern u1="&#x113;" u2="z" k="20" />
-<hkern u1="&#x113;" u2="y" k="41" />
-<hkern u1="&#x113;" u2="x" k="41" />
-<hkern u1="&#x113;" u2="w" k="41" />
-<hkern u1="&#x113;" u2="v" k="41" />
-<hkern u1="&#x113;" u2="&#x27;" k="20" />
-<hkern u1="&#x113;" u2="&#x22;" k="20" />
-<hkern u1="&#x114;" u2="J" k="-123" />
-<hkern u1="&#x115;" u2="&#x201d;" k="20" />
-<hkern u1="&#x115;" u2="&#x2019;" k="20" />
-<hkern u1="&#x115;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x115;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x115;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x115;" u2="&#x17e;" k="20" />
-<hkern u1="&#x115;" u2="&#x17c;" k="20" />
-<hkern u1="&#x115;" u2="&#x17a;" k="20" />
-<hkern u1="&#x115;" u2="&#x175;" k="41" />
-<hkern u1="&#x115;" u2="&#xfd;" k="41" />
-<hkern u1="&#x115;" u2="z" k="20" />
-<hkern u1="&#x115;" u2="y" k="41" />
-<hkern u1="&#x115;" u2="x" k="41" />
-<hkern u1="&#x115;" u2="w" k="41" />
-<hkern u1="&#x115;" u2="v" k="41" />
-<hkern u1="&#x115;" u2="&#x27;" k="20" />
-<hkern u1="&#x115;" u2="&#x22;" k="20" />
-<hkern u1="&#x116;" u2="J" k="-123" />
-<hkern u1="&#x117;" u2="&#x201d;" k="20" />
-<hkern u1="&#x117;" u2="&#x2019;" k="20" />
-<hkern u1="&#x117;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x117;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x117;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x117;" u2="&#x17e;" k="20" />
-<hkern u1="&#x117;" u2="&#x17c;" k="20" />
-<hkern u1="&#x117;" u2="&#x17a;" k="20" />
-<hkern u1="&#x117;" u2="&#x175;" k="41" />
-<hkern u1="&#x117;" u2="&#xfd;" k="41" />
-<hkern u1="&#x117;" u2="z" k="20" />
-<hkern u1="&#x117;" u2="y" k="41" />
-<hkern u1="&#x117;" u2="x" k="41" />
-<hkern u1="&#x117;" u2="w" k="41" />
-<hkern u1="&#x117;" u2="v" k="41" />
-<hkern u1="&#x117;" u2="&#x27;" k="20" />
-<hkern u1="&#x117;" u2="&#x22;" k="20" />
-<hkern u1="&#x118;" u2="J" k="-123" />
-<hkern u1="&#x119;" u2="&#x201d;" k="20" />
-<hkern u1="&#x119;" u2="&#x2019;" k="20" />
-<hkern u1="&#x119;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x119;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x119;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x119;" u2="&#x17e;" k="20" />
-<hkern u1="&#x119;" u2="&#x17c;" k="20" />
-<hkern u1="&#x119;" u2="&#x17a;" k="20" />
-<hkern u1="&#x119;" u2="&#x175;" k="41" />
-<hkern u1="&#x119;" u2="&#xfd;" k="41" />
-<hkern u1="&#x119;" u2="z" k="20" />
-<hkern u1="&#x119;" u2="y" k="41" />
-<hkern u1="&#x119;" u2="x" k="41" />
-<hkern u1="&#x119;" u2="w" k="41" />
-<hkern u1="&#x119;" u2="v" k="41" />
-<hkern u1="&#x119;" u2="&#x27;" k="20" />
-<hkern u1="&#x119;" u2="&#x22;" k="20" />
-<hkern u1="&#x11a;" u2="J" k="-123" />
-<hkern u1="&#x11b;" u2="&#x201d;" k="20" />
-<hkern u1="&#x11b;" u2="&#x2019;" k="20" />
-<hkern u1="&#x11b;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x11b;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x11b;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x11b;" u2="&#x17e;" k="20" />
-<hkern u1="&#x11b;" u2="&#x17c;" k="20" />
-<hkern u1="&#x11b;" u2="&#x17a;" k="20" />
-<hkern u1="&#x11b;" u2="&#x175;" k="41" />
-<hkern u1="&#x11b;" u2="&#xfd;" k="41" />
-<hkern u1="&#x11b;" u2="z" k="20" />
-<hkern u1="&#x11b;" u2="y" k="41" />
-<hkern u1="&#x11b;" u2="x" k="41" />
-<hkern u1="&#x11b;" u2="w" k="41" />
-<hkern u1="&#x11b;" u2="v" k="41" />
-<hkern u1="&#x11b;" u2="&#x27;" k="20" />
-<hkern u1="&#x11b;" u2="&#x22;" k="20" />
-<hkern u1="&#x125;" u2="&#x201d;" k="20" />
-<hkern u1="&#x125;" u2="&#x2019;" k="20" />
-<hkern u1="&#x125;" u2="&#x27;" k="20" />
-<hkern u1="&#x125;" u2="&#x22;" k="20" />
-<hkern u1="&#x136;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x136;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x136;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x136;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x136;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x136;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x136;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x136;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x136;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x136;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x136;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x136;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x136;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x136;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x136;" u2="&#x152;" k="41" />
-<hkern u1="&#x136;" u2="&#x150;" k="41" />
-<hkern u1="&#x136;" u2="&#x14e;" k="41" />
-<hkern u1="&#x136;" u2="&#x14c;" k="41" />
-<hkern u1="&#x136;" u2="&#x122;" k="41" />
-<hkern u1="&#x136;" u2="&#x120;" k="41" />
-<hkern u1="&#x136;" u2="&#x11e;" k="41" />
-<hkern u1="&#x136;" u2="&#x11c;" k="41" />
-<hkern u1="&#x136;" u2="&#x10c;" k="41" />
-<hkern u1="&#x136;" u2="&#x10a;" k="41" />
-<hkern u1="&#x136;" u2="&#x108;" k="41" />
-<hkern u1="&#x136;" u2="&#x106;" k="41" />
-<hkern u1="&#x136;" u2="&#xd8;" k="41" />
-<hkern u1="&#x136;" u2="&#xd6;" k="41" />
-<hkern u1="&#x136;" u2="&#xd5;" k="41" />
-<hkern u1="&#x136;" u2="&#xd4;" k="41" />
-<hkern u1="&#x136;" u2="&#xd3;" k="41" />
-<hkern u1="&#x136;" u2="&#xd2;" k="41" />
-<hkern u1="&#x136;" u2="&#xc7;" k="41" />
-<hkern u1="&#x136;" u2="Q" k="41" />
-<hkern u1="&#x136;" u2="O" k="41" />
-<hkern u1="&#x136;" u2="G" k="41" />
-<hkern u1="&#x136;" u2="C" k="41" />
-<hkern u1="&#x137;" u2="&#x1ee3;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ee1;" k="41" />
-<hkern u1="&#x137;" u2="&#x1edf;" k="41" />
-<hkern u1="&#x137;" u2="&#x1edd;" k="41" />
-<hkern u1="&#x137;" u2="&#x1edb;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ed9;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ed7;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ed5;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ed1;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ecf;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ecd;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ec7;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ec5;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ec3;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ebf;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ebd;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ebb;" k="41" />
-<hkern u1="&#x137;" u2="&#x1eb9;" k="41" />
-<hkern u1="&#x137;" u2="&#x1ff;" k="41" />
-<hkern u1="&#x137;" u2="&#x1a1;" k="41" />
-<hkern u1="&#x137;" u2="&#x153;" k="41" />
-<hkern u1="&#x137;" u2="&#x151;" k="41" />
-<hkern u1="&#x137;" u2="&#x14f;" k="41" />
-<hkern u1="&#x137;" u2="&#x14d;" k="41" />
-<hkern u1="&#x137;" u2="&#x11b;" k="41" />
-<hkern u1="&#x137;" u2="&#x119;" k="41" />
-<hkern u1="&#x137;" u2="&#x117;" k="41" />
-<hkern u1="&#x137;" u2="&#x115;" k="41" />
-<hkern u1="&#x137;" u2="&#x113;" k="41" />
-<hkern u1="&#x137;" u2="&#x111;" k="41" />
-<hkern u1="&#x137;" u2="&#x10f;" k="41" />
-<hkern u1="&#x137;" u2="&#x10d;" k="41" />
-<hkern u1="&#x137;" u2="&#x10b;" k="41" />
-<hkern u1="&#x137;" u2="&#x109;" k="41" />
-<hkern u1="&#x137;" u2="&#x107;" k="41" />
-<hkern u1="&#x137;" u2="&#xf8;" k="41" />
-<hkern u1="&#x137;" u2="&#xf6;" k="41" />
-<hkern u1="&#x137;" u2="&#xf5;" k="41" />
-<hkern u1="&#x137;" u2="&#xf4;" k="41" />
-<hkern u1="&#x137;" u2="&#xf3;" k="41" />
-<hkern u1="&#x137;" u2="&#xf2;" k="41" />
-<hkern u1="&#x137;" u2="&#xeb;" k="41" />
-<hkern u1="&#x137;" u2="&#xea;" k="41" />
-<hkern u1="&#x137;" u2="&#xe9;" k="41" />
-<hkern u1="&#x137;" u2="&#xe8;" k="41" />
-<hkern u1="&#x137;" u2="&#xe7;" k="41" />
-<hkern u1="&#x137;" u2="&#xe0;" k="41" />
-<hkern u1="&#x137;" u2="q" k="41" />
-<hkern u1="&#x137;" u2="o" k="41" />
-<hkern u1="&#x137;" u2="e" k="41" />
-<hkern u1="&#x137;" u2="d" k="41" />
-<hkern u1="&#x137;" u2="c" k="41" />
-<hkern u1="&#x138;" u2="&#x1ee3;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ee1;" k="41" />
-<hkern u1="&#x138;" u2="&#x1edf;" k="41" />
-<hkern u1="&#x138;" u2="&#x1edd;" k="41" />
-<hkern u1="&#x138;" u2="&#x1edb;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ed9;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ed7;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ed5;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ed1;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ecf;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ecd;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ec7;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ec5;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ec3;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ebf;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ebd;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ebb;" k="41" />
-<hkern u1="&#x138;" u2="&#x1eb9;" k="41" />
-<hkern u1="&#x138;" u2="&#x1ff;" k="41" />
-<hkern u1="&#x138;" u2="&#x1a1;" k="41" />
-<hkern u1="&#x138;" u2="&#x153;" k="41" />
-<hkern u1="&#x138;" u2="&#x151;" k="41" />
-<hkern u1="&#x138;" u2="&#x14f;" k="41" />
-<hkern u1="&#x138;" u2="&#x14d;" k="41" />
-<hkern u1="&#x138;" u2="&#x11b;" k="41" />
-<hkern u1="&#x138;" u2="&#x119;" k="41" />
-<hkern u1="&#x138;" u2="&#x117;" k="41" />
-<hkern u1="&#x138;" u2="&#x115;" k="41" />
-<hkern u1="&#x138;" u2="&#x113;" k="41" />
-<hkern u1="&#x138;" u2="&#x111;" k="41" />
-<hkern u1="&#x138;" u2="&#x10f;" k="41" />
-<hkern u1="&#x138;" u2="&#x10d;" k="41" />
-<hkern u1="&#x138;" u2="&#x10b;" k="41" />
-<hkern u1="&#x138;" u2="&#x109;" k="41" />
-<hkern u1="&#x138;" u2="&#x107;" k="41" />
-<hkern u1="&#x138;" u2="&#xf8;" k="41" />
-<hkern u1="&#x138;" u2="&#xf6;" k="41" />
-<hkern u1="&#x138;" u2="&#xf5;" k="41" />
-<hkern u1="&#x138;" u2="&#xf4;" k="41" />
-<hkern u1="&#x138;" u2="&#xf3;" k="41" />
-<hkern u1="&#x138;" u2="&#xf2;" k="41" />
-<hkern u1="&#x138;" u2="&#xeb;" k="41" />
-<hkern u1="&#x138;" u2="&#xea;" k="41" />
-<hkern u1="&#x138;" u2="&#xe9;" k="41" />
-<hkern u1="&#x138;" u2="&#xe8;" k="41" />
-<hkern u1="&#x138;" u2="&#xe7;" k="41" />
-<hkern u1="&#x138;" u2="&#xe0;" k="41" />
-<hkern u1="&#x138;" u2="q" k="41" />
-<hkern u1="&#x138;" u2="o" k="41" />
-<hkern u1="&#x138;" u2="e" k="41" />
-<hkern u1="&#x138;" u2="d" k="41" />
-<hkern u1="&#x138;" u2="c" k="41" />
-<hkern u1="&#x139;" u2="&#x201d;" k="164" />
-<hkern u1="&#x139;" u2="&#x2019;" k="164" />
-<hkern u1="&#x139;" u2="&#x1ef8;" k="61" />
-<hkern u1="&#x139;" u2="&#x1ef6;" k="61" />
-<hkern u1="&#x139;" u2="&#x1ef4;" k="61" />
-<hkern u1="&#x139;" u2="&#x1ef2;" k="61" />
-<hkern u1="&#x139;" u2="&#x1ef0;" k="20" />
-<hkern u1="&#x139;" u2="&#x1eee;" k="20" />
-<hkern u1="&#x139;" u2="&#x1eec;" k="20" />
-<hkern u1="&#x139;" u2="&#x1eea;" k="20" />
-<hkern u1="&#x139;" u2="&#x1ee8;" k="20" />
-<hkern u1="&#x139;" u2="&#x1ee6;" k="20" />
-<hkern u1="&#x139;" u2="&#x1ee4;" k="20" />
-<hkern u1="&#x139;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x139;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x139;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x139;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x139;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x139;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x139;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x139;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x139;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x139;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x139;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x139;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x139;" u2="&#x1e84;" k="41" />
-<hkern u1="&#x139;" u2="&#x1e82;" k="41" />
-<hkern u1="&#x139;" u2="&#x1e80;" k="41" />
-<hkern u1="&#x139;" u2="&#x21a;" k="41" />
-<hkern u1="&#x139;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x139;" u2="&#x1af;" k="20" />
-<hkern u1="&#x139;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x139;" u2="&#x178;" k="61" />
-<hkern u1="&#x139;" u2="&#x176;" k="61" />
-<hkern u1="&#x139;" u2="&#x174;" k="41" />
-<hkern u1="&#x139;" u2="&#x172;" k="20" />
-<hkern u1="&#x139;" u2="&#x170;" k="20" />
-<hkern u1="&#x139;" u2="&#x16e;" k="20" />
-<hkern u1="&#x139;" u2="&#x16c;" k="20" />
-<hkern u1="&#x139;" u2="&#x16a;" k="20" />
-<hkern u1="&#x139;" u2="&#x168;" k="20" />
-<hkern u1="&#x139;" u2="&#x164;" k="41" />
-<hkern u1="&#x139;" u2="&#x162;" k="41" />
-<hkern u1="&#x139;" u2="&#x152;" k="41" />
-<hkern u1="&#x139;" u2="&#x150;" k="41" />
-<hkern u1="&#x139;" u2="&#x14e;" k="41" />
-<hkern u1="&#x139;" u2="&#x14c;" k="41" />
-<hkern u1="&#x139;" u2="&#x122;" k="41" />
-<hkern u1="&#x139;" u2="&#x120;" k="41" />
-<hkern u1="&#x139;" u2="&#x11e;" k="41" />
-<hkern u1="&#x139;" u2="&#x11c;" k="41" />
-<hkern u1="&#x139;" u2="&#x10c;" k="41" />
-<hkern u1="&#x139;" u2="&#x10a;" k="41" />
-<hkern u1="&#x139;" u2="&#x108;" k="41" />
-<hkern u1="&#x139;" u2="&#x106;" k="41" />
-<hkern u1="&#x139;" u2="&#xdd;" k="61" />
-<hkern u1="&#x139;" u2="&#xdc;" k="20" />
-<hkern u1="&#x139;" u2="&#xdb;" k="20" />
-<hkern u1="&#x139;" u2="&#xda;" k="20" />
-<hkern u1="&#x139;" u2="&#xd9;" k="20" />
-<hkern u1="&#x139;" u2="&#xd8;" k="41" />
-<hkern u1="&#x139;" u2="&#xd6;" k="41" />
-<hkern u1="&#x139;" u2="&#xd5;" k="41" />
-<hkern u1="&#x139;" u2="&#xd4;" k="41" />
-<hkern u1="&#x139;" u2="&#xd3;" k="41" />
-<hkern u1="&#x139;" u2="&#xd2;" k="41" />
-<hkern u1="&#x139;" u2="&#xc7;" k="41" />
-<hkern u1="&#x139;" u2="Y" k="61" />
-<hkern u1="&#x139;" u2="W" k="41" />
-<hkern u1="&#x139;" u2="V" k="41" />
-<hkern u1="&#x139;" u2="U" k="20" />
-<hkern u1="&#x139;" u2="T" k="41" />
-<hkern u1="&#x139;" u2="Q" k="41" />
-<hkern u1="&#x139;" u2="O" k="41" />
-<hkern u1="&#x139;" u2="G" k="41" />
-<hkern u1="&#x139;" u2="C" k="41" />
-<hkern u1="&#x139;" u2="&#x27;" k="164" />
-<hkern u1="&#x139;" u2="&#x22;" k="164" />
-<hkern u1="&#x13b;" u2="&#x201d;" k="164" />
-<hkern u1="&#x13b;" u2="&#x2019;" k="164" />
-<hkern u1="&#x13b;" u2="&#x1ef8;" k="61" />
-<hkern u1="&#x13b;" u2="&#x1ef6;" k="61" />
-<hkern u1="&#x13b;" u2="&#x1ef4;" k="61" />
-<hkern u1="&#x13b;" u2="&#x1ef2;" k="61" />
-<hkern u1="&#x13b;" u2="&#x1ef0;" k="20" />
-<hkern u1="&#x13b;" u2="&#x1eee;" k="20" />
-<hkern u1="&#x13b;" u2="&#x1eec;" k="20" />
-<hkern u1="&#x13b;" u2="&#x1eea;" k="20" />
-<hkern u1="&#x13b;" u2="&#x1ee8;" k="20" />
-<hkern u1="&#x13b;" u2="&#x1ee6;" k="20" />
-<hkern u1="&#x13b;" u2="&#x1ee4;" k="20" />
-<hkern u1="&#x13b;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1e84;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1e82;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1e80;" k="41" />
-<hkern u1="&#x13b;" u2="&#x21a;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x13b;" u2="&#x1af;" k="20" />
-<hkern u1="&#x13b;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x13b;" u2="&#x178;" k="61" />
-<hkern u1="&#x13b;" u2="&#x176;" k="61" />
-<hkern u1="&#x13b;" u2="&#x174;" k="41" />
-<hkern u1="&#x13b;" u2="&#x172;" k="20" />
-<hkern u1="&#x13b;" u2="&#x170;" k="20" />
-<hkern u1="&#x13b;" u2="&#x16e;" k="20" />
-<hkern u1="&#x13b;" u2="&#x16c;" k="20" />
-<hkern u1="&#x13b;" u2="&#x16a;" k="20" />
-<hkern u1="&#x13b;" u2="&#x168;" k="20" />
-<hkern u1="&#x13b;" u2="&#x164;" k="41" />
-<hkern u1="&#x13b;" u2="&#x162;" k="41" />
-<hkern u1="&#x13b;" u2="&#x152;" k="41" />
-<hkern u1="&#x13b;" u2="&#x150;" k="41" />
-<hkern u1="&#x13b;" u2="&#x14e;" k="41" />
-<hkern u1="&#x13b;" u2="&#x14c;" k="41" />
-<hkern u1="&#x13b;" u2="&#x122;" k="41" />
-<hkern u1="&#x13b;" u2="&#x120;" k="41" />
-<hkern u1="&#x13b;" u2="&#x11e;" k="41" />
-<hkern u1="&#x13b;" u2="&#x11c;" k="41" />
-<hkern u1="&#x13b;" u2="&#x10c;" k="41" />
-<hkern u1="&#x13b;" u2="&#x10a;" k="41" />
-<hkern u1="&#x13b;" u2="&#x108;" k="41" />
-<hkern u1="&#x13b;" u2="&#x106;" k="41" />
-<hkern u1="&#x13b;" u2="&#xdd;" k="61" />
-<hkern u1="&#x13b;" u2="&#xdc;" k="20" />
-<hkern u1="&#x13b;" u2="&#xdb;" k="20" />
-<hkern u1="&#x13b;" u2="&#xda;" k="20" />
-<hkern u1="&#x13b;" u2="&#xd9;" k="20" />
-<hkern u1="&#x13b;" u2="&#xd8;" k="41" />
-<hkern u1="&#x13b;" u2="&#xd6;" k="41" />
-<hkern u1="&#x13b;" u2="&#xd5;" k="41" />
-<hkern u1="&#x13b;" u2="&#xd4;" k="41" />
-<hkern u1="&#x13b;" u2="&#xd3;" k="41" />
-<hkern u1="&#x13b;" u2="&#xd2;" k="41" />
-<hkern u1="&#x13b;" u2="&#xc7;" k="41" />
-<hkern u1="&#x13b;" u2="Y" k="61" />
-<hkern u1="&#x13b;" u2="W" k="41" />
-<hkern u1="&#x13b;" u2="V" k="41" />
-<hkern u1="&#x13b;" u2="U" k="20" />
-<hkern u1="&#x13b;" u2="T" k="41" />
-<hkern u1="&#x13b;" u2="Q" k="41" />
-<hkern u1="&#x13b;" u2="O" k="41" />
-<hkern u1="&#x13b;" u2="G" k="41" />
-<hkern u1="&#x13b;" u2="C" k="41" />
-<hkern u1="&#x13b;" u2="&#x27;" k="164" />
-<hkern u1="&#x13b;" u2="&#x22;" k="164" />
-<hkern u1="&#x13d;" u2="&#x201d;" k="164" />
-<hkern u1="&#x13d;" u2="&#x2019;" k="164" />
-<hkern u1="&#x13d;" u2="&#x1ef8;" k="61" />
-<hkern u1="&#x13d;" u2="&#x1ef6;" k="61" />
-<hkern u1="&#x13d;" u2="&#x1ef4;" k="61" />
-<hkern u1="&#x13d;" u2="&#x1ef2;" k="61" />
-<hkern u1="&#x13d;" u2="&#x1ef0;" k="20" />
-<hkern u1="&#x13d;" u2="&#x1eee;" k="20" />
-<hkern u1="&#x13d;" u2="&#x1eec;" k="20" />
-<hkern u1="&#x13d;" u2="&#x1eea;" k="20" />
-<hkern u1="&#x13d;" u2="&#x1ee8;" k="20" />
-<hkern u1="&#x13d;" u2="&#x1ee6;" k="20" />
-<hkern u1="&#x13d;" u2="&#x1ee4;" k="20" />
-<hkern u1="&#x13d;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1e84;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1e82;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1e80;" k="41" />
-<hkern u1="&#x13d;" u2="&#x21a;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x13d;" u2="&#x1af;" k="20" />
-<hkern u1="&#x13d;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x13d;" u2="&#x178;" k="61" />
-<hkern u1="&#x13d;" u2="&#x176;" k="61" />
-<hkern u1="&#x13d;" u2="&#x174;" k="41" />
-<hkern u1="&#x13d;" u2="&#x172;" k="20" />
-<hkern u1="&#x13d;" u2="&#x170;" k="20" />
-<hkern u1="&#x13d;" u2="&#x16e;" k="20" />
-<hkern u1="&#x13d;" u2="&#x16c;" k="20" />
-<hkern u1="&#x13d;" u2="&#x16a;" k="20" />
-<hkern u1="&#x13d;" u2="&#x168;" k="20" />
-<hkern u1="&#x13d;" u2="&#x164;" k="41" />
-<hkern u1="&#x13d;" u2="&#x162;" k="41" />
-<hkern u1="&#x13d;" u2="&#x152;" k="41" />
-<hkern u1="&#x13d;" u2="&#x150;" k="41" />
-<hkern u1="&#x13d;" u2="&#x14e;" k="41" />
-<hkern u1="&#x13d;" u2="&#x14c;" k="41" />
-<hkern u1="&#x13d;" u2="&#x122;" k="41" />
-<hkern u1="&#x13d;" u2="&#x120;" k="41" />
-<hkern u1="&#x13d;" u2="&#x11e;" k="41" />
-<hkern u1="&#x13d;" u2="&#x11c;" k="41" />
-<hkern u1="&#x13d;" u2="&#x10c;" k="41" />
-<hkern u1="&#x13d;" u2="&#x10a;" k="41" />
-<hkern u1="&#x13d;" u2="&#x108;" k="41" />
-<hkern u1="&#x13d;" u2="&#x106;" k="41" />
-<hkern u1="&#x13d;" u2="&#xdd;" k="61" />
-<hkern u1="&#x13d;" u2="&#xdc;" k="20" />
-<hkern u1="&#x13d;" u2="&#xdb;" k="20" />
-<hkern u1="&#x13d;" u2="&#xda;" k="20" />
-<hkern u1="&#x13d;" u2="&#xd9;" k="20" />
-<hkern u1="&#x13d;" u2="&#xd8;" k="41" />
-<hkern u1="&#x13d;" u2="&#xd6;" k="41" />
-<hkern u1="&#x13d;" u2="&#xd5;" k="41" />
-<hkern u1="&#x13d;" u2="&#xd4;" k="41" />
-<hkern u1="&#x13d;" u2="&#xd3;" k="41" />
-<hkern u1="&#x13d;" u2="&#xd2;" k="41" />
-<hkern u1="&#x13d;" u2="&#xc7;" k="41" />
-<hkern u1="&#x13d;" u2="Y" k="61" />
-<hkern u1="&#x13d;" u2="W" k="41" />
-<hkern u1="&#x13d;" u2="V" k="41" />
-<hkern u1="&#x13d;" u2="U" k="20" />
-<hkern u1="&#x13d;" u2="T" k="41" />
-<hkern u1="&#x13d;" u2="Q" k="41" />
-<hkern u1="&#x13d;" u2="O" k="41" />
-<hkern u1="&#x13d;" u2="G" k="41" />
-<hkern u1="&#x13d;" u2="C" k="41" />
-<hkern u1="&#x13d;" u2="&#x27;" k="164" />
-<hkern u1="&#x13d;" u2="&#x22;" k="164" />
-<hkern u1="&#x13e;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x13e;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x13e;" u2="&#x127;" k="-143" />
-<hkern u1="&#x13e;" u2="&#x125;" k="-61" />
-<hkern u1="&#x13e;" u2="&#x7d;" k="-143" />
-<hkern u1="&#x13e;" u2="l" k="-61" />
-<hkern u1="&#x13e;" u2="k" k="-61" />
-<hkern u1="&#x13e;" u2="h" k="-61" />
-<hkern u1="&#x13e;" u2="b" k="-61" />
-<hkern u1="&#x13e;" u2="]" k="-143" />
-<hkern u1="&#x13e;" u2="&#x3f;" k="-143" />
-<hkern u1="&#x13e;" u2="&#x29;" k="-143" />
-<hkern u1="&#x13e;" u2="&#x27;" k="-82" />
-<hkern u1="&#x13e;" u2="&#x22;" k="-82" />
-<hkern u1="&#x13f;" u2="&#x201d;" k="164" />
-<hkern u1="&#x13f;" u2="&#x2019;" k="164" />
-<hkern u1="&#x13f;" u2="&#x1ef8;" k="61" />
-<hkern u1="&#x13f;" u2="&#x1ef6;" k="61" />
-<hkern u1="&#x13f;" u2="&#x1ef4;" k="61" />
-<hkern u1="&#x13f;" u2="&#x1ef2;" k="61" />
-<hkern u1="&#x13f;" u2="&#x1ef0;" k="20" />
-<hkern u1="&#x13f;" u2="&#x1eee;" k="20" />
-<hkern u1="&#x13f;" u2="&#x1eec;" k="20" />
-<hkern u1="&#x13f;" u2="&#x1eea;" k="20" />
-<hkern u1="&#x13f;" u2="&#x1ee8;" k="20" />
-<hkern u1="&#x13f;" u2="&#x1ee6;" k="20" />
-<hkern u1="&#x13f;" u2="&#x1ee4;" k="20" />
-<hkern u1="&#x13f;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1e84;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1e82;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1e80;" k="41" />
-<hkern u1="&#x13f;" u2="&#x21a;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x13f;" u2="&#x1af;" k="20" />
-<hkern u1="&#x13f;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x13f;" u2="&#x178;" k="61" />
-<hkern u1="&#x13f;" u2="&#x176;" k="61" />
-<hkern u1="&#x13f;" u2="&#x174;" k="41" />
-<hkern u1="&#x13f;" u2="&#x172;" k="20" />
-<hkern u1="&#x13f;" u2="&#x170;" k="20" />
-<hkern u1="&#x13f;" u2="&#x16e;" k="20" />
-<hkern u1="&#x13f;" u2="&#x16c;" k="20" />
-<hkern u1="&#x13f;" u2="&#x16a;" k="20" />
-<hkern u1="&#x13f;" u2="&#x168;" k="20" />
-<hkern u1="&#x13f;" u2="&#x164;" k="41" />
-<hkern u1="&#x13f;" u2="&#x162;" k="41" />
-<hkern u1="&#x13f;" u2="&#x152;" k="41" />
-<hkern u1="&#x13f;" u2="&#x150;" k="41" />
-<hkern u1="&#x13f;" u2="&#x14e;" k="41" />
-<hkern u1="&#x13f;" u2="&#x14c;" k="41" />
-<hkern u1="&#x13f;" u2="&#x122;" k="41" />
-<hkern u1="&#x13f;" u2="&#x120;" k="41" />
-<hkern u1="&#x13f;" u2="&#x11e;" k="41" />
-<hkern u1="&#x13f;" u2="&#x11c;" k="41" />
-<hkern u1="&#x13f;" u2="&#x10c;" k="41" />
-<hkern u1="&#x13f;" u2="&#x10a;" k="41" />
-<hkern u1="&#x13f;" u2="&#x108;" k="41" />
-<hkern u1="&#x13f;" u2="&#x106;" k="41" />
-<hkern u1="&#x13f;" u2="&#xdd;" k="61" />
-<hkern u1="&#x13f;" u2="&#xdc;" k="20" />
-<hkern u1="&#x13f;" u2="&#xdb;" k="20" />
-<hkern u1="&#x13f;" u2="&#xda;" k="20" />
-<hkern u1="&#x13f;" u2="&#xd9;" k="20" />
-<hkern u1="&#x13f;" u2="&#xd8;" k="41" />
-<hkern u1="&#x13f;" u2="&#xd6;" k="41" />
-<hkern u1="&#x13f;" u2="&#xd5;" k="41" />
-<hkern u1="&#x13f;" u2="&#xd4;" k="41" />
-<hkern u1="&#x13f;" u2="&#xd3;" k="41" />
-<hkern u1="&#x13f;" u2="&#xd2;" k="41" />
-<hkern u1="&#x13f;" u2="&#xc7;" k="41" />
-<hkern u1="&#x13f;" u2="Y" k="61" />
-<hkern u1="&#x13f;" u2="W" k="41" />
-<hkern u1="&#x13f;" u2="V" k="41" />
-<hkern u1="&#x13f;" u2="U" k="20" />
-<hkern u1="&#x13f;" u2="T" k="41" />
-<hkern u1="&#x13f;" u2="Q" k="41" />
-<hkern u1="&#x13f;" u2="O" k="41" />
-<hkern u1="&#x13f;" u2="G" k="41" />
-<hkern u1="&#x13f;" u2="C" k="41" />
-<hkern u1="&#x13f;" u2="&#x27;" k="164" />
-<hkern u1="&#x13f;" u2="&#x22;" k="164" />
-<hkern u1="&#x141;" u2="&#x201d;" k="164" />
-<hkern u1="&#x141;" u2="&#x2019;" k="164" />
-<hkern u1="&#x141;" u2="&#x1ef8;" k="61" />
-<hkern u1="&#x141;" u2="&#x1ef6;" k="61" />
-<hkern u1="&#x141;" u2="&#x1ef4;" k="61" />
-<hkern u1="&#x141;" u2="&#x1ef2;" k="61" />
-<hkern u1="&#x141;" u2="&#x1ef0;" k="20" />
-<hkern u1="&#x141;" u2="&#x1eee;" k="20" />
-<hkern u1="&#x141;" u2="&#x1eec;" k="20" />
-<hkern u1="&#x141;" u2="&#x1eea;" k="20" />
-<hkern u1="&#x141;" u2="&#x1ee8;" k="20" />
-<hkern u1="&#x141;" u2="&#x1ee6;" k="20" />
-<hkern u1="&#x141;" u2="&#x1ee4;" k="20" />
-<hkern u1="&#x141;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x141;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x141;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x141;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x141;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x141;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x141;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x141;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x141;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x141;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x141;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x141;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x141;" u2="&#x1e84;" k="41" />
-<hkern u1="&#x141;" u2="&#x1e82;" k="41" />
-<hkern u1="&#x141;" u2="&#x1e80;" k="41" />
-<hkern u1="&#x141;" u2="&#x21a;" k="41" />
-<hkern u1="&#x141;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x141;" u2="&#x1af;" k="20" />
-<hkern u1="&#x141;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x141;" u2="&#x178;" k="61" />
-<hkern u1="&#x141;" u2="&#x176;" k="61" />
-<hkern u1="&#x141;" u2="&#x174;" k="41" />
-<hkern u1="&#x141;" u2="&#x172;" k="20" />
-<hkern u1="&#x141;" u2="&#x170;" k="20" />
-<hkern u1="&#x141;" u2="&#x16e;" k="20" />
-<hkern u1="&#x141;" u2="&#x16c;" k="20" />
-<hkern u1="&#x141;" u2="&#x16a;" k="20" />
-<hkern u1="&#x141;" u2="&#x168;" k="20" />
-<hkern u1="&#x141;" u2="&#x164;" k="41" />
-<hkern u1="&#x141;" u2="&#x162;" k="41" />
-<hkern u1="&#x141;" u2="&#x152;" k="41" />
-<hkern u1="&#x141;" u2="&#x150;" k="41" />
-<hkern u1="&#x141;" u2="&#x14e;" k="41" />
-<hkern u1="&#x141;" u2="&#x14c;" k="41" />
-<hkern u1="&#x141;" u2="&#x122;" k="41" />
-<hkern u1="&#x141;" u2="&#x120;" k="41" />
-<hkern u1="&#x141;" u2="&#x11e;" k="41" />
-<hkern u1="&#x141;" u2="&#x11c;" k="41" />
-<hkern u1="&#x141;" u2="&#x10c;" k="41" />
-<hkern u1="&#x141;" u2="&#x10a;" k="41" />
-<hkern u1="&#x141;" u2="&#x108;" k="41" />
-<hkern u1="&#x141;" u2="&#x106;" k="41" />
-<hkern u1="&#x141;" u2="&#xdd;" k="61" />
-<hkern u1="&#x141;" u2="&#xdc;" k="20" />
-<hkern u1="&#x141;" u2="&#xdb;" k="20" />
-<hkern u1="&#x141;" u2="&#xda;" k="20" />
-<hkern u1="&#x141;" u2="&#xd9;" k="20" />
-<hkern u1="&#x141;" u2="&#xd8;" k="41" />
-<hkern u1="&#x141;" u2="&#xd6;" k="41" />
-<hkern u1="&#x141;" u2="&#xd5;" k="41" />
-<hkern u1="&#x141;" u2="&#xd4;" k="41" />
-<hkern u1="&#x141;" u2="&#xd3;" k="41" />
-<hkern u1="&#x141;" u2="&#xd2;" k="41" />
-<hkern u1="&#x141;" u2="&#xc7;" k="41" />
-<hkern u1="&#x141;" u2="Y" k="61" />
-<hkern u1="&#x141;" u2="W" k="41" />
-<hkern u1="&#x141;" u2="V" k="41" />
-<hkern u1="&#x141;" u2="U" k="20" />
-<hkern u1="&#x141;" u2="T" k="41" />
-<hkern u1="&#x141;" u2="Q" k="41" />
-<hkern u1="&#x141;" u2="O" k="41" />
-<hkern u1="&#x141;" u2="G" k="41" />
-<hkern u1="&#x141;" u2="C" k="41" />
-<hkern u1="&#x141;" u2="&#x27;" k="164" />
-<hkern u1="&#x141;" u2="&#x22;" k="164" />
-<hkern u1="&#x146;" u2="&#x201d;" k="20" />
-<hkern u1="&#x146;" u2="&#x2019;" k="20" />
-<hkern u1="&#x146;" u2="&#x27;" k="20" />
-<hkern u1="&#x146;" u2="&#x22;" k="20" />
-<hkern u1="&#x14c;" u2="&#x201e;" k="82" />
-<hkern u1="&#x14c;" u2="&#x201a;" k="82" />
-<hkern u1="&#x14c;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#x14c;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#x14c;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#x14c;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#x14c;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#x14c;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#x14c;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#x14c;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#x14c;" u2="&#x1eae;" k="41" />
-<hkern u1="&#x14c;" u2="&#x1eac;" k="41" />
-<hkern u1="&#x14c;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#x14c;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#x14c;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#x14c;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#x14c;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#x14c;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#x14c;" u2="&#x1e84;" k="20" />
-<hkern u1="&#x14c;" u2="&#x1e82;" k="20" />
-<hkern u1="&#x14c;" u2="&#x1e80;" k="20" />
-<hkern u1="&#x14c;" u2="&#x1e00;" k="41" />
-<hkern u1="&#x14c;" u2="&#x405;" k="20" />
-<hkern u1="&#x14c;" u2="&#x21a;" k="61" />
-<hkern u1="&#x14c;" u2="&#x1fa;" k="41" />
-<hkern u1="&#x14c;" u2="&#x17d;" k="20" />
-<hkern u1="&#x14c;" u2="&#x17b;" k="20" />
-<hkern u1="&#x14c;" u2="&#x179;" k="20" />
-<hkern u1="&#x14c;" u2="&#x178;" k="20" />
-<hkern u1="&#x14c;" u2="&#x176;" k="20" />
-<hkern u1="&#x14c;" u2="&#x174;" k="20" />
-<hkern u1="&#x14c;" u2="&#x164;" k="61" />
-<hkern u1="&#x14c;" u2="&#x162;" k="61" />
-<hkern u1="&#x14c;" u2="&#x104;" k="41" />
-<hkern u1="&#x14c;" u2="&#x102;" k="41" />
-<hkern u1="&#x14c;" u2="&#x100;" k="41" />
-<hkern u1="&#x14c;" u2="&#xdd;" k="20" />
-<hkern u1="&#x14c;" u2="&#xc5;" k="41" />
-<hkern u1="&#x14c;" u2="&#xc4;" k="41" />
-<hkern u1="&#x14c;" u2="&#xc3;" k="41" />
-<hkern u1="&#x14c;" u2="&#xc2;" k="41" />
-<hkern u1="&#x14c;" u2="&#xc1;" k="41" />
-<hkern u1="&#x14c;" u2="&#xc0;" k="41" />
-<hkern u1="&#x14c;" u2="Z" k="20" />
-<hkern u1="&#x14c;" u2="Y" k="20" />
-<hkern u1="&#x14c;" u2="X" k="41" />
-<hkern u1="&#x14c;" u2="W" k="20" />
-<hkern u1="&#x14c;" u2="V" k="20" />
-<hkern u1="&#x14c;" u2="T" k="61" />
-<hkern u1="&#x14c;" u2="A" k="41" />
-<hkern u1="&#x14c;" u2="&#x2e;" k="82" />
-<hkern u1="&#x14c;" u2="&#x2c;" k="82" />
-<hkern u1="&#x14e;" u2="&#x201e;" k="82" />
-<hkern u1="&#x14e;" u2="&#x201a;" k="82" />
-<hkern u1="&#x14e;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#x14e;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#x14e;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#x14e;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#x14e;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#x14e;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#x14e;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#x14e;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#x14e;" u2="&#x1eae;" k="41" />
-<hkern u1="&#x14e;" u2="&#x1eac;" k="41" />
-<hkern u1="&#x14e;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#x14e;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#x14e;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#x14e;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#x14e;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#x14e;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#x14e;" u2="&#x1e84;" k="20" />
-<hkern u1="&#x14e;" u2="&#x1e82;" k="20" />
-<hkern u1="&#x14e;" u2="&#x1e80;" k="20" />
-<hkern u1="&#x14e;" u2="&#x1e00;" k="41" />
-<hkern u1="&#x14e;" u2="&#x405;" k="20" />
-<hkern u1="&#x14e;" u2="&#x21a;" k="61" />
-<hkern u1="&#x14e;" u2="&#x1fa;" k="41" />
-<hkern u1="&#x14e;" u2="&#x17d;" k="20" />
-<hkern u1="&#x14e;" u2="&#x17b;" k="20" />
-<hkern u1="&#x14e;" u2="&#x179;" k="20" />
-<hkern u1="&#x14e;" u2="&#x178;" k="20" />
-<hkern u1="&#x14e;" u2="&#x176;" k="20" />
-<hkern u1="&#x14e;" u2="&#x174;" k="20" />
-<hkern u1="&#x14e;" u2="&#x164;" k="61" />
-<hkern u1="&#x14e;" u2="&#x162;" k="61" />
-<hkern u1="&#x14e;" u2="&#x104;" k="41" />
-<hkern u1="&#x14e;" u2="&#x102;" k="41" />
-<hkern u1="&#x14e;" u2="&#x100;" k="41" />
-<hkern u1="&#x14e;" u2="&#xdd;" k="20" />
-<hkern u1="&#x14e;" u2="&#xc5;" k="41" />
-<hkern u1="&#x14e;" u2="&#xc4;" k="41" />
-<hkern u1="&#x14e;" u2="&#xc3;" k="41" />
-<hkern u1="&#x14e;" u2="&#xc2;" k="41" />
-<hkern u1="&#x14e;" u2="&#xc1;" k="41" />
-<hkern u1="&#x14e;" u2="&#xc0;" k="41" />
-<hkern u1="&#x14e;" u2="Z" k="20" />
-<hkern u1="&#x14e;" u2="Y" k="20" />
-<hkern u1="&#x14e;" u2="X" k="41" />
-<hkern u1="&#x14e;" u2="W" k="20" />
-<hkern u1="&#x14e;" u2="V" k="20" />
-<hkern u1="&#x14e;" u2="T" k="61" />
-<hkern u1="&#x14e;" u2="A" k="41" />
-<hkern u1="&#x14e;" u2="&#x2e;" k="82" />
-<hkern u1="&#x14e;" u2="&#x2c;" k="82" />
-<hkern u1="&#x150;" u2="&#x201e;" k="82" />
-<hkern u1="&#x150;" u2="&#x201a;" k="82" />
-<hkern u1="&#x150;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#x150;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#x150;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#x150;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#x150;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#x150;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#x150;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#x150;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#x150;" u2="&#x1eae;" k="41" />
-<hkern u1="&#x150;" u2="&#x1eac;" k="41" />
-<hkern u1="&#x150;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#x150;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#x150;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#x150;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#x150;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#x150;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#x150;" u2="&#x1e84;" k="20" />
-<hkern u1="&#x150;" u2="&#x1e82;" k="20" />
-<hkern u1="&#x150;" u2="&#x1e80;" k="20" />
-<hkern u1="&#x150;" u2="&#x1e00;" k="41" />
-<hkern u1="&#x150;" u2="&#x405;" k="20" />
-<hkern u1="&#x150;" u2="&#x21a;" k="61" />
-<hkern u1="&#x150;" u2="&#x1fa;" k="41" />
-<hkern u1="&#x150;" u2="&#x17d;" k="20" />
-<hkern u1="&#x150;" u2="&#x17b;" k="20" />
-<hkern u1="&#x150;" u2="&#x179;" k="20" />
-<hkern u1="&#x150;" u2="&#x178;" k="20" />
-<hkern u1="&#x150;" u2="&#x176;" k="20" />
-<hkern u1="&#x150;" u2="&#x174;" k="20" />
-<hkern u1="&#x150;" u2="&#x164;" k="61" />
-<hkern u1="&#x150;" u2="&#x162;" k="61" />
-<hkern u1="&#x150;" u2="&#x104;" k="41" />
-<hkern u1="&#x150;" u2="&#x102;" k="41" />
-<hkern u1="&#x150;" u2="&#x100;" k="41" />
-<hkern u1="&#x150;" u2="&#xdd;" k="20" />
-<hkern u1="&#x150;" u2="&#xc5;" k="41" />
-<hkern u1="&#x150;" u2="&#xc4;" k="41" />
-<hkern u1="&#x150;" u2="&#xc3;" k="41" />
-<hkern u1="&#x150;" u2="&#xc2;" k="41" />
-<hkern u1="&#x150;" u2="&#xc1;" k="41" />
-<hkern u1="&#x150;" u2="&#xc0;" k="41" />
-<hkern u1="&#x150;" u2="Z" k="20" />
-<hkern u1="&#x150;" u2="Y" k="20" />
-<hkern u1="&#x150;" u2="X" k="41" />
-<hkern u1="&#x150;" u2="W" k="20" />
-<hkern u1="&#x150;" u2="V" k="20" />
-<hkern u1="&#x150;" u2="T" k="61" />
-<hkern u1="&#x150;" u2="A" k="41" />
-<hkern u1="&#x150;" u2="&#x2e;" k="82" />
-<hkern u1="&#x150;" u2="&#x2c;" k="82" />
-<hkern u1="&#x152;" u2="J" k="-123" />
-<hkern u1="&#x155;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x155;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x155;" u2="&#x1ee3;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ee1;" k="41" />
-<hkern u1="&#x155;" u2="&#x1edf;" k="41" />
-<hkern u1="&#x155;" u2="&#x1edd;" k="41" />
-<hkern u1="&#x155;" u2="&#x1edb;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ed9;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ed7;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ed5;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ed1;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ecf;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ecd;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ec7;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ec5;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ec3;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ebf;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ebd;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ebb;" k="41" />
-<hkern u1="&#x155;" u2="&#x1eb9;" k="41" />
-<hkern u1="&#x155;" u2="&#x1eb7;" k="41" />
-<hkern u1="&#x155;" u2="&#x1eb5;" k="41" />
-<hkern u1="&#x155;" u2="&#x1eb3;" k="41" />
-<hkern u1="&#x155;" u2="&#x1eb1;" k="41" />
-<hkern u1="&#x155;" u2="&#x1eaf;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ead;" k="41" />
-<hkern u1="&#x155;" u2="&#x1eab;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ea9;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ea5;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ea3;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ea1;" k="41" />
-<hkern u1="&#x155;" u2="&#x1e01;" k="41" />
-<hkern u1="&#x155;" u2="&#x1ff;" k="41" />
-<hkern u1="&#x155;" u2="&#x1fd;" k="41" />
-<hkern u1="&#x155;" u2="&#x1fb;" k="41" />
-<hkern u1="&#x155;" u2="&#x1a1;" k="41" />
-<hkern u1="&#x155;" u2="&#x153;" k="41" />
-<hkern u1="&#x155;" u2="&#x151;" k="41" />
-<hkern u1="&#x155;" u2="&#x14f;" k="41" />
-<hkern u1="&#x155;" u2="&#x14d;" k="41" />
-<hkern u1="&#x155;" u2="&#x123;" k="20" />
-<hkern u1="&#x155;" u2="&#x121;" k="20" />
-<hkern u1="&#x155;" u2="&#x11f;" k="20" />
-<hkern u1="&#x155;" u2="&#x11d;" k="20" />
-<hkern u1="&#x155;" u2="&#x11b;" k="41" />
-<hkern u1="&#x155;" u2="&#x119;" k="41" />
-<hkern u1="&#x155;" u2="&#x117;" k="41" />
-<hkern u1="&#x155;" u2="&#x115;" k="41" />
-<hkern u1="&#x155;" u2="&#x113;" k="41" />
-<hkern u1="&#x155;" u2="&#x111;" k="41" />
-<hkern u1="&#x155;" u2="&#x10f;" k="41" />
-<hkern u1="&#x155;" u2="&#x10d;" k="41" />
-<hkern u1="&#x155;" u2="&#x10b;" k="41" />
-<hkern u1="&#x155;" u2="&#x109;" k="41" />
-<hkern u1="&#x155;" u2="&#x107;" k="41" />
-<hkern u1="&#x155;" u2="&#x105;" k="41" />
-<hkern u1="&#x155;" u2="&#x103;" k="41" />
-<hkern u1="&#x155;" u2="&#x101;" k="41" />
-<hkern u1="&#x155;" u2="&#xf8;" k="41" />
-<hkern u1="&#x155;" u2="&#xf6;" k="41" />
-<hkern u1="&#x155;" u2="&#xf5;" k="41" />
-<hkern u1="&#x155;" u2="&#xf4;" k="41" />
-<hkern u1="&#x155;" u2="&#xf3;" k="41" />
-<hkern u1="&#x155;" u2="&#xf2;" k="41" />
-<hkern u1="&#x155;" u2="&#xeb;" k="41" />
-<hkern u1="&#x155;" u2="&#xea;" k="41" />
-<hkern u1="&#x155;" u2="&#xe9;" k="41" />
-<hkern u1="&#x155;" u2="&#xe8;" k="41" />
-<hkern u1="&#x155;" u2="&#xe7;" k="41" />
-<hkern u1="&#x155;" u2="&#xe6;" k="41" />
-<hkern u1="&#x155;" u2="&#xe5;" k="41" />
-<hkern u1="&#x155;" u2="&#xe4;" k="41" />
-<hkern u1="&#x155;" u2="&#xe3;" k="41" />
-<hkern u1="&#x155;" u2="&#xe2;" k="41" />
-<hkern u1="&#x155;" u2="&#xe1;" k="41" />
-<hkern u1="&#x155;" u2="&#xe0;" k="41" />
-<hkern u1="&#x155;" u2="q" k="41" />
-<hkern u1="&#x155;" u2="o" k="41" />
-<hkern u1="&#x155;" u2="g" k="20" />
-<hkern u1="&#x155;" u2="e" k="41" />
-<hkern u1="&#x155;" u2="d" k="41" />
-<hkern u1="&#x155;" u2="c" k="41" />
-<hkern u1="&#x155;" u2="a" k="41" />
-<hkern u1="&#x155;" u2="&#x27;" k="-82" />
-<hkern u1="&#x155;" u2="&#x22;" k="-82" />
-<hkern u1="&#x157;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x157;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x157;" u2="&#x1ee3;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ee1;" k="41" />
-<hkern u1="&#x157;" u2="&#x1edf;" k="41" />
-<hkern u1="&#x157;" u2="&#x1edd;" k="41" />
-<hkern u1="&#x157;" u2="&#x1edb;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ed9;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ed7;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ed5;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ed1;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ecf;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ecd;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ec7;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ec5;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ec3;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ebf;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ebd;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ebb;" k="41" />
-<hkern u1="&#x157;" u2="&#x1eb9;" k="41" />
-<hkern u1="&#x157;" u2="&#x1eb7;" k="41" />
-<hkern u1="&#x157;" u2="&#x1eb5;" k="41" />
-<hkern u1="&#x157;" u2="&#x1eb3;" k="41" />
-<hkern u1="&#x157;" u2="&#x1eb1;" k="41" />
-<hkern u1="&#x157;" u2="&#x1eaf;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ead;" k="41" />
-<hkern u1="&#x157;" u2="&#x1eab;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ea9;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ea5;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ea3;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ea1;" k="41" />
-<hkern u1="&#x157;" u2="&#x1e01;" k="41" />
-<hkern u1="&#x157;" u2="&#x1ff;" k="41" />
-<hkern u1="&#x157;" u2="&#x1fd;" k="41" />
-<hkern u1="&#x157;" u2="&#x1fb;" k="41" />
-<hkern u1="&#x157;" u2="&#x1a1;" k="41" />
-<hkern u1="&#x157;" u2="&#x153;" k="41" />
-<hkern u1="&#x157;" u2="&#x151;" k="41" />
-<hkern u1="&#x157;" u2="&#x14f;" k="41" />
-<hkern u1="&#x157;" u2="&#x14d;" k="41" />
-<hkern u1="&#x157;" u2="&#x123;" k="20" />
-<hkern u1="&#x157;" u2="&#x121;" k="20" />
-<hkern u1="&#x157;" u2="&#x11f;" k="20" />
-<hkern u1="&#x157;" u2="&#x11d;" k="20" />
-<hkern u1="&#x157;" u2="&#x11b;" k="41" />
-<hkern u1="&#x157;" u2="&#x119;" k="41" />
-<hkern u1="&#x157;" u2="&#x117;" k="41" />
-<hkern u1="&#x157;" u2="&#x115;" k="41" />
-<hkern u1="&#x157;" u2="&#x113;" k="41" />
-<hkern u1="&#x157;" u2="&#x111;" k="41" />
-<hkern u1="&#x157;" u2="&#x10f;" k="41" />
-<hkern u1="&#x157;" u2="&#x10d;" k="41" />
-<hkern u1="&#x157;" u2="&#x10b;" k="41" />
-<hkern u1="&#x157;" u2="&#x109;" k="41" />
-<hkern u1="&#x157;" u2="&#x107;" k="41" />
-<hkern u1="&#x157;" u2="&#x105;" k="41" />
-<hkern u1="&#x157;" u2="&#x103;" k="41" />
-<hkern u1="&#x157;" u2="&#x101;" k="41" />
-<hkern u1="&#x157;" u2="&#xf8;" k="41" />
-<hkern u1="&#x157;" u2="&#xf6;" k="41" />
-<hkern u1="&#x157;" u2="&#xf5;" k="41" />
-<hkern u1="&#x157;" u2="&#xf4;" k="41" />
-<hkern u1="&#x157;" u2="&#xf3;" k="41" />
-<hkern u1="&#x157;" u2="&#xf2;" k="41" />
-<hkern u1="&#x157;" u2="&#xeb;" k="41" />
-<hkern u1="&#x157;" u2="&#xea;" k="41" />
-<hkern u1="&#x157;" u2="&#xe9;" k="41" />
-<hkern u1="&#x157;" u2="&#xe8;" k="41" />
-<hkern u1="&#x157;" u2="&#xe7;" k="41" />
-<hkern u1="&#x157;" u2="&#xe6;" k="41" />
-<hkern u1="&#x157;" u2="&#xe5;" k="41" />
-<hkern u1="&#x157;" u2="&#xe4;" k="41" />
-<hkern u1="&#x157;" u2="&#xe3;" k="41" />
-<hkern u1="&#x157;" u2="&#xe2;" k="41" />
-<hkern u1="&#x157;" u2="&#xe1;" k="41" />
-<hkern u1="&#x157;" u2="&#xe0;" k="41" />
-<hkern u1="&#x157;" u2="q" k="41" />
-<hkern u1="&#x157;" u2="o" k="41" />
-<hkern u1="&#x157;" u2="g" k="20" />
-<hkern u1="&#x157;" u2="e" k="41" />
-<hkern u1="&#x157;" u2="d" k="41" />
-<hkern u1="&#x157;" u2="c" k="41" />
-<hkern u1="&#x157;" u2="a" k="41" />
-<hkern u1="&#x157;" u2="&#x27;" k="-82" />
-<hkern u1="&#x157;" u2="&#x22;" k="-82" />
-<hkern u1="&#x159;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x159;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x159;" u2="&#x1ee3;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ee1;" k="41" />
-<hkern u1="&#x159;" u2="&#x1edf;" k="41" />
-<hkern u1="&#x159;" u2="&#x1edd;" k="41" />
-<hkern u1="&#x159;" u2="&#x1edb;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ed9;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ed7;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ed5;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ed1;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ecf;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ecd;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ec7;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ec5;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ec3;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ebf;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ebd;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ebb;" k="41" />
-<hkern u1="&#x159;" u2="&#x1eb9;" k="41" />
-<hkern u1="&#x159;" u2="&#x1eb7;" k="41" />
-<hkern u1="&#x159;" u2="&#x1eb5;" k="41" />
-<hkern u1="&#x159;" u2="&#x1eb3;" k="41" />
-<hkern u1="&#x159;" u2="&#x1eb1;" k="41" />
-<hkern u1="&#x159;" u2="&#x1eaf;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ead;" k="41" />
-<hkern u1="&#x159;" u2="&#x1eab;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ea9;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ea5;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ea3;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ea1;" k="41" />
-<hkern u1="&#x159;" u2="&#x1e01;" k="41" />
-<hkern u1="&#x159;" u2="&#x1ff;" k="41" />
-<hkern u1="&#x159;" u2="&#x1fd;" k="41" />
-<hkern u1="&#x159;" u2="&#x1fb;" k="41" />
-<hkern u1="&#x159;" u2="&#x1a1;" k="41" />
-<hkern u1="&#x159;" u2="&#x153;" k="41" />
-<hkern u1="&#x159;" u2="&#x151;" k="41" />
-<hkern u1="&#x159;" u2="&#x14f;" k="41" />
-<hkern u1="&#x159;" u2="&#x14d;" k="41" />
-<hkern u1="&#x159;" u2="&#x123;" k="20" />
-<hkern u1="&#x159;" u2="&#x121;" k="20" />
-<hkern u1="&#x159;" u2="&#x11f;" k="20" />
-<hkern u1="&#x159;" u2="&#x11d;" k="20" />
-<hkern u1="&#x159;" u2="&#x11b;" k="41" />
-<hkern u1="&#x159;" u2="&#x119;" k="41" />
-<hkern u1="&#x159;" u2="&#x117;" k="41" />
-<hkern u1="&#x159;" u2="&#x115;" k="41" />
-<hkern u1="&#x159;" u2="&#x113;" k="41" />
-<hkern u1="&#x159;" u2="&#x111;" k="41" />
-<hkern u1="&#x159;" u2="&#x10f;" k="41" />
-<hkern u1="&#x159;" u2="&#x10d;" k="41" />
-<hkern u1="&#x159;" u2="&#x10b;" k="41" />
-<hkern u1="&#x159;" u2="&#x109;" k="41" />
-<hkern u1="&#x159;" u2="&#x107;" k="41" />
-<hkern u1="&#x159;" u2="&#x105;" k="41" />
-<hkern u1="&#x159;" u2="&#x103;" k="41" />
-<hkern u1="&#x159;" u2="&#x101;" k="41" />
-<hkern u1="&#x159;" u2="&#xf8;" k="41" />
-<hkern u1="&#x159;" u2="&#xf6;" k="41" />
-<hkern u1="&#x159;" u2="&#xf5;" k="41" />
-<hkern u1="&#x159;" u2="&#xf4;" k="41" />
-<hkern u1="&#x159;" u2="&#xf3;" k="41" />
-<hkern u1="&#x159;" u2="&#xf2;" k="41" />
-<hkern u1="&#x159;" u2="&#xeb;" k="41" />
-<hkern u1="&#x159;" u2="&#xea;" k="41" />
-<hkern u1="&#x159;" u2="&#xe9;" k="41" />
-<hkern u1="&#x159;" u2="&#xe8;" k="41" />
-<hkern u1="&#x159;" u2="&#xe7;" k="41" />
-<hkern u1="&#x159;" u2="&#xe6;" k="41" />
-<hkern u1="&#x159;" u2="&#xe5;" k="41" />
-<hkern u1="&#x159;" u2="&#xe4;" k="41" />
-<hkern u1="&#x159;" u2="&#xe3;" k="41" />
-<hkern u1="&#x159;" u2="&#xe2;" k="41" />
-<hkern u1="&#x159;" u2="&#xe1;" k="41" />
-<hkern u1="&#x159;" u2="&#xe0;" k="41" />
-<hkern u1="&#x159;" u2="q" k="41" />
-<hkern u1="&#x159;" u2="o" k="41" />
-<hkern u1="&#x159;" u2="g" k="20" />
-<hkern u1="&#x159;" u2="e" k="41" />
-<hkern u1="&#x159;" u2="d" k="41" />
-<hkern u1="&#x159;" u2="c" k="41" />
-<hkern u1="&#x159;" u2="a" k="41" />
-<hkern u1="&#x159;" u2="&#x27;" k="-82" />
-<hkern u1="&#x159;" u2="&#x22;" k="-82" />
-<hkern u1="&#x162;" u2="&#x201e;" k="123" />
-<hkern u1="&#x162;" u2="&#x201a;" k="123" />
-<hkern u1="&#x162;" u2="&#x2015;" k="82" />
-<hkern u1="&#x162;" u2="&#x2014;" k="82" />
-<hkern u1="&#x162;" u2="&#x2013;" k="82" />
-<hkern u1="&#x162;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x162;" u2="&#x1ef1;" k="102" />
-<hkern u1="&#x162;" u2="&#x1eef;" k="102" />
-<hkern u1="&#x162;" u2="&#x1eed;" k="102" />
-<hkern u1="&#x162;" u2="&#x1eeb;" k="102" />
-<hkern u1="&#x162;" u2="&#x1ee9;" k="102" />
-<hkern u1="&#x162;" u2="&#x1ee7;" k="102" />
-<hkern u1="&#x162;" u2="&#x1ee5;" k="102" />
-<hkern u1="&#x162;" u2="&#x1ee3;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x162;" u2="&#x1ee1;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x162;" u2="&#x1edf;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x162;" u2="&#x1edd;" k="143" />
-<hkern u1="&#x162;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x162;" u2="&#x1edb;" k="143" />
-<hkern u1="&#x162;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x162;" u2="&#x1ed9;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x162;" u2="&#x1ed7;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x162;" u2="&#x1ed5;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x162;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x162;" u2="&#x1ed1;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x162;" u2="&#x1ecf;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x162;" u2="&#x1ecd;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x162;" u2="&#x1ec7;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ec5;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ec3;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ebf;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ebd;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ebb;" k="143" />
-<hkern u1="&#x162;" u2="&#x1eb9;" k="143" />
-<hkern u1="&#x162;" u2="&#x1eb7;" k="164" />
-<hkern u1="&#x162;" u2="&#x1eb6;" k="143" />
-<hkern u1="&#x162;" u2="&#x1eb5;" k="164" />
-<hkern u1="&#x162;" u2="&#x1eb4;" k="143" />
-<hkern u1="&#x162;" u2="&#x1eb3;" k="164" />
-<hkern u1="&#x162;" u2="&#x1eb2;" k="143" />
-<hkern u1="&#x162;" u2="&#x1eb1;" k="164" />
-<hkern u1="&#x162;" u2="&#x1eb0;" k="143" />
-<hkern u1="&#x162;" u2="&#x1eaf;" k="164" />
-<hkern u1="&#x162;" u2="&#x1eae;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ead;" k="164" />
-<hkern u1="&#x162;" u2="&#x1eac;" k="143" />
-<hkern u1="&#x162;" u2="&#x1eab;" k="164" />
-<hkern u1="&#x162;" u2="&#x1eaa;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ea9;" k="164" />
-<hkern u1="&#x162;" u2="&#x1ea8;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ea6;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ea5;" k="164" />
-<hkern u1="&#x162;" u2="&#x1ea4;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ea3;" k="164" />
-<hkern u1="&#x162;" u2="&#x1ea2;" k="143" />
-<hkern u1="&#x162;" u2="&#x1ea1;" k="164" />
-<hkern u1="&#x162;" u2="&#x1ea0;" k="143" />
-<hkern u1="&#x162;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x162;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x162;" u2="&#x1e3f;" k="102" />
-<hkern u1="&#x162;" u2="&#x1e01;" k="164" />
-<hkern u1="&#x162;" u2="&#x1e00;" k="143" />
-<hkern u1="&#x162;" u2="&#x21a;" k="-41" />
-<hkern u1="&#x162;" u2="&#x219;" k="123" />
-<hkern u1="&#x162;" u2="&#x1ff;" k="143" />
-<hkern u1="&#x162;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x162;" u2="&#x1fd;" k="164" />
-<hkern u1="&#x162;" u2="&#x1fb;" k="164" />
-<hkern u1="&#x162;" u2="&#x1fa;" k="143" />
-<hkern u1="&#x162;" u2="&#x1b0;" k="102" />
-<hkern u1="&#x162;" u2="&#x1a1;" k="143" />
-<hkern u1="&#x162;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x162;" u2="&#x17e;" k="82" />
-<hkern u1="&#x162;" u2="&#x17c;" k="82" />
-<hkern u1="&#x162;" u2="&#x17a;" k="82" />
-<hkern u1="&#x162;" u2="&#x175;" k="41" />
-<hkern u1="&#x162;" u2="&#x173;" k="102" />
-<hkern u1="&#x162;" u2="&#x171;" k="102" />
-<hkern u1="&#x162;" u2="&#x16f;" k="102" />
-<hkern u1="&#x162;" u2="&#x16d;" k="102" />
-<hkern u1="&#x162;" u2="&#x16b;" k="102" />
-<hkern u1="&#x162;" u2="&#x169;" k="102" />
-<hkern u1="&#x162;" u2="&#x164;" k="-41" />
-<hkern u1="&#x162;" u2="&#x162;" k="-41" />
-<hkern u1="&#x162;" u2="&#x15f;" k="123" />
-<hkern u1="&#x162;" u2="&#x15b;" k="123" />
-<hkern u1="&#x162;" u2="&#x157;" k="102" />
-<hkern u1="&#x162;" u2="&#x155;" k="102" />
-<hkern u1="&#x162;" u2="&#x153;" k="143" />
-<hkern u1="&#x162;" u2="&#x152;" k="41" />
-<hkern u1="&#x162;" u2="&#x151;" k="143" />
-<hkern u1="&#x162;" u2="&#x150;" k="41" />
-<hkern u1="&#x162;" u2="&#x14f;" k="143" />
-<hkern u1="&#x162;" u2="&#x14e;" k="41" />
-<hkern u1="&#x162;" u2="&#x14d;" k="143" />
-<hkern u1="&#x162;" u2="&#x14c;" k="41" />
-<hkern u1="&#x162;" u2="&#x14b;" k="102" />
-<hkern u1="&#x162;" u2="&#x146;" k="102" />
-<hkern u1="&#x162;" u2="&#x144;" k="102" />
-<hkern u1="&#x162;" u2="&#x138;" k="102" />
-<hkern u1="&#x162;" u2="&#x123;" k="143" />
-<hkern u1="&#x162;" u2="&#x122;" k="41" />
-<hkern u1="&#x162;" u2="&#x121;" k="143" />
-<hkern u1="&#x162;" u2="&#x120;" k="41" />
-<hkern u1="&#x162;" u2="&#x11f;" k="143" />
-<hkern u1="&#x162;" u2="&#x11e;" k="41" />
-<hkern u1="&#x162;" u2="&#x11d;" k="143" />
-<hkern u1="&#x162;" u2="&#x11c;" k="41" />
-<hkern u1="&#x162;" u2="&#x11b;" k="143" />
-<hkern u1="&#x162;" u2="&#x119;" k="143" />
-<hkern u1="&#x162;" u2="&#x117;" k="143" />
-<hkern u1="&#x162;" u2="&#x115;" k="143" />
-<hkern u1="&#x162;" u2="&#x113;" k="143" />
-<hkern u1="&#x162;" u2="&#x111;" k="143" />
-<hkern u1="&#x162;" u2="&#x10f;" k="143" />
-<hkern u1="&#x162;" u2="&#x10d;" k="143" />
-<hkern u1="&#x162;" u2="&#x10c;" k="41" />
-<hkern u1="&#x162;" u2="&#x10b;" k="143" />
-<hkern u1="&#x162;" u2="&#x10a;" k="41" />
-<hkern u1="&#x162;" u2="&#x109;" k="143" />
-<hkern u1="&#x162;" u2="&#x108;" k="41" />
-<hkern u1="&#x162;" u2="&#x107;" k="143" />
-<hkern u1="&#x162;" u2="&#x106;" k="41" />
-<hkern u1="&#x162;" u2="&#x105;" k="164" />
-<hkern u1="&#x162;" u2="&#x104;" k="143" />
-<hkern u1="&#x162;" u2="&#x103;" k="164" />
-<hkern u1="&#x162;" u2="&#x102;" k="143" />
-<hkern u1="&#x162;" u2="&#x101;" k="164" />
-<hkern u1="&#x162;" u2="&#x100;" k="143" />
-<hkern u1="&#x162;" u2="&#xfd;" k="41" />
-<hkern u1="&#x162;" u2="&#xfc;" k="102" />
-<hkern u1="&#x162;" u2="&#xfb;" k="102" />
-<hkern u1="&#x162;" u2="&#xfa;" k="102" />
-<hkern u1="&#x162;" u2="&#xf9;" k="102" />
-<hkern u1="&#x162;" u2="&#xf8;" k="143" />
-<hkern u1="&#x162;" u2="&#xf6;" k="143" />
-<hkern u1="&#x162;" u2="&#xf5;" k="143" />
-<hkern u1="&#x162;" u2="&#xf4;" k="143" />
-<hkern u1="&#x162;" u2="&#xf3;" k="143" />
-<hkern u1="&#x162;" u2="&#xf2;" k="143" />
-<hkern u1="&#x162;" u2="&#xeb;" k="143" />
-<hkern u1="&#x162;" u2="&#xea;" k="143" />
-<hkern u1="&#x162;" u2="&#xe9;" k="143" />
-<hkern u1="&#x162;" u2="&#xe8;" k="143" />
-<hkern u1="&#x162;" u2="&#xe7;" k="143" />
-<hkern u1="&#x162;" u2="&#xe6;" k="164" />
-<hkern u1="&#x162;" u2="&#xe5;" k="164" />
-<hkern u1="&#x162;" u2="&#xe4;" k="164" />
-<hkern u1="&#x162;" u2="&#xe3;" k="164" />
-<hkern u1="&#x162;" u2="&#xe2;" k="164" />
-<hkern u1="&#x162;" u2="&#xe1;" k="164" />
-<hkern u1="&#x162;" u2="&#xe0;" k="143" />
-<hkern u1="&#x162;" u2="&#xd8;" k="41" />
-<hkern u1="&#x162;" u2="&#xd6;" k="41" />
-<hkern u1="&#x162;" u2="&#xd5;" k="41" />
-<hkern u1="&#x162;" u2="&#xd4;" k="41" />
-<hkern u1="&#x162;" u2="&#xd3;" k="41" />
-<hkern u1="&#x162;" u2="&#xd2;" k="41" />
-<hkern u1="&#x162;" u2="&#xc7;" k="41" />
-<hkern u1="&#x162;" u2="&#xc5;" k="143" />
-<hkern u1="&#x162;" u2="&#xc4;" k="143" />
-<hkern u1="&#x162;" u2="&#xc3;" k="143" />
-<hkern u1="&#x162;" u2="&#xc2;" k="143" />
-<hkern u1="&#x162;" u2="&#xc1;" k="143" />
-<hkern u1="&#x162;" u2="&#xc0;" k="143" />
-<hkern u1="&#x162;" u2="z" k="82" />
-<hkern u1="&#x162;" u2="y" k="41" />
-<hkern u1="&#x162;" u2="x" k="41" />
-<hkern u1="&#x162;" u2="w" k="41" />
-<hkern u1="&#x162;" u2="v" k="41" />
-<hkern u1="&#x162;" u2="u" k="102" />
-<hkern u1="&#x162;" u2="s" k="123" />
-<hkern u1="&#x162;" u2="r" k="102" />
-<hkern u1="&#x162;" u2="q" k="143" />
-<hkern u1="&#x162;" u2="p" k="102" />
-<hkern u1="&#x162;" u2="o" k="143" />
-<hkern u1="&#x162;" u2="n" k="102" />
-<hkern u1="&#x162;" u2="m" k="102" />
-<hkern u1="&#x162;" u2="g" k="143" />
-<hkern u1="&#x162;" u2="e" k="143" />
-<hkern u1="&#x162;" u2="d" k="143" />
-<hkern u1="&#x162;" u2="c" k="143" />
-<hkern u1="&#x162;" u2="a" k="164" />
-<hkern u1="&#x162;" u2="T" k="-41" />
-<hkern u1="&#x162;" u2="Q" k="41" />
-<hkern u1="&#x162;" u2="O" k="41" />
-<hkern u1="&#x162;" u2="G" k="41" />
-<hkern u1="&#x162;" u2="C" k="41" />
-<hkern u1="&#x162;" u2="A" k="143" />
-<hkern u1="&#x162;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x162;" u2="&#x2e;" k="123" />
-<hkern u1="&#x162;" u2="&#x2d;" k="82" />
-<hkern u1="&#x162;" u2="&#x2c;" k="123" />
-<hkern u1="&#x163;" u2="&#x201d;" k="-41" />
-<hkern u1="&#x163;" u2="&#x2019;" k="-41" />
-<hkern u1="&#x163;" u2="&#x27;" k="-41" />
-<hkern u1="&#x163;" u2="&#x22;" k="-41" />
-<hkern u1="&#x164;" u2="&#x201e;" k="123" />
-<hkern u1="&#x164;" u2="&#x201a;" k="123" />
-<hkern u1="&#x164;" u2="&#x2015;" k="82" />
-<hkern u1="&#x164;" u2="&#x2014;" k="82" />
-<hkern u1="&#x164;" u2="&#x2013;" k="82" />
-<hkern u1="&#x164;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x164;" u2="&#x1ef1;" k="102" />
-<hkern u1="&#x164;" u2="&#x1eef;" k="102" />
-<hkern u1="&#x164;" u2="&#x1eed;" k="102" />
-<hkern u1="&#x164;" u2="&#x1eeb;" k="102" />
-<hkern u1="&#x164;" u2="&#x1ee9;" k="102" />
-<hkern u1="&#x164;" u2="&#x1ee7;" k="102" />
-<hkern u1="&#x164;" u2="&#x1ee5;" k="102" />
-<hkern u1="&#x164;" u2="&#x1ee3;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x164;" u2="&#x1ee1;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x164;" u2="&#x1edf;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x164;" u2="&#x1edd;" k="143" />
-<hkern u1="&#x164;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x164;" u2="&#x1edb;" k="143" />
-<hkern u1="&#x164;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x164;" u2="&#x1ed9;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x164;" u2="&#x1ed7;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x164;" u2="&#x1ed5;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x164;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x164;" u2="&#x1ed1;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x164;" u2="&#x1ecf;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x164;" u2="&#x1ecd;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x164;" u2="&#x1ec7;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ec5;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ec3;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ebf;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ebd;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ebb;" k="143" />
-<hkern u1="&#x164;" u2="&#x1eb9;" k="143" />
-<hkern u1="&#x164;" u2="&#x1eb7;" k="164" />
-<hkern u1="&#x164;" u2="&#x1eb6;" k="143" />
-<hkern u1="&#x164;" u2="&#x1eb5;" k="164" />
-<hkern u1="&#x164;" u2="&#x1eb4;" k="143" />
-<hkern u1="&#x164;" u2="&#x1eb3;" k="164" />
-<hkern u1="&#x164;" u2="&#x1eb2;" k="143" />
-<hkern u1="&#x164;" u2="&#x1eb1;" k="164" />
-<hkern u1="&#x164;" u2="&#x1eb0;" k="143" />
-<hkern u1="&#x164;" u2="&#x1eaf;" k="164" />
-<hkern u1="&#x164;" u2="&#x1eae;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ead;" k="164" />
-<hkern u1="&#x164;" u2="&#x1eac;" k="143" />
-<hkern u1="&#x164;" u2="&#x1eab;" k="164" />
-<hkern u1="&#x164;" u2="&#x1eaa;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ea9;" k="164" />
-<hkern u1="&#x164;" u2="&#x1ea8;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ea6;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ea5;" k="164" />
-<hkern u1="&#x164;" u2="&#x1ea4;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ea3;" k="164" />
-<hkern u1="&#x164;" u2="&#x1ea2;" k="143" />
-<hkern u1="&#x164;" u2="&#x1ea1;" k="164" />
-<hkern u1="&#x164;" u2="&#x1ea0;" k="143" />
-<hkern u1="&#x164;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x164;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x164;" u2="&#x1e3f;" k="102" />
-<hkern u1="&#x164;" u2="&#x1e01;" k="164" />
-<hkern u1="&#x164;" u2="&#x1e00;" k="143" />
-<hkern u1="&#x164;" u2="&#x21a;" k="-41" />
-<hkern u1="&#x164;" u2="&#x219;" k="123" />
-<hkern u1="&#x164;" u2="&#x1ff;" k="143" />
-<hkern u1="&#x164;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x164;" u2="&#x1fd;" k="164" />
-<hkern u1="&#x164;" u2="&#x1fb;" k="164" />
-<hkern u1="&#x164;" u2="&#x1fa;" k="143" />
-<hkern u1="&#x164;" u2="&#x1b0;" k="102" />
-<hkern u1="&#x164;" u2="&#x1a1;" k="143" />
-<hkern u1="&#x164;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x164;" u2="&#x17e;" k="82" />
-<hkern u1="&#x164;" u2="&#x17c;" k="82" />
-<hkern u1="&#x164;" u2="&#x17a;" k="82" />
-<hkern u1="&#x164;" u2="&#x175;" k="41" />
-<hkern u1="&#x164;" u2="&#x173;" k="102" />
-<hkern u1="&#x164;" u2="&#x171;" k="102" />
-<hkern u1="&#x164;" u2="&#x16f;" k="102" />
-<hkern u1="&#x164;" u2="&#x16d;" k="102" />
-<hkern u1="&#x164;" u2="&#x16b;" k="102" />
-<hkern u1="&#x164;" u2="&#x169;" k="102" />
-<hkern u1="&#x164;" u2="&#x164;" k="-41" />
-<hkern u1="&#x164;" u2="&#x162;" k="-41" />
-<hkern u1="&#x164;" u2="&#x15f;" k="123" />
-<hkern u1="&#x164;" u2="&#x15b;" k="123" />
-<hkern u1="&#x164;" u2="&#x157;" k="102" />
-<hkern u1="&#x164;" u2="&#x155;" k="102" />
-<hkern u1="&#x164;" u2="&#x153;" k="143" />
-<hkern u1="&#x164;" u2="&#x152;" k="41" />
-<hkern u1="&#x164;" u2="&#x151;" k="143" />
-<hkern u1="&#x164;" u2="&#x150;" k="41" />
-<hkern u1="&#x164;" u2="&#x14f;" k="143" />
-<hkern u1="&#x164;" u2="&#x14e;" k="41" />
-<hkern u1="&#x164;" u2="&#x14d;" k="143" />
-<hkern u1="&#x164;" u2="&#x14c;" k="41" />
-<hkern u1="&#x164;" u2="&#x14b;" k="102" />
-<hkern u1="&#x164;" u2="&#x146;" k="102" />
-<hkern u1="&#x164;" u2="&#x144;" k="102" />
-<hkern u1="&#x164;" u2="&#x138;" k="102" />
-<hkern u1="&#x164;" u2="&#x123;" k="143" />
-<hkern u1="&#x164;" u2="&#x122;" k="41" />
-<hkern u1="&#x164;" u2="&#x121;" k="143" />
-<hkern u1="&#x164;" u2="&#x120;" k="41" />
-<hkern u1="&#x164;" u2="&#x11f;" k="143" />
-<hkern u1="&#x164;" u2="&#x11e;" k="41" />
-<hkern u1="&#x164;" u2="&#x11d;" k="143" />
-<hkern u1="&#x164;" u2="&#x11c;" k="41" />
-<hkern u1="&#x164;" u2="&#x11b;" k="143" />
-<hkern u1="&#x164;" u2="&#x119;" k="143" />
-<hkern u1="&#x164;" u2="&#x117;" k="143" />
-<hkern u1="&#x164;" u2="&#x115;" k="143" />
-<hkern u1="&#x164;" u2="&#x113;" k="143" />
-<hkern u1="&#x164;" u2="&#x111;" k="143" />
-<hkern u1="&#x164;" u2="&#x10f;" k="143" />
-<hkern u1="&#x164;" u2="&#x10d;" k="143" />
-<hkern u1="&#x164;" u2="&#x10c;" k="41" />
-<hkern u1="&#x164;" u2="&#x10b;" k="143" />
-<hkern u1="&#x164;" u2="&#x10a;" k="41" />
-<hkern u1="&#x164;" u2="&#x109;" k="143" />
-<hkern u1="&#x164;" u2="&#x108;" k="41" />
-<hkern u1="&#x164;" u2="&#x107;" k="143" />
-<hkern u1="&#x164;" u2="&#x106;" k="41" />
-<hkern u1="&#x164;" u2="&#x105;" k="164" />
-<hkern u1="&#x164;" u2="&#x104;" k="143" />
-<hkern u1="&#x164;" u2="&#x103;" k="164" />
-<hkern u1="&#x164;" u2="&#x102;" k="143" />
-<hkern u1="&#x164;" u2="&#x101;" k="164" />
-<hkern u1="&#x164;" u2="&#x100;" k="143" />
-<hkern u1="&#x164;" u2="&#xfd;" k="41" />
-<hkern u1="&#x164;" u2="&#xfc;" k="102" />
-<hkern u1="&#x164;" u2="&#xfb;" k="102" />
-<hkern u1="&#x164;" u2="&#xfa;" k="102" />
-<hkern u1="&#x164;" u2="&#xf9;" k="102" />
-<hkern u1="&#x164;" u2="&#xf8;" k="143" />
-<hkern u1="&#x164;" u2="&#xf6;" k="143" />
-<hkern u1="&#x164;" u2="&#xf5;" k="143" />
-<hkern u1="&#x164;" u2="&#xf4;" k="143" />
-<hkern u1="&#x164;" u2="&#xf3;" k="143" />
-<hkern u1="&#x164;" u2="&#xf2;" k="143" />
-<hkern u1="&#x164;" u2="&#xeb;" k="143" />
-<hkern u1="&#x164;" u2="&#xea;" k="143" />
-<hkern u1="&#x164;" u2="&#xe9;" k="143" />
-<hkern u1="&#x164;" u2="&#xe8;" k="143" />
-<hkern u1="&#x164;" u2="&#xe7;" k="143" />
-<hkern u1="&#x164;" u2="&#xe6;" k="164" />
-<hkern u1="&#x164;" u2="&#xe5;" k="164" />
-<hkern u1="&#x164;" u2="&#xe4;" k="164" />
-<hkern u1="&#x164;" u2="&#xe3;" k="164" />
-<hkern u1="&#x164;" u2="&#xe2;" k="164" />
-<hkern u1="&#x164;" u2="&#xe1;" k="164" />
-<hkern u1="&#x164;" u2="&#xe0;" k="143" />
-<hkern u1="&#x164;" u2="&#xd8;" k="41" />
-<hkern u1="&#x164;" u2="&#xd6;" k="41" />
-<hkern u1="&#x164;" u2="&#xd5;" k="41" />
-<hkern u1="&#x164;" u2="&#xd4;" k="41" />
-<hkern u1="&#x164;" u2="&#xd3;" k="41" />
-<hkern u1="&#x164;" u2="&#xd2;" k="41" />
-<hkern u1="&#x164;" u2="&#xc7;" k="41" />
-<hkern u1="&#x164;" u2="&#xc5;" k="143" />
-<hkern u1="&#x164;" u2="&#xc4;" k="143" />
-<hkern u1="&#x164;" u2="&#xc3;" k="143" />
-<hkern u1="&#x164;" u2="&#xc2;" k="143" />
-<hkern u1="&#x164;" u2="&#xc1;" k="143" />
-<hkern u1="&#x164;" u2="&#xc0;" k="143" />
-<hkern u1="&#x164;" u2="z" k="82" />
-<hkern u1="&#x164;" u2="y" k="41" />
-<hkern u1="&#x164;" u2="x" k="41" />
-<hkern u1="&#x164;" u2="w" k="41" />
-<hkern u1="&#x164;" u2="v" k="41" />
-<hkern u1="&#x164;" u2="u" k="102" />
-<hkern u1="&#x164;" u2="s" k="123" />
-<hkern u1="&#x164;" u2="r" k="102" />
-<hkern u1="&#x164;" u2="q" k="143" />
-<hkern u1="&#x164;" u2="p" k="102" />
-<hkern u1="&#x164;" u2="o" k="143" />
-<hkern u1="&#x164;" u2="n" k="102" />
-<hkern u1="&#x164;" u2="m" k="102" />
-<hkern u1="&#x164;" u2="g" k="143" />
-<hkern u1="&#x164;" u2="e" k="143" />
-<hkern u1="&#x164;" u2="d" k="143" />
-<hkern u1="&#x164;" u2="c" k="143" />
-<hkern u1="&#x164;" u2="a" k="164" />
-<hkern u1="&#x164;" u2="T" k="-41" />
-<hkern u1="&#x164;" u2="Q" k="41" />
-<hkern u1="&#x164;" u2="O" k="41" />
-<hkern u1="&#x164;" u2="G" k="41" />
-<hkern u1="&#x164;" u2="C" k="41" />
-<hkern u1="&#x164;" u2="A" k="143" />
-<hkern u1="&#x164;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x164;" u2="&#x2e;" k="123" />
-<hkern u1="&#x164;" u2="&#x2d;" k="82" />
-<hkern u1="&#x164;" u2="&#x2c;" k="123" />
-<hkern u1="&#x165;" u2="&#x201d;" k="-41" />
-<hkern u1="&#x165;" u2="&#x2019;" k="-41" />
-<hkern u1="&#x165;" u2="&#x27;" k="-41" />
-<hkern u1="&#x165;" u2="&#x22;" k="-41" />
-<hkern u1="&#x166;" u2="&#x201e;" k="123" />
-<hkern u1="&#x166;" u2="&#x201a;" k="123" />
-<hkern u1="&#x166;" u2="&#x2015;" k="82" />
-<hkern u1="&#x166;" u2="&#x2014;" k="82" />
-<hkern u1="&#x166;" u2="&#x2013;" k="82" />
-<hkern u1="&#x166;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x166;" u2="&#x1ef1;" k="102" />
-<hkern u1="&#x166;" u2="&#x1eef;" k="102" />
-<hkern u1="&#x166;" u2="&#x1eed;" k="102" />
-<hkern u1="&#x166;" u2="&#x1eeb;" k="102" />
-<hkern u1="&#x166;" u2="&#x1ee9;" k="102" />
-<hkern u1="&#x166;" u2="&#x1ee7;" k="102" />
-<hkern u1="&#x166;" u2="&#x1ee5;" k="102" />
-<hkern u1="&#x166;" u2="&#x1ee3;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x166;" u2="&#x1ee1;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x166;" u2="&#x1edf;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x166;" u2="&#x1edd;" k="143" />
-<hkern u1="&#x166;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x166;" u2="&#x1edb;" k="143" />
-<hkern u1="&#x166;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x166;" u2="&#x1ed9;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x166;" u2="&#x1ed7;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x166;" u2="&#x1ed5;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x166;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x166;" u2="&#x1ed1;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x166;" u2="&#x1ecf;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x166;" u2="&#x1ecd;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x166;" u2="&#x1ec7;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ec5;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ec3;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ebf;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ebd;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ebb;" k="143" />
-<hkern u1="&#x166;" u2="&#x1eb9;" k="143" />
-<hkern u1="&#x166;" u2="&#x1eb7;" k="164" />
-<hkern u1="&#x166;" u2="&#x1eb6;" k="143" />
-<hkern u1="&#x166;" u2="&#x1eb5;" k="164" />
-<hkern u1="&#x166;" u2="&#x1eb4;" k="143" />
-<hkern u1="&#x166;" u2="&#x1eb3;" k="164" />
-<hkern u1="&#x166;" u2="&#x1eb2;" k="143" />
-<hkern u1="&#x166;" u2="&#x1eb1;" k="164" />
-<hkern u1="&#x166;" u2="&#x1eb0;" k="143" />
-<hkern u1="&#x166;" u2="&#x1eaf;" k="164" />
-<hkern u1="&#x166;" u2="&#x1eae;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ead;" k="164" />
-<hkern u1="&#x166;" u2="&#x1eac;" k="143" />
-<hkern u1="&#x166;" u2="&#x1eab;" k="164" />
-<hkern u1="&#x166;" u2="&#x1eaa;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ea9;" k="164" />
-<hkern u1="&#x166;" u2="&#x1ea8;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ea6;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ea5;" k="164" />
-<hkern u1="&#x166;" u2="&#x1ea4;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ea3;" k="164" />
-<hkern u1="&#x166;" u2="&#x1ea2;" k="143" />
-<hkern u1="&#x166;" u2="&#x1ea1;" k="164" />
-<hkern u1="&#x166;" u2="&#x1ea0;" k="143" />
-<hkern u1="&#x166;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x166;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x166;" u2="&#x1e3f;" k="102" />
-<hkern u1="&#x166;" u2="&#x1e01;" k="164" />
-<hkern u1="&#x166;" u2="&#x1e00;" k="143" />
-<hkern u1="&#x166;" u2="&#x21a;" k="-41" />
-<hkern u1="&#x166;" u2="&#x219;" k="123" />
-<hkern u1="&#x166;" u2="&#x1ff;" k="143" />
-<hkern u1="&#x166;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x166;" u2="&#x1fd;" k="164" />
-<hkern u1="&#x166;" u2="&#x1fb;" k="164" />
-<hkern u1="&#x166;" u2="&#x1fa;" k="143" />
-<hkern u1="&#x166;" u2="&#x1b0;" k="102" />
-<hkern u1="&#x166;" u2="&#x1a1;" k="143" />
-<hkern u1="&#x166;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x166;" u2="&#x17e;" k="82" />
-<hkern u1="&#x166;" u2="&#x17c;" k="82" />
-<hkern u1="&#x166;" u2="&#x17a;" k="82" />
-<hkern u1="&#x166;" u2="&#x175;" k="41" />
-<hkern u1="&#x166;" u2="&#x173;" k="102" />
-<hkern u1="&#x166;" u2="&#x171;" k="102" />
-<hkern u1="&#x166;" u2="&#x16f;" k="102" />
-<hkern u1="&#x166;" u2="&#x16d;" k="102" />
-<hkern u1="&#x166;" u2="&#x16b;" k="102" />
-<hkern u1="&#x166;" u2="&#x169;" k="102" />
-<hkern u1="&#x166;" u2="&#x164;" k="-41" />
-<hkern u1="&#x166;" u2="&#x162;" k="-41" />
-<hkern u1="&#x166;" u2="&#x15f;" k="123" />
-<hkern u1="&#x166;" u2="&#x15b;" k="123" />
-<hkern u1="&#x166;" u2="&#x157;" k="102" />
-<hkern u1="&#x166;" u2="&#x155;" k="102" />
-<hkern u1="&#x166;" u2="&#x153;" k="143" />
-<hkern u1="&#x166;" u2="&#x152;" k="41" />
-<hkern u1="&#x166;" u2="&#x151;" k="143" />
-<hkern u1="&#x166;" u2="&#x150;" k="41" />
-<hkern u1="&#x166;" u2="&#x14f;" k="143" />
-<hkern u1="&#x166;" u2="&#x14e;" k="41" />
-<hkern u1="&#x166;" u2="&#x14d;" k="143" />
-<hkern u1="&#x166;" u2="&#x14c;" k="41" />
-<hkern u1="&#x166;" u2="&#x14b;" k="102" />
-<hkern u1="&#x166;" u2="&#x146;" k="102" />
-<hkern u1="&#x166;" u2="&#x144;" k="102" />
-<hkern u1="&#x166;" u2="&#x138;" k="102" />
-<hkern u1="&#x166;" u2="&#x123;" k="143" />
-<hkern u1="&#x166;" u2="&#x122;" k="41" />
-<hkern u1="&#x166;" u2="&#x121;" k="143" />
-<hkern u1="&#x166;" u2="&#x120;" k="41" />
-<hkern u1="&#x166;" u2="&#x11f;" k="143" />
-<hkern u1="&#x166;" u2="&#x11e;" k="41" />
-<hkern u1="&#x166;" u2="&#x11d;" k="143" />
-<hkern u1="&#x166;" u2="&#x11c;" k="41" />
-<hkern u1="&#x166;" u2="&#x11b;" k="143" />
-<hkern u1="&#x166;" u2="&#x119;" k="143" />
-<hkern u1="&#x166;" u2="&#x117;" k="143" />
-<hkern u1="&#x166;" u2="&#x115;" k="143" />
-<hkern u1="&#x166;" u2="&#x113;" k="143" />
-<hkern u1="&#x166;" u2="&#x111;" k="143" />
-<hkern u1="&#x166;" u2="&#x10f;" k="143" />
-<hkern u1="&#x166;" u2="&#x10d;" k="143" />
-<hkern u1="&#x166;" u2="&#x10c;" k="41" />
-<hkern u1="&#x166;" u2="&#x10b;" k="143" />
-<hkern u1="&#x166;" u2="&#x10a;" k="41" />
-<hkern u1="&#x166;" u2="&#x109;" k="143" />
-<hkern u1="&#x166;" u2="&#x108;" k="41" />
-<hkern u1="&#x166;" u2="&#x107;" k="143" />
-<hkern u1="&#x166;" u2="&#x106;" k="41" />
-<hkern u1="&#x166;" u2="&#x105;" k="164" />
-<hkern u1="&#x166;" u2="&#x104;" k="143" />
-<hkern u1="&#x166;" u2="&#x103;" k="164" />
-<hkern u1="&#x166;" u2="&#x102;" k="143" />
-<hkern u1="&#x166;" u2="&#x101;" k="164" />
-<hkern u1="&#x166;" u2="&#x100;" k="143" />
-<hkern u1="&#x166;" u2="&#xfd;" k="41" />
-<hkern u1="&#x166;" u2="&#xfc;" k="102" />
-<hkern u1="&#x166;" u2="&#xfb;" k="102" />
-<hkern u1="&#x166;" u2="&#xfa;" k="102" />
-<hkern u1="&#x166;" u2="&#xf9;" k="102" />
-<hkern u1="&#x166;" u2="&#xf8;" k="143" />
-<hkern u1="&#x166;" u2="&#xf6;" k="143" />
-<hkern u1="&#x166;" u2="&#xf5;" k="143" />
-<hkern u1="&#x166;" u2="&#xf4;" k="143" />
-<hkern u1="&#x166;" u2="&#xf3;" k="143" />
-<hkern u1="&#x166;" u2="&#xf2;" k="143" />
-<hkern u1="&#x166;" u2="&#xeb;" k="143" />
-<hkern u1="&#x166;" u2="&#xea;" k="143" />
-<hkern u1="&#x166;" u2="&#xe9;" k="143" />
-<hkern u1="&#x166;" u2="&#xe8;" k="143" />
-<hkern u1="&#x166;" u2="&#xe7;" k="143" />
-<hkern u1="&#x166;" u2="&#xe6;" k="164" />
-<hkern u1="&#x166;" u2="&#xe5;" k="164" />
-<hkern u1="&#x166;" u2="&#xe4;" k="164" />
-<hkern u1="&#x166;" u2="&#xe3;" k="164" />
-<hkern u1="&#x166;" u2="&#xe2;" k="164" />
-<hkern u1="&#x166;" u2="&#xe1;" k="164" />
-<hkern u1="&#x166;" u2="&#xe0;" k="143" />
-<hkern u1="&#x166;" u2="&#xd8;" k="41" />
-<hkern u1="&#x166;" u2="&#xd6;" k="41" />
-<hkern u1="&#x166;" u2="&#xd5;" k="41" />
-<hkern u1="&#x166;" u2="&#xd4;" k="41" />
-<hkern u1="&#x166;" u2="&#xd3;" k="41" />
-<hkern u1="&#x166;" u2="&#xd2;" k="41" />
-<hkern u1="&#x166;" u2="&#xc7;" k="41" />
-<hkern u1="&#x166;" u2="&#xc5;" k="143" />
-<hkern u1="&#x166;" u2="&#xc4;" k="143" />
-<hkern u1="&#x166;" u2="&#xc3;" k="143" />
-<hkern u1="&#x166;" u2="&#xc2;" k="143" />
-<hkern u1="&#x166;" u2="&#xc1;" k="143" />
-<hkern u1="&#x166;" u2="&#xc0;" k="143" />
-<hkern u1="&#x166;" u2="z" k="82" />
-<hkern u1="&#x166;" u2="y" k="41" />
-<hkern u1="&#x166;" u2="x" k="41" />
-<hkern u1="&#x166;" u2="w" k="41" />
-<hkern u1="&#x166;" u2="v" k="41" />
-<hkern u1="&#x166;" u2="u" k="102" />
-<hkern u1="&#x166;" u2="s" k="123" />
-<hkern u1="&#x166;" u2="r" k="102" />
-<hkern u1="&#x166;" u2="q" k="143" />
-<hkern u1="&#x166;" u2="p" k="102" />
-<hkern u1="&#x166;" u2="o" k="143" />
-<hkern u1="&#x166;" u2="n" k="102" />
-<hkern u1="&#x166;" u2="m" k="102" />
-<hkern u1="&#x166;" u2="g" k="143" />
-<hkern u1="&#x166;" u2="e" k="143" />
-<hkern u1="&#x166;" u2="d" k="143" />
-<hkern u1="&#x166;" u2="c" k="143" />
-<hkern u1="&#x166;" u2="a" k="164" />
-<hkern u1="&#x166;" u2="T" k="-41" />
-<hkern u1="&#x166;" u2="Q" k="41" />
-<hkern u1="&#x166;" u2="O" k="41" />
-<hkern u1="&#x166;" u2="G" k="41" />
-<hkern u1="&#x166;" u2="C" k="41" />
-<hkern u1="&#x166;" u2="A" k="143" />
-<hkern u1="&#x166;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x166;" u2="&#x2e;" k="123" />
-<hkern u1="&#x166;" u2="&#x2d;" k="82" />
-<hkern u1="&#x166;" u2="&#x2c;" k="123" />
-<hkern u1="&#x168;" u2="&#x201e;" k="41" />
-<hkern u1="&#x168;" u2="&#x201a;" k="41" />
-<hkern u1="&#x168;" u2="&#x1eb6;" k="20" />
-<hkern u1="&#x168;" u2="&#x1eb4;" k="20" />
-<hkern u1="&#x168;" u2="&#x1eb2;" k="20" />
-<hkern u1="&#x168;" u2="&#x1eb0;" k="20" />
-<hkern u1="&#x168;" u2="&#x1eae;" k="20" />
-<hkern u1="&#x168;" u2="&#x1eac;" k="20" />
-<hkern u1="&#x168;" u2="&#x1eaa;" k="20" />
-<hkern u1="&#x168;" u2="&#x1ea8;" k="20" />
-<hkern u1="&#x168;" u2="&#x1ea6;" k="20" />
-<hkern u1="&#x168;" u2="&#x1ea4;" k="20" />
-<hkern u1="&#x168;" u2="&#x1ea2;" k="20" />
-<hkern u1="&#x168;" u2="&#x1ea0;" k="20" />
-<hkern u1="&#x168;" u2="&#x1e00;" k="20" />
-<hkern u1="&#x168;" u2="&#x1fa;" k="20" />
-<hkern u1="&#x168;" u2="&#x104;" k="20" />
-<hkern u1="&#x168;" u2="&#x102;" k="20" />
-<hkern u1="&#x168;" u2="&#x100;" k="20" />
-<hkern u1="&#x168;" u2="&#xc5;" k="20" />
-<hkern u1="&#x168;" u2="&#xc4;" k="20" />
-<hkern u1="&#x168;" u2="&#xc3;" k="20" />
-<hkern u1="&#x168;" u2="&#xc2;" k="20" />
-<hkern u1="&#x168;" u2="&#xc1;" k="20" />
-<hkern u1="&#x168;" u2="&#xc0;" k="20" />
-<hkern u1="&#x168;" u2="A" k="20" />
-<hkern u1="&#x168;" u2="&#x2e;" k="41" />
-<hkern u1="&#x168;" u2="&#x2c;" k="41" />
-<hkern u1="&#x16a;" u2="&#x201e;" k="41" />
-<hkern u1="&#x16a;" u2="&#x201a;" k="41" />
-<hkern u1="&#x16a;" u2="&#x1eb6;" k="20" />
-<hkern u1="&#x16a;" u2="&#x1eb4;" k="20" />
-<hkern u1="&#x16a;" u2="&#x1eb2;" k="20" />
-<hkern u1="&#x16a;" u2="&#x1eb0;" k="20" />
-<hkern u1="&#x16a;" u2="&#x1eae;" k="20" />
-<hkern u1="&#x16a;" u2="&#x1eac;" k="20" />
-<hkern u1="&#x16a;" u2="&#x1eaa;" k="20" />
-<hkern u1="&#x16a;" u2="&#x1ea8;" k="20" />
-<hkern u1="&#x16a;" u2="&#x1ea6;" k="20" />
-<hkern u1="&#x16a;" u2="&#x1ea4;" k="20" />
-<hkern u1="&#x16a;" u2="&#x1ea2;" k="20" />
-<hkern u1="&#x16a;" u2="&#x1ea0;" k="20" />
-<hkern u1="&#x16a;" u2="&#x1e00;" k="20" />
-<hkern u1="&#x16a;" u2="&#x1fa;" k="20" />
-<hkern u1="&#x16a;" u2="&#x104;" k="20" />
-<hkern u1="&#x16a;" u2="&#x102;" k="20" />
-<hkern u1="&#x16a;" u2="&#x100;" k="20" />
-<hkern u1="&#x16a;" u2="&#xc5;" k="20" />
-<hkern u1="&#x16a;" u2="&#xc4;" k="20" />
-<hkern u1="&#x16a;" u2="&#xc3;" k="20" />
-<hkern u1="&#x16a;" u2="&#xc2;" k="20" />
-<hkern u1="&#x16a;" u2="&#xc1;" k="20" />
-<hkern u1="&#x16a;" u2="&#xc0;" k="20" />
-<hkern u1="&#x16a;" u2="A" k="20" />
-<hkern u1="&#x16a;" u2="&#x2e;" k="41" />
-<hkern u1="&#x16a;" u2="&#x2c;" k="41" />
-<hkern u1="&#x16c;" u2="&#x201e;" k="41" />
-<hkern u1="&#x16c;" u2="&#x201a;" k="41" />
-<hkern u1="&#x16c;" u2="&#x1eb6;" k="20" />
-<hkern u1="&#x16c;" u2="&#x1eb4;" k="20" />
-<hkern u1="&#x16c;" u2="&#x1eb2;" k="20" />
-<hkern u1="&#x16c;" u2="&#x1eb0;" k="20" />
-<hkern u1="&#x16c;" u2="&#x1eae;" k="20" />
-<hkern u1="&#x16c;" u2="&#x1eac;" k="20" />
-<hkern u1="&#x16c;" u2="&#x1eaa;" k="20" />
-<hkern u1="&#x16c;" u2="&#x1ea8;" k="20" />
-<hkern u1="&#x16c;" u2="&#x1ea6;" k="20" />
-<hkern u1="&#x16c;" u2="&#x1ea4;" k="20" />
-<hkern u1="&#x16c;" u2="&#x1ea2;" k="20" />
-<hkern u1="&#x16c;" u2="&#x1ea0;" k="20" />
-<hkern u1="&#x16c;" u2="&#x1e00;" k="20" />
-<hkern u1="&#x16c;" u2="&#x1fa;" k="20" />
-<hkern u1="&#x16c;" u2="&#x104;" k="20" />
-<hkern u1="&#x16c;" u2="&#x102;" k="20" />
-<hkern u1="&#x16c;" u2="&#x100;" k="20" />
-<hkern u1="&#x16c;" u2="&#xc5;" k="20" />
-<hkern u1="&#x16c;" u2="&#xc4;" k="20" />
-<hkern u1="&#x16c;" u2="&#xc3;" k="20" />
-<hkern u1="&#x16c;" u2="&#xc2;" k="20" />
-<hkern u1="&#x16c;" u2="&#xc1;" k="20" />
-<hkern u1="&#x16c;" u2="&#xc0;" k="20" />
-<hkern u1="&#x16c;" u2="A" k="20" />
-<hkern u1="&#x16c;" u2="&#x2e;" k="41" />
-<hkern u1="&#x16c;" u2="&#x2c;" k="41" />
-<hkern u1="&#x16e;" u2="&#x201e;" k="41" />
-<hkern u1="&#x16e;" u2="&#x201a;" k="41" />
-<hkern u1="&#x16e;" u2="&#x1eb6;" k="20" />
-<hkern u1="&#x16e;" u2="&#x1eb4;" k="20" />
-<hkern u1="&#x16e;" u2="&#x1eb2;" k="20" />
-<hkern u1="&#x16e;" u2="&#x1eb0;" k="20" />
-<hkern u1="&#x16e;" u2="&#x1eae;" k="20" />
-<hkern u1="&#x16e;" u2="&#x1eac;" k="20" />
-<hkern u1="&#x16e;" u2="&#x1eaa;" k="20" />
-<hkern u1="&#x16e;" u2="&#x1ea8;" k="20" />
-<hkern u1="&#x16e;" u2="&#x1ea6;" k="20" />
-<hkern u1="&#x16e;" u2="&#x1ea4;" k="20" />
-<hkern u1="&#x16e;" u2="&#x1ea2;" k="20" />
-<hkern u1="&#x16e;" u2="&#x1ea0;" k="20" />
-<hkern u1="&#x16e;" u2="&#x1e00;" k="20" />
-<hkern u1="&#x16e;" u2="&#x1fa;" k="20" />
-<hkern u1="&#x16e;" u2="&#x104;" k="20" />
-<hkern u1="&#x16e;" u2="&#x102;" k="20" />
-<hkern u1="&#x16e;" u2="&#x100;" k="20" />
-<hkern u1="&#x16e;" u2="&#xc5;" k="20" />
-<hkern u1="&#x16e;" u2="&#xc4;" k="20" />
-<hkern u1="&#x16e;" u2="&#xc3;" k="20" />
-<hkern u1="&#x16e;" u2="&#xc2;" k="20" />
-<hkern u1="&#x16e;" u2="&#xc1;" k="20" />
-<hkern u1="&#x16e;" u2="&#xc0;" k="20" />
-<hkern u1="&#x16e;" u2="A" k="20" />
-<hkern u1="&#x16e;" u2="&#x2e;" k="41" />
-<hkern u1="&#x16e;" u2="&#x2c;" k="41" />
-<hkern u1="&#x170;" u2="&#x201e;" k="41" />
-<hkern u1="&#x170;" u2="&#x201a;" k="41" />
-<hkern u1="&#x170;" u2="&#x1eb6;" k="20" />
-<hkern u1="&#x170;" u2="&#x1eb4;" k="20" />
-<hkern u1="&#x170;" u2="&#x1eb2;" k="20" />
-<hkern u1="&#x170;" u2="&#x1eb0;" k="20" />
-<hkern u1="&#x170;" u2="&#x1eae;" k="20" />
-<hkern u1="&#x170;" u2="&#x1eac;" k="20" />
-<hkern u1="&#x170;" u2="&#x1eaa;" k="20" />
-<hkern u1="&#x170;" u2="&#x1ea8;" k="20" />
-<hkern u1="&#x170;" u2="&#x1ea6;" k="20" />
-<hkern u1="&#x170;" u2="&#x1ea4;" k="20" />
-<hkern u1="&#x170;" u2="&#x1ea2;" k="20" />
-<hkern u1="&#x170;" u2="&#x1ea0;" k="20" />
-<hkern u1="&#x170;" u2="&#x1e00;" k="20" />
-<hkern u1="&#x170;" u2="&#x1fa;" k="20" />
-<hkern u1="&#x170;" u2="&#x104;" k="20" />
-<hkern u1="&#x170;" u2="&#x102;" k="20" />
-<hkern u1="&#x170;" u2="&#x100;" k="20" />
-<hkern u1="&#x170;" u2="&#xc5;" k="20" />
-<hkern u1="&#x170;" u2="&#xc4;" k="20" />
-<hkern u1="&#x170;" u2="&#xc3;" k="20" />
-<hkern u1="&#x170;" u2="&#xc2;" k="20" />
-<hkern u1="&#x170;" u2="&#xc1;" k="20" />
-<hkern u1="&#x170;" u2="&#xc0;" k="20" />
-<hkern u1="&#x170;" u2="A" k="20" />
-<hkern u1="&#x170;" u2="&#x2e;" k="41" />
-<hkern u1="&#x170;" u2="&#x2c;" k="41" />
-<hkern u1="&#x172;" u2="&#x201e;" k="41" />
-<hkern u1="&#x172;" u2="&#x201a;" k="41" />
-<hkern u1="&#x172;" u2="&#x1eb6;" k="20" />
-<hkern u1="&#x172;" u2="&#x1eb4;" k="20" />
-<hkern u1="&#x172;" u2="&#x1eb2;" k="20" />
-<hkern u1="&#x172;" u2="&#x1eb0;" k="20" />
-<hkern u1="&#x172;" u2="&#x1eae;" k="20" />
-<hkern u1="&#x172;" u2="&#x1eac;" k="20" />
-<hkern u1="&#x172;" u2="&#x1eaa;" k="20" />
-<hkern u1="&#x172;" u2="&#x1ea8;" k="20" />
-<hkern u1="&#x172;" u2="&#x1ea6;" k="20" />
-<hkern u1="&#x172;" u2="&#x1ea4;" k="20" />
-<hkern u1="&#x172;" u2="&#x1ea2;" k="20" />
-<hkern u1="&#x172;" u2="&#x1ea0;" k="20" />
-<hkern u1="&#x172;" u2="&#x1e00;" k="20" />
-<hkern u1="&#x172;" u2="&#x1fa;" k="20" />
-<hkern u1="&#x172;" u2="&#x104;" k="20" />
-<hkern u1="&#x172;" u2="&#x102;" k="20" />
-<hkern u1="&#x172;" u2="&#x100;" k="20" />
-<hkern u1="&#x172;" u2="&#xc5;" k="20" />
-<hkern u1="&#x172;" u2="&#xc4;" k="20" />
-<hkern u1="&#x172;" u2="&#xc3;" k="20" />
-<hkern u1="&#x172;" u2="&#xc2;" k="20" />
-<hkern u1="&#x172;" u2="&#xc1;" k="20" />
-<hkern u1="&#x172;" u2="&#xc0;" k="20" />
-<hkern u1="&#x172;" u2="A" k="20" />
-<hkern u1="&#x172;" u2="&#x2e;" k="41" />
-<hkern u1="&#x172;" u2="&#x2c;" k="41" />
-<hkern u1="&#x174;" u2="&#x201e;" k="102" />
-<hkern u1="&#x174;" u2="&#x201a;" k="102" />
-<hkern u1="&#x174;" u2="&#x1ef1;" k="20" />
-<hkern u1="&#x174;" u2="&#x1eef;" k="20" />
-<hkern u1="&#x174;" u2="&#x1eed;" k="20" />
-<hkern u1="&#x174;" u2="&#x1eeb;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ee9;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ee7;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ee5;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ee3;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ee2;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ee1;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ee0;" k="20" />
-<hkern u1="&#x174;" u2="&#x1edf;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ede;" k="20" />
-<hkern u1="&#x174;" u2="&#x1edd;" k="41" />
-<hkern u1="&#x174;" u2="&#x1edc;" k="20" />
-<hkern u1="&#x174;" u2="&#x1edb;" k="41" />
-<hkern u1="&#x174;" u2="&#x1eda;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ed9;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ed8;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ed7;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ed6;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ed5;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ed4;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ed2;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ed1;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ed0;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ecf;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ece;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ecd;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ecc;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ec7;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ec5;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ec3;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ebf;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ebd;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ebb;" k="41" />
-<hkern u1="&#x174;" u2="&#x1eb9;" k="41" />
-<hkern u1="&#x174;" u2="&#x1eb7;" k="41" />
-<hkern u1="&#x174;" u2="&#x1eb6;" k="82" />
-<hkern u1="&#x174;" u2="&#x1eb5;" k="41" />
-<hkern u1="&#x174;" u2="&#x1eb4;" k="82" />
-<hkern u1="&#x174;" u2="&#x1eb3;" k="41" />
-<hkern u1="&#x174;" u2="&#x1eb2;" k="82" />
-<hkern u1="&#x174;" u2="&#x1eb1;" k="41" />
-<hkern u1="&#x174;" u2="&#x1eb0;" k="82" />
-<hkern u1="&#x174;" u2="&#x1eaf;" k="41" />
-<hkern u1="&#x174;" u2="&#x1eae;" k="82" />
-<hkern u1="&#x174;" u2="&#x1ead;" k="41" />
-<hkern u1="&#x174;" u2="&#x1eac;" k="82" />
-<hkern u1="&#x174;" u2="&#x1eab;" k="41" />
-<hkern u1="&#x174;" u2="&#x1eaa;" k="82" />
-<hkern u1="&#x174;" u2="&#x1ea9;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ea8;" k="82" />
-<hkern u1="&#x174;" u2="&#x1ea6;" k="82" />
-<hkern u1="&#x174;" u2="&#x1ea5;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ea4;" k="82" />
-<hkern u1="&#x174;" u2="&#x1ea3;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ea2;" k="82" />
-<hkern u1="&#x174;" u2="&#x1ea1;" k="41" />
-<hkern u1="&#x174;" u2="&#x1ea0;" k="82" />
-<hkern u1="&#x174;" u2="&#x1e3f;" k="20" />
-<hkern u1="&#x174;" u2="&#x1e01;" k="41" />
-<hkern u1="&#x174;" u2="&#x1e00;" k="82" />
-<hkern u1="&#x174;" u2="&#x219;" k="20" />
-<hkern u1="&#x174;" u2="&#x1ff;" k="41" />
-<hkern u1="&#x174;" u2="&#x1fe;" k="20" />
-<hkern u1="&#x174;" u2="&#x1fd;" k="41" />
-<hkern u1="&#x174;" u2="&#x1fb;" k="41" />
-<hkern u1="&#x174;" u2="&#x1fa;" k="82" />
-<hkern u1="&#x174;" u2="&#x1b0;" k="20" />
-<hkern u1="&#x174;" u2="&#x1a1;" k="41" />
-<hkern u1="&#x174;" u2="&#x1a0;" k="20" />
-<hkern u1="&#x174;" u2="&#x173;" k="20" />
-<hkern u1="&#x174;" u2="&#x171;" k="20" />
-<hkern u1="&#x174;" u2="&#x16f;" k="20" />
-<hkern u1="&#x174;" u2="&#x16d;" k="20" />
-<hkern u1="&#x174;" u2="&#x16b;" k="20" />
-<hkern u1="&#x174;" u2="&#x169;" k="20" />
-<hkern u1="&#x174;" u2="&#x15f;" k="20" />
-<hkern u1="&#x174;" u2="&#x15b;" k="20" />
-<hkern u1="&#x174;" u2="&#x157;" k="20" />
-<hkern u1="&#x174;" u2="&#x155;" k="20" />
-<hkern u1="&#x174;" u2="&#x153;" k="41" />
-<hkern u1="&#x174;" u2="&#x152;" k="20" />
-<hkern u1="&#x174;" u2="&#x151;" k="41" />
-<hkern u1="&#x174;" u2="&#x150;" k="20" />
-<hkern u1="&#x174;" u2="&#x14f;" k="41" />
-<hkern u1="&#x174;" u2="&#x14e;" k="20" />
-<hkern u1="&#x174;" u2="&#x14d;" k="41" />
-<hkern u1="&#x174;" u2="&#x14c;" k="20" />
-<hkern u1="&#x174;" u2="&#x14b;" k="20" />
-<hkern u1="&#x174;" u2="&#x146;" k="20" />
-<hkern u1="&#x174;" u2="&#x144;" k="20" />
-<hkern u1="&#x174;" u2="&#x138;" k="20" />
-<hkern u1="&#x174;" u2="&#x123;" k="20" />
-<hkern u1="&#x174;" u2="&#x122;" k="20" />
-<hkern u1="&#x174;" u2="&#x121;" k="20" />
-<hkern u1="&#x174;" u2="&#x120;" k="20" />
-<hkern u1="&#x174;" u2="&#x11f;" k="20" />
-<hkern u1="&#x174;" u2="&#x11e;" k="20" />
-<hkern u1="&#x174;" u2="&#x11d;" k="20" />
-<hkern u1="&#x174;" u2="&#x11c;" k="20" />
-<hkern u1="&#x174;" u2="&#x11b;" k="41" />
-<hkern u1="&#x174;" u2="&#x119;" k="41" />
-<hkern u1="&#x174;" u2="&#x117;" k="41" />
-<hkern u1="&#x174;" u2="&#x115;" k="41" />
-<hkern u1="&#x174;" u2="&#x113;" k="41" />
-<hkern u1="&#x174;" u2="&#x111;" k="41" />
-<hkern u1="&#x174;" u2="&#x10f;" k="41" />
-<hkern u1="&#x174;" u2="&#x10d;" k="41" />
-<hkern u1="&#x174;" u2="&#x10c;" k="20" />
-<hkern u1="&#x174;" u2="&#x10b;" k="41" />
-<hkern u1="&#x174;" u2="&#x10a;" k="20" />
-<hkern u1="&#x174;" u2="&#x109;" k="41" />
-<hkern u1="&#x174;" u2="&#x108;" k="20" />
-<hkern u1="&#x174;" u2="&#x107;" k="41" />
-<hkern u1="&#x174;" u2="&#x106;" k="20" />
-<hkern u1="&#x174;" u2="&#x105;" k="41" />
-<hkern u1="&#x174;" u2="&#x104;" k="82" />
-<hkern u1="&#x174;" u2="&#x103;" k="41" />
-<hkern u1="&#x174;" u2="&#x102;" k="82" />
-<hkern u1="&#x174;" u2="&#x101;" k="41" />
-<hkern u1="&#x174;" u2="&#x100;" k="82" />
-<hkern u1="&#x174;" u2="&#xfc;" k="20" />
-<hkern u1="&#x174;" u2="&#xfb;" k="20" />
-<hkern u1="&#x174;" u2="&#xfa;" k="20" />
-<hkern u1="&#x174;" u2="&#xf9;" k="20" />
-<hkern u1="&#x174;" u2="&#xf8;" k="41" />
-<hkern u1="&#x174;" u2="&#xf6;" k="41" />
-<hkern u1="&#x174;" u2="&#xf5;" k="41" />
-<hkern u1="&#x174;" u2="&#xf4;" k="41" />
-<hkern u1="&#x174;" u2="&#xf3;" k="41" />
-<hkern u1="&#x174;" u2="&#xf2;" k="41" />
-<hkern u1="&#x174;" u2="&#xeb;" k="41" />
-<hkern u1="&#x174;" u2="&#xea;" k="41" />
-<hkern u1="&#x174;" u2="&#xe9;" k="41" />
-<hkern u1="&#x174;" u2="&#xe8;" k="41" />
-<hkern u1="&#x174;" u2="&#xe7;" k="41" />
-<hkern u1="&#x174;" u2="&#xe6;" k="41" />
-<hkern u1="&#x174;" u2="&#xe5;" k="41" />
-<hkern u1="&#x174;" u2="&#xe4;" k="41" />
-<hkern u1="&#x174;" u2="&#xe3;" k="41" />
-<hkern u1="&#x174;" u2="&#xe2;" k="41" />
-<hkern u1="&#x174;" u2="&#xe1;" k="41" />
-<hkern u1="&#x174;" u2="&#xe0;" k="41" />
-<hkern u1="&#x174;" u2="&#xd8;" k="20" />
-<hkern u1="&#x174;" u2="&#xd6;" k="20" />
-<hkern u1="&#x174;" u2="&#xd5;" k="20" />
-<hkern u1="&#x174;" u2="&#xd4;" k="20" />
-<hkern u1="&#x174;" u2="&#xd3;" k="20" />
-<hkern u1="&#x174;" u2="&#xd2;" k="20" />
-<hkern u1="&#x174;" u2="&#xc7;" k="20" />
-<hkern u1="&#x174;" u2="&#xc5;" k="82" />
-<hkern u1="&#x174;" u2="&#xc4;" k="82" />
-<hkern u1="&#x174;" u2="&#xc3;" k="82" />
-<hkern u1="&#x174;" u2="&#xc2;" k="82" />
-<hkern u1="&#x174;" u2="&#xc1;" k="82" />
-<hkern u1="&#x174;" u2="&#xc0;" k="82" />
-<hkern u1="&#x174;" u2="u" k="20" />
-<hkern u1="&#x174;" u2="s" k="20" />
-<hkern u1="&#x174;" u2="r" k="20" />
-<hkern u1="&#x174;" u2="q" k="41" />
-<hkern u1="&#x174;" u2="p" k="20" />
-<hkern u1="&#x174;" u2="o" k="41" />
-<hkern u1="&#x174;" u2="n" k="20" />
-<hkern u1="&#x174;" u2="m" k="20" />
-<hkern u1="&#x174;" u2="g" k="20" />
-<hkern u1="&#x174;" u2="e" k="41" />
-<hkern u1="&#x174;" u2="d" k="41" />
-<hkern u1="&#x174;" u2="c" k="41" />
-<hkern u1="&#x174;" u2="a" k="41" />
-<hkern u1="&#x174;" u2="Q" k="20" />
-<hkern u1="&#x174;" u2="O" k="20" />
-<hkern u1="&#x174;" u2="G" k="20" />
-<hkern u1="&#x174;" u2="C" k="20" />
-<hkern u1="&#x174;" u2="A" k="82" />
-<hkern u1="&#x174;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x174;" u2="&#x2e;" k="102" />
-<hkern u1="&#x174;" u2="&#x2c;" k="102" />
-<hkern u1="&#x175;" u2="&#x201e;" k="82" />
-<hkern u1="&#x175;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x175;" u2="&#x201a;" k="82" />
-<hkern u1="&#x175;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x175;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x175;" u2="&#x2e;" k="82" />
-<hkern u1="&#x175;" u2="&#x2c;" k="82" />
-<hkern u1="&#x175;" u2="&#x27;" k="-82" />
-<hkern u1="&#x175;" u2="&#x22;" k="-82" />
-<hkern u1="&#x176;" u2="&#x201e;" k="123" />
-<hkern u1="&#x176;" u2="&#x201a;" k="123" />
-<hkern u1="&#x176;" u2="&#x1ef1;" k="61" />
-<hkern u1="&#x176;" u2="&#x1eef;" k="61" />
-<hkern u1="&#x176;" u2="&#x1eed;" k="61" />
-<hkern u1="&#x176;" u2="&#x1eeb;" k="61" />
-<hkern u1="&#x176;" u2="&#x1ee9;" k="61" />
-<hkern u1="&#x176;" u2="&#x1ee7;" k="61" />
-<hkern u1="&#x176;" u2="&#x1ee5;" k="61" />
-<hkern u1="&#x176;" u2="&#x1ee3;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x176;" u2="&#x1ee1;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x176;" u2="&#x1edf;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x176;" u2="&#x1edd;" k="102" />
-<hkern u1="&#x176;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x176;" u2="&#x1edb;" k="102" />
-<hkern u1="&#x176;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x176;" u2="&#x1ed9;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x176;" u2="&#x1ed7;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x176;" u2="&#x1ed5;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x176;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x176;" u2="&#x1ed1;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x176;" u2="&#x1ecf;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x176;" u2="&#x1ecd;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x176;" u2="&#x1ec7;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ec5;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ec3;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ebf;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ebd;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ebb;" k="102" />
-<hkern u1="&#x176;" u2="&#x1eb9;" k="102" />
-<hkern u1="&#x176;" u2="&#x1eb7;" k="102" />
-<hkern u1="&#x176;" u2="&#x1eb6;" k="123" />
-<hkern u1="&#x176;" u2="&#x1eb5;" k="102" />
-<hkern u1="&#x176;" u2="&#x1eb4;" k="123" />
-<hkern u1="&#x176;" u2="&#x1eb3;" k="102" />
-<hkern u1="&#x176;" u2="&#x1eb2;" k="123" />
-<hkern u1="&#x176;" u2="&#x1eb1;" k="102" />
-<hkern u1="&#x176;" u2="&#x1eb0;" k="123" />
-<hkern u1="&#x176;" u2="&#x1eaf;" k="102" />
-<hkern u1="&#x176;" u2="&#x1eae;" k="123" />
-<hkern u1="&#x176;" u2="&#x1ead;" k="102" />
-<hkern u1="&#x176;" u2="&#x1eac;" k="123" />
-<hkern u1="&#x176;" u2="&#x1eab;" k="102" />
-<hkern u1="&#x176;" u2="&#x1eaa;" k="123" />
-<hkern u1="&#x176;" u2="&#x1ea9;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ea8;" k="123" />
-<hkern u1="&#x176;" u2="&#x1ea6;" k="123" />
-<hkern u1="&#x176;" u2="&#x1ea5;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ea4;" k="123" />
-<hkern u1="&#x176;" u2="&#x1ea3;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ea2;" k="123" />
-<hkern u1="&#x176;" u2="&#x1ea1;" k="102" />
-<hkern u1="&#x176;" u2="&#x1ea0;" k="123" />
-<hkern u1="&#x176;" u2="&#x1e3f;" k="61" />
-<hkern u1="&#x176;" u2="&#x1e01;" k="102" />
-<hkern u1="&#x176;" u2="&#x1e00;" k="123" />
-<hkern u1="&#x176;" u2="&#x219;" k="82" />
-<hkern u1="&#x176;" u2="&#x1ff;" k="102" />
-<hkern u1="&#x176;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x176;" u2="&#x1fd;" k="102" />
-<hkern u1="&#x176;" u2="&#x1fb;" k="102" />
-<hkern u1="&#x176;" u2="&#x1fa;" k="123" />
-<hkern u1="&#x176;" u2="&#x1b0;" k="61" />
-<hkern u1="&#x176;" u2="&#x1a1;" k="102" />
-<hkern u1="&#x176;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x176;" u2="&#x17e;" k="41" />
-<hkern u1="&#x176;" u2="&#x17c;" k="41" />
-<hkern u1="&#x176;" u2="&#x17a;" k="41" />
-<hkern u1="&#x176;" u2="&#x173;" k="61" />
-<hkern u1="&#x176;" u2="&#x171;" k="61" />
-<hkern u1="&#x176;" u2="&#x16f;" k="61" />
-<hkern u1="&#x176;" u2="&#x16d;" k="61" />
-<hkern u1="&#x176;" u2="&#x16b;" k="61" />
-<hkern u1="&#x176;" u2="&#x169;" k="61" />
-<hkern u1="&#x176;" u2="&#x15f;" k="82" />
-<hkern u1="&#x176;" u2="&#x15b;" k="82" />
-<hkern u1="&#x176;" u2="&#x157;" k="61" />
-<hkern u1="&#x176;" u2="&#x155;" k="61" />
-<hkern u1="&#x176;" u2="&#x153;" k="102" />
-<hkern u1="&#x176;" u2="&#x152;" k="41" />
-<hkern u1="&#x176;" u2="&#x151;" k="102" />
-<hkern u1="&#x176;" u2="&#x150;" k="41" />
-<hkern u1="&#x176;" u2="&#x14f;" k="102" />
-<hkern u1="&#x176;" u2="&#x14e;" k="41" />
-<hkern u1="&#x176;" u2="&#x14d;" k="102" />
-<hkern u1="&#x176;" u2="&#x14c;" k="41" />
-<hkern u1="&#x176;" u2="&#x14b;" k="61" />
-<hkern u1="&#x176;" u2="&#x146;" k="61" />
-<hkern u1="&#x176;" u2="&#x144;" k="61" />
-<hkern u1="&#x176;" u2="&#x138;" k="61" />
-<hkern u1="&#x176;" u2="&#x123;" k="41" />
-<hkern u1="&#x176;" u2="&#x122;" k="41" />
-<hkern u1="&#x176;" u2="&#x121;" k="41" />
-<hkern u1="&#x176;" u2="&#x120;" k="41" />
-<hkern u1="&#x176;" u2="&#x11f;" k="41" />
-<hkern u1="&#x176;" u2="&#x11e;" k="41" />
-<hkern u1="&#x176;" u2="&#x11d;" k="41" />
-<hkern u1="&#x176;" u2="&#x11c;" k="41" />
-<hkern u1="&#x176;" u2="&#x11b;" k="102" />
-<hkern u1="&#x176;" u2="&#x119;" k="102" />
-<hkern u1="&#x176;" u2="&#x117;" k="102" />
-<hkern u1="&#x176;" u2="&#x115;" k="102" />
-<hkern u1="&#x176;" u2="&#x113;" k="102" />
-<hkern u1="&#x176;" u2="&#x111;" k="102" />
-<hkern u1="&#x176;" u2="&#x10f;" k="102" />
-<hkern u1="&#x176;" u2="&#x10d;" k="102" />
-<hkern u1="&#x176;" u2="&#x10c;" k="41" />
-<hkern u1="&#x176;" u2="&#x10b;" k="102" />
-<hkern u1="&#x176;" u2="&#x10a;" k="41" />
-<hkern u1="&#x176;" u2="&#x109;" k="102" />
-<hkern u1="&#x176;" u2="&#x108;" k="41" />
-<hkern u1="&#x176;" u2="&#x107;" k="102" />
-<hkern u1="&#x176;" u2="&#x106;" k="41" />
-<hkern u1="&#x176;" u2="&#x105;" k="102" />
-<hkern u1="&#x176;" u2="&#x104;" k="123" />
-<hkern u1="&#x176;" u2="&#x103;" k="102" />
-<hkern u1="&#x176;" u2="&#x102;" k="123" />
-<hkern u1="&#x176;" u2="&#x101;" k="102" />
-<hkern u1="&#x176;" u2="&#x100;" k="123" />
-<hkern u1="&#x176;" u2="&#xfc;" k="61" />
-<hkern u1="&#x176;" u2="&#xfb;" k="61" />
-<hkern u1="&#x176;" u2="&#xfa;" k="61" />
-<hkern u1="&#x176;" u2="&#xf9;" k="61" />
-<hkern u1="&#x176;" u2="&#xf8;" k="102" />
-<hkern u1="&#x176;" u2="&#xf6;" k="102" />
-<hkern u1="&#x176;" u2="&#xf5;" k="102" />
-<hkern u1="&#x176;" u2="&#xf4;" k="102" />
-<hkern u1="&#x176;" u2="&#xf3;" k="102" />
-<hkern u1="&#x176;" u2="&#xf2;" k="102" />
-<hkern u1="&#x176;" u2="&#xeb;" k="102" />
-<hkern u1="&#x176;" u2="&#xea;" k="102" />
-<hkern u1="&#x176;" u2="&#xe9;" k="102" />
-<hkern u1="&#x176;" u2="&#xe8;" k="102" />
-<hkern u1="&#x176;" u2="&#xe7;" k="102" />
-<hkern u1="&#x176;" u2="&#xe6;" k="102" />
-<hkern u1="&#x176;" u2="&#xe5;" k="102" />
-<hkern u1="&#x176;" u2="&#xe4;" k="102" />
-<hkern u1="&#x176;" u2="&#xe3;" k="102" />
-<hkern u1="&#x176;" u2="&#xe2;" k="102" />
-<hkern u1="&#x176;" u2="&#xe1;" k="102" />
-<hkern u1="&#x176;" u2="&#xe0;" k="102" />
-<hkern u1="&#x176;" u2="&#xd8;" k="41" />
-<hkern u1="&#x176;" u2="&#xd6;" k="41" />
-<hkern u1="&#x176;" u2="&#xd5;" k="41" />
-<hkern u1="&#x176;" u2="&#xd4;" k="41" />
-<hkern u1="&#x176;" u2="&#xd3;" k="41" />
-<hkern u1="&#x176;" u2="&#xd2;" k="41" />
-<hkern u1="&#x176;" u2="&#xc7;" k="41" />
-<hkern u1="&#x176;" u2="&#xc5;" k="123" />
-<hkern u1="&#x176;" u2="&#xc4;" k="123" />
-<hkern u1="&#x176;" u2="&#xc3;" k="123" />
-<hkern u1="&#x176;" u2="&#xc2;" k="123" />
-<hkern u1="&#x176;" u2="&#xc1;" k="123" />
-<hkern u1="&#x176;" u2="&#xc0;" k="123" />
-<hkern u1="&#x176;" u2="z" k="41" />
-<hkern u1="&#x176;" u2="u" k="61" />
-<hkern u1="&#x176;" u2="s" k="82" />
-<hkern u1="&#x176;" u2="r" k="61" />
-<hkern u1="&#x176;" u2="q" k="102" />
-<hkern u1="&#x176;" u2="p" k="61" />
-<hkern u1="&#x176;" u2="o" k="102" />
-<hkern u1="&#x176;" u2="n" k="61" />
-<hkern u1="&#x176;" u2="m" k="61" />
-<hkern u1="&#x176;" u2="g" k="41" />
-<hkern u1="&#x176;" u2="e" k="102" />
-<hkern u1="&#x176;" u2="d" k="102" />
-<hkern u1="&#x176;" u2="c" k="102" />
-<hkern u1="&#x176;" u2="a" k="102" />
-<hkern u1="&#x176;" u2="Q" k="41" />
-<hkern u1="&#x176;" u2="O" k="41" />
-<hkern u1="&#x176;" u2="G" k="41" />
-<hkern u1="&#x176;" u2="C" k="41" />
-<hkern u1="&#x176;" u2="A" k="123" />
-<hkern u1="&#x176;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x176;" u2="&#x2e;" k="123" />
-<hkern u1="&#x176;" u2="&#x2c;" k="123" />
-<hkern u1="&#x177;" u2="&#x201e;" k="82" />
-<hkern u1="&#x177;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x177;" u2="&#x201a;" k="82" />
-<hkern u1="&#x177;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x177;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x177;" u2="&#x2e;" k="82" />
-<hkern u1="&#x177;" u2="&#x2c;" k="82" />
-<hkern u1="&#x177;" u2="&#x27;" k="-82" />
-<hkern u1="&#x177;" u2="&#x22;" k="-82" />
-<hkern u1="&#x178;" u2="&#x201e;" k="123" />
-<hkern u1="&#x178;" u2="&#x201a;" k="123" />
-<hkern u1="&#x178;" u2="&#x1ef1;" k="61" />
-<hkern u1="&#x178;" u2="&#x1eef;" k="61" />
-<hkern u1="&#x178;" u2="&#x1eed;" k="61" />
-<hkern u1="&#x178;" u2="&#x1eeb;" k="61" />
-<hkern u1="&#x178;" u2="&#x1ee9;" k="61" />
-<hkern u1="&#x178;" u2="&#x1ee7;" k="61" />
-<hkern u1="&#x178;" u2="&#x1ee5;" k="61" />
-<hkern u1="&#x178;" u2="&#x1ee3;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x178;" u2="&#x1ee1;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x178;" u2="&#x1edf;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x178;" u2="&#x1edd;" k="102" />
-<hkern u1="&#x178;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x178;" u2="&#x1edb;" k="102" />
-<hkern u1="&#x178;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x178;" u2="&#x1ed9;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x178;" u2="&#x1ed7;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x178;" u2="&#x1ed5;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x178;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x178;" u2="&#x1ed1;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x178;" u2="&#x1ecf;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x178;" u2="&#x1ecd;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x178;" u2="&#x1ec7;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ec5;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ec3;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ebf;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ebd;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ebb;" k="102" />
-<hkern u1="&#x178;" u2="&#x1eb9;" k="102" />
-<hkern u1="&#x178;" u2="&#x1eb7;" k="102" />
-<hkern u1="&#x178;" u2="&#x1eb6;" k="123" />
-<hkern u1="&#x178;" u2="&#x1eb5;" k="102" />
-<hkern u1="&#x178;" u2="&#x1eb4;" k="123" />
-<hkern u1="&#x178;" u2="&#x1eb3;" k="102" />
-<hkern u1="&#x178;" u2="&#x1eb2;" k="123" />
-<hkern u1="&#x178;" u2="&#x1eb1;" k="102" />
-<hkern u1="&#x178;" u2="&#x1eb0;" k="123" />
-<hkern u1="&#x178;" u2="&#x1eaf;" k="102" />
-<hkern u1="&#x178;" u2="&#x1eae;" k="123" />
-<hkern u1="&#x178;" u2="&#x1ead;" k="102" />
-<hkern u1="&#x178;" u2="&#x1eac;" k="123" />
-<hkern u1="&#x178;" u2="&#x1eab;" k="102" />
-<hkern u1="&#x178;" u2="&#x1eaa;" k="123" />
-<hkern u1="&#x178;" u2="&#x1ea9;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ea8;" k="123" />
-<hkern u1="&#x178;" u2="&#x1ea6;" k="123" />
-<hkern u1="&#x178;" u2="&#x1ea5;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ea4;" k="123" />
-<hkern u1="&#x178;" u2="&#x1ea3;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ea2;" k="123" />
-<hkern u1="&#x178;" u2="&#x1ea1;" k="102" />
-<hkern u1="&#x178;" u2="&#x1ea0;" k="123" />
-<hkern u1="&#x178;" u2="&#x1e3f;" k="61" />
-<hkern u1="&#x178;" u2="&#x1e01;" k="102" />
-<hkern u1="&#x178;" u2="&#x1e00;" k="123" />
-<hkern u1="&#x178;" u2="&#x219;" k="82" />
-<hkern u1="&#x178;" u2="&#x1ff;" k="102" />
-<hkern u1="&#x178;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x178;" u2="&#x1fd;" k="102" />
-<hkern u1="&#x178;" u2="&#x1fb;" k="102" />
-<hkern u1="&#x178;" u2="&#x1fa;" k="123" />
-<hkern u1="&#x178;" u2="&#x1b0;" k="61" />
-<hkern u1="&#x178;" u2="&#x1a1;" k="102" />
-<hkern u1="&#x178;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x178;" u2="&#x17e;" k="41" />
-<hkern u1="&#x178;" u2="&#x17c;" k="41" />
-<hkern u1="&#x178;" u2="&#x17a;" k="41" />
-<hkern u1="&#x178;" u2="&#x173;" k="61" />
-<hkern u1="&#x178;" u2="&#x171;" k="61" />
-<hkern u1="&#x178;" u2="&#x16f;" k="61" />
-<hkern u1="&#x178;" u2="&#x16d;" k="61" />
-<hkern u1="&#x178;" u2="&#x16b;" k="61" />
-<hkern u1="&#x178;" u2="&#x169;" k="61" />
-<hkern u1="&#x178;" u2="&#x15f;" k="82" />
-<hkern u1="&#x178;" u2="&#x15b;" k="82" />
-<hkern u1="&#x178;" u2="&#x157;" k="61" />
-<hkern u1="&#x178;" u2="&#x155;" k="61" />
-<hkern u1="&#x178;" u2="&#x153;" k="102" />
-<hkern u1="&#x178;" u2="&#x152;" k="41" />
-<hkern u1="&#x178;" u2="&#x151;" k="102" />
-<hkern u1="&#x178;" u2="&#x150;" k="41" />
-<hkern u1="&#x178;" u2="&#x14f;" k="102" />
-<hkern u1="&#x178;" u2="&#x14e;" k="41" />
-<hkern u1="&#x178;" u2="&#x14d;" k="102" />
-<hkern u1="&#x178;" u2="&#x14c;" k="41" />
-<hkern u1="&#x178;" u2="&#x14b;" k="61" />
-<hkern u1="&#x178;" u2="&#x146;" k="61" />
-<hkern u1="&#x178;" u2="&#x144;" k="61" />
-<hkern u1="&#x178;" u2="&#x138;" k="61" />
-<hkern u1="&#x178;" u2="&#x123;" k="41" />
-<hkern u1="&#x178;" u2="&#x122;" k="41" />
-<hkern u1="&#x178;" u2="&#x121;" k="41" />
-<hkern u1="&#x178;" u2="&#x120;" k="41" />
-<hkern u1="&#x178;" u2="&#x11f;" k="41" />
-<hkern u1="&#x178;" u2="&#x11e;" k="41" />
-<hkern u1="&#x178;" u2="&#x11d;" k="41" />
-<hkern u1="&#x178;" u2="&#x11c;" k="41" />
-<hkern u1="&#x178;" u2="&#x11b;" k="102" />
-<hkern u1="&#x178;" u2="&#x119;" k="102" />
-<hkern u1="&#x178;" u2="&#x117;" k="102" />
-<hkern u1="&#x178;" u2="&#x115;" k="102" />
-<hkern u1="&#x178;" u2="&#x113;" k="102" />
-<hkern u1="&#x178;" u2="&#x111;" k="102" />
-<hkern u1="&#x178;" u2="&#x10f;" k="102" />
-<hkern u1="&#x178;" u2="&#x10d;" k="102" />
-<hkern u1="&#x178;" u2="&#x10c;" k="41" />
-<hkern u1="&#x178;" u2="&#x10b;" k="102" />
-<hkern u1="&#x178;" u2="&#x10a;" k="41" />
-<hkern u1="&#x178;" u2="&#x109;" k="102" />
-<hkern u1="&#x178;" u2="&#x108;" k="41" />
-<hkern u1="&#x178;" u2="&#x107;" k="102" />
-<hkern u1="&#x178;" u2="&#x106;" k="41" />
-<hkern u1="&#x178;" u2="&#x105;" k="102" />
-<hkern u1="&#x178;" u2="&#x104;" k="123" />
-<hkern u1="&#x178;" u2="&#x103;" k="102" />
-<hkern u1="&#x178;" u2="&#x102;" k="123" />
-<hkern u1="&#x178;" u2="&#x101;" k="102" />
-<hkern u1="&#x178;" u2="&#x100;" k="123" />
-<hkern u1="&#x178;" u2="&#xfc;" k="61" />
-<hkern u1="&#x178;" u2="&#xfb;" k="61" />
-<hkern u1="&#x178;" u2="&#xfa;" k="61" />
-<hkern u1="&#x178;" u2="&#xf9;" k="61" />
-<hkern u1="&#x178;" u2="&#xf8;" k="102" />
-<hkern u1="&#x178;" u2="&#xf6;" k="102" />
-<hkern u1="&#x178;" u2="&#xf5;" k="102" />
-<hkern u1="&#x178;" u2="&#xf4;" k="102" />
-<hkern u1="&#x178;" u2="&#xf3;" k="102" />
-<hkern u1="&#x178;" u2="&#xf2;" k="102" />
-<hkern u1="&#x178;" u2="&#xeb;" k="102" />
-<hkern u1="&#x178;" u2="&#xea;" k="102" />
-<hkern u1="&#x178;" u2="&#xe9;" k="102" />
-<hkern u1="&#x178;" u2="&#xe8;" k="102" />
-<hkern u1="&#x178;" u2="&#xe7;" k="102" />
-<hkern u1="&#x178;" u2="&#xe6;" k="102" />
-<hkern u1="&#x178;" u2="&#xe5;" k="102" />
-<hkern u1="&#x178;" u2="&#xe4;" k="102" />
-<hkern u1="&#x178;" u2="&#xe3;" k="102" />
-<hkern u1="&#x178;" u2="&#xe2;" k="102" />
-<hkern u1="&#x178;" u2="&#xe1;" k="102" />
-<hkern u1="&#x178;" u2="&#xe0;" k="102" />
-<hkern u1="&#x178;" u2="&#xd8;" k="41" />
-<hkern u1="&#x178;" u2="&#xd6;" k="41" />
-<hkern u1="&#x178;" u2="&#xd5;" k="41" />
-<hkern u1="&#x178;" u2="&#xd4;" k="41" />
-<hkern u1="&#x178;" u2="&#xd3;" k="41" />
-<hkern u1="&#x178;" u2="&#xd2;" k="41" />
-<hkern u1="&#x178;" u2="&#xc7;" k="41" />
-<hkern u1="&#x178;" u2="&#xc5;" k="123" />
-<hkern u1="&#x178;" u2="&#xc4;" k="123" />
-<hkern u1="&#x178;" u2="&#xc3;" k="123" />
-<hkern u1="&#x178;" u2="&#xc2;" k="123" />
-<hkern u1="&#x178;" u2="&#xc1;" k="123" />
-<hkern u1="&#x178;" u2="&#xc0;" k="123" />
-<hkern u1="&#x178;" u2="z" k="41" />
-<hkern u1="&#x178;" u2="u" k="61" />
-<hkern u1="&#x178;" u2="s" k="82" />
-<hkern u1="&#x178;" u2="r" k="61" />
-<hkern u1="&#x178;" u2="q" k="102" />
-<hkern u1="&#x178;" u2="p" k="61" />
-<hkern u1="&#x178;" u2="o" k="102" />
-<hkern u1="&#x178;" u2="n" k="61" />
-<hkern u1="&#x178;" u2="m" k="61" />
-<hkern u1="&#x178;" u2="g" k="41" />
-<hkern u1="&#x178;" u2="e" k="102" />
-<hkern u1="&#x178;" u2="d" k="102" />
-<hkern u1="&#x178;" u2="c" k="102" />
-<hkern u1="&#x178;" u2="a" k="102" />
-<hkern u1="&#x178;" u2="Q" k="41" />
-<hkern u1="&#x178;" u2="O" k="41" />
-<hkern u1="&#x178;" u2="G" k="41" />
-<hkern u1="&#x178;" u2="C" k="41" />
-<hkern u1="&#x178;" u2="A" k="123" />
-<hkern u1="&#x178;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x178;" u2="&#x2e;" k="123" />
-<hkern u1="&#x178;" u2="&#x2c;" k="123" />
-<hkern u1="&#x179;" u2="&#x1ee2;" k="20" />
-<hkern u1="&#x179;" u2="&#x1ee0;" k="20" />
-<hkern u1="&#x179;" u2="&#x1ede;" k="20" />
-<hkern u1="&#x179;" u2="&#x1edc;" k="20" />
-<hkern u1="&#x179;" u2="&#x1eda;" k="20" />
-<hkern u1="&#x179;" u2="&#x1ed8;" k="20" />
-<hkern u1="&#x179;" u2="&#x1ed6;" k="20" />
-<hkern u1="&#x179;" u2="&#x1ed4;" k="20" />
-<hkern u1="&#x179;" u2="&#x1ed2;" k="20" />
-<hkern u1="&#x179;" u2="&#x1ed0;" k="20" />
-<hkern u1="&#x179;" u2="&#x1ece;" k="20" />
-<hkern u1="&#x179;" u2="&#x1ecc;" k="20" />
-<hkern u1="&#x179;" u2="&#x1fe;" k="20" />
-<hkern u1="&#x179;" u2="&#x1a0;" k="20" />
-<hkern u1="&#x179;" u2="&#x152;" k="20" />
-<hkern u1="&#x179;" u2="&#x150;" k="20" />
-<hkern u1="&#x179;" u2="&#x14e;" k="20" />
-<hkern u1="&#x179;" u2="&#x14c;" k="20" />
-<hkern u1="&#x179;" u2="&#x122;" k="20" />
-<hkern u1="&#x179;" u2="&#x120;" k="20" />
-<hkern u1="&#x179;" u2="&#x11e;" k="20" />
-<hkern u1="&#x179;" u2="&#x11c;" k="20" />
-<hkern u1="&#x179;" u2="&#x10c;" k="20" />
-<hkern u1="&#x179;" u2="&#x10a;" k="20" />
-<hkern u1="&#x179;" u2="&#x108;" k="20" />
-<hkern u1="&#x179;" u2="&#x106;" k="20" />
-<hkern u1="&#x179;" u2="&#xd8;" k="20" />
-<hkern u1="&#x179;" u2="&#xd6;" k="20" />
-<hkern u1="&#x179;" u2="&#xd5;" k="20" />
-<hkern u1="&#x179;" u2="&#xd4;" k="20" />
-<hkern u1="&#x179;" u2="&#xd3;" k="20" />
-<hkern u1="&#x179;" u2="&#xd2;" k="20" />
-<hkern u1="&#x179;" u2="&#xc7;" k="20" />
-<hkern u1="&#x179;" u2="Q" k="20" />
-<hkern u1="&#x179;" u2="O" k="20" />
-<hkern u1="&#x179;" u2="G" k="20" />
-<hkern u1="&#x179;" u2="C" k="20" />
-<hkern u1="&#x17b;" u2="&#x1ee2;" k="20" />
-<hkern u1="&#x17b;" u2="&#x1ee0;" k="20" />
-<hkern u1="&#x17b;" u2="&#x1ede;" k="20" />
-<hkern u1="&#x17b;" u2="&#x1edc;" k="20" />
-<hkern u1="&#x17b;" u2="&#x1eda;" k="20" />
-<hkern u1="&#x17b;" u2="&#x1ed8;" k="20" />
-<hkern u1="&#x17b;" u2="&#x1ed6;" k="20" />
-<hkern u1="&#x17b;" u2="&#x1ed4;" k="20" />
-<hkern u1="&#x17b;" u2="&#x1ed2;" k="20" />
-<hkern u1="&#x17b;" u2="&#x1ed0;" k="20" />
-<hkern u1="&#x17b;" u2="&#x1ece;" k="20" />
-<hkern u1="&#x17b;" u2="&#x1ecc;" k="20" />
-<hkern u1="&#x17b;" u2="&#x1fe;" k="20" />
-<hkern u1="&#x17b;" u2="&#x1a0;" k="20" />
-<hkern u1="&#x17b;" u2="&#x152;" k="20" />
-<hkern u1="&#x17b;" u2="&#x150;" k="20" />
-<hkern u1="&#x17b;" u2="&#x14e;" k="20" />
-<hkern u1="&#x17b;" u2="&#x14c;" k="20" />
-<hkern u1="&#x17b;" u2="&#x122;" k="20" />
-<hkern u1="&#x17b;" u2="&#x120;" k="20" />
-<hkern u1="&#x17b;" u2="&#x11e;" k="20" />
-<hkern u1="&#x17b;" u2="&#x11c;" k="20" />
-<hkern u1="&#x17b;" u2="&#x10c;" k="20" />
-<hkern u1="&#x17b;" u2="&#x10a;" k="20" />
-<hkern u1="&#x17b;" u2="&#x108;" k="20" />
-<hkern u1="&#x17b;" u2="&#x106;" k="20" />
-<hkern u1="&#x17b;" u2="&#xd8;" k="20" />
-<hkern u1="&#x17b;" u2="&#xd6;" k="20" />
-<hkern u1="&#x17b;" u2="&#xd5;" k="20" />
-<hkern u1="&#x17b;" u2="&#xd4;" k="20" />
-<hkern u1="&#x17b;" u2="&#xd3;" k="20" />
-<hkern u1="&#x17b;" u2="&#xd2;" k="20" />
-<hkern u1="&#x17b;" u2="&#xc7;" k="20" />
-<hkern u1="&#x17b;" u2="Q" k="20" />
-<hkern u1="&#x17b;" u2="O" k="20" />
-<hkern u1="&#x17b;" u2="G" k="20" />
-<hkern u1="&#x17b;" u2="C" k="20" />
-<hkern u1="&#x17d;" u2="&#x1ee2;" k="20" />
-<hkern u1="&#x17d;" u2="&#x1ee0;" k="20" />
-<hkern u1="&#x17d;" u2="&#x1ede;" k="20" />
-<hkern u1="&#x17d;" u2="&#x1edc;" k="20" />
-<hkern u1="&#x17d;" u2="&#x1eda;" k="20" />
-<hkern u1="&#x17d;" u2="&#x1ed8;" k="20" />
-<hkern u1="&#x17d;" u2="&#x1ed6;" k="20" />
-<hkern u1="&#x17d;" u2="&#x1ed4;" k="20" />
-<hkern u1="&#x17d;" u2="&#x1ed2;" k="20" />
-<hkern u1="&#x17d;" u2="&#x1ed0;" k="20" />
-<hkern u1="&#x17d;" u2="&#x1ece;" k="20" />
-<hkern u1="&#x17d;" u2="&#x1ecc;" k="20" />
-<hkern u1="&#x17d;" u2="&#x1fe;" k="20" />
-<hkern u1="&#x17d;" u2="&#x1a0;" k="20" />
-<hkern u1="&#x17d;" u2="&#x152;" k="20" />
-<hkern u1="&#x17d;" u2="&#x150;" k="20" />
-<hkern u1="&#x17d;" u2="&#x14e;" k="20" />
-<hkern u1="&#x17d;" u2="&#x14c;" k="20" />
-<hkern u1="&#x17d;" u2="&#x122;" k="20" />
-<hkern u1="&#x17d;" u2="&#x120;" k="20" />
-<hkern u1="&#x17d;" u2="&#x11e;" k="20" />
-<hkern u1="&#x17d;" u2="&#x11c;" k="20" />
-<hkern u1="&#x17d;" u2="&#x10c;" k="20" />
-<hkern u1="&#x17d;" u2="&#x10a;" k="20" />
-<hkern u1="&#x17d;" u2="&#x108;" k="20" />
-<hkern u1="&#x17d;" u2="&#x106;" k="20" />
-<hkern u1="&#x17d;" u2="&#xd8;" k="20" />
-<hkern u1="&#x17d;" u2="&#xd6;" k="20" />
-<hkern u1="&#x17d;" u2="&#xd5;" k="20" />
-<hkern u1="&#x17d;" u2="&#xd4;" k="20" />
-<hkern u1="&#x17d;" u2="&#xd3;" k="20" />
-<hkern u1="&#x17d;" u2="&#xd2;" k="20" />
-<hkern u1="&#x17d;" u2="&#xc7;" k="20" />
-<hkern u1="&#x17d;" u2="Q" k="20" />
-<hkern u1="&#x17d;" u2="O" k="20" />
-<hkern u1="&#x17d;" u2="G" k="20" />
-<hkern u1="&#x17d;" u2="C" k="20" />
-<hkern u1="&#x1a1;" g2="uniFB04" k="-82" />
-<hkern u1="&#x1a1;" g2="uniFB03" k="-82" />
-<hkern u1="&#x1a1;" g2="uniFB02" k="-82" />
-<hkern u1="&#x1a1;" g2="uniFB01" k="-82" />
-<hkern u1="&#x1a1;" g2="ff" k="-82" />
-<hkern u1="&#x1a1;" u2="&#x1ef5;" k="-102" />
-<hkern u1="&#x1a1;" u2="&#x1e83;" k="-102" />
-<hkern u1="&#x1a1;" u2="&#x1e81;" k="-102" />
-<hkern u1="&#x1a1;" u2="&#x21b;" k="-82" />
-<hkern u1="&#x1a1;" u2="&#x175;" k="-102" />
-<hkern u1="&#x1a1;" u2="&#x165;" k="-82" />
-<hkern u1="&#x1a1;" u2="&#x163;" k="-82" />
-<hkern u1="&#x1a1;" u2="&#xfd;" k="-102" />
-<hkern u1="&#x1a1;" u2="y" k="-102" />
-<hkern u1="&#x1a1;" u2="x" k="-102" />
-<hkern u1="&#x1a1;" u2="w" k="-102" />
-<hkern u1="&#x1a1;" u2="v" k="-102" />
-<hkern u1="&#x1a1;" u2="t" k="-82" />
-<hkern u1="&#x1a1;" u2="f" k="-82" />
-<hkern u1="&#x1b0;" g2="uniFB04" k="-102" />
-<hkern u1="&#x1b0;" g2="uniFB03" k="-102" />
-<hkern u1="&#x1b0;" g2="uniFB02" k="-102" />
-<hkern u1="&#x1b0;" g2="uniFB01" k="-102" />
-<hkern u1="&#x1b0;" g2="ff" k="-102" />
-<hkern u1="&#x1b0;" u2="&#x1ef5;" k="-102" />
-<hkern u1="&#x1b0;" u2="&#x1e83;" k="-102" />
-<hkern u1="&#x1b0;" u2="&#x1e81;" k="-102" />
-<hkern u1="&#x1b0;" u2="&#x21b;" k="-102" />
-<hkern u1="&#x1b0;" u2="&#x175;" k="-102" />
-<hkern u1="&#x1b0;" u2="&#x165;" k="-102" />
-<hkern u1="&#x1b0;" u2="&#x163;" k="-102" />
-<hkern u1="&#x1b0;" u2="&#xfd;" k="-102" />
-<hkern u1="&#x1b0;" u2="y" k="-102" />
-<hkern u1="&#x1b0;" u2="x" k="-102" />
-<hkern u1="&#x1b0;" u2="w" k="-102" />
-<hkern u1="&#x1b0;" u2="v" k="-102" />
-<hkern u1="&#x1b0;" u2="t" k="-102" />
-<hkern u1="&#x1b0;" u2="f" k="-102" />
-<hkern u1="&#x1fa;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1fa;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1fa;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1fa;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1fa;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1fa;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1fa;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1fa;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1fa;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1fa;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1fa;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x178;" k="123" />
-<hkern u1="&#x1fa;" u2="&#x176;" k="123" />
-<hkern u1="&#x1fa;" u2="&#x174;" k="82" />
-<hkern u1="&#x1fa;" u2="&#x164;" k="143" />
-<hkern u1="&#x1fa;" u2="&#x162;" k="143" />
-<hkern u1="&#x1fa;" u2="&#x152;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x150;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x122;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x120;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x108;" k="41" />
-<hkern u1="&#x1fa;" u2="&#x106;" k="41" />
-<hkern u1="&#x1fa;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1fa;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1fa;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1fa;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1fa;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1fa;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1fa;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1fa;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1fa;" u2="Y" k="123" />
-<hkern u1="&#x1fa;" u2="W" k="82" />
-<hkern u1="&#x1fa;" u2="V" k="82" />
-<hkern u1="&#x1fa;" u2="T" k="143" />
-<hkern u1="&#x1fa;" u2="Q" k="41" />
-<hkern u1="&#x1fa;" u2="O" k="41" />
-<hkern u1="&#x1fa;" u2="J" k="-266" />
-<hkern u1="&#x1fa;" u2="G" k="41" />
-<hkern u1="&#x1fa;" u2="C" k="41" />
-<hkern u1="&#x1fa;" u2="&#x27;" k="143" />
-<hkern u1="&#x1fa;" u2="&#x22;" k="143" />
-<hkern u1="&#x1fb;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1fb;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1fb;" u2="&#x27;" k="20" />
-<hkern u1="&#x1fb;" u2="&#x22;" k="20" />
-<hkern u1="&#x1fc;" u2="J" k="-123" />
-<hkern u1="&#x1fe;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1fe;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1fe;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x1eae;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x1eac;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x1e84;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x1e82;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x1e80;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x1e00;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x405;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x21a;" k="61" />
-<hkern u1="&#x1fe;" u2="&#x1fa;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x17d;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x17b;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x179;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x178;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x176;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x174;" k="20" />
-<hkern u1="&#x1fe;" u2="&#x164;" k="61" />
-<hkern u1="&#x1fe;" u2="&#x162;" k="61" />
-<hkern u1="&#x1fe;" u2="&#x104;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x102;" k="41" />
-<hkern u1="&#x1fe;" u2="&#x100;" k="41" />
-<hkern u1="&#x1fe;" u2="&#xdd;" k="20" />
-<hkern u1="&#x1fe;" u2="&#xc5;" k="41" />
-<hkern u1="&#x1fe;" u2="&#xc4;" k="41" />
-<hkern u1="&#x1fe;" u2="&#xc3;" k="41" />
-<hkern u1="&#x1fe;" u2="&#xc2;" k="41" />
-<hkern u1="&#x1fe;" u2="&#xc1;" k="41" />
-<hkern u1="&#x1fe;" u2="&#xc0;" k="41" />
-<hkern u1="&#x1fe;" u2="Z" k="20" />
-<hkern u1="&#x1fe;" u2="Y" k="20" />
-<hkern u1="&#x1fe;" u2="X" k="41" />
-<hkern u1="&#x1fe;" u2="W" k="20" />
-<hkern u1="&#x1fe;" u2="V" k="20" />
-<hkern u1="&#x1fe;" u2="T" k="61" />
-<hkern u1="&#x1fe;" u2="A" k="41" />
-<hkern u1="&#x1fe;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1fe;" u2="&#x2c;" k="82" />
-<hkern u1="&#x21a;" u2="&#x201e;" k="123" />
-<hkern u1="&#x21a;" u2="&#x201a;" k="123" />
-<hkern u1="&#x21a;" u2="&#x2015;" k="82" />
-<hkern u1="&#x21a;" u2="&#x2014;" k="82" />
-<hkern u1="&#x21a;" u2="&#x2013;" k="82" />
-<hkern u1="&#x21a;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1ef1;" k="102" />
-<hkern u1="&#x21a;" u2="&#x1eef;" k="102" />
-<hkern u1="&#x21a;" u2="&#x1eed;" k="102" />
-<hkern u1="&#x21a;" u2="&#x1eeb;" k="102" />
-<hkern u1="&#x21a;" u2="&#x1ee9;" k="102" />
-<hkern u1="&#x21a;" u2="&#x1ee7;" k="102" />
-<hkern u1="&#x21a;" u2="&#x1ee5;" k="102" />
-<hkern u1="&#x21a;" u2="&#x1ee3;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1ee1;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1edf;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1edd;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1edb;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1ed9;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1ed7;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1ed5;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1ed1;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1ecf;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1ecd;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1ec7;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ec5;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ec3;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ebf;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ebd;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ebb;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1eb9;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1eb7;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1eb6;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1eb5;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1eb4;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1eb3;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1eb2;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1eb1;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1eb0;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1eaf;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1eae;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ead;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1eac;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1eab;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1eaa;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ea9;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1ea8;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ea6;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ea5;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1ea4;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ea3;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1ea2;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1ea1;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1ea0;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1e3f;" k="102" />
-<hkern u1="&#x21a;" u2="&#x1e01;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1e00;" k="143" />
-<hkern u1="&#x21a;" u2="&#x21a;" k="-41" />
-<hkern u1="&#x21a;" u2="&#x219;" k="123" />
-<hkern u1="&#x21a;" u2="&#x1ff;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x21a;" u2="&#x1fd;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1fb;" k="164" />
-<hkern u1="&#x21a;" u2="&#x1fa;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1b0;" k="102" />
-<hkern u1="&#x21a;" u2="&#x1a1;" k="143" />
-<hkern u1="&#x21a;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x21a;" u2="&#x17e;" k="82" />
-<hkern u1="&#x21a;" u2="&#x17c;" k="82" />
-<hkern u1="&#x21a;" u2="&#x17a;" k="82" />
-<hkern u1="&#x21a;" u2="&#x175;" k="41" />
-<hkern u1="&#x21a;" u2="&#x173;" k="102" />
-<hkern u1="&#x21a;" u2="&#x171;" k="102" />
-<hkern u1="&#x21a;" u2="&#x16f;" k="102" />
-<hkern u1="&#x21a;" u2="&#x16d;" k="102" />
-<hkern u1="&#x21a;" u2="&#x16b;" k="102" />
-<hkern u1="&#x21a;" u2="&#x169;" k="102" />
-<hkern u1="&#x21a;" u2="&#x164;" k="-41" />
-<hkern u1="&#x21a;" u2="&#x162;" k="-41" />
-<hkern u1="&#x21a;" u2="&#x15f;" k="123" />
-<hkern u1="&#x21a;" u2="&#x15b;" k="123" />
-<hkern u1="&#x21a;" u2="&#x157;" k="102" />
-<hkern u1="&#x21a;" u2="&#x155;" k="102" />
-<hkern u1="&#x21a;" u2="&#x153;" k="143" />
-<hkern u1="&#x21a;" u2="&#x152;" k="41" />
-<hkern u1="&#x21a;" u2="&#x151;" k="143" />
-<hkern u1="&#x21a;" u2="&#x150;" k="41" />
-<hkern u1="&#x21a;" u2="&#x14f;" k="143" />
-<hkern u1="&#x21a;" u2="&#x14e;" k="41" />
-<hkern u1="&#x21a;" u2="&#x14d;" k="143" />
-<hkern u1="&#x21a;" u2="&#x14c;" k="41" />
-<hkern u1="&#x21a;" u2="&#x14b;" k="102" />
-<hkern u1="&#x21a;" u2="&#x146;" k="102" />
-<hkern u1="&#x21a;" u2="&#x144;" k="102" />
-<hkern u1="&#x21a;" u2="&#x138;" k="102" />
-<hkern u1="&#x21a;" u2="&#x123;" k="143" />
-<hkern u1="&#x21a;" u2="&#x122;" k="41" />
-<hkern u1="&#x21a;" u2="&#x121;" k="143" />
-<hkern u1="&#x21a;" u2="&#x120;" k="41" />
-<hkern u1="&#x21a;" u2="&#x11f;" k="143" />
-<hkern u1="&#x21a;" u2="&#x11e;" k="41" />
-<hkern u1="&#x21a;" u2="&#x11d;" k="143" />
-<hkern u1="&#x21a;" u2="&#x11c;" k="41" />
-<hkern u1="&#x21a;" u2="&#x11b;" k="143" />
-<hkern u1="&#x21a;" u2="&#x119;" k="143" />
-<hkern u1="&#x21a;" u2="&#x117;" k="143" />
-<hkern u1="&#x21a;" u2="&#x115;" k="143" />
-<hkern u1="&#x21a;" u2="&#x113;" k="143" />
-<hkern u1="&#x21a;" u2="&#x111;" k="143" />
-<hkern u1="&#x21a;" u2="&#x10f;" k="143" />
-<hkern u1="&#x21a;" u2="&#x10d;" k="143" />
-<hkern u1="&#x21a;" u2="&#x10c;" k="41" />
-<hkern u1="&#x21a;" u2="&#x10b;" k="143" />
-<hkern u1="&#x21a;" u2="&#x10a;" k="41" />
-<hkern u1="&#x21a;" u2="&#x109;" k="143" />
-<hkern u1="&#x21a;" u2="&#x108;" k="41" />
-<hkern u1="&#x21a;" u2="&#x107;" k="143" />
-<hkern u1="&#x21a;" u2="&#x106;" k="41" />
-<hkern u1="&#x21a;" u2="&#x105;" k="164" />
-<hkern u1="&#x21a;" u2="&#x104;" k="143" />
-<hkern u1="&#x21a;" u2="&#x103;" k="164" />
-<hkern u1="&#x21a;" u2="&#x102;" k="143" />
-<hkern u1="&#x21a;" u2="&#x101;" k="164" />
-<hkern u1="&#x21a;" u2="&#x100;" k="143" />
-<hkern u1="&#x21a;" u2="&#xfd;" k="41" />
-<hkern u1="&#x21a;" u2="&#xfc;" k="102" />
-<hkern u1="&#x21a;" u2="&#xfb;" k="102" />
-<hkern u1="&#x21a;" u2="&#xfa;" k="102" />
-<hkern u1="&#x21a;" u2="&#xf9;" k="102" />
-<hkern u1="&#x21a;" u2="&#xf8;" k="143" />
-<hkern u1="&#x21a;" u2="&#xf6;" k="143" />
-<hkern u1="&#x21a;" u2="&#xf5;" k="143" />
-<hkern u1="&#x21a;" u2="&#xf4;" k="143" />
-<hkern u1="&#x21a;" u2="&#xf3;" k="143" />
-<hkern u1="&#x21a;" u2="&#xf2;" k="143" />
-<hkern u1="&#x21a;" u2="&#xeb;" k="143" />
-<hkern u1="&#x21a;" u2="&#xea;" k="143" />
-<hkern u1="&#x21a;" u2="&#xe9;" k="143" />
-<hkern u1="&#x21a;" u2="&#xe8;" k="143" />
-<hkern u1="&#x21a;" u2="&#xe7;" k="143" />
-<hkern u1="&#x21a;" u2="&#xe6;" k="164" />
-<hkern u1="&#x21a;" u2="&#xe5;" k="164" />
-<hkern u1="&#x21a;" u2="&#xe4;" k="164" />
-<hkern u1="&#x21a;" u2="&#xe3;" k="164" />
-<hkern u1="&#x21a;" u2="&#xe2;" k="164" />
-<hkern u1="&#x21a;" u2="&#xe1;" k="164" />
-<hkern u1="&#x21a;" u2="&#xe0;" k="143" />
-<hkern u1="&#x21a;" u2="&#xd8;" k="41" />
-<hkern u1="&#x21a;" u2="&#xd6;" k="41" />
-<hkern u1="&#x21a;" u2="&#xd5;" k="41" />
-<hkern u1="&#x21a;" u2="&#xd4;" k="41" />
-<hkern u1="&#x21a;" u2="&#xd3;" k="41" />
-<hkern u1="&#x21a;" u2="&#xd2;" k="41" />
-<hkern u1="&#x21a;" u2="&#xc7;" k="41" />
-<hkern u1="&#x21a;" u2="&#xc5;" k="143" />
-<hkern u1="&#x21a;" u2="&#xc4;" k="143" />
-<hkern u1="&#x21a;" u2="&#xc3;" k="143" />
-<hkern u1="&#x21a;" u2="&#xc2;" k="143" />
-<hkern u1="&#x21a;" u2="&#xc1;" k="143" />
-<hkern u1="&#x21a;" u2="&#xc0;" k="143" />
-<hkern u1="&#x21a;" u2="z" k="82" />
-<hkern u1="&#x21a;" u2="y" k="41" />
-<hkern u1="&#x21a;" u2="x" k="41" />
-<hkern u1="&#x21a;" u2="w" k="41" />
-<hkern u1="&#x21a;" u2="v" k="41" />
-<hkern u1="&#x21a;" u2="u" k="102" />
-<hkern u1="&#x21a;" u2="s" k="123" />
-<hkern u1="&#x21a;" u2="r" k="102" />
-<hkern u1="&#x21a;" u2="q" k="143" />
-<hkern u1="&#x21a;" u2="p" k="102" />
-<hkern u1="&#x21a;" u2="o" k="143" />
-<hkern u1="&#x21a;" u2="n" k="102" />
-<hkern u1="&#x21a;" u2="m" k="102" />
-<hkern u1="&#x21a;" u2="g" k="143" />
-<hkern u1="&#x21a;" u2="e" k="143" />
-<hkern u1="&#x21a;" u2="d" k="143" />
-<hkern u1="&#x21a;" u2="c" k="143" />
-<hkern u1="&#x21a;" u2="a" k="164" />
-<hkern u1="&#x21a;" u2="T" k="-41" />
-<hkern u1="&#x21a;" u2="Q" k="41" />
-<hkern u1="&#x21a;" u2="O" k="41" />
-<hkern u1="&#x21a;" u2="G" k="41" />
-<hkern u1="&#x21a;" u2="C" k="41" />
-<hkern u1="&#x21a;" u2="A" k="143" />
-<hkern u1="&#x21a;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x21a;" u2="&#x2e;" k="123" />
-<hkern u1="&#x21a;" u2="&#x2d;" k="82" />
-<hkern u1="&#x21a;" u2="&#x2c;" k="123" />
-<hkern u1="&#x21b;" u2="&#x201d;" k="-41" />
-<hkern u1="&#x21b;" u2="&#x2019;" k="-41" />
-<hkern u1="&#x21b;" u2="&#x27;" k="-41" />
-<hkern u1="&#x21b;" u2="&#x22;" k="-41" />
-<hkern u1="&#x386;" u2="&#x201d;" k="143" />
-<hkern u1="&#x386;" u2="&#x2019;" k="143" />
-<hkern u1="&#x386;" u2="&#x3d2;" k="123" />
-<hkern u1="&#x386;" u2="&#x3ab;" k="123" />
-<hkern u1="&#x386;" u2="&#x3a8;" k="82" />
-<hkern u1="&#x386;" u2="&#x3a6;" k="41" />
-<hkern u1="&#x386;" u2="&#x3a5;" k="123" />
-<hkern u1="&#x386;" u2="&#x3a4;" k="143" />
-<hkern u1="&#x386;" u2="&#x39f;" k="41" />
-<hkern u1="&#x386;" u2="&#x398;" k="41" />
-<hkern u1="&#x386;" u2="&#x27;" k="143" />
-<hkern u1="&#x386;" u2="&#x22;" k="143" />
-<hkern u1="&#x38c;" u2="&#x201e;" k="82" />
-<hkern u1="&#x38c;" u2="&#x201a;" k="82" />
-<hkern u1="&#x38c;" u2="&#x3d2;" k="20" />
-<hkern u1="&#x38c;" u2="&#x3bb;" k="20" />
-<hkern u1="&#x38c;" u2="&#x3ab;" k="20" />
-<hkern u1="&#x38c;" u2="&#x3a8;" k="20" />
-<hkern u1="&#x38c;" u2="&#x3a7;" k="41" />
-<hkern u1="&#x38c;" u2="&#x3a5;" k="20" />
-<hkern u1="&#x38c;" u2="&#x3a4;" k="61" />
-<hkern u1="&#x38c;" u2="&#x3a3;" k="20" />
-<hkern u1="&#x38c;" u2="&#x39b;" k="41" />
-<hkern u1="&#x38c;" u2="&#x396;" k="20" />
-<hkern u1="&#x38c;" u2="&#x394;" k="41" />
-<hkern u1="&#x38c;" u2="&#x391;" k="41" />
-<hkern u1="&#x38c;" u2="&#x386;" k="41" />
-<hkern u1="&#x38c;" u2="&#x2e;" k="82" />
-<hkern u1="&#x38c;" u2="&#x2c;" k="82" />
-<hkern u1="&#x38e;" u2="&#x2126;" k="20" />
-<hkern u1="&#x38e;" u2="&#x201e;" k="123" />
-<hkern u1="&#x38e;" u2="&#x201a;" k="123" />
-<hkern u1="&#x38e;" u2="&#x3ce;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3cd;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3cc;" k="102" />
-<hkern u1="&#x38e;" u2="&#x3cb;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3c9;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3c8;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3c6;" k="102" />
-<hkern u1="&#x38e;" u2="&#x3c5;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3c3;" k="102" />
-<hkern u1="&#x38e;" u2="&#x3c2;" k="102" />
-<hkern u1="&#x38e;" u2="&#x3c1;" k="102" />
-<hkern u1="&#x38e;" u2="&#x3bf;" k="102" />
-<hkern u1="&#x38e;" u2="&#x3bc;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3ba;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3b9;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3b7;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3b5;" k="82" />
-<hkern u1="&#x38e;" u2="&#x3b4;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3b1;" k="102" />
-<hkern u1="&#x38e;" u2="&#x3b0;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3af;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3ae;" k="61" />
-<hkern u1="&#x38e;" u2="&#x3ad;" k="82" />
-<hkern u1="&#x38e;" u2="&#x3ac;" k="102" />
-<hkern u1="&#x38e;" u2="&#x3a9;" k="20" />
-<hkern u1="&#x38e;" u2="&#x3a6;" k="61" />
-<hkern u1="&#x38e;" u2="&#x39f;" k="41" />
-<hkern u1="&#x38e;" u2="&#x39b;" k="123" />
-<hkern u1="&#x38e;" u2="&#x398;" k="41" />
-<hkern u1="&#x38e;" u2="&#x394;" k="123" />
-<hkern u1="&#x38e;" u2="&#x391;" k="123" />
-<hkern u1="&#x38e;" u2="&#x386;" k="123" />
-<hkern u1="&#x38e;" u2="&#x2e;" k="123" />
-<hkern u1="&#x38e;" u2="&#x2c;" k="123" />
-<hkern u1="&#x38f;" u2="&#x3d2;" k="20" />
-<hkern u1="&#x38f;" u2="&#x3ab;" k="20" />
-<hkern u1="&#x38f;" u2="&#x3a5;" k="20" />
-<hkern u1="&#x38f;" u2="&#x3a4;" k="41" />
-<hkern u1="&#x390;" u2="&#x201d;" k="41" />
-<hkern u1="&#x390;" u2="&#x2019;" k="41" />
-<hkern u1="&#x390;" u2="&#x27;" k="41" />
-<hkern u1="&#x390;" u2="&#x22;" k="41" />
-<hkern u1="&#x391;" u2="&#x201d;" k="143" />
-<hkern u1="&#x391;" u2="&#x2019;" k="143" />
-<hkern u1="&#x391;" u2="&#x3d2;" k="123" />
-<hkern u1="&#x391;" u2="&#x3ab;" k="123" />
-<hkern u1="&#x391;" u2="&#x3a8;" k="82" />
-<hkern u1="&#x391;" u2="&#x3a6;" k="41" />
-<hkern u1="&#x391;" u2="&#x3a5;" k="123" />
-<hkern u1="&#x391;" u2="&#x3a4;" k="143" />
-<hkern u1="&#x391;" u2="&#x39f;" k="41" />
-<hkern u1="&#x391;" u2="&#x398;" k="41" />
-<hkern u1="&#x391;" u2="&#x27;" k="143" />
-<hkern u1="&#x391;" u2="&#x22;" k="143" />
-<hkern u1="&#x392;" u2="&#x201e;" k="82" />
-<hkern u1="&#x392;" u2="&#x201a;" k="82" />
-<hkern u1="&#x392;" u2="&#x3a7;" k="41" />
-<hkern u1="&#x392;" u2="&#x39b;" k="41" />
-<hkern u1="&#x392;" u2="&#x394;" k="41" />
-<hkern u1="&#x392;" u2="&#x391;" k="41" />
-<hkern u1="&#x392;" u2="&#x386;" k="41" />
-<hkern u1="&#x392;" u2="&#x2e;" k="82" />
-<hkern u1="&#x392;" u2="&#x2c;" k="82" />
-<hkern u1="&#x393;" u2="&#x2126;" k="61" />
-<hkern u1="&#x393;" u2="&#x201e;" k="123" />
-<hkern u1="&#x393;" u2="&#x201a;" k="123" />
-<hkern u1="&#x393;" u2="&#x2015;" k="82" />
-<hkern u1="&#x393;" u2="&#x2014;" k="82" />
-<hkern u1="&#x393;" u2="&#x2013;" k="82" />
-<hkern u1="&#x393;" u2="&#x3d1;" k="41" />
-<hkern u1="&#x393;" u2="&#x3ce;" k="102" />
-<hkern u1="&#x393;" u2="&#x3cd;" k="102" />
-<hkern u1="&#x393;" u2="&#x3cc;" k="143" />
-<hkern u1="&#x393;" u2="&#x3cb;" k="102" />
-<hkern u1="&#x393;" u2="&#x3c9;" k="102" />
-<hkern u1="&#x393;" u2="&#x3c8;" k="102" />
-<hkern u1="&#x393;" u2="&#x3c7;" k="41" />
-<hkern u1="&#x393;" u2="&#x3c6;" k="143" />
-<hkern u1="&#x393;" u2="&#x3c5;" k="102" />
-<hkern u1="&#x393;" u2="&#x3c3;" k="143" />
-<hkern u1="&#x393;" u2="&#x3c2;" k="143" />
-<hkern u1="&#x393;" u2="&#x3c1;" k="102" />
-<hkern u1="&#x393;" u2="&#x3bf;" k="143" />
-<hkern u1="&#x393;" u2="&#x3bd;" k="41" />
-<hkern u1="&#x393;" u2="&#x3bc;" k="102" />
-<hkern u1="&#x393;" u2="&#x3ba;" k="102" />
-<hkern u1="&#x393;" u2="&#x3b9;" k="82" />
-<hkern u1="&#x393;" u2="&#x3b7;" k="102" />
-<hkern u1="&#x393;" u2="&#x3b5;" k="102" />
-<hkern u1="&#x393;" u2="&#x3b4;" k="61" />
-<hkern u1="&#x393;" u2="&#x3b3;" k="41" />
-<hkern u1="&#x393;" u2="&#x3b1;" k="143" />
-<hkern u1="&#x393;" u2="&#x3b0;" k="102" />
-<hkern u1="&#x393;" u2="&#x3af;" k="82" />
-<hkern u1="&#x393;" u2="&#x3ae;" k="102" />
-<hkern u1="&#x393;" u2="&#x3ad;" k="102" />
-<hkern u1="&#x393;" u2="&#x3ac;" k="143" />
-<hkern u1="&#x393;" u2="&#x3a9;" k="61" />
-<hkern u1="&#x393;" u2="&#x3a6;" k="102" />
-<hkern u1="&#x393;" u2="&#x39f;" k="61" />
-<hkern u1="&#x393;" u2="&#x39b;" k="164" />
-<hkern u1="&#x393;" u2="&#x398;" k="61" />
-<hkern u1="&#x393;" u2="&#x394;" k="164" />
-<hkern u1="&#x393;" u2="&#x391;" k="164" />
-<hkern u1="&#x393;" u2="&#x386;" k="164" />
-<hkern u1="&#x393;" u2="&#x2e;" k="123" />
-<hkern u1="&#x393;" u2="&#x2d;" k="82" />
-<hkern u1="&#x393;" u2="&#x2c;" k="123" />
-<hkern u1="&#x394;" u2="&#x201d;" k="143" />
-<hkern u1="&#x394;" u2="&#x2019;" k="143" />
-<hkern u1="&#x394;" u2="&#x3d2;" k="123" />
-<hkern u1="&#x394;" u2="&#x3ab;" k="123" />
-<hkern u1="&#x394;" u2="&#x3a8;" k="82" />
-<hkern u1="&#x394;" u2="&#x3a6;" k="41" />
-<hkern u1="&#x394;" u2="&#x3a5;" k="123" />
-<hkern u1="&#x394;" u2="&#x3a4;" k="143" />
-<hkern u1="&#x394;" u2="&#x39f;" k="41" />
-<hkern u1="&#x394;" u2="&#x398;" k="41" />
-<hkern u1="&#x394;" u2="&#x27;" k="143" />
-<hkern u1="&#x394;" u2="&#x22;" k="143" />
-<hkern u1="&#x396;" u2="&#x3a6;" k="61" />
-<hkern u1="&#x396;" u2="&#x39f;" k="20" />
-<hkern u1="&#x396;" u2="&#x398;" k="20" />
-<hkern u1="&#x398;" u2="&#x201e;" k="82" />
-<hkern u1="&#x398;" u2="&#x201a;" k="82" />
-<hkern u1="&#x398;" u2="&#x3d2;" k="20" />
-<hkern u1="&#x398;" u2="&#x3bb;" k="20" />
-<hkern u1="&#x398;" u2="&#x3ab;" k="20" />
-<hkern u1="&#x398;" u2="&#x3a8;" k="20" />
-<hkern u1="&#x398;" u2="&#x3a7;" k="41" />
-<hkern u1="&#x398;" u2="&#x3a5;" k="20" />
-<hkern u1="&#x398;" u2="&#x3a4;" k="61" />
-<hkern u1="&#x398;" u2="&#x3a3;" k="20" />
-<hkern u1="&#x398;" u2="&#x39b;" k="41" />
-<hkern u1="&#x398;" u2="&#x396;" k="20" />
-<hkern u1="&#x398;" u2="&#x394;" k="41" />
-<hkern u1="&#x398;" u2="&#x391;" k="41" />
-<hkern u1="&#x398;" u2="&#x386;" k="41" />
-<hkern u1="&#x398;" u2="&#x2e;" k="82" />
-<hkern u1="&#x398;" u2="&#x2c;" k="82" />
-<hkern u1="&#x39a;" u2="&#x3c4;" k="20" />
-<hkern u1="&#x39a;" u2="&#x3c0;" k="20" />
-<hkern u1="&#x39a;" u2="&#x3a6;" k="61" />
-<hkern u1="&#x39a;" u2="&#x39f;" k="41" />
-<hkern u1="&#x39a;" u2="&#x398;" k="41" />
-<hkern u1="&#x39b;" u2="&#x201d;" k="143" />
-<hkern u1="&#x39b;" u2="&#x2019;" k="143" />
-<hkern u1="&#x39b;" u2="&#x3d2;" k="123" />
-<hkern u1="&#x39b;" u2="&#x3ab;" k="123" />
-<hkern u1="&#x39b;" u2="&#x3a8;" k="82" />
-<hkern u1="&#x39b;" u2="&#x3a6;" k="41" />
-<hkern u1="&#x39b;" u2="&#x3a5;" k="123" />
-<hkern u1="&#x39b;" u2="&#x3a4;" k="143" />
-<hkern u1="&#x39b;" u2="&#x39f;" k="41" />
-<hkern u1="&#x39b;" u2="&#x398;" k="41" />
-<hkern u1="&#x39b;" u2="&#x27;" k="143" />
-<hkern u1="&#x39b;" u2="&#x22;" k="143" />
-<hkern u1="&#x39f;" u2="&#x201e;" k="82" />
-<hkern u1="&#x39f;" u2="&#x201a;" k="82" />
-<hkern u1="&#x39f;" u2="&#x3d2;" k="20" />
-<hkern u1="&#x39f;" u2="&#x3bb;" k="20" />
-<hkern u1="&#x39f;" u2="&#x3ab;" k="20" />
-<hkern u1="&#x39f;" u2="&#x3a8;" k="20" />
-<hkern u1="&#x39f;" u2="&#x3a7;" k="41" />
-<hkern u1="&#x39f;" u2="&#x3a5;" k="20" />
-<hkern u1="&#x39f;" u2="&#x3a4;" k="61" />
-<hkern u1="&#x39f;" u2="&#x3a3;" k="20" />
-<hkern u1="&#x39f;" u2="&#x39b;" k="41" />
-<hkern u1="&#x39f;" u2="&#x396;" k="20" />
-<hkern u1="&#x39f;" u2="&#x394;" k="41" />
-<hkern u1="&#x39f;" u2="&#x391;" k="41" />
-<hkern u1="&#x39f;" u2="&#x386;" k="41" />
-<hkern u1="&#x39f;" u2="&#x2e;" k="82" />
-<hkern u1="&#x39f;" u2="&#x2c;" k="82" />
-<hkern u1="&#x3a1;" u2="&#x201e;" k="266" />
-<hkern u1="&#x3a1;" u2="&#x201a;" k="266" />
-<hkern u1="&#x3a1;" u2="&#x3bb;" k="41" />
-<hkern u1="&#x3a1;" u2="&#x3a7;" k="41" />
-<hkern u1="&#x3a1;" u2="&#x39b;" k="102" />
-<hkern u1="&#x3a1;" u2="&#x396;" k="20" />
-<hkern u1="&#x3a1;" u2="&#x394;" k="102" />
-<hkern u1="&#x3a1;" u2="&#x391;" k="102" />
-<hkern u1="&#x3a1;" u2="&#x386;" k="102" />
-<hkern u1="&#x3a1;" u2="&#x2e;" k="266" />
-<hkern u1="&#x3a1;" u2="&#x2c;" k="266" />
-<hkern u1="&#x3a4;" u2="&#x2126;" k="61" />
-<hkern u1="&#x3a4;" u2="&#x201e;" k="123" />
-<hkern u1="&#x3a4;" u2="&#x201a;" k="123" />
-<hkern u1="&#x3a4;" u2="&#x2015;" k="82" />
-<hkern u1="&#x3a4;" u2="&#x2014;" k="82" />
-<hkern u1="&#x3a4;" u2="&#x2013;" k="82" />
-<hkern u1="&#x3a4;" u2="&#x3d1;" k="41" />
-<hkern u1="&#x3a4;" u2="&#x3ce;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3cd;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3cc;" k="143" />
-<hkern u1="&#x3a4;" u2="&#x3cb;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3c9;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3c8;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3c7;" k="41" />
-<hkern u1="&#x3a4;" u2="&#x3c6;" k="143" />
-<hkern u1="&#x3a4;" u2="&#x3c5;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3c3;" k="143" />
-<hkern u1="&#x3a4;" u2="&#x3c2;" k="143" />
-<hkern u1="&#x3a4;" u2="&#x3c1;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3bf;" k="143" />
-<hkern u1="&#x3a4;" u2="&#x3bd;" k="41" />
-<hkern u1="&#x3a4;" u2="&#x3bc;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3ba;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3b9;" k="82" />
-<hkern u1="&#x3a4;" u2="&#x3b7;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3b5;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3b4;" k="61" />
-<hkern u1="&#x3a4;" u2="&#x3b3;" k="41" />
-<hkern u1="&#x3a4;" u2="&#x3b1;" k="143" />
-<hkern u1="&#x3a4;" u2="&#x3b0;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3af;" k="82" />
-<hkern u1="&#x3a4;" u2="&#x3ae;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3ad;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x3ac;" k="143" />
-<hkern u1="&#x3a4;" u2="&#x3a9;" k="61" />
-<hkern u1="&#x3a4;" u2="&#x3a6;" k="102" />
-<hkern u1="&#x3a4;" u2="&#x39f;" k="61" />
-<hkern u1="&#x3a4;" u2="&#x39b;" k="164" />
-<hkern u1="&#x3a4;" u2="&#x398;" k="61" />
-<hkern u1="&#x3a4;" u2="&#x394;" k="164" />
-<hkern u1="&#x3a4;" u2="&#x391;" k="164" />
-<hkern u1="&#x3a4;" u2="&#x386;" k="164" />
-<hkern u1="&#x3a4;" u2="&#x2e;" k="123" />
-<hkern u1="&#x3a4;" u2="&#x2d;" k="82" />
-<hkern u1="&#x3a4;" u2="&#x2c;" k="123" />
-<hkern u1="&#x3a5;" u2="&#x2126;" k="20" />
-<hkern u1="&#x3a5;" u2="&#x201e;" k="123" />
-<hkern u1="&#x3a5;" u2="&#x201a;" k="123" />
-<hkern u1="&#x3a5;" u2="&#x3ce;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3cd;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3cc;" k="102" />
-<hkern u1="&#x3a5;" u2="&#x3cb;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3c9;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3c8;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3c6;" k="102" />
-<hkern u1="&#x3a5;" u2="&#x3c5;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3c3;" k="102" />
-<hkern u1="&#x3a5;" u2="&#x3c2;" k="102" />
-<hkern u1="&#x3a5;" u2="&#x3c1;" k="102" />
-<hkern u1="&#x3a5;" u2="&#x3bf;" k="102" />
-<hkern u1="&#x3a5;" u2="&#x3bc;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3ba;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3b9;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3b7;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3b5;" k="82" />
-<hkern u1="&#x3a5;" u2="&#x3b4;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3b1;" k="102" />
-<hkern u1="&#x3a5;" u2="&#x3b0;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3af;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3ae;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x3ad;" k="82" />
-<hkern u1="&#x3a5;" u2="&#x3ac;" k="102" />
-<hkern u1="&#x3a5;" u2="&#x3a9;" k="20" />
-<hkern u1="&#x3a5;" u2="&#x3a6;" k="61" />
-<hkern u1="&#x3a5;" u2="&#x39f;" k="41" />
-<hkern u1="&#x3a5;" u2="&#x39b;" k="123" />
-<hkern u1="&#x3a5;" u2="&#x398;" k="41" />
-<hkern u1="&#x3a5;" u2="&#x394;" k="123" />
-<hkern u1="&#x3a5;" u2="&#x391;" k="123" />
-<hkern u1="&#x3a5;" u2="&#x386;" k="123" />
-<hkern u1="&#x3a5;" u2="&#x2e;" k="123" />
-<hkern u1="&#x3a5;" u2="&#x2c;" k="123" />
-<hkern u1="&#x3a6;" u2="&#x201e;" k="102" />
-<hkern u1="&#x3a6;" u2="&#x201a;" k="102" />
-<hkern u1="&#x3a6;" u2="&#x3d2;" k="61" />
-<hkern u1="&#x3a6;" u2="&#x3bb;" k="20" />
-<hkern u1="&#x3a6;" u2="&#x3ab;" k="61" />
-<hkern u1="&#x3a6;" u2="&#x3a7;" k="20" />
-<hkern u1="&#x3a6;" u2="&#x3a5;" k="61" />
-<hkern u1="&#x3a6;" u2="&#x3a4;" k="82" />
-<hkern u1="&#x3a6;" u2="&#x3a3;" k="20" />
-<hkern u1="&#x3a6;" u2="&#x39b;" k="41" />
-<hkern u1="&#x3a6;" u2="&#x396;" k="61" />
-<hkern u1="&#x3a6;" u2="&#x394;" k="41" />
-<hkern u1="&#x3a6;" u2="&#x391;" k="41" />
-<hkern u1="&#x3a6;" u2="&#x386;" k="41" />
-<hkern u1="&#x3a6;" u2="&#x2e;" k="102" />
-<hkern u1="&#x3a6;" u2="&#x2c;" k="102" />
-<hkern u1="&#x3a7;" u2="&#x3c4;" k="20" />
-<hkern u1="&#x3a7;" u2="&#x3c0;" k="20" />
-<hkern u1="&#x3a7;" u2="&#x3a6;" k="61" />
-<hkern u1="&#x3a7;" u2="&#x39f;" k="41" />
-<hkern u1="&#x3a7;" u2="&#x398;" k="41" />
-<hkern u1="&#x3a8;" u2="&#x201e;" k="123" />
-<hkern u1="&#x3a8;" u2="&#x201a;" k="123" />
-<hkern u1="&#x3a8;" u2="&#x39f;" k="20" />
-<hkern u1="&#x3a8;" u2="&#x39b;" k="82" />
-<hkern u1="&#x3a8;" u2="&#x398;" k="20" />
-<hkern u1="&#x3a8;" u2="&#x394;" k="82" />
-<hkern u1="&#x3a8;" u2="&#x391;" k="82" />
-<hkern u1="&#x3a8;" u2="&#x386;" k="82" />
-<hkern u1="&#x3a8;" u2="&#x2e;" k="123" />
-<hkern u1="&#x3a8;" u2="&#x2c;" k="123" />
-<hkern u1="&#x3a9;" u2="&#x3d2;" k="20" />
-<hkern u1="&#x3a9;" u2="&#x3ab;" k="20" />
-<hkern u1="&#x3a9;" u2="&#x3a5;" k="20" />
-<hkern u1="&#x3a9;" u2="&#x3a4;" k="41" />
-<hkern u1="&#x3ab;" u2="&#x2126;" k="20" />
-<hkern u1="&#x3ab;" u2="&#x201e;" k="123" />
-<hkern u1="&#x3ab;" u2="&#x201a;" k="123" />
-<hkern u1="&#x3ab;" u2="&#x3ce;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3cd;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3cc;" k="102" />
-<hkern u1="&#x3ab;" u2="&#x3cb;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3c9;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3c8;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3c6;" k="102" />
-<hkern u1="&#x3ab;" u2="&#x3c5;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3c3;" k="102" />
-<hkern u1="&#x3ab;" u2="&#x3c2;" k="102" />
-<hkern u1="&#x3ab;" u2="&#x3c1;" k="102" />
-<hkern u1="&#x3ab;" u2="&#x3bf;" k="102" />
-<hkern u1="&#x3ab;" u2="&#x3bc;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3ba;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3b9;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3b7;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3b5;" k="82" />
-<hkern u1="&#x3ab;" u2="&#x3b4;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3b1;" k="102" />
-<hkern u1="&#x3ab;" u2="&#x3b0;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3af;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3ae;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x3ad;" k="82" />
-<hkern u1="&#x3ab;" u2="&#x3ac;" k="102" />
-<hkern u1="&#x3ab;" u2="&#x3a9;" k="20" />
-<hkern u1="&#x3ab;" u2="&#x3a6;" k="61" />
-<hkern u1="&#x3ab;" u2="&#x39f;" k="41" />
-<hkern u1="&#x3ab;" u2="&#x39b;" k="123" />
-<hkern u1="&#x3ab;" u2="&#x398;" k="41" />
-<hkern u1="&#x3ab;" u2="&#x394;" k="123" />
-<hkern u1="&#x3ab;" u2="&#x391;" k="123" />
-<hkern u1="&#x3ab;" u2="&#x386;" k="123" />
-<hkern u1="&#x3ab;" u2="&#x2e;" k="123" />
-<hkern u1="&#x3ab;" u2="&#x2c;" k="123" />
-<hkern u1="&#x3ac;" u2="&#x3bb;" k="-41" />
-<hkern u1="&#x3ae;" u2="&#x201d;" k="20" />
-<hkern u1="&#x3ae;" u2="&#x2019;" k="20" />
-<hkern u1="&#x3ae;" u2="&#x27;" k="20" />
-<hkern u1="&#x3ae;" u2="&#x22;" k="20" />
-<hkern u1="&#x3af;" u2="&#x201d;" k="82" />
-<hkern u1="&#x3af;" u2="&#x2019;" k="82" />
-<hkern u1="&#x3af;" u2="&#x3c4;" k="20" />
-<hkern u1="&#x3af;" u2="&#x3c0;" k="20" />
-<hkern u1="&#x3af;" u2="&#x27;" k="82" />
-<hkern u1="&#x3af;" u2="&#x22;" k="82" />
-<hkern u1="&#x3b1;" u2="&#x3bb;" k="-41" />
-<hkern u1="&#x3b3;" u2="&#x201e;" k="82" />
-<hkern u1="&#x3b3;" u2="&#x201a;" k="82" />
-<hkern u1="&#x3b3;" u2="&#x3bb;" k="20" />
-<hkern u1="&#x3b3;" u2="&#x2e;" k="82" />
-<hkern u1="&#x3b3;" u2="&#x2c;" k="82" />
-<hkern u1="&#x3b6;" u2="&#x2015;" k="102" />
-<hkern u1="&#x3b6;" u2="&#x2014;" k="102" />
-<hkern u1="&#x3b6;" u2="&#x2013;" k="102" />
-<hkern u1="&#x3b6;" u2="&#x3cc;" k="41" />
-<hkern u1="&#x3b6;" u2="&#x3c6;" k="41" />
-<hkern u1="&#x3b6;" u2="&#x3c4;" k="41" />
-<hkern u1="&#x3b6;" u2="&#x3c3;" k="41" />
-<hkern u1="&#x3b6;" u2="&#x3c2;" k="41" />
-<hkern u1="&#x3b6;" u2="&#x3c0;" k="41" />
-<hkern u1="&#x3b6;" u2="&#x3bf;" k="41" />
-<hkern u1="&#x3b6;" u2="&#x3b4;" k="41" />
-<hkern u1="&#x3b6;" u2="&#x3b1;" k="41" />
-<hkern u1="&#x3b6;" u2="&#x3ac;" k="41" />
-<hkern u1="&#x3b6;" u2="&#x2d;" k="102" />
-<hkern u1="&#x3b7;" u2="&#x201d;" k="20" />
-<hkern u1="&#x3b7;" u2="&#x2019;" k="20" />
-<hkern u1="&#x3b7;" u2="&#x27;" k="20" />
-<hkern u1="&#x3b7;" u2="&#x22;" k="20" />
-<hkern u1="&#x3b8;" u2="&#x201e;" k="41" />
-<hkern u1="&#x3b8;" u2="&#x201a;" k="41" />
-<hkern u1="&#x3b8;" u2="&#x2e;" k="41" />
-<hkern u1="&#x3b8;" u2="&#x2c;" k="41" />
-<hkern u1="&#x3b9;" u2="&#x201d;" k="82" />
-<hkern u1="&#x3b9;" u2="&#x2019;" k="82" />
-<hkern u1="&#x3b9;" u2="&#x3c4;" k="20" />
-<hkern u1="&#x3b9;" u2="&#x3c0;" k="20" />
-<hkern u1="&#x3b9;" u2="&#x27;" k="82" />
-<hkern u1="&#x3b9;" u2="&#x22;" k="82" />
-<hkern u1="&#x3ba;" u2="&#x3cc;" k="41" />
-<hkern u1="&#x3ba;" u2="&#x3c6;" k="41" />
-<hkern u1="&#x3ba;" u2="&#x3c3;" k="41" />
-<hkern u1="&#x3ba;" u2="&#x3c2;" k="41" />
-<hkern u1="&#x3ba;" u2="&#x3bf;" k="41" />
-<hkern u1="&#x3ba;" u2="&#x3b1;" k="41" />
-<hkern u1="&#x3ba;" u2="&#x3ac;" k="41" />
-<hkern u1="&#x3bb;" u2="&#x201d;" k="123" />
-<hkern u1="&#x3bb;" u2="&#x2019;" k="123" />
-<hkern u1="&#x3bb;" u2="&#x3cc;" k="20" />
-<hkern u1="&#x3bb;" u2="&#x3c6;" k="20" />
-<hkern u1="&#x3bb;" u2="&#x3c4;" k="41" />
-<hkern u1="&#x3bb;" u2="&#x3c3;" k="20" />
-<hkern u1="&#x3bb;" u2="&#x3c2;" k="20" />
-<hkern u1="&#x3bb;" u2="&#x3c0;" k="41" />
-<hkern u1="&#x3bb;" u2="&#x3bf;" k="20" />
-<hkern u1="&#x3bb;" u2="&#x3bd;" k="41" />
-<hkern u1="&#x3bb;" u2="&#x3b3;" k="41" />
-<hkern u1="&#x3bb;" u2="&#x3b1;" k="20" />
-<hkern u1="&#x3bb;" u2="&#x3ac;" k="20" />
-<hkern u1="&#x3bb;" u2="&#x27;" k="123" />
-<hkern u1="&#x3bb;" u2="&#x22;" k="123" />
-<hkern u1="&#x3bd;" u2="&#x201e;" k="82" />
-<hkern u1="&#x3bd;" u2="&#x201a;" k="82" />
-<hkern u1="&#x3bd;" u2="&#x3bb;" k="20" />
-<hkern u1="&#x3bd;" u2="&#x2e;" k="82" />
-<hkern u1="&#x3bd;" u2="&#x2c;" k="82" />
-<hkern u1="&#x3bf;" u2="&#x201d;" k="20" />
-<hkern u1="&#x3bf;" u2="&#x2019;" k="20" />
-<hkern u1="&#x3bf;" u2="&#x3bd;" k="41" />
-<hkern u1="&#x3bf;" u2="&#x3b3;" k="41" />
-<hkern u1="&#x3bf;" u2="&#x27;" k="20" />
-<hkern u1="&#x3bf;" u2="&#x22;" k="20" />
-<hkern u1="&#x3c1;" u2="&#x201d;" k="20" />
-<hkern u1="&#x3c1;" u2="&#x2019;" k="20" />
-<hkern u1="&#x3c1;" u2="&#x3bd;" k="41" />
-<hkern u1="&#x3c1;" u2="&#x3b3;" k="41" />
-<hkern u1="&#x3c1;" u2="&#x27;" k="20" />
-<hkern u1="&#x3c1;" u2="&#x22;" k="20" />
-<hkern u1="&#x3c3;" u2="&#x201e;" k="20" />
-<hkern u1="&#x3c3;" u2="&#x201a;" k="20" />
-<hkern u1="&#x3c3;" u2="&#x2e;" k="20" />
-<hkern u1="&#x3c3;" u2="&#x2c;" k="20" />
-<hkern u1="&#x3c6;" u2="&#x201d;" k="20" />
-<hkern u1="&#x3c6;" u2="&#x2019;" k="20" />
-<hkern u1="&#x3c6;" u2="&#x3bd;" k="41" />
-<hkern u1="&#x3c6;" u2="&#x3b3;" k="41" />
-<hkern u1="&#x3c6;" u2="&#x27;" k="20" />
-<hkern u1="&#x3c6;" u2="&#x22;" k="20" />
-<hkern u1="&#x3c7;" u2="&#x201e;" k="61" />
-<hkern u1="&#x3c7;" u2="&#x201a;" k="61" />
-<hkern u1="&#x3c7;" u2="&#x2015;" k="41" />
-<hkern u1="&#x3c7;" u2="&#x2014;" k="41" />
-<hkern u1="&#x3c7;" u2="&#x2013;" k="41" />
-<hkern u1="&#x3c7;" u2="&#x3cc;" k="41" />
-<hkern u1="&#x3c7;" u2="&#x3c6;" k="41" />
-<hkern u1="&#x3c7;" u2="&#x3c3;" k="41" />
-<hkern u1="&#x3c7;" u2="&#x3c2;" k="41" />
-<hkern u1="&#x3c7;" u2="&#x3bf;" k="41" />
-<hkern u1="&#x3c7;" u2="&#x3b4;" k="41" />
-<hkern u1="&#x3c7;" u2="&#x3b1;" k="41" />
-<hkern u1="&#x3c7;" u2="&#x3ac;" k="41" />
-<hkern u1="&#x3c7;" u2="&#x2e;" k="61" />
-<hkern u1="&#x3c7;" u2="&#x2d;" k="41" />
-<hkern u1="&#x3c7;" u2="&#x2c;" k="61" />
-<hkern u1="&#x3ca;" u2="&#x201d;" k="41" />
-<hkern u1="&#x3ca;" u2="&#x2019;" k="41" />
-<hkern u1="&#x3ca;" u2="&#x27;" k="41" />
-<hkern u1="&#x3ca;" u2="&#x22;" k="41" />
-<hkern u1="&#x3cc;" u2="&#x201d;" k="20" />
-<hkern u1="&#x3cc;" u2="&#x2019;" k="20" />
-<hkern u1="&#x3cc;" u2="&#x3bd;" k="41" />
-<hkern u1="&#x3cc;" u2="&#x3b3;" k="41" />
-<hkern u1="&#x3cc;" u2="&#x27;" k="20" />
-<hkern u1="&#x3cc;" u2="&#x22;" k="20" />
-<hkern u1="&#x3d1;" u2="&#x201e;" k="61" />
-<hkern u1="&#x3d1;" u2="&#x201a;" k="61" />
-<hkern u1="&#x3d1;" u2="&#x2e;" k="61" />
-<hkern u1="&#x3d1;" u2="&#x2c;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x2126;" k="20" />
-<hkern u1="&#x3d2;" u2="&#x201e;" k="123" />
-<hkern u1="&#x3d2;" u2="&#x201a;" k="123" />
-<hkern u1="&#x3d2;" u2="&#x3ce;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3cd;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3cc;" k="102" />
-<hkern u1="&#x3d2;" u2="&#x3cb;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3c9;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3c8;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3c6;" k="102" />
-<hkern u1="&#x3d2;" u2="&#x3c5;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3c3;" k="102" />
-<hkern u1="&#x3d2;" u2="&#x3c2;" k="102" />
-<hkern u1="&#x3d2;" u2="&#x3c1;" k="102" />
-<hkern u1="&#x3d2;" u2="&#x3bf;" k="102" />
-<hkern u1="&#x3d2;" u2="&#x3bc;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3ba;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3b9;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3b7;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3b5;" k="82" />
-<hkern u1="&#x3d2;" u2="&#x3b4;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3b1;" k="102" />
-<hkern u1="&#x3d2;" u2="&#x3b0;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3af;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3ae;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x3ad;" k="82" />
-<hkern u1="&#x3d2;" u2="&#x3ac;" k="102" />
-<hkern u1="&#x3d2;" u2="&#x3a9;" k="20" />
-<hkern u1="&#x3d2;" u2="&#x3a6;" k="61" />
-<hkern u1="&#x3d2;" u2="&#x39f;" k="41" />
-<hkern u1="&#x3d2;" u2="&#x39b;" k="123" />
-<hkern u1="&#x3d2;" u2="&#x398;" k="41" />
-<hkern u1="&#x3d2;" u2="&#x394;" k="123" />
-<hkern u1="&#x3d2;" u2="&#x391;" k="123" />
-<hkern u1="&#x3d2;" u2="&#x386;" k="123" />
-<hkern u1="&#x3d2;" u2="&#x2e;" k="123" />
-<hkern u1="&#x3d2;" u2="&#x2c;" k="123" />
-<hkern u1="&#x402;" u2="&#x201d;" k="82" />
-<hkern u1="&#x402;" u2="&#x2019;" k="82" />
-<hkern u1="&#x402;" u2="&#x50f;" k="41" />
-<hkern u1="&#x402;" u2="&#x50e;" k="123" />
-<hkern u1="&#x402;" u2="&#x507;" k="61" />
-<hkern u1="&#x402;" u2="&#x506;" k="102" />
-<hkern u1="&#x402;" u2="&#x505;" k="61" />
-<hkern u1="&#x402;" u2="&#x504;" k="102" />
-<hkern u1="&#x402;" u2="&#x4fa;" k="82" />
-<hkern u1="&#x402;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x402;" u2="&#x4f4;" k="102" />
-<hkern u1="&#x402;" u2="&#x4f3;" k="41" />
-<hkern u1="&#x402;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x402;" u2="&#x4f1;" k="41" />
-<hkern u1="&#x402;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x402;" u2="&#x4ef;" k="41" />
-<hkern u1="&#x402;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x402;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x402;" u2="&#x4cb;" k="102" />
-<hkern u1="&#x402;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x402;" u2="&#x4b8;" k="102" />
-<hkern u1="&#x402;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x402;" u2="&#x4b6;" k="102" />
-<hkern u1="&#x402;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x402;" u2="&#x4b4;" k="123" />
-<hkern u1="&#x402;" u2="&#x4b1;" k="41" />
-<hkern u1="&#x402;" u2="&#x4b0;" k="102" />
-<hkern u1="&#x402;" u2="&#x4af;" k="41" />
-<hkern u1="&#x402;" u2="&#x4ae;" k="102" />
-<hkern u1="&#x402;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x402;" u2="&#x4ac;" k="102" />
-<hkern u1="&#x402;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x402;" u2="&#x4a0;" k="123" />
-<hkern u1="&#x402;" u2="&#x49e;" k="82" />
-<hkern u1="&#x402;" u2="&#x492;" k="82" />
-<hkern u1="&#x402;" u2="&#x48c;" k="82" />
-<hkern u1="&#x402;" u2="&#x476;" k="82" />
-<hkern u1="&#x402;" u2="&#x474;" k="82" />
-<hkern u1="&#x402;" u2="&#x470;" k="102" />
-<hkern u1="&#x402;" u2="&#x462;" k="82" />
-<hkern u1="&#x402;" u2="&#x45e;" k="41" />
-<hkern u1="&#x402;" u2="&#x44a;" k="41" />
-<hkern u1="&#x402;" u2="&#x447;" k="41" />
-<hkern u1="&#x402;" u2="&#x443;" k="41" />
-<hkern u1="&#x402;" u2="&#x442;" k="41" />
-<hkern u1="&#x402;" u2="&#x42a;" k="123" />
-<hkern u1="&#x402;" u2="&#x427;" k="102" />
-<hkern u1="&#x402;" u2="&#x423;" k="41" />
-<hkern u1="&#x402;" u2="&#x422;" k="102" />
-<hkern u1="&#x402;" u2="&#x40e;" k="41" />
-<hkern u1="&#x402;" u2="&#x40b;" k="123" />
-<hkern u1="&#x402;" u2="&#x402;" k="123" />
-<hkern u1="&#x402;" u2="&#x27;" k="82" />
-<hkern u1="&#x402;" u2="&#x22;" k="82" />
-<hkern u1="&#x403;" u2="&#x201e;" k="123" />
-<hkern u1="&#x403;" u2="&#x201a;" k="123" />
-<hkern u1="&#x403;" u2="&#x2015;" k="82" />
-<hkern u1="&#x403;" u2="&#x2014;" k="82" />
-<hkern u1="&#x403;" u2="&#x2013;" k="82" />
-<hkern u1="&#x403;" u2="&#x513;" k="123" />
-<hkern u1="&#x403;" u2="&#x512;" k="102" />
-<hkern u1="&#x403;" u2="&#x511;" k="143" />
-<hkern u1="&#x403;" u2="&#x50f;" k="82" />
-<hkern u1="&#x403;" u2="&#x50d;" k="143" />
-<hkern u1="&#x403;" u2="&#x50c;" k="41" />
-<hkern u1="&#x403;" u2="&#x50b;" k="102" />
-<hkern u1="&#x403;" u2="&#x509;" k="123" />
-<hkern u1="&#x403;" u2="&#x508;" k="102" />
-<hkern u1="&#x403;" u2="&#x507;" k="102" />
-<hkern u1="&#x403;" u2="&#x505;" k="102" />
-<hkern u1="&#x403;" u2="&#x503;" k="143" />
-<hkern u1="&#x403;" u2="&#x502;" k="143" />
-<hkern u1="&#x403;" u2="&#x501;" k="143" />
-<hkern u1="&#x403;" u2="&#x500;" k="143" />
-<hkern u1="&#x403;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x403;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x403;" u2="&#x4f9;" k="102" />
-<hkern u1="&#x403;" u2="&#x4f7;" k="102" />
-<hkern u1="&#x403;" u2="&#x4f5;" k="102" />
-<hkern u1="&#x403;" u2="&#x4f3;" k="82" />
-<hkern u1="&#x403;" u2="&#x4f1;" k="82" />
-<hkern u1="&#x403;" u2="&#x4ef;" k="82" />
-<hkern u1="&#x403;" u2="&#x4ed;" k="41" />
-<hkern u1="&#x403;" u2="&#x4eb;" k="143" />
-<hkern u1="&#x403;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x403;" u2="&#x4e9;" k="143" />
-<hkern u1="&#x403;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x403;" u2="&#x4e7;" k="143" />
-<hkern u1="&#x403;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x403;" u2="&#x4e5;" k="102" />
-<hkern u1="&#x403;" u2="&#x4e3;" k="102" />
-<hkern u1="&#x403;" u2="&#x4e1;" k="61" />
-<hkern u1="&#x403;" u2="&#x4df;" k="41" />
-<hkern u1="&#x403;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x403;" u2="&#x4d7;" k="143" />
-<hkern u1="&#x403;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x403;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x403;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x403;" u2="&#x4ce;" k="102" />
-<hkern u1="&#x403;" u2="&#x4cc;" k="102" />
-<hkern u1="&#x403;" u2="&#x4ca;" k="102" />
-<hkern u1="&#x403;" u2="&#x4c8;" k="102" />
-<hkern u1="&#x403;" u2="&#x4c6;" k="123" />
-<hkern u1="&#x403;" u2="&#x4c5;" k="102" />
-<hkern u1="&#x403;" u2="&#x4c4;" k="102" />
-<hkern u1="&#x403;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x403;" u2="&#x4bf;" k="143" />
-<hkern u1="&#x403;" u2="&#x4be;" k="102" />
-<hkern u1="&#x403;" u2="&#x4bd;" k="143" />
-<hkern u1="&#x403;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x403;" u2="&#x4bb;" k="102" />
-<hkern u1="&#x403;" u2="&#x4b9;" k="102" />
-<hkern u1="&#x403;" u2="&#x4b7;" k="102" />
-<hkern u1="&#x403;" u2="&#x4b5;" k="82" />
-<hkern u1="&#x403;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x403;" u2="&#x4b1;" k="82" />
-<hkern u1="&#x403;" u2="&#x4af;" k="82" />
-<hkern u1="&#x403;" u2="&#x4ad;" k="82" />
-<hkern u1="&#x403;" u2="&#x4ac;" k="-41" />
-<hkern u1="&#x403;" u2="&#x4ab;" k="143" />
-<hkern u1="&#x403;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x403;" u2="&#x4a9;" k="143" />
-<hkern u1="&#x403;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x403;" u2="&#x4a7;" k="102" />
-<hkern u1="&#x403;" u2="&#x4a5;" k="102" />
-<hkern u1="&#x403;" u2="&#x4a3;" k="102" />
-<hkern u1="&#x403;" u2="&#x4a1;" k="82" />
-<hkern u1="&#x403;" u2="&#x49d;" k="102" />
-<hkern u1="&#x403;" u2="&#x49b;" k="102" />
-<hkern u1="&#x403;" u2="&#x499;" k="41" />
-<hkern u1="&#x403;" u2="&#x497;" k="41" />
-<hkern u1="&#x403;" u2="&#x495;" k="102" />
-<hkern u1="&#x403;" u2="&#x491;" k="102" />
-<hkern u1="&#x403;" u2="&#x48f;" k="102" />
-<hkern u1="&#x403;" u2="&#x48b;" k="102" />
-<hkern u1="&#x403;" u2="&#x481;" k="143" />
-<hkern u1="&#x403;" u2="&#x480;" k="41" />
-<hkern u1="&#x403;" u2="&#x47f;" k="41" />
-<hkern u1="&#x403;" u2="&#x47e;" k="41" />
-<hkern u1="&#x403;" u2="&#x47d;" k="143" />
-<hkern u1="&#x403;" u2="&#x47c;" k="41" />
-<hkern u1="&#x403;" u2="&#x47b;" k="143" />
-<hkern u1="&#x403;" u2="&#x47a;" k="41" />
-<hkern u1="&#x403;" u2="&#x479;" k="143" />
-<hkern u1="&#x403;" u2="&#x478;" k="41" />
-<hkern u1="&#x403;" u2="&#x477;" k="41" />
-<hkern u1="&#x403;" u2="&#x475;" k="41" />
-<hkern u1="&#x403;" u2="&#x473;" k="143" />
-<hkern u1="&#x403;" u2="&#x472;" k="41" />
-<hkern u1="&#x403;" u2="&#x471;" k="102" />
-<hkern u1="&#x403;" u2="&#x46d;" k="102" />
-<hkern u1="&#x403;" u2="&#x46b;" k="102" />
-<hkern u1="&#x403;" u2="&#x469;" k="102" />
-<hkern u1="&#x403;" u2="&#x467;" k="123" />
-<hkern u1="&#x403;" u2="&#x466;" k="143" />
-<hkern u1="&#x403;" u2="&#x465;" k="102" />
-<hkern u1="&#x403;" u2="&#x461;" k="41" />
-<hkern u1="&#x403;" u2="&#x460;" k="41" />
-<hkern u1="&#x403;" u2="&#x45f;" k="102" />
-<hkern u1="&#x403;" u2="&#x45e;" k="82" />
-<hkern u1="&#x403;" u2="&#x45d;" k="102" />
-<hkern u1="&#x403;" u2="&#x45c;" k="102" />
-<hkern u1="&#x403;" u2="&#x45a;" k="102" />
-<hkern u1="&#x403;" u2="&#x459;" k="123" />
-<hkern u1="&#x403;" u2="&#x455;" k="123" />
-<hkern u1="&#x403;" u2="&#x454;" k="143" />
-<hkern u1="&#x403;" u2="&#x453;" k="102" />
-<hkern u1="&#x403;" u2="&#x451;" k="143" />
-<hkern u1="&#x403;" u2="&#x450;" k="143" />
-<hkern u1="&#x403;" u2="&#x44f;" k="61" />
-<hkern u1="&#x403;" u2="&#x44e;" k="102" />
-<hkern u1="&#x403;" u2="&#x44d;" k="41" />
-<hkern u1="&#x403;" u2="&#x44c;" k="102" />
-<hkern u1="&#x403;" u2="&#x44b;" k="102" />
-<hkern u1="&#x403;" u2="&#x44a;" k="82" />
-<hkern u1="&#x403;" u2="&#x449;" k="102" />
-<hkern u1="&#x403;" u2="&#x448;" k="102" />
-<hkern u1="&#x403;" u2="&#x447;" k="102" />
-<hkern u1="&#x403;" u2="&#x446;" k="102" />
-<hkern u1="&#x403;" u2="&#x445;" k="41" />
-<hkern u1="&#x403;" u2="&#x444;" k="143" />
-<hkern u1="&#x403;" u2="&#x443;" k="82" />
-<hkern u1="&#x403;" u2="&#x442;" k="82" />
-<hkern u1="&#x403;" u2="&#x441;" k="143" />
-<hkern u1="&#x403;" u2="&#x440;" k="102" />
-<hkern u1="&#x403;" u2="&#x43f;" k="102" />
-<hkern u1="&#x403;" u2="&#x43e;" k="143" />
-<hkern u1="&#x403;" u2="&#x43d;" k="102" />
-<hkern u1="&#x403;" u2="&#x43c;" k="102" />
-<hkern u1="&#x403;" u2="&#x43b;" k="123" />
-<hkern u1="&#x403;" u2="&#x43a;" k="102" />
-<hkern u1="&#x403;" u2="&#x439;" k="102" />
-<hkern u1="&#x403;" u2="&#x438;" k="102" />
-<hkern u1="&#x403;" u2="&#x437;" k="41" />
-<hkern u1="&#x403;" u2="&#x436;" k="41" />
-<hkern u1="&#x403;" u2="&#x435;" k="143" />
-<hkern u1="&#x403;" u2="&#x434;" k="123" />
-<hkern u1="&#x403;" u2="&#x433;" k="102" />
-<hkern u1="&#x403;" u2="&#x432;" k="102" />
-<hkern u1="&#x403;" u2="&#x424;" k="82" />
-<hkern u1="&#x403;" u2="&#x422;" k="-41" />
-<hkern u1="&#x403;" u2="&#x421;" k="41" />
-<hkern u1="&#x403;" u2="&#x41e;" k="41" />
-<hkern u1="&#x403;" u2="&#x41b;" k="102" />
-<hkern u1="&#x403;" u2="&#x414;" k="102" />
-<hkern u1="&#x403;" u2="&#x410;" k="143" />
-<hkern u1="&#x403;" u2="&#x409;" k="102" />
-<hkern u1="&#x403;" u2="&#x404;" k="41" />
-<hkern u1="&#x403;" u2="&#x2e;" k="123" />
-<hkern u1="&#x403;" u2="&#x2d;" k="82" />
-<hkern u1="&#x403;" u2="&#x2c;" k="123" />
-<hkern u1="&#x404;" u2="&#x50c;" k="41" />
-<hkern u1="&#x404;" u2="&#x507;" k="41" />
-<hkern u1="&#x404;" u2="&#x505;" k="41" />
-<hkern u1="&#x404;" u2="&#x502;" k="41" />
-<hkern u1="&#x404;" u2="&#x500;" k="41" />
-<hkern u1="&#x404;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x404;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x404;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x404;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x404;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x404;" u2="&#x4be;" k="41" />
-<hkern u1="&#x404;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x404;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x404;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x404;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x404;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x404;" u2="&#x480;" k="41" />
-<hkern u1="&#x404;" u2="&#x47e;" k="41" />
-<hkern u1="&#x404;" u2="&#x47c;" k="41" />
-<hkern u1="&#x404;" u2="&#x47a;" k="41" />
-<hkern u1="&#x404;" u2="&#x478;" k="41" />
-<hkern u1="&#x404;" u2="&#x472;" k="41" />
-<hkern u1="&#x404;" u2="&#x460;" k="41" />
-<hkern u1="&#x404;" u2="&#x447;" k="41" />
-<hkern u1="&#x404;" u2="&#x424;" k="41" />
-<hkern u1="&#x404;" u2="&#x421;" k="41" />
-<hkern u1="&#x404;" u2="&#x41e;" k="41" />
-<hkern u1="&#x404;" u2="&#x404;" k="41" />
-<hkern u1="&#x405;" u2="&#x507;" k="41" />
-<hkern u1="&#x405;" u2="&#x505;" k="41" />
-<hkern u1="&#x409;" u2="&#x201d;" k="82" />
-<hkern u1="&#x409;" u2="&#x2019;" k="82" />
-<hkern u1="&#x409;" u2="&#x50f;" k="41" />
-<hkern u1="&#x409;" u2="&#x50e;" k="123" />
-<hkern u1="&#x409;" u2="&#x507;" k="61" />
-<hkern u1="&#x409;" u2="&#x506;" k="102" />
-<hkern u1="&#x409;" u2="&#x505;" k="61" />
-<hkern u1="&#x409;" u2="&#x504;" k="102" />
-<hkern u1="&#x409;" u2="&#x4fa;" k="82" />
-<hkern u1="&#x409;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x409;" u2="&#x4f4;" k="102" />
-<hkern u1="&#x409;" u2="&#x4f3;" k="41" />
-<hkern u1="&#x409;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x409;" u2="&#x4f1;" k="41" />
-<hkern u1="&#x409;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x409;" u2="&#x4ef;" k="41" />
-<hkern u1="&#x409;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x409;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x409;" u2="&#x4cb;" k="102" />
-<hkern u1="&#x409;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x409;" u2="&#x4b8;" k="102" />
-<hkern u1="&#x409;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x409;" u2="&#x4b6;" k="102" />
-<hkern u1="&#x409;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x409;" u2="&#x4b4;" k="123" />
-<hkern u1="&#x409;" u2="&#x4b1;" k="41" />
-<hkern u1="&#x409;" u2="&#x4b0;" k="102" />
-<hkern u1="&#x409;" u2="&#x4af;" k="41" />
-<hkern u1="&#x409;" u2="&#x4ae;" k="102" />
-<hkern u1="&#x409;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x409;" u2="&#x4ac;" k="102" />
-<hkern u1="&#x409;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x409;" u2="&#x4a0;" k="123" />
-<hkern u1="&#x409;" u2="&#x49e;" k="82" />
-<hkern u1="&#x409;" u2="&#x492;" k="82" />
-<hkern u1="&#x409;" u2="&#x48c;" k="82" />
-<hkern u1="&#x409;" u2="&#x476;" k="82" />
-<hkern u1="&#x409;" u2="&#x474;" k="82" />
-<hkern u1="&#x409;" u2="&#x470;" k="102" />
-<hkern u1="&#x409;" u2="&#x462;" k="82" />
-<hkern u1="&#x409;" u2="&#x45e;" k="41" />
-<hkern u1="&#x409;" u2="&#x44a;" k="41" />
-<hkern u1="&#x409;" u2="&#x447;" k="41" />
-<hkern u1="&#x409;" u2="&#x443;" k="41" />
-<hkern u1="&#x409;" u2="&#x442;" k="41" />
-<hkern u1="&#x409;" u2="&#x42a;" k="123" />
-<hkern u1="&#x409;" u2="&#x427;" k="102" />
-<hkern u1="&#x409;" u2="&#x423;" k="41" />
-<hkern u1="&#x409;" u2="&#x422;" k="102" />
-<hkern u1="&#x409;" u2="&#x40e;" k="41" />
-<hkern u1="&#x409;" u2="&#x40b;" k="123" />
-<hkern u1="&#x409;" u2="&#x402;" k="123" />
-<hkern u1="&#x409;" u2="&#x27;" k="82" />
-<hkern u1="&#x409;" u2="&#x22;" k="82" />
-<hkern u1="&#x40a;" u2="&#x201d;" k="82" />
-<hkern u1="&#x40a;" u2="&#x2019;" k="82" />
-<hkern u1="&#x40a;" u2="&#x50f;" k="41" />
-<hkern u1="&#x40a;" u2="&#x50e;" k="123" />
-<hkern u1="&#x40a;" u2="&#x507;" k="61" />
-<hkern u1="&#x40a;" u2="&#x506;" k="102" />
-<hkern u1="&#x40a;" u2="&#x505;" k="61" />
-<hkern u1="&#x40a;" u2="&#x504;" k="102" />
-<hkern u1="&#x40a;" u2="&#x4fa;" k="82" />
-<hkern u1="&#x40a;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4f4;" k="102" />
-<hkern u1="&#x40a;" u2="&#x4f3;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4f1;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4ef;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4cb;" k="102" />
-<hkern u1="&#x40a;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4b8;" k="102" />
-<hkern u1="&#x40a;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4b6;" k="102" />
-<hkern u1="&#x40a;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4b4;" k="123" />
-<hkern u1="&#x40a;" u2="&#x4b1;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4b0;" k="102" />
-<hkern u1="&#x40a;" u2="&#x4af;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4ae;" k="102" />
-<hkern u1="&#x40a;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4ac;" k="102" />
-<hkern u1="&#x40a;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x40a;" u2="&#x4a0;" k="123" />
-<hkern u1="&#x40a;" u2="&#x49e;" k="82" />
-<hkern u1="&#x40a;" u2="&#x492;" k="82" />
-<hkern u1="&#x40a;" u2="&#x48c;" k="82" />
-<hkern u1="&#x40a;" u2="&#x476;" k="82" />
-<hkern u1="&#x40a;" u2="&#x474;" k="82" />
-<hkern u1="&#x40a;" u2="&#x470;" k="102" />
-<hkern u1="&#x40a;" u2="&#x462;" k="82" />
-<hkern u1="&#x40a;" u2="&#x45e;" k="41" />
-<hkern u1="&#x40a;" u2="&#x44a;" k="41" />
-<hkern u1="&#x40a;" u2="&#x447;" k="41" />
-<hkern u1="&#x40a;" u2="&#x443;" k="41" />
-<hkern u1="&#x40a;" u2="&#x442;" k="41" />
-<hkern u1="&#x40a;" u2="&#x42a;" k="123" />
-<hkern u1="&#x40a;" u2="&#x427;" k="102" />
-<hkern u1="&#x40a;" u2="&#x423;" k="41" />
-<hkern u1="&#x40a;" u2="&#x422;" k="102" />
-<hkern u1="&#x40a;" u2="&#x40e;" k="41" />
-<hkern u1="&#x40a;" u2="&#x40b;" k="123" />
-<hkern u1="&#x40a;" u2="&#x402;" k="123" />
-<hkern u1="&#x40a;" u2="&#x27;" k="82" />
-<hkern u1="&#x40a;" u2="&#x22;" k="82" />
-<hkern u1="&#x40b;" u2="&#x201d;" k="82" />
-<hkern u1="&#x40b;" u2="&#x2019;" k="82" />
-<hkern u1="&#x40b;" u2="&#x50f;" k="41" />
-<hkern u1="&#x40b;" u2="&#x50e;" k="123" />
-<hkern u1="&#x40b;" u2="&#x507;" k="61" />
-<hkern u1="&#x40b;" u2="&#x506;" k="102" />
-<hkern u1="&#x40b;" u2="&#x505;" k="61" />
-<hkern u1="&#x40b;" u2="&#x504;" k="102" />
-<hkern u1="&#x40b;" u2="&#x4fa;" k="82" />
-<hkern u1="&#x40b;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4f4;" k="102" />
-<hkern u1="&#x40b;" u2="&#x4f3;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4f1;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4ef;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4cb;" k="102" />
-<hkern u1="&#x40b;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4b8;" k="102" />
-<hkern u1="&#x40b;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4b6;" k="102" />
-<hkern u1="&#x40b;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4b4;" k="123" />
-<hkern u1="&#x40b;" u2="&#x4b1;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4b0;" k="102" />
-<hkern u1="&#x40b;" u2="&#x4af;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4ae;" k="102" />
-<hkern u1="&#x40b;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4ac;" k="102" />
-<hkern u1="&#x40b;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x40b;" u2="&#x4a0;" k="123" />
-<hkern u1="&#x40b;" u2="&#x49e;" k="82" />
-<hkern u1="&#x40b;" u2="&#x492;" k="82" />
-<hkern u1="&#x40b;" u2="&#x48c;" k="82" />
-<hkern u1="&#x40b;" u2="&#x476;" k="82" />
-<hkern u1="&#x40b;" u2="&#x474;" k="82" />
-<hkern u1="&#x40b;" u2="&#x470;" k="102" />
-<hkern u1="&#x40b;" u2="&#x462;" k="82" />
-<hkern u1="&#x40b;" u2="&#x45e;" k="41" />
-<hkern u1="&#x40b;" u2="&#x44a;" k="41" />
-<hkern u1="&#x40b;" u2="&#x447;" k="41" />
-<hkern u1="&#x40b;" u2="&#x443;" k="41" />
-<hkern u1="&#x40b;" u2="&#x442;" k="41" />
-<hkern u1="&#x40b;" u2="&#x42a;" k="123" />
-<hkern u1="&#x40b;" u2="&#x427;" k="102" />
-<hkern u1="&#x40b;" u2="&#x423;" k="41" />
-<hkern u1="&#x40b;" u2="&#x422;" k="102" />
-<hkern u1="&#x40b;" u2="&#x40e;" k="41" />
-<hkern u1="&#x40b;" u2="&#x40b;" k="123" />
-<hkern u1="&#x40b;" u2="&#x402;" k="123" />
-<hkern u1="&#x40b;" u2="&#x27;" k="82" />
-<hkern u1="&#x40b;" u2="&#x22;" k="82" />
-<hkern u1="&#x40c;" u2="&#x510;" k="20" />
-<hkern u1="&#x40c;" u2="&#x50c;" k="41" />
-<hkern u1="&#x40c;" u2="&#x507;" k="41" />
-<hkern u1="&#x40c;" u2="&#x505;" k="41" />
-<hkern u1="&#x40c;" u2="&#x502;" k="41" />
-<hkern u1="&#x40c;" u2="&#x500;" k="41" />
-<hkern u1="&#x40c;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x40c;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x40c;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x40c;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x40c;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x40c;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x40c;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x40c;" u2="&#x4be;" k="102" />
-<hkern u1="&#x40c;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x40c;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x40c;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x40c;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x40c;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x40c;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x40c;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x40c;" u2="&#x480;" k="41" />
-<hkern u1="&#x40c;" u2="&#x47e;" k="41" />
-<hkern u1="&#x40c;" u2="&#x47c;" k="41" />
-<hkern u1="&#x40c;" u2="&#x47a;" k="41" />
-<hkern u1="&#x40c;" u2="&#x478;" k="41" />
-<hkern u1="&#x40c;" u2="&#x472;" k="41" />
-<hkern u1="&#x40c;" u2="&#x470;" k="41" />
-<hkern u1="&#x40c;" u2="&#x460;" k="41" />
-<hkern u1="&#x40c;" u2="&#x447;" k="41" />
-<hkern u1="&#x40c;" u2="&#x427;" k="41" />
-<hkern u1="&#x40c;" u2="&#x424;" k="41" />
-<hkern u1="&#x40c;" u2="&#x421;" k="41" />
-<hkern u1="&#x40c;" u2="&#x41e;" k="41" />
-<hkern u1="&#x40c;" u2="&#x404;" k="41" />
-<hkern u1="&#x40e;" u2="&#x201e;" k="123" />
-<hkern u1="&#x40e;" u2="&#x201a;" k="123" />
-<hkern u1="&#x40e;" u2="&#x513;" k="82" />
-<hkern u1="&#x40e;" u2="&#x512;" k="102" />
-<hkern u1="&#x40e;" u2="&#x511;" k="41" />
-<hkern u1="&#x40e;" u2="&#x50d;" k="41" />
-<hkern u1="&#x40e;" u2="&#x50c;" k="20" />
-<hkern u1="&#x40e;" u2="&#x509;" k="82" />
-<hkern u1="&#x40e;" u2="&#x508;" k="102" />
-<hkern u1="&#x40e;" u2="&#x503;" k="41" />
-<hkern u1="&#x40e;" u2="&#x502;" k="143" />
-<hkern u1="&#x40e;" u2="&#x501;" k="41" />
-<hkern u1="&#x40e;" u2="&#x500;" k="143" />
-<hkern u1="&#x40e;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x40e;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x40e;" u2="&#x4ea;" k="20" />
-<hkern u1="&#x40e;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x40e;" u2="&#x4e8;" k="20" />
-<hkern u1="&#x40e;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x40e;" u2="&#x4e6;" k="20" />
-<hkern u1="&#x40e;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x40e;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x40e;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x40e;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x40e;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x40e;" u2="&#x4c6;" k="82" />
-<hkern u1="&#x40e;" u2="&#x4c5;" k="102" />
-<hkern u1="&#x40e;" u2="&#x4bf;" k="61" />
-<hkern u1="&#x40e;" u2="&#x4be;" k="41" />
-<hkern u1="&#x40e;" u2="&#x4bd;" k="61" />
-<hkern u1="&#x40e;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x40e;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x40e;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x40e;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x40e;" u2="&#x4aa;" k="20" />
-<hkern u1="&#x40e;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x40e;" u2="&#x4a8;" k="20" />
-<hkern u1="&#x40e;" u2="&#x49f;" k="-102" />
-<hkern u1="&#x40e;" u2="&#x48d;" k="-102" />
-<hkern u1="&#x40e;" u2="&#x481;" k="41" />
-<hkern u1="&#x40e;" u2="&#x480;" k="20" />
-<hkern u1="&#x40e;" u2="&#x47e;" k="20" />
-<hkern u1="&#x40e;" u2="&#x47d;" k="41" />
-<hkern u1="&#x40e;" u2="&#x47c;" k="20" />
-<hkern u1="&#x40e;" u2="&#x47b;" k="41" />
-<hkern u1="&#x40e;" u2="&#x47a;" k="20" />
-<hkern u1="&#x40e;" u2="&#x479;" k="41" />
-<hkern u1="&#x40e;" u2="&#x478;" k="20" />
-<hkern u1="&#x40e;" u2="&#x473;" k="41" />
-<hkern u1="&#x40e;" u2="&#x472;" k="20" />
-<hkern u1="&#x40e;" u2="&#x467;" k="82" />
-<hkern u1="&#x40e;" u2="&#x466;" k="143" />
-<hkern u1="&#x40e;" u2="&#x460;" k="20" />
-<hkern u1="&#x40e;" u2="&#x45b;" k="-102" />
-<hkern u1="&#x40e;" u2="&#x459;" k="82" />
-<hkern u1="&#x40e;" u2="&#x455;" k="20" />
-<hkern u1="&#x40e;" u2="&#x454;" k="41" />
-<hkern u1="&#x40e;" u2="&#x452;" k="-102" />
-<hkern u1="&#x40e;" u2="&#x451;" k="41" />
-<hkern u1="&#x40e;" u2="&#x450;" k="41" />
-<hkern u1="&#x40e;" u2="&#x447;" k="41" />
-<hkern u1="&#x40e;" u2="&#x444;" k="41" />
-<hkern u1="&#x40e;" u2="&#x441;" k="41" />
-<hkern u1="&#x40e;" u2="&#x43e;" k="41" />
-<hkern u1="&#x40e;" u2="&#x43b;" k="82" />
-<hkern u1="&#x40e;" u2="&#x435;" k="41" />
-<hkern u1="&#x40e;" u2="&#x434;" k="82" />
-<hkern u1="&#x40e;" u2="&#x42f;" k="20" />
-<hkern u1="&#x40e;" u2="&#x424;" k="61" />
-<hkern u1="&#x40e;" u2="&#x421;" k="20" />
-<hkern u1="&#x40e;" u2="&#x41e;" k="20" />
-<hkern u1="&#x40e;" u2="&#x41b;" k="102" />
-<hkern u1="&#x40e;" u2="&#x414;" k="102" />
-<hkern u1="&#x40e;" u2="&#x410;" k="143" />
-<hkern u1="&#x40e;" u2="&#x409;" k="102" />
-<hkern u1="&#x40e;" u2="&#x404;" k="20" />
-<hkern u1="&#x40e;" u2="&#x2e;" k="123" />
-<hkern u1="&#x40e;" u2="&#x2c;" k="123" />
-<hkern u1="&#x410;" u2="&#x201d;" k="143" />
-<hkern u1="&#x410;" u2="&#x2019;" k="143" />
-<hkern u1="&#x410;" u2="&#x50f;" k="41" />
-<hkern u1="&#x410;" u2="&#x50e;" k="102" />
-<hkern u1="&#x410;" u2="&#x507;" k="41" />
-<hkern u1="&#x410;" u2="&#x506;" k="143" />
-<hkern u1="&#x410;" u2="&#x505;" k="41" />
-<hkern u1="&#x410;" u2="&#x504;" k="143" />
-<hkern u1="&#x410;" u2="&#x4fa;" k="41" />
-<hkern u1="&#x410;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x410;" u2="&#x4f4;" k="102" />
-<hkern u1="&#x410;" u2="&#x4da;" k="41" />
-<hkern u1="&#x410;" u2="&#x4d8;" k="41" />
-<hkern u1="&#x410;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x410;" u2="&#x4cb;" k="102" />
-<hkern u1="&#x410;" u2="&#x4be;" k="102" />
-<hkern u1="&#x410;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x410;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x410;" u2="&#x4b8;" k="102" />
-<hkern u1="&#x410;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x410;" u2="&#x4b6;" k="102" />
-<hkern u1="&#x410;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x410;" u2="&#x4b4;" k="102" />
-<hkern u1="&#x410;" u2="&#x4b0;" k="123" />
-<hkern u1="&#x410;" u2="&#x4ae;" k="123" />
-<hkern u1="&#x410;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x410;" u2="&#x4ac;" k="143" />
-<hkern u1="&#x410;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x410;" u2="&#x4a0;" k="102" />
-<hkern u1="&#x410;" u2="&#x49e;" k="41" />
-<hkern u1="&#x410;" u2="&#x492;" k="41" />
-<hkern u1="&#x410;" u2="&#x48c;" k="41" />
-<hkern u1="&#x410;" u2="&#x476;" k="82" />
-<hkern u1="&#x410;" u2="&#x474;" k="82" />
-<hkern u1="&#x410;" u2="&#x470;" k="102" />
-<hkern u1="&#x410;" u2="&#x462;" k="41" />
-<hkern u1="&#x410;" u2="&#x44a;" k="41" />
-<hkern u1="&#x410;" u2="&#x447;" k="41" />
-<hkern u1="&#x410;" u2="&#x442;" k="41" />
-<hkern u1="&#x410;" u2="&#x42a;" k="102" />
-<hkern u1="&#x410;" u2="&#x427;" k="102" />
-<hkern u1="&#x410;" u2="&#x424;" k="41" />
-<hkern u1="&#x410;" u2="&#x422;" k="143" />
-<hkern u1="&#x410;" u2="&#x40b;" k="102" />
-<hkern u1="&#x410;" u2="&#x402;" k="102" />
-<hkern u1="&#x410;" u2="&#x27;" k="143" />
-<hkern u1="&#x410;" u2="&#x22;" k="143" />
-<hkern u1="&#x411;" u2="&#x201d;" k="41" />
-<hkern u1="&#x411;" u2="&#x2019;" k="41" />
-<hkern u1="&#x411;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x411;" u2="&#x4d4;" k="20" />
-<hkern u1="&#x411;" u2="&#x4d2;" k="20" />
-<hkern u1="&#x411;" u2="&#x4d0;" k="20" />
-<hkern u1="&#x411;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x411;" u2="&#x4be;" k="41" />
-<hkern u1="&#x411;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x411;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x411;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x411;" u2="&#x470;" k="41" />
-<hkern u1="&#x411;" u2="&#x466;" k="20" />
-<hkern u1="&#x411;" u2="&#x427;" k="41" />
-<hkern u1="&#x411;" u2="&#x410;" k="20" />
-<hkern u1="&#x411;" u2="&#x27;" k="41" />
-<hkern u1="&#x411;" u2="&#x22;" k="41" />
-<hkern u1="&#x412;" u2="&#x201e;" k="82" />
-<hkern u1="&#x412;" u2="&#x201a;" k="82" />
-<hkern u1="&#x412;" u2="&#x506;" k="41" />
-<hkern u1="&#x412;" u2="&#x504;" k="41" />
-<hkern u1="&#x412;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x412;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x412;" u2="&#x476;" k="20" />
-<hkern u1="&#x412;" u2="&#x474;" k="20" />
-<hkern u1="&#x412;" u2="&#x2e;" k="82" />
-<hkern u1="&#x412;" u2="&#x2c;" k="82" />
-<hkern u1="&#x413;" u2="&#x201e;" k="123" />
-<hkern u1="&#x413;" u2="&#x201a;" k="123" />
-<hkern u1="&#x413;" u2="&#x2015;" k="82" />
-<hkern u1="&#x413;" u2="&#x2014;" k="82" />
-<hkern u1="&#x413;" u2="&#x2013;" k="82" />
-<hkern u1="&#x413;" u2="&#x513;" k="123" />
-<hkern u1="&#x413;" u2="&#x512;" k="102" />
-<hkern u1="&#x413;" u2="&#x511;" k="143" />
-<hkern u1="&#x413;" u2="&#x50f;" k="82" />
-<hkern u1="&#x413;" u2="&#x50d;" k="143" />
-<hkern u1="&#x413;" u2="&#x50c;" k="41" />
-<hkern u1="&#x413;" u2="&#x50b;" k="102" />
-<hkern u1="&#x413;" u2="&#x509;" k="123" />
-<hkern u1="&#x413;" u2="&#x508;" k="102" />
-<hkern u1="&#x413;" u2="&#x507;" k="102" />
-<hkern u1="&#x413;" u2="&#x505;" k="102" />
-<hkern u1="&#x413;" u2="&#x503;" k="143" />
-<hkern u1="&#x413;" u2="&#x502;" k="143" />
-<hkern u1="&#x413;" u2="&#x501;" k="143" />
-<hkern u1="&#x413;" u2="&#x500;" k="143" />
-<hkern u1="&#x413;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x413;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x413;" u2="&#x4f9;" k="102" />
-<hkern u1="&#x413;" u2="&#x4f7;" k="102" />
-<hkern u1="&#x413;" u2="&#x4f5;" k="102" />
-<hkern u1="&#x413;" u2="&#x4f3;" k="82" />
-<hkern u1="&#x413;" u2="&#x4f1;" k="82" />
-<hkern u1="&#x413;" u2="&#x4ef;" k="82" />
-<hkern u1="&#x413;" u2="&#x4ed;" k="41" />
-<hkern u1="&#x413;" u2="&#x4eb;" k="143" />
-<hkern u1="&#x413;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x413;" u2="&#x4e9;" k="143" />
-<hkern u1="&#x413;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x413;" u2="&#x4e7;" k="143" />
-<hkern u1="&#x413;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x413;" u2="&#x4e5;" k="102" />
-<hkern u1="&#x413;" u2="&#x4e3;" k="102" />
-<hkern u1="&#x413;" u2="&#x4e1;" k="61" />
-<hkern u1="&#x413;" u2="&#x4df;" k="41" />
-<hkern u1="&#x413;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x413;" u2="&#x4d7;" k="143" />
-<hkern u1="&#x413;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x413;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x413;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x413;" u2="&#x4ce;" k="102" />
-<hkern u1="&#x413;" u2="&#x4cc;" k="102" />
-<hkern u1="&#x413;" u2="&#x4ca;" k="102" />
-<hkern u1="&#x413;" u2="&#x4c8;" k="102" />
-<hkern u1="&#x413;" u2="&#x4c6;" k="123" />
-<hkern u1="&#x413;" u2="&#x4c5;" k="102" />
-<hkern u1="&#x413;" u2="&#x4c4;" k="102" />
-<hkern u1="&#x413;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x413;" u2="&#x4bf;" k="143" />
-<hkern u1="&#x413;" u2="&#x4be;" k="102" />
-<hkern u1="&#x413;" u2="&#x4bd;" k="143" />
-<hkern u1="&#x413;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x413;" u2="&#x4bb;" k="102" />
-<hkern u1="&#x413;" u2="&#x4b9;" k="102" />
-<hkern u1="&#x413;" u2="&#x4b7;" k="102" />
-<hkern u1="&#x413;" u2="&#x4b5;" k="82" />
-<hkern u1="&#x413;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x413;" u2="&#x4b1;" k="82" />
-<hkern u1="&#x413;" u2="&#x4af;" k="82" />
-<hkern u1="&#x413;" u2="&#x4ad;" k="82" />
-<hkern u1="&#x413;" u2="&#x4ac;" k="-41" />
-<hkern u1="&#x413;" u2="&#x4ab;" k="143" />
-<hkern u1="&#x413;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x413;" u2="&#x4a9;" k="143" />
-<hkern u1="&#x413;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x413;" u2="&#x4a7;" k="102" />
-<hkern u1="&#x413;" u2="&#x4a5;" k="102" />
-<hkern u1="&#x413;" u2="&#x4a3;" k="102" />
-<hkern u1="&#x413;" u2="&#x4a1;" k="82" />
-<hkern u1="&#x413;" u2="&#x49d;" k="102" />
-<hkern u1="&#x413;" u2="&#x49b;" k="102" />
-<hkern u1="&#x413;" u2="&#x499;" k="41" />
-<hkern u1="&#x413;" u2="&#x497;" k="41" />
-<hkern u1="&#x413;" u2="&#x495;" k="102" />
-<hkern u1="&#x413;" u2="&#x491;" k="102" />
-<hkern u1="&#x413;" u2="&#x48f;" k="102" />
-<hkern u1="&#x413;" u2="&#x48b;" k="102" />
-<hkern u1="&#x413;" u2="&#x481;" k="143" />
-<hkern u1="&#x413;" u2="&#x480;" k="41" />
-<hkern u1="&#x413;" u2="&#x47f;" k="41" />
-<hkern u1="&#x413;" u2="&#x47e;" k="41" />
-<hkern u1="&#x413;" u2="&#x47d;" k="143" />
-<hkern u1="&#x413;" u2="&#x47c;" k="41" />
-<hkern u1="&#x413;" u2="&#x47b;" k="143" />
-<hkern u1="&#x413;" u2="&#x47a;" k="41" />
-<hkern u1="&#x413;" u2="&#x479;" k="143" />
-<hkern u1="&#x413;" u2="&#x478;" k="41" />
-<hkern u1="&#x413;" u2="&#x477;" k="41" />
-<hkern u1="&#x413;" u2="&#x475;" k="41" />
-<hkern u1="&#x413;" u2="&#x473;" k="143" />
-<hkern u1="&#x413;" u2="&#x472;" k="41" />
-<hkern u1="&#x413;" u2="&#x471;" k="102" />
-<hkern u1="&#x413;" u2="&#x46d;" k="102" />
-<hkern u1="&#x413;" u2="&#x46b;" k="102" />
-<hkern u1="&#x413;" u2="&#x469;" k="102" />
-<hkern u1="&#x413;" u2="&#x467;" k="123" />
-<hkern u1="&#x413;" u2="&#x466;" k="143" />
-<hkern u1="&#x413;" u2="&#x465;" k="102" />
-<hkern u1="&#x413;" u2="&#x461;" k="41" />
-<hkern u1="&#x413;" u2="&#x460;" k="41" />
-<hkern u1="&#x413;" u2="&#x45f;" k="102" />
-<hkern u1="&#x413;" u2="&#x45e;" k="82" />
-<hkern u1="&#x413;" u2="&#x45d;" k="102" />
-<hkern u1="&#x413;" u2="&#x45c;" k="102" />
-<hkern u1="&#x413;" u2="&#x45a;" k="102" />
-<hkern u1="&#x413;" u2="&#x459;" k="123" />
-<hkern u1="&#x413;" u2="&#x455;" k="123" />
-<hkern u1="&#x413;" u2="&#x454;" k="143" />
-<hkern u1="&#x413;" u2="&#x453;" k="102" />
-<hkern u1="&#x413;" u2="&#x451;" k="143" />
-<hkern u1="&#x413;" u2="&#x450;" k="143" />
-<hkern u1="&#x413;" u2="&#x44f;" k="61" />
-<hkern u1="&#x413;" u2="&#x44e;" k="102" />
-<hkern u1="&#x413;" u2="&#x44d;" k="41" />
-<hkern u1="&#x413;" u2="&#x44c;" k="102" />
-<hkern u1="&#x413;" u2="&#x44b;" k="102" />
-<hkern u1="&#x413;" u2="&#x44a;" k="82" />
-<hkern u1="&#x413;" u2="&#x449;" k="102" />
-<hkern u1="&#x413;" u2="&#x448;" k="102" />
-<hkern u1="&#x413;" u2="&#x447;" k="102" />
-<hkern u1="&#x413;" u2="&#x446;" k="102" />
-<hkern u1="&#x413;" u2="&#x445;" k="41" />
-<hkern u1="&#x413;" u2="&#x444;" k="143" />
-<hkern u1="&#x413;" u2="&#x443;" k="82" />
-<hkern u1="&#x413;" u2="&#x442;" k="82" />
-<hkern u1="&#x413;" u2="&#x441;" k="143" />
-<hkern u1="&#x413;" u2="&#x440;" k="102" />
-<hkern u1="&#x413;" u2="&#x43f;" k="102" />
-<hkern u1="&#x413;" u2="&#x43e;" k="143" />
-<hkern u1="&#x413;" u2="&#x43d;" k="102" />
-<hkern u1="&#x413;" u2="&#x43c;" k="102" />
-<hkern u1="&#x413;" u2="&#x43b;" k="123" />
-<hkern u1="&#x413;" u2="&#x43a;" k="102" />
-<hkern u1="&#x413;" u2="&#x439;" k="102" />
-<hkern u1="&#x413;" u2="&#x438;" k="102" />
-<hkern u1="&#x413;" u2="&#x437;" k="41" />
-<hkern u1="&#x413;" u2="&#x436;" k="41" />
-<hkern u1="&#x413;" u2="&#x435;" k="143" />
-<hkern u1="&#x413;" u2="&#x434;" k="123" />
-<hkern u1="&#x413;" u2="&#x433;" k="102" />
-<hkern u1="&#x413;" u2="&#x432;" k="102" />
-<hkern u1="&#x413;" u2="&#x424;" k="82" />
-<hkern u1="&#x413;" u2="&#x422;" k="-41" />
-<hkern u1="&#x413;" u2="&#x421;" k="41" />
-<hkern u1="&#x413;" u2="&#x41e;" k="41" />
-<hkern u1="&#x413;" u2="&#x41b;" k="102" />
-<hkern u1="&#x413;" u2="&#x414;" k="102" />
-<hkern u1="&#x413;" u2="&#x410;" k="143" />
-<hkern u1="&#x413;" u2="&#x409;" k="102" />
-<hkern u1="&#x413;" u2="&#x404;" k="41" />
-<hkern u1="&#x413;" u2="&#x2e;" k="123" />
-<hkern u1="&#x413;" u2="&#x2d;" k="82" />
-<hkern u1="&#x413;" u2="&#x2c;" k="123" />
-<hkern u1="&#x414;" u2="&#x507;" k="41" />
-<hkern u1="&#x414;" u2="&#x505;" k="41" />
-<hkern u1="&#x414;" u2="&#x4e1;" k="-41" />
-<hkern u1="&#x414;" u2="&#x408;" k="-225" />
-<hkern u1="&#x416;" u2="&#x510;" k="20" />
-<hkern u1="&#x416;" u2="&#x50c;" k="41" />
-<hkern u1="&#x416;" u2="&#x507;" k="41" />
-<hkern u1="&#x416;" u2="&#x505;" k="41" />
-<hkern u1="&#x416;" u2="&#x502;" k="41" />
-<hkern u1="&#x416;" u2="&#x500;" k="41" />
-<hkern u1="&#x416;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x416;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x416;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x416;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x416;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x416;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x416;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x416;" u2="&#x4be;" k="102" />
-<hkern u1="&#x416;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x416;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x416;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x416;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x416;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x416;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x416;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x416;" u2="&#x480;" k="41" />
-<hkern u1="&#x416;" u2="&#x47e;" k="41" />
-<hkern u1="&#x416;" u2="&#x47c;" k="41" />
-<hkern u1="&#x416;" u2="&#x47a;" k="41" />
-<hkern u1="&#x416;" u2="&#x478;" k="41" />
-<hkern u1="&#x416;" u2="&#x472;" k="41" />
-<hkern u1="&#x416;" u2="&#x470;" k="41" />
-<hkern u1="&#x416;" u2="&#x460;" k="41" />
-<hkern u1="&#x416;" u2="&#x447;" k="41" />
-<hkern u1="&#x416;" u2="&#x427;" k="41" />
-<hkern u1="&#x416;" u2="&#x424;" k="41" />
-<hkern u1="&#x416;" u2="&#x421;" k="41" />
-<hkern u1="&#x416;" u2="&#x41e;" k="41" />
-<hkern u1="&#x416;" u2="&#x404;" k="41" />
-<hkern u1="&#x417;" u2="&#x201e;" k="82" />
-<hkern u1="&#x417;" u2="&#x201a;" k="82" />
-<hkern u1="&#x417;" u2="&#x506;" k="41" />
-<hkern u1="&#x417;" u2="&#x504;" k="41" />
-<hkern u1="&#x417;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x417;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x417;" u2="&#x476;" k="20" />
-<hkern u1="&#x417;" u2="&#x474;" k="20" />
-<hkern u1="&#x417;" u2="&#x2e;" k="82" />
-<hkern u1="&#x417;" u2="&#x2c;" k="82" />
-<hkern u1="&#x41a;" u2="&#x510;" k="20" />
-<hkern u1="&#x41a;" u2="&#x50c;" k="41" />
-<hkern u1="&#x41a;" u2="&#x507;" k="41" />
-<hkern u1="&#x41a;" u2="&#x505;" k="41" />
-<hkern u1="&#x41a;" u2="&#x502;" k="41" />
-<hkern u1="&#x41a;" u2="&#x500;" k="41" />
-<hkern u1="&#x41a;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x41a;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x41a;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x41a;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x41a;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x41a;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x41a;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x41a;" u2="&#x4be;" k="102" />
-<hkern u1="&#x41a;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x41a;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x41a;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x41a;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x41a;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x41a;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x41a;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x41a;" u2="&#x480;" k="41" />
-<hkern u1="&#x41a;" u2="&#x47e;" k="41" />
-<hkern u1="&#x41a;" u2="&#x47c;" k="41" />
-<hkern u1="&#x41a;" u2="&#x47a;" k="41" />
-<hkern u1="&#x41a;" u2="&#x478;" k="41" />
-<hkern u1="&#x41a;" u2="&#x472;" k="41" />
-<hkern u1="&#x41a;" u2="&#x470;" k="41" />
-<hkern u1="&#x41a;" u2="&#x460;" k="41" />
-<hkern u1="&#x41a;" u2="&#x447;" k="41" />
-<hkern u1="&#x41a;" u2="&#x427;" k="41" />
-<hkern u1="&#x41a;" u2="&#x424;" k="41" />
-<hkern u1="&#x41a;" u2="&#x421;" k="41" />
-<hkern u1="&#x41a;" u2="&#x41e;" k="41" />
-<hkern u1="&#x41a;" u2="&#x404;" k="41" />
-<hkern u1="&#x41e;" u2="&#x201e;" k="82" />
-<hkern u1="&#x41e;" u2="&#x201a;" k="82" />
-<hkern u1="&#x41e;" u2="&#x513;" k="20" />
-<hkern u1="&#x41e;" u2="&#x512;" k="41" />
-<hkern u1="&#x41e;" u2="&#x50e;" k="20" />
-<hkern u1="&#x41e;" u2="&#x509;" k="20" />
-<hkern u1="&#x41e;" u2="&#x508;" k="41" />
-<hkern u1="&#x41e;" u2="&#x506;" k="41" />
-<hkern u1="&#x41e;" u2="&#x504;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x41e;" u2="&#x4de;" k="20" />
-<hkern u1="&#x41e;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x41e;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x41e;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x41e;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x41e;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x41e;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x41e;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x41e;" u2="&#x498;" k="20" />
-<hkern u1="&#x41e;" u2="&#x496;" k="41" />
-<hkern u1="&#x41e;" u2="&#x476;" k="20" />
-<hkern u1="&#x41e;" u2="&#x474;" k="20" />
-<hkern u1="&#x41e;" u2="&#x470;" k="41" />
-<hkern u1="&#x41e;" u2="&#x46e;" k="20" />
-<hkern u1="&#x41e;" u2="&#x467;" k="20" />
-<hkern u1="&#x41e;" u2="&#x466;" k="41" />
-<hkern u1="&#x41e;" u2="&#x459;" k="20" />
-<hkern u1="&#x41e;" u2="&#x43b;" k="20" />
-<hkern u1="&#x41e;" u2="&#x434;" k="20" />
-<hkern u1="&#x41e;" u2="&#x42d;" k="20" />
-<hkern u1="&#x41e;" u2="&#x42a;" k="20" />
-<hkern u1="&#x41e;" u2="&#x427;" k="41" />
-<hkern u1="&#x41e;" u2="&#x425;" k="41" />
-<hkern u1="&#x41e;" u2="&#x423;" k="41" />
-<hkern u1="&#x41e;" u2="&#x422;" k="61" />
-<hkern u1="&#x41e;" u2="&#x41b;" k="41" />
-<hkern u1="&#x41e;" u2="&#x417;" k="20" />
-<hkern u1="&#x41e;" u2="&#x416;" k="41" />
-<hkern u1="&#x41e;" u2="&#x414;" k="41" />
-<hkern u1="&#x41e;" u2="&#x410;" k="41" />
-<hkern u1="&#x41e;" u2="&#x40e;" k="41" />
-<hkern u1="&#x41e;" u2="&#x40b;" k="20" />
-<hkern u1="&#x41e;" u2="&#x409;" k="41" />
-<hkern u1="&#x41e;" u2="&#x402;" k="20" />
-<hkern u1="&#x41e;" u2="&#x2e;" k="82" />
-<hkern u1="&#x41e;" u2="&#x2c;" k="82" />
-<hkern u1="&#x420;" u2="&#x201e;" k="266" />
-<hkern u1="&#x420;" u2="&#x201a;" k="266" />
-<hkern u1="&#x420;" u2="&#x513;" k="102" />
-<hkern u1="&#x420;" u2="&#x512;" k="123" />
-<hkern u1="&#x420;" u2="&#x509;" k="102" />
-<hkern u1="&#x420;" u2="&#x508;" k="123" />
-<hkern u1="&#x420;" u2="&#x502;" k="82" />
-<hkern u1="&#x420;" u2="&#x500;" k="82" />
-<hkern u1="&#x420;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x420;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x420;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x420;" u2="&#x4d4;" k="102" />
-<hkern u1="&#x420;" u2="&#x4d2;" k="102" />
-<hkern u1="&#x420;" u2="&#x4d0;" k="102" />
-<hkern u1="&#x420;" u2="&#x4c6;" k="102" />
-<hkern u1="&#x420;" u2="&#x4c5;" k="123" />
-<hkern u1="&#x420;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x420;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x420;" u2="&#x496;" k="41" />
-<hkern u1="&#x420;" u2="&#x46a;" k="20" />
-<hkern u1="&#x420;" u2="&#x467;" k="102" />
-<hkern u1="&#x420;" u2="&#x466;" k="102" />
-<hkern u1="&#x420;" u2="&#x459;" k="102" />
-<hkern u1="&#x420;" u2="&#x43b;" k="102" />
-<hkern u1="&#x420;" u2="&#x434;" k="102" />
-<hkern u1="&#x420;" u2="&#x425;" k="41" />
-<hkern u1="&#x420;" u2="&#x41b;" k="123" />
-<hkern u1="&#x420;" u2="&#x416;" k="41" />
-<hkern u1="&#x420;" u2="&#x414;" k="123" />
-<hkern u1="&#x420;" u2="&#x410;" k="102" />
-<hkern u1="&#x420;" u2="&#x409;" k="123" />
-<hkern u1="&#x420;" u2="&#x2e;" k="266" />
-<hkern u1="&#x420;" u2="&#x2c;" k="266" />
-<hkern u1="&#x421;" u2="&#x50c;" k="41" />
-<hkern u1="&#x421;" u2="&#x507;" k="41" />
-<hkern u1="&#x421;" u2="&#x505;" k="41" />
-<hkern u1="&#x421;" u2="&#x502;" k="41" />
-<hkern u1="&#x421;" u2="&#x500;" k="41" />
-<hkern u1="&#x421;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x421;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x421;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x421;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x421;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x421;" u2="&#x4be;" k="41" />
-<hkern u1="&#x421;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x421;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x421;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x421;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x421;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x421;" u2="&#x480;" k="41" />
-<hkern u1="&#x421;" u2="&#x47e;" k="41" />
-<hkern u1="&#x421;" u2="&#x47c;" k="41" />
-<hkern u1="&#x421;" u2="&#x47a;" k="41" />
-<hkern u1="&#x421;" u2="&#x478;" k="41" />
-<hkern u1="&#x421;" u2="&#x472;" k="41" />
-<hkern u1="&#x421;" u2="&#x460;" k="41" />
-<hkern u1="&#x421;" u2="&#x447;" k="41" />
-<hkern u1="&#x421;" u2="&#x424;" k="41" />
-<hkern u1="&#x421;" u2="&#x421;" k="41" />
-<hkern u1="&#x421;" u2="&#x41e;" k="41" />
-<hkern u1="&#x421;" u2="&#x404;" k="41" />
-<hkern u1="&#x422;" u2="&#x201e;" k="123" />
-<hkern u1="&#x422;" u2="&#x201a;" k="123" />
-<hkern u1="&#x422;" u2="&#x2015;" k="82" />
-<hkern u1="&#x422;" u2="&#x2014;" k="82" />
-<hkern u1="&#x422;" u2="&#x2013;" k="82" />
-<hkern u1="&#x422;" u2="&#x513;" k="123" />
-<hkern u1="&#x422;" u2="&#x512;" k="102" />
-<hkern u1="&#x422;" u2="&#x511;" k="143" />
-<hkern u1="&#x422;" u2="&#x50f;" k="82" />
-<hkern u1="&#x422;" u2="&#x50d;" k="143" />
-<hkern u1="&#x422;" u2="&#x50c;" k="41" />
-<hkern u1="&#x422;" u2="&#x50b;" k="102" />
-<hkern u1="&#x422;" u2="&#x509;" k="123" />
-<hkern u1="&#x422;" u2="&#x508;" k="102" />
-<hkern u1="&#x422;" u2="&#x507;" k="102" />
-<hkern u1="&#x422;" u2="&#x505;" k="102" />
-<hkern u1="&#x422;" u2="&#x503;" k="143" />
-<hkern u1="&#x422;" u2="&#x502;" k="143" />
-<hkern u1="&#x422;" u2="&#x501;" k="143" />
-<hkern u1="&#x422;" u2="&#x500;" k="143" />
-<hkern u1="&#x422;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x422;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x422;" u2="&#x4f9;" k="102" />
-<hkern u1="&#x422;" u2="&#x4f7;" k="102" />
-<hkern u1="&#x422;" u2="&#x4f5;" k="102" />
-<hkern u1="&#x422;" u2="&#x4f3;" k="82" />
-<hkern u1="&#x422;" u2="&#x4f1;" k="82" />
-<hkern u1="&#x422;" u2="&#x4ef;" k="82" />
-<hkern u1="&#x422;" u2="&#x4ed;" k="41" />
-<hkern u1="&#x422;" u2="&#x4eb;" k="143" />
-<hkern u1="&#x422;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x422;" u2="&#x4e9;" k="143" />
-<hkern u1="&#x422;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x422;" u2="&#x4e7;" k="143" />
-<hkern u1="&#x422;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x422;" u2="&#x4e5;" k="102" />
-<hkern u1="&#x422;" u2="&#x4e3;" k="102" />
-<hkern u1="&#x422;" u2="&#x4e1;" k="61" />
-<hkern u1="&#x422;" u2="&#x4df;" k="41" />
-<hkern u1="&#x422;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x422;" u2="&#x4d7;" k="143" />
-<hkern u1="&#x422;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x422;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x422;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x422;" u2="&#x4ce;" k="102" />
-<hkern u1="&#x422;" u2="&#x4cc;" k="102" />
-<hkern u1="&#x422;" u2="&#x4ca;" k="102" />
-<hkern u1="&#x422;" u2="&#x4c8;" k="102" />
-<hkern u1="&#x422;" u2="&#x4c6;" k="123" />
-<hkern u1="&#x422;" u2="&#x4c5;" k="102" />
-<hkern u1="&#x422;" u2="&#x4c4;" k="102" />
-<hkern u1="&#x422;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x422;" u2="&#x4bf;" k="143" />
-<hkern u1="&#x422;" u2="&#x4be;" k="102" />
-<hkern u1="&#x422;" u2="&#x4bd;" k="143" />
-<hkern u1="&#x422;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x422;" u2="&#x4bb;" k="102" />
-<hkern u1="&#x422;" u2="&#x4b9;" k="102" />
-<hkern u1="&#x422;" u2="&#x4b7;" k="102" />
-<hkern u1="&#x422;" u2="&#x4b5;" k="82" />
-<hkern u1="&#x422;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x422;" u2="&#x4b1;" k="82" />
-<hkern u1="&#x422;" u2="&#x4af;" k="82" />
-<hkern u1="&#x422;" u2="&#x4ad;" k="82" />
-<hkern u1="&#x422;" u2="&#x4ac;" k="-41" />
-<hkern u1="&#x422;" u2="&#x4ab;" k="143" />
-<hkern u1="&#x422;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x422;" u2="&#x4a9;" k="143" />
-<hkern u1="&#x422;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x422;" u2="&#x4a7;" k="102" />
-<hkern u1="&#x422;" u2="&#x4a5;" k="102" />
-<hkern u1="&#x422;" u2="&#x4a3;" k="102" />
-<hkern u1="&#x422;" u2="&#x4a1;" k="82" />
-<hkern u1="&#x422;" u2="&#x49d;" k="102" />
-<hkern u1="&#x422;" u2="&#x49b;" k="102" />
-<hkern u1="&#x422;" u2="&#x499;" k="41" />
-<hkern u1="&#x422;" u2="&#x497;" k="41" />
-<hkern u1="&#x422;" u2="&#x495;" k="102" />
-<hkern u1="&#x422;" u2="&#x491;" k="102" />
-<hkern u1="&#x422;" u2="&#x48f;" k="102" />
-<hkern u1="&#x422;" u2="&#x48b;" k="102" />
-<hkern u1="&#x422;" u2="&#x481;" k="143" />
-<hkern u1="&#x422;" u2="&#x480;" k="41" />
-<hkern u1="&#x422;" u2="&#x47f;" k="41" />
-<hkern u1="&#x422;" u2="&#x47e;" k="41" />
-<hkern u1="&#x422;" u2="&#x47d;" k="143" />
-<hkern u1="&#x422;" u2="&#x47c;" k="41" />
-<hkern u1="&#x422;" u2="&#x47b;" k="143" />
-<hkern u1="&#x422;" u2="&#x47a;" k="41" />
-<hkern u1="&#x422;" u2="&#x479;" k="143" />
-<hkern u1="&#x422;" u2="&#x478;" k="41" />
-<hkern u1="&#x422;" u2="&#x477;" k="41" />
-<hkern u1="&#x422;" u2="&#x475;" k="41" />
-<hkern u1="&#x422;" u2="&#x473;" k="143" />
-<hkern u1="&#x422;" u2="&#x472;" k="41" />
-<hkern u1="&#x422;" u2="&#x471;" k="102" />
-<hkern u1="&#x422;" u2="&#x46d;" k="102" />
-<hkern u1="&#x422;" u2="&#x46b;" k="102" />
-<hkern u1="&#x422;" u2="&#x469;" k="102" />
-<hkern u1="&#x422;" u2="&#x467;" k="123" />
-<hkern u1="&#x422;" u2="&#x466;" k="143" />
-<hkern u1="&#x422;" u2="&#x465;" k="102" />
-<hkern u1="&#x422;" u2="&#x461;" k="41" />
-<hkern u1="&#x422;" u2="&#x460;" k="41" />
-<hkern u1="&#x422;" u2="&#x45f;" k="102" />
-<hkern u1="&#x422;" u2="&#x45e;" k="82" />
-<hkern u1="&#x422;" u2="&#x45d;" k="102" />
-<hkern u1="&#x422;" u2="&#x45c;" k="102" />
-<hkern u1="&#x422;" u2="&#x45a;" k="102" />
-<hkern u1="&#x422;" u2="&#x459;" k="123" />
-<hkern u1="&#x422;" u2="&#x455;" k="123" />
-<hkern u1="&#x422;" u2="&#x454;" k="143" />
-<hkern u1="&#x422;" u2="&#x453;" k="102" />
-<hkern u1="&#x422;" u2="&#x451;" k="143" />
-<hkern u1="&#x422;" u2="&#x450;" k="143" />
-<hkern u1="&#x422;" u2="&#x44f;" k="61" />
-<hkern u1="&#x422;" u2="&#x44e;" k="102" />
-<hkern u1="&#x422;" u2="&#x44d;" k="41" />
-<hkern u1="&#x422;" u2="&#x44c;" k="102" />
-<hkern u1="&#x422;" u2="&#x44b;" k="102" />
-<hkern u1="&#x422;" u2="&#x44a;" k="82" />
-<hkern u1="&#x422;" u2="&#x449;" k="102" />
-<hkern u1="&#x422;" u2="&#x448;" k="102" />
-<hkern u1="&#x422;" u2="&#x447;" k="102" />
-<hkern u1="&#x422;" u2="&#x446;" k="102" />
-<hkern u1="&#x422;" u2="&#x445;" k="41" />
-<hkern u1="&#x422;" u2="&#x444;" k="143" />
-<hkern u1="&#x422;" u2="&#x443;" k="82" />
-<hkern u1="&#x422;" u2="&#x442;" k="82" />
-<hkern u1="&#x422;" u2="&#x441;" k="143" />
-<hkern u1="&#x422;" u2="&#x440;" k="102" />
-<hkern u1="&#x422;" u2="&#x43f;" k="102" />
-<hkern u1="&#x422;" u2="&#x43e;" k="143" />
-<hkern u1="&#x422;" u2="&#x43d;" k="102" />
-<hkern u1="&#x422;" u2="&#x43c;" k="102" />
-<hkern u1="&#x422;" u2="&#x43b;" k="123" />
-<hkern u1="&#x422;" u2="&#x43a;" k="102" />
-<hkern u1="&#x422;" u2="&#x439;" k="102" />
-<hkern u1="&#x422;" u2="&#x438;" k="102" />
-<hkern u1="&#x422;" u2="&#x437;" k="41" />
-<hkern u1="&#x422;" u2="&#x436;" k="41" />
-<hkern u1="&#x422;" u2="&#x435;" k="143" />
-<hkern u1="&#x422;" u2="&#x434;" k="123" />
-<hkern u1="&#x422;" u2="&#x433;" k="102" />
-<hkern u1="&#x422;" u2="&#x432;" k="102" />
-<hkern u1="&#x422;" u2="&#x424;" k="82" />
-<hkern u1="&#x422;" u2="&#x422;" k="-41" />
-<hkern u1="&#x422;" u2="&#x421;" k="41" />
-<hkern u1="&#x422;" u2="&#x41e;" k="41" />
-<hkern u1="&#x422;" u2="&#x41b;" k="102" />
-<hkern u1="&#x422;" u2="&#x414;" k="102" />
-<hkern u1="&#x422;" u2="&#x410;" k="143" />
-<hkern u1="&#x422;" u2="&#x409;" k="102" />
-<hkern u1="&#x422;" u2="&#x404;" k="41" />
-<hkern u1="&#x422;" u2="&#x2e;" k="123" />
-<hkern u1="&#x422;" u2="&#x2d;" k="82" />
-<hkern u1="&#x422;" u2="&#x2c;" k="123" />
-<hkern u1="&#x423;" u2="&#x201e;" k="123" />
-<hkern u1="&#x423;" u2="&#x201a;" k="123" />
-<hkern u1="&#x423;" u2="&#x513;" k="82" />
-<hkern u1="&#x423;" u2="&#x512;" k="102" />
-<hkern u1="&#x423;" u2="&#x511;" k="41" />
-<hkern u1="&#x423;" u2="&#x50d;" k="41" />
-<hkern u1="&#x423;" u2="&#x50c;" k="20" />
-<hkern u1="&#x423;" u2="&#x509;" k="82" />
-<hkern u1="&#x423;" u2="&#x508;" k="102" />
-<hkern u1="&#x423;" u2="&#x503;" k="41" />
-<hkern u1="&#x423;" u2="&#x502;" k="143" />
-<hkern u1="&#x423;" u2="&#x501;" k="41" />
-<hkern u1="&#x423;" u2="&#x500;" k="143" />
-<hkern u1="&#x423;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x423;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x423;" u2="&#x4ea;" k="20" />
-<hkern u1="&#x423;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x423;" u2="&#x4e8;" k="20" />
-<hkern u1="&#x423;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x423;" u2="&#x4e6;" k="20" />
-<hkern u1="&#x423;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x423;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x423;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x423;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x423;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x423;" u2="&#x4c6;" k="82" />
-<hkern u1="&#x423;" u2="&#x4c5;" k="102" />
-<hkern u1="&#x423;" u2="&#x4bf;" k="61" />
-<hkern u1="&#x423;" u2="&#x4be;" k="41" />
-<hkern u1="&#x423;" u2="&#x4bd;" k="61" />
-<hkern u1="&#x423;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x423;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x423;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x423;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x423;" u2="&#x4aa;" k="20" />
-<hkern u1="&#x423;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x423;" u2="&#x4a8;" k="20" />
-<hkern u1="&#x423;" u2="&#x49f;" k="-102" />
-<hkern u1="&#x423;" u2="&#x48d;" k="-102" />
-<hkern u1="&#x423;" u2="&#x481;" k="41" />
-<hkern u1="&#x423;" u2="&#x480;" k="20" />
-<hkern u1="&#x423;" u2="&#x47e;" k="20" />
-<hkern u1="&#x423;" u2="&#x47d;" k="41" />
-<hkern u1="&#x423;" u2="&#x47c;" k="20" />
-<hkern u1="&#x423;" u2="&#x47b;" k="41" />
-<hkern u1="&#x423;" u2="&#x47a;" k="20" />
-<hkern u1="&#x423;" u2="&#x479;" k="41" />
-<hkern u1="&#x423;" u2="&#x478;" k="20" />
-<hkern u1="&#x423;" u2="&#x473;" k="41" />
-<hkern u1="&#x423;" u2="&#x472;" k="20" />
-<hkern u1="&#x423;" u2="&#x467;" k="82" />
-<hkern u1="&#x423;" u2="&#x466;" k="143" />
-<hkern u1="&#x423;" u2="&#x460;" k="20" />
-<hkern u1="&#x423;" u2="&#x45b;" k="-102" />
-<hkern u1="&#x423;" u2="&#x459;" k="82" />
-<hkern u1="&#x423;" u2="&#x455;" k="20" />
-<hkern u1="&#x423;" u2="&#x454;" k="41" />
-<hkern u1="&#x423;" u2="&#x452;" k="-102" />
-<hkern u1="&#x423;" u2="&#x451;" k="41" />
-<hkern u1="&#x423;" u2="&#x450;" k="41" />
-<hkern u1="&#x423;" u2="&#x447;" k="41" />
-<hkern u1="&#x423;" u2="&#x444;" k="41" />
-<hkern u1="&#x423;" u2="&#x441;" k="41" />
-<hkern u1="&#x423;" u2="&#x43e;" k="41" />
-<hkern u1="&#x423;" u2="&#x43b;" k="82" />
-<hkern u1="&#x423;" u2="&#x435;" k="41" />
-<hkern u1="&#x423;" u2="&#x434;" k="82" />
-<hkern u1="&#x423;" u2="&#x42f;" k="20" />
-<hkern u1="&#x423;" u2="&#x424;" k="61" />
-<hkern u1="&#x423;" u2="&#x421;" k="20" />
-<hkern u1="&#x423;" u2="&#x41e;" k="20" />
-<hkern u1="&#x423;" u2="&#x41b;" k="102" />
-<hkern u1="&#x423;" u2="&#x414;" k="102" />
-<hkern u1="&#x423;" u2="&#x410;" k="143" />
-<hkern u1="&#x423;" u2="&#x409;" k="102" />
-<hkern u1="&#x423;" u2="&#x404;" k="20" />
-<hkern u1="&#x423;" u2="&#x2e;" k="123" />
-<hkern u1="&#x423;" u2="&#x2c;" k="123" />
-<hkern u1="&#x424;" u2="&#x201e;" k="82" />
-<hkern u1="&#x424;" u2="&#x201a;" k="82" />
-<hkern u1="&#x424;" u2="&#x513;" k="20" />
-<hkern u1="&#x424;" u2="&#x512;" k="41" />
-<hkern u1="&#x424;" u2="&#x50e;" k="41" />
-<hkern u1="&#x424;" u2="&#x509;" k="20" />
-<hkern u1="&#x424;" u2="&#x508;" k="41" />
-<hkern u1="&#x424;" u2="&#x506;" k="41" />
-<hkern u1="&#x424;" u2="&#x504;" k="41" />
-<hkern u1="&#x424;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x424;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x424;" u2="&#x4f2;" k="61" />
-<hkern u1="&#x424;" u2="&#x4f0;" k="61" />
-<hkern u1="&#x424;" u2="&#x4ee;" k="61" />
-<hkern u1="&#x424;" u2="&#x4ec;" k="41" />
-<hkern u1="&#x424;" u2="&#x4de;" k="41" />
-<hkern u1="&#x424;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x424;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x424;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x424;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x424;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x424;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x424;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x424;" u2="&#x4b4;" k="41" />
-<hkern u1="&#x424;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x424;" u2="&#x4b0;" k="61" />
-<hkern u1="&#x424;" u2="&#x4ae;" k="61" />
-<hkern u1="&#x424;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x424;" u2="&#x4a0;" k="41" />
-<hkern u1="&#x424;" u2="&#x498;" k="41" />
-<hkern u1="&#x424;" u2="&#x496;" k="41" />
-<hkern u1="&#x424;" u2="&#x476;" k="20" />
-<hkern u1="&#x424;" u2="&#x474;" k="20" />
-<hkern u1="&#x424;" u2="&#x46e;" k="41" />
-<hkern u1="&#x424;" u2="&#x467;" k="20" />
-<hkern u1="&#x424;" u2="&#x466;" k="41" />
-<hkern u1="&#x424;" u2="&#x459;" k="20" />
-<hkern u1="&#x424;" u2="&#x43b;" k="20" />
-<hkern u1="&#x424;" u2="&#x434;" k="20" />
-<hkern u1="&#x424;" u2="&#x42d;" k="41" />
-<hkern u1="&#x424;" u2="&#x42a;" k="41" />
-<hkern u1="&#x424;" u2="&#x425;" k="41" />
-<hkern u1="&#x424;" u2="&#x423;" k="61" />
-<hkern u1="&#x424;" u2="&#x422;" k="61" />
-<hkern u1="&#x424;" u2="&#x41b;" k="41" />
-<hkern u1="&#x424;" u2="&#x417;" k="41" />
-<hkern u1="&#x424;" u2="&#x416;" k="41" />
-<hkern u1="&#x424;" u2="&#x414;" k="41" />
-<hkern u1="&#x424;" u2="&#x410;" k="41" />
-<hkern u1="&#x424;" u2="&#x40e;" k="61" />
-<hkern u1="&#x424;" u2="&#x40b;" k="41" />
-<hkern u1="&#x424;" u2="&#x409;" k="41" />
-<hkern u1="&#x424;" u2="&#x402;" k="41" />
-<hkern u1="&#x424;" u2="&#x2e;" k="82" />
-<hkern u1="&#x424;" u2="&#x2c;" k="82" />
-<hkern u1="&#x425;" u2="&#x510;" k="20" />
-<hkern u1="&#x425;" u2="&#x50c;" k="41" />
-<hkern u1="&#x425;" u2="&#x507;" k="41" />
-<hkern u1="&#x425;" u2="&#x505;" k="41" />
-<hkern u1="&#x425;" u2="&#x502;" k="41" />
-<hkern u1="&#x425;" u2="&#x500;" k="41" />
-<hkern u1="&#x425;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x425;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x425;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x425;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x425;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x425;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x425;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x425;" u2="&#x4be;" k="102" />
-<hkern u1="&#x425;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x425;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x425;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x425;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x425;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x425;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x425;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x425;" u2="&#x480;" k="41" />
-<hkern u1="&#x425;" u2="&#x47e;" k="41" />
-<hkern u1="&#x425;" u2="&#x47c;" k="41" />
-<hkern u1="&#x425;" u2="&#x47a;" k="41" />
-<hkern u1="&#x425;" u2="&#x478;" k="41" />
-<hkern u1="&#x425;" u2="&#x472;" k="41" />
-<hkern u1="&#x425;" u2="&#x470;" k="41" />
-<hkern u1="&#x425;" u2="&#x460;" k="41" />
-<hkern u1="&#x425;" u2="&#x447;" k="41" />
-<hkern u1="&#x425;" u2="&#x427;" k="41" />
-<hkern u1="&#x425;" u2="&#x424;" k="41" />
-<hkern u1="&#x425;" u2="&#x421;" k="41" />
-<hkern u1="&#x425;" u2="&#x41e;" k="41" />
-<hkern u1="&#x425;" u2="&#x404;" k="41" />
-<hkern u1="&#x426;" u2="&#x507;" k="41" />
-<hkern u1="&#x426;" u2="&#x505;" k="41" />
-<hkern u1="&#x426;" u2="&#x4e1;" k="-41" />
-<hkern u1="&#x426;" u2="&#x408;" k="-225" />
-<hkern u1="&#x429;" u2="&#x507;" k="41" />
-<hkern u1="&#x429;" u2="&#x505;" k="41" />
-<hkern u1="&#x429;" u2="&#x4e1;" k="-41" />
-<hkern u1="&#x429;" u2="&#x408;" k="-225" />
-<hkern u1="&#x42a;" u2="&#x201d;" k="82" />
-<hkern u1="&#x42a;" u2="&#x2019;" k="82" />
-<hkern u1="&#x42a;" u2="&#x50f;" k="41" />
-<hkern u1="&#x42a;" u2="&#x50e;" k="123" />
-<hkern u1="&#x42a;" u2="&#x507;" k="61" />
-<hkern u1="&#x42a;" u2="&#x506;" k="102" />
-<hkern u1="&#x42a;" u2="&#x505;" k="61" />
-<hkern u1="&#x42a;" u2="&#x504;" k="102" />
-<hkern u1="&#x42a;" u2="&#x4fa;" k="82" />
-<hkern u1="&#x42a;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4f4;" k="102" />
-<hkern u1="&#x42a;" u2="&#x4f3;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4f1;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4ef;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4cb;" k="102" />
-<hkern u1="&#x42a;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4b8;" k="102" />
-<hkern u1="&#x42a;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4b6;" k="102" />
-<hkern u1="&#x42a;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4b4;" k="123" />
-<hkern u1="&#x42a;" u2="&#x4b1;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4b0;" k="102" />
-<hkern u1="&#x42a;" u2="&#x4af;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4ae;" k="102" />
-<hkern u1="&#x42a;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4ac;" k="102" />
-<hkern u1="&#x42a;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x42a;" u2="&#x4a0;" k="123" />
-<hkern u1="&#x42a;" u2="&#x49e;" k="82" />
-<hkern u1="&#x42a;" u2="&#x492;" k="82" />
-<hkern u1="&#x42a;" u2="&#x48c;" k="82" />
-<hkern u1="&#x42a;" u2="&#x476;" k="82" />
-<hkern u1="&#x42a;" u2="&#x474;" k="82" />
-<hkern u1="&#x42a;" u2="&#x470;" k="102" />
-<hkern u1="&#x42a;" u2="&#x462;" k="82" />
-<hkern u1="&#x42a;" u2="&#x45e;" k="41" />
-<hkern u1="&#x42a;" u2="&#x44a;" k="41" />
-<hkern u1="&#x42a;" u2="&#x447;" k="41" />
-<hkern u1="&#x42a;" u2="&#x443;" k="41" />
-<hkern u1="&#x42a;" u2="&#x442;" k="41" />
-<hkern u1="&#x42a;" u2="&#x42a;" k="123" />
-<hkern u1="&#x42a;" u2="&#x427;" k="102" />
-<hkern u1="&#x42a;" u2="&#x423;" k="41" />
-<hkern u1="&#x42a;" u2="&#x422;" k="102" />
-<hkern u1="&#x42a;" u2="&#x40e;" k="41" />
-<hkern u1="&#x42a;" u2="&#x40b;" k="123" />
-<hkern u1="&#x42a;" u2="&#x402;" k="123" />
-<hkern u1="&#x42a;" u2="&#x27;" k="82" />
-<hkern u1="&#x42a;" u2="&#x22;" k="82" />
-<hkern u1="&#x42c;" u2="&#x201d;" k="82" />
-<hkern u1="&#x42c;" u2="&#x2019;" k="82" />
-<hkern u1="&#x42c;" u2="&#x50f;" k="41" />
-<hkern u1="&#x42c;" u2="&#x50e;" k="123" />
-<hkern u1="&#x42c;" u2="&#x507;" k="61" />
-<hkern u1="&#x42c;" u2="&#x506;" k="102" />
-<hkern u1="&#x42c;" u2="&#x505;" k="61" />
-<hkern u1="&#x42c;" u2="&#x504;" k="102" />
-<hkern u1="&#x42c;" u2="&#x4fa;" k="82" />
-<hkern u1="&#x42c;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4f4;" k="102" />
-<hkern u1="&#x42c;" u2="&#x4f3;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4f1;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4ef;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4cb;" k="102" />
-<hkern u1="&#x42c;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4b8;" k="102" />
-<hkern u1="&#x42c;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4b6;" k="102" />
-<hkern u1="&#x42c;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4b4;" k="123" />
-<hkern u1="&#x42c;" u2="&#x4b1;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4b0;" k="102" />
-<hkern u1="&#x42c;" u2="&#x4af;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4ae;" k="102" />
-<hkern u1="&#x42c;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4ac;" k="102" />
-<hkern u1="&#x42c;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x42c;" u2="&#x4a0;" k="123" />
-<hkern u1="&#x42c;" u2="&#x49e;" k="82" />
-<hkern u1="&#x42c;" u2="&#x492;" k="82" />
-<hkern u1="&#x42c;" u2="&#x48c;" k="82" />
-<hkern u1="&#x42c;" u2="&#x476;" k="82" />
-<hkern u1="&#x42c;" u2="&#x474;" k="82" />
-<hkern u1="&#x42c;" u2="&#x470;" k="102" />
-<hkern u1="&#x42c;" u2="&#x462;" k="82" />
-<hkern u1="&#x42c;" u2="&#x45e;" k="41" />
-<hkern u1="&#x42c;" u2="&#x44a;" k="41" />
-<hkern u1="&#x42c;" u2="&#x447;" k="41" />
-<hkern u1="&#x42c;" u2="&#x443;" k="41" />
-<hkern u1="&#x42c;" u2="&#x442;" k="41" />
-<hkern u1="&#x42c;" u2="&#x42a;" k="123" />
-<hkern u1="&#x42c;" u2="&#x427;" k="102" />
-<hkern u1="&#x42c;" u2="&#x423;" k="41" />
-<hkern u1="&#x42c;" u2="&#x422;" k="102" />
-<hkern u1="&#x42c;" u2="&#x40e;" k="41" />
-<hkern u1="&#x42c;" u2="&#x40b;" k="123" />
-<hkern u1="&#x42c;" u2="&#x402;" k="123" />
-<hkern u1="&#x42c;" u2="&#x27;" k="82" />
-<hkern u1="&#x42c;" u2="&#x22;" k="82" />
-<hkern u1="&#x42d;" u2="&#x201e;" k="82" />
-<hkern u1="&#x42d;" u2="&#x201a;" k="82" />
-<hkern u1="&#x42d;" u2="&#x513;" k="20" />
-<hkern u1="&#x42d;" u2="&#x512;" k="41" />
-<hkern u1="&#x42d;" u2="&#x50e;" k="20" />
-<hkern u1="&#x42d;" u2="&#x509;" k="20" />
-<hkern u1="&#x42d;" u2="&#x508;" k="41" />
-<hkern u1="&#x42d;" u2="&#x506;" k="41" />
-<hkern u1="&#x42d;" u2="&#x504;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x42d;" u2="&#x4de;" k="20" />
-<hkern u1="&#x42d;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x42d;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x42d;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x42d;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x42d;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x42d;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x42d;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x42d;" u2="&#x498;" k="20" />
-<hkern u1="&#x42d;" u2="&#x496;" k="41" />
-<hkern u1="&#x42d;" u2="&#x476;" k="20" />
-<hkern u1="&#x42d;" u2="&#x474;" k="20" />
-<hkern u1="&#x42d;" u2="&#x470;" k="41" />
-<hkern u1="&#x42d;" u2="&#x46e;" k="20" />
-<hkern u1="&#x42d;" u2="&#x467;" k="20" />
-<hkern u1="&#x42d;" u2="&#x466;" k="41" />
-<hkern u1="&#x42d;" u2="&#x459;" k="20" />
-<hkern u1="&#x42d;" u2="&#x43b;" k="20" />
-<hkern u1="&#x42d;" u2="&#x434;" k="20" />
-<hkern u1="&#x42d;" u2="&#x42d;" k="20" />
-<hkern u1="&#x42d;" u2="&#x42a;" k="20" />
-<hkern u1="&#x42d;" u2="&#x427;" k="41" />
-<hkern u1="&#x42d;" u2="&#x425;" k="41" />
-<hkern u1="&#x42d;" u2="&#x423;" k="41" />
-<hkern u1="&#x42d;" u2="&#x422;" k="61" />
-<hkern u1="&#x42d;" u2="&#x41b;" k="41" />
-<hkern u1="&#x42d;" u2="&#x417;" k="20" />
-<hkern u1="&#x42d;" u2="&#x416;" k="41" />
-<hkern u1="&#x42d;" u2="&#x414;" k="41" />
-<hkern u1="&#x42d;" u2="&#x410;" k="41" />
-<hkern u1="&#x42d;" u2="&#x40e;" k="41" />
-<hkern u1="&#x42d;" u2="&#x40b;" k="20" />
-<hkern u1="&#x42d;" u2="&#x409;" k="41" />
-<hkern u1="&#x42d;" u2="&#x402;" k="20" />
-<hkern u1="&#x42d;" u2="&#x2e;" k="82" />
-<hkern u1="&#x42d;" u2="&#x2c;" k="82" />
-<hkern u1="&#x42e;" u2="&#x201e;" k="82" />
-<hkern u1="&#x42e;" u2="&#x201a;" k="82" />
-<hkern u1="&#x42e;" u2="&#x513;" k="20" />
-<hkern u1="&#x42e;" u2="&#x512;" k="41" />
-<hkern u1="&#x42e;" u2="&#x50e;" k="20" />
-<hkern u1="&#x42e;" u2="&#x509;" k="20" />
-<hkern u1="&#x42e;" u2="&#x508;" k="41" />
-<hkern u1="&#x42e;" u2="&#x506;" k="41" />
-<hkern u1="&#x42e;" u2="&#x504;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x42e;" u2="&#x4de;" k="20" />
-<hkern u1="&#x42e;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x42e;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x42e;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x42e;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x42e;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x42e;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x42e;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x42e;" u2="&#x498;" k="20" />
-<hkern u1="&#x42e;" u2="&#x496;" k="41" />
-<hkern u1="&#x42e;" u2="&#x476;" k="20" />
-<hkern u1="&#x42e;" u2="&#x474;" k="20" />
-<hkern u1="&#x42e;" u2="&#x470;" k="41" />
-<hkern u1="&#x42e;" u2="&#x46e;" k="20" />
-<hkern u1="&#x42e;" u2="&#x467;" k="20" />
-<hkern u1="&#x42e;" u2="&#x466;" k="41" />
-<hkern u1="&#x42e;" u2="&#x459;" k="20" />
-<hkern u1="&#x42e;" u2="&#x43b;" k="20" />
-<hkern u1="&#x42e;" u2="&#x434;" k="20" />
-<hkern u1="&#x42e;" u2="&#x42d;" k="20" />
-<hkern u1="&#x42e;" u2="&#x42a;" k="20" />
-<hkern u1="&#x42e;" u2="&#x427;" k="41" />
-<hkern u1="&#x42e;" u2="&#x425;" k="41" />
-<hkern u1="&#x42e;" u2="&#x423;" k="41" />
-<hkern u1="&#x42e;" u2="&#x422;" k="61" />
-<hkern u1="&#x42e;" u2="&#x41b;" k="41" />
-<hkern u1="&#x42e;" u2="&#x417;" k="20" />
-<hkern u1="&#x42e;" u2="&#x416;" k="41" />
-<hkern u1="&#x42e;" u2="&#x414;" k="41" />
-<hkern u1="&#x42e;" u2="&#x410;" k="41" />
-<hkern u1="&#x42e;" u2="&#x40e;" k="41" />
-<hkern u1="&#x42e;" u2="&#x40b;" k="20" />
-<hkern u1="&#x42e;" u2="&#x409;" k="41" />
-<hkern u1="&#x42e;" u2="&#x402;" k="20" />
-<hkern u1="&#x42e;" u2="&#x2e;" k="82" />
-<hkern u1="&#x42e;" u2="&#x2c;" k="82" />
-<hkern u1="&#x430;" u2="&#x201d;" k="20" />
-<hkern u1="&#x430;" u2="&#x2019;" k="20" />
-<hkern u1="&#x430;" u2="&#x27;" k="20" />
-<hkern u1="&#x430;" u2="&#x22;" k="20" />
-<hkern u1="&#x432;" u2="&#x44f;" k="-41" />
-<hkern u1="&#x433;" u2="&#x201e;" k="102" />
-<hkern u1="&#x433;" u2="&#x201a;" k="102" />
-<hkern u1="&#x433;" u2="&#x2015;" k="41" />
-<hkern u1="&#x433;" u2="&#x2014;" k="41" />
-<hkern u1="&#x433;" u2="&#x2013;" k="41" />
-<hkern u1="&#x433;" u2="&#x513;" k="61" />
-<hkern u1="&#x433;" u2="&#x511;" k="20" />
-<hkern u1="&#x433;" u2="&#x50d;" k="20" />
-<hkern u1="&#x433;" u2="&#x509;" k="61" />
-<hkern u1="&#x433;" u2="&#x503;" k="20" />
-<hkern u1="&#x433;" u2="&#x501;" k="20" />
-<hkern u1="&#x433;" u2="&#x4eb;" k="20" />
-<hkern u1="&#x433;" u2="&#x4e9;" k="20" />
-<hkern u1="&#x433;" u2="&#x4e7;" k="20" />
-<hkern u1="&#x433;" u2="&#x4d7;" k="20" />
-<hkern u1="&#x433;" u2="&#x4c6;" k="61" />
-<hkern u1="&#x433;" u2="&#x4ab;" k="20" />
-<hkern u1="&#x433;" u2="&#x4a9;" k="20" />
-<hkern u1="&#x433;" u2="&#x481;" k="20" />
-<hkern u1="&#x433;" u2="&#x47d;" k="20" />
-<hkern u1="&#x433;" u2="&#x47b;" k="20" />
-<hkern u1="&#x433;" u2="&#x479;" k="20" />
-<hkern u1="&#x433;" u2="&#x473;" k="20" />
-<hkern u1="&#x433;" u2="&#x467;" k="61" />
-<hkern u1="&#x433;" u2="&#x459;" k="61" />
-<hkern u1="&#x433;" u2="&#x454;" k="20" />
-<hkern u1="&#x433;" u2="&#x451;" k="20" />
-<hkern u1="&#x433;" u2="&#x450;" k="20" />
-<hkern u1="&#x433;" u2="&#x444;" k="20" />
-<hkern u1="&#x433;" u2="&#x441;" k="20" />
-<hkern u1="&#x433;" u2="&#x43e;" k="20" />
-<hkern u1="&#x433;" u2="&#x43b;" k="61" />
-<hkern u1="&#x433;" u2="&#x435;" k="20" />
-<hkern u1="&#x433;" u2="&#x434;" k="61" />
-<hkern u1="&#x433;" u2="&#x2e;" k="102" />
-<hkern u1="&#x433;" u2="&#x2d;" k="41" />
-<hkern u1="&#x433;" u2="&#x2c;" k="102" />
-<hkern u1="&#x434;" u2="&#x201d;" k="20" />
-<hkern u1="&#x434;" u2="&#x2019;" k="20" />
-<hkern u1="&#x434;" u2="&#x27;" k="20" />
-<hkern u1="&#x434;" u2="&#x22;" k="20" />
-<hkern u1="&#x435;" u2="&#x201d;" k="20" />
-<hkern u1="&#x435;" u2="&#x2019;" k="20" />
-<hkern u1="&#x435;" u2="&#x27;" k="20" />
-<hkern u1="&#x435;" u2="&#x22;" k="20" />
-<hkern u1="&#x436;" u2="&#x511;" k="41" />
-<hkern u1="&#x436;" u2="&#x50d;" k="41" />
-<hkern u1="&#x436;" u2="&#x503;" k="41" />
-<hkern u1="&#x436;" u2="&#x501;" k="41" />
-<hkern u1="&#x436;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x436;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x436;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x436;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x436;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x436;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x436;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x436;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x436;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x436;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x436;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x436;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x436;" u2="&#x481;" k="41" />
-<hkern u1="&#x436;" u2="&#x47d;" k="41" />
-<hkern u1="&#x436;" u2="&#x47b;" k="41" />
-<hkern u1="&#x436;" u2="&#x479;" k="41" />
-<hkern u1="&#x436;" u2="&#x473;" k="41" />
-<hkern u1="&#x436;" u2="&#x454;" k="41" />
-<hkern u1="&#x436;" u2="&#x451;" k="41" />
-<hkern u1="&#x436;" u2="&#x450;" k="41" />
-<hkern u1="&#x436;" u2="&#x447;" k="41" />
-<hkern u1="&#x436;" u2="&#x444;" k="41" />
-<hkern u1="&#x436;" u2="&#x441;" k="41" />
-<hkern u1="&#x436;" u2="&#x43e;" k="41" />
-<hkern u1="&#x436;" u2="&#x435;" k="41" />
-<hkern u1="&#x437;" u2="&#x44f;" k="-41" />
-<hkern u1="&#x43a;" u2="&#x511;" k="41" />
-<hkern u1="&#x43a;" u2="&#x50d;" k="41" />
-<hkern u1="&#x43a;" u2="&#x503;" k="41" />
-<hkern u1="&#x43a;" u2="&#x501;" k="41" />
-<hkern u1="&#x43a;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x43a;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x43a;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x43a;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x43a;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x43a;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x43a;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x43a;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x43a;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x43a;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x43a;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x43a;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x43a;" u2="&#x481;" k="41" />
-<hkern u1="&#x43a;" u2="&#x47d;" k="41" />
-<hkern u1="&#x43a;" u2="&#x47b;" k="41" />
-<hkern u1="&#x43a;" u2="&#x479;" k="41" />
-<hkern u1="&#x43a;" u2="&#x473;" k="41" />
-<hkern u1="&#x43a;" u2="&#x454;" k="41" />
-<hkern u1="&#x43a;" u2="&#x451;" k="41" />
-<hkern u1="&#x43a;" u2="&#x450;" k="41" />
-<hkern u1="&#x43a;" u2="&#x447;" k="41" />
-<hkern u1="&#x43a;" u2="&#x444;" k="41" />
-<hkern u1="&#x43a;" u2="&#x441;" k="41" />
-<hkern u1="&#x43a;" u2="&#x43e;" k="41" />
-<hkern u1="&#x43a;" u2="&#x435;" k="41" />
-<hkern u1="&#x43e;" u2="&#x201d;" k="20" />
-<hkern u1="&#x43e;" u2="&#x2019;" k="20" />
-<hkern u1="&#x43e;" u2="&#x50f;" k="20" />
-<hkern u1="&#x43e;" u2="&#x507;" k="20" />
-<hkern u1="&#x43e;" u2="&#x505;" k="20" />
-<hkern u1="&#x43e;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x43e;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x43e;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x43e;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x43e;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x43e;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x43e;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x43e;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x43e;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x43e;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x43e;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x43e;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x43e;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x43e;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x43e;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x43e;" u2="&#x497;" k="41" />
-<hkern u1="&#x43e;" u2="&#x45e;" k="20" />
-<hkern u1="&#x43e;" u2="&#x44a;" k="20" />
-<hkern u1="&#x43e;" u2="&#x447;" k="20" />
-<hkern u1="&#x43e;" u2="&#x445;" k="41" />
-<hkern u1="&#x43e;" u2="&#x443;" k="20" />
-<hkern u1="&#x43e;" u2="&#x442;" k="20" />
-<hkern u1="&#x43e;" u2="&#x436;" k="41" />
-<hkern u1="&#x43e;" u2="&#x27;" k="20" />
-<hkern u1="&#x43e;" u2="&#x22;" k="20" />
-<hkern u1="&#x440;" u2="&#x201d;" k="20" />
-<hkern u1="&#x440;" u2="&#x2019;" k="20" />
-<hkern u1="&#x440;" u2="&#x50f;" k="20" />
-<hkern u1="&#x440;" u2="&#x507;" k="20" />
-<hkern u1="&#x440;" u2="&#x505;" k="20" />
-<hkern u1="&#x440;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x440;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x440;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x440;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x440;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x440;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x440;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x440;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x440;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x440;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x440;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x440;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x440;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x440;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x440;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x440;" u2="&#x497;" k="41" />
-<hkern u1="&#x440;" u2="&#x45e;" k="20" />
-<hkern u1="&#x440;" u2="&#x44a;" k="20" />
-<hkern u1="&#x440;" u2="&#x447;" k="20" />
-<hkern u1="&#x440;" u2="&#x445;" k="41" />
-<hkern u1="&#x440;" u2="&#x443;" k="20" />
-<hkern u1="&#x440;" u2="&#x442;" k="20" />
-<hkern u1="&#x440;" u2="&#x436;" k="41" />
-<hkern u1="&#x440;" u2="&#x27;" k="20" />
-<hkern u1="&#x440;" u2="&#x22;" k="20" />
-<hkern u1="&#x442;" u2="&#x201e;" k="102" />
-<hkern u1="&#x442;" u2="&#x201a;" k="102" />
-<hkern u1="&#x442;" u2="&#x2015;" k="41" />
-<hkern u1="&#x442;" u2="&#x2014;" k="41" />
-<hkern u1="&#x442;" u2="&#x2013;" k="41" />
-<hkern u1="&#x442;" u2="&#x513;" k="61" />
-<hkern u1="&#x442;" u2="&#x511;" k="20" />
-<hkern u1="&#x442;" u2="&#x50d;" k="20" />
-<hkern u1="&#x442;" u2="&#x509;" k="61" />
-<hkern u1="&#x442;" u2="&#x503;" k="20" />
-<hkern u1="&#x442;" u2="&#x501;" k="20" />
-<hkern u1="&#x442;" u2="&#x4eb;" k="20" />
-<hkern u1="&#x442;" u2="&#x4e9;" k="20" />
-<hkern u1="&#x442;" u2="&#x4e7;" k="20" />
-<hkern u1="&#x442;" u2="&#x4d7;" k="20" />
-<hkern u1="&#x442;" u2="&#x4c6;" k="61" />
-<hkern u1="&#x442;" u2="&#x4ab;" k="20" />
-<hkern u1="&#x442;" u2="&#x4a9;" k="20" />
-<hkern u1="&#x442;" u2="&#x481;" k="20" />
-<hkern u1="&#x442;" u2="&#x47d;" k="20" />
-<hkern u1="&#x442;" u2="&#x47b;" k="20" />
-<hkern u1="&#x442;" u2="&#x479;" k="20" />
-<hkern u1="&#x442;" u2="&#x473;" k="20" />
-<hkern u1="&#x442;" u2="&#x467;" k="61" />
-<hkern u1="&#x442;" u2="&#x459;" k="61" />
-<hkern u1="&#x442;" u2="&#x454;" k="20" />
-<hkern u1="&#x442;" u2="&#x451;" k="20" />
-<hkern u1="&#x442;" u2="&#x450;" k="20" />
-<hkern u1="&#x442;" u2="&#x444;" k="20" />
-<hkern u1="&#x442;" u2="&#x441;" k="20" />
-<hkern u1="&#x442;" u2="&#x43e;" k="20" />
-<hkern u1="&#x442;" u2="&#x43b;" k="61" />
-<hkern u1="&#x442;" u2="&#x435;" k="20" />
-<hkern u1="&#x442;" u2="&#x434;" k="61" />
-<hkern u1="&#x442;" u2="&#x2e;" k="102" />
-<hkern u1="&#x442;" u2="&#x2d;" k="41" />
-<hkern u1="&#x442;" u2="&#x2c;" k="102" />
-<hkern u1="&#x443;" u2="&#x201e;" k="82" />
-<hkern u1="&#x443;" u2="&#x201a;" k="82" />
-<hkern u1="&#x443;" u2="&#x513;" k="41" />
-<hkern u1="&#x443;" u2="&#x509;" k="41" />
-<hkern u1="&#x443;" u2="&#x4c6;" k="41" />
-<hkern u1="&#x443;" u2="&#x467;" k="41" />
-<hkern u1="&#x443;" u2="&#x459;" k="41" />
-<hkern u1="&#x443;" u2="&#x43b;" k="41" />
-<hkern u1="&#x443;" u2="&#x434;" k="41" />
-<hkern u1="&#x443;" u2="&#x2e;" k="82" />
-<hkern u1="&#x443;" u2="&#x2c;" k="82" />
-<hkern u1="&#x444;" u2="&#x201d;" k="20" />
-<hkern u1="&#x444;" u2="&#x2019;" k="20" />
-<hkern u1="&#x444;" u2="&#x50f;" k="20" />
-<hkern u1="&#x444;" u2="&#x507;" k="20" />
-<hkern u1="&#x444;" u2="&#x505;" k="20" />
-<hkern u1="&#x444;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x444;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x444;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x444;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x444;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x444;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x444;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x444;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x444;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x444;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x444;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x444;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x444;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x444;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x444;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x444;" u2="&#x497;" k="41" />
-<hkern u1="&#x444;" u2="&#x45e;" k="20" />
-<hkern u1="&#x444;" u2="&#x44a;" k="20" />
-<hkern u1="&#x444;" u2="&#x447;" k="20" />
-<hkern u1="&#x444;" u2="&#x445;" k="41" />
-<hkern u1="&#x444;" u2="&#x443;" k="20" />
-<hkern u1="&#x444;" u2="&#x442;" k="20" />
-<hkern u1="&#x444;" u2="&#x436;" k="41" />
-<hkern u1="&#x444;" u2="&#x27;" k="20" />
-<hkern u1="&#x444;" u2="&#x22;" k="20" />
-<hkern u1="&#x445;" u2="&#x511;" k="41" />
-<hkern u1="&#x445;" u2="&#x50d;" k="41" />
-<hkern u1="&#x445;" u2="&#x503;" k="41" />
-<hkern u1="&#x445;" u2="&#x501;" k="41" />
-<hkern u1="&#x445;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x445;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x445;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x445;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x445;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x445;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x445;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x445;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x445;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x445;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x445;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x445;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x445;" u2="&#x481;" k="41" />
-<hkern u1="&#x445;" u2="&#x47d;" k="41" />
-<hkern u1="&#x445;" u2="&#x47b;" k="41" />
-<hkern u1="&#x445;" u2="&#x479;" k="41" />
-<hkern u1="&#x445;" u2="&#x473;" k="41" />
-<hkern u1="&#x445;" u2="&#x454;" k="41" />
-<hkern u1="&#x445;" u2="&#x451;" k="41" />
-<hkern u1="&#x445;" u2="&#x450;" k="41" />
-<hkern u1="&#x445;" u2="&#x447;" k="41" />
-<hkern u1="&#x445;" u2="&#x444;" k="41" />
-<hkern u1="&#x445;" u2="&#x441;" k="41" />
-<hkern u1="&#x445;" u2="&#x43e;" k="41" />
-<hkern u1="&#x445;" u2="&#x435;" k="41" />
-<hkern u1="&#x446;" u2="&#x201d;" k="20" />
-<hkern u1="&#x446;" u2="&#x2019;" k="20" />
-<hkern u1="&#x446;" u2="&#x27;" k="20" />
-<hkern u1="&#x446;" u2="&#x22;" k="20" />
-<hkern u1="&#x449;" u2="&#x201d;" k="20" />
-<hkern u1="&#x449;" u2="&#x2019;" k="20" />
-<hkern u1="&#x449;" u2="&#x27;" k="20" />
-<hkern u1="&#x449;" u2="&#x22;" k="20" />
-<hkern u1="&#x44a;" u2="&#x201d;" k="123" />
-<hkern u1="&#x44a;" u2="&#x2019;" k="123" />
-<hkern u1="&#x44a;" u2="&#x50f;" k="102" />
-<hkern u1="&#x44a;" u2="&#x507;" k="102" />
-<hkern u1="&#x44a;" u2="&#x505;" k="102" />
-<hkern u1="&#x44a;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x44a;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x44a;" u2="&#x4f5;" k="82" />
-<hkern u1="&#x44a;" u2="&#x4f3;" k="61" />
-<hkern u1="&#x44a;" u2="&#x4f1;" k="61" />
-<hkern u1="&#x44a;" u2="&#x4ef;" k="61" />
-<hkern u1="&#x44a;" u2="&#x4e1;" k="41" />
-<hkern u1="&#x44a;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x44a;" u2="&#x4cc;" k="82" />
-<hkern u1="&#x44a;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x44a;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x44a;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x44a;" u2="&#x4b9;" k="82" />
-<hkern u1="&#x44a;" u2="&#x4b7;" k="82" />
-<hkern u1="&#x44a;" u2="&#x4b5;" k="102" />
-<hkern u1="&#x44a;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x44a;" u2="&#x4b1;" k="61" />
-<hkern u1="&#x44a;" u2="&#x4af;" k="61" />
-<hkern u1="&#x44a;" u2="&#x4ad;" k="102" />
-<hkern u1="&#x44a;" u2="&#x4a1;" k="102" />
-<hkern u1="&#x44a;" u2="&#x497;" k="41" />
-<hkern u1="&#x44a;" u2="&#x47f;" k="41" />
-<hkern u1="&#x44a;" u2="&#x477;" k="41" />
-<hkern u1="&#x44a;" u2="&#x475;" k="41" />
-<hkern u1="&#x44a;" u2="&#x461;" k="41" />
-<hkern u1="&#x44a;" u2="&#x45e;" k="61" />
-<hkern u1="&#x44a;" u2="&#x44a;" k="102" />
-<hkern u1="&#x44a;" u2="&#x447;" k="82" />
-<hkern u1="&#x44a;" u2="&#x445;" k="41" />
-<hkern u1="&#x44a;" u2="&#x443;" k="61" />
-<hkern u1="&#x44a;" u2="&#x442;" k="102" />
-<hkern u1="&#x44a;" u2="&#x436;" k="41" />
-<hkern u1="&#x44a;" u2="&#x27;" k="123" />
-<hkern u1="&#x44a;" u2="&#x22;" k="123" />
-<hkern u1="&#x44c;" u2="&#x201d;" k="123" />
-<hkern u1="&#x44c;" u2="&#x2019;" k="123" />
-<hkern u1="&#x44c;" u2="&#x50f;" k="102" />
-<hkern u1="&#x44c;" u2="&#x507;" k="102" />
-<hkern u1="&#x44c;" u2="&#x505;" k="102" />
-<hkern u1="&#x44c;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x44c;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x44c;" u2="&#x4f5;" k="82" />
-<hkern u1="&#x44c;" u2="&#x4f3;" k="61" />
-<hkern u1="&#x44c;" u2="&#x4f1;" k="61" />
-<hkern u1="&#x44c;" u2="&#x4ef;" k="61" />
-<hkern u1="&#x44c;" u2="&#x4e1;" k="41" />
-<hkern u1="&#x44c;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x44c;" u2="&#x4cc;" k="82" />
-<hkern u1="&#x44c;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x44c;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x44c;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x44c;" u2="&#x4b9;" k="82" />
-<hkern u1="&#x44c;" u2="&#x4b7;" k="82" />
-<hkern u1="&#x44c;" u2="&#x4b5;" k="102" />
-<hkern u1="&#x44c;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x44c;" u2="&#x4b1;" k="61" />
-<hkern u1="&#x44c;" u2="&#x4af;" k="61" />
-<hkern u1="&#x44c;" u2="&#x4ad;" k="102" />
-<hkern u1="&#x44c;" u2="&#x4a1;" k="102" />
-<hkern u1="&#x44c;" u2="&#x497;" k="41" />
-<hkern u1="&#x44c;" u2="&#x47f;" k="41" />
-<hkern u1="&#x44c;" u2="&#x477;" k="41" />
-<hkern u1="&#x44c;" u2="&#x475;" k="41" />
-<hkern u1="&#x44c;" u2="&#x461;" k="41" />
-<hkern u1="&#x44c;" u2="&#x45e;" k="61" />
-<hkern u1="&#x44c;" u2="&#x44a;" k="102" />
-<hkern u1="&#x44c;" u2="&#x447;" k="82" />
-<hkern u1="&#x44c;" u2="&#x445;" k="41" />
-<hkern u1="&#x44c;" u2="&#x443;" k="61" />
-<hkern u1="&#x44c;" u2="&#x442;" k="102" />
-<hkern u1="&#x44c;" u2="&#x436;" k="41" />
-<hkern u1="&#x44c;" u2="&#x27;" k="123" />
-<hkern u1="&#x44c;" u2="&#x22;" k="123" />
-<hkern u1="&#x44d;" u2="&#x201d;" k="20" />
-<hkern u1="&#x44d;" u2="&#x2019;" k="20" />
-<hkern u1="&#x44d;" u2="&#x50f;" k="20" />
-<hkern u1="&#x44d;" u2="&#x507;" k="20" />
-<hkern u1="&#x44d;" u2="&#x505;" k="20" />
-<hkern u1="&#x44d;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x44d;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x44d;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x44d;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x44d;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x44d;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x44d;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x44d;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x44d;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x44d;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x44d;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x44d;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x44d;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x44d;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x44d;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x44d;" u2="&#x497;" k="41" />
-<hkern u1="&#x44d;" u2="&#x45e;" k="20" />
-<hkern u1="&#x44d;" u2="&#x44a;" k="20" />
-<hkern u1="&#x44d;" u2="&#x447;" k="20" />
-<hkern u1="&#x44d;" u2="&#x445;" k="41" />
-<hkern u1="&#x44d;" u2="&#x443;" k="20" />
-<hkern u1="&#x44d;" u2="&#x442;" k="20" />
-<hkern u1="&#x44d;" u2="&#x436;" k="41" />
-<hkern u1="&#x44d;" u2="&#x27;" k="20" />
-<hkern u1="&#x44d;" u2="&#x22;" k="20" />
-<hkern u1="&#x44e;" u2="&#x201d;" k="20" />
-<hkern u1="&#x44e;" u2="&#x2019;" k="20" />
-<hkern u1="&#x44e;" u2="&#x50f;" k="20" />
-<hkern u1="&#x44e;" u2="&#x507;" k="20" />
-<hkern u1="&#x44e;" u2="&#x505;" k="20" />
-<hkern u1="&#x44e;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x44e;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x44e;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x44e;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x44e;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x44e;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x44e;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x44e;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x44e;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x44e;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x44e;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x44e;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x44e;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x44e;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x44e;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x44e;" u2="&#x497;" k="41" />
-<hkern u1="&#x44e;" u2="&#x45e;" k="20" />
-<hkern u1="&#x44e;" u2="&#x44a;" k="20" />
-<hkern u1="&#x44e;" u2="&#x447;" k="20" />
-<hkern u1="&#x44e;" u2="&#x445;" k="41" />
-<hkern u1="&#x44e;" u2="&#x443;" k="20" />
-<hkern u1="&#x44e;" u2="&#x442;" k="20" />
-<hkern u1="&#x44e;" u2="&#x436;" k="41" />
-<hkern u1="&#x44e;" u2="&#x27;" k="20" />
-<hkern u1="&#x44e;" u2="&#x22;" k="20" />
-<hkern u1="&#x450;" u2="&#x201d;" k="20" />
-<hkern u1="&#x450;" u2="&#x2019;" k="20" />
-<hkern u1="&#x450;" u2="&#x27;" k="20" />
-<hkern u1="&#x450;" u2="&#x22;" k="20" />
-<hkern u1="&#x451;" u2="&#x201d;" k="20" />
-<hkern u1="&#x451;" u2="&#x2019;" k="20" />
-<hkern u1="&#x451;" u2="&#x27;" k="20" />
-<hkern u1="&#x451;" u2="&#x22;" k="20" />
-<hkern u1="&#x452;" u2="&#x201d;" k="20" />
-<hkern u1="&#x452;" u2="&#x2019;" k="20" />
-<hkern u1="&#x452;" u2="&#x507;" k="41" />
-<hkern u1="&#x452;" u2="&#x505;" k="41" />
-<hkern u1="&#x452;" u2="&#x27;" k="20" />
-<hkern u1="&#x452;" u2="&#x22;" k="20" />
-<hkern u1="&#x453;" u2="&#x201e;" k="102" />
-<hkern u1="&#x453;" u2="&#x201a;" k="102" />
-<hkern u1="&#x453;" u2="&#x2015;" k="41" />
-<hkern u1="&#x453;" u2="&#x2014;" k="41" />
-<hkern u1="&#x453;" u2="&#x2013;" k="41" />
-<hkern u1="&#x453;" u2="&#x513;" k="61" />
-<hkern u1="&#x453;" u2="&#x511;" k="20" />
-<hkern u1="&#x453;" u2="&#x50d;" k="20" />
-<hkern u1="&#x453;" u2="&#x509;" k="61" />
-<hkern u1="&#x453;" u2="&#x503;" k="20" />
-<hkern u1="&#x453;" u2="&#x501;" k="20" />
-<hkern u1="&#x453;" u2="&#x4eb;" k="20" />
-<hkern u1="&#x453;" u2="&#x4e9;" k="20" />
-<hkern u1="&#x453;" u2="&#x4e7;" k="20" />
-<hkern u1="&#x453;" u2="&#x4d7;" k="20" />
-<hkern u1="&#x453;" u2="&#x4c6;" k="61" />
-<hkern u1="&#x453;" u2="&#x4ab;" k="20" />
-<hkern u1="&#x453;" u2="&#x4a9;" k="20" />
-<hkern u1="&#x453;" u2="&#x481;" k="20" />
-<hkern u1="&#x453;" u2="&#x47d;" k="20" />
-<hkern u1="&#x453;" u2="&#x47b;" k="20" />
-<hkern u1="&#x453;" u2="&#x479;" k="20" />
-<hkern u1="&#x453;" u2="&#x473;" k="20" />
-<hkern u1="&#x453;" u2="&#x467;" k="61" />
-<hkern u1="&#x453;" u2="&#x459;" k="61" />
-<hkern u1="&#x453;" u2="&#x454;" k="20" />
-<hkern u1="&#x453;" u2="&#x451;" k="20" />
-<hkern u1="&#x453;" u2="&#x450;" k="20" />
-<hkern u1="&#x453;" u2="&#x444;" k="20" />
-<hkern u1="&#x453;" u2="&#x441;" k="20" />
-<hkern u1="&#x453;" u2="&#x43e;" k="20" />
-<hkern u1="&#x453;" u2="&#x43b;" k="61" />
-<hkern u1="&#x453;" u2="&#x435;" k="20" />
-<hkern u1="&#x453;" u2="&#x434;" k="61" />
-<hkern u1="&#x453;" u2="&#x2e;" k="102" />
-<hkern u1="&#x453;" u2="&#x2d;" k="41" />
-<hkern u1="&#x453;" u2="&#x2c;" k="102" />
-<hkern u1="&#x459;" u2="&#x201d;" k="123" />
-<hkern u1="&#x459;" u2="&#x2019;" k="123" />
-<hkern u1="&#x459;" u2="&#x50f;" k="102" />
-<hkern u1="&#x459;" u2="&#x507;" k="102" />
-<hkern u1="&#x459;" u2="&#x505;" k="102" />
-<hkern u1="&#x459;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x459;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x459;" u2="&#x4f5;" k="82" />
-<hkern u1="&#x459;" u2="&#x4f3;" k="61" />
-<hkern u1="&#x459;" u2="&#x4f1;" k="61" />
-<hkern u1="&#x459;" u2="&#x4ef;" k="61" />
-<hkern u1="&#x459;" u2="&#x4e1;" k="41" />
-<hkern u1="&#x459;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x459;" u2="&#x4cc;" k="82" />
-<hkern u1="&#x459;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x459;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x459;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x459;" u2="&#x4b9;" k="82" />
-<hkern u1="&#x459;" u2="&#x4b7;" k="82" />
-<hkern u1="&#x459;" u2="&#x4b5;" k="102" />
-<hkern u1="&#x459;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x459;" u2="&#x4b1;" k="61" />
-<hkern u1="&#x459;" u2="&#x4af;" k="61" />
-<hkern u1="&#x459;" u2="&#x4ad;" k="102" />
-<hkern u1="&#x459;" u2="&#x4a1;" k="102" />
-<hkern u1="&#x459;" u2="&#x497;" k="41" />
-<hkern u1="&#x459;" u2="&#x47f;" k="41" />
-<hkern u1="&#x459;" u2="&#x477;" k="41" />
-<hkern u1="&#x459;" u2="&#x475;" k="41" />
-<hkern u1="&#x459;" u2="&#x461;" k="41" />
-<hkern u1="&#x459;" u2="&#x45e;" k="61" />
-<hkern u1="&#x459;" u2="&#x44a;" k="102" />
-<hkern u1="&#x459;" u2="&#x447;" k="82" />
-<hkern u1="&#x459;" u2="&#x445;" k="41" />
-<hkern u1="&#x459;" u2="&#x443;" k="61" />
-<hkern u1="&#x459;" u2="&#x442;" k="102" />
-<hkern u1="&#x459;" u2="&#x436;" k="41" />
-<hkern u1="&#x459;" u2="&#x27;" k="123" />
-<hkern u1="&#x459;" u2="&#x22;" k="123" />
-<hkern u1="&#x45a;" u2="&#x201d;" k="123" />
-<hkern u1="&#x45a;" u2="&#x2019;" k="123" />
-<hkern u1="&#x45a;" u2="&#x50f;" k="102" />
-<hkern u1="&#x45a;" u2="&#x507;" k="102" />
-<hkern u1="&#x45a;" u2="&#x505;" k="102" />
-<hkern u1="&#x45a;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x45a;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x45a;" u2="&#x4f5;" k="82" />
-<hkern u1="&#x45a;" u2="&#x4f3;" k="61" />
-<hkern u1="&#x45a;" u2="&#x4f1;" k="61" />
-<hkern u1="&#x45a;" u2="&#x4ef;" k="61" />
-<hkern u1="&#x45a;" u2="&#x4e1;" k="41" />
-<hkern u1="&#x45a;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x45a;" u2="&#x4cc;" k="82" />
-<hkern u1="&#x45a;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x45a;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x45a;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x45a;" u2="&#x4b9;" k="82" />
-<hkern u1="&#x45a;" u2="&#x4b7;" k="82" />
-<hkern u1="&#x45a;" u2="&#x4b5;" k="102" />
-<hkern u1="&#x45a;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x45a;" u2="&#x4b1;" k="61" />
-<hkern u1="&#x45a;" u2="&#x4af;" k="61" />
-<hkern u1="&#x45a;" u2="&#x4ad;" k="102" />
-<hkern u1="&#x45a;" u2="&#x4a1;" k="102" />
-<hkern u1="&#x45a;" u2="&#x497;" k="41" />
-<hkern u1="&#x45a;" u2="&#x47f;" k="41" />
-<hkern u1="&#x45a;" u2="&#x477;" k="41" />
-<hkern u1="&#x45a;" u2="&#x475;" k="41" />
-<hkern u1="&#x45a;" u2="&#x461;" k="41" />
-<hkern u1="&#x45a;" u2="&#x45e;" k="61" />
-<hkern u1="&#x45a;" u2="&#x44a;" k="102" />
-<hkern u1="&#x45a;" u2="&#x447;" k="82" />
-<hkern u1="&#x45a;" u2="&#x445;" k="41" />
-<hkern u1="&#x45a;" u2="&#x443;" k="61" />
-<hkern u1="&#x45a;" u2="&#x442;" k="102" />
-<hkern u1="&#x45a;" u2="&#x436;" k="41" />
-<hkern u1="&#x45a;" u2="&#x27;" k="123" />
-<hkern u1="&#x45a;" u2="&#x22;" k="123" />
-<hkern u1="&#x45b;" u2="&#x201d;" k="20" />
-<hkern u1="&#x45b;" u2="&#x2019;" k="20" />
-<hkern u1="&#x45b;" u2="&#x507;" k="41" />
-<hkern u1="&#x45b;" u2="&#x505;" k="41" />
-<hkern u1="&#x45b;" u2="&#x27;" k="20" />
-<hkern u1="&#x45b;" u2="&#x22;" k="20" />
-<hkern u1="&#x45c;" u2="&#x511;" k="41" />
-<hkern u1="&#x45c;" u2="&#x50d;" k="41" />
-<hkern u1="&#x45c;" u2="&#x503;" k="41" />
-<hkern u1="&#x45c;" u2="&#x501;" k="41" />
-<hkern u1="&#x45c;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x45c;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x45c;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x45c;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x45c;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x45c;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x45c;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x45c;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x45c;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x45c;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x45c;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x45c;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x45c;" u2="&#x481;" k="41" />
-<hkern u1="&#x45c;" u2="&#x47d;" k="41" />
-<hkern u1="&#x45c;" u2="&#x47b;" k="41" />
-<hkern u1="&#x45c;" u2="&#x479;" k="41" />
-<hkern u1="&#x45c;" u2="&#x473;" k="41" />
-<hkern u1="&#x45c;" u2="&#x454;" k="41" />
-<hkern u1="&#x45c;" u2="&#x451;" k="41" />
-<hkern u1="&#x45c;" u2="&#x450;" k="41" />
-<hkern u1="&#x45c;" u2="&#x447;" k="41" />
-<hkern u1="&#x45c;" u2="&#x444;" k="41" />
-<hkern u1="&#x45c;" u2="&#x441;" k="41" />
-<hkern u1="&#x45c;" u2="&#x43e;" k="41" />
-<hkern u1="&#x45c;" u2="&#x435;" k="41" />
-<hkern u1="&#x45e;" u2="&#x201e;" k="82" />
-<hkern u1="&#x45e;" u2="&#x201a;" k="82" />
-<hkern u1="&#x45e;" u2="&#x513;" k="41" />
-<hkern u1="&#x45e;" u2="&#x509;" k="41" />
-<hkern u1="&#x45e;" u2="&#x4c6;" k="41" />
-<hkern u1="&#x45e;" u2="&#x467;" k="41" />
-<hkern u1="&#x45e;" u2="&#x459;" k="41" />
-<hkern u1="&#x45e;" u2="&#x43b;" k="41" />
-<hkern u1="&#x45e;" u2="&#x434;" k="41" />
-<hkern u1="&#x45e;" u2="&#x2e;" k="82" />
-<hkern u1="&#x45e;" u2="&#x2c;" k="82" />
-<hkern u1="&#x460;" u2="&#x201e;" k="82" />
-<hkern u1="&#x460;" u2="&#x201a;" k="82" />
-<hkern u1="&#x460;" u2="&#x513;" k="20" />
-<hkern u1="&#x460;" u2="&#x512;" k="41" />
-<hkern u1="&#x460;" u2="&#x50e;" k="20" />
-<hkern u1="&#x460;" u2="&#x509;" k="20" />
-<hkern u1="&#x460;" u2="&#x508;" k="41" />
-<hkern u1="&#x460;" u2="&#x506;" k="41" />
-<hkern u1="&#x460;" u2="&#x504;" k="41" />
-<hkern u1="&#x460;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x460;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x460;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x460;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x460;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x460;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x460;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x460;" u2="&#x4de;" k="20" />
-<hkern u1="&#x460;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x460;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x460;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x460;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x460;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x460;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x460;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x460;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x460;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x460;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x460;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x460;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x460;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x460;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x460;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x460;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x460;" u2="&#x498;" k="20" />
-<hkern u1="&#x460;" u2="&#x496;" k="41" />
-<hkern u1="&#x460;" u2="&#x476;" k="20" />
-<hkern u1="&#x460;" u2="&#x474;" k="20" />
-<hkern u1="&#x460;" u2="&#x470;" k="41" />
-<hkern u1="&#x460;" u2="&#x46e;" k="20" />
-<hkern u1="&#x460;" u2="&#x467;" k="20" />
-<hkern u1="&#x460;" u2="&#x466;" k="41" />
-<hkern u1="&#x460;" u2="&#x459;" k="20" />
-<hkern u1="&#x460;" u2="&#x43b;" k="20" />
-<hkern u1="&#x460;" u2="&#x434;" k="20" />
-<hkern u1="&#x460;" u2="&#x42d;" k="20" />
-<hkern u1="&#x460;" u2="&#x42a;" k="20" />
-<hkern u1="&#x460;" u2="&#x427;" k="41" />
-<hkern u1="&#x460;" u2="&#x425;" k="41" />
-<hkern u1="&#x460;" u2="&#x423;" k="41" />
-<hkern u1="&#x460;" u2="&#x422;" k="61" />
-<hkern u1="&#x460;" u2="&#x41b;" k="41" />
-<hkern u1="&#x460;" u2="&#x417;" k="20" />
-<hkern u1="&#x460;" u2="&#x416;" k="41" />
-<hkern u1="&#x460;" u2="&#x414;" k="41" />
-<hkern u1="&#x460;" u2="&#x410;" k="41" />
-<hkern u1="&#x460;" u2="&#x40e;" k="41" />
-<hkern u1="&#x460;" u2="&#x40b;" k="20" />
-<hkern u1="&#x460;" u2="&#x409;" k="41" />
-<hkern u1="&#x460;" u2="&#x402;" k="20" />
-<hkern u1="&#x460;" u2="&#x2e;" k="82" />
-<hkern u1="&#x460;" u2="&#x2c;" k="82" />
-<hkern u1="&#x461;" u2="&#x201e;" k="82" />
-<hkern u1="&#x461;" u2="&#x201a;" k="82" />
-<hkern u1="&#x461;" u2="&#x513;" k="41" />
-<hkern u1="&#x461;" u2="&#x509;" k="41" />
-<hkern u1="&#x461;" u2="&#x4c6;" k="41" />
-<hkern u1="&#x461;" u2="&#x467;" k="41" />
-<hkern u1="&#x461;" u2="&#x459;" k="41" />
-<hkern u1="&#x461;" u2="&#x43b;" k="41" />
-<hkern u1="&#x461;" u2="&#x434;" k="41" />
-<hkern u1="&#x461;" u2="&#x2e;" k="82" />
-<hkern u1="&#x461;" u2="&#x2c;" k="82" />
-<hkern u1="&#x462;" u2="&#x201d;" k="82" />
-<hkern u1="&#x462;" u2="&#x2019;" k="82" />
-<hkern u1="&#x462;" u2="&#x50f;" k="41" />
-<hkern u1="&#x462;" u2="&#x50e;" k="41" />
-<hkern u1="&#x462;" u2="&#x506;" k="102" />
-<hkern u1="&#x462;" u2="&#x504;" k="102" />
-<hkern u1="&#x462;" u2="&#x4f4;" k="82" />
-<hkern u1="&#x462;" u2="&#x4cb;" k="82" />
-<hkern u1="&#x462;" u2="&#x4b8;" k="82" />
-<hkern u1="&#x462;" u2="&#x4b6;" k="82" />
-<hkern u1="&#x462;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x462;" u2="&#x4b4;" k="41" />
-<hkern u1="&#x462;" u2="&#x4b0;" k="61" />
-<hkern u1="&#x462;" u2="&#x4ae;" k="61" />
-<hkern u1="&#x462;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x462;" u2="&#x4ac;" k="82" />
-<hkern u1="&#x462;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x462;" u2="&#x4a0;" k="41" />
-<hkern u1="&#x462;" u2="&#x476;" k="61" />
-<hkern u1="&#x462;" u2="&#x474;" k="61" />
-<hkern u1="&#x462;" u2="&#x470;" k="82" />
-<hkern u1="&#x462;" u2="&#x44a;" k="41" />
-<hkern u1="&#x462;" u2="&#x442;" k="41" />
-<hkern u1="&#x462;" u2="&#x42a;" k="41" />
-<hkern u1="&#x462;" u2="&#x427;" k="82" />
-<hkern u1="&#x462;" u2="&#x422;" k="82" />
-<hkern u1="&#x462;" u2="&#x40b;" k="41" />
-<hkern u1="&#x462;" u2="&#x402;" k="41" />
-<hkern u1="&#x462;" u2="&#x27;" k="82" />
-<hkern u1="&#x462;" u2="&#x22;" k="82" />
-<hkern u1="&#x463;" u2="&#x201d;" k="123" />
-<hkern u1="&#x463;" u2="&#x2019;" k="123" />
-<hkern u1="&#x463;" u2="&#x50f;" k="102" />
-<hkern u1="&#x463;" u2="&#x507;" k="102" />
-<hkern u1="&#x463;" u2="&#x505;" k="102" />
-<hkern u1="&#x463;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x463;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x463;" u2="&#x4f5;" k="82" />
-<hkern u1="&#x463;" u2="&#x4f3;" k="61" />
-<hkern u1="&#x463;" u2="&#x4f1;" k="61" />
-<hkern u1="&#x463;" u2="&#x4ef;" k="61" />
-<hkern u1="&#x463;" u2="&#x4e1;" k="41" />
-<hkern u1="&#x463;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x463;" u2="&#x4cc;" k="82" />
-<hkern u1="&#x463;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x463;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x463;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x463;" u2="&#x4b9;" k="82" />
-<hkern u1="&#x463;" u2="&#x4b7;" k="82" />
-<hkern u1="&#x463;" u2="&#x4b5;" k="102" />
-<hkern u1="&#x463;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x463;" u2="&#x4b1;" k="61" />
-<hkern u1="&#x463;" u2="&#x4af;" k="61" />
-<hkern u1="&#x463;" u2="&#x4ad;" k="102" />
-<hkern u1="&#x463;" u2="&#x4a1;" k="102" />
-<hkern u1="&#x463;" u2="&#x497;" k="41" />
-<hkern u1="&#x463;" u2="&#x47f;" k="41" />
-<hkern u1="&#x463;" u2="&#x477;" k="41" />
-<hkern u1="&#x463;" u2="&#x475;" k="41" />
-<hkern u1="&#x463;" u2="&#x461;" k="41" />
-<hkern u1="&#x463;" u2="&#x45e;" k="61" />
-<hkern u1="&#x463;" u2="&#x44a;" k="102" />
-<hkern u1="&#x463;" u2="&#x447;" k="82" />
-<hkern u1="&#x463;" u2="&#x445;" k="41" />
-<hkern u1="&#x463;" u2="&#x443;" k="61" />
-<hkern u1="&#x463;" u2="&#x442;" k="102" />
-<hkern u1="&#x463;" u2="&#x436;" k="41" />
-<hkern u1="&#x463;" u2="&#x27;" k="123" />
-<hkern u1="&#x463;" u2="&#x22;" k="123" />
-<hkern u1="&#x464;" u2="&#x50c;" k="41" />
-<hkern u1="&#x464;" u2="&#x507;" k="41" />
-<hkern u1="&#x464;" u2="&#x505;" k="41" />
-<hkern u1="&#x464;" u2="&#x502;" k="41" />
-<hkern u1="&#x464;" u2="&#x500;" k="41" />
-<hkern u1="&#x464;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x464;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x464;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x464;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x464;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x464;" u2="&#x4be;" k="41" />
-<hkern u1="&#x464;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x464;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x464;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x464;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x464;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x464;" u2="&#x480;" k="41" />
-<hkern u1="&#x464;" u2="&#x47e;" k="41" />
-<hkern u1="&#x464;" u2="&#x47c;" k="41" />
-<hkern u1="&#x464;" u2="&#x47a;" k="41" />
-<hkern u1="&#x464;" u2="&#x478;" k="41" />
-<hkern u1="&#x464;" u2="&#x472;" k="41" />
-<hkern u1="&#x464;" u2="&#x460;" k="41" />
-<hkern u1="&#x464;" u2="&#x447;" k="41" />
-<hkern u1="&#x464;" u2="&#x424;" k="41" />
-<hkern u1="&#x464;" u2="&#x421;" k="41" />
-<hkern u1="&#x464;" u2="&#x41e;" k="41" />
-<hkern u1="&#x464;" u2="&#x404;" k="41" />
-<hkern u1="&#x466;" u2="&#x201d;" k="143" />
-<hkern u1="&#x466;" u2="&#x2019;" k="143" />
-<hkern u1="&#x466;" u2="&#x50f;" k="41" />
-<hkern u1="&#x466;" u2="&#x50e;" k="102" />
-<hkern u1="&#x466;" u2="&#x507;" k="41" />
-<hkern u1="&#x466;" u2="&#x506;" k="143" />
-<hkern u1="&#x466;" u2="&#x505;" k="41" />
-<hkern u1="&#x466;" u2="&#x504;" k="143" />
-<hkern u1="&#x466;" u2="&#x4fa;" k="41" />
-<hkern u1="&#x466;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x466;" u2="&#x4f4;" k="102" />
-<hkern u1="&#x466;" u2="&#x4da;" k="41" />
-<hkern u1="&#x466;" u2="&#x4d8;" k="41" />
-<hkern u1="&#x466;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x466;" u2="&#x4cb;" k="102" />
-<hkern u1="&#x466;" u2="&#x4be;" k="102" />
-<hkern u1="&#x466;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x466;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x466;" u2="&#x4b8;" k="102" />
-<hkern u1="&#x466;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x466;" u2="&#x4b6;" k="102" />
-<hkern u1="&#x466;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x466;" u2="&#x4b4;" k="102" />
-<hkern u1="&#x466;" u2="&#x4b0;" k="123" />
-<hkern u1="&#x466;" u2="&#x4ae;" k="123" />
-<hkern u1="&#x466;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x466;" u2="&#x4ac;" k="143" />
-<hkern u1="&#x466;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x466;" u2="&#x4a0;" k="102" />
-<hkern u1="&#x466;" u2="&#x49e;" k="41" />
-<hkern u1="&#x466;" u2="&#x492;" k="41" />
-<hkern u1="&#x466;" u2="&#x48c;" k="41" />
-<hkern u1="&#x466;" u2="&#x476;" k="82" />
-<hkern u1="&#x466;" u2="&#x474;" k="82" />
-<hkern u1="&#x466;" u2="&#x470;" k="102" />
-<hkern u1="&#x466;" u2="&#x462;" k="41" />
-<hkern u1="&#x466;" u2="&#x44a;" k="41" />
-<hkern u1="&#x466;" u2="&#x447;" k="41" />
-<hkern u1="&#x466;" u2="&#x442;" k="41" />
-<hkern u1="&#x466;" u2="&#x42a;" k="102" />
-<hkern u1="&#x466;" u2="&#x427;" k="102" />
-<hkern u1="&#x466;" u2="&#x424;" k="41" />
-<hkern u1="&#x466;" u2="&#x422;" k="143" />
-<hkern u1="&#x466;" u2="&#x40b;" k="102" />
-<hkern u1="&#x466;" u2="&#x402;" k="102" />
-<hkern u1="&#x466;" u2="&#x27;" k="143" />
-<hkern u1="&#x466;" u2="&#x22;" k="143" />
-<hkern u1="&#x467;" u2="&#x201d;" k="143" />
-<hkern u1="&#x467;" u2="&#x2019;" k="143" />
-<hkern u1="&#x467;" u2="&#x511;" k="41" />
-<hkern u1="&#x467;" u2="&#x50f;" k="102" />
-<hkern u1="&#x467;" u2="&#x50d;" k="41" />
-<hkern u1="&#x467;" u2="&#x507;" k="123" />
-<hkern u1="&#x467;" u2="&#x505;" k="123" />
-<hkern u1="&#x467;" u2="&#x503;" k="41" />
-<hkern u1="&#x467;" u2="&#x501;" k="41" />
-<hkern u1="&#x467;" u2="&#x4f5;" k="61" />
-<hkern u1="&#x467;" u2="&#x4f3;" k="61" />
-<hkern u1="&#x467;" u2="&#x4f1;" k="61" />
-<hkern u1="&#x467;" u2="&#x4ef;" k="61" />
-<hkern u1="&#x467;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x467;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x467;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x467;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x467;" u2="&#x4cc;" k="61" />
-<hkern u1="&#x467;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x467;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x467;" u2="&#x4b9;" k="61" />
-<hkern u1="&#x467;" u2="&#x4b7;" k="61" />
-<hkern u1="&#x467;" u2="&#x4b5;" k="102" />
-<hkern u1="&#x467;" u2="&#x4b1;" k="41" />
-<hkern u1="&#x467;" u2="&#x4af;" k="41" />
-<hkern u1="&#x467;" u2="&#x4ad;" k="102" />
-<hkern u1="&#x467;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x467;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x467;" u2="&#x4a1;" k="102" />
-<hkern u1="&#x467;" u2="&#x481;" k="41" />
-<hkern u1="&#x467;" u2="&#x47f;" k="41" />
-<hkern u1="&#x467;" u2="&#x47d;" k="41" />
-<hkern u1="&#x467;" u2="&#x47b;" k="41" />
-<hkern u1="&#x467;" u2="&#x479;" k="41" />
-<hkern u1="&#x467;" u2="&#x477;" k="41" />
-<hkern u1="&#x467;" u2="&#x475;" k="41" />
-<hkern u1="&#x467;" u2="&#x473;" k="41" />
-<hkern u1="&#x467;" u2="&#x471;" k="20" />
-<hkern u1="&#x467;" u2="&#x461;" k="41" />
-<hkern u1="&#x467;" u2="&#x45e;" k="61" />
-<hkern u1="&#x467;" u2="&#x454;" k="41" />
-<hkern u1="&#x467;" u2="&#x451;" k="41" />
-<hkern u1="&#x467;" u2="&#x450;" k="41" />
-<hkern u1="&#x467;" u2="&#x44a;" k="102" />
-<hkern u1="&#x467;" u2="&#x447;" k="61" />
-<hkern u1="&#x467;" u2="&#x444;" k="41" />
-<hkern u1="&#x467;" u2="&#x443;" k="61" />
-<hkern u1="&#x467;" u2="&#x442;" k="102" />
-<hkern u1="&#x467;" u2="&#x441;" k="41" />
-<hkern u1="&#x467;" u2="&#x43e;" k="41" />
-<hkern u1="&#x467;" u2="&#x435;" k="41" />
-<hkern u1="&#x467;" u2="&#x27;" k="143" />
-<hkern u1="&#x467;" u2="&#x22;" k="143" />
-<hkern u1="&#x468;" u2="&#x201d;" k="143" />
-<hkern u1="&#x468;" u2="&#x2019;" k="143" />
-<hkern u1="&#x468;" u2="&#x50f;" k="41" />
-<hkern u1="&#x468;" u2="&#x50e;" k="102" />
-<hkern u1="&#x468;" u2="&#x507;" k="41" />
-<hkern u1="&#x468;" u2="&#x506;" k="143" />
-<hkern u1="&#x468;" u2="&#x505;" k="41" />
-<hkern u1="&#x468;" u2="&#x504;" k="143" />
-<hkern u1="&#x468;" u2="&#x4fa;" k="41" />
-<hkern u1="&#x468;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x468;" u2="&#x4f4;" k="102" />
-<hkern u1="&#x468;" u2="&#x4da;" k="41" />
-<hkern u1="&#x468;" u2="&#x4d8;" k="41" />
-<hkern u1="&#x468;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x468;" u2="&#x4cb;" k="102" />
-<hkern u1="&#x468;" u2="&#x4be;" k="102" />
-<hkern u1="&#x468;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x468;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x468;" u2="&#x4b8;" k="102" />
-<hkern u1="&#x468;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x468;" u2="&#x4b6;" k="102" />
-<hkern u1="&#x468;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x468;" u2="&#x4b4;" k="102" />
-<hkern u1="&#x468;" u2="&#x4b0;" k="123" />
-<hkern u1="&#x468;" u2="&#x4ae;" k="123" />
-<hkern u1="&#x468;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x468;" u2="&#x4ac;" k="143" />
-<hkern u1="&#x468;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x468;" u2="&#x4a0;" k="102" />
-<hkern u1="&#x468;" u2="&#x49e;" k="41" />
-<hkern u1="&#x468;" u2="&#x492;" k="41" />
-<hkern u1="&#x468;" u2="&#x48c;" k="41" />
-<hkern u1="&#x468;" u2="&#x476;" k="82" />
-<hkern u1="&#x468;" u2="&#x474;" k="82" />
-<hkern u1="&#x468;" u2="&#x470;" k="102" />
-<hkern u1="&#x468;" u2="&#x462;" k="41" />
-<hkern u1="&#x468;" u2="&#x44a;" k="41" />
-<hkern u1="&#x468;" u2="&#x447;" k="41" />
-<hkern u1="&#x468;" u2="&#x442;" k="41" />
-<hkern u1="&#x468;" u2="&#x42a;" k="102" />
-<hkern u1="&#x468;" u2="&#x427;" k="102" />
-<hkern u1="&#x468;" u2="&#x424;" k="41" />
-<hkern u1="&#x468;" u2="&#x422;" k="143" />
-<hkern u1="&#x468;" u2="&#x40b;" k="102" />
-<hkern u1="&#x468;" u2="&#x402;" k="102" />
-<hkern u1="&#x468;" u2="&#x27;" k="143" />
-<hkern u1="&#x468;" u2="&#x22;" k="143" />
-<hkern u1="&#x469;" u2="&#x201d;" k="143" />
-<hkern u1="&#x469;" u2="&#x2019;" k="143" />
-<hkern u1="&#x469;" u2="&#x511;" k="41" />
-<hkern u1="&#x469;" u2="&#x50f;" k="102" />
-<hkern u1="&#x469;" u2="&#x50d;" k="41" />
-<hkern u1="&#x469;" u2="&#x507;" k="123" />
-<hkern u1="&#x469;" u2="&#x505;" k="123" />
-<hkern u1="&#x469;" u2="&#x503;" k="41" />
-<hkern u1="&#x469;" u2="&#x501;" k="41" />
-<hkern u1="&#x469;" u2="&#x4f5;" k="61" />
-<hkern u1="&#x469;" u2="&#x4f3;" k="61" />
-<hkern u1="&#x469;" u2="&#x4f1;" k="61" />
-<hkern u1="&#x469;" u2="&#x4ef;" k="61" />
-<hkern u1="&#x469;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x469;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x469;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x469;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x469;" u2="&#x4cc;" k="61" />
-<hkern u1="&#x469;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x469;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x469;" u2="&#x4b9;" k="61" />
-<hkern u1="&#x469;" u2="&#x4b7;" k="61" />
-<hkern u1="&#x469;" u2="&#x4b5;" k="102" />
-<hkern u1="&#x469;" u2="&#x4b1;" k="41" />
-<hkern u1="&#x469;" u2="&#x4af;" k="41" />
-<hkern u1="&#x469;" u2="&#x4ad;" k="102" />
-<hkern u1="&#x469;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x469;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x469;" u2="&#x4a1;" k="102" />
-<hkern u1="&#x469;" u2="&#x481;" k="41" />
-<hkern u1="&#x469;" u2="&#x47f;" k="41" />
-<hkern u1="&#x469;" u2="&#x47d;" k="41" />
-<hkern u1="&#x469;" u2="&#x47b;" k="41" />
-<hkern u1="&#x469;" u2="&#x479;" k="41" />
-<hkern u1="&#x469;" u2="&#x477;" k="41" />
-<hkern u1="&#x469;" u2="&#x475;" k="41" />
-<hkern u1="&#x469;" u2="&#x473;" k="41" />
-<hkern u1="&#x469;" u2="&#x471;" k="20" />
-<hkern u1="&#x469;" u2="&#x461;" k="41" />
-<hkern u1="&#x469;" u2="&#x45e;" k="61" />
-<hkern u1="&#x469;" u2="&#x454;" k="41" />
-<hkern u1="&#x469;" u2="&#x451;" k="41" />
-<hkern u1="&#x469;" u2="&#x450;" k="41" />
-<hkern u1="&#x469;" u2="&#x44a;" k="102" />
-<hkern u1="&#x469;" u2="&#x447;" k="61" />
-<hkern u1="&#x469;" u2="&#x444;" k="41" />
-<hkern u1="&#x469;" u2="&#x443;" k="61" />
-<hkern u1="&#x469;" u2="&#x442;" k="102" />
-<hkern u1="&#x469;" u2="&#x441;" k="41" />
-<hkern u1="&#x469;" u2="&#x43e;" k="41" />
-<hkern u1="&#x469;" u2="&#x435;" k="41" />
-<hkern u1="&#x469;" u2="&#x27;" k="143" />
-<hkern u1="&#x469;" u2="&#x22;" k="143" />
-<hkern u1="&#x46a;" u2="&#x506;" k="20" />
-<hkern u1="&#x46a;" u2="&#x504;" k="20" />
-<hkern u1="&#x46c;" u2="&#x506;" k="20" />
-<hkern u1="&#x46c;" u2="&#x504;" k="20" />
-<hkern u1="&#x46e;" u2="&#x201e;" k="82" />
-<hkern u1="&#x46e;" u2="&#x201a;" k="82" />
-<hkern u1="&#x46e;" u2="&#x506;" k="41" />
-<hkern u1="&#x46e;" u2="&#x504;" k="41" />
-<hkern u1="&#x46e;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x46e;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x46e;" u2="&#x476;" k="20" />
-<hkern u1="&#x46e;" u2="&#x474;" k="20" />
-<hkern u1="&#x46e;" u2="&#x2e;" k="82" />
-<hkern u1="&#x46e;" u2="&#x2c;" k="82" />
-<hkern u1="&#x470;" u2="&#x201e;" k="143" />
-<hkern u1="&#x470;" u2="&#x201a;" k="143" />
-<hkern u1="&#x470;" u2="&#x513;" k="41" />
-<hkern u1="&#x470;" u2="&#x512;" k="61" />
-<hkern u1="&#x470;" u2="&#x509;" k="41" />
-<hkern u1="&#x470;" u2="&#x508;" k="61" />
-<hkern u1="&#x470;" u2="&#x502;" k="82" />
-<hkern u1="&#x470;" u2="&#x500;" k="82" />
-<hkern u1="&#x470;" u2="&#x4d4;" k="82" />
-<hkern u1="&#x470;" u2="&#x4d2;" k="82" />
-<hkern u1="&#x470;" u2="&#x4d0;" k="82" />
-<hkern u1="&#x470;" u2="&#x4c6;" k="41" />
-<hkern u1="&#x470;" u2="&#x4c5;" k="61" />
-<hkern u1="&#x470;" u2="&#x467;" k="41" />
-<hkern u1="&#x470;" u2="&#x466;" k="82" />
-<hkern u1="&#x470;" u2="&#x459;" k="41" />
-<hkern u1="&#x470;" u2="&#x43b;" k="41" />
-<hkern u1="&#x470;" u2="&#x434;" k="41" />
-<hkern u1="&#x470;" u2="&#x41b;" k="61" />
-<hkern u1="&#x470;" u2="&#x414;" k="61" />
-<hkern u1="&#x470;" u2="&#x410;" k="82" />
-<hkern u1="&#x470;" u2="&#x409;" k="61" />
-<hkern u1="&#x470;" u2="&#x2e;" k="143" />
-<hkern u1="&#x470;" u2="&#x2c;" k="143" />
-<hkern u1="&#x471;" u2="&#x201d;" k="20" />
-<hkern u1="&#x471;" u2="&#x2019;" k="20" />
-<hkern u1="&#x471;" u2="&#x50f;" k="20" />
-<hkern u1="&#x471;" u2="&#x507;" k="20" />
-<hkern u1="&#x471;" u2="&#x505;" k="20" />
-<hkern u1="&#x471;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x471;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x471;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x471;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x471;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x471;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x471;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x471;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x471;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x471;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x471;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x471;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x471;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x471;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x471;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x471;" u2="&#x497;" k="41" />
-<hkern u1="&#x471;" u2="&#x45e;" k="20" />
-<hkern u1="&#x471;" u2="&#x44a;" k="20" />
-<hkern u1="&#x471;" u2="&#x447;" k="20" />
-<hkern u1="&#x471;" u2="&#x445;" k="41" />
-<hkern u1="&#x471;" u2="&#x443;" k="20" />
-<hkern u1="&#x471;" u2="&#x442;" k="20" />
-<hkern u1="&#x471;" u2="&#x436;" k="41" />
-<hkern u1="&#x471;" u2="&#x27;" k="20" />
-<hkern u1="&#x471;" u2="&#x22;" k="20" />
-<hkern u1="&#x472;" u2="&#x201e;" k="82" />
-<hkern u1="&#x472;" u2="&#x201a;" k="82" />
-<hkern u1="&#x472;" u2="&#x513;" k="20" />
-<hkern u1="&#x472;" u2="&#x512;" k="41" />
-<hkern u1="&#x472;" u2="&#x50e;" k="20" />
-<hkern u1="&#x472;" u2="&#x509;" k="20" />
-<hkern u1="&#x472;" u2="&#x508;" k="41" />
-<hkern u1="&#x472;" u2="&#x506;" k="41" />
-<hkern u1="&#x472;" u2="&#x504;" k="41" />
-<hkern u1="&#x472;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x472;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x472;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x472;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x472;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x472;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x472;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x472;" u2="&#x4de;" k="20" />
-<hkern u1="&#x472;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x472;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x472;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x472;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x472;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x472;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x472;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x472;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x472;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x472;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x472;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x472;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x472;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x472;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x472;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x472;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x472;" u2="&#x498;" k="20" />
-<hkern u1="&#x472;" u2="&#x496;" k="41" />
-<hkern u1="&#x472;" u2="&#x476;" k="20" />
-<hkern u1="&#x472;" u2="&#x474;" k="20" />
-<hkern u1="&#x472;" u2="&#x470;" k="41" />
-<hkern u1="&#x472;" u2="&#x46e;" k="20" />
-<hkern u1="&#x472;" u2="&#x467;" k="20" />
-<hkern u1="&#x472;" u2="&#x466;" k="41" />
-<hkern u1="&#x472;" u2="&#x459;" k="20" />
-<hkern u1="&#x472;" u2="&#x43b;" k="20" />
-<hkern u1="&#x472;" u2="&#x434;" k="20" />
-<hkern u1="&#x472;" u2="&#x42d;" k="20" />
-<hkern u1="&#x472;" u2="&#x42a;" k="20" />
-<hkern u1="&#x472;" u2="&#x427;" k="41" />
-<hkern u1="&#x472;" u2="&#x425;" k="41" />
-<hkern u1="&#x472;" u2="&#x423;" k="41" />
-<hkern u1="&#x472;" u2="&#x422;" k="61" />
-<hkern u1="&#x472;" u2="&#x41b;" k="41" />
-<hkern u1="&#x472;" u2="&#x417;" k="20" />
-<hkern u1="&#x472;" u2="&#x416;" k="41" />
-<hkern u1="&#x472;" u2="&#x414;" k="41" />
-<hkern u1="&#x472;" u2="&#x410;" k="41" />
-<hkern u1="&#x472;" u2="&#x40e;" k="41" />
-<hkern u1="&#x472;" u2="&#x40b;" k="20" />
-<hkern u1="&#x472;" u2="&#x409;" k="41" />
-<hkern u1="&#x472;" u2="&#x402;" k="20" />
-<hkern u1="&#x472;" u2="&#x2e;" k="82" />
-<hkern u1="&#x472;" u2="&#x2c;" k="82" />
-<hkern u1="&#x473;" u2="&#x201d;" k="20" />
-<hkern u1="&#x473;" u2="&#x2019;" k="20" />
-<hkern u1="&#x473;" u2="&#x50f;" k="20" />
-<hkern u1="&#x473;" u2="&#x507;" k="20" />
-<hkern u1="&#x473;" u2="&#x505;" k="20" />
-<hkern u1="&#x473;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x473;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x473;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x473;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x473;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x473;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x473;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x473;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x473;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x473;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x473;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x473;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x473;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x473;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x473;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x473;" u2="&#x497;" k="41" />
-<hkern u1="&#x473;" u2="&#x45e;" k="20" />
-<hkern u1="&#x473;" u2="&#x44a;" k="20" />
-<hkern u1="&#x473;" u2="&#x447;" k="20" />
-<hkern u1="&#x473;" u2="&#x445;" k="41" />
-<hkern u1="&#x473;" u2="&#x443;" k="20" />
-<hkern u1="&#x473;" u2="&#x442;" k="20" />
-<hkern u1="&#x473;" u2="&#x436;" k="41" />
-<hkern u1="&#x473;" u2="&#x27;" k="20" />
-<hkern u1="&#x473;" u2="&#x22;" k="20" />
-<hkern u1="&#x474;" u2="&#x201e;" k="123" />
-<hkern u1="&#x474;" u2="&#x201a;" k="123" />
-<hkern u1="&#x474;" u2="&#x513;" k="82" />
-<hkern u1="&#x474;" u2="&#x512;" k="102" />
-<hkern u1="&#x474;" u2="&#x511;" k="41" />
-<hkern u1="&#x474;" u2="&#x50d;" k="41" />
-<hkern u1="&#x474;" u2="&#x50c;" k="20" />
-<hkern u1="&#x474;" u2="&#x509;" k="82" />
-<hkern u1="&#x474;" u2="&#x508;" k="102" />
-<hkern u1="&#x474;" u2="&#x503;" k="41" />
-<hkern u1="&#x474;" u2="&#x502;" k="143" />
-<hkern u1="&#x474;" u2="&#x501;" k="41" />
-<hkern u1="&#x474;" u2="&#x500;" k="143" />
-<hkern u1="&#x474;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x474;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x474;" u2="&#x4ea;" k="20" />
-<hkern u1="&#x474;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x474;" u2="&#x4e8;" k="20" />
-<hkern u1="&#x474;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x474;" u2="&#x4e6;" k="20" />
-<hkern u1="&#x474;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x474;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x474;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x474;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x474;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x474;" u2="&#x4c6;" k="82" />
-<hkern u1="&#x474;" u2="&#x4c5;" k="102" />
-<hkern u1="&#x474;" u2="&#x4bf;" k="61" />
-<hkern u1="&#x474;" u2="&#x4be;" k="41" />
-<hkern u1="&#x474;" u2="&#x4bd;" k="61" />
-<hkern u1="&#x474;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x474;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x474;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x474;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x474;" u2="&#x4aa;" k="20" />
-<hkern u1="&#x474;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x474;" u2="&#x4a8;" k="20" />
-<hkern u1="&#x474;" u2="&#x49f;" k="-102" />
-<hkern u1="&#x474;" u2="&#x48d;" k="-102" />
-<hkern u1="&#x474;" u2="&#x481;" k="41" />
-<hkern u1="&#x474;" u2="&#x480;" k="20" />
-<hkern u1="&#x474;" u2="&#x47e;" k="20" />
-<hkern u1="&#x474;" u2="&#x47d;" k="41" />
-<hkern u1="&#x474;" u2="&#x47c;" k="20" />
-<hkern u1="&#x474;" u2="&#x47b;" k="41" />
-<hkern u1="&#x474;" u2="&#x47a;" k="20" />
-<hkern u1="&#x474;" u2="&#x479;" k="41" />
-<hkern u1="&#x474;" u2="&#x478;" k="20" />
-<hkern u1="&#x474;" u2="&#x473;" k="41" />
-<hkern u1="&#x474;" u2="&#x472;" k="20" />
-<hkern u1="&#x474;" u2="&#x467;" k="82" />
-<hkern u1="&#x474;" u2="&#x466;" k="143" />
-<hkern u1="&#x474;" u2="&#x460;" k="20" />
-<hkern u1="&#x474;" u2="&#x45b;" k="-102" />
-<hkern u1="&#x474;" u2="&#x459;" k="82" />
-<hkern u1="&#x474;" u2="&#x455;" k="20" />
-<hkern u1="&#x474;" u2="&#x454;" k="41" />
-<hkern u1="&#x474;" u2="&#x452;" k="-102" />
-<hkern u1="&#x474;" u2="&#x451;" k="41" />
-<hkern u1="&#x474;" u2="&#x450;" k="41" />
-<hkern u1="&#x474;" u2="&#x447;" k="41" />
-<hkern u1="&#x474;" u2="&#x444;" k="41" />
-<hkern u1="&#x474;" u2="&#x441;" k="41" />
-<hkern u1="&#x474;" u2="&#x43e;" k="41" />
-<hkern u1="&#x474;" u2="&#x43b;" k="82" />
-<hkern u1="&#x474;" u2="&#x435;" k="41" />
-<hkern u1="&#x474;" u2="&#x434;" k="82" />
-<hkern u1="&#x474;" u2="&#x42f;" k="20" />
-<hkern u1="&#x474;" u2="&#x424;" k="61" />
-<hkern u1="&#x474;" u2="&#x421;" k="20" />
-<hkern u1="&#x474;" u2="&#x41e;" k="20" />
-<hkern u1="&#x474;" u2="&#x41b;" k="102" />
-<hkern u1="&#x474;" u2="&#x414;" k="102" />
-<hkern u1="&#x474;" u2="&#x410;" k="143" />
-<hkern u1="&#x474;" u2="&#x409;" k="102" />
-<hkern u1="&#x474;" u2="&#x404;" k="20" />
-<hkern u1="&#x474;" u2="&#x2e;" k="123" />
-<hkern u1="&#x474;" u2="&#x2c;" k="123" />
-<hkern u1="&#x475;" u2="&#x201e;" k="82" />
-<hkern u1="&#x475;" u2="&#x201a;" k="82" />
-<hkern u1="&#x475;" u2="&#x513;" k="41" />
-<hkern u1="&#x475;" u2="&#x509;" k="41" />
-<hkern u1="&#x475;" u2="&#x4c6;" k="41" />
-<hkern u1="&#x475;" u2="&#x467;" k="41" />
-<hkern u1="&#x475;" u2="&#x459;" k="41" />
-<hkern u1="&#x475;" u2="&#x43b;" k="41" />
-<hkern u1="&#x475;" u2="&#x434;" k="41" />
-<hkern u1="&#x475;" u2="&#x2e;" k="82" />
-<hkern u1="&#x475;" u2="&#x2c;" k="82" />
-<hkern u1="&#x476;" u2="&#x201e;" k="123" />
-<hkern u1="&#x476;" u2="&#x201a;" k="123" />
-<hkern u1="&#x476;" u2="&#x513;" k="82" />
-<hkern u1="&#x476;" u2="&#x512;" k="102" />
-<hkern u1="&#x476;" u2="&#x511;" k="41" />
-<hkern u1="&#x476;" u2="&#x50d;" k="41" />
-<hkern u1="&#x476;" u2="&#x50c;" k="20" />
-<hkern u1="&#x476;" u2="&#x509;" k="82" />
-<hkern u1="&#x476;" u2="&#x508;" k="102" />
-<hkern u1="&#x476;" u2="&#x503;" k="41" />
-<hkern u1="&#x476;" u2="&#x502;" k="143" />
-<hkern u1="&#x476;" u2="&#x501;" k="41" />
-<hkern u1="&#x476;" u2="&#x500;" k="143" />
-<hkern u1="&#x476;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x476;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x476;" u2="&#x4ea;" k="20" />
-<hkern u1="&#x476;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x476;" u2="&#x4e8;" k="20" />
-<hkern u1="&#x476;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x476;" u2="&#x4e6;" k="20" />
-<hkern u1="&#x476;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x476;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x476;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x476;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x476;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x476;" u2="&#x4c6;" k="82" />
-<hkern u1="&#x476;" u2="&#x4c5;" k="102" />
-<hkern u1="&#x476;" u2="&#x4bf;" k="61" />
-<hkern u1="&#x476;" u2="&#x4be;" k="41" />
-<hkern u1="&#x476;" u2="&#x4bd;" k="61" />
-<hkern u1="&#x476;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x476;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x476;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x476;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x476;" u2="&#x4aa;" k="20" />
-<hkern u1="&#x476;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x476;" u2="&#x4a8;" k="20" />
-<hkern u1="&#x476;" u2="&#x49f;" k="-102" />
-<hkern u1="&#x476;" u2="&#x48d;" k="-102" />
-<hkern u1="&#x476;" u2="&#x481;" k="41" />
-<hkern u1="&#x476;" u2="&#x480;" k="20" />
-<hkern u1="&#x476;" u2="&#x47e;" k="20" />
-<hkern u1="&#x476;" u2="&#x47d;" k="41" />
-<hkern u1="&#x476;" u2="&#x47c;" k="20" />
-<hkern u1="&#x476;" u2="&#x47b;" k="41" />
-<hkern u1="&#x476;" u2="&#x47a;" k="20" />
-<hkern u1="&#x476;" u2="&#x479;" k="41" />
-<hkern u1="&#x476;" u2="&#x478;" k="20" />
-<hkern u1="&#x476;" u2="&#x473;" k="41" />
-<hkern u1="&#x476;" u2="&#x472;" k="20" />
-<hkern u1="&#x476;" u2="&#x467;" k="82" />
-<hkern u1="&#x476;" u2="&#x466;" k="143" />
-<hkern u1="&#x476;" u2="&#x460;" k="20" />
-<hkern u1="&#x476;" u2="&#x45b;" k="-102" />
-<hkern u1="&#x476;" u2="&#x459;" k="82" />
-<hkern u1="&#x476;" u2="&#x455;" k="20" />
-<hkern u1="&#x476;" u2="&#x454;" k="41" />
-<hkern u1="&#x476;" u2="&#x452;" k="-102" />
-<hkern u1="&#x476;" u2="&#x451;" k="41" />
-<hkern u1="&#x476;" u2="&#x450;" k="41" />
-<hkern u1="&#x476;" u2="&#x447;" k="41" />
-<hkern u1="&#x476;" u2="&#x444;" k="41" />
-<hkern u1="&#x476;" u2="&#x441;" k="41" />
-<hkern u1="&#x476;" u2="&#x43e;" k="41" />
-<hkern u1="&#x476;" u2="&#x43b;" k="82" />
-<hkern u1="&#x476;" u2="&#x435;" k="41" />
-<hkern u1="&#x476;" u2="&#x434;" k="82" />
-<hkern u1="&#x476;" u2="&#x42f;" k="20" />
-<hkern u1="&#x476;" u2="&#x424;" k="61" />
-<hkern u1="&#x476;" u2="&#x421;" k="20" />
-<hkern u1="&#x476;" u2="&#x41e;" k="20" />
-<hkern u1="&#x476;" u2="&#x41b;" k="102" />
-<hkern u1="&#x476;" u2="&#x414;" k="102" />
-<hkern u1="&#x476;" u2="&#x410;" k="143" />
-<hkern u1="&#x476;" u2="&#x409;" k="102" />
-<hkern u1="&#x476;" u2="&#x404;" k="20" />
-<hkern u1="&#x476;" u2="&#x2e;" k="123" />
-<hkern u1="&#x476;" u2="&#x2c;" k="123" />
-<hkern u1="&#x477;" u2="&#x201e;" k="82" />
-<hkern u1="&#x477;" u2="&#x201a;" k="82" />
-<hkern u1="&#x477;" u2="&#x513;" k="41" />
-<hkern u1="&#x477;" u2="&#x509;" k="41" />
-<hkern u1="&#x477;" u2="&#x4c6;" k="41" />
-<hkern u1="&#x477;" u2="&#x467;" k="41" />
-<hkern u1="&#x477;" u2="&#x459;" k="41" />
-<hkern u1="&#x477;" u2="&#x43b;" k="41" />
-<hkern u1="&#x477;" u2="&#x434;" k="41" />
-<hkern u1="&#x477;" u2="&#x2e;" k="82" />
-<hkern u1="&#x477;" u2="&#x2c;" k="82" />
-<hkern u1="&#x478;" u2="&#x201e;" k="82" />
-<hkern u1="&#x478;" u2="&#x201a;" k="82" />
-<hkern u1="&#x478;" u2="&#x513;" k="41" />
-<hkern u1="&#x478;" u2="&#x509;" k="41" />
-<hkern u1="&#x478;" u2="&#x4c6;" k="41" />
-<hkern u1="&#x478;" u2="&#x467;" k="41" />
-<hkern u1="&#x478;" u2="&#x459;" k="41" />
-<hkern u1="&#x478;" u2="&#x43b;" k="41" />
-<hkern u1="&#x478;" u2="&#x434;" k="41" />
-<hkern u1="&#x478;" u2="&#x2e;" k="82" />
-<hkern u1="&#x478;" u2="&#x2c;" k="82" />
-<hkern u1="&#x479;" u2="&#x201e;" k="82" />
-<hkern u1="&#x479;" u2="&#x201a;" k="82" />
-<hkern u1="&#x479;" u2="&#x513;" k="41" />
-<hkern u1="&#x479;" u2="&#x509;" k="41" />
-<hkern u1="&#x479;" u2="&#x4c6;" k="41" />
-<hkern u1="&#x479;" u2="&#x467;" k="41" />
-<hkern u1="&#x479;" u2="&#x459;" k="41" />
-<hkern u1="&#x479;" u2="&#x43b;" k="41" />
-<hkern u1="&#x479;" u2="&#x434;" k="41" />
-<hkern u1="&#x479;" u2="&#x2e;" k="82" />
-<hkern u1="&#x479;" u2="&#x2c;" k="82" />
-<hkern u1="&#x47a;" u2="&#x201e;" k="82" />
-<hkern u1="&#x47a;" u2="&#x201a;" k="82" />
-<hkern u1="&#x47a;" u2="&#x513;" k="20" />
-<hkern u1="&#x47a;" u2="&#x512;" k="41" />
-<hkern u1="&#x47a;" u2="&#x50e;" k="20" />
-<hkern u1="&#x47a;" u2="&#x509;" k="20" />
-<hkern u1="&#x47a;" u2="&#x508;" k="41" />
-<hkern u1="&#x47a;" u2="&#x506;" k="41" />
-<hkern u1="&#x47a;" u2="&#x504;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x47a;" u2="&#x4de;" k="20" />
-<hkern u1="&#x47a;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x47a;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x47a;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x47a;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x47a;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x47a;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x47a;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x47a;" u2="&#x498;" k="20" />
-<hkern u1="&#x47a;" u2="&#x496;" k="41" />
-<hkern u1="&#x47a;" u2="&#x476;" k="20" />
-<hkern u1="&#x47a;" u2="&#x474;" k="20" />
-<hkern u1="&#x47a;" u2="&#x470;" k="41" />
-<hkern u1="&#x47a;" u2="&#x46e;" k="20" />
-<hkern u1="&#x47a;" u2="&#x467;" k="20" />
-<hkern u1="&#x47a;" u2="&#x466;" k="41" />
-<hkern u1="&#x47a;" u2="&#x459;" k="20" />
-<hkern u1="&#x47a;" u2="&#x43b;" k="20" />
-<hkern u1="&#x47a;" u2="&#x434;" k="20" />
-<hkern u1="&#x47a;" u2="&#x42d;" k="20" />
-<hkern u1="&#x47a;" u2="&#x42a;" k="20" />
-<hkern u1="&#x47a;" u2="&#x427;" k="41" />
-<hkern u1="&#x47a;" u2="&#x425;" k="41" />
-<hkern u1="&#x47a;" u2="&#x423;" k="41" />
-<hkern u1="&#x47a;" u2="&#x422;" k="61" />
-<hkern u1="&#x47a;" u2="&#x41b;" k="41" />
-<hkern u1="&#x47a;" u2="&#x417;" k="20" />
-<hkern u1="&#x47a;" u2="&#x416;" k="41" />
-<hkern u1="&#x47a;" u2="&#x414;" k="41" />
-<hkern u1="&#x47a;" u2="&#x410;" k="41" />
-<hkern u1="&#x47a;" u2="&#x40e;" k="41" />
-<hkern u1="&#x47a;" u2="&#x40b;" k="20" />
-<hkern u1="&#x47a;" u2="&#x409;" k="41" />
-<hkern u1="&#x47a;" u2="&#x402;" k="20" />
-<hkern u1="&#x47a;" u2="&#x2e;" k="82" />
-<hkern u1="&#x47a;" u2="&#x2c;" k="82" />
-<hkern u1="&#x47b;" u2="&#x201d;" k="20" />
-<hkern u1="&#x47b;" u2="&#x2019;" k="20" />
-<hkern u1="&#x47b;" u2="&#x50f;" k="20" />
-<hkern u1="&#x47b;" u2="&#x507;" k="20" />
-<hkern u1="&#x47b;" u2="&#x505;" k="20" />
-<hkern u1="&#x47b;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x47b;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x47b;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x47b;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x47b;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x47b;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x47b;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x47b;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x47b;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x47b;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x47b;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x47b;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x47b;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x47b;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x47b;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x47b;" u2="&#x497;" k="41" />
-<hkern u1="&#x47b;" u2="&#x45e;" k="20" />
-<hkern u1="&#x47b;" u2="&#x44a;" k="20" />
-<hkern u1="&#x47b;" u2="&#x447;" k="20" />
-<hkern u1="&#x47b;" u2="&#x445;" k="41" />
-<hkern u1="&#x47b;" u2="&#x443;" k="20" />
-<hkern u1="&#x47b;" u2="&#x442;" k="20" />
-<hkern u1="&#x47b;" u2="&#x436;" k="41" />
-<hkern u1="&#x47b;" u2="&#x27;" k="20" />
-<hkern u1="&#x47b;" u2="&#x22;" k="20" />
-<hkern u1="&#x47c;" u2="&#x201e;" k="82" />
-<hkern u1="&#x47c;" u2="&#x201a;" k="82" />
-<hkern u1="&#x47c;" u2="&#x513;" k="20" />
-<hkern u1="&#x47c;" u2="&#x512;" k="41" />
-<hkern u1="&#x47c;" u2="&#x50e;" k="20" />
-<hkern u1="&#x47c;" u2="&#x509;" k="20" />
-<hkern u1="&#x47c;" u2="&#x508;" k="41" />
-<hkern u1="&#x47c;" u2="&#x506;" k="41" />
-<hkern u1="&#x47c;" u2="&#x504;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x47c;" u2="&#x4de;" k="20" />
-<hkern u1="&#x47c;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x47c;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x47c;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x47c;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x47c;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x47c;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x47c;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x47c;" u2="&#x498;" k="20" />
-<hkern u1="&#x47c;" u2="&#x496;" k="41" />
-<hkern u1="&#x47c;" u2="&#x476;" k="20" />
-<hkern u1="&#x47c;" u2="&#x474;" k="20" />
-<hkern u1="&#x47c;" u2="&#x470;" k="41" />
-<hkern u1="&#x47c;" u2="&#x46e;" k="20" />
-<hkern u1="&#x47c;" u2="&#x467;" k="20" />
-<hkern u1="&#x47c;" u2="&#x466;" k="41" />
-<hkern u1="&#x47c;" u2="&#x459;" k="20" />
-<hkern u1="&#x47c;" u2="&#x43b;" k="20" />
-<hkern u1="&#x47c;" u2="&#x434;" k="20" />
-<hkern u1="&#x47c;" u2="&#x42d;" k="20" />
-<hkern u1="&#x47c;" u2="&#x42a;" k="20" />
-<hkern u1="&#x47c;" u2="&#x427;" k="41" />
-<hkern u1="&#x47c;" u2="&#x425;" k="41" />
-<hkern u1="&#x47c;" u2="&#x423;" k="41" />
-<hkern u1="&#x47c;" u2="&#x422;" k="61" />
-<hkern u1="&#x47c;" u2="&#x41b;" k="41" />
-<hkern u1="&#x47c;" u2="&#x417;" k="20" />
-<hkern u1="&#x47c;" u2="&#x416;" k="41" />
-<hkern u1="&#x47c;" u2="&#x414;" k="41" />
-<hkern u1="&#x47c;" u2="&#x410;" k="41" />
-<hkern u1="&#x47c;" u2="&#x40e;" k="41" />
-<hkern u1="&#x47c;" u2="&#x40b;" k="20" />
-<hkern u1="&#x47c;" u2="&#x409;" k="41" />
-<hkern u1="&#x47c;" u2="&#x402;" k="20" />
-<hkern u1="&#x47c;" u2="&#x2e;" k="82" />
-<hkern u1="&#x47c;" u2="&#x2c;" k="82" />
-<hkern u1="&#x47d;" u2="&#x201d;" k="20" />
-<hkern u1="&#x47d;" u2="&#x2019;" k="20" />
-<hkern u1="&#x47d;" u2="&#x50f;" k="20" />
-<hkern u1="&#x47d;" u2="&#x507;" k="20" />
-<hkern u1="&#x47d;" u2="&#x505;" k="20" />
-<hkern u1="&#x47d;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x47d;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x47d;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x47d;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x47d;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x47d;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x47d;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x47d;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x47d;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x47d;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x47d;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x47d;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x47d;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x47d;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x47d;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x47d;" u2="&#x497;" k="41" />
-<hkern u1="&#x47d;" u2="&#x45e;" k="20" />
-<hkern u1="&#x47d;" u2="&#x44a;" k="20" />
-<hkern u1="&#x47d;" u2="&#x447;" k="20" />
-<hkern u1="&#x47d;" u2="&#x445;" k="41" />
-<hkern u1="&#x47d;" u2="&#x443;" k="20" />
-<hkern u1="&#x47d;" u2="&#x442;" k="20" />
-<hkern u1="&#x47d;" u2="&#x436;" k="41" />
-<hkern u1="&#x47d;" u2="&#x27;" k="20" />
-<hkern u1="&#x47d;" u2="&#x22;" k="20" />
-<hkern u1="&#x47e;" u2="&#x201e;" k="82" />
-<hkern u1="&#x47e;" u2="&#x201a;" k="82" />
-<hkern u1="&#x47e;" u2="&#x513;" k="20" />
-<hkern u1="&#x47e;" u2="&#x512;" k="41" />
-<hkern u1="&#x47e;" u2="&#x50e;" k="20" />
-<hkern u1="&#x47e;" u2="&#x509;" k="20" />
-<hkern u1="&#x47e;" u2="&#x508;" k="41" />
-<hkern u1="&#x47e;" u2="&#x506;" k="41" />
-<hkern u1="&#x47e;" u2="&#x504;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x47e;" u2="&#x4de;" k="20" />
-<hkern u1="&#x47e;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x47e;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x47e;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x47e;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x47e;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x47e;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x47e;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x47e;" u2="&#x498;" k="20" />
-<hkern u1="&#x47e;" u2="&#x496;" k="41" />
-<hkern u1="&#x47e;" u2="&#x476;" k="20" />
-<hkern u1="&#x47e;" u2="&#x474;" k="20" />
-<hkern u1="&#x47e;" u2="&#x470;" k="41" />
-<hkern u1="&#x47e;" u2="&#x46e;" k="20" />
-<hkern u1="&#x47e;" u2="&#x467;" k="20" />
-<hkern u1="&#x47e;" u2="&#x466;" k="41" />
-<hkern u1="&#x47e;" u2="&#x459;" k="20" />
-<hkern u1="&#x47e;" u2="&#x43b;" k="20" />
-<hkern u1="&#x47e;" u2="&#x434;" k="20" />
-<hkern u1="&#x47e;" u2="&#x42d;" k="20" />
-<hkern u1="&#x47e;" u2="&#x42a;" k="20" />
-<hkern u1="&#x47e;" u2="&#x427;" k="41" />
-<hkern u1="&#x47e;" u2="&#x425;" k="41" />
-<hkern u1="&#x47e;" u2="&#x423;" k="41" />
-<hkern u1="&#x47e;" u2="&#x422;" k="61" />
-<hkern u1="&#x47e;" u2="&#x41b;" k="41" />
-<hkern u1="&#x47e;" u2="&#x417;" k="20" />
-<hkern u1="&#x47e;" u2="&#x416;" k="41" />
-<hkern u1="&#x47e;" u2="&#x414;" k="41" />
-<hkern u1="&#x47e;" u2="&#x410;" k="41" />
-<hkern u1="&#x47e;" u2="&#x40e;" k="41" />
-<hkern u1="&#x47e;" u2="&#x40b;" k="20" />
-<hkern u1="&#x47e;" u2="&#x409;" k="41" />
-<hkern u1="&#x47e;" u2="&#x402;" k="20" />
-<hkern u1="&#x47e;" u2="&#x2e;" k="82" />
-<hkern u1="&#x47e;" u2="&#x2c;" k="82" />
-<hkern u1="&#x47f;" u2="&#x201e;" k="82" />
-<hkern u1="&#x47f;" u2="&#x201a;" k="82" />
-<hkern u1="&#x47f;" u2="&#x513;" k="41" />
-<hkern u1="&#x47f;" u2="&#x509;" k="41" />
-<hkern u1="&#x47f;" u2="&#x4c6;" k="41" />
-<hkern u1="&#x47f;" u2="&#x467;" k="41" />
-<hkern u1="&#x47f;" u2="&#x459;" k="41" />
-<hkern u1="&#x47f;" u2="&#x43b;" k="41" />
-<hkern u1="&#x47f;" u2="&#x434;" k="41" />
-<hkern u1="&#x47f;" u2="&#x2e;" k="82" />
-<hkern u1="&#x47f;" u2="&#x2c;" k="82" />
-<hkern u1="&#x480;" u2="&#x50c;" k="41" />
-<hkern u1="&#x480;" u2="&#x507;" k="41" />
-<hkern u1="&#x480;" u2="&#x505;" k="41" />
-<hkern u1="&#x480;" u2="&#x502;" k="41" />
-<hkern u1="&#x480;" u2="&#x500;" k="41" />
-<hkern u1="&#x480;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x480;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x480;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x480;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x480;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x480;" u2="&#x4be;" k="41" />
-<hkern u1="&#x480;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x480;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x480;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x480;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x480;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x480;" u2="&#x480;" k="41" />
-<hkern u1="&#x480;" u2="&#x47e;" k="41" />
-<hkern u1="&#x480;" u2="&#x47c;" k="41" />
-<hkern u1="&#x480;" u2="&#x47a;" k="41" />
-<hkern u1="&#x480;" u2="&#x478;" k="41" />
-<hkern u1="&#x480;" u2="&#x472;" k="41" />
-<hkern u1="&#x480;" u2="&#x460;" k="41" />
-<hkern u1="&#x480;" u2="&#x447;" k="41" />
-<hkern u1="&#x480;" u2="&#x424;" k="41" />
-<hkern u1="&#x480;" u2="&#x421;" k="41" />
-<hkern u1="&#x480;" u2="&#x41e;" k="41" />
-<hkern u1="&#x480;" u2="&#x404;" k="41" />
-<hkern u1="&#x48a;" u2="&#x507;" k="41" />
-<hkern u1="&#x48a;" u2="&#x505;" k="41" />
-<hkern u1="&#x48a;" u2="&#x4e1;" k="-41" />
-<hkern u1="&#x48a;" u2="&#x408;" k="-225" />
-<hkern u1="&#x48b;" u2="&#x201d;" k="20" />
-<hkern u1="&#x48b;" u2="&#x2019;" k="20" />
-<hkern u1="&#x48b;" u2="&#x27;" k="20" />
-<hkern u1="&#x48b;" u2="&#x22;" k="20" />
-<hkern u1="&#x48c;" u2="&#x201d;" k="82" />
-<hkern u1="&#x48c;" u2="&#x2019;" k="82" />
-<hkern u1="&#x48c;" u2="&#x50f;" k="41" />
-<hkern u1="&#x48c;" u2="&#x50e;" k="41" />
-<hkern u1="&#x48c;" u2="&#x506;" k="102" />
-<hkern u1="&#x48c;" u2="&#x504;" k="102" />
-<hkern u1="&#x48c;" u2="&#x4f4;" k="82" />
-<hkern u1="&#x48c;" u2="&#x4cb;" k="82" />
-<hkern u1="&#x48c;" u2="&#x4b8;" k="82" />
-<hkern u1="&#x48c;" u2="&#x4b6;" k="82" />
-<hkern u1="&#x48c;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x48c;" u2="&#x4b4;" k="41" />
-<hkern u1="&#x48c;" u2="&#x4b0;" k="61" />
-<hkern u1="&#x48c;" u2="&#x4ae;" k="61" />
-<hkern u1="&#x48c;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x48c;" u2="&#x4ac;" k="82" />
-<hkern u1="&#x48c;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x48c;" u2="&#x4a0;" k="41" />
-<hkern u1="&#x48c;" u2="&#x476;" k="61" />
-<hkern u1="&#x48c;" u2="&#x474;" k="61" />
-<hkern u1="&#x48c;" u2="&#x470;" k="82" />
-<hkern u1="&#x48c;" u2="&#x44a;" k="41" />
-<hkern u1="&#x48c;" u2="&#x442;" k="41" />
-<hkern u1="&#x48c;" u2="&#x42a;" k="41" />
-<hkern u1="&#x48c;" u2="&#x427;" k="82" />
-<hkern u1="&#x48c;" u2="&#x422;" k="82" />
-<hkern u1="&#x48c;" u2="&#x40b;" k="41" />
-<hkern u1="&#x48c;" u2="&#x402;" k="41" />
-<hkern u1="&#x48c;" u2="&#x27;" k="82" />
-<hkern u1="&#x48c;" u2="&#x22;" k="82" />
-<hkern u1="&#x48d;" u2="&#x201d;" k="123" />
-<hkern u1="&#x48d;" u2="&#x2019;" k="123" />
-<hkern u1="&#x48d;" u2="&#x50f;" k="102" />
-<hkern u1="&#x48d;" u2="&#x507;" k="102" />
-<hkern u1="&#x48d;" u2="&#x505;" k="102" />
-<hkern u1="&#x48d;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x48d;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x48d;" u2="&#x4f5;" k="82" />
-<hkern u1="&#x48d;" u2="&#x4f3;" k="61" />
-<hkern u1="&#x48d;" u2="&#x4f1;" k="61" />
-<hkern u1="&#x48d;" u2="&#x4ef;" k="61" />
-<hkern u1="&#x48d;" u2="&#x4e1;" k="41" />
-<hkern u1="&#x48d;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x48d;" u2="&#x4cc;" k="82" />
-<hkern u1="&#x48d;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x48d;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x48d;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x48d;" u2="&#x4b9;" k="82" />
-<hkern u1="&#x48d;" u2="&#x4b7;" k="82" />
-<hkern u1="&#x48d;" u2="&#x4b5;" k="102" />
-<hkern u1="&#x48d;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x48d;" u2="&#x4b1;" k="61" />
-<hkern u1="&#x48d;" u2="&#x4af;" k="61" />
-<hkern u1="&#x48d;" u2="&#x4ad;" k="102" />
-<hkern u1="&#x48d;" u2="&#x4a1;" k="102" />
-<hkern u1="&#x48d;" u2="&#x497;" k="41" />
-<hkern u1="&#x48d;" u2="&#x47f;" k="41" />
-<hkern u1="&#x48d;" u2="&#x477;" k="41" />
-<hkern u1="&#x48d;" u2="&#x475;" k="41" />
-<hkern u1="&#x48d;" u2="&#x461;" k="41" />
-<hkern u1="&#x48d;" u2="&#x45e;" k="61" />
-<hkern u1="&#x48d;" u2="&#x44a;" k="102" />
-<hkern u1="&#x48d;" u2="&#x447;" k="82" />
-<hkern u1="&#x48d;" u2="&#x445;" k="41" />
-<hkern u1="&#x48d;" u2="&#x443;" k="61" />
-<hkern u1="&#x48d;" u2="&#x442;" k="102" />
-<hkern u1="&#x48d;" u2="&#x436;" k="41" />
-<hkern u1="&#x48d;" u2="&#x27;" k="123" />
-<hkern u1="&#x48d;" u2="&#x22;" k="123" />
-<hkern u1="&#x48e;" u2="&#x201e;" k="266" />
-<hkern u1="&#x48e;" u2="&#x201a;" k="266" />
-<hkern u1="&#x48e;" u2="&#x513;" k="102" />
-<hkern u1="&#x48e;" u2="&#x512;" k="123" />
-<hkern u1="&#x48e;" u2="&#x509;" k="102" />
-<hkern u1="&#x48e;" u2="&#x508;" k="123" />
-<hkern u1="&#x48e;" u2="&#x502;" k="82" />
-<hkern u1="&#x48e;" u2="&#x500;" k="82" />
-<hkern u1="&#x48e;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x48e;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x48e;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x48e;" u2="&#x4d4;" k="102" />
-<hkern u1="&#x48e;" u2="&#x4d2;" k="102" />
-<hkern u1="&#x48e;" u2="&#x4d0;" k="102" />
-<hkern u1="&#x48e;" u2="&#x4c6;" k="102" />
-<hkern u1="&#x48e;" u2="&#x4c5;" k="123" />
-<hkern u1="&#x48e;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x48e;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x48e;" u2="&#x496;" k="41" />
-<hkern u1="&#x48e;" u2="&#x46a;" k="20" />
-<hkern u1="&#x48e;" u2="&#x467;" k="102" />
-<hkern u1="&#x48e;" u2="&#x466;" k="102" />
-<hkern u1="&#x48e;" u2="&#x459;" k="102" />
-<hkern u1="&#x48e;" u2="&#x43b;" k="102" />
-<hkern u1="&#x48e;" u2="&#x434;" k="102" />
-<hkern u1="&#x48e;" u2="&#x425;" k="41" />
-<hkern u1="&#x48e;" u2="&#x41b;" k="123" />
-<hkern u1="&#x48e;" u2="&#x416;" k="41" />
-<hkern u1="&#x48e;" u2="&#x414;" k="123" />
-<hkern u1="&#x48e;" u2="&#x410;" k="102" />
-<hkern u1="&#x48e;" u2="&#x409;" k="123" />
-<hkern u1="&#x48e;" u2="&#x2e;" k="266" />
-<hkern u1="&#x48e;" u2="&#x2c;" k="266" />
-<hkern u1="&#x48f;" u2="&#x201d;" k="20" />
-<hkern u1="&#x48f;" u2="&#x2019;" k="20" />
-<hkern u1="&#x48f;" u2="&#x50f;" k="20" />
-<hkern u1="&#x48f;" u2="&#x507;" k="20" />
-<hkern u1="&#x48f;" u2="&#x505;" k="20" />
-<hkern u1="&#x48f;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x48f;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x48f;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x48f;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x48f;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x48f;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x48f;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x48f;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x48f;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x48f;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x48f;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x48f;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x48f;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x48f;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x48f;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x48f;" u2="&#x497;" k="41" />
-<hkern u1="&#x48f;" u2="&#x45e;" k="20" />
-<hkern u1="&#x48f;" u2="&#x44a;" k="20" />
-<hkern u1="&#x48f;" u2="&#x447;" k="20" />
-<hkern u1="&#x48f;" u2="&#x445;" k="41" />
-<hkern u1="&#x48f;" u2="&#x443;" k="20" />
-<hkern u1="&#x48f;" u2="&#x442;" k="20" />
-<hkern u1="&#x48f;" u2="&#x436;" k="41" />
-<hkern u1="&#x48f;" u2="&#x27;" k="20" />
-<hkern u1="&#x48f;" u2="&#x22;" k="20" />
-<hkern u1="&#x490;" u2="&#x201e;" k="123" />
-<hkern u1="&#x490;" u2="&#x201a;" k="123" />
-<hkern u1="&#x490;" u2="&#x2015;" k="82" />
-<hkern u1="&#x490;" u2="&#x2014;" k="82" />
-<hkern u1="&#x490;" u2="&#x2013;" k="82" />
-<hkern u1="&#x490;" u2="&#x513;" k="123" />
-<hkern u1="&#x490;" u2="&#x512;" k="102" />
-<hkern u1="&#x490;" u2="&#x511;" k="143" />
-<hkern u1="&#x490;" u2="&#x50f;" k="82" />
-<hkern u1="&#x490;" u2="&#x50d;" k="143" />
-<hkern u1="&#x490;" u2="&#x50c;" k="41" />
-<hkern u1="&#x490;" u2="&#x50b;" k="102" />
-<hkern u1="&#x490;" u2="&#x509;" k="123" />
-<hkern u1="&#x490;" u2="&#x508;" k="102" />
-<hkern u1="&#x490;" u2="&#x507;" k="102" />
-<hkern u1="&#x490;" u2="&#x505;" k="102" />
-<hkern u1="&#x490;" u2="&#x503;" k="143" />
-<hkern u1="&#x490;" u2="&#x502;" k="143" />
-<hkern u1="&#x490;" u2="&#x501;" k="143" />
-<hkern u1="&#x490;" u2="&#x500;" k="143" />
-<hkern u1="&#x490;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x490;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x490;" u2="&#x4f9;" k="102" />
-<hkern u1="&#x490;" u2="&#x4f7;" k="102" />
-<hkern u1="&#x490;" u2="&#x4f5;" k="102" />
-<hkern u1="&#x490;" u2="&#x4f3;" k="82" />
-<hkern u1="&#x490;" u2="&#x4f1;" k="82" />
-<hkern u1="&#x490;" u2="&#x4ef;" k="82" />
-<hkern u1="&#x490;" u2="&#x4ed;" k="41" />
-<hkern u1="&#x490;" u2="&#x4eb;" k="143" />
-<hkern u1="&#x490;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x490;" u2="&#x4e9;" k="143" />
-<hkern u1="&#x490;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x490;" u2="&#x4e7;" k="143" />
-<hkern u1="&#x490;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x490;" u2="&#x4e5;" k="102" />
-<hkern u1="&#x490;" u2="&#x4e3;" k="102" />
-<hkern u1="&#x490;" u2="&#x4e1;" k="61" />
-<hkern u1="&#x490;" u2="&#x4df;" k="41" />
-<hkern u1="&#x490;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x490;" u2="&#x4d7;" k="143" />
-<hkern u1="&#x490;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x490;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x490;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x490;" u2="&#x4ce;" k="102" />
-<hkern u1="&#x490;" u2="&#x4cc;" k="102" />
-<hkern u1="&#x490;" u2="&#x4ca;" k="102" />
-<hkern u1="&#x490;" u2="&#x4c8;" k="102" />
-<hkern u1="&#x490;" u2="&#x4c6;" k="123" />
-<hkern u1="&#x490;" u2="&#x4c5;" k="102" />
-<hkern u1="&#x490;" u2="&#x4c4;" k="102" />
-<hkern u1="&#x490;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x490;" u2="&#x4bf;" k="143" />
-<hkern u1="&#x490;" u2="&#x4be;" k="102" />
-<hkern u1="&#x490;" u2="&#x4bd;" k="143" />
-<hkern u1="&#x490;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x490;" u2="&#x4bb;" k="102" />
-<hkern u1="&#x490;" u2="&#x4b9;" k="102" />
-<hkern u1="&#x490;" u2="&#x4b7;" k="102" />
-<hkern u1="&#x490;" u2="&#x4b5;" k="82" />
-<hkern u1="&#x490;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x490;" u2="&#x4b1;" k="82" />
-<hkern u1="&#x490;" u2="&#x4af;" k="82" />
-<hkern u1="&#x490;" u2="&#x4ad;" k="82" />
-<hkern u1="&#x490;" u2="&#x4ac;" k="-41" />
-<hkern u1="&#x490;" u2="&#x4ab;" k="143" />
-<hkern u1="&#x490;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x490;" u2="&#x4a9;" k="143" />
-<hkern u1="&#x490;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x490;" u2="&#x4a7;" k="102" />
-<hkern u1="&#x490;" u2="&#x4a5;" k="102" />
-<hkern u1="&#x490;" u2="&#x4a3;" k="102" />
-<hkern u1="&#x490;" u2="&#x4a1;" k="82" />
-<hkern u1="&#x490;" u2="&#x49d;" k="102" />
-<hkern u1="&#x490;" u2="&#x49b;" k="102" />
-<hkern u1="&#x490;" u2="&#x499;" k="41" />
-<hkern u1="&#x490;" u2="&#x497;" k="41" />
-<hkern u1="&#x490;" u2="&#x495;" k="102" />
-<hkern u1="&#x490;" u2="&#x491;" k="102" />
-<hkern u1="&#x490;" u2="&#x48f;" k="102" />
-<hkern u1="&#x490;" u2="&#x48b;" k="102" />
-<hkern u1="&#x490;" u2="&#x481;" k="143" />
-<hkern u1="&#x490;" u2="&#x480;" k="41" />
-<hkern u1="&#x490;" u2="&#x47f;" k="41" />
-<hkern u1="&#x490;" u2="&#x47e;" k="41" />
-<hkern u1="&#x490;" u2="&#x47d;" k="143" />
-<hkern u1="&#x490;" u2="&#x47c;" k="41" />
-<hkern u1="&#x490;" u2="&#x47b;" k="143" />
-<hkern u1="&#x490;" u2="&#x47a;" k="41" />
-<hkern u1="&#x490;" u2="&#x479;" k="143" />
-<hkern u1="&#x490;" u2="&#x478;" k="41" />
-<hkern u1="&#x490;" u2="&#x477;" k="41" />
-<hkern u1="&#x490;" u2="&#x475;" k="41" />
-<hkern u1="&#x490;" u2="&#x473;" k="143" />
-<hkern u1="&#x490;" u2="&#x472;" k="41" />
-<hkern u1="&#x490;" u2="&#x471;" k="102" />
-<hkern u1="&#x490;" u2="&#x46d;" k="102" />
-<hkern u1="&#x490;" u2="&#x46b;" k="102" />
-<hkern u1="&#x490;" u2="&#x469;" k="102" />
-<hkern u1="&#x490;" u2="&#x467;" k="123" />
-<hkern u1="&#x490;" u2="&#x466;" k="143" />
-<hkern u1="&#x490;" u2="&#x465;" k="102" />
-<hkern u1="&#x490;" u2="&#x461;" k="41" />
-<hkern u1="&#x490;" u2="&#x460;" k="41" />
-<hkern u1="&#x490;" u2="&#x45f;" k="102" />
-<hkern u1="&#x490;" u2="&#x45e;" k="82" />
-<hkern u1="&#x490;" u2="&#x45d;" k="102" />
-<hkern u1="&#x490;" u2="&#x45c;" k="102" />
-<hkern u1="&#x490;" u2="&#x45a;" k="102" />
-<hkern u1="&#x490;" u2="&#x459;" k="123" />
-<hkern u1="&#x490;" u2="&#x455;" k="123" />
-<hkern u1="&#x490;" u2="&#x454;" k="143" />
-<hkern u1="&#x490;" u2="&#x453;" k="102" />
-<hkern u1="&#x490;" u2="&#x451;" k="143" />
-<hkern u1="&#x490;" u2="&#x450;" k="143" />
-<hkern u1="&#x490;" u2="&#x44f;" k="61" />
-<hkern u1="&#x490;" u2="&#x44e;" k="102" />
-<hkern u1="&#x490;" u2="&#x44d;" k="41" />
-<hkern u1="&#x490;" u2="&#x44c;" k="102" />
-<hkern u1="&#x490;" u2="&#x44b;" k="102" />
-<hkern u1="&#x490;" u2="&#x44a;" k="82" />
-<hkern u1="&#x490;" u2="&#x449;" k="102" />
-<hkern u1="&#x490;" u2="&#x448;" k="102" />
-<hkern u1="&#x490;" u2="&#x447;" k="102" />
-<hkern u1="&#x490;" u2="&#x446;" k="102" />
-<hkern u1="&#x490;" u2="&#x445;" k="41" />
-<hkern u1="&#x490;" u2="&#x444;" k="143" />
-<hkern u1="&#x490;" u2="&#x443;" k="82" />
-<hkern u1="&#x490;" u2="&#x442;" k="82" />
-<hkern u1="&#x490;" u2="&#x441;" k="143" />
-<hkern u1="&#x490;" u2="&#x440;" k="102" />
-<hkern u1="&#x490;" u2="&#x43f;" k="102" />
-<hkern u1="&#x490;" u2="&#x43e;" k="143" />
-<hkern u1="&#x490;" u2="&#x43d;" k="102" />
-<hkern u1="&#x490;" u2="&#x43c;" k="102" />
-<hkern u1="&#x490;" u2="&#x43b;" k="123" />
-<hkern u1="&#x490;" u2="&#x43a;" k="102" />
-<hkern u1="&#x490;" u2="&#x439;" k="102" />
-<hkern u1="&#x490;" u2="&#x438;" k="102" />
-<hkern u1="&#x490;" u2="&#x437;" k="41" />
-<hkern u1="&#x490;" u2="&#x436;" k="41" />
-<hkern u1="&#x490;" u2="&#x435;" k="143" />
-<hkern u1="&#x490;" u2="&#x434;" k="123" />
-<hkern u1="&#x490;" u2="&#x433;" k="102" />
-<hkern u1="&#x490;" u2="&#x432;" k="102" />
-<hkern u1="&#x490;" u2="&#x424;" k="82" />
-<hkern u1="&#x490;" u2="&#x422;" k="-41" />
-<hkern u1="&#x490;" u2="&#x421;" k="41" />
-<hkern u1="&#x490;" u2="&#x41e;" k="41" />
-<hkern u1="&#x490;" u2="&#x41b;" k="102" />
-<hkern u1="&#x490;" u2="&#x414;" k="102" />
-<hkern u1="&#x490;" u2="&#x410;" k="143" />
-<hkern u1="&#x490;" u2="&#x409;" k="102" />
-<hkern u1="&#x490;" u2="&#x404;" k="41" />
-<hkern u1="&#x490;" u2="&#x2e;" k="123" />
-<hkern u1="&#x490;" u2="&#x2d;" k="82" />
-<hkern u1="&#x490;" u2="&#x2c;" k="123" />
-<hkern u1="&#x491;" u2="&#x201e;" k="102" />
-<hkern u1="&#x491;" u2="&#x201a;" k="102" />
-<hkern u1="&#x491;" u2="&#x2015;" k="41" />
-<hkern u1="&#x491;" u2="&#x2014;" k="41" />
-<hkern u1="&#x491;" u2="&#x2013;" k="41" />
-<hkern u1="&#x491;" u2="&#x513;" k="61" />
-<hkern u1="&#x491;" u2="&#x511;" k="20" />
-<hkern u1="&#x491;" u2="&#x50d;" k="20" />
-<hkern u1="&#x491;" u2="&#x509;" k="61" />
-<hkern u1="&#x491;" u2="&#x503;" k="20" />
-<hkern u1="&#x491;" u2="&#x501;" k="20" />
-<hkern u1="&#x491;" u2="&#x4eb;" k="20" />
-<hkern u1="&#x491;" u2="&#x4e9;" k="20" />
-<hkern u1="&#x491;" u2="&#x4e7;" k="20" />
-<hkern u1="&#x491;" u2="&#x4d7;" k="20" />
-<hkern u1="&#x491;" u2="&#x4c6;" k="61" />
-<hkern u1="&#x491;" u2="&#x4ab;" k="20" />
-<hkern u1="&#x491;" u2="&#x4a9;" k="20" />
-<hkern u1="&#x491;" u2="&#x481;" k="20" />
-<hkern u1="&#x491;" u2="&#x47d;" k="20" />
-<hkern u1="&#x491;" u2="&#x47b;" k="20" />
-<hkern u1="&#x491;" u2="&#x479;" k="20" />
-<hkern u1="&#x491;" u2="&#x473;" k="20" />
-<hkern u1="&#x491;" u2="&#x467;" k="61" />
-<hkern u1="&#x491;" u2="&#x459;" k="61" />
-<hkern u1="&#x491;" u2="&#x454;" k="20" />
-<hkern u1="&#x491;" u2="&#x451;" k="20" />
-<hkern u1="&#x491;" u2="&#x450;" k="20" />
-<hkern u1="&#x491;" u2="&#x444;" k="20" />
-<hkern u1="&#x491;" u2="&#x441;" k="20" />
-<hkern u1="&#x491;" u2="&#x43e;" k="20" />
-<hkern u1="&#x491;" u2="&#x43b;" k="61" />
-<hkern u1="&#x491;" u2="&#x435;" k="20" />
-<hkern u1="&#x491;" u2="&#x434;" k="61" />
-<hkern u1="&#x491;" u2="&#x2e;" k="102" />
-<hkern u1="&#x491;" u2="&#x2d;" k="41" />
-<hkern u1="&#x491;" u2="&#x2c;" k="102" />
-<hkern u1="&#x492;" u2="&#x201e;" k="102" />
-<hkern u1="&#x492;" u2="&#x201a;" k="102" />
-<hkern u1="&#x492;" u2="&#x2015;" k="41" />
-<hkern u1="&#x492;" u2="&#x2014;" k="41" />
-<hkern u1="&#x492;" u2="&#x2013;" k="41" />
-<hkern u1="&#x492;" u2="&#x513;" k="102" />
-<hkern u1="&#x492;" u2="&#x512;" k="82" />
-<hkern u1="&#x492;" u2="&#x511;" k="82" />
-<hkern u1="&#x492;" u2="&#x50e;" k="-41" />
-<hkern u1="&#x492;" u2="&#x50d;" k="82" />
-<hkern u1="&#x492;" u2="&#x50c;" k="41" />
-<hkern u1="&#x492;" u2="&#x50b;" k="61" />
-<hkern u1="&#x492;" u2="&#x509;" k="102" />
-<hkern u1="&#x492;" u2="&#x508;" k="82" />
-<hkern u1="&#x492;" u2="&#x507;" k="41" />
-<hkern u1="&#x492;" u2="&#x505;" k="41" />
-<hkern u1="&#x492;" u2="&#x503;" k="82" />
-<hkern u1="&#x492;" u2="&#x502;" k="102" />
-<hkern u1="&#x492;" u2="&#x501;" k="82" />
-<hkern u1="&#x492;" u2="&#x500;" k="102" />
-<hkern u1="&#x492;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x492;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x492;" u2="&#x4f9;" k="61" />
-<hkern u1="&#x492;" u2="&#x4f7;" k="61" />
-<hkern u1="&#x492;" u2="&#x4f5;" k="102" />
-<hkern u1="&#x492;" u2="&#x4ed;" k="41" />
-<hkern u1="&#x492;" u2="&#x4eb;" k="82" />
-<hkern u1="&#x492;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x492;" u2="&#x4e9;" k="82" />
-<hkern u1="&#x492;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x492;" u2="&#x4e7;" k="82" />
-<hkern u1="&#x492;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x492;" u2="&#x4e5;" k="61" />
-<hkern u1="&#x492;" u2="&#x4e3;" k="61" />
-<hkern u1="&#x492;" u2="&#x4df;" k="41" />
-<hkern u1="&#x492;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x492;" u2="&#x4d7;" k="82" />
-<hkern u1="&#x492;" u2="&#x4d4;" k="123" />
-<hkern u1="&#x492;" u2="&#x4d2;" k="123" />
-<hkern u1="&#x492;" u2="&#x4d0;" k="123" />
-<hkern u1="&#x492;" u2="&#x4ce;" k="61" />
-<hkern u1="&#x492;" u2="&#x4cc;" k="102" />
-<hkern u1="&#x492;" u2="&#x4ca;" k="61" />
-<hkern u1="&#x492;" u2="&#x4c8;" k="61" />
-<hkern u1="&#x492;" u2="&#x4c6;" k="102" />
-<hkern u1="&#x492;" u2="&#x4c5;" k="82" />
-<hkern u1="&#x492;" u2="&#x4c4;" k="61" />
-<hkern u1="&#x492;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x492;" u2="&#x4bf;" k="61" />
-<hkern u1="&#x492;" u2="&#x4be;" k="41" />
-<hkern u1="&#x492;" u2="&#x4bd;" k="61" />
-<hkern u1="&#x492;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x492;" u2="&#x4bb;" k="61" />
-<hkern u1="&#x492;" u2="&#x4b9;" k="102" />
-<hkern u1="&#x492;" u2="&#x4b7;" k="102" />
-<hkern u1="&#x492;" u2="&#x4b4;" k="-41" />
-<hkern u1="&#x492;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x492;" u2="&#x4ac;" k="-41" />
-<hkern u1="&#x492;" u2="&#x4ab;" k="82" />
-<hkern u1="&#x492;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x492;" u2="&#x4a9;" k="82" />
-<hkern u1="&#x492;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x492;" u2="&#x4a7;" k="61" />
-<hkern u1="&#x492;" u2="&#x4a5;" k="61" />
-<hkern u1="&#x492;" u2="&#x4a3;" k="61" />
-<hkern u1="&#x492;" u2="&#x4a0;" k="-41" />
-<hkern u1="&#x492;" u2="&#x49f;" k="-41" />
-<hkern u1="&#x492;" u2="&#x49d;" k="61" />
-<hkern u1="&#x492;" u2="&#x49b;" k="61" />
-<hkern u1="&#x492;" u2="&#x499;" k="41" />
-<hkern u1="&#x492;" u2="&#x497;" k="41" />
-<hkern u1="&#x492;" u2="&#x495;" k="61" />
-<hkern u1="&#x492;" u2="&#x491;" k="61" />
-<hkern u1="&#x492;" u2="&#x48f;" k="61" />
-<hkern u1="&#x492;" u2="&#x48d;" k="-41" />
-<hkern u1="&#x492;" u2="&#x48b;" k="61" />
-<hkern u1="&#x492;" u2="&#x481;" k="82" />
-<hkern u1="&#x492;" u2="&#x480;" k="41" />
-<hkern u1="&#x492;" u2="&#x47e;" k="41" />
-<hkern u1="&#x492;" u2="&#x47d;" k="82" />
-<hkern u1="&#x492;" u2="&#x47c;" k="41" />
-<hkern u1="&#x492;" u2="&#x47b;" k="82" />
-<hkern u1="&#x492;" u2="&#x47a;" k="41" />
-<hkern u1="&#x492;" u2="&#x479;" k="82" />
-<hkern u1="&#x492;" u2="&#x478;" k="41" />
-<hkern u1="&#x492;" u2="&#x473;" k="82" />
-<hkern u1="&#x492;" u2="&#x472;" k="41" />
-<hkern u1="&#x492;" u2="&#x471;" k="61" />
-<hkern u1="&#x492;" u2="&#x46d;" k="61" />
-<hkern u1="&#x492;" u2="&#x46b;" k="41" />
-<hkern u1="&#x492;" u2="&#x469;" k="61" />
-<hkern u1="&#x492;" u2="&#x467;" k="102" />
-<hkern u1="&#x492;" u2="&#x466;" k="123" />
-<hkern u1="&#x492;" u2="&#x465;" k="61" />
-<hkern u1="&#x492;" u2="&#x460;" k="41" />
-<hkern u1="&#x492;" u2="&#x45f;" k="61" />
-<hkern u1="&#x492;" u2="&#x45d;" k="61" />
-<hkern u1="&#x492;" u2="&#x45c;" k="61" />
-<hkern u1="&#x492;" u2="&#x45b;" k="-41" />
-<hkern u1="&#x492;" u2="&#x45a;" k="61" />
-<hkern u1="&#x492;" u2="&#x459;" k="102" />
-<hkern u1="&#x492;" u2="&#x455;" k="61" />
-<hkern u1="&#x492;" u2="&#x454;" k="82" />
-<hkern u1="&#x492;" u2="&#x453;" k="61" />
-<hkern u1="&#x492;" u2="&#x452;" k="-41" />
-<hkern u1="&#x492;" u2="&#x451;" k="82" />
-<hkern u1="&#x492;" u2="&#x450;" k="82" />
-<hkern u1="&#x492;" u2="&#x44e;" k="61" />
-<hkern u1="&#x492;" u2="&#x44d;" k="41" />
-<hkern u1="&#x492;" u2="&#x44c;" k="61" />
-<hkern u1="&#x492;" u2="&#x44b;" k="61" />
-<hkern u1="&#x492;" u2="&#x449;" k="61" />
-<hkern u1="&#x492;" u2="&#x448;" k="61" />
-<hkern u1="&#x492;" u2="&#x447;" k="102" />
-<hkern u1="&#x492;" u2="&#x446;" k="61" />
-<hkern u1="&#x492;" u2="&#x445;" k="41" />
-<hkern u1="&#x492;" u2="&#x444;" k="82" />
-<hkern u1="&#x492;" u2="&#x441;" k="82" />
-<hkern u1="&#x492;" u2="&#x440;" k="61" />
-<hkern u1="&#x492;" u2="&#x43f;" k="61" />
-<hkern u1="&#x492;" u2="&#x43e;" k="82" />
-<hkern u1="&#x492;" u2="&#x43d;" k="61" />
-<hkern u1="&#x492;" u2="&#x43c;" k="61" />
-<hkern u1="&#x492;" u2="&#x43b;" k="102" />
-<hkern u1="&#x492;" u2="&#x43a;" k="61" />
-<hkern u1="&#x492;" u2="&#x439;" k="61" />
-<hkern u1="&#x492;" u2="&#x438;" k="61" />
-<hkern u1="&#x492;" u2="&#x437;" k="41" />
-<hkern u1="&#x492;" u2="&#x436;" k="41" />
-<hkern u1="&#x492;" u2="&#x435;" k="82" />
-<hkern u1="&#x492;" u2="&#x434;" k="102" />
-<hkern u1="&#x492;" u2="&#x433;" k="61" />
-<hkern u1="&#x492;" u2="&#x432;" k="61" />
-<hkern u1="&#x492;" u2="&#x42a;" k="-41" />
-<hkern u1="&#x492;" u2="&#x424;" k="61" />
-<hkern u1="&#x492;" u2="&#x422;" k="-41" />
-<hkern u1="&#x492;" u2="&#x421;" k="41" />
-<hkern u1="&#x492;" u2="&#x41e;" k="41" />
-<hkern u1="&#x492;" u2="&#x41b;" k="82" />
-<hkern u1="&#x492;" u2="&#x414;" k="82" />
-<hkern u1="&#x492;" u2="&#x410;" k="123" />
-<hkern u1="&#x492;" u2="&#x40b;" k="-41" />
-<hkern u1="&#x492;" u2="&#x409;" k="82" />
-<hkern u1="&#x492;" u2="&#x404;" k="41" />
-<hkern u1="&#x492;" u2="&#x402;" k="-41" />
-<hkern u1="&#x492;" u2="&#x2e;" k="102" />
-<hkern u1="&#x492;" u2="&#x2d;" k="41" />
-<hkern u1="&#x492;" u2="&#x2c;" k="102" />
-<hkern u1="&#x493;" u2="&#x201e;" k="61" />
-<hkern u1="&#x493;" u2="&#x201a;" k="61" />
-<hkern u1="&#x493;" u2="&#x513;" k="61" />
-<hkern u1="&#x493;" u2="&#x511;" k="41" />
-<hkern u1="&#x493;" u2="&#x50d;" k="41" />
-<hkern u1="&#x493;" u2="&#x509;" k="61" />
-<hkern u1="&#x493;" u2="&#x503;" k="41" />
-<hkern u1="&#x493;" u2="&#x501;" k="41" />
-<hkern u1="&#x493;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x493;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x493;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x493;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x493;" u2="&#x4c6;" k="61" />
-<hkern u1="&#x493;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x493;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x493;" u2="&#x481;" k="41" />
-<hkern u1="&#x493;" u2="&#x47d;" k="41" />
-<hkern u1="&#x493;" u2="&#x47b;" k="41" />
-<hkern u1="&#x493;" u2="&#x479;" k="41" />
-<hkern u1="&#x493;" u2="&#x473;" k="41" />
-<hkern u1="&#x493;" u2="&#x467;" k="61" />
-<hkern u1="&#x493;" u2="&#x459;" k="61" />
-<hkern u1="&#x493;" u2="&#x454;" k="41" />
-<hkern u1="&#x493;" u2="&#x451;" k="41" />
-<hkern u1="&#x493;" u2="&#x450;" k="41" />
-<hkern u1="&#x493;" u2="&#x444;" k="41" />
-<hkern u1="&#x493;" u2="&#x441;" k="41" />
-<hkern u1="&#x493;" u2="&#x43e;" k="41" />
-<hkern u1="&#x493;" u2="&#x43b;" k="61" />
-<hkern u1="&#x493;" u2="&#x435;" k="41" />
-<hkern u1="&#x493;" u2="&#x434;" k="61" />
-<hkern u1="&#x493;" u2="&#x2e;" k="61" />
-<hkern u1="&#x493;" u2="&#x2c;" k="61" />
-<hkern u1="&#x494;" u2="&#x201d;" k="61" />
-<hkern u1="&#x494;" u2="&#x2019;" k="61" />
-<hkern u1="&#x494;" u2="&#x50f;" k="41" />
-<hkern u1="&#x494;" u2="&#x50e;" k="61" />
-<hkern u1="&#x494;" u2="&#x507;" k="61" />
-<hkern u1="&#x494;" u2="&#x506;" k="41" />
-<hkern u1="&#x494;" u2="&#x505;" k="61" />
-<hkern u1="&#x494;" u2="&#x504;" k="41" />
-<hkern u1="&#x494;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x494;" u2="&#x4f4;" k="82" />
-<hkern u1="&#x494;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x494;" u2="&#x4cb;" k="82" />
-<hkern u1="&#x494;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x494;" u2="&#x4b8;" k="82" />
-<hkern u1="&#x494;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x494;" u2="&#x4b6;" k="82" />
-<hkern u1="&#x494;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x494;" u2="&#x4b4;" k="61" />
-<hkern u1="&#x494;" u2="&#x4b0;" k="41" />
-<hkern u1="&#x494;" u2="&#x4ae;" k="41" />
-<hkern u1="&#x494;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x494;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x494;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x494;" u2="&#x4a0;" k="61" />
-<hkern u1="&#x494;" u2="&#x476;" k="61" />
-<hkern u1="&#x494;" u2="&#x474;" k="61" />
-<hkern u1="&#x494;" u2="&#x470;" k="82" />
-<hkern u1="&#x494;" u2="&#x44a;" k="41" />
-<hkern u1="&#x494;" u2="&#x447;" k="41" />
-<hkern u1="&#x494;" u2="&#x442;" k="41" />
-<hkern u1="&#x494;" u2="&#x42a;" k="61" />
-<hkern u1="&#x494;" u2="&#x427;" k="82" />
-<hkern u1="&#x494;" u2="&#x422;" k="61" />
-<hkern u1="&#x494;" u2="&#x40b;" k="61" />
-<hkern u1="&#x494;" u2="&#x408;" k="-102" />
-<hkern u1="&#x494;" u2="&#x402;" k="61" />
-<hkern u1="&#x494;" u2="&#x27;" k="61" />
-<hkern u1="&#x494;" u2="&#x22;" k="61" />
-<hkern u1="&#x495;" u2="&#x201d;" k="61" />
-<hkern u1="&#x495;" u2="&#x2019;" k="61" />
-<hkern u1="&#x495;" u2="&#x507;" k="41" />
-<hkern u1="&#x495;" u2="&#x505;" k="41" />
-<hkern u1="&#x495;" u2="&#x27;" k="61" />
-<hkern u1="&#x495;" u2="&#x22;" k="61" />
-<hkern u1="&#x496;" u2="&#x50f;" k="41" />
-<hkern u1="&#x496;" u2="&#x50c;" k="41" />
-<hkern u1="&#x496;" u2="&#x507;" k="41" />
-<hkern u1="&#x496;" u2="&#x505;" k="41" />
-<hkern u1="&#x496;" u2="&#x4f5;" k="82" />
-<hkern u1="&#x496;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x496;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x496;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x496;" u2="&#x4cc;" k="82" />
-<hkern u1="&#x496;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x496;" u2="&#x4be;" k="61" />
-<hkern u1="&#x496;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x496;" u2="&#x4bc;" k="61" />
-<hkern u1="&#x496;" u2="&#x4b9;" k="82" />
-<hkern u1="&#x496;" u2="&#x4b7;" k="82" />
-<hkern u1="&#x496;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x496;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x496;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x496;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x496;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x496;" u2="&#x480;" k="41" />
-<hkern u1="&#x496;" u2="&#x47e;" k="41" />
-<hkern u1="&#x496;" u2="&#x47c;" k="41" />
-<hkern u1="&#x496;" u2="&#x47a;" k="41" />
-<hkern u1="&#x496;" u2="&#x478;" k="41" />
-<hkern u1="&#x496;" u2="&#x472;" k="41" />
-<hkern u1="&#x496;" u2="&#x471;" k="20" />
-<hkern u1="&#x496;" u2="&#x46f;" k="-61" />
-<hkern u1="&#x496;" u2="&#x460;" k="41" />
-<hkern u1="&#x496;" u2="&#x44a;" k="41" />
-<hkern u1="&#x496;" u2="&#x447;" k="82" />
-<hkern u1="&#x496;" u2="&#x442;" k="41" />
-<hkern u1="&#x496;" u2="&#x424;" k="61" />
-<hkern u1="&#x496;" u2="&#x421;" k="41" />
-<hkern u1="&#x496;" u2="&#x41e;" k="41" />
-<hkern u1="&#x496;" u2="&#x408;" k="-225" />
-<hkern u1="&#x496;" u2="&#x404;" k="41" />
-<hkern u1="&#x497;" u2="&#x511;" k="20" />
-<hkern u1="&#x497;" u2="&#x50d;" k="20" />
-<hkern u1="&#x497;" u2="&#x507;" k="41" />
-<hkern u1="&#x497;" u2="&#x505;" k="41" />
-<hkern u1="&#x497;" u2="&#x503;" k="20" />
-<hkern u1="&#x497;" u2="&#x501;" k="20" />
-<hkern u1="&#x497;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x497;" u2="&#x4eb;" k="20" />
-<hkern u1="&#x497;" u2="&#x4e9;" k="20" />
-<hkern u1="&#x497;" u2="&#x4e7;" k="20" />
-<hkern u1="&#x497;" u2="&#x4d7;" k="20" />
-<hkern u1="&#x497;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x497;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x497;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x497;" u2="&#x4ab;" k="20" />
-<hkern u1="&#x497;" u2="&#x4a9;" k="20" />
-<hkern u1="&#x497;" u2="&#x481;" k="20" />
-<hkern u1="&#x497;" u2="&#x47d;" k="20" />
-<hkern u1="&#x497;" u2="&#x47b;" k="20" />
-<hkern u1="&#x497;" u2="&#x479;" k="20" />
-<hkern u1="&#x497;" u2="&#x473;" k="20" />
-<hkern u1="&#x497;" u2="&#x454;" k="20" />
-<hkern u1="&#x497;" u2="&#x451;" k="20" />
-<hkern u1="&#x497;" u2="&#x450;" k="20" />
-<hkern u1="&#x497;" u2="&#x447;" k="20" />
-<hkern u1="&#x497;" u2="&#x444;" k="20" />
-<hkern u1="&#x497;" u2="&#x441;" k="20" />
-<hkern u1="&#x497;" u2="&#x43e;" k="20" />
-<hkern u1="&#x497;" u2="&#x435;" k="20" />
-<hkern u1="&#x498;" u2="&#x201e;" k="82" />
-<hkern u1="&#x498;" u2="&#x201a;" k="82" />
-<hkern u1="&#x498;" u2="&#x506;" k="41" />
-<hkern u1="&#x498;" u2="&#x504;" k="41" />
-<hkern u1="&#x498;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x498;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x498;" u2="&#x476;" k="20" />
-<hkern u1="&#x498;" u2="&#x474;" k="20" />
-<hkern u1="&#x498;" u2="&#x2e;" k="82" />
-<hkern u1="&#x498;" u2="&#x2c;" k="82" />
-<hkern u1="&#x499;" u2="&#x44f;" k="-41" />
-<hkern u1="&#x49a;" u2="&#x50f;" k="41" />
-<hkern u1="&#x49a;" u2="&#x50c;" k="41" />
-<hkern u1="&#x49a;" u2="&#x507;" k="41" />
-<hkern u1="&#x49a;" u2="&#x505;" k="41" />
-<hkern u1="&#x49a;" u2="&#x4f5;" k="82" />
-<hkern u1="&#x49a;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x49a;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x49a;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x49a;" u2="&#x4cc;" k="82" />
-<hkern u1="&#x49a;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x49a;" u2="&#x4be;" k="61" />
-<hkern u1="&#x49a;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x49a;" u2="&#x4bc;" k="61" />
-<hkern u1="&#x49a;" u2="&#x4b9;" k="82" />
-<hkern u1="&#x49a;" u2="&#x4b7;" k="82" />
-<hkern u1="&#x49a;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x49a;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x49a;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x49a;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x49a;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x49a;" u2="&#x480;" k="41" />
-<hkern u1="&#x49a;" u2="&#x47e;" k="41" />
-<hkern u1="&#x49a;" u2="&#x47c;" k="41" />
-<hkern u1="&#x49a;" u2="&#x47a;" k="41" />
-<hkern u1="&#x49a;" u2="&#x478;" k="41" />
-<hkern u1="&#x49a;" u2="&#x472;" k="41" />
-<hkern u1="&#x49a;" u2="&#x471;" k="20" />
-<hkern u1="&#x49a;" u2="&#x46f;" k="-61" />
-<hkern u1="&#x49a;" u2="&#x460;" k="41" />
-<hkern u1="&#x49a;" u2="&#x44a;" k="41" />
-<hkern u1="&#x49a;" u2="&#x447;" k="82" />
-<hkern u1="&#x49a;" u2="&#x442;" k="41" />
-<hkern u1="&#x49a;" u2="&#x424;" k="61" />
-<hkern u1="&#x49a;" u2="&#x421;" k="41" />
-<hkern u1="&#x49a;" u2="&#x41e;" k="41" />
-<hkern u1="&#x49a;" u2="&#x408;" k="-225" />
-<hkern u1="&#x49a;" u2="&#x404;" k="41" />
-<hkern u1="&#x49b;" u2="&#x511;" k="20" />
-<hkern u1="&#x49b;" u2="&#x50d;" k="20" />
-<hkern u1="&#x49b;" u2="&#x507;" k="41" />
-<hkern u1="&#x49b;" u2="&#x505;" k="41" />
-<hkern u1="&#x49b;" u2="&#x503;" k="20" />
-<hkern u1="&#x49b;" u2="&#x501;" k="20" />
-<hkern u1="&#x49b;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x49b;" u2="&#x4eb;" k="20" />
-<hkern u1="&#x49b;" u2="&#x4e9;" k="20" />
-<hkern u1="&#x49b;" u2="&#x4e7;" k="20" />
-<hkern u1="&#x49b;" u2="&#x4d7;" k="20" />
-<hkern u1="&#x49b;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x49b;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x49b;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x49b;" u2="&#x4ab;" k="20" />
-<hkern u1="&#x49b;" u2="&#x4a9;" k="20" />
-<hkern u1="&#x49b;" u2="&#x481;" k="20" />
-<hkern u1="&#x49b;" u2="&#x47d;" k="20" />
-<hkern u1="&#x49b;" u2="&#x47b;" k="20" />
-<hkern u1="&#x49b;" u2="&#x479;" k="20" />
-<hkern u1="&#x49b;" u2="&#x473;" k="20" />
-<hkern u1="&#x49b;" u2="&#x454;" k="20" />
-<hkern u1="&#x49b;" u2="&#x451;" k="20" />
-<hkern u1="&#x49b;" u2="&#x450;" k="20" />
-<hkern u1="&#x49b;" u2="&#x447;" k="20" />
-<hkern u1="&#x49b;" u2="&#x444;" k="20" />
-<hkern u1="&#x49b;" u2="&#x441;" k="20" />
-<hkern u1="&#x49b;" u2="&#x43e;" k="20" />
-<hkern u1="&#x49b;" u2="&#x435;" k="20" />
-<hkern u1="&#x49c;" u2="&#x510;" k="20" />
-<hkern u1="&#x49c;" u2="&#x50c;" k="41" />
-<hkern u1="&#x49c;" u2="&#x507;" k="41" />
-<hkern u1="&#x49c;" u2="&#x505;" k="41" />
-<hkern u1="&#x49c;" u2="&#x502;" k="41" />
-<hkern u1="&#x49c;" u2="&#x500;" k="41" />
-<hkern u1="&#x49c;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x49c;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x49c;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x49c;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x49c;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x49c;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x49c;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x49c;" u2="&#x4be;" k="102" />
-<hkern u1="&#x49c;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x49c;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x49c;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x49c;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x49c;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x49c;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x49c;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x49c;" u2="&#x480;" k="41" />
-<hkern u1="&#x49c;" u2="&#x47e;" k="41" />
-<hkern u1="&#x49c;" u2="&#x47c;" k="41" />
-<hkern u1="&#x49c;" u2="&#x47a;" k="41" />
-<hkern u1="&#x49c;" u2="&#x478;" k="41" />
-<hkern u1="&#x49c;" u2="&#x472;" k="41" />
-<hkern u1="&#x49c;" u2="&#x470;" k="41" />
-<hkern u1="&#x49c;" u2="&#x460;" k="41" />
-<hkern u1="&#x49c;" u2="&#x447;" k="41" />
-<hkern u1="&#x49c;" u2="&#x427;" k="41" />
-<hkern u1="&#x49c;" u2="&#x424;" k="41" />
-<hkern u1="&#x49c;" u2="&#x421;" k="41" />
-<hkern u1="&#x49c;" u2="&#x41e;" k="41" />
-<hkern u1="&#x49c;" u2="&#x404;" k="41" />
-<hkern u1="&#x49d;" u2="&#x511;" k="41" />
-<hkern u1="&#x49d;" u2="&#x50d;" k="41" />
-<hkern u1="&#x49d;" u2="&#x503;" k="41" />
-<hkern u1="&#x49d;" u2="&#x501;" k="41" />
-<hkern u1="&#x49d;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x49d;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x49d;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x49d;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x49d;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x49d;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x49d;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x49d;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x49d;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x49d;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x49d;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x49d;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x49d;" u2="&#x481;" k="41" />
-<hkern u1="&#x49d;" u2="&#x47d;" k="41" />
-<hkern u1="&#x49d;" u2="&#x47b;" k="41" />
-<hkern u1="&#x49d;" u2="&#x479;" k="41" />
-<hkern u1="&#x49d;" u2="&#x473;" k="41" />
-<hkern u1="&#x49d;" u2="&#x454;" k="41" />
-<hkern u1="&#x49d;" u2="&#x451;" k="41" />
-<hkern u1="&#x49d;" u2="&#x450;" k="41" />
-<hkern u1="&#x49d;" u2="&#x447;" k="41" />
-<hkern u1="&#x49d;" u2="&#x444;" k="41" />
-<hkern u1="&#x49d;" u2="&#x441;" k="41" />
-<hkern u1="&#x49d;" u2="&#x43e;" k="41" />
-<hkern u1="&#x49d;" u2="&#x435;" k="41" />
-<hkern u1="&#x49e;" u2="&#x510;" k="20" />
-<hkern u1="&#x49e;" u2="&#x50c;" k="41" />
-<hkern u1="&#x49e;" u2="&#x507;" k="41" />
-<hkern u1="&#x49e;" u2="&#x505;" k="41" />
-<hkern u1="&#x49e;" u2="&#x502;" k="41" />
-<hkern u1="&#x49e;" u2="&#x500;" k="41" />
-<hkern u1="&#x49e;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x49e;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x49e;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x49e;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x49e;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x49e;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x49e;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x49e;" u2="&#x4be;" k="102" />
-<hkern u1="&#x49e;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x49e;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x49e;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x49e;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x49e;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x49e;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x49e;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x49e;" u2="&#x480;" k="41" />
-<hkern u1="&#x49e;" u2="&#x47e;" k="41" />
-<hkern u1="&#x49e;" u2="&#x47c;" k="41" />
-<hkern u1="&#x49e;" u2="&#x47a;" k="41" />
-<hkern u1="&#x49e;" u2="&#x478;" k="41" />
-<hkern u1="&#x49e;" u2="&#x472;" k="41" />
-<hkern u1="&#x49e;" u2="&#x470;" k="41" />
-<hkern u1="&#x49e;" u2="&#x460;" k="41" />
-<hkern u1="&#x49e;" u2="&#x447;" k="41" />
-<hkern u1="&#x49e;" u2="&#x427;" k="41" />
-<hkern u1="&#x49e;" u2="&#x424;" k="41" />
-<hkern u1="&#x49e;" u2="&#x421;" k="41" />
-<hkern u1="&#x49e;" u2="&#x41e;" k="41" />
-<hkern u1="&#x49e;" u2="&#x404;" k="41" />
-<hkern u1="&#x49f;" u2="&#x511;" k="41" />
-<hkern u1="&#x49f;" u2="&#x50d;" k="41" />
-<hkern u1="&#x49f;" u2="&#x503;" k="41" />
-<hkern u1="&#x49f;" u2="&#x501;" k="41" />
-<hkern u1="&#x49f;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x49f;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x49f;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x49f;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x49f;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x49f;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x49f;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x49f;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x49f;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x49f;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x49f;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x49f;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x49f;" u2="&#x481;" k="41" />
-<hkern u1="&#x49f;" u2="&#x47d;" k="41" />
-<hkern u1="&#x49f;" u2="&#x47b;" k="41" />
-<hkern u1="&#x49f;" u2="&#x479;" k="41" />
-<hkern u1="&#x49f;" u2="&#x473;" k="41" />
-<hkern u1="&#x49f;" u2="&#x454;" k="41" />
-<hkern u1="&#x49f;" u2="&#x451;" k="41" />
-<hkern u1="&#x49f;" u2="&#x450;" k="41" />
-<hkern u1="&#x49f;" u2="&#x447;" k="41" />
-<hkern u1="&#x49f;" u2="&#x444;" k="41" />
-<hkern u1="&#x49f;" u2="&#x441;" k="41" />
-<hkern u1="&#x49f;" u2="&#x43e;" k="41" />
-<hkern u1="&#x49f;" u2="&#x435;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x510;" k="20" />
-<hkern u1="&#x4a0;" u2="&#x50c;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x507;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x505;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x502;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x500;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x4be;" k="102" />
-<hkern u1="&#x4a0;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x4a0;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x480;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x47e;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x47c;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x47a;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x478;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x472;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x470;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x460;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x447;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x427;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x424;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x421;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x41e;" k="41" />
-<hkern u1="&#x4a0;" u2="&#x404;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x511;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x50d;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x503;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x501;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x481;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x47d;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x47b;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x479;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x473;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x454;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x451;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x450;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x447;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x444;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x441;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x43e;" k="41" />
-<hkern u1="&#x4a1;" u2="&#x435;" k="41" />
-<hkern u1="&#x4a2;" u2="&#x507;" k="41" />
-<hkern u1="&#x4a2;" u2="&#x505;" k="41" />
-<hkern u1="&#x4a2;" u2="&#x4e1;" k="-41" />
-<hkern u1="&#x4a2;" u2="&#x408;" k="-225" />
-<hkern u1="&#x4a3;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4a3;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4a3;" u2="&#x27;" k="20" />
-<hkern u1="&#x4a3;" u2="&#x22;" k="20" />
-<hkern u1="&#x4a4;" u2="&#x201e;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x201a;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x2015;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x2014;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x2013;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x513;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x512;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x511;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x50e;" k="-41" />
-<hkern u1="&#x4a4;" u2="&#x50d;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x50c;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x50b;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x509;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x508;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x507;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x505;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x503;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x502;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x501;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x500;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4f9;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4f7;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4f5;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x4ed;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4eb;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4e9;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4e7;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4e5;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4e3;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4df;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4d7;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x4d4;" k="123" />
-<hkern u1="&#x4a4;" u2="&#x4d2;" k="123" />
-<hkern u1="&#x4a4;" u2="&#x4d0;" k="123" />
-<hkern u1="&#x4a4;" u2="&#x4ce;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4cc;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x4ca;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4c8;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4c6;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x4c5;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x4c4;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4bf;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4be;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4bd;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4bb;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4b9;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x4b7;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x4b4;" k="-41" />
-<hkern u1="&#x4a4;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4ac;" k="-41" />
-<hkern u1="&#x4a4;" u2="&#x4ab;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4a9;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x4a7;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4a5;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4a3;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x4a0;" k="-41" />
-<hkern u1="&#x4a4;" u2="&#x49f;" k="-41" />
-<hkern u1="&#x4a4;" u2="&#x49d;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x49b;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x499;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x497;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x495;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x491;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x48f;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x48d;" k="-41" />
-<hkern u1="&#x4a4;" u2="&#x48b;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x481;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x480;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x47e;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x47d;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x47c;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x47b;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x47a;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x479;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x478;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x473;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x472;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x471;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x46d;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x46b;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x469;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x467;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x466;" k="123" />
-<hkern u1="&#x4a4;" u2="&#x465;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x460;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x45f;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x45d;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x45c;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x45b;" k="-41" />
-<hkern u1="&#x4a4;" u2="&#x45a;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x459;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x455;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x454;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x453;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x452;" k="-41" />
-<hkern u1="&#x4a4;" u2="&#x451;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x450;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x44e;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x44d;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x44c;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x44b;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x449;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x448;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x447;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x446;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x445;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x444;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x441;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x440;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x43f;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x43e;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x43d;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x43c;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x43b;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x43a;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x439;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x438;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x437;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x436;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x435;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x434;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x433;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x432;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x42a;" k="-41" />
-<hkern u1="&#x4a4;" u2="&#x424;" k="61" />
-<hkern u1="&#x4a4;" u2="&#x422;" k="-41" />
-<hkern u1="&#x4a4;" u2="&#x421;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x41e;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x41b;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x414;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x410;" k="123" />
-<hkern u1="&#x4a4;" u2="&#x40b;" k="-41" />
-<hkern u1="&#x4a4;" u2="&#x409;" k="82" />
-<hkern u1="&#x4a4;" u2="&#x404;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x402;" k="-41" />
-<hkern u1="&#x4a4;" u2="&#x2e;" k="102" />
-<hkern u1="&#x4a4;" u2="&#x2d;" k="41" />
-<hkern u1="&#x4a4;" u2="&#x2c;" k="102" />
-<hkern u1="&#x4a5;" u2="&#x201e;" k="102" />
-<hkern u1="&#x4a5;" u2="&#x201a;" k="102" />
-<hkern u1="&#x4a5;" u2="&#x2015;" k="41" />
-<hkern u1="&#x4a5;" u2="&#x2014;" k="41" />
-<hkern u1="&#x4a5;" u2="&#x2013;" k="41" />
-<hkern u1="&#x4a5;" u2="&#x513;" k="61" />
-<hkern u1="&#x4a5;" u2="&#x511;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x50d;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x509;" k="61" />
-<hkern u1="&#x4a5;" u2="&#x503;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x501;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x4eb;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x4e9;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x4e7;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x4d7;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x4c6;" k="61" />
-<hkern u1="&#x4a5;" u2="&#x4ab;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x4a9;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x481;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x47d;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x47b;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x479;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x473;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x467;" k="61" />
-<hkern u1="&#x4a5;" u2="&#x459;" k="61" />
-<hkern u1="&#x4a5;" u2="&#x454;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x451;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x450;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x444;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x441;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x43e;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x43b;" k="61" />
-<hkern u1="&#x4a5;" u2="&#x435;" k="20" />
-<hkern u1="&#x4a5;" u2="&#x434;" k="61" />
-<hkern u1="&#x4a5;" u2="&#x2e;" k="102" />
-<hkern u1="&#x4a5;" u2="&#x2d;" k="41" />
-<hkern u1="&#x4a5;" u2="&#x2c;" k="102" />
-<hkern u1="&#x4a6;" u2="&#x201d;" k="164" />
-<hkern u1="&#x4a6;" u2="&#x2019;" k="164" />
-<hkern u1="&#x4a6;" u2="&#x50f;" k="82" />
-<hkern u1="&#x4a6;" u2="&#x50e;" k="102" />
-<hkern u1="&#x4a6;" u2="&#x507;" k="82" />
-<hkern u1="&#x4a6;" u2="&#x506;" k="184" />
-<hkern u1="&#x4a6;" u2="&#x505;" k="82" />
-<hkern u1="&#x4a6;" u2="&#x504;" k="184" />
-<hkern u1="&#x4a6;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4a6;" u2="&#x4f4;" k="123" />
-<hkern u1="&#x4a6;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4a6;" u2="&#x4cb;" k="123" />
-<hkern u1="&#x4a6;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x4a6;" u2="&#x4be;" k="61" />
-<hkern u1="&#x4a6;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x4a6;" u2="&#x4bc;" k="61" />
-<hkern u1="&#x4a6;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4a6;" u2="&#x4b8;" k="123" />
-<hkern u1="&#x4a6;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4a6;" u2="&#x4b6;" k="123" />
-<hkern u1="&#x4a6;" u2="&#x4b5;" k="82" />
-<hkern u1="&#x4a6;" u2="&#x4b4;" k="102" />
-<hkern u1="&#x4a6;" u2="&#x4b0;" k="102" />
-<hkern u1="&#x4a6;" u2="&#x4ae;" k="102" />
-<hkern u1="&#x4a6;" u2="&#x4ad;" k="82" />
-<hkern u1="&#x4a6;" u2="&#x4ac;" k="184" />
-<hkern u1="&#x4a6;" u2="&#x4a1;" k="82" />
-<hkern u1="&#x4a6;" u2="&#x4a0;" k="102" />
-<hkern u1="&#x4a6;" u2="&#x476;" k="143" />
-<hkern u1="&#x4a6;" u2="&#x474;" k="143" />
-<hkern u1="&#x4a6;" u2="&#x470;" k="123" />
-<hkern u1="&#x4a6;" u2="&#x44a;" k="82" />
-<hkern u1="&#x4a6;" u2="&#x447;" k="41" />
-<hkern u1="&#x4a6;" u2="&#x442;" k="82" />
-<hkern u1="&#x4a6;" u2="&#x42a;" k="102" />
-<hkern u1="&#x4a6;" u2="&#x427;" k="123" />
-<hkern u1="&#x4a6;" u2="&#x422;" k="184" />
-<hkern u1="&#x4a6;" u2="&#x40b;" k="102" />
-<hkern u1="&#x4a6;" u2="&#x408;" k="-102" />
-<hkern u1="&#x4a6;" u2="&#x402;" k="102" />
-<hkern u1="&#x4a6;" u2="&#x27;" k="164" />
-<hkern u1="&#x4a6;" u2="&#x22;" k="164" />
-<hkern u1="&#x4a7;" u2="&#x201d;" k="143" />
-<hkern u1="&#x4a7;" u2="&#x2019;" k="143" />
-<hkern u1="&#x4a7;" u2="&#x50f;" k="102" />
-<hkern u1="&#x4a7;" u2="&#x507;" k="143" />
-<hkern u1="&#x4a7;" u2="&#x505;" k="143" />
-<hkern u1="&#x4a7;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4a7;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4a7;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x4a7;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x4a7;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4a7;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4a7;" u2="&#x4b5;" k="102" />
-<hkern u1="&#x4a7;" u2="&#x4b1;" k="41" />
-<hkern u1="&#x4a7;" u2="&#x4af;" k="41" />
-<hkern u1="&#x4a7;" u2="&#x4ad;" k="102" />
-<hkern u1="&#x4a7;" u2="&#x4a1;" k="102" />
-<hkern u1="&#x4a7;" u2="&#x47f;" k="41" />
-<hkern u1="&#x4a7;" u2="&#x477;" k="41" />
-<hkern u1="&#x4a7;" u2="&#x475;" k="41" />
-<hkern u1="&#x4a7;" u2="&#x461;" k="41" />
-<hkern u1="&#x4a7;" u2="&#x44a;" k="102" />
-<hkern u1="&#x4a7;" u2="&#x447;" k="41" />
-<hkern u1="&#x4a7;" u2="&#x442;" k="102" />
-<hkern u1="&#x4a7;" u2="&#x27;" k="143" />
-<hkern u1="&#x4a7;" u2="&#x22;" k="143" />
-<hkern u1="&#x4a8;" u2="&#x50e;" k="41" />
-<hkern u1="&#x4a8;" u2="&#x506;" k="41" />
-<hkern u1="&#x4a8;" u2="&#x504;" k="41" />
-<hkern u1="&#x4a8;" u2="&#x4b4;" k="41" />
-<hkern u1="&#x4a8;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x4a8;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x4a8;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x4a8;" u2="&#x4a0;" k="41" />
-<hkern u1="&#x4a8;" u2="&#x476;" k="20" />
-<hkern u1="&#x4a8;" u2="&#x474;" k="20" />
-<hkern u1="&#x4a8;" u2="&#x42a;" k="41" />
-<hkern u1="&#x4a8;" u2="&#x422;" k="61" />
-<hkern u1="&#x4a8;" u2="&#x40b;" k="41" />
-<hkern u1="&#x4a8;" u2="&#x402;" k="41" />
-<hkern u1="&#x4a9;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x50f;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x507;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x505;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x4a9;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x4a9;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x4a9;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x4a9;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x4a9;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x497;" k="41" />
-<hkern u1="&#x4a9;" u2="&#x45e;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x44a;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x447;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x445;" k="41" />
-<hkern u1="&#x4a9;" u2="&#x443;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x442;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x436;" k="41" />
-<hkern u1="&#x4a9;" u2="&#x27;" k="20" />
-<hkern u1="&#x4a9;" u2="&#x22;" k="20" />
-<hkern u1="&#x4aa;" u2="&#x50c;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x507;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x505;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x502;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x500;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x4be;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x480;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x47e;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x47c;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x47a;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x478;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x472;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x460;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x447;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x424;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x421;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x41e;" k="41" />
-<hkern u1="&#x4aa;" u2="&#x404;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x201e;" k="123" />
-<hkern u1="&#x4ac;" u2="&#x201a;" k="123" />
-<hkern u1="&#x4ac;" u2="&#x2015;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x2014;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x2013;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x513;" k="123" />
-<hkern u1="&#x4ac;" u2="&#x512;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x511;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x50f;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x50d;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x50c;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x50b;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x509;" k="123" />
-<hkern u1="&#x4ac;" u2="&#x508;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x507;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x505;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x503;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x502;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x501;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x500;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x4f9;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4f7;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4f5;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4f3;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x4f1;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x4ef;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x4ed;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x4eb;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x4e9;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x4e7;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x4e5;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4e3;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4e1;" k="61" />
-<hkern u1="&#x4ac;" u2="&#x4df;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x4d7;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x4ce;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4cc;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4ca;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4c8;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4c6;" k="123" />
-<hkern u1="&#x4ac;" u2="&#x4c5;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4c4;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x4bf;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x4be;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4bd;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4bb;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4b9;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4b7;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4b5;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x4b1;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x4af;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x4ad;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x4ac;" k="-41" />
-<hkern u1="&#x4ac;" u2="&#x4ab;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x4a9;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x4a7;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4a5;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4a3;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x4a1;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x49d;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x49b;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x499;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x497;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x495;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x491;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x48f;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x48b;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x481;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x480;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x47f;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x47e;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x47d;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x47c;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x47b;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x47a;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x479;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x478;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x477;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x475;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x473;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x472;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x471;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x46d;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x46b;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x469;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x467;" k="123" />
-<hkern u1="&#x4ac;" u2="&#x466;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x465;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x461;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x460;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x45f;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x45e;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x45d;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x45c;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x45a;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x459;" k="123" />
-<hkern u1="&#x4ac;" u2="&#x455;" k="123" />
-<hkern u1="&#x4ac;" u2="&#x454;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x453;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x451;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x450;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x44f;" k="61" />
-<hkern u1="&#x4ac;" u2="&#x44e;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x44d;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x44c;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x44b;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x44a;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x449;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x448;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x447;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x446;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x445;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x444;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x443;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x442;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x441;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x440;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x43f;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x43e;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x43d;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x43c;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x43b;" k="123" />
-<hkern u1="&#x4ac;" u2="&#x43a;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x439;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x438;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x437;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x436;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x435;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x434;" k="123" />
-<hkern u1="&#x4ac;" u2="&#x433;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x432;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x424;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x422;" k="-41" />
-<hkern u1="&#x4ac;" u2="&#x421;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x41e;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x41b;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x414;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x410;" k="143" />
-<hkern u1="&#x4ac;" u2="&#x409;" k="102" />
-<hkern u1="&#x4ac;" u2="&#x404;" k="41" />
-<hkern u1="&#x4ac;" u2="&#x2e;" k="123" />
-<hkern u1="&#x4ac;" u2="&#x2d;" k="82" />
-<hkern u1="&#x4ac;" u2="&#x2c;" k="123" />
-<hkern u1="&#x4ad;" u2="&#x201e;" k="102" />
-<hkern u1="&#x4ad;" u2="&#x201a;" k="102" />
-<hkern u1="&#x4ad;" u2="&#x2015;" k="41" />
-<hkern u1="&#x4ad;" u2="&#x2014;" k="41" />
-<hkern u1="&#x4ad;" u2="&#x2013;" k="41" />
-<hkern u1="&#x4ad;" u2="&#x513;" k="61" />
-<hkern u1="&#x4ad;" u2="&#x511;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x50d;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x509;" k="61" />
-<hkern u1="&#x4ad;" u2="&#x503;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x501;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x4eb;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x4e9;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x4e7;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x4d7;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x4c6;" k="61" />
-<hkern u1="&#x4ad;" u2="&#x4ab;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x4a9;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x481;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x47d;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x47b;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x479;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x473;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x467;" k="61" />
-<hkern u1="&#x4ad;" u2="&#x459;" k="61" />
-<hkern u1="&#x4ad;" u2="&#x454;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x451;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x450;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x444;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x441;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x43e;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x43b;" k="61" />
-<hkern u1="&#x4ad;" u2="&#x435;" k="20" />
-<hkern u1="&#x4ad;" u2="&#x434;" k="61" />
-<hkern u1="&#x4ad;" u2="&#x2e;" k="102" />
-<hkern u1="&#x4ad;" u2="&#x2d;" k="41" />
-<hkern u1="&#x4ad;" u2="&#x2c;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x201e;" k="123" />
-<hkern u1="&#x4ae;" u2="&#x201a;" k="123" />
-<hkern u1="&#x4ae;" u2="&#x513;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x512;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x511;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x510;" k="20" />
-<hkern u1="&#x4ae;" u2="&#x50d;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x50c;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x50b;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x509;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x508;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x507;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x505;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x503;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x502;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x501;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x500;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x4f9;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x4f7;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x4f5;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x4eb;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x4e9;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x4e7;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x4e5;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x4e3;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x4db;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x4da;" k="20" />
-<hkern u1="&#x4ae;" u2="&#x4d9;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x4d8;" k="20" />
-<hkern u1="&#x4ae;" u2="&#x4d7;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x4d5;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x4d4;" k="123" />
-<hkern u1="&#x4ae;" u2="&#x4d3;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x4d2;" k="123" />
-<hkern u1="&#x4ae;" u2="&#x4d1;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x4d0;" k="123" />
-<hkern u1="&#x4ae;" u2="&#x4ce;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x4cc;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x4ca;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x4c8;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x4c6;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x4c5;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x4c4;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x4bf;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x4bd;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x4bb;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x4b9;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x4b7;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x4ab;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x4a9;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x4a7;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x4a5;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x4a3;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x49f;" k="-41" />
-<hkern u1="&#x4ae;" u2="&#x49d;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x49b;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x495;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x491;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x48f;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x48d;" k="-41" />
-<hkern u1="&#x4ae;" u2="&#x48b;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x481;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x480;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x47e;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x47d;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x47c;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x47b;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x47a;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x479;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x478;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x473;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x472;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x471;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x46d;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x46b;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x469;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x467;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x466;" k="123" />
-<hkern u1="&#x4ae;" u2="&#x465;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x460;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x45f;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x45d;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x45c;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x45b;" k="-41" />
-<hkern u1="&#x4ae;" u2="&#x45a;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x459;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x455;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x454;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x453;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x452;" k="-41" />
-<hkern u1="&#x4ae;" u2="&#x451;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x450;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x44f;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x44e;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x44c;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x44b;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x449;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x448;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x447;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x446;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x444;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x441;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x440;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x43f;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x43e;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x43d;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x43c;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x43b;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x43a;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x439;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x438;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x435;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x434;" k="102" />
-<hkern u1="&#x4ae;" u2="&#x433;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x432;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x430;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x424;" k="61" />
-<hkern u1="&#x4ae;" u2="&#x421;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x41e;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x41b;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x414;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x410;" k="123" />
-<hkern u1="&#x4ae;" u2="&#x409;" k="82" />
-<hkern u1="&#x4ae;" u2="&#x404;" k="41" />
-<hkern u1="&#x4ae;" u2="&#x2e;" k="123" />
-<hkern u1="&#x4ae;" u2="&#x2c;" k="123" />
-<hkern u1="&#x4af;" u2="&#x201e;" k="82" />
-<hkern u1="&#x4af;" u2="&#x201a;" k="82" />
-<hkern u1="&#x4af;" u2="&#x513;" k="20" />
-<hkern u1="&#x4af;" u2="&#x509;" k="20" />
-<hkern u1="&#x4af;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x4af;" u2="&#x467;" k="20" />
-<hkern u1="&#x4af;" u2="&#x459;" k="20" />
-<hkern u1="&#x4af;" u2="&#x43b;" k="20" />
-<hkern u1="&#x4af;" u2="&#x434;" k="20" />
-<hkern u1="&#x4af;" u2="&#x2e;" k="82" />
-<hkern u1="&#x4af;" u2="&#x2c;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x201e;" k="123" />
-<hkern u1="&#x4b0;" u2="&#x201a;" k="123" />
-<hkern u1="&#x4b0;" u2="&#x513;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x512;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x511;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x510;" k="20" />
-<hkern u1="&#x4b0;" u2="&#x50d;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x50c;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x50b;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x509;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x508;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x507;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x505;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x503;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x502;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x501;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x500;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x4f9;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x4f7;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x4f5;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x4eb;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x4e9;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x4e7;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x4e5;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x4e3;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x4db;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x4da;" k="20" />
-<hkern u1="&#x4b0;" u2="&#x4d9;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x4d8;" k="20" />
-<hkern u1="&#x4b0;" u2="&#x4d7;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x4d5;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x4d4;" k="123" />
-<hkern u1="&#x4b0;" u2="&#x4d3;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x4d2;" k="123" />
-<hkern u1="&#x4b0;" u2="&#x4d1;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x4d0;" k="123" />
-<hkern u1="&#x4b0;" u2="&#x4ce;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x4cc;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x4ca;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x4c8;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x4c6;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x4c5;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x4c4;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x4bf;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x4bd;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x4bb;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x4b9;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x4b7;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x4ab;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x4a9;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x4a7;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x4a5;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x4a3;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x49f;" k="-41" />
-<hkern u1="&#x4b0;" u2="&#x49d;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x49b;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x495;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x491;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x48f;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x48d;" k="-41" />
-<hkern u1="&#x4b0;" u2="&#x48b;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x481;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x480;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x47e;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x47d;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x47c;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x47b;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x47a;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x479;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x478;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x473;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x472;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x471;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x46d;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x46b;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x469;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x467;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x466;" k="123" />
-<hkern u1="&#x4b0;" u2="&#x465;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x460;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x45f;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x45d;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x45c;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x45b;" k="-41" />
-<hkern u1="&#x4b0;" u2="&#x45a;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x459;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x455;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x454;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x453;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x452;" k="-41" />
-<hkern u1="&#x4b0;" u2="&#x451;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x450;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x44f;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x44e;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x44c;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x44b;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x449;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x448;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x447;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x446;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x444;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x441;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x440;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x43f;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x43e;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x43d;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x43c;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x43b;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x43a;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x439;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x438;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x435;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x434;" k="102" />
-<hkern u1="&#x4b0;" u2="&#x433;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x432;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x430;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x424;" k="61" />
-<hkern u1="&#x4b0;" u2="&#x421;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x41e;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x41b;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x414;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x410;" k="123" />
-<hkern u1="&#x4b0;" u2="&#x409;" k="82" />
-<hkern u1="&#x4b0;" u2="&#x404;" k="41" />
-<hkern u1="&#x4b0;" u2="&#x2e;" k="123" />
-<hkern u1="&#x4b0;" u2="&#x2c;" k="123" />
-<hkern u1="&#x4b1;" u2="&#x201e;" k="82" />
-<hkern u1="&#x4b1;" u2="&#x201a;" k="82" />
-<hkern u1="&#x4b1;" u2="&#x513;" k="20" />
-<hkern u1="&#x4b1;" u2="&#x509;" k="20" />
-<hkern u1="&#x4b1;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x4b1;" u2="&#x467;" k="20" />
-<hkern u1="&#x4b1;" u2="&#x459;" k="20" />
-<hkern u1="&#x4b1;" u2="&#x43b;" k="20" />
-<hkern u1="&#x4b1;" u2="&#x434;" k="20" />
-<hkern u1="&#x4b1;" u2="&#x2e;" k="82" />
-<hkern u1="&#x4b1;" u2="&#x2c;" k="82" />
-<hkern u1="&#x4b2;" u2="&#x50f;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x50c;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x507;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x505;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x4f5;" k="82" />
-<hkern u1="&#x4b2;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x4cc;" k="82" />
-<hkern u1="&#x4b2;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x4be;" k="61" />
-<hkern u1="&#x4b2;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x4bc;" k="61" />
-<hkern u1="&#x4b2;" u2="&#x4b9;" k="82" />
-<hkern u1="&#x4b2;" u2="&#x4b7;" k="82" />
-<hkern u1="&#x4b2;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x480;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x47e;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x47c;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x47a;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x478;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x472;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x471;" k="20" />
-<hkern u1="&#x4b2;" u2="&#x46f;" k="-61" />
-<hkern u1="&#x4b2;" u2="&#x460;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x44a;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x447;" k="82" />
-<hkern u1="&#x4b2;" u2="&#x442;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x424;" k="61" />
-<hkern u1="&#x4b2;" u2="&#x421;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x41e;" k="41" />
-<hkern u1="&#x4b2;" u2="&#x408;" k="-225" />
-<hkern u1="&#x4b2;" u2="&#x404;" k="41" />
-<hkern u1="&#x4b3;" u2="&#x511;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x50d;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x507;" k="41" />
-<hkern u1="&#x4b3;" u2="&#x505;" k="41" />
-<hkern u1="&#x4b3;" u2="&#x503;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x501;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x4eb;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x4e9;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x4e7;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x4d7;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x4ab;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x4a9;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x481;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x47d;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x47b;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x479;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x473;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x454;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x451;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x450;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x447;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x444;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x441;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x43e;" k="20" />
-<hkern u1="&#x4b3;" u2="&#x435;" k="20" />
-<hkern u1="&#x4b4;" u2="&#x507;" k="41" />
-<hkern u1="&#x4b4;" u2="&#x505;" k="41" />
-<hkern u1="&#x4b4;" u2="&#x4e1;" k="-41" />
-<hkern u1="&#x4b4;" u2="&#x408;" k="-225" />
-<hkern u1="&#x4b5;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4b5;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4b5;" u2="&#x27;" k="20" />
-<hkern u1="&#x4b5;" u2="&#x22;" k="20" />
-<hkern u1="&#x4b6;" u2="&#x507;" k="41" />
-<hkern u1="&#x4b6;" u2="&#x505;" k="41" />
-<hkern u1="&#x4b6;" u2="&#x4e1;" k="-41" />
-<hkern u1="&#x4b6;" u2="&#x408;" k="-225" />
-<hkern u1="&#x4b7;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4b7;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4b7;" u2="&#x27;" k="20" />
-<hkern u1="&#x4b7;" u2="&#x22;" k="20" />
-<hkern u1="&#x4ba;" u2="&#x201d;" k="61" />
-<hkern u1="&#x4ba;" u2="&#x2019;" k="61" />
-<hkern u1="&#x4ba;" u2="&#x50f;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x50e;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x507;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x506;" k="82" />
-<hkern u1="&#x4ba;" u2="&#x505;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x504;" k="82" />
-<hkern u1="&#x4ba;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x4ba;" u2="&#x4f4;" k="82" />
-<hkern u1="&#x4ba;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x4ba;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x4ba;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x4ba;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x4ba;" u2="&#x4cb;" k="82" />
-<hkern u1="&#x4ba;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x4ba;" u2="&#x4b8;" k="82" />
-<hkern u1="&#x4ba;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x4ba;" u2="&#x4b6;" k="82" />
-<hkern u1="&#x4ba;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x4b4;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x4b0;" k="102" />
-<hkern u1="&#x4ba;" u2="&#x4ae;" k="102" />
-<hkern u1="&#x4ba;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x4ac;" k="123" />
-<hkern u1="&#x4ba;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x4a0;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x476;" k="61" />
-<hkern u1="&#x4ba;" u2="&#x474;" k="61" />
-<hkern u1="&#x4ba;" u2="&#x470;" k="82" />
-<hkern u1="&#x4ba;" u2="&#x45e;" k="20" />
-<hkern u1="&#x4ba;" u2="&#x44a;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x447;" k="20" />
-<hkern u1="&#x4ba;" u2="&#x443;" k="20" />
-<hkern u1="&#x4ba;" u2="&#x442;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x42a;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x427;" k="82" />
-<hkern u1="&#x4ba;" u2="&#x422;" k="123" />
-<hkern u1="&#x4ba;" u2="&#x40b;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x402;" k="41" />
-<hkern u1="&#x4ba;" u2="&#x27;" k="61" />
-<hkern u1="&#x4ba;" u2="&#x22;" k="61" />
-<hkern u1="&#x4bb;" u2="&#x201d;" k="102" />
-<hkern u1="&#x4bb;" u2="&#x2019;" k="102" />
-<hkern u1="&#x4bb;" u2="&#x50f;" k="41" />
-<hkern u1="&#x4bb;" u2="&#x507;" k="82" />
-<hkern u1="&#x4bb;" u2="&#x505;" k="82" />
-<hkern u1="&#x4bb;" u2="&#x4f3;" k="41" />
-<hkern u1="&#x4bb;" u2="&#x4f1;" k="41" />
-<hkern u1="&#x4bb;" u2="&#x4ef;" k="41" />
-<hkern u1="&#x4bb;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x4bb;" u2="&#x4b1;" k="41" />
-<hkern u1="&#x4bb;" u2="&#x4af;" k="41" />
-<hkern u1="&#x4bb;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x4bb;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x4bb;" u2="&#x45e;" k="41" />
-<hkern u1="&#x4bb;" u2="&#x44a;" k="41" />
-<hkern u1="&#x4bb;" u2="&#x443;" k="41" />
-<hkern u1="&#x4bb;" u2="&#x442;" k="41" />
-<hkern u1="&#x4bb;" u2="&#x27;" k="102" />
-<hkern u1="&#x4bb;" u2="&#x22;" k="102" />
-<hkern u1="&#x4bc;" u2="&#x506;" k="20" />
-<hkern u1="&#x4bc;" u2="&#x504;" k="20" />
-<hkern u1="&#x4bc;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x4bc;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x4bc;" u2="&#x4ac;" k="41" />
-<hkern u1="&#x4bc;" u2="&#x476;" k="20" />
-<hkern u1="&#x4bc;" u2="&#x474;" k="20" />
-<hkern u1="&#x4bc;" u2="&#x422;" k="41" />
-<hkern u1="&#x4bd;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4bd;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4bd;" u2="&#x27;" k="20" />
-<hkern u1="&#x4bd;" u2="&#x22;" k="20" />
-<hkern u1="&#x4be;" u2="&#x506;" k="20" />
-<hkern u1="&#x4be;" u2="&#x504;" k="20" />
-<hkern u1="&#x4be;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x4be;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x4be;" u2="&#x4ac;" k="41" />
-<hkern u1="&#x4be;" u2="&#x476;" k="20" />
-<hkern u1="&#x4be;" u2="&#x474;" k="20" />
-<hkern u1="&#x4be;" u2="&#x422;" k="41" />
-<hkern u1="&#x4bf;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4bf;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4bf;" u2="&#x27;" k="20" />
-<hkern u1="&#x4bf;" u2="&#x22;" k="20" />
-<hkern u1="&#x4c1;" u2="&#x510;" k="20" />
-<hkern u1="&#x4c1;" u2="&#x50c;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x507;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x505;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x502;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x500;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x4be;" k="102" />
-<hkern u1="&#x4c1;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x4c1;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x480;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x47e;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x47c;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x47a;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x478;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x472;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x470;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x460;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x447;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x427;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x424;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x421;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x41e;" k="41" />
-<hkern u1="&#x4c1;" u2="&#x404;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x511;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x50d;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x503;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x501;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x481;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x47d;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x47b;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x479;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x473;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x454;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x451;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x450;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x447;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x444;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x441;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x43e;" k="41" />
-<hkern u1="&#x4c2;" u2="&#x435;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x201d;" k="61" />
-<hkern u1="&#x4c3;" u2="&#x2019;" k="61" />
-<hkern u1="&#x4c3;" u2="&#x50f;" k="61" />
-<hkern u1="&#x4c3;" u2="&#x507;" k="61" />
-<hkern u1="&#x4c3;" u2="&#x506;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x505;" k="61" />
-<hkern u1="&#x4c3;" u2="&#x504;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x4f4;" k="82" />
-<hkern u1="&#x4c3;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x4cb;" k="82" />
-<hkern u1="&#x4c3;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x4be;" k="61" />
-<hkern u1="&#x4c3;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x4bc;" k="61" />
-<hkern u1="&#x4c3;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x4b8;" k="82" />
-<hkern u1="&#x4c3;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x4b6;" k="82" />
-<hkern u1="&#x4c3;" u2="&#x4b5;" k="61" />
-<hkern u1="&#x4c3;" u2="&#x4b1;" k="20" />
-<hkern u1="&#x4c3;" u2="&#x4b0;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x4af;" k="20" />
-<hkern u1="&#x4c3;" u2="&#x4ae;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x4ad;" k="61" />
-<hkern u1="&#x4c3;" u2="&#x4ac;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x4a1;" k="61" />
-<hkern u1="&#x4c3;" u2="&#x47f;" k="20" />
-<hkern u1="&#x4c3;" u2="&#x477;" k="20" />
-<hkern u1="&#x4c3;" u2="&#x476;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x475;" k="20" />
-<hkern u1="&#x4c3;" u2="&#x474;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x470;" k="82" />
-<hkern u1="&#x4c3;" u2="&#x461;" k="20" />
-<hkern u1="&#x4c3;" u2="&#x44a;" k="61" />
-<hkern u1="&#x4c3;" u2="&#x447;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x442;" k="61" />
-<hkern u1="&#x4c3;" u2="&#x427;" k="82" />
-<hkern u1="&#x4c3;" u2="&#x424;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x422;" k="41" />
-<hkern u1="&#x4c3;" u2="&#x408;" k="-102" />
-<hkern u1="&#x4c3;" u2="&#x27;" k="61" />
-<hkern u1="&#x4c3;" u2="&#x22;" k="61" />
-<hkern u1="&#x4c4;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4c4;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4c4;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4c4;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4c4;" u2="&#x447;" k="41" />
-<hkern u1="&#x4c5;" u2="&#x507;" k="41" />
-<hkern u1="&#x4c5;" u2="&#x505;" k="41" />
-<hkern u1="&#x4c5;" u2="&#x4e1;" k="-41" />
-<hkern u1="&#x4c5;" u2="&#x408;" k="-225" />
-<hkern u1="&#x4c6;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4c6;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4c6;" u2="&#x27;" k="20" />
-<hkern u1="&#x4c6;" u2="&#x22;" k="20" />
-<hkern u1="&#x4c9;" u2="&#x507;" k="41" />
-<hkern u1="&#x4c9;" u2="&#x505;" k="41" />
-<hkern u1="&#x4c9;" u2="&#x4e1;" k="-41" />
-<hkern u1="&#x4c9;" u2="&#x408;" k="-225" />
-<hkern u1="&#x4ca;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4ca;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4ca;" u2="&#x27;" k="20" />
-<hkern u1="&#x4ca;" u2="&#x22;" k="20" />
-<hkern u1="&#x4cd;" u2="&#x507;" k="41" />
-<hkern u1="&#x4cd;" u2="&#x505;" k="41" />
-<hkern u1="&#x4cd;" u2="&#x4e1;" k="-41" />
-<hkern u1="&#x4cd;" u2="&#x408;" k="-225" />
-<hkern u1="&#x4ce;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4ce;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4ce;" u2="&#x27;" k="20" />
-<hkern u1="&#x4ce;" u2="&#x22;" k="20" />
-<hkern u1="&#x4d0;" u2="&#x201d;" k="143" />
-<hkern u1="&#x4d0;" u2="&#x2019;" k="143" />
-<hkern u1="&#x4d0;" u2="&#x50f;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x50e;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x507;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x506;" k="143" />
-<hkern u1="&#x4d0;" u2="&#x505;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x504;" k="143" />
-<hkern u1="&#x4d0;" u2="&#x4fa;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x4f4;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x4da;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x4d8;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x4cb;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x4be;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x4b8;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x4b6;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x4b4;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x4b0;" k="123" />
-<hkern u1="&#x4d0;" u2="&#x4ae;" k="123" />
-<hkern u1="&#x4d0;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x4ac;" k="143" />
-<hkern u1="&#x4d0;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x4a0;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x49e;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x492;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x48c;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x476;" k="82" />
-<hkern u1="&#x4d0;" u2="&#x474;" k="82" />
-<hkern u1="&#x4d0;" u2="&#x470;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x462;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x44a;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x447;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x442;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x42a;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x427;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x424;" k="41" />
-<hkern u1="&#x4d0;" u2="&#x422;" k="143" />
-<hkern u1="&#x4d0;" u2="&#x40b;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x402;" k="102" />
-<hkern u1="&#x4d0;" u2="&#x27;" k="143" />
-<hkern u1="&#x4d0;" u2="&#x22;" k="143" />
-<hkern u1="&#x4d1;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4d1;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4d1;" u2="&#x27;" k="20" />
-<hkern u1="&#x4d1;" u2="&#x22;" k="20" />
-<hkern u1="&#x4d2;" u2="&#x201d;" k="143" />
-<hkern u1="&#x4d2;" u2="&#x2019;" k="143" />
-<hkern u1="&#x4d2;" u2="&#x50f;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x50e;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x507;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x506;" k="143" />
-<hkern u1="&#x4d2;" u2="&#x505;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x504;" k="143" />
-<hkern u1="&#x4d2;" u2="&#x4fa;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x4f4;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x4da;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x4d8;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x4cb;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x4be;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x4b8;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x4b6;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x4b4;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x4b0;" k="123" />
-<hkern u1="&#x4d2;" u2="&#x4ae;" k="123" />
-<hkern u1="&#x4d2;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x4ac;" k="143" />
-<hkern u1="&#x4d2;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x4a0;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x49e;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x492;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x48c;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x476;" k="82" />
-<hkern u1="&#x4d2;" u2="&#x474;" k="82" />
-<hkern u1="&#x4d2;" u2="&#x470;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x462;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x44a;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x447;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x442;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x42a;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x427;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x424;" k="41" />
-<hkern u1="&#x4d2;" u2="&#x422;" k="143" />
-<hkern u1="&#x4d2;" u2="&#x40b;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x402;" k="102" />
-<hkern u1="&#x4d2;" u2="&#x27;" k="143" />
-<hkern u1="&#x4d2;" u2="&#x22;" k="143" />
-<hkern u1="&#x4d3;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4d3;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4d3;" u2="&#x27;" k="20" />
-<hkern u1="&#x4d3;" u2="&#x22;" k="20" />
-<hkern u1="&#x4d5;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4d5;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4d5;" u2="&#x27;" k="20" />
-<hkern u1="&#x4d5;" u2="&#x22;" k="20" />
-<hkern u1="&#x4d7;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4d7;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4d7;" u2="&#x27;" k="20" />
-<hkern u1="&#x4d7;" u2="&#x22;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x201e;" k="82" />
-<hkern u1="&#x4d8;" u2="&#x201a;" k="82" />
-<hkern u1="&#x4d8;" u2="&#x513;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x512;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x50e;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x509;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x508;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x506;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x504;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x4de;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x4d8;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x498;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x496;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x476;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x474;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x470;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x46e;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x467;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x466;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x459;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x43b;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x434;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x42d;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x42a;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x427;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x425;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x423;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x422;" k="61" />
-<hkern u1="&#x4d8;" u2="&#x41b;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x417;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x416;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x414;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x410;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x40e;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x40b;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x409;" k="41" />
-<hkern u1="&#x4d8;" u2="&#x402;" k="20" />
-<hkern u1="&#x4d8;" u2="&#x2e;" k="82" />
-<hkern u1="&#x4d8;" u2="&#x2c;" k="82" />
-<hkern u1="&#x4d9;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x50f;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x507;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x505;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x4d9;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x4d9;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x4d9;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x4d9;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x4d9;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x497;" k="41" />
-<hkern u1="&#x4d9;" u2="&#x45e;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x44a;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x447;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x445;" k="41" />
-<hkern u1="&#x4d9;" u2="&#x443;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x442;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x436;" k="41" />
-<hkern u1="&#x4d9;" u2="&#x27;" k="20" />
-<hkern u1="&#x4d9;" u2="&#x22;" k="20" />
-<hkern u1="&#x4da;" u2="&#x201e;" k="82" />
-<hkern u1="&#x4da;" u2="&#x201a;" k="82" />
-<hkern u1="&#x4da;" u2="&#x513;" k="20" />
-<hkern u1="&#x4da;" u2="&#x512;" k="41" />
-<hkern u1="&#x4da;" u2="&#x50e;" k="20" />
-<hkern u1="&#x4da;" u2="&#x509;" k="20" />
-<hkern u1="&#x4da;" u2="&#x508;" k="41" />
-<hkern u1="&#x4da;" u2="&#x506;" k="41" />
-<hkern u1="&#x4da;" u2="&#x504;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x4da;" u2="&#x4de;" k="20" />
-<hkern u1="&#x4da;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x4da;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x4da;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x4da;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x4da;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x4da;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x4da;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x4da;" u2="&#x498;" k="20" />
-<hkern u1="&#x4da;" u2="&#x496;" k="41" />
-<hkern u1="&#x4da;" u2="&#x476;" k="20" />
-<hkern u1="&#x4da;" u2="&#x474;" k="20" />
-<hkern u1="&#x4da;" u2="&#x470;" k="41" />
-<hkern u1="&#x4da;" u2="&#x46e;" k="20" />
-<hkern u1="&#x4da;" u2="&#x467;" k="20" />
-<hkern u1="&#x4da;" u2="&#x466;" k="41" />
-<hkern u1="&#x4da;" u2="&#x459;" k="20" />
-<hkern u1="&#x4da;" u2="&#x43b;" k="20" />
-<hkern u1="&#x4da;" u2="&#x434;" k="20" />
-<hkern u1="&#x4da;" u2="&#x42d;" k="20" />
-<hkern u1="&#x4da;" u2="&#x42a;" k="20" />
-<hkern u1="&#x4da;" u2="&#x427;" k="41" />
-<hkern u1="&#x4da;" u2="&#x425;" k="41" />
-<hkern u1="&#x4da;" u2="&#x423;" k="41" />
-<hkern u1="&#x4da;" u2="&#x422;" k="61" />
-<hkern u1="&#x4da;" u2="&#x41b;" k="41" />
-<hkern u1="&#x4da;" u2="&#x417;" k="20" />
-<hkern u1="&#x4da;" u2="&#x416;" k="41" />
-<hkern u1="&#x4da;" u2="&#x414;" k="41" />
-<hkern u1="&#x4da;" u2="&#x410;" k="41" />
-<hkern u1="&#x4da;" u2="&#x40e;" k="41" />
-<hkern u1="&#x4da;" u2="&#x40b;" k="20" />
-<hkern u1="&#x4da;" u2="&#x409;" k="41" />
-<hkern u1="&#x4da;" u2="&#x402;" k="20" />
-<hkern u1="&#x4da;" u2="&#x2e;" k="82" />
-<hkern u1="&#x4da;" u2="&#x2c;" k="82" />
-<hkern u1="&#x4db;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4db;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4db;" u2="&#x50f;" k="20" />
-<hkern u1="&#x4db;" u2="&#x507;" k="20" />
-<hkern u1="&#x4db;" u2="&#x505;" k="20" />
-<hkern u1="&#x4db;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x4db;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x4db;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x4db;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x4db;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x4db;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x4db;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x4db;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x4db;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x4db;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x4db;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x4db;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x4db;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x4db;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x4db;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x4db;" u2="&#x497;" k="41" />
-<hkern u1="&#x4db;" u2="&#x45e;" k="20" />
-<hkern u1="&#x4db;" u2="&#x44a;" k="20" />
-<hkern u1="&#x4db;" u2="&#x447;" k="20" />
-<hkern u1="&#x4db;" u2="&#x445;" k="41" />
-<hkern u1="&#x4db;" u2="&#x443;" k="20" />
-<hkern u1="&#x4db;" u2="&#x442;" k="20" />
-<hkern u1="&#x4db;" u2="&#x436;" k="41" />
-<hkern u1="&#x4db;" u2="&#x27;" k="20" />
-<hkern u1="&#x4db;" u2="&#x22;" k="20" />
-<hkern u1="&#x4dc;" u2="&#x510;" k="20" />
-<hkern u1="&#x4dc;" u2="&#x50c;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x507;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x505;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x502;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x500;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x4be;" k="102" />
-<hkern u1="&#x4dc;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x4dc;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x480;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x47e;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x47c;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x47a;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x478;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x472;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x470;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x460;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x447;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x427;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x424;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x421;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x41e;" k="41" />
-<hkern u1="&#x4dc;" u2="&#x404;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x511;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x50d;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x503;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x501;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x481;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x47d;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x47b;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x479;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x473;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x454;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x451;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x450;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x447;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x444;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x441;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x43e;" k="41" />
-<hkern u1="&#x4dd;" u2="&#x435;" k="41" />
-<hkern u1="&#x4de;" u2="&#x201e;" k="82" />
-<hkern u1="&#x4de;" u2="&#x201a;" k="82" />
-<hkern u1="&#x4de;" u2="&#x506;" k="41" />
-<hkern u1="&#x4de;" u2="&#x504;" k="41" />
-<hkern u1="&#x4de;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x4de;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x4de;" u2="&#x476;" k="20" />
-<hkern u1="&#x4de;" u2="&#x474;" k="20" />
-<hkern u1="&#x4de;" u2="&#x2e;" k="82" />
-<hkern u1="&#x4de;" u2="&#x2c;" k="82" />
-<hkern u1="&#x4df;" u2="&#x44f;" k="-41" />
-<hkern u1="&#x4e0;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4e0;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4e0;" u2="&#x507;" k="41" />
-<hkern u1="&#x4e0;" u2="&#x505;" k="41" />
-<hkern u1="&#x4e0;" u2="&#x27;" k="20" />
-<hkern u1="&#x4e0;" u2="&#x22;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x201e;" k="82" />
-<hkern u1="&#x4e6;" u2="&#x201a;" k="82" />
-<hkern u1="&#x4e6;" u2="&#x513;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x512;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x50e;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x509;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x508;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x506;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x504;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x4de;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x4e6;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x498;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x496;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x476;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x474;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x470;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x46e;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x467;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x466;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x459;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x43b;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x434;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x42d;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x42a;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x427;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x425;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x423;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x422;" k="61" />
-<hkern u1="&#x4e6;" u2="&#x41b;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x417;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x416;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x414;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x410;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x40e;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x40b;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x409;" k="41" />
-<hkern u1="&#x4e6;" u2="&#x402;" k="20" />
-<hkern u1="&#x4e6;" u2="&#x2e;" k="82" />
-<hkern u1="&#x4e6;" u2="&#x2c;" k="82" />
-<hkern u1="&#x4e7;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x50f;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x507;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x505;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x4e7;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x4e7;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x4e7;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x4e7;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x4e7;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x497;" k="41" />
-<hkern u1="&#x4e7;" u2="&#x45e;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x44a;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x447;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x445;" k="41" />
-<hkern u1="&#x4e7;" u2="&#x443;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x442;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x436;" k="41" />
-<hkern u1="&#x4e7;" u2="&#x27;" k="20" />
-<hkern u1="&#x4e7;" u2="&#x22;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x201e;" k="82" />
-<hkern u1="&#x4e8;" u2="&#x201a;" k="82" />
-<hkern u1="&#x4e8;" u2="&#x513;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x512;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x50e;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x509;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x508;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x506;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x504;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x4de;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x4e8;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x498;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x496;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x476;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x474;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x470;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x46e;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x467;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x466;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x459;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x43b;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x434;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x42d;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x42a;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x427;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x425;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x423;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x422;" k="61" />
-<hkern u1="&#x4e8;" u2="&#x41b;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x417;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x416;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x414;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x410;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x40e;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x40b;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x409;" k="41" />
-<hkern u1="&#x4e8;" u2="&#x402;" k="20" />
-<hkern u1="&#x4e8;" u2="&#x2e;" k="82" />
-<hkern u1="&#x4e8;" u2="&#x2c;" k="82" />
-<hkern u1="&#x4e9;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x50f;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x507;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x505;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x4e9;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x4e9;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x4e9;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x4e9;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x4e9;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x497;" k="41" />
-<hkern u1="&#x4e9;" u2="&#x45e;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x44a;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x447;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x445;" k="41" />
-<hkern u1="&#x4e9;" u2="&#x443;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x442;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x436;" k="41" />
-<hkern u1="&#x4e9;" u2="&#x27;" k="20" />
-<hkern u1="&#x4e9;" u2="&#x22;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x201e;" k="82" />
-<hkern u1="&#x4ea;" u2="&#x201a;" k="82" />
-<hkern u1="&#x4ea;" u2="&#x513;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x512;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x50e;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x509;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x508;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x506;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x504;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x4de;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x4ea;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x498;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x496;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x476;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x474;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x470;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x46e;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x467;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x466;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x459;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x43b;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x434;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x42d;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x42a;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x427;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x425;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x423;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x422;" k="61" />
-<hkern u1="&#x4ea;" u2="&#x41b;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x417;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x416;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x414;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x410;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x40e;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x40b;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x409;" k="41" />
-<hkern u1="&#x4ea;" u2="&#x402;" k="20" />
-<hkern u1="&#x4ea;" u2="&#x2e;" k="82" />
-<hkern u1="&#x4ea;" u2="&#x2c;" k="82" />
-<hkern u1="&#x4eb;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x50f;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x507;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x505;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x4eb;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x4eb;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x4eb;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x4eb;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x4eb;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x497;" k="41" />
-<hkern u1="&#x4eb;" u2="&#x45e;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x44a;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x447;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x445;" k="41" />
-<hkern u1="&#x4eb;" u2="&#x443;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x442;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x436;" k="41" />
-<hkern u1="&#x4eb;" u2="&#x27;" k="20" />
-<hkern u1="&#x4eb;" u2="&#x22;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x201e;" k="82" />
-<hkern u1="&#x4ec;" u2="&#x201a;" k="82" />
-<hkern u1="&#x4ec;" u2="&#x513;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x512;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x50e;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x509;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x508;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x506;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x504;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4f2;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4f0;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4ee;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4ec;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x4de;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4c6;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x4c5;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4b4;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x4ec;" u2="&#x4a0;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x498;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x496;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x476;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x474;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x470;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x46e;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x467;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x466;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x459;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x43b;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x434;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x42d;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x42a;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x427;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x425;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x423;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x422;" k="61" />
-<hkern u1="&#x4ec;" u2="&#x41b;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x417;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x416;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x414;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x410;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x40e;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x40b;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x409;" k="41" />
-<hkern u1="&#x4ec;" u2="&#x402;" k="20" />
-<hkern u1="&#x4ec;" u2="&#x2e;" k="82" />
-<hkern u1="&#x4ec;" u2="&#x2c;" k="82" />
-<hkern u1="&#x4ed;" u2="&#x201d;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x2019;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x50f;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x507;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x505;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x4ed;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x4ed;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x4ed;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x4ed;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x4b5;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x4ed;" u2="&#x4ad;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x4a1;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x497;" k="41" />
-<hkern u1="&#x4ed;" u2="&#x45e;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x44a;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x447;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x445;" k="41" />
-<hkern u1="&#x4ed;" u2="&#x443;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x442;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x436;" k="41" />
-<hkern u1="&#x4ed;" u2="&#x27;" k="20" />
-<hkern u1="&#x4ed;" u2="&#x22;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x201e;" k="123" />
-<hkern u1="&#x4ee;" u2="&#x201a;" k="123" />
-<hkern u1="&#x4ee;" u2="&#x513;" k="82" />
-<hkern u1="&#x4ee;" u2="&#x512;" k="102" />
-<hkern u1="&#x4ee;" u2="&#x511;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x50d;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x50c;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x509;" k="82" />
-<hkern u1="&#x4ee;" u2="&#x508;" k="102" />
-<hkern u1="&#x4ee;" u2="&#x503;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x502;" k="143" />
-<hkern u1="&#x4ee;" u2="&#x501;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x500;" k="143" />
-<hkern u1="&#x4ee;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x4ea;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x4e8;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x4e6;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x4ee;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x4ee;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x4ee;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x4c6;" k="82" />
-<hkern u1="&#x4ee;" u2="&#x4c5;" k="102" />
-<hkern u1="&#x4ee;" u2="&#x4bf;" k="61" />
-<hkern u1="&#x4ee;" u2="&#x4be;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x4bd;" k="61" />
-<hkern u1="&#x4ee;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x4aa;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x4a8;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x49f;" k="-102" />
-<hkern u1="&#x4ee;" u2="&#x48d;" k="-102" />
-<hkern u1="&#x4ee;" u2="&#x481;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x480;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x47e;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x47d;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x47c;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x47b;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x47a;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x479;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x478;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x473;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x472;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x467;" k="82" />
-<hkern u1="&#x4ee;" u2="&#x466;" k="143" />
-<hkern u1="&#x4ee;" u2="&#x460;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x45b;" k="-102" />
-<hkern u1="&#x4ee;" u2="&#x459;" k="82" />
-<hkern u1="&#x4ee;" u2="&#x455;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x454;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x452;" k="-102" />
-<hkern u1="&#x4ee;" u2="&#x451;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x450;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x447;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x444;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x441;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x43e;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x43b;" k="82" />
-<hkern u1="&#x4ee;" u2="&#x435;" k="41" />
-<hkern u1="&#x4ee;" u2="&#x434;" k="82" />
-<hkern u1="&#x4ee;" u2="&#x42f;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x424;" k="61" />
-<hkern u1="&#x4ee;" u2="&#x421;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x41e;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x41b;" k="102" />
-<hkern u1="&#x4ee;" u2="&#x414;" k="102" />
-<hkern u1="&#x4ee;" u2="&#x410;" k="143" />
-<hkern u1="&#x4ee;" u2="&#x409;" k="102" />
-<hkern u1="&#x4ee;" u2="&#x404;" k="20" />
-<hkern u1="&#x4ee;" u2="&#x2e;" k="123" />
-<hkern u1="&#x4ee;" u2="&#x2c;" k="123" />
-<hkern u1="&#x4ef;" u2="&#x201e;" k="82" />
-<hkern u1="&#x4ef;" u2="&#x201a;" k="82" />
-<hkern u1="&#x4ef;" u2="&#x513;" k="41" />
-<hkern u1="&#x4ef;" u2="&#x509;" k="41" />
-<hkern u1="&#x4ef;" u2="&#x4c6;" k="41" />
-<hkern u1="&#x4ef;" u2="&#x467;" k="41" />
-<hkern u1="&#x4ef;" u2="&#x459;" k="41" />
-<hkern u1="&#x4ef;" u2="&#x43b;" k="41" />
-<hkern u1="&#x4ef;" u2="&#x434;" k="41" />
-<hkern u1="&#x4ef;" u2="&#x2e;" k="82" />
-<hkern u1="&#x4ef;" u2="&#x2c;" k="82" />
-<hkern u1="&#x4f0;" u2="&#x201e;" k="123" />
-<hkern u1="&#x4f0;" u2="&#x201a;" k="123" />
-<hkern u1="&#x4f0;" u2="&#x513;" k="82" />
-<hkern u1="&#x4f0;" u2="&#x512;" k="102" />
-<hkern u1="&#x4f0;" u2="&#x511;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x50d;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x50c;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x509;" k="82" />
-<hkern u1="&#x4f0;" u2="&#x508;" k="102" />
-<hkern u1="&#x4f0;" u2="&#x503;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x502;" k="143" />
-<hkern u1="&#x4f0;" u2="&#x501;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x500;" k="143" />
-<hkern u1="&#x4f0;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x4ea;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x4e8;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x4e6;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x4f0;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x4f0;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x4f0;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x4c6;" k="82" />
-<hkern u1="&#x4f0;" u2="&#x4c5;" k="102" />
-<hkern u1="&#x4f0;" u2="&#x4bf;" k="61" />
-<hkern u1="&#x4f0;" u2="&#x4be;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x4bd;" k="61" />
-<hkern u1="&#x4f0;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x4aa;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x4a8;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x49f;" k="-102" />
-<hkern u1="&#x4f0;" u2="&#x48d;" k="-102" />
-<hkern u1="&#x4f0;" u2="&#x481;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x480;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x47e;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x47d;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x47c;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x47b;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x47a;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x479;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x478;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x473;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x472;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x467;" k="82" />
-<hkern u1="&#x4f0;" u2="&#x466;" k="143" />
-<hkern u1="&#x4f0;" u2="&#x460;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x45b;" k="-102" />
-<hkern u1="&#x4f0;" u2="&#x459;" k="82" />
-<hkern u1="&#x4f0;" u2="&#x455;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x454;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x452;" k="-102" />
-<hkern u1="&#x4f0;" u2="&#x451;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x450;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x447;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x444;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x441;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x43e;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x43b;" k="82" />
-<hkern u1="&#x4f0;" u2="&#x435;" k="41" />
-<hkern u1="&#x4f0;" u2="&#x434;" k="82" />
-<hkern u1="&#x4f0;" u2="&#x42f;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x424;" k="61" />
-<hkern u1="&#x4f0;" u2="&#x421;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x41e;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x41b;" k="102" />
-<hkern u1="&#x4f0;" u2="&#x414;" k="102" />
-<hkern u1="&#x4f0;" u2="&#x410;" k="143" />
-<hkern u1="&#x4f0;" u2="&#x409;" k="102" />
-<hkern u1="&#x4f0;" u2="&#x404;" k="20" />
-<hkern u1="&#x4f0;" u2="&#x2e;" k="123" />
-<hkern u1="&#x4f0;" u2="&#x2c;" k="123" />
-<hkern u1="&#x4f1;" u2="&#x201e;" k="82" />
-<hkern u1="&#x4f1;" u2="&#x201a;" k="82" />
-<hkern u1="&#x4f1;" u2="&#x513;" k="41" />
-<hkern u1="&#x4f1;" u2="&#x509;" k="41" />
-<hkern u1="&#x4f1;" u2="&#x4c6;" k="41" />
-<hkern u1="&#x4f1;" u2="&#x467;" k="41" />
-<hkern u1="&#x4f1;" u2="&#x459;" k="41" />
-<hkern u1="&#x4f1;" u2="&#x43b;" k="41" />
-<hkern u1="&#x4f1;" u2="&#x434;" k="41" />
-<hkern u1="&#x4f1;" u2="&#x2e;" k="82" />
-<hkern u1="&#x4f1;" u2="&#x2c;" k="82" />
-<hkern u1="&#x4f2;" u2="&#x201e;" k="123" />
-<hkern u1="&#x4f2;" u2="&#x201a;" k="123" />
-<hkern u1="&#x4f2;" u2="&#x513;" k="82" />
-<hkern u1="&#x4f2;" u2="&#x512;" k="102" />
-<hkern u1="&#x4f2;" u2="&#x511;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x50d;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x50c;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x509;" k="82" />
-<hkern u1="&#x4f2;" u2="&#x508;" k="102" />
-<hkern u1="&#x4f2;" u2="&#x503;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x502;" k="143" />
-<hkern u1="&#x4f2;" u2="&#x501;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x500;" k="143" />
-<hkern u1="&#x4f2;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x4ea;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x4e8;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x4e6;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x4f2;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x4f2;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x4f2;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x4c6;" k="82" />
-<hkern u1="&#x4f2;" u2="&#x4c5;" k="102" />
-<hkern u1="&#x4f2;" u2="&#x4bf;" k="61" />
-<hkern u1="&#x4f2;" u2="&#x4be;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x4bd;" k="61" />
-<hkern u1="&#x4f2;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x4aa;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x4a8;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x49f;" k="-102" />
-<hkern u1="&#x4f2;" u2="&#x48d;" k="-102" />
-<hkern u1="&#x4f2;" u2="&#x481;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x480;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x47e;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x47d;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x47c;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x47b;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x47a;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x479;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x478;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x473;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x472;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x467;" k="82" />
-<hkern u1="&#x4f2;" u2="&#x466;" k="143" />
-<hkern u1="&#x4f2;" u2="&#x460;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x45b;" k="-102" />
-<hkern u1="&#x4f2;" u2="&#x459;" k="82" />
-<hkern u1="&#x4f2;" u2="&#x455;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x454;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x452;" k="-102" />
-<hkern u1="&#x4f2;" u2="&#x451;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x450;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x447;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x444;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x441;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x43e;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x43b;" k="82" />
-<hkern u1="&#x4f2;" u2="&#x435;" k="41" />
-<hkern u1="&#x4f2;" u2="&#x434;" k="82" />
-<hkern u1="&#x4f2;" u2="&#x42f;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x424;" k="61" />
-<hkern u1="&#x4f2;" u2="&#x421;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x41e;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x41b;" k="102" />
-<hkern u1="&#x4f2;" u2="&#x414;" k="102" />
-<hkern u1="&#x4f2;" u2="&#x410;" k="143" />
-<hkern u1="&#x4f2;" u2="&#x409;" k="102" />
-<hkern u1="&#x4f2;" u2="&#x404;" k="20" />
-<hkern u1="&#x4f2;" u2="&#x2e;" k="123" />
-<hkern u1="&#x4f2;" u2="&#x2c;" k="123" />
-<hkern u1="&#x4f3;" u2="&#x201e;" k="82" />
-<hkern u1="&#x4f3;" u2="&#x201a;" k="82" />
-<hkern u1="&#x4f3;" u2="&#x513;" k="41" />
-<hkern u1="&#x4f3;" u2="&#x509;" k="41" />
-<hkern u1="&#x4f3;" u2="&#x4c6;" k="41" />
-<hkern u1="&#x4f3;" u2="&#x467;" k="41" />
-<hkern u1="&#x4f3;" u2="&#x459;" k="41" />
-<hkern u1="&#x4f3;" u2="&#x43b;" k="41" />
-<hkern u1="&#x4f3;" u2="&#x434;" k="41" />
-<hkern u1="&#x4f3;" u2="&#x2e;" k="82" />
-<hkern u1="&#x4f3;" u2="&#x2c;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x201e;" k="123" />
-<hkern u1="&#x4f6;" u2="&#x201a;" k="123" />
-<hkern u1="&#x4f6;" u2="&#x2015;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x2014;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x2013;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x513;" k="123" />
-<hkern u1="&#x4f6;" u2="&#x512;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x511;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x50f;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x50d;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x50c;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x50b;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x509;" k="123" />
-<hkern u1="&#x4f6;" u2="&#x508;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x507;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x505;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x503;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x502;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x501;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x500;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x4f9;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4f7;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4f5;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4f3;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x4f1;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x4ef;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x4ed;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x4eb;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x4e9;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x4e7;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x4e5;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4e3;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4e1;" k="61" />
-<hkern u1="&#x4f6;" u2="&#x4df;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x4d7;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x4ce;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4cc;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4ca;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4c8;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4c6;" k="123" />
-<hkern u1="&#x4f6;" u2="&#x4c5;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4c4;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x4bf;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x4be;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4bd;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4bb;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4b9;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4b7;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4b5;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x4b1;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x4af;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x4ad;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x4ac;" k="-41" />
-<hkern u1="&#x4f6;" u2="&#x4ab;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x4a9;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x4a7;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4a5;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4a3;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x4a1;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x49d;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x49b;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x499;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x497;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x495;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x491;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x48f;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x48b;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x481;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x480;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x47f;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x47e;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x47d;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x47c;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x47b;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x47a;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x479;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x478;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x477;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x475;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x473;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x472;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x471;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x46d;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x46b;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x469;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x467;" k="123" />
-<hkern u1="&#x4f6;" u2="&#x466;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x465;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x461;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x460;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x45f;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x45e;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x45d;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x45c;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x45a;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x459;" k="123" />
-<hkern u1="&#x4f6;" u2="&#x455;" k="123" />
-<hkern u1="&#x4f6;" u2="&#x454;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x453;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x451;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x450;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x44f;" k="61" />
-<hkern u1="&#x4f6;" u2="&#x44e;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x44d;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x44c;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x44b;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x44a;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x449;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x448;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x447;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x446;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x445;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x444;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x443;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x442;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x441;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x440;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x43f;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x43e;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x43d;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x43c;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x43b;" k="123" />
-<hkern u1="&#x4f6;" u2="&#x43a;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x439;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x438;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x437;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x436;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x435;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x434;" k="123" />
-<hkern u1="&#x4f6;" u2="&#x433;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x432;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x424;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x422;" k="-41" />
-<hkern u1="&#x4f6;" u2="&#x421;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x41e;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x41b;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x414;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x410;" k="143" />
-<hkern u1="&#x4f6;" u2="&#x409;" k="102" />
-<hkern u1="&#x4f6;" u2="&#x404;" k="41" />
-<hkern u1="&#x4f6;" u2="&#x2e;" k="123" />
-<hkern u1="&#x4f6;" u2="&#x2d;" k="82" />
-<hkern u1="&#x4f6;" u2="&#x2c;" k="123" />
-<hkern u1="&#x4f7;" u2="&#x201e;" k="102" />
-<hkern u1="&#x4f7;" u2="&#x201a;" k="102" />
-<hkern u1="&#x4f7;" u2="&#x2015;" k="41" />
-<hkern u1="&#x4f7;" u2="&#x2014;" k="41" />
-<hkern u1="&#x4f7;" u2="&#x2013;" k="41" />
-<hkern u1="&#x4f7;" u2="&#x513;" k="61" />
-<hkern u1="&#x4f7;" u2="&#x511;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x50d;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x509;" k="61" />
-<hkern u1="&#x4f7;" u2="&#x503;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x501;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x4eb;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x4e9;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x4e7;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x4d7;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x4c6;" k="61" />
-<hkern u1="&#x4f7;" u2="&#x4ab;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x4a9;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x481;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x47d;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x47b;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x479;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x473;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x467;" k="61" />
-<hkern u1="&#x4f7;" u2="&#x459;" k="61" />
-<hkern u1="&#x4f7;" u2="&#x454;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x451;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x450;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x444;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x441;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x43e;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x43b;" k="61" />
-<hkern u1="&#x4f7;" u2="&#x435;" k="20" />
-<hkern u1="&#x4f7;" u2="&#x434;" k="61" />
-<hkern u1="&#x4f7;" u2="&#x2e;" k="102" />
-<hkern u1="&#x4f7;" u2="&#x2d;" k="41" />
-<hkern u1="&#x4f7;" u2="&#x2c;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x201e;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x201a;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x2015;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x2014;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x2013;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x513;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x512;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x511;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x50e;" k="-41" />
-<hkern u1="&#x4fa;" u2="&#x50d;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x50c;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x50b;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x509;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x508;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x507;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x505;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x503;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x502;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x501;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x500;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4f9;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4f7;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4f5;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x4ed;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4eb;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4e9;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4e7;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4e5;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4e3;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4df;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4d7;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x4d4;" k="123" />
-<hkern u1="&#x4fa;" u2="&#x4d2;" k="123" />
-<hkern u1="&#x4fa;" u2="&#x4d0;" k="123" />
-<hkern u1="&#x4fa;" u2="&#x4ce;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4cc;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x4ca;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4c8;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4c6;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x4c5;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x4c4;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4bf;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4be;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4bd;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4bc;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4bb;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4b9;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x4b7;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x4b4;" k="-41" />
-<hkern u1="&#x4fa;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4ac;" k="-41" />
-<hkern u1="&#x4fa;" u2="&#x4ab;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4a9;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x4a7;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4a5;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4a3;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x4a0;" k="-41" />
-<hkern u1="&#x4fa;" u2="&#x49f;" k="-41" />
-<hkern u1="&#x4fa;" u2="&#x49d;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x49b;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x499;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x497;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x495;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x491;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x48f;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x48d;" k="-41" />
-<hkern u1="&#x4fa;" u2="&#x48b;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x481;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x480;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x47e;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x47d;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x47c;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x47b;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x47a;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x479;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x478;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x473;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x472;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x471;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x46d;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x46b;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x469;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x467;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x466;" k="123" />
-<hkern u1="&#x4fa;" u2="&#x465;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x460;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x45f;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x45d;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x45c;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x45b;" k="-41" />
-<hkern u1="&#x4fa;" u2="&#x45a;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x459;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x455;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x454;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x453;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x452;" k="-41" />
-<hkern u1="&#x4fa;" u2="&#x451;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x450;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x44e;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x44d;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x44c;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x44b;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x449;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x448;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x447;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x446;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x445;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x444;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x441;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x440;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x43f;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x43e;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x43d;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x43c;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x43b;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x43a;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x439;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x438;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x437;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x436;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x435;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x434;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x433;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x432;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x42a;" k="-41" />
-<hkern u1="&#x4fa;" u2="&#x424;" k="61" />
-<hkern u1="&#x4fa;" u2="&#x422;" k="-41" />
-<hkern u1="&#x4fa;" u2="&#x421;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x41e;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x41b;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x414;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x410;" k="123" />
-<hkern u1="&#x4fa;" u2="&#x40b;" k="-41" />
-<hkern u1="&#x4fa;" u2="&#x409;" k="82" />
-<hkern u1="&#x4fa;" u2="&#x404;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x402;" k="-41" />
-<hkern u1="&#x4fa;" u2="&#x2e;" k="102" />
-<hkern u1="&#x4fa;" u2="&#x2d;" k="41" />
-<hkern u1="&#x4fa;" u2="&#x2c;" k="102" />
-<hkern u1="&#x4fb;" u2="&#x201e;" k="61" />
-<hkern u1="&#x4fb;" u2="&#x201a;" k="61" />
-<hkern u1="&#x4fb;" u2="&#x513;" k="61" />
-<hkern u1="&#x4fb;" u2="&#x511;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x50d;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x509;" k="61" />
-<hkern u1="&#x4fb;" u2="&#x503;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x501;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x4eb;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x4e9;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x4e7;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x4d7;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x4c6;" k="61" />
-<hkern u1="&#x4fb;" u2="&#x4ab;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x4a9;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x481;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x47d;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x47b;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x479;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x473;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x467;" k="61" />
-<hkern u1="&#x4fb;" u2="&#x459;" k="61" />
-<hkern u1="&#x4fb;" u2="&#x454;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x451;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x450;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x444;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x441;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x43e;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x43b;" k="61" />
-<hkern u1="&#x4fb;" u2="&#x435;" k="41" />
-<hkern u1="&#x4fb;" u2="&#x434;" k="61" />
-<hkern u1="&#x4fb;" u2="&#x2e;" k="61" />
-<hkern u1="&#x4fb;" u2="&#x2c;" k="61" />
-<hkern u1="&#x4fc;" u2="&#x50f;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x50c;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x507;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x505;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x4f5;" k="82" />
-<hkern u1="&#x4fc;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x4cc;" k="82" />
-<hkern u1="&#x4fc;" u2="&#x4bf;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x4be;" k="61" />
-<hkern u1="&#x4fc;" u2="&#x4bd;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x4bc;" k="61" />
-<hkern u1="&#x4fc;" u2="&#x4b9;" k="82" />
-<hkern u1="&#x4fc;" u2="&#x4b7;" k="82" />
-<hkern u1="&#x4fc;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x480;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x47e;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x47c;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x47a;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x478;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x472;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x471;" k="20" />
-<hkern u1="&#x4fc;" u2="&#x46f;" k="-61" />
-<hkern u1="&#x4fc;" u2="&#x460;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x44a;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x447;" k="82" />
-<hkern u1="&#x4fc;" u2="&#x442;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x424;" k="61" />
-<hkern u1="&#x4fc;" u2="&#x421;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x41e;" k="41" />
-<hkern u1="&#x4fc;" u2="&#x408;" k="-225" />
-<hkern u1="&#x4fc;" u2="&#x404;" k="41" />
-<hkern u1="&#x4fd;" u2="&#x511;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x50d;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x507;" k="41" />
-<hkern u1="&#x4fd;" u2="&#x505;" k="41" />
-<hkern u1="&#x4fd;" u2="&#x503;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x501;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x4eb;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x4e9;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x4e7;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x4d7;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x4ab;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x4a9;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x481;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x47d;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x47b;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x479;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x473;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x454;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x451;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x450;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x447;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x444;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x441;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x43e;" k="20" />
-<hkern u1="&#x4fd;" u2="&#x435;" k="20" />
-<hkern u1="&#x4fe;" u2="&#x510;" k="20" />
-<hkern u1="&#x4fe;" u2="&#x50c;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x507;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x505;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x502;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x500;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x4ea;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x4e8;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x4e6;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x4be;" k="102" />
-<hkern u1="&#x4fe;" u2="&#x4bc;" k="102" />
-<hkern u1="&#x4fe;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x4aa;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x4a8;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x480;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x47e;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x47c;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x47a;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x478;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x472;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x470;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x460;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x447;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x427;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x424;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x421;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x41e;" k="41" />
-<hkern u1="&#x4fe;" u2="&#x404;" k="41" />
-<hkern u1="&#x4ff;" u2="&#x511;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x50d;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x507;" k="41" />
-<hkern u1="&#x4ff;" u2="&#x505;" k="41" />
-<hkern u1="&#x4ff;" u2="&#x503;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x501;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x4f5;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x4eb;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x4e9;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x4e7;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x4d7;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x4cc;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x4b9;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x4b7;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x4ab;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x4a9;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x481;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x47d;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x47b;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x479;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x473;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x454;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x451;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x450;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x447;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x444;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x441;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x43e;" k="20" />
-<hkern u1="&#x4ff;" u2="&#x435;" k="20" />
-<hkern u1="&#x502;" u2="&#x201d;" k="102" />
-<hkern u1="&#x502;" u2="&#x2019;" k="102" />
-<hkern u1="&#x502;" u2="&#x50f;" k="61" />
-<hkern u1="&#x502;" u2="&#x50e;" k="82" />
-<hkern u1="&#x502;" u2="&#x507;" k="41" />
-<hkern u1="&#x502;" u2="&#x506;" k="41" />
-<hkern u1="&#x502;" u2="&#x505;" k="41" />
-<hkern u1="&#x502;" u2="&#x504;" k="41" />
-<hkern u1="&#x502;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x502;" u2="&#x4fe;" k="61" />
-<hkern u1="&#x502;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x502;" u2="&#x4fc;" k="61" />
-<hkern u1="&#x502;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x502;" u2="&#x4f4;" k="61" />
-<hkern u1="&#x502;" u2="&#x4f2;" k="61" />
-<hkern u1="&#x502;" u2="&#x4f0;" k="61" />
-<hkern u1="&#x502;" u2="&#x4ee;" k="61" />
-<hkern u1="&#x502;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x502;" u2="&#x4dc;" k="61" />
-<hkern u1="&#x502;" u2="&#x4d4;" k="61" />
-<hkern u1="&#x502;" u2="&#x4d2;" k="61" />
-<hkern u1="&#x502;" u2="&#x4d0;" k="61" />
-<hkern u1="&#x502;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x502;" u2="&#x4cb;" k="61" />
-<hkern u1="&#x502;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x502;" u2="&#x4c1;" k="61" />
-<hkern u1="&#x502;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x502;" u2="&#x4b8;" k="61" />
-<hkern u1="&#x502;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x502;" u2="&#x4b6;" k="61" />
-<hkern u1="&#x502;" u2="&#x4b5;" k="61" />
-<hkern u1="&#x502;" u2="&#x4b4;" k="82" />
-<hkern u1="&#x502;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x502;" u2="&#x4b2;" k="61" />
-<hkern u1="&#x502;" u2="&#x4b0;" k="61" />
-<hkern u1="&#x502;" u2="&#x4ae;" k="61" />
-<hkern u1="&#x502;" u2="&#x4ad;" k="61" />
-<hkern u1="&#x502;" u2="&#x4ac;" k="143" />
-<hkern u1="&#x502;" u2="&#x4a1;" k="61" />
-<hkern u1="&#x502;" u2="&#x4a0;" k="82" />
-<hkern u1="&#x502;" u2="&#x497;" k="41" />
-<hkern u1="&#x502;" u2="&#x496;" k="61" />
-<hkern u1="&#x502;" u2="&#x476;" k="61" />
-<hkern u1="&#x502;" u2="&#x474;" k="61" />
-<hkern u1="&#x502;" u2="&#x470;" k="61" />
-<hkern u1="&#x502;" u2="&#x46a;" k="41" />
-<hkern u1="&#x502;" u2="&#x466;" k="61" />
-<hkern u1="&#x502;" u2="&#x44a;" k="61" />
-<hkern u1="&#x502;" u2="&#x447;" k="41" />
-<hkern u1="&#x502;" u2="&#x445;" k="41" />
-<hkern u1="&#x502;" u2="&#x442;" k="61" />
-<hkern u1="&#x502;" u2="&#x436;" k="41" />
-<hkern u1="&#x502;" u2="&#x42a;" k="82" />
-<hkern u1="&#x502;" u2="&#x427;" k="61" />
-<hkern u1="&#x502;" u2="&#x425;" k="61" />
-<hkern u1="&#x502;" u2="&#x423;" k="61" />
-<hkern u1="&#x502;" u2="&#x422;" k="143" />
-<hkern u1="&#x502;" u2="&#x416;" k="61" />
-<hkern u1="&#x502;" u2="&#x410;" k="61" />
-<hkern u1="&#x502;" u2="&#x40e;" k="61" />
-<hkern u1="&#x502;" u2="&#x40b;" k="82" />
-<hkern u1="&#x502;" u2="&#x402;" k="82" />
-<hkern u1="&#x502;" u2="&#x27;" k="102" />
-<hkern u1="&#x502;" u2="&#x22;" k="102" />
-<hkern u1="&#x503;" u2="&#x201d;" k="102" />
-<hkern u1="&#x503;" u2="&#x2019;" k="102" />
-<hkern u1="&#x503;" u2="&#x50f;" k="61" />
-<hkern u1="&#x503;" u2="&#x507;" k="102" />
-<hkern u1="&#x503;" u2="&#x505;" k="102" />
-<hkern u1="&#x503;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x503;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x503;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x503;" u2="&#x4f3;" k="41" />
-<hkern u1="&#x503;" u2="&#x4f1;" k="41" />
-<hkern u1="&#x503;" u2="&#x4ef;" k="41" />
-<hkern u1="&#x503;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x503;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x503;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x503;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x503;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x503;" u2="&#x4b5;" k="61" />
-<hkern u1="&#x503;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x503;" u2="&#x4ad;" k="61" />
-<hkern u1="&#x503;" u2="&#x4a1;" k="61" />
-<hkern u1="&#x503;" u2="&#x497;" k="41" />
-<hkern u1="&#x503;" u2="&#x45e;" k="41" />
-<hkern u1="&#x503;" u2="&#x44a;" k="61" />
-<hkern u1="&#x503;" u2="&#x447;" k="41" />
-<hkern u1="&#x503;" u2="&#x445;" k="41" />
-<hkern u1="&#x503;" u2="&#x443;" k="41" />
-<hkern u1="&#x503;" u2="&#x442;" k="61" />
-<hkern u1="&#x503;" u2="&#x436;" k="41" />
-<hkern u1="&#x503;" u2="&#x27;" k="102" />
-<hkern u1="&#x503;" u2="&#x22;" k="102" />
-<hkern u1="&#x504;" u2="&#x201d;" k="102" />
-<hkern u1="&#x504;" u2="&#x2019;" k="102" />
-<hkern u1="&#x504;" u2="&#x50f;" k="61" />
-<hkern u1="&#x504;" u2="&#x50e;" k="82" />
-<hkern u1="&#x504;" u2="&#x507;" k="41" />
-<hkern u1="&#x504;" u2="&#x506;" k="41" />
-<hkern u1="&#x504;" u2="&#x505;" k="41" />
-<hkern u1="&#x504;" u2="&#x504;" k="41" />
-<hkern u1="&#x504;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x504;" u2="&#x4fe;" k="61" />
-<hkern u1="&#x504;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x504;" u2="&#x4fc;" k="61" />
-<hkern u1="&#x504;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x504;" u2="&#x4f4;" k="61" />
-<hkern u1="&#x504;" u2="&#x4f2;" k="61" />
-<hkern u1="&#x504;" u2="&#x4f0;" k="61" />
-<hkern u1="&#x504;" u2="&#x4ee;" k="61" />
-<hkern u1="&#x504;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x504;" u2="&#x4dc;" k="61" />
-<hkern u1="&#x504;" u2="&#x4d4;" k="61" />
-<hkern u1="&#x504;" u2="&#x4d2;" k="61" />
-<hkern u1="&#x504;" u2="&#x4d0;" k="61" />
-<hkern u1="&#x504;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x504;" u2="&#x4cb;" k="61" />
-<hkern u1="&#x504;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x504;" u2="&#x4c1;" k="61" />
-<hkern u1="&#x504;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x504;" u2="&#x4b8;" k="61" />
-<hkern u1="&#x504;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x504;" u2="&#x4b6;" k="61" />
-<hkern u1="&#x504;" u2="&#x4b5;" k="61" />
-<hkern u1="&#x504;" u2="&#x4b4;" k="82" />
-<hkern u1="&#x504;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x504;" u2="&#x4b2;" k="61" />
-<hkern u1="&#x504;" u2="&#x4b0;" k="61" />
-<hkern u1="&#x504;" u2="&#x4ae;" k="61" />
-<hkern u1="&#x504;" u2="&#x4ad;" k="61" />
-<hkern u1="&#x504;" u2="&#x4ac;" k="143" />
-<hkern u1="&#x504;" u2="&#x4a1;" k="61" />
-<hkern u1="&#x504;" u2="&#x4a0;" k="82" />
-<hkern u1="&#x504;" u2="&#x497;" k="41" />
-<hkern u1="&#x504;" u2="&#x496;" k="61" />
-<hkern u1="&#x504;" u2="&#x476;" k="61" />
-<hkern u1="&#x504;" u2="&#x474;" k="61" />
-<hkern u1="&#x504;" u2="&#x470;" k="61" />
-<hkern u1="&#x504;" u2="&#x46a;" k="41" />
-<hkern u1="&#x504;" u2="&#x466;" k="61" />
-<hkern u1="&#x504;" u2="&#x44a;" k="61" />
-<hkern u1="&#x504;" u2="&#x447;" k="41" />
-<hkern u1="&#x504;" u2="&#x445;" k="41" />
-<hkern u1="&#x504;" u2="&#x442;" k="61" />
-<hkern u1="&#x504;" u2="&#x436;" k="41" />
-<hkern u1="&#x504;" u2="&#x42a;" k="82" />
-<hkern u1="&#x504;" u2="&#x427;" k="61" />
-<hkern u1="&#x504;" u2="&#x425;" k="61" />
-<hkern u1="&#x504;" u2="&#x423;" k="61" />
-<hkern u1="&#x504;" u2="&#x422;" k="143" />
-<hkern u1="&#x504;" u2="&#x416;" k="61" />
-<hkern u1="&#x504;" u2="&#x410;" k="61" />
-<hkern u1="&#x504;" u2="&#x40e;" k="61" />
-<hkern u1="&#x504;" u2="&#x40b;" k="82" />
-<hkern u1="&#x504;" u2="&#x402;" k="82" />
-<hkern u1="&#x504;" u2="&#x27;" k="102" />
-<hkern u1="&#x504;" u2="&#x22;" k="102" />
-<hkern u1="&#x505;" u2="&#x201d;" k="102" />
-<hkern u1="&#x505;" u2="&#x2019;" k="102" />
-<hkern u1="&#x505;" u2="&#x50f;" k="61" />
-<hkern u1="&#x505;" u2="&#x507;" k="102" />
-<hkern u1="&#x505;" u2="&#x505;" k="102" />
-<hkern u1="&#x505;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x505;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x505;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x505;" u2="&#x4f3;" k="41" />
-<hkern u1="&#x505;" u2="&#x4f1;" k="41" />
-<hkern u1="&#x505;" u2="&#x4ef;" k="41" />
-<hkern u1="&#x505;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x505;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x505;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x505;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x505;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x505;" u2="&#x4b5;" k="61" />
-<hkern u1="&#x505;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x505;" u2="&#x4ad;" k="61" />
-<hkern u1="&#x505;" u2="&#x4a1;" k="61" />
-<hkern u1="&#x505;" u2="&#x497;" k="41" />
-<hkern u1="&#x505;" u2="&#x45e;" k="41" />
-<hkern u1="&#x505;" u2="&#x44a;" k="61" />
-<hkern u1="&#x505;" u2="&#x447;" k="41" />
-<hkern u1="&#x505;" u2="&#x445;" k="41" />
-<hkern u1="&#x505;" u2="&#x443;" k="41" />
-<hkern u1="&#x505;" u2="&#x442;" k="61" />
-<hkern u1="&#x505;" u2="&#x436;" k="41" />
-<hkern u1="&#x505;" u2="&#x27;" k="102" />
-<hkern u1="&#x505;" u2="&#x22;" k="102" />
-<hkern u1="&#x506;" u2="&#x507;" k="41" />
-<hkern u1="&#x506;" u2="&#x505;" k="41" />
-<hkern u1="&#x506;" u2="&#x4e1;" k="-41" />
-<hkern u1="&#x506;" u2="&#x408;" k="-225" />
-<hkern u1="&#x507;" u2="&#x201d;" k="20" />
-<hkern u1="&#x507;" u2="&#x2019;" k="20" />
-<hkern u1="&#x507;" u2="&#x27;" k="20" />
-<hkern u1="&#x507;" u2="&#x22;" k="20" />
-<hkern u1="&#x508;" u2="&#x201d;" k="102" />
-<hkern u1="&#x508;" u2="&#x2019;" k="102" />
-<hkern u1="&#x508;" u2="&#x50f;" k="61" />
-<hkern u1="&#x508;" u2="&#x50e;" k="82" />
-<hkern u1="&#x508;" u2="&#x507;" k="41" />
-<hkern u1="&#x508;" u2="&#x506;" k="41" />
-<hkern u1="&#x508;" u2="&#x505;" k="41" />
-<hkern u1="&#x508;" u2="&#x504;" k="41" />
-<hkern u1="&#x508;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x508;" u2="&#x4fe;" k="61" />
-<hkern u1="&#x508;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x508;" u2="&#x4fc;" k="61" />
-<hkern u1="&#x508;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x508;" u2="&#x4f4;" k="61" />
-<hkern u1="&#x508;" u2="&#x4f2;" k="61" />
-<hkern u1="&#x508;" u2="&#x4f0;" k="61" />
-<hkern u1="&#x508;" u2="&#x4ee;" k="61" />
-<hkern u1="&#x508;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x508;" u2="&#x4dc;" k="61" />
-<hkern u1="&#x508;" u2="&#x4d4;" k="61" />
-<hkern u1="&#x508;" u2="&#x4d2;" k="61" />
-<hkern u1="&#x508;" u2="&#x4d0;" k="61" />
-<hkern u1="&#x508;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x508;" u2="&#x4cb;" k="61" />
-<hkern u1="&#x508;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x508;" u2="&#x4c1;" k="61" />
-<hkern u1="&#x508;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x508;" u2="&#x4b8;" k="61" />
-<hkern u1="&#x508;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x508;" u2="&#x4b6;" k="61" />
-<hkern u1="&#x508;" u2="&#x4b5;" k="61" />
-<hkern u1="&#x508;" u2="&#x4b4;" k="82" />
-<hkern u1="&#x508;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x508;" u2="&#x4b2;" k="61" />
-<hkern u1="&#x508;" u2="&#x4b0;" k="61" />
-<hkern u1="&#x508;" u2="&#x4ae;" k="61" />
-<hkern u1="&#x508;" u2="&#x4ad;" k="61" />
-<hkern u1="&#x508;" u2="&#x4ac;" k="143" />
-<hkern u1="&#x508;" u2="&#x4a1;" k="61" />
-<hkern u1="&#x508;" u2="&#x4a0;" k="82" />
-<hkern u1="&#x508;" u2="&#x497;" k="41" />
-<hkern u1="&#x508;" u2="&#x496;" k="61" />
-<hkern u1="&#x508;" u2="&#x476;" k="61" />
-<hkern u1="&#x508;" u2="&#x474;" k="61" />
-<hkern u1="&#x508;" u2="&#x470;" k="61" />
-<hkern u1="&#x508;" u2="&#x46a;" k="41" />
-<hkern u1="&#x508;" u2="&#x466;" k="61" />
-<hkern u1="&#x508;" u2="&#x44a;" k="61" />
-<hkern u1="&#x508;" u2="&#x447;" k="41" />
-<hkern u1="&#x508;" u2="&#x445;" k="41" />
-<hkern u1="&#x508;" u2="&#x442;" k="61" />
-<hkern u1="&#x508;" u2="&#x436;" k="41" />
-<hkern u1="&#x508;" u2="&#x42a;" k="82" />
-<hkern u1="&#x508;" u2="&#x427;" k="61" />
-<hkern u1="&#x508;" u2="&#x425;" k="61" />
-<hkern u1="&#x508;" u2="&#x423;" k="61" />
-<hkern u1="&#x508;" u2="&#x422;" k="143" />
-<hkern u1="&#x508;" u2="&#x416;" k="61" />
-<hkern u1="&#x508;" u2="&#x410;" k="61" />
-<hkern u1="&#x508;" u2="&#x40e;" k="61" />
-<hkern u1="&#x508;" u2="&#x40b;" k="82" />
-<hkern u1="&#x508;" u2="&#x402;" k="82" />
-<hkern u1="&#x508;" u2="&#x27;" k="102" />
-<hkern u1="&#x508;" u2="&#x22;" k="102" />
-<hkern u1="&#x509;" u2="&#x201d;" k="102" />
-<hkern u1="&#x509;" u2="&#x2019;" k="102" />
-<hkern u1="&#x509;" u2="&#x50f;" k="61" />
-<hkern u1="&#x509;" u2="&#x507;" k="102" />
-<hkern u1="&#x509;" u2="&#x505;" k="102" />
-<hkern u1="&#x509;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x509;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x509;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x509;" u2="&#x4f3;" k="41" />
-<hkern u1="&#x509;" u2="&#x4f1;" k="41" />
-<hkern u1="&#x509;" u2="&#x4ef;" k="41" />
-<hkern u1="&#x509;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x509;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x509;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x509;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x509;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x509;" u2="&#x4b5;" k="61" />
-<hkern u1="&#x509;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x509;" u2="&#x4ad;" k="61" />
-<hkern u1="&#x509;" u2="&#x4a1;" k="61" />
-<hkern u1="&#x509;" u2="&#x497;" k="41" />
-<hkern u1="&#x509;" u2="&#x45e;" k="41" />
-<hkern u1="&#x509;" u2="&#x44a;" k="61" />
-<hkern u1="&#x509;" u2="&#x447;" k="41" />
-<hkern u1="&#x509;" u2="&#x445;" k="41" />
-<hkern u1="&#x509;" u2="&#x443;" k="41" />
-<hkern u1="&#x509;" u2="&#x442;" k="61" />
-<hkern u1="&#x509;" u2="&#x436;" k="41" />
-<hkern u1="&#x509;" u2="&#x27;" k="102" />
-<hkern u1="&#x509;" u2="&#x22;" k="102" />
-<hkern u1="&#x50a;" u2="&#x201d;" k="102" />
-<hkern u1="&#x50a;" u2="&#x2019;" k="102" />
-<hkern u1="&#x50a;" u2="&#x50f;" k="61" />
-<hkern u1="&#x50a;" u2="&#x50e;" k="82" />
-<hkern u1="&#x50a;" u2="&#x507;" k="41" />
-<hkern u1="&#x50a;" u2="&#x506;" k="41" />
-<hkern u1="&#x50a;" u2="&#x505;" k="41" />
-<hkern u1="&#x50a;" u2="&#x504;" k="41" />
-<hkern u1="&#x50a;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x50a;" u2="&#x4fe;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x50a;" u2="&#x4fc;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x50a;" u2="&#x4f4;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4f2;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4f0;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4ee;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x50a;" u2="&#x4dc;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4d4;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4d2;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4d0;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x50a;" u2="&#x4cb;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x50a;" u2="&#x4c1;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x50a;" u2="&#x4b8;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x50a;" u2="&#x4b6;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4b5;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4b4;" k="82" />
-<hkern u1="&#x50a;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x50a;" u2="&#x4b2;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4b0;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4ae;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4ad;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4ac;" k="143" />
-<hkern u1="&#x50a;" u2="&#x4a1;" k="61" />
-<hkern u1="&#x50a;" u2="&#x4a0;" k="82" />
-<hkern u1="&#x50a;" u2="&#x497;" k="41" />
-<hkern u1="&#x50a;" u2="&#x496;" k="61" />
-<hkern u1="&#x50a;" u2="&#x476;" k="61" />
-<hkern u1="&#x50a;" u2="&#x474;" k="61" />
-<hkern u1="&#x50a;" u2="&#x470;" k="61" />
-<hkern u1="&#x50a;" u2="&#x46a;" k="41" />
-<hkern u1="&#x50a;" u2="&#x466;" k="61" />
-<hkern u1="&#x50a;" u2="&#x44a;" k="61" />
-<hkern u1="&#x50a;" u2="&#x447;" k="41" />
-<hkern u1="&#x50a;" u2="&#x445;" k="41" />
-<hkern u1="&#x50a;" u2="&#x442;" k="61" />
-<hkern u1="&#x50a;" u2="&#x436;" k="41" />
-<hkern u1="&#x50a;" u2="&#x42a;" k="82" />
-<hkern u1="&#x50a;" u2="&#x427;" k="61" />
-<hkern u1="&#x50a;" u2="&#x425;" k="61" />
-<hkern u1="&#x50a;" u2="&#x423;" k="61" />
-<hkern u1="&#x50a;" u2="&#x422;" k="143" />
-<hkern u1="&#x50a;" u2="&#x416;" k="61" />
-<hkern u1="&#x50a;" u2="&#x410;" k="61" />
-<hkern u1="&#x50a;" u2="&#x40e;" k="61" />
-<hkern u1="&#x50a;" u2="&#x40b;" k="82" />
-<hkern u1="&#x50a;" u2="&#x402;" k="82" />
-<hkern u1="&#x50a;" u2="&#x27;" k="102" />
-<hkern u1="&#x50a;" u2="&#x22;" k="102" />
-<hkern u1="&#x50b;" u2="&#x201d;" k="102" />
-<hkern u1="&#x50b;" u2="&#x2019;" k="102" />
-<hkern u1="&#x50b;" u2="&#x50f;" k="61" />
-<hkern u1="&#x50b;" u2="&#x507;" k="102" />
-<hkern u1="&#x50b;" u2="&#x505;" k="102" />
-<hkern u1="&#x50b;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x50b;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x50b;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x50b;" u2="&#x4f3;" k="41" />
-<hkern u1="&#x50b;" u2="&#x4f1;" k="41" />
-<hkern u1="&#x50b;" u2="&#x4ef;" k="41" />
-<hkern u1="&#x50b;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x50b;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x50b;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x50b;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x50b;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x50b;" u2="&#x4b5;" k="61" />
-<hkern u1="&#x50b;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x50b;" u2="&#x4ad;" k="61" />
-<hkern u1="&#x50b;" u2="&#x4a1;" k="61" />
-<hkern u1="&#x50b;" u2="&#x497;" k="41" />
-<hkern u1="&#x50b;" u2="&#x45e;" k="41" />
-<hkern u1="&#x50b;" u2="&#x44a;" k="61" />
-<hkern u1="&#x50b;" u2="&#x447;" k="41" />
-<hkern u1="&#x50b;" u2="&#x445;" k="41" />
-<hkern u1="&#x50b;" u2="&#x443;" k="41" />
-<hkern u1="&#x50b;" u2="&#x442;" k="61" />
-<hkern u1="&#x50b;" u2="&#x436;" k="41" />
-<hkern u1="&#x50b;" u2="&#x27;" k="102" />
-<hkern u1="&#x50b;" u2="&#x22;" k="102" />
-<hkern u1="&#x50c;" u2="&#x201e;" k="82" />
-<hkern u1="&#x50c;" u2="&#x201a;" k="82" />
-<hkern u1="&#x50c;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x50c;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x50c;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x50c;" u2="&#x4d4;" k="20" />
-<hkern u1="&#x50c;" u2="&#x4d2;" k="20" />
-<hkern u1="&#x50c;" u2="&#x4d0;" k="20" />
-<hkern u1="&#x50c;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x50c;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x50c;" u2="&#x4b0;" k="20" />
-<hkern u1="&#x50c;" u2="&#x4ae;" k="20" />
-<hkern u1="&#x50c;" u2="&#x4ac;" k="41" />
-<hkern u1="&#x50c;" u2="&#x496;" k="41" />
-<hkern u1="&#x50c;" u2="&#x476;" k="20" />
-<hkern u1="&#x50c;" u2="&#x474;" k="20" />
-<hkern u1="&#x50c;" u2="&#x466;" k="20" />
-<hkern u1="&#x50c;" u2="&#x425;" k="41" />
-<hkern u1="&#x50c;" u2="&#x422;" k="41" />
-<hkern u1="&#x50c;" u2="&#x416;" k="41" />
-<hkern u1="&#x50c;" u2="&#x410;" k="20" />
-<hkern u1="&#x50c;" u2="&#x2e;" k="82" />
-<hkern u1="&#x50c;" u2="&#x2c;" k="82" />
-<hkern u1="&#x50d;" u2="&#x201d;" k="41" />
-<hkern u1="&#x50d;" u2="&#x2019;" k="41" />
-<hkern u1="&#x50d;" u2="&#x507;" k="41" />
-<hkern u1="&#x50d;" u2="&#x505;" k="41" />
-<hkern u1="&#x50d;" u2="&#x4ff;" k="20" />
-<hkern u1="&#x50d;" u2="&#x4fd;" k="20" />
-<hkern u1="&#x50d;" u2="&#x4f3;" k="20" />
-<hkern u1="&#x50d;" u2="&#x4f1;" k="20" />
-<hkern u1="&#x50d;" u2="&#x4ef;" k="20" />
-<hkern u1="&#x50d;" u2="&#x4dd;" k="20" />
-<hkern u1="&#x50d;" u2="&#x4c2;" k="20" />
-<hkern u1="&#x50d;" u2="&#x4b3;" k="20" />
-<hkern u1="&#x50d;" u2="&#x497;" k="20" />
-<hkern u1="&#x50d;" u2="&#x45e;" k="20" />
-<hkern u1="&#x50d;" u2="&#x445;" k="20" />
-<hkern u1="&#x50d;" u2="&#x443;" k="20" />
-<hkern u1="&#x50d;" u2="&#x436;" k="20" />
-<hkern u1="&#x50d;" u2="&#x27;" k="41" />
-<hkern u1="&#x50d;" u2="&#x22;" k="41" />
-<hkern u1="&#x50e;" u2="&#x201d;" k="82" />
-<hkern u1="&#x50e;" u2="&#x2019;" k="82" />
-<hkern u1="&#x50e;" u2="&#x50f;" k="41" />
-<hkern u1="&#x50e;" u2="&#x50e;" k="61" />
-<hkern u1="&#x50e;" u2="&#x506;" k="41" />
-<hkern u1="&#x50e;" u2="&#x504;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4fe;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4fc;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4f4;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4dc;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4d4;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4d2;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4d0;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4cb;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4c1;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4b8;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4b6;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4b4;" k="61" />
-<hkern u1="&#x50e;" u2="&#x4b2;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4b0;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4ae;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4ac;" k="61" />
-<hkern u1="&#x50e;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x50e;" u2="&#x4a0;" k="61" />
-<hkern u1="&#x50e;" u2="&#x496;" k="41" />
-<hkern u1="&#x50e;" u2="&#x476;" k="41" />
-<hkern u1="&#x50e;" u2="&#x474;" k="41" />
-<hkern u1="&#x50e;" u2="&#x470;" k="41" />
-<hkern u1="&#x50e;" u2="&#x466;" k="41" />
-<hkern u1="&#x50e;" u2="&#x44a;" k="41" />
-<hkern u1="&#x50e;" u2="&#x442;" k="41" />
-<hkern u1="&#x50e;" u2="&#x42a;" k="61" />
-<hkern u1="&#x50e;" u2="&#x427;" k="41" />
-<hkern u1="&#x50e;" u2="&#x425;" k="41" />
-<hkern u1="&#x50e;" u2="&#x422;" k="61" />
-<hkern u1="&#x50e;" u2="&#x416;" k="41" />
-<hkern u1="&#x50e;" u2="&#x410;" k="41" />
-<hkern u1="&#x50e;" u2="&#x40b;" k="61" />
-<hkern u1="&#x50e;" u2="&#x402;" k="61" />
-<hkern u1="&#x50e;" u2="&#x27;" k="82" />
-<hkern u1="&#x50e;" u2="&#x22;" k="82" />
-<hkern u1="&#x50f;" u2="&#x201d;" k="102" />
-<hkern u1="&#x50f;" u2="&#x2019;" k="102" />
-<hkern u1="&#x50f;" u2="&#x50f;" k="61" />
-<hkern u1="&#x50f;" u2="&#x507;" k="102" />
-<hkern u1="&#x50f;" u2="&#x505;" k="102" />
-<hkern u1="&#x50f;" u2="&#x4ff;" k="41" />
-<hkern u1="&#x50f;" u2="&#x4fd;" k="41" />
-<hkern u1="&#x50f;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x50f;" u2="&#x4f3;" k="41" />
-<hkern u1="&#x50f;" u2="&#x4f1;" k="41" />
-<hkern u1="&#x50f;" u2="&#x4ef;" k="41" />
-<hkern u1="&#x50f;" u2="&#x4dd;" k="41" />
-<hkern u1="&#x50f;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x50f;" u2="&#x4c2;" k="41" />
-<hkern u1="&#x50f;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x50f;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x50f;" u2="&#x4b5;" k="61" />
-<hkern u1="&#x50f;" u2="&#x4b3;" k="41" />
-<hkern u1="&#x50f;" u2="&#x4ad;" k="61" />
-<hkern u1="&#x50f;" u2="&#x4a1;" k="61" />
-<hkern u1="&#x50f;" u2="&#x497;" k="41" />
-<hkern u1="&#x50f;" u2="&#x45e;" k="41" />
-<hkern u1="&#x50f;" u2="&#x44a;" k="61" />
-<hkern u1="&#x50f;" u2="&#x447;" k="41" />
-<hkern u1="&#x50f;" u2="&#x445;" k="41" />
-<hkern u1="&#x50f;" u2="&#x443;" k="41" />
-<hkern u1="&#x50f;" u2="&#x442;" k="61" />
-<hkern u1="&#x50f;" u2="&#x436;" k="41" />
-<hkern u1="&#x50f;" u2="&#x27;" k="102" />
-<hkern u1="&#x50f;" u2="&#x22;" k="102" />
-<hkern u1="&#x510;" u2="&#x4f5;" k="41" />
-<hkern u1="&#x510;" u2="&#x4cc;" k="41" />
-<hkern u1="&#x510;" u2="&#x4b9;" k="41" />
-<hkern u1="&#x510;" u2="&#x4b7;" k="41" />
-<hkern u1="&#x510;" u2="&#x447;" k="41" />
-<hkern u1="&#x512;" u2="&#x507;" k="41" />
-<hkern u1="&#x512;" u2="&#x505;" k="41" />
-<hkern u1="&#x512;" u2="&#x4e1;" k="-41" />
-<hkern u1="&#x512;" u2="&#x408;" k="-225" />
-<hkern u1="&#x513;" u2="&#x201d;" k="20" />
-<hkern u1="&#x513;" u2="&#x2019;" k="20" />
-<hkern u1="&#x513;" u2="&#x27;" k="20" />
-<hkern u1="&#x513;" u2="&#x22;" k="20" />
-<hkern u1="&#x1e00;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1e00;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1e00;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1e00;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1e00;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1e00;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1e00;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1e00;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1e00;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1e00;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1e00;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x178;" k="123" />
-<hkern u1="&#x1e00;" u2="&#x176;" k="123" />
-<hkern u1="&#x1e00;" u2="&#x174;" k="82" />
-<hkern u1="&#x1e00;" u2="&#x164;" k="143" />
-<hkern u1="&#x1e00;" u2="&#x162;" k="143" />
-<hkern u1="&#x1e00;" u2="&#x152;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x150;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x122;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x120;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x108;" k="41" />
-<hkern u1="&#x1e00;" u2="&#x106;" k="41" />
-<hkern u1="&#x1e00;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1e00;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1e00;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1e00;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1e00;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1e00;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1e00;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1e00;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1e00;" u2="Y" k="123" />
-<hkern u1="&#x1e00;" u2="W" k="82" />
-<hkern u1="&#x1e00;" u2="V" k="82" />
-<hkern u1="&#x1e00;" u2="T" k="143" />
-<hkern u1="&#x1e00;" u2="Q" k="41" />
-<hkern u1="&#x1e00;" u2="O" k="41" />
-<hkern u1="&#x1e00;" u2="J" k="-266" />
-<hkern u1="&#x1e00;" u2="G" k="41" />
-<hkern u1="&#x1e00;" u2="C" k="41" />
-<hkern u1="&#x1e00;" u2="&#x27;" k="143" />
-<hkern u1="&#x1e00;" u2="&#x22;" k="143" />
-<hkern u1="&#x1e01;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1e01;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1e01;" u2="&#x27;" k="20" />
-<hkern u1="&#x1e01;" u2="&#x22;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x201e;" k="102" />
-<hkern u1="&#x1e80;" u2="&#x201a;" k="102" />
-<hkern u1="&#x1e80;" u2="&#x1ef1;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1eef;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1eed;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1eeb;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ee9;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ee7;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ee5;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ee3;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ee2;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ee1;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ee0;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1edf;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ede;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1edd;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1edc;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1edb;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1eda;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ed9;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ed8;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ed7;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ed6;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ed5;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ed4;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ed2;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ed1;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ed0;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ecf;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ece;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ecd;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ecc;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ec7;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ec5;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ec3;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ebf;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ebd;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ebb;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1eb9;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1eb7;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1eb6;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x1eb5;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1eb4;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x1eb3;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1eb2;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x1eb1;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1eb0;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x1eaf;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1eae;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x1ead;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1eac;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x1eab;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1eaa;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x1ea9;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ea8;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x1ea6;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x1ea5;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ea4;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x1ea3;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ea2;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x1ea1;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1ea0;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x1e3f;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1e01;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1e00;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x219;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1ff;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1fe;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1fd;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1fb;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1fa;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x1b0;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x1a1;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x1a0;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x173;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x171;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x16f;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x16d;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x16b;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x169;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x15f;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x15b;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x157;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x155;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x153;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x152;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x151;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x150;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x14f;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x14e;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x14d;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x14c;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x14b;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x146;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x144;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x138;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x123;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x122;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x121;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x120;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x11f;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x11e;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x11d;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x11c;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x11b;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x119;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x117;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x115;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x113;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x111;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x10f;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x10d;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x10c;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x10b;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x10a;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x109;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x108;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x107;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x106;" k="20" />
-<hkern u1="&#x1e80;" u2="&#x105;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x104;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x103;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x102;" k="82" />
-<hkern u1="&#x1e80;" u2="&#x101;" k="41" />
-<hkern u1="&#x1e80;" u2="&#x100;" k="82" />
-<hkern u1="&#x1e80;" u2="&#xfc;" k="20" />
-<hkern u1="&#x1e80;" u2="&#xfb;" k="20" />
-<hkern u1="&#x1e80;" u2="&#xfa;" k="20" />
-<hkern u1="&#x1e80;" u2="&#xf9;" k="20" />
-<hkern u1="&#x1e80;" u2="&#xf8;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xf6;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xf5;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xf4;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xf3;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xf2;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xeb;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xea;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xe9;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xe8;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xe7;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xe6;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xe5;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xe4;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xe3;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xe2;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xe1;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xe0;" k="41" />
-<hkern u1="&#x1e80;" u2="&#xd8;" k="20" />
-<hkern u1="&#x1e80;" u2="&#xd6;" k="20" />
-<hkern u1="&#x1e80;" u2="&#xd5;" k="20" />
-<hkern u1="&#x1e80;" u2="&#xd4;" k="20" />
-<hkern u1="&#x1e80;" u2="&#xd3;" k="20" />
-<hkern u1="&#x1e80;" u2="&#xd2;" k="20" />
-<hkern u1="&#x1e80;" u2="&#xc7;" k="20" />
-<hkern u1="&#x1e80;" u2="&#xc5;" k="82" />
-<hkern u1="&#x1e80;" u2="&#xc4;" k="82" />
-<hkern u1="&#x1e80;" u2="&#xc3;" k="82" />
-<hkern u1="&#x1e80;" u2="&#xc2;" k="82" />
-<hkern u1="&#x1e80;" u2="&#xc1;" k="82" />
-<hkern u1="&#x1e80;" u2="&#xc0;" k="82" />
-<hkern u1="&#x1e80;" u2="u" k="20" />
-<hkern u1="&#x1e80;" u2="s" k="20" />
-<hkern u1="&#x1e80;" u2="r" k="20" />
-<hkern u1="&#x1e80;" u2="q" k="41" />
-<hkern u1="&#x1e80;" u2="p" k="20" />
-<hkern u1="&#x1e80;" u2="o" k="41" />
-<hkern u1="&#x1e80;" u2="n" k="20" />
-<hkern u1="&#x1e80;" u2="m" k="20" />
-<hkern u1="&#x1e80;" u2="g" k="20" />
-<hkern u1="&#x1e80;" u2="e" k="41" />
-<hkern u1="&#x1e80;" u2="d" k="41" />
-<hkern u1="&#x1e80;" u2="c" k="41" />
-<hkern u1="&#x1e80;" u2="a" k="41" />
-<hkern u1="&#x1e80;" u2="Q" k="20" />
-<hkern u1="&#x1e80;" u2="O" k="20" />
-<hkern u1="&#x1e80;" u2="G" k="20" />
-<hkern u1="&#x1e80;" u2="C" k="20" />
-<hkern u1="&#x1e80;" u2="A" k="82" />
-<hkern u1="&#x1e80;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1e80;" u2="&#x2e;" k="102" />
-<hkern u1="&#x1e80;" u2="&#x2c;" k="102" />
-<hkern u1="&#x1e81;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1e81;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x1e81;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1e81;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x1e81;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1e81;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1e81;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1e81;" u2="&#x27;" k="-82" />
-<hkern u1="&#x1e81;" u2="&#x22;" k="-82" />
-<hkern u1="&#x1e82;" u2="&#x201e;" k="102" />
-<hkern u1="&#x1e82;" u2="&#x201a;" k="102" />
-<hkern u1="&#x1e82;" u2="&#x1ef1;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1eef;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1eed;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1eeb;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ee9;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ee7;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ee5;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ee3;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ee2;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ee1;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ee0;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1edf;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ede;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1edd;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1edc;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1edb;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1eda;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ed9;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ed8;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ed7;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ed6;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ed5;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ed4;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ed2;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ed1;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ed0;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ecf;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ece;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ecd;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ecc;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ec7;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ec5;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ec3;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ebf;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ebd;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ebb;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1eb9;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1eb7;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1eb6;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x1eb5;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1eb4;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x1eb3;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1eb2;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x1eb1;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1eb0;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x1eaf;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1eae;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x1ead;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1eac;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x1eab;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1eaa;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x1ea9;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ea8;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x1ea6;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x1ea5;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ea4;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x1ea3;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ea2;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x1ea1;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1ea0;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x1e3f;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1e01;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1e00;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x219;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1ff;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1fe;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1fd;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1fb;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1fa;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x1b0;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x1a1;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x1a0;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x173;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x171;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x16f;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x16d;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x16b;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x169;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x15f;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x15b;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x157;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x155;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x153;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x152;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x151;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x150;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x14f;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x14e;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x14d;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x14c;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x14b;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x146;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x144;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x138;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x123;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x122;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x121;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x120;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x11f;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x11e;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x11d;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x11c;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x11b;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x119;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x117;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x115;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x113;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x111;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x10f;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x10d;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x10c;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x10b;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x10a;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x109;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x108;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x107;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x106;" k="20" />
-<hkern u1="&#x1e82;" u2="&#x105;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x104;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x103;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x102;" k="82" />
-<hkern u1="&#x1e82;" u2="&#x101;" k="41" />
-<hkern u1="&#x1e82;" u2="&#x100;" k="82" />
-<hkern u1="&#x1e82;" u2="&#xfc;" k="20" />
-<hkern u1="&#x1e82;" u2="&#xfb;" k="20" />
-<hkern u1="&#x1e82;" u2="&#xfa;" k="20" />
-<hkern u1="&#x1e82;" u2="&#xf9;" k="20" />
-<hkern u1="&#x1e82;" u2="&#xf8;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xf6;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xf5;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xf4;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xf3;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xf2;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xeb;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xea;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xe9;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xe8;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xe7;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xe6;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xe5;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xe4;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xe3;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xe2;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xe1;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xe0;" k="41" />
-<hkern u1="&#x1e82;" u2="&#xd8;" k="20" />
-<hkern u1="&#x1e82;" u2="&#xd6;" k="20" />
-<hkern u1="&#x1e82;" u2="&#xd5;" k="20" />
-<hkern u1="&#x1e82;" u2="&#xd4;" k="20" />
-<hkern u1="&#x1e82;" u2="&#xd3;" k="20" />
-<hkern u1="&#x1e82;" u2="&#xd2;" k="20" />
-<hkern u1="&#x1e82;" u2="&#xc7;" k="20" />
-<hkern u1="&#x1e82;" u2="&#xc5;" k="82" />
-<hkern u1="&#x1e82;" u2="&#xc4;" k="82" />
-<hkern u1="&#x1e82;" u2="&#xc3;" k="82" />
-<hkern u1="&#x1e82;" u2="&#xc2;" k="82" />
-<hkern u1="&#x1e82;" u2="&#xc1;" k="82" />
-<hkern u1="&#x1e82;" u2="&#xc0;" k="82" />
-<hkern u1="&#x1e82;" u2="u" k="20" />
-<hkern u1="&#x1e82;" u2="s" k="20" />
-<hkern u1="&#x1e82;" u2="r" k="20" />
-<hkern u1="&#x1e82;" u2="q" k="41" />
-<hkern u1="&#x1e82;" u2="p" k="20" />
-<hkern u1="&#x1e82;" u2="o" k="41" />
-<hkern u1="&#x1e82;" u2="n" k="20" />
-<hkern u1="&#x1e82;" u2="m" k="20" />
-<hkern u1="&#x1e82;" u2="g" k="20" />
-<hkern u1="&#x1e82;" u2="e" k="41" />
-<hkern u1="&#x1e82;" u2="d" k="41" />
-<hkern u1="&#x1e82;" u2="c" k="41" />
-<hkern u1="&#x1e82;" u2="a" k="41" />
-<hkern u1="&#x1e82;" u2="Q" k="20" />
-<hkern u1="&#x1e82;" u2="O" k="20" />
-<hkern u1="&#x1e82;" u2="G" k="20" />
-<hkern u1="&#x1e82;" u2="C" k="20" />
-<hkern u1="&#x1e82;" u2="A" k="82" />
-<hkern u1="&#x1e82;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1e82;" u2="&#x2e;" k="102" />
-<hkern u1="&#x1e82;" u2="&#x2c;" k="102" />
-<hkern u1="&#x1e83;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1e83;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x1e83;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1e83;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x1e83;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1e83;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1e83;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1e83;" u2="&#x27;" k="-82" />
-<hkern u1="&#x1e83;" u2="&#x22;" k="-82" />
-<hkern u1="&#x1e84;" u2="&#x201e;" k="102" />
-<hkern u1="&#x1e84;" u2="&#x201a;" k="102" />
-<hkern u1="&#x1e84;" u2="&#x1ef1;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1eef;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1eed;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1eeb;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ee9;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ee7;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ee5;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ee3;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ee2;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ee1;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ee0;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1edf;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ede;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1edd;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1edc;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1edb;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1eda;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ed9;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ed8;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ed7;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ed6;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ed5;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ed4;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ed2;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ed1;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ed0;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ecf;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ece;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ecd;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ecc;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ec7;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ec5;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ec3;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ebf;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ebd;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ebb;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1eb9;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1eb7;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1eb6;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x1eb5;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1eb4;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x1eb3;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1eb2;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x1eb1;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1eb0;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x1eaf;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1eae;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x1ead;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1eac;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x1eab;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1eaa;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x1ea9;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ea8;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x1ea6;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x1ea5;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ea4;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x1ea3;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ea2;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x1ea1;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1ea0;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x1e3f;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1e01;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1e00;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x219;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1ff;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1fe;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1fd;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1fb;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1fa;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x1b0;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x1a1;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x1a0;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x173;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x171;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x16f;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x16d;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x16b;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x169;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x15f;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x15b;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x157;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x155;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x153;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x152;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x151;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x150;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x14f;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x14e;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x14d;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x14c;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x14b;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x146;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x144;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x138;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x123;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x122;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x121;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x120;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x11f;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x11e;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x11d;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x11c;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x11b;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x119;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x117;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x115;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x113;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x111;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x10f;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x10d;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x10c;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x10b;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x10a;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x109;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x108;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x107;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x106;" k="20" />
-<hkern u1="&#x1e84;" u2="&#x105;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x104;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x103;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x102;" k="82" />
-<hkern u1="&#x1e84;" u2="&#x101;" k="41" />
-<hkern u1="&#x1e84;" u2="&#x100;" k="82" />
-<hkern u1="&#x1e84;" u2="&#xfc;" k="20" />
-<hkern u1="&#x1e84;" u2="&#xfb;" k="20" />
-<hkern u1="&#x1e84;" u2="&#xfa;" k="20" />
-<hkern u1="&#x1e84;" u2="&#xf9;" k="20" />
-<hkern u1="&#x1e84;" u2="&#xf8;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xf6;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xf5;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xf4;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xf3;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xf2;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xeb;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xea;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xe9;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xe8;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xe7;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xe6;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xe5;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xe4;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xe3;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xe2;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xe1;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xe0;" k="41" />
-<hkern u1="&#x1e84;" u2="&#xd8;" k="20" />
-<hkern u1="&#x1e84;" u2="&#xd6;" k="20" />
-<hkern u1="&#x1e84;" u2="&#xd5;" k="20" />
-<hkern u1="&#x1e84;" u2="&#xd4;" k="20" />
-<hkern u1="&#x1e84;" u2="&#xd3;" k="20" />
-<hkern u1="&#x1e84;" u2="&#xd2;" k="20" />
-<hkern u1="&#x1e84;" u2="&#xc7;" k="20" />
-<hkern u1="&#x1e84;" u2="&#xc5;" k="82" />
-<hkern u1="&#x1e84;" u2="&#xc4;" k="82" />
-<hkern u1="&#x1e84;" u2="&#xc3;" k="82" />
-<hkern u1="&#x1e84;" u2="&#xc2;" k="82" />
-<hkern u1="&#x1e84;" u2="&#xc1;" k="82" />
-<hkern u1="&#x1e84;" u2="&#xc0;" k="82" />
-<hkern u1="&#x1e84;" u2="u" k="20" />
-<hkern u1="&#x1e84;" u2="s" k="20" />
-<hkern u1="&#x1e84;" u2="r" k="20" />
-<hkern u1="&#x1e84;" u2="q" k="41" />
-<hkern u1="&#x1e84;" u2="p" k="20" />
-<hkern u1="&#x1e84;" u2="o" k="41" />
-<hkern u1="&#x1e84;" u2="n" k="20" />
-<hkern u1="&#x1e84;" u2="m" k="20" />
-<hkern u1="&#x1e84;" u2="g" k="20" />
-<hkern u1="&#x1e84;" u2="e" k="41" />
-<hkern u1="&#x1e84;" u2="d" k="41" />
-<hkern u1="&#x1e84;" u2="c" k="41" />
-<hkern u1="&#x1e84;" u2="a" k="41" />
-<hkern u1="&#x1e84;" u2="Q" k="20" />
-<hkern u1="&#x1e84;" u2="O" k="20" />
-<hkern u1="&#x1e84;" u2="G" k="20" />
-<hkern u1="&#x1e84;" u2="C" k="20" />
-<hkern u1="&#x1e84;" u2="A" k="82" />
-<hkern u1="&#x1e84;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1e84;" u2="&#x2e;" k="102" />
-<hkern u1="&#x1e84;" u2="&#x2c;" k="102" />
-<hkern u1="&#x1e85;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1e85;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x1e85;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1e85;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x1e85;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1e85;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1e85;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1e85;" u2="&#x27;" k="-82" />
-<hkern u1="&#x1e85;" u2="&#x22;" k="-82" />
-<hkern u1="&#x1ea0;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1ea0;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1ea0;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1ea0;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1ea0;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1ea0;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1ea0;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1ea0;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1ea0;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1ea0;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1ea0;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x178;" k="123" />
-<hkern u1="&#x1ea0;" u2="&#x176;" k="123" />
-<hkern u1="&#x1ea0;" u2="&#x174;" k="82" />
-<hkern u1="&#x1ea0;" u2="&#x164;" k="143" />
-<hkern u1="&#x1ea0;" u2="&#x162;" k="143" />
-<hkern u1="&#x1ea0;" u2="&#x152;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x150;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x122;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x120;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x108;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x106;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1ea0;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1ea0;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1ea0;" u2="Y" k="123" />
-<hkern u1="&#x1ea0;" u2="W" k="82" />
-<hkern u1="&#x1ea0;" u2="V" k="82" />
-<hkern u1="&#x1ea0;" u2="T" k="143" />
-<hkern u1="&#x1ea0;" u2="Q" k="41" />
-<hkern u1="&#x1ea0;" u2="O" k="41" />
-<hkern u1="&#x1ea0;" u2="J" k="-266" />
-<hkern u1="&#x1ea0;" u2="G" k="41" />
-<hkern u1="&#x1ea0;" u2="C" k="41" />
-<hkern u1="&#x1ea0;" u2="&#x27;" k="143" />
-<hkern u1="&#x1ea0;" u2="&#x22;" k="143" />
-<hkern u1="&#x1ea1;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ea1;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ea1;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ea1;" u2="&#x22;" k="20" />
-<hkern u1="&#x1ea2;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1ea2;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1ea2;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1ea2;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1ea2;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1ea2;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1ea2;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1ea2;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1ea2;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1ea2;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1ea2;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x178;" k="123" />
-<hkern u1="&#x1ea2;" u2="&#x176;" k="123" />
-<hkern u1="&#x1ea2;" u2="&#x174;" k="82" />
-<hkern u1="&#x1ea2;" u2="&#x164;" k="143" />
-<hkern u1="&#x1ea2;" u2="&#x162;" k="143" />
-<hkern u1="&#x1ea2;" u2="&#x152;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x150;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x122;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x120;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x108;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x106;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1ea2;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1ea2;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1ea2;" u2="Y" k="123" />
-<hkern u1="&#x1ea2;" u2="W" k="82" />
-<hkern u1="&#x1ea2;" u2="V" k="82" />
-<hkern u1="&#x1ea2;" u2="T" k="143" />
-<hkern u1="&#x1ea2;" u2="Q" k="41" />
-<hkern u1="&#x1ea2;" u2="O" k="41" />
-<hkern u1="&#x1ea2;" u2="J" k="-266" />
-<hkern u1="&#x1ea2;" u2="G" k="41" />
-<hkern u1="&#x1ea2;" u2="C" k="41" />
-<hkern u1="&#x1ea2;" u2="&#x27;" k="143" />
-<hkern u1="&#x1ea2;" u2="&#x22;" k="143" />
-<hkern u1="&#x1ea3;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ea3;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ea3;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ea3;" u2="&#x22;" k="20" />
-<hkern u1="&#x1ea4;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1ea4;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1ea4;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1ea4;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1ea4;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1ea4;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1ea4;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1ea4;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1ea4;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1ea4;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1ea4;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x178;" k="123" />
-<hkern u1="&#x1ea4;" u2="&#x176;" k="123" />
-<hkern u1="&#x1ea4;" u2="&#x174;" k="82" />
-<hkern u1="&#x1ea4;" u2="&#x164;" k="143" />
-<hkern u1="&#x1ea4;" u2="&#x162;" k="143" />
-<hkern u1="&#x1ea4;" u2="&#x152;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x150;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x122;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x120;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x108;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x106;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1ea4;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1ea4;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1ea4;" u2="Y" k="123" />
-<hkern u1="&#x1ea4;" u2="W" k="82" />
-<hkern u1="&#x1ea4;" u2="V" k="82" />
-<hkern u1="&#x1ea4;" u2="T" k="143" />
-<hkern u1="&#x1ea4;" u2="Q" k="41" />
-<hkern u1="&#x1ea4;" u2="O" k="41" />
-<hkern u1="&#x1ea4;" u2="J" k="-266" />
-<hkern u1="&#x1ea4;" u2="G" k="41" />
-<hkern u1="&#x1ea4;" u2="C" k="41" />
-<hkern u1="&#x1ea4;" u2="&#x27;" k="143" />
-<hkern u1="&#x1ea4;" u2="&#x22;" k="143" />
-<hkern u1="&#x1ea5;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ea5;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ea5;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ea5;" u2="&#x22;" k="20" />
-<hkern u1="&#x1ea6;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1ea6;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1ea6;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1ea6;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1ea6;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1ea6;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1ea6;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1ea6;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1ea6;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1ea6;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1ea6;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x178;" k="123" />
-<hkern u1="&#x1ea6;" u2="&#x176;" k="123" />
-<hkern u1="&#x1ea6;" u2="&#x174;" k="82" />
-<hkern u1="&#x1ea6;" u2="&#x164;" k="143" />
-<hkern u1="&#x1ea6;" u2="&#x162;" k="143" />
-<hkern u1="&#x1ea6;" u2="&#x152;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x150;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x122;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x120;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x108;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x106;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1ea6;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1ea6;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1ea6;" u2="Y" k="123" />
-<hkern u1="&#x1ea6;" u2="W" k="82" />
-<hkern u1="&#x1ea6;" u2="V" k="82" />
-<hkern u1="&#x1ea6;" u2="T" k="143" />
-<hkern u1="&#x1ea6;" u2="Q" k="41" />
-<hkern u1="&#x1ea6;" u2="O" k="41" />
-<hkern u1="&#x1ea6;" u2="J" k="-266" />
-<hkern u1="&#x1ea6;" u2="G" k="41" />
-<hkern u1="&#x1ea6;" u2="C" k="41" />
-<hkern u1="&#x1ea6;" u2="&#x27;" k="143" />
-<hkern u1="&#x1ea6;" u2="&#x22;" k="143" />
-<hkern u1="&#x1ea7;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ea7;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ea7;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ea7;" u2="&#x22;" k="20" />
-<hkern u1="&#x1ea8;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1ea8;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1ea8;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1ea8;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1ea8;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1ea8;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1ea8;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1ea8;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1ea8;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1ea8;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1ea8;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x178;" k="123" />
-<hkern u1="&#x1ea8;" u2="&#x176;" k="123" />
-<hkern u1="&#x1ea8;" u2="&#x174;" k="82" />
-<hkern u1="&#x1ea8;" u2="&#x164;" k="143" />
-<hkern u1="&#x1ea8;" u2="&#x162;" k="143" />
-<hkern u1="&#x1ea8;" u2="&#x152;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x150;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x122;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x120;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x108;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x106;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1ea8;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1ea8;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1ea8;" u2="Y" k="123" />
-<hkern u1="&#x1ea8;" u2="W" k="82" />
-<hkern u1="&#x1ea8;" u2="V" k="82" />
-<hkern u1="&#x1ea8;" u2="T" k="143" />
-<hkern u1="&#x1ea8;" u2="Q" k="41" />
-<hkern u1="&#x1ea8;" u2="O" k="41" />
-<hkern u1="&#x1ea8;" u2="J" k="-266" />
-<hkern u1="&#x1ea8;" u2="G" k="41" />
-<hkern u1="&#x1ea8;" u2="C" k="41" />
-<hkern u1="&#x1ea8;" u2="&#x27;" k="143" />
-<hkern u1="&#x1ea8;" u2="&#x22;" k="143" />
-<hkern u1="&#x1ea9;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ea9;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ea9;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ea9;" u2="&#x22;" k="20" />
-<hkern u1="&#x1eaa;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1eaa;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1eaa;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1eaa;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1eaa;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1eaa;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1eaa;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1eaa;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1eaa;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1eaa;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1eaa;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x178;" k="123" />
-<hkern u1="&#x1eaa;" u2="&#x176;" k="123" />
-<hkern u1="&#x1eaa;" u2="&#x174;" k="82" />
-<hkern u1="&#x1eaa;" u2="&#x164;" k="143" />
-<hkern u1="&#x1eaa;" u2="&#x162;" k="143" />
-<hkern u1="&#x1eaa;" u2="&#x152;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x150;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x122;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x120;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x108;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x106;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1eaa;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1eaa;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1eaa;" u2="Y" k="123" />
-<hkern u1="&#x1eaa;" u2="W" k="82" />
-<hkern u1="&#x1eaa;" u2="V" k="82" />
-<hkern u1="&#x1eaa;" u2="T" k="143" />
-<hkern u1="&#x1eaa;" u2="Q" k="41" />
-<hkern u1="&#x1eaa;" u2="O" k="41" />
-<hkern u1="&#x1eaa;" u2="J" k="-266" />
-<hkern u1="&#x1eaa;" u2="G" k="41" />
-<hkern u1="&#x1eaa;" u2="C" k="41" />
-<hkern u1="&#x1eaa;" u2="&#x27;" k="143" />
-<hkern u1="&#x1eaa;" u2="&#x22;" k="143" />
-<hkern u1="&#x1eab;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1eab;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1eab;" u2="&#x27;" k="20" />
-<hkern u1="&#x1eab;" u2="&#x22;" k="20" />
-<hkern u1="&#x1eac;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1eac;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1eac;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1eac;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1eac;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1eac;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1eac;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1eac;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1eac;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1eac;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1eac;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x178;" k="123" />
-<hkern u1="&#x1eac;" u2="&#x176;" k="123" />
-<hkern u1="&#x1eac;" u2="&#x174;" k="82" />
-<hkern u1="&#x1eac;" u2="&#x164;" k="143" />
-<hkern u1="&#x1eac;" u2="&#x162;" k="143" />
-<hkern u1="&#x1eac;" u2="&#x152;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x150;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x122;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x120;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x108;" k="41" />
-<hkern u1="&#x1eac;" u2="&#x106;" k="41" />
-<hkern u1="&#x1eac;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1eac;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1eac;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1eac;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1eac;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1eac;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1eac;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1eac;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1eac;" u2="Y" k="123" />
-<hkern u1="&#x1eac;" u2="W" k="82" />
-<hkern u1="&#x1eac;" u2="V" k="82" />
-<hkern u1="&#x1eac;" u2="T" k="143" />
-<hkern u1="&#x1eac;" u2="Q" k="41" />
-<hkern u1="&#x1eac;" u2="O" k="41" />
-<hkern u1="&#x1eac;" u2="J" k="-266" />
-<hkern u1="&#x1eac;" u2="G" k="41" />
-<hkern u1="&#x1eac;" u2="C" k="41" />
-<hkern u1="&#x1eac;" u2="&#x27;" k="143" />
-<hkern u1="&#x1eac;" u2="&#x22;" k="143" />
-<hkern u1="&#x1ead;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ead;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ead;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ead;" u2="&#x22;" k="20" />
-<hkern u1="&#x1eae;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1eae;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1eae;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1eae;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1eae;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1eae;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1eae;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1eae;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1eae;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1eae;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1eae;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x178;" k="123" />
-<hkern u1="&#x1eae;" u2="&#x176;" k="123" />
-<hkern u1="&#x1eae;" u2="&#x174;" k="82" />
-<hkern u1="&#x1eae;" u2="&#x164;" k="143" />
-<hkern u1="&#x1eae;" u2="&#x162;" k="143" />
-<hkern u1="&#x1eae;" u2="&#x152;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x150;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x122;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x120;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x108;" k="41" />
-<hkern u1="&#x1eae;" u2="&#x106;" k="41" />
-<hkern u1="&#x1eae;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1eae;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1eae;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1eae;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1eae;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1eae;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1eae;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1eae;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1eae;" u2="Y" k="123" />
-<hkern u1="&#x1eae;" u2="W" k="82" />
-<hkern u1="&#x1eae;" u2="V" k="82" />
-<hkern u1="&#x1eae;" u2="T" k="143" />
-<hkern u1="&#x1eae;" u2="Q" k="41" />
-<hkern u1="&#x1eae;" u2="O" k="41" />
-<hkern u1="&#x1eae;" u2="J" k="-266" />
-<hkern u1="&#x1eae;" u2="G" k="41" />
-<hkern u1="&#x1eae;" u2="C" k="41" />
-<hkern u1="&#x1eae;" u2="&#x27;" k="143" />
-<hkern u1="&#x1eae;" u2="&#x22;" k="143" />
-<hkern u1="&#x1eaf;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1eaf;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1eaf;" u2="&#x27;" k="20" />
-<hkern u1="&#x1eaf;" u2="&#x22;" k="20" />
-<hkern u1="&#x1eb0;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1eb0;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1eb0;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1eb0;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1eb0;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1eb0;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1eb0;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1eb0;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1eb0;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1eb0;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1eb0;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x178;" k="123" />
-<hkern u1="&#x1eb0;" u2="&#x176;" k="123" />
-<hkern u1="&#x1eb0;" u2="&#x174;" k="82" />
-<hkern u1="&#x1eb0;" u2="&#x164;" k="143" />
-<hkern u1="&#x1eb0;" u2="&#x162;" k="143" />
-<hkern u1="&#x1eb0;" u2="&#x152;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x150;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x122;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x120;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x108;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x106;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1eb0;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1eb0;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1eb0;" u2="Y" k="123" />
-<hkern u1="&#x1eb0;" u2="W" k="82" />
-<hkern u1="&#x1eb0;" u2="V" k="82" />
-<hkern u1="&#x1eb0;" u2="T" k="143" />
-<hkern u1="&#x1eb0;" u2="Q" k="41" />
-<hkern u1="&#x1eb0;" u2="O" k="41" />
-<hkern u1="&#x1eb0;" u2="J" k="-266" />
-<hkern u1="&#x1eb0;" u2="G" k="41" />
-<hkern u1="&#x1eb0;" u2="C" k="41" />
-<hkern u1="&#x1eb0;" u2="&#x27;" k="143" />
-<hkern u1="&#x1eb0;" u2="&#x22;" k="143" />
-<hkern u1="&#x1eb1;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1eb1;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1eb1;" u2="&#x27;" k="20" />
-<hkern u1="&#x1eb1;" u2="&#x22;" k="20" />
-<hkern u1="&#x1eb2;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1eb2;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1eb2;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1eb2;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1eb2;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1eb2;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1eb2;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1eb2;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1eb2;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1eb2;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1eb2;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x178;" k="123" />
-<hkern u1="&#x1eb2;" u2="&#x176;" k="123" />
-<hkern u1="&#x1eb2;" u2="&#x174;" k="82" />
-<hkern u1="&#x1eb2;" u2="&#x164;" k="143" />
-<hkern u1="&#x1eb2;" u2="&#x162;" k="143" />
-<hkern u1="&#x1eb2;" u2="&#x152;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x150;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x122;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x120;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x108;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x106;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1eb2;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1eb2;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1eb2;" u2="Y" k="123" />
-<hkern u1="&#x1eb2;" u2="W" k="82" />
-<hkern u1="&#x1eb2;" u2="V" k="82" />
-<hkern u1="&#x1eb2;" u2="T" k="143" />
-<hkern u1="&#x1eb2;" u2="Q" k="41" />
-<hkern u1="&#x1eb2;" u2="O" k="41" />
-<hkern u1="&#x1eb2;" u2="J" k="-266" />
-<hkern u1="&#x1eb2;" u2="G" k="41" />
-<hkern u1="&#x1eb2;" u2="C" k="41" />
-<hkern u1="&#x1eb2;" u2="&#x27;" k="143" />
-<hkern u1="&#x1eb2;" u2="&#x22;" k="143" />
-<hkern u1="&#x1eb3;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1eb3;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1eb3;" u2="&#x27;" k="20" />
-<hkern u1="&#x1eb3;" u2="&#x22;" k="20" />
-<hkern u1="&#x1eb4;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1eb4;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1eb4;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1eb4;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1eb4;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1eb4;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1eb4;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1eb4;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1eb4;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1eb4;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1eb4;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x178;" k="123" />
-<hkern u1="&#x1eb4;" u2="&#x176;" k="123" />
-<hkern u1="&#x1eb4;" u2="&#x174;" k="82" />
-<hkern u1="&#x1eb4;" u2="&#x164;" k="143" />
-<hkern u1="&#x1eb4;" u2="&#x162;" k="143" />
-<hkern u1="&#x1eb4;" u2="&#x152;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x150;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x122;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x120;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x108;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x106;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1eb4;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1eb4;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1eb4;" u2="Y" k="123" />
-<hkern u1="&#x1eb4;" u2="W" k="82" />
-<hkern u1="&#x1eb4;" u2="V" k="82" />
-<hkern u1="&#x1eb4;" u2="T" k="143" />
-<hkern u1="&#x1eb4;" u2="Q" k="41" />
-<hkern u1="&#x1eb4;" u2="O" k="41" />
-<hkern u1="&#x1eb4;" u2="J" k="-266" />
-<hkern u1="&#x1eb4;" u2="G" k="41" />
-<hkern u1="&#x1eb4;" u2="C" k="41" />
-<hkern u1="&#x1eb4;" u2="&#x27;" k="143" />
-<hkern u1="&#x1eb4;" u2="&#x22;" k="143" />
-<hkern u1="&#x1eb5;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1eb5;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1eb5;" u2="&#x27;" k="20" />
-<hkern u1="&#x1eb5;" u2="&#x22;" k="20" />
-<hkern u1="&#x1eb6;" u2="&#x201d;" k="143" />
-<hkern u1="&#x1eb6;" u2="&#x2019;" k="143" />
-<hkern u1="&#x1eb6;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x1eb6;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x1eb6;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x1eb6;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x1eb6;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x1e84;" k="82" />
-<hkern u1="&#x1eb6;" u2="&#x1e82;" k="82" />
-<hkern u1="&#x1eb6;" u2="&#x1e80;" k="82" />
-<hkern u1="&#x1eb6;" u2="&#x21a;" k="143" />
-<hkern u1="&#x1eb6;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x178;" k="123" />
-<hkern u1="&#x1eb6;" u2="&#x176;" k="123" />
-<hkern u1="&#x1eb6;" u2="&#x174;" k="82" />
-<hkern u1="&#x1eb6;" u2="&#x164;" k="143" />
-<hkern u1="&#x1eb6;" u2="&#x162;" k="143" />
-<hkern u1="&#x1eb6;" u2="&#x152;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x150;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x122;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x120;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x108;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x106;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#xdd;" k="123" />
-<hkern u1="&#x1eb6;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1eb6;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1eb6;" u2="Y" k="123" />
-<hkern u1="&#x1eb6;" u2="W" k="82" />
-<hkern u1="&#x1eb6;" u2="V" k="82" />
-<hkern u1="&#x1eb6;" u2="T" k="143" />
-<hkern u1="&#x1eb6;" u2="Q" k="41" />
-<hkern u1="&#x1eb6;" u2="O" k="41" />
-<hkern u1="&#x1eb6;" u2="J" k="-266" />
-<hkern u1="&#x1eb6;" u2="G" k="41" />
-<hkern u1="&#x1eb6;" u2="C" k="41" />
-<hkern u1="&#x1eb6;" u2="&#x27;" k="143" />
-<hkern u1="&#x1eb6;" u2="&#x22;" k="143" />
-<hkern u1="&#x1eb7;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1eb7;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1eb7;" u2="&#x27;" k="20" />
-<hkern u1="&#x1eb7;" u2="&#x22;" k="20" />
-<hkern u1="&#x1eb8;" u2="J" k="-123" />
-<hkern u1="&#x1eb9;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1eb9;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1eb9;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x1eb9;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x1eb9;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x1eb9;" u2="&#x17e;" k="20" />
-<hkern u1="&#x1eb9;" u2="&#x17c;" k="20" />
-<hkern u1="&#x1eb9;" u2="&#x17a;" k="20" />
-<hkern u1="&#x1eb9;" u2="&#x175;" k="41" />
-<hkern u1="&#x1eb9;" u2="&#xfd;" k="41" />
-<hkern u1="&#x1eb9;" u2="z" k="20" />
-<hkern u1="&#x1eb9;" u2="y" k="41" />
-<hkern u1="&#x1eb9;" u2="x" k="41" />
-<hkern u1="&#x1eb9;" u2="w" k="41" />
-<hkern u1="&#x1eb9;" u2="v" k="41" />
-<hkern u1="&#x1eb9;" u2="&#x27;" k="20" />
-<hkern u1="&#x1eb9;" u2="&#x22;" k="20" />
-<hkern u1="&#x1eba;" u2="J" k="-123" />
-<hkern u1="&#x1ebb;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ebb;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ebb;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x1ebb;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x1ebb;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x1ebb;" u2="&#x17e;" k="20" />
-<hkern u1="&#x1ebb;" u2="&#x17c;" k="20" />
-<hkern u1="&#x1ebb;" u2="&#x17a;" k="20" />
-<hkern u1="&#x1ebb;" u2="&#x175;" k="41" />
-<hkern u1="&#x1ebb;" u2="&#xfd;" k="41" />
-<hkern u1="&#x1ebb;" u2="z" k="20" />
-<hkern u1="&#x1ebb;" u2="y" k="41" />
-<hkern u1="&#x1ebb;" u2="x" k="41" />
-<hkern u1="&#x1ebb;" u2="w" k="41" />
-<hkern u1="&#x1ebb;" u2="v" k="41" />
-<hkern u1="&#x1ebb;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ebb;" u2="&#x22;" k="20" />
-<hkern u1="&#x1ebc;" u2="J" k="-123" />
-<hkern u1="&#x1ebd;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ebd;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ebd;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x1ebd;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x1ebd;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x1ebd;" u2="&#x17e;" k="20" />
-<hkern u1="&#x1ebd;" u2="&#x17c;" k="20" />
-<hkern u1="&#x1ebd;" u2="&#x17a;" k="20" />
-<hkern u1="&#x1ebd;" u2="&#x175;" k="41" />
-<hkern u1="&#x1ebd;" u2="&#xfd;" k="41" />
-<hkern u1="&#x1ebd;" u2="z" k="20" />
-<hkern u1="&#x1ebd;" u2="y" k="41" />
-<hkern u1="&#x1ebd;" u2="x" k="41" />
-<hkern u1="&#x1ebd;" u2="w" k="41" />
-<hkern u1="&#x1ebd;" u2="v" k="41" />
-<hkern u1="&#x1ebd;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ebd;" u2="&#x22;" k="20" />
-<hkern u1="&#x1ebe;" u2="J" k="-123" />
-<hkern u1="&#x1ebf;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ebf;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ebf;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x1ebf;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x1ebf;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x1ebf;" u2="&#x17e;" k="20" />
-<hkern u1="&#x1ebf;" u2="&#x17c;" k="20" />
-<hkern u1="&#x1ebf;" u2="&#x17a;" k="20" />
-<hkern u1="&#x1ebf;" u2="&#x175;" k="41" />
-<hkern u1="&#x1ebf;" u2="&#xfd;" k="41" />
-<hkern u1="&#x1ebf;" u2="z" k="20" />
-<hkern u1="&#x1ebf;" u2="y" k="41" />
-<hkern u1="&#x1ebf;" u2="x" k="41" />
-<hkern u1="&#x1ebf;" u2="w" k="41" />
-<hkern u1="&#x1ebf;" u2="v" k="41" />
-<hkern u1="&#x1ebf;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ebf;" u2="&#x22;" k="20" />
-<hkern u1="&#x1ec0;" u2="J" k="-123" />
-<hkern u1="&#x1ec1;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ec1;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ec1;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x1ec1;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x1ec1;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x1ec1;" u2="&#x17e;" k="20" />
-<hkern u1="&#x1ec1;" u2="&#x17c;" k="20" />
-<hkern u1="&#x1ec1;" u2="&#x17a;" k="20" />
-<hkern u1="&#x1ec1;" u2="&#x175;" k="41" />
-<hkern u1="&#x1ec1;" u2="&#xfd;" k="41" />
-<hkern u1="&#x1ec1;" u2="z" k="20" />
-<hkern u1="&#x1ec1;" u2="y" k="41" />
-<hkern u1="&#x1ec1;" u2="x" k="41" />
-<hkern u1="&#x1ec1;" u2="w" k="41" />
-<hkern u1="&#x1ec1;" u2="v" k="41" />
-<hkern u1="&#x1ec1;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ec1;" u2="&#x22;" k="20" />
-<hkern u1="&#x1ec2;" u2="J" k="-123" />
-<hkern u1="&#x1ec3;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ec3;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ec3;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x1ec3;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x1ec3;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x1ec3;" u2="&#x17e;" k="20" />
-<hkern u1="&#x1ec3;" u2="&#x17c;" k="20" />
-<hkern u1="&#x1ec3;" u2="&#x17a;" k="20" />
-<hkern u1="&#x1ec3;" u2="&#x175;" k="41" />
-<hkern u1="&#x1ec3;" u2="&#xfd;" k="41" />
-<hkern u1="&#x1ec3;" u2="z" k="20" />
-<hkern u1="&#x1ec3;" u2="y" k="41" />
-<hkern u1="&#x1ec3;" u2="x" k="41" />
-<hkern u1="&#x1ec3;" u2="w" k="41" />
-<hkern u1="&#x1ec3;" u2="v" k="41" />
-<hkern u1="&#x1ec3;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ec3;" u2="&#x22;" k="20" />
-<hkern u1="&#x1ec4;" u2="J" k="-123" />
-<hkern u1="&#x1ec5;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ec5;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ec5;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x1ec5;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x1ec5;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x1ec5;" u2="&#x17e;" k="20" />
-<hkern u1="&#x1ec5;" u2="&#x17c;" k="20" />
-<hkern u1="&#x1ec5;" u2="&#x17a;" k="20" />
-<hkern u1="&#x1ec5;" u2="&#x175;" k="41" />
-<hkern u1="&#x1ec5;" u2="&#xfd;" k="41" />
-<hkern u1="&#x1ec5;" u2="z" k="20" />
-<hkern u1="&#x1ec5;" u2="y" k="41" />
-<hkern u1="&#x1ec5;" u2="x" k="41" />
-<hkern u1="&#x1ec5;" u2="w" k="41" />
-<hkern u1="&#x1ec5;" u2="v" k="41" />
-<hkern u1="&#x1ec5;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ec5;" u2="&#x22;" k="20" />
-<hkern u1="&#x1ec6;" u2="J" k="-123" />
-<hkern u1="&#x1ec7;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ec7;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ec7;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x1ec7;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x1ec7;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x1ec7;" u2="&#x17e;" k="20" />
-<hkern u1="&#x1ec7;" u2="&#x17c;" k="20" />
-<hkern u1="&#x1ec7;" u2="&#x17a;" k="20" />
-<hkern u1="&#x1ec7;" u2="&#x175;" k="41" />
-<hkern u1="&#x1ec7;" u2="&#xfd;" k="41" />
-<hkern u1="&#x1ec7;" u2="z" k="20" />
-<hkern u1="&#x1ec7;" u2="y" k="41" />
-<hkern u1="&#x1ec7;" u2="x" k="41" />
-<hkern u1="&#x1ec7;" u2="w" k="41" />
-<hkern u1="&#x1ec7;" u2="v" k="41" />
-<hkern u1="&#x1ec7;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ec7;" u2="&#x22;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1ecc;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1ecc;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x1eae;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x1eac;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x1e84;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x1e82;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x1e80;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x1e00;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x405;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x21a;" k="61" />
-<hkern u1="&#x1ecc;" u2="&#x1fa;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x17d;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x17b;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x179;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x178;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x176;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x174;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#x164;" k="61" />
-<hkern u1="&#x1ecc;" u2="&#x162;" k="61" />
-<hkern u1="&#x1ecc;" u2="&#x104;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x102;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x100;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#xdd;" k="20" />
-<hkern u1="&#x1ecc;" u2="&#xc5;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#xc4;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#xc3;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#xc2;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#xc1;" k="41" />
-<hkern u1="&#x1ecc;" u2="&#xc0;" k="41" />
-<hkern u1="&#x1ecc;" u2="Z" k="20" />
-<hkern u1="&#x1ecc;" u2="Y" k="20" />
-<hkern u1="&#x1ecc;" u2="X" k="41" />
-<hkern u1="&#x1ecc;" u2="W" k="20" />
-<hkern u1="&#x1ecc;" u2="V" k="20" />
-<hkern u1="&#x1ecc;" u2="T" k="61" />
-<hkern u1="&#x1ecc;" u2="A" k="41" />
-<hkern u1="&#x1ecc;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1ecc;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1ecd;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ecd;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ecd;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x1ecd;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x1ecd;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x1ecd;" u2="&#x17e;" k="20" />
-<hkern u1="&#x1ecd;" u2="&#x17c;" k="20" />
-<hkern u1="&#x1ecd;" u2="&#x17a;" k="20" />
-<hkern u1="&#x1ecd;" u2="&#x175;" k="41" />
-<hkern u1="&#x1ecd;" u2="&#xfd;" k="41" />
-<hkern u1="&#x1ecd;" u2="z" k="20" />
-<hkern u1="&#x1ecd;" u2="y" k="41" />
-<hkern u1="&#x1ecd;" u2="x" k="41" />
-<hkern u1="&#x1ecd;" u2="w" k="41" />
-<hkern u1="&#x1ecd;" u2="v" k="41" />
-<hkern u1="&#x1ecd;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ecd;" u2="&#x22;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1ece;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1ece;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x1eae;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x1eac;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x1e84;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x1e82;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x1e80;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x1e00;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x405;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x21a;" k="61" />
-<hkern u1="&#x1ece;" u2="&#x1fa;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x17d;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x17b;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x179;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x178;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x176;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x174;" k="20" />
-<hkern u1="&#x1ece;" u2="&#x164;" k="61" />
-<hkern u1="&#x1ece;" u2="&#x162;" k="61" />
-<hkern u1="&#x1ece;" u2="&#x104;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x102;" k="41" />
-<hkern u1="&#x1ece;" u2="&#x100;" k="41" />
-<hkern u1="&#x1ece;" u2="&#xdd;" k="20" />
-<hkern u1="&#x1ece;" u2="&#xc5;" k="41" />
-<hkern u1="&#x1ece;" u2="&#xc4;" k="41" />
-<hkern u1="&#x1ece;" u2="&#xc3;" k="41" />
-<hkern u1="&#x1ece;" u2="&#xc2;" k="41" />
-<hkern u1="&#x1ece;" u2="&#xc1;" k="41" />
-<hkern u1="&#x1ece;" u2="&#xc0;" k="41" />
-<hkern u1="&#x1ece;" u2="Z" k="20" />
-<hkern u1="&#x1ece;" u2="Y" k="20" />
-<hkern u1="&#x1ece;" u2="X" k="41" />
-<hkern u1="&#x1ece;" u2="W" k="20" />
-<hkern u1="&#x1ece;" u2="V" k="20" />
-<hkern u1="&#x1ece;" u2="T" k="61" />
-<hkern u1="&#x1ece;" u2="A" k="41" />
-<hkern u1="&#x1ece;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1ece;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1ecf;" u2="&#x201d;" k="20" />
-<hkern u1="&#x1ecf;" u2="&#x2019;" k="20" />
-<hkern u1="&#x1ecf;" u2="&#x1ef5;" k="41" />
-<hkern u1="&#x1ecf;" u2="&#x1e83;" k="41" />
-<hkern u1="&#x1ecf;" u2="&#x1e81;" k="41" />
-<hkern u1="&#x1ecf;" u2="&#x17e;" k="20" />
-<hkern u1="&#x1ecf;" u2="&#x17c;" k="20" />
-<hkern u1="&#x1ecf;" u2="&#x17a;" k="20" />
-<hkern u1="&#x1ecf;" u2="&#x175;" k="41" />
-<hkern u1="&#x1ecf;" u2="&#xfd;" k="41" />
-<hkern u1="&#x1ecf;" u2="z" k="20" />
-<hkern u1="&#x1ecf;" u2="y" k="41" />
-<hkern u1="&#x1ecf;" u2="x" k="41" />
-<hkern u1="&#x1ecf;" u2="w" k="41" />
-<hkern u1="&#x1ecf;" u2="v" k="41" />
-<hkern u1="&#x1ecf;" u2="&#x27;" k="20" />
-<hkern u1="&#x1ecf;" u2="&#x22;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1ed0;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1ed0;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x1eae;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x1eac;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x1e84;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x1e82;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x1e80;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x1e00;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x405;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x21a;" k="61" />
-<hkern u1="&#x1ed0;" u2="&#x1fa;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x17d;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x17b;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x179;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x178;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x176;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x174;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#x164;" k="61" />
-<hkern u1="&#x1ed0;" u2="&#x162;" k="61" />
-<hkern u1="&#x1ed0;" u2="&#x104;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x102;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x100;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#xdd;" k="20" />
-<hkern u1="&#x1ed0;" u2="&#xc5;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#xc4;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#xc3;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#xc2;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#xc1;" k="41" />
-<hkern u1="&#x1ed0;" u2="&#xc0;" k="41" />
-<hkern u1="&#x1ed0;" u2="Z" k="20" />
-<hkern u1="&#x1ed0;" u2="Y" k="20" />
-<hkern u1="&#x1ed0;" u2="X" k="41" />
-<hkern u1="&#x1ed0;" u2="W" k="20" />
-<hkern u1="&#x1ed0;" u2="V" k="20" />
-<hkern u1="&#x1ed0;" u2="T" k="61" />
-<hkern u1="&#x1ed0;" u2="A" k="41" />
-<hkern u1="&#x1ed0;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1ed0;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1ed2;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1ed2;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1ed2;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x1eae;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x1eac;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x1e84;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x1e82;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x1e80;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x1e00;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x405;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x21a;" k="61" />
-<hkern u1="&#x1ed2;" u2="&#x1fa;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x17d;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x17b;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x179;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x178;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x176;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x174;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#x164;" k="61" />
-<hkern u1="&#x1ed2;" u2="&#x162;" k="61" />
-<hkern u1="&#x1ed2;" u2="&#x104;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x102;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x100;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#xdd;" k="20" />
-<hkern u1="&#x1ed2;" u2="&#xc5;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#xc4;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#xc3;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#xc2;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#xc1;" k="41" />
-<hkern u1="&#x1ed2;" u2="&#xc0;" k="41" />
-<hkern u1="&#x1ed2;" u2="Z" k="20" />
-<hkern u1="&#x1ed2;" u2="Y" k="20" />
-<hkern u1="&#x1ed2;" u2="X" k="41" />
-<hkern u1="&#x1ed2;" u2="W" k="20" />
-<hkern u1="&#x1ed2;" u2="V" k="20" />
-<hkern u1="&#x1ed2;" u2="T" k="61" />
-<hkern u1="&#x1ed2;" u2="A" k="41" />
-<hkern u1="&#x1ed2;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1ed2;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1ed4;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1ed4;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1ed4;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x1eae;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x1eac;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x1e84;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x1e82;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x1e80;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x1e00;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x405;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x21a;" k="61" />
-<hkern u1="&#x1ed4;" u2="&#x1fa;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x17d;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x17b;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x179;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x178;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x176;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x174;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#x164;" k="61" />
-<hkern u1="&#x1ed4;" u2="&#x162;" k="61" />
-<hkern u1="&#x1ed4;" u2="&#x104;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x102;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x100;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#xdd;" k="20" />
-<hkern u1="&#x1ed4;" u2="&#xc5;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#xc4;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#xc3;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#xc2;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#xc1;" k="41" />
-<hkern u1="&#x1ed4;" u2="&#xc0;" k="41" />
-<hkern u1="&#x1ed4;" u2="Z" k="20" />
-<hkern u1="&#x1ed4;" u2="Y" k="20" />
-<hkern u1="&#x1ed4;" u2="X" k="41" />
-<hkern u1="&#x1ed4;" u2="W" k="20" />
-<hkern u1="&#x1ed4;" u2="V" k="20" />
-<hkern u1="&#x1ed4;" u2="T" k="61" />
-<hkern u1="&#x1ed4;" u2="A" k="41" />
-<hkern u1="&#x1ed4;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1ed4;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1ed6;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1ed6;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1ed6;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x1eae;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x1eac;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x1e84;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x1e82;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x1e80;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x1e00;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x405;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x21a;" k="61" />
-<hkern u1="&#x1ed6;" u2="&#x1fa;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x17d;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x17b;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x179;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x178;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x176;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x174;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#x164;" k="61" />
-<hkern u1="&#x1ed6;" u2="&#x162;" k="61" />
-<hkern u1="&#x1ed6;" u2="&#x104;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x102;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x100;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#xdd;" k="20" />
-<hkern u1="&#x1ed6;" u2="&#xc5;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#xc4;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#xc3;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#xc2;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#xc1;" k="41" />
-<hkern u1="&#x1ed6;" u2="&#xc0;" k="41" />
-<hkern u1="&#x1ed6;" u2="Z" k="20" />
-<hkern u1="&#x1ed6;" u2="Y" k="20" />
-<hkern u1="&#x1ed6;" u2="X" k="41" />
-<hkern u1="&#x1ed6;" u2="W" k="20" />
-<hkern u1="&#x1ed6;" u2="V" k="20" />
-<hkern u1="&#x1ed6;" u2="T" k="61" />
-<hkern u1="&#x1ed6;" u2="A" k="41" />
-<hkern u1="&#x1ed6;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1ed6;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1ed8;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1ed8;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1ed8;" u2="&#x1ef8;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x1ef6;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x1ef4;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x1ef2;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x1eb6;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x1eb4;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x1eb2;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x1eb0;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x1eae;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x1eac;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x1eaa;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x1ea8;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x1ea6;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x1ea4;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x1ea2;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x1ea0;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x1e84;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x1e82;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x1e80;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x1e00;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x405;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x21a;" k="61" />
-<hkern u1="&#x1ed8;" u2="&#x1fa;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x17d;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x17b;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x179;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x178;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x176;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x174;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#x164;" k="61" />
-<hkern u1="&#x1ed8;" u2="&#x162;" k="61" />
-<hkern u1="&#x1ed8;" u2="&#x104;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x102;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x100;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#xdd;" k="20" />
-<hkern u1="&#x1ed8;" u2="&#xc5;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#xc4;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#xc3;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#xc2;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#xc1;" k="41" />
-<hkern u1="&#x1ed8;" u2="&#xc0;" k="41" />
-<hkern u1="&#x1ed8;" u2="Z" k="20" />
-<hkern u1="&#x1ed8;" u2="Y" k="20" />
-<hkern u1="&#x1ed8;" u2="X" k="41" />
-<hkern u1="&#x1ed8;" u2="W" k="20" />
-<hkern u1="&#x1ed8;" u2="V" k="20" />
-<hkern u1="&#x1ed8;" u2="T" k="61" />
-<hkern u1="&#x1ed8;" u2="A" k="41" />
-<hkern u1="&#x1ed8;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1ed8;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1edb;" g2="uniFB04" k="-82" />
-<hkern u1="&#x1edb;" g2="uniFB03" k="-82" />
-<hkern u1="&#x1edb;" g2="uniFB02" k="-82" />
-<hkern u1="&#x1edb;" g2="uniFB01" k="-82" />
-<hkern u1="&#x1edb;" g2="ff" k="-82" />
-<hkern u1="&#x1edb;" u2="&#x1ef5;" k="-102" />
-<hkern u1="&#x1edb;" u2="&#x1e83;" k="-102" />
-<hkern u1="&#x1edb;" u2="&#x1e81;" k="-102" />
-<hkern u1="&#x1edb;" u2="&#x21b;" k="-82" />
-<hkern u1="&#x1edb;" u2="&#x175;" k="-102" />
-<hkern u1="&#x1edb;" u2="&#x165;" k="-82" />
-<hkern u1="&#x1edb;" u2="&#x163;" k="-82" />
-<hkern u1="&#x1edb;" u2="&#xfd;" k="-102" />
-<hkern u1="&#x1edb;" u2="y" k="-102" />
-<hkern u1="&#x1edb;" u2="x" k="-102" />
-<hkern u1="&#x1edb;" u2="w" k="-102" />
-<hkern u1="&#x1edb;" u2="v" k="-102" />
-<hkern u1="&#x1edb;" u2="t" k="-82" />
-<hkern u1="&#x1edb;" u2="f" k="-82" />
-<hkern u1="&#x1edd;" g2="uniFB04" k="-82" />
-<hkern u1="&#x1edd;" g2="uniFB03" k="-82" />
-<hkern u1="&#x1edd;" g2="uniFB02" k="-82" />
-<hkern u1="&#x1edd;" g2="uniFB01" k="-82" />
-<hkern u1="&#x1edd;" g2="ff" k="-82" />
-<hkern u1="&#x1edd;" u2="&#x1ef5;" k="-102" />
-<hkern u1="&#x1edd;" u2="&#x1e83;" k="-102" />
-<hkern u1="&#x1edd;" u2="&#x1e81;" k="-102" />
-<hkern u1="&#x1edd;" u2="&#x21b;" k="-82" />
-<hkern u1="&#x1edd;" u2="&#x175;" k="-102" />
-<hkern u1="&#x1edd;" u2="&#x165;" k="-82" />
-<hkern u1="&#x1edd;" u2="&#x163;" k="-82" />
-<hkern u1="&#x1edd;" u2="&#xfd;" k="-102" />
-<hkern u1="&#x1edd;" u2="y" k="-102" />
-<hkern u1="&#x1edd;" u2="x" k="-102" />
-<hkern u1="&#x1edd;" u2="w" k="-102" />
-<hkern u1="&#x1edd;" u2="v" k="-102" />
-<hkern u1="&#x1edd;" u2="t" k="-82" />
-<hkern u1="&#x1edd;" u2="f" k="-82" />
-<hkern u1="&#x1edf;" g2="uniFB04" k="-82" />
-<hkern u1="&#x1edf;" g2="uniFB03" k="-82" />
-<hkern u1="&#x1edf;" g2="uniFB02" k="-82" />
-<hkern u1="&#x1edf;" g2="uniFB01" k="-82" />
-<hkern u1="&#x1edf;" g2="ff" k="-82" />
-<hkern u1="&#x1edf;" u2="&#x1ef5;" k="-102" />
-<hkern u1="&#x1edf;" u2="&#x1e83;" k="-102" />
-<hkern u1="&#x1edf;" u2="&#x1e81;" k="-102" />
-<hkern u1="&#x1edf;" u2="&#x21b;" k="-82" />
-<hkern u1="&#x1edf;" u2="&#x175;" k="-102" />
-<hkern u1="&#x1edf;" u2="&#x165;" k="-82" />
-<hkern u1="&#x1edf;" u2="&#x163;" k="-82" />
-<hkern u1="&#x1edf;" u2="&#xfd;" k="-102" />
-<hkern u1="&#x1edf;" u2="y" k="-102" />
-<hkern u1="&#x1edf;" u2="x" k="-102" />
-<hkern u1="&#x1edf;" u2="w" k="-102" />
-<hkern u1="&#x1edf;" u2="v" k="-102" />
-<hkern u1="&#x1edf;" u2="t" k="-82" />
-<hkern u1="&#x1edf;" u2="f" k="-82" />
-<hkern u1="&#x1ee1;" g2="uniFB04" k="-82" />
-<hkern u1="&#x1ee1;" g2="uniFB03" k="-82" />
-<hkern u1="&#x1ee1;" g2="uniFB02" k="-82" />
-<hkern u1="&#x1ee1;" g2="uniFB01" k="-82" />
-<hkern u1="&#x1ee1;" g2="ff" k="-82" />
-<hkern u1="&#x1ee1;" u2="&#x1ef5;" k="-102" />
-<hkern u1="&#x1ee1;" u2="&#x1e83;" k="-102" />
-<hkern u1="&#x1ee1;" u2="&#x1e81;" k="-102" />
-<hkern u1="&#x1ee1;" u2="&#x21b;" k="-82" />
-<hkern u1="&#x1ee1;" u2="&#x175;" k="-102" />
-<hkern u1="&#x1ee1;" u2="&#x165;" k="-82" />
-<hkern u1="&#x1ee1;" u2="&#x163;" k="-82" />
-<hkern u1="&#x1ee1;" u2="&#xfd;" k="-102" />
-<hkern u1="&#x1ee1;" u2="y" k="-102" />
-<hkern u1="&#x1ee1;" u2="x" k="-102" />
-<hkern u1="&#x1ee1;" u2="w" k="-102" />
-<hkern u1="&#x1ee1;" u2="v" k="-102" />
-<hkern u1="&#x1ee1;" u2="t" k="-82" />
-<hkern u1="&#x1ee1;" u2="f" k="-82" />
-<hkern u1="&#x1ee3;" g2="uniFB04" k="-82" />
-<hkern u1="&#x1ee3;" g2="uniFB03" k="-82" />
-<hkern u1="&#x1ee3;" g2="uniFB02" k="-82" />
-<hkern u1="&#x1ee3;" g2="uniFB01" k="-82" />
-<hkern u1="&#x1ee3;" g2="ff" k="-82" />
-<hkern u1="&#x1ee3;" u2="&#x1ef5;" k="-102" />
-<hkern u1="&#x1ee3;" u2="&#x1e83;" k="-102" />
-<hkern u1="&#x1ee3;" u2="&#x1e81;" k="-102" />
-<hkern u1="&#x1ee3;" u2="&#x21b;" k="-82" />
-<hkern u1="&#x1ee3;" u2="&#x175;" k="-102" />
-<hkern u1="&#x1ee3;" u2="&#x165;" k="-82" />
-<hkern u1="&#x1ee3;" u2="&#x163;" k="-82" />
-<hkern u1="&#x1ee3;" u2="&#xfd;" k="-102" />
-<hkern u1="&#x1ee3;" u2="y" k="-102" />
-<hkern u1="&#x1ee3;" u2="x" k="-102" />
-<hkern u1="&#x1ee3;" u2="w" k="-102" />
-<hkern u1="&#x1ee3;" u2="v" k="-102" />
-<hkern u1="&#x1ee3;" u2="t" k="-82" />
-<hkern u1="&#x1ee3;" u2="f" k="-82" />
-<hkern u1="&#x1ee4;" u2="&#x201e;" k="41" />
-<hkern u1="&#x1ee4;" u2="&#x201a;" k="41" />
-<hkern u1="&#x1ee4;" u2="&#x1eb6;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x1eb4;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x1eb2;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x1eb0;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x1eae;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x1eac;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x1eaa;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x1ea8;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x1ea6;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x1ea4;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x1ea2;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x1ea0;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x1e00;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x1fa;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x104;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x102;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x100;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#xc5;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#xc4;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#xc3;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#xc2;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#xc1;" k="20" />
-<hkern u1="&#x1ee4;" u2="&#xc0;" k="20" />
-<hkern u1="&#x1ee4;" u2="A" k="20" />
-<hkern u1="&#x1ee4;" u2="&#x2e;" k="41" />
-<hkern u1="&#x1ee4;" u2="&#x2c;" k="41" />
-<hkern u1="&#x1ee9;" g2="uniFB04" k="-102" />
-<hkern u1="&#x1ee9;" g2="uniFB03" k="-102" />
-<hkern u1="&#x1ee9;" g2="uniFB02" k="-102" />
-<hkern u1="&#x1ee9;" g2="uniFB01" k="-102" />
-<hkern u1="&#x1ee9;" g2="ff" k="-102" />
-<hkern u1="&#x1ee9;" u2="&#x1ef5;" k="-102" />
-<hkern u1="&#x1ee9;" u2="&#x1e83;" k="-102" />
-<hkern u1="&#x1ee9;" u2="&#x1e81;" k="-102" />
-<hkern u1="&#x1ee9;" u2="&#x21b;" k="-102" />
-<hkern u1="&#x1ee9;" u2="&#x175;" k="-102" />
-<hkern u1="&#x1ee9;" u2="&#x165;" k="-102" />
-<hkern u1="&#x1ee9;" u2="&#x163;" k="-102" />
-<hkern u1="&#x1ee9;" u2="&#xfd;" k="-102" />
-<hkern u1="&#x1ee9;" u2="y" k="-102" />
-<hkern u1="&#x1ee9;" u2="x" k="-102" />
-<hkern u1="&#x1ee9;" u2="w" k="-102" />
-<hkern u1="&#x1ee9;" u2="v" k="-102" />
-<hkern u1="&#x1ee9;" u2="t" k="-102" />
-<hkern u1="&#x1ee9;" u2="f" k="-102" />
-<hkern u1="&#x1eeb;" g2="uniFB04" k="-102" />
-<hkern u1="&#x1eeb;" g2="uniFB03" k="-102" />
-<hkern u1="&#x1eeb;" g2="uniFB02" k="-102" />
-<hkern u1="&#x1eeb;" g2="uniFB01" k="-102" />
-<hkern u1="&#x1eeb;" g2="ff" k="-102" />
-<hkern u1="&#x1eeb;" u2="&#x1ef5;" k="-102" />
-<hkern u1="&#x1eeb;" u2="&#x1e83;" k="-102" />
-<hkern u1="&#x1eeb;" u2="&#x1e81;" k="-102" />
-<hkern u1="&#x1eeb;" u2="&#x21b;" k="-102" />
-<hkern u1="&#x1eeb;" u2="&#x175;" k="-102" />
-<hkern u1="&#x1eeb;" u2="&#x165;" k="-102" />
-<hkern u1="&#x1eeb;" u2="&#x163;" k="-102" />
-<hkern u1="&#x1eeb;" u2="&#xfd;" k="-102" />
-<hkern u1="&#x1eeb;" u2="y" k="-102" />
-<hkern u1="&#x1eeb;" u2="x" k="-102" />
-<hkern u1="&#x1eeb;" u2="w" k="-102" />
-<hkern u1="&#x1eeb;" u2="v" k="-102" />
-<hkern u1="&#x1eeb;" u2="t" k="-102" />
-<hkern u1="&#x1eeb;" u2="f" k="-102" />
-<hkern u1="&#x1eed;" g2="uniFB04" k="-102" />
-<hkern u1="&#x1eed;" g2="uniFB03" k="-102" />
-<hkern u1="&#x1eed;" g2="uniFB02" k="-102" />
-<hkern u1="&#x1eed;" g2="uniFB01" k="-102" />
-<hkern u1="&#x1eed;" g2="ff" k="-102" />
-<hkern u1="&#x1eed;" u2="&#x1ef5;" k="-102" />
-<hkern u1="&#x1eed;" u2="&#x1e83;" k="-102" />
-<hkern u1="&#x1eed;" u2="&#x1e81;" k="-102" />
-<hkern u1="&#x1eed;" u2="&#x21b;" k="-102" />
-<hkern u1="&#x1eed;" u2="&#x175;" k="-102" />
-<hkern u1="&#x1eed;" u2="&#x165;" k="-102" />
-<hkern u1="&#x1eed;" u2="&#x163;" k="-102" />
-<hkern u1="&#x1eed;" u2="&#xfd;" k="-102" />
-<hkern u1="&#x1eed;" u2="y" k="-102" />
-<hkern u1="&#x1eed;" u2="x" k="-102" />
-<hkern u1="&#x1eed;" u2="w" k="-102" />
-<hkern u1="&#x1eed;" u2="v" k="-102" />
-<hkern u1="&#x1eed;" u2="t" k="-102" />
-<hkern u1="&#x1eed;" u2="f" k="-102" />
-<hkern u1="&#x1eef;" g2="uniFB04" k="-102" />
-<hkern u1="&#x1eef;" g2="uniFB03" k="-102" />
-<hkern u1="&#x1eef;" g2="uniFB02" k="-102" />
-<hkern u1="&#x1eef;" g2="uniFB01" k="-102" />
-<hkern u1="&#x1eef;" g2="ff" k="-102" />
-<hkern u1="&#x1eef;" u2="&#x1ef5;" k="-102" />
-<hkern u1="&#x1eef;" u2="&#x1e83;" k="-102" />
-<hkern u1="&#x1eef;" u2="&#x1e81;" k="-102" />
-<hkern u1="&#x1eef;" u2="&#x21b;" k="-102" />
-<hkern u1="&#x1eef;" u2="&#x175;" k="-102" />
-<hkern u1="&#x1eef;" u2="&#x165;" k="-102" />
-<hkern u1="&#x1eef;" u2="&#x163;" k="-102" />
-<hkern u1="&#x1eef;" u2="&#xfd;" k="-102" />
-<hkern u1="&#x1eef;" u2="y" k="-102" />
-<hkern u1="&#x1eef;" u2="x" k="-102" />
-<hkern u1="&#x1eef;" u2="w" k="-102" />
-<hkern u1="&#x1eef;" u2="v" k="-102" />
-<hkern u1="&#x1eef;" u2="t" k="-102" />
-<hkern u1="&#x1eef;" u2="f" k="-102" />
-<hkern u1="&#x1ef1;" g2="uniFB04" k="-102" />
-<hkern u1="&#x1ef1;" g2="uniFB03" k="-102" />
-<hkern u1="&#x1ef1;" g2="uniFB02" k="-102" />
-<hkern u1="&#x1ef1;" g2="uniFB01" k="-102" />
-<hkern u1="&#x1ef1;" g2="ff" k="-102" />
-<hkern u1="&#x1ef1;" u2="&#x1ef5;" k="-102" />
-<hkern u1="&#x1ef1;" u2="&#x1e83;" k="-102" />
-<hkern u1="&#x1ef1;" u2="&#x1e81;" k="-102" />
-<hkern u1="&#x1ef1;" u2="&#x21b;" k="-102" />
-<hkern u1="&#x1ef1;" u2="&#x175;" k="-102" />
-<hkern u1="&#x1ef1;" u2="&#x165;" k="-102" />
-<hkern u1="&#x1ef1;" u2="&#x163;" k="-102" />
-<hkern u1="&#x1ef1;" u2="&#xfd;" k="-102" />
-<hkern u1="&#x1ef1;" u2="y" k="-102" />
-<hkern u1="&#x1ef1;" u2="x" k="-102" />
-<hkern u1="&#x1ef1;" u2="w" k="-102" />
-<hkern u1="&#x1ef1;" u2="v" k="-102" />
-<hkern u1="&#x1ef1;" u2="t" k="-102" />
-<hkern u1="&#x1ef1;" u2="f" k="-102" />
-<hkern u1="&#x1ef2;" u2="&#x201e;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x201a;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1ef1;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x1eef;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x1eed;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x1eeb;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x1ee9;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x1ee7;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x1ee5;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x1ee3;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x1ee1;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x1edf;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x1edd;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x1edb;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x1ed9;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x1ed7;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x1ed5;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x1ed1;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x1ecf;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x1ecd;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x1ec7;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ec5;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ec3;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ebf;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ebd;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ebb;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1eb9;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1eb7;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1eb6;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1eb5;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1eb4;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1eb3;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1eb2;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1eb1;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1eb0;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1eaf;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1eae;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1ead;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1eac;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1eab;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1eaa;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1ea9;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ea8;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1ea6;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1ea5;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ea4;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1ea3;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ea2;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1ea1;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1ea0;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1e3f;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x1e01;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1e00;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x219;" k="82" />
-<hkern u1="&#x1ef2;" u2="&#x1ff;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x1fd;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1fb;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1fa;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x1b0;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x1a1;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x17e;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x17c;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x17a;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x173;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x171;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x16f;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x16d;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x16b;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x169;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x15f;" k="82" />
-<hkern u1="&#x1ef2;" u2="&#x15b;" k="82" />
-<hkern u1="&#x1ef2;" u2="&#x157;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x155;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x153;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x152;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x151;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x150;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x14f;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x14d;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x14b;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x146;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x144;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x138;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#x123;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x122;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x121;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x120;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x11f;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x11d;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x11b;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x119;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x117;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x115;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x113;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x111;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x10f;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x10d;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x10b;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x109;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x108;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x107;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x106;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#x105;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x104;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x103;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x102;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x101;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#x100;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#xfc;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#xfb;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#xfa;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#xf9;" k="61" />
-<hkern u1="&#x1ef2;" u2="&#xf8;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xf6;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xf5;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xf4;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xf3;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xf2;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xeb;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xea;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xe9;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xe8;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xe7;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xe6;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xe5;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xe4;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xe3;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xe2;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xe1;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xe0;" k="102" />
-<hkern u1="&#x1ef2;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1ef2;" u2="&#xc5;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#xc4;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#xc3;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#xc2;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#xc1;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#xc0;" k="123" />
-<hkern u1="&#x1ef2;" u2="z" k="41" />
-<hkern u1="&#x1ef2;" u2="u" k="61" />
-<hkern u1="&#x1ef2;" u2="s" k="82" />
-<hkern u1="&#x1ef2;" u2="r" k="61" />
-<hkern u1="&#x1ef2;" u2="q" k="102" />
-<hkern u1="&#x1ef2;" u2="p" k="61" />
-<hkern u1="&#x1ef2;" u2="o" k="102" />
-<hkern u1="&#x1ef2;" u2="n" k="61" />
-<hkern u1="&#x1ef2;" u2="m" k="61" />
-<hkern u1="&#x1ef2;" u2="g" k="41" />
-<hkern u1="&#x1ef2;" u2="e" k="102" />
-<hkern u1="&#x1ef2;" u2="d" k="102" />
-<hkern u1="&#x1ef2;" u2="c" k="102" />
-<hkern u1="&#x1ef2;" u2="a" k="102" />
-<hkern u1="&#x1ef2;" u2="Q" k="41" />
-<hkern u1="&#x1ef2;" u2="O" k="41" />
-<hkern u1="&#x1ef2;" u2="G" k="41" />
-<hkern u1="&#x1ef2;" u2="C" k="41" />
-<hkern u1="&#x1ef2;" u2="A" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1ef2;" u2="&#x2e;" k="123" />
-<hkern u1="&#x1ef2;" u2="&#x2c;" k="123" />
-<hkern u1="&#x1ef3;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1ef3;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x1ef3;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1ef3;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x1ef3;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1ef3;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1ef3;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1ef3;" u2="&#x27;" k="-82" />
-<hkern u1="&#x1ef3;" u2="&#x22;" k="-82" />
-<hkern u1="&#x1ef4;" u2="&#x201e;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x201a;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1ef1;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x1eef;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x1eed;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x1eeb;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x1ee9;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x1ee7;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x1ee5;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x1ee3;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x1ee1;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x1edf;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x1edd;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x1edb;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x1ed9;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x1ed7;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x1ed5;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x1ed1;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x1ecf;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x1ecd;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x1ec7;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ec5;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ec3;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ebf;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ebd;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ebb;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1eb9;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1eb7;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1eb6;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1eb5;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1eb4;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1eb3;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1eb2;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1eb1;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1eb0;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1eaf;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1eae;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1ead;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1eac;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1eab;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1eaa;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1ea9;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ea8;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1ea6;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1ea5;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ea4;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1ea3;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ea2;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1ea1;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1ea0;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1e3f;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x1e01;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1e00;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x219;" k="82" />
-<hkern u1="&#x1ef4;" u2="&#x1ff;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x1fd;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1fb;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1fa;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x1b0;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x1a1;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x17e;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x17c;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x17a;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x173;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x171;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x16f;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x16d;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x16b;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x169;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x15f;" k="82" />
-<hkern u1="&#x1ef4;" u2="&#x15b;" k="82" />
-<hkern u1="&#x1ef4;" u2="&#x157;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x155;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x153;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x152;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x151;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x150;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x14f;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x14d;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x14b;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x146;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x144;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x138;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#x123;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x122;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x121;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x120;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x11f;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x11d;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x11b;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x119;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x117;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x115;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x113;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x111;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x10f;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x10d;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x10b;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x109;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x108;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x107;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x106;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#x105;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x104;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x103;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x102;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x101;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#x100;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#xfc;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#xfb;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#xfa;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#xf9;" k="61" />
-<hkern u1="&#x1ef4;" u2="&#xf8;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xf6;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xf5;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xf4;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xf3;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xf2;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xeb;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xea;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xe9;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xe8;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xe7;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xe6;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xe5;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xe4;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xe3;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xe2;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xe1;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xe0;" k="102" />
-<hkern u1="&#x1ef4;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1ef4;" u2="&#xc5;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#xc4;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#xc3;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#xc2;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#xc1;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#xc0;" k="123" />
-<hkern u1="&#x1ef4;" u2="z" k="41" />
-<hkern u1="&#x1ef4;" u2="u" k="61" />
-<hkern u1="&#x1ef4;" u2="s" k="82" />
-<hkern u1="&#x1ef4;" u2="r" k="61" />
-<hkern u1="&#x1ef4;" u2="q" k="102" />
-<hkern u1="&#x1ef4;" u2="p" k="61" />
-<hkern u1="&#x1ef4;" u2="o" k="102" />
-<hkern u1="&#x1ef4;" u2="n" k="61" />
-<hkern u1="&#x1ef4;" u2="m" k="61" />
-<hkern u1="&#x1ef4;" u2="g" k="41" />
-<hkern u1="&#x1ef4;" u2="e" k="102" />
-<hkern u1="&#x1ef4;" u2="d" k="102" />
-<hkern u1="&#x1ef4;" u2="c" k="102" />
-<hkern u1="&#x1ef4;" u2="a" k="102" />
-<hkern u1="&#x1ef4;" u2="Q" k="41" />
-<hkern u1="&#x1ef4;" u2="O" k="41" />
-<hkern u1="&#x1ef4;" u2="G" k="41" />
-<hkern u1="&#x1ef4;" u2="C" k="41" />
-<hkern u1="&#x1ef4;" u2="A" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1ef4;" u2="&#x2e;" k="123" />
-<hkern u1="&#x1ef4;" u2="&#x2c;" k="123" />
-<hkern u1="&#x1ef5;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1ef5;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x1ef5;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1ef5;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x1ef5;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1ef5;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1ef5;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1ef5;" u2="&#x27;" k="-82" />
-<hkern u1="&#x1ef5;" u2="&#x22;" k="-82" />
-<hkern u1="&#x1ef6;" u2="&#x201e;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x201a;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1ef1;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x1eef;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x1eed;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x1eeb;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x1ee9;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x1ee7;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x1ee5;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x1ee3;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x1ee1;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x1edf;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x1edd;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x1edb;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x1ed9;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x1ed7;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x1ed5;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x1ed1;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x1ecf;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x1ecd;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x1ec7;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ec5;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ec3;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ebf;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ebd;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ebb;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1eb9;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1eb7;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1eb6;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1eb5;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1eb4;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1eb3;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1eb2;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1eb1;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1eb0;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1eaf;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1eae;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1ead;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1eac;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1eab;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1eaa;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1ea9;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ea8;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1ea6;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1ea5;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ea4;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1ea3;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ea2;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1ea1;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1ea0;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1e3f;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x1e01;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1e00;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x219;" k="82" />
-<hkern u1="&#x1ef6;" u2="&#x1ff;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x1fd;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1fb;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1fa;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x1b0;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x1a1;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x17e;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x17c;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x17a;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x173;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x171;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x16f;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x16d;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x16b;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x169;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x15f;" k="82" />
-<hkern u1="&#x1ef6;" u2="&#x15b;" k="82" />
-<hkern u1="&#x1ef6;" u2="&#x157;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x155;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x153;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x152;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x151;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x150;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x14f;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x14d;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x14b;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x146;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x144;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x138;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#x123;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x122;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x121;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x120;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x11f;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x11d;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x11b;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x119;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x117;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x115;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x113;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x111;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x10f;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x10d;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x10b;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x109;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x108;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x107;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x106;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#x105;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x104;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x103;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x102;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x101;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#x100;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#xfc;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#xfb;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#xfa;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#xf9;" k="61" />
-<hkern u1="&#x1ef6;" u2="&#xf8;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xf6;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xf5;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xf4;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xf3;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xf2;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xeb;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xea;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xe9;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xe8;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xe7;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xe6;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xe5;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xe4;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xe3;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xe2;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xe1;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xe0;" k="102" />
-<hkern u1="&#x1ef6;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1ef6;" u2="&#xc5;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#xc4;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#xc3;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#xc2;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#xc1;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#xc0;" k="123" />
-<hkern u1="&#x1ef6;" u2="z" k="41" />
-<hkern u1="&#x1ef6;" u2="u" k="61" />
-<hkern u1="&#x1ef6;" u2="s" k="82" />
-<hkern u1="&#x1ef6;" u2="r" k="61" />
-<hkern u1="&#x1ef6;" u2="q" k="102" />
-<hkern u1="&#x1ef6;" u2="p" k="61" />
-<hkern u1="&#x1ef6;" u2="o" k="102" />
-<hkern u1="&#x1ef6;" u2="n" k="61" />
-<hkern u1="&#x1ef6;" u2="m" k="61" />
-<hkern u1="&#x1ef6;" u2="g" k="41" />
-<hkern u1="&#x1ef6;" u2="e" k="102" />
-<hkern u1="&#x1ef6;" u2="d" k="102" />
-<hkern u1="&#x1ef6;" u2="c" k="102" />
-<hkern u1="&#x1ef6;" u2="a" k="102" />
-<hkern u1="&#x1ef6;" u2="Q" k="41" />
-<hkern u1="&#x1ef6;" u2="O" k="41" />
-<hkern u1="&#x1ef6;" u2="G" k="41" />
-<hkern u1="&#x1ef6;" u2="C" k="41" />
-<hkern u1="&#x1ef6;" u2="A" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1ef6;" u2="&#x2e;" k="123" />
-<hkern u1="&#x1ef6;" u2="&#x2c;" k="123" />
-<hkern u1="&#x1ef7;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1ef7;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x1ef7;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1ef7;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x1ef7;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1ef7;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1ef7;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1ef7;" u2="&#x27;" k="-82" />
-<hkern u1="&#x1ef7;" u2="&#x22;" k="-82" />
-<hkern u1="&#x1ef8;" u2="&#x201e;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x201a;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1ef1;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x1eef;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x1eed;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x1eeb;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x1ee9;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x1ee7;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x1ee5;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x1ee3;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ee2;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x1ee1;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ee0;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x1edf;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ede;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x1edd;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1edc;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x1edb;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1eda;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x1ed9;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ed8;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x1ed7;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ed6;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x1ed5;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ed4;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x1ed2;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x1ed1;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ed0;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x1ecf;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ece;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x1ecd;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ecc;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x1ec7;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ec5;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ec3;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ebf;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ebd;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ebb;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1eb9;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1eb7;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1eb6;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1eb5;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1eb4;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1eb3;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1eb2;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1eb1;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1eb0;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1eaf;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1eae;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1ead;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1eac;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1eab;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1eaa;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1ea9;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ea8;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1ea6;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1ea5;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ea4;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1ea3;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ea2;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1ea1;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1ea0;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1e3f;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x1e01;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1e00;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x219;" k="82" />
-<hkern u1="&#x1ef8;" u2="&#x1ff;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1fe;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x1fd;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1fb;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1fa;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x1b0;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x1a1;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x1a0;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x17e;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x17c;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x17a;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x173;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x171;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x16f;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x16d;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x16b;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x169;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x15f;" k="82" />
-<hkern u1="&#x1ef8;" u2="&#x15b;" k="82" />
-<hkern u1="&#x1ef8;" u2="&#x157;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x155;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x153;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x152;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x151;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x150;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x14f;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x14e;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x14d;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x14c;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x14b;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x146;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x144;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x138;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#x123;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x122;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x121;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x120;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x11f;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x11e;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x11d;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x11c;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x11b;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x119;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x117;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x115;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x113;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x111;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x10f;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x10d;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x10c;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x10b;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x10a;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x109;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x108;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x107;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x106;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#x105;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x104;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x103;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x102;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x101;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#x100;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#xfc;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#xfb;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#xfa;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#xf9;" k="61" />
-<hkern u1="&#x1ef8;" u2="&#xf8;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xf6;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xf5;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xf4;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xf3;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xf2;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xeb;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xea;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xe9;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xe8;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xe7;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xe6;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xe5;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xe4;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xe3;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xe2;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xe1;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xe0;" k="102" />
-<hkern u1="&#x1ef8;" u2="&#xd8;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#xd6;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#xd5;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#xd4;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#xd3;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#xd2;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#xc7;" k="41" />
-<hkern u1="&#x1ef8;" u2="&#xc5;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#xc4;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#xc3;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#xc2;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#xc1;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#xc0;" k="123" />
-<hkern u1="&#x1ef8;" u2="z" k="41" />
-<hkern u1="&#x1ef8;" u2="u" k="61" />
-<hkern u1="&#x1ef8;" u2="s" k="82" />
-<hkern u1="&#x1ef8;" u2="r" k="61" />
-<hkern u1="&#x1ef8;" u2="q" k="102" />
-<hkern u1="&#x1ef8;" u2="p" k="61" />
-<hkern u1="&#x1ef8;" u2="o" k="102" />
-<hkern u1="&#x1ef8;" u2="n" k="61" />
-<hkern u1="&#x1ef8;" u2="m" k="61" />
-<hkern u1="&#x1ef8;" u2="g" k="41" />
-<hkern u1="&#x1ef8;" u2="e" k="102" />
-<hkern u1="&#x1ef8;" u2="d" k="102" />
-<hkern u1="&#x1ef8;" u2="c" k="102" />
-<hkern u1="&#x1ef8;" u2="a" k="102" />
-<hkern u1="&#x1ef8;" u2="Q" k="41" />
-<hkern u1="&#x1ef8;" u2="O" k="41" />
-<hkern u1="&#x1ef8;" u2="G" k="41" />
-<hkern u1="&#x1ef8;" u2="C" k="41" />
-<hkern u1="&#x1ef8;" u2="A" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1ef8;" u2="&#x2e;" k="123" />
-<hkern u1="&#x1ef8;" u2="&#x2c;" k="123" />
-<hkern u1="&#x1ef9;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1ef9;" u2="&#x201d;" k="-82" />
-<hkern u1="&#x1ef9;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1ef9;" u2="&#x2019;" k="-82" />
-<hkern u1="&#x1ef9;" u2="&#x3f;" k="-41" />
-<hkern u1="&#x1ef9;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1ef9;" u2="&#x2c;" k="82" />
-<hkern u1="&#x1ef9;" u2="&#x27;" k="-82" />
-<hkern u1="&#x1ef9;" u2="&#x22;" k="-82" />
-<hkern u1="&#x1f4d;" u2="&#x201e;" k="82" />
-<hkern u1="&#x1f4d;" u2="&#x201a;" k="82" />
-<hkern u1="&#x1f4d;" u2="&#x3d2;" k="20" />
-<hkern u1="&#x1f4d;" u2="&#x3bb;" k="20" />
-<hkern u1="&#x1f4d;" u2="&#x3ab;" k="20" />
-<hkern u1="&#x1f4d;" u2="&#x3a8;" k="20" />
-<hkern u1="&#x1f4d;" u2="&#x3a7;" k="41" />
-<hkern u1="&#x1f4d;" u2="&#x3a5;" k="20" />
-<hkern u1="&#x1f4d;" u2="&#x3a4;" k="61" />
-<hkern u1="&#x1f4d;" u2="&#x3a3;" k="20" />
-<hkern u1="&#x1f4d;" u2="&#x39b;" k="41" />
-<hkern u1="&#x1f4d;" u2="&#x396;" k="20" />
-<hkern u1="&#x1f4d;" u2="&#x394;" k="41" />
-<hkern u1="&#x1f4d;" u2="&#x391;" k="41" />
-<hkern u1="&#x1f4d;" u2="&#x386;" k="41" />
-<hkern u1="&#x1f4d;" u2="&#x2e;" k="82" />
-<hkern u1="&#x1f4d;" u2="&#x2c;" k="82" />
-<hkern u1="&#x2013;" u2="&#x50f;" k="41" />
-<hkern u1="&#x2013;" u2="&#x50e;" k="82" />
-<hkern u1="&#x2013;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x2013;" u2="&#x4b4;" k="82" />
-<hkern u1="&#x2013;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x2013;" u2="&#x4ac;" k="82" />
-<hkern u1="&#x2013;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x2013;" u2="&#x4a0;" k="82" />
-<hkern u1="&#x2013;" u2="&#x44a;" k="41" />
-<hkern u1="&#x2013;" u2="&#x442;" k="41" />
-<hkern u1="&#x2013;" u2="&#x42a;" k="82" />
-<hkern u1="&#x2013;" u2="&#x422;" k="82" />
-<hkern u1="&#x2013;" u2="&#x40b;" k="82" />
-<hkern u1="&#x2013;" u2="&#x402;" k="82" />
-<hkern u1="&#x2013;" u2="&#x3a4;" k="82" />
-<hkern u1="&#x2013;" u2="&#x21a;" k="82" />
-<hkern u1="&#x2013;" u2="&#x164;" k="82" />
-<hkern u1="&#x2013;" u2="&#x162;" k="82" />
-<hkern u1="&#x2013;" u2="T" k="82" />
-<hkern u1="&#x2014;" u2="&#x50f;" k="41" />
-<hkern u1="&#x2014;" u2="&#x50e;" k="82" />
-<hkern u1="&#x2014;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x2014;" u2="&#x4b4;" k="82" />
-<hkern u1="&#x2014;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x2014;" u2="&#x4ac;" k="82" />
-<hkern u1="&#x2014;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x2014;" u2="&#x4a0;" k="82" />
-<hkern u1="&#x2014;" u2="&#x44a;" k="41" />
-<hkern u1="&#x2014;" u2="&#x442;" k="41" />
-<hkern u1="&#x2014;" u2="&#x42a;" k="82" />
-<hkern u1="&#x2014;" u2="&#x422;" k="82" />
-<hkern u1="&#x2014;" u2="&#x40b;" k="82" />
-<hkern u1="&#x2014;" u2="&#x402;" k="82" />
-<hkern u1="&#x2014;" u2="&#x3a4;" k="82" />
-<hkern u1="&#x2014;" u2="&#x21a;" k="82" />
-<hkern u1="&#x2014;" u2="&#x164;" k="82" />
-<hkern u1="&#x2014;" u2="&#x162;" k="82" />
-<hkern u1="&#x2014;" u2="T" k="82" />
-<hkern u1="&#x2015;" u2="&#x50f;" k="41" />
-<hkern u1="&#x2015;" u2="&#x50e;" k="82" />
-<hkern u1="&#x2015;" u2="&#x4b5;" k="41" />
-<hkern u1="&#x2015;" u2="&#x4b4;" k="82" />
-<hkern u1="&#x2015;" u2="&#x4ad;" k="41" />
-<hkern u1="&#x2015;" u2="&#x4ac;" k="82" />
-<hkern u1="&#x2015;" u2="&#x4a1;" k="41" />
-<hkern u1="&#x2015;" u2="&#x4a0;" k="82" />
-<hkern u1="&#x2015;" u2="&#x44a;" k="41" />
-<hkern u1="&#x2015;" u2="&#x442;" k="41" />
-<hkern u1="&#x2015;" u2="&#x42a;" k="82" />
-<hkern u1="&#x2015;" u2="&#x422;" k="82" />
-<hkern u1="&#x2015;" u2="&#x40b;" k="82" />
-<hkern u1="&#x2015;" u2="&#x402;" k="82" />
-<hkern u1="&#x2015;" u2="&#x3a4;" k="82" />
-<hkern u1="&#x2015;" u2="&#x21a;" k="82" />
-<hkern u1="&#x2015;" u2="&#x164;" k="82" />
-<hkern u1="&#x2015;" u2="&#x162;" k="82" />
-<hkern u1="&#x2015;" u2="T" k="82" />
-<hkern u1="&#x2018;" u2="&#x1ef8;" k="-20" />
-<hkern u1="&#x2018;" u2="&#x1ef6;" k="-20" />
-<hkern u1="&#x2018;" u2="&#x1ef4;" k="-20" />
-<hkern u1="&#x2018;" u2="&#x1ef2;" k="-20" />
-<hkern u1="&#x2018;" u2="&#x1ef1;" k="61" />
-<hkern u1="&#x2018;" u2="&#x1eef;" k="61" />
-<hkern u1="&#x2018;" u2="&#x1eed;" k="61" />
-<hkern u1="&#x2018;" u2="&#x1eeb;" k="61" />
-<hkern u1="&#x2018;" u2="&#x1ee9;" k="61" />
-<hkern u1="&#x2018;" u2="&#x1ee7;" k="61" />
-<hkern u1="&#x2018;" u2="&#x1ee5;" k="61" />
-<hkern u1="&#x2018;" u2="&#x1ee3;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1ee1;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1edf;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1edd;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1edb;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1ed9;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1ed7;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1ed5;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1ed1;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1ecf;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1ecd;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1ec7;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1ec5;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1ec3;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1ebf;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1ebd;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1ebb;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1eb9;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1eb7;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1eb6;" k="143" />
-<hkern u1="&#x2018;" u2="&#x1eb5;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1eb4;" k="143" />
-<hkern u1="&#x2018;" u2="&#x1eb3;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1eb2;" k="143" />
-<hkern u1="&#x2018;" u2="&#x1eb1;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1eb0;" k="143" />
-<hkern u1="&#x2018;" u2="&#x1eaf;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1eae;" k="143" />
-<hkern u1="&#x2018;" u2="&#x1ead;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1eac;" k="143" />
-<hkern u1="&#x2018;" u2="&#x1eab;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1eaa;" k="143" />
-<hkern u1="&#x2018;" u2="&#x1ea9;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1ea8;" k="143" />
-<hkern u1="&#x2018;" u2="&#x1ea6;" k="143" />
-<hkern u1="&#x2018;" u2="&#x1ea5;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1ea4;" k="143" />
-<hkern u1="&#x2018;" u2="&#x1ea3;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1ea2;" k="143" />
-<hkern u1="&#x2018;" u2="&#x1ea1;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1ea0;" k="143" />
-<hkern u1="&#x2018;" u2="&#x1e84;" k="-41" />
-<hkern u1="&#x2018;" u2="&#x1e82;" k="-41" />
-<hkern u1="&#x2018;" u2="&#x1e80;" k="-41" />
-<hkern u1="&#x2018;" u2="&#x1e3f;" k="61" />
-<hkern u1="&#x2018;" u2="&#x1e01;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1e00;" k="143" />
-<hkern u1="&#x2018;" u2="&#x513;" k="143" />
-<hkern u1="&#x2018;" u2="&#x512;" k="123" />
-<hkern u1="&#x2018;" u2="&#x511;" k="123" />
-<hkern u1="&#x2018;" u2="&#x50d;" k="123" />
-<hkern u1="&#x2018;" u2="&#x509;" k="143" />
-<hkern u1="&#x2018;" u2="&#x508;" k="123" />
-<hkern u1="&#x2018;" u2="&#x503;" k="123" />
-<hkern u1="&#x2018;" u2="&#x502;" k="143" />
-<hkern u1="&#x2018;" u2="&#x501;" k="123" />
-<hkern u1="&#x2018;" u2="&#x500;" k="143" />
-<hkern u1="&#x2018;" u2="&#x4eb;" k="123" />
-<hkern u1="&#x2018;" u2="&#x4e9;" k="123" />
-<hkern u1="&#x2018;" u2="&#x4e7;" k="123" />
-<hkern u1="&#x2018;" u2="&#x4db;" k="41" />
-<hkern u1="&#x2018;" u2="&#x4d9;" k="41" />
-<hkern u1="&#x2018;" u2="&#x4d7;" k="123" />
-<hkern u1="&#x2018;" u2="&#x4d5;" k="41" />
-<hkern u1="&#x2018;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x2018;" u2="&#x4d3;" k="41" />
-<hkern u1="&#x2018;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x2018;" u2="&#x4d1;" k="41" />
-<hkern u1="&#x2018;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x2018;" u2="&#x4c6;" k="143" />
-<hkern u1="&#x2018;" u2="&#x4c5;" k="123" />
-<hkern u1="&#x2018;" u2="&#x4ab;" k="123" />
-<hkern u1="&#x2018;" u2="&#x4a9;" k="123" />
-<hkern u1="&#x2018;" u2="&#x481;" k="123" />
-<hkern u1="&#x2018;" u2="&#x47d;" k="123" />
-<hkern u1="&#x2018;" u2="&#x47b;" k="123" />
-<hkern u1="&#x2018;" u2="&#x479;" k="123" />
-<hkern u1="&#x2018;" u2="&#x473;" k="123" />
-<hkern u1="&#x2018;" u2="&#x471;" k="20" />
-<hkern u1="&#x2018;" u2="&#x467;" k="143" />
-<hkern u1="&#x2018;" u2="&#x466;" k="143" />
-<hkern u1="&#x2018;" u2="&#x459;" k="143" />
-<hkern u1="&#x2018;" u2="&#x455;" k="61" />
-<hkern u1="&#x2018;" u2="&#x454;" k="123" />
-<hkern u1="&#x2018;" u2="&#x451;" k="123" />
-<hkern u1="&#x2018;" u2="&#x450;" k="123" />
-<hkern u1="&#x2018;" u2="&#x444;" k="123" />
-<hkern u1="&#x2018;" u2="&#x441;" k="123" />
-<hkern u1="&#x2018;" u2="&#x43e;" k="123" />
-<hkern u1="&#x2018;" u2="&#x43b;" k="143" />
-<hkern u1="&#x2018;" u2="&#x435;" k="123" />
-<hkern u1="&#x2018;" u2="&#x434;" k="143" />
-<hkern u1="&#x2018;" u2="&#x430;" k="41" />
-<hkern u1="&#x2018;" u2="&#x41b;" k="123" />
-<hkern u1="&#x2018;" u2="&#x414;" k="123" />
-<hkern u1="&#x2018;" u2="&#x410;" k="143" />
-<hkern u1="&#x2018;" u2="&#x409;" k="123" />
-<hkern u1="&#x2018;" u2="&#x3cc;" k="82" />
-<hkern u1="&#x2018;" u2="&#x3c6;" k="82" />
-<hkern u1="&#x2018;" u2="&#x3c3;" k="82" />
-<hkern u1="&#x2018;" u2="&#x3c2;" k="82" />
-<hkern u1="&#x2018;" u2="&#x3c1;" k="61" />
-<hkern u1="&#x2018;" u2="&#x3bf;" k="82" />
-<hkern u1="&#x2018;" u2="&#x3bc;" k="41" />
-<hkern u1="&#x2018;" u2="&#x3ba;" k="41" />
-<hkern u1="&#x2018;" u2="&#x3b7;" k="41" />
-<hkern u1="&#x2018;" u2="&#x3b6;" k="41" />
-<hkern u1="&#x2018;" u2="&#x3b5;" k="41" />
-<hkern u1="&#x2018;" u2="&#x3b4;" k="61" />
-<hkern u1="&#x2018;" u2="&#x3b1;" k="82" />
-<hkern u1="&#x2018;" u2="&#x3ae;" k="41" />
-<hkern u1="&#x2018;" u2="&#x3ad;" k="41" />
-<hkern u1="&#x2018;" u2="&#x3ac;" k="82" />
-<hkern u1="&#x2018;" u2="&#x39b;" k="143" />
-<hkern u1="&#x2018;" u2="&#x394;" k="143" />
-<hkern u1="&#x2018;" u2="&#x391;" k="143" />
-<hkern u1="&#x2018;" u2="&#x386;" k="143" />
-<hkern u1="&#x2018;" u2="&#x21a;" k="-41" />
-<hkern u1="&#x2018;" u2="&#x219;" k="61" />
-<hkern u1="&#x2018;" u2="&#x1ff;" k="123" />
-<hkern u1="&#x2018;" u2="&#x1fd;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1fb;" k="82" />
-<hkern u1="&#x2018;" u2="&#x1fa;" k="143" />
-<hkern u1="&#x2018;" u2="&#x1b0;" k="61" />
-<hkern u1="&#x2018;" u2="&#x1a1;" k="123" />
-<hkern u1="&#x2018;" u2="&#x178;" k="-20" />
-<hkern u1="&#x2018;" u2="&#x176;" k="-20" />
-<hkern u1="&#x2018;" u2="&#x174;" k="-41" />
-<hkern u1="&#x2018;" u2="&#x173;" k="61" />
-<hkern u1="&#x2018;" u2="&#x171;" k="61" />
-<hkern u1="&#x2018;" u2="&#x16f;" k="61" />
-<hkern u1="&#x2018;" u2="&#x16d;" k="61" />
-<hkern u1="&#x2018;" u2="&#x16b;" k="61" />
-<hkern u1="&#x2018;" u2="&#x169;" k="61" />
-<hkern u1="&#x2018;" u2="&#x164;" k="-41" />
-<hkern u1="&#x2018;" u2="&#x162;" k="-41" />
-<hkern u1="&#x2018;" u2="&#x15f;" k="61" />
-<hkern u1="&#x2018;" u2="&#x15b;" k="61" />
-<hkern u1="&#x2018;" u2="&#x157;" k="61" />
-<hkern u1="&#x2018;" u2="&#x155;" k="61" />
-<hkern u1="&#x2018;" u2="&#x153;" k="123" />
-<hkern u1="&#x2018;" u2="&#x151;" k="123" />
-<hkern u1="&#x2018;" u2="&#x14f;" k="123" />
-<hkern u1="&#x2018;" u2="&#x14d;" k="123" />
-<hkern u1="&#x2018;" u2="&#x14b;" k="61" />
-<hkern u1="&#x2018;" u2="&#x146;" k="61" />
-<hkern u1="&#x2018;" u2="&#x144;" k="61" />
-<hkern u1="&#x2018;" u2="&#x138;" k="61" />
-<hkern u1="&#x2018;" u2="&#x123;" k="61" />
-<hkern u1="&#x2018;" u2="&#x121;" k="61" />
-<hkern u1="&#x2018;" u2="&#x11f;" k="61" />
-<hkern u1="&#x2018;" u2="&#x11d;" k="61" />
-<hkern u1="&#x2018;" u2="&#x11b;" k="123" />
-<hkern u1="&#x2018;" u2="&#x119;" k="123" />
-<hkern u1="&#x2018;" u2="&#x117;" k="123" />
-<hkern u1="&#x2018;" u2="&#x115;" k="123" />
-<hkern u1="&#x2018;" u2="&#x113;" k="123" />
-<hkern u1="&#x2018;" u2="&#x111;" k="123" />
-<hkern u1="&#x2018;" u2="&#x10f;" k="123" />
-<hkern u1="&#x2018;" u2="&#x10d;" k="123" />
-<hkern u1="&#x2018;" u2="&#x10b;" k="123" />
-<hkern u1="&#x2018;" u2="&#x109;" k="123" />
-<hkern u1="&#x2018;" u2="&#x107;" k="123" />
-<hkern u1="&#x2018;" u2="&#x105;" k="82" />
-<hkern u1="&#x2018;" u2="&#x104;" k="143" />
-<hkern u1="&#x2018;" u2="&#x103;" k="82" />
-<hkern u1="&#x2018;" u2="&#x102;" k="143" />
-<hkern u1="&#x2018;" u2="&#x101;" k="82" />
-<hkern u1="&#x2018;" u2="&#x100;" k="143" />
-<hkern u1="&#x2018;" u2="&#xfc;" k="61" />
-<hkern u1="&#x2018;" u2="&#xfb;" k="61" />
-<hkern u1="&#x2018;" u2="&#xfa;" k="61" />
-<hkern u1="&#x2018;" u2="&#xf9;" k="61" />
-<hkern u1="&#x2018;" u2="&#xf8;" k="123" />
-<hkern u1="&#x2018;" u2="&#xf6;" k="123" />
-<hkern u1="&#x2018;" u2="&#xf5;" k="123" />
-<hkern u1="&#x2018;" u2="&#xf4;" k="123" />
-<hkern u1="&#x2018;" u2="&#xf3;" k="123" />
-<hkern u1="&#x2018;" u2="&#xf2;" k="123" />
-<hkern u1="&#x2018;" u2="&#xeb;" k="123" />
-<hkern u1="&#x2018;" u2="&#xea;" k="123" />
-<hkern u1="&#x2018;" u2="&#xe9;" k="123" />
-<hkern u1="&#x2018;" u2="&#xe8;" k="123" />
-<hkern u1="&#x2018;" u2="&#xe7;" k="123" />
-<hkern u1="&#x2018;" u2="&#xe6;" k="82" />
-<hkern u1="&#x2018;" u2="&#xe5;" k="82" />
-<hkern u1="&#x2018;" u2="&#xe4;" k="82" />
-<hkern u1="&#x2018;" u2="&#xe3;" k="82" />
-<hkern u1="&#x2018;" u2="&#xe2;" k="82" />
-<hkern u1="&#x2018;" u2="&#xe1;" k="82" />
-<hkern u1="&#x2018;" u2="&#xe0;" k="123" />
-<hkern u1="&#x2018;" u2="&#xdd;" k="-20" />
-<hkern u1="&#x2018;" u2="&#xc5;" k="143" />
-<hkern u1="&#x2018;" u2="&#xc4;" k="143" />
-<hkern u1="&#x2018;" u2="&#xc3;" k="143" />
-<hkern u1="&#x2018;" u2="&#xc2;" k="143" />
-<hkern u1="&#x2018;" u2="&#xc1;" k="143" />
-<hkern u1="&#x2018;" u2="&#xc0;" k="143" />
-<hkern u1="&#x2018;" u2="u" k="61" />
-<hkern u1="&#x2018;" u2="s" k="61" />
-<hkern u1="&#x2018;" u2="r" k="61" />
-<hkern u1="&#x2018;" u2="q" k="123" />
-<hkern u1="&#x2018;" u2="p" k="61" />
-<hkern u1="&#x2018;" u2="o" k="123" />
-<hkern u1="&#x2018;" u2="n" k="61" />
-<hkern u1="&#x2018;" u2="m" k="61" />
-<hkern u1="&#x2018;" u2="g" k="61" />
-<hkern u1="&#x2018;" u2="e" k="123" />
-<hkern u1="&#x2018;" u2="d" k="123" />
-<hkern u1="&#x2018;" u2="c" k="123" />
-<hkern u1="&#x2018;" u2="a" k="82" />
-<hkern u1="&#x2018;" u2="Y" k="-20" />
-<hkern u1="&#x2018;" u2="W" k="-41" />
-<hkern u1="&#x2018;" u2="V" k="-41" />
-<hkern u1="&#x2018;" u2="T" k="-41" />
-<hkern u1="&#x2018;" u2="A" k="143" />
-<hkern u1="&#x2019;" u2="&#x1ef8;" k="-20" />
-<hkern u1="&#x2019;" u2="&#x1ef6;" k="-20" />
-<hkern u1="&#x2019;" u2="&#x1ef4;" k="-20" />
-<hkern u1="&#x2019;" u2="&#x1ef2;" k="-20" />
-<hkern u1="&#x2019;" u2="&#x1ef1;" k="61" />
-<hkern u1="&#x2019;" u2="&#x1eef;" k="61" />
-<hkern u1="&#x2019;" u2="&#x1eed;" k="61" />
-<hkern u1="&#x2019;" u2="&#x1eeb;" k="61" />
-<hkern u1="&#x2019;" u2="&#x1ee9;" k="61" />
-<hkern u1="&#x2019;" u2="&#x1ee7;" k="61" />
-<hkern u1="&#x2019;" u2="&#x1ee5;" k="61" />
-<hkern u1="&#x2019;" u2="&#x1ee3;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1ee1;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1edf;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1edd;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1edb;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1ed9;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1ed7;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1ed5;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1ed1;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1ecf;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1ecd;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1ec7;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1ec5;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1ec3;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1ebf;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1ebd;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1ebb;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1eb9;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1eb7;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1eb6;" k="143" />
-<hkern u1="&#x2019;" u2="&#x1eb5;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1eb4;" k="143" />
-<hkern u1="&#x2019;" u2="&#x1eb3;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1eb2;" k="143" />
-<hkern u1="&#x2019;" u2="&#x1eb1;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1eb0;" k="143" />
-<hkern u1="&#x2019;" u2="&#x1eaf;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1eae;" k="143" />
-<hkern u1="&#x2019;" u2="&#x1ead;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1eac;" k="143" />
-<hkern u1="&#x2019;" u2="&#x1eab;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1eaa;" k="143" />
-<hkern u1="&#x2019;" u2="&#x1ea9;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1ea8;" k="143" />
-<hkern u1="&#x2019;" u2="&#x1ea6;" k="143" />
-<hkern u1="&#x2019;" u2="&#x1ea5;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1ea4;" k="143" />
-<hkern u1="&#x2019;" u2="&#x1ea3;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1ea2;" k="143" />
-<hkern u1="&#x2019;" u2="&#x1ea1;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1ea0;" k="143" />
-<hkern u1="&#x2019;" u2="&#x1e84;" k="-41" />
-<hkern u1="&#x2019;" u2="&#x1e82;" k="-41" />
-<hkern u1="&#x2019;" u2="&#x1e80;" k="-41" />
-<hkern u1="&#x2019;" u2="&#x1e3f;" k="61" />
-<hkern u1="&#x2019;" u2="&#x1e01;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1e00;" k="143" />
-<hkern u1="&#x2019;" u2="&#x513;" k="143" />
-<hkern u1="&#x2019;" u2="&#x512;" k="123" />
-<hkern u1="&#x2019;" u2="&#x511;" k="123" />
-<hkern u1="&#x2019;" u2="&#x50d;" k="123" />
-<hkern u1="&#x2019;" u2="&#x509;" k="143" />
-<hkern u1="&#x2019;" u2="&#x508;" k="123" />
-<hkern u1="&#x2019;" u2="&#x503;" k="123" />
-<hkern u1="&#x2019;" u2="&#x502;" k="143" />
-<hkern u1="&#x2019;" u2="&#x501;" k="123" />
-<hkern u1="&#x2019;" u2="&#x500;" k="143" />
-<hkern u1="&#x2019;" u2="&#x4eb;" k="123" />
-<hkern u1="&#x2019;" u2="&#x4e9;" k="123" />
-<hkern u1="&#x2019;" u2="&#x4e7;" k="123" />
-<hkern u1="&#x2019;" u2="&#x4db;" k="41" />
-<hkern u1="&#x2019;" u2="&#x4d9;" k="41" />
-<hkern u1="&#x2019;" u2="&#x4d7;" k="123" />
-<hkern u1="&#x2019;" u2="&#x4d5;" k="41" />
-<hkern u1="&#x2019;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x2019;" u2="&#x4d3;" k="41" />
-<hkern u1="&#x2019;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x2019;" u2="&#x4d1;" k="41" />
-<hkern u1="&#x2019;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x2019;" u2="&#x4c6;" k="143" />
-<hkern u1="&#x2019;" u2="&#x4c5;" k="123" />
-<hkern u1="&#x2019;" u2="&#x4ab;" k="123" />
-<hkern u1="&#x2019;" u2="&#x4a9;" k="123" />
-<hkern u1="&#x2019;" u2="&#x481;" k="123" />
-<hkern u1="&#x2019;" u2="&#x47d;" k="123" />
-<hkern u1="&#x2019;" u2="&#x47b;" k="123" />
-<hkern u1="&#x2019;" u2="&#x479;" k="123" />
-<hkern u1="&#x2019;" u2="&#x473;" k="123" />
-<hkern u1="&#x2019;" u2="&#x471;" k="20" />
-<hkern u1="&#x2019;" u2="&#x467;" k="143" />
-<hkern u1="&#x2019;" u2="&#x466;" k="143" />
-<hkern u1="&#x2019;" u2="&#x459;" k="143" />
-<hkern u1="&#x2019;" u2="&#x455;" k="61" />
-<hkern u1="&#x2019;" u2="&#x454;" k="123" />
-<hkern u1="&#x2019;" u2="&#x451;" k="123" />
-<hkern u1="&#x2019;" u2="&#x450;" k="123" />
-<hkern u1="&#x2019;" u2="&#x444;" k="123" />
-<hkern u1="&#x2019;" u2="&#x441;" k="123" />
-<hkern u1="&#x2019;" u2="&#x43e;" k="123" />
-<hkern u1="&#x2019;" u2="&#x43b;" k="143" />
-<hkern u1="&#x2019;" u2="&#x435;" k="123" />
-<hkern u1="&#x2019;" u2="&#x434;" k="143" />
-<hkern u1="&#x2019;" u2="&#x430;" k="41" />
-<hkern u1="&#x2019;" u2="&#x41b;" k="123" />
-<hkern u1="&#x2019;" u2="&#x414;" k="123" />
-<hkern u1="&#x2019;" u2="&#x410;" k="143" />
-<hkern u1="&#x2019;" u2="&#x409;" k="123" />
-<hkern u1="&#x2019;" u2="&#x3cc;" k="82" />
-<hkern u1="&#x2019;" u2="&#x3c6;" k="82" />
-<hkern u1="&#x2019;" u2="&#x3c3;" k="82" />
-<hkern u1="&#x2019;" u2="&#x3c2;" k="82" />
-<hkern u1="&#x2019;" u2="&#x3c1;" k="61" />
-<hkern u1="&#x2019;" u2="&#x3bf;" k="82" />
-<hkern u1="&#x2019;" u2="&#x3bc;" k="41" />
-<hkern u1="&#x2019;" u2="&#x3ba;" k="41" />
-<hkern u1="&#x2019;" u2="&#x3b7;" k="41" />
-<hkern u1="&#x2019;" u2="&#x3b6;" k="41" />
-<hkern u1="&#x2019;" u2="&#x3b5;" k="41" />
-<hkern u1="&#x2019;" u2="&#x3b4;" k="61" />
-<hkern u1="&#x2019;" u2="&#x3b1;" k="82" />
-<hkern u1="&#x2019;" u2="&#x3ae;" k="41" />
-<hkern u1="&#x2019;" u2="&#x3ad;" k="41" />
-<hkern u1="&#x2019;" u2="&#x3ac;" k="82" />
-<hkern u1="&#x2019;" u2="&#x39b;" k="143" />
-<hkern u1="&#x2019;" u2="&#x394;" k="143" />
-<hkern u1="&#x2019;" u2="&#x391;" k="143" />
-<hkern u1="&#x2019;" u2="&#x386;" k="143" />
-<hkern u1="&#x2019;" u2="&#x21a;" k="-41" />
-<hkern u1="&#x2019;" u2="&#x219;" k="61" />
-<hkern u1="&#x2019;" u2="&#x1ff;" k="123" />
-<hkern u1="&#x2019;" u2="&#x1fd;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1fb;" k="82" />
-<hkern u1="&#x2019;" u2="&#x1fa;" k="143" />
-<hkern u1="&#x2019;" u2="&#x1b0;" k="61" />
-<hkern u1="&#x2019;" u2="&#x1a1;" k="123" />
-<hkern u1="&#x2019;" u2="&#x178;" k="-20" />
-<hkern u1="&#x2019;" u2="&#x176;" k="-20" />
-<hkern u1="&#x2019;" u2="&#x174;" k="-41" />
-<hkern u1="&#x2019;" u2="&#x173;" k="61" />
-<hkern u1="&#x2019;" u2="&#x171;" k="61" />
-<hkern u1="&#x2019;" u2="&#x16f;" k="61" />
-<hkern u1="&#x2019;" u2="&#x16d;" k="61" />
-<hkern u1="&#x2019;" u2="&#x16b;" k="61" />
-<hkern u1="&#x2019;" u2="&#x169;" k="61" />
-<hkern u1="&#x2019;" u2="&#x164;" k="-41" />
-<hkern u1="&#x2019;" u2="&#x162;" k="-41" />
-<hkern u1="&#x2019;" u2="&#x15f;" k="61" />
-<hkern u1="&#x2019;" u2="&#x15b;" k="61" />
-<hkern u1="&#x2019;" u2="&#x157;" k="61" />
-<hkern u1="&#x2019;" u2="&#x155;" k="61" />
-<hkern u1="&#x2019;" u2="&#x153;" k="123" />
-<hkern u1="&#x2019;" u2="&#x151;" k="123" />
-<hkern u1="&#x2019;" u2="&#x14f;" k="123" />
-<hkern u1="&#x2019;" u2="&#x14d;" k="123" />
-<hkern u1="&#x2019;" u2="&#x14b;" k="61" />
-<hkern u1="&#x2019;" u2="&#x146;" k="61" />
-<hkern u1="&#x2019;" u2="&#x144;" k="61" />
-<hkern u1="&#x2019;" u2="&#x138;" k="61" />
-<hkern u1="&#x2019;" u2="&#x123;" k="61" />
-<hkern u1="&#x2019;" u2="&#x121;" k="61" />
-<hkern u1="&#x2019;" u2="&#x11f;" k="61" />
-<hkern u1="&#x2019;" u2="&#x11d;" k="61" />
-<hkern u1="&#x2019;" u2="&#x11b;" k="123" />
-<hkern u1="&#x2019;" u2="&#x119;" k="123" />
-<hkern u1="&#x2019;" u2="&#x117;" k="123" />
-<hkern u1="&#x2019;" u2="&#x115;" k="123" />
-<hkern u1="&#x2019;" u2="&#x113;" k="123" />
-<hkern u1="&#x2019;" u2="&#x111;" k="123" />
-<hkern u1="&#x2019;" u2="&#x10f;" k="123" />
-<hkern u1="&#x2019;" u2="&#x10d;" k="123" />
-<hkern u1="&#x2019;" u2="&#x10b;" k="123" />
-<hkern u1="&#x2019;" u2="&#x109;" k="123" />
-<hkern u1="&#x2019;" u2="&#x107;" k="123" />
-<hkern u1="&#x2019;" u2="&#x105;" k="82" />
-<hkern u1="&#x2019;" u2="&#x104;" k="143" />
-<hkern u1="&#x2019;" u2="&#x103;" k="82" />
-<hkern u1="&#x2019;" u2="&#x102;" k="143" />
-<hkern u1="&#x2019;" u2="&#x101;" k="82" />
-<hkern u1="&#x2019;" u2="&#x100;" k="143" />
-<hkern u1="&#x2019;" u2="&#xfc;" k="61" />
-<hkern u1="&#x2019;" u2="&#xfb;" k="61" />
-<hkern u1="&#x2019;" u2="&#xfa;" k="61" />
-<hkern u1="&#x2019;" u2="&#xf9;" k="61" />
-<hkern u1="&#x2019;" u2="&#xf8;" k="123" />
-<hkern u1="&#x2019;" u2="&#xf6;" k="123" />
-<hkern u1="&#x2019;" u2="&#xf5;" k="123" />
-<hkern u1="&#x2019;" u2="&#xf4;" k="123" />
-<hkern u1="&#x2019;" u2="&#xf3;" k="123" />
-<hkern u1="&#x2019;" u2="&#xf2;" k="123" />
-<hkern u1="&#x2019;" u2="&#xeb;" k="123" />
-<hkern u1="&#x2019;" u2="&#xea;" k="123" />
-<hkern u1="&#x2019;" u2="&#xe9;" k="123" />
-<hkern u1="&#x2019;" u2="&#xe8;" k="123" />
-<hkern u1="&#x2019;" u2="&#xe7;" k="123" />
-<hkern u1="&#x2019;" u2="&#xe6;" k="82" />
-<hkern u1="&#x2019;" u2="&#xe5;" k="82" />
-<hkern u1="&#x2019;" u2="&#xe4;" k="82" />
-<hkern u1="&#x2019;" u2="&#xe3;" k="82" />
-<hkern u1="&#x2019;" u2="&#xe2;" k="82" />
-<hkern u1="&#x2019;" u2="&#xe1;" k="82" />
-<hkern u1="&#x2019;" u2="&#xe0;" k="123" />
-<hkern u1="&#x2019;" u2="&#xdd;" k="-20" />
-<hkern u1="&#x2019;" u2="&#xc5;" k="143" />
-<hkern u1="&#x2019;" u2="&#xc4;" k="143" />
-<hkern u1="&#x2019;" u2="&#xc3;" k="143" />
-<hkern u1="&#x2019;" u2="&#xc2;" k="143" />
-<hkern u1="&#x2019;" u2="&#xc1;" k="143" />
-<hkern u1="&#x2019;" u2="&#xc0;" k="143" />
-<hkern u1="&#x2019;" u2="u" k="61" />
-<hkern u1="&#x2019;" u2="s" k="61" />
-<hkern u1="&#x2019;" u2="r" k="61" />
-<hkern u1="&#x2019;" u2="q" k="123" />
-<hkern u1="&#x2019;" u2="p" k="61" />
-<hkern u1="&#x2019;" u2="o" k="123" />
-<hkern u1="&#x2019;" u2="n" k="61" />
-<hkern u1="&#x2019;" u2="m" k="61" />
-<hkern u1="&#x2019;" u2="g" k="61" />
-<hkern u1="&#x2019;" u2="e" k="123" />
-<hkern u1="&#x2019;" u2="d" k="123" />
-<hkern u1="&#x2019;" u2="c" k="123" />
-<hkern u1="&#x2019;" u2="a" k="82" />
-<hkern u1="&#x2019;" u2="Y" k="-20" />
-<hkern u1="&#x2019;" u2="W" k="-41" />
-<hkern u1="&#x2019;" u2="V" k="-41" />
-<hkern u1="&#x2019;" u2="T" k="-41" />
-<hkern u1="&#x2019;" u2="A" k="143" />
-<hkern u1="&#x201a;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x201a;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x201a;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x201a;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x201a;" u2="&#x1ef0;" k="41" />
-<hkern u1="&#x201a;" u2="&#x1eee;" k="41" />
-<hkern u1="&#x201a;" u2="&#x1eec;" k="41" />
-<hkern u1="&#x201a;" u2="&#x1eea;" k="41" />
-<hkern u1="&#x201a;" u2="&#x1ee8;" k="41" />
-<hkern u1="&#x201a;" u2="&#x1ee6;" k="41" />
-<hkern u1="&#x201a;" u2="&#x1ee4;" k="41" />
-<hkern u1="&#x201a;" u2="&#x1ee2;" k="102" />
-<hkern u1="&#x201a;" u2="&#x1ee0;" k="102" />
-<hkern u1="&#x201a;" u2="&#x1ede;" k="102" />
-<hkern u1="&#x201a;" u2="&#x1edc;" k="102" />
-<hkern u1="&#x201a;" u2="&#x1eda;" k="102" />
-<hkern u1="&#x201a;" u2="&#x1ed8;" k="102" />
-<hkern u1="&#x201a;" u2="&#x1ed6;" k="102" />
-<hkern u1="&#x201a;" u2="&#x1ed4;" k="102" />
-<hkern u1="&#x201a;" u2="&#x1ed2;" k="102" />
-<hkern u1="&#x201a;" u2="&#x1ed0;" k="102" />
-<hkern u1="&#x201a;" u2="&#x1ece;" k="102" />
-<hkern u1="&#x201a;" u2="&#x1ecc;" k="102" />
-<hkern u1="&#x201a;" u2="&#x1e84;" k="123" />
-<hkern u1="&#x201a;" u2="&#x1e82;" k="123" />
-<hkern u1="&#x201a;" u2="&#x1e80;" k="123" />
-<hkern u1="&#x201a;" u2="&#x50f;" k="102" />
-<hkern u1="&#x201a;" u2="&#x50e;" k="143" />
-<hkern u1="&#x201a;" u2="&#x50c;" k="102" />
-<hkern u1="&#x201a;" u2="&#x507;" k="102" />
-<hkern u1="&#x201a;" u2="&#x506;" k="123" />
-<hkern u1="&#x201a;" u2="&#x505;" k="102" />
-<hkern u1="&#x201a;" u2="&#x504;" k="123" />
-<hkern u1="&#x201a;" u2="&#x4f5;" k="123" />
-<hkern u1="&#x201a;" u2="&#x4f4;" k="164" />
-<hkern u1="&#x201a;" u2="&#x4ea;" k="102" />
-<hkern u1="&#x201a;" u2="&#x4e8;" k="102" />
-<hkern u1="&#x201a;" u2="&#x4e6;" k="102" />
-<hkern u1="&#x201a;" u2="&#x4cc;" k="123" />
-<hkern u1="&#x201a;" u2="&#x4cb;" k="164" />
-<hkern u1="&#x201a;" u2="&#x4be;" k="123" />
-<hkern u1="&#x201a;" u2="&#x4bc;" k="123" />
-<hkern u1="&#x201a;" u2="&#x4b9;" k="123" />
-<hkern u1="&#x201a;" u2="&#x4b8;" k="164" />
-<hkern u1="&#x201a;" u2="&#x4b7;" k="123" />
-<hkern u1="&#x201a;" u2="&#x4b6;" k="164" />
-<hkern u1="&#x201a;" u2="&#x4b5;" k="102" />
-<hkern u1="&#x201a;" u2="&#x4b4;" k="143" />
-<hkern u1="&#x201a;" u2="&#x4b0;" k="123" />
-<hkern u1="&#x201a;" u2="&#x4ae;" k="123" />
-<hkern u1="&#x201a;" u2="&#x4ad;" k="102" />
-<hkern u1="&#x201a;" u2="&#x4ac;" k="143" />
-<hkern u1="&#x201a;" u2="&#x4aa;" k="102" />
-<hkern u1="&#x201a;" u2="&#x4a8;" k="102" />
-<hkern u1="&#x201a;" u2="&#x4a1;" k="102" />
-<hkern u1="&#x201a;" u2="&#x4a0;" k="143" />
-<hkern u1="&#x201a;" u2="&#x480;" k="102" />
-<hkern u1="&#x201a;" u2="&#x47e;" k="102" />
-<hkern u1="&#x201a;" u2="&#x47c;" k="102" />
-<hkern u1="&#x201a;" u2="&#x47a;" k="102" />
-<hkern u1="&#x201a;" u2="&#x478;" k="102" />
-<hkern u1="&#x201a;" u2="&#x476;" k="123" />
-<hkern u1="&#x201a;" u2="&#x474;" k="123" />
-<hkern u1="&#x201a;" u2="&#x472;" k="102" />
-<hkern u1="&#x201a;" u2="&#x470;" k="164" />
-<hkern u1="&#x201a;" u2="&#x460;" k="102" />
-<hkern u1="&#x201a;" u2="&#x44a;" k="102" />
-<hkern u1="&#x201a;" u2="&#x447;" k="123" />
-<hkern u1="&#x201a;" u2="&#x442;" k="102" />
-<hkern u1="&#x201a;" u2="&#x42a;" k="143" />
-<hkern u1="&#x201a;" u2="&#x427;" k="164" />
-<hkern u1="&#x201a;" u2="&#x424;" k="82" />
-<hkern u1="&#x201a;" u2="&#x422;" k="143" />
-<hkern u1="&#x201a;" u2="&#x421;" k="102" />
-<hkern u1="&#x201a;" u2="&#x41e;" k="102" />
-<hkern u1="&#x201a;" u2="&#x40b;" k="143" />
-<hkern u1="&#x201a;" u2="&#x404;" k="102" />
-<hkern u1="&#x201a;" u2="&#x402;" k="143" />
-<hkern u1="&#x201a;" u2="&#x3d2;" k="123" />
-<hkern u1="&#x201a;" u2="&#x3b8;" k="41" />
-<hkern u1="&#x201a;" u2="&#x3ab;" k="123" />
-<hkern u1="&#x201a;" u2="&#x3a8;" k="123" />
-<hkern u1="&#x201a;" u2="&#x3a6;" k="102" />
-<hkern u1="&#x201a;" u2="&#x3a5;" k="123" />
-<hkern u1="&#x201a;" u2="&#x3a4;" k="143" />
-<hkern u1="&#x201a;" u2="&#x39f;" k="82" />
-<hkern u1="&#x201a;" u2="&#x398;" k="82" />
-<hkern u1="&#x201a;" u2="&#x21a;" k="143" />
-<hkern u1="&#x201a;" u2="&#x1fe;" k="102" />
-<hkern u1="&#x201a;" u2="&#x1af;" k="41" />
-<hkern u1="&#x201a;" u2="&#x1a0;" k="102" />
-<hkern u1="&#x201a;" u2="&#x178;" k="123" />
-<hkern u1="&#x201a;" u2="&#x176;" k="123" />
-<hkern u1="&#x201a;" u2="&#x174;" k="123" />
-<hkern u1="&#x201a;" u2="&#x172;" k="41" />
-<hkern u1="&#x201a;" u2="&#x170;" k="41" />
-<hkern u1="&#x201a;" u2="&#x16e;" k="41" />
-<hkern u1="&#x201a;" u2="&#x16c;" k="41" />
-<hkern u1="&#x201a;" u2="&#x16a;" k="41" />
-<hkern u1="&#x201a;" u2="&#x168;" k="41" />
-<hkern u1="&#x201a;" u2="&#x164;" k="143" />
-<hkern u1="&#x201a;" u2="&#x162;" k="143" />
-<hkern u1="&#x201a;" u2="&#x152;" k="102" />
-<hkern u1="&#x201a;" u2="&#x150;" k="102" />
-<hkern u1="&#x201a;" u2="&#x14e;" k="102" />
-<hkern u1="&#x201a;" u2="&#x14c;" k="102" />
-<hkern u1="&#x201a;" u2="&#x122;" k="102" />
-<hkern u1="&#x201a;" u2="&#x120;" k="102" />
-<hkern u1="&#x201a;" u2="&#x11e;" k="102" />
-<hkern u1="&#x201a;" u2="&#x11c;" k="102" />
-<hkern u1="&#x201a;" u2="&#x10c;" k="102" />
-<hkern u1="&#x201a;" u2="&#x10a;" k="102" />
-<hkern u1="&#x201a;" u2="&#x108;" k="102" />
-<hkern u1="&#x201a;" u2="&#x106;" k="102" />
-<hkern u1="&#x201a;" u2="&#xdd;" k="123" />
-<hkern u1="&#x201a;" u2="&#xdc;" k="41" />
-<hkern u1="&#x201a;" u2="&#xdb;" k="41" />
-<hkern u1="&#x201a;" u2="&#xda;" k="41" />
-<hkern u1="&#x201a;" u2="&#xd9;" k="41" />
-<hkern u1="&#x201a;" u2="&#xd8;" k="102" />
-<hkern u1="&#x201a;" u2="&#xd6;" k="102" />
-<hkern u1="&#x201a;" u2="&#xd5;" k="102" />
-<hkern u1="&#x201a;" u2="&#xd4;" k="102" />
-<hkern u1="&#x201a;" u2="&#xd3;" k="102" />
-<hkern u1="&#x201a;" u2="&#xd2;" k="102" />
-<hkern u1="&#x201a;" u2="&#xc7;" k="102" />
-<hkern u1="&#x201a;" u2="Y" k="123" />
-<hkern u1="&#x201a;" u2="W" k="123" />
-<hkern u1="&#x201a;" u2="V" k="123" />
-<hkern u1="&#x201a;" u2="U" k="41" />
-<hkern u1="&#x201a;" u2="T" k="143" />
-<hkern u1="&#x201a;" u2="Q" k="102" />
-<hkern u1="&#x201a;" u2="O" k="102" />
-<hkern u1="&#x201a;" u2="G" k="102" />
-<hkern u1="&#x201a;" u2="C" k="102" />
-<hkern u1="&#x201c;" u2="&#x1ef8;" k="-20" />
-<hkern u1="&#x201c;" u2="&#x1ef6;" k="-20" />
-<hkern u1="&#x201c;" u2="&#x1ef4;" k="-20" />
-<hkern u1="&#x201c;" u2="&#x1ef2;" k="-20" />
-<hkern u1="&#x201c;" u2="&#x1ef1;" k="61" />
-<hkern u1="&#x201c;" u2="&#x1eef;" k="61" />
-<hkern u1="&#x201c;" u2="&#x1eed;" k="61" />
-<hkern u1="&#x201c;" u2="&#x1eeb;" k="61" />
-<hkern u1="&#x201c;" u2="&#x1ee9;" k="61" />
-<hkern u1="&#x201c;" u2="&#x1ee7;" k="61" />
-<hkern u1="&#x201c;" u2="&#x1ee5;" k="61" />
-<hkern u1="&#x201c;" u2="&#x1ee3;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1ee1;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1edf;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1edd;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1edb;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1ed9;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1ed7;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1ed5;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1ed1;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1ecf;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1ecd;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1ec7;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1ec5;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1ec3;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1ebf;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1ebd;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1ebb;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1eb9;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1eb7;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1eb6;" k="143" />
-<hkern u1="&#x201c;" u2="&#x1eb5;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1eb4;" k="143" />
-<hkern u1="&#x201c;" u2="&#x1eb3;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1eb2;" k="143" />
-<hkern u1="&#x201c;" u2="&#x1eb1;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1eb0;" k="143" />
-<hkern u1="&#x201c;" u2="&#x1eaf;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1eae;" k="143" />
-<hkern u1="&#x201c;" u2="&#x1ead;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1eac;" k="143" />
-<hkern u1="&#x201c;" u2="&#x1eab;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1eaa;" k="143" />
-<hkern u1="&#x201c;" u2="&#x1ea9;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1ea8;" k="143" />
-<hkern u1="&#x201c;" u2="&#x1ea6;" k="143" />
-<hkern u1="&#x201c;" u2="&#x1ea5;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1ea4;" k="143" />
-<hkern u1="&#x201c;" u2="&#x1ea3;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1ea2;" k="143" />
-<hkern u1="&#x201c;" u2="&#x1ea1;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1ea0;" k="143" />
-<hkern u1="&#x201c;" u2="&#x1e84;" k="-41" />
-<hkern u1="&#x201c;" u2="&#x1e82;" k="-41" />
-<hkern u1="&#x201c;" u2="&#x1e80;" k="-41" />
-<hkern u1="&#x201c;" u2="&#x1e3f;" k="61" />
-<hkern u1="&#x201c;" u2="&#x1e01;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1e00;" k="143" />
-<hkern u1="&#x201c;" u2="&#x513;" k="143" />
-<hkern u1="&#x201c;" u2="&#x512;" k="123" />
-<hkern u1="&#x201c;" u2="&#x511;" k="123" />
-<hkern u1="&#x201c;" u2="&#x50d;" k="123" />
-<hkern u1="&#x201c;" u2="&#x509;" k="143" />
-<hkern u1="&#x201c;" u2="&#x508;" k="123" />
-<hkern u1="&#x201c;" u2="&#x503;" k="123" />
-<hkern u1="&#x201c;" u2="&#x502;" k="143" />
-<hkern u1="&#x201c;" u2="&#x501;" k="123" />
-<hkern u1="&#x201c;" u2="&#x500;" k="143" />
-<hkern u1="&#x201c;" u2="&#x4eb;" k="123" />
-<hkern u1="&#x201c;" u2="&#x4e9;" k="123" />
-<hkern u1="&#x201c;" u2="&#x4e7;" k="123" />
-<hkern u1="&#x201c;" u2="&#x4db;" k="41" />
-<hkern u1="&#x201c;" u2="&#x4d9;" k="41" />
-<hkern u1="&#x201c;" u2="&#x4d7;" k="123" />
-<hkern u1="&#x201c;" u2="&#x4d5;" k="41" />
-<hkern u1="&#x201c;" u2="&#x4d4;" k="143" />
-<hkern u1="&#x201c;" u2="&#x4d3;" k="41" />
-<hkern u1="&#x201c;" u2="&#x4d2;" k="143" />
-<hkern u1="&#x201c;" u2="&#x4d1;" k="41" />
-<hkern u1="&#x201c;" u2="&#x4d0;" k="143" />
-<hkern u1="&#x201c;" u2="&#x4c6;" k="143" />
-<hkern u1="&#x201c;" u2="&#x4c5;" k="123" />
-<hkern u1="&#x201c;" u2="&#x4ab;" k="123" />
-<hkern u1="&#x201c;" u2="&#x4a9;" k="123" />
-<hkern u1="&#x201c;" u2="&#x481;" k="123" />
-<hkern u1="&#x201c;" u2="&#x47d;" k="123" />
-<hkern u1="&#x201c;" u2="&#x47b;" k="123" />
-<hkern u1="&#x201c;" u2="&#x479;" k="123" />
-<hkern u1="&#x201c;" u2="&#x473;" k="123" />
-<hkern u1="&#x201c;" u2="&#x471;" k="20" />
-<hkern u1="&#x201c;" u2="&#x467;" k="143" />
-<hkern u1="&#x201c;" u2="&#x466;" k="143" />
-<hkern u1="&#x201c;" u2="&#x459;" k="143" />
-<hkern u1="&#x201c;" u2="&#x455;" k="61" />
-<hkern u1="&#x201c;" u2="&#x454;" k="123" />
-<hkern u1="&#x201c;" u2="&#x451;" k="123" />
-<hkern u1="&#x201c;" u2="&#x450;" k="123" />
-<hkern u1="&#x201c;" u2="&#x444;" k="123" />
-<hkern u1="&#x201c;" u2="&#x441;" k="123" />
-<hkern u1="&#x201c;" u2="&#x43e;" k="123" />
-<hkern u1="&#x201c;" u2="&#x43b;" k="143" />
-<hkern u1="&#x201c;" u2="&#x435;" k="123" />
-<hkern u1="&#x201c;" u2="&#x434;" k="143" />
-<hkern u1="&#x201c;" u2="&#x430;" k="41" />
-<hkern u1="&#x201c;" u2="&#x41b;" k="123" />
-<hkern u1="&#x201c;" u2="&#x414;" k="123" />
-<hkern u1="&#x201c;" u2="&#x410;" k="143" />
-<hkern u1="&#x201c;" u2="&#x409;" k="123" />
-<hkern u1="&#x201c;" u2="&#x3cc;" k="82" />
-<hkern u1="&#x201c;" u2="&#x3c6;" k="82" />
-<hkern u1="&#x201c;" u2="&#x3c3;" k="82" />
-<hkern u1="&#x201c;" u2="&#x3c2;" k="82" />
-<hkern u1="&#x201c;" u2="&#x3c1;" k="61" />
-<hkern u1="&#x201c;" u2="&#x3bf;" k="82" />
-<hkern u1="&#x201c;" u2="&#x3bc;" k="41" />
-<hkern u1="&#x201c;" u2="&#x3ba;" k="41" />
-<hkern u1="&#x201c;" u2="&#x3b7;" k="41" />
-<hkern u1="&#x201c;" u2="&#x3b6;" k="41" />
-<hkern u1="&#x201c;" u2="&#x3b5;" k="41" />
-<hkern u1="&#x201c;" u2="&#x3b4;" k="61" />
-<hkern u1="&#x201c;" u2="&#x3b1;" k="82" />
-<hkern u1="&#x201c;" u2="&#x3ae;" k="41" />
-<hkern u1="&#x201c;" u2="&#x3ad;" k="41" />
-<hkern u1="&#x201c;" u2="&#x3ac;" k="82" />
-<hkern u1="&#x201c;" u2="&#x39b;" k="143" />
-<hkern u1="&#x201c;" u2="&#x394;" k="143" />
-<hkern u1="&#x201c;" u2="&#x391;" k="143" />
-<hkern u1="&#x201c;" u2="&#x386;" k="143" />
-<hkern u1="&#x201c;" u2="&#x21a;" k="-41" />
-<hkern u1="&#x201c;" u2="&#x219;" k="61" />
-<hkern u1="&#x201c;" u2="&#x1ff;" k="123" />
-<hkern u1="&#x201c;" u2="&#x1fd;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1fb;" k="82" />
-<hkern u1="&#x201c;" u2="&#x1fa;" k="143" />
-<hkern u1="&#x201c;" u2="&#x1b0;" k="61" />
-<hkern u1="&#x201c;" u2="&#x1a1;" k="123" />
-<hkern u1="&#x201c;" u2="&#x178;" k="-20" />
-<hkern u1="&#x201c;" u2="&#x176;" k="-20" />
-<hkern u1="&#x201c;" u2="&#x174;" k="-41" />
-<hkern u1="&#x201c;" u2="&#x173;" k="61" />
-<hkern u1="&#x201c;" u2="&#x171;" k="61" />
-<hkern u1="&#x201c;" u2="&#x16f;" k="61" />
-<hkern u1="&#x201c;" u2="&#x16d;" k="61" />
-<hkern u1="&#x201c;" u2="&#x16b;" k="61" />
-<hkern u1="&#x201c;" u2="&#x169;" k="61" />
-<hkern u1="&#x201c;" u2="&#x164;" k="-41" />
-<hkern u1="&#x201c;" u2="&#x162;" k="-41" />
-<hkern u1="&#x201c;" u2="&#x15f;" k="61" />
-<hkern u1="&#x201c;" u2="&#x15b;" k="61" />
-<hkern u1="&#x201c;" u2="&#x157;" k="61" />
-<hkern u1="&#x201c;" u2="&#x155;" k="61" />
-<hkern u1="&#x201c;" u2="&#x153;" k="123" />
-<hkern u1="&#x201c;" u2="&#x151;" k="123" />
-<hkern u1="&#x201c;" u2="&#x14f;" k="123" />
-<hkern u1="&#x201c;" u2="&#x14d;" k="123" />
-<hkern u1="&#x201c;" u2="&#x14b;" k="61" />
-<hkern u1="&#x201c;" u2="&#x146;" k="61" />
-<hkern u1="&#x201c;" u2="&#x144;" k="61" />
-<hkern u1="&#x201c;" u2="&#x138;" k="61" />
-<hkern u1="&#x201c;" u2="&#x123;" k="61" />
-<hkern u1="&#x201c;" u2="&#x121;" k="61" />
-<hkern u1="&#x201c;" u2="&#x11f;" k="61" />
-<hkern u1="&#x201c;" u2="&#x11d;" k="61" />
-<hkern u1="&#x201c;" u2="&#x11b;" k="123" />
-<hkern u1="&#x201c;" u2="&#x119;" k="123" />
-<hkern u1="&#x201c;" u2="&#x117;" k="123" />
-<hkern u1="&#x201c;" u2="&#x115;" k="123" />
-<hkern u1="&#x201c;" u2="&#x113;" k="123" />
-<hkern u1="&#x201c;" u2="&#x111;" k="123" />
-<hkern u1="&#x201c;" u2="&#x10f;" k="123" />
-<hkern u1="&#x201c;" u2="&#x10d;" k="123" />
-<hkern u1="&#x201c;" u2="&#x10b;" k="123" />
-<hkern u1="&#x201c;" u2="&#x109;" k="123" />
-<hkern u1="&#x201c;" u2="&#x107;" k="123" />
-<hkern u1="&#x201c;" u2="&#x105;" k="82" />
-<hkern u1="&#x201c;" u2="&#x104;" k="143" />
-<hkern u1="&#x201c;" u2="&#x103;" k="82" />
-<hkern u1="&#x201c;" u2="&#x102;" k="143" />
-<hkern u1="&#x201c;" u2="&#x101;" k="82" />
-<hkern u1="&#x201c;" u2="&#x100;" k="143" />
-<hkern u1="&#x201c;" u2="&#xfc;" k="61" />
-<hkern u1="&#x201c;" u2="&#xfb;" k="61" />
-<hkern u1="&#x201c;" u2="&#xfa;" k="61" />
-<hkern u1="&#x201c;" u2="&#xf9;" k="61" />
-<hkern u1="&#x201c;" u2="&#xf8;" k="123" />
-<hkern u1="&#x201c;" u2="&#xf6;" k="123" />
-<hkern u1="&#x201c;" u2="&#xf5;" k="123" />
-<hkern u1="&#x201c;" u2="&#xf4;" k="123" />
-<hkern u1="&#x201c;" u2="&#xf3;" k="123" />
-<hkern u1="&#x201c;" u2="&#xf2;" k="123" />
-<hkern u1="&#x201c;" u2="&#xeb;" k="123" />
-<hkern u1="&#x201c;" u2="&#xea;" k="123" />
-<hkern u1="&#x201c;" u2="&#xe9;" k="123" />
-<hkern u1="&#x201c;" u2="&#xe8;" k="123" />
-<hkern u1="&#x201c;" u2="&#xe7;" k="123" />
-<hkern u1="&#x201c;" u2="&#xe6;" k="82" />
-<hkern u1="&#x201c;" u2="&#xe5;" k="82" />
-<hkern u1="&#x201c;" u2="&#xe4;" k="82" />
-<hkern u1="&#x201c;" u2="&#xe3;" k="82" />
-<hkern u1="&#x201c;" u2="&#xe2;" k="82" />
-<hkern u1="&#x201c;" u2="&#xe1;" k="82" />
-<hkern u1="&#x201c;" u2="&#xe0;" k="123" />
-<hkern u1="&#x201c;" u2="&#xdd;" k="-20" />
-<hkern u1="&#x201c;" u2="&#xc5;" k="143" />
-<hkern u1="&#x201c;" u2="&#xc4;" k="143" />
-<hkern u1="&#x201c;" u2="&#xc3;" k="143" />
-<hkern u1="&#x201c;" u2="&#xc2;" k="143" />
-<hkern u1="&#x201c;" u2="&#xc1;" k="143" />
-<hkern u1="&#x201c;" u2="&#xc0;" k="143" />
-<hkern u1="&#x201c;" u2="u" k="61" />
-<hkern u1="&#x201c;" u2="s" k="61" />
-<hkern u1="&#x201c;" u2="r" k="61" />
-<hkern u1="&#x201c;" u2="q" k="123" />
-<hkern u1="&#x201c;" u2="p" k="61" />
-<hkern u1="&#x201c;" u2="o" k="123" />
-<hkern u1="&#x201c;" u2="n" k="61" />
-<hkern u1="&#x201c;" u2="m" k="61" />
-<hkern u1="&#x201c;" u2="g" k="61" />
-<hkern u1="&#x201c;" u2="e" k="123" />
-<hkern u1="&#x201c;" u2="d" k="123" />
-<hkern u1="&#x201c;" u2="c" k="123" />
-<hkern u1="&#x201c;" u2="a" k="82" />
-<hkern u1="&#x201c;" u2="Y" k="-20" />
-<hkern u1="&#x201c;" u2="W" k="-41" />
-<hkern u1="&#x201c;" u2="V" k="-41" />
-<hkern u1="&#x201c;" u2="T" k="-41" />
-<hkern u1="&#x201c;" u2="A" k="143" />
-<hkern u1="&#x201e;" u2="&#x1ef8;" k="123" />
-<hkern u1="&#x201e;" u2="&#x1ef6;" k="123" />
-<hkern u1="&#x201e;" u2="&#x1ef4;" k="123" />
-<hkern u1="&#x201e;" u2="&#x1ef2;" k="123" />
-<hkern u1="&#x201e;" u2="&#x1ef0;" k="41" />
-<hkern u1="&#x201e;" u2="&#x1eee;" k="41" />
-<hkern u1="&#x201e;" u2="&#x1eec;" k="41" />
-<hkern u1="&#x201e;" u2="&#x1eea;" k="41" />
-<hkern u1="&#x201e;" u2="&#x1ee8;" k="41" />
-<hkern u1="&#x201e;" u2="&#x1ee6;" k="41" />
-<hkern u1="&#x201e;" u2="&#x1ee4;" k="41" />
-<hkern u1="&#x201e;" u2="&#x1ee2;" k="102" />
-<hkern u1="&#x201e;" u2="&#x1ee0;" k="102" />
-<hkern u1="&#x201e;" u2="&#x1ede;" k="102" />
-<hkern u1="&#x201e;" u2="&#x1edc;" k="102" />
-<hkern u1="&#x201e;" u2="&#x1eda;" k="102" />
-<hkern u1="&#x201e;" u2="&#x1ed8;" k="102" />
-<hkern u1="&#x201e;" u2="&#x1ed6;" k="102" />
-<hkern u1="&#x201e;" u2="&#x1ed4;" k="102" />
-<hkern u1="&#x201e;" u2="&#x1ed2;" k="102" />
-<hkern u1="&#x201e;" u2="&#x1ed0;" k="102" />
-<hkern u1="&#x201e;" u2="&#x1ece;" k="102" />
-<hkern u1="&#x201e;" u2="&#x1ecc;" k="102" />
-<hkern u1="&#x201e;" u2="&#x1e84;" k="123" />
-<hkern u1="&#x201e;" u2="&#x1e82;" k="123" />
-<hkern u1="&#x201e;" u2="&#x1e80;" k="123" />
-<hkern u1="&#x201e;" u2="&#x50f;" k="102" />
-<hkern u1="&#x201e;" u2="&#x50e;" k="143" />
-<hkern u1="&#x201e;" u2="&#x50c;" k="102" />
-<hkern u1="&#x201e;" u2="&#x507;" k="102" />
-<hkern u1="&#x201e;" u2="&#x506;" k="123" />
-<hkern u1="&#x201e;" u2="&#x505;" k="102" />
-<hkern u1="&#x201e;" u2="&#x504;" k="123" />
-<hkern u1="&#x201e;" u2="&#x4f5;" k="123" />
-<hkern u1="&#x201e;" u2="&#x4f4;" k="164" />
-<hkern u1="&#x201e;" u2="&#x4ea;" k="102" />
-<hkern u1="&#x201e;" u2="&#x4e8;" k="102" />
-<hkern u1="&#x201e;" u2="&#x4e6;" k="102" />
-<hkern u1="&#x201e;" u2="&#x4cc;" k="123" />
-<hkern u1="&#x201e;" u2="&#x4cb;" k="164" />
-<hkern u1="&#x201e;" u2="&#x4be;" k="123" />
-<hkern u1="&#x201e;" u2="&#x4bc;" k="123" />
-<hkern u1="&#x201e;" u2="&#x4b9;" k="123" />
-<hkern u1="&#x201e;" u2="&#x4b8;" k="164" />
-<hkern u1="&#x201e;" u2="&#x4b7;" k="123" />
-<hkern u1="&#x201e;" u2="&#x4b6;" k="164" />
-<hkern u1="&#x201e;" u2="&#x4b5;" k="102" />
-<hkern u1="&#x201e;" u2="&#x4b4;" k="143" />
-<hkern u1="&#x201e;" u2="&#x4b0;" k="123" />
-<hkern u1="&#x201e;" u2="&#x4ae;" k="123" />
-<hkern u1="&#x201e;" u2="&#x4ad;" k="102" />
-<hkern u1="&#x201e;" u2="&#x4ac;" k="143" />
-<hkern u1="&#x201e;" u2="&#x4aa;" k="102" />
-<hkern u1="&#x201e;" u2="&#x4a8;" k="102" />
-<hkern u1="&#x201e;" u2="&#x4a1;" k="102" />
-<hkern u1="&#x201e;" u2="&#x4a0;" k="143" />
-<hkern u1="&#x201e;" u2="&#x480;" k="102" />
-<hkern u1="&#x201e;" u2="&#x47e;" k="102" />
-<hkern u1="&#x201e;" u2="&#x47c;" k="102" />
-<hkern u1="&#x201e;" u2="&#x47a;" k="102" />
-<hkern u1="&#x201e;" u2="&#x478;" k="102" />
-<hkern u1="&#x201e;" u2="&#x476;" k="123" />
-<hkern u1="&#x201e;" u2="&#x474;" k="123" />
-<hkern u1="&#x201e;" u2="&#x472;" k="102" />
-<hkern u1="&#x201e;" u2="&#x470;" k="164" />
-<hkern u1="&#x201e;" u2="&#x460;" k="102" />
-<hkern u1="&#x201e;" u2="&#x44a;" k="102" />
-<hkern u1="&#x201e;" u2="&#x447;" k="123" />
-<hkern u1="&#x201e;" u2="&#x442;" k="102" />
-<hkern u1="&#x201e;" u2="&#x42a;" k="143" />
-<hkern u1="&#x201e;" u2="&#x427;" k="164" />
-<hkern u1="&#x201e;" u2="&#x424;" k="82" />
-<hkern u1="&#x201e;" u2="&#x422;" k="143" />
-<hkern u1="&#x201e;" u2="&#x421;" k="102" />
-<hkern u1="&#x201e;" u2="&#x41e;" k="102" />
-<hkern u1="&#x201e;" u2="&#x40b;" k="143" />
-<hkern u1="&#x201e;" u2="&#x404;" k="102" />
-<hkern u1="&#x201e;" u2="&#x402;" k="143" />
-<hkern u1="&#x201e;" u2="&#x3d2;" k="123" />
-<hkern u1="&#x201e;" u2="&#x3b8;" k="41" />
-<hkern u1="&#x201e;" u2="&#x3ab;" k="123" />
-<hkern u1="&#x201e;" u2="&#x3a8;" k="123" />
-<hkern u1="&#x201e;" u2="&#x3a6;" k="102" />
-<hkern u1="&#x201e;" u2="&#x3a5;" k="123" />
-<hkern u1="&#x201e;" u2="&#x3a4;" k="143" />
-<hkern u1="&#x201e;" u2="&#x39f;" k="82" />
-<hkern u1="&#x201e;" u2="&#x398;" k="82" />
-<hkern u1="&#x201e;" u2="&#x21a;" k="143" />
-<hkern u1="&#x201e;" u2="&#x1fe;" k="102" />
-<hkern u1="&#x201e;" u2="&#x1af;" k="41" />
-<hkern u1="&#x201e;" u2="&#x1a0;" k="102" />
-<hkern u1="&#x201e;" u2="&#x178;" k="123" />
-<hkern u1="&#x201e;" u2="&#x176;" k="123" />
-<hkern u1="&#x201e;" u2="&#x174;" k="123" />
-<hkern u1="&#x201e;" u2="&#x172;" k="41" />
-<hkern u1="&#x201e;" u2="&#x170;" k="41" />
-<hkern u1="&#x201e;" u2="&#x16e;" k="41" />
-<hkern u1="&#x201e;" u2="&#x16c;" k="41" />
-<hkern u1="&#x201e;" u2="&#x16a;" k="41" />
-<hkern u1="&#x201e;" u2="&#x168;" k="41" />
-<hkern u1="&#x201e;" u2="&#x164;" k="143" />
-<hkern u1="&#x201e;" u2="&#x162;" k="143" />
-<hkern u1="&#x201e;" u2="&#x152;" k="102" />
-<hkern u1="&#x201e;" u2="&#x150;" k="102" />
-<hkern u1="&#x201e;" u2="&#x14e;" k="102" />
-<hkern u1="&#x201e;" u2="&#x14c;" k="102" />
-<hkern u1="&#x201e;" u2="&#x122;" k="102" />
-<hkern u1="&#x201e;" u2="&#x120;" k="102" />
-<hkern u1="&#x201e;" u2="&#x11e;" k="102" />
-<hkern u1="&#x201e;" u2="&#x11c;" k="102" />
-<hkern u1="&#x201e;" u2="&#x10c;" k="102" />
-<hkern u1="&#x201e;" u2="&#x10a;" k="102" />
-<hkern u1="&#x201e;" u2="&#x108;" k="102" />
-<hkern u1="&#x201e;" u2="&#x106;" k="102" />
-<hkern u1="&#x201e;" u2="&#xdd;" k="123" />
-<hkern u1="&#x201e;" u2="&#xdc;" k="41" />
-<hkern u1="&#x201e;" u2="&#xdb;" k="41" />
-<hkern u1="&#x201e;" u2="&#xda;" k="41" />
-<hkern u1="&#x201e;" u2="&#xd9;" k="41" />
-<hkern u1="&#x201e;" u2="&#xd8;" k="102" />
-<hkern u1="&#x201e;" u2="&#xd6;" k="102" />
-<hkern u1="&#x201e;" u2="&#xd5;" k="102" />
-<hkern u1="&#x201e;" u2="&#xd4;" k="102" />
-<hkern u1="&#x201e;" u2="&#xd3;" k="102" />
-<hkern u1="&#x201e;" u2="&#xd2;" k="102" />
-<hkern u1="&#x201e;" u2="&#xc7;" k="102" />
-<hkern u1="&#x201e;" u2="Y" k="123" />
-<hkern u1="&#x201e;" u2="W" k="123" />
-<hkern u1="&#x201e;" u2="V" k="123" />
-<hkern u1="&#x201e;" u2="U" k="41" />
-<hkern u1="&#x201e;" u2="T" k="143" />
-<hkern u1="&#x201e;" u2="Q" k="102" />
-<hkern u1="&#x201e;" u2="O" k="102" />
-<hkern u1="&#x201e;" u2="G" k="102" />
-<hkern u1="&#x201e;" u2="C" k="102" />
-<hkern u1="&#x2126;" u2="&#x3d2;" k="20" />
-<hkern u1="&#x2126;" u2="&#x3ab;" k="20" />
-<hkern u1="&#x2126;" u2="&#x3a5;" k="20" />
-<hkern u1="&#x2126;" u2="&#x3a4;" k="41" />
-<hkern g1="ff" u2="&#x201d;" k="-123" />
-<hkern g1="ff" u2="&#x2019;" k="-123" />
-<hkern g1="ff" u2="&#x27;" k="-123" />
-<hkern g1="ff" u2="&#x22;" k="-123" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/fonts/open-sans-fontfacekit/opensans_regular/OpenSans-Regular-webfont.ttf b/core/src/plugins/gui.ajax/res/themes/orbit/fonts/open-sans-fontfacekit/opensans_regular/OpenSans-Regular-webfont.ttf
deleted file mode 100644
index bfb6db541f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/fonts/open-sans-fontfacekit/opensans_regular/OpenSans-Regular-webfont.ttf and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/fonts/open-sans-fontfacekit/opensans_regular/OpenSans-Regular-webfont.woff b/core/src/plugins/gui.ajax/res/themes/orbit/fonts/open-sans-fontfacekit/opensans_regular/OpenSans-Regular-webfont.woff
deleted file mode 100644
index dbd2afc994..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/fonts/open-sans-fontfacekit/opensans_regular/OpenSans-Regular-webfont.woff and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/html/gui.html b/core/src/plugins/gui.ajax/res/themes/orbit/html/gui.html
deleted file mode 100644
index 190534930b..0000000000
--- a/core/src/plugins/gui.ajax/res/themes/orbit/html/gui.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:ajxp>
-	<head>
-		<title>AJXP_APPLICATION_TITLE</title>
-        AJXP_REBASE
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
-        <link rel="stylesheet" type="text/css" href="AJXP_THEME_FOLDER/css/allz.css?v=AJXP_CURRENT_VERSION">
-		<!--[if IE 8]>
-		<script src="AJXP_CLIENT_RESOURCES_FOLDER/js/vendor/es6/es5-shim.min.js"></script>
-		<script src="AJXP_CLIENT_RESOURCES_FOLDER/js/vendor/es6/es5-sham.min.js"></script>
-		<![endif]-->
-        <!--[if IE 7]>
-        <script src="AJXP_CLIENT_RESOURCES_FOLDER/js/vendor/es6/json3.min.js"></script>
-        <![endif]-->
-        AJXP_ADDITIONAL_JS_FRAMEWORKS
-        <script language="javascript" type="text/javascript" src="AJXP_CLIENT_RESOURCES_FOLDER/js/ajaxplorer_boot.js?v=AJXP_CURRENT_VERSION"></script>
-        <link rel="icon" type="image/x-png" href="AJXP_THEME_FOLDER/images/html-folder.png">
-    </head>
-	<body style="overflow: hidden;">
-		<script type="text/javascript">
-        window.ajxpNoNotifLoader = true;
-        window.ajxpThemeSkipLoaderProgress = true;
-		// Initialize booter. Do not remove the commented line AJXP_JSON_START_PARAMETERS, as it is 
-		// dynamically replaced by the application!
-		var ajaxplorer, startParameters = {}, MessageHash={};
-		//AJXP_JSON_START_PARAMETERS
-        document.observe("ajaxplorer:before_gui_load", function(e){
-			if(window.React){
-                React.initializeTouchEvents(true);
-            }
-            ajaxplorer.currentThemeUsesIconFonts = true;
-            pydio.Parameters.set('currentThemeUsesIconFonts', true);
-            document.documentElement.className += " ajxp_theme_orbit";
-        });
-        window.ajxpBootstrap = new AjxpBootstrap(startParameters);
-        //window.onbeforeunload = function(){return "Do you want to quit?";};
-		</script>
-		<div id="ajxp_desktop" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"window","fitMarginBottom":"$(\"optional_bottom_div\").getHeight()"}'></div>
-		<div id="all_forms">
-			<div id="generic_dialog_box" class="dialogBox form-login_form"><div class="dialogTitle"></div><div class="dialogContent"></div></div>
-			<div id="hidden_frames" style="display:none;"></div>
-			<div id="hidden_forms" style="position:absolute;left:-1000px;"></div>	
-			
-			<!-- LOGIN SCREEN MUST BE ALREADY IN PAGE TO ENABLE PASSWORD REMEMBERING -->
-            <form id="login_form" style="display:none;" box_width="320" box_padding="0" overlayStyle='{"backgroundColor":"white","opacity":10,"backgroundImage":"url(\"AJXP_THEME_FOLDER/images/grid_t.png\")"}'>
-				<input type="hidden" name="get_action" value="login">
-				<input type="hidden" name="login_seed" id="login_seed" value="">
-		 	   	<a style="float:right;font-size: 16px;" href="javascript:pydio.getController().fireAction('switch_language');" title="AJXP_MESSAGE[190]" alt="AJXP_MESSAGE[190]" class="icon-flag">&nbsp;</a>
-				<div class="dialogLegend" style="margin-bottom: 3px;margin-top: 4px;" ajxp_message_id="180">AJXP_MESSAGE[180]</div>
-				<div style="width:100%;">
-					<div class="SF_element">
-						<div class="SF_label"><ajxp:message ajxp_message_id="181">AJXP_MESSAGE[181]</ajxp:message></div>
-						<div class="SF_input"><input type="text" name="userid" style="width: 100px; padding:0px;" class="dialogFocus" placeholder="AJXP_MESSAGE[181]"></div>
-					</div>
-					<div class="SF_element">
-						<div class="SF_label"><ajxp:message ajxp_message_id="182">AJXP_MESSAGE[182]</ajxp:message></div>
-						<div class="SF_input"><input type="password" name="password"  style="width: 100px; padding:0px;" placeholder="AJXP_MESSAGE[182]"></div>
-					</div>
-					<div class="SF_element">
-						<input type="checkbox" class="radio" name="remember_me" style="border: none; width:20px !important;"/><ajxp:message ajxp_message_id="261">AJXP_MESSAGE[261]</ajxp:message>
-					</div>
-				</div>
-			</form>
-		</div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/html/gui_debug.html b/core/src/plugins/gui.ajax/res/themes/orbit/html/gui_debug.html
deleted file mode 100644
index 79a0748492..0000000000
--- a/core/src/plugins/gui.ajax/res/themes/orbit/html/gui_debug.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:ajxp>
-<head>
-    <title>Pydio</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <?php if(isSet($START_PARAMETERS) && isSet($START_PARAMETERS["REBASE"])){
-        echo '<base href="'.$START_PARAMETERS["REBASE"].'"/>';
-    }?>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="icon" type="image/x-png" href="<?php print(AJXP_THEME_FOLDER);?>/images/html-folder.png">
-    <!--[if IE 8]>
-    <script src="plugins/gui.ajax/res/js/vendor/es6/es5-shim.min.js"></script>
-    <script src="plugins/gui.ajax/res/js/vendor/es6/es5-sham.min.js"></script>
-    <![endif]-->
-    <!--[if IE 7]>
-    <script src="plugins/gui.ajax/res/js/vendor/es6/json3.min.js"></script>
-    <![endif]-->
-    <?php
-    print($ADDITIONAL_FRAMEWORKS);
-
-$list = AJXP_INSTALL_PATH."/".AJXP_THEME_FOLDER."/css/allz_list.txt";
-$lines = file($list);
-foreach ($lines as $line){
-	print("<link rel=\"stylesheet\" type=\"text/css\" href=\"".CLIENT_RESOURCES_FOLDER."/".trim($line)."\">\n");
-    }
-    ?>
-
-    <?php
-$list = AJXP_INSTALL_PATH."/".CLIENT_RESOURCES_FOLDER."/js/ajaxplorer_boot_list.txt";
-$lines = file($list);
-foreach ($lines as $line){
-	print("<script language=\"javascript\" type=\"text/javascript\" src=\"".CLIENT_RESOURCES_FOLDER."/".trim($line)."\"></script>\n");
-}
-?>
-</head>
-<body style="overflow:hidden;">
-        <div id="ajxp_desktop" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"window","fitMarginBottom":"$(\"optional_bottom_div\").getHeight()"}'></div>
-
-        <script type="text/javascript">
-window.ajxpNoNotifLoader = true;
-window.ajxpThemeSkipLoaderProgress = true;
-var ajaxplorer, startParameters = {};
-<?php if($JSON_START_PARAMETERS) print "startParameters = ".$JSON_START_PARAMETERS.";"; ?>
-window.ajxpBootstrap = new AjxpBootstrap(startParameters);
-    </script>
-    <?php
-$list = AJXP_INSTALL_PATH."/".CLIENT_RESOURCES_FOLDER."/js/ajaxplorer_core.txt";
-$lines = file($list);
-foreach ($lines as $line){
-	print("<script language=\"javascript\" type=\"text/javascript\" src=\"".CLIENT_RESOURCES_FOLDER."/".trim($line)."\"></script>\n");
-}
-$list = AJXP_INSTALL_PATH."/".CLIENT_RESOURCES_FOLDER."/js/ajaxplorer_ui.txt";
-$lines = file($list);
-foreach ($lines as $line){
-	print("<script language=\"javascript\" type=\"text/javascript\" src=\"".CLIENT_RESOURCES_FOLDER."/".trim($line)."\"></script>\n");
-}
-?>
-<div id="all_forms">
-        <div id="generic_dialog_box" class="dialogBox form-login_form"><div class="dialogTitle"></div><div class="dialogContent"></div></div>
-<div id="hidden_frames" style="display:none;"></div>
-        <div id="hidden_forms" style="position:absolute;left:-1000px;"></div>
-
-    <!-- LOGIN SCREEN MUST BE ALREADY IN PAGE TO ENABLE PASSWORD REMEMBERING -->
-        <form id="login_form" action="login" style="display:none;" box_width="320" box_padding="0" overlayStyle='{"backgroundColor":"white","opacity":10,"backgroundImage":"url(\"<?php print(AJXP_THEME_FOLDER); ?>/images/grid_t.png\")"}'>
-        <input type="hidden" name="get_action" value="login">
-        <input type="hidden" name="login_seed" id="login_seed" value="">
-        <a style="float:right;font-size: 16px;" href="javascript:pydio.getController().fireAction('switch_language');" title="<?php print($mess[190]);?>" alt="<?php print($mess[190]);?>" class="icon-flag"></a>
-        <div class="dialogLegend" style="margin-bottom: 3px;margin-top:4px;" ajxp_message_id="180"><?php print($mess[180]);?></div>
-<div style="width:100%;">
-        <div class="SF_element">
-        <div class="SF_label"><ajxp:message ajxp_message_id="181"><?php print($mess[181]);?></ajxp:message></div>
-<div class="SF_input"><input type="text" name="userid" style="width: 100px; padding:0px;" class="dialogFocus" placeholder="<?php print($mess[181]);?>"></div>
-        </div>
-        <div class="SF_element">
-        <div class="SF_label"><ajxp:message ajxp_message_id="182"><?php print($mess[182]);?></ajxp:message></div>
-<div class="SF_input"><input type="password" name="password"  style="width: 100px; padding:0px;"  placeholder="<?php print($mess[182]);?>"></div>
-        </div>
-        <div class="SF_element">
-        <input type="checkbox" class="radio" name="remember_me" style="border: none; width:20px !important;"/><ajxp:message ajxp_message_id="261"><?php print($mess[261]);?></ajxp:message>
-        </div>
-        </div>
-        </form>
-        </div>
-        <script type="text/javascript">
-            if(window.React) React.initializeTouchEvents(true);
-            document.observe("ajaxplorer:before_gui_load", function(e){
-                ajaxplorer.currentThemeUsesIconFonts = true;
-                pydio.Parameters.set('currentThemeUsesIconFonts', true);
-                document.documentElement.className += " ajxp_theme_orbit";
-            });
-    </script>
-
-    </body>
-        </html>
-
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/0.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/0.gif
deleted file mode 100644
index 390358048c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/0.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/1.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/1.gif
deleted file mode 100644
index 6991e1f9c3..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/1.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/2.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/2.gif
deleted file mode 100644
index 9874671147..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/2.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/ICON.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/ICON.png
deleted file mode 100644
index ea0b1e06e8..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/ICON.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/LoginBoxLogo.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/LoginBoxLogo.png
index df03da4b95..23c4cc50b0 100644
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/LoginBoxLogo.png and b/core/src/plugins/gui.ajax/res/themes/orbit/images/LoginBoxLogo.png differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/PydioLogo250.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/PydioLogo250.png
index df03da4b95..23c4cc50b0 100644
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/PydioLogo250.png and b/core/src/plugins/gui.ajax/res/themes/orbit/images/PydioLogo250.png differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/Toolbar.psd b/core/src/plugins/gui.ajax/res/themes/orbit/images/Toolbar.psd
deleted file mode 100644
index b2568903b2..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/Toolbar.psd and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/ToolbarBg.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/ToolbarBg.gif
deleted file mode 100644
index 341ef531b7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/ToolbarBg.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/ToolbarBgReverse.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/ToolbarBgReverse.gif
deleted file mode 100644
index 0b028de0f0..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/ToolbarBgReverse.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/ajxp-connexion-loader.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/ajxp-connexion-loader.gif
deleted file mode 100644
index 5a38eb749d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/ajxp-connexion-loader.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/arrow_down_margin.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/arrow_down_margin.png
deleted file mode 100644
index e29275ffbd..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/arrow_down_margin.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/arrow_left.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/arrow_left.png
deleted file mode 100644
index ebacdb2507..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/arrow_left.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/arrow_right.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/arrow_right.png
deleted file mode 100644
index e9c8f96db3..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/arrow_right.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/arrow_up.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/arrow_up.png
deleted file mode 100644
index c5315a7559..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/arrow_up.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/arrow_up_margin.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/arrow_up_margin.png
deleted file mode 100644
index 934ce42f8f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/arrow_up_margin.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/autocompleter-loader.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/autocompleter-loader.gif
deleted file mode 100644
index 8c1ffedd99..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/autocompleter-loader.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/fakeFlashButtonBg.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/fakeFlashButtonBg.gif
deleted file mode 100644
index e5f66ddabd..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/fakeFlashButtonBg.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/header_bg.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/header_bg.png
deleted file mode 100644
index 28c804cdf3..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/header_bg.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/header_bg_down.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/header_bg_down.png
deleted file mode 100644
index 8e16513850..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/header_bg_down.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/header_bg_on.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/header_bg_on.png
deleted file mode 100644
index af34ffeb0a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/header_bg_on.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/header_bg_plain.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/header_bg_plain.png
deleted file mode 100644
index 28c804cdf3..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/header_bg_plain.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/header_bg_up.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/header_bg_up.png
deleted file mode 100644
index 324186160e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/header_bg_up.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/hgrabber.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/hgrabber.gif
deleted file mode 100644
index 35ec413384..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/hgrabber.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/hires-photos/02.jpg b/core/src/plugins/gui.ajax/res/themes/orbit/images/hires-photos/02.jpg
index 4cc62d4208..aca19c78f9 100644
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/hires-photos/02.jpg and b/core/src/plugins/gui.ajax/res/themes/orbit/images/hires-photos/02.jpg differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/hires-photos/03-mobile.jpg b/core/src/plugins/gui.ajax/res/themes/orbit/images/hires-photos/03-mobile.jpg
index 1cceefeae5..cf7298d21c 100644
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/hires-photos/03-mobile.jpg and b/core/src/plugins/gui.ajax/res/themes/orbit/images/hires-photos/03-mobile.jpg differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/hires-photos/03.jpg b/core/src/plugins/gui.ajax/res/themes/orbit/images/hires-photos/03.jpg
index 342b6e93b6..29fd5239c8 100644
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/hires-photos/03.jpg and b/core/src/plugins/gui.ajax/res/themes/orbit/images/hires-photos/03.jpg differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/hires-photos/05.jpg b/core/src/plugins/gui.ajax/res/themes/orbit/images/hires-photos/05.jpg
index 52db61ea7b..f1a896c6d0 100644
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/hires-photos/05.jpg and b/core/src/plugins/gui.ajax/res/themes/orbit/images/hires-photos/05.jpg differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/hires-photos/06.jpg b/core/src/plugins/gui.ajax/res/themes/orbit/images/hires-photos/06.jpg
index 1e4453dbc0..d42436b6b8 100644
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/hires-photos/06.jpg and b/core/src/plugins/gui.ajax/res/themes/orbit/images/hires-photos/06.jpg differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/html-folder-ajxp.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/html-folder-ajxp.png
deleted file mode 100644
index c0bad77ce9..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/html-folder-ajxp.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang.gif
deleted file mode 100644
index 62b3bc5f23..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_cn.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_cn.gif
deleted file mode 100644
index 11f6da47d2..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_cn.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_de.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_de.gif
deleted file mode 100644
index aea2ee560d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_de.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_ee.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_ee.gif
deleted file mode 100644
index 1b9164c69a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_ee.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_en.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_en.gif
deleted file mode 100644
index 1358a09e55..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_en.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_fr.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_fr.gif
deleted file mode 100644
index dff858b3e1..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_fr.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_hun.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_hun.gif
deleted file mode 100644
index 790d7e738f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_hun.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_it.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_it.gif
deleted file mode 100644
index 8818ae6c68..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_it.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_lt.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_lt.gif
deleted file mode 100644
index c1a1c12a68..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_lt.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_pl.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_pl.gif
deleted file mode 100644
index c3ed36d85e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_pl.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_pt.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_pt.gif
deleted file mode 100644
index ed22576b2a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_pt.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_rs.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_rs.gif
deleted file mode 100644
index e31bc68310..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_rs.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_si.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_si.gif
deleted file mode 100644
index 5c2977695d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_si.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_sk.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_sk.gif
deleted file mode 100644
index 07c0567325..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/i18n/lang_sk.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/overlays/share128.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/overlays/share128.png
deleted file mode 100644
index 112f870ae3..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/overlays/share128.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/progress_bar.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/progress_bar.gif
deleted file mode 100644
index f0cc7dec03..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/progress_bar.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/progress_bar_80.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/progress_bar_80.gif
deleted file mode 100644
index 7e133bae8b..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/progress_bar_80.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/progress_box.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/progress_box.gif
deleted file mode 100644
index cda8c5df00..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/progress_box.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/progress_box_80.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/progress_box_80.gif
deleted file mode 100644
index 1d0d38cc4b..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/progress_box_80.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/slider-handle-vert.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/slider-handle-vert.png
deleted file mode 100644
index e88b0c546c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/slider-handle-vert.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/slider-handle.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/slider-handle.png
deleted file mode 100644
index 1bd9f8223f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/slider-handle.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/slider-track-bottom.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/slider-track-bottom.png
deleted file mode 100644
index c4d05e079b..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/slider-track-bottom.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/slider-track-left.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/slider-track-left.png
deleted file mode 100644
index 438b951fde..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/slider-track-left.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/slider-track-right.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/slider-track-right.png
deleted file mode 100644
index c2363d152d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/slider-track-right.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/slider-track-top.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/slider-track-top.png
deleted file mode 100644
index cb7b33b8a8..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/slider-track-top.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/strip.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/strip.png
deleted file mode 100644
index 4ec3f8cf7a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/strip.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/tree-even-odd-bg.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/tree-even-odd-bg.png
deleted file mode 100644
index 804c7b0ca4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/tree-even-odd-bg.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/tree-odd-even-bg.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/tree-odd-even-bg.png
deleted file mode 100644
index 88142f29c7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/tree-odd-even-bg.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/vgrabber.gif b/core/src/plugins/gui.ajax/res/themes/orbit/images/vgrabber.gif
deleted file mode 100644
index 9c43590160..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/vgrabber.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/white_logo-ajxp.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/white_logo-ajxp.png
deleted file mode 100644
index d2dd65c957..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/orbit/images/white_logo-ajxp.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/I.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/xtree/I.png
similarity index 100%
rename from core/src/plugins/gui.ajax/res/themes/orbit/images/I.png
rename to core/src/plugins/gui.ajax/res/themes/orbit/images/xtree/I.png
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/L.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/xtree/L.png
similarity index 100%
rename from core/src/plugins/gui.ajax/res/themes/orbit/images/L.png
rename to core/src/plugins/gui.ajax/res/themes/orbit/images/xtree/L.png
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/Lminus.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/xtree/Lminus.png
similarity index 100%
rename from core/src/plugins/gui.ajax/res/themes/orbit/images/Lminus.png
rename to core/src/plugins/gui.ajax/res/themes/orbit/images/xtree/Lminus.png
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/Lplus.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/xtree/Lplus.png
similarity index 100%
rename from core/src/plugins/gui.ajax/res/themes/orbit/images/Lplus.png
rename to core/src/plugins/gui.ajax/res/themes/orbit/images/xtree/Lplus.png
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/T.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/xtree/T.png
similarity index 100%
rename from core/src/plugins/gui.ajax/res/themes/orbit/images/T.png
rename to core/src/plugins/gui.ajax/res/themes/orbit/images/xtree/T.png
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/Tminus.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/xtree/Tminus.png
similarity index 100%
rename from core/src/plugins/gui.ajax/res/themes/orbit/images/Tminus.png
rename to core/src/plugins/gui.ajax/res/themes/orbit/images/xtree/Tminus.png
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/Tplus.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/xtree/Tplus.png
similarity index 100%
rename from core/src/plugins/gui.ajax/res/themes/orbit/images/Tplus.png
rename to core/src/plugins/gui.ajax/res/themes/orbit/images/xtree/Tplus.png
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/foldericon.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/xtree/foldericon.png
similarity index 100%
rename from core/src/plugins/gui.ajax/res/themes/orbit/images/foldericon.png
rename to core/src/plugins/gui.ajax/res/themes/orbit/images/xtree/foldericon.png
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/openfoldericon.png b/core/src/plugins/gui.ajax/res/themes/orbit/images/xtree/openfoldericon.png
similarity index 100%
rename from core/src/plugins/gui.ajax/res/themes/orbit/images/openfoldericon.png
rename to core/src/plugins/gui.ajax/res/themes/orbit/images/xtree/openfoldericon.png
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/css/ajaxplorer.css b/core/src/plugins/gui.ajax/res/themes/umbra/css/ajaxplorer.css
deleted file mode 100644
index dec9db85ad..0000000000
--- a/core/src/plugins/gui.ajax/res/themes/umbra/css/ajaxplorer.css
+++ /dev/null
@@ -1,3675 +0,0 @@
-table.sort-table tr:nth-child(even)
-{
-    background-color: #f9f9f9;
-}
-
-.soft_css_gradient, .menu.desktop, .menu.rootDirChooser, .menu.bookmarksMenu, .action_bar, .slider-pane{
-    background: rgb(255,255,255); /* Old browsers */
-    background: -moz-linear-gradient(top, rgba(255,255,255,1) 0%, rgba(229,229,229,1) 100%); /* FF3.6+ */
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,255,255,1)), color-stop(100%,rgba(229,229,229,1))); /* Chrome,Safari4+ */
-    background: -webkit-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(229,229,229,1) 100%); /* Chrome10+,Safari5.1+ */
-    background: -o-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(229,229,229,1) 100%); /* Opera11.10+ */
-    background: -ms-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(229,229,229,1) 100%); /* IE10+ */
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#e5e5e5',GradientType=0 ); /* IE6-9 */
-    background: linear-gradient(top, rgba(255,255,255,1) 0%,rgba(229,229,229,1) 100%); /* W3C */
-}
-
-.css_gradient, .infoPanelGroup, .panelHeader, .dialogBox, .action_bar.floatingBar, .largeButton, .fakeUploadButton, .header_label, .header_resizer{
-    background: rgb(247,247,247); /* Old browsers */
-    background: -moz-linear-gradient(top, rgba(247,247,247,1) 0%, rgba(227,227,227,1) 50%, rgba(216,216,216,1) 51%, rgba(242,242,242,1) 100%); /* FF3.6+ */
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(247,247,247,1)), color-stop(50%,rgba(227,227,227,1)), color-stop(51%,rgba(216,216,216,1)), color-stop(100%,rgba(242,242,242,1))); /* Chrome,Safari4+ */
-    background: -webkit-linear-gradient(top, rgba(247,247,247,1) 0%,rgba(227,227,227,1) 50%,rgba(216,216,216,1) 51%,rgba(242,242,242,1) 100%); /* Chrome10+,Safari5.1+ */
-    background: -o-linear-gradient(top, rgba(247,247,247,1) 0%,rgba(227,227,227,1) 50%,rgba(216,216,216,1) 51%,rgba(242,242,242,1) 100%); /* Opera11.10+ */
-    background: -ms-linear-gradient(top, rgba(247,247,247,1) 0%,rgba(227,227,227,1) 50%,rgba(216,216,216,1) 51%,rgba(242,242,242,1) 100%); /* IE10+ */
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#e5e5e5',GradientType=0 ); /* IE6-9 */
-    background: linear-gradient(top, rgba(247,247,247,1) 0%,rgba(227,227,227,1) 50%,rgba(216,216,216,1) 51%,rgba(242,242,242,1) 100%); /* W3C */
-}
-
-div.ascending > .header_label{
-    background: url("../images/arrow_up_margin.png") right center no-repeat; /* Old browsers */
-    background: url("../images/arrow_up_margin.png") right center no-repeat, -moz-linear-gradient(top, rgba(247,247,247,1) 0%, rgba(227,227,227,1) 50%, rgba(216,216,216,1) 51%, rgba(242,242,242,1) 100%); /* FF3.6+ */
-    background: url("../images/arrow_up_margin.png") right center no-repeat, -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(247,247,247,1)), color-stop(50%,rgba(227,227,227,1)), color-stop(51%,rgba(216,216,216,1)), color-stop(100%,rgba(242,242,242,1))); /* Chrome,Safari4+ */
-    background: url("../images/arrow_up_margin.png") right center no-repeat, -webkit-linear-gradient(top, rgba(247,247,247,1) 0%,rgba(227,227,227,1) 50%,rgba(216,216,216,1) 51%,rgba(242,242,242,1) 100%); /* Chrome10+,Safari5.1+ */
-    background: url("../images/arrow_up_margin.png") right center no-repeat, -o-linear-gradient(top, rgba(247,247,247,1) 0%,rgba(227,227,227,1) 50%,rgba(216,216,216,1) 51%,rgba(242,242,242,1) 100%); /* Opera11.10+ */
-    background: url("../images/arrow_up_margin.png") right center no-repeat, -ms-linear-gradient(top, rgba(247,247,247,1) 0%,rgba(227,227,227,1) 50%,rgba(216,216,216,1) 51%,rgba(242,242,242,1) 100%); /* IE10+ */
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#e5e5e5',GradientType=0 ); /* IE6-9 */
-    background: url("../images/arrow_up_margin.png") right center no-repeat, linear-gradient(top, rgba(247,247,247,1) 0%,rgba(227,227,227,1) 50%,rgba(216,216,216,1) 51%,rgba(242,242,242,1) 100%); /* W3C */
-}
-
-div.descending > .header_label{
-    background: url("../images/arrow_down_margin.png") right center no-repeat; /* Old browsers */
-    background: url("../images/arrow_down_margin.png") right center no-repeat, -moz-linear-gradient(top, rgba(247,247,247,1) 0%, rgba(227,227,227,1) 50%, rgba(216,216,216,1) 51%, rgba(242,242,242,1) 100%); /* FF3.6+ */
-    background: url("../images/arrow_down_margin.png") right center no-repeat, -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(247,247,247,1)), color-stop(50%,rgba(227,227,227,1)), color-stop(51%,rgba(216,216,216,1)), color-stop(100%,rgba(242,242,242,1))); /* Chrome,Safari4+ */
-    background: url("../images/arrow_down_margin.png") right center no-repeat, -webkit-linear-gradient(top, rgba(247,247,247,1) 0%,rgba(227,227,227,1) 50%,rgba(216,216,216,1) 51%,rgba(242,242,242,1) 100%); /* Chrome10+,Safari5.1+ */
-    background: url("../images/arrow_down_margin.png") right center no-repeat, -o-linear-gradient(top, rgba(247,247,247,1) 0%,rgba(227,227,227,1) 50%,rgba(216,216,216,1) 51%,rgba(242,242,242,1) 100%); /* Opera11.10+ */
-    background: url("../images/arrow_down_margin.png") right center no-repeat, -ms-linear-gradient(top, rgba(247,247,247,1) 0%,rgba(227,227,227,1) 50%,rgba(216,216,216,1) 51%,rgba(242,242,242,1) 100%); /* IE10+ */
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#e5e5e5',GradientType=0 ); /* IE6-9 */
-    background: url("../images/arrow_down_margin.png") right center no-repeat, linear-gradient(top, rgba(247,247,247,1) 0%,rgba(227,227,227,1) 50%,rgba(216,216,216,1) 51%,rgba(242,242,242,1) 100%); /* W3C */
-}
-
-.grey_gradient_emboss,.selected, div.selected-webfx-tree-item-inactive{
-    background: rgb(221,221,221); /* Old browsers */
-    background: -moz-linear-gradient(top, rgba(221,221,221,1) 46%, rgba(201,201,201,1) 100%); /* FF3.6+ */
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(46%,rgba(221,221,221,1)), color-stop(100%,rgba(201,201,201,1))); /* Chrome,Safari4+ */
-    background: -webkit-linear-gradient(top, rgba(221,221,221,1) 46%,rgba(201,201,201,1) 100%); /* Chrome10+,Safari5.1+ */
-    background: -o-linear-gradient(top, rgba(221,221,221,1) 46%,rgba(201,201,201,1) 100%); /* Opera11.10+ */
-    background: -ms-linear-gradient(top, rgba(221,221,221,1) 46%,rgba(201,201,201,1) 100%); /* IE10+ */
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#dddddd', endColorstr='#c9c9c9',GradientType=0 ); /* IE6-9 */
-    background: linear-gradient(top, rgba(221,221,221,1) 46%,rgba(201,201,201,1) 100%); /* W3C */
-}
-
-.blue_gradient,div.selected-webfx-tree-item, .selected-focus{
-    background: rgb(115,161,215); /* Old browsers */
-    background: -moz-linear-gradient(top, rgba(115,161,215,1) 46%, rgba(66,128,199,1) 100%); /* FF3.6+ */
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(46%,rgba(115,161,215,1)), color-stop(100%,rgba(66,128,199,1))); /* Chrome,Safari4+ */
-    background: -webkit-linear-gradient(top, rgba(115,161,215,1) 46%,rgba(66,128,199,1) 100%); /* Chrome10+,Safari5.1+ */
-    background: -o-linear-gradient(top, rgba(115,161,215,1) 46%,rgba(66,128,199,1) 100%); /* Opera11.10+ */
-    background: -ms-linear-gradient(top, rgba(115,161,215,1) 46%,rgba(66,128,199,1) 100%); /* IE10+ */
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#73a1d7', endColorstr='#4280c7',GradientType=0 ) !important; /* IE6-9 */
-    background: linear-gradient(top, rgba(115,161,215,1) 46%,rgba(66,128,199,1) 100%); /* W3C */
-}
-
-.grey_gradient_light_inputs,
-.dialogContent input,
-.dialogContent input[type="text"],
-.dialogContent input[type="password"],
-.dialogContent select,
-#search_txt,
-#location_form, #repository_form
-{
-    background: rgb(243,243,243); /* Old browsers */
-    background: rgb(243,243,243); /* Old browsers */
-    background: -moz-linear-gradient(top, rgba(243,243,243,1) 0%, rgba(255,255,255,1) 100%); /* FF3.6+ */
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(243,243,243,1)), color-stop(100%,rgba(255,255,255,1))); /* Chrome,Safari4+ */
-    background: -webkit-linear-gradient(top, rgba(243,243,243,1) 0%,rgba(255,255,255,1) 100%); /* Chrome10+,Safari5.1+ */
-    background: -o-linear-gradient(top, rgba(243,243,243,1) 0%,rgba(255,255,255,1) 100%); /* Opera11.10+ */
-    background: -ms-linear-gradient(top, rgba(243,243,243,1) 0%,rgba(255,255,255,1) 100%); /* IE10+ */
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f3f3f3', endColorstr='#ffffff',GradientType=0 ); /* IE6-9 */
-    background: linear-gradient(top, rgba(243,243,243,1) 0%,rgba(255,255,255,1) 100%); /* W3C */
-}
-
-/*
-MAJOR STYLES
-*/
-a:link {
-	color: #676965;
-	text-decoration: none;
-    outline: 0;
-}
-a:visited {
-	text-decoration: none;
-	color: #676965;
-}
-a:hover {
-	text-decoration: none;
-	color: #676965;
-}
-a:active,
-a:focus{
-	text-decoration: none;
-	color: #676965;
-    outline: 0;
-}
-
-body, html
-{
-    margin: 0px;
-    padding: 0px;
-}
-
-input, textarea, select
-{
-    margin-top: 1px;
-    margin-left: 10px;
-    padding: 2px;
-    border: 1px solid #aaa;
-    font-size: 11px;
-    font-family: Trebuchet MS, sans-serif, Nimbus Sans L;
-    border-radius: 2px;
-    -moz-border-radius: 2px;
-    -webkit-border-radius: 2px;
-}
-
-textarea{
-    margin-top: 0px;
-    margin-left: 0px;
-    padding:0px;
-    background-color: #fff;
-}
-
-.titre {
-	font-family: Trebuchet MS, Helvetica, Nimbus Sans L, sans-serif;
-	font-size: 14px;
-	font-weight: bold;
-	color: black;
-	width: 100%;
-	text-align: left;
-}
-
-.titre input, .backImage{
-    margin-top: 0px;
-    margin-left: 0px;
-    padding: 2px;
-    border: 1px solid #5E7C90;
-}
-
-.tooltipped
-{
-   background-color: #ffffc0;
-}
-
-
-.flexbox body{
-    position: absolute;
-    top:0;
-    bottom:0;
-    left:0;
-    right:0;
-}
-
-.vertical_layout{
-    display:-webkit-flex;
-    display:flex;
-    flex-direction: column;
-    -webkit-flex-direction: column;
-}
-
-.vertical_layout > *{
-    flex-shrink: 0;
-}
-
-.horizontal_layout{
-    display: -webkit-flex;
-    display: flex;
-    flex-direction: row;
-    -webkit-flex-direction: row;
-    align-items: stretch;
-    -webkit-align-items: stretch;
-}
-
-.vertical_fit{
-    flex:1;
-    -webkit-flex: 1;
-    overflow-y: hidden;
-}
-
-
-
-
-#sidebar_rootdir_td
-{
-   height: 17px;
-   vertical-align: top;
-}
-
-#sidebar_tree_td
-{
-   vertical-align: top;
-}
-
-#sidebar_searchform_td
-{
-   vertical-align: bottom;
-   height: 20px;
-}
-
-.thumbnail_selectable_cell
-{
-   width: 110px;
-   height: 100px;
-   border: 1px solid #eee;
-   float: left;
-   text-align: center;
-   margin: 4px;
-   background-color: #f9f9f9;
-   -moz-border-radius : 5px;
-   border-radius : 5px;
-}
-
-div.detailed > div.thumbnail_selectable_cell {
-    width: 48%;
-    text-align: left;
-    height: 55px;
-    overflow: hidden;
-}
-
-div.detailed > div.thumbnail_selectable_cell > div.thumbnail_selectable_cell {
-    margin: 9px 11px;
-    border: 0;
-    background: transparent;
-}
-
-.thumbnail_iconlike_shadow{
-    border: 1px solid white;
-    -webkit-box-shadow: 0 0 5px #666666;
-    -moz-box-shadow: 0 0 5px #666666;
-    box-shadow: 0 0 5px #666666;
-}
-
-.selectable_div div.selected{
-   border: 1px solid #ddd;
-    /*
-	-webkit-box-shadow : 1px 2px 3px rgba(50, 50, 50, 0.8);
-	-moz-box-shadow : 1px 2px 3px rgba(50, 50, 50, 0.8);
-	box-shadow : 1px 2px 3px rgba(50, 50, 50, 0.8);*/
-}
-.selectable_div div.selected-focus{
-   border: 1px solid #73A2D7 !important;
-    /*
-	-webkit-box-shadow : 1px 2px 3px rgba(50, 50, 50, 0.8);
-	-moz-box-shadow : 1px 2px 3px rgba(50, 50, 50, 0.8);
-	box-shadow : 1px 2px 3px rgba(50, 50, 50, 0.8);*/
-}
-
-div.detailed div.thumbLabel
-{
-    font-size: 1.4em;
-    margin-top: 8px;
-    margin-bottom: 1px;
-}
-
-.img_cont
-{
-   width: 64px;
-   height: 64px;
-   border: 1px solid #ddd;
-   vertical-align: middle;
-}
-
-.text_label{
-	display:block;
-	/*float:left;*/
-	overflow:hidden;
-	padding-left:2px;
-	padding-top:2px;
-	height: 18px;
-	line-height: 17px;
-	white-space : nowrap;
-}
-
-.text_label.full{
-	height: auto;
-	white-space: normal;
-}
-
-.list_selectable_span img {
-	float: left;
-}
-
-/*
-DIALOG BOXES
-*/
-/*#upload_form, #createdir_form, #createfile_form, #rename_div*/
-#all_forms
-{
-    background-color: #eee;
-}
-#all_forms div{display:none;}
-#all_forms form{display:inline;}
-
-#all_forms div div,
-#all_forms div.shadow_class
-{display:block;}
-
-div.shadow_class
-{
-	-moz-border-radius:5px;
-	border-radius:5px;
-}
-
-
-.dialogBox, .editBox
-{
-	background-color: #fff;
-    display: none;
-    position: absolute;
-    top: 30%;
-    left: 30%;
-    z-index: 1002;
-    font-family: Trebuchet MS, sans-serif;
-    font-size: 11px;
-    padding:5px;
-	-moz-border-radius:5px;
-	border-radius:5px;
-}
-
-.editBox
-{
-    top:5%;
-    left:5%;
-    padding: 0px;
-    margin:0px;
-}
-
-.dialogTitle
-{
-	color:#333333;
-	cursor:move;
-	padding:0px 4px 4px;
-}
-
-.dialogContent
-{
-    background-color: #fff;
-    padding: 10px 10px;
-    border: 1px solid #dddddd;
-	-moz-border-radius:0px 0px 3px 3px;
-	border-radius:0px 0px 3px 3px;
-}
-
-.dialogContent input,
-.dialogContent input[type="text"],
-.dialogContent input[type="password"],
-.dialogContent select,
-#search_txt
-{
-    margin-left:0px;
-    width: 174px;
-    border: 1px solid #aaa;
-    background-repeat: no-repeat;
-    background-position: top left;
-	height: 16px;
-	border-radius: 2px;
-	-moz-border-radius: 2px;
-	-webkit-border-radius: 2px;
-
-}
-
-.dialogContent select{
-    height: 22px;
-}
-
-.dialogContent select[multiple]{
-    height: 66px;
-}
-
-.dialogContent input:focus,
-.dialogContent input[type="text"]:focus,
-.dialogContent input[type="password"]:focus,
-.dialogContent select:focus
-{
-	background: white;
-	border: 1px solid #5d83ae;
-}
-
-.dialogContent input:disabled,
-.dialogContent input[type="text"]:disabled,
-.dialogContent input[type="password"]:disabled,
-.dialogContent option:disabled
-.dialogContent textarea:disabled
-{
-	background: #eee;
-}
-
-.dialogContent input[type="checkbox"],
-.dialogContent input[type="radio"]
-{
-	height: auto;
-	width: auto;
-	border-radius : 0px;
-    border:none;
-    filter: none;
-    background: none;
-}
-
-.dialogLegend
-{
-    color: #666;
-    padding-bottom: 5px;
-    line-height: 16px;
-}
-
-.dialogButtons
-{
-    text-align: right;
-    clear:both;
-}
-
-.dialogButtons input,
-fieldSet input.dialogButton
-{
-    margin-left: 6px;
-    width: 22px;
-    height: 22px;
-    padding:0px;
-    background-image: none;
-    background-color: #f1f1ef;
-    border-radius: 3px;
-    -moz-border-radius: 3px;
-}
-
-.dialogButtonsCheckbox{
-
-    float: left;
-    margin-top: 9px;
-
-}
-
-.dialogButtonsCheckbox label{
-    cursor: pointer;
-}
-
-.editContent, .editContent div
-{
-    background-color: #fff;
-}
-
-.editContent textarea, textarea#myCode, .editContent iframe
-{
-    border:0px;
-    border-left:1px solid #5E7C90;
-    padding:0px;
-    margin:0px;
-}
-
-#activity_monitor_warning{
-	position:absolute;
-	left:35%;
-	width:20%;
-	top:30%;
-	text-align:center;
-	font-size: 16px;
-	color: #5E7C90;
-	font-weight:bold;
-	cursor: pointer;
-}
-
-#activity_monitor_warning span.click_anywhere{
-	font-size: 12px;
-	color: #676965;
-	display:block;
-	padding-top:15px;
-	font-weight:normal;
-}
-
-#activity_monitor_warning span.warning_timer{
-	color: #0077b3;
-}
-
-textarea#myCode
-{
-    border: 1px solid #666;
-    border-right-color: #ccc;
-    border-left-color: #ccc;
-}
-
-.dialogContent form, .editContent form
-{
-    display: inline;
-    margin: 0px;
-}
-
-.dialogButton
-{
-	border-bottom: 1px solid buttonshadow;
-	border-right: 1px solid buttonshadow;
-	border-top: 1px solid #fff;
-	border-left: 1px solid #fff;
-	padding-left: 8px;
-	padding-right: 8px;
-	padding-top: 1px;
-	padding-bottom: 1px;
-	margin-top: 5px;
-}
-
-.largeButton{
-    padding: 2px 4px 1px;
-    font-size: 12px;
-    text-align: center;
-    border: 1px solid #A7A7A7;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-    cursor: pointer;
-    text-shadow: 1px 1px 1px white;
-    box-shadow: inset 1px 1px 1px white;
-    width: 95px;
-    display: inline-block !important;
-    margin: 0 6px;
-}
-.largeButton img{
-    width:16px;
-    height:16px;
-    vertical-align: middle;
-    position: relative;
-    top: -2px;
-    margin-right: 5px;
-    margin-top: 3px;
-}
-
-.dialogArrow
-{
-    font-weight: bold;
-    font-size: 16px;
-}
-
-#fancyframe
-{
-    border:0px;
-    width: 410px;
-    height: 385px;
-}
-
-#flashframe
-{
-    border:0px;
-    width: 450px;
-    height: 300px;
-    overflow:hidden;
-    margin-top: -9px;
-}
-
-/********************/
-/* MESSAGE BOX      */
-/********************/
-#message_div
-{
-    position: absolute;
-    z-index: 1500;
-    cursor: pointer;
-    border-radius: 5px;
-    color:#fff;
-}
-#message_content
-{
-    font-family: Trebuchet MS, sans-serif, Helvetica, Arial;
-    font-size: 11px;
-    margin: 8px;
-    overflow-y: auto;
-    max-height: 120px;
-}
-
-.errorMessage
-{
-    background-color: #960000;
-    cursor: pointer;
-	filter:alpha(opacity=90);
-	opacity: 0.90;
-	-moz-opacity:0.90;
-}
-
-.logMessage
-{
-    background-color: #009600;
-	filter:alpha(opacity=90);
-	opacity: 0.90;
-	-moz-opacity:0.90;
-}
-
-html.boxshadow div.logMessage{
-    border:  1px solid #009600;
-    -webkit-box-shadow: 0px 0px 7px #009600;
-    -moz-box-shadow: 0px 0px 7px #009600;
-    box-shadow: 0px 0px 7px #009600;
-    color : #060 !important;
-    opacity: 1;
-    background-color: #fff;
-}
-
-html.boxshadow div.errorMessage{
-    border:  1px solid #960000;
-    -webkit-box-shadow: 0px 0px 7px #960000;
-    -moz-box-shadow: 0px 0px 7px #960000;
-    box-shadow: 0px 0px 7px #960000;
-    color : #600 !important;
-    opacity: 1;
-    background-color: #fff;
-}
-
-
-.simple_tooltip_observer {
-    cursor: help;
-}
-
-.simple_tooltip_observer_active{
-    text-decoration: underline;
-}
-
-.simple_tooltip_title{
-    padding-top: 2px;
-    padding-bottom: 1px;
-    font-weight: bold;
-    font-size: 11px;
-}
-.simple_tooltip
-{
-	position:absolute;
-	width:200px;
-	z-index:10000;
-	border:1px solid #696765;
-	color : #696765;
-	background-color: #fff;
-	font-family: Trebuchet MS, Helvetica, Sans-serif;
-	font-size: 11px;
-    padding: 0px 10px 5px 10px;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-    border-radius: 4px;
-    -moz-box-shadow: 2px 2px 5px #AAAAAA;
-    -webkit-box-shadow: 2px 2px 5px #AAAAAA;
-    box-shadow: 2px 2px 5px #AAAAAA;
-}
-
-div.accordion_toggle{
-    clear:left;
-	background-color: #B0C6D8;
-	padding: 2px 6px;
-	margin-top: 2px;
-	color: white;
-	font-weight: bold;
-	cursor: pointer;
-	border-radius: 4px;
-	background-image: url('../images/0.gif');
-	background-repeat: no-repeat;
-	background-position: 5px 6px;
-	padding-left: 18px;
-	line-height:15px;
-}
-
-div.accordion_toggle_active{
-    background-image: url('../images/1.gif');
-}
-
-
-div.accordion_content{
-    overflow: hidden;
-    padding: 5px;
-}
-
-div.dialogContentMainTitle{
-    color: #2B70BE;
-    font-size: 20px;
-    margin-bottom: 10px;
-    border-bottom: 1px solid #2B70BE;
-    padding-bottom: 0px;
-}
-
-div.oneFieldForm{
-    margin-bottom: 13px;
-    background-color: #EEEEEE;
-    padding: 3px 6px;
-    border-radius: 4px;
-    margin-top: 10px;
-}
-
-div.oneFieldForm input.SF_input{
-    background: white !important;
-}
-
-/********************/
-/* PROGRESS BAR     */
-/********************/
-#progressBox
-{
-    display: block;
-    z-index: 2002;
-    top: 20%;
-	-moz-border-radius : 5px;
-	border-radius : 5px;
-    width: 305px;
-    padding: 3px;
-    display: block;
-    top: 30%;
-    z-index: 2002;
-    left: 40%;
-    position: absolute;
-    -webkit-box-shadow: 1px 1px 24px #aaa;
-    -moz-box-shadow: 1px 1px 24px #aaa;
-    box-shadow: 1px 1px 24px #aaa;
-}
-
-.pg_cancel_button{
-	background-color: #C33;
-	display: inline-block;
-	border-radius: 20px;
-	-moz-border-radius: 20px;
-	-webkit-border-radius: 20px;
-	cursor: pointer;
-	float: right;
-	margin-right: 8px;
-	font-weight: bold;
-	color: white !important;
-	height: 12px;
-	width: 8px;
-	padding-left: 4px;
-	line-height: 13px;
-	font-size: 7px;
-	margin-top: 2px;
-}
-
-/*************************/
-/* SF like "Standard Form" DATA : try to make a "standard"...
-/*************************/
-div.SF_element{
-	padding-top:5px;
-	clear:left;
-}
-
-div.SF_disabled{
-	color: #ccc;
-	font-style:italic;
-}
-
-div.SF_label{
-	float: left;
-	width: 39%;
-	text-align: right;
-	padding: 3px;
-	padding-right:1%;
-	padding-left:0;
-	line-height: 18px;
-	/*white-space: nowrap; /* css-3 */
-	/*word-wrap: no break-word; /* Internet Explorer 5.5+ */
-}
-
-.no-flexbox div.SF_label{
-	padding-right:3px !important;
-}
-
-.SF_input{
-	float:left;
-	padding:1px !important;
-	width: 57% !important;
-	_width:54% !important; /*IE*/
-}
-
-div.SF_element.SF_largeLabel > div.SF_label{
-    width: 57% !important;
-   	_width:54% !important; /*IE*/
-}
-
-div.SF_element.SF_largeLabel > .SF_input{
-    width: 39% !important;
-}
-
-div.SF_element.SF_largeLabel > input.SF_input.SF_number,
-input.SF_input.SF_number{
-    width: 30px !important;
-    text-align: right;
-}
-
-.SF_box{
-   width: 20px !important;
-}
-
-.SF_fieldCheckBox{
-    float:left;
-    margin: 5px;
-}
-
-.SF_elementWithCheckbox > .SF_input{
-    width: 51% !important;
-    _width:46% !important; /*IE*/
-}
-
-.SF_failed{
-	border: 1px solid #D8B0B0 !important;
-}
-
-.SF_replicableGroup{
-    background-color:#EEE;
-    clear: both;
-    position: relative;
-    margin-bottom: 5px;
-    border-radius: 5px;
-}
-
-.SF_replication_Add,
-.SF_replication_Remove
-{
-    display: block;
-    width: 20px;
-    height: 20px;
-    background-image: url('../images/0.gif');
-    background-repeat: no-repeat;
-    background-position: 5px 6px;
-    position:absolute;
-    bottom: 0;
-    left: 0;
-}
-
-.SF_replication_Remove
-{
-    background-image: url('../images/1.gif');
-    top: 0;
-}
-
-.SF_rgClear{
-    clear:left;
-    height: 3px;
-}
-
-.SF_image_block{
-    max-width: 80px;
-    float: left;
-}
-
-.SF_image.small{
-    max-width: 80px;
-    max-height: 80px;
-}
-.SF_image_link{
-    display: inline-block;
-    width: 80px;
-    cursor: pointer;
-    text-align: center;
-}
-
-.accordion_toggle_failed {
-	background-color: #D8B0B0 !important;
-}
-
-/****************
-/* LOGIN BOX
-/****************/
-.captcha_container {
-	text-align:center;
-}
-.captcha_container img{
-	margin: 5 0 0 2px;
-	border: 1px solid #ddd;
-}
-
-/***************/
-/*ACTION BAR   */
-/***************/
-.centeredWidth{
-}
-
-#toolbars
-{
-}
-
-.toolbars_separator
-{
-    border-bottom: 1px solid #fff;
-    border-top: 1px solid buttonshadow;
-}
-
-.toolbar_title{
-    font-size:15px;
-    font-weight:bold;
-    color: #ddd;
-}
-
-.toolbarGroup {
-    display: inline;
-}
-
-#tree_container{
-    background-color: #fff;
-    border-radius: 2px;
-    -webkit-box-shadow: 0px 0px 2px #aaa;
-    -moz-box-shadow: 0px 0px 2px #aaa;
-    box-shadow: 0px 0px 2px #aaa;
-}
-
-.panelHeader{
-    border: none;
-	font-family: Trebuchet MS, sans-serif;
-	font-size: 12px;
-	padding: 3px 2px 2px 7px;
-	color: #676965;
-	vertical-align: middle;
-	background-color: #fff;
-	height: 18px;
-    margin-bottom: 1px;
-    -moz-border-radius: 2px;
-    -webkit-border-radius: 2px;
-    border-radius: 2px 2px 2px 2px;
-	text-shadow : 1px 1px 1px #FFFFFF;
-    -webkit-box-shadow: 0px 0px 2px #aaa;
-    -moz-box-shadow: 0px 0px 2px #aaa;
-    box-shadow: 0px 0px 2px #aaa;
-}
-
-#sidebar_splitter div.panelHeader,
-#search_panel div.panelHeader{
-    padding-top: 5px;
-    padding-bottom: 4px;
-}
-
-.action_bar
-{
-    font-family: Arial;
-    font-size: 12px;
-    padding: 0px;
-    line-height: 15px;
-    height:51px;
-}
-.action_bar.editor_action_bar{
-    height:55px;
-}
-
-div.editor_header{
-    height: 55px;
-}
-
-div.editor_header > div.editor_action_bar {
-    position: absolute;
-    right: 0;
-    padding-right: 8px;
-    background: none;
-    padding-top: 15px;
-    height: 42px;
-    padding-left: 10px;
-}
-
-div.editor_header > div.editor_action_bar > div.separator{
-    display: none !important;
-}
-
-div.editor_header > span.header_label{
-    display: none;
-    font-size: 24px;
-    width: 100%;
-    padding: 15px 0 0 62px;
-    background-image: url('../images/mimes/64/user-acl.png');
-    background-size: 40px;
-    background-repeat: no-repeat;
-    background-position: 14px 9px;
-    text-shadow: 1px 1px 5px black;
-    overflow: visible;
-}
-
-.action_bar.text_only{
-    line-height: 16px;
-    height:30px;
-}
-
-.action_bar.icons_only{
-    height:40px;
-    line-height: 0px;
-}
-
-.action_bar
-{
-	overflow:hidden;
-}
-
-.action_bar.floatingBar{
-    position: absolute;
-    border-radius: 8px;
-    padding-right: 10px;
-    padding-left: 10px;
-    cursor: move;
-    -webkit-box-shadow: rgba(0, 0, 0, 0.398438) 2px 2px 6px;
-    -moz-box-shadow: rgba(0, 0, 0, 0.398438) 2px 2px 6px;
-    box-shadow: rgba(0, 0, 0, 0.398438) 2px 2px 6px;
-    opacity: 0.95;
-}
-
-.action_bar span.actionbar_button_label {
-    cursor: pointer;
-    display: block;
-    min-width: 35px;
-    padding: 0 1px;
-}
-
-div.action_bar.icons_only  span.actionbar_button_label{
-    display: none;
-}
-
-div.action_bar.text_only  span.actionbar_button_label{
-    font-size: 11px;
-}
-
-.action_bar div.actionbar_arrow_div{
-    position: absolute;
-    top: 19px;
-    right: 11px;
-}
-.action_bar.icons_only div.actionbar_arrow_div{
-    position: absolute;
-    top: 23px;
-    right: 6px;
-}
-.action_bar.icons_only div.actionbar_arrow_div img{
-    height: 6px;
-    width: 10px;
-}
-
-#buttons_bar
-{
-	border-bottom:1px solid #ccc;
-	padding-left:0px;
-	padding-top:0;
-	overflow:hidden;
-}
-
-.action_bar a
-{
-    display: block;
-    float: left;
-    font-size: 9px;
-    padding: 4px;
-    text-align: center;
-    overflow: visible;
-    color: #333;
-    outline: none;
-    border-radius: 3px;
-    text-shadow: 1px 1px 1px white;
-    margin: 5px 2px 0px 1px;
-    padding-bottom: 1px;
-}
-
-.action_bar.icons_only a{
-    padding-bottom: 2px;
-    padding-top: 3px;
-}
-
-.action_bar.text_only a{
-    padding-bottom: 3px;
-    padding-top: 2px;
-    margin-top: 5px;
-}
-
-.action_bar a.menuAnchorSelected,
-.action_bar a:hover
-{
-   background:white;
-   border: 1px solid #ccc;
-   margin: 4px 1px 0px 0px;
-}
-
-.action_bar.text_only a.menuAnchorSelected,
-.action_bar.text_only a:hover{
-    margin-top: 4px;
-}
-
-
-.action_bar a.menuAnchorSelected{
-   border-bottom: 0px ;
-   border-radius: 3px 3px 0px 0px;
-}
-
-.action_bar a.disabled,
-.action_bar a.disabled:hover
-{
-    color: expression('#c4c7c1');
-    border:  0px;
-    margin: 5px 3px 1px 0px;
-}
-
-.action_bar a img
-{
-    margin: 2px 0px 0px 0px;
-}
-
-div.action_bar.icons_only img.actionbar_button_icon{
-    height: 22px;
-    width: 22px;
-}
-
-div.action_bar.icon_text img.actionbar_button_icon{
-    height: 16px;
-    width: 16px;
-}
-
-div.action_bar.text_only a img{
-    display: none;
-}
-
-.action_bar a.separator,
-div.separator
-{
-    border-left: 1px solid #CCC;
-    border-right: 1px solid white;
-    display: block;
-    float: left;
-    font-size: 10px;
-    height: 100%;
-    margin-left: 2px;
-    margin-right: 2px;
-    padding-top: 0;
-    text-align: center;
-    width: 0px;
-}
-
-a.carousel-control{
-	border-left:1px solid #c4c7c1;
-	border-right:1px solid #c4c7c1;
-	border-bottom:1px solid #c4c7c1;
-	display:block;
-	float:left;
-	font-size:10px;
-	height:51px;
-	padding-top:0;
-	text-align:center;
-	width:8px!important;
-	margin:0px !important;
-	cursor:pointer;
-	background-color: #fff;
-}
-a.carousel-disabled{
-	background-color: transparent;
-}
-
-a.carousel-control img{
-	/*margin-top:20px !important;*/
-}
-
-#content_pane{
-    margin: 20px;
-    margin-top:17px;
-    -webkit-box-shadow:0 0 5px #aaaaaa;
-    -moz-box-shadow:0 0 5px #aaaaaa;
-    box-shadow:0 0 5px #aaaaaa;
-    background-color: #fff;
-}
-#topPane, #bottomSplitPane{
-    margin: 20px;
-    border:  0px !important;
-}
-
-#locationbar_cont
-{
-	/*background-image:url(../images/ToolbarBg.gif);*/
-	background-position:center center;
-	background-repeat:repeat-x;
-	height:33px;
-	_height:32px;
-	width:100%;
-    -webkit-box-shadow:0 0px 5px #bbb;
-    -moz-box-shadow:0 0px 5px #bbb;
-    box-shadow:0 0px 5px #bbb;
-    clear:left;
-}
-
-#locationBar{
-
-}
-
-#location_form,
-#repository_form
-{
-	border:1px solid #BBBBBB;
-	border-right-width:0px;
-	float:left;
-	height:20px;
-	padding:2px 0px 0px 4px;
-}
-
-#location_form input,
-#repository_form input,
-#location_form div{
-    background: transparent !important;
-}
-
-
-#repository_form, #goto_parent
-{
-	-moz-border-radius : 5px 0px 0px 5px;
-	border-radius : 5px 0px 0px 5px;
-}
-
-#repository_goto, #bookmarks_goto
-{
-	-moz-border-radius : 0px 5px 5px 0px;
-	border-radius : 0px 5px 5px 0px;
-}
-
-#location_form
-{
-    margin-left: 0px;
-}
-#location_form div.location_bar_label{
-    line-height: 18px;
-}
-
-#repository_form
-{
-    width: 120px;
-}
-
-#location_form input,
-#repository_form input
-{
-    margin:1px 0px 0px 0px;
-    _margin: 0px 0px 1px 0px;
-    border:none;
-    height: 15px;
-    width: 325px;
-    float:left;
-}
-
-#repository_form img#repo_icon{
-    float: left;
-    vertical-align:top;
-}
-#repository_form input
-{
-    width: 90px;
-    margin-left: 3px;
-}
-
-#repo_chooser{
-	max-width:170px;
-}
-
-.inlineBarButton,
-.inlineBarButtonLeft,
-.inlineBarButtonRight
-{
-	display:inline;
-	border: 1px solid #bbb;
-    height: 22px;
-    float:left;
-    padding:0 1px;
-    cursor:pointer;
-}
-
-.inlineBarButtonLeft{
-	border-left-width:0px;
-}
-.inlineBarButtonRight{
-	border-right-width:0px;
-}
-
-.inlineBarButton img,
-.inlineBarButtonLeft img,
-.inlineBarButtonRight img
-{
-	margin-top:3px;
-	display:inline;
-	border:0px;
-}
-
-.inline_hover_light,
-.user_widget_hover
-{
-   background-color: rgba(255, 255, 255, 0.5);
-}
-
-.inline_hover
-{
-   background-color: rgba(255, 255, 255, 0.7);
-}
-
-.inline_disabled img,
-.SF_disabled img
-{
-	filter:alpha(opacity=30);
-	opacity: 0.3;
-	-moz-opacity:0.3;
-	cursor:default;
-}
-
-img.simple_button_arrow{
-    position:absolute;
-    right:0px;
-    bottom:1px;
-    display:none;
-}
-
-.inline_hover > img.simple_button_arrow{
-    display: block;
-}
-
-#search_panel_button{
-    padding: 0 2px 0 3px;
-}
-/*
-#logging_string
-{
-   color: #084165;
-   font-size: 15px;
-   font-family: Trebuchet MS, sans-serif;
-   font-weight: bold;
-   padding-right: 3px;
-}
-*/
-#logging_string {
-	float: right;
-	color:#666666;
-	font-family:Trebuchet MS,sans-serif;
-	font-size:11px;
-	padding-right: 5px;
-}
-#logging_string i
-{
-	font-weight:bold;
-}
-#logging_string i img
-{
-    font-style: normal;
-    cursor: pointer;
-	margin-right:7px;
-	margin-top:-4px;
-}
-.user_widget_label{
-	float: left;
-	line-height: 16px;
-	border-width: 1px 0px 1px 1px;
-	border-style: solid none solid solid;
-	border-color: #bbbbbb;
-	-moz-border-radius: 5px 0pt 0pt 5px;
-	border-radius: 5px 0pt 0pt 5px;
-	padding: 3px 0px 3px 7px;
-	_padding: 3px 0px 1px 7px;
-	cursor: pointer;
-}
-
-.user_widget_label.withImage{
-    position: relative;
-    padding:0;
-}
-
-.user_widget_label.withImage i{
-    font-weight: bold;
-    line-height: 22px;
-    display: inline-block;
-    padding: 0 4px 0 8px;
-}
-
-.user_widget_label.withImage i img{
-}
-
-img.user_widget_mini{
-    vertical-align: middle;
-    height: 16px;
-    border: 1px solid white;
-    top: 5px;
-    left: 2px;
-    box-shadow: 1px 1px 0px #666;
-}
-
-.locationbar_title
-{
-    display:inline;
-    font-family:Trebuchet MS, sans-serif, Helvetica, Arial;
-    color: #5E7C90;
-    font-size:15px;
-    font-weight:bold;
-    float:left;
-}
-
-#current_path,
-#repo_path
-{
-    /*width: 455px;*/
-    border:none;
-    height: 20px;
-    padding:0px;
-    padding-left:3px;
-    padding-top:0px;
-    font-size: 11px;
-}
-
-#current_path{
-    padding-left:0px;
-}
-#current_path:focus, #repo_path:focus{
-    outline: none;
-}
-
-/********************************/
-/* SLIDER*/
-/*********************************/
-
-.slider-pane{
-	background-color:#f1f1ef;
-	border:1px solid #CCCCCC;
-	padding:5px 3px;
-	position:absolute;
-	width:11px;
-	z-index:10000;
-    border-radius: 0px 0px 5px 5px;
-    box-shadow: 1px 1px 2px rgba(0,0,0,0.25);
-}
-
-.slider-handle,
-.slider-pane div.selected
-{
-	background-image:url("../images/slider-handle-vert.png");
-	background-position:top center;
-	background-repeat:no-repeat;
-	background-color: transparent !important;
-	height:15px;
-	width:10px;
-}
-
-.slider-tracker {
-	background-image : url("../images/slider-track-bottom.png");
-	background-position:bottom center;
-	background-repeat:no-repeat;
-}
-
-.slider-tracker-top {
-	background-image : url("../images/slider-track-top.png");
-	background-position:top center;
-	background-repeat:no-repeat;
-}
-
-/********************************/
-/* HEADER RESIZER WIDGET
-/******************************/
-div.header_resizer{
-	border-bottom: 1px solid #676965;
-	overflow:hidden;
-}
-
-div.header_resizer div.header_cell{
-	float:left;
-	overflow:hidden;
-	width:90px;
-	text-shadow : 1px 1px 1px #FFFFFF;
-	white-space:nowrap;
-	border: 0px !important;
-	cursor: pointer;
-}
-
-div.header_resizer div.header_label{
-	font-family: Trebuchet MS;
-	font-size: 12px;
-	padding:3px 5px 2px;
-}
-div.header_resizer div.resizer{
-	float:left;
-	width:1px;
-	background-color: #ffffff;
-	height: 23px;
-	cursor:e-resize;
-	border: 0px;
-}
-
-div.header_resizer div.resizer_sortable{
-	background-color: #daddd7;
-}
-
-div.header_resizer div.dragging{
-	background-color : #bbb;
-	border-left: 1px solid #bbb;
-}
-div.resizeGhost{
-	width: 1px;
-	border-right: 1px solid #ccc;
-	position:absolute;
-	z-index:1000;
-	opacity:0.7;
-}
-
-div.sort-table-filter div.header_cell {
-    border-right: 1px solid #ccc !important;
-    box-shadow: inset 1px 1px 1px rgba(0, 0, 0, 0.37);
-}
-
-div.sort-table-filter div.header_cell:last-child {
-    border-right: 0 !important;
-}
-
-div.header_cell input[type="text"] {
-    margin-left: 0;
-    width: 96%;
-    border: 0;
-    background: transparent;
-}
-
-div.sort-table-filter {
-    display: none;
-}
-
-div.fl-showFilterPane div.sort-table-filter {
-    display: block;
-}
-
-div.fl-displayMode-list.fl-showFilterPane div.scroller_track {
-    top: 50px !important;
-}
-
-#ws_legend label{
-    font-size:16px !important;
-}
-
-/*
-div.header_resizer div.descending {
-	background-color: #daddd7;
-	background-image: url("../images/arrow_up_margin.png");
-	background-repeat : no-repeat;
-	background-position : right center;
-}
-*/
-/*
-div.header_resizer div.ascending {
-	background-color: #daddd7;
-	background-image: url("../images/arrow_down_margin.png");
-	background-repeat : no-repeat;
-	background-position : right center;
-}
-*/
-
-
-/*********************************/
-/* FILE LIST SKINNING
-/********************************/
-.sort-table {
-	font-family:Trebuchet MS, sans-serif;
-	font-size: 11px;
-}
-
-.sort-table thead {
-	background-color:	#aaa;
-}
-
-.sort-table td {
-	padding:	2px 0px;
-}
-
-.no-flexbox .sort-table td{
-	padding: 3px 0px;
-}
-
-.sort-table thead td {
-	/*
-	display: block;
-	float: left;
-	overflow:hidden;
-	height: 23px;
-	*/
-    background-color: #ddd;
-	border-bottom:	none;
-	cursor:			pointer;
-	border-right: 	1px solid buttonhighlight;
-	font-size:12px;
-	color: #676965;
-	padding: 0px;
-	background-color: #f1f1ef;
-	border-bottom : 1px solid #676965;
-}
-
-.sort-table thead td div {
-	padding-left: 7px;
-	padding-top: 3px;
-	height: 20px;
-	overflow:hidden;
-	white-space:nowrap;
-}
-
-.sort-table thead td.descending {
-	background-color: #daddd7;
-	background-image: url("../images/arrow_up_margin.png");
-	background-repeat : no-repeat;
-	background-position : right center;
-}
-
-.sort-table thead td.ascending {
-	background-color: #daddd7;
-	background-image: url("../images/arrow_down_margin.png");
-	background-repeat : no-repeat;
-	background-position : right center;
-}
-
-#last_header{
-   border-right: 	0px solid #ddd;
-   widht: auto !important;
-}
-
-#last_header:active{
-}
-
-.sort-table thead td:active {
-	background-color: #c4c7c1;
-}
-
-.column_resize_grabber {
-	display:block;
-	width: 3px;
-	float:right;
-	height: 23px;
-	font-size: 0px;
-	cursor:e-resize;
-}
-
-
-.odd
-{
-}
-
-.selected
-{
-	color : #404040;
-	text-decoration: none;
-}
-
-.selected-focus
-{
-    color: #fff !important;
-}
-
-.droppableZone
-{
-   background-color: #c3d9ff;
-   /*border: 1px dotted #666;*/
-}
-
-.paginator
-{
-	background-color:#fff8d1;
-	border-bottom-color:#dddddd;
-	border-bottom-style:solid;
-	border-bottom-width:1px;
-	font-family:Trebuchet MS;
-	font-size:11px;
-	height:20px;
-	padding-top:2px;
-	text-align:center;
-}
-
-.paginatorInput
-{
-	width:21px;
-	padding: 0px 2px;
-	height: 14px;
-	text-align: right;
-	border: 1px solid #CCCCCC;
-	margin-right: 2px;
-	margin-left: 5px;
-}
-
-div.multiple_selection_draggable
-{
-    display: block;
-    color: #000;
-    background-color: #fff;
-    padding: 5px;
-    padding-bottom:0px;
-    border: 1px dashed #999;
-    font-family: Trebuchet MS, sans-serif;
-    font-size: 11px;
-	cursor:default;
-	overflow:hidden;
-}
-
-div.selection_ctrl_key
-{
-    background-image:url('../images/0.gif');
-    background-repeat: no-repeat;
-    background-position: bottom right;
-}
-
-
-a.disabled
-{
-  filter:alpha(opacity=30);
-  opacity: 0.3;
-  -moz-opacity:0.3;
-}
-
-a.enabled
-{
-  filter:alpha(opacity=100);
-  opacity: 1;
-  -moz-opacity:1;
-}
-
-.action_bar a.disabled:hover
-{
-    background-color: transparent;
-    cursor: default;
-}
-
-.action_bar a.disabled
-{
-	filter:alpha(opacity=100);
-	opacity: 1;
-	-moz-opacity:1;
-}
-
-.action_bar a.disabled img,
-.action_bar a.disabled span
-{
-  filter:alpha(opacity=30);
-  opacity: 0.3;
-  -moz-opacity:0.3;
-}
-
-/*
-BOOKMARKS BAR
-*/
-#bm_bar_cont
-{
-    /*background-color: #ddd;*/
-}
-
-
-#bookmarks_bar
-{
-    display: none;
-    background-color: #fff;
-    position:relative;
-    width:86%;
-    left:7%;
-    height: 25px;
-    padding: 0px;
-    padding-left:10px;
-}
-
-#bmbar_title
-{
-    color: #ddd;
-    float:right;
-    display:inline;
-    font-family:Trebuchet MS, sans-serif, Helvetica, Arial;
-    font-size:15px;
-    font-weight:bold;
-}
-
-a.bookmark_button
-{
-    text-decoration: none;
-    padding-right: 10px;
-}
-
-#bookmarks_bar a
-{
-    display: block;
-    float:left;
-}
-
-div.bm, div.bm_hover
-{
-   /* border: 1px solid #ddd;*/
-	filter:alpha(opacity=30);
-	opacity: 0.3;
-	-moz-opacity:0.3;
-    display: block;
-    float: right;
-    text-align: center;
-    font-size: 11px;
-    padding: 3px;
-    margin-right: 5px;
-    /*background-color: #ddd;*/
-    font-family: Trebuchet MS, sans-serif;
-    color: #333;
-}
-
-div.bm_hover
-{
-	filter:alpha(opacity=100);
-	opacity: 1;
-	-moz-opacity:1;
-    text-decoration: none;
-    /*
-	border-top: 1px solid #fff;
-	border-left: 1px solid #fff;
-	border-right: 1px solid buttonshadow;
-	border-bottom: 1px solid buttonshadow;
-    background-color: #ddd;
-    */
-}
-
-.extendedMenu
-{
-     float:none;
-}
-
-/*
-UPLOAD MULTIFILE FORM
-*/
-div#upload_files_list, div#multiple_download_container
-{
-   background-color: white;
-   overflow: auto;
-   height: 250px;
-   width : 320px;
-   border: 1px solid #ccc;
-   text-align: left;
-	-moz-border-radius : 5px;
-	border-radius : 5px;
-}
-
-.droparea {
-	background:url("../../../../../../index.php?get_action=get_drop_bg") no-repeat scroll right bottom transparent;
-}
-
-.dropareaHover {
-	border-color:#D96252 !important;
-}
-
-div#total_files_list, div#uploader_options_pane
-{
--moz-border-radius:5px 5px 5px 5px;
-border-radius:5px 5px 5px 5px;
-background-color:white;
-border:1px solid #CCCCCC;
-font-size:11px;
-height:39px;
-overflow:hidden;
-padding:5px 10px;
-text-align:left;
-width:301px;
-}
-
-div#uploader_options_pane {
-	height: 59px;
-}
-
-div#uploader_options_pane input {
-	width: 15px;
-	margin-right: 0px;
-	margin-left: 0px;
-	margin-top: 5px;
-}
-
-div#upload_files_list div, div#multiple_download_container div
-{
-   overflow: hidden;
-   border-bottom: 1px solid #fff;
-   background-color: #efefef;
-   padding-top: 6px;
-   padding-bottom: 6px;
-   padding-left: 6px;
-   position:relative;
-}
-#upload_files_list img
-{
-   margin-right: 6px;
-}
-
-#upload_files_list div a
-{
-   color: #ddd;
-   font-style: italic;
-}
-#upload_files_list div a:hover
-{
-    text-decoration:none;
-    color: #d00;
-}
-
-#multiple_download_container div a
-{
-    display: block;
-}
-#multiple_download_container div a:hover
-{
-    text-decoration:none;
-    color: #aaa;
-}
-#fileInputContainer {
-        vertical-align: top;
-}
-#fileInputContainerDiv {
-        height: 130px;
-        width: 62px; /* to fit 1px border */
-        margin: 0;
-        padding: 0;
-        position: relative;
-        overflow: hidden;
-        vertical-align: top;
-}
-#fileInputContainer input {
-        filter:alpha(opacity:0); opacity:0; moz-opacity:0;
-        position: absolute;
-        font-size: 60px; /* causes it to fill the containing div */
-        top:0px; right:0px;
-        z-index: 10000;
-        height: 56px;
-}
-#fileInputPos {
-        text-align: left;
-        height: 60px;
-        width: 60px;
-        position: absolute;
-        top: 0px; right: 0px;
-        overflow: hidden;
-        z-index: 9999; /* this was needed to work in IE */
-}
-
-.fakeUploadButton {
-	width: 60px;
-	padding-top: 8px;
-	padding-bottom: 5px;
-	border: 1px solid #ccc;
-	text-align:center;
-	vertical-align: middle;
-	font-size: 10px;
-	margin-bottom: 5px;
-	cursor:pointer;
-    /*
-    background-color: white;
-	background-image:url('../images/fakeFlashButtonBg.gif');
-	background-position : bottom;
-	background-repeat : repeat-x;
-	*/
-	color : #667;
-	font-weight: bold;
-	-moz-border-radius : 5px;
-	border-radius : 5px;
-}
-
-.fakeUploadButton.disabled{
-    -moz-opacity: 0.5;
-    opacity: 0.5;
-    filter:alpha(opacity=50);
-    cursor: default;
-}
-
-
-.fakeUploadButton img {
-    margin-bottom: 3px;
-}
-
-.fakeOptionButton {
-   padding-top: 3px;
-   padding-bottom: 3px;
-	margin-bottom: 0px;
-	margin-top: 5px;
-	background-position : center;
-	-moz-border-radius : 5px;
-	border-radius : 5px;
-}
-
-#uploadBrowseButton {
-        position: absolute;
-        top: 0px; right: 0px;
-        margin:0;
-}
-#uploadSendButton {
-        position: absolute;
-        top: 63px; right: 0px;
-        margin:0;
-}
-
-#uploadFilesListContainer
-{
-	vertical-align:top;
-	font-size: 11px;
-	letter-spacing: 1;
-}
-
-/***** SCROLLER ******/
-.scroller_track{
-    position: absolute;
-    width: 10px;
-    background-color: #F1F1F1;
-    cursor: move;
-    right: 10px;
-    z-index: 1000;
-    opacity: 0.7;
-    border-radius: 0px 2px 2px 0px;
-    border-left: 1px solid #CCC;
-}
-.scroller_handle{
-    -webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-}
-
-.flexbox div.scroller_track{
-    top:0;
-    bottom: 0;
-}
-
-div#folder_pane{
-    position: relative;
-}
-
-
-/*
- SEARCH BOX / INFO PANEL
-*/
-
-#panelsToggle
-{
-    height: 23px;
-    cursor:pointer;
-}
-
-div.tabulatorContainer{
-	padding: 3px;
-	padding-bottom: 0px;
-	height: 24px;
-	border-bottom: 1px solid #676965;
-}
-
-.toggleHeader
-{
-	width: 50%;
-	cursor: pointer;
-	padding-right: 2px;
-	border: 1px solid #676965;
-	border-bottom: 0px;
-	border-radius: 4px 4px 0px 0px;
-	-moz-border-radius: 4px 4px 0px 0px;
-	-webkit-border-radius: 4px 4px 0px 0px;
-}
-
-.toggleHeader a, .toggleHeader a, .toggleHeader a:link, .toggleHeader a:visited, .toggleHeader a:hover , .toggleHeader a:active
-{
-	text-decoration:none;
-}
-
-.panelHeader.panelHeaderWithIcon{
-    position: relative;
-    padding-left: 26px;
-}
-
-.panelHeader img
-{
-    position: absolute;
-    top: 6px;
-    left: 6px;
-}
-
-.panelHeader img.panelHeaderCloseIcon{
-    left: auto;
-    right: 6px;
-    cursor: pointer;
-}
-
-.toggleInactive
-{
-	background: #EEE !important;
-	border-width: 1px;
-	border-bottom: 1px solid #676965;
-  filter:alpha(opacity=60);
-  opacity: 0.6;
-  -moz-opacity:0.6;
-}
-
-.toggleInactive a, .toggleInactive a:link, .toggleInactive a:visited, .toggleInactive a:hover , .toggleInactive a:active
-{
-	color: #999;
-	text-decoration:none;
-}
-
-#search_panel{
-    margin: 20px;
-    -webkit-box-shadow: 0px 0px 6px #aaa;
-    -moz-box-shadow: 0px 0px 6px #aaa;
-    box-shadow: 0px 0px 6px #aaa;
-}
-
-#search_div
-{
-/*    width: 100%;*/
-    font-family: Trebuchet MS, sans-serif, Helvetica, Arial, Sans-serif;
-    font-size: 11px;
-}
-
-#search_results
-{
-    width:100%;
-    overflow: auto;
-    height: 120px;
-    background-color: #fff;
-    margin-bottom: 3px;
-    position: relative;
-}
-
-#search_container
-{
-    /*padding:0px;*/
-}
-
-#search_form, #search_state
-{
-     padding-left: 10px;
-     padding-top:5px;
-     text-align: center;
-    height: 25px;
-}
-#search_form
-{
-    border-bottom: 1px solid #ddd;
-    background-color: #eee;
-}
-#search_form a
-{
-    display:block;
-    float:left;
-    width:18px;
-    cursor: pointer;
-    margin-right: 0px;
-    margin-left: 5px;
-    padding: 1px;
-}
-
-#search_form a img{
-    margin-top: 2px;
-    vertical-align: top;
-}
-
-#search_form input
-{
-    margin: 0px;
-}
-
-#search_meta {
-    font-family: Arial, Helvetica, SANS-SERIF;
-    font-size: 11px;
-    float: right;
-    text-align: left;
-    padding-left: 10px;
-    padding-right: 18px;
-    padding-top:2px;
-}
-
-.searchScore{
-    float: right;
-    color: #CCC;
-    font-size: 10px;
-    font-style: italic;
-}
-
-.searchUnindex{
-
-}
-
-meta_opt {
-	cursor: pointer;
-}
-
-meta_opt.checked {
-	text-decoration: underline;
-	font-weight: bold;
-}
-
-#search_results
-{
-    margin-left:0px;
-    width: 100%;
-    font-family: Arial, Verdana, sans-serif;
-    font-size: 11px;
-}
-
-#search_results em {
-	color: red;
-	font-style:normal;
-}
-
-#search_results div
-{
-    border-bottom: 1px solid #f1f1ef;
-    padding: 4px;
-    cursor: pointer;
-}
-
-#search_results div:hover
-{
-    background-color:#73a2d7 !important;
-    background-image: -webkit-gradient(
-        linear,
-        left bottom,
-        left top,
-        color-stop(0, rgb(66,128,199)),
-        color-stop(0.54, rgb(115,161,215))
-    );
-    background-image: -moz-linear-gradient(
-        center bottom,
-        rgb(52,111,179) 0%,
-        rgb(115,161,215) 54%
-    );
-    color: white;
-}
-
-.infoPanelActions
-{
-	padding:5px;
-    font-size: 11px;
-}
-
-#info_panel div.panelContent
-{
-	overflow:auto;
-    background-color: #fff;
-    font-family: Arial, Verdana, Sans-serif;
-    font-size: 12px;
-    border-radius: 2px;
-    -webkit-box-shadow: 0px 0px 2px #aaa;
-    -moz-box-shadow: 0px 0px 2px #aaa;
-    box-shadow: 0px 0px 2px #aaa;
-}
-
-#info_panel a
-{
-    color:#676965;
-    display: block;
-    padding: 3px 2px;
-}
-
-#info_panel a:hover
-{
-	font-weight : bold;
-}
-
-#info_panel a img{
-	margin-right : 5px;
-}
-
-#info_panel a:hover
-{
-   text-decoration:none;
-}
-
-#info_panel div.folderImage
-{
-   text-align:center;
-   padding-bottom: 10px;
-}
-
-div.ipanel_no_selection_select {
-    display: none;
-}
-
-.infoPanelTable
-{
-	font-size: 11px;
-	width: 100%;
-}
-
-td.infoPanelValue
-{
-	padding:3px;
-}
-
-td.infoPanelLabel
-{
-	padding:3px 5px;
-	font-weight:bold;
-	width:35%;
-}
-
-.infoPanelGroup
-{
-    border-radius: 0px;
-}
-
-tr.even td.infoPanelLabel
-{
-	border-right:1px solid white;
-}
-
-tr td.infoPanelLabel
-{
-	border-right:1px solid #f4f4f4;
-}
-
-.infoPanelImagePreview
-{
-	width: 100%;
-	background-color: #ffffff;
-	text-align:center;
-	padding: 10px 0;
-}
-.infoPanelImagePreview img
-{
-	-webkit-box-shadow: 1px 1px 6px #7a7a7a;
-	-moz-box-shadow: 1px 1px 6px #7a7a7a;
-	box-shadow: 1px 1px 6px #7a7a7a;
-}
-
-#browser
-{
-    /*padding:10px;*/
-    clear:left;
-    background-color:#eee;
-    line-height: 18px;
-    -webkit-box-shadow: inset 1px 1px 5px #999;
-    -moz-box-shadow: inset 1px 1px 5px #999;
-    box-shadow: inset 1px 1px 5px #999;
-}
-
-div.selectable_div, .table_rows_container, #tree_container, #bottomSplitPane, .ajxp_simple_container{
-    font-family: Trebuchet MS, sans-serif, Helvetica, Arial, Sans-serif;
-    font-size: 11px;
-}
-
-.table_rows_container td,
-.infoPanelTable td
-{
-	border-top: 1px solid #eee;
-	border-bottom: 1px solid #eee;
-	border-right: 1px solid #eee;
-}
-.table_rows_container tr.even td,
-.infoPanelTable tr.even td
-{
-	border-top: 0px;
-	border-bottom:0px;
-}
-.table_rows_container tr:first-child td,
-.infoPanelTable tr:first-child td
-{
-	border-top:0px;
-}
-.table_rows_container tr:last-child td,
-.infoPanelTable tr:last-child td
-{
-	border-bottom: 1px solid #eee;
-}
-.table_rows_container tr.selected-focus td,
-.infoPanelTable tr.selected-focus td
-{
-	border-right: 1px solid #73A2D7;
-}
-
-.no_select_bg::selection {
-	background:transparent;
-}
-
-.no_select_bg::-moz-selection {
-	background:transparent;
-}
-
-#vertical_splitter{
-    overflow: hidden;
-}
-
-#sidebar_splitter{
-    overflow: auto;
-    width: 200px;
-    background-color: #D2DFE9;
-    -webkit-box-shadow: rgb(153, 153, 153) 1px 1px 5px inset;
-    -moz-box-shadow: rgb(153, 153, 153) 1px 1px 5px inset;
-    box-shadow: rgb(153, 153, 153) 1px 1px 5px inset;
-}
-
-.splitterContentPane{
-	border: 1px solid #676965;
-}
-
-.vsplitbar
-{
-   width: 4px;
-   /*background-color: #eee;*/
-   background-image: url(../images/vgrabber.gif);
-   background-repeat: no-repeat;
-   background-position: center;
-}
-.vsplitbar.active
-{
-  background-color: #666;
-}
-
-.hsplitbar.folded{
-    opacity: 0;
-    cursor: default !important;
-}
-
-.vsplitbar:hover
-{
-}
-
-.hsplitbar
-{
-   height: 4px;
-   /*background-color: #eee;*/
-   background-image: url(../images/hgrabber.gif);
-   background-repeat: no-repeat;
-   background-position: center;
-}
-.hsplitbar.active
-{
-  background-color: #666;
-}
-
-.hsplitbar:hover{
-  /*background-color: #ccc;*/
-}
-
-
-#splashScreen
-{
-   width: 430px;
-   height: 332px;
-}
-
-#docFileIframe
-{
-	border-bottom:1px solid #AAAAAA;
-	height:300px;
-	left:0;
-	position:relative;
-	top:0;
-	width:100%;
-}
-
-#adminIFrame
-{
-    border: 1px solid white;
-    width: 641px;
-    height: 390px;
-    background-color: #fff;
-}
-
-/*********************
-ADMIN STYLES
-**********************/
-#users_list,
-#repo_list
-{
-    height: 299px;
-    width: 200px;
-    float: left;
-    padding-top: 5px;
-    overflow: auto;
-}
-#users_detail_panel,
-#repo_detail_panel{
-	width: 438px;
-    height: 299px;
-    float: left;
-	border-left: 1px solid #bbb;
-    overflow: auto;
-}
-
-#repo_list{
-    height: 294px;
-}
-
-#repo_detail_panel fieldset
-{
-	margin:10px;
-    font-family: Trebuchet MS, sans-serif;
-    font-size: 13px;
-}
-
-.metaPane{
-	background-color: #f6f6f6;
-	margin-bottom:5px;
-	margin-top:2px;
-	float:left;
-	padding:6px 5px 8px;
-	width:96%;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-}
-
-.metaPane img,
-img.metaPaneTitle
-{
-	float:right;
-	cursor:pointer;
-	margin-left: 3px;
-}
-
-img.metaPaneTitle{
-    display:none;
-}
-
-div.accordion_toggle_active img.metaPaneTitle
-{
-    display:inline;
-}
-
-.metaPane span.title{
-	font-weight: bold;
-}
-
-.users_list_title
-{
-    font-family: Trebuchet MS, Nimbus Sans L, sans-serif;
-    font-size: 20px;
-    font-weight: bold;
-    color: white;
-    padding-left: 5px;
-    border-bottom: 1px solid white;
-    background-color: #bbb;
-}
-
-
-.user
-{
-    padding-top: 15px;
-    padding-left: 5px;
-    padding-bottom: 15px;
-    background-color: #fff;
-    border-top: 1px solid #fff;
-    border-bottom: 1px solid #fff;
-    border-left: 1px solid #fff;
-    margin-left: 5px;
-}
-
-.user_id, .user_data, .repository, .password
-{
-    font-family: Trebuchet MS, sans-serif;
-    font-size: 11px;
-}
-
-.wallet_pane{
-	/*
-	background-color:#EFEFEF;
-	border-left:1px solid;
-	*/
-	margin-left:2px;
-	margin-right:2px;
-	padding:0 10px 0 0;
-}
-.wallet_pane div.driver_form{
-	width:215px;
-}
-.wallet_pane input.dialogButton{
-	float:right;
-	border: 1px solid #676965;
-}
-
-.config_subblock{
-	border: 1px dotted #ccc;
-	padding:5px 10px;
-	margin-bottom:10px;
-}
-
-.user_data
-{
-    background-color: #fff;
-}
-
-fieldset
-{
-    border: 1px solid #ccc;
-    padding: 10px;
-    padding-top: 5px;
-    margin-bottom: 5px;
-}
-
-legend
-{
-    color: #A6A8A4;
-    font-weight: bold;
-}
-
-legend a{
-	text-decoration:none;
-	cursor: pointer;
-}
-
-legend a.active {
-	background-color: transparent;
-	color: #87A9C4;
-	text-decoration:none;
-	cursor: default;
-	font-size: 1.1em;
-}
-
-.repository, .repository td, .password td
-{
-   padding: 1px;
-}
-
-.repository td
-{
-   vertical-align: bottom;
-   line-height: 19px;
-   padding: 6px 0 5px 6px;
-}
-
-.repository input, .user_delete_confirm
-{
-   border: none;
-   margin-left: 1px;
-   margin-top: 0px;
-   padding: 0px;
-}
-
-.user_data
-{
-    padding: 10px;
-    /*padding-right: 20px;*/
-}
-
-.user_id
-{
-    cursor: pointer;
-    font-size: 17px;
-}
-
-.user_id b
-{
-    color: #666;
-}
-#user_admin_bar, #repo_create_form, #log_chooser
-{
-   font-family: Trebuchet MS, sans-serif;
-   padding: 15px;
-   font-size: 12px;
-   border: 0px solid #ddd;
-   background-color: #ddd;
-   border-bottom: 1px solid #bbb;
-}
-
-#user_admin_bar input, .password input
-{
-   height: 18px;
-   width: 90px;
-   font-size: 12px;
-   padding: 0px;
-   margin-left: 0px;
-   margin-right: 5px;
-}
-
-#user_admin_bar .submit_button, .password .submit_button,
-#options_pane .submit_button, .password .submit_button
-{
-   width: 30px;
-}
-
-#user_admin_bar b,
-#repo_create_form b,
-#log_chooser b
-{
-   font-size: 15px;
-   color: #666;
-}
-
-#user_pref_form input
-{
-   width: 65px;
-   padding: 0px;
-   margin-right: 5px;
-}
-
-#user_pref_form input.radio
-{
-   width: 20px;
-   border: 0px;
-   background-image: none;
-}
-
-#repo_create_form select
-{
-   border: 1px solid #5E7C90;
-   height: 20px;
-   width: 160px;
-}
-
-div#available_roles, div#user_roles{
-	padding: 0px;
-	border: 1px solid #aaa;
-	width: 100%;
-	height: 80px;
-	overflow:auto;
-}
-
-div#rights_pane{
-	border: 1px solid #aaa;
-	_height: 150px;
-	max-height: 150px;
-	overflow:auto;
-	margin-top:5px;
-	padding: 2px 0;
-	width: 100%;
-}
-
-div.ajxp_role{
-	background-color:#FFFFFF;
-	border-left:7px solid #DDDDDD;
-	cursor:move;
-	margin-left:1px;
-	margin-top:1px;
-	padding:1px 4px;
-}
-
-div.available_role{
-  filter:alpha(opacity=60);
-  opacity: 0.6;
-  -moz-opacity:0.6;
-}
-
-div.user_role{
-	opacity : 1 !important;
-	-moz-opacity : 1 !important;
-	filter:alpha(opacity=100) !important;
-}
-
-.roles_hover{
-	border : 1px solid #ffffef;
-}
-
-.editable_users_list{
-
-    border: 1px solid #AAAAAA;
-    height: 160px;
-    overflow: auto;
-    clear:left;
-    position: relative;
-    margin-top: 2px;
-    border-radius: 3px;
-
-
-}
-
-.editable_users_list div.user_entry,
-li.complete_user_entry,
-li.complete_group_entry,
-li.complete_user_entry_temp
-{
-    clear: left;
-    background-color: rgba(255, 255, 255, 0.7);
-    border-bottom: 1px solid #F1F1EF;
-}
-
-div.editable_users_list div.user_entry_rights{
-    float: right;
-    padding-top: 8px;
-    padding-right: 4px;
-}
-.no-flexbox div.editable_users_list div.user_entry_rights{
-    padding-top: 4px;
-}
-
-li.complete_user_entry,
-li.complete_group_entry,
-li.complete_user_entry_temp{
-    padding: 0 !important;
-}
-
-
-.editable_users_list div.user_entry span.user_entry_label,
-li.complete_user_entry span.user_entry_label,
-li.complete_group_entry span.user_entry_label,
-li.complete_user_entry_temp span.user_entry_label
-{
-    display: inline-block;
-    padding: 8px 5px 8px 25px !important;
-    background-image: url("../images/mimes/16/user.png");
-    background-repeat: no-repeat;
-    background-position: 4px 5px;
-
-}
-
-li.complete_user_entry{
-
-}
-
-li.complete_group_entry span.user_entry_label,
-.editable_users_list div.group_entry span.user_entry_label
-{
-    background-image: url("../images/mimes/16/users-folder.png");
-}
-
-li.complete_user_entry_temp span.user_entry_label,
-.editable_users_list div.user_entry_temp span.user_entry_label
-{
-    background-image: url("../images/mimes/16/user_shared.png");
-}
-
-.editable_users_list span.delete_user_entry{
-    background-image: url("../images/mimes/16/trashcan.png");
-    width: 12px;
-    height: 12px;
-    display: inline-block;
-    background-size: 100%;
-    margin-left: 5px;
-    cursor: pointer;
-}
-
-.editable_users_list label{
-    padding: 0 3px;
-    cursor: pointer;
-}
-
-span.user_entry_check{
-    display: inline-block;
-    padding: 0 5px;
-}
-
-.editable_users_list.user_entry_check_hidden span.user_entry_check{
-    display: none;
-}
-
-#create_shared_user{
-    width: 84%;
-    background-color: #EEE;
-    margin: 0 6%;
-    box-shadow: 0px 0px 7px #666;
-    padding: 1px 4px;
-    border-radius: 0px 0px 7px 7px;
-
-    position: absolute;
-    top: -1px;
-}
-
-.editable_users_header{
-    float: right;
-    margin-top: 2px;
-    font-style: italic;
-    font-size: 9px;
-    color: #AAA;
-    padding: 2px;
-}
-
-.editable_users_header span,
-div.user_entry span.cbContainer
-{
-    display: inline-block;
-    padding: 0 2px;
-    width: 40px;
-    text-align: center;
-    cursor: pointer;
-}
-
-/***********************/
-/* SHARE DIALOG & BUTTONS
-/***********************/
-#share-folder-minisite-public_button.disabled,
-#share-file-minisite_button.disabled{
-    display: none;
-}
-
-input.share_info_panel_link{
-    width: 98% !important;
-    margin-left: 0;
-    font-size: 16px;
-    height: 16px;
-    padding: 5px 2px;
-}
-
-#ajxp_shared_info_panel > div.infoPanelTable{
-    margin: 3%;
-    width: 94%;
-}
-
-#share_folder_form div.SF_element > div.SF_label {
-    float: none;
-    text-align: left;
-    padding: 0;
-}
-
-#share_folder_form div.dialogContentMainTitle {
-    margin: 20px 0 0;
-}
-
-#share_folder_form div.SF_element > input.SF_input,
-select.minisite_layout_selector
-{
-    width: 96% !important;
-}
-
-div#share-folder-type-chooser {
-    font-size: 13px;
-    margin: 0 6px;
-    line-height: 25px;
-}
-
-.share_leaf div.no_share_leaf,
-.share_leaf span.no_share_leaf,
-div.only_share_leaf,
-span.only_share_leaf
-{
-    display: none !important;
-}
-
-.share_leaf div.only_share_leaf{
-    display: block !important;
-}
-
-.share_leaf span.only_share_leaf{
-    display: inline !important;
-}
-
-input#shared_user{
-    width: 370px !important;
-}
-
-div#target_repository_toggle{
-    display: none !important;
-}
-
-.share_edit div#target_repository_toggle{
-    display: block !important;
-    width: 400px;
-}
-
-.share_edit div#target_repository_toggle span{
-    display: inline;
-}
-
-.share_edit div#target_repository_toggle div.SF_horizontal_actions{
-    text-align: right;
-    margin-top: 5px;
-    margin-bottom: -20px;
-    padding-right: 0;
-}
-
-.share_edit div#target_repository,
-.share_edit div#share-folder-type-chooser,
-.share_edit div#share-folder-type-leaf
-{
-    display: none !important;
-}
-
-.share_edit.edit_parameters div#target_repository,
-.share_edit.type-ws div#target_repository
-{
-    display: block !important;
-}
-
-#target_repository_toggle a {
-    border-bottom: 1px solid #555;
-    cursor: pointer;
-}
-#share_generate{
-    height: 40px;
-}
-
-#share_generate div.largeButton{
-    background-color: #4aCEB0;
-}
-
-#shareDialogButtons{
-    padding-top: 30px;
-    text-align: center;
-}
-
-div#share_update{
-    text-align: center;
-    display: none !important;
-}
-
-div#share_result div.non_macos,
-div#share_result div.macos_only
-{
-    font-size:13px;
-    padding:10px 0 0;
-    text-align:center;
-}
-
-.edit_parameters div#shareDialogButtons,
-.edit_parameters div#share_result
-{
-    display: none;
-}
-
-.edit_parameters div#share_update{
-    display: block !important;
-}
-
-#target_repository_toggle span.params_hide,
-.edit_parameters div#target_repository_toggle span.params_view
-{
-    display: none !important;
-}
-.edit_parameters div#target_repository_toggle span.params_hide{
-    display: inline !important;
-}
-
-.share_edit.type-ws span.params_hide, .share_edit.type-ws span.params_view{
-    display: none !important;
-}
-
-#shareDialogButtons div.largeButton,
-#share_update div.largeButton
-{
-    padding: 5px 15px 7px !important;
-    display: inline-block;
-    float: none;
-}
-
-.share_edit.type-ws div#shareDialogButtons{
-    padding-top: 10px;
-}
-.share_edit.type-ws div#shareDialogButtons div.largeButton,
-.share_edit.type-ws div#share_update div.largeButton
-{
-    display: block;
-    margin: 8px 80px;
-}
-
-#shareDialogButtons div.largeButton.destruct{
-    background-color: #A00;
-}
-
-.share_dialog_toggler{
-    cursor: pointer;
-}
-
-.share_dialog_toggler span.toggler_arrow{
-    float: right;
-    margin-right: 5px;
-    margin-top: 3px;
-    transform:rotate(270deg);
-}
-
-.share_dialog_toggler_closed span.toggler_arrow{
-    transform:rotate(0deg);
-}
-
-.share_dialog_toggled{
-    overflow: hidden;
-    transition: height 0.5s ease;
-}
-
-.share_dialog_toggled_closed{
-    height: 0 !important;
-    overflow: hidden;
-}
-
-#editable_hash_link{
-    margin:4px 10px;
-    font-size:13px;
-}
-
-#description_parameters{
-    margin: 5px 0;
-}
-
-#editable_hash_parameters{
-    margin: 5px;
-}
-
-#ws_shared_users_parameters{
-    margin: 0 5px;
-    position: relative;
-}
-
-#share_folder_form{
-    max-width: 400px;
-}
-
-
-div.user_entry span.cbContainer{
-
-}
-/***********************/
-/* EDITORS & DIAPORAMA */
-/***********************/
-textarea.editor
-{
-	background-color:white;
-	font-family:monospace;
-	font-size:13px;
-	line-height:16px;
-}
-
-.diaporamaButton
-{
-  filter:alpha(opacity=40);
-  opacity: 0.4;
-  -moz-opacity:0.4;
-}
-.diaporamaButtonActive,
-.diaporamaButton:hover
-{
-  filter:alpha(opacity=100);
-  opacity: 1;
-  -moz-opacity:1;
-}
-
-#diaporamaMetadataContainer{
-    background-color: #757575;
-    font-family: Arial, Helvetica, sans-serif;
-}
-
-#diaporamaMetadataContainer div.panelContent{
-    margin-top: 6px;
-    margin-bottom: 6px;
-    margin-left: 6px;
-    background-color: white;
-    border-radius: 7px;
-    margin-right: 3px;
-}
-#diaporamaMetadataContainer div.infoPanelImagePreview{
-    border-radius: 7px;
-}
-#diaporamaSplitter div.vsplitbar{
-    background-color: #757575;
-}
-#diaporamaMetadataContainer div.scroller_track{
-    right: 2px;
-    top: 6px;
-}
-#diaporamaMetadataContainer div.scroller_track,
-#diaporamaMetadataContainer div.scroller_handle{
-    border-radius: 0 7px 7px 0;
-}
-#diaporamaMetadataContainer div.imagePreviewOverlay{
-    background-color:rgba(0, 0, 0, 0.2) !important;
-    opacity: 1 !important;
-}
-
-div.icons_only.diaporama_toolbar{
-    height: 40px !important;
-    width: 470px;
-}
-div.diaporama_toolbar div#diaporama_legend{
-    display: none;
-}
-div.diaporama_toolbar div#diaporama_input_boxes{
-    margin-top: 10px !important;
-}
-
-/***********************/
-/* AUTOCOMPLETION DIV  */
-/***********************/
-div.autocomplete
-{
-      position:absolute;
-      font-family:Trebuchet MS, sans-serif;
-      font-size: 11px;
-      width:250px;
-      background-color:white;
-      border:1px solid #bbb;
-      margin:8px 0px 0px;
-      padding:0px;
-      box-shadow: 2px 2px 3px #cccccc;
-      border-radius: 0 0 2px 2px;
-    max-height: 200px;
-    overflow-y: auto;
-}
-div.autocomplete ul
-{
-      list-style-type:none;
-      margin:0px;
-      padding:0px;
-}
-div.autocomplete ul li.selected
-{
-      background-color: #73a2d7;
-}
-div.autocomplete ul li
-{
-      list-style-type:none;
-      display:block;
-      margin:0;
-      padding:7px;
-      cursor:pointer;
-}
-
-/************************/
-/* CONTEXT MENU STYLES  */
-/************************/
-div.menu {
-	position: absolute;
-	top: 0;
-	left: 0;
-	font-family: Trebuchet MS, Helvetica, sans-serif;
-	-moz-border-radius:5px;
-	border-radius:5px;
-}
-div.menu a {
-	display: block;
-	text-decoration: none;
-	cursor: default;
-	outline: none;
-	font-size: 11px;
-}
-.menu .separator {
-	height: 1px;
-	padding: 0;
-	overflow: hidden;
-	display: block;
-	font-size: 1px;
-}
-.menu ul, .menu li {
-	margin: 0;
-	padding: 0;
-	list-style: none;
-    overflow-x: hidden;
-}
-.menu li {
-	list-style-position: outside;
-	min-height: 24px;
-    height: auto;
-}
-
-.menu.desktop {
-	width: 10em;
-	border: 1px solid #D1D2D0;
-	padding: 0;
-    padding-top: 0px;
-    padding-bottom: 1px;
-}
-
-.menu.desktop.toolbarmenu {
-	border: 1px solid #ccc;
-	background: #fff;
-    padding-bottom: 0px;
-	width: auto;
-   /* IE */
-   width:expression("150px");
-	-moz-border-radius : 0px 5px 5px 5px;
-	border-radius : 0px 5px 5px 5px;
-}
-
-.menu.desktop.toolbarmenu img {
-	width: 22px;
-	height:22px;
-}
-
-.menu.desktop.textual{
-    width:7em;
-}
-.menu.desktop.textual img {
-    margin-right: 6px;
-}
-
-
-.menu.desktop ul, .menu.desktop li {
-	margin: 0;
-	padding: 0;
-}
-
-.menu.desktop li{
-    padding: 0px;
-    padding-top: 1px;
-    padding-bottom: 1px;
-    overflow-y: hidden;
-}
-
-.menu.desktop.toolbarmenu li {
-	height: auto;
-    padding-top: 1px;
-    padding-bottom: 0px;
-}
-
-.menu li.menuTitle {
-   font-size: 11px;
-   font-weight: bold;
-   padding-top: 2px;
-   padding-left: 5px;
-   padding-right: 25px;
-   padding-bottom: 5px;
-   color: #ccc;
-   border-bottom: 0px solid #ddd;
-   text-align: left;
-   font-style: italic;
-   display: none;
-}
-
-.menu.desktop li.separator {
-	padding: 0px;
-	height: 1px;
-}
-.menu.desktop a img{
-    margin-right: 9px;
-    margin-top: -5px;
-}
-
-.menu.desktop a {
-	color: #000;
-	padding: 6px 0 2px 5px;
-	margin: 0;
-	height: 17px;
-    font-family: Arial;
-	font-size:11px;
-}
-
-.menu.desktop.toolbarmenu a img{
-    margin-right: 6px;
-}
-
-.menu.desktop.toolbarmenu a {
-	color: #000;
-	padding: 11px 20px 5px 8px;
-	margin: 0;
-    font-family: Arial;
-	font-size:11px;
-}
-
-.menu.desktop a.disabled {
-	opacity: 0.25;
-	filter: alpha(opacity=25);
-	zoom: 1;
-}
-.menu.desktop li.separator a{
-    display: none !important;
-}
-.menu li.separator {
-	border-bottom: 1px solid #fff;
-	margin: 1px 1px 0 1px;
-	line-height: 1px !important;
-    height: 1px !important;
-    min-height: 1px !important;
-}
-.menu.desktop.toolbarmenu li.separator{
-	border-bottom: 1px solid #ddd;
-}
-
-.bookmarksMenu li.separator {
-	border-bottom: 1px solid #fff;
-	margin: 1px 1px 0 1px;
-	line-height: 1px !important;
-	padding: 0px;
-	height: 1px !important;
-}
-/* we need explicit enabled class to overcome css deficiences (without creating unnecessary markup) */
-.menu.desktop a.enabled:hover {
-	background-color: #73a2d7;
-	color: #fff;
-}
-
-.menu.desktop li.menuAnchorSelected,
-.menu.desktop li.menuAnchorSelected a {
-	background-color: #73a2d7;
-	color: #fff !important;
-}
-
-.rootDirChooser
-{
-   font-size: 11px;
-   font-family: Trebuchet MS, sans-serif, Helvetica, sans-serif;
-   position:absolute;
-   z-index: 1500;
-   min-width: 150px;
-   /* IE */
-   width:expression("250px");
-   border: 1px solid #D1D2D0;
-}
-
-.rootDirChooser img
-{
-   border: 0px;
-}
-
-.rootDirChooser a,
-.bookmarksMenu a
-{
-   display: block;
-   padding: 2px;
-   padding-right: 20px;
-   padding-left: 5px;
-   padding-top: 4px;
-}
-
-.rootDirChooser span.menu_description{
-    display:none;
-}
-
-.rootDirChooser a img,
-.bookmarksMenu a img
-{
-   margin-right:5px;
-}
-.rootDirChooser a.disabled IMG{
-	filter: alpha(opacity=30);
-	opacity: 0.3;
-	-moz-opacity: 0.3
-}
-
-.rootDirChooser span.rootDirTitle
-{
-   display: block;
-   font-size: 12px;
-   font-weight: bold;
-   padding-top: 1px;
-   padding-left: 5px;
-   padding-right: 50px;
-   color: #ccc;
-   border-bottom: 0px solid #ddd;
-   text-align: left;
-   font-style: italic;
-}
-
-.rootDirChooser a:hover,
-.bookmarksMenu a:hover,
-.bookmarksMenu a.hovered,
-.rootDirChooser a.hovered
-{
-   background-color: #73a2d7;
-   color: #fff;
-}
-
-.rootDirChooser li.separator {
-	border-bottom: 1px solid #fff;
-	margin: 1px 1px 0 1px;
-	line-height: 1px !important;
-	padding: 0px;
-	height: 1px !important;
-}
-
-
-.bookmarksMenu
-{
-   font-size: 11px;
-   font-family: Trebuchet MS, Helvetica, sans-serif;
-   position:absolute;
-   z-index: 1500;
-   border: 1px solid #D1D2D0;
-   width: 200px;
-   padding: 2px;
-}
-
-.rightAlignMenu a{
-	padding: 4px 5px 2px 20px;
-	text-align:right;
-	height: 16px;
-}
-
-.rightAlignMenu a img{
-	margin-right:0px;
-	margin-left:5px;
-	float: right;
-}
-
-.menuActions {
-    position: absolute;
-    right: 0px;
-    top: 1px;
-    text-align: right;
-    padding-top:2px !important;
-}
-
-.menuActions a{
-	width: 18px;
-	padding: 1px;
-	display: inline-block !important;
-	filter:alpha(opacity=30);
-	opacity: 0.3;
-	-moz-opacity:0.3;
-	cursor: pointer !important;
-    height: 16px;
-}
-
-.menuActions a:hover
-{
-   filter:alpha(opacity=100);
-   opacity: 1.0;
-   -moz-opacity:1.0;
-}
-
-.backgroundPanel{
-   position:absolute;
-   right:0;
-   bottom:20px;
-   padding:1px 5px 3px 7px;
-   font-size:11px;
-   font-weight:bold;
-   color: #fff;
-   font-family: Trebuchet MS, sans-serif;
-   background-color:#5E7C90;
-   filter:alpha(opacity=80);
-   opacity: 0.8;
-   -moz-opacity:0.8;
-    z-index:10000;
-    border-radius: 7px 0 0 7px;
-}
-
-/*******************************/
-/* CREDIT SPLASH SCREEN
-/******************************/
-#docDiv div.title
-{
-    font-size:13px;
-    font-weight: bold;
-}
-
-#docDiv div.subtitle
-{
-    color: #5E7C90;
-    font-size:12px;
-    font-weight: bold;
-}
-
-/********************************************/
-/* NEW HTML5 / CSS3 STYLES  	            */
-/* Generally applied after a Modernizr test */
-/********************************************/
-.css_boxshadow{
-	-moz-box-shadow : 5px 5px 20px rgba(100, 100, 100, 0.5);
-	-webkit-box-shadow : 5px 5px 20px rgba(100, 100, 100, 0.5);
-	box-shadow : 5px 5px 20px rgba(100, 100, 100, 0.5);
-}
-
-.dialogBox.css_boxshadow{
-    -moz-box-shadow : 5px 5px 60px #303030;
-    -webkit-box-shadow : 5px 5px 60px #303030;
-	box-shadow : 5px 5px 60px #303030;
-}
-
-div.dialogBox div.dialogBox.css_boxshadow{
-    -moz-box-shadow: 2px 2px 10px #4C5B6B;
-    -webkit-box-shadow: 2px 2px 10px #4C5B6B;
-    box-shadow: 2px 2px 10px #4C5B6B;
-    border: 1px solid white;
-}
-
-/****************************************/
-/* WEBDAV PREFERENCES                    */
-/****************************************/
-#webdav_repo_list{
-	height: 200px;
-	overflow: auto;
-	border: 1px solid #BBB;
-}
-
-#webdav_repo_list div{
-	padding: 7px;
-}
-
-#webdav_repo_list span{
-	display: inline-block;
-	width: 25%;
-}
-
-#webdav_repo_list input {
-	width: 73%;
-}
-
-input#webdav_password{
-    height: 22px !important;
-}
-
-.video-js-box{
-    margin-left: 10px !important;
-}
-
-.video-js-box.vjs-fullscreen{
-    margin-left: 0px !important;
-}
-
-#video_container{
-    margin: 5px 20px 5px 10px !important;
-}
-
-td.ip_geo_cell{
-    padding-right: 12px !important;
-}
-
-
-.pluginfo_list {
-    padding-left: 0px;
-}
-
-.pluginfo_list li:nth-child(2n+1) {
-    background-color: #F7F7F7;
-}
-
-.pluginfo_list li {
-    list-style: none;
-    padding: 5px 2px;
-    overflow: hidden;
-}
-
-.pluginfo_key {
-    display: inline-block;
-    width: 90px;
-    font-weight: bold;
-}
-
-/************************************************/
-/*     NICE ROUNDED PURE-CSS TABS                                     */
-/*     From http://css-tricks.com/better-tabs-with-round-out-borders/ */
-/************************************************/
-.tabrow {
-    list-style: none;
-    margin: 10px 0 0px;
-    padding: 0 20px;
-    line-height: 24px;
-    height: 26px;
-    overflow: hidden;
-    font-size: 13px;
-    font-family: Verdana;
-    position: relative;
-}
-
-.tabpanes {
-    background-color: #ffffff;
-}
-
-.tabrow li {
-    border: 1px solid #AAA;
-    background: #D1D1D1;
-    background: -o-linear-gradient(top, #ECECEC 50%, #D1D1D1 100%);
-    background: -ms-linear-gradient(top, #ECECEC 50%, #D1D1D1 100%);
-    background: -moz-linear-gradient(top, #ECECEC 50%, #D1D1D1 100%);
-    background: -webkit-linear-gradient(top, #ECECEC 50%, #D1D1D1 100%);
-    background: linear-gradient(top, #ECECEC 50%, #D1D1D1 100%);
-    display: inline-block;
-    position: relative;
-    z-index: 0;
-    border-top-left-radius: 6px;
-    border-top-right-radius: 6px;
-    box-shadow: 0 3px 3px rgba(0, 0, 0, 0.4), inset 0 1px 0 #FFF;
-    text-shadow: 0 1px #FFF;
-    margin: 0 -5px;
-    padding: 0 20px;
-}
-.tabrow span {
-    color: #555;
-    text-decoration: none;
-    cursor: pointer;
-}
-.tabrow li.selected {
-    background: #FFF;
-    color: #333;
-    z-index: 2;
-    border-bottom-color: #FFF;
-}
-.tabrow:before {
-    position: absolute;
-    content: " ";
-    width: 100%;
-    bottom: 0;
-    left: 0;
-    border-bottom: 1px solid #AAA;
-    z-index: 1;
-}
-.tabrow li:before,
-.tabrow li:after {
-    border: 1px solid #AAA;
-    position: absolute;
-    bottom: -1px;
-    width: 5px;
-    height: 5px;
-    content: " ";
-}
-.tabrow li:before {
-    left: -6px;
-    border-bottom-right-radius: 6px;
-    border-width: 0 1px 1px 0;
-    box-shadow: 2px 2px 0 #D1D1D1;
-}
-.tabrow li:after {
-    right: -6px;
-    border-bottom-left-radius: 6px;
-    border-width: 0 0 1px 1px;
-    box-shadow: -2px 2px 0 #D1D1D1;
-}
-.tabrow li.selected:before {
-    box-shadow: 2px 2px 0 #FFF;
-}
-.tabrow li.selected:after {
-    box-shadow: -2px 2px 0 #FFF;
-}
-
-#sm2-container{
-    position: absolute;
-    top: -1000px;
-}
-
-#refresh_button, #thumb_size_button{
-    display:none;
-}
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/css/allz.css b/core/src/plugins/gui.ajax/res/themes/umbra/css/allz.css
deleted file mode 100644
index 08134cbff7..0000000000
--- a/core/src/plugins/gui.ajax/res/themes/umbra/css/allz.css
+++ /dev/null
@@ -1,442 +0,0 @@
-.flexbox div.webfx-tree-container.first_container{background-image:url('../images/tree-even-odd-bg.png')}.no-flexbox div#tree_container{background-image:url('../images/tree-odd-even-bg.png');background-attachment:scroll}.webfx-tree-container{margin:0px;padding:0px;font-family:Trebuchet MS,sans-serif;white-space:nowrap;font-size:11px}.webfx-tree-item{padding:0px;margin:0px;font-family:Trebuchet MS,sans-serif;font-size:11px;white-space:nowrap;height:25px}.webfx-tree-item:hover{background-color:#eee}.selected-webfx-tree-item{color:white}.selected-webfx-tree-item-inactive{text-decoration:none}.webfx-tree-item a,.webfx-tree-item a:active,.webfx-tree-item a:hover,.webfx-tree-item a:link{margin-left:0px;outline:0;cursor:default}.webfx-tree-item a{text-decoration:none}.webfx-tree-item a:hover{text-decoration:none}.webfx-tree-item a{outline:0}.webfx-tree-item a span{display:inline-block;height:19px;line-height:19px;margin-top:4px;padding-left:24px;background-position:4px 1px;background-repeat:no-repeat}*::-moz-focus-inner{border:none}.selected-webfx-tree-item a{color:white!important;text-decoration:none}.webfx-tree-item a.selected-focus{color:white}.webfx-tree-item img{vertical-align:middle;border:0px;float:left}.webfx-tree-icon{width:16px;height:16px;margin-right:3px}.selected{background:#ddd;color:white;text-decoration:none}#container{width:50%;margin:0 auto;text-align:left}.footer{background-color:#000;padding:0.5em}.leightbox{color:#333;display:none;position:absolute;top:45%;left:45%;width:50%;height:50%;padding:1em;border:1em solid #B8B8B8;background-color:white;text-align:left;z-index:1001;overflow:auto}#overlay,#loading_overlay{display:none;position:absolute;top:0;left:0;width:100%;height:100%;z-index:1000;background-color:#2B2B2B;-moz-opacity:0.5;opacity:.50;filter:alpha(opacity=50)}#loading_overlay{display:block;z-index:2000;-moz-opacity:0.2;opacity:0.2;filter:alpha(opacity=20)}#element_overlay{position:absolute;top:0;left:0;width:100%;height:100%;z-index:1000;background-color:#EEEEEE;-moz-opacity:0.8;opacity:.80;filter:alpha(opacity=80);text-align:center;overflow:hidden;padding:0!important;margin:0!important}#element_overlay img{margin-top:30%}#element_iframe{position:absolute;width:80%;height:80%;z-index:1010;background-color:#eee;border:1px solid black}.lightbox[id]{position:fixed}#overlay[id]{position:fixed}table.sort-table tr:nth-child(even){background-color:#f9f9f9}.soft_css_gradient,.menu.desktop,.menu.rootDirChooser,.menu.bookmarksMenu,.action_bar,.slider-pane{background:rgb(255,255,255);background:-moz-linear-gradient(top,rgba(255,255,255,1)0%,rgba(229,229,229,1)100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,rgba(255,255,255,1)),color-stop(100%,rgba(229,229,229,1)));background:-webkit-linear-gradient(top,rgba(255,255,255,1)0%,rgba(229,229,229,1)100%);background:-o-linear-gradient(top,rgba(255,255,255,1)0%,rgba(229,229,229,1)100%);background:-ms-linear-gradient(top,rgba(255,255,255,1)0%,rgba(229,229,229,1)100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff',endColorstr='#e5e5e5',GradientType=0);background:linear-gradient(top,rgba(255,255,255,1)0%,rgba(229,229,229,1)100%)}.css_gradient,.infoPanelGroup,.panelHeader,.dialogBox,.action_bar.floatingBar,.largeButton,.fakeUploadButton,.header_label,.header_resizer{background:rgb(247,247,247);background:-moz-linear-gradient(top,rgba(247,247,247,1)0%,rgba(227,227,227,1)50%,rgba(216,216,216,1)51%,rgba(242,242,242,1)100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,rgba(247,247,247,1)),color-stop(50%,rgba(227,227,227,1)),color-stop(51%,rgba(216,216,216,1)),color-stop(100%,rgba(242,242,242,1)));background:-webkit-linear-gradient(top,rgba(247,247,247,1)0%,rgba(227,227,227,1)50%,rgba(216,216,216,1)51%,rgba(242,242,242,1)100%);background:-o-linear-gradient(top,rgba(247,247,247,1)0%,rgba(227,227,227,1)50%,rgba(216,216,216,1)51%,rgba(242,242,242,1)100%);background:-ms-linear-gradient(top,rgba(247,247,247,1)0%,rgba(227,227,227,1)50%,rgba(216,216,216,1)51%,rgba(242,242,242,1)100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff',endColorstr='#e5e5e5',GradientType=0);background:linear-gradient(top,rgba(247,247,247,1)0%,rgba(227,227,227,1)50%,rgba(216,216,216,1)51%,rgba(242,242,242,1)100%)}div.ascending>.header_label{background:url("../images/arrow_up_margin.png")right center no-repeat;background:url("../images/arrow_up_margin.png")right center no-repeat,-moz-linear-gradient(top,rgba(247,247,247,1)0%,rgba(227,227,227,1)50%,rgba(216,216,216,1)51%,rgba(242,242,242,1)100%);background:url("../images/arrow_up_margin.png")right center no-repeat,-webkit-gradient(linear,left top,left bottom,color-stop(0%,rgba(247,247,247,1)),color-stop(50%,rgba(227,227,227,1)),color-stop(51%,rgba(216,216,216,1)),color-stop(100%,rgba(242,242,242,1)));background:url("../images/arrow_up_margin.png")right center no-repeat,-webkit-linear-gradient(top,rgba(247,247,247,1)0%,rgba(227,227,227,1)50%,rgba(216,216,216,1)51%,rgba(242,242,242,1)100%);background:url("../images/arrow_up_margin.png")right center no-repeat,-o-linear-gradient(top,rgba(247,247,247,1)0%,rgba(227,227,227,1)50%,rgba(216,216,216,1)51%,rgba(242,242,242,1)100%);background:url("../images/arrow_up_margin.png")right center no-repeat,-ms-linear-gradient(top,rgba(247,247,247,1)0%,rgba(227,227,227,1)50%,rgba(216,216,216,1)51%,rgba(242,242,242,1)100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff',endColorstr='#e5e5e5',GradientType=0);background:url("../images/arrow_up_margin.png")right center no-repeat,linear-gradient(top,rgba(247,247,247,1)0%,rgba(227,227,227,1)50%,rgba(216,216,216,1)51%,rgba(242,242,242,1)100%)}div.descending>.header_label{background:url("../images/arrow_down_margin.png")right center no-repeat;background:url("../images/arrow_down_margin.png")right center no-repeat,-moz-linear-gradient(top,rgba(247,247,247,1)0%,rgba(227,227,227,1)50%,rgba(216,216,216,1)51%,rgba(242,242,242,1)100%);background:url("../images/arrow_down_margin.png")right center no-repeat,-webkit-gradient(linear,left top,left bottom,color-stop(0%,rgba(247,247,247,1)),color-stop(50%,rgba(227,227,227,1)),color-stop(51%,rgba(216,216,216,1)),color-stop(100%,rgba(242,242,242,1)));background:url("../images/arrow_down_margin.png")right center no-repeat,-webkit-linear-gradient(top,rgba(247,247,247,1)0%,rgba(227,227,227,1)50%,rgba(216,216,216,1)51%,rgba(242,242,242,1)100%);background:url("../images/arrow_down_margin.png")right center no-repeat,-o-linear-gradient(top,rgba(247,247,247,1)0%,rgba(227,227,227,1)50%,rgba(216,216,216,1)51%,rgba(242,242,242,1)100%);background:url("../images/arrow_down_margin.png")right center no-repeat,-ms-linear-gradient(top,rgba(247,247,247,1)0%,rgba(227,227,227,1)50%,rgba(216,216,216,1)51%,rgba(242,242,242,1)100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff',endColorstr='#e5e5e5',GradientType=0);background:url("../images/arrow_down_margin.png")right center no-repeat,linear-gradient(top,rgba(247,247,247,1)0%,rgba(227,227,227,1)50%,rgba(216,216,216,1)51%,rgba(242,242,242,1)100%)}.grey_gradient_emboss,.selected,div.selected-webfx-tree-item-inactive{background:rgb(221,221,221);background:-moz-linear-gradient(top,rgba(221,221,221,1)46%,rgba(201,201,201,1)100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(46%,rgba(221,221,221,1)),color-stop(100%,rgba(201,201,201,1)));background:-webkit-linear-gradient(top,rgba(221,221,221,1)46%,rgba(201,201,201,1)100%);background:-o-linear-gradient(top,rgba(221,221,221,1)46%,rgba(201,201,201,1)100%);background:-ms-linear-gradient(top,rgba(221,221,221,1)46%,rgba(201,201,201,1)100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#dddddd',endColorstr='#c9c9c9',GradientType=0);background:linear-gradient(top,rgba(221,221,221,1)46%,rgba(201,201,201,1)100%)}.blue_gradient,div.selected-webfx-tree-item,.selected-focus{background:rgb(115,161,215);background:-moz-linear-gradient(top,rgba(115,161,215,1)46%,rgba(66,128,199,1)100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(46%,rgba(115,161,215,1)),color-stop(100%,rgba(66,128,199,1)));background:-webkit-linear-gradient(top,rgba(115,161,215,1)46%,rgba(66,128,199,1)100%);background:-o-linear-gradient(top,rgba(115,161,215,1)46%,rgba(66,128,199,1)100%);background:-ms-linear-gradient(top,rgba(115,161,215,1)46%,rgba(66,128,199,1)100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#73a1d7',endColorstr='#4280c7',GradientType=0)!important;background:linear-gradient(top,rgba(115,161,215,1)46%,rgba(66,128,199,1)100%)}.grey_gradient_light_inputs,.dialogContent input,.dialogContent input[type="text"],.dialogContent input[type="password"],.dialogContent select,#search_txt,#location_form,#repository_form{background:rgb(243,243,243);background:rgb(243,243,243);background:-moz-linear-gradient(top,rgba(243,243,243,1)0%,rgba(255,255,255,1)100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,rgba(243,243,243,1)),color-stop(100%,rgba(255,255,255,1)));background:-webkit-linear-gradient(top,rgba(243,243,243,1)0%,rgba(255,255,255,1)100%);background:-o-linear-gradient(top,rgba(243,243,243,1)0%,rgba(255,255,255,1)100%);background:-ms-linear-gradient(top,rgba(243,243,243,1)0%,rgba(255,255,255,1)100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f3f3f3',endColorstr='#ffffff',GradientType=0);background:linear-gradient(top,rgba(243,243,243,1)0%,rgba(255,255,255,1)100%)}a:link{color:#676965;text-decoration:none;outline:0}a:visited{text-decoration:none;color:#676965}a:hover{text-decoration:none;color:#676965}a:active,a:focus{text-decoration:none;color:#676965;outline:0}body,html{margin:0px;padding:0px}input,textarea,select{margin-top:1px;margin-left:10px;padding:2px;border:1px solid #aaa;font-size:11px;font-family:Trebuchet MS,sans-serif,Nimbus Sans L;border-radius:2px;-moz-border-radius:2px;-webkit-border-radius:2px}textarea{margin-top:0px;margin-left:0px;padding:0px;background-color:#fff}.titre{font-family:Trebuchet MS,Helvetica,Nimbus Sans L,sans-serif;font-size:14px;font-weight:bold;color:black;width:100%;text-align:left}.titre input,.backImage{margin-top:0px;margin-left:0px;padding:2px;border:1px solid #5E7C90}.tooltipped{background-color:#ffffc0}.flexbox body{position:absolute;top:0;bottom:0;left:0;right:0}.vertical_layout{display:-webkit-flex;display:flex;flex-direction:column;-webkit-flex-direction:column}.vertical_layout>*{flex-shrink:0}.horizontal_layout{display:-webkit-flex;display:flex;flex-direction:row;-webkit-flex-direction:row;align-items:stretch;-webkit-align-items:stretch}.vertical_fit{flex:1;-webkit-flex:1;overflow-y:hidden}#sidebar_rootdir_td{height:17px;vertical-align:top}#sidebar_tree_td{vertical-align:top}#sidebar_searchform_td{vertical-align:bottom;height:20px}.thumbnail_selectable_cell{width:110px;height:100px;border:1px solid #eee;float:left;text-align:center;margin:4px;background-color:#f9f9f9;-moz-border-radius:5px;border-radius:5px}div.detailed>div.thumbnail_selectable_cell{width:48%;text-align:left;height:55px;overflow:hidden}div.detailed>div.thumbnail_selectable_cell>div.thumbnail_selectable_cell{margin:9px 11px;border:0;background:transparent}.thumbnail_iconlike_shadow{border:1px solid white;-webkit-box-shadow:0 0 5px#666666;-moz-box-shadow:0 0 5px#666666;box-shadow:0 0 5px#666666}.selectable_div div.selected{border:1px solid #ddd}.selectable_div div.selected-focus{border:1px solid #73A2D7!important}div.detailed div.thumbLabel{font-size:1.4em;margin-top:8px;margin-bottom:1px}.img_cont{width:64px;height:64px;border:1px solid #ddd;vertical-align:middle}.text_label{display:block;overflow:hidden;padding-left:2px;padding-top:2px;height:18px;line-height:17px;white-space:nowrap}.text_label.full{height:auto;white-space:normal}.list_selectable_span img{float:left}#all_forms{background-color:#eee}#all_forms div{display:none}#all_forms form{display:inline}#all_forms div div,#all_forms div.shadow_class{display:block}div.shadow_class{-moz-border-radius:5px;border-radius:5px}.dialogBox,.editBox{background-color:#fff;display:none;position:absolute;top:30%;left:30%;z-index:1002;font-family:Trebuchet MS,sans-serif;font-size:11px;padding:5px;-moz-border-radius:5px;border-radius:5px}.editBox{top:5%;left:5%;padding:0px;margin:0px}.dialogTitle{color:#333333;cursor:move;padding:0px 4px 4px}.dialogContent{background-color:#fff;padding:10px 10px;border:1px solid #dddddd;-moz-border-radius:0px 0px 3px 3px;border-radius:0px 0px 3px 3px}.dialogContent input,.dialogContent input[type="text"],.dialogContent input[type="password"],.dialogContent select,#search_txt{margin-left:0px;width:174px;border:1px solid #aaa;background-repeat:no-repeat;background-position:top left;height:16px;border-radius:2px;-moz-border-radius:2px;-webkit-border-radius:2px}.dialogContent select{height:22px}.dialogContent select[multiple]{height:66px}.dialogContent input:focus,.dialogContent input[type="text"]:focus,.dialogContent input[type="password"]:focus,.dialogContent select:focus{background:white;border:1px solid #5d83ae}.dialogContent input:disabled,.dialogContent input[type="text"]:disabled,.dialogContent input[type="password"]:disabled,.dialogContent option:disabled.dialogContent textarea:disabled{background:#eee}.dialogContent input[type="checkbox"],.dialogContent input[type="radio"]{height:auto;width:auto;border-radius:0px;border:none;filter:none;background:none}.dialogLegend{color:#666;padding-bottom:5px;line-height:16px}.dialogButtons{text-align:right;clear:both}.dialogButtons input,fieldSet input.dialogButton{margin-left:6px;width:22px;height:22px;padding:0px;background-image:none;background-color:#f1f1ef;border-radius:3px;-moz-border-radius:3px}.dialogButtonsCheckbox{float:left;margin-top:9px}.dialogButtonsCheckbox label{cursor:pointer}.editContent,.editContent div{background-color:#fff}.editContent textarea,textarea#myCode,.editContent iframe{border:0px;border-left:1px solid #5E7C90;padding:0px;margin:0px}#activity_monitor_warning{position:absolute;left:35%;width:20%;top:30%;text-align:center;font-size:16px;color:#5E7C90;font-weight:bold;cursor:pointer}#activity_monitor_warning span.click_anywhere{font-size:12px;color:#676965;display:block;padding-top:15px;font-weight:normal}#activity_monitor_warning span.warning_timer{color:#0077b3}textarea#myCode{border:1px solid #666;border-right-color:#ccc;border-left-color:#ccc}.dialogContent form,.editContent form{display:inline;margin:0px}.dialogButton{border-bottom:1px solid buttonshadow;border-right:1px solid buttonshadow;border-top:1px solid #fff;border-left:1px solid #fff;padding-left:8px;padding-right:8px;padding-top:1px;padding-bottom:1px;margin-top:5px}.largeButton{padding:2px 4px 1px;font-size:12px;text-align:center;border:1px solid #A7A7A7;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;cursor:pointer;text-shadow:1px 1px 1px white;box-shadow:inset 1px 1px 1px white;width:95px;display:inline-block!important;margin:0 6px}.largeButton img{width:16px;height:16px;vertical-align:middle;position:relative;top:-2px;margin-right:5px;margin-top:3px}.dialogArrow{font-weight:bold;font-size:16px}#fancyframe{border:0px;width:410px;height:385px}#flashframe{border:0px;width:450px;height:300px;overflow:hidden;margin-top:-9px}#message_div{position:absolute;z-index:1500;cursor:pointer;border-radius:5px;color:#fff}#message_content{font-family:Trebuchet MS,sans-serif,Helvetica,Arial;font-size:11px;margin:8px;overflow-y:auto;max-height:120px}.errorMessage{background-color:#960000;cursor:pointer;filter:alpha(opacity=90);opacity:0.90;-moz-opacity:0.90}.logMessage{background-color:#009600;filter:alpha(opacity=90);opacity:0.90;-moz-opacity:0.90}html.boxshadow div.logMessage{border:1px solid #009600;-webkit-box-shadow:0px 0px 7px#009600;-moz-box-shadow:0px 0px 7px#009600;box-shadow:0px 0px 7px#009600;color:#060!important;opacity:1;background-color:#fff}html.boxshadow div.errorMessage{border:1px solid #960000;-webkit-box-shadow:0px 0px 7px#960000;-moz-box-shadow:0px 0px 7px#960000;box-shadow:0px 0px 7px#960000;color:#600!important;opacity:1;background-color:#fff}.simple_tooltip_observer{cursor:help}.simple_tooltip_observer_active{text-decoration:underline}.simple_tooltip_title{padding-top:2px;padding-bottom:1px;font-weight:bold;font-size:11px}.simple_tooltip{position:absolute;width:200px;z-index:10000;border:1px solid #696765;color:#696765;background-color:#fff;font-family:Trebuchet MS,Helvetica,Sans-serif;font-size:11px;padding:0px 10px 5px 10px;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;-moz-box-shadow:2px 2px 5px#AAAAAA;-webkit-box-shadow:2px 2px 5px#AAAAAA;box-shadow:2px 2px 5px#AAAAAA}div.accordion_toggle{clear:left;background-color:#B0C6D8;padding:2px 6px;margin-top:2px;color:white;font-weight:bold;cursor:pointer;border-radius:4px;background-image:url('../images/0.gif');background-repeat:no-repeat;background-position:5px 6px;padding-left:18px;line-height:15px}div.accordion_toggle_active{background-image:url('../images/1.gif')}div.accordion_content{overflow:hidden;padding:5px}div.dialogContentMainTitle{color:#2B70BE;font-size:20px;margin-bottom:10px;border-bottom:1px solid #2B70BE;padding-bottom:0px}div.oneFieldForm{margin-bottom:13px;background-color:#EEEEEE;padding:3px 6px;border-radius:4px;margin-top:10px}div.oneFieldForm input.SF_input{background:white!important}#progressBox{display:block;z-index:2002;top:20%;-moz-border-radius:5px;border-radius:5px;width:305px;padding:3px;display:block;top:30%;z-index:2002;left:40%;position:absolute;-webkit-box-shadow:1px 1px 24px#aaa;-moz-box-shadow:1px 1px 24px#aaa;box-shadow:1px 1px 24px#aaa}.pg_cancel_button{background-color:#C33;display:inline-block;border-radius:20px;-moz-border-radius:20px;-webkit-border-radius:20px;cursor:pointer;float:right;margin-right:8px;font-weight:bold;color:white!important;height:12px;width:8px;padding-left:4px;line-height:13px;font-size:7px;margin-top:2px}div.SF_element{padding-top:5px;clear:left}div.SF_disabled{color:#ccc;font-style:italic}div.SF_label{float:left;width:39%;text-align:right;padding:3px;padding-right:1%;padding-left:0;line-height:18px}.no-flexbox div.SF_label{padding-right:3px!important}.SF_input{float:left;padding:1px!important;width:57%!important;_width:54%!important}div.SF_element.SF_largeLabel>div.SF_label{width:57%!important;_width:54%!important}div.SF_element.SF_largeLabel>.SF_input{width:39%!important}div.SF_element.SF_largeLabel>input.SF_input.SF_number,input.SF_input.SF_number{width:30px!important;text-align:right}.SF_box{width:20px!important}.SF_fieldCheckBox{float:left;margin:5px}.SF_elementWithCheckbox>.SF_input{width:51%!important;_width:46%!important}.SF_failed{border:1px solid #D8B0B0!important}.SF_replicableGroup{background-color:#EEE;clear:both;position:relative;margin-bottom:5px;border-radius:5px}.SF_replication_Add,.SF_replication_Remove{display:block;width:20px;height:20px;background-image:url('../images/0.gif');background-repeat:no-repeat;background-position:5px 6px;position:absolute;bottom:0;left:0}.SF_replication_Remove{background-image:url('../images/1.gif');top:0}.SF_rgClear{clear:left;height:3px}.SF_image_block{max-width:80px;float:left}.SF_image.small{max-width:80px;max-height:80px}.SF_image_link{display:inline-block;width:80px;cursor:pointer;text-align:center}.accordion_toggle_failed{background-color:#D8B0B0!important}.captcha_container{text-align:center}.captcha_container img{margin:5 0 0 2px;border:1px solid #ddd}.centeredWidth{}#toolbars{}.toolbars_separator{border-bottom:1px solid #fff;border-top:1px solid buttonshadow}.toolbar_title{font-size:15px;font-weight:bold;color:#ddd}.toolbarGroup{display:inline}#tree_container{background-color:#fff;border-radius:2px;-webkit-box-shadow:0px 0px 2px#aaa;-moz-box-shadow:0px 0px 2px#aaa;box-shadow:0px 0px 2px#aaa}.panelHeader{border:none;font-family:Trebuchet MS,sans-serif;font-size:12px;padding:3px 2px 2px 7px;color:#676965;vertical-align:middle;background-color:#fff;height:18px;margin-bottom:1px;-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px 2px 2px 2px;text-shadow:1px 1px 1px#FFFFFF;-webkit-box-shadow:0px 0px 2px#aaa;-moz-box-shadow:0px 0px 2px#aaa;box-shadow:0px 0px 2px#aaa}#sidebar_splitter div.panelHeader,#search_panel div.panelHeader{padding-top:5px;padding-bottom:4px}.action_bar{font-family:Arial;font-size:12px;padding:0px;line-height:15px;height:51px}.action_bar.editor_action_bar{height:55px}div.editor_header{height:55px}div.editor_header>div.editor_action_bar{position:absolute;right:0;padding-right:8px;background:none;padding-top:15px;height:42px;padding-left:10px}div.editor_header>div.editor_action_bar>div.separator{display:none!important}div.editor_header>span.header_label{display:none;font-size:24px;width:100%;padding:15px 0 0 62px;background-image:url('../images/mimes/64/user-acl.png');background-size:40px;background-repeat:no-repeat;background-position:14px 9px;text-shadow:1px 1px 5px black;overflow:visible}.action_bar.text_only{line-height:16px;height:30px}.action_bar.icons_only{height:40px;line-height:0px}.action_bar{overflow:hidden}.action_bar.floatingBar{position:absolute;border-radius:8px;padding-right:10px;padding-left:10px;cursor:move;-webkit-box-shadow:rgba(0,0,0,0.398438)2px 2px 6px;-moz-box-shadow:rgba(0,0,0,0.398438)2px 2px 6px;box-shadow:rgba(0,0,0,0.398438)2px 2px 6px;opacity:0.95}.action_bar span.actionbar_button_label{cursor:pointer;display:block;min-width:35px;padding:0 1px}div.action_bar.icons_only span.actionbar_button_label{display:none}div.action_bar.text_only span.actionbar_button_label{font-size:11px}.action_bar div.actionbar_arrow_div{position:absolute;top:19px;right:11px}.action_bar.icons_only div.actionbar_arrow_div{position:absolute;top:23px;right:6px}.action_bar.icons_only div.actionbar_arrow_div img{height:6px;width:10px}#buttons_bar{border-bottom:1px solid #ccc;padding-left:0px;padding-top:0;overflow:hidden}.action_bar a{display:block;float:left;font-size:9px;padding:4px;text-align:center;overflow:visible;color:#333;outline:none;border-radius:3px;text-shadow:1px 1px 1px white;margin:5px 2px 0px 1px;padding-bottom:1px}.action_bar.icons_only a{padding-bottom:2px;padding-top:3px}.action_bar.text_only a{padding-bottom:3px;padding-top:2px;margin-top:5px}.action_bar a.menuAnchorSelected,.action_bar a:hover{background:white;border:1px solid #ccc;margin:4px 1px 0px 0px}.action_bar.text_only a.menuAnchorSelected,.action_bar.text_only a:hover{margin-top:4px}.action_bar a.menuAnchorSelected{border-bottom:0px;border-radius:3px 3px 0px 0px}.action_bar a.disabled,.action_bar a.disabled:hover{color:expression('#c4c7c1');border:0px;margin:5px 3px 1px 0px}.action_bar a img{margin:2px 0px 0px 0px}div.action_bar.icons_only img.actionbar_button_icon{height:22px;width:22px}div.action_bar.icon_text img.actionbar_button_icon{height:16px;width:16px}div.action_bar.text_only a img{display:none}.action_bar a.separator,div.separator{border-left:1px solid #CCC;border-right:1px solid white;display:block;float:left;font-size:10px;height:100%;margin-left:2px;margin-right:2px;padding-top:0;text-align:center;width:0px}a.carousel-control{border-left:1px solid #c4c7c1;border-right:1px solid #c4c7c1;border-bottom:1px solid #c4c7c1;display:block;float:left;font-size:10px;height:51px;padding-top:0;text-align:center;width:8px!important;margin:0px!important;cursor:pointer;background-color:#fff}a.carousel-disabled{background-color:transparent}a.carousel-control img{}#content_pane{margin:20px;margin-top:17px;-webkit-box-shadow:0 0 5px#aaaaaa;-moz-box-shadow:0 0 5px#aaaaaa;box-shadow:0 0 5px#aaaaaa;background-color:#fff}#topPane,#bottomSplitPane{margin:20px;border:0px!important}#locationbar_cont{background-position:center center;background-repeat:repeat-x;height:33px;_height:32px;width:100%;-webkit-box-shadow:0 0px 5px#bbb;-moz-box-shadow:0 0px 5px#bbb;box-shadow:0 0px 5px#bbb;clear:left}#locationBar{}#location_form,#repository_form{border:1px solid #BBBBBB;border-right-width:0px;float:left;height:20px;padding:2px 0px 0px 4px}#location_form input,#repository_form input,#location_form div{background:transparent!important}#repository_form,#goto_parent{-moz-border-radius:5px 0px 0px 5px;border-radius:5px 0px 0px 5px}#repository_goto,#bookmarks_goto{-moz-border-radius:0px 5px 5px 0px;border-radius:0px 5px 5px 0px}#location_form{margin-left:0px}#location_form div.location_bar_label{line-height:18px}#repository_form{width:120px}#location_form input,#repository_form input{margin:1px 0px 0px 0px;_margin:0px 0px 1px 0px;border:none;height:15px;width:325px;float:left}#repository_form img#repo_icon{float:left;vertical-align:top}#repository_form input{width:90px;margin-left:3px}#repo_chooser{max-width:170px}.inlineBarButton,.inlineBarButtonLeft,.inlineBarButtonRight{display:inline;border:1px solid #bbb;height:22px;float:left;padding:0 1px;cursor:pointer}.inlineBarButtonLeft{border-left-width:0px}.inlineBarButtonRight{border-right-width:0px}.inlineBarButton img,.inlineBarButtonLeft img,.inlineBarButtonRight img{margin-top:3px;display:inline;border:0px}.inline_hover_light,.user_widget_hover{background-color:rgba(255,255,255,0.5)}.inline_hover{background-color:rgba(255,255,255,0.7)}.inline_disabled img,.SF_disabled img{filter:alpha(opacity=30);opacity:0.3;-moz-opacity:0.3;cursor:default}img.simple_button_arrow{position:absolute;right:0px;bottom:1px;display:none}.inline_hover>img.simple_button_arrow{display:block}#search_panel_button{padding:0 2px 0 3px}#logging_string{float:right;color:#666666;font-family:Trebuchet MS,sans-serif;font-size:11px;padding-right:5px}#logging_string i{font-weight:bold}#logging_string i img{font-style:normal;cursor:pointer;margin-right:7px;margin-top:-4px}.user_widget_label{float:left;line-height:16px;border-width:1px 0px 1px 1px;border-style:solid none solid solid;border-color:#bbbbbb;-moz-border-radius:5px 0pt 0pt 5px;border-radius:5px 0pt 0pt 5px;padding:3px 0px 3px 7px;_padding:3px 0px 1px 7px;cursor:pointer}.user_widget_label.withImage{position:relative;padding:0}.user_widget_label.withImage i{font-weight:bold;line-height:22px;display:inline-block;padding:0 4px 0 8px}.user_widget_label.withImage i img{}img.user_widget_mini{vertical-align:middle;height:16px;border:1px solid white;top:5px;left:2px;box-shadow:1px 1px 0px#666}.locationbar_title{display:inline;font-family:Trebuchet MS,sans-serif,Helvetica,Arial;color:#5E7C90;font-size:15px;font-weight:bold;float:left}#current_path,#repo_path{border:none;height:20px;padding:0px;padding-left:3px;padding-top:0px;font-size:11px}#current_path{padding-left:0px}#current_path:focus,#repo_path:focus{outline:none}.slider-pane{background-color:#f1f1ef;border:1px solid #CCCCCC;padding:5px 3px;position:absolute;width:11px;z-index:10000;border-radius:0px 0px 5px 5px;box-shadow:1px 1px 2px rgba(0,0,0,0.25)}.slider-handle,.slider-pane div.selected{background-image:url("../images/slider-handle-vert.png");background-position:top center;background-repeat:no-repeat;background-color:transparent!important;height:15px;width:10px}.slider-tracker{background-image:url("../images/slider-track-bottom.png");background-position:bottom center;background-repeat:no-repeat}.slider-tracker-top{background-image:url("../images/slider-track-top.png");background-position:top center;background-repeat:no-repeat}div.header_resizer{border-bottom:1px solid #676965;overflow:hidden}div.header_resizer div.header_cell{float:left;overflow:hidden;width:90px;text-shadow:1px 1px 1px#FFFFFF;white-space:nowrap;border:0px!important;cursor:pointer}div.header_resizer div.header_label{font-family:Trebuchet MS;font-size:12px;padding:3px 5px 2px}div.header_resizer div.resizer{float:left;width:1px;background-color:#ffffff;height:23px;cursor:e-resize;border:0px}div.header_resizer div.resizer_sortable{background-color:#daddd7}div.header_resizer div.dragging{background-color:#bbb;border-left:1px solid #bbb}div.resizeGhost{width:1px;border-right:1px solid #ccc;position:absolute;z-index:1000;opacity:0.7}div.sort-table-filter div.header_cell{border-right:1px solid #ccc!important;box-shadow:inset 1px 1px 1px rgba(0,0,0,0.37)}div.sort-table-filter div.header_cell:last-child{border-right:0!important}div.header_cell input[type="text"]{margin-left:0;width:96%;border:0;background:transparent}div.sort-table-filter{display:none}div.fl-showFilterPane div.sort-table-filter{display:block}div.fl-displayMode-list.fl-showFilterPane div.scroller_track{top:50px!important}#ws_legend label{font-size:16px!important}.sort-table{font-family:Trebuchet MS,sans-serif;font-size:11px}.sort-table thead{background-color:#aaa}.sort-table td{padding:2px 0px}.no-flexbox.sort-table td{padding:3px 0px}.sort-table thead td{background-color:#ddd;border-bottom:none;cursor:pointer;border-right:1px solid buttonhighlight;font-size:12px;color:#676965;padding:0px;background-color:#f1f1ef;border-bottom:1px solid #676965}.sort-table thead td div{padding-left:7px;padding-top:3px;height:20px;overflow:hidden;white-space:nowrap}.sort-table thead td.descending{background-color:#daddd7;background-image:url("../images/arrow_up_margin.png");background-repeat:no-repeat;background-position:right center}.sort-table thead td.ascending{background-color:#daddd7;background-image:url("../images/arrow_down_margin.png");background-repeat:no-repeat;background-position:right center}#last_header{border-right:0px solid #ddd;widht:auto!important}#last_header:active{}.sort-table thead td:active{background-color:#c4c7c1}.column_resize_grabber{display:block;width:3px;float:right;height:23px;font-size:0px;cursor:e-resize}.odd{}.selected{color:#404040;text-decoration:none}.selected-focus{color:#fff!important}.droppableZone{background-color:#c3d9ff}.paginator{background-color:#fff8d1;border-bottom-color:#dddddd;border-bottom-style:solid;border-bottom-width:1px;font-family:Trebuchet MS;font-size:11px;height:20px;padding-top:2px;text-align:center}.paginatorInput{width:21px;padding:0px 2px;height:14px;text-align:right;border:1px solid #CCCCCC;margin-right:2px;margin-left:5px}div.multiple_selection_draggable{display:block;color:#000;background-color:#fff;padding:5px;padding-bottom:0px;border:1px dashed#999;font-family:Trebuchet MS,sans-serif;font-size:11px;cursor:default;overflow:hidden}div.selection_ctrl_key{background-image:url('../images/0.gif');background-repeat:no-repeat;background-position:bottom right}a.disabled{filter:alpha(opacity=30);opacity:0.3;-moz-opacity:0.3}a.enabled{filter:alpha(opacity=100);opacity:1;-moz-opacity:1}.action_bar a.disabled:hover{background-color:transparent;cursor:default}.action_bar a.disabled{filter:alpha(opacity=100);opacity:1;-moz-opacity:1}.action_bar a.disabled img,.action_bar a.disabled span{filter:alpha(opacity=30);opacity:0.3;-moz-opacity:0.3}#bm_bar_cont{}#bookmarks_bar{display:none;background-color:#fff;position:relative;width:86%;left:7%;height:25px;padding:0px;padding-left:10px}#bmbar_title{color:#ddd;float:right;display:inline;font-family:Trebuchet MS,sans-serif,Helvetica,Arial;font-size:15px;font-weight:bold}a.bookmark_button{text-decoration:none;padding-right:10px}#bookmarks_bar a{display:block;float:left}div.bm,div.bm_hover{filter:alpha(opacity=30);opacity:0.3;-moz-opacity:0.3;display:block;float:right;text-align:center;font-size:11px;padding:3px;margin-right:5px;font-family:Trebuchet MS,sans-serif;color:#333}div.bm_hover{filter:alpha(opacity=100);opacity:1;-moz-opacity:1;text-decoration:none}.extendedMenu{float:none}div#upload_files_list,div#multiple_download_container{background-color:white;overflow:auto;height:250px;width:320px;border:1px solid #ccc;text-align:left;-moz-border-radius:5px;border-radius:5px}.droparea{background:url("../../../../../../index.php?get_action=get_drop_bg")no-repeat scroll right bottom transparent}.dropareaHover{border-color:#D96252!important}div#total_files_list,div#uploader_options_pane{-moz-border-radius:5px 5px 5px 5px;border-radius:5px 5px 5px 5px;background-color:white;border:1px solid #CCCCCC;font-size:11px;height:39px;overflow:hidden;padding:5px 10px;text-align:left;width:301px}div#uploader_options_pane{height:59px}div#uploader_options_pane input{width:15px;margin-right:0px;margin-left:0px;margin-top:5px}div#upload_files_list div,div#multiple_download_container div{overflow:hidden;border-bottom:1px solid #fff;background-color:#efefef;padding-top:6px;padding-bottom:6px;padding-left:6px;position:relative}#upload_files_list img{margin-right:6px}#upload_files_list div a{color:#ddd;font-style:italic}#upload_files_list div a:hover{text-decoration:none;color:#d00}#multiple_download_container div a{display:block}#multiple_download_container div a:hover{text-decoration:none;color:#aaa}#fileInputContainer{vertical-align:top}#fileInputContainerDiv{height:130px;width:62px;margin:0;padding:0;position:relative;overflow:hidden;vertical-align:top}#fileInputContainer input{filter:alpha(opacity:0);opacity:0;moz-opacity:0;position:absolute;font-size:60px;top:0px;right:0px;z-index:10000;height:56px}#fileInputPos{text-align:left;height:60px;width:60px;position:absolute;top:0px;right:0px;overflow:hidden;z-index:9999}.fakeUploadButton{width:60px;padding-top:8px;padding-bottom:5px;border:1px solid #ccc;text-align:center;vertical-align:middle;font-size:10px;margin-bottom:5px;cursor:pointer;color:#667;font-weight:bold;-moz-border-radius:5px;border-radius:5px}.fakeUploadButton.disabled{-moz-opacity:0.5;opacity:0.5;filter:alpha(opacity=50);cursor:default}.fakeUploadButton img{margin-bottom:3px}.fakeOptionButton{padding-top:3px;padding-bottom:3px;margin-bottom:0px;margin-top:5px;background-position:center;-moz-border-radius:5px;border-radius:5px}#uploadBrowseButton{position:absolute;top:0px;right:0px;margin:0}#uploadSendButton{position:absolute;top:63px;right:0px;margin:0}#uploadFilesListContainer{vertical-align:top;font-size:11px;letter-spacing:1}.scroller_track{position:absolute;width:10px;background-color:#F1F1F1;cursor:move;right:10px;z-index:1000;opacity:0.7;border-radius:0px 2px 2px 0px;border-left:1px solid #CCC}.scroller_handle{-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.flexbox div.scroller_track{top:0;bottom:0}div#folder_pane{position:relative}#panelsToggle{height:23px;cursor:pointer}div.tabulatorContainer{padding:3px;padding-bottom:0px;height:24px;border-bottom:1px solid #676965}.toggleHeader{width:50%;cursor:pointer;padding-right:2px;border:1px solid #676965;border-bottom:0px;border-radius:4px 4px 0px 0px;-moz-border-radius:4px 4px 0px 0px;-webkit-border-radius:4px 4px 0px 0px}.toggleHeader a,.toggleHeader a,.toggleHeader a:link,.toggleHeader a:visited,.toggleHeader a:hover,.toggleHeader a:active{text-decoration:none}.panelHeader.panelHeaderWithIcon{position:relative;padding-left:26px}.panelHeader img{position:absolute;top:6px;left:6px}.panelHeader img.panelHeaderCloseIcon{left:auto;right:6px;cursor:pointer}.toggleInactive{background:#EEE!important;border-width:1px;border-bottom:1px solid #676965;filter:alpha(opacity=60);opacity:0.6;-moz-opacity:0.6}.toggleInactive a,.toggleInactive a:link,.toggleInactive a:visited,.toggleInactive a:hover,.toggleInactive a:active{color:#999;text-decoration:none}#search_panel{margin:20px;-webkit-box-shadow:0px 0px 6px#aaa;-moz-box-shadow:0px 0px 6px#aaa;box-shadow:0px 0px 6px#aaa}#search_div{font-family:Trebuchet MS,sans-serif,Helvetica,Arial,Sans-serif;font-size:11px}#search_results{width:100%;overflow:auto;height:120px;background-color:#fff;margin-bottom:3px;position:relative}#search_container{}#search_form,#search_state{padding-left:10px;padding-top:5px;text-align:center;height:25px}#search_form{border-bottom:1px solid #ddd;background-color:#eee}#search_form a{display:block;float:left;width:18px;cursor:pointer;margin-right:0px;margin-left:5px;padding:1px}#search_form a img{margin-top:2px;vertical-align:top}#search_form input{margin:0px}#search_meta{font-family:Arial,Helvetica,SANS-SERIF;font-size:11px;float:right;text-align:left;padding-left:10px;padding-right:18px;padding-top:2px}.searchScore{float:right;color:#CCC;font-size:10px;font-style:italic}.searchUnindex{}meta_opt{cursor:pointer}meta_opt.checked{text-decoration:underline;font-weight:bold}#search_results{margin-left:0px;width:100%;font-family:Arial,Verdana,sans-serif;font-size:11px}#search_results em{color:red;font-style:normal}#search_results div{border-bottom:1px solid #f1f1ef;padding:4px;cursor:pointer}#search_results div:hover{background-color:#73a2d7!important;background-image:-webkit-gradient(linear,left bottom,left top,color-stop(0,rgb(66,128,199)),color-stop(0.54,rgb(115,161,215)));background-image:-moz-linear-gradient(center bottom,rgb(52,111,179)0%,rgb(115,161,215)54%);color:white}.infoPanelActions{padding:5px;font-size:11px}#info_panel div.panelContent{overflow:auto;background-color:#fff;font-family:Arial,Verdana,Sans-serif;font-size:12px;border-radius:2px;-webkit-box-shadow:0px 0px 2px#aaa;-moz-box-shadow:0px 0px 2px#aaa;box-shadow:0px 0px 2px#aaa}#info_panel a{color:#676965;display:block;padding:3px 2px}#info_panel a:hover{font-weight:bold}#info_panel a img{margin-right:5px}#info_panel a:hover{text-decoration:none}#info_panel div.folderImage{text-align:center;padding-bottom:10px}div.ipanel_no_selection_select{display:none}.infoPanelTable{font-size:11px;width:100%}td.infoPanelValue{padding:3px}td.infoPanelLabel{padding:3px 5px;font-weight:bold;width:35%}.infoPanelGroup{border-radius:0px}tr.even td.infoPanelLabel{border-right:1px solid white}tr td.infoPanelLabel{border-right:1px solid #f4f4f4}.infoPanelImagePreview{width:100%;background-color:#ffffff;text-align:center;padding:10px 0}.infoPanelImagePreview img{-webkit-box-shadow:1px 1px 6px#7a7a7a;-moz-box-shadow:1px 1px 6px#7a7a7a;box-shadow:1px 1px 6px#7a7a7a}#browser{clear:left;background-color:#eee;line-height:18px;-webkit-box-shadow:inset 1px 1px 5px#999;-moz-box-shadow:inset 1px 1px 5px#999;box-shadow:inset 1px 1px 5px#999}div.selectable_div,.table_rows_container,#tree_container,#bottomSplitPane,.ajxp_simple_container{font-family:Trebuchet MS,sans-serif,Helvetica,Arial,Sans-serif;font-size:11px}.table_rows_container td,.infoPanelTable td{border-top:1px solid #eee;border-bottom:1px solid #eee;border-right:1px solid #eee}.table_rows_container tr.even td,.infoPanelTable tr.even td{border-top:0px;border-bottom:0px}.table_rows_container tr:first-child td,.infoPanelTable tr:first-child td{border-top:0px}.table_rows_container tr:last-child td,.infoPanelTable tr:last-child td{border-bottom:1px solid #eee}.table_rows_container tr.selected-focus td,.infoPanelTable tr.selected-focus td{border-right:1px solid #73A2D7}.no_select_bg::selection{background:transparent}.no_select_bg::-moz-selection{background:transparent}#vertical_splitter{overflow:hidden}#sidebar_splitter{overflow:auto;width:200px;background-color:#D2DFE9;-webkit-box-shadow:rgb(153,153,153)1px 1px 5px inset;-moz-box-shadow:rgb(153,153,153)1px 1px 5px inset;box-shadow:rgb(153,153,153)1px 1px 5px inset}.splitterContentPane{border:1px solid #676965}.vsplitbar{width:4px;background-image:url(../images/vgrabber.gif);background-repeat:no-repeat;background-position:center}.vsplitbar.active{background-color:#666}.hsplitbar.folded{opacity:0;cursor:default!important}.vsplitbar:hover{}.hsplitbar{height:4px;background-image:url(../images/hgrabber.gif);background-repeat:no-repeat;background-position:center}.hsplitbar.active{background-color:#666}.hsplitbar:hover{}#splashScreen{width:430px;height:332px}#docFileIframe{border-bottom:1px solid #AAAAAA;height:300px;left:0;position:relative;top:0;width:100%}#adminIFrame{border:1px solid white;width:641px;height:390px;background-color:#fff}#users_list,#repo_list{height:299px;width:200px;float:left;padding-top:5px;overflow:auto}#users_detail_panel,#repo_detail_panel{width:438px;height:299px;float:left;border-left:1px solid #bbb;overflow:auto}#repo_list{height:294px}#repo_detail_panel fieldset{margin:10px;font-family:Trebuchet MS,sans-serif;font-size:13px}.metaPane{background-color:#f6f6f6;margin-bottom:5px;margin-top:2px;float:left;padding:6px 5px 8px;width:96%;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.metaPane img,img.metaPaneTitle{float:right;cursor:pointer;margin-left:3px}img.metaPaneTitle{display:none}div.accordion_toggle_active img.metaPaneTitle{display:inline}.metaPane span.title{font-weight:bold}.users_list_title{font-family:Trebuchet MS,Nimbus Sans L,sans-serif;font-size:20px;font-weight:bold;color:white;padding-left:5px;border-bottom:1px solid white;background-color:#bbb}.user{padding-top:15px;padding-left:5px;padding-bottom:15px;background-color:#fff;border-top:1px solid #fff;border-bottom:1px solid #fff;border-left:1px solid #fff;margin-left:5px}.user_id,.user_data,.repository,.password{font-family:Trebuchet MS,sans-serif;font-size:11px}.wallet_pane{margin-left:2px;margin-right:2px;padding:0 10px 0 0}.wallet_pane div.driver_form{width:215px}.wallet_pane input.dialogButton{float:right;border:1px solid #676965}.config_subblock{border:1px dotted#ccc;padding:5px 10px;margin-bottom:10px}.user_data{background-color:#fff}fieldset{border:1px solid #ccc;padding:10px;padding-top:5px;margin-bottom:5px}legend{color:#A6A8A4;font-weight:bold}legend a{text-decoration:none;cursor:pointer}legend a.active{background-color:transparent;color:#87A9C4;text-decoration:none;cursor:default;font-size:1.1em}.repository,.repository td,.password td{padding:1px}.repository td{vertical-align:bottom;line-height:19px;padding:6px 0 5px 6px}.repository input,.user_delete_confirm{border:none;margin-left:1px;margin-top:0px;padding:0px}.user_data{padding:10px}.user_id{cursor:pointer;font-size:17px}.user_id b{color:#666}#user_admin_bar,#repo_create_form,#log_chooser{font-family:Trebuchet MS,sans-serif;padding:15px;font-size:12px;border:0px solid #ddd;background-color:#ddd;border-bottom:1px solid #bbb}#user_admin_bar input,.password input{height:18px;width:90px;font-size:12px;padding:0px;margin-left:0px;margin-right:5px}#user_admin_bar.submit_button,.password.submit_button,#options_pane.submit_button,.password.submit_button{width:30px}#user_admin_bar b,#repo_create_form b,#log_chooser b{font-size:15px;color:#666}#user_pref_form input{width:65px;padding:0px;margin-right:5px}#user_pref_form input.radio{width:20px;border:0px;background-image:none}#repo_create_form select{border:1px solid #5E7C90;height:20px;width:160px}div#available_roles,div#user_roles{padding:0px;border:1px solid #aaa;width:100%;height:80px;overflow:auto}div#rights_pane{border:1px solid #aaa;_height:150px;max-height:150px;overflow:auto;margin-top:5px;padding:2px 0;width:100%}div.ajxp_role{background-color:#FFFFFF;border-left:7px solid #DDDDDD;cursor:move;margin-left:1px;margin-top:1px;padding:1px 4px}div.available_role{filter:alpha(opacity=60);opacity:0.6;-moz-opacity:0.6}div.user_role{opacity:1!important;-moz-opacity:1!important;filter:alpha(opacity=100)!important}.roles_hover{border:1px solid #ffffef}.editable_users_list{border:1px solid #AAAAAA;height:160px;overflow:auto;clear:left;position:relative;margin-top:2px;border-radius:3px}.editable_users_list div.user_entry,li.complete_user_entry,li.complete_group_entry,li.complete_user_entry_temp{clear:left;background-color:rgba(255,255,255,0.7);border-bottom:1px solid #F1F1EF}div.editable_users_list div.user_entry_rights{float:right;padding-top:8px;padding-right:4px}.no-flexbox div.editable_users_list div.user_entry_rights{padding-top:4px}li.complete_user_entry,li.complete_group_entry,li.complete_user_entry_temp{padding:0!important}.editable_users_list div.user_entry span.user_entry_label,li.complete_user_entry span.user_entry_label,li.complete_group_entry span.user_entry_label,li.complete_user_entry_temp span.user_entry_label{display:inline-block;padding:8px 5px 8px 25px!important;background-image:url("../images/mimes/16/user.png");background-repeat:no-repeat;background-position:4px 5px}li.complete_user_entry{}li.complete_group_entry span.user_entry_label,.editable_users_list div.group_entry span.user_entry_label{background-image:url("../images/mimes/16/users-folder.png")}li.complete_user_entry_temp span.user_entry_label,.editable_users_list div.user_entry_temp span.user_entry_label{background-image:url("../images/mimes/16/user_shared.png")}.editable_users_list span.delete_user_entry{background-image:url("../images/mimes/16/trashcan.png");width:12px;height:12px;display:inline-block;background-size:100%;margin-left:5px;cursor:pointer}.editable_users_list label{padding:0 3px;cursor:pointer}span.user_entry_check{display:inline-block;padding:0 5px}.editable_users_list.user_entry_check_hidden span.user_entry_check{display:none}#create_shared_user{width:84%;background-color:#EEE;margin:0 6%;box-shadow:0px 0px 7px#666;padding:1px 4px;border-radius:0px 0px 7px 7px;position:absolute;top:-1px}.editable_users_header{float:right;margin-top:2px;font-style:italic;font-size:9px;color:#AAA;padding:2px}.editable_users_header span,div.user_entry span.cbContainer{display:inline-block;padding:0 2px;width:30px;text-align:center;cursor:pointer}#share-folder-minisite-public_button.disabled,#share-file-minisite_button.disabled{display:none}input.share_info_panel_link{width:98%!important;margin-left:0;font-size:16px;height:16px;padding:5px 2px}#ajxp_shared_info_panel>div.infoPanelTable{margin:3%;width:94%}#share_folder_form div.SF_element>div.SF_label{float:none;text-align:left;padding:0}#share_folder_form div.dialogContentMainTitle{margin:20px 0 0}#share_folder_form div.SF_element>input.SF_input,select.minisite_layout_selector{width:96%!important}div#share-folder-type-chooser{font-size:13px;margin:0 6px;line-height:25px}.share_leaf div.no_share_leaf,.share_leaf span.no_share_leaf,div.only_share_leaf,span.only_share_leaf{display:none!important}.share_leaf div.only_share_leaf{display:block!important}.share_leaf span.only_share_leaf{display:inline!important}input#shared_user{width:370px!important}div#target_repository_toggle{display:none!important}.share_edit div#target_repository_toggle{display:block!important;width:400px}.share_edit div#target_repository_toggle span{display:inline}.share_edit div#target_repository_toggle div.SF_horizontal_actions{text-align:right;margin-top:5px;margin-bottom:-20px;padding-right:0}.share_edit div#target_repository,.share_edit div#share-folder-type-chooser,.share_edit div#share-folder-type-leaf{display:none!important}.share_edit.edit_parameters div#target_repository,.share_edit.type-ws div#target_repository{display:block!important}#target_repository_toggle a{border-bottom:1px solid #555;cursor:pointer}#share_generate{height:40px}#share_generate div.largeButton{background-color:#4aCEB0}#shareDialogButtons{padding-top:30px;text-align:center}div#share_update{text-align:center;display:none!important}div#share_result div.non_macos,div#share_result div.macos_only{font-size:13px;padding:10px 0 0;text-align:center}.edit_parameters div#shareDialogButtons,.edit_parameters div#share_result{display:none}.edit_parameters div#share_update{display:block!important}#target_repository_toggle span.params_hide,.edit_parameters div#target_repository_toggle span.params_view{display:none!important}.edit_parameters div#target_repository_toggle span.params_hide{display:inline!important}.share_edit.type-ws span.params_hide,.share_edit.type-ws span.params_view{display:none!important}#shareDialogButtons div.largeButton,#share_update div.largeButton{padding:5px 15px 7px!important;display:inline-block;float:none}.share_edit.type-ws div#shareDialogButtons{padding-top:10px}.share_edit.type-ws div#shareDialogButtons div.largeButton,.share_edit.type-ws div#share_update div.largeButton{display:block;margin:8px 80px}#shareDialogButtons div.largeButton.destruct{background-color:#A00}.share_dialog_toggler{cursor:pointer}.share_dialog_toggler span.toggler_arrow{float:right;margin-right:5px;margin-top:3px;transform:rotate(270deg)}.share_dialog_toggler_closed span.toggler_arrow{transform:rotate(0deg)}.share_dialog_toggled{overflow:hidden;transition:height 0.5s ease}.share_dialog_toggled_closed{height:0!important;overflow:hidden}#editable_hash_link{margin:4px 10px;font-size:13px}#description_parameters{margin:5px 0}#editable_hash_parameters{margin:5px}#ws_shared_users_parameters{margin:0 5px;position:relative}#share_folder_form{max-width:400px}div.user_entry span.cbContainer{}textarea.editor{background-color:white;font-family:monospace;font-size:13px;line-height:16px}.diaporamaButton{filter:alpha(opacity=40);opacity:0.4;-moz-opacity:0.4}.diaporamaButtonActive,.diaporamaButton:hover{filter:alpha(opacity=100);opacity:1;-moz-opacity:1}#diaporamaMetadataContainer{background-color:#757575;font-family:Arial,Helvetica,sans-serif}#diaporamaMetadataContainer div.panelContent{margin-top:6px;margin-bottom:6px;margin-left:6px;background-color:white;border-radius:7px;margin-right:3px}#diaporamaMetadataContainer div.infoPanelImagePreview{border-radius:7px}#diaporamaSplitter div.vsplitbar{background-color:#757575}#diaporamaMetadataContainer div.scroller_track{right:2px;top:6px}#diaporamaMetadataContainer div.scroller_track,#diaporamaMetadataContainer div.scroller_handle{border-radius:0 7px 7px 0}#diaporamaMetadataContainer div.imagePreviewOverlay{background-color:rgba(0,0,0,0.2)!important;opacity:1!important}div.icons_only.diaporama_toolbar{height:40px!important;width:470px}div.diaporama_toolbar div#diaporama_legend{display:none}div.diaporama_toolbar div#diaporama_input_boxes{margin-top:10px!important}div.autocomplete{position:absolute;font-family:Trebuchet MS,sans-serif;font-size:11px;width:250px;background-color:white;border:1px solid #bbb;margin:8px 0px 0px;padding:0px;box-shadow:2px 2px 3px#cccccc;border-radius:0 0 2px 2px;max-height:200px;overflow-y:auto}div.autocomplete ul{list-style-type:none;margin:0px;padding:0px}div.autocomplete ul li.selected{background-color:#73a2d7}div.autocomplete ul li{list-style-type:none;display:block;margin:0;padding:7px;cursor:pointer}div.menu{position:absolute;top:0;left:0;font-family:Trebuchet MS,Helvetica,sans-serif;-moz-border-radius:5px;border-radius:5px}div.menu a{display:block;text-decoration:none;cursor:default;outline:none;font-size:11px}.menu.separator{height:1px;padding:0;overflow:hidden;display:block;font-size:1px}.menu ul,.menu li{margin:0;padding:0;list-style:none;overflow-x:hidden}.menu li{list-style-position:outside;min-height:24px;height:auto}.menu.desktop{width:10em;border:1px solid #D1D2D0;padding:0;padding-top:0px;padding-bottom:1px}.menu.desktop.toolbarmenu{border:1px solid #ccc;background:#fff;padding-bottom:0px;width:auto;width:expression("150px");-moz-border-radius:0px 5px 5px 5px;border-radius:0px 5px 5px 5px}.menu.desktop.toolbarmenu img{width:22px;height:22px}.menu.desktop.textual{width:7em}.menu.desktop.textual img{margin-right:6px}.menu.desktop ul,.menu.desktop li{margin:0;padding:0}.menu.desktop li{padding:0px;padding-top:1px;padding-bottom:1px;overflow-y:hidden}.menu.desktop.toolbarmenu li{height:auto;padding-top:1px;padding-bottom:0px}.menu li.menuTitle{font-size:11px;font-weight:bold;padding-top:2px;padding-left:5px;padding-right:25px;padding-bottom:5px;color:#ccc;border-bottom:0px solid #ddd;text-align:left;font-style:italic;display:none}.menu.desktop li.separator{padding:0px;height:1px}.menu.desktop a img{margin-right:9px;margin-top:-5px}.menu.desktop a{color:#000;padding:6px 0 2px 5px;margin:0;height:17px;font-family:Arial;font-size:11px}.menu.desktop.toolbarmenu a img{margin-right:6px}.menu.desktop.toolbarmenu a{color:#000;padding:11px 20px 5px 8px;margin:0;font-family:Arial;font-size:11px}.menu.desktop a.disabled{opacity:0.25;filter:alpha(opacity=25);zoom:1}.menu.desktop li.separator a{display:none!important}.menu li.separator{border-bottom:1px solid #fff;margin:1px 1px 0 1px;line-height:1px!important;height:1px!important;min-height:1px!important}.menu.desktop.toolbarmenu li.separator{border-bottom:1px solid #ddd}.bookmarksMenu li.separator{border-bottom:1px solid #fff;margin:1px 1px 0 1px;line-height:1px!important;padding:0px;height:1px!important}.menu.desktop a.enabled:hover{background-color:#73a2d7;color:#fff}.menu.desktop li.menuAnchorSelected,.menu.desktop li.menuAnchorSelected a{background-color:#73a2d7;color:#fff!important}.rootDirChooser{font-size:11px;font-family:Trebuchet MS,sans-serif,Helvetica,sans-serif;position:absolute;z-index:1500;min-width:150px;width:expression("250px");border:1px solid #D1D2D0}.rootDirChooser img{border:0px}.rootDirChooser a,.bookmarksMenu a{display:block;padding:2px;padding-right:20px;padding-left:5px;padding-top:4px}.rootDirChooser span.menu_description{display:none}.rootDirChooser a img,.bookmarksMenu a img{margin-right:5px}.rootDirChooser a.disabled IMG{filter:alpha(opacity=30);opacity:0.3;-moz-opacity:0.3}.rootDirChooser span.rootDirTitle{display:block;font-size:12px;font-weight:bold;padding-top:1px;padding-left:5px;padding-right:50px;color:#ccc;border-bottom:0px solid #ddd;text-align:left;font-style:italic}.rootDirChooser a:hover,.bookmarksMenu a:hover,.bookmarksMenu a.hovered,.rootDirChooser a.hovered{background-color:#73a2d7;color:#fff}.rootDirChooser li.separator{border-bottom:1px solid #fff;margin:1px 1px 0 1px;line-height:1px!important;padding:0px;height:1px!important}.bookmarksMenu{font-size:11px;font-family:Trebuchet MS,Helvetica,sans-serif;position:absolute;z-index:1500;border:1px solid #D1D2D0;width:200px;padding:2px}.rightAlignMenu a{padding:4px 5px 2px 20px;text-align:right;height:16px}.rightAlignMenu a img{margin-right:0px;margin-left:5px;float:right}.menuActions{position:absolute;right:0px;top:1px;text-align:right;padding-top:2px!important}.menuActions a{width:18px;padding:1px;display:inline-block!important;filter:alpha(opacity=30);opacity:0.3;-moz-opacity:0.3;cursor:pointer!important;height:16px}.menuActions a:hover{filter:alpha(opacity=100);opacity:1.0;-moz-opacity:1.0}.backgroundPanel{position:absolute;right:0;bottom:20px;padding:1px 5px 3px 7px;font-size:11px;font-weight:bold;color:#fff;font-family:Trebuchet MS,sans-serif;background-color:#5E7C90;filter:alpha(opacity=80);opacity:0.8;-moz-opacity:0.8;z-index:10000;border-radius:7px 0 0 7px}#docDiv div.title{font-size:13px;font-weight:bold}#docDiv div.subtitle{color:#5E7C90;font-size:12px;font-weight:bold}.css_boxshadow{-moz-box-shadow:5px 5px 20px rgba(100,100,100,0.5);-webkit-box-shadow:5px 5px 20px rgba(100,100,100,0.5);box-shadow:5px 5px 20px rgba(100,100,100,0.5)}.dialogBox.css_boxshadow{-moz-box-shadow:5px 5px 60px#303030;-webkit-box-shadow:5px 5px 60px#303030;box-shadow:5px 5px 60px#303030}div.dialogBox div.dialogBox.css_boxshadow{-moz-box-shadow:2px 2px 10px#4C5B6B;-webkit-box-shadow:2px 2px 10px#4C5B6B;box-shadow:2px 2px 10px#4C5B6B;border:1px solid white}#webdav_repo_list{height:200px;overflow:auto;border:1px solid #BBB}#webdav_repo_list div{padding:7px}#webdav_repo_list span{display:inline-block;width:25%}#webdav_repo_list input{width:73%}input#webdav_password{height:22px!important}.video-js-box{margin-left:10px!important}.video-js-box.vjs-fullscreen{margin-left:0px!important}#video_container{margin:5px 20px 5px 10px!important}td.ip_geo_cell{padding-right:12px!important}.pluginfo_list{padding-left:0px}.pluginfo_list li:nth-child(2n+1){background-color:#F7F7F7}.pluginfo_list li{list-style:none;padding:5px 2px;overflow:hidden}.pluginfo_key{display:inline-block;width:90px;font-weight:bold}.tabrow{list-style:none;margin:10px 0 0px;padding:0 20px;line-height:24px;height:26px;overflow:hidden;font-size:13px;font-family:Verdana;position:relative}.tabpanes{background-color:#ffffff}.tabrow li{border:1px solid #AAA;background:#D1D1D1;background:-o-linear-gradient(top,#ECECEC 50%,#D1D1D1 100%);background:-ms-linear-gradient(top,#ECECEC 50%,#D1D1D1 100%);background:-moz-linear-gradient(top,#ECECEC 50%,#D1D1D1 100%);background:-webkit-linear-gradient(top,#ECECEC 50%,#D1D1D1 100%);background:linear-gradient(top,#ECECEC 50%,#D1D1D1 100%);display:inline-block;position:relative;z-index:0;border-top-left-radius:6px;border-top-right-radius:6px;box-shadow:0 3px 3px rgba(0,0,0,0.4),inset 0 1px 0#FFF;text-shadow:0 1px#FFF;margin:0-5px;padding:0 20px}.tabrow span{color:#555;text-decoration:none;cursor:pointer}.tabrow li.selected{background:#FFF;color:#333;z-index:2;border-bottom-color:#FFF}.tabrow:before{position:absolute;content:" ";width:100%;bottom:0;left:0;border-bottom:1px solid #AAA;z-index:1}.tabrow li:before,.tabrow li:after{border:1px solid #AAA;position:absolute;bottom:-1px;width:5px;height:5px;content:" "}.tabrow li:before{left:-6px;border-bottom-right-radius:6px;border-width:0 1px 1px 0;box-shadow:2px 2px 0#D1D1D1}.tabrow li:after{right:-6px;border-bottom-left-radius:6px;border-width:0 0 1px 1px;box-shadow:-2px 2px 0#D1D1D1}.tabrow li.selected:before{box-shadow:2px 2px 0#FFF}.tabrow li.selected:after{box-shadow:-2px 2px 0#FFF}#sm2-container{position:absolute;top:-1000px}#refresh_button,#thumb_size_button{display:none}
-/*!
-Chosen, a Select Box Enhancer for jQuery and Prototype
-by Patrick Filler for Harvest, http://getharvest.com
-
-Version 1.2.0
-Full source at https://github.com/harvesthq/chosen
-Copyright (c) 2011-2014 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 */
-.chosen-container {
-  position: relative;
-  display: inline-block;
-  vertical-align: middle;
-  font-size: 13px;
-  zoom: 1;
-  *display: inline;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  user-select: none;
-    max-width: 466px;
-    width: 99% !important;
-}
-.chosen-container * {
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-}
-.chosen-container .chosen-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);
-}
-.chosen-container.chosen-with-drop .chosen-drop {
-  left: 0;
-}
-.chosen-container a {
-  cursor: pointer;
-}
-
-/* @end */
-/* @group Single Chosen */
-.chosen-container-single .chosen-single {
-  position: relative;
-  display: block;
-  overflow: hidden;
-    padding: 2px 0 0 8px;
-    height: 30px;
-    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(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
-  background: -moz-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
-  background: -o-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
-  background: linear-gradient(top, #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;
-}
-.chosen-container-single .chosen-default {
-  color: #999;
-}
-.chosen-container-single .chosen-single span {
-  display: block;
-  overflow: hidden;
-  margin-right: 26px;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.chosen-container-single .chosen-single-with-deselect span {
-  margin-right: 38px;
-}
-.chosen-container-single .chosen-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;
-}
-.chosen-container-single .chosen-single abbr:hover {
-  background-position: -42px -10px;
-}
-.chosen-container-single.chosen-disabled .chosen-single abbr:hover {
-  background-position: -42px -10px;
-}
-.chosen-container-single .chosen-single div {
-  position: absolute;
-  top: 0;
-  right: 0;
-  display: block;
-  width: 18px;
-  height: 100%;
-}
-.chosen-container-single .chosen-single div b {
-  display: block;
-  width: 100%;
-  height: 100%;
-  background: url('chosen-sprite.png') no-repeat 0px 6px;
-}
-.chosen-container-single .chosen-search {
-  position: relative;
-  z-index: 1010;
-  margin: 0;
-  padding: 3px 4px;
-  white-space: nowrap;
-}
-.chosen-container-single .chosen-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;
-}
-.chosen-container-single .chosen-drop {
-  margin-top: -1px;
-  border-radius: 0 0 4px 4px;
-  background-clip: padding-box;
-}
-.chosen-container-single.chosen-container-single-nosearch .chosen-search {
-  position: absolute;
-  left: -9999px;
-}
-
-/* @end */
-/* @group Results */
-.chosen-container .chosen-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;
-}
-.chosen-container .chosen-results li {
-  display: none;
-  margin: 0;
-  padding: 5px 6px;
-  list-style: none;
-  line-height: 15px;
-  word-wrap: break-word;
-  -webkit-touch-callout: none;
-}
-.chosen-container .chosen-results li.active-result {
-  display: list-item;
-  cursor: pointer;
-}
-.chosen-container .chosen-results li.disabled-result {
-  display: list-item;
-  color: #ccc;
-  cursor: default;
-}
-.chosen-container .chosen-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;
-}
-.chosen-container .chosen-results li.no-results {
-  color: #777;
-  display: list-item;
-  background: #f4f4f4;
-}
-.chosen-container .chosen-results li.group-result {
-  display: list-item;
-  font-weight: bold;
-  cursor: default;
-  font-family: "Open Sans Regular";
-  text-transform: uppercase;
-}
-.chosen-container .chosen-results li.group-option {
-  padding-left: 15px;
-}
-.chosen-container .chosen-results li em {
-  font-style: normal;
-  text-decoration: underline;
-}
-
-/* @end */
-/* @group Multi Chosen */
-.chosen-container-multi .chosen-choices {
-  position: relative;
-  overflow: hidden;
-  margin: 0;
-  padding: 0 5px;
-  width: 100%;
-  height: auto !important;
-  height: 1%;
-  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;
-}
-.chosen-container-multi .chosen-choices li {
-  float: left;
-  list-style: none;
-}
-.chosen-container-multi .chosen-choices li.search-field {
-  margin: 0;
-  padding: 0;
-  white-space: nowrap;
-}
-.chosen-container-multi .chosen-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;
-}
-.chosen-container-multi .chosen-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;
-}
-.chosen-container-multi .chosen-choices li.search-choice span {
-  word-wrap: break-word;
-}
-.chosen-container-multi .chosen-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;
-}
-.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover {
-  background-position: -42px -10px;
-}
-.chosen-container-multi .chosen-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(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-  background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-  background-image: -o-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-  background-image: linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-  color: #666;
-}
-.chosen-container-multi .chosen-choices li.search-choice-focus {
-  background: #d4d4d4;
-}
-.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close {
-  background-position: -42px -10px;
-}
-.chosen-container-multi .chosen-results {
-  margin: 0;
-  padding: 0;
-}
-.chosen-container-multi .chosen-drop .result-selected {
-  display: list-item;
-  color: #ccc;
-  cursor: default;
-}
-
-/* @end */
-/* @group Active  */
-.chosen-container-active .chosen-single {
-  border: 1px solid #5897fb;
-  box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
-}
-.chosen-container-active.chosen-with-drop .chosen-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%);
-  box-shadow: 0 1px 0 #fff inset;
-}
-.chosen-container-active.chosen-with-drop .chosen-single div {
-  border-left: none;
-  background: transparent;
-}
-.chosen-container-active.chosen-with-drop .chosen-single div b {
-  background-position: -18px 6px;
-}
-.chosen-container-active .chosen-choices {
-  border: 1px solid #5897fb;
-  box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
-}
-.chosen-container-active .chosen-choices li.search-field input[type="text"] {
-  color: #222 !important;
-}
-
-/* @end */
-/* @group Disabled Support */
-.chosen-disabled {
-  opacity: 0.5 !important;
-  cursor: default;
-}
-.chosen-disabled .chosen-single {
-  cursor: default;
-}
-.chosen-disabled .chosen-choices .search-choice .search-choice-close {
-  cursor: default;
-}
-
-/* @end */
-/* @group Right to Left */
-.chosen-rtl {
-  text-align: right;
-}
-.chosen-rtl .chosen-single {
-  overflow: visible;
-  padding: 0 8px 0 0;
-}
-.chosen-rtl .chosen-single span {
-  margin-right: 0;
-  margin-left: 26px;
-  direction: rtl;
-}
-.chosen-rtl .chosen-single-with-deselect span {
-  margin-left: 38px;
-}
-.chosen-rtl .chosen-single div {
-  right: auto;
-  left: 3px;
-}
-.chosen-rtl .chosen-single abbr {
-  right: auto;
-  left: 26px;
-}
-.chosen-rtl .chosen-choices li {
-  float: right;
-}
-.chosen-rtl .chosen-choices li.search-field input[type="text"] {
-  direction: rtl;
-}
-.chosen-rtl .chosen-choices li.search-choice {
-  margin: 3px 5px 3px 0;
-  padding: 3px 5px 3px 19px;
-}
-.chosen-rtl .chosen-choices li.search-choice .search-choice-close {
-  right: auto;
-  left: 4px;
-}
-.chosen-rtl.chosen-container-single-nosearch .chosen-search,
-.chosen-rtl .chosen-drop {
-  left: 9999px;
-}
-.chosen-rtl.chosen-container-single .chosen-results {
-  margin: 0 0 4px 4px;
-  padding: 0 4px 0 0;
-}
-.chosen-rtl .chosen-results li.group-option {
-  padding-right: 15px;
-  padding-left: 0;
-}
-.chosen-rtl.chosen-container-active.chosen-with-drop .chosen-single div {
-  border-right: none;
-}
-.chosen-rtl .chosen-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;
-}
-.chosen-rtl.chosen-container-single .chosen-single div b {
-  background-position: 6px 2px;
-}
-.chosen-rtl.chosen-container-single.chosen-with-drop .chosen-single div b {
-  background-position: -12px 2px;
-}
-
-/* @end */
-/* @group Retina compatibility */
-@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-resolution: 144dpi) {
-  .chosen-rtl .chosen-search input[type="text"],
-  .chosen-container-single .chosen-single abbr,
-  .chosen-container-single .chosen-single div b,
-  .chosen-container-single .chosen-search input[type="text"],
-  .chosen-container-multi .chosen-choices .search-choice .search-choice-close,
-  .chosen-container .chosen-results-scroll-down span,
-  .chosen-container .chosen-results-scroll-up span {
-    background-image: url('chosen-sprite@2x.png') !important;
-    background-size: 52px 37px !important;
-    background-repeat: no-repeat !important;
-  }
-}
-/* @end */
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/css/allz_list.txt b/core/src/plugins/gui.ajax/res/themes/umbra/css/allz_list.txt
deleted file mode 100644
index fbbc65135e..0000000000
--- a/core/src/plugins/gui.ajax/res/themes/umbra/css/allz_list.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-themes/umbra/css/xtree.css
-themes/umbra/css/screen.css
-themes/umbra/css/ajaxplorer.css
-themes/orbit/css/chosen.css#NO_MINI
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/css/pie/PIE.htc b/core/src/plugins/gui.ajax/res/themes/umbra/css/pie/PIE.htc
deleted file mode 100644
index b39af01ab0..0000000000
--- a/core/src/plugins/gui.ajax/res/themes/umbra/css/pie/PIE.htc
+++ /dev/null
@@ -1,81 +0,0 @@
-<!--
-PIE: CSS3 rendering for IE
-Version 1.0beta4
-http://css3pie.com
-Dual-licensed for use under the Apache License Version 2.0 or the General Public License (GPL) Version 2.
--->
-<PUBLIC:COMPONENT lightWeight="true">
-<PUBLIC:ATTACH EVENT="oncontentready" FOR="element" ONEVENT="init()" />
-<PUBLIC:ATTACH EVENT="ondocumentready" FOR="element" ONEVENT="init()" />
-<PUBLIC:ATTACH EVENT="ondetach" FOR="element" ONEVENT="cleanup()" />
-
-<script type="text/javascript">
-var doc = element.document;var g=window.PIE;
-if(!g){g=window.PIE={F:"-pie-",Sa:"Pie",Pa:"pie_",Jb:{TD:1,TH:1}};try{doc.execCommand("BackgroundImageCache",false,true)}catch(L){}g.J=function(){for(var a=4,b=doc.createElement("div"),c=b.getElementsByTagName("i");b.innerHTML="<!--[if gt IE "+ ++a+"]><i></i><![endif]--\>",c[0];);return a}();if(g.J===6)g.F=g.F.replace(/^-/,"");g.Ab=doc.documentMode||g.J;(function(){var a,b=0,c={};g.p={Ga:function(e){if(!a){a=doc.createDocumentFragment();a.namespaces.add("css3vml","urn:schemas-microsoft-com:vml")}return a.createElement("css3vml:"+e)},
-ta:function(e){return e&&e._pieId||(e._pieId=++b)},fb:function(e){var f,h,j,d,i=arguments;f=1;for(h=i.length;f<h;f++){d=i[f];for(j in d)if(d.hasOwnProperty(j))e[j]=d[j]}return e},Pb:function(e,f,h){var j=c[e],d,i;if(j)Object.prototype.toString.call(j)==="[object Array]"?j.push([f,h]):f.call(h,j);else{i=c[e]=[[f,h]];d=new Image;d.onload=function(){j=c[e]={i:d.width,f:d.height};for(var k=0,m=i.length;k<m;k++)i[k][0].call(i[k][1],j);d.onload=null};d.src=e}}}})();g.ia=function(){this.hb=[];this.Db={}};
-g.ia.prototype={aa:function(a){var b=g.p.ta(a),c=this.Db,e=this.hb;if(!(b in c)){c[b]=e.length;e.push(a)}},Ma:function(a){a=g.p.ta(a);var b=this.Db;if(a&&a in b){delete this.hb[b[a]];delete b[a]}},Ia:function(){for(var a=this.hb,b=a.length;b--;)a[b]&&a[b]()}};g.ya=new g.ia;g.ya.Tc=function(){var a=this;if(!a.Uc){setInterval(function(){a.Ia()},250);a.Uc=1}};g.G=new g.ia;window.attachEvent("onbeforeunload",function(){g.G.Ia()});g.G.Ea=function(a,b,c){a.attachEvent(b,c);this.aa(function(){a.detachEvent(b,
-c)})};(function(){function a(){g.za.Ia()}g.za=new g.ia;g.G.Ea(window,"onresize",a)})();(function(){function a(){g.Ra.Ia()}g.Ra=new g.ia;g.G.Ea(window,"onscroll",a);g.za.aa(a)})();(function(){function a(){c=g.Qa.wc()}function b(){if(c){for(var e=0,f=c.length;e<f;e++)g.attach(c[e]);c=0}}var c;g.G.Ea(window,"onbeforeprint",a);g.G.Ea(window,"onafterprint",b)})();g.hd=function(){function a(i){this.V=i}var b=doc.createElement("length-calc"),c=doc.documentElement,e=b.style,f={},h=["mm","cm","in","pt","pc"],
-j=h.length,d={};e.position="absolute";e.top=e.left="-9999px";for(c.appendChild(b);j--;){b.style.width="100"+h[j];f[h[j]]=b.offsetWidth/100}c.removeChild(b);a.prototype={ib:/(px|em|ex|mm|cm|in|pt|pc|%)$/,vb:function(){var i=this.Lc;if(i===void 0)i=this.Lc=parseFloat(this.V);return i},ab:function(){var i=this.ad;if(!i)i=this.ad=(i=this.V.match(this.ib))&&i[0]||"px";return i},a:function(i,k){var m=this.vb(),l=this.ab();switch(l){case "px":return m;case "%":return m*(typeof k==="function"?k():k)/100;
-case "em":return m*this.tb(i);case "ex":return m*this.tb(i)/2;default:return m*f[l]}},tb:function(i){var k=i.currentStyle.fontSize;if(k.indexOf("px")>0)return parseFloat(k);else{b.style.width="1em";i.appendChild(b);k=b.offsetWidth;b.parentNode===i&&i.removeChild(b);return k}}};g.k=function(i){return d[i]||(d[i]=new a(i))};return a}();g.Na=function(){function a(f){this.U=f}var b=g.k("50%"),c={top:1,center:1,bottom:1},e={left:1,center:1,right:1};a.prototype={Dc:function(){if(!this.sb){var f=this.U,
-h=f.length,j=g.u,d=j.ja,i=g.k("0");d=d.fa;i=["left",i,"top",i];if(h===1){f.push(new j.Ta(d,"center"));h++}if(h===2){d&(f[0].h|f[1].h)&&f[0].d in c&&f[1].d in e&&f.push(f.shift());if(f[0].h&d)if(f[0].d==="center")i[1]=b;else i[0]=f[0].d;else if(f[0].Y())i[1]=g.k(f[0].d);if(f[1].h&d)if(f[1].d==="center")i[3]=b;else i[2]=f[1].d;else if(f[1].Y())i[3]=g.k(f[1].d)}this.sb=i}return this.sb},coords:function(f,h,j){var d=this.Dc(),i=d[1].a(f,h);f=d[3].a(f,j);return{x:d[0]==="right"?h-i:i,y:d[2]==="bottom"?
-j-f:f}}};return a}();g.Rb=function(){function a(b){this.V=b}a.prototype={ib:/[a-z]+$/i,ab:function(){return this.lc||(this.lc=this.V.match(this.ib)[0].toLowerCase())},vc:function(){var b=this.fc,c;if(b===undefined){b=this.ab();c=parseFloat(this.V,10);b=this.fc=b==="deg"?c:b==="rad"?c/Math.PI*180:b==="grad"?c/400*360:b==="turn"?c*360:0}return b}};return a}();g.$b=function(){function a(c){this.V=c}var b={};a.Sc=/\s*rgba\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d+|\d*\.\d+)\s*\)\s*/;a.gb=
-{aliceblue:"F0F8FF",antiquewhite:"FAEBD7",aqua:"0FF",aquamarine:"7FFFD4",azure:"F0FFFF",beige:"F5F5DC",bisque:"FFE4C4",black:"000",blanchedalmond:"FFEBCD",blue:"00F",blueviolet:"8A2BE2",brown:"A52A2A",burlywood:"DEB887",cadetblue:"5F9EA0",chartreuse:"7FFF00",chocolate:"D2691E",coral:"FF7F50",cornflowerblue:"6495ED",cornsilk:"FFF8DC",crimson:"DC143C",cyan:"0FF",darkblue:"00008B",darkcyan:"008B8B",darkgoldenrod:"B8860B",darkgray:"A9A9A9",darkgreen:"006400",darkkhaki:"BDB76B",darkmagenta:"8B008B",darkolivegreen:"556B2F",
-darkorange:"FF8C00",darkorchid:"9932CC",darkred:"8B0000",darksalmon:"E9967A",darkseagreen:"8FBC8F",darkslateblue:"483D8B",darkslategray:"2F4F4F",darkturquoise:"00CED1",darkviolet:"9400D3",deeppink:"FF1493",deepskyblue:"00BFFF",dimgray:"696969",dodgerblue:"1E90FF",firebrick:"B22222",floralwhite:"FFFAF0",forestgreen:"228B22",fuchsia:"F0F",gainsboro:"DCDCDC",ghostwhite:"F8F8FF",gold:"FFD700",goldenrod:"DAA520",gray:"808080",green:"008000",greenyellow:"ADFF2F",honeydew:"F0FFF0",hotpink:"FF69B4",indianred:"CD5C5C",
-indigo:"4B0082",ivory:"FFFFF0",khaki:"F0E68C",lavender:"E6E6FA",lavenderblush:"FFF0F5",lawngreen:"7CFC00",lemonchiffon:"FFFACD",lightblue:"ADD8E6",lightcoral:"F08080",lightcyan:"E0FFFF",lightgoldenrodyellow:"FAFAD2",lightgreen:"90EE90",lightgrey:"D3D3D3",lightpink:"FFB6C1",lightsalmon:"FFA07A",lightseagreen:"20B2AA",lightskyblue:"87CEFA",lightslategray:"789",lightsteelblue:"B0C4DE",lightyellow:"FFFFE0",lime:"0F0",limegreen:"32CD32",linen:"FAF0E6",magenta:"F0F",maroon:"800000",mediumauqamarine:"66CDAA",
-mediumblue:"0000CD",mediumorchid:"BA55D3",mediumpurple:"9370D8",mediumseagreen:"3CB371",mediumslateblue:"7B68EE",mediumspringgreen:"00FA9A",mediumturquoise:"48D1CC",mediumvioletred:"C71585",midnightblue:"191970",mintcream:"F5FFFA",mistyrose:"FFE4E1",moccasin:"FFE4B5",navajowhite:"FFDEAD",navy:"000080",oldlace:"FDF5E6",olive:"808000",olivedrab:"688E23",orange:"FFA500",orangered:"FF4500",orchid:"DA70D6",palegoldenrod:"EEE8AA",palegreen:"98FB98",paleturquoise:"AFEEEE",palevioletred:"D87093",papayawhip:"FFEFD5",
-peachpuff:"FFDAB9",peru:"CD853F",pink:"FFC0CB",plum:"DDA0DD",powderblue:"B0E0E6",purple:"800080",red:"F00",rosybrown:"BC8F8F",royalblue:"4169E1",saddlebrown:"8B4513",salmon:"FA8072",sandybrown:"F4A460",seagreen:"2E8B57",seashell:"FFF5EE",sienna:"A0522D",silver:"C0C0C0",skyblue:"87CEEB",slateblue:"6A5ACD",slategray:"708090",snow:"FFFAFA",springgreen:"00FF7F",steelblue:"4682B4",tan:"D2B48C",teal:"008080",thistle:"D8BFD8",tomato:"FF6347",turquoise:"40E0D0",violet:"EE82EE",wheat:"F5DEB3",white:"FFF",
-whitesmoke:"F5F5F5",yellow:"FF0",yellowgreen:"9ACD32"};a.prototype={parse:function(){if(!this.Ca){var c=this.V,e;if(e=c.match(a.Sc)){this.Ca="rgb("+e[1]+","+e[2]+","+e[3]+")";this.qb=parseFloat(e[4])}else{if((e=c.toLowerCase())in a.gb)c="#"+a.gb[e];this.Ca=c;this.qb=c==="transparent"?0:1}}},O:function(c){this.parse();return this.Ca==="currentColor"?c.currentStyle.color:this.Ca},la:function(){this.parse();return this.qb}};g.pa=function(c){return b[c]||(b[c]=new a(c))};return a}();g.u=function(){function a(c){this.Ha=
-c;this.ch=0;this.U=[];this.wa=0}var b=a.ja={xa:1,ob:2,ea:4,ac:8,pb:16,fa:32,A:64,ga:128,ha:256,Aa:512,dc:1024,URL:2048};a.Ta=function(c,e){this.h=c;this.d=e};a.Ta.prototype={db:function(){return this.h&b.A||this.h&b.ga&&this.d==="0"},Y:function(){return this.db()||this.h&b.Aa}};a.prototype={dd:/\s/,Mc:/^[\+\-]?(\d*\.)?\d+/,url:/^url\(\s*("([^"]*)"|'([^']*)'|([!#$%&*-~]*))\s*\)/i,zb:/^\-?[_a-z][\w-]*/i,Yc:/^("([^"]*)"|'([^']*)')/,Fc:/^#([\da-f]{6}|[\da-f]{3})/i,bd:{px:b.A,em:b.A,ex:b.A,mm:b.A,cm:b.A,
-"in":b.A,pt:b.A,pc:b.A,deg:b.xa,rad:b.xa,grad:b.xa},sc:{rgb:1,rgba:1,hsl:1,hsla:1},next:function(c){function e(t,n){t=new a.Ta(t,n);if(!c){k.U.push(t);k.wa++}return t}function f(){k.wa++;return null}var h,j,d,i,k=this;if(this.wa<this.U.length)return this.U[this.wa++];for(;this.dd.test(this.Ha.charAt(this.ch));)this.ch++;if(this.ch>=this.Ha.length)return f();j=this.ch;h=this.Ha.substring(this.ch);d=h.charAt(0);switch(d){case "#":if(i=h.match(this.Fc)){this.ch+=i[0].length;return e(b.ea,i[0])}break;
-case '"':case "'":if(i=h.match(this.Yc)){this.ch+=i[0].length;return e(b.dc,i[2]||i[3]||"")}break;case "/":case ",":this.ch++;return e(b.ha,d);case "u":if(i=h.match(this.url)){this.ch+=i[0].length;return e(b.URL,i[2]||i[3]||i[4]||"")}}if(i=h.match(this.Mc)){d=i[0];this.ch+=d.length;if(h.charAt(d.length)==="%"){this.ch++;return e(b.Aa,d+"%")}if(i=h.substring(d.length).match(this.zb)){d+=i[0];this.ch+=i[0].length;return e(this.bd[i[0].toLowerCase()]||b.ac,d)}return e(b.ga,d)}if(i=h.match(this.zb)){d=
-i[0];this.ch+=d.length;if(d.toLowerCase()in g.$b.gb||d==="currentColor")return e(b.ea,d);if(h.charAt(d.length)==="("){this.ch++;if(d.toLowerCase()in this.sc){h=function(t){return t&&t.h&b.ga};i=function(t){return t&&t.h&(b.ga|b.Aa)};var m=function(t,n){return t&&t.d===n},l=function(){return k.next(1)};if((d.charAt(0)==="r"?i(l()):h(l()))&&m(l(),",")&&i(l())&&m(l(),",")&&i(l())&&(d==="rgb"||d==="hsa"||m(l(),",")&&h(l()))&&m(l(),")"))return e(b.ea,this.Ha.substring(j,this.ch));return f()}return e(b.pb,
-d)}return e(b.fa,d)}this.ch++;return e(b.ob,d)},z:function(){return this.U[this.wa-- -2]},all:function(){for(;this.next(););return this.U},da:function(c,e){for(var f=[],h,j;h=this.next();){if(c(h)){j=true;this.z();break}f.push(h)}return e&&!j?null:f}};return a}();var M=function(a){this.e=a};M.prototype={K:0,Qc:function(){var a=this.Ua,b;return!a||(b=this.o())&&(a.x!==b.x||a.y!==b.y)},Vc:function(){var a=this.Ua,b;return!a||(b=this.o())&&(a.i!==b.i||a.f!==b.f)},ub:function(){var a=this.e.getBoundingClientRect();
-return{x:a.left,y:a.top,i:a.right-a.left,f:a.bottom-a.top}},o:function(){return this.K?this.Da||(this.Da=this.ub()):this.ub()},Ec:function(){return!!this.Ua},Ja:function(){++this.K},La:function(){if(!--this.K){if(this.Da)this.Ua=this.Da;this.Da=null}}};(function(){function a(b){var c=g.p.ta(b);return function(){if(this.K){var e=this.rb||(this.rb={});return c in e?e[c]:(e[c]=b.call(this))}else return b.call(this)}}g.s={K:0,$:function(b){function c(e){this.e=e}g.p.fb(c.prototype,g.s,b);c.kc={};return c},
-m:function(){var b=this.qa(),c=this.constructor.kc;return b?b in c?c[b]:(c[b]=this.ba(b)):null},qa:a(function(){var b=this.e,c=this.constructor,e=b.style;b=b.currentStyle;var f=this.na,h=this.va,j=c.ic||(c.ic=g.F+f);c=c.jc||(c.jc=g.Sa+h.charAt(0).toUpperCase()+h.substring(1));return e[c]||b.getAttribute(j)||e[h]||b.getAttribute(f)}),g:a(function(){return!!this.m()}),D:a(function(){var b=this.qa(),c=b!==this.gc;this.gc=b;return c}),ma:a,Ja:function(){++this.K},La:function(){--this.K||delete this.rb}}})();
-g.Tb=g.s.$({na:g.F+"background",va:g.Sa+"Background",nc:{scroll:1,fixed:1,local:1},Ka:{"repeat-x":1,"repeat-y":1,repeat:1,"no-repeat":1},Nc:{"padding-box":1,"border-box":1,"content-box":1},rc:{"padding-box":1,"border-box":1},Rc:{top:1,right:1,bottom:1,left:1,center:1},Wc:{contain:1,cover:1},ba:function(a){function b(u){return u.Y()||u.h&i&&u.d in t}function c(u){return u.Y()&&g.k(u.d)||u.d==="auto"&&"auto"}var e=this.e.currentStyle,f,h,j=g.u.ja,d=j.ha,i=j.fa,k=j.ea,m,l,t=this.Rc,n,p,s=null;if(this.$a()){a=
-new g.u(a);s={M:[]};for(h={};f=a.next();){m=f.h;l=f.d;if(!h.P&&m&j.pb&&l==="linear-gradient"){n={ca:[],P:l};for(p={};f=a.next();){m=f.h;l=f.d;if(m&j.ob&&l===")"){p.color&&n.ca.push(p);n.ca.length>1&&g.p.fb(h,n);break}if(m&k){if(n.Xa||n.bb){f=a.z();if(f.h!==d)break;a.next()}p={color:g.pa(l)};f=a.next();if(f.Y())p.Fb=g.k(f.d);else a.z()}else if(m&j.xa&&!n.Xa&&!p.color&&!n.ca.length)n.Xa=new g.Rb(f.d);else if(b(f)&&!n.bb&&!p.color&&!n.ca.length){a.z();n.bb=new g.Na(a.da(function(u){return!b(u)},false))}else if(m&
-d&&l===","){if(p.color){n.ca.push(p);p={}}}else break}}else if(!h.P&&m&j.URL){h.Cb=l;h.P="image"}else if(b(f)&&!h.size){a.z();h.Ya=new g.Na(a.da(function(u){return!b(u)},false))}else if(m&i)if(l in this.Ka)h.Bb=l;else if(l in this.Nc){h.kd=l;if(l in this.rc)h.clip=l}else{if(l in this.nc)h.jd=l}else if(m&k&&!s.color)s.color=g.pa(l);else if(m&d)if(l==="/"){f=a.next();m=f.h;l=f.d;if(m&i&&l in this.Wc)h.size=l;else if(l=c(f))h.size={i:l,f:c(a.next())||a.z()&&l}}else{if(l===","&&h.P){s.M.push(h);h={}}}else return null}h.P&&
-s.M.push(h)}else this.Nb(function(){var u=e.backgroundPositionX,w=e.backgroundPositionY,r=e.backgroundImage,o=e.backgroundColor;s={};if(o!=="transparent")s.color=g.pa(o);if(r!=="none")s.M=[{P:"image",Cb:(new g.u(r)).next().d,Bb:e.backgroundRepeat,Ya:new g.Na((new g.u(u+" "+w)).all())}]});return s&&(s.color||s.M&&s.M[0])?s:null},Nb:function(a){var b=this.e.runtimeStyle,c=b.backgroundImage,e=b.backgroundColor;if(c)b.backgroundImage="";if(e)b.backgroundColor="";a=a.call(this);if(c)b.backgroundImage=
-c;if(e)b.backgroundColor=e;return a},qa:g.s.ma(function(){return this.$a()||this.Nb(function(){var a=this.e.currentStyle;return a.backgroundColor+" "+a.backgroundImage+" "+a.backgroundRepeat+" "+a.backgroundPositionX+" "+a.backgroundPositionY})}),$a:g.s.ma(function(){var a=this.e;return a.style[this.va]||a.currentStyle.getAttribute(this.na)}),Eb:function(){var a=0;if(g.J<7){a=this.e;a=""+(a.style[g.Sa+"PngFix"]||a.currentStyle.getAttribute(g.F+"png-fix"))==="true"}return a},g:g.s.ma(function(){return(this.$a()||
-this.Eb())&&!!this.m()})});g.Xb=g.s.$({Ib:["Top","Right","Bottom","Left"],Kc:{thin:"1px",medium:"3px",thick:"5px"},ba:function(){var a={},b={},c={},e=false,f=true,h=true,j=true;this.Ob(function(){for(var d=this.e.currentStyle,i=0,k,m,l,t,n,p,s;i<4;i++){l=this.Ib[i];s=l.charAt(0).toLowerCase();k=b[s]=d["border"+l+"Style"];m=d["border"+l+"Color"];l=d["border"+l+"Width"];if(i>0){if(k!==t)h=false;if(m!==n)f=false;if(l!==p)j=false}t=k;n=m;p=l;c[s]=g.pa(m);l=a[s]=g.k(b[s]==="none"?"0":this.Kc[l]||l);if(l.a(this.e)>
-0)e=true}});return e?{nb:a,Zc:b,tc:c,ed:j,uc:f,$c:h}:null},qa:g.s.ma(function(){var a=this.e,b=a.currentStyle,c;a.tagName in g.Jb&&a.offsetParent.currentStyle.borderCollapse==="collapse"||this.Ob(function(){c=b.borderWidth+"|"+b.borderStyle+"|"+b.borderColor});return c}),Ob:function(a){var b=this.e.runtimeStyle,c=b.borderWidth,e=b.borderColor;if(c)b.borderWidth="";if(e)b.borderColor="";a=a.call(this);if(c)b.borderWidth=c;if(e)b.borderColor=e;return a}});(function(){g.Oa=g.s.$({na:"border-radius",
-va:"borderRadius",ba:function(b){var c=null,e,f,h,j,d=false;if(b){f=new g.u(b);var i=function(){for(var k=[],m;(h=f.next())&&h.Y();){j=g.k(h.d);m=j.vb();if(m<0)return null;if(m>0)d=true;k.push(j)}return k.length>0&&k.length<5?{tl:k[0],tr:k[1]||k[0],br:k[2]||k[0],bl:k[3]||k[1]||k[0]}:null};if(b=i()){if(h){if(h.h&g.u.ja.ha&&h.d==="/")e=i()}else e=b;if(d&&b&&e)c={x:b,y:e}}}return c}});var a=g.k("0");a={tl:a,tr:a,br:a,bl:a};g.Oa.Qb={x:a,y:a}})();g.Vb=g.s.$({na:"border-image",va:"borderImage",Ka:{stretch:1,
-round:1,repeat:1,space:1},ba:function(a){var b=null,c,e,f,h,j,d,i=0,k,m=g.u.ja,l=m.fa,t=m.ga,n=m.A,p=m.Aa;if(a){c=new g.u(a);b={};for(var s=function(r){return r&&r.h&m.ha&&r.d==="/"},u=function(r){return r&&r.h&l&&r.d==="fill"},w=function(){h=c.da(function(r){return!(r.h&(t|p))});if(u(c.next())&&!b.fill)b.fill=true;else c.z();if(s(c.next())){i++;j=c.da(function(){return!(e.h&(t|p|n))&&!(e.h&l&&e.d==="auto")});if(s(c.next())){i++;d=c.da(function(){return!(e.h&(t|n))})}}else c.z()};e=c.next();){a=e.h;
-f=e.d;if(a&(t|p)&&!h){c.z();w()}else if(u(e)&&!b.fill){b.fill=true;w()}else if(a&l&&this.Ka[f]&&!b.repeat){b.repeat={f:f};if(e=c.next())if(e.h&l&&this.Ka[e.d])b.repeat.kb=e.d;else c.z()}else if(a&m.URL&&!b.src)b.src=f;else return null}if(!b.src||!h||h.length<1||h.length>4||j&&j.length>4||i===1&&j.length<1||d&&d.length>4||i===2&&d.length<1)return null;if(!b.repeat)b.repeat={f:"stretch"};if(!b.repeat.kb)b.repeat.kb=b.repeat.f;a=function(r,o){return{T:o(r[0]),S:o(r[1]||r[0]),L:o(r[2]||r[0]),Q:o(r[3]||
-r[1]||r[0])}};b.slice=a(h,function(r){return g.k(r.h&t?r.d+"px":r.d)});b.width=j&&j.length>0?a(j,function(r){return r.h&(n|p)?g.k(r.d):r.d}):(k=this.e.currentStyle)&&{T:g.k(k.borderTopWidth),S:g.k(k.borderRightWidth),L:g.k(k.borderBottomWidth),Q:g.k(k.borderLeftWidth)};b.ua=a(d||[0],function(r){return r.h&n?g.k(r.d):r.d})}return b}});g.Zb=g.s.$({na:"box-shadow",va:"boxShadow",ba:function(a){var b,c=g.k,e=g.u.ja,f;if(a){f=new g.u(a);b={ua:[],cb:[]};for(a=function(){for(var h,j,d,i,k,m;h=f.next();){d=
-h.d;j=h.h;if(j&e.ha&&d===",")break;else if(h.db()&&!k){f.z();k=f.da(function(l){return!l.db()})}else if(j&e.ea&&!i)i=d;else if(j&e.fa&&d==="inset"&&!m)m=true;else return false}h=k&&k.length;if(h>1&&h<5){(m?b.cb:b.ua).push({fd:c(k[0].d),gd:c(k[1].d),blur:c(k[2]?k[2].d:"0"),Xc:c(k[3]?k[3].d:"0"),color:g.pa(i||"currentColor")});return true}return false};a(););}return b&&(b.cb.length||b.ua.length)?b:null}});g.ec=g.s.$({qa:g.s.ma(function(){var a=this.e.currentStyle;return a.visibility+"|"+a.display}),
-ba:function(){var a=this.e,b=a.runtimeStyle;a=a.currentStyle;var c=b.visibility,e;b.visibility="";e=a.visibility;b.visibility=c;return{cd:e!=="hidden",xc:a.display!=="none"}},g:function(){return false}});g.B={Z:function(a){function b(c,e,f,h){this.e=c;this.q=e;this.j=f;this.parent=h}g.p.fb(b.prototype,g.B,a);return b},eb:false,R:function(){return false},Kb:function(){this.n();this.g()&&this.X()},jb:function(){this.eb=true},Lb:function(){this.g()?this.X():this.n()},Wa:function(a,b){this.Hb(a);for(var c=
-this.ka||(this.ka=[]),e=a+1,f=c.length,h;e<f;e++)if(h=c[e])break;c[a]=b;this.w().insertBefore(b,h||null)},ra:function(a){var b=this.ka;return b&&b[a]||null},Hb:function(a){var b=this.ra(a),c=this.Ba;if(b&&c){c.removeChild(b);this.ka[a]=null}},sa:function(a,b,c,e){var f=this.Va||(this.Va={}),h=f[a];if(!h){h=f[a]=g.p.Ga("shape");if(b)h.appendChild(h[b]=g.p.Ga(b));if(e){c=this.ra(e);if(!c){this.Wa(e,doc.createElement("group"+e));c=this.ra(e)}}c.appendChild(h);a=h.style;a.position="absolute";a.left=a.top=
-0;a.behavior="url(#default#VML)"}return h},Za:function(a){var b=this.Va,c=b&&b[a];if(c){c.parentNode.removeChild(c);delete b[a]}return!!c},xb:function(a){var b=this.e,c=this.q.o(),e=c.i,f=c.f,h,j,d,i,k,m;c=a.x.tl.a(b,e);h=a.y.tl.a(b,f);j=a.x.tr.a(b,e);d=a.y.tr.a(b,f);i=a.x.br.a(b,e);k=a.y.br.a(b,f);m=a.x.bl.a(b,e);a=a.y.bl.a(b,f);e=Math.min(e/(c+j),f/(d+k),e/(m+i),f/(h+a));if(e<1){c*=e;h*=e;j*=e;d*=e;i*=e;k*=e;m*=e;a*=e}return{x:{tl:c,tr:j,br:i,bl:m},y:{tl:h,tr:d,br:k,bl:a}}},oa:function(a,b,c){b=
-b||1;var e,f,h=this.q.o();f=h.i*b;h=h.f*b;var j=this.j.v,d=Math.floor,i=Math.ceil,k=a?a.T*b:0,m=a?a.S*b:0,l=a?a.L*b:0;a=a?a.Q*b:0;var t,n,p,s,u;if(c||j.g()){e=this.xb(c||j.m());c=e.x.tl*b;j=e.y.tl*b;t=e.x.tr*b;n=e.y.tr*b;p=e.x.br*b;s=e.y.br*b;u=e.x.bl*b;b=e.y.bl*b;f="m"+d(a)+","+d(j)+"qy"+d(c)+","+d(k)+"l"+i(f-t)+","+d(k)+"qx"+i(f-m)+","+d(n)+"l"+i(f-m)+","+i(h-s)+"qy"+i(f-p)+","+i(h-l)+"l"+d(u)+","+i(h-l)+"qx"+d(a)+","+i(h-b)+" x e"}else f="m"+d(a)+","+d(k)+"l"+i(f-m)+","+d(k)+"l"+i(f-m)+","+i(h-
-l)+"l"+d(a)+","+i(h-l)+"xe";return f},w:function(){var a=this.parent.ra(this.C),b;if(!a){a=doc.createElement(this.Fa);b=a.style;b.position="absolute";b.top=b.left=0;this.parent.Wa(this.C,a)}return a},n:function(){this.parent.Hb(this.C);delete this.Va;delete this.ka}};g.cc=g.B.Z({g:function(){var a=this.oc;for(var b in a)if(a.hasOwnProperty(b)&&a[b].g())return true;return false},R:function(){return this.j.lb.D()},jb:function(){if(this.g()){var a=this.wb(),b=a,c;a=a.currentStyle;var e=a.position,f=
-this.w().style,h=0,j=0;j=this.q.o();if(e==="fixed"&&g.J>6){h=j.x;j=j.y;b=e}else{do b=b.offsetParent;while(b&&b.currentStyle.position==="static");if(b){c=b.getBoundingClientRect();b=b.currentStyle;h=j.x-c.left-(parseFloat(b.borderLeftWidth)||0);j=j.y-c.top-(parseFloat(b.borderTopWidth)||0)}else{b=doc.documentElement;h=j.x+b.scrollLeft-b.clientLeft;j=j.y+b.scrollTop-b.clientTop}b="absolute"}f.position=b;f.left=h;f.top=j;f.zIndex=e==="static"?-1:a.zIndex;this.eb=true}},Lb:function(){},Mb:function(){var a=
-this.j.lb.m();this.w().style.display=a.cd&&a.xc?"":"none"},Kb:function(){this.g()?this.Mb():this.n()},wb:function(){var a=this.e;return a.tagName in g.Jb?a.offsetParent:a},w:function(){var a=this.Ba,b;if(!a){b=this.wb();a=this.Ba=doc.createElement("css3-container");a.style.direction="ltr";this.Mb();b.parentNode.insertBefore(a,b)}return a},n:function(){var a=this.Ba,b;if(a&&(b=a.parentNode))b.removeChild(a);delete this.Ba;delete this.ka}});g.Sb=g.B.Z({C:2,Fa:"background",R:function(){var a=this.j;
-return a.H.D()||a.v.D()},g:function(){var a=this.j;return a.N.g()||a.v.g()||a.H.g()||a.W.g()&&a.W.m().cb},X:function(){var a=this.q.o();if(a.i&&a.f){this.yc();this.zc()}},yc:function(){var a=this.j.H.m(),b=this.q.o(),c=this.e,e=a&&a.color,f,h;if(e&&e.la()>0){this.yb();a=this.sa("bgColor","fill",this.w(),1);f=b.i;b=b.f;a.stroked=false;a.coordsize=f*2+","+b*2;a.coordorigin="1,1";a.path=this.oa(null,2);h=a.style;h.width=f;h.height=b;a.fill.color=e.O(c);c=e.la();if(c<1)a.fill.opacity=c}else this.Za("bgColor")},
-zc:function(){var a=this.j.H.m(),b=this.q.o();a=a&&a.M;var c,e,f,h,j;if(a){this.yb();e=b.i;f=b.f;for(j=a.length;j--;){b=a[j];c=this.sa("bgImage"+j,"fill",this.w(),2);c.stroked=false;c.fill.type="tile";c.fillcolor="none";c.coordsize=e*2+","+f*2;c.coordorigin="1,1";c.path=this.oa(0,2);h=c.style;h.width=e;h.height=f;if(b.P==="linear-gradient")this.mc(c,b);else{c.fill.src=b.Cb;this.Pc(c,j)}}}for(j=a?a.length:0;this.Za("bgImage"+j++););},Pc:function(a,b){g.p.Pb(a.fill.src,function(c){var e=a.fill,f=this.e,
-h=this.q.o(),j=h.i;h=h.f;var d=this.j,i=d.I.m(),k=i&&i.nb;i=k?k.t.a(f):0;var m=k?k.r.a(f):0,l=k?k.b.a(f):0;k=k?k.l.a(f):0;d=d.H.m().M[b];f=d.Ya?d.Ya.coords(f,j-c.i-k-m,h-c.f-i-l):{x:0,y:0};d=d.Bb;l=m=0;var t=j+1,n=h+1,p=g.J===8?0:1;k=Math.round(f.x)+k+0.5;i=Math.round(f.y)+i+0.5;e.position=k/j+","+i/h;if(d&&d!=="repeat"){if(d==="repeat-x"||d==="no-repeat"){m=i+1;n=i+c.f+p}if(d==="repeat-y"||d==="no-repeat"){l=k+1;t=k+c.i+p}a.style.clip="rect("+m+"px,"+t+"px,"+n+"px,"+l+"px)"}},this)},mc:function(a,
-b){function c(B,C,z,F,H){if(z===0||z===180)return[F,C];else if(z===90||z===270)return[B,H];else{z=Math.tan(-z*t/180);B=z*B-C;C=-1/z;F=C*F-H;H=C-z;return[(F-B)/H,(z*F-C*B)/H]}}function e(){w=m>=90&&m<270?i:0;r=m<180?k:0;o=i-w;x=k-r}function f(){for(;m<0;)m+=360;m%=360}function h(B,C){var z=C[0]-B[0];B=C[1]-B[1];return Math.abs(z===0?B:B===0?z:Math.sqrt(z*z+B*B))}var j=this.e,d=this.q.o(),i=d.i,k=d.f;a=a.fill;var m=b.Xa,l=b.bb;b=b.ca;d=b.length;var t=Math.PI,n,p,s,u,w,r,o,x,q,y,A,D;if(l){l=l.coords(j,
-i,k);n=l.x;p=l.y}if(m){m=m.vc();f();e();if(!l){n=w;p=r}l=c(n,p,m,o,x);s=l[0];u=l[1]}else if(l){s=i-n;u=k-p}else{n=p=s=0;u=k}l=s-n;q=u-p;if(m===void 0){m=!l?q<0?90:270:!q?l<0?180:0:-Math.atan2(q,l)/t*180;f();e()}l=m%90?Math.atan2(l*i/k,q)/t*180:m+90;l+=180;l%=360;y=h([n,p],[s,u]);s=h([w,r],c(w,r,m,o,x));u=[];p=h([n,p],c(n,p,m,w,r))/s*100;n=[];for(q=0;q<d;q++)n.push(b[q].Fb?b[q].Fb.a(j,y):q===0?0:q===d-1?y:null);for(q=1;q<d;q++){if(n[q]===null){A=n[q-1];y=q;do D=n[++y];while(D===null);n[q]=A+(D-A)/
-(y-q+1)}n[q]=Math.max(n[q],n[q-1])}for(q=0;q<d;q++)u.push(p+n[q]/s*100+"% "+b[q].color.O(j));a.angle=l;a.type="gradient";a.method="sigma";a.color=b[0].color.O(j);a.color2=b[d-1].color.O(j);a.colors.value=u.join(",")},yb:function(){var a=this.e.runtimeStyle;a.backgroundImage="url(about:blank)";a.backgroundColor="transparent"},n:function(){g.B.n.call(this);var a=this.e.runtimeStyle;a.backgroundImage=a.backgroundColor=""}});g.Wb=g.B.Z({C:4,Fa:"border",qc:{TABLE:1,INPUT:1,TEXTAREA:1,SELECT:1,OPTION:1,
-IMG:1,HR:1,FIELDSET:1},Jc:{submit:1,button:1,reset:1},R:function(){var a=this.j;return a.I.D()||a.v.D()},g:function(){var a=this.j;return(a.N.g()||a.v.g()||a.H.g())&&a.I.g()},X:function(){var a=this.e,b=this.j.I.m(),c=this.q.o(),e=c.i;c=c.f;var f,h,j,d,i;if(b){this.Hc();b=this.Bc(2);d=0;for(i=b.length;d<i;d++){j=b[d];f=this.sa("borderPiece"+d,j.stroke?"stroke":"fill",this.w());f.coordsize=e*2+","+c*2;f.coordorigin="1,1";f.path=j.path;h=f.style;h.width=e;h.height=c;f.filled=!!j.fill;f.stroked=!!j.stroke;
-if(j.stroke){f=f.stroke;f.weight=j.mb+"px";f.color=j.color.O(a);f.dashstyle=j.stroke==="dashed"?"2 2":j.stroke==="dotted"?"1 1":"solid";f.linestyle=j.stroke==="double"&&j.mb>2?"ThinThin":"Single"}else f.fill.color=j.fill.O(a)}for(;this.Za("borderPiece"+d++););}},Hc:function(){var a=this.e,b=a.currentStyle,c=a.runtimeStyle,e=a.tagName,f=g.J===6,h;if(f&&e in this.qc||e==="BUTTON"||e==="INPUT"&&a.type in this.Jc){c.borderWidth="";e=this.j.I.Ib;for(h=e.length;h--;){f=e[h];c["padding"+f]="";c["padding"+
-f]=g.k(b["padding"+f]).a(a)+g.k(b["border"+f+"Width"]).a(a)+(!g.J===8&&h%2?1:0)}c.borderWidth=0}else if(f){if(a.childNodes.length!==1||a.firstChild.tagName!=="ie6-mask"){b=doc.createElement("ie6-mask");e=b.style;e.visibility="visible";for(e.zoom=1;e=a.firstChild;)b.appendChild(e);a.appendChild(b);c.visibility="hidden"}}else c.borderColor="transparent"},Bc:function(a){var b=this.e,c,e,f,h=this.j.I,j=[],d,i,k,m,l=Math.round,t,n,p;if(h.g()){c=h.m();h=c.nb;n=c.Zc;p=c.tc;if(c.ed&&c.$c&&c.uc){if(p.t.la()>
-0){c=h.t.a(b);k=c/2;j.push({path:this.oa({T:k,S:k,L:k,Q:k},a),stroke:n.t,color:p.t,mb:c})}}else{a=a||1;c=this.q.o();e=c.i;f=c.f;c=l(h.t.a(b));k=l(h.r.a(b));m=l(h.b.a(b));b=l(h.l.a(b));var s={t:c,r:k,b:m,l:b};b=this.j.v;if(b.g())t=this.xb(b.m());d=Math.floor;i=Math.ceil;var u=function(o,x){return t?t[o][x]:0},w=function(o,x,q,y,A,D){var B=u("x",o),C=u("y",o),z=o.charAt(1)==="r";o=o.charAt(0)==="b";return B>0&&C>0?(D?"al":"ae")+(z?i(e-B):d(B))*a+","+(o?i(f-C):d(C))*a+","+(d(B)-x)*a+","+(d(C)-q)*a+","+
-y*65535+","+2949075*(A?1:-1):(D?"m":"l")+(z?e-x:x)*a+","+(o?f-q:q)*a},r=function(o,x,q,y){var A=o==="t"?d(u("x","tl"))*a+","+i(x)*a:o==="r"?i(e-x)*a+","+d(u("y","tr"))*a:o==="b"?i(e-u("x","br"))*a+","+d(f-x)*a:d(x)*a+","+i(f-u("y","bl"))*a;o=o==="t"?i(e-u("x","tr"))*a+","+i(x)*a:o==="r"?i(e-x)*a+","+i(f-u("y","br"))*a:o==="b"?d(u("x","bl"))*a+","+d(f-x)*a:d(x)*a+","+d(u("y","tl"))*a;return q?(y?"m"+o:"")+"l"+A:(y?"m"+A:"")+"l"+o};b=function(o,x,q,y,A,D){var B=o==="l"||o==="r",C=s[o],z,F;if(C>0&&n[o]!==
-"none"&&p[o].la()>0){z=s[B?o:x];x=s[B?x:o];F=s[B?o:q];q=s[B?q:o];if(n[o]==="dashed"||n[o]==="dotted"){j.push({path:w(y,z,x,D+45,0,1)+w(y,0,0,D,1,0),fill:p[o]});j.push({path:r(o,C/2,0,1),stroke:n[o],mb:C,color:p[o]});j.push({path:w(A,F,q,D,0,1)+w(A,0,0,D-45,1,0),fill:p[o]})}else j.push({path:w(y,z,x,D+45,0,1)+r(o,C,0,0)+w(A,F,q,D,0,0)+(n[o]==="double"&&C>2?w(A,F-d(F/3),q-d(q/3),D-45,1,0)+r(o,i(C/3*2),1,0)+w(y,z-d(z/3),x-d(x/3),D,1,0)+"x "+w(y,d(z/3),d(x/3),D+45,0,1)+r(o,d(C/3),1,0)+w(A,d(F/3),d(q/
-3),D,0,0):"")+w(A,0,0,D-45,1,0)+r(o,0,1,0)+w(y,0,0,D,1,0),fill:p[o]})}};b("t","l","r","tl","tr",90);b("r","t","b","tr","br",0);b("b","r","l","br","bl",-90);b("l","b","t","bl","tl",-180)}}return j},n:function(){g.B.n.call(this);this.e.runtimeStyle.borderColor=""}});g.Ub=g.B.Z({C:5,Oc:["t","tr","r","br","b","bl","l","tl","c"],R:function(){return this.j.N.D()},g:function(){return this.j.N.g()},X:function(){this.w();var a=this.j.N.m(),b=this.q.o(),c=this.e,e=this.Gb;g.p.Pb(a.src,function(f){function h(w,
-r,o,x,q){w=e[w].style;var y=Math.max;w.width=y(r,0);w.height=y(o,0);w.left=x;w.top=q}function j(w,r,o){for(var x=0,q=w.length;x<q;x++)e[w[x]].imagedata[r]=o}var d=b.i,i=b.f,k=a.width,m=k.T.a(c),l=k.S.a(c),t=k.L.a(c);k=k.Q.a(c);var n=a.slice,p=n.T.a(c),s=n.S.a(c),u=n.L.a(c);n=n.Q.a(c);h("tl",k,m,0,0);h("t",d-k-l,m,k,0);h("tr",l,m,d-l,0);h("r",l,i-m-t,d-l,m);h("br",l,t,d-l,i-t);h("b",d-k-l,t,k,i-t);h("bl",k,t,0,i-t);h("l",k,i-m-t,0,m);h("c",d-k-l,i-m-t,k,m);j(["tl","t","tr"],"cropBottom",(f.f-p)/f.f);
-j(["tl","l","bl"],"cropRight",(f.i-n)/f.i);j(["bl","b","br"],"cropTop",(f.f-u)/f.f);j(["tr","r","br"],"cropLeft",(f.i-s)/f.i);if(a.repeat.kb==="stretch"){j(["l","r","c"],"cropTop",p/f.f);j(["l","r","c"],"cropBottom",u/f.f)}if(a.repeat.f==="stretch"){j(["t","b","c"],"cropLeft",n/f.i);j(["t","b","c"],"cropRight",s/f.i)}e.c.style.display=a.fill?"":"none"},this)},w:function(){var a=this.parent.ra(this.C),b,c,e,f=this.Oc,h=f.length;if(!a){a=doc.createElement("border-image");b=a.style;b.position="absolute";
-this.Gb={};for(e=0;e<h;e++){c=this.Gb[f[e]]=g.p.Ga("rect");c.appendChild(g.p.Ga("imagedata"));b=c.style;b.behavior="url(#default#VML)";b.position="absolute";b.top=b.left=0;c.imagedata.src=this.j.N.m().src;c.stroked=false;c.filled=false;a.appendChild(c)}this.parent.Wa(this.C,a)}return a}});g.Yb=g.B.Z({C:1,Fa:"outset-box-shadow",R:function(){var a=this.j;return a.W.D()||a.v.D()},g:function(){var a=this.j.W;return a.g()&&a.m().ua[0]},X:function(){function a(z,F,H,K,J,v,E){z=b.sa("shadow"+z+F,"fill",
-e,j-z);F=z.fill;z.coordsize=m*2+","+l*2;z.coordorigin="1,1";z.stroked=false;z.filled=true;F.color=J.O(c);if(v){F.type="gradienttitle";F.color2=F.color;F.opacity=0}z.path=E;u=z.style;u.left=H;u.top=K;u.width=m;u.height=l;return z}var b=this,c=this.e,e=this.w(),f=this.j,h=f.W.m().ua;f=f.v.m();var j=h.length,d=j,i,k=this.q.o(),m=k.i,l=k.f;k=g.J===8?1:0;for(var t=["tl","tr","br","bl"],n,p,s,u,w,r,o,x,q,y,A,D,B,C;d--;){p=h[d];w=p.fd.a(c);r=p.gd.a(c);i=p.Xc.a(c);o=p.blur.a(c);p=p.color;x=-i-o;if(!f&&o)f=
-g.Oa.Qb;x=this.oa({T:x,S:x,L:x,Q:x},2,f);if(o){q=(i+o)*2+m;y=(i+o)*2+l;A=o*2/q;D=o*2/y;if(o-i>m/2||o-i>l/2)for(i=4;i--;){n=t[i];B=n.charAt(0)==="b";C=n.charAt(1)==="r";n=a(d,n,w,r,p,o,x);s=n.fill;s.focusposition=(C?1-A:A)+","+(B?1-D:D);s.focussize="0,0";n.style.clip="rect("+((B?y/2:0)+k)+"px,"+(C?q:q/2)+"px,"+(B?y:y/2)+"px,"+((C?q/2:0)+k)+"px)"}else{n=a(d,"",w,r,p,o,x);s=n.fill;s.focusposition=A+","+D;s.focussize=1-A*2+","+(1-D*2)}}else{n=a(d,"",w,r,p,o,x);w=p.la();if(w<1)n.fill.opacity=w}}}});g.bc=
-g.B.Z({C:6,Fa:"imgEl",R:function(){var a=this.j;return this.e.src!==this.hc||a.v.D()},g:function(){var a=this.j;return a.v.g()||a.H.Eb()},X:function(){this.hc=j;this.Gc();var a=this.sa("img","fill",this.w()),b=a.fill,c=this.q.o(),e=c.i;c=c.f;var f=this.j.I.m();f=f&&f.nb;var h=this.e,j=h.src,d=Math.round;a.stroked=false;b.type="frame";b.src=j;b.position=(e?0.5/e:0)+","+(c?0.5/c:0);a.coordsize=e*2+","+c*2;a.coordorigin="1,1";a.path=this.oa(f?{T:d(f.t.a(h)),S:d(f.r.a(h)),L:d(f.b.a(h)),Q:d(f.l.a(h))}:
-0,2);a=a.style;a.width=e;a.height=c},Gc:function(){this.e.runtimeStyle.filter="alpha(opacity=0)"},n:function(){g.B.n.call(this);this.e.runtimeStyle.filter=""}});g.Qa=function(){function a(d){function i(){if(!z){var v,E,G=d.currentStyle,I=G.getAttribute(c)==="true";J=G.getAttribute(e);J=g.Ab===8?J!=="false":J==="true";if(!C){C=1;d.runtimeStyle.zoom=1;G=d;for(var O=1;G=G.previousSibling;)if(G.nodeType===1){O=0;break}if(O)d.className+=" "+g.Pa+"first-child"}y.Ja();if(I&&(E=y.o())&&(v=doc.documentElement||
-doc.body)&&(E.y>v.clientHeight||E.x>v.clientWidth||E.y+E.f<0||E.x+E.i<0)){if(!H){H=1;g.Ra.aa(i)}}else{z=1;H=C=0;g.Ra.Ma(i);A={H:new g.Tb(d),I:new g.Xb(d),N:new g.Vb(d),v:new g.Oa(d),W:new g.Zb(d),lb:new g.ec(d)};D=[A.H,A.I,A.N,A.v,A.W,A.lb];v=new g.cc(d,y,A);E=[new g.Yb(d,y,A,v),new g.Sb(d,y,A,v),new g.Wb(d,y,A,v),new g.Ub(d,y,A,v)];d.tagName==="IMG"&&E.push(new g.bc(d,y,A,v));v.oc=E;q=[v].concat(E);if(v=d.currentStyle.getAttribute(g.F+"watch-ancestors")){B=[];v=parseInt(v,10);E=0;for(I=d.parentNode;I&&
-(v==="NaN"||E++<v);){B.push(I);I.attachEvent("onpropertychange",u);I.attachEvent("onmouseenter",p);I.attachEvent("onmouseleave",s);I=I.parentNode}}if(J){g.ya.aa(m);g.ya.Tc()}m(1)}if(!F){F=1;d.attachEvent("onmove",k);d.attachEvent("onresize",k);d.attachEvent("onpropertychange",l);d.attachEvent("onmouseenter",p);d.attachEvent("onmouseleave",s);g.za.aa(k);g.G.aa(o)}y.La()}}function k(){y&&y.Ec()&&m()}function m(v){if(!K)if(z){var E,G;w();if(v||y.Qc()){E=0;for(G=q.length;E<G;E++)q[E].jb()}if(v||y.Vc()){E=
-0;for(G=q.length;E<G;E++)q[E].Lb()}r()}else C||i()}function l(){var v,E,G;v=event;if(!K&&!(v&&v.propertyName in j))if(z){w();v=0;for(E=q.length;v<E;v++){G=q[v];G.eb||G.jb();G.R()&&G.Kb()}r()}else C||i()}function t(){if(d)d.className+=f}function n(){if(d)d.className=d.className.replace(h,"")}function p(){setTimeout(t,0)}function s(){setTimeout(n,0)}function u(){var v=event.propertyName;if(v==="className"||v==="id")l()}function w(){y.Ja();for(var v=D.length;v--;)D[v].Ja()}function r(){for(var v=D.length;v--;)D[v].La();
-y.La()}function o(){if(F){if(B)for(var v=0,E=B.length,G;v<E;v++){G=B[v];G.detachEvent("onpropertychange",u);G.detachEvent("onmouseenter",p);G.detachEvent("onmouseleave",s)}d.detachEvent("onmove",m);d.detachEvent("onresize",m);d.detachEvent("onpropertychange",l);d.detachEvent("onmouseenter",p);d.detachEvent("onmouseleave",s);g.G.Ma(o);F=0}}function x(){if(!K){var v,E;o();K=1;if(q){v=0;for(E=q.length;v<E;v++)q[v].n()}J&&g.ya.Ma(m);g.za.Ma(m);q=y=A=D=B=d=null}}var q,y=new M(d),A,D,B,C,z,F,H,K,J;this.Ic=
-i;this.update=m;this.n=x;this.Ac=d}var b={},c=g.F+"lazy-init",e=g.F+"poll",f=" "+g.Pa+"hover",h=new RegExp("\\b"+g.Pa+"hover\\b","g"),j={background:1,bgColor:1,display:1};a.Cc=function(d){var i=g.p.ta(d);return b[i]||(b[i]=new a(d))};a.n=function(d){d=g.p.ta(d);var i=b[d];if(i){i.n();delete b[d]}};a.wc=function(){var d=[],i;if(b){for(var k in b)if(b.hasOwnProperty(k)){i=b[k];d.push(i.Ac);i.n()}b={}}return d};return a}();g.attach=function(a){g.Ab<9&&g.Qa.Cc(a).Ic()};g.detach=function(a){g.Qa.n(a)}};
-var N=window.PIE,P=element;function init(){N&&doc.media!=="print"&&N.attach(P)}function cleanup(){if(N){N.detach(P);N=P=0}}P.readyState==="complete"&&init();
-</script>
-</PUBLIC:COMPONENT>
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/css/pie/PIE.js b/core/src/plugins/gui.ajax/res/themes/umbra/css/pie/PIE.js
deleted file mode 100644
index fec517293b..0000000000
--- a/core/src/plugins/gui.ajax/res/themes/umbra/css/pie/PIE.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-PIE: CSS3 rendering for IE
-Version 1.0beta4
-http://css3pie.com
-Dual-licensed for use under the Apache License Version 2.0 or the General Public License (GPL) Version 2.
-*/
-(function(){
-var doc = document;var g=window.PIE;
-if(!g){g=window.PIE={F:"-pie-",Sa:"Pie",Pa:"pie_",Jb:{TD:1,TH:1}};try{doc.execCommand("BackgroundImageCache",false,true)}catch(L){}g.J=function(){for(var a=4,b=doc.createElement("div"),c=b.getElementsByTagName("i");b.innerHTML="<!--[if gt IE "+ ++a+"]><i></i><![endif]--\>",c[0];);return a}();if(g.J===6)g.F=g.F.replace(/^-/,"");g.Ab=doc.documentMode||g.J;(function(){var a,b=0,c={};g.p={Ga:function(e){if(!a){a=doc.createDocumentFragment();a.namespaces.add("css3vml","urn:schemas-microsoft-com:vml")}return a.createElement("css3vml:"+e)},
-ta:function(e){return e&&e._pieId||(e._pieId=++b)},fb:function(e){var f,h,j,d,i=arguments;f=1;for(h=i.length;f<h;f++){d=i[f];for(j in d)if(d.hasOwnProperty(j))e[j]=d[j]}return e},Pb:function(e,f,h){var j=c[e],d,i;if(j)Object.prototype.toString.call(j)==="[object Array]"?j.push([f,h]):f.call(h,j);else{i=c[e]=[[f,h]];d=new Image;d.onload=function(){j=c[e]={i:d.width,f:d.height};for(var k=0,m=i.length;k<m;k++)i[k][0].call(i[k][1],j);d.onload=null};d.src=e}}}})();g.ia=function(){this.hb=[];this.Db={}};
-g.ia.prototype={aa:function(a){var b=g.p.ta(a),c=this.Db,e=this.hb;if(!(b in c)){c[b]=e.length;e.push(a)}},Ma:function(a){a=g.p.ta(a);var b=this.Db;if(a&&a in b){delete this.hb[b[a]];delete b[a]}},Ia:function(){for(var a=this.hb,b=a.length;b--;)a[b]&&a[b]()}};g.ya=new g.ia;g.ya.Tc=function(){var a=this;if(!a.Uc){setInterval(function(){a.Ia()},250);a.Uc=1}};g.G=new g.ia;window.attachEvent("onbeforeunload",function(){g.G.Ia()});g.G.Ea=function(a,b,c){a.attachEvent(b,c);this.aa(function(){a.detachEvent(b,
-c)})};(function(){function a(){g.za.Ia()}g.za=new g.ia;g.G.Ea(window,"onresize",a)})();(function(){function a(){g.Ra.Ia()}g.Ra=new g.ia;g.G.Ea(window,"onscroll",a);g.za.aa(a)})();(function(){function a(){c=g.Qa.wc()}function b(){if(c){for(var e=0,f=c.length;e<f;e++)g.attach(c[e]);c=0}}var c;g.G.Ea(window,"onbeforeprint",a);g.G.Ea(window,"onafterprint",b)})();g.hd=function(){function a(i){this.V=i}var b=doc.createElement("length-calc"),c=doc.documentElement,e=b.style,f={},h=["mm","cm","in","pt","pc"],
-j=h.length,d={};e.position="absolute";e.top=e.left="-9999px";for(c.appendChild(b);j--;){b.style.width="100"+h[j];f[h[j]]=b.offsetWidth/100}c.removeChild(b);a.prototype={ib:/(px|em|ex|mm|cm|in|pt|pc|%)$/,vb:function(){var i=this.Lc;if(i===void 0)i=this.Lc=parseFloat(this.V);return i},ab:function(){var i=this.ad;if(!i)i=this.ad=(i=this.V.match(this.ib))&&i[0]||"px";return i},a:function(i,k){var m=this.vb(),l=this.ab();switch(l){case "px":return m;case "%":return m*(typeof k==="function"?k():k)/100;
-case "em":return m*this.tb(i);case "ex":return m*this.tb(i)/2;default:return m*f[l]}},tb:function(i){var k=i.currentStyle.fontSize;if(k.indexOf("px")>0)return parseFloat(k);else{b.style.width="1em";i.appendChild(b);k=b.offsetWidth;b.parentNode===i&&i.removeChild(b);return k}}};g.k=function(i){return d[i]||(d[i]=new a(i))};return a}();g.Na=function(){function a(f){this.U=f}var b=g.k("50%"),c={top:1,center:1,bottom:1},e={left:1,center:1,right:1};a.prototype={Dc:function(){if(!this.sb){var f=this.U,
-h=f.length,j=g.u,d=j.ja,i=g.k("0");d=d.fa;i=["left",i,"top",i];if(h===1){f.push(new j.Ta(d,"center"));h++}if(h===2){d&(f[0].h|f[1].h)&&f[0].d in c&&f[1].d in e&&f.push(f.shift());if(f[0].h&d)if(f[0].d==="center")i[1]=b;else i[0]=f[0].d;else if(f[0].Y())i[1]=g.k(f[0].d);if(f[1].h&d)if(f[1].d==="center")i[3]=b;else i[2]=f[1].d;else if(f[1].Y())i[3]=g.k(f[1].d)}this.sb=i}return this.sb},coords:function(f,h,j){var d=this.Dc(),i=d[1].a(f,h);f=d[3].a(f,j);return{x:d[0]==="right"?h-i:i,y:d[2]==="bottom"?
-j-f:f}}};return a}();g.Rb=function(){function a(b){this.V=b}a.prototype={ib:/[a-z]+$/i,ab:function(){return this.lc||(this.lc=this.V.match(this.ib)[0].toLowerCase())},vc:function(){var b=this.fc,c;if(b===undefined){b=this.ab();c=parseFloat(this.V,10);b=this.fc=b==="deg"?c:b==="rad"?c/Math.PI*180:b==="grad"?c/400*360:b==="turn"?c*360:0}return b}};return a}();g.$b=function(){function a(c){this.V=c}var b={};a.Sc=/\s*rgba\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d+|\d*\.\d+)\s*\)\s*/;a.gb=
-{aliceblue:"F0F8FF",antiquewhite:"FAEBD7",aqua:"0FF",aquamarine:"7FFFD4",azure:"F0FFFF",beige:"F5F5DC",bisque:"FFE4C4",black:"000",blanchedalmond:"FFEBCD",blue:"00F",blueviolet:"8A2BE2",brown:"A52A2A",burlywood:"DEB887",cadetblue:"5F9EA0",chartreuse:"7FFF00",chocolate:"D2691E",coral:"FF7F50",cornflowerblue:"6495ED",cornsilk:"FFF8DC",crimson:"DC143C",cyan:"0FF",darkblue:"00008B",darkcyan:"008B8B",darkgoldenrod:"B8860B",darkgray:"A9A9A9",darkgreen:"006400",darkkhaki:"BDB76B",darkmagenta:"8B008B",darkolivegreen:"556B2F",
-darkorange:"FF8C00",darkorchid:"9932CC",darkred:"8B0000",darksalmon:"E9967A",darkseagreen:"8FBC8F",darkslateblue:"483D8B",darkslategray:"2F4F4F",darkturquoise:"00CED1",darkviolet:"9400D3",deeppink:"FF1493",deepskyblue:"00BFFF",dimgray:"696969",dodgerblue:"1E90FF",firebrick:"B22222",floralwhite:"FFFAF0",forestgreen:"228B22",fuchsia:"F0F",gainsboro:"DCDCDC",ghostwhite:"F8F8FF",gold:"FFD700",goldenrod:"DAA520",gray:"808080",green:"008000",greenyellow:"ADFF2F",honeydew:"F0FFF0",hotpink:"FF69B4",indianred:"CD5C5C",
-indigo:"4B0082",ivory:"FFFFF0",khaki:"F0E68C",lavender:"E6E6FA",lavenderblush:"FFF0F5",lawngreen:"7CFC00",lemonchiffon:"FFFACD",lightblue:"ADD8E6",lightcoral:"F08080",lightcyan:"E0FFFF",lightgoldenrodyellow:"FAFAD2",lightgreen:"90EE90",lightgrey:"D3D3D3",lightpink:"FFB6C1",lightsalmon:"FFA07A",lightseagreen:"20B2AA",lightskyblue:"87CEFA",lightslategray:"789",lightsteelblue:"B0C4DE",lightyellow:"FFFFE0",lime:"0F0",limegreen:"32CD32",linen:"FAF0E6",magenta:"F0F",maroon:"800000",mediumauqamarine:"66CDAA",
-mediumblue:"0000CD",mediumorchid:"BA55D3",mediumpurple:"9370D8",mediumseagreen:"3CB371",mediumslateblue:"7B68EE",mediumspringgreen:"00FA9A",mediumturquoise:"48D1CC",mediumvioletred:"C71585",midnightblue:"191970",mintcream:"F5FFFA",mistyrose:"FFE4E1",moccasin:"FFE4B5",navajowhite:"FFDEAD",navy:"000080",oldlace:"FDF5E6",olive:"808000",olivedrab:"688E23",orange:"FFA500",orangered:"FF4500",orchid:"DA70D6",palegoldenrod:"EEE8AA",palegreen:"98FB98",paleturquoise:"AFEEEE",palevioletred:"D87093",papayawhip:"FFEFD5",
-peachpuff:"FFDAB9",peru:"CD853F",pink:"FFC0CB",plum:"DDA0DD",powderblue:"B0E0E6",purple:"800080",red:"F00",rosybrown:"BC8F8F",royalblue:"4169E1",saddlebrown:"8B4513",salmon:"FA8072",sandybrown:"F4A460",seagreen:"2E8B57",seashell:"FFF5EE",sienna:"A0522D",silver:"C0C0C0",skyblue:"87CEEB",slateblue:"6A5ACD",slategray:"708090",snow:"FFFAFA",springgreen:"00FF7F",steelblue:"4682B4",tan:"D2B48C",teal:"008080",thistle:"D8BFD8",tomato:"FF6347",turquoise:"40E0D0",violet:"EE82EE",wheat:"F5DEB3",white:"FFF",
-whitesmoke:"F5F5F5",yellow:"FF0",yellowgreen:"9ACD32"};a.prototype={parse:function(){if(!this.Ca){var c=this.V,e;if(e=c.match(a.Sc)){this.Ca="rgb("+e[1]+","+e[2]+","+e[3]+")";this.qb=parseFloat(e[4])}else{if((e=c.toLowerCase())in a.gb)c="#"+a.gb[e];this.Ca=c;this.qb=c==="transparent"?0:1}}},O:function(c){this.parse();return this.Ca==="currentColor"?c.currentStyle.color:this.Ca},la:function(){this.parse();return this.qb}};g.pa=function(c){return b[c]||(b[c]=new a(c))};return a}();g.u=function(){function a(c){this.Ha=
-c;this.ch=0;this.U=[];this.wa=0}var b=a.ja={xa:1,ob:2,ea:4,ac:8,pb:16,fa:32,A:64,ga:128,ha:256,Aa:512,dc:1024,URL:2048};a.Ta=function(c,e){this.h=c;this.d=e};a.Ta.prototype={db:function(){return this.h&b.A||this.h&b.ga&&this.d==="0"},Y:function(){return this.db()||this.h&b.Aa}};a.prototype={dd:/\s/,Mc:/^[\+\-]?(\d*\.)?\d+/,url:/^url\(\s*("([^"]*)"|'([^']*)'|([!#$%&*-~]*))\s*\)/i,zb:/^\-?[_a-z][\w-]*/i,Yc:/^("([^"]*)"|'([^']*)')/,Fc:/^#([\da-f]{6}|[\da-f]{3})/i,bd:{px:b.A,em:b.A,ex:b.A,mm:b.A,cm:b.A,
-"in":b.A,pt:b.A,pc:b.A,deg:b.xa,rad:b.xa,grad:b.xa},sc:{rgb:1,rgba:1,hsl:1,hsla:1},next:function(c){function e(t,n){t=new a.Ta(t,n);if(!c){k.U.push(t);k.wa++}return t}function f(){k.wa++;return null}var h,j,d,i,k=this;if(this.wa<this.U.length)return this.U[this.wa++];for(;this.dd.test(this.Ha.charAt(this.ch));)this.ch++;if(this.ch>=this.Ha.length)return f();j=this.ch;h=this.Ha.substring(this.ch);d=h.charAt(0);switch(d){case "#":if(i=h.match(this.Fc)){this.ch+=i[0].length;return e(b.ea,i[0])}break;
-case '"':case "'":if(i=h.match(this.Yc)){this.ch+=i[0].length;return e(b.dc,i[2]||i[3]||"")}break;case "/":case ",":this.ch++;return e(b.ha,d);case "u":if(i=h.match(this.url)){this.ch+=i[0].length;return e(b.URL,i[2]||i[3]||i[4]||"")}}if(i=h.match(this.Mc)){d=i[0];this.ch+=d.length;if(h.charAt(d.length)==="%"){this.ch++;return e(b.Aa,d+"%")}if(i=h.substring(d.length).match(this.zb)){d+=i[0];this.ch+=i[0].length;return e(this.bd[i[0].toLowerCase()]||b.ac,d)}return e(b.ga,d)}if(i=h.match(this.zb)){d=
-i[0];this.ch+=d.length;if(d.toLowerCase()in g.$b.gb||d==="currentColor")return e(b.ea,d);if(h.charAt(d.length)==="("){this.ch++;if(d.toLowerCase()in this.sc){h=function(t){return t&&t.h&b.ga};i=function(t){return t&&t.h&(b.ga|b.Aa)};var m=function(t,n){return t&&t.d===n},l=function(){return k.next(1)};if((d.charAt(0)==="r"?i(l()):h(l()))&&m(l(),",")&&i(l())&&m(l(),",")&&i(l())&&(d==="rgb"||d==="hsa"||m(l(),",")&&h(l()))&&m(l(),")"))return e(b.ea,this.Ha.substring(j,this.ch));return f()}return e(b.pb,
-d)}return e(b.fa,d)}this.ch++;return e(b.ob,d)},z:function(){return this.U[this.wa-- -2]},all:function(){for(;this.next(););return this.U},da:function(c,e){for(var f=[],h,j;h=this.next();){if(c(h)){j=true;this.z();break}f.push(h)}return e&&!j?null:f}};return a}();var M=function(a){this.e=a};M.prototype={K:0,Qc:function(){var a=this.Ua,b;return!a||(b=this.o())&&(a.x!==b.x||a.y!==b.y)},Vc:function(){var a=this.Ua,b;return!a||(b=this.o())&&(a.i!==b.i||a.f!==b.f)},ub:function(){var a=this.e.getBoundingClientRect();
-return{x:a.left,y:a.top,i:a.right-a.left,f:a.bottom-a.top}},o:function(){return this.K?this.Da||(this.Da=this.ub()):this.ub()},Ec:function(){return!!this.Ua},Ja:function(){++this.K},La:function(){if(!--this.K){if(this.Da)this.Ua=this.Da;this.Da=null}}};(function(){function a(b){var c=g.p.ta(b);return function(){if(this.K){var e=this.rb||(this.rb={});return c in e?e[c]:(e[c]=b.call(this))}else return b.call(this)}}g.s={K:0,$:function(b){function c(e){this.e=e}g.p.fb(c.prototype,g.s,b);c.kc={};return c},
-m:function(){var b=this.qa(),c=this.constructor.kc;return b?b in c?c[b]:(c[b]=this.ba(b)):null},qa:a(function(){var b=this.e,c=this.constructor,e=b.style;b=b.currentStyle;var f=this.na,h=this.va,j=c.ic||(c.ic=g.F+f);c=c.jc||(c.jc=g.Sa+h.charAt(0).toUpperCase()+h.substring(1));return e[c]||b.getAttribute(j)||e[h]||b.getAttribute(f)}),g:a(function(){return!!this.m()}),D:a(function(){var b=this.qa(),c=b!==this.gc;this.gc=b;return c}),ma:a,Ja:function(){++this.K},La:function(){--this.K||delete this.rb}}})();
-g.Tb=g.s.$({na:g.F+"background",va:g.Sa+"Background",nc:{scroll:1,fixed:1,local:1},Ka:{"repeat-x":1,"repeat-y":1,repeat:1,"no-repeat":1},Nc:{"padding-box":1,"border-box":1,"content-box":1},rc:{"padding-box":1,"border-box":1},Rc:{top:1,right:1,bottom:1,left:1,center:1},Wc:{contain:1,cover:1},ba:function(a){function b(u){return u.Y()||u.h&i&&u.d in t}function c(u){return u.Y()&&g.k(u.d)||u.d==="auto"&&"auto"}var e=this.e.currentStyle,f,h,j=g.u.ja,d=j.ha,i=j.fa,k=j.ea,m,l,t=this.Rc,n,p,s=null;if(this.$a()){a=
-new g.u(a);s={M:[]};for(h={};f=a.next();){m=f.h;l=f.d;if(!h.P&&m&j.pb&&l==="linear-gradient"){n={ca:[],P:l};for(p={};f=a.next();){m=f.h;l=f.d;if(m&j.ob&&l===")"){p.color&&n.ca.push(p);n.ca.length>1&&g.p.fb(h,n);break}if(m&k){if(n.Xa||n.bb){f=a.z();if(f.h!==d)break;a.next()}p={color:g.pa(l)};f=a.next();if(f.Y())p.Fb=g.k(f.d);else a.z()}else if(m&j.xa&&!n.Xa&&!p.color&&!n.ca.length)n.Xa=new g.Rb(f.d);else if(b(f)&&!n.bb&&!p.color&&!n.ca.length){a.z();n.bb=new g.Na(a.da(function(u){return!b(u)},false))}else if(m&
-d&&l===","){if(p.color){n.ca.push(p);p={}}}else break}}else if(!h.P&&m&j.URL){h.Cb=l;h.P="image"}else if(b(f)&&!h.size){a.z();h.Ya=new g.Na(a.da(function(u){return!b(u)},false))}else if(m&i)if(l in this.Ka)h.Bb=l;else if(l in this.Nc){h.kd=l;if(l in this.rc)h.clip=l}else{if(l in this.nc)h.jd=l}else if(m&k&&!s.color)s.color=g.pa(l);else if(m&d)if(l==="/"){f=a.next();m=f.h;l=f.d;if(m&i&&l in this.Wc)h.size=l;else if(l=c(f))h.size={i:l,f:c(a.next())||a.z()&&l}}else{if(l===","&&h.P){s.M.push(h);h={}}}else return null}h.P&&
-s.M.push(h)}else this.Nb(function(){var u=e.backgroundPositionX,w=e.backgroundPositionY,r=e.backgroundImage,o=e.backgroundColor;s={};if(o!=="transparent")s.color=g.pa(o);if(r!=="none")s.M=[{P:"image",Cb:(new g.u(r)).next().d,Bb:e.backgroundRepeat,Ya:new g.Na((new g.u(u+" "+w)).all())}]});return s&&(s.color||s.M&&s.M[0])?s:null},Nb:function(a){var b=this.e.runtimeStyle,c=b.backgroundImage,e=b.backgroundColor;if(c)b.backgroundImage="";if(e)b.backgroundColor="";a=a.call(this);if(c)b.backgroundImage=
-c;if(e)b.backgroundColor=e;return a},qa:g.s.ma(function(){return this.$a()||this.Nb(function(){var a=this.e.currentStyle;return a.backgroundColor+" "+a.backgroundImage+" "+a.backgroundRepeat+" "+a.backgroundPositionX+" "+a.backgroundPositionY})}),$a:g.s.ma(function(){var a=this.e;return a.style[this.va]||a.currentStyle.getAttribute(this.na)}),Eb:function(){var a=0;if(g.J<7){a=this.e;a=""+(a.style[g.Sa+"PngFix"]||a.currentStyle.getAttribute(g.F+"png-fix"))==="true"}return a},g:g.s.ma(function(){return(this.$a()||
-this.Eb())&&!!this.m()})});g.Xb=g.s.$({Ib:["Top","Right","Bottom","Left"],Kc:{thin:"1px",medium:"3px",thick:"5px"},ba:function(){var a={},b={},c={},e=false,f=true,h=true,j=true;this.Ob(function(){for(var d=this.e.currentStyle,i=0,k,m,l,t,n,p,s;i<4;i++){l=this.Ib[i];s=l.charAt(0).toLowerCase();k=b[s]=d["border"+l+"Style"];m=d["border"+l+"Color"];l=d["border"+l+"Width"];if(i>0){if(k!==t)h=false;if(m!==n)f=false;if(l!==p)j=false}t=k;n=m;p=l;c[s]=g.pa(m);l=a[s]=g.k(b[s]==="none"?"0":this.Kc[l]||l);if(l.a(this.e)>
-0)e=true}});return e?{nb:a,Zc:b,tc:c,ed:j,uc:f,$c:h}:null},qa:g.s.ma(function(){var a=this.e,b=a.currentStyle,c;a.tagName in g.Jb&&a.offsetParent.currentStyle.borderCollapse==="collapse"||this.Ob(function(){c=b.borderWidth+"|"+b.borderStyle+"|"+b.borderColor});return c}),Ob:function(a){var b=this.e.runtimeStyle,c=b.borderWidth,e=b.borderColor;if(c)b.borderWidth="";if(e)b.borderColor="";a=a.call(this);if(c)b.borderWidth=c;if(e)b.borderColor=e;return a}});(function(){g.Oa=g.s.$({na:"border-radius",
-va:"borderRadius",ba:function(b){var c=null,e,f,h,j,d=false;if(b){f=new g.u(b);var i=function(){for(var k=[],m;(h=f.next())&&h.Y();){j=g.k(h.d);m=j.vb();if(m<0)return null;if(m>0)d=true;k.push(j)}return k.length>0&&k.length<5?{tl:k[0],tr:k[1]||k[0],br:k[2]||k[0],bl:k[3]||k[1]||k[0]}:null};if(b=i()){if(h){if(h.h&g.u.ja.ha&&h.d==="/")e=i()}else e=b;if(d&&b&&e)c={x:b,y:e}}}return c}});var a=g.k("0");a={tl:a,tr:a,br:a,bl:a};g.Oa.Qb={x:a,y:a}})();g.Vb=g.s.$({na:"border-image",va:"borderImage",Ka:{stretch:1,
-round:1,repeat:1,space:1},ba:function(a){var b=null,c,e,f,h,j,d,i=0,k,m=g.u.ja,l=m.fa,t=m.ga,n=m.A,p=m.Aa;if(a){c=new g.u(a);b={};for(var s=function(r){return r&&r.h&m.ha&&r.d==="/"},u=function(r){return r&&r.h&l&&r.d==="fill"},w=function(){h=c.da(function(r){return!(r.h&(t|p))});if(u(c.next())&&!b.fill)b.fill=true;else c.z();if(s(c.next())){i++;j=c.da(function(){return!(e.h&(t|p|n))&&!(e.h&l&&e.d==="auto")});if(s(c.next())){i++;d=c.da(function(){return!(e.h&(t|n))})}}else c.z()};e=c.next();){a=e.h;
-f=e.d;if(a&(t|p)&&!h){c.z();w()}else if(u(e)&&!b.fill){b.fill=true;w()}else if(a&l&&this.Ka[f]&&!b.repeat){b.repeat={f:f};if(e=c.next())if(e.h&l&&this.Ka[e.d])b.repeat.kb=e.d;else c.z()}else if(a&m.URL&&!b.src)b.src=f;else return null}if(!b.src||!h||h.length<1||h.length>4||j&&j.length>4||i===1&&j.length<1||d&&d.length>4||i===2&&d.length<1)return null;if(!b.repeat)b.repeat={f:"stretch"};if(!b.repeat.kb)b.repeat.kb=b.repeat.f;a=function(r,o){return{T:o(r[0]),S:o(r[1]||r[0]),L:o(r[2]||r[0]),Q:o(r[3]||
-r[1]||r[0])}};b.slice=a(h,function(r){return g.k(r.h&t?r.d+"px":r.d)});b.width=j&&j.length>0?a(j,function(r){return r.h&(n|p)?g.k(r.d):r.d}):(k=this.e.currentStyle)&&{T:g.k(k.borderTopWidth),S:g.k(k.borderRightWidth),L:g.k(k.borderBottomWidth),Q:g.k(k.borderLeftWidth)};b.ua=a(d||[0],function(r){return r.h&n?g.k(r.d):r.d})}return b}});g.Zb=g.s.$({na:"box-shadow",va:"boxShadow",ba:function(a){var b,c=g.k,e=g.u.ja,f;if(a){f=new g.u(a);b={ua:[],cb:[]};for(a=function(){for(var h,j,d,i,k,m;h=f.next();){d=
-h.d;j=h.h;if(j&e.ha&&d===",")break;else if(h.db()&&!k){f.z();k=f.da(function(l){return!l.db()})}else if(j&e.ea&&!i)i=d;else if(j&e.fa&&d==="inset"&&!m)m=true;else return false}h=k&&k.length;if(h>1&&h<5){(m?b.cb:b.ua).push({fd:c(k[0].d),gd:c(k[1].d),blur:c(k[2]?k[2].d:"0"),Xc:c(k[3]?k[3].d:"0"),color:g.pa(i||"currentColor")});return true}return false};a(););}return b&&(b.cb.length||b.ua.length)?b:null}});g.ec=g.s.$({qa:g.s.ma(function(){var a=this.e.currentStyle;return a.visibility+"|"+a.display}),
-ba:function(){var a=this.e,b=a.runtimeStyle;a=a.currentStyle;var c=b.visibility,e;b.visibility="";e=a.visibility;b.visibility=c;return{cd:e!=="hidden",xc:a.display!=="none"}},g:function(){return false}});g.B={Z:function(a){function b(c,e,f,h){this.e=c;this.q=e;this.j=f;this.parent=h}g.p.fb(b.prototype,g.B,a);return b},eb:false,R:function(){return false},Kb:function(){this.n();this.g()&&this.X()},jb:function(){this.eb=true},Lb:function(){this.g()?this.X():this.n()},Wa:function(a,b){this.Hb(a);for(var c=
-this.ka||(this.ka=[]),e=a+1,f=c.length,h;e<f;e++)if(h=c[e])break;c[a]=b;this.w().insertBefore(b,h||null)},ra:function(a){var b=this.ka;return b&&b[a]||null},Hb:function(a){var b=this.ra(a),c=this.Ba;if(b&&c){c.removeChild(b);this.ka[a]=null}},sa:function(a,b,c,e){var f=this.Va||(this.Va={}),h=f[a];if(!h){h=f[a]=g.p.Ga("shape");if(b)h.appendChild(h[b]=g.p.Ga(b));if(e){c=this.ra(e);if(!c){this.Wa(e,doc.createElement("group"+e));c=this.ra(e)}}c.appendChild(h);a=h.style;a.position="absolute";a.left=a.top=
-0;a.behavior="url(#default#VML)"}return h},Za:function(a){var b=this.Va,c=b&&b[a];if(c){c.parentNode.removeChild(c);delete b[a]}return!!c},xb:function(a){var b=this.e,c=this.q.o(),e=c.i,f=c.f,h,j,d,i,k,m;c=a.x.tl.a(b,e);h=a.y.tl.a(b,f);j=a.x.tr.a(b,e);d=a.y.tr.a(b,f);i=a.x.br.a(b,e);k=a.y.br.a(b,f);m=a.x.bl.a(b,e);a=a.y.bl.a(b,f);e=Math.min(e/(c+j),f/(d+k),e/(m+i),f/(h+a));if(e<1){c*=e;h*=e;j*=e;d*=e;i*=e;k*=e;m*=e;a*=e}return{x:{tl:c,tr:j,br:i,bl:m},y:{tl:h,tr:d,br:k,bl:a}}},oa:function(a,b,c){b=
-b||1;var e,f,h=this.q.o();f=h.i*b;h=h.f*b;var j=this.j.v,d=Math.floor,i=Math.ceil,k=a?a.T*b:0,m=a?a.S*b:0,l=a?a.L*b:0;a=a?a.Q*b:0;var t,n,p,s,u;if(c||j.g()){e=this.xb(c||j.m());c=e.x.tl*b;j=e.y.tl*b;t=e.x.tr*b;n=e.y.tr*b;p=e.x.br*b;s=e.y.br*b;u=e.x.bl*b;b=e.y.bl*b;f="m"+d(a)+","+d(j)+"qy"+d(c)+","+d(k)+"l"+i(f-t)+","+d(k)+"qx"+i(f-m)+","+d(n)+"l"+i(f-m)+","+i(h-s)+"qy"+i(f-p)+","+i(h-l)+"l"+d(u)+","+i(h-l)+"qx"+d(a)+","+i(h-b)+" x e"}else f="m"+d(a)+","+d(k)+"l"+i(f-m)+","+d(k)+"l"+i(f-m)+","+i(h-
-l)+"l"+d(a)+","+i(h-l)+"xe";return f},w:function(){var a=this.parent.ra(this.C),b;if(!a){a=doc.createElement(this.Fa);b=a.style;b.position="absolute";b.top=b.left=0;this.parent.Wa(this.C,a)}return a},n:function(){this.parent.Hb(this.C);delete this.Va;delete this.ka}};g.cc=g.B.Z({g:function(){var a=this.oc;for(var b in a)if(a.hasOwnProperty(b)&&a[b].g())return true;return false},R:function(){return this.j.lb.D()},jb:function(){if(this.g()){var a=this.wb(),b=a,c;a=a.currentStyle;var e=a.position,f=
-this.w().style,h=0,j=0;j=this.q.o();if(e==="fixed"&&g.J>6){h=j.x;j=j.y;b=e}else{do b=b.offsetParent;while(b&&b.currentStyle.position==="static");if(b){c=b.getBoundingClientRect();b=b.currentStyle;h=j.x-c.left-(parseFloat(b.borderLeftWidth)||0);j=j.y-c.top-(parseFloat(b.borderTopWidth)||0)}else{b=doc.documentElement;h=j.x+b.scrollLeft-b.clientLeft;j=j.y+b.scrollTop-b.clientTop}b="absolute"}f.position=b;f.left=h;f.top=j;f.zIndex=e==="static"?-1:a.zIndex;this.eb=true}},Lb:function(){},Mb:function(){var a=
-this.j.lb.m();this.w().style.display=a.cd&&a.xc?"":"none"},Kb:function(){this.g()?this.Mb():this.n()},wb:function(){var a=this.e;return a.tagName in g.Jb?a.offsetParent:a},w:function(){var a=this.Ba,b;if(!a){b=this.wb();a=this.Ba=doc.createElement("css3-container");a.style.direction="ltr";this.Mb();b.parentNode.insertBefore(a,b)}return a},n:function(){var a=this.Ba,b;if(a&&(b=a.parentNode))b.removeChild(a);delete this.Ba;delete this.ka}});g.Sb=g.B.Z({C:2,Fa:"background",R:function(){var a=this.j;
-return a.H.D()||a.v.D()},g:function(){var a=this.j;return a.N.g()||a.v.g()||a.H.g()||a.W.g()&&a.W.m().cb},X:function(){var a=this.q.o();if(a.i&&a.f){this.yc();this.zc()}},yc:function(){var a=this.j.H.m(),b=this.q.o(),c=this.e,e=a&&a.color,f,h;if(e&&e.la()>0){this.yb();a=this.sa("bgColor","fill",this.w(),1);f=b.i;b=b.f;a.stroked=false;a.coordsize=f*2+","+b*2;a.coordorigin="1,1";a.path=this.oa(null,2);h=a.style;h.width=f;h.height=b;a.fill.color=e.O(c);c=e.la();if(c<1)a.fill.opacity=c}else this.Za("bgColor")},
-zc:function(){var a=this.j.H.m(),b=this.q.o();a=a&&a.M;var c,e,f,h,j;if(a){this.yb();e=b.i;f=b.f;for(j=a.length;j--;){b=a[j];c=this.sa("bgImage"+j,"fill",this.w(),2);c.stroked=false;c.fill.type="tile";c.fillcolor="none";c.coordsize=e*2+","+f*2;c.coordorigin="1,1";c.path=this.oa(0,2);h=c.style;h.width=e;h.height=f;if(b.P==="linear-gradient")this.mc(c,b);else{c.fill.src=b.Cb;this.Pc(c,j)}}}for(j=a?a.length:0;this.Za("bgImage"+j++););},Pc:function(a,b){g.p.Pb(a.fill.src,function(c){var e=a.fill,f=this.e,
-h=this.q.o(),j=h.i;h=h.f;var d=this.j,i=d.I.m(),k=i&&i.nb;i=k?k.t.a(f):0;var m=k?k.r.a(f):0,l=k?k.b.a(f):0;k=k?k.l.a(f):0;d=d.H.m().M[b];f=d.Ya?d.Ya.coords(f,j-c.i-k-m,h-c.f-i-l):{x:0,y:0};d=d.Bb;l=m=0;var t=j+1,n=h+1,p=g.J===8?0:1;k=Math.round(f.x)+k+0.5;i=Math.round(f.y)+i+0.5;e.position=k/j+","+i/h;if(d&&d!=="repeat"){if(d==="repeat-x"||d==="no-repeat"){m=i+1;n=i+c.f+p}if(d==="repeat-y"||d==="no-repeat"){l=k+1;t=k+c.i+p}a.style.clip="rect("+m+"px,"+t+"px,"+n+"px,"+l+"px)"}},this)},mc:function(a,
-b){function c(B,C,z,F,H){if(z===0||z===180)return[F,C];else if(z===90||z===270)return[B,H];else{z=Math.tan(-z*t/180);B=z*B-C;C=-1/z;F=C*F-H;H=C-z;return[(F-B)/H,(z*F-C*B)/H]}}function e(){w=m>=90&&m<270?i:0;r=m<180?k:0;o=i-w;x=k-r}function f(){for(;m<0;)m+=360;m%=360}function h(B,C){var z=C[0]-B[0];B=C[1]-B[1];return Math.abs(z===0?B:B===0?z:Math.sqrt(z*z+B*B))}var j=this.e,d=this.q.o(),i=d.i,k=d.f;a=a.fill;var m=b.Xa,l=b.bb;b=b.ca;d=b.length;var t=Math.PI,n,p,s,u,w,r,o,x,q,y,A,D;if(l){l=l.coords(j,
-i,k);n=l.x;p=l.y}if(m){m=m.vc();f();e();if(!l){n=w;p=r}l=c(n,p,m,o,x);s=l[0];u=l[1]}else if(l){s=i-n;u=k-p}else{n=p=s=0;u=k}l=s-n;q=u-p;if(m===void 0){m=!l?q<0?90:270:!q?l<0?180:0:-Math.atan2(q,l)/t*180;f();e()}l=m%90?Math.atan2(l*i/k,q)/t*180:m+90;l+=180;l%=360;y=h([n,p],[s,u]);s=h([w,r],c(w,r,m,o,x));u=[];p=h([n,p],c(n,p,m,w,r))/s*100;n=[];for(q=0;q<d;q++)n.push(b[q].Fb?b[q].Fb.a(j,y):q===0?0:q===d-1?y:null);for(q=1;q<d;q++){if(n[q]===null){A=n[q-1];y=q;do D=n[++y];while(D===null);n[q]=A+(D-A)/
-(y-q+1)}n[q]=Math.max(n[q],n[q-1])}for(q=0;q<d;q++)u.push(p+n[q]/s*100+"% "+b[q].color.O(j));a.angle=l;a.type="gradient";a.method="sigma";a.color=b[0].color.O(j);a.color2=b[d-1].color.O(j);a.colors.value=u.join(",")},yb:function(){var a=this.e.runtimeStyle;a.backgroundImage="url(about:blank)";a.backgroundColor="transparent"},n:function(){g.B.n.call(this);var a=this.e.runtimeStyle;a.backgroundImage=a.backgroundColor=""}});g.Wb=g.B.Z({C:4,Fa:"border",qc:{TABLE:1,INPUT:1,TEXTAREA:1,SELECT:1,OPTION:1,
-IMG:1,HR:1,FIELDSET:1},Jc:{submit:1,button:1,reset:1},R:function(){var a=this.j;return a.I.D()||a.v.D()},g:function(){var a=this.j;return(a.N.g()||a.v.g()||a.H.g())&&a.I.g()},X:function(){var a=this.e,b=this.j.I.m(),c=this.q.o(),e=c.i;c=c.f;var f,h,j,d,i;if(b){this.Hc();b=this.Bc(2);d=0;for(i=b.length;d<i;d++){j=b[d];f=this.sa("borderPiece"+d,j.stroke?"stroke":"fill",this.w());f.coordsize=e*2+","+c*2;f.coordorigin="1,1";f.path=j.path;h=f.style;h.width=e;h.height=c;f.filled=!!j.fill;f.stroked=!!j.stroke;
-if(j.stroke){f=f.stroke;f.weight=j.mb+"px";f.color=j.color.O(a);f.dashstyle=j.stroke==="dashed"?"2 2":j.stroke==="dotted"?"1 1":"solid";f.linestyle=j.stroke==="double"&&j.mb>2?"ThinThin":"Single"}else f.fill.color=j.fill.O(a)}for(;this.Za("borderPiece"+d++););}},Hc:function(){var a=this.e,b=a.currentStyle,c=a.runtimeStyle,e=a.tagName,f=g.J===6,h;if(f&&e in this.qc||e==="BUTTON"||e==="INPUT"&&a.type in this.Jc){c.borderWidth="";e=this.j.I.Ib;for(h=e.length;h--;){f=e[h];c["padding"+f]="";c["padding"+
-f]=g.k(b["padding"+f]).a(a)+g.k(b["border"+f+"Width"]).a(a)+(!g.J===8&&h%2?1:0)}c.borderWidth=0}else if(f){if(a.childNodes.length!==1||a.firstChild.tagName!=="ie6-mask"){b=doc.createElement("ie6-mask");e=b.style;e.visibility="visible";for(e.zoom=1;e=a.firstChild;)b.appendChild(e);a.appendChild(b);c.visibility="hidden"}}else c.borderColor="transparent"},Bc:function(a){var b=this.e,c,e,f,h=this.j.I,j=[],d,i,k,m,l=Math.round,t,n,p;if(h.g()){c=h.m();h=c.nb;n=c.Zc;p=c.tc;if(c.ed&&c.$c&&c.uc){if(p.t.la()>
-0){c=h.t.a(b);k=c/2;j.push({path:this.oa({T:k,S:k,L:k,Q:k},a),stroke:n.t,color:p.t,mb:c})}}else{a=a||1;c=this.q.o();e=c.i;f=c.f;c=l(h.t.a(b));k=l(h.r.a(b));m=l(h.b.a(b));b=l(h.l.a(b));var s={t:c,r:k,b:m,l:b};b=this.j.v;if(b.g())t=this.xb(b.m());d=Math.floor;i=Math.ceil;var u=function(o,x){return t?t[o][x]:0},w=function(o,x,q,y,A,D){var B=u("x",o),C=u("y",o),z=o.charAt(1)==="r";o=o.charAt(0)==="b";return B>0&&C>0?(D?"al":"ae")+(z?i(e-B):d(B))*a+","+(o?i(f-C):d(C))*a+","+(d(B)-x)*a+","+(d(C)-q)*a+","+
-y*65535+","+2949075*(A?1:-1):(D?"m":"l")+(z?e-x:x)*a+","+(o?f-q:q)*a},r=function(o,x,q,y){var A=o==="t"?d(u("x","tl"))*a+","+i(x)*a:o==="r"?i(e-x)*a+","+d(u("y","tr"))*a:o==="b"?i(e-u("x","br"))*a+","+d(f-x)*a:d(x)*a+","+i(f-u("y","bl"))*a;o=o==="t"?i(e-u("x","tr"))*a+","+i(x)*a:o==="r"?i(e-x)*a+","+i(f-u("y","br"))*a:o==="b"?d(u("x","bl"))*a+","+d(f-x)*a:d(x)*a+","+d(u("y","tl"))*a;return q?(y?"m"+o:"")+"l"+A:(y?"m"+A:"")+"l"+o};b=function(o,x,q,y,A,D){var B=o==="l"||o==="r",C=s[o],z,F;if(C>0&&n[o]!==
-"none"&&p[o].la()>0){z=s[B?o:x];x=s[B?x:o];F=s[B?o:q];q=s[B?q:o];if(n[o]==="dashed"||n[o]==="dotted"){j.push({path:w(y,z,x,D+45,0,1)+w(y,0,0,D,1,0),fill:p[o]});j.push({path:r(o,C/2,0,1),stroke:n[o],mb:C,color:p[o]});j.push({path:w(A,F,q,D,0,1)+w(A,0,0,D-45,1,0),fill:p[o]})}else j.push({path:w(y,z,x,D+45,0,1)+r(o,C,0,0)+w(A,F,q,D,0,0)+(n[o]==="double"&&C>2?w(A,F-d(F/3),q-d(q/3),D-45,1,0)+r(o,i(C/3*2),1,0)+w(y,z-d(z/3),x-d(x/3),D,1,0)+"x "+w(y,d(z/3),d(x/3),D+45,0,1)+r(o,d(C/3),1,0)+w(A,d(F/3),d(q/
-3),D,0,0):"")+w(A,0,0,D-45,1,0)+r(o,0,1,0)+w(y,0,0,D,1,0),fill:p[o]})}};b("t","l","r","tl","tr",90);b("r","t","b","tr","br",0);b("b","r","l","br","bl",-90);b("l","b","t","bl","tl",-180)}}return j},n:function(){g.B.n.call(this);this.e.runtimeStyle.borderColor=""}});g.Ub=g.B.Z({C:5,Oc:["t","tr","r","br","b","bl","l","tl","c"],R:function(){return this.j.N.D()},g:function(){return this.j.N.g()},X:function(){this.w();var a=this.j.N.m(),b=this.q.o(),c=this.e,e=this.Gb;g.p.Pb(a.src,function(f){function h(w,
-r,o,x,q){w=e[w].style;var y=Math.max;w.width=y(r,0);w.height=y(o,0);w.left=x;w.top=q}function j(w,r,o){for(var x=0,q=w.length;x<q;x++)e[w[x]].imagedata[r]=o}var d=b.i,i=b.f,k=a.width,m=k.T.a(c),l=k.S.a(c),t=k.L.a(c);k=k.Q.a(c);var n=a.slice,p=n.T.a(c),s=n.S.a(c),u=n.L.a(c);n=n.Q.a(c);h("tl",k,m,0,0);h("t",d-k-l,m,k,0);h("tr",l,m,d-l,0);h("r",l,i-m-t,d-l,m);h("br",l,t,d-l,i-t);h("b",d-k-l,t,k,i-t);h("bl",k,t,0,i-t);h("l",k,i-m-t,0,m);h("c",d-k-l,i-m-t,k,m);j(["tl","t","tr"],"cropBottom",(f.f-p)/f.f);
-j(["tl","l","bl"],"cropRight",(f.i-n)/f.i);j(["bl","b","br"],"cropTop",(f.f-u)/f.f);j(["tr","r","br"],"cropLeft",(f.i-s)/f.i);if(a.repeat.kb==="stretch"){j(["l","r","c"],"cropTop",p/f.f);j(["l","r","c"],"cropBottom",u/f.f)}if(a.repeat.f==="stretch"){j(["t","b","c"],"cropLeft",n/f.i);j(["t","b","c"],"cropRight",s/f.i)}e.c.style.display=a.fill?"":"none"},this)},w:function(){var a=this.parent.ra(this.C),b,c,e,f=this.Oc,h=f.length;if(!a){a=doc.createElement("border-image");b=a.style;b.position="absolute";
-this.Gb={};for(e=0;e<h;e++){c=this.Gb[f[e]]=g.p.Ga("rect");c.appendChild(g.p.Ga("imagedata"));b=c.style;b.behavior="url(#default#VML)";b.position="absolute";b.top=b.left=0;c.imagedata.src=this.j.N.m().src;c.stroked=false;c.filled=false;a.appendChild(c)}this.parent.Wa(this.C,a)}return a}});g.Yb=g.B.Z({C:1,Fa:"outset-box-shadow",R:function(){var a=this.j;return a.W.D()||a.v.D()},g:function(){var a=this.j.W;return a.g()&&a.m().ua[0]},X:function(){function a(z,F,H,K,J,v,E){z=b.sa("shadow"+z+F,"fill",
-e,j-z);F=z.fill;z.coordsize=m*2+","+l*2;z.coordorigin="1,1";z.stroked=false;z.filled=true;F.color=J.O(c);if(v){F.type="gradienttitle";F.color2=F.color;F.opacity=0}z.path=E;u=z.style;u.left=H;u.top=K;u.width=m;u.height=l;return z}var b=this,c=this.e,e=this.w(),f=this.j,h=f.W.m().ua;f=f.v.m();var j=h.length,d=j,i,k=this.q.o(),m=k.i,l=k.f;k=g.J===8?1:0;for(var t=["tl","tr","br","bl"],n,p,s,u,w,r,o,x,q,y,A,D,B,C;d--;){p=h[d];w=p.fd.a(c);r=p.gd.a(c);i=p.Xc.a(c);o=p.blur.a(c);p=p.color;x=-i-o;if(!f&&o)f=
-g.Oa.Qb;x=this.oa({T:x,S:x,L:x,Q:x},2,f);if(o){q=(i+o)*2+m;y=(i+o)*2+l;A=o*2/q;D=o*2/y;if(o-i>m/2||o-i>l/2)for(i=4;i--;){n=t[i];B=n.charAt(0)==="b";C=n.charAt(1)==="r";n=a(d,n,w,r,p,o,x);s=n.fill;s.focusposition=(C?1-A:A)+","+(B?1-D:D);s.focussize="0,0";n.style.clip="rect("+((B?y/2:0)+k)+"px,"+(C?q:q/2)+"px,"+(B?y:y/2)+"px,"+((C?q/2:0)+k)+"px)"}else{n=a(d,"",w,r,p,o,x);s=n.fill;s.focusposition=A+","+D;s.focussize=1-A*2+","+(1-D*2)}}else{n=a(d,"",w,r,p,o,x);w=p.la();if(w<1)n.fill.opacity=w}}}});g.bc=
-g.B.Z({C:6,Fa:"imgEl",R:function(){var a=this.j;return this.e.src!==this.hc||a.v.D()},g:function(){var a=this.j;return a.v.g()||a.H.Eb()},X:function(){this.hc=j;this.Gc();var a=this.sa("img","fill",this.w()),b=a.fill,c=this.q.o(),e=c.i;c=c.f;var f=this.j.I.m();f=f&&f.nb;var h=this.e,j=h.src,d=Math.round;a.stroked=false;b.type="frame";b.src=j;b.position=(e?0.5/e:0)+","+(c?0.5/c:0);a.coordsize=e*2+","+c*2;a.coordorigin="1,1";a.path=this.oa(f?{T:d(f.t.a(h)),S:d(f.r.a(h)),L:d(f.b.a(h)),Q:d(f.l.a(h))}:
-0,2);a=a.style;a.width=e;a.height=c},Gc:function(){this.e.runtimeStyle.filter="alpha(opacity=0)"},n:function(){g.B.n.call(this);this.e.runtimeStyle.filter=""}});g.Qa=function(){function a(d){function i(){if(!z){var v,E,G=d.currentStyle,I=G.getAttribute(c)==="true";J=G.getAttribute(e);J=g.Ab===8?J!=="false":J==="true";if(!C){C=1;d.runtimeStyle.zoom=1;G=d;for(var O=1;G=G.previousSibling;)if(G.nodeType===1){O=0;break}if(O)d.className+=" "+g.Pa+"first-child"}y.Ja();if(I&&(E=y.o())&&(v=doc.documentElement||
-doc.body)&&(E.y>v.clientHeight||E.x>v.clientWidth||E.y+E.f<0||E.x+E.i<0)){if(!H){H=1;g.Ra.aa(i)}}else{z=1;H=C=0;g.Ra.Ma(i);A={H:new g.Tb(d),I:new g.Xb(d),N:new g.Vb(d),v:new g.Oa(d),W:new g.Zb(d),lb:new g.ec(d)};D=[A.H,A.I,A.N,A.v,A.W,A.lb];v=new g.cc(d,y,A);E=[new g.Yb(d,y,A,v),new g.Sb(d,y,A,v),new g.Wb(d,y,A,v),new g.Ub(d,y,A,v)];d.tagName==="IMG"&&E.push(new g.bc(d,y,A,v));v.oc=E;q=[v].concat(E);if(v=d.currentStyle.getAttribute(g.F+"watch-ancestors")){B=[];v=parseInt(v,10);E=0;for(I=d.parentNode;I&&
-(v==="NaN"||E++<v);){B.push(I);I.attachEvent("onpropertychange",u);I.attachEvent("onmouseenter",p);I.attachEvent("onmouseleave",s);I=I.parentNode}}if(J){g.ya.aa(m);g.ya.Tc()}m(1)}if(!F){F=1;d.attachEvent("onmove",k);d.attachEvent("onresize",k);d.attachEvent("onpropertychange",l);d.attachEvent("onmouseenter",p);d.attachEvent("onmouseleave",s);g.za.aa(k);g.G.aa(o)}y.La()}}function k(){y&&y.Ec()&&m()}function m(v){if(!K)if(z){var E,G;w();if(v||y.Qc()){E=0;for(G=q.length;E<G;E++)q[E].jb()}if(v||y.Vc()){E=
-0;for(G=q.length;E<G;E++)q[E].Lb()}r()}else C||i()}function l(){var v,E,G;v=event;if(!K&&!(v&&v.propertyName in j))if(z){w();v=0;for(E=q.length;v<E;v++){G=q[v];G.eb||G.jb();G.R()&&G.Kb()}r()}else C||i()}function t(){if(d)d.className+=f}function n(){if(d)d.className=d.className.replace(h,"")}function p(){setTimeout(t,0)}function s(){setTimeout(n,0)}function u(){var v=event.propertyName;if(v==="className"||v==="id")l()}function w(){y.Ja();for(var v=D.length;v--;)D[v].Ja()}function r(){for(var v=D.length;v--;)D[v].La();
-y.La()}function o(){if(F){if(B)for(var v=0,E=B.length,G;v<E;v++){G=B[v];G.detachEvent("onpropertychange",u);G.detachEvent("onmouseenter",p);G.detachEvent("onmouseleave",s)}d.detachEvent("onmove",m);d.detachEvent("onresize",m);d.detachEvent("onpropertychange",l);d.detachEvent("onmouseenter",p);d.detachEvent("onmouseleave",s);g.G.Ma(o);F=0}}function x(){if(!K){var v,E;o();K=1;if(q){v=0;for(E=q.length;v<E;v++)q[v].n()}J&&g.ya.Ma(m);g.za.Ma(m);q=y=A=D=B=d=null}}var q,y=new M(d),A,D,B,C,z,F,H,K,J;this.Ic=
-i;this.update=m;this.n=x;this.Ac=d}var b={},c=g.F+"lazy-init",e=g.F+"poll",f=" "+g.Pa+"hover",h=new RegExp("\\b"+g.Pa+"hover\\b","g"),j={background:1,bgColor:1,display:1};a.Cc=function(d){var i=g.p.ta(d);return b[i]||(b[i]=new a(d))};a.n=function(d){d=g.p.ta(d);var i=b[d];if(i){i.n();delete b[d]}};a.wc=function(){var d=[],i;if(b){for(var k in b)if(b.hasOwnProperty(k)){i=b[k];d.push(i.Ac);i.n()}b={}}return d};return a}();g.attach=function(a){g.Ab<9&&g.Qa.Cc(a).Ic()};g.detach=function(a){g.Qa.n(a)}};
-})();
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/css/screen.css b/core/src/plugins/gui.ajax/res/themes/umbra/css/screen.css
deleted file mode 100644
index f23c9dbcf6..0000000000
--- a/core/src/plugins/gui.ajax/res/themes/umbra/css/screen.css
+++ /dev/null
@@ -1,81 +0,0 @@
-#container { 
-	width: 50%;
-	margin: 0 auto;
-	text-align: left;
-}
-
-.footer {
-	background-color: #000;
-	padding: 0.5em;
-}
-
-.leightbox {
-	color: #333;
-	display: none;
-	position: absolute;
-	top: 45%;
-	left: 45%;
-	width: 50%;
-	height: 50%;
-	padding: 1em;
-	border: 1em solid #B8B8B8;
-	background-color: white;
-	text-align: left;
-	z-index:1001;
-	overflow: auto;	
-}
-
-#overlay, #loading_overlay{
-	display:none;
-	position:absolute;
-	top:0;
-	left:0;
-	width:100%;
-	height:100%;
-	z-index:1000;
-	background-color: #2B2B2B;
-	-moz-opacity: 0.5;
-	opacity: .50;
-	filter: alpha(opacity=50);
-}
-
-#loading_overlay{
-    display:block;
-    z-index:2000;
-	-moz-opacity:0.2;
-	opacity:0.2;
-	filter: alpha(opacity=20);
-}
-
-#element_overlay{
-	position:absolute;
-    top: 0;
-    left:0;
-	width:100%;
-	height:100%;
-	z-index:1000;
-	background-color: #EEEEEE;
-	-moz-opacity: 0.8;
-	opacity:.80;
-	filter: alpha(opacity=80);
-	text-align:center;
-	overflow:hidden;
-    padding: 0 !important;
-    margin: 0 !important;
-}
-#element_overlay img{
-    margin-top:30%;
-}
-
-
-#element_iframe{
-	position:absolute;
-	width:80%;
-	height:80%;
-	z-index:1010;
-	background-color:#eee;
-	border:1px solid black;
-}
-
-.lightbox[id]{ /* IE6 and below Can't See This */    position:fixed;    }
-#overlay[id]{ /* IE6 and below Can't See This */    position:fixed;    }
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/css/xtree.css b/core/src/plugins/gui.ajax/res/themes/umbra/css/xtree.css
deleted file mode 100644
index 584cfda00a..0000000000
--- a/core/src/plugins/gui.ajax/res/themes/umbra/css/xtree.css
+++ /dev/null
@@ -1,102 +0,0 @@
-.flexbox div.webfx-tree-container.first_container{
-	background-image:url('../images/tree-even-odd-bg.png');
-}
-
-.no-flexbox div#tree_container{
-	background-image:url('../images/tree-odd-even-bg.png');
-	background-attachment:scroll;
-}
-
-
-.webfx-tree-container {
-	margin: 0px;
-	padding: 0px;
-	font-family: Trebuchet MS, sans-serif;
-	white-space: nowrap;
-	font-size: 11px;
-}
-
-.webfx-tree-item
-{
-	padding: 0px;
-	margin: 0px;
-	font-family: Trebuchet MS, sans-serif;
-	font-size: 11px;
-	white-space: nowrap;
-	height: 25px;
-}
-
-.webfx-tree-item:hover{
-	background-color: #eee;
-}
-
-.selected-webfx-tree-item {
-	color : white;
-}
-
-.selected-webfx-tree-item-inactive 
-{
-	text-decoration: none;
-}
-
-.webfx-tree-item a, .webfx-tree-item a:active, .webfx-tree-item a:hover, .webfx-tree-item a:link {
-	margin-left: 0px;
-	outline:0;
-	cursor: default;
-}
-
-.webfx-tree-item a {	
-	text-decoration: none;
-}
-
-.webfx-tree-item a:hover {
-	text-decoration: none;
-}
-
-.webfx-tree-item a {
-	outline:0;
-}
-
-.webfx-tree-item a span{
-	display:inline-block;
-	height: 19px;
-	line-height: 19px;
-	margin-top:4px;
-	
-	padding-left: 24px;
-	background-position: 4px 1px;
-	background-repeat:no-repeat;
-}
-
-*::-moz-focus-inner { 
-	border: none; 
-}
-
-.selected-webfx-tree-item a {
-	color: white !important;
-	text-decoration: none;
-}
-
-
-.webfx-tree-item a.selected-focus{
-      color: white;
-}
-
-.webfx-tree-item img {
-	vertical-align: middle;
-	border: 0px;
-	float:left;
-}
-
-.webfx-tree-icon {
-	width: 16px;
-	height: 16px;
-	margin-right:3px;
-}
-
-.selected
-{
-	background: #ddd;
-	color: white;
-	text-decoration: none;
-}
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/html/gui.html b/core/src/plugins/gui.ajax/res/themes/umbra/html/gui.html
deleted file mode 100644
index 80f140c93e..0000000000
--- a/core/src/plugins/gui.ajax/res/themes/umbra/html/gui.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:ajxp>
-	<head>
-		<title>AJXP_APPLICATION_TITLE</title>
-        AJXP_REBASE
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
-		<link rel="icon" type="image/x-png" href="AJXP_THEME_FOLDER/images/html-folder.png">
-		<link rel="stylesheet" type="text/css" href="AJXP_THEME_FOLDER/css/allz.css?v=AJXP_CURRENT_VERSION">
-        AJXP_ADDITIONAL_JS_FRAMEWORKS
-		<script language="javascript" type="text/javascript" src="AJXP_CLIENT_RESOURCES_FOLDER/js/ajaxplorer_boot.js?v=AJXP_CURRENT_VERSION"></script>
-	</head>
-	<body style="overflow:hidden;">
-		<script type="text/javascript">
-		// Initialize booter. Do not remove the commented line AJXP_JSON_START_PARAMETERS, as it is 
-		// dynamically replaced by the application!
-		var ajaxplorer, startParameters = {}, MessageHash={};
-		//AJXP_JSON_START_PARAMETERS
-		window.ajxpBootstrap = new AjxpBootstrap(startParameters);
-		</script>
-		<div id="ajxp_desktop" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"window","fitMarginBottom":"$(\"optional_bottom_div\").getHeight()"}'></div>
-		<div id="all_forms">
-			<div id="generic_dialog_box" class="dialogBox"><div class="dialogTitle"></div><div class="dialogContent"></div></div>
-			<div id="hidden_frames" style="display:none;"></div>
-			<div id="hidden_forms" style="position:absolute;left:-1000px;"></div>	
-			
-			<!-- LOGIN SCREEN MUST BE ALREADY IN PAGE TO ENABLE PASSWORD REMEMBERING -->
-			<form id="login_form" action="login" style="display:none;" box_width="230">
-				<input type="hidden" name="get_action" value="login">
-				<input type="hidden" name="login_seed" id="login_seed" value="">
-		 	   	<a style="float:right;" href="javascript:pydio.getController().fireAction('switch_language');" title="AJXP_MESSAGE[190]" alt="AJXP_MESSAGE[190]"><img src="AJXP_THEME_FOLDER/images/actions/16/flag.png" border="0" height="16" width="16"></a>
-				<div class="dialogLegend" style="margin-bottom: 3px;margin-top: 4px;" ajxp_message_id="180">AJXP_MESSAGE[180]</div>
-				<div style="width:100%;">
-					<div class="SF_element">
-						<div class="SF_label"><ajxp:message ajxp_message_id="181">AJXP_MESSAGE[181]</ajxp:message></div>
-						<div class="SF_input"><input type="text" name="userid" style="width: 100px; padding:0px;" class="dialogFocus"></div>
-					</div>
-					<div class="SF_element">
-						<div class="SF_label"><ajxp:message ajxp_message_id="182">AJXP_MESSAGE[182]</ajxp:message></div>
-						<div class="SF_input"><input type="password" name="password"  style="width: 100px; padding:0px;"></div>
-					</div>
-					<div class="SF_element">
-						<input type="checkbox" class="radio" name="remember_me" style="border: none; width:20px !important;"/><ajxp:message ajxp_message_id="261">AJXP_MESSAGE[261]</ajxp:message>
-					</div>
-				</div>
-			</form>
-		</div>
-	</body>
-</html>
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/0.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/0.gif
deleted file mode 100644
index 390358048c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/0.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/1.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/1.gif
deleted file mode 100644
index 6991e1f9c3..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/1.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/2.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/2.gif
deleted file mode 100644
index 9874671147..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/2.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/I.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/I.png
deleted file mode 100644
index 4fb194799e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/I.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/ICON.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/ICON.png
deleted file mode 100644
index ea0b1e06e8..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/ICON.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/L.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/L.png
deleted file mode 100644
index 5db2b2d397..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/L.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/Lminus.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/Lminus.png
deleted file mode 100644
index 35cba050be..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/Lminus.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/LoginBoxLogo.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/LoginBoxLogo.png
deleted file mode 100644
index 82d28786d3..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/LoginBoxLogo.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/Lplus.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/Lplus.png
deleted file mode 100644
index 53f96232e5..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/Lplus.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/OxygenPalette.psd b/core/src/plugins/gui.ajax/res/themes/umbra/images/OxygenPalette.psd
deleted file mode 100644
index 1d66043b1b..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/OxygenPalette.psd and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/PydioLogo250.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/PydioLogo250.png
deleted file mode 100644
index 50c9e0925a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/PydioLogo250.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/T.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/T.png
deleted file mode 100644
index d1d203b55f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/T.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/Tminus.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/Tminus.png
deleted file mode 100644
index 931b5138c0..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/Tminus.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/Toolbar.psd b/core/src/plugins/gui.ajax/res/themes/umbra/images/Toolbar.psd
deleted file mode 100644
index b2568903b2..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/Toolbar.psd and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/ToolbarBg.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/ToolbarBg.gif
deleted file mode 100644
index 341ef531b7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/ToolbarBg.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/ToolbarBgReverse.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/ToolbarBgReverse.gif
deleted file mode 100644
index 0b028de0f0..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/ToolbarBgReverse.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/Tplus.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/Tplus.png
deleted file mode 100644
index c7d9d0c3fc..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/Tplus.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/1leftarrow.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/1leftarrow.png
deleted file mode 100644
index bbe1482172..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/1leftarrow.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/1uparrow.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/1uparrow.png
deleted file mode 100644
index 594b4d40c9..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/1uparrow.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/accessories-archiver.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/accessories-archiver.png
deleted file mode 100644
index d3f443f88a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/accessories-archiver.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/admin.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/admin.png
deleted file mode 100644
index 3482198d54..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/admin.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/ajxp-link.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/ajxp-link.png
deleted file mode 100644
index b1e5170060..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/ajxp-link.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/applix.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/applix.png
deleted file mode 100644
index 35427f5bda..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/applix.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/archive_insert.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/archive_insert.png
deleted file mode 100644
index 1e3a8ae217..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/archive_insert.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/ark_extract.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/ark_extract.png
deleted file mode 100644
index ab3a47f599..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/ark_extract.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/arrow_down_margin.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/arrow_down_margin.png
deleted file mode 100644
index 2e338f7f83..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/arrow_down_margin.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/back.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/back.png
deleted file mode 100644
index 1689860213..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/back.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/bookmark.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/bookmark.png
deleted file mode 100644
index 04818df036..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/bookmark.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/bookmark_add.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/bookmark_add.png
deleted file mode 100644
index 5e37efcd87..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/bookmark_add.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/bookmark_menu.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/bookmark_menu.png
deleted file mode 100644
index dfb7e35d1d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/bookmark_menu.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/button_cancel.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/button_cancel.png
deleted file mode 100644
index 66d63371cc..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/button_cancel.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/button_ok.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/button_ok.png
deleted file mode 100644
index 4b36e07996..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/button_ok.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/column-visible.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/column-visible.png
deleted file mode 100644
index 2b6134dd58..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/column-visible.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/configure.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/configure.png
deleted file mode 100644
index 895a81fe50..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/configure.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/database.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/database.png
deleted file mode 100644
index f6c7ae66b6..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/database.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/decrypted.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/decrypted.png
deleted file mode 100644
index 32a84f2d74..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/decrypted.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/delete_bookmark.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/delete_bookmark.png
deleted file mode 100644
index 3f2a5de3d0..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/delete_bookmark.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/documentinfo_koffice.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/documentinfo_koffice.png
deleted file mode 100644
index c4e926c416..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/documentinfo_koffice.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/download_manager.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/download_manager.png
deleted file mode 100644
index 2731b2c17c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/download_manager.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/drive_remote.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/drive_remote.png
deleted file mode 100644
index 3aa23b06b6..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/drive_remote.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/edit.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/edit.png
deleted file mode 100644
index e71e51eb61..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/edit.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/edit_clear_history.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/edit_clear_history.png
deleted file mode 100644
index 936d848a2a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/edit_clear_history.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/edit_user.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/edit_user.png
deleted file mode 100755
index e81b793598..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/edit_user.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/editcopy.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/editcopy.png
deleted file mode 100644
index d350391481..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/editcopy.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/editdelete.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/editdelete.png
deleted file mode 100644
index 3f2a5de3d0..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/editdelete.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/editpaste.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/editpaste.png
deleted file mode 100644
index 27f11dc435..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/editpaste.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/encrypted.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/encrypted.png
deleted file mode 100644
index 34058ba233..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/encrypted.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/eraser.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/eraser.png
deleted file mode 100644
index 898d2ec77c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/eraser.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/favorite-folder.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/favorite-folder.png
deleted file mode 100644
index 97ff67f71a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/favorite-folder.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/file_info.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/file_info.png
deleted file mode 100644
index 89cacb25c9..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/file_info.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/fileclose.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/fileclose.png
deleted file mode 100644
index e9e86ca2d2..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/fileclose.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/filenew.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/filenew.png
deleted file mode 100644
index 9aaab557c5..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/filenew.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/fileopen.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/fileopen.png
deleted file mode 100644
index 591b100058..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/fileopen.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/filesave.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/filesave.png
deleted file mode 100644
index 59a0e255a1..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/filesave.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/fileview_icon.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/fileview_icon.png
deleted file mode 100644
index 7dc6687c10..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/fileview_icon.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/flag.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/flag.png
deleted file mode 100644
index 43d3754335..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/flag.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/folder1_important.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/folder1_important.png
deleted file mode 100644
index 9cd1c053c5..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/folder1_important.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/folder_grey.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/folder_grey.png
deleted file mode 100644
index 2f2cb995b4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/folder_grey.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/folder_new.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/folder_new.png
deleted file mode 100644
index 4ea2db1b05..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/folder_new.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/folder_parent.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/folder_parent.png
deleted file mode 100644
index f5db04c8dc..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/folder_parent.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/folder_red.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/folder_red.png
deleted file mode 100644
index 11f8c86071..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/folder_red.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/folder_red_new.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/folder_red_new.png
deleted file mode 100644
index dcfffa961f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/folder_red_new.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/forward.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/forward.png
deleted file mode 100644
index 04efbb3696..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/forward.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/frame_image.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/frame_image.png
deleted file mode 100644
index 255f0adba7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/frame_image.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/go_back.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/go_back.png
deleted file mode 100644
index 1689860213..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/go_back.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/goto_parent.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/goto_parent.png
deleted file mode 100644
index a7980347d6..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/goto_parent.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/hdd_external_mount.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/hdd_external_mount.png
deleted file mode 100644
index 739fa2d2f0..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/hdd_external_mount.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/hdd_external_unmount.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/hdd_external_unmount.png
deleted file mode 100644
index 24adf741ba..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/hdd_external_unmount.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/help-about.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/help-about.png
deleted file mode 100644
index 9bdf7734cf..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/help-about.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/info.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/info.png
deleted file mode 100644
index 09d0e33c50..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/info.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/ksysv.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/ksysv.png
deleted file mode 100644
index 77b5859ed2..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/ksysv.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/mail_generic.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/mail_generic.png
deleted file mode 100644
index d2f72b2c02..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/mail_generic.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/media-playback-start.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/media-playback-start.png
deleted file mode 100644
index 5b84d94bd7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/media-playback-start.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/network-wired.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/network-wired.png
deleted file mode 100644
index 2589a21c6d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/network-wired.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/network_server_database.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/network_server_database.png
deleted file mode 100644
index 3030c17d75..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/network_server_database.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/panel_horizontal_hide.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/panel_horizontal_hide.png
deleted file mode 100644
index ce3d119229..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/panel_horizontal_hide.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/panel_horizontal_show.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/panel_horizontal_show.png
deleted file mode 100644
index b2498855a6..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/panel_horizontal_show.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/panel_vertical_hide.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/panel_vertical_hide.png
deleted file mode 100644
index 446cb022b5..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/panel_vertical_hide.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/panel_vertical_show.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/panel_vertical_show.png
deleted file mode 100644
index 7d2282937b..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/panel_vertical_show.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/player_play.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/player_play.png
deleted file mode 100644
index 32ba2b0790..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/player_play.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/player_stop.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/player_stop.png
deleted file mode 100644
index a44e6f9027..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/player_stop.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/public_url.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/public_url.png
deleted file mode 100644
index b01e46a747..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/public_url.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/qr-code.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/qr-code.png
deleted file mode 100644
index 07396e0f1d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/qr-code.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/reload.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/reload.png
deleted file mode 100644
index a5a05a1868..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/reload.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/search.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/search.png
deleted file mode 100644
index 309b7c43cd..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/search.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/share.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/share.png
deleted file mode 100644
index 12ff3efe51..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/share.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/toggle_log.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/toggle_log.png
deleted file mode 100644
index 63864c9bb4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/toggle_log.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/transp.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/transp.png
deleted file mode 100644
index b98e40b487..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/transp.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/trashcan_empty.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/trashcan_empty.png
deleted file mode 100644
index 3050a8a2c1..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/trashcan_empty.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/up.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/up.png
deleted file mode 100644
index 71b89d3127..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/up.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/user-create-repository.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/user-create-repository.png
deleted file mode 100644
index 9c94d8df13..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/user-create-repository.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/user_group_new.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/user_group_new.png
deleted file mode 100644
index 4ecc09c79e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/user_group_new.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/view_choose.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/view_choose.png
deleted file mode 100644
index 152465b5d3..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/view_choose.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/view_icon.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/view_icon.png
deleted file mode 100644
index a8af5ea776..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/view_icon.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/view_left_close.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/view_left_close.png
deleted file mode 100644
index 798d9d8ee1..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/view_left_close.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/view_left_right.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/view_left_right.png
deleted file mode 100644
index f0c8e3bdec..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/view_left_right.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/view_list_details.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/view_list_details.png
deleted file mode 100644
index 1473cbe3b7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/view_list_details.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/view_list_tree.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/view_list_tree.png
deleted file mode 100644
index dd3d0f0a4c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/view_list_tree.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/view_text.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/view_text.png
deleted file mode 100644
index ebe21a54b8..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/view_text.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/view_tree.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/view_tree.png
deleted file mode 100644
index dd3d0f0a4c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/view_tree.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/viewmag1.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/viewmag1.png
deleted file mode 100644
index 9a4d41e20e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/viewmag1.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/wallet_open.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/wallet_open.png
deleted file mode 100644
index f2c09a32f9..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/wallet_open.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/window_close.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/window_close.png
deleted file mode 100644
index 0e8e20ba70..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/window_close.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/window_fullscreen.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/window_fullscreen.png
deleted file mode 100644
index 7f970f3574..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/window_fullscreen.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/window_nofullscreen.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/window_nofullscreen.png
deleted file mode 100644
index b4be3ff585..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/window_nofullscreen.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/xmag.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/xmag.png
deleted file mode 100644
index 746c8a1afc..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/xmag.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/yast_backup.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/yast_backup.png
deleted file mode 100644
index 71b89d3127..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/yast_backup.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/yast_kuser.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/yast_kuser.png
deleted file mode 100644
index f766854678..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/yast_kuser.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/yast_security.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/yast_security.png
deleted file mode 100644
index ff92fda878..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/yast_security.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/yast_user_add.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/yast_user_add.png
deleted file mode 100644
index 65d9894cc7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/yast_user_add.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/zoom-fit-best.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/zoom-fit-best.png
deleted file mode 100644
index de9dd9c96f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/zoom-fit-best.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/zoom-in.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/zoom-in.png
deleted file mode 100644
index d738766417..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/zoom-in.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/zoom-original.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/zoom-original.png
deleted file mode 100644
index 82ee75a676..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/zoom-original.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/zoom-out.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/zoom-out.png
deleted file mode 100644
index 3d2089ac99..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/16/zoom-out.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/1leftarrow.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/1leftarrow.png
deleted file mode 100644
index b82d694fb8..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/1leftarrow.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/1uparrow.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/1uparrow.png
deleted file mode 100644
index 9fd5aa443e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/1uparrow.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/accessories-archiver.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/accessories-archiver.png
deleted file mode 100644
index d1b79e9f56..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/accessories-archiver.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/admin.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/admin.png
deleted file mode 100644
index aff64f62fa..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/admin.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/ajxp-link.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/ajxp-link.png
deleted file mode 100644
index 57e7b40f62..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/ajxp-link.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/applix.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/applix.png
deleted file mode 100644
index 2febcbefd6..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/applix.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/archive_insert.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/archive_insert.png
deleted file mode 100644
index cea63ab11f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/archive_insert.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/ark_extract.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/ark_extract.png
deleted file mode 100644
index 426c525e59..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/ark_extract.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/back_22.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/back_22.png
deleted file mode 100644
index b315cb2e25..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/back_22.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/bookmark.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/bookmark.png
deleted file mode 100644
index 835d30ac8a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/bookmark.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/bookmark_f.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/bookmark_f.png
deleted file mode 100644
index a42916da68..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/bookmark_f.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/button_cancel.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/button_cancel.png
deleted file mode 100644
index 3f1be67466..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/button_cancel.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/button_ok.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/button_ok.png
deleted file mode 100644
index 04f7c37c14..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/button_ok.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/cancel.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/cancel.png
deleted file mode 100644
index 0f7b9a82f4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/cancel.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/configure.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/configure.png
deleted file mode 100644
index 82be464eeb..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/configure.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/database.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/database.png
deleted file mode 100644
index b8e20c2b72..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/database.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/decrypted.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/decrypted.png
deleted file mode 100644
index e28cf8d2e4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/decrypted.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/dialog_close.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/dialog_close.png
deleted file mode 100644
index 91bd18b46c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/dialog_close.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/dialog_ok_apply.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/dialog_ok_apply.png
deleted file mode 100644
index c9841b8d7e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/dialog_ok_apply.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/documentinfo_koffice.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/documentinfo_koffice.png
deleted file mode 100644
index 949dd0b9af..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/documentinfo_koffice.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/download_manager.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/download_manager.png
deleted file mode 100644
index 4aa485cdc0..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/download_manager.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/drive_remote.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/drive_remote.png
deleted file mode 100644
index c5a3ee4dd9..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/drive_remote.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/edit.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/edit.png
deleted file mode 100644
index 5ddbef9829..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/edit.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/edit_clear_history.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/edit_clear_history.png
deleted file mode 100644
index 66fdad8a3e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/edit_clear_history.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/edit_user.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/edit_user.png
deleted file mode 100755
index 0a8c11db38..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/edit_user.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/editcopy.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/editcopy.png
deleted file mode 100644
index 56c2a4bc63..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/editcopy.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/editdelete.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/editdelete.png
deleted file mode 100644
index 9770097473..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/editdelete.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/editpaste.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/editpaste.png
deleted file mode 100644
index 00b4a04140..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/editpaste.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/encrypted.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/encrypted.png
deleted file mode 100644
index ad7d8e8431..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/encrypted.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/eraser.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/eraser.png
deleted file mode 100644
index 4325f81a40..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/eraser.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/favorite-folder.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/favorite-folder.png
deleted file mode 100644
index 155c556751..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/favorite-folder.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/file_info.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/file_info.png
deleted file mode 100644
index f69319aa3e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/file_info.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/fileclose.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/fileclose.png
deleted file mode 100644
index 767794aba6..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/fileclose.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/filenew.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/filenew.png
deleted file mode 100644
index c0853d291c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/filenew.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/fileopen.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/fileopen.png
deleted file mode 100644
index 69a72f53cd..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/fileopen.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/filesave.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/filesave.png
deleted file mode 100644
index b1b69b7d50..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/filesave.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/fileview_icon.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/fileview_icon.png
deleted file mode 100644
index 2f978d644a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/fileview_icon.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/folder1_important.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/folder1_important.png
deleted file mode 100644
index b23fc9829d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/folder1_important.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/folder_grey.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/folder_grey.png
deleted file mode 100644
index 609dadf5a4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/folder_grey.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/folder_new.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/folder_new.png
deleted file mode 100644
index 7c5aa4471f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/folder_new.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/folder_red.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/folder_red.png
deleted file mode 100644
index 650865f85e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/folder_red.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/folder_red_new.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/folder_red_new.png
deleted file mode 100644
index 5bb32c276a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/folder_red_new.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/forward.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/forward.png
deleted file mode 100755
index 11e4c51eac..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/forward.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/forward_22.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/forward_22.png
deleted file mode 100644
index 11e4c51eac..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/forward_22.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/frame_image.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/frame_image.png
deleted file mode 100644
index eccef07aa7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/frame_image.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/go_back.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/go_back.png
deleted file mode 100644
index 14f7d9c7d2..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/go_back.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/hdd_external_mount.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/hdd_external_mount.png
deleted file mode 100644
index e34118580d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/hdd_external_mount.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/hdd_external_unmount.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/hdd_external_unmount.png
deleted file mode 100644
index 25bbcd0827..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/hdd_external_unmount.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/info.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/info.png
deleted file mode 100644
index 6ebdac5184..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/info.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/ksysv.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/ksysv.png
deleted file mode 100644
index dde5f41e08..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/ksysv.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/mail_generic.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/mail_generic.png
deleted file mode 100644
index 827f2047f7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/mail_generic.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/media-playback-start.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/media-playback-start.png
deleted file mode 100644
index 7687ccac91..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/media-playback-start.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/network-wired.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/network-wired.png
deleted file mode 100644
index d9b700643d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/network-wired.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/network_server.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/network_server.png
deleted file mode 100644
index a858473a3d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/network_server.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/network_server_database.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/network_server_database.png
deleted file mode 100644
index 9476227b55..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/network_server_database.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/player_play.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/player_play.png
deleted file mode 100644
index 7687ccac91..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/player_play.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/player_stop.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/player_stop.png
deleted file mode 100644
index 983388e1be..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/player_stop.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/printer1.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/printer1.png
deleted file mode 100644
index 651e4a5878..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/printer1.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/public_url.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/public_url.png
deleted file mode 100644
index 73291443b8..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/public_url.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/qr-code.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/qr-code.png
deleted file mode 100644
index 1800002d77..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/qr-code.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/reload.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/reload.png
deleted file mode 100644
index 976273fc02..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/reload.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/share.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/share.png
deleted file mode 100644
index 3d95c1f914..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/share.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/system_search.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/system_search.png
deleted file mode 100644
index e131d5f02d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/system_search.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/trashcan_empty.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/trashcan_empty.png
deleted file mode 100644
index e72084d762..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/trashcan_empty.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/unshare.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/unshare.png
deleted file mode 100644
index c45e069821..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/unshare.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/up.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/up.png
deleted file mode 100644
index aadd6e5da8..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/up.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/user-create-repository.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/user-create-repository.png
deleted file mode 100644
index aae9c687c1..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/user-create-repository.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/user_group_new.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/user_group_new.png
deleted file mode 100644
index 85dd08cf6c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/user_group_new.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/view_choose.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/view_choose.png
deleted file mode 100644
index 80f2a9f473..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/view_choose.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/view_icon.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/view_icon.png
deleted file mode 100644
index 508a38eb65..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/view_icon.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/view_left_close.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/view_left_close.png
deleted file mode 100644
index a496308c66..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/view_left_close.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/view_left_right.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/view_left_right.png
deleted file mode 100644
index de3331b31a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/view_left_right.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/view_list_details.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/view_list_details.png
deleted file mode 100644
index 1473cbe3b7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/view_list_details.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/view_list_tree.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/view_list_tree.png
deleted file mode 100644
index 46393d5648..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/view_list_tree.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/view_pim_news.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/view_pim_news.png
deleted file mode 100644
index 7b2c3465cc..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/view_pim_news.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/view_text.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/view_text.png
deleted file mode 100644
index 1cfd089254..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/view_text.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/view_tree.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/view_tree.png
deleted file mode 100644
index 46393d5648..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/view_tree.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/wallet_open.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/wallet_open.png
deleted file mode 100644
index 5ed832f0da..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/wallet_open.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/window_fullscreen.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/window_fullscreen.png
deleted file mode 100644
index a4c86f1f05..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/window_fullscreen.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/window_nofullscreen.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/window_nofullscreen.png
deleted file mode 100644
index 356c5a7a6a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/window_nofullscreen.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/yast_backup.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/yast_backup.png
deleted file mode 100644
index 9f47f101f2..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/yast_backup.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/yast_security.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/yast_security.png
deleted file mode 100644
index 720303cbf0..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/yast_security.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/yast_user_add.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/yast_user_add.png
deleted file mode 100644
index eb8f845479..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/yast_user_add.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/zoom-fit-best.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/zoom-fit-best.png
deleted file mode 100644
index f4beb76b53..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/zoom-fit-best.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/zoom-fit-restore.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/zoom-fit-restore.png
deleted file mode 100644
index 463c657309..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/zoom-fit-restore.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/zoom-in.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/zoom-in.png
deleted file mode 100644
index a5bd769299..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/zoom-in.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/zoom-original.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/zoom-original.png
deleted file mode 100644
index 69452ea297..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/zoom-original.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/zoom-out.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/zoom-out.png
deleted file mode 100644
index 7008f40503..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/22/zoom-out.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/1leftarrow.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/1leftarrow.png
deleted file mode 100644
index 5bad1cc310..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/1leftarrow.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/1uparrow.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/1uparrow.png
deleted file mode 100644
index c2735be5f4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/1uparrow.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/accessories-archiver.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/accessories-archiver.png
deleted file mode 100644
index 0ef770ebe4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/accessories-archiver.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/ajxp-link.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/ajxp-link.png
deleted file mode 100644
index 4e40a8f3e7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/ajxp-link.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/archive_insert.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/archive_insert.png
deleted file mode 100644
index 80c66b2abc..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/archive_insert.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/ark_extract.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/ark_extract.png
deleted file mode 100644
index 515f0cfeb4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/ark_extract.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/back.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/back.png
deleted file mode 100644
index b3d3b578e5..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/back.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/bookmark.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/bookmark.png
deleted file mode 100644
index ad914b90f2..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/bookmark.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/bookmark_add.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/bookmark_add.png
deleted file mode 100644
index 834ad5734a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/bookmark_add.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/bottom.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/bottom.png
deleted file mode 100644
index 25b9ba81dd..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/bottom.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/button_cancel.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/button_cancel.png
deleted file mode 100644
index 0b4af089f5..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/button_cancel.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/button_ok.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/button_ok.png
deleted file mode 100644
index 5109bf5f11..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/button_ok.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/configure.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/configure.png
deleted file mode 100644
index ac4a56d61c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/configure.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/database.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/database.png
deleted file mode 100644
index b4fbae75fa..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/database.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/documentinfo_koffice.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/documentinfo_koffice.png
deleted file mode 100644
index 4d7e11d11e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/documentinfo_koffice.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/download_manager.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/download_manager.png
deleted file mode 100644
index 4c753f3ada..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/download_manager.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/drive_remote.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/drive_remote.png
deleted file mode 100644
index 69e0806e4d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/drive_remote.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/edit_clear_history.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/edit_clear_history.png
deleted file mode 100644
index d2395262de..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/edit_clear_history.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/edit_rename.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/edit_rename.png
deleted file mode 100644
index a8192502d2..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/edit_rename.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/edit_user.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/edit_user.png
deleted file mode 100755
index 757d48affb..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/edit_user.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/editcopy.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/editcopy.png
deleted file mode 100644
index 0a5b97f805..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/editcopy.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/editdelete.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/editdelete.png
deleted file mode 100644
index 53dbd63f62..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/editdelete.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/editpaste.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/editpaste.png
deleted file mode 100644
index b0fdee7f23..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/editpaste.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/eraser.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/eraser.png
deleted file mode 100644
index 10c3fda2bb..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/eraser.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/favorite-folder.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/favorite-folder.png
deleted file mode 100644
index 3876777952..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/favorite-folder.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/file_info.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/file_info.png
deleted file mode 100644
index 19fcb94725..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/file_info.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/fileclose.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/fileclose.png
deleted file mode 100644
index c72f5b589c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/fileclose.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/filenew.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/filenew.png
deleted file mode 100644
index 7168d63b1a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/filenew.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/fileopen.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/fileopen.png
deleted file mode 100644
index 4e59b93b61..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/fileopen.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/filesave.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/filesave.png
deleted file mode 100644
index 7b3dd33c7b..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/filesave.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/fileview_icon.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/fileview_icon.png
deleted file mode 100644
index 44b4f0648d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/fileview_icon.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/fileview_preview.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/fileview_preview.png
deleted file mode 100644
index afe340f96b..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/fileview_preview.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/folder1_important.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/folder1_important.png
deleted file mode 100644
index 8198de37fe..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/folder1_important.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/folder_grey.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/folder_grey.png
deleted file mode 100644
index ba5e44d57a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/folder_grey.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/folder_network.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/folder_network.png
deleted file mode 100644
index d6e1fd01de..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/folder_network.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/folder_new.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/folder_new.png
deleted file mode 100644
index 6792719de7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/folder_new.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/folder_parent.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/folder_parent.png
deleted file mode 100644
index f533323d31..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/folder_parent.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/folder_red.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/folder_red.png
deleted file mode 100644
index 583f975440..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/folder_red.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/folder_red_new.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/folder_red_new.png
deleted file mode 100644
index 9f48c7b5c6..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/folder_red_new.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/forward.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/forward.png
deleted file mode 100644
index de80f23fe5..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/forward.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/hdd_external_mount.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/hdd_external_mount.png
deleted file mode 100644
index c27f40a4a7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/hdd_external_mount.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/hdd_external_unmount.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/hdd_external_unmount.png
deleted file mode 100644
index fb2e098c88..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/hdd_external_unmount.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/info.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/info.png
deleted file mode 100644
index f7eff1aca4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/info.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/ksysv.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/ksysv.png
deleted file mode 100644
index 0dd1beedb8..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/ksysv.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/mail_generic.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/mail_generic.png
deleted file mode 100644
index cc033f6aeb..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/mail_generic.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/media_playback_start.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/media_playback_start.png
deleted file mode 100644
index 08adde7276..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/media_playback_start.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/network_server.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/network_server.png
deleted file mode 100644
index 388b37d4cc..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/network_server.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/network_server_database.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/network_server_database.png
deleted file mode 100644
index 7affc7e693..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/network_server_database.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/object_edit.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/object_edit.png
deleted file mode 100644
index f7033de67f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/object_edit.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/player_stop.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/player_stop.png
deleted file mode 100644
index 020ef79058..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/player_stop.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/preferences_system.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/preferences_system.png
deleted file mode 100644
index e4656a0501..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/preferences_system.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/preferences_system_login.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/preferences_system_login.png
deleted file mode 100644
index 97f0bdaf27..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/preferences_system_login.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/qr-code.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/qr-code.png
deleted file mode 100644
index abdedebfe3..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/qr-code.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/reload.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/reload.png
deleted file mode 100644
index 29ac90a741..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/reload.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/share.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/share.png
deleted file mode 100644
index 60107f7d1d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/share.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/system_log_out.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/system_log_out.png
deleted file mode 100644
index 80b01ea500..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/system_log_out.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/system_search.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/system_search.png
deleted file mode 100644
index b155bef27f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/system_search.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/toggle_log.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/toggle_log.png
deleted file mode 100644
index df1d42087c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/toggle_log.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/top.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/top.png
deleted file mode 100644
index bf9a000616..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/top.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/trashcan_empty.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/trashcan_empty.png
deleted file mode 100644
index 189bb6a5d8..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/trashcan_empty.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/up.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/up.png
deleted file mode 100644
index 5af187a2ed..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/up.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/user-create-repository.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/user-create-repository.png
deleted file mode 100644
index 517318b060..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/user-create-repository.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/user_create.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/user_create.png
deleted file mode 100644
index 80f0d38405..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/user_create.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/user_group_new.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/user_group_new.png
deleted file mode 100644
index f4e2dbf836..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/user_group_new.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/user_guest.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/user_guest.png
deleted file mode 100644
index 92266bac59..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/user_guest.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/user_normal.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/user_normal.png
deleted file mode 100644
index 66dc1e65f0..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/user_normal.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/user_sysadmin.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/user_sysadmin.png
deleted file mode 100644
index 20d0de94e1..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/user_sysadmin.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/utilities_file_archiver.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/utilities_file_archiver.png
deleted file mode 100644
index b9646cec39..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/utilities_file_archiver.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/view_choose.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/view_choose.png
deleted file mode 100644
index e88d60ffee..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/view_choose.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/view_left_close.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/view_left_close.png
deleted file mode 100644
index a496308c66..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/view_left_close.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/view_left_right.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/view_left_right.png
deleted file mode 100644
index de3331b31a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/view_left_right.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/view_list_details.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/view_list_details.png
deleted file mode 100644
index 86956da632..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/view_list_details.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/view_list_icons.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/view_list_icons.png
deleted file mode 100644
index e1f9bbce05..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/view_list_icons.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/view_list_text.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/view_list_text.png
deleted file mode 100644
index 61b04d2006..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/view_list_text.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/view_list_tree.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/view_list_tree.png
deleted file mode 100644
index 52dea08707..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/view_list_tree.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/view_pim_news.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/view_pim_news.png
deleted file mode 100644
index 11e158bbcd..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/view_pim_news.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/view_tree.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/view_tree.png
deleted file mode 100644
index 52dea08707..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/view_tree.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/wallet_open.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/wallet_open.png
deleted file mode 100644
index 8a8e29464c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/wallet_open.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/window_fullscreen.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/window_fullscreen.png
deleted file mode 100644
index 90ae4974dc..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/window_fullscreen.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/window_nofullscreen.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/window_nofullscreen.png
deleted file mode 100644
index a00ad13656..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/window_nofullscreen.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/xmag.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/xmag.png
deleted file mode 100644
index 2e46982986..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/xmag.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/yast_backup.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/yast_backup.png
deleted file mode 100644
index 5af187a2ed..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/yast_backup.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/yast_user_add.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/yast_user_add.png
deleted file mode 100644
index d4098121af..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/yast_user_add.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/zoom-fit-best.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/zoom-fit-best.png
deleted file mode 100644
index b29f17ae51..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/zoom-fit-best.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/zoom-in.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/zoom-in.png
deleted file mode 100644
index 59e12a9d69..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/zoom-in.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/zoom-original.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/zoom-original.png
deleted file mode 100644
index 6be5175fb0..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/zoom-original.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/zoom-out.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/zoom-out.png
deleted file mode 100644
index 5d81460c9d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/actions/32/zoom-out.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/ajxp-connexion-loader.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/ajxp-connexion-loader.gif
deleted file mode 100644
index 5a38eb749d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/ajxp-connexion-loader.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/arrow_down.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/arrow_down.png
deleted file mode 100644
index c26cecf192..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/arrow_down.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/arrow_down_margin.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/arrow_down_margin.png
deleted file mode 100644
index e29275ffbd..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/arrow_down_margin.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/arrow_left.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/arrow_left.png
deleted file mode 100644
index ebacdb2507..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/arrow_left.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/arrow_right.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/arrow_right.png
deleted file mode 100644
index e9c8f96db3..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/arrow_right.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/arrow_up.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/arrow_up.png
deleted file mode 100644
index c5315a7559..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/arrow_up.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/arrow_up_margin.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/arrow_up_margin.png
deleted file mode 100644
index 934ce42f8f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/arrow_up_margin.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/autocompleter-loader.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/autocompleter-loader.gif
deleted file mode 100644
index 8c1ffedd99..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/autocompleter-loader.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/blank.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/blank.png
deleted file mode 100644
index 8274452d1e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/blank.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/fakeFlashButtonBg.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/fakeFlashButtonBg.gif
deleted file mode 100644
index e5f66ddabd..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/fakeFlashButtonBg.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/foldericon.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/foldericon.png
deleted file mode 100644
index 34794f61ad..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/foldericon.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/greenled.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/greenled.png
deleted file mode 100644
index 734117f668..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/greenled.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/header_bg.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/header_bg.png
deleted file mode 100644
index 28c804cdf3..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/header_bg.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/header_bg_down.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/header_bg_down.png
deleted file mode 100644
index 8e16513850..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/header_bg_down.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/header_bg_on.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/header_bg_on.png
deleted file mode 100644
index af34ffeb0a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/header_bg_on.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/header_bg_plain.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/header_bg_plain.png
deleted file mode 100644
index 28c804cdf3..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/header_bg_plain.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/header_bg_up.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/header_bg_up.png
deleted file mode 100644
index 324186160e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/header_bg_up.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/hgrabber.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/hgrabber.gif
deleted file mode 100644
index 67a41676e6..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/hgrabber.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/html-folder.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/html-folder.png
deleted file mode 100644
index c0bad77ce9..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/html-folder.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang.gif
deleted file mode 100644
index 62b3bc5f23..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_cn.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_cn.gif
deleted file mode 100644
index 6caed29fa8..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_cn.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_de.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_de.gif
deleted file mode 100644
index aea2ee560d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_de.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_ee.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_ee.gif
deleted file mode 100644
index 1b9164c69a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_ee.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_en.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_en.gif
deleted file mode 100644
index 1358a09e55..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_en.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_fr.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_fr.gif
deleted file mode 100644
index dff858b3e1..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_fr.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_hun.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_hun.gif
deleted file mode 100644
index 790d7e738f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_hun.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_it.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_it.gif
deleted file mode 100644
index 8818ae6c68..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_it.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_lt.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_lt.gif
deleted file mode 100644
index c1a1c12a68..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_lt.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_pl.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_pl.gif
deleted file mode 100644
index c3ed36d85e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_pl.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_pt.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_pt.gif
deleted file mode 100644
index ed22576b2a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_pt.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_rs.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_rs.gif
deleted file mode 100644
index e31bc68310..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_rs.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_si.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_si.gif
deleted file mode 100644
index 5c2977695d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_si.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_sk.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_sk.gif
deleted file mode 100644
index 07c0567325..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/i18n/lang_sk.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/loadingImage.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/loadingImage.gif
deleted file mode 100644
index cf38df9b69..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/loadingImage.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/locationBg.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/locationBg.gif
deleted file mode 100644
index f7bd091c8c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/locationBg.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/admin.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/admin.png
deleted file mode 100644
index 3482198d54..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/admin.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/applications_engineering.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/applications_engineering.png
deleted file mode 100644
index d23bb74adf..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/applications_engineering.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/archive.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/archive.png
deleted file mode 100644
index 8b946b6016..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/archive.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/book.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/book.png
deleted file mode 100644
index bca993e095..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/book.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/css.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/css.png
deleted file mode 100644
index 1a8f49ef1d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/css.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/document.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/document.png
deleted file mode 100644
index 352c64675e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/document.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/document_open_remote.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/document_open_remote.png
deleted file mode 100644
index 839714c498..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/document_open_remote.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/dwg.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/dwg.png
deleted file mode 100644
index c048c8c034..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/dwg.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/exe.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/exe.png
deleted file mode 100644
index acaf8234f4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/exe.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/flash.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/flash.png
deleted file mode 100644
index 68daf02595..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/flash.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/folder.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/folder.png
deleted file mode 100644
index 6f665e9a0f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/folder.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/folder_development.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/folder_development.png
deleted file mode 100644
index 5626aa1247..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/folder_development.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/folder_grey.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/folder_grey.png
deleted file mode 100644
index 2f2cb995b4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/folder_grey.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/folder_open.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/folder_open.png
deleted file mode 100644
index 9a26ca17d5..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/folder_open.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/folder_red.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/folder_red.png
deleted file mode 100644
index dcfffa961f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/folder_red.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/hdd_external_mount.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/hdd_external_mount.png
deleted file mode 100644
index 739fa2d2f0..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/hdd_external_mount.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/hdd_external_unmount.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/hdd_external_unmount.png
deleted file mode 100644
index 24adf741ba..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/hdd_external_unmount.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/horo.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/horo.png
deleted file mode 100644
index f9ab0385fb..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/horo.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/html.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/html.png
deleted file mode 100644
index d2a96ac1ec..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/html.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/image.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/image.png
deleted file mode 100644
index ddc3ea6ffb..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/image.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/java_src.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/java_src.png
deleted file mode 100644
index ebcd551f15..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/java_src.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/javascript.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/javascript.png
deleted file mode 100644
index e15326ed65..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/javascript.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/midi.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/midi.png
deleted file mode 100644
index 5bb6206dac..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/midi.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/mime_empty.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/mime_empty.png
deleted file mode 100644
index 5ee6710f91..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/mime_empty.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/pdf.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/pdf.png
deleted file mode 100644
index ec9ec8e28f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/pdf.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/php.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/php.png
deleted file mode 100644
index f05384f0f4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/php.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/preferences_desktop.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/preferences_desktop.png
deleted file mode 100644
index fa3cbacf3f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/preferences_desktop.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/preferences_plugin.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/preferences_plugin.png
deleted file mode 100644
index 674c80b894..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/preferences_plugin.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/presentation.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/presentation.png
deleted file mode 100644
index 96ec95ce3f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/presentation.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/repo_child.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/repo_child.png
deleted file mode 100644
index 2500079788..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/repo_child.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/search.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/search.png
deleted file mode 100644
index 309b7c43cd..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/search.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/sound.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/sound.png
deleted file mode 100644
index ab88c04b3a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/sound.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/source_pl.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/source_pl.png
deleted file mode 100644
index e25f575cd6..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/source_pl.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/spreadsheet.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/spreadsheet.png
deleted file mode 100644
index a505500e7b..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/spreadsheet.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/susehelpcenter.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/susehelpcenter.png
deleted file mode 100644
index 22a27cf2a0..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/susehelpcenter.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/toggle_log.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/toggle_log.png
deleted file mode 100644
index 63864c9bb4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/toggle_log.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/trashcan.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/trashcan.png
deleted file mode 100644
index f9dadf2fdf..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/trashcan.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/trashcan_full.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/trashcan_full.png
deleted file mode 100644
index 4ad8848bdc..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/trashcan_full.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/txt2.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/txt2.png
deleted file mode 100644
index 0d8d62a958..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/txt2.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/user-acl.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/user-acl.png
deleted file mode 100755
index d5883a149a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/user-acl.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/user.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/user.png
deleted file mode 100644
index 20d71033b5..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/user.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/user_admin.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/user_admin.png
deleted file mode 100644
index e015e5b167..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/user_admin.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/user_child.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/user_child.png
deleted file mode 100644
index 2500079788..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/user_child.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/user_group_new.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/user_group_new.png
deleted file mode 100644
index f931e13e2b..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/user_group_new.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/user_guest.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/user_guest.png
deleted file mode 100644
index adbbc6e0c1..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/user_guest.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/user_shared.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/user_shared.png
deleted file mode 100644
index 5f6b33fc0a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/user_shared.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/users-folder.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/users-folder.png
deleted file mode 100755
index 6b07d818b9..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/users-folder.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/video.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/video.png
deleted file mode 100644
index 942e650225..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/video.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/word.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/word.png
deleted file mode 100644
index 0cbcda0908..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/word.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/x-office-calendar.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/x-office-calendar.png
deleted file mode 100644
index e27a9de152..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/x-office-calendar.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/yast_kuser.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/yast_kuser.png
deleted file mode 100644
index b83c3d8107..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/yast_kuser.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/zip.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/zip.png
deleted file mode 100644
index a6e97d632c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/16/zip.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/admin.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/admin.png
deleted file mode 100644
index a96c80b24f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/admin.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/applications_engineering.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/applications_engineering.png
deleted file mode 100644
index 1ed85d8214..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/applications_engineering.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/archive.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/archive.png
deleted file mode 100644
index 0b4a137aa4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/archive.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/book.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/book.png
deleted file mode 100644
index 80316bb5fa..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/book.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/css.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/css.png
deleted file mode 100644
index d52a8c2251..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/css.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/document.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/document.png
deleted file mode 100644
index 28fa88d6b1..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/document.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/document_open_remote.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/document_open_remote.png
deleted file mode 100644
index 43498e0642..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/document_open_remote.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/dwg.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/dwg.png
deleted file mode 100644
index 0b72507c26..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/dwg.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/exe.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/exe.png
deleted file mode 100644
index 3e317d4a7a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/exe.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/flash.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/flash.png
deleted file mode 100644
index 5310e86eb4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/flash.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/folder.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/folder.png
deleted file mode 100644
index 2c2f42793c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/folder.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/folder_development.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/folder_development.png
deleted file mode 100644
index ceed7cbc1c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/folder_development.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/folder_grey.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/folder_grey.png
deleted file mode 100644
index f99afbc002..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/folder_grey.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/folder_red.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/folder_red.png
deleted file mode 100644
index 1d30751397..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/folder_red.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/hdd_external_mount.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/hdd_external_mount.png
deleted file mode 100644
index e402a19297..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/hdd_external_mount.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/hdd_external_unmount.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/hdd_external_unmount.png
deleted file mode 100644
index 2b343a1fbb..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/hdd_external_unmount.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/horo.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/horo.png
deleted file mode 100644
index 580cd64396..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/horo.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/html.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/html.png
deleted file mode 100644
index df58014666..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/html.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/image.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/image.png
deleted file mode 100644
index e87b14536c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/image.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/javascript.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/javascript.png
deleted file mode 100644
index 8939f202dd..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/javascript.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/midi.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/midi.png
deleted file mode 100644
index 48704e6e3c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/midi.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/mime_empty.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/mime_empty.png
deleted file mode 100644
index e62739660b..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/mime_empty.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/pdf.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/pdf.png
deleted file mode 100644
index 9d7f3f21de..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/pdf.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/php.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/php.png
deleted file mode 100644
index fdcdca4800..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/php.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/preferences_desktop.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/preferences_desktop.png
deleted file mode 100644
index c6c0592e32..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/preferences_desktop.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/preferences_plugin.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/preferences_plugin.png
deleted file mode 100644
index c8db6dd4c9..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/preferences_plugin.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/presentation.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/presentation.png
deleted file mode 100644
index 6975280eca..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/presentation.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/repo_child.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/repo_child.png
deleted file mode 100644
index 1d30751397..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/repo_child.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/sound.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/sound.png
deleted file mode 100644
index ed0d3bc1dc..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/sound.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/source_java.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/source_java.png
deleted file mode 100644
index c990a92e7f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/source_java.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/source_pl.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/source_pl.png
deleted file mode 100644
index 975ad8bf9a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/source_pl.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/spreadsheet.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/spreadsheet.png
deleted file mode 100644
index 9aea98cb6f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/spreadsheet.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/susehelpcenter.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/susehelpcenter.png
deleted file mode 100644
index 39ca77af2f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/susehelpcenter.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/toggle_log.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/toggle_log.png
deleted file mode 100644
index 79c43db838..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/toggle_log.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/trashcan.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/trashcan.png
deleted file mode 100644
index ecfaf97dc8..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/trashcan.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/trashcan_full.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/trashcan_full.png
deleted file mode 100644
index ab3ae4955f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/trashcan_full.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/txt2.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/txt2.png
deleted file mode 100644
index d52a8c2251..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/txt2.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/user-acl.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/user-acl.png
deleted file mode 100755
index 49ae5d6298..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/user-acl.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/user.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/user.png
deleted file mode 100644
index 13933ddb3a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/user.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/user_admin.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/user_admin.png
deleted file mode 100644
index a2ca743649..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/user_admin.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/user_child.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/user_child.png
deleted file mode 100644
index 13933ddb3a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/user_child.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/user_group_new.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/user_group_new.png
deleted file mode 100644
index 4e391b4b6f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/user_group_new.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/user_guest.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/user_guest.png
deleted file mode 100644
index cd145a4fdb..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/user_guest.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/user_shared.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/user_shared.png
deleted file mode 100644
index f3e4d4d68d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/user_shared.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/users-folder.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/users-folder.png
deleted file mode 100755
index 5ce92e1e16..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/users-folder.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/video.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/video.png
deleted file mode 100644
index 1c131a7024..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/video.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/word.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/word.png
deleted file mode 100644
index 1ef17e056f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/word.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/x-office-calendar.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/x-office-calendar.png
deleted file mode 100644
index 186a17218d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/x-office-calendar.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/yast_kuser.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/yast_kuser.png
deleted file mode 100644
index d12f0812e2..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/yast_kuser.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/zip.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/zip.png
deleted file mode 100644
index 0b4a137aa4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/mimes/64/zip.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/openfoldericon.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/openfoldericon.png
deleted file mode 100644
index 9a26ca17d5..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/openfoldericon.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/overlays/12/bookmark.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/overlays/12/bookmark.png
deleted file mode 100644
index 2095294d57..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/overlays/12/bookmark.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/overlays/12/shared.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/overlays/12/shared.png
deleted file mode 100644
index 08a3251c0e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/overlays/12/shared.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/overlays/8/bookmark.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/overlays/8/bookmark.png
deleted file mode 100644
index 88596f4d5b..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/overlays/8/bookmark.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/overlays/8/shared.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/overlays/8/shared.png
deleted file mode 100644
index b7589519ba..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/overlays/8/shared.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/overlays/share128.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/overlays/share128.png
deleted file mode 100644
index 112f870ae3..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/overlays/share128.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/progress_bar.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/progress_bar.gif
deleted file mode 100644
index f0cc7dec03..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/progress_bar.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/progress_bar_80.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/progress_bar_80.gif
deleted file mode 100644
index 7e133bae8b..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/progress_bar_80.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/progress_box.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/progress_box.gif
deleted file mode 100644
index cda8c5df00..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/progress_box.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/progress_box_80.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/progress_box_80.gif
deleted file mode 100644
index 1d0d38cc4b..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/progress_box_80.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/redled.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/redled.png
deleted file mode 100644
index ef440c5321..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/redled.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/slider-handle-vert.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/slider-handle-vert.png
deleted file mode 100644
index e88b0c546c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/slider-handle-vert.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/slider-handle.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/slider-handle.png
deleted file mode 100644
index 1bd9f8223f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/slider-handle.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/slider-track-bottom.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/slider-track-bottom.png
deleted file mode 100644
index c4d05e079b..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/slider-track-bottom.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/slider-track-left.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/slider-track-left.png
deleted file mode 100644
index 438b951fde..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/slider-track-left.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/slider-track-right.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/slider-track-right.png
deleted file mode 100644
index c2363d152d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/slider-track-right.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/slider-track-top.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/slider-track-top.png
deleted file mode 100644
index cb7b33b8a8..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/slider-track-top.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/strip.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/strip.png
deleted file mode 100644
index 4ec3f8cf7a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/strip.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/tree-even-odd-bg.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/tree-even-odd-bg.png
deleted file mode 100644
index 804c7b0ca4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/tree-even-odd-bg.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/tree-odd-even-bg.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/tree-odd-even-bg.png
deleted file mode 100644
index 88142f29c7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/tree-odd-even-bg.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/vgrabber.gif b/core/src/plugins/gui.ajax/res/themes/umbra/images/vgrabber.gif
deleted file mode 100644
index 9c43590160..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/vgrabber.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/images/yellowled.png b/core/src/plugins/gui.ajax/res/themes/umbra/images/yellowled.png
deleted file mode 100644
index 125badbad7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/umbra/images/yellowled.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/css/ajaxplorer.css b/core/src/plugins/gui.ajax/res/themes/vision/css/ajaxplorer.css
deleted file mode 100755
index d9e3b70457..0000000000
--- a/core/src/plugins/gui.ajax/res/themes/vision/css/ajaxplorer.css
+++ /dev/null
@@ -1,5403 +0,0 @@
-table.sort-table tr:nth-child(even)
-{
-    background-color: #f9f9f9;
-}
-
-*{
-    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-}
-
-*:focus{
-    outline: none;
-}
-
-.soft_css_gradient, .menu.bookmarksMenu{
-    background: rgb(255,255,255); /* Old browsers */
-    background: -moz-linear-gradient(top, rgba(255,255,255,1) 0%, rgba(229,229,229,1) 100%); /* FF3.6+ */
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,255,255,1)), color-stop(100%,rgba(229,229,229,1))); /* Chrome,Safari4+ */
-    background: -webkit-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(229,229,229,1) 100%); /* Chrome10+,Safari5.1+ */
-    background: -o-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(229,229,229,1) 100%); /* Opera11.10+ */
-    background: -ms-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(229,229,229,1) 100%); /* IE10+ */
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#e5e5e5',GradientType=0 ); /* IE6-9 */
-    background: linear-gradient(top, rgba(255,255,255,1) 0%,rgba(229,229,229,1) 100%); /* W3C */
-}
-
-.grey_gradient_emboss,.selected, div.selected-webfx-tree-item-inactive{
-    background: rgb(221,221,221) !important; /* Old browsers */ /* FF3.6+ */ /* Chrome,Safari4+ */ /* Chrome10+,Safari5.1+ */ /* Opera11.10+ */ /* IE10+ */ /* IE6-9 */ /* W3C */
-}
-
-.blue_gradient,div.selected-webfx-tree-item, .selected-focus{
-    background: #5599ff !important; /* Old browsers */ /* FF3.6+ */ /* Chrome,Safari4+ */ /* Chrome10+,Safari5.1+ */ /* Opera11.10+ */ /* IE10+ */ /* IE6-9 */ /* W3C */
-}
-
-.grey_gradient_light_inputs, .dialogContent input, .dialogContent input[type="text"], .dialogContent input[type="password"], .dialogContent select, #search_txt, #location_form,#treeCopy
-{
-    background: rgb(243,243,243); /* Old browsers */
-    background: rgb(243,243,243); /* Old browsers */
-    background: -moz-linear-gradient(top, rgba(243,243,243,1) 0%, rgba(255,255,255,1) 100%); /* FF3.6+ */
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(243,243,243,1)), color-stop(100%,rgba(255,255,255,1))); /* Chrome,Safari4+ */
-    background: -webkit-linear-gradient(top, rgba(243,243,243,1) 0%,rgba(255,255,255,1) 100%); /* Chrome10+,Safari5.1+ */
-    background: -o-linear-gradient(top, rgba(243,243,243,1) 0%,rgba(255,255,255,1) 100%); /* Opera11.10+ */
-    background: -ms-linear-gradient(top, rgba(243,243,243,1) 0%,rgba(255,255,255,1) 100%); /* IE10+ */
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f3f3f3', endColorstr='#ffffff',GradientType=0 ); /* IE6-9 */
-    background: linear-gradient(top, rgba(243,243,243,1) 0%,rgba(255,255,255,1) 100%); /* W3C */
-}
-
-/*
-MAJOR STYLES
-*/
-a:link, a:visited, a:hover, a:active, a:focus {
-    text-decoration: none;
-    outline: 0;
-    color: rgb(111, 121, 131);
-}
-
-.linked{
-    cursor: pointer;
-}
-
-body, html
-{
-    margin: 0;
-    padding: 0;
-}
-
-
-.flexbox body{
-    position: absolute;
-    top:0;
-    bottom:0;
-    left:0;
-    right:0;
-}
-
-.vertical_layout{
-    display:-webkit-flex;
-    display:flex;
-    flex-direction: column;
-    -webkit-flex-direction: column;
-}
-
-.vertical_layout > *{
-    flex-shrink: 0;
-}
-
-.horizontal_layout{
-    display: -webkit-flex;
-    display: flex;
-    flex-direction: row;
-    -webkit-flex-direction: row;
-    align-items: stretch;
-    -webkit-align-items: stretch;
-}
-
-.vertical_fit{
-    flex:1;
-    -webkit-flex: 1;
-    overflow-y: hidden;
-}
-
-
-input, textarea, select
-{
-    margin-top: 1px;
-    margin-left: 10px;
-    padding: 2px;
-    border: 1px solid #aaa;
-    font-size: 11px;
-    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-    border-radius: 2px;
-    -moz-border-radius: 2px;
-    -webkit-border-radius: 2px;
-}
-
-textarea{
-    margin-top: 0;
-    margin-left: 0;
-    padding: 0;
-    background-color: #fff;
-}
-
-.titre {
-    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-    font-size: 14px;
-    font-weight: bold;
-    color: black;
-    width: 100%;
-    text-align: left;
-}
-
-.titre input, .backImage{
-    margin-top: 0;
-    margin-left: 0;
-    padding: 2px;
-    border: 1px solid #5E7C90;
-}
-
-kbd {
-    padding: .1em .6em;
-    border: 1px solid #ccc;
-    font-size: 11px;
-    font-family: Arial,Helvetica,sans-serif;
-    background-color: #f7f7f7;
-    color: #333;
-    -moz-box-shadow: 0 1px 0 rgba(0,0,0,0.2),0 0 0 2px #fff inset;
-    -webkit-box-shadow: 0 1px 0 rgba(0,0,0,0.2),0 0 0 2px #fff inset;
-    box-shadow: 0 1px 0 rgba(0,0,0,0.2),0 0 0 2px #fff inset;
-    border-radius: 3px;
-    display: inline-block;
-    margin: 0 .1em;
-    text-shadow: 0 1px 0 #fff;
-    line-height: 1.4;
-    white-space: nowrap;
-}
-
-.tooltipped
-{
-    background-color: #ffffc0;
-}
-.resizableHandle{
-    position: absolute;
-    width: 10px;
-    height: 10px;
-    background-image: url('../images/resize_handle.png');
-    opacity: 0.5;
-    cursor: nwse-resize;
-}
-
-#sidebar_rootdir_td
-{
-    height: 17px;
-    vertical-align: top;
-}
-
-#sidebar_tree_td
-{
-    vertical-align: top;
-}
-
-#sidebar_searchform_td
-{
-    vertical-align: bottom;
-    height: 20px;
-}
-
-.thumbnail_selectable_cell
-{
-    width: 110px;
-    height: 100px;
-    float: left;
-    text-align: center;
-    margin: 4px;
-    background-color: rgb(250, 250, 250);
-    -moz-border-radius : 2px;
-    border-radius: 2px;
-    padding: 4px 6px;
-    color: rgb(111, 121, 131);
-}
-
-.thumbnail_selectable_cell.detailed {;
-    margin: 0px 0px !important;
-    margin-bottom: 2px;
-    background-color: #ffffff;
-    width: 100%;
-    display: block;;
-    height: auto;
-    
-border-radius: 0;
-padding: 6px 4px;
-}
-
-.thumbnail_selectable_cell.detailed:hover{
-    background-color: rgb(253, 252, 228);
-}
-
-.thumbnail_selectable_cell.detailed:last-child{
-    border-bottom: 0;
-}
-
-.thumbnail_selectable_cell.detailed div.thumbnail_selectable_cell{
-
-    margin-right: 11px;
-    background-color: transparent;
-
-}
-
-.thumbnail_selectable_cell.detailed div.thumbLabel{
-
-    font-size: 15px;
-    text-align: left;
-    
-
-    padding-top: 9px;
-    
-
-    padding-bottom: 0px;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    overflow: hidden;
-}
-
-.thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata{
-
-    text-align: left;
-    padding-top: 0;
-    opacity: 0.8;
-    font-size: 11px;
-    white-space: nowrap;
-    margin-top: 1px;
-}
-
-.thumbnail_selectable_cell.detailed.metadata_empty div.thumbLabel{
-    padding-top:18px;
-}
-
-div.thumbnail_cell_metadata span.metadata_chunk span.text_label{
-    margin-left: 0;
-    display:inline;
-}
-
-div.thumbnail_cell_metadata span.metadata_chunk{
-    display: inline;
-    margin-right: 5px;
-}
-
-.selectable_div.detailed{
-    padding: 0 !important;
-}
-
-.thumbnail_iconlike_shadow{
-    border: 1px solid white;
-    -webkit-box-shadow: 0 0 5px #5C5C5C;
-    -moz-box-shadow: 0 0 5px #5C5C5C;
-    box-shadow: 0 0 5px #5C5C5C;
-}
-
-.selectable_div div.selected{
-    /*
-	-webkit-box-shadow : 1px 2px 3px rgba(50, 50, 50, 0.8);
-	-moz-box-shadow : 1px 2px 3px rgba(50, 50, 50, 0.8);
-	box-shadow : 1px 2px 3px rgba(50, 50, 50, 0.8);*/
-}
-.selectable_div div.selected-focus{
-    /*
-	-webkit-box-shadow : 1px 2px 3px rgba(50, 50, 50, 0.8);
-	-moz-box-shadow : 1px 2px 3px rgba(50, 50, 50, 0.8);
-	box-shadow : 1px 2px 3px rgba(50, 50, 50, 0.8);*/
-}
-
-.thumbLabel
-{
-    /*overflow: hidden;*/
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    overflow: hidden;
-}
-
-.img_cont
-{
-    width: 64px;
-    height: 64px;
-    border: 1px solid #ddd;
-    vertical-align: middle;
-}
-
-.text_label{
-    display:block;
-    /*float:left;*/
-    overflow:hidden;
-    padding-left: 6px;
-    padding-top: 4px;
-    height: 18px;
-    line-height: 17px;
-    white-space : nowrap;
-    color: #888;
-    text-overflow: ellipsis;
-}
-
-.text_label.full{
-    height: auto;
-    white-space: normal;
-}
-
-.list_selectable_span img {
-    float: left;
-}
-
-.table_rows_container span.list_selectable_span span.text_label{
-    font-size: 12px;
-    padding-left: 27px !important;
-    background-position: 5px 4px;
-    color: rgb(80, 82, 83);
-    letter-spacing: 1px;
-    background-size: 16px;
-}
-
-.overlay_icon_div{
-    position: absolute;
-    background: none !important;
-    height: 12px !important;
-    bottom: 0 !important;
-    width: auto !important;
-    top: 4px !important;
-    right: 10px !important;
-    font-size: 11px;
-}
-
-.thumbnail_selectable_cell > div > div.overlay_icon_div{
-    top: 24px !important;
-    right: 21px !important;
-    font-size: 16px;
-    transition: top 0.6s ease;
-}
-
-div.class-FetchedResultPane div.overlay_icon_div {
-    top: 16px!important;
-    font-size: 13px;
-}
-
-span.overlay-class-span{
-    color: rgb(111,123,136);
-    margin-left: 5px;
-    padding: 0 !important;
-    margin-top: 0 !important;
-}
-
-.selected span.overlay-class-span,
-.selected-webfx-tree-item span.overlay-class-span
-{
-    color: white;
-}
-
-.overlay_icon_div span.overlay-class-span{
-    margin-left: 7px;
-}
-
-.webfx-tree-item span.overlay-class-span{
-
-}
-
-/*
-DIALOG BOXES
-*/
-/*#upload_form, #createdir_form, #createfile_form, #rename_div*/
-#all_forms
-{
-    background-color: #eee;
-}
-#all_forms div{display:none;}
-#all_forms form{display:inline;}
-
-#all_forms div div,
-#all_forms div.shadow_class
-{display:block;}
-
-div.shadow_class
-{
-    -moz-border-radius:5px;
-    border-radius:5px;
-}
-
-
-.dialogBox, .editBox
-{
-    display: none;
-    position: absolute;
-    top: 30%;
-    left: 30%;
-    z-index: 1002;
-    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-    font-size: 11px;
-    padding: 0;
-    -moz-border-radius:5px;
-    border-radius: 3px;
-    min-width: 260px;
-}
-
-.editBox
-{
-    top:5%;
-    left:5%;
-    padding: 0;
-    margin: 0;
-}
-
-.dialogTitle
-{
-    cursor:move;
-    font-size: 13px !important;
-}
-
-.dialogTitle span.ajxp_icon_span,
-.dialogTitle span#modalCloseBtn
-{
-    display: inline-block;
-    font-size: 15px;
-    padding-right: 5px
-}
-
-.dialogTitle span#modalCloseBtn{
-    font-size: 13px;
-    margin-top:2px
-}
-
-
-.dialogContent
-{
-    background-color: #fff;
-    padding: 10px 10px;
-    border: 1px solid #dddddd;
-    -moz-border-radius: 0 0 3px 3px;
-    border-radius: 0 0 3px 3px;
-    background-image: url('../images/grid_tl.png');
-    border-top: 0;
-    color: #5C5C5C;
-}
-
-.dialogContent input,
-.dialogContent input[type="text"],
-.dialogContent input[type="password"],
-.dialogContent select,
-#search_txt
-{
-    margin-left: 0;
-    width: 174px;
-    border: 1px solid #aaa;
-    background-repeat: no-repeat;
-    background-position: top left;
-    height: 20px;
-    border-radius: 2px;
-    -moz-border-radius: 2px;
-    -webkit-border-radius: 2px;
-
-}
-
-.dialogContent select{
-    height: 22px;
-}
-
-.dialogContent select[multiple]{
-    height: 66px;
-}
-
-.dialogContent input:focus,
-.dialogContent input[type="text"]:focus,
-.dialogContent input[type="password"]:focus,
-.dialogContent select:focus
-{
-    background: white;
-    border: 1px solid #5599ff;
-}
-
-.dialogContent input:disabled,
-.dialogContent input[type="text"]:disabled,
-.dialogContent input[type="password"]:disabled,
-.dialogContent option:disabled
-.dialogContent textarea:disabled
-{
-    background: #eee;
-}
-
-.dialogContent input[type="checkbox"],
-.dialogContent input[type="radio"]
-{
-    height: auto;
-    width: auto;
-    border-radius : 0;
-    border:none;
-    filter: none;
-    background: none;
-    margin-right: 0;
-}
-
-label{
-    margin-right: 8px;
-}
-
-.checkbox_left {
-    float: left;
-    clear: left;
-    margin: 0 4px 5px 0 !important;
-}
-
-label.checkbox_label_left{
-    float: left;
-    display: inline-block;
-}
-
-.dialogLegend
-{
-    color: #5C5C5C;
-    padding-bottom: 5px;
-    line-height: 16px;
-}
-
-.dialogButtons
-{
-    text-align: right;
-    clear:both;
-}
-
-.dialogButtons input,
-fieldSet input.dialogButton
-{
-    margin-left: 6px;
-    width: 22px;
-    height: 22px;
-    padding: 2px;
-    background-image: none;
-    background-color: #eee;
-    border-radius: 2px;
-    -moz-border-radius: 3px;
-    box-shadow: inset 1px 1px 1px white;
-}
-
-.dialogButtons.inlineEdition input
-{
-    margin-left: 6px;
-    width: 22px;
-    height: 22px;
-    padding: 0;
-    box-shadow: none;
-}
-
-.dialogButtonsCheckbox{
-
-    float: left;
-    margin-top: 9px;
-
-}
-
-span.ajxp-caret-up{
-    position: absolute;
-    top: -21px;
-    left: 118px;
-    font-size: 30px;
-    color: #5C5C5C;
-}
-
-.dialogButtonsCheckbox label{
-    cursor: pointer;
-}
-
-.editContent, .editContent div
-{
-    background-color: #fff;
-}
-
-.editContent textarea, textarea#myCode, .editContent iframe
-{
-    border: 0;
-    border-left:1px solid #5E7C90;
-    padding: 0;
-    margin: 0;
-}
-
-#activity_monitor_warning{
-    position:absolute;
-    left:35%;
-    width:20%;
-    top:30%;
-    text-align:center;
-    font-size: 16px;
-    color: #5E7C90;
-    font-weight:bold;
-    cursor: pointer;
-}
-
-#activity_monitor_warning span.click_anywhere{
-    font-size: 12px;
-    color: #676965;
-    display:block;
-    padding-top:15px;
-    font-weight:normal;
-}
-
-#activity_monitor_warning span.warning_timer{
-    color: #0077b3;
-}
-
-textarea#myCode
-{
-    border: 1px solid #5C5C5C;
-    border-right-color: #ccc;
-    border-left-color: #ccc;
-}
-
-.dialogContent form, .editContent form
-{
-    display: inline;
-    margin: 0;
-}
-
-.dialogButton
-{
-    border-bottom: 1px solid buttonshadow;
-    border-right: 1px solid buttonshadow;
-    border-top: 1px solid #fff;
-    border-left: 1px solid #fff;
-    padding: 1px 8px;
-    margin-top: 5px;
-}
-
-.largeButton,
-.SF_input.SF_inlineButton
-{
-    display: inline-block;
-    font-size: 11px;
-    padding: 9px 0 !important;
-    text-align: center;
-    overflow: visible;
-    color: #fff;
-    outline: none;
-    border-radius: 2px;
-    margin-left: 12px;
-    background: #4dc5c3;
-    letter-spacing: 1px;
-    float: left;
-    cursor: pointer;
-}
-
-.largeButton img{
-    width:16px;
-    height:16px;
-    vertical-align: middle;
-    position: relative;
-    top: -2px;
-    margin-right: 5px;
-    margin-top: 3px;
-}
-
-.dialogArrow
-{
-    font-weight: bold;
-    font-size: 16px;
-}
-
-#fancyframe
-{
-    border: 0;
-    width: 410px;
-    height: 385px;
-}
-
-#flashframe
-{
-    border: 0;
-    width: 450px;
-    height: 300px;
-    overflow:hidden;
-    margin-top: -9px;
-}
-
-/********************/
-/* MESSAGE BOX      */
-/********************/
-#message_div
-{
-    position: absolute;
-    z-index: 1500;
-    cursor: pointer;
-    border-radius: 3px;
-    box-shadow: 3px 3px 11px rgba(0,0,0,0.25);
-}
-#message_content
-{
-    font-size: 13px;
-    margin: 8px;
-    overflow-y: auto;
-    max-height: 120px;
-    letter-spacing: 0;
-}
-
-.errorMessage
-{
-    background-color: #960000;
-    cursor: pointer;
-    filter:alpha(opacity=90);
-    opacity: 0.90;
-    -moz-opacity:0.90;
-}
-
-.logMessage
-{
-    background-color: #009600;
-    filter:alpha(opacity=90);
-    opacity: 0.90;
-    -moz-opacity:0.90;
-}
-
-html.boxshadow div.logMessage{
-    border: 1px solid #009600;
-    color: #009600 !important;
-    background-color: rgb(173, 224, 173);
-}
-
-html.boxshadow div.errorMessage{
-    border: 1px solid #960001;
-    color: #960000 !important;
-    background-color: rgb(241, 174, 174);
-}
-
-
-.simple_tooltip_observer {
-    cursor: help;
-}
-
-.simple_tooltip_observer_active{
-    /*text-decoration: underline;*/
-}
-
-.simple_tooltip_title{
-    padding-top: 2px;
-    padding-bottom: 1px;
-    font-weight: bold;
-    font-size: 11px;
-}
-.simple_tooltip
-{
-    position:absolute;
-    width:150px;
-    z-index:10000;
-    border:1px solid #696765;
-    color : #696765;
-    background-color: #fff;
-    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-    font-size: 11px;
-    letter-spacing: 1px;
-    padding: 4px 5px 5px 5px;
-}
-
-
-.down_arrow_tip,
-.top_arrow_tip {
-    background: rgba(69, 77, 85, 0.86);
-    color: white;
-    border: 0;
-    border-radius: 2px;
-}
-.down_arrow_tip:after {
-    top: 100%;
-    border: solid transparent;
-    content: " ";
-    height: 0;
-    width: 0;
-    position: absolute;
-    pointer-events: none;
-}
-
-.down_arrow_tip:after {
-    border-color: rgba(69, 77, 85, 0);
-    border-top-color: rgba(69, 77, 85, 0.86);
-    border-width: 5px;
-    left: 50%;
-    margin-left: -5px;
-}
-
-.top_arrow_tip{
-    width: 100px;
-}
-.top_arrow_tip:after {
-    bottom: 100%;
-    border: solid transparent;
-    content: " ";
-    height: 0;
-    width: 0;
-    position: absolute;
-    pointer-events: none;
-}
-
-.top_arrow_tip:after {
-    border-color: rgba(111, 123, 136, 0);
-    border-bottom-color:  rgb(111, 123, 136);
-    border-width: 5px;
-    left: 50%;
-    margin-left: -5px;
-}
-
-.arrow_tip_arrow_left:after{
-    left: 8%;
-}
-
-.right_arrow_tip {
-    color: #ffffff;
-    border-radius: 4px;
-    background-color: rgba(69, 77, 85, 0.86);
-    border: 0;
-}
-.right_arrow_tip:after, .right_arrow_tip:before {
-    left: 100%;
-    border: solid transparent;
-    content: " ";
-    height: 0;
-    width: 0;
-    position: absolute;
-    pointer-events: none;
-}
-
-.right_arrow_tip:after {
-    border-color: rgba(69, 77, 85, 0);
-    border-left-color: rgba(69, 77, 85, 0.86);
-    border-width: 5px;
-    top: 50%;
-    margin-top: -5px;
-}
-.right_arrow_tip:before {
-    border-color: rgba(69, 77, 85, 0);
-    border-left-color: rgba(69, 77, 85, 0.86);
-    border-width: 5px;
-    top: 50%;
-    margin-top: -5px;
-}
-
-
-div.accordion_toggle,
-div.dialogContentMainTitle{
-    color: rgb(117, 128, 139);
-    font-size: 20px;
-    margin-bottom: 10px;
-    border-bottom: 1px solid rgb(117, 128, 139);
-    padding-bottom: 0;
-}
-
-div.accordion_toggle{
-    cursor: pointer;
-    background-image: url('../images/Tplus.png');
-    background-repeat: no-repeat;
-    background-position-x: -6px;
-    background-position-y: -3px;
-    padding-left: 15px;
-    font-size: 16px;
-    margin-bottom: 0;
-    margin-top: 10px;
-    padding-bottom: 2px;
-    border-bottom: 0;
-}
-
-div.accordion_content div.dialogLegend{
-    text-align: justify;
-    /*opacity: 0.7;*/
-    color: rgb(117, 128, 139);
-}
-
-div.accordion_toggle_active{
-    background-image: url('../images/Tminus.png');
-}
-
-
-div.accordion_content{
-    overflow: hidden;
-    padding: 5px;
-}
-
-
-div.oneFieldForm{
-    margin-bottom: 13px;
-    background-color: #EEEEEE;
-    padding: 3px 6px;
-    border-radius: 4px;
-    margin-top: 10px;
-}
-
-div.oneFieldForm input.SF_input{
-    background: white !important;
-}
-
-/********************/
-/* PROGRESS BAR     */
-/********************/
-.pg_cancel_button{
-    background-color: #C33;
-    display: inline-block;
-    border-radius: 20px;
-    -moz-border-radius: 20px;
-    -webkit-border-radius: 20px;
-    cursor: pointer;
-    float: right;
-    margin-right: 8px;
-    font-weight: bold;
-    color: white !important;
-    height: 12px;
-    width: 8px;
-    padding-left: 4px;
-    line-height: 13px;
-    font-size: 7px;
-    margin-top: 2px;
-}
-
-/*************************/
-/* SF like "Standard Form" DATA : try to make a "standard"...
-/*************************/
-div.SF_element{
-    padding-top: 5px;
-    clear:left;
-}
-
-div.SF_disabled{
-    color: #ccc;
-    font-style:italic;
-}
-
-div.SF_label{
-    float: left;
-    width: 39%;
-    text-align: right;
-    padding-right:1%;
-    padding-left:0;
-    padding-top: 5px;
-    padding-bottom: 8px;
-    line-height: 18px;
-    font-size: 12px;
-    /*white-space: nowrap; /* css-3 */
-    /*word-wrap: no break-word; /* Internet Explorer 5.5+ */
-}
-
-input.SF_fieldCheckBox{
-    margin-top: 7px !important;
-}
-
-.no-flexbox div.SF_label{
-    padding-right:3px !important;
-}
-
-.SF_input{
-    float:left;
-    padding: 2px 3px !important;
-    width: 54% !important;
-    _width:54% !important; /*IE*/
-}
-
-div.SF_element.SF_largeLabel > div.SF_label{
-    width: 56% !important;
-    _width:54% !important; /*IE*/
-}
-
-div.SF_element.SF_largeLabel > .SF_input{
-    width: 39% !important;
-}
-
-div.SF_element.SF_largeLabel > input.SF_input.SF_number,
-input.SF_input.SF_number{
-    width: 30px !important;
-    text-align: right;
-}
-
-.SF_box{
-    width: 20px !important;
-}
-
-.SF_fieldCheckBox{
-    float:left;
-    margin: 5px;
-}
-
-.SF_elementWithCheckbox > .SF_input{
-    width: 50% !important;
-    _width:46% !important; /*IE*/
-}
-
-.SF_inlineButton {
-    margin: 3px 0 !important;
-    padding: 4px !important;
-    background-image: url('../images/grid_tl.png');
-}
-
-.SF_inlineMonitoring {
-    padding: 7px 4px !important;
-}
-.SF_inlineMonitoring.SF_inlineMonitoringWorking:after{
-    content: " [reloading]";
-}
-
-.SF_inlineButton span[class^="icon-"]{
-    margin-right: 3px;
-}
-
-.SF_inlineButton.SF_inlineButtonWorking{
-    box-shadow: inset 1px 1px 0px rgba(0, 0, 0, 0.35);
-    padding-top: 10px !important;
-    padding-bottom: 8px !important;
-}
-
-.SF_failed{
-    border: 1px solid #D8B0B0 !important;
-}
-
-.SF_replicableGroup{
-    background-color:#EEE;
-    clear: both;
-    position: relative;
-    margin-bottom: 5px;
-    border-radius: 5px;
-}
-
-.SF_replication_Add,
-.SF_replication_Remove
-{
-    display: block;
-    width: 20px;
-    height: 20px;
-    background-image: url('../images/0.gif');
-    background-repeat: no-repeat;
-    background-position: 5px 6px;
-    position:absolute;
-    bottom: 0;
-    left: 0;
-}
-
-.SF_replication_Remove
-{
-    background-image: url('../images/1.gif');
-    top: 0;
-}
-
-.SF_rgClear{
-    clear:left;
-    height: 3px;
-}
-
-.SF_image_block{
-    max-width: 80px;
-    float: left;
-}
-
-.SF_image.small{
-    max-width: 80px;
-    max-height: 80px;
-}
-.SF_image_link{
-    display: inline-block;
-    width: 80px;
-    cursor: pointer;
-    text-align: center;
-}
-
-.accordion_toggle_failed {
-    background-color: #D8B0B0 !important;
-}
-
-.SF_horizontal_labelRow{
-    clear: both;
-}
-
-.SF_horizontal_labelRow div.SF_label{
-    float:left;
-    text-align: left;
-    padding: 8px 5px 0 3px;
-    margin-right: 5px;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-}
-
-.SF_horizontal_fieldsRow{
-    clear: both;
-}
-.SF_horizontal_fieldsRow input{
-    float: left;
-    margin-right: 5px;
-    font-size: 13px;
-    padding: 3px 4px 3px 2px !important;
-}
-
-.SF_horizontal_fieldsRow input.SF_number{
-    text-align: left;
-}
-
-.SF_horizontal_actions {
-    float: left;
-    padding: 5px 2px;
-    font-size: 15px;
-}
-
-.SF_horizontal_pastilles{
-    float: left;
-    padding: 3px 2px;
-    font-size: 11px;
-}
-
-.SF_horizontal_actions span{
-    cursor: pointer;
-    margin-right: 0;
-}
-
-.SF_horizontal_pastilles span{
-    margin-right: 10px;
-}
-
-.SF_horizontal_action_destructive{
-    color: #A00;
-}
-
-/****************
-/* LOGIN BOX
-/****************/
-.captcha_container {
-    text-align:center;
-}
-.captcha_container img{
-    margin: 5 0 0 2px;
-    border: 1px solid #ddd;
-}
-
-#login_form,
-#login_form_dynamic
-{
-    margin: 0 53px;
-    font-size: 15px;
-    padding-top: 20px;
-    padding-bottom: 20px;
-}
-
-#login_form div.SF_label,
-#login_form_dynamic div.SF_label{
-    display: none;
-}
-
-#login_form.no_placeholder div.SF_label,
-#login_form_dynamic.no_placeholder div.SF_label
-{
-    display: block;
-    text-align: left;
-    padding: 0 4px;
-}
-
-#login_form.no_placeholder div.SF_input,
-#login_form_dynamic.no_placeholder div.SF_input
-{
-    clear: left;
-}
-
-#login_form div.SF_input > input,
-#login_form_dynamic div.SF_input > input{
-    width: 200px !important;
-    padding: 4px !important;
-    font-size: 17px;
-}
-
-.ajxp_login_error {
-    margin-top: 10px;
-    font-size: 14px !important;
-    background-color: transparent !important;
-    color: rgb(219, 0, 0) !important;
-    border: 1px solid rgb(216, 0, 0);
-    padding: 7px !important;
-}
-
-.ajxp_password_auth div.SF_element:first-of-type{
-    display: none !important;
-}
-
-/***************/
-/*ACTION BAR   */
-/***************/
-.centeredWidth{
-}
-
-#global_toolbar{
-    background-color: #474E50;
-    height: 30px;
-    padding: 12px 0 4px 5px !important;
-    box-shadow: 0 0 8px rgba(0,0,0,0.4);
-}
-
-#top_toolbar{
-    float:right;
-}
-
-#workspace_toolbar{
-    padding-top: 11px;
-    height: 53px;
-    overflow: hidden;
-}
-
-#simple_repository_label{
-    float: left;
-    width: 23%;
-    padding: 0 0 0 17px;
-    height: 53px;
-    font-size: 25px;
-    color: rgb(111, 121, 131);
-}
-
-#simple_repository_label div.repository_title{
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    overflow: hidden;
-}
-
-#simple_repository_label div.repository_legend {
-    font-size: 13px;
-}
-
-#toolbars
-{
-}
-
-.toolbars_separator
-{
-    border-bottom: 1px solid #fff;
-    border-top: 1px solid buttonshadow;
-}
-
-.toolbar_title{
-    font-size:15px;
-    font-weight:bold;
-    color: #ddd;
-}
-
-#tree_container{
-    background-color: #ebedf0;
-    border-left: 1px solid rgb(172, 178, 184);
-    border-right: 1px solid rgb(172, 178, 184);
-}
-
-.panelHeader, .dialogTitle{
-    border: none;
-    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue-Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-    font-size: 12px !important;
-    padding: 5px 2px 5px 9px;
-    color: rgb(255, 255, 255);
-    vertical-align: middle;
-    background-color: rgb(138, 149, 160);
-    letter-spacing: 1px; /* Old browsers */   /* FF3.6+ */   /* Chrome,Safari4+ */   /* Chrome10+,Safari5.1+ */   /* Opera 11.10+ */   /* IE10+ */   /* W3C */   /* IE6-9 */; /* Old browsers */   /* FF3.6+ */   /* Chrome,Safari4+ */   /* Chrome10+,Safari5.1+ */   /* Opera 11.10+ */   /* IE10+ */   /* W3C */   /* IE6-9 */;
-    border-bottom: 2px solid rgb(111, 123, 136);
-}
-
-
-.dialogTitle{
-    border-radius: 2px 2px 0 0;
-    background-color: #4dc5c3;
-    border-bottom: 1px solid rgb(67, 156, 155);
-}
-
-#sidebar_splitter div.panelHeader,
-#search_panel div.panelHeader{
-}
-
-#search_panel div.panelHeader{
-    cursor: move;
-}
-
-.action_bar
-{
-    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-    font-size: 12px;
-    padding: 0;
-    line-height: 15px;
-}
-.action_bar.editor_action_bar{
-    height: 37px;
-    background-color: transparent;
-    border-bottom: 0 solid rgb(138, 149, 160);
-    right: 29px;
-    position: absolute;
-    z-index: 10;
-}
-
-#codemirror_box div.action_bar.editor_action_bar{
-    right: 0;
-    border-bottom: 1px solid rgb(138, 149, 160);
-    padding-left: 10px;
-}
-
-.action_bar.editor_action_bar div.separator{
-    display: none;
-}
-
-span[message_id="Text Search"] {
-    display: none;
-}
-
-div.editor_header{
-    height: auto;
-}
-
-div.editor_header > div.editor_action_bar {
-    position: absolute;
-    right: 20px;
-    padding-right: 8px;
-    background: none;
-    padding-top: 15px;
-    height: 42px;
-    padding-left: 10px;
-}
-
-.ajxp_theme_vision div.editor_header > div.editor_action_bar{
-    border-bottom:0;
-}
-
-
-div.editor_header > div.editor_action_bar > div.separator{
-    display: none !important;
-}
-
-.editor_action_bar a {
-padding: 3px 5px !important;
-}
-
-.editor_action_bar span.actionbar_button_label {
-    font-size: 11px !important;
-    font-weight: bold;
-}
-
-div.editor_header > span.header_label{
-    color: rgb(111, 123, 136);
-    font-size: 24px;
-    width: 100%;
-    padding: 15px 0 0 62px;
-    display: inline-block;
-    background-image: url('../images/mimes/64/user-acl.png');
-    background-size: 40px;
-    background-repeat: no-repeat;
-    background-position: 14px 9px;
-    text-shadow: 1px 1px 5px black;
-    overflow: visible;
-}
-
-.ajxp_theme_vision div.editor_header > span.header_label{
-    text-shadow: none;
-}
-
-.action_bar.text_only{
-    line-height: 16px;
-    height:38px;
-}
-
-.action_bar.icons_only{
-    height:40px;
-    line-height: 0;
-}
-
-.action_bar
-{
-    overflow:hidden;
-}
-
-.action_bar.floatingBar{
-    position: absolute;
-    border-radius: 20px;
-    padding-right: 10px;
-    padding-left: 10px;
-    cursor: move;
-    opacity: 0.90;
-    background-color: rgb(138, 149, 160);
-}
-
-.action_bar span.actionbar_button_label {
-    cursor: pointer;
-    display: inline-block;
-    padding: 4px 3px 3px;
-    font-size: 12px;
-}
-
-div.action_bar.icons_only  span.actionbar_button_label{
-    display: none;
-}
-
-div.action_bar.text_only  span.actionbar_button_label{
-    font-size: 11px;
-}
-
-.action_bar div.actionbar_arrow_div{
-    position: absolute;
-    top: 10px;
-    right: -3px;
-}
-.action_bar.icons_only div.actionbar_arrow_div{
-    position: absolute;
-    top: 23px;
-    right: 6px;
-}
-.action_bar.icons_only div.actionbar_arrow_div img{
-    height: 6px;
-    width: 10px;
-}
-
-#buttons_bar
-{
-    padding-left: 0;
-    padding-top: 5px;
-    overflow:hidden;
-    padding-bottom: 6px;
-}
-
-.action_bar a
-{
-    display: inline-block;
-    font-size: 11px;
-    padding: 5px 10px 7px 9px;
-    text-align: center;
-    overflow: visible;
-    color: #fff;
-    outline: none;
-    border-radius: 2px;
-    margin: 5px 2px 0 1px;
-    background: #4dc5c3; /* Old browsers */   /* FF3.6+ */   /* Chrome,Safari4+ */   /* Chrome10+,Safari5.1+ */   /* Opera 11.10+ */   /* IE10+ */   /* W3C */   /* IE6-9 */;
-    letter-spacing: 1px;
-    float: left;
-}
-
-.action_bar.icons_only a{
-    padding-bottom: 2px;
-    padding-top: 3px;
-    padding-left: 6px;
-    padding-right: 6px;
-    margin-right: 0;
-    float: left;
-    background-color: transparent;
-    font-size: 1.5em;
-    display: inline-block;
-    cursor: pointer;
-    margin-left: 0;
-}
-
-.action_bar.text_only a{
-    padding-bottom: 3px;
-    padding-top: 2px;
-    margin-top: 5px;
-}
-
-.action_bar span.ajxp_icon_span {
-    font-size: 1.3em;
-    float: left;
-    padding-top: 3px;
-}
-
-.action_bar a.menuAnchorSelected,
-.action_bar a:hover
-{
-}
-
-.action_bar.text_only a.menuAnchorSelected,
-.action_bar.text_only a:hover{
-    margin-top: 4px;
-}
-
-
-.action_bar a.menuAnchorSelected{
-   /* border-radius: 3px 3px 0 0;*/
-}
-
-.action_bar a img
-{
-    margin: 2px 5px 2px 0;
-    display: none;
-}
-
-div.action_bar.icons_only img.actionbar_button_icon{
-    height: 22px;
-    width: 22px;
-    display: none;
-}
-
-div.action_bar.icon_text img.actionbar_button_icon{
-    height: 12px;
-    width: 12px;
-    float: left;
-}
-
-div.action_bar.text_only a img{
-    display: none;
-}
-
-.action_bar a.separator,
-div.separator
-{
-    border-left: 1px solid #CCC;
-    border-right: 1px solid white;
-    display: block;
-    float: left;
-    font-size: 10px;
-    height: 100%;
-    margin-left: 2px;
-    margin-right: 2px;
-    padding-top: 0;
-    text-align: center;
-    width: 0;
-}
-
-a.carousel-control{
-    border-left:1px solid #c4c7c1;
-    border-right:1px solid #c4c7c1;
-    border-bottom:1px solid #c4c7c1;
-    display:block;
-    float:left;
-    font-size:10px;
-    height:51px;
-    padding-top:0;
-    text-align:center;
-    width:8px!important;
-    margin: 0 !important;
-    cursor:pointer;
-    background-color: #fff;
-}
-
-.FL-inlineToolbar {
-    text-align: left;
-}
-
-div.FL-inlineToolbar.FL-inlineToolbarUnique{
-    display: none;
-}
-div.selected div.FL-inlineToolbar.FL-inlineToolbarUnique {
-    display: block;
-}
-
-tr.selected div.FL-inlineToolbar.FL-inlineToolbarUnique,
-tr div.FL-inlineToolbar.FL-inlineToolbarMultiple {
-    display: inline-block;
-    position: absolute;
-    top:0;
-}
-
-div.FL-inlineToolbar a {
-    margin: 0 5px;
-}
-
-div.FL-inlineToolbar a span.actionbar_button_label {
-    margin-left: 5px;
-}
-
-.selected div.FL-inlineToolbar a {
-    color: white;
-
-}
-
-/* inline bar in detailed mode */
-div.detailed div.FL-inlineToolbar a span.actionbar_button_label{
-    display: inline-block !important;
-}
-
-div.detailed div.FL-inlineToolbar {
-    margin-left: 50px;
-    margin-top: 2px;
-}
-
-div.detailed div.FL-inlineToolbar div.toolbarGroup {
-    min-width: 400px;
-}
-
-
-a.carousel-disabled{
-    background-color: transparent;
-}
-
-a.carousel-control img{
-    /*margin-top:20px !important;*/
-}
-
-#content_pane{
-    background-color: #fff;
-}
-
-#content_pane div.panelHeader,
-#search_results div.panelHeader,
-div.class-FetchedResultPane > div.panelHeader
-{
-    display: none;
-}
-
-#topPane, #bottomSplitPane{
-    border: 0 !important;
-}
-
-#locationbar_cont
-{
-    /*background-image:url(../images/ToolbarBg.gif);*/
-    background-position:center center;
-    background-repeat:repeat-x;
-    height:33px;
-    _height:32px;
-    width:100%;
-    -webkit-box-shadow:0 0 5px #bbb;
-    -moz-box-shadow:0 0 5px #bbb;
-    box-shadow:0 0 5px #bbb;
-    clear:left;
-}
-
-#locationBar{
-
-}
-
-#location_form,
-#repository_form
-{
-    border-right-width: 0;
-    float:left;
-    height:20px;
-    padding:2px 0 0 4px;
-}
-
-#location_form input,
-#repository_form input,
-#location_form div{
-    background: transparent !important;
-}
-
-
-#repository_form, #goto_parent
-{
-    -moz-border-radius : 5px 0 0 5px;
-    border-radius : 5px 0 0 5px;
-}
-
-#repository_goto, #bookmarks_goto
-{
-    -moz-border-radius : 0 5px 5px 0;
-    border-radius : 0 5px 5px 0;
-}
-
-#location_form
-{
-    margin-left: 0;
-}
-#location_form div.location_bar_label{
-    line-height: 18px;
-}
-
-#repository_form
-{
-    width: 112px;
-}
-
-#location_form input,
-#repository_form input
-{
-    margin:1px 0 0 0;
-    _margin: 0 0 1px 0;
-    border:none;
-    height: 15px;
-    width: 325px;
-    float:left;
-}
-
-#repository_form img#repo_icon{
-    float: left;
-    vertical-align:top;
-    display: none;
-}
-#repository_form input
-{
-    width: 90px;
-    margin-left: 3px;
-    color: #fff;
-    letter-spacing: 1px;
-}
-
-#repo_chooser{
-    float:right;
-    color: #fff;
-    font-size: 12px;
-    font-weight: normal;
-    letter-spacing: 1px;
-    margin-right: 13px;
-    cursor: pointer;
-}
-
-#repo_chooser.disabled{
-    display:none;
-}
-
-#repo_chooser span.icon-sitemap {
-    font-size: 1.0em;
-    padding-right: 5px;
-    padding-top: 5px;
-    display: inline-block;
-}
-
-#repo_chooser span.ws-label {
-    display: inline-block;
-    padding-top: 0;
-    line-height: 20px;
-}
-
-#repo_chooser span.icon-caret-down {
-    display: inline-block;
-    padding-left: 3px;
-}
-
-.inlineBarButton,
-.inlineBarButtonLeft,
-.inlineBarButtonRight
-{
-    display:inline;
-    height: 22px;
-    float:left;
-    padding:0 1px;
-    cursor:pointer;
-}
-
-.inlineBarButtonLeft{
-    border-left-width: 0;
-}
-.inlineBarButtonRight{
-    border-right-width: 0;
-}
-
-.inlineBarButton img,
-.inlineBarButtonLeft img,
-.inlineBarButtonRight img
-{
-    margin-top:3px;
-    display:inline;
-    border: 0;
-}
-
-.inline_hover_light,
-.user_widget_hover
-{
-    /*background-color: rgba(255, 255, 255, 0.5);*/
-}
-
-.inline_hover
-{
-}
-
-.inline_disabled img,
-.SF_disabled img
-{
-    filter:alpha(opacity=30);
-    opacity: 0.3;
-    -moz-opacity:0.3;
-    cursor:default;
-}
-
-img.simple_button_arrow{
-    position:absolute;
-    right: 0;
-    bottom:1px;
-    display:none;
-}
-
-.inline_hover > img.simple_button_arrow{
-    display: block;
-}
-
-#search_panel_button{
-    padding: 0 2px 0 3px;
-}
-
-#logging_string {
-    color:#fff;
-    font-size:11px;
-    float: right;
-}
-
-#logging_string.disabled{
-    display:none;
-}
-
-#logging_string div.inlineBarButtonLeft{
-    display:none;
-}
-
-#logging_string i
-{
-    font-style: normal;
-    font-weight: normal;
-    letter-spacing: 1px;
-}
-#logging_string i img
-{
-    font-style: normal;
-    cursor: pointer;
-    margin-top: -12px;
-    float: right;
-    margin-left: 10px;
-}
-.user_widget_label{
-    float: left;
-    padding: 3px 10px 12px 7px;
-    cursor: pointer;
-    font-size: 12px;
-    letter-spacing: 1px;
-}
-
-.user_widget_label.withImage{
-    position: relative;
-    padding:0;
-}
-
-.user_widget_label.withImage i{
-    font-weight: bold;
-    display: inline-block;
-    padding: 3px 0 0 8px;
-    font-size: 12px;
-}
-
-.user_widget_label.withImage i img{
-}
-
-img.user_widget_mini{
-    vertical-align: middle;
-    height: 39px;
-}
-
-.locationbar_title
-{
-    display:inline;
-    color: #5E7C90;
-    font-size:15px;
-    font-weight:bold;
-    float:left;
-}
-
-#current_path,
-#repo_path
-{
-    /*width: 455px;*/
-    border:none;
-    height: 20px;
-    padding: 0;
-    padding-left:3px;
-    padding-top: 0;
-    font-size: 11px;
-}
-
-#current_path{
-    padding-left: 0;
-}
-#current_path:focus, #repo_path:focus{
-    outline: none;
-}
-
-/********************************/
-/* SLIDER*/
-/*********************************/
-
-.slider-pane{
-    background-color: #ebedf0;
-    padding: 5px 2px;
-    position:absolute;
-    width:11px;
-    z-index:10000;
-    border-radius: 2px;
-    box-shadow: 1px 1px 4px rgba(0,0,0,0.75);
-}
-
-.slider-handle,
-.slider-pane div.selected
-{
-    background-image: url("../images/slider-handle-vert.png") !important;
-    background-position:top center;
-    background-repeat: no-repeat !important;
-    background-color: transparent !important;
-    height:15px;
-    width:10px;
-}
-
-.slider-tracker {
-    background-image : url("../images/slider-track-bottom.png");
-    background-position:bottom center;
-    background-repeat:no-repeat;
-}
-
-.slider-tracker-top {
-    background-position:top center;
-    background-repeat:no-repeat;
-}
-
-/********************************/
-/* HEADER RESIZER WIDGET
-/******************************/
-div.header_resizer, div#search_meta{
-    overflow:hidden;
-    box-shadow: 0 1px 1px rgba(0,0,0,0.35);
-    opacity: 0.85;
-    max-height: 26px;
-}
-
-div.header_resizer div.header_cell{
-    float:left;
-    overflow:hidden;
-    width:90px;
-    white-space:nowrap;
-    border: 0 !important;
-    cursor: pointer;
-}
-
-div.header_resizer div.header_label{
-    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-    font-size: 12px;
-    padding: 4px 5px 4px;
-    background-color: rgb(255, 255, 255);
-    color: rgb(104, 120, 136);
-    letter-spacing: 1px;
-    border-bottom: 0;
-    height: 18px;
-    overflow: hidden;
-}
-
-.header_cell span.ajxp-order-icon {
-    display: none;
-    float: right;
-    padding-top: 1px;
-}
-
-div.header_resizer div.header_cell.ascending span.icon-caret-up{
-    display:inline-block;
-}
-
-div.header_resizer div.header_cell.descending span.icon-caret-down{
-    display:inline-block;
-}
-
-
-div.header_resizer div.header_cell.ascending div.header_label,
-div.header_resizer div.header_cell.descending div.header_label
-{
-    background-color: rgb(231, 231, 231);
-
-
-}
-
-div.header_resizer div.resizer{
-    float:left;
-    width:1px;
-    background-color: #ebedf0;
-    height: 26px;
-    cursor:e-resize;
-    border: 0;
-
-}
-
-div.header_resizer div.resizer_sortable{
-    background-color: #fff;
-}
-
-div.header_resizer div.dragging{
-    background-color : #bbb;
-    border-left: 1px solid #bbb;
-}
-div.resizeGhost{
-    width: 1px;
-    border-right: 1px solid #ccc;
-    position:absolute;
-    z-index:1000;
-    opacity:0.7;
-}
-
-div.sort-table-filter div.header_cell {
-    border-right: 1px solid #ccc !important;
-    box-shadow: inset 1px 1px 1px rgba(0, 0, 0, 0.37);
-}
-
-div.sort-table-filter div.header_cell:last-child {
-    border-right: 0 !important;
-}
-
-div.header_cell input[type="text"] {
-    margin-left: 0;
-    width: 96%;
-    border: 0;
-    background: transparent;
-}
-
-div.sort-table-filter {
-    display: none;
-}
-
-div.fl-showFilterPane div.sort-table-filter {
-    display: block;
-}
-
-div.fl-displayMode-list.fl-showFilterPane div.scroller_track {
-    top: 50px !important;
-}
-
-#ws_legend label{
-    font-size:16px !important;
-}
-
-/*
-div.header_resizer div.descending {
-	background-color: #daddd7;
-	background-image: url("../images/arrow_up_margin.png");
-	background-repeat : no-repeat;
-	background-position : right center;
-}
-*/
-/*
-div.header_resizer div.ascending {
-	background-color: #daddd7;
-	background-image: url("../images/arrow_down_margin.png");
-	background-repeat : no-repeat;
-	background-position : right center;
-}
-*/
-
-
-/*********************************/
-/* FILE LIST SKINNING
-/********************************/
-.sort-table {
-    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-    font-size: 10px;
-}
-
-.sort-table thead {
-    background-color:	#aaa;
-}
-
-.sort-table td {
-    padding: 7px 0;
-}
-
-.no-flexbox .sort-table td{
-    padding: 3px 0;
-}
-
-.sort-table thead td {
-    /*
-     display: block;
-     float: left;
-     overflow:hidden;
-     height: 23px;
-     */
-    background-color: #ddd;
-    border-bottom:	none;
-    cursor:			pointer;
-    border-right: 	1px solid buttonhighlight;
-    font-size:12px;
-    color: #676965;
-    padding: 0;
-    background-color: #f1f1ef;
-    border-bottom : 1px solid #676965;
-}
-
-.sort-table thead td div {
-    padding-left: 7px;
-    padding-top: 3px;
-    height: 20px;
-    overflow:hidden;
-    white-space:nowrap;
-}
-
-.sort-table thead td.descending {
-    background-color: #daddd7;
-    background-image: url("../images/arrow_up_margin.png");
-    background-repeat : no-repeat;
-    background-position : right center;
-}
-
-.sort-table thead td.ascending {
-    background-color: #daddd7;
-    background-image: url("../images/arrow_down_margin.png");
-    background-repeat : no-repeat;
-    background-position : right center;
-}
-
-#last_header{
-    border-right: 	0px solid #ddd;
-    widht: auto !important;
-}
-
-#last_header:active{
-}
-
-.sort-table thead td:active {
-    background-color: #c4c7c1;
-}
-
-.column_resize_grabber {
-    display:block;
-    width: 3px;
-    float:right;
-    height: 23px;
-    font-size: 0;
-    cursor:e-resize;
-}
-
-
-.odd
-{
-}
-
-.selected
-{
-    text-decoration: none;
-}
-
-.selected-focus,
-.selected-focus span.text_label
-{
-    color: #fff !important;
-}
-
-.droppableZone,
-.thumbnail_selectable_cell.detailed.droppableZone
-{
-    background-color: #c3d9ff !important;
-    /*border: 1px dotted #5C5C5C;*/
-}
-
-.paginator
-{
-    background-color:#fff8d1;
-    border-bottom-color:#dddddd;
-    border-bottom-style:solid;
-    border-bottom-width:1px;
-    font-family:"HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif ;
-    font-size:11px;
-    height:20px;
-    padding-top:2px;
-    text-align:center;
-}
-
-.paginatorInput
-{
-    width:21px;
-    padding: 0 2px;
-    height: 14px;
-    text-align: right;
-    border: 1px solid #CCCCCC;
-    margin-right: 2px;
-    margin-left: 5px;
-}
-
-div.multiple_selection_draggable
-{
-    display: block;
-    color: #000;
-    background-color: #fff;
-    padding: 5px;
-    border: 1px solid #c3d9ff;
-    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif , sans-serif;
-    font-size: 12px;
-    cursor:default;
-    overflow:hidden;
-    border-radius: 3px;
-}
-
-div.selection_ctrl_key
-{
-    background-image:url('../images/0.gif');
-    background-repeat: no-repeat;
-    background-position: bottom right;
-}
-
-
-a.disabled
-{
-    filter:alpha(opacity=30);
-    opacity: 0.3;
-    -moz-opacity:0.3;
-}
-
-a.enabled
-{
-    filter:alpha(opacity=100);
-    opacity: 1;
-    -moz-opacity:1;
-}
-
-.action_bar a.disabled:hover
-{
-    cursor: default;
-}
-
-.dialogBox div.action_bar a.disabled
-{
-    filter: alpha(opacity=20);
-    opacity: 0.2;
-    -moz-opacity: 0.2;
-}
-
-.action_bar a.disabled
-{
-    filter: alpha(opacity=100);
-    opacity: 1;
-    -moz-opacity: 1;
-}
-
-.action_bar a.disabled img,
-.action_bar a.disabled span
-{
-    filter:alpha(opacity=30);
-    opacity: 0.3;
-    -moz-opacity:0.3;
-}
-
-/*
-BOOKMARKS BAR
-*/
-#bm_bar_cont
-{
-    /*background-color: #ddd;*/
-}
-
-
-#bookmarks_bar
-{
-    display: none;
-    background-color: #fff;
-    position:relative;
-    width:86%;
-    left:7%;
-    height: 25px;
-    padding: 0;
-    padding-left:10px;
-}
-
-#bmbar_title
-{
-    color: #ddd;
-    float:right;
-    display:inline;
-    font-family:"HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif , sans-serif, Helvetica, Arial;
-    font-size:15px;
-    font-weight:bold;
-}
-
-a.bookmark_button
-{
-    text-decoration: none;
-    padding-right: 10px;
-}
-
-#bookmarks_bar a
-{
-    display: block;
-    float:left;
-}
-
-div.bm, div.bm_hover
-{
-    /* border: 1px solid #ddd;*/
-    filter:alpha(opacity=30);
-    opacity: 0.3;
-    -moz-opacity:0.3;
-    display: block;
-    float: right;
-    text-align: center;
-    font-size: 11px;
-    padding: 3px;
-    margin-right: 5px;
-    /*background-color: #ddd;*/
-    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif , sans-serif;
-    color: #333;
-}
-
-div.bm_hover
-{
-    filter:alpha(opacity=100);
-    opacity: 1;
-    -moz-opacity:1;
-    text-decoration: none;
-    /*
-	border-top: 1px solid #fff;
-	border-left: 1px solid #fff;
-	border-right: 1px solid buttonshadow;
-	border-bottom: 1px solid buttonshadow;
-    background-color: #ddd;
-    */
-}
-
-.extendedMenu
-{
-    float:none;
-}
-
-/*
-UPLOAD MULTIFILE FORM
-*/
-div#upload_files_list, div#multiple_download_container
-{
-    overflow: auto;
-    height: 210px;
-    border: 4px dashed rgb(221, 221, 221);
-    text-align: left;
-    -moz-border-radius: 11px;
-    border-radius: 11px;
-}
-
-.droparea {
-    background: url("../../../../../../index.php?get_action=get_drop_bg") no-repeat scroll left bottom transparent;
-    background-position: 10px 100%;
-}
-
-.dropareaHover{
-    background-color: #c3d9ff !important;
-}
-
-#uploader_chooser{
-    width: 100%;
-}
-
-#uploader_chooser ul{
-    margin: 0;
-    padding: 0;
-    list-style: none;
-    display: block;
-    position: relative;
-    border-bottom: 1px solid #77b8e2;
-}
-
-#uploader_chooser li {
-    display: inline-block;
-    padding: 12px 14px;
-    border-radius: 4px 4px 0 0;
-    margin: 8px 2px;
-    margin-bottom: 0;
-    border-bottom: 0;
-    cursor: pointer;
-    font-size: 13px;
-}
-
-#uploader_chooser li:hover {
-    background-color: #f5f5f5;
-    border-bottom: 2px solid #f5f5f5;
-}
-#uploader_chooser li.current:hover {
-}
-#uploader_chooser li.current {
-    font-weight: bold;
-    cursor: default;
-    border-bottom: 2px solid #77b8e2;
-}
-
-
-#content_pane.dropareaHover {
-    border-color: #D96252 !important;
-    border-style: dashed;
-    background-color: white !important;
-}
-
-div#uploader_options_pane {
-    background-color: white;
-    border-top: 1px solid #CCCCCC;
-    font-size: 11px;
-    height: 59px;
-    overflow: hidden;
-    padding: 7px 10px;
-    text-align: left;
-    display: none;
-    margin-bottom: 11px;
-    border-bottom: 1px solid #CCCCCC;
-    box-shadow: inset 0px 1px 6px rgba(0,0,0,0.3);
-    border-radius: 2px;
-    margin-top: 2px;
-}
-div#total_files_list{
-    display:none !important;
-}
-
-div#uploader_options_pane input {
-    width: 15px;
-    margin-right: 0;
-    margin-left: 0;
-    margin-top: 5px;
-}
-
-div#upload_files_list div, div#multiple_download_container div
-{
-    overflow: hidden;
-    padding-top: 10px;
-    padding-bottom: 10px;
-    padding-left: 14px;
-    position: relative;
-    font-size: 13px;
-    background-image: url('../images/dl_bg.png');
-    background-repeat: no-repeat;
-    background-size: 0% 100%;
-    border-bottom: 1px solid rgb(227, 229, 233);
-    color: #5C5C5C;
-}
-
-div#upload_files_list span.item_relative_path{
-    color: #ccc;
-    margin-left: 15px;
-    font-size: 0.8em;
-}
-
-
-#upload_files_list img
-{
-    margin-right: 6px;
-}
-
-#upload_files_list img.fakeUploadButton {
-    display: none;
-}
-
-#upload_files_list div a
-{
-    color: #ddd;
-    font-style: italic;
-}
-
-#upload_files_list span.statusText,
-#upload_files_list span.percentText
-{
-    font-size: 10px;
-    display: inline-block;
-    padding: 0 6px;
-    color: #cccccc;
-}
-
-#upload_files_list span.statusText.new, #upload_files_list span.statusText.loaded{
-    display:none;
-}
-
-#upload_files_list span.icon-remove-sign,
-#upload_files_list span.mdi.mdi-close
-{
-    color: #ccc;
-    display: block;
-    float: right;
-    margin-right: 10px;
-    cursor: pointer;
-}
-
-#upload_files_list span.icon-remove-sign:hover,
-#upload_files_list span.mdi.mdi-close:hover
-{
-    color: #d00;
-}
-
-#multiple_download_container div a
-{
-    display: block;
-}
-#multiple_download_container div a:hover
-{
-    text-decoration:none;
-    color: #aaa;
-}
-#fileInputContainer {
-    position: relative;
-}
-#fileInputContainerDiv { /* to fit 1px border */
-    margin: 0;
-    padding: 0;
-    position: relative;
-    overflow: hidden;
-    vertical-align: top;
-    height: 60px;
-    width: 167px;
-    cursor: pointer;
-}
-#fileInputContainer input {
-    filter:alpha(opacity:0); opacity:0; moz-opacity:0;
-    position: absolute;
-    font-size: 60px; /* causes it to fill the containing div */
-    top: 0; 
-    left: 0;
-    z-index: 10000;
-    height: 56px;
-    cursor: pointer !important;
-}
-#fileInputPos {
-    text-align: left;
-    height: 60px;
-    width: 180px;
-    position: absolute;
-    top: 0; 
-    overflow: hidden;
-    z-index: 9999; /* this was needed to work in IE */
-;
-    cursor: pointer;
-}
-#uploaderTextActions{
-    position:absolute;
-    bottom: 6px;
-    right: 8px;
-    color: rgb(203, 204, 206);
-}
-
-#uploaderTextActions span{
-    cursor:pointer;
-}
-
-
-#uploaderTextActions span:hover{
-    color: #5C5C5C;
-}
-
-
-.fakeUploadButton {
-    width: 151px;
-    padding-top: 6px;
-    padding-bottom: 6px;
-    border: 1px solid #ccc;
-    text-align: left;
-    vertical-align: middle;
-    font-size: 1.4em;
-    margin-bottom: 5px;
-    cursor: pointer;
-    color: #667;
-    font-weight: normal;
-    -moz-border-radius: 3px;
-    border-radius: 3px;
-    background-color: #ebedf0;
-    box-shadow: inset 1px 1px 0 white;
-}
-
-.fakeUploadButton.disabled{
-    -moz-opacity: 0.5;
-    opacity: 0.5;
-    filter:alpha(opacity=50);
-    cursor: default;
-}
-
-
-.fakeUploadButton img {
-    margin-bottom: 3px;
-}
-
-.fakeOptionButton {
-    padding-top: 3px;
-    padding-bottom: 3px;
-    margin-bottom: 0;
-    margin-top: 5px;
-    background-position : center;
-    -moz-border-radius : 5px;
-    border-radius : 5px;
-}
-
-#uploadBrowseButton {
-    position: absolute;
-    top: 0; 
-    left: 0;
-    margin:0;
-}
-
-#uploadBrowseButton span.icon-desktop {
-    font-size: 2em;
-    display: block;
-    float: left;
-    padding: 2px 7px;
-}
-
-#uploadSendButton { 
-}
-
-#uploaderTextActions span.disabled{
-     display:none;
-}
-
-#uploadFilesListContainer
-{
-    vertical-align:top;
-    font-size: 11px;
-    letter-spacing: 1;
-}
-
-/***** SCROLLER ******/
-.scroller_track{
-    position: absolute;
-    width: 7px;
-    background-color: transparent;
-    cursor: ns-resize;
-    right: 0;
-    z-index: 1000;
-    opacity: 0.7;
-    padding-right: 1px;
-}
-.flexbox div.scroller_track{
-    top:0;
-    bottom: 0;
-}
-
-div#folder_pane{
-    position: relative;
-}
-
-.scroller_handle{
-    -webkit-border-radius: 5px;
-    border-radius: 5px;
-    background: rgb(190, 190, 190)!important;
-    transition: background-color 0.3s ease;
-}
-
-.scroller_handle:hover{
-    background: rgb(110, 110, 110)!important;
-}
-
-/*
- SEARCH BOX / INFO PANEL
-*/
-
-#panelsToggle
-{
-    height: 23px;
-    cursor:pointer;
-}
-
-div.tabulatorContainer{
-    padding: 0;
-    height: 28px;
-    overflow: hidden;
-    border-radius: 0;
-}
-
-#topPane > div.tabulatorContainer{
-    border-radius: 0;
-}
-
-#cpane_tabs > div.tabulatorContainer{
-    border-left-width: 1px;
-    border-left-style: solid;
-    border-left-color: rgb(111, 123, 136);
-}
-
-div.tabulatorContainer div#display_toolbar{
-    min-width: 0;
-    padding-top: 6px;
-    padding-right: 6px;
-}
-
-#info_panel div#display_toolbar {
-    float: left;
-    text-align: left;
-    min-width: 20px;
-    height: 10px;
-}
-
-#info_panel div#display_toolbar a {
-    background: none;
-    border: none;
-    margin-right: 0;
-}
-
-span.toggleHeader{
-    display: inline-block;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    padding: 6px 6px;
-    background-color: rgb(111, 123, 136);
-    transition: background-color 0.3s ease;
-}
-
-span.toggleHeader.toggleInactive{
-    background-color: transparent;
-    font-size: 0.9em;
-    cursor: pointer;
-}
-
-span.toggleHeader span[class^="icon-"],
-span.toggleHeader span[class*=" icon-"]{
-    margin-right: 4px;
-}
-
-div.tabulator-vertical div {
-    display: none;
-}
-
-div.tabulator-vertical div.tabulatorContainer {
-    display: block;
-    height: 100%;
-}
-
-div.tabulator-vertical div.toolbarGroup{
-    display: block;
-    height: 24px;
-    font-size: 1.4em;
-}
-
-div.tabulatorContainer.icons_only span.tab_label{
-    display: none;
-}
-
-div.tabulatorContainer.icons_only span[class^="icon-"],
-div.tabulatorContainer.icons_only span[class*=" icon-"]
-{
-    display: inline;
-    font-size: 1.2em;
-}
-
-div.tabulatorContainer.icons_only div.toggleInactive span[class^="icon-"],
-div.tabulatorContainer.icons_only div.toggleInactive span[class*=" icon-"],
-div.tabulatorContainer.icons_only div.toolbarGroup span[class^="icon-"],
-div.tabulatorContainer.icons_only div.toolbarGroup span[class*=" icon-"]
-{
-    display: inline;
-    font-size: 1em;
-}
-
-div.tabulatorContainer span.tab_close_button {
-    margin-left: 6px;
-    cursor: pointer;
-}
-
-div.tabulatorContainer span.toggleInactive span.tab_close_button {
-    color: rgb(111, 123, 136);
-}
-
-div.tabulatorContainer span.toggleInactive span.tab_close_button:hover {
-    color: #ffffff;
-}
-
-.panelHeader.panelHeaderWithIcon{
-    position: relative;
-}
-
-.panelHeader img
-{
-    display: none;
-}
-
-.panelHeader img.panelHeaderCloseIcon{
-    left: auto;
-    right: 6px;
-    cursor: pointer;
-}
-
-#search_panel{
-}
-
-#search_div
-{
-    /*    width: 100%;*/
-}
-
-
-#search_container
-{
-    /*padding: 0;*/
-}
-
-#search_form, #search_state
-{
-    padding-left: 10px;
-    padding-top: 11px;
-    width: 100%;
-}
-#search_form
-{
-    float: right;
-    text-align: right;
-    padding-right: 11px;
-    height: 34px;
-    overflow: hidden;
-}
-#search_form a
-{
-    display: inline-block;
-    width:18px;
-    cursor: pointer;
-    margin-right: 0;
-    margin-left: 5px;
-    padding: 1px;
-    font-size: 1.4em;
-    padding-top: 3px;
-    color: rgb(138, 149, 160);
-}
-
-#search_form a.disabled {
-    display: none;
-}
-
-#search_form a img{
-    margin-top: 2px;
-    vertical-align: top;
-    display: none;
-}
-
-#search_form input
-{
-    float: none !important;
-    margin: 0;
-    height: 25px;
-    border-color: rgb(138, 149, 160);
-    background: #fff;
-    font-size: 1.2em;
-    color: rgb(138, 149, 160);
-    padding-left: 6px;
-    border-width: 1px;
-    width: 70%;
-}
-
-#search_meta {
-    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-    font-size: 11px;
-    padding: 0;
-    background-color: rgb(255, 255, 255);
-    color: rgb(143, 162, 182);
-    letter-spacing: 1px;
-    border-bottom: 1px solid rgb(194, 196, 199);
-    max-height: 200px !important;
-    box-shadow: none !important;
-    height: 25px !important;
-    -webkit-transition-property: height;
-    -webkit-transition-duration: 0.1s;
-    -webkit-transition-timing-function: ease-in-out;
-    -moz-transition-property: height;
-    -moz-transition-duration: 0.1s;
-    -moz-transition-timing-function: ease-in-out;
-    transition-property: height;
-    transition-duration: 0.1s;
-    transition-timing-function: ease-in-out;
-    position: relative;
-}
-
-#search_meta.toggle_open{
-    height: 200px !important;
-}
-
-#search_meta input.c3,
-#search_meta span.c3
-{
-    width: 21%;
-    margin-left: 0;
-    margin-right: 0;
-    border: 1px solid #ACB2BB;
-    background-color: #ffffff;
-    padding: 2px 3px;
-}
-#search_meta input.c3:disabled{
-    opacity: 0.35;
-}
-
-#search_meta span.c3{
-    cursor: pointer;
-}
-#search_meta input.c3:focus{
-    background-color: white;
-}
-
-#modiftime_fixed_radio span.c3{
-    border-right-width: 0 !important;
-}
-
-#modiftime_fixed_radio span.c3:last-of-type{
-    border-right-width: 1px !important;
-}
-#search_meta span.c3.selected{
-    background-color: rgb(138, 149, 160) !important;
-    color: white;
-}
-
-
-#search_meta span.c4 {
-    display: inline-block;
-    width: 18%;
-    text-align: left;
-}
-
-#search_meta span.c6 {
-    display: inline-block;
-    width: 14%;
-    text-align: center;
-}
-
-.advanced_search {
-}
-
-#basic_search{
-    padding: 4px;
-    height: 17px;
-    width: 350px;
-}
-
-#search_meta.toggle_open #basic_search{
-    border-bottom: 1px solid rgb(143, 162, 182);
-}
-
-#search_meta_detailed {
-    padding:10px 5px;
-    line-height: 28px;
-    overflow: hidden;
-    background-color: rgba(235, 237, 240, 0.36);
-}
-
-#search_meta span.toggle_button {
-    float: right;
-    display: inline-block;
-    padding: 2px 5px;
-    border-radius: 3px;
-    background-color: #4dc5c3;
-    cursor: pointer;
-    color: white;
-}
-
-#search_meta span.toggle_button.close,
-#search_meta.toggle_open span.toggle_button.open,
-#search_meta.toggle_open span#search_meta_options
-{
-    display: none;
-}
-
-.search_label.open,
-.search_label.close
-{
-    display: inline-block;
-    padding: 2px;
-    height: 20px;
-}
-.search_label.close{
-    display: none;
-}
-
-#refresh_search_button{
-    cursor: pointer;
-}
-
-#search_meta.toggle_open span.search_label.open{
-    display: none;
-}
-
-#search_meta.toggle_open span.search_label.close{
-    display: inline-block;
-}
-
-#search_meta.toggle_open span.toggle_button.close,
-#search_meta span.toggle_button.open
-{
-    display: inline-block;
-}
-
-#search_meta div.advanced_search_section{
-    padding: 5px 5px 15px 17px;
-    line-height: 29px;
-    display: none;
-}
-
-#search_meta div.advanced_search_section.visible{
-    display: block;
-}
-
-#search_meta div.advanced_search_section_title {
-    border-bottom: 1px solid;
-    padding-bottom: 6px;
-    line-height: 9px;
-    margin-bottom: 7px;
-    cursor: pointer;
-}
-
-.searchScore{
-    float: right;
-    color: #CCC;
-    font-size: 10px;
-    font-style: italic;
-}
-
-.searchUnindex{
-
-}
-
-span.search_meta_opt {
-    cursor: pointer;
-}
-span.search_meta_opt > span{
-    display: none;
-}
-
-span.search_meta_opt.checked > span {
-    display: inline;
-}
-
-#search_results_cont{
-    display: none;
-    position: absolute;
-    z-index: 1010;
-    border: 1px solid rgb(138, 149, 160);
-    border-radius: 4px;
-    box-shadow: 1px 10px 40px rgba(0,0,0,0.5);
-    background-color: #ebedf0;
-}
-
-#search_results
-{
-    margin-left: 0;
-    width: 350px;
-    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-}
-
-.close_results.icon-remove-sign,
-.close_results.mdi.mdi-close
-{
-    float: right;
-    display: inline-block;
-    padding: 2px 5px;
-    cursor:pointer;
-}
-
-#search_results em {
-    color: red;
-    font-style:normal;
-}
-
-div.class-FetchedResultPane{
-    background-color: #ebedf0;
-    border-left: 1px solid rgb(187,187,187);
-}
-
-#search_results div.ajxpNodeProvider,
-div.class-FetchedResultPane div.ajxpNodeProvider
-{
-    cursor: pointer;
-    background-color: transparent !important;
-    border-bottom: 1px solid #ffffff;
-}
-
-#search_results div.ajxpNodeProvider:hover,
-div.class-FetchedResultPane div.ajxpNodeProvider:hover
-{
-    background-color: transparent !important;
-}
-
-div.class-FetchedResultPane div.ajxpNodeProvider.selected-focus,
-#search_results div.ajxpNodeProvider.selected-focus
-{
-    background-color: #59F !important;
-}
-
-div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbLabel,
-#search_results div.thumbnail_selectable_cell.detailed div.thumbLabel{
-    font-size: 14px;
-    padding-top: 4px;
-}
-
-div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed span.text_label,
-#search_results div.thumbnail_selectable_cell.detailed span.text_label{
-    padding-top: 0;
-}
-
-#no-results-found {
-    text-align: center;
-    margin-top: 10%;
-}
-
-.infoPanelActions
-{
-    padding:5px;
-    font-size: 11px;
-    text-align: right;
-}
-
-#info_panel span[data-ajxpAction]{
-    float: right;
-    display: inline-block;
-    padding: 3px;
-    cursor: pointer;
-}
-
-#info_panel div.panelContent
-{
-    overflow: hidden;
-    background-color: #ebedf0;
-    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-    border-left: 1px solid rgb(172, 178, 184);
-    border-right: 1px solid rgb(172, 178, 184);
-    padding-bottom: 15px;
-}
-
-#info_panel div.panelHeader.panelHeaderWithIcon{
-    /*
-    background-color: #5599FF !important;
-    border-bottom: 2px solid rgb(65, 117, 194);
-    */
-    background-color: #4dc5c3;
-    border-bottom: 2px solid #399997;
-
-    -webkit-transition-property: height;
-    -webkit-transition-duration: 0.2s;
-    -webkit-transition-timing-function: ease-out;
-    -moz-transition-property: height;
-    -moz-transition-duration: 0.2s;
-    -moz-transition-timing-function: ease-out;
-    transition-property: height;
-    transition-duration: 0.2s;
-    transition-timing-function: ease-out;
-
-    padding-left: 6px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-
-    border-radius: 0;
-}
-
-#info_panel.folded div.panelHeader{
-    height: 100%;
-}
-
-#info_panel.folded div.panelHeader a{
-    font-size: 1.4em;
-}
-
-#info_panel.folded{
-    /*width: 26px !important;*/
-}
-
-#info_panel.folded span[ajxp_message_id]{
-    display: none;
-}
-
-#info_panel div.folded_icons{
-    display: none;
-}
-
-#info_panel.folded div.folded_icons{
-    display: block;
-    position: absolute;
-    top: 29px;
-    left: 0px;
-    background-color: #399997;
-    width: 27px;
-    height: 100%;
-}
-
-#info_panel.folded div.folded_icons span{
-    display: block;
-    margin: 10px 0 21px 0;
-    font-size: 13px;
-    text-align: center;
-}
-
-#info_panel.folded div.folded_icons span.clickable{
-    cursor: pointer;
-}
-
-div.foldedPanel_tooltip{
-    width: 210px !important;
-    background-color: #399997;
-    border-radius: 2px;
-    border-width: 0;
-    box-shadow: none;
-    min-height: 35px;
-}
-
-div.foldedPanel_tooltip:after {
-    content: "";
-    position: absolute;
-    width: 0;
-    height: 0;
-    border-width: 7px;
-    border-style: solid;
-    border-color: transparent transparent transparent #399997;
-    top: 15px;
-    left: 220px;
-}
-
-div.foldedPanel_tooltip td{
-    color: white;
-    font-size: 11px;
-
-}
-
-#info_panel a
-{
-    display: inline-block;
-    padding: 4px 8px;
-    border: 1px solid #ddd;
-    border-radius: 3px;
-    margin-right: 10px;
-    margin-bottom: 6px;
-    font-size: 11px;
-    letter-spacing: 1px;
-    background-color: #eee;
-}
-
-#info_panel a:hover
-{
-}
-
-#info_panel a img{
-    margin-right : 5px;
-}
-
-#info_panel a:hover
-{
-    text-decoration:none;
-}
-
-#info_panel div.folderImage
-{
-    text-align:center;
-    padding-bottom: 10px;
-}
-
-.infoPanelTable
-{
-    font-size: 12px;
-    width: 100%;
-    color: rgb(111, 121, 131);
-}
-
-td.infoPanelValue
-{
-    padding: 6px;
-}
-
-.panelContent.scrolling td.infoPanelValue{
-    padding-right: 18px;
-}
-
-td.infoPanelLabel {
-    padding: 7px 6px;
-    width: 35%;
-    text-align: right;
-    color: #555;
-    vertical-align: top;
-}
-
-div.infoPanelLabel, div.infoPanelValue{
-    font-size: 12px;
-    padding: 7px 6px;
-    float: left;
-}
-div.infoPanelLabel{
-    color: #555;
-    text-align: right;
-    width: 32%;
-}
-div.infoPanelValue{
-    width: 55%;
-    color: rgb(111, 121, 131);
-    min-height: 22px;
-}
-
-.infoPanelGroup
-{
-    border-radius: 0;
-    padding: 1px;
-}
-
-.panelContent div.panelHeader{
-
-    font-size: 12px;
-    padding: 6px 7px;
-    background-color: rgba(138, 149, 160, 0.65) !important;
-    border-bottom: 0 !important;
-    clear: left;
-}
-
-.panelContent.scrolling div.panelHeader{
-    padding-right: 13px;
-}
-
-.infoPanelImagePreview
-{
-    width: 100%;
-    text-align:center;
-    padding: 10px 0;
-}
-.infoPanelImagePreview img
-{
-}
-
-div.double div.infoPanelAllMetadata > div{
-    float: left;
-    margin: 1%;
-    width: 48%;
-}
-
-div.triple div.infoPanelAllMetadata > div{
-    float: left;
-    margin: 1%;
-    width: 31%;
-}
-
-#browser
-{
-    clear:left;
-    background-color: #fff;
-    line-height: 18px;
-    /*
-    padding-left: 3px;
-    padding-right: 3px;
-    */
-}
-
-div.selectable_div, .table_rows_container, #tree_container, #bottomSplitPane, .ajxp_simple_container{
-    font-family:    "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-    font-size: 12px;
-}
-
-.table_rows_container td
-{
-    border: 0;
-}
-.table_rows_container tr:nth-child(even)>td
-{
-    border-top: 0;
-    border-bottom: 0;
-}
-.table_rows_container tr:first-child td,
-.infoPanelTable tr:first-child td
-{
-    border-top: 0;
-}
-
-.table_rows_container tr:last-child td
-{
-    border-bottom: 0;
-}
-.infoPanelTable tr:last-child td
-{
-    border-bottom:0;
-}
-
-.table_rows_container tr.selected-focus td,
-.infoPanelTable tr.selected-focus td
-{
-}
-.table_rows_container tr:hover,
-.table_rows_container tr.even:hover
-{
-    background-color: rgb(253, 252, 228);
-}
-
-.no_select_bg::selection {
-    background:transparent;
-}
-
-.no_select_bg::-moz-selection {
-    background:transparent;
-}
-
-#vertical_splitter{
-    overflow: hidden;
-}
-
-#sidebar_splitter{
-    overflow: auto;
-    width: 200px;
-    background-color: #D2DFE9;
-    -webkit-box-shadow: rgb(153, 153, 153) 1px 1px 5px inset;
-    -moz-box-shadow: rgb(153, 153, 153) 1px 1px 5px inset;
-    box-shadow: rgb(153, 153, 153) 1px 1px 5px inset;
-}
-
-.splitterContentPane{
-    border: 1px solid #676965;
-}
-
-.vsplitbar
-{
-    width: 3px;
-    z-index: 10;
-}
-.vsplitbar:hover
-{
-    background-image: url(../images/vgrabber.gif);
-    background-repeat: no-repeat;
-    background-position: center;
-    background-color: #474E50;/*rgba(255,255,255,0.5);*/
-}
-.vsplitbar.active
-{
-    background-color: #474E50;
-}
-.hsplitbar.folded, .vsplitbar.folded{
-    opacity: 0;
-    cursor: default !important;
-}
-
-.vsplitbar:hover
-{
-}
-
-.hsplitbar
-{
-    height: 4px;
-    /*background-color: #eee;*/
-    background-image: url(../images/hgrabber.gif);
-    background-repeat: no-repeat;
-    background-position: center;
-}
-.hsplitbar.active
-{
-    background-color: #474E50;
-}
-
-.hsplitbar:hover{
-    /*background-color: #ccc;*/
-}
-
-
-#splashScreen
-{
-    width: 430px;
-    height: 332px;
-}
-
-#docFileIframe
-{
-    border-bottom:1px solid #AAAAAA;
-    height:300px;
-    left:0;
-    position:relative;
-    top:0;
-    width:100%;
-}
-
-#adminIFrame
-{
-    border: 1px solid white;
-    width: 641px;
-    height: 390px;
-    background-color: #fff;
-}
-
-/*********************
-ADMIN STYLES
-**********************/
-#users_list,
-#repo_list
-{
-    height: 299px;
-    width: 200px;
-    float: left;
-    padding-top: 5px;
-    overflow: auto;
-}
-#users_detail_panel,
-#repo_detail_panel{
-    width: 438px;
-    height: 299px;
-    float: left;
-    border-left: 1px solid #bbb;
-    overflow: auto;
-}
-
-#repo_list{
-    height: 294px;
-}
-
-#repo_detail_panel fieldset
-{
-    margin:10px;
-    font-size: 13px;
-}
-
-.metaPane{
-    margin-bottom:5px;
-    margin-top:2px;
-    padding:6px 5px 8px;
-    width:96%;
-}
-
-.metaPane img,
-img.metaPaneTitle
-{
-    float:right;
-    cursor:pointer;
-    margin-left: 3px;
-}
-
-img.metaPaneTitle{
-    display:none;
-}
-
-div.accordion_toggle_active img.metaPaneTitle
-{
-    display:inline;
-}
-
-.metaPane span.title{
-    font-weight: bold;
-}
-
-.users_list_title
-{
-    font-size: 20px;
-    font-weight: bold;
-    color: white;
-    padding-left: 5px;
-    border-bottom: 1px solid white;
-    background-color: #bbb;
-}
-
-
-.user
-{
-    padding-top: 15px;
-    padding-left: 5px;
-    padding-bottom: 15px;
-    background-color: #fff;
-    border-top: 1px solid #fff;
-    border-bottom: 1px solid #fff;
-    border-left: 1px solid #fff;
-    margin-left: 5px;
-}
-
-.user_id, .user_data, .repository, .password
-{
-    font-size: 11px;
-}
-
-.wallet_pane{
-    /*
-     background-color:#EFEFEF;
-     border-left:1px solid;
-     */
-    margin-left:2px;
-    margin-right:2px;
-    padding:0 10px 0 0;
-}
-.wallet_pane div.driver_form{
-    width:215px;
-}
-.wallet_pane input.dialogButton{
-    float:right;
-    border: 1px solid #676965;
-}
-
-.config_subblock{
-    border: 1px dotted #ccc;
-    padding:5px 10px;
-    margin-bottom:10px;
-}
-
-.user_data
-{
-    background-color: #fff;
-}
-
-fieldset
-{
-    border: 1px solid #ccc;
-    padding: 10px;
-    padding-top: 5px;
-    margin-bottom: 5px;
-}
-
-legend
-{
-    color: #5C5C5C;
-}
-
-legend a{
-    text-decoration:none;
-    cursor: pointer;
-}
-
-legend a.active {
-    background-color: transparent;
-    color: #87A9C4;
-    text-decoration:none;
-    cursor: default;
-    font-size: 1.1em;
-}
-
-.repository, .repository td, .password td
-{
-    padding: 1px;
-}
-
-.repository td
-{
-    vertical-align: bottom;
-    line-height: 19px;
-    padding: 6px 0 5px 6px;
-}
-
-.repository input, .user_delete_confirm
-{
-    border: none;
-    margin-left: 1px;
-    margin-top: 0;
-    padding: 0;
-}
-
-.user_data
-{
-    padding: 10px;
-    /*padding-right: 20px;*/
-}
-
-.user_id
-{
-    cursor: pointer;
-    font-size: 17px;
-}
-
-.user_id b
-{
-    color: #5C5C5C;
-}
-#user_admin_bar, #repo_create_form, #log_chooser
-{
-    padding: 15px;
-    font-size: 12px;
-    border: 0 solid #ddd;
-    background-color: #ddd;
-    border-bottom: 1px solid #bbb;
-}
-
-#user_admin_bar input, .password input
-{
-    height: 18px;
-    width: 90px;
-    font-size: 12px;
-    padding: 0;
-    margin-left: 0;
-    margin-right: 5px;
-}
-
-#user_admin_bar .submit_button, .password .submit_button,
-#options_pane .submit_button, .password .submit_button
-{
-    width: 30px;
-}
-
-#user_admin_bar b,
-#repo_create_form b,
-#log_chooser b
-{
-    font-size: 15px;
-    color: #5C5C5C;
-}
-
-#user_pref_form input
-{
-    width: 65px;
-    padding: 0;
-    margin-right: 5px;
-}
-
-#user_pref_form input.radio
-{
-    width: 20px;
-    border: 0;
-    background-image: none;
-}
-
-#repo_create_form select
-{
-    border: 1px solid #5E7C90;
-    height: 20px;
-    width: 160px;
-}
-
-#user_acl{
-    font-size:1.1em;
-}
-
-div#available_roles, div#user_roles{
-    padding: 0;
-    border: 1px solid #aaa;
-    width: 100%;
-    height: 110px;
-    overflow:auto;
-    border-radius: 3px;
-}
-
-div#rights_pane{
-    border: 1px solid #aaa;
-    _height: 150px;
-    max-height: 150px;
-    overflow:auto;
-    margin-top:5px;
-    padding: 2px 0;
-    width: 100%;
-}
-
-div.ajxp_role{
-    background-color:#FFFFFF;
-    border-left:7px solid #DDDDDD;
-    cursor:move;
-    margin: 2px;
-    padding:3px 5px;
-    border-radius: 2px;
-}
-
-div.available_role{
-}
-
-div.user_role{
-    opacity : 1 !important;
-    -moz-opacity : 1 !important;
-    filter:alpha(opacity=100) !important;
-}
-
-.roles_hover{
-    border : 1px solid #ffffef;
-}
-
-.editable_users_list{
-
-    border: 1px solid #AAAAAA;
-    height: 190px;
-    overflow: auto;
-    clear:left;
-    position: relative;
-    margin-top: 2px;
-    border-radius: 3px;
-}
-
-.editable_users_list div.user_entry,
-li.complete_user_entry,
-li.complete_group_entry,
-li.complete_user_entry_temp
-{
-    clear: left;
-    background-color: rgba(255, 255, 255, 0.7);
-    border-bottom: 1px solid #F1F1EF;
-    font-size:12px;
-    padding: 1px;
-}
-
-div.editable_users_list div.user_entry_rights{
-    float: right;
-    padding-top: 8px;
-    padding-right: 4px;
-}
-.no-flexbox div.editable_users_list div.user_entry_rights{
-    padding-top: 4px;
-}
-
-li.complete_user_entry,
-li.complete_group_entry,
-li.complete_user_entry_temp{
-    padding: 1px !important;
-}
-
-
-.editable_users_list div.user_entry span.user_entry_label,
-li.complete_user_entry span.user_entry_label,
-li.complete_group_entry span.user_entry_label,
-li.complete_user_entry_temp span.user_entry_label
-{
-    display: inline-block;
-    padding: 8px 5px 8px 30px !important;
-    background-image: url("../images/mimes/16/user.png");
-    background-repeat: no-repeat;
-    background-position: 6px 7px;
-}
-
-li.complete_user_entry{
-
-}
-
-li.complete_group_entry span.user_entry_label,
-.editable_users_list div.group_entry span.user_entry_label
-{
-    background-image: url("../images/mimes/16/users-folder.png");
-}
-
-li.complete_user_entry_temp span.user_entry_label,
-.editable_users_list div.user_entry_temp span.user_entry_label
-{
-    background-image: url("../images/mimes/16/user_shared.png");
-}
-
-.editable_users_list span.delete_user_entry{
-    width: 12px;
-    height: 12px;
-    display: inline;
-    background-size: 100%;
-    margin-left: 5px;
-    cursor: pointer;
-    color: #A00;
-}
-
-.editable_users_list label{
-    padding: 0 3px;
-    cursor: pointer;
-}
-
-span.user_entry_check{
-    display: inline-block;
-    padding: 0 5px;
-}
-
-.editable_users_list.user_entry_check_hidden span.user_entry_check{
-    display: none;
-}
-
-#create_shared_user{
-    width: 84%;
-    background-color: #EEE;
-    margin: 0 6%;
-    box-shadow: 0 0 7px #5C5C5C;
-    padding: 1px 4px;
-    border-radius: 0 0 7px 7px;
-
-    position: absolute;
-    top: -1px;
-}
-
-#create_sub_user{
-    padding: 8px 14px;
-}
-
-.editable_users_header{
-    float: right;
-    margin-top: 2px;
-    font-style: italic;
-    font-size: 9px;
-    color: #AAA;
-    padding: 2px;
-}
-
-.editable_users_header span,
-div.user_entry span.cbContainer
-{
-    display: inline-block;
-    padding: 0 2px;
-    width: 40px;
-    text-align: center;
-    cursor: pointer;
-}
-
-div.editable_users_header.autocomplete_readonly {
-    display: none !important;
-}
-
-input.autocomplete_readonly{
-    display:none;
-}
-
-div.autocomplete_readonly span.delete_user_entry{
-    display: none !important;
-}
-
-
-.share_chooser_list li.selected{
-    color: #555555;
-}
-
-/***********************/
-/* SHARE DIALOG & BUTTONS
-/***********************/
-#share-folder-minisite-public_button.disabled,
-#share-file-minisite_button.disabled{
-    display: none;
-}
-
-input.share_info_panel_link{
-    width: 98% !important;
-    margin-left: 0;
-    font-size: 16px;
-    height: 16px;
-    padding: 5px 2px;
-}
-
-#ajxp_shared_info_panel > div.infoPanelTable{
-    margin: 3%;
-    width: 94%;
-}
-
-#share_folder_form div.SF_element > div.SF_label {
-    float: none;
-    text-align: left;
-    padding: 0;
-}
-
-#share_folder_form div.dialogContentMainTitle {
-    margin: 20px 0 0;
-}
-
-#share_folder_form div.SF_element > input.SF_input,
-select.minisite_layout_selector
-{
-    width: 96% !important;
-}
-
-div#share-folder-type-chooser {
-    font-size: 13px;
-    margin: 0 6px;
-    line-height: 25px;
-}
-
-.share_leaf div.no_share_leaf,
-.share_leaf span.no_share_leaf,
-div.only_share_leaf,
-span.only_share_leaf
-{
-    display: none !important;
-}
-
-.share_leaf div.only_share_leaf{
-    display: block !important;
-}
-
-.share_leaf span.only_share_leaf{
-    display: inline !important;
-}
-
-input#shared_user{
-    width: 370px !important;
-}
-
-div#target_repository_toggle{
-    display: none !important;
-}
-
-.share_edit div#target_repository_toggle{
-    display: block !important;
-    width: 400px;
-}
-
-.share_edit div#target_repository_toggle span{
-    display: inline;
-}
-
-.share_edit div#target_repository_toggle div.SF_horizontal_actions{
-    text-align: right;
-    margin-top: 5px;
-    margin-bottom: -20px;
-    padding-right: 0;
-}
-
-.share_edit div#target_repository,
-.share_edit div#share-folder-type-chooser,
-.share_edit div#share-folder-type-leaf
-{
-    display: none !important;
-}
-
-.share_edit.edit_parameters div#target_repository,
-.share_edit.type-ws div#target_repository
-{
-    display: block !important;
-}
-
-#target_repository_toggle a {
-    border-bottom: 1px solid #555;
-    cursor: pointer;
-}
-#share_generate{
-    height: 40px;
-}
-
-#share_generate div.largeButton{
-    background-color: #4aCEB0;
-}
-
-#shareDialogButtons{
-    padding-top: 30px;
-    text-align: center;
-}
-
-div#share_update{
-    text-align: center;
-    display: none !important;
-}
-
-div#share_result div.non_macos,
-div#share_result div.macos_only
-{
-    font-size:13px;
-    padding:10px 0 0;
-    text-align:center;
-}
-
-.edit_parameters div#shareDialogButtons,
-.edit_parameters div#share_result
-{
-    display: none;
-}
-
-.edit_parameters div#share_update{
-    display: block !important;
-}
-
-#target_repository_toggle span.params_hide,
-.edit_parameters div#target_repository_toggle span.params_view
-{
-    display: none !important;
-}
-.edit_parameters div#target_repository_toggle span.params_hide{
-    display: inline !important;
-}
-
-.share_edit.type-ws span.params_hide, .share_edit.type-ws span.params_view{
-    display: none !important;
-}
-
-#shareDialogButtons div.largeButton,
-#share_update div.largeButton
-{
-    padding: 5px 15px 7px !important;
-    display: inline-block;
-    float: none;
-}
-
-.share_edit.type-ws div#shareDialogButtons{
-    padding-top: 10px;
-}
-.share_edit.type-ws div#shareDialogButtons div.largeButton,
-.share_edit.type-ws div#share_update div.largeButton
-{
-    display: block;
-    margin: 8px 80px;
-}
-
-#shareDialogButtons div.largeButton.destruct{
-    background-color: #A00;
-}
-
-.share_dialog_toggler{
-    cursor: pointer;
-}
-
-.share_dialog_toggler span.toggler_arrow{
-    float: right;
-    margin-right: 5px;
-    margin-top: 3px;
-    transform:rotate(270deg);
-}
-
-.share_dialog_toggler_closed span.toggler_arrow{
-    transform:rotate(0deg);
-}
-
-.share_dialog_toggled{
-    overflow: hidden;
-    transition: height 0.5s ease;
-}
-
-.share_dialog_toggled_closed{
-    height: 0 !important;
-    overflow: hidden;
-}
-
-#editable_hash_link{
-    margin:4px 10px;
-    font-size:13px;
-}
-
-#description_parameters{
-    margin: 5px 0;
-}
-
-#editable_hash_parameters{
-    margin: 5px;
-}
-
-#ws_shared_users_parameters{
-    margin: 0 5px;
-    position: relative;
-}
-
-#share_folder_form{
-    max-width: 400px;
-}
-
-
-div.user_entry span.cbContainer{
-
-}
-/***********************/
-/* EDITORS & DIAPORAMA */
-/***********************/
-textarea.editor
-{
-    background-color:white;
-    font-family:monospace;
-    font-size:13px;
-    line-height:16px;
-}
-
-.diaporamaButton
-{
-    filter:alpha(opacity=40);
-    opacity: 0.4;
-    -moz-opacity:0.4;
-}
-.diaporamaButtonActive,
-.diaporamaButton:hover
-{
-    filter:alpha(opacity=100);
-    opacity: 1;
-    -moz-opacity:1;
-}
-
-#diaporamaMetadataContainer{
-    background-color: #757575;
-    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-}
-
-#diaporamaMetadataContainer div.panelContent{
-    background-color: #ebedf0;
-    margin-right: 3px;
-}
-#diaporamaMetadataContainer div.infoPanelImagePreview{
-    border-radius: 7px;
-}
-#diaporamaSplitter div.vsplitbar{
-    background-color: #757575;
-}
-#diaporamaMetadataContainer div.scroller_track{
-    right: 3px;
-}
-#diaporamaMetadataContainer div.scroller_track,
-#diaporamaMetadataContainer div.scroller_handle{
-}
-#diaporamaMetadataContainer div.imagePreviewOverlay{
-    background-color:rgba(0, 0, 0, 0.2) !important;
-    opacity: 1 !important;
-}
-
-div.icons_only.diaporama_toolbar{
-    height: 33px !important;
-    width: 470px;
-    max-width:80%;
-}
-div.diaporama_toolbar div#diaporama_legend{
-    display: none;
-}
-div.diaporama_toolbar div#diaporama_input_boxes{
-    margin-top: 6px !important;
-}
-
-/***********************/
-/* AUTOCOMPLETION DIV  */
-/***********************/
-div.autocomplete
-{
-    position:absolute;
-    width:250px;
-    background-color:white;
-    border:1px solid #bbb;
-    margin:8px 0 0;
-    padding: 0;
-    box-shadow: 1px 2px 3px rgba(65, 65, 65, 0.85);
-    border-radius: 0;
-    max-height: 180px;
-    overflow-y: auto;
-}
-div.autocomplete ul
-{
-    list-style-type:none;
-    margin: 0;
-    padding: 0;
-}
-div.autocomplete ul li.selected
-{
-    background-color: #73a2d7 !important;
-}
-div.autocomplete ul li
-{
-    list-style-type:none;
-    display:block;
-    margin:0;
-    padding:7px;
-    cursor:pointer;
-}
-span.user_team_save{
-    position: absolute;
-    bottom: 0;
-    right: 0;
-    padding: 3px 4px;
-    background-color: rgba(0, 0, 0, 0.53);
-    border-radius: 4px 0 0 0;
-    color: white;
-    font-size: 12px;
-    z-index: 10;
-    cursor: pointer;
-}
-
-
-/************************/
-/* CONTEXT MENU STYLES  */
-/************************/
-div.menu {
-    position: absolute;
-    top: 0;
-    left: 0;
-    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-    -moz-border-radius:5px;
-    border-radius: 2px;
-    opacity: 0.97;
-}
-div.menu a {
-    display: block;
-    text-decoration: none;
-    cursor: default;
-    outline: none;
-    font-size: 13px;
-}
-.menu .separator {
-    height: 1px;
-    padding: 0;
-    overflow: hidden;
-    display: block;
-    font-size: 1px;
-}
-.menu ul, .menu li {
-    margin: 0;
-    padding: 0;
-    list-style: none;
-    overflow-x: hidden;
-}
-.menu li {
-    list-style-position: outside;
-}
-
-.menu.desktop {
-    width: 10em;
-    padding: 0;
-    padding-top: 0;
-    padding-bottom: 1px;
-    letter-spacing: 1px;
-    background-color: #ffffff;
-}
-
-.menu.desktop.toolbarmenu {
-    background: #4dc5c3;
-    padding-bottom: 0;
-    width: auto;
-    /* IE */
-    width:expression("150px");
-    -moz-border-radius : 0 5px 5px 5px;
-    border-radius: 0 2px 2px 2px;
-}
-
-.menu.desktop.toolbarmenu.panelHeaderMenu {
-    background: rgb(138, 149, 160);
-}
-
-.menu.desktop.toolbarmenu.panelHeaderMenu {
-    background: rgb(138, 149, 160);
-}
-
-.menu.desktop.toolbarmenu.panelHeaderMenu.bmbarMenu {
-    width:150px;
-}
-
-.bmbarMenu div.moreActions {
-    font-size: 11px;
-}
-
-.bmbarMenu div.moreActions span{
-    cursor:pointer;
-}
-
-.menu.desktop.toolbarmenu img {
-    width: 16px;
-    height:16px;
-}
-
-.menu.desktop.textual{
-    width:7em;
-}
-.menu.desktop.textual img {
-    margin-right: 6px;
-}
-
-
-.menu.desktop ul, .menu.desktop li {
-    margin: 0;
-    padding: 0;
-}
-
-.menu.desktop li{
-    padding: 0;
-    overflow-y: hidden;
-    color: rgb(123, 134, 145);
-}
-
-.menu.desktop.toolbarmenu li {
-    height: auto;
-    padding-top: 1px;
-    padding-bottom: 0;
-    color: white;
-}
-
-.rootDirChooser li.menuTitle {
-    color: rgba(77, 197, 195, 1);
-    padding: 10px 8px 4px;
-    text-align: left;
-    /* background-color: rgba(77, 197, 195, 1); */
-    font-size: 22px;
-    /*margin: 1px;*/
-    /* border-bottom: 1px solid #fff; */
-    letter-spacing: 1px;
-}
-
-.menu li.menuTitle{
-    display: none;
-}
-
-.menu.rootDirChooser li.menuTitle{
-    display: block;
-}
-
-.menu.desktop.panelHeaderMenu li.menuTitle {
-    display: block;
-    font-size: 12px;
-    border-bottom: 1px solid #ffffff;
-    padding: 7px;
-    text-align: left;
-    background-color: rgba(255,255,255,0.2);
-}
-
-.menu.desktop li.separator {
-    padding: 0;
-    height: 1px;
-}
-.menu.desktop a img{
-    margin-right: 9px;
-    margin-top: -5px;
-}
-
-.menu.desktop span.ajxp_icon_span{
-    font-size: 1.1em;
-    padding-right: 5px;
-}
-
-.menu.desktop a {
-    color: rgb(123, 134, 145);
-    padding: 5px 8px 3px;
-    margin: 0;
-    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-    font-size: 12px;
-    letter-spacing: 1px;
-    line-height: 20px;
-}
-
-.menu.desktop.toolbarmenu a img{
-    margin-right: 6px;
-}
-
-.menu.desktop.toolbarmenu a {
-    color: #fff;
-    padding: 8px 20px 5px 8px;
-    margin: 0;
-    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-    font-size:11px;
-}
-
-.menu.desktop.toolbarmenu.panelHeaderMenu a {
-    color: #fff;
-    padding: 7px 11px 4px 8px;
-    margin: 0;
-    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-    font-size:11px;
-}
-
-.menu.desktop a.disabled {
-    opacity: 0.25;
-    filter: alpha(opacity=25);
-    zoom: 1;
-}
-.menu.desktop li.separator {
-    border-bottom: 1px solid #ebedf0;
-    margin: 1px 1px 0 1px;
-    line-height: 1px !important;
-}
-.menu.desktop.toolbarmenu li.separator{
-    border-bottom: 1px solid #ffffff;
-}
-
-.bookmarksMenu li.separator {
-    border-bottom: 1px solid #fff;
-    margin: 0 1px 0 1px;
-    line-height: 1px !important;
-    padding: 0;
-    height: 1px !important;
-}
-
-/* we need explicit enabled class to overcome css deficiences (without creating unnecessary markup) */
-.menu.desktop a.enabled:hover {
-    background-color: #73a2d7;
-    color: #fff;
-}
-
-.menu.desktop li.menuAnchorSelected,
-.menu.desktop li.menuAnchorSelected a {
-    background-color: #73a2d7;
-    color: #fff !important;
-}
-
-.rootDirChooser
-{
-    font-size: 11px;
-    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-    position:absolute;
-    z-index: 1500;
-    width: 250px !important;
-    /* IE */
-    width:expression("250px");
-    background-color: #474E50;
-}
-
-.rootDirChooser span.ajxp_icon_span{
-
-    display:inline-block;
-    padding-right: 5px;
-    font-size: 1.4em;
-
-}
-
-.rootDirChooser img
-{
-    border: 0;
-}
-
-.rootDirChooser a
-{
-    display: block;
-    padding: 6px 5px 5px 6px;
-    color: #fff;
-    letter-spacing: 1px;
-    /*height: 16px;*/
-}
-
-.rootDirChooser a img
-{
-    margin-right:5px;
-}
-.rootDirChooser a.disabled IMG{
-    filter: alpha(opacity=30);
-    opacity: 0.3;
-    -moz-opacity: 0.3
-}
-
-.rootDirChooser span.rootDirTitle
-{
-    display: block;
-    font-size: 12px;
-    font-weight: bold;
-    padding-top: 1px;
-    padding-left: 5px;
-    padding-right: 50px;
-    color: #ccc;
-    border-bottom: 0 solid #ddd;
-    text-align: left;
-    font-style: italic;
-}
-
-.rootDirChooser a:hover,
-.bookmarksMenu a:hover,
-.bookmarksMenu a.hovered,
-.rootDirChooser a.hovered
-{
-    background-color: rgba(200, 219, 223, 0.21);
-    box-shadow: inset 1px 1px 0 rgba(255, 255, 255, 0.12);
-    color: #fff;
-}
-
-.rootDirChooser li.separator {
-    /*
-    border-bottom: 1px solid #fff;
-    margin: 1px 1px 0 1px;
-    line-height: 1px !important;
-    padding: 0;
-    height: 1px !important;
-    */
-    border-top: 1px solid rgba(255, 255, 255, 0.98);
-    margin: 0 auto;
-    line-height: 1px !important;
-    height: 0 !important;
-    width: 98%;
-}
-
-.rootDirChooser li.separator.menuTitle{
-    height: auto !important;
-    line-height: 14px !important;
-    border-top: none;
-    padding-top: 7px !important;
-    width: 100%;
-
-}
-
-.menu.menuDetails {
-}
-
-.menu.menuDetails a{
-    line-height: 17px;
-    padding: 10px 5px;
-}
-
-.menu.menuDetails span.ajxp_icon_span{
-    float: left;
-    padding: 3px 9px 23px 4px;
-    font-size: 18px;
-}
-
-.menu.menuDetails span.menu_label{
-    font-size: 14px;
-    display: block;
-}
-
-.menu.menuDetails span.menu_description{
-    display: block;
-    letter-spacing: 0;
-    line-height: 15px;
-    font-size: 11px;
-    color: rgba(255, 255, 255, 0.57);
-    padding-top: 2px;
-}
-
-.menu.menuDetails img{
-    display: none;
-}
-
-.rightAlignMenu{
-    width: 180px !important;
-}
-
-
-.rightAlignMenu a{
-    padding: 8px 5px 7px 20px;
-    text-align:right;
-    letter-spacing: 1px;
-}
-
-.rightAlignMenu a img{
-    margin-right: 0;
-    margin-left:5px;
-    float: right;
-}
-
-.rightAlignMenu a img,
-.rightAlignMenu span.ajxp_icon_span
-{
-    margin-right: 0;
-    margin-left: 9px;
-    display: inline-block;
-    font-size: 13px;
-    float: right;
-    margin-top: 2px;
-}
-
-.menuActions {
-    position: absolute;
-    right: 0;
-    top: 1px;
-    text-align: right;
-    padding-right: 3px !important;
-    margin-top: 5px !important;
-}
-
-.menuActions a{
-    width: 18px;
-    padding: 1px;
-    display: inline-block !important;
-    filter:alpha(opacity=30);
-    opacity: 0.3;
-    -moz-opacity:0.3;
-    cursor: pointer !important;
-    height: 16px;
-}
-
-.menuActions.moreActions{
-    margin-top: 0 !important;
-    z-index: 1;
-}
-.menuActions.moreActions span{
-    color: #ffffff;
-    cursor: pointer;
-    width: 16px;
-    display: inline-block;
-    text-align: left;
-    font-size: 1.2em;
-    text-shadow: 1px 1px 1px #676767;
-}
-
-.menuActions a:hover
-{
-    filter:alpha(opacity=100);
-    opacity: 1.0;
-    -moz-opacity:1.0;
-}
-
-div.menuActions img{
-    display: none;
-}
-
-.menuActions.icon-caret-right {
-    padding-top: 2px;
-}
-
-/*
-.backgroundPanel{
-    position:absolute;
-    right:0;
-    bottom:20px;
-    padding:1px 5px 3px 7px;
-    font-size:11px;
-    font-weight:bold;
-    color: #fff;
-    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif , sans-serif;
-    background-color:#5599ff;
-    filter:alpha(opacity=80);
-    opacity: 0.8;
-    -moz-opacity:0.8;
-    z-index:10000;
-    border-radius: 3px 0 0 3px;
-}*/
-
-.backgroundPanel {
-    position: absolute;
-    bottom: 0;
-    padding: 3px 7px 4px 7px;
-    font-size: 11px;
-    font-weight: bold;
-    color: #fff;
-    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif , sans-serif;
-    background-color: #59f;
-    z-index: 10000;
-    border-radius: 3px 3px 0 0;
-    width: 15%;
-    margin-left: 45%;
-    text-align: center;
-}
-
-/*******************************/
-/* CREDIT SPLASH SCREEN
-/******************************/
-#docDiv div.title
-{
-    font-size:13px;
-    font-weight: bold;
-}
-
-#docDiv div.subtitle
-{
-    color: #5E7C90;
-    font-size:25px;
-}
-
-#docDiv a
-{
-    color: #39C0BE !important;
-    text-decoration: underline;
-}
-
-/********************************************/
-/* NEW HTML5 / CSS3 STYLES  	            */
-/* Generally applied after a Modernizr test */
-/********************************************/
-.css_boxshadow,div.menu{
-    -moz-box-shadow : 5px 5px 40px rgba(100, 100, 100, 0.5);
-    -webkit-box-shadow : 5px 5px 40px rgba(100, 100, 100, 0.5);
-    box-shadow : 5px 5px 40px rgba(100, 100, 100, 0.5);
-}
-
-.dialogBox, div.dialogBox.css_boxshadow{
-    -moz-box-shadow: 5px 5px 60px #222;
-    -webkit-box-shadow: 5px 5px 60px #222;
-    box-shadow: 5px 5px 60px #222;
-}
-
-div.dialogBox div.dialogBox.css_boxshadow{
-    border-radius: 4px !important;
-    border: 0;
-    width: 96%;
-    left: 2%;
-    top: 19%;
-    background-color: white;
-}
-
-.no-flexbox div#mailer_message{
-    width: 380px !important;
-}
-
-div.dialogBox div.dialogBox.css_boxshadow > div{
-    background-color: transparent;
-}
-
-div.dialogBox.form-login_form,
-div.dialogBox.form-login_form_dynamic
-{
-    box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.23);
-    -webkit-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.23);
-    -moz-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.23);
-}
-
-#progressBox
-{
-    display: block;
-    z-index: 2002;
-    top: 20%;
-    -moz-border-radius : 5px;
-    border-radius : 5px;
-    width: 305px;
-    padding: 3px;
-    display: block;
-    top: 30%;
-    z-index: 2002;
-    left: 40%;
-    position: absolute;
-    box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.23);
-    -webkit-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.23);
-    -moz-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.23);
-}
-
-div.overlay.form-login_form,
-div.overlay.form-login_form_dynamic,
-div.overlay.form-switch_language_form
-{
-    opacity: 1 !important;
-    background-image: url('../images/grid_t.png');
-    background-color: white !important;
-}
-
-/****************************************/
-/* WEBDAV PREFERENCES                    */
-/****************************************/
-#webdav_main_access{
-    font-size: 20px;
-    padding: 5px;
-    text-align: center;
-    border-radius: 3px;
-    background-color: white;
-    width: 97%;
-    margin-bottom: 5px;
-    color: rgb(111, 121, 131);
-}
-
-#perworkspace-urls-toggle{
-    text-decoration: underline;
-    cursor: pointer;
-}
-#perworkspace-urls-toggle span{
-    font-size: 13px;
-    margin: 0 7px;
-    text-decoration: none;
-}
-
-#webdav_repo_list{
-    height: 200px;
-    overflow: auto;
-    border: 1px solid #BBB;
-}
-
-#webdav_repo_list div{
-    padding: 7px;
-}
-
-#webdav_repo_list span{
-    display: inline-block;
-    width: 24%;
-}
-
-#webdav_repo_list input {
-    width: 73%;
-}
-
-input#webdav_password{
-    height: 22px !important;
-}
-
-.video-js-box{
-    margin-left: 10px !important;
-}
-
-#cpane_tabs .video-js-box{
-    margin-left: 0 !important;
-}
-
-.video-js-box.vjs-fullscreen{
-    margin-left: 0 !important;
-}
-
-#video_container{
-    margin: 5px 20px 5px 10px !important;
-}
-
-td.ip_geo_cell{
-    padding-right: 12px !important;
-}
-
-
-/************************************************/
-/*     NICE ROUNDED PURE-CSS TABS                                     */
-/*     From http://css-tricks.com/better-tabs-with-round-out-borders/ */
-/************************************************/
-.tabrow {
-    list-style: none;
-    margin: 0;
-    padding: 0;
-    line-height: 24px;
-    overflow: hidden;
-    font-size: 13px;
-    position: relative;
-    background-color: rgb(78, 167, 165);
-    border-radius: 0 3px 0 0;
-}
-
-.tabpanes {
-    background-color: #f8f8f8;
-
-}
-
-.tabrow li {
-    border: 0;
-    display: inline-block;
-    position: relative;
-    padding: 9px 10px 9px;
-    cursor: pointer;
-    color: rgba(255, 255, 255, 0.61);
-    text-align: center;
-    line-height: 16px;
-    margin: 0;
-}
-.tabrow li.selected {
-    color: #ffffff;
-    background-color: transparent !important;
-}
-
-#sm2-container{
-    position: absolute;
-    top: -1000px;
-}
-
-.toolbarGroup{
-    display:inline-block;
-}
-
-#put_toolbar div.separator{
-    margin-right: 10px;
-}
-
-#display_toolbar {
-    float: right;
-    display: inline-block;
-    min-width: 60px;
-    text-align: right;
-}
-
-#display_toolbar a,
-#top_toolbar a
-{
-    color: #fff;
-    display: inline-block;
-    padding: 0 3px;
-}
-
-#default_toolbar a span.ajxp_icon_span {
-    margin-right: 1px;
-}
-
-#display_toolbar a:hover{
-    color: rgb(253, 252, 228);
-}
-
-#display_toolbar a.disabled{
-    display:none;
-}
-
-#top_toolbar a
-{
-    font-size:12px;
-    padding: 0 10px;
-    letter-spacing: 1px;
-}
-
-#top_toolbar a span.ajxp_icon_span,
-#top_toolbar a span.ajxp_icon_arrow
-{
-    font-size: 1.0em;
-    display:inline-block;
-    padding: 0 4px;
-}
-
-#top_toolbar a img{
-    display:none;
-}
-
-#display_toolbar span.actionbar_button_label {
-    display: none;
-}
-
-#cpane_header{
-    padding-bottom: 4px;
-    height: 19px;
-}
-
-/*
-TABULATOR VARIANTS
-*/
-
-/*
-TABULATOR IN A TABULATOR
-*/
-#files_list_header,
-.innerTabulator  div.panelHeader
-{
-    font-size: 11px;
-    padding: 5px 3px 3px 8px;
-    height: 18px;
-    letter-spacing: 1px;
-    background-color: #FFFFFF;
-    border-bottom: 1px solid rgb(187, 187, 187);
-    color: rgb(111, 123, 136);
-    border-left: 1px solid rgb(187, 187, 187);
-    border-right: 0;
-}
-
-.innerTabulator  div.panelHeader.tabulatorContainer
-{
-    padding: 0 0 0 0;
-    height: 26px;
-}
-
-.innerTabulator span.toggleHeader{
-    padding: 4px 7px 4px 7px;
-    border-right: 1px dotted rgb(111, 123, 136);
-    background-color: #ebedf0;
-    color: rgb(111, 123, 136);
-    font-size: 11px;
-}
-
-.innerTabulator span.toggleHeader.toggleInactive{
-    background-color: white;
-}
-
-#files_list_header > #display_toolbar a:hover,
-#files_list_header > #display_toolbar a,
-div.innerTabulator > div.tabulatorContainer > #display_toolbar a:hover,
-div.innerTabulator > div.tabulatorContainer > #display_toolbar a
-{
-    color: rgb(111, 123, 136) !important;
-}
-
-#cpane_tabs span.toggleHeader{
-    padding: 6px 10px;
-}
-
-#cpane_tabs span.toggleInactive{
-    border-right: 1px dotted rgb(111, 123, 136);
-}
-
-#cpane_tabs span.toggleInactiveBeforeActive{
-    border-right: 0;
-}
-
-
-/*
-DASHBOARD TABULATOR
-*/
-.flat_tabulator  div.panelHeader.tabulatorContainer
-{
-    padding: 0 0 0 0;
-    height: 34px;
-    background-color: transparent;
-    border-bottom: 0;
-}
-
-.flat_tabulator span.toggleHeader{
-    padding: 8px 10px 8px;
-    font-size: 13px;
-    border-bottom: 0 solid #399C9B;
-    color: #ffffff;
-    background-color: rgb(78, 167, 165);
-    margin-right: 1px;
-    border-right: 0;
-    box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.26);
-    border-radius: 3px 3px 0 0;
-}
-
-.flat_tabulator span.toggleHeader:first-of-type{
-    background-color: rgb(111,123,136) !important;
-}
-
-.flat_tabulator[data-ajxpTabsCount="1"] span.toggleHeader
-{
-/*    background-color: white;*/
-}
-
-.flat_tabulator span.toggleHeader.toggleInactive {
-    border-bottom: 0;
-    color: rgba(255, 255, 255, 0.62);
-    font-size: 13px;
-    background-color: rgba(78, 167, 165, 0.5);
-    box-shadow: none;
-    padding-bottom: 7px;
-}
-
-div.flat_tabulator > div.tabulatorContainer > #display_toolbar a:hover,
-div.flat_tabulator > div.tabulatorContainer > #display_toolbar a
-{
-    color: rgb(111, 123, 136) !important;
-}
-
-
-div.flat_tabulator span.toggleInactive{
-}
-
-div.flat_tabulator span.toggleInactive span.tab_close_button{
-    opacity: 0.25;
-}
-
-div.flat_tabulator span.toggleInactiveBeforeActive{
-}
-
-div.flat_tabulator > div:not(.tabulatorContainer){
-    /*
-    background-color: #ffffff;
-    border-radius: 0 0 2px 2px;
-    */
-}
-
-.horizontal_tabulator div.tabulatorContainer {
-    float: left;
-    width: 22%;
-    padding: 0;
-    background-color: #ebedf0 !important;
-}
-
-.horizontal_tabulator span.toggleHeader{
-    width: 96% !important;
-    text-align: center;
-    padding: 33px 0;
-    background-color: #e35d52 !important;
-    color: #ffffff !important;
-    border: 0;
-    display: block;
-    margin: 2%;
-    border-radius: 2px;
-}
-
-.horizontal_tabulator span.toggleInactive{
-    width: 200px;
-    border-width: 0 !important;
-    background-color: transparent !important;
-    color: rgb(111, 123, 136) !important;
-    text-shadow: none;
-    padding-bottom: 33px !important;
-}
-
-div.horizontal_tabulator > div:not(.tabulatorContainer){
-    float: left;
-    padding: 0 !important;
-    width:78%;
-}
-
-#breadcrumb{
-    display: inline-block;
-    overflow: hidden;
-}
-
-#breadcrumb div.inner_bread{
-    width: 2000px;
-}
-
-#breadcrumb span.icon-home{
-    display: inline-block;
-    font-size: 1.3em;
-}
-
-#breadcrumb span.icon-chevron-right{
-    display: inline-block;
-    padding: 0 2px;
-}
-
-#breadcrumb span.ajxp-goto{
-    cursor: pointer;
-}
-
-#breadcrumb span.ajxp-goto-refresh {
-    display: none;
-    text-decoration: none !important;
-}
-
-#breadcrumb span.ajxp-goto:hover {
-    /*color: rgb(253, 252, 228);*/
-    text-decoration: underline;
-}
-
-#breadcrumb span.ajxp-goto:hover span.ajxp-goto-refresh {
-    display: inline-block;
-    margin-left: 3px;
-    font-size: 10px;
-}
-
-#AjxpConnexion-loader{
-    left:49% !important;
-    top: 7px !important;
-    width:30px;
-}
-
-#AjxpConnexion-loader img{
-    height:6px;
-}
-
-#ajxp_link_form span.icon-envelope-alt {
-    font-size: 1.3em;
-}
-
-#ajxp_link_form img {
-    display: none;
-}
-
-.ipanel_no_selection_select, #no-results-found {
-    color: rgb(180, 184, 190);
-    text-shadow: 1px 1px 0 #ffffff;
-}
-
-.ipanel_no_selection_select span.icon-info-sign {
-    display: block;
-    text-align: center;
-    font-size: 150px;
-    padding: 50px 0 20px;
-}
-
-.ipanel_no_selection_select span.label {
-    display: block;
-    text-align: center;
-    font-size: 13px;
-}
-
-.panelContent i {
-    font-size: 13px;
-    font-style: normal;
-    color: rgb(180, 184, 190);
-    text-shadow: 1px 1px 0 #ffffff;
-}
-
-.ipanel_no_selection_data {
-    display: none;
-}
-
-#webdav_password_form {
-    padding-left: 0 !important;
-}
-
-#buttons_bar a{
-    padding-bottom: 0;
-    height: 28px;
-}
-
-#workspace_toolbar a#ls_button{
-    display: none;
-}
-
-#create_button {
-    /*padding: 7px 10px 10px 10px;*/
-    margin-right: 0;
-    border-radius: 2px 0 0 2px;
-    padding: 0;
-    height: 33px !important;
-}
-
-#create_button_label {
-    display: none;
-}
-
-#create_button span.ajxp_icon_arrow {
-    display: none;
-}
-
-#create_button span.icon-plus{
-    padding: 9px;
-}
-
-#upload_button {
-    border-radius: 0 2px 2px 0;
-}
-
-.custom_top_title{
-    color: white;
-}
-
-span.letter_badge {
-    display: inline-block;
-    float: left;
-    width: 32px;
-    background-color: rgb(78, 167, 165);
-    border-radius: 34px;
-    color: white;
-    text-align: center;
-    padding: 7px 0;
-    font-size: 0.8em;
-    font-family: "Open Sans Regular";
-}
-
-.rootDirChooser span.letter_badge{
-    display: none;
-}
-
-
-
-#action_instance_user_create_repository {
-    font-size: 14px;
-    line-height: 21px;
-}
-
-/* rotation animation */
-@-webkit-keyframes rotate {
-    from { -webkit-transform:rotate(0deg); }
-    to { -webkit-transform:rotate(360deg); }
-}
-
-@-moz-keyframes rotate {
-    from { -moz-transform:rotate(0deg); }
-    to { -moz-transform:rotate(360deg); }
-}
-
-@-ms-keyframes rotate {
-    from { -ms-transform:rotate(0deg); }
-    to { -ms-transform:rotate(360deg); }
-}
-
-@-o-keyframes rotate {
-    from { -o-transform:rotate(0deg); }
-    to { -o-transform:rotate(360deg); }
-}
-
-.rotating, .icon-spinner {
-    -webkit-transform-origin: 50% 50%;
-    -webkit-animation-name: rotate;
-    -webkit-animation-duration: 1.0s;
-    -webkit-animation-iteration-count: infinite;
-    -webkit-animation-timing-function: linear;
-    -moz-transform-origin: 50% 50%;
-    -moz-animation-name: rotate;
-    -moz-animation-duration: 1.5s;
-    -moz-animation-iteration-count: infinite;
-    -moz-animation-timing-function: linear;
-    -ms-transform-origin: 50% 50%;
-    -ms-animation-name: rotate;
-    -ms-animation-duration: 1.5s;
-    -ms-animation-iteration-count: infinite;
-    -ms-animation-timing-function: linear;
-    -o-transform-origin: 50% 50%;
-    -o-animation-name: rotate;
-    -o-animation-duration: 1.5s;
-    -o-animation-iteration-count: infinite;
-    -o-animation-timing-function: linear;
-}
-
-.icon-spinner{
-    display: block !important;
-    text-align: center;
-}
-
-.icon-spinner.spinner_large{
-    font-size: 22px;
-}
-
-.events_menu span.icon-spinner{
-    display: block !important;
-    text-align: center;
-    width: 14px !important;
-    height: 16px !important;
-    float: left;
-}
-
-
-.rect_spinners {
-    margin: 30px auto;
-    width: 50px;
-    height: 35px;
-    text-align: center;
-    font-size: 10px;
-}
-
-.rect_spinners > div {
-    background-color: #00A790;
-    height: 100%;
-    width: 6px;
-    display: inline-block;
-    margin-right: 2px;
-    -webkit-animation: stretchdelay 1.2s infinite ease-in-out;
-    animation: stretchdelay 1.2s infinite ease-in-out;
-}
-
-.rect_spinners div.rect2 {
-    -webkit-animation-delay: -1.1s;
-    animation-delay: -1.1s;
-}
-
-.rect_spinners div.rect3 {
-    -webkit-animation-delay: -1.0s;
-    animation-delay: -1.0s;
-}
-
-.rect_spinners div.rect4 {
-    -webkit-animation-delay: -0.9s;
-    animation-delay: -0.9s;
-}
-
-.rect_spinners div.rect5 {
-    -webkit-animation-delay: -0.8s;
-    animation-delay: -0.8s;
-}
-
-@-webkit-keyframes stretchdelay {
-    0%, 40%, 100% { -webkit-transform: scaleY(0.4) }
-    20% { -webkit-transform: scaleY(1.0) }
-}
-
-@keyframes stretchdelay {
-    0%, 40%, 100% {
-        transform: scaleY(0.4);
-        -webkit-transform: scaleY(0.4);
-    }  20% {
-           transform: scaleY(1.0);
-           -webkit-transform: scaleY(1.0);
-       }
-}
-
-.bounce-spinner {
-    width: 50px;
-    height: 50px;
-
-    position: relative;
-    margin: 30px auto;
-}
-
-.double-bounce1, .double-bounce2 {
-    width: 100%;
-    height: 100%;
-    border-radius: 50%;
-    background-color: #00A790;
-    opacity: 0.6;
-    position: absolute;
-    top: 0;
-    left: 0;
-
-    -webkit-animation: bounce 2.0s infinite ease-in-out;
-    animation: bounce 2.0s infinite ease-in-out;
-}
-
-.double-bounce2 {
-    -webkit-animation-delay: -1.0s;
-    animation-delay: -1.0s;
-}
-
-@-webkit-keyframes bounce {
-    0%, 100% { -webkit-transform: scale(0.0) }
-    50% { -webkit-transform: scale(1.0) }
-}
-
-@keyframes bounce {
-    0%, 100% {
-        transform: scale(0.0);
-        -webkit-transform: scale(0.0);
-    } 50% {
-          transform: scale(1.0);
-          -webkit-transform: scale(1.0);
-      }
-}
-
-#ajxp_workspace_info_panel{
-    margin: 0 !important;
-}
-
-#ajxp_workspace_info_panel_content,
-#ajxp_quota_panel_content
-{
-    color: rgb(111, 121, 131);
-    padding: 10px !important;
-}
-
-tr[data-groupByValue],
-div[data-groupByValue]
-{
-    clear: left;
-    max-height: 480px;
-    overflow: hidden;
-    margin-bottom: 10px;
-}
-
-tr[data-groupByValue]:first-child,
-div[data-groupByValue]:first-child
-{
-    margin-top: 10px;
-}
-
-div[data-groupByValue] h3,
-tr[data-groupByValue] h3
-{
-    font-size: 16px;
-    margin: 10px 0 10px 14px;
-    color: rgb(111, 121, 131);
-    font-weight: normal;
-}
-
-h3.dashboard_panel_title{
-    display: none;
-}
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/css/allz.css b/core/src/plugins/gui.ajax/res/themes/vision/css/allz.css
deleted file mode 100755
index 82100f98a6..0000000000
--- a/core/src/plugins/gui.ajax/res/themes/vision/css/allz.css
+++ /dev/null
@@ -1,442 +0,0 @@
-.flexbox div.webfx-tree-container.first_container{}.no-flexbox div#tree_container{}.webfx-tree-container{margin:0;padding:0;font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;white-space:nowrap;font-size:11px}.webfx-tree-item{padding:0;margin:0;font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;font-size:11px;white-space:nowrap;height:27px;position:relative}.webfx-tree-item:hover{background-color:rgb(253,252,228)}.selected-webfx-tree-item{color:white}.selected-webfx-tree-item-inactive{text-decoration:none}.webfx-tree-item a,.webfx-tree-item a:active,.webfx-tree-item a:hover,.webfx-tree-item a:link{margin-left:0;outline:0;cursor:default}.webfx-tree-item a{text-decoration:none}.webfx-tree-item a:hover{text-decoration:none}.webfx-tree-item a{outline:0;color:rgb(111,121,131)}.webfx-tree-item a span{display:inline-block;line-height:19px;margin-top:4px;padding-left:25px;background-position:4px 1px;background-repeat:no-repeat;font-size:13px}*::-moz-focus-inner{border:none}.selected-webfx-tree-item a{color:white!important;text-decoration:none}.webfx-tree-item a.selected-focus{color:white}.webfx-tree-item img{vertical-align:middle;border:0;float:left}.webfx-tree-icon{width:16px;height:16px;margin-right:3px}.selected{background:#ddd;color:white;text-decoration:none}.flat_tree_pane div#tree_container{border:0;background-color:transparent}.flat_tree_pane div#tree_container>.webfx-tree-item{display:none}.flat_tree_pane div.webfx-tree-item{background-color:transparent;cursor:pointer;padding:3px 6px}.flat_tree_pane div.webfx-tree-item a{color:rgba(255,255,255,0.7);cursor:pointer}.flat_tree_pane div.webfx-tree-item a span{padding-left:33px;background-position:13px 4px!important;background-repeat:no-repeat;font-size:13px;background-size:12px;padding-top:1px}.flat_tree_pane div.webfx-tree-item.selected-webfx-tree-item-inactive,.flat_tree_pane div.webfx-tree-item.selected-webfx-tree-item{background-color:rgba(255,255,255,0.15)!important}.flat_tree_pane div.webfx-tree-item.selected-webfx-tree-item a,.flat_tree_pane div.webfx-tree-item.selected-webfx-tree-item-inactive a{text-shadow:none;color:#fff!important}.flat_tree_pane>#tree_container>.webfx-tree-container>.webfx-tree-item{margin-top:10px}.flat_tree_pane>#tree_container>.webfx-tree-container>.webfx-tree-item a span{color:#FFFFFF;background-image:none!important;padding-left:4px;margin-top:5px;font-size:14px;letter-spacing:1px}.flat_tree_pane div.webfx-tree-container.first_container{padding:0}.flat_tree_pane div.scrolling div.webfx-tree-container.first_container{padding:0}.flat_tree_pane div.webfx-tree-item img{display:none}.flat_tree_pane div.webfx-tree-container>.webfx-tree-container{}.flat_tree_pane div.webfx-tree-container>.webfx-tree-container>.webfx-tree-container{margin-bottom:0;box-shadow:none}.flat_tree_pane div.webfx-tree-container>.webfx-tree-container>.webfx-tree-item{background-color:transparent;border-top:0}.flat_tree_pane div.webfx-tree-container>.webfx-tree-container div.webfx-tree-container{}.flat_tree_pane div.webfx-tree-container>.webfx-tree-container div.webfx-tree-container div.webfx-tree-item{padding-left:20px}.flat_tree_pane div.webfx-tree-container>.webfx-tree-container>.webfx-tree-container div.webfx-tree-container div.webfx-tree-item{padding-left:40px}.flat_tree_pane div.webfx-tree-container>.webfx-tree-container>.webfx-tree-container>.webfx-tree-container div.webfx-tree-container div.webfx-tree-item{padding-left:60px}#container{width:50%;margin:0 auto;text-align:left}.footer{background-color:#000;padding:0.5em}.leightbox{color:#333;display:none;position:absolute;top:45%;left:45%;width:50%;height:50%;padding:1em;border:1em solid #B8B8B8;background-color:white;text-align:left;z-index:1001;overflow:auto}#overlay,#loading_overlay{display:none;position:absolute;top:0;left:0;width:100%;height:100%;z-index:1000;background-color:rgb(0,0,0);-moz-opacity:0.6;opacity:.60;filter:alpha(opacity=60)}#loading_overlay{display:block;z-index:2000;-moz-opacity:1.0!important;opacity:1.0!important;filter:alpha(opacity=100)!important;background-color:#fff!important;background-image:url('../images/grid_t.png')}#element_overlay{position:absolute;top:0;left:0;width:100%;height:100%;z-index:1000;background-color:#EEEEEE;-moz-opacity:0.8;opacity:.80;filter:alpha(opacity=80);text-align:center;overflow:hidden;padding:0!important;margin:0!important}div.dialogBox div#element_overlay{background-color:rgb(37,37,37);opacity:0;transition:opacity 0.4s ease}#element_overlay img{margin-top:30%}#element_iframe{position:absolute;width:80%;height:80%;z-index:1010;background-color:#eee;border:1px solid black}.lightbox[id]{position:fixed}#overlay[id]{position:fixed}table.sort-table tr:nth-child(even){background-color:#f9f9f9}*{font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif}*:focus{outline:none}.soft_css_gradient,.menu.bookmarksMenu{background:rgb(255,255,255);background:-moz-linear-gradient(top,rgba(255,255,255,1)0%,rgba(229,229,229,1)100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,rgba(255,255,255,1)),color-stop(100%,rgba(229,229,229,1)));background:-webkit-linear-gradient(top,rgba(255,255,255,1)0%,rgba(229,229,229,1)100%);background:-o-linear-gradient(top,rgba(255,255,255,1)0%,rgba(229,229,229,1)100%);background:-ms-linear-gradient(top,rgba(255,255,255,1)0%,rgba(229,229,229,1)100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff',endColorstr='#e5e5e5',GradientType=0);background:linear-gradient(top,rgba(255,255,255,1)0%,rgba(229,229,229,1)100%)}.grey_gradient_emboss,.selected,div.selected-webfx-tree-item-inactive{background:rgb(221,221,221)!important}.blue_gradient,div.selected-webfx-tree-item,.selected-focus{background:#5599ff!important}.grey_gradient_light_inputs,.dialogContent input,.dialogContent input[type="text"],.dialogContent input[type="password"],.dialogContent select,#search_txt,#location_form,#treeCopy{background:rgb(243,243,243);background:rgb(243,243,243);background:-moz-linear-gradient(top,rgba(243,243,243,1)0%,rgba(255,255,255,1)100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,rgba(243,243,243,1)),color-stop(100%,rgba(255,255,255,1)));background:-webkit-linear-gradient(top,rgba(243,243,243,1)0%,rgba(255,255,255,1)100%);background:-o-linear-gradient(top,rgba(243,243,243,1)0%,rgba(255,255,255,1)100%);background:-ms-linear-gradient(top,rgba(243,243,243,1)0%,rgba(255,255,255,1)100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f3f3f3',endColorstr='#ffffff',GradientType=0);background:linear-gradient(top,rgba(243,243,243,1)0%,rgba(255,255,255,1)100%)}a:link,a:visited,a:hover,a:active,a:focus{text-decoration:none;outline:0;color:rgb(111,121,131)}.linked{cursor:pointer}body,html{margin:0;padding:0}.flexbox body{position:absolute;top:0;bottom:0;left:0;right:0}.vertical_layout{display:-webkit-flex;display:flex;flex-direction:column;-webkit-flex-direction:column}.vertical_layout>*{flex-shrink:0}.horizontal_layout{display:-webkit-flex;display:flex;flex-direction:row;-webkit-flex-direction:row;align-items:stretch;-webkit-align-items:stretch}.vertical_fit{flex:1;-webkit-flex:1;overflow-y:hidden}input,textarea,select{margin-top:1px;margin-left:10px;padding:2px;border:1px solid #aaa;font-size:11px;font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;border-radius:2px;-moz-border-radius:2px;-webkit-border-radius:2px}textarea{margin-top:0;margin-left:0;padding:0;background-color:#fff}.titre{font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;font-size:14px;font-weight:bold;color:black;width:100%;text-align:left}.titre input,.backImage{margin-top:0;margin-left:0;padding:2px;border:1px solid #5E7C90}kbd{padding:.1em.6em;border:1px solid #ccc;font-size:11px;font-family:Arial,Helvetica,sans-serif;background-color:#f7f7f7;color:#333;-moz-box-shadow:0 1px 0 rgba(0,0,0,0.2),0 0 0 2px#fff inset;-webkit-box-shadow:0 1px 0 rgba(0,0,0,0.2),0 0 0 2px#fff inset;box-shadow:0 1px 0 rgba(0,0,0,0.2),0 0 0 2px#fff inset;border-radius:3px;display:inline-block;margin:0.1em;text-shadow:0 1px 0#fff;line-height:1.4;white-space:nowrap}.tooltipped{background-color:#ffffc0}.resizableHandle{position:absolute;width:10px;height:10px;background-image:url('../images/resize_handle.png');opacity:0.5;cursor:nwse-resize}#sidebar_rootdir_td{height:17px;vertical-align:top}#sidebar_tree_td{vertical-align:top}#sidebar_searchform_td{vertical-align:bottom;height:20px}.thumbnail_selectable_cell{width:110px;height:100px;float:left;text-align:center;margin:4px;background-color:rgb(250,250,250);-moz-border-radius:2px;border-radius:2px;padding:4px 6px;color:rgb(111,121,131)}.thumbnail_selectable_cell.detailed{;margin:0px 0px!important;margin-bottom:2px;background-color:#ffffff;width:100%;display:block;height:auto;border-radius:0;padding:6px 4px}.thumbnail_selectable_cell.detailed:hover{background-color:rgb(253,252,228)}.thumbnail_selectable_cell.detailed:last-child{border-bottom:0}.thumbnail_selectable_cell.detailed div.thumbnail_selectable_cell{margin-right:11px;background-color:transparent}.thumbnail_selectable_cell.detailed div.thumbLabel{font-size:15px;text-align:left;padding-top:9px;padding-bottom:0px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.thumbnail_selectable_cell.detailed div.thumbnail_cell_metadata{text-align:left;padding-top:0;opacity:0.8;font-size:11px;white-space:nowrap;margin-top:1px}.thumbnail_selectable_cell.detailed.metadata_empty div.thumbLabel{padding-top:18px}div.thumbnail_cell_metadata span.metadata_chunk span.text_label{margin-left:0;display:inline}div.thumbnail_cell_metadata span.metadata_chunk{display:inline;margin-right:5px}.selectable_div.detailed{padding:0!important}.thumbnail_iconlike_shadow{border:1px solid white;-webkit-box-shadow:0 0 5px#5C5C5C;-moz-box-shadow:0 0 5px#5C5C5C;box-shadow:0 0 5px#5C5C5C}.selectable_div div.selected{}.selectable_div div.selected-focus{}.thumbLabel{white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.img_cont{width:64px;height:64px;border:1px solid #ddd;vertical-align:middle}.text_label{display:block;overflow:hidden;padding-left:6px;padding-top:4px;height:18px;line-height:17px;white-space:nowrap;color:#888;text-overflow:ellipsis}.text_label.full{height:auto;white-space:normal}.list_selectable_span img{float:left}.table_rows_container span.list_selectable_span span.text_label{font-size:12px;padding-left:27px!important;background-position:5px 4px;color:rgb(80,82,83);letter-spacing:1px;background-size:16px}.overlay_icon_div{position:absolute;background:none!important;height:12px!important;bottom:0!important;width:auto!important;top:4px!important;right:10px!important;font-size:11px}.thumbnail_selectable_cell>div>div.overlay_icon_div{top:24px!important;right:21px!important;font-size:16px;transition:top 0.6s ease}div.class-FetchedResultPane div.overlay_icon_div{top:16px!important;font-size:13px}span.overlay-class-span{color:rgb(111,123,136);margin-left:5px;padding:0!important;margin-top:0!important}.selected span.overlay-class-span,.selected-webfx-tree-item span.overlay-class-span{color:white}.overlay_icon_div span.overlay-class-span{margin-left:7px}.webfx-tree-item span.overlay-class-span{}#all_forms{background-color:#eee}#all_forms div{display:none}#all_forms form{display:inline}#all_forms div div,#all_forms div.shadow_class{display:block}div.shadow_class{-moz-border-radius:5px;border-radius:5px}.dialogBox,.editBox{display:none;position:absolute;top:30%;left:30%;z-index:1002;font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;font-size:11px;padding:0;-moz-border-radius:5px;border-radius:3px;min-width:260px}.editBox{top:5%;left:5%;padding:0;margin:0}.dialogTitle{cursor:move;font-size:13px!important}.dialogTitle span.ajxp_icon_span,.dialogTitle span#modalCloseBtn{display:inline-block;font-size:15px;padding-right:5px}.dialogTitle span#modalCloseBtn{font-size:13px;margin-top:2px}.dialogContent{background-color:#fff;padding:10px 10px;border:1px solid #dddddd;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;background-image:url('../images/grid_tl.png');border-top:0;color:#5C5C5C}.dialogContent input,.dialogContent input[type="text"],.dialogContent input[type="password"],.dialogContent select,#search_txt{margin-left:0;width:174px;border:1px solid #aaa;background-repeat:no-repeat;background-position:top left;height:20px;border-radius:2px;-moz-border-radius:2px;-webkit-border-radius:2px}.dialogContent select{height:22px}.dialogContent select[multiple]{height:66px}.dialogContent input:focus,.dialogContent input[type="text"]:focus,.dialogContent input[type="password"]:focus,.dialogContent select:focus{background:white;border:1px solid #5599ff}.dialogContent input:disabled,.dialogContent input[type="text"]:disabled,.dialogContent input[type="password"]:disabled,.dialogContent option:disabled.dialogContent textarea:disabled{background:#eee}.dialogContent input[type="checkbox"],.dialogContent input[type="radio"]{height:auto;width:auto;border-radius:0;border:none;filter:none;background:none;margin-right:0}label{margin-right:8px}.checkbox_left{float:left;clear:left;margin:0 4px 5px 0!important}label.checkbox_label_left{float:left;display:inline-block}.dialogLegend{color:#5C5C5C;padding-bottom:5px;line-height:16px}.dialogButtons{text-align:right;clear:both}.dialogButtons input,fieldSet input.dialogButton{margin-left:6px;width:22px;height:22px;padding:2px;background-image:none;background-color:#eee;border-radius:2px;-moz-border-radius:3px;box-shadow:inset 1px 1px 1px white}.dialogButtons.inlineEdition input{margin-left:6px;width:22px;height:22px;padding:0;box-shadow:none}.dialogButtonsCheckbox{float:left;margin-top:9px}span.ajxp-caret-up{position:absolute;top:-21px;left:118px;font-size:30px;color:#5C5C5C}.dialogButtonsCheckbox label{cursor:pointer}.editContent,.editContent div{background-color:#fff}.editContent textarea,textarea#myCode,.editContent iframe{border:0;border-left:1px solid #5E7C90;padding:0;margin:0}#activity_monitor_warning{position:absolute;left:35%;width:20%;top:30%;text-align:center;font-size:16px;color:#5E7C90;font-weight:bold;cursor:pointer}#activity_monitor_warning span.click_anywhere{font-size:12px;color:#676965;display:block;padding-top:15px;font-weight:normal}#activity_monitor_warning span.warning_timer{color:#0077b3}textarea#myCode{border:1px solid #5C5C5C;border-right-color:#ccc;border-left-color:#ccc}.dialogContent form,.editContent form{display:inline;margin:0}.dialogButton{border-bottom:1px solid buttonshadow;border-right:1px solid buttonshadow;border-top:1px solid #fff;border-left:1px solid #fff;padding:1px 8px;margin-top:5px}.largeButton,.SF_input.SF_inlineButton{display:inline-block;font-size:11px;padding:9px 0!important;text-align:center;overflow:visible;color:#fff;outline:none;border-radius:2px;margin-left:12px;background:#4dc5c3;letter-spacing:1px;float:left;cursor:pointer}.largeButton img{width:16px;height:16px;vertical-align:middle;position:relative;top:-2px;margin-right:5px;margin-top:3px}.dialogArrow{font-weight:bold;font-size:16px}#fancyframe{border:0;width:410px;height:385px}#flashframe{border:0;width:450px;height:300px;overflow:hidden;margin-top:-9px}#message_div{position:absolute;z-index:1500;cursor:pointer;border-radius:3px;box-shadow:3px 3px 11px rgba(0,0,0,0.25)}#message_content{font-size:13px;margin:8px;overflow-y:auto;max-height:120px;letter-spacing:0}.errorMessage{background-color:#960000;cursor:pointer;filter:alpha(opacity=90);opacity:0.90;-moz-opacity:0.90}.logMessage{background-color:#009600;filter:alpha(opacity=90);opacity:0.90;-moz-opacity:0.90}html.boxshadow div.logMessage{border:1px solid #009600;color:#009600!important;background-color:rgb(173,224,173)}html.boxshadow div.errorMessage{border:1px solid #960001;color:#960000!important;background-color:rgb(241,174,174)}.simple_tooltip_observer{cursor:help}.simple_tooltip_observer_active{}.simple_tooltip_title{padding-top:2px;padding-bottom:1px;font-weight:bold;font-size:11px}.simple_tooltip{position:absolute;width:150px;z-index:10000;border:1px solid #696765;color:#696765;background-color:#fff;font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;font-size:11px;letter-spacing:1px;padding:4px 5px 5px 5px}.down_arrow_tip,.top_arrow_tip{background:rgba(69,77,85,0.86);color:white;border:0;border-radius:2px}.down_arrow_tip:after{top:100%;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none}.down_arrow_tip:after{border-color:rgba(69,77,85,0);border-top-color:rgba(69,77,85,0.86);border-width:5px;left:50%;margin-left:-5px}.top_arrow_tip{width:100px}.top_arrow_tip:after{bottom:100%;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none}.top_arrow_tip:after{border-color:rgba(111,123,136,0);border-bottom-color:rgb(111,123,136);border-width:5px;left:50%;margin-left:-5px}.arrow_tip_arrow_left:after{left:8%}.right_arrow_tip{color:#ffffff;border-radius:4px;background-color:rgba(69,77,85,0.86);border:0}.right_arrow_tip:after,.right_arrow_tip:before{left:100%;border:solid transparent;content:" ";height:0;width:0;position:absolute;pointer-events:none}.right_arrow_tip:after{border-color:rgba(69,77,85,0);border-left-color:rgba(69,77,85,0.86);border-width:5px;top:50%;margin-top:-5px}.right_arrow_tip:before{border-color:rgba(69,77,85,0);border-left-color:rgba(69,77,85,0.86);border-width:5px;top:50%;margin-top:-5px}div.accordion_toggle,div.dialogContentMainTitle{color:rgb(117,128,139);font-size:20px;margin-bottom:10px;border-bottom:1px solid rgb(117,128,139);padding-bottom:0}div.accordion_toggle{cursor:pointer;background-image:url('../images/Tplus.png');background-repeat:no-repeat;background-position-x:-6px;background-position-y:-3px;padding-left:15px;font-size:16px;margin-bottom:0;margin-top:10px;padding-bottom:2px;border-bottom:0}div.accordion_content div.dialogLegend{text-align:justify;color:rgb(117,128,139)}div.accordion_toggle_active{background-image:url('../images/Tminus.png')}div.accordion_content{overflow:hidden;padding:5px}div.oneFieldForm{margin-bottom:13px;background-color:#EEEEEE;padding:3px 6px;border-radius:4px;margin-top:10px}div.oneFieldForm input.SF_input{background:white!important}.pg_cancel_button{background-color:#C33;display:inline-block;border-radius:20px;-moz-border-radius:20px;-webkit-border-radius:20px;cursor:pointer;float:right;margin-right:8px;font-weight:bold;color:white!important;height:12px;width:8px;padding-left:4px;line-height:13px;font-size:7px;margin-top:2px}div.SF_element{padding-top:5px;clear:left}div.SF_disabled{color:#ccc;font-style:italic}div.SF_label{float:left;width:39%;text-align:right;padding-right:1%;padding-left:0;padding-top:5px;padding-bottom:8px;line-height:18px;font-size:12px}input.SF_fieldCheckBox{margin-top:7px!important}.no-flexbox div.SF_label{padding-right:3px!important}.SF_input{float:left;padding:2px 3px!important;width:54%!important;_width:54%!important}div.SF_element.SF_largeLabel>div.SF_label{width:56%!important;_width:54%!important}div.SF_element.SF_largeLabel>.SF_input{width:39%!important}div.SF_element.SF_largeLabel>input.SF_input.SF_number,input.SF_input.SF_number{width:30px!important;text-align:right}.SF_box{width:20px!important}.SF_fieldCheckBox{float:left;margin:5px}.SF_elementWithCheckbox>.SF_input{width:50%!important;_width:46%!important}.SF_inlineButton{margin:3px 0!important;padding:4px!important;background-image:url('../images/grid_tl.png')}.SF_inlineMonitoring{padding:7px 4px!important}.SF_inlineMonitoring.SF_inlineMonitoringWorking:after{content:" [reloading]"}.SF_inlineButton span[class^="icon-"]{margin-right:3px}.SF_inlineButton.SF_inlineButtonWorking{box-shadow:inset 1px 1px 0px rgba(0,0,0,0.35);padding-top:10px!important;padding-bottom:8px!important}.SF_failed{border:1px solid #D8B0B0!important}.SF_replicableGroup{background-color:#EEE;clear:both;position:relative;margin-bottom:5px;border-radius:5px}.SF_replication_Add,.SF_replication_Remove{display:block;width:20px;height:20px;background-image:url('../images/0.gif');background-repeat:no-repeat;background-position:5px 6px;position:absolute;bottom:0;left:0}.SF_replication_Remove{background-image:url('../images/1.gif');top:0}.SF_rgClear{clear:left;height:3px}.SF_image_block{max-width:80px;float:left}.SF_image.small{max-width:80px;max-height:80px}.SF_image_link{display:inline-block;width:80px;cursor:pointer;text-align:center}.accordion_toggle_failed{background-color:#D8B0B0!important}.SF_horizontal_labelRow{clear:both}.SF_horizontal_labelRow div.SF_label{float:left;text-align:left;padding:8px 5px 0 3px;margin-right:5px;text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.SF_horizontal_fieldsRow{clear:both}.SF_horizontal_fieldsRow input{float:left;margin-right:5px;font-size:13px;padding:3px 4px 3px 2px!important}.SF_horizontal_fieldsRow input.SF_number{text-align:left}.SF_horizontal_actions{float:left;padding:5px 2px;font-size:15px}.SF_horizontal_pastilles{float:left;padding:3px 2px;font-size:11px}.SF_horizontal_actions span{cursor:pointer;margin-right:0}.SF_horizontal_pastilles span{margin-right:10px}.SF_horizontal_action_destructive{color:#A00}.captcha_container{text-align:center}.captcha_container img{margin:5 0 0 2px;border:1px solid #ddd}#login_form,#login_form_dynamic{margin:0 53px;font-size:15px;padding-top:20px;padding-bottom:20px}#login_form div.SF_label,#login_form_dynamic div.SF_label{display:none}#login_form.no_placeholder div.SF_label,#login_form_dynamic.no_placeholder div.SF_label{display:block;text-align:left;padding:0 4px}#login_form.no_placeholder div.SF_input,#login_form_dynamic.no_placeholder div.SF_input{clear:left}#login_form div.SF_input>input,#login_form_dynamic div.SF_input>input{width:200px!important;padding:4px!important;font-size:17px}.ajxp_login_error{margin-top:10px;font-size:14px!important;background-color:transparent!important;color:rgb(219,0,0)!important;border:1px solid rgb(216,0,0);padding:7px!important}.ajxp_password_auth div.SF_element:first-of-type{display:none!important}.centeredWidth{}#global_toolbar{background-color:#474E50;height:30px;padding:12px 0 4px 5px!important;box-shadow:0 0 8px rgba(0,0,0,0.4)}#top_toolbar{float:right}#workspace_toolbar{padding-top:11px;height:53px;overflow:hidden}#simple_repository_label{float:left;width:23%;padding:0 0 0 17px;height:53px;font-size:25px;color:rgb(111,121,131)}#simple_repository_label div.repository_title{white-space:nowrap;text-overflow:ellipsis;overflow:hidden}#simple_repository_label div.repository_legend{font-size:13px}#toolbars{}.toolbars_separator{border-bottom:1px solid #fff;border-top:1px solid buttonshadow}.toolbar_title{font-size:15px;font-weight:bold;color:#ddd}#tree_container{background-color:#ebedf0;border-left:1px solid rgb(172,178,184);border-right:1px solid rgb(172,178,184)}.panelHeader,.dialogTitle{border:none;font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue-Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;font-size:12px!important;padding:5px 2px 5px 9px;color:rgb(255,255,255);vertical-align:middle;background-color:rgb(138,149,160);letter-spacing:1px;;border-bottom:2px solid rgb(111,123,136)}.dialogTitle{border-radius:2px 2px 0 0;background-color:#4dc5c3;border-bottom:1px solid rgb(67,156,155)}#sidebar_splitter div.panelHeader,#search_panel div.panelHeader{}#search_panel div.panelHeader{cursor:move}.action_bar{font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;font-size:12px;padding:0;line-height:15px}.action_bar.editor_action_bar{height:37px;background-color:transparent;border-bottom:0 solid rgb(138,149,160);right:29px;position:absolute;z-index:10}#codemirror_box div.action_bar.editor_action_bar{right:0;border-bottom:1px solid rgb(138,149,160);padding-left:10px}.action_bar.editor_action_bar div.separator{display:none}span[message_id="Text Search"]{display:none}div.editor_header{height:auto}div.editor_header>div.editor_action_bar{position:absolute;right:20px;padding-right:8px;background:none;padding-top:15px;height:42px;padding-left:10px}.ajxp_theme_vision div.editor_header>div.editor_action_bar{border-bottom:0}div.editor_header>div.editor_action_bar>div.separator{display:none!important}.editor_action_bar a{padding:3px 5px!important}.editor_action_bar span.actionbar_button_label{font-size:11px!important;font-weight:bold}div.editor_header>span.header_label{color:rgb(111,123,136);font-size:24px;width:100%;padding:15px 0 0 62px;display:inline-block;background-image:url('../images/mimes/64/user-acl.png');background-size:40px;background-repeat:no-repeat;background-position:14px 9px;text-shadow:1px 1px 5px black;overflow:visible}.ajxp_theme_vision div.editor_header>span.header_label{text-shadow:none}.action_bar.text_only{line-height:16px;height:38px}.action_bar.icons_only{height:40px;line-height:0}.action_bar{overflow:hidden}.action_bar.floatingBar{position:absolute;border-radius:20px;padding-right:10px;padding-left:10px;cursor:move;opacity:0.90;background-color:rgb(138,149,160)}.action_bar span.actionbar_button_label{cursor:pointer;display:inline-block;padding:4px 3px 3px;font-size:12px}div.action_bar.icons_only span.actionbar_button_label{display:none}div.action_bar.text_only span.actionbar_button_label{font-size:11px}.action_bar div.actionbar_arrow_div{position:absolute;top:10px;right:-3px}.action_bar.icons_only div.actionbar_arrow_div{position:absolute;top:23px;right:6px}.action_bar.icons_only div.actionbar_arrow_div img{height:6px;width:10px}#buttons_bar{padding-left:0;padding-top:5px;overflow:hidden;padding-bottom:6px}.action_bar a{display:inline-block;font-size:11px;padding:5px 10px 7px 9px;text-align:center;overflow:visible;color:#fff;outline:none;border-radius:2px;margin:5px 2px 0 1px;background:#4dc5c3;letter-spacing:1px;float:left}.action_bar.icons_only a{padding-bottom:2px;padding-top:3px;padding-left:6px;padding-right:6px;margin-right:0;float:left;background-color:transparent;font-size:1.5em;display:inline-block;cursor:pointer;margin-left:0}.action_bar.text_only a{padding-bottom:3px;padding-top:2px;margin-top:5px}.action_bar span.ajxp_icon_span{font-size:1.3em;float:left;padding-top:3px}.action_bar a.menuAnchorSelected,.action_bar a:hover{}.action_bar.text_only a.menuAnchorSelected,.action_bar.text_only a:hover{margin-top:4px}.action_bar a.menuAnchorSelected{}.action_bar a img{margin:2px 5px 2px 0;display:none}div.action_bar.icons_only img.actionbar_button_icon{height:22px;width:22px;display:none}div.action_bar.icon_text img.actionbar_button_icon{height:12px;width:12px;float:left}div.action_bar.text_only a img{display:none}.action_bar a.separator,div.separator{border-left:1px solid #CCC;border-right:1px solid white;display:block;float:left;font-size:10px;height:100%;margin-left:2px;margin-right:2px;padding-top:0;text-align:center;width:0}a.carousel-control{border-left:1px solid #c4c7c1;border-right:1px solid #c4c7c1;border-bottom:1px solid #c4c7c1;display:block;float:left;font-size:10px;height:51px;padding-top:0;text-align:center;width:8px!important;margin:0!important;cursor:pointer;background-color:#fff}.FL-inlineToolbar{text-align:left}div.FL-inlineToolbar.FL-inlineToolbarUnique{display:none}div.selected div.FL-inlineToolbar.FL-inlineToolbarUnique{display:block}tr.selected div.FL-inlineToolbar.FL-inlineToolbarUnique,tr div.FL-inlineToolbar.FL-inlineToolbarMultiple{display:inline-block;position:absolute;top:0}div.FL-inlineToolbar a{margin:0 5px}div.FL-inlineToolbar a span.actionbar_button_label{margin-left:5px}.selected div.FL-inlineToolbar a{color:white}div.detailed div.FL-inlineToolbar a span.actionbar_button_label{display:inline-block!important}div.detailed div.FL-inlineToolbar{margin-left:50px;margin-top:2px}div.detailed div.FL-inlineToolbar div.toolbarGroup{min-width:400px}a.carousel-disabled{background-color:transparent}a.carousel-control img{}#content_pane{background-color:#fff}#content_pane div.panelHeader,#search_results div.panelHeader,div.class-FetchedResultPane>div.panelHeader{display:none}#topPane,#bottomSplitPane{border:0!important}#locationbar_cont{background-position:center center;background-repeat:repeat-x;height:33px;_height:32px;width:100%;-webkit-box-shadow:0 0 5px#bbb;-moz-box-shadow:0 0 5px#bbb;box-shadow:0 0 5px#bbb;clear:left}#locationBar{}#location_form,#repository_form{border-right-width:0;float:left;height:20px;padding:2px 0 0 4px}#location_form input,#repository_form input,#location_form div{background:transparent!important}#repository_form,#goto_parent{-moz-border-radius:5px 0 0 5px;border-radius:5px 0 0 5px}#repository_goto,#bookmarks_goto{-moz-border-radius:0 5px 5px 0;border-radius:0 5px 5px 0}#location_form{margin-left:0}#location_form div.location_bar_label{line-height:18px}#repository_form{width:112px}#location_form input,#repository_form input{margin:1px 0 0 0;_margin:0 0 1px 0;border:none;height:15px;width:325px;float:left}#repository_form img#repo_icon{float:left;vertical-align:top;display:none}#repository_form input{width:90px;margin-left:3px;color:#fff;letter-spacing:1px}#repo_chooser{float:right;color:#fff;font-size:12px;font-weight:normal;letter-spacing:1px;margin-right:13px;cursor:pointer}#repo_chooser.disabled{display:none}#repo_chooser span.icon-sitemap{font-size:1.0em;padding-right:5px;padding-top:5px;display:inline-block}#repo_chooser span.ws-label{display:inline-block;padding-top:0;line-height:20px}#repo_chooser span.icon-caret-down{display:inline-block;padding-left:3px}.inlineBarButton,.inlineBarButtonLeft,.inlineBarButtonRight{display:inline;height:22px;float:left;padding:0 1px;cursor:pointer}.inlineBarButtonLeft{border-left-width:0}.inlineBarButtonRight{border-right-width:0}.inlineBarButton img,.inlineBarButtonLeft img,.inlineBarButtonRight img{margin-top:3px;display:inline;border:0}.inline_hover_light,.user_widget_hover{}.inline_hover{}.inline_disabled img,.SF_disabled img{filter:alpha(opacity=30);opacity:0.3;-moz-opacity:0.3;cursor:default}img.simple_button_arrow{position:absolute;right:0;bottom:1px;display:none}.inline_hover>img.simple_button_arrow{display:block}#search_panel_button{padding:0 2px 0 3px}#logging_string{color:#fff;font-size:11px;float:right}#logging_string.disabled{display:none}#logging_string div.inlineBarButtonLeft{display:none}#logging_string i{font-style:normal;font-weight:normal;letter-spacing:1px}#logging_string i img{font-style:normal;cursor:pointer;margin-top:-12px;float:right;margin-left:10px}.user_widget_label{float:left;padding:3px 10px 12px 7px;cursor:pointer;font-size:12px;letter-spacing:1px}.user_widget_label.withImage{position:relative;padding:0}.user_widget_label.withImage i{font-weight:bold;display:inline-block;padding:3px 0 0 8px;font-size:12px}.user_widget_label.withImage i img{}img.user_widget_mini{vertical-align:middle;height:39px}.locationbar_title{display:inline;color:#5E7C90;font-size:15px;font-weight:bold;float:left}#current_path,#repo_path{border:none;height:20px;padding:0;padding-left:3px;padding-top:0;font-size:11px}#current_path{padding-left:0}#current_path:focus,#repo_path:focus{outline:none}.slider-pane{background-color:#ebedf0;padding:5px 2px;position:absolute;width:11px;z-index:10000;border-radius:2px;box-shadow:1px 1px 4px rgba(0,0,0,0.75)}.slider-handle,.slider-pane div.selected{background-image:url("../images/slider-handle-vert.png")!important;background-position:top center;background-repeat:no-repeat!important;background-color:transparent!important;height:15px;width:10px}.slider-tracker{background-image:url("../images/slider-track-bottom.png");background-position:bottom center;background-repeat:no-repeat}.slider-tracker-top{background-position:top center;background-repeat:no-repeat}div.header_resizer,div#search_meta{overflow:hidden;box-shadow:0 1px 1px rgba(0,0,0,0.35);opacity:0.85;max-height:26px}div.header_resizer div.header_cell{float:left;overflow:hidden;width:90px;white-space:nowrap;border:0!important;cursor:pointer}div.header_resizer div.header_label{font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;font-size:12px;padding:4px 5px 4px;background-color:rgb(255,255,255);color:rgb(104,120,136);letter-spacing:1px;border-bottom:0;height:18px;overflow:hidden}.header_cell span.ajxp-order-icon{display:none;float:right;padding-top:1px}div.header_resizer div.header_cell.ascending span.icon-caret-up{display:inline-block}div.header_resizer div.header_cell.descending span.icon-caret-down{display:inline-block}div.header_resizer div.header_cell.ascending div.header_label,div.header_resizer div.header_cell.descending div.header_label{background-color:rgb(231,231,231)}div.header_resizer div.resizer{float:left;width:1px;background-color:#ebedf0;height:26px;cursor:e-resize;border:0}div.header_resizer div.resizer_sortable{background-color:#fff}div.header_resizer div.dragging{background-color:#bbb;border-left:1px solid #bbb}div.resizeGhost{width:1px;border-right:1px solid #ccc;position:absolute;z-index:1000;opacity:0.7}div.sort-table-filter div.header_cell{border-right:1px solid #ccc!important;box-shadow:inset 1px 1px 1px rgba(0,0,0,0.37)}div.sort-table-filter div.header_cell:last-child{border-right:0!important}div.header_cell input[type="text"]{margin-left:0;width:96%;border:0;background:transparent}div.sort-table-filter{display:none}div.fl-showFilterPane div.sort-table-filter{display:block}div.fl-displayMode-list.fl-showFilterPane div.scroller_track{top:50px!important}#ws_legend label{font-size:16px!important}.sort-table{font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;font-size:10px}.sort-table thead{background-color:#aaa}.sort-table td{padding:7px 0}.no-flexbox.sort-table td{padding:3px 0}.sort-table thead td{background-color:#ddd;border-bottom:none;cursor:pointer;border-right:1px solid buttonhighlight;font-size:12px;color:#676965;padding:0;background-color:#f1f1ef;border-bottom:1px solid #676965}.sort-table thead td div{padding-left:7px;padding-top:3px;height:20px;overflow:hidden;white-space:nowrap}.sort-table thead td.descending{background-color:#daddd7;background-image:url("../images/arrow_up_margin.png");background-repeat:no-repeat;background-position:right center}.sort-table thead td.ascending{background-color:#daddd7;background-image:url("../images/arrow_down_margin.png");background-repeat:no-repeat;background-position:right center}#last_header{border-right:0px solid #ddd;widht:auto!important}#last_header:active{}.sort-table thead td:active{background-color:#c4c7c1}.column_resize_grabber{display:block;width:3px;float:right;height:23px;font-size:0;cursor:e-resize}.odd{}.selected{text-decoration:none}.selected-focus,.selected-focus span.text_label{color:#fff!important}.droppableZone,.thumbnail_selectable_cell.detailed.droppableZone{background-color:#c3d9ff!important}.paginator{background-color:#fff8d1;border-bottom-color:#dddddd;border-bottom-style:solid;border-bottom-width:1px;font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;font-size:11px;height:20px;padding-top:2px;text-align:center}.paginatorInput{width:21px;padding:0 2px;height:14px;text-align:right;border:1px solid #CCCCCC;margin-right:2px;margin-left:5px}div.multiple_selection_draggable{display:block;color:#000;background-color:#fff;padding:5px;border:1px solid #c3d9ff;font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif,sans-serif;font-size:12px;cursor:default;overflow:hidden;border-radius:3px}div.selection_ctrl_key{background-image:url('../images/0.gif');background-repeat:no-repeat;background-position:bottom right}a.disabled{filter:alpha(opacity=30);opacity:0.3;-moz-opacity:0.3}a.enabled{filter:alpha(opacity=100);opacity:1;-moz-opacity:1}.action_bar a.disabled:hover{cursor:default}.dialogBox div.action_bar a.disabled{filter:alpha(opacity=20);opacity:0.2;-moz-opacity:0.2}.action_bar a.disabled{filter:alpha(opacity=100);opacity:1;-moz-opacity:1}.action_bar a.disabled img,.action_bar a.disabled span{filter:alpha(opacity=30);opacity:0.3;-moz-opacity:0.3}#bm_bar_cont{}#bookmarks_bar{display:none;background-color:#fff;position:relative;width:86%;left:7%;height:25px;padding:0;padding-left:10px}#bmbar_title{color:#ddd;float:right;display:inline;font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif,sans-serif,Helvetica,Arial;font-size:15px;font-weight:bold}a.bookmark_button{text-decoration:none;padding-right:10px}#bookmarks_bar a{display:block;float:left}div.bm,div.bm_hover{filter:alpha(opacity=30);opacity:0.3;-moz-opacity:0.3;display:block;float:right;text-align:center;font-size:11px;padding:3px;margin-right:5px;font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif,sans-serif;color:#333}div.bm_hover{filter:alpha(opacity=100);opacity:1;-moz-opacity:1;text-decoration:none}.extendedMenu{float:none}div#upload_files_list,div#multiple_download_container{overflow:auto;height:210px;border:4px dashed rgb(221,221,221);text-align:left;-moz-border-radius:11px;border-radius:11px}.droparea{background:url("../../../../../../index.php?get_action=get_drop_bg")no-repeat scroll left bottom transparent;background-position:10px 100%}.dropareaHover{background-color:#c3d9ff!important}#uploader_chooser{width:100%}#uploader_chooser ul{margin:0;padding:0;list-style:none;display:block;position:relative;border-bottom:1px solid #77b8e2}#uploader_chooser li{display:inline-block;padding:12px 14px;border-radius:4px 4px 0 0;margin:8px 2px;margin-bottom:0;border-bottom:0;cursor:pointer;font-size:13px}#uploader_chooser li:hover{background-color:#f5f5f5;border-bottom:2px solid #f5f5f5}#uploader_chooser li.current:hover{}#uploader_chooser li.current{font-weight:bold;cursor:default;border-bottom:2px solid #77b8e2}#content_pane.dropareaHover{border-color:#D96252!important;border-style:dashed;background-color:white!important}div#uploader_options_pane{background-color:white;border-top:1px solid #CCCCCC;font-size:11px;height:59px;overflow:hidden;padding:7px 10px;text-align:left;display:none;margin-bottom:11px;border-bottom:1px solid #CCCCCC;box-shadow:inset 0px 1px 6px rgba(0,0,0,0.3);border-radius:2px;margin-top:2px}div#total_files_list{display:none!important}div#uploader_options_pane input{width:15px;margin-right:0;margin-left:0;margin-top:5px}div#upload_files_list div,div#multiple_download_container div{overflow:hidden;padding-top:10px;padding-bottom:10px;padding-left:14px;position:relative;font-size:13px;background-image:url('../images/dl_bg.png');background-repeat:no-repeat;background-size:0%100%;border-bottom:1px solid rgb(227,229,233);color:#5C5C5C}div#upload_files_list span.item_relative_path{color:#ccc;margin-left:15px;font-size:0.8em}#upload_files_list img{margin-right:6px}#upload_files_list img.fakeUploadButton{display:none}#upload_files_list div a{color:#ddd;font-style:italic}#upload_files_list span.statusText,#upload_files_list span.percentText{font-size:10px;display:inline-block;padding:0 6px;color:#cccccc}#upload_files_list span.statusText.new,#upload_files_list span.statusText.loaded{display:none}#upload_files_list span.icon-remove-sign{color:#ccc;display:block;float:right;margin-right:10px;cursor:pointer}#upload_files_list span.icon-remove-sign:hover{color:#d00}#multiple_download_container div a{display:block}#multiple_download_container div a:hover{text-decoration:none;color:#aaa}#fileInputContainer{position:relative}#fileInputContainerDiv{margin:0;padding:0;position:relative;overflow:hidden;vertical-align:top;height:60px;width:167px;cursor:pointer}#fileInputContainer input{filter:alpha(opacity:0);opacity:0;moz-opacity:0;position:absolute;font-size:60px;top:0;left:0;z-index:10000;height:56px;cursor:pointer!important}#fileInputPos{text-align:left;height:60px;width:180px;position:absolute;top:0;overflow:hidden;z-index:9999;cursor:pointer}#uploaderTextActions{position:absolute;bottom:6px;right:8px;color:rgb(203,204,206)}#uploaderTextActions span{cursor:pointer}#uploaderTextActions span:hover{color:#5C5C5C}.fakeUploadButton{width:151px;padding-top:6px;padding-bottom:6px;border:1px solid #ccc;text-align:left;vertical-align:middle;font-size:1.4em;margin-bottom:5px;cursor:pointer;color:#667;font-weight:normal;-moz-border-radius:3px;border-radius:3px;background-color:#ebedf0;box-shadow:inset 1px 1px 0 white}.fakeUploadButton.disabled{-moz-opacity:0.5;opacity:0.5;filter:alpha(opacity=50);cursor:default}.fakeUploadButton img{margin-bottom:3px}.fakeOptionButton{padding-top:3px;padding-bottom:3px;margin-bottom:0;margin-top:5px;background-position:center;-moz-border-radius:5px;border-radius:5px}#uploadBrowseButton{position:absolute;top:0;left:0;margin:0}#uploadBrowseButton span.icon-desktop{font-size:2em;display:block;float:left;padding:2px 7px}#uploadSendButton{}#uploaderTextActions span.disabled{display:none}#uploadFilesListContainer{vertical-align:top;font-size:11px;letter-spacing:1}.scroller_track{position:absolute;width:7px;background-color:transparent;cursor:ns-resize;right:0;z-index:1000;opacity:0.7;padding-right:1px}.flexbox div.scroller_track{top:0;bottom:0}div#folder_pane{position:relative}.scroller_handle{-webkit-border-radius:5px;border-radius:5px;background:rgb(190,190,190)!important;transition:background-color 0.3s ease}.scroller_handle:hover{background:rgb(110,110,110)!important}#panelsToggle{height:23px;cursor:pointer}div.tabulatorContainer{padding:0;height:28px;overflow:hidden;border-radius:0}#topPane>div.tabulatorContainer{border-radius:0}#cpane_tabs>div.tabulatorContainer{border-left-width:1px;border-left-style:solid;border-left-color:rgb(111,123,136)}div.tabulatorContainer div#display_toolbar{min-width:0;padding-top:6px;padding-right:6px}#info_panel div#display_toolbar{float:left;text-align:left;min-width:20px;height:10px}#info_panel div#display_toolbar a{background:none;border:none;margin-right:0}span.toggleHeader{display:inline-block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;padding:6px 6px;background-color:rgb(111,123,136);transition:background-color 0.3s ease}span.toggleHeader.toggleInactive{background-color:transparent;font-size:0.9em;cursor:pointer}span.toggleHeader span[class^="icon-"],span.toggleHeader span[class*=" icon-"]{margin-right:4px}div.tabulator-vertical div{display:none}div.tabulator-vertical div.tabulatorContainer{display:block;height:100%}div.tabulator-vertical div.toolbarGroup{display:block;height:24px;font-size:1.4em}div.tabulatorContainer.icons_only span.tab_label{display:none}div.tabulatorContainer.icons_only span[class^="icon-"],div.tabulatorContainer.icons_only span[class*=" icon-"]{display:inline;font-size:1.2em}div.tabulatorContainer.icons_only div.toggleInactive span[class^="icon-"],div.tabulatorContainer.icons_only div.toggleInactive span[class*=" icon-"],div.tabulatorContainer.icons_only div.toolbarGroup span[class^="icon-"],div.tabulatorContainer.icons_only div.toolbarGroup span[class*=" icon-"]{display:inline;font-size:1em}div.tabulatorContainer span.tab_close_button{margin-left:6px;cursor:pointer}div.tabulatorContainer span.toggleInactive span.tab_close_button{color:rgb(111,123,136)}div.tabulatorContainer span.toggleInactive span.tab_close_button:hover{color:#ffffff}.panelHeader.panelHeaderWithIcon{position:relative}.panelHeader img{display:none}.panelHeader img.panelHeaderCloseIcon{left:auto;right:6px;cursor:pointer}#search_panel{}#search_div{}#search_container{}#search_form,#search_state{padding-left:10px;padding-top:11px;width:100%}#search_form{float:right;text-align:right;padding-right:11px;height:34px;overflow:hidden}#search_form a{display:inline-block;width:18px;cursor:pointer;margin-right:0;margin-left:5px;padding:1px;font-size:1.4em;padding-top:3px;color:rgb(138,149,160)}#search_form a.disabled{display:none}#search_form a img{margin-top:2px;vertical-align:top;display:none}#search_form input{float:none!important;margin:0;height:25px;border-color:rgb(138,149,160);background:#fff;font-size:1.2em;color:rgb(138,149,160);padding-left:6px;border-width:1px;width:70%}#search_meta{font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;font-size:11px;padding:0;background-color:rgb(255,255,255);color:rgb(143,162,182);letter-spacing:1px;border-bottom:1px solid rgb(194,196,199);max-height:200px!important;box-shadow:none!important;height:25px!important;-webkit-transition-property:height;-webkit-transition-duration:0.1s;-webkit-transition-timing-function:ease-in-out;-moz-transition-property:height;-moz-transition-duration:0.1s;-moz-transition-timing-function:ease-in-out;transition-property:height;transition-duration:0.1s;transition-timing-function:ease-in-out;position:relative}#search_meta.toggle_open{height:200px!important}#search_meta input.c3,#search_meta span.c3{width:21%;margin-left:0;margin-right:0;border:1px solid #ACB2BB;background-color:#ffffff;padding:2px 3px}#search_meta input.c3:disabled{opacity:0.35}#search_meta span.c3{cursor:pointer}#search_meta input.c3:focus{background-color:white}#modiftime_fixed_radio span.c3{border-right-width:0!important}#modiftime_fixed_radio span.c3:last-of-type{border-right-width:1px!important}#search_meta span.c3.selected{background-color:rgb(138,149,160)!important;color:white}#search_meta span.c4{display:inline-block;width:18%;text-align:left}#search_meta span.c6{display:inline-block;width:14%;text-align:center}.advanced_search{}#basic_search{padding:4px;height:17px;width:350px}#search_meta.toggle_open#basic_search{border-bottom:1px solid rgb(143,162,182)}#search_meta_detailed{padding:10px 5px;line-height:28px;overflow:hidden;background-color:rgba(235,237,240,0.36)}#search_meta span.toggle_button{float:right;display:inline-block;padding:2px 5px;border-radius:3px;background-color:#4dc5c3;cursor:pointer;color:white}#search_meta span.toggle_button.close,#search_meta.toggle_open span.toggle_button.open,#search_meta.toggle_open span#search_meta_options{display:none}.search_label.open,.search_label.close{display:inline-block;padding:2px;height:20px}.search_label.close{display:none}#refresh_search_button{cursor:pointer}#search_meta.toggle_open span.search_label.open{display:none}#search_meta.toggle_open span.search_label.close{display:inline-block}#search_meta.toggle_open span.toggle_button.close,#search_meta span.toggle_button.open{display:inline-block}#search_meta div.advanced_search_section{padding:5px 5px 15px 17px;line-height:29px;display:none}#search_meta div.advanced_search_section.visible{display:block}#search_meta div.advanced_search_section_title{border-bottom:1px solid;padding-bottom:6px;line-height:9px;margin-bottom:7px;cursor:pointer}.searchScore{float:right;color:#CCC;font-size:10px;font-style:italic}.searchUnindex{}span.search_meta_opt{cursor:pointer}span.search_meta_opt>span{display:none}span.search_meta_opt.checked>span{display:inline}#search_results_cont{display:none;position:absolute;z-index:1010;border:1px solid rgb(138,149,160);border-radius:4px;box-shadow:1px 10px 40px rgba(0,0,0,0.5);background-color:#ebedf0}#search_results{margin-left:0;width:350px;font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif}.close_results.icon-remove-sign{float:right;display:inline-block;padding:2px 5px;cursor:pointer}#search_results em{color:red;font-style:normal}div.class-FetchedResultPane{background-color:#ebedf0;border-left:1px solid rgb(187,187,187)}#search_results div.ajxpNodeProvider,div.class-FetchedResultPane div.ajxpNodeProvider{cursor:pointer;background-color:transparent!important;border-bottom:1px solid #ffffff}#search_results div.ajxpNodeProvider:hover,div.class-FetchedResultPane div.ajxpNodeProvider:hover{background-color:transparent!important}div.class-FetchedResultPane div.ajxpNodeProvider.selected-focus,#search_results div.ajxpNodeProvider.selected-focus{background-color:#59F!important}div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed div.thumbLabel,#search_results div.thumbnail_selectable_cell.detailed div.thumbLabel{font-size:14px;padding-top:4px}div.class-FetchedResultPane div.thumbnail_selectable_cell.detailed span.text_label,#search_results div.thumbnail_selectable_cell.detailed span.text_label{padding-top:0}#no-results-found{text-align:center;margin-top:10%}.infoPanelActions{padding:5px;font-size:11px;text-align:right}#info_panel span[data-ajxpAction]{float:right;display:inline-block;padding:3px;cursor:pointer}#info_panel div.panelContent{overflow:hidden;background-color:#ebedf0;font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;border-left:1px solid rgb(172,178,184);border-right:1px solid rgb(172,178,184);padding-bottom:15px}#info_panel div.panelHeader.panelHeaderWithIcon{background-color:#4dc5c3;border-bottom:2px solid #399997;-webkit-transition-property:height;-webkit-transition-duration:0.2s;-webkit-transition-timing-function:ease-out;-moz-transition-property:height;-moz-transition-duration:0.2s;-moz-transition-timing-function:ease-out;transition-property:height;transition-duration:0.2s;transition-timing-function:ease-out;padding-left:6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;border-radius:0}#info_panel.folded div.panelHeader{height:100%}#info_panel.folded div.panelHeader a{font-size:1.4em}#info_panel.folded{}#info_panel.folded span[ajxp_message_id]{display:none}#info_panel div.folded_icons{display:none}#info_panel.folded div.folded_icons{display:block;position:absolute;top:29px;left:0px;background-color:#399997;width:27px;height:100%}#info_panel.folded div.folded_icons span{display:block;margin:10px 0 21px 0;font-size:13px;text-align:center}#info_panel.folded div.folded_icons span.clickable{cursor:pointer}div.foldedPanel_tooltip{width:210px!important;background-color:#399997;border-radius:2px;border-width:0;box-shadow:none;min-height:35px}div.foldedPanel_tooltip:after{content:"";position:absolute;width:0;height:0;border-width:7px;border-style:solid;border-color:transparent transparent transparent#399997;top:15px;left:220px}div.foldedPanel_tooltip td{color:white;font-size:11px}#info_panel a{display:inline-block;padding:4px 8px;border:1px solid #ddd;border-radius:3px;margin-right:10px;margin-bottom:6px;font-size:11px;letter-spacing:1px;background-color:#eee}#info_panel a:hover{}#info_panel a img{margin-right:5px}#info_panel a:hover{text-decoration:none}#info_panel div.folderImage{text-align:center;padding-bottom:10px}.infoPanelTable{font-size:12px;width:100%;color:rgb(111,121,131)}td.infoPanelValue{padding:6px}.panelContent.scrolling td.infoPanelValue{padding-right:18px}td.infoPanelLabel{padding:7px 6px;width:35%;text-align:right;color:#555;vertical-align:top}div.infoPanelLabel,div.infoPanelValue{font-size:12px;padding:7px 6px;float:left}div.infoPanelLabel{color:#555;text-align:right;width:32%}div.infoPanelValue{width:55%;color:rgb(111,121,131);min-height:22px}.infoPanelGroup{border-radius:0;padding:1px}.panelContent div.panelHeader{font-size:12px;padding:6px 7px;background-color:rgba(138,149,160,0.65)!important;border-bottom:0!important;clear:left}.panelContent.scrolling div.panelHeader{padding-right:13px}.infoPanelImagePreview{width:100%;text-align:center;padding:10px 0}.infoPanelImagePreview img{}div.double div.infoPanelAllMetadata>div{float:left;margin:1%;width:48%}div.triple div.infoPanelAllMetadata>div{float:left;margin:1%;width:31%}#browser{clear:left;background-color:#fff;line-height:18px}div.selectable_div,.table_rows_container,#tree_container,#bottomSplitPane,.ajxp_simple_container{font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;font-size:12px}.table_rows_container td{border:0}.table_rows_container tr:nth-child(even)>td{border-top:0;border-bottom:0}.table_rows_container tr:first-child td,.infoPanelTable tr:first-child td{border-top:0}.table_rows_container tr:last-child td{border-bottom:0}.infoPanelTable tr:last-child td{border-bottom:0}.table_rows_container tr.selected-focus td,.infoPanelTable tr.selected-focus td{}.table_rows_container tr:hover,.table_rows_container tr.even:hover{background-color:rgb(253,252,228)}.no_select_bg::selection{background:transparent}.no_select_bg::-moz-selection{background:transparent}#vertical_splitter{overflow:hidden}#sidebar_splitter{overflow:auto;width:200px;background-color:#D2DFE9;-webkit-box-shadow:rgb(153,153,153)1px 1px 5px inset;-moz-box-shadow:rgb(153,153,153)1px 1px 5px inset;box-shadow:rgb(153,153,153)1px 1px 5px inset}.splitterContentPane{border:1px solid #676965}.vsplitbar{width:3px;z-index:10}.vsplitbar:hover{background-image:url(../images/vgrabber.gif);background-repeat:no-repeat;background-position:center;background-color:#474E50}.vsplitbar.active{background-color:#474E50}.hsplitbar.folded,.vsplitbar.folded{opacity:0;cursor:default!important}.vsplitbar:hover{}.hsplitbar{height:4px;background-image:url(../images/hgrabber.gif);background-repeat:no-repeat;background-position:center}.hsplitbar.active{background-color:#474E50}.hsplitbar:hover{}#splashScreen{width:430px;height:332px}#docFileIframe{border-bottom:1px solid #AAAAAA;height:300px;left:0;position:relative;top:0;width:100%}#adminIFrame{border:1px solid white;width:641px;height:390px;background-color:#fff}#users_list,#repo_list{height:299px;width:200px;float:left;padding-top:5px;overflow:auto}#users_detail_panel,#repo_detail_panel{width:438px;height:299px;float:left;border-left:1px solid #bbb;overflow:auto}#repo_list{height:294px}#repo_detail_panel fieldset{margin:10px;font-size:13px}.metaPane{margin-bottom:5px;margin-top:2px;padding:6px 5px 8px;width:96%}.metaPane img,img.metaPaneTitle{float:right;cursor:pointer;margin-left:3px}img.metaPaneTitle{display:none}div.accordion_toggle_active img.metaPaneTitle{display:inline}.metaPane span.title{font-weight:bold}.users_list_title{font-size:20px;font-weight:bold;color:white;padding-left:5px;border-bottom:1px solid white;background-color:#bbb}.user{padding-top:15px;padding-left:5px;padding-bottom:15px;background-color:#fff;border-top:1px solid #fff;border-bottom:1px solid #fff;border-left:1px solid #fff;margin-left:5px}.user_id,.user_data,.repository,.password{font-size:11px}.wallet_pane{margin-left:2px;margin-right:2px;padding:0 10px 0 0}.wallet_pane div.driver_form{width:215px}.wallet_pane input.dialogButton{float:right;border:1px solid #676965}.config_subblock{border:1px dotted#ccc;padding:5px 10px;margin-bottom:10px}.user_data{background-color:#fff}fieldset{border:1px solid #ccc;padding:10px;padding-top:5px;margin-bottom:5px}legend{color:#5C5C5C}legend a{text-decoration:none;cursor:pointer}legend a.active{background-color:transparent;color:#87A9C4;text-decoration:none;cursor:default;font-size:1.1em}.repository,.repository td,.password td{padding:1px}.repository td{vertical-align:bottom;line-height:19px;padding:6px 0 5px 6px}.repository input,.user_delete_confirm{border:none;margin-left:1px;margin-top:0;padding:0}.user_data{padding:10px}.user_id{cursor:pointer;font-size:17px}.user_id b{color:#5C5C5C}#user_admin_bar,#repo_create_form,#log_chooser{padding:15px;font-size:12px;border:0 solid #ddd;background-color:#ddd;border-bottom:1px solid #bbb}#user_admin_bar input,.password input{height:18px;width:90px;font-size:12px;padding:0;margin-left:0;margin-right:5px}#user_admin_bar.submit_button,.password.submit_button,#options_pane.submit_button,.password.submit_button{width:30px}#user_admin_bar b,#repo_create_form b,#log_chooser b{font-size:15px;color:#5C5C5C}#user_pref_form input{width:65px;padding:0;margin-right:5px}#user_pref_form input.radio{width:20px;border:0;background-image:none}#repo_create_form select{border:1px solid #5E7C90;height:20px;width:160px}#user_acl{font-size:1.1em}div#available_roles,div#user_roles{padding:0;border:1px solid #aaa;width:100%;height:110px;overflow:auto;border-radius:3px}div#rights_pane{border:1px solid #aaa;_height:150px;max-height:150px;overflow:auto;margin-top:5px;padding:2px 0;width:100%}div.ajxp_role{background-color:#FFFFFF;border-left:7px solid #DDDDDD;cursor:move;margin:2px;padding:3px 5px;border-radius:2px}div.available_role{}div.user_role{opacity:1!important;-moz-opacity:1!important;filter:alpha(opacity=100)!important}.roles_hover{border:1px solid #ffffef}.editable_users_list{border:1px solid #AAAAAA;height:190px;overflow:auto;clear:left;position:relative;margin-top:2px;border-radius:3px}.editable_users_list div.user_entry,li.complete_user_entry,li.complete_group_entry,li.complete_user_entry_temp{clear:left;background-color:rgba(255,255,255,0.7);border-bottom:1px solid #F1F1EF;font-size:12px;padding:1px}div.editable_users_list div.user_entry_rights{float:right;padding-top:8px;padding-right:4px}.no-flexbox div.editable_users_list div.user_entry_rights{padding-top:4px}li.complete_user_entry,li.complete_group_entry,li.complete_user_entry_temp{padding:1px!important}.editable_users_list div.user_entry span.user_entry_label,li.complete_user_entry span.user_entry_label,li.complete_group_entry span.user_entry_label,li.complete_user_entry_temp span.user_entry_label{display:inline-block;padding:8px 5px 8px 30px!important;background-image:url("../images/mimes/16/user.png");background-repeat:no-repeat;background-position:6px 7px}li.complete_user_entry{}li.complete_group_entry span.user_entry_label,.editable_users_list div.group_entry span.user_entry_label{background-image:url("../images/mimes/16/users-folder.png")}li.complete_user_entry_temp span.user_entry_label,.editable_users_list div.user_entry_temp span.user_entry_label{background-image:url("../images/mimes/16/user_shared.png")}.editable_users_list span.delete_user_entry{width:12px;height:12px;display:inline;background-size:100%;margin-left:5px;cursor:pointer;color:#A00}.editable_users_list label{padding:0 3px;cursor:pointer}span.user_entry_check{display:inline-block;padding:0 5px}.editable_users_list.user_entry_check_hidden span.user_entry_check{display:none}#create_shared_user{width:84%;background-color:#EEE;margin:0 6%;box-shadow:0 0 7px#5C5C5C;padding:1px 4px;border-radius:0 0 7px 7px;position:absolute;top:-1px}#create_sub_user{padding:8px 14px}.editable_users_header{float:right;margin-top:2px;font-style:italic;font-size:9px;color:#AAA;padding:2px}.editable_users_header span,div.user_entry span.cbContainer{display:inline-block;padding:0 2px;width:30px;text-align:center;cursor:pointer}div.editable_users_header.autocomplete_readonly{display:none!important}input.autocomplete_readonly{display:none}div.autocomplete_readonly span.delete_user_entry{display:none!important}.share_chooser_list li.selected{color:#555555}#share-folder-minisite-public_button.disabled,#share-file-minisite_button.disabled{display:none}input.share_info_panel_link{width:98%!important;margin-left:0;font-size:16px;height:16px;padding:5px 2px}#ajxp_shared_info_panel>div.infoPanelTable{margin:3%;width:94%}#share_folder_form div.SF_element>div.SF_label{float:none;text-align:left;padding:0}#share_folder_form div.dialogContentMainTitle{margin:20px 0 0}#share_folder_form div.SF_element>input.SF_input,select.minisite_layout_selector{width:96%!important}div#share-folder-type-chooser{font-size:13px;margin:0 6px;line-height:25px}.share_leaf div.no_share_leaf,.share_leaf span.no_share_leaf,div.only_share_leaf,span.only_share_leaf{display:none!important}.share_leaf div.only_share_leaf{display:block!important}.share_leaf span.only_share_leaf{display:inline!important}input#shared_user{width:370px!important}div#target_repository_toggle{display:none!important}.share_edit div#target_repository_toggle{display:block!important;width:400px}.share_edit div#target_repository_toggle span{display:inline}.share_edit div#target_repository_toggle div.SF_horizontal_actions{text-align:right;margin-top:5px;margin-bottom:-20px;padding-right:0}.share_edit div#target_repository,.share_edit div#share-folder-type-chooser,.share_edit div#share-folder-type-leaf{display:none!important}.share_edit.edit_parameters div#target_repository,.share_edit.type-ws div#target_repository{display:block!important}#target_repository_toggle a{border-bottom:1px solid #555;cursor:pointer}#share_generate{height:40px}#share_generate div.largeButton{background-color:#4aCEB0}#shareDialogButtons{padding-top:30px;text-align:center}div#share_update{text-align:center;display:none!important}div#share_result div.non_macos,div#share_result div.macos_only{font-size:13px;padding:10px 0 0;text-align:center}.edit_parameters div#shareDialogButtons,.edit_parameters div#share_result{display:none}.edit_parameters div#share_update{display:block!important}#target_repository_toggle span.params_hide,.edit_parameters div#target_repository_toggle span.params_view{display:none!important}.edit_parameters div#target_repository_toggle span.params_hide{display:inline!important}.share_edit.type-ws span.params_hide,.share_edit.type-ws span.params_view{display:none!important}#shareDialogButtons div.largeButton,#share_update div.largeButton{padding:5px 15px 7px!important;display:inline-block;float:none}.share_edit.type-ws div#shareDialogButtons{padding-top:10px}.share_edit.type-ws div#shareDialogButtons div.largeButton,.share_edit.type-ws div#share_update div.largeButton{display:block;margin:8px 80px}#shareDialogButtons div.largeButton.destruct{background-color:#A00}.share_dialog_toggler{cursor:pointer}.share_dialog_toggler span.toggler_arrow{float:right;margin-right:5px;margin-top:3px;transform:rotate(270deg)}.share_dialog_toggler_closed span.toggler_arrow{transform:rotate(0deg)}.share_dialog_toggled{overflow:hidden;transition:height 0.5s ease}.share_dialog_toggled_closed{height:0!important;overflow:hidden}#editable_hash_link{margin:4px 10px;font-size:13px}#description_parameters{margin:5px 0}#editable_hash_parameters{margin:5px}#ws_shared_users_parameters{margin:0 5px;position:relative}#share_folder_form{max-width:400px}div.user_entry span.cbContainer{}textarea.editor{background-color:white;font-family:monospace;font-size:13px;line-height:16px}.diaporamaButton{filter:alpha(opacity=40);opacity:0.4;-moz-opacity:0.4}.diaporamaButtonActive,.diaporamaButton:hover{filter:alpha(opacity=100);opacity:1;-moz-opacity:1}#diaporamaMetadataContainer{background-color:#757575;font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif}#diaporamaMetadataContainer div.panelContent{background-color:#ebedf0;margin-right:3px}#diaporamaMetadataContainer div.infoPanelImagePreview{border-radius:7px}#diaporamaSplitter div.vsplitbar{background-color:#757575}#diaporamaMetadataContainer div.scroller_track{right:3px}#diaporamaMetadataContainer div.scroller_track,#diaporamaMetadataContainer div.scroller_handle{}#diaporamaMetadataContainer div.imagePreviewOverlay{background-color:rgba(0,0,0,0.2)!important;opacity:1!important}div.icons_only.diaporama_toolbar{height:33px!important;width:470px;max-width:80%}div.diaporama_toolbar div#diaporama_legend{display:none}div.diaporama_toolbar div#diaporama_input_boxes{margin-top:6px!important}div.autocomplete{position:absolute;width:250px;background-color:white;border:1px solid #bbb;margin:8px 0 0;padding:0;box-shadow:1px 2px 3px rgba(65,65,65,0.85);border-radius:0;max-height:180px;overflow-y:auto}div.autocomplete ul{list-style-type:none;margin:0;padding:0}div.autocomplete ul li.selected{background-color:#73a2d7!important}div.autocomplete ul li{list-style-type:none;display:block;margin:0;padding:7px;cursor:pointer}span.user_team_save{position:absolute;bottom:0;right:0;padding:3px 4px;background-color:rgba(0,0,0,0.53);border-radius:4px 0 0 0;color:white;font-size:12px;z-index:10;cursor:pointer}div.menu{position:absolute;top:0;left:0;font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;-moz-border-radius:5px;border-radius:2px;opacity:0.97}div.menu a{display:block;text-decoration:none;cursor:default;outline:none;font-size:13px}.menu.separator{height:1px;padding:0;overflow:hidden;display:block;font-size:1px}.menu ul,.menu li{margin:0;padding:0;list-style:none;overflow-x:hidden}.menu li{list-style-position:outside}.menu.desktop{width:10em;padding:0;padding-top:0;padding-bottom:1px;letter-spacing:1px;background-color:#ffffff}.menu.desktop.toolbarmenu{background:#4dc5c3;padding-bottom:0;width:auto;width:expression("150px");-moz-border-radius:0 5px 5px 5px;border-radius:0 2px 2px 2px}.menu.desktop.toolbarmenu.panelHeaderMenu{background:rgb(138,149,160)}.menu.desktop.toolbarmenu.panelHeaderMenu{background:rgb(138,149,160)}.menu.desktop.toolbarmenu.panelHeaderMenu.bmbarMenu{width:150px}.bmbarMenu div.moreActions{font-size:11px}.bmbarMenu div.moreActions span{cursor:pointer}.menu.desktop.toolbarmenu img{width:16px;height:16px}.menu.desktop.textual{width:7em}.menu.desktop.textual img{margin-right:6px}.menu.desktop ul,.menu.desktop li{margin:0;padding:0}.menu.desktop li{padding:0;overflow-y:hidden;color:rgb(123,134,145)}.menu.desktop.toolbarmenu li{height:auto;padding-top:1px;padding-bottom:0;color:white}.rootDirChooser li.menuTitle{color:rgba(77,197,195,1);padding:10px 8px 4px;text-align:left;font-size:22px;letter-spacing:1px}.menu li.menuTitle{display:none}.menu.rootDirChooser li.menuTitle{display:block}.menu.desktop.panelHeaderMenu li.menuTitle{display:block;font-size:12px;border-bottom:1px solid #ffffff;padding:7px;text-align:left;background-color:rgba(255,255,255,0.2)}.menu.desktop li.separator{padding:0;height:1px}.menu.desktop a img{margin-right:9px;margin-top:-5px}.menu.desktop span.ajxp_icon_span{font-size:1.1em;padding-right:5px}.menu.desktop a{color:rgb(123,134,145);padding:5px 8px 3px;margin:0;font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;font-size:12px;letter-spacing:1px;line-height:20px}.menu.desktop.toolbarmenu a img{margin-right:6px}.menu.desktop.toolbarmenu a{color:#fff;padding:8px 20px 5px 8px;margin:0;font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;font-size:11px}.menu.desktop.toolbarmenu.panelHeaderMenu a{color:#fff;padding:7px 11px 4px 8px;margin:0;font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;font-size:11px}.menu.desktop a.disabled{opacity:0.25;filter:alpha(opacity=25);zoom:1}.menu.desktop li.separator{border-bottom:1px solid #ebedf0;margin:1px 1px 0 1px;line-height:1px!important}.menu.desktop.toolbarmenu li.separator{border-bottom:1px solid #ffffff}.bookmarksMenu li.separator{border-bottom:1px solid #fff;margin:0 1px 0 1px;line-height:1px!important;padding:0;height:1px!important}.menu.desktop a.enabled:hover{background-color:#73a2d7;color:#fff}.menu.desktop li.menuAnchorSelected,.menu.desktop li.menuAnchorSelected a{background-color:#73a2d7;color:#fff!important}.rootDirChooser{font-size:11px;font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif;position:absolute;z-index:1500;width:250px!important;width:expression("250px");background-color:#474E50}.rootDirChooser span.ajxp_icon_span{display:inline-block;padding-right:5px;font-size:1.4em}.rootDirChooser img{border:0}.rootDirChooser a{display:block;padding:6px 5px 5px 6px;color:#fff;letter-spacing:1px}.rootDirChooser a img{margin-right:5px}.rootDirChooser a.disabled IMG{filter:alpha(opacity=30);opacity:0.3;-moz-opacity:0.3}.rootDirChooser span.rootDirTitle{display:block;font-size:12px;font-weight:bold;padding-top:1px;padding-left:5px;padding-right:50px;color:#ccc;border-bottom:0 solid #ddd;text-align:left;font-style:italic}.rootDirChooser a:hover,.bookmarksMenu a:hover,.bookmarksMenu a.hovered,.rootDirChooser a.hovered{background-color:rgba(200,219,223,0.21);box-shadow:inset 1px 1px 0 rgba(255,255,255,0.12);color:#fff}.rootDirChooser li.separator{border-top:1px solid rgba(255,255,255,0.98);margin:0 auto;line-height:1px!important;height:0!important;width:98%}.rootDirChooser li.separator.menuTitle{height:auto!important;line-height:14px!important;border-top:none;padding-top:7px!important;width:100%}.menu.menuDetails{}.menu.menuDetails a{line-height:17px;padding:10px 5px}.menu.menuDetails span.ajxp_icon_span{float:left;padding:3px 9px 23px 4px;font-size:18px}.menu.menuDetails span.menu_label{font-size:14px;display:block}.menu.menuDetails span.menu_description{display:block;letter-spacing:0;line-height:15px;font-size:11px;color:rgba(255,255,255,0.57);padding-top:2px}.menu.menuDetails img{display:none}.rightAlignMenu{width:180px!important}.rightAlignMenu a{padding:8px 5px 7px 20px;text-align:right;letter-spacing:1px}.rightAlignMenu a img{margin-right:0;margin-left:5px;float:right}.rightAlignMenu a img,.rightAlignMenu span.ajxp_icon_span{margin-right:0;margin-left:9px;display:inline-block;font-size:13px;float:right;margin-top:2px}.menuActions{position:absolute;right:0;top:1px;text-align:right;padding-right:3px!important;margin-top:5px!important}.menuActions a{width:18px;padding:1px;display:inline-block!important;filter:alpha(opacity=30);opacity:0.3;-moz-opacity:0.3;cursor:pointer!important;height:16px}.menuActions.moreActions{margin-top:0!important;z-index:1}.menuActions.moreActions span{color:#ffffff;cursor:pointer;width:16px;display:inline-block;text-align:left;font-size:1.2em;text-shadow:1px 1px 1px#676767}.menuActions a:hover{filter:alpha(opacity=100);opacity:1.0;-moz-opacity:1.0}div.menuActions img{display:none}.menuActions.icon-caret-right{padding-top:2px}.backgroundPanel{position:absolute;bottom:0;padding:3px 7px 4px 7px;font-size:11px;font-weight:bold;color:#fff;font-family:"HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif,sans-serif;background-color:#59f;z-index:10000;border-radius:3px 3px 0 0;width:15%;margin-left:45%;text-align:center}#docDiv div.title{font-size:13px;font-weight:bold}#docDiv div.subtitle{color:#5E7C90;font-size:25px}#docDiv a{color:#39C0BE!important;text-decoration:underline}.css_boxshadow,div.menu{-moz-box-shadow:5px 5px 40px rgba(100,100,100,0.5);-webkit-box-shadow:5px 5px 40px rgba(100,100,100,0.5);box-shadow:5px 5px 40px rgba(100,100,100,0.5)}.dialogBox,div.dialogBox.css_boxshadow{-moz-box-shadow:5px 5px 60px#222;-webkit-box-shadow:5px 5px 60px#222;box-shadow:5px 5px 60px#222}div.dialogBox div.dialogBox.css_boxshadow{border-radius:4px!important;border:0;width:96%;left:2%;top:19%;background-color:white}.no-flexbox div#mailer_message{width:380px!important}div.dialogBox div.dialogBox.css_boxshadow>div{background-color:transparent}div.dialogBox.form-login_form,div.dialogBox.form-login_form_dynamic{box-shadow:2px 2px 6px rgba(0,0,0,0.23);-webkit-box-shadow:2px 2px 6px rgba(0,0,0,0.23);-moz-box-shadow:2px 2px 6px rgba(0,0,0,0.23)}#progressBox{display:block;z-index:2002;top:20%;-moz-border-radius:5px;border-radius:5px;width:305px;padding:3px;display:block;top:30%;z-index:2002;left:40%;position:absolute;box-shadow:2px 2px 6px rgba(0,0,0,0.23);-webkit-box-shadow:2px 2px 6px rgba(0,0,0,0.23);-moz-box-shadow:2px 2px 6px rgba(0,0,0,0.23)}div.overlay.form-login_form,div.overlay.form-login_form_dynamic,div.overlay.form-switch_language_form{opacity:1!important;background-image:url('../images/grid_t.png');background-color:white!important}#webdav_main_access{font-size:20px;padding:5px;text-align:center;border-radius:3px;background-color:white;width:97%;margin-bottom:5px;color:rgb(111,121,131)}#perworkspace-urls-toggle{text-decoration:underline;cursor:pointer}#perworkspace-urls-toggle span{font-size:13px;margin:0 7px;text-decoration:none}#webdav_repo_list{height:200px;overflow:auto;border:1px solid #BBB}#webdav_repo_list div{padding:7px}#webdav_repo_list span{display:inline-block;width:24%}#webdav_repo_list input{width:73%}input#webdav_password{height:22px!important}.video-js-box{margin-left:10px!important}#cpane_tabs.video-js-box{margin-left:0!important}.video-js-box.vjs-fullscreen{margin-left:0!important}#video_container{margin:5px 20px 5px 10px!important}td.ip_geo_cell{padding-right:12px!important}.tabrow{list-style:none;margin:0;padding:0;line-height:24px;overflow:hidden;font-size:13px;position:relative;background-color:rgb(78,167,165);border-radius:0 3px 0 0}.tabpanes{background-color:#f8f8f8}.tabrow li{border:0;display:inline-block;position:relative;padding:9px 10px 9px;cursor:pointer;color:rgba(255,255,255,0.61);text-align:center;line-height:16px;margin:0}.tabrow li.selected{color:#ffffff;background-color:transparent!important}#sm2-container{position:absolute;top:-1000px}.toolbarGroup{display:inline-block}#put_toolbar div.separator{margin-right:10px}#display_toolbar{float:right;display:inline-block;min-width:60px;text-align:right}#display_toolbar a,#top_toolbar a{color:#fff;display:inline-block;padding:0 3px}#default_toolbar a span.ajxp_icon_span{margin-right:1px}#display_toolbar a:hover{color:rgb(253,252,228)}#display_toolbar a.disabled{display:none}#top_toolbar a{font-size:12px;padding:0 10px;letter-spacing:1px}#top_toolbar a span.ajxp_icon_span,#top_toolbar a span.ajxp_icon_arrow{font-size:1.0em;display:inline-block;padding:0 4px}#top_toolbar a img{display:none}#display_toolbar span.actionbar_button_label{display:none}#cpane_header{padding-bottom:4px;height:19px}#files_list_header,.innerTabulator div.panelHeader{font-size:11px;padding:5px 3px 3px 8px;height:18px;letter-spacing:1px;background-color:#FFFFFF;border-bottom:1px solid rgb(187,187,187);color:rgb(111,123,136);border-left:1px solid rgb(187,187,187);border-right:0}.innerTabulator div.panelHeader.tabulatorContainer{padding:0 0 0 0;height:26px}.innerTabulator span.toggleHeader{padding:4px 7px 4px 7px;border-right:1px dotted rgb(111,123,136);background-color:#ebedf0;color:rgb(111,123,136);font-size:11px}.innerTabulator span.toggleHeader.toggleInactive{background-color:white}#files_list_header>#display_toolbar a:hover,#files_list_header>#display_toolbar a,div.innerTabulator>div.tabulatorContainer>#display_toolbar a:hover,div.innerTabulator>div.tabulatorContainer>#display_toolbar a{color:rgb(111,123,136)!important}#cpane_tabs span.toggleHeader{padding:6px 10px}#cpane_tabs span.toggleInactive{border-right:1px dotted rgb(111,123,136)}#cpane_tabs span.toggleInactiveBeforeActive{border-right:0}.flat_tabulator div.panelHeader.tabulatorContainer{padding:0 0 0 0;height:34px;background-color:transparent;border-bottom:0}.flat_tabulator span.toggleHeader{padding:8px 10px 8px;font-size:13px;border-bottom:0 solid #399C9B;color:#ffffff;background-color:rgb(78,167,165);margin-right:1px;border-right:0;box-shadow:inset 0px 1px 0px rgba(255,255,255,0.26);border-radius:3px 3px 0 0}.flat_tabulator span.toggleHeader:first-of-type{background-color:rgb(111,123,136)!important}.flat_tabulator[data-ajxpTabsCount="1"]span.toggleHeader{}.flat_tabulator span.toggleHeader.toggleInactive{border-bottom:0;color:rgba(255,255,255,0.62);font-size:13px;background-color:rgba(78,167,165,0.5);box-shadow:none;padding-bottom:7px}div.flat_tabulator>div.tabulatorContainer>#display_toolbar a:hover,div.flat_tabulator>div.tabulatorContainer>#display_toolbar a{color:rgb(111,123,136)!important}div.flat_tabulator span.toggleInactive{}div.flat_tabulator span.toggleInactive span.tab_close_button{opacity:0.25}div.flat_tabulator span.toggleInactiveBeforeActive{}div.flat_tabulator>div:not(.tabulatorContainer){}.horizontal_tabulator div.tabulatorContainer{float:left;width:22%;padding:0;background-color:#ebedf0!important}.horizontal_tabulator span.toggleHeader{width:96%!important;text-align:center;padding:33px 0;background-color:#e35d52!important;color:#ffffff!important;border:0;display:block;margin:2%;border-radius:2px}.horizontal_tabulator span.toggleInactive{width:200px;border-width:0!important;background-color:transparent!important;color:rgb(111,123,136)!important;text-shadow:none;padding-bottom:33px!important}div.horizontal_tabulator>div:not(.tabulatorContainer){float:left;padding:0!important;width:78%}#breadcrumb{display:inline-block;overflow:hidden}#breadcrumb div.inner_bread{width:2000px}#breadcrumb span.icon-home{display:inline-block;font-size:1.3em}#breadcrumb span.icon-chevron-right{display:inline-block;padding:0 2px}#breadcrumb span.ajxp-goto{cursor:pointer}#breadcrumb span.ajxp-goto-refresh{display:none;text-decoration:none!important}#breadcrumb span.ajxp-goto:hover{text-decoration:underline}#breadcrumb span.ajxp-goto:hover span.ajxp-goto-refresh{display:inline-block;margin-left:3px;font-size:10px}#AjxpConnexion-loader{left:49%!important;top:7px!important;width:30px}#AjxpConnexion-loader img{height:6px}#ajxp_link_form span.icon-envelope-alt{font-size:1.3em}#ajxp_link_form img{display:none}.ipanel_no_selection_select,#no-results-found{color:rgb(180,184,190);text-shadow:1px 1px 0#ffffff}.ipanel_no_selection_select span.icon-info-sign{display:block;text-align:center;font-size:150px;padding:50px 0 20px}.ipanel_no_selection_select span.label{display:block;text-align:center;font-size:13px}.panelContent i{font-size:13px;font-style:normal;color:rgb(180,184,190);text-shadow:1px 1px 0#ffffff}.ipanel_no_selection_data{display:none}#webdav_password_form{padding-left:0!important}#buttons_bar a{padding-bottom:0;height:28px}#workspace_toolbar a#ls_button{display:none}#create_button{margin-right:0;border-radius:2px 0 0 2px;padding:0;height:33px!important}#create_button_label{display:none}#create_button span.ajxp_icon_arrow{display:none}#create_button span.icon-plus{padding:9px}#upload_button{border-radius:0 2px 2px 0}.custom_top_title{color:white}span.letter_badge{display:inline-block;float:left;width:32px;background-color:rgb(78,167,165);border-radius:34px;color:white;text-align:center;padding:7px 0;font-size:0.8em;font-family:"Open Sans Regular"}.rootDirChooser span.letter_badge{display:none}#action_instance_user_create_repository{font-size:14px;line-height:21px}@-webkit-keyframes rotate{from{-webkit-transform:rotate(0deg)}to{-webkit-transform:rotate(360deg)}}@-moz-keyframes rotate{from{-moz-transform:rotate(0deg)}to{-moz-transform:rotate(360deg)}}@-ms-keyframes rotate{from{-ms-transform:rotate(0deg)}to{-ms-transform:rotate(360deg)}}@-o-keyframes rotate{from{-o-transform:rotate(0deg)}to{-o-transform:rotate(360deg)}}.rotating,.icon-spinner{-webkit-transform-origin:50%50%;-webkit-animation-name:rotate;-webkit-animation-duration:1.0s;-webkit-animation-iteration-count:infinite;-webkit-animation-timing-function:linear;-moz-transform-origin:50%50%;-moz-animation-name:rotate;-moz-animation-duration:1.5s;-moz-animation-iteration-count:infinite;-moz-animation-timing-function:linear;-ms-transform-origin:50%50%;-ms-animation-name:rotate;-ms-animation-duration:1.5s;-ms-animation-iteration-count:infinite;-ms-animation-timing-function:linear;-o-transform-origin:50%50%;-o-animation-name:rotate;-o-animation-duration:1.5s;-o-animation-iteration-count:infinite;-o-animation-timing-function:linear}.icon-spinner{display:block!important;text-align:center}.icon-spinner.spinner_large{font-size:22px}.events_menu span.icon-spinner{display:block!important;text-align:center;width:14px!important;height:16px!important;float:left}.rect_spinners{margin:30px auto;width:50px;height:35px;text-align:center;font-size:10px}.rect_spinners>div{background-color:#00A790;height:100%;width:6px;display:inline-block;margin-right:2px;-webkit-animation:stretchdelay 1.2s infinite ease-in-out;animation:stretchdelay 1.2s infinite ease-in-out}.rect_spinners div.rect2{-webkit-animation-delay:-1.1s;animation-delay:-1.1s}.rect_spinners div.rect3{-webkit-animation-delay:-1.0s;animation-delay:-1.0s}.rect_spinners div.rect4{-webkit-animation-delay:-0.9s;animation-delay:-0.9s}.rect_spinners div.rect5{-webkit-animation-delay:-0.8s;animation-delay:-0.8s}@-webkit-keyframes stretchdelay{0%,40%,100%{-webkit-transform:scaleY(0.4)}20%{-webkit-transform:scaleY(1.0)}}@keyframes stretchdelay{0%,40%,100%{transform:scaleY(0.4);-webkit-transform:scaleY(0.4)}20%{transform:scaleY(1.0);-webkit-transform:scaleY(1.0)}}.bounce-spinner{width:50px;height:50px;position:relative;margin:30px auto}.double-bounce1,.double-bounce2{width:100%;height:100%;border-radius:50%;background-color:#00A790;opacity:0.6;position:absolute;top:0;left:0;-webkit-animation:bounce 2.0s infinite ease-in-out;animation:bounce 2.0s infinite ease-in-out}.double-bounce2{-webkit-animation-delay:-1.0s;animation-delay:-1.0s}@-webkit-keyframes bounce{0%,100%{-webkit-transform:scale(0.0)}50%{-webkit-transform:scale(1.0)}}@keyframes bounce{0%,100%{transform:scale(0.0);-webkit-transform:scale(0.0)}50%{transform:scale(1.0);-webkit-transform:scale(1.0)}}#ajxp_workspace_info_panel{margin:0!important}#ajxp_workspace_info_panel_content,#ajxp_quota_panel_content{color:rgb(111,121,131);padding:10px!important}tr[data-groupByValue],div[data-groupByValue]{clear:left;max-height:480px;overflow:hidden;margin-bottom:10px}tr[data-groupByValue]:first-child,div[data-groupByValue]:first-child{margin-top:10px}div[data-groupByValue]h3,tr[data-groupByValue]h3{font-size:16px;margin:10px 0 10px 14px;color:rgb(111,121,131);font-weight:normal}h3.dashboard_panel_title{display:none}
-/*!
-Chosen, a Select Box Enhancer for jQuery and Prototype
-by Patrick Filler for Harvest, http://getharvest.com
-
-Version 1.2.0
-Full source at https://github.com/harvesthq/chosen
-Copyright (c) 2011-2014 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 */
-.chosen-container {
-  position: relative;
-  display: inline-block;
-  vertical-align: middle;
-  font-size: 13px;
-  zoom: 1;
-  *display: inline;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  user-select: none;
-    max-width: 466px;
-    width: 99% !important;
-}
-.chosen-container * {
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-}
-.chosen-container .chosen-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);
-}
-.chosen-container.chosen-with-drop .chosen-drop {
-  left: 0;
-}
-.chosen-container a {
-  cursor: pointer;
-}
-
-/* @end */
-/* @group Single Chosen */
-.chosen-container-single .chosen-single {
-  position: relative;
-  display: block;
-  overflow: hidden;
-    padding: 2px 0 0 8px;
-    height: 30px;
-    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(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
-  background: -moz-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
-  background: -o-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
-  background: linear-gradient(top, #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;
-}
-.chosen-container-single .chosen-default {
-  color: #999;
-}
-.chosen-container-single .chosen-single span {
-  display: block;
-  overflow: hidden;
-  margin-right: 26px;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.chosen-container-single .chosen-single-with-deselect span {
-  margin-right: 38px;
-}
-.chosen-container-single .chosen-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;
-}
-.chosen-container-single .chosen-single abbr:hover {
-  background-position: -42px -10px;
-}
-.chosen-container-single.chosen-disabled .chosen-single abbr:hover {
-  background-position: -42px -10px;
-}
-.chosen-container-single .chosen-single div {
-  position: absolute;
-  top: 0;
-  right: 0;
-  display: block;
-  width: 18px;
-  height: 100%;
-}
-.chosen-container-single .chosen-single div b {
-  display: block;
-  width: 100%;
-  height: 100%;
-  background: url('chosen-sprite.png') no-repeat 0px 6px;
-}
-.chosen-container-single .chosen-search {
-  position: relative;
-  z-index: 1010;
-  margin: 0;
-  padding: 3px 4px;
-  white-space: nowrap;
-}
-.chosen-container-single .chosen-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;
-}
-.chosen-container-single .chosen-drop {
-  margin-top: -1px;
-  border-radius: 0 0 4px 4px;
-  background-clip: padding-box;
-}
-.chosen-container-single.chosen-container-single-nosearch .chosen-search {
-  position: absolute;
-  left: -9999px;
-}
-
-/* @end */
-/* @group Results */
-.chosen-container .chosen-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;
-}
-.chosen-container .chosen-results li {
-  display: none;
-  margin: 0;
-  padding: 5px 6px;
-  list-style: none;
-  line-height: 15px;
-  word-wrap: break-word;
-  -webkit-touch-callout: none;
-}
-.chosen-container .chosen-results li.active-result {
-  display: list-item;
-  cursor: pointer;
-}
-.chosen-container .chosen-results li.disabled-result {
-  display: list-item;
-  color: #ccc;
-  cursor: default;
-}
-.chosen-container .chosen-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;
-}
-.chosen-container .chosen-results li.no-results {
-  color: #777;
-  display: list-item;
-  background: #f4f4f4;
-}
-.chosen-container .chosen-results li.group-result {
-  display: list-item;
-  font-weight: bold;
-  cursor: default;
-  font-family: "Open Sans Regular";
-  text-transform: uppercase;
-}
-.chosen-container .chosen-results li.group-option {
-  padding-left: 15px;
-}
-.chosen-container .chosen-results li em {
-  font-style: normal;
-  text-decoration: underline;
-}
-
-/* @end */
-/* @group Multi Chosen */
-.chosen-container-multi .chosen-choices {
-  position: relative;
-  overflow: hidden;
-  margin: 0;
-  padding: 0 5px;
-  width: 100%;
-  height: auto !important;
-  height: 1%;
-  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;
-}
-.chosen-container-multi .chosen-choices li {
-  float: left;
-  list-style: none;
-}
-.chosen-container-multi .chosen-choices li.search-field {
-  margin: 0;
-  padding: 0;
-  white-space: nowrap;
-}
-.chosen-container-multi .chosen-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;
-}
-.chosen-container-multi .chosen-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;
-}
-.chosen-container-multi .chosen-choices li.search-choice span {
-  word-wrap: break-word;
-}
-.chosen-container-multi .chosen-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;
-}
-.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover {
-  background-position: -42px -10px;
-}
-.chosen-container-multi .chosen-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(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-  background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-  background-image: -o-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-  background-image: linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
-  color: #666;
-}
-.chosen-container-multi .chosen-choices li.search-choice-focus {
-  background: #d4d4d4;
-}
-.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close {
-  background-position: -42px -10px;
-}
-.chosen-container-multi .chosen-results {
-  margin: 0;
-  padding: 0;
-}
-.chosen-container-multi .chosen-drop .result-selected {
-  display: list-item;
-  color: #ccc;
-  cursor: default;
-}
-
-/* @end */
-/* @group Active  */
-.chosen-container-active .chosen-single {
-  border: 1px solid #5897fb;
-  box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
-}
-.chosen-container-active.chosen-with-drop .chosen-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%);
-  box-shadow: 0 1px 0 #fff inset;
-}
-.chosen-container-active.chosen-with-drop .chosen-single div {
-  border-left: none;
-  background: transparent;
-}
-.chosen-container-active.chosen-with-drop .chosen-single div b {
-  background-position: -18px 6px;
-}
-.chosen-container-active .chosen-choices {
-  border: 1px solid #5897fb;
-  box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
-}
-.chosen-container-active .chosen-choices li.search-field input[type="text"] {
-  color: #222 !important;
-}
-
-/* @end */
-/* @group Disabled Support */
-.chosen-disabled {
-  opacity: 0.5 !important;
-  cursor: default;
-}
-.chosen-disabled .chosen-single {
-  cursor: default;
-}
-.chosen-disabled .chosen-choices .search-choice .search-choice-close {
-  cursor: default;
-}
-
-/* @end */
-/* @group Right to Left */
-.chosen-rtl {
-  text-align: right;
-}
-.chosen-rtl .chosen-single {
-  overflow: visible;
-  padding: 0 8px 0 0;
-}
-.chosen-rtl .chosen-single span {
-  margin-right: 0;
-  margin-left: 26px;
-  direction: rtl;
-}
-.chosen-rtl .chosen-single-with-deselect span {
-  margin-left: 38px;
-}
-.chosen-rtl .chosen-single div {
-  right: auto;
-  left: 3px;
-}
-.chosen-rtl .chosen-single abbr {
-  right: auto;
-  left: 26px;
-}
-.chosen-rtl .chosen-choices li {
-  float: right;
-}
-.chosen-rtl .chosen-choices li.search-field input[type="text"] {
-  direction: rtl;
-}
-.chosen-rtl .chosen-choices li.search-choice {
-  margin: 3px 5px 3px 0;
-  padding: 3px 5px 3px 19px;
-}
-.chosen-rtl .chosen-choices li.search-choice .search-choice-close {
-  right: auto;
-  left: 4px;
-}
-.chosen-rtl.chosen-container-single-nosearch .chosen-search,
-.chosen-rtl .chosen-drop {
-  left: 9999px;
-}
-.chosen-rtl.chosen-container-single .chosen-results {
-  margin: 0 0 4px 4px;
-  padding: 0 4px 0 0;
-}
-.chosen-rtl .chosen-results li.group-option {
-  padding-right: 15px;
-  padding-left: 0;
-}
-.chosen-rtl.chosen-container-active.chosen-with-drop .chosen-single div {
-  border-right: none;
-}
-.chosen-rtl .chosen-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;
-}
-.chosen-rtl.chosen-container-single .chosen-single div b {
-  background-position: 6px 2px;
-}
-.chosen-rtl.chosen-container-single.chosen-with-drop .chosen-single div b {
-  background-position: -12px 2px;
-}
-
-/* @end */
-/* @group Retina compatibility */
-@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-resolution: 144dpi) {
-  .chosen-rtl .chosen-search input[type="text"],
-  .chosen-container-single .chosen-single abbr,
-  .chosen-container-single .chosen-single div b,
-  .chosen-container-single .chosen-search input[type="text"],
-  .chosen-container-multi .chosen-choices .search-choice .search-choice-close,
-  .chosen-container .chosen-results-scroll-down span,
-  .chosen-container .chosen-results-scroll-up span {
-    background-image: url('chosen-sprite@2x.png') !important;
-    background-size: 52px 37px !important;
-    background-repeat: no-repeat !important;
-  }
-}
-/* @end */
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/css/allz_list.txt b/core/src/plugins/gui.ajax/res/themes/vision/css/allz_list.txt
deleted file mode 100755
index 14028dad0d..0000000000
--- a/core/src/plugins/gui.ajax/res/themes/vision/css/allz_list.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-themes/vision/css/xtree.css
-themes/vision/css/screen.css
-themes/vision/css/ajaxplorer.css
-themes/orbit/css/chosen.css#NO_MINI
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/css/animate-custom.css b/core/src/plugins/gui.ajax/res/themes/vision/css/animate-custom.css
deleted file mode 100644
index 70b482a2e7..0000000000
--- a/core/src/plugins/gui.ajax/res/themes/vision/css/animate-custom.css
+++ /dev/null
@@ -1,274 +0,0 @@
-.animated{-webkit-animation-fill-mode:both;-moz-animation-fill-mode:both;-ms-animation-fill-mode:both;-o-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:1s;-moz-animation-duration:1s;-ms-animation-duration:1s;-o-animation-duration:1s;animation-duration:1s;}.animated.hinge{-webkit-animation-duration:1s;-moz-animation-duration:1s;-ms-animation-duration:1s;-o-animation-duration:1s;animation-duration:1s;}
-
-.animated.super-quick {
-    -webkit-animation-duration: 0.15s;
-    animation-duration: 0.3s;
-}
-
-.animated.quick {
-    -webkit-animation-duration: 0.15s;
-    animation-duration: 0.3s;
-}
-
-.animated.long {
-    -webkit-animation-duration: 2s;
-    animation-duration: 2s;
-}
-
-@-webkit-keyframes fadeIn {
-	0% {opacity: 0;}	100% {opacity: 1;}
-}
-
-@-moz-keyframes fadeIn {
-	0% {opacity: 0;}	
-	100% {opacity: 1;}
-}
-
-@-o-keyframes fadeIn {
-	0% {opacity: 0;}	
-	100% {opacity: 1;}
-}
-
-@keyframes fadeIn {
-	0% {opacity: 0;}	
-	100% {opacity: 1;}
-}
-
-.fadeIn {
-	-webkit-animation-name: fadeIn;
-	-moz-animation-name: fadeIn;
-	-o-animation-name: fadeIn;
-	animation-name: fadeIn;
-}
-@-webkit-keyframes fadeInLeft {
-	0% {
-		opacity: 0;
-		-webkit-transform: translateX(-20px);
-	}
-	
-	100% {
-		opacity: 1;
-		-webkit-transform: translateX(0);
-	}
-}
-
-@-moz-keyframes fadeInLeft {
-	0% {
-		opacity: 0;
-		-moz-transform: translateX(-20px);
-	}
-	
-	100% {
-		opacity: 1;
-		-moz-transform: translateX(0);
-	}
-}
-
-@-o-keyframes fadeInLeft {
-	0% {
-		opacity: 0;
-		-o-transform: translateX(-20px);
-	}
-	
-	100% {
-		opacity: 1;
-		-o-transform: translateX(0);
-	}
-}
-
-@keyframes fadeInLeft {
-	0% {
-		opacity: 0;
-		transform: translateX(-20px);
-	}
-	
-	100% {
-		opacity: 1;
-		transform: translateX(0);
-	}
-}
-
-.fadeInLeft {
-	-webkit-animation-name: fadeInLeft;
-	-moz-animation-name: fadeInLeft;
-	-o-animation-name: fadeInLeft;
-	animation-name: fadeInLeft;
-}
-@-webkit-keyframes fadeInUpBig {
-	0% {
-		opacity: 0;
-		-webkit-transform: translateY(2000px);
-	}
-	
-	100% {
-		opacity: 1;
-		-webkit-transform: translateY(0);
-	}
-}
-
-@-moz-keyframes fadeInUpBig {
-	0% {
-		opacity: 0;
-		-moz-transform: translateY(2000px);
-	}
-	
-	100% {
-		opacity: 1;
-		-moz-transform: translateY(0);
-	}
-}
-
-@-o-keyframes fadeInUpBig {
-	0% {
-		opacity: 0;
-		-o-transform: translateY(2000px);
-	}
-	
-	100% {
-		opacity: 1;
-		-o-transform: translateY(0);
-	}
-}
-
-@keyframes fadeInUpBig {
-	0% {
-		opacity: 0;
-		transform: translateY(2000px);
-	}
-	
-	100% {
-		opacity: 1;
-		transform: translateY(0);
-	}
-}
-
-.fadeInUpBig {
-	-webkit-animation-name: fadeInUpBig;
-	-moz-animation-name: fadeInUpBig;
-	-o-animation-name: fadeInUpBig;
-	animation-name: fadeInUpBig;
-}
-@-webkit-keyframes fadeOutDownBig {
-	0% {
-		opacity: 1;
-		-webkit-transform: translateY(0);
-	}
-	
-	100% {
-		opacity: 0;
-		-webkit-transform: translateY(2000px);
-	}
-}
-
-@-moz-keyframes fadeOutDownBig {
-	0% {
-		opacity: 1;
-		-moz-transform: translateY(0);
-	}
-	
-	100% {
-		opacity: 0;
-		-moz-transform: translateY(2000px);
-	}
-}
-
-@-o-keyframes fadeOutDownBig {
-	0% {
-		opacity: 1;
-		-o-transform: translateY(0);
-	}
-	
-	100% {
-		opacity: 0;
-		-o-transform: translateY(2000px);
-	}
-}
-
-@keyframes fadeOutDownBig {
-	0% {
-		opacity: 1;
-		transform: translateY(0);
-	}
-	
-	100% {
-		opacity: 0;
-		transform: translateY(2000px);
-	}
-}
-
-.fadeOutDownBig {
-	-webkit-animation-name: fadeOutDownBig;
-	-moz-animation-name: fadeOutDownBig;
-	-o-animation-name: fadeOutDownBig;
-	animation-name: fadeOutDownBig;
-}
-@-webkit-keyframes bounceOutLeft {
-	0% {
-		-webkit-transform: translateX(0);
-	}
-	
-	20% {
-		opacity: 1;
-		-webkit-transform: translateX(20px);
-	}
-	
-	100% {
-		opacity: 0;
-		-webkit-transform: translateX(-2000px);
-	}
-}
-
-@-moz-keyframes bounceOutLeft {
-	0% {
-		-moz-transform: translateX(0);
-	}
-	
-	20% {
-		opacity: 1;
-		-moz-transform: translateX(20px);
-	}
-	
-	100% {
-		opacity: 0;
-		-moz-transform: translateX(-2000px);
-	}
-}
-
-@-o-keyframes bounceOutLeft {
-	0% {
-		-o-transform: translateX(0);
-	}
-	
-	20% {
-		opacity: 1;
-		-o-transform: translateX(20px);
-	}
-	
-	100% {
-		opacity: 0;
-		-o-transform: translateX(-2000px);
-	}
-}
-
-@keyframes bounceOutLeft {
-	0% {
-		transform: translateX(0);
-	}
-	
-	20% {
-		opacity: 1;
-		transform: translateX(20px);
-	}
-	
-	100% {
-		opacity: 0;
-		transform: translateX(-2000px);
-	}
-}
-
-.bounceOutLeft {
-	-webkit-animation-name: bounceOutLeft;
-	-moz-animation-name: bounceOutLeft;
-	-o-animation-name: bounceOutLeft;
-	animation-name: bounceOutLeft;
-}
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/css/font-awesome.css b/core/src/plugins/gui.ajax/res/themes/vision/css/font-awesome.css
deleted file mode 100755
index 37194b4301..0000000000
--- a/core/src/plugins/gui.ajax/res/themes/vision/css/font-awesome.css
+++ /dev/null
@@ -1,1479 +0,0 @@
-/*!
- *  Font Awesome 3.2.1
- *  the iconic font designed for Bootstrap
- *  ------------------------------------------------------------------------------
- *  The full suite of pictographic icons, examples, and documentation can be
- *  found at http://fontawesome.io.  Stay up to date on Twitter at
- *  http://twitter.com/fontawesome.
- *
- *  License
- *  ------------------------------------------------------------------------------
- *  - The Font Awesome font is licensed under SIL OFL 1.1 -
- *    http://scripts.sil.org/OFL
- *  - Font Awesome CSS, LESS, and SASS files are licensed under MIT License -
- *    http://opensource.org/licenses/mit-license.html
- *  - Font Awesome documentation licensed under CC BY 3.0 -
- *    http://creativecommons.org/licenses/by/3.0/
- *  - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
- *    "Font Awesome by Dave Gandy - http://fontawesome.io"
- *
- *  Author - Dave Gandy
- *  ------------------------------------------------------------------------------
- *  Email: dave@fontawesome.io
- *  Twitter: http://twitter.com/davegandy
- *  Work: Lead Product Designer @ Kyruus - http://kyruus.com
- */
-/* FONT PATH
- * -------------------------- */
-@font-face {
-  font-family: 'FontAwesome';
-  src: url('../images/awesome/fontawesome-webfont.eot?v=3.2.1');
-  src: url('../images/awesome/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('../images/awesome/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('../images/awesome/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('../images/awesome/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg');
-  font-weight: normal;
-  font-style: normal;
-}
-/* FONT AWESOME CORE
- * -------------------------- */
-[class^="icon-"],
-[class*=" icon-"] {
-  font-family: FontAwesome;
-  font-weight: normal;
-  font-style: normal;
-  text-decoration: inherit;
-  -webkit-font-smoothing: antialiased;
-  *margin-right: .3em;
-}
-[class^="icon-"]:before,
-[class*=" icon-"]:before {
-  text-decoration: inherit;
-  display: inline-block;
-  speak: none;
-}
-/* makes the font 33% larger relative to the icon container */
-.icon-large:before {
-  vertical-align: -10%;
-  font-size: 1.3333333333333333em;
-}
-/* makes sure icons active on rollover in links */
-a [class^="icon-"],
-a [class*=" icon-"] {
-  display: inline;
-}
-/* increased font size for icon-large */
-[class^="icon-"].icon-fixed-width,
-[class*=" icon-"].icon-fixed-width {
-  display: inline-block;
-  width: 1.1428571428571428em;
-  text-align: right;
-  padding-right: 0.2857142857142857em;
-}
-[class^="icon-"].icon-fixed-width.icon-large,
-[class*=" icon-"].icon-fixed-width.icon-large {
-  width: 1.4285714285714286em;
-}
-.icons-ul {
-  margin-left: 2.142857142857143em;
-  list-style-type: none;
-}
-.icons-ul > li {
-  position: relative;
-}
-.icons-ul .icon-li {
-  position: absolute;
-  left: -2.142857142857143em;
-  width: 2.142857142857143em;
-  text-align: center;
-  line-height: inherit;
-}
-[class^="icon-"].hide,
-[class*=" icon-"].hide {
-  display: none;
-}
-.icon-muted {
-  color: #eeeeee;
-}
-.icon-light {
-  color: #ffffff;
-}
-.icon-dark {
-  color: #333333;
-}
-.icon-border {
-  border: solid 1px #eeeeee;
-  padding: .2em .25em .15em;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-}
-.icon-2x {
-  font-size: 2em;
-}
-.icon-2x.icon-border {
-  border-width: 2px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-}
-.icon-3x {
-  font-size: 3em;
-}
-.icon-3x.icon-border {
-  border-width: 3px;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-}
-.icon-4x {
-  font-size: 4em;
-}
-.icon-4x.icon-border {
-  border-width: 4px;
-  -webkit-border-radius: 6px;
-  -moz-border-radius: 6px;
-  border-radius: 6px;
-}
-.icon-5x {
-  font-size: 5em;
-}
-.icon-5x.icon-border {
-  border-width: 5px;
-  -webkit-border-radius: 7px;
-  -moz-border-radius: 7px;
-  border-radius: 7px;
-}
-.pull-right {
-  float: right;
-}
-.pull-left {
-  float: left;
-}
-[class^="icon-"].pull-left,
-[class*=" icon-"].pull-left {
-  margin-right: .3em;
-}
-[class^="icon-"].pull-right,
-[class*=" icon-"].pull-right {
-  margin-left: .3em;
-}
-/* BOOTSTRAP SPECIFIC CLASSES
- * -------------------------- */
-/* Bootstrap 2.0 sprites.less reset */
-[class^="icon-"],
-[class*=" icon-"] {
-  display: inline;
-  width: auto;
-  height: auto;
-  line-height: normal;
-  vertical-align: baseline;
-  background-image: none;
-  background-position: 0% 0%;
-  background-repeat: repeat;
-  margin-top: 0;
-}
-/* more sprites.less reset */
-.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:hover > [class*=" icon-"],
-.dropdown-menu > .active > a > [class^="icon-"],
-.dropdown-menu > .active > a > [class*=" icon-"],
-.dropdown-submenu:hover > a > [class^="icon-"],
-.dropdown-submenu:hover > a > [class*=" icon-"] {
-  background-image: none;
-}
-/* keeps Bootstrap styles with and without icons the same */
-.btn [class^="icon-"].icon-large,
-.nav [class^="icon-"].icon-large,
-.btn [class*=" icon-"].icon-large,
-.nav [class*=" icon-"].icon-large {
-  line-height: .9em;
-}
-.btn [class^="icon-"].icon-spin,
-.nav [class^="icon-"].icon-spin,
-.btn [class*=" icon-"].icon-spin,
-.nav [class*=" icon-"].icon-spin {
-  display: inline-block;
-}
-.nav-tabs [class^="icon-"],
-.nav-pills [class^="icon-"],
-.nav-tabs [class*=" icon-"],
-.nav-pills [class*=" icon-"],
-.nav-tabs [class^="icon-"].icon-large,
-.nav-pills [class^="icon-"].icon-large,
-.nav-tabs [class*=" icon-"].icon-large,
-.nav-pills [class*=" icon-"].icon-large {
-  line-height: .9em;
-}
-.btn [class^="icon-"].pull-left.icon-2x,
-.btn [class*=" icon-"].pull-left.icon-2x,
-.btn [class^="icon-"].pull-right.icon-2x,
-.btn [class*=" icon-"].pull-right.icon-2x {
-  margin-top: .18em;
-}
-.btn [class^="icon-"].icon-spin.icon-large,
-.btn [class*=" icon-"].icon-spin.icon-large {
-  line-height: .8em;
-}
-.btn.btn-small [class^="icon-"].pull-left.icon-2x,
-.btn.btn-small [class*=" icon-"].pull-left.icon-2x,
-.btn.btn-small [class^="icon-"].pull-right.icon-2x,
-.btn.btn-small [class*=" icon-"].pull-right.icon-2x {
-  margin-top: .25em;
-}
-.btn.btn-large [class^="icon-"],
-.btn.btn-large [class*=" icon-"] {
-  margin-top: 0;
-}
-.btn.btn-large [class^="icon-"].pull-left.icon-2x,
-.btn.btn-large [class*=" icon-"].pull-left.icon-2x,
-.btn.btn-large [class^="icon-"].pull-right.icon-2x,
-.btn.btn-large [class*=" icon-"].pull-right.icon-2x {
-  margin-top: .05em;
-}
-.btn.btn-large [class^="icon-"].pull-left.icon-2x,
-.btn.btn-large [class*=" icon-"].pull-left.icon-2x {
-  margin-right: .2em;
-}
-.btn.btn-large [class^="icon-"].pull-right.icon-2x,
-.btn.btn-large [class*=" icon-"].pull-right.icon-2x {
-  margin-left: .2em;
-}
-/* Fixes alignment in nav lists */
-.nav-list [class^="icon-"],
-.nav-list [class*=" icon-"] {
-  line-height: inherit;
-}
-/* EXTRAS
- * -------------------------- */
-/* Stacked and layered icon */
-.icon-stack {
-  position: relative;
-  display: inline-block;
-  width: 2em;
-  height: 2em;
-  line-height: 2em;
-  vertical-align: -35%;
-}
-.icon-stack [class^="icon-"],
-.icon-stack [class*=" icon-"] {
-  display: block;
-  text-align: center;
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  font-size: 1em;
-  line-height: inherit;
-  *line-height: 2em;
-}
-.icon-stack .icon-stack-base {
-  font-size: 2em;
-  *line-height: 1em;
-}
-/* Animated rotating icon */
-.icon-spin {
-  display: inline-block;
-  -moz-animation: spin 2s infinite linear;
-  -o-animation: spin 2s infinite linear;
-  -webkit-animation: spin 2s infinite linear;
-  animation: spin 2s infinite linear;
-}
-/* Prevent stack and spinners from being taken inline when inside a link */
-a .icon-stack,
-a .icon-spin {
-  display: inline-block;
-  text-decoration: none;
-}
-@-moz-keyframes spin {
-  0% {
-    -moz-transform: rotate(0deg);
-  }
-  100% {
-    -moz-transform: rotate(359deg);
-  }
-}
-@-webkit-keyframes spin {
-  0% {
-    -webkit-transform: rotate(0deg);
-  }
-  100% {
-    -webkit-transform: rotate(359deg);
-  }
-}
-@-o-keyframes spin {
-  0% {
-    -o-transform: rotate(0deg);
-  }
-  100% {
-    -o-transform: rotate(359deg);
-  }
-}
-@-ms-keyframes spin {
-  0% {
-    -ms-transform: rotate(0deg);
-  }
-  100% {
-    -ms-transform: rotate(359deg);
-  }
-}
-@keyframes spin {
-  0% {
-    transform: rotate(0deg);
-  }
-  100% {
-    transform: rotate(359deg);
-  }
-}
-/* Icon rotations and mirroring */
-.icon-rotate-90:before {
-  -webkit-transform: rotate(90deg);
-  -moz-transform: rotate(90deg);
-  -ms-transform: rotate(90deg);
-  -o-transform: rotate(90deg);
-  transform: rotate(90deg);
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
-}
-.icon-rotate-180:before {
-  -webkit-transform: rotate(180deg);
-  -moz-transform: rotate(180deg);
-  -ms-transform: rotate(180deg);
-  -o-transform: rotate(180deg);
-  transform: rotate(180deg);
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
-}
-.icon-rotate-270:before {
-  -webkit-transform: rotate(270deg);
-  -moz-transform: rotate(270deg);
-  -ms-transform: rotate(270deg);
-  -o-transform: rotate(270deg);
-  transform: rotate(270deg);
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
-}
-.icon-flip-horizontal:before {
-  -webkit-transform: scale(-1, 1);
-  -moz-transform: scale(-1, 1);
-  -ms-transform: scale(-1, 1);
-  -o-transform: scale(-1, 1);
-  transform: scale(-1, 1);
-}
-.icon-flip-vertical:before {
-  -webkit-transform: scale(1, -1);
-  -moz-transform: scale(1, -1);
-  -ms-transform: scale(1, -1);
-  -o-transform: scale(1, -1);
-  transform: scale(1, -1);
-}
-/* ensure rotation occurs inside anchor tags */
-a .icon-rotate-90:before,
-a .icon-rotate-180:before,
-a .icon-rotate-270:before,
-a .icon-flip-horizontal:before,
-a .icon-flip-vertical:before {
-  display: inline-block;
-}
-/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
-   readers do not read off random characters that represent icons */
-.icon-glass:before {
-  content: "\f000";
-}
-.icon-music:before {
-  content: "\f001";
-}
-.icon-search:before {
-  content: "\f002";
-}
-.icon-envelope-alt:before {
-  content: "\f003";
-}
-.icon-heart:before {
-  content: "\f004";
-}
-.icon-star:before {
-  content: "\f005";
-}
-.icon-star-empty:before {
-  content: "\f006";
-}
-.icon-user:before {
-  content: "\f007";
-}
-.icon-film:before {
-  content: "\f008";
-}
-.icon-th-large:before {
-  content: "\f009";
-}
-.icon-th:before {
-  content: "\f00a";
-}
-.icon-th-list:before {
-  content: "\f00b";
-}
-.icon-ok:before {
-  content: "\f00c";
-}
-.icon-remove:before {
-  content: "\f00d";
-}
-.icon-zoom-in:before {
-  content: "\f00e";
-}
-.icon-zoom-out:before {
-  content: "\f010";
-}
-.icon-power-off:before,
-.icon-off:before {
-  content: "\f011";
-}
-.icon-signal:before {
-  content: "\f012";
-}
-.icon-gear:before,
-.icon-cog:before {
-  content: "\f013";
-}
-.icon-trash:before {
-  content: "\f014";
-}
-.icon-home:before {
-  content: "\f015";
-}
-.icon-file-alt:before {
-  content: "\f016";
-}
-.icon-time:before {
-  content: "\f017";
-}
-.icon-road:before {
-  content: "\f018";
-}
-.icon-download-alt:before {
-  content: "\f019";
-}
-.icon-download:before {
-  content: "\f01a";
-}
-.icon-upload:before {
-  content: "\f01b";
-}
-.icon-inbox:before {
-  content: "\f01c";
-}
-.icon-play-circle:before {
-  content: "\f01d";
-}
-.icon-rotate-right:before,
-.icon-repeat:before {
-  content: "\f01e";
-}
-.icon-refresh:before {
-  content: "\f021";
-}
-.icon-list-alt:before {
-  content: "\f022";
-}
-.icon-lock:before {
-  content: "\f023";
-}
-.icon-flag:before {
-  content: "\f024";
-}
-.icon-headphones:before {
-  content: "\f025";
-}
-.icon-volume-off:before {
-  content: "\f026";
-}
-.icon-volume-down:before {
-  content: "\f027";
-}
-.icon-volume-up:before {
-  content: "\f028";
-}
-.icon-qrcode:before {
-  content: "\f029";
-}
-.icon-barcode:before {
-  content: "\f02a";
-}
-.icon-tag:before {
-  content: "\f02b";
-}
-.icon-tags:before {
-  content: "\f02c";
-}
-.icon-book:before {
-  content: "\f02d";
-}
-.icon-bookmark:before {
-  content: "\f02e";
-}
-.icon-print:before {
-  content: "\f02f";
-}
-.icon-camera:before {
-  content: "\f030";
-}
-.icon-font:before {
-  content: "\f031";
-}
-.icon-bold:before {
-  content: "\f032";
-}
-.icon-italic:before {
-  content: "\f033";
-}
-.icon-text-height:before {
-  content: "\f034";
-}
-.icon-text-width:before {
-  content: "\f035";
-}
-.icon-align-left:before {
-  content: "\f036";
-}
-.icon-align-center:before {
-  content: "\f037";
-}
-.icon-align-right:before {
-  content: "\f038";
-}
-.icon-align-justify:before {
-  content: "\f039";
-}
-.icon-list:before {
-  content: "\f03a";
-}
-.icon-indent-left:before {
-  content: "\f03b";
-}
-.icon-indent-right:before {
-  content: "\f03c";
-}
-.icon-facetime-video:before {
-  content: "\f03d";
-}
-.icon-picture:before {
-  content: "\f03e";
-}
-.icon-pencil:before {
-  content: "\f040";
-}
-.icon-map-marker:before {
-  content: "\f041";
-}
-.icon-adjust:before {
-  content: "\f042";
-}
-.icon-tint:before {
-  content: "\f043";
-}
-.icon-edit:before {
-  content: "\f044";
-}
-.icon-share:before {
-  content: "\f045";
-}
-.icon-check:before {
-  content: "\f046";
-}
-.icon-move:before {
-  content: "\f047";
-}
-.icon-step-backward:before {
-  content: "\f048";
-}
-.icon-fast-backward:before {
-  content: "\f049";
-}
-.icon-backward:before {
-  content: "\f04a";
-}
-.icon-play:before {
-  content: "\f04b";
-}
-.icon-pause:before {
-  content: "\f04c";
-}
-.icon-stop:before {
-  content: "\f04d";
-}
-.icon-forward:before {
-  content: "\f04e";
-}
-.icon-fast-forward:before {
-  content: "\f050";
-}
-.icon-step-forward:before {
-  content: "\f051";
-}
-.icon-eject:before {
-  content: "\f052";
-}
-.icon-chevron-left:before {
-  content: "\f053";
-}
-.icon-chevron-right:before {
-  content: "\f054";
-}
-.icon-plus-sign:before {
-  content: "\f055";
-}
-.icon-minus-sign:before {
-  content: "\f056";
-}
-.icon-remove-sign:before {
-  content: "\f057";
-}
-.icon-ok-sign:before {
-  content: "\f058";
-}
-.icon-question-sign:before {
-  content: "\f059";
-}
-.icon-info-sign:before {
-  content: "\f05a";
-}
-.icon-screenshot:before {
-  content: "\f05b";
-}
-.icon-remove-circle:before {
-  content: "\f05c";
-}
-.icon-ok-circle:before {
-  content: "\f05d";
-}
-.icon-ban-circle:before {
-  content: "\f05e";
-}
-.icon-arrow-left:before {
-  content: "\f060";
-}
-.icon-arrow-right:before {
-  content: "\f061";
-}
-.icon-arrow-up:before {
-  content: "\f062";
-}
-.icon-arrow-down:before {
-  content: "\f063";
-}
-.icon-mail-forward:before,
-.icon-share-alt:before {
-  content: "\f064";
-}
-.icon-resize-full:before {
-  content: "\f065";
-}
-.icon-resize-small:before {
-  content: "\f066";
-}
-.icon-plus:before {
-  content: "\f067";
-}
-.icon-minus:before {
-  content: "\f068";
-}
-.icon-asterisk:before {
-  content: "\f069";
-}
-.icon-exclamation-sign:before {
-  content: "\f06a";
-}
-.icon-gift:before {
-  content: "\f06b";
-}
-.icon-leaf:before {
-  content: "\f06c";
-}
-.icon-fire:before {
-  content: "\f06d";
-}
-.icon-eye-open:before {
-  content: "\f06e";
-}
-.icon-eye-close:before {
-  content: "\f070";
-}
-.icon-warning-sign:before {
-  content: "\f071";
-}
-.icon-plane:before {
-  content: "\f072";
-}
-.icon-calendar:before {
-  content: "\f073";
-}
-.icon-random:before {
-  content: "\f074";
-}
-.icon-comment:before {
-  content: "\f075";
-}
-.icon-magnet:before {
-  content: "\f076";
-}
-.icon-chevron-up:before {
-  content: "\f077";
-}
-.icon-chevron-down:before {
-  content: "\f078";
-}
-.icon-retweet:before {
-  content: "\f079";
-}
-.icon-shopping-cart:before {
-  content: "\f07a";
-}
-.icon-folder-close:before {
-  content: "\f07b";
-}
-.icon-folder-open:before {
-  content: "\f07c";
-}
-.icon-resize-vertical:before {
-  content: "\f07d";
-}
-.icon-resize-horizontal:before {
-  content: "\f07e";
-}
-.icon-bar-chart:before {
-  content: "\f080";
-}
-.icon-twitter-sign:before {
-  content: "\f081";
-}
-.icon-facebook-sign:before {
-  content: "\f082";
-}
-.icon-camera-retro:before {
-  content: "\f083";
-}
-.icon-key:before {
-  content: "\f084";
-}
-.icon-gears:before,
-.icon-cogs:before {
-  content: "\f085";
-}
-.icon-comments:before {
-  content: "\f086";
-}
-.icon-thumbs-up-alt:before {
-  content: "\f087";
-}
-.icon-thumbs-down-alt:before {
-  content: "\f088";
-}
-.icon-star-half:before {
-  content: "\f089";
-}
-.icon-heart-empty:before {
-  content: "\f08a";
-}
-.icon-signout:before {
-  content: "\f08b";
-}
-.icon-linkedin-sign:before {
-  content: "\f08c";
-}
-.icon-pushpin:before {
-  content: "\f08d";
-}
-.icon-external-link:before {
-  content: "\f08e";
-}
-.icon-signin:before {
-  content: "\f090";
-}
-.icon-trophy:before {
-  content: "\f091";
-}
-.icon-github-sign:before {
-  content: "\f092";
-}
-.icon-upload-alt:before {
-  content: "\f093";
-}
-.icon-lemon:before {
-  content: "\f094";
-}
-.icon-phone:before {
-  content: "\f095";
-}
-.icon-unchecked:before,
-.icon-check-empty:before {
-  content: "\f096";
-}
-.icon-bookmark-empty:before {
-  content: "\f097";
-}
-.icon-phone-sign:before {
-  content: "\f098";
-}
-.icon-twitter:before {
-  content: "\f099";
-}
-.icon-facebook:before {
-  content: "\f09a";
-}
-.icon-github:before {
-  content: "\f09b";
-}
-.icon-unlock:before {
-  content: "\f09c";
-}
-.icon-credit-card:before {
-  content: "\f09d";
-}
-.icon-rss:before {
-  content: "\f09e";
-}
-.icon-hdd:before {
-  content: "\f0a0";
-}
-.icon-bullhorn:before {
-  content: "\f0a1";
-}
-.icon-bell:before {
-  content: "\f0a2";
-}
-.icon-certificate:before {
-  content: "\f0a3";
-}
-.icon-hand-right:before {
-  content: "\f0a4";
-}
-.icon-hand-left:before {
-  content: "\f0a5";
-}
-.icon-hand-up:before {
-  content: "\f0a6";
-}
-.icon-hand-down:before {
-  content: "\f0a7";
-}
-.icon-circle-arrow-left:before {
-  content: "\f0a8";
-}
-.icon-circle-arrow-right:before {
-  content: "\f0a9";
-}
-.icon-circle-arrow-up:before {
-  content: "\f0aa";
-}
-.icon-circle-arrow-down:before {
-  content: "\f0ab";
-}
-.icon-globe:before {
-  content: "\f0ac";
-}
-.icon-wrench:before {
-  content: "\f0ad";
-}
-.icon-tasks:before {
-  content: "\f0ae";
-}
-.icon-filter:before {
-  content: "\f0b0";
-}
-.icon-briefcase:before {
-  content: "\f0b1";
-}
-.icon-fullscreen:before {
-  content: "\f0b2";
-}
-.icon-group:before {
-  content: "\f0c0";
-}
-.icon-link:before {
-  content: "\f0c1";
-}
-.icon-cloud:before {
-  content: "\f0c2";
-}
-.icon-beaker:before {
-  content: "\f0c3";
-}
-.icon-cut:before {
-  content: "\f0c4";
-}
-.icon-copy:before {
-  content: "\f0c5";
-}
-.icon-paperclip:before,
-.icon-paper-clip:before {
-  content: "\f0c6";
-}
-.icon-save:before {
-  content: "\f0c7";
-}
-.icon-sign-blank:before {
-  content: "\f0c8";
-}
-.icon-reorder:before {
-  content: "\f0c9";
-}
-.icon-list-ul:before {
-  content: "\f0ca";
-}
-.icon-list-ol:before {
-  content: "\f0cb";
-}
-.icon-strikethrough:before {
-  content: "\f0cc";
-}
-.icon-underline:before {
-  content: "\f0cd";
-}
-.icon-table:before {
-  content: "\f0ce";
-}
-.icon-magic:before {
-  content: "\f0d0";
-}
-.icon-truck:before {
-  content: "\f0d1";
-}
-.icon-pinterest:before {
-  content: "\f0d2";
-}
-.icon-pinterest-sign:before {
-  content: "\f0d3";
-}
-.icon-google-plus-sign:before {
-  content: "\f0d4";
-}
-.icon-google-plus:before {
-  content: "\f0d5";
-}
-.icon-money:before {
-  content: "\f0d6";
-}
-.icon-caret-down:before {
-  content: "\f0d7";
-}
-.icon-caret-up:before {
-  content: "\f0d8";
-}
-.icon-caret-left:before {
-  content: "\f0d9";
-}
-.icon-caret-right:before {
-  content: "\f0da";
-}
-.icon-columns:before {
-  content: "\f0db";
-}
-.icon-sort:before {
-  content: "\f0dc";
-}
-.icon-sort-down:before {
-  content: "\f0dd";
-}
-.icon-sort-up:before {
-  content: "\f0de";
-}
-.icon-envelope:before {
-  content: "\f0e0";
-}
-.icon-linkedin:before {
-  content: "\f0e1";
-}
-.icon-rotate-left:before,
-.icon-undo:before {
-  content: "\f0e2";
-}
-.icon-legal:before {
-  content: "\f0e3";
-}
-.icon-dashboard:before {
-  content: "\f0e4";
-}
-.icon-comment-alt:before {
-  content: "\f0e5";
-}
-.icon-comments-alt:before {
-  content: "\f0e6";
-}
-.icon-bolt:before {
-  content: "\f0e7";
-}
-.icon-sitemap:before {
-  content: "\f0e8";
-}
-.icon-umbrella:before {
-  content: "\f0e9";
-}
-.icon-paste:before {
-  content: "\f0ea";
-}
-.icon-lightbulb:before {
-  content: "\f0eb";
-}
-.icon-exchange:before {
-  content: "\f0ec";
-}
-.icon-cloud-download:before {
-  content: "\f0ed";
-}
-.icon-cloud-upload:before {
-  content: "\f0ee";
-}
-.icon-user-md:before {
-  content: "\f0f0";
-}
-.icon-stethoscope:before {
-  content: "\f0f1";
-}
-.icon-suitcase:before {
-  content: "\f0f2";
-}
-.icon-bell-alt:before {
-  content: "\f0f3";
-}
-.icon-coffee:before {
-  content: "\f0f4";
-}
-.icon-food:before {
-  content: "\f0f5";
-}
-.icon-file-text-alt:before {
-  content: "\f0f6";
-}
-.icon-building:before {
-  content: "\f0f7";
-}
-.icon-hospital:before {
-  content: "\f0f8";
-}
-.icon-ambulance:before {
-  content: "\f0f9";
-}
-.icon-medkit:before {
-  content: "\f0fa";
-}
-.icon-fighter-jet:before {
-  content: "\f0fb";
-}
-.icon-beer:before {
-  content: "\f0fc";
-}
-.icon-h-sign:before {
-  content: "\f0fd";
-}
-.icon-plus-sign-alt:before {
-  content: "\f0fe";
-}
-.icon-double-angle-left:before {
-  content: "\f100";
-}
-.icon-double-angle-right:before {
-  content: "\f101";
-}
-.icon-double-angle-up:before {
-  content: "\f102";
-}
-.icon-double-angle-down:before {
-  content: "\f103";
-}
-.icon-angle-left:before {
-  content: "\f104";
-}
-.icon-angle-right:before {
-  content: "\f105";
-}
-.icon-angle-up:before {
-  content: "\f106";
-}
-.icon-angle-down:before {
-  content: "\f107";
-}
-.icon-desktop:before {
-  content: "\f108";
-}
-.icon-laptop:before {
-  content: "\f109";
-}
-.icon-tablet:before {
-  content: "\f10a";
-}
-.icon-mobile-phone:before {
-  content: "\f10b";
-}
-.icon-circle-blank:before {
-  content: "\f10c";
-}
-.icon-quote-left:before {
-  content: "\f10d";
-}
-.icon-quote-right:before {
-  content: "\f10e";
-}
-.icon-spinner:before {
-  content: "\f110";
-}
-.icon-circle:before {
-  content: "\f111";
-}
-.icon-mail-reply:before,
-.icon-reply:before {
-  content: "\f112";
-}
-.icon-github-alt:before {
-  content: "\f113";
-}
-.icon-folder-close-alt:before {
-  content: "\f114";
-}
-.icon-folder-open-alt:before {
-  content: "\f115";
-}
-.icon-expand-alt:before {
-  content: "\f116";
-}
-.icon-collapse-alt:before {
-  content: "\f117";
-}
-.icon-smile:before {
-  content: "\f118";
-}
-.icon-frown:before {
-  content: "\f119";
-}
-.icon-meh:before {
-  content: "\f11a";
-}
-.icon-gamepad:before {
-  content: "\f11b";
-}
-.icon-keyboard:before {
-  content: "\f11c";
-}
-.icon-flag-alt:before {
-  content: "\f11d";
-}
-.icon-flag-checkered:before {
-  content: "\f11e";
-}
-.icon-terminal:before {
-  content: "\f120";
-}
-.icon-code:before {
-  content: "\f121";
-}
-.icon-reply-all:before {
-  content: "\f122";
-}
-.icon-mail-reply-all:before {
-  content: "\f122";
-}
-.icon-star-half-full:before,
-.icon-star-half-empty:before {
-  content: "\f123";
-}
-.icon-location-arrow:before {
-  content: "\f124";
-}
-.icon-crop:before {
-  content: "\f125";
-}
-.icon-code-fork:before {
-  content: "\f126";
-}
-.icon-unlink:before {
-  content: "\f127";
-}
-.icon-question:before {
-  content: "\f128";
-}
-.icon-info:before {
-  content: "\f129";
-}
-.icon-exclamation:before {
-  content: "\f12a";
-}
-.icon-superscript:before {
-  content: "\f12b";
-}
-.icon-subscript:before {
-  content: "\f12c";
-}
-.icon-eraser:before {
-  content: "\f12d";
-}
-.icon-puzzle-piece:before {
-  content: "\f12e";
-}
-.icon-microphone:before {
-  content: "\f130";
-}
-.icon-microphone-off:before {
-  content: "\f131";
-}
-.icon-shield:before {
-  content: "\f132";
-}
-.icon-calendar-empty:before {
-  content: "\f133";
-}
-.icon-fire-extinguisher:before {
-  content: "\f134";
-}
-.icon-rocket:before {
-  content: "\f135";
-}
-.icon-maxcdn:before {
-  content: "\f136";
-}
-.icon-chevron-sign-left:before {
-  content: "\f137";
-}
-.icon-chevron-sign-right:before {
-  content: "\f138";
-}
-.icon-chevron-sign-up:before {
-  content: "\f139";
-}
-.icon-chevron-sign-down:before {
-  content: "\f13a";
-}
-.icon-html5:before {
-  content: "\f13b";
-}
-.icon-css3:before {
-  content: "\f13c";
-}
-.icon-anchor:before {
-  content: "\f13d";
-}
-.icon-unlock-alt:before {
-  content: "\f13e";
-}
-.icon-bullseye:before {
-  content: "\f140";
-}
-.icon-ellipsis-horizontal:before {
-  content: "\f141";
-}
-.icon-ellipsis-vertical:before {
-  content: "\f142";
-}
-.icon-rss-sign:before {
-  content: "\f143";
-}
-.icon-play-sign:before {
-  content: "\f144";
-}
-.icon-ticket:before {
-  content: "\f145";
-}
-.icon-minus-sign-alt:before {
-  content: "\f146";
-}
-.icon-check-minus:before {
-  content: "\f147";
-}
-.icon-level-up:before {
-  content: "\f148";
-}
-.icon-level-down:before {
-  content: "\f149";
-}
-.icon-check-sign:before {
-  content: "\f14a";
-}
-.icon-edit-sign:before {
-  content: "\f14b";
-}
-.icon-external-link-sign:before {
-  content: "\f14c";
-}
-.icon-share-sign:before {
-  content: "\f14d";
-}
-.icon-compass:before {
-  content: "\f14e";
-}
-.icon-collapse:before {
-  content: "\f150";
-}
-.icon-collapse-top:before {
-  content: "\f151";
-}
-.icon-expand:before {
-  content: "\f152";
-}
-.icon-euro:before,
-.icon-eur:before {
-  content: "\f153";
-}
-.icon-gbp:before {
-  content: "\f154";
-}
-.icon-dollar:before,
-.icon-usd:before {
-  content: "\f155";
-}
-.icon-rupee:before,
-.icon-inr:before {
-  content: "\f156";
-}
-.icon-yen:before,
-.icon-jpy:before {
-  content: "\f157";
-}
-.icon-renminbi:before,
-.icon-cny:before {
-  content: "\f158";
-}
-.icon-won:before,
-.icon-krw:before {
-  content: "\f159";
-}
-.icon-bitcoin:before,
-.icon-btc:before {
-  content: "\f15a";
-}
-.icon-file:before {
-  content: "\f15b";
-}
-.icon-file-text:before {
-  content: "\f15c";
-}
-.icon-sort-by-alphabet:before {
-  content: "\f15d";
-}
-.icon-sort-by-alphabet-alt:before {
-  content: "\f15e";
-}
-.icon-sort-by-attributes:before {
-  content: "\f160";
-}
-.icon-sort-by-attributes-alt:before {
-  content: "\f161";
-}
-.icon-sort-by-order:before {
-  content: "\f162";
-}
-.icon-sort-by-order-alt:before {
-  content: "\f163";
-}
-.icon-thumbs-up:before {
-  content: "\f164";
-}
-.icon-thumbs-down:before {
-  content: "\f165";
-}
-.icon-youtube-sign:before {
-  content: "\f166";
-}
-.icon-youtube:before {
-  content: "\f167";
-}
-.icon-xing:before {
-  content: "\f168";
-}
-.icon-xing-sign:before {
-  content: "\f169";
-}
-.icon-youtube-play:before {
-  content: "\f16a";
-}
-.icon-dropbox:before {
-  content: "\f16b";
-}
-.icon-stackexchange:before {
-  content: "\f16c";
-}
-.icon-instagram:before {
-  content: "\f16d";
-}
-.icon-flickr:before {
-  content: "\f16e";
-}
-.icon-adn:before {
-  content: "\f170";
-}
-.icon-bitbucket:before {
-  content: "\f171";
-}
-.icon-bitbucket-sign:before {
-  content: "\f172";
-}
-.icon-tumblr:before {
-  content: "\f173";
-}
-.icon-tumblr-sign:before {
-  content: "\f174";
-}
-.icon-long-arrow-down:before {
-  content: "\f175";
-}
-.icon-long-arrow-up:before {
-  content: "\f176";
-}
-.icon-long-arrow-left:before {
-  content: "\f177";
-}
-.icon-long-arrow-right:before {
-  content: "\f178";
-}
-.icon-apple:before {
-  content: "\f179";
-}
-.icon-windows:before {
-  content: "\f17a";
-}
-.icon-android:before {
-  content: "\f17b";
-}
-.icon-linux:before {
-  content: "\f17c";
-}
-.icon-dribbble:before {
-  content: "\f17d";
-}
-.icon-skype:before {
-  content: "\f17e";
-}
-.icon-foursquare:before {
-  content: "\f180";
-}
-.icon-trello:before {
-  content: "\f181";
-}
-.icon-female:before {
-  content: "\f182";
-}
-.icon-male:before {
-  content: "\f183";
-}
-.icon-gittip:before {
-  content: "\f184";
-}
-.icon-sun:before {
-  content: "\f185";
-}
-.icon-moon:before {
-  content: "\f186";
-}
-.icon-archive:before {
-  content: "\f187";
-}
-.icon-bug:before {
-  content: "\f188";
-}
-.icon-vk:before {
-  content: "\f189";
-}
-.icon-weibo:before {
-  content: "\f18a";
-}
-.icon-renren:before {
-  content: "\f18b";
-}
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/css/media.css b/core/src/plugins/gui.ajax/res/themes/vision/css/media.css
deleted file mode 100644
index dbb2b7d8a0..0000000000
--- a/core/src/plugins/gui.ajax/res/themes/vision/css/media.css
+++ /dev/null
@@ -1,71 +0,0 @@
-@media only screen
-and (max-width : 800px) {
-    .custom_top_title{
-        width: 23%;
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-    }
-}
-
-@media only screen
-and (max-width : 680px) {
-    .ws-label{
-        display: none !important;
-    }
-    span.actionbar_button_label,
-    .action_bar span.actionbar_button_label,
-    #get_my_feed_button_label,
-    #logging_string i,
-    #logging_string *[ajxp_message_id],
-    #global_toolbar span.icon-caret-down,
-    #search_form a
-    {
-        display: none !important;
-    }
-    #simple_repository_label{
-        font-size: 16px;
-        width: 100px !important;
-    }
-    #simple_repository_label div.repository_legend{
-        visibility: hidden;
-    }
-    #workspace_toolbar {
-        padding-top: 0;
-    }
-    #group_more_action_button{
-        height:17px;
-    }
-    .user_widget_label.withImage i{
-        width: 30px;
-        overflow: hidden;
-    }
-    .thumbnail_selectable_cell > div > div.overlay_icon_div{
-        top: 32px !important;
-    }
-}
-
-@media only screen
-and (max-width : 400px){
-    #simple_repository_label{
-        display:none;
-        font-size: 12px;
-        width: 100% !important;
-        padding:0 20px;
-        height:auto;
-    }
-    
-    div.repository_legend{
-        display:none;
-    }
-    #search_engine_cont{
-        width:15% !important;
-    }
-    #buttons_bar_cont{
-        margin-left: 15px;
-    }
-    #workspace_toolbar{
-        padding-top:0;
-    }
-
-}
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/css/modal.jpg b/core/src/plugins/gui.ajax/res/themes/vision/css/modal.jpg
deleted file mode 100755
index 34eafe3d02..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/css/modal.jpg and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/css/pie/PIE.htc b/core/src/plugins/gui.ajax/res/themes/vision/css/pie/PIE.htc
deleted file mode 100755
index b39af01ab0..0000000000
--- a/core/src/plugins/gui.ajax/res/themes/vision/css/pie/PIE.htc
+++ /dev/null
@@ -1,81 +0,0 @@
-<!--
-PIE: CSS3 rendering for IE
-Version 1.0beta4
-http://css3pie.com
-Dual-licensed for use under the Apache License Version 2.0 or the General Public License (GPL) Version 2.
--->
-<PUBLIC:COMPONENT lightWeight="true">
-<PUBLIC:ATTACH EVENT="oncontentready" FOR="element" ONEVENT="init()" />
-<PUBLIC:ATTACH EVENT="ondocumentready" FOR="element" ONEVENT="init()" />
-<PUBLIC:ATTACH EVENT="ondetach" FOR="element" ONEVENT="cleanup()" />
-
-<script type="text/javascript">
-var doc = element.document;var g=window.PIE;
-if(!g){g=window.PIE={F:"-pie-",Sa:"Pie",Pa:"pie_",Jb:{TD:1,TH:1}};try{doc.execCommand("BackgroundImageCache",false,true)}catch(L){}g.J=function(){for(var a=4,b=doc.createElement("div"),c=b.getElementsByTagName("i");b.innerHTML="<!--[if gt IE "+ ++a+"]><i></i><![endif]--\>",c[0];);return a}();if(g.J===6)g.F=g.F.replace(/^-/,"");g.Ab=doc.documentMode||g.J;(function(){var a,b=0,c={};g.p={Ga:function(e){if(!a){a=doc.createDocumentFragment();a.namespaces.add("css3vml","urn:schemas-microsoft-com:vml")}return a.createElement("css3vml:"+e)},
-ta:function(e){return e&&e._pieId||(e._pieId=++b)},fb:function(e){var f,h,j,d,i=arguments;f=1;for(h=i.length;f<h;f++){d=i[f];for(j in d)if(d.hasOwnProperty(j))e[j]=d[j]}return e},Pb:function(e,f,h){var j=c[e],d,i;if(j)Object.prototype.toString.call(j)==="[object Array]"?j.push([f,h]):f.call(h,j);else{i=c[e]=[[f,h]];d=new Image;d.onload=function(){j=c[e]={i:d.width,f:d.height};for(var k=0,m=i.length;k<m;k++)i[k][0].call(i[k][1],j);d.onload=null};d.src=e}}}})();g.ia=function(){this.hb=[];this.Db={}};
-g.ia.prototype={aa:function(a){var b=g.p.ta(a),c=this.Db,e=this.hb;if(!(b in c)){c[b]=e.length;e.push(a)}},Ma:function(a){a=g.p.ta(a);var b=this.Db;if(a&&a in b){delete this.hb[b[a]];delete b[a]}},Ia:function(){for(var a=this.hb,b=a.length;b--;)a[b]&&a[b]()}};g.ya=new g.ia;g.ya.Tc=function(){var a=this;if(!a.Uc){setInterval(function(){a.Ia()},250);a.Uc=1}};g.G=new g.ia;window.attachEvent("onbeforeunload",function(){g.G.Ia()});g.G.Ea=function(a,b,c){a.attachEvent(b,c);this.aa(function(){a.detachEvent(b,
-c)})};(function(){function a(){g.za.Ia()}g.za=new g.ia;g.G.Ea(window,"onresize",a)})();(function(){function a(){g.Ra.Ia()}g.Ra=new g.ia;g.G.Ea(window,"onscroll",a);g.za.aa(a)})();(function(){function a(){c=g.Qa.wc()}function b(){if(c){for(var e=0,f=c.length;e<f;e++)g.attach(c[e]);c=0}}var c;g.G.Ea(window,"onbeforeprint",a);g.G.Ea(window,"onafterprint",b)})();g.hd=function(){function a(i){this.V=i}var b=doc.createElement("length-calc"),c=doc.documentElement,e=b.style,f={},h=["mm","cm","in","pt","pc"],
-j=h.length,d={};e.position="absolute";e.top=e.left="-9999px";for(c.appendChild(b);j--;){b.style.width="100"+h[j];f[h[j]]=b.offsetWidth/100}c.removeChild(b);a.prototype={ib:/(px|em|ex|mm|cm|in|pt|pc|%)$/,vb:function(){var i=this.Lc;if(i===void 0)i=this.Lc=parseFloat(this.V);return i},ab:function(){var i=this.ad;if(!i)i=this.ad=(i=this.V.match(this.ib))&&i[0]||"px";return i},a:function(i,k){var m=this.vb(),l=this.ab();switch(l){case "px":return m;case "%":return m*(typeof k==="function"?k():k)/100;
-case "em":return m*this.tb(i);case "ex":return m*this.tb(i)/2;default:return m*f[l]}},tb:function(i){var k=i.currentStyle.fontSize;if(k.indexOf("px")>0)return parseFloat(k);else{b.style.width="1em";i.appendChild(b);k=b.offsetWidth;b.parentNode===i&&i.removeChild(b);return k}}};g.k=function(i){return d[i]||(d[i]=new a(i))};return a}();g.Na=function(){function a(f){this.U=f}var b=g.k("50%"),c={top:1,center:1,bottom:1},e={left:1,center:1,right:1};a.prototype={Dc:function(){if(!this.sb){var f=this.U,
-h=f.length,j=g.u,d=j.ja,i=g.k("0");d=d.fa;i=["left",i,"top",i];if(h===1){f.push(new j.Ta(d,"center"));h++}if(h===2){d&(f[0].h|f[1].h)&&f[0].d in c&&f[1].d in e&&f.push(f.shift());if(f[0].h&d)if(f[0].d==="center")i[1]=b;else i[0]=f[0].d;else if(f[0].Y())i[1]=g.k(f[0].d);if(f[1].h&d)if(f[1].d==="center")i[3]=b;else i[2]=f[1].d;else if(f[1].Y())i[3]=g.k(f[1].d)}this.sb=i}return this.sb},coords:function(f,h,j){var d=this.Dc(),i=d[1].a(f,h);f=d[3].a(f,j);return{x:d[0]==="right"?h-i:i,y:d[2]==="bottom"?
-j-f:f}}};return a}();g.Rb=function(){function a(b){this.V=b}a.prototype={ib:/[a-z]+$/i,ab:function(){return this.lc||(this.lc=this.V.match(this.ib)[0].toLowerCase())},vc:function(){var b=this.fc,c;if(b===undefined){b=this.ab();c=parseFloat(this.V,10);b=this.fc=b==="deg"?c:b==="rad"?c/Math.PI*180:b==="grad"?c/400*360:b==="turn"?c*360:0}return b}};return a}();g.$b=function(){function a(c){this.V=c}var b={};a.Sc=/\s*rgba\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d+|\d*\.\d+)\s*\)\s*/;a.gb=
-{aliceblue:"F0F8FF",antiquewhite:"FAEBD7",aqua:"0FF",aquamarine:"7FFFD4",azure:"F0FFFF",beige:"F5F5DC",bisque:"FFE4C4",black:"000",blanchedalmond:"FFEBCD",blue:"00F",blueviolet:"8A2BE2",brown:"A52A2A",burlywood:"DEB887",cadetblue:"5F9EA0",chartreuse:"7FFF00",chocolate:"D2691E",coral:"FF7F50",cornflowerblue:"6495ED",cornsilk:"FFF8DC",crimson:"DC143C",cyan:"0FF",darkblue:"00008B",darkcyan:"008B8B",darkgoldenrod:"B8860B",darkgray:"A9A9A9",darkgreen:"006400",darkkhaki:"BDB76B",darkmagenta:"8B008B",darkolivegreen:"556B2F",
-darkorange:"FF8C00",darkorchid:"9932CC",darkred:"8B0000",darksalmon:"E9967A",darkseagreen:"8FBC8F",darkslateblue:"483D8B",darkslategray:"2F4F4F",darkturquoise:"00CED1",darkviolet:"9400D3",deeppink:"FF1493",deepskyblue:"00BFFF",dimgray:"696969",dodgerblue:"1E90FF",firebrick:"B22222",floralwhite:"FFFAF0",forestgreen:"228B22",fuchsia:"F0F",gainsboro:"DCDCDC",ghostwhite:"F8F8FF",gold:"FFD700",goldenrod:"DAA520",gray:"808080",green:"008000",greenyellow:"ADFF2F",honeydew:"F0FFF0",hotpink:"FF69B4",indianred:"CD5C5C",
-indigo:"4B0082",ivory:"FFFFF0",khaki:"F0E68C",lavender:"E6E6FA",lavenderblush:"FFF0F5",lawngreen:"7CFC00",lemonchiffon:"FFFACD",lightblue:"ADD8E6",lightcoral:"F08080",lightcyan:"E0FFFF",lightgoldenrodyellow:"FAFAD2",lightgreen:"90EE90",lightgrey:"D3D3D3",lightpink:"FFB6C1",lightsalmon:"FFA07A",lightseagreen:"20B2AA",lightskyblue:"87CEFA",lightslategray:"789",lightsteelblue:"B0C4DE",lightyellow:"FFFFE0",lime:"0F0",limegreen:"32CD32",linen:"FAF0E6",magenta:"F0F",maroon:"800000",mediumauqamarine:"66CDAA",
-mediumblue:"0000CD",mediumorchid:"BA55D3",mediumpurple:"9370D8",mediumseagreen:"3CB371",mediumslateblue:"7B68EE",mediumspringgreen:"00FA9A",mediumturquoise:"48D1CC",mediumvioletred:"C71585",midnightblue:"191970",mintcream:"F5FFFA",mistyrose:"FFE4E1",moccasin:"FFE4B5",navajowhite:"FFDEAD",navy:"000080",oldlace:"FDF5E6",olive:"808000",olivedrab:"688E23",orange:"FFA500",orangered:"FF4500",orchid:"DA70D6",palegoldenrod:"EEE8AA",palegreen:"98FB98",paleturquoise:"AFEEEE",palevioletred:"D87093",papayawhip:"FFEFD5",
-peachpuff:"FFDAB9",peru:"CD853F",pink:"FFC0CB",plum:"DDA0DD",powderblue:"B0E0E6",purple:"800080",red:"F00",rosybrown:"BC8F8F",royalblue:"4169E1",saddlebrown:"8B4513",salmon:"FA8072",sandybrown:"F4A460",seagreen:"2E8B57",seashell:"FFF5EE",sienna:"A0522D",silver:"C0C0C0",skyblue:"87CEEB",slateblue:"6A5ACD",slategray:"708090",snow:"FFFAFA",springgreen:"00FF7F",steelblue:"4682B4",tan:"D2B48C",teal:"008080",thistle:"D8BFD8",tomato:"FF6347",turquoise:"40E0D0",violet:"EE82EE",wheat:"F5DEB3",white:"FFF",
-whitesmoke:"F5F5F5",yellow:"FF0",yellowgreen:"9ACD32"};a.prototype={parse:function(){if(!this.Ca){var c=this.V,e;if(e=c.match(a.Sc)){this.Ca="rgb("+e[1]+","+e[2]+","+e[3]+")";this.qb=parseFloat(e[4])}else{if((e=c.toLowerCase())in a.gb)c="#"+a.gb[e];this.Ca=c;this.qb=c==="transparent"?0:1}}},O:function(c){this.parse();return this.Ca==="currentColor"?c.currentStyle.color:this.Ca},la:function(){this.parse();return this.qb}};g.pa=function(c){return b[c]||(b[c]=new a(c))};return a}();g.u=function(){function a(c){this.Ha=
-c;this.ch=0;this.U=[];this.wa=0}var b=a.ja={xa:1,ob:2,ea:4,ac:8,pb:16,fa:32,A:64,ga:128,ha:256,Aa:512,dc:1024,URL:2048};a.Ta=function(c,e){this.h=c;this.d=e};a.Ta.prototype={db:function(){return this.h&b.A||this.h&b.ga&&this.d==="0"},Y:function(){return this.db()||this.h&b.Aa}};a.prototype={dd:/\s/,Mc:/^[\+\-]?(\d*\.)?\d+/,url:/^url\(\s*("([^"]*)"|'([^']*)'|([!#$%&*-~]*))\s*\)/i,zb:/^\-?[_a-z][\w-]*/i,Yc:/^("([^"]*)"|'([^']*)')/,Fc:/^#([\da-f]{6}|[\da-f]{3})/i,bd:{px:b.A,em:b.A,ex:b.A,mm:b.A,cm:b.A,
-"in":b.A,pt:b.A,pc:b.A,deg:b.xa,rad:b.xa,grad:b.xa},sc:{rgb:1,rgba:1,hsl:1,hsla:1},next:function(c){function e(t,n){t=new a.Ta(t,n);if(!c){k.U.push(t);k.wa++}return t}function f(){k.wa++;return null}var h,j,d,i,k=this;if(this.wa<this.U.length)return this.U[this.wa++];for(;this.dd.test(this.Ha.charAt(this.ch));)this.ch++;if(this.ch>=this.Ha.length)return f();j=this.ch;h=this.Ha.substring(this.ch);d=h.charAt(0);switch(d){case "#":if(i=h.match(this.Fc)){this.ch+=i[0].length;return e(b.ea,i[0])}break;
-case '"':case "'":if(i=h.match(this.Yc)){this.ch+=i[0].length;return e(b.dc,i[2]||i[3]||"")}break;case "/":case ",":this.ch++;return e(b.ha,d);case "u":if(i=h.match(this.url)){this.ch+=i[0].length;return e(b.URL,i[2]||i[3]||i[4]||"")}}if(i=h.match(this.Mc)){d=i[0];this.ch+=d.length;if(h.charAt(d.length)==="%"){this.ch++;return e(b.Aa,d+"%")}if(i=h.substring(d.length).match(this.zb)){d+=i[0];this.ch+=i[0].length;return e(this.bd[i[0].toLowerCase()]||b.ac,d)}return e(b.ga,d)}if(i=h.match(this.zb)){d=
-i[0];this.ch+=d.length;if(d.toLowerCase()in g.$b.gb||d==="currentColor")return e(b.ea,d);if(h.charAt(d.length)==="("){this.ch++;if(d.toLowerCase()in this.sc){h=function(t){return t&&t.h&b.ga};i=function(t){return t&&t.h&(b.ga|b.Aa)};var m=function(t,n){return t&&t.d===n},l=function(){return k.next(1)};if((d.charAt(0)==="r"?i(l()):h(l()))&&m(l(),",")&&i(l())&&m(l(),",")&&i(l())&&(d==="rgb"||d==="hsa"||m(l(),",")&&h(l()))&&m(l(),")"))return e(b.ea,this.Ha.substring(j,this.ch));return f()}return e(b.pb,
-d)}return e(b.fa,d)}this.ch++;return e(b.ob,d)},z:function(){return this.U[this.wa-- -2]},all:function(){for(;this.next(););return this.U},da:function(c,e){for(var f=[],h,j;h=this.next();){if(c(h)){j=true;this.z();break}f.push(h)}return e&&!j?null:f}};return a}();var M=function(a){this.e=a};M.prototype={K:0,Qc:function(){var a=this.Ua,b;return!a||(b=this.o())&&(a.x!==b.x||a.y!==b.y)},Vc:function(){var a=this.Ua,b;return!a||(b=this.o())&&(a.i!==b.i||a.f!==b.f)},ub:function(){var a=this.e.getBoundingClientRect();
-return{x:a.left,y:a.top,i:a.right-a.left,f:a.bottom-a.top}},o:function(){return this.K?this.Da||(this.Da=this.ub()):this.ub()},Ec:function(){return!!this.Ua},Ja:function(){++this.K},La:function(){if(!--this.K){if(this.Da)this.Ua=this.Da;this.Da=null}}};(function(){function a(b){var c=g.p.ta(b);return function(){if(this.K){var e=this.rb||(this.rb={});return c in e?e[c]:(e[c]=b.call(this))}else return b.call(this)}}g.s={K:0,$:function(b){function c(e){this.e=e}g.p.fb(c.prototype,g.s,b);c.kc={};return c},
-m:function(){var b=this.qa(),c=this.constructor.kc;return b?b in c?c[b]:(c[b]=this.ba(b)):null},qa:a(function(){var b=this.e,c=this.constructor,e=b.style;b=b.currentStyle;var f=this.na,h=this.va,j=c.ic||(c.ic=g.F+f);c=c.jc||(c.jc=g.Sa+h.charAt(0).toUpperCase()+h.substring(1));return e[c]||b.getAttribute(j)||e[h]||b.getAttribute(f)}),g:a(function(){return!!this.m()}),D:a(function(){var b=this.qa(),c=b!==this.gc;this.gc=b;return c}),ma:a,Ja:function(){++this.K},La:function(){--this.K||delete this.rb}}})();
-g.Tb=g.s.$({na:g.F+"background",va:g.Sa+"Background",nc:{scroll:1,fixed:1,local:1},Ka:{"repeat-x":1,"repeat-y":1,repeat:1,"no-repeat":1},Nc:{"padding-box":1,"border-box":1,"content-box":1},rc:{"padding-box":1,"border-box":1},Rc:{top:1,right:1,bottom:1,left:1,center:1},Wc:{contain:1,cover:1},ba:function(a){function b(u){return u.Y()||u.h&i&&u.d in t}function c(u){return u.Y()&&g.k(u.d)||u.d==="auto"&&"auto"}var e=this.e.currentStyle,f,h,j=g.u.ja,d=j.ha,i=j.fa,k=j.ea,m,l,t=this.Rc,n,p,s=null;if(this.$a()){a=
-new g.u(a);s={M:[]};for(h={};f=a.next();){m=f.h;l=f.d;if(!h.P&&m&j.pb&&l==="linear-gradient"){n={ca:[],P:l};for(p={};f=a.next();){m=f.h;l=f.d;if(m&j.ob&&l===")"){p.color&&n.ca.push(p);n.ca.length>1&&g.p.fb(h,n);break}if(m&k){if(n.Xa||n.bb){f=a.z();if(f.h!==d)break;a.next()}p={color:g.pa(l)};f=a.next();if(f.Y())p.Fb=g.k(f.d);else a.z()}else if(m&j.xa&&!n.Xa&&!p.color&&!n.ca.length)n.Xa=new g.Rb(f.d);else if(b(f)&&!n.bb&&!p.color&&!n.ca.length){a.z();n.bb=new g.Na(a.da(function(u){return!b(u)},false))}else if(m&
-d&&l===","){if(p.color){n.ca.push(p);p={}}}else break}}else if(!h.P&&m&j.URL){h.Cb=l;h.P="image"}else if(b(f)&&!h.size){a.z();h.Ya=new g.Na(a.da(function(u){return!b(u)},false))}else if(m&i)if(l in this.Ka)h.Bb=l;else if(l in this.Nc){h.kd=l;if(l in this.rc)h.clip=l}else{if(l in this.nc)h.jd=l}else if(m&k&&!s.color)s.color=g.pa(l);else if(m&d)if(l==="/"){f=a.next();m=f.h;l=f.d;if(m&i&&l in this.Wc)h.size=l;else if(l=c(f))h.size={i:l,f:c(a.next())||a.z()&&l}}else{if(l===","&&h.P){s.M.push(h);h={}}}else return null}h.P&&
-s.M.push(h)}else this.Nb(function(){var u=e.backgroundPositionX,w=e.backgroundPositionY,r=e.backgroundImage,o=e.backgroundColor;s={};if(o!=="transparent")s.color=g.pa(o);if(r!=="none")s.M=[{P:"image",Cb:(new g.u(r)).next().d,Bb:e.backgroundRepeat,Ya:new g.Na((new g.u(u+" "+w)).all())}]});return s&&(s.color||s.M&&s.M[0])?s:null},Nb:function(a){var b=this.e.runtimeStyle,c=b.backgroundImage,e=b.backgroundColor;if(c)b.backgroundImage="";if(e)b.backgroundColor="";a=a.call(this);if(c)b.backgroundImage=
-c;if(e)b.backgroundColor=e;return a},qa:g.s.ma(function(){return this.$a()||this.Nb(function(){var a=this.e.currentStyle;return a.backgroundColor+" "+a.backgroundImage+" "+a.backgroundRepeat+" "+a.backgroundPositionX+" "+a.backgroundPositionY})}),$a:g.s.ma(function(){var a=this.e;return a.style[this.va]||a.currentStyle.getAttribute(this.na)}),Eb:function(){var a=0;if(g.J<7){a=this.e;a=""+(a.style[g.Sa+"PngFix"]||a.currentStyle.getAttribute(g.F+"png-fix"))==="true"}return a},g:g.s.ma(function(){return(this.$a()||
-this.Eb())&&!!this.m()})});g.Xb=g.s.$({Ib:["Top","Right","Bottom","Left"],Kc:{thin:"1px",medium:"3px",thick:"5px"},ba:function(){var a={},b={},c={},e=false,f=true,h=true,j=true;this.Ob(function(){for(var d=this.e.currentStyle,i=0,k,m,l,t,n,p,s;i<4;i++){l=this.Ib[i];s=l.charAt(0).toLowerCase();k=b[s]=d["border"+l+"Style"];m=d["border"+l+"Color"];l=d["border"+l+"Width"];if(i>0){if(k!==t)h=false;if(m!==n)f=false;if(l!==p)j=false}t=k;n=m;p=l;c[s]=g.pa(m);l=a[s]=g.k(b[s]==="none"?"0":this.Kc[l]||l);if(l.a(this.e)>
-0)e=true}});return e?{nb:a,Zc:b,tc:c,ed:j,uc:f,$c:h}:null},qa:g.s.ma(function(){var a=this.e,b=a.currentStyle,c;a.tagName in g.Jb&&a.offsetParent.currentStyle.borderCollapse==="collapse"||this.Ob(function(){c=b.borderWidth+"|"+b.borderStyle+"|"+b.borderColor});return c}),Ob:function(a){var b=this.e.runtimeStyle,c=b.borderWidth,e=b.borderColor;if(c)b.borderWidth="";if(e)b.borderColor="";a=a.call(this);if(c)b.borderWidth=c;if(e)b.borderColor=e;return a}});(function(){g.Oa=g.s.$({na:"border-radius",
-va:"borderRadius",ba:function(b){var c=null,e,f,h,j,d=false;if(b){f=new g.u(b);var i=function(){for(var k=[],m;(h=f.next())&&h.Y();){j=g.k(h.d);m=j.vb();if(m<0)return null;if(m>0)d=true;k.push(j)}return k.length>0&&k.length<5?{tl:k[0],tr:k[1]||k[0],br:k[2]||k[0],bl:k[3]||k[1]||k[0]}:null};if(b=i()){if(h){if(h.h&g.u.ja.ha&&h.d==="/")e=i()}else e=b;if(d&&b&&e)c={x:b,y:e}}}return c}});var a=g.k("0");a={tl:a,tr:a,br:a,bl:a};g.Oa.Qb={x:a,y:a}})();g.Vb=g.s.$({na:"border-image",va:"borderImage",Ka:{stretch:1,
-round:1,repeat:1,space:1},ba:function(a){var b=null,c,e,f,h,j,d,i=0,k,m=g.u.ja,l=m.fa,t=m.ga,n=m.A,p=m.Aa;if(a){c=new g.u(a);b={};for(var s=function(r){return r&&r.h&m.ha&&r.d==="/"},u=function(r){return r&&r.h&l&&r.d==="fill"},w=function(){h=c.da(function(r){return!(r.h&(t|p))});if(u(c.next())&&!b.fill)b.fill=true;else c.z();if(s(c.next())){i++;j=c.da(function(){return!(e.h&(t|p|n))&&!(e.h&l&&e.d==="auto")});if(s(c.next())){i++;d=c.da(function(){return!(e.h&(t|n))})}}else c.z()};e=c.next();){a=e.h;
-f=e.d;if(a&(t|p)&&!h){c.z();w()}else if(u(e)&&!b.fill){b.fill=true;w()}else if(a&l&&this.Ka[f]&&!b.repeat){b.repeat={f:f};if(e=c.next())if(e.h&l&&this.Ka[e.d])b.repeat.kb=e.d;else c.z()}else if(a&m.URL&&!b.src)b.src=f;else return null}if(!b.src||!h||h.length<1||h.length>4||j&&j.length>4||i===1&&j.length<1||d&&d.length>4||i===2&&d.length<1)return null;if(!b.repeat)b.repeat={f:"stretch"};if(!b.repeat.kb)b.repeat.kb=b.repeat.f;a=function(r,o){return{T:o(r[0]),S:o(r[1]||r[0]),L:o(r[2]||r[0]),Q:o(r[3]||
-r[1]||r[0])}};b.slice=a(h,function(r){return g.k(r.h&t?r.d+"px":r.d)});b.width=j&&j.length>0?a(j,function(r){return r.h&(n|p)?g.k(r.d):r.d}):(k=this.e.currentStyle)&&{T:g.k(k.borderTopWidth),S:g.k(k.borderRightWidth),L:g.k(k.borderBottomWidth),Q:g.k(k.borderLeftWidth)};b.ua=a(d||[0],function(r){return r.h&n?g.k(r.d):r.d})}return b}});g.Zb=g.s.$({na:"box-shadow",va:"boxShadow",ba:function(a){var b,c=g.k,e=g.u.ja,f;if(a){f=new g.u(a);b={ua:[],cb:[]};for(a=function(){for(var h,j,d,i,k,m;h=f.next();){d=
-h.d;j=h.h;if(j&e.ha&&d===",")break;else if(h.db()&&!k){f.z();k=f.da(function(l){return!l.db()})}else if(j&e.ea&&!i)i=d;else if(j&e.fa&&d==="inset"&&!m)m=true;else return false}h=k&&k.length;if(h>1&&h<5){(m?b.cb:b.ua).push({fd:c(k[0].d),gd:c(k[1].d),blur:c(k[2]?k[2].d:"0"),Xc:c(k[3]?k[3].d:"0"),color:g.pa(i||"currentColor")});return true}return false};a(););}return b&&(b.cb.length||b.ua.length)?b:null}});g.ec=g.s.$({qa:g.s.ma(function(){var a=this.e.currentStyle;return a.visibility+"|"+a.display}),
-ba:function(){var a=this.e,b=a.runtimeStyle;a=a.currentStyle;var c=b.visibility,e;b.visibility="";e=a.visibility;b.visibility=c;return{cd:e!=="hidden",xc:a.display!=="none"}},g:function(){return false}});g.B={Z:function(a){function b(c,e,f,h){this.e=c;this.q=e;this.j=f;this.parent=h}g.p.fb(b.prototype,g.B,a);return b},eb:false,R:function(){return false},Kb:function(){this.n();this.g()&&this.X()},jb:function(){this.eb=true},Lb:function(){this.g()?this.X():this.n()},Wa:function(a,b){this.Hb(a);for(var c=
-this.ka||(this.ka=[]),e=a+1,f=c.length,h;e<f;e++)if(h=c[e])break;c[a]=b;this.w().insertBefore(b,h||null)},ra:function(a){var b=this.ka;return b&&b[a]||null},Hb:function(a){var b=this.ra(a),c=this.Ba;if(b&&c){c.removeChild(b);this.ka[a]=null}},sa:function(a,b,c,e){var f=this.Va||(this.Va={}),h=f[a];if(!h){h=f[a]=g.p.Ga("shape");if(b)h.appendChild(h[b]=g.p.Ga(b));if(e){c=this.ra(e);if(!c){this.Wa(e,doc.createElement("group"+e));c=this.ra(e)}}c.appendChild(h);a=h.style;a.position="absolute";a.left=a.top=
-0;a.behavior="url(#default#VML)"}return h},Za:function(a){var b=this.Va,c=b&&b[a];if(c){c.parentNode.removeChild(c);delete b[a]}return!!c},xb:function(a){var b=this.e,c=this.q.o(),e=c.i,f=c.f,h,j,d,i,k,m;c=a.x.tl.a(b,e);h=a.y.tl.a(b,f);j=a.x.tr.a(b,e);d=a.y.tr.a(b,f);i=a.x.br.a(b,e);k=a.y.br.a(b,f);m=a.x.bl.a(b,e);a=a.y.bl.a(b,f);e=Math.min(e/(c+j),f/(d+k),e/(m+i),f/(h+a));if(e<1){c*=e;h*=e;j*=e;d*=e;i*=e;k*=e;m*=e;a*=e}return{x:{tl:c,tr:j,br:i,bl:m},y:{tl:h,tr:d,br:k,bl:a}}},oa:function(a,b,c){b=
-b||1;var e,f,h=this.q.o();f=h.i*b;h=h.f*b;var j=this.j.v,d=Math.floor,i=Math.ceil,k=a?a.T*b:0,m=a?a.S*b:0,l=a?a.L*b:0;a=a?a.Q*b:0;var t,n,p,s,u;if(c||j.g()){e=this.xb(c||j.m());c=e.x.tl*b;j=e.y.tl*b;t=e.x.tr*b;n=e.y.tr*b;p=e.x.br*b;s=e.y.br*b;u=e.x.bl*b;b=e.y.bl*b;f="m"+d(a)+","+d(j)+"qy"+d(c)+","+d(k)+"l"+i(f-t)+","+d(k)+"qx"+i(f-m)+","+d(n)+"l"+i(f-m)+","+i(h-s)+"qy"+i(f-p)+","+i(h-l)+"l"+d(u)+","+i(h-l)+"qx"+d(a)+","+i(h-b)+" x e"}else f="m"+d(a)+","+d(k)+"l"+i(f-m)+","+d(k)+"l"+i(f-m)+","+i(h-
-l)+"l"+d(a)+","+i(h-l)+"xe";return f},w:function(){var a=this.parent.ra(this.C),b;if(!a){a=doc.createElement(this.Fa);b=a.style;b.position="absolute";b.top=b.left=0;this.parent.Wa(this.C,a)}return a},n:function(){this.parent.Hb(this.C);delete this.Va;delete this.ka}};g.cc=g.B.Z({g:function(){var a=this.oc;for(var b in a)if(a.hasOwnProperty(b)&&a[b].g())return true;return false},R:function(){return this.j.lb.D()},jb:function(){if(this.g()){var a=this.wb(),b=a,c;a=a.currentStyle;var e=a.position,f=
-this.w().style,h=0,j=0;j=this.q.o();if(e==="fixed"&&g.J>6){h=j.x;j=j.y;b=e}else{do b=b.offsetParent;while(b&&b.currentStyle.position==="static");if(b){c=b.getBoundingClientRect();b=b.currentStyle;h=j.x-c.left-(parseFloat(b.borderLeftWidth)||0);j=j.y-c.top-(parseFloat(b.borderTopWidth)||0)}else{b=doc.documentElement;h=j.x+b.scrollLeft-b.clientLeft;j=j.y+b.scrollTop-b.clientTop}b="absolute"}f.position=b;f.left=h;f.top=j;f.zIndex=e==="static"?-1:a.zIndex;this.eb=true}},Lb:function(){},Mb:function(){var a=
-this.j.lb.m();this.w().style.display=a.cd&&a.xc?"":"none"},Kb:function(){this.g()?this.Mb():this.n()},wb:function(){var a=this.e;return a.tagName in g.Jb?a.offsetParent:a},w:function(){var a=this.Ba,b;if(!a){b=this.wb();a=this.Ba=doc.createElement("css3-container");a.style.direction="ltr";this.Mb();b.parentNode.insertBefore(a,b)}return a},n:function(){var a=this.Ba,b;if(a&&(b=a.parentNode))b.removeChild(a);delete this.Ba;delete this.ka}});g.Sb=g.B.Z({C:2,Fa:"background",R:function(){var a=this.j;
-return a.H.D()||a.v.D()},g:function(){var a=this.j;return a.N.g()||a.v.g()||a.H.g()||a.W.g()&&a.W.m().cb},X:function(){var a=this.q.o();if(a.i&&a.f){this.yc();this.zc()}},yc:function(){var a=this.j.H.m(),b=this.q.o(),c=this.e,e=a&&a.color,f,h;if(e&&e.la()>0){this.yb();a=this.sa("bgColor","fill",this.w(),1);f=b.i;b=b.f;a.stroked=false;a.coordsize=f*2+","+b*2;a.coordorigin="1,1";a.path=this.oa(null,2);h=a.style;h.width=f;h.height=b;a.fill.color=e.O(c);c=e.la();if(c<1)a.fill.opacity=c}else this.Za("bgColor")},
-zc:function(){var a=this.j.H.m(),b=this.q.o();a=a&&a.M;var c,e,f,h,j;if(a){this.yb();e=b.i;f=b.f;for(j=a.length;j--;){b=a[j];c=this.sa("bgImage"+j,"fill",this.w(),2);c.stroked=false;c.fill.type="tile";c.fillcolor="none";c.coordsize=e*2+","+f*2;c.coordorigin="1,1";c.path=this.oa(0,2);h=c.style;h.width=e;h.height=f;if(b.P==="linear-gradient")this.mc(c,b);else{c.fill.src=b.Cb;this.Pc(c,j)}}}for(j=a?a.length:0;this.Za("bgImage"+j++););},Pc:function(a,b){g.p.Pb(a.fill.src,function(c){var e=a.fill,f=this.e,
-h=this.q.o(),j=h.i;h=h.f;var d=this.j,i=d.I.m(),k=i&&i.nb;i=k?k.t.a(f):0;var m=k?k.r.a(f):0,l=k?k.b.a(f):0;k=k?k.l.a(f):0;d=d.H.m().M[b];f=d.Ya?d.Ya.coords(f,j-c.i-k-m,h-c.f-i-l):{x:0,y:0};d=d.Bb;l=m=0;var t=j+1,n=h+1,p=g.J===8?0:1;k=Math.round(f.x)+k+0.5;i=Math.round(f.y)+i+0.5;e.position=k/j+","+i/h;if(d&&d!=="repeat"){if(d==="repeat-x"||d==="no-repeat"){m=i+1;n=i+c.f+p}if(d==="repeat-y"||d==="no-repeat"){l=k+1;t=k+c.i+p}a.style.clip="rect("+m+"px,"+t+"px,"+n+"px,"+l+"px)"}},this)},mc:function(a,
-b){function c(B,C,z,F,H){if(z===0||z===180)return[F,C];else if(z===90||z===270)return[B,H];else{z=Math.tan(-z*t/180);B=z*B-C;C=-1/z;F=C*F-H;H=C-z;return[(F-B)/H,(z*F-C*B)/H]}}function e(){w=m>=90&&m<270?i:0;r=m<180?k:0;o=i-w;x=k-r}function f(){for(;m<0;)m+=360;m%=360}function h(B,C){var z=C[0]-B[0];B=C[1]-B[1];return Math.abs(z===0?B:B===0?z:Math.sqrt(z*z+B*B))}var j=this.e,d=this.q.o(),i=d.i,k=d.f;a=a.fill;var m=b.Xa,l=b.bb;b=b.ca;d=b.length;var t=Math.PI,n,p,s,u,w,r,o,x,q,y,A,D;if(l){l=l.coords(j,
-i,k);n=l.x;p=l.y}if(m){m=m.vc();f();e();if(!l){n=w;p=r}l=c(n,p,m,o,x);s=l[0];u=l[1]}else if(l){s=i-n;u=k-p}else{n=p=s=0;u=k}l=s-n;q=u-p;if(m===void 0){m=!l?q<0?90:270:!q?l<0?180:0:-Math.atan2(q,l)/t*180;f();e()}l=m%90?Math.atan2(l*i/k,q)/t*180:m+90;l+=180;l%=360;y=h([n,p],[s,u]);s=h([w,r],c(w,r,m,o,x));u=[];p=h([n,p],c(n,p,m,w,r))/s*100;n=[];for(q=0;q<d;q++)n.push(b[q].Fb?b[q].Fb.a(j,y):q===0?0:q===d-1?y:null);for(q=1;q<d;q++){if(n[q]===null){A=n[q-1];y=q;do D=n[++y];while(D===null);n[q]=A+(D-A)/
-(y-q+1)}n[q]=Math.max(n[q],n[q-1])}for(q=0;q<d;q++)u.push(p+n[q]/s*100+"% "+b[q].color.O(j));a.angle=l;a.type="gradient";a.method="sigma";a.color=b[0].color.O(j);a.color2=b[d-1].color.O(j);a.colors.value=u.join(",")},yb:function(){var a=this.e.runtimeStyle;a.backgroundImage="url(about:blank)";a.backgroundColor="transparent"},n:function(){g.B.n.call(this);var a=this.e.runtimeStyle;a.backgroundImage=a.backgroundColor=""}});g.Wb=g.B.Z({C:4,Fa:"border",qc:{TABLE:1,INPUT:1,TEXTAREA:1,SELECT:1,OPTION:1,
-IMG:1,HR:1,FIELDSET:1},Jc:{submit:1,button:1,reset:1},R:function(){var a=this.j;return a.I.D()||a.v.D()},g:function(){var a=this.j;return(a.N.g()||a.v.g()||a.H.g())&&a.I.g()},X:function(){var a=this.e,b=this.j.I.m(),c=this.q.o(),e=c.i;c=c.f;var f,h,j,d,i;if(b){this.Hc();b=this.Bc(2);d=0;for(i=b.length;d<i;d++){j=b[d];f=this.sa("borderPiece"+d,j.stroke?"stroke":"fill",this.w());f.coordsize=e*2+","+c*2;f.coordorigin="1,1";f.path=j.path;h=f.style;h.width=e;h.height=c;f.filled=!!j.fill;f.stroked=!!j.stroke;
-if(j.stroke){f=f.stroke;f.weight=j.mb+"px";f.color=j.color.O(a);f.dashstyle=j.stroke==="dashed"?"2 2":j.stroke==="dotted"?"1 1":"solid";f.linestyle=j.stroke==="double"&&j.mb>2?"ThinThin":"Single"}else f.fill.color=j.fill.O(a)}for(;this.Za("borderPiece"+d++););}},Hc:function(){var a=this.e,b=a.currentStyle,c=a.runtimeStyle,e=a.tagName,f=g.J===6,h;if(f&&e in this.qc||e==="BUTTON"||e==="INPUT"&&a.type in this.Jc){c.borderWidth="";e=this.j.I.Ib;for(h=e.length;h--;){f=e[h];c["padding"+f]="";c["padding"+
-f]=g.k(b["padding"+f]).a(a)+g.k(b["border"+f+"Width"]).a(a)+(!g.J===8&&h%2?1:0)}c.borderWidth=0}else if(f){if(a.childNodes.length!==1||a.firstChild.tagName!=="ie6-mask"){b=doc.createElement("ie6-mask");e=b.style;e.visibility="visible";for(e.zoom=1;e=a.firstChild;)b.appendChild(e);a.appendChild(b);c.visibility="hidden"}}else c.borderColor="transparent"},Bc:function(a){var b=this.e,c,e,f,h=this.j.I,j=[],d,i,k,m,l=Math.round,t,n,p;if(h.g()){c=h.m();h=c.nb;n=c.Zc;p=c.tc;if(c.ed&&c.$c&&c.uc){if(p.t.la()>
-0){c=h.t.a(b);k=c/2;j.push({path:this.oa({T:k,S:k,L:k,Q:k},a),stroke:n.t,color:p.t,mb:c})}}else{a=a||1;c=this.q.o();e=c.i;f=c.f;c=l(h.t.a(b));k=l(h.r.a(b));m=l(h.b.a(b));b=l(h.l.a(b));var s={t:c,r:k,b:m,l:b};b=this.j.v;if(b.g())t=this.xb(b.m());d=Math.floor;i=Math.ceil;var u=function(o,x){return t?t[o][x]:0},w=function(o,x,q,y,A,D){var B=u("x",o),C=u("y",o),z=o.charAt(1)==="r";o=o.charAt(0)==="b";return B>0&&C>0?(D?"al":"ae")+(z?i(e-B):d(B))*a+","+(o?i(f-C):d(C))*a+","+(d(B)-x)*a+","+(d(C)-q)*a+","+
-y*65535+","+2949075*(A?1:-1):(D?"m":"l")+(z?e-x:x)*a+","+(o?f-q:q)*a},r=function(o,x,q,y){var A=o==="t"?d(u("x","tl"))*a+","+i(x)*a:o==="r"?i(e-x)*a+","+d(u("y","tr"))*a:o==="b"?i(e-u("x","br"))*a+","+d(f-x)*a:d(x)*a+","+i(f-u("y","bl"))*a;o=o==="t"?i(e-u("x","tr"))*a+","+i(x)*a:o==="r"?i(e-x)*a+","+i(f-u("y","br"))*a:o==="b"?d(u("x","bl"))*a+","+d(f-x)*a:d(x)*a+","+d(u("y","tl"))*a;return q?(y?"m"+o:"")+"l"+A:(y?"m"+A:"")+"l"+o};b=function(o,x,q,y,A,D){var B=o==="l"||o==="r",C=s[o],z,F;if(C>0&&n[o]!==
-"none"&&p[o].la()>0){z=s[B?o:x];x=s[B?x:o];F=s[B?o:q];q=s[B?q:o];if(n[o]==="dashed"||n[o]==="dotted"){j.push({path:w(y,z,x,D+45,0,1)+w(y,0,0,D,1,0),fill:p[o]});j.push({path:r(o,C/2,0,1),stroke:n[o],mb:C,color:p[o]});j.push({path:w(A,F,q,D,0,1)+w(A,0,0,D-45,1,0),fill:p[o]})}else j.push({path:w(y,z,x,D+45,0,1)+r(o,C,0,0)+w(A,F,q,D,0,0)+(n[o]==="double"&&C>2?w(A,F-d(F/3),q-d(q/3),D-45,1,0)+r(o,i(C/3*2),1,0)+w(y,z-d(z/3),x-d(x/3),D,1,0)+"x "+w(y,d(z/3),d(x/3),D+45,0,1)+r(o,d(C/3),1,0)+w(A,d(F/3),d(q/
-3),D,0,0):"")+w(A,0,0,D-45,1,0)+r(o,0,1,0)+w(y,0,0,D,1,0),fill:p[o]})}};b("t","l","r","tl","tr",90);b("r","t","b","tr","br",0);b("b","r","l","br","bl",-90);b("l","b","t","bl","tl",-180)}}return j},n:function(){g.B.n.call(this);this.e.runtimeStyle.borderColor=""}});g.Ub=g.B.Z({C:5,Oc:["t","tr","r","br","b","bl","l","tl","c"],R:function(){return this.j.N.D()},g:function(){return this.j.N.g()},X:function(){this.w();var a=this.j.N.m(),b=this.q.o(),c=this.e,e=this.Gb;g.p.Pb(a.src,function(f){function h(w,
-r,o,x,q){w=e[w].style;var y=Math.max;w.width=y(r,0);w.height=y(o,0);w.left=x;w.top=q}function j(w,r,o){for(var x=0,q=w.length;x<q;x++)e[w[x]].imagedata[r]=o}var d=b.i,i=b.f,k=a.width,m=k.T.a(c),l=k.S.a(c),t=k.L.a(c);k=k.Q.a(c);var n=a.slice,p=n.T.a(c),s=n.S.a(c),u=n.L.a(c);n=n.Q.a(c);h("tl",k,m,0,0);h("t",d-k-l,m,k,0);h("tr",l,m,d-l,0);h("r",l,i-m-t,d-l,m);h("br",l,t,d-l,i-t);h("b",d-k-l,t,k,i-t);h("bl",k,t,0,i-t);h("l",k,i-m-t,0,m);h("c",d-k-l,i-m-t,k,m);j(["tl","t","tr"],"cropBottom",(f.f-p)/f.f);
-j(["tl","l","bl"],"cropRight",(f.i-n)/f.i);j(["bl","b","br"],"cropTop",(f.f-u)/f.f);j(["tr","r","br"],"cropLeft",(f.i-s)/f.i);if(a.repeat.kb==="stretch"){j(["l","r","c"],"cropTop",p/f.f);j(["l","r","c"],"cropBottom",u/f.f)}if(a.repeat.f==="stretch"){j(["t","b","c"],"cropLeft",n/f.i);j(["t","b","c"],"cropRight",s/f.i)}e.c.style.display=a.fill?"":"none"},this)},w:function(){var a=this.parent.ra(this.C),b,c,e,f=this.Oc,h=f.length;if(!a){a=doc.createElement("border-image");b=a.style;b.position="absolute";
-this.Gb={};for(e=0;e<h;e++){c=this.Gb[f[e]]=g.p.Ga("rect");c.appendChild(g.p.Ga("imagedata"));b=c.style;b.behavior="url(#default#VML)";b.position="absolute";b.top=b.left=0;c.imagedata.src=this.j.N.m().src;c.stroked=false;c.filled=false;a.appendChild(c)}this.parent.Wa(this.C,a)}return a}});g.Yb=g.B.Z({C:1,Fa:"outset-box-shadow",R:function(){var a=this.j;return a.W.D()||a.v.D()},g:function(){var a=this.j.W;return a.g()&&a.m().ua[0]},X:function(){function a(z,F,H,K,J,v,E){z=b.sa("shadow"+z+F,"fill",
-e,j-z);F=z.fill;z.coordsize=m*2+","+l*2;z.coordorigin="1,1";z.stroked=false;z.filled=true;F.color=J.O(c);if(v){F.type="gradienttitle";F.color2=F.color;F.opacity=0}z.path=E;u=z.style;u.left=H;u.top=K;u.width=m;u.height=l;return z}var b=this,c=this.e,e=this.w(),f=this.j,h=f.W.m().ua;f=f.v.m();var j=h.length,d=j,i,k=this.q.o(),m=k.i,l=k.f;k=g.J===8?1:0;for(var t=["tl","tr","br","bl"],n,p,s,u,w,r,o,x,q,y,A,D,B,C;d--;){p=h[d];w=p.fd.a(c);r=p.gd.a(c);i=p.Xc.a(c);o=p.blur.a(c);p=p.color;x=-i-o;if(!f&&o)f=
-g.Oa.Qb;x=this.oa({T:x,S:x,L:x,Q:x},2,f);if(o){q=(i+o)*2+m;y=(i+o)*2+l;A=o*2/q;D=o*2/y;if(o-i>m/2||o-i>l/2)for(i=4;i--;){n=t[i];B=n.charAt(0)==="b";C=n.charAt(1)==="r";n=a(d,n,w,r,p,o,x);s=n.fill;s.focusposition=(C?1-A:A)+","+(B?1-D:D);s.focussize="0,0";n.style.clip="rect("+((B?y/2:0)+k)+"px,"+(C?q:q/2)+"px,"+(B?y:y/2)+"px,"+((C?q/2:0)+k)+"px)"}else{n=a(d,"",w,r,p,o,x);s=n.fill;s.focusposition=A+","+D;s.focussize=1-A*2+","+(1-D*2)}}else{n=a(d,"",w,r,p,o,x);w=p.la();if(w<1)n.fill.opacity=w}}}});g.bc=
-g.B.Z({C:6,Fa:"imgEl",R:function(){var a=this.j;return this.e.src!==this.hc||a.v.D()},g:function(){var a=this.j;return a.v.g()||a.H.Eb()},X:function(){this.hc=j;this.Gc();var a=this.sa("img","fill",this.w()),b=a.fill,c=this.q.o(),e=c.i;c=c.f;var f=this.j.I.m();f=f&&f.nb;var h=this.e,j=h.src,d=Math.round;a.stroked=false;b.type="frame";b.src=j;b.position=(e?0.5/e:0)+","+(c?0.5/c:0);a.coordsize=e*2+","+c*2;a.coordorigin="1,1";a.path=this.oa(f?{T:d(f.t.a(h)),S:d(f.r.a(h)),L:d(f.b.a(h)),Q:d(f.l.a(h))}:
-0,2);a=a.style;a.width=e;a.height=c},Gc:function(){this.e.runtimeStyle.filter="alpha(opacity=0)"},n:function(){g.B.n.call(this);this.e.runtimeStyle.filter=""}});g.Qa=function(){function a(d){function i(){if(!z){var v,E,G=d.currentStyle,I=G.getAttribute(c)==="true";J=G.getAttribute(e);J=g.Ab===8?J!=="false":J==="true";if(!C){C=1;d.runtimeStyle.zoom=1;G=d;for(var O=1;G=G.previousSibling;)if(G.nodeType===1){O=0;break}if(O)d.className+=" "+g.Pa+"first-child"}y.Ja();if(I&&(E=y.o())&&(v=doc.documentElement||
-doc.body)&&(E.y>v.clientHeight||E.x>v.clientWidth||E.y+E.f<0||E.x+E.i<0)){if(!H){H=1;g.Ra.aa(i)}}else{z=1;H=C=0;g.Ra.Ma(i);A={H:new g.Tb(d),I:new g.Xb(d),N:new g.Vb(d),v:new g.Oa(d),W:new g.Zb(d),lb:new g.ec(d)};D=[A.H,A.I,A.N,A.v,A.W,A.lb];v=new g.cc(d,y,A);E=[new g.Yb(d,y,A,v),new g.Sb(d,y,A,v),new g.Wb(d,y,A,v),new g.Ub(d,y,A,v)];d.tagName==="IMG"&&E.push(new g.bc(d,y,A,v));v.oc=E;q=[v].concat(E);if(v=d.currentStyle.getAttribute(g.F+"watch-ancestors")){B=[];v=parseInt(v,10);E=0;for(I=d.parentNode;I&&
-(v==="NaN"||E++<v);){B.push(I);I.attachEvent("onpropertychange",u);I.attachEvent("onmouseenter",p);I.attachEvent("onmouseleave",s);I=I.parentNode}}if(J){g.ya.aa(m);g.ya.Tc()}m(1)}if(!F){F=1;d.attachEvent("onmove",k);d.attachEvent("onresize",k);d.attachEvent("onpropertychange",l);d.attachEvent("onmouseenter",p);d.attachEvent("onmouseleave",s);g.za.aa(k);g.G.aa(o)}y.La()}}function k(){y&&y.Ec()&&m()}function m(v){if(!K)if(z){var E,G;w();if(v||y.Qc()){E=0;for(G=q.length;E<G;E++)q[E].jb()}if(v||y.Vc()){E=
-0;for(G=q.length;E<G;E++)q[E].Lb()}r()}else C||i()}function l(){var v,E,G;v=event;if(!K&&!(v&&v.propertyName in j))if(z){w();v=0;for(E=q.length;v<E;v++){G=q[v];G.eb||G.jb();G.R()&&G.Kb()}r()}else C||i()}function t(){if(d)d.className+=f}function n(){if(d)d.className=d.className.replace(h,"")}function p(){setTimeout(t,0)}function s(){setTimeout(n,0)}function u(){var v=event.propertyName;if(v==="className"||v==="id")l()}function w(){y.Ja();for(var v=D.length;v--;)D[v].Ja()}function r(){for(var v=D.length;v--;)D[v].La();
-y.La()}function o(){if(F){if(B)for(var v=0,E=B.length,G;v<E;v++){G=B[v];G.detachEvent("onpropertychange",u);G.detachEvent("onmouseenter",p);G.detachEvent("onmouseleave",s)}d.detachEvent("onmove",m);d.detachEvent("onresize",m);d.detachEvent("onpropertychange",l);d.detachEvent("onmouseenter",p);d.detachEvent("onmouseleave",s);g.G.Ma(o);F=0}}function x(){if(!K){var v,E;o();K=1;if(q){v=0;for(E=q.length;v<E;v++)q[v].n()}J&&g.ya.Ma(m);g.za.Ma(m);q=y=A=D=B=d=null}}var q,y=new M(d),A,D,B,C,z,F,H,K,J;this.Ic=
-i;this.update=m;this.n=x;this.Ac=d}var b={},c=g.F+"lazy-init",e=g.F+"poll",f=" "+g.Pa+"hover",h=new RegExp("\\b"+g.Pa+"hover\\b","g"),j={background:1,bgColor:1,display:1};a.Cc=function(d){var i=g.p.ta(d);return b[i]||(b[i]=new a(d))};a.n=function(d){d=g.p.ta(d);var i=b[d];if(i){i.n();delete b[d]}};a.wc=function(){var d=[],i;if(b){for(var k in b)if(b.hasOwnProperty(k)){i=b[k];d.push(i.Ac);i.n()}b={}}return d};return a}();g.attach=function(a){g.Ab<9&&g.Qa.Cc(a).Ic()};g.detach=function(a){g.Qa.n(a)}};
-var N=window.PIE,P=element;function init(){N&&doc.media!=="print"&&N.attach(P)}function cleanup(){if(N){N.detach(P);N=P=0}}P.readyState==="complete"&&init();
-</script>
-</PUBLIC:COMPONENT>
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/css/pie/PIE.js b/core/src/plugins/gui.ajax/res/themes/vision/css/pie/PIE.js
deleted file mode 100755
index fec517293b..0000000000
--- a/core/src/plugins/gui.ajax/res/themes/vision/css/pie/PIE.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-PIE: CSS3 rendering for IE
-Version 1.0beta4
-http://css3pie.com
-Dual-licensed for use under the Apache License Version 2.0 or the General Public License (GPL) Version 2.
-*/
-(function(){
-var doc = document;var g=window.PIE;
-if(!g){g=window.PIE={F:"-pie-",Sa:"Pie",Pa:"pie_",Jb:{TD:1,TH:1}};try{doc.execCommand("BackgroundImageCache",false,true)}catch(L){}g.J=function(){for(var a=4,b=doc.createElement("div"),c=b.getElementsByTagName("i");b.innerHTML="<!--[if gt IE "+ ++a+"]><i></i><![endif]--\>",c[0];);return a}();if(g.J===6)g.F=g.F.replace(/^-/,"");g.Ab=doc.documentMode||g.J;(function(){var a,b=0,c={};g.p={Ga:function(e){if(!a){a=doc.createDocumentFragment();a.namespaces.add("css3vml","urn:schemas-microsoft-com:vml")}return a.createElement("css3vml:"+e)},
-ta:function(e){return e&&e._pieId||(e._pieId=++b)},fb:function(e){var f,h,j,d,i=arguments;f=1;for(h=i.length;f<h;f++){d=i[f];for(j in d)if(d.hasOwnProperty(j))e[j]=d[j]}return e},Pb:function(e,f,h){var j=c[e],d,i;if(j)Object.prototype.toString.call(j)==="[object Array]"?j.push([f,h]):f.call(h,j);else{i=c[e]=[[f,h]];d=new Image;d.onload=function(){j=c[e]={i:d.width,f:d.height};for(var k=0,m=i.length;k<m;k++)i[k][0].call(i[k][1],j);d.onload=null};d.src=e}}}})();g.ia=function(){this.hb=[];this.Db={}};
-g.ia.prototype={aa:function(a){var b=g.p.ta(a),c=this.Db,e=this.hb;if(!(b in c)){c[b]=e.length;e.push(a)}},Ma:function(a){a=g.p.ta(a);var b=this.Db;if(a&&a in b){delete this.hb[b[a]];delete b[a]}},Ia:function(){for(var a=this.hb,b=a.length;b--;)a[b]&&a[b]()}};g.ya=new g.ia;g.ya.Tc=function(){var a=this;if(!a.Uc){setInterval(function(){a.Ia()},250);a.Uc=1}};g.G=new g.ia;window.attachEvent("onbeforeunload",function(){g.G.Ia()});g.G.Ea=function(a,b,c){a.attachEvent(b,c);this.aa(function(){a.detachEvent(b,
-c)})};(function(){function a(){g.za.Ia()}g.za=new g.ia;g.G.Ea(window,"onresize",a)})();(function(){function a(){g.Ra.Ia()}g.Ra=new g.ia;g.G.Ea(window,"onscroll",a);g.za.aa(a)})();(function(){function a(){c=g.Qa.wc()}function b(){if(c){for(var e=0,f=c.length;e<f;e++)g.attach(c[e]);c=0}}var c;g.G.Ea(window,"onbeforeprint",a);g.G.Ea(window,"onafterprint",b)})();g.hd=function(){function a(i){this.V=i}var b=doc.createElement("length-calc"),c=doc.documentElement,e=b.style,f={},h=["mm","cm","in","pt","pc"],
-j=h.length,d={};e.position="absolute";e.top=e.left="-9999px";for(c.appendChild(b);j--;){b.style.width="100"+h[j];f[h[j]]=b.offsetWidth/100}c.removeChild(b);a.prototype={ib:/(px|em|ex|mm|cm|in|pt|pc|%)$/,vb:function(){var i=this.Lc;if(i===void 0)i=this.Lc=parseFloat(this.V);return i},ab:function(){var i=this.ad;if(!i)i=this.ad=(i=this.V.match(this.ib))&&i[0]||"px";return i},a:function(i,k){var m=this.vb(),l=this.ab();switch(l){case "px":return m;case "%":return m*(typeof k==="function"?k():k)/100;
-case "em":return m*this.tb(i);case "ex":return m*this.tb(i)/2;default:return m*f[l]}},tb:function(i){var k=i.currentStyle.fontSize;if(k.indexOf("px")>0)return parseFloat(k);else{b.style.width="1em";i.appendChild(b);k=b.offsetWidth;b.parentNode===i&&i.removeChild(b);return k}}};g.k=function(i){return d[i]||(d[i]=new a(i))};return a}();g.Na=function(){function a(f){this.U=f}var b=g.k("50%"),c={top:1,center:1,bottom:1},e={left:1,center:1,right:1};a.prototype={Dc:function(){if(!this.sb){var f=this.U,
-h=f.length,j=g.u,d=j.ja,i=g.k("0");d=d.fa;i=["left",i,"top",i];if(h===1){f.push(new j.Ta(d,"center"));h++}if(h===2){d&(f[0].h|f[1].h)&&f[0].d in c&&f[1].d in e&&f.push(f.shift());if(f[0].h&d)if(f[0].d==="center")i[1]=b;else i[0]=f[0].d;else if(f[0].Y())i[1]=g.k(f[0].d);if(f[1].h&d)if(f[1].d==="center")i[3]=b;else i[2]=f[1].d;else if(f[1].Y())i[3]=g.k(f[1].d)}this.sb=i}return this.sb},coords:function(f,h,j){var d=this.Dc(),i=d[1].a(f,h);f=d[3].a(f,j);return{x:d[0]==="right"?h-i:i,y:d[2]==="bottom"?
-j-f:f}}};return a}();g.Rb=function(){function a(b){this.V=b}a.prototype={ib:/[a-z]+$/i,ab:function(){return this.lc||(this.lc=this.V.match(this.ib)[0].toLowerCase())},vc:function(){var b=this.fc,c;if(b===undefined){b=this.ab();c=parseFloat(this.V,10);b=this.fc=b==="deg"?c:b==="rad"?c/Math.PI*180:b==="grad"?c/400*360:b==="turn"?c*360:0}return b}};return a}();g.$b=function(){function a(c){this.V=c}var b={};a.Sc=/\s*rgba\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d+|\d*\.\d+)\s*\)\s*/;a.gb=
-{aliceblue:"F0F8FF",antiquewhite:"FAEBD7",aqua:"0FF",aquamarine:"7FFFD4",azure:"F0FFFF",beige:"F5F5DC",bisque:"FFE4C4",black:"000",blanchedalmond:"FFEBCD",blue:"00F",blueviolet:"8A2BE2",brown:"A52A2A",burlywood:"DEB887",cadetblue:"5F9EA0",chartreuse:"7FFF00",chocolate:"D2691E",coral:"FF7F50",cornflowerblue:"6495ED",cornsilk:"FFF8DC",crimson:"DC143C",cyan:"0FF",darkblue:"00008B",darkcyan:"008B8B",darkgoldenrod:"B8860B",darkgray:"A9A9A9",darkgreen:"006400",darkkhaki:"BDB76B",darkmagenta:"8B008B",darkolivegreen:"556B2F",
-darkorange:"FF8C00",darkorchid:"9932CC",darkred:"8B0000",darksalmon:"E9967A",darkseagreen:"8FBC8F",darkslateblue:"483D8B",darkslategray:"2F4F4F",darkturquoise:"00CED1",darkviolet:"9400D3",deeppink:"FF1493",deepskyblue:"00BFFF",dimgray:"696969",dodgerblue:"1E90FF",firebrick:"B22222",floralwhite:"FFFAF0",forestgreen:"228B22",fuchsia:"F0F",gainsboro:"DCDCDC",ghostwhite:"F8F8FF",gold:"FFD700",goldenrod:"DAA520",gray:"808080",green:"008000",greenyellow:"ADFF2F",honeydew:"F0FFF0",hotpink:"FF69B4",indianred:"CD5C5C",
-indigo:"4B0082",ivory:"FFFFF0",khaki:"F0E68C",lavender:"E6E6FA",lavenderblush:"FFF0F5",lawngreen:"7CFC00",lemonchiffon:"FFFACD",lightblue:"ADD8E6",lightcoral:"F08080",lightcyan:"E0FFFF",lightgoldenrodyellow:"FAFAD2",lightgreen:"90EE90",lightgrey:"D3D3D3",lightpink:"FFB6C1",lightsalmon:"FFA07A",lightseagreen:"20B2AA",lightskyblue:"87CEFA",lightslategray:"789",lightsteelblue:"B0C4DE",lightyellow:"FFFFE0",lime:"0F0",limegreen:"32CD32",linen:"FAF0E6",magenta:"F0F",maroon:"800000",mediumauqamarine:"66CDAA",
-mediumblue:"0000CD",mediumorchid:"BA55D3",mediumpurple:"9370D8",mediumseagreen:"3CB371",mediumslateblue:"7B68EE",mediumspringgreen:"00FA9A",mediumturquoise:"48D1CC",mediumvioletred:"C71585",midnightblue:"191970",mintcream:"F5FFFA",mistyrose:"FFE4E1",moccasin:"FFE4B5",navajowhite:"FFDEAD",navy:"000080",oldlace:"FDF5E6",olive:"808000",olivedrab:"688E23",orange:"FFA500",orangered:"FF4500",orchid:"DA70D6",palegoldenrod:"EEE8AA",palegreen:"98FB98",paleturquoise:"AFEEEE",palevioletred:"D87093",papayawhip:"FFEFD5",
-peachpuff:"FFDAB9",peru:"CD853F",pink:"FFC0CB",plum:"DDA0DD",powderblue:"B0E0E6",purple:"800080",red:"F00",rosybrown:"BC8F8F",royalblue:"4169E1",saddlebrown:"8B4513",salmon:"FA8072",sandybrown:"F4A460",seagreen:"2E8B57",seashell:"FFF5EE",sienna:"A0522D",silver:"C0C0C0",skyblue:"87CEEB",slateblue:"6A5ACD",slategray:"708090",snow:"FFFAFA",springgreen:"00FF7F",steelblue:"4682B4",tan:"D2B48C",teal:"008080",thistle:"D8BFD8",tomato:"FF6347",turquoise:"40E0D0",violet:"EE82EE",wheat:"F5DEB3",white:"FFF",
-whitesmoke:"F5F5F5",yellow:"FF0",yellowgreen:"9ACD32"};a.prototype={parse:function(){if(!this.Ca){var c=this.V,e;if(e=c.match(a.Sc)){this.Ca="rgb("+e[1]+","+e[2]+","+e[3]+")";this.qb=parseFloat(e[4])}else{if((e=c.toLowerCase())in a.gb)c="#"+a.gb[e];this.Ca=c;this.qb=c==="transparent"?0:1}}},O:function(c){this.parse();return this.Ca==="currentColor"?c.currentStyle.color:this.Ca},la:function(){this.parse();return this.qb}};g.pa=function(c){return b[c]||(b[c]=new a(c))};return a}();g.u=function(){function a(c){this.Ha=
-c;this.ch=0;this.U=[];this.wa=0}var b=a.ja={xa:1,ob:2,ea:4,ac:8,pb:16,fa:32,A:64,ga:128,ha:256,Aa:512,dc:1024,URL:2048};a.Ta=function(c,e){this.h=c;this.d=e};a.Ta.prototype={db:function(){return this.h&b.A||this.h&b.ga&&this.d==="0"},Y:function(){return this.db()||this.h&b.Aa}};a.prototype={dd:/\s/,Mc:/^[\+\-]?(\d*\.)?\d+/,url:/^url\(\s*("([^"]*)"|'([^']*)'|([!#$%&*-~]*))\s*\)/i,zb:/^\-?[_a-z][\w-]*/i,Yc:/^("([^"]*)"|'([^']*)')/,Fc:/^#([\da-f]{6}|[\da-f]{3})/i,bd:{px:b.A,em:b.A,ex:b.A,mm:b.A,cm:b.A,
-"in":b.A,pt:b.A,pc:b.A,deg:b.xa,rad:b.xa,grad:b.xa},sc:{rgb:1,rgba:1,hsl:1,hsla:1},next:function(c){function e(t,n){t=new a.Ta(t,n);if(!c){k.U.push(t);k.wa++}return t}function f(){k.wa++;return null}var h,j,d,i,k=this;if(this.wa<this.U.length)return this.U[this.wa++];for(;this.dd.test(this.Ha.charAt(this.ch));)this.ch++;if(this.ch>=this.Ha.length)return f();j=this.ch;h=this.Ha.substring(this.ch);d=h.charAt(0);switch(d){case "#":if(i=h.match(this.Fc)){this.ch+=i[0].length;return e(b.ea,i[0])}break;
-case '"':case "'":if(i=h.match(this.Yc)){this.ch+=i[0].length;return e(b.dc,i[2]||i[3]||"")}break;case "/":case ",":this.ch++;return e(b.ha,d);case "u":if(i=h.match(this.url)){this.ch+=i[0].length;return e(b.URL,i[2]||i[3]||i[4]||"")}}if(i=h.match(this.Mc)){d=i[0];this.ch+=d.length;if(h.charAt(d.length)==="%"){this.ch++;return e(b.Aa,d+"%")}if(i=h.substring(d.length).match(this.zb)){d+=i[0];this.ch+=i[0].length;return e(this.bd[i[0].toLowerCase()]||b.ac,d)}return e(b.ga,d)}if(i=h.match(this.zb)){d=
-i[0];this.ch+=d.length;if(d.toLowerCase()in g.$b.gb||d==="currentColor")return e(b.ea,d);if(h.charAt(d.length)==="("){this.ch++;if(d.toLowerCase()in this.sc){h=function(t){return t&&t.h&b.ga};i=function(t){return t&&t.h&(b.ga|b.Aa)};var m=function(t,n){return t&&t.d===n},l=function(){return k.next(1)};if((d.charAt(0)==="r"?i(l()):h(l()))&&m(l(),",")&&i(l())&&m(l(),",")&&i(l())&&(d==="rgb"||d==="hsa"||m(l(),",")&&h(l()))&&m(l(),")"))return e(b.ea,this.Ha.substring(j,this.ch));return f()}return e(b.pb,
-d)}return e(b.fa,d)}this.ch++;return e(b.ob,d)},z:function(){return this.U[this.wa-- -2]},all:function(){for(;this.next(););return this.U},da:function(c,e){for(var f=[],h,j;h=this.next();){if(c(h)){j=true;this.z();break}f.push(h)}return e&&!j?null:f}};return a}();var M=function(a){this.e=a};M.prototype={K:0,Qc:function(){var a=this.Ua,b;return!a||(b=this.o())&&(a.x!==b.x||a.y!==b.y)},Vc:function(){var a=this.Ua,b;return!a||(b=this.o())&&(a.i!==b.i||a.f!==b.f)},ub:function(){var a=this.e.getBoundingClientRect();
-return{x:a.left,y:a.top,i:a.right-a.left,f:a.bottom-a.top}},o:function(){return this.K?this.Da||(this.Da=this.ub()):this.ub()},Ec:function(){return!!this.Ua},Ja:function(){++this.K},La:function(){if(!--this.K){if(this.Da)this.Ua=this.Da;this.Da=null}}};(function(){function a(b){var c=g.p.ta(b);return function(){if(this.K){var e=this.rb||(this.rb={});return c in e?e[c]:(e[c]=b.call(this))}else return b.call(this)}}g.s={K:0,$:function(b){function c(e){this.e=e}g.p.fb(c.prototype,g.s,b);c.kc={};return c},
-m:function(){var b=this.qa(),c=this.constructor.kc;return b?b in c?c[b]:(c[b]=this.ba(b)):null},qa:a(function(){var b=this.e,c=this.constructor,e=b.style;b=b.currentStyle;var f=this.na,h=this.va,j=c.ic||(c.ic=g.F+f);c=c.jc||(c.jc=g.Sa+h.charAt(0).toUpperCase()+h.substring(1));return e[c]||b.getAttribute(j)||e[h]||b.getAttribute(f)}),g:a(function(){return!!this.m()}),D:a(function(){var b=this.qa(),c=b!==this.gc;this.gc=b;return c}),ma:a,Ja:function(){++this.K},La:function(){--this.K||delete this.rb}}})();
-g.Tb=g.s.$({na:g.F+"background",va:g.Sa+"Background",nc:{scroll:1,fixed:1,local:1},Ka:{"repeat-x":1,"repeat-y":1,repeat:1,"no-repeat":1},Nc:{"padding-box":1,"border-box":1,"content-box":1},rc:{"padding-box":1,"border-box":1},Rc:{top:1,right:1,bottom:1,left:1,center:1},Wc:{contain:1,cover:1},ba:function(a){function b(u){return u.Y()||u.h&i&&u.d in t}function c(u){return u.Y()&&g.k(u.d)||u.d==="auto"&&"auto"}var e=this.e.currentStyle,f,h,j=g.u.ja,d=j.ha,i=j.fa,k=j.ea,m,l,t=this.Rc,n,p,s=null;if(this.$a()){a=
-new g.u(a);s={M:[]};for(h={};f=a.next();){m=f.h;l=f.d;if(!h.P&&m&j.pb&&l==="linear-gradient"){n={ca:[],P:l};for(p={};f=a.next();){m=f.h;l=f.d;if(m&j.ob&&l===")"){p.color&&n.ca.push(p);n.ca.length>1&&g.p.fb(h,n);break}if(m&k){if(n.Xa||n.bb){f=a.z();if(f.h!==d)break;a.next()}p={color:g.pa(l)};f=a.next();if(f.Y())p.Fb=g.k(f.d);else a.z()}else if(m&j.xa&&!n.Xa&&!p.color&&!n.ca.length)n.Xa=new g.Rb(f.d);else if(b(f)&&!n.bb&&!p.color&&!n.ca.length){a.z();n.bb=new g.Na(a.da(function(u){return!b(u)},false))}else if(m&
-d&&l===","){if(p.color){n.ca.push(p);p={}}}else break}}else if(!h.P&&m&j.URL){h.Cb=l;h.P="image"}else if(b(f)&&!h.size){a.z();h.Ya=new g.Na(a.da(function(u){return!b(u)},false))}else if(m&i)if(l in this.Ka)h.Bb=l;else if(l in this.Nc){h.kd=l;if(l in this.rc)h.clip=l}else{if(l in this.nc)h.jd=l}else if(m&k&&!s.color)s.color=g.pa(l);else if(m&d)if(l==="/"){f=a.next();m=f.h;l=f.d;if(m&i&&l in this.Wc)h.size=l;else if(l=c(f))h.size={i:l,f:c(a.next())||a.z()&&l}}else{if(l===","&&h.P){s.M.push(h);h={}}}else return null}h.P&&
-s.M.push(h)}else this.Nb(function(){var u=e.backgroundPositionX,w=e.backgroundPositionY,r=e.backgroundImage,o=e.backgroundColor;s={};if(o!=="transparent")s.color=g.pa(o);if(r!=="none")s.M=[{P:"image",Cb:(new g.u(r)).next().d,Bb:e.backgroundRepeat,Ya:new g.Na((new g.u(u+" "+w)).all())}]});return s&&(s.color||s.M&&s.M[0])?s:null},Nb:function(a){var b=this.e.runtimeStyle,c=b.backgroundImage,e=b.backgroundColor;if(c)b.backgroundImage="";if(e)b.backgroundColor="";a=a.call(this);if(c)b.backgroundImage=
-c;if(e)b.backgroundColor=e;return a},qa:g.s.ma(function(){return this.$a()||this.Nb(function(){var a=this.e.currentStyle;return a.backgroundColor+" "+a.backgroundImage+" "+a.backgroundRepeat+" "+a.backgroundPositionX+" "+a.backgroundPositionY})}),$a:g.s.ma(function(){var a=this.e;return a.style[this.va]||a.currentStyle.getAttribute(this.na)}),Eb:function(){var a=0;if(g.J<7){a=this.e;a=""+(a.style[g.Sa+"PngFix"]||a.currentStyle.getAttribute(g.F+"png-fix"))==="true"}return a},g:g.s.ma(function(){return(this.$a()||
-this.Eb())&&!!this.m()})});g.Xb=g.s.$({Ib:["Top","Right","Bottom","Left"],Kc:{thin:"1px",medium:"3px",thick:"5px"},ba:function(){var a={},b={},c={},e=false,f=true,h=true,j=true;this.Ob(function(){for(var d=this.e.currentStyle,i=0,k,m,l,t,n,p,s;i<4;i++){l=this.Ib[i];s=l.charAt(0).toLowerCase();k=b[s]=d["border"+l+"Style"];m=d["border"+l+"Color"];l=d["border"+l+"Width"];if(i>0){if(k!==t)h=false;if(m!==n)f=false;if(l!==p)j=false}t=k;n=m;p=l;c[s]=g.pa(m);l=a[s]=g.k(b[s]==="none"?"0":this.Kc[l]||l);if(l.a(this.e)>
-0)e=true}});return e?{nb:a,Zc:b,tc:c,ed:j,uc:f,$c:h}:null},qa:g.s.ma(function(){var a=this.e,b=a.currentStyle,c;a.tagName in g.Jb&&a.offsetParent.currentStyle.borderCollapse==="collapse"||this.Ob(function(){c=b.borderWidth+"|"+b.borderStyle+"|"+b.borderColor});return c}),Ob:function(a){var b=this.e.runtimeStyle,c=b.borderWidth,e=b.borderColor;if(c)b.borderWidth="";if(e)b.borderColor="";a=a.call(this);if(c)b.borderWidth=c;if(e)b.borderColor=e;return a}});(function(){g.Oa=g.s.$({na:"border-radius",
-va:"borderRadius",ba:function(b){var c=null,e,f,h,j,d=false;if(b){f=new g.u(b);var i=function(){for(var k=[],m;(h=f.next())&&h.Y();){j=g.k(h.d);m=j.vb();if(m<0)return null;if(m>0)d=true;k.push(j)}return k.length>0&&k.length<5?{tl:k[0],tr:k[1]||k[0],br:k[2]||k[0],bl:k[3]||k[1]||k[0]}:null};if(b=i()){if(h){if(h.h&g.u.ja.ha&&h.d==="/")e=i()}else e=b;if(d&&b&&e)c={x:b,y:e}}}return c}});var a=g.k("0");a={tl:a,tr:a,br:a,bl:a};g.Oa.Qb={x:a,y:a}})();g.Vb=g.s.$({na:"border-image",va:"borderImage",Ka:{stretch:1,
-round:1,repeat:1,space:1},ba:function(a){var b=null,c,e,f,h,j,d,i=0,k,m=g.u.ja,l=m.fa,t=m.ga,n=m.A,p=m.Aa;if(a){c=new g.u(a);b={};for(var s=function(r){return r&&r.h&m.ha&&r.d==="/"},u=function(r){return r&&r.h&l&&r.d==="fill"},w=function(){h=c.da(function(r){return!(r.h&(t|p))});if(u(c.next())&&!b.fill)b.fill=true;else c.z();if(s(c.next())){i++;j=c.da(function(){return!(e.h&(t|p|n))&&!(e.h&l&&e.d==="auto")});if(s(c.next())){i++;d=c.da(function(){return!(e.h&(t|n))})}}else c.z()};e=c.next();){a=e.h;
-f=e.d;if(a&(t|p)&&!h){c.z();w()}else if(u(e)&&!b.fill){b.fill=true;w()}else if(a&l&&this.Ka[f]&&!b.repeat){b.repeat={f:f};if(e=c.next())if(e.h&l&&this.Ka[e.d])b.repeat.kb=e.d;else c.z()}else if(a&m.URL&&!b.src)b.src=f;else return null}if(!b.src||!h||h.length<1||h.length>4||j&&j.length>4||i===1&&j.length<1||d&&d.length>4||i===2&&d.length<1)return null;if(!b.repeat)b.repeat={f:"stretch"};if(!b.repeat.kb)b.repeat.kb=b.repeat.f;a=function(r,o){return{T:o(r[0]),S:o(r[1]||r[0]),L:o(r[2]||r[0]),Q:o(r[3]||
-r[1]||r[0])}};b.slice=a(h,function(r){return g.k(r.h&t?r.d+"px":r.d)});b.width=j&&j.length>0?a(j,function(r){return r.h&(n|p)?g.k(r.d):r.d}):(k=this.e.currentStyle)&&{T:g.k(k.borderTopWidth),S:g.k(k.borderRightWidth),L:g.k(k.borderBottomWidth),Q:g.k(k.borderLeftWidth)};b.ua=a(d||[0],function(r){return r.h&n?g.k(r.d):r.d})}return b}});g.Zb=g.s.$({na:"box-shadow",va:"boxShadow",ba:function(a){var b,c=g.k,e=g.u.ja,f;if(a){f=new g.u(a);b={ua:[],cb:[]};for(a=function(){for(var h,j,d,i,k,m;h=f.next();){d=
-h.d;j=h.h;if(j&e.ha&&d===",")break;else if(h.db()&&!k){f.z();k=f.da(function(l){return!l.db()})}else if(j&e.ea&&!i)i=d;else if(j&e.fa&&d==="inset"&&!m)m=true;else return false}h=k&&k.length;if(h>1&&h<5){(m?b.cb:b.ua).push({fd:c(k[0].d),gd:c(k[1].d),blur:c(k[2]?k[2].d:"0"),Xc:c(k[3]?k[3].d:"0"),color:g.pa(i||"currentColor")});return true}return false};a(););}return b&&(b.cb.length||b.ua.length)?b:null}});g.ec=g.s.$({qa:g.s.ma(function(){var a=this.e.currentStyle;return a.visibility+"|"+a.display}),
-ba:function(){var a=this.e,b=a.runtimeStyle;a=a.currentStyle;var c=b.visibility,e;b.visibility="";e=a.visibility;b.visibility=c;return{cd:e!=="hidden",xc:a.display!=="none"}},g:function(){return false}});g.B={Z:function(a){function b(c,e,f,h){this.e=c;this.q=e;this.j=f;this.parent=h}g.p.fb(b.prototype,g.B,a);return b},eb:false,R:function(){return false},Kb:function(){this.n();this.g()&&this.X()},jb:function(){this.eb=true},Lb:function(){this.g()?this.X():this.n()},Wa:function(a,b){this.Hb(a);for(var c=
-this.ka||(this.ka=[]),e=a+1,f=c.length,h;e<f;e++)if(h=c[e])break;c[a]=b;this.w().insertBefore(b,h||null)},ra:function(a){var b=this.ka;return b&&b[a]||null},Hb:function(a){var b=this.ra(a),c=this.Ba;if(b&&c){c.removeChild(b);this.ka[a]=null}},sa:function(a,b,c,e){var f=this.Va||(this.Va={}),h=f[a];if(!h){h=f[a]=g.p.Ga("shape");if(b)h.appendChild(h[b]=g.p.Ga(b));if(e){c=this.ra(e);if(!c){this.Wa(e,doc.createElement("group"+e));c=this.ra(e)}}c.appendChild(h);a=h.style;a.position="absolute";a.left=a.top=
-0;a.behavior="url(#default#VML)"}return h},Za:function(a){var b=this.Va,c=b&&b[a];if(c){c.parentNode.removeChild(c);delete b[a]}return!!c},xb:function(a){var b=this.e,c=this.q.o(),e=c.i,f=c.f,h,j,d,i,k,m;c=a.x.tl.a(b,e);h=a.y.tl.a(b,f);j=a.x.tr.a(b,e);d=a.y.tr.a(b,f);i=a.x.br.a(b,e);k=a.y.br.a(b,f);m=a.x.bl.a(b,e);a=a.y.bl.a(b,f);e=Math.min(e/(c+j),f/(d+k),e/(m+i),f/(h+a));if(e<1){c*=e;h*=e;j*=e;d*=e;i*=e;k*=e;m*=e;a*=e}return{x:{tl:c,tr:j,br:i,bl:m},y:{tl:h,tr:d,br:k,bl:a}}},oa:function(a,b,c){b=
-b||1;var e,f,h=this.q.o();f=h.i*b;h=h.f*b;var j=this.j.v,d=Math.floor,i=Math.ceil,k=a?a.T*b:0,m=a?a.S*b:0,l=a?a.L*b:0;a=a?a.Q*b:0;var t,n,p,s,u;if(c||j.g()){e=this.xb(c||j.m());c=e.x.tl*b;j=e.y.tl*b;t=e.x.tr*b;n=e.y.tr*b;p=e.x.br*b;s=e.y.br*b;u=e.x.bl*b;b=e.y.bl*b;f="m"+d(a)+","+d(j)+"qy"+d(c)+","+d(k)+"l"+i(f-t)+","+d(k)+"qx"+i(f-m)+","+d(n)+"l"+i(f-m)+","+i(h-s)+"qy"+i(f-p)+","+i(h-l)+"l"+d(u)+","+i(h-l)+"qx"+d(a)+","+i(h-b)+" x e"}else f="m"+d(a)+","+d(k)+"l"+i(f-m)+","+d(k)+"l"+i(f-m)+","+i(h-
-l)+"l"+d(a)+","+i(h-l)+"xe";return f},w:function(){var a=this.parent.ra(this.C),b;if(!a){a=doc.createElement(this.Fa);b=a.style;b.position="absolute";b.top=b.left=0;this.parent.Wa(this.C,a)}return a},n:function(){this.parent.Hb(this.C);delete this.Va;delete this.ka}};g.cc=g.B.Z({g:function(){var a=this.oc;for(var b in a)if(a.hasOwnProperty(b)&&a[b].g())return true;return false},R:function(){return this.j.lb.D()},jb:function(){if(this.g()){var a=this.wb(),b=a,c;a=a.currentStyle;var e=a.position,f=
-this.w().style,h=0,j=0;j=this.q.o();if(e==="fixed"&&g.J>6){h=j.x;j=j.y;b=e}else{do b=b.offsetParent;while(b&&b.currentStyle.position==="static");if(b){c=b.getBoundingClientRect();b=b.currentStyle;h=j.x-c.left-(parseFloat(b.borderLeftWidth)||0);j=j.y-c.top-(parseFloat(b.borderTopWidth)||0)}else{b=doc.documentElement;h=j.x+b.scrollLeft-b.clientLeft;j=j.y+b.scrollTop-b.clientTop}b="absolute"}f.position=b;f.left=h;f.top=j;f.zIndex=e==="static"?-1:a.zIndex;this.eb=true}},Lb:function(){},Mb:function(){var a=
-this.j.lb.m();this.w().style.display=a.cd&&a.xc?"":"none"},Kb:function(){this.g()?this.Mb():this.n()},wb:function(){var a=this.e;return a.tagName in g.Jb?a.offsetParent:a},w:function(){var a=this.Ba,b;if(!a){b=this.wb();a=this.Ba=doc.createElement("css3-container");a.style.direction="ltr";this.Mb();b.parentNode.insertBefore(a,b)}return a},n:function(){var a=this.Ba,b;if(a&&(b=a.parentNode))b.removeChild(a);delete this.Ba;delete this.ka}});g.Sb=g.B.Z({C:2,Fa:"background",R:function(){var a=this.j;
-return a.H.D()||a.v.D()},g:function(){var a=this.j;return a.N.g()||a.v.g()||a.H.g()||a.W.g()&&a.W.m().cb},X:function(){var a=this.q.o();if(a.i&&a.f){this.yc();this.zc()}},yc:function(){var a=this.j.H.m(),b=this.q.o(),c=this.e,e=a&&a.color,f,h;if(e&&e.la()>0){this.yb();a=this.sa("bgColor","fill",this.w(),1);f=b.i;b=b.f;a.stroked=false;a.coordsize=f*2+","+b*2;a.coordorigin="1,1";a.path=this.oa(null,2);h=a.style;h.width=f;h.height=b;a.fill.color=e.O(c);c=e.la();if(c<1)a.fill.opacity=c}else this.Za("bgColor")},
-zc:function(){var a=this.j.H.m(),b=this.q.o();a=a&&a.M;var c,e,f,h,j;if(a){this.yb();e=b.i;f=b.f;for(j=a.length;j--;){b=a[j];c=this.sa("bgImage"+j,"fill",this.w(),2);c.stroked=false;c.fill.type="tile";c.fillcolor="none";c.coordsize=e*2+","+f*2;c.coordorigin="1,1";c.path=this.oa(0,2);h=c.style;h.width=e;h.height=f;if(b.P==="linear-gradient")this.mc(c,b);else{c.fill.src=b.Cb;this.Pc(c,j)}}}for(j=a?a.length:0;this.Za("bgImage"+j++););},Pc:function(a,b){g.p.Pb(a.fill.src,function(c){var e=a.fill,f=this.e,
-h=this.q.o(),j=h.i;h=h.f;var d=this.j,i=d.I.m(),k=i&&i.nb;i=k?k.t.a(f):0;var m=k?k.r.a(f):0,l=k?k.b.a(f):0;k=k?k.l.a(f):0;d=d.H.m().M[b];f=d.Ya?d.Ya.coords(f,j-c.i-k-m,h-c.f-i-l):{x:0,y:0};d=d.Bb;l=m=0;var t=j+1,n=h+1,p=g.J===8?0:1;k=Math.round(f.x)+k+0.5;i=Math.round(f.y)+i+0.5;e.position=k/j+","+i/h;if(d&&d!=="repeat"){if(d==="repeat-x"||d==="no-repeat"){m=i+1;n=i+c.f+p}if(d==="repeat-y"||d==="no-repeat"){l=k+1;t=k+c.i+p}a.style.clip="rect("+m+"px,"+t+"px,"+n+"px,"+l+"px)"}},this)},mc:function(a,
-b){function c(B,C,z,F,H){if(z===0||z===180)return[F,C];else if(z===90||z===270)return[B,H];else{z=Math.tan(-z*t/180);B=z*B-C;C=-1/z;F=C*F-H;H=C-z;return[(F-B)/H,(z*F-C*B)/H]}}function e(){w=m>=90&&m<270?i:0;r=m<180?k:0;o=i-w;x=k-r}function f(){for(;m<0;)m+=360;m%=360}function h(B,C){var z=C[0]-B[0];B=C[1]-B[1];return Math.abs(z===0?B:B===0?z:Math.sqrt(z*z+B*B))}var j=this.e,d=this.q.o(),i=d.i,k=d.f;a=a.fill;var m=b.Xa,l=b.bb;b=b.ca;d=b.length;var t=Math.PI,n,p,s,u,w,r,o,x,q,y,A,D;if(l){l=l.coords(j,
-i,k);n=l.x;p=l.y}if(m){m=m.vc();f();e();if(!l){n=w;p=r}l=c(n,p,m,o,x);s=l[0];u=l[1]}else if(l){s=i-n;u=k-p}else{n=p=s=0;u=k}l=s-n;q=u-p;if(m===void 0){m=!l?q<0?90:270:!q?l<0?180:0:-Math.atan2(q,l)/t*180;f();e()}l=m%90?Math.atan2(l*i/k,q)/t*180:m+90;l+=180;l%=360;y=h([n,p],[s,u]);s=h([w,r],c(w,r,m,o,x));u=[];p=h([n,p],c(n,p,m,w,r))/s*100;n=[];for(q=0;q<d;q++)n.push(b[q].Fb?b[q].Fb.a(j,y):q===0?0:q===d-1?y:null);for(q=1;q<d;q++){if(n[q]===null){A=n[q-1];y=q;do D=n[++y];while(D===null);n[q]=A+(D-A)/
-(y-q+1)}n[q]=Math.max(n[q],n[q-1])}for(q=0;q<d;q++)u.push(p+n[q]/s*100+"% "+b[q].color.O(j));a.angle=l;a.type="gradient";a.method="sigma";a.color=b[0].color.O(j);a.color2=b[d-1].color.O(j);a.colors.value=u.join(",")},yb:function(){var a=this.e.runtimeStyle;a.backgroundImage="url(about:blank)";a.backgroundColor="transparent"},n:function(){g.B.n.call(this);var a=this.e.runtimeStyle;a.backgroundImage=a.backgroundColor=""}});g.Wb=g.B.Z({C:4,Fa:"border",qc:{TABLE:1,INPUT:1,TEXTAREA:1,SELECT:1,OPTION:1,
-IMG:1,HR:1,FIELDSET:1},Jc:{submit:1,button:1,reset:1},R:function(){var a=this.j;return a.I.D()||a.v.D()},g:function(){var a=this.j;return(a.N.g()||a.v.g()||a.H.g())&&a.I.g()},X:function(){var a=this.e,b=this.j.I.m(),c=this.q.o(),e=c.i;c=c.f;var f,h,j,d,i;if(b){this.Hc();b=this.Bc(2);d=0;for(i=b.length;d<i;d++){j=b[d];f=this.sa("borderPiece"+d,j.stroke?"stroke":"fill",this.w());f.coordsize=e*2+","+c*2;f.coordorigin="1,1";f.path=j.path;h=f.style;h.width=e;h.height=c;f.filled=!!j.fill;f.stroked=!!j.stroke;
-if(j.stroke){f=f.stroke;f.weight=j.mb+"px";f.color=j.color.O(a);f.dashstyle=j.stroke==="dashed"?"2 2":j.stroke==="dotted"?"1 1":"solid";f.linestyle=j.stroke==="double"&&j.mb>2?"ThinThin":"Single"}else f.fill.color=j.fill.O(a)}for(;this.Za("borderPiece"+d++););}},Hc:function(){var a=this.e,b=a.currentStyle,c=a.runtimeStyle,e=a.tagName,f=g.J===6,h;if(f&&e in this.qc||e==="BUTTON"||e==="INPUT"&&a.type in this.Jc){c.borderWidth="";e=this.j.I.Ib;for(h=e.length;h--;){f=e[h];c["padding"+f]="";c["padding"+
-f]=g.k(b["padding"+f]).a(a)+g.k(b["border"+f+"Width"]).a(a)+(!g.J===8&&h%2?1:0)}c.borderWidth=0}else if(f){if(a.childNodes.length!==1||a.firstChild.tagName!=="ie6-mask"){b=doc.createElement("ie6-mask");e=b.style;e.visibility="visible";for(e.zoom=1;e=a.firstChild;)b.appendChild(e);a.appendChild(b);c.visibility="hidden"}}else c.borderColor="transparent"},Bc:function(a){var b=this.e,c,e,f,h=this.j.I,j=[],d,i,k,m,l=Math.round,t,n,p;if(h.g()){c=h.m();h=c.nb;n=c.Zc;p=c.tc;if(c.ed&&c.$c&&c.uc){if(p.t.la()>
-0){c=h.t.a(b);k=c/2;j.push({path:this.oa({T:k,S:k,L:k,Q:k},a),stroke:n.t,color:p.t,mb:c})}}else{a=a||1;c=this.q.o();e=c.i;f=c.f;c=l(h.t.a(b));k=l(h.r.a(b));m=l(h.b.a(b));b=l(h.l.a(b));var s={t:c,r:k,b:m,l:b};b=this.j.v;if(b.g())t=this.xb(b.m());d=Math.floor;i=Math.ceil;var u=function(o,x){return t?t[o][x]:0},w=function(o,x,q,y,A,D){var B=u("x",o),C=u("y",o),z=o.charAt(1)==="r";o=o.charAt(0)==="b";return B>0&&C>0?(D?"al":"ae")+(z?i(e-B):d(B))*a+","+(o?i(f-C):d(C))*a+","+(d(B)-x)*a+","+(d(C)-q)*a+","+
-y*65535+","+2949075*(A?1:-1):(D?"m":"l")+(z?e-x:x)*a+","+(o?f-q:q)*a},r=function(o,x,q,y){var A=o==="t"?d(u("x","tl"))*a+","+i(x)*a:o==="r"?i(e-x)*a+","+d(u("y","tr"))*a:o==="b"?i(e-u("x","br"))*a+","+d(f-x)*a:d(x)*a+","+i(f-u("y","bl"))*a;o=o==="t"?i(e-u("x","tr"))*a+","+i(x)*a:o==="r"?i(e-x)*a+","+i(f-u("y","br"))*a:o==="b"?d(u("x","bl"))*a+","+d(f-x)*a:d(x)*a+","+d(u("y","tl"))*a;return q?(y?"m"+o:"")+"l"+A:(y?"m"+A:"")+"l"+o};b=function(o,x,q,y,A,D){var B=o==="l"||o==="r",C=s[o],z,F;if(C>0&&n[o]!==
-"none"&&p[o].la()>0){z=s[B?o:x];x=s[B?x:o];F=s[B?o:q];q=s[B?q:o];if(n[o]==="dashed"||n[o]==="dotted"){j.push({path:w(y,z,x,D+45,0,1)+w(y,0,0,D,1,0),fill:p[o]});j.push({path:r(o,C/2,0,1),stroke:n[o],mb:C,color:p[o]});j.push({path:w(A,F,q,D,0,1)+w(A,0,0,D-45,1,0),fill:p[o]})}else j.push({path:w(y,z,x,D+45,0,1)+r(o,C,0,0)+w(A,F,q,D,0,0)+(n[o]==="double"&&C>2?w(A,F-d(F/3),q-d(q/3),D-45,1,0)+r(o,i(C/3*2),1,0)+w(y,z-d(z/3),x-d(x/3),D,1,0)+"x "+w(y,d(z/3),d(x/3),D+45,0,1)+r(o,d(C/3),1,0)+w(A,d(F/3),d(q/
-3),D,0,0):"")+w(A,0,0,D-45,1,0)+r(o,0,1,0)+w(y,0,0,D,1,0),fill:p[o]})}};b("t","l","r","tl","tr",90);b("r","t","b","tr","br",0);b("b","r","l","br","bl",-90);b("l","b","t","bl","tl",-180)}}return j},n:function(){g.B.n.call(this);this.e.runtimeStyle.borderColor=""}});g.Ub=g.B.Z({C:5,Oc:["t","tr","r","br","b","bl","l","tl","c"],R:function(){return this.j.N.D()},g:function(){return this.j.N.g()},X:function(){this.w();var a=this.j.N.m(),b=this.q.o(),c=this.e,e=this.Gb;g.p.Pb(a.src,function(f){function h(w,
-r,o,x,q){w=e[w].style;var y=Math.max;w.width=y(r,0);w.height=y(o,0);w.left=x;w.top=q}function j(w,r,o){for(var x=0,q=w.length;x<q;x++)e[w[x]].imagedata[r]=o}var d=b.i,i=b.f,k=a.width,m=k.T.a(c),l=k.S.a(c),t=k.L.a(c);k=k.Q.a(c);var n=a.slice,p=n.T.a(c),s=n.S.a(c),u=n.L.a(c);n=n.Q.a(c);h("tl",k,m,0,0);h("t",d-k-l,m,k,0);h("tr",l,m,d-l,0);h("r",l,i-m-t,d-l,m);h("br",l,t,d-l,i-t);h("b",d-k-l,t,k,i-t);h("bl",k,t,0,i-t);h("l",k,i-m-t,0,m);h("c",d-k-l,i-m-t,k,m);j(["tl","t","tr"],"cropBottom",(f.f-p)/f.f);
-j(["tl","l","bl"],"cropRight",(f.i-n)/f.i);j(["bl","b","br"],"cropTop",(f.f-u)/f.f);j(["tr","r","br"],"cropLeft",(f.i-s)/f.i);if(a.repeat.kb==="stretch"){j(["l","r","c"],"cropTop",p/f.f);j(["l","r","c"],"cropBottom",u/f.f)}if(a.repeat.f==="stretch"){j(["t","b","c"],"cropLeft",n/f.i);j(["t","b","c"],"cropRight",s/f.i)}e.c.style.display=a.fill?"":"none"},this)},w:function(){var a=this.parent.ra(this.C),b,c,e,f=this.Oc,h=f.length;if(!a){a=doc.createElement("border-image");b=a.style;b.position="absolute";
-this.Gb={};for(e=0;e<h;e++){c=this.Gb[f[e]]=g.p.Ga("rect");c.appendChild(g.p.Ga("imagedata"));b=c.style;b.behavior="url(#default#VML)";b.position="absolute";b.top=b.left=0;c.imagedata.src=this.j.N.m().src;c.stroked=false;c.filled=false;a.appendChild(c)}this.parent.Wa(this.C,a)}return a}});g.Yb=g.B.Z({C:1,Fa:"outset-box-shadow",R:function(){var a=this.j;return a.W.D()||a.v.D()},g:function(){var a=this.j.W;return a.g()&&a.m().ua[0]},X:function(){function a(z,F,H,K,J,v,E){z=b.sa("shadow"+z+F,"fill",
-e,j-z);F=z.fill;z.coordsize=m*2+","+l*2;z.coordorigin="1,1";z.stroked=false;z.filled=true;F.color=J.O(c);if(v){F.type="gradienttitle";F.color2=F.color;F.opacity=0}z.path=E;u=z.style;u.left=H;u.top=K;u.width=m;u.height=l;return z}var b=this,c=this.e,e=this.w(),f=this.j,h=f.W.m().ua;f=f.v.m();var j=h.length,d=j,i,k=this.q.o(),m=k.i,l=k.f;k=g.J===8?1:0;for(var t=["tl","tr","br","bl"],n,p,s,u,w,r,o,x,q,y,A,D,B,C;d--;){p=h[d];w=p.fd.a(c);r=p.gd.a(c);i=p.Xc.a(c);o=p.blur.a(c);p=p.color;x=-i-o;if(!f&&o)f=
-g.Oa.Qb;x=this.oa({T:x,S:x,L:x,Q:x},2,f);if(o){q=(i+o)*2+m;y=(i+o)*2+l;A=o*2/q;D=o*2/y;if(o-i>m/2||o-i>l/2)for(i=4;i--;){n=t[i];B=n.charAt(0)==="b";C=n.charAt(1)==="r";n=a(d,n,w,r,p,o,x);s=n.fill;s.focusposition=(C?1-A:A)+","+(B?1-D:D);s.focussize="0,0";n.style.clip="rect("+((B?y/2:0)+k)+"px,"+(C?q:q/2)+"px,"+(B?y:y/2)+"px,"+((C?q/2:0)+k)+"px)"}else{n=a(d,"",w,r,p,o,x);s=n.fill;s.focusposition=A+","+D;s.focussize=1-A*2+","+(1-D*2)}}else{n=a(d,"",w,r,p,o,x);w=p.la();if(w<1)n.fill.opacity=w}}}});g.bc=
-g.B.Z({C:6,Fa:"imgEl",R:function(){var a=this.j;return this.e.src!==this.hc||a.v.D()},g:function(){var a=this.j;return a.v.g()||a.H.Eb()},X:function(){this.hc=j;this.Gc();var a=this.sa("img","fill",this.w()),b=a.fill,c=this.q.o(),e=c.i;c=c.f;var f=this.j.I.m();f=f&&f.nb;var h=this.e,j=h.src,d=Math.round;a.stroked=false;b.type="frame";b.src=j;b.position=(e?0.5/e:0)+","+(c?0.5/c:0);a.coordsize=e*2+","+c*2;a.coordorigin="1,1";a.path=this.oa(f?{T:d(f.t.a(h)),S:d(f.r.a(h)),L:d(f.b.a(h)),Q:d(f.l.a(h))}:
-0,2);a=a.style;a.width=e;a.height=c},Gc:function(){this.e.runtimeStyle.filter="alpha(opacity=0)"},n:function(){g.B.n.call(this);this.e.runtimeStyle.filter=""}});g.Qa=function(){function a(d){function i(){if(!z){var v,E,G=d.currentStyle,I=G.getAttribute(c)==="true";J=G.getAttribute(e);J=g.Ab===8?J!=="false":J==="true";if(!C){C=1;d.runtimeStyle.zoom=1;G=d;for(var O=1;G=G.previousSibling;)if(G.nodeType===1){O=0;break}if(O)d.className+=" "+g.Pa+"first-child"}y.Ja();if(I&&(E=y.o())&&(v=doc.documentElement||
-doc.body)&&(E.y>v.clientHeight||E.x>v.clientWidth||E.y+E.f<0||E.x+E.i<0)){if(!H){H=1;g.Ra.aa(i)}}else{z=1;H=C=0;g.Ra.Ma(i);A={H:new g.Tb(d),I:new g.Xb(d),N:new g.Vb(d),v:new g.Oa(d),W:new g.Zb(d),lb:new g.ec(d)};D=[A.H,A.I,A.N,A.v,A.W,A.lb];v=new g.cc(d,y,A);E=[new g.Yb(d,y,A,v),new g.Sb(d,y,A,v),new g.Wb(d,y,A,v),new g.Ub(d,y,A,v)];d.tagName==="IMG"&&E.push(new g.bc(d,y,A,v));v.oc=E;q=[v].concat(E);if(v=d.currentStyle.getAttribute(g.F+"watch-ancestors")){B=[];v=parseInt(v,10);E=0;for(I=d.parentNode;I&&
-(v==="NaN"||E++<v);){B.push(I);I.attachEvent("onpropertychange",u);I.attachEvent("onmouseenter",p);I.attachEvent("onmouseleave",s);I=I.parentNode}}if(J){g.ya.aa(m);g.ya.Tc()}m(1)}if(!F){F=1;d.attachEvent("onmove",k);d.attachEvent("onresize",k);d.attachEvent("onpropertychange",l);d.attachEvent("onmouseenter",p);d.attachEvent("onmouseleave",s);g.za.aa(k);g.G.aa(o)}y.La()}}function k(){y&&y.Ec()&&m()}function m(v){if(!K)if(z){var E,G;w();if(v||y.Qc()){E=0;for(G=q.length;E<G;E++)q[E].jb()}if(v||y.Vc()){E=
-0;for(G=q.length;E<G;E++)q[E].Lb()}r()}else C||i()}function l(){var v,E,G;v=event;if(!K&&!(v&&v.propertyName in j))if(z){w();v=0;for(E=q.length;v<E;v++){G=q[v];G.eb||G.jb();G.R()&&G.Kb()}r()}else C||i()}function t(){if(d)d.className+=f}function n(){if(d)d.className=d.className.replace(h,"")}function p(){setTimeout(t,0)}function s(){setTimeout(n,0)}function u(){var v=event.propertyName;if(v==="className"||v==="id")l()}function w(){y.Ja();for(var v=D.length;v--;)D[v].Ja()}function r(){for(var v=D.length;v--;)D[v].La();
-y.La()}function o(){if(F){if(B)for(var v=0,E=B.length,G;v<E;v++){G=B[v];G.detachEvent("onpropertychange",u);G.detachEvent("onmouseenter",p);G.detachEvent("onmouseleave",s)}d.detachEvent("onmove",m);d.detachEvent("onresize",m);d.detachEvent("onpropertychange",l);d.detachEvent("onmouseenter",p);d.detachEvent("onmouseleave",s);g.G.Ma(o);F=0}}function x(){if(!K){var v,E;o();K=1;if(q){v=0;for(E=q.length;v<E;v++)q[v].n()}J&&g.ya.Ma(m);g.za.Ma(m);q=y=A=D=B=d=null}}var q,y=new M(d),A,D,B,C,z,F,H,K,J;this.Ic=
-i;this.update=m;this.n=x;this.Ac=d}var b={},c=g.F+"lazy-init",e=g.F+"poll",f=" "+g.Pa+"hover",h=new RegExp("\\b"+g.Pa+"hover\\b","g"),j={background:1,bgColor:1,display:1};a.Cc=function(d){var i=g.p.ta(d);return b[i]||(b[i]=new a(d))};a.n=function(d){d=g.p.ta(d);var i=b[d];if(i){i.n();delete b[d]}};a.wc=function(){var d=[],i;if(b){for(var k in b)if(b.hasOwnProperty(k)){i=b[k];d.push(i.Ac);i.n()}b={}}return d};return a}();g.attach=function(a){g.Ab<9&&g.Qa.Cc(a).Ic()};g.detach=function(a){g.Qa.n(a)}};
-})();
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/css/screen.css b/core/src/plugins/gui.ajax/res/themes/vision/css/screen.css
deleted file mode 100755
index ad9067a6b9..0000000000
--- a/core/src/plugins/gui.ajax/res/themes/vision/css/screen.css
+++ /dev/null
@@ -1,92 +0,0 @@
-#container {
-    width: 50%;
-    margin: 0 auto;
-    text-align: left;
-}
-
-.footer {
-    background-color: #000;
-    padding: 0.5em;
-}
-
-.leightbox {
-    color: #333;
-    display: none;
-    position: absolute;
-    top: 45%;
-    left: 45%;
-    width: 50%;
-    height: 50%;
-    padding: 1em;
-    border: 1em solid #B8B8B8;
-    background-color: white;
-    text-align: left;
-    z-index:1001;
-    overflow: auto;
-}
-
-#overlay, #loading_overlay{
-    display:none;
-    position:absolute;
-    top:0;
-    left:0;
-    width:100%;
-    height:100%;
-    z-index:1000;
-    background-color: rgb(0, 0, 0);
-    -moz-opacity: 0.6;
-    opacity: .60;
-    filter: alpha(opacity=60);
-}
-
-#loading_overlay{
-    display:block;
-    z-index:2000;
-    -moz-opacity:1.0 !important;
-    opacity:1.0 !important;
-    filter: alpha(opacity=100)  !important;
-    background-color: #fff !important;
-    background-image: url('../images/grid_t.png');
-}
-
-#element_overlay{
-    position:absolute;
-    top: 0;
-    left:0;
-    width:100%;
-    height:100%;
-    z-index:1000;
-    background-color: #EEEEEE;
-    -moz-opacity: 0.8;
-    opacity:.80;
-    filter: alpha(opacity=80);
-    text-align:center;
-    overflow:hidden;
-    padding: 0 !important;
-    margin: 0 !important;
-}
-
-div.dialogBox div#element_overlay{
-
-    background-color: rgb(37,37,37);
-    opacity: 0;
-    transition: opacity 0.4s ease;
-
-}
-
-#element_overlay img{
-    margin-top:30%;
-}
-
-
-#element_iframe{
-    position:absolute;
-    width:80%;
-    height:80%;
-    z-index:1010;
-    background-color:#eee;
-    border:1px solid black;
-}
-
-.lightbox[id]{ /* IE6 and below Can't See This */    position:fixed;    }
-#overlay[id]{ /* IE6 and below Can't See This */    position:fixed;    }
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/css/tabs.jpg b/core/src/plugins/gui.ajax/res/themes/vision/css/tabs.jpg
deleted file mode 100755
index 3bf3d1baa0..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/css/tabs.jpg and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/css/xtree.css b/core/src/plugins/gui.ajax/res/themes/vision/css/xtree.css
deleted file mode 100755
index d162d8c4cb..0000000000
--- a/core/src/plugins/gui.ajax/res/themes/vision/css/xtree.css
+++ /dev/null
@@ -1,198 +0,0 @@
-.flexbox div.webfx-tree-container.first_container{
-}
-
-.no-flexbox div#tree_container{
-	/*background-image:url('../images/tree-odd-even-bg.png');
-	background-attachment:scroll;*/
-}
-
-
-.webfx-tree-container {
-	margin: 0;
-	padding: 0;
-	font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-	white-space: nowrap;
-	font-size: 11px;
-}
-
-.webfx-tree-item
-{
-	padding: 0;
-	margin: 0;
-	font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-	font-size: 11px;
-	white-space: nowrap;
-	height: 27px;
-    position: relative;
-}
-
-.webfx-tree-item:hover{
-	background-color: rgb(253, 252, 228);
-}
-
-.selected-webfx-tree-item {
-	color : white;
-}
-
-.selected-webfx-tree-item-inactive 
-{
-	text-decoration: none;
-}
-
-.webfx-tree-item a, .webfx-tree-item a:active, .webfx-tree-item a:hover, .webfx-tree-item a:link {
-	margin-left: 0;
-	outline:0;
-	cursor: default;
-}
-
-.webfx-tree-item a {	
-	text-decoration: none;
-}
-
-.webfx-tree-item a:hover {
-	text-decoration: none;
-}
-
-.webfx-tree-item a {
-	outline:0;
-    color: rgb(111, 121, 131);
-}
-
-.webfx-tree-item a span {
-    display: inline-block;
-    line-height: 19px;
-    margin-top: 4px;
-    padding-left: 25px;
-    background-position: 4px 1px;
-    background-repeat: no-repeat;
-    font-size: 13px;
-}
-
-*::-moz-focus-inner { 
-	border: none; 
-}
-
-.selected-webfx-tree-item a {
-	color: white !important;
-	text-decoration: none;
-}
-
-
-.webfx-tree-item a.selected-focus{
-      color: white;
-}
-
-.webfx-tree-item img {
-	vertical-align: middle;
-	border: 0;
-	float:left;
-}
-
-.webfx-tree-icon {
-	width: 16px;
-	height: 16px;
-	margin-right:3px;
-}
-
-.selected
-{
-	background: #ddd;
-	color: white;
-	text-decoration: none;
-}
-
-.flat_tree_pane div#tree_container{
-    border: 0;
-    background-color: transparent;
-}
-.flat_tree_pane div#tree_container > .webfx-tree-item{
-    display: none;
-}
-
-.flat_tree_pane div.webfx-tree-item{
-    background-color: transparent;
-    cursor: pointer;
-    padding: 3px 6px;
-}
-
-.flat_tree_pane  div.webfx-tree-item a{
-    color: rgba(255, 255, 255, 0.7);
-    cursor: pointer;
-}
-
-.flat_tree_pane  div.webfx-tree-item a span{
-    padding-left: 33px; 
-    background-position: 13px 4px !important;
-    background-repeat: no-repeat;
-    font-size: 13px;
-    background-size: 12px;
-    padding-top: 1px;
-}
-
-.flat_tree_pane  div.webfx-tree-item.selected-webfx-tree-item-inactive,
-.flat_tree_pane  div.webfx-tree-item.selected-webfx-tree-item{
-    background-color: rgba(255, 255, 255, 0.15) !important;
-}
-
-.flat_tree_pane  div.webfx-tree-item.selected-webfx-tree-item a,
-.flat_tree_pane  div.webfx-tree-item.selected-webfx-tree-item-inactive a{
-    text-shadow: none;
-    color:#fff !important;
-}
-
-
-.flat_tree_pane > #tree_container >  .webfx-tree-container > .webfx-tree-item{
-    margin-top: 10px;
-}
-
-.flat_tree_pane > #tree_container >  .webfx-tree-container > .webfx-tree-item a span{
-    color: #FFFFFF;
-    background-image: none!important;
-    padding-left: 4px;
-    margin-top: 5px;
-    font-size: 14px;
-    letter-spacing: 1px;
-}
-
-.flat_tree_pane div.webfx-tree-container.first_container {
-    padding: 0;
-}
-
-.flat_tree_pane  div.scrolling div.webfx-tree-container.first_container {
-    padding: 0;
-}
-
-.flat_tree_pane  div.webfx-tree-item img{
-    display:none;
-}
-
-.flat_tree_pane  div.webfx-tree-container > .webfx-tree-container{
-    /*background-color: rgba(255, 255, 255, 0.44);*/
-}
-
-.flat_tree_pane  div.webfx-tree-container > .webfx-tree-container > .webfx-tree-container{
-
-    margin-bottom: 0;
-    box-shadow: none;
-
-}
-
-.flat_tree_pane  div.webfx-tree-container > .webfx-tree-container > .webfx-tree-item{
-    background-color: transparent;
-    border-top:0;
-}
-
-.flat_tree_pane  div.webfx-tree-container > .webfx-tree-container  div.webfx-tree-container{
-}
-
-.flat_tree_pane  div.webfx-tree-container > .webfx-tree-container  div.webfx-tree-container  div.webfx-tree-item{
-    padding-left: 20px;
-}
-
-.flat_tree_pane  div.webfx-tree-container > .webfx-tree-container > .webfx-tree-container div.webfx-tree-container  div.webfx-tree-item{
-    padding-left: 40px;
-}
-
-.flat_tree_pane  div.webfx-tree-container > .webfx-tree-container > .webfx-tree-container > .webfx-tree-container  div.webfx-tree-container  div.webfx-tree-item{
-    padding-left: 60px;
-}
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/html/gui.html b/core/src/plugins/gui.ajax/res/themes/vision/html/gui.html
deleted file mode 100755
index 530ec07ebd..0000000000
--- a/core/src/plugins/gui.ajax/res/themes/vision/html/gui.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:ajxp>
-	<head>
-		<title>AJXP_APPLICATION_TITLE</title>
-        AJXP_REBASE
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
-        <link rel="stylesheet" type="text/css" href="AJXP_THEME_FOLDER/css/allz.css?v=AJXP_CURRENT_VERSION">
-		<!--[if IE 8]>
-		<script src="AJXP_CLIENT_RESOURCES_FOLDER/js/vendor/es6/es5-shim.min.js"></script>
-		<script src="AJXP_CLIENT_RESOURCES_FOLDER/js/vendor/es6/es5-sham.min.js"></script>
-		<![endif]-->
-        AJXP_ADDITIONAL_JS_FRAMEWORKS
-        <script language="javascript" type="text/javascript" src="AJXP_CLIENT_RESOURCES_FOLDER/js/ajaxplorer_boot.js?v=AJXP_CURRENT_VERSION"></script>
-        <link rel="icon" type="image/x-png" href="AJXP_THEME_FOLDER/images/html-folder.png">
-    </head>
-	<body style="overflow:hidden;">
-		<script type="text/javascript">
-		// Initialize booter. Do not remove the commented line AJXP_JSON_START_PARAMETERS, as it is 
-		// dynamically replaced by the application!
-		var ajaxplorer, startParameters = {}, MessageHash={};
-		//AJXP_JSON_START_PARAMETERS
-        document.observe("ajaxplorer:before_gui_load", function(e){
-			if(window.React){
-                React.initializeTouchEvents(true);
-            }
-            ajaxplorer.currentThemeUsesIconFonts = true;
-            pydio.Parameters.set('currentThemeUsesIconFonts', true);
-            document.documentElement.className += " ajxp_theme_vision";
-        });
-        window.ajxpBootstrap = new AjxpBootstrap(startParameters);
-        //window.onbeforeunload = function(){return "Do you want to quit?";};
-		</script>
-		<div id="ajxp_desktop" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"window","fitMarginBottom":"$(\"optional_bottom_div\").getHeight()"}'></div>
-		<div id="all_forms">
-			<div id="generic_dialog_box" class="dialogBox form-login_form"><div class="dialogTitle"></div><div class="dialogContent"></div></div>
-			<div id="hidden_frames" style="display:none;"></div>
-			<div id="hidden_forms" style="position:absolute;left:-1000px;"></div>	
-			
-			<!-- LOGIN SCREEN MUST BE ALREADY IN PAGE TO ENABLE PASSWORD REMEMBERING -->
-            <form id="login_form" style="display:none;" box_width="320" box_padding="0" overlayStyle='{"backgroundColor":"white","opacity":10,"backgroundImage":"url(\"AJXP_THEME_FOLDER/images/grid_t.png\")"}'>
-				<input type="hidden" name="get_action" value="login">
-				<input type="hidden" name="login_seed" id="login_seed" value="">
-		 	   	<a style="float:right;font-size: 16px;" href="javascript:pydio.getController().fireAction('switch_language');" title="AJXP_MESSAGE[190]" alt="AJXP_MESSAGE[190]" class="icon-flag">&nbsp;</a>
-				<div class="dialogLegend" style="margin-bottom: 3px;margin-top: 4px;" ajxp_message_id="180">AJXP_MESSAGE[180]</div>
-				<div style="width:100%;">
-					<div class="SF_element">
-						<div class="SF_label"><ajxp:message ajxp_message_id="181">AJXP_MESSAGE[181]</ajxp:message></div>
-						<div class="SF_input"><input type="text" name="userid" style="width: 100px; padding:0px;" class="dialogFocus" placeholder="AJXP_MESSAGE[181]"></div>
-					</div>
-					<div class="SF_element">
-						<div class="SF_label"><ajxp:message ajxp_message_id="182">AJXP_MESSAGE[182]</ajxp:message></div>
-						<div class="SF_input"><input type="password" name="password"  style="width: 100px; padding:0px;" placeholder="AJXP_MESSAGE[182]"></div>
-					</div>
-					<div class="SF_element">
-						<input type="checkbox" class="radio" name="remember_me" style="border: none; width:20px !important;"/><ajxp:message ajxp_message_id="261">AJXP_MESSAGE[261]</ajxp:message>
-					</div>
-				</div>
-			</form>
-		</div>
-        <link rel="stylesheet" href="plugins/gui.ajax/res/themes/vision/css/media.css"/>
-        <link rel="stylesheet" href="plugins/gui.ajax/res/themes/vision/css/animate-custom.css"/>
-    </body>
-</html>
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/html/gui_debug.html b/core/src/plugins/gui.ajax/res/themes/vision/html/gui_debug.html
deleted file mode 100755
index de7968f4b7..0000000000
--- a/core/src/plugins/gui.ajax/res/themes/vision/html/gui_debug.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:ajxp>
-<head>
-    <title>Pydio</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <?php if(isSet($START_PARAMETERS) && isSet($START_PARAMETERS["REBASE"])){
-        echo '<base href="'.$START_PARAMETERS["REBASE"].'"/>';
-    }?>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="icon" type="image/x-png" href="<?php print(AJXP_THEME_FOLDER);?>/images/html-folder.png">
-    <!--[if IE 8]>
-    <script src="plugins/gui.ajax/res/js/vendor/es6/es5-shim.min.js"></script>
-    <script src="plugins/gui.ajax/res/js/vendor/es6/es5-sham.min.js"></script>
-    <![endif]-->
-    <?php
-    print($ADDITIONAL_FRAMEWORKS);
-
-$list = AJXP_INSTALL_PATH."/".AJXP_THEME_FOLDER."/css/allz_list.txt";
-$lines = file($list);
-foreach ($lines as $line){
-	print("<link rel=\"stylesheet\" type=\"text/css\" href=\"".CLIENT_RESOURCES_FOLDER."/".trim($line)."\">\n");
-    }
-    ?>
-
-    <?php
-$list = AJXP_INSTALL_PATH."/".CLIENT_RESOURCES_FOLDER."/js/ajaxplorer_boot_list.txt";
-$lines = file($list);
-foreach ($lines as $line){
-	print("<script language=\"javascript\" type=\"text/javascript\" src=\"".CLIENT_RESOURCES_FOLDER."/".trim($line)."\"></script>\n");
-}
-?>
-</head>
-<body style="overflow:hidden;">
-        <div id="ajxp_desktop" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"window","fitMarginBottom":"$(\"optional_bottom_div\").getHeight()"}'></div>
-
-        <script type="text/javascript">
-var ajaxplorer, startParameters = {};
-<?php if($JSON_START_PARAMETERS) print "startParameters = ".$JSON_START_PARAMETERS.";"; ?>
-window.ajxpBootstrap = new AjxpBootstrap(startParameters);
-    </script>
-    <?php
-$list = AJXP_INSTALL_PATH."/".CLIENT_RESOURCES_FOLDER."/js/ajaxplorer_core.txt";
-$lines = file($list);
-foreach ($lines as $line){
-	print("<script language=\"javascript\" type=\"text/javascript\" src=\"".CLIENT_RESOURCES_FOLDER."/".trim($line)."\"></script>\n");
-}
-$list = AJXP_INSTALL_PATH."/".CLIENT_RESOURCES_FOLDER."/js/ajaxplorer_ui.txt";
-$lines = file($list);
-foreach ($lines as $line){
-	print("<script language=\"javascript\" type=\"text/javascript\" src=\"".CLIENT_RESOURCES_FOLDER."/".trim($line)."\"></script>\n");
-}
-?>
-<div id="all_forms">
-        <div id="generic_dialog_box" class="dialogBox form-login_form"><div class="dialogTitle"></div><div class="dialogContent"></div></div>
-<div id="hidden_frames" style="display:none;"></div>
-        <div id="hidden_forms" style="position:absolute;left:-1000px;"></div>
-
-    <!-- LOGIN SCREEN MUST BE ALREADY IN PAGE TO ENABLE PASSWORD REMEMBERING -->
-        <form id="login_form" action="login" style="display:none;" box_width="320" box_padding="0" overlayStyle='{"backgroundColor":"white","opacity":10,"backgroundImage":"url(\"<?php print(AJXP_THEME_FOLDER); ?>/images/grid_t.png\")"}'>
-        <input type="hidden" name="get_action" value="login">
-        <input type="hidden" name="login_seed" id="login_seed" value="">
-        <a style="float:right;font-size: 16px;" href="javascript:pydio.getController().fireAction('switch_language');" title="<?php print($mess[190]);?>" alt="<?php print($mess[190]);?>" class="icon-flag"></a>
-        <div class="dialogLegend" style="margin-bottom: 3px;margin-top:4px;" ajxp_message_id="180"><?php print($mess[180]);?></div>
-<div style="width:100%;">
-        <div class="SF_element">
-        <div class="SF_label"><ajxp:message ajxp_message_id="181"><?php print($mess[181]);?></ajxp:message></div>
-<div class="SF_input"><input type="text" name="userid" style="width: 100px; padding:0px;" class="dialogFocus" placeholder="<?php print($mess[181]);?>"></div>
-        </div>
-        <div class="SF_element">
-        <div class="SF_label"><ajxp:message ajxp_message_id="182"><?php print($mess[182]);?></ajxp:message></div>
-<div class="SF_input"><input type="password" name="password"  style="width: 100px; padding:0px;"  placeholder="<?php print($mess[182]);?>"></div>
-        </div>
-        <div class="SF_element">
-        <input type="checkbox" class="radio" name="remember_me" style="border: none; width:20px !important;"/><ajxp:message ajxp_message_id="261"><?php print($mess[261]);?></ajxp:message>
-        </div>
-        </div>
-        </form>
-        </div>
-        <link rel="stylesheet" href="plugins/gui.ajax/res/themes/vision/css/media.css"/>
-        <link rel="stylesheet" href="plugins/gui.ajax/res/themes/vision/css/animate-custom.css"/>
-        <script type="text/javascript">
-        document.observe("ajaxplorer:before_gui_load", function(e){
-            ajaxplorer.currentThemeUsesIconFonts = true;
-            document.documentElement.className += " ajxp_theme_vision";
-        });
-    </script>
-
-    </body>
-        </html>
-
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/0.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/0.gif
deleted file mode 100755
index 390358048c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/0.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/1.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/1.gif
deleted file mode 100755
index 6991e1f9c3..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/1.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/2.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/2.gif
deleted file mode 100755
index 9874671147..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/2.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/I.png b/core/src/plugins/gui.ajax/res/themes/vision/images/I.png
deleted file mode 100755
index fbb5e3ac0a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/I.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/ICON.png b/core/src/plugins/gui.ajax/res/themes/vision/images/ICON.png
deleted file mode 100755
index ea0b1e06e8..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/ICON.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/L.png b/core/src/plugins/gui.ajax/res/themes/vision/images/L.png
deleted file mode 100755
index cd41cca6d1..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/L.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/Lminus.png b/core/src/plugins/gui.ajax/res/themes/vision/images/Lminus.png
deleted file mode 100755
index 7318864486..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/Lminus.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/LoginBoxLogo.png b/core/src/plugins/gui.ajax/res/themes/vision/images/LoginBoxLogo.png
deleted file mode 100644
index 82d28786d3..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/LoginBoxLogo.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/Lplus.png b/core/src/plugins/gui.ajax/res/themes/vision/images/Lplus.png
deleted file mode 100755
index a962fcccad..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/Lplus.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/PydioLogo250.png b/core/src/plugins/gui.ajax/res/themes/vision/images/PydioLogo250.png
deleted file mode 100644
index 50c9e0925a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/PydioLogo250.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/T.png b/core/src/plugins/gui.ajax/res/themes/vision/images/T.png
deleted file mode 100755
index cd41cca6d1..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/T.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/Tminus.png b/core/src/plugins/gui.ajax/res/themes/vision/images/Tminus.png
deleted file mode 100755
index 69311c5650..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/Tminus.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/Toolbar.psd b/core/src/plugins/gui.ajax/res/themes/vision/images/Toolbar.psd
deleted file mode 100755
index b2568903b2..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/Toolbar.psd and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/ToolbarBg.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/ToolbarBg.gif
deleted file mode 100755
index 341ef531b7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/ToolbarBg.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/ToolbarBgReverse.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/ToolbarBgReverse.gif
deleted file mode 100755
index 0b028de0f0..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/ToolbarBgReverse.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/Tplus.png b/core/src/plugins/gui.ajax/res/themes/vision/images/Tplus.png
deleted file mode 100755
index a962fcccad..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/Tplus.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/1leftarrow.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/1leftarrow.png
deleted file mode 100755
index bbe1482172..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/1leftarrow.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/1uparrow.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/1uparrow.png
deleted file mode 100755
index 594b4d40c9..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/1uparrow.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/accessories-archiver.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/accessories-archiver.png
deleted file mode 100755
index d3f443f88a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/accessories-archiver.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/admin.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/admin.png
deleted file mode 100755
index 3482198d54..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/admin.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/ajxp-link.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/ajxp-link.png
deleted file mode 100755
index b1e5170060..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/ajxp-link.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/applix.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/applix.png
deleted file mode 100755
index 35427f5bda..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/applix.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/archive_insert.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/archive_insert.png
deleted file mode 100755
index 1e3a8ae217..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/archive_insert.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/ark_extract.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/ark_extract.png
deleted file mode 100755
index ab3a47f599..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/ark_extract.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/arrow_down_margin.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/arrow_down_margin.png
deleted file mode 100755
index 2e338f7f83..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/arrow_down_margin.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/back.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/back.png
deleted file mode 100755
index 1689860213..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/back.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/bookmark.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/bookmark.png
deleted file mode 100755
index 04818df036..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/bookmark.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/bookmark_add.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/bookmark_add.png
deleted file mode 100755
index 5e37efcd87..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/bookmark_add.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/bookmark_menu.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/bookmark_menu.png
deleted file mode 100755
index dfb7e35d1d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/bookmark_menu.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/button_cancel.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/button_cancel.png
deleted file mode 100755
index 66d63371cc..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/button_cancel.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/button_ok.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/button_ok.png
deleted file mode 100755
index 4b36e07996..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/button_ok.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/column-visible.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/column-visible.png
deleted file mode 100755
index 2b6134dd58..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/column-visible.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/configure.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/configure.png
deleted file mode 100755
index 895a81fe50..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/configure.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/database.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/database.png
deleted file mode 100755
index f6c7ae66b6..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/database.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/decrypted.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/decrypted.png
deleted file mode 100755
index 32a84f2d74..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/decrypted.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/delete_bookmark.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/delete_bookmark.png
deleted file mode 100755
index 3f2a5de3d0..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/delete_bookmark.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/documentinfo_koffice.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/documentinfo_koffice.png
deleted file mode 100755
index c4e926c416..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/documentinfo_koffice.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/download_manager.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/download_manager.png
deleted file mode 100755
index 2731b2c17c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/download_manager.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/drive_remote.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/drive_remote.png
deleted file mode 100755
index 3aa23b06b6..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/drive_remote.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/edit.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/edit.png
deleted file mode 100755
index e71e51eb61..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/edit.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/edit_clear_history.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/edit_clear_history.png
deleted file mode 100755
index 936d848a2a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/edit_clear_history.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/edit_user.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/edit_user.png
deleted file mode 100755
index e81b793598..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/edit_user.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/editcopy.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/editcopy.png
deleted file mode 100755
index d350391481..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/editcopy.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/editdelete.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/editdelete.png
deleted file mode 100755
index 3f2a5de3d0..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/editdelete.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/editpaste.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/editpaste.png
deleted file mode 100755
index 27f11dc435..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/editpaste.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/encrypted.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/encrypted.png
deleted file mode 100755
index 34058ba233..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/encrypted.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/eraser.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/eraser.png
deleted file mode 100755
index 898d2ec77c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/eraser.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/favorite-folder.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/favorite-folder.png
deleted file mode 100755
index 97ff67f71a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/favorite-folder.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/file_info.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/file_info.png
deleted file mode 100755
index 89cacb25c9..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/file_info.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/fileclose.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/fileclose.png
deleted file mode 100755
index e9e86ca2d2..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/fileclose.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/filenew.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/filenew.png
deleted file mode 100755
index 9aaab557c5..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/filenew.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/fileopen.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/fileopen.png
deleted file mode 100755
index 591b100058..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/fileopen.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/filesave.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/filesave.png
deleted file mode 100755
index 59a0e255a1..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/filesave.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/fileview_icon.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/fileview_icon.png
deleted file mode 100755
index 7dc6687c10..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/fileview_icon.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/flag.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/flag.png
deleted file mode 100755
index 43d3754335..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/flag.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/folder1_important.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/folder1_important.png
deleted file mode 100755
index 9cd1c053c5..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/folder1_important.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/folder_grey.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/folder_grey.png
deleted file mode 100755
index 2f2cb995b4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/folder_grey.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/folder_new.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/folder_new.png
deleted file mode 100755
index 4ea2db1b05..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/folder_new.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/folder_parent.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/folder_parent.png
deleted file mode 100755
index f5db04c8dc..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/folder_parent.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/folder_red.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/folder_red.png
deleted file mode 100755
index 11f8c86071..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/folder_red.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/folder_red_new.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/folder_red_new.png
deleted file mode 100755
index dcfffa961f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/folder_red_new.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/forward.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/forward.png
deleted file mode 100755
index 04efbb3696..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/forward.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/frame_image.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/frame_image.png
deleted file mode 100755
index 255f0adba7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/frame_image.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/go_back.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/go_back.png
deleted file mode 100755
index 1689860213..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/go_back.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/goto_parent.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/goto_parent.png
deleted file mode 100755
index a7980347d6..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/goto_parent.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/hdd_external_mount.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/hdd_external_mount.png
deleted file mode 100755
index 739fa2d2f0..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/hdd_external_mount.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/hdd_external_unmount.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/hdd_external_unmount.png
deleted file mode 100755
index 24adf741ba..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/hdd_external_unmount.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/help-about.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/help-about.png
deleted file mode 100755
index 9bdf7734cf..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/help-about.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/info.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/info.png
deleted file mode 100755
index 09d0e33c50..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/info.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/ksysv.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/ksysv.png
deleted file mode 100755
index 77b5859ed2..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/ksysv.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/mail_generic.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/mail_generic.png
deleted file mode 100755
index d2f72b2c02..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/mail_generic.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/media-playback-start.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/media-playback-start.png
deleted file mode 100755
index 5b84d94bd7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/media-playback-start.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/network-wired.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/network-wired.png
deleted file mode 100755
index 2589a21c6d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/network-wired.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/network_server_database.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/network_server_database.png
deleted file mode 100755
index 3030c17d75..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/network_server_database.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/panel_horizontal_hide.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/panel_horizontal_hide.png
deleted file mode 100755
index ce3d119229..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/panel_horizontal_hide.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/panel_horizontal_show.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/panel_horizontal_show.png
deleted file mode 100755
index b2498855a6..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/panel_horizontal_show.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/panel_vertical_hide.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/panel_vertical_hide.png
deleted file mode 100755
index 446cb022b5..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/panel_vertical_hide.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/panel_vertical_show.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/panel_vertical_show.png
deleted file mode 100755
index 7d2282937b..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/panel_vertical_show.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/player_play.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/player_play.png
deleted file mode 100755
index 32ba2b0790..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/player_play.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/player_stop.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/player_stop.png
deleted file mode 100755
index a44e6f9027..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/player_stop.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/public_url.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/public_url.png
deleted file mode 100755
index b01e46a747..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/public_url.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/reload.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/reload.png
deleted file mode 100755
index a5a05a1868..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/reload.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/search.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/search.png
deleted file mode 100755
index 309b7c43cd..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/search.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/share.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/share.png
deleted file mode 100755
index 12ff3efe51..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/share.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/toggle_log.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/toggle_log.png
deleted file mode 100755
index 63864c9bb4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/toggle_log.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/transp.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/transp.png
deleted file mode 100755
index b98e40b487..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/transp.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/trashcan_empty.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/trashcan_empty.png
deleted file mode 100755
index 3050a8a2c1..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/trashcan_empty.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/up.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/up.png
deleted file mode 100755
index 71b89d3127..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/up.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/user-create-repository.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/user-create-repository.png
deleted file mode 100755
index 9c94d8df13..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/user-create-repository.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/user_group_new.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/user_group_new.png
deleted file mode 100755
index 4ecc09c79e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/user_group_new.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/view_choose.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/view_choose.png
deleted file mode 100755
index 152465b5d3..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/view_choose.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/view_icon.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/view_icon.png
deleted file mode 100755
index a8af5ea776..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/view_icon.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/view_left_close.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/view_left_close.png
deleted file mode 100755
index 798d9d8ee1..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/view_left_close.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/view_left_right.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/view_left_right.png
deleted file mode 100755
index f0c8e3bdec..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/view_left_right.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/view_list_tree.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/view_list_tree.png
deleted file mode 100755
index dd3d0f0a4c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/view_list_tree.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/view_text.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/view_text.png
deleted file mode 100755
index ebe21a54b8..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/view_text.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/view_tree.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/view_tree.png
deleted file mode 100755
index dd3d0f0a4c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/view_tree.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/viewmag1.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/viewmag1.png
deleted file mode 100755
index 9a4d41e20e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/viewmag1.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/wallet_open.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/wallet_open.png
deleted file mode 100755
index f2c09a32f9..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/wallet_open.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/window_close.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/window_close.png
deleted file mode 100755
index 0e8e20ba70..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/window_close.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/window_fullscreen.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/window_fullscreen.png
deleted file mode 100755
index 7f970f3574..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/window_fullscreen.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/window_nofullscreen.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/window_nofullscreen.png
deleted file mode 100755
index b4be3ff585..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/window_nofullscreen.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/xmag.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/xmag.png
deleted file mode 100755
index 746c8a1afc..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/xmag.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/yast_backup.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/yast_backup.png
deleted file mode 100755
index 71b89d3127..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/yast_backup.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/yast_kuser.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/yast_kuser.png
deleted file mode 100755
index f766854678..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/yast_kuser.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/yast_security.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/yast_security.png
deleted file mode 100755
index ff92fda878..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/yast_security.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/yast_user_add.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/yast_user_add.png
deleted file mode 100755
index 65d9894cc7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/yast_user_add.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/zoom-fit-best.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/zoom-fit-best.png
deleted file mode 100755
index de9dd9c96f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/zoom-fit-best.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/zoom-in.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/zoom-in.png
deleted file mode 100755
index d738766417..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/zoom-in.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/zoom-original.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/zoom-original.png
deleted file mode 100755
index 82ee75a676..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/zoom-original.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/zoom-out.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/zoom-out.png
deleted file mode 100755
index 3d2089ac99..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/16/zoom-out.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/1leftarrow.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/1leftarrow.png
deleted file mode 100755
index b82d694fb8..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/1leftarrow.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/1uparrow.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/1uparrow.png
deleted file mode 100755
index 9fd5aa443e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/1uparrow.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/accessories-archiver.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/accessories-archiver.png
deleted file mode 100755
index d1b79e9f56..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/accessories-archiver.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/admin.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/admin.png
deleted file mode 100755
index aff64f62fa..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/admin.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/ajxp-link.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/ajxp-link.png
deleted file mode 100755
index 57e7b40f62..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/ajxp-link.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/applix.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/applix.png
deleted file mode 100755
index 2febcbefd6..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/applix.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/archive_insert.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/archive_insert.png
deleted file mode 100755
index cea63ab11f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/archive_insert.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/ark_extract.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/ark_extract.png
deleted file mode 100755
index 426c525e59..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/ark_extract.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/back_22.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/back_22.png
deleted file mode 100755
index b315cb2e25..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/back_22.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/bookmark.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/bookmark.png
deleted file mode 100755
index 835d30ac8a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/bookmark.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/bookmark_f.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/bookmark_f.png
deleted file mode 100755
index a42916da68..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/bookmark_f.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/button_cancel.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/button_cancel.png
deleted file mode 100755
index 3f1be67466..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/button_cancel.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/button_ok.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/button_ok.png
deleted file mode 100755
index 04f7c37c14..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/button_ok.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/cancel.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/cancel.png
deleted file mode 100755
index 0f7b9a82f4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/cancel.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/configure.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/configure.png
deleted file mode 100755
index 82be464eeb..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/configure.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/database.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/database.png
deleted file mode 100755
index b8e20c2b72..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/database.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/decrypted.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/decrypted.png
deleted file mode 100755
index e28cf8d2e4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/decrypted.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/dialog_close.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/dialog_close.png
deleted file mode 100755
index 91bd18b46c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/dialog_close.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/dialog_ok_apply.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/dialog_ok_apply.png
deleted file mode 100755
index c9841b8d7e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/dialog_ok_apply.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/documentinfo_koffice.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/documentinfo_koffice.png
deleted file mode 100755
index 949dd0b9af..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/documentinfo_koffice.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/download_manager.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/download_manager.png
deleted file mode 100755
index 4aa485cdc0..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/download_manager.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/drive_remote.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/drive_remote.png
deleted file mode 100755
index c5a3ee4dd9..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/drive_remote.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/edit.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/edit.png
deleted file mode 100755
index 5ddbef9829..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/edit.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/edit_clear_history.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/edit_clear_history.png
deleted file mode 100755
index 66fdad8a3e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/edit_clear_history.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/edit_user.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/edit_user.png
deleted file mode 100755
index 0a8c11db38..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/edit_user.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/editcopy.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/editcopy.png
deleted file mode 100755
index 56c2a4bc63..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/editcopy.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/editdelete.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/editdelete.png
deleted file mode 100755
index 9770097473..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/editdelete.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/editpaste.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/editpaste.png
deleted file mode 100755
index 00b4a04140..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/editpaste.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/encrypted.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/encrypted.png
deleted file mode 100755
index ad7d8e8431..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/encrypted.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/eraser.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/eraser.png
deleted file mode 100755
index 4325f81a40..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/eraser.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/favorite-folder.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/favorite-folder.png
deleted file mode 100755
index 155c556751..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/favorite-folder.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/file_info.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/file_info.png
deleted file mode 100755
index f69319aa3e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/file_info.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/fileclose.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/fileclose.png
deleted file mode 100755
index 767794aba6..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/fileclose.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/filenew.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/filenew.png
deleted file mode 100755
index c0853d291c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/filenew.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/fileopen.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/fileopen.png
deleted file mode 100755
index 69a72f53cd..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/fileopen.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/filesave.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/filesave.png
deleted file mode 100755
index b1b69b7d50..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/filesave.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/fileview_icon.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/fileview_icon.png
deleted file mode 100755
index 2f978d644a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/fileview_icon.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/folder1_important.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/folder1_important.png
deleted file mode 100755
index b23fc9829d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/folder1_important.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/folder_grey.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/folder_grey.png
deleted file mode 100755
index 609dadf5a4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/folder_grey.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/folder_new.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/folder_new.png
deleted file mode 100755
index 7c5aa4471f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/folder_new.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/folder_red.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/folder_red.png
deleted file mode 100755
index 650865f85e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/folder_red.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/folder_red_new.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/folder_red_new.png
deleted file mode 100755
index 5bb32c276a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/folder_red_new.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/forward.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/forward.png
deleted file mode 100755
index 11e4c51eac..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/forward.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/forward_22.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/forward_22.png
deleted file mode 100755
index 11e4c51eac..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/forward_22.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/frame_image.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/frame_image.png
deleted file mode 100755
index eccef07aa7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/frame_image.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/go_back.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/go_back.png
deleted file mode 100755
index 14f7d9c7d2..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/go_back.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/hdd_external_mount.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/hdd_external_mount.png
deleted file mode 100755
index e34118580d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/hdd_external_mount.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/hdd_external_unmount.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/hdd_external_unmount.png
deleted file mode 100755
index 25bbcd0827..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/hdd_external_unmount.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/info.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/info.png
deleted file mode 100755
index 6ebdac5184..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/info.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/ksysv.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/ksysv.png
deleted file mode 100755
index dde5f41e08..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/ksysv.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/mail_generic.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/mail_generic.png
deleted file mode 100755
index 827f2047f7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/mail_generic.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/media-playback-start.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/media-playback-start.png
deleted file mode 100755
index 7687ccac91..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/media-playback-start.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/network-wired.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/network-wired.png
deleted file mode 100755
index d9b700643d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/network-wired.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/network_server.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/network_server.png
deleted file mode 100755
index a858473a3d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/network_server.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/network_server_database.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/network_server_database.png
deleted file mode 100755
index 9476227b55..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/network_server_database.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/player_play.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/player_play.png
deleted file mode 100755
index 7687ccac91..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/player_play.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/player_stop.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/player_stop.png
deleted file mode 100755
index 983388e1be..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/player_stop.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/printer1.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/printer1.png
deleted file mode 100755
index 651e4a5878..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/printer1.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/public_url.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/public_url.png
deleted file mode 100755
index 73291443b8..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/public_url.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/reload.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/reload.png
deleted file mode 100755
index 976273fc02..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/reload.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/share.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/share.png
deleted file mode 100755
index 3d95c1f914..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/share.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/system_search.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/system_search.png
deleted file mode 100755
index e131d5f02d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/system_search.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/trashcan_empty.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/trashcan_empty.png
deleted file mode 100755
index e72084d762..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/trashcan_empty.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/unshare.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/unshare.png
deleted file mode 100755
index c45e069821..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/unshare.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/up.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/up.png
deleted file mode 100755
index aadd6e5da8..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/up.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/user-create-repository.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/user-create-repository.png
deleted file mode 100755
index aae9c687c1..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/user-create-repository.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/user_group_new.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/user_group_new.png
deleted file mode 100755
index 85dd08cf6c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/user_group_new.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/view_choose.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/view_choose.png
deleted file mode 100755
index 80f2a9f473..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/view_choose.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/view_icon.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/view_icon.png
deleted file mode 100755
index 508a38eb65..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/view_icon.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/view_left_close.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/view_left_close.png
deleted file mode 100755
index a496308c66..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/view_left_close.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/view_left_right.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/view_left_right.png
deleted file mode 100755
index de3331b31a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/view_left_right.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/view_list_details.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/view_list_details.png
deleted file mode 100755
index 1473cbe3b7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/view_list_details.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/view_list_tree.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/view_list_tree.png
deleted file mode 100755
index 46393d5648..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/view_list_tree.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/view_pim_news.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/view_pim_news.png
deleted file mode 100755
index 7b2c3465cc..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/view_pim_news.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/view_text.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/view_text.png
deleted file mode 100755
index 1cfd089254..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/view_text.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/view_tree.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/view_tree.png
deleted file mode 100755
index 46393d5648..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/view_tree.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/wallet_open.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/wallet_open.png
deleted file mode 100755
index 5ed832f0da..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/wallet_open.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/window_fullscreen.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/window_fullscreen.png
deleted file mode 100755
index a4c86f1f05..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/window_fullscreen.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/window_nofullscreen.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/window_nofullscreen.png
deleted file mode 100755
index 356c5a7a6a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/window_nofullscreen.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/yast_backup.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/yast_backup.png
deleted file mode 100755
index 9f47f101f2..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/yast_backup.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/yast_security.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/yast_security.png
deleted file mode 100755
index 720303cbf0..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/yast_security.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/yast_user_add.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/yast_user_add.png
deleted file mode 100755
index eb8f845479..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/yast_user_add.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/zoom-fit-best.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/zoom-fit-best.png
deleted file mode 100755
index f4beb76b53..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/zoom-fit-best.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/zoom-fit-restore.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/zoom-fit-restore.png
deleted file mode 100755
index 463c657309..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/zoom-fit-restore.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/zoom-in.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/zoom-in.png
deleted file mode 100755
index a5bd769299..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/zoom-in.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/zoom-original.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/zoom-original.png
deleted file mode 100755
index 69452ea297..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/zoom-original.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/zoom-out.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/zoom-out.png
deleted file mode 100755
index 7008f40503..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/22/zoom-out.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/1leftarrow.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/1leftarrow.png
deleted file mode 100755
index 5bad1cc310..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/1leftarrow.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/1uparrow.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/1uparrow.png
deleted file mode 100755
index c2735be5f4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/1uparrow.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/accessories-archiver.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/accessories-archiver.png
deleted file mode 100755
index 0ef770ebe4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/accessories-archiver.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/ajxp-link.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/ajxp-link.png
deleted file mode 100755
index 4e40a8f3e7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/ajxp-link.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/archive_insert.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/archive_insert.png
deleted file mode 100755
index 80c66b2abc..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/archive_insert.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/ark_extract.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/ark_extract.png
deleted file mode 100755
index 515f0cfeb4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/ark_extract.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/back.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/back.png
deleted file mode 100755
index b3d3b578e5..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/back.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/bookmark.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/bookmark.png
deleted file mode 100755
index ad914b90f2..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/bookmark.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/bookmark_add.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/bookmark_add.png
deleted file mode 100755
index 834ad5734a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/bookmark_add.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/bottom.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/bottom.png
deleted file mode 100755
index 25b9ba81dd..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/bottom.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/button_cancel.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/button_cancel.png
deleted file mode 100755
index 0b4af089f5..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/button_cancel.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/button_ok.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/button_ok.png
deleted file mode 100755
index 5109bf5f11..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/button_ok.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/configure.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/configure.png
deleted file mode 100755
index ac4a56d61c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/configure.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/database.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/database.png
deleted file mode 100755
index b4fbae75fa..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/database.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/documentinfo_koffice.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/documentinfo_koffice.png
deleted file mode 100755
index 4d7e11d11e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/documentinfo_koffice.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/download_manager.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/download_manager.png
deleted file mode 100755
index 4c753f3ada..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/download_manager.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/drive_remote.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/drive_remote.png
deleted file mode 100755
index 69e0806e4d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/drive_remote.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/edit_clear_history.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/edit_clear_history.png
deleted file mode 100755
index d2395262de..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/edit_clear_history.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/edit_rename.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/edit_rename.png
deleted file mode 100755
index a8192502d2..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/edit_rename.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/edit_user.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/edit_user.png
deleted file mode 100755
index 757d48affb..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/edit_user.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/editcopy.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/editcopy.png
deleted file mode 100755
index 0a5b97f805..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/editcopy.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/editdelete.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/editdelete.png
deleted file mode 100755
index 53dbd63f62..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/editdelete.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/editpaste.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/editpaste.png
deleted file mode 100755
index b0fdee7f23..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/editpaste.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/eraser.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/eraser.png
deleted file mode 100755
index 10c3fda2bb..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/eraser.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/favorite-folder.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/favorite-folder.png
deleted file mode 100755
index 3876777952..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/favorite-folder.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/file_info.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/file_info.png
deleted file mode 100755
index 19fcb94725..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/file_info.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/fileclose.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/fileclose.png
deleted file mode 100755
index c72f5b589c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/fileclose.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/filenew.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/filenew.png
deleted file mode 100755
index 7168d63b1a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/filenew.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/fileopen.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/fileopen.png
deleted file mode 100755
index 4e59b93b61..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/fileopen.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/filesave.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/filesave.png
deleted file mode 100755
index 7b3dd33c7b..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/filesave.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/fileview_icon.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/fileview_icon.png
deleted file mode 100755
index 44b4f0648d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/fileview_icon.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/fileview_preview.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/fileview_preview.png
deleted file mode 100755
index afe340f96b..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/fileview_preview.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/folder1_important.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/folder1_important.png
deleted file mode 100755
index 8198de37fe..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/folder1_important.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/folder_grey.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/folder_grey.png
deleted file mode 100755
index ba5e44d57a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/folder_grey.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/folder_network.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/folder_network.png
deleted file mode 100755
index d6e1fd01de..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/folder_network.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/folder_new.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/folder_new.png
deleted file mode 100755
index 6792719de7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/folder_new.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/folder_parent.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/folder_parent.png
deleted file mode 100755
index f533323d31..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/folder_parent.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/folder_red.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/folder_red.png
deleted file mode 100755
index 583f975440..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/folder_red.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/folder_red_new.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/folder_red_new.png
deleted file mode 100755
index 9f48c7b5c6..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/folder_red_new.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/forward.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/forward.png
deleted file mode 100755
index de80f23fe5..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/forward.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/hdd_external_mount.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/hdd_external_mount.png
deleted file mode 100755
index c27f40a4a7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/hdd_external_mount.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/hdd_external_unmount.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/hdd_external_unmount.png
deleted file mode 100755
index fb2e098c88..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/hdd_external_unmount.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/info.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/info.png
deleted file mode 100755
index f7eff1aca4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/info.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/ksysv.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/ksysv.png
deleted file mode 100755
index 0dd1beedb8..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/ksysv.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/mail_generic.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/mail_generic.png
deleted file mode 100755
index cc033f6aeb..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/mail_generic.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/media_playback_start.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/media_playback_start.png
deleted file mode 100755
index 08adde7276..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/media_playback_start.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/network_server.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/network_server.png
deleted file mode 100755
index 388b37d4cc..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/network_server.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/network_server_database.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/network_server_database.png
deleted file mode 100755
index 7affc7e693..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/network_server_database.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/object_edit.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/object_edit.png
deleted file mode 100755
index f7033de67f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/object_edit.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/player_stop.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/player_stop.png
deleted file mode 100755
index 020ef79058..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/player_stop.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/preferences_system.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/preferences_system.png
deleted file mode 100755
index e4656a0501..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/preferences_system.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/preferences_system_login.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/preferences_system_login.png
deleted file mode 100755
index 97f0bdaf27..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/preferences_system_login.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/reload.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/reload.png
deleted file mode 100755
index 29ac90a741..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/reload.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/share.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/share.png
deleted file mode 100755
index 60107f7d1d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/share.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/system_log_out.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/system_log_out.png
deleted file mode 100755
index 80b01ea500..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/system_log_out.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/system_search.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/system_search.png
deleted file mode 100755
index b155bef27f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/system_search.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/toggle_log.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/toggle_log.png
deleted file mode 100755
index df1d42087c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/toggle_log.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/top.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/top.png
deleted file mode 100755
index bf9a000616..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/top.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/trashcan_empty.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/trashcan_empty.png
deleted file mode 100755
index 189bb6a5d8..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/trashcan_empty.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/up.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/up.png
deleted file mode 100755
index 5af187a2ed..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/up.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/user-create-repository.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/user-create-repository.png
deleted file mode 100755
index 517318b060..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/user-create-repository.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/user_create.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/user_create.png
deleted file mode 100755
index 80f0d38405..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/user_create.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/user_group_new.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/user_group_new.png
deleted file mode 100755
index f4e2dbf836..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/user_group_new.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/user_guest.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/user_guest.png
deleted file mode 100755
index 92266bac59..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/user_guest.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/user_normal.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/user_normal.png
deleted file mode 100755
index 66dc1e65f0..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/user_normal.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/user_sysadmin.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/user_sysadmin.png
deleted file mode 100755
index 20d0de94e1..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/user_sysadmin.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/utilities_file_archiver.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/utilities_file_archiver.png
deleted file mode 100755
index b9646cec39..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/utilities_file_archiver.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/view_choose.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/view_choose.png
deleted file mode 100755
index e88d60ffee..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/view_choose.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/view_left_close.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/view_left_close.png
deleted file mode 100755
index a496308c66..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/view_left_close.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/view_left_right.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/view_left_right.png
deleted file mode 100755
index de3331b31a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/view_left_right.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/view_list_details.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/view_list_details.png
deleted file mode 100755
index 86956da632..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/view_list_details.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/view_list_icons.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/view_list_icons.png
deleted file mode 100755
index e1f9bbce05..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/view_list_icons.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/view_list_text.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/view_list_text.png
deleted file mode 100755
index 61b04d2006..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/view_list_text.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/view_list_tree.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/view_list_tree.png
deleted file mode 100755
index 52dea08707..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/view_list_tree.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/view_pim_news.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/view_pim_news.png
deleted file mode 100755
index 11e158bbcd..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/view_pim_news.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/view_tree.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/view_tree.png
deleted file mode 100755
index 52dea08707..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/view_tree.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/wallet_open.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/wallet_open.png
deleted file mode 100755
index 8a8e29464c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/wallet_open.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/window_fullscreen.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/window_fullscreen.png
deleted file mode 100755
index 90ae4974dc..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/window_fullscreen.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/window_nofullscreen.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/window_nofullscreen.png
deleted file mode 100755
index a00ad13656..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/window_nofullscreen.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/xmag.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/xmag.png
deleted file mode 100755
index 2e46982986..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/xmag.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/yast_backup.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/yast_backup.png
deleted file mode 100755
index 5af187a2ed..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/yast_backup.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/yast_user_add.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/yast_user_add.png
deleted file mode 100755
index d4098121af..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/yast_user_add.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/zoom-fit-best.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/zoom-fit-best.png
deleted file mode 100755
index b29f17ae51..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/zoom-fit-best.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/zoom-in.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/zoom-in.png
deleted file mode 100755
index 59e12a9d69..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/zoom-in.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/zoom-original.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/zoom-original.png
deleted file mode 100755
index 6be5175fb0..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/zoom-original.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/zoom-out.png b/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/zoom-out.png
deleted file mode 100755
index 5d81460c9d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/actions/32/zoom-out.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/ajxp-connexion-loader.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/ajxp-connexion-loader.gif
deleted file mode 100755
index 5a38eb749d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/ajxp-connexion-loader.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/arrow_down.png b/core/src/plugins/gui.ajax/res/themes/vision/images/arrow_down.png
deleted file mode 100755
index c26cecf192..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/arrow_down.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/arrow_down_margin.png b/core/src/plugins/gui.ajax/res/themes/vision/images/arrow_down_margin.png
deleted file mode 100755
index e29275ffbd..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/arrow_down_margin.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/arrow_left.png b/core/src/plugins/gui.ajax/res/themes/vision/images/arrow_left.png
deleted file mode 100755
index ebacdb2507..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/arrow_left.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/arrow_right.png b/core/src/plugins/gui.ajax/res/themes/vision/images/arrow_right.png
deleted file mode 100755
index e9c8f96db3..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/arrow_right.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/arrow_up.png b/core/src/plugins/gui.ajax/res/themes/vision/images/arrow_up.png
deleted file mode 100755
index c5315a7559..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/arrow_up.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/arrow_up_margin.png b/core/src/plugins/gui.ajax/res/themes/vision/images/arrow_up_margin.png
deleted file mode 100755
index 934ce42f8f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/arrow_up_margin.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/autocompleter-loader.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/autocompleter-loader.gif
deleted file mode 100755
index 8c1ffedd99..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/autocompleter-loader.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/awesome/FontAwesome.otf b/core/src/plugins/gui.ajax/res/themes/vision/images/awesome/FontAwesome.otf
deleted file mode 100755
index 70125459f7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/awesome/FontAwesome.otf and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/awesome/fontawesome-webfont.eot b/core/src/plugins/gui.ajax/res/themes/vision/images/awesome/fontawesome-webfont.eot
deleted file mode 100755
index 0662cb96bf..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/awesome/fontawesome-webfont.eot and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/awesome/fontawesome-webfont.svg b/core/src/plugins/gui.ajax/res/themes/vision/images/awesome/fontawesome-webfont.svg
deleted file mode 100755
index 2edb4ec34c..0000000000
--- a/core/src/plugins/gui.ajax/res/themes/vision/images/awesome/fontawesome-webfont.svg
+++ /dev/null
@@ -1,399 +0,0 @@
-<?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></metadata>
-<defs>
-<font id="fontawesomeregular" horiz-adv-x="1536" >
-<font-face units-per-em="1792" ascent="1536" descent="-256" />
-<missing-glyph horiz-adv-x="448" />
-<glyph unicode=" "  horiz-adv-x="448" />
-<glyph unicode="&#x09;" horiz-adv-x="448" />
-<glyph unicode="&#xa0;" horiz-adv-x="448" />
-<glyph unicode="&#xa8;" horiz-adv-x="1792" />
-<glyph unicode="&#xa9;" horiz-adv-x="1792" />
-<glyph unicode="&#xae;" horiz-adv-x="1792" />
-<glyph unicode="&#xb4;" horiz-adv-x="1792" />
-<glyph unicode="&#xc6;" horiz-adv-x="1792" />
-<glyph unicode="&#x2000;" horiz-adv-x="768" />
-<glyph unicode="&#x2001;" />
-<glyph unicode="&#x2002;" horiz-adv-x="768" />
-<glyph unicode="&#x2003;" />
-<glyph unicode="&#x2004;" horiz-adv-x="512" />
-<glyph unicode="&#x2005;" horiz-adv-x="384" />
-<glyph unicode="&#x2006;" horiz-adv-x="256" />
-<glyph unicode="&#x2007;" horiz-adv-x="256" />
-<glyph unicode="&#x2008;" horiz-adv-x="192" />
-<glyph unicode="&#x2009;" horiz-adv-x="307" />
-<glyph unicode="&#x200a;" horiz-adv-x="85" />
-<glyph unicode="&#x202f;" horiz-adv-x="307" />
-<glyph unicode="&#x205f;" horiz-adv-x="384" />
-<glyph unicode="&#x2122;" horiz-adv-x="1792" />
-<glyph unicode="&#x221e;" horiz-adv-x="1792" />
-<glyph unicode="&#x2260;" horiz-adv-x="1792" />
-<glyph unicode="&#xe000;" horiz-adv-x="500" d="M0 0z" />
-<glyph unicode="&#xf000;" horiz-adv-x="1792" d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
-<glyph unicode="&#xf001;" d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89 t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf002;" horiz-adv-x="1664" d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5 t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-<glyph unicode="&#xf003;" horiz-adv-x="1792" d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13 t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf004;" horiz-adv-x="1792" d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600 q-18 -18 -44 -18z" />
-<glyph unicode="&#xf005;" horiz-adv-x="1664" d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455 l502 -73q56 -9 56 -46z" />
-<glyph unicode="&#xf006;" horiz-adv-x="1664" d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500 l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
-<glyph unicode="&#xf007;" horiz-adv-x="1408" d="M1408 131q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q9 0 42 -21.5t74.5 -48t108 -48t133.5 -21.5t133.5 21.5t108 48t74.5 48t42 21.5q61 0 111.5 -20t85.5 -53.5t62 -81 t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf008;" horiz-adv-x="1920" d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128 q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45 t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128 q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19 t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf009;" horiz-adv-x="1664" d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38 h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf00a;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf00b;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf00c;" horiz-adv-x="1792" d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
-<glyph unicode="&#xf00d;" horiz-adv-x="1408" d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68 t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
-<glyph unicode="&#xf00e;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224 q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5 t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-<glyph unicode="&#xf010;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z " />
-<glyph unicode="&#xf011;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5 t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />
-<glyph unicode="&#xf012;" horiz-adv-x="1792" d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf013;" d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38 q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13 l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22 q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
-<glyph unicode="&#xf014;" horiz-adv-x="1408" d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832 q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf015;" horiz-adv-x="1664" d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5 l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
-<glyph unicode="&#xf016;" horiz-adv-x="1280" d="M128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280zM768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z " />
-<glyph unicode="&#xf017;" d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf018;" horiz-adv-x="1920" d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256 q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
-<glyph unicode="&#xf019;" horiz-adv-x="1664" d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136 q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
-<glyph unicode="&#xf01a;" d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273 t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01b;" d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198 t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01c;" d="M1023 576h316q-1 3 -2.5 8t-2.5 8l-212 496h-708l-212 -496q-1 -2 -2.5 -8t-2.5 -8h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552 q25 -61 25 -123z" />
-<glyph unicode="&#xf01d;" d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01e;" d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q14 0 25 -9 l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
-<glyph unicode="&#xf021;" d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117 q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5 q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf022;" horiz-adv-x="1792" d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5 t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47 t47 -113z" />
-<glyph unicode="&#xf023;" horiz-adv-x="1152" d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf024;" horiz-adv-x="1792" d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48 t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf025;" horiz-adv-x="1664" d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78 t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5 t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
-<glyph unicode="&#xf026;" horiz-adv-x="768" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf027;" horiz-adv-x="1152" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
-<glyph unicode="&#xf028;" horiz-adv-x="1664" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5 t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289 t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />
-<glyph unicode="&#xf029;" horiz-adv-x="1408" d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
-<glyph unicode="&#xf02a;" horiz-adv-x="1792" d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
-<glyph unicode="&#xf02b;" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91z" />
-<glyph unicode="&#xf02c;" horiz-adv-x="1920" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />
-<glyph unicode="&#xf02d;" horiz-adv-x="1664" d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23 q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906 q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5 t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />
-<glyph unicode="&#xf02e;" horiz-adv-x="1280" d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-<glyph unicode="&#xf02f;" horiz-adv-x="1664" d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68 v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
-<glyph unicode="&#xf030;" horiz-adv-x="1920" d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136 q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-<glyph unicode="&#xf031;" horiz-adv-x="1664" d="M725 977l-170 -450q73 -1 153.5 -2t119 -1.5t52.5 -0.5l29 2q-32 95 -92 241q-53 132 -92 211zM21 -128h-21l2 79q22 7 80 18q89 16 110 31q20 16 48 68l237 616l280 724h75h53l11 -21l205 -480q103 -242 124 -297q39 -102 96 -235q26 -58 65 -164q24 -67 65 -149 q22 -49 35 -57q22 -19 69 -23q47 -6 103 -27q6 -39 6 -57q0 -14 -1 -26q-80 0 -192 8q-93 8 -189 8q-79 0 -135 -2l-200 -11l-58 -2q0 45 4 78l131 28q56 13 68 23q12 12 12 27t-6 32l-47 114l-92 228l-450 2q-29 -65 -104 -274q-23 -64 -23 -84q0 -31 17 -43 q26 -21 103 -32q3 0 13.5 -2t30 -5t40.5 -6q1 -28 1 -58q0 -17 -2 -27q-66 0 -349 20l-48 -8q-81 -14 -167 -14z" />
-<glyph unicode="&#xf032;" horiz-adv-x="1408" d="M555 15q76 -32 140 -32q131 0 216 41t122 113q38 70 38 181q0 114 -41 180q-58 94 -141 126q-80 32 -247 32q-74 0 -101 -10v-144l-1 -173l3 -270q0 -15 12 -44zM541 761q43 -7 109 -7q175 0 264 65t89 224q0 112 -85 187q-84 75 -255 75q-52 0 -130 -13q0 -44 2 -77 q7 -122 6 -279l-1 -98q0 -43 1 -77zM0 -128l2 94q45 9 68 12q77 12 123 31q17 27 21 51q9 66 9 194l-2 497q-5 256 -9 404q-1 87 -11 109q-1 4 -12 12q-18 12 -69 15q-30 2 -114 13l-4 83l260 6l380 13l45 1q5 0 14 0.5t14 0.5q1 0 21.5 -0.5t40.5 -0.5h74q88 0 191 -27 q43 -13 96 -39q57 -29 102 -76q44 -47 65 -104t21 -122q0 -70 -32 -128t-95 -105q-26 -20 -150 -77q177 -41 267 -146q92 -106 92 -236q0 -76 -29 -161q-21 -62 -71 -117q-66 -72 -140 -108q-73 -36 -203 -60q-82 -15 -198 -11l-197 4q-84 2 -298 -11q-33 -3 -272 -11z" />
-<glyph unicode="&#xf033;" horiz-adv-x="1024" d="M0 -126l17 85q4 1 77 20q76 19 116 39q29 37 41 101l27 139l56 268l12 64q8 44 17 84.5t16 67t12.5 46.5t9 30.5t3.5 11.5l29 157l16 63l22 135l8 50v38q-41 22 -144 28q-28 2 -38 4l19 103l317 -14q39 -2 73 -2q66 0 214 9q33 2 68 4.5t36 2.5q-2 -19 -6 -38 q-7 -29 -13 -51q-55 -19 -109 -31q-64 -16 -101 -31q-12 -31 -24 -88q-9 -44 -13 -82q-44 -199 -66 -306l-61 -311l-38 -158l-43 -235l-12 -45q-2 -7 1 -27q64 -15 119 -21q36 -5 66 -10q-1 -29 -7 -58q-7 -31 -9 -41q-18 0 -23 -1q-24 -2 -42 -2q-9 0 -28 3q-19 4 -145 17 l-198 2q-41 1 -174 -11q-74 -7 -98 -9z" />
-<glyph unicode="&#xf034;" horiz-adv-x="1792" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l215 -1h293l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -42.5 2t-103.5 -1t-111 -1 q-34 0 -67 -5q-10 -97 -8 -136l1 -152v-332l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-88 0 -233 -14q-48 -4 -70 -4q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q8 192 6 433l-5 428q-1 62 -0.5 118.5t0.5 102.5t-2 57t-6 15q-6 5 -14 6q-38 6 -148 6q-43 0 -100 -13.5t-73 -24.5q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1744 128q33 0 42 -18.5t-11 -44.5 l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80z" />
-<glyph unicode="&#xf035;" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l446 -1h318l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -58.5 2t-138.5 -1t-128 -1 q-94 0 -127 -5q-10 -97 -8 -136l1 -152v52l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-82 0 -233 -13q-45 -5 -70 -5q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q6 137 6 433l-5 44q0 265 -2 278q-2 11 -6 15q-6 5 -14 6q-38 6 -148 6q-50 0 -168.5 -14t-132.5 -24q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1505 113q26 -20 26 -49t-26 -49l-162 -126 q-26 -20 -44.5 -11t-18.5 42v80h-1024v-80q0 -33 -18.5 -42t-44.5 11l-162 126q-26 20 -26 49t26 49l162 126q26 20 44.5 11t18.5 -42v-80h1024v80q0 33 18.5 42t44.5 -11z" />
-<glyph unicode="&#xf036;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf037;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19 h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf038;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf039;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf03a;" horiz-adv-x="1792" d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5 t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344 q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192 q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03b;" horiz-adv-x="1792" d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03c;" horiz-adv-x="1792" d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03d;" horiz-adv-x="1792" d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5 q39 -17 39 -59z" />
-<glyph unicode="&#xf03e;" horiz-adv-x="1920" d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216 q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf040;" d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38 q53 0 91 -38l235 -234q37 -39 37 -91z" />
-<glyph unicode="&#xf041;" horiz-adv-x="1024" d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
-<glyph unicode="&#xf042;" d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf043;" horiz-adv-x="1024" d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362 q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
-<glyph unicode="&#xf044;" horiz-adv-x="1792" d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92 l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />
-<glyph unicode="&#xf045;" horiz-adv-x="1664" d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832 q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5 t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />
-<glyph unicode="&#xf046;" horiz-adv-x="1664" d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832 q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110 q24 -24 24 -57t-24 -57z" />
-<glyph unicode="&#xf047;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45 t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf048;" horiz-adv-x="1024" d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19z" />
-<glyph unicode="&#xf049;" horiz-adv-x="1792" d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19l710 710 q19 19 32 13t13 -32v-710q4 11 13 19z" />
-<glyph unicode="&#xf04a;" horiz-adv-x="1664" d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-8 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q5 11 13 19z" />
-<glyph unicode="&#xf04b;" horiz-adv-x="1408" d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
-<glyph unicode="&#xf04c;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf04d;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf04e;" horiz-adv-x="1664" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
-<glyph unicode="&#xf050;" horiz-adv-x="1792" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19l-710 -710 q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
-<glyph unicode="&#xf051;" horiz-adv-x="1024" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19z" />
-<glyph unicode="&#xf052;" horiz-adv-x="1538" d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
-<glyph unicode="&#xf053;" horiz-adv-x="1152" d="M742 -37l-652 651q-37 37 -37 90.5t37 90.5l652 651q37 37 90.5 37t90.5 -37l75 -75q37 -37 37 -90.5t-37 -90.5l-486 -486l486 -485q37 -38 37 -91t-37 -90l-75 -75q-37 -37 -90.5 -37t-90.5 37z" />
-<glyph unicode="&#xf054;" horiz-adv-x="1152" d="M1099 704q0 -52 -37 -91l-652 -651q-37 -37 -90 -37t-90 37l-76 75q-37 39 -37 91q0 53 37 90l486 486l-486 485q-37 39 -37 91q0 53 37 90l76 75q36 38 90 38t90 -38l652 -651q37 -37 37 -90z" />
-<glyph unicode="&#xf055;" d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5 t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf056;" d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" />
-<glyph unicode="&#xf057;" d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19 q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf058;" d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf059;" d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59 q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05a;" d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23 t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05b;" d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109 q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143 q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf05c;" d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23 l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5 t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05d;" d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198 t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05e;" d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61 t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
-<glyph unicode="&#xf060;" d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5 t32.5 -90.5z" />
-<glyph unicode="&#xf061;" d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
-<glyph unicode="&#xf062;" horiz-adv-x="1664" d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651 q37 -39 37 -91z" />
-<glyph unicode="&#xf063;" horiz-adv-x="1664" d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
-<glyph unicode="&#xf064;" horiz-adv-x="1792" d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22 t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
-<glyph unicode="&#xf065;" d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332 q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf066;" d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45 t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
-<glyph unicode="&#xf067;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf068;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf069;" horiz-adv-x="1664" d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154 q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
-<glyph unicode="&#xf06a;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192 q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
-<glyph unicode="&#xf06b;" d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320 q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5 t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf06c;" horiz-adv-x="1792" d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268 q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-30 0 -51 11t-31 24t-27 42q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5 t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />
-<glyph unicode="&#xf06d;" horiz-adv-x="1408" d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1 q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />
-<glyph unicode="&#xf06e;" horiz-adv-x="1792" d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5 t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
-<glyph unicode="&#xf070;" horiz-adv-x="1792" d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9 q-105 -188 -315 -566t-316 -567l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5 q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z " />
-<glyph unicode="&#xf071;" horiz-adv-x="1792" d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185 q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
-<glyph unicode="&#xf072;" horiz-adv-x="1408" d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9 q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
-<glyph unicode="&#xf073;" horiz-adv-x="1664" d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64 q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47 h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf074;" horiz-adv-x="1792" d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1 t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5 v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111 t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-<glyph unicode="&#xf075;" horiz-adv-x="1792" d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281 q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
-<glyph unicode="&#xf076;" d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384 q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf077;" horiz-adv-x="1664" d="M1611 320q0 -53 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-486 485l-486 -485q-36 -38 -90 -38t-90 38l-75 75q-38 36 -38 90q0 53 38 91l651 651q37 37 90 37q52 0 91 -37l650 -651q38 -38 38 -91z" />
-<glyph unicode="&#xf078;" horiz-adv-x="1664" d="M1611 832q0 -53 -37 -90l-651 -651q-38 -38 -91 -38q-54 0 -90 38l-651 651q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l486 -486l486 486q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
-<glyph unicode="&#xf079;" horiz-adv-x="1920" d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -11 7 -21 zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z " />
-<glyph unicode="&#xf07a;" horiz-adv-x="1664" d="M640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5 l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5 t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf07b;" horiz-adv-x="1664" d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf07c;" horiz-adv-x="1920" d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5 t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf07d;" horiz-adv-x="768" d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf07e;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf080;" horiz-adv-x="1920" d="M512 512v-384h-256v384h256zM896 1024v-896h-256v896h256zM1280 768v-640h-256v640h256zM1664 1152v-1024h-256v1024h256zM1792 32v1216q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5z M1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf081;" d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4 q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5 t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf082;" d="M1307 618l23 219h-198v109q0 49 15.5 68.5t71.5 19.5h110v219h-175q-152 0 -218 -72t-66 -213v-131h-131v-219h131v-635h262v635h175zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960 q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf083;" horiz-adv-x="1792" d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5 t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280 q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf084;" horiz-adv-x="1792" d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26 l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5 t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
-<glyph unicode="&#xf085;" horiz-adv-x="1920" d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -10 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5 l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7 l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -9 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31 q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20 t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68 q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70 q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
-<glyph unicode="&#xf086;" horiz-adv-x="1792" d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224 q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7 q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />
-<glyph unicode="&#xf087;" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5 t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769 q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128 q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />
-<glyph unicode="&#xf088;" d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 32 18 69t-17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5 t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5 h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -74 49 -163z" />
-<glyph unicode="&#xf089;" horiz-adv-x="896" d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
-<glyph unicode="&#xf08a;" horiz-adv-x="1792" d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559 q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5 q224 0 351 -124t127 -344z" />
-<glyph unicode="&#xf08b;" horiz-adv-x="1664" d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704 q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />
-<glyph unicode="&#xf08c;" d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5 q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf08d;" horiz-adv-x="1152" d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38 t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
-<glyph unicode="&#xf08e;" horiz-adv-x="1792" d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf090;" d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5 q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf091;" horiz-adv-x="1664" d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91 t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96 q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf092;" d="M394 184q-8 -9 -20 3q-13 11 -4 19q8 9 20 -3q12 -11 4 -19zM352 245q9 -12 0 -19q-8 -6 -17 7t0 18q9 7 17 -6zM291 305q-5 -7 -13 -2q-10 5 -7 12q3 5 13 2q10 -5 7 -12zM322 271q-6 -7 -16 3q-9 11 -2 16q6 6 16 -3q9 -11 2 -16zM451 159q-4 -12 -19 -6q-17 4 -13 15 t19 7q16 -5 13 -16zM514 154q0 -11 -16 -11q-17 -2 -17 11q0 11 16 11q17 2 17 -11zM572 164q2 -10 -14 -14t-18 8t14 15q16 2 18 -9zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-224q-16 0 -24.5 1t-19.5 5t-16 14.5t-5 27.5v239q0 97 -52 142q57 6 102.5 18t94 39 t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103 q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -103t0.5 -68q0 -22 -11 -33.5t-22 -13t-33 -1.5 h-224q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf093;" horiz-adv-x="1664" d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92 t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
-<glyph unicode="&#xf094;" d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5 q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44 q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5 q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -10 1 -18.5t3 -17t4 -13.5t6.5 -16t6.5 -17q16 -40 25 -118.5t9 -136.5z" />
-<glyph unicode="&#xf095;" horiz-adv-x="1408" d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -52.5 3.5t-57.5 12.5t-47.5 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-128 79 -264.5 215.5t-215.5 264.5q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47.5t-12.5 57.5t-3.5 52.5 q0 92 51 186q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174 q2 -1 19 -11.5t24 -14t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
-<glyph unicode="&#xf096;" horiz-adv-x="1408" d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf097;" horiz-adv-x="1280" d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289 q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-<glyph unicode="&#xf098;" d="M1280 343q0 11 -2 16q-3 8 -38.5 29.5t-88.5 49.5l-53 29q-5 3 -19 13t-25 15t-21 5q-18 0 -47 -32.5t-57 -65.5t-44 -33q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170.5 126.5t-126.5 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5t-3.5 16.5q0 13 20.5 33.5t45 38.5 t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5t320.5 -216.5q6 -2 30 -11t33 -12.5 t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf099;" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
-<glyph unicode="&#xf09a;" horiz-adv-x="768" d="M511 980h257l-30 -284h-227v-824h-341v824h-170v284h170v171q0 182 86 275.5t283 93.5h227v-284h-142q-39 0 -62.5 -6.5t-34 -23.5t-13.5 -34.5t-3 -49.5v-142z" />
-<glyph unicode="&#xf09b;" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23 q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -89t0.5 -54q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf09c;" horiz-adv-x="1664" d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5 t316.5 -131.5t131.5 -316.5z" />
-<glyph unicode="&#xf09d;" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
-<glyph unicode="&#xf09e;" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294 q187 -186 294 -425.5t120 -501.5z" />
-<glyph unicode="&#xf0a0;" d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5 h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75 l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
-<glyph unicode="&#xf0a1;" horiz-adv-x="1792" d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5 t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
-<glyph unicode="&#xf0a2;" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM183 128h1298q-164 181 -246.5 411.5t-82.5 484.5q0 256 -320 256t-320 -256q0 -254 -82.5 -484.5t-246.5 -411.5zM1664 128q0 -52 -38 -90t-90 -38 h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" />
-<glyph unicode="&#xf0a3;" d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70 l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70 l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
-<glyph unicode="&#xf0a4;" horiz-adv-x="1792" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106 q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43 q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5 t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
-<glyph unicode="&#xf0a5;" horiz-adv-x="1792" d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-2 3 -3.5 4.5t-4 4.5t-4.5 5q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576 q-50 0 -89 -38.5t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45 t45 -19t45 19t19 45zM1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128 q0 122 81.5 189t206.5 67q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf0a6;" d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576 q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5 t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76 q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />
-<glyph unicode="&#xf0a7;" d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33 t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580 q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100 q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />
-<glyph unicode="&#xf0a8;" d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0a9;" d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0aa;" d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0ab;" d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0ac;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11 q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 10.5t-9.5 10.5q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5 q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5 q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5 t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-5 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3 q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25 q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5 t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5 t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10t17 -20q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21 q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5 q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3 q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5 t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q7 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5 q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7 q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
-<glyph unicode="&#xf0ad;" horiz-adv-x="1664" d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5 t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
-<glyph unicode="&#xf0ae;" horiz-adv-x="1792" d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19 t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0b0;" horiz-adv-x="1408" d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
-<glyph unicode="&#xf0b1;" horiz-adv-x="1792" d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68 t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf0b2;" d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144 l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z " />
-<glyph unicode="&#xf0c0;" horiz-adv-x="1920" d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5 t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75 t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5 t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" />
-<glyph unicode="&#xf0c1;" horiz-adv-x="1664" d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26 l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15 t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207 q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" />
-<glyph unicode="&#xf0c2;" horiz-adv-x="1920" d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z " />
-<glyph unicode="&#xf0c3;" horiz-adv-x="1664" d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
-<glyph unicode="&#xf0c4;" horiz-adv-x="1792" d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84 q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148 q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108 q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6 q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" />
-<glyph unicode="&#xf0c5;" horiz-adv-x="1792" d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299 h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
-<glyph unicode="&#xf0c6;" horiz-adv-x="1408" d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181 l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235 z" />
-<glyph unicode="&#xf0c7;" d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5 h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" />
-<glyph unicode="&#xf0c8;" d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf0c9;" d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45 t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0ca;" horiz-adv-x="1792" d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf0cb;" horiz-adv-x="1792" d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362 q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5 t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 122t0.5 121v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5 t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf0cc;" horiz-adv-x="1792" d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 97 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6 l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -55 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23 l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" />
-<glyph unicode="&#xf0cd;" d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47 q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41 q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472 q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" />
-<glyph unicode="&#xf0ce;" horiz-adv-x="1664" d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23 v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192 q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192 q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113 z" />
-<glyph unicode="&#xf0d0;" horiz-adv-x="1664" d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276 l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
-<glyph unicode="&#xf0d1;" horiz-adv-x="1792" d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5 t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38 t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d2;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134 q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33 q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0d3;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5 t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5 t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
-<glyph unicode="&#xf0d4;" d="M678 -57q0 -38 -10 -71h-380q-95 0 -171.5 56.5t-103.5 147.5q24 45 69 77.5t100 49.5t107 24t107 7q32 0 49 -2q6 -4 30.5 -21t33 -23t31 -23t32 -25.5t27.5 -25.5t26.5 -29.5t21 -30.5t17.5 -34.5t9.5 -36t4.5 -40.5zM385 294q-234 -7 -385 -85v433q103 -118 273 -118 q32 0 70 5q-21 -61 -21 -86q0 -67 63 -149zM558 805q0 -100 -43.5 -160.5t-140.5 -60.5q-51 0 -97 26t-78 67.5t-56 93.5t-35.5 104t-11.5 99q0 96 51.5 165t144.5 69q66 0 119 -41t84 -104t47 -130t16 -128zM1536 896v-736q0 -119 -84.5 -203.5t-203.5 -84.5h-468 q39 73 39 157q0 66 -22 122.5t-55.5 93t-72 71t-72 59.5t-55.5 54.5t-22 59.5q0 36 23 68t56 61.5t65.5 64.5t55.5 93t23 131t-26.5 145.5t-75.5 118.5q-6 6 -14 11t-12.5 7.5t-10 9.5t-10.5 17h135l135 64h-437q-138 0 -244.5 -38.5t-182.5 -133.5q0 126 81 213t207 87h960 q119 0 203.5 -84.5t84.5 -203.5v-96h-256v256h-128v-256h-256v-128h256v-256h128v256h256z" />
-<glyph unicode="&#xf0d5;" horiz-adv-x="1664" d="M876 71q0 21 -4.5 40.5t-9.5 36t-17.5 34.5t-21 30.5t-26.5 29.5t-27.5 25.5t-32 25.5t-31 23t-33 23t-30.5 21q-17 2 -50 2q-54 0 -106 -7t-108 -25t-98 -46t-69 -75t-27 -107q0 -68 35.5 -121.5t93 -84t120.5 -45.5t127 -15q59 0 112.5 12.5t100.5 39t74.5 73.5 t27.5 110zM756 933q0 60 -16.5 127.5t-47 130.5t-84 104t-119.5 41q-93 0 -144 -69t-51 -165q0 -47 11.5 -99t35.5 -104t56 -93.5t78 -67.5t97 -26q97 0 140.5 60.5t43.5 160.5zM625 1408h437l-135 -79h-135q71 -45 110 -126t39 -169q0 -74 -23 -131.5t-56 -92.5t-66 -64.5 t-56 -61t-23 -67.5q0 -26 16.5 -51t43 -48t58.5 -48t64 -55.5t58.5 -66t43 -85t16.5 -106.5q0 -160 -140 -282q-152 -131 -420 -131q-59 0 -119.5 10t-122 33.5t-108.5 58t-77 89t-30 121.5q0 61 37 135q32 64 96 110.5t145 71t155 36t150 13.5q-64 83 -64 149q0 12 2 23.5 t5 19.5t8 21.5t7 21.5q-40 -5 -70 -5q-149 0 -255.5 98t-106.5 246q0 140 95 250.5t234 141.5q94 20 187 20zM1664 1152v-128h-256v-256h-128v256h-256v128h256v256h128v-256h256z" />
-<glyph unicode="&#xf0d6;" horiz-adv-x="1920" d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384 v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d7;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d8;" horiz-adv-x="1024" d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0d9;" horiz-adv-x="640" d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf0da;" horiz-adv-x="640" d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0db;" horiz-adv-x="1664" d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf0dc;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0dd;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0de;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0e0;" horiz-adv-x="1792" d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123 q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" />
-<glyph unicode="&#xf0e1;" d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329 q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
-<glyph unicode="&#xf0e2;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" />
-<glyph unicode="&#xf0e3;" horiz-adv-x="1792" d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5 t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14 q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28 q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" />
-<glyph unicode="&#xf0e4;" horiz-adv-x="1792" d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5 t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5 t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29 q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-<glyph unicode="&#xf0e5;" horiz-adv-x="1792" d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640 q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5 t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
-<glyph unicode="&#xf0e6;" horiz-adv-x="1792" d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257 t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5 t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129 q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" />
-<glyph unicode="&#xf0e7;" horiz-adv-x="896" d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
-<glyph unicode="&#xf0e8;" horiz-adv-x="1792" d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68 z" />
-<glyph unicode="&#xf0e9;" horiz-adv-x="1664" d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97 q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69 q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf0ea;" horiz-adv-x="1792" d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28 h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
-<glyph unicode="&#xf0eb;" horiz-adv-x="1024" d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134 q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47 q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5 t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" />
-<glyph unicode="&#xf0ec;" horiz-adv-x="1792" d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9 q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-<glyph unicode="&#xf0ed;" horiz-adv-x="1920" d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-<glyph unicode="&#xf0ee;" horiz-adv-x="1920" d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-<glyph unicode="&#xf0f0;" horiz-adv-x="1408" d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56 t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68 t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5 t271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf0f1;" horiz-adv-x="1408" d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48 t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252 t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />
-<glyph unicode="&#xf0f2;" horiz-adv-x="1792" d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66 t66 -158z" />
-<glyph unicode="&#xf0f3;" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1664 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5 q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" />
-<glyph unicode="&#xf0f4;" horiz-adv-x="1920" d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45 t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf0f5;" horiz-adv-x="1408" d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45 t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f6;" horiz-adv-x="1280" d="M1024 352v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1024 608v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280z M768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z" />
-<glyph unicode="&#xf0f7;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f8;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5 t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320 v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f9;" horiz-adv-x="1920" d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152 q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0fa;" horiz-adv-x="1792" d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32 q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf0fb;" horiz-adv-x="1920" d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96 q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q261 -58 287 -93z" />
-<glyph unicode="&#xf0fc;" horiz-adv-x="1664" d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
-<glyph unicode="&#xf0fd;" d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf0fe;" d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf100;" horiz-adv-x="1024" d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
-<glyph unicode="&#xf101;" horiz-adv-x="1024" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23 l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf102;" horiz-adv-x="1152" d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393 q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf103;" horiz-adv-x="1152" d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf104;" horiz-adv-x="640" d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf105;" horiz-adv-x="640" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf106;" horiz-adv-x="1152" d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf107;" horiz-adv-x="1152" d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf108;" horiz-adv-x="1920" d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19 t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf109;" horiz-adv-x="1920" d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
-<glyph unicode="&#xf10a;" horiz-adv-x="1152" d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832 q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf10b;" horiz-adv-x="768" d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136 q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf10c;" d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103 t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf10d;" horiz-adv-x="1664" d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" />
-<glyph unicode="&#xf10e;" horiz-adv-x="1664" d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216 v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" />
-<glyph unicode="&#xf110;" horiz-adv-x="1568" d="M496 192q0 -60 -42.5 -102t-101.5 -42q-60 0 -102 42t-42 102t42 102t102 42q59 0 101.5 -42t42.5 -102zM928 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -66 -47 -113t-113 -47t-113 47t-47 113 t47 113t113 47t113 -47t47 -113zM1360 192q0 -46 -33 -79t-79 -33t-79 33t-33 79t33 79t79 33t79 -33t33 -79zM528 1088q0 -73 -51.5 -124.5t-124.5 -51.5t-124.5 51.5t-51.5 124.5t51.5 124.5t124.5 51.5t124.5 -51.5t51.5 -124.5zM992 1280q0 -80 -56 -136t-136 -56 t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1536 640q0 -40 -28 -68t-68 -28t-68 28t-28 68t28 68t68 28t68 -28t28 -68zM1328 1088q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5z" />
-<glyph unicode="&#xf111;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf112;" horiz-adv-x="1792" d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19 l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
-<glyph unicode="&#xf113;" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86 t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218 q0 -87 -27 -168q136 -160 136 -398z" />
-<glyph unicode="&#xf114;" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf115;" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z " />
-<glyph unicode="&#xf116;" horiz-adv-x="1152" d="M896 608v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224h224q14 0 23 -9t9 -23zM1024 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 -28 t-28 -68v-704q0 -40 28 -68t68 -28h704q40 0 68 28t28 68zM1152 928v-704q0 -92 -65.5 -158t-158.5 -66h-704q-93 0 -158.5 66t-65.5 158v704q0 93 65.5 158.5t158.5 65.5h704q93 0 158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf117;" horiz-adv-x="1152" d="M928 1152q93 0 158.5 -65.5t65.5 -158.5v-704q0 -92 -65.5 -158t-158.5 -66h-704q-93 0 -158.5 66t-65.5 158v704q0 93 65.5 158.5t158.5 65.5h704zM1024 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 -28t-28 -68v-704q0 -40 28 -68t68 -28h704q40 0 68 28t28 68z M864 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576z" />
-<glyph unicode="&#xf118;" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5 t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf119;" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204 t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf11a;" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf11b;" horiz-adv-x="1920" d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150 t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" />
-<glyph unicode="&#xf11c;" horiz-adv-x="1920" d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16 h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16 h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96 q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896 h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf11d;" horiz-adv-x="1792" d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9 h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102 q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-<glyph unicode="&#xf11e;" horiz-adv-x="1792" d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2 q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266 q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8 q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-<glyph unicode="&#xf120;" horiz-adv-x="1664" d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9 t9 -23z" />
-<glyph unicode="&#xf121;" horiz-adv-x="1920" d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5 l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" />
-<glyph unicode="&#xf122;" horiz-adv-x="1792" d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1 q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" />
-<glyph unicode="&#xf123;" horiz-adv-x="1664" d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5 l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
-<glyph unicode="&#xf124;" horiz-adv-x="1408" d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
-<glyph unicode="&#xf125;" horiz-adv-x="1664" d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23 v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf126;" horiz-adv-x="1024" d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5 q-2 -287 -226 -414q-68 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497 q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" />
-<glyph unicode="&#xf127;" horiz-adv-x="1664" d="M439 265l-256 -256q-10 -9 -23 -9q-12 0 -23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320 q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18 l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9 t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
-<glyph unicode="&#xf128;" horiz-adv-x="1024" d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5 t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" />
-<glyph unicode="&#xf129;" horiz-adv-x="640" d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192 q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf12a;" horiz-adv-x="640" d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
-<glyph unicode="&#xf12b;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1534 846v-206h-514l-3 27 q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5t-65.5 -51.5t-30.5 -63h232v80 h126z" />
-<glyph unicode="&#xf12c;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1536 -50v-206h-514l-4 27 q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73h232v80h126z" />
-<glyph unicode="&#xf12d;" horiz-adv-x="1920" d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
-<glyph unicode="&#xf12e;" horiz-adv-x="1664" d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5 t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89 q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117 q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" />
-<glyph unicode="&#xf130;" horiz-adv-x="1152" d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5 t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
-<glyph unicode="&#xf131;" horiz-adv-x="1408" d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128 q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23 t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" />
-<glyph unicode="&#xf132;" horiz-adv-x="1280" d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150 t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf133;" horiz-adv-x="1664" d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf134;" horiz-adv-x="1408" d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800 q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113 q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
-<glyph unicode="&#xf135;" horiz-adv-x="1664" d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1 q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
-<glyph unicode="&#xf136;" horiz-adv-x="1792" d="M1708 881l-188 -881h-304l181 849q4 21 1 43q-4 20 -16 35q-10 14 -28 24q-18 9 -40 9h-197l-205 -960h-303l204 960h-304l-205 -960h-304l272 1280h1139q157 0 245 -118q86 -116 52 -281z" />
-<glyph unicode="&#xf137;" d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf138;" d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf139;" d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf13a;" d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf13b;" horiz-adv-x="1408" d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
-<glyph unicode="&#xf13c;" horiz-adv-x="1792" d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
-<glyph unicode="&#xf13d;" horiz-adv-x="1792" d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-13 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352 q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19 t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf13e;" horiz-adv-x="1152" d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181 v-320h736z" />
-<glyph unicode="&#xf140;" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150 t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf141;" horiz-adv-x="1408" d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf142;" horiz-adv-x="384" d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf143;" d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 232 -177 396t-396 177q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128q13 0 23 10 t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf144;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56 q16 -8 32 -8q17 0 32 9z" />
-<glyph unicode="&#xf145;" horiz-adv-x="1792" d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136 t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
-<glyph unicode="&#xf146;" d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
-<glyph unicode="&#xf147;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5 t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf148;" horiz-adv-x="1024" d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
-<glyph unicode="&#xf149;" horiz-adv-x="1024" d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
-<glyph unicode="&#xf14a;" d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5 t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14b;" d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14c;" d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14d;" d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q10 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5 t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14e;" d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf150;" d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf151;" d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf152;" d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf153;" horiz-adv-x="1024" d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9 t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26 l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />
-<glyph unicode="&#xf154;" horiz-adv-x="1024" d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7 q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
-<glyph unicode="&#xf155;" horiz-adv-x="1024" d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43 t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5 t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50 t53 -63.5t31.5 -76.5t13 -94z" />
-<glyph unicode="&#xf156;" horiz-adv-x="898" d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102 q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf157;" horiz-adv-x="1027" d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61 l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
-<glyph unicode="&#xf158;" horiz-adv-x="1664" d="M1664 352v-32q0 -132 -94 -226t-226 -94h-128q-132 0 -226 94t-94 226v480h-224q-2 -102 -14.5 -190.5t-30.5 -156t-48.5 -126.5t-57 -99.5t-67.5 -77.5t-69.5 -58.5t-74 -44t-69 -32t-65.5 -25.5q-4 -2 -32 -13q-8 -2 -12 -2q-22 0 -30 20l-71 178q-5 13 0 25t17 17 q7 3 20 7.5t18 6.5q31 12 46.5 18.5t44.5 20t45.5 26t42 32.5t40.5 42.5t34.5 53.5t30.5 68.5t22.5 83.5t17 103t6.5 123h-256q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h1216q14 0 23 -9t9 -23v-160q0 -14 -9 -23t-23 -9h-224v-512q0 -26 19 -45t45 -19h128q26 0 45 19t19 45 v64q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1280 1376v-160q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h960q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf159;" horiz-adv-x="1792" d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23 t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28 q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf15a;" horiz-adv-x="1280" d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164 l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30 t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
-<glyph unicode="&#xf15b;" horiz-adv-x="1280" d="M1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
-<glyph unicode="&#xf15c;" horiz-adv-x="1280" d="M1024 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1024 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28 t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
-<glyph unicode="&#xf15d;" horiz-adv-x="1664" d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23 v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162 l230 -662h70z" />
-<glyph unicode="&#xf15e;" horiz-adv-x="1664" d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150 v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248 v119h121z" />
-<glyph unicode="&#xf160;" horiz-adv-x="1792" d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832 q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf161;" horiz-adv-x="1792" d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192 q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf162;" d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23 zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5 t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />
-<glyph unicode="&#xf163;" d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9 t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13 q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />
-<glyph unicode="&#xf164;" horiz-adv-x="1664" d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76 q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5 t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />
-<glyph unicode="&#xf165;" horiz-adv-x="1664" d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135 t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121 t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />
-<glyph unicode="&#xf166;" d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 16 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15 q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38 q21 -28 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5 q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78l24 -69t23 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38q-51 0 -78 -38 q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf167;" d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73 q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51 q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99 q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-37 -51 -106 -51q-67 0 -105 51 q-28 38 -28 118v175q0 80 28 117q38 51 105 51q69 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />
-<glyph unicode="&#xf168;" horiz-adv-x="1408" d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942 q25 45 64 45h241q22 0 31 -15z" />
-<glyph unicode="&#xf169;" d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1 l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf16a;" horiz-adv-x="1792" d="M1280 640q0 37 -30 54l-512 320q-31 20 -65 2q-33 -18 -33 -56v-640q0 -38 33 -56q16 -8 31 -8q20 0 34 10l512 320q30 17 30 54zM1792 640q0 -96 -1 -150t-8.5 -136.5t-22.5 -147.5q-16 -73 -69 -123t-124 -58q-222 -25 -671 -25t-671 25q-71 8 -124.5 58t-69.5 123 q-14 65 -21.5 147.5t-8.5 136.5t-1 150t1 150t8.5 136.5t22.5 147.5q16 73 69 123t124 58q222 25 671 25t671 -25q71 -8 124.5 -58t69.5 -123q14 -65 21.5 -147.5t8.5 -136.5t1 -150z" />
-<glyph unicode="&#xf16b;" horiz-adv-x="1792" d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
-<glyph unicode="&#xf16c;" horiz-adv-x="1408" d="M928 135v-151l-707 -1v151zM1169 481v-701l-1 -35v-1h-1132l-35 1h-1v736h121v-618h928v618h120zM241 393l704 -65l-13 -150l-705 65zM309 709l683 -183l-39 -146l-683 183zM472 1058l609 -360l-77 -130l-609 360zM832 1389l398 -585l-124 -85l-399 584zM1285 1536 l121 -697l-149 -26l-121 697z" />
-<glyph unicode="&#xf16d;" d="M1362 110v648h-135q20 -63 20 -131q0 -126 -64 -232.5t-174 -168.5t-240 -62q-197 0 -337 135.5t-140 327.5q0 68 20 131h-141v-648q0 -26 17.5 -43.5t43.5 -17.5h1069q25 0 43 17.5t18 43.5zM1078 643q0 124 -90.5 211.5t-218.5 87.5q-127 0 -217.5 -87.5t-90.5 -211.5 t90.5 -211.5t217.5 -87.5q128 0 218.5 87.5t90.5 211.5zM1362 1003v165q0 28 -20 48.5t-49 20.5h-174q-29 0 -49 -20.5t-20 -48.5v-165q0 -29 20 -49t49 -20h174q29 0 49 20t20 49zM1536 1211v-1142q0 -81 -58 -139t-139 -58h-1142q-81 0 -139 58t-58 139v1142q0 81 58 139 t139 58h1142q81 0 139 -58t58 -139z" />
-<glyph unicode="&#xf16e;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150 t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
-<glyph unicode="&#xf170;" d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf171;" horiz-adv-x="1408" d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22 t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18 t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5 t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
-<glyph unicode="&#xf172;" d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5 t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf173;" horiz-adv-x="1024" d="M390 1408h219v-388h364v-241h-364v-394q0 -136 14 -172q13 -37 52 -60q50 -31 117 -31q117 0 232 76v-242q-102 -48 -178 -65q-77 -19 -173 -19q-105 0 -186 27q-78 25 -138 75q-58 51 -79 105q-22 54 -22 161v539h-170v217q91 30 155 84q64 55 103 132q39 78 54 196z " />
-<glyph unicode="&#xf174;" d="M1123 127v181q-88 -56 -174 -56q-51 0 -88 23q-29 17 -39 45q-11 30 -11 129v295h274v181h-274v291h-164q-11 -90 -40 -147t-78 -99q-48 -40 -116 -63v-163h127v-404q0 -78 17 -121q17 -42 59 -78q43 -37 104 -57q62 -20 140 -20q67 0 129 14q57 13 134 49zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf175;" horiz-adv-x="768" d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
-<glyph unicode="&#xf176;" horiz-adv-x="768" d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
-<glyph unicode="&#xf177;" horiz-adv-x="1792" d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf178;" horiz-adv-x="1792" d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
-<glyph unicode="&#xf179;" horiz-adv-x="1408" d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q112 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65 q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />
-<glyph unicode="&#xf17a;" horiz-adv-x="1664" d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
-<glyph unicode="&#xf17b;" horiz-adv-x="1408" d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30 t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5 h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />
-<glyph unicode="&#xf17c;" d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-7 -10 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7 q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15 q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5 t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19 q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63 q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18l-4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92 q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 37 34.5 53t72.5 10.5t60 -22.5zM626 1152 q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-14 -1 -7 -7l4 -2 q14 -4 18 -31q0 -3 8 2zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5t-30 -18.5 t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43q-19 4 -51 9.5 t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49t-14 -48 q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54q110 143 124 195 q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5t-40.5 -33.5t-61 -14 q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5t15.5 47.5q1 -31 8 -56.5 t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
-<glyph unicode="&#xf17d;" d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81 t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19 q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -6 6.5 -17.5t7.5 -16.5q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6 t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf17e;" d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5 t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5 q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80 q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
-<glyph unicode="&#xf180;" horiz-adv-x="1664" d="M1483 512l-587 -587q-52 -53 -127.5 -53t-128.5 53l-587 587q-53 53 -53 128t53 128l587 587q53 53 128 53t128 -53l265 -265l-398 -399l-188 188q-42 42 -99 42q-59 0 -100 -41l-120 -121q-42 -40 -42 -99q0 -58 42 -100l406 -408q30 -28 67 -37l6 -4h28q60 0 99 41 l619 619l2 -3q53 -53 53 -128t-53 -128zM1406 1138l120 -120q14 -15 14 -36t-14 -36l-730 -730q-17 -15 -37 -15v0q-4 0 -6 1q-18 2 -30 14l-407 408q-14 15 -14 36t14 35l121 120q13 15 35 15t36 -15l252 -252l574 575q15 15 36 15t36 -15z" />
-<glyph unicode="&#xf181;" d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408 q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf182;" horiz-adv-x="1280" d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43 q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf183;" horiz-adv-x="1024" d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf184;" d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf185;" horiz-adv-x="1792" d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4 l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94 q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />
-<glyph unicode="&#xf186;" d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61 t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
-<glyph unicode="&#xf187;" horiz-adv-x="1792" d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536 q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf188;" horiz-adv-x="1664" d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207 q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19 t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
-<glyph unicode="&#xf189;" horiz-adv-x="1920" d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-78 -100 -90 -131q-17 -41 14 -81q17 -21 81 -82h1l1 -1l1 -1l2 -2q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58 t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6 q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q17 19 38 30q53 26 239 24 q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2 q39 5 64 -2.5t31 -16.5z" />
-<glyph unicode="&#xf18a;" horiz-adv-x="1792" d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12 q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422 q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178 q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
-<glyph unicode="&#xf18b;" horiz-adv-x="1920" d="M805 163q-122 -67 -261 -67q-141 0 -261 67q98 61 167 149t94 191q25 -103 94 -191t167 -149zM453 1176v-344q0 -179 -89.5 -326t-234.5 -217q-129 152 -129 351q0 200 129.5 352t323.5 184zM958 991q-128 -152 -128 -351q0 -201 128 -351q-145 70 -234.5 218t-89.5 328 v341q196 -33 324 -185zM1638 163q-122 -67 -261 -67q-141 0 -261 67q98 61 167 149t94 191q25 -103 94 -191t167 -149zM1286 1176v-344q0 -179 -91 -326t-237 -217v0q133 154 133 351q0 195 -133 351q129 151 328 185zM1920 640q0 -201 -129 -351q-145 70 -234.5 218 t-89.5 328v341q194 -32 323.5 -184t129.5 -352z" />
-<glyph unicode="&#xf18c;" horiz-adv-x="1792" />
-<glyph unicode="&#xf18d;" horiz-adv-x="1792" />
-<glyph unicode="&#xf18e;" horiz-adv-x="1792" />
-<glyph unicode="&#xf500;" horiz-adv-x="1792" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/awesome/fontawesome-webfont.ttf b/core/src/plugins/gui.ajax/res/themes/vision/images/awesome/fontawesome-webfont.ttf
deleted file mode 100755
index d365924691..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/awesome/fontawesome-webfont.ttf and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/awesome/fontawesome-webfont.woff b/core/src/plugins/gui.ajax/res/themes/vision/images/awesome/fontawesome-webfont.woff
deleted file mode 100755
index b9bd17e158..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/awesome/fontawesome-webfont.woff and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/blank.png b/core/src/plugins/gui.ajax/res/themes/vision/images/blank.png
deleted file mode 100755
index 8274452d1e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/blank.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/dl_bg.png b/core/src/plugins/gui.ajax/res/themes/vision/images/dl_bg.png
deleted file mode 100644
index f561ebba88..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/dl_bg.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/fakeFlashButtonBg.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/fakeFlashButtonBg.gif
deleted file mode 100755
index e5f66ddabd..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/fakeFlashButtonBg.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/foldericon.png b/core/src/plugins/gui.ajax/res/themes/vision/images/foldericon.png
deleted file mode 100755
index 34794f61ad..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/foldericon.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/greenled.png b/core/src/plugins/gui.ajax/res/themes/vision/images/greenled.png
deleted file mode 100755
index 734117f668..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/greenled.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/grid_t.png b/core/src/plugins/gui.ajax/res/themes/vision/images/grid_t.png
deleted file mode 100755
index 5a5944c5d6..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/grid_t.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/grid_tl.png b/core/src/plugins/gui.ajax/res/themes/vision/images/grid_tl.png
deleted file mode 100644
index 021acdfafd..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/grid_tl.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/header_bg.png b/core/src/plugins/gui.ajax/res/themes/vision/images/header_bg.png
deleted file mode 100755
index 28c804cdf3..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/header_bg.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/header_bg_down.png b/core/src/plugins/gui.ajax/res/themes/vision/images/header_bg_down.png
deleted file mode 100755
index 8e16513850..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/header_bg_down.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/header_bg_on.png b/core/src/plugins/gui.ajax/res/themes/vision/images/header_bg_on.png
deleted file mode 100755
index af34ffeb0a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/header_bg_on.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/header_bg_plain.png b/core/src/plugins/gui.ajax/res/themes/vision/images/header_bg_plain.png
deleted file mode 100755
index 28c804cdf3..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/header_bg_plain.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/header_bg_up.png b/core/src/plugins/gui.ajax/res/themes/vision/images/header_bg_up.png
deleted file mode 100755
index 324186160e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/header_bg_up.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/hgrabber.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/hgrabber.gif
deleted file mode 100755
index 35ec413384..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/hgrabber.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/html-folder.png b/core/src/plugins/gui.ajax/res/themes/vision/images/html-folder.png
deleted file mode 100755
index f13f0a7c33..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/html-folder.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang.gif
deleted file mode 100755
index 62b3bc5f23..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_cn.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_cn.gif
deleted file mode 100755
index 11f6da47d2..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_cn.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_de.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_de.gif
deleted file mode 100755
index aea2ee560d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_de.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_ee.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_ee.gif
deleted file mode 100755
index 1b9164c69a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_ee.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_en.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_en.gif
deleted file mode 100755
index 1358a09e55..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_en.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_fr.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_fr.gif
deleted file mode 100755
index dff858b3e1..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_fr.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_hun.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_hun.gif
deleted file mode 100755
index 790d7e738f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_hun.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_it.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_it.gif
deleted file mode 100755
index 8818ae6c68..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_it.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_lt.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_lt.gif
deleted file mode 100755
index c1a1c12a68..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_lt.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_pl.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_pl.gif
deleted file mode 100755
index c3ed36d85e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_pl.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_pt.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_pt.gif
deleted file mode 100644
index ed22576b2a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_pt.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_rs.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_rs.gif
deleted file mode 100755
index e31bc68310..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_rs.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_si.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_si.gif
deleted file mode 100755
index 5c2977695d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_si.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_sk.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_sk.gif
deleted file mode 100755
index 07c0567325..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/i18n/lang_sk.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/loadingImage.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/loadingImage.gif
deleted file mode 100755
index cf38df9b69..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/loadingImage.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/locationBg.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/locationBg.gif
deleted file mode 100755
index f7bd091c8c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/locationBg.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/._users-folder.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/._users-folder.png
deleted file mode 100755
index 8ef49c9861..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/._users-folder.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/admin.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/admin.png
deleted file mode 100755
index 3482198d54..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/admin.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/applications_engineering.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/applications_engineering.png
deleted file mode 100644
index d23bb74adf..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/applications_engineering.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/archive.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/archive.png
deleted file mode 100755
index 8b946b6016..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/archive.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/book.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/book.png
deleted file mode 100644
index bca993e095..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/book.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/css.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/css.png
deleted file mode 100755
index 1a8f49ef1d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/css.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/desktop.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/desktop.png
deleted file mode 100644
index 202ff35512..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/desktop.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/document.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/document.png
deleted file mode 100755
index 352c64675e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/document.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/document_open_remote.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/document_open_remote.png
deleted file mode 100755
index 839714c498..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/document_open_remote.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/dwg.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/dwg.png
deleted file mode 100644
index c048c8c034..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/dwg.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/exe.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/exe.png
deleted file mode 100755
index acaf8234f4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/exe.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/flash.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/flash.png
deleted file mode 100755
index 68daf02595..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/flash.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/folder.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/folder.png
deleted file mode 100755
index 6f665e9a0f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/folder.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/folder_development.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/folder_development.png
deleted file mode 100755
index 5626aa1247..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/folder_development.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/folder_grey.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/folder_grey.png
deleted file mode 100755
index 2f2cb995b4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/folder_grey.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/folder_open.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/folder_open.png
deleted file mode 100755
index 9a26ca17d5..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/folder_open.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/folder_red.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/folder_red.png
deleted file mode 100755
index dcfffa961f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/folder_red.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/hdd_external_mount.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/hdd_external_mount.png
deleted file mode 100755
index 739fa2d2f0..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/hdd_external_mount.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/hdd_external_unmount.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/hdd_external_unmount.png
deleted file mode 100755
index 24adf741ba..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/hdd_external_unmount.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/html.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/html.png
deleted file mode 100755
index d2a96ac1ec..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/html.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/image.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/image.png
deleted file mode 100755
index ddc3ea6ffb..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/image.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/java_src.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/java_src.png
deleted file mode 100755
index ebcd551f15..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/java_src.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/javascript.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/javascript.png
deleted file mode 100755
index e15326ed65..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/javascript.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/midi.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/midi.png
deleted file mode 100755
index 5bb6206dac..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/midi.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/mime_empty.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/mime_empty.png
deleted file mode 100755
index 5ee6710f91..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/mime_empty.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/pdf.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/pdf.png
deleted file mode 100755
index ec9ec8e28f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/pdf.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/php.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/php.png
deleted file mode 100755
index f05384f0f4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/php.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/preferences_desktop.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/preferences_desktop.png
deleted file mode 100755
index fa3cbacf3f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/preferences_desktop.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/preferences_plugin.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/preferences_plugin.png
deleted file mode 100755
index 674c80b894..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/preferences_plugin.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/presentation.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/presentation.png
deleted file mode 100755
index 96ec95ce3f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/presentation.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/repo_child.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/repo_child.png
deleted file mode 100755
index 2500079788..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/repo_child.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/search.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/search.png
deleted file mode 100755
index 309b7c43cd..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/search.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/sound.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/sound.png
deleted file mode 100755
index ab88c04b3a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/sound.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/source_pl.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/source_pl.png
deleted file mode 100755
index e25f575cd6..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/source_pl.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/spreadsheet.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/spreadsheet.png
deleted file mode 100755
index a505500e7b..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/spreadsheet.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/susehelpcenter.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/susehelpcenter.png
deleted file mode 100755
index 22a27cf2a0..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/susehelpcenter.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/toggle_log.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/toggle_log.png
deleted file mode 100755
index 63864c9bb4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/toggle_log.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/trashcan.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/trashcan.png
deleted file mode 100755
index f9dadf2fdf..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/trashcan.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/trashcan_full.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/trashcan_full.png
deleted file mode 100755
index 4ad8848bdc..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/trashcan_full.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/txt2.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/txt2.png
deleted file mode 100755
index 0d8d62a958..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/txt2.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/user-acl.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/user-acl.png
deleted file mode 100755
index d5883a149a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/user-acl.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/user.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/user.png
deleted file mode 100755
index 20d71033b5..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/user.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/user_admin.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/user_admin.png
deleted file mode 100755
index e015e5b167..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/user_admin.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/user_child.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/user_child.png
deleted file mode 100755
index 2500079788..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/user_child.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/user_group_new.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/user_group_new.png
deleted file mode 100755
index f931e13e2b..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/user_group_new.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/user_guest.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/user_guest.png
deleted file mode 100755
index adbbc6e0c1..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/user_guest.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/user_shared.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/user_shared.png
deleted file mode 100755
index 5f6b33fc0a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/user_shared.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/users-folder.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/users-folder.png
deleted file mode 100755
index 6b07d818b9..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/users-folder.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/video.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/video.png
deleted file mode 100755
index 942e650225..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/video.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/word.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/word.png
deleted file mode 100755
index 0cbcda0908..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/word.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/x-office-calendar.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/x-office-calendar.png
deleted file mode 100755
index e27a9de152..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/x-office-calendar.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/yast_kuser.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/yast_kuser.png
deleted file mode 100755
index b83c3d8107..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/yast_kuser.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/zip.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/zip.png
deleted file mode 100755
index a6e97d632c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/16/zip.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/admin.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/admin.png
deleted file mode 100755
index a96c80b24f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/admin.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/applications_engineering.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/applications_engineering.png
deleted file mode 100644
index 1ed85d8214..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/applications_engineering.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/archive.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/archive.png
deleted file mode 100755
index 0b4a137aa4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/archive.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/book.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/book.png
deleted file mode 100644
index 80316bb5fa..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/book.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/css.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/css.png
deleted file mode 100755
index d52a8c2251..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/css.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/desktop.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/desktop.png
deleted file mode 100644
index 01bfaed952..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/desktop.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/document.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/document.png
deleted file mode 100755
index 28fa88d6b1..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/document.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/document_open_remote.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/document_open_remote.png
deleted file mode 100755
index 43498e0642..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/document_open_remote.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/dwg.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/dwg.png
deleted file mode 100644
index 0b72507c26..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/dwg.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/exe.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/exe.png
deleted file mode 100755
index 3e317d4a7a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/exe.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/flash.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/flash.png
deleted file mode 100755
index 5310e86eb4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/flash.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/folder.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/folder.png
deleted file mode 100755
index 2c2f42793c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/folder.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/folder_development.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/folder_development.png
deleted file mode 100755
index ceed7cbc1c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/folder_development.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/folder_grey.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/folder_grey.png
deleted file mode 100755
index f99afbc002..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/folder_grey.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/folder_red.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/folder_red.png
deleted file mode 100755
index 1d30751397..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/folder_red.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/hdd_external_mount.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/hdd_external_mount.png
deleted file mode 100755
index e402a19297..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/hdd_external_mount.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/hdd_external_unmount.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/hdd_external_unmount.png
deleted file mode 100755
index 2b343a1fbb..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/hdd_external_unmount.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/html.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/html.png
deleted file mode 100755
index df58014666..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/html.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/image.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/image.png
deleted file mode 100755
index e87b14536c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/image.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/javascript.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/javascript.png
deleted file mode 100755
index 8939f202dd..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/javascript.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/midi.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/midi.png
deleted file mode 100755
index 48704e6e3c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/midi.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/mime_empty.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/mime_empty.png
deleted file mode 100755
index e62739660b..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/mime_empty.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/pdf.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/pdf.png
deleted file mode 100755
index 9d7f3f21de..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/pdf.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/php.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/php.png
deleted file mode 100755
index fdcdca4800..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/php.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/preferences_desktop.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/preferences_desktop.png
deleted file mode 100755
index c6c0592e32..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/preferences_desktop.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/preferences_plugin.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/preferences_plugin.png
deleted file mode 100755
index c8db6dd4c9..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/preferences_plugin.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/presentation.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/presentation.png
deleted file mode 100755
index 6975280eca..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/presentation.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/repo_child.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/repo_child.png
deleted file mode 100755
index 1d30751397..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/repo_child.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/sound.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/sound.png
deleted file mode 100755
index ed0d3bc1dc..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/sound.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/source_java.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/source_java.png
deleted file mode 100755
index c990a92e7f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/source_java.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/source_pl.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/source_pl.png
deleted file mode 100755
index 975ad8bf9a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/source_pl.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/spreadsheet.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/spreadsheet.png
deleted file mode 100755
index 9aea98cb6f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/spreadsheet.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/susehelpcenter.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/susehelpcenter.png
deleted file mode 100755
index 39ca77af2f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/susehelpcenter.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/toggle_log.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/toggle_log.png
deleted file mode 100755
index 79c43db838..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/toggle_log.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/trashcan.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/trashcan.png
deleted file mode 100755
index ecfaf97dc8..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/trashcan.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/trashcan_full.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/trashcan_full.png
deleted file mode 100755
index ab3ae4955f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/trashcan_full.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/txt2.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/txt2.png
deleted file mode 100755
index d52a8c2251..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/txt2.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/user-acl.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/user-acl.png
deleted file mode 100755
index 49ae5d6298..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/user-acl.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/user.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/user.png
deleted file mode 100755
index 13933ddb3a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/user.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/user_admin.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/user_admin.png
deleted file mode 100755
index a2ca743649..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/user_admin.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/user_child.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/user_child.png
deleted file mode 100755
index 13933ddb3a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/user_child.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/user_group_new.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/user_group_new.png
deleted file mode 100755
index 4e391b4b6f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/user_group_new.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/user_guest.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/user_guest.png
deleted file mode 100755
index cd145a4fdb..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/user_guest.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/user_shared.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/user_shared.png
deleted file mode 100755
index f3e4d4d68d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/user_shared.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/users-folder.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/users-folder.png
deleted file mode 100755
index 5ce92e1e16..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/users-folder.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/video.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/video.png
deleted file mode 100755
index 1c131a7024..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/video.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/word.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/word.png
deleted file mode 100755
index 1ef17e056f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/word.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/x-office-calendar.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/x-office-calendar.png
deleted file mode 100755
index 186a17218d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/x-office-calendar.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/yast_kuser.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/yast_kuser.png
deleted file mode 100755
index d12f0812e2..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/yast_kuser.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/zip.png b/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/zip.png
deleted file mode 100755
index 0b4a137aa4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/mimes/64/zip.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/openfoldericon.png b/core/src/plugins/gui.ajax/res/themes/vision/images/openfoldericon.png
deleted file mode 100755
index 9a26ca17d5..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/openfoldericon.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/overlays/12/bookmark.png b/core/src/plugins/gui.ajax/res/themes/vision/images/overlays/12/bookmark.png
deleted file mode 100755
index 2095294d57..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/overlays/12/bookmark.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/overlays/12/shared.png b/core/src/plugins/gui.ajax/res/themes/vision/images/overlays/12/shared.png
deleted file mode 100755
index 08a3251c0e..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/overlays/12/shared.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/overlays/8/bookmark.png b/core/src/plugins/gui.ajax/res/themes/vision/images/overlays/8/bookmark.png
deleted file mode 100755
index 88596f4d5b..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/overlays/8/bookmark.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/overlays/8/shared.png b/core/src/plugins/gui.ajax/res/themes/vision/images/overlays/8/shared.png
deleted file mode 100755
index b7589519ba..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/overlays/8/shared.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/overlays/share128.png b/core/src/plugins/gui.ajax/res/themes/vision/images/overlays/share128.png
deleted file mode 100755
index 112f870ae3..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/overlays/share128.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/progress_bar.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/progress_bar.gif
deleted file mode 100755
index f0cc7dec03..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/progress_bar.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/progress_bar_80.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/progress_bar_80.gif
deleted file mode 100755
index 7e133bae8b..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/progress_bar_80.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/progress_box.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/progress_box.gif
deleted file mode 100755
index cda8c5df00..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/progress_box.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/progress_box_80.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/progress_box_80.gif
deleted file mode 100755
index 1d0d38cc4b..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/progress_box_80.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/redled.png b/core/src/plugins/gui.ajax/res/themes/vision/images/redled.png
deleted file mode 100755
index ef440c5321..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/redled.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/resize_handle.png b/core/src/plugins/gui.ajax/res/themes/vision/images/resize_handle.png
deleted file mode 100644
index bccdb0981f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/resize_handle.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/slider-handle-vert.png b/core/src/plugins/gui.ajax/res/themes/vision/images/slider-handle-vert.png
deleted file mode 100755
index e88b0c546c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/slider-handle-vert.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/slider-handle.png b/core/src/plugins/gui.ajax/res/themes/vision/images/slider-handle.png
deleted file mode 100755
index 1bd9f8223f..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/slider-handle.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/slider-track-bottom.png b/core/src/plugins/gui.ajax/res/themes/vision/images/slider-track-bottom.png
deleted file mode 100755
index c4d05e079b..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/slider-track-bottom.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/slider-track-left.png b/core/src/plugins/gui.ajax/res/themes/vision/images/slider-track-left.png
deleted file mode 100755
index 438b951fde..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/slider-track-left.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/slider-track-right.png b/core/src/plugins/gui.ajax/res/themes/vision/images/slider-track-right.png
deleted file mode 100755
index c2363d152d..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/slider-track-right.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/slider-track-top.png b/core/src/plugins/gui.ajax/res/themes/vision/images/slider-track-top.png
deleted file mode 100755
index cb7b33b8a8..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/slider-track-top.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/strip.png b/core/src/plugins/gui.ajax/res/themes/vision/images/strip.png
deleted file mode 100755
index 4ec3f8cf7a..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/strip.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/tree-even-odd-bg.png b/core/src/plugins/gui.ajax/res/themes/vision/images/tree-even-odd-bg.png
deleted file mode 100755
index 804c7b0ca4..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/tree-even-odd-bg.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/tree-odd-even-bg.png b/core/src/plugins/gui.ajax/res/themes/vision/images/tree-odd-even-bg.png
deleted file mode 100755
index 88142f29c7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/tree-odd-even-bg.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/vgrabber.gif b/core/src/plugins/gui.ajax/res/themes/vision/images/vgrabber.gif
deleted file mode 100755
index 9c43590160..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/vgrabber.gif and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/white_by.png b/core/src/plugins/gui.ajax/res/themes/vision/images/white_by.png
deleted file mode 100644
index 05303ee40c..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/white_by.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/white_logo-ajxp.png b/core/src/plugins/gui.ajax/res/themes/vision/images/white_logo-ajxp.png
deleted file mode 100644
index d2dd65c957..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/white_logo-ajxp.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/white_logo.png b/core/src/plugins/gui.ajax/res/themes/vision/images/white_logo.png
deleted file mode 100755
index 139fe10de1..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/white_logo.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/res/themes/vision/images/yellowled.png b/core/src/plugins/gui.ajax/res/themes/vision/images/yellowled.png
deleted file mode 100755
index 125badbad7..0000000000
Binary files a/core/src/plugins/gui.ajax/res/themes/vision/images/yellowled.png and /dev/null differ
diff --git a/core/src/plugins/gui.ajax/widget_sample.html b/core/src/plugins/gui.ajax/widget_sample.html
index 331fbe076b..8f164a95db 100644
--- a/core/src/plugins/gui.ajax/widget_sample.html
+++ b/core/src/plugins/gui.ajax/widget_sample.html
@@ -3,7 +3,7 @@
     <title>Pydio Sample</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 
-    <link rel="icon" type="image/x-png" href="res/themes/vision/images/html-folder.png">
+    <link rel="icon" type="image/x-png" href="res/themes/orbit/images/html-folder.png">
 
     <link rel="stylesheet" type="text/css" href="res/themes/orbit/css/allz.css">
     <link rel="stylesheet" type="text/css" href="res/themes/orbit/css/animate-custom.css">
diff --git a/core/src/plugins/gui.ios/MobileNativeRedirect.php b/core/src/plugins/gui.ios/MobileNativeRedirect.php
new file mode 100644
index 0000000000..b80e134ab0
--- /dev/null
+++ b/core/src/plugins/gui.ios/MobileNativeRedirect.php
@@ -0,0 +1,57 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Gui;
+
+use Exception;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Http\UserAgent;
+
+use Pydio\Core\PluginFramework\Plugin;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Test user agent
+ * @package AjaXplorer_Plugins
+ * @subpackage Gui
+ */
+class MobileNativeRedirect extends Plugin
+{
+    public function performChecks()
+    {
+        if (ApplicationState::hasMinisiteHash()) {
+            throw new Exception("Disabled for minisites");
+        }
+        if (UserAgent::userAgentIsWindowsPhone()) {
+            throw new Exception("No native app for windows phone");
+        }
+
+        if (UserAgent::userAgentIsIOS() && !isSet($_GET["skipIOS"]) && !isSet($_COOKIE["SKIP_IOS"])) {
+            return;
+        }
+        if (UserAgent::userAgentIsAndroid() && !isSet($_GET["skipANDROID"]) && !isSet($_COOKIE["SKIP_ANDROID"])) {
+            return;
+        }
+        throw new Exception("Active only when mobile user agent detected.");
+    }
+
+}
diff --git a/core/src/plugins/gui.ios/ajxp-ios.js b/core/src/plugins/gui.ios/ajxp-ios.js
index f3c8547bbb..8438e9ac9f 100644
--- a/core/src/plugins/gui.ios/ajxp-ios.js
+++ b/core/src/plugins/gui.ios/ajxp-ios.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 function cleanURL(url){
     var split = url.split("#");
diff --git a/core/src/plugins/gui.ios/class.IOSGuiPlugin.php b/core/src/plugins/gui.ios/class.IOSGuiPlugin.php
deleted file mode 100644
index 273ef559bb..0000000000
--- a/core/src/plugins/gui.ios/class.IOSGuiPlugin.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Test user agent
- * @package AjaXplorer_Plugins
- * @subpackage Gui
- */
-class IOSGuiPlugin extends AJXP_Plugin
-{
-    public function performChecks()
-    {
-        if(isSet($_SESSION["CURRENT_MINISITE"])) throw new Exception("Disabled for minisites");
-        if(AJXP_Utils::userAgentIsWindowsPhone()){
-            throw new Exception("No native app for windows phone");
-        }
-
-        if (AJXP_Utils::userAgentIsIOS() && !isSet($_GET["skipIOS"]) && !isSet($_COOKIE["SKIP_IOS"])) {
-            return;
-        }
-        if (AJXP_Utils::userAgentIsAndroid() && !isSet($_GET["skipANDROID"]) && !isSet($_COOKIE["SKIP_ANDROID"])) {
-            return;
-        }
-        throw new Exception("Active only when mobile user agent detected.");
-    }
-
-}
diff --git a/core/src/plugins/gui.ios/i18n/conf/de.php b/core/src/plugins/gui.ios/i18n/conf/de.php
index 86bc5ebb59..3fcd39f764 100644
--- a/core/src/plugins/gui.ios/i18n/conf/de.php
+++ b/core/src/plugins/gui.ios/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 /*******************************************************************************
 * German translation:
diff --git a/core/src/plugins/gui.ios/i18n/conf/en.php b/core/src/plugins/gui.ios/i18n/conf/en.php
index 195be7e641..158c21f9f5 100644
--- a/core/src/plugins/gui.ios/i18n/conf/en.php
+++ b/core/src/plugins/gui.ios/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "iOS" => "iOS",
diff --git a/core/src/plugins/gui.ios/i18n/conf/fr.php b/core/src/plugins/gui.ios/i18n/conf/fr.php
index e12d5e98a4..ed3ad69772 100644
--- a/core/src/plugins/gui.ios/i18n/conf/fr.php
+++ b/core/src/plugins/gui.ios/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "iOS" => "iOS",
diff --git a/core/src/plugins/gui.ios/i18n/conf/it.php b/core/src/plugins/gui.ios/i18n/conf/it.php
index bb392f0ad9..9da109512c 100644
--- a/core/src/plugins/gui.ios/i18n/conf/it.php
+++ b/core/src/plugins/gui.ios/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "iOS" => "iOS",
diff --git a/core/src/plugins/gui.ios/i18n/conf/pt.php b/core/src/plugins/gui.ios/i18n/conf/pt.php
index a84bc0d35f..faf9c2ff90 100644
--- a/core/src/plugins/gui.ios/i18n/conf/pt.php
+++ b/core/src/plugins/gui.ios/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "iOS" => "iOS",
diff --git a/core/src/plugins/gui.ios/i18n/de.php b/core/src/plugins/gui.ios/i18n/de.php
index 7bc7884b6d..061ebe4aa7 100644
--- a/core/src/plugins/gui.ios/i18n/de.php
+++ b/core/src/plugins/gui.ios/i18n/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1.ios" => "Für den Zugriff auf %s steht ein Nativer iOs Client zu Verfügung.",
diff --git a/core/src/plugins/gui.ios/i18n/en.php b/core/src/plugins/gui.ios/i18n/en.php
index b084b80c5d..4ef7dc7eac 100644
--- a/core/src/plugins/gui.ios/i18n/en.php
+++ b/core/src/plugins/gui.ios/i18n/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1.ios" => "There is a native application available for accessing %s through iPhone/iPad!",
diff --git a/core/src/plugins/gui.ios/i18n/fr.php b/core/src/plugins/gui.ios/i18n/fr.php
index 75cd06a100..e5be76c6f9 100644
--- a/core/src/plugins/gui.ios/i18n/fr.php
+++ b/core/src/plugins/gui.ios/i18n/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1.ios" => "Il existe un client natif pour accéder à %s sur l'iPhone/iPad.",
diff --git a/core/src/plugins/gui.ios/i18n/it.php b/core/src/plugins/gui.ios/i18n/it.php
index b3b132e7bf..12e5754d7b 100644
--- a/core/src/plugins/gui.ios/i18n/it.php
+++ b/core/src/plugins/gui.ios/i18n/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1.ios" => "Esiste un'applicazione nativa per accedere a %s attraverso iPhone/iPad!",
diff --git a/core/src/plugins/gui.ios/i18n/pt.php b/core/src/plugins/gui.ios/i18n/pt.php
index 71a81cf4b1..cfb2b90652 100644
--- a/core/src/plugins/gui.ios/i18n/pt.php
+++ b/core/src/plugins/gui.ios/i18n/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1.ios" => "Existe uma aplicação nativa para aceder %s através do iPhone/iPad!",
diff --git a/core/src/plugins/gui.ios/manifest.xml b/core/src/plugins/gui.ios/manifest.xml
index b09638469f..63a7c61f89 100644
--- a/core/src/plugins/gui.ios/manifest.xml
+++ b/core/src/plugins/gui.ios/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <guidriver name="ajxp_ios" label="CONF_MESSAGE[iOS]" description="CONF_MESSAGE[Template for redirecting to iPhone application]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <class_definition filename="plugins/gui.ios/class.IOSGuiPlugin.php" classname="IOSGuiPlugin"/>
+    <class_definition filename="plugins/gui.ios/MobileNativeRedirect.php" classname="Pydio\Gui\MobileNativeRedirect"/>
     <server_settings>
         <global_param description="CONF_MESSAGE[iOS Application URL]" label="CONF_MESSAGE[iOS Application]" name="IOS_URL" type="string" default="http://pyd.io/support/stores/ios.php" expose="true"/>
         <global_param description="CONF_MESSAGE[Android Application URL]" label="CONF_MESSAGE[Android App]" name="ANDROID_URL" type="string" default="http://pyd.io/support/stores/android.php" expose="true"/>
diff --git a/core/src/plugins/gui.light/LightGuiPlugin.php b/core/src/plugins/gui.light/LightGuiPlugin.php
new file mode 100644
index 0000000000..e0c688c2f6
--- /dev/null
+++ b/core/src/plugins/gui.light/LightGuiPlugin.php
@@ -0,0 +1,41 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Gui;
+
+use Exception;
+use Pydio\Core\PluginFramework\Plugin;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Test cookie
+ * @package AjaXplorer_Plugins
+ * @subpackage Editor
+ */
+class LightGuiPlugin extends Plugin
+{
+    public function performChecks()
+    {
+        if (!isSet($_COOKIE["AJXP_GUI"]) || $_COOKIE["AJXP_GUI"] != "light") throw new Exception("no");
+    }
+
+}
diff --git a/core/src/plugins/gui.light/ajxp-dl-later.js b/core/src/plugins/gui.light/ajxp-dl-later.js
index 925ebbc6ad..08b2678a24 100644
--- a/core/src/plugins/gui.light/ajxp-dl-later.js
+++ b/core/src/plugins/gui.light/ajxp-dl-later.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 window.logAjxpEven = false;
 function logAjxpBmAction(text){
diff --git a/core/src/plugins/gui.light/class.LightGuiPlugin.php b/core/src/plugins/gui.light/class.LightGuiPlugin.php
deleted file mode 100644
index cbf2a06226..0000000000
--- a/core/src/plugins/gui.light/class.LightGuiPlugin.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Test cookie
- * @package AjaXplorer_Plugins
- * @subpackage Editor
- */
-class LightGuiPlugin extends AJXP_Plugin
-{
-    public function performChecks()
-    {
-        if(!isSet($_COOKIE["AJXP_GUI"]) || $_COOKIE["AJXP_GUI"] != "light") throw new Exception("no");
-    }
-
-}
diff --git a/core/src/plugins/gui.light/i18n/conf/de.php b/core/src/plugins/gui.light/i18n/conf/de.php
index 6cf5f856ee..dd82f008d1 100644
--- a/core/src/plugins/gui.light/i18n/conf/de.php
+++ b/core/src/plugins/gui.light/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 /* *****************************************************************************
diff --git a/core/src/plugins/gui.light/i18n/conf/en.php b/core/src/plugins/gui.light/i18n/conf/en.php
index c4e652a59e..6f71f5f666 100644
--- a/core/src/plugins/gui.light/i18n/conf/en.php
+++ b/core/src/plugins/gui.light/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Light" => "Light",
diff --git a/core/src/plugins/gui.light/i18n/conf/fr.php b/core/src/plugins/gui.light/i18n/conf/fr.php
index 55e38ac4ec..ae7c1bdde8 100644
--- a/core/src/plugins/gui.light/i18n/conf/fr.php
+++ b/core/src/plugins/gui.light/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Light" => "Léger",
diff --git a/core/src/plugins/gui.light/i18n/conf/it.php b/core/src/plugins/gui.light/i18n/conf/it.php
index 99eb478a5c..6ab7e9a4e5 100644
--- a/core/src/plugins/gui.light/i18n/conf/it.php
+++ b/core/src/plugins/gui.light/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Light" => "Light",
diff --git a/core/src/plugins/gui.light/i18n/conf/pt.php b/core/src/plugins/gui.light/i18n/conf/pt.php
index 4736b77378..3ff5f814fe 100644
--- a/core/src/plugins/gui.light/i18n/conf/pt.php
+++ b/core/src/plugins/gui.light/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Light" => "Light",
diff --git a/core/src/plugins/gui.light/manifest.xml b/core/src/plugins/gui.light/manifest.xml
index fc55400eae..9003343d15 100644
--- a/core/src/plugins/gui.light/manifest.xml
+++ b/core/src/plugins/gui.light/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <guidriver name="light" label="CONF_MESSAGE[Light]" description="CONF_MESSAGE[Simple Template for Bookmarklets]">
-    <class_definition filename="plugins/gui.light/class.LightGuiPlugin.php" classname="LightGuiPlugin"/>
+    <class_definition filename="plugins/gui.light/LightGuiPlugin.php" classname="Pydio\Gui\LightGuiPlugin"/>
     <client_settings>
         <resources>
             <i18n namespace="light_gui" path="plugins/gui.light/i18n"/>
@@ -37,21 +37,6 @@
 				    }
 				</style>
 			]]></template>
-			<template name="main_oxygen" element="ajxp_desktop" position="top" theme="oxygen"><![CDATA[
-				<div id="browser" style="background: white;color: #676965;font-family: Arial, Helvetica;" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop"}'>
-					<div id="actions_log" style="overflow: hidden;font-size: 17px;height: 128px;border-radius: 5px;background-color: #BBB;padding: 3px;">
-					</div>
-				</div>
-			]]></template>
-			<template name="main_umbra" element="ajxp_desktop" position="top" theme="umbra"><![CDATA[
-				<div id="browser" style="background: white;color: #676965;font-family: Arial, Helvetica;" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop"}'>
-					<div id="actions_log" style="overflow: hidden;font-size: 17px;height: 128px;border-radius: 5px;background-color: #BBB;padding: 3px;">
-					</div>
-				</div>
-			]]></template>
-			<template name="main_vision" element="ajxp_desktop" position="top" theme="vision"><![CDATA[
-                <div id="actions_log" style="overflow: hidden;font-size: 17px;height: 128px;border-radius: 5px;background-color: #BBB;padding: 3px;"></div>
-			]]></template>
 			<template name="main_orbit" element="ajxp_desktop" position="top" theme="orbit"><![CDATA[
                 <div id="actions_log" style="overflow: hidden;font-size: 17px;height: 128px;border-radius: 5px;background-color: #BBB;padding: 3px;"></div>
 			]]></template>
diff --git a/core/src/plugins/gui.mobile/MobileGuiPlugin.php b/core/src/plugins/gui.mobile/MobileGuiPlugin.php
new file mode 100644
index 0000000000..40623ea411
--- /dev/null
+++ b/core/src/plugins/gui.mobile/MobileGuiPlugin.php
@@ -0,0 +1,91 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Gui;
+
+use DOMXPath;
+use Exception;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Utils\Http\UserAgent;
+
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\PluginFramework\PluginsService;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Test user agent
+ * @package AjaXplorer_Plugins
+ * @subpackage Editor
+ */
+class MobileGuiPlugin extends Plugin
+{
+    public function performChecks()
+    {
+        if (!UserAgent::userAgentIsMobile()) throw new Exception("no");
+    }
+
+    /**
+     * Dynamically modify some registry contributions nodes. Can be easily derivated to enable/disable
+     * some features dynamically during plugin initialization.
+     * @param ContextInterface $ctx
+     * @param \DOMNode $contribNode
+     * @return void
+     */
+    public function parseSpecificContributions(ContextInterface $ctx, \DOMNode &$contribNode)
+    {
+
+        if ($contribNode->nodeName == "client_configs" && !$this->orbitExtensionActive($ctx)) {
+            // remove template_part for orbit_content
+            $xPath = new DOMXPath($contribNode->ownerDocument);
+            $tplNodeList = $xPath->query('template_part[@ajxpId="orbit_content"]', $contribNode);
+            if (!$tplNodeList->length) return;
+            $contribNode->removeChild($tplNodeList->item(0));
+        }
+
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @return bool
+     */
+    private function orbitExtensionActive(ContextInterface $ctx)
+    {
+        $confs = ConfService::getConfStorageImpl()->loadPluginConfig("gui", "ajax");
+        if (!isset($confs) || !isSet($confs["GUI_THEME"])) $confs["GUI_THEME"] = "orbit";
+        if ($confs["GUI_THEME"] == "orbit") {
+            $pServ = PluginsService::getInstance($ctx);
+            $activePlugs = $pServ->getActivePlugins();
+            $streamWrappers = $pServ->getStreamWrapperPlugins();
+            $streamActive = false;
+            foreach ($streamWrappers as $sW) {
+                if ((array_key_exists($sW, $activePlugs) && $activePlugs[$sW] === true)) {
+                    $streamActive = true;
+                    break;
+                }
+            }
+            return $streamActive;
+        }
+        return false;
+    }
+
+}
diff --git a/core/src/plugins/gui.mobile/ajxp-mobile.css b/core/src/plugins/gui.mobile/ajxp-mobile.css
index 0d6e380f79..311540376c 100644
--- a/core/src/plugins/gui.mobile/ajxp-mobile.css
+++ b/core/src/plugins/gui.mobile/ajxp-mobile.css
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 .hsplitbar {
   height: 10px !important;
@@ -55,14 +55,6 @@ a.m-2 {
   width: 100%;
   position: absolute;
 }
-.umbra div#search_panel {
-  margin: 5px;
-}
-.ajxp_theme_vision a.m-2 {
-  margin: 3px 1px;
-  padding: 3px 5px;
-  background-color: #4dc5c3 !important;
-}
 #uploadBrowseButton {
   display: none !important;
 }
@@ -75,9 +67,6 @@ a.m-2 {
   font-size: 12px;
   height: 40px;
 }
-div#userdashboard_main_tab h3.dashboard_panel_title {
-  display: none;
-}
 /* UPDATE MINISITE TEMPlATES */
 #ajxp_shared_folder div#breadcrumb,
 #ajxp_embed_template div#breadcrumb {
diff --git a/core/src/plugins/gui.mobile/ajxp-mobile.js b/core/src/plugins/gui.mobile/ajxp-mobile.js
index 766f145aae..02a79652df 100644
--- a/core/src/plugins/gui.mobile/ajxp-mobile.js
+++ b/core/src/plugins/gui.mobile/ajxp-mobile.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 function getAjxpMobileActions(){
 	var mobileActions = $('mobile_actions_copy');
diff --git a/core/src/plugins/gui.mobile/ajxp-mobile.less b/core/src/plugins/gui.mobile/ajxp-mobile.less
index 61350ff638..2183d2a4cc 100644
--- a/core/src/plugins/gui.mobile/ajxp-mobile.less
+++ b/core/src/plugins/gui.mobile/ajxp-mobile.less
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 @reactBoxShadowDepth1:0 3px 6px rgba(0,0,0,.16),0 3px 6px rgba(0,0,0,.23);
 
@@ -63,16 +63,6 @@ a.m-2{
   }
 }
 
-.umbra div#search_panel{
-    margin: 5px;
-}
-
-.ajxp_theme_vision a.m-2{
-    margin: 3px 1px;
-    padding: 3px 5px;
-    background-color:rgb(77, 197, 195) !important;
-}
-
 #uploadBrowseButton{
     display: none !important;
 }
@@ -89,10 +79,6 @@ a.m-2{
     height: 40px;
 }
 
-div#userdashboard_main_tab h3.dashboard_panel_title{
-    display: none;
-}
-
 /* UPDATE MINISITE TEMPlATES */
 #ajxp_shared_folder div#breadcrumb,
 #ajxp_embed_template div#breadcrumb
diff --git a/core/src/plugins/gui.mobile/class.MobileGuiPlugin.php b/core/src/plugins/gui.mobile/class.MobileGuiPlugin.php
deleted file mode 100644
index 827eb61c72..0000000000
--- a/core/src/plugins/gui.mobile/class.MobileGuiPlugin.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Test user agent
- * @package AjaXplorer_Plugins
- * @subpackage Editor
- */
-class MobileGuiPlugin extends AJXP_Plugin
-{
-    public function performChecks()
-    {
-        if(!AJXP_Utils::userAgentIsMobile()) throw new Exception("no");
-    }
-
-    public function parseSpecificContributions(&$contribNode){
-
-        if($contribNode->nodeName == "client_configs" && !$this->orbitExtensionActive()){
-            // remove template_part for orbit_content
-            $xPath=new DOMXPath($contribNode->ownerDocument);
-            $tplNodeList = $xPath->query('template_part[@ajxpId="orbit_content"]', $contribNode);
-            if(!$tplNodeList->length) return ;
-            $contribNode->removeChild($tplNodeList->item(0));
-        }
-
-    }
-
-    private function orbitExtensionActive(){
-        $confs = ConfService::getConfStorageImpl()->loadPluginConfig("gui", "ajax");
-        if(!isset($confs) || !isSet($confs["GUI_THEME"])) $confs["GUI_THEME"] = "orbit";
-        if($confs["GUI_THEME"] == "orbit"){
-            $pServ = AJXP_PluginsService::getInstance();
-            $activePlugs    = $pServ->getActivePlugins();
-            $streamWrappers = $pServ->getStreamWrapperPlugins();
-            $streamActive   = false;
-            foreach($streamWrappers as $sW){
-                if((array_key_exists($sW, $activePlugs) && $activePlugs[$sW] === true)){
-                    $streamActive = true;
-                    break;
-                }
-            }
-            return $streamActive;
-        }
-        return false;
-    }
-
-}
diff --git a/core/src/plugins/gui.mobile/i18n/conf/de.php b/core/src/plugins/gui.mobile/i18n/conf/de.php
index 6a0a44d8ed..12498a0dd0 100644
--- a/core/src/plugins/gui.mobile/i18n/conf/de.php
+++ b/core/src/plugins/gui.mobile/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 /*******************************************************************************
diff --git a/core/src/plugins/gui.mobile/i18n/conf/en.php b/core/src/plugins/gui.mobile/i18n/conf/en.php
index 181d90a560..c00dafc2b7 100644
--- a/core/src/plugins/gui.mobile/i18n/conf/en.php
+++ b/core/src/plugins/gui.mobile/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Mobile" => "Mobile",
diff --git a/core/src/plugins/gui.mobile/i18n/conf/fr.php b/core/src/plugins/gui.mobile/i18n/conf/fr.php
index 66a491f75c..ec08019802 100644
--- a/core/src/plugins/gui.mobile/i18n/conf/fr.php
+++ b/core/src/plugins/gui.mobile/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Mobile" => "Mobile",
diff --git a/core/src/plugins/gui.mobile/i18n/conf/it.php b/core/src/plugins/gui.mobile/i18n/conf/it.php
index f01e57cc56..3be4e39395 100644
--- a/core/src/plugins/gui.mobile/i18n/conf/it.php
+++ b/core/src/plugins/gui.mobile/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Mobile" => "Mobile",
diff --git a/core/src/plugins/gui.mobile/i18n/conf/pt.php b/core/src/plugins/gui.mobile/i18n/conf/pt.php
index 4b4b77d5bc..f18c2cdb46 100644
--- a/core/src/plugins/gui.mobile/i18n/conf/pt.php
+++ b/core/src/plugins/gui.mobile/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Mobile" => "Móvel",
diff --git a/core/src/plugins/gui.mobile/manifest.xml b/core/src/plugins/gui.mobile/manifest.xml
index a9b6986bc7..9beaffcf8f 100644
--- a/core/src/plugins/gui.mobile/manifest.xml
+++ b/core/src/plugins/gui.mobile/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <guidriver name="ajxp_mobile" label="CONF_MESSAGE[Mobile]" description="CONF_MESSAGE[Template extending gui.ajax for small screen terminals.]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <class_definition filename="plugins/gui.mobile/class.MobileGuiPlugin.php" classname="MobileGuiPlugin"/>
+    <class_definition filename="plugins/gui.mobile/MobileGuiPlugin.php" classname="Pydio\Gui\MobileGuiPlugin"/>
     <client_settings>
         <resources>
             <i18n namespace="mobile_gui" path="plugins/gui.mobile/i18n"/>
@@ -44,93 +44,6 @@
 					window.ajxpMobile = true;
 				</script>
 			]]></template>
-			<template name="main_oxygen" element="ajxp_desktop" position="top" theme="oxygen"><![CDATA[
-				<div id="toolbars">
-					<div id="action_bar">
-						<div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar"></div>
-						<div id="locationbar_cont">
-							<div style="height: 100%;" class="separator"></div>
-							<div style="padding-top : 5px;">
-								<div id="repo_chooser" ajxpClass="RepositorySelect"></div>
-								<div id="locationBar" ajxpClass="LocationBar" ajxpOptions='{"flexTo":"locationbar_cont"}'></div>
-								<div id="logging_string" ajxpClass="UserWidget"></div>
-							</div>
-						</div>
-					</div>
-				</div>
-				<div id="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop"}'>
-						<div id="content_pane" ajxpClass="FilesList" ajxpOptions='"list"' style="border: 1px solid #676965;"></div>
-				</div>
-				<div id="info_container" class="css_boxshadow" ajxpClass="AjxpPane" style="position:absolute;top:4%;left:2%;width:95%;height:91%;display:none;z-index:20001; border-radius: 5px 5px 5px 5px; background-color: #F1F1EF; border: 3px solid #2b70c4;">
-					<div id="info_panel_header" class="panelHeader" style="font-weight:bold;color:#2b70c4;font-size:14px;"><a class="m-2" style="float:right;" href="javascript:$('info_container').hide();">Close</a><span class="info_panel_title_span">Title</span></div>
-					<div id="info_panel" ajxpClass="InfoPanel" ajxpOptions='{"fit":"height"}' class="ajxp_simple_container"></div>
-				</div>
-				<div id="mobile_actions" style="display:none"><a class="m-2" href="#">Info</a> <a class="m-2" href="#">Explore</a></div>
-			]]></template>
-            <template name="main_umbra" element="ajxp_desktop" position="top" theme="umbra"><![CDATA[
-				<div id="toolbars">
-					<div>
-						<div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"skipBubbling":true,"defaultIconSize":16,"defaultStyle":"icon_text","styles":{"icons_only":"Icons Only","icon_text":"Icons and Text","text_only":"Text only"},"stylesImgSizes":{"icons_only":22,"icon_text":16,"text_only":16},"stylesBarSizes":{"icons_only":40,"icon_text":51,"text_only":30}}' class="soft_css_gradient"></div>
-						<div id="locationbar_cont" class="css_gradient">
-							<div style="height: 100%;" class="separator"></div>
-							<div style="padding-top : 5px;">
-								<div id="repo_chooser" ajxpClass="RepositorySelect"></div>
-								<div id="locationBar" ajxpClass="LocationBar" ajxpOptions='{"flexTo":"locationbar_cont","searchButton":"searchbar_splitter","searchIcon":"xmag.png", "searchFocus":"search_txt"}'></div>
-								<div id="logging_string" ajxpClass="UserWidget"></div>
-							</div>
-						</div>
-					</div>
-				</div>
-                <div id="searchbar_splitter" class="browser_splitter umbra" style="overflow:hidden;" ajxpClass="Splitter" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop","direction":"horizontal","initA":0, "minSize":0, "startFolded": true}'>
-                    <div id="search_container" ajxpClass="SearchEngine" ajxpPaneHeader="87" ajxpPaneIcon="xmag.png" data-globalOptions='{"headerClose":{"icon":"panel_vertical_hide.png","splitter":"searchbar_splitter","title":86}}' style="height: 0px; overflow:hidden;"></div>
-                    <div id="content_pane" ajxpClass="FilesList" ajxpOptions='"list"' style="border: 1px solid #bbb;margin:3px;margin-top:1px;"></div>
-                </div>
-				<div id="info_container" class="css_boxshadow umbra" ajxpClass="AjxpPane" style="position:absolute;top:4%;left:2%;width:95%;height:91%;display:none;z-index:20001; border-radius: 5px 5px 5px 5px; background-color: #F1F1EF; border: 3px solid #2b70c4;">
-					<div id="info_panel_header" class="panelHeader" style="font-weight:bold;color:#2b70c4;font-size:14px;"><a class="m-2" style="float:right;" href="javascript:$('info_container').hide();">Close</a><span class="info_panel_title_span">Title</span></div>
-					<div id="info_panel" ajxpClass="InfoPanel" ajxpOptions='{"fit":"height"}' class="ajxp_simple_container"></div>
-				</div>
-				<div id="mobile_actions" style="display:none"><a class="m-2" href="#">Info</a> <a class="m-2" href="#">Explore</a></div>
-			]]></template>
-            <template name="main_vision" element="ajxp_desktop" position="top" theme="vision"><![CDATA[
-				<div id="toolbars">
-					<div id="global_toolbar" ajxpClass="LogoWidget">
-					    <div id="logging_string" ajxpClass="UserWidget" ajxpOptions='{"menuEvent" : "over"}'></div>
-						<div id="top_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["user"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
-						<div id="repo_chooser" ajxpClass="RepositorySelect" ajxpOptions='{"menuPosition": "bottom middle", "menuOffsetTop":11, "menuOffsetLeft":0, "menuMaxHeight":350, "menuEvent":"over", "simpleLabel":"<span class=\"icon-sitemap\"></span><span class=\"ws-label\" ajxp_message_id=\"455\">AJXP_MESSAGE[455]</span><span class=\"icon-caret-down\"></span>"}'></div>
-					</div>
-					<div id="workspace_toolbar" ajxpClass="AjxpPane">
-                        <div id="simple_repository_label" ajxpClass="RepositorySimpleLabel" ajxpOptions='{"bindSizeTo":{"width":{"id":"topPane", "events":["resize-FilesList-content_pane","actions_refreshed"], "min":150,"offset":-5}}}'></div>
-					    <div style="float:left;" ajxpClass="AjxpPane"  id="buttons_bar_cont">
-						    <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["put", "get"],"groupOtherToolbars":["more", "change", "remote"], "groupOtherLabel":"More","skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
-						</div>
-						<div style="float:right;" ajxpClass="AjxpPane" ajxpOptions='{"bindSizeTo":{"width":{"id":"content_pane", "events":["resize-InfoPanel-info_panel", "resize-FoldersTree-topPane","actions_refreshed"], "min":120, "offset":-20, "checkSiblings":true}}}' id="search_engine_cont">
-						    <div id="search_engine" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "fitMarginBottom":20}'></div>
-						</div>
-						<div style="clear:both;" class="skipSibling"/>
-					</div>
-				</div>
-                <div id="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop"}'>
-                    <div id="vertical_splitter2" ajxpClass="Splitter" ajxpOptions='{"direction": "vertical", "initA": 26, "minA":26, "maxA":320, "fit":"height","fitParent":"browser", "minSize":0, "foldingButton":"A", "startFolded":true, "invisibleBar":true}'>
-                        <div id="topPane" ajxpClass="AjxpTabulator" ajxpOptions='{"defaultTabId": "folders","tabInfos" : [{"id":"folders","label":"130","iconClass":"icon-folder-open","element":"folder_pane"},{"id":"shared","label":"363","iconClass":"icon-share","element":"shared_elements"},{"id":"flagged","label":"147","iconClass":"icon-bookmark-empty","element":"flagged_elements"}],"headerToolbarOptions":{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["filter","vertical_splitter2-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}}'>
-                            <div id="folder_pane" ajxpClass="FoldersTree" ajxpOptions='{"display":"dz","replaceScroller":true}' ></div>
-                            <div id="shared_elements" ajxpClass="FetchedResultPane" ajxpOptions='{"nodeProviderProperties":{"get_action":"search", "query":"keyword:ajxp_shared"},"reloadOnServerMessage":"tree/reload_shared_elements"}'></div>
-                            <div id="flagged_elements" ajxpClass="FetchedResultPane" ajxpOptions='{"nodeProviderProperties":{"get_action":"search", "query":"keyword:ajxp_bookmarked"},"reloadOnServerMessage":"tree/reload_bookmarks"}'></div>
-                        </div>
-                        <div id="cpane_container" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"browser"}'>
-                            <div id="cpane_header" class="panelHeader">
-                                <div id="display_toolbar" ajxpClass="ActionsToolbar" ajxpOptions='{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["default"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
-                                <div id="breadcrumb" ajxpClass="Breadcrumb" style="width:50%;" ajxpOptions='{"flexTo":"cpane_header"}'></div>
-                            </div>
-                            <div id="content_pane" ajxpClass="FilesList" ajxpOptions='{"inlineToolbarOptions":{"toolbarsList":["inline"],"skipBubbling":true, "skipCarousel":true, "unique":true},"displayMode":"detail","replaceScroller":true, "fit":"height", "fitParent":"cpane_container", "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px"}' style="border: 1px solid #bbb; border-width:0 1px;"></div>
-                        </div>
-                    </div>
-                </div>
-				<div id="info_container" ajxpClass="AjxpPane" style="position:absolute;top:4%;left:2%;width:95%;height:91%;display:none;z-index:20001; border-radius: 5px 5px 5px 5px;border: 1px solid #59F;box-shadow: rgba(0, 0, 0, 0.7) 1px 1px 31px;">
-                    <div id="info_panel" ajxpClass="InfoPanel" ajxpPaneHeader="131" ajxpPaneIcon="file_info.png" ajxpOptions='{"replaceScroller":"true", "skipActions":true}'></div>
-                    <div class="infoPanelActions" style="color: white; position:absolute; top: -5px; right: 5px; font-size: 1.3em;"><a class="icon-remove-sign"></a></div>
-                </div>
-				<div id="mobile_actions" style="display:none"><a class="m-2" href="#">Info</a> <a class="m-2" href="#">Explore</a></div>
-			]]></template>
             <template_part ajxpClass="AjxpPane" ajxpId="orbit_content" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop"}' theme="orbit"><![CDATA[
             <div id="browser" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height","fitParent":"ajxp_desktop"}'>
                 <div id="topPane" ajxpClass="AjxpPane" ajxpOptions=''>
@@ -150,7 +63,7 @@
                     <div id="files_list_pane" ajxpClass="AjxpPane"  ajxpOptions='{"fit":"height","fitParent":"cpane_container"}'>
                         <div id="files_list_header" ajxpClass="AjxpPane">
                             <div style="float:left;" ajxpClass="AjxpPane"  id="buttons_bar_cont" ajxpOptions='{"flexTo":"files_list_header", "flexToMargin":30}'>
-                                <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["navigation", "info_panel_share","put"],"groupOtherToolbars":["more", "change_main", "change", "remote"], "groupOtherLabel":"More","skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
+                                <div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["navigation", "info_panel_share","put"],"groupOtherToolbars":["more", "change_main", "change", "remote"], "groupOtherLabel":"More","submenuOffsetTop":2}'></div>
                             </div>
                         </div>
                         <div id="content_pane" ajxpClass="FilesList" ajxpOptions='{"inlineToolbarOptions":{"toolbarsList":["inline"],"unique":true},"displayMode":"detail","replaceScroller":true, "messageBoxReference":true, "fit":"height", "fitParent":"files_lit_pane", "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px"}'></div>
diff --git a/core/src/plugins/gui.user/UserGuiController.php b/core/src/plugins/gui.user/UserGuiController.php
new file mode 100644
index 0000000000..20c42bf1bc
--- /dev/null
+++ b/core/src/plugins/gui.user/UserGuiController.php
@@ -0,0 +1,177 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Gui;
+
+use Exception;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Core\Services\AuthService;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\StringHelper;
+
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\PluginFramework\PluginsService;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * @package AjaXplorer_Plugins
+ * @subpackage Gui
+ * @class Pydio\Gui\UserGuiController
+ * Handle the specific /user access point
+ */
+class UserGuiController extends Plugin
+{
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @throws Exception
+     * @throws \Pydio\Core\Exception\ActionNotFoundException
+     * @throws \Pydio\Core\Exception\AuthRequiredException
+     * @throws \Pydio\Core\Exception\UserNotFoundException
+     */
+    public function processUserAccessPoint(ServerRequestInterface &$requestInterface, ResponseInterface &$responseInterface)
+    {
+        $action = $requestInterface->getAttribute("action");
+        $httpVars = $requestInterface->getParsedBody();
+        $context = $requestInterface->getAttribute("ctx");
+
+        switch ($action) {
+            
+            case "user_access_point":
+                
+                $action = "reset-password";
+                $key = InputFilter::sanitize($httpVars["key"], InputFilter::SANITIZE_ALPHANUM);
+                try {
+
+                    $keyData = ConfService::getConfStorageImpl()->loadTemporaryKey("password-reset", $key);
+                    if ($keyData === null || $keyData["user_id"] === false) {
+                        throw new Exception("Invalid password reset key! Did you make sure to copy the correct link?");
+                    }
+
+                    $_SESSION['OVERRIDE_GUI_START_PARAMETERS'] = array(
+                        "REBASE" => "../../",
+                        "USER_GUI_ACTION" => $action,
+                        "USER_ACTION_KEY" => $key
+                    );
+                } catch (Exception $e) {
+                    $_SESSION['OVERRIDE_GUI_START_PARAMETERS'] = array(
+                        "ALERT" => $e->getMessage()
+                    );
+                }
+                $req = $requestInterface->withAttribute("action", "get_boot_gui");
+                $responseInterface = Controller::run($req);
+                unset($_SESSION['OVERRIDE_GUI_START_PARAMETERS']);
+
+                break;
+            
+            case "reset-password-ask":
+
+                // This is a reset password request, generate a token and store it.
+                // Find user by id
+                if (UsersService::userExists($httpVars["email"])) {
+                    // Send email
+                    $mailUId = InputFilter::sanitize($httpVars["email"], InputFilter::SANITIZE_EMAILCHARS);
+                    $userObject = UsersService::getUserById($mailUId);
+                    $email = $userObject->getPersonalRole()->filterParameterValue("core.conf", "email", AJXP_REPO_SCOPE_ALL, "");
+                    if (!empty($email)) {
+                        $uuid = StringHelper::generateRandomString(48);
+                        ConfService::getConfStorageImpl()->saveTemporaryKey("password-reset", $uuid, InputFilter::decodeSecureMagic($httpVars["email"]), array());
+                        $mailer = PluginsService::getInstance($context)->getUniqueActivePluginForType("mailer");
+                        if ($mailer !== false) {
+                            $mess = LocaleService::getMessages();
+                            $link = rtrim(ApplicationState::detectServerURL(true), "/") . "/user/reset-password/" . $uuid;
+                            $mailer->sendMail($context, array($email), $mess["gui.user.1"], $mess["gui.user.7"] . "<a href=\"$link\">$link</a>");
+                        } else {
+                            echo 'ERROR: There is no mailer configured, please contact your administrator';
+                        }
+                    }
+
+                }
+                // Prune existing expired tokens
+                ConfService::getConfStorageImpl()->pruneTemporaryKeys("password-reset", 20);
+                echo "SUCCESS";
+
+                break;
+            
+            case "reset-password":
+
+                ConfService::getConfStorageImpl()->pruneTemporaryKeys("password-reset", 20);
+                // This is a reset password
+                if (isSet($httpVars["key"]) && isSet($httpVars["user_id"])) {
+                    $keyString = InputFilter::sanitize($httpVars["key"], InputFilter::SANITIZE_ALPHANUM);
+                    $key = ConfService::getConfStorageImpl()->loadTemporaryKey("password-reset", $keyString);
+                    ConfService::getConfStorageImpl()->deleteTemporaryKey("password-reset", $keyString);
+                    $uId = $httpVars["user_id"];
+                    if (UsersService::ignoreUserCase()) {
+                        $uId = strtolower($uId);
+                    }
+                    if ($key != null && strtolower($key["user_id"]) == $uId && UsersService::userExists($uId)) {
+                        UsersService::updatePassword($key["user_id"], $httpVars["new_pass"]);
+                    } else {
+                        echo 'PASS_ERROR';
+                        break;
+                    }
+                    AuthService::disconnect();
+                    echo 'SUCCESS';
+                }else{
+                    AuthService::disconnect();
+                    echo 'ERROR';
+                }
+
+                break;
+            default:
+                break;
+        }
+    }
+
+    /**
+     * @param $actionName
+     * @param $args
+     * @throws Exception
+     */
+    protected function processSubAction($actionName, $args)
+    {
+        switch ($actionName) {
+            case "reset-password-ask":
+                break;
+            case "reset-password":
+                if (count($args)) {
+                    $token = $args[0];
+                    $key = ConfService::getConfStorageImpl()->loadTemporaryKey("password-reset", $token);
+                    if ($key == null || $key["user_id"] === false) {
+                        throw new Exception("Invalid password reset key! Did you make sure to copy the correct link?");
+                    }
+                }
+                break;
+            default:
+
+                break;
+        }
+    }
+
+}
diff --git a/core/src/plugins/gui.user/class.UserGuiController.js b/core/src/plugins/gui.user/class.UserGuiController.js
index 2ad40af07e..fa1ee49e77 100644
--- a/core/src/plugins/gui.user/class.UserGuiController.js
+++ b/core/src/plugins/gui.user/class.UserGuiController.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 Class.create("UserGuiController", AjxpPane, {
 
diff --git a/core/src/plugins/gui.user/class.UserGuiController.php b/core/src/plugins/gui.user/class.UserGuiController.php
deleted file mode 100644
index eec6ac8fdb..0000000000
--- a/core/src/plugins/gui.user/class.UserGuiController.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * @package AjaXplorer_Plugins
- * @subpackage Gui
- * @class UserGuiController
- * Handle the specific /user access point
- */
-class UserGuiController extends AJXP_Plugin
-{
-
-    /**
-     * Parse
-     * @param DOMNode $contribNode
-     */
-    protected function parseSpecificContributions(&$contribNode)
-    {
-        parent::parseSpecificContributions($contribNode);
-        if (substr($_SERVER["REQUEST_URI"], 0, strlen('/user')) != '/user') {
-            if ($contribNode->nodeName == "client_configs") {
-                $children = $contribNode->childNodes;
-                foreach ($children as $child) {
-                    if($child->nodeType == XML_ELEMENT_NODE) $contribNode->removeChild($child);
-                }
-            } else if ($contribNode->nodeName == "actions") {
-                $children = $contribNode->childNodes;
-                foreach ($children as $child) {
-                    if ($child->nodeType == XML_ELEMENT_NODE && $child->nodeName == "action" && $child->getAttribute("name") == "login") {
-                        $contribNode->removeChild($child);
-                    }
-                }
-
-            }
-        }
-
-    }
-
-
-    public function processUserAccessPoint($action, $httpVars, $fileVars)
-    {
-        switch ($action) {
-            case "user_access_point":
-                $setUrl = ConfService::getCoreConf("SERVER_URL");
-                $realUri = "/";
-                if(!empty($setUrl)){
-                    $realUri = parse_url(ConfService::getCoreConf("SERVER_URL"), PHP_URL_PATH);
-                }
-                $requestURI = str_replace("//", "/", $_SERVER["REQUEST_URI"]);
-                $uri = trim(str_replace(rtrim($realUri, "/")."/user", "", $requestURI), "/");
-                $uriParts = explode("/", $uri);
-                $action = array_shift($uriParts);
-                $key = ($action == "reset-password" && count($uriParts)) ? array_shift($uriParts) : "";
-                try{
-                    $this->processSubAction($action, $uriParts);
-                    $_SESSION['OVERRIDE_GUI_START_PARAMETERS'] = array(
-                        "REBASE"=>"../../",
-                        "USER_GUI_ACTION" => $action,
-                        "USER_ACTION_KEY" => $key
-                    );
-                }catch(Exception $e){
-                    $_SESSION['OVERRIDE_GUI_START_PARAMETERS'] = array(
-                        "ALERT" => $e->getMessage()
-                    );
-                }
-                AJXP_Controller::findActionAndApply("get_boot_gui", array(), array());
-                unset($_SESSION['OVERRIDE_GUI_START_PARAMETERS']);
-
-                break;
-            case "reset-password-ask":
-
-                // This is a reset password request, generate a token and store it.
-                // Find user by id
-                if (AuthService::userExists($httpVars["email"])) {
-                    // Send email
-                    $userObject = ConfService::getConfStorageImpl()->createUserObject($httpVars["email"]);
-                    $email = $userObject->personalRole->filterParameterValue("core.conf", "email", AJXP_REPO_SCOPE_ALL, "");
-                    if (!empty($email)) {
-                        $uuid = AJXP_Utils::generateRandomString(48);
-                        ConfService::getConfStorageImpl()->saveTemporaryKey("password-reset", $uuid, AJXP_Utils::decodeSecureMagic($httpVars["email"]), array());
-                        $mailer = AJXP_PluginsService::getInstance()->getUniqueActivePluginForType("mailer");
-                        if ($mailer !== false) {
-                            $mess = ConfService::getMessages();
-                            $link = AJXP_Utils::detectServerURL()."/user/reset-password/".$uuid;
-                            $mailer->sendMail(array($email), $mess["gui.user.1"], $mess["gui.user.7"]."<a href=\"$link\">$link</a>");
-                        } else {
-                            echo 'ERROR: There is no mailer configured, please contact your administrator';
-                        }
-                    }
-
-                }
-                // Prune existing expired tokens
-                ConfService::getConfStorageImpl()->pruneTemporaryKeys("password-reset", 20);
-                echo "SUCCESS";
-
-                break;
-            case "reset-password":
-
-                ConfService::getConfStorageImpl()->pruneTemporaryKeys("password-reset", 20);
-                // This is a reset password
-                if (isSet($httpVars["key"]) && isSet($httpVars["user_id"])) {
-                    $key = ConfService::getConfStorageImpl()->loadTemporaryKey("password-reset", $httpVars["key"]);
-                    ConfService::getConfStorageImpl()->deleteTemporaryKey("password-reset", $httpVars["key"]);
-                    $uId  = $httpVars["user_id"];
-                    if(AuthService::ignoreUserCase()){
-                        $uId = strtolower($uId);
-                    }
-                    if ($key != null && strtolower($key["user_id"]) == $uId && AuthService::userExists($uId)) {
-                        AuthService::updatePassword($key["user_id"], $httpVars["new_pass"]);
-                    }else{
-                        echo 'PASS_ERROR';
-                        break;
-                    }
-                }
-                AuthService::disconnect();
-                echo 'SUCCESS';
-
-                break;
-            default:
-                break;
-        }
-    }
-
-    protected function processSubAction($actionName, $args)
-    {
-        switch ($actionName) {
-            case "reset-password-ask":
-                break;
-            case "reset-password":
-                if (count($args)) {
-                    $token = $args[0];
-                    $key = ConfService::getConfStorageImpl()->loadTemporaryKey("password-reset", $token);
-                    if ($key == null || $key["user_id"] === false) {
-                        throw new Exception("Invalid password reset key! Did you make sure to copy the correct link?");
-                    }
-                }
-                break;
-            default:
-
-                break;
-        }
-    }
-
-}
diff --git a/core/src/plugins/gui.user/i18n/conf/cs.php b/core/src/plugins/gui.user/i18n/conf/cs.php
index 375c0ff4e5..d0146a500d 100644
--- a/core/src/plugins/gui.user/i18n/conf/cs.php
+++ b/core/src/plugins/gui.user/i18n/conf/cs.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "User access point" => "Uživatelský přístupový bod",
diff --git a/core/src/plugins/gui.user/i18n/conf/de.php b/core/src/plugins/gui.user/i18n/conf/de.php
index 6374e6a305..6d1ffd7b86 100644
--- a/core/src/plugins/gui.user/i18n/conf/de.php
+++ b/core/src/plugins/gui.user/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 /*******************************************************************************
 * German translation:
diff --git a/core/src/plugins/gui.user/i18n/conf/en.php b/core/src/plugins/gui.user/i18n/conf/en.php
index bf3df90ba9..c5bbd9b93c 100644
--- a/core/src/plugins/gui.user/i18n/conf/en.php
+++ b/core/src/plugins/gui.user/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "User access point" => "User access point",
diff --git a/core/src/plugins/gui.user/i18n/cs.php b/core/src/plugins/gui.user/i18n/cs.php
index 76c01de2aa..d153e851ea 100644
--- a/core/src/plugins/gui.user/i18n/cs.php
+++ b/core/src/plugins/gui.user/i18n/cs.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
     "1" => "Reset hesla",
@@ -26,4 +26,5 @@
     "5" => "Požadavek na změnu hesla byl zaslán na emailovou adresu registrovanou s vaším uživatelským účtem. Klikněte na odkaz v emailu pro provedení změny hesla.",
     "6" => "Děkujeme, nyní se můžete přihlásit!",
     "7" => "Byla vyžádána změna hesla pro účet vedený pod touto emailovou adresou. Pokud jste tento požadavek nevyžádali vy, můžete tento email ignorovat. Jinak klikněte na následující odkaz pro reset svého hesla:",
+    "8" => "Use the form below to reset your password. Please enter your login and the new password twice.",
 );
diff --git a/core/src/plugins/gui.user/i18n/de.php b/core/src/plugins/gui.user/i18n/de.php
index bc468283c4..49efe413ec 100644
--- a/core/src/plugins/gui.user/i18n/de.php
+++ b/core/src/plugins/gui.user/i18n/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 /*******************************************************************************
 * German translation:
@@ -31,4 +31,5 @@
     "5" => "E-Mail erfolgreich versendet. Klicken Sie auf den Link in der Nachricht, um ein neues Passwort zu vergeben.",
     "6" => "Vielen Dank. Sie k&ouml;nnen sich jetzt anmelden.",
     "7" => "Für das Konto mit dieser E-Mail-Adresse wurde eine Anfrage zum Zurücksetzen des Passwortes angefordert. Wenn Sie dieses Anfrage nicht gemacht haben, können Sie die E-Mail ignorieren. Ansonsten klicken Sie auf folgenden Link, um Ihr Passwort zurückzusetzen:", /* No HTML entities, might be the body of the mail */
+    "8" => "Use the form below to reset your password. Please enter your login and the new password twice.",
 );
diff --git a/core/src/plugins/gui.user/i18n/en.php b/core/src/plugins/gui.user/i18n/en.php
index f743f48413..066ddcc32f 100644
--- a/core/src/plugins/gui.user/i18n/en.php
+++ b/core/src/plugins/gui.user/i18n/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
     "1" => "Password Reset",
@@ -26,4 +26,5 @@
     "5" => "A reset password request has been sent to the email registered with your account. Click on the link in the email to recreate a password.",
     "6" => "Thank you, you can now log in!",
     "7" => "A password reset has been requested on the account associated to this email address. If you are not the author of this request, you can safely ignore this email. Otherwise click on the following link to reset your password:",
+    "8" => "Use the form below to reset your password. Please enter your login and the new password twice."
 );
diff --git a/core/src/plugins/gui.user/i18n/fr.php b/core/src/plugins/gui.user/i18n/fr.php
index 6f6c060da1..ca776a8853 100644
--- a/core/src/plugins/gui.user/i18n/fr.php
+++ b/core/src/plugins/gui.user/i18n/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
     "1" => "Réinitialisation du mot de passe",
@@ -26,4 +26,5 @@
     "5" => "Un courriel contenant une demande de réinitialisation du mot de passe a été envoyé à l'adresse courriel enregistrée dans votre compte. Cliquez sur le lien du courriel pour créer un nouveau mot de passe.",
     "6" => "Merci, vous pouvez à présent vous connecter avec ce nouveau mot de passe!",
     "7" => "Une demande de réinitialisation de mot de passe a été demandée pour le compte associé à ce courriel. Si vous n'en êtes pas l'auteur, vous pouvez ignorer ce courriel. Sinon cliquez sur le lien suivant :",
+    "8" => "Utilisez le formulaire pour remettre à zéro votre mot de passe. Entrez votre identifiant et votre nouveau mot de passe deux fois.",
 );
diff --git a/core/src/plugins/gui.user/i18n/it.php b/core/src/plugins/gui.user/i18n/it.php
index a93aa9cac2..415bba1cef 100644
--- a/core/src/plugins/gui.user/i18n/it.php
+++ b/core/src/plugins/gui.user/i18n/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
     "1" => "Reset Password",
@@ -26,4 +26,5 @@
     "5" => "Una richiesta di reset password è stata inviata all'indirizzo mail associato al tuo account. Clicca sul link nella mail per creare una nuova password.",
     "6" => "Grazie. Ora puoi autenticarti!",
     "7" => "Il reset della password è stato richiesto dall'account associato a questo indirizzo mail. Se non sei l'autore di questa richiesta, puoi semplicemente ignorare questa mail. Altrimenti, clicca sul link seguente per reimpostare la tua password:",
+    "8" => "Use the form below to reset your password. Please enter your login and the new password twice.",
 );
diff --git a/core/src/plugins/gui.user/i18n/ru.php b/core/src/plugins/gui.user/i18n/ru.php
index ce3bfd3b8e..677a5cdb68 100644
--- a/core/src/plugins/gui.user/i18n/ru.php
+++ b/core/src/plugins/gui.user/i18n/ru.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
     "1" => "Сброс пароля",
@@ -26,4 +26,5 @@
     "5" => "Запрос на сброс пароля будет послан на email, который указан в вашей учётной записи. Нажмите на ссылку в письме, чтобы пересоздать пароль.",
     "6" => "Спасибо, теперь Вы можете зайти в систему!",
     "7" => "Запрошен сброс пароля для учётной записи ассоциированной с этим email адресом. Если Вы не автор запроса просто проигнорируйте это письмо. Если Вы хотите сбросить пароль, то нажмите на ссылку:",
+    "8" => "Use the form below to reset your password. Please enter your login and the new password twice.",
 );
diff --git a/core/src/plugins/gui.user/manifest.xml b/core/src/plugins/gui.user/manifest.xml
index af9887538d..55e65aa7ce 100644
--- a/core/src/plugins/gui.user/manifest.xml
+++ b/core/src/plugins/gui.user/manifest.xml
@@ -9,7 +9,7 @@
         </resources>
     </client_settings>
 
-    <class_definition classname="UserGuiController" filename="plugins/gui.user/class.UserGuiController.php"/>
+    <class_definition classname="Pydio\Gui\UserGuiController" filename="plugins/gui.user/UserGuiController.php"/>
 
     <registry_contributions>
         <actions>
@@ -109,14 +109,15 @@
                     </clientCallback>
                     <clientForm id="reset-password"><![CDATA[
     				    <div id="reset-password" box_width="320" style="font-size: 15px;">
+    				        <div class="dialogLegend" ajxp_message_id="gui.user.8">AJXP_MESSAGE[gui.user.8]</div>
                             <div class="SF_element">
-                                <div class="SF_label" ajxp_message_id="gui.user.4">AJXP_MESSAGE[gui.user.4] : </div><input id="user_id" value="" type="text" class="SF_input"/>
+                                <div class="SF_label" ajxp_message_id="gui.user.4">AJXP_MESSAGE[gui.user.4] : </div><input style="width:90%;" id="user_id" value="" type="text" class="SF_input"/>
                             </div>
                             <div class="SF_element">
-                                <div class="SF_label" ajxp_message_id="198">AJXP_MESSAGE[198] : </div><input id="user_change_ownpass1" value="" type="password" class="SF_input"/>
+                                <div class="SF_label" ajxp_message_id="198">AJXP_MESSAGE[198] : </div><input style="width:90%;" id="user_change_ownpass1" value="" type="password" class="SF_input"/>
                             </div>
                             <div class="SF_element">
-                                <div class="SF_label" ajxp_message_id="199">AJXP_MESSAGE[199] : </div><input id="user_change_ownpass2" value="" type="password" class="SF_input"/>
+                                <div class="SF_label" ajxp_message_id="199">AJXP_MESSAGE[199] : </div><input style="width:90%;" id="user_change_ownpass2" value="" type="password" class="SF_input"/>
                             </div>
                             <div class="SF_element" id="pwd_strength_container"></div>
     				    </div>
@@ -124,35 +125,11 @@
                     <serverCallback methodName="processUserAccessPoint"/>
                 </processing>
             </action>
-            <action name="login">
-                <processing></processing>
-            </action>
         </actions>
-        <client_configs>
-            <template element="ajxp_desktop" name="main_vision" position="top"><![CDATA[
-				<div id="toolbars">
-					<div id="global_toolbar" ajxpClass="LogoWidget"></div>
-				</div>
-				<div id="user-gui-controller" ajxpClass="AjxpPane" ajxpOptions='{}' style="background:url('plugins/gui.ajax/res/themes/vision/images/grid_t.png')"></div>
-				<!--
-				<div id="notifications" ajxpClass="FetchedResultPane" ajxpOptions='{"fit":"height", "fitParent": "window", "fixedDisplayMode":"thumb", "displayMode":"thumb", "selectable":"false", "nodeProviderProperties":{"get_action":"get_my_feed", "format":"xml", "connexion_discrete":true}}'></div>
-				-->
-				<script type="text/javascript">
-                    document.observe('ajaxplorer:loaded', function(){
-                        if(!ajaxplorer.UIG) {
-                            ResourcesManager.prototype.loadJSResource('plugins/gui.user/class.UserGuiController.js', 'UserGuiController', function(){
-                                ajaxplorer.UIG = new UserGuiController($('user-gui-controller'));
-                            }, true);
-                        }
-                    });
-				    pydio.UI.disableAllKeyBindings();
-				</script>
-            ]]></template>
-        </client_configs>
     </registry_contributions>
 
     <dependencies>
-        <activePlugin pluginName="gui.ajax|gui.mobile|gui.ios"/>
+        <activePlugin pluginName="gui.ajax|gui.mobile|gui.ios|core.auth"/>
     </dependencies>
 
 </ajxp_plugin>
diff --git a/core/src/plugins/index.elasticsearch/ElasticSearchIndexer.php b/core/src/plugins/index.elasticsearch/ElasticSearchIndexer.php
new file mode 100644
index 0000000000..2c04e8685e
--- /dev/null
+++ b/core/src/plugins/index.elasticsearch/ElasticSearchIndexer.php
@@ -0,0 +1,682 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Access\Indexer\Implementation;
+
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Indexer\Core\AbstractSearchEngineIndexer;
+use Pydio\Core\Http\Message\UserMessage;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\VarsFilter;
+use \Elastica;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+require_once (dirname(__FILE__)."/vendor/autoload.php");
+
+/**
+ * Encapsultion of the Elastica component as a plugin
+ * @package AjaXplorer_Plugins
+ * @subpackage Index
+ * @property Elastica\Client $client
+ * @property Elastica\Index $currentIndex
+ * @property Elastica\Type $currentType
+ */
+class ElasticSearchIndexer extends AbstractSearchEngineIndexer
+{
+    private $client;
+    private $currentIndex;
+    private $currentType;
+    private $nextId;
+    private $lastIdPath;
+
+    private $metaFields = [];
+    private $indexContent = false;
+    private $specificId = "";
+    private $verboseIndexation = false;
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        parent::init($ctx, $options);
+        $metaFields = $this->getContextualOption($ctx, "index_meta_fields");
+        $specKey = $this->getContextualOption($ctx, "repository_specific_keywords");
+        if (!empty($metaFields)) {
+            $this->metaFields = explode(",",$metaFields);
+        }
+
+        if (!empty($specKey)) {
+            $this->specificId = "-".str_replace([",", "/"], ["-", "__"], VarsFilter::filter($specKey, $ctx));
+        }
+
+        /* Connexion to Elastica Client with the default parameters */
+        $this->client = new Elastica\Client([
+            "host" => $this->getContextualOption($ctx, "ELASTICSEARCH_HOST"),
+            "port" => $this->getContextualOption($ctx, "ELASTICSEARCH_PORT")]
+        );
+
+        $this->indexContent = ($this->getContextualOption($ctx, "index_content") == true);
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param \Pydio\Access\Core\AbstractAccessDriver $accessDriver
+     */
+    public function initMeta(ContextInterface $ctx, \Pydio\Access\Core\AbstractAccessDriver $accessDriver)
+    {
+        if (!empty($this->metaFields) || $this->indexContent) {
+            $metaFields = $this->metaFields;
+            /** @var \DOMElement $el */
+            $el = $this->getXPath()->query("/indexer")->item(0);
+            if ($this->indexContent) {
+                if($this->indexContent) $metaFields[] = "ajxp_document_content";
+                $data = ["indexed_meta_fields" => $metaFields,
+                    "additionnal_meta_columns" => ["ajxp_document_content" => "Content"]
+                ];
+                $el->setAttribute("indexed_meta_fields", json_encode($data));
+            } else {
+                $el->setAttribute("indexed_meta_fields", json_encode($metaFields));
+            }
+        }
+        parent::init($ctx, $this->options);
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     */
+    public function indexationIndexNode($node){
+        $this->updateNodeIndex(null, $node, false, false);
+    }
+
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $parentNode
+     */
+    public function indexationStarts($parentNode){
+        $this->loadIndex($parentNode->getContext(), true);
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $parentNode
+     */
+    public function indexationEnds($parentNode){
+        if($this->currentIndex) {
+            $this->currentIndex->optimize();
+        }
+    }
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @return null
+     * @throws \Exception
+     */
+    public function applyAction(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface)
+    {
+        $actionName = $requestInterface->getAttribute("action");
+        $httpVars = $requestInterface->getParsedBody();
+        /** @var ContextInterface $ctx */
+        $ctx = $requestInterface->getAttribute("ctx");
+        $ctxUser = $ctx->getUser();
+
+        $messages = LocaleService::getMessages();
+
+        $x = new \Pydio\Core\Http\Response\SerializableResponseStream();
+        $nodesList = new \Pydio\Access\Core\Model\NodesList();
+        $responseInterface = $responseInterface->withBody($x);
+        $x->addChunk($nodesList);
+
+        if ($actionName == "search") {
+            // TMP
+            if (strpos($httpVars["query"], "keyword:") === 0) {
+                $parts = explode(":", $httpVars["query"]);
+                $requestInterface = $requestInterface->withAttribute("action", "search_by_keyword")->withParsedBody(["field" => $parts[1]]);
+                $this->applyAction($requestInterface, $responseInterface);
+                return null;
+            }
+
+            try {
+                $this->loadIndex($ctx, false);
+            } catch (\Exception $ex) {
+                if (ConfService::backgroundActionsSupported() && !ApplicationState::sapiIsCli() && !isSet($httpVars["skip_unindexed"])) {
+                    $task = \Pydio\Tasks\TaskService::actionAsTask($ctx, "index", []);
+                    $task->setLabel($messages["index.lucene.7"]);
+                    $responseInterface = \Pydio\Tasks\TaskService::getInstance()->enqueueTask($task, $requestInterface, $responseInterface);
+                    $x->addChunk(new UserMessage($messages["index.lucene.7"]));
+                }else{
+                    $x->addChunk(new UserMessage($messages["index.lucene.12"]));
+                }
+            }
+
+            $textQuery = $httpVars["query"];
+            if($this->getContextualOption($ctx, "AUTO_WILDCARD") === true && strlen($textQuery) > 0 && ctype_alnum($textQuery)){
+                if($textQuery[0] == '"' && $textQuery[strlen($textQuery)-1] == '"'){
+                    $textQuery = substr($textQuery, 1, -1);
+                }else if($textQuery[strlen($textQuery)-1] != "*" ){
+                    $textQuery.="*";
+                }
+            }
+
+
+            $this->currentIndex->open();
+            $fieldQuery = new Elastica\Query\QueryString();
+            $fieldQuery->setAllowLeadingWildcard(true);
+            $fieldQuery->setFuzzyMinSim(0.8);
+
+            if($textQuery == "*"){
+
+                $fields = ["ajxp_node"];
+                $fieldQuery->setQuery("yes");
+                $fieldQuery->setFields($fields);
+
+            }else if(strpos($textQuery, ":") !== false){
+
+                // USE LUCENE DSL DIRECTLY (key1:value1 AND key2:value2...)
+                $textQuery = str_replace("ajxp_meta_ajxp_document_content:","body:", $textQuery);
+                $textQuery = $this->filterSearchRangesKeywords($textQuery);
+                $fieldQuery->setQuery($textQuery);
+
+            } else{
+
+                $fields = ["basename","ajxp_meta_*", "body"];
+                $fieldQuery->setQuery($textQuery);
+                $fieldQuery->setFields($fields);
+
+            }
+
+            /*
+            TODO : READAPT QUERY WITH EACH FIELD
+            if ((isSet($this->metaFields) || $this->indexContent) && isSet($httpVars["fields"])) {
+                 $sParts = array();
+                 foreach (explode(",",$httpVars["fields"]) as $searchField) {
+                     if ($searchField == "filename") {
+                         $sParts[] = "basename:".$httpVars["query"];
+                     } else if (in_array($searchField, $this->metaFields)) {
+                         $sParts[] = "ajxp_meta_".$searchField.":".$httpVars["query"];
+                     } else if ($searchField == "ajxp_document_content") {
+                         $sParts[] = "title:".$httpVars["query"];
+                         $sParts[] = "body:".$httpVars["query"];
+                         $sParts[] = "keywords:".$httpVars["query"];
+                     }
+                 }
+                 $query = implode(" OR ", $sParts);
+                 $query = "ajxp_scope:shared AND ($query)";
+                 $this->logDebug("Query : $query");
+            } else {
+            */
+
+            //}
+            /*
+                We create this object search because it'll allow us to fetch the number of results we want at once.
+                We just have to set some parameters, the query type and the size of the result set.
+             */
+            $search = new Elastica\Search($this->client);
+            $search->addIndex($this->currentIndex)->addType($this->currentType);
+
+            $maxResults = $this->getContextualOption($ctx, "MAX_RESULTS");
+            if(isSet($httpVars['limit'])){
+                $maxResults = intval($httpVars['limit']);
+            }
+            $searchOptions = [
+                \Elastica\Search::OPTION_SEARCH_TYPE => \Elastica\Search::OPTION_SEARCH_TYPE_QUERY_THEN_FETCH,
+                \Elastica\Search::OPTION_SIZE => $maxResults];
+
+            $this->logDebug(__FUNCTION__,"Executing query: ", $textQuery);
+            $fullQuery = new Elastica\Query();
+            $fullQuery->setQuery($fieldQuery);
+
+            $qb = new Elastica\QueryBuilder();
+            $fullQuery = new Elastica\Query();
+            $filter = $qb->query()->match("ajxp_scope", "shared");
+            $fullQuery->setQuery(
+                $qb->query()->bool()->addMust($fieldQuery)->addFilter($filter)
+            );
+            $result = $search->search($fullQuery, $searchOptions);
+            $this->logDebug(__FUNCTION__,"Search finished. ");
+            $hits = $result->getResults();
+
+            foreach ($hits as $hit) {
+                $source = $hit->getSource();
+
+                if ($source["serialized_metadata"] != null) {
+                    $meta = unserialize(base64_decode($source["serialized_metadata"]));
+                    $tmpNode = new AJXP_Node($source["node_url"], $meta);
+                } else {
+                    $tmpNode = new AJXP_Node($source["node_url"], []);
+                    $tmpNode->loadNodeInfo();
+                }
+
+                if (!file_exists($tmpNode->getUrl())) {
+                    $this->currentType->deleteById($hit->getId());
+                    continue;
+                }
+
+                $tmpNode->search_score = sprintf("%0.2f", $hit->getScore());
+                $nodesList->addBranch($tmpNode);
+            }
+
+        } else if ($actionName == "search_by_keyword") {
+
+            try {
+                $this->loadIndex($ctx, false);
+            } catch (\Exception $ex) {
+                throw new \Exception($messages["index.lucene.7"]);
+            }
+
+            $searchField = InputFilter::sanitize($httpVars["field"], InputFilter::SANITIZE_ALPHANUM);
+
+            $fieldQuery = new Elastica\Query\QueryString();
+            $fields = [$searchField];
+            $fieldQuery->setQuery($searchField == "ajxp_node"?"yes":"true");
+
+            $fieldQuery->setFields($fields);
+            $fieldQuery->setAllowLeadingWildcard(false);
+            $fieldQuery->setFuzzyMinSim(0.8);
+
+
+            $search = new Elastica\Search($this->client);
+            $search->addIndex($this->currentIndex)->addType($this->currentType);
+
+            $maxResults = $this->getContextualOption($ctx, "MAX_RESULTS");
+            if(isSet($httpVars['limit'])){
+                $maxResults = intval($httpVars['limit']);
+            }
+            $searchOptions = [
+                \Elastica\Search::OPTION_SEARCH_TYPE => \Elastica\Search::OPTION_SEARCH_TYPE_QUERY_THEN_FETCH,
+                \Elastica\Search::OPTION_SIZE => $maxResults];
+
+            $qb = new Elastica\QueryBuilder();
+            $fullQuery = new Elastica\Query();
+            $fullQuery->setQuery(
+                $qb->query()->bool()
+                    ->addMust($fieldQuery)
+                    ->addMust($qb->query()->match("ajxp_scope", "user"))
+                    ->addMust($qb->query()->match("user", $ctxUser->getId()))
+            );
+
+            $result = $search->search($fullQuery, $searchOptions);
+            $this->logDebug(__FUNCTION__,"Search finished. ");
+            $hits = $result->getResults();
+
+            foreach ($hits as $hit) {
+
+                if ($hit->serialized_metadata!=null) {
+                    $meta = unserialize(base64_decode($hit->serialized_metadata));
+                    $tmpNode = new AJXP_Node($hit->node_url, $meta);
+                } else {
+                    $tmpNode = new AJXP_Node($hit->node_url, []);
+                    $tmpNode->loadNodeInfo();
+                }
+                if (!file_exists($tmpNode->getUrl())) {
+                    $this->currentType->deleteById($hit->getId());
+                    continue;
+                }
+                $tmpNode->search_score = sprintf("%0.2f", $hit->score);
+                $nodesList->addBranch($tmpNode);
+
+            }
+        }
+
+    }
+
+    /**
+     * @param $url
+     */
+    public function recursiveIndexation($url)
+    {
+        //print("Indexing $url \n");
+        $this->logDebug("Indexing content of folder ".$url);
+        if (ApplicationState::sapiIsCli() && $this->verboseIndexation) {
+            print("Indexing content of ".$url."\n");
+        }
+        @set_time_limit(60);
+        $handle = opendir($url);
+
+        if ($handle !== false) {
+            while ( ($child = readdir($handle)) != false) {
+                if($child[0] == ".") continue;
+                $newUrl = $url."/".$child;
+                $this->logDebug("Indexing Node ".$newUrl);
+                try {
+                    $this->updateNodeIndex(null, new AJXP_Node($newUrl));
+                } catch (\Exception $e) {
+                    $this->logDebug("Error Indexing Node ".$newUrl." (".$e->getMessage().")");
+                }
+            }
+            closedir($handle);
+        } else {
+            $this->logDebug("Cannot open $url!!");
+        }
+    }
+
+    /**
+     *
+     * Hooked to node.meta_change, this will update the index
+     *
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     */
+    public function updateNodeIndexMeta($node)
+    {
+        $this->loadIndex($node->getContext(), true);
+        if (UsersService::usersEnabled() && $node->getContext()->hasUser()) {
+
+            $query = new Elastica\Query\Term();
+            $query->setTerm("node_url", $node->getUrl());
+            $results = $this->currentType->search($query);
+            $hits = $results->getResults();
+            foreach ($hits as $hit) {
+                $source = $hit->getSource();
+                if ($source['ajxp_scope'] == 'shared' || ($source['ajxp_scope'] == 'user' && $source['ajxp_user'] == $node->getContext()->getUser()->getId())) {
+                    $this->currentType->deleteById($hit->getId());
+                }
+            }
+        } else {
+            $id = $this->getIndexedDocumentId($node);
+            if($id != null) $this->currentType->deleteById($id);
+        }
+        $this->createIndexedDocument($node);
+
+    }
+
+    /**
+     *
+     * Hooked to node.change, this will update the index
+     * if $oldNode = null => create node $newNode
+     * if $newNode = null => delete node $oldNode
+     * Else copy or move oldNode to newNode.
+     *
+     * @param \Pydio\Access\Core\Model\AJXP_Node $oldNode
+     * @param \Pydio\Access\Core\Model\AJXP_Node $newNode
+     * @param Boolean $copy
+     * @param bool $recursive
+     */
+    public function updateNodeIndex($oldNode, $newNode = null, $copy = false, $recursive = false)
+    {
+        if($oldNode == null){
+            $this->loadIndex($newNode->getContext(), true);
+        }else{
+            $this->loadIndex($oldNode->getContext(), true);
+        }
+
+        if ($oldNode != null && $copy == false) {
+            $oldDocId = $this->getIndexedDocumentId($oldNode);
+            if ($oldDocId != null) {
+                $this->currentType->deleteById($oldDocId);
+                $childrenHits = $this->getIndexedChildrenDocuments($oldNode);
+
+                if ($childrenHits != null) {
+                    $childrenHits = $childrenHits->getResults();
+
+                    foreach ($childrenHits as $hit) {
+                        $this->currentType->deleteById($hit->getId());
+                    }
+                }
+            }
+        }
+
+        if ($newNode != null) {
+            // Make sure it does not already exists anyway
+            $newDocId = $this->getIndexedDocumentId($newNode);
+            if ($newDocId != null) {
+                try{
+                    $this->currentType->deleteById($newDocId);
+                }catch (Elastica\Exception\NotFoundException $eEx){
+                    $this->logError(__FUNCTION__, "Trying to delete a non existing document");
+                }
+                $childrenHits = $this->getIndexedChildrenDocuments($newNode);
+                if ($childrenHits != null) {
+                    $childrenHits = $childrenHits->getResults();
+
+                    foreach ($childrenHits as $hit) {
+                        try{
+                            $this->currentType->deleteById($hit->getId());
+                        }catch (Elastica\Exception\NotFoundException $eEx){
+                            $this->logError(__FUNCTION__, "Trying to delete a non existing document");
+                        }
+                    }
+                }
+            }
+
+            $this->createIndexedDocument($newNode);
+
+            if ($recursive && $oldNode == null && is_dir($newNode->getUrl())) {
+                $this->recursiveIndexation($newNode->getUrl());
+            }
+        }
+
+
+        if ($oldNode != null && $newNode != null && is_dir($newNode->getUrl())) { // Copy / Move / Rename
+            // Get old node children docs, and update them manually, no need to scan real directory
+            $childrenHits = $this->getIndexedChildrenDocuments($oldNode);
+            if ($childrenHits != null) {
+                $childrenHits = $childrenHits->getResults();
+
+                foreach ($childrenHits as $hit) {
+                    $oldChildURL = $this->currentType->getDocument($hit->getId())->get("node_url");
+                    if ($copy == false) {
+                        $this->currentType->deleteById($hit->getId());
+                    }
+                    $newChildURL = str_replace($oldNode->getUrl(),
+                        $newNode->getUrl(),
+                        $oldChildURL);
+                    $this->createIndexedDocument(new AJXP_Node($newChildURL));
+                }
+            }
+        }
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $ajxpNode
+     * @throws \Exception
+     */
+    public function createIndexedDocument($ajxpNode)
+    {
+        $ajxpNode->loadNodeInfo();
+
+        $parseContent = $this->indexContent;
+        if ($parseContent && $ajxpNode->bytesize > $this->getContextualOption($ajxpNode->getContext(), "PARSE_CONTENT_MAX_SIZE")) {
+            $parseContent = false;
+        }
+
+        $data = [];
+        $data["node_url"] = $ajxpNode->getUrl();
+        $data["node_path"] = str_replace("/", "AJXPFAKESEP", $ajxpNode->getPath());
+        $data["basename"] = basename($ajxpNode->getPath());
+        $data["ajxp_node"] = "yes";
+        $data["ajxp_scope"] = "shared";
+        $data["serialized_metadata"] = base64_encode(serialize($ajxpNode->metadata));
+        $data["ajxp_modiftime"] = date("Ymd", $ajxpNode->ajxp_modiftime);
+        $data["ajxp_bytesize"] = $ajxpNode->bytesize;
+        $ajxpMime = $ajxpNode->ajxp_mime;
+        if (empty($ajxpMime)) {
+            $data["ajxp_mime"] = pathinfo($ajxpNode->getLabel(), PATHINFO_EXTENSION);
+        } else {
+            $data["ajxp_mime"] = $ajxpNode->ajxp_mime;
+        }
+
+        if (isSet($ajxpNode->indexableMetaKeys["shared"])) {
+            foreach ($ajxpNode->indexableMetaKeys["shared"] as $sharedField) {
+                if ($ajxpNode->$sharedField) {
+                    $data[$sharedField] = $ajxpNode->$sharedField;
+                }
+            }
+        }
+        foreach ($this->metaFields as $field) {
+            if ($ajxpNode->$field != null) {
+                $data["ajxp_meta_$field"] = $ajxpNode->$field;
+            }
+        }
+        if($parseContent){
+            $body = $this->extractIndexableContent($ajxpNode);
+            if(!empty($body)){
+                $data["body"] = $body;
+            }
+        }
+
+        $mapping = new Elastica\Type\Mapping();
+        $mapping->setType($this->currentType);
+        $mapping->setProperties($this->dataToMappingProperties($data));
+        $mapping->send();
+        $doc = new Elastica\Document($this->nextId, $data);
+        $this->currentType->addDocument($doc);
+        $this->nextId++;
+
+        if (isSet($ajxpNode->indexableMetaKeys["user"]) && count($ajxpNode->indexableMetaKeys["user"]) && UsersService::usersEnabled() && $ajxpNode->getContext()->hasUser()) {
+
+            $userData = [
+                "ajxp_scope" => "user",
+                "user"      => $ajxpNode->getUser()->getId(),
+                "serialized_metadata" => $data["serialized_metadata"],
+                "node_url"  => $data["node_url"],
+                "node_path"  => $data["node_path"]
+            ];
+            $userData["ajxp_user"] = $ajxpNode->getContext()->getUser()->getId();
+            foreach ($ajxpNode->indexableMetaKeys["user"] as $userField) {
+                if ($ajxpNode->$userField) {
+                    $userData[$userField] = $ajxpNode->$userField;
+                }
+            }
+            $mapping = new Elastica\Type\Mapping();
+            $mapping->setType($this->currentType);
+            $mapping->setProperties($this->dataToMappingProperties($userData));
+            $mapping->send();
+            $doc = new Elastica\Document($this->nextId, $userData);
+            $this->currentType->addDocument($doc);
+            $this->nextId++;
+        }
+
+        /* we update the last id in the file */
+        $file = fopen($this->lastIdPath, "w");
+        fputs($file, $this->nextId-1);
+        fclose($file);
+
+    }
+
+    /**
+     * Transform not data to ready to store mapping
+     * @param $data
+     * @return array
+     */
+    protected function dataToMappingProperties($data){
+
+        $mapping_properties = [];
+        foreach ($data as $key => $value) {
+            if ($key == "node_url" || $key == "node_path") {
+                $mapping_properties[$key] = ["type" => "string", "index" => "not_analyzed"];
+            } else if($key == "serialized_metadata"){
+                $mapping_properties[$key] = ["type" => "string" /*, "index" => "no" */];
+            } else if ($key == "ajxp_bytesize"){
+                $mapping_properties[$key] = ["type" => "long"];
+            } else {
+                $type = gettype($value);
+                if ($type != "integer" && $type != "boolean" && $type != "double") {
+                    $type = "string";
+                }
+                $mapping_properties[$key] = ["type" => $type];
+            }
+        }
+        return $mapping_properties;
+
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $ajxpNode
+     * @return Number
+     */
+    public function getIndexedDocumentId($ajxpNode)
+    {
+        /*
+            we used a term query that will check for the exact term (here is the path to a file)
+            that can't be duplicate.Thus it will get the right result.
+         */
+        $query = new Elastica\Query\Term();
+        $query->setTerm("node_url", $ajxpNode->getUrl());
+
+        /* returns a result set from the query */
+        $results = $this->currentIndex->search($query);
+
+        if($results->getTotalHits() == 0) return null;
+
+        return $results->current()->getId();
+    }
+
+    /**
+     * Find all existing lucene documents based on the parent url
+     * @param AJXP_Node $ajxpNode
+     * @return Elastica\ResultSet
+     */
+    public function getIndexedChildrenDocuments($ajxpNode)
+    {
+        $testQ = str_replace("/", "AJXPFAKESEP", $ajxpNode->getPath()."/");
+
+        /* we use a wildcard query to fetch all children documents relatively to their paths */
+        $query = new Elastica\Query\Wildcard("node_path", $testQ."*");
+
+        /* returns a result set from the query */
+        $results = $this->currentIndex->search($query);
+
+        if($results->getTotalHits() == 0) return null;
+
+        return $results;
+    }
+
+    /**
+     *
+     * load the index into the class parameter currentIndex
+     * @param ContextInterface $ctx
+     * @param bool $create
+     */
+    protected function loadIndex(ContextInterface $ctx, $create = true)
+    {
+        $specificId = $this->buildSpecificId($ctx);
+
+        $this->currentIndex = $this->client->getIndex($specificId);
+
+        /* if the cache directory for the repository index is not created we do create it */
+        $iPath = (defined('AJXP_SHARED_CACHE_DIR')?AJXP_SHARED_CACHE_DIR:AJXP_CACHE_DIR)."/indexes/".$specificId;
+        if(!is_dir($iPath)) mkdir($iPath,0755, true);
+
+        if ($create && !$this->currentIndex->exists()) {
+            $this->currentIndex->create();
+        }
+
+        $this->currentType = new Elastica\Type($this->currentIndex, "type_".$specificId);
+
+        /* we fetch the last id we used to create a document and set the variable nextId */
+        $this->lastIdPath = (defined('AJXP_SHARED_CACHE_DIR')?AJXP_SHARED_CACHE_DIR:AJXP_CACHE_DIR)."/indexes/".$specificId."/last_id";
+        if (file_exists($this->lastIdPath)) {
+            $file = fopen($this->lastIdPath, "r");
+            $this->nextId = floatval(fgets($file)) + 1;
+            fclose($file);
+        } else {
+            touch($this->lastIdPath);
+            $this->nextId = 1;
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/index.elasticsearch/class.AjxpElasticSearch.php b/core/src/plugins/index.elasticsearch/class.AjxpElasticSearch.php
deleted file mode 100644
index 029a2bf702..0000000000
--- a/core/src/plugins/index.elasticsearch/class.AjxpElasticSearch.php
+++ /dev/null
@@ -1,677 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-require_once (dirname(__FILE__)."/vendor/autoload.php");
-
-/**
- * Encapsultion of the Elastica component as a plugin
- * @package AjaXplorer_Plugins
- * @subpackage Index
- * @property Elastica\Client $client
- * @property Elastica\Index $currentIndex
- * @property Elastica\Type $currentType
- */
-class AjxpElasticSearch extends AbstractSearchEngineIndexer
-{
-    private $client;
-    private $currentIndex;
-    private $currentType;
-    private $nextId;
-    private $lastIdPath;
-
-    private $metaFields = [];
-    private $indexContent = false;
-    private $specificId = "";
-    private $verboseIndexation = false;
-
-    public function init($options)
-    {
-        parent::init($options);
-        $metaFields = $this->getFilteredOption("index_meta_fields");
-        $specKey = $this->getFilteredOption("repository_specific_keywords");
-        if (!empty($metaFields)) {
-            $this->metaFields = explode(",",$metaFields);
-        }
-
-        if (!empty($specKey)) {
-            $this->specificId = "-".str_replace(array(",", "/"), array("-", "__"), AJXP_VarsFilter::filter($specKey));
-        }
-
-        /* Connexion to Elastica Client with the default parameters */
-        $this->client = new Elastica\Client(array(
-            "host" => $this->getFilteredOption("ELASTICSEARCH_HOST"),
-            "port" => $this->getFilteredOption("ELASTICSEARCH_PORT"))
-        );
-
-        $this->indexContent = ($this->getFilteredOption("index_content") == true);
-    }
-
-    public function initMeta($accessDriver)
-    {
-        $this->accessDriver = $accessDriver;
-        if (!empty($this->metaFields) || $this->indexContent) {
-            $metaFields = $this->metaFields;
-            $el = $this->getXPath()->query("/indexer")->item(0);
-            if ($this->indexContent) {
-                if($this->indexContent) $metaFields[] = "ajxp_document_content";
-                $data = ["indexed_meta_fields" => $metaFields,
-                    "additionnal_meta_columns" => ["ajxp_document_content" => "Content"]
-                ];
-                $el->setAttribute("indexed_meta_fields", json_encode($data));
-            } else {
-                $el->setAttribute("indexed_meta_fields", json_encode($metaFields));
-            }
-        }
-        parent::init($this->options);
-    }
-
-    /**
-     * @param AJXP_Node $node
-     */
-    public function indexationIndexNode($node){
-        $this->updateNodeIndex(null, $node, false, false);
-    }
-
-
-    /**
-     * @param AJXP_Node $parentNode
-     */
-    public function indexationStarts($parentNode){
-        $this->loadIndex($parentNode->getRepositoryId(), true, $parentNode->getUser());
-    }
-
-    /**
-     * @param AJXP_Node $parentNode
-     */
-    public function indexationEnds($parentNode){
-        if($this->currentIndex) {
-            $this->currentIndex->optimize();
-        }
-    }
-
-    public function applyAction($actionName, $httpVars, $fileVars)
-    {
-        $messages = ConfService::getMessages();
-        $repoId = $this->accessDriver->repository->getId();
-
-        if ($actionName == "search") {
-            // TMP
-            if (strpos($httpVars["query"], "keyword:") === 0) {
-                $parts = explode(":", $httpVars["query"]);
-                $this->applyAction("search_by_keyword", array("field" => $parts[1]), array());
-                return;
-            }
-
-            try {
-                $this->loadIndex($repoId, false);
-            } catch (Exception $ex) {
-                $this->applyAction("index", array(), array());
-                throw new Exception($messages["index.lucene.7"]);
-            }
-
-            $textQuery = $httpVars["query"];
-            if($this->getFilteredOption("AUTO_WILDCARD") === true && strlen($textQuery) > 0 && ctype_alnum($textQuery)){
-                if($textQuery[0] == '"' && $textQuery[strlen($textQuery)-1] == '"'){
-                    $textQuery = substr($textQuery, 1, -1);
-                }else if($textQuery[strlen($textQuery)-1] != "*" ){
-                    $textQuery.="*";
-                }
-            }
-
-            $this->currentIndex->open();
-            $fieldQuery = new Elastica\Query\QueryString();
-            $fieldQuery->setAllowLeadingWildcard(true);
-            $fieldQuery->setFuzzyMinSim(0.8);
-
-            if($textQuery == "*"){
-
-                $fields = ["ajxp_node"];
-                $fieldQuery->setQuery("yes");
-                $fieldQuery->setFields($fields);
-
-            }else if(strpos($textQuery, ":") !== false){
-
-                // USE LUCENE DSL DIRECTLY (key1:value1 AND key2:value2...)
-                $textQuery = str_replace("ajxp_meta_ajxp_document_content:","body:", $textQuery);
-                $textQuery = $this->filterSearchRangesKeywords($textQuery);
-                $fieldQuery->setQuery($textQuery);
-
-            } else{
-
-                $fields = ["basename","ajxp_meta_*", "body"];
-                $fieldQuery->setQuery($textQuery);
-                $fieldQuery->setFields($fields);
-
-            }
-
-            /*
-            TODO : READAPT QUERY WITH EACH FIELD
-            if ((isSet($this->metaFields) || $this->indexContent) && isSet($httpVars["fields"])) {
-                 $sParts = array();
-                 foreach (explode(",",$httpVars["fields"]) as $searchField) {
-                     if ($searchField == "filename") {
-                         $sParts[] = "basename:".$httpVars["query"];
-                     } else if (in_array($searchField, $this->metaFields)) {
-                         $sParts[] = "ajxp_meta_".$searchField.":".$httpVars["query"];
-                     } else if ($searchField == "ajxp_document_content") {
-                         $sParts[] = "title:".$httpVars["query"];
-                         $sParts[] = "body:".$httpVars["query"];
-                         $sParts[] = "keywords:".$httpVars["query"];
-                     }
-                 }
-                 $query = implode(" OR ", $sParts);
-                 $query = "ajxp_scope:shared AND ($query)";
-                 $this->logDebug("Query : $query");
-            } else {
-            */
-
-            //}
-            /*
-                We create this object search because it'll allow us to fetch the number of results we want at once.
-                We just have to set some parameters, the query type and the size of the result set.
-             */
-            $search = new Elastica\Search($this->client);
-            $search->addIndex($this->currentIndex)->addType($this->currentType);
-
-            $maxResults = $this->getFilteredOption("MAX_RESULTS");
-            if(isSet($httpVars['limit'])){
-                $maxResults = intval($httpVars['limit']);
-            }
-            $searchOptions = [
-                \Elastica\Search::OPTION_SEARCH_TYPE => \Elastica\Search::OPTION_SEARCH_TYPE_QUERY_THEN_FETCH,
-                \Elastica\Search::OPTION_SIZE => $maxResults];
-
-            $this->logDebug(__FUNCTION__,"Executing query: ", $textQuery);
-            $fullQuery = new Elastica\Query();
-            $fullQuery->setQuery($fieldQuery);
-
-            $qb = new Elastica\QueryBuilder();
-            $fullQuery = new Elastica\Query();
-            $filter = $qb->query()->match("ajxp_scope", "shared");
-            $fullQuery->setQuery(
-                $qb->query()->bool()->addMust($fieldQuery)->addFilter($filter)
-            );
-
-            $result = $search->search($fullQuery, $searchOptions);
-            $this->logDebug(__FUNCTION__,"Search finished. ");
-            $hits = $result->getResults();
-
-            AJXP_XMLWriter::header();
-            foreach ($hits as $hit) {
-                $source = $hit->getSource();
-
-                if ($source["serialized_metadata"] != null) {
-                    $meta = unserialize(base64_decode($source["serialized_metadata"]));
-                    $tmpNode = new AJXP_Node(SystemTextEncoding::fromUTF8($source["node_url"]), $meta);
-                } else {
-                    $tmpNode = new AJXP_Node(SystemTextEncoding::fromUTF8($source["node_url"]), array());
-                    $tmpNode->loadNodeInfo();
-                }
-
-                if (!file_exists($tmpNode->getUrl())) {
-                    $this->currentType->deleteById($hit->getId());
-                    continue;
-                }
-
-                $tmpNode->search_score = sprintf("%0.2f", $hit->getScore());
-                AJXP_XMLWriter::renderAjxpNode($tmpNode);
-            }
-
-            AJXP_XMLWriter::close();
-
-        } else if ($actionName == "search_by_keyword") {
-
-            $scope = "user";
-            try {
-                $this->loadIndex($repoId, false);
-            } catch (Exception $ex) {
-                throw new Exception($messages["index.lucene.7"]);
-            }
-
-            /*
-            $sParts = array();
-            $searchField = $httpVars["field"];
-
-
-            if ($scope == "user") {
-                if (AuthService::usersEnabled() && AuthService::getLoggedUser() == null) {
-                    throw new Exception("Cannot find current user");
-                }
-                $sParts[] = "ajxp_scope:user";
-                $sParts[] = "ajxp_user:".AuthService::getLoggedUser()->getId();
-            } else {
-                $sParts[] = "ajxp_scope:shared";
-            }
-            $query = implode(" AND ", $sParts);
-            $this->logDebug("Query : $query");*/
-
-            $searchField = AJXP_Utils::sanitize($httpVars["field"], AJXP_SANITIZE_ALPHANUM);
-
-            $fieldQuery = new Elastica\Query\QueryString();
-            $fields = array($searchField);
-            $fieldQuery->setQuery($searchField == "ajxp_node"?"yes":"true");
-
-            $fieldQuery->setFields($fields);
-            $fieldQuery->setAllowLeadingWildcard(false);
-            $fieldQuery->setFuzzyMinSim(0.8);
-
-
-            $search = new Elastica\Search($this->client);
-            $search->addIndex($this->currentIndex)->addType($this->currentType);
-
-            $maxResults = $this->getFilteredOption("MAX_RESULTS");
-            if(isSet($httpVars['limit'])){
-                $maxResults = intval($httpVars['limit']);
-            }
-            $searchOptions = array(
-                \Elastica\Search::OPTION_SEARCH_TYPE => \Elastica\Search::OPTION_SEARCH_TYPE_QUERY_THEN_FETCH,
-                \Elastica\Search::OPTION_SIZE => $maxResults);
-
-            /* ADD SCOPE FILTER
-            $term = new Elastica\Filter\Term();
-            $term->setTerm("ajxp_scope", "user");*/
-
-            $qb = new Elastica\QueryBuilder();
-            $fullQuery = new Elastica\Query();
-            $fullQuery->setQuery(
-                $qb->query()->bool()
-                    ->addMust($fieldQuery)
-                    ->addMust($qb->query()->match("ajxp_scope", "user"))
-                    ->addMust($qb->query()->match("user", AuthService::getLoggedUser()->getId())
-                )
-            );
-
-            $result = $search->search($fullQuery, $searchOptions);
-            $this->logDebug(__FUNCTION__,"Search finished. ");
-            $hits = $result->getResults();
-
-            AJXP_XMLWriter::header();
-
-            $leafNodes = [];
-            foreach ($hits as $hit) {
-                if ($hit->serialized_metadata!=null) {
-                    $meta = unserialize(base64_decode($hit->serialized_metadata));
-                    $tmpNode = new AJXP_Node(SystemTextEncoding::fromUTF8($hit->node_url), $meta);
-                } else {
-                    $tmpNode = new AJXP_Node(SystemTextEncoding::fromUTF8($hit->node_url), array());
-                    $tmpNode->loadNodeInfo();
-                }
-                if (!file_exists($tmpNode->getUrl())) {
-                    $this->currentType->deleteById($hit->id);
-                    continue;
-                }
-                $tmpNode->search_score = sprintf("%0.2f", $hit->score);
-
-                if($tmpNode->isLeaf()){
-                    $leafNodes[]= $tmpNode;
-                } else {
-                    AJXP_XMLWriter::renderAjxpNode($tmpNode);
-                }
-
-            }
-            foreach ($leafNodes as $leaf) {
-                AJXP_XMLWriter::renderAjxpNode($leaf);
-            }
-
-            AJXP_XMLWriter::close();
-        }
-
-    }
-
-    /**
-     * @param $url
-     */
-    public function recursiveIndexation($url)
-    {
-        //print("Indexing $url \n");
-        $this->logDebug("Indexing content of folder ".$url);
-        if (ConfService::currentContextIsCommandLine() && $this->verboseIndexation) {
-            print("Indexing content of ".$url."\n");
-        }
-        @set_time_limit(60);
-        $handle = opendir($url);
-
-        if ($handle !== false) {
-            while ( ($child = readdir($handle)) != false) {
-                if($child[0] == ".") continue;
-                $newUrl = $url."/".$child;
-                $this->logDebug("Indexing Node ".$newUrl);
-                try {
-                    $this->updateNodeIndex(null, new AJXP_Node($newUrl));
-                } catch (Exception $e) {
-                    $this->logDebug("Error Indexing Node ".$newUrl." (".$e->getMessage().")");
-                }
-            }
-            closedir($handle);
-        } else {
-            $this->logDebug("Cannot open $url!!");
-        }
-    }
-
-    /**
-     *
-     * Hooked to node.meta_change, this will update the index
-     *
-     * @param AJXP_Node $node
-     */
-    public function updateNodeIndexMeta($node)
-    {
-        $this->loadIndex($node->getRepositoryId(), true, $node->getUser());
-        if (AuthService::usersEnabled() && AuthService::getLoggedUser()!=null) {
-
-            $query = new Elastica\Query\Term();
-            $query->setTerm("node_url", $node->getUrl());
-            $results = $this->currentType->search($query);
-            $hits = $results->getResults();
-            foreach ($hits as $hit) {
-                $source = $hit->getSource();
-                if ($source['ajxp_scope'] == 'shared' || ($source['ajxp_scope'] == 'user' && $source['ajxp_user'] == AuthService::getLoggedUser()->getId())) {
-                    $this->currentType->deleteById($hit->getId());
-                }
-            }
-        } else {
-            $id = $this->getIndexedDocumentId($node);
-            if($id != null) $this->currentType->deleteById($id);
-        }
-        $this->createIndexedDocument($node);
-
-    }
-
-    /**
-     *
-     * Hooked to node.change, this will update the index
-     * if $oldNode = null => create node $newNode
-     * if $newNode = null => delete node $oldNode
-     * Else copy or move oldNode to newNode.
-     *
-     * @param AJXP_Node $oldNode
-     * @param AJXP_Node $newNode
-     * @param Boolean $copy
-     * @param bool $recursive
-     */
-    public function updateNodeIndex($oldNode, $newNode = null, $copy = false, $recursive = false)
-    {
-        if($oldNode == null){
-            $this->loadIndex($newNode->getRepositoryId(), true, $newNode->getUser());
-        }else{
-            $this->loadIndex($oldNode->getRepositoryId(), true, $oldNode->getUser());
-        }
-
-        if ($oldNode != null && $copy == false) {
-            $oldDocId = $this->getIndexedDocumentId($oldNode);
-            if ($oldDocId != null) {
-                $this->currentType->deleteById($oldDocId);
-                $childrenHits = $this->getIndexedChildrenDocuments($newNode);
-
-                if ($childrenHits != null) {
-                    $childrenHits = $childrenHits->getResults();
-
-                    foreach ($childrenHits as $hit) {
-                        $this->currentType->deleteById($hit->getId());
-                    }
-                }
-            }
-        }
-
-        if ($newNode != null) {
-            // Make sure it does not already exists anyway
-            $newDocId = $this->getIndexedDocumentId($newNode);
-            if ($newDocId != null) {
-                try{
-                    $this->currentType->deleteById($newDocId);
-                }catch (Elastica\Exception\NotFoundException $eEx){
-                    $this->logError(__FUNCTION__, "Trying to delete a non existing document");
-                }
-                $childrenHits = $this->getIndexedChildrenDocuments($newNode);
-                if ($childrenHits != null) {
-                    $childrenHits = $childrenHits->getResults();
-
-                    foreach ($childrenHits as $hit) {
-                        try{
-                            $this->currentType->deleteById($hit->getId());
-                        }catch (Elastica\Exception\NotFoundException $eEx){
-                            $this->logError(__FUNCTION__, "Trying to delete a non existing document");
-                        }
-                    }
-                }
-            }
-
-            $this->createIndexedDocument($newNode);
-
-            if ($recursive && $oldNode == null && is_dir($newNode->getUrl())) {
-                $this->recursiveIndexation($newNode->getUrl());
-            }
-        }
-
-
-        if ($oldNode != null && $newNode != null && is_dir($newNode->getUrl())) { // Copy / Move / Rename
-            // Get old node children docs, and update them manually, no need to scan real directory
-            $childrenHits = $this->getIndexedChildrenDocuments($oldNode);
-            if ($childrenHits != null) {
-                $childrenHits = $childrenHits->getResults();
-
-                foreach ($childrenHits as $hit) {
-                    $oldChildURL = $this->currentType->getDocument($hit->getId())->get("node_url");
-                    if ($copy == false) {
-                        $this->currentType->deleteById($hit->getId());
-                    }
-                    $newChildURL = str_replace(SystemTextEncoding::toUTF8($oldNode->getUrl()),
-                        SystemTextEncoding::toUTF8($newNode->getUrl()),
-                        $oldChildURL);
-                    $newChildURL = SystemTextEncoding::fromUTF8($newChildURL);
-                    $this->createIndexedDocument(new AJXP_Node($newChildURL));
-                }
-            }
-        }
-    }
-
-    /**
-     * @param AJXP_Node $ajxpNode
-     * @throws Exception
-     */
-    public function createIndexedDocument($ajxpNode)
-    {
-        $ajxpNode->loadNodeInfo();
-
-        $parseContent = $this->indexContent;
-        if ($parseContent && $ajxpNode->bytesize > $this->getFilteredOption("PARSE_CONTENT_MAX_SIZE")) {
-            $parseContent = false;
-        }
-
-        $data = [];
-        $data["node_url"] = $ajxpNode->getUrl();
-        $data["node_path"] = str_replace("/", "AJXPFAKESEP", $ajxpNode->getPath());
-        $data["basename"] = basename($ajxpNode->getPath());
-        $data["ajxp_node"] = "yes";
-        $data["ajxp_scope"] = "shared";
-        $data["serialized_metadata"] = base64_encode(serialize($ajxpNode->metadata));
-        $data["ajxp_modiftime"] = date("Ymd", $ajxpNode->ajxp_modiftime);
-        $data["ajxp_bytesize"] = $ajxpNode->bytesize;
-        $ajxpMime = $ajxpNode->ajxp_mime;
-        if (empty($ajxpMime)) {
-            $data["ajxp_mime"] = pathinfo($ajxpNode->getLabel(), PATHINFO_EXTENSION);
-        } else {
-            $data["ajxp_mime"] = $ajxpNode->ajxp_mime;
-        }
-
-        if (isSet($ajxpNode->indexableMetaKeys["shared"])) {
-            foreach ($ajxpNode->indexableMetaKeys["shared"] as $sharedField) {
-                if ($ajxpNode->$sharedField) {
-                    $data[$sharedField] = $ajxpNode->$sharedField;
-                }
-            }
-        }
-        foreach ($this->metaFields as $field) {
-            if ($ajxpNode->$field != null) {
-                $data["ajxp_meta_$field"] = $ajxpNode->$field;
-            }
-        }
-        if($parseContent){
-            $body = $this->extractIndexableContent($ajxpNode);
-            if(!empty($body)){
-                $data["body"] = $body;
-            }
-        }
-
-        $mapping = new Elastica\Type\Mapping();
-        $mapping->setType($this->currentType);
-        $mapping->setProperties($this->dataToMappingProperties($data));
-        $mapping->send();
-        $doc = new Elastica\Document($this->nextId, $data);
-        $this->currentType->addDocument($doc);
-        $this->nextId++;
-
-        if (isSet($ajxpNode->indexableMetaKeys["user"]) && count($ajxpNode->indexableMetaKeys["user"]) && AuthService::usersEnabled() && AuthService::getLoggedUser() != null) {
-
-            $userData = array(
-                "ajxp_scope" => "user",
-                "user"      => AuthService::getLoggedUser()->getId(),
-                "serialized_metadata" => $data["serialized_metadata"],
-                "node_url"  => $data["node_url"],
-                "node_path"  => $data["node_path"]
-            );
-            $userData["ajxp_user"] = AuthService::getLoggedUser()->getId();
-            foreach ($ajxpNode->indexableMetaKeys["user"] as $userField) {
-                if ($ajxpNode->$userField) {
-                    $userData[$userField] = $ajxpNode->$userField;
-                }
-            }
-            $mapping = new Elastica\Type\Mapping();
-            $mapping->setType($this->currentType);
-            $mapping->setProperties($this->dataToMappingProperties($userData));
-            $mapping->send();
-            $doc = new Elastica\Document($this->nextId, $userData);
-            $this->currentType->addDocument($doc);
-            $this->nextId++;
-        }
-
-        /* we update the last id in the file */
-        $file = fopen($this->lastIdPath, "w");
-        fputs($file, $this->nextId-1);
-        fclose($file);
-
-    }
-
-    /**
-     * Transform not data to ready to store mapping
-     * @param $data
-     * @return array
-     */
-    protected function dataToMappingProperties($data){
-
-        $mapping_properties = [];
-        foreach ($data as $key => $value) {
-            if ($key == "node_url" || $key == "node_path") {
-                $mapping_properties[$key] = ["type" => "string", "index" => "not_analyzed"];
-            } else if($key == "serialized_metadata"){
-                $mapping_properties[$key] = ["type" => "string" /*, "index" => "no" */];
-            } else if ($key == "ajxp_bytesize"){
-                $mapping_properties[$key] = ["type" => "long"];
-            } else {
-                $type = gettype($value);
-                if ($type != "integer" && $type != "boolean" && $type != "double") {
-                    $type = "string";
-                }
-                $mapping_properties[$key] = ["type" => $type];
-            }
-        }
-        return $mapping_properties;
-
-    }
-
-    /**
-     * @param AJXP_Node $ajxpNode
-     * @return Number
-     */
-    public function getIndexedDocumentId($ajxpNode)
-    {
-        /*
-            we used a term query that will check for the exact term (here is the path to a file)
-            that can't be duplicate.Thus it will get the right result.
-         */
-        $query = new Elastica\Query\Term();
-        $query->setTerm("node_url", $ajxpNode->getUrl());
-
-        /* returns a result set from the query */
-        $results = $this->currentIndex->search($query);
-
-        if($results->getTotalHits() == 0) return null;
-
-        return $results->current()->getId();
-    }
-
-    /**
-     * Find all existing lucene documents based on the parent url
-     * @param AJXP_Node $ajxpNode
-     * @return Elastica\ResultSet
-     */
-    public function getIndexedChildrenDocuments($ajxpNode)
-    {
-        $testQ = str_replace("/", "AJXPFAKESEP", SystemTextEncoding::toUTF8($ajxpNode->getPath()."/"));
-
-        /* we use a wildcard query to fetch all children documents relatively to their paths */
-        $query = new Elastica\Query\Wildcard("node_path", $testQ."*");
-
-        /* returns a result set from the query */
-        $results = $this->currentIndex->search($query);
-
-        if($results->getTotalHits() == 0) return null;
-
-        return $results;
-    }
-
-    /**
-     *
-     * load the index into the class parameter currentIndex
-     * @param Integer $repositoryId
-     * @param bool $create
-     * @param null $resolveUserId
-     */
-    protected function loadIndex($repositoryId, $create = true, $resolveUserId = null)
-    {
-        $specificId = $this->buildSpecificId($repositoryId, $resolveUserId);
-
-        $this->currentIndex = $this->client->getIndex($specificId);
-
-        /* if the cache directory for the repository index is not created we do create it */
-        $iPath = (defined('AJXP_SHARED_CACHE_DIR')?AJXP_SHARED_CACHE_DIR:AJXP_CACHE_DIR)."/indexes/".$specificId;
-        if(!is_dir($iPath)) mkdir($iPath,0755, true);
-
-        if ($create && !$this->currentIndex->exists()) {
-            $this->currentIndex->create();
-        }
-
-        $this->currentType = new Elastica\Type($this->currentIndex, "type_".$specificId);
-
-        /* we fetch the last id we used to create a document and set the variable nextId */
-        $this->lastIdPath = (defined('AJXP_SHARED_CACHE_DIR')?AJXP_SHARED_CACHE_DIR:AJXP_CACHE_DIR)."/indexes/".$specificId."/last_id";
-        if (file_exists($this->lastIdPath)) {
-            $file = fopen($this->lastIdPath, "r");
-            $this->nextId = floatval(fgets($file)) + 1;
-            fclose($file);
-        } else {
-            touch($this->lastIdPath);
-            $this->nextId = 1;
-        }
-    }
-}
\ No newline at end of file
diff --git a/core/src/plugins/index.elasticsearch/manifest.xml b/core/src/plugins/index.elasticsearch/manifest.xml
index d5b12522cc..1d465515e8 100644
--- a/core/src/plugins/index.elasticsearch/manifest.xml
+++ b/core/src/plugins/index.elasticsearch/manifest.xml
@@ -4,7 +4,7 @@
         <core_relation packaged="false" tested_version="1.0"/>
     </plugin_info>
 
-    <class_definition filename="plugins/index.elasticsearch/class.AjxpElasticSearch.php" classname="AjxpElasticSearch"/>
+    <class_definition filename="plugins/index.elasticsearch/ElasticSearchIndexer.php" classname="Pydio\Access\Indexer\Implementation\ElasticSearchIndexer"/>
     <client_settings>
         <resources>
             <img_library alias="elastic_search_images" path="plugins/index.elasticsearch/resources/images"/>
@@ -40,7 +40,7 @@
                                write="false" adminOnly="false">
                 </rightsContext>
                 <processing>
-                    <serverCallback methodName="applyAction" restPath="/query/"/>
+                    <serverCallback methodName="applyAction" restParams="/query/"/>
                 </processing>
             </action>
             <action name="search_by_keyword">
@@ -48,23 +48,24 @@
                                write="false" adminOnly="false">
                 </rightsContext>
                 <processing>
-                    <serverCallback methodName="applyAction" restPath="/query/"/>
+                    <serverCallback methodName="applyAction" restParams="/query/"/>
                 </processing>
             </action>
         </actions>
         <client_configs>
-            <template_part ajxpClass="AjxpTabulator" theme="vision" ajxpId="topPane" ajxpOptions='{"defaultTabId": "folders","tabInfos" : [{"id":"folders","label":"130","iconClass":"icon-folder-open","element":"folder_pane"},{"id":"shared","label":"363","iconClass":"mdi mdi-share-variant","element":"shared_elements"},{"id":"flagged","label":"147","iconClass":"icon-bookmark-empty","element":"flagged_elements"}],"headerToolbarOptions":{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["filter","vertical_splitter2-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}}'><![CDATA[
-                <div id="folder_pane" ajxpClass="FoldersTree" ajxpOptions='{"display":"dz","replaceScroller":true}' ></div>
-                <div id="shared_elements" ajxpClass="FetchedResultPane" ajxpOptions='{"nodeProviderProperties":{"get_action":"search", "query":"keyword:ajxp_shared"},"reloadOnServerMessage":"tree/reload_shared_elements","clearSelectionOnBlur":true}'></div>
-                <div id="flagged_elements" ajxpClass="FetchedResultPane" ajxpOptions='{"nodeProviderProperties":{"get_action":"search", "query":"keyword:ajxp_bookmarked"},"reloadOnServerMessage":"tree/reload_bookmarks","clearSelectionOnBlur":true}'></div>
-            ]]></template_part>
-            <component_config className="AjxpPane::navigation_scroller">
-                <additional_content id="navigation_shared"><![CDATA[
-                    <div ajxp_position="2" id="navigation_shared">
-                        <h3 class="colorcode-shared" ajxp_message_id="share_center.98">AJXP_MESSAGE[share_center.98] <small id="shared_files_toggler" class="simple-toggler-show" ajxpClass="VisibilityToggler" ajxpOptions='{"widget_id":"shared_files_list"}'>AJXP_MESSAGE[513]</small></h3>
-                        <div style="display:none;" id="shared_files_list" ajxpClass="FetchedResultPane" ajxpOptions='{"fit":"content","silentLoading":true, "nodeProviderProperties":{"get_action":"search", "query":"keyword:ajxp_shared", "connexion_discrete":true}, "emptyChildrenMessage":"share_center.131","containerDroppableAction":"share-file-minisite","clearSelectionOnBlur":true}'></div>
-                    </div>
-            ]]></additional_content>
+            <component_config className="AjxpReactComponent::left_navigator">
+                <additional_content
+                        id="navigation_bookmarks"
+                        position="1"
+                        type="ListProvider"
+                        options='{"title":"147", "titleClassName":"colorcode-bookmark", "fit":"content","silentLoading":true, "nodeProviderProperties":{"get_action":"search", "query":"keyword:ajxp_bookmarked"},"reloadOnServerMessage":"tree/reload_bookmarks", "connexion_discrete":true, "containerDroppableAction":"bookmark", "emptyChildrenMessage":515}'/>
+            </component_config>
+            <component_config className="AjxpReactComponent::left_navigator">
+                <additional_content
+                        id="navigation_shared"
+                        position="2"
+                        type="ListProvider"
+                        options='{"title":"share_center.98", "titleClassName":"colorcode-shared", "fit":"content","silentLoading":true, "nodeProviderProperties":{"get_action":"search", "query":"keyword:ajxp_shared", "connexion_discrete":true}, "emptyChildrenMessage":"share_center.131","containerDroppableAction":"share-file-minisite","clearSelectionOnBlur":true,"reloadOnServerMessage":"tree/reload_shared_elements"}'/>
             </component_config>
         </client_configs>
     </registry_contributions>
diff --git a/core/src/plugins/index.elasticsearch/plugin_doc.html b/core/src/plugins/index.elasticsearch/plugin_doc.html
index 4e861b0dc3..e32776e04a 100644
--- a/core/src/plugins/index.elasticsearch/plugin_doc.html
+++ b/core/src/plugins/index.elasticsearch/plugin_doc.html
@@ -17,7 +17,7 @@
 - Create an index called "test_index":<br/>
 <pre>$ curl -XPUT 'localhost:9200/test_index'</pre><br/>
 - Then add a document with the type "test_type" with the following command:<br/>
-<pre>$ curl -XPUT 'localhost:9200/test_index/test_type/1 -d '{"user":"test", "message":"this is a test"}'</pre>
+<pre>$ curl -XPUT 'localhost:9200/test_index/test_type/1' -d '{"user":"test", "message":"this is a test"}'</pre>
 This will add a document with id equals to 1 containing two fields "user" and "message" that respective values are "test" and "this is a test".<br/>
 The document will be added in the index "test_index" under the type "test_type".<br/><br/>
 - You can retrieve the documents by their id:
diff --git a/core/src/plugins/index.elasticsearch/resources/i18n/conf/de.php b/core/src/plugins/index.elasticsearch/resources/i18n/conf/de.php
index 788c1c3be0..b9da61b22b 100644
--- a/core/src/plugins/index.elasticsearch/resources/i18n/conf/de.php
+++ b/core/src/plugins/index.elasticsearch/resources/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "ElasticSearch Search Engine" => "ElasticSearch",
@@ -49,4 +49,4 @@
 "ElasticSearch Server host (without http)" => "ElasticSearch Server host (without http)",
 "ElasticSearch Port" => "ElasticSearch Port",
 "ElasticSearch Server port (default 9200)" => "ElasticSearch Server port (default 9200)",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/index.elasticsearch/resources/i18n/conf/en.php b/core/src/plugins/index.elasticsearch/resources/i18n/conf/en.php
index 57ae52097b..630db8e668 100644
--- a/core/src/plugins/index.elasticsearch/resources/i18n/conf/en.php
+++ b/core/src/plugins/index.elasticsearch/resources/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "ElasticSearch Search Engine" => "ElasticSearch Search Engine",
diff --git a/core/src/plugins/index.elasticsearch/resources/i18n/conf/fr.php b/core/src/plugins/index.elasticsearch/resources/i18n/conf/fr.php
index 3cd8bc6acf..47a0b9f112 100644
--- a/core/src/plugins/index.elasticsearch/resources/i18n/conf/fr.php
+++ b/core/src/plugins/index.elasticsearch/resources/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Lucene Search Engine" => "Moteur de recherche Lucene",
diff --git a/core/src/plugins/index.elasticsearch/resources/i18n/conf/it.php b/core/src/plugins/index.elasticsearch/resources/i18n/conf/it.php
index cf1d6bb84d..340ad0c006 100644
--- a/core/src/plugins/index.elasticsearch/resources/i18n/conf/it.php
+++ b/core/src/plugins/index.elasticsearch/resources/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Lucene Search Engine" => "Motore Rierca Lucene",
@@ -51,4 +51,4 @@
 "ElasticSearch Server host (without http)" => "ElasticSearch Server host (without http)",
 "ElasticSearch Port" => "ElasticSearch Port",
 "ElasticSearch Server port (default 9200)" => "ElasticSearch Server port (default 9200)",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/index.elasticsearch/resources/i18n/conf/pt.php b/core/src/plugins/index.elasticsearch/resources/i18n/conf/pt.php
index 98557eb217..c4f566386c 100644
--- a/core/src/plugins/index.elasticsearch/resources/i18n/conf/pt.php
+++ b/core/src/plugins/index.elasticsearch/resources/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Lucene Search Engine" => "Motor de pesquisa Lucene",
diff --git a/core/src/plugins/index.elasticsearch/resources/i18n/de.php b/core/src/plugins/index.elasticsearch/resources/i18n/de.php
index 04c73f60f9..6ced872ed0 100644
--- a/core/src/plugins/index.elasticsearch/resources/i18n/de.php
+++ b/core/src/plugins/index.elasticsearch/resources/i18n/de.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/index.elasticsearch/resources/i18n/en.php b/core/src/plugins/index.elasticsearch/resources/i18n/en.php
index af26a2cae2..ba8a212a52 100644
--- a/core/src/plugins/index.elasticsearch/resources/i18n/en.php
+++ b/core/src/plugins/index.elasticsearch/resources/i18n/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/index.elasticsearch/resources/i18n/es.php b/core/src/plugins/index.elasticsearch/resources/i18n/es.php
index eee650e980..fedfef20c0 100644
--- a/core/src/plugins/index.elasticsearch/resources/i18n/es.php
+++ b/core/src/plugins/index.elasticsearch/resources/i18n/es.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/index.elasticsearch/resources/i18n/fr.php b/core/src/plugins/index.elasticsearch/resources/i18n/fr.php
index b3687bb234..21ed65d02c 100644
--- a/core/src/plugins/index.elasticsearch/resources/i18n/fr.php
+++ b/core/src/plugins/index.elasticsearch/resources/i18n/fr.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/index.elasticsearch/resources/i18n/it.php b/core/src/plugins/index.elasticsearch/resources/i18n/it.php
index c42f721907..0124e9426b 100644
--- a/core/src/plugins/index.elasticsearch/resources/i18n/it.php
+++ b/core/src/plugins/index.elasticsearch/resources/i18n/it.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/index.elasticsearch/resources/i18n/pt.php b/core/src/plugins/index.elasticsearch/resources/i18n/pt.php
index 564b6a3ccf..78f7d0d8bc 100644
--- a/core/src/plugins/index.elasticsearch/resources/i18n/pt.php
+++ b/core/src/plugins/index.elasticsearch/resources/i18n/pt.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/index.lucene/LuceneIndexer.php b/core/src/plugins/index.lucene/LuceneIndexer.php
new file mode 100644
index 0000000000..823d02da2f
--- /dev/null
+++ b/core/src/plugins/index.lucene/LuceneIndexer.php
@@ -0,0 +1,835 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Indexer\Implementation;
+
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\NodesList;
+use Pydio\Access\Indexer\Core\AbstractSearchEngineIndexer;
+use Pydio\Core\Http\Message\UserMessage;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Vars\StatHelper;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Encapsultion of the Zend_Search_Lucene component as a plugin
+ * @package AjaXplorer_Plugins
+ * @subpackage Index
+ */
+class LuceneIndexer extends AbstractSearchEngineIndexer
+{
+    /**
+     * @var \Zend_Search_Lucene_Interface
+     */
+    private $currentIndex;
+    private $metaFields = [];
+    private $indexContent = false;
+    private $verboseIndexation = false;
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        parent::init($ctx, $options);
+        set_include_path(get_include_path().PATH_SEPARATOR.AJXP_INSTALL_PATH."/plugins/index.lucene");
+        $metaFields = $this->getContextualOption($ctx, "index_meta_fields");
+        if (!empty($metaFields)) {
+            $this->metaFields = explode(",",$metaFields);
+        }
+        $this->indexContent = ($this->getContextualOption($ctx, "index_content") == true);
+    }
+
+    /**
+     * @param ContextInterface $contextInterface
+     * @param AbstractAccessDriver $accessDriver
+     */
+    public function initMeta(ContextInterface $contextInterface, AbstractAccessDriver $accessDriver)
+    {
+        parent::initMeta($contextInterface, $accessDriver);
+        if (!empty($this->metaFields) || $this->indexContent) {
+            $metaFields = $this->metaFields;
+            $el = $this->getXPath()->query("/indexer")->item(0);
+            if ($this->indexContent) {
+                if($this->indexContent) $metaFields[] = "ajxp_document_content";
+                $data = ["indexed_meta_fields" => $metaFields,
+                              "additionnal_meta_columns" => ["ajxp_document_content" => "Content"]
+                ];
+                $el->setAttribute("indexed_meta_fields", json_encode($data));
+            } else {
+                $el->setAttribute("indexed_meta_fields", json_encode($metaFields));
+            }
+        }
+        parent::init($contextInterface, $this->options);
+    }
+
+
+    /**
+     * @param string $queryAnalyzer
+     * @param int $wildcardLimitation
+     */
+    protected function setDefaultAnalyzer($queryAnalyzer, $wildcardLimitation)
+    {
+        switch ($queryAnalyzer) {
+            case "utf8num_insensitive":
+                \Zend_Search_Lucene_Analysis_Analyzer::setDefault(new \Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8Num_CaseInsensitive());
+                break;
+            case "utf8num_sensitive":
+                \Zend_Search_Lucene_Analysis_Analyzer::setDefault(new \Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8Num());
+                break;
+            case "utf8_insensitive":
+                \Zend_Search_Lucene_Analysis_Analyzer::setDefault(new \Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8_CaseInsensitive());
+                break;
+            case "utf8_sensitive":
+                \Zend_Search_Lucene_Analysis_Analyzer::setDefault(new \Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8());
+                break;
+            case "textnum_insensitive":
+                \Zend_Search_Lucene_Analysis_Analyzer::setDefault(new \Zend_Search_Lucene_Analysis_Analyzer_Common_TextNum_CaseInsensitive());
+                break;
+            case "textnum_sensitive":
+                \Zend_Search_Lucene_Analysis_Analyzer::setDefault(new \Zend_Search_Lucene_Analysis_Analyzer_Common_TextNum());
+                break;
+            case "text_insensitive":
+                \Zend_Search_Lucene_Analysis_Analyzer::setDefault(new \Zend_Search_Lucene_Analysis_Analyzer_Common_Text_CaseInsensitive());
+                break;
+            case "text_sensitive":
+                \Zend_Search_Lucene_Analysis_Analyzer::setDefault(new \Zend_Search_Lucene_Analysis_Analyzer_Common_Text());
+                break;
+            default:
+                \Zend_Search_Lucene_Analysis_Analyzer::setDefault(new \Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8Num_CaseInsensitive());
+                break;
+        }
+        \Zend_Search_Lucene_Search_Query_Wildcard::setMinPrefixLength($wildcardLimitation);
+
+    }
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @return array|null
+     * @throws \Exception
+     */
+    public function applyAction(\Psr\Http\Message\ServerRequestInterface &$requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface)
+    {
+        $messages = LocaleService::getMessages();
+        $actionName = $requestInterface->getAttribute("action");
+        $httpVars   = $requestInterface->getParsedBody();
+        /** @var ContextInterface $ctx */
+        $ctx = $requestInterface->getAttribute("ctx");
+        $ctxUser = $ctx->getUser();
+        $repoId = $ctx->getRepositoryId();
+
+        $x = new \Pydio\Core\Http\Response\SerializableResponseStream();
+        $responseInterface = $responseInterface->withBody($x);
+
+        if ($actionName == "search") {
+
+            // TMP
+            if (strpos($httpVars["query"], "keyword:") === 0) {
+                $parts = explode(":", $httpVars["query"]);
+                $requestInterface = $requestInterface->withAttribute("action", "search_by_keyword")->withParsedBody(["field" => $parts[1]]);
+                $this->applyAction($requestInterface, $responseInterface);
+                return null;
+            }
+
+            require_once("Zend/Search/Lucene.php");
+            try {
+                $index =  $this->loadIndex($ctx, false);
+            } catch (\Exception $ex) {
+                if ($this->seemsCurrentlyIndexing($ctx, 3)){
+                    $x->addChunk(new UserMessage($messages["index.lucene.11"]));
+                }else if (ConfService::backgroundActionsSupported() && !ApplicationState::sapiIsCli() && !isSet($httpVars["skip_unindexed"])) {
+                    $task = \Pydio\Tasks\TaskService::actionAsTask($ctx, "index", []);
+                    $task->setLabel($messages["index.lucene.7"]);
+                    $responseInterface = \Pydio\Tasks\TaskService::getInstance()->enqueueTask($task, $requestInterface, $responseInterface);
+                    $x->addChunk(new UserMessage($messages["index.lucene.7"]));
+                }else{
+                    $x->addChunk(new UserMessage($messages["index.lucene.12"]));
+                }
+                return null;
+            }
+            $textQuery = $httpVars["query"];
+            if($this->getContextualOption($ctx, "AUTO_WILDCARD") === true && strlen($textQuery) > 0 && ctype_alnum($textQuery)){
+                if($textQuery[0] == '"' && $textQuery[strlen($textQuery)-1] == '"'){
+                    $textQuery = substr($textQuery, 1, -1);
+                }else if($textQuery[strlen($textQuery)-1] != "*" ){
+                    $textQuery.="*";
+                }
+            }
+            if(strpos($textQuery, ":") !== false){
+                $textQuery = str_replace("ajxp_meta_ajxp_document_content:","body:", $textQuery);
+                $textQuery = $this->filterSearchRangesKeywords($textQuery);
+                $query = "ajxp_scope:shared AND ($textQuery)";
+            }
+            else if ((isSet($this->metaFields) || $this->indexContent) && isSet($httpVars["fields"])) {
+                $sParts = [];
+                foreach (explode(",",$httpVars["fields"]) as $searchField) {
+                    if ($searchField == "filename") {
+                        $sParts[] = "basename:".$textQuery;
+                    } else if ($searchField == "ajxp_document_content"){
+                        $sParts[] = $textQuery;
+                    } else if (in_array($searchField, $this->metaFields)) {
+                        $sParts[] = "ajxp_meta_".$searchField.":".$textQuery;
+                    } else if ($searchField == "ajxp_document_content") {
+                        $sParts[] = "title:".$textQuery;
+                        $sParts[] = "body:".$textQuery;
+                        $sParts[] = "keywords:".$textQuery;
+                    }
+                }
+                $query = implode(" OR ", $sParts);
+                $query = "ajxp_scope:shared AND ($query)";
+                $this->logDebug("Query : $query");
+            } else {
+                $index->setDefaultSearchField("basename");
+                $query = $this->filterSearchRangesKeywords($textQuery);
+            }
+            $this->setDefaultAnalyzer(
+                $this->getContextualOption($ctx, "QUERY_ANALYSER"),
+                intval($this->getContextualOption($ctx, "WILDCARD_LIMITATION"))
+            );
+            if ($query == "*") {
+                $index->setDefaultSearchField("ajxp_node");
+                $query = "yes";
+                $hits = $index->find($query);
+            } else {
+                if(isSet($httpVars["limit"])){
+                    $limit = intval($httpVars["limit"]);
+                    // Ask one more to detect if there is "more" results or not.
+                    $index->setResultSetLimit( $limit + 50 );
+                }
+                $hits = $index->find($query);
+            }
+            $commitIndex = false;
+
+            $nodesList = new NodesList();
+            $x->addChunk($nodesList);
+
+            $cursor = 0;
+            if(!empty($limit) && count($hits) > $limit){
+                $nodesList->setPaginationData(count($hits), 1, 1);
+            }
+            foreach ($hits as $hit) {
+                // Backward compatibility
+                $hit->node_url = preg_replace("#ajxp\.[a-z_]+://#", "pydio://", $hit->node_url);
+                if ($hit->serialized_metadata!=null) {
+                    $meta = unserialize(base64_decode($hit->serialized_metadata));
+                    if(isSet($meta["ajxp_modiftime"])){
+                        $meta["ajxp_relativetime"] = $meta["ajxp_description"] = $messages[4]." ". StatHelper::relativeDate($meta["ajxp_modiftime"], $messages);
+                    }
+                    $tmpNode = new AJXP_Node($hit->node_url, $meta);
+                    if(!$tmpNode->hasUser()){
+                        if($hit->ajxp_scope === "user" && $hit->ajxp_user) $tmpNode->setUserId($hit->ajxp_user);
+                        else $tmpNode->setUserId($ctx->getUser()->getId());
+                    }
+                } else {
+                    $tmpNode = new AJXP_Node($hit->node_url, []);
+                    if(!$tmpNode->hasUser()){
+                        if($hit->ajxp_scope === "user" && $hit->ajxp_user) $tmpNode->setUserId($hit->ajxp_user);
+                        else $tmpNode->setUserId($ctx->getUser()->getId());
+                    }
+                    $tmpNode->loadNodeInfo();
+                }
+                if($tmpNode->getRepositoryId() != $repoId){
+                    $this->logDebug(__CLASS__, "Strange case, search retrieves a node from wrong repository!");
+                    $index->delete($hit->id);
+                    $commitIndex = true;
+                    continue;
+                }
+                if (!file_exists($tmpNode->getUrl())) {
+                    $index->delete($hit->id);
+                    $commitIndex = true;
+                    continue;
+                }
+                if (!is_readable($tmpNode->getUrl())){
+                    continue;
+                }
+                $basename = basename($tmpNode->getPath());
+                $isLeaf = $tmpNode->isLeaf();
+                if (!$ctx->getRepository()->getDriverInstance($ctx)->filterNodeName($ctx, $tmpNode->getPath(), $basename, $isLeaf, ["d" => true, "f" => true, "z" => true])){
+                    continue;
+                }
+                $tmpNode->search_score = sprintf("%0.2f", $hit->score);
+                $nodesList->addBranch($tmpNode);
+                $cursor++;
+                if(isSet($limit) && $cursor >= $limit) break;
+            }
+
+            if ($commitIndex) {
+                $index->commit();
+            }
+        } else if ($actionName == "search_by_keyword") {
+            require_once("Zend/Search/Lucene.php");
+            $scope = "user";
+
+            try {
+                $index =  $this->loadIndex($ctx, false);
+            } catch (\Exception $ex) {
+                if (ConfService::backgroundActionsSupported() && !ApplicationState::sapiIsCli()) {
+                    $task = \Pydio\Tasks\TaskService::actionAsTask($ctx, "index", []);
+                    $task->setLabel($messages["index.lucene.7"]);
+                    $responseInterface = \Pydio\Tasks\TaskService::getInstance()->enqueueTask($task, $requestInterface, $responseInterface);
+                    $x->addChunk(new UserMessage($messages["index.lucene.7"]));
+                }
+                return null;
+            }
+            $sParts = [];
+            $searchField = $httpVars["field"];
+            if ($searchField == "ajxp_node") {
+                $sParts[] = "$searchField:yes";
+            } else {
+                $sParts[] = "$searchField:true";
+            }
+            if ($scope == "user" && UsersService::usersEnabled()) {
+                if ($ctxUser == null) {
+                    throw new \Exception("Cannot find current user");
+                }
+                $sParts[] = "ajxp_scope:user";
+                $sParts[] = "ajxp_user:".$ctxUser->getId();
+            } else {
+                $sParts[] = "ajxp_scope:shared";
+            }
+            $query = implode(" AND ", $sParts);
+            $this->logDebug("Query : $query");
+            $index->setResultSetLimit(isSet($httpVars["limit"]) ? intval($httpVars["limit"]) : 50);
+            $hits = $index->find($query);
+
+            $commitIndex = false;
+
+            $nodesList = new NodesList();
+            $x->addChunk($nodesList);
+            $leafNodes = [];
+            foreach ($hits as $hit) {
+                // Backward compat with old protocols
+                $hit->node_url = preg_replace("#ajxp\.[a-z_]+://#", "pydio://", $hit->node_url);
+                if ($hit->serialized_metadata!=null) {
+                    $meta = unserialize(base64_decode($hit->serialized_metadata));
+                    $tmpNode = new AJXP_Node($hit->node_url, $meta);
+                    if(!$tmpNode->hasUser()){
+                        if($hit->ajxp_user) $tmpNode->setUserId($hit->ajxp_user);
+                        else $tmpNode->setUserId($ctx->getUser()->getId());
+                    }
+                } else {
+                    $tmpNode = new AJXP_Node($hit->node_url, []);
+                    if(!$tmpNode->hasUser()){
+                        if($hit->ajxp_user) $tmpNode->setUserId($hit->ajxp_user);
+                        else $tmpNode->setUserId($ctx->getUser()->getId());
+                    }
+                    $tmpNode->loadNodeInfo();
+                }
+                if (!file_exists($tmpNode->getUrl())) {
+                    $index->delete($hit->id);
+                    $commitIndex = true;
+                    continue;
+                }
+                if (!is_readable($tmpNode->getUrl())){
+                    continue;
+                }
+                $basename = basename($tmpNode->getPath());
+                $isLeaf = $tmpNode->isLeaf();
+                if (!$ctx->getRepository()->getDriverInstance($ctx)->filterNodeName($ctx, $tmpNode->getPath(), $basename, $isLeaf, ["d"=>true, "f"=>true])){
+                    continue;
+                }
+                $tmpNode->search_score = sprintf("%0.2f", $hit->score);
+                if($isLeaf){
+                    $leafNodes[]= $tmpNode;
+                }else{
+                    $nodesList->addBranch($tmpNode);
+                }
+            }
+            foreach ($leafNodes as $leaf){
+                $nodesList->addBranch($leaf);
+            }
+            if ($commitIndex) {
+                $index->commit();
+            }
+        }
+        if(isSet($returnNodes)) return $returnNodes;
+        else return null;
+    }
+
+    /**
+     * @param AJXP_Node $parentNode
+     */
+    public function indexationStarts($parentNode){
+        $this->currentIndex = $this->loadTemporaryIndex($parentNode->getContext());
+    }
+
+    /**
+     * @param AJXP_Node $parentNode
+     */
+    public function indexationEnds($parentNode){
+        $this->logDebug('INDEX.END', 'Optimizing Index');
+        $this->currentIndex->optimize();
+        $this->logDebug('INDEX.END', 'Commiting Index');
+        $this->currentIndex->commit();
+        unset($this->currentIndex);
+        $this->logDebug('INDEX.END', 'Merging Temporary in main');
+        $this->mergeTemporaryIndexToMain($parentNode->getContext());
+        $this->logDebug('INDEX.END', 'Done');
+    }
+
+    /**
+     * @param AJXP_Node $node
+     */
+    public function indexationIndexNode($node){
+        $this->updateNodeIndex(null, $node, false, false);
+    }
+
+    /**
+     * @param $url
+     */
+    public function recursiveIndexation($url)
+    {
+        //print("Indexing $url \n");
+        $this->logDebug("Indexing content of folder ".$url);
+        if (ApplicationState::sapiIsCli() && $this->verboseIndexation) {
+            print("Indexing content of ".$url."\n");
+        }
+        if(!ApplicationState::sapiIsCli()) @set_time_limit(60);
+        $handle = opendir($url);
+        if ($handle !== false) {
+            while ( ($child = readdir($handle)) != false) {
+                if($child[0] == ".") continue;
+                $newUrl = $url."/".$child;
+                if (ApplicationState::sapiIsCli() && $this->verboseIndexation) {
+                    print("Indexing node ".$newUrl."\n");
+                }
+                $this->logDebug("Indexing Node ".$newUrl);
+                try {
+                    $newNode = new AJXP_Node($newUrl);
+                    $this->updateNodeIndex(null, $newNode, false, true);
+                    Controller::applyHook("node.index.add", [$newNode]);
+                } catch (\Exception $e) {
+                    if (ApplicationState::sapiIsCli() && $this->verboseIndexation) {
+                        print("Error indexing node ".$newUrl." (".$e->getMessage().") \n");
+                    }
+                    $this->logDebug("Error Indexing Node ".$newUrl." (".$e->getMessage().")");
+                }
+            }
+            closedir($handle);
+        } else {
+            $this->logDebug("Cannot open $url!!");
+        }
+    }
+
+    /**
+     * Passes the array of META_SOURCES options before creating the shared workspace.
+     * Used here to disable the repository_specific_keywords, as path is in fact already fully resolved.
+     * @param ContextInterface $context
+     * @param $metaOptions array
+     */
+    public function updateSharedChildOptions($context, &$metaOptions){
+        if(isSet($metaOptions["index.lucene"]) && isSet($metaOptions["index.lucene"]["repository_specific_keywords"])){
+            unset($metaOptions["index.lucene"]["repository_specific_keywords"]);
+        }
+    }
+
+    /**
+     * Called on workspace.after_delete event, clear the index!
+     * @param $repoId
+     */
+    public function clearWorkspaceIndexes($repoId){
+        $iPath = $this->getIndexPath($repoId);
+        $this->clearIndexIfExists($iPath);
+        $this->clearIndexIfExists($iPath."-PYDIO_TMP");
+    }
+
+    /**
+     *
+     * Hooked to node.meta_change, this will update the index
+     *
+     * @param AJXP_Node $node
+     */
+    public function updateNodeIndexMeta($node)
+    {
+        require_once("Zend/Search/Lucene.php");
+        try{
+
+            if (isSet($this->currentIndex)) {
+                $index = $this->currentIndex;
+            } else {
+                $index =  $this->loadIndex($node->getContext(), true);
+            }
+            \Zend_Search_Lucene_Analysis_Analyzer::setDefault( new \Zend_Search_Lucene_Analysis_Analyzer_Common_TextNum_CaseInsensitive());
+
+            if (UsersService::usersEnabled() && $node->getContext()->hasUser()) {
+                $term = new \Zend_Search_Lucene_Index_Term($node->getUrl(), "node_url");
+                $hits = $index->termDocs($term);
+                foreach ($hits as $hitId) {
+                    $hit = $index->getDocument($hitId);
+                    if ($hit->ajxp_scope == 'shared' || ($hit->ajxp_scope == 'user' && $hit->ajxp_user == $node->getContext()->getUser()->getId())) {
+                        $index->delete($hitId);
+                    }
+                }
+            } else {
+                $id = $this->getIndexedDocumentId($index, $node);
+                if($id != null) $index->delete($id);
+            }
+            if(file_exists($node->getUrl())){
+                $this->createIndexedDocument($node, $index);
+            }
+            $this->logDebug(__FILE__, "Indexation passed ".$node->getUrl());
+        } catch (\Exception $e){
+            $this->logError(__FILE__, "Lucene indexation failed for ".$node->getUrl()." (".$e->getMessage().")");
+        }
+    }
+
+    /**
+     *
+     * Hooked to node.change, this will update the index
+     * if $oldNode = null => create node $newNode
+     * if $newNode = null => delete node $oldNode
+     * Else copy or move oldNode to newNode.
+     *
+     * @param \Pydio\Access\Core\Model\AJXP_Node $oldNode
+     * @param \Pydio\Access\Core\Model\AJXP_Node $newNode
+     * @param Boolean $copy
+     * @param bool $recursive
+     */
+    public function updateNodeIndex($oldNode, $newNode = null, $copy = false, $recursive = false)
+    {
+        require_once("Zend/Search/Lucene.php");
+        if (isSet($this->currentIndex)) {
+            $oldIndex = $newIndex = $this->currentIndex;
+        } else {
+            if($oldNode == null){
+                $newIndex = $oldIndex = $this->loadIndex($newNode->getContext(), true);
+            }else if($newNode == null){
+                $oldIndex = $newIndex = $this->loadIndex($oldNode->getContext(), true);
+            }else{
+                $newId = $newNode->getRepositoryId();
+                $oldId = $oldNode->getRepositoryId();
+                if($newId == $oldId){
+                    $newIndex = $oldIndex = $this->loadIndex($newNode->getContext(), true);
+                }else{
+                    $newIndex = $this->loadIndex($newNode->getContext(), true);
+                    $oldIndex = $this->loadIndex($oldNode->getContext(), true);
+                }
+            }
+        }
+        $refNode = ($oldNode != null ? $oldNode : $newNode);
+        $this->setDefaultAnalyzer(
+            $this->getContextualOption($refNode->getContext(), "QUERY_ANALYSER"),
+            intval($this->getContextualOption($refNode->getContext(), "WILDCARD_LIMITATION"))
+        );
+        if ($oldNode != null && $copy == false) {
+            $oldDocId = $this->getIndexedDocumentId($oldIndex, $oldNode);
+            if ($oldDocId != null) {
+                $oldIndex->delete($oldDocId);
+                if ($newNode == null) { // DELETION
+                    $childrenHits = $this->getIndexedChildrenDocuments($oldIndex, $oldNode);
+                    foreach ($childrenHits as $hit) {
+                        $oldIndex->delete($hit->id);
+                    }
+                }
+            }
+        }
+
+        if ($newNode != null) {
+            // Make sure it does not already exists anyway
+            $newDocId = $this->getIndexedDocumentId($newIndex, $newNode);
+            if ($newDocId != null) {
+                $newIndex->delete($newDocId);
+                $childrenHits = $this->getIndexedChildrenDocuments($newIndex, $newNode);
+                foreach ($childrenHits as $hit) {
+                    $newIndex->delete($hit->id);
+                }
+            }
+            $this->createIndexedDocument($newNode, $newIndex);
+            if ( $recursive && $oldNode == null && is_dir($newNode->getUrl())) {
+                $this->recursiveIndexation($newNode->getUrl());
+            }
+        }
+
+        if ($oldNode != null && $newNode != null && is_dir($newNode->getUrl()) && ($newIndex == $oldIndex)) { // Copy / Move / Rename
+            // Get old node children docs, and update them manually, no need to scan real directory
+            $childrenHits = $this->getIndexedChildrenDocuments($oldIndex, $oldNode);
+            foreach ($childrenHits as $hit) {
+                $oldChildURL = $oldIndex->getDocument($hit->id)->node_url;
+                if ($copy == false) {
+                    $oldIndex->delete($hit->id);
+                }
+                $newChildURL = str_replace($oldNode->getUrl(),$newNode->getUrl(),$oldChildURL);
+                $this->createIndexedDocument(new AJXP_Node($newChildURL), $oldIndex);
+            }
+        }
+
+        if (!isSet($this->currentIndex)) {
+            $oldIndex->commit();
+            if($newIndex != $oldIndex){
+                $newIndex->commit();
+            }
+        }
+    }
+
+    /**
+     * @param AJXP_Node $ajxpNode
+     * @param \Zend_Search_Lucene_Interface $index
+     * @throws \Exception
+     * @return \Zend_Search_Lucene_Document
+     */
+    public function createIndexedDocument($ajxpNode, &$index)
+    {
+        if(!empty($this->metaFields)){
+            $ajxpNode->loadNodeInfo(false, false, "all");
+        }else{
+            $ajxpNode->loadNodeInfo();
+        }
+        $ext = strtolower(pathinfo($ajxpNode->getLabel(), PATHINFO_EXTENSION));
+        $parseContent = $this->indexContent;
+        if ($parseContent && $ajxpNode->bytesize > $this->getContextualOption($ajxpNode->getContext(), "PARSE_CONTENT_MAX_SIZE")) {
+            $parseContent = false;
+        }
+        if ($parseContent && in_array($ext, explode(",", $this->getContextualOption($ajxpNode->getContext(), "PARSE_CONTENT_HTML")))) {
+            $doc = @\Zend_Search_Lucene_Document_Html::loadHTMLFile($ajxpNode->getUrl());
+        } elseif ($parseContent && $ext == "docx" && class_exists("\Zend_Search_Lucene_Document_Docx")) {
+            $realFile = $ajxpNode->getRealFile();
+            $doc = @\Zend_Search_Lucene_Document_Docx::loadDocxFile($realFile);
+        } elseif ($parseContent && $ext == "docx" && class_exists("\Zend_Search_Lucene_Document_Pptx")) {
+            $realFile = $ajxpNode->getRealFile();
+            $doc = @\Zend_Search_Lucene_Document_Pptx::loadPptxFile($realFile);
+        } elseif ($parseContent && $ext == "xlsx" && class_exists("\Zend_Search_Lucene_Document_Xlsx")) {
+            $realFile = $ajxpNode->getRealFile();
+            $doc = @\Zend_Search_Lucene_Document_Xlsx::loadXlsxFile($realFile);
+        } else {
+            $doc = new \Zend_Search_Lucene_Document();
+        }
+        if($doc == null) throw new \Exception("Could not load document");
+
+        $doc->addField(\Zend_Search_Lucene_Field::keyword("node_url", $ajxpNode->getUrl(), "utf8"));
+        $doc->addField(\Zend_Search_Lucene_Field::keyword("node_path", str_replace("/", "AJXPFAKESEP", $ajxpNode->getPath()), "utf8"));
+        $doc->addField(\Zend_Search_Lucene_Field::text("basename", basename($ajxpNode->getPath()), "utf8"));
+        $doc->addField(\Zend_Search_Lucene_Field::keyword("ajxp_node", "yes"));
+        $doc->addField(\Zend_Search_Lucene_Field::keyword("ajxp_scope", "shared"));
+        $doc->addField(\Zend_Search_Lucene_Field::keyword("ajxp_modiftime", date("Ymd", $ajxpNode->ajxp_modiftime)));
+        $doc->addField(\Zend_Search_Lucene_Field::keyword("ajxp_bytesize", $ajxpNode->bytesize));
+        $ajxpMime = $ajxpNode->ajxp_mime;
+        if (empty($ajxpMime)) {
+            $doc->addField(\Zend_Search_Lucene_Field::keyword("ajxp_mime", pathinfo($ajxpNode->getLabel(), PATHINFO_EXTENSION)));
+        } else {
+            $doc->addField(\Zend_Search_Lucene_Field::keyword("ajxp_mime", $ajxpNode->ajxp_mime));
+        }
+
+
+        // Store a cached copy of the metadata
+        $serializedMeta = base64_encode(serialize($ajxpNode->metadata));
+        $doc->addField(\Zend_Search_Lucene_Field::binary("serialized_metadata", $serializedMeta));
+        if (isSet($ajxpNode->indexableMetaKeys["shared"])) {
+            foreach ($ajxpNode->indexableMetaKeys["shared"] as $sharedField) {
+                if($ajxpNode->$sharedField) $doc->addField(\Zend_Search_Lucene_Field::keyword($sharedField, $ajxpNode->$sharedField));
+            }
+        }
+        foreach ($this->metaFields as $field) {
+            if ($ajxpNode->$field != null) {
+                $doc->addField(\Zend_Search_Lucene_Field::text("ajxp_meta_$field", $ajxpNode->$field, "utf8"));
+            }
+        }
+        if (isSet($ajxpNode->indexableMetaKeys["user"]) && count($ajxpNode->indexableMetaKeys["user"]) && UsersService::usersEnabled() && $ajxpNode->getContext()->hasUser() ) {
+            $privateDoc = new \Zend_Search_Lucene_Document();
+            $privateDoc->addField(\Zend_Search_Lucene_Field::keyword("node_url", $ajxpNode->getUrl(), "utf8"));
+            $privateDoc->addField(\Zend_Search_Lucene_Field::keyword("node_path", str_replace("/", "AJXPFAKESEP", $ajxpNode->getPath()), "utf8"));
+
+            $privateDoc->addField(\Zend_Search_Lucene_Field::keyword("ajxp_scope", "user"));
+            $privateDoc->addField(\Zend_Search_Lucene_Field::keyword("ajxp_user", $ajxpNode->getContext()->getUser()->getId()));
+            foreach ($ajxpNode->indexableMetaKeys["user"] as $userField) {
+                if ($ajxpNode->$userField) {
+                    $privateDoc->addField(\Zend_Search_Lucene_Field::keyword($userField, $ajxpNode->$userField));
+                }
+            }
+            $privateDoc->addField(\Zend_Search_Lucene_Field::binary("serialized_metadata", $serializedMeta));
+
+            $index->addDocument($privateDoc);
+        }
+
+        if($parseContent){
+            $body = $this->extractIndexableContent($ajxpNode);
+            if(!empty($body)) $doc->addField(\Zend_Search_Lucene_Field::unStored("body", $body));
+        }
+        $index->addDocument($doc);
+        return $doc;
+    }
+
+    /**
+     * @param  \Zend_Search_Lucene_Interface $index
+     * @param AJXP_Node $ajxpNode
+     * @return Number
+     */
+    public function getIndexedDocumentId($index, $ajxpNode)
+    {
+        $term = new \Zend_Search_Lucene_Index_Term($ajxpNode->getUrl(), "node_url");
+        $docIds = $index->termDocs($term);
+        if(!count($docIds)) return null;
+        return $docIds[0];
+    }
+
+    /**
+     * Find all existing lucene documents based on the parent url
+     * @param \Zend_Search_Lucene_Interface $index
+     * @param AJXP_Node $ajxpNode
+     * @return \Zend_Search_Lucene_Search_QueryHit
+     */
+    public function getIndexedChildrenDocuments($index, $ajxpNode)
+    {
+        // Try getting doc by url
+        $testQ = str_replace("/", "AJXPFAKESEP", $ajxpNode->getPath());
+        $pattern = new \Zend_Search_Lucene_Index_Term($testQ .'*', 'node_path');
+        $query = new \Zend_Search_Lucene_Search_Query_Wildcard($pattern);
+        $hits = $index->find($query);
+        return $hits;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @return string
+     */
+    protected function getIndexPath(ContextInterface $ctx){
+        $mainCacheDir = (defined('AJXP_SHARED_CACHE_DIR')?AJXP_SHARED_CACHE_DIR:AJXP_CACHE_DIR);
+        if(!is_dir($mainCacheDir."/indexes")) mkdir($mainCacheDir."/indexes",0755,true);
+        $iPath = $mainCacheDir."/indexes/index-".$this->buildSpecificId($ctx);
+        return $iPath;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @return \Zend_Search_Lucene_Interface
+     */
+    protected function loadTemporaryIndex(ContextInterface $ctx){
+        $indexPath = $this->getIndexPath($ctx);
+        $tmpIndexPath = $indexPath."-PYDIO_TMP";
+        $this->clearIndexIfExists($tmpIndexPath);
+        $this->copyIndex($indexPath, $tmpIndexPath);
+        return $this->loadIndex($ctx, true, $tmpIndexPath);
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param int $checkInterval
+     * @return bool
+     */
+    protected function seemsCurrentlyIndexing(ContextInterface $ctx, $checkInterval){
+        $tmpIndexPath = $this->getIndexPath($ctx)."-PYDIO_TMP";
+        if(is_dir($tmpIndexPath)){
+            $mtime = filemtime($tmpIndexPath);
+            if(time() - $mtime <= 60 * $checkInterval){
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     */
+    protected function mergeTemporaryIndexToMain(ContextInterface $ctx){
+        $indexPath = $this->getIndexPath($ctx);
+        $tmpIndexPath = $indexPath."-PYDIO_TMP";
+        $this->clearIndexIfExists($indexPath);
+        $this->moveIndex($tmpIndexPath, $indexPath);
+        $this->clearIndexIfExists($tmpIndexPath);
+    }
+
+    /**
+     * @param $folder
+     */
+    private function clearIndexIfExists($folder){
+        if(!is_dir($folder))return;
+        $content = scandir($folder);
+        foreach($content as $file){
+            if($file == "." || $file == "..") continue;
+            unlink($folder.DIRECTORY_SEPARATOR.$file);
+        }
+        rmdir($folder);
+    }
+
+    /**
+     * @param $folder1
+     * @param $folder2
+     */
+    private function copyIndex($folder1, $folder2){
+        if(!is_dir($folder1))return;
+        if(!is_dir($folder2)) mkdir($folder2, 0755);
+        $content = scandir($folder1);
+        foreach($content as $file){
+            if($file == "." || $file == "..") continue;
+            copy($folder1.DIRECTORY_SEPARATOR.$file, $folder2.DIRECTORY_SEPARATOR.$file);
+        }
+    }
+
+
+    /**
+     * @param $folder1
+     * @param $folder2
+     */
+    private function moveIndex($folder1, $folder2){
+        if(!is_dir($folder1))return;
+        if(!is_dir($folder2)) mkdir($folder2, 0755);
+        $content = scandir($folder1);
+        foreach($content as $file){
+            if($file == "." || $file == "..") continue;
+            rename($folder1.DIRECTORY_SEPARATOR.$file, $folder2.DIRECTORY_SEPARATOR.$file);
+        }
+    }
+
+
+    /**
+     *
+     * Load index for context
+     * @param ContextInterface $ctx
+     * @param bool $create
+     * @param null $iPath
+     * @throws \Exception
+     * @return \Zend_Search_Lucene_Interface the index
+     */
+    protected function loadIndex(ContextInterface $ctx, $create = true, $iPath = null)
+    {
+        require_once("Zend/Search/Lucene.php");
+        if($iPath == null){
+            $iPath = $this->getIndexPath($ctx);
+        }
+        if (is_dir($iPath)) {
+            try{
+                $index = \Zend_Search_Lucene::open($iPath);
+            }catch (\Zend_Search_Lucene_Exception $se){
+                $this->logError(__FUNCTION__, "Error while trying to load lucene index at path ".$iPath."! Maybe a permission issue?");
+                throw $se;
+            }
+        } else {
+            if (!$create) {
+                $messages = LocaleService::getMessages();
+                throw new \Exception($messages["index.lucene.9"]);
+            }
+            try{
+                $index = \Zend_Search_Lucene::create($iPath);
+            }catch (\Zend_Search_Lucene_Exception $se){
+                $this->logError(__FUNCTION__, "Error while trying to create lucene index at path ".$iPath."! Maybe a permission issue?");
+                throw $se;
+            }
+        }
+        return $index;
+    }
+}
diff --git a/core/src/plugins/index.lucene/class.AjxpLuceneIndexer.php b/core/src/plugins/index.lucene/class.AjxpLuceneIndexer.php
deleted file mode 100644
index 1032610b51..0000000000
--- a/core/src/plugins/index.lucene/class.AjxpLuceneIndexer.php
+++ /dev/null
@@ -1,778 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Encapsultion of the Zend_Search_Lucene component as a plugin
- * @package AjaXplorer_Plugins
- * @subpackage Index
- */
-class AjxpLuceneIndexer extends AbstractSearchEngineIndexer
-{
-    /**
-     * @var Zend_Search_Lucene_Interface
-     */
-    private $currentIndex;
-    private $metaFields = array();
-    private $indexContent = false;
-    private $verboseIndexation = false;
-
-    public function init($options)
-    {
-        parent::init($options);
-        set_include_path(get_include_path().PATH_SEPARATOR.AJXP_INSTALL_PATH."/plugins/index.lucene");
-        $metaFields = $this->getFilteredOption("index_meta_fields");
-        if (!empty($metaFields)) {
-            $this->metaFields = explode(",",$metaFields);
-        }
-        $this->indexContent = ($this->getFilteredOption("index_content") == true);
-    }
-
-    public function initMeta($accessDriver)
-    {
-        parent::initMeta($accessDriver);
-        if (!empty($this->metaFields) || $this->indexContent) {
-            $metaFields = $this->metaFields;
-            $el = $this->getXPath()->query("/indexer")->item(0);
-            if ($this->indexContent) {
-                if($this->indexContent) $metaFields[] = "ajxp_document_content";
-                $data = array("indexed_meta_fields" => $metaFields,
-                              "additionnal_meta_columns" => array("ajxp_document_content" => "Content")
-                );
-                $el->setAttribute("indexed_meta_fields", json_encode($data));
-            } else {
-                $el->setAttribute("indexed_meta_fields", json_encode($metaFields));
-            }
-        }
-        parent::init($this->options);
-    }
-
-
-    protected function setDefaultAnalyzer()
-    {
-        switch ($this->getFilteredOption("QUERY_ANALYSER")) {
-            case "utf8num_insensitive":
-                Zend_Search_Lucene_Analysis_Analyzer::setDefault(new Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8Num_CaseInsensitive());
-                break;
-            case "utf8num_sensitive":
-                Zend_Search_Lucene_Analysis_Analyzer::setDefault(new Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8Num());
-                break;
-            case "utf8_insensitive":
-                Zend_Search_Lucene_Analysis_Analyzer::setDefault(new Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8_CaseInsensitive());
-                break;
-            case "utf8_sensitive":
-                Zend_Search_Lucene_Analysis_Analyzer::setDefault(new Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8());
-                break;
-            case "textnum_insensitive":
-                Zend_Search_Lucene_Analysis_Analyzer::setDefault(new Zend_Search_Lucene_Analysis_Analyzer_Common_TextNum_CaseInsensitive());
-                break;
-            case "textnum_sensitive":
-                Zend_Search_Lucene_Analysis_Analyzer::setDefault(new Zend_Search_Lucene_Analysis_Analyzer_Common_textNum());
-                break;
-            case "text_insensitive":
-                Zend_Search_Lucene_Analysis_Analyzer::setDefault(new Zend_Search_Lucene_Analysis_Analyzer_Common_Text_CaseInsensitive());
-                break;
-            case "text_sensitive":
-                Zend_Search_Lucene_Analysis_Analyzer::setDefault(new Zend_Search_Lucene_Analysis_Analyzer_Common_Text());
-                break;
-            default:
-                Zend_Search_Lucene_Analysis_Analyzer::setDefault(new Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8Num_CaseInsensitive());
-                break;
-        }
-        Zend_Search_Lucene_Search_Query_Wildcard::setMinPrefixLength(intval($this->getFilteredOption("WILDCARD_LIMITATION")));
-
-    }
-
-    public function applyAction($actionName, $httpVars, $fileVars)
-    {
-        $messages = ConfService::getMessages();
-        $repoId = $this->accessDriver->repository->getId();
-
-        if ($actionName == "search") {
-
-            // TMP
-            if (strpos($httpVars["query"], "keyword:") === 0) {
-                $parts = explode(":", $httpVars["query"]);
-                $this->applyAction("search_by_keyword", array("field" => $parts[1]), array());
-                return null;
-            }
-
-            require_once("Zend/Search/Lucene.php");
-            try {
-                $index =  $this->loadIndex($repoId, false);
-            } catch (Exception $ex) {
-                AJXP_XMLWriter::header();
-                if ($this->seemsCurrentlyIndexing($repoId, 3)){
-                    AJXP_XMLWriter::sendMessage($messages["index.lucene.11"], null);
-                }else if (ConfService::backgroundActionsSupported() && !ConfService::currentContextIsCommandLine()) {
-                    AJXP_Controller::applyActionInBackground($repoId, "index", array());
-                    sleep(2);
-                    AJXP_XMLWriter::triggerBgAction("check_index_status", array("repository_id" => $repoId), sprintf($messages["index.lucene.8"], "/"), true, 5);
-                    AJXP_XMLWriter::sendMessage($messages["index.lucene.7"], null);
-                }else{
-                    AJXP_XMLWriter::sendMessage($messages["index.lucene.12"], null);
-                }
-                AJXP_XMLWriter::close();
-                return null;
-            }
-            $textQuery = $httpVars["query"];
-            if($this->getFilteredOption("AUTO_WILDCARD") === true && strlen($textQuery) > 0 && ctype_alnum($textQuery)){
-                if($textQuery[0] == '"' && $textQuery[strlen($textQuery)-1] == '"'){
-                    $textQuery = substr($textQuery, 1, -1);
-                }else if($textQuery[strlen($textQuery)-1] != "*" ){
-                    $textQuery.="*";
-                }
-            }
-            if(strpos($textQuery, ":") !== false){
-                $textQuery = str_replace("ajxp_meta_ajxp_document_content:","body:", $textQuery);
-                $textQuery = $this->filterSearchRangesKeywords($textQuery);
-                $query = "ajxp_scope:shared AND ($textQuery)";
-            }
-            else if ((isSet($this->metaFields) || $this->indexContent) && isSet($httpVars["fields"])) {
-                $sParts = array();
-                foreach (explode(",",$httpVars["fields"]) as $searchField) {
-                    if ($searchField == "filename") {
-                        $sParts[] = "basename:".$textQuery;
-                    } else if ($searchField == "ajxp_document_content"){
-                        $sParts[] = $textQuery;
-                    } else if (in_array($searchField, $this->metaFields)) {
-                        $sParts[] = "ajxp_meta_".$searchField.":".$textQuery;
-                    } else if ($searchField == "ajxp_document_content") {
-                        $sParts[] = "title:".$textQuery;
-                        $sParts[] = "body:".$textQuery;
-                        $sParts[] = "keywords:".$textQuery;
-                    }
-                }
-                $query = implode(" OR ", $sParts);
-                $query = "ajxp_scope:shared AND ($query)";
-                $this->logDebug("Query : $query");
-            } else {
-                $index->setDefaultSearchField("basename");
-                $query = $this->filterSearchRangesKeywords($textQuery);
-            }
-            $this->setDefaultAnalyzer();
-            if ($query == "*") {
-                $index->setDefaultSearchField("ajxp_node");
-                $query = "yes";
-                $hits = $index->find($query, "node_url", SORT_STRING);
-            } else {
-                $hits = $index->find($query);
-            }
-            $commitIndex = false;
-
-            if (isSet($httpVars['return_selection'])) {
-                $returnNodes = array();
-            } else {
-                AJXP_XMLWriter::header();
-            }
-            $cursor = 0;
-            if(isSet($httpVars['limit'])){
-                $limit = intval($httpVars['limit']);
-            }
-            if(!isSet($returnNodes) && !empty($limit) && count($hits) > $limit){
-                AJXP_XMLWriter::renderPaginationData(count($hits), 1, 1);
-            }
-            foreach ($hits as $hit) {
-                // Backward compatibility
-                $hit->node_url = preg_replace("#ajxp\.[a-z_]+://#", "pydio://", $hit->node_url);
-                if ($hit->serialized_metadata!=null) {
-                    $meta = unserialize(base64_decode($hit->serialized_metadata));
-                    if(isSet($meta["ajxp_modiftime"])){
-                        $meta["ajxp_relativetime"] = $meta["ajxp_description"] = $messages[4]." ".AJXP_Utils::relativeDate($meta["ajxp_modiftime"], $messages);
-                    }
-                    $tmpNode = new AJXP_Node(SystemTextEncoding::fromUTF8($hit->node_url), $meta);
-                } else {
-                    $tmpNode = new AJXP_Node(SystemTextEncoding::fromUTF8($hit->node_url), array());
-                    $tmpNode->loadNodeInfo();
-                }
-                if($tmpNode->getRepositoryId() != $repoId){
-                    $this->logDebug(__CLASS__, "Strange case, search retrieves a node from wrong repository!");
-                    $index->delete($hit->id);
-                    $commitIndex = true;
-                    continue;
-                }
-                if (!file_exists($tmpNode->getUrl())) {
-                    $index->delete($hit->id);
-                    $commitIndex = true;
-                    continue;
-                }
-                if (!is_readable($tmpNode->getUrl())){
-                    continue;
-                }
-                $basename = basename($tmpNode->getPath());
-                $isLeaf = $tmpNode->isLeaf();
-                if (!$this->accessDriver->filterNodeName($tmpNode->getPath(), $basename, $isLeaf, array("d" => true, "f" => true, "z" => true))){
-                    continue;
-                }
-                $tmpNode->search_score = sprintf("%0.2f", $hit->score);
-                if (isSet($returnNodes)) {
-                    $returnNodes[] = $tmpNode;
-                } else {
-                    AJXP_XMLWriter::renderAjxpNode($tmpNode);
-                }
-                $cursor++;
-                if(isSet($limit) && $cursor >= $limit) break;
-            }
-            if(!isSet($returnNodes)) AJXP_XMLWriter::close();
-            if ($commitIndex) {
-                $index->commit();
-            }
-        } else if ($actionName == "search_by_keyword") {
-            require_once("Zend/Search/Lucene.php");
-            $scope = "user";
-
-            try {
-                $index =  $this->loadIndex($repoId, false);
-            } catch (Exception $ex) {
-                AJXP_XMLWriter::header();
-                if (ConfService::backgroundActionsSupported() && !ConfService::currentContextIsCommandLine()) {
-                    AJXP_Controller::applyActionInBackground($repoId, "index", array());
-                    AJXP_XMLWriter::triggerBgAction("check_index_status", array("repository_id" => $repoId), sprintf($messages["index.lucene.8"], "/"), true, 2);
-                }
-                AJXP_XMLWriter::sendMessage($messages["index.lucene.7"], null);
-                AJXP_XMLWriter::close();
-                return null;
-            }
-            $sParts = array();
-            $searchField = $httpVars["field"];
-            if ($searchField == "ajxp_node") {
-                $sParts[] = "$searchField:yes";
-            } else {
-                $sParts[] = "$searchField:true";
-            }
-            if ($scope == "user" && AuthService::usersEnabled()) {
-                if (AuthService::getLoggedUser() == null) {
-                    throw new Exception("Cannot find current user");
-                }
-                $sParts[] = "ajxp_scope:user";
-                $sParts[] = "ajxp_user:".AuthService::getLoggedUser()->getId();
-            } else {
-                $sParts[] = "ajxp_scope:shared";
-            }
-            $query = implode(" AND ", $sParts);
-            $this->logDebug("Query : $query");
-            $hits = $index->find($query);
-
-            $commitIndex = false;
-
-            if (isSet($httpVars['return_selection'])) {
-                $returnNodes = array();
-            } else {
-                AJXP_XMLWriter::header();
-            }
-            foreach ($hits as $hit) {
-                // Backward compat with old protocols
-                $hit->node_url = preg_replace("#ajxp\.[a-z_]+://#", "pydio://", $hit->node_url);
-                if ($hit->serialized_metadata!=null) {
-                    $meta = unserialize(base64_decode($hit->serialized_metadata));
-                    $tmpNode = new AJXP_Node(SystemTextEncoding::fromUTF8($hit->node_url), $meta);
-                } else {
-                    $tmpNode = new AJXP_Node(SystemTextEncoding::fromUTF8($hit->node_url), array());
-                    $tmpNode->loadNodeInfo();
-                }
-                if (!file_exists($tmpNode->getUrl())) {
-                    $index->delete($hit->id);
-                    $commitIndex = true;
-                    continue;
-                }
-                if (!is_readable($tmpNode->getUrl())){
-                    continue;
-                }
-                $basename = basename($tmpNode->getPath());
-                $isLeaf = $tmpNode->isLeaf();
-                if (!$this->accessDriver->filterNodeName($tmpNode->getPath(), $basename, $isLeaf, array("d"=>true, "f"=>true))){
-                    continue;
-                }
-                $tmpNode->search_score = sprintf("%0.2f", $hit->score);
-                if (isSet($returnNodes)) {
-                    $returnNodes[] = $tmpNode;
-                } else {
-                    AJXP_XMLWriter::renderAjxpNode($tmpNode);
-                }
-            }
-            if(!isSet($returnNodes)) AJXP_XMLWriter::close();
-            if ($commitIndex) {
-                $index->commit();
-            }
-        }
-        if(isSet($returnNodes)) return $returnNodes;
-        else return null;
-    }
-
-    /**
-     * @param AJXP_Node $parentNode
-     */
-    public function indexationStarts($parentNode){
-        $this->currentIndex = $this->loadTemporaryIndex($parentNode->getRepositoryId());
-    }
-
-    /**
-     * @param AJXP_Node $parentNode
-     */
-    public function indexationEnds($parentNode){
-        $this->logDebug('INDEX.END', 'Optimizing Index');
-        $this->currentIndex->optimize();
-        $this->logDebug('INDEX.END', 'Commiting Index');
-        $this->currentIndex->commit();
-        unset($this->currentIndex);
-        $this->logDebug('INDEX.END', 'Merging Temporary in main');
-        $this->mergeTemporaryIndexToMain($parentNode->getRepositoryId());
-        $this->logDebug('INDEX.END', 'Done');
-    }
-
-    /**
-     * @param AJXP_Node $node
-     */
-    public function indexationIndexNode($node){
-        $this->updateNodeIndex(null, $node, false, false);
-    }
-
-    public function recursiveIndexation($url)
-    {
-        //print("Indexing $url \n");
-        $this->logDebug("Indexing content of folder ".$url);
-        if (ConfService::currentContextIsCommandLine() && $this->verboseIndexation) {
-            print("Indexing content of ".$url."\n");
-        }
-        if(!ConfService::currentContextIsCommandLine()) @set_time_limit(60);
-        $handle = opendir($url);
-        if ($handle !== false) {
-            while ( ($child = readdir($handle)) != false) {
-                if($child[0] == ".") continue;
-                $newUrl = $url."/".$child;
-                if (ConfService::currentContextIsCommandLine() && $this->verboseIndexation) {
-                    print("Indexing node ".$newUrl."\n");
-                }
-                $this->logDebug("Indexing Node ".$newUrl);
-                try {
-                    $newNode = new AJXP_Node($newUrl);
-                    $this->updateNodeIndex(null, $newNode, false, true);
-                    AJXP_Controller::applyHook("node.index.add", array($newNode));
-                } catch (Exception $e) {
-                    if (ConfService::currentContextIsCommandLine() && $this->verboseIndexation) {
-                        print("Error indexing node ".$newUrl." (".$e->getMessage().") \n");
-                    }
-                    $this->logDebug("Error Indexing Node ".$newUrl." (".$e->getMessage().")");
-                }
-            }
-            closedir($handle);
-        } else {
-            $this->logDebug("Cannot open $url!!");
-        }
-    }
-
-    /**
-     * Passes the array of META_SOURCES options before creating the shared workspace.
-     * Used here to disable the repository_specific_keywords, as path is in fact already fully resolved.
-     * @param $metaOptions array
-     */
-    public function updateSharedChildOptions(&$metaOptions){
-        if(isSet($metaOptions["index.lucene"]) && isSet($metaOptions["index.lucene"]["repository_specific_keywords"])){
-            unset($metaOptions["index.lucene"]["repository_specific_keywords"]);
-        }
-    }
-
-    /**
-     * Called on workspace.after_delete event, clear the index!
-     * @param $repoId
-     */
-    public function clearWorkspaceIndexes($repoId){
-        $iPath = $this->getIndexPath($repoId);
-        $this->clearIndexIfExists($iPath);
-        $this->clearIndexIfExists($iPath."-PYDIO_TMP");
-    }
-
-    /**
-     *
-     * Hooked to node.meta_change, this will update the index
-     *
-     * @param AJXP_Node $node
-     */
-    public function updateNodeIndexMeta($node)
-    {
-        require_once("Zend/Search/Lucene.php");
-        try{
-
-            if (isSet($this->currentIndex)) {
-                $index = $this->currentIndex;
-            } else {
-                $index =  $this->loadIndex($node->getRepositoryId(), true, $node->getUser());
-            }
-            Zend_Search_Lucene_Analysis_Analyzer::setDefault( new Zend_Search_Lucene_Analysis_Analyzer_Common_TextNum_CaseInsensitive());
-
-            if (AuthService::usersEnabled() && AuthService::getLoggedUser()!=null) {
-                $term = new Zend_Search_Lucene_Index_Term(SystemTextEncoding::toUTF8($node->getUrl()), "node_url");
-                $hits = $index->termDocs($term);
-                foreach ($hits as $hitId) {
-                    $hit = $index->getDocument($hitId);
-                    if ($hit->ajxp_scope == 'shared' || ($hit->ajxp_scope == 'user' && $hit->ajxp_user == AuthService::getLoggedUser()->getId())) {
-                        $index->delete($hitId);
-                    }
-                }
-            } else {
-                $id = $this->getIndexedDocumentId($index, $node);
-                if($id != null) $index->delete($id);
-            }
-            if(file_exists($node->getUrl())){
-                $this->createIndexedDocument($node, $index);
-            }
-            $this->logDebug(__FILE__, "Indexation passed ".$node->getUrl());
-        } catch (Exception $e){
-            $this->logError(__FILE__, "Lucene indexation failed for ".$node->getUrl()." (".$e->getMessage().")");
-        }
-    }
-
-    /**
-     *
-     * Hooked to node.change, this will update the index
-     * if $oldNode = null => create node $newNode
-     * if $newNode = null => delete node $oldNode
-     * Else copy or move oldNode to newNode.
-     *
-     * @param AJXP_Node $oldNode
-     * @param AJXP_Node $newNode
-     * @param Boolean $copy
-     * @param bool $recursive
-     */
-    public function updateNodeIndex($oldNode, $newNode = null, $copy = false, $recursive = false)
-    {
-        require_once("Zend/Search/Lucene.php");
-        if (isSet($this->currentIndex)) {
-            $oldIndex = $newIndex = $this->currentIndex;
-        } else {
-            if($oldNode == null){
-                $newIndex = $oldIndex = $this->loadIndex($newNode->getRepositoryId(), true, $newNode->getUser());
-            }else if($newNode == null){
-                $oldIndex = $newIndex = $this->loadIndex($oldNode->getRepositoryId(), true, $oldNode->getUser());
-            }else{
-                $newId = $newNode->getRepositoryId();
-                $oldId = $oldNode->getRepositoryId();
-                if($newId == $oldId){
-                    $newIndex = $oldIndex = $this->loadIndex($newNode->getRepositoryId(), true, $newNode->getUser());
-                }else{
-                    $newIndex = $this->loadIndex($newNode->getRepositoryId(), true, $newNode->getUser());
-                    $oldIndex = $this->loadIndex($oldNode->getRepositoryId(), true, $oldNode->getUser());
-                }
-            }
-        }
-        $this->setDefaultAnalyzer();
-        if ($oldNode != null && $copy == false) {
-            $oldDocId = $this->getIndexedDocumentId($oldIndex, $oldNode);
-            if ($oldDocId != null) {
-                $oldIndex->delete($oldDocId);
-                if ($newNode == null) { // DELETION
-                    $childrenHits = $this->getIndexedChildrenDocuments($oldIndex, $oldNode);
-                    foreach ($childrenHits as $hit) {
-                        $oldIndex->delete($hit->id);
-                    }
-                }
-            }
-        }
-
-        if ($newNode != null) {
-            // Make sure it does not already exists anyway
-            $newDocId = $this->getIndexedDocumentId($newIndex, $newNode);
-            if ($newDocId != null) {
-                $newIndex->delete($newDocId);
-                $childrenHits = $this->getIndexedChildrenDocuments($newIndex, $newNode);
-                foreach ($childrenHits as $hit) {
-                    $newIndex->delete($hit->id);
-                }
-            }
-            $this->createIndexedDocument($newNode, $newIndex);
-            if ( $recursive && $oldNode == null && is_dir($newNode->getUrl())) {
-                $this->recursiveIndexation($newNode->getUrl());
-            }
-        }
-
-        if ($oldNode != null && $newNode != null && is_dir($newNode->getUrl()) && ($newIndex == $oldIndex)) { // Copy / Move / Rename
-            // Get old node children docs, and update them manually, no need to scan real directory
-            $childrenHits = $this->getIndexedChildrenDocuments($oldIndex, $oldNode);
-            foreach ($childrenHits as $hit) {
-                $oldChildURL = $oldIndex->getDocument($hit->id)->node_url;
-                if ($copy == false) {
-                    $oldIndex->delete($hit->id);
-                }
-                $newChildURL = str_replace(SystemTextEncoding::toUTF8($oldNode->getUrl()),
-                                           SystemTextEncoding::toUTF8($newNode->getUrl()),
-                                           $oldChildURL);
-                $newChildURL = SystemTextEncoding::fromUTF8($newChildURL);
-                $this->createIndexedDocument(new AJXP_Node($newChildURL), $oldIndex);
-            }
-        }
-
-        if (!isSet($this->currentIndex)) {
-            $oldIndex->commit();
-            if($newIndex != $oldIndex){
-                $newIndex->commit();
-            }
-        }
-    }
-
-    /**
-     * @param AJXP_Node $ajxpNode
-     * @param Zend_Search_Lucene_Interface $index
-     * @throws Exception
-     * @return Zend_Search_Lucene_Document
-     */
-    public function createIndexedDocument($ajxpNode, &$index)
-    {
-        if(!empty($this->metaFields)){
-            $ajxpNode->loadNodeInfo(false, false, "all");
-        }else{
-            $ajxpNode->loadNodeInfo();
-        }
-        $ext = strtolower(pathinfo($ajxpNode->getLabel(), PATHINFO_EXTENSION));
-        $parseContent = $this->indexContent;
-        if ($parseContent && $ajxpNode->bytesize > $this->getFilteredOption("PARSE_CONTENT_MAX_SIZE")) {
-            $parseContent = false;
-        }
-        if ($parseContent && in_array($ext, explode(",",$this->getFilteredOption("PARSE_CONTENT_HTML")))) {
-            $doc = @Zend_Search_Lucene_Document_Html::loadHTMLFile($ajxpNode->getUrl());
-        } elseif ($parseContent && $ext == "docx" && class_exists("Zend_Search_Lucene_Document_Docx")) {
-            $realFile = call_user_func(array($ajxpNode->wrapperClassName, "getRealFSReference"), $ajxpNode->getUrl());
-            $doc = @Zend_Search_Lucene_Document_Docx::loadDocxFile($realFile);
-        } elseif ($parseContent && $ext == "docx" && class_exists("Zend_Search_Lucene_Document_Pptx")) {
-            $realFile = call_user_func(array($ajxpNode->wrapperClassName, "getRealFSReference"), $ajxpNode->getUrl());
-            $doc = @Zend_Search_Lucene_Document_Pptx::loadPptxFile($realFile);
-        } elseif ($parseContent && $ext == "xlsx" && class_exists("Zend_Search_Lucene_Document_Xlsx")) {
-            $realFile = call_user_func(array($ajxpNode->wrapperClassName, "getRealFSReference"), $ajxpNode->getUrl());
-            $doc = @Zend_Search_Lucene_Document_Xlsx::loadXlsxFile($realFile);
-        } else {
-            $doc = new Zend_Search_Lucene_Document();
-        }
-        if($doc == null) throw new Exception("Could not load document");
-
-        $doc->addField(Zend_Search_Lucene_Field::Keyword("node_url", $ajxpNode->getUrl()), SystemTextEncoding::getEncoding());
-        $doc->addField(Zend_Search_Lucene_Field::Keyword("node_path", str_replace("/", "AJXPFAKESEP", $ajxpNode->getPath())), SystemTextEncoding::getEncoding());
-        $doc->addField(Zend_Search_Lucene_Field::Text("basename", basename($ajxpNode->getPath())), SystemTextEncoding::getEncoding());
-        $doc->addField(Zend_Search_Lucene_Field::Keyword("ajxp_node", "yes"), SystemTextEncoding::getEncoding());
-        $doc->addField(Zend_Search_Lucene_Field::Keyword("ajxp_scope", "shared"));
-        $doc->addField(Zend_Search_Lucene_Field::Keyword("ajxp_modiftime", date("Ymd", $ajxpNode->ajxp_modiftime)));
-        $doc->addField(Zend_Search_Lucene_Field::Keyword("ajxp_bytesize", $ajxpNode->bytesize));
-        $ajxpMime = $ajxpNode->ajxp_mime;
-        if (empty($ajxpMime)) {
-            $doc->addField(Zend_Search_Lucene_Field::Keyword("ajxp_mime", pathinfo($ajxpNode->getLabel(), PATHINFO_EXTENSION)));
-        } else {
-            $doc->addField(Zend_Search_Lucene_Field::Keyword("ajxp_mime", $ajxpNode->ajxp_mime));
-        }
-
-
-        // Store a cached copy of the metadata
-        $serializedMeta = base64_encode(serialize($ajxpNode->metadata));
-        $doc->addField(Zend_Search_Lucene_Field::Binary("serialized_metadata", $serializedMeta));
-        if (isSet($ajxpNode->indexableMetaKeys["shared"])) {
-            foreach ($ajxpNode->indexableMetaKeys["shared"] as $sharedField) {
-                if($ajxpNode->$sharedField) $doc->addField(Zend_search_Lucene_Field::keyword($sharedField, $ajxpNode->$sharedField));
-            }
-        }
-        foreach ($this->metaFields as $field) {
-            if ($ajxpNode->$field != null) {
-                $doc->addField(Zend_Search_Lucene_Field::Text("ajxp_meta_$field", $ajxpNode->$field), SystemTextEncoding::getEncoding());
-            }
-        }
-        if (isSet($ajxpNode->indexableMetaKeys["user"]) && count($ajxpNode->indexableMetaKeys["user"]) && AuthService::usersEnabled() && AuthService::getLoggedUser() != null) {
-            $privateDoc = new Zend_Search_Lucene_Document();
-            $privateDoc->addField(Zend_Search_Lucene_Field::Keyword("node_url", $ajxpNode->getUrl(), SystemTextEncoding::getEncoding()));
-            $privateDoc->addField(Zend_Search_Lucene_Field::Keyword("node_path", str_replace("/", "AJXPFAKESEP", $ajxpNode->getPath()), SystemTextEncoding::getEncoding()));
-
-            $privateDoc->addField(Zend_Search_Lucene_Field::Keyword("ajxp_scope", "user"));
-            $privateDoc->addField(Zend_Search_Lucene_Field::Keyword("ajxp_user", AuthService::getLoggedUser()->getId()));
-            foreach ($ajxpNode->indexableMetaKeys["user"] as $userField) {
-                if ($ajxpNode->$userField) {
-                    $privateDoc->addField(Zend_search_Lucene_Field::keyword($userField, $ajxpNode->$userField));
-                }
-            }
-            $privateDoc->addField(Zend_Search_Lucene_Field::Binary("serialized_metadata", $serializedMeta));
-
-            $index->addDocument($privateDoc);
-        }
-
-        if($parseContent){
-            $body = $this->extractIndexableContent($ajxpNode);
-            if(!empty($body)) $doc->addField(Zend_Search_Lucene_Field::unStored("body", $body));
-        }
-        $index->addDocument($doc);
-        return $doc;
-    }
-
-    /**
-     * @param  Zend_Search_Lucene_Interface $index
-     * @param AJXP_Node $ajxpNode
-     * @return Number
-     */
-    public function getIndexedDocumentId($index, $ajxpNode)
-    {
-        $term = new Zend_Search_Lucene_Index_Term(SystemTextEncoding::toUTF8($ajxpNode->getUrl()), "node_url");
-        $docIds = $index->termDocs($term);
-        if(!count($docIds)) return null;
-        return $docIds[0];
-    }
-
-    /**
-     * Find all existing lucene documents based on the parent url
-     * @param Zend_Search_Lucene_Interface $index
-     * @param AJXP_Node $ajxpNode
-     * @return Zend_Search_Lucene_Search_QueryHit
-     */
-    public function getIndexedChildrenDocuments($index, $ajxpNode)
-    {
-        // Try getting doc by url
-        $testQ = str_replace("/", "AJXPFAKESEP", SystemTextEncoding::toUTF8($ajxpNode->getPath()));
-        $pattern = new Zend_Search_Lucene_Index_Term($testQ .'*', 'node_path');
-        $query = new Zend_Search_Lucene_Search_Query_Wildcard($pattern);
-        $hits = $index->find($query);
-        return $hits;
-    }
-
-    /**
-     * @param $repositoryId
-     * @param null $resolveUserId
-     * @return string
-     */
-    protected function getIndexPath($repositoryId, $resolveUserId = null){
-        $mainCacheDir = (defined('AJXP_SHARED_CACHE_DIR')?AJXP_SHARED_CACHE_DIR:AJXP_CACHE_DIR);
-        if(!is_dir($mainCacheDir."/indexes")) mkdir($mainCacheDir."/indexes",0755,true);
-        $iPath = $mainCacheDir."/indexes/index-".$this->buildSpecificId($repositoryId, $resolveUserId);
-        return $iPath;
-    }
-
-    /**
-     * @param $repositoryId
-     * @return Zend_Search_Lucene_Interface
-     */
-    protected function loadTemporaryIndex($repositoryId){
-        $indexPath = $this->getIndexPath($repositoryId);
-        $tmpIndexPath = $indexPath."-PYDIO_TMP";
-        $this->clearIndexIfExists($tmpIndexPath);
-        $this->copyIndex($indexPath, $tmpIndexPath);
-        return $this->loadIndex($repositoryId, true, null, $tmpIndexPath);
-    }
-
-    /**
-     * @param String $repositoryId
-     * @param int $checkInterval
-     * @return bool
-     */
-    protected function seemsCurrentlyIndexing($repositoryId, $checkInterval){
-        $tmpIndexPath = $this->getIndexPath($repositoryId)."-PYDIO_TMP";
-        if(is_dir($tmpIndexPath)){
-            $mtime = filemtime($tmpIndexPath);
-            if(time() - $mtime <= 60 * $checkInterval){
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @param $repositoryId
-     */
-    protected function mergeTemporaryIndexToMain($repositoryId){
-        $indexPath = $this->getIndexPath($repositoryId);
-        $tmpIndexPath = $indexPath."-PYDIO_TMP";
-        $this->clearIndexIfExists($indexPath);
-        $this->moveIndex($tmpIndexPath, $indexPath);
-        $this->clearIndexIfExists($tmpIndexPath);
-    }
-
-    /**
-     * @param $folder
-     */
-    private function clearIndexIfExists($folder){
-        if(!is_dir($folder))return;
-        $content = scandir($folder);
-        foreach($content as $file){
-            if($file == "." || $file == "..") continue;
-            unlink($folder.DIRECTORY_SEPARATOR.$file);
-        }
-        rmdir($folder);
-    }
-
-    /**
-     * @param $folder1
-     * @param $folder2
-     */
-    private function copyIndex($folder1, $folder2){
-        if(!is_dir($folder1))return;
-        if(!is_dir($folder2)) mkdir($folder2, 0755);
-        $content = scandir($folder1);
-        foreach($content as $file){
-            if($file == "." || $file == "..") continue;
-            copy($folder1.DIRECTORY_SEPARATOR.$file, $folder2.DIRECTORY_SEPARATOR.$file);
-        }
-    }
-
-
-    /**
-     * @param $folder1
-     * @param $folder2
-     */
-    private function moveIndex($folder1, $folder2){
-        if(!is_dir($folder1))return;
-        if(!is_dir($folder2)) mkdir($folder2, 0755);
-        $content = scandir($folder1);
-        foreach($content as $file){
-            if($file == "." || $file == "..") continue;
-            rename($folder1.DIRECTORY_SEPARATOR.$file, $folder2.DIRECTORY_SEPARATOR.$file);
-        }
-    }
-
-
-    /**
-     *
-     * Enter description here ...
-     * @param Integer $repositoryId
-     * @param bool $create
-     * @param null $resolveUserId
-     * @param null $iPath
-     * @throws Exception
-     * @return Zend_Search_Lucene_Interface the index
-     */
-    protected function loadIndex($repositoryId, $create = true, $resolveUserId = null, $iPath = null)
-    {
-        require_once("Zend/Search/Lucene.php");
-        if($iPath == null){
-            $iPath = $this->getIndexPath($repositoryId, $resolveUserId);
-        }
-        if (is_dir($iPath)) {
-            try{
-                $index = Zend_Search_Lucene::open($iPath);
-            }catch (Zend_Search_Lucene_Exception $se){
-                $this->logError(__FUNCTION__, "Error while trying to load lucene index at path ".$iPath."! Maybe a permission issue?");
-                throw $se;
-            }
-        } else {
-            if (!$create) {
-                $messages = ConfService::getMessages();
-                throw new Exception($messages["index.lucene.9"]);
-            }
-            try{
-                $index = Zend_Search_Lucene::create($iPath);
-            }catch (Zend_Search_Lucene_Exception $se){
-                $this->logError(__FUNCTION__, "Error while trying to create lucene index at path ".$iPath."! Maybe a permission issue?");
-                throw $se;
-            }
-        }
-        return $index;
-    }
-}
diff --git a/core/src/plugins/index.lucene/manifest.xml b/core/src/plugins/index.lucene/manifest.xml
index 4120af04c3..0c6964703c 100644
--- a/core/src/plugins/index.lucene/manifest.xml
+++ b/core/src/plugins/index.lucene/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <indexer id="index.lucene" label="CONF_MESSAGE[Lucene Search Engine]" description="CONF_MESSAGE[Zend_Search_Lucene implementation to index all files and search a whole repository quickly.]"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-	<class_definition filename="plugins/index.lucene/class.AjxpLuceneIndexer.php" classname="AjxpLuceneIndexer"/>
+	<class_definition filename="plugins/index.lucene/LuceneIndexer.php" classname="Pydio\Access\Indexer\Implementation\LuceneIndexer"/>
     <client_settings>
         <resources>
             <img_library alias="lucene_images" path="plugins/index.lucene/resources/images"/>
@@ -54,11 +54,6 @@
 			</action>
 		</actions>
         <client_configs>
-            <template_part ajxpClass="AjxpTabulator" theme="vision" ajxpId="topPane" ajxpOptions='{"defaultTabId": "folders", "tabsTips":"top center", "tabInfos" : [{"id":"folders","label":"130", "title":"480","iconClass":"icon-folder-close","element":"folder_pane"},{"id":"shared","label":"363", "title":"481","iconClass":"mdi mdi-share-variant","element":"shared_elements"},{"id":"flagged","label":"147", "title":"482","iconClass":"icon-bookmark-empty","element":"flagged_elements"}],"headerToolbarOptions":{"submenuClassName":"panelHeaderMenu","submenuPosition":"bottom right","submenuOffsetTop":12,"toolbarsList":["filter","vertical_splitter2-actions"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}}'><![CDATA[
-                <div id="folder_pane" ajxpClass="FoldersTree" ajxpOptions='{"display":"dz","replaceScroller":true}' ></div>
-                <div id="shared_elements" ajxpClass="FetchedResultPane" ajxpOptions='{"nodeProviderProperties":{"get_action":"search", "query":"keyword:ajxp_shared"},"reloadOnServerMessage":"tree/reload_shared_elements","clearSelectionOnBlur":true}'></div>
-                <div id="flagged_elements" ajxpClass="FetchedResultPane" ajxpOptions='{"nodeProviderProperties":{"get_action":"search", "query":"keyword:ajxp_bookmarked"},"reloadOnServerMessage":"tree/reload_bookmarks","clearSelectionOnBlur":true}'></div>
-            ]]></template_part>
             <component_config className="AjxpReactComponent::left_navigator">
                 <additional_content
                         id="navigation_bookmarks"
diff --git a/core/src/plugins/index.lucene/resources/i18n/ca.php b/core/src/plugins/index.lucene/resources/i18n/ca.php
index 3747cf9706..410a7d6746 100644
--- a/core/src/plugins/index.lucene/resources/i18n/ca.php
+++ b/core/src/plugins/index.lucene/resources/i18n/ca.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 // catalan translation: Salva Gómez <salva.gomez at gmail.com>, 2015
 $mess = array(
diff --git a/core/src/plugins/index.lucene/resources/i18n/conf/de.php b/core/src/plugins/index.lucene/resources/i18n/conf/de.php
index 459e810969..4511d0286b 100644
--- a/core/src/plugins/index.lucene/resources/i18n/conf/de.php
+++ b/core/src/plugins/index.lucene/resources/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Lucene Search Engine" => "Lucene",
@@ -45,4 +45,4 @@
 "Automatically append a * after the user query to make the search broader" => "Den Suchbegriff des Benutzers immer mit einem * beenden.",
 "Hide 'My Shares'" => "Hide 'My Shares'",
 "Hide My Shares section in the Orbit theme GUI." => "Hide My Shares section in the Orbit theme GUI.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/index.lucene/resources/i18n/conf/en.php b/core/src/plugins/index.lucene/resources/i18n/conf/en.php
index 99c4b61280..baea48178e 100644
--- a/core/src/plugins/index.lucene/resources/i18n/conf/en.php
+++ b/core/src/plugins/index.lucene/resources/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Lucene Search Engine" => "Lucene Search Engine",
diff --git a/core/src/plugins/index.lucene/resources/i18n/conf/fr.php b/core/src/plugins/index.lucene/resources/i18n/conf/fr.php
index b1f7c66905..bc849a222a 100644
--- a/core/src/plugins/index.lucene/resources/i18n/conf/fr.php
+++ b/core/src/plugins/index.lucene/resources/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Lucene Search Engine" => "Moteur de recherche Lucene",
diff --git a/core/src/plugins/index.lucene/resources/i18n/conf/it.php b/core/src/plugins/index.lucene/resources/i18n/conf/it.php
index a8e9073462..3c8466a150 100644
--- a/core/src/plugins/index.lucene/resources/i18n/conf/it.php
+++ b/core/src/plugins/index.lucene/resources/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Lucene Search Engine" => "Motore Rierca Lucene",
@@ -45,4 +45,4 @@
 "Automatically append a * after the user query to make the search broader" => "Automatically append a * after the user query to make the search broader",
 "Hide 'My Shares'" => "Hide 'My Shares'",
 "Hide My Shares section in the Orbit theme GUI." => "Hide My Shares section in the Orbit theme GUI.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/index.lucene/resources/i18n/conf/pt.php b/core/src/plugins/index.lucene/resources/i18n/conf/pt.php
index 7ec7b4edc6..ac672d4ecf 100644
--- a/core/src/plugins/index.lucene/resources/i18n/conf/pt.php
+++ b/core/src/plugins/index.lucene/resources/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Lucene Search Engine" => "Motor de pesquisa Lucene",
diff --git a/core/src/plugins/index.lucene/resources/i18n/de.php b/core/src/plugins/index.lucene/resources/i18n/de.php
index 62e0baa62f..de7a1fff0d 100644
--- a/core/src/plugins/index.lucene/resources/i18n/de.php
+++ b/core/src/plugins/index.lucene/resources/i18n/de.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/index.lucene/resources/i18n/en.php b/core/src/plugins/index.lucene/resources/i18n/en.php
index 396c2d7e7e..d15114e69e 100644
--- a/core/src/plugins/index.lucene/resources/i18n/en.php
+++ b/core/src/plugins/index.lucene/resources/i18n/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/index.lucene/resources/i18n/es.php b/core/src/plugins/index.lucene/resources/i18n/es.php
index eeb4f4b902..4fa09de69f 100644
--- a/core/src/plugins/index.lucene/resources/i18n/es.php
+++ b/core/src/plugins/index.lucene/resources/i18n/es.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 // spanish translation: Salva Gómez <salva.gomez at gmail.com>, 2015
 $mess = array(
diff --git a/core/src/plugins/index.lucene/resources/i18n/fr.php b/core/src/plugins/index.lucene/resources/i18n/fr.php
index 62ea7d87a1..7e8d779f5f 100644
--- a/core/src/plugins/index.lucene/resources/i18n/fr.php
+++ b/core/src/plugins/index.lucene/resources/i18n/fr.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/index.lucene/resources/i18n/it.php b/core/src/plugins/index.lucene/resources/i18n/it.php
index e46eb21486..0a022a502e 100644
--- a/core/src/plugins/index.lucene/resources/i18n/it.php
+++ b/core/src/plugins/index.lucene/resources/i18n/it.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/index.lucene/resources/i18n/pt.php b/core/src/plugins/index.lucene/resources/i18n/pt.php
index 9b22e6094e..66a6abcc26 100644
--- a/core/src/plugins/index.lucene/resources/i18n/pt.php
+++ b/core/src/plugins/index.lucene/resources/i18n/pt.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/index.lucene/resources/i18n/ru.php b/core/src/plugins/index.lucene/resources/i18n/ru.php
index 741651ee25..fed22fab18 100644
--- a/core/src/plugins/index.lucene/resources/i18n/ru.php
+++ b/core/src/plugins/index.lucene/resources/i18n/ru.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 $mess = array(
diff --git a/core/src/plugins/log.sql/SqlLogDriver.php b/core/src/plugins/log.sql/SqlLogDriver.php
new file mode 100644
index 0000000000..a0075d83ff
--- /dev/null
+++ b/core/src/plugins/log.sql/SqlLogDriver.php
@@ -0,0 +1,775 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Log\Implementation;
+
+use DateTime;
+use dibi;
+use DibiDateTime;
+use DibiException;
+use Exception;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Utils\DBHelper;
+use Pydio\Core\Utils\FileHelper;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\OptionsHelper;
+use Pydio\Core\Utils\Vars\PathUtils;
+use Pydio\Core\PluginFramework\SqlTableProvider;
+use Pydio\Log\Core\AbstractLogDriver;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * SQL Logging Plugin
+ * Requires php bcmath (for inet_dtop/inet_ptod) enabled and php version 5.1 (for DateTime class) minimum
+ * @package AjaXplorer_Plugins
+ * @subpackage Log
+ */
+class SqlLogDriver extends AbstractLogDriver implements SqlTableProvider
+{
+    /**
+     * @var array
+     */
+    private $sqlDriver;
+    private $queries;
+
+    /**
+     * Initialize the driver.
+     *
+     * Gives the driver a chance to set up it's connection / file resource etc..
+     *
+     * @param ContextInterface $ctx
+     * @param array $options
+     * @throws \Pydio\Core\Exception\DBConnectionException
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        parent::init($ctx, $options);
+        $this->sqlDriver = OptionsHelper::cleanDibiDriverParameters($options["SQL_DRIVER"]);
+        try {
+            if (!dibi::isConnected()) {
+                dibi::connect($this->sqlDriver);
+            }
+        } catch (DibiException $e) {
+            throw new \Pydio\Core\Exception\DBConnectionException();
+        }
+        $this->queries = FileHelper::loadSerialFile($this->getBaseDir() . "/queries.json", false, "json");
+    }
+
+    public function performChecks()
+    {
+        if (!isSet($this->options)) return;
+        $test = OptionsHelper::cleanDibiDriverParameters($this->options["SQL_DRIVER"]);
+        if (!count($test)) {
+            throw new Exception("Please define an SQL connexion in the core configuration");
+        }
+    }
+
+    /**
+     * Find users last connections from log table
+     * @param array $userIds
+     * @return array
+     */
+    public function usersLastConnection($userIds)
+    {
+        $res = dibi::query("SELECT [user], MAX([logdate]) AS date_max FROM [ajxp_log] WHERE [user] IN (%s) GROUP BY [user]", $userIds);
+        $all = $res->fetchPairs("user", "date_max");
+        return $all;
+    }
+
+    /**
+     * @param $actionName
+     * @param $httpVars
+     * @param $fileVars
+     */
+    public function exposeQueries($actionName, &$httpVars, &$fileVars)
+    {
+
+        header('Content-type: application/json');
+        echo json_encode($this->queries);
+
+    }
+
+    /**
+     * @param $queryName
+     * @return bool
+     */
+    private function getQuery($queryName)
+    {
+        foreach ($this->queries as $q) {
+            if (isset($q["NAME"]) && $q["NAME"] == $queryName) return $q;
+        }
+        return false;
+    }
+
+    /**
+     * @param $queryName
+     * @param $start
+     * @param $count
+     * @param string $frequency
+     * @param array $additionalFilters
+     * @return array|\DibiRow[]
+     * @throws Exception
+     */
+    protected function processOneQuery($queryName, $start, $count, $frequency = "auto", $additionalFilters = array())
+    {
+
+        $query = $this->getQuery($queryName);
+        if ($query === false) {
+            throw new Exception("Cannot find query " . $queryName);
+        }
+        $pg = ($this->sqlDriver["driver"] == "postgre");
+
+        $mess = LocaleService::getMessages();
+
+        $format = 'Y-m-d 00:00:00';
+        $endFormat = 'Y-m-d 23:59:59';
+        $dKeyFormat = $mess["date_relative_date_format"];
+        $ref = time();
+        $last = $start + $count;
+        $startDate = date($format, strtotime("-$last day", $ref));
+        $endDate = date($endFormat, strtotime("-$start day", $ref));
+        $dateCursor = "logdate > '$startDate' AND logdate <= '$endDate'";
+        foreach ($additionalFilters as $filterField => $filterValue) {
+            $comparator = (strpos($filterValue, "%") !== false ? "LIKE" : "=");
+            $dateCursor .= " AND [" . InputFilter::sanitize($filterField, InputFilter::SANITIZE_ALPHANUM) . "] $comparator '" . InputFilter::sanitize($filterValue, InputFilter::SANITIZE_EMAILCHARS) . "'";
+        }
+
+        $q = $query["SQL"];
+        $q = str_replace("AJXP_CURSOR_DATE", $dateCursor, $q);
+        if ($pg) {
+            $q = str_replace("ORDER BY logdate DESC", "ORDER BY DATE(logdate) DESC", $q);
+        }
+
+        //$q .= " LIMIT $start, $count";
+        $res = dibi::query($q);
+        $all = $res->fetchAll();
+        $allDates = array();
+
+        if (isSet($query["AXIS"]) && $query["AXIS"]["x"] == "Date") {
+            if ($frequency == "auto") {
+                if ($count > 70) $frequency = "month";
+                else if ($count > 21) $frequency = "week";
+            }
+            $groupedSums = array();
+            if ($frequency == "week") {
+                $groupByFormat = "W";
+            } else if ($frequency == "month") {
+                $groupByFormat = "n";
+            }
+        }
+
+        foreach ($all as $row => &$data) {
+            // PG: Recapitalize keys
+            if ($pg) {
+                $newData = array();
+                foreach ($data as $k => $v) {
+                    $newData[ucfirst($k)] = $v;
+                }
+                $data = $newData;
+            }
+            if (isSet($data["File"])) {
+                $data["File"] = PathUtils::forwardSlashBasename($data["File"]);
+            }
+            if (isSet($data["Date"])) {
+                if ($data["Date"] instanceof DibiDateTime) {
+                    $tStamp = $data["Date"]->getTimestamp();
+                } else {
+                    $tStamp = strtotime($data["Date"]);
+                }
+                $key = date($dKeyFormat, $tStamp);
+                $data["Date_sortable"] = $tStamp;
+                $data["Date"] = $key;
+                $allDates[$key] = true;
+                if (isSet($groupByFormat)) {
+                    $newKey = date($groupByFormat, $tStamp);
+                    if (!isSet($groupedSums[$newKey])) {
+                        $groupedSums[$newKey] = $data;
+                    } else {
+                        $valueKey = $query["AXIS"]["y"];
+                        $groupedSums[$newKey][$valueKey] += $data[$valueKey];
+                    }
+                }
+            }
+        }
+
+        if (isSet($query["AXIS"]) && $query["AXIS"]["x"] == "Date") {
+            for ($i = 0; $i < $count; $i++) {
+                $dateCurs = $start + $i;
+                $timeDate = strtotime("-$dateCurs day", $ref);
+                $dateK = date($dKeyFormat, $timeDate);
+                if (isSet($groupByFormat)) {
+                    $newKey = date($groupByFormat, $timeDate);
+                    if (!isSet($groupedSums[$newKey])) {
+                        array_push($all, array("Date" => $dateK, "Date_sortable" => $timeDate));
+                    }
+                } else {
+                    if (!isSet($allDates[$dateK])) {
+                        array_push($all, array("Date" => $dateK, "Date_sortable" => $timeDate));
+                    }
+                }
+            }
+        }
+
+        if (isSet($query["FIGURE"]) && isSet($all[0][$query["FIGURE"]])) {
+            $f = $all[0][$query["FIGURE"]];
+            if ($f > 1000) $f = number_format($f / 1000, 1, ".", " ") . 'K';
+            $all[0] = array($query["FIGURE"] => $f);
+        }
+
+        if (isSet($groupByFormat) && isSet($groupedSums)) {
+            return array_values($groupedSums);
+        } else {
+            return $all;
+        }
+
+    }
+
+    /**
+     * @param $actionName
+     * @param $httpVars
+     * @param $fileVars
+     * @throws Exception
+     */
+    public function processQuery($actionName, &$httpVars, &$fileVars)
+    {
+
+        session_write_close();
+        $query_name = $httpVars["query_name"];
+        $start = 0;
+        $count = 30;
+        $frequency = (isSet($httpVars["frequency"]) ? InputFilter::sanitize($httpVars["frequency"], InputFilter::SANITIZE_ALPHANUM) : "auto");
+        if (isSet($httpVars["start"])) $start = intval($httpVars["start"]);
+        if (isSet($httpVars["count"])) $count = intval($httpVars["count"]);
+        $additionalFilters = array();
+        if (isSet($httpVars["user"])) $additionalFilters["user"] = InputFilter::sanitize($httpVars["user"], InputFilter::SANITIZE_EMAILCHARS);
+        if (isSet($httpVars["ws_id"])) $additionalFilters["repository_id"] = InputFilter::sanitize($httpVars["ws_id"], InputFilter::SANITIZE_ALPHANUM);
+        if (isSet($httpVars["filename_filter"])) {
+            $additionalFilters["basename"] = str_replace("*", "%", InputFilter::sanitize($httpVars["filename_filter"], InputFilter::SANITIZE_FILENAME));
+        }
+        if (isSet($httpVars["dirname_filter"])) {
+            $additionalFilters["dirname"] = str_replace("*", "%", InputFilter::sanitize($httpVars["dirname_filter"], InputFilter::SANITIZE_DIRNAME));
+        }
+
+
+        $queries = explode(",", $query_name);
+        $meta = array();
+        if (count($queries) == 1) {
+            $qName = InputFilter::sanitize($query_name, InputFilter::SANITIZE_ALPHANUM);
+            $all = $this->processOneQuery($qName, $start, $count, $frequency, $additionalFilters);
+            $qDef = $this->getQuery($qName);
+            if ($qDef !== false && isSet($qDef['AXIS'])) {
+                unset($qDef["SQL"]);
+                $meta[$qName] = $qDef;
+            }
+        } else {
+            $all = array();
+            foreach ($queries as $qName) {
+                $qName = InputFilter::sanitize($qName, InputFilter::SANITIZE_ALPHANUM);
+                $all[$qName] = $this->processOneQuery($qName, $start, $count, $frequency, $additionalFilters);
+                $qDef = $this->getQuery($qName);
+                if ($qDef !== false && isSet($qDef['AXIS'])) {
+                    unset($qDef["SQL"]);
+                    $meta[$qName] = $qDef;
+                }
+            }
+        }
+
+        //$qry = "SELECT FOUND_ROWS() AS NbRows";
+        //$res = dibi::query($qry);
+        $total_count = 1000; //$res->fetchSingle();
+
+        header('Content-type: application/json');
+        $links = array();
+
+        if ($start > $count) {
+            $links[] = array('rel' => 'first', 'cursor' => 0, 'count' => $count);
+        }
+        if ($start > 0) {
+            $prev = max(0, $start - $count);
+            $links[] = array('rel' => 'previous', 'cursor' => $prev, 'count' => $count);
+        }
+        if ($start < $total_count) {
+            $next = $start + $count;
+            $links[] = array('rel' => 'next', 'cursor' => $next, 'count' => $count);
+        }
+        if ($start < $total_count - $count) {
+            $last = $total_count - ($total_count % $count);
+            //$links[] = array('rel' => 'last', 'cursor' => $last, 'count' => $count);
+        }
+        $hLinks = array();
+        foreach ($links as $link) {
+            $hLinks[] = '<http://localhost/api/ajxp_conf/analytic_query/' . $query_name . '/' . $link["cursor"] . '/' . $link["cursor"] . '>; rel="' . $link["rel"] . '"';
+        }
+        header('Link: ' . implode(",", $hLinks));
+
+        $envelope = array("links" => $links, "data" => $all, "meta" => $meta);
+        echo json_encode($envelope);
+
+    }
+
+
+    /**
+     * Format a table row into an xml list of nodes for the log treeview
+     *
+     * @param String $node Name of the xml node
+     * @param String $icon Icon to use for the list item
+     * @param String $dateattrib
+     * @param String $display
+     * @param String $text Text displayed in the listview but not the treeview.
+     * @param String $filename
+     * @param Integer $is_file 0|1 to indicate whether this list item is a file or not.
+     *
+     * @return String Formatted XML node for insertion into the treeview.
+     */
+    public function formatXmlLogList($node, $icon, $dateattrib, $display, $text, $filename, $is_file = 0)
+    {
+        return "<$node icon=\"{$icon}\" date=\"{$dateattrib}\" display=\"{$display}\" text=\"{$text}\" is_file=\"{$is_file}\" filename=\"{$filename}\"/>";
+    }
+
+    /**
+     * Format a table row into an xml list of nodes for the log reader
+     *
+     * @param String $node Name of the xml node
+     * @param String $icon Icon to use for the list item
+     * @param String $dateattrib
+     * @param String $filename Source of the list, usually a filename
+     * @param String $remote_ip Client IP that was logged
+     * @param String $log_level Log level of the item
+     * @param String $user User who was logged in
+     * @param $source
+     * @param String $action The action the user performed.
+     * @param String $params Parameters to the action
+     * @param string $rootPath
+     * @param null $rowId
+     * @return String Formatted XML node for insertion into the log reader
+     *
+     */
+    public function formatXmlLogItem($node, $icon, $dateattrib, $filename, $remote_ip, $log_level, $user, $source, $action, $params, $rootPath = "/logs", $rowId = null)
+    {
+        $remote_ip = $this->inet_dtop($remote_ip);
+        $log_unixtime = strtotime($dateattrib);
+        $log_datetime = date("m-d-y", $log_unixtime) . " " . date("G:i:s", $log_unixtime);
+        $log_year = date('Y', $log_unixtime);
+        $log_month = date('m', $log_unixtime);
+        $log_date = date("m-d-y", $log_unixtime);
+
+        $meta = [
+            "icon" => $icon,
+            "date" => $log_datetime,
+            "ajxp_modiftime" => $log_unixtime,
+            "is_file" => true,
+            "filename" => "{$rootPath}/{$log_year}/{$log_month}/{$log_date}/{$log_datetime}",
+            "ajxp_mime" => "log",
+            "ip" => $remote_ip,
+            "level" => $log_level,
+            "user" => $user,
+            "action" => $action,
+            "source" => $source,
+            "params" => $params
+        ];
+        if($rowId !== null){
+            $meta["cursor"] = $rowId;
+        }
+
+        return $meta;
+
+    }
+
+    /**
+     * Write an entry to the log.
+     *
+     * @param String $level Log severity: one of LOG_LEVEL_* (DEBUG,INFO,NOTICE,WARNING,ERROR)
+     * @param String $ip The client ip
+     * @param String $user The user login
+     * @param String $repositoryId current repository ID
+     * @param String $source The source of the message
+     * @param String $prefix The prefix of the message
+     * @param String $message The message to log
+     * @param array $nodesPathes
+     */
+    public function write2($level, $ip, $user, $repositoryId, $source, $prefix, $message, $nodesPathes = array())
+    {
+        if ($prefix == "Log In" && $message == "context=API") {
+            // Limit the number of logs
+            $test = dibi::query('SELECT [logdate] FROM [ajxp_log] WHERE [user]=%s AND [message]=%s AND [params]=%s ORDER BY [logdate] DESC %lmt %ofs', $user, $prefix, $message, 1, 0);
+            $lastInsert = $test->fetchSingle();
+            $now = new DateTime('NOW');
+            if ($lastInsert instanceof DibiDateTime) {
+                $lastTimestamp = $lastInsert->getTimestamp();
+            } else {
+                $lastTimestamp = strtotime($lastInsert);
+            }
+            if ($lastInsert !== false && $now->getTimestamp() - $lastTimestamp < 60 * 60) {
+                // IGNORING, LIMIT API LOGINS TO ONE PER HOUR, OR IT WILL FILL THE LOGS
+                return;
+            }
+        }
+        $files = array(array("dirname" => "", "basename" => ""));
+        if (InputFilter::detectXSS($message)) {
+            $message = "XSS Detected in Message!";
+        } else if (count($nodesPathes)) {
+            $files = array();
+            foreach ($nodesPathes as $path) {
+                $parts = pathinfo($path);
+                $files[] = array("dirname" => $parts["dirname"], "basename" => $parts["basename"]);
+            }
+        }
+        foreach ($files as $fileDef) {
+            $log_row = Array(
+                'logdate' => new DateTime('NOW'),
+                'remote_ip' => $this->inet_ptod($ip),
+                'severity' => strtoupper((string)$level),
+                'user' => $user,
+                'source' => $source,
+                'message' => $prefix,
+                'params' => $message,
+                'repository_id' => $repositoryId,
+                'device' => $_SERVER['HTTP_USER_AGENT'],
+                'dirname' => $fileDef["dirname"],
+                'basename' => $fileDef["basename"]
+            );
+            //we already handle exception for write2 in core.log
+            dibi::query('INSERT INTO [ajxp_log]', $log_row);
+        }
+    }
+
+    /**
+     * List available log files in XML
+     *
+     * @param string $nodeName
+     * @param null $year
+     * @param null $month
+     * @param string $rootPath
+     * @return array|\String[]
+     * @throws DibiException
+     * @throws PydioException
+     * @internal param bool $print
+     */
+    public function listLogFiles($nodeName = "file", $year = null, $month = null, $rootPath = "/logs")
+    {
+        $data = array();
+
+        switch ($this->sqlDriver["driver"]) {
+            case "sqlite":
+            case "sqlite3":
+                $yFunc = "strftime('%Y', [logdate])";
+                $mFunc = "strftime('%m', [logdate])";
+                $dFunc = "date([logdate])";
+                break;
+            case "mysqli":
+            case "mysql":
+                $yFunc = "YEAR([logdate])";
+                $mFunc = "MONTH([logdate])";
+                $dFunc = "DATE([logdate])";
+                break;
+            case "postgre":
+                $yFunc = "EXTRACT(YEAR FROM [logdate])";
+                $mFunc = "EXTRACT(MONTH FROM [logdate])";
+                $dFunc = "DATE([logdate])";
+                break;
+            default:
+                throw new PydioException("ERROR!, DB driver " . $this->sqlDriver["driver"] . " not supported yet in __FUNCTION__");
+        }
+
+        try {
+            if ($month != null) { // Get days
+
+                //cal_days_in_month(CAL_GREGORIAN, $month, $year)
+                $start_time = mktime(0, 0, 0, $month, 1, $year);
+                $end_time = mktime(0, 0, 0, $month + 1, 1, $year);
+
+                $q = 'SELECT
+                    DISTINCT ' . $dFunc . ' AS logdate
+                    FROM [ajxp_log]
+                    WHERE [logdate] >= %t AND [logdate] < %t';
+                $result = dibi::query($q, $start_time, $end_time);
+
+                foreach ($result as $r) {
+                    $log_time = strtotime($r['logdate']);
+
+                    $fullYear = date('Y', $log_time);
+                    $logM = date('m', $log_time);
+                    $date = $r['logdate'];
+                    if ($date instanceof DibiDateTime) {
+                        $date = $date->format("Y-m-d");
+                    }
+                    $key = "$rootPath/$fullYear/$logM/$date";
+                    $data[$key] = [
+                        "icon"              => "toggle_log.png",
+                        "date"              => $date,
+                        "is_file"           => false,
+                        "ajxp_mime"         => "datagrid",
+                        "grid_datasource"   => "get_action=ls&dir=" . urlencode($key),
+                        "grid_header_title" => "Application Logs for $date",
+                        "grid_actions"      => "refresh,filter,copy_as_text"
+                    ];
+                }
+
+            } else if ($year != null) { // Get months
+                $year_start_time = mktime(0, 0, 0, 1, 1, $year);
+                $year_end_time = mktime(0, 0, 0, 1, 1, $year + 1);
+
+                $q = 'SELECT
+                    DISTINCT ' . $yFunc . ' AS year,
+                    ' . $mFunc . ' AS month
+                    FROM [ajxp_log]
+                    WHERE [logdate] >= %t AND [logdate] < %t';
+                $result = dibi::query($q, $year_start_time, $year_end_time);
+
+                foreach ($result as $r) {
+                    /* We always recreate a unix timestamp while looping because it provides us with a uniform way to format the date.
+                     * The month returned by the database will not be zero-padded and causes problems down the track when DateTime zero pads things */
+                    $month_time = mktime(0, 0, 0, $r['month'], 1, $r['year']);
+
+                    $fullYear = date('Y', $month_time);
+                    $logMDisplay = date('F', $month_time);
+                    $logM = date('m', $month_time);
+
+                    //"<$node icon=\"{$icon}\" date=\"{$dateattrib}\" display=\"{$display}\" text=\"{$text}\" is_file=\"{$is_file}\" filename=\"{$filename}\"/>";
+                    //$data[$r['month']] = $this->formatXmlLogList($nodeName, 'x-office-calendar.png', $logM, $logMDisplay, $logMDisplay, "$rootPath/$fullYear/$logM");
+                    $key = "$rootPath/$fullYear/$logM";
+                    $data[$key] = [
+                        "icon"      => "x-office-calendar.png",
+                        "text"      => $logMDisplay,
+                        "date"      => $logM,
+                        "display"   => $logMDisplay,
+                        "is_file"   => false
+                    ];
+
+                }
+
+            } else {
+
+                // Append Analytics Node
+                $data[$rootPath . "/0000_all_analytics"] = [
+                    "icon" => "graphs_viewer/ICON_SIZE/analytics.png",
+                    "ajxp_mime" => "ajxp_graphs",
+                    "is_file"   => true,
+                    "text"      => "Analytics Dashboard"
+                ];
+
+                // Get years
+                $q = 'SELECT
+                    DISTINCT ' . $yFunc . ' AS year
+                    FROM [ajxp_log]';
+                $result = dibi::query($q);
+
+                foreach ($result as $r) {
+                    $fullYear = $r['year'];
+                    $nodeKey = "$rootPath/$fullYear";
+                    $data[$nodeKey] = [
+                        "icon"      => "x-office-calendar.png",
+                        "text"      => $fullYear,
+                        "date"      => $fullYear,
+                        "display"   => $fullYear,
+                        "is_file"   => false
+                    ];
+
+                }
+            }
+        } catch (DibiException $e) {
+            throw $e;
+        }
+
+        return $data;
+    }
+
+    /**
+     * List log contents in XML
+     *
+     * @param $parentDir
+     * @param String $date Assumed to be m-d-y format.
+     * @param string $nodeName
+     * @param string $rootPath
+     * @param int $cursor
+     * @return \array[]
+     */
+    public function listLogs($parentDir, $date, $nodeName = "log", $rootPath = "/logs", $cursor = -1)
+    {
+        $start_time = strtotime($date);
+        $end_time = mktime(0, 0, 0, date('m', $start_time), date('d', $start_time) + 1, date('Y', $start_time));
+        $logs = [];
+
+        try {
+            if ($cursor != -1) {
+                $q = 'SELECT * FROM [ajxp_log] WHERE [id] > %i ORDER BY [logdate] DESC';
+                $result = dibi::query($q, $cursor);
+            } else {
+                $q = 'SELECT * FROM [ajxp_log] WHERE [logdate] BETWEEN %t AND %t ORDER BY [logdate] DESC';
+                $result = dibi::query($q, $start_time, $end_time);
+            }
+            $currentCount = 1;
+            foreach ($result as $r) {
+
+                if (isSet($buffer) && $buffer["user"] == $r["user"] && $buffer["message"] == $r["message"] && $buffer["params"] == $r["params"]) {
+                    $currentCount++;
+                    continue;
+                }
+                if (isSet($buffer)) {
+                    $meta = $this->formatXmlLogItem(
+                        $nodeName,
+                        'toggle_log.png',
+                        $buffer['logdate'],
+                        $date,
+                        $buffer['remote_ip'],
+                        $buffer['severity'],
+                        $buffer['user'],
+                        $buffer['source'],
+                        $buffer['message'] . ($currentCount > 1 ? " (" . $currentCount . ")" : ""),
+                        $buffer['params'],
+                        $rootPath,
+                        $buffer['id']
+                    );
+                    $logs[$meta["filename"]] = $meta;
+                }
+                $meta = $this->formatXmlLogItem(
+                    $nodeName,
+                    'toggle_log.png',
+                    $r['logdate'],
+                    $date,
+                    $r['remote_ip'],
+                    $r['severity'],
+                    $r['user'],
+                    $r['source'],
+                    $r['message'],
+                    $r['params'],
+                    $rootPath,
+                    $r['id']
+                );
+                $logs[$meta["filename"]] = $meta;
+
+                $currentCount = 1;
+                $buffer = $r;
+
+            }
+
+        } catch (DibiException $e) {
+            //echo get_class($e), ': ', $e->getMessage(), "\n";
+        }
+        return $logs;
+    }
+
+    // IPV4/6 <--> DEC Lovingly lifted from stackoverflow, credit to Sander Marechal
+    // Requires bcmath
+
+    /**
+     * Convert an IP address from presentation to decimal(39,0) format suitable for storage in MySQL
+     *
+     * @param string $ip_address An IP address in IPv4, IPv6 or decimal notation
+     * @return string The IP address in decimal notation
+     */
+    public function inet_ptod($ip_address)
+    {
+        return $ip_address;
+        /*
+        // IPv4 address
+        if (strpos($ip_address, ':') === false && strpos($ip_address, '.') !== false) {
+            $ip_address = '::' . $ip_address;
+        }
+
+        // IPv6 address
+        if (strpos($ip_address, ':') !== false) {
+            $network = inet_pton($ip_address);
+            $parts = unpack('N*', $network);
+
+            foreach ($parts as &$part) {
+                    if ($part < 0) {
+                            $part = bcadd((string) $part, '4294967296');
+                    }
+
+                    if (!is_string($part)) {
+                            $part = (string) $part;
+                    }
+            }
+
+            $decimal = $parts[4];
+            $decimal = bcadd($decimal, bcmul($parts[3], '4294967296'));
+            $decimal = bcadd($decimal, bcmul($parts[2], '18446744073709551616'));
+            $decimal = bcadd($decimal, bcmul($parts[1], '79228162514264337593543950336'));
+
+            return $decimal;
+        }
+
+        // Decimal address
+        return $ip_address;
+        */
+    }
+
+    /**
+     * Convert an IP address from decimal format to presentation format
+     *
+     * @param string $decimal An IP address in IPv4, IPv6 or decimal notation
+     * @return string The IP address in presentation format
+     */
+    public function inet_dtop($decimal)
+    {
+        return $decimal;
+        /*
+        // IPv4 or IPv6 format
+        if (strpos($decimal, ':') !== false || strpos($decimal, '.') !== false) {
+            return $decimal;
+        }
+
+        // Decimal format
+        $parts = array();
+        $parts[1] = bcdiv($decimal, '79228162514264337593543950336', 0);
+        $decimal = bcsub($decimal, bcmul($parts[1], '79228162514264337593543950336'));
+        $parts[2] = bcdiv($decimal, '18446744073709551616', 0);
+        $decimal = bcsub($decimal, bcmul($parts[2], '18446744073709551616'));
+        $parts[3] = bcdiv($decimal, '4294967296', 0);
+        $decimal = bcsub($decimal, bcmul($parts[3], '4294967296'));
+        $parts[4] = $decimal;
+
+        foreach ($parts as &$part) {
+            if (bccomp($part, '2147483647') == 1) {
+                    $part = bcsub($part, '4294967296');
+            }
+
+            $part = (int) $part;
+        }
+
+        $network = pack('N4', $parts[1], $parts[2], $parts[3], $parts[4]);
+        $ip_address = inet_ntop($network);
+
+        // Turn IPv6 to IPv4 if it's IPv4
+        if (preg_match('/^::\d+.\d+.\d+.\d+$/', $ip_address)) {
+            return substr($ip_address, 2);
+        }
+
+        return $ip_address;
+        */
+    }
+
+    /**
+     * @param array $param
+     * @return string
+     * @throws Exception
+     */
+    public function installSQLTables($param)
+    {
+        $p = OptionsHelper::cleanDibiDriverParameters($param["SQL_DRIVER"]);
+        return DBHelper::runCreateTablesQuery($p, $this->getBaseDir() . "/create.sql");
+    }
+
+}
diff --git a/core/src/plugins/log.sql/class.sqlLogDriver.php b/core/src/plugins/log.sql/class.sqlLogDriver.php
deleted file mode 100644
index 3a6e3e08b8..0000000000
--- a/core/src/plugins/log.sql/class.sqlLogDriver.php
+++ /dev/null
@@ -1,697 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * SQL Logging Plugin
- * Requires php bcmath (for inet_dtop/inet_ptod) enabled and php version 5.1 (for DateTime class) minimum
- * @package AjaXplorer_Plugins
- * @subpackage Log
- */
-class sqlLogDriver extends AbstractLogDriver implements SqlTableProvider
-{
-    /**
-     * @var Array
-     */
-    private $sqlDriver;
-    private $queries;
-
-    /**
-     * Initialize the driver.
-     *
-     * Gives the driver a chance to set up it's connection / file resource etc..
-     *
-     * @param Array $options array of options specific to the logger driver.
-     * @access public
-     */
-    public function init($options)
-    {
-        parent::init($options);
-        $this->sqlDriver = AJXP_Utils::cleanDibiDriverParameters($options["SQL_DRIVER"]);
-        try {
-            if(!dibi::isConnected()) {
-                dibi::connect($this->sqlDriver);
-            }
-        } catch (DibiException $e) {
-            echo get_class($e), ': ', $e->getMessage(), "\n";
-            exit(1);
-        }
-        $this->queries = AJXP_Utils::loadSerialFile($this->getBaseDir()."/queries.json", false, "json");
-    }
-
-    public function performChecks()
-    {
-        if(!isSet($this->options)) return;
-        $test = AJXP_Utils::cleanDibiDriverParameters($this->options["SQL_DRIVER"]);
-        if (!count($test)) {
-            throw new Exception("Please define an SQL connexion in the core configuration");
-        }
-    }
-
-    public function usersLastConnection($userIds){
-        $res = dibi::query("SELECT [user], MAX([logdate]) AS date_max FROM [ajxp_log] WHERE [user] IN (%s) GROUP BY [user]", $userIds);
-        $all = $res->fetchPairs("user", "date_max");
-        return $all;
-    }
-
-    public function exposeQueries($actionName, &$httpVars, &$fileVars){
-
-        header('Content-type: application/json');
-        echo json_encode($this->queries);
-
-    }
-
-    private function getQuery($queryName){
-        foreach($this->queries as $q){
-            if(isset($q["NAME"]) && $q["NAME"] == $queryName) return $q;
-        }
-        return false;
-    }
-
-    protected function processOneQuery($queryName, $start, $count, $frequency="auto", $additionalFilters=array()){
-
-        $query = $this->getQuery($queryName);
-        if($query === false){
-            throw new Exception("Cannot find query ".$queryName);
-        }
-        $pg = ($this->sqlDriver["driver"] == "postgre");
-
-        $mess = ConfService::getMessages();
-
-        $format = 'Y-m-d 00:00:00';
-        $endFormat = 'Y-m-d 23:59:59';
-        $dKeyFormat = $mess["date_relative_date_format"];
-        $ref = time();
-        $last = $start + $count;
-        $startDate = date($format, strtotime("-$last day", $ref));
-        $endDate =  date($endFormat, strtotime("-$start day", $ref));
-        $dateCursor = "logdate > '$startDate' AND logdate <= '$endDate'";
-        foreach($additionalFilters as $filterField => $filterValue){
-            $comparator = (strpos($filterValue, "%") !== false ? "LIKE" : "=");
-            $dateCursor .= " AND [".AJXP_Utils::sanitize($filterField, AJXP_SANITIZE_ALPHANUM)."] $comparator '".AJXP_Utils::sanitize($filterValue, AJXP_SANITIZE_EMAILCHARS)."'";
-        }
-
-        $q = $query["SQL"];
-        $q = str_replace("AJXP_CURSOR_DATE", $dateCursor, $q);
-        if($pg){
-            $q = str_replace("ORDER BY logdate DESC", "ORDER BY DATE(logdate) DESC",$q);
-        }
-
-        //$q .= " LIMIT $start, $count";
-        $res = dibi::query($q);
-        $all = $res->fetchAll();
-        $allDates = array();
-
-        if(isSet($query["AXIS"]) && $query["AXIS"]["x"] == "Date"){
-            if($frequency == "auto"){
-                if($count > 70) $frequency = "month";
-                else if($count > 21) $frequency = "week";
-            }
-            $groupedSums = array();
-            if($frequency == "week"){
-                $groupByFormat = "W";
-            } else if ($frequency == "month"){
-                $groupByFormat = "n";
-            }
-        }
-
-        foreach($all as $row => &$data){
-            // PG: Recapitalize keys
-            if($pg){
-                $newData = array();
-                foreach($data as $k => $v){
-                    $newData[ucfirst($k)] = $v;
-                }
-                $data = $newData;
-            }
-            if(isSet($data["File"])){
-                $data["File"] = AJXP_Utils::safeBasename($data["File"]);
-            }
-            if(isSet($data["Date"])){
-                if(is_a($data["Date"], "DibiDateTime")){
-                    $tStamp = $data["Date"]->getTimestamp();
-                }else {
-                    $tStamp = strtotime($data["Date"]);
-                }
-                $key = date($dKeyFormat, $tStamp);
-                $data["Date_sortable"] = $tStamp;
-                $data["Date"] = $key;
-                $allDates[$key] = true;
-                if(isSet($groupByFormat)){
-                    $newKey = date($groupByFormat, $tStamp);
-                    if(!isSet($groupedSums[$newKey])){
-                        $groupedSums[$newKey] = $data;
-                    }else{
-                        $valueKey = $query["AXIS"]["y"];
-                        $groupedSums[$newKey][$valueKey] += $data[$valueKey];
-                    }
-                }
-            }
-        }
-
-        if(isSet($query["AXIS"]) && $query["AXIS"]["x"] == "Date"){
-            for($i = 0;$i<$count;$i++){
-                $dateCurs = $start + $i;
-                $timeDate = strtotime("-$dateCurs day", $ref);
-                $dateK = date($dKeyFormat, $timeDate);
-                if(isSet($groupByFormat)){
-                    $newKey = date($groupByFormat, $timeDate);
-                    if(!isSet($groupedSums[$newKey])){
-                        array_push($all, array("Date" => $dateK, "Date_sortable" => $timeDate));
-                    }
-                }else{
-                    if(!isSet($allDates[$dateK])){
-                        array_push($all, array("Date" => $dateK, "Date_sortable" => $timeDate));
-                    }
-                }
-            }
-        }
-
-        if(isSet($query["FIGURE"]) && isSet($all[0][$query["FIGURE"]])){
-            $f = $all[0][$query["FIGURE"]];
-            if($f > 1000) $f = number_format($f / 1000, 1, ".", " ") . 'K';
-            $all[0] = array($query["FIGURE"] => $f);
-        }
-
-        if(isSet($groupByFormat) && isSet($groupedSums)){
-            return array_values($groupedSums);
-        }else{
-            return $all;
-        }
-
-    }
-
-    public function processQuery($actionName, &$httpVars, &$fileVars){
-
-        session_write_close();
-        $query_name = $httpVars["query_name"];
-        $start = 0;
-        $count = 30;
-        $frequency = (isSet($httpVars["frequency"])?AJXP_Utils::sanitize($httpVars["frequency"], AJXP_SANITIZE_ALPHANUM):"auto");
-        if(isSet($httpVars["start"])) $start = intval($httpVars["start"]);
-        if(isSet($httpVars["count"])) $count = intval($httpVars["count"]);
-        $additionalFilters = array();
-        if(isSet($httpVars["user"])) $additionalFilters["user"] = AJXP_Utils::sanitize($httpVars["user"], AJXP_SANITIZE_EMAILCHARS);
-        if(isSet($httpVars["ws_id"])) $additionalFilters["repository_id"] = AJXP_Utils::sanitize($httpVars["ws_id"], AJXP_SANITIZE_ALPHANUM);
-        if(isSet($httpVars["filename_filter"])){
-            $additionalFilters["basename"] = str_replace("*", "%", AJXP_Utils::sanitize($httpVars["filename_filter"], AJXP_SANITIZE_FILENAME));
-        }
-        if(isSet($httpVars["dirname_filter"])){
-            $additionalFilters["dirname"] = str_replace("*", "%", AJXP_Utils::sanitize($httpVars["dirname_filter"], AJXP_SANITIZE_DIRNAME));
-        }
-
-
-        $queries = explode(",", $query_name);
-        $meta = array();
-        if(count($queries) == 1){
-            $qName = AJXP_Utils::sanitize($query_name, AJXP_SANITIZE_ALPHANUM);
-            $all = $this->processOneQuery($qName, $start, $count, $frequency, $additionalFilters);
-            $qDef = $this->getQuery($qName);
-            if($qDef !== false && isSet($qDef['AXIS'])) {
-                unset($qDef["SQL"]);
-                $meta[$qName] = $qDef;
-            }
-        }else{
-            $all = array();
-            foreach($queries as $qName){
-                $qName = AJXP_Utils::sanitize($qName, AJXP_SANITIZE_ALPHANUM);
-                $all[$qName] = $this->processOneQuery($qName, $start, $count, $frequency, $additionalFilters);
-                $qDef = $this->getQuery($qName);
-                if($qDef !== false && isSet($qDef['AXIS'])) {
-                    unset($qDef["SQL"]);
-                    $meta[$qName] = $qDef;
-                }
-            }
-        }
-
-        //$qry = "SELECT FOUND_ROWS() AS NbRows";
-        //$res = dibi::query($qry);
-        $total_count = 1000; //$res->fetchSingle();
-
-        header('Content-type: application/json');
-        $links = array();
-
-        if($start > $count){
-            $links[] = array('rel' => 'first', 'cursor' => 0, 'count' => $count);
-        }
-        if($start > 0){
-            $prev = max(0,  $start - $count);
-            $links[] = array('rel' => 'previous', 'cursor' => $prev, 'count' => $count);
-        }
-        if($start < $total_count){
-            $next = $start + $count;
-            $links[] = array('rel' => 'next', 'cursor' => $next, 'count' => $count);
-        }
-        if($start < $total_count - $count){
-            $last = $total_count - ($total_count % $count);
-            //$links[] = array('rel' => 'last', 'cursor' => $last, 'count' => $count);
-        }
-        $hLinks = array();
-        foreach($links as $link){
-            $hLinks[] = '<http://localhost/api/ajxp_conf/analytic_query/'.$query_name.'/'.$link["cursor"].'/'.$link["cursor"].'>; rel="'.$link["rel"].'"';
-        }
-        header('Link: '.implode(",", $hLinks));
-
-        $envelope = array("links" => $links, "data" => $all, "meta" => $meta);
-        echo json_encode($envelope);
-
-    }
-
-
-    /**
-     * Format a table row into an xml list of nodes for the log treeview
-     *
-     * @param String $node Name of the xml node
-     * @param String $icon Icon to use for the list item
-     * @param String $dateattrib
-     * @param String $display
-     * @param String $text Text displayed in the listview but not the treeview.
-     * @param String $filename
-     * @param Integer $is_file 0|1 to indicate whether this list item is a file or not.
-     *
-     * @return String Formatted XML node for insertion into the treeview.
-     */
-    public function formatXmlLogList($node, $icon, $dateattrib, $display, $text, $filename, $is_file = 0)
-    {
-        return "<$node icon=\"{$icon}\" date=\"{$dateattrib}\" display=\"{$display}\" text=\"{$text}\" is_file=\"{$is_file}\" filename=\"{$filename}\"/>";
-    }
-
-    /**
-     * Format a table row into an xml list of nodes for the log reader
-     *
-     * @param String $node Name of the xml node
-     * @param String $icon Icon to use for the list item
-     * @param String $dateattrib
-     * @param String $filename Source of the list, usually a filename
-     * @param String $remote_ip Client IP that was logged
-     * @param String $log_level Log level of the item
-     * @param String $user User who was logged in
-     * @param $source
-     * @param String $action The action the user performed.
-     * @param String $params Parameters to the action
-     * @param string $rootPath
-     * @param null $rowId
-     * @return String Formatted XML node for insertion into the log reader
-     *
-     */
-    public function formatXmlLogItem($node, $icon, $dateattrib, $filename, $remote_ip, $log_level, $user, $source, $action, $params, $rootPath = "/logs", $rowId=null)
-    {
-        $remote_ip = $this->inet_dtop($remote_ip);
-        $log_unixtime = strtotime($dateattrib);
-        $log_datetime = date("m-d-y", $log_unixtime) . " " . date("G:i:s", $log_unixtime);
-        $log_year = date('Y', $log_unixtime);
-        $log_month = date('m', $log_unixtime);
-        $log_date = date("m-d-y", $log_unixtime);
-
-        // Some actions or parameters can contain characters that need to be encoded, especially when a piece of code raises a notification or error.
-        $action = AJXP_Utils::xmlEntities($action);
-        $params = AJXP_Utils::xmlEntities($params);
-        $source = AJXP_Utils::xmlEntities($source);
-        $rowIdString = "";
-        if($rowId !== null){
-            $rowIdString = "cursor=\"{$rowId}\"";
-        }
-
-        return "<$node $rowIdString icon=\"{$icon}\" date=\"{$log_datetime}\" ajxp_modiftime=\"{$log_unixtime}\" is_file=\"true\" filename=\"{$rootPath}/{$log_year}/{$log_month}/{$log_date}/{$log_datetime}\" ajxp_mime=\"log\" ip=\"{$remote_ip}\" level=\"{$log_level}\" user=\"{$user}\" action=\"{$action}\" source=\"{$source}\" params=\"{$params}\"/>";
-    }
-
-    /**
-     * Write an entry to the log.
-     *
-     * @param String $level Log severity: one of LOG_LEVEL_* (DEBUG,INFO,NOTICE,WARNING,ERROR)
-     * @param String $ip The client ip
-     * @param String $user The user login
-     * @param String $source The source of the message
-     * @param String $prefix The prefix of the message
-     * @param String $message The message to log
-     * @param array $nodesPathes
-     */
-    public function write2($level, $ip, $user, $source, $prefix, $message, $nodesPathes = array())
-    {
-        if($prefix == "Log In" && $message=="context=API"){
-            // Limit the number of logs
-            $test = dibi::query('SELECT [logdate] FROM [ajxp_log] WHERE [user]=%s AND [message]=%s AND [params]=%s ORDER BY [logdate] DESC %lmt %ofs', $user, $prefix, $message, 1, 0);
-            $lastInsert = $test->fetchSingle();
-            $now = new DateTime('NOW');
-            if(is_a($lastInsert, "DibiDateTime")){
-                $lastTimestamp = $lastInsert->getTimestamp();
-            }else{
-                $lastTimestamp = strtotime($lastInsert);
-            }
-            if($lastInsert !== false && $now->getTimestamp() - $lastTimestamp < 60 * 60){
-                // IGNORING, LIMIT API LOGINS TO ONE PER HOUR, OR IT WILL FILL THE LOGS
-                return;
-            }
-        }
-        $files = array(array("dirname"=>"", "basename"=>""));
-        if(AJXP_Utils::detectXSS($message)){
-            $message = "XSS Detected in Message!";
-        }else if(count($nodesPathes)){
-            $files = array();
-            foreach($nodesPathes as $path){
-                $parts = pathinfo($path);
-                $files[] = array("dirname"=>$parts["dirname"], "basename"=>$parts["basename"]);
-            }
-        }
-        foreach($files as $fileDef){
-            $log_row = Array(
-                'logdate'       => new DateTime('NOW'),
-                'remote_ip'     => $this->inet_ptod($ip),
-                'severity'      => strtoupper((string) $level),
-                'user'          => $user,
-                'source'        => $source,
-                'message'       => $prefix,
-                'params'        => $message,
-                'repository_id' => ConfService::getInstance()->getContextRepositoryId(),
-                'device'        => $_SERVER['HTTP_USER_AGENT'],
-                'dirname'       => $fileDef["dirname"],
-                'basename'      => $fileDef["basename"]
-            );
-            //we already handle exception for write2 in core.log
-            dibi::query('INSERT INTO [ajxp_log]', $log_row);
-        }
-    }
-
-    /**
-     * List available log files in XML
-     *
-     * @param String [optional] $nodeName
-     * @param String [optional] $year
-     * @param String [optional] $month
-     */
-    public function xmlListLogFiles($nodeName="file", $year=null, $month=null, $rootPath = "/logs", $print = true)
-    {
-        $xml_strings = array();
-
-        switch ($this->sqlDriver["driver"]) {
-            case "sqlite":
-            case "sqlite3":
-                $yFunc = "strftime('%Y', [logdate])";
-                $mFunc = "strftime('%m', [logdate])";
-                $dFunc = "date([logdate])";
-                break;
-            case "mysqli":
-            case "mysql":
-                $yFunc = "YEAR([logdate])";
-                $mFunc = "MONTH([logdate])";
-                $dFunc = "DATE([logdate])";
-                break;
-            case "postgre":
-                $yFunc = "EXTRACT(YEAR FROM [logdate])";
-                $mFunc = "EXTRACT(MONTH FROM [logdate])";
-                $dFunc = "DATE([logdate])";
-                break;
-            default:
-                echo "ERROR!, DB driver "+ $this->sqlDriver["driver"] +" not supported yet in __FUNCTION__";
-                exit(1);
-        }
-
-        try {
-            if ($month != null) { // Get days
-
-                //cal_days_in_month(CAL_GREGORIAN, $month, $year)
-                $start_time = mktime(0,0,0,$month,1,$year);
-                $end_time = mktime(0,0,0,$month+1,1,$year);
-
-                $q = 'SELECT
-                    DISTINCT '.$dFunc.' AS logdate
-                    FROM [ajxp_log]
-                    WHERE [logdate] >= %t AND [logdate] < %t';
-                $result = dibi::query($q, $start_time, $end_time);
-
-                foreach ($result as $r) {
-                    $log_time = strtotime($r['logdate']);
-
-                    $fullYear = date('Y', $log_time);
-                    $fullMonth = date('F', $log_time);
-                    $logM = date('m', $log_time);
-                    $date = $r['logdate'];
-                    if (is_a($date, "DibiDateTime")) {
-                        $date = $date->format("Y-m-d");
-                    }
-                    $path = "$rootPath/$fullYear/$logM/$date";
-                    $metadata = array(
-                        "icon" => "toggle_log.png",
-                        "date"=> $date,
-                        "ajxp_mime"         => "datagrid",
-                        "grid_datasource"   => "get_action=ls&dir=".urlencode($path),
-                        "grid_header_title" => "Application Logs for $date",
-                        "grid_actions"      => "refresh,filter,copy_as_text"
-                    );
-                    $xml_strings[$date] = AJXP_XMLWriter::renderNode($path, $date, true, $metadata, true, false);
-                }
-
-            } else if ($year != null) { // Get months
-                $year_start_time = mktime(0,0,0,1,1,$year);
-                $year_end_time = mktime(0,0,0,1,1,$year+1);
-
-                $q = 'SELECT
-                    DISTINCT '.$yFunc.' AS year,
-                    '.$mFunc.' AS month
-                    FROM [ajxp_log]
-                    WHERE [logdate] >= %t AND [logdate] < %t';
-                $result = dibi::query($q, $year_start_time, $year_end_time);
-
-                foreach ($result as $r) {
-                    /* We always recreate a unix timestamp while looping because it provides us with a uniform way to format the date.
-                     * The month returned by the database will not be zero-padded and causes problems down the track when DateTime zero pads things */
-                    $month_time = mktime(0,0,0,$r['month'],1,$r['year']);
-
-                    $fullYear = date('Y', $month_time);
-                    $fullMonth = date('F', $month_time);
-                    $logMDisplay = date('F', $month_time);
-                    $logM = date('m', $month_time);
-
-                    $xml_strings[$r['month']] = $this->formatXmlLogList($nodeName, 'x-office-calendar.png', $logM, $logMDisplay, $logMDisplay, "$rootPath/$fullYear/$logM");
-                    //"<$nodeName icon=\"x-office-calendar.png\" date=\"$fullMonth\" display=\"$logM\" text=\"$fullMonth\" is_file=\"0\" filename=\"/logs/$fullYear/$fullMonth\"/>";
-                }
-
-            } else {
-
-                // Append Analytics Node
-                $xml_strings['0000'] = AJXP_XMLWriter::renderNode($rootPath."/all_analytics",
-                    "Analytics Dashboard",
-                    true,
-                    array(
-                        "icon"      => "graphs_viewer/ICON_SIZE/analytics.png",
-                        "ajxp_mime" => "ajxp_graphs",
-                    ),
-                    true,
-                    false
-                );
-
-
-                // Get years
-                $q = 'SELECT
-                    DISTINCT '.$yFunc.' AS year
-                    FROM [ajxp_log]';
-                $result = dibi::query($q);
-
-                foreach ($result as $r) {
-                    $year_time = mktime(0,0,0,1,1,$r['year']);
-                    $fullYear = $r['year'];
-
-                    $xml_strings[$r['year']] = $this->formatXmlLogList($nodeName, 'x-office-calendar.png', $fullYear, $fullYear, $fullYear, "$rootPath/$fullYear");
-                    //"<$nodeName icon=\"x-office-calendar.png\" date=\"$fullYear\" display=\"$fullYear\" text=\"$fullYear\" is_file=\"0\" filename=\"/logs/$fullYear\"/>";
-                }
-            }
-        } catch (DibiException $e) {
-            echo get_class($e), ': ', $e->getMessage(), "\n";
-            exit(1);
-        }
-
-        if ($print) {
-            foreach ($xml_strings as $s) {
-                print($s);
-            }
-        }
-
-        return $xml_strings ;
-    }
-
-    /**
-     * List log contents in XML
-     *
-     * @param String $date Assumed to be m-d-y format.
-     * @param String [optional] $nodeName
-     */
-    public function xmlLogs($parentDir, $date, $nodeName = "log", $rootPath = "/logs", $cursor = -1)
-    {
-        $start_time = strtotime($date);
-        $end_time = mktime(0,0,0,date('m', $start_time), date('d', $start_time) + 1, date('Y', $start_time));
-
-        try {
-            if($cursor != -1){
-                $q = 'SELECT * FROM [ajxp_log] WHERE [id] > %i ORDER BY [logdate] DESC';
-                $result = dibi::query($q, $cursor);
-            }else{
-                $q = 'SELECT * FROM [ajxp_log] WHERE [logdate] BETWEEN %t AND %t ORDER BY [logdate] DESC';
-                $result = dibi::query($q, $start_time, $end_time);
-            }
-            $log_items = "";
-            $currentCount = 1;
-            foreach ($result as $r) {
-
-                if(isSet($buffer) && $buffer["user"] == $r["user"] && $buffer["message"] == $r["message"] && $buffer["params"] == $r["params"]){
-                    $currentCount ++;
-                    continue;
-                }
-                if(isSet($buffer)){
-                    $log_items .= SystemTextEncoding::toUTF8($this->formatXmlLogItem(
-                        $nodeName,
-                        'toggle_log.png',
-                        $buffer['logdate'],
-                        $date,
-                        $buffer['remote_ip'],
-                        $buffer['severity'],
-                        $buffer['user'],
-                        $buffer['source'],
-                        $buffer['message'].($currentCount > 1?" (".$currentCount.")":""),
-                        $buffer['params'],
-                        $rootPath,
-                        $buffer['id']
-                        )
-                    );
-                }
-                $log_items .= SystemTextEncoding::toUTF8($this->formatXmlLogItem(
-                    $nodeName,
-                    'toggle_log.png',
-                    $r['logdate'],
-                    $date,
-                    $r['remote_ip'],
-                    $r['severity'],
-                    $r['user'],
-                    $r['source'],
-                    $r['message'],
-                    $r['params'],
-                    $rootPath,
-                    $r['id'])
-                    );
-
-                $currentCount = 1;
-
-                $buffer = $r;
-
-            }
-
-            print($log_items);
-
-        } catch (DibiException $e) {
-            echo get_class($e), ': ', $e->getMessage(), "\n";
-            exit(1);
-        }
-    }
-
-    // IPV4/6 <--> DEC Lovingly lifted from stackoverflow, credit to Sander Marechal
-    // Requires bcmath
-
-    /**
-     * Convert an IP address from presentation to decimal(39,0) format suitable for storage in MySQL
-     *
-     * @param string $ip_address An IP address in IPv4, IPv6 or decimal notation
-     * @return string The IP address in decimal notation
-     */
-    public function inet_ptod($ip_address)
-    {
-        return $ip_address;
-        // IPv4 address
-        if (strpos($ip_address, ':') === false && strpos($ip_address, '.') !== false) {
-            $ip_address = '::' . $ip_address;
-        }
-
-        // IPv6 address
-        if (strpos($ip_address, ':') !== false) {
-            $network = inet_pton($ip_address);
-            $parts = unpack('N*', $network);
-
-            foreach ($parts as &$part) {
-                    if ($part < 0) {
-                            $part = bcadd((string) $part, '4294967296');
-                    }
-
-                    if (!is_string($part)) {
-                            $part = (string) $part;
-                    }
-            }
-
-            $decimal = $parts[4];
-            $decimal = bcadd($decimal, bcmul($parts[3], '4294967296'));
-            $decimal = bcadd($decimal, bcmul($parts[2], '18446744073709551616'));
-            $decimal = bcadd($decimal, bcmul($parts[1], '79228162514264337593543950336'));
-
-            return $decimal;
-        }
-
-        // Decimal address
-        return $ip_address;
-    }
-
-    /**
-     * Convert an IP address from decimal format to presentation format
-     *
-     * @param string $decimal An IP address in IPv4, IPv6 or decimal notation
-     * @return string The IP address in presentation format
-     */
-    public function inet_dtop($decimal)
-    {
-        return $decimal;
-        // IPv4 or IPv6 format
-        if (strpos($decimal, ':') !== false || strpos($decimal, '.') !== false) {
-            return $decimal;
-        }
-
-        // Decimal format
-        $parts = array();
-        $parts[1] = bcdiv($decimal, '79228162514264337593543950336', 0);
-        $decimal = bcsub($decimal, bcmul($parts[1], '79228162514264337593543950336'));
-        $parts[2] = bcdiv($decimal, '18446744073709551616', 0);
-        $decimal = bcsub($decimal, bcmul($parts[2], '18446744073709551616'));
-        $parts[3] = bcdiv($decimal, '4294967296', 0);
-        $decimal = bcsub($decimal, bcmul($parts[3], '4294967296'));
-        $parts[4] = $decimal;
-
-        foreach ($parts as &$part) {
-            if (bccomp($part, '2147483647') == 1) {
-                    $part = bcsub($part, '4294967296');
-            }
-
-            $part = (int) $part;
-        }
-
-        $network = pack('N4', $parts[1], $parts[2], $parts[3], $parts[4]);
-        $ip_address = inet_ntop($network);
-
-        // Turn IPv6 to IPv4 if it's IPv4
-        if (preg_match('/^::\d+.\d+.\d+.\d+$/', $ip_address)) {
-            return substr($ip_address, 2);
-        }
-
-        return $ip_address;
-    }
-
-    public function installSQLTables($param)
-    {
-        $p = AJXP_Utils::cleanDibiDriverParameters($param["SQL_DRIVER"]);
-        return AJXP_Utils::runCreateTablesQuery($p, $this->getBaseDir()."/create.sql");
-    }
-
-}
diff --git a/core/src/plugins/log.sql/i18n/conf/de.php b/core/src/plugins/log.sql/i18n/conf/de.php
index 0cc7cd496b..e9c07dcc3b 100644
--- a/core/src/plugins/log.sql/i18n/conf/de.php
+++ b/core/src/plugins/log.sql/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "DB Storage" => "Datenbank",
diff --git a/core/src/plugins/log.sql/i18n/conf/en.php b/core/src/plugins/log.sql/i18n/conf/en.php
index 4b2c566636..d6e24a8ddf 100644
--- a/core/src/plugins/log.sql/i18n/conf/en.php
+++ b/core/src/plugins/log.sql/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "DB Storage" => "DB Storage",
diff --git a/core/src/plugins/log.sql/i18n/conf/fr.php b/core/src/plugins/log.sql/i18n/conf/fr.php
index dd95a1d94b..d6a9d1c5b3 100644
--- a/core/src/plugins/log.sql/i18n/conf/fr.php
+++ b/core/src/plugins/log.sql/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "DB Storage" => "Logs en BDD",
diff --git a/core/src/plugins/log.sql/i18n/conf/it.php b/core/src/plugins/log.sql/i18n/conf/it.php
index c47416003c..5a867e0177 100644
--- a/core/src/plugins/log.sql/i18n/conf/it.php
+++ b/core/src/plugins/log.sql/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "DB Storage" => "Memoria DB",
diff --git a/core/src/plugins/log.sql/i18n/conf/pt.php b/core/src/plugins/log.sql/i18n/conf/pt.php
index 38a97f16d9..2ff0939adf 100644
--- a/core/src/plugins/log.sql/i18n/conf/pt.php
+++ b/core/src/plugins/log.sql/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "DB Storage" => "Armazenamento da BD",
diff --git a/core/src/plugins/log.sql/manifest.xml b/core/src/plugins/log.sql/manifest.xml
index 93b3e71c44..c20222466f 100644
--- a/core/src/plugins/log.sql/manifest.xml
+++ b/core/src/plugins/log.sql/manifest.xml
@@ -29,5 +29,5 @@
             </action>
         </actions>
     </registry_contributions>
-	<class_definition filename="plugins/log.sql/class.sqlLogDriver.php" classname="sqlLogDriver"/>
+	<class_definition filename="plugins/log.sql/SqlLogDriver.php" classname="Pydio\Log\Implementation\SqlLogDriver"/>
 </logdriver>
diff --git a/core/src/plugins/log.sql/queries.json b/core/src/plugins/log.sql/queries.json
index 152022ee31..4410698ad2 100644
--- a/core/src/plugins/log.sql/queries.json
+++ b/core/src/plugins/log.sql/queries.json
@@ -52,7 +52,7 @@
       "order":"Date_sortable"
     },
       "DIAGRAM":"bar",
-    "SQL":"SELECT DATE( logdate )AS Date, COUNT( DISTINCT ajxp_log.user ) AS Connections FROM ajxp_log WHERE ajxp_log.user IN ( SELECT DISTINCT login FROM ajxp_user_rights WHERE severity =  \"INFO\" AND login NOT IN ( SELECT DISTINCT login  FROM ajxp_user_rights WHERE repo_uuid = \"ajxp.parent_user\" ) )  AND AJXP_CURSOR_DATE GROUP BY DATE( logdate )  ORDER BY logdate DESC "
+    "SQL":"SELECT DATE( logdate )AS Date, COUNT( DISTINCT ajxp_log.user ) AS Connections FROM ajxp_log WHERE ajxp_log.user IN ( SELECT DISTINCT login FROM ajxp_user_rights WHERE severity =  \"INFO\" AND login NOT IN ( SELECT DISTINCT login  FROM ajxp_user_rights WHERE repo_uuid = \"ajxp.parent_user\" ) )  AND AJXP_CURSOR_DATE GROUP BY DATE( logdate )  ORDER BY DATE(logdate) DESC "
   },
   {
     "NAME":"connections_per_day",
@@ -63,7 +63,7 @@
       "order":"Date_sortable"
     },
       "DIAGRAM":"bar",
-    "SQL":"SELECT DATE( logdate )AS Date, COUNT( DISTINCT id ) AS Connections FROM ajxp_log WHERE ajxp_log.user IN ( SELECT DISTINCT login FROM ajxp_user_rights WHERE severity =  \"INFO\" AND login NOT IN (SELECT DISTINCT login FROM ajxp_user_rights WHERE repo_uuid = \"ajxp.parent_user\" ) ) AND AJXP_CURSOR_DATE AND (params LIKE  \"Log In%\" OR message LIKE  \"Log In%\" ) AND ( params LIKE \"%WebUI%\" ) GROUP BY DATE( logdate )  ORDER BY logdate DESC"
+    "SQL":"SELECT DATE( logdate )AS Date, COUNT( DISTINCT id ) AS Connections FROM ajxp_log WHERE ajxp_log.user IN ( SELECT DISTINCT login FROM ajxp_user_rights WHERE severity =  \"INFO\" AND login NOT IN (SELECT DISTINCT login FROM ajxp_user_rights WHERE repo_uuid = \"ajxp.parent_user\" ) ) AND AJXP_CURSOR_DATE AND (params LIKE  \"Log In%\" OR message LIKE  \"Log In%\" ) AND ( params LIKE \"%WebUI%\" ) GROUP BY DATE( logdate )  ORDER BY DATE(logdate) DESC"
   },
     {
         "SEPARATOR":true,
@@ -78,7 +78,7 @@
        "order":"Date_sortable"
     },
       "DIAGRAM":"bar",
-    "SQL":"SELECT DATE(logdate) AS Date, COUNT(distinct id) AS Downloads FROM ajxp_log WHERE severity = \"INFO\" AND (params like \"Download%\" OR message like \"Download%\" ) AND AJXP_CURSOR_DATE GROUP BY DATE(logdate)  ORDER BY logdate DESC"
+    "SQL":"SELECT DATE(logdate) AS Date, COUNT(distinct id) AS Downloads FROM ajxp_log WHERE severity = \"INFO\" AND (params like \"Download%\" OR message like \"Download%\" ) AND AJXP_CURSOR_DATE GROUP BY DATE(logdate)  ORDER BY DATE(logdate) DESC"
   },
   {
     "NAME":"uploads_per_day",
@@ -89,7 +89,7 @@
       "order":"Date_sortable"
     },
       "DIAGRAM":"bar",
-    "SQL":"SELECT DATE(logdate) AS Date, COUNT(distinct id) AS Uploads FROM ajxp_log WHERE severity = \"INFO\" AND (message like \"Upload%\" OR message like \"Upload%\") AND AJXP_CURSOR_DATE GROUP BY DATE(logdate)  ORDER BY logdate DESC"
+    "SQL":"SELECT DATE(logdate) AS Date, COUNT(distinct id) AS Uploads FROM ajxp_log WHERE severity = \"INFO\" AND (message like \"Upload%\" OR message like \"Upload%\") AND AJXP_CURSOR_DATE GROUP BY DATE(logdate)  ORDER BY DATE(logdate) DESC"
   },
   {
     "NAME":"sharedfiles_per_day",
@@ -100,7 +100,7 @@
       "order":"Date_sortable"
     },
       "DIAGRAM":"bar",
-    "SQL":"SELECT DATE( logdate )AS Date, COUNT( DISTINCT id ) AS Shares FROM ajxp_log WHERE severity = \"INFO\" AND AJXP_CURSOR_DATE AND ajxp_log.user IN ( SELECT DISTINCT login FROM ajxp_user_rights  WHERE login NOT IN ( SELECT DISTINCT login FROM ajxp_user_rights WHERE repo_uuid = \"ajxp.parent_user\" ) ) AND (params LIKE \"New Share%\" OR message LIKE \"New Share%\" ) GROUP BY DATE( logdate )  ORDER BY logdate DESC"
+    "SQL":"SELECT DATE( logdate )AS Date, COUNT( DISTINCT id ) AS Shares FROM ajxp_log WHERE severity = \"INFO\" AND AJXP_CURSOR_DATE AND ajxp_log.user IN ( SELECT DISTINCT login FROM ajxp_user_rights  WHERE login NOT IN ( SELECT DISTINCT login FROM ajxp_user_rights WHERE repo_uuid = \"ajxp.parent_user\" ) ) AND (params LIKE \"New Share%\" OR message LIKE \"New Share%\" ) GROUP BY DATE( logdate )  ORDER BY DATE(logdate) DESC"
   },
     {
         "NAME":"most_downloaded",
@@ -112,4 +112,4 @@
         "DIAGRAM": "pie",
         "SQL":"SELECT SUBSTR(params,7) AS File, COUNT( 1 ) AS Downloaded FROM ajxp_log WHERE severity = \"INFO\" AND (params LIKE \"Download%\" OR message LIKE \"Download%\" ) AND AJXP_CURSOR_DATE GROUP BY params ORDER BY COUNT( 1 ) DESC LIMIT 20"
     }
-]
\ No newline at end of file
+]
diff --git a/core/src/plugins/log.syslog/SysLogDriver.php b/core/src/plugins/log.syslog/SysLogDriver.php
new file mode 100644
index 0000000000..2ef57913c0
--- /dev/null
+++ b/core/src/plugins/log.syslog/SysLogDriver.php
@@ -0,0 +1,220 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Log\Implementation;
+
+use Pydio\Core\Model\ContextInterface;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Standard logger. Writes logs into text files
+ * @package AjaXplorer_Plugins
+ * @subpackage Log
+ */
+class SysLogDriver extends TextLogDriver
+{
+    /**
+     * @var Integer File handle to currently open log file.
+     */
+    public $fileHandle = false;
+
+    /**
+     * @var array stack of log messages to be written when file becomes available.
+     */
+    public $stack;
+
+    /**
+     * @var String identifer
+     */
+    public $signature;
+
+    /**
+     * Close file handle on objects destructor.
+     */
+    public function __destruct()
+    {
+        if ($this->fileHandle !== false) {
+            $this->close();
+        }
+        parent::__destruct();
+    }
+
+    /**
+     * If the plugin is cloned, make sure to renew the $fileHandle
+     */
+    public function __clone()
+    {
+        $this->close();
+        $this->open();
+        parent::__clone();
+    }
+
+    /**
+     * Initialise storage: check and/or make log folder and file.
+     */
+    public function initStorage()
+    {
+        $this->open();
+    }
+
+    /**
+     * Open log file for append, and flush out buffered messages to the file.
+     */
+    public function open()
+    {
+        $this->fileHandle = openlog($this->signature, LOG_ODELAY | LOG_PID, LOG_LOCAL0);
+        if ($this->fileHandle !== false && count($this->stack)) {
+            $this->stackFlush();
+        }
+    }
+
+    /**
+     * Initialise the text log driver.
+     *
+     * Sets the user defined options.
+     * Makes sure that the folder and file exist, and makes them if they don't.
+     *
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        parent::init($ctx, $options);
+        $this->stack = array();
+        $this->fileHandle = false;
+
+        $this->signature = $this->options["IDENTIFIER"];
+
+        $this->initStorage();
+
+    }
+
+    /**
+     * Write text to the log file.
+     *
+     * If write is not allowed because the file is not yet open, the message is buffered until
+     * file becomes available.
+     *
+     * @param String $level Log severity: one of LOG_LEVEL_* (DEBUG,INFO,NOTICE,WARNING,ERROR)
+     * @param String $ip The client ip
+     * @param String $user The user login
+     * @param String $repositoryId current repository ID
+     * @param String $source The source of the message
+     * @param String $prefix The prefix of the message
+     * @param String $message The message to log
+     * @param array $nodePathes
+     */
+    public function write2($level, $ip, $user, $repositoryId, $source, $prefix, $message, $nodePathes = array())
+    {
+        //syslog already take care of timestamp and log severity
+        $textMessage = "$ip\t$user\t$source\t$prefix\t$message";
+
+        switch ($level) {
+            case LOG_LEVEL_DEBUG:
+                $sysLevel = LOG_DEBUG;
+                break;
+            case LOG_LEVEL_INFO:
+                $sysLevel = LOG_INFO;
+                break;
+            case LOG_LEVEL_NOTICE:
+                $sysLevel = LOG_NOTICE;
+                break;
+            case LOG_LEVEL_WARNING:
+                $sysLevel = LOG_WARNING;
+                break;
+            case LOG_LEVEL_ERROR:
+                $sysLevel = LOG_ERR;
+                break;
+            default:
+                $sysLevel = LOG_LEVEL_INFO;
+                break;
+        }
+
+
+        if ($this->fileHandle !== false) {
+
+            if (count($this->stack)) $this->stackFlush();
+            syslog($sysLevel, $textMessage);
+
+        } else {
+            $this->stack[] = array($sysLevel, $textMessage);
+        }
+
+    }
+
+    /**
+     * Flush the stack/buffer of messages that couldn't be written earlier.
+     *
+     */
+    public function stackFlush()
+    {
+        // Flush stack for messages that could have been written before the file opening.
+        foreach ($this->stack as $message) {
+            syslog($message[0], $message[1]);
+        }
+        $this->stack = array();
+    }
+
+    /**
+     * closes the handle to the log file
+     *
+     * @access public
+     */
+    public function close()
+    {
+        if ($this->fileHandle) closelog();
+    }
+
+    /**
+     * List available logs in XML format.
+     *
+     * This method prints the response.
+     *
+     * @param String $nodeName Name of the XML node to use as response.
+     * @param Integer $year The year to list.
+     * @param Integer $month The month to list.
+     * @param string $rootPath
+     * @return null
+     * @internal param bool $print
+     */
+    public function listLogFiles($nodeName = "file", $year = null, $month = null, $rootPath = "/logs")
+    {
+        return ["$rootPath/see" => [
+            "date" => "", "icon" => "", "display" => "Logs are not readable via this GUI, they are sent directly to your system logger daemon.",
+            "text" => "Logs are not readable via this GUI, they are sent directly to your system logger daemon.", "is_file" => 1, "filename" => "$rootPath/see"
+        ]];
+    }
+
+    /**
+     * Get a log in XML format.
+     *
+     * @param $parentDir
+     * @param String $date Date in m-d-y format.
+     * @param String $nodeName The name of the node to use for each log item.
+     * @param string $rootPath
+     * @param int $cursor
+     * @return null
+     */
+    public function listLogs($parentDir, $date, $nodeName = "log", $rootPath = "/logs", $cursor = -1)
+    {
+    }
+}
diff --git a/core/src/plugins/log.syslog/class.sysLogDriver.php b/core/src/plugins/log.syslog/class.sysLogDriver.php
deleted file mode 100644
index 7667707647..0000000000
--- a/core/src/plugins/log.syslog/class.sysLogDriver.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Standard logger. Writes logs into text files
- * @package AjaXplorer_Plugins
- * @subpackage Log
- */
-class sysLogDriver extends textLogDriver
-{
-    /**
-     * @var Integer File handle to currently open log file.
-     */
-    public $fileHandle = false;
-
-    /**
-     * @var Array stack of log messages to be written when file becomes available.
-     */
-    public $stack;
-
-    /**
-     * @var String identifer
-     */
-    public $signature;
-
-    /**
-     * Close file handle on objects destructor.
-     */
-    public function __destruct()
-    {
-        if ($this->fileHandle !== false) {
-            $this->close();
-        }
-    }
-
-    /**
-     * If the plugin is cloned, make sure to renew the $fileHandle
-     */
-    public function __clone() {
-        $this->close();
-        $this->open();
-    }
-
-    /**
-     * Initialise storage: check and/or make log folder and file.
-     */
-    public function initStorage()
-    {
-        $this->open();
-    }
-
-    /**
-     * Open log file for append, and flush out buffered messages to the file.
-     */
-    public function open()
-    {
-        $this->fileHandle = openlog($this->signature, LOG_ODELAY | LOG_PID, LOG_LOCAL0 );
-        if ($this->fileHandle !== false && count($this->stack)) {
-            $this->stackFlush();
-        }
-    }
-
-    /**
-     * Initialise the text log driver.
-     *
-     * Sets the user defined options.
-     * Makes sure that the folder and file exist, and makes them if they don't.
-     *
-     * @param Array $options array of options specific to the logger driver.
-     * @access public
-     * @return null
-     */
-    public function init($options)
-    {
-        parent::init($options);
-        $this->severityDescription = 0;
-        $this->stack = array();
-        $this->fileHandle = false;
-
-        $this->signature = $this->options["IDENTIFIER"];
-
-        $this->initStorage();
-
-    }
-
-    /**
-     * Write text to the log file.
-     *
-     * If write is not allowed because the file is not yet open, the message is buffered until
-     * file becomes available.
-     *
-     * @param String $level Log severity: one of LOG_LEVEL_* (DEBUG,INFO,NOTICE,WARNING,ERROR)
-     * @param String $ip The client ip
-     * @param String $user The user login
-     * @param String $source The source of the message
-     * @param String $prefix  The prefix of the message
-     * @param String $message The message to log
-     *
-     */
-    public function write2($level, $ip, $user, $source, $prefix, $message, $nodePathes = array())
-    {
-        //syslog already take care of timestamp and log severity
-        $textMessage = "$ip\t$user\t$source\t$prefix\t$message";
-
-        switch ($level) {
-            case LOG_LEVEL_DEBUG:
-                $sysLevel = LOG_DEBUG;
-                break;
-            case LOG_LEVEL_INFO:
-                $sysLevel = LOG_INFO;
-                break;
-            case LOG_LEVEL_NOTICE:
-                $sysLevel = LOG_NOTICE;
-                break;
-            case LOG_LEVEL_WARNING:
-                $sysLevel = LOG_WARNING;
-                break;
-            case LOG_LEVEL_ERROR:
-                $sysLevel = LOG_ERR;
-                break;
-        }
-
-
-        if ($this->fileHandle !== false) {
-
-            if(count($this->stack)) $this->stackFlush();
-            syslog($sysLevel, $textMessage);
-
-        } else {
-            $this->stack[] = array($sysLevel, $textMessage);
-        }
-
-    }
-
-    /**
-     * Flush the stack/buffer of messages that couldn't be written earlier.
-     *
-     */
-    public function stackFlush()
-    {
-        // Flush stack for messages that could have been written before the file opening.
-        foreach ($this->stack as $message) {
-            syslog($message[0], $message[1]);
-        }
-        $this->stack = array();
-    }
-
-    /**
-     * closes the handle to the log file
-     *
-     * @access public
-     */
-    public function close()
-    {
-        if($this->fileHandle) closelog();
-    }
-
-    /**
-     * List available logs in XML format.
-     *
-     * This method prints the response.
-     *
-     * @param String $nodeName Name of the XML node to use as response.
-     * @param Integer $year The year to list.
-     * @param Integer $month The month to list.
-     * @param string $rootPath
-     * @param bool $print
-     * @return null
-     */
-    public function xmlListLogFiles($nodeName="file", $year=null, $month=null, $rootPath = "/logs", $print = true)
-    {
-        $xml = "<$nodeName icon=\"toggle_log.png\" date=\"\"
-        display=\"Logs are not readable via this GUI, they are sent directly to your system logger daemon.\"
-        text=\"Logs are not readable via this GUI, they are sent directly to your system logger daemon.\"
-        is_file=\"1\"
-        filename=\"$rootPath/see\"/>";
-        if($print) print $xml;
-        return array($xml);
-    }
-
-    /**
-     * Get a log in XML format.
-     *
-     * @param $parentDir
-     * @param String $date Date in m-d-y format.
-     * @param String $nodeName The name of the node to use for each log item.
-     * @param string $rootPath
-     * @return null
-     */
-    public function xmlLogs($parentDir, $date, $nodeName = "log", $rootPath = "/logs")
-    {
-    }
-}
diff --git a/core/src/plugins/log.syslog/i18n/conf/cs.php b/core/src/plugins/log.syslog/i18n/conf/cs.php
index 976906f256..3c9f84ecf4 100644
--- a/core/src/plugins/log.syslog/i18n/conf/cs.php
+++ b/core/src/plugins/log.syslog/i18n/conf/cs.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Syslog logger" => "Syslog logger",
diff --git a/core/src/plugins/log.syslog/i18n/conf/de.php b/core/src/plugins/log.syslog/i18n/conf/de.php
index 3e3fbc3935..e5e4896325 100644
--- a/core/src/plugins/log.syslog/i18n/conf/de.php
+++ b/core/src/plugins/log.syslog/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Syslog logger" => "Syslog",
diff --git a/core/src/plugins/log.syslog/i18n/conf/en.php b/core/src/plugins/log.syslog/i18n/conf/en.php
index 42400c91c8..b6d63de0c2 100644
--- a/core/src/plugins/log.syslog/i18n/conf/en.php
+++ b/core/src/plugins/log.syslog/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Syslog logger" => "Syslog logger",
diff --git a/core/src/plugins/log.syslog/i18n/conf/fr.php b/core/src/plugins/log.syslog/i18n/conf/fr.php
index 15b9308088..051afd28ca 100644
--- a/core/src/plugins/log.syslog/i18n/conf/fr.php
+++ b/core/src/plugins/log.syslog/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Syslog logger" => "Journaux système",
diff --git a/core/src/plugins/log.syslog/i18n/conf/it.php b/core/src/plugins/log.syslog/i18n/conf/it.php
index 1f6fd943ab..76c43bd583 100644
--- a/core/src/plugins/log.syslog/i18n/conf/it.php
+++ b/core/src/plugins/log.syslog/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Syslog logger" => "Logger Syslog",
diff --git a/core/src/plugins/log.syslog/i18n/conf/pt.php b/core/src/plugins/log.syslog/i18n/conf/pt.php
index 245bbdd1ef..7855d24933 100644
--- a/core/src/plugins/log.syslog/i18n/conf/pt.php
+++ b/core/src/plugins/log.syslog/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Syslog logger" => "Registos Syslog",
diff --git a/core/src/plugins/log.syslog/manifest.xml b/core/src/plugins/log.syslog/manifest.xml
index 6973c911df..9075c97e9a 100644
--- a/core/src/plugins/log.syslog/manifest.xml
+++ b/core/src/plugins/log.syslog/manifest.xml
@@ -4,7 +4,7 @@
         <plugin_author>Charles du Jeu</plugin_author>
         <core_relation packaged="true" tested_version="4.2.0"/>
     </plugin_info>
-    <class_definition filename="plugins/log.syslog/class.sysLogDriver.php" classname="sysLogDriver"/>
+    <class_definition filename="plugins/log.syslog/SysLogDriver.php" classname="Pydio\Log\Implementation\SysLogDriver"/>
     <client_settings>
         <resources>
             <i18n namespace="syslog_logger" path="plugins/log.syslog/i18n"/>
diff --git a/core/src/plugins/log.text/TextLogDriver.php b/core/src/plugins/log.text/TextLogDriver.php
new file mode 100644
index 0000000000..fabed6bf4e
--- /dev/null
+++ b/core/src/plugins/log.text/TextLogDriver.php
@@ -0,0 +1,345 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Log\Implementation;
+
+use Exception;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\StringHelper;
+
+use Pydio\Core\Utils\Vars\VarsFilter;
+use Pydio\Log\Core\AbstractLogDriver;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Standard logger. Writes logs into text files
+ * @package AjaXplorer_Plugins
+ * @subpackage Log
+ */
+class TextLogDriver extends AbstractLogDriver
+{
+    /**
+     * @var Integer Default permissions, in chmod format.
+     */
+    public $USER_GROUP_RIGHTS = 0770;
+
+    /**
+     * @var resource File handle to currently open log file.
+     */
+    public $fileHandle;
+
+    /**
+     * @var array stack of log messages to be written when file becomes available.
+     */
+    public $stack;
+
+    /**
+     * @var String full path to the directory where logs will be kept, with trailing slash.
+     */
+    public $storageDir = "";
+
+    /**
+     * @var String name of the log file to write.
+     */
+    public $logFileName = "";
+
+
+    /**
+     * Close file handle on objects destructor.
+     */
+    public function __destruct()
+    {
+        if ($this->fileHandle !== false) $this->close();
+    }
+
+    /**
+     * If the plugin is cloned, make sure to renew the $fileHandle
+     */
+    public function __clone()
+    {
+        $this->close();
+        $this->open();
+    }
+
+    /**
+     * Initialise storage: check and/or make log folder and file.
+     */
+    public function initStorage()
+    {
+        $storageDir = $this->storageDir;
+        if (!file_exists($storageDir)) {
+            @mkdir($storageDir);
+        }
+        $this->open();
+    }
+
+    /**
+     * Open log file for append, and flush out buffered messages to the file.
+     */
+    public function open()
+    {
+        if ($this->storageDir != "") {
+            $create = false;
+            if (!file_exists($this->storageDir . $this->logFileName)) {
+                // file creation
+                $create = true;
+            }
+            $this->fileHandle = @fopen($this->storageDir . $this->logFileName, "at+");
+            if ($this->fileHandle === false) {
+                error_log("Cannot open log file " . $this->storageDir . $this->logFileName);
+            }
+            if ($this->fileHandle !== false && count($this->stack)) {
+                $this->stackFlush();
+            }
+            if ($create && $this->fileHandle !== false) {
+                $mainLink = $this->storageDir . "ajxp_access.log";
+                if (file_exists($mainLink)) {
+                    @unlink($mainLink);
+                }
+                @symlink($this->storageDir . $this->logFileName, $mainLink);
+            }
+        }
+    }
+
+    /**
+     * Initialise the text log driver.
+     *
+     * Sets the user defined options.
+     * Makes sure that the folder and file exist, and makes them if they don't.
+     *
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        parent::init($ctx, $options);
+
+        $this->stack = array();
+        $this->fileHandle = false;
+
+
+        $this->storageDir = isset($this->options['LOG_PATH']) ? $this->options['LOG_PATH'] : "";
+        $this->storageDir = VarsFilter::filter($this->storageDir, $ctx);
+        $this->storageDir = (rtrim($this->storageDir)) . "/";
+        $this->logFileName = isset($this->options['LOG_FILE_NAME']) ? $this->options['LOG_FILE_NAME'] : 'log_' . date('m-d-y') . '.txt';
+        $this->USER_GROUP_RIGHTS = isset($this->options['LOG_CHMOD']) ? $this->options['LOG_CHMOD'] : 0770;
+
+        if (preg_match("/(.*)date\('(.*)'\)(.*)/i", $this->logFileName, $matches)) {
+            $this->logFileName = $matches[1] . date($matches[2]) . $matches[3];
+        }
+
+        $this->initStorage();
+    }
+
+    /**
+     * Write text to the log file.
+     *
+     * If write is not allowed because the file is not yet open, the message is buffered until
+     * file becomes available.
+     *
+     * @param String $level Log severity: one of LOG_LEVEL_* (DEBUG,INFO,NOTICE,WARNING,ERROR)
+     * @param String $ip The client ip
+     * @param String $user The user login
+     * @param String $repositoryId current repository ID
+     * @param String $source The source of the message
+     * @param String $prefix The prefix of the message
+     * @param String $message The message to log
+     * @param array $nodePathes
+     * @throws Exception
+     */
+    public function write2($level, $ip, $user, $repositoryId, $source, $prefix, $message, $nodePathes = array())
+    {
+        if (InputFilter::detectXSS($message)) $message = "XSS Detected in message!";
+        $textMessage = date("m-d-y") . " " . date("H:i:s") . "\t";
+        $textMessage .= "$ip\t" . strtoupper((string)$level) . "\t$user\t$source\t$prefix\t$message\n";
+
+        if ($this->fileHandle !== false) {
+            if (count($this->stack)) $this->stackFlush();
+            if (fwrite($this->fileHandle, $textMessage) === false) {
+                throw new Exception("There was an error writing to log file ($this->logFileName)");
+            }
+        } else {
+            $this->stack[] = $textMessage;
+        }
+    }
+
+    /**
+     * Flush the stack/buffer of messages that couldn't be written earlier.
+     *
+     */
+    public function stackFlush()
+    {
+        // Flush stack for messages that could have been written before the file opening.
+        foreach ($this->stack as $message) {
+            @fwrite($this->fileHandle, $message);
+        }
+        $this->stack = array();
+    }
+
+    /**
+     * closes the handle to the log file
+     *
+     * @access public
+     */
+    public function close()
+    {
+        if (is_resource($this->fileHandle)) {
+            fclose($this->fileHandle);
+            $this->fileHandle = FALSE;
+        }
+    }
+
+    /**
+     * List available logs in XML format.
+     *
+     * This method prints the response.
+     *
+     * @param String $nodeName Name of the XML node to use as response.
+     * @param Integer $year The year to list.
+     * @param Integer $month The month to list.
+     * @param string $rootPath
+     * @return null
+     */
+    public function listLogFiles($nodeName = "file", $year = null, $month = null, $rootPath = "/logs")
+    {
+        $logs = array();
+        if (!is_dir($this->storageDir)) {
+            return $logs;
+        }
+        $years = array();
+        $months = array();
+        if (($handle = opendir($this->storageDir)) !== false) {
+            while ($file = readdir($handle)) {
+                if ($file == "index.html" || $file == "ajxp_access.log") continue;
+                $split = explode(".", $file);
+                if (!count($split) || $split[0] == "") continue;
+                $split2 = explode("_", $split[0]);
+                $date = $split2[1];
+                $dSplit = explode("-", $date);
+                $time = mktime(0, 0, 1, intval($dSplit[0]), intval($dSplit[1]), intval($dSplit[2]));
+                $display = date("l d", $time);
+                $fullYear = date("Y", $time);
+                $fullMonth = date("F", $time);
+                $logM = $fullMonth;
+                if ($year != null && $fullYear != $year) continue;
+                if ($month != null && $fullMonth != $month) continue;
+                $key = "$rootPath/$fullYear/$fullMonth/$date";
+                $logs[$key] = [
+                    "icon" => "toggle_log.png",
+                    "date" => $display,
+                    "text" => $date,
+                    "is_file" => false,
+                    "filename" => $key,
+                    "ajxp_mime"         => "datagrid",
+                    "grid_datasource"   => "get_action=ls&dir=" . urlencode($key),
+                    "grid_header_title" => "Application Logs for $date",
+                    "grid_actions"      => "refresh,filter,copy_as_text"
+                ];
+                $years["$rootPath/$fullYear"] = [
+                    "icon" => "x-office-calendar.png",
+                    "date" => $fullYear,
+                    "display" => $fullYear,
+                    "text" => $fullYear,
+                    "is_file" => false,
+                    "filename" => "$rootPath/$fullYear"
+                ];
+                $months["$rootPath/$fullYear/$fullMonth"] = [
+                    "icon" => "x-office-calendar.png",
+                    "date" => $fullMonth,
+                    "display" => $logM,
+                    "text" => $fullMonth,
+                    "is_file" => false,
+                    "filename" => "$rootPath/$fullYear/$fullMonth"
+                ];
+            }
+            closedir($handle);
+        }
+        $result = $years;
+        if ($year != null) {
+            $result = $months;
+            if ($month != null) {
+                $result = $logs;
+            }
+        }
+        krsort($result, SORT_STRING);
+        return $result;
+    }
+
+    /**
+     * Get a log in XML format.
+     *
+     * @param $parentDir
+     * @param String $date Date in m-d-y format.
+     * @param String $nodeName The name of the node to use for each log item.
+     * @param string $rootPath
+     * @param int $cursor
+     * @return null
+     */
+    public function listLogs($parentDir, $date, $nodeName = "log", $rootPath = "/logs", $cursor = -1)
+    {
+        $logs = [];
+        $fName = $this->storageDir . "log_" . $date . ".txt";
+        if (!is_file($fName) || !is_readable($fName)) {
+            return $logs;
+        }
+
+        $lines = file($fName);
+        foreach ($lines as $line) {
+            $line = StringHelper::xmlEntities($line);
+            $matches = explode("\t", $line, 7);
+            if (count($matches) == 6) {
+                $matches[6] = $matches[5];
+                $matches[5] = $matches[4];
+                $matches[4] = $matches[3];
+                $matches[3] = "";
+            }
+            if (count($matches) == 7) {
+                $fileName = $parentDir . "/" . $matches[0];
+                foreach ($matches as $key => $match) {
+                    $match = str_replace("\"", "'", $match);
+                    $matches[$key] = $match;
+                }
+                if (count($matches) < 3) continue;
+                // rebuild timestamp
+                $date = $matches[0];
+                list($m, $d, $Y, $h, $i, $s) = sscanf($date, "%i-%i-%i %i:%i:%i");
+                $tStamp = mktime($h, $i, $s, $m, $d, $Y);
+                $logs[$fileName] = [
+                    "is_file" => true,
+                    "ajxp_modiftime" => $tStamp,
+                    "filename" => $fileName,
+                    "ajxp_mime" => "log",
+                    "date" => $matches[0],
+                    "ip" => $matches[1],
+                    "level" => $matches[2],
+                    "user" => $matches[3],
+                    "source"=> $matches[4],
+                    "action" => $matches[5],
+                    "params" => $matches[6],
+                    "icon" => "toggle_log.png"
+                ];
+            }
+        }
+        return $logs;
+    }
+}
diff --git a/core/src/plugins/log.text/class.textLogDriver.php b/core/src/plugins/log.text/class.textLogDriver.php
deleted file mode 100644
index df486475f1..0000000000
--- a/core/src/plugins/log.text/class.textLogDriver.php
+++ /dev/null
@@ -1,294 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Standard logger. Writes logs into text files
- * @package AjaXplorer_Plugins
- * @subpackage Log
- */
-class textLogDriver extends AbstractLogDriver
-{
-    /**
-     * @var Integer Default permissions, in chmod format.
-     */
-    public $USER_GROUP_RIGHTS = 0770;
-
-    /**
-     * @var Integer File handle to currently open log file.
-     */
-    public $fileHandle;
-
-    /**
-     * @var Array stack of log messages to be written when file becomes available.
-     */
-    public $stack;
-
-    /**
-     * @var String full path to the directory where logs will be kept, with trailing slash.
-     */
-    public $storageDir = "";
-
-    /**
-     * @var String name of the log file to write.
-     */
-    public $logFileName = "";
-
-
-    /**
-     * Close file handle on objects destructor.
-     */
-    public function __destruct()
-    {
-        if($this->fileHandle !== false) $this->close();
-    }
-
-    /**
-     * If the plugin is cloned, make sure to renew the $fileHandle
-     */
-    public function __clone() {
-        $this->close();
-        $this->open();
-    }
-
-    /**
-     * Initialise storage: check and/or make log folder and file.
-     */
-    public function initStorage()
-    {
-        $storageDir = $this->storageDir;
-        if (!file_exists($storageDir)) {
-            @mkdir($storageDir);
-        }
-        $this->open();
-    }
-
-    /**
-     * Open log file for append, and flush out buffered messages to the file.
-     */
-    public function open()
-    {
-        if ($this->storageDir!="") {
-            $create = false;
-            if (!file_exists($this->storageDir . $this->logFileName)) {
-                // file creation
-                $create = true;
-            }
-            $this->fileHandle = @fopen($this->storageDir . $this->logFileName, "at+");
-            if ($this->fileHandle === false) {
-                error_log("Cannot open log file ".$this->storageDir . $this->logFileName);
-            }
-            if ($this->fileHandle !== false && count($this->stack)) {
-                $this->stackFlush();
-            }
-            if ($create && $this->fileHandle !== false) {
-                $mainLink = $this->storageDir."ajxp_access.log";
-                if (file_exists($mainLink)) {
-                    @unlink($mainLink);
-                }
-                @symlink($this->storageDir.$this->logFileName, $mainLink);
-            }
-        }
-    }
-
-    /**
-     * Initialise the text log driver.
-     *
-     * Sets the user defined options.
-     * Makes sure that the folder and file exist, and makes them if they don't.
-     *
-     * @param Array $options array of options specific to the logger driver.
-     * @access public
-     * @return null
-     */
-    public function init($options)
-    {
-        parent::init($options);
-
-        $this->severityDescription = 0;
-        $this->stack = array();
-        $this->fileHandle = false;
-
-
-        $this->storageDir = isset($this->options['LOG_PATH']) ? $this->options['LOG_PATH'] : "";
-        $this->storageDir = AJXP_VarsFilter::filter($this->storageDir);
-        $this->storageDir = (rtrim($this->storageDir))."/";
-        $this->logFileName = isset($this->options['LOG_FILE_NAME']) ? $this->options['LOG_FILE_NAME'] : 'log_' . date('m-d-y') . '.txt';
-        $this->USER_GROUP_RIGHTS = isset($this->options['LOG_CHMOD']) ? $this->options['LOG_CHMOD'] : 0770;
-
-        if (preg_match("/(.*)date\('(.*)'\)(.*)/i", $this->logFileName, $matches)) {
-            $this->logFileName = $matches[1].date($matches[2]).$matches[3];
-        }
-
-        $this->initStorage();
-    }
-
-    /**
-     * Write text to the log file.
-     *
-     * If write is not allowed because the file is not yet open, the message is buffered until
-     * file becomes available.
-     *
-     * @param String $level Log severity: one of LOG_LEVEL_* (DEBUG,INFO,NOTICE,WARNING,ERROR)
-     * @param String $ip The client ip
-     * @param String $user The user login
-     * @param String $source The source of the message
-     * @param String $prefix The prefix of the message
-     * @param String $message The message to log
-     * @throws Exception
-     * @return void
-     */
-    public function write2($level, $ip, $user, $source, $prefix, $message, $nodePathes = array())
-    {
-        if(AJXP_Utils::detectXSS($message)) $message = "XSS Detected in message!";
-        $textMessage = date("m-d-y") . " " . date("H:i:s") . "\t";
-        $textMessage .= "$ip\t".strtoupper((string) $level)."\t$user\t$source\t$prefix\t$message\n";
-
-        if ($this->fileHandle !== false) {
-            if(count($this->stack)) $this->stackFlush();
-            if (fwrite($this->fileHandle, $textMessage) === false) {
-                throw new Exception("There was an error writing to log file ($this->logFileName)");
-            }
-        } else {
-            $this->stack[] = $textMessage;
-        }
-    }
-
-    /**
-     * Flush the stack/buffer of messages that couldn't be written earlier.
-     *
-     */
-    public function stackFlush()
-    {
-        // Flush stack for messages that could have been written before the file opening.
-        foreach ($this->stack as $message) {
-            @fwrite($this->fileHandle, $message);
-        }
-        $this->stack = array();
-    }
-
-    /**
-     * closes the handle to the log file
-     *
-     * @access public
-     */
-    public function close()
-    {
-        if(is_resource($this->fileHandle)){
-            fclose($this->fileHandle);
-            $this->fileHandle = FALSE;
-        }
-    }
-
-    /**
-     * List available logs in XML format.
-     *
-     * This method prints the response.
-     *
-     * @param String $nodeName Name of the XML node to use as response.
-     * @param Integer $year The year to list.
-     * @param Integer $month The month to list.
-     * @return null
-     */
-    public function xmlListLogFiles($nodeName="file", $year=null, $month=null, $rootPath = "/logs", $print = true)
-    {
-        $dir = $this->storageDir;
-        if(!is_dir($this->storageDir)) return ;
-        $logs = array();
-        $years = array();
-        $months = array();
-        if (($handle = opendir($this->storageDir))!==false) {
-            while ($file = readdir($handle)) {
-                if($file == "index.html" || $file == "ajxp_access.log") continue;
-                $split = explode(".", $file);
-                if(!count($split) || $split[0] == "") continue;
-                $split2 = explode("_", $split[0]);
-                $date = $split2[1];
-                $dSplit = explode("-", $date);
-                $time = mktime(0,0,1,intval($dSplit[0]), intval($dSplit[1]), intval($dSplit[2]));
-                $display = date("l d", $time);
-                $fullYear = date("Y", $time);
-                $fullMonth = date("F", $time);
-                $logY = $fullYear;
-                $logM = $fullMonth;
-                if($year != null && $fullYear != $year) continue;
-                if($month != null && $fullMonth != $month) continue;
-                $logs[$time] = "<$nodeName icon=\"toggle_log.png\" date=\"$display\" display=\"$display\" text=\"$date\" is_file=\"0\" filename=\"$rootPath/$fullYear/$fullMonth/$date\"/>";
-                $years[$logY] = "<$nodeName icon=\"x-office-calendar.png\" date=\"$fullYear\" display=\"$fullYear\" text=\"$fullYear\" is_file=\"0\" filename=\"$rootPath/$fullYear\"/>";
-                $months[$logM] = "<$nodeName icon=\"x-office-calendar.png\" date=\"$fullMonth\" display=\"$logM\" text=\"$fullMonth\" is_file=\"0\" filename=\"$rootPath/$fullYear/$fullMonth\"/>";
-            }
-            closedir($handle);
-        }
-        $result = $years;
-        if ($year != null) {
-            $result = $months;
-            if ($month != null) {
-                $result = $logs;
-            }
-        }
-        krsort($result, SORT_STRING);
-        if($print) foreach($result as $log) print($log);
-        return $result;
-    }
-
-    /**
-     * Get a log in XML format.
-     *
-     * @param String $date Date in m-d-y format.
-     * @param String $nodeName The name of the node to use for each log item.
-     * @return null
-     */
-    public function xmlLogs($parentDir, $date, $nodeName = "log", $rootPath = "/logs")
-    {
-        $fName = $this->storageDir."log_".$date.".txt";
-
-        if(!is_file($fName) || !is_readable($fName)) return;
-
-        $res = "";
-        $lines = file($fName);
-        foreach ($lines as $line) {
-            $line = AJXP_Utils::xmlEntities($line);
-            $matches = explode("\t",$line,7);
-            if (count($matches) == 6){
-                $matches[6] = $matches[5];
-                $matches[5] = $matches[4];
-                $matches[4] = $matches[3];
-                $matches[3] = "";
-            }
-            if (count($matches) == 7) {
-                $fileName = $parentDir."/".$matches[0];
-                foreach ($matches as $key => $match) {
-                    $match = AJXP_Utils::xmlEntities($match);
-                    $match = str_replace("\"", "'", $match);
-                    $matches[$key] = $match;
-                }
-                if(count($matches) < 3) continue;
-                // rebuild timestamp
-                $date = $matches[0];
-                list($m,$d,$Y,$h,$i,$s) = sscanf($date, "%i-%i-%i %i:%i:%i");
-                $tStamp = mktime($h,$i,$s,$m,$d,$Y);
-                print(SystemTextEncoding::toUTF8("<$nodeName is_file=\"1\" ajxp_modiftime=\"$tStamp\" filename=\"$fileName\" ajxp_mime=\"log\" date=\"$matches[0]\" ip=\"$matches[1]\" level=\"$matches[2]\" user=\"$matches[3]\" source=\"$matches[4]\" action=\"$matches[5]\" params=\"$matches[6]\" icon=\"toggle_log.png\" />", false));
-            }
-        }
-        return ;
-    }
-}
diff --git a/core/src/plugins/log.text/i18n/conf/cs.php b/core/src/plugins/log.text/i18n/conf/cs.php
index 3d9e3018d7..719df9d0f4 100644
--- a/core/src/plugins/log.text/i18n/conf/cs.php
+++ b/core/src/plugins/log.text/i18n/conf/cs.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Text logger" => "Textové logy",
@@ -40,4 +40,4 @@
 "The port to access Redis server" => "The port to access Redis server",
 "Cache Prefix" => "Cache Prefix",
 "" => "",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/log.text/i18n/conf/de.php b/core/src/plugins/log.text/i18n/conf/de.php
index cdbd756231..d820113d42 100644
--- a/core/src/plugins/log.text/i18n/conf/de.php
+++ b/core/src/plugins/log.text/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Text logger" => "Textdatei",
diff --git a/core/src/plugins/log.text/i18n/conf/en.php b/core/src/plugins/log.text/i18n/conf/en.php
index f089cb5076..e19a88f70b 100644
--- a/core/src/plugins/log.text/i18n/conf/en.php
+++ b/core/src/plugins/log.text/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Text logger" => "Text logger",
diff --git a/core/src/plugins/log.text/i18n/conf/fr.php b/core/src/plugins/log.text/i18n/conf/fr.php
index 01b7648c07..69370d5e1e 100644
--- a/core/src/plugins/log.text/i18n/conf/fr.php
+++ b/core/src/plugins/log.text/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Text logger" => "Journaux texte",
diff --git a/core/src/plugins/log.text/i18n/conf/it.php b/core/src/plugins/log.text/i18n/conf/it.php
index e7583ff7af..9ac187da6b 100644
--- a/core/src/plugins/log.text/i18n/conf/it.php
+++ b/core/src/plugins/log.text/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Text logger" => "Logger Testuale",
@@ -42,4 +42,4 @@
 "The hostname to access Redis server" => "The hostname to access Redis server",
 "The port to access Redis server" => "The port to access Redis server",
 "Cache Prefix" => "Cache Prefix",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/log.text/i18n/conf/pt.php b/core/src/plugins/log.text/i18n/conf/pt.php
index 5cc580a7fb..04b429944c 100644
--- a/core/src/plugins/log.text/i18n/conf/pt.php
+++ b/core/src/plugins/log.text/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Text logger" => "Registos em Texto",
diff --git a/core/src/plugins/log.text/manifest.xml b/core/src/plugins/log.text/manifest.xml
index 1aac5ae25b..9d897dc565 100644
--- a/core/src/plugins/log.text/manifest.xml
+++ b/core/src/plugins/log.text/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <logdriver name="text" enabled="always" label="CONF_MESSAGE[Text logger]" description="CONF_MESSAGE[Stores the logs as readable tab delimited text.]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <class_definition filename="plugins/log.text/class.textLogDriver.php" classname="textLogDriver"/>
+    <class_definition filename="plugins/log.text/TextLogDriver.php" classname="Pydio\Log\Implementation\TextLogDriver"/>
     <client_settings>
         <resources>
             <i18n namespace="text_logger" path="plugins/log.text/i18n"/>
diff --git a/core/src/plugins/mailer.phpmailer-lite/PhpMailLite.php b/core/src/plugins/mailer.phpmailer-lite/PhpMailLite.php
new file mode 100644
index 0000000000..eb16a68c96
--- /dev/null
+++ b/core/src/plugins/mailer.phpmailer-lite/PhpMailLite.php
@@ -0,0 +1,108 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Mailer\Implementation;
+
+use Exception;
+use phpmailerException;
+use PHPMailerLite;
+use Pydio\Core\Model\Context;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Mailer\Core\Mailer;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Send notifications to user on some predefined actions
+ * @package AjaXplorer_Plugins
+ * @subpackage Mailer
+ */
+class PhpMailLite extends Mailer
+{
+    /**
+     * @param ContextInterface $ctx
+     * @param $recipients
+     * @param $subject
+     * @param $body
+     * @param null $from
+     * @param array $images
+     * @param bool $useHtml
+     * @throws Exception
+     * @throws phpmailerException
+     */
+    protected function sendMailImpl(ContextInterface $ctx, $recipients, $subject, $body, $from = null, $images = array(), $useHtml = true)
+    {
+        require_once("lib/class.phpmailer-lite.php");
+        $realRecipients = $this->resolveAdresses($ctx, $recipients);
+        if(!count($realRecipients)){
+            return;
+        }
+        // NOW IF THERE ARE RECIPIENTS FOR ANY REASON, GO
+        $mail = new PHPMailerLite(true);
+        $mail->Mailer = $this->getContextualOption(Context::emptyContext(), "MAILER");
+        $mail->Sendmail = $this->getContextualOption(Context::emptyContext(), "SENDMAIL_PATH");
+        $from = $this->resolveFrom($ctx, $from);
+        if (!is_array($from) || empty($from["adress"])) {
+            throw new Exception("Cannot send email without a FROM address. Please check your core.mailer configuration.");
+        }
+        if (!empty($from)) {
+            if ($from["adress"] != $from["name"]) {
+                $mail->SetFrom($from["adress"], $from["name"]);
+            } else {
+                $mail->SetFrom($from["adress"]);
+            }
+        }
+        foreach ($realRecipients as $address) {
+            if ($address["adress"] == $address["name"]) {
+                $mail->AddAddress(trim($address["adress"]));
+            } else {
+                $mail->AddAddress(trim($address["adress"]), trim($address["name"]));
+            }
+        }
+        $mail->WordWrap = 50;                                 // set word wrap to 50 characters
+        $mail->IsHTML($useHtml);                                  // set email format to HTML
+        $mail->CharSet = "utf-8";
+        $mail->Encoding = $this->getContextualOption(Context::emptyContext(), "MAIL_ENCODING");
+        foreach ($images as $image) {
+            $mail->AddEmbeddedImage($image["path"], $image["cid"], '', 'base64', 'image/png');
+        }
+
+        $mail->Subject = $subject;
+        if ($useHtml) {
+            if (strpos($body, "<html") !== false) {
+                $mail->Body = $body;
+            } else {
+                $mail->Body = "<html><body>" . nl2br($body) . "</body></html>";
+            }
+            $mail->AltBody = Mailer::simpleHtml2Text($mail->Body);
+        } else {
+            $mail->Body = Mailer::simpleHtml2Text($body);
+        }
+
+        if (!$mail->Send()) {
+            $message = "Message could not be sent\n";
+            $message .= "Mailer Error: " . $mail->ErrorInfo;
+            throw new Exception($message);
+        }
+
+    }
+
+}
diff --git a/core/src/plugins/mailer.phpmailer-lite/class.PhpMailLiteMailer.php b/core/src/plugins/mailer.phpmailer-lite/class.PhpMailLiteMailer.php
deleted file mode 100644
index 6981423da6..0000000000
--- a/core/src/plugins/mailer.phpmailer-lite/class.PhpMailLiteMailer.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Send notifications to user on some predefined actions
- * @package AjaXplorer_Plugins
- * @subpackage Mailer
- */
-class PhpMailLiteMailer extends AjxpMailer
-{
-    protected function sendMailImpl($recipients, $subject, $body, $from = null, $images = array(), $useHtml = true)
-    {
-        require_once("lib/class.phpmailer-lite.php");
-        $realRecipients = $this->resolveAdresses($recipients);
-
-        // NOW IF THERE ARE RECIPIENTS FOR ANY REASON, GO
-        $mail = new PHPMailerLite(true);
-        $mail->Mailer = $this->getFilteredOption("MAILER");
-        $mail->Sendmail = $this->getFilteredOption("SENDMAIL_PATH");
-        $from = $this->resolveFrom($from);
-        if (!is_array($from) || empty($from["adress"])) {
-            throw new Exception("Cannot send email without a FROM address. Please check your core.mailer configuration.");
-        }
-        if (!empty($from)) {
-            if ($from["adress"] != $from["name"]) {
-                $mail->SetFrom($from["adress"], $from["name"]);
-            } else {
-                $mail->setFrom($from["adress"]);
-            }
-        }
-        foreach ($realRecipients as $address) {
-            if ($address["adress"] == $address["name"]) {
-                $mail->AddAddress(trim($address["adress"]));
-            } else {
-                $mail->AddAddress(trim($address["adress"]), trim($address["name"]));
-            }
-        }
-        $mail->WordWrap = 50;                                 // set word wrap to 50 characters
-        $mail->IsHTML($useHtml);                                  // set email format to HTML
-        $mail->CharSet = "utf-8";
-        $mail->Encoding = $this->getFilteredOption("MAIL_ENCODING");
-        foreach ($images as $image) {
-            $mail->AddEmbeddedImage($image["path"], $image["cid"], '', 'base64', 'image/png');
-        }
-
-        $mail->Subject = $subject;
-        if($useHtml){
-            if (strpos($body, "<html")!==false) {
-                $mail->Body = $body;
-            } else {
-                $mail->Body = "<html><body>".nl2br($body)."</body></html>";
-            }
-            $mail->AltBody = AjxpMailer::simpleHtml2Text($mail->Body);
-        }else{
-            $mail->Body = AjxpMailer::simpleHtml2Text($body);
-        }
-
-        if (!$mail->Send()) {
-            $message = "Message could not be sent\n";
-            $message .= "Mailer Error: " . $mail->ErrorInfo;
-            throw new Exception($message);
-        }
-
-    }
-
-}
diff --git a/core/src/plugins/mailer.phpmailer-lite/i18n/conf/cs.php b/core/src/plugins/mailer.phpmailer-lite/i18n/conf/cs.php
index 61e4f6995a..0eca3de83e 100644
--- a/core/src/plugins/mailer.phpmailer-lite/i18n/conf/cs.php
+++ b/core/src/plugins/mailer.phpmailer-lite/i18n/conf/cs.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "PHPMailer-lite" => "PHPMailer-lite",
@@ -27,4 +27,4 @@
 "Path to sendmail if not the default one" => "Cesta k sendmail, pokud mimo obvyklé umístění",
 "Mails Encoding" => "Mails Encoding",
 "Content encoding of the email. Default value should be ok for most configurations. Some specific Windows Exchange + Outlook combination may require switching to 7bit." => "Content encoding of the email. Default value should be ok for most configurations. Some specific Windows Exchange + Outlook combination may require switching to 7bit.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/mailer.phpmailer-lite/i18n/conf/de.php b/core/src/plugins/mailer.phpmailer-lite/i18n/conf/de.php
index cb6b511b41..51a48bbdb6 100644
--- a/core/src/plugins/mailer.phpmailer-lite/i18n/conf/de.php
+++ b/core/src/plugins/mailer.phpmailer-lite/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "PHPMailer-lite" => "PHPMailer-lite",
@@ -27,4 +27,4 @@
 "Path to sendmail if not the default one" => "Pfad zur ausführbaren Datei 'sendmail'",
 "Mails Encoding" => "Mails Encoding",
 "Content encoding of the email. Default value should be ok for most configurations. Some specific Windows Exchange + Outlook combination may require switching to 7bit." => "Content encoding of the email. Default value should be ok for most configurations. Some specific Windows Exchange + Outlook combination may require switching to 7bit.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/mailer.phpmailer-lite/i18n/conf/en.php b/core/src/plugins/mailer.phpmailer-lite/i18n/conf/en.php
index 289c742715..f40c2f19b0 100644
--- a/core/src/plugins/mailer.phpmailer-lite/i18n/conf/en.php
+++ b/core/src/plugins/mailer.phpmailer-lite/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "PHPMailer-lite" => "PHPMailer-lite",
@@ -27,4 +27,4 @@
 "Path to sendmail if not the default one" => "Path to sendmail if not the default one",
 "Mails Encoding" => "Mails Encoding",
 "Content encoding of the email. Default value should be ok for most configurations. Some specific Windows Exchange + Outlook combination may require switching to 7bit." => "Content encoding of the email. Default value should be ok for most configurations. Some specific Windows Exchange + Outlook combination may require switching to 7bit.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/mailer.phpmailer-lite/lib/class.phpmailer-lite.php b/core/src/plugins/mailer.phpmailer-lite/lib/class.phpmailer-lite.php
index 95f8a8f937..fc142c61d5 100644
--- a/core/src/plugins/mailer.phpmailer-lite/lib/class.phpmailer-lite.php
+++ b/core/src/plugins/mailer.phpmailer-lite/lib/class.phpmailer-lite.php
@@ -582,7 +582,7 @@ protected function MailSend($header, $body)
     }
     $to = implode(', ', $toArr);
 
-    $params = sprintf("-oi -f %s", $this->Sender);
+    $params = sprintf("-oi -f%s", $this->Sender);
     if ($this->Sender != '' && strlen(ini_get('safe_mode'))< 1) {
       $old_from = ini_get('sendmail_from');
       ini_set('sendmail_from', $this->Sender);
diff --git a/core/src/plugins/mailer.phpmailer-lite/manifest.xml b/core/src/plugins/mailer.phpmailer-lite/manifest.xml
index 7b5c7b9bb2..3b39f53b16 100644
--- a/core/src/plugins/mailer.phpmailer-lite/manifest.xml
+++ b/core/src/plugins/mailer.phpmailer-lite/manifest.xml
@@ -6,7 +6,7 @@
         <param name="SENDMAIL_PATH" type="string" label="CONF_MESSAGE[Sendmail Path]" description="CONF_MESSAGE[Path to sendmail if not the default one]" mandatory="true" default="/usr/sbin/sendmail"/>
         <param name="MAIL_ENCODING" type="select" choices="quoted-printable,8bit,7bit,binary,base64" label="CONF_MESSAGE[Mails Encoding]" description="CONF_MESSAGE[Content encoding of the email. Default value should be ok for most configurations. Some specific Windows Exchange + Outlook combination may require switching to 7bit.]" default="quoted-printable"/>
     </server_settings>
-    <class_definition filename="plugins/mailer.phpmailer-lite/class.PhpMailLiteMailer.php" classname="PhpMailLiteMailer"/>
+    <class_definition filename="plugins/mailer.phpmailer-lite/PhpMailLite.php" classname="Pydio\Mailer\Implementation\PhpMailLite"/>
     <client_settings>
 	<resources>
 	    <i18n namespace="mailer.phpmailer-lite" path="plugins/mailer.phpmailer-lite/i18n" />
diff --git a/core/src/plugins/meta.comments/CommentsMetaManager.php b/core/src/plugins/meta.comments/CommentsMetaManager.php
new file mode 100644
index 0000000000..eac1181473
--- /dev/null
+++ b/core/src/plugins/meta.comments/CommentsMetaManager.php
@@ -0,0 +1,256 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Meta\UserGenerated;
+
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\StatHelper;
+
+use Pydio\Core\Controller\HTMLWriter;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Access\Meta\Core\AbstractMetaSource;
+use Pydio\Access\Metastore\Core\IMetaStoreProvider;
+use Pydio\Notification\Core\IFeedStore;
+
+define("AJXP_META_SPACE_COMMENTS", "AJXP_META_SPACE_COMMENTS");
+
+/**
+ * Class CommentsMetaManager
+ * Manage use defined comments
+ * @package Pydio\Meta\Comment
+ */
+class CommentsMetaManager extends AbstractMetaSource
+{
+    /**
+     * @var IMetaStoreProvider
+     */
+    private $metaStore;
+    /**
+     * @var IFeedStore
+     */
+    private $feedStore;
+
+    private $storageMode;
+
+    /**
+     * @param ContextInterface $ctx
+     * @param AbstractAccessDriver $accessDriver
+     * @throws \Exception
+     */
+    public function initMeta(ContextInterface $ctx, AbstractAccessDriver $accessDriver)
+    {
+        parent::initMeta($ctx, $accessDriver);
+        $pService = PluginsService::getInstance($ctx);
+        $feed = $pService->getUniqueActivePluginForType("feed");
+        if ($feed) {
+            $this->storageMode = "FEED";
+            $this->feedStore = $feed;
+        } else {
+            $store = $pService->getUniqueActivePluginForType("metastore");
+            if ($store === false) {
+                throw new \Exception("The 'meta.comments' plugin requires at least one active 'metastore' plugin");
+            }
+            $this->metaStore = $store;
+            $this->storageMode = "METASTORE";
+        }
+    }
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $ajxpNode
+     */
+    public function mergeMeta($ajxpNode)
+    {
+        $ajxpNode->mergeMetadata(array("ajxp_has_comments_feed" => "true"));
+        if ($ajxpNode->retrieveMetadata(AJXP_META_SPACE_COMMENTS, false) != null) {
+        }
+
+    }
+
+    /**
+     *
+     * @param \Pydio\Access\Core\Model\AJXP_Node $oldFile
+     * @param \Pydio\Access\Core\Model\AJXP_Node $newFile
+     * @param Boolean $copy
+     */
+    public function moveMeta($oldFile, $newFile = null, $copy = false)
+    {
+        if($oldFile == null) return;
+        $feedStore = PluginsService::getInstance($oldFile->getContext())->getUniqueActivePluginForType("feed");
+        if ($feedStore !== false) {
+            $feedStore->updateMetaObject($oldFile->getRepositoryId(), $oldFile->getPath(), ($newFile!=null?$newFile->getPath():null), $copy);
+            return;
+        }
+
+        if(!$copy && $this->metaStore->inherentMetaMove()) return;
+
+        $oldMeta = $this->metaStore->retrieveMetadata($oldFile, AJXP_META_SPACE_COMMENTS);
+        if (!count($oldMeta)) {
+            return;
+        }
+        // If it's a move or a delete, delete old data
+        if (!$copy) {
+            $this->metaStore->removeMetadata($oldFile, AJXP_META_SPACE_COMMENTS);
+        }
+        // If copy or move, copy data.
+        if ($newFile != null) {
+            $this->metaStore->setMetadata($newFile, AJXP_META_SPACE_COMMENTS, $oldMeta);
+        }
+    }
+
+
+    /**
+     * @param String $actionName
+     * @param array $httpVars
+     * @param array $fileVars
+     * @param ContextInterface $ctx
+     */
+    public function switchActions($actionName, $httpVars, $fileVars, ContextInterface $ctx)
+    {
+        $userSelection = UserSelection::fromContext($ctx, $httpVars);
+        $uniqNode = $userSelection->getUniqueNode();
+        /** @var IFeedStore $feedStore */
+        $feedStore = PluginsService::getInstance($ctx)->getUniqueActivePluginForType("feed");
+        $existingFeed = $uniqNode->retrieveMetadata(AJXP_META_SPACE_COMMENTS, false);
+        if ($existingFeed == null) {
+            $existingFeed = array();
+        }
+        $mess = LocaleService::getMessages();
+        switch ($actionName) {
+
+            case "post_comment":
+
+                $uId = $ctx->getUser()->getId();
+                $limit = $this->getContextualOption($ctx, "COMMENT_SIZE_LIMIT");
+                if (!empty($limit)) {
+                    $content = substr(InputFilter::decodeSecureMagic($httpVars["content"]), 0, $limit);
+                } else {
+                    $content = InputFilter::decodeSecureMagic($httpVars["content"]);
+                }
+                $com = array(
+                    "date"      => time(),
+                    "author"    => $uId,
+                    "content"   => $content
+                );
+                $existingFeed[] = $com;
+                if ($feedStore!== false) {
+                    $feedStore->persistMetaObject(
+                        $uniqNode->getPath(),
+                        base64_encode($content),
+                        $uniqNode->getRepositoryId(),
+                        $uniqNode->getRepository()->securityScope(),
+                        $uniqNode->getRepository()->getOwner(),
+                        $ctx->getUser()->getId(),
+                        $ctx->getUser()->getGroupPath());
+                } else {
+                    $uniqNode->removeMetadata(AJXP_META_SPACE_COMMENTS, false);
+                    $uniqNode->setMetadata(AJXP_META_SPACE_COMMENTS, $existingFeed, false);
+                }
+                HTMLWriter::charsetHeader("application/json");
+                $com["hdate"] = StatHelper::relativeDate($com["date"], $mess);
+                $com["path"] = $uniqNode->getPath();
+                echo json_encode($com);
+
+                break;
+
+            case "load_comments_feed":
+
+                HTMLWriter::charsetHeader("application/json");
+                if ($feedStore !== false) {
+                    $sortBy = isSet($httpVars["sort_by"])? InputFilter::decodeSecureMagic($httpVars["sort_by"]) :"date";
+                    $sortDir = isSet($httpVars["sort_dir"])? InputFilter::decodeSecureMagic($httpVars["sort_dir"]) :"asc";
+                    $offset = isSet($httpVars["offset"]) ? intval($httpVars["offset"]) : 0;
+                    $limit = isSet($httpVars["limit"]) ? intval($httpVars["limit"]) : 100;
+                    $uniqNode->loadNodeInfo();
+                    $data = $feedStore->findMetaObjectsByIndexPath(
+                        $ctx->getRepositoryId(),
+                        $uniqNode->getPath(),
+                        $ctx->getUser()->getId(),
+                        $ctx->getUser()->getGroupPath(),
+                        $offset,
+                        $limit,
+                        $sortBy,
+                        $sortDir,
+                        !$uniqNode->isLeaf()
+                    );
+                    $theFeed = array();
+                    foreach ($data as $stdObject) {
+                        $rPath = substr($stdObject->path, strlen($uniqNode->getPath()));
+                        if($rPath == false && $stdObject->path == $uniqNode->getPath()) $rPath = "";
+                        $rPath = ltrim($rPath, "/");
+                        $newItem = array(
+                            "date"      =>$stdObject->date,
+                            "hdate"     => StatHelper::relativeDate($stdObject->date, $mess),
+                            "author"    => $stdObject->author,
+                            "content"   => base64_decode($stdObject->content),
+                            "path"      => $stdObject->path,
+                            "rpath"     => $rPath,
+                            "uuid"      => $stdObject->uuid
+                        );
+                        if (isSet($previous) && $previous["author"] == $newItem["author"] &&  $previous["path"] == $newItem["path"] && $previous["hdate"] == $newItem["hdate"] ) {
+                            $theFeed[count($theFeed) - 1]["content"].= '<br>'.$newItem["content"];
+
+                        } else {
+                            $theFeed[] = $newItem;
+                        }
+                        $previous = $newItem;
+                    }
+                    echo json_encode($theFeed);
+                } else {
+                    foreach ($existingFeed as &$item) {
+                        $item["hdate"] = StatHelper::relativeDate($item["date"], $mess);
+                    }
+                    echo json_encode($existingFeed);
+                }
+
+                break;
+
+            case "delete_comment":
+
+                $data = json_decode($httpVars["comment_data"], true);
+                if ($feedStore === false) {
+                    $reFeed = array();
+                    if($data["author"] != $ctx->getUser()->getId()) break;
+                    foreach ($existingFeed as $fElement) {
+                        if ($fElement["date"] == $data["date"] && $fElement["author"] == $data["author"] && $fElement["content"] == $data["content"]) {
+                            continue;
+                        }
+                        $fElement["hdate"] = StatHelper::relativeDate($fElement["date"], $mess);
+                        $reFeed[] = $fElement;
+                    }
+                    $uniqNode->removeMetadata(AJXP_META_SPACE_COMMENTS, false);
+                    $uniqNode->setMetadata(AJXP_META_SPACE_COMMENTS, $reFeed, false);
+                    HTMLWriter::charsetHeader("application/json");
+                    echo json_encode($reFeed);
+                } else {
+                    $feedStore->dismissAlertById($ctx, $data["uuid"], 1);
+                }
+
+                break;
+
+            default:
+                break;
+        }
+
+    }
+
+}
diff --git a/core/src/plugins/meta.comments/class.CommentsMetaManager.php b/core/src/plugins/meta.comments/class.CommentsMetaManager.php
deleted file mode 100644
index 1499514c4f..0000000000
--- a/core/src/plugins/meta.comments/class.CommentsMetaManager.php
+++ /dev/null
@@ -1,228 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-define("AJXP_META_SPACE_COMMENTS", "AJXP_META_SPACE_COMMENTS");
-
-class CommentsMetaManager extends AJXP_AbstractMetaSource
-{
-    /**
-     * @var MetaStoreProvider
-     */
-    private $metaStore;
-    /**
-     * @var AJXP_FeedStore
-     */
-    private $feedStore;
-
-    private $storageMode;
-
-    public function initMeta($accessDriver)
-    {
-        parent::initMeta($accessDriver);
-        $feed = AJXP_PluginsService::getInstance()->getUniqueActivePluginForType("feed");
-        if ($feed) {
-            $this->storageMode = "FEED";
-            $this->feedStore = $feed;
-        } else {
-            $store = AJXP_PluginsService::getInstance()->getUniqueActivePluginForType("metastore");
-            if ($store === false) {
-                throw new Exception("The 'meta.comments' plugin requires at least one active 'metastore' plugin");
-            }
-            $this->metaStore = $store;
-            $this->storageMode = "METASTORE";
-        }
-    }
-    /**
-     * @param AJXP_Node $ajxpNode
-     */
-    public function mergeMeta($ajxpNode)
-    {
-        $ajxpNode->mergeMetadata(array("ajxp_has_comments_feed" => "true"));
-        if ($ajxpNode->retrieveMetadata(AJXP_META_SPACE_COMMENTS, false) != null) {
-        }
-
-    }
-
-    /**
-     *
-     * @param AJXP_Node $oldFile
-     * @param AJXP_Node $newFile
-     * @param Boolean $copy
-     */
-    public function moveMeta($oldFile, $newFile = null, $copy = false)
-    {
-        if($oldFile == null) return;
-        $feedStore = AJXP_PluginsService::getInstance()->getUniqueActivePluginForType("feed");
-        if ($feedStore !== false) {
-            $feedStore->updateMetaObject($oldFile->getRepositoryId(), $oldFile->getPath(), ($newFile!=null?$newFile->getPath():null), $copy);
-            return;
-        }
-
-        if(!$copy && $this->metaStore->inherentMetaMove()) return;
-
-        $oldMeta = $this->metaStore->retrieveMetadata($oldFile, AJXP_META_SPACE_COMMENTS);
-        if (!count($oldMeta)) {
-            return;
-        }
-        // If it's a move or a delete, delete old data
-        if (!$copy) {
-            $this->metaStore->removeMetadata($oldFile, AJXP_META_SPACE_COMMENTS);
-        }
-        // If copy or move, copy data.
-        if ($newFile != null) {
-            $this->metaStore->setMetadata($newFile, AJXP_META_SPACE_COMMENTS, $oldMeta);
-        }
-    }
-
-
-    /**
-     * @param String $actionName
-     * @param Array $httpVars
-     * @param Array $fileVars
-     */
-    public function switchActions($actionName, $httpVars, $fileVars)
-    {
-        $userSelection = new UserSelection($this->accessDriver->repository, $httpVars);
-        $uniqNode = $userSelection->getUniqueNode();
-        $feedStore = AJXP_PluginsService::getInstance()->getUniqueActivePluginForType("feed");
-        $existingFeed = $uniqNode->retrieveMetadata(AJXP_META_SPACE_COMMENTS, false);
-        if ($existingFeed == null) {
-            $existingFeed = array();
-        }
-        $mess = ConfService::getMessages();
-        switch ($actionName) {
-
-            case "post_comment":
-
-                $uId = AuthService::getLoggedUser()->getId();
-                $limit = $this->getFilteredOption("COMMENT_SIZE_LIMIT");
-                if (!empty($limit)) {
-                    $content = substr(AJXP_Utils::decodeSecureMagic($httpVars["content"]), 0, $limit);
-                } else {
-                    $content = AJXP_Utils::decodeSecureMagic($httpVars["content"]);
-                }
-                $com = array(
-                    "date"      => time(),
-                    "author"    => $uId,
-                    "content"   => $content
-                );
-                $existingFeed[] = $com;
-                if ($feedStore!== false) {
-                    $feedStore->persistMetaObject(
-                        $uniqNode->getPath(),
-                        base64_encode($content),
-                        $uniqNode->getRepositoryId(),
-                        $uniqNode->getRepository()->securityScope(),
-                        $uniqNode->getRepository()->getOwner(),
-                        AuthService::getLoggedUser()->getId(),
-                        AuthService::getLoggedUser()->getGroupPath());
-                } else {
-                    $uniqNode->removeMetadata(AJXP_META_SPACE_COMMENTS, false);
-                    $uniqNode->setMetadata(AJXP_META_SPACE_COMMENTS, $existingFeed, false);
-                }
-                HTMLWriter::charsetHeader("application/json");
-                $com["hdate"] = AJXP_Utils::relativeDate($com["date"], $mess);
-                $com["path"] = $uniqNode->getPath();
-                echo json_encode($com);
-
-                break;
-
-            case "load_comments_feed":
-
-                HTMLWriter::charsetHeader("application/json");
-                if ($feedStore !== false) {
-                    $sortBy = isSet($httpVars["sort_by"])?AJXP_Utils::decodeSecureMagic($httpVars["sort_by"]):"date";
-                    $sortDir = isSet($httpVars["sort_dir"])?AJXP_Utils::decodeSecureMagic($httpVars["sort_dir"]):"asc";
-                    $offset = isSet($httpVars["offset"]) ? intval($httpVars["offset"]) : 0;
-                    $limit = isSet($httpVars["limit"]) ? intval($httpVars["limit"]) : 100;
-                    $uniqNode->loadNodeInfo();
-                    $data = $feedStore->findMetaObjectsByIndexPath(
-                        $this->accessDriver->repository->getId(),
-                        $uniqNode->getPath(),
-                        AuthService::getLoggedUser()->getId(),
-                        AuthService::getLoggedUser()->getGroupPath(),
-                        $offset,
-                        $limit,
-                        $sortBy,
-                        $sortDir,
-                        !$uniqNode->isLeaf()
-                    );
-                    $theFeed = array();
-                    foreach ($data as $stdObject) {
-                        $rPath = substr($stdObject->path, strlen($uniqNode->getPath()));
-                        if($rPath == false && $stdObject->path == $uniqNode->getPath()) $rPath = "";
-                        $rPath = ltrim($rPath, "/");
-                        $newItem = array(
-                            "date"      =>$stdObject->date,
-                            "hdate"     => AJXP_Utils::relativeDate($stdObject->date, $mess),
-                            "author"    => $stdObject->author,
-                            "content"   => base64_decode($stdObject->content),
-                            "path"      => $stdObject->path,
-                            "rpath"     => $rPath,
-                            "uuid"      => $stdObject->uuid
-                        );
-                        if (isSet($previous) && $previous["author"] == $newItem["author"] &&  $previous["path"] == $newItem["path"] && $previous["hdate"] == $newItem["hdate"] ) {
-                            $theFeed[count($theFeed) - 1]["content"].= '<br>'.$newItem["content"];
-
-                        } else {
-                            $theFeed[] = $newItem;
-                        }
-                        $previous = $newItem;
-                    }
-                    echo json_encode($theFeed);
-                } else {
-                    foreach ($existingFeed as &$item) {
-                        $item["hdate"] = AJXP_Utils::relativeDate($item["date"], $mess);
-                    }
-                    echo json_encode($existingFeed);
-                }
-
-                break;
-
-            case "delete_comment":
-
-                $data = json_decode($httpVars["comment_data"], true);
-                if ($feedStore === false) {
-                    $reFeed = array();
-                    if($data["author"] != AuthService::getLoggedUser()->getId()) break;
-                    foreach ($existingFeed as $fElement) {
-                        if ($fElement["date"] == $data["date"] && $fElement["author"] == $data["author"] && $fElement["content"] == $data["content"]) {
-                            continue;
-                        }
-                        $fElement["hdate"] = AJXP_Utils::relativeDate($fElement["date"], $mess);
-                        $reFeed[] = $fElement;
-                    }
-                    $uniqNode->removeMetadata(AJXP_META_SPACE_COMMENTS, false);
-                    $uniqNode->setMetadata(AJXP_META_SPACE_COMMENTS, $reFeed, false);
-                    HTMLWriter::charsetHeader("application/json");
-                    echo json_encode($reFeed);
-                } else {
-                    $feedStore->dismissAlertById($data["uuid"], 1);
-                }
-
-                break;
-
-            default:
-                break;
-        }
-
-    }
-
-}
diff --git a/core/src/plugins/meta.comments/class.CommentsPanel.js b/core/src/plugins/meta.comments/class.CommentsPanel.js
index 854d95e698..2470a5d2d5 100644
--- a/core/src/plugins/meta.comments/class.CommentsPanel.js
+++ b/core/src/plugins/meta.comments/class.CommentsPanel.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 
diff --git a/core/src/plugins/meta.comments/i18n/conf/cs.php b/core/src/plugins/meta.comments/i18n/conf/cs.php
index 3ea4b23337..bfb012b734 100644
--- a/core/src/plugins/meta.comments/i18n/conf/cs.php
+++ b/core/src/plugins/meta.comments/i18n/conf/cs.php
@@ -16,11 +16,11 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Comments Feed" => "Kanál komentářů",
 "Display a chat-like feed on all nodes" => "Zobrazit kanál podobný chatu na všech uzlech",
 "Comment limit" => "Comment limit",
 "Maximum number of characters for each comment" => "Maximum number of characters for each comment",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/meta.comments/i18n/conf/de.php b/core/src/plugins/meta.comments/i18n/conf/de.php
index 27d472d6fd..4dbed67f1a 100644
--- a/core/src/plugins/meta.comments/i18n/conf/de.php
+++ b/core/src/plugins/meta.comments/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Comments Feed" => "Kommentare",
diff --git a/core/src/plugins/meta.comments/i18n/conf/en.php b/core/src/plugins/meta.comments/i18n/conf/en.php
index 92bca4efb0..03dda3ff3e 100644
--- a/core/src/plugins/meta.comments/i18n/conf/en.php
+++ b/core/src/plugins/meta.comments/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Comments Feed" => "Comments Feed",
diff --git a/core/src/plugins/meta.comments/i18n/conf/fr.php b/core/src/plugins/meta.comments/i18n/conf/fr.php
index c7db4b6b10..0cf3ffd284 100644
--- a/core/src/plugins/meta.comments/i18n/conf/fr.php
+++ b/core/src/plugins/meta.comments/i18n/conf/fr.php
@@ -16,11 +16,11 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Comments Feed" => "Flux de commentaires",
 "Display a chat-like feed on all nodes" => "Afficher un flux type chat sur tous les noeuds",
 "Comment limit" => "Limite des commentaires",
 "Maximum number of characters for each comment" => "Nombre de commentaires maximum pour chaque fil.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/meta.comments/i18n/conf/it.php b/core/src/plugins/meta.comments/i18n/conf/it.php
index de311630f3..47ce2b80b6 100644
--- a/core/src/plugins/meta.comments/i18n/conf/it.php
+++ b/core/src/plugins/meta.comments/i18n/conf/it.php
@@ -16,11 +16,11 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Comments Feed" => "Feed Commenti",
 "Display a chat-like feed on all nodes" => "Visualizza un feed simile alle chat per tutti i nodi",
 "Comment limit" => "Comment limit",
 "Maximum number of characters for each comment" => "Maximum number of characters for each comment",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/meta.comments/manifest.xml b/core/src/plugins/meta.comments/manifest.xml
index 5016f27a38..ad005a2983 100644
--- a/core/src/plugins/meta.comments/manifest.xml
+++ b/core/src/plugins/meta.comments/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <meta id="meta.comments" label="CONF_MESSAGE[Comments Feed]" description="CONF_MESSAGE[Display a chat-like feed on all nodes]"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-	<class_definition filename="plugins/meta.comments/class.CommentsMetaManager.php" classname="CommentsMetaManager"/>
+	<class_definition filename="plugins/meta.comments/CommentsMetaManager.php" classname="Pydio\Access\Meta\UserGenerated\CommentsMetaManager"/>
 	<client_settings>
 		<resources>
 			<i18n namespace="meta.comments" path="plugins/meta.comments/i18n" />
@@ -66,6 +66,6 @@
 	</registry_contributions>
 	<dependencies>
 		<!-- Wrapper type plugins only -->
-		<pluginClass pluginName="access.fs|access.ftp|access.demo|access.remote_fs"/>
+		<pluginClass pluginName="access.fs|access.ftp|access.demo"/>
 	</dependencies>
 </meta>
diff --git a/core/src/plugins/meta.exif/ExifMetaManager.php b/core/src/plugins/meta.exif/ExifMetaManager.php
new file mode 100644
index 0000000000..a2c49a921a
--- /dev/null
+++ b/core/src/plugins/meta.exif/ExifMetaManager.php
@@ -0,0 +1,312 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+namespace Pydio\Access\Meta\Exif;
+
+use Pydio\Access\Core\AbstractAccessDriver;
+
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\ApplicationState;
+
+
+
+use Pydio\Core\Utils\TextEncoder;
+use Pydio\Access\Meta\Core\AbstractMetaSource;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Extract Exif data from JPEG IMAGES
+ * @package AjaXplorer_Plugins
+ * @subpackage Meta
+ */
+class ExifMetaManager extends AbstractMetaSource
+{
+    protected $metaDefinitions;
+
+    /**
+     * @param ContextInterface $contextInterface
+     * @param array $options
+     */
+    public function init(ContextInterface $contextInterface, $options = [])
+    {
+        $this->options = $options;
+    }
+
+    public function performChecks()
+    {
+        if (!function_exists("exif_imagetype")) {
+            throw new \Exception("Exif PHP extension does not seem to be installed!");
+        }
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param AbstractAccessDriver $accessDriver
+     */
+    public function initMeta(ContextInterface $ctx, AbstractAccessDriver $accessDriver)
+    {
+        parent::initMeta($ctx, $accessDriver);
+
+        if(!function_exists("exif_read_data")) return ;
+
+        $def = $this->getMetaDefinition();
+        if (!count($def)) {
+            return ;
+        }
+        $cdataHead = '<div>
+                        <div class="panelHeader infoPanelGroup" colspan="2"><span class="user_meta_change" title="AJXP_MESSAGE[meta.exif.1]">AJXP_MESSAGE[meta.exif.2]</span>AJXP_MESSAGE[meta.exif.3]</div>
+                        <div class="infoPanelTable exifPanelTable" cellspacing="0" border="0" cellpadding="0">';
+        $cdataFoot = '</div></div>';
+        $cdataParts = "";
+        $even = false;
+        foreach ($def as $key=>$label) {
+            $trClass = ($even?" class=\"even\"":"");
+            $even = !$even;
+            $cdataParts .= '<div'.$trClass.'><div class="infoPanelLabel">'.$label.'</div><div class="infoPanelValue" id="ip_'.$key.'">#{'.$key.'}</div></div>';
+        }
+
+        $selection = $this->getXPath()->query('registry_contributions/client_configs/component_config[@className="InfoPanel"]/infoPanelExtension');
+        /** @var \DOMElement $contrib */
+        $contrib = $selection->item(0);
+        $contrib->setAttribute("attributes", implode(",", array_keys($def)));
+        $contrib->setAttribute("modifier", "ExifCellRenderer.prototype.infoPanelModifier");
+        $htmlSel = $this->getXPath()->query('html', $contrib);
+        $html = $htmlSel->item(0);
+        $cdata = $this->manifestDoc->createCDATASection($cdataHead . $cdataParts . $cdataFoot);
+        $html->appendChild($cdata);
+
+        parent::init($ctx, $this->options);
+
+    }
+
+    /**
+     * @return array
+     */
+    protected function getMetaDefinition()
+    {
+        if (isSet($this->metaDefinitions)) {
+            return $this->metaDefinitions;
+        }
+        $fields = $this->options["meta_fields"];
+        $arrF = explode(",", $fields);
+        $labels = $this->options["meta_labels"];
+        $arrL = explode(",", $labels);
+        $result = array();
+        foreach ($arrF as $index => $value) {
+            $value = str_replace(".", "-", $value);
+            if (isSet($arrL[$index])) {
+                $result[$value] = $arrL[$index];
+            } else {
+                $result[$value] = $value;
+            }
+        }
+        $this->metaDefinitions = $result;
+        return $result;
+    }
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     */
+    public function extractExif(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface)
+    {
+        $httpVars       = $requestInterface->getParsedBody();
+        $ctx            = $requestInterface->getAttribute("ctx");
+        $userSelection  = UserSelection::fromContext($ctx, $httpVars);
+        $selectedNode   = $userSelection->getUniqueNode();
+        $realFile       = $selectedNode->getRealFile();
+
+        ApplicationState::safeIniSet('exif.encode_unicode', 'UTF-8');
+        $exifData = @exif_read_data($realFile, 0, TRUE);
+        if($exifData === false || !is_array($exifData)) return;
+        if ($exifData !== false && isSet($exifData["GPS"])) {
+            $exifData["COMPUTED_GPS"] = $this->convertGPSData($exifData);
+        }
+        $iptc = $this->extractIPTC($realFile);
+        if(count($iptc)){
+            $exifData["IPTC"] = $iptc;
+        }
+        $excludeTags = array();// array("componentsconfiguration", "filesource", "scenetype", "makernote", "datadump");
+
+        $filteredData = array();
+        foreach ($exifData as $section => $data) {
+            $filteredData[$section] = array();
+            foreach ($data as $key => $value) {
+                if (is_array($value)) {
+                    $value = implode(",", $value);
+                }
+                if(in_array(strtolower($key), $excludeTags)) continue;
+                if(strpos($key, "UndefinedTag:") === 0) continue;
+                $value = preg_replace( '/[^[:print:]]/', '',$value);
+                $filteredData[$section][$key] = TextEncoder::toUTF8($value);
+            }
+        }
+
+        require_once "ExifXmlMessage.php";
+        $x = new \Pydio\Core\Http\Response\SerializableResponseStream();
+        $x->addChunk(new ExifXmlMessage($filteredData));
+        $responseInterface = $responseInterface->withBody($x);
+
+    }
+
+    /**
+     * @param $str
+     * @return string
+     */
+    public function string_format($str)
+    {
+        $tmpStr = "";
+
+        for ($i=0;$i<strlen($str);$i++) {
+            if (ord($str[$i]) !=0) {
+                $tmpStr .= $str[$i];
+            }
+        }
+        return $tmpStr;
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $ajxpNode
+     */
+    public function extractMeta(&$ajxpNode)
+    {
+        $currentFile = $ajxpNode->getUrl();
+        if(!$ajxpNode->isLeaf() || preg_match("/\.zip\//",$currentFile)) return ;
+          if(!preg_match("/\.jpg$|\.jpeg$|\.tif$|\.tiff$/i",$currentFile)) return ;
+        $definitions = $this->getMetaDefinition();
+        if(!count($definitions)) return ;
+        if(!function_exists("exif_read_data")) return ;
+        //if(!exif_imagetype($currentFile)) return ;
+        $realFile = $ajxpNode->getRealFile();
+        $exif = @exif_read_data($realFile, 0, TRUE);
+        $iptc = $this->extractIPTC($realFile);
+
+        if($exif === false) return ;
+        $additionalMeta = array();
+        foreach ($definitions as $def => $label) {
+            list($exifSection, $exifName) = explode("-", $def);
+            if ($exifSection == "COMPUTED_GPS" && !isSet($exif["COMPUTED_GPS"])) {
+                $exif['COMPUTED_GPS'] = $this->convertGPSData($exif);
+            }
+            if (isSet($exif[$exifSection]) && isSet($exif[$exifSection][$exifName])) {
+                $additionalMeta[$def] = $exif[$exifSection][$exifName];
+            }
+            if ($exifSection == "IPTC" && isSet($iptc[$exifName])){
+                $additionalMeta[$def] = $iptc[$exifName];
+            }
+        }
+        $ajxpNode->mergeMetadata($additionalMeta);
+    }
+
+    /**
+     * @param $realFile
+     * @return array
+     */
+    private function extractIPTC($realFile){
+        $output = array();
+        if(!function_exists("iptcparse")) {
+            return $output;
+        }
+        getimagesize($realFile,$info);
+        if(!isset($info['APP13'])) {
+            return $output;
+        }
+        $iptcHeaderArray = array
+        (
+            '2#005'=>'DocumentTitle',
+            '2#010'=>'Urgency',
+            '2#015'=>'Category',
+            '2#020'=>'Subcategories',
+            '2#025'=>'Keywords',
+            '2#040'=>'SpecialInstructions',
+            '2#055'=>'CreationDate',
+            '2#080'=>'AuthorByline',
+            '2#085'=>'AuthorTitle',
+            '2#090'=>'City',
+            '2#095'=>'State',
+            '2#101'=>'Country',
+            '2#103'=>'OTR',
+            '2#105'=>'Headline',
+            '2#110'=>'Source',
+            '2#115'=>'PhotoSource',
+            '2#116'=>'Copyright',
+            '2#120'=>'Caption',
+            '2#122'=>'CaptionWriter'
+        );
+        $iptc =iptcparse($info['APP13']);
+        if (!is_array($iptc)) {
+            return $output;
+        }
+        foreach (array_keys($iptc) as $key) {
+            if (isSet($iptcHeaderArray[$key])) {
+                $cnt = count($iptc[$key]);
+                $val = "";
+                for ($i=0; $i < $cnt; $i++) $val .= $iptc[$key][$i] . " ";
+                $output[$iptcHeaderArray[$key]] = preg_replace( '/[^[:print:]]/', '',$val);
+            }
+        }
+        return $output;
+    }
+
+    /**
+     * @param $exif
+     * @return array
+     */
+    private function convertGPSData($exif)
+    {
+        if(!isSet($exif["GPS"])) return array();
+        require_once(AJXP_INSTALL_PATH . "/plugins/meta.exif/GeoConversion.php");
+        $converter = new GeoConversion();
+        $latDeg=@$this->parseGPSValue($exif["GPS"]["GPSLatitude"][0]);
+        $latMin=@$this->parseGPSValue($exif["GPS"]["GPSLatitude"][1]);
+        $latSec=@$this->parseGPSValue($exif["GPS"]["GPSLatitude"][2]);
+        $latHem=$exif["GPS"]["GPSLatitudeRef"];
+        $longDeg=@$this->parseGPSValue($exif["GPS"]["GPSLongitude"][0]);
+        $longMin=@$this->parseGPSValue($exif["GPS"]["GPSLongitude"][1]);
+        $longSec=@$this->parseGPSValue($exif["GPS"]["GPSLongitude"][2]);
+        $longRef=$exif["GPS"]["GPSLongitudeRef"];
+        $latSign = ($latHem == "S" ? "-":"");
+        $longSign = ($longRef == "W" ? "-":"");
+        $gpsData = array(
+            "GPS_Latitude"=>"$latDeg deg $latMin' $latSec $latHem--".$converter->DMS2Dd($latSign.$latDeg."o$latMin'$latSec"),
+            "GPS_Longitude"=>"$longDeg deg $longMin' $longSec $longRef--".$converter->DMS2Dd($longSign.$longDeg."o$longMin'$longSec"),
+            "GPS_Altitude"=> $exif["GPS"]["GPSAltitude"][0]
+        );
+        return $gpsData;
+    }
+
+    /**
+     * @param $value
+     * @return float
+     */
+    private function parseGPSValue($value)
+    {
+        if (strstr($value, "/") === false) {
+            return floatval($value);
+        } else {
+            $exp = explode("/", $value);
+            return round(intval($exp[0])/intval($exp[1]), 4);
+        }
+    }
+
+}
diff --git a/core/src/plugins/meta.exif/ExifXmlMessage.php b/core/src/plugins/meta.exif/ExifXmlMessage.php
new file mode 100644
index 0000000000..e12bc9d096
--- /dev/null
+++ b/core/src/plugins/meta.exif/ExifXmlMessage.php
@@ -0,0 +1,79 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+namespace Pydio\Access\Meta\Exif;
+
+use Pydio\Core\Utils\Vars\StringHelper;
+
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+
+/**
+ * Class ExifXmlMessage
+ * @package Pydio\Access\Meta\Exif
+ */
+class ExifXmlMessage implements \Pydio\Core\Http\Response\XMLSerializableResponseChunk, \Pydio\Core\Http\Response\JSONSerializableResponseChunk
+{
+    protected $data;
+
+    /**
+     * ExifXmlMessage constructor.
+     * @param $filteredData
+     */
+    public function __construct($filteredData)
+    {
+        $this->data = $filteredData;
+    }
+
+    /**
+     * @return string
+     */
+    public function toXML()
+    {
+        $buffer = "";
+        foreach ($this->data as $section => $data) {
+            $buffer .= "<exifSection name='$section'>";
+            foreach ($data as $key => $value) {
+                $buffer .= "<exifTag name=\"$key\">". StringHelper::xmlEntities($value) ."</exifTag>";
+            }
+            $buffer .= "</exifSection>";
+        }
+        return $buffer;
+
+    }
+
+    /**
+     * @return string
+     */
+    public function jsonSerializableKey()
+    {
+        return "exif";
+    }
+
+    /**
+     * @return mixed
+     */
+    public function jsonSerializableData()
+    {
+        return $this->data;
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/meta.exif/GeoConversion.php b/core/src/plugins/meta.exif/GeoConversion.php
new file mode 100644
index 0000000000..0506af44a0
--- /dev/null
+++ b/core/src/plugins/meta.exif/GeoConversion.php
@@ -0,0 +1,221 @@
+<?php
+//*************************English Description***************************//
+// Class to convert Latitude/Longitude Coordinates                       //
+// Developed by: Di�go Garrido de Almeida (diego@brflog.net)             //
+// Location: Conselheiro Lafaiete - Minas Gerais / Brazil                //
+// License: None, this class can be used without credits                 //
+// Recommended use: To convert the Google Earth standard coordinates     //
+//                  to Google Maps API standard coordinates, to do this, //
+//                  use the method GeoConversao::DMS2Dd.                 //
+//                  eg: $GeoConversao->DMS2Dd('45�22\'38"') -> 45.3772   //
+//                                                                       //
+//                                                                       //
+//                                                                       //
+// Considerations:                                                       //
+// D = Degrees                                                           //
+// M = Minutes                                                           //
+// S = Seconds                                                           //
+// .m = Decimal Minutes                                                  //
+// .s = Decimal Seconds                                                  //
+//                                                                       //
+// DM.m (DMm) = Degrees, Minutes, Decimal Minutes (eg. 45o22.6333)       //
+// D.d (Dd) = Degrees, Decimal Degrees (eg. 45.3772o)                    //
+// DMS (DMS) = Degrees, Minutes, Seconds (eg. 45o22'38")                 //
+//***********************************************************************//
+
+//**************************Descrio em Portugus*********************//
+// Classe para converso de coordenadas de Latitude e Longitude        //
+// Desenvolvida por: Diego Garrido de Almeida                          //
+// Localizado: Conselheiro Lafaiete - Minas Gerais / Brasil           //
+// Licenca: Nenhuma, podendo ser alterada, sem necessidade de creditos //
+// Utilizatio Recomendada: Conversco das Coordenadas do Google Earth   //
+//                         para a API do Google Maps para WEB, atraves //
+//                         do Metodo GeoConversao::DMS2Dd              //
+//                 ex: $GeoConversao->DMS2Dd('45a22\'38"') -> 45.3772  //
+//                                                                     //
+// Considerades:                                                      //
+// D = Degrees (Degrais)                                               //
+// M = Minutes (Minutos)                                               //
+// S = Seconds (Segundos)                                              //
+// .m = Decimal Minutes (Decimos de Minuto)                            //
+// .s = Decimal Seconds (Decimos de Segundo)                           //
+//                                                                     //
+// DM.m (DMm) = Degrees, Minutes, Decimal Minutes (ex. 45o22.6333)     //
+// D.d (Dd) = Degrees, Decimal Degrees (ex. 45.3772o)                  //
+// DMS (DMS) = Degrees, Minutes, Seconds (ex. 45o22'38")               //
+//*********************************************************************//
+namespace Pydio\Access\Meta\Exif;
+
+/**
+ * Class GeoConversion
+ * @package Pydio\Access\Meta\Exif
+ */
+Class GeoConversion{
+
+   public $negative = FALSE;
+   public $real = FALSE;
+   public $negative_path = '';
+
+    /**
+     * @param $string
+     */
+    private function is_negative(&$string)
+   {
+      if ($string[0] == '-') {
+        $this->negative = TRUE;
+        $string = str_replace('-','',$string);
+        $this->negative_path = '-';
+      }
+      $real = TRUE;
+   }
+
+    /**
+     * @param $string
+     * @param $decimal
+     */
+    private function replace_special_chars(&$string, $decimal)
+   {
+       for ($I = 0 ; $I < strlen($string) ; $I++) {
+         $not_decimal = $decimal == FALSE ? ($string[$I] != '.') : TRUE;
+         if (!is_numeric($string[$I]) && $not_decimal && $string[$I] != ' ') {
+           $string[$I] = ';';
+         } else if ($string[$I] == ' ') {
+           $string[$I] = '';
+         }
+       }
+   }
+
+    /**
+     * @param $DMS
+     * @return array
+     */
+    private function SepDMS($DMS)
+   {
+       $this->replace_special_chars($DMS,FALSE);
+       $dados = explode(';',$DMS);
+       return array('D' => $dados[0],'M' => $dados[1],'S' => $dados[2]);
+   }
+
+    /**
+     * @param $DMm
+     * @return array
+     */
+    private function SepDMm($DMm)
+   {
+       $this->replace_special_chars($DMm,TRUE);
+       $dados = explode(';',$DMm);
+       return array('D' => $dados[0],'M' => $dados[1],'m' => $dados[2]);
+   }
+
+    /**
+     * @param $Dd
+     * @return array
+     */
+    private function SepDd($Dd)
+   {
+       $this->replace_special_chars($Dd,TRUE);
+       $dados = explode(';',$Dd);
+       return array('D' => $dados[0],'d' => $dados[1]);
+   }
+
+    /**
+     * @param $DMS
+     * @return string
+     */
+    public function DMS2DMm($DMS)
+   {
+       $this->is_negative($DMS);
+
+       $array_DMm = array('D' => '','M' => '','m' => '');
+       $array_DMS = $this->SepDMS($DMS);
+
+       $array_DMm['m'] = $array_DMS['S']/60;
+       $array_DMm['M'] = $array_DMS['M'];
+       $array_DMm['D'] = $array_DMS['D'];
+
+       return $this->negative_path.$array_DMm['D'].'�'.($array_DMm['M'] + $array_DMm['m']);
+   }
+
+    /**
+     * @param $DMm
+     * @return string
+     */
+    public function DMm2Dd($DMm)
+   {
+       $this->is_negative($DMm);
+
+       $array_Dd = array('D' => '','d' => '');
+       $array_DMm = $this->SepDMm($DMm);
+
+       $array_Dd['d'] = ($array_DMm['M'].'.'.$array_DMm['m'])/60;
+       $array_Dd['D'] =  $array_DMm['D'];
+
+       return $this->negative_path.($array_Dd['D'] + $array_Dd['d']);
+   }
+
+    /**
+     * @param $DMS
+     * @return string
+     */
+    public function DMS2Dd($DMS)
+   {
+       $this->is_negative($DMS);
+
+       $DMm = $this->DMS2DMm($DMS);
+       return $this->DMm2Dd($DMm);
+   }
+
+    /**
+     * @param $DMm
+     * @return string
+     */
+    public function DMm2DMS($DMm)
+   {
+       $this->is_negative($DMm);
+
+       $array_DMS = array('D' => '', 'M' => '', 'S' => '');
+       $array_DMm = $this->SepDMm($DMm);
+
+       $str_S = ((0).".".$array_DMm['m']) * 60;
+
+       $array_DMS['S'] = $str_S;
+       $array_DMS['M'] = $array_DMm['M'];
+       $array_DMS['D'] = $array_DMm['D'];
+
+       return $array_DMS['D'].'�'.$array_DMS['M'].'\''.$array_DMS['S'].'"';
+   }
+
+    /**
+     * @param $Dd
+     * @return string
+     */
+    public function Dd2DMm($Dd)
+   {
+       $this->is_negative($Dd);
+
+       $array_DMm = array('D' => '','M' => '','m' => '');
+       $array_Dd = $this->SepDd($Dd);
+
+       $str_Mm = ((0).".".$array_Dd['d']) * 60;
+
+       $dados_Mm = explode(".",$str_Mm);
+
+       $array_DMm['m'] = $dados_Mm[1];
+       $array_DMm['M'] = $dados_Mm[0];
+       $array_DMm['D'] = $array_Dd['D'];
+
+       return $this->negative_path.$array_DMm['D']."� ".$array_DMm['M'].".".$array_DMm['m'];
+   }
+
+    /**
+     * @param $Dd
+     * @return string
+     */
+    public function Dd2DMS($Dd)
+   {
+       $this->is_negative($Dd);
+
+       $DMm = $this->Dd2DMm($Dd);
+       return $this->DMm2DMS($DMm);
+   }
+}
diff --git a/core/src/plugins/meta.exif/class.ExifCellRenderer.js b/core/src/plugins/meta.exif/class.ExifCellRenderer.js
index 7826a8eaf6..09baac5573 100644
--- a/core/src/plugins/meta.exif/class.ExifCellRenderer.js
+++ b/core/src/plugins/meta.exif/class.ExifCellRenderer.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 Class.create("ExifCellRenderer", {	
 	initialize: function(){
diff --git a/core/src/plugins/meta.exif/class.ExifMetaManager.php b/core/src/plugins/meta.exif/class.ExifMetaManager.php
deleted file mode 100644
index 7d30b885dd..0000000000
--- a/core/src/plugins/meta.exif/class.ExifMetaManager.php
+++ /dev/null
@@ -1,284 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Extract Exif data from JPEG IMAGES
- * @package AjaXplorer_Plugins
- * @subpackage Meta
- */
-class ExifMetaManager extends AJXP_AbstractMetaSource
-{
-    protected $metaDefinitions;
-
-    public function init($options)
-    {
-        $this->options = $options;
-    }
-
-    public function performChecks()
-    {
-        if (!function_exists("exif_imagetype")) {
-            throw new Exception("Exif PHP extension does not seem to be installed!");
-        }
-    }
-
-    public function initMeta($accessDriver)
-    {
-        parent::initMeta($accessDriver);
-        if(!function_exists("exif_read_data")) return ;
-        //$messages = ConfService::getMessages();
-        $def = $this->getMetaDefinition();
-        if (!count($def)) {
-            return ;
-        }
-        $cdataHead = '<div>
-                        <div class="panelHeader infoPanelGroup" colspan="2"><span class="user_meta_change" title="AJXP_MESSAGE[meta.exif.1]">AJXP_MESSAGE[meta.exif.2]</span>AJXP_MESSAGE[meta.exif.3]</div>
-                        <div class="infoPanelTable exifPanelTable" cellspacing="0" border="0" cellpadding="0">';
-        $cdataFoot = '</div></div>';
-        $cdataParts = "";
-        $even = false;
-        foreach ($def as $key=>$label) {
-            $trClass = ($even?" class=\"even\"":"");
-            $even = !$even;
-            $cdataParts .= '<div'.$trClass.'><div class="infoPanelLabel">'.$label.'</div><div class="infoPanelValue" id="ip_'.$key.'">#{'.$key.'}</div></div>';
-        }
-
-        $selection = $this->getXPath()->query('registry_contributions/client_configs/component_config[@className="InfoPanel"]/infoPanelExtension');
-        $contrib = $selection->item(0);
-        $contrib->setAttribute("attributes", implode(",", array_keys($def)));
-        $contrib->setAttribute("modifier", "ExifCellRenderer.prototype.infoPanelModifier");
-        $htmlSel = $this->getXPath()->query('html', $contrib);
-        $html = $htmlSel->item(0);
-        $cdata = $this->manifestDoc->createCDATASection($cdataHead . $cdataParts . $cdataFoot);
-        $html->appendChild($cdata);
-
-        parent::init($this->options);
-
-    }
-
-    protected function getMetaDefinition()
-    {
-        if (isSet($this->metaDefinitions)) {
-            return $this->metaDefinitions;
-        }
-        $fields = $this->options["meta_fields"];
-        $arrF = explode(",", $fields);
-        $labels = $this->options["meta_labels"];
-        $arrL = explode(",", $labels);
-        $result = array();
-        foreach ($arrF as $index => $value) {
-            $value = str_replace(".", "-", $value);
-            if (isSet($arrL[$index])) {
-                $result[$value] = $arrL[$index];
-            } else {
-                $result[$value] = $value;
-            }
-        }
-        $this->metaDefinitions = $result;
-        return $result;
-    }
-
-    public function extractExif($actionName, $httpVars, $fileVars)
-    {
-        $repo = $this->accessDriver->repository;
-        $userSelection = new UserSelection($this->accessDriver->repository, $httpVars);
-        $repo->detectStreamWrapper(true);
-
-        $selectedNode = $userSelection->getUniqueNode();
-        $realFile = AJXP_MetaStreamWrapper::getRealFSReference($selectedNode->getUrl());
-
-        AJXP_Utils::safeIniSet('exif.encode_unicode', 'UTF-8');
-        $exifData = @exif_read_data($realFile, 0, TRUE);
-        if($exifData === false || !is_array($exifData)) return;
-        if ($exifData !== false && isSet($exifData["GPS"])) {
-            $exifData["COMPUTED_GPS"] = $this->convertGPSData($exifData);
-        }
-        $iptc = $this->extractIPTC($realFile);
-        if(count($iptc)){
-            $exifData["IPTC"] = $iptc;
-        }
-        $excludeTags = array();// array("componentsconfiguration", "filesource", "scenetype", "makernote", "datadump");
-        $format = "xml";
-        if(isSet($httpVars["format"]) && $httpVars["format"] == "json"){
-            $format = "json";
-        }
-        $filteredData = array();
-        foreach ($exifData as $section => $data) {
-            $filteredData[$section] = array();
-            foreach ($data as $key => $value) {
-                if (is_array($value)) {
-                    $value = implode(",", $value);
-                }
-                if(in_array(strtolower($key), $excludeTags)) continue;
-                if(strpos($key, "UndefinedTag:") === 0) continue;
-                $value = preg_replace( '/[^[:print:]]/', '',$value);
-                $filteredData[$section][$key] = SystemTextEncoding::toUTF8($value);
-            }
-        }
-
-        if($format == "xml"){
-
-            AJXP_XMLWriter::header("metadata", array("file" => $selectedNode->getPath(), "type" => "EXIF"));
-            foreach ($filteredData as $section => $data) {
-                print("<exifSection name='$section'>");
-                foreach ($data as $key => $value) {
-                    print("<exifTag name=\"$key\">". AJXP_Utils::xmlEntities($value)."</exifTag>");
-                }
-                print("</exifSection>");
-            }
-            AJXP_XMLWriter::close("metadata");
-
-        }else{
-
-            HTMLWriter::charsetHeader("application/json");
-            echo json_encode($filteredData);
-
-        }
-
-    }
-
-    public function string_format($str)
-    {
-        $tmpStr = "";
-
-        for ($i=0;$i<strlen($str);$i++) {
-            if (ord($str[$i]) !=0) {
-                $tmpStr .= $str[$i];
-            }
-        }
-        return $tmpStr;
-    }
-
-    /**
-     * @param AJXP_Node $ajxpNode
-     */
-    public function extractMeta(&$ajxpNode)
-    {
-        $currentFile = $ajxpNode->getUrl();
-        if(!$ajxpNode->isLeaf() || preg_match("/\.zip\//",$currentFile)) return ;
-          if(!preg_match("/\.jpg$|\.jpeg$|\.tif$|\.tiff$/i",$currentFile)) return ;
-        $definitions = $this->getMetaDefinition();
-        if(!count($definitions)) return ;
-        if(!function_exists("exif_read_data")) return ;
-        //if(!exif_imagetype($currentFile)) return ;
-        $realFile = $ajxpNode->getRealFile();
-        $exif = @exif_read_data($realFile, 0, TRUE);
-        $iptc = $this->extractIPTC($realFile);
-
-        if($exif === false) return ;
-        $additionalMeta = array();
-        foreach ($definitions as $def => $label) {
-            list($exifSection, $exifName) = explode("-", $def);
-            if ($exifSection == "COMPUTED_GPS" && !isSet($exif["COMPUTED_GPS"])) {
-                $exif['COMPUTED_GPS'] = $this->convertGPSData($exif);
-            }
-            if (isSet($exif[$exifSection]) && isSet($exif[$exifSection][$exifName])) {
-                $additionalMeta[$def] = $exif[$exifSection][$exifName];
-            }
-            if ($exifSection == "IPTC" && isSet($iptc[$exifName])){
-                $additionalMeta[$def] = $iptc[$exifName];
-            }
-        }
-        $ajxpNode->mergeMetadata($additionalMeta);
-    }
-
-    private function extractIPTC($realFile){
-        $output = array();
-        if(!function_exists("iptcparse")) {
-            return $output;
-        }
-        getimagesize($realFile,$info);
-        if(!isset($info['APP13'])) {
-            return $output;
-        }
-        $iptcHeaderArray = array
-        (
-            '2#005'=>'DocumentTitle',
-            '2#010'=>'Urgency',
-            '2#015'=>'Category',
-            '2#020'=>'Subcategories',
-            '2#025'=>'Keywords',
-            '2#040'=>'SpecialInstructions',
-            '2#055'=>'CreationDate',
-            '2#080'=>'AuthorByline',
-            '2#085'=>'AuthorTitle',
-            '2#090'=>'City',
-            '2#095'=>'State',
-            '2#101'=>'Country',
-            '2#103'=>'OTR',
-            '2#105'=>'Headline',
-            '2#110'=>'Source',
-            '2#115'=>'PhotoSource',
-            '2#116'=>'Copyright',
-            '2#120'=>'Caption',
-            '2#122'=>'CaptionWriter'
-        );
-        $iptc =iptcparse($info['APP13']);
-        if (!is_array($iptc)) {
-            return $output;
-        }
-        foreach (array_keys($iptc) as $key) {
-            if (isSet($iptcHeaderArray[$key])) {
-                $cnt = count($iptc[$key]);
-                $val = "";
-                for ($i=0; $i < $cnt; $i++) $val .= $iptc[$key][$i] . " ";
-                $output[$iptcHeaderArray[$key]] = preg_replace( '/[^[:print:]]/', '',$val);
-            }
-        }
-        return $output;
-    }
-
-    private function convertGPSData($exif)
-    {
-        if(!isSet($exif["GPS"])) return array();
-        require_once(AJXP_INSTALL_PATH."/plugins/meta.exif/class.GeoConversion.php");
-        $converter = new GeoConversion();
-        $latDeg=@$this->parseGPSValue($exif["GPS"]["GPSLatitude"][0]);
-        $latMin=@$this->parseGPSValue($exif["GPS"]["GPSLatitude"][1]);
-        $latSec=@$this->parseGPSValue($exif["GPS"]["GPSLatitude"][2]);
-        $latHem=$exif["GPS"]["GPSLatitudeRef"];
-        $longDeg=@$this->parseGPSValue($exif["GPS"]["GPSLongitude"][0]);
-        $longMin=@$this->parseGPSValue($exif["GPS"]["GPSLongitude"][1]);
-        $longSec=@$this->parseGPSValue($exif["GPS"]["GPSLongitude"][2]);
-        $longRef=$exif["GPS"]["GPSLongitudeRef"];
-        $latSign = ($latHem == "S" ? "-":"");
-        $longSign = ($longRef == "W" ? "-":"");
-        $gpsData = array(
-            "GPS_Latitude"=>"$latDeg deg $latMin' $latSec $latHem--".$converter->DMS2Dd($latSign.$latDeg."o$latMin'$latSec"),
-            "GPS_Longitude"=>"$longDeg deg $longMin' $longSec $longRef--".$converter->DMS2Dd($longSign.$longDeg."o$longMin'$longSec"),
-            "GPS_Altitude"=> $exif["GPS"]["GPSAltitude"][0]
-        );
-        return $gpsData;
-    }
-
-    private function parseGPSValue($value)
-    {
-        if (strstr($value, "/") === false) {
-            return floatval($value);
-        } else {
-            $exp = explode("/", $value);
-            return round(intval($exp[0])/intval($exp[1]), 4);
-        }
-    }
-
-}
diff --git a/core/src/plugins/meta.exif/class.GeoConversion.php b/core/src/plugins/meta.exif/class.GeoConversion.php
deleted file mode 100644
index c1196739c0..0000000000
--- a/core/src/plugins/meta.exif/class.GeoConversion.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-//*************************English Description***************************//
-// Class to convert Latitude/Longitude Coordinates                       //
-// Developed by: Di�go Garrido de Almeida (diego@brflog.net)             //
-// Location: Conselheiro Lafaiete - Minas Gerais / Brazil                //
-// License: None, this class can be used without credits                 //
-// Recommended use: To convert the Google Earth standard coordinates     //
-//                  to Google Maps API standard coordinates, to do this, //
-//                  use the method GeoConversao::DMS2Dd.                 //
-//                  eg: $GeoConversao->DMS2Dd('45�22\'38"') -> 45.3772   //
-//                                                                       //
-//                                                                       //
-//                                                                       //
-// Considerations:                                                       //
-// D = Degrees                                                           //
-// M = Minutes                                                           //
-// S = Seconds                                                           //
-// .m = Decimal Minutes                                                  //
-// .s = Decimal Seconds                                                  //
-//                                                                       //
-// DM.m (DMm) = Degrees, Minutes, Decimal Minutes (eg. 45o22.6333)       //
-// D.d (Dd) = Degrees, Decimal Degrees (eg. 45.3772o)                    //
-// DMS (DMS) = Degrees, Minutes, Seconds (eg. 45o22'38")                 //
-//***********************************************************************//
-
-//**************************Descri��o em Portugu�s*********************//
-// Classe para convers�o de coordenadas de Latitude e Longitude        //
-// Desenvolvida por: Di�go Garrido de Almeida                          //
-// Localiza��o: Conselheiro Lafaiete - Minas Gerais / Brasil           //
-// Licen�a: Nenhuma, podendo ser alterada, sem necessidade de cr�ditos //
-// Utiliza��o Recomendada: Convers�o das Coordenadas do Google Earth   //
-//                         para a API do Google Maps para WEB, atrav�s //
-//                         do M�todo GeoConversao::DMS2Dd              //
-//                 ex: $GeoConversao->DMS2Dd('45�22\'38"') -> 45.3772  //
-//                                                                     //
-// Considera��es:                                                      //
-// D = Degrees (Degrais)                                               //
-// M = Minutes (Minutos)                                               //
-// S = Seconds (Segundos)                                              //
-// .m = Decimal Minutes (D�cimos de Minuto)                            //
-// .s = Decimal Seconds (D�cimos de Segundo)                           //
-//                                                                     //
-// DM.m (DMm) = Degrees, Minutes, Decimal Minutes (ex. 45o22.6333)     //
-// D.d (Dd) = Degrees, Decimal Degrees (ex. 45.3772o)                  //
-// DMS (DMS) = Degrees, Minutes, Seconds (ex. 45o22'38")               //
-//*********************************************************************//
-
-
-Class GeoConversion{
-
-   public $negative = FALSE;
-   public $real = FALSE;
-   public $negative_path = '';
-
-   private function is_negative(&$string)
-   {
-      if ($string[0] == '-') {
-        $this->negative = TRUE;
-        $string = str_replace('-','',$string);
-        $this->negative_path = '-';
-      }
-      $real = TRUE;
-   }
-
-   private function replace_special_chars(&$string,$decimal)
-   {
-       for ($I = 0 ; $I < strlen($string) ; $I++) {
-         $not_decimal = $decimal == FALSE ? ($string[$I] != '.') : TRUE;
-         if (!is_numeric($string[$I]) && $not_decimal && $string[$I] != ' ') {
-           $string[$I] = ';';
-         } else if ($string[$I] == ' ') {
-           $string[$I] = '';
-         }
-       }
-   }
-
-   private function SepDMS($DMS)
-   {
-       $this->replace_special_chars($DMS,FALSE);
-       $dados = explode(';',$DMS);
-       return array('D' => $dados[0],'M' => $dados[1],'S' => $dados[2]);
-   }
-
-   private function SepDMm($DMm)
-   {
-       $this->replace_special_chars($DMm,TRUE);
-       $dados = explode(';',$DMm);
-       return array('D' => $dados[0],'M' => $dados[1],'m' => $dados[2]);
-   }
-
-   private function SepDd($Dd)
-   {
-       $this->replace_special_chars($Dd,TRUE);
-       $dados = explode(';',$Dd);
-       return array('D' => $dados[0],'d' => $dados[1]);
-   }
-
-   public function DMS2DMm($DMS)
-   {
-       $this->is_negative($DMS);
-
-       $array_DMm = array('D' => '','M' => '','m' => '');
-       $array_DMS = $this->SepDMS($DMS);
-
-       $array_DMm['m'] = $array_DMS['S']/60;
-       $array_DMm['M'] = $array_DMS['M'];
-       $array_DMm['D'] = $array_DMS['D'];
-
-       return $this->negative_path.$array_DMm['D'].'�'.($array_DMm['M'] + $array_DMm['m']);
-   }
-
-   public function DMm2Dd($DMm)
-   {
-       $this->is_negative($DMm);
-
-       $array_Dd = array('D' => '','d' => '');
-       $array_DMm = $this->SepDMm($DMm);
-
-       $array_Dd['d'] = ($array_DMm['M'].'.'.$array_DMm['m'])/60;
-       $array_Dd['D'] =  $array_DMm['D'];
-
-       return $this->negative_path.($array_Dd['D'] + $array_Dd['d']);
-   }
-
-   public function DMS2Dd($DMS)
-   {
-       $this->is_negative($DMS);
-
-       $DMm = $this->DMS2DMm($DMS);
-       return $this->DMm2Dd($DMm);
-   }
-
-   public function DMm2DMS($DMm)
-   {
-       $this->is_negative($DMm);
-
-       $array_DMS = array('D' => '', 'M' => '', 'S' => '');
-       $array_DMm = $this->SepDMm($DMm);
-
-       $str_S = ((0).".".$array_DMm['m']) * 60;
-
-       $array_DMS['S'] = $str_S;
-       $array_DMS['M'] = $array_DMm['M'];
-       $array_DMS['D'] = $array_DMm['D'];
-
-       return $array_DMS['D'].'�'.$array_DMS['M'].'\''.$array_DMS['S'].'"';
-   }
-
-   public function Dd2DMm($Dd)
-   {
-       $this->is_negative($Dd);
-
-       $array_DMm = array('D' => '','M' => '','m' => '');
-       $array_Dd = $this->SepDd($Dd);
-
-       $str_Mm = ((0).".".$array_Dd['d']) * 60;
-
-       $dados_Mm = explode(".",$str_Mm);
-
-       $array_DMm['m'] = $dados_Mm[1];
-       $array_DMm['M'] = $dados_Mm[0];
-       $array_DMm['D'] = $array_Dd['D'];
-
-       return $this->negative_path.$array_DMm['D']."� ".$array_DMm['M'].".".$array_DMm['m'];
-   }
-
-   public function Dd2DMS($Dd)
-   {
-       $this->is_negative($Dd);
-
-       $DMm = $this->Dd2DMm($Dd);
-       return $this->DMm2DMS($DMm);
-   }
-}
diff --git a/core/src/plugins/meta.exif/i18n/conf/de.php b/core/src/plugins/meta.exif/i18n/conf/de.php
index cefca2dd96..1c448496e7 100644
--- a/core/src/plugins/meta.exif/i18n/conf/de.php
+++ b/core/src/plugins/meta.exif/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Exif Metadata" => "Exif-Metadaten",
diff --git a/core/src/plugins/meta.exif/i18n/conf/en.php b/core/src/plugins/meta.exif/i18n/conf/en.php
index 68b140e9f7..68fc9f8a3a 100644
--- a/core/src/plugins/meta.exif/i18n/conf/en.php
+++ b/core/src/plugins/meta.exif/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Exif Metadata" => "Exif Metadata",
diff --git a/core/src/plugins/meta.exif/i18n/conf/fr.php b/core/src/plugins/meta.exif/i18n/conf/fr.php
index 41cadd3877..158ab79f63 100644
--- a/core/src/plugins/meta.exif/i18n/conf/fr.php
+++ b/core/src/plugins/meta.exif/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Exif Metadata" => "Métadonnées EXIF",
diff --git a/core/src/plugins/meta.exif/i18n/conf/it.php b/core/src/plugins/meta.exif/i18n/conf/it.php
index 437069e2fa..ace0596af3 100644
--- a/core/src/plugins/meta.exif/i18n/conf/it.php
+++ b/core/src/plugins/meta.exif/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Exif Metadata" => "Metadati Exif",
diff --git a/core/src/plugins/meta.exif/i18n/conf/pt.php b/core/src/plugins/meta.exif/i18n/conf/pt.php
index af4fb5e2b0..5e4c1f6105 100644
--- a/core/src/plugins/meta.exif/i18n/conf/pt.php
+++ b/core/src/plugins/meta.exif/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Exif Metadata" => "Exif Metadata",
diff --git a/core/src/plugins/meta.exif/i18n/fr.php b/core/src/plugins/meta.exif/i18n/fr.php
index 740919fc1c..51dbc56ad1 100644
--- a/core/src/plugins/meta.exif/i18n/fr.php
+++ b/core/src/plugins/meta.exif/i18n/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Géolocalisation",
diff --git a/core/src/plugins/meta.exif/i18n/si.php b/core/src/plugins/meta.exif/i18n/si.php
index c03bf2b846..da5ec3c1b0 100644
--- a/core/src/plugins/meta.exif/i18n/si.php
+++ b/core/src/plugins/meta.exif/i18n/si.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
  // Slovenian translation: April 21 2011 by Vladimir Bohinc (vladimir.bohinc@gmail.com)
 //
diff --git a/core/src/plugins/meta.exif/manifest.xml b/core/src/plugins/meta.exif/manifest.xml
index 8bcd537746..c8df599dcf 100644
--- a/core/src/plugins/meta.exif/manifest.xml
+++ b/core/src/plugins/meta.exif/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <meta id="meta.exif" label="CONF_MESSAGE[Exif Metadata]" description="CONF_MESSAGE[Extracts the EXIF metadata of a JPG image. Used in conjunction with editor.exif]"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-	<class_definition filename="plugins/meta.exif/class.ExifMetaManager.php" classname="ExifMetaManager"/>
+	<class_definition filename="plugins/meta.exif/ExifMetaManager.php" classname="Pydio\Access\Meta\Exif\ExifMetaManager"/>
 	<client_settings icon="plugins/access.mysql/resources/images/mysql_icon.png">
 		<resources>
 			<i18n namespace="meta.exif" path="plugins/meta.exif/i18n" />
@@ -36,6 +36,6 @@
 	</registry_contributions>
 	<dependencies>
 		<!-- Wrapper type plugins only -->
-		<pluginClass pluginName="access.fs|access.ftp|access.demo|access.remote_fs"/>
+		<pluginClass pluginName="access.fs|access.ftp|access.demo"/>
 	</dependencies>
 </meta>
diff --git a/core/src/plugins/meta.filehasher/FileHasher.php b/core/src/plugins/meta.filehasher/FileHasher.php
new file mode 100644
index 0000000000..e1ab61edfd
--- /dev/null
+++ b/core/src/plugins/meta.filehasher/FileHasher.php
@@ -0,0 +1,340 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Meta\Hash;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Access\Core\MetaStreamWrapper;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Access\Meta\Core\IFileHasher;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\LocalCache;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Services\ApplicationState;
+
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Access\Meta\Core\AbstractMetaSource;
+use Pydio\Access\Metastore\Core\IMetaStoreProvider;
+use Zend\Diactoros\Response\JsonResponse;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Generates and caches and md5 hash of each file
+ * @package Pydio\Access\Meta\Hash
+ */
+class FileHasher extends AbstractMetaSource implements IFileHasher
+{
+    const METADATA_HASH_NAMESPACE = "file_hahser";
+    /**
+     * @var IMetaStoreProvider
+     */
+    protected $metaStore;
+
+    /**
+     * @return bool
+     */
+    public static function rsyncEnabled()
+    {
+        return function_exists("rsync_generate_signature");
+    }
+
+    /**
+     * @return array
+     */
+    public function getConfigs()
+    {
+        $data = parent::getConfigs();
+        $this->filterData($data);
+        return $data;
+    }
+
+    /**
+     * @param array $data
+     */
+    public function loadConfigs($data)
+    {
+        $this->filterData($data);
+        parent::loadConfigs($data);
+
+    }
+
+    /**
+     * @param $data
+     */
+    private function filterData(&$data)
+    {
+        $data["RSYNC_SUPPORTED"] = self::rsyncEnabled();
+    }
+
+
+    /**
+     * @param ContextInterface $ctx
+     * @param \DOMNode $contribNode
+     */
+    public function parseSpecificContributions(ContextInterface $ctx, \DOMNode &$contribNode)
+    {
+        parent::parseSpecificContributions($ctx, $contribNode);
+        if (!self::rsyncEnabled() && $contribNode->nodeName == "actions") {
+            // REMOVE rsync actions, this will advertise the fact that
+            // rsync is not enabled.
+            $xp = new \DOMXPath($contribNode->ownerDocument);
+            $children = $xp->query("action[contains(@name, 'filehasher')]", $contribNode);
+            foreach ($children as $child) {
+                $contribNode->removeChild($child);
+            }
+        }
+        if ($this->getContextualOption($ctx, "CACHE_XML_TREE") !== true && $contribNode->nodeName == "actions") {
+            // REMOVE pre and post process on LS action
+            $xp = new \DOMXPath($contribNode->ownerDocument);
+            $children = $xp->query("action[@name='ls']", $contribNode);
+            foreach ($children as $child) {
+                $contribNode->removeChild($child);
+            }
+        }
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param AbstractAccessDriver $accessDriver
+     * @throws PydioException
+     */
+    public function initMeta(ContextInterface $ctx, AbstractAccessDriver $accessDriver)
+    {
+        parent::initMeta($ctx, $accessDriver);
+        $store = PluginsService::getInstance($ctx)->getUniqueActivePluginForType("metastore");
+        if ($store === false) {
+            throw new PydioException("The 'meta.simple_lock' plugin requires at least one active 'metastore' plugin");
+        }
+        $this->metaStore = $store;
+        $this->metaStore->initMeta($ctx, $accessDriver);
+    }
+
+    /**
+     * Handle stat_hash action
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     */
+    public function statAction(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface){
+
+        $selection = UserSelection::fromContext($requestInterface->getAttribute("ctx"), $requestInterface->getParsedBody());
+
+        clearstatcache();
+        if ($selection->isUnique()) {
+            $node = $selection->getUniqueNode();
+            $stat = @stat($node->getUrl());
+            if (!$stat || !is_readable($node->getUrl())) {
+                $responseData = new \stdClass();
+            } else {
+                if(is_file($node->getUrl())) {
+                    $serverParams = $requestInterface->getServerParams();
+                    if(isSet($serverParams["HTTP_RANGE"])){
+                        $fullSize = floatval($stat['size']);
+                        $ranges = explode('=', $serverParams["HTTP_RANGE"]);
+                        $offsets = explode('-', $ranges[1]);
+                        $offset = floatval($offsets[0]);
+                        $length = floatval($offsets[1]) - $offset;
+                        if (!$length) $length = $fullSize - $offset;
+                        if ($length + $offset > $fullSize || $length < 0) $length = $fullSize - $offset;
+                        $hash = $this->getPartialHash($node, $offset, $length);
+                    }else{
+                        $selection->getUniqueNode()->loadNodeInfo(true);
+                        $hash = $this->getFileHash($selection->getUniqueNode());
+                    }
+                }
+                else $hash = 'directory';
+                $stat[13] = $stat["hash"] = $hash;
+                $responseData = $stat;
+            }
+        } else {
+            $files = $selection->getFiles();
+            $responseData = [];
+            foreach ($files as $index => $path) {
+                $node = new AJXP_Node($selection->currentBaseUrl().$path);
+                $stat = @stat($selection->currentBaseUrl().$path);
+                if(!$stat || !is_readable($node->getUrl())) {
+                    $stat = new \stdClass();
+                } else {
+                    if(!is_dir($node->getUrl())) {
+                        $node->loadNodeInfo(true);
+                        $hash = $this->getFileHash($node);
+                    } else {
+                        $hash = 'directory';
+                    }
+                    $stat[13] = $stat["hash"] = $hash;
+                }
+                $responseData[$path] = $stat;
+            }
+
+        }
+
+        $responseInterface = new JsonResponse($responseData);
+
+    }
+
+    /**
+     * @param $actionName
+     * @param $httpVars
+     * @param $fileVars
+     * @param ContextInterface $ctx
+     * @throws \Exception
+     */
+    public function switchActions($actionName, $httpVars, $fileVars, ContextInterface $ctx)
+    {
+        $selection = UserSelection::fromContext($ctx, $httpVars);
+        
+        switch ($actionName) {
+
+            case "filehasher_signature":
+                $file = $selection->getUniqueNode();
+                if(!file_exists($file->getUrl())) break;
+                $cacheItem = LocalCache::getItem("signatures", $file->getUrl(), array($this, "generateSignature"));
+                $data = $cacheItem->getData();
+                header("Content-Type:application/octet-stream");
+                header("Content-Length", strlen($data));
+                echo($data);
+                break;
+            
+            case "filehasher_delta":
+            case "filehasher_patch":
+                // HANDLE UPLOAD DATA
+                $this->logDebug("Received signature file, should compute delta now");
+                if (!isSet($fileVars) && !is_array($fileVars["userfile_0"])) {
+                    throw new \Exception("These action should find uploaded data");
+                }
+                $signature_delta_file = $fileVars["userfile_0"]["tmp_name"];
+                $fileUrl = $selection->getUniqueNode()->getUrl();
+                $file = MetaStreamWrapper::getRealFSReference($fileUrl, true);
+                if ($actionName == "filehasher_delta") {
+                    $deltaFile = tempnam(ApplicationState::getAjxpTmpDir(), $actionName."-delta");
+                    $this->logDebug("Received signature file, should compute delta now");
+                    \rsync_generate_delta($signature_delta_file, $file, $deltaFile);
+                    $this->logDebug("Computed delta file, size is ".filesize($deltaFile));
+                    header("Content-Type:application/octet-stream");
+                    header("Content-Length:".filesize($deltaFile));
+                    readfile($deltaFile);
+                    unlink($deltaFile);
+                } else {
+                    $patched = $file.".rdiff_patched";
+                    \rsync_patch_file($file, $signature_delta_file, $patched);
+                    rename($patched, $file);
+                    $node = $selection->getUniqueNode();
+                    Controller::applyHook("node.change", array($node, $node, false));
+                    header("Content-Type:text/plain");
+                    echo md5_file($file);
+                }
+                break;
+
+        }
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     * @return String md5
+     */
+    public function getFileHash(AJXP_Node $node)
+    {
+        // Make sure that node is really there
+        if ($node->isLeaf()) {
+            $md5 = null;
+            if ($this->metaStore != false) {
+
+                $hashMeta = $this->metaStore->retrieveMetadata(
+                    $node,
+                    FileHasher::METADATA_HASH_NAMESPACE,
+                    false,
+                    AJXP_METADATA_SCOPE_GLOBAL);
+                $mtime = filemtime($node->getUrl());
+                if(is_array($hashMeta)
+                    && array_key_exists("md5", $hashMeta)
+                    && array_key_exists("md5_mtime", $hashMeta)
+                    && $hashMeta["md5_mtime"] >= $mtime){
+                    $md5 = $hashMeta["md5"];
+                }
+                if ($md5 == null) {
+                    $md5 = md5_file($node->getUrl());
+                    $hashMeta = array(
+                        "md5" => $md5,
+                        "md5_mtime" => $mtime
+                    );
+                    $this->metaStore->setMetadata($node, FileHasher::METADATA_HASH_NAMESPACE, $hashMeta, false, AJXP_METADATA_SCOPE_GLOBAL);
+                }
+
+            } else {
+
+                $md5 = md5_file($node->getUrl());
+
+            }
+            $node->mergeMetadata(array("md5" => $md5));
+            return $md5;
+        }else{
+            return 'directory';
+        }
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     * @param float $offset
+     * @param float $length
+     * @return String md5
+     */
+    public function getPartialHash($node, $offset, $length){
+
+        $this->logDebug('Getting partial hash from ' . $offset . ' to ' . $length );
+        $fp = fopen($node->getUrl(), "r");
+        $ctx = hash_init('md5');
+        if($offset > 0){
+            fseek($fp, $offset);
+        }
+        hash_update_stream($ctx, $fp, $length);
+        $hash = hash_final($ctx);
+        $this->logDebug('Partial hash is ' . $hash );
+        fclose($fp);
+        return $hash;
+
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $oldNode
+     * @param \Pydio\Access\Core\Model\AJXP_Node $newNode
+     * @param bool $copy
+     */
+    public function invalidateHash($oldNode = null, $newNode = null, $copy = false)
+    {
+        if($this->metaStore == false) return;
+        if ($oldNode != null) {
+            $this->metaStore->removeMetadata($oldNode, FileHasher::METADATA_HASH_NAMESPACE, false, AJXP_METADATA_SCOPE_GLOBAL);
+        }
+    }
+
+
+    /**
+     * @param $masterFile
+     * @param $targetFile
+     */
+    public function generateSignature($masterFile, $targetFile)
+    {
+        \rsync_generate_signature($masterFile, $targetFile);
+    }
+}
diff --git a/core/src/plugins/meta.filehasher/class.FileHasher.php b/core/src/plugins/meta.filehasher/class.FileHasher.php
deleted file mode 100755
index a10b9842f1..0000000000
--- a/core/src/plugins/meta.filehasher/class.FileHasher.php
+++ /dev/null
@@ -1,318 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-/**
- * Generates and caches and md5 hash of each file
- * @package AjaXplorer_Plugins
- * @subpackage Meta
- */
-class FileHasher extends AJXP_AbstractMetaSource
-{
-    const METADATA_HASH_NAMESPACE = "file_hahser";
-    /**
-     * @var MetaStoreProvider
-     */
-    protected $metaStore;
-
-    public static function rsyncEnabled()
-    {
-        return function_exists("rsync_generate_signature");
-    }
-
-    public function getConfigs()
-    {
-        $data = parent::getConfigs();
-        $this->filterData($data);
-        return $data;
-    }
-    public function loadConfigs($data)
-    {
-        $this->filterData($data);
-        parent::loadConfigs($data);
-
-    }
-
-    private function filterData(&$data)
-    {
-        $data["RSYNC_SUPPORTED"] = self::rsyncEnabled();
-    }
-
-
-    public function parseSpecificContributions(&$contribNode)
-    {
-        parent::parseSpecificContributions($contribNode);
-        if (!self::rsyncEnabled() && $contribNode->nodeName == "actions") {
-            // REMOVE rsync actions, this will advertise the fact that
-            // rsync is not enabled.
-            $xp = new DOMXPath($contribNode->ownerDocument);
-            $children = $xp->query("action[contains(@name, 'filehasher')]", $contribNode);
-            foreach ($children as $child) {
-                $contribNode->removeChild($child);
-            }
-        }
-        if ($this->getFilteredOption("CACHE_XML_TREE") !== true && $contribNode->nodeName == "actions") {
-            // REMOVE pre and post process on LS action
-            $xp = new DOMXPath($contribNode->ownerDocument);
-            $children = $xp->query("action[@name='ls']", $contribNode);
-            foreach ($children as $child) {
-                $contribNode->removeChild($child);
-            }
-        }
-    }
-
-    public function initMeta($accessDriver)
-    {
-        parent::initMeta($accessDriver);
-        $store = AJXP_PluginsService::getInstance()->getUniqueActivePluginForType("metastore");
-        if ($store === false) {
-            throw new Exception("The 'meta.simple_lock' plugin requires at least one active 'metastore' plugin");
-        }
-        $this->metaStore = $store;
-        $this->metaStore->initMeta($accessDriver);
-    }
-
-    private function getTreeName()
-    {
-        $repo = $this->accessDriver->repository;
-        $base = AJXP_SHARED_CACHE_DIR."/trees/tree-".$repo->getId();
-        $secuScope = $repo->securityScope();
-        if ($secuScope == "USER") {
-            $base .= "-".AuthService::getLoggedUser()->getId();
-        } else if ($secuScope == "GROUP") {
-            $base .= "-".str_replace("/", "_", AuthService::getLoggedUser()->getGroupPath());
-        }
-        return $base . "-full.xml";
-    }
-
-    public function checkFullTreeCache($actionName, &$httpVars, &$fileVars)
-    {
-        $cName = $this->getTreeName();
-        if (is_file($cName)) {
-            header('Content-Type: text/xml; charset=UTF-8');
-            header('Cache-Control: no-cache');
-            if ( strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate') ) {
-                header('Content-Encoding:deflate');
-                readfile($cName.".gz");
-            } else {
-                readfile($cName);
-            }
-            exit();
-        }
-    }
-
-    public function cacheFullTree($actionName, $httpVars, $postProcessData)
-    {
-        $cName = $this->getTreeName();
-        if(!is_dir(dirname($cName))) mkdir(dirname($cName));
-        $xmlString = $postProcessData["ob_output"];
-        file_put_contents($cName, $xmlString);
-        file_put_contents($cName.".gz", gzdeflate($xmlString, 9));
-        print($xmlString);
-    }
-
-    public function switchActions($actionName, $httpVars, $fileVars)
-    {
-        //$urlBase = $this->accessDriver
-        $repository = $this->accessDriver->repository;
-        if (!$repository->detectStreamWrapper(true)) {
-            return false;
-        }
-        $selection = new UserSelection($repository, $httpVars);
-        switch ($actionName) {
-            case "filehasher_signature":
-                $file = $selection->getUniqueNode();
-                if(!file_exists($file->getUrl())) break;
-                $cacheItem = AJXP_Cache::getItem("signatures", $file->getUrl(), array($this, "generateSignature"));
-                $data = $cacheItem->getData();
-                header("Content-Type:application/octet-stream");
-                header("Content-Length", strlen($data));
-                echo($data);
-                break;
-            case "filehasher_delta":
-            case "filehasher_patch":
-                // HANDLE UPLOAD DATA
-                $this->logDebug("Received signature file, should compute delta now");
-                if (!isSet($fileVars) && !is_array($fileVars["userfile_0"])) {
-                    throw new Exception("These action should find uploaded data");
-                }
-                $signature_delta_file = $fileVars["userfile_0"]["tmp_name"];
-                $fileUrl = $selection->getUniqueNode()->getUrl();
-                $file = AJXP_MetaStreamWrapper::getRealFSReference($fileUrl, true);
-                if ($actionName == "filehasher_delta") {
-                    $deltaFile = tempnam(AJXP_Utils::getAjxpTmpDir(), $actionName."-delta");
-                    $this->logDebug("Received signature file, should compute delta now");
-                    rsync_generate_delta($signature_delta_file, $file, $deltaFile);
-                    $this->logDebug("Computed delta file, size is ".filesize($deltaFile));
-                    header("Content-Type:application/octet-stream");
-                    header("Content-Length:".filesize($deltaFile));
-                    readfile($deltaFile);
-                    unlink($deltaFile);
-                } else {
-                    $patched = $file.".rdiff_patched";
-                    rsync_patch_file($file, $signature_delta_file, $patched);
-                    rename($patched, $file);
-                    $node = $selection->getUniqueNode();
-                    AJXP_Controller::applyHook("node.change", array($node, $node, false));
-                    header("Content-Type:text/plain");
-                    echo md5_file($file);
-                }
-                break;
-            case "stat_hash" :
-                clearstatcache();
-                header("Content-type:application/json");
-                if ($selection->isUnique()) {
-                    $node = $selection->getUniqueNode();
-                    $stat = @stat($node->getUrl());
-                    if (!$stat || !is_readable($node->getUrl())) {
-                        print '{}';
-                    } else {
-                        if(is_file($node->getUrl())) {
-                            if(isSet($_SERVER["HTTP_RANGE"])){
-                                $fullSize = floatval($stat['size']);
-                                $ranges = explode('=', $_SERVER["HTTP_RANGE"]);
-                                $offsets = explode('-', $ranges[1]);
-                                $offset = floatval($offsets[0]);
-                                $length = floatval($offsets[1]) - $offset;
-                                if (!$length) $length = $fullSize - $offset;
-                                if ($length + $offset > $fullSize || $length < 0) $length = $fullSize - $offset;
-                                $hash = $this->getPartialHash($node, $offset, $length);
-                            }else{
-                                $hash = $this->getFileHash($selection->getUniqueNode());
-                            }
-                        }
-                        else $hash = 'directory';
-                        $stat[13] = $stat["hash"] = $hash;
-                        print json_encode($stat);
-                    }
-                } else {
-                    $files = $selection->getFiles();
-                    print '{';
-                    foreach ($files as $index => $path) {
-                        $node = new AJXP_Node($selection->currentBaseUrl().$path);
-                        $stat = @stat($selection->currentBaseUrl().$path);
-                        if(!$stat || !is_readable($node->getUrl())) $stat = '{}';
-                        else {
-                            if(!is_dir($node->getUrl())) $hash = $this->getFileHash($node);
-                            else $hash = 'directory';
-                            $stat[13] = $stat["hash"] = $hash;
-                            $stat = json_encode($stat);
-                        }
-                        print json_encode(SystemTextEncoding::toUTF8($path)).':'.$stat . (($index < count($files) -1) ? "," : "");
-                    }
-                    print '}';
-                }
-
-                break;
-
-
-                break;
-        }
-    }
-
-    /**
-     * @param AJXP_Node $node
-     * @return String md5
-     */
-    public function getFileHash($node)
-    {
-        if ($node->isLeaf()) {
-            $md5 = null;
-            if ($this->metaStore != false) {
-
-                $hashMeta = $this->metaStore->retrieveMetadata(
-                    $node,
-                    FileHasher::METADATA_HASH_NAMESPACE,
-                    false,
-                    AJXP_METADATA_SCOPE_GLOBAL);
-                $mtime = filemtime($node->getUrl());
-                if(is_array($hashMeta)
-                    && array_key_exists("md5", $hashMeta)
-                    && array_key_exists("md5_mtime", $hashMeta)
-                    && $hashMeta["md5_mtime"] >= $mtime){
-                    $md5 = $hashMeta["md5"];
-                }
-                if ($md5 == null) {
-                    $md5 = md5_file($node->getUrl());
-                    $hashMeta = array(
-                        "md5" => $md5,
-                        "md5_mtime" => $mtime
-                    );
-                    $this->metaStore->setMetadata($node, FileHasher::METADATA_HASH_NAMESPACE, $hashMeta, false, AJXP_METADATA_SCOPE_GLOBAL);
-                }
-
-            } else {
-
-                $md5 = md5_file($node->getUrl());
-
-            }
-            $node->mergeMetadata(array("md5" => $md5));
-            return $md5;
-        }else{
-            return 'directory';
-        }
-    }
-
-    /**
-     * @param AJXP_Node $node
-     * @param float $offset
-     * @param float $length
-     * @return String md5
-     */
-    public function getPartialHash($node, $offset, $length){
-
-        $this->logDebug('Getting partial hash from ' . $offset . ' to ' . $length );
-        $fp = fopen($node->getUrl(), "r");
-        $ctx = hash_init('md5');
-        if($offset > 0){
-            fseek($fp, $offset);
-        }
-        hash_update_stream($ctx, $fp, $length);
-        $hash = hash_final($ctx);
-        $this->logDebug('Partial hash is ' . $hash );
-        fclose($fp);
-        return $hash;
-
-    }
-
-    /**
-     * @param AJXP_Node $oldNode
-     * @param AJXP_Node $newNode
-     * @param bool $copy
-     */
-    public function invalidateHash($oldNode = null, $newNode = null, $copy = false)
-    {
-        if($this->metaStore == false) return;
-        if ($oldNode != null) {
-            $this->metaStore->removeMetadata($oldNode, FileHasher::METADATA_HASH_NAMESPACE, false, AJXP_METADATA_SCOPE_GLOBAL);
-        }
-        if ($this->getFilteredOption("CACHE_XML_TREE") === true && is_file($this->getTreeName())) {
-            @unlink($this->getTreeName());
-        }
-    }
-
-
-    public function generateSignature($masterFile, $targetFile)
-    {
-        rsync_generate_signature($masterFile, $targetFile);
-    }
-}
diff --git a/core/src/plugins/meta.filehasher/i18n/conf/de.php b/core/src/plugins/meta.filehasher/i18n/conf/de.php
index 349c4031fe..2c5852ffb8 100644
--- a/core/src/plugins/meta.filehasher/i18n/conf/de.php
+++ b/core/src/plugins/meta.filehasher/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "File Hasher" => "Datei-Hashes",
diff --git a/core/src/plugins/meta.filehasher/i18n/conf/en.php b/core/src/plugins/meta.filehasher/i18n/conf/en.php
index 8ce90ab297..a8eca1ce77 100644
--- a/core/src/plugins/meta.filehasher/i18n/conf/en.php
+++ b/core/src/plugins/meta.filehasher/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "File Hasher" => "File Hasher",
diff --git a/core/src/plugins/meta.filehasher/i18n/conf/fr.php b/core/src/plugins/meta.filehasher/i18n/conf/fr.php
index 8a13e99f0b..065f5335dd 100644
--- a/core/src/plugins/meta.filehasher/i18n/conf/fr.php
+++ b/core/src/plugins/meta.filehasher/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "File Hasher" => "Empreinte de fichier",
@@ -25,4 +25,4 @@
 "Cache full tree" => "Cacher l'arbre",
 "Cache XML tree and invalidate on node change" => "Cacher l'arbre XML et l'invalider lors d'un changement de noeud.",
 "Dont edit, it will be detected by the server" => "Ne pas éditer, sera détecter par le serveur.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/meta.filehasher/i18n/conf/it.php b/core/src/plugins/meta.filehasher/i18n/conf/it.php
index fd3e822142..0e6af6c3c4 100644
--- a/core/src/plugins/meta.filehasher/i18n/conf/it.php
+++ b/core/src/plugins/meta.filehasher/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "File Hasher" => "Hasher File",
@@ -25,4 +25,4 @@
 "Cache full tree" => "Cache full tree",
 "Cache XML tree and invalidate on node change" => "Cache XML tree and invalidate on node change",
 "Dont edit, it will be detected by the server" => "Don't edit, it will be detected by the server",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/meta.filehasher/i18n/conf/pt.php b/core/src/plugins/meta.filehasher/i18n/conf/pt.php
index 0effa8835e..95f464fe53 100644
--- a/core/src/plugins/meta.filehasher/i18n/conf/pt.php
+++ b/core/src/plugins/meta.filehasher/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "File Hasher" => "Obter Hash de Ficheiro",
@@ -25,4 +25,4 @@
 "Cache full tree" => "Cache full tree",
 "Cache XML tree and invalidate on node change" => "Cache XML tree and invalidate on node change",
 "Dont edit, it will be detected by the server" => "Don't edit, it will be detected by the server",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/meta.filehasher/manifest.xml b/core/src/plugins/meta.filehasher/manifest.xml
index a921c392ea..7f96ce4d18 100644
--- a/core/src/plugins/meta.filehasher/manifest.xml
+++ b/core/src/plugins/meta.filehasher/manifest.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <meta id="meta.filehasher" label="CONF_MESSAGE[File Hasher]" description="CONF_MESSAGE[Compute on-demand a hash of the file content and stores it in the metadata if a metastore is provided]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <class_definition filename="plugins/meta.filehasher/class.FileHasher.php" classname="FileHasher"/>
+    <class_definition filename="plugins/meta.filehasher/FileHasher.php" classname="Pydio\Access\Meta\Hash\FileHasher"/>
     <server_settings>
-        <param name="CACHE_XML_TREE" type="boolean" default="false" label="CONF_MESSAGE[Cache full tree]" description="CONF_MESSAGE[Cache XML tree and invalidate on node change]"/>
         <global_param name="RSYNC_SUPPORTED" type="boolean" label="CONF_MESSAGE[Rsync Support]" description="CONF_MESSAGE[Dont edit, it will be detected by the server]" expose="true"/>
     </server_settings>
    	<client_settings>
@@ -40,20 +39,12 @@
                <action name="stat_hash">
                    <rightsContext adminOnly="false" noUser="false" read="true" userLogged="true" write="false"/>
                    <processing>
-                       <serverCallback methodName="switchActions" checkParams="false" restParams="/file+" developerComment="Returns an fstat() structure including the hash of the file">
+                       <serverCallback methodName="statAction" checkParams="false" restParams="/file+" developerComment="Returns an fstat() structure including the hash of the file">
                            <input_param description="One or more nodes to stat." name="nodes" type="AJXP_NODE[]"/>
                            <output type="json"/>
                        </serverCallback>
                    </processing>
                </action>
-               <action name="ls" dirDefault="true">
-                   <pre_processing>
-                       <serverCallback methodName="checkFullTreeCache" applyCondition="$apply=isSet($httpVars['recursive']);"/>
-                   </pre_processing>
-                   <post_processing>
-                       <serverCallback methodName="cacheFullTree" capture="true" applyCondition="$apply=isSet($httpVars['recursive']);"/>
-                   </post_processing>
-               </action>
            </actions>
    		<hooks>
    			<serverCallback hookName="node.info" methodName="getFileHash" applyCondition="$apply = isSet($_GET['recursive']);"/>
diff --git a/core/src/plugins/meta.git/GitManager.php b/core/src/plugins/meta.git/GitManager.php
new file mode 100644
index 0000000000..a6991ee894
--- /dev/null
+++ b/core/src/plugins/meta.git/GitManager.php
@@ -0,0 +1,361 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Meta\Version;
+
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\StatHelper;
+
+use Pydio\Core\Controller\HTMLWriter;
+use Pydio\Access\Meta\Core\AbstractMetaSource;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Manage versioning using Git
+ * @package Pydio\Access\Meta\Version
+ */
+class GitManager extends AbstractMetaSource
+{
+
+    private $repoBase;
+
+    public function performChecks()
+    {
+        $ex = ApplicationState::searchIncludePath("VersionControl/Git.php");
+        if (!$ex) {
+            throw new \Exception("Cannot find PEAR library VersionControl/Git");
+        }
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param AbstractAccessDriver $accessDriver
+     * @throws \Exception
+     */
+    public function initMeta(ContextInterface $ctx, AbstractAccessDriver $accessDriver)
+    {
+        parent::initMeta($ctx, $accessDriver);
+        require_once("VersionControl/Git.php");
+        $repo = $ctx->getRepository();
+        $this->repoBase = $repo->getContextOption($ctx, "PATH");
+        if(empty($this->repoBase)){
+            throw new \Exception("Meta.git: cannot find PATH option in repository! Are you sure it's an FS-based workspace?");
+        }
+        if (!is_dir($this->repoBase.DIRECTORY_SEPARATOR.".git")) {
+            $git = new \VersionControl_Git($this->repoBase);
+            $git->initRepository();
+        }
+    }
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     */
+    public function applyActions(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface)
+    {
+        
+        $actionName         = $requestInterface->getAttribute("action");
+        $ctx                = $requestInterface->getAttribute("ctx");
+        $httpVars           = $requestInterface->getParsedBody();
+        $x                  = new \Pydio\Core\Http\Response\SerializableResponseStream();
+        $responseInterface  = $responseInterface->withBody($x);
+        $userSelection      = \Pydio\Access\Core\Model\UserSelection::fromContext($ctx, $httpVars);
+
+        $git = new \VersionControl_Git($this->repoBase);
+        switch ($actionName) {
+            case "git_history":
+                $nodesList = new \Pydio\Access\Core\Model\NodesList();
+                $selectedNode = $userSelection->getUniqueNode();
+                $file = ltrim($selectedNode->getPath(), "/");
+                $res = $this->gitHistory($git, $file);
+                $ic = StatHelper::getMimeInfo($selectedNode, false)[1];
+                $index = count($res);
+                $mess = LocaleService::getMessages();
+                foreach ($res as &$commit) {
+                    unset($commit["DETAILS"]);
+                    $commit["icon"] = $ic;
+                    $commit["index"] = $index;
+                    $commit["EVENT"] = $mess["meta.git.".$commit["EVENT"]];
+                    $commit["text"] = basename($commit["FILE"]);
+                    $index --;
+                    $n = new AJXP_Node("/".$commit["ID"], $commit);
+                    $n->setLeaf(true);
+                    $nodesList->addBranch($n);
+                }
+                $x->addChunk($nodesList);
+                break;
+            break;
+
+            case "git_revertfile":
+
+                $originalFile = InputFilter::decodeSecureMagic($httpVars["original_file"]);
+                $file = InputFilter::decodeSecureMagic($httpVars["file"]);
+                $commitId = $httpVars["commit_id"];
+
+                $command = $git->getCommand("cat-file");
+                $command->setOption("s", true);
+                $command->addArgument($commitId.":".$file);
+                $command->execute();
+
+                $command = $git->getCommand("show");
+                $command->addArgument($commitId.":".$file);
+                $commandLine = $command->createCommandString();
+                $outputStream = fopen($this->repoBase.$originalFile, "w");
+                $this->executeCommandInStreams($git, $commandLine, $outputStream);
+                fclose($outputStream);
+                /** @var ContextInterface $ctx */
+                $ctx = $requestInterface->getAttribute("ctx");
+                $this->commitChanges($ctx);
+                $diff = new \Pydio\Access\Core\Model\NodesDiff();
+                $diff->update(new AJXP_Node($ctx->getUrlBase().$file));
+                $x->addChunk($diff);
+
+
+            break;
+
+            case "git_getfile":
+
+                $file = InputFilter::decodeSecureMagic($httpVars["file"]);
+                $commitId = $httpVars["commit_id"];
+                $attach = $httpVars["attach"];
+
+                $command = $git->getCommand("cat-file");
+                $command->setOption("s", true);
+                $command->addArgument($commitId.":".$file);
+                $size = $command->execute();
+
+                $command = $git->getCommand("show");
+                $command->addArgument($commitId.":".$file);
+                $commandLine = $command->createCommandString();
+
+                if ($attach == "inline") {
+                    $fileExt = substr(strrchr(basename($file), '.'), 1);
+                    if (empty($fileExt)) {
+                        $fileMime = "application/octet-stream";
+                    } else {
+                        $regex = "/^([\w\+\-\.\/]+)\s+(\w+\s)*($fileExt\s)/i";
+                        $lines = file( AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/editor.browser/resources/other/mime.types");
+                        foreach ($lines as $line) {
+                            if(substr($line, 0, 1) == '#')
+                                continue; // skip comments
+                            $line = rtrim($line) . " ";
+                            if(!preg_match($regex, $line, $matches))
+                                continue; // no match to the extension
+                            $fileMime = $matches[1];
+                        }
+                    }
+                    if(empty($fileMime)) $fileMime = "application/octet-stream";
+                    $responseInterface = HTMLWriter::responseWithInlineHeaders($responseInterface, basename($file), $size, $fileMime);
+                } else {
+                    $responseInterface = HTMLWriter::responseWithAttachmentsHeaders($responseInterface, basename($file), $size, false, false);
+                }
+
+
+                $reader = function() use ($git, $commandLine){
+                    $outputStream = fopen("php://output", "a");
+                    $this->executeCommandInStreams($git, $commandLine, $outputStream);
+                    fclose($outputStream);
+                    if(intval(ini_get("output_buffering")) > 0){
+                        ob_end_flush();
+                    }
+                };
+
+                $async = new \Pydio\Core\Http\Response\AsyncResponseStream($reader);
+                $responseInterface = $responseInterface->withBody($async);
+
+                break;
+
+            break;
+
+            default:
+            break;
+        }
+
+
+    }
+
+    /**
+     * @param \VersionControl_Git $git
+     * @param $commandLine
+     * @param $outputStream
+     * @param null $errorStream
+     * @return string
+     */
+    protected function executeCommandInStreams($git, $commandLine, $outputStream, $errorStream = null)
+    {
+        $descriptorspec = array(
+            1 => array('pipe', 'w'),
+            2 => array('pipe', 'w'),
+        );
+        $pipes = array();
+        $resource = proc_open($commandLine, $descriptorspec, $pipes, realpath($git->getDirectory()));
+
+        //$stdout = stream_get_contents($pipes[1]);
+        //$stderr = stream_get_contents($pipes[2]);
+        $bufLength = 4096;
+        while ( ($read = fread($pipes[1], $bufLength)) != false ) {
+            fputs($outputStream, $read, strlen($read));
+        }
+        //stream_copy_to_stream($pipes[1], $outputStream);
+        if ($errorStream != null) {
+            stream_copy_to_stream($pipes[2], $errorStream);
+        } else {
+            $stderr = stream_get_contents($pipes[2]);
+        }
+        foreach ($pipes as $pipe) {
+            fclose($pipe);
+        }
+
+        $status = trim(proc_close($resource));
+        return $status;
+
+    }
+
+    /**
+     * @param \VersionControl_Git $git
+     * @param string $file
+     * @return array
+     */
+    protected function gitHistory($git, $file)
+    {
+        $command = $git->getCommand("log");
+        if(strpos($file, " ") === false){
+            // We currently cannot use follow if file/folder has a space
+            $command->setOption("follow", true);
+        }
+        $command->setOption("p", true);
+        $command->addArgument($file);
+        //var_dump($command->createCommandString());
+        $res = $command->execute();
+        $lines = explode(PHP_EOL, $res);
+        $allCommits = array();
+        $grabOtherLines  = $grabMessageLines = false;
+        while (count($lines)) {
+            $line = array_shift($lines);
+            if (preg_match("/^commit /i", $line)) {
+                if (isSet($currentCommit)) {
+                    if (isSet($currentCommit["DETAILS"])) {
+                        $currentCommit["DETAILS"] = implode(PHP_EOL, $currentCommit["DETAILS"]);
+                    }
+                    $allCommits[] = $currentCommit;
+                }
+                $currentCommit = array();
+                $currentCommit["ID"] = substr($line, strlen("commit "));
+                $grabMessageLines = false;
+                $grabOtherLines = false;
+            } else if (preg_match("/^diff --git a\/(.*) b\/(.*)/i", $line, $matches)) {
+                $origA = $matches[1];
+                $origB = $matches[2];
+                $currentCommit["FILE"] = $origB;
+                if ($origB != $origA) {
+                    if (basename($origB) != basename($origA)) {
+                        $currentCommit["EVENT"] = "RENAME";
+                    } else if (dirname($origA) != dirname($origB)) {
+                        $currentCommit["EVENT"] = "MOVE";
+                    }
+                } else {
+                    $currentCommit["EVENT"] = "MODIFICATION";
+                    $currentCommit["DETAILS"] = array();
+                    $grabOtherLines = true;
+                }
+            } else if (preg_match("/^Date: /", $line)) {
+                $currentCommit["DATE"] = trim(substr($line, strlen("Date: ")));
+                $currentCommit["ajxp_modiftime"] = strtotime(substr($line, strlen("Date: ")));
+            } else if ($grabOtherLines) {
+                if(isSet($currentCommit) && count($currentCommit["DETAILS"]) >= 10) continue;
+                $currentCommit["DETAILS"][] = $line;
+            } else if (trim($line) == "") {
+                $grabMessageLines = !$grabMessageLines;
+            } else if ($grabMessageLines) {
+                if(!isSet($currentCommit["MESSAGE"])) $currentCommit["MESSAGE"] = "";
+                $currentCommit["MESSAGE"] .= trim($line);
+            }
+        }
+        // $currentCommit
+        if(isSet($currentCommit)){
+            if (count($currentCommit["DETAILS"]) && substr($currentCommit["DETAILS"][0], 0, strlen("new file")) == "new file") {
+                $currentCommit["EVENT"] = "CREATION";
+                unset($currentCommit["DETAILS"]);
+            }
+            $allCommits[] = $currentCommit;
+        }
+        return $allCommits;
+    }
+
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $fromNode
+     * @param \Pydio\Access\Core\Model\AJXP_Node$toNode
+     * @param boolean $copy
+     */
+    public function changesHook($fromNode=null, $toNode=null, $copy=false)
+    {
+        $refNode = ($fromNode !== null ? $fromNode : $toNode);
+        $this->commitChanges($refNode->getContext());
+        return;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param string $path
+     */
+    private function commitChanges(ContextInterface $ctx, $path = null)
+    {
+        $git = new \VersionControl_Git($this->repoBase);
+        $command = $git->getCommand("add");
+        $command->addArgument(".");
+        try {
+            $cmd = $command->createCommandString();
+            $this->logDebug("Git command ".$cmd);
+            $res = $command->execute();
+            $this->logDebug("GIT RESULT ADD : ".$res);
+        } catch (\Exception $e) {
+            $this->logDebug("Error in GIT Command ".$e->getMessage());
+        }
+
+        $command = $git->getCommand("commit");
+        $command->setOption("a", true);
+        $userId = "no user";
+        $mail = "mail@mail.com";
+        if ($ctx->hasUser()) {
+            $userId = $ctx->getUser()->getId();
+            $mail = $ctx->getUser()->getPersonalRole()->filterParameterValue("core.conf", "email", AJXP_REPO_SCOPE_ALL, "mail@mail.com");
+        }
+        $command->setOption("m", $userId);
+        $command->setOption("author", "$userId <$mail>");
+        //$command->addArgument($path);
+
+        try {
+            $cmd = $command->createCommandString();
+            $this->logDebug("Git command ".$cmd);
+            $res = $command->execute();
+            $this->logDebug("GIT RESULT COMMIT : ".$res);
+        } catch (\Exception $e) {
+            $this->logDebug("Error ".$e->getMessage());
+        }
+    }
+
+}
diff --git a/core/src/plugins/meta.git/class.GitManager.php b/core/src/plugins/meta.git/class.GitManager.php
deleted file mode 100644
index 5d82da7541..0000000000
--- a/core/src/plugins/meta.git/class.GitManager.php
+++ /dev/null
@@ -1,311 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-/**
- * Manage versioning using Git
- * @package AjaXplorer_Plugins
- * @subpackage Meta
- */
-class GitManager extends AJXP_AbstractMetaSource
-{
-
-    private $repoBase;
-
-    public function performChecks()
-    {
-        $ex = AJXP_Utils::searchIncludePath("VersionControl/Git.php");
-        if (!$ex) {
-            throw new Exception("Cannot find PEAR library VersionControl/Git");
-        }
-    }
-
-    /**
-     * @param AbstractAccessDriver $accessDriver
-     * @throws Exception
-     */
-    public function initMeta($accessDriver)
-    {
-        parent::initMeta($accessDriver);
-        require_once("VersionControl/Git.php");
-        $repo = $accessDriver->repository;
-        $this->repoBase = $repo->getOption("PATH");
-        if(empty($this->repoBase)){
-            throw new Exception("Meta.git: cannot find PATH option in repository! Are you sure it's an FS-based workspace?");
-        }
-        if (!is_dir($this->repoBase.DIRECTORY_SEPARATOR.".git")) {
-            $git = new VersionControl_Git($this->repoBase);
-            $git->initRepository();
-        }
-    }
-
-    public function applyActions($actionName, $httpVars, $fileVars)
-    {
-        $git = new VersionControl_Git($this->repoBase);
-        switch ($actionName) {
-            case "git_history":
-                $file = AJXP_Utils::decodeSecureMagic($httpVars["file"]);
-                $file = ltrim($file, "/");
-                $res = $this->gitHistory($git, $file);
-                AJXP_XMLWriter::header();
-                $ic = AJXP_Utils::mimetype($file, "image", false);
-                $index = count($res);
-                $mess = ConfService::getMessages();
-                foreach ($res as &$commit) {
-                    unset($commit["DETAILS"]);
-                    $commit["icon"] = $ic;
-                    $commit["index"] = $index;
-                    $commit["EVENT"] = $mess["meta.git.".$commit["EVENT"]];
-                    $index --;
-                    AJXP_XMLWriter::renderNode("/".$commit["ID"], basename($commit["FILE"]), true, $commit);
-                }
-                AJXP_XMLWriter::close();
-                break;
-            break;
-
-            case "git_revertfile":
-
-                $originalFile = AJXP_Utils::decodeSecureMagic($httpVars["original_file"]);
-                $file = AJXP_Utils::decodeSecureMagic($httpVars["file"]);
-                $commitId = $httpVars["commit_id"];
-
-                $command = $git->getCommand("cat-file");
-                $command->setOption("s", true);
-                $command->addArgument($commitId.":".$file);
-                $size = $command->execute();
-
-                $command = $git->getCommand("show");
-                $command->addArgument($commitId.":".$file);
-                $commandLine = $command->createCommandString();
-                $outputStream = fopen($this->repoBase.$originalFile, "w");
-                $this->executeCommandInStreams($git, $commandLine, $outputStream);
-                fclose($outputStream);
-                $this->commitChanges();
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::reloadDataNode();
-                AJXP_XMLWriter::close();
-
-
-            break;
-
-            case "git_getfile":
-
-                $file = AJXP_Utils::decodeSecureMagic($httpVars["file"]);
-                $commitId = $httpVars["commit_id"];
-                $attach = $httpVars["attach"];
-
-                $command = $git->getCommand("cat-file");
-                $command->setOption("s", true);
-                $command->addArgument($commitId.":".$file);
-                $size = $command->execute();
-
-                $command = $git->getCommand("show");
-                $command->addArgument($commitId.":".$file);
-                $commandLine = $command->createCommandString();
-
-                if ($attach == "inline") {
-                    $fileExt = substr(strrchr(basename($file), '.'), 1);
-                    if (empty($fileExt)) {
-                        $fileMime = "application/octet-stream";
-                    } else {
-                        $regex = "/^([\w\+\-\.\/]+)\s+(\w+\s)*($fileExt\s)/i";
-                        $lines = file( AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/editor.browser/resources/other/mime.types");
-                        foreach ($lines as $line) {
-                            if(substr($line, 0, 1) == '#')
-                                continue; // skip comments
-                            $line = rtrim($line) . " ";
-                            if(!preg_match($regex, $line, $matches))
-                                continue; // no match to the extension
-                            $fileMime = $matches[1];
-                        }
-                    }
-                    if(empty($fileMime)) $fileMime = "application/octet-stream";
-                    HTMLWriter::generateInlineHeaders(basename($file), $size, $fileMime);
-                } else {
-                    HTMLWriter::generateAttachmentsHeader(basename($file), $size, false, false);
-                }
-                $outputStream = fopen("php://output", "a");
-                $this->executeCommandInStreams($git, $commandLine, $outputStream);
-                fclose($outputStream);
-                if(intval(ini_get("output_buffering")) > 0){
-                    ob_end_flush();
-                }
-                break;
-
-            break;
-
-            default:
-            break;
-        }
-
-
-    }
-
-    protected function executeCommandInStreams($git, $commandLine, $outputStream, $errorStream = null)
-    {
-        $descriptorspec = array(
-            1 => array('pipe', 'w'),
-            2 => array('pipe', 'w'),
-        );
-        $pipes = array();
-        $resource = proc_open($commandLine, $descriptorspec, $pipes, realpath($git->getDirectory()));
-
-        //$stdout = stream_get_contents($pipes[1]);
-        //$stderr = stream_get_contents($pipes[2]);
-        $bufLength = 4096;
-        while ( ($read = fread($pipes[1], $bufLength)) != false ) {
-            fputs($outputStream, $read, strlen($read));
-        }
-        //stream_copy_to_stream($pipes[1], $outputStream);
-        if ($errorStream != null) {
-            stream_copy_to_stream($pipes[2], $errorStream);
-        } else {
-            $stderr = stream_get_contents($pipes[2]);
-        }
-        foreach ($pipes as $pipe) {
-            fclose($pipe);
-        }
-
-        $status = trim(proc_close($resource));
-        return $status;
-
-    }
-
-    protected function gitHistory($git, $file)
-    {
-        $command = $git->getCommand("log");
-        if(strpos($file, " ") === false){
-            // We currently cannot use follow if file/folder has a space
-            $command->setOption("follow", true);
-        }
-        $command->setOption("p", true);
-        $command->addArgument($file);
-        //var_dump($command->createCommandString());
-        $res = $command->execute();
-        $lines = explode(PHP_EOL, $res);
-        $allCommits = array();
-        while (count($lines)) {
-            $line = array_shift($lines);
-            if (preg_match("/^commit /i", $line)) {
-                if (isSet($currentCommit)) {
-                    if (isSet($currentCommit["DETAILS"])) {
-                        $currentCommit["DETAILS"] = implode(PHP_EOL, $currentCommit["DETAILS"]);
-                    }
-                    $allCommits[] = $currentCommit;
-                }
-                $currentCommit = array();
-                $currentCommit["ID"] = substr($line, strlen("commit "));
-                $grabMessageLines = false;
-                $grabOtherLines = false;
-            } else if (preg_match("/^diff --git a\/(.*) b\/(.*)/i", $line, $matches)) {
-                $origA = $matches[1];
-                $origB = $matches[2];
-                $currentCommit["FILE"] = $origB;
-                if ($origB != $origA) {
-                    if (basename($origB) != basename($origA)) {
-                        $currentCommit["EVENT"] = "RENAME";
-                    } else if (dirname($origA) != dirname($origB)) {
-                        $currentCommit["EVENT"] = "MOVE";
-                    }
-                } else {
-                    $currentCommit["EVENT"] = "MODIFICATION";
-                    $currentCommit["DETAILS"] = array();
-                    $grabOtherLines = true;
-                }
-            } else if (preg_match("/^Date: /", $line)) {
-                $currentCommit["DATE"] = trim(substr($line, strlen("Date: ")));
-                $currentCommit["ajxp_modiftime"] = strtotime(substr($line, strlen("Date: ")));
-            } else if ($grabOtherLines) {
-                if(count($currentCommit["DETAILS"]) >= 10) continue;
-                $currentCommit["DETAILS"][] = $line;
-            } else if (trim($line) == "") {
-                $grabMessageLines = !$grabMessageLines;
-            } else if ($grabMessageLines) {
-                if(!isSet($currentCommit["MESSAGE"])) $currentCommit["MESSAGE"] = "";
-                $currentCommit["MESSAGE"] .= trim($line);
-            }
-        }
-        // $currentCommit
-        if (count($currentCommit["DETAILS"]) && substr($currentCommit["DETAILS"][0], 0, strlen("new file")) == "new file") {
-            $currentCommit["EVENT"] = "CREATION";
-            unset($currentCommit["DETAILS"]);
-        }
-        $allCommits[] = $currentCommit;
-        return $allCommits;
-    }
-
-
-    /**
-     * @param AJXP_Node $fromNode
-     * @param AJXP_Node$toNode
-     * @param boolean $copy
-     */
-    public function changesHook($fromNode=null, $toNode=null, $copy=false)
-    {
-        $this->commitChanges();
-        return;
-        /*
-        $refNode = $fromNode;
-        if ($fromNode == null && $toNode != null) {
-            $refNode = $toNode;
-        }
-        $this->commitChanges(dirname($refNode->getPath()));
-        */
-    }
-
-    private function commitChanges($path = null)
-    {
-        $git = new VersionControl_Git($this->repoBase);
-        $command = $git->getCommand("add");
-        $command->addArgument(".");
-        try {
-            $cmd = $command->createCommandString();
-            $this->logDebug("Git command ".$cmd);
-            $res = $command->execute();
-        } catch (Exception $e) {
-            $this->logDebug("Error ".$e->getMessage());
-        }
-        $this->logDebug("GIT RESULT ADD : ".$res);
-
-        $command = $git->getCommand("commit");
-        $command->setOption("a", true);
-        $userId = "no user";
-        $mail = "mail@mail.com";
-        if (AuthService::getLoggedUser()!=null) {
-            $userId = AuthService::getLoggedUser()->getId();
-            $mail = AuthService::getLoggedUser()->personalRole->filterParameterValue("core.conf", "email", AJXP_REPO_SCOPE_ALL, "mail@mail.com");
-        }
-        $command->setOption("m", $userId);
-        $command->setOption("author", "$userId <$mail>");
-        //$command->addArgument($path);
-
-        try {
-            $cmd = $command->createCommandString();
-            $this->logDebug("Git command ".$cmd);
-            $res = $command->execute();
-        } catch (Exception $e) {
-            $this->logDebug("Error ".$e->getMessage());
-        }
-        $this->logDebug("GIT RESULT COMMIT : ".$res);
-    }
-
-}
diff --git a/core/src/plugins/meta.git/class.HistoryBrowser.js b/core/src/plugins/meta.git/class.HistoryBrowser.js
index 3d8dbe3489..b5c9a011d9 100644
--- a/core/src/plugins/meta.git/class.HistoryBrowser.js
+++ b/core/src/plugins/meta.git/class.HistoryBrowser.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  * Description : Simple display of SVN logs.
  */
 Class.create("HistoryBrowser", {
@@ -66,7 +66,6 @@ Class.create("HistoryBrowser", {
 
         this.toolbarObject = new ActionsToolbar(this.toolbar, {
             buttonRenderer : 'this',
-            skipBubbling: true,
             toolbarsList : $A(['history']),
             dataModelElementId: this.element.id
         });
diff --git a/core/src/plugins/meta.git/i18n/conf/cs.php b/core/src/plugins/meta.git/i18n/conf/cs.php
index 795dfd5f12..936a4d1101 100644
--- a/core/src/plugins/meta.git/i18n/conf/cs.php
+++ b/core/src/plugins/meta.git/i18n/conf/cs.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 defined('AJXP_EXEC') or die('Access not allowed');
diff --git a/core/src/plugins/meta.git/i18n/conf/de.php b/core/src/plugins/meta.git/i18n/conf/de.php
index 06b3e65d41..10823ecbc4 100644
--- a/core/src/plugins/meta.git/i18n/conf/de.php
+++ b/core/src/plugins/meta.git/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 defined('AJXP_EXEC') or die('Access not allowed');
diff --git a/core/src/plugins/meta.git/i18n/conf/en.php b/core/src/plugins/meta.git/i18n/conf/en.php
index 8f5e434752..171a0ef885 100644
--- a/core/src/plugins/meta.git/i18n/conf/en.php
+++ b/core/src/plugins/meta.git/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 defined('AJXP_EXEC') or die('Access not allowed');
diff --git a/core/src/plugins/meta.git/i18n/conf/fr.php b/core/src/plugins/meta.git/i18n/conf/fr.php
index 90342fb78d..69c900a48e 100644
--- a/core/src/plugins/meta.git/i18n/conf/fr.php
+++ b/core/src/plugins/meta.git/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 defined('AJXP_EXEC') or die('Access not allowed');
diff --git a/core/src/plugins/meta.git/i18n/conf/it.php b/core/src/plugins/meta.git/i18n/conf/it.php
index cd80895563..5854a19d92 100644
--- a/core/src/plugins/meta.git/i18n/conf/it.php
+++ b/core/src/plugins/meta.git/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 defined('AJXP_EXEC') or die('Accesso non consentito');
diff --git a/core/src/plugins/meta.git/i18n/conf/pt.php b/core/src/plugins/meta.git/i18n/conf/pt.php
index 747743677e..356b4441ec 100644
--- a/core/src/plugins/meta.git/i18n/conf/pt.php
+++ b/core/src/plugins/meta.git/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 
 defined('AJXP_EXEC') or die('Access not allowed');
diff --git a/core/src/plugins/meta.git/i18n/cs.php b/core/src/plugins/meta.git/i18n/cs.php
index 6fc0ace85b..f29604fbd3 100644
--- a/core/src/plugins/meta.git/i18n/cs.php
+++ b/core/src/plugins/meta.git/i18n/cs.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 defined('AJXP_EXEC') or die('Access not allowed');
diff --git a/core/src/plugins/meta.git/i18n/de.php b/core/src/plugins/meta.git/i18n/de.php
index f011a60865..dd9023f821 100644
--- a/core/src/plugins/meta.git/i18n/de.php
+++ b/core/src/plugins/meta.git/i18n/de.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 defined('AJXP_EXEC') or die('Access not allowed');
diff --git a/core/src/plugins/meta.git/i18n/en.php b/core/src/plugins/meta.git/i18n/en.php
index b88b646926..3a0fdb6d0d 100644
--- a/core/src/plugins/meta.git/i18n/en.php
+++ b/core/src/plugins/meta.git/i18n/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 defined('AJXP_EXEC') or die('Access not allowed');
diff --git a/core/src/plugins/meta.git/i18n/fr.php b/core/src/plugins/meta.git/i18n/fr.php
index 4a9f88d952..2aa1a13414 100644
--- a/core/src/plugins/meta.git/i18n/fr.php
+++ b/core/src/plugins/meta.git/i18n/fr.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 defined('AJXP_EXEC') or die('Access not allowed');
diff --git a/core/src/plugins/meta.git/i18n/it.php b/core/src/plugins/meta.git/i18n/it.php
index 9906cbae56..aaa406b9da 100644
--- a/core/src/plugins/meta.git/i18n/it.php
+++ b/core/src/plugins/meta.git/i18n/it.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 defined('AJXP_EXEC') or die('Accesso non consentito');
diff --git a/core/src/plugins/meta.git/i18n/pt.php b/core/src/plugins/meta.git/i18n/pt.php
index 7641c58487..a49df34b28 100644
--- a/core/src/plugins/meta.git/i18n/pt.php
+++ b/core/src/plugins/meta.git/i18n/pt.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 
 defined('AJXP_EXEC') or die('Access not allowed');
diff --git a/core/src/plugins/meta.git/manifest.xml b/core/src/plugins/meta.git/manifest.xml
index fdabc24a73..0310e78137 100644
--- a/core/src/plugins/meta.git/manifest.xml
+++ b/core/src/plugins/meta.git/manifest.xml
@@ -5,7 +5,7 @@
         <core_relation packaged="true" tested_version="4.2.0"/>
         <plugin_author>Charles du Jeu</plugin_author>
     </plugin_info>
-    <class_definition classname="GitManager" filename="plugins/meta.git/class.GitManager.php"/>
+    <class_definition classname="Pydio\Access\Meta\Version\GitManager" filename="plugins/meta.git/GitManager.php"/>
     <client_settings>
         <resources>
             <i18n namespace="meta.git" path="plugins/meta.git/i18n"/>
diff --git a/core/src/plugins/meta.monitor_fs/FSMonitoringManager.php b/core/src/plugins/meta.monitor_fs/FSMonitoringManager.php
new file mode 100644
index 0000000000..3709401803
--- /dev/null
+++ b/core/src/plugins/meta.monitor_fs/FSMonitoringManager.php
@@ -0,0 +1,83 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Meta\Monitor;
+
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Core\Controller\CliRunner;
+
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Access\Meta\Core\AbstractMetaSource;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Monitor filesystem using Python
+ * @package AjaXplorer_Plugins
+ * @subpackage Meta
+ */
+class FSMonitoringManager extends AbstractMetaSource
+{
+    private $repoBase;
+
+    /**
+     * @param ContextInterface $ctx
+     * @param AbstractAccessDriver $accessDriver
+     */
+    public function initMeta(ContextInterface $ctx, AbstractAccessDriver $accessDriver)
+    {
+        parent::initMeta($ctx, $accessDriver);
+        $repo = $ctx->getRepository();
+        $this->repoBase = $repo->getContextOption($ctx, "PATH");
+    }
+
+    /**
+     * @param AJXP_Node $node
+     */
+    public function beforePathChange(AJXP_Node $node){
+        $this->informWatcher("path_change", $node->getPath());
+    }
+
+    /**
+     * @param AJXP_Node $node
+     */
+    public function beforeChange(AJXP_Node $node){
+        $this->informWatcher("content_change", $node->getPath());
+    }
+
+    /**
+     * @param AJXP_Node $node
+     */
+    public function beforeCreate(AJXP_Node $node){
+        $this->informWatcher("create", $node->getPath());
+    }
+
+    /**
+     * @param $action
+     * @param $path
+     */
+    protected function informWatcher($action, $path)
+    {
+        $cmd = "python ".$this->getBaseDir()."/framework_watch.py --action=$action --path=". escapeshellarg($path);
+        CliRunner::runCommandInBackground($cmd, $this->getBaseDir() . "/cmd.out");
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/plugins/meta.monitor_fs/class.FSMonitoringManager.php b/core/src/plugins/meta.monitor_fs/class.FSMonitoringManager.php
deleted file mode 100644
index b0bca0fc8e..0000000000
--- a/core/src/plugins/meta.monitor_fs/class.FSMonitoringManager.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-/**
- * Monitor filesystem using Python
- * @package AjaXplorer_Plugins
- * @subpackage Meta
- */
-class FSMonitoringManager extends AJXP_AbstractMetaSource
-{
-    private $repoBase;
-
-    /**
-     * @param AbstractAccessDriver $accessDriver
-     */
-    public function initMeta($accessDriver)
-    {
-        parent::initMeta($accessDriver);
-        $repo = $accessDriver->repository;
-        $this->repoBase = $repo->getOption("PATH");
-    }
-
-    public function beforePathChange(AJXP_Node $node){
-        $this->informWatcher("path_change", $node->getPath());
-    }
-
-    public function beforeChange(AJXP_Node $node){
-        $this->informWatcher("content_change", $node->getPath());
-    }
-
-    public function beforeCreate(AJXP_Node $node){
-        $this->informWatcher("create", $node->getPath());
-    }
-
-    protected function informWatcher($action, $path)
-    {
-        $cmd = "python ".$this->getBaseDir()."/framework_watch.py --action=$action --path=". escapeshellarg($path);
-        AJXP_Controller::runCommandInBackground($cmd, $this->getBaseDir()."/cmd.out");
-    }
-
-}
\ No newline at end of file
diff --git a/core/src/plugins/meta.monitor_fs/i18n/conf/de.php b/core/src/plugins/meta.monitor_fs/i18n/conf/de.php
index 543cea5af7..41fdb084d0 100644
--- a/core/src/plugins/meta.monitor_fs/i18n/conf/de.php
+++ b/core/src/plugins/meta.monitor_fs/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FileSystem Monitoring" => "Arbeitsumgebung überwachen",
diff --git a/core/src/plugins/meta.monitor_fs/i18n/conf/en.php b/core/src/plugins/meta.monitor_fs/i18n/conf/en.php
index 212f42eacf..c9a23cea30 100644
--- a/core/src/plugins/meta.monitor_fs/i18n/conf/en.php
+++ b/core/src/plugins/meta.monitor_fs/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FileSystem Monitoring" => "FileSystem Monitoring",
diff --git a/core/src/plugins/meta.monitor_fs/i18n/conf/it.php b/core/src/plugins/meta.monitor_fs/i18n/conf/it.php
index a37c02011f..bc2ab7a81e 100644
--- a/core/src/plugins/meta.monitor_fs/i18n/conf/it.php
+++ b/core/src/plugins/meta.monitor_fs/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FileSystem Monitoring" => "Monitoraggio FileSystem",
diff --git a/core/src/plugins/meta.monitor_fs/manifest.xml b/core/src/plugins/meta.monitor_fs/manifest.xml
index 7beb059d54..5f15266a25 100644
--- a/core/src/plugins/meta.monitor_fs/manifest.xml
+++ b/core/src/plugins/meta.monitor_fs/manifest.xml
@@ -6,8 +6,8 @@
         <plugin_author>Charles du Jeu</plugin_author>
     </plugin_info>
 
-    <class_definition classname="FSMonitoringManager"
-                      filename="plugins/meta.monitor_fs/class.FSMonitoringManager.php"/>
+    <class_definition classname="Pydio\Access\Meta\Monitor\FSMonitoringManager"
+                      filename="plugins/meta.monitor_fs/FSMonitoringManager.php"/>
     <client_settings>
         <resources>
             <i18n namespace="meta.monitor_fs" path="plugins/meta.monitor_fs/i18n" />
diff --git a/core/src/plugins/meta.mount/FilesystemMounter.php b/core/src/plugins/meta.mount/FilesystemMounter.php
new file mode 100644
index 0000000000..27e4233960
--- /dev/null
+++ b/core/src/plugins/meta.mount/FilesystemMounter.php
@@ -0,0 +1,234 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Meta\Mount;
+
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Auth\Core\MemorySafe;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Utils\Vars\VarsFilter;
+use Pydio\Access\Meta\Core\AbstractMetaSource;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Dynamically mount a remote folder when switching to the repository
+ * @package AjaXplorer_Plugins
+ * @subpackage Meta
+ *
+ */
+class FilesystemMounter extends AbstractMetaSource
+{
+    /**
+     * @param ContextInterface $ctx
+     * @param AbstractAccessDriver $accessDriver
+     */
+    public function beforeInitMeta(ContextInterface $ctx, AbstractAccessDriver $accessDriver)
+    {
+        if($this->isAlreadyMounted($ctx)) {
+            return;
+        }
+        $this->mountFS($ctx);
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param AbstractAccessDriver $accessDriver
+     */
+    public function initMeta(ContextInterface $ctx, AbstractAccessDriver $accessDriver)
+    {
+        parent::initMeta($ctx, $accessDriver);
+    }
+
+    /**
+     * @return array
+     * @throws \Exception
+     */
+    protected function getCredentials()
+    {
+        // 1. Try from plugin config
+        $user = $this->options["USER"];
+        $password = $this->options["PASS"];
+        // 1BIS : encoded?
+        if ($user == "" && isSet($this->options["ENCODED_CREDENTIALS"])) {
+            list($user,$password) = MemorySafe::getCredentialsFromEncodedString($this->options["ENCODED_CREDENTIALS"]);
+        }
+        // 2. Try from session
+        if ($user=="" &&  isSet($this->options["USE_SESSION_CREDENTIALS"]) ) {
+            $safeCred = MemorySafe::loadCredentials();
+            if ($safeCred !== false) {
+                $user = $safeCred["user"];
+                $password = $safeCred["password"];
+            } else {
+                throw new \Exception("Session credential are empty! Did you forget to check the Set Session Credential in the Authentication configuration panel?");
+            }
+        }
+        return array($user, $password);
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $name
+     * @param string $user
+     * @param string $pass
+     * @param bool $escapePass
+     * @return mixed
+     * @throws \Pydio\Core\Exception\PydioException
+     */
+    protected function getOption(ContextInterface $ctx, $name, $user="", $pass="", $escapePass = true)
+    {
+        $opt = $this->options[$name];
+        $opt = str_replace("AJXP_USER", $user, $opt);
+        if($escapePass)  $opt = str_replace("AJXP_PASS",  "'$pass'", $opt);
+        else $opt = str_replace("AJXP_PASS",  $pass, $opt);
+        $opt = str_replace("AJXP_SERVER_UID", posix_getuid(), $opt);
+        $opt = str_replace("AJXP_SERVER_GID", posix_getgid(), $opt);
+        if (stristr($opt, "AJXP_REPOSITORY_PATH") !== false) {
+            $repo = $ctx->getRepository();
+            $path = $repo->getContextOption($ctx, "PATH");
+            $opt = str_replace("AJXP_REPOSITORY_PATH", $path, $opt);
+        }
+        $opt = VarsFilter::filter($opt, $ctx);
+        return $opt;
+    }
+
+    /**
+     * @param ContextInterface $contextInterface
+     * @return bool
+     * @throws \Exception
+     */
+    protected function isAlreadyMounted(ContextInterface $contextInterface)
+    {
+        list($user, $password) = $this->getCredentials();
+        $MOUNT_POINT = $this->getOption($contextInterface, "MOUNT_POINT", $user, $password);
+        if( is_dir($MOUNT_POINT) ){
+            $statParent = stat(dirname($MOUNT_POINT));
+            $statMount = stat($MOUNT_POINT);
+            // Compare device id's
+            if( $statParent[0] == $statMount[0] ){
+                return false;
+            }else{
+                return true;
+            }
+        }else{
+            return false;
+        }
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @throws \Exception
+     * @throws \Pydio\Core\Exception\PydioException
+     */
+    public function mountFS(ContextInterface $ctx)
+    {
+        list($user, $password) = $this->getCredentials();
+        $this->logDebug("FSMounter::mountFS Should mount" . $user);
+        $repo = $ctx->getRepository();
+
+        if(isset($this->options["MOUNT_DEVIL"]) && !empty($this->options["MOUNT_DEVIL"]) && $this->options["MOUNT_DEVIL"]) {
+            $udevil = "udevil --quiet";
+        }else{
+            $udevil = "";
+        }
+
+        $MOUNT_TYPE = $this->options["FILESYSTEM_TYPE"];
+        $MOUNT_POINT = $this->getOption($ctx, "MOUNT_POINT", $user, $password);
+        $MOUNT_POINT_ROOT = $this->getOption($ctx, "MOUNT_POINT", "", "");
+        $create = $repo->getContextOption($ctx, "CREATE");
+        if ( $MOUNT_POINT != $MOUNT_POINT_ROOT && !is_dir($MOUNT_POINT_ROOT) && $create) {
+            @mkdir($MOUNT_POINT_ROOT, 0755);
+        }
+        $recycle = false;
+        if (!is_dir($MOUNT_POINT) && $create) {
+            @mkdir($MOUNT_POINT, 0755);
+        } else {
+            if ($repo->getContextOption($ctx, "RECYCLE_BIN") != "") {
+                // Make sure the recycle bin was not mounted inside the mount point!
+                $recycle = $repo->getContextOption($ctx, "PATH")."/".$repo->getContextOption($ctx, "RECYCLE_BIN");
+                if (@is_dir($recycle)) {
+                    @rmdir($recycle);
+                }
+            }
+        }
+        $UNC_PATH = $this->getOption($ctx, "UNC_PATH", $user, $password, false);
+        $MOUNT_OPTIONS = $this->getOption($ctx, "MOUNT_OPTIONS", $user, $password, false);
+
+        $cmd = $udevil."mount -t " .$MOUNT_TYPE. (empty( $MOUNT_OPTIONS )? " " : " -o " .escapeshellarg($MOUNT_OPTIONS). " " ) .escapeshellarg($UNC_PATH). " " .escapeshellarg($MOUNT_POINT);
+        $res = null;
+        if($this->getOption($ctx, "MOUNT_ENV_PASSWD") == true){
+            putenv("PASSWD=$password");
+        }
+        system($cmd, $res);
+        if($this->getOption($ctx, "MOUNT_ENV_PASSWD") == true){
+            putenv("PASSWD=");
+        }
+        $resultsOptions = str_replace(" ", "", $this->getOption($ctx, "MOUNT_RESULT_SUCCESS"));
+        $acceptedResults = array(0);
+        if(!empty($resultsOptions)){
+            $acceptedResults = array_merge($acceptedResults, array_map("intval", explode(",", $resultsOptions)));
+        }
+
+        if($res === null){
+            // Check it is correctly mounted now!
+            // Could not get the output return code
+            $cmd1 = "mount | grep ".escapeshellarg($MOUNT_POINT);
+            $output = shell_exec($cmd1);
+            $success = !empty($output);
+        }else{
+            $success = (in_array($res, $acceptedResults));
+        }
+        if (!$success) {
+            throw new \Exception("Error while mounting file system!");
+        } else {
+            if ($recycle !== false && !is_dir($recycle)) {
+                @mkdir($recycle, 0755);
+            }
+        }
+    }
+
+    /**
+     * @param ContextInterface $contextInterface
+     * @return bool
+     * @throws \Exception
+     */
+    public function umountFS(ContextInterface $contextInterface)
+    {
+        $this->logDebug("FSMounter::unmountFS");
+        list($user, $password) = $this->getCredentials();
+        $MOUNT_POINT = $this->getOption($contextInterface, "MOUNT_POINT", $user, $password);
+
+        if(isset($this->options["MOUNT_DEVIL"]) && !empty($this->options["MOUNT_DEVIL"]) && $this->options["MOUNT_DEVIL"]) {
+            $udevil = "udevil --quiet";
+        }else{
+            $udevil = "";
+        }
+        system($udevil."umount ".escapeshellarg($MOUNT_POINT), $res);
+        if($this->getOption($contextInterface, "REMOVE_MOUNTPOINT_ON_UNMOUNT") == true && $res == 0 && !$this->isAlreadyMounted($contextInterface) ){
+            // Remove mount point
+            $testRm = @rmdir($MOUNT_POINT);
+            if($testRm === false){
+                $this->logError("[umount]", "Error while trying to delete mount point on unmount");
+            }
+        }
+        return true;
+    }
+
+}
diff --git a/core/src/plugins/meta.mount/class.FilesystemMounter.php b/core/src/plugins/meta.mount/class.FilesystemMounter.php
deleted file mode 100755
index 1bc7d8af30..0000000000
--- a/core/src/plugins/meta.mount/class.FilesystemMounter.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-/**
- * Dynamically mount a remote folder when switching to the repository
- * @package AjaXplorer_Plugins
- * @subpackage Meta
- *
- */
-class FilesystemMounter extends AJXP_AbstractMetaSource
-{
-    /**
-     * @var Repository
-     */
-    protected $repository;
-
-    /**
-     * @param AbstractAccessDriver $accessDriver
-     * @param Repository $repository
-     */
-    public function beforeInitMeta($accessDriver, $repository)
-    {
-        $this->accessDriver = $accessDriver;
-        $this->repository = $repository;
-        if($this->isAlreadyMounted()) return;
-        $this->mountFS();
-    }
-
-    /**
-     * @param AbstractAccessDriver $accessDriver
-     */
-    public function initMeta($accessDriver)
-    {
-        parent::initMeta($accessDriver);
-        $this->repository = $this->accessDriver->repository;
-        /*
-        if($this->isAlreadyMounted()) return;
-        $this->mountFS();
-        */
-    }
-
-    protected function getCredentials()
-    {
-        // 1. Try from plugin config
-        $user = $this->options["USER"];
-        $password = $this->options["PASS"];
-        // 1BIS : encoded?
-        if ($user == "" && isSet($this->options["ENCODED_CREDENTIALS"])) {
-            list($user,$password) = AJXP_Safe::getCredentialsFromEncodedString($this->options["ENCODED_CREDENTIALS"]);
-        }
-        // 2. Try from session
-        if ($user=="" &&  isSet($this->options["USE_SESSION_CREDENTIALS"]) ) {
-            $safeCred = AJXP_Safe::loadCredentials();
-            if ($safeCred !== false) {
-                $user = $safeCred["user"];
-                $password = $safeCred["password"];
-            } else {
-                throw new Exception("Session credential are empty! Did you forget to check the Set Session Credential in the Authentication configuration panel?");
-            }
-        }
-        return array($user, $password);
-    }
-
-    protected function getOption($name, $user="", $pass="", $escapePass = true)
-    {
-        $opt = $this->options[$name];
-        $opt = str_replace("AJXP_USER", $user, $opt);
-        if($escapePass)  $opt = str_replace("AJXP_PASS",  "'$pass'", $opt);
-        else $opt = str_replace("AJXP_PASS",  $pass, $opt);
-        $opt = str_replace("AJXP_SERVER_UID", posix_getuid(), $opt);
-        $opt = str_replace("AJXP_SERVER_GID", posix_getgid(), $opt);
-        if (stristr($opt, "AJXP_REPOSITORY_PATH") !== false) {
-            $repo = $this->repository;
-            $path = $repo->getOption("PATH");
-            $opt = str_replace("AJXP_REPOSITORY_PATH", $path, $opt);
-        }
-        $opt = AJXP_VarsFilter::filter($opt);
-        return $opt;
-    }
-
-    protected function isAlreadyMounted()
-    {
-        list($user, $password) = $this->getCredentials();
-        $MOUNT_POINT = $this->getOption("MOUNT_POINT", $user, $password);
-        if( is_dir($MOUNT_POINT) ){
-            $statParent = stat(dirname($MOUNT_POINT));
-            $statMount = stat($MOUNT_POINT);
-            // Compare device id's
-            if( $statParent[0] == $statMount[0] ){
-                return false;
-            }else{
-                return true;
-            }
-        }else{
-            return false;
-        }
-    }
-
-    public function mountFS()
-    {
-        list($user, $password) = $this->getCredentials();
-        $this->logDebug("FSMounter::mountFS Should mount" . $user);
-        $repo = $this->repository;
-
-        if(isset($this->options["MOUNT_DEVIL"]) && !empty($this->options["MOUNT_DEVIL"]) && $this->options["MOUNT_DEVIL"]) {
-            $udevil = "udevil ";
-        }else{
-            $udevil = "";
-        }
-
-        $MOUNT_TYPE = $this->options["FILESYSTEM_TYPE"];
-        $MOUNT_POINT = $this->getOption("MOUNT_POINT", $user, $password);
-        $MOUNT_POINT_ROOT = $this->getOption("MOUNT_POINT", "", "");
-        $create = $repo->getOption("CREATE");
-        if ( $MOUNT_POINT != $MOUNT_POINT_ROOT && !is_dir($MOUNT_POINT_ROOT) && $create) {
-            @mkdir($MOUNT_POINT_ROOT, 0755);
-        }
-        $recycle = false;
-        if (!is_dir($MOUNT_POINT) && $create) {
-            @mkdir($MOUNT_POINT, 0755);
-        } else {
-            if ($repo->getOption("RECYCLE_BIN") != "") {
-                // Make sure the recycle bin was not mounted inside the mount point!
-                $recycle = $repo->getOption("PATH")."/".$repo->getOption("RECYCLE_BIN");
-                if (@is_dir($recycle)) {
-                    @rmdir($recycle);
-                }
-            }
-        }
-        $UNC_PATH = $this->getOption("UNC_PATH", $user, $password, false);
-        $MOUNT_OPTIONS = $this->getOption("MOUNT_OPTIONS", $user, $password, false);
-
-        $cmd = $udevil."mount -t " .$MOUNT_TYPE. (empty( $MOUNT_OPTIONS )? " " : " -o " .escapeshellarg($MOUNT_OPTIONS). " " ) .escapeshellarg($UNC_PATH). " " .escapeshellarg($MOUNT_POINT);
-        $res = null;
-        if($this->getOption("MOUNT_ENV_PASSWD") == true){
-            putenv("PASSWD=$password");
-        }
-        system($cmd, $res);
-        if($this->getOption("MOUNT_ENV_PASSWD") == true){
-            putenv("PASSWD=");
-        }
-        $resultsOptions = str_replace(" ", "", $this->getOption("MOUNT_RESULT_SUCCESS"));
-        $acceptedResults = array(0);
-        if(!empty($resultsOptions)){
-            $acceptedResults = array_merge($acceptedResults, array_map("intval", explode(",", $resultsOptions)));
-        }
-
-        if($res === null){
-            // Check it is correctly mounted now!
-            // Could not get the output return code
-            $cmd1 = "mount | grep ".escapeshellarg($MOUNT_POINT);
-            $output = shell_exec($cmd1);
-            $success = !empty($output);
-        }else{
-            $success = (in_array($res, $acceptedResults));
-        }
-        if (!$success) {
-            throw new Exception("Error while mounting file system!");
-        } else {
-            if ($recycle !== false && !is_dir($recycle)) {
-                @mkdir($recycle, 0755);
-            }
-        }
-    }
-
-    public function umountFS()
-    {
-        $this->logDebug("FSMounter::unmountFS");
-        list($user, $password) = $this->getCredentials();
-        $MOUNT_POINT = $this->getOption("MOUNT_POINT", $user, $password);
-
-        if(isset($this->options["MOUNT_DEVIL"]) && !empty($this->options["MOUNT_DEVIL"]) && $this->options["MOUNT_DEVIL"]) {
-            $udevil = "udevil ";
-        }else{
-            $udevil = "";
-        }
-        system($udevil."umount ".escapeshellarg($MOUNT_POINT), $res);
-        if($this->getOption("REMOVE_MOUNTPOINT_ON_UNMOUNT") == true && $res == 0 && !$this->isAlreadyMounted() ){
-            // Remove mount point
-            $testRm = @rmdir($MOUNT_POINT);
-            if($testRm === false){
-                $this->logError("[umount]", "Error while trying to delete mount point on unmount");
-            }
-        }
-        return true;
-    }
-
-}
diff --git a/core/src/plugins/meta.mount/i18n/conf/de.php b/core/src/plugins/meta.mount/i18n/conf/de.php
index d43b9db6df..bd1ac68d63 100644
--- a/core/src/plugins/meta.mount/i18n/conf/de.php
+++ b/core/src/plugins/meta.mount/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FS Mount" => "Dateisystem einbinden",
@@ -39,4 +39,4 @@
 "On some setup result code 32 is often an already mounted code and we want to consider this as a success. Add comma-separated list of codes." => "On some setup result code 32 is often an already mounted code and we want to consider this as a success. Add comma-separated list of codes.",
 "Remove mount point on unmount" => "Remove mount point on unmount",
 "Delete mount folder on unmount. Can be required for security reasons." => "Delete mount folder on unmount. Can be required for security reasons.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/meta.mount/i18n/conf/en.php b/core/src/plugins/meta.mount/i18n/conf/en.php
index f32f852fe5..0b35865564 100644
--- a/core/src/plugins/meta.mount/i18n/conf/en.php
+++ b/core/src/plugins/meta.mount/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FS Mount" => "FS Mount",
diff --git a/core/src/plugins/meta.mount/i18n/conf/fr.php b/core/src/plugins/meta.mount/i18n/conf/fr.php
index 876daeabd0..cfd7b97f69 100644
--- a/core/src/plugins/meta.mount/i18n/conf/fr.php
+++ b/core/src/plugins/meta.mount/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FS Mount" => "Montage de système de fichiers",
diff --git a/core/src/plugins/meta.mount/i18n/conf/it.php b/core/src/plugins/meta.mount/i18n/conf/it.php
index 232c76c9c2..e23f409ddf 100644
--- a/core/src/plugins/meta.mount/i18n/conf/it.php
+++ b/core/src/plugins/meta.mount/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FS Mount" => "Monta FS",
@@ -39,4 +39,4 @@
 "On some setup result code 32 is often an already mounted code and we want to consider this as a success. Add comma-separated list of codes." => "On some setup result code 32 is often an already mounted code and we want to consider this as a success. Add comma-separated list of codes.",
 "Remove mount point on unmount" => "Remove mount point on unmount",
 "Delete mount folder on unmount. Can be required for security reasons." => "Delete mount folder on unmount. Can be required for security reasons.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/meta.mount/i18n/conf/pt.php b/core/src/plugins/meta.mount/i18n/conf/pt.php
index 777ad31715..94100879ac 100644
--- a/core/src/plugins/meta.mount/i18n/conf/pt.php
+++ b/core/src/plugins/meta.mount/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FS Mount" => "Partição FS",
diff --git a/core/src/plugins/meta.mount/manifest.xml b/core/src/plugins/meta.mount/manifest.xml
index 1f6e1f9a25..021b0e0ffb 100644
--- a/core/src/plugins/meta.mount/manifest.xml
+++ b/core/src/plugins/meta.mount/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <meta id="meta.mount" label="CONF_MESSAGE[FS Mount]" description="CONF_MESSAGE[Mount a remote location on the file system before accessing the repository]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd" mixins="credentials_consumer">
-    <class_definition filename="plugins/meta.mount/class.FilesystemMounter.php" classname="FilesystemMounter"/>
+    <class_definition filename="plugins/meta.mount/FilesystemMounter.php" classname="Pydio\Access\Meta\Mount\FilesystemMounter"/>
     <server_settings>
         <param name="FILESYSTEM_TYPE" type="string" label="CONF_MESSAGE[FS Type]" description="CONF_MESSAGE[Filesystem Type, will be used for the -t option of the mount command]" mandatory="true" default="cifs"/>
         <param name="MOUNT_DEVIL" type="boolean" label="CONF_MESSAGE[Devil]" description="CONF_MESSAGE[Call the mount/umount commands through devil, must be configured on the server]" mandatory="true" default="false"/>
diff --git a/core/src/plugins/meta.quota/QuotaComputer.php b/core/src/plugins/meta.quota/QuotaComputer.php
new file mode 100644
index 0000000000..4e5cfbfb0b
--- /dev/null
+++ b/core/src/plugins/meta.quota/QuotaComputer.php
@@ -0,0 +1,263 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Meta\Quota;
+
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Utils\Vars\StatHelper;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Access\Meta\Core\AbstractMetaSource;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Computes used storage for user
+ * @package AjaXplorer_Plugins
+ * @subpackage Meta
+ */
+class QuotaComputer extends AbstractMetaSource
+{
+    /**
+     * @var AbstractAccessDriver
+     */
+    protected $accessDriver;
+    protected $currentQuota;
+    protected $computeLocal = true;
+    public static $loadedQuota;
+    public static $loadedSoftLimit;
+    /**
+     * @var \Pydio\Mailer\Core\Mailer
+     */
+    protected $mailer;
+    
+    /**
+     * @param ContextInterface $ctx
+     * @return ContextInterface
+     */
+    protected function getEffectiveContext(ContextInterface $ctx){
+        $repository = $ctx->getRepository();
+        if($repository->hasParent() && $repository->getOwner() !== null){
+            $parentOwner = $repository->getOwner();
+            return $ctx->withRepositoryId($repository->getParentId())->withUserId($parentOwner);
+        }else{
+            return $ctx;
+        }
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $optionName
+     * @return mixed|null
+     */
+    public function getContextualOption(ContextInterface $ctx, $optionName)
+    {
+        $repo = $ctx->getRepository();
+        $user = $ctx->getUser();
+        if ($repo->hasParent() && $repo->getOwner() != null && $repo->getOwner() != $user->getId()) {
+            // Pass parent user instead of currently logged
+            $userObject = UsersService::getUserById($repo->getOwner());
+            $newCtx = \Pydio\Core\Model\Context::contextWithObjects($userObject, $repo);
+            return parent::getContextualOption($newCtx, $optionName);
+        }else{
+            return parent::getContextualOption($ctx, $optionName);
+        }
+
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     * @param int $newSize
+     * @return mixed
+     * @throws \Exception
+     */
+    public function precheckQuotaUsage($node, $newSize = 0)
+    {
+        // POSITIVE DELTA ?
+        if ($newSize == 0) {
+            return null;
+        }
+        $delta = $newSize;
+        $quota = $this->getAuthorized($node->getContext());
+        $soft = $this->getSoftLimit($node->getContext());
+        $q = $this->getUsageForContext($node->getContext());
+        $this->logDebug("QUOTA : Previous usage was $q");
+        if ($q + $delta >= $quota) {
+            $mess = LocaleService::getMessages();
+            throw new \Exception($mess["meta.quota.3"]." (". StatHelper::roundSize($quota) .")!");
+        } else if ( $soft !== false && ($q + $delta) >= $soft && $q <= $soft) {
+            $this->sendSoftLimitAlert($node->getContext());
+        }
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     */
+    protected function sendSoftLimitAlert(ContextInterface $ctx)
+    {
+        $mailer = PluginsService::getInstance($ctx)->getActivePluginsForType("mailer", true);
+        if ($mailer !== false && $ctx->hasUser()) {
+            $percent = $this->getContextualOption($ctx, "SOFT_QUOTA");
+            $quota = $this->getContextualOption($ctx, "DEFAULT_QUOTA");
+            $mailer->sendMail(
+                $ctx, 
+                array($ctx->getUser()->getId()),
+                "You are close to exceed your quota!",
+                "You are currently using more than $percent% of your authorized quota of $quota!");
+        }
+    }
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     */
+    public function getCurrentQuota(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface)
+    {
+        $ctx = $requestInterface->getAttribute("ctx");
+        $u = $this->getUsageForContext($ctx);
+        $responseInterface = new \Zend\Diactoros\Response\JsonResponse(['USAGE' => $u, 'TOTAL' => $this->getAuthorized($ctx)]);
+        return;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $data
+     */
+    public function loadRepositoryInfo(ContextInterface $ctx, &$data){
+        $data['meta.quota'] = array(
+            'usage' => $u = $this->getUsageForContext($ctx),
+            'total' => $this->getAuthorized($ctx)
+        );
+    }
+
+    /**
+     * @param AJXP_Node $oldNode
+     * @param AJXP_Node $newNode
+     * @param bool $copy
+     * @throws \Exception
+     */
+    public function recomputeQuotaUsage($oldNode = null, $newNode = null, $copy = false)
+    {
+        //$repoOptions = $this->getWorkingRepositoryOptions();
+        //$q = $this->accessDriver->directoryUsage("", $repoOptions);
+
+        $refNode = ($oldNode !== null ? $oldNode : $newNode);
+        $q = $this->getUsageForContext($refNode->getContext());
+        $this->storeUsage($refNode->getContext(), $q);
+        $t = $this->getAuthorized($refNode->getContext());
+
+        Controller::applyHook("msg.instant", array($refNode->getContext(), "<metaquota usage='{$q}' total='{$t}'/>"));
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $quota
+     */
+    protected function storeUsage(ContextInterface $ctx, $quota)
+    {
+        $data = $this->getUserData($ctx);
+        $repo = $ctx->getRepositoryId();
+        if(!isset($data["REPO_USAGES"])) $data["REPO_USAGES"] = array();
+        $data["REPO_USAGES"][$repo] = $quota;
+        $this->saveUserData($ctx, $data);
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @return int
+     */
+    protected function getAuthorized(ContextInterface $ctx)
+    {
+        if(self::$loadedQuota != null) return self::$loadedQuota;
+        $q = $this->getContextualOption($ctx, "DEFAULT_QUOTA");
+        self::$loadedQuota = StatHelper::convertBytes($q);
+        return self::$loadedQuota;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @return bool|float
+     */
+    protected function getSoftLimit(ContextInterface $ctx)
+    {
+        if(self::$loadedSoftLimit != null) return self::$loadedSoftLimit;
+        $l = $this->getContextualOption($ctx, "SOFT_QUOTA");
+        if (!empty($l)) {
+            self::$loadedSoftLimit = round($this->getAuthorized($ctx)*intval($l)/100);
+        } else {
+            self::$loadedSoftLimit = false;
+        }
+        return self::$loadedSoftLimit;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @return integer
+     */
+    private function getUsageForContext(ContextInterface $ctx){
+
+        $ctx = $this->getEffectiveContext($ctx);
+        $rootNode = new AJXP_Node($ctx->getUrlBase()."/");
+
+        if (!isSet($data["REPO_USAGES"][$ctx->getRepositoryId()]) || $this->options["CACHE_QUOTA"] === false) {
+
+            $quota = $rootNode->getSizeRecursive();
+            if(!isset($data["REPO_USAGES"])) $data["REPO_USAGES"] = array();
+            $data["REPO_USAGES"][$ctx->getRepositoryId()] = $quota;
+            $this->saveUserData($ctx, $data);
+
+        }
+
+        if ($this->getContextualOption($ctx, "USAGE_SCOPE") == "local") {
+            return floatval($data["REPO_USAGES"][$ctx->getRepositoryId()]);
+        } else {
+            return array_sum(array_map("floatval", $data["REPO_USAGES"]));
+        }
+
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @return array|mixed|string
+     */
+    private function getUserData(ContextInterface $ctx)
+    {
+        $logged = $ctx->getUser();
+        $data = $logged->getPref("meta.quota");
+        if(is_array($data)) return $data;
+        else return array();
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $data
+     */
+    private function saveUserData(ContextInterface $ctx, $data)
+    {
+        $logged = $ctx->getUser();
+        $logged->setPref("meta.quota", $data);
+        $logged->save("user");
+    }
+
+}
diff --git a/core/src/plugins/meta.quota/class.QuotaComputer.php b/core/src/plugins/meta.quota/class.QuotaComputer.php
deleted file mode 100644
index 55e6ef4a63..0000000000
--- a/core/src/plugins/meta.quota/class.QuotaComputer.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-/**
- * Computes used storage for user
- * @package AjaXplorer_Plugins
- * @subpackage Meta
- */
-class QuotaComputer extends AJXP_AbstractMetaSource
-{
-    /**
-     * @var AbstractAccessDriver
-     */
-    protected $accessDriver;
-    protected $currentQuota;
-    protected $computeLocal = true;
-    public static $loadedQuota;
-    public static $loadedSoftLimit;
-    /**
-     * @var AjxpMailer
-     */
-    protected $mailer;
-
-    protected function getWorkingPath()
-    {
-        $repo = $this->accessDriver->repository;
-        $clearParent = null;
-        // SPECIAL : QUOTA MUST BE COMPUTED ON PARENT REPOSITORY FOLDER
-        if ($repo->hasParent()) {
-            $parentOwner = $repo->getOwner();
-            if ($parentOwner !== null) {
-                $repo = ConfService::getRepositoryById($repo->getParentId());
-                $originalUser = AuthService::getLoggedUser();
-                $loggedUser = AuthService::getLoggedUser();
-                if (!$loggedUser->hasParent()) {
-                    $loggedUser->setParent($parentOwner);
-                    $clearParent = null;
-                } else {
-                    $clearParent = $loggedUser->getParent();
-                }
-                $loggedUser->setResolveAsParent(true);
-                AuthService::updateUser($loggedUser);
-            }
-        }
-        $path = $repo->getOption("PATH");
-        if ( isSet($originalUser) ) {
-            $originalUser->setParent($clearParent);
-            $originalUser->setResolveAsParent(false);
-            AuthService::updateUser($originalUser);
-        }
-
-        return $path;
-    }
-
-    /**
-     * @return array
-     */
-    protected function getWorkingRepositoryOptions()
-    {
-        $p = array();
-        $repo = $this->accessDriver->repository;
-        $clearParent = null;
-        // SPECIAL : QUOTA MUST BE COMPUTED ON PARENT REPOSITORY FOLDER
-        if ($repo->hasParent()) {
-            $parentOwner = $repo->getOwner();
-            if ($parentOwner !== null) {
-                $repo = ConfService::getRepositoryById($repo->getParentId());
-                $originalUser = AuthService::getLoggedUser();
-                $loggedUser = AuthService::getLoggedUser();
-                if (!$loggedUser->hasParent()) {
-                    $loggedUser->setParent($parentOwner);
-                    $clearParent = null;
-                } else {
-                    $clearParent = $loggedUser->getParent();
-                }
-                $loggedUser->setResolveAsParent(true);
-                AuthService::updateUser($loggedUser);
-            }
-        }
-        $path = $repo->getOption("PATH");
-        $p["PATH"] = $path;
-        if ( isSet($originalUser) ) {
-            $originalUser->setParent($clearParent);
-            $originalUser->setResolveAsParent(false);
-            AuthService::updateUser($originalUser);
-        }
-        return $p;
-    }
-
-    public function getFilteredOption($optionName, $repoScope = AJXP_REPO_SCOPE_ALL, $userObject = null){
-        $repo = $this->accessDriver->repository;
-        if ($repo->hasParent() && $repo->getOwner() != null && $repo->getOwner() != AuthService::getLoggedUser()->getId()) {
-            // Pass parent user instead of currently logged
-            $userObject = ConfService::getConfStorageImpl()->createUserObject($repo->getOwner());
-        }
-        return parent::getFilteredOption($optionName, $repoScope, $userObject);
-    }
-
-    /**
-     * @param AJXP_Node $node
-     * @param int $newSize
-     * @return mixed
-     * @throws Exception
-     */
-    public function precheckQuotaUsage($node, $newSize = 0)
-    {
-        // POSITIVE DELTA ?
-        if ($newSize == 0) {
-            return null;
-        }
-        $delta = $newSize;
-        $quota = $this->getAuthorized();
-        $soft = $this->getSoftLimit();
-        $q = $this->getUsage();
-        $this->logDebug("QUOTA : Previous usage was $q");
-        if ($q + $delta >= $quota) {
-            $mess = ConfService::getMessages();
-            throw new Exception($mess["meta.quota.3"]." (".AJXP_Utils::roundSize($quota) .")!");
-        } else if ( $soft !== false && ($q + $delta) >= $soft && $q <= $soft) {
-            $this->sendSoftLimitAlert();
-        }
-    }
-
-    protected function sendSoftLimitAlert()
-    {
-        $mailer = AJXP_PluginsService::getInstance()->getActivePluginsForType("mailer", true);
-        if ($mailer !== false) {
-            $percent = $this->getFilteredOption("SOFT_QUOTA");
-            $quota = $this->getFilteredOption("DEFAULT_QUOTA");
-            $mailer->sendMail(
-                array(AuthService::getLoggedUser()->getId()),
-                "You are close to exceed your quota!",
-                "You are currently using more than $percent% of your authorized quota of $quota!");
-        }
-    }
-
-    public function getCurrentQuota($action, $httpVars, $fileVars)
-    {
-        $u = $this->getUsage();
-        HTMLWriter::charsetHeader("application/json");
-        print json_encode(array('USAGE' => $u, 'TOTAL' => $this->getAuthorized()));
-        return;
-    }
-
-    public function loadRepositoryInfo(&$data){
-        $data['meta.quota'] = array(
-            'usage' => $u = $this->getUsage(),
-            'total' => $this->getAuthorized()
-        );
-    }
-
-    public function recomputeQuotaUsage($oldNode = null, $newNode = null, $copy = false)
-    {
-        $repoOptions = $this->getWorkingRepositoryOptions();
-        $q = $this->accessDriver->directoryUsage("", $repoOptions);
-        $this->storeUsage($q);
-        $t = $this->getAuthorized();
-        AJXP_Controller::applyHook("msg.instant", array("<metaquota usage='{$q}' total='{$t}'/>", $this->accessDriver->repository->getId()));
-    }
-
-    protected function storeUsage($quota)
-    {
-        $data = $this->getUserData();
-        $repo = $this->accessDriver->repository->getId();
-        if(!isset($data["REPO_USAGES"])) $data["REPO_USAGES"] = array();
-        $data["REPO_USAGES"][$repo] = $quota;
-        $this->saveUserData($data);
-    }
-
-    protected function getAuthorized()
-    {
-        if(self::$loadedQuota != null) return self::$loadedQuota;
-        $q = $this->getFilteredOption("DEFAULT_QUOTA");
-        self::$loadedQuota = AJXP_Utils::convertBytes($q);
-        return self::$loadedQuota;
-    }
-
-    protected function getSoftLimit()
-    {
-        if(self::$loadedSoftLimit != null) return self::$loadedSoftLimit;
-        $l = $this->getFilteredOption("SOFT_QUOTA");
-        if (!empty($l)) {
-            self::$loadedSoftLimit = round($this->getAuthorized()*intval($l)/100);
-        } else {
-            self::$loadedSoftLimit = false;
-        }
-        return self::$loadedSoftLimit;
-    }
-
-    /**
-     * @param String $dir
-     * @return bool|int
-     */
-    private function getUsage()
-    {
-        $data = $this->getUserData();
-        $repo = $this->accessDriver->repository->getId();
-        $repoOptions = $this->getWorkingRepositoryOptions();
-        if (!isSet($data["REPO_USAGES"][$repo]) || $this->options["CACHE_QUOTA"] === false) {
-            $quota = $this->accessDriver->directoryUsage("", $repoOptions);
-            if(!isset($data["REPO_USAGES"])) $data["REPO_USAGES"] = array();
-            $data["REPO_USAGES"][$repo] = $quota;
-            $this->saveUserData($data);
-        }
-
-        if ($this->getFilteredOption("USAGE_SCOPE", $repo) == "local") {
-            return floatval($data["REPO_USAGES"][$repo]);
-        } else {
-            return array_sum(array_map("floatval", $data["REPO_USAGES"]));
-        }
-
-    }
-
-    private function getUserData()
-    {
-        $logged = AuthService::getLoggedUser();
-        $data = $logged->getPref("meta.quota");
-        if(is_array($data)) return $data;
-        else return array();
-    }
-
-    private function saveUserData($data)
-    {
-        $logged = AuthService::getLoggedUser();
-        $logged->setPref("meta.quota", $data);
-        $logged->save("user");
-        AuthService::updateUser($logged);
-    }
-
-}
diff --git a/core/src/plugins/meta.quota/i18n/ca.php b/core/src/plugins/meta.quota/i18n/ca.php
index 2065005427..1fdf4d78b5 100644
--- a/core/src/plugins/meta.quota/i18n/ca.php
+++ b/core/src/plugins/meta.quota/i18n/ca.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 // catalan translation: Salva Gómez <salva.gomez at gmail.com>, 2015
 $mess=array(
diff --git a/core/src/plugins/meta.quota/i18n/conf/de.php b/core/src/plugins/meta.quota/i18n/conf/de.php
index 6b17796c02..8a0b403ca4 100644
--- a/core/src/plugins/meta.quota/i18n/conf/de.php
+++ b/core/src/plugins/meta.quota/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FS Mount" => "Dateisystem einbinden",
diff --git a/core/src/plugins/meta.quota/i18n/conf/en.php b/core/src/plugins/meta.quota/i18n/conf/en.php
index 7a2877dca9..79a592919e 100644
--- a/core/src/plugins/meta.quota/i18n/conf/en.php
+++ b/core/src/plugins/meta.quota/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FS Mount" => "FS Mount",
diff --git a/core/src/plugins/meta.quota/i18n/conf/fr.php b/core/src/plugins/meta.quota/i18n/conf/fr.php
index 5a0d59c600..354e465de8 100644
--- a/core/src/plugins/meta.quota/i18n/conf/fr.php
+++ b/core/src/plugins/meta.quota/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FS Mount" => "Montage de système de fichiers",
diff --git a/core/src/plugins/meta.quota/i18n/conf/it.php b/core/src/plugins/meta.quota/i18n/conf/it.php
index 8cb57ceee7..ad4a1b4d5f 100644
--- a/core/src/plugins/meta.quota/i18n/conf/it.php
+++ b/core/src/plugins/meta.quota/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FS Mount" => "Monta FS",
diff --git a/core/src/plugins/meta.quota/i18n/conf/pt.php b/core/src/plugins/meta.quota/i18n/conf/pt.php
index fcd5b0acd6..949a67a7d7 100644
--- a/core/src/plugins/meta.quota/i18n/conf/pt.php
+++ b/core/src/plugins/meta.quota/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FS Mount" => "Partição FS",
diff --git a/core/src/plugins/meta.quota/i18n/conf/ru.php b/core/src/plugins/meta.quota/i18n/conf/ru.php
index 31dcc2772a..d7b93d7603 100644
--- a/core/src/plugins/meta.quota/i18n/conf/ru.php
+++ b/core/src/plugins/meta.quota/i18n/conf/ru.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "FS Mount" => "FS Mount",
@@ -34,4 +34,4 @@
 "Soft Limit (%)" => "Soft Limit (%)",
 "Custom Field (Deprecated)" => "Custom Field (Deprecated)",
 "If you want to define quotas for each user, define a custom field in the CUSTOM_DATA parameter of the conf plugin, and declare this field name here." => "If you want to define quotas for each user, define a custom field in the CUSTOM_DATA parameter of the conf plugin, and declare this field name here.",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/meta.quota/i18n/de.php b/core/src/plugins/meta.quota/i18n/de.php
index 81593089dd..9dffa88d70 100644
--- a/core/src/plugins/meta.quota/i18n/de.php
+++ b/core/src/plugins/meta.quota/i18n/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Speicherverbrauch (lädt...)",
diff --git a/core/src/plugins/meta.quota/i18n/en.php b/core/src/plugins/meta.quota/i18n/en.php
index eb7f543f53..e262a8e45c 100644
--- a/core/src/plugins/meta.quota/i18n/en.php
+++ b/core/src/plugins/meta.quota/i18n/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Quota usage (loading...)",
diff --git a/core/src/plugins/meta.quota/i18n/es.php b/core/src/plugins/meta.quota/i18n/es.php
index 1dc95f2560..4ed7fc1a85 100644
--- a/core/src/plugins/meta.quota/i18n/es.php
+++ b/core/src/plugins/meta.quota/i18n/es.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 // spanish translation: Salva Gómez <salva.gomez at gmail.com>, 2015
 $mess=array(
diff --git a/core/src/plugins/meta.quota/i18n/fr.php b/core/src/plugins/meta.quota/i18n/fr.php
index a4b98830f1..81700b4979 100644
--- a/core/src/plugins/meta.quota/i18n/fr.php
+++ b/core/src/plugins/meta.quota/i18n/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Utilisation du quota (en cours...)",
diff --git a/core/src/plugins/meta.quota/i18n/it.php b/core/src/plugins/meta.quota/i18n/it.php
index 00c6e2ad47..a9413e4d31 100644
--- a/core/src/plugins/meta.quota/i18n/it.php
+++ b/core/src/plugins/meta.quota/i18n/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Utilizzo (caricamento...)",
diff --git a/core/src/plugins/meta.quota/i18n/pt.php b/core/src/plugins/meta.quota/i18n/pt.php
index b752f81bdb..753c35210f 100644
--- a/core/src/plugins/meta.quota/i18n/pt.php
+++ b/core/src/plugins/meta.quota/i18n/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Uso da Quota...",
diff --git a/core/src/plugins/meta.quota/i18n/ru.php b/core/src/plugins/meta.quota/i18n/ru.php
index 8eabbc008b..9e58561ee6 100644
--- a/core/src/plugins/meta.quota/i18n/ru.php
+++ b/core/src/plugins/meta.quota/i18n/ru.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Объём файлов (загрузка...)",
diff --git a/core/src/plugins/meta.quota/manifest.xml b/core/src/plugins/meta.quota/manifest.xml
index 6a72b413a8..04447a06d5 100644
--- a/core/src/plugins/meta.quota/manifest.xml
+++ b/core/src/plugins/meta.quota/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <meta id="meta.quota" label="CONF_MESSAGE[User quota]" description="CONF_MESSAGE[Maintain the size of a given directory for each user]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <class_definition filename="plugins/meta.quota/class.QuotaComputer.php" classname="QuotaComputer"/>
+    <class_definition filename="plugins/meta.quota/QuotaComputer.php" classname="Pydio\Access\Meta\Quota\QuotaComputer"/>
     <server_settings>
         <param description="CONF_MESSAGE[Authorized quota. Use php.ini like values (20M, 2G), etc.]" label="CONF_MESSAGE[User Quota]" name="DEFAULT_QUOTA" type="string" inherit="true"/>
         <param description="CONF_MESSAGE[Store computed quota value in the user preferences, to avoid triggering computation each time it is requested. This may introduce some lag if the repository is shared by many users.]" label="CONF_MESSAGE[Cache value]" name="CACHE_QUOTA" type="boolean" default="false"/>
diff --git a/core/src/plugins/meta.simple_lock/SimpleLockManager.php b/core/src/plugins/meta.simple_lock/SimpleLockManager.php
new file mode 100644
index 0000000000..7b9f2e0095
--- /dev/null
+++ b/core/src/plugins/meta.simple_lock/SimpleLockManager.php
@@ -0,0 +1,156 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Meta\Lock;
+
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\NodesDiff;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Http\Response\SerializableResponseStream;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Access\Meta\Core\AbstractMetaSource;
+use Pydio\Access\Metastore\Core\IMetaStoreProvider;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Locks a folder manually
+ * @package AjaXplorer_Plugins
+ * @subpackage Meta
+ */
+class SimpleLockManager extends AbstractMetaSource
+{
+    const METADATA_LOCK_NAMESPACE = "simple_lock";
+    /**
+    * @var IMetaStoreProvider
+    */
+    protected $metaStore;
+
+    /**
+     * @param ContextInterface $ctx
+     * @param AbstractAccessDriver $accessDriver
+     * @throws PydioException
+     */
+    public function initMeta(ContextInterface $ctx, AbstractAccessDriver $accessDriver)
+    {
+        parent::initMeta($ctx, $accessDriver);
+        $store = PluginsService::getInstance($ctx)->getUniqueActivePluginForType("metastore");
+        if ($store === false) {
+            throw new PydioException("The 'meta.simple_lock' plugin requires at least one active 'metastore' plugin");
+        }
+    }
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @throws PydioException
+     */
+    public function applyChangeLock(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface)
+    {
+        $httpVars = $requestInterface->getParsedBody();
+        /** @var ContextInterface $ctx */
+        $ctx = $requestInterface->getAttribute("ctx");
+
+        if ($ctx->getRepository()->getDriverInstance($ctx) instanceof \Pydio\Access\Driver\StreamProvider\FS\DemoAccessDriver) {
+            throw new PydioException("Write actions are disabled in demo mode!");
+        }
+        $repo = $ctx->getRepository();
+        $user = $ctx->getUser();
+        if (!UsersService::usersEnabled() && $user!=null && !$user->canWrite($repo->getId())) {
+            throw new PydioException("You have no right on this action.");
+        }
+        $selection = UserSelection::fromContext($ctx, $httpVars);
+
+        $unlock = (isSet($httpVars["unlock"])?true:false);
+        $node = $selection->getUniqueNode();
+        if ($unlock) {
+            $node->removeMetadata(self::METADATA_LOCK_NAMESPACE, false, AJXP_METADATA_SCOPE_GLOBAL);
+        } else {
+            $node->setMetadata(
+                SimpleLockManager::METADATA_LOCK_NAMESPACE,
+                array("lock_user" => $ctx->getUser()->getId()),
+                false,
+                AJXP_METADATA_SCOPE_GLOBAL
+            );
+        }
+        $x = new SerializableResponseStream();
+        $diff = new NodesDiff();
+        $diff->update($selection->getUniqueNode());
+        $x->addChunk($diff);
+        $responseInterface = $responseInterface->withBody($x);
+    }
+
+    /**
+     * @param AJXP_Node $node
+     */
+    public function processLockMeta($node)
+    {
+        // Transform meta into overlay_icon
+        // $this->logDebug("SHOULD PROCESS METADATA FOR ", $node->getLabel());
+        $lock = $node->retrieveMetadata(
+           SimpleLockManager::METADATA_LOCK_NAMESPACE,
+           false,
+           AJXP_METADATA_SCOPE_GLOBAL);
+        if(is_array($lock)
+            && array_key_exists("lock_user", $lock)){
+            if ($lock["lock_user"] != $node->getContext()->getUser()->getId()) {
+                $displayName = UsersService::getUserPersonalParameter("USER_DISPLAY_NAME", $lock["lock_user"], "core.conf", $lock["lock_user"]);
+                $node->setLabel($node->getLabel() . " (locked by ".$displayName.")");
+                $node->mergeMetadata(array(
+                    "sl_locked" => "true",
+                    "overlay_icon" => "meta_simple_lock/ICON_SIZE/lock.png",
+                    "overlay_class" => "icon-lock"
+                ), true);
+            } else {
+                $node->setLabel($node->getLabel() . " (locked by you)");
+                $node->mergeMetadata(array(
+                    "sl_locked" => "true",
+                    "sl_mylock" => "true",
+                    "overlay_icon" => "meta_simple_lock/ICON_SIZE/lock_my.png",
+                    "overlay_class" => "icon-lock"
+                ), true);
+            }
+        }
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     * @throws PydioException
+     */
+    public function checkFileLock($node)
+    {
+        $this->logDebug("SHOULD CHECK LOCK METADATA FOR ", $node->getLabel());
+        $lock = $node->retrieveMetadata(
+           SimpleLockManager::METADATA_LOCK_NAMESPACE,
+           false,
+           AJXP_METADATA_SCOPE_GLOBAL);
+        if(is_array($lock)
+            && array_key_exists("lock_user", $lock)
+            && $lock["lock_user"] != $node->getUserId()){
+            $mess = LocaleService::getMessages();
+            throw new PydioException($mess["meta.simple_lock.5"]);
+        }
+    }
+}
diff --git a/core/src/plugins/meta.simple_lock/class.SimpleLockManager.php b/core/src/plugins/meta.simple_lock/class.SimpleLockManager.php
deleted file mode 100644
index 0e103fee77..0000000000
--- a/core/src/plugins/meta.simple_lock/class.SimpleLockManager.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-/**
- * Locks a folder manually
- * @package AjaXplorer_Plugins
- * @subpackage Meta
- */
-class SimpleLockManager extends AJXP_AbstractMetaSource
-{
-    const METADATA_LOCK_NAMESPACE = "simple_lock";
-    /**
-    * @var MetaStoreProvider
-    */
-    protected $metaStore;
-
-    public function initMeta($accessDriver)
-    {
-        parent::initMeta($accessDriver);
-        $store = AJXP_PluginsService::getInstance()->getUniqueActivePluginForType("metastore");
-        if ($store === false) {
-            throw new Exception("The 'meta.simple_lock' plugin requires at least one active 'metastore' plugin");
-        }
-        $this->metaStore = $store;
-        $this->metaStore->initMeta($accessDriver);
-    }
-
-    /**
-     * @param string $action
-     * @param array $httpVars
-     * @param array $fileVars
-     */
-    public function applyChangeLock($actionName, $httpVars, $fileVars)
-    {
-        if (is_a($this->accessDriver, "demoAccessDriver")) {
-            throw new Exception("Write actions are disabled in demo mode!");
-        }
-        $repo = $this->accessDriver->repository;
-        $user = AuthService::getLoggedUser();
-        if (!AuthService::usersEnabled() && $user!=null && !$user->canWrite($repo->getId())) {
-            throw new Exception("You have no right on this action.");
-        }
-        $selection = new UserSelection($repo, $httpVars);
-
-        $unlock = (isSet($httpVars["unlock"])?true:false);
-        if ($unlock) {
-            $this->metaStore->removeMetadata($selection->getUniqueNode(), self::METADATA_LOCK_NAMESPACE, false, AJXP_METADATA_SCOPE_GLOBAL);
-        } else {
-            $this->metaStore->setMetadata(
-                $selection->getUniqueNode(),
-                SimpleLockManager::METADATA_LOCK_NAMESPACE,
-                array("lock_user" => AuthService::getLoggedUser()->getId()),
-                false,
-                AJXP_METADATA_SCOPE_GLOBAL
-            );
-        }
-        AJXP_XMLWriter::header();
-        AJXP_XMLWriter::reloadDataNode();
-        AJXP_XMLWriter::close();
-    }
-
-    /**
-     * @param AJXP_Node $node
-     */
-    public function processLockMeta($node)
-    {
-        // Transform meta into overlay_icon
-        // $this->logDebug("SHOULD PROCESS METADATA FOR ", $node->getLabel());
-        $lock = $this->metaStore->retrieveMetadata(
-           $node,
-           SimpleLockManager::METADATA_LOCK_NAMESPACE,
-           false,
-           AJXP_METADATA_SCOPE_GLOBAL);
-        if(is_array($lock)
-            && array_key_exists("lock_user", $lock)){
-            if ($lock["lock_user"] != AuthService::getLoggedUser()->getId()) {
-                $node->mergeMetadata(array(
-                    "sl_locked" => "true",
-                    "overlay_icon" => "meta_simple_lock/ICON_SIZE/lock.png",
-                    "overlay_class" => "icon-lock"
-                ), true);
-            } else {
-                $node->mergeMetadata(array(
-                    "sl_locked" => "true",
-                    "sl_mylock" => "true",
-                    "overlay_icon" => "meta_simple_lock/ICON_SIZE/lock_my.png",
-                    "overlay_class" => "icon-lock"
-                ), true);
-            }
-        }
-    }
-
-    /**
-     * @param AJXP_Node $node
-     */
-    public function checkFileLock($node)
-    {
-        $this->logDebug("SHOULD CHECK LOCK METADATA FOR ", $node->getLabel());
-        $lock = $this->metaStore->retrieveMetadata(
-           $node,
-           SimpleLockManager::METADATA_LOCK_NAMESPACE,
-           false,
-           AJXP_METADATA_SCOPE_GLOBAL);
-        if(is_array($lock)
-            && array_key_exists("lock_user", $lock)
-            && $lock["lock_user"] != AuthService::getLoggedUser()->getId()){
-            $mess = ConfService::getMessages();
-            throw new Exception($mess["meta.simple_lock.5"]);
-        }
-    }
-}
diff --git a/core/src/plugins/meta.simple_lock/manifest.xml b/core/src/plugins/meta.simple_lock/manifest.xml
index 6c0c716d58..84ca991d00 100644
--- a/core/src/plugins/meta.simple_lock/manifest.xml
+++ b/core/src/plugins/meta.simple_lock/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <meta id="simple_lock" label="CONF_MESSAGE[Simple Lock]" description="CONF_MESSAGE[Manual Locking mechanism to avoid concurrent edition]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <class_definition filename="plugins/meta.simple_lock/class.SimpleLockManager.php" classname="SimpleLockManager"/>
+    <class_definition filename="plugins/meta.simple_lock/SimpleLockManager.php" classname="Pydio\Access\Meta\Lock\SimpleLockManager"/>
    	<client_settings icon="plugins/access.mysql/resources/images/mysql_icon.png">
    		<resources>
    			<i18n namespace="meta.simple_lock" path="plugins/meta.simple_lock/i18n" />
@@ -10,9 +10,9 @@
    	</client_settings>
    	<registry_contributions>
    		<hooks>
-   			<serverCallback hookName="node.info" methodName="processLockMeta"></serverCallback>
-   			<serverCallback hookName="node.before_change" methodName="checkFileLock"></serverCallback>
-   			<serverCallback hookName="node.before_path_change" methodName="checkFileLock"></serverCallback>
+   			<serverCallback hookName="node.info.nocache" methodName="processLockMeta"/>
+   			<serverCallback hookName="node.before_change" methodName="checkFileLock"/>
+   			<serverCallback hookName="node.before_path_change" methodName="checkFileLock"/>
    		</hooks>
         <actions>
             <action name="sl_lock">
diff --git a/core/src/plugins/meta.svn/SvnManager.php b/core/src/plugins/meta.svn/SvnManager.php
new file mode 100644
index 0000000000..869a682769
--- /dev/null
+++ b/core/src/plugins/meta.svn/SvnManager.php
@@ -0,0 +1,494 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Meta\Version;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Access\Core\MetaStreamWrapper;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\RecycleBinManager;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Core\Http\Message\ReloadMessage;
+use Pydio\Core\Http\Message\UserMessage;
+use Pydio\Core\Http\Message\XMLMessage;
+use Pydio\Core\Http\Response\SerializableResponseStream;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\AuthService;
+
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Utils\Vars\InputFilter;
+
+use Pydio\Core\Utils\Vars\XMLFilter;
+use Pydio\Core\Utils\TextEncoder;
+use Pydio\Access\Meta\Core\AbstractMetaSource;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+define('SVNLIB_PATH', '');
+if (SVNLIB_PATH != "") {
+    putenv("LD_LIBRARY_PATH=".SVNLIB_PATH);
+}
+/**
+ * Uses svn command lines to extract version infos. Autocommit on change.
+ * @package AjaXplorer_Plugins
+ * @subpackage Meta
+ */
+class SvnManager extends AbstractMetaSource
+{
+    private static $svnListDir;
+    private static $svnListCache;
+    private $commitMessageParams;
+
+    /**
+     * @param \Pydio\Core\Model\ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(\Pydio\Core\Model\ContextInterface $ctx, $options = [])
+    {
+        $this->options = $options;
+        // Do nothing
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param AbstractAccessDriver $accessDriver
+     */
+    public function initMeta(ContextInterface $ctx, AbstractAccessDriver $accessDriver)
+    {
+        require_once("svn_lib.inc.php");
+        parent::initMeta($ctx, $accessDriver);
+        parent::init($ctx, $this->options);
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $httpVars
+     * @param array $additionnalPathes
+     * @param bool $testRecycle
+     * @return array
+     * @throws \Exception
+     */
+    protected function initDirAndSelection(ContextInterface $ctx, $httpVars, $additionnalPathes = array(), $testRecycle = false)
+    {
+        $userSelection = UserSelection::fromContext($ctx, $httpVars);
+        $repo = $userSelection->getContext()->getRepository();
+        $urlBase = $userSelection->currentBaseUrl();
+        $result = array();
+
+        if ($testRecycle) {
+            $recycle = $repo->getContextOption($ctx, "RECYCLE_BIN");
+            if ($recycle != "") {
+                RecycleBinManager::init($urlBase, "/".$recycle);
+                RecycleBinManager::filterActions($httpVars["get_action"], $userSelection, $httpVars);
+                $result["RECYCLE"] = $recycle;
+                    // if necessary, check recycle was checked.
+                // We could use a hook instead here? Maybe the full recycle system
+                // could be turned into a plugin
+                $sessionKey = "AJXP_SVN_".$repo->getId()."_RECYCLE_CHECKED";
+                if (isSet($_SESSION[$sessionKey])) {
+                    $file = RecycleBinManager::getRelativeRecycle()."/".RecycleBinManager::getCacheFileName();
+                    $realFile = MetaStreamWrapper::getRealFSReference($urlBase.$file);
+                    $this->addIfNotVersionned($ctx, $file, $realFile);
+                    $_SESSION[$sessionKey] = true;
+                }
+            }
+        }
+
+        $result["DIR"] = MetaStreamWrapper::getRealFSReference($urlBase. InputFilter::decodeSecureMagic($httpVars["dir"]));
+        $result["ORIGINAL_SELECTION"] = $userSelection;
+        $result["SELECTION"] = array();
+        if (!$userSelection->isEmpty()) {
+            $files = $userSelection->getFiles();
+            foreach ($files as $selected) {
+                $result["SELECTION"][] = MetaStreamWrapper::getRealFSReference($urlBase.$selected);
+            }
+        }
+        foreach ($additionnalPathes as $parameter => $path) {
+            $result[$parameter] = MetaStreamWrapper::getRealFSReference($urlBase.$path);
+        }
+        return $result;
+    }
+
+    /**
+     * @param $ctx ContextInterface
+     * @param $repoFile
+     * @param $realFile
+     * @throws \Exception
+     */
+    protected function addIfNotVersionned(ContextInterface $ctx, $repoFile, $realFile)
+    {
+        $error = false;
+        $res = [];
+        try {
+            $res = ExecSvnCmd("svn status ", $realFile);
+        } catch (\Exception $e) {
+            $error = true;
+        }
+        if ($error || (count($res[IDX_STDOUT]) && substr($res[IDX_STDOUT][0],0,1) == "?")) {
+            ExecSvnCmd("svn add", "$realFile");
+            $this->commitMessageParams = "Recycle cache file";
+            $this->commitChanges("ADD", array("dir" => dirname($repoFile)), array(), $ctx);
+        }
+    }
+
+    /**
+     * @param String $file URL of the file to commit (probably a metadata)
+     * @param \Pydio\Access\Core\Model\AJXP_Node $ajxpNode Optionnal node to commit along.
+     */
+    public function commitFile($file, $ajxpNode)
+    {
+        $realFile = MetaStreamWrapper::getRealFSReference($file);
+
+        $res = ExecSvnCmd("svn status ", $realFile);
+        if (count($res[IDX_STDOUT]) && substr($res[IDX_STDOUT][0],0,1) == "?") {
+            $res2 = ExecSvnCmd("svn add", "$realFile");
+        }
+        $ctx = $ajxpNode->getContext();
+        if ($ajxpNode != null) {
+            $nodeRealFile = MetaStreamWrapper::getRealFSReference($ajxpNode->getUrl());
+            try {
+                ExecSvnCmd("svn propset metachange ".time(), $nodeRealFile);
+            } catch (\Exception $e) {
+                $this->commitChanges("COMMIT_META", $realFile, array(), $ctx);
+                return;
+            }
+            // WILL COMMIT BOTH AT ONCE
+            $command = "svn commit";
+            $user = $ctx->getUser()->getId();
+            $switches = "-m \"Pydio||$user||COMMIT_META||file:".escapeshellarg($file)."\"";
+            ExecSvnCmd($command, array($realFile, $nodeRealFile), $switches);
+            ExecSvnCmd('svn update', dirname($nodeRealFile), '');
+        } else {
+            $this->commitChanges("COMMIT_META", $realFile, array(), $ctx);
+        }
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @throws \Exception
+     */
+    public function switchAction(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface)
+    {
+        $actionName     = $requestInterface->getAttribute("action");
+        $httpVars       = $requestInterface->getParsedBody();
+        $ctx            = $requestInterface->getAttribute("ctx");
+
+        $init = $this->initDirAndSelection($ctx, $httpVars);
+        if ($actionName == "svnlog") {
+            $res1 = ExecSvnCmd("svnversion", $init["DIR"]);
+            $test = trim(implode("", $res1[IDX_STDOUT]));
+            if (is_numeric($test)) {
+                $currentRev = $test;
+            } else if (strstr($test, ":")!==false && count(explode(":", $test))) {
+                $revRange = explode(":", $test);
+            }
+            $command = 'svn log';
+            $switches = '--xml -rHEAD:0';
+            $arg = $init["SELECTION"][0];
+            $res = ExecSvnCmd($command, $arg, $switches);
+            $serialStream = new SerializableResponseStream();
+            $lines = explode(PHP_EOL, $res[IDX_STDOUT]);
+            array_shift($lines);
+            if (isSet($currentRev)) {
+                $serialStream->addChunk(new XMLMessage("<current_revision>$currentRev</current_revision>"));
+            } else if (isSet($revRange)) {
+                $serialStream->addChunk(new XMLMessage("<revision_range start='$revRange[0]' end='$revRange[1]'/>"));
+            }
+            $serialStream->addChunk(new XMLMessage(implode("", $lines)));
+            $responseInterface = $responseInterface->withBody($serialStream);
+
+        } else if ($actionName == "svndownload") {
+            $revision = $httpVars["revision"];
+            $realFile = $init["SELECTION"][0];
+            $entries = $this->svnListNode($realFile, $revision);
+            $keys = array_keys($entries);
+            $localName = $keys[0];
+            $contentSize = 0;
+            if (isSet($entries[$localName]["last_revision_size"])) {
+                $contentSize = intval($entries[$localName]["last_revision_size"]);
+            }
+            // output directly the file!
+            header("Content-Type: application/force-download; name=\"".$localName."\"");
+            header("Content-Transfer-Encoding: binary");
+            if($contentSize > 0) header("Content-Length: ".$contentSize);
+            header("Content-Disposition: attachment; filename=\"".$localName."\"");
+            header("Expires: 0");
+            header("Cache-Control: no-cache, must-revalidate");
+            header("Pragma: no-cache");
+            if (preg_match('/ MSIE /',$_SERVER['HTTP_USER_AGENT'])) {
+                header("Pragma: public");
+                header("Expires: 0");
+                header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
+                header("Cache-Control: private",false);
+            }
+            $realFile = escapeshellarg($realFile);
+            $revision = escapeshellarg($revision);
+            system( (SVNLIB_PATH!=""?SVNLIB_PATH."/":"") ."svn cat -r$revision $realFile");
+            return;
+        } else if ($actionName == "revert_file") {
+
+            $revision = escapeshellarg($httpVars["revision"]);
+            $realFile = $init["SELECTION"][0];
+            $compare = (isSet($httpVars["compare"]) && $httpVars["compare"] == "true");
+            $escapedFile = escapeshellarg($realFile);
+            if ($compare) {
+                $ext = pathinfo($realFile, PATHINFO_EXTENSION);
+                $targetFile = preg_replace("/\.$ext$/", "-r$revision.$ext", $realFile);
+                system( (SVNLIB_PATH!=""?SVNLIB_PATH."/":"") ."svn cat -r$revision $escapedFile > ".escapeshellarg($targetFile));
+            } else {
+                system( (SVNLIB_PATH!=""?SVNLIB_PATH."/":"") ."svn cat -r$revision $escapedFile > $escapedFile");
+                $this->commitChanges($actionName, $realFile, array(), $ctx);
+            }
+
+        } else if ($actionName == "svnswitch") {
+            $revision = escapeshellarg($httpVars["revision"]);
+            ExecSvnCmd("svn update -r$revision ".$init["DIR"]);
+        }
+    }
+
+    /**
+     * @param $actionName
+     * @param $httpVars
+     * @param $filesVars
+     * @param ContextInterface $ctx
+     * @throws \Exception
+     */
+    public function addSelection($actionName, $httpVars, $filesVars, ContextInterface $ctx)
+    {
+        switch ($actionName) {
+            case "mkdir":
+                $init = $this->initDirAndSelection($ctx, $httpVars, array("NEW_DIR" => InputFilter::decodeSecureMagic($httpVars["dir"] . "/" . $httpVars["dirname"])));
+                $res = ExecSvnCmd("svn add", $init["NEW_DIR"]);
+                $this->commitMessageParams = $httpVars["dirname"];
+            break;
+            case "mkfile":
+                $init = $this->initDirAndSelection($ctx, $httpVars, array("NEW_FILE" => InputFilter::decodeSecureMagic($httpVars["dir"] . "/" . $httpVars["filename"])));
+                $res = ExecSvnCmd("svn add", $init["NEW_FILE"]);
+                $this->commitMessageParams = $httpVars["filename"];
+            break;
+            case "upload":
+                if (isSet($filesVars) && isSet($filesVars["userfile_0"]) && isSet($filesVars["userfile_0"]["name"])) {
+                    $init = $this->initDirAndSelection($ctx, $httpVars, array("NEW_FILE" => TextEncoder::fromUTF8($httpVars["dir"])."/".$filesVars["userfile_0"]["name"]));
+                    $res = ExecSvnCmd("svn status ", $init["NEW_FILE"]);
+                    if (count($res[IDX_STDOUT]) && substr($res[IDX_STDOUT][0],0,1) == "?") {
+                        $res = ExecSvnCmd("svn add", $init["NEW_FILE"]);
+                    } else {
+                        $res = true;
+                    }
+                    //$res = ExecSvnCmd("svn add", $init["NEW_FILE"]);
+                    $this->commitMessageParams = $filesVars["userfile_0"]["name"];
+                }
+            break;
+        }
+        if (isSet($res)) {
+            $this->commitChanges($actionName, $httpVars, $filesVars, $ctx);
+        }
+    }
+
+    /**
+     * @param ServerRequestInterface $requestInterface
+     * @param ResponseInterface $responseInterface
+     * @throws \Exception
+     */
+    public function copyOrMoveSelection(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface)
+    {
+        $actionName     = $requestInterface->getAttribute("action");
+        $httpVars       = $requestInterface->getParsedBody();
+        $ctx            = $requestInterface->getAttribute("ctx");
+
+        if ($actionName != "rename") {
+            $init = $this->initDirAndSelection($ctx, $httpVars, array("DEST_DIR" => InputFilter::decodeSecureMagic($httpVars["dest"])));
+            $this->commitMessageParams = "To:".$httpVars["dest"].";items:";
+        } else {
+            $init = $this->initDirAndSelection($ctx, $httpVars, array(), true);
+        }
+        $this->logDebug("Entering SVN MAnager for action $actionName", $init);
+        $action = 'copy';
+        if ($actionName == "move" || $actionName == "rename") {
+            $action = 'move';
+        }
+        foreach ($init["SELECTION"] as $selectedFile) {
+            if ($actionName == "rename") {
+                $destFile = dirname($selectedFile)."/". InputFilter::decodeSecureMagic($httpVars["filename_new"]);
+                $this->commitMessageParams = "To:".$httpVars["filename_new"].";item:".$httpVars["file"];
+            } else {
+                $destFile = $init["DEST_DIR"]."/".basename($selectedFile);
+            }
+            $this->addIfNotVersionned($ctx, str_replace($init["DIR"], "", $selectedFile), $selectedFile);
+            ExecSvnCmd("svn $action", array($selectedFile,$destFile), '');
+        }
+        if ($actionName != "rename") {
+            $this->commitMessageParams .= "[".implode(",",$init["SELECTION"])."]";
+        }
+        $this->commitChanges($actionName, $httpVars, [], $ctx);
+        if ($actionName != "rename") {
+            $this->commitChanges($actionName, array("dir" => $httpVars["dest"]), [], $ctx);
+        }
+        $this->logInfo("CopyMove/Rename (svn delegate)", array("files"=>$init["SELECTION"]));
+
+        $mess = LocaleService::getMessages();
+
+        $serialStream = new SerializableResponseStream([new UserMessage($mess["meta.svn.5"]), new ReloadMessage()]);
+        $responseInterface = $responseInterface->withBody($serialStream);
+    }
+
+    /**
+     * @param $actionName
+     * @param $httpVars
+     * @param $filesVars
+     * @param ContextInterface $ctx
+     * @throws \Exception
+     */
+    public function deleteSelection(ServerRequestInterface $requestInterface, ResponseInterface &$responseInterface)
+    {
+        $actionName     = $requestInterface->getAttribute("action");
+        $httpVars       = $requestInterface->getParsedBody();
+        $ctx            = $requestInterface->getAttribute("ctx");
+
+        $init = $this->initDirAndSelection($ctx, $httpVars, array(), true);
+        if (isSet($init["RECYCLE"]) && isSet($init["RECYCLE"]["action"]) && $init["RECYCLE"]["action"] != "delete") {
+            $httpVars["dest"] = TextEncoder::fromUTF8($init["RECYCLE"]["dest"]);
+            $updatedRequest = $requestInterface->withAttribute("action", "move")->withParsedBody($httpVars);
+            $this->copyOrMoveSelection($updatedRequest, $responseInterface);
+
+            $userSelection = $init["ORIGINAL_SELECTION"];
+            $files = $userSelection->getFiles();
+            if ($actionName == "delete") {
+                foreach ($files as $file) {
+                    RecycleBinManager::fileToRecycle($file);
+                }
+            } else if ($actionName == "restore") {
+                foreach ($files as $file) {
+                    RecycleBinManager::deleteFromRecycle($file);
+                }
+            }
+            $this->commitChanges($actionName, array("dir" => RecycleBinManager::getRelativeRecycle()), [], $ctx);
+            return ;
+        }
+        foreach ($init["SELECTION"] as $selectedFile) {
+            $res = ExecSvnCmd('svn delete', $selectedFile, '--force');
+        }
+        $this->commitMessageParams = "[".implode(",",$init["SELECTION"])."]";
+        $this->commitChanges($actionName, $httpVars, [], $ctx);
+        $this->logInfo("Delete (svn delegate)", array("files"=>$init["SELECTION"]));
+
+        $mess = LocaleService::getMessages();
+        $serialStream = new SerializableResponseStream([new UserMessage($mess["meta.svn.51"]), new ReloadMessage()]);
+        $responseInterface = $responseInterface->withBody($serialStream);
+    }
+
+    /**
+     * @param $actionName
+     * @param $httpVars
+     * @param $filesVars
+     * @param ContextInterface $ctx
+     * @throws \Exception
+     */
+    public function commitChanges($actionName, $httpVars, $filesVars, ContextInterface $ctx)
+    {
+        if (is_array($httpVars)) {
+            $init = $this->initDirAndSelection($ctx, $httpVars);
+            $args = $init["DIR"];
+        } else {
+            $args = $httpVars;
+        }
+        $status = ExecSvnCmd('svn status', $args);
+        if (trim(implode("", $status[IDX_STDOUT])) == "") {
+            return;
+        }
+        $command = "svn commit";
+        $user = $ctx->getUser()->getId();
+        $switches = "-m \"Pydio||$user||$actionName".(isSet($this->commitMessageParams)?"||".$this->commitMessageParams:"")."\"";
+        $res = ExecSvnCmd($command, $args, $switches);
+        if (is_file($args)) {
+            $res2 = ExecSvnCmd('svn update', dirname($args), '');
+        } else if (is_dir($args)) {
+            $res2 = ExecSvnCmd('svn update', $args, '');
+        }
+    }
+    /**
+     *
+     * @param AJXP_Node $ajxpNode
+     */
+    public function extractMeta(&$ajxpNode)
+    {
+        //if(isSet($_SESSION["SVN_COMMAND_RUNNING"]) && $_SESSION["SVN_COMMAND_RUNNING"] === true) return ;
+        $realDir = dirname($ajxpNode->getRealFile());
+        if (SvnManager::$svnListDir == $realDir) {
+            $entries = SvnManager::$svnListCache;
+        } else {
+            try {
+                SvnManager::$svnListDir = $realDir;
+                $entries = $this->svnListNode($realDir);
+                SvnManager::$svnListCache = $entries;
+            } catch (\Exception $e) {
+                $this->logError("ExtractMeta", $e->getMessage());
+            }
+        }
+        $fileId = TextEncoder::toUTF8(basename($ajxpNode->getUrl()));
+        if (isSet($entries[$fileId])) {
+            $ajxpNode->mergeMetadata($entries[$fileId]);
+        }
+    }
+
+    /**
+     * @param $realPath
+     * @param null $revision
+     * @return array
+     * @throws \Exception
+     */
+    protected function svnListNode($realPath, $revision = null)
+    {
+        $command = 'svn list';
+        $switches = '--xml';
+        if ($revision != null) {
+            $switches = '--xml -r'.$revision;
+        }
+        $_SESSION["SVN_COMMAND_RUNNING"] = true;
+        //if(substr(strtolower(PHP_OS), 0, 3) == "win") session_write_close();
+        try {
+            $res = ExecSvnCmd($command, $realPath, $switches);
+        } catch (\Exception $e) {
+            return array();
+        }
+        //if(substr(strtolower(PHP_OS), 0, 3) == "win") session_start();
+        unset($_SESSION["SVN_COMMAND_RUNNING"]);
+        $domDoc = new \DOMDocument();
+        $domDoc->loadXML($res[IDX_STDOUT]);
+        $xPath = new \DOMXPath($domDoc);
+        $entriesList = $xPath->query("list/entry");
+        $entries = array();
+        foreach ($entriesList as $entry) {
+            $logEntry = array();
+            $name = $xPath->query("name", $entry)->item(0)->nodeValue;
+            $logEntry["last_revision"] = $xPath->query("commit/@revision", $entry)->item(0)->value;
+            $logEntry["last_revision_author"] = $xPath->query("commit/author", $entry)->item(0)->nodeValue;
+            $logEntry["last_revision_date"] = $xPath->query("commit/date", $entry)->item(0)->nodeValue;
+            $logEntry["last_revision_size"] = $xPath->query("size", $entry)->item(0)->nodeValue;
+            $entries[$name] = $logEntry;
+        }
+        return $entries;
+    }
+
+
+
+}
diff --git a/core/src/plugins/meta.svn/class.SVNLogger.js b/core/src/plugins/meta.svn/class.SVNLogger.js
index 76c1819174..b0faef434b 100644
--- a/core/src/plugins/meta.svn/class.SVNLogger.js
+++ b/core/src/plugins/meta.svn/class.SVNLogger.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  * Description : Simple display of SVN logs.
  */
 Class.create("SVNLogger", {
diff --git a/core/src/plugins/meta.svn/class.SvnManager.php b/core/src/plugins/meta.svn/class.SvnManager.php
deleted file mode 100644
index d446d47148..0000000000
--- a/core/src/plugins/meta.svn/class.SvnManager.php
+++ /dev/null
@@ -1,402 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-define('SVNLIB_PATH', '');
-if (SVNLIB_PATH != "") {
-    putenv("LD_LIBRARY_PATH=".SVNLIB_PATH);
-}
-/**
- * Uses svn command lines to extract version infos. Autocommit on change.
- * @package AjaXplorer_Plugins
- * @subpackage Meta
- */
-class SvnManager extends AJXP_AbstractMetaSource
-{
-    private static $svnListDir;
-    private static $svnListCache;
-    private $commitMessageParams;
-
-    public function init($options)
-    {
-        $this->options = $options;
-        // Do nothing
-    }
-
-    public function initMeta($accessDriver)
-    {
-        require_once("svn_lib.inc.php");
-        parent::initMeta($accessDriver);
-        parent::init($this->options);
-    }
-
-    protected function initDirAndSelection($httpVars, $additionnalPathes = array(), $testRecycle = false)
-    {
-        $repo = $this->accessDriver->repository;
-        $repo->detectStreamWrapper(true);
-        $userSelection = new UserSelection($repo, $httpVars);
-        $urlBase = $userSelection->currentBaseUrl();
-        $result = array();
-
-        if ($testRecycle) {
-            $recycle = $repo->getOption("RECYCLE_BIN");
-            if ($recycle != "") {
-                RecycleBinManager::init($urlBase, "/".$recycle);
-                $result["RECYCLE"] = RecycleBinManager::filterActions($httpVars["get_action"], $userSelection, $httpVars["dir"], $httpVars);
-                // if necessary, check recycle was checked.
-                // We could use a hook instead here? Maybe the full recycle system
-                // could be turned into a plugin
-                $sessionKey = "AJXP_SVN_".$repo->getId()."_RECYCLE_CHECKED";
-                if (isSet($_SESSION[$sessionKey])) {
-                    $file = RecycleBinManager::getRelativeRecycle()."/".RecycleBinManager::getCacheFileName();
-                    $realFile = AJXP_MetaStreamWrapper::getRealFSReference($urlBase.$file);
-                    $this->addIfNotVersionned($file, $realFile);
-                    $_SESSION[$sessionKey] = true;
-                }
-            }
-        }
-
-        $result["DIR"] = AJXP_MetaStreamWrapper::getRealFSReference($urlBase.AJXP_Utils::decodeSecureMagic($httpVars["dir"]));
-        $result["ORIGINAL_SELECTION"] = $userSelection;
-        $result["SELECTION"] = array();
-        if (!$userSelection->isEmpty()) {
-            $files = $userSelection->getFiles();
-            foreach ($files as $selected) {
-                $result["SELECTION"][] = AJXP_MetaStreamWrapper::getRealFSReference($urlBase.$selected);
-            }
-        }
-        foreach ($additionnalPathes as $parameter => $path) {
-            $result[$parameter] = AJXP_MetaStreamWrapper::getRealFSReference($urlBase.$path);
-        }
-        return $result;
-    }
-
-    protected function addIfNotVersionned($repoFile, $realFile)
-    {
-        $error = false;
-        try {
-            //$res = ExecSvnCmd("svnversion", $realFile, "");
-            $res = ExecSvnCmd("svn status ", $realFile);
-        } catch (Exception $e) {
-            $error = true;
-        }
-        if ($error || (count($res[IDX_STDOUT]) && substr($res[IDX_STDOUT][0],0,1) == "?")) {
-            $res2 = ExecSvnCmd("svn add", "$realFile");
-            $this->commitMessageParams = "Recycle cache file";
-            $this->commitChanges("ADD", array("dir" => dirname($repoFile)), array());
-        }
-    }
-
-    /**
-     * @param String $file URL of the file to commit (probably a metadata)
-     * @param AJXP_Node $ajxpNode Optionnal node to commit along.
-     */
-    public function commitFile($file, $ajxpNode = null)
-    {
-        $repo = $this->accessDriver->repository;
-        $repo->detectStreamWrapper();
-        $realFile = AJXP_MetaStreamWrapper::getRealFSReference($file);
-
-        $res = ExecSvnCmd("svn status ", $realFile);
-        if (count($res[IDX_STDOUT]) && substr($res[IDX_STDOUT][0],0,1) == "?") {
-            $res2 = ExecSvnCmd("svn add", "$realFile");
-        }
-        if ($ajxpNode != null) {
-            $nodeRealFile = AJXP_MetaStreamWrapper::getRealFSReference($ajxpNode->getUrl());
-            try {
-                ExecSvnCmd("svn propset metachange ".time(), $nodeRealFile);
-            } catch (Exception $e) {
-                $this->commitChanges("COMMIT_META", $realFile, array());
-                return;
-            }
-            // WILL COMMIT BOTH AT ONCE
-            $command = "svn commit";
-            $user = AuthService::getLoggedUser()->getId();
-            $switches = "-m \"Pydio||$user||COMMIT_META||file:".escapeshellarg($file)."\"";
-            ExecSvnCmd($command, array($realFile, $nodeRealFile), $switches);
-            ExecSvnCmd('svn update', dirname($nodeRealFile), '');
-        } else {
-            $this->commitChanges("COMMIT_META", $realFile, array());
-        }
-    }
-
-    public function switchAction($actionName, $httpVars, $filesVars)
-    {
-        $init = $this->initDirAndSelection($httpVars);
-        if ($actionName == "svnlog") {
-            $res1 = ExecSvnCmd("svnversion", $init["DIR"]);
-            $test = trim(implode("", $res1[IDX_STDOUT]));
-            if (is_numeric($test)) {
-                $currentRev = $test;
-            } else if (strstr($test, ":")!==false && count(explode(":", $test))) {
-                $revRange = explode(":", $test);
-            }
-            $command = 'svn log';
-            $switches = '--xml -rHEAD:0';
-            $arg = $init["SELECTION"][0];
-            $res = ExecSvnCmd($command, $arg, $switches);
-            AJXP_XMLWriter::header();
-            $lines = explode(PHP_EOL, $res[IDX_STDOUT]);
-            array_shift($lines);
-            if (isSet($currentRev)) {
-                print("<current_revision>$currentRev</current_revision>");
-            } else if (isSet($revRange)) {
-                print("<revision_range start='$revRange[0]' end='$revRange[1]'/>");
-            }
-            print(SystemTextEncoding::toUTF8(implode("", $lines), false));
-            AJXP_XMLWriter::close();
-        } else if ($actionName == "svndownload") {
-            $revision = $httpVars["revision"];
-            $realFile = $init["SELECTION"][0];
-            $entries = $this->svnListNode($realFile, $revision);
-            $keys = array_keys($entries);
-            $localName = $keys[0];
-            $contentSize = 0;
-            if (isSet($entries[$localName]["last_revision_size"])) {
-                $contentSize = intval($entries[$localName]["last_revision_size"]);
-            }
-            // output directly the file!
-            header("Content-Type: application/force-download; name=\"".$localName."\"");
-            header("Content-Transfer-Encoding: binary");
-            if($contentSize > 0) header("Content-Length: ".$contentSize);
-            header("Content-Disposition: attachment; filename=\"".$localName."\"");
-            header("Expires: 0");
-            header("Cache-Control: no-cache, must-revalidate");
-            header("Pragma: no-cache");
-            if (preg_match('/ MSIE /',$_SERVER['HTTP_USER_AGENT'])) {
-                header("Pragma: public");
-                header("Expires: 0");
-                header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
-                header("Cache-Control: private",false);
-            }
-            $realFile = escapeshellarg($realFile);
-            $revision = escapeshellarg($revision);
-            system( (SVNLIB_PATH!=""?SVNLIB_PATH."/":"") ."svn cat -r$revision $realFile");
-            exit(0);
-        } else if ($actionName == "revert_file") {
-
-            $revision = escapeshellarg($httpVars["revision"]);
-            $realFile = $init["SELECTION"][0];
-            $compare = (isSet($httpVars["compare"]) && $httpVars["compare"] == "true");
-            $escapedFile = escapeshellarg($realFile);
-            if ($compare) {
-                $ext = pathinfo($realFile, PATHINFO_EXTENSION);
-                $targetFile = preg_replace("/\.$ext$/", "-r$revision.$ext", $realFile);
-                system( (SVNLIB_PATH!=""?SVNLIB_PATH."/":"") ."svn cat -r$revision $escapedFile > ".escapeshellarg($targetFile));
-            } else {
-                system( (SVNLIB_PATH!=""?SVNLIB_PATH."/":"") ."svn cat -r$revision $escapedFile > $escapedFile");
-                $this->commitChanges($actionName, $realFile, array());
-            }
-
-        } else if ($actionName == "svnswitch") {
-            $revision = escapeshellarg($httpVars["revision"]);
-            ExecSvnCmd("svn update -r$revision ".$init["DIR"]);
-        }
-    }
-
-    public function addSelection($actionName, $httpVars, $filesVars)
-    {
-        switch ($actionName) {
-            case "mkdir":
-                $init = $this->initDirAndSelection($httpVars, array("NEW_DIR" => AJXP_Utils::decodeSecureMagic($httpVars["dir"]."/".$httpVars["dirname"])));
-                $res = ExecSvnCmd("svn add", $init["NEW_DIR"]);
-                $this->commitMessageParams = $httpVars["dirname"];
-            break;
-            case "mkfile":
-                $init = $this->initDirAndSelection($httpVars, array("NEW_FILE" => AJXP_Utils::decodeSecureMagic($httpVars["dir"]."/".$httpVars["filename"])));
-                $res = ExecSvnCmd("svn add", $init["NEW_FILE"]);
-                $this->commitMessageParams = $httpVars["filename"];
-            break;
-            case "upload":
-                if (isSet($filesVars) && isSet($filesVars["userfile_0"]) && isSet($filesVars["userfile_0"]["name"])) {
-                    $init = $this->initDirAndSelection($httpVars, array("NEW_FILE" => SystemTextEncoding::fromUTF8($httpVars["dir"])."/".$filesVars["userfile_0"]["name"]));
-                    $res = ExecSvnCmd("svn status ", $init["NEW_FILE"]);
-                    if (count($res[IDX_STDOUT]) && substr($res[IDX_STDOUT][0],0,1) == "?") {
-                        $res = ExecSvnCmd("svn add", $init["NEW_FILE"]);
-                    } else {
-                        $res = true;
-                    }
-                    //$res = ExecSvnCmd("svn add", $init["NEW_FILE"]);
-                    $this->commitMessageParams = $filesVars["userfile_0"]["name"];
-                }
-            break;
-        }
-        if (isSet($res)) {
-            $this->commitChanges($actionName, $httpVars, $filesVars);
-        }
-    }
-
-    public function copyOrMoveSelection($actionName, &$httpVars, $filesVars)
-    {
-        if ($actionName != "rename") {
-            $init = $this->initDirAndSelection($httpVars, array("DEST_DIR" => AJXP_Utils::decodeSecureMagic($httpVars["dest"])));
-            $this->commitMessageParams = "To:".$httpVars["dest"].";items:";
-        } else {
-            $init = $this->initDirAndSelection($httpVars, array(), true);
-        }
-        $this->logDebug("Entering SVN MAnager for action $actionName", $init);
-        $action = 'copy';
-        if ($actionName == "move" || $actionName == "rename") {
-            $action = 'move';
-        }
-        foreach ($init["SELECTION"] as $selectedFile) {
-            if ($actionName == "rename") {
-                $destFile = dirname($selectedFile)."/".AJXP_Utils::decodeSecureMagic($httpVars["filename_new"]);
-                $this->commitMessageParams = "To:".$httpVars["filename_new"].";item:".$httpVars["file"];
-            } else {
-                $destFile = $init["DEST_DIR"]."/".basename($selectedFile);
-            }
-            $this->addIfNotVersionned(str_replace($init["DIR"], "", $selectedFile), $selectedFile);
-            $res = ExecSvnCmd("svn $action", array($selectedFile,$destFile), '');
-        }
-        if ($actionName != "rename") {
-            $this->commitMessageParams .= "[".implode(",",$init["SELECTION"])."]";
-        }
-        $this->commitChanges($actionName, $httpVars, $filesVars);
-        if ($actionName != "rename") {
-            $this->commitChanges($actionName, array("dir" => $httpVars["dest"]), $filesVars);
-        }
-        $this->logInfo("CopyMove/Rename (svn delegate)", array("files"=>$init["SELECTION"]));
-
-        $mess = ConfService::getMessages();
-        AJXP_XMLWriter::header();
-        AJXP_XMLWriter::sendMessage($mess["meta.svn.5"], null);
-        AJXP_XMLWriter::reloadDataNode();
-        AJXP_XMLWriter::close();
-    }
-
-    public function deleteSelection($actionName, &$httpVars, $filesVars)
-    {
-        $init = $this->initDirAndSelection($httpVars, array(), true);
-        if (isSet($init["RECYCLE"]) && isSet($init["RECYCLE"]["action"]) && $init["RECYCLE"]["action"] != "delete") {
-            $httpVars["dest"] = SystemTextEncoding::fromUTF8($init["RECYCLE"]["dest"]);
-            $this->copyOrMoveSelection("move", $httpVars, $filesVars);
-            $userSelection = $init["ORIGINAL_SELECTION"];
-            $files = $userSelection->getFiles();
-            if ($actionName == "delete") {
-                foreach ($files as $file) {
-                    RecycleBinManager::fileToRecycle($file);
-                }
-            } else if ($actionName == "restore") {
-                foreach ($files as $file) {
-                    RecycleBinManager::deleteFromRecycle($file);
-                }
-            }
-            $this->commitChanges($actionName, array("dir" => RecycleBinManager::getRelativeRecycle()), $filesVars);
-            return ;
-        }
-        foreach ($init["SELECTION"] as $selectedFile) {
-            $res = ExecSvnCmd('svn delete', $selectedFile, '--force');
-        }
-        $this->commitMessageParams = "[".implode(",",$init["SELECTION"])."]";
-        $this->commitChanges($actionName, $httpVars, $filesVars);
-        $this->logInfo("Delete (svn delegate)", array("files"=>$init["SELECTION"]));
-
-        $mess = ConfService::getMessages();
-        AJXP_XMLWriter::header();
-        AJXP_XMLWriter::sendMessage($mess["meta.svn.51"], null);
-        AJXP_XMLWriter::reloadDataNode();
-        AJXP_XMLWriter::close();
-    }
-
-    public function commitChanges($actionName, $httpVars, $filesVars)
-    {
-        if (is_array($httpVars)) {
-            $init = $this->initDirAndSelection($httpVars);
-            $args = $init["DIR"];
-        } else {
-            $args = $httpVars;
-        }
-        $status = ExecSvnCmd('svn status', $args);
-        if (trim(implode("", $status[IDX_STDOUT])) == "") {
-            return;
-        }
-        $command = "svn commit";
-        $user = AuthService::getLoggedUser()->getId();
-        $switches = "-m \"Pydio||$user||$actionName".(isSet($this->commitMessageParams)?"||".$this->commitMessageParams:"")."\"";
-        $res = ExecSvnCmd($command, $args, $switches);
-        if (is_file($args)) {
-            $res2 = ExecSvnCmd('svn update', dirname($args), '');
-        } else if (is_dir($args)) {
-            $res2 = ExecSvnCmd('svn update', $args, '');
-        }
-    }
-    /**
-     *
-     * @param AJXP_Node $ajxpNode
-     */
-    public function extractMeta(&$ajxpNode)
-    {
-        //if(isSet($_SESSION["SVN_COMMAND_RUNNING"]) && $_SESSION["SVN_COMMAND_RUNNING"] === true) return ;
-        $realDir = dirname($ajxpNode->getRealFile());
-        if (SvnManager::$svnListDir == $realDir) {
-            $entries = SvnManager::$svnListCache;
-        } else {
-            try {
-                SvnManager::$svnListDir = $realDir;
-                $entries = $this->svnListNode($realDir);
-                SvnManager::$svnListCache = $entries;
-            } catch (Exception $e) {
-                $this->logError("ExtractMeta", $e->getMessage());
-            }
-        }
-        $fileId = SystemTextEncoding::toUTF8(basename($ajxpNode->getUrl()));
-        if (isSet($entries[$fileId])) {
-            $ajxpNode->mergeMetadata($entries[$fileId]);
-        }
-    }
-
-    protected function svnListNode($realPath, $revision = null)
-    {
-        $command = 'svn list';
-        $switches = '--xml';
-        if ($revision != null) {
-            $switches = '--xml -r'.$revision;
-        }
-        $_SESSION["SVN_COMMAND_RUNNING"] = true;
-        //if(substr(strtolower(PHP_OS), 0, 3) == "win") session_write_close();
-        try {
-            $res = ExecSvnCmd($command, $realPath, $switches);
-        } catch (Exception $e) {
-            return array();
-        }
-        //if(substr(strtolower(PHP_OS), 0, 3) == "win") session_start();
-        unset($_SESSION["SVN_COMMAND_RUNNING"]);
-        $domDoc = new DOMDocument();
-        $domDoc->loadXML($res[IDX_STDOUT]);
-        $xPath = new DOMXPath($domDoc);
-        $entriesList = $xPath->query("list/entry");
-        $entries = array();
-        foreach ($entriesList as $entry) {
-            $logEntry = array();
-            $name = $xPath->query("name", $entry)->item(0)->nodeValue;
-            $logEntry["last_revision"] = $xPath->query("commit/@revision", $entry)->item(0)->value;
-            $logEntry["last_revision_author"] = $xPath->query("commit/author", $entry)->item(0)->nodeValue;
-            $logEntry["last_revision_date"] = $xPath->query("commit/date", $entry)->item(0)->nodeValue;
-            $logEntry["last_revision_size"] = $xPath->query("size", $entry)->item(0)->nodeValue;
-            $entries[$name] = $logEntry;
-        }
-        return $entries;
-    }
-
-
-
-}
diff --git a/core/src/plugins/meta.svn/i18n/conf/cs.php b/core/src/plugins/meta.svn/i18n/conf/cs.php
index 2395bdd424..16745c2dd2 100644
--- a/core/src/plugins/meta.svn/i18n/conf/cs.php
+++ b/core/src/plugins/meta.svn/i18n/conf/cs.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Subversion Repository" => "Subversion repozitář",
diff --git a/core/src/plugins/meta.svn/i18n/conf/de.php b/core/src/plugins/meta.svn/i18n/conf/de.php
index 8b0e8ccc03..f9067d8128 100644
--- a/core/src/plugins/meta.svn/i18n/conf/de.php
+++ b/core/src/plugins/meta.svn/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Subversion Repository" => "Subversion-Repository",
diff --git a/core/src/plugins/meta.svn/i18n/conf/en.php b/core/src/plugins/meta.svn/i18n/conf/en.php
index 95863a0413..c8ed318ef2 100644
--- a/core/src/plugins/meta.svn/i18n/conf/en.php
+++ b/core/src/plugins/meta.svn/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Subversion Repository" => "Subversion Repository",
diff --git a/core/src/plugins/meta.svn/i18n/conf/fr.php b/core/src/plugins/meta.svn/i18n/conf/fr.php
index 07117fc39e..cf1fb8cfdc 100644
--- a/core/src/plugins/meta.svn/i18n/conf/fr.php
+++ b/core/src/plugins/meta.svn/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Subversion Repository" => "Dépôt Subversion",
diff --git a/core/src/plugins/meta.svn/i18n/conf/it.php b/core/src/plugins/meta.svn/i18n/conf/it.php
index 19c4a80d4c..39954f5c29 100644
--- a/core/src/plugins/meta.svn/i18n/conf/it.php
+++ b/core/src/plugins/meta.svn/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Subversion Repository" => "Repository Subversion",
diff --git a/core/src/plugins/meta.svn/i18n/conf/pt.php b/core/src/plugins/meta.svn/i18n/conf/pt.php
index ef998ef59c..f1d1d68185 100644
--- a/core/src/plugins/meta.svn/i18n/conf/pt.php
+++ b/core/src/plugins/meta.svn/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Subversion Repository" => "Repositório de Sub-versões",
diff --git a/core/src/plugins/meta.svn/i18n/fr.php b/core/src/plugins/meta.svn/i18n/fr.php
index 14df7b014f..26028c840d 100644
--- a/core/src/plugins/meta.svn/i18n/fr.php
+++ b/core/src/plugins/meta.svn/i18n/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "1" => "Versions",
@@ -34,4 +34,4 @@
 "5" => "The selected files/folders have been copied/moved (by SVN)",
 "51" => "The selected files/folders have been deleted (by SVN)",
 "61" => "Actions",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/meta.svn/i18n/si.php b/core/src/plugins/meta.svn/i18n/si.php
index f2ed504cf9..a0ab850971 100644
--- a/core/src/plugins/meta.svn/i18n/si.php
+++ b/core/src/plugins/meta.svn/i18n/si.php
@@ -1,23 +1,23 @@
 <?php
 /*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
 // Slovenian translation: April 21 2011 by Vladimir Bohinc (vladimir.bohinc@gmail.com)
 //
 //---------------------------------------------------------------------------------------------------
@@ -27,14 +27,4 @@
 "2" => "SVN dnevnik",
 "21" => "SVN dnevnik izbrane datoteke/mape",
 "3" => "Preklopi na to različico",
-"31" => "Compare",
-"32" => "Revert",
-"33" => "This will create a new version of the file with the content of this previous version. Are you sure?",
-"4" => "Versioning",
-"41" => "Last Revision",
-"42" => "Revision Date",
-"43" => "Revision Author",
-"5" => "The selected files/folders have been copied/moved (by SVN)",
-"51" => "The selected files/folders have been deleted (by SVN)",
-"61" => "Actions",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/meta.svn/manifest.xml b/core/src/plugins/meta.svn/manifest.xml
index 43a229859e..26d30f8d0c 100644
--- a/core/src/plugins/meta.svn/manifest.xml
+++ b/core/src/plugins/meta.svn/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <meta id="meta.svn" enabled="false" label="CONF_MESSAGE[Subversion Repository]" description="CONF_MESSAGE[Extract SVN informations (revision, change log, etc) if the repository is a Working-Copy, and SVN is available as a commandline.]"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-	<class_definition filename="plugins/meta.svn/class.SvnManager.php" classname="SvnManager"/>
+	<class_definition filename="plugins/meta.svn/SvnManager.php" classname="Pydio\Access\Meta\Version\SvnManager"/>
 	<client_settings icon="plugins/access.mysql/resources/images/mysql_icon.png">
 		<resources>
 			<i18n namespace="meta.svn" path="plugins/meta.svn/i18n" />
@@ -168,6 +168,6 @@
 	</registry_contributions>
 	<dependencies>
 		<!-- Wrapper type plugins only -->
-		<pluginClass pluginName="access.fs|access.demo|access.remote_fs"/>
+		<pluginClass pluginName="access.fs|access.demo"/>
 	</dependencies>
 </meta>
diff --git a/core/src/plugins/meta.svn/svn_lib.inc.php b/core/src/plugins/meta.svn/svn_lib.inc.php
index 76cb35bb11..268d73fb8f 100644
--- a/core/src/plugins/meta.svn/svn_lib.inc.php
+++ b/core/src/plugins/meta.svn/svn_lib.inc.php
@@ -630,7 +630,7 @@ function &ExecSvnCmd($cmd, $arg = '', $switches = ''){
         if (is_array($arg)) {
             $arg = implode(" ", array_map("escapeshellarg", $arg));
         } else {
-            $arg = escapeshellarg(SystemTextEncoding::toUTF8($arg));
+            $arg = escapeshellarg(\Pydio\Core\Utils\TextEncoder::toUTF8($arg));
         }
 
         $cmdline = (SVNLIB_PATH!=""?SVNLIB_PATH."/":"").$cmd." ".$switches." ".$arg;
diff --git a/core/src/plugins/meta.syncable/ChangesTracker.php b/core/src/plugins/meta.syncable/ChangesTracker.php
new file mode 100755
index 0000000000..6832d32900
--- /dev/null
+++ b/core/src/plugins/meta.syncable/ChangesTracker.php
@@ -0,0 +1,713 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Meta\Sync;
+
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Filter\AJXP_Permission;
+use Pydio\Core\Controller\CliRunner;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Services\RepositoryService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\DBHelper;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\OptionsHelper;
+use Pydio\Core\Controller\HTMLWriter;
+use Pydio\Core\PluginFramework\SqlTableProvider;
+use Pydio\Log\Core\Logger;
+use Pydio\Access\Meta\Core\AbstractMetaSource;
+use Pydio\Tasks\Schedule;
+use Pydio\Tasks\TaskService;
+use \dibi as dibi;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Generates and caches and md5 hash of each file
+ * @package AjaXplorer_Plugins
+ * @subpackage Meta
+ */
+class ChangesTracker extends AbstractMetaSource implements SqlTableProvider
+{
+    private $sqlDriver;
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        $this->sqlDriver = OptionsHelper::cleanDibiDriverParameters(["group_switch_value" => "core"]);
+        parent::init($ctx, $options);
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param string $path
+     * @return bool
+     */
+    protected function excludeFromSync($ctx, $path){
+        $excludedExtensions = ["dlpart"];
+        $ext = pathinfo($path, PATHINFO_EXTENSION);
+        if(!empty($ext) && in_array($ext, $excludedExtensions)){
+            return true;
+        }
+        try{
+            $ctx->getRepository()->getDriverInstance($ctx)->filterUserSelectionToHidden($ctx, [$path]);
+        }catch(\Exception $e){
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     */
+    protected function indexIsSync(ContextInterface $ctx){
+        // Grab all folders mtime and compare them
+        $repoIdentifier = $this->computeIdentifier($ctx);
+        $res = dibi::query("SELECT [node_path],[mtime] FROM [ajxp_index] WHERE [md5] = %s AND [repository_identifier] = %s", 'directory', $repoIdentifier);
+        $modified = [];
+
+        // REGISTER ROOT ANYWAY: WE PROBABLY CAN'T GET A "FILEMTIME" ON IT.
+        $mod = [
+            "url"   => $ctx->getUrlBase(),
+            "path"  => "/",
+            "children" => []
+        ];
+        $children = dibi::query("SELECT [node_path],[mtime] FROM [ajxp_index] WHERE [repository_identifier] = %s AND [node_path] LIKE %s AND [node_path] NOT LIKE %s",
+             $repoIdentifier, "/%", "/%/%");
+        foreach($children as $cRow){
+            $cp = substr($cRow->node_path, 1);
+            if(empty($cp)) continue;
+            if(PHP_OS == 'Darwin'){
+                $cp = \Normalizer::normalize($cp, \Normalizer::FORM_D);
+            }
+            $mod["children"][$cp] = $cRow->mtime;
+        }
+        $modified[] = $mod;
+
+        clearstatcache();
+        // CHECK ALL FOLDERS
+        foreach($res as $row){
+            $path = $row->node_path;
+            $mtime = intval($row->mtime);
+            $url = $ctx->getUrlBase().$path;
+            $currentTime = @filemtime($url);
+            if($currentTime === false && !file_exists($url)) {
+                // Deleted folder!
+                $this->logDebug(__FUNCTION__, "Folder deleted directly on storage: ".$url);
+                $node = new AJXP_Node($url);
+                Controller::applyHook("node.change", [&$node, null, false], true);
+                continue;
+            }
+            if($currentTime > $mtime){
+                $mod = [
+                    "url" => $url,
+                    "path" => $path,
+                    "children" => [],
+                    "current_time" => $currentTime
+                ];
+                $children = dibi::query("SELECT [node_path],[mtime],[md5] FROM [ajxp_index] WHERE [repository_identifier] = %s AND [node_path] LIKE %s AND [node_path] NOT LIKE %s",
+                    $repoIdentifier, "$path/%", "$path/%/%");
+                foreach($children as $cRow){
+                    $cp = substr($cRow->node_path, strlen($path)+1);
+                    if(empty($cp)) continue;
+                    if(PHP_OS == 'Darwin'){
+                        $cp = \Normalizer::normalize($cp, \Normalizer::FORM_D);
+                    }
+                    $mod["children"][$cp] = $cRow->mtime;
+                }
+                $modified[] = $mod;
+            }
+        }
+
+        // NOW COMPUTE DIFFS
+        foreach($modified as $mod_data){
+            $url = $mod_data["url"];
+            $this->logDebug("Current folder is ".$url);
+            $current_time = $mod_data["current_time"];
+            $currentChildren = $mod_data["children"];
+            $files = scandir($url);
+            foreach($files as $f){
+                if($f[0] == ".") continue;
+                $nodeUrl = $url."/".$f;
+                $this->logDebug(__FUNCTION__, "Scanning ".$nodeUrl);
+                $node = new AJXP_Node($nodeUrl);
+                // Ignore dirs modified time
+                // if(is_dir($nodeUrl) && $mod_data["path"] != "/") continue;
+                if(!isSet($currentChildren[$f])){
+                    if($this->excludeFromSync($ctx, $nodeUrl)){
+                        $this->logDebug(__FUNCTION__, "Excluding item detected on storage: ".$nodeUrl);
+                        continue;
+                    }
+                    // New items detected
+                    $this->logDebug(__FUNCTION__, "New item detected on storage: ".$nodeUrl);
+                    Controller::applyHook("node.change", [null, &$node, false, true], true);
+                    continue;
+                }else {
+                    if(is_dir($nodeUrl)) continue; // Make sure to not trigger a recursive indexation here.
+                    if(filemtime($nodeUrl) > $currentChildren[$f]){
+                        if($this->excludeFromSync($ctx, $nodeUrl)){
+                            $this->logDebug(__FUNCTION__, "Excluding item changed on storage: ".$nodeUrl);
+                            continue;
+                        }
+                        // Changed!
+                        $this->logDebug(__FUNCTION__, "Item modified directly on storage: ".$nodeUrl);
+                        Controller::applyHook("node.change", [&$node, &$node, false], true);
+                    }
+                }
+            }
+            foreach($currentChildren as $cPath => $mtime){
+                $this->logDebug(__FUNCTION__, "Existing children ".$cPath);
+                if(!in_array($cPath, $files)){
+                    if($this->excludeFromSync($ctx, $url."/".$cPath)){
+                        $this->logDebug(__FUNCTION__, "Excluding item deleted on storage: ".$url."/".$cPath);
+                        continue;
+                    }
+                    // Deleted
+                    $this->logDebug(__FUNCTION__, "File deleted directly on storage: ".$url."/".$cPath);
+                    $node = new AJXP_Node($url."/".$cPath);
+                    Controller::applyHook("node.change", [&$node, null, false], true);
+                }
+            }
+            // Now "touch" parent directory
+            if(isSet($current_time)){
+                dibi::query("UPDATE [ajxp_index] SET ", ["mtime" => $current_time], " WHERE [repository_identifier] = %s AND [node_path] = %s", $repoIdentifier, $mod_data["path"]);
+            }
+        }
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param bool $check
+     * @return string
+     * @throws \Exception
+     */
+    protected function getResyncTimestampFile(\Pydio\Core\Model\ContextInterface $ctx, $check = false){
+        $repo = $ctx->getRepository();
+        $sScope = $repo->securityScope();
+        $suffix = "-".$repo->getId();
+        if(!empty($sScope)) $suffix = "-".$ctx->getUser()->getId();
+        $file = $this->getPluginCacheDir(true, $check)."/storage_changes_time".$suffix;
+        return $file;
+    }
+
+    /**
+     * @param $actionName
+     * @param $httpVars
+     * @param $fileVars
+     * @param ContextInterface $contextInterface
+     */
+    public function resyncAction($actionName, $httpVars, $fileVars, \Pydio\Core\Model\ContextInterface $contextInterface)
+    {
+        if (ConfService::backgroundActionsSupported() && !ApplicationState::sapiIsCli()) {
+            CliRunner::applyActionInBackground($contextInterface, "resync_storage", $httpVars);
+        }else{
+            $file = $this->getResyncTimestampFile($contextInterface, true);
+            file_put_contents($file, time());
+            $this->indexIsSync($contextInterface);
+        }
+    }
+
+    /**
+     * @param $actionName
+     * @param $httpVars
+     * @param $fileVars
+     * @param ContextInterface $contextInterface
+     * @return null
+     * @throws \Exception
+     * @throws \Pydio\Core\Exception\PydioException
+     */
+    public function switchActions($actionName, $httpVars, $fileVars, \Pydio\Core\Model\ContextInterface $contextInterface)
+    {
+        if($actionName != "changes" || !isSet($httpVars["seq_id"])) return false;
+        if(!dibi::isConnected()) {
+            dibi::connect($this->sqlDriver);
+        }
+        $filter = null;
+        $masks = [];
+        $currentRepo = $contextInterface->getRepository();
+        Controller::applyHook("role.masks", [$contextInterface, &$masks, AJXP_Permission::READ]);
+        if(count($masks) == 1 && $masks[0] == "/"){
+            $masks = [];
+        }
+        $recycle = $currentRepo->getContextOption($contextInterface, "RECYCLE_BIN");
+        $recycle = (!empty($recycle)?$recycle:false);
+
+        if($this->options["OBSERVE_STORAGE_CHANGES"] === true){
+            // Do it every XX minutes
+            $minutes = 5;
+            if(isSet($this->options["OBSERVE_STORAGE_EVERY"])){
+                $minutes = intval($this->options["OBSERVE_STORAGE_EVERY"]);
+            }
+            $file = $this->getResyncTimestampFile($contextInterface);
+            $last = 0;
+            if(is_file($file)) $last = intval(file_get_contents($file));
+            if(time() - $last >  $minutes * 60){
+                $this->resyncAction("resync_storage", [], [], $contextInterface);
+            }
+        }
+        if($this->options["REQUIRES_INDEXATION"]){
+            $task = TaskService::actionAsTask($contextInterface, "index", []);
+            $task->setActionLabel(LocaleService::getMessages(), 'core.index.3');
+            TaskService::getInstance()->enqueueTask($task);
+            // Unset the REQUIRES_INDEXATION FLAG
+            $meta =  $currentRepo->getContextOption($contextInterface, "META_SOURCES");
+            unset($meta["meta.syncable"]["REQUIRES_INDEXATION"]);
+            $currentRepo->addOption("META_SOURCES", $meta);
+            RepositoryService::replaceRepository($currentRepo->getId(), $currentRepo);
+        }
+
+        HTMLWriter::charsetHeader('application/json', 'UTF-8');
+        $stream = isSet($httpVars["stream"]);
+        $separator = $stream ? "\n" : ",";
+
+
+        $veryLastSeq = intval(dibi::query("SELECT MAX([seq]) FROM [ajxp_changes]")->fetchSingle());
+        $seqId = intval(InputFilter::sanitize($httpVars["seq_id"], InputFilter::SANITIZE_ALPHANUM));
+        if($veryLastSeq > 0 && $seqId > $veryLastSeq){
+            // This is not normal! Send a signal reload all changes from start.
+            if(!$stream) echo json_encode(['changes'=> [], 'last_seq'=>1]);
+            else echo 'LAST_SEQ:1';
+            return null;
+        }
+
+
+        $ands = [];
+        $ands[] = ["[ajxp_changes].[repository_identifier] = %s", $this->computeIdentifier($contextInterface)];
+        $ands[]= ["[seq] > %i", $seqId];
+        if(isSet($httpVars["filter"])) {
+            $filter = InputFilter::decodeSecureMagic($httpVars["filter"]);
+            $filterLike = rtrim($filter, "/") . "/";
+            $ands[] = ["[source] LIKE %like~ OR [target] LIKE %like~", $filterLike, $filterLike];
+        }
+        if(count($masks)){
+            $ors = [];
+            foreach($masks as $mask){
+                $trimmedMask = rtrim($mask, "/") ;
+                $filterLike = $trimmedMask . "/";
+                $ors[] = ["[source] LIKE %like~ OR [target] LIKE %like~", $filterLike, $filterLike];
+                $ors[] = ["[source] = %s OR [target] = %s", $trimmedMask, $trimmedMask];
+            }
+            if(count($ors)){
+                $ands[] = ["%or", $ors];
+            }
+        }
+        $res = dibi::query("SELECT
+            [seq] , [ajxp_changes].[repository_identifier] , [ajxp_changes].[node_id] , [type] , [source] ,  [target] , [ajxp_index].[bytesize], [ajxp_index].[md5], [ajxp_index].[mtime], [ajxp_index].[node_path]
+            FROM [ajxp_changes]
+            LEFT JOIN [ajxp_index]
+                ON [ajxp_changes].[node_id] = [ajxp_index].[node_id]
+            WHERE %and
+            ORDER BY [ajxp_changes].[node_id], [seq] ASC",
+            $ands);
+
+        if(!$stream) echo '{"changes":[';
+        $previousNodeId = -1;
+        $previousRow = null;
+        $order = ["path"=>0, "content"=>1, "create"=>2, "delete"=>3];
+        $relocateAttrs = ["bytesize", "md5", "mtime", "node_path", "repository_identifier"];
+        $valuesSent = false;
+        foreach ($res as $row) {
+            $row->node = [];
+            foreach ($relocateAttrs as $att) {
+                $row->node[$att] = $row->$att;
+                unset($row->$att);
+            }
+            if(!empty($recycle)) $this->cancelRecycleNodes($row, $recycle);
+            if($this->pathOutOfMask($row->node["node_path"], $masks)){
+                $row->node["node_path"] = false;
+            }
+            if(!isSet($httpVars["flatten"]) || $httpVars["flatten"] == "false"){
+
+                if(!$this->filterMasks($row, $masks) && !$this->filterRow($row, $filter)){
+                    if ($valuesSent) {
+                        echo $separator;
+                    }
+                    echo json_encode($row);
+                    $valuesSent = true;
+                }
+
+            }else{
+
+                if ($row->node_id == $previousNodeId) {
+                    $previousRow->target = $row->target;
+                    $previousRow->seq = $row->seq;
+                    // Specific case, maybe linked to recycle bin management
+                    // A create should make a new node ID.
+                    if ($row->type === "create" && $previousRow->type === "delete"){
+                        $previousRow->type = "create";
+                    }else if ($order[$row->type] > $order[$previousRow->type]) {
+                        $previousRow->type = $row->type;
+                    }
+                } else {
+                    if (isSet($previousRow) && ($previousRow->source != $previousRow->target || $previousRow->type == "content")) {
+                        if($this->filterMasks($previousRow, $masks) || $this->filterRow($previousRow, $filter)){
+                            $previousRow = $row;
+                            $previousNodeId = $row->node_id;
+                            $lastSeq = $row->seq;
+                            continue;
+                        }
+                        if($valuesSent) echo $separator;
+                        echo json_encode($previousRow);
+                        $valuesSent = true;
+                    }
+                    $previousRow = $row;
+                    $previousNodeId = $row->node_id;
+                }
+                if(!isSet($lastSeq) || $row->seq > $lastSeq){
+                    $lastSeq = $row->seq;
+                }
+                flush();
+            }
+        }
+
+        // SEND LAST ROW IF THERE IS ONE
+        if (isSet($previousRow) && ($previousRow->source != $previousRow->target || $previousRow->type == "content")
+            && !$this->pathOutOfMask($previousRow->target, $masks) && !$this->filterMasks($previousRow, $masks) && !$this->filterRow($previousRow, $filter)) {
+
+            if($valuesSent) echo $separator;
+            echo json_encode($previousRow);
+            if (!isSet($lastSeq) || $previousRow->seq > $lastSeq){
+                $lastSeq = $previousRow->seq;
+            }
+            $valuesSent = true;
+        }
+
+        if (isSet($lastSeq)) {
+            if($stream){
+                echo("\nLAST_SEQ:".$lastSeq);
+            }else{
+                echo '], "last_seq":'.$lastSeq.'}';
+            }
+        } else {
+            $lastSeq = dibi::query("SELECT MAX([seq]) FROM [ajxp_changes]")->fetchSingle();
+            if(empty($lastSeq)) $lastSeq = 1;
+            if($stream){
+                echo("\nLAST_SEQ:".$lastSeq);
+            }else{
+                echo '], "last_seq":'.$lastSeq.'}';
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @param $row
+     * @param $recycle
+     */
+    protected function cancelRecycleNodes(&$row, $recycle){
+        if($row->type != 'path') return;
+        if(strpos($row->source, '/'.$recycle) === 0){
+            $row->source = 'NULL';
+            $row->type  = 'create';
+        }else if(strpos($row->target, '/'.$recycle) === 0){
+            $row->target = 'NULL';
+            $row->type   = 'delete';
+        }
+    }
+
+    /**
+     * @param $previousRow
+     * @param null $filter
+     * @return bool
+     */
+    protected function filterRow(&$previousRow, $filter = null){
+        if($filter == null) return false;
+        $srcInFilter = strpos($previousRow->source, $filter."/") === 0;
+        $targetInFilter = strpos($previousRow->target, $filter."/") === 0;
+        if(!$srcInFilter && !$targetInFilter){
+            return true;
+        }
+        if($previousRow->type == 'path'){
+            if(!$srcInFilter){
+                $previousRow->type = 'create';
+                $previousRow->source = 'NULL';
+            }else if(!$targetInFilter){
+                $previousRow->type = 'delete';
+                $previousRow->target = 'NULL';
+            }
+        }
+        if($srcInFilter){
+            $previousRow->source = substr($previousRow->source, strlen($filter));
+        }
+        if($targetInFilter){
+            $previousRow->target = substr($previousRow->target, strlen($filter));
+        }
+        if($previousRow->type != 'delete'){
+            $previousRow->node['node_path'] = substr($previousRow->node['node_path'], strlen($filter));
+        }else if(strpos($previousRow->node['node_path'], $filter) !== 0){
+            $previousRow->node['node_path'] = false;
+        }
+        return false;
+    }
+
+    /**
+     * @param $testPath
+     * @param array $masks
+     * @return bool
+     */
+    protected function pathOutOfMask($testPath, $masks = []){
+        if(!count($masks)) return false;
+        $regexps = [];
+        foreach($masks as $path){
+            $regexps[] = '^'.preg_quote($path.'/', '/');
+        }
+        $regexp = '/'.implode("|", $regexps).'/';
+        $inMask = ($testPath == 'NULL') || $testPath === false || in_array($testPath, $masks) || preg_match($regexp, $testPath);
+        return !$inMask;
+    }
+
+    /**
+     * @param $previousRow
+     * @param array $masks
+     * @return bool
+     */
+    protected function filterMasks(&$previousRow, $masks = []){
+        if(!count($masks)) return false;
+
+        $srcInFilter = !$this->pathOutOfMask($previousRow->source, $masks);
+        $targetInFilter = !$this->pathOutOfMask($previousRow->target, $masks);
+
+        if(!$srcInFilter && !$targetInFilter){
+            return true;
+        }
+        if($previousRow->type == 'path'){
+            if(!$srcInFilter){
+                $previousRow->type = 'create';
+                $previousRow->source = 'NULL';
+            }else if(!$targetInFilter){
+                $previousRow->type = 'delete';
+                $previousRow->target = 'NULL';
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @return String
+     */
+    protected function computeIdentifier(ContextInterface $ctx)
+    {
+        $parts = [$ctx->getRepositoryId()];
+        $repository = $ctx->getRepository();
+        if ($repository->securityScope() == 'USER') {
+            $parts[] = $ctx->getUser()->getId();
+        } else if ($repository->securityScope() == 'GROUP') {
+            $parts[] = $ctx->getUser()->getGroupPath();
+        }
+        return implode("-", $parts);
+    }
+
+    /**
+     * Called on workspace.after_delete event. Remove all references to this WS in the DB.
+     * Find all repo identifier exactly equal to $repoId , or like $repoId-%
+     * @param $repoId
+     */
+    public function clearIndexForWorkspaceId($repoId){
+        if(!dibi::isConnected()) {
+            dibi::connect($this->sqlDriver);
+        }
+        dibi::query("DELETE FROM [ajxp_index] WHERE [repository_identifier] = %s OR [repository_identifier] LIKE %like~", $repoId, $repoId."-");
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $oldNode
+     * @param AJXP_Node $newNode
+     * @param bool $copy
+     */
+    public function updateNodesIndex($oldNode = null, $newNode = null, $copy = false)
+    {
+        if(!dibi::isConnected()) {
+            dibi::connect($this->sqlDriver);
+        }
+        $refNode = ($oldNode !== null ? $oldNode : $newNode);
+        try {
+            if ($newNode != null && $this->excludeNode($newNode)) {
+                // CREATE
+                if($oldNode == null) {
+                    Logger::debug("Ignoring ".$newNode->getUrl()." for indexation");
+                    return;
+                }else{
+                    Logger::debug("Target node is excluded, see it as a deletion: ".$newNode->getUrl());
+                    $newNode = null;
+                }
+            }
+            if ($newNode == null) {
+                $repoId = $this->computeIdentifier($refNode->getContext());
+                // DELETE
+                $this->logDebug('DELETE', $oldNode->getUrl());
+                dibi::query("DELETE FROM [ajxp_index] WHERE [node_path] LIKE %like~ AND [repository_identifier] = %s", $oldNode->getPath(), $repoId);
+            } else if ($oldNode == null || $copy) {
+                // CREATE
+                $stat = stat($newNode->getUrl());
+                $newNode->setLeaf(!($stat['mode'] & 040000));
+                $this->logDebug('INSERT', $newNode->getUrl());
+                dibi::query("INSERT INTO [ajxp_index]", [
+                    "node_path" => $newNode->getPath(),
+                    "bytesize"  => $stat["size"],
+                    "mtime"     => $stat["mtime"],
+                    "md5"       => $newNode->isLeaf()? md5_file($newNode->getUrl()):"directory",
+                    "repository_identifier" => $repoId = $this->computeIdentifier($refNode->getContext())
+                ]);
+                if($copy && !$newNode->isLeaf()){
+                    // Make sure to index the content of this folder
+                    $this->logInfo("Core.index", "Should reindex folder ".$newNode->getPath());
+                    $task = TaskService::actionAsTask($newNode->getContext(), "index", ["file" => $newNode->getPath()]);
+                    $task->setActionLabel(LocaleService::getMessages(), 'core.index.3');
+                    $task->setSchedule(new Schedule(Schedule::TYPE_ONCE_DEFER));
+                    TaskService::getInstance()->enqueueTask($task);
+                }
+            } else {
+                $repoId = $this->computeIdentifier($refNode->getContext());
+                if ($oldNode->getPath() == $newNode->getPath()) {
+                    // CONTENT CHANGE
+                    clearstatcache();
+                    $stat = stat($newNode->getUrl());
+                    $this->logDebug("Content changed", "current stat size is : " . $stat["size"]);
+                    $this->logDebug('UPDATE CONTENT', $newNode->getUrl());
+                    dibi::query("UPDATE [ajxp_index] SET ", [
+                        "bytesize"  => $stat["size"],
+                        "mtime"     => $stat["mtime"],
+                        "md5"       => md5_file($newNode->getUrl())
+                    ], "WHERE [node_path] = %s AND [repository_identifier] = %s", $oldNode->getPath(), $repoId);
+                    try{
+                        $rowCount = dibi::getAffectedRows();
+                        if($rowCount === 0){
+                            $this->logError(__FUNCTION__, "There was an update event on a non-indexed node (".$newNode->getPath()."), creating index entry!");
+                            $this->updateNodesIndex(null, $newNode, false);
+                        }
+                    }catch (\Exception $e){}
+
+                } else {
+                    // PATH CHANGE ONLY
+                    $newNode->loadNodeInfo();
+                    if ($newNode->isLeaf()) {
+                        $this->logDebug('UPDATE LEAF PATH', $newNode->getUrl());
+                        dibi::query("UPDATE [ajxp_index] SET ", [
+                            "node_path"  => $newNode->getPath(),
+                        ], "WHERE [node_path] = %s AND [repository_identifier] = %s", $oldNode->getPath(), $repoId);
+                        try{
+                            $rowCount = dibi::getAffectedRows();
+                            if($rowCount === 0){
+                                $this->logError(__FUNCTION__, "There was an update event on a non-indexed node (".$newNode->getPath()."), creating index entry!");
+                                $this->updateNodesIndex(null, $newNode, false);
+                            }
+                        }catch (\Exception $e){}
+                    } else {
+                        $this->logDebug('UPDATE FOLDER PATH', $newNode->getUrl());
+                        dibi::query("UPDATE [ajxp_index] SET [node_path]=REPLACE( REPLACE(CONCAT('$$$',[node_path]), CONCAT('$$$', %s), CONCAT('$$$', %s)) , '$$$', '') ",
+                            $oldNode->getPath(),
+                            $newNode->getPath(),
+                            "WHERE ([node_path] = %s OR [node_path] LIKE %like~) AND [repository_identifier] = %s",
+                            $oldNode->getPath(),
+                            rtrim($oldNode->getPath(), '/') . '/',
+                            $repoId);
+                        try{
+                            $rowCount = dibi::getAffectedRows();
+                            if($rowCount === 0){
+                                $this->logError(__FUNCTION__, "There was an update event on a non-indexed folder (".$newNode->getPath()."), relaunching a recursive indexation!");
+                                $task = TaskService::actionAsTask($newNode->getContext(), "index", ["file" => $newNode->getPath()]);
+                                $task->setActionLabel(LocaleService::getMessages(), 'core.index.3');
+                                $task->setSchedule(new Schedule(Schedule::TYPE_ONCE_DEFER));
+                                TaskService::getInstance()->enqueueTask($task);
+
+                            }
+                        }catch (\Exception $e){}
+                    }
+
+                }
+            }
+        } catch (\Exception $e) {
+            Logger::error("[meta.syncable]", "Exception", $e->getTraceAsString());
+            Logger::error("[meta.syncable]", "Indexation", $e->getMessage());
+        }
+
+    }
+
+    /**
+     * @param AJXP_Node $node
+     * @param integer $result
+     */
+    public function computeSizeRecursive(&$node, &$result){
+        
+        $id = $this->computeIdentifier($node->getContext());
+        $res = dibi::query("SELECT SUM([bytesize]) FROM [ajxp_index] WHERE [repository_identifier] = %s AND ([node_path] = %s OR [node_path] LIKE %s)", $id, $node->getPath(), rtrim($node->getPath(), "/")."/%");
+        $result = floatval($res->fetchSingle());
+
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     * @return bool
+     */
+    protected function excludeNode($node){
+        // DO NOT EXCLUDE RECYCLE INDEXATION, OTHERWISE RESTORED DATA IS NOT DETECTED!
+        //$repo = $node->getRepository();
+        //$recycle = $repo->getOption("RECYCLE_BIN");
+        //if(!empty($recycle) && strpos($node->getPath(), "/".trim($recycle, "/")) === 0) return true;
+
+        // Other exclusions conditions here?
+        return false;
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     */
+    public function indexNode($node){
+        // Create
+        $this->updateNodesIndex(null, $node, false);
+    }
+
+    /**
+     * @param AJXP_Node $node
+     */
+    public function clearIndexForNode($node){
+        // Delete
+        $this->updateNodesIndex($node, null, false);
+    }
+
+    /**
+     * @param ContextInterface $context
+     * @param array $metaSourcesOptions
+     */
+    public function setIndexationRequiredFlag($context, &$metaSourcesOptions){
+        if(isSet($metaSourcesOptions["meta.syncable"]) && (!isSet($metaSourcesOptions["meta.syncable"]["REPO_SYNCABLE"]) || $metaSourcesOptions["meta.syncable"]["REPO_SYNCABLE"] === true )){
+            $metaSourcesOptions["meta.syncable"]["REQUIRES_INDEXATION"] = true;
+        }
+    }
+
+    /**
+     * @param array $param
+     * @return string
+     * @throws \Exception
+     */
+    public function installSQLTables($param)
+    {
+        $p = OptionsHelper::cleanDibiDriverParameters(isSet($param) && isSet($param["SQL_DRIVER"]) ? $param["SQL_DRIVER"] : $this->sqlDriver);
+        return DBHelper::runCreateTablesQuery($p, $this->getBaseDir() . "/create.sql");
+    }
+
+}
diff --git a/core/src/plugins/meta.syncable/class.ChangesTracker.php b/core/src/plugins/meta.syncable/class.ChangesTracker.php
deleted file mode 100755
index a721e419bb..0000000000
--- a/core/src/plugins/meta.syncable/class.ChangesTracker.php
+++ /dev/null
@@ -1,635 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-/**
- * Generates and caches and md5 hash of each file
- * @package AjaXplorer_Plugins
- * @subpackage Meta
- */
-class ChangesTracker extends AJXP_AbstractMetaSource implements SqlTableProvider
-{
-    private $sqlDriver;
-
-    public function init($options)
-    {
-        $this->sqlDriver = AJXP_Utils::cleanDibiDriverParameters(array("group_switch_value" => "core"));
-        parent::init($options);
-    }
-
-    protected function excludeFromSync($path){
-        $excludedExtensions = array("dlpart");
-        $ext = pathinfo($path, PATHINFO_EXTENSION);
-        if(!empty($ext) && in_array($ext, $excludedExtensions)){
-            return true;
-        }
-        try{
-            $this->accessDriver->filterUserSelectionToHidden(array($path));
-        }catch(Exception $e){
-            return true;
-        }
-        return false;
-    }
-
-    protected function indexIsSync(){
-        // Grab all folders mtime and compare them
-        $repoIdentifier = $this->computeIdentifier($this->accessDriver->repository);
-        $res = dibi::query("SELECT [node_path],[mtime] FROM [ajxp_index] WHERE [md5] = %s AND [repository_identifier] = %s", 'directory', $repoIdentifier);
-        $modified = array();
-
-        // REGISTER ROOT ANYWAY: WE PROBABLY CAN'T GET A "FILEMTIME" ON IT.
-        $mod = array(
-            "url"   => $this->accessDriver->getResourceUrl(""),
-            "path"  => "/",
-            "children" => array()
-        );
-        $children = dibi::query("SELECT [node_path],[mtime] FROM [ajxp_index] WHERE [repository_identifier] = %s AND [node_path] LIKE %s AND [node_path] NOT LIKE %s",
-             $repoIdentifier, "/%", "/%/%");
-        foreach($children as $cRow){
-            $cp = substr($cRow->node_path, 1);
-            if(empty($cp)) continue;
-            if(PHP_OS == 'Darwin'){
-                $cp = Normalizer::normalize($cp, Normalizer::FORM_D);
-            }
-            $mod["children"][$cp] = $cRow->mtime;
-        }
-        $modified[] = $mod;
-
-        clearstatcache();
-        // CHECK ALL FOLDERS
-        foreach($res as $row){
-            $path = $row->node_path;
-            $mtime = intval($row->mtime);
-            $url = $this->accessDriver->getResourceUrl($path);
-            $currentTime = @filemtime($url);
-            if($currentTime === false && !file_exists($url)) {
-                // Deleted folder!
-                $this->logDebug(__FUNCTION__, "Folder deleted directly on storage: ".$url);
-                $node = new AJXP_Node($url);
-                AJXP_Controller::applyHook("node.change", array(&$node, null, false), true);
-                continue;
-            }
-            if($currentTime > $mtime){
-                $mod = array(
-                    "url" => $url,
-                    "path" => $path,
-                    "children" => array(),
-                    "current_time" => $currentTime
-                );
-                $children = dibi::query("SELECT [node_path],[mtime],[md5] FROM [ajxp_index] WHERE [repository_identifier] = %s AND [node_path] LIKE %s AND [node_path] NOT LIKE %s",
-                    $repoIdentifier, "$path/%", "$path/%/%");
-                foreach($children as $cRow){
-                    $cp = substr($cRow->node_path, strlen($path)+1);
-                    if(empty($cp)) continue;
-                    if(PHP_OS == 'Darwin'){
-                        $cp = Normalizer::normalize($cp, Normalizer::FORM_D);
-                    }
-                    $mod["children"][$cp] = $cRow->mtime;
-                }
-                $modified[] = $mod;
-            }
-        }
-
-        // NOW COMPUTE DIFFS
-        foreach($modified as $mod_data){
-            $url = $mod_data["url"];
-            $this->logDebug("Current folder is ".$url);
-            $current_time = $mod_data["current_time"];
-            $currentChildren = $mod_data["children"];
-            $files = scandir($url);
-            foreach($files as $f){
-                if($f[0] == ".") continue;
-                $nodeUrl = $url."/".$f;
-                $this->logDebug(__FUNCTION__, "Scanning ".$nodeUrl);
-                $node = new AJXP_Node($nodeUrl);
-                // Ignore dirs modified time
-                // if(is_dir($nodeUrl) && $mod_data["path"] != "/") continue;
-                if(!isSet($currentChildren[$f])){
-                    if($this->excludeFromSync($nodeUrl)){
-                        $this->logDebug(__FUNCTION__, "Excluding item detected on storage: ".$nodeUrl);
-                        continue;
-                    }
-                    // New items detected
-                    $this->logDebug(__FUNCTION__, "New item detected on storage: ".$nodeUrl);
-                    AJXP_Controller::applyHook("node.change", array(null, &$node, false, true), true);
-                    continue;
-                }else {
-                    if(is_dir($nodeUrl)) continue; // Make sure to not trigger a recursive indexation here.
-                    if(filemtime($nodeUrl) > $currentChildren[$f]){
-                        if($this->excludeFromSync($nodeUrl)){
-                            $this->logDebug(__FUNCTION__, "Excluding item changed on storage: ".$nodeUrl);
-                            continue;
-                        }
-                        // Changed!
-                        $this->logDebug(__FUNCTION__, "Item modified directly on storage: ".$nodeUrl);
-                        AJXP_Controller::applyHook("node.change", array(&$node, &$node, false), true);
-                    }
-                }
-            }
-            foreach($currentChildren as $cPath => $mtime){
-                $this->logDebug(__FUNCTION__, "Existing children ".$cPath);
-                if(!in_array($cPath, $files)){
-                    if($this->excludeFromSync($url."/".$cPath)){
-                        $this->logDebug(__FUNCTION__, "Excluding item deleted on storage: ".$url."/".$cPath);
-                        continue;
-                    }
-                    // Deleted
-                    $this->logDebug(__FUNCTION__, "File deleted directly on storage: ".$url."/".$cPath);
-                    $node = new AJXP_Node($url."/".$cPath);
-                    AJXP_Controller::applyHook("node.change", array(&$node, null, false), true);
-                }
-            }
-            // Now "touch" parent directory
-            if(isSet($current_time)){
-                dibi::query("UPDATE [ajxp_index] SET ", array("mtime" => $current_time), " WHERE [repository_identifier] = %s AND [node_path] = %s", $repoIdentifier, $mod_data["path"]);
-            }
-        }
-    }
-
-    protected function getResyncTimestampFile($check = false){
-        $repo = ConfService::getRepository();
-        $sScope = $repo->securityScope();
-        $suffix = "-".$repo->getId();
-        if(!empty($sScope)) $suffix = "-".AuthService::getLoggedUser()->getId();
-        $file = $this->getPluginCacheDir(true, $check)."/storage_changes_time".$suffix;
-        return $file;
-    }
-
-    public function resyncAction($actionName, $httpVars, $fileVars)
-    {
-        if (ConfService::backgroundActionsSupported() && !ConfService::currentContextIsCommandLine()) {
-            AJXP_Controller::applyActionInBackground(ConfService::getRepository()->getId(), "resync_storage", $httpVars);
-        }else{
-            $file = $this->getResyncTimestampFile(true);
-            file_put_contents($file, time());
-            $this->indexIsSync();
-        }
-    }
-
-    public function switchActions($actionName, $httpVars, $fileVars)
-    {
-        if($actionName != "changes" || !isSet($httpVars["seq_id"])) return false;
-        if(!dibi::isConnected()) {
-            dibi::connect($this->sqlDriver);
-        }
-        $filter = null;
-        $masks = array();
-        $currentRepo = $this->accessDriver->repository;
-        AJXP_Controller::applyHook("role.masks", array($currentRepo->getId(), &$masks, AJXP_Permission::READ));
-        if(count($masks) == 1 && $masks[0] == "/"){
-            $masks = array();
-        }
-        $recycle = $currentRepo->getOption("RECYCLE_BIN");
-        $recycle = (!empty($recycle)?$recycle:false);
-
-        if($this->options["OBSERVE_STORAGE_CHANGES"] === true){
-            // Do it every XX minutes
-            $minutes = 5;
-            if(isSet($this->options["OBSERVE_STORAGE_EVERY"])){
-                $minutes = intval($this->options["OBSERVE_STORAGE_EVERY"]);
-            }
-            $file = $this->getResyncTimestampFile();
-            $last = 0;
-            if(is_file($file)) $last = intval(file_get_contents($file));
-            if(time() - $last >  $minutes * 60){
-                $this->resyncAction("resync_storage", array(), array());
-            }
-        }
-        if($this->options["REQUIRES_INDEXATION"]){
-            if (ConfService::backgroundActionsSupported()){
-                AJXP_Controller::applyActionInBackground(ConfService::getRepository()->getId(), "index", array());
-            }else{
-                AJXP_Controller::findActionAndApply("index", array(), array());
-            }
-            // Unset the REQUIRES_INDEXATION FLAG
-            $meta =  $currentRepo->getOption("META_SOURCES");
-            unset($meta["meta.syncable"]["REQUIRES_INDEXATION"]);
-            $currentRepo->addOption("META_SOURCES", $meta);
-            ConfService::replaceRepository($currentRepo->getId(), $currentRepo);
-        }
-
-        HTMLWriter::charsetHeader('application/json', 'UTF-8');
-        $stream = isSet($httpVars["stream"]);
-        $separator = $stream ? "\n" : ",";
-
-
-        $veryLastSeq = intval(dibi::query("SELECT MAX([seq]) FROM [ajxp_changes]")->fetchSingle());
-        $seqId = intval(AJXP_Utils::sanitize($httpVars["seq_id"], AJXP_SANITIZE_ALPHANUM));
-        if($veryLastSeq > 0 && $seqId > $veryLastSeq){
-            // This is not normal! Send a signal reload all changes from start.
-            if(!$stream) echo json_encode(array('changes'=>array(), 'last_seq'=>1));
-            else echo 'LAST_SEQ:1';
-            return null;
-        }
-
-
-        $ands = array();
-        $ands[] = array("[ajxp_changes].[repository_identifier] = %s", $this->computeIdentifier($currentRepo));
-        $ands[]= array("[seq] > %i", $seqId);
-        if(isSet($httpVars["filter"])) {
-            $filter = AJXP_Utils::decodeSecureMagic($httpVars["filter"]);
-            $filterLike = rtrim($filter, "/") . "/";
-            $ands[] = array("[source] LIKE %like~ OR [target] LIKE %like~", $filterLike, $filterLike);
-        }
-        if(count($masks)){
-            $ors = array();
-            foreach($masks as $mask){
-                $trimmedMask = rtrim($mask, "/") ;
-                $filterLike = $trimmedMask . "/";
-                $ors[] = array("[source] LIKE %like~ OR [target] LIKE %like~", $filterLike, $filterLike);
-                $ors[] = array("[source] = %s OR [target] = %s", $trimmedMask, $trimmedMask);
-            }
-            if(count($ors)){
-                $ands[] = array("%or", $ors);
-            }
-        }
-        $res = dibi::query("SELECT
-            [seq] , [ajxp_changes].[repository_identifier] , [ajxp_changes].[node_id] , [type] , [source] ,  [target] , [ajxp_index].[bytesize], [ajxp_index].[md5], [ajxp_index].[mtime], [ajxp_index].[node_path]
-            FROM [ajxp_changes]
-            LEFT JOIN [ajxp_index]
-                ON [ajxp_changes].[node_id] = [ajxp_index].[node_id]
-            WHERE %and
-            ORDER BY [ajxp_changes].[node_id], [seq] ASC",
-            $ands);
-
-        if(!$stream) echo '{"changes":[';
-        $previousNodeId = -1;
-        $previousRow = null;
-        $order = array("path"=>0, "content"=>1, "create"=>2, "delete"=>3);
-        $relocateAttrs = array("bytesize", "md5", "mtime", "node_path", "repository_identifier");
-        $valuesSent = false;
-        foreach ($res as $row) {
-            $row->node = array();
-            foreach ($relocateAttrs as $att) {
-                $row->node[$att] = $row->$att;
-                unset($row->$att);
-            }
-            if(!empty($recycle)) $this->cancelRecycleNodes($row, $recycle);
-            if($this->pathOutOfMask($row->node["node_path"], $masks)){
-                $row->node["node_path"] = false;
-            }
-            if(!isSet($httpVars["flatten"]) || $httpVars["flatten"] == "false"){
-
-                if(!$this->filterMasks($row, $masks) && !$this->filterRow($row, $filter)){
-                    if ($valuesSent) {
-                        echo $separator;
-                    }
-                    echo json_encode($row);
-                    $valuesSent = true;
-                }
-
-            }else{
-
-                if ($row->node_id == $previousNodeId) {
-                    $previousRow->target = $row->target;
-                    $previousRow->seq = $row->seq;
-                    // Specific case, maybe linked to recycle bin management
-                    // A create should make a new node ID.
-                    if ($row->type === "create" && $previousRow->type === "delete"){
-                        $previousRow->type = "create";
-                    }else if ($order[$row->type] > $order[$previousRow->type]) {
-                        $previousRow->type = $row->type;
-                    }
-                } else {
-                    if (isSet($previousRow) && ($previousRow->source != $previousRow->target || $previousRow->type == "content")) {
-                        if($this->filterMasks($previousRow, $masks) || $this->filterRow($previousRow, $filter)){
-                            $previousRow = $row;
-                            $previousNodeId = $row->node_id;
-                            $lastSeq = $row->seq;
-                            continue;
-                        }
-                        if($valuesSent) echo $separator;
-                        echo json_encode($previousRow);
-                        $valuesSent = true;
-                    }
-                    $previousRow = $row;
-                    $previousNodeId = $row->node_id;
-                }
-                if(!isSet($lastSeq) || $row->seq > $lastSeq){
-                    $lastSeq = $row->seq;
-                }
-                flush();
-            }
-        }
-
-        // SEND LAST ROW IF THERE IS ONE
-        if (isSet($previousRow) && ($previousRow->source != $previousRow->target || $previousRow->type == "content")
-            && !$this->pathOutOfMask($previousRow->target, $masks) && !$this->filterMasks($previousRow, $masks) && !$this->filterRow($previousRow, $filter)) {
-
-            if($valuesSent) echo $separator;
-            echo json_encode($previousRow);
-            if (!isSet($lastSeq) || $previousRow->seq > $lastSeq){
-                $lastSeq = $previousRow->seq;
-            }
-            $valuesSent = true;
-        }
-
-        if (isSet($lastSeq)) {
-            if($stream){
-                echo("\nLAST_SEQ:".$lastSeq);
-            }else{
-                echo '], "last_seq":'.$lastSeq.'}';
-            }
-        } else {
-            $lastSeq = dibi::query("SELECT MAX([seq]) FROM [ajxp_changes]")->fetchSingle();
-            if(empty($lastSeq)) $lastSeq = 1;
-            if($stream){
-                echo("\nLAST_SEQ:".$lastSeq);
-            }else{
-                echo '], "last_seq":'.$lastSeq.'}';
-            }
-        }
-        return null;
-    }
-
-    protected function cancelRecycleNodes(&$row, $recycle){
-        if($row->type != 'path') return;
-        if(strpos($row->source, '/'.$recycle) === 0){
-            $row->source = 'NULL';
-            $row->type  = 'create';
-        }else if(strpos($row->target, '/'.$recycle) === 0){
-            $row->target = 'NULL';
-            $row->type   = 'delete';
-        }
-    }
-
-    protected function filterRow(&$previousRow, $filter = null){
-        if($filter == null) return false;
-        $srcInFilter = strpos($previousRow->source, $filter."/") === 0;
-        $targetInFilter = strpos($previousRow->target, $filter."/") === 0;
-        if(!$srcInFilter && !$targetInFilter){
-            return true;
-        }
-        if($previousRow->type == 'path'){
-            if(!$srcInFilter){
-                $previousRow->type = 'create';
-                $previousRow->source = 'NULL';
-            }else if(!$targetInFilter){
-                $previousRow->type = 'delete';
-                $previousRow->target = 'NULL';
-            }
-        }
-        if($srcInFilter){
-            $previousRow->source = substr($previousRow->source, strlen($filter));
-        }
-        if($targetInFilter){
-            $previousRow->target = substr($previousRow->target, strlen($filter));
-        }
-        if($previousRow->type != 'delete'){
-            $previousRow->node['node_path'] = substr($previousRow->node['node_path'], strlen($filter));
-        }else if(strpos($previousRow->node['node_path'], $filter) !== 0){
-            $previousRow->node['node_path'] = false;
-        }
-        return false;
-    }
-
-    protected function pathOutOfMask($testPath, $masks = array()){
-        if(!count($masks)) return false;
-        $regexps = array();
-        foreach($masks as $path){
-            $regexps[] = '^'.preg_quote($path.'/', '/');
-        }
-        $regexp = '/'.implode("|", $regexps).'/';
-        $inMask = ($testPath == 'NULL') || $testPath === false || in_array($testPath, $masks) || preg_match($regexp, $testPath);
-        return !$inMask;
-    }
-
-    protected function filterMasks(&$previousRow, $masks = array()){
-        if(!count($masks)) return false;
-
-        $srcInFilter = !$this->pathOutOfMask($previousRow->source, $masks);
-        $targetInFilter = !$this->pathOutOfMask($previousRow->target, $masks);
-
-        if(!$srcInFilter && !$targetInFilter){
-            return true;
-        }
-        if($previousRow->type == 'path'){
-            if(!$srcInFilter){
-                $previousRow->type = 'create';
-                $previousRow->source = 'NULL';
-            }else if(!$targetInFilter){
-                $previousRow->type = 'delete';
-                $previousRow->target = 'NULL';
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @param Repository $repository
-     * @param null $resolveUserId
-     * @return String
-     */
-    protected function computeIdentifier($repository, $resolveUserId = null)
-    {
-        $parts = array($repository->getId());
-        if ($repository->securityScope() == 'USER') {
-            if($resolveUserId != null) {
-                $parts[] = $resolveUserId;
-            } else {
-                $parts[] = AuthService::getLoggedUser()->getId();
-            }
-        } else if ($repository->securityScope() == 'GROUP') {
-            if($resolveUserId != null) {
-                $userObject = ConfService::getConfStorageImpl()->createUserObject($resolveUserId);
-                if($userObject != null) $parts[] = $userObject->getGroupPath();
-            }else{
-                $parts[] = AuthService::getLoggedUser()->getGroupPath();
-            }
-        }
-        return implode("-", $parts);
-    }
-
-    /**
-     * @param Repository $repository
-     * @return float
-     */
-    public function getRepositorySpaceUsage($repository){
-        $id = $this->computeIdentifier($repository);
-        $res = dibi::query("SELECT SUM([bytesize]) FROM [ajxp_index] WHERE [repository_identifier] = %s", $id);
-        return floatval($res->fetchSingle());
-    }
-
-    /**
-     * Called on workspace.after_delete event. Remove all references to this WS in the DB.
-     * Find all repo identifier exactly equal to $repoId , or like $repoId-%
-     * @param $repoId
-     */
-    public function clearIndexForWorkspaceId($repoId){
-        if(!dibi::isConnected()) {
-            dibi::connect($this->sqlDriver);
-        }
-        dibi::query("DELETE FROM [ajxp_index] WHERE [repository_identifier] = %s OR [repository_identifier] LIKE %like~", $repoId, $repoId."-");
-    }
-
-    /**
-     * @param AJXP_Node $oldNode
-     * @param AJXP_Node $newNode
-     * @param bool $copy
-     */
-    public function updateNodesIndex($oldNode = null, $newNode = null, $copy = false)
-    {
-        if(!dibi::isConnected()) {
-            dibi::connect($this->sqlDriver);
-        }
-        //$this->logInfo("Syncable index", array($oldNode == null?'null':$oldNode->getUrl(), $newNode == null?'null':$newNode->getUrl()));
-        try {
-            if ($newNode != null && $this->excludeNode($newNode)) {
-                // CREATE
-                if($oldNode == null) {
-                    AJXP_Logger::debug("Ignoring ".$newNode->getUrl()." for indexation");
-                    return;
-                }else{
-                    AJXP_Logger::debug("Target node is excluded, see it as a deletion: ".$newNode->getUrl());
-                    $newNode = null;
-                }
-            }
-            if ($newNode == null) {
-                $repoId = $this->computeIdentifier($oldNode->getRepository(), $oldNode->getUser());
-                // DELETE
-                $this->logDebug('DELETE', $oldNode->getUrl());
-                dibi::query("DELETE FROM [ajxp_index] WHERE [node_path] LIKE %like~ AND [repository_identifier] = %s", SystemTextEncoding::toUTF8($oldNode->getPath()), $repoId);
-            } else if ($oldNode == null || $copy) {
-                // CREATE
-                $stat = stat($newNode->getUrl());
-                $newNode->setLeaf(!($stat['mode'] & 040000));
-                $this->logDebug('INSERT', $newNode->getUrl());
-                dibi::query("INSERT INTO [ajxp_index]", array(
-                    "node_path" => SystemTextEncoding::toUTF8($newNode->getPath()),
-                    "bytesize"  => $stat["size"],
-                    "mtime"     => $stat["mtime"],
-                    "md5"       => $newNode->isLeaf()? md5_file($newNode->getUrl()):"directory",
-                    "repository_identifier" => $repoId = $this->computeIdentifier($newNode->getRepository(), $newNode->getUser())
-                ));
-                if($copy && !$newNode->isLeaf()){
-                    // Make sure to index the content of this file
-                    AJXP_Controller::findActionAndApply("index", array("file" => $newNode->getPath()), array());
-                }
-            } else {
-                $repoId = $this->computeIdentifier($oldNode->getRepository(), $oldNode->getUser());
-                if ($oldNode->getPath() == $newNode->getPath()) {
-                    // CONTENT CHANGE
-                    clearstatcache();
-                    $stat = stat($newNode->getUrl());
-                    $this->logDebug("Content changed", "current stat size is : " . $stat["size"]);
-                    $this->logDebug('UPDATE CONTENT', $newNode->getUrl());
-                    dibi::query("UPDATE [ajxp_index] SET ", array(
-                        "bytesize"  => $stat["size"],
-                        "mtime"     => $stat["mtime"],
-                        "md5"       => md5_file($newNode->getUrl())
-                    ), "WHERE [node_path] = %s AND [repository_identifier] = %s", SystemTextEncoding::toUTF8($oldNode->getPath()), $repoId);
-                    try{
-                        $rowCount = dibi::getAffectedRows();
-                        if($rowCount === 0){
-                            $this->logError(__FUNCTION__, "There was an update event on a non-indexed node (".$newNode->getPath()."), creating index entry!");
-                            $this->updateNodesIndex(null, $newNode, false);
-                        }
-                    }catch (Exception $e){}
-
-                } else {
-                    // PATH CHANGE ONLY
-                    $newNode->loadNodeInfo();
-                    if ($newNode->isLeaf()) {
-                        $this->logDebug('UPDATE LEAF PATH', $newNode->getUrl());
-                        dibi::query("UPDATE [ajxp_index] SET ", array(
-                            "node_path"  => SystemTextEncoding::toUTF8($newNode->getPath()),
-                        ), "WHERE [node_path] = %s AND [repository_identifier] = %s", SystemTextEncoding::toUTF8($oldNode->getPath()), $repoId);
-                        try{
-                            $rowCount = dibi::getAffectedRows();
-                            if($rowCount === 0){
-                                $this->logError(__FUNCTION__, "There was an update event on a non-indexed node (".$newNode->getPath()."), creating index entry!");
-                                $this->updateNodesIndex(null, $newNode, false);
-                            }
-                        }catch (Exception $e){}
-                    } else {
-                        $this->logDebug('UPDATE FOLDER PATH', $newNode->getUrl());
-                        dibi::query("UPDATE [ajxp_index] SET [node_path]=REPLACE( REPLACE(CONCAT('$$$',[node_path]), CONCAT('$$$', %s), CONCAT('$$$', %s)) , '$$$', '') ",
-                            SystemTextEncoding::toUTF8($oldNode->getPath()),
-                            SystemTextEncoding::toUTF8($newNode->getPath()),
-                            "WHERE ([node_path] = %s OR [node_path] LIKE %like~) AND [repository_identifier] = %s",
-                            SystemTextEncoding::toUTF8($oldNode->getPath()),
-                            rtrim(SystemTextEncoding::toUTF8($oldNode->getPath()), '/') . '/',
-                            $repoId);
-                        try{
-                            $rowCount = dibi::getAffectedRows();
-                            if($rowCount === 0){
-                                $this->logError(__FUNCTION__, "There was an update event on a non-indexed folder (".$newNode->getPath()."), relaunching a recursive indexation!");
-                                AJXP_Controller::findActionAndApply("index", array("file" => $newNode->getPath()), array());
-                            }
-                        }catch (Exception $e){}
-                    }
-
-                }
-            }
-        } catch (Exception $e) {
-            AJXP_Logger::error("[meta.syncable]", "Exception", $e->getTraceAsString());
-            AJXP_Logger::error("[meta.syncable]", "Indexation", $e->getMessage());
-        }
-
-    }
-
-    /**
-     * @param AJXP_Node $node
-     * @return bool
-     */
-    protected function excludeNode($node){
-        // DO NOT EXCLUDE RECYCLE INDEXATION, OTHERWISE RESTORED DATA IS NOT DETECTED!
-        //$repo = $node->getRepository();
-        //$recycle = $repo->getOption("RECYCLE_BIN");
-        //if(!empty($recycle) && strpos($node->getPath(), "/".trim($recycle, "/")) === 0) return true;
-
-        // Other exclusions conditions here?
-        return false;
-    }
-
-    /**
-     * @param AJXP_Node $node
-     */
-    public function indexNode($node){
-        // Create
-        $this->updateNodesIndex(null, $node, false);
-    }
-
-    /**
-     * @param AJXP_Node $node
-     */
-    public function clearIndexForNode($node){
-        // Delete
-        $this->updateNodesIndex($node, null, false);
-    }
-
-    /**
-     * @param array $metaSourcesOptions
-     */
-    public function setIndexationRequiredFlag(&$metaSourcesOptions){
-        if(isSet($metaSourcesOptions["meta.syncable"]) && (!isSet($metaSourcesOptions["meta.syncable"]["REPO_SYNCABLE"]) || $metaSourcesOptions["meta.syncable"]["REPO_SYNCABLE"] === true )){
-            $metaSourcesOptions["meta.syncable"]["REQUIRES_INDEXATION"] = true;
-        }
-    }
-
-    public function installSQLTables($param)
-    {
-        $p = AJXP_Utils::cleanDibiDriverParameters(isSet($param) && isSet($param["SQL_DRIVER"])?$param["SQL_DRIVER"]:$this->sqlDriver);
-        return AJXP_Utils::runCreateTablesQuery($p, $this->getBaseDir()."/create.sql");
-    }
-
-}
diff --git a/core/src/plugins/meta.syncable/create.mysql b/core/src/plugins/meta.syncable/create.mysql
index 2e92a2cb5a..26ad0403a0 100644
--- a/core/src/plugins/meta.syncable/create.mysql
+++ b/core/src/plugins/meta.syncable/create.mysql
@@ -35,4 +35,4 @@ DROP TRIGGER IF EXISTS `LOG_UPDATE`;
 
 CREATE TRIGGER `LOG_UPDATE` AFTER UPDATE ON `ajxp_index`
 FOR EACH ROW INSERT INTO ajxp_changes (repository_identifier, node_id,source,target,type)
-  VALUES (new.repository_identifier, new.node_id, old.node_path, new.node_path, CASE old.node_path = new.node_path WHEN true THEN 'content' ELSE 'path' END);
+  VALUES (new.repository_identifier, new.node_id, old.node_path, new.node_path, CASE old.node_path COLLATE utf8_bin = new.node_path COLLATE utf8_bin WHEN true THEN 'content' ELSE 'path' END);
diff --git a/core/src/plugins/meta.syncable/i18n/conf/de.php b/core/src/plugins/meta.syncable/i18n/conf/de.php
index 5d08ce6d49..c75c156ae3 100644
--- a/core/src/plugins/meta.syncable/i18n/conf/de.php
+++ b/core/src/plugins/meta.syncable/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Syncable Workspace" => "Synchronisierbare Arbeitsumgebung",
diff --git a/core/src/plugins/meta.syncable/i18n/conf/en.php b/core/src/plugins/meta.syncable/i18n/conf/en.php
index 39486c6348..7040291169 100644
--- a/core/src/plugins/meta.syncable/i18n/conf/en.php
+++ b/core/src/plugins/meta.syncable/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Syncable Workspace" => "Syncable Workspace",
diff --git a/core/src/plugins/meta.syncable/i18n/conf/it.php b/core/src/plugins/meta.syncable/i18n/conf/it.php
index ecb83664db..15a06e95a0 100644
--- a/core/src/plugins/meta.syncable/i18n/conf/it.php
+++ b/core/src/plugins/meta.syncable/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Syncable Workspace" => "Workspace Sincronizzabile",
diff --git a/core/src/plugins/meta.syncable/manifest.xml b/core/src/plugins/meta.syncable/manifest.xml
index f7e593a4f5..e116458447 100644
--- a/core/src/plugins/meta.syncable/manifest.xml
+++ b/core/src/plugins/meta.syncable/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <meta id="meta.syncable" label="CONF_MESSAGE[Syncable Workspace]" description="CONF_MESSAGE[Track changes on this workspace to enable the synchronization with an external client]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <class_definition filename="plugins/meta.syncable/class.ChangesTracker.php" classname="ChangesTracker"/>
+    <class_definition filename="plugins/meta.syncable/ChangesTracker.php" classname="Pydio\Access\Meta\Sync\ChangesTracker"/>
     <client_settings>
         <resources>
             <i18n namespace="meta.syncable" path="plugins/meta.syncable/i18n"/>
@@ -35,6 +35,7 @@
    			<serverCallback hookName="node.change" methodName="updateNodesIndex" defer="true"/>
    			<serverCallback hookName="node.index" methodName="indexNode"/>
    			<serverCallback hookName="node.index.recursive.start" methodName="clearIndexForNode"/>
+   			<serverCallback hookName="node.size.recursive" methodName="computeSizeRecursive"/>
             <serverCallback hookName="workspace.after_delete" methodName="clearIndexForWorkspaceId"/>
             <serverCallback hookName="workspace.share_metasources" methodName="setIndexationRequiredFlag"/>
         </hooks>
diff --git a/core/src/plugins/meta.user/UserMetaManager.php b/core/src/plugins/meta.user/UserMetaManager.php
new file mode 100644
index 0000000000..1efbf3307f
--- /dev/null
+++ b/core/src/plugins/meta.user/UserMetaManager.php
@@ -0,0 +1,413 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Meta\UserGenerated;
+
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Utils\Vars\InputFilter;
+
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Access\Meta\Core\AbstractMetaSource;
+use Pydio\Access\Metastore\Core\IMetaStoreProvider;
+use Pydio\Core\Utils\Vars\StringHelper;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Simple metadata implementation, stored in hidden files inside the
+ * folders
+ * @package AjaXplorer_Plugins
+ * @subpackage Meta
+ */
+class UserMetaManager extends AbstractMetaSource
+{
+    /**
+     * @var IMetaStoreProvider
+     */
+    protected $metaStore;
+    protected $fieldsAdditionalData = array();
+    private $metaOptionsParsed = false;
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+        $this->options = $options;
+        // Do not call parent
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param AbstractAccessDriver $accessDriver
+     * @throws PydioException
+     */
+    public function initMeta(ContextInterface $ctx, AbstractAccessDriver $accessDriver)
+    {
+        parent::initMeta($ctx, $accessDriver);
+
+        $store = PluginsService::getInstance($ctx)->getUniqueActivePluginForType("metastore");
+        if ($store === false) {
+            throw new PydioException("The 'meta.user' plugin requires at least one active 'metastore' plugin");
+        }
+        $this->metaStore = $store;
+        $this->metaStore->initMeta($ctx, $accessDriver);
+        
+        $def = $this->getMetaDefinition();
+        foreach($def as $k => &$d){
+            if(isSet($this->fieldsAdditionalData[$k])) $d["data"] = $this->fieldsAdditionalData[$k];
+        }
+        $this->exposeConfigInManifest("meta_definitions", json_encode($def));
+        if(!isSet($this->options["meta_visibility"])) $visibilities = array("visible");
+        else $visibilities = explode(",", $this->options["meta_visibility"]);
+        $editButton = '';
+        $u = $ctx->getUser();
+        if($u != null && $u->canWrite($ctx->getRepositoryId())){
+            $editButton = '<span class="icon-edit" data-ajxpAction="edit_user_meta" title="AJXP_MESSAGE[meta.user.1]"></span><span class="user_meta_change" style="display: none;" data-ajxpAction="edit_user_meta" title="AJXP_MESSAGE[meta.user.1]">AJXP_MESSAGE[457]</span>';
+        }
+        $cdataHead = '<div>
+                        <div class="panelHeader infoPanelGroup">'.$editButton.'AJXP_MESSAGE[meta.user.1]</div>
+                     ';
+        $cdataFoot = '</div>';
+        $cdataParts = "";
+
+        $selection = $this->getXPath()->query('registry_contributions/client_configs/component_config[@className="FilesList"]/columns');
+        $contrib = $selection->item(0);
+        $even = false;
+        $searchables = array();
+        $searchablesRenderers = array();
+        $index = 0;
+
+        foreach ($def as $key=> $data) {
+            $label = $data["label"];
+            $fieldType = $data["type"];
+
+            if (isSet($visibilities[$index])) {
+                $lastVisibility = $visibilities[$index];
+            }
+            $index ++;
+            $col = $this->manifestDoc->createElement("additional_column");
+            $col->setAttribute("messageString", $label);
+            $col->setAttribute("attributeName", $key);
+            $col->setAttribute("sortType", "String");
+            if(isSet($lastVisibility)) $col->setAttribute("defaultVisibilty", $lastVisibility);
+            switch ($fieldType) {
+                case "stars_rate":
+                    $col->setAttribute("modifier", "MetaCellRenderer.prototype.starsRateFilter");
+                    $col->setAttribute("sortType", "CellSorterValue");
+                    $searchables[$key] = $label;
+                    $searchablesRenderers[$key] = "MetaCellRenderer.prototype.formPanelStars";
+                    break;
+                case "css_label":
+                    $col->setAttribute("modifier", "MetaCellRenderer.prototype.cssLabelsFilter");
+                    $col->setAttribute("sortType", "CellSorterValue");
+                    $searchables[$key] = $label;
+                    $searchablesRenderers[$key] = "MetaCellRenderer.prototype.formPanelCssLabels";
+                    break;
+                case "textarea":
+                    $searchables[$key] = $label;
+                    break;
+                case "string":
+                    $searchables[$key] = $label;
+                    break;
+                case "choice":
+                    $searchables[$key] = $label;
+                    $col->setAttribute("modifier", "MetaCellRenderer.prototype.selectorsFilter");
+                    $col->setAttribute("sortType", "CellSorterValue");
+                    $col->setAttribute("metaAdditional", $this->fieldsAdditionalData[$key]);
+                    $searchablesRenderers[$key] = "MetaCellRenderer.prototype.formPanelSelectorFilter";
+                    break;
+                case "tags":
+                    $searchables[$key] = $label;
+                    $searchablesRenderers[$key] = "MetaCellRenderer.prototype.formPanelTags";
+                    break;
+                default:
+                    break;
+            }
+            $contrib->appendChild($col);
+            $trClass = ($even?" class=\"even infoPanelRow\"":" class=\"infoPanelRow\"");
+            $even = !$even;
+            $cdataParts .= '<div'.$trClass.'><div class="infoPanelLabel">'.$label.'</div><div class="infoPanelValue" data-metaType="'.$fieldType.'" id="ip_'.$key.'">#{'.$key.'}</div></div>';
+        }
+
+        $selection = $this->getXPath()->query('registry_contributions/client_configs/component_config[@className="InfoPanel"]/infoPanelExtension');
+        $contrib = $selection->item(0);
+        $contrib->setAttribute("attributes", implode(",", array_keys($def)));
+        if (!empty($this->fieldsAdditionalData)) {
+            $contrib->setAttribute("metaAdditional", json_encode($this->fieldsAdditionalData));
+        }
+        $contrib->setAttribute("modifier", "MetaCellRenderer.prototype.infoPanelModifier");
+
+        $htmlSel = $this->getXPath()->query('html', $contrib);
+        $html = $htmlSel->item(0);
+        $cdata = $this->manifestDoc->createCDATASection($cdataHead . $cdataParts . $cdataFoot);
+        $html->appendChild($cdata);
+
+        $selection = $this->getXPath()->query('registry_contributions/client_configs/template_part[@ajxpClass="SearchEngine"]');
+        foreach ($selection as $tag) {
+            $v = $tag->attributes->getNamedItem("ajxpOptions")->nodeValue;
+            $metaV = count($searchables)? '"metaColumns":'.json_encode($searchables): "";
+            if (count($searchablesRenderers)) {
+                $metaV .= ',"metaColumnsRenderers":'.json_encode($searchablesRenderers);
+            }
+            if (!empty($v) && trim($v) != "{}" && !empty($metaV)) {
+                $v = str_replace("}", ", ".$metaV."}", $v);
+            } else {
+                $v = "{".$metaV."}";
+            }
+            $tag->setAttribute("ajxpOptions", $v);
+        }
+
+        parent::init($ctx, $this->options);
+
+    }
+
+    /**
+     * @return array
+     */
+    protected function getMetaDefinition()
+    {
+        if (!$this->metaOptionsParsed) {
+            if (!isSet($this->options["meta_types"]) && isSet($this->options["meta_fields"])) {
+                // Get type from name
+                $val = $this->options["meta_fields"];
+                if($val == "stars_rate") $this->options["meta_types"].="stars_rate";
+                else if($val == "css_label") $this->options["meta_types"].="css_label";
+                else if(substr($val, 0,5) == "area_") $this->options["meta_types"].="textarea";
+                else $this->options["meta_types"].="string";
+            }
+            if(!empty($this->options["meta_additional"])){
+                $this->fieldsAdditionalData[$this->options["meta_fields"]] = $this->options["meta_additional"];
+            }
+            foreach ($this->options as $key => $val) {
+                $matches = array();
+                if (preg_match('/^meta_fields_(.*)$/', $key, $matches) != 0) {
+                    $repIndex = $matches[1];
+                    $this->options["meta_fields"].=",".$val;
+                    $this->options["meta_labels"].=",".$this->options["meta_labels_".$repIndex];
+                    if (!empty($this->options["meta_additional_".$repIndex])) {
+                        $this->fieldsAdditionalData[$val] = $this->options["meta_additional_".$repIndex];
+                    }
+                    if (isSet($this->options["meta_types_".$repIndex])) {
+                        $this->options["meta_types"].=",".$this->options["meta_types_".$repIndex];
+                    } else {
+                        // Get type from name
+                        if($val == "stars_rate") $this->options["meta_types"].=","."stars_rate";
+                        else if($val == "css_label") $this->options["meta_types"].=","."css_label";
+                        else if(substr($val,0,5) == "area_") $this->options["meta_types"].=","."textarea";
+                        else $this->options["meta_types"].=","."string";
+                    }
+                    if (isSet($this->options["meta_visibility_".$repIndex]) && isSet($this->options["meta_visibility"])) {
+                        $this->options["meta_visibility"].=",".$this->options["meta_visibility_".$repIndex];
+                    }
+                }
+            }
+            $this->metaOptionsParsed = true;
+        }
+
+        $fields = $this->options["meta_fields"];
+        $arrF = explode(",", $fields);
+        $labels = $this->options["meta_labels"];
+        $arrL = explode(",", $labels);
+        $arrT = explode(",", $this->options["meta_types"]);
+
+        $result = array();
+        foreach ($arrF as $index => $value) {
+            //make sure value does not contain spaces or things like that
+            $value = StringHelper::slugify($value);
+            if (isSet($arrL[$index])) {
+                $result[$value] = array("label" => $arrL[$index], "type" => $arrT[$index]);
+            } else {
+                $result[$value] = array("label" => $value, "type" => $arrT[$index]);
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @throws \Exception
+     */
+    public function editMeta(\Psr\Http\Message\ServerRequestInterface &$requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface)
+    {
+        /** @var ContextInterface $ctx */
+        $ctx = $requestInterface->getAttribute("ctx");
+        $httpVars = $requestInterface->getParsedBody();
+        if ($ctx->getRepository()->getDriverInstance($ctx) instanceof \Pydio\Access\Driver\StreamProvider\FS\DemoAccessDriver) {
+            throw new \Exception("Write actions are disabled in demo mode!");
+        }
+        $user = $ctx->getUser();
+
+        if (!UsersService::usersEnabled() && $user!=null && !$user->canWrite($ctx->getRepositoryId())) {
+            throw new \Exception("You have no right on this action.");
+        }
+        $selection = UserSelection::fromContext($ctx, $httpVars);
+
+        $nodes = $selection->buildNodes();
+        $nodesDiffs = new \Pydio\Access\Core\Model\NodesDiff();
+        $def = $this->getMetaDefinition();
+        foreach($nodes as $ajxpNode){
+
+            $newValues = array();
+            if(!is_writable($ajxpNode->getUrl())){
+                throw new \Exception("You are not allowed to perform this action");
+            }
+            Controller::applyHook("node.before_change", array(&$ajxpNode));
+            foreach ($def as $key => $data) {
+                if (isSet($httpVars[$key])) {
+                    $newValues[$key] = InputFilter::decodeSecureMagic($httpVars[$key]);
+                    if($data["type"] == "tags"){
+                        $this->updateTags($ctx, InputFilter::decodeSecureMagic($httpVars[$key]));
+                    }
+                } else {
+                    if (!isset($original)) {
+                        $original = $ajxpNode->retrieveMetadata("users_meta", false, AJXP_METADATA_SCOPE_GLOBAL);
+                    }
+                    if (isSet($original) && isset($original[$key])) {
+                        $newValues[$key] = $original[$key];
+                    }
+                }
+            }
+            $ajxpNode->setMetadata("users_meta", $newValues, false, AJXP_METADATA_SCOPE_GLOBAL);
+            Controller::applyHook("node.meta_change", array($ajxpNode));
+            $ajxpNode->loadNodeInfo(true, false, "all");
+            $nodesDiffs->update($ajxpNode);
+
+        }
+        $respStream = new \Pydio\Core\Http\Response\SerializableResponseStream();
+        $responseInterface = $responseInterface->withBody($respStream);
+        $respStream->addChunk($nodesDiffs);
+    }
+
+    /**
+     *
+     * @param AJXP_Node $ajxpNode
+     * @param bool $contextNode
+     * @param bool $details
+     * @return void
+     */
+    public function extractMeta(&$ajxpNode, $contextNode = false, $details = false)
+    {
+        $metadata = $ajxpNode->retrieveMetadata("users_meta", false, AJXP_METADATA_SCOPE_GLOBAL);
+        if(empty($metadata)) $metadata = array();
+        $ajxpNode->mergeMetadata($metadata);
+
+    }
+
+    /**
+     *
+     * @param \Pydio\Access\Core\Model\AJXP_Node $oldNode
+     * @param AJXP_Node $newNode
+     * @param Boolean $copy
+     */
+    public function updateMetaLocation($oldNode, $newNode = null, $copy = false)
+    {
+        $defs = $this->getMetaDefinition();
+        $updateField = $createField = null;
+        foreach($defs as $f => $data){
+            if($data["type"] == "updater") $updateField = $f;
+            else if($data["type"] == "creator") $createField = $f;
+        }
+        $valuesUpdate = (isSet($updateField) || isSet($createField));
+        $currentUser = null;
+        if($valuesUpdate){
+            $refNode = ($oldNode !== null ? $oldNode : $newNode);
+            $currentUser = $refNode->getUserId();
+        }
+
+        if($oldNode == null && !$valuesUpdate) return;
+        if(!$copy && !$valuesUpdate && $this->metaStore->inherentMetaMove()) return;
+
+        if($oldNode == null){
+            $oldMeta = $this->metaStore->retrieveMetadata($newNode, "users_meta", false, AJXP_METADATA_SCOPE_GLOBAL);
+        }else{
+            $oldMeta = $this->metaStore->retrieveMetadata($oldNode, "users_meta", false, AJXP_METADATA_SCOPE_GLOBAL);
+        }
+        if($valuesUpdate){
+            if(isSet($updateField))$oldMeta[$updateField] = $currentUser;
+            if(isSet($createField) && $oldNode == null) $oldMeta[$createField] = $currentUser;
+        }
+        if (!count($oldMeta)) {
+            return;
+        }
+        // If it's a move or a delete, delete old data
+        if ($oldNode != null && !$copy) {
+            $this->metaStore->removeMetadata($oldNode, "users_meta", false, AJXP_METADATA_SCOPE_GLOBAL);
+        }
+        // If copy or move, copy data.
+        if ($newNode != null) {
+            $this->metaStore->setMetadata($newNode, "users_meta", $oldMeta, false, AJXP_METADATA_SCOPE_GLOBAL);
+        }
+    }
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     * @return \Psr\Http\Message\ResponseInterface|\Zend\Diactoros\Response\JsonResponse
+     */
+    public function listTags(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface){
+
+        $tags = $this->loadTags($requestInterface->getAttribute("ctx"));
+        if(empty($tags)) $tags = array();
+        $responseInterface = new \Zend\Diactoros\Response\JsonResponse($tags);
+        return $responseInterface;
+
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @return array
+     */
+    protected function loadTags(ContextInterface $ctx){
+
+        $store = ConfService::getConfStorageImpl();
+        if(!($store instanceof \Pydio\Conf\Sql\SqlConfDriver)) return array();
+        $data = array();
+        $store->simpleStoreGet("meta_user_tags", $ctx->getRepositoryId(), "serial", $data);
+        return $data;
+
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $tagString
+     * @throws \Exception
+     */
+    protected function updateTags(ContextInterface $ctx, $tagString){
+
+        $store = ConfService::getConfStorageImpl();
+        if(!($store instanceof \Pydio\Conf\Sql\SqlConfDriver)) return;
+        $tags = $this->loadTags($ctx);
+        $tags = array_merge($tags, array_map("trim", explode(",", $tagString)));
+        $tags = array_unique($tags);
+        $store->simpleStoreSet("meta_user_tags", $ctx->getRepositoryId(), array_values($tags), "serial");
+
+    }
+
+}
diff --git a/core/src/plugins/meta.user/class.MetaCellRenderer.js b/core/src/plugins/meta.user/class.MetaCellRenderer.js
index 30931ccf3c..311a8f8d4b 100644
--- a/core/src/plugins/meta.user/class.MetaCellRenderer.js
+++ b/core/src/plugins/meta.user/class.MetaCellRenderer.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  * Description : Static class for renderers
  */
 Class.create("MetaCellRenderer", {
@@ -389,13 +389,14 @@ Class.create("MetaCellRenderer", {
         htmlElement.select('[data-metatype]').each(function(td){
             var metaType = td.readAttribute("data-metatype");
             var metaName = td.id.replace(/^ip_/, '');
+            var value;
             switch(metaType){
                 case "stars_rate":
-                    var value = parseInt(td.innerHTML);
+                    value = parseInt(td.innerHTML);
                     td.update(this.createStars(value, null, metaName));
                 break;
                 case "css_label":
-                    var value = td.innerHTML.strip();
+                    value = td.innerHTML.strip();
                     var rule = this.findCssRule(value);
                     if(rule){
                         td.addClassName(rule.cssClass);
@@ -406,14 +407,14 @@ Class.create("MetaCellRenderer", {
                     if(MetaCellRenderer.staticMetadataCache && MetaCellRenderer.staticMetadataCache.get(metaName)){
                         var selectorValues  = MetaCellRenderer.staticMetadataCache.get(metaName);
                         if(!selectorValues) break;
-                        var value = td.innerHTML.strip();
+                        value = td.innerHTML.strip();
                         if(selectorValues[value]){
                             td.update(selectorValues[value]);
                         }
                     }
                 break;
                 case "tags":
-                    var value = td.innerHTML.strip();
+                    value = td.innerHTML.strip();
                     this.displayTagsAsBlocks(metaName, td, value, ajxpNode);
                 break;
                 case "text":
@@ -438,7 +439,7 @@ Class.create("MetaCellRenderer", {
 	},
 
     linkEditableDiv : function(div){
-        div.saver = new Element("img", {src:"plugins/gui.ajax/res/themes/umbra/images/actions/22/dialog_ok_apply.png"}).setStyle({
+        div.saver = new Element("img", {src:"plugins/gui.ajax/res/themes/orbit/images/actions/22/dialog_ok_apply.png"}).setStyle({
             float:"left",
             width: "22px",
             height:"22px",
diff --git a/core/src/plugins/meta.user/class.UserMetaManager.php b/core/src/plugins/meta.user/class.UserMetaManager.php
deleted file mode 100644
index 31b21ffd9b..0000000000
--- a/core/src/plugins/meta.user/class.UserMetaManager.php
+++ /dev/null
@@ -1,357 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Simple metadata implementation, stored in hidden files inside the
- * folders
- * @package AjaXplorer_Plugins
- * @subpackage Meta
- */
-class UserMetaManager extends AJXP_AbstractMetaSource
-{
-    /**
-     * @var MetaStoreProvider
-     */
-    protected $metaStore;
-    protected $fieldsAdditionalData = array();
-    private $metaOptionsParsed = false;
-
-    public function init($options)
-    {
-        $this->options = $options;
-        // Do nothing
-    }
-
-    public function initMeta($accessDriver)
-    {
-        parent::initMeta($accessDriver);
-
-        $store = AJXP_PluginsService::getInstance()->getUniqueActivePluginForType("metastore");
-        if ($store === false) {
-            throw new Exception("The 'meta.user' plugin requires at least one active 'metastore' plugin");
-        }
-        $this->metaStore = $store;
-        $this->metaStore->initMeta($accessDriver);
-
-        //$messages = ConfService::getMessages();
-        $def = $this->getMetaDefinition();
-        foreach($def as $k => &$d){
-            if(isSet($this->fieldsAdditionalData[$k])) $d["data"] = $this->fieldsAdditionalData[$k];
-        }
-        $this->exposeConfigInManifest("meta_definitions", json_encode($def));
-        if(!isSet($this->options["meta_visibility"])) $visibilities = array("visible");
-        else $visibilities = explode(",", $this->options["meta_visibility"]);
-        $editButton = '';
-        $u = AuthService::getLoggedUser();
-        if($u != null && $u->canWrite($this->accessDriver->repository->getId())){
-            $editButton = '<span class="icon-edit" data-ajxpAction="edit_user_meta" title="AJXP_MESSAGE[meta.user.1]"></span><span class="user_meta_change" style="display: none;" data-ajxpAction="edit_user_meta" title="AJXP_MESSAGE[meta.user.1]">AJXP_MESSAGE[457]</span>';
-        }
-        $cdataHead = '<div>
-                        <div class="panelHeader infoPanelGroup" colspan="2">'.$editButton.'AJXP_MESSAGE[meta.user.1]</div>
-                     ';
-        $cdataFoot = '</div>';
-        $cdataParts = "";
-
-        $selection = $this->getXPath()->query('registry_contributions/client_configs/component_config[@className="FilesList"]/columns');
-        $contrib = $selection->item(0);
-        $even = false;
-        $searchables = array();
-        $searchablesRenderers = array();
-        $index = 0;
-        $fieldType = "text";
-        foreach ($def as $key=> $data) {
-            $label = $data["label"];
-            $fieldType = $data["type"];
-
-            if (isSet($visibilities[$index])) {
-                $lastVisibility = $visibilities[$index];
-            }
-            $index ++;
-            $col = $this->manifestDoc->createElement("additional_column");
-            $col->setAttribute("messageString", $label);
-            $col->setAttribute("attributeName", $key);
-            $col->setAttribute("sortType", "String");
-            if(isSet($lastVisibility)) $col->setAttribute("defaultVisibilty", $lastVisibility);
-            switch ($fieldType) {
-                case "stars_rate":
-                    $col->setAttribute("modifier", "MetaCellRenderer.prototype.starsRateFilter");
-                    $col->setAttribute("sortType", "CellSorterValue");
-                    $searchables[$key] = $label;
-                    $searchablesRenderers[$key] = "MetaCellRenderer.prototype.formPanelStars";
-                    break;
-                case "css_label":
-                    $col->setAttribute("modifier", "MetaCellRenderer.prototype.cssLabelsFilter");
-                    $col->setAttribute("sortType", "CellSorterValue");
-                    $searchables[$key] = $label;
-                    $searchablesRenderers[$key] = "MetaCellRenderer.prototype.formPanelCssLabels";
-                    break;
-                case "textarea":
-                    $searchables[$key] = $label;
-                    break;
-                case "string":
-                    $searchables[$key] = $label;
-                    break;
-                case "choice":
-                    $searchables[$key] = $label;
-                    $col->setAttribute("modifier", "MetaCellRenderer.prototype.selectorsFilter");
-                    $col->setAttribute("sortType", "CellSorterValue");
-                    $col->setAttribute("metaAdditional", $this->fieldsAdditionalData[$key]);
-                    $searchablesRenderers[$key] = "MetaCellRenderer.prototype.formPanelSelectorFilter";
-                    break;
-                case "tags":
-                    $searchables[$key] = $label;
-                    $searchablesRenderers[$key] = "MetaCellRenderer.prototype.formPanelTags";
-                    break;
-                default:
-                    break;
-            }
-            $contrib->appendChild($col);
-            $trClass = ($even?" class=\"even infoPanelRow\"":" class=\"infoPanelRow\"");
-            $even = !$even;
-            $cdataParts .= '<div'.$trClass.'><div class="infoPanelLabel">'.$label.'</div><div class="infoPanelValue" data-metaType="'.$fieldType.'" id="ip_'.$key.'">#{'.$key.'}</div></div>';
-        }
-
-        $selection = $this->getXPath()->query('registry_contributions/client_configs/component_config[@className="InfoPanel"]/infoPanelExtension');
-        $contrib = $selection->item(0);
-        $contrib->setAttribute("attributes", implode(",", array_keys($def)));
-        if (!empty($this->fieldsAdditionalData)) {
-            $contrib->setAttribute("metaAdditional", json_encode($this->fieldsAdditionalData));
-        }
-        $contrib->setAttribute("modifier", "MetaCellRenderer.prototype.infoPanelModifier");
-
-        $htmlSel = $this->getXPath()->query('html', $contrib);
-        $html = $htmlSel->item(0);
-        $cdata = $this->manifestDoc->createCDATASection($cdataHead . $cdataParts . $cdataFoot);
-        $html->appendChild($cdata);
-
-        $selection = $this->getXPath()->query('registry_contributions/client_configs/template_part[@ajxpClass="SearchEngine"]');
-        foreach ($selection as $tag) {
-            $v = $tag->attributes->getNamedItem("ajxpOptions")->nodeValue;
-            $metaV = count($searchables)? '"metaColumns":'.json_encode($searchables): "";
-            if (count($searchablesRenderers)) {
-                $metaV .= ',"metaColumnsRenderers":'.json_encode($searchablesRenderers);
-            }
-            if (!empty($v) && trim($v) != "{}" && !empty($metaV)) {
-                $v = str_replace("}", ", ".$metaV."}", $v);
-            } else {
-                $v = "{".$metaV."}";
-            }
-            $tag->setAttribute("ajxpOptions", $v);
-        }
-
-        parent::init($this->options);
-
-    }
-
-    protected function getMetaDefinition()
-    {
-        if (!$this->metaOptionsParsed) {
-            if (!isSet($this->options["meta_types"]) && isSet($this->options["meta_fields"])) {
-                // Get type from name
-                $val = $this->options["meta_fields"];
-                if($val == "stars_rate") $this->options["meta_types"].="stars_rate";
-                else if($val == "css_label") $this->options["meta_types"].="css_label";
-                else if(substr($val, 0,5) == "area_") $this->options["meta_types"].="textarea";
-                else $this->options["meta_types"].="string";
-            }
-            if(!empty($this->options["meta_additional"])){
-                $this->fieldsAdditionalData[$this->options["meta_fields"]] = $this->options["meta_additional"];
-            }
-            foreach ($this->options as $key => $val) {
-                $matches = array();
-                if (preg_match('/^meta_fields_(.*)$/', $key, $matches) != 0) {
-                    $repIndex = $matches[1];
-                    $this->options["meta_fields"].=",".$val;
-                    $this->options["meta_labels"].=",".$this->options["meta_labels_".$repIndex];
-                    if (!empty($this->options["meta_additional_".$repIndex])) {
-                        $this->fieldsAdditionalData[$val] = $this->options["meta_additional_".$repIndex];
-                    }
-                    if (isSet($this->options["meta_types_".$repIndex])) {
-                        $this->options["meta_types"].=",".$this->options["meta_types_".$repIndex];
-                    } else {
-                        // Get type from name
-                        if($val == "stars_rate") $this->options["meta_types"].=","."stars_rate";
-                        else if($val == "css_label") $this->options["meta_types"].=","."css_label";
-                        else if(substr($val,0,5) == "area_") $this->options["meta_types"].=","."textarea";
-                        else $this->options["meta_types"].=","."string";
-                    }
-                    if (isSet($this->options["meta_visibility_".$repIndex]) && isSet($this->options["meta_visibility"])) {
-                        $this->options["meta_visibility"].=",".$this->options["meta_visibility_".$repIndex];
-                    }
-                }
-            }
-            $this->metaOptionsParsed = true;
-        }
-
-        $fields = $this->options["meta_fields"];
-        $arrF = explode(",", $fields);
-        $labels = $this->options["meta_labels"];
-        $arrL = explode(",", $labels);
-        $arrT = explode(",", $this->options["meta_types"]);
-
-        $result = array();
-        foreach ($arrF as $index => $value) {
-            if (isSet($arrL[$index])) {
-                $result[$value] = array("label" => $arrL[$index], "type" => $arrT[$index]);
-            } else {
-                $result[$value] = array("label" => $value, "type" => $arrT[$index]);
-            }
-        }
-        return $result;
-    }
-
-    public function editMeta($actionName, $httpVars, $fileVars)
-    {
-        if (is_a($this->accessDriver, "demoAccessDriver")) {
-            throw new Exception("Write actions are disabled in demo mode!");
-        }
-        $repo = $this->accessDriver->repository;
-        $user = AuthService::getLoggedUser();
-        if (!AuthService::usersEnabled() && $user!=null && !$user->canWrite($repo->getId())) {
-            throw new Exception("You have no right on this action.");
-        }
-        $selection = new UserSelection($repo, $httpVars);
-
-        $nodes = $selection->buildNodes();
-        $nodesDiffs = array();
-        $def = $this->getMetaDefinition();
-        foreach($nodes as $ajxpNode){
-
-            $newValues = array();
-            if(!is_writable($ajxpNode->getUrl())){
-                throw new Exception("You are not allowed to perform this action");
-            }
-            AJXP_Controller::applyHook("node.before_change", array(&$ajxpNode));
-            foreach ($def as $key => $data) {
-                if (isSet($httpVars[$key])) {
-                    $newValues[$key] = AJXP_Utils::decodeSecureMagic($httpVars[$key]);
-                    if($data["type"] == "tags"){
-                        $this->updateTags(AJXP_Utils::decodeSecureMagic($httpVars[$key]));
-                    }
-                } else {
-                    if (!isset($original)) {
-                        $original = $ajxpNode->retrieveMetadata("users_meta", false, AJXP_METADATA_SCOPE_GLOBAL);
-                    }
-                    if (isSet($original) && isset($original[$key])) {
-                        $newValues[$key] = $original[$key];
-                    }
-                }
-            }
-            $ajxpNode->setMetadata("users_meta", $newValues, false, AJXP_METADATA_SCOPE_GLOBAL);
-            AJXP_Controller::applyHook("node.meta_change", array($ajxpNode));
-
-            $nodesDiffs[$ajxpNode->getPath()] = $ajxpNode;
-
-        }
-        AJXP_XMLWriter::header();
-        AJXP_XMLWriter::writeNodesDiff(array("UPDATE" => $nodesDiffs), true);
-        AJXP_XMLWriter::close();
-    }
-
-    /**
-     *
-     * @param AJXP_Node $ajxpNode
-     * @param bool $contextNode
-     * @param bool $details
-     * @return void
-     */
-    public function extractMeta(&$ajxpNode, $contextNode = false, $details = false)
-    {
-        $metadata = $ajxpNode->retrieveMetadata("users_meta", false, AJXP_METADATA_SCOPE_GLOBAL);
-        if(empty($metadata)) $metadata = array();
-        $ajxpNode->mergeMetadata($metadata);
-
-    }
-
-    /**
-     *
-     * @param AJXP_Node $oldNode
-     * @param AJXP_Node $newNode
-     * @param Boolean $copy
-     */
-    public function updateMetaLocation($oldNode, $newNode = null, $copy = false)
-    {
-        $defs = $this->getMetaDefinition();
-        $updateField = $createField = null;
-        foreach($defs as $f => $data){
-            if($data["type"] == "updater") $updateField = $f;
-            else if($data["type"] == "creator") $createField = $f;
-        }
-        $valuesUpdate = (isSet($updateField) || isSet($createField));
-        $currentUser = null;
-        if($valuesUpdate){
-            $currentUser = AuthService::getLoggedUser()->getId();
-        }
-
-        if($oldNode == null && !$valuesUpdate) return;
-        if(!$copy && !$valuesUpdate && $this->metaStore->inherentMetaMove()) return;
-
-        if($oldNode == null){
-            $oldMeta = $this->metaStore->retrieveMetadata($newNode, "users_meta", false, AJXP_METADATA_SCOPE_GLOBAL);
-        }else{
-            $oldMeta = $this->metaStore->retrieveMetadata($oldNode, "users_meta", false, AJXP_METADATA_SCOPE_GLOBAL);
-        }
-        if($valuesUpdate){
-            if(isSet($updateField))$oldMeta[$updateField] = $currentUser;
-            if(isSet($createField) && $oldNode == null) $oldMeta[$createField] = $currentUser;
-        }
-        if (!count($oldMeta)) {
-            return;
-        }
-        // If it's a move or a delete, delete old data
-        if ($oldNode != null && !$copy) {
-            $this->metaStore->removeMetadata($oldNode, "users_meta", false, AJXP_METADATA_SCOPE_GLOBAL);
-        }
-        // If copy or move, copy data.
-        if ($newNode != null) {
-            $this->metaStore->setMetadata($newNode, "users_meta", $oldMeta, false, AJXP_METADATA_SCOPE_GLOBAL);
-        }
-    }
-
-    public function listTags($actionName, &$httpVars, &$fileVars){
-
-        HTMLWriter::charsetHeader("application/json");
-        $tags = $this->loadTags();
-        if(empty($tags)) $tags = array();
-        echo json_encode($tags);
-
-    }
-
-    protected function loadTags(){
-        $store = ConfService::getConfStorageImpl();
-        if(!is_a($store, "sqlConfDriver")) return array();
-        $data = array();
-        $store->simpleStoreGet("meta_user_tags", ConfService::getRepository()->getId(), "serial", $data);
-        return $data;
-    }
-
-    protected function updateTags($tagString){
-        $store = ConfService::getConfStorageImpl();
-        if(!is_a($store, "sqlConfDriver")) return;
-        $tags = $this->loadTags();
-        $tags = array_merge($tags, array_map("trim", explode(",", $tagString)));
-        $tags = array_unique($tags);
-        $store->simpleStoreSet("meta_user_tags", ConfService::getRepository()->getId(), array_values($tags), "serial");
-    }
-
-}
diff --git a/core/src/plugins/meta.user/i18n/conf/cs.php b/core/src/plugins/meta.user/i18n/conf/cs.php
index 982e6a6841..76044a6df5 100644
--- a/core/src/plugins/meta.user/i18n/conf/cs.php
+++ b/core/src/plugins/meta.user/i18n/conf/cs.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Text Metadata" => "Textová metadata",
@@ -49,4 +49,4 @@
 "Visible" => "Visible",
 "Hidden" => "Hidden",
 "Tags (extensible sets of values)" => "Tags (extensible sets of values)",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/meta.user/i18n/conf/de.php b/core/src/plugins/meta.user/i18n/conf/de.php
index 7e1a869161..c7244a670f 100644
--- a/core/src/plugins/meta.user/i18n/conf/de.php
+++ b/core/src/plugins/meta.user/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Text Metadata" => "Zusätzliche Metadaten in Datei",
@@ -43,4 +43,4 @@
 "Additional info" => "Zusätzliche Info",
 "Depending on the field type. Currently used for selection only" => "Abhängig vom Typ des Feldes. Aktuell nur für Wertelisten verwendet.",
 "Tags (extensible sets of values)" => "Tags (extensible sets of values)",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/meta.user/i18n/conf/en.php b/core/src/plugins/meta.user/i18n/conf/en.php
index ca1e0d7f94..57a1e095d8 100644
--- a/core/src/plugins/meta.user/i18n/conf/en.php
+++ b/core/src/plugins/meta.user/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Text Metadata" => "Text Metadata",
@@ -43,4 +43,4 @@
 "Additional info" => "Additional info",
 "Depending on the field type. Currently used for selection only" => "Depending on the field type. Currently used for selection only",
 "Tags (extensible sets of values)" => "Tags (extensible sets of values)",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/meta.user/i18n/conf/fr.php b/core/src/plugins/meta.user/i18n/conf/fr.php
index d288b4f837..0b1c17d5ec 100644
--- a/core/src/plugins/meta.user/i18n/conf/fr.php
+++ b/core/src/plugins/meta.user/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Text Metadata" => "Métadonnées texte",
diff --git a/core/src/plugins/meta.user/i18n/conf/it.php b/core/src/plugins/meta.user/i18n/conf/it.php
index d77d2fc0cc..52e43b3f95 100644
--- a/core/src/plugins/meta.user/i18n/conf/it.php
+++ b/core/src/plugins/meta.user/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Text Metadata" => "Testo Metadata",
@@ -43,4 +43,4 @@
 "Additional info" => "Info Addizionali",
 "Depending on the field type. Currently used for selection only" => "In base al tipo di campo. Attualmente utilizzato solo per la selezione.",
 "Tags (extensible sets of values)" => "Tags (extensible sets of values)",
-);
\ No newline at end of file
+);
diff --git a/core/src/plugins/meta.user/i18n/conf/pt.php b/core/src/plugins/meta.user/i18n/conf/pt.php
index 62aec221d7..994e7a2413 100644
--- a/core/src/plugins/meta.user/i18n/conf/pt.php
+++ b/core/src/plugins/meta.user/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Text Metadata" => "Texto de Metadata",
diff --git a/core/src/plugins/meta.user/i18n/cs.php b/core/src/plugins/meta.user/i18n/cs.php
index 8a49325952..a83961efed 100644
--- a/core/src/plugins/meta.user/i18n/cs.php
+++ b/core/src/plugins/meta.user/i18n/cs.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "Meta data",
diff --git a/core/src/plugins/meta.user/i18n/de.php b/core/src/plugins/meta.user/i18n/de.php
index 9a4a47ceb8..10462e7850 100644
--- a/core/src/plugins/meta.user/i18n/de.php
+++ b/core/src/plugins/meta.user/i18n/de.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
  //	german translation: Axel Otterstätter <axel.otterstaetter@googlemail.com>
 //
diff --git a/core/src/plugins/meta.user/i18n/en.php b/core/src/plugins/meta.user/i18n/en.php
index bc1c9e3d68..daa74566b7 100644
--- a/core/src/plugins/meta.user/i18n/en.php
+++ b/core/src/plugins/meta.user/i18n/en.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "Meta Data",
diff --git a/core/src/plugins/meta.user/i18n/es.php b/core/src/plugins/meta.user/i18n/es.php
index d3d14ff3b9..4818ea6f15 100644
--- a/core/src/plugins/meta.user/i18n/es.php
+++ b/core/src/plugins/meta.user/i18n/es.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
  // spanish translation: Ion Rey Bakaikoa <ionrei@gmail.com>, 2010
 //---------------------------------------------------------------------------------------------------
diff --git a/core/src/plugins/meta.user/i18n/fi.php b/core/src/plugins/meta.user/i18n/fi.php
index fd891d9e50..9bd31ef19a 100644
--- a/core/src/plugins/meta.user/i18n/fi.php
+++ b/core/src/plugins/meta.user/i18n/fi.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
  //	Finnish translation by Aleksi Postari
 //	aleksi (at) postari.net
diff --git a/core/src/plugins/meta.user/i18n/fr.php b/core/src/plugins/meta.user/i18n/fr.php
index b2a0e213f2..f389235e48 100644
--- a/core/src/plugins/meta.user/i18n/fr.php
+++ b/core/src/plugins/meta.user/i18n/fr.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "Meta-données",
diff --git a/core/src/plugins/meta.user/i18n/it.php b/core/src/plugins/meta.user/i18n/it.php
index 5516454869..1e3ee0a02a 100644
--- a/core/src/plugins/meta.user/i18n/it.php
+++ b/core/src/plugins/meta.user/i18n/it.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "Meta Data",
diff --git a/core/src/plugins/meta.user/i18n/pt.php b/core/src/plugins/meta.user/i18n/pt.php
index be2daf753f..eeb4d98f59 100644
--- a/core/src/plugins/meta.user/i18n/pt.php
+++ b/core/src/plugins/meta.user/i18n/pt.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "MetaData",
diff --git a/core/src/plugins/meta.user/i18n/ru.php b/core/src/plugins/meta.user/i18n/ru.php
index 493d10e760..2adfc30ba6 100644
--- a/core/src/plugins/meta.user/i18n/ru.php
+++ b/core/src/plugins/meta.user/i18n/ru.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 $mess=array(
 "1" => "Метаданные",
diff --git a/core/src/plugins/meta.user/i18n/si.php b/core/src/plugins/meta.user/i18n/si.php
index 6a9a72dfe9..0871d9873b 100644
--- a/core/src/plugins/meta.user/i18n/si.php
+++ b/core/src/plugins/meta.user/i18n/si.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */// Slovenian translation: April 21 2011 by Vladimir Bohinc (vladimir.bohinc@gmail.com)
 //
 //---------------------------------------------------------------------------------------------------
diff --git a/core/src/plugins/meta.user/manifest.xml b/core/src/plugins/meta.user/manifest.xml
index b1992ab7f1..aca754fe12 100644
--- a/core/src/plugins/meta.user/manifest.xml
+++ b/core/src/plugins/meta.user/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <meta id="meta.user" label="CONF_MESSAGE[Text Metadata]" description="CONF_MESSAGE[Simple metadata implementation stored in a hidden file.]"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-	<class_definition filename="plugins/meta.user/class.UserMetaManager.php" classname="UserMetaManager"/>
+	<class_definition filename="plugins/meta.user/UserMetaManager.php" classname="Pydio\Access\Meta\UserGenerated\UserMetaManager"/>
 	<client_settings icon="plugins/access.mysql/resources/images/mysql_icon.png">
 		<resources>
 			<i18n namespace="meta.user" path="plugins/meta.user/i18n" />
@@ -22,8 +22,6 @@
 			<serverCallback hookName="node.change" methodName="updateMetaLocation" defer="true"/>
 		</hooks>
 		<client_configs>
-			<template_part ajxpId="search_container" ajxpClass="SearchEngine" ajxpOptions="{}"/>
-			<template_part ajxpId="search_container" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "fitMarginBottom":20}' theme="vision"/>
 			<template_part ajxpId="search_container" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "searchChooserAsResultsHeader":true, "openSearchInput":"true", "openSearchStickLeftTo":"topPane", "toggleResultsFitTo":"cpane_tabs", "fitMarginBottom":0, "toggleResultsOffsetRight":0, "toggleResultsOffsetTop":0, "detailThumbSize":24}' theme="orbit"/>
 			<component_config className="FilesList">
 				<columns><!-- Dynamically generated by the plugin  --></columns>
@@ -120,6 +118,6 @@
 	</registry_contributions>
 	<dependencies>
 		<!-- Wrapper type plugins only -->
-		<pluginClass pluginName="access.fs|access.ftp|access.demo|access.remote_fs"/>
+		<pluginClass pluginName="access.fs|access.ftp|access.demo"/>
 	</dependencies>
 </meta>
diff --git a/core/src/plugins/meta.watch/WatchRegister.php b/core/src/plugins/meta.watch/WatchRegister.php
new file mode 100644
index 0000000000..64c2087135
--- /dev/null
+++ b/core/src/plugins/meta.watch/WatchRegister.php
@@ -0,0 +1,591 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Meta\Watch;
+
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Access\Meta\Core\AbstractMetaSource;
+use Pydio\Access\Metastore\Core\IMetaStoreProvider;
+use Pydio\Notification\Core\Notification;
+use Pydio\Notification\Core\NotificationCenter;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Keep an eye on a folder to be alerted when something changes inside it
+ * @package AjaXplorer_Plugins
+ * @subpackage Meta
+ */
+class WatchRegister extends AbstractMetaSource
+{
+    public static $META_WATCH_CHANGE = "META_WATCH_CHANGE";
+    public static $META_WATCH_READ = "META_WATCH_READ";
+    public static $META_WATCH_BOTH = "META_WATCH_BOTH";
+    public static $META_WATCH_NAMESPACE = "META_WATCH";
+
+    public static $META_WATCH_USERS_READ = "META_WATCH_USERS_READ";
+    public static $META_WATCH_USERS_CHANGE = "META_WATCH_USERS_CHANGE";
+    public static $META_WATCH_USERS_NAMESPACE = "META_WATCH_USERS";
+
+    /**
+     * @var IMetaStoreProvider
+     */
+    protected $metaStore;
+
+    /**
+     * @var NotificationCenter
+     */
+    protected $notificationCenter;
+
+    /**
+     * @param ContextInterface $ctx
+     * @param AbstractAccessDriver $accessDriver
+     * @throws PydioException
+     */
+    public function initMeta(ContextInterface $ctx, AbstractAccessDriver $accessDriver)
+    {
+        parent::initMeta($ctx, $accessDriver);
+        $this->notificationCenter = PluginsService::getInstance($ctx)->getPluginById("core.notifications");
+        $store = PluginsService::getInstance($ctx)->getUniqueActivePluginForType("metastore");
+        if ($store === false) {
+            throw new PydioException("The 'meta.watch' plugin requires at least one active 'metastore' plugin");
+        }
+        $this->metaStore = $store;
+        $this->metaStore->initMeta($ctx, $accessDriver);
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     * @param string $userId
+     * @param string $watchType
+     * @param array $targetUsers Optional list of specific users to watch
+     */
+    public function setWatchOnFolder($node, $userId, $watchType, $targetUsers = array())
+    {
+        if ( ($watchType == self::$META_WATCH_USERS_READ || $watchType == self::$META_WATCH_USERS_CHANGE ) && count($targetUsers)) {
+            $usersMeta = $this->metaStore->retrieveMetadata($node, self::$META_WATCH_USERS_NAMESPACE);
+            if (is_array($usersMeta) && is_array($usersMeta[$watchType]) && is_array($usersMeta[$watchType][$userId])) {
+                $usersMeta[$watchType][$userId] = array_merge($usersMeta[$watchType][$userId], $targetUsers);
+            } else {
+                if(!is_array($usersMeta)) $usersMeta = array();
+                if(!is_array($usersMeta[$watchType])) $usersMeta[$watchType] = array();
+                $usersMeta[$watchType][$userId] = $targetUsers;
+            }
+            $this->metaStore->setMetadata(
+                $node,
+                self::$META_WATCH_USERS_NAMESPACE,
+                $usersMeta,
+                false,
+                AJXP_METADATA_SCOPE_REPOSITORY
+            );
+        } else {
+            $meta = $this->metaStore->retrieveMetadata(
+                $node,
+                self::$META_WATCH_NAMESPACE,
+                false,
+                AJXP_METADATA_SCOPE_REPOSITORY
+            );
+            if (isSet($meta) && isSet($meta[$userId])) {
+                unset($meta[$userId]);
+                $this->metaStore->removeMetadata(
+                    $node,
+                    self::$META_WATCH_NAMESPACE,
+                    false,
+                    AJXP_METADATA_SCOPE_REPOSITORY
+                );
+            }
+            $meta[$userId] = $watchType;
+            if (count($meta)) {
+                $this->metaStore->setMetadata(
+                    $node,
+                    self::$META_WATCH_NAMESPACE,
+                    $meta,
+                    false,
+                    AJXP_METADATA_SCOPE_REPOSITORY
+                );
+            }
+        }
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     * @param $userId
+     * @param bool $clearUsers
+     * @param bool $targetUserId
+     */
+    public function removeWatchFromFolder($node, $userId, $clearUsers = false, $targetUserId = false)
+    {
+        if ($clearUsers) {
+            $usersMeta = $this->metaStore->retrieveMetadata(
+                $node,
+                self::$META_WATCH_USERS_NAMESPACE,
+                false,
+                AJXP_METADATA_SCOPE_REPOSITORY
+            );
+
+            // WEIRD / WILL IT REMOVE OTHER PEOPLE WATCHES??
+            if (isSet($usersMeta) && (isSet($usersMeta[self::$META_WATCH_USERS_CHANGE][$userId]) || isSet($usersMeta[self::$META_WATCH_USERS_READ][$userId]))) {
+
+                if ($targetUserId != false) {
+                    if (isSet($usersMeta[self::$META_WATCH_USERS_CHANGE][$userId])) {
+                        $c = $usersMeta[self::$META_WATCH_USERS_CHANGE][$userId];
+                        if(in_array($targetUserId, $c)) $c = array_diff($c, array($targetUserId));
+                        if(count($c)) $usersMeta[self::$META_WATCH_USERS_CHANGE][$userId] = $c;
+                        else unset($usersMeta[self::$META_WATCH_USERS_CHANGE][$userId]);
+                    }
+                    if (isSet($usersMeta[self::$META_WATCH_USERS_READ][$userId])) {
+                        $c = $usersMeta[self::$META_WATCH_USERS_READ][$userId];
+                        if(in_array($targetUserId, $c)) $c = array_diff($c, array($targetUserId));
+                        if(count($c)) $usersMeta[self::$META_WATCH_USERS_READ][$userId] = $c;
+                        else unset($usersMeta[self::$META_WATCH_USERS_READ][$userId]);
+                    }
+                    $this->metaStore->setMetadata($node, self::$META_WATCH_USERS_NAMESPACE, $usersMeta, false, AJXP_METADATA_SCOPE_REPOSITORY);
+
+                } else {
+
+                    $this->metaStore->removeMetadata(
+                        $node,
+                        self::$META_WATCH_USERS_NAMESPACE,
+                        false,
+                        AJXP_METADATA_SCOPE_REPOSITORY);
+
+                }
+
+            }
+        } else {
+
+            $meta = $this->metaStore->retrieveMetadata(
+                $node,
+                self::$META_WATCH_NAMESPACE,
+                false,
+                AJXP_METADATA_SCOPE_REPOSITORY
+            );
+            if (isSet($meta) && isSet($meta[$userId])) {
+                $this->metaStore->removeMetadata(
+                    $node,
+                    self::$META_WATCH_NAMESPACE,
+                    false,
+                    AJXP_METADATA_SCOPE_REPOSITORY
+                );
+            }
+
+        }
+
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     * @param $userId
+     * @param string $ns Watch namespace
+     * @param array $result
+     * @return string|bool the type of watch
+     */
+    public function hasWatchOnNode($node, $userId, $ns = "META_WATCH", &$result = array())
+    {
+        $meta = $this->metaStore->retrieveMetadata(
+            $node,
+            $ns,
+            false,
+            AJXP_METADATA_SCOPE_REPOSITORY
+        );
+        if ($ns == self::$META_WATCH_USERS_NAMESPACE) {
+            if (isSet($meta[self::$META_WATCH_USERS_READ]) && isSet($meta[self::$META_WATCH_USERS_READ][$userId])) {
+                $result = $meta[self::$META_WATCH_USERS_READ][$userId];
+                return self::$META_WATCH_USERS_READ;
+            }
+            if (isSet($meta[self::$META_WATCH_USERS_CHANGE]) && isSet($meta[self::$META_WATCH_USERS_CHANGE][$userId])) {
+                $result = $meta[self::$META_WATCH_USERS_CHANGE][$userId];
+                return self::$META_WATCH_USERS_CHANGE;
+            }
+            return false;
+        } else if (isSet($meta) && isSet($meta[$userId])) {
+            return $meta[$userId];
+        } else {
+            return false;
+        }
+
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     * @param String $watchType
+     * @return array
+     */
+    public function collectWatches($node, $watchType)
+    {
+        $currentUserId = "shared";
+        $ctx = $node->getContext();
+        if ($ctx->hasUser()) {
+            $currentUserId = $ctx->getUser()->getId();
+        }
+        $result = array();
+        $result["node"] = $this->getWatchesOnNode($node, $watchType, $currentUserId);
+
+        $ancestors = array();
+        $node->collectMetadatasInParents(
+            array(self::$META_WATCH_NAMESPACE,self::$META_WATCH_USERS_NAMESPACE),
+            false,
+            AJXP_METADATA_SCOPE_REPOSITORY,
+            false,
+            $ancestors
+        );
+
+        $result["ancestors"] = array();
+        foreach($ancestors as $nodeMeta){
+            $source = $nodeMeta["SOURCE_NODE"];
+            $watchMeta = isSet($nodeMeta[self::$META_WATCH_NAMESPACE]) ? $nodeMeta[self::$META_WATCH_NAMESPACE] : false;
+            $usersMeta = isSet($nodeMeta[self::$META_WATCH_USERS_NAMESPACE]) ? $nodeMeta[self::$META_WATCH_USERS_NAMESPACE] : false;
+            $ids = $this->loadWatchesFromMeta($watchType, $currentUserId, $source, $watchMeta, $usersMeta);
+            foreach($ids as $id){
+                // Do not send notification to myself!
+                if($id !== $currentUserId){
+                    $result["ancestors"][] = array("node" => $source, "id" => $id);
+                }
+            }
+        }
+
+        return $result;
+    }
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     * @param String $watchType
+     * @param String $userId
+     * @return array
+     */
+    public function getWatchesOnNode($node, $watchType, $userId = null)
+    {
+        $ctx = $node->getContext();
+        if($userId == null){
+            $currentUserId = "shared";
+            if ($ctx->hasUser()) {
+                $currentUserId = $ctx->getUser()->getId();
+            }
+        }else{
+            $currentUserId = $userId;
+        }
+        $meta = $node->retrieveMetadata(
+            self::$META_WATCH_NAMESPACE,
+            false,
+            AJXP_METADATA_SCOPE_REPOSITORY
+        );
+        $usersMeta = false;
+        if ($currentUserId != 'shared') {
+            $usersMeta = $node->retrieveMetadata(
+                self::$META_WATCH_USERS_NAMESPACE,
+                false,
+                AJXP_METADATA_SCOPE_REPOSITORY
+            );
+        }
+        return $this->loadWatchesFromMeta($watchType, $currentUserId, $node, $meta, $usersMeta);
+    }
+
+    /**
+     * @param String $watchType
+     * @param String $currentUserId
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     * @param array|bool $watchMeta
+     * @param array|bool $usersMeta
+     * @return array
+     */
+    private function loadWatchesFromMeta($watchType, $currentUserId, $node, $watchMeta = false, $usersMeta = false){
+        $IDS = array();
+        if($usersMeta !== false){
+            if ($watchType == self::$META_WATCH_CHANGE && isSet($usersMeta[self::$META_WATCH_USERS_CHANGE])) {
+                $usersMeta = $usersMeta[self::$META_WATCH_USERS_CHANGE];
+            } else if ($watchType == self::$META_WATCH_READ && isSet($usersMeta[self::$META_WATCH_USERS_READ])) {
+                $usersMeta = $usersMeta[self::$META_WATCH_USERS_READ];
+            } else {
+                $usersMeta = null;
+            }
+        }
+
+        if (!empty($watchMeta) && is_array($watchMeta)) {
+            foreach ($watchMeta as $id => $type) {
+                if ($type == $watchType || $type == self::$META_WATCH_BOTH) {
+                    $IDS[] = $id;
+                }
+            }
+        }
+        if (!empty($usersMeta) && is_array($usersMeta)) {
+            foreach ($usersMeta as $id => $targetUsers) {
+                if (in_array($currentUserId, $targetUsers)) {
+                    $IDS[] = $id;
+                }
+            }
+        }
+        if (count($IDS)) {
+            $changes = false;
+            foreach ($IDS as $index => $id) {
+                if ($currentUserId == $id && !AJXP_SERVER_DEBUG) {
+                    // In non-debug mode, do not send notifications to watcher!
+                    unset($IDS[$index]);
+                    continue;
+                }
+                if (!UsersService::userExists($id)) {
+                    unset($IDS[$index]);
+                    if(is_array($watchMeta)){
+                        $changes = true;
+                        $watchMeta[$id] = AJXP_VALUE_CLEAR;
+                    }
+                }else{
+                    // Make sure the user is still authorized on this node, otherwise remove it.
+                    $uObject = UsersService::getUserById($id, false);
+                    $acl = $uObject->getMergedRole()->getAcl($node->getRepositoryId());
+                    $isOwner = ($node->getRepository()->getOwner() == $uObject->getId());
+                    if(!$isOwner && (empty($acl) || strpos($acl, "r") === FALSE)){
+                        unset($IDS[$index]);
+                        if(is_array($watchMeta)){
+                            $changes = true;
+                            $watchMeta[$id] = AJXP_VALUE_CLEAR;
+                        }
+                    }
+                }
+            }
+            if ($changes) {
+                $node->setMetadata(
+                    self::$META_WATCH_NAMESPACE,
+                    $watchMeta,
+                    false,
+                    AJXP_METADATA_SCOPE_REPOSITORY
+                );
+            }
+        }
+        return $IDS;
+    }
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     */
+    public function switchActions(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface)
+    {
+        $actionName = $requestInterface->getAttribute("action");
+        $httpVars = $requestInterface->getParsedBody();
+        if($actionName !== "toggle_watch") return;
+        /** @var ContextInterface $ctx */
+        $ctx = $requestInterface->getAttribute("ctx");
+
+        $us = UserSelection::fromContext($ctx, $httpVars);
+        $node = $us->getUniqueNode();
+        $node->loadNodeInfo();
+        $cmd = $httpVars["watch_action"];
+
+        $meta = $this->metaStore->retrieveMetadata(
+            $node,
+            self::$META_WATCH_NAMESPACE,
+            false,
+            AJXP_METADATA_SCOPE_REPOSITORY
+        );
+        $userId = $ctx->hasUser() ? $ctx->getUser()->getId() : "shared";
+
+        if($node->isRoot() && $node->getRepository()->hasParent() && $cmd == "watch_stop" && !(isSet($meta) && isSet($meta[$userId]))){
+            $usersMeta = $this->metaStore->retrieveMetadata(
+                $node,
+                self::$META_WATCH_USERS_NAMESPACE,
+                false,
+                AJXP_METADATA_SCOPE_REPOSITORY);
+            if(is_array($usersMeta) && array_key_exists(self::$META_WATCH_USERS_CHANGE, $usersMeta) && array_key_exists($userId,$usersMeta[self::$META_WATCH_USERS_CHANGE])) {
+                unset($usersMeta[self::$META_WATCH_USERS_CHANGE][$userId]);
+                $this->metaStore->setMetadata(
+                    $node,
+                    self::$META_WATCH_USERS_NAMESPACE,
+                    $usersMeta,
+                    false,
+                    AJXP_METADATA_SCOPE_REPOSITORY
+                );
+            }
+        } else if ($cmd == "watch_stop" && isSet($meta) && isSet($meta[$userId])) {
+            unset($meta[$userId]);
+            $this->metaStore->removeMetadata(
+                $node,
+                self::$META_WATCH_NAMESPACE,
+                false,
+                AJXP_METADATA_SCOPE_REPOSITORY
+            );
+        } else {
+            switch ($cmd) {
+                case "watch_change": $type = self::$META_WATCH_CHANGE;break;
+                case "watch_read": $type = self::$META_WATCH_READ; break;
+                case "watch_both": $type = self::$META_WATCH_BOTH; break;
+                default: $type = self::$META_WATCH_BOTH; break;
+            }
+            $meta[$userId] = $type;
+            $this->metaStore->setMetadata(
+                $node,
+                self::$META_WATCH_NAMESPACE,
+                $meta,
+                false,
+                AJXP_METADATA_SCOPE_REPOSITORY
+            );
+        }
+
+        $node->metadata = array();
+        $node->loadNodeInfo(true, false, "all");
+        $this->enrichNode($node);
+        $nodesDiff = new \Pydio\Access\Core\Model\NodesDiff();
+        $nodesDiff->update($node);
+        $x = new \Pydio\Core\Http\Response\SerializableResponseStream();
+        $x->addChunk($nodesDiff);
+        $responseInterface = $responseInterface->withBody($x);
+
+    }
+
+
+    /**
+     * @param AJXP_Node|null $oldNode
+     * @param AJXP_Node|null $newNode
+     * @param bool $copy
+     */
+    public function processChangeHook(AJXP_Node $oldNode=null, AJXP_Node $newNode=null, $copy = false)
+    {
+        $newNotif = $this->notificationCenter->generateNotificationFromChangeHook($oldNode, $newNode, $copy, "new");
+        if ($newNotif !== false && $newNotif->getNode() !== false) {
+            $this->processActiveHook($newNotif, self::$META_WATCH_CHANGE, AJXP_NOTIF_NODE_CHANGE);
+        }
+        if($oldNode != null && $newNode != null && $oldNode->getUrl() == $newNode->getUrl()) return;
+        $oldNotif =  $this->notificationCenter->generateNotificationFromChangeHook($oldNode, $newNode, $copy, "old");
+        if ($oldNotif !== false && $oldNotif->getNode() !== false) {
+            $this->processActiveHook($oldNotif, self::$META_WATCH_CHANGE, AJXP_NOTIF_NODE_CHANGE);
+        }
+
+        $this->updateMetaLocation($oldNode, $newNode, $copy);
+
+    }
+
+    /**
+     * @param AJXP_Node $node
+     */
+    public function processReadHook(AJXP_Node $node)
+    {
+        $notification = new Notification();
+        $notification->setAction(AJXP_NOTIF_NODE_VIEW);
+        $notification->setNode($node);
+        $this->processActiveHook($notification, self::$META_WATCH_READ);
+
+    }
+
+    /**
+     * @param Notification $notification
+     * @param $namespace
+     * @param null $parentActionType
+     */
+    private function processActiveHook(Notification $notification, $namespace, $parentActionType = null){
+        $origNode = $notification->getNode();
+        $node = new AJXP_Node($origNode->getUrl());
+        $all = $this->collectWatches($node, $namespace);
+        if($node->isRoot() && $node->getRepository() !== null && $node->getRepository()->hasContentFilter()){
+            $node->setLeaf(true);
+        }else{
+            $node->setLeaf(false);
+        }
+        foreach($all["node"] as $id) {
+            $this->notificationCenter->postNotification($notification, $id);
+        }
+        foreach($all["ancestors"] as $pair){
+            $parentNotification = new Notification();
+            /**
+             * @var \Pydio\Access\Core\Model\AJXP_Node $parentNode
+             */
+            $parentNode = $pair["node"];
+            if($parentNode->isRoot() && $parentNode->getRepository() !== null && $parentNode->getRepository()->hasContentFilter()){
+                $parentNode->setLeaf(true);
+            }else{
+                $parentNode->setLeaf(false);
+            }
+            $parentNotification->setNode($parentNode);
+            if($parentActionType == null){
+                $parentNotification->setAction($notification->getAction());
+            }else{
+                $parentNotification->setAction($parentActionType);
+            }
+            $this->notificationCenter->prepareNotification($notification);
+            $parentNotification->addRelatedNotification($notification);
+            $this->notificationCenter->postNotification($parentNotification, $pair["id"]);
+        }
+    }
+
+    /**
+     * @param AJXP_Node $node
+     */
+    public function enrichNode(&$node)
+    {
+        if(!$node->getContext()->hasUser()) {
+            return;
+        }
+        $meta = $this->metaStore->retrieveMetadata(
+            $node,
+            self::$META_WATCH_NAMESPACE,
+            false,
+            AJXP_METADATA_SCOPE_REPOSITORY);
+        $userId = $node->getContext()->getUser()->getId();
+        if(is_array($meta) && array_key_exists($userId, $meta)){
+            $node->mergeMetadata(array(
+                "meta_watched" => $meta[$userId],
+                "overlay_icon" => "meta.watch/ICON_SIZE/watch.png",
+                "overlay_class" => "icon-eye-open"
+            ), true);
+        }else if($node->isRoot() && $node->getRepository()->hasParent()){
+            $usersMeta = $this->metaStore->retrieveMetadata(
+                $node,
+                self::$META_WATCH_USERS_NAMESPACE,
+                false,
+                AJXP_METADATA_SCOPE_REPOSITORY);
+            if(is_array($usersMeta) && array_key_exists(self::$META_WATCH_USERS_CHANGE, $usersMeta) && array_key_exists($userId,$usersMeta[self::$META_WATCH_USERS_CHANGE])) {
+                $node->mergeMetadata(array(
+                    "meta_watched" => self::$META_WATCH_CHANGE,
+                    "overlay_icon" => "meta.watch/ICON_SIZE/watch.png",
+                    "overlay_class" => "icon-eye-open"
+                ), true);
+            }
+        }
+    }
+
+    /**
+     *
+     * @param \Pydio\Access\Core\Model\AJXP_Node $oldFile
+     * @param \Pydio\Access\Core\Model\AJXP_Node $newFile
+     * @param Boolean $copy
+     */
+    public function updateMetaLocation($oldFile, $newFile = null, $copy = false)
+    {
+        if($oldFile == null) return;
+        if(!$copy && $this->metaStore->inherentMetaMove()) return;
+
+        $oldMeta = $this->metaStore->retrieveMetadata($oldFile, self::$META_WATCH_NAMESPACE, false, AJXP_METADATA_SCOPE_REPOSITORY);
+        if (count($oldMeta)) {
+            // If it's a move or a delete, delete old data
+            if (!$copy) {
+                $this->metaStore->removeMetadata($oldFile, self::$META_WATCH_NAMESPACE, false, AJXP_METADATA_SCOPE_REPOSITORY);
+            }
+            // If copy or move, copy data.
+            if ($newFile != null) {
+                $this->metaStore->setMetadata($newFile, self::$META_WATCH_NAMESPACE, $oldMeta, false, AJXP_METADATA_SCOPE_REPOSITORY);
+            }
+        }
+
+    }
+
+}
diff --git a/core/src/plugins/meta.watch/class.MetaWatchRegister.php b/core/src/plugins/meta.watch/class.MetaWatchRegister.php
deleted file mode 100755
index 935fdbcde3..0000000000
--- a/core/src/plugins/meta.watch/class.MetaWatchRegister.php
+++ /dev/null
@@ -1,525 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Keep an eye on a folder to be alerted when something changes inside it
- * @package AjaXplorer_Plugins
- * @subpackage Meta
- */
-class MetaWatchRegister extends AJXP_AbstractMetaSource
-{
-    public static $META_WATCH_CHANGE = "META_WATCH_CHANGE";
-    public static $META_WATCH_READ = "META_WATCH_READ";
-    public static $META_WATCH_BOTH = "META_WATCH_BOTH";
-    public static $META_WATCH_NAMESPACE = "META_WATCH";
-
-    public static $META_WATCH_USERS_READ = "META_WATCH_USERS_READ";
-    public static $META_WATCH_USERS_CHANGE = "META_WATCH_USERS_CHANGE";
-    public static $META_WATCH_USERS_NAMESPACE = "META_WATCH_USERS";
-
-    /**
-     * @var MetaStoreProvider
-     */
-    protected $metaStore;
-
-    /**
-     * @var AJXP_NotificationCenter
-     */
-    protected $notificationCenter;
-
-    public function initMeta($accessDriver)
-    {
-        parent::initMeta($accessDriver);
-        $this->notificationCenter = AJXP_PluginsService::findPluginById("core.notifications");
-        $store = AJXP_PluginsService::getInstance()->getUniqueActivePluginForType("metastore");
-        if ($store === false) {
-            throw new Exception("The 'meta.watch' plugin requires at least one active 'metastore' plugin");
-        }
-        $this->metaStore = $store;
-        $this->metaStore->initMeta($accessDriver);
-    }
-
-    /**
-     * @param AJXP_Node $node
-     * @param string $userId
-     * @param string $watchType
-     * @param array $targetUsers Optional list of specific users to watch
-     */
-    public function setWatchOnFolder($node, $userId, $watchType, $targetUsers = array())
-    {
-        if ( ($watchType == self::$META_WATCH_USERS_READ || $watchType == self::$META_WATCH_USERS_CHANGE ) && count($targetUsers)) {
-            $usersMeta = $this->metaStore->retrieveMetadata($node, self::$META_WATCH_USERS_NAMESPACE);
-            if (is_array($usersMeta) && is_array($usersMeta[$watchType]) && is_array($usersMeta[$watchType][$userId])) {
-                $usersMeta[$watchType][$userId] = array_merge($usersMeta[$watchType][$userId], $targetUsers);
-            } else {
-                if(!is_array($usersMeta)) $usersMeta = array();
-                if(!is_array($usersMeta[$watchType])) $usersMeta[$watchType] = array();
-                $usersMeta[$watchType][$userId] = $targetUsers;
-            }
-            $this->metaStore->setMetadata(
-                $node,
-                self::$META_WATCH_USERS_NAMESPACE,
-                $usersMeta,
-                false,
-                AJXP_METADATA_SCOPE_REPOSITORY
-            );
-        } else {
-            $meta = $this->metaStore->retrieveMetadata(
-                $node,
-                self::$META_WATCH_NAMESPACE,
-                false,
-                AJXP_METADATA_SCOPE_REPOSITORY
-            );
-            if (isSet($meta) && isSet($meta[$userId])) {
-                unset($meta[$userId]);
-                $this->metaStore->removeMetadata(
-                    $node,
-                    self::$META_WATCH_NAMESPACE,
-                    false,
-                    AJXP_METADATA_SCOPE_REPOSITORY
-                );
-            }
-            $meta[$userId] = $watchType;
-            if (count($meta)) {
-                $this->metaStore->setMetadata(
-                    $node,
-                    self::$META_WATCH_NAMESPACE,
-                    $meta,
-                    false,
-                    AJXP_METADATA_SCOPE_REPOSITORY
-                );
-            }
-        }
-    }
-
-    /**
-     * @param AJXP_Node $node
-     * @param $userId
-     * @param bool $clearUsers
-     * @param bool $targetUserId
-     */
-    public function removeWatchFromFolder($node, $userId, $clearUsers = false, $targetUserId = false)
-    {
-        if ($clearUsers) {
-            $usersMeta = $this->metaStore->retrieveMetadata(
-                $node,
-                self::$META_WATCH_USERS_NAMESPACE,
-                false,
-                AJXP_METADATA_SCOPE_REPOSITORY
-            );
-
-            // WEIRD / WILL IT REMOVE OTHER PEOPLE WATCHES??
-            if (isSet($usersMeta) && (isSet($usersMeta[self::$META_WATCH_USERS_CHANGE][$userId]) || isSet($usersMeta[self::$META_WATCH_USERS_READ][$userId]))) {
-
-                if ($targetUserId != false) {
-                    if (isSet($usersMeta[self::$META_WATCH_USERS_CHANGE][$userId])) {
-                        $c = $usersMeta[self::$META_WATCH_USERS_CHANGE][$userId];
-                        if(in_array($targetUserId, $c)) $c = array_diff($c, array($targetUserId));
-                        if(count($c)) $usersMeta[self::$META_WATCH_USERS_CHANGE][$userId] = $c;
-                        else unset($usersMeta[self::$META_WATCH_USERS_CHANGE][$userId]);
-                    }
-                    if (isSet($usersMeta[self::$META_WATCH_USERS_READ][$userId])) {
-                        $c = $usersMeta[self::$META_WATCH_USERS_READ][$userId];
-                        if(in_array($targetUserId, $c)) $c = array_diff($c, array($targetUserId));
-                        if(count($c)) $usersMeta[self::$META_WATCH_USERS_READ][$userId] = $c;
-                        else unset($usersMeta[self::$META_WATCH_USERS_READ][$userId]);
-                    }
-                    $this->metaStore->setMetadata($node, self::$META_WATCH_USERS_NAMESPACE, $usersMeta, false, AJXP_METADATA_SCOPE_REPOSITORY);
-
-                } else {
-
-                    $this->metaStore->removeMetadata(
-                        $node,
-                        self::$META_WATCH_USERS_NAMESPACE,
-                        false,
-                        AJXP_METADATA_SCOPE_REPOSITORY);
-
-                }
-
-            }
-        } else {
-
-            $meta = $this->metaStore->retrieveMetadata(
-                $node,
-                self::$META_WATCH_NAMESPACE,
-                false,
-                AJXP_METADATA_SCOPE_REPOSITORY
-            );
-            if (isSet($meta) && isSet($meta[$userId])) {
-                $this->metaStore->removeMetadata(
-                    $node,
-                    self::$META_WATCH_NAMESPACE,
-                    false,
-                    AJXP_METADATA_SCOPE_REPOSITORY
-                );
-            }
-
-        }
-
-    }
-
-    /**
-     * @param AJXP_Node $node
-     * @param $userId
-     * @param string $ns Watch namespace
-     * @param array $result
-     * @return string|bool the type of watch
-     */
-    public function hasWatchOnNode($node, $userId, $ns = "META_WATCH", &$result = array())
-    {
-        $meta = $this->metaStore->retrieveMetadata(
-            $node,
-            $ns,
-            false,
-            AJXP_METADATA_SCOPE_REPOSITORY
-        );
-        if ($ns == self::$META_WATCH_USERS_NAMESPACE) {
-            if (isSet($meta[self::$META_WATCH_USERS_READ]) && isSet($meta[self::$META_WATCH_USERS_READ][$userId])) {
-                $result = $meta[self::$META_WATCH_USERS_READ][$userId];
-                return self::$META_WATCH_USERS_READ;
-            }
-            if (isSet($meta[self::$META_WATCH_USERS_CHANGE]) && isSet($meta[self::$META_WATCH_USERS_CHANGE][$userId])) {
-                $result = $meta[self::$META_WATCH_USERS_CHANGE][$userId];
-                return self::$META_WATCH_USERS_CHANGE;
-            }
-            return false;
-        } else if (isSet($meta) && isSet($meta[$userId])) {
-            return $meta[$userId];
-        } else {
-            return false;
-        }
-
-    }
-
-    /**
-     * @param AJXP_Node $node
-     * @param String $watchType
-     * @return array
-     */
-    public function collectWatches($node, $watchType)
-    {
-        $currentUserId = "shared";
-        if (AuthService::getLoggedUser() != null) {
-            $currentUserId = AuthService::getLoggedUser()->getId();
-        }
-        $result = array();
-        $result["node"] = $this->getWatchesOnNode($node, $watchType, $currentUserId);
-
-        $ancestors = array();
-        $node->collectMetadatasInParents(
-            array(self::$META_WATCH_NAMESPACE,self::$META_WATCH_USERS_NAMESPACE),
-            false,
-            AJXP_METADATA_SCOPE_REPOSITORY,
-            false,
-            $ancestors
-        );
-
-        $result["ancestors"] = array();
-        foreach($ancestors as $nodeMeta){
-            $source = $nodeMeta["SOURCE_NODE"];
-            $watchMeta = isSet($nodeMeta[self::$META_WATCH_NAMESPACE]) ? $nodeMeta[self::$META_WATCH_NAMESPACE] : false;
-            $usersMeta = isSet($nodeMeta[self::$META_WATCH_USERS_NAMESPACE]) ? $nodeMeta[self::$META_WATCH_USERS_NAMESPACE] : false;
-            $ids = $this->loadWatchesFromMeta($watchType, $currentUserId, $source, $watchMeta, $usersMeta);
-            foreach($ids as $id){
-                // Do not send notification to myself!
-                if($id !== $currentUserId){
-                    $result["ancestors"][] = array("node" => $source, "id" => $id);
-                }
-            }
-        }
-
-        return $result;
-    }
-    /**
-     * @param AJXP_Node $node
-     * @param String $watchType
-     * @param String $userId
-     * @return array
-     */
-    public function getWatchesOnNode($node, $watchType, $userId = null)
-    {
-        if($userId == null){
-            $currentUserId = "shared";
-            if (AuthService::getLoggedUser() != null) {
-                $currentUserId = AuthService::getLoggedUser()->getId();
-            }
-        }else{
-            $currentUserId = $userId;
-        }
-        $meta = $node->retrieveMetadata(
-            self::$META_WATCH_NAMESPACE,
-            false,
-            AJXP_METADATA_SCOPE_REPOSITORY
-        );
-        $usersMeta = false;
-        if ($currentUserId != 'shared') {
-            $usersMeta = $node->retrieveMetadata(
-                self::$META_WATCH_USERS_NAMESPACE,
-                false,
-                AJXP_METADATA_SCOPE_REPOSITORY
-            );
-        }
-        return $this->loadWatchesFromMeta($watchType, $currentUserId, $node, $meta, $usersMeta);
-    }
-
-    /**
-     * @param String $watchType
-     * @param String $currentUserId
-     * @param AJXP_Node $node
-     * @param array|bool $watchMeta
-     * @param array|bool $usersMeta
-     * @return array
-     */
-    private function loadWatchesFromMeta($watchType, $currentUserId, $node, $watchMeta = false, $usersMeta = false){
-        $IDS = array();
-        if($usersMeta !== false){
-            if ($watchType == self::$META_WATCH_CHANGE && isSet($usersMeta[self::$META_WATCH_USERS_CHANGE])) {
-                $usersMeta = $usersMeta[self::$META_WATCH_USERS_CHANGE];
-            } else if ($watchType == self::$META_WATCH_READ && isSet($usersMeta[self::$META_WATCH_USERS_READ])) {
-                $usersMeta = $usersMeta[self::$META_WATCH_USERS_READ];
-            } else {
-                $usersMeta = null;
-            }
-        }
-
-        if (!empty($watchMeta) && is_array($watchMeta)) {
-            foreach ($watchMeta as $id => $type) {
-                if ($type == $watchType || $type == self::$META_WATCH_BOTH) {
-                    $IDS[] = $id;
-                }
-            }
-        }
-        if (!empty($usersMeta) && is_array($usersMeta)) {
-            foreach ($usersMeta as $id => $targetUsers) {
-                if (in_array($currentUserId, $targetUsers)) {
-                    $IDS[] = $id;
-                }
-            }
-        }
-        if (count($IDS)) {
-            $changes = false;
-            foreach ($IDS as $index => $id) {
-                if ($currentUserId == $id && !AJXP_SERVER_DEBUG) {
-                    // In non-debug mode, do not send notifications to watcher!
-                    unset($IDS[$index]);
-                    continue;
-                }
-                if (!AuthService::userExists($id)) {
-                    unset($IDS[$index]);
-                    if(is_array($watchMeta)){
-                        $changes = true;
-                        $watchMeta[$id] = AJXP_VALUE_CLEAR;
-                    }
-                }else{
-                    // Make sure the user is still authorized on this node, otherwise remove it.
-                    $uObject = ConfService::getConfStorageImpl()->createUserObject($id);
-                    $acl = $uObject->mergedRole->getAcl($node->getRepositoryId());
-                    $isOwner = ($node->getRepository()->getOwner() == $uObject->getId());
-                    if(!$isOwner && (empty($acl) || strpos($acl, "r") === FALSE)){
-                        unset($IDS[$index]);
-                        if(is_array($watchMeta)){
-                            $changes = true;
-                            $watchMeta[$id] = AJXP_VALUE_CLEAR;
-                        }
-                    }
-                }
-            }
-            if ($changes) {
-                $node->setMetadata(
-                    self::$META_WATCH_NAMESPACE,
-                    $watchMeta,
-                    false,
-                    AJXP_METADATA_SCOPE_REPOSITORY
-                );
-            }
-        }
-        return $IDS;
-    }
-
-    public function switchActions($actionName, $httpVars, $fileVars)
-    {
-        switch ($actionName) {
-
-            case "toggle_watch":
-
-                $us = new UserSelection($this->accessDriver->repository, $httpVars);
-                $node = $us->getUniqueNode();
-                $node->loadNodeInfo();
-                $cmd = $httpVars["watch_action"];
-
-                $meta = $this->metaStore->retrieveMetadata(
-                    $node,
-                    self::$META_WATCH_NAMESPACE,
-                    false,
-                    AJXP_METADATA_SCOPE_REPOSITORY
-                );
-                $userId = AuthService::getLoggedUser()!= null ? AuthService::getLoggedUser()->getId() : "shared";
-
-                if ($cmd == "watch_stop" && isSet($meta) && isSet($meta[$userId])) {
-                    unset($meta[$userId]);
-                    $this->metaStore->removeMetadata(
-                        $node,
-                        self::$META_WATCH_NAMESPACE,
-                        false,
-                        AJXP_METADATA_SCOPE_REPOSITORY
-                    );
-                } else {
-                    switch ($cmd) {
-                        case "watch_change": $type = self::$META_WATCH_CHANGE;break;
-                        case "watch_read": $type = self::$META_WATCH_READ; break;
-                        case "watch_both": $type = self::$META_WATCH_BOTH; break;
-                        default: break;
-                    }
-                    $meta[$userId] = $type;
-                    $this->metaStore->setMetadata(
-                        $node,
-                        self::$META_WATCH_NAMESPACE,
-                        $meta,
-                        false,
-                        AJXP_METADATA_SCOPE_REPOSITORY
-                    );
-                }
-
-                AJXP_XMLWriter::header();
-                $node->metadata = array();
-                $node->loadNodeInfo(true, false, "all");
-                $this->enrichNode($node);
-                AJXP_XMLWriter::writeNodesDiff(array("UPDATE" => array( $node->getPath() => $node )), true);
-                AJXP_XMLWriter::close();
-
-                break;
-
-            default:
-            break;
-
-        }
-    }
-
-
-    public function processChangeHook(AJXP_Node $oldNode=null, AJXP_Node $newNode=null, $copy = false)
-    {
-        $newNotif = $this->notificationCenter->generateNotificationFromChangeHook($oldNode, $newNode, $copy, "new");
-        if ($newNotif !== false && $newNotif->getNode() !== false) {
-            $this->processActiveHook($newNotif, self::$META_WATCH_CHANGE, AJXP_NOTIF_NODE_CHANGE);
-        }
-        if($oldNode != null && $newNode != null && $oldNode->getUrl() == $newNode->getUrl()) return;
-        $oldNotif =  $this->notificationCenter->generateNotificationFromChangeHook($oldNode, $newNode, $copy, "old");
-        if ($oldNotif !== false && $oldNotif->getNode() !== false) {
-            $this->processActiveHook($oldNotif, self::$META_WATCH_CHANGE, AJXP_NOTIF_NODE_CHANGE);
-        }
-
-        $this->updateMetaLocation($oldNode, $newNode, $copy);
-
-    }
-
-    public function processReadHook(AJXP_Node $node)
-    {
-        $notification = new AJXP_Notification();
-        $notification->setAction(AJXP_NOTIF_NODE_VIEW);
-        $notification->setNode($node);
-        $this->processActiveHook($notification, self::$META_WATCH_READ);
-
-    }
-
-    private function processActiveHook(AJXP_Notification $notification, $namespace, $parentActionType = null){
-        $origNode = $notification->getNode();
-        $node = new AJXP_Node($origNode->getUrl());
-        $all = $this->collectWatches($node, $namespace);
-        if($node->isRoot() && $node->getRepository() !== null && $node->getRepository()->hasContentFilter()){
-            $node->setLeaf(true);
-        }else{
-            $node->setLeaf(false);
-        }
-        foreach($all["node"] as $id) {
-            $this->notificationCenter->postNotification($notification, $id);
-        }
-        foreach($all["ancestors"] as $pair){
-            $parentNotification = new AJXP_Notification();
-            /**
-             * @var AJXP_Node $parentNode
-             */
-            $parentNode = $pair["node"];
-            if($parentNode->isRoot() && $parentNode->getRepository() !== null && $parentNode->getRepository()->hasContentFilter()){
-                $parentNode->setLeaf(true);
-            }else{
-                $parentNode->setLeaf(false);
-            }
-            $parentNotification->setNode($parentNode);
-            if($parentActionType == null){
-                $parentNotification->setAction($notification->getAction());
-            }else{
-                $parentNotification->setAction($parentActionType);
-            }
-            $this->notificationCenter->prepareNotification($notification);
-            $parentNotification->addRelatedNotification($notification);
-            $this->notificationCenter->postNotification($parentNotification, $pair["id"]);
-        }
-    }
-
-    /**
-     * @param AJXP_Node $node
-     */
-    public function enrichNode($node)
-    {
-        if(AuthService::getLoggedUser() == null) return;
-        $meta = $this->metaStore->retrieveMetadata(
-            $node,
-            self::$META_WATCH_NAMESPACE,
-            false,
-            AJXP_METADATA_SCOPE_REPOSITORY);
-        if(is_array($meta)
-            && array_key_exists(AuthService::getLoggedUser()->getId(), $meta)){
-            $node->mergeMetadata(array(
-                "meta_watched" => $meta[AuthService::getLoggedUser()->getId()],
-                "overlay_icon" => "meta.watch/ICON_SIZE/watch.png",
-                "overlay_class" => "icon-eye-open"
-            ), true);
-        }
-    }
-
-    /**
-     *
-     * @param AJXP_Node $oldFile
-     * @param AJXP_Node $newFile
-     * @param Boolean $copy
-     */
-    public function updateMetaLocation($oldFile, $newFile = null, $copy = false)
-    {
-        if($oldFile == null) return;
-        if(!$copy && $this->metaStore->inherentMetaMove()) return;
-
-        $oldMeta = $this->metaStore->retrieveMetadata($oldFile, self::$META_WATCH_NAMESPACE, false, AJXP_METADATA_SCOPE_REPOSITORY);
-        if (count($oldMeta)) {
-            // If it's a move or a delete, delete old data
-            if (!$copy) {
-                $this->metaStore->removeMetadata($oldFile, self::$META_WATCH_NAMESPACE, false, AJXP_METADATA_SCOPE_REPOSITORY);
-            }
-            // If copy or move, copy data.
-            if ($newFile != null) {
-                $this->metaStore->setMetadata($newFile, self::$META_WATCH_NAMESPACE, $oldMeta, false, AJXP_METADATA_SCOPE_REPOSITORY);
-            }
-        }
-
-    }
-
-}
diff --git a/core/src/plugins/meta.watch/manifest.xml b/core/src/plugins/meta.watch/manifest.xml
index d7953ac2e1..068bb5e10f 100755
--- a/core/src/plugins/meta.watch/manifest.xml
+++ b/core/src/plugins/meta.watch/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <meta id="meta.watch" label="CONF_MESSAGE[Watch Metadata]" description="CONF_MESSAGE[Register watched on files or folders]"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <class_definition filename="plugins/meta.watch/class.MetaWatchRegister.php" classname="MetaWatchRegister"/>
+    <class_definition filename="plugins/meta.watch/WatchRegister.php" classname="Pydio\Access\Meta\Watch\WatchRegister"/>
     <client_settings>
         <resources>
             <img_library alias="meta.watch" path="plugins/meta.watch/icons"/>
@@ -12,7 +12,7 @@
             <action name="toggle_watch">
                 <gui src="meta.watch/ICON_SIZE/watch.png" text="meta.watch.1" title="meta.watch.2" iconClass="icon-rss">
                     <context dir="true" recycle="hidden" selection="true" actionBar="true" actionBarGroup="more" contextMenu="true"/>
-                    <selectionContext dir="true" file="true" recycle="false" unique="true"/>
+                    <selectionContext dir="true" file="true" recycle="false" unique="true" enableRoot="true"/>
                 </gui>
                 <rightsContext adminOnly="false" noUser="false" read="false" userLogged="only" write="false"/>
                 <subMenu>
@@ -104,7 +104,7 @@
         <hooks>
             <serverCallback hookName="node.read" methodName="processReadHook" defer="true"/>
             <serverCallback hookName="node.change" methodName="processChangeHook" defer="true"/>
-            <serverCallback hookName="node.info" methodName="enrichNode" />
+            <serverCallback hookName="node.info.nocache" methodName="enrichNode" />
         </hooks>
     </registry_contributions>
 </meta>
diff --git a/core/src/plugins/metastore.s3/S3MetaStore.php b/core/src/plugins/metastore.s3/S3MetaStore.php
new file mode 100644
index 0000000000..8343e56400
--- /dev/null
+++ b/core/src/plugins/metastore.s3/S3MetaStore.php
@@ -0,0 +1,250 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Metastore\Implementation;
+
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Core\Model\ContextInterface;
+
+use Pydio\Access\Meta\Core\AbstractMetaSource;
+use Pydio\Access\Metastore\Core\IMetaStoreProvider;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+/**
+ * Simple metadata implementation, coupled with an S3 repository, stores
+ * the metadata in the s3 bucket
+ */
+class S3MetaStore extends AbstractMetaSource implements IMetaStoreProvider
+{
+    private static $metaCache;
+    protected $bucketName;
+    
+    /**
+     * @param ContextInterface $ctx
+     * @param AbstractAccessDriver $accessDriver
+     */
+    public function initMeta(ContextInterface $ctx, AbstractAccessDriver $accessDriver)
+    {
+        parent::initMeta($ctx, $accessDriver);
+        $this->bucketName = $ctx->getRepository()->getContextOption($ctx, "CONTAINER");
+    }
+
+    /**
+     * @abstract
+     * @return bool
+     */
+    public function inherentMetaMove()
+    {
+        return true;
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $node
+     * @return string
+     */
+    protected function getUserId($node)
+    {
+        if($node->hasUser()) return $node->getUserId();
+        return "shared";
+    }
+
+    /**
+     * @return \aws\S3\S3Client
+     */
+    protected function getAwsService(ContextInterface $ctx)
+    {
+        if(method_exists($ctx->getRepository()->getDriverInstance($ctx), "getS3Service")){
+            return $ctx->getRepository()->getDriverInstance($ctx)->getS3Service();
+        }
+        return null;
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $ajxpNode
+     * @param boolean $create
+     * @return String
+     */
+    private function updateNodeMetaPath($ajxpNode, $create = false){
+        $trim = trim($ajxpNode->getPath(), "/");
+        if($ajxpNode->is_file !== null){
+            $folder = !$ajxpNode->isLeaf();
+        }else{
+            $folder = !is_file($ajxpNode->getUrl());
+        }
+        if(!$folder) return $trim;
+        $meta = is_file(rtrim($ajxpNode->getUrl(), "/")."/.meta");
+        if(!$meta){
+            if($create) file_put_contents(rtrim($ajxpNode->getUrl(), "/")."/.meta", "meta");
+            else return null;
+        }
+        return $trim."/.meta";
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $ajxpNode
+     * @param String $nameSpace
+     * @param array $metaData
+     * @param bool $private
+     * @param int $scope
+     */
+    public function setMetadata($ajxpNode, $nameSpace, $metaData, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY)
+    {
+        $aws = $this->getAwsService($ajxpNode->getContext());
+        if($aws == null) return;
+        $user = ($private?$this->getUserId($ajxpNode):AJXP_METADATA_SHAREDUSER);
+        $pathName = $this->updateNodeMetaPath($ajxpNode, true);
+        $response = $aws->copyObject(
+            array(
+                'Bucket' => $this->bucketName,
+                'Key' => $pathName,
+                'CopySource' => $this->bucketName."/".rawurlencode($pathName),
+                'MetadataDirective' => 'REPLACE',
+                'Metadata' => array($this->getMetaKey($nameSpace,$scope,$user) => base64_encode(serialize($metaData)))
+            )
+        );
+        $this->logDebug("UPDATE RESPONSE", $response);
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $ajxpNode
+     * @param String $nameSpace
+     * @param bool $private
+     * @param int $scope
+     */
+    public function removeMetadata($ajxpNode, $nameSpace, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY)
+    {
+        $aws = $this->getAwsService($ajxpNode->getContext());
+        if($aws == null) return;
+        $user = ($private?$this->getUserId($ajxpNode):AJXP_METADATA_SHAREDUSER);
+        $pathName = $this->updateNodeMetaPath($ajxpNode, false);
+        if($pathName != null){
+            $aws->copyObject(
+                array(
+                    'Bucket' => $this->bucketName,
+                    'Key' => $pathName,
+                    'CopySource' => $this->bucketName."/".rawurlencode($pathName),
+                    'MetadataDirective' => 'REPLACE',
+                    'Metadata' => array($this->getMetaKey($nameSpace,$scope,$user) => "")
+                )
+            );
+        }
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $ajxpNode
+     * @param String $nameSpace
+     * @param bool $private
+     * @param int $scope
+     * @return array|mixed
+     */
+    public function retrieveMetadata($ajxpNode, $nameSpace, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY)
+    {
+        $aws = $this->getAwsService($ajxpNode->getContext());
+        if($aws == null) return array();
+
+        if (isSet(self::$metaCache[$ajxpNode->getPath()])) {
+            $data = self::$metaCache[$ajxpNode->getPath()];
+        } else {
+            $pathName = $this->updateNodeMetaPath($ajxpNode, false);
+            if($pathName == null) return [];
+            try{
+                $response = $aws->headObject(array("Bucket" => $this->bucketName, "Key" => $pathName));
+                $metadata = $response["Metadata"];
+                if($metadata == null){
+                    $metadata = array();
+                }
+            }catch(Aws\S3\Exception\S3Exception $e){
+                $metadata = array();
+            }
+            self::$metaCache[$ajxpNode->getPath()] = $metadata;
+            $data = self::$metaCache[$ajxpNode->getPath()];
+        }
+        if($private === AJXP_METADATA_ALLUSERS){
+            $startKey = $this->getMetaKey($nameSpace, $scope, "");
+            $arrMeta = array();
+            foreach($data as $k => $mData){
+                if(strpos($k, $startKey) === 0){
+                    $decData = unserialize(base64_decode($mData));
+                    if(is_array($decData)) $arrMeta = array_merge_recursive($arrMeta, $decData);
+                }
+            }
+            return $arrMeta;
+        }else{
+            $user = ($private?$this->getUserId($ajxpNode):AJXP_METADATA_SHAREDUSER);
+            $mKey = $this->getMetaKey($nameSpace,$scope,$user);
+            if (isSet($data[$mKey])) {
+                $arrMeta =  unserialize(base64_decode($data[$mKey]));
+                if(is_array($arrMeta)) return $arrMeta;
+            }
+        }
+        return array();
+    }
+
+    /**
+     * @param $namespace
+     * @param $scope
+     * @param $user
+     * @return string
+     */
+    private function getMetaKey($namespace, $scope, $user)
+    {
+        return strtolower($namespace."-".$scope."-".$user);
+    }
+
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $ajxpNode
+     * @return void
+     */
+    public function enrichNode(&$ajxpNode)
+    {
+        // Try both
+        $aws = $this->getAwsService($ajxpNode->getContext());
+        if($aws == null) return;
+
+        if (isSet(self::$metaCache[$ajxpNode->getPath()])) {
+            $data = self::$metaCache[$ajxpNode->getPath()];
+        } else {
+            $this->logDebug("Should retrieve metadata for ".$ajxpNode->getPath());
+            $pathName = $this->updateNodeMetaPath($ajxpNode, false);
+            if($pathName == null) return;
+            try{
+                $response = $aws->headObject(array("Bucket" => $this->bucketName, "Key" => $pathName));
+                $metadata = $response["Metadata"];
+                if($metadata == null){
+                    $metadata = array();
+                }
+            }catch (Aws\S3\Exception\S3Exception $e){
+                $metadata = array();
+            }
+            self::$metaCache[$ajxpNode->getPath()] = $metadata;
+            $data = self::$metaCache[$ajxpNode->getPath()];
+        }
+        $allMeta = array();
+        foreach ($data as $amzKey => $value) {
+            $parts = explode("-", $amzKey);
+            $all[$parts[0]] = $value;
+        }
+
+        $ajxpNode->mergeMetadata($allMeta);
+    }
+
+
+}
diff --git a/core/src/plugins/metastore.s3/class.s3MetaStore.php b/core/src/plugins/metastore.s3/class.s3MetaStore.php
deleted file mode 100755
index 642c7df9a0..0000000000
--- a/core/src/plugins/metastore.s3/class.s3MetaStore.php
+++ /dev/null
@@ -1,228 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-/**
- * Simple metadata implementation, coupled with an S3 repository, stores
- * the metadata in the s3 bucket
- * @package AjaXplorer_Plugins
- * @subpackage Metastore
- */
-class s3MetaStore extends AJXP_AbstractMetaSource implements MetaStoreProvider
-{
-    private static $currentMetaName;
-    private static $metaCache;
-    private static $fullMetaCache;
-
-    protected $globalMetaFile;
-    protected $bucketName;
-
-
-    public function init($options)
-    {
-        $this->options = $options;
-        $this->loadRegistryContributions();
-        $this->globalMetaFile = AJXP_DATA_PATH."/plugins/metastore.serial/ajxp_meta";
-    }
-
-    public function initMeta($accessDriver)
-    {
-        parent::initMeta($accessDriver);
-        $this->bucketName = $this->accessDriver->repository->getOption("CONTAINER");
-    }
-
-    /**
-     * @abstract
-     * @return bool
-     */
-    public function inherentMetaMove()
-    {
-        return true;
-    }
-
-    /**
-     * @param AJXP_Node $node
-     * @return string
-     */
-    protected function getUserId($node)
-    {
-        if($node->hasUser()) return $node->getUser();
-        if(AuthService::usersEnabled()) return AuthService::getLoggedUser()->getId();
-        return "shared";
-    }
-
-    /**
-     * @return \aws\S3\S3Client
-     */
-    protected function getAwsService()
-    {
-        if(method_exists($this->accessDriver, "getS3Service")){
-            return $this->accessDriver->getS3Service();
-        }
-        return null;
-    }
-
-    /**
-     * @param AJXP_Node $ajxpNode
-     * @param boolean $create
-     * @return String
-     */
-    private function updateNodeMetaPath($ajxpNode, $create = false){
-        $trim = trim($ajxpNode->getPath(), "/");
-        if($ajxpNode->is_file !== null){
-            $folder = !$ajxpNode->isLeaf();
-        }else{
-            $folder = !is_file($ajxpNode->getUrl());
-        }
-        if(!$folder) return $trim;
-        $meta = is_file(rtrim($ajxpNode->getUrl(), "/")."/.meta");
-        if(!$meta){
-            if($create) file_put_contents(rtrim($ajxpNode->getUrl(), "/")."/.meta", "meta");
-            else return null;
-        }
-        return $trim."/.meta";
-    }
-
-    public function setMetadata($ajxpNode, $nameSpace, $metaData, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY)
-    {
-        $aws = $this->getAwsService();
-        if($aws == null) return;
-        $user = ($private?$this->getUserId($ajxpNode):AJXP_METADATA_SHAREDUSER);
-        $pathName = $this->updateNodeMetaPath($ajxpNode, true);
-        $response = $aws->copyObject(
-            array(
-                'Bucket' => $this->bucketName,
-                'Key' => $pathName,
-                'CopySource' => $this->bucketName."/".rawurlencode($pathName),
-                'MetadataDirective' => 'REPLACE',
-                'Metadata' => array($this->getMetaKey($nameSpace,$scope,$user) => base64_encode(serialize($metaData)))
-            )
-        );
-        $this->logDebug("UPDATE RESPONSE", $response);
-    }
-
-    public function removeMetadata($ajxpNode, $nameSpace, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY)
-    {
-        $aws = $this->getAwsService();
-        if($aws == null) return;
-        $user = ($private?$this->getUserId($ajxpNode):AJXP_METADATA_SHAREDUSER);
-        $pathName = $this->updateNodeMetaPath($ajxpNode, false);
-        if($pathName != null){
-            $aws->copyObject(
-                array(
-                    'Bucket' => $this->bucketName,
-                    'Key' => $pathName,
-                    'CopySource' => $this->bucketName."/".rawurlencode($pathName),
-                    'MetadataDirective' => 'REPLACE',
-                    'Metadata' => array($this->getMetaKey($nameSpace,$scope,$user) => "")
-                )
-            );
-        }
-    }
-
-    public function retrieveMetadata($ajxpNode, $nameSpace, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY)
-    {
-        $aws = $this->getAwsService();
-        if($aws == null) return array();
-
-        if (isSet(self::$metaCache[$ajxpNode->getPath()])) {
-            $data = self::$metaCache[$ajxpNode->getPath()];
-        } else {
-            $pathName = $this->updateNodeMetaPath($ajxpNode, false);
-            if($pathName == null) return;
-            try{
-                $response = $aws->headObject(array("Bucket" => $this->bucketName, "Key" => $pathName));
-                $metadata = $response["Metadata"];
-                if($metadata == null){
-                    $metadata = array();
-                }
-            }catch(Aws\S3\Exception\S3Exception $e){
-                $metadata = array();
-            }
-            self::$metaCache[$ajxpNode->getPath()] = $metadata;
-            $data = self::$metaCache[$ajxpNode->getPath()];
-        }
-        if($private === AJXP_METADATA_ALLUSERS){
-            $startKey = $this->getMetaKey($nameSpace, $scope, "");
-            $arrMeta = array();
-            foreach($data as $k => $mData){
-                if(strpos($k, $startKey) === 0){
-                    $decData = unserialize(base64_decode($mData));
-                    if(is_array($decData)) $arrMeta = array_merge_recursive($arrMeta, $decData);
-                }
-            }
-            return $arrMeta;
-        }else{
-            $user = ($private?$this->getUserId($ajxpNode):AJXP_METADATA_SHAREDUSER);
-            $mKey = $this->getMetaKey($nameSpace,$scope,$user);
-            if (isSet($data[$mKey])) {
-                $arrMeta =  unserialize(base64_decode($data[$mKey]));
-                if(is_array($arrMeta)) return $arrMeta;
-            }
-        }
-        return array();
-    }
-
-    private function getMetaKey($namespace, $scope, $user)
-    {
-        return strtolower($namespace."-".$scope."-".$user);
-    }
-
-
-    /**
-     * @param AJXP_Node $ajxpNode
-     * @return void
-     */
-    public function enrichNode(&$ajxpNode)
-    {
-        // Try both
-        $aws = $this->getAwsService();
-        if($aws == null) return;
-
-        if (isSet(self::$metaCache[$ajxpNode->getPath()])) {
-            $data = self::$metaCache[$ajxpNode->getPath()];
-        } else {
-            $this->logDebug("Should retrieve metadata for ".$ajxpNode->getPath());
-            $pathName = $this->updateNodeMetaPath($ajxpNode, false);
-            if($pathName == null) return;
-            try{
-                $response = $aws->headObject(array("Bucket" => $this->bucketName, "Key" => $pathName));
-                $metadata = $response["Metadata"];
-                if($metadata == null){
-                    $metadata = array();
-                }
-            }catch (Aws\S3\Exception\S3Exception $e){
-                $metadata = array();
-            }
-            self::$metaCache[$ajxpNode->getPath()] = $metadata;
-            $data = self::$metaCache[$ajxpNode->getPath()];
-        }
-        $allMeta = array();
-        foreach ($data as $amzKey => $value) {
-            $parts = explode("-", $amzKey);
-            $all[$parts[0]] = $value;
-        }
-
-        $ajxpNode->mergeMetadata($allMeta);
-    }
-
-
-}
diff --git a/core/src/plugins/metastore.s3/i18n/conf/de.php b/core/src/plugins/metastore.s3/i18n/conf/de.php
index d6e85ed3a6..a8d7227ce6 100755
--- a/core/src/plugins/metastore.s3/i18n/conf/de.php
+++ b/core/src/plugins/metastore.s3/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
     "S3 MetaStore" => "Metadaten in S3",
diff --git a/core/src/plugins/metastore.s3/i18n/conf/en.php b/core/src/plugins/metastore.s3/i18n/conf/en.php
index d79fe3b169..7abaf32b24 100755
--- a/core/src/plugins/metastore.s3/i18n/conf/en.php
+++ b/core/src/plugins/metastore.s3/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
     "S3 MetaStore" => "MetaStore S3",
diff --git a/core/src/plugins/metastore.s3/i18n/conf/fr.php b/core/src/plugins/metastore.s3/i18n/conf/fr.php
index ede5e20e1b..afb297546f 100755
--- a/core/src/plugins/metastore.s3/i18n/conf/fr.php
+++ b/core/src/plugins/metastore.s3/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 	"S3 MetaStore" => "Stockage Meta S3",
diff --git a/core/src/plugins/metastore.s3/i18n/conf/it.php b/core/src/plugins/metastore.s3/i18n/conf/it.php
index 76fd214216..c938e8c5ac 100755
--- a/core/src/plugins/metastore.s3/i18n/conf/it.php
+++ b/core/src/plugins/metastore.s3/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
     "S3 MetaStore" => "MetaStore S3",
diff --git a/core/src/plugins/metastore.s3/i18n/conf/pt.php b/core/src/plugins/metastore.s3/i18n/conf/pt.php
index ca09308138..1fc4ba62e8 100644
--- a/core/src/plugins/metastore.s3/i18n/conf/pt.php
+++ b/core/src/plugins/metastore.s3/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
     "S3 MetaStore" => "MetaStore S3",
diff --git a/core/src/plugins/metastore.s3/manifest.xml b/core/src/plugins/metastore.s3/manifest.xml
index 5cf00fafbe..b095b43e5e 100755
--- a/core/src/plugins/metastore.s3/manifest.xml
+++ b/core/src/plugins/metastore.s3/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metastore id="metastore.s3" label="CONF_MESSAGE[S3 MetaStore]" description="CONF_MESSAGE[Stores metadata s3 metadata]"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-	<class_definition filename="plugins/metastore.s3/class.s3MetaStore.php" classname="s3MetaStore"/>
+	<class_definition filename="plugins/metastore.s3/S3MetaStore.php" classname="Pydio\Access\Metastore\Implementation\S3MetaStore"/>
     <client_settings icon="plugins/access.mysql/resources/images/mysql_icon.png">
         <resources>
             <i18n namespace="metastore_s3" path="plugins/metastore.s3/i18n" />
diff --git a/core/src/plugins/metastore.serial/SerialMetaStore.php b/core/src/plugins/metastore.serial/SerialMetaStore.php
new file mode 100644
index 0000000000..071fba85f8
--- /dev/null
+++ b/core/src/plugins/metastore.serial/SerialMetaStore.php
@@ -0,0 +1,404 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Metastore\Implementation;
+
+use Pydio\Access\Core\MetaStreamWrapper;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Core\Controller\Controller;
+use Pydio\Access\Meta\Core\AbstractMetaSource;
+use Pydio\Access\Metastore\Core\IMetaStoreProvider;
+use Pydio\Core\Utils\TextEncoder;
+use Pydio\Core\Utils\Vars\PathUtils;
+use Pydio\Core\Utils\Vars\StatHelper;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+/**
+ * Simple metadata implementation, stored in hidden files inside the
+ * folders
+ */
+class SerialMetaStore extends AbstractMetaSource implements IMetaStoreProvider
+{
+    private static $currentMetaName;
+    private static $metaCache;
+    private static $fullMetaCache;
+
+    protected $globalMetaFile;
+
+    /**
+     * @param \Pydio\Core\Model\ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(\Pydio\Core\Model\ContextInterface $ctx, $options = [])
+    {
+        $this->options = $options;
+        $this->globalMetaFile = AJXP_DATA_PATH."/plugins/metastore.serial/ajxp_meta";
+    }
+
+    /**
+     * @abstract
+     * @return bool
+     */
+    public function inherentMetaMove()
+    {
+        return false;
+    }
+
+
+    /**
+     * @param AJXP_Node $node
+     * @return string
+     */
+    protected function getUserId($node)
+    {
+        if($node->hasUser()) return $node->getUserId();
+        return "shared";
+    }
+
+    /**
+     * @param AJXP_Node $ajxpNode
+     * @param String $nameSpace
+     * @param array $metaData
+     * @param bool $private
+     * @param int $scope
+     */
+    public function setMetadata($ajxpNode, $nameSpace, $metaData, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY)
+    {
+        $this->loadMetaFileData(
+            $ajxpNode,
+            $scope,
+            ($private?$this->getUserId($ajxpNode):AJXP_METADATA_SHAREDUSER)
+        );
+        if (!isSet(self::$metaCache[$nameSpace])) {
+            self::$metaCache[$nameSpace] = array();
+        }
+        self::$metaCache[$nameSpace] = array_merge(self::$metaCache[$nameSpace], $metaData);
+        if(is_array(self::$metaCache[$nameSpace])){
+            foreach(self::$metaCache[$nameSpace] as $k => $v){
+                if($v == AJXP_VALUE_CLEAR) unset(self::$metaCache[$nameSpace][$k]);
+            }
+        }
+        $this->saveMetaFileData(
+            $ajxpNode,
+            $scope,
+            ($private?$this->getUserId($ajxpNode):AJXP_METADATA_SHAREDUSER)
+        );
+    }
+
+    /**
+     * @param AJXP_Node $ajxpNode
+     * @param String $nameSpace
+     * @param bool $private
+     * @param int $scope
+     * @return array|void
+     */
+    public function removeMetadata($ajxpNode, $nameSpace, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY)
+    {
+        $this->loadMetaFileData(
+            $ajxpNode,
+            $scope,
+            ($private?$this->getUserId($ajxpNode):AJXP_METADATA_SHAREDUSER)
+        );
+        if(!isSet(self::$metaCache[$nameSpace])) return;
+        unset(self::$metaCache[$nameSpace]);
+        $this->saveMetaFileData(
+            $ajxpNode,
+            $scope,
+            ($private?$this->getUserId($ajxpNode):AJXP_METADATA_SHAREDUSER)
+        );
+    }
+
+    /**
+     * @param AJXP_Node $ajxpNode
+     * @param String $nameSpace
+     * @param bool $private
+     * @param int $scope
+     * @return array
+     */
+    public function retrieveMetadata($ajxpNode, $nameSpace, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY)
+    {
+        if($private === AJXP_METADATA_ALLUSERS){
+            $userScope = AJXP_METADATA_ALLUSERS;
+        }else if($private === true){
+            $userScope = $this->getUserId($ajxpNode);
+        }else{
+            $userScope = AJXP_METADATA_SHAREDUSER;
+        }
+        $this->loadMetaFileData(
+            $ajxpNode,
+            $scope,
+            $userScope
+        );
+        if(!isSet(self::$metaCache[$nameSpace])) return array();
+        else return self::$metaCache[$nameSpace];
+    }
+
+
+
+    /**
+     * @param AJXP_Node $ajxpNode
+     * @return void
+     */
+    public function enrichNode(&$ajxpNode)
+    {
+        // Try both
+        $all = array();
+        $this->loadMetaFileData($ajxpNode, AJXP_METADATA_SCOPE_GLOBAL, AJXP_METADATA_SHAREDUSER);
+        $all[] = self::$metaCache;
+        $this->loadMetaFileData($ajxpNode, AJXP_METADATA_SCOPE_GLOBAL, $this->getUserId($ajxpNode));
+        $all[] = self::$metaCache;
+        $this->loadMetaFileData($ajxpNode, AJXP_METADATA_SCOPE_REPOSITORY, AJXP_METADATA_SHAREDUSER);
+        $all[] = self::$metaCache;
+        $this->loadMetaFileData($ajxpNode, AJXP_METADATA_SCOPE_REPOSITORY, $this->getUserId($ajxpNode));
+        $all[] = self::$metaCache;
+        $allMeta = array();
+        foreach ($all as $metadata) {
+            foreach ($metadata as $namespace => $meta) {
+                foreach ($meta as $key => $value) {
+                    $allMeta[$namespace."-".$key] = $value;
+                }
+            }
+        }
+        $ajxpNode->mergeMetadata($allMeta);
+    }
+
+    /**
+     * @param $metaFile
+     * @param \Pydio\Core\Model\ContextInterface $ctx
+     * @return string
+     */
+    protected function updateSecurityScope($metaFile, \Pydio\Core\Model\ContextInterface $ctx)
+    {
+        $repo = $ctx->getRepository();
+        if (!is_object($repo)) {
+            return $metaFile;
+        }
+        $securityScope = $repo->securityScope();
+        if($securityScope == false) return $metaFile;
+        if($ctx->hasUser()){
+            if ($securityScope == "USER") {
+                $metaFile .= "_".$ctx->getUser()->getId();
+            }else if($securityScope == "GROUP"){
+                $uObj= $ctx->getUser();
+                if($uObj != null){
+                    $u = str_replace("/", "__", $uObj->getGroupPath());
+                    $metaFile.= "_".$u;
+                }
+            }
+        }
+        return $metaFile;
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $ajxpNode
+     * @param String $scope
+     * @param String $userId
+     * @return void
+     */
+    protected function loadMetaFileData($ajxpNode, $scope, $userId)
+    {
+        $currentFile = $ajxpNode->getUrl();
+        $fileKey = $ajxpNode->getPath();
+        if($fileKey == null) $fileKey = "/";
+        if (isSet($this->options["METADATA_FILE_LOCATION"]) && $this->options["METADATA_FILE_LOCATION"] == "outside") {
+            // Force scope
+            $scope = AJXP_METADATA_SCOPE_REPOSITORY;
+        }
+        if ($scope == AJXP_METADATA_SCOPE_GLOBAL) {
+            $metaFile = dirname($currentFile)."/".$this->options["METADATA_FILE"];
+            if (preg_match("/\.zip\//",$currentFile)) {
+                self::$fullMetaCache[$metaFile] = array();
+                self::$metaCache = array();
+                return ;
+            }
+            $fileKey = basename($fileKey);
+        } else {
+            $metaFile = $this->globalMetaFile."_".$ajxpNode->getRepositoryId();
+            $metaFile = $this->updateSecurityScope($metaFile, $ajxpNode->getContext());
+        }
+        self::$metaCache = array();
+        if (!isSet(self::$fullMetaCache[$metaFile])) {
+            self::$currentMetaName = $metaFile;
+            $rawData = @file_get_contents($metaFile);
+            if ($rawData !== false) {
+                self::$fullMetaCache[$metaFile] = unserialize($rawData);
+            }
+        }
+        if (isSet(self::$fullMetaCache[$metaFile]) && is_array(self::$fullMetaCache[$metaFile])) {
+            if($userId == AJXP_METADATA_ALLUSERS && is_array(self::$fullMetaCache[$metaFile][$fileKey])){
+                foreach(self::$fullMetaCache[$metaFile][$fileKey] as $uId => $data){
+                    self::$metaCache = array_merge_recursive(self::$metaCache, $data);
+                }
+            }else{
+                if (isSet(self::$fullMetaCache[$metaFile][$fileKey][$userId])) {
+                    self::$metaCache = self::$fullMetaCache[$metaFile][$fileKey][$userId];
+                } else {
+                    if ($this->options["UPGRADE_FROM_METASERIAL"] == true && count(self::$fullMetaCache[$metaFile]) && !isSet(self::$fullMetaCache[$metaFile]["AJXP_METASTORE_UPGRADED"])) {
+                        self::$fullMetaCache[$metaFile] = $this->upgradeDataFromMetaSerial(self::$fullMetaCache[$metaFile]);
+                        if (isSet(self::$fullMetaCache[$metaFile][$fileKey][$userId])) {
+                            self::$metaCache = self::$fullMetaCache[$metaFile][$fileKey][$userId];
+                        }
+                        // Save upgraded version
+                        file_put_contents($metaFile, serialize(self::$fullMetaCache[$metaFile]));
+                    }
+                }
+            }
+        } else {
+            self::$fullMetaCache[$metaFile] = array();
+            self::$metaCache = array();
+        }
+    }
+
+    /**
+     * @param AJXP_Node $ajxpNode
+     * @param String $scope
+     * @param String $userId
+     */
+    protected function saveMetaFileData($ajxpNode, $scope, $userId)
+    {
+        $currentFile = $ajxpNode->getUrl();
+        $repositoryId = $ajxpNode->getRepositoryId();
+        $fileKey = $ajxpNode->getPath();
+        if(empty($fileKey)) $fileKey = "/";
+        if (isSet($this->options["METADATA_FILE_LOCATION"]) && $this->options["METADATA_FILE_LOCATION"] == "outside") {
+            // Force scope
+            $scope = AJXP_METADATA_SCOPE_REPOSITORY;
+        }
+        if ($scope == AJXP_METADATA_SCOPE_GLOBAL) {
+            $metaFile = dirname($currentFile)."/".$this->options["METADATA_FILE"];
+            $fileKey = basename($fileKey);
+        } else {
+            if (!is_dir(dirname($this->globalMetaFile))) {
+                mkdir(dirname($this->globalMetaFile), 0755, true);
+            }
+            $metaFile = $this->globalMetaFile."_".$repositoryId;
+            $metaFile = $this->updateSecurityScope($metaFile, $ajxpNode->getContext());
+        }
+        $metFileNode = new AJXP_Node($metaFile);
+        $driver = $metFileNode->getDriver();
+        if($scope==AJXP_METADATA_SCOPE_REPOSITORY
+            || (@is_file($metaFile) && call_user_func(array($driver, "isWriteable"), $metFileNode))
+            || call_user_func(array($driver, "isWriteable"), $metFileNode->getParent()) ){
+            if (is_array(self::$metaCache) && count(self::$metaCache)) {
+                if (!isset(self::$fullMetaCache[$metaFile])) {
+                    self::$fullMetaCache[$metaFile] = array();
+                }
+                if (!isset(self::$fullMetaCache[$metaFile][$fileKey])) {
+                    self::$fullMetaCache[$metaFile][$fileKey] = array();
+                }
+                if (!isset(self::$fullMetaCache[$metaFile][$fileKey][$userId])) {
+                    self::$fullMetaCache[$metaFile][$fileKey][$userId] = array();
+                }
+                self::$fullMetaCache[$metaFile][$fileKey][$userId] = self::$metaCache;
+            } else {
+                // CLEAN
+                if (isset(self::$fullMetaCache[$metaFile][$fileKey][$userId])) {
+                    unset(self::$fullMetaCache[$metaFile][$fileKey][$userId]);
+                }
+                if(isset(self::$fullMetaCache[$metaFile][$fileKey])
+                    && !count(self::$fullMetaCache[$metaFile][$fileKey])){
+                    unset(self::$fullMetaCache[$metaFile][$fileKey]);
+                }
+            }
+            $writeMode = "w";
+            $nodeIsWinLocal = false;
+            if($scope === AJXP_METADATA_SCOPE_GLOBAL && $this->nodeIsLocalWindowsFS($ajxpNode)) { 
+                $nodeIsWinLocal = true;
+                if (file_exists($metaFile)) {
+                    $writeMode = "rw+";
+                    $nodeIsWinLocal = false;
+                }
+            }
+            $fp = @fopen($metaFile, $writeMode);
+            if ($fp !== false) {
+                @fwrite($fp, serialize(self::$fullMetaCache[$metaFile]), strlen(serialize(self::$fullMetaCache[$metaFile])));
+                @fclose($fp);
+                if($nodeIsWinLocal){
+                    $real_path_metafile = realpath(MetaStreamWrapper::getRealFSReference($metaFile));
+                    if (is_dir(dirname($real_path_metafile))) {
+                        StatHelper::winSetHidden($real_path_metafile);
+                    }
+                }
+            }else{
+                $this->logError(__FUNCTION__, "Error while trying to open the meta file, maybe a permission problem?");
+            }
+            if ($scope == AJXP_METADATA_SCOPE_GLOBAL) {
+                 Controller::applyHook("version.commit_file", array($metaFile, $ajxpNode));
+            }
+        }
+    }
+
+    /**
+     * @param AJXP_Node $ajxpNode
+     * @param string $nameSpace
+     * @param string $userScope
+     * @return array
+     */
+    public function collectChildrenWithRepositoryMeta($ajxpNode, $nameSpace, $userScope){
+        $result = array();
+        $repositoryId = $ajxpNode->getRepositoryId();
+        $metaFile = $this->globalMetaFile."_".$repositoryId;
+        $metaFile = $this->updateSecurityScope($metaFile, $ajxpNode->getContext());
+        if(!is_file($metaFile)) return $result;
+        $raw_data = file_get_contents($metaFile);
+        if($raw_data === false) return $result;
+        $metadata = unserialize($raw_data);
+        if($metadata === false || !is_array($metadata)) return $result;
+        $srcPath = $ajxpNode->getPath();
+        if($srcPath == "/") $srcPath = "";
+        foreach($metadata as $path => $data){
+            preg_match("#^".preg_quote($srcPath, "#")."/#", $path, $matches);
+            if($path == $srcPath || count($matches)) {
+                $relativePath = substr($path, strlen($srcPath)); // REMOVE ORIGINAL NODE PATH
+                if($relativePath === false) $relativePath = "/";
+                foreach($data as $userId => $meta){
+                    if(($userScope == $userId || $userScope == AJXP_METADATA_ALLUSERS) && isSet($meta[$nameSpace])){
+                        if(!isSet($result[$relativePath])) $result[$relativePath] = array();
+                        $result[$relativePath][$userId] = $meta[$nameSpace];
+                    }
+                }
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * @param AJXP_Node $ajxpNode
+     * @return bool
+     */
+    private function nodeIsLocalWindowsFS($ajxpNode){
+        return (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' && !MetaStreamWrapper::wrapperIsRemote($ajxpNode->getUrl()));
+    }
+
+    /**
+     * @param $data
+     * @return array
+     */
+    protected function upgradeDataFromMetaSerial($data)
+    {
+        $new = array();
+        foreach ($data as $fileKey => $fileData) {
+            $new[$fileKey] = array(AJXP_METADATA_SHAREDUSER => array( "users_meta" => $fileData ));
+            $new["AJXP_METASTORE_UPGRADED"] = true;
+        }
+        return $new;
+    }
+
+}
diff --git a/core/src/plugins/metastore.serial/class.SerialMetaStore.php b/core/src/plugins/metastore.serial/class.SerialMetaStore.php
deleted file mode 100644
index f674fd4247..0000000000
--- a/core/src/plugins/metastore.serial/class.SerialMetaStore.php
+++ /dev/null
@@ -1,392 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-/**
- * Simple metadata implementation, stored in hidden files inside the
- * folders
- * @package AjaXplorer_Plugins
- * @subpackage Metastore
- */
-class SerialMetaStore extends AJXP_AbstractMetaSource implements MetaStoreProvider
-{
-    private static $currentMetaName;
-    private static $metaCache;
-    private static $fullMetaCache;
-
-    protected $globalMetaFile;
-
-
-    public function init($options)
-    {
-        $this->options = $options;
-        $this->loadRegistryContributions();
-        $this->globalMetaFile = AJXP_DATA_PATH."/plugins/metastore.serial/ajxp_meta";
-    }
-
-    /**
-     * @abstract
-     * @return bool
-     */
-    public function inherentMetaMove()
-    {
-        return false;
-    }
-
-
-    /**
-     * @param AJXP_Node $node
-     * @return string
-     */
-    protected function getUserId($node)
-    {
-        if($node->hasUser()) return $node->getUser();
-        if(AuthService::usersEnabled()) return AuthService::getLoggedUser()->getId();
-        return "shared";
-    }
-
-    public function setMetadata($ajxpNode, $nameSpace, $metaData, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY)
-    {
-        $this->loadMetaFileData(
-            $ajxpNode,
-            $scope,
-            ($private?$this->getUserId($ajxpNode):AJXP_METADATA_SHAREDUSER)
-        );
-        if (!isSet(self::$metaCache[$nameSpace])) {
-            self::$metaCache[$nameSpace] = array();
-        }
-        self::$metaCache[$nameSpace] = array_merge(self::$metaCache[$nameSpace], $metaData);
-        if(is_array(self::$metaCache[$nameSpace])){
-            foreach(self::$metaCache[$nameSpace] as $k => $v){
-                if($v == AJXP_VALUE_CLEAR) unset(self::$metaCache[$nameSpace][$k]);
-            }
-        }
-        $this->saveMetaFileData(
-            $ajxpNode,
-            $scope,
-            ($private?$this->getUserId($ajxpNode):AJXP_METADATA_SHAREDUSER)
-        );
-    }
-
-    public function removeMetadata($ajxpNode, $nameSpace, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY)
-    {
-        $this->loadMetaFileData(
-            $ajxpNode,
-            $scope,
-            ($private?$this->getUserId($ajxpNode):AJXP_METADATA_SHAREDUSER)
-        );
-        if(!isSet(self::$metaCache[$nameSpace])) return;
-        unset(self::$metaCache[$nameSpace]);
-        $this->saveMetaFileData(
-            $ajxpNode,
-            $scope,
-            ($private?$this->getUserId($ajxpNode):AJXP_METADATA_SHAREDUSER)
-        );
-    }
-
-    public function retrieveMetadata($ajxpNode, $nameSpace, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY)
-    {
-        if($private === AJXP_METADATA_ALLUSERS){
-            $userScope = AJXP_METADATA_ALLUSERS;
-        }else if($private === true){
-            $userScope = $this->getUserId($ajxpNode);
-        }else{
-            $userScope = AJXP_METADATA_SHAREDUSER;
-        }
-        $this->loadMetaFileData(
-            $ajxpNode,
-            $scope,
-            $userScope
-        );
-        if(!isSet(self::$metaCache[$nameSpace])) return array();
-        else return self::$metaCache[$nameSpace];
-    }
-
-
-
-    /**
-     * @param AJXP_Node $ajxpNode
-     * @return void
-     */
-    public function enrichNode(&$ajxpNode)
-    {
-        // Try both
-        $all = array();
-        $this->loadMetaFileData($ajxpNode, AJXP_METADATA_SCOPE_GLOBAL, AJXP_METADATA_SHAREDUSER);
-        $all[] = self::$metaCache;
-        $this->loadMetaFileData($ajxpNode, AJXP_METADATA_SCOPE_GLOBAL, $this->getUserId($ajxpNode));
-        $all[] = self::$metaCache;
-        $this->loadMetaFileData($ajxpNode, AJXP_METADATA_SCOPE_REPOSITORY, AJXP_METADATA_SHAREDUSER);
-        $all[] = self::$metaCache;
-        $this->loadMetaFileData($ajxpNode, AJXP_METADATA_SCOPE_REPOSITORY, $this->getUserId($ajxpNode));
-        $all[] = self::$metaCache;
-        $allMeta = array();
-        foreach ($all as $metadata) {
-            foreach ($metadata as $namespace => $meta) {
-                foreach ($meta as $key => $value) {
-                    $allMeta[$namespace."-".$key] = $value;
-                }
-            }
-        }
-        $ajxpNode->mergeMetadata($allMeta);
-    }
-
-    protected function updateSecurityScope($metaFile, $repositoryId, $resolveUserId = null)
-    {
-        $repo = ConfService::getRepositoryById($repositoryId);
-        if (!is_object($repo)) {
-            return $metaFile;
-        }
-        $securityScope = $repo->securityScope();
-        if($securityScope == false) return $metaFile;
-        if($resolveUserId != null){
-            if ($securityScope == "USER") {
-                $metaFile .= "_".$resolveUserId;
-            }else if($securityScope == "GROUP"){
-                $uObj= ConfService::getConfStorageImpl()->createUserObject($resolveUserId);
-                if($uObj != null){
-                    $u = str_replace("/", "__", $uObj->getGroupPath());
-                    $metaFile.= "_".$u;
-                }
-            }
-        }else if (AuthService::getLoggedUser() != null) {
-            if ($securityScope == "USER") {
-                $u = AuthService::getLoggedUser();
-                if($u->getResolveAsParent()) $id = $u->getParent();
-                else $id = $u->getId();
-                $metaFile .= "_".$id;
-            } else if ($securityScope == "GROUP") {
-                $u = AuthService::getLoggedUser()->getGroupPath();
-                $u = str_replace("/", "__", $u);
-                $metaFile .= "_".$u;
-            }
-        }
-        return $metaFile;
-    }
-
-    /**
-     * @param AJXP_Node $ajxpNode
-     * @param String $scope
-     * @param String $userId
-     * @return void
-     */
-    protected function loadMetaFileData($ajxpNode, $scope, $userId)
-    {
-        $currentFile = $ajxpNode->getUrl();
-        $fileKey = $ajxpNode->getPath();
-        if($fileKey == null) $fileKey = "/";
-        if (isSet($this->options["METADATA_FILE_LOCATION"]) && $this->options["METADATA_FILE_LOCATION"] == "outside") {
-            // Force scope
-            $scope = AJXP_METADATA_SCOPE_REPOSITORY;
-        }
-        if ($scope == AJXP_METADATA_SCOPE_GLOBAL) {
-            $metaFile = dirname($currentFile)."/".$this->options["METADATA_FILE"];
-            if (preg_match("/\.zip\//",$currentFile)) {
-                self::$fullMetaCache[$metaFile] = array();
-                self::$metaCache = array();
-                return ;
-            }
-            $fileKey = basename($fileKey);
-        } else {
-            $metaFile = $this->globalMetaFile."_".$ajxpNode->getRepositoryId();
-            $metaFile = $this->updateSecurityScope($metaFile, $ajxpNode->getRepositoryId(), $ajxpNode->getUser());
-        }
-        self::$metaCache = array();
-        if (!isSet(self::$fullMetaCache[$metaFile])) {
-            self::$currentMetaName = $metaFile;
-            $rawData = @file_get_contents($metaFile);
-            if ($rawData !== false) {
-                self::$fullMetaCache[$metaFile] = unserialize($rawData);
-            }
-        }
-        if (isSet(self::$fullMetaCache[$metaFile]) && is_array(self::$fullMetaCache[$metaFile])) {
-            if($userId == AJXP_METADATA_ALLUSERS && is_array(self::$fullMetaCache[$metaFile][$fileKey])){
-                foreach(self::$fullMetaCache[$metaFile][$fileKey] as $uId => $data){
-                    self::$metaCache = array_merge_recursive(self::$metaCache, $data);
-                }
-            }else{
-                if (isSet(self::$fullMetaCache[$metaFile][$fileKey][$userId])) {
-                    self::$metaCache = self::$fullMetaCache[$metaFile][$fileKey][$userId];
-                } else {
-                    if ($this->options["UPGRADE_FROM_METASERIAL"] == true && count(self::$fullMetaCache[$metaFile]) && !isSet(self::$fullMetaCache[$metaFile]["AJXP_METASTORE_UPGRADED"])) {
-                        self::$fullMetaCache[$metaFile] = $this->upgradeDataFromMetaSerial(self::$fullMetaCache[$metaFile]);
-                        if (isSet(self::$fullMetaCache[$metaFile][$fileKey][$userId])) {
-                            self::$metaCache = self::$fullMetaCache[$metaFile][$fileKey][$userId];
-                        }
-                        // Save upgraded version
-                        file_put_contents($metaFile, serialize(self::$fullMetaCache[$metaFile]));
-                    }
-                }
-            }
-        } else {
-            self::$fullMetaCache[$metaFile] = array();
-            self::$metaCache = array();
-        }
-    }
-
-    /**
-     * @param AJXP_Node $ajxpNode
-     * @param String $scope
-     * @param String $userId
-     */
-    protected function saveMetaFileData($ajxpNode, $scope, $userId)
-    {
-        $currentFile = $ajxpNode->getUrl();
-        $repositoryId = $ajxpNode->getRepositoryId();
-        $fileKey = $ajxpNode->getPath();
-        if(empty($fileKey)) $fileKey = "/";
-        if (isSet($this->options["METADATA_FILE_LOCATION"]) && $this->options["METADATA_FILE_LOCATION"] == "outside") {
-            // Force scope
-            $scope = AJXP_METADATA_SCOPE_REPOSITORY;
-        }
-        if ($scope == AJXP_METADATA_SCOPE_GLOBAL) {
-            $metaFile = dirname($currentFile)."/".$this->options["METADATA_FILE"];
-            $fileKey = basename($fileKey);
-        } else {
-            if (!is_dir(dirname($this->globalMetaFile))) {
-                mkdir(dirname($this->globalMetaFile), 0755, true);
-            }
-            $metaFile = $this->globalMetaFile."_".$repositoryId;
-            $metaFile = $this->updateSecurityScope($metaFile, $ajxpNode->getRepositoryId(), $ajxpNode->getUser());
-        }
-        if($scope==AJXP_METADATA_SCOPE_REPOSITORY
-            || (@is_file($metaFile) && call_user_func(array($this->accessDriver, "isWriteable"), $metaFile))
-            || call_user_func(array($this->accessDriver, "isWriteable"), dirname($metaFile)) ){
-            if (is_array(self::$metaCache) && count(self::$metaCache)) {
-                if (!isset(self::$fullMetaCache[$metaFile])) {
-                    self::$fullMetaCache[$metaFile] = array();
-                }
-                if (!isset(self::$fullMetaCache[$metaFile][$fileKey])) {
-                    self::$fullMetaCache[$metaFile][$fileKey] = array();
-                }
-                if (!isset(self::$fullMetaCache[$metaFile][$fileKey][$userId])) {
-                    self::$fullMetaCache[$metaFile][$fileKey][$userId] = array();
-                }
-                self::$fullMetaCache[$metaFile][$fileKey][$userId] = self::$metaCache;
-            } else {
-                // CLEAN
-                if (isset(self::$fullMetaCache[$metaFile][$fileKey][$userId])) {
-                    unset(self::$fullMetaCache[$metaFile][$fileKey][$userId]);
-                }
-                if(isset(self::$fullMetaCache[$metaFile][$fileKey])
-                    && !count(self::$fullMetaCache[$metaFile][$fileKey])){
-                    unset(self::$fullMetaCache[$metaFile][$fileKey]);
-                }
-            }
-            $fp = @fopen($metaFile, "w");
-            if ($fp !== false) {
-                @fwrite($fp, serialize(self::$fullMetaCache[$metaFile]), strlen(serialize(self::$fullMetaCache[$metaFile])));
-                @fclose($fp);
-            }else{
-                $this->logError(__FUNCTION__, "Error while trying to open the meta file, maybe a permission problem?");
-            }
-            if ($scope == AJXP_METADATA_SCOPE_GLOBAL) {
-                 AJXP_Controller::applyHook("version.commit_file", array($metaFile, $ajxpNode));
-            }
-        }
-    }
-
-    /**
-     * @param AJXP_Node $ajxpNode
-     * @param string $nameSpace
-     * @param string $userScope
-     * @return array
-     */
-    public function collectChildrenWithRepositoryMeta($ajxpNode, $nameSpace, $userScope){
-        $result = array();
-        $repositoryId = $ajxpNode->getRepositoryId();
-        $metaFile = $this->globalMetaFile."_".$repositoryId;
-        $metaFile = $this->updateSecurityScope($metaFile, $ajxpNode->getRepositoryId(), $ajxpNode->getUser());
-        if(!is_file($metaFile)) return $result;
-        $raw_data = file_get_contents($metaFile);
-        if($raw_data === false) return $result;
-        $metadata = unserialize($raw_data);
-        if($metadata === false || !is_array($metadata)) return $result;
-        $srcPath = $ajxpNode->getPath();
-        if($srcPath == "/") $srcPath = "";
-        foreach($metadata as $path => $data){
-            preg_match("#^".preg_quote($srcPath, "#")."/#", $path, $matches);
-            if($path == $srcPath || count($matches)) {
-                $relativePath = substr($path, strlen($srcPath)); // REMOVE ORIGINAL NODE PATH
-                if($relativePath === false) $relativePath = "/";
-                foreach($data as $userId => $meta){
-                    if(($userScope == $userId || $userScope == AJXP_METADATA_ALLUSERS) && isSet($meta[$nameSpace])){
-                        if(!isSet($result[$relativePath])) $result[$relativePath] = array();
-                        $result[$relativePath][$userId] = $meta[$nameSpace];
-                    }
-                }
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * @param AJXP_Node|null $srcNode
-     * @param AJXP_Node|null $destNode
-     * @param bool|false $copy
-     */
-    public function nodeChangeHook($srcNode = null, $destNode = null, $copy = false){
-        // This is not called, it's the responsibility of the meta provider/setter to
-        // handle the node.change event.
-        // For example, it would break the ShareCenter "shares" management.
-        /*
-        if($srcNode == null || $copy) return;
-        $operation = $destNode == null ? "delete" : "move";
-        $repositoryId = $srcNode->getRepositoryId();
-        $metaFile = $this->globalMetaFile."_".$repositoryId;
-        $metaFile = $this->updateSecurityScope($metaFile, $srcNode->getRepositoryId(), $srcNode->getUser());
-        if(!is_file($metaFile)) return;
-        $raw_data = file_get_contents($metaFile);
-        if($raw_data === false) return;
-        $metadata = unserialize($raw_data);
-        if($metadata === false || !is_array($metadata)) return;
-        $changes = false;
-        $srcPath = $srcNode->getPath();
-        foreach($metadata as $path => $data){
-            preg_match("#^".preg_quote($srcPath, "#")."/#", $path, $matches);
-            if($path == $srcPath || count($matches)){
-                if($operation == "move"){
-                    if($path == $srcPath) $newPath = $destNode->getPath();
-                    else $newPath = preg_replace("#^".preg_quote($srcPath, "#")."#", $destNode->getPath(), $path);
-                    $metadata[$newPath] = $data;
-                }
-                unset($metadata[$path]);
-                $changes = true;
-            }
-        }
-        if($changes){
-            // Should update $metadata now.
-            @file_put_contents($metaFile, serialize($metadata));
-        }
-        */
-    }
-
-    protected function upgradeDataFromMetaSerial($data)
-    {
-        $new = array();
-        foreach ($data as $fileKey => $fileData) {
-            $new[$fileKey] = array(AJXP_METADATA_SHAREDUSER => array( "users_meta" => $fileData ));
-            $new["AJXP_METASTORE_UPGRADED"] = true;
-        }
-        return $new;
-    }
-
-}
diff --git a/core/src/plugins/metastore.serial/i18n/conf/de.php b/core/src/plugins/metastore.serial/i18n/conf/de.php
index e0ad76aa3f..5e077852e3 100644
--- a/core/src/plugins/metastore.serial/i18n/conf/de.php
+++ b/core/src/plugins/metastore.serial/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Files MetaStore" => "Metadaten in Datei",
diff --git a/core/src/plugins/metastore.serial/i18n/conf/en.php b/core/src/plugins/metastore.serial/i18n/conf/en.php
index a2ec42d6c6..bf4dba26a4 100644
--- a/core/src/plugins/metastore.serial/i18n/conf/en.php
+++ b/core/src/plugins/metastore.serial/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Files MetaStore" => "Files MetaStore",
diff --git a/core/src/plugins/metastore.serial/i18n/conf/fr.php b/core/src/plugins/metastore.serial/i18n/conf/fr.php
index f10c8b28e3..7b965d73ad 100644
--- a/core/src/plugins/metastore.serial/i18n/conf/fr.php
+++ b/core/src/plugins/metastore.serial/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Files MetaStore" => "MetaStore Fichiers",
diff --git a/core/src/plugins/metastore.serial/i18n/conf/it.php b/core/src/plugins/metastore.serial/i18n/conf/it.php
index d52b0a27d0..cdfa3d22f5 100644
--- a/core/src/plugins/metastore.serial/i18n/conf/it.php
+++ b/core/src/plugins/metastore.serial/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Files MetaStore" => "File MetaStore",
diff --git a/core/src/plugins/metastore.serial/i18n/conf/pt.php b/core/src/plugins/metastore.serial/i18n/conf/pt.php
index c070bd6dab..cec46ca86f 100644
--- a/core/src/plugins/metastore.serial/i18n/conf/pt.php
+++ b/core/src/plugins/metastore.serial/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Files MetaStore" => "Ficheiros MetaStore",
diff --git a/core/src/plugins/metastore.serial/manifest.xml b/core/src/plugins/metastore.serial/manifest.xml
index b03553a42a..80105743c7 100644
--- a/core/src/plugins/metastore.serial/manifest.xml
+++ b/core/src/plugins/metastore.serial/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metastore id="metastore.serial" label="CONF_MESSAGE[Files MetaStore]" description="CONF_MESSAGE[Stores metadata inside local hidden files.]"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-	<class_definition filename="plugins/metastore.serial/class.SerialMetaStore.php" classname="SerialMetaStore"/>
+	<class_definition filename="plugins/metastore.serial/SerialMetaStore.php" classname="Pydio\Access\Metastore\Implementation\SerialMetaStore"/>
     <client_settings icon="plugins/access.mysql/resources/images/mysql_icon.png">
         <resources>
             <i18n namespace="metastore_serial" path="plugins/metastore.serial/i18n" />
@@ -10,11 +10,4 @@
         <param name="METADATA_FILE_LOCATION" type="select" choices="infolders|CONF_MESSAGE[In Local Folders],outside|CONF_MESSAGE[Application Data Folder]" label="CONF_MESSAGE[File location]" description="CONF_MESSAGE[Where to store the metadata file : LOCAL means a hidden file will be created in each folder, GLOBAL means that one file will be created in AJXP_DATA_PATH/plugins/action.share folder.]" mandatory="true" default="infolders"/>
         <param name="METADATA_FILE" type="string" label="CONF_MESSAGE[Meta File]" description="CONF_MESSAGE[Hidden file used inside folders to save meta data]" mandatory="true" default=".ajxp_meta"/>
 	</server_settings>
-    <registry_contributions>
-<!--
-        <hooks>
-            <serverCallback hookName="node.change" methodName="nodeChangeHook"/>
-        </hooks>
--->
-    </registry_contributions>
 </metastore>
diff --git a/core/src/plugins/metastore.xattr/XAttrMetaStore.php b/core/src/plugins/metastore.xattr/XAttrMetaStore.php
new file mode 100644
index 0000000000..40d394f469
--- /dev/null
+++ b/core/src/plugins/metastore.xattr/XAttrMetaStore.php
@@ -0,0 +1,163 @@
+<?php
+/*
+ * Copyright 2007-2012 Charles du Jeu <contact (at) cdujeu.me>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Access\Metastore\Implementation;
+
+use Pydio\Access\Core\Model\AJXP_Node;
+
+use Pydio\Access\Meta\Core\AbstractMetaSource;
+use Pydio\Access\Metastore\Core\IMetaStoreProvider;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+
+/**
+ * Class XAttrMetaStore
+ * @package Pydio\Access\Metastore\Implementation
+ */
+class XAttrMetaStore extends AbstractMetaSource implements IMetaStoreProvider
+{
+    protected $rootPath;
+
+    public function performChecks()
+    {
+        if (!function_exists("xattr_list")) {
+            throw new \Exception("The PHP Xattr Extension does not seem to be loaded");
+        }
+    }
+
+    /**
+     * @param $namespace
+     * @param $scope
+     * @param $user
+     * @return string
+     */
+    private function getMetaKey($namespace, $scope, $user)
+    {
+        return strtolower($namespace."-".$scope."-".$user);
+    }
+
+    /**
+     * @abstract
+     * @return bool
+     */
+    public function inherentMetaMove()
+    {
+        return true;
+    }
+
+    /**
+     * @param bool $private
+     * @param AJXP_Node $node
+     * @return string
+     */
+    protected function getUserId($private, $node)
+    {
+        if(!$private) return AJXP_METADATA_SHAREDUSER;
+        if($node->hasUser()) return $node->getUserId();
+        return "shared";
+    }
+
+    /**
+     * @abstract
+     * @param \Pydio\Access\Core\Model\AJXP_Node $ajxpNode
+     * @param String $nameSpace
+     * @param array $metaData
+     * @param bool $private
+     * @param int $scope
+     */
+    public function setMetadata($ajxpNode, $nameSpace, $metaData, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY)
+    {
+        $path = $ajxpNode->getRealFile();
+        if(!file_exists($path)) return;
+        $key = $this->getMetaKey($nameSpace, $scope, $this->getUserId($private, $ajxpNode));
+        if (!\xattr_supported($path)) {
+            throw new \Exception("Filesystem does not support Extended Attributes!");
+        }
+        $value = base64_encode(serialize($metaData));
+        \xattr_set($path, $key, $value);
+
+    }
+
+    /**
+     * @abstract
+     * @param \Pydio\Access\Core\Model\AJXP_Node $ajxpNode
+     * @param String $nameSpace
+     * @param bool $private
+     * @param int $scope
+     * @return array|void
+     * @throws \Exception
+     */
+    public function removeMetadata($ajxpNode, $nameSpace, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY)
+    {
+        $path = $ajxpNode->getRealFile();
+        if(!file_exists($path)) return;
+        $key = $this->getMetaKey($nameSpace, $scope, $this->getUserId($private, $ajxpNode));
+        if (!\xattr_supported($path)) {
+            throw new \Exception("Filesystem does not support Extended Attributes!");
+        }
+        \xattr_remove($path, $key);
+    }
+
+    /**
+     * @abstract
+     * @param AJXP_Node $ajxpNode
+     * @param String $nameSpace
+     * @param bool|String $private
+     * @param int $scope
+     * @return array()
+     */
+    public function retrieveMetadata($ajxpNode, $nameSpace, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY)
+    {
+        $path = $ajxpNode->getRealFile();
+        if(!file_exists($path)) return array();
+        if (!\xattr_supported($path)) {
+            //throw new Exception("Filesystem does not support Extended Attributes!");
+            return array();
+        }
+        if($private === AJXP_METADATA_ALLUSERS){
+            $startKey = $this->getMetaKey($nameSpace, $scope, "");
+            $arrMeta = array();
+            $keyList = \xattr_list($path);
+            foreach($keyList as $k){
+                if(strpos($k, $startKey) === 0){
+                    $mData = \xattr_get($path, $k);
+                    $decData = unserialize(base64_decode($mData));
+                    if(is_array($decData)) $arrMeta = array_merge_recursive($arrMeta, $decData);
+                }
+            }
+            return $arrMeta;
+        }else{
+            $key = $this->getMetaKey($nameSpace, $scope, $this->getUserId($private, $ajxpNode));
+            $data = \xattr_get($path, $key);
+            $data = unserialize(base64_decode($data));
+            if( empty($data) || !is_array($data)) return array();
+            return $data;
+        }
+    }
+
+    /**
+     * @param \Pydio\Access\Core\Model\AJXP_Node $ajxpNode
+     * @return void
+     */
+    public function enrichNode(&$ajxpNode)
+    {
+    }
+}
diff --git a/core/src/plugins/metastore.xattr/class.xAttrMetaStore.php b/core/src/plugins/metastore.xattr/class.xAttrMetaStore.php
deleted file mode 100755
index d38c685f42..0000000000
--- a/core/src/plugins/metastore.xattr/class.xAttrMetaStore.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/*
- * Copyright 2007-2012 Charles du Jeu <contact (at) cdujeu.me>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-
-/**
- * Use an xattr-enabled filesystem to store metadata
- * @package AjaXplorer_Plugins
- * @subpackage Metastore
- */
-class xAttrMetaStore extends AJXP_AbstractMetaSource implements MetaStoreProvider
-{
-    protected $rootPath;
-
-    public function performChecks()
-    {
-        if (!function_exists("xattr_list")) {
-            throw new Exception("The PHP Xattr Extension does not seem to be loaded");
-        }
-    }
-
-    private function getMetaKey($namespace, $scope, $user)
-    {
-        return strtolower($namespace."-".$scope."-".$user);
-    }
-
-    /**
-     * @abstract
-     * @return bool
-     */
-    public function inherentMetaMove()
-    {
-        return true;
-    }
-
-    /**
-     * @param bool $private
-     * @param AJXP_Node $node
-     * @return string
-     */
-    protected function getUserId($private, $node)
-    {
-        if(!$private) return AJXP_METADATA_SHAREDUSER;
-        if($node->hasUser()) return $node->getUser();
-        if(AuthService::usersEnabled()) return AuthService::getLoggedUser()->getId();
-        return "shared";
-    }
-
-    /**
-     * @abstract
-     * @param AJXP_Node $ajxpNode
-     * @param String $nameSpace
-     * @param array $metaData
-     * @param bool $private
-     * @param int $scope
-     */
-    public function setMetadata($ajxpNode, $nameSpace, $metaData, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY)
-    {
-        $path = $ajxpNode->getRealFile();
-        if(!file_exists($path)) return;
-        $key = $this->getMetaKey($nameSpace, $scope, $this->getUserId($private, $ajxpNode));
-        if (!xattr_supported($path)) {
-            throw new Exception("Filesystem does not support Extended Attributes!");
-        }
-        $value = base64_encode(serialize($metaData));
-        xattr_set($path, $key, $value);
-
-    }
-
-    /**
-     * @abstract
-     * @param AJXP_Node $ajxpNode
-     * @param String $nameSpace
-     * @param bool $private
-     * @param int $scope
-     */
-    public function removeMetadata($ajxpNode, $nameSpace, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY)
-    {
-        $path = $ajxpNode->getRealFile();
-        if(!file_exists($path)) return;
-        $key = $this->getMetaKey($nameSpace, $scope, $this->getUserId($private, $ajxpNode));
-        if (!xattr_supported($path)) {
-            throw new Exception("Filesystem does not support Extended Attributes!");
-        }
-        xattr_remove($path, $key);
-    }
-
-    /**
-     * @abstract
-     * @param AJXP_Node $ajxpNode
-     * @param String $nameSpace
-     * @param bool|String $private
-     * @param int $scope
-     * @return array()
-     */
-    public function retrieveMetadata($ajxpNode, $nameSpace, $private = false, $scope=AJXP_METADATA_SCOPE_REPOSITORY)
-    {
-        $path = $ajxpNode->getRealFile();
-        if(!file_exists($path)) return array();
-        if (!xattr_supported($path)) {
-            //throw new Exception("Filesystem does not support Extended Attributes!");
-            return array();
-        }
-        if($private === AJXP_METADATA_ALLUSERS){
-            $startKey = $this->getMetaKey($nameSpace, $scope, "");
-            $arrMeta = array();
-            $keyList = xattr_list($path);
-            foreach($keyList as $k){
-                if(strpos($k, $startKey) === 0){
-                    $mData = xattr_get($path, $k);
-                    $decData = unserialize(base64_decode($mData));
-                    if(is_array($decData)) $arrMeta = array_merge_recursive($arrMeta, $decData);
-                }
-            }
-            return $arrMeta;
-        }else{
-            $key = $this->getMetaKey($nameSpace, $scope, $this->getUserId($private, $ajxpNode));
-            $data = xattr_get($path, $key);
-            $data = unserialize(base64_decode($data));
-            if( empty($data) || !is_array($data)) return array();
-            return $data;
-        }
-    }
-
-    /**
-     * @param AJXP_Node $ajxpNode
-     * @return void
-     */
-    public function enrichNode(&$ajxpNode)
-    {
-    }
-}
diff --git a/core/src/plugins/metastore.xattr/i18n/conf/de.php b/core/src/plugins/metastore.xattr/i18n/conf/de.php
index 367bb61c6a..89b4379f92 100644
--- a/core/src/plugins/metastore.xattr/i18n/conf/de.php
+++ b/core/src/plugins/metastore.xattr/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Extended Attributes" => "Erweiterte Attribute",
diff --git a/core/src/plugins/metastore.xattr/i18n/conf/en.php b/core/src/plugins/metastore.xattr/i18n/conf/en.php
index 92bd84d325..51851bc257 100644
--- a/core/src/plugins/metastore.xattr/i18n/conf/en.php
+++ b/core/src/plugins/metastore.xattr/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Extended Attributes" => "Extended Attributes",
diff --git a/core/src/plugins/metastore.xattr/i18n/conf/it.php b/core/src/plugins/metastore.xattr/i18n/conf/it.php
index ec85ad371e..cd080ad79d 100644
--- a/core/src/plugins/metastore.xattr/i18n/conf/it.php
+++ b/core/src/plugins/metastore.xattr/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Extended Attributes" => "Attributi Estesi",
diff --git a/core/src/plugins/metastore.xattr/manifest.xml b/core/src/plugins/metastore.xattr/manifest.xml
index ee81b8ed1e..01a968db33 100644
--- a/core/src/plugins/metastore.xattr/manifest.xml
+++ b/core/src/plugins/metastore.xattr/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metastore id="metastore.xattr" enabled="false" label="CONF_MESSAGE[Extended Attributes]" description="CONF_MESSAGE[Stores metadata inside filesystem Extended Attributes.]"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-	<class_definition filename="plugins/metastore.xattr/class.xAttrMetaStore.php" classname="xAttrMetaStore"/>
+	<class_definition filename="plugins/metastore.xattr/XAttrMetaStore.php" classname="Pydio\Access\Metastore\Implementation\XAttrMetaStore"/>
 	<client_settings>
         <resources>
             <i18n namespace="xAttrMetaStore" path="plugins/metastore.xattr/i18n" />
diff --git a/core/src/plugins/mq.serial/SerialMessageExchanger.php b/core/src/plugins/mq.serial/SerialMessageExchanger.php
new file mode 100644
index 0000000000..d1e0accf54
--- /dev/null
+++ b/core/src/plugins/mq.serial/SerialMessageExchanger.php
@@ -0,0 +1,267 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Mq\Implementation;
+
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Utils\FileHelper;
+
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Notification\Core\IMessageExchanger;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+/**
+ * Serialized file plugin to manage messages queues
+ * @package AjaXplorer_Plugins
+ * @subpackage Mq
+ */
+class SerialMessageExchanger extends Plugin implements IMessageExchanger
+{
+
+    /**
+     * @var array
+     */
+    private $channels;
+    private $clientsGCTime = 10;
+
+    /**
+     * @param $channelName
+     * @param bool $create
+     * @throws \Exception
+     */
+    public function loadChannel($channelName, $create = false)
+    {
+        if (isSet($this->channels) && is_array($this->channels[$channelName])) {
+            return;
+        }
+        if (is_file($this->getPluginWorkDir()."/queues/channel-$channelName")) {
+            if(!isset($this->channels)) $this->channels = array();
+            $data = FileHelper::loadSerialFile($this->getPluginWorkDir() . "/queues/channel-$channelName");
+            if (is_array($data)) {
+                if(!is_array($data["MESSAGES"])) $data["MESSAGES"] = array();
+                if(!is_array($data["CLIENTS"])) $data["CLIENTS"] = array();
+                $this->channels[$channelName] = $data;
+                return;
+            }
+        }
+        if ($create) {
+            if(!isSet($this->channels)) $this->channels = array();
+            $this->channels[$channelName] = array("CLIENTS" => array(),
+                "MESSAGES" => array());
+        }
+    }
+
+    public function __destruct()
+    {
+        if (isSet($this->channels) && is_array($this->channels)) {
+            foreach ($this->channels as $channelName => $data) {
+                if (is_array($data)) {
+                    FileHelper::saveSerialFile($this->getPluginWorkDir() . "/queues/channel-$channelName", $data);
+                }
+            }
+        }
+    }
+
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $channelName
+     * @param $clientId
+     * @throws \Exception
+     * @return mixed
+     */
+    public function suscribeToChannel(ContextInterface $ctx, $channelName, $clientId)
+    {
+        $this->loadChannel($channelName, true);
+        if (UsersService::usersEnabled()) {
+            $user = $ctx->getUser();
+            if ($user == null) {
+                throw new \Exception("You must be logged in");
+            }
+            $GROUP_PATH = $user->getGroupPath();
+            $USER_ID = $user->getId();
+        } else {
+            $GROUP_PATH = '/';
+            $USER_ID = 'shared';
+        }
+        if($GROUP_PATH == null) $GROUP_PATH = false;
+        $this->channels[$channelName]["CLIENTS"][$clientId] = array(
+            "ALIVE" => time(),
+            "USER_ID" => $USER_ID,
+            "GROUP_PATH" => $GROUP_PATH
+        );
+        foreach ($this->channels[$channelName]["MESSAGES"] as &$object) {
+            $object->messageRC[$clientId] = $clientId;
+        }
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $channelName
+     * @param $clientId
+     * @return mixed
+     */
+    public function unsuscribeFromChannel(ContextInterface $ctx, $channelName, $clientId)
+    {
+        $this->loadChannel($channelName);
+        if(!isSet($this->channels) || !isSet($this->channels[$channelName])) return;
+        if(!array_key_exists($clientId,  $this->channels[$channelName]["CLIENTS"])) return;
+        unset($this->channels[$channelName]["CLIENTS"][$clientId]);
+        foreach ($this->channels[$channelName]["MESSAGES"] as $index => &$object) {
+            unset($object->messageRC[$clientId]);
+            if (count($object->messageRC)== 0) {
+                unset($this->channels[$channelName]["MESSAGES"][$index]);
+            }
+        }
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $channelName
+     * @param $messageObject
+     */
+    public function publishToChannel(ContextInterface $ctx, $channelName, $messageObject)
+    {
+        $this->loadChannel($channelName);
+        if(!isSet($this->channels) || !isSet($this->channels[$channelName])) return;
+        if(!count($this->channels[$channelName]["CLIENTS"])) return;
+        $clientIds = array_keys($this->channels[$channelName]["CLIENTS"]);
+        $messageObject->messageRC = array_combine($clientIds, $clientIds);
+        $messageObject->messageTS = microtime();
+        $this->channels[$channelName]["MESSAGES"][] = $messageObject;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $channelName
+     * @param $clientId
+     * @param $userId
+     * @param $userGroup
+     * @return mixed
+     */
+    public function consumeInstantChannel(ContextInterface $ctx, $channelName, $clientId, $userId, $userGroup)
+    {
+        // Force refresh
+        //$this->channels = null;
+        $this->loadChannel($channelName);
+        if(!isSet($this->channels) || !isSet($this->channels[$channelName])) {
+            return null;
+        }
+        // Check dead clients
+        if (is_array($this->channels[$channelName]["CLIENTS"])) {
+            $toRemove = array();
+            foreach ($this->channels[$channelName]["CLIENTS"] as $cId => $cData) {
+                $cAlive = $cData["ALIVE"];
+                if( $cId != $clientId &&  time() - $cAlive > $this->clientsGCTime * 60) $toRemove[] = $cId;
+            }
+            if(count($toRemove)) {
+                foreach($toRemove as $c) {
+                    $this->unsuscribeFromChannel($ctx, $channelName, $c);
+                }
+            }
+        }
+        if (!array_key_exists($clientId,  $this->channels[$channelName]["CLIENTS"])) {
+            // Auto Suscribe
+            $this->suscribeToChannel($ctx, $channelName, $clientId);
+        }
+        $this->channels[$channelName]["CLIENTS"][$clientId]["ALIVE"] = time();
+        
+        $result = array();
+        foreach ($this->channels[$channelName]["MESSAGES"] as $index => $object) {
+            if (!isSet($object->messageRC[$clientId])) {
+                continue;
+            }
+            if (isSet($object->userId) && $object->userId != $userId) {
+                // Skipping, restricted to userId
+                continue;
+            }
+            if (isSet($object->groupPath) && $object->groupPath != $userGroup) {
+                // Skipping, restricted to groupPath
+                continue;
+            }
+            $result[] = $object;
+            unset($object->messageRC[$clientId]);
+            if (count($object->messageRC) <= 0) {
+                unset($this->channels[$channelName]["MESSAGES"][$index]);
+            } else {
+                $this->channels[$channelName]["MESSAGES"][$index] = $object;
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $channelName
+     * @param $filter
+     * @return mixed
+     */
+    public function consumeWorkerChannel(ContextInterface $ctx, $channelName, $filter = null)
+    {
+        $data = array();
+        if (file_exists($this->getPluginWorkDir()."/worker/$channelName.ser")) {
+            $data = unserialize(file_get_contents($this->getPluginWorkDir()."/worker/$channelName.ser"));
+            file_put_contents($this->getPluginWorkDir()."/worker/$channelName.ser", array(), LOCK_EX);
+        }
+        return $data;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param string $channel Name of the persistant queue to create
+     * @param object $message Message to send
+     * @return mixed
+     */
+    public function publishWorkerMessage(ContextInterface $ctx, $channel, $message)
+    {
+        $data = array();
+        $fExists = false;
+        if (file_exists($this->getPluginWorkDir()."/worker/$channel.ser")) {
+            $fExists = true;
+            $data = unserialize(file_get_contents($this->getPluginWorkDir()."/worker/$channel.ser"));
+        }
+        $data[] = $message;
+        if (!$fExists) {
+            if (!is_dir($this->getPluginWorkDir()."/queues")) {
+                mkdir($this->getPluginWorkDir()."/queues", 0755, true);
+            }
+        }
+        $res = file_put_contents($this->getPluginWorkDir()."/worker/$channel.ser", serialize($data), LOCK_EX);
+        return $res;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $channel
+     * @param $message
+     * @return Object
+     */
+    public function publishInstantMessage(ContextInterface $ctx, $channel, $message)
+    {
+        $this->loadChannel($channel);
+        if(!isSet($this->channels) || !isSet($this->channels[$channel])) return;
+        if(!count($this->channels[$channel]["CLIENTS"])) return;
+        $clientIds = array_keys($this->channels[$channel]["CLIENTS"]);
+        $message->messageRC = array_combine($clientIds, $clientIds);
+        $message->messageTS = microtime();
+        $this->channels[$channel]["MESSAGES"][] = $message;
+    }
+}
diff --git a/core/src/plugins/mq.serial/class.AJXP_SerialMessageExchanger.php b/core/src/plugins/mq.serial/class.AJXP_SerialMessageExchanger.php
deleted file mode 100644
index 0bff769d89..0000000000
--- a/core/src/plugins/mq.serial/class.AJXP_SerialMessageExchanger.php
+++ /dev/null
@@ -1,248 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-/**
- * Serialized file plugin to manage messages queues
- * @package AjaXplorer_Plugins
- * @subpackage Mq
- */
-class AJXP_SerialMessageExchanger extends AJXP_Plugin implements AJXP_MessageExchanger
-{
-
-    /**
-     * @var Array
-     */
-    private $channels;
-    private $clientsGCTime = 10;
-
-    public function loadChannel($channelName, $create = false)
-    {
-        if (isSet($this->channels) && is_array($this->channels[$channelName])) {
-            return;
-        }
-        if (is_file($this->getPluginWorkDir()."/queues/channel-$channelName")) {
-            if(!isset($this->channels)) $this->channels = array();
-            $data = AJXP_Utils::loadSerialFile($this->getPluginWorkDir()."/queues/channel-$channelName");
-            if (is_array($data)) {
-                if(!is_array($data["MESSAGES"])) $data["MESSAGES"] = array();
-                if(!is_array($data["CLIENTS"])) $data["CLIENTS"] = array();
-                $this->channels[$channelName] = $data;
-                return;
-            }
-        }
-        if ($create) {
-            if(!isSet($this->channels)) $this->channels = array();
-            $this->channels[$channelName] = array("CLIENTS" => array(),
-                "MESSAGES" => array());
-        }
-    }
-
-    public function __destruct()
-    {
-        if (isSet($this->channels) && is_array($this->channels)) {
-            foreach ($this->channels as $channelName => $data) {
-                if (is_array($data)) {
-                    AJXP_Utils::saveSerialFile($this->getPluginWorkDir()."/queues/channel-$channelName", $data);
-                }
-            }
-        }
-    }
-
-
-    /**
-     * @param $channelName
-     * @param $clientId
-     * @throws Exception
-     * @return mixed
-     */
-    public function suscribeToChannel($channelName, $clientId)
-    {
-        $this->loadChannel($channelName, true);
-        if (AuthService::usersEnabled()) {
-            $user = AuthService::getLoggedUser();
-            if ($user == null) {
-                throw new Exception("You must be logged in");
-            }
-            $GROUP_PATH = $user->getGroupPath();
-            $USER_ID = $user->getId();
-        } else {
-            $GROUP_PATH = '/';
-            $USER_ID = 'shared';
-        }
-        if($GROUP_PATH == null) $GROUP_PATH = false;
-        $this->channels[$channelName]["CLIENTS"][$clientId] = array(
-            "ALIVE" => time(),
-            "USER_ID" => $USER_ID,
-            "GROUP_PATH" => $GROUP_PATH
-        );
-        foreach ($this->channels[$channelName]["MESSAGES"] as &$object) {
-            $object->messageRC[$clientId] = $clientId;
-        }
-    }
-
-    /**
-     * @param $channelName
-     * @param $clientId
-     * @return mixed
-     */
-    public function unsuscribeFromChannel($channelName, $clientId)
-    {
-        $this->loadChannel($channelName);
-        if(!isSet($this->channels) || !isSet($this->channels[$channelName])) return;
-        if(!array_key_exists($clientId,  $this->channels[$channelName]["CLIENTS"])) return;
-        unset($this->channels[$channelName]["CLIENTS"][$clientId]);
-        foreach ($this->channels[$channelName]["MESSAGES"] as $index => &$object) {
-            unset($object->messageRC[$clientId]);
-            if (count($object->messageRC)== 0) {
-                unset($this->channels[$channelName]["MESSAGES"][$index]);
-            }
-        }
-    }
-
-    public function publishToChannel($channelName, $messageObject)
-    {
-        $this->loadChannel($channelName);
-        if(!isSet($this->channels) || !isSet($this->channels[$channelName])) return;
-        if(!count($this->channels[$channelName]["CLIENTS"])) return;
-        $clientIds = array_keys($this->channels[$channelName]["CLIENTS"]);
-        $messageObject->messageRC = array_combine($clientIds, $clientIds);
-        $messageObject->messageTS = microtime();
-        $this->channels[$channelName]["MESSAGES"][] = $messageObject;
-    }
-
-    /**
-     * @param $channelName
-     * @param $clientId
-     * @param $userId
-     * @param $userGroup
-     * @return mixed
-     */
-    public function consumeInstantChannel($channelName, $clientId, $userId, $userGroup)
-    {
-        // Force refresh
-        //$this->channels = null;
-        $this->loadChannel($channelName);
-        if(!isSet($this->channels) || !isSet($this->channels[$channelName])) return;
-        // Check dead clients
-        if (is_array($this->channels[$channelName]["CLIENTS"])) {
-            $toRemove = array();
-            foreach ($this->channels[$channelName]["CLIENTS"] as $cId => $cData) {
-                $cAlive = $cData["ALIVE"];
-                if( $cId != $clientId &&  time() - $cAlive > $this->clientsGCTime * 60) $toRemove[] = $cId;
-            }
-            if(count($toRemove)) foreach($toRemove as $c) $this->unsuscribeFromChannel($channelName, $c);
-        }
-        if (!array_key_exists($clientId,  $this->channels[$channelName]["CLIENTS"])) {
-            // Auto Suscribe
-            $this->suscribeToChannel($channelName, $clientId);
-        }
-        $this->channels[$channelName]["CLIENTS"][$clientId]["ALIVE"] = time();
-
-        //$user = AuthService::getLoggedUser();
-       // if ($user == null) {
-       //     throw new Exception("You must be logged in");
-       // }
-        //$GROUP_PATH = $user->getGroupPath();
-       // if($GROUP_PATH == null) $GROUP_PATH = false;
-
-        $result = array();
-        foreach ($this->channels[$channelName]["MESSAGES"] as $index => $object) {
-            if (!isSet($object->messageRC[$clientId])) {
-                continue;
-            }
-            if (isSet($object->userId) && $object->userId != $userId) {
-                // Skipping, restricted to userId
-                continue;
-            }
-            if (isSet($object->groupPath) && $object->groupPath != $userGroup) {
-                // Skipping, restricted to groupPath
-                continue;
-            }
-            $result[] = $object;
-            unset($object->messageRC[$clientId]);
-            if (count($object->messageRC) <= 0) {
-                unset($this->channels[$channelName]["MESSAGES"][$index]);
-            } else {
-                $this->channels[$channelName]["MESSAGES"][$index] = $object;
-            }
-        }
-        return $result;
-    }
-
-
-
-
-
-    /**
-     * @param $channelName
-     * @param $filter
-     * @return mixed
-     */
-    public function consumeWorkerChannel($channelName, $filter = null)
-    {
-        $data = array();
-        if (file_exists($this->getPluginWorkDir()."/worker/$channelName.ser")) {
-            $data = unserialize(file_get_contents($this->getPluginWorkDir()."/worker/$channelName.ser"));
-            file_put_contents($this->getPluginWorkDir()."/worker/$channelName.ser", array(), LOCK_EX);
-        }
-        return $data;
-    }
-
-    /**
-     * @param string $channel Name of the persistant queue to create
-     * @param object $message Message to send
-     * @return mixed
-     */
-    public function publishWorkerMessage($channel, $message)
-    {
-        $data = array();
-        $fExists = false;
-        if (file_exists($this->getPluginWorkDir()."/worker/$channel.ser")) {
-            $fExists = true;
-            $data = unserialize(file_get_contents($this->getPluginWorkDir()."/worker/$channel.ser"));
-        }
-        $data[] = $message;
-        if (!$fExists) {
-            if (!is_dir($this->getPluginWorkDir()."/queues")) {
-                mkdir($this->getPluginWorkDir()."/queues", 0755, true);
-            }
-        }
-        $res = file_put_contents($this->getPluginWorkDir()."/worker/$channel.ser", serialize($data), LOCK_EX);
-        return $res;
-    }
-
-    /**
-     * @param $channel
-     * @param $message
-     * @return Object
-     */
-    public function publishInstantMessage($channel, $message)
-    {
-        $this->loadChannel($channel);
-        if(!isSet($this->channels) || !isSet($this->channels[$channel])) return;
-        if(!count($this->channels[$channel]["CLIENTS"])) return;
-        $clientIds = array_keys($this->channels[$channel]["CLIENTS"]);
-        $message->messageRC = array_combine($clientIds, $clientIds);
-        $message->messageTS = microtime();
-        $this->channels[$channel]["MESSAGES"][] = $message;
-    }
-}
diff --git a/core/src/plugins/mq.serial/i18n/conf/cs.php b/core/src/plugins/mq.serial/i18n/conf/cs.php
index e2b85f3b37..67a9b8aa2d 100644
--- a/core/src/plugins/mq.serial/i18n/conf/cs.php
+++ b/core/src/plugins/mq.serial/i18n/conf/cs.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "MQ Serial" => "MQ Serial",
diff --git a/core/src/plugins/mq.serial/i18n/conf/de.php b/core/src/plugins/mq.serial/i18n/conf/de.php
index 9cc77f8a02..44da30a105 100644
--- a/core/src/plugins/mq.serial/i18n/conf/de.php
+++ b/core/src/plugins/mq.serial/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "MQ Serial" => "Datei-Warteschlange",
diff --git a/core/src/plugins/mq.serial/i18n/conf/en.php b/core/src/plugins/mq.serial/i18n/conf/en.php
index 1831502c82..d9dbda128a 100644
--- a/core/src/plugins/mq.serial/i18n/conf/en.php
+++ b/core/src/plugins/mq.serial/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "MQ Serial" => "MQ Serial",
diff --git a/core/src/plugins/mq.serial/i18n/conf/it.php b/core/src/plugins/mq.serial/i18n/conf/it.php
index b9184602fe..9b68717707 100644
--- a/core/src/plugins/mq.serial/i18n/conf/it.php
+++ b/core/src/plugins/mq.serial/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "MQ Serial" => "MQ Seriale",
diff --git a/core/src/plugins/mq.serial/manifest.xml b/core/src/plugins/mq.serial/manifest.xml
index 9c0f33d53d..93bc1d6a00 100644
--- a/core/src/plugins/mq.serial/manifest.xml
+++ b/core/src/plugins/mq.serial/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ajxp_plugin label="CONF_MESSAGE[MQ Serial]" description="CONF_MESSAGE[Store persistant and worker queues in serial files]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <class_definition classname="AJXP_SerialMessageExchanger" filename="plugins/mq.serial/class.AJXP_SerialMessageExchanger.php"/>
+    <class_definition classname="Pydio\Mq\Implementation\SerialMessageExchanger" filename="plugins/mq.serial/SerialMessageExchanger.php"/>
 	<client_settings>
         <resources>
             <i18n namespace="serialMessageExchanger" path="plugins/mq.serial/i18n" />
diff --git a/core/src/plugins/mq.sql/SqlMessageExchanger.php b/core/src/plugins/mq.sql/SqlMessageExchanger.php
new file mode 100644
index 0000000000..821a8bec67
--- /dev/null
+++ b/core/src/plugins/mq.sql/SqlMessageExchanger.php
@@ -0,0 +1,308 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Mq\Implementation;
+
+use Pydio\Core\Model\ContextInterface;
+
+use Pydio\Core\Utils\FileHelper;
+use Pydio\Core\Utils\Vars\OptionsHelper;
+
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Notification\Core\IMessageExchanger;
+use \dibi as dibi;
+
+defined('AJXP_EXEC') or die('Access not allowed');
+
+/**
+ * Sql-based plugin to manage messages queues
+ *
+ * @package AjaXplorer_Plugins
+ * @subpackage Mq
+ */
+class SqlMessageExchanger extends Plugin implements IMessageExchanger
+{
+
+    /**
+     * @param ContextInterface $ctx
+     * @param array $options
+     */
+    public function init(ContextInterface $ctx, $options = [])
+    {
+           parent::init($ctx, $options);
+           $this->sqlDriver = $this->sqlDriver = OptionsHelper::cleanDibiDriverParameters($options["SQL_DRIVER"]);
+       }
+
+    public function performChecks()
+    {
+        if(!isSet($this->options)) return;
+        $test = OptionsHelper::cleanDibiDriverParameters($this->options["SQL_DRIVER"]);
+        if (!count($test)) {
+            throw new \Exception("Please define an SQL connexion in the core configuration");
+        }
+    }
+
+
+    /**
+     * @var array
+     */
+    private $channels;
+    private $clientsGCTime = 10;
+    private $sqlDriver;
+
+    /**
+     * @param $channelName
+     * @param bool $create
+     * @throws \Exception
+     */
+    public function loadChannel($channelName, $create = false)
+    {
+        if (isSet($this->channels) && is_array($this->channels[$channelName])) {
+            return;
+        }
+        if (is_file($this->getPluginWorkDir()."/queues/channel-$channelName")) {
+            if(!isset($this->channels)) $this->channels = array();
+            $data = FileHelper::loadSerialFile($this->getPluginWorkDir() . "/queues/channel-$channelName");
+            if (is_array($data)) {
+                if(!is_array($data["MESSAGES"])) $data["MESSAGES"] = array();
+                if(!is_array($data["CLIENTS"])) $data["CLIENTS"] = array();
+                $this->channels[$channelName] = $data;
+                return;
+            }
+        }
+        if ($create) {
+            if(!isSet($this->channels)) $this->channels = array();
+            $this->channels[$channelName] = array("CLIENTS" => array(),
+                "MESSAGES" => array());
+        }
+    }
+
+    public function __destruct()
+    {
+        if (isSet($this->channels) && is_array($this->channels)) {
+            foreach ($this->channels as $channelName => $data) {
+                if (is_array($data)) {
+                    FileHelper::saveSerialFile($this->getPluginWorkDir() . "/queues/channel-$channelName", $data);
+                }
+            }
+        }
+    }
+
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $channelName
+     * @param $clientId
+     * @return mixed
+     * @throws \Exception
+     */
+    public function suscribeToChannel(ContextInterface $ctx, $channelName, $clientId)
+    {
+        $this->loadChannel($channelName, true);
+        if ($ctx->hasUser()) {
+            $user = $ctx->getUser();
+            if ($user == null) {
+                throw new \Exception("You must be logged in");
+            }
+            $GROUP_PATH = $user->getGroupPath();
+            $USER_ID = $user->getId();
+        } else {
+            $GROUP_PATH = "/";
+            $USER_ID = "shared";
+        }
+        if($GROUP_PATH == null) $GROUP_PATH = false;
+        $this->channels[$channelName]["CLIENTS"][$clientId] = array(
+            "ALIVE" => time(),
+            "USER_ID" => $USER_ID,
+            "GROUP_PATH" => $GROUP_PATH
+        );
+        /*
+        foreach ($this->channels[$channelName]["MESSAGES"] as &$object) {
+            $object->messageRC[$clientId] = $clientId;
+        }
+        */
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $channelName
+     * @param $clientId
+     * @return mixed
+     */
+    public function unsuscribeFromChannel(ContextInterface $ctx, $channelName, $clientId)
+    {
+        $this->loadChannel($channelName);
+        if(!isSet($this->channels) || !isSet($this->channels[$channelName])) return;
+        if(!array_key_exists($clientId,  $this->channels[$channelName]["CLIENTS"])) return;
+        unset($this->channels[$channelName]["CLIENTS"][$clientId]);
+        foreach ($this->channels[$channelName]["MESSAGES"] as $index => &$object) {
+            unset($object->messageRC[$clientId]);
+            if (count($object->messageRC)== 0) {
+                unset($this->channels[$channelName]["MESSAGES"][$index]);
+            }
+        }
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $channelName
+     * @param $messageObject
+     */
+    public function publishToChannel(ContextInterface $ctx, $channelName, $messageObject)
+    {
+        $this->loadChannel($channelName);
+        if(!isSet($this->channels) || !isSet($this->channels[$channelName])) return;
+        if(!count($this->channels[$channelName]["CLIENTS"])) return;
+        $clientIds = array_keys($this->channels[$channelName]["CLIENTS"]);
+        $messageObject->messageRC = array_combine($clientIds, $clientIds);
+        $messageObject->messageTS = microtime();
+        $this->channels[$channelName]["MESSAGES"][] = $messageObject;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $channelName
+     * @param $clientId
+     * @param $userId
+     * @param $userGroup
+     * @return mixed
+     * @throws \Exception
+     */
+    public function consumeInstantChannel(ContextInterface $ctx, $channelName, $clientId, $userId, $userGroup)
+    {
+        $this->loadChannel($channelName);
+        if(!isSet($this->channels) || !isSet($this->channels[$channelName])) {
+            return null;
+        }
+        // Check dead clients
+        if (is_array($this->channels[$channelName]["CLIENTS"])) {
+            $toRemove = array();
+            foreach ($this->channels[$channelName]["CLIENTS"] as $cId => $cData) {
+                $cAlive = $cData["ALIVE"];
+                if( $cId != $clientId &&  time() - $cAlive > $this->clientsGCTime * 60) $toRemove[] = $cId;
+            }
+            if(count($toRemove)) {
+                foreach($toRemove as $c) {
+                    $this->unsuscribeFromChannel($ctx, $channelName, $c);
+                }
+            }
+        }
+        if (!array_key_exists($clientId,  $this->channels[$channelName]["CLIENTS"])) {
+            // Auto Suscribe
+            $this->suscribeToChannel($ctx, $channelName, $clientId);
+        }
+        $this->channels[$channelName]["CLIENTS"][$clientId]["ALIVE"] = time();
+
+        $result = array();
+        foreach ($this->channels[$channelName]["MESSAGES"] as $index => $object) {
+            if (!isSet($object->messageRC[$clientId])) {
+                continue;
+            }
+            if (isSet($object->userId) && $object->userId != $userId) {
+                // Skipping, restricted to userId
+                continue;
+            }
+            if (isSet($object->groupPath) && $object->groupPath != $userGroup) {
+                // Skipping, restricted to groupPath
+                continue;
+            }
+            $result[] = $object;
+            unset($object->messageRC[$clientId]);
+            if (count($object->messageRC) <= 0) {
+                unset($this->channels[$channelName]["MESSAGES"][$index]);
+            } else {
+                $this->channels[$channelName]["MESSAGES"][$index] = $object;
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $channelName
+     * @param $filter
+     * @return mixed
+     */
+    public function consumeWorkerChannel(ContextInterface $ctx, $channelName, $filter = null)
+    {
+        if(!dibi::isConnected()) {
+            dibi::connect($this->sqlDriver);
+        }
+        $castType = "UNSIGNED";
+        if($this->sqlDriver["driver"] == "postgre") $castType = "INTEGER";
+        $results = dibi::query("SELECT * FROM [ajxp_simple_store] WHERE [store_id]=%s ORDER BY CAST([object_id] AS ".$castType.") ASC", "queues.$channelName");
+        $rows = $results->fetchAll();
+        $arr = array();
+        $deleted = array();
+        foreach ($rows as $row) {
+            $arr[] = unserialize($row["serialized_data"]);
+            $deleted[] = $row["object_id"];
+        }
+        if (count($deleted)) {
+            // We use (%s) instead of %in to pass everyting as string ('1' instead of 1)
+            dibi::query("DELETE FROM [ajxp_simple_store] WHERE [store_id]=%s AND [object_id] IN (%s)", "queues.$channelName", $deleted);
+        }
+        return $arr;
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param string $channel Name of the persistant queue to create
+     * @param object $message Message to send
+     * @return mixed
+     */
+    public function publishWorkerMessage(ContextInterface $ctx, $channel, $message)
+    {
+        if(!dibi::isConnected()) {
+            dibi::connect($this->sqlDriver);
+        }
+        $castType = "UNSIGNED";
+        if($this->sqlDriver["driver"] == "postgre") $castType = "INTEGER";
+        $r = dibi::query("SELECT MAX( CAST( [object_id] AS ".$castType." ) ) FROM [ajxp_simple_store] WHERE [store_id]=%s", "queues.$channel");
+        $index = $r->fetchSingle();
+        if($index == null) $index = 1;
+        else $index = intval($index)+1;
+        $values = array(
+            "store_id" => "queues.$channel",
+            "object_id" => $index,
+            "serialized_data" => serialize($message)
+        );
+        dibi::query("INSERT INTO [ajxp_simple_store] ([object_id],[store_id],[serialized_data],[binary_data],[related_object_id]) VALUES (%s,%s,%bin,%bin,%s)",
+            $values["object_id"], $values["store_id"], $values["serialized_data"], $values["binary_data"], $values["related_object_id"]);
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $channel
+     * @param $message
+     * @return Object
+     */
+    public function publishInstantMessage(ContextInterface $ctx, $channel, $message)
+    {
+        $this->loadChannel($channel);
+        if(!isSet($this->channels) || !isSet($this->channels[$channel])) return;
+        if(!count($this->channels[$channel]["CLIENTS"])) return;
+        $clientIds = array_keys($this->channels[$channel]["CLIENTS"]);
+        $message->messageRC = array_combine($clientIds, $clientIds);
+        $message->messageTS = microtime();
+        $this->channels[$channel]["MESSAGES"][] = $message;
+    }
+
+}
diff --git a/core/src/plugins/mq.sql/class.AJXP_SqlMessageExchanger.php b/core/src/plugins/mq.sql/class.AJXP_SqlMessageExchanger.php
deleted file mode 100644
index 375e72219d..0000000000
--- a/core/src/plugins/mq.sql/class.AJXP_SqlMessageExchanger.php
+++ /dev/null
@@ -1,282 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die('Access not allowed');
-
-/**
- * Sql-based plugin to manage messages queues
- *
- * @package AjaXplorer_Plugins
- * @subpackage Mq
- */
-class AJXP_SqlMessageExchanger extends AJXP_Plugin implements AJXP_MessageExchanger
-{
-
-    public function init($options)
-    {
-           parent::init($options);
-           $this->sqlDriver = $this->sqlDriver = AJXP_Utils::cleanDibiDriverParameters($options["SQL_DRIVER"]);
-       }
-
-    public function performChecks()
-    {
-        if(!isSet($this->options)) return;
-        $test = AJXP_Utils::cleanDibiDriverParameters($this->options["SQL_DRIVER"]);
-        if (!count($test)) {
-            throw new Exception("Please define an SQL connexion in the core configuration");
-        }
-    }
-
-
-    /**
-     * @var Array
-     */
-    private $channels;
-    private $clientsGCTime = 10;
-    private $sqlDriver;
-
-    public function loadChannel($channelName, $create = false)
-    {
-        if (isSet($this->channels) && is_array($this->channels[$channelName])) {
-            return;
-        }
-        if (is_file($this->getPluginWorkDir()."/queues/channel-$channelName")) {
-            if(!isset($this->channels)) $this->channels = array();
-            $data = AJXP_Utils::loadSerialFile($this->getPluginWorkDir()."/queues/channel-$channelName");
-            if (is_array($data)) {
-                if(!is_array($data["MESSAGES"])) $data["MESSAGES"] = array();
-                if(!is_array($data["CLIENTS"])) $data["CLIENTS"] = array();
-                $this->channels[$channelName] = $data;
-                return;
-            }
-        }
-        if ($create) {
-            if(!isSet($this->channels)) $this->channels = array();
-            $this->channels[$channelName] = array("CLIENTS" => array(),
-                "MESSAGES" => array());
-        }
-    }
-
-    public function __destruct()
-    {
-        if (isSet($this->channels) && is_array($this->channels)) {
-            foreach ($this->channels as $channelName => $data) {
-                if (is_array($data)) {
-                    AJXP_Utils::saveSerialFile($this->getPluginWorkDir()."/queues/channel-$channelName", $data);
-                }
-            }
-        }
-    }
-
-
-    /**
-     * @param $channelName
-     * @param $clientId
-     * @return mixed
-     */
-    public function suscribeToChannel($channelName, $clientId)
-    {
-        $this->loadChannel($channelName, true);
-        if (AuthService::usersEnabled()) {
-            $user = AuthService::getLoggedUser();
-            if ($user == null) {
-                throw new Exception("You must be logged in");
-            }
-            $GROUP_PATH = $user->getGroupPath();
-            $USER_ID = $user->getId();
-        } else {
-            $GROUP_PATH = "/";
-            $USER_ID = "shared";
-        }
-        if($GROUP_PATH == null) $GROUP_PATH = false;
-        $this->channels[$channelName]["CLIENTS"][$clientId] = array(
-            "ALIVE" => time(),
-            "USER_ID" => $USER_ID,
-            "GROUP_PATH" => $GROUP_PATH
-        );
-        /*
-        foreach ($this->channels[$channelName]["MESSAGES"] as &$object) {
-            $object->messageRC[$clientId] = $clientId;
-        }
-        */
-    }
-
-    /**
-     * @param $channelName
-     * @param $clientId
-     * @return mixed
-     */
-    public function unsuscribeFromChannel($channelName, $clientId)
-    {
-        $this->loadChannel($channelName);
-        if(!isSet($this->channels) || !isSet($this->channels[$channelName])) return;
-        if(!array_key_exists($clientId,  $this->channels[$channelName]["CLIENTS"])) return;
-        unset($this->channels[$channelName]["CLIENTS"][$clientId]);
-        foreach ($this->channels[$channelName]["MESSAGES"] as $index => &$object) {
-            unset($object->messageRC[$clientId]);
-            if (count($object->messageRC)== 0) {
-                unset($this->channels[$channelName]["MESSAGES"][$index]);
-            }
-        }
-    }
-
-    public function publishToChannel($channelName, $messageObject)
-    {
-        $this->loadChannel($channelName);
-        if(!isSet($this->channels) || !isSet($this->channels[$channelName])) return;
-        if(!count($this->channels[$channelName]["CLIENTS"])) return;
-        $clientIds = array_keys($this->channels[$channelName]["CLIENTS"]);
-        $messageObject->messageRC = array_combine($clientIds, $clientIds);
-        $messageObject->messageTS = microtime();
-        $this->channels[$channelName]["MESSAGES"][] = $messageObject;
-    }
-
-    /**
-     * @param $channelName
-     * @param $clientId
-     * @param $userId
-     * @param $userGroup
-     * @return mixed
-     */
-    public function consumeInstantChannel($channelName, $clientId, $userId, $userGroup)
-    {
-        $this->loadChannel($channelName);
-        if(!isSet($this->channels) || !isSet($this->channels[$channelName])) return;
-        // Check dead clients
-        if (is_array($this->channels[$channelName]["CLIENTS"])) {
-            $toRemove = array();
-            foreach ($this->channels[$channelName]["CLIENTS"] as $cId => $cData) {
-                $cAlive = $cData["ALIVE"];
-                if( $cId != $clientId &&  time() - $cAlive > $this->clientsGCTime * 60) $toRemove[] = $cId;
-            }
-            if(count($toRemove)) foreach($toRemove as $c) $this->unsuscribeFromChannel($channelName, $c);
-        }
-        if (!array_key_exists($clientId,  $this->channels[$channelName]["CLIENTS"])) {
-            // Auto Suscribe
-            $this->suscribeToChannel($channelName, $clientId);
-        }
-        $this->channels[$channelName]["CLIENTS"][$clientId]["ALIVE"] = time();
-
-        /*
-        $user = AuthService::getLoggedUser();
-        if ($user == null) {
-            throw new Exception("You must be logged in");
-        }
-        $GROUP_PATH = $user->getGroupPath();
-        if($GROUP_PATH == null) $GROUP_PATH = false;
-        */
-        $result = array();
-        foreach ($this->channels[$channelName]["MESSAGES"] as $index => $object) {
-            if (!isSet($object->messageRC[$clientId])) {
-                continue;
-            }
-            if (isSet($object->userId) && $object->userId != $userId) {
-                // Skipping, restricted to userId
-                continue;
-            }
-            if (isSet($object->groupPath) && $object->groupPath != $userGroup) {
-                // Skipping, restricted to groupPath
-                continue;
-            }
-            $result[] = $object;
-            unset($object->messageRC[$clientId]);
-            if (count($object->messageRC) <= 0) {
-                unset($this->channels[$channelName]["MESSAGES"][$index]);
-            } else {
-                $this->channels[$channelName]["MESSAGES"][$index] = $object;
-            }
-        }
-        return $result;
-    }
-
-
-
-
-
-    /**
-     * @param $channelName
-     * @param $filter
-     * @return mixed
-     */
-    public function consumeWorkerChannel($channelName, $filter = null)
-    {
-        if(!dibi::isConnected()) {
-            dibi::connect($this->sqlDriver);
-        }
-        $castType = "UNSIGNED";
-        if($this->sqlDriver["driver"] == "postgre") $castType = "INTEGER";
-        $results = dibi::query("SELECT * FROM [ajxp_simple_store] WHERE [store_id]=%s ORDER BY CAST([object_id] AS ".$castType.") ASC", "queues.$channelName");
-        $rows = $results->fetchAll();
-        $arr = array();
-        $deleted = array();
-        foreach ($rows as $row) {
-            $arr[] = unserialize($row["serialized_data"]);
-            $deleted[] = $row["object_id"];
-        }
-        if (count($deleted)) {
-            // We use (%s) instead of %in to pass everyting as string ('1' instead of 1)
-            dibi::query("DELETE FROM [ajxp_simple_store] WHERE [store_id]=%s AND [object_id] IN (%s)", "queues.$channelName", $deleted);
-        }
-        return $arr;
-    }
-
-    /**
-     * @param string $channel Name of the persistant queue to create
-     * @param object $message Message to send
-     * @return mixed
-     */
-    public function publishWorkerMessage($channel, $message)
-    {
-        if(!dibi::isConnected()) {
-            dibi::connect($this->sqlDriver);
-        }
-        $castType = "UNSIGNED";
-        if($this->sqlDriver["driver"] == "postgre") $castType = "INTEGER";
-        $r = dibi::query("SELECT MAX( CAST( [object_id] AS ".$castType." ) ) FROM [ajxp_simple_store] WHERE [store_id]=%s", "queues.$channel");
-        $index = $r->fetchSingle();
-        if($index == null) $index = 1;
-        else $index = intval($index)+1;
-        $values = array(
-            "store_id" => "queues.$channel",
-            "object_id" => $index,
-            "serialized_data" => serialize($message)
-        );
-        dibi::query("INSERT INTO [ajxp_simple_store] ([object_id],[store_id],[serialized_data],[binary_data],[related_object_id]) VALUES (%s,%s,%bin,%bin,%s)",
-            $values["object_id"], $values["store_id"], $values["serialized_data"], $values["binary_data"], $values["related_object_id"]);
-    }
-
-    /**
-     * @param $channel
-     * @param $message
-     * @return Object
-     */
-    public function publishInstantMessage($channel, $message)
-    {
-        $this->loadChannel($channel);
-        if(!isSet($this->channels) || !isSet($this->channels[$channel])) return;
-        if(!count($this->channels[$channel]["CLIENTS"])) return;
-        $clientIds = array_keys($this->channels[$channel]["CLIENTS"]);
-        $message->messageRC = array_combine($clientIds, $clientIds);
-        $message->messageTS = microtime();
-        $this->channels[$channel]["MESSAGES"][] = $message;
-    }
-
-}
diff --git a/core/src/plugins/mq.sql/i18n/conf/cs.php b/core/src/plugins/mq.sql/i18n/conf/cs.php
index ad1267f8bc..bc59ca209f 100644
--- a/core/src/plugins/mq.sql/i18n/conf/cs.php
+++ b/core/src/plugins/mq.sql/i18n/conf/cs.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "MQ SQL" => "MQ SQL",
diff --git a/core/src/plugins/mq.sql/i18n/conf/de.php b/core/src/plugins/mq.sql/i18n/conf/de.php
index 10bc042f45..55e8e46a81 100644
--- a/core/src/plugins/mq.sql/i18n/conf/de.php
+++ b/core/src/plugins/mq.sql/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "MQ SQL" => "SQL-Warteschlange",
diff --git a/core/src/plugins/mq.sql/i18n/conf/en.php b/core/src/plugins/mq.sql/i18n/conf/en.php
index d23c601ed3..ad8530211a 100644
--- a/core/src/plugins/mq.sql/i18n/conf/en.php
+++ b/core/src/plugins/mq.sql/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "MQ SQL" => "MQ SQL",
diff --git a/core/src/plugins/mq.sql/i18n/conf/it.php b/core/src/plugins/mq.sql/i18n/conf/it.php
index 27373bfe88..588006043b 100644
--- a/core/src/plugins/mq.sql/i18n/conf/it.php
+++ b/core/src/plugins/mq.sql/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "MQ SQL" => "MQ SQL",
diff --git a/core/src/plugins/mq.sql/manifest.xml b/core/src/plugins/mq.sql/manifest.xml
index e6da3b7959..d81a5acf4c 100644
--- a/core/src/plugins/mq.sql/manifest.xml
+++ b/core/src/plugins/mq.sql/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ajxp_plugin label="CONF_MESSAGE[MQ SQL]" description="CONF_MESSAGE[Store persistant and worker queues in database]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd" mixins="dibidriver_consumer">
-    <class_definition classname="AJXP_SqlMessageExchanger" filename="plugins/mq.sql/class.AJXP_SqlMessageExchanger.php"/>
+    <class_definition classname="Pydio\Mq\Implementation\SqlMessageExchanger" filename="plugins/mq.sql/SqlMessageExchanger.php"/>
 	<client_settings>
         <resources>
             <i18n namespace="sqlMessageExchanger" path="plugins/mq.sql/i18n" />
diff --git a/core/src/plugins/shorten.bitly/class.BitlyShortener.php b/core/src/plugins/shorten.bitly/class.BitlyShortener.php
deleted file mode 100644
index 2a165821bd..0000000000
--- a/core/src/plugins/shorten.bitly/class.BitlyShortener.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Use a developer Bit.ly account to shorten publiclet links.
- * @package AjaXplorer_Plugins
- * @subpackage Shorten
- */
-class BitlyShortener extends AJXP_Plugin
-{
-    public function postProcess($action, $httpVars, $params)
-    {
-        $jsonData = json_decode($params["ob_output"], true);
-        if ($jsonData != false) {
-            $url = $jsonData["publiclet_link"] ;
-            $elementId = $jsonData["element_id"];
-        } else {
-            $url = $params["ob_output"];
-            $elementId = -1;
-        }
-
-        $BITLY_USER = $this->getFilteredOption("BITLY_USER");
-        $BITLY_APIKEY = $this->getFilteredOption("BITLY_APIKEY");
-
-        if (empty($BITLY_USER) || empty($BITLY_APIKEY)) {
-            print($url);
-            $this->logError("Config", "Bitly Shortener : you must drop the conf.shorten.bitly.inc file inside conf.php and set the login/api key!");
-            return;
-        }
-        $bitly_login = $BITLY_USER;
-        $bitly_api = $BITLY_APIKEY;
-        $format = 'json';
-        $version = '2.0.1';
-        $bitly = 'http://api.bit.ly/shorten?version='.$version.'&longUrl='.urlencode($url).'&login='.$bitly_login.'&apiKey='.$bitly_api.'&format='.$format;
-        $response = AJXP_Utils::getRemoteContent($bitly);
-        $json = json_decode($response, true);
-        if (isSet($json['results'][$url]['shortUrl'])) {
-            print($json['results'][$url]['shortUrl']);
-            $this->updateMetaShort($httpVars["file"], $elementId, $json['results'][$url]['shortUrl']);
-        } else {
-            print($url);
-        }
-    }
-
-    protected function updateMetaShort($file, $elementId, $shortUrl)
-    {
-        $context = new UserSelection(ConfService::getRepository());
-        $baseUrl = $context->currentBaseUrl();
-        $node = new AJXP_Node($baseUrl.$file);
-        if ($node->hasMetaStore()) {
-            $metadata = $node->retrieveMetadata(
-                "ajxp_shared",
-                true,
-                AJXP_METADATA_SCOPE_REPOSITORY
-            );
-            if ($elementId != -1) {
-                if (!is_array($metadata["element"][$elementId])) {
-                    $metadata["element"][$elementId] = array();
-                }
-                $metadata["element"][$elementId]["short_form_url"] = $shortUrl;
-            } else {
-                if(isSet($metadata["shares"])){
-                    $key = array_pop(array_keys($metadata["shares"]));
-                    $metadata["shares"][$key]["short_form_url"] = $shortUrl;
-                }else{
-                    $metadata['short_form_url'] = $shortUrl;
-                }
-            }
-            $node->setMetadata(
-                "ajxp_shared",
-                $metadata,
-                true,
-                AJXP_METADATA_SCOPE_REPOSITORY
-            );
-        }
-    }
-
-}
diff --git a/core/src/plugins/shorten.bitly/i18n/conf/de.php b/core/src/plugins/shorten.bitly/i18n/conf/de.php
deleted file mode 100644
index 43364849c9..0000000000
--- a/core/src/plugins/shorten.bitly/i18n/conf/de.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Bit.ly URL Shortener" => "Bit.ly URL-Kürzungsdienst",
-"Shorten Download Links before sending them back to the user. Requires a Bit.ly account." => "Links zum Herunterladen von Dateien vor dem Versand an Benutzer kürzen. Erfordert einen Bit.ly Zugang.",
-"User Name" => "Benutzername",
-"Bit.ly account user name" => "Benutzername bei Bit.ly",
-"API Key" => "API Key",
-"Bit.ly account API Key" => "Bit.ly API-Key",
-);
diff --git a/core/src/plugins/shorten.bitly/i18n/conf/en.php b/core/src/plugins/shorten.bitly/i18n/conf/en.php
deleted file mode 100644
index 23f26b89ef..0000000000
--- a/core/src/plugins/shorten.bitly/i18n/conf/en.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Bit.ly URL Shortener" => "Bit.ly URL Shortener",
-"Shorten Download Links before sending them back to the user. Requires a Bit.ly account." => "Shorten Download Links before sending them back to the user. Requires a Bit.ly account.",
-"User Name" => "User Name",
-"Bit.ly account user name" => "Bit.ly account user name",
-"API Key" => "API Key",
-"Bit.ly account API Key" => "Bit.ly account API Key",
-);
diff --git a/core/src/plugins/shorten.bitly/i18n/conf/fr.php b/core/src/plugins/shorten.bitly/i18n/conf/fr.php
deleted file mode 100644
index 53f165234d..0000000000
--- a/core/src/plugins/shorten.bitly/i18n/conf/fr.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Bit.ly URL Shortener" => "Raccourcisseur d'URL Bit.ly",
-"Shorten Download Links before sending them back to the user. Requires a Bit.ly account." => "Raccourcir les liens de téléchargement avant de les renvoyer à l'utilisateur. Nécessite un compte Bit.ly.",
-"User Name" => "Nom d'utilisateur",
-"Bit.ly account user name" => "Nom d'utilisateur Bit.ly",
-"API Key" => "Clef API",
-"Bit.ly account API Key" => "Clef d'API Bit.ly",
-);
diff --git a/core/src/plugins/shorten.bitly/i18n/conf/it.php b/core/src/plugins/shorten.bitly/i18n/conf/it.php
deleted file mode 100644
index a4c3798320..0000000000
--- a/core/src/plugins/shorten.bitly/i18n/conf/it.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Bit.ly URL Shortener" => "Abbreviatore URL Bit.ly",
-"Shorten Download Links before sending them back to the user. Requires a Bit.ly account." => "Abbrevia i link di download prima di mostrarli all'utente. Richiede un account su 'Bit.ly'.",
-"User Name" => "Nome Utente",
-"Bit.ly account user name" => "Nome utente per Bit.ly",
-"API Key" => "Chiave API",
-"Bit.ly account API Key" => "Chiave API per Bit.ly",
-);
diff --git a/core/src/plugins/shorten.bitly/i18n/conf/pt.php b/core/src/plugins/shorten.bitly/i18n/conf/pt.php
deleted file mode 100644
index 8acf8d9df0..0000000000
--- a/core/src/plugins/shorten.bitly/i18n/conf/pt.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/*
-* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
-* This file is part of Pydio.
-*
-* Pydio is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* Pydio 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
-*
-* The latest code can be found at <http://pyd.io/>.
-*/
-$mess=array(
-"Bit.ly URL Shortener" => "Redutor de URLs Bit.ly",
-"Shorten Download URLs before sending them back to the user. Requires a Bit.ly account." => "Diminui o tamanho dos URLs de transferência antes de os dar ao utilizador. Requer uma conta Bit.ly.",
-"User Name" => "Nome de Utilizador",
-"Bit.ly account user name" => "Nome de utilizador Bit.ly",
-"API Key" => "Chave API",
-"Bit.ly account API Key" => "Chave API da conta Bit.ly",
-"Shorten Download Links before sending them back to the user. Requires a Bit.ly account." => "Shorten Download Links before sending them back to the user. Requires a Bit.ly account.",
-);
diff --git a/core/src/plugins/shorten.bitly/manifest.xml b/core/src/plugins/shorten.bitly/manifest.xml
deleted file mode 100644
index 8d30ae3bf4..0000000000
--- a/core/src/plugins/shorten.bitly/manifest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ajxp_plugin id="shorten.bitly" enabled="false" label="CONF_MESSAGE[Bit.ly URL Shortener]" description="CONF_MESSAGE[Shorten Download Links before sending them back to the user. Requires a Bit.ly account.]"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-    <plugin_info>
-        <core_relation packaged="false" tested_version="6.2"/>
-    </plugin_info>
-    <client_settings>
-        <resources>
-            <i18n namespace="bitly_shortener" path="plugins/shorten.bitly/i18n" />
-        </resources>
-    </client_settings>
-    <server_settings>
-        <global_param name="BITLY_USER" type="string" label="CONF_MESSAGE[User Name]" description="CONF_MESSAGE[Bit.ly account user name]" mandatory="true"/>
-        <global_param name="BITLY_APIKEY" type="string" label="CONF_MESSAGE[API Key]" description="CONF_MESSAGE[Bit.ly account API Key]" mandatory="true"/>
-    </server_settings>
-	<registry_contributions>
-        <actions>
-        <!-- Override a simple action -->
-            <action name="share">
-                <post_processing>
-                    <serverCallback methodName="postProcess" capture="true" applyCondition="$apply=(!isSet($httpVars['sub_action']) || $httpVars['sub_action'] == 'create_minisite');"/>
-                </post_processing>
-            </action>
-        </actions>
-	</registry_contributions>
-	<class_definition filename="plugins/shorten.bitly/class.BitlyShortener.php" classname="BitlyShortener"/>
-    <dependencies>
-        <activePlugin pluginName="action.share"/>
-    </dependencies>
-</ajxp_plugin>
diff --git a/core/src/plugins/shorten.bitly/plugin_doc.html b/core/src/plugins/shorten.bitly/plugin_doc.html
deleted file mode 100644
index 27c4ed1b53..0000000000
--- a/core/src/plugins/shorten.bitly/plugin_doc.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>Uses the Bit.ly webservice to automatically shorten the links generated for public files.</p>
\ No newline at end of file
diff --git a/core/src/plugins/shorten.multi/MultiShortener.php b/core/src/plugins/shorten.multi/MultiShortener.php
new file mode 100644
index 0000000000..791916efdc
--- /dev/null
+++ b/core/src/plugins/shorten.multi/MultiShortener.php
@@ -0,0 +1,156 @@
+<?php
+/*
+* Multi shortener plugin for ajaXplorer by FrenandoAloso
+*         based in bit.ly plugin
+*/
+
+namespace Pydio\LinkShortener;
+
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Utils\FileHelper;
+
+use Pydio\Core\PluginFramework\Plugin;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Multiple implementation to choose from various webservices
+ * @package AjaXplorer_Plugins
+ * @subpackage Shorten
+ */
+class MultiShortener extends Plugin
+{
+
+    /**
+     * @param string $url
+     * @param string $shorten
+     */
+    public function processShortenHook(ContextInterface $ctx, $url, &$shorten){
+        $shorten = $this->generateLink($ctx, $url);
+    }
+
+    /**
+     * @param ContextInterface $ctx
+     * @param $url
+     * @return bool|mixed|null|string
+     */
+    protected function generateLink(ContextInterface $ctx, $url){
+
+        $type = $this->getContextualOption($ctx, "SHORTEN_TYPE");
+        if(empty($type)) return null;
+        switch (intval($type["shorten_type"])) {
+            case 0:
+                if (!isSet($type["ADFLY_TYPE"]) || !isSet($type["ADFLY_APIKEY"]) || !isSet($type["ADFLY_UID"]) || !isSet($type["ADFLY_DOMAIN"])) {
+                    $this->logError("Config", "adFly Shortener : you must set the api key!");
+                    break;
+                }
+                $adfly_type = $type["ADFLY_TYPE"];
+                $adfly_api = $type["ADFLY_APIKEY"];
+                $adfly_uid = $type["ADFLY_UID"];
+                $adfly_dom = $type["ADFLY_DOMAIN"];
+                $adfly = 'http://api.adf.ly/api.php?key='.$adfly_api.'&uid='.$adfly_uid.'&advert_type='.$adfly_type.'&domain='.$adfly_dom.'&url='.urlencode($url);
+                $response = FileHelper::getRemoteContent($adfly);
+                $response = strip_tags($response, '<body>');
+                $response = strip_tags($response);
+                if (isSet($response)) {
+                    return $response;
+                }
+                break;
+
+            case 1:
+                if (!isSet($type["BITLY_USER"]) || !isSet($type["BITLY_APIKEY"])) {
+                    $this->logError("Config", "Bitly Shortener : you must drop the conf.shorten.bitly.inc file inside conf.php and set the login/api key!");
+                    break;
+                }
+                $bitly_login = $type["BITLY_USER"];
+                $bitly_api = $type["BITLY_APIKEY"];
+                $format = 'json';
+                $version = '2.0.1';
+                $bitly = 'http://api.bit.ly/shorten?version='.$version.'&longUrl='.urlencode($url).'&login='.$bitly_login.'&apiKey='.$bitly_api.'&format='.$format;
+                $response = FileHelper::getRemoteContent($bitly);
+                $json = json_decode($response, true);
+                if (isSet($json['results'][$url]['shortUrl'])) {
+                    return $json['results'][$url]['shortUrl'];
+                }
+                break;
+
+            case 2:
+                if (!isSet($type["GOOGL_APIKEY"])) {
+                    $this->logError("Config", "Goo.gl Shortener : you must set the api key!");
+                    break;
+                }
+                $data = array(
+                    'longUrl' => $url,
+                    'key' => $type["GOOGL_APIKEY"]
+                );
+
+                $options = array(
+                    'http' => array(
+                        'method'  => 'POST',
+                        'content' => json_encode( $data ),
+                        'header'=>  "Content-Type: application/json\r\n" .
+                            "Accept: application/json\r\n"
+                    )
+                );
+
+                $goourl = 'https://www.googleapis.com/urlshortener/v1/url?key='.$type["GOOGL_APIKEY"];
+                $context  = stream_context_create( $options );
+                $result = file_get_contents( $goourl, false, $context );
+                $json = (array) json_decode( $result );
+                if (isSet($json['id'])) {
+                    return $json['id'];
+                }
+                break;
+
+            case 3:
+                if (!isSet($type["POST_APIKEY"])) {
+                    $this->logError("Config", "po.st Shortener : you must set the api key!");
+                    break;
+                }
+                $post_api = $type["POST_APIKEY"];
+                $post = 'http://po.st/api/shorten?longUrl='.urlencode($url).'&apiKey='.$post_api.'&format=txt';
+                $response = FileHelper::getRemoteContent($post);
+                if (isSet($response)) {
+                    return $response;
+                }
+                break;
+
+            case 4:
+                if (!isSet($type["YOURLS_DOMAIN"])) {
+                    $this->logError("Config", "yourls Shortener : you must set the domain name");
+                    return null;
+                }
+                if (!isSet($type["YOURLS_APIKEY"])) {
+                    $this->logError("Config", "yourls Shortener : you must set the api key");
+                    return null;
+                }
+                $useidn = false;
+                if (isSet($type["YOURLS_USEIDN"])) {
+                    $useidn = $type["YOURLS_USEIDN"];
+                }
+                $yourls_domain = $type["YOURLS_DOMAIN"];
+                $yourls_api = $type["YOURLS_APIKEY"];
+                $yourls = 'http://'.$yourls_domain.'/yourls-api.php?signature='.$yourls_api.'&action=shorturl&format=simple&url='.urlencode($url);
+                $response = FileHelper::getRemoteContent($yourls);
+                if (isSet($response)) {
+                    $shorturl = $response;
+                    if ($useidn) {
+                        // WARNING: idn_to_utf8 requires php-idn module.
+                        // WARNING: http_build_url requires php-pecl-http module.
+                        $purl = parse_url($shorturl);
+                        $purl['host'] = idn_to_utf8($purl['host']);
+                        $shorturl = http_build_url($purl);
+                    }
+                    return $shorturl;
+                }
+                break;
+
+            default:
+                break;
+        }
+
+        return null;
+
+    }
+    
+}
diff --git a/core/src/plugins/shorten.multi/class.multiShortener.php b/core/src/plugins/shorten.multi/class.multiShortener.php
deleted file mode 100755
index 2d075cbc35..0000000000
--- a/core/src/plugins/shorten.multi/class.multiShortener.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-/*
-* Multi shortener plugin for ajaXplorer by FrenandoAloso
-*         based in bit.ly plugin
-*/
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Multiple implementation to choose from various webservices
- * @package AjaXplorer_Plugins
- * @subpackage Shorten
- */
-class multiShortener extends AJXP_Plugin
-{
-
-    /**
-     * @param string $url
-     * @param string $shorten
-     */
-    public function processShortenHook($url, &$shorten){
-        $shorten = $this->generateLink($url);
-    }
-
-    /**
-     * @param $action
-     * @param $httpVars
-     * @param $params
-     */
-    public function postProcess($action, $httpVars, $params)
-    {
-        $type = $this->getFilteredOption("SHORTEN_TYPE");
-        if(empty($type)) return;
-        $jsonData = json_decode($params["ob_output"], true);
-        $elementId = -1;
-        if ($jsonData != false) {
-            $url = $jsonData["publiclet_link"] ;
-            $elementId = $jsonData["element_id"];
-        } else {
-            $url = $params["ob_output"];
-        }
-
-        $res =  $this->generateLink($url);
-        if(!empty($res)){
-            $this->updateMetaShort($httpVars["file"], $elementId, $res);
-            print($res);
-        }else{
-            print($url);
-        }
-    }
-
-    protected function generateLink($url){
-
-        $type = $this->getFilteredOption("SHORTEN_TYPE");
-        if(empty($type)) return null;
-        switch (intval($type["shorten_type"])) {
-            case 0:
-                if (!isSet($type["ADFLY_TYPE"]) || !isSet($type["ADFLY_APIKEY"]) || !isSet($type["ADFLY_UID"]) || !isSet($type["ADFLY_DOMAIN"])) {
-                    $this->logError("Config", "adFly Shortener : you must set the api key!");
-                    break;
-                }
-                $adfly_type = $type["ADFLY_TYPE"];
-                $adfly_api = $type["ADFLY_APIKEY"];
-                $adfly_uid = $type["ADFLY_UID"];
-                $adfly_dom = $type["ADFLY_DOMAIN"];
-                $adfly = 'http://api.adf.ly/api.php?key='.$adfly_api.'&uid='.$adfly_uid.'&advert_type='.$adfly_type.'&domain='.$adfly_dom.'&url='.urlencode($url);
-                $response = AJXP_Utils::getRemoteContent($adfly);
-                $response = strip_tags($response, '<body>');
-                $response = strip_tags($response);
-                if (isSet($response)) {
-                    return $response;
-                }
-                break;
-
-            case 1:
-                if (!isSet($type["BITLY_USER"]) || !isSet($type["BITLY_APIKEY"])) {
-                    $this->logError("Config", "Bitly Shortener : you must drop the conf.shorten.bitly.inc file inside conf.php and set the login/api key!");
-                    break;
-                }
-                $bitly_login = $type["BITLY_USER"];
-                $bitly_api = $type["BITLY_APIKEY"];
-                $format = 'json';
-                $version = '2.0.1';
-                $bitly = 'http://api.bit.ly/shorten?version='.$version.'&longUrl='.urlencode($url).'&login='.$bitly_login.'&apiKey='.$bitly_api.'&format='.$format;
-                $response = AJXP_Utils::getRemoteContent($bitly);
-                $json = json_decode($response, true);
-                if (isSet($json['results'][$url]['shortUrl'])) {
-                    return $json['results'][$url]['shortUrl'];
-                }
-                break;
-
-            case 2:
-                if (!isSet($type["GOOGL_APIKEY"])) {
-                    $this->logError("Config", "Goo.gl Shortener : you must set the api key!");
-                    break;
-                }
-                $data = array(
-                    'longUrl' => $url,
-                    'key' => $type["GOOGL_APIKEY"]
-                );
-
-                $options = array(
-                    'http' => array(
-                        'method'  => 'POST',
-                        'content' => json_encode( $data ),
-                        'header'=>  "Content-Type: application/json\r\n" .
-                            "Accept: application/json\r\n"
-                    )
-                );
-
-                $goourl = 'https://www.googleapis.com/urlshortener/v1/url?key='.$type["GOOGL_APIKEY"];
-                $context  = stream_context_create( $options );
-                $result = file_get_contents( $goourl, false, $context );
-                $json = (array) json_decode( $result );
-                if (isSet($json['id'])) {
-                    return $json['id'];
-                }
-                break;
-
-            case 3:
-                if (!isSet($type["POST_APIKEY"])) {
-                    $this->logError("Config", "po.st Shortener : you must set the api key!");
-                    break;
-                }
-                $post_api = $type["POST_APIKEY"];
-                $post = 'http://po.st/api/shorten?longUrl='.urlencode($url).'&apiKey='.$post_api.'&format=txt';
-                $response = AJXP_Utils::getRemoteContent($post);
-                if (isSet($response)) {
-                    return $response;
-                }
-                break;
-
-            case 4:
-                if (!isSet($type["YOURLS_DOMAIN"])) {
-                    $this->logError("Config", "yourls Shortener : you must set the domain name");
-                    return null;
-                }
-                if (!isSet($type["YOURLS_APIKEY"])) {
-                    $this->logError("Config", "yourls Shortener : you must set the api key");
-                    return null;
-                }
-                $useidn = false;
-                if (isSet($type["YOURLS_USEIDN"])) {
-                    $useidn = $type["YOURLS_USEIDN"];
-                }
-                $yourls_domain = $type["YOURLS_DOMAIN"];
-                $yourls_api = $type["YOURLS_APIKEY"];
-                $yourls = 'http://'.$yourls_domain.'/yourls-api.php?signature='.$yourls_api.'&action=shorturl&format=simple&url='.urlencode($url);
-                $response = AJXP_Utils::getRemoteContent($yourls);
-                if (isSet($response)) {
-                    $shorturl = $response;
-                    if ($useidn) {
-                        // WARNING: idn_to_utf8 requires php-idn module.
-                        // WARNING: http_build_url requires php-pecl-http module.
-                        $purl = parse_url($shorturl);
-                        $purl['host'] = idn_to_utf8($purl['host']);
-                        $shorturl = http_build_url($purl);
-                    }
-                    return $shorturl;
-                }
-                break;
-
-            default:
-                break;
-        }
-
-        return null;
-
-    }
-
-    protected function updateMetaShort($file, $elementId, $shortUrl)
-    {
-        $context = new UserSelection(ConfService::getRepository());
-        $baseUrl = $context->currentBaseUrl();
-        $node = new AJXP_Node($baseUrl.$file);
-        if ($node->hasMetaStore()) {
-            $metadata = $node->retrieveMetadata(
-                "ajxp_shared",
-                true,
-                AJXP_METADATA_SCOPE_REPOSITORY
-            );
-            if ($elementId != -1) {
-                if (!is_array($metadata["element"][$elementId])) {
-                    $metadata["element"][$elementId] = array();
-                }
-                $metadata["element"][$elementId]["short_form_url"] = $shortUrl;
-            } else {
-                if(isSet($metadata["shares"])){
-                    $key = array_pop(array_keys($metadata["shares"]));
-                    $metadata["shares"][$key]["short_form_url"] = $shortUrl;
-                }else{
-                    $metadata['short_form_url'] = $shortUrl;
-                }
-            }
-            $node->setMetadata(
-                "ajxp_shared",
-                $metadata,
-                true,
-                AJXP_METADATA_SCOPE_REPOSITORY
-            );
-        }
-    }
-
-}
diff --git a/core/src/plugins/shorten.multi/manifest.xml b/core/src/plugins/shorten.multi/manifest.xml
index f1dbc7086f..6438d280b3 100755
--- a/core/src/plugins/shorten.multi/manifest.xml
+++ b/core/src/plugins/shorten.multi/manifest.xml
@@ -29,19 +29,11 @@
 		<global_param group_switch_name="shorten_type" group_switch_label="yourls" group_switch_value="yourls" name="YOURLS_USEIDN" type="boolean" label="CONF_MESSAGE[Use IDN]" description="CONF_MESSAGE[Use IDN]" mandatory="false" default="false"/>
     </server_settings>
 	<registry_contributions>
-        <actions>
-        <!-- Override share action output / Backward compat -->
-            <action name="share">
-                <post_processing>
-                    <serverCallback methodName="postProcess" capture="true" applyCondition="$apply=(!isSet($httpVars['sub_action']) || $httpVars['sub_action'] == 'create_minisite');"/>
-                </post_processing>
-            </action>
-        </actions>
         <hooks>
             <serverCallback methodName="processShortenHook" hookName="url.shorten"/>
         </hooks>
 	</registry_contributions>
-	<class_definition filename="plugins/shorten.multi/class.multiShortener.php" classname="multiShortener"/>
+	<class_definition filename="plugins/shorten.multi/MultiShortener.php" classname="Pydio\LinkShortener\MultiShortener"/>
     <dependencies>
         <activePlugin pluginName="action.share"/>
     </dependencies>
diff --git a/core/src/plugins/uploader.flex/FlexUpload.php b/core/src/plugins/uploader.flex/FlexUpload.php
new file mode 100644
index 0000000000..82888769f9
--- /dev/null
+++ b/core/src/plugins/uploader.flex/FlexUpload.php
@@ -0,0 +1,125 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Uploader\Processor;
+
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\UsersService;
+use Pydio\Core\Utils\Vars\StatHelper;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Legacy Flash plugin for upload
+ * @package AjaXplorer_Plugins
+ * @subpackage Uploader
+ */
+class FlexUpload extends Plugin
+{
+    private static $active = false;
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $request
+     * @param \Psr\Http\Message\ResponseInterface $response
+     */
+    public function getTemplate(\Psr\Http\Message\ServerRequestInterface &$request, \Psr\Http\Message\ResponseInterface &$response){
+        
+        /** @var ContextInterface $ctx */
+        $ctx = $request->getAttribute("ctx");
+        $confMaxSize = StatHelper::convertBytes(ConfService::getContextConf($ctx, "UPLOAD_MAX_SIZE", "uploader"));
+        $UploadMaxSize = min(StatHelper::convertBytes(ini_get('upload_max_filesize')), StatHelper::convertBytes(ini_get('post_max_size')));
+        if($confMaxSize != 0) $UploadMaxSize = min ($UploadMaxSize, $confMaxSize);
+        $confTotalNumber = ConfService::getContextConf($ctx, "UPLOAD_MAX_NUMBER", "uploader");
+        $confTotalSize = ConfService::getContextConf($ctx, "UPLOAD_MAX_SIZE_TOTAL", "uploader");
+        $confTotalNumber = ConfService::getContextConf($ctx, "UPLOAD_MAX_NUMBER", "uploader");
+        $maxLength = ConfService::getContextConf($ctx, "NODENAME_MAX_LENGTH");
+
+        $FlashVar = '&totalUploadSize='.$confTotalSize.'&fileSizeLimit='.$UploadMaxSize.'&maxFileNumber='.$confTotalNumber.'&maxFilenameLength='.$maxLength;
+        $pluginConfigs = $this->getConfigs();
+        include($this->getBaseDir()."/flash_tpl.html");
+
+    }
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $request
+     * @param \Psr\Http\Message\ResponseInterface $response
+     */
+    public function preProcess(\Psr\Http\Message\ServerRequestInterface &$request, \Psr\Http\Message\ResponseInterface &$response)
+    {
+        /** @var ContextInterface $ctx */
+        $ctx = $request->getAttribute("ctx");
+
+        //------------------------------------------------------------
+        // SPECIAL HANDLING FOR FLEX UPLOADER RIGHTS FOR THIS ACTION
+        //------------------------------------------------------------
+        if (UsersService::usersEnabled()) {
+            $loggedUser = $ctx->getUser();
+            if ($request->getAttribute("action") == "upload" &&
+                ($loggedUser == null || !$loggedUser->canWrite($ctx->getRepositoryId().""))
+                && isSet($request->getUploadedFiles()['Filedata'])) {
+                $response = $response->withStatus(410, "Not authorized");
+                return;
+            }
+        }
+
+        $fileVars = $request->getUploadedFiles();
+        if (isSet($fileVars["Filedata"])) {
+            self::$active = true;
+            $httpVars = $request->getParsedBody();
+            $this->logDebug("Dir before base64", $httpVars);
+            $httpVars["dir"] = base64_decode(urldecode($httpVars["dir"]));
+            $request = $request->withParsedBody($httpVars);
+
+            $existingUp = $_FILES["Filedata"];
+            $filename = $httpVars["Filename"];
+            // Rebuild UploadedFile object
+            $request = $request->withUploadedFiles(["userfile_0" => new \Zend\Diactoros\UploadedFile($existingUp["tmp_name"], $existingUp["size"], $existingUp["error"], $filename)]);
+            $this->logDebug("Setting FlexProc active");
+        }
+    }
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $request
+     * @param \Psr\Http\Message\ResponseInterface $response
+     * @throws \Exception
+     */
+    public function postProcess(\Psr\Http\Message\ServerRequestInterface &$request, \Psr\Http\Message\ResponseInterface &$response)
+    {
+        if (!self::$active) {
+            return;
+        }
+        $result = $request->getAttribute("upload_process_result");
+        if (isSet($result["SUCCESS"]) && $result["SUCCESS"] === true) {
+            $response = new \Zend\Diactoros\Response\EmptyResponse(200);
+            if (iSset($result["UPDATED_NODE"])) {
+                Controller::applyHook("node.change", array($result["UPDATED_NODE"], $result["UPDATED_NODE"], false));
+            } else {
+                Controller::applyHook("node.change", array(null, $result["CREATED_NODE"], false));
+            }
+        } else if (isSet($result["ERROR"]) && is_array($result["ERROR"])) {
+            $code = $result["ERROR"]["CODE"];
+            $message = $result["ERROR"]["MESSAGE"];
+            $response = $response->withStatus($code, $message);
+        }
+    }
+}
diff --git a/core/src/plugins/uploader.flex/class.FlexUploadProcessor.php b/core/src/plugins/uploader.flex/class.FlexUploadProcessor.php
deleted file mode 100644
index 1c5d7c7445..0000000000
--- a/core/src/plugins/uploader.flex/class.FlexUploadProcessor.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Legacy Flash plugin for upload
- * @package AjaXplorer_Plugins
- * @subpackage Uploader
- */
-class FlexUploadProcessor extends AJXP_Plugin
-{
-    private static $active = false;
-
-    public function preProcess($action, &$httpVars, &$fileVars)
-    {
-        if (isSet($fileVars["Filedata"])) {
-            self::$active = true;
-            $this->logDebug("Dir before base64", $httpVars);
-            $httpVars["dir"] = base64_decode(urldecode($httpVars["dir"]));
-            $fileVars["userfile_0"] = $fileVars["Filedata"];
-            unset($fileVars["Filedata"]);
-            $this->logDebug("Setting FlexProc active");
-        }
-    }
-
-    public function postProcess($action, $httpVars, $postProcessData)
-    {
-        if (!self::$active) {
-            return false;
-        }
-        $this->logDebug("FlexProc is active=".self::$active, $postProcessData);
-        $result = $postProcessData["processor_result"];
-        if (isSet($result["SUCCESS"]) && $result["SUCCESS"] === true) {
-            header('HTTP/1.0 200 OK');
-            if (iSset($result["UPDATED_NODE"])) {
-                AJXP_Controller::applyHook("node.change", array($result["UPDATED_NODE"], $result["UPDATED_NODE"], false));
-            } else {
-                AJXP_Controller::applyHook("node.change", array(null, $result["CREATED_NODE"], false));
-            }
-            //die("200 OK");
-        } else if (isSet($result["ERROR"]) && is_array($result["ERROR"])) {
-            $code = $result["ERROR"]["CODE"];
-            $message = $result["ERROR"]["MESSAGE"];
-
-            //header("HTTP/1.0 $code $message");
-            die("Error $code $message");
-        }
-    }
-}
diff --git a/core/src/plugins/uploader.flex/flash_tpl.html b/core/src/plugins/uploader.flex/flash_tpl.html
index 1c0155cd13..8651d29f97 100644
--- a/core/src/plugins/uploader.flex/flash_tpl.html
+++ b/core/src/plugins/uploader.flex/flash_tpl.html
@@ -1,15 +1,3 @@
-<?php 
-    $confMaxSize = AJXP_Utils::convertBytes(ConfService::getCoreConf("UPLOAD_MAX_SIZE", "uploader"));
-	$UploadMaxSize = min(AJXP_Utils::convertBytes(ini_get('upload_max_filesize')), AJXP_Utils::convertBytes(ini_get('post_max_size')));
-	if($confMaxSize != 0) $UploadMaxSize = min ($UploadMaxSize, $confMaxSize);
-	$confTotalNumber = ConfService::getCoreConf("UPLOAD_MAX_NUMBER", "uploader");
-    $confTotalSize = ConfService::getCoreConf("UPLOAD_MAX_SIZE_TOTAL", "uploader");
-    $confTotalNumber = ConfService::getCoreConf("UPLOAD_MAX_NUMBER", "uploader");
-    $maxLength = ConfService::getCoreConf("NODENAME_MAX_LENGTH");
-    
-	$FlashVar = '&totalUploadSize='.$confTotalSize.'&fileSizeLimit='.$UploadMaxSize.'&maxFileNumber='.$confTotalNumber.'&maxFilenameLength='.$maxLength;
-	$pluginConfigs = AJXP_PluginsService::getInstance()->findPlugin("uploader", "flex")->getConfigs();
-?>
 <html>
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">	
@@ -116,7 +104,7 @@
 	flashVarExt = '&fileTypes='+exts.join(";")+'&fileTypeDescription='+escape(configs.get("ALLOWED_EXTENSIONS_READABLE"));
 }
 
-var url = '<?php print($_SERVER['SCRIPT_NAME']);?>?get_action=upload&secure_token='+parent.Connexion.SECURE_TOKEN+'&ajxp_sessid=<?php echo session_id(); ?>';
+var url = '<?php print($_SERVER['SCRIPT_NAME']);?>?get_action=upload&secure_token='+parent.Connexion.SECURE_TOKEN+'&ajxp_sessid=<?php echo session_id(); ?>&XDEBUG_SESSION=xdebug_ajaxplorer';
 
 var FlashObject = "plugins/uploader.flex/FlashFileUpload.swf";
 var FlashVarValue = "<?php echo $FlashVar; ?>" + flashVarExt + "&uploadPage=" + escape(url) + "<?php echo (!empty($pluginConfigs['HTTPS_POLICY_FILE']) ? "&policyFile=".$pluginConfigs['HTTPS_POLICY_FILE'] : ""); ?>";
diff --git a/core/src/plugins/uploader.flex/i18n/conf/de.php b/core/src/plugins/uploader.flex/i18n/conf/de.php
index 667d1d4467..39576b6f92 100644
--- a/core/src/plugins/uploader.flex/i18n/conf/de.php
+++ b/core/src/plugins/uploader.flex/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Flash uploader" => "Flash",
diff --git a/core/src/plugins/uploader.flex/i18n/conf/en.php b/core/src/plugins/uploader.flex/i18n/conf/en.php
index 76e74c493d..ba72aef4f4 100644
--- a/core/src/plugins/uploader.flex/i18n/conf/en.php
+++ b/core/src/plugins/uploader.flex/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Flash uploader" => "Flash",
diff --git a/core/src/plugins/uploader.flex/i18n/conf/fr.php b/core/src/plugins/uploader.flex/i18n/conf/fr.php
index eab8a1c96e..c34e25e635 100644
--- a/core/src/plugins/uploader.flex/i18n/conf/fr.php
+++ b/core/src/plugins/uploader.flex/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Flash uploader" => "Programme d'envoi Flash",
diff --git a/core/src/plugins/uploader.flex/i18n/conf/it.php b/core/src/plugins/uploader.flex/i18n/conf/it.php
index 23c7bc63cf..7f20b07902 100644
--- a/core/src/plugins/uploader.flex/i18n/conf/it.php
+++ b/core/src/plugins/uploader.flex/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Flash uploader" => "Flash",
diff --git a/core/src/plugins/uploader.flex/i18n/conf/pt.php b/core/src/plugins/uploader.flex/i18n/conf/pt.php
index b4cbde8a11..defe40f416 100644
--- a/core/src/plugins/uploader.flex/i18n/conf/pt.php
+++ b/core/src/plugins/uploader.flex/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Flash uploader" => "Enviar usando Flash",
diff --git a/core/src/plugins/uploader.flex/manifest.xml b/core/src/plugins/uploader.flex/manifest.xml
index d8e20e6da5..9cb19577fd 100644
--- a/core/src/plugins/uploader.flex/manifest.xml
+++ b/core/src/plugins/uploader.flex/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <uploader id="uploader.flex" text="51" order="1" title="162" label="CONF_MESSAGE[Flash uploader]" description="CONF_MESSAGE[Legacy flash uploader, used when the browser does not support HTML5. If you want to force the usage of this uploader, deactivate the uploader.html, and remove the activeCondition tag from the uploader.flex manifest file.]"  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-	<class_definition filename="plugins/uploader.flex/class.FlexUploadProcessor.php" classname="FlexUploadProcessor"/>
+	<class_definition filename="plugins/uploader.flex/FlexUpload.php" classname="Pydio\Uploader\Processor\FlexUpload"/>
     <client_settings>
         <resources>
             <i18n namespace="flex_uploader" path="plugins/uploader.flex/i18n" />
@@ -11,6 +11,11 @@
 	</server_settings>
 	<registry_contributions>
 		<actions>
+            <action name="flex_tpl">
+                <processing>
+                    <serverCallback methodName="getTemplate"/>
+                </processing>
+            </action>
 			<action name="upload">
 				<pre_processing>
 					<serverCallback methodName="preProcess"/>
@@ -35,7 +40,7 @@
 			</div>
 		]]></clientForm>
 		<dialogOnOpen><![CDATA[
-        var src = window.ajxpServerAccessPath + '&get_action=get_template&template_name=flash_tpl.html&pluginName=uploader.flex&encode=false';
+        var src = window.ajxpServerAccessPath + '&get_action=flex_tpl&encode=false';
         modal.getForm().down('#flashframe').src = src;
 		]]></dialogOnOpen>
 		<activeCondition><![CDATA[
diff --git a/core/src/plugins/uploader.html/Gruntfile.js b/core/src/plugins/uploader.html/Gruntfile.js
new file mode 100644
index 0000000000..63ad80dac3
--- /dev/null
+++ b/core/src/plugins/uploader.html/Gruntfile.js
@@ -0,0 +1,34 @@
+module.exports = function(grunt) {
+    grunt.initConfig({
+        babel: {
+            options: {},
+
+            dist: {
+                files: [
+                    {
+                        expand: true,
+                        cwd: 'js/react/',
+                        src: ['**/*.js'],
+                        dest: 'js/build/',
+                        ext: '.js'
+                    }
+                ]
+            }
+        },
+        watch: {
+            js: {
+                files: [
+                    "js/react/**/*"
+                ],
+                tasks: ['babel'],
+                options: {
+                    spawn: false
+                }
+            }
+        }
+    });
+    grunt.loadNpmTasks('grunt-babel');
+    grunt.loadNpmTasks('grunt-contrib-watch');
+    grunt.registerTask('default', ['babel']);
+
+};
diff --git a/core/src/plugins/uploader.html/SimpleUpload.php b/core/src/plugins/uploader.html/SimpleUpload.php
new file mode 100644
index 0000000000..51a8ddb897
--- /dev/null
+++ b/core/src/plugins/uploader.html/SimpleUpload.php
@@ -0,0 +1,286 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Uploader\Processor;
+
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\NodesDiff;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Exception\AuthRequiredException;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\ApiKeysService;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Http\Message\ExternalUploadedFile;
+
+use Pydio\Core\Utils\Vars\XMLFilter;
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\Utils\XMLHelper;
+use Zend\Diactoros\Response\TextResponse;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Processor for standard POST upload
+ * @package AjaXplorer_Plugins
+ * @subpackage Uploader
+ */
+class SimpleUpload extends Plugin
+{
+    /**
+     * @param $action
+     * @param $httpVars
+     * @param $fileVars
+     */
+    public function getDropBg($action, $httpVars, $fileVars)
+    {
+        $lang = LocaleService::getLanguage();
+        $img = AJXP_INSTALL_PATH."/plugins/uploader.html/i18n/$lang-dropzone.png";
+        if(!is_file($img)) $img = AJXP_INSTALL_PATH."/plugins/uploader.html/i18n/en-dropzone.png";
+        header("Content-Type: image/png; name=\"dropzone.png\"");
+        header("Content-Length: ".filesize($img));
+        header('Cache-Control: public');
+        readfile($img);
+    }
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $request
+     * @param \Psr\Http\Message\ResponseInterface $response
+     * @throws \Pydio\Core\Exception\PydioException
+     */
+    public function preProcess(\Psr\Http\Message\ServerRequestInterface &$request, \Psr\Http\Message\ResponseInterface &$response)
+    {
+        $httpVars = $request->getParsedBody();
+        $serverData = $request->getServerParams();
+
+        if (!isSet($httpVars["input_stream"]) || isSet($httpVars["force_post"])) {
+            // Nothing to do
+            return;
+        }
+
+        $this->logDebug("SimpleUpload::preProcess", $httpVars);
+
+        // Setting the stream data
+        if (isset($serverData['HTTP_X_FILE_TMP_LOCATION'])) {
+            // The file has already been transferred
+
+            // Checking headers
+            if (!isset($serverData['HTTP_X_FILE_SIZE'])) {
+                exit('Warning, wrong headers');
+            }
+
+            $fileNameH = $serverData['HTTP_X_FILE_NAME'];
+            $fileSizeH = (int)$serverData['HTTP_X_FILE_SIZE'];
+
+            // Clean up dir name (backward compat)
+            if (dirname($httpVars["dir"]) == "/" && basename($httpVars["dir"]) == $fileNameH) {
+                $httpVars["dir"] = "/";
+            }
+
+            $clientFileName = basename($fileNameH);
+
+            // Setting the stream to point to the file location
+            $streamOrFile = $serverData['HTTP_X_FILE_TMP_LOCATION'];
+            $errorStatus = UPLOAD_ERR_OK;
+            // Update UploadedFile object built on input stream with file name and size
+            $uploadedFile = new \Zend\Diactoros\UploadedFile(
+                $serverData['HTTP_X_FILE_TMP_LOCATION'],
+                $fileSizeH,
+                UPLOAD_ERR_OK,
+                $clientFileName
+            );
+
+
+        } else if(isSet($serverData['HTTP_X_FILE_DIRECT_UPLOAD'])){
+
+            // Mandatory headers
+            $externalUploadStatus = $serverData['HTTP_X_FILE_DIRECT_UPLOAD'];
+            $fileNameH = $serverData['HTTP_X_FILE_NAME'];
+            $fileSizeH = (int)$serverData['HTTP_X_FILE_SIZE'];
+
+            // Faking data if not present
+            if (empty($fileNameH)) {
+                $fileNameH = "fake-name";
+            }
+
+            if (empty($fileSieH)) {
+                $fileSizeH = 1;
+            }
+
+            if(!ExternalUploadedFile::isValidStatus($externalUploadStatus)){
+                throw new PydioException("Unrecognized direct upload status ". $externalUploadStatus);
+            }
+
+            if($externalUploadStatus === ExternalUploadedFile::STATUS_REQUEST_OPTIONS){
+
+                if(!ApiKeysService::requestHasValidHeadersForAdminTask($request->getServerParams(), PYDIO_BOOSTER_TASK_IDENTIFIER)){
+                    throw new AuthRequiredException();
+                }
+
+            }
+
+            $uploadedFile = new ExternalUploadedFile($externalUploadStatus, $fileSizeH, $fileNameH);
+
+        } else {
+
+            // The file is the post data stream
+
+            // Mandatory headers
+            if (!isset($serverData['CONTENT_LENGTH'], $serverData['HTTP_X_FILE_NAME'])) {
+                throw new PydioException("Warning, missing headers!");
+            }
+
+            $fileNameH = $serverData['HTTP_X_FILE_NAME'];
+            $fileSizeH = (int)$serverData['HTTP_X_FILE_SIZE'];
+
+            // Clean up dir name (backward compat)
+            if (dirname($httpVars["dir"]) == "/" && basename($httpVars["dir"]) == $fileNameH) {
+                $httpVars["dir"] = "/";
+            }
+
+            $clientFileName = basename($fileNameH);
+
+
+            // Checking headers
+            if (isSet($serverData['HTTP_X_FILE_SIZE'])) {
+                if ($serverData['CONTENT_LENGTH'] != $serverData['HTTP_X_FILE_SIZE']) {
+                    $response = new TextResponse("Warning, wrong headers");
+                }
+            }
+
+            // Setting the stream to point to the post data
+            $streamOrFile = array_shift($request->getUploadedFiles())->getStream();
+            // Update UploadedFile object built on input stream with file name and size
+            $uploadedFile = new \Zend\Diactoros\UploadedFile(
+                $streamOrFile,
+                $fileSizeH,
+                $streamOrFile->getError(),
+                $clientFileName
+            );
+
+
+        }
+
+        $request = $request->withUploadedFiles(["userfile_0" => $uploadedFile]);
+    }
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $request
+     * @param \Psr\Http\Message\ResponseInterface $response
+     */
+    public function postProcess(\Psr\Http\Message\ServerRequestInterface &$request, \Psr\Http\Message\ResponseInterface &$response)
+    {
+        $httpVars = $request->getParsedBody();
+        if ($request->getAttribute("api")!="v2" && !isSet($httpVars["simple_uploader"]) && !isSet($httpVars["xhr_uploader"]) && !isSet($httpVars["force_post"])) {
+            return;
+        }
+        $this->logDebug("SimpleUploadProc is active");
+        $result = $request->getAttribute("upload_process_result");
+        if(empty($result)){
+            // Ignore
+            return;
+        }
+        $nodesDiff = new NodesDiff();
+        if(isSet($result["CREATED_NODE"])){
+            $nodesDiff->add($result["CREATED_NODE"]);
+        }
+        if(isSet($result["UPDATED_NODE"])){
+            $nodesDiff->update($result["UPDATED_NODE"]);
+        }
+
+        if (isSet($httpVars["simple_uploader"])) {
+            $response = $response->withHeader("Content-type", "text/html; charset=UTF-8");
+            print("<html><script language=\"javascript\">\n");
+            if (isSet($result["ERROR"])) {
+                $message = $result["ERROR"]["MESSAGE"]." (".$result["ERROR"]["CODE"].")";
+                $response->getBody()->write("\n if(parent.pydio.getController().multi_selector) parent.pydio.getController().multi_selector.submitNext('".str_replace("'", "\'", $message)."');");
+            } else {
+                print("\n if(parent.pydio.getController().multi_selector) parent.pydio.getController().multi_selector.submitNext();");
+                if (isSet($result["CREATED_NODE"]) || isSet($result["UPDATED_NODE"])) {
+                    $s = '<tree>' . $nodesDiff->toXML() . '</tree>';
+                    $response->getBody()->write("\n var resultString = '".str_replace("'", "\'", $s)."'; var resultXML = parent.parseXml(resultString);");
+                    $response->getBody()->write("\n parent.PydioApi.getClient().parseXmlMessage(resultXML);");
+                }
+            }
+            $response->getBody()->write("</script></html>");
+        } else {
+            if (isSet($result["ERROR"])) {
+                $message = $result["ERROR"]["MESSAGE"]." (".$result["ERROR"]["CODE"].")";
+                $response = $response->withHeader("Content-type", "text/plain; charset=UTF-8");
+                $response->getBody()->write($message);
+            } else {
+
+                $nodesDiffXML = "";
+                if (isSet($result["CREATED_NODE"]) || isSet($result["UPDATED_NODE"])) {
+                    $nodesDiffXML = $nodesDiff->toXML();
+                }
+                $response = $response->withHeader("Content-type", "text/xml; charset=UTF-8");
+                $response->getBody()->write(XMLHelper::wrapDocument($nodesDiffXML));
+
+                /* for further implementation */
+                if (!isSet($result["PREVENT_NOTIF"])) {
+                    if (isset($result["CREATED_NODE"])) {
+                        Controller::applyHook("node.change", array(null, $result["CREATED_NODE"], false));
+                    } else if (isSet($result["UPDATED_NODE"])) {
+                        Controller::applyHook("node.change", array($result["UPDATED_NODE"], $result["UPDATED_NODE"], false));
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * @param $action
+     * @param $httpVars
+     * @param $fileVars
+     * @param \Pydio\Core\Model\ContextInterface $contextInterface
+     * @throws \Exception
+     */
+    public function unifyChunks($action, $httpVars, $fileVars, \Pydio\Core\Model\ContextInterface $contextInterface)
+    {
+        $selection = UserSelection::fromContext($contextInterface, []);
+        $dir = InputFilter::decodeSecureMagic($httpVars["dir"]);
+        $destStreamURL = $selection->currentBaseUrl().$dir."/";
+        $filename = InputFilter::decodeSecureMagic($httpVars["file_name"]);
+
+        $chunks = array();
+        $index = 0;
+        while (isSet($httpVars["chunk_".$index])) {
+            $chunks[] = InputFilter::decodeSecureMagic($httpVars["chunk_" . $index]);
+            $index++;
+        }
+
+        $newDest = fopen($destStreamURL.$filename, "w");
+        for ($i = 0; $i < count($chunks) ; $i++) {
+            $part = fopen($destStreamURL.$chunks[$i], "r");
+            if(is_resource($part)){
+                while (!feof($part)) {
+                    fwrite($newDest, fread($part, 4096));
+                }
+                fclose($part);
+            }
+            unlink($destStreamURL.$chunks[$i]);
+        }
+        fclose($newDest);
+        Controller::applyHook("node.change", array(null, new AJXP_Node($newDest), false));
+    }
+}
diff --git a/core/src/plugins/uploader.html/class.MultiUploader.js b/core/src/plugins/uploader.html/class.MultiUploader.js
index bab80af53d..42c1ee5708 100644
--- a/core/src/plugins/uploader.html/class.MultiUploader.js
+++ b/core/src/plugins/uploader.html/class.MultiUploader.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  * Credit:
  *   Original class by Stickman -- http://www.the-stickman.com
  *      with thanks to:
@@ -295,9 +295,9 @@ Class.create("MultiUploader", {
 			return;
 		}
 		var stateImg = $(row).select("img")[0];
-		if(state == 'loading') stateImg.src = ajxpResourcesFolder+'/images/yellowled.png';
-		else if(state == 'done') stateImg.src = ajxpResourcesFolder+'/images/greenled.png';
-		else if(state == 'error') stateImg.src = ajxpResourcesFolder+'/images/redled.png';
+		if(state == 'loading') stateImg.src = pydio.Parameters.get('APPLICATION_ROOT')+'plugins/uploader.html/img/yellowled.png';
+		else if(state == 'done') stateImg.src = pydio.Parameters.get('APPLICATION_ROOT')+'plugins/uploader.html/img/greenled.png';
+		else if(state == 'error') stateImg.src = pydio.Parameters.get('APPLICATION_ROOT')+'plugins/uploader.html/img/redled.png';
 	},
 	
 	
diff --git a/core/src/plugins/uploader.html/class.SimpleUploadProcessor.php b/core/src/plugins/uploader.html/class.SimpleUploadProcessor.php
deleted file mode 100644
index a8884ecaf0..0000000000
--- a/core/src/plugins/uploader.html/class.SimpleUploadProcessor.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Processor for standard POST upload
- * @package AjaXplorer_Plugins
- * @subpackage Uploader
- */
-class SimpleUploadProcessor extends AJXP_Plugin
-{
-    public function getDropBg($action, $httpVars, $fileVars)
-    {
-        $lang = ConfService::getLanguage();
-        $img = AJXP_INSTALL_PATH."/plugins/uploader.html/i18n/$lang-dropzone.png";
-        if(!is_file($img)) $img = AJXP_INSTALL_PATH."/plugins/uploader.html/i18n/en-dropzone.png";
-        header("Content-Type: image/png; name=\"dropzone.png\"");
-        header("Content-Length: ".filesize($img));
-        header('Cache-Control: public');
-        readfile($img);
-    }
-
-    public function preProcess($action, &$httpVars, &$fileVars)
-    {
-        if (!isSet($httpVars["input_stream"]) || isSet($httpVars["force_post"])) {
-            return false;
-        }
-
-        $headersCheck = isset(
-                $_SERVER['CONTENT_LENGTH'],
-                $_SERVER['HTTP_X_FILE_NAME']
-            ) ;
-        if (isSet($_SERVER['HTTP_X_FILE_SIZE'])) {
-            if ($_SERVER['CONTENT_LENGTH'] != $_SERVER['HTTP_X_FILE_SIZE']) {
-                exit('Warning, wrong headers');
-            }
-        }
-        $fileNameH = $_SERVER['HTTP_X_FILE_NAME'];
-        $fileSizeH = $_SERVER['CONTENT_LENGTH'];
-
-        if (dirname($httpVars["dir"]) == "/" && basename($httpVars["dir"]) == $fileNameH) {
-            $httpVars["dir"] = "/";
-        }
-        $this->logDebug("SimpleUpload::preProcess", $httpVars);
-
-        if ($headersCheck) {
-            // create the object and assign property
-            $fileVars["userfile_0"] = array(
-                "input_upload" => true,
-                "name"		   => SystemTextEncoding::fromUTF8(basename($fileNameH)),
-                "size"		   => $fileSizeH
-            );
-        } else {
-            exit("Warning, missing headers!");
-        }
-    }
-
-    public function postProcess($action, $httpVars, $postProcessData)
-    {
-        if (!isSet($httpVars["simple_uploader"]) && !isSet($httpVars["xhr_uploader"]) && !isSet($httpVars["force_post"])) {
-            return false;
-        }
-        $this->logDebug("SimpleUploadProc is active");
-        $result = $postProcessData["processor_result"];
-
-        if (isSet($httpVars["simple_uploader"])) {
-            print("<html><script language=\"javascript\">\n");
-            if (isSet($result["ERROR"])) {
-                $message = $result["ERROR"]["MESSAGE"]." (".$result["ERROR"]["CODE"].")";
-                print("\n if(parent.pydio.getController().multi_selector) parent.pydio.getController().multi_selector.submitNext('".str_replace("'", "\'", $message)."');");
-            } else {
-                print("\n if(parent.pydio.getController().multi_selector) parent.pydio.getController().multi_selector.submitNext();");
-                if (isSet($result["CREATED_NODE"]) || isSet($result["UPDATED_NODE"])) {
-                    $s = '<tree>';
-                    $s .= AJXP_XMLWriter::writeNodesDiff(array((isSet($result["UPDATED_NODE"])?"UPDATE":"ADD")=> array($result[(isSet($result["UPDATED_NODE"])?"UPDATED":"CREATED")."_NODE"])), false);
-                    $s.= '</tree>';
-                    print("\n var resultString = '".str_replace("'", "\'", $s)."'; var resultXML = parent.parseXml(resultString);");
-                    print("\n parent.PydioApi.getClient().parseXmlMessage(resultXML);");
-                }
-            }
-            print("</script></html>");
-        } else {
-            if (isSet($result["ERROR"])) {
-                $message = $result["ERROR"]["MESSAGE"]." (".$result["ERROR"]["CODE"].")";
-                exit($message);
-            } else {
-                AJXP_XMLWriter::header();
-                if (isSet($result["CREATED_NODE"]) || isSet($result["UPDATED_NODE"])) {
-                    AJXP_XMLWriter::writeNodesDiff(array((isSet($result["UPDATED_NODE"])?"UPDATE":"ADD") => array($result[(isSet($result["UPDATED_NODE"])?"UPDATED":"CREATED")."_NODE"])), true);
-                }
-                AJXP_XMLWriter::close();
-                /* for further implementation */
-                if (!isSet($result["PREVENT_NOTIF"])) {
-                    if (isset($result["CREATED_NODE"])) {
-                        AJXP_Controller::applyHook("node.change", array(null, $result["CREATED_NODE"], false));
-                    } else if (isSet($result["UPDATED_NODE"])) {
-                        AJXP_Controller::applyHook("node.change", array($result["UPDATED_NODE"], $result["UPDATED_NODE"], false));
-                    }
-                }
-                //exit("OK");
-            }
-        }
-
-    }
-
-    public function unifyChunks($action, $httpVars, $fileVars)
-    {
-        $repository = ConfService::getRepository();
-        if (!$repository->detectStreamWrapper(true)) {
-            return false;
-        }
-        $selection = new UserSelection($repository);
-        $dir = AJXP_Utils::decodeSecureMagic($httpVars["dir"]);
-        $destStreamURL = $selection->currentBaseUrl().$dir."/";
-        $filename = AJXP_Utils::decodeSecureMagic($httpVars["file_name"]);
-
-        $chunks = array();
-        $index = 0;
-        while (isSet($httpVars["chunk_".$index])) {
-            $chunks[] = AJXP_Utils::decodeSecureMagic($httpVars["chunk_".$index]);
-            $index++;
-        }
-
-        $newDest = fopen($destStreamURL.$filename, "w");
-        for ($i = 0; $i < count($chunks) ; $i++) {
-            $part = fopen($destStreamURL.$chunks[$i], "r");
-            if(is_resource($part)){
-                while (!feof($part)) {
-                    fwrite($newDest, fread($part, 4096));
-                }
-                fclose($part);
-            }
-            unlink($destStreamURL.$chunks[$i]);
-        }
-        fclose($newDest);
-        AJXP_Controller::applyHook("node.change", array(null, new AJXP_Node($newDest), false));
-    }
-}
diff --git a/core/src/plugins/uploader.html/class.XHRUploader.js b/core/src/plugins/uploader.html/class.XHRUploader.js
index a5f58bd6a6..e2a9a52790 100644
--- a/core/src/plugins/uploader.html/class.XHRUploader.js
+++ b/core/src/plugins/uploader.html/class.XHRUploader.js
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  * Description : Class for simple XHR multiple upload, HTML5 only
  */
 Class.create("XHRUploader", {
@@ -24,19 +24,21 @@ Class.create("XHRUploader", {
     listTarget : null,
     mainForm: null,
     id : null,
-    rowAsProgressBar: false,
     dataModel: null,
     contextNode: null,
     currentBackgroundPanel: null,
     // Copy get/setUserPrefs from AjxpPane
     getUserPreference: AjxpPane.prototype.getUserPreference,
     setUserPreference: AjxpPane.prototype.setUserPreference,
+    configs: null,
 
 
 	initialize : function( formObject, mask ){
 
         window.UploaderInstanceRunning = true;
 
+        this.configs = pydio.getPluginConfigs("mq");
+
 		formObject = $(formObject);
 		// Main form
 		this.htmlElement = this.mainForm = formObject;
@@ -44,8 +46,6 @@ Class.create("XHRUploader", {
 		// Where to write the list
 		this.listTarget = formObject.down('div.uploadFilesList');
 
-        this.rowAsProgressBar = this.listTarget.hasClassName('rowAsProgressBar');
-
 		// How many elements?
 		this.count = 0;
 		// Current index
@@ -270,14 +270,6 @@ Class.create("XHRUploader", {
             <span style="float:left;margin-left:10px;" id="uploadedString">'+MessageHash[256]+' : 0%</span>\
             </div>');
         }
-        var options = {
-            animate		: false,									// Animate the progress? - default: true
-            showText	: false,									// show text with percentage in next to the progressbar? - default : true
-            width		: 154,										// Width of the progressbar - don't forget to adjust your image too!!!
-            boxImage	: ajxpResourcesFolder+'/images/progress_box.gif',			// boxImage : image around the progress bar
-            barImage	: ajxpResourcesFolder+'/images/progress_bar.gif',	// Image to use in the progressbar. Can be an array of images too.
-            height		: 4										// Height of the progressbar - don't forget to adjust your image too!!!
-        };
         this.mainForm.down('#clear_list_button').observe("click", function(e){
             pydio.getController().multi_selector.clearList();
             pydio.getController().multi_selector.updateTotalData();
@@ -285,10 +277,6 @@ Class.create("XHRUploader", {
         this.optionPane = this.createOptionsPane();
         this.optionPane.loadData();
 
-        if(this.mainForm.down('#phBar_total')){
-            this.totalProgressBar = new JS_BRAMUS.jsProgressBar($('pgBar_total'), 0, options);
-            this.mainForm.PROGRESSBAR = this.totalProgressBar;
-        }
         this.totalStrings = $('totalStrings');
         this.uploadedString = $('uploadedString');
 
@@ -553,75 +541,13 @@ Class.create("XHRUploader", {
         }
 
 		var id = 'pgBar_' + (this.listTarget.childNodes.length + 1);
-        if(this.rowAsProgressBar){
-            this.createInnerProgressBar(item, id);
-        }else{
-            this.createProgressBar(item, id);
-        }
+        this.createInnerProgressBar(item, id);
 		item.file = file;
 		item.updateStatus('new');
 		this.updateTotalData();
         this.sendButton.removeClassName("disabled");
 	},
-	
-	createProgressBar : function(item, id){
-		var div = new Element('div', {id:id, style:'-moz-border-radius:2px;border-radius:2px;'});
-		div.setStyle({
-			border:'1px solid #ccc', 
-			backgroundColor: 'white',
-			marginTop: '7px',
-			height:'4px',
-			padding:0,
-			width:'154px'
-		});
-		var percentText = new Element('span', {style:"float:right;display:block;width:30px;text-align:center;"});
-		var statusText = new Element('span', {style:"float:right;display:block;width:66px;overflow:hidden;text-align:right;"});
-		var container = new Element('div', {style:'border:none;padding:0;padding-right:5px;color: #777;'});
-		container.insert(statusText);		
-		container.insert(percentText);		
-		container.insert(div);
-		item.insert(container);
-		item.percentText = percentText;
-		var options = {
-			animate		: false,
-			showText	: false,
-			width		: 154,
-			boxImage	: ajxpResourcesFolder+'/images/progress_box.gif',
-			barImage	: ajxpResourcesFolder+'/images/progress_bar.gif',
-			height		: 4
-		};
-		item.pgBar = new JS_BRAMUS.jsProgressBar(div, 0, options);
-		item.statusText = statusText;
-		item.updateProgress = function(computableEvent, percentage){
-			if(percentage == null){
-				percentage = Math.round((computableEvent.loaded * 100) / computableEvent.total);  
-	        	this.bytesLoaded = computableEvent.loaded;				
-			}
-			if(!this.percentValue || this.percentValue != percentage){
-				this.percentText.innerHTML = percentage + '%';
-				this.pgBar.setPercentage(percentage);
-			}
-			this.percentValue = percentage;
-		}.bind(item);
-        var oThis = this;
-		item.updateStatus = function(status){
-			this.status = status;
-            var messageIds = {
-                "new" : 433,
-                "loading":434,
-                "loaded":435,
-                "error":436
-            };
-            try{
-                status = window.MessageHash[messageIds[status]];
-            }catch(e){}
-            if(oThis.currentBackgroundPanel){
-                oThis.currentBackgroundPanel.update(item.file.name.stripTags() + ' ['+status+']');
-            }
-            this.statusText.innerHTML = "["+status+"]";
-		}.bind(item);
-	},
-	
+    
 	createInnerProgressBar : function(item, id){
 		var statusText = new Element('span', {className:"statusText"});
 		var percentText = new Element('span', {className:"percentText"});
@@ -742,16 +668,40 @@ Class.create("XHRUploader", {
         return false;
     },
 	
-	initializeXHR : function(item, queryStringParam, forceDir){
+	initializeXHR : function(item, queryStringParam, forceDir, callback){
 
         var currentDir = this.contextNode.getPath();
         if(forceDir) currentDir = forceDir;
 
 		var xhr = new XMLHttpRequest();
-		var uri = ajxpBootstrap.parameters.get('ajxpServerAccess')+"&get_action=upload&xhr_uploader=true&dir="+encodeURIComponent(currentDir);
-		if(queryStringParam){
-			uri += '&' + queryStringParam;
-		}
+        var uri;
+
+        if (!this.configs.get("UPLOAD_ACTIVE")) {
+            uri = ajxpBootstrap.parameters.get('ajxpServerAccess') + "&get_action=upload&xhr_uploader=true&dir=" + encodeURIComponent(currentDir);
+
+            if (queryStringParam) {
+                uri += '&' + queryStringParam;
+            }
+        } else {
+            
+            var secure = this.configs.get("BOOSTER_MAIN_SECURE");
+            if(this.configs.get("BOOSTER_UPLOAD_ADVANCED") && this.configs.get("BOOSTER_UPLOAD_ADVANCED")['booster_upload_advanced'] === 'custom' && this.configs.get("BOOSTER_UPLOAD_ADVANCED")['UPLOAD_SECURE']){
+                secure = this.configs.get("BOOSTER_UPLOAD_ADVANCED")['UPLOAD_SECURE'];
+            }
+            var host = this.configs.get("BOOSTER_MAIN_HOST");
+            if(this.configs.get("BOOSTER_UPLOAD_ADVANCED") && this.configs.get("BOOSTER_UPLOAD_ADVANCED")['booster_upload_advanced'] === 'custom' && this.configs.get("BOOSTER_UPLOAD_ADVANCED")['UPLOAD_HOST']){
+                host = this.configs.get("BOOSTER_UPLOAD_ADVANCED")['UPLOAD_HOST'];
+            }
+            var port = this.configs.get("BOOSTER_MAIN_PORT");
+            if(this.configs.get("BOOSTER_UPLOAD_ADVANCED") && this.configs.get("BOOSTER_UPLOAD_ADVANCED")['booster_upload_advanced'] === 'custom' && this.configs.get("BOOSTER_UPLOAD_ADVANCED")['UPLOAD_PORT']){
+                port = this.configs.get("BOOSTER_UPLOAD_ADVANCED")['UPLOAD_PORT'];
+            }
+
+            xhr.withCredentials = true;
+
+            uri = "http"+(secure?"s":"")+"://"+host+":"+port+"/"+this.configs.get("UPLOAD_PATH")+"/"+pydio.user.activeRepository + currentDir + item.file.name;
+        }
+
 
 		var upload = xhr.upload;
 		upload.addEventListener("progress", function(e){
@@ -759,6 +709,7 @@ Class.create("XHRUploader", {
 			item.updateProgress(e);
         	this.updateTotalData();
 		}.bind(this), false);
+
 		xhr.onreadystatechange = function() {  
 			if (xhr.readyState == 4) {
 				item.updateProgress(null, 100);
@@ -776,14 +727,23 @@ Class.create("XHRUploader", {
 			}
 		}.bind(this);        
         
-        upload.onerror = function(){
+        upload.onerror = function() {
+            if (this.configs.get("UPLOAD_ACTIVE")) {
+                this.configs.set("UPLOAD_ACTIVE", false);
+                return this.initializeXHR(item, queryStringParam, forceDir, callback);
+            }
+
 			item.updateStatus('error');
-        };		
+        }.bind(this);
 
 		xhr.open("POST", uri, true);
-        try {if(Prototype.Browser.IE10) xhr.responseType =  'msxml-document'; } catch(e){}
-        return xhr;
-		
+
+        try {
+            if(Prototype.Browser.IE10) xhr.responseType =  'msxml-document';
+        } catch(e){
+        }
+
+        return callback(xhr);
 	},
 	
 	sendFileMultipart : function(item){
@@ -853,24 +813,32 @@ Class.create("XHRUploader", {
 		}else{
 			// 'overwrite' : do nothing!
 		}
-		
-		var xhr = this.initializeXHR(item, (auto_rename?"auto_rename=true":""), currentDir);
-		var file = item.file;
+
+		var xhr = this.initializeXHR(item, (auto_rename?"auto_rename=true":""), currentDir, function (item) {
+            return function (xhr) {
+
+                var file = item.file;
+
+                if(window.FormData){
+                    this.sendFileUsingFormData(xhr, file);
+                } else if(window.FileReader) {
+                    var fileReader = new FileReader();
+                    fileReader.onload = function(e){
+                        this.xhrSendAsBinary(xhr, file.name, e.target.result, item)
+                    }.bind(this);
+                    fileReader.readAsBinaryString(file);
+                }else if(file.getAsBinary){
+                    window.testFile = file;
+                    var data = file.getAsBinary();
+                    this.xhrSendAsBinary(xhr, file.name, data, item)
+                }
+
+                return xhr;
+            }
+        }(item).bind(this));
+
         item.updateProgress(null, 0);
-		item.updateStatus('loading');		
-		if(window.FormData){
-			this.sendFileUsingFormData(xhr, file);
-		}else if(window.FileReader){
-			var fileReader = new FileReader();
-			fileReader.onload = function(e){
-				this.xhrSendAsBinary(xhr, file.name, e.target.result, item)
-			}.bind(this);
-			fileReader.readAsBinaryString(file);
-		}else if(file.getAsBinary){
-			window.testFile = file;
-			var data = file.getAsBinary();
-			this.xhrSendAsBinary(xhr, file.name, data, item)
-		}
+        item.updateStatus('loading');
 	},
 	
 	sendFileUsingFormData : function(xhr, file){
@@ -1103,4 +1071,4 @@ if(!XMLHttpRequest.prototype.sendAsBinary){
 	       var blob = bb.getBlob();
 	       this.send(blob);
 	};
-}
\ No newline at end of file
+}
diff --git a/core/src/plugins/uploader.html/i18n/conf/cs.php b/core/src/plugins/uploader.html/i18n/conf/cs.php
index 5a8efa11f3..c7cd4bad83 100644
--- a/core/src/plugins/uploader.html/i18n/conf/cs.php
+++ b/core/src/plugins/uploader.html/i18n/conf/cs.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "HTML Uploader" => "Stadartní",
diff --git a/core/src/plugins/uploader.html/i18n/conf/de.php b/core/src/plugins/uploader.html/i18n/conf/de.php
index 4f503a657f..17777174f0 100644
--- a/core/src/plugins/uploader.html/i18n/conf/de.php
+++ b/core/src/plugins/uploader.html/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "HTML Uploader" => "Standard",
diff --git a/core/src/plugins/uploader.html/i18n/conf/en.php b/core/src/plugins/uploader.html/i18n/conf/en.php
index f4545ac73d..ef5bff69c6 100644
--- a/core/src/plugins/uploader.html/i18n/conf/en.php
+++ b/core/src/plugins/uploader.html/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "HTML Uploader" => "Standard",
diff --git a/core/src/plugins/uploader.html/i18n/conf/fr.php b/core/src/plugins/uploader.html/i18n/conf/fr.php
index 1bd050fa13..1488164d62 100644
--- a/core/src/plugins/uploader.html/i18n/conf/fr.php
+++ b/core/src/plugins/uploader.html/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "HTML Uploader" => "Programme d'envoi HTML",
diff --git a/core/src/plugins/uploader.html/i18n/conf/it.php b/core/src/plugins/uploader.html/i18n/conf/it.php
index 1036e51706..971f39489c 100644
--- a/core/src/plugins/uploader.html/i18n/conf/it.php
+++ b/core/src/plugins/uploader.html/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "HTML Uploader" => "Standard",
diff --git a/core/src/plugins/uploader.html/i18n/conf/pt.php b/core/src/plugins/uploader.html/i18n/conf/pt.php
index 7fe63213c8..1437947556 100644
--- a/core/src/plugins/uploader.html/i18n/conf/pt.php
+++ b/core/src/plugins/uploader.html/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "HTML Uploader" => "Envio por HTML",
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/greenled.png b/core/src/plugins/uploader.html/img/greenled.png
similarity index 100%
rename from core/src/plugins/gui.ajax/res/themes/orbit/images/greenled.png
rename to core/src/plugins/uploader.html/img/greenled.png
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/redled.png b/core/src/plugins/uploader.html/img/redled.png
similarity index 100%
rename from core/src/plugins/gui.ajax/res/themes/orbit/images/redled.png
rename to core/src/plugins/uploader.html/img/redled.png
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/images/yellowled.png b/core/src/plugins/uploader.html/img/yellowled.png
similarity index 100%
rename from core/src/plugins/gui.ajax/res/themes/orbit/images/yellowled.png
rename to core/src/plugins/uploader.html/img/yellowled.png
diff --git a/core/src/plugins/uploader.html/js/react/UploaderGlobalListener.js b/core/src/plugins/uploader.html/js/react/UploaderGlobalListener.js
new file mode 100644
index 0000000000..1394927880
--- /dev/null
+++ b/core/src/plugins/uploader.html/js/react/UploaderGlobalListener.js
@@ -0,0 +1,85 @@
+(function(global){
+
+    var initUploaderExtension = function(){
+
+        var dropzones = $$('[ajxpClass="FilesList"]');
+        if(!dropzones.length) {
+            return;
+        }
+
+        var dropzone = dropzones[0];
+        dropzone.addClassName('droparea');
+        var selector = '#content_pane,div.webfx-tree-item,.ajxpNodeProvider';
+        var dragOverFunc = function(event) {
+            var el = Event.findElement(event, selector);
+            if(el.hasClassName('ajxpNodeProvider') && el.ajxpNode.isLeaf()){
+                el = Event.findElement(event, '#content_pane');
+            }
+            el.addClassName("dropareaHover");
+            event.preventDefault();
+        };
+        var dropFunc = function(event) {
+            event.preventDefault();
+            var el = Event.findElement(event, selector);
+            if(el.hasClassName('ajxpNodeProvider') && el.ajxpNode.isLeaf()){
+                el = Event.findElement(event, '#content_pane');
+            }
+            el.removeClassName("dropareaHover");
+            var items = event.dataTransfer.items || [];
+            var files = event.dataTransfer.files;
+            ResourcesManager.loadClassesAndApply(["UploaderModel"], function(){
+                var passItems, contextNode;
+                if (items.length && items[0] && (items[0].getAsEntry || items[0].webkitGetAsEntry)) {
+                    passItems = items;
+                }
+                if(el.ajxpNode) {
+                    contextNode = el.ajxpNode;
+                } else {
+                    contextNode = pydio.getContextHolder().getContextNode();
+                }
+                UploaderModel.Store.getInstance().handleDropEventResults(passItems, files, contextNode);
+                if(!UploaderModel.Store.getInstance().getAutoStart()){
+                    pydio.getController().fireAction('upload');
+                }
+            });
+        };
+        var enterFunc = function(){
+            var el = Event.findElement(event, selector);
+            if(el.hasClassName('ajxpNodeProvider') && el.ajxpNode.isLeaf()){
+                el = Event.findElement(event, '#content_pane');
+            }
+            el.addClassName("dropareaHover");
+        };
+        var leaveFunc = function(){
+            var el = Event.findElement(event, selector);
+            if(el.hasClassName('ajxpNodeProvider') && el.ajxpNode.isLeaf()){
+                el = Event.findElement(event, '#content_pane');
+            }
+            el.removeClassName("dropareaHover");
+        };
+        AjxpDroppables.dragOverHook = dragOverFunc;
+        AjxpDroppables.dropHook = dropFunc;
+        AjxpDroppables.dragEnterHook = enterFunc;
+        AjxpDroppables.dragLeaveHook = leaveFunc;
+        dropzone.addEventListener("dragover", dragOverFunc, true);
+        dropzone.addEventListener("drop", dropFunc, true);
+        dropzone.addEventListener("dragenter", enterFunc, true);
+        dropzone.addEventListener("dragleave", leaveFunc, true);
+        document.observeOnce("ajaxplorer:trigger_repository_switch", function(){
+            dropzone.removeClassName('droparea');
+            dropzone.removeEventListener("dragover", dragOverFunc, true);
+            dropzone.removeEventListener("drop", dropFunc, true);
+            dropzone.removeEventListener("dragenter", enterFunc, true);
+            dropzone.removeEventListener("dragleave", leaveFunc, true);
+            AjxpDroppables.dragOverHook = null;
+            AjxpDroppables.dropHook = null;
+            AjxpDroppables.dragEnterHook = null;
+            AjxpDroppables.dragLeaveHook = null;
+        });
+    }
+
+    var ns = global.UploaderGlobalListener || {};
+    ns.initUploaderExtension = initUploaderExtension;
+    global.UploaderGlobalListener = ns;
+
+})(window);
\ No newline at end of file
diff --git a/core/src/plugins/uploader.html/js/react/UploaderModel.js b/core/src/plugins/uploader.html/js/react/UploaderModel.js
new file mode 100644
index 0000000000..d41684a9ad
--- /dev/null
+++ b/core/src/plugins/uploader.html/js/react/UploaderModel.js
@@ -0,0 +1,645 @@
+(function(global){
+
+    class StatusItem extends Observable{
+        constructor(type){
+            super();
+            this._status = 'new';
+            this._type = type;
+            this._id = Math.random();
+            this._errorMessage = null;
+        }
+        getId(){
+            return this._id;
+        }
+        getLabel(){
+
+        }
+        getType(){
+            return this._type;
+        }
+        getStatus(){
+            return this._status;
+        }
+        setStatus(status){
+            this._status = status;
+            this.notify('status');
+        }
+        getErrorMessage(){
+            return this._errorMessage || '';
+        }
+        onError(errorMessage){
+            this._errorMessage = errorMessage;
+            this.setStatus('error');
+        }
+        process(completeCallback){
+            this._doProcess(completeCallback);
+        }
+        abort(completeCallback){
+            if(this._status !== 'loading') return;
+            console.log('Should Stop XHR');
+            this._doAbort(completeCallback);
+        }
+    }
+
+    class UploadItem extends StatusItem{
+
+        constructor(file, targetNode, relativePath = null){
+            super('file');
+            this._file = file;
+            this._status = 'new';
+            this._progress = 0;
+            this._targetNode = targetNode;
+            this._repositoryId = global.pydio.user.activeRepository;
+            this._relativePath = relativePath;
+        }
+        getMqConfigs(){
+            return global.pydio.getPluginConfigs('mq');
+        }
+        getFile(){
+            return this._file;
+        }
+        getSize(){
+            return this._file.size;
+        }
+        getLabel(){
+            return this._relativePath ? this._relativePath : this._file.name;
+        }
+        getProgress(){
+            return this._progress;
+        }
+        setProgress(newValue, bytes = null){
+            this._progress = newValue;
+            this.notify('progress', newValue);
+            if(bytes !== null) {
+                this.notify('bytes', bytes);
+            }
+        }
+        getRelativePath(){
+            return this._relativePath;
+        }
+        buildQueryString(){
+
+            let fullPath = this._targetNode.getPath();
+            if(this._relativePath) {
+                fullPath += PathUtils.getDirname(this._relativePath);
+            }
+            let currentRepo = global.pydio.user.activeRepository;
+
+            let queryString = '&get_action=upload&xhr_uploader=true&dir=' + encodeURIComponent(fullPath);
+
+            let dataModel = global.pydio.getContextHolder();
+            let nodeName = PathUtils.getBasename(this._file.name);
+            var newNode = new AjxpNode(fullPath+"/"+nodeName);
+            if(this._file.size){
+                newNode.getMetadata().set("filesize", this._file.size);
+            }
+            try{
+                let params = null;
+                if(currentRepo !== this._repositoryId) {
+                    params = {tmp_repository_id:this._repositoryId};
+                }
+                dataModel.applyCheckHook(newNode, params);
+            }catch(e){
+                throw new Error('Error while checking before uploads');
+            }
+            let overwriteStatus = UploaderConfigs.getInstance().getOption("DEFAULT_EXISTING", "upload_existing");
+            if(overwriteStatus === 'rename'){
+                queryString += '&auto_rename=true';
+            }else if(overwriteStatus === 'alert' && !this._relativePath && currentRepo === this._repositoryId){
+                if(dataModel.fileNameExists(nodeName, false, this._targetNode)){
+                    if(!global.confirm(MessageHash[124])){
+                        throw new Error('File already exists');
+                    }
+                }
+            }
+            if(currentRepo !== this._repositoryId){
+                queryString += '&tmp_repository_id=' + this._repositoryId;
+            }
+            return queryString;
+        }
+        _parseXHRResponse(){
+            if(!this.xhr) return;
+            if (this.xhr.responseXML){
+                var result = PydioApi.getClient().parseXmlMessage(this.xhr.responseXML);
+                if(!result) this.onError('Empty response');
+            }else if (this.xhr.responseText && this.xhr.responseText != 'OK') {
+                this.onError('Unexpected response: ' + this.xhr.responseText);
+            }
+        }
+        _doProcess(completeCallback){
+            let complete = function(){
+                this.setStatus('loaded');
+                this._parseXHRResponse();
+                completeCallback();
+            }.bind(this);
+            let error = function(){
+                this.setStatus('error');
+                completeCallback();
+            }.bind(this);
+            let progress = function(computableEvent){
+                let percentage = Math.round((computableEvent.loaded * 100) / computableEvent.total);
+                let bytesLoaded = computableEvent.loaded;
+                this.setProgress(percentage, bytesLoaded);
+            }.bind(this);
+            this.setStatus('loading');
+
+            let maxUpload = parseFloat(UploaderConfigs.getInstance().getOption('UPLOAD_MAX_SIZE'));
+            if(this.getSize() > maxUpload){
+                this.onError('File is too big: contact your admin to raise the upload value, or use the desktop client.');
+                completeCallback();
+                return;
+            }
+
+            let queryString;
+            try{
+                queryString = this.buildQueryString();
+            }catch(e){
+                this.onError(e.message);
+                completeCallback();
+                return;
+            }
+
+            // Checks applied.
+            if(this.getMqConfigs().get('UPLOAD_ACTIVE')){
+
+                this.tryAlternativeUpload(complete, progress, function(){
+                    // Failed, switch back to normal upload.
+                    this.xhr = PydioApi.getClient().uploadFile(this._file,'userfile_0',queryString,complete,error,progress);
+                }.bind(this));
+
+            }else{
+
+                this.xhr = PydioApi.getClient().uploadFile(this._file,'userfile_0',queryString,complete,error,progress);
+
+            }
+
+        }
+        _doAbort(completeCallback){
+            if(this.xhr){
+                try{
+                    this.xhr.abort();
+                }catch(e){}
+            }
+        }
+
+        tryAlternativeUpload(completeCallback, progressCallback, errorCallback){
+            let configs = this.getMqConfigs();
+            var secure = configs.get("BOOSTER_MAIN_SECURE");
+            if(configs.get("BOOSTER_UPLOAD_ADVANCED") && configs.get("BOOSTER_UPLOAD_ADVANCED")['booster_upload_advanced'] === 'custom' && configs.get("BOOSTER_UPLOAD_ADVANCED")['UPLOAD_SECURE']){
+                secure = this.configs.get("BOOSTER_UPLOAD_ADVANCED")['UPLOAD_SECURE'];
+            }
+            var host = configs.get("BOOSTER_MAIN_HOST");
+            if(configs.get("BOOSTER_UPLOAD_ADVANCED") && configs.get("BOOSTER_UPLOAD_ADVANCED")['booster_upload_advanced'] === 'custom' && configs.get("BOOSTER_UPLOAD_ADVANCED")['UPLOAD_HOST']){
+                host = configs.get("BOOSTER_UPLOAD_ADVANCED")['UPLOAD_HOST'];
+            }
+            var port = configs.get("BOOSTER_MAIN_PORT");
+            if(configs.get("BOOSTER_UPLOAD_ADVANCED") && configs.get("BOOSTER_UPLOAD_ADVANCED")['booster_upload_advanced'] === 'custom' && configs.get("BOOSTER_UPLOAD_ADVANCED")['UPLOAD_PORT']){
+                port = configs.get("BOOSTER_UPLOAD_ADVANCED")['UPLOAD_PORT'];
+            }
+            let fullPath = this._targetNode.getPath();
+            if(this._relativePath) {
+                fullPath += PathUtils.getDirname(this._relativePath);
+            }
+            fullPath += '/' + PathUtils.getBasename(this._file.name);
+
+            let url = "http"+(secure?"s":"")+"://"+host+":"+port+"/"+configs.get("UPLOAD_PATH")+"/"+this._repositoryId + fullPath;
+            let queryString = '';
+            let overwriteStatus = UploaderConfigs.getInstance().getOption("DEFAULT_EXISTING", "upload_existing");
+            if(overwriteStatus === 'rename') {
+                queryString += 'auto_rename=true';
+            }
+            try{
+                this.xhr = PydioApi.getClient().uploadFile(this._file,'userfile_0',queryString,completeCallback,errorCallback,progressCallback, url, {withCredentials:true});
+            }catch(e){
+                errorCallback();
+            }
+        }
+    }
+
+    class FolderItem extends StatusItem{
+        constructor(path, targetNode){
+            super('folder');
+            this._path = path;
+            this._targetNode =  targetNode;
+        }
+        getPath(){
+            return this._path;
+        }
+        getLabel(){
+            return PathUtils.getBasename(this._path);
+        }
+        _doProcess(completeCallback){
+            let fullPath = this._targetNode.getPath() + this._path;
+            let params = {
+                get_action: 'mkdir',
+                dir: PathUtils.getDirname(fullPath),
+                dirname:PathUtils.getBasename(fullPath),
+                ignore_exists:true,
+            };
+            PydioApi.getClient().request(params, function(t){
+                this.setStatus('loaded');
+
+                var result = PydioApi.getClient().parseXmlMessage(t.responseXML);
+                if(!result) this.onError('Empty response');
+
+                completeCallback();
+            }.bind(this));
+        }
+        _doAbort(completeCallback){
+            if(global.console) global.console.log('Cannot abort folder creation');
+        }
+    }
+
+    class UploadTask extends PydioTasks.Task{
+
+        constructor(){
+            super({
+                id      : 'local-upload-task',
+                userId  : global.pydio.user.id,
+                wsId    : global.pydio.user.activeRepository,
+                flags   : PydioTasks.Task.FLAG_HAS_PROGRESS|PydioTasks.Task.FLAG_STOPPABLE,
+                label   : "Uploading files to server...",
+                status  : PydioTasks.Task.STATUS_COMPLETE,
+                statusMessage  : ''
+            });
+        }
+
+        setProgress(progress){
+            this._internal['progress'] = progress;
+            this.updateStatus(PydioTasks.Task.STATUS_RUNNING);
+        }
+        setPending(queueSize){
+            this._internal['statusMessage'] = queueSize + ' files waiting for upload';
+            this.updateStatus(PydioTasks.Task.STATUS_PENDING);
+        }
+        setRunning(queueSize){
+            this._internal['statusMessage'] = 'Uploading ' + queueSize + ' files';
+            this.updateStatus(PydioTasks.Task.STATUS_RUNNING);
+        }
+        setIdle(){
+            this._internal['statusMessage'] = '';
+            this.updateStatus(PydioTasks.Task.STATUS_COMPLETE);
+        }
+        updateStatus(status){
+            this._internal['status'] = status;
+            this.notifyMainStore();
+        }
+
+        notifyMainStore(){
+            PydioTasks.Store.getInstance().notify("tasks_updated");
+        }
+
+        hasOpenablePane(){
+            return true;
+        }
+        openDetailPane(){
+            global.pydio.Controller.fireAction("upload");
+        }
+
+        static getInstance(){
+            if(!UploadTask.__INSTANCE) {
+                UploadTask.__INSTANCE = new UploadTask();
+                PydioTasks.Store.getInstance().enqueueLocalTask(UploadTask.__INSTANCE);
+            }
+            return UploadTask.__INSTANCE;
+        }
+
+    }
+
+    class UploaderStore extends Observable{
+
+        constructor(){
+            super();
+            this._folders = [];
+            this._uploads = [];
+            this._processing = [];
+            this._processed = [];
+            // Todo
+            this._queueCounter = 0;
+            this._maxQueueSize = 2;
+        }
+        recomputeGlobalProgress(){
+            let totalCount      = 0;
+            let totalProgress   = 0;
+            this._uploads.concat(this._processing).forEach(function(item){
+                if(!item.getProgress) return;
+                totalCount ++;
+                totalProgress += item.getProgress();
+            });
+            let progress;
+            if(!totalCount) {
+                progress = 0;
+            }else{
+                progress = Math.ceil(totalProgress / totalCount);
+            }
+            return progress;
+        }
+        getAutoStart(){
+            return UploaderConfigs.getInstance().getOptionAsBool("DEFAULT_AUTO_START", "upload_auto_send");
+        }
+        getAutoClose(){
+            return UploaderConfigs.getInstance().getOptionAsBool("DEFAULT_AUTO_CLOSE", "upload_auto_close");
+        }
+        pushFolder(folderItem){
+            this._folders.push(folderItem);
+            UploadTask.getInstance().setPending(this.getQueueSize());
+            if(this.getAutoStart() && !this._processing.length) {
+                this.processNext();
+            } // Autostart with queue was empty before
+            this.notify('update');
+        }
+        pushFile(uploadItem){
+            this._uploads.push(uploadItem);
+            UploadTask.getInstance().setPending(this.getQueueSize());
+            uploadItem.observe("progress", function(){
+                let pg = this.recomputeGlobalProgress();
+                UploadTask.getInstance().setProgress(pg);
+            }.bind(this));
+            if(this.getAutoStart() && !this._processing.length) {
+                this.processNext();
+            } // Autostart with queue was empty before
+            this.notify('update');
+        }
+        log(){
+            if(global.console){
+                global.console.log("Uploads", this._uploads);
+                global.console.log("Folders", this._folders);
+            }
+        }
+        processQueue(){
+            let next = this.getNext();
+            while(next !== null){
+                next.process(function(){
+                    this._processed.push(next);
+                    this.notify("update");
+                }.bind(this));
+                next = this.getNext();
+            }
+        }
+        getQueueSize(){
+            return this._folders.length + this._uploads.length + this._processing.length;
+        }
+        clearAll(){
+            this._folders = [];
+            this._uploads = [];
+            this._processing = [];
+            this._processed = [];
+            this.notify('update');
+            UploadTask.getInstance().setIdle();
+        }
+        processNext(){
+            let processable = this.getNext();
+            if(processable){
+                this._processing.push(processable);
+                UploadTask.getInstance().setRunning(this.getQueueSize());
+                processable.process(function(){
+                    this._processing = LangUtils.arrayWithout(this._processing, this._processing.indexOf(processable));
+                    this._processed.push(processable);
+                    this.processNext();
+                    this.notify("update");
+                }.bind(this));
+            }else{
+                UploadTask.getInstance().setIdle();
+                if(this.hasErrors()){
+                    if(!pydio.getController().react_selector){
+                        global.pydio.getController().fireAction("upload");
+                    }
+                }else if(this.getAutoClose()){
+                    this.notify("auto_close");
+                }
+            }
+        }
+        getNext(){
+            if(this._folders.length){
+                return this._folders.shift();
+            }
+            if(this._uploads.length){
+                return this._uploads.shift();
+            }
+        }
+        stopOrRemoveItem(item){
+            item.abort();
+            ['_uploads', '_folders', '_processing', '_processed'].forEach(function(key){
+                let arr = this[key];
+                if(arr.indexOf(item) !== -1) {
+                    this[key] = LangUtils.arrayWithout(arr, arr.indexOf(item));
+                }
+            }.bind(this));
+            this.notify("update");
+        }
+        getItems(){
+            return {
+                processing: this._processing,
+                pending: this._folders.concat(this._uploads),
+                processed: this._processed
+            };
+        }
+        hasErrors(){
+            let result = false;
+            this._processed.map(function(item){
+                if(item.getStatus() === 'error'){
+                    result = true;
+                }
+            });
+            return result;
+        }
+        static getInstance(){
+            if(!UploaderStore.__INSTANCE){
+                UploaderStore.__INSTANCE = new UploaderStore();
+            }
+            return UploaderStore.__INSTANCE;
+        }
+
+        handleFolderPickerResult(files, targetNode){
+            var folders = {};
+            for(var i=0;i<files.length;i++){
+                var relPath = null;
+                if(files[i]['webkitRelativePath']){
+                    relPath = '/' + files[i]['webkitRelativePath'];
+                    var folderPath = PathUtils.getDirname(relPath);
+                    if(!folders[folderPath]){
+                        this.pushFolder(new FolderItem(folderPath, targetNode));
+                        folders[folderPath] = true;
+                    }
+                }
+                this.pushFile(new UploadItem(files[i], targetNode, relPath));
+            }
+        }
+
+        handleDropEventResults(items, files, targetNode){
+
+            let oThis = this;
+
+            if (items && items.length && (items[0].getAsEntry || items[0].webkitGetAsEntry)) {
+                let error = (global.console ? global.console.log : function(err){global.alert(err); }) ;
+                let length = items.length;
+                for (var i = 0; i < length; i++) {
+                    var entry;
+                    if(items[i].kind && items[i].kind != 'file') continue;
+                    if(items[0].getAsEntry){
+                        entry = items[i].getAsEntry();
+                    }else{
+                        entry = items[i].webkitGetAsEntry();
+                    }
+                    if (entry.isFile) {
+                        entry.file(function(File) {
+                            if(File.size == 0) return;
+                            oThis.pushFile(new UploadItem(File, targetNode));
+                        }, error );
+                    } else if (entry.isDirectory) {
+                        oThis.pushFolder(new FolderItem(entry.fullPath, targetNode));
+                        this.recurseDirectory(entry, function(fileEntry){
+                            var relativePath = fileEntry.fullPath;
+                            fileEntry.file(function(File) {
+                                if(File.size == 0) return;
+                                oThis.pushFile(new UploadItem(File, targetNode, relativePath));
+                            }, error );
+                        }, function(folderEntry){
+                            oThis.pushFolder(new FolderItem(folderEntry.fullPath, targetNode));
+                        }, error );
+                    }
+                }
+            }else{
+                for(var j=0;j<files.length;j++){
+                    oThis.pushFile(new UploadItem(files[j], targetNode));
+                }
+            }
+            UploaderStore.getInstance().log();
+        }
+
+        recurseDirectory(item, fileHandler, folderHandler, errorHandler) {
+
+            let recurseDir = this.recurseDirectory.bind(this);
+            let dirReader = item.createReader();
+            let entries = [];
+
+            let toArray = function(list){
+                return Array.prototype.slice.call(list || [], 0);
+            };
+
+            // Call the reader.readEntries() until no more results are returned.
+            var readEntries = function() {
+                dirReader.readEntries (function(results) {
+                    if (!results.length) {
+
+                        $A(entries).each(function(e){
+                            if(e.isDirectory){
+                                folderHandler(e);
+                                recurseDir(e, fileHandler, folderHandler, errorHandler);
+                            }else{
+                                fileHandler(e);
+                            }
+                        });
+                    } else {
+                        entries = entries.concat(toArray(results));
+                        readEntries();
+                    }
+                }, errorHandler);
+            };
+
+            readEntries(); // Start reading dirs.
+
+        }
+
+
+    }
+
+    class UploaderConfigs extends Observable{
+
+        static getInstance(){
+            if(!UploaderConfigs.__INSTANCE) UploaderConfigs.__INSTANCE = new UploaderConfigs();
+            return UploaderConfigs.__INSTANCE;
+        }
+
+        constructor(){
+            super();
+            pydio.observe("registry_loaded", function(){
+                this._global = null;
+                this._mq = null;
+            }.bind(this));
+        }
+
+        _loadOptions(){
+            if(!this._global){
+                this._global = global.pydio.getPluginConfigs("uploader");
+                this._mq = global.pydio.getPluginConfigs("mq");
+            }
+        }
+
+        getOptionAsBool(name, userPref = '', defaultValue = undefined){
+            let o = this.getOption(name, userPref, defaultValue);
+            return (o === true  || o === 'true');
+        }
+
+        getOption(name, userPref = '', defaultValue = undefined){
+            this._loadOptions();
+            if(userPref){
+                let test = this.getUserPreference('originalUploadForm_XHRUploader', userPref);
+                if(test !== undefined && test !== null) return test;
+            }
+            if(this._global.has(name)){
+                return this._global.get(name);
+            }
+            if(this._mq.has(name)){
+                return this._mq.get(name);
+            }
+            if(defaultValue !== undefined){
+                return defaultValue;
+            }
+            return null;
+        }
+
+        updateOption(name, value, isBool = false){
+            if(isBool){
+                value = value? "true" : "false";
+            }
+            this.setUserPreference('originalUploadForm_XHRUploader', name, value);
+            this.notify("change");
+        }
+
+
+        // TODO: SHOULD BE IN A "CORE" COMPONENT
+        getUserPreference(guiElementId, prefName){
+            let pydio = global.pydio;
+            if(!pydio.user) return null;
+            var gui_pref = pydio.user.getPreference("gui_preferences", true);
+            if(!gui_pref || !gui_pref[guiElementId]) return null;
+            if(pydio.user.activeRepository && gui_pref[guiElementId]['repo-'+pydio.user.activeRepository]){
+                return gui_pref[guiElementId]['repo-'+pydio.user.activeRepository][prefName];
+            }
+            return gui_pref[guiElementId][prefName];
+        }
+
+        setUserPreference(guiElementId, prefName, prefValue){
+            let pydio = global.pydio;
+            if(!pydio || !pydio.user) return;
+            var guiPref = pydio.user.getPreference("gui_preferences", true);
+            if(!guiPref) guiPref = {};
+            if(!guiPref[guiElementId]) guiPref[guiElementId] = {};
+            if(pydio.user.activeRepository ){
+                var repokey = 'repo-'+pydio.user.activeRepository;
+                if(!guiPref[guiElementId][repokey]) guiPref[guiElementId][repokey] = {};
+                if(guiPref[guiElementId][repokey][prefName] && guiPref[guiElementId][repokey][prefName] == prefValue){
+                    return;
+                }
+                guiPref[guiElementId][repokey][prefName] = prefValue;
+            }else{
+                if(guiPref[guiElementId][prefName] && guiPref[guiElementId][prefName] == prefValue){
+                    return;
+                }
+                guiPref[guiElementId][prefName] = prefValue;
+            }
+            pydio.user.setPreference("gui_preferences", guiPref, true);
+            pydio.user.savePreference("gui_preferences");
+        }
+
+    }
+
+    var ns = global.UploaderModel || {};
+    ns.Store = UploaderStore;
+    ns.Configs = UploaderConfigs;
+    ns.UploadItem = UploadItem;
+    ns.FolderItem = FolderItem;
+    global.UploaderModel = ns;
+
+})(window);
diff --git a/core/src/plugins/uploader.html/js/react/UploaderView.js b/core/src/plugins/uploader.html/js/react/UploaderView.js
new file mode 100644
index 0000000000..67608709f7
--- /dev/null
+++ b/core/src/plugins/uploader.html/js/react/UploaderView.js
@@ -0,0 +1,308 @@
+(function(global){
+    
+    var DropUploader = React.createClass({
+
+        onDrop: function(files, event, sourceComponent){
+            var items, files;
+            if(event.dataTransfer){
+                items = event.dataTransfer.items || [];
+                files = event.dataTransfer.files;
+            }else if(event.target){
+                files = event.target.files;
+            }
+            let contextNode = global.pydio.getContextHolder().getContextNode();
+            UploaderModel.Store.getInstance().handleDropEventResults(items, files, contextNode);
+        },
+
+        onFolderPicked: function(files){
+            let contextNode = global.pydio.getContextHolder().getContextNode();
+            UploaderModel.Store.getInstance().handleFolderPickerResult(files, contextNode);
+        },
+
+        start: function(e){
+            e.preventDefault();
+            UploaderModel.Store.getInstance().processNext();
+        },
+        clear: function(e){
+            e.preventDefault();
+            UploaderModel.Store.getInstance().clearAll();
+        },
+        toggleOptions: function(e){
+            e.preventDefault();
+            let crtOptions = this.state && this.state.options ? this.state.options : false;
+            this.setState({options:!crtOptions});
+        },
+
+        openFilePicker: function(e){
+            e.preventDefault();
+            this.refs.dropzone.open();
+        },
+
+        openFolderPicker: function(e){
+            e.preventDefault();
+            this.refs.dropzone.openFolderPicker();
+        },
+
+        render: function(){
+
+            let options;
+            if(this.state && this.state.options){
+                options = <UploadOptionsPane onDismiss={this.toggleOptions}/>
+            }
+            let folderButton, startButton;
+            let e = global.document.createElement('input');
+            e.setAttribute('type', 'file');
+            if('webkitdirectory' in e){
+                folderButton = <ReactMUI.RaisedButton label="Pick Folder" onClick={this.openFolderPicker}/>;
+            }
+            e = null;
+            let configs = UploaderModel.Configs.getInstance();
+            if(!configs.getOptionAsBool('DEFAULT_AUTO_START', 'upload_auto_send', true)){
+                startButton = <ReactMUI.FlatButton label="Start" onClick={this.start} secondary={true}/>
+            }
+            return (
+                <div style={{position:'relative'}}>
+                    <div className="react-mui-context uploader-action-bar">
+                        <ReactMUI.FlatButton style={{float: 'right'}} label="Options"  onClick={this.toggleOptions}/>
+                        <ReactMUI.RaisedButton secondary={true} label="Pick File" onClick={this.openFilePicker}/>
+                        {folderButton}
+                        {startButton}
+                        <ReactMUI.FlatButton label="Clear List" onClick={this.clear}/>
+                    </div>
+                    <PydioForm.FileDropZone
+                        ref="dropzone"
+                        multiple={true}
+                        enableFolders={true}
+                        supportClick={false}
+                        onDrop={this.onDrop}
+                        onFolderPicked={this.onFolderPicked}
+                        style={{width:'100%'}}
+                    >
+                        <TransfersList/>
+                    </PydioForm.FileDropZone>
+                    {options}
+                </div>
+            );
+
+        }
+
+    });
+
+    var TransferFile = React.createClass({
+
+        propTypes: {
+            item: React.PropTypes.object.isRequired,
+            className:React.PropTypes.string
+        },
+
+        componentDidMount: function(){
+            this.props.item.observe('progress', function(value){
+                this.setState({progress: value});
+            }.bind(this));
+            this.props.item.observe('status', function(value){
+                this.setState({status: value});
+            }.bind(this));
+        },
+
+        getInitialState: function(){
+            return {
+                progress: this.props.item.getProgress(),
+                status: this.props.item.getStatus()
+            };
+        },
+
+        abortTransfer: function(){
+            UploaderModel.Store.getInstance().stopOrRemoveItem(this.props.item);
+        },
+
+        render: function(){
+            let style;
+            var messageIds = {
+                "new" : 433,
+                "loading":434,
+                "loaded":435,
+                "error":436
+            };
+            let statusMessage = this.props.item.getStatus();
+            let stopButton;
+            if(statusMessage === 'loading'){
+                stopButton = <span className="stop-button icon-stop" onClick={this.abortTransfer}/>;
+            }else{
+                stopButton = <span className="stop-button mdi mdi-close" onClick={this.abortTransfer}/>;
+            }
+            if(statusMessage === 'error' && this.props.item.getErrorMessage()){
+                statusMessage = this.props.item.getErrorMessage();
+            }
+            if(global.pydio.MessageHash[messageIds[statusMessage]]){
+                statusMessage = global.pydio.MessageHash[messageIds[statusMessage]];
+            }
+            if(this.props.item.getRelativePath()){
+                var relativeMessage = <span className="path">{this.props.item.getRelativePath()}</span>;
+            }
+            if(this.state && this.state.progress){
+                style = {width: this.state.progress + '%'};
+            }
+            return (
+                <div className={"file-row upload-" + this.props.item.getStatus() + " " + (this.props.className?this.props.className:"")}>
+                    <span className="mdi mdi-file"/> {this.props.item.getFile().name}
+                    {relativeMessage}
+                    <span className="status">{statusMessage}</span>
+                    {stopButton}
+                    <div className="uploader-pgbar" style={style}/>
+                </div>
+            );
+        }
+    });
+
+    var TransferFolder = React.createClass({
+
+        propTypes: {
+            item: React.PropTypes.object.isRequired
+        },
+
+        render: function(){
+            let statusMessage;
+            if(this.props.item.getStatus() === 'loaded'){
+                statusMessage = 'Created';
+            }
+            return (
+                <div className={"folder-row upload-" + this.props.item.getStatus() + " " + (this.props.className?this.props.className:"")}>
+                    <span className="mdi mdi-folder"/> {this.props.item.getPath()} <span className="status">{statusMessage}</span>
+                </div>
+            );
+        }
+    });
+
+    var TransfersList = React.createClass({
+
+        componentDidMount: function(){
+            let store = UploaderModel.Store.getInstance();
+            this._storeObserver = function(){
+                if(!this.isMounted()) return;
+                this.setState({items: store.getItems()});
+            }.bind(this);
+            store.observe("update", this._storeObserver);
+            store.observe("auto_close", function(){
+                pydio.UI.modal.dismiss();
+            });
+            this.setState({items: store.getItems()});
+        },
+
+        componentWillUnmount: function(){
+            if(this._storeObserver){
+                UploaderModel.Store.getInstance().stopObserving("update", this._storeObserver);
+                UploaderModel.Store.getInstance().stopObserving("auto_close");
+            }
+        },
+
+        renderSection: function(accumulator, items, title = "", className=""){
+            if(title && items.length){
+                accumulator.push(<div className={className + " header"}>{title}</div>);
+            }
+            items.sort(function(a, b){
+                let aType = a instanceof UploaderModel.FolderItem? 'folder' : 'file';
+                let bType = b instanceof UploaderModel.FolderItem? 'folder' : 'file';
+                if(aType === bType){
+                    return 0;
+                }else{
+                    return aType === 'folder' ? -1 : 1;
+                }
+            });
+            items.forEach(function(f){
+                if(f instanceof UploaderModel.FolderItem){
+                    accumulator.push( <TransferFolder key={f.getId()} item={f} className={className}/> );
+                }else{
+                    accumulator.push( <TransferFile key={f.getId()} item={f} className={className}/> );
+                }
+            });
+        },
+
+        render: function(){
+            let items = [];
+            if(this.state && this.state.items){
+                this.renderSection(items, this.state.items.processing, 'Processing', 'section-processing');
+                this.renderSection(items, this.state.items.pending, 'Pending', 'section-pending');
+                this.renderSection(items, this.state.items.processed, 'Processed', 'section-processed');
+            }
+            return (
+                <div id="upload_files_list" className={UploaderModel.Configs.getInstance().getOptionAsBool('UPLOAD_SHOW_PROCESSED', 'upload_show_processed', false) ? 'show-processed' : ''}>
+                    {items}
+                </div>
+            )
+        }
+    });
+
+    var UploadOptionsPane = React.createClass({
+
+        propTypes: {
+            onDismiss: React.PropTypes.func.isRequired
+        },
+
+        getInitialState: function(){
+
+            let configs = UploaderModel.Configs.getInstance();
+            return {
+                configs: configs
+            };
+
+        },
+
+        updateField: function(fName, event){
+            if(fName === 'autostart'){
+                let toggleStart = this.state.configs.getOptionAsBool('DEFAULT_AUTO_START', 'upload_auto_send', true);
+                toggleStart = !toggleStart;
+                this.state.configs.updateOption('upload_auto_send', toggleStart, true);
+            }else if(fName === 'autoclose'){
+                let toggleStart = this.state.configs.getOptionAsBool('DEFAULT_AUTO_CLOSE', 'upload_auto_close', true);
+                toggleStart = !toggleStart;
+                this.state.configs.updateOption('upload_auto_close', toggleStart, true);
+            }else if(fName === 'existing'){
+                this.state.configs.updateOption('upload_existing', event.target.getSelectedValue());
+            }else if(fName === 'show_processed'){
+                let toggleShowProcessed = this.state.configs.getOptionAsBool('UPLOAD_SHOW_PROCESSED', 'upload_show_processed', false);
+                toggleShowProcessed = !toggleShowProcessed;
+                this.state.configs.updateOption('upload_show_processed', toggleShowProcessed, true);
+            }
+            this.setState({random: Math.random()});
+        },
+
+        radioChange: function(e, newValue){
+            this.state.configs.updateOption('upload_existing', newValue);
+            this.setState({random: Math.random()});
+        },
+        
+        render: function(){
+
+            let maxUpload = this.state.configs.getOption('UPLOAD_MAX_SIZE');
+            let maxUploadMessage = MessageHash[282] + ': ' + PathUtils.roundFileSize(maxUpload, '');
+            let toggleStart = this.state.configs.getOptionAsBool('DEFAULT_AUTO_START', 'upload_auto_send');
+            let toggleClose = this.state.configs.getOptionAsBool('DEFAULT_AUTO_CLOSE', 'upload_auto_close');
+            let toggleShowProcessed = this.state.configs.getOptionAsBool('UPLOAD_SHOW_PROCESSED', 'upload_show_processed', false);
+            let overwriteType = this.state.configs.getOption('DEFAULT_EXISTING', 'upload_existing');
+
+            return (
+                <div className="upload-options-pane react-mui-context">
+                    <span className="close-options mdi mdi-close" onClick={this.props.onDismiss}></span>
+                    <div className="option-row">{maxUploadMessage}</div>
+                    <div className="option-row"><ReactMUI.Toggle label="Start uploading automatically" labelPosition="right" toggled={toggleStart} defaultToggled={toggleStart} onToggle={this.updateField.bind(this, 'autostart')}/></div>
+                    <div className="option-row"><ReactMUI.Toggle label="Close panel after upload is finished" labelPosition="right"  toggled={toggleClose} onToggle={this.updateField.bind(this, 'autoclose')}/></div>
+                    <div className="option-row"><ReactMUI.Toggle label="Show/hide processed files" labelPosition="right"  toggled={toggleShowProcessed} onToggle={this.updateField.bind(this, 'show_processed')}/></div>
+                    <div className="option-row">
+                        <div style={{marginBottom: 10}}>If a file with the same name exists</div>
+                        <ReactMUI.RadioButtonGroup ref="group" name="shipSpeed" defaultSelected={overwriteType} onChange={this.radioChange}>
+                            <ReactMUI.RadioButton value="alert" label="Stop upload and alert me"/>
+                            <ReactMUI.RadioButton value="rename" label="Rename new file automatically"/>
+                            <ReactMUI.RadioButton value="overwrite" label="Overwrite existing file"/>
+                        </ReactMUI.RadioButtonGroup>
+                    </div>
+                </div>
+            );
+        }
+
+    });
+
+    var ns = global.UploaderView || {};
+    ns.DropUploader = DropUploader;
+    global.UploaderView = ns;
+
+})(window);
\ No newline at end of file
diff --git a/core/src/plugins/uploader.html/manifest.xml b/core/src/plugins/uploader.html/manifest.xml
index 6f7fd26c36..8f3817d7f9 100644
--- a/core/src/plugins/uploader.html/manifest.xml
+++ b/core/src/plugins/uploader.html/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <uploader id="uploader.html" order="0" text="51" title="162" className="MultiUploader" label="CONF_MESSAGE[HTML Uploader]" description="CONF_MESSAGE[Auto-switching HTML5 or IFrame uploader.]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-	<class_definition filename="plugins/uploader.html/class.SimpleUploadProcessor.php" classname="SimpleUploadProcessor"/>
+	<class_definition filename="plugins/uploader.html/SimpleUpload.php" classname="Pydio\Uploader\Processor\SimpleUpload"/>
     <server_settings>
         <global_param expose="true" name="DEFAULT_EXISTING" group="CONF_MESSAGE[Default Behaviour]" type="select" choices="overwrite|CONF_MESSAGE[Always Override],rename|CONF_MESSAGE[Auto Rename File],alert|CONF_MESSAGE[Prompt user]" label="CONF_MESSAGE[Existing Files]" description="CONF_MESSAGE[Inform the user or not if the file already exists (default behaviour, the user will be able to change this preference)]" mandatory="false" default="rename"/>
         <global_param expose="true" name="DEFAULT_AUTO_START" group="CONF_MESSAGE[Default Behaviour]" type="boolean" label="CONF_MESSAGE[Auto Start]" description="CONF_MESSAGE[Default value for automatically starting upload or not]" mandatory="false" default="true"/>
@@ -9,7 +9,9 @@
     <client_settings>
         <resources>
             <js file="plugins/uploader.html/class.MultiUploader.js" className="MultiUploader"/>
-            <js file="plugins/uploader.html/class.XHRUploader.js" className="XHRUploader"/>
+            <js file="plugins/uploader.html/js/build/UploaderView.js" className="UploaderView" depends="React,PydioForm,UploaderModel"/>
+            <js file="plugins/uploader.html/js/build/UploaderModel.js" className="UploaderModel" depends="PydioTasks"/>
+            <js file="plugins/uploader.html/js/build/UploaderGlobalListener.js" className="UploaderGlobalListener"/>
             <i18n path="plugins/uploader.html/i18n" namespace="html_uploader"/>
         </resources>
     </client_settings>
@@ -42,165 +44,37 @@
         <pluginClass pluginName="gui.ajax"/>
     </dependencies>
 	<processing>
-		<clientForm id="originalUploadForm"><![CDATA[
-			<!-- UPLOAD FORM -->
-			<form action="AJXP_SERVER_ACCESS" target="hidden_iframe" enctype="multipart/form-data" method="POST" id="originalUploadForm" style="text-align:left; display:none;" box_width="420">
-			<table>
-				<tr>
-				        <td id="fileInputContainer" valign="top"><div id="fileInputContainerDiv">
-				                <div id="fileInputPos"><input type="file" name="userfile_1" class="dialogFocus"></div>
-				                <div id="uploadBrowseButton" class="fakeUploadButton"><img src="AJXP_THEME_FOLDER/images/actions/22/view_list_details.png"><br/>AJXP_MESSAGE[171]</div>
-				                <div id="uploadSendButton" class="fakeUploadButton"><img src="AJXP_THEME_FOLDER/images/actions/22/yast_backup.png"><br/>AJXP_MESSAGE[77]</div>
-				        </div></td>
-				        <td rowspan="2" id="uploadFilesListContainer">
-				                <div id="upload_files_list" class="uploadFilesList"></div>
-				        </td>
-				</tr>
-				<tr>
-				        <td id="optClosButtonsContainer">
-				                <div class="fakeUploadButton fakeOptionButton" id="uploadOptionsButton">AJXP_MESSAGE[310] <span style="display:none;">[x]</span></div>
-				                <div class="fakeUploadButton fakeOptionButton" id="uploadCloseButton">AJXP_MESSAGE[86]</div>
-				        </td>
-				</tr>
-			</table>
-			<input type="hidden" name="get_action" value="upload">
-			<input type="hidden" name="simple_uploader" value="true">
-			</form>
-			<script language="javascript">$('originalUploadForm').hide();</script>
-		]]></clientForm>
-        <clientForm id="originalUploadForm" theme="vision"><![CDATA[
-			<!-- UPLOAD FORM -->
-			<form action="AJXP_SERVER_ACCESS" target="hidden_iframe" enctype="multipart/form-data" method="POST" id="originalUploadForm" style="text-align:left; display:none;" box_width="500" box_padding="0">
-			<div style="padding:10px;">
-                <div id="fileInputContainer">
-                    <div id="uploaderTextActions">
-                        <span id="uploadSendButton">AJXP_MESSAGE[77] |</span>
-                        <span id="clear_list_button">AJXP_MESSAGE[216] |</span>
-                        <span id="uploadOptionsButton">AJXP_MESSAGE[310] <span style="display:none;">[x]</span></span>
-                    </div>
-                    <div id="fileInputContainerDiv">
-                            <div id="fileInputPos"><input type="file" name="userfile_1" class="dialogFocus"></div>
-                            <div id="uploadBrowseButton" class="fakeUploadButton"><span class="icon-desktop"></span>AJXP_MESSAGE[454]</div>
-                    </div>
-                </div>
-                <div id="uploader_options_pane"></div>
-                <div id="upload_files_list" class="uploadFilesList rowAsProgressBar"></div>
-                <div id="total_files_list"></div>
-                <input type="hidden" name="get_action" value="upload">
-                <input type="hidden" name="simple_uploader" value="true">
-			</div>
-			</form>
-			<script language="javascript">$('originalUploadForm').hide();</script>
-		]]></clientForm>
-        <clientForm id="originalUploadForm" theme="orbit"><![CDATA[
-			<!-- UPLOAD FORM -->
-			<form action="AJXP_SERVER_ACCESS" target="hidden_iframe" enctype="multipart/form-data" method="POST" id="originalUploadForm" style="text-align:left; display:none;" box_width="60%" box_padding="0">
-			<div style="padding:10px;">
-                <div id="fileInputContainer">
-                    <div id="uploaderTextActions">
-                        <span id="uploadSendButton">AJXP_MESSAGE[77] |</span>
-                        <span id="clear_list_button">AJXP_MESSAGE[216] |</span>
-                        <span id="uploadOptionsButton">AJXP_MESSAGE[310] <span style="display:none;">[x]</span></span>
-                    </div>
-                    <div id="fileInputContainerDiv">
-                            <div id="fileInputPos"><input type="file" name="userfile_1" class="dialogFocus"></div>
-                            <div id="uploadBrowseButton" class="fakeUploadButton"><span class="icon-desktop"></span>AJXP_MESSAGE[454]</div>
-                    </div>
-                </div>
-                <div id="uploader_options_pane"></div>
-                <div id="upload_files_list" class="uploadFilesList rowAsProgressBar"></div>
-                <div id="total_files_list"></div>
-                <input type="hidden" name="get_action" value="upload">
-                <input type="hidden" name="simple_uploader" value="true">
-			<div>
-			</form>
-			<script language="javascript">$('originalUploadForm').hide();</script>
+        <clientForm id="upload_main_container" theme="orbit"><![CDATA[
+			<div id="upload_main_container" box_width="60%" box_padding="0" style="padding:10px;"><div>
 		]]></clientForm>
 		<dialogOnOpen><![CDATA[
 			if(typeof File != "undefined" && typeof (new XMLHttpRequest()).upload != "undefined"  && 'draggable' in new Element('span')){
-			    if(pydio.getController().multi_selector && pydio.getController().multi_selector.__className == 'XHRUploader'){
-			        pydio.getController().multi_selector.initialize(oForm);
-			    }else{
-    				pydio.getController().multi_selector = new XHRUploader(oForm);
-                }
+                pydio.getController().react_selector = new AjxpReactComponent(oForm.down("#upload_main_container"), {
+                    componentNamespace:"UploaderView",
+                    componentName:"DropUploader",
+                    dependencies:["UploaderModel","PydioForm"]
+                });
 			}else{
 				pydio.getController().multi_selector = new MultiUploader(oForm);
 			}
 		]]></dialogOnOpen>
+        <dialogOnComplete><![CDATA[
+            if(pydio.getController().react_selector){
+                pydio.getController().react_selector.destroy();
+                pydio.getController().react_selector = null;
+            }
+        ]]></dialogOnComplete>
 		<extensionOnInit><![CDATA[
-		if(typeof File != "undefined" && typeof (new XMLHttpRequest()).upload != "undefined"
-		       && 'draggable' in new Element('span') && (window.FileReader || window.FormData)
-		       && ajaxplorer && ajaxplorer.user && ajaxplorer.user.write
-	    	){
-			var dropzones = $$('[ajxpClass="FilesList"]');
-			if(dropzones.length){
-			    var dropzone = dropzones[0];
-                dropzone.addClassName('droparea');
-                var selector = '#content_pane,div.webfx-tree-item,.ajxpNodeProvider';
-                var dragOverFunc = function(event) {
-                    var el = Event.findElement(event, selector);
-                    if(el.hasClassName('ajxpNodeProvider') && el.ajxpNode.isLeaf()){
-                        el = Event.findElement(event, '#content_pane');
-                    }
-                    el.addClassName("dropareaHover");
-                    event.preventDefault();
-                };
-                var dropFunc = function(event) {
-                    event.preventDefault();
-                    var el = Event.findElement(event, selector);
-                    if(el.hasClassName('ajxpNodeProvider') && el.ajxpNode.isLeaf()){
-                        el = Event.findElement(event, '#content_pane');
-                    }
-                    el.removeClassName("dropareaHover");
-                    if(!window.UploaderInstanceRunning){
-                        var items = event.dataTransfer.items || [];
-                        if (event.dataTransfer.files.length && items[0] && (items[0].getAsEntry || items[0].webkitGetAsEntry)) {
-                            window.UploaderDroppedItems = items;
-                            window.UploaderDroppedFiles = event.dataTransfer.files;
-                            window.UploaderDroppedTarget = el;
-                            pydio.getController().fireAction('upload');
-                        }else if(event.dataTransfer.files.length){
-                            window.UploaderDroppedFiles = event.dataTransfer.files;
-                            window.UploaderDroppedTarget = el;
-                            pydio.getController().fireAction('upload');
-                        }
-                    }
-                };
-                var enterFunc = function(){
-                    var el = Event.findElement(event, selector);
-                    if(el.hasClassName('ajxpNodeProvider') && el.ajxpNode.isLeaf()){
-                        el = Event.findElement(event, '#content_pane');
-                    }
-                    el.addClassName("dropareaHover");
-                };
-                var leaveFunc = function(){
-                    var el = Event.findElement(event, selector);
-                    if(el.hasClassName('ajxpNodeProvider') && el.ajxpNode.isLeaf()){
-                        el = Event.findElement(event, '#content_pane');
-                    }
-                    el.removeClassName("dropareaHover");
-                };
-                AjxpDroppables.dragOverHook = dragOverFunc;
-                AjxpDroppables.dropHook = dropFunc;
-                AjxpDroppables.dragEnterHook = enterFunc;
-                AjxpDroppables.dragLeaveHook = leaveFunc;
-                dropzone.addEventListener("dragover", dragOverFunc, true);
-                dropzone.addEventListener("drop", dropFunc, true);
-                dropzone.addEventListener("dragenter", enterFunc, true);
-                dropzone.addEventListener("dragleave", leaveFunc, true);
-                document.observeOnce("ajaxplorer:trigger_repository_switch", function(){
-                    dropzone.removeClassName('droparea');
-                    dropzone.removeEventListener("dragover", dragOverFunc, true);
-                    dropzone.removeEventListener("drop", dropFunc, true);
-                    dropzone.removeEventListener("dragenter", enterFunc, true);
-                    dropzone.removeEventListener("dragleave", leaveFunc, true);
-                    AjxpDroppables.dragOverHook = null;
-                    AjxpDroppables.dropHook = null;
-                    AjxpDroppables.dragEnterHook = null;
-                    AjxpDroppables.dragLeaveHook = null;
-                });
-			}
-		}
+            var pydioUserWriteable = pydio && pydio.user && pydio.user.write;
+            var dragSupported = 'draggable' in new Element('span');
+            var fileUploadSupported = typeof File != "undefined" && typeof (new XMLHttpRequest()).upload != "undefined" && (window.FileReader || window.FormData);
+            if(fileUploadSupported && dragSupported && pydioUserWriteable){
+                try{
+                    ResourcesManager.loadClassesAndApply(["UploaderGlobalListener","UploaderModel"], function(){
+                        UploaderGlobalListener.initUploaderExtension();
+                    });
+                }catch(e){}
+            }
 		]]></extensionOnInit>
 	</processing>
 </uploader>
diff --git a/core/src/plugins/uploader.html/package.json b/core/src/plugins/uploader.html/package.json
new file mode 100644
index 0000000000..6d89ef80a0
--- /dev/null
+++ b/core/src/plugins/uploader.html/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "uploader.html",
+  "version": "6.5.1",
+  "description": "XHR based Uploader",
+  "source_path":"js/react",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "Abstrium SAS",
+  "license": "agpl",
+  "devDependencies": {
+    "grunt": "~0.4.5",
+    "grunt-babel": "~5.0.3",
+    "grunt-contrib-watch": "~0.6.1"
+  }
+}
diff --git a/core/src/plugins/uploader.http/HttpDownload.php b/core/src/plugins/uploader.http/HttpDownload.php
new file mode 100644
index 0000000000..3f8e035601
--- /dev/null
+++ b/core/src/plugins/uploader.http/HttpDownload.php
@@ -0,0 +1,272 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Uploader\Processor;
+
+use Pydio\Access\Core\AbstractAccessDriver;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\LocaleService;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\StatHelper;
+
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Core\Controller\UnixProcess;
+use Pydio\Tasks\Task;
+use Pydio\Tasks\TaskService;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Remote files downloader
+ * @package AjaXplorer_Plugins
+ * @subpackage Downloader
+ */
+class HttpDownload extends Plugin
+{
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $request
+     * @param \Psr\Http\Message\ResponseInterface $response
+     * @return bool
+     * @throws \Exception
+     * @throws \Pydio\Core\Exception\PydioException
+     */
+    public function switchAction(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response)
+    {
+        //$this->logInfo("DL file", $httpVars);
+        $httpVars = $request->getParsedBody();
+        $action = $request->getAttribute("action");
+        /** @var ContextInterface $ctx */
+        $ctx = $request->getAttribute("ctx");
+        $userSelection = UserSelection::fromContext($request->getAttribute("ctx"), $httpVars);
+        $dir = InputFilter::decodeSecureMagic($httpVars["dir"]);
+        $currentDirUrl = $userSelection->currentBaseUrl().$dir."/";
+        $dlURL = null;
+        if (isSet($httpVars["file"])) {
+            $parts = parse_url($httpVars["file"]);
+            $getPath = $parts["path"];
+            $basename = basename($getPath);
+            //$dlURL = $httpVars["file"];
+        }else if (isSet($httpVars["dlfile"])) {
+            $dlFile = $userSelection->currentBaseUrl(). InputFilter::decodeSecureMagic($httpVars["dlfile"]);
+            $realFile = file_get_contents($dlFile);
+            if(empty($realFile)) throw new \Exception("cannot find file $dlFile for download");
+            $parts = parse_url($realFile);
+            $getPath = $parts["path"];
+            $basename = basename($getPath);
+            //$dlURL = $realFile;
+        }else{
+            throw new \Exception("Missing argument, either file or dlfile");
+        }
+        /** @var AbstractAccessDriver $fsDriver */
+        $fsDriver = PluginsService::getInstance($ctx)->getUniqueActivePluginForType("access");
+        $fsDriver->filterUserSelectionToHidden($ctx, array($basename));
+
+        switch ($action) {
+            case "external_download":
+
+                // Preparing the task
+                $taskId = $request->getAttribute("pydio-task-id");
+                if(empty($taskId)) {
+                    $task = TaskService::actionAsTask($request->getAttribute("ctx"), "external_download", $httpVars, [], Task::FLAG_HAS_PROGRESS | Task::FLAG_STOPPABLE);
+                    $task->setActionLabel(LocaleService::getMessages(), 'httpdownloader.1');
+                    TaskService::getInstance()->enqueueTask($task, $request, $response);
+                    break;
+                }
+
+                // Parameters
+                $url = $httpVars["file"];
+                $node = new AJXP_Node($currentDirUrl.$basename);
+
+                // Work
+                try {
+                    $this->externalDownload(
+                        $url,  // Original url for the file
+                        $node, // Destination node
+                        function ($msg, $progress) use ($taskId) {
+                            TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_RUNNING, sprintf($msg, $progress), null, $progress);
+                        } //  Showing progress for the download
+                    );
+                } catch (\Exception $e) {
+                    // In case of a problem, removing the task
+                    TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_FAILED, $e->getMessage());
+                    return false;
+                }
+
+                // Ending the task
+                if (isset($dlFile) && isSet($httpVars["delete_dlfile"]) && is_file($dlFile)) {
+                    Controller::applyHook("node.before_path_change", array(new AJXP_Node($dlFile)));
+                    unlink($dlFile);
+                    Controller::applyHook("node.change", array(new AJXP_Node($dlFile), null, false));
+                }
+                $mess = LocaleService::getMessages();
+                TaskService::getInstance()->updateTaskStatus($taskId, Task::STATUS_COMPLETE, $mess["httpdownloader.8"]);
+                Controller::applyHook("node.change", array(null, $node, false), true);
+
+            break;
+            case "update_dl_data":
+
+                $file = InputFilter::decodeSecureMagic($httpVars["file"]);
+                header("text/plain");
+                if (is_file($currentDirUrl.$file)) {
+                    $node = new AJXP_Node($currentDirUrl.$file);
+                    $filesize = filesize($node->getUrl());
+                    echo $filesize;
+                } else {
+                    echo "stop";
+                }
+
+            break;
+            case "stop_dl":
+                $newName = "__".str_replace(".dlpart", ".ser", $basename);
+                $hiddenFilename = $currentDirUrl.$newName;
+                $data = @unserialize(@file_get_contents($hiddenFilename));
+                header("text/plain");
+                $this->logDebug("Getting $hiddenFilename",$data);
+                if (isSet($data["pid"])) {
+                    $process = new UnixProcess();
+                    $process->setPid($data["pid"]);
+                    $process->stop();
+                    unlink($hiddenFilename);
+                    unlink($currentDirUrl.$basename);
+                    echo 'stop';
+                } else {
+                    echo 'failed';
+                }
+            break;
+            default:
+            break;
+        }
+
+        return false;
+    }
+
+
+    /**
+     * @param string $url
+     * @param AJXP_Node $node
+     * @param $updateFn
+     * @throws \Exception
+     */
+    public function externalDownload($url, $node, $updateFn) {
+
+        $client = new \GuzzleHttp\Client(['base_url' => $url]);
+
+        $response = $client->get();
+
+        if ($response->getStatusCode() !== 200) {
+            throw new \Exception("There was a problem retrieving the file from the server");
+        }
+
+        $totalSize = -1;
+
+        $contentDisposition = $response->getHeader("Content-Disposition");
+        $contentLength = $response->getHeader("Content-Length");
+
+        if (strstr($contentDisposition, "filename")!== false) {
+            $ar = explode("filename=", $contentDisposition);
+            $basename = trim(array_pop($ar));
+            $basename = str_replace("\"", "", $basename); // Remove quotes
+        }
+
+        if (!empty($contentLength)) {
+            $totalSize = intval($contentLength);
+            $this->logDebug("Should download $totalSize bytes!");
+        }
+        if ($totalSize != -1) {
+            Controller::applyHook("node.before_create", array($node, $totalSize));
+        }
+
+        $basename = basename($node->getPath());
+        $tmpFilename = $node->getUrl().".dlpart";
+        $hiddenFilename = rtrim($node->getUrl(), $basename) . "__" . $basename .".ser";
+
+        $filename = $node->getUrl();
+
+        $dlData = array(
+            "sourceUrl" => $url,
+            "totalSize" => $totalSize
+        );
+        if (isSet($pid)) {
+            $dlData["pid"] = $pid;
+        }
+
+        //file_put_contents($hiddenFilename, serialize($dlData));
+        $fpHid=fopen($hiddenFilename,"w");
+        fputs($fpHid,serialize($dlData));
+        fclose($fpHid);
+
+        // NOW READ RESPONSE
+        $readBodySize = 0;
+        $currentPercent = 0;
+        $destStream = fopen($tmpFilename, "w");
+
+        $body = $response->getBody();
+
+        // Copy-ing the body to the destination file
+        while (!$body->eof()) {
+            $body->read(4096);
+
+            $part = $body->read(4096);
+            $readBytes = strlen($part);
+
+            fwrite($destStream, $part, $readBytes);
+
+            $readBodySize += $readBytes;
+
+            if($totalSize > 0) {
+                $newPercent = round(100 * $readBodySize / $totalSize);
+                if($newPercent > $currentPercent) {
+                    $updateFn("Downloading ... %d %%", $newPercent);
+                }
+
+                $currentPercent = $newPercent;
+            }
+        }
+
+        fclose($destStream);
+        rename($tmpFilename, $filename);
+        unlink($hiddenFilename);
+    }
+
+    /**
+     * @param AJXP_Node $ajxpNode
+     */
+    public function detectDLParts(&$ajxpNode)
+    {
+        if (!preg_match("/\.dlpart$/i",$ajxpNode->getUrl())) {
+            return;
+        }
+        $basename = basename($ajxpNode->getUrl());
+        $newName = "__".str_replace(".dlpart", ".ser", $basename);
+        $hidFile = str_replace($basename, $newName, $ajxpNode->getUrl());
+        if (is_file($hidFile)) {
+            $data = unserialize(file_get_contents($hidFile));
+            if ($data["totalSize"] != -1) {
+                $ajxpNode->target_bytesize = $data["totalSize"];
+                $ajxpNode->target_filesize = StatHelper::roundSize($data["totalSize"]);
+                $ajxpNode->process_stoppable = (isSet($data["pid"])?"true":"false");
+            }
+        }
+    }
+}
diff --git a/core/src/plugins/uploader.http/bookmarklet/ajxp.js b/core/src/plugins/uploader.http/bookmarklet/ajxp.js
index 5b9f2bb9ba..68dc14eca2 100644
--- a/core/src/plugins/uploader.http/bookmarklet/ajxp.js
+++ b/core/src/plugins/uploader.http/bookmarklet/ajxp.js
@@ -15,12 +15,12 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  */
 var currentLink;
 function parseLinks(){
     var bmlink1 = '<a id="ajxp_bm_link_dl1" title="Send to Pydio">\
-                Download <img ajxp_image="true" src="'+window.ajxp_bm_target+'/plugins/gui.ajax/res/themes/umbra/images/actions/22/forward_22.png" align="absmiddle"><img align="absmiddle" ajxp_image="true" src="'+window.ajxp_bm_target+'/plugins/gui.ajax/res/themes/umbra/images/actions/32/hdd_external_unmount.png"></a>';
+                Download <img ajxp_image="true" src="'+window.ajxp_bm_target+'/plugins/gui.ajax/res/themes/orbit/images/actions/22/forward_22.png" align="absmiddle"><img align="absmiddle" ajxp_image="true" src="'+window.ajxp_bm_target+'/plugins/gui.ajax/res/themes/orbit/images/actions/32/hdd_external_unmount.png"></a>';
 	jQuery('body').append('<link rel="stylesheet" type="text/css" href="'+ajxp_bm_target+'plugins/uploader.http/bookmarklet/ajxp.css"></link>');
 	jQuery('body').append('<div id="ajxp_bm_main" style="display:none;" class="ajxp_bm_menu" ><div><a id="ajxp_bm_close" style="float:right;font-size:12px;cursor:pointer;border-left:1px solid #fff;padding-left: 10px;">X</a>Pydio direct download</div><div class="ajxp_bm_menu_legend">Click on any link or image to send the link directly to your Pydio account.</div><div style="display:none" id="ajxp_bm_frame_div"><iframe frameborder="0" id="ajxp_bm_iframe"></iframe></div></div><div style="position:absolute;" class="ajxp_bm_menu" id="ajxp_bm_link_menu">'+bmlink1+'<a id="ajxp_bm_link_dl2">Process link normally</a></div>').click(function(){jQuery('#ajxp_bm_link_menu').slideUp();}) ;
 
diff --git a/core/src/plugins/uploader.http/class.HttpDownloader.php b/core/src/plugins/uploader.http/class.HttpDownloader.php
deleted file mode 100644
index 9e8c770d63..0000000000
--- a/core/src/plugins/uploader.http/class.HttpDownloader.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Remote files downloader
- * @package AjaXplorer_Plugins
- * @subpackage Downloader
- */
-class HttpDownloader extends AJXP_Plugin
-{
-    public function switchAction($action, $httpVars, $fileVars)
-    {
-        //$this->logInfo("DL file", $httpVars);
-
-        $repository = ConfService::getRepository();
-        if (!$repository->detectStreamWrapper(true)) {
-            return false;
-        }
-        $userSelection = new UserSelection($repository);
-        $dir = AJXP_Utils::decodeSecureMagic($httpVars["dir"]);
-        $currentDirUrl = $userSelection->currentBaseUrl().$dir."/";
-        $dlURL = null;
-        if (isSet($httpVars["file"])) {
-            $parts = parse_url($httpVars["file"]);
-            $getPath = $parts["path"];
-            $basename = basename($getPath);
-            //$dlURL = $httpVars["file"];
-        }else if (isSet($httpVars["dlfile"])) {
-            $dlFile = $userSelection->currentBaseUrl().AJXP_Utils::decodeSecureMagic($httpVars["dlfile"]);
-            $realFile = file_get_contents($dlFile);
-            if(empty($realFile)) throw new Exception("cannot find file $dlFile for download");
-            $parts = parse_url($realFile);
-            $getPath = $parts["path"];
-            $basename = basename($getPath);
-            //$dlURL = $realFile;
-        }else{
-            throw new Exception("Missing argument, either file or dlfile");
-        }
-        $fsDriver = AJXP_PluginsService::getInstance()->getUniqueActivePluginForType("access");
-        $fsDriver->filterUserSelectionToHidden(array($basename));
-
-        switch ($action) {
-            case "external_download":
-                if (!ConfService::currentContextIsCommandLine() && ConfService::backgroundActionsSupported()) {
-
-                    $unixProcess = AJXP_Controller::applyActionInBackground($repository->getId(), "external_download", $httpVars);
-                    if ($unixProcess !== null) {
-                        @file_put_contents($currentDirUrl.".".$basename.".pid", $unixProcess->getPid());
-                    }
-                    AJXP_XMLWriter::header();
-                    AJXP_XMLWriter::triggerBgAction("reload_node", array(), "Triggering DL ", true, 2);
-                    AJXP_XMLWriter::close();
-                    session_write_close();
-                    exit();
-                }
-
-                require_once(AJXP_BIN_FOLDER."/http_class/http_class.php");
-                session_write_close();
-
-                $httpClient = new http_class();
-                $arguments = array();
-                $httpClient->GetRequestArguments($httpVars["file"], $arguments);
-                $err = $httpClient->Open($arguments);
-                $collectHeaders = array(
-                    "ajxp-last-redirection" => "",
-                    "content-disposition"	=> "",
-                    "content-length"		=> ""
-                );
-                if(!empty($err)){
-                    throw new Exception($err);
-                }
-
-                $err = $httpClient->SendRequest($arguments);
-                $httpClient->follow_redirect = true;
-
-                $pidHiddenFileName = $currentDirUrl.".".$basename.".pid";
-                if (is_file($pidHiddenFileName)) {
-                    $pid = file_get_contents($pidHiddenFileName);
-                    @unlink($pidHiddenFileName);
-                }
-
-                if(!empty($err)){
-                    $httpClient->Close();
-                    throw new Exception($err);
-                }
-
-                $httpClient->ReadReplyHeaders($collectHeaders);
-
-                $totalSize = -1;
-                if (!empty($collectHeaders["content-disposition"]) && strstr($collectHeaders["content-disposition"], "filename")!== false) {
-                    $ar = explode("filename=", $collectHeaders["content-disposition"]);
-                    $basename = trim(array_pop($ar));
-                    $basename = str_replace("\"", "", $basename); // Remove quotes
-                }
-                if (!empty($collectHeaders["content-length"])) {
-                    $totalSize = intval($collectHeaders["content-length"]);
-                    $this->logDebug("Should download $totalSize bytes!");
-                }
-                if ($totalSize != -1) {
-                    $node = new AJXP_Node($currentDirUrl.$basename);
-                    AJXP_Controller::applyHook("node.before_create", array($node, $totalSize));
-                }
-
-                $tmpFilename = $currentDirUrl.$basename.".dlpart";
-                $hiddenFilename = $currentDirUrl."__".$basename.".ser";
-                $filename = $currentDirUrl.$basename;
-
-                $dlData = array(
-                    "sourceUrl" => $getPath,
-                    "totalSize" => $totalSize
-                );
-                if (isSet($pid)) {
-                    $dlData["pid"] = $pid;
-                }
-                //file_put_contents($hiddenFilename, serialize($dlData));
-                $fpHid=fopen($hiddenFilename,"w");
-                fputs($fpHid,serialize($dlData));
-                fclose($fpHid);
-
-                // NOW READ RESPONSE
-                $destStream = fopen($tmpFilename, "w");
-                while (true) {
-                    $body = "";
-                    $error = $httpClient->ReadReplyBody($body, 1000);
-                    if($error != "" || strlen($body) == 0) break;
-                    fwrite($destStream, $body, strlen($body));
-                }
-                fclose($destStream);
-                rename($tmpFilename, $filename);
-                unlink($hiddenFilename);
-                $httpClient->Close();
-
-                if (isset($dlFile) && isSet($httpVars["delete_dlfile"]) && is_file($dlFile)) {
-                    AJXP_Controller::applyHook("node.before_path_change", array(new AJXP_Node($dlFile)));
-                    unlink($dlFile);
-                    AJXP_Controller::applyHook("node.change", array(new AJXP_Node($dlFile), null, false));
-                }
-                $mess = ConfService::getMessages();
-                AJXP_Controller::applyHook("node.change", array(null, new AJXP_Node($filename), false));
-                AJXP_XMLWriter::header();
-                AJXP_XMLWriter::triggerBgAction("reload_node", array(), $mess["httpdownloader.8"]);
-                AJXP_XMLWriter::close();
-
-
-            break;
-            case "update_dl_data":
-                $file = AJXP_Utils::decodeSecureMagic($httpVars["file"]);
-                header("text/plain");
-                if (is_file($currentDirUrl.$file)) {
-                    $node = new AJXP_Node($currentDirUrl.$file);
-                    $filesize = filesize($node->getUrl());
-                    echo $filesize;
-                } else {
-                    echo "stop";
-                }
-
-            break;
-            case "stop_dl":
-                $newName = "__".str_replace(".dlpart", ".ser", $basename);
-                $hiddenFilename = $currentDirUrl.$newName;
-                $data = @unserialize(@file_get_contents($hiddenFilename));
-                header("text/plain");
-                $this->logDebug("Getting $hiddenFilename",$data);
-                if (isSet($data["pid"])) {
-                    $process = new UnixProcess();
-                    $process->setPid($data["pid"]);
-                    $process->stop();
-                    unlink($hiddenFilename);
-                    unlink($currentDirUrl.$basename);
-                    echo 'stop';
-                } else {
-                    echo 'failed';
-                }
-            break;
-            default:
-            break;
-        }
-
-        return false;
-
-    }
-
-    /**
-     * @param AJXP_Node $ajxpNode
-     */
-    public function detectDLParts(&$ajxpNode)
-    {
-        if (!preg_match("/\.dlpart$/i",$ajxpNode->getUrl())) {
-            return;
-        }
-        $basename = basename($ajxpNode->getUrl());
-        $newName = "__".str_replace(".dlpart", ".ser", $basename);
-        $hidFile = str_replace($basename, $newName, $ajxpNode->getUrl());
-        if (is_file($hidFile)) {
-            $data = unserialize(file_get_contents($hidFile));
-            if ($data["totalSize"] != -1) {
-                $ajxpNode->target_bytesize = $data["totalSize"];
-                $ajxpNode->target_filesize = AJXP_Utils::roundSize($data["totalSize"]);
-                $ajxpNode->process_stoppable = (isSet($data["pid"])?"true":"false");
-            }
-        }
-    }
-}
diff --git a/core/src/plugins/uploader.http/manifest.xml b/core/src/plugins/uploader.http/manifest.xml
index af3aa533c2..8e1fde7943 100644
--- a/core/src/plugins/uploader.http/manifest.xml
+++ b/core/src/plugins/uploader.http/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <uploader text="51" title="132" order="10" id="uploader.http" label="CONF_MESSAGE[Remote Download]" description="CONF_MESSAGE[Async downloader to load a file from another source]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-	<class_definition filename="plugins/uploader.http/class.HttpDownloader.php" classname="HttpDownloader"/>
+	<class_definition filename="plugins/uploader.http/HttpDownload.php" classname="Pydio\Uploader\Processor\HttpDownload"/>
 	<client_settings>
 		<resources>
 	        <i18n namespace="httpdownloader" path="plugins/uploader.http/resources/i18n" />
@@ -26,26 +26,6 @@
 					<serverCallback methodName="switchAction"/>
 				</processing>
 			</action>
-            <action name="external_download_file">
-				<gui text="httpdownloader.1" title="httpdownloader.2" src="httpdownloader_images/ICON_SIZE/kget_list.png" accessKey="httpdownloader.3" hasAccessKey="false">
-					<context selection="true" dir="true" recycle="hidden"
-						actionBar="true" contextMenu="true" infoPanel="false"
-						actionBarGroup="get" inZip="false">
-					</context>
-					<selectionContext dir="false" file="true" recycle="false" unique="true" allowedMimes="download" behaviour="hidden" />
-				</gui>
-				<rightsContext noUser="true" userLogged="only" read="false" write="true" adminOnly=""/>
-				<processing>
-					<clientCallback><![CDATA[
-						fileName = ajaxplorer.getUserSelection().getUniqueFileName();
-						var crtDir = ajaxplorer.getContextNode().getPath();
-						var bgManager = pydio.getController().getBackgroundTasksManager();
-						bgManager.queueAction("external_download", {dlfile:fileName, dir:crtDir}, MessageHash["httpdownloader.6"]+ " " +getBaseName(fileName)+" " + MessageHash["httpdownloader.7"]);
-						bgManager.next();
-						]]></clientCallback>
-					<serverCallback methodName="switchAction"/>
-				</processing>
-			</action>
 			<action name="generate_dl_bookmarklet">
 				<gui text="httpdownloader.9" title="httpdownloader.9" iconClass="icon-bookmark" src="httpdownloader_images/ICON_SIZE/add_bookmarklet.png" accessKey="httpdownloader.3" hasAccessKey="false">
 					<context selection="false" dir="true" recycle="hidden"
@@ -149,15 +129,17 @@
                 oForm = modal.getForm();
                 var dlFile = oForm.down('[name="url"]').getValue();
                 var crtDir = ajaxplorer.getContextNode().getPath();
-                var bgManager = pydio.getController().getBackgroundTasksManager();
-                bgManager.queueAction("external_download", {file:dlFile, dir:crtDir}, MessageHash["httpdownloader.6"]+ " " +getBaseName(dlFile)+" " + MessageHash["httpdownloader.7"]);
+                PydioApi.getClient().request({get_action:'external_download', file:dlFile, dir:crtDir}, function(t){
+                    PydioApi.getClient().parseXmlMessage(t.responseXML);
+                });
                 for(var i=2;i<6;i++){
                     var file = oForm.down('[name="url'+i+'"]').getValue();
                     if(file){
-                        bgManager.queueAction("external_download", {file:file, dir:crtDir}, MessageHash["httpdownloader.6"]+ " " +getBaseName(file)+" " + MessageHash["httpdownloader.7"]);
+                        PydioApi.getClient().request({get_action:'external_download', file:file, dir:crtDir}, function(t){
+                            PydioApi.getClient().parseXmlMessage(t.responseXML);
+                        });
                     }
                 }
-                bgManager.next();
                 hideLightBox(true);
              });
         ]]></dialogOnOpen>
diff --git a/core/src/plugins/uploader.http/resources/i18n/conf/de.php b/core/src/plugins/uploader.http/resources/i18n/conf/de.php
index 35514507fd..01414bb756 100644
--- a/core/src/plugins/uploader.http/resources/i18n/conf/de.php
+++ b/core/src/plugins/uploader.http/resources/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Remote Download" => "HTTP-Server",
diff --git a/core/src/plugins/uploader.http/resources/i18n/conf/en.php b/core/src/plugins/uploader.http/resources/i18n/conf/en.php
index 64368940ed..4d3dfb4763 100644
--- a/core/src/plugins/uploader.http/resources/i18n/conf/en.php
+++ b/core/src/plugins/uploader.http/resources/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Remote Download" => "Remote Server",
diff --git a/core/src/plugins/uploader.http/resources/i18n/conf/fr.php b/core/src/plugins/uploader.http/resources/i18n/conf/fr.php
index 2bf107414b..dedcaf5acd 100644
--- a/core/src/plugins/uploader.http/resources/i18n/conf/fr.php
+++ b/core/src/plugins/uploader.http/resources/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
     "Remote Download" => "Téléchargement à distance",
diff --git a/core/src/plugins/uploader.http/resources/i18n/conf/it.php b/core/src/plugins/uploader.http/resources/i18n/conf/it.php
index 8bd34f0af0..7f23147ff0 100644
--- a/core/src/plugins/uploader.http/resources/i18n/conf/it.php
+++ b/core/src/plugins/uploader.http/resources/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Remote Download" => "Server Remoto",
diff --git a/core/src/plugins/uploader.http/resources/i18n/conf/ru.php b/core/src/plugins/uploader.http/resources/i18n/conf/ru.php
index b79b8d70b5..d05d5c3d89 100644
--- a/core/src/plugins/uploader.http/resources/i18n/conf/ru.php
+++ b/core/src/plugins/uploader.http/resources/i18n/conf/ru.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Remote Download" => "Другой сервер",
diff --git a/core/src/plugins/uploader.jumploader/Jumploader.php b/core/src/plugins/uploader.jumploader/Jumploader.php
new file mode 100644
index 0000000000..90bd2dea25
--- /dev/null
+++ b/core/src/plugins/uploader.jumploader/Jumploader.php
@@ -0,0 +1,524 @@
+<?php
+/*
+ * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+namespace Pydio\Uploader\Processor;
+
+use Pydio\Access\Core\MetaStreamWrapper;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\UserSelection;
+use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\FileHelper;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\StatHelper;
+
+use Pydio\Core\PluginFramework\Plugin;
+use Pydio\Log\Core\Logger;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Encapsulation of the Jumploader Java applet (must be downloaded separately).
+ * @package AjaXplorer_Plugins
+ * @subpackage Uploader
+ */
+class Jumploader extends Plugin
+{
+    /**
+     * Handle UTF8 Decoding
+     *
+     * @var bool
+     */
+    private static $skipDecoding = false;
+    private static $remote = false;
+    private static $wrapperIsRemote = false;
+    private static $partitions = array();
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $request
+     * @param \Psr\Http\Message\ResponseInterface $response
+     */
+    public function getTemplate(\Psr\Http\Message\ServerRequestInterface &$request, \Psr\Http\Message\ResponseInterface &$response){
+
+        /** @var ContextInterface $ctx */
+        $ctx = $request->getAttribute("ctx");
+        $confMaxSize = StatHelper::convertBytes(ConfService::getContextConf($ctx, "UPLOAD_MAX_SIZE", "uploader"));
+        $UploadMaxSize = min(StatHelper::convertBytes(ini_get('upload_max_filesize')), StatHelper::convertBytes(ini_get('post_max_size')));
+        if($confMaxSize != 0) $UploadMaxSize = min ($UploadMaxSize, $confMaxSize);
+        $confTotalSize = ConfService::getContextConf($ctx, "UPLOAD_MAX_SIZE_TOTAL", "uploader");
+        $confTotalNumber = ConfService::getContextConf($ctx, "UPLOAD_MAX_NUMBER", "uploader");
+
+        $repository = $ctx->getRepository();
+        $accessType = $repository->getAccessType();
+
+        $partitionLength = $UploadMaxSize - 1000;
+
+        if($accessType == "remotefs"){
+            $maxFileLength = $UploadMaxSize;
+        }else if($accessType == "ftp"){
+            $partitionLength = $UploadMaxSize - 1000;
+        }
+
+        include($this->getBaseDir()."/jumploader_tpl.html");
+
+    }
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $request
+     * @param \Psr\Http\Message\ResponseInterface $response
+     * @throws \Exception
+     */
+    public function preProcess(\Psr\Http\Message\ServerRequestInterface &$request, \Psr\Http\Message\ResponseInterface &$response)
+    {
+        $httpVars = $request->getParsedBody();
+
+        if(!count($request->getUploadedFiles()) || isSet($httpVars["simple_uploader"]) || isset($httpVars["xhr_uploader"]) || isSet($httpVars["Filename"])){
+            return;
+        }
+        
+        /** @var \Pydio\Core\Model\ContextInterface $ctx */
+        $ctx = $request->getAttribute("ctx");
+        $repository = $ctx->getRepository();
+        $driver = $repository->getDriverInstance($ctx);
+
+        if (method_exists($driver, "storeFileToCopy")) {
+            self::$remote = true;
+        }
+
+        $wrapperName = MetaStreamWrapper::actualRepositoryWrapperClass(new AJXP_Node($ctx->getUrlBase()));
+        if ($wrapperName == "ajxp.ftp" || $wrapperName == "ajxp.remotefs") {
+            $this->logDebug("Skip decoding");
+            self::$skipDecoding = true;
+        }
+        $this->logDebug("Stream is",$wrapperName);
+        self::$wrapperIsRemote = call_user_func(array($wrapperName, "isRemote"));
+        
+        $this->logDebug("Jumploader HttpVars", $httpVars);
+
+
+        $httpVars["dir"] = base64_decode(str_replace(" ","+",$httpVars["dir"]));
+        $index = $httpVars["partitionIndex"];
+        /** @var \Psr\Http\Message\UploadedFileInterface $uploadedFile */
+        $uploadedFile = $request->getUploadedFiles()["userfile_0"];
+        $realName = $uploadedFile->getClientFilename();
+        //$realName = $fileVars["userfile_0"]["name"];
+
+        /* if fileId is not set, request for cross-session resume (only if the protocol is not ftp)*/
+        if (!isSet($httpVars["fileId"])) {
+            $this->logDebug("Trying Cross-Session Resume request");
+
+            $dir = InputFilter::decodeSecureMagic($httpVars["dir"]);
+            $context = UserSelection::fromContext($ctx, $httpVars);
+            $destStreamURL = $context->currentBaseUrl().$dir;
+            $fileHash = md5($httpVars["fileName"]);
+
+            if (!self::$remote) {
+                $resumeIndexes = array ();
+                $it = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($destStreamURL));
+                $it->setMaxDepth(0);
+                while ($it->valid()) {
+                    if (!$it->isDot()) {
+                        $subPathName = $it->getSubPathName();
+                        Logger::debug("Iterator SubPathName: " . $it->getSubPathName());
+                        if (strstr($subPathName, $fileHash) != false) {
+                            $explodedSubPathName = explode('.', $subPathName);
+                            $resumeFileId = $explodedSubPathName[1];
+                            $resumeIndexes[] = $explodedSubPathName[2];
+
+                            $this->logDebug("Current Index: " . $explodedSubPathName[2]);
+                        }
+                    }
+                    $it->next();
+                }
+
+                /* no valid temp file found. return. */
+                if (empty ($resumeIndexes)){
+                    $this->logDebug("No Cross-Session Resume request");
+                    return;
+                }
+
+                Logger::debug("ResumeFileID: " . $resumeFileId);
+                Logger::debug("Max Resume Index: " . max($resumeIndexes));
+                $nextResumeIndex = max($resumeIndexes) + 1;
+                Logger::debug("Next Resume Index: " . $nextResumeIndex);
+
+                if (isSet($resumeFileId)) {
+                    $this->logDebug("ResumeFileId is set. Returning values: fileId: " . $resumeFileId . ", partitionIndex: " . $nextResumeIndex);
+                    $httpVars["resumeFileId"] = $resumeFileId;
+                    $httpVars["resumePartitionIndex"] = $nextResumeIndex;
+                }
+            }
+            return;
+        }
+
+        /* if the file has to be partitioned */
+        if (isSet($httpVars["partitionCount"]) && intval($httpVars["partitionCount"]) > 1) {
+            $this->logDebug("Partitioned upload");
+            $fileId = $httpVars["fileId"];
+            $fileHash = md5($realName);
+
+            /* In order to enable cross-session resume, temp files must not depend on session.
+             * Now named after and md5() of the original file name.
+             */
+            $this->logDebug("Filename: " . $realName . ", File hash: " . $fileHash);
+            //$fileVars["userfile_0"]["name"] = "$fileHash.$fileId.$index";
+            $newUp = new \Zend\Diactoros\UploadedFile($_FILES["userfile_0"]["tmp_name"], $uploadedFile->getSize(), $uploadedFile->getError(), "$fileHash.$fileId.$index");
+            $request = $request->withUploadedFiles(["userfile_0" => $newUp]);
+
+            $httpVars["lastPartition"] = false;
+        }else{
+            /*
+             * If we wan to upload a folderUpload to folderServer
+             * Temporarily,put all files in this folder to folderServer.
+             * But a same file name may be existed in folderServer,
+             * this can cause error of uploading.
+             *
+             * We rename this file by his relativePath. At the postProcess session, we will use this name
+             * to copy to right location
+             *
+             */
+            $file_tmp_md5 = md5($httpVars["relativePath"]);
+            //$fileVars["userfile_0"]["name"] = $file_tmp_md5;
+            $newUp = new \Zend\Diactoros\UploadedFile($_FILES["userfile_0"]["tmp_name"], $uploadedFile->getSize(), $uploadedFile->getError(), $file_tmp_md5);
+            $request = $request->withUploadedFiles(["userfile_0" => $newUp]);
+
+        }
+
+
+
+        /* if we received the last partition */
+        if (intval($index) == intval($httpVars["partitionCount"])-1) {
+            $httpVars["lastPartition"] = true;
+            $httpVars["partitionRealName"] = $realName;
+        }
+
+        $request = $request->withParsedBody($httpVars);
+
+    }
+
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $request
+     * @param \Psr\Http\Message\ResponseInterface $response
+     * @return void
+     * @throws \Exception
+     */
+    public function postProcess(\Psr\Http\Message\ServerRequestInterface &$request, \Psr\Http\Message\ResponseInterface &$response)
+    {
+        $httpVars = $request->getParsedBody();
+        if(isSet($httpVars["simple_uploader"]) || isSet($httpVars["xhr_uploader"])) {
+            return;
+        }
+        $response = $response->withHeader("Content-type", "text/plain");
+
+        /* If set resumeFileId and resumePartitionIndex, cross-session resume is requested. */
+        if (isSet($httpVars["resumeFileId"]) && isSet($httpVars["resumePartitionIndex"])) {
+            $response->getBody()->write("fileId: " . $httpVars["resumeFileId"] . "\n");
+            $response->getBody()->write("partitionIndex: " . $httpVars["resumePartitionIndex"]);
+            return;
+        }
+
+        /*if (self::$skipDecoding) {
+
+        }*/
+
+        $result = $request->getAttribute("upload_process_result");
+
+        if (isset($result["ERROR"])) {
+            if (isset($httpVars["lastPartition"]) && isset($httpVars["partitionCount"])) {
+                /* we get the stream url (where all the partitions have been uploaded so far) */
+
+                $dir = InputFilter::decodeSecureMagic($httpVars["dir"]);
+                $context = UserSelection::fromContext($request->getAttribute("ctx"), []);
+                $destStreamURL = $context->currentBaseUrl().$dir."/";
+
+                if ($httpVars["partitionCount"] > 1) {
+                    /* we fetch the information that help us to construct the temp files name */
+                    $fileId = $httpVars["fileId"];
+                    $fileHash = md5($httpVars["fileName"]);
+
+                    /* deletion of all the partitions that have been uploaded */
+                    for ($i = 0; $i < $httpVars["partitionCount"]; $i++) {
+                        if (file_exists($destStreamURL."$fileHash.$fileId.$i")) {
+                            unlink($destStreamURL."$fileHash.$fileId.$i");
+                        }
+                    }
+                } else {
+                    $fileName = $httpVars["fileName"];
+                    unlink($destStreamURL.$fileName);
+                }
+            }
+            $response->getBody()->write("Error: ".$result["ERROR"]["MESSAGE"]);
+            return;
+        }
+
+        if (!isSet($httpVars["partitionRealName"]) && !isSet($httpVars["lastPartition"])) {
+            return ;
+        }
+
+        /** @var \Pydio\Core\Model\ContextInterface $ctx */
+        $ctx = $request->getAttribute("ctx");
+        $repository = $ctx->getRepository();
+        $driver = $repository->getDriverInstance($ctx);
+
+        if ($httpVars["lastPartition"]) {
+            $dir = InputFilter::decodeSecureMagic($httpVars["dir"]);
+            $context = UserSelection::fromContext($ctx, $httpVars);
+            $destStreamURL = $context->currentBaseUrl().$dir."/";
+
+            /* we check if the current file has a relative path (aka we want to upload an entire directory) */
+            $this->logDebug("Now dispatching relativePath dest:", $httpVars["relativePath"]);
+            $subs = explode("/", $httpVars["relativePath"]);
+            $userfile_name = array_pop($subs);
+
+            $folderForbidden = false;
+            $all_in_place = true;
+            $partitions_length = 0;
+            $fileId = $httpVars["fileId"];
+            $fileHash = md5($userfile_name);
+            $partitionCount = $httpVars["partitionCount"];
+            $fileLength = $_POST["fileLength"];
+
+            /*
+             *
+             * Now, we supposed that access driver has already saved uploaded file in to
+             * folderServer with file name is md5 relativePath value.
+             * We try to copy this file to right location in recovery his name.
+             *
+             */
+            $userfile_name = md5($httpVars["relativePath"]);
+
+            if (self::$remote) {
+                $partitions = array();
+                $newPartitions = array();
+                $index_first_partition = -1;
+                $i = 0;
+                do {
+                    $currentFileName = $driver->getFileNameToCopy();
+                    $partitions[] = $driver->getNextFileToCopy();
+
+                    if ($index_first_partition < 0 && strstr($currentFileName, $fileHash) != false) {
+                        $index_first_partition = $i;
+                    } else if ($index_first_partition < 0) {
+                        $newPartitions[] = array_pop($partitions);
+                    }
+                } while ($driver->hasFilesToCopy());
+            }
+
+            /* if partitionned */
+            if ($partitionCount > 1) {
+                if (self::$remote) {
+                    for ($i = 0; $all_in_place && $i < $partitionCount; $i++) {
+                        $partition_file = "$fileHash.$fileId.$i";
+                        if ( strstr($partitions[$i]["name"], $partition_file) != false ) {
+                            $partitions_length += filesize( $partitions[$i]["tmp_name"] );
+                        } else { $all_in_place = false; }
+                    }
+                } else {
+                    for ($i = 0; $all_in_place && $i < $partitionCount; $i++) {
+                        $partition_file = $destStreamURL."$fileHash.$fileId.$i";
+                        if ( file_exists( $partition_file ) ) {
+                            $partitions_length += filesize( $partition_file );
+                        } else { $all_in_place = false; }
+                    }
+                }
+            } else {
+                if (self::$remote) {
+                    if ( strstr($newPartitions[count($newPartitions)-1]["name"], $userfile_name) != false) {
+                        $partitions_length += filesize( $newPartitions[count($newPartitions)-1]["tmp_name"] );
+                    }
+                } else {
+                    if (file_exists($destStreamURL.$userfile_name)) {
+                        $partitions_length += filesize($destStreamURL.$userfile_name);
+                    }
+                }
+            }
+
+            if ( (!$all_in_place || $partitions_length != floatval($fileLength))) {
+                echo "Error: Upload validation error!";
+                /* we delete all the uploaded partitions */
+                if ($httpVars["partitionCount"] > 1) {
+                    for ($i = 0; $i < $partitionCount; $i++) {
+                        if (file_exists($destStreamURL."$fileHash.$fileId.$i")) {
+                            unlink($destStreamURL."$fileHash.$fileId.$i");
+                        }
+                    }
+                } else {
+                    $fileName = $httpVars["partitionRealName"];
+                    unlink($destStreamURL.$fileName);
+                }
+                return;
+            }
+
+            if (count($subs) > 0 && !self::$remote) {
+                $curDir = "";
+
+                if (substr($curDir, -1) == "/") {
+                    $curDir = substr($curDir, 0, -1);
+                }
+
+                // Create the folder tree as necessary
+                foreach ($subs as $key => $spath) {
+                    $messtmp="";
+                    $dirname= InputFilter::decodeSecureMagic($spath, InputFilter::SANITIZE_FILENAME);
+                    $dirname = substr($dirname, 0, ConfService::getContextConf($ctx, "NODENAME_MAX_LENGTH"));
+                    //$this->filterUserSelectionToHidden(array($dirname));
+                    if (StatHelper::isHidden($dirname)) {
+                        $folderForbidden = true;
+                        break;
+                    }
+
+                    if (file_exists($destStreamURL."$curDir/$dirname")) {
+                        // if the folder exists, traverse
+                        $this->logDebug("$curDir/$dirname existing, traversing for $userfile_name out of", $httpVars["relativePath"]);
+                        $curDir .= "/".$dirname;
+                        continue;
+                    }
+
+                    $this->logDebug($destStreamURL.$curDir);
+                    $dirMode = 0775;
+                    $chmodValue = $repository->getContextOption($ctx, "CHMOD_VALUE");
+                    if (isSet($chmodValue) && $chmodValue != "") {
+                        $dirMode = octdec(ltrim($chmodValue, "0"));
+                        if ($dirMode & 0400) $dirMode |= 0100; // Owner is allowed to read, allow to list the directory
+                        if ($dirMode & 0040) $dirMode |= 0010; // Group is allowed to read, allow to list the directory
+                        if ($dirMode & 0004) $dirMode |= 0001; // Other are allowed to read, allow to list the directory
+                    }
+                    $url = $destStreamURL.$curDir."/".$dirname;
+                    $old = umask(0);
+                    mkdir($url, $dirMode);
+                    umask($old);
+                    Controller::applyHook("node.change", array(null, new AJXP_Node($url), false));
+                    $curDir .= "/".$dirname;
+                }
+            }
+
+            if (!$folderForbidden) {
+                $fileId = $httpVars["fileId"];
+                $this->logDebug("Should now rebuild file!", $httpVars);
+                // Now move the final file to the right folder
+                // Currently the file is at the base of the current
+                $this->logDebug("PartitionRealName", $destStreamURL.$httpVars["partitionRealName"]);
+
+                // Get file by name (md5 value)
+                $relPath_md5 = InputFilter::decodeSecureMagic(md5($httpVars["relativePath"]));
+
+                // original file name
+                $relPath = InputFilter::decodeSecureMagic($httpVars["relativePath"]);
+
+                $target = $destStreamURL;
+                $target .= (self::$remote)? basename($relPath) : $relPath;
+
+                /*
+                *   $current is uploaded file with md5 value as his name
+                *   we copy to $relPath and delete md5 file
+                */
+
+                $current = $destStreamURL.basename($relPath_md5);
+
+                if ($httpVars["partitionCount"] > 1) {
+                    if (self::$remote) {
+                        $test = ApplicationState::getAjxpTmpDir() ."/".$httpVars["partitionRealName"];
+                        $newDest = fopen(ApplicationState::getAjxpTmpDir() ."/".$httpVars["partitionRealName"], "w");
+                        $newFile = array();
+                        $length = 0;
+                        for ($i = 0, $count = count($partitions); $i < $count; $i++) {
+                            $currentFile = $partitions[$i];
+                            $currentFileName = $currentFile["tmp_name"];
+                            $part = fopen($currentFileName, "r");
+                            if(is_resource($part)){
+                                while (!feof($part)) {
+                                    $length += fwrite($newDest, fread($part, 4096));
+                                }
+                                fclose($part);
+                            }
+                            unlink($currentFileName);
+                        }
+                        $newFile["type"] = $partitions[0]["type"];
+                        $newFile["name"] = $httpVars["partitionRealName"];
+                        $newFile["error"] = 0;
+                        $newFile["size"] = $length;
+                        $newFile["tmp_name"] = ApplicationState::getAjxpTmpDir() ."/".$httpVars["partitionRealName"];
+                        $newFile["destination"] = $partitions[0]["destination"];
+                        $newPartitions[] = $newFile;
+                    } else {
+                        $current = $destStreamURL.$httpVars["partitionRealName"];
+                        $newDest = fopen($current, "w");
+                        $fileHash = md5($httpVars["partitionRealName"]);
+
+                        for ($i = 0; $i < $httpVars["partitionCount"] ; $i++) {
+                            $part = fopen($destStreamURL."$fileHash.$fileId.$i", "r");
+                            if(is_resource($part)){
+                                while (!feof($part)) {
+                                    fwrite($newDest, fread($part, 4096));
+                                }
+                                fclose($part);
+                            }
+                            unlink($destStreamURL."$fileHash.$fileId.$i");
+                        }
+
+                    }
+                    fclose($newDest);
+                }
+
+                if (!self::$remote && (!self::$wrapperIsRemote || $relPath != $httpVars["partitionRealName"])) {
+                    if($current != $target){
+                        $err = copy($current, $target);
+                    }
+                    else $err = true;
+                } else {
+                    for ($i=0, $count=count($newPartitions); $i<$count; $i++) {
+                        $driver->storeFileToCopy($newPartitions[$i]);
+                    }
+                }
+
+                if ($current != $target && $err !== false) {
+                    if(!self::$remote) unlink($current);
+                    Controller::applyHook("node.change", array(null, new AJXP_Node($target), false));
+                } else if ($current == $target) {
+                    Controller::applyHook("node.change", array(null, new AJXP_Node($target), false));
+                }
+            } else {
+                // Remove the file, as it should not have been uploaded!
+                //if(!self::$remote) unlink($current);
+            }
+        }
+    }
+
+    /**
+     * @param $params
+     * @return string
+     */
+    public function jumploaderInstallApplet($params)
+    {
+        if (is_file($this->getBaseDir()."/jumploader_z.jar")) {
+            return "ERROR: The applet is already installed!";
+        }
+        $fileData = FileHelper::getRemoteContent("http://jumploader.com/jar/jumploader_z.jar");
+        if (!is_writable($this->getBaseDir())) {
+            file_put_contents(AJXP_CACHE_DIR."/jumploader_z.jar", $fileData);
+            return "ERROR: The applet was downloaded, but the folder plugins/uploader.jumploader is not writeable. Applet is located in the cache folder, please put it manually in the plugin folder.";
+        } else {
+            file_put_contents($this->getBaseDir()."/jumploader_z.jar", $fileData);
+            return "SUCCESS: Installed applet successfully!";
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/src/plugins/uploader.jumploader/class.JumploaderProcessor.php b/core/src/plugins/uploader.jumploader/class.JumploaderProcessor.php
deleted file mode 100644
index b868bea470..0000000000
--- a/core/src/plugins/uploader.jumploader/class.JumploaderProcessor.php
+++ /dev/null
@@ -1,450 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-/**
- * Encapsulation of the Jumploader Java applet (must be downloaded separately).
- * @package AjaXplorer_Plugins
- * @subpackage Uploader
- */
-class JumploaderProcessor extends AJXP_Plugin
-{
-    /**
-     * Handle UTF8 Decoding
-     *
-     * @var unknown_type
-     */
-    private static $skipDecoding = false;
-    private static $remote = false;
-    private static $wrapperIsRemote = false;
-    private static $partitions = array();
-
-    public function preProcess($action, &$httpVars, &$fileVars)
-    {
-        if(isSet($httpVars["simple_uploader"]) || isSet($httpVars["xhr_uploader"])) return;
-        $repository = ConfService::getRepository();
-        $driver = ConfService::loadDriverForRepository($repository);
-
-        if (method_exists($driver, "storeFileToCopy")) {
-            self::$remote = true;
-        }
-
-        if ($repository->detectStreamWrapper(true)) {
-            $wrapperName = AJXP_MetaStreamWrapper::actualRepositoryWrapperClass($repository->getId());
-            if ($wrapperName == "ajxp.ftp" || $wrapperName == "ajxp.remotefs") {
-                $this->logDebug("Skip decoding");
-                self::$skipDecoding = true;
-            }
-            $this->logDebug("Stream is",$wrapperName);
-            self::$wrapperIsRemote = call_user_func(array($wrapperName, "isRemote"));
-        }
-        $this->logDebug("Jumploader HttpVars", $httpVars);
-        $this->logDebug("Jumploader FileVars", $fileVars);
-
-
-        $httpVars["dir"] = base64_decode(str_replace(" ","+",$httpVars["dir"]));
-        $index = $httpVars["partitionIndex"];
-        $realName = $fileVars["userfile_0"]["name"];
-
-        /* if fileId is not set, request for cross-session resume (only if the protocol is not ftp)*/
-        if (!isSet($httpVars["fileId"])) {
-            $this->logDebug("Trying Cross-Session Resume request");
-
-            $dir = AJXP_Utils::decodeSecureMagic($httpVars["dir"]);
-            $repository->detectStreamWrapper(true);
-            $context = new UserSelection($repository);
-            $destStreamURL = $context->currentBaseUrl().$dir;
-            $fileHash = md5($httpVars["fileName"]);
-
-            if (!self::$remote) {
-                $resumeIndexes = array ();
-                $it = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($destStreamURL));
-                $it->setMaxDepth(0);
-                while ($it->valid()) {
-                    if (!$it->isDot()) {
-                        $subPathName = $it->getSubPathName();
-                        AJXP_LOGGER :: debug("Iterator SubPathName: " . $it->getSubPathName());
-                        if (strstr($subPathName, $fileHash) != false) {
-                            $explodedSubPathName = explode('.', $subPathName);
-                            $resumeFileId = $explodedSubPathName[1];
-                            $resumeIndexes[] = $explodedSubPathName[2];
-
-                            $this->logDebug("Current Index: " . $explodedSubPathName[2]);
-                        }
-                    }
-                    $it->next();
-                }
-
-                /* no valid temp file found. return. */
-                if (empty ($resumeIndexes)){
-                    $this->logDebug("No Cross-Session Resume request");
-                    return;
-                }
-
-                AJXP_LOGGER :: debug("ResumeFileID: " . $resumeFileId);
-                AJXP_LOGGER :: debug("Max Resume Index: " . max($resumeIndexes));
-                $nextResumeIndex = max($resumeIndexes) + 1;
-                AJXP_LOGGER :: debug("Next Resume Index: " . $nextResumeIndex);
-
-                if (isSet($resumeFileId)) {
-                    $this->logDebug("ResumeFileId is set. Returning values: fileId: " . $resumeFileId . ", partitionIndex: " . $nextResumeIndex);
-                    $httpVars["resumeFileId"] = $resumeFileId;
-                    $httpVars["resumePartitionIndex"] = $nextResumeIndex;
-                }
-            }
-            return;
-        }
-
-        /* if the file has to be partitioned */
-        if (isSet($httpVars["partitionCount"]) && intval($httpVars["partitionCount"]) > 1) {
-            $this->logDebug("Partitioned upload");
-            $fileId = $httpVars["fileId"];
-            $fileHash = md5($realName);
-
-            /* In order to enable cross-session resume, temp files must not depend on session.
-             * Now named after and md5() of the original file name.
-             */
-            $this->logDebug("Filename: " . $realName . ", File hash: " . $fileHash);
-            $fileVars["userfile_0"]["name"] = "$fileHash.$fileId.$index";
-            $httpVars["lastPartition"] = false;
-        }else{
-            /*
-             * If we wan to upload a folderUpload to folderServer
-             * Temporarily,put all files in this folder to folderServer.
-             * But a same file name may be existed in folderServer,
-             * this can cause error of uploading.
-             *
-             * We rename this file by his relativePath. At the postProcess session, we will use this name
-             * to copy to right location
-             *
-             */
-            $file_tmp_md5 = md5($httpVars["relativePath"]);
-            $fileVars["userfile_0"]["name"] = $file_tmp_md5;
-        }
-
-
-
-        /* if we received the last partition */
-        if (intval($index) == intval($httpVars["partitionCount"])-1) {
-            $httpVars["lastPartition"] = true;
-            $httpVars["partitionRealName"] = $realName;
-        }
-    }
-
-    public function postProcess($action, $httpVars, $postProcessData)
-    {
-        if(isSet($httpVars["simple_uploader"]) || isSet($httpVars["xhr_uploader"])) return;
-
-        /* If set resumeFileId and resumePartitionIndex, cross-session resume is requested. */
-        if (isSet($httpVars["resumeFileId"]) && isSet($httpVars["resumePartitionIndex"])) {
-            header("HTTP/1.1 200 OK");
-
-            print("fileId: " . $httpVars["resumeFileId"] . "\n");
-            print("partitionIndex: " . $httpVars["resumePartitionIndex"]);
-
-            return;
-        }
-
-        /*if (self::$skipDecoding) {
-
-        }*/
-
-        if (isset($postProcessData["processor_result"]["ERROR"])) {
-            if (isset($httpVars["lastPartition"]) && isset($httpVars["partitionCount"])) {
-                /* we get the stream url (where all the partitions have been uploaded so far) */
-                $repository = ConfService::getRepository();
-                $dir = AJXP_Utils::decodeSecureMagic($httpVars["dir"]);
-                $repository->detectStreamWrapper(true);
-                $context = new UserSelection($repository);
-                $destStreamURL = $context->currentBaseUrl().$dir."/";
-
-                if ($httpVars["partitionCount"] > 1) {
-                    /* we fetch the information that help us to construct the temp files name */
-                    $fileId = $httpVars["fileId"];
-                    $fileHash = md5($httpVars["fileName"]);
-
-                    /* deletion of all the partitions that have been uploaded */
-                    for ($i = 0; $i < $httpVars["partitionCount"]; $i++) {
-                        if (file_exists($destStreamURL."$fileHash.$fileId.$i")) {
-                            unlink($destStreamURL."$fileHash.$fileId.$i");
-                        }
-                    }
-                } else {
-                    $fileName = $httpVars["fileName"];
-                    unlink($destStreamURL.$fileName);
-                }
-            }
-            echo "Error: ".$postProcessData["processor_result"]["ERROR"]["MESSAGE"];
-            return;
-        }
-
-        if (!isSet($httpVars["partitionRealName"]) && !isSet($httpVars["lastPartition"])) {
-            return ;
-        }
-
-        $repository = ConfService::getRepository();
-        $driver = ConfService::loadDriverForRepository($repository);
-
-        if (!$repository->detectStreamWrapper(false)) {
-            return false;
-        }
-
-        if ($httpVars["lastPartition"]) {
-            $dir = AJXP_Utils::decodeSecureMagic($httpVars["dir"]);
-            $repository->detectStreamWrapper(true);
-            $context = new UserSelection($repository);
-            $destStreamURL = $context->currentBaseUrl().$dir."/";
-
-            /* we check if the current file has a relative path (aka we want to upload an entire directory) */
-            $this->logDebug("Now dispatching relativePath dest:", $httpVars["relativePath"]);
-            $subs = explode("/", $httpVars["relativePath"]);
-            $userfile_name = array_pop($subs);
-
-            $folderForbidden = false;
-            $all_in_place = true;
-            $partitions_length = 0;
-            $fileId = $httpVars["fileId"];
-            $fileHash = md5($userfile_name);
-            $partitionCount = $httpVars["partitionCount"];
-            $fileLength = $_POST["fileLength"];
-
-            /*
-             *
-             * Now, we supposed that access driver has already saved uploaded file in to
-             * folderServer with file name is md5 relativePath value.
-             * We try to copy this file to right location in recovery his name.
-             *
-             */
-            $userfile_name = md5($httpVars["relativePath"]);
-
-            if (self::$remote) {
-                $partitions = array();
-                $newPartitions = array();
-                $index_first_partition = -1;
-                $i = 0;
-                do {
-                    $currentFileName = $driver->getFileNameToCopy();
-                    $partitions[] = $driver->getNextFileToCopy();
-
-                    if ($index_first_partition < 0 && strstr($currentFileName, $fileHash) != false) {
-                        $index_first_partition = $i;
-                    } else if ($index_first_partition < 0) {
-                        $newPartitions[] = array_pop($partitions);
-                    }
-                } while ($driver->hasFilesToCopy());
-            }
-
-            /* if partitionned */
-            if ($partitionCount > 1) {
-                if (self::$remote) {
-                    for ($i = 0; $all_in_place && $i < $partitionCount; $i++) {
-                        $partition_file = "$fileHash.$fileId.$i";
-                        if ( strstr($partitions[$i]["name"], $partition_file) != false ) {
-                            $partitions_length += filesize( $partitions[$i]["tmp_name"] );
-                        } else { $all_in_place = false; }
-                    }
-                } else {
-                    for ($i = 0; $all_in_place && $i < $partitionCount; $i++) {
-                        $partition_file = $destStreamURL."$fileHash.$fileId.$i";
-                        if ( file_exists( $partition_file ) ) {
-                            $partitions_length += filesize( $partition_file );
-                        } else { $all_in_place = false; }
-                    }
-                }
-            } else {
-                if (self::$remote) {
-                    if ( strstr($newPartitions[count($newPartitions)-1]["name"], $userfile_name) != false) {
-                        $partitions_length += filesize( $newPartitions[count($newPartitions)-1]["tmp_name"] );
-                    }
-                } else {
-                    if (file_exists($destStreamURL.$userfile_name)) {
-                        $partitions_length += filesize($destStreamURL.$userfile_name);
-                    }
-                }
-            }
-
-            if ( (!$all_in_place || $partitions_length != floatval($fileLength))) {
-                echo "Error: Upload validation error!";
-                /* we delete all the uploaded partitions */
-                if ($httpVars["partitionCount"] > 1) {
-                    for ($i = 0; $i < $partitionCount; $i++) {
-                        if (file_exists($destStreamURL."$fileHash.$fileId.$i")) {
-                            unlink($destStreamURL."$fileHash.$fileId.$i");
-                        }
-                    }
-                } else {
-                    $fileName = $httpVars["partitionRealName"];
-                    unlink($destStreamURL.$fileName);
-                }
-                return;
-            }
-
-            if (count($subs) > 0 && !self::$remote) {
-                $curDir = "";
-
-                if (substr($curDir, -1) == "/") {
-                    $curDir = substr($curDir, 0, -1);
-                }
-
-                // Create the folder tree as necessary
-                foreach ($subs as $key => $spath) {
-                    $messtmp="";
-                    $dirname=AJXP_Utils::decodeSecureMagic($spath, AJXP_SANITIZE_FILENAME);
-                    $dirname = substr($dirname, 0, ConfService::getCoreConf("NODENAME_MAX_LENGTH"));
-                    //$this->filterUserSelectionToHidden(array($dirname));
-                    if (AJXP_Utils::isHidden($dirname)) {
-                        $folderForbidden = true;
-                        break;
-                    }
-
-                    if (file_exists($destStreamURL."$curDir/$dirname")) {
-                        // if the folder exists, traverse
-                        $this->logDebug("$curDir/$dirname existing, traversing for $userfile_name out of", $httpVars["relativePath"]);
-                        $curDir .= "/".$dirname;
-                        continue;
-                    }
-
-                    $this->logDebug($destStreamURL.$curDir);
-                    $dirMode = 0775;
-                    $chmodValue = $repository->getOption("CHMOD_VALUE");
-                    if (isSet($chmodValue) && $chmodValue != "") {
-                        $dirMode = octdec(ltrim($chmodValue, "0"));
-                        if ($dirMode & 0400) $dirMode |= 0100; // Owner is allowed to read, allow to list the directory
-                        if ($dirMode & 0040) $dirMode |= 0010; // Group is allowed to read, allow to list the directory
-                        if ($dirMode & 0004) $dirMode |= 0001; // Other are allowed to read, allow to list the directory
-                    }
-                    $url = $destStreamURL.$curDir."/".$dirname;
-                    $old = umask(0);
-                    mkdir($url, $dirMode);
-                    umask($old);
-                    AJXP_Controller::applyHook("node.change", array(null, new AJXP_Node($url), false));
-                    $curDir .= "/".$dirname;
-                }
-            }
-
-            if (!$folderForbidden) {
-                $fileId = $httpVars["fileId"];
-                $this->logDebug("Should now rebuild file!", $httpVars);
-                // Now move the final file to the right folder
-                // Currently the file is at the base of the current
-                $this->logDebug("PartitionRealName", $destStreamURL.$httpVars["partitionRealName"]);
-
-                // Get file by name (md5 value)
-                $relPath_md5 = AJXP_Utils::decodeSecureMagic(md5($httpVars["relativePath"]));
-
-                // original file name
-                $relPath = AJXP_Utils::decodeSecureMagic($httpVars["relativePath"]);
-
-                $target = $destStreamURL;
-                $target .= (self::$remote)? basename($relPath) : $relPath;
-
-                /*
-                *   $current is uploaded file with md5 value as his name
-                *   we copy to $relPath and delete md5 file
-                */
-
-                $current = $destStreamURL.basename($relPath_md5);
-
-                if ($httpVars["partitionCount"] > 1) {
-                    if (self::$remote) {
-                        $test = AJXP_Utils::getAjxpTmpDir()."/".$httpVars["partitionRealName"];
-                        $newDest = fopen(AJXP_Utils::getAjxpTmpDir()."/".$httpVars["partitionRealName"], "w");
-                        $newFile = array();
-                        $length = 0;
-                        for ($i = 0, $count = count($partitions); $i < $count; $i++) {
-                            $currentFile = $partitions[$i];
-                            $currentFileName = $currentFile["tmp_name"];
-                            $part = fopen($currentFileName, "r");
-                            if(is_resource($part)){
-                                while (!feof($part)) {
-                                    $length += fwrite($newDest, fread($part, 4096));
-                                }
-                                fclose($part);
-                            }
-                            unlink($currentFileName);
-                        }
-                        $newFile["type"] = $partitions[0]["type"];
-                        $newFile["name"] = $httpVars["partitionRealName"];
-                        $newFile["error"] = 0;
-                        $newFile["size"] = $length;
-                        $newFile["tmp_name"] = AJXP_Utils::getAjxpTmpDir()."/".$httpVars["partitionRealName"];
-                        $newFile["destination"] = $partitions[0]["destination"];
-                        $newPartitions[] = $newFile;
-                    } else {
-                        $current = $destStreamURL.$httpVars["partitionRealName"];
-                        $newDest = fopen($current, "w");
-                        $fileHash = md5($httpVars["partitionRealName"]);
-
-                        for ($i = 0; $i < $httpVars["partitionCount"] ; $i++) {
-                            $part = fopen($destStreamURL."$fileHash.$fileId.$i", "r");
-                            if(is_resource($part)){
-                                while (!feof($part)) {
-                                    fwrite($newDest, fread($part, 4096));
-                                }
-                                fclose($part);
-                            }
-                            unlink($destStreamURL."$fileHash.$fileId.$i");
-                        }
-
-                    }
-                    fclose($newDest);
-                }
-
-                if (!self::$remote && (!self::$wrapperIsRemote || $relPath != $httpVars["partitionRealName"])) {
-                    if($current != $target){
-                        $err = copy($current, $target);
-                    }
-                    else $err = true;
-                } else {
-                    for ($i=0, $count=count($newPartitions); $i<$count; $i++) {
-                        $driver->storeFileToCopy($newPartitions[$i]);
-                    }
-                }
-
-                if ($current != $target && $err !== false) {
-                    if(!self::$remote) unlink($current);
-                    AJXP_Controller::applyHook("node.change", array(null, new AJXP_Node($target), false));
-                } else if ($current == $target) {
-                    AJXP_Controller::applyHook("node.change", array(null, new AJXP_Node($target), false));
-                }
-            } else {
-                // Remove the file, as it should not have been uploaded!
-                //if(!self::$remote) unlink($current);
-            }
-        }
-    }
-
-    public function jumploaderInstallApplet($params)
-    {
-        if (is_file($this->getBaseDir()."/jumploader_z.jar")) {
-            return "ERROR: The applet is already installed!";
-        }
-        $fileData = AJXP_Utils::getRemoteContent("http://jumploader.com/jar/jumploader_z.jar");
-        if (!is_writable($this->getBaseDir())) {
-            file_put_contents(AJXP_CACHE_DIR."/jumploader_z.jar", $fileData);
-            return "ERROR: The applet was downloaded, but the folder plugins/uploader.jumploader is not writeable. Applet is located in the cache folder, please put it manually in the plugin folder.";
-        } else {
-            file_put_contents($this->getBaseDir()."/jumploader_z.jar", $fileData);
-            return "SUCCESS: Installed applet successfully!";
-        }
-    }
-}
\ No newline at end of file
diff --git a/core/src/plugins/uploader.jumploader/i18n/conf/de.php b/core/src/plugins/uploader.jumploader/i18n/conf/de.php
index 675795770e..e65f9f92b2 100644
--- a/core/src/plugins/uploader.jumploader/i18n/conf/de.php
+++ b/core/src/plugins/uploader.jumploader/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Jumploader" => "JumpLoader",
diff --git a/core/src/plugins/uploader.jumploader/i18n/conf/en.php b/core/src/plugins/uploader.jumploader/i18n/conf/en.php
index baf3abc2bb..97b31fc2bc 100644
--- a/core/src/plugins/uploader.jumploader/i18n/conf/en.php
+++ b/core/src/plugins/uploader.jumploader/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Jumploader" => "Java (big files)",
diff --git a/core/src/plugins/uploader.jumploader/i18n/conf/fr.php b/core/src/plugins/uploader.jumploader/i18n/conf/fr.php
index ba8694c259..98b1f23897 100644
--- a/core/src/plugins/uploader.jumploader/i18n/conf/fr.php
+++ b/core/src/plugins/uploader.jumploader/i18n/conf/fr.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Jumploader" => "Java (gros fichiers)",
diff --git a/core/src/plugins/uploader.jumploader/i18n/conf/it.php b/core/src/plugins/uploader.jumploader/i18n/conf/it.php
index 8faa23b21d..b23c27aee3 100644
--- a/core/src/plugins/uploader.jumploader/i18n/conf/it.php
+++ b/core/src/plugins/uploader.jumploader/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Jumploader" => "Java (file grandi)",
diff --git a/core/src/plugins/uploader.jumploader/i18n/conf/pt.php b/core/src/plugins/uploader.jumploader/i18n/conf/pt.php
index e7457d65fe..e0a969d869 100644
--- a/core/src/plugins/uploader.jumploader/i18n/conf/pt.php
+++ b/core/src/plugins/uploader.jumploader/i18n/conf/pt.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "Jumploader" => "Jumploader",
diff --git a/core/src/plugins/uploader.jumploader/jumploader_tpl.html b/core/src/plugins/uploader.jumploader/jumploader_tpl.html
index ff7f0d8e7a..fbec03e936 100644
--- a/core/src/plugins/uploader.jumploader/jumploader_tpl.html
+++ b/core/src/plugins/uploader.jumploader/jumploader_tpl.html
@@ -1,23 +1,3 @@
-<?php 
-    $confMaxSize = AJXP_Utils::convertBytes(ConfService::getCoreConf("UPLOAD_MAX_SIZE", "uploader"));
-	$UploadMaxSize = min(AJXP_Utils::convertBytes(ini_get('upload_max_filesize')), AJXP_Utils::convertBytes(ini_get('post_max_size')));
-	if($confMaxSize != 0) $UploadMaxSize = min ($UploadMaxSize, $confMaxSize);
-    $confTotalSize = ConfService::getCoreConf("UPLOAD_MAX_SIZE_TOTAL", "uploader");
-    $confTotalNumber = ConfService::getCoreConf("UPLOAD_MAX_NUMBER", "uploader");
-    
-	$repository = ConfService::getRepository();
-	$accessType = $repository->getAccessType();
-
-    $partitionLength = $UploadMaxSize - 1000;
-
-    if($accessType == "remotefs"){
-		$maxFileLength = $UploadMaxSize;
-	}else if($accessType == "ftp"){
-		$partitionLength = $UploadMaxSize - 1000;
-	}
-	
-
-?>
 <html>
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">	
@@ -91,8 +71,8 @@
 						height="400" \
 						mayscript> \
 					<param name="gc_loggingLevel" value="ERROR"/> \
-					<param name="uc_uploadUrl" value="'+ document.location.href.split("?").shift().replace('index_shared.php', 'index.php') + '?secure_token=' + parent.Connexion.SECURE_TOKEN  +'&get_action=upload"/> \
-					<param name="uc_resumeCheckUrl" value="'+ document.location.href.split("?").shift().replace('index_shared.php', 'index.php') + '?secure_token=' + parent.Connexion.SECURE_TOKEN  +'&get_action=upload"/> \
+					<param name="uc_uploadUrl" value="'+ document.location.href.split("?").shift() + '?secure_token=' + parent.Connexion.SECURE_TOKEN  +'&get_action=upload"/> \
+					<param name="uc_resumeCheckUrl" value="'+ document.location.href.split("?").shift() + '?secure_token=' + parent.Connexion.SECURE_TOKEN  +'&get_action=upload"/> \
 					<param name="uc_fileParameterName" value="userfile_0"/> \
 					<param name="ac_fireUploaderStatusChanged" value="true"/> \
 					<param name="ac_fireAppletInitialized" value="true"/> \
diff --git a/core/src/plugins/uploader.jumploader/manifest.xml b/core/src/plugins/uploader.jumploader/manifest.xml
index 6b4137ce89..b42bcf6971 100644
--- a/core/src/plugins/uploader.jumploader/manifest.xml
+++ b/core/src/plugins/uploader.jumploader/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <uploader id="uploader.jumploader" order="2" enabled="false" text="51" title="162" label="CONF_MESSAGE[Jumploader]" description="CONF_MESSAGE[Third-party JumpLoader JAVA applet allowing to upload folders, chunk big files, etc.]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd">
-	<class_definition filename="plugins/uploader.jumploader/class.JumploaderProcessor.php" classname="JumploaderProcessor"/>
+	<class_definition filename="plugins/uploader.jumploader/Jumploader.php" classname="Pydio\Uploader\Processor\Jumploader"/>
     <client_settings>
         <resources>
             <i18n namespace="jumploader" path="plugins/uploader.jumploader/i18n"/>
@@ -11,6 +11,11 @@
     </server_settings>
 	<registry_contributions>
 		<actions>
+            <action name="jumploader_tpl">
+                <processing>
+                    <serverCallback methodName="getTemplate"/>
+                </processing>
+            </action>
 			<action name="upload">
 				<pre_processing>
 					<serverCallback methodName="preProcess"/>
@@ -35,8 +40,11 @@
 			</div>
 		]]></clientForm>
 		<dialogOnOpen><![CDATA[
-        var src = window.ajxpServerAccessPath + '&get_action=get_template&template_name=jumploader_tpl.html&pluginName=uploader.jumploader&encode=false';
+        var src = window.ajxpServerAccessPath + '&get_action=jumploader_tpl&encode=false';
         modal.getForm().down('#jumpframe').src = src;
 		]]></dialogOnOpen>
+        <activeCondition><![CDATA[
+            return navigator.javaEnabled();
+        ]]></activeCondition>
 	</processing>
 </uploader>
diff --git a/core/src/plugins/uploader.plupload/Pluploader.php b/core/src/plugins/uploader.plupload/Pluploader.php
new file mode 100644
index 0000000000..cd33e65ee8
--- /dev/null
+++ b/core/src/plugins/uploader.plupload/Pluploader.php
@@ -0,0 +1,236 @@
+<?php
+/**
+ *
+ * Copyright 2007-2009 Charles du Jeu
+ * This file is part of Pydio.
+ * The latest code can be found at http://pyd.io/
+ *
+ * This program is published under the LGPL Gnu Lesser General Public License.
+ * You should have received a copy of the license along with Pydio.
+ *
+ * The main conditions are as follow :
+ * You must conspicuously and appropriately publish on each copy distributed
+ * an appropriate copyright notice and disclaimer of warranty and 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 the GNU Lesser General
+ * Public License along with the Program.
+ *
+ * If you modify your copy or copies of the library or any portion of it, you may
+ * distribute the resulting library provided you do so under the GNU Lesser
+ * General Public License. However, programs that link to the library may be
+ * licensed under terms of your choice, so long as the library itself can be changed.
+ * Any translation of the GNU Lesser General Public License must be accompanied by the
+ * GNU Lesser General Public License.
+ *
+ * If you copy or distribute the program, you must accompany it with the complete
+ * corresponding machine-readable source code or with a written offer, valid for at
+ * least three years, to furnish the complete corresponding machine-readable source code.
+ *
+ * Any of the above conditions can be waived if you get permission from the copyright holder.
+ * Pydio 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.
+ *
+ * Description : Class for handling flex upload
+ */
+namespace Pydio\Uploader\Processor;
+
+use Pydio\Access\Core\MetaStreamWrapper;
+use Pydio\Access\Core\Model\AJXP_Node;
+use Pydio\Access\Core\Model\UserSelection;
+
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Utils\Vars\InputFilter;
+use Pydio\Core\Utils\Vars\StatHelper;
+
+use Pydio\Core\Utils\Vars\XMLFilter;
+use Pydio\Core\PluginFramework\Plugin;
+
+defined('AJXP_EXEC') or die( 'Access not allowed');
+
+/**
+ * Class Pluploader
+ */
+class Pluploader extends Plugin
+{
+    /**
+     * @param \Psr\Http\Message\ServerRequestInterface $requestInterface
+     * @param \Psr\Http\Message\ResponseInterface $responseInterface
+     */
+    public function getTemplate(\Psr\Http\Message\ServerRequestInterface $requestInterface, \Psr\Http\Message\ResponseInterface &$responseInterface){
+
+        /** @var \Pydio\Core\Model\ContextInterface $ctx */
+        $ctx = $requestInterface->getAttribute("ctx");
+        $UploadMaxSize = StatHelper::convertBytes(ini_get('upload_max_filesize'));
+        $UploadMaxPostSize = StatHelper::convertBytes(ini_get('post_max_size'));
+        if($UploadMaxPostSize > 0 && $UploadMaxPostSize < $UploadMaxSize) $UploadMaxSize = $UploadMaxPostSize;
+        $confMaxSize = ConfService::getConf("UPLOAD_MAX_FILE");
+        if($confMaxSize != 0 &&  $confMaxSize < $UploadMaxSize) $UploadMaxSize = $confMaxSize;
+
+        $pluginConfigs = $this->getConfigs();
+        $confTotalSize = ConfService::getConf("UPLOAD_MAX_TOTAL");
+        $confTotalNumber = ConfService::getConf("UPLOAD_MAX_NUMBER");
+
+        $repository = $ctx->getRepository();
+        $accessType = $repository->getAccessType();
+        if($accessType == "fs"){
+            $partitionLength = $UploadMaxSize - 1000;
+        }else if($accessType == "remotefs"){
+            $maxFileLength = $UploadMaxSize;
+        }else if($accessType == "ftp"){
+            $maxFileLength = $UploadMaxSize;
+        }
+
+        $minisite_session = "";
+        if(strpos(session_name(), "AjaXplorer_Shared") === 0) {
+            $minisite_session = "&minisite_session=" . substr(session_name(), strlen("AjaXplorer_Shared"));
+        }
+        $secureToken = $requestInterface->getParsedBody()["secure_token"];
+        include($this->getBaseDir()."/pluploader_tpl.html");
+
+    }
+
+    /**
+     * @param $action
+     * @param $httpVars
+     * @param $fileVars
+     * @param \Pydio\Core\Model\ContextInterface $ctx
+     * @throws \Exception
+     * @throws \Pydio\Core\Exception\ActionNotFoundException
+     * @throws \Pydio\Core\Exception\AuthRequiredException
+     */
+    public function unifyChunks($action, &$httpVars, &$fileVars, \Pydio\Core\Model\ContextInterface $ctx)
+    {
+
+        $filename = InputFilter::decodeSecureMagic($httpVars["name"]);
+
+        $tmpName = $fileVars["file"]["tmp_name"];
+        $chunk = $httpVars["chunk"];
+        $chunks = $httpVars["chunks"];
+
+        //error_log("currentChunk:".$chunk."  chunks: ".$chunks);
+
+        $repository = $ctx->getRepository();
+        $userSelection = UserSelection::fromContext($ctx, []);
+        $dir = InputFilter::securePath($httpVars["dir"]);
+        $destStreamURL = $userSelection->currentBaseUrl().$dir."/";
+
+        $parentNode = new AJXP_Node($userSelection->currentBaseUrl());
+        $driver = $parentNode->getDriver();
+        $remote = false;
+        if (method_exists($driver, "storeFileToCopy")) {
+            $remote = true;
+            $destCopy = XMLFilter::resolveKeywords($repository->getContextOption($ctx, "TMP_UPLOAD"));
+            // Make tmp folder a bit more unique using secure_token
+            $tmpFolder = $destCopy."/".$httpVars["secure_token"];
+            if(!is_dir($tmpFolder)){
+                @mkdir($tmpFolder, 0700, true);
+            }
+            $target = $tmpFolder.'/'.$filename;
+            $fileVars["file"]["destination"] = base64_encode($dir);
+        }else if(MetaStreamWrapper::wrapperIsRemote($destStreamURL)){
+            $remote = true;
+            $tmpFolder = ApplicationState::getAjxpTmpDir() ."/".$httpVars["secure_token"];
+            if(!is_dir($tmpFolder)){
+                @mkdir($tmpFolder, 0700, true);
+            }
+            $target = $tmpFolder.'/'.$filename;
+        }else{
+
+            $target = $destStreamURL.$filename;
+        }
+
+
+        //error_log("Directory: ".$dir);
+
+        // Clean the fileName for security reasons
+        //$filename = preg_replace('/[^\w\._]+/', '', $filename);
+        $contentType =  "";
+        // Look for the content type header
+        if (isset($_SERVER["HTTP_CONTENT_TYPE"]))
+            $contentType = $_SERVER["HTTP_CONTENT_TYPE"];
+
+        if (isset($_SERVER["CONTENT_TYPE"]))
+            $contentType = $_SERVER["CONTENT_TYPE"];
+
+        // Handle non multipart uploads older WebKit versions didn't support multipart in HTML5
+        if (strpos($contentType, "multipart") !== false) {
+            if (isset($tmpName) && is_uploaded_file($tmpName)) {
+                //error_log("tmpName: ".$tmpName);
+
+                // Open temp file
+                $out = fopen($target, $chunk == 0 ? "wb" : "ab");
+                if ($out) {
+                    // Read binary input stream and append it to temp file
+                    $in = fopen($tmpName, "rb");
+
+                    if ($in) {
+                        while ($buff = fread($in, 4096))
+                            fwrite($out, $buff);
+                    } else{
+                        echo('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": "Failed to open input stream."}, "id" : "id"}');
+                        return;
+                    }
+                    fclose($in);
+                    fclose($out);
+                    @unlink($tmpName);
+                } else{
+                    echo('{"jsonrpc" : "2.0", "error" : {"code": 102, "message": "Failed to open output stream."}, "id" : "id"}');
+                    return;
+                }
+            } else{
+                echo('{"jsonrpc" : "2.0", "error" : {"code": 103, "message": "Failed to move uploaded file."}, "id" : "id"}');
+                return;
+            }
+        } else {
+            // Open temp file
+            $out = fopen($target, $chunk == 0 ? "wb" : "ab");
+            if ($out) {
+                // Read binary input stream and append it to temp file
+                $in = fopen("php://input", "rb");
+
+                if ($in) {
+                    while ($buff = fread($in, 4096))
+                        fwrite($out, $buff);
+                } else{
+                    echo('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": "Failed to open input stream."}, "id" : "id"}');
+                    return;
+                }
+
+                fclose($in);
+                fclose($out);
+            } else{
+                echo('{"jsonrpc" : "2.0", "error" : {"code": 102, "message": "Failed to open output stream."}, "id" : "id"}');
+                return;
+            }
+        }
+        /* we apply the hook if we are uploading the last chunk */
+        if($chunk == $chunks-1){
+            if(!$remote){
+                Controller::applyHook("node.change", array(null, new AJXP_Node($destStreamURL.$filename), false));
+            }else{
+                if(method_exists($driver, "storeFileToCopy")){
+                    $fileVars["file"]["tmp_name"] = $target;
+                    $fileVars["file"]["name"] = $filename;
+                    $driver->storeFileToCopy($fileVars["file"]);
+                    $request = \Zend\Diactoros\ServerRequestFactory::fromGlobals();
+                    $request = $request->withAttribute("action", "next_to_remote")->withParsedBody([]);
+                    Controller::run($request);
+
+                }else{
+                    // Remote Driver case: copy temp file to destination
+                    $node = new AJXP_Node($destStreamURL.$filename);
+                    Controller::applyHook("node.before_create", array($node, filesize($target)));
+                    Controller::applyHook("node.before_change", array(new AJXP_Node($destStreamURL)));
+                    $res = copy($target, $destStreamURL.$filename);
+                    if($res) @unlink($target);
+                    Controller::applyHook("node.change", array(null, $node, false));
+                }
+            }
+        }
+        // Return JSON-RPC response
+        echo('{"jsonrpc" : "2.0", "result" : null, "id" : "id"}');
+        return;
+    }
+}
diff --git a/core/src/plugins/uploader.plupload/class.PluploadProcessor.php b/core/src/plugins/uploader.plupload/class.PluploadProcessor.php
deleted file mode 100644
index 1918378a42..0000000000
--- a/core/src/plugins/uploader.plupload/class.PluploadProcessor.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-/**
- * @package info.ajaxplorer
- *
- * Copyright 2007-2009 Charles du Jeu
- * This file is part of Pydio.
- * The latest code can be found at http://pyd.io/
- *
- * This program is published under the LGPL Gnu Lesser General Public License.
- * You should have received a copy of the license along with Pydio.
- *
- * The main conditions are as follow :
- * You must conspicuously and appropriately publish on each copy distributed
- * an appropriate copyright notice and disclaimer of warranty and 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 the GNU Lesser General
- * Public License along with the Program.
- *
- * If you modify your copy or copies of the library or any portion of it, you may
- * distribute the resulting library provided you do so under the GNU Lesser
- * General Public License. However, programs that link to the library may be
- * licensed under terms of your choice, so long as the library itself can be changed.
- * Any translation of the GNU Lesser General Public License must be accompanied by the
- * GNU Lesser General Public License.
- *
- * If you copy or distribute the program, you must accompany it with the complete
- * corresponding machine-readable source code or with a written offer, valid for at
- * least three years, to furnish the complete corresponding machine-readable source code.
- *
- * Any of the above conditions can be waived if you get permission from the copyright holder.
- * Pydio 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.
- *
- * Description : Class for handling flex upload
- */
-defined('AJXP_EXEC') or die( 'Access not allowed');
-
-class PluploadProcessor extends AJXP_Plugin
-{
-// 15 minutes execution time
-//@set_time_limit(15 * 60);
-
-// Uncomment this one to fake upload time
-// usleep(5000);
-
-    public function unifyChunks($action, &$httpVars, &$fileVars)
-    {
-
-            $filename = AJXP_Utils::decodeSecureMagic($httpVars["name"]);
-
-            $tmpName = $fileVars["file"]["tmp_name"];
-            $chunk = $httpVars["chunk"];
-            $chunks = $httpVars["chunks"];
-
-            //error_log("currentChunk:".$chunk."  chunks: ".$chunks);
-
-            $repository = ConfService::getRepository();
-            if (!$repository->detectStreamWrapper(true)) {
-                return false;
-            }
-            $userSelection = new UserSelection($repository);
-            $dir = AJXP_Utils::securePath($httpVars["dir"]);
-            $destStreamURL = $userSelection->currentBaseUrl().$dir."/";
-
-            $driver = ConfService::loadDriverForRepository($repository);
-            $remote = false;
-            if (method_exists($driver, "storeFileToCopy")) {
-                $remote = true;
-                $destCopy = AJXP_XMLWriter::replaceAjxpXmlKeywords($repository->getOption("TMP_UPLOAD"));
-                // Make tmp folder a bit more unique using secure_token
-                $tmpFolder = $destCopy."/".$httpVars["secure_token"];
-                if(!is_dir($tmpFolder)){
-                    @mkdir($tmpFolder, 0700, true);
-                }
-                $target = $tmpFolder.'/'.$filename;
-                $fileVars["file"]["destination"] = base64_encode($dir);
-            }else if(AJXP_MetaStreamWrapper::wrapperIsRemote($destStreamURL)){
-                $remote = true;
-                $tmpFolder = AJXP_Utils::getAjxpTmpDir()."/".$httpVars["secure_token"];
-                if(!is_dir($tmpFolder)){
-                    @mkdir($tmpFolder, 0700, true);
-                }
-                $target = $tmpFolder.'/'.$filename;
-            }else{
-
-                $target = $destStreamURL.$filename;
-            }
-
-
-            //error_log("Directory: ".$dir);
-
-            // Clean the fileName for security reasons
-            //$filename = preg_replace('/[^\w\._]+/', '', $filename);
-            $contentType =  "";
-            // Look for the content type header
-            if (isset($_SERVER["HTTP_CONTENT_TYPE"]))
-                $contentType = $_SERVER["HTTP_CONTENT_TYPE"];
-
-            if (isset($_SERVER["CONTENT_TYPE"]))
-                $contentType = $_SERVER["CONTENT_TYPE"];
-
-            // Handle non multipart uploads older WebKit versions didn't support multipart in HTML5
-            if (strpos($contentType, "multipart") !== false) {
-                if (isset($tmpName) && is_uploaded_file($tmpName)) {
-                    //error_log("tmpName: ".$tmpName);
-
-                    // Open temp file
-                    $out = fopen($target, $chunk == 0 ? "wb" : "ab");
-                    if ($out) {
-                        // Read binary input stream and append it to temp file
-                        $in = fopen($tmpName, "rb");
-
-                        if ($in) {
-                            while ($buff = fread($in, 4096))
-                                fwrite($out, $buff);
-                        } else
-                            die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": "Failed to open input stream."}, "id" : "id"}');
-                        fclose($in);
-                        fclose($out);
-                        @unlink($tmpName);
-                    } else
-                        die('{"jsonrpc" : "2.0", "error" : {"code": 102, "message": "Failed to open output stream."}, "id" : "id"}');
-                } else
-                    die('{"jsonrpc" : "2.0", "error" : {"code": 103, "message": "Failed to move uploaded file."}, "id" : "id"}');
-            } else {
-                // Open temp file
-                $out = fopen($target, $chunk == 0 ? "wb" : "ab");
-                if ($out) {
-                    // Read binary input stream and append it to temp file
-                    $in = fopen("php://input", "rb");
-
-                    if ($in) {
-                        while ($buff = fread($in, 4096))
-                            fwrite($out, $buff);
-                    } else
-                        die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": "Failed to open input stream."}, "id" : "id"}');
-
-                    fclose($in);
-                    fclose($out);
-                } else
-                    die('{"jsonrpc" : "2.0", "error" : {"code": 102, "message": "Failed to open output stream."}, "id" : "id"}');
-            }
-            /* we apply the hook if we are uploading the last chunk */
-            if($chunk == $chunks-1){
-                if(!$remote){
-                    AJXP_Controller::applyHook("node.change", array(null, new AJXP_Node($destStreamURL.$filename), false));
-                }else{
-                    if(method_exists($driver, "storeFileToCopy")){
-                        $fileVars["file"]["tmp_name"] = $target;
-                        $fileVars["file"]["name"] = $filename;
-                        $driver->storeFileToCopy($fileVars["file"]);
-                        AJXP_Controller::findActionAndApply("next_to_remote", array(), array());
-                    }else{
-                        // Remote Driver case: copy temp file to destination
-                        $node = new AJXP_Node($destStreamURL.$filename);
-                        AJXP_Controller::applyHook("node.before_create", array($node, filesize($target)));
-                        AJXP_Controller::applyHook("node.before_change", array(new AJXP_Node($destStreamURL)));
-                        $res = copy($target, $destStreamURL.$filename);
-                        if($res) @unlink($target);
-                        AJXP_Controller::applyHook("node.change", array(null, $node, false));
-                    }
-                }
-            }
-            // Return JSON-RPC response
-            die('{"jsonrpc" : "2.0", "result" : null, "id" : "id"}');
-    }
-}
diff --git a/core/src/plugins/uploader.plupload/i18n/conf/cs.php b/core/src/plugins/uploader.plupload/i18n/conf/cs.php
index 24783dd6c5..00993b25e2 100644
--- a/core/src/plugins/uploader.plupload/i18n/conf/cs.php
+++ b/core/src/plugins/uploader.plupload/i18n/conf/cs.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "PLUploader" => "PLUploader",
diff --git a/core/src/plugins/uploader.plupload/i18n/conf/de.php b/core/src/plugins/uploader.plupload/i18n/conf/de.php
index 185e83a4b9..339b24f0c6 100644
--- a/core/src/plugins/uploader.plupload/i18n/conf/de.php
+++ b/core/src/plugins/uploader.plupload/i18n/conf/de.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "PLUploader" => "Plupload",
diff --git a/core/src/plugins/uploader.plupload/i18n/conf/en.php b/core/src/plugins/uploader.plupload/i18n/conf/en.php
index b013847e4e..ff92cbf8fb 100644
--- a/core/src/plugins/uploader.plupload/i18n/conf/en.php
+++ b/core/src/plugins/uploader.plupload/i18n/conf/en.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "PLUploader" => "PLUploader",
diff --git a/core/src/plugins/uploader.plupload/i18n/conf/it.php b/core/src/plugins/uploader.plupload/i18n/conf/it.php
index f3ce19bd79..45dfcc3403 100644
--- a/core/src/plugins/uploader.plupload/i18n/conf/it.php
+++ b/core/src/plugins/uploader.plupload/i18n/conf/it.php
@@ -16,7 +16,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
 *
-* The latest code can be found at <http://pyd.io/>.
+* The latest code can be found at <https://pydio.com>.
 */
 $mess=array(
 "PLUploader" => "PLUploader",
diff --git a/core/src/plugins/uploader.plupload/manifest.xml b/core/src/plugins/uploader.plupload/manifest.xml
index 8287d478ac..96209509c5 100644
--- a/core/src/plugins/uploader.plupload/manifest.xml
+++ b/core/src/plugins/uploader.plupload/manifest.xml
@@ -5,7 +5,7 @@
         <plugin_author>lmanders</plugin_author>
         <plugin_version>1.0</plugin_version>
     </plugin_info>
-	<class_definition filename="plugins/uploader.plupload/class.PluploadProcessor.php" classname="PluploadProcessor"/>
+	<class_definition filename="plugins/uploader.plupload/Pluploader.php" classname="Pydio\Uploader\Processor\Pluploader"/>
 	<client_settings>
 		<resources>
 	        <i18n namespace="plupload" path="plugins/uploader.plupload/i18n" />
@@ -23,6 +23,11 @@
                     <serverCallback methodName="unifyChunks"/>
                 </processing>
             </action>
+            <action name="plupload_tpl">
+                <processing>
+                    <serverCallback methodName="getTemplate"/>
+                </processing>
+            </action>
         </actions>
     </registry_contributions>
     <dependencies>
@@ -39,7 +44,7 @@
 			</div>
 		]]></clientForm>
 		<dialogOnOpen><![CDATA[
-        var src = window.ajxpServerAccessPath + '&get_action=get_template&template_name=pluploader_tpl.html&pluginName=uploader.plupload&encode=false';
+        var src = window.ajxpServerAccessPath + '&get_action=plupload_tpl&encode=false';
         modal.getForm().down('#pluploadframe').src = src;
 		]]></dialogOnOpen>
 	</processing>
diff --git a/core/src/plugins/uploader.plupload/pluploader_tpl.html b/core/src/plugins/uploader.plupload/pluploader_tpl.html
index cc69993b79..0e3202693b 100644
--- a/core/src/plugins/uploader.plupload/pluploader_tpl.html
+++ b/core/src/plugins/uploader.plupload/pluploader_tpl.html
@@ -1,28 +1,3 @@
-<?php 
-    $UploadMaxSize = AJXP_Utils::convertBytes(ini_get('upload_max_filesize'));
-    $UploadMaxPostSize = AJXP_Utils::convertBytes(ini_get('post_max_size'));
-    if($UploadMaxPostSize > 0 && $UploadMaxPostSize < $UploadMaxSize) $UploadMaxSize = $UploadMaxPostSize;
-    $confMaxSize = ConfService::getConf("UPLOAD_MAX_FILE");
-    if($confMaxSize != 0 &&  $confMaxSize < $UploadMaxSize) $UploadMaxSize = $confMaxSize;
-    $confTotalSize = ConfService::getConf("UPLOAD_MAX_TOTAL");
-    $confTotalNumber = ConfService::getConf("UPLOAD_MAX_NUMBER");    
-    $pluginConfigs = AJXP_PluginsService::getInstance()->findPlugin("uploader", "plupload")->getConfigs();    
-
-	$repository = ConfService::getRepository();
-	$accessType = $repository->getAccessType();
-	if($accessType == "fs"){
-		$partitionLength = $UploadMaxSize - 1000;	
-	}else if($accessType == "remotefs"){
-		$maxFileLength = $UploadMaxSize;
-	}else if($accessType == "ftp"){
-		$maxFileLength = $UploadMaxSize;
-	}
-
-    $minisite_session = "";
-    if(strpos(session_name(), "AjaXplorer_Shared") === 0){
-    $minisite_session = "&minisite_session=".substr(session_name(), strlen("AjaXplorer_Shared"));
-    }
-?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
 "http://www.w3.org/TR/html4/strict.dtd">
 <html>
@@ -49,14 +24,15 @@
 
 var ftpUrl = '<?php echo ($ftpURL?$ftpURL:""); ?>';
 
-var uploadUrl = '<?php print($_SERVER["SCRIPT_NAME"]); ?>?get_action=upload_chunks_unify_plupload&secure_token=<?php echo $httpVars["secure_token"];?>&ajxp_sessid=<?php echo session_id().$minisite_session; ?>';
+var uploadUrl = '<?php print($_SERVER["SCRIPT_NAME"]); ?>?get_action=upload_chunks_unify_plupload&secure_token=<?php echo $secureToken;?>&ajxp_sessid=<?php echo session_id().$minisite_session; ?>';
 
 var maxFileSize = '<?PHP echo ($UploadMaxSize/1048576) . "mb"; ?>';
 var maxHTML4 = '<?PHP echo $UploadMaxSize; ?>';
 var config_runtimes = '<?php echo $pluginConfigs["RUNTIMES"]; ?>';
 var config_max_file_size = '<?php echo $pluginConfigs["MAX_FILE_SIZE"]; ?>';
 var config_chunk_size = '<?php echo (!empty($pluginConfigs["CHUNK_SIZE"]) ? $pluginConfigs["CHUNK_SIZE"] : (($UploadMaxSize/1048576) - 1)."mb"); ?>';
-var currentDir = parent.ajaxplorer.getContextNode().getPath();
+var currentDir = parent.pydio.getContextNode().getPath();
+var AjxpNode = parent.AjxpNode;
 
 $(function() {
 	$("#plupload_uploader").pluploadQueue({
@@ -84,12 +60,23 @@
 	
 	// attach callbacks for FileUploaded
 	function attachCallbacks(Uploader) {
+        Uploader.bind('FilesAdded', function(up, files){
+            plupload.each(files, function(file){
+                var node = new AjxpNode(currentDir + '/' + file.name);
+                if(file.size) node.getMetadata().set('filesize', file.size);
+                try{
+                    parent.pydio.getContextHolder().applyCheckHook(node);
+                }catch(e){
+                    Uploader.removeFile(file);
+                }
+            });
+        });
 		Uploader.bind('UploadFile', function(up, file, res) {
             parent.document.fire("ajaxplorer:longtask_starting");
 		});
 		Uploader.bind('FileUploaded', function(up, file, res) {
 			if(this.total.queued <= 1) {
-				parent.ajaxplorer.fireContextRefresh();
+				parent.pydio.fireContextRefresh();
                 parent.document.fire("ajaxplorer:longtask_finished");
 			}
 		});
diff --git a/core/src/proxy.php b/core/src/proxy.php
new file mode 100644
index 0000000000..90354e496c
--- /dev/null
+++ b/core/src/proxy.php
@@ -0,0 +1,27 @@
+<?php
+/*
+ * Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+include_once("base.conf.php");
+define('AJXP_EXEC', true);
+require_once AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/action.share/vendor/autoload.php";
+global $skipHtmlBase;
+$skipHtmlBase = true;
+$base = rtrim(dirname($_SERVER["SCRIPT_NAME"]), "/");
+\Pydio\Share\ShareCenter::publicRoute($base, "/proxy", ["hash" => $_GET["hash"]]);
\ No newline at end of file
diff --git a/core/src/publicLet.inc.php b/core/src/publicLet.inc.php
index 7a0c8f4393..1b42f6de5c 100644
--- a/core/src/publicLet.inc.php
+++ b/core/src/publicLet.inc.php
@@ -16,23 +16,25 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  *
  * Description : Specific inclusion to run publiclet scripts
  */
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\PluginFramework\PluginsService;
+
 require_once("base.conf.php");
 
-$pServ = AJXP_PluginsService::getInstance();
+$pServ = PluginsService::getInstance();
 ConfService::init();
 ConfService::start();
 $authDriver = ConfService::getAuthDriverImpl();
-$confDriver = ConfService::getConfStorageImpl();
-require_once($confDriver->getUserClassFileName());
-require_once(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/action.share/class.ShareCenter.php");
+require_once(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/action.share/vendor/autoload.php");
+class_alias("Pydio\\Share\\ShareCenter", "ShareCenter");
 
 $fakes = '
 // Non working exception class
-class AJXP_Exception extends Exception
+class PydioException extends Exception
 {
     public function __construct($msg) { echo "$msg"; exit(); }
 }';
diff --git a/core/src/rest.php b/core/src/rest.php
deleted file mode 100644
index c1c87eda1a..0000000000
--- a/core/src/rest.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu <contact (at) cdujeu.me>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio 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 Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- * Description : Real RESTful API access
- */
-include_once("base.conf.php");
-
-set_error_handler(array("AJXP_XMLWriter", "catchError"), E_ALL & ~E_NOTICE & ~E_STRICT );
-set_exception_handler(array("AJXP_XMLWriter", "catchException"));
-
-$pServ = AJXP_PluginsService::getInstance();
-ConfService::$useSession = false;
-AuthService::$useSession = false;
-
-ConfService::init();
-ConfService::start();
-
-$confStorageDriver = ConfService::getConfStorageImpl();
-require_once($confStorageDriver->getUserClassFileName());
-//session_name("AjaXplorer");
-//session_start();
-
-AJXP_PluginsService::getInstance()->initActivePlugins();
-AuthService::preLogUser(array_merge($_GET, $_POST));
-if(AuthService::getLoggedUser() == null){
-    header('HTTP/1.0 401 Unauthorized');
-    echo 'You are not authorized to access this API.';
-    exit;
-}
-$authDriver = ConfService::getAuthDriverImpl();
-ConfService::currentContextIsRestAPI("api");
-
-$uri = $_SERVER["REQUEST_URI"];
-$scriptUri = ltrim(AJXP_Utils::safeDirname($_SERVER["SCRIPT_NAME"]),'/')."/api/";
-$uri = substr($uri, strlen($scriptUri));
-$uri = explode("/", trim($uri, "/"));
-// GET REPO ID
-$repoID = array_shift($uri);
-// GET ACTION NAME
-$action = array_shift($uri);
-$path = "/".implode("/", $uri);
-if($repoID == 'pydio'){
-    ConfService::switchRootDir();
-    $repo = ConfService::getRepository();
-}else{
-    $repo = ConfService::findRepositoryByIdOrAlias($repoID);
-    if ($repo == null) {
-        die("Cannot find repository with ID ".$repoID);
-    }
-
-    if(!ConfService::repositoryIsAccessible($repo->getId(), $repo, AuthService::getLoggedUser(), false, true)){
-        header('HTTP/1.0 401 Unauthorized');
-        echo 'You are not authorized to access this workspace.';
-        exit;
-    }
-    ConfService::switchRootDir($repo->getId());
-}
-// DRIVERS BELOW NEED IDENTIFICATION CHECK
-if (!AuthService::usersEnabled() || ConfService::getCoreConf("ALLOW_GUEST_BROWSING", "auth") || AuthService::getLoggedUser()!=null) {
-    $confDriver = ConfService::getConfStorageImpl();
-    $Driver = ConfService::loadDriverForRepository($repo);
-}
-AJXP_PluginsService::getInstance()->initActivePlugins();
-
-$xmlResult = AJXP_Controller::findRestActionAndApply($action, $path);
-if (!empty($xmlResult) && !headers_sent()) {
-    AJXP_XMLWriter::header();
-    print($xmlResult);
-    AJXP_XMLWriter::close();
-}
diff --git a/core/src/runTests.php b/core/src/runTests.php
index 0d39a756b5..d526f32372 100644
--- a/core/src/runTests.php
+++ b/core/src/runTests.php
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
  *
- * The latest code can be found at <http://pyd.io/>.
+ * The latest code can be found at <https://pydio.com>.
  *
  * Re-run the diagnostic tests
  */
@@ -25,9 +25,20 @@
  * If you want to run the tests, first comment this line!
  * It is disabled for security purpose
  */
+use Pydio\Core\Utils\Reflection\DiagnosticRunner;
+use Pydio\Core\Controller\HTMLWriter;
+
 die("You are not allowed to see this page (comment first line of the file to access it!)");
 require_once("base.conf.php");
+require_once AJXP_BIN_FOLDER."/lib/HttpClient.php";
 
+/**
+ * @param $baseData
+ * @param $url
+ * @param $parameters
+ * @param $private
+ * @return HttpClient
+ */
 function apiPost($baseData, $url, $parameters, $private){
 
     $nonce = substr(md5(microtime()), 0, 6);
@@ -242,8 +253,8 @@ function apiPost($baseData, $url, $parameters, $private){
     $outputArray = array();
     $testedParams = array();
     $passed = true;
-    $passed = AJXP_Utils::runTests($outputArray, $testedParams);
-    AJXP_Utils::testResultsToTable($outputArray, $testedParams, true);
-    AJXP_Utils::testResultsToFile($outputArray, $testedParams);
+    $passed = DiagnosticRunner::runTests($outputArray, $testedParams);
+    DiagnosticRunner::testResultsToFile($outputArray, $testedParams);
+    echo DiagnosticRunner::testResultsToTable($outputArray, $testedParams, true);
 
 }
\ No newline at end of file
diff --git a/core/src/web.config b/core/src/web.config
new file mode 100644
index 0000000000..9ed7271f0f
--- /dev/null
+++ b/core/src/web.config
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <system.webServer>
+        <rewrite>
+            <rules>
+                <rule name="redirect all requests" stopProcessing="true">
+                    <match url="^(.*)$" ignoreCase="false" />
+                    <conditions logicalGrouping="MatchAll">
+                            <add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
+                            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
+                    </conditions>
+                    <action type="Rewrite" url="index.php" appendQueryString="true" />
+                </rule>
+            </rules>
+        </rewrite>
+        <defaultDocument>
+            <files>
+                <clear />
+                <add value="index.php" />
+                <add value="index.html" />
+            </files>
+        </defaultDocument>
+        <staticContent>
+	    <remove fileExtension=".woff2" />
+            <mimeMap fileExtension=".woff2" mimeType="application/x-woff" />           
+	        <remove fileExtension=".woff" />
+	        <mimeMap fileExtension=".woff" mimeType="application/x-woff" />
+	        <remove fileExtension=".json" />
+            <mimeMap fileExtension=".json" mimeType="application/json" />
+        </staticContent>
+   </system.webServer>
+</configuration>
\ No newline at end of file
diff --git a/core/src/worker.php b/core/src/worker.php
new file mode 100644
index 0000000000..3b16db91a3
--- /dev/null
+++ b/core/src/worker.php
@@ -0,0 +1,162 @@
+<?php
+/*
+ * Copyright 2007-2015 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com>.
+ */
+
+use Pydio\Core\Services\AuthService;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Services\ApplicationState;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Controller\ShutdownScheduler;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Services\RepositoryService;
+
+use Pydio\Tasks\Task;
+
+include_once("base.conf.php");
+
+$pServ = PluginsService::getInstance();
+
+ConfService::init();
+ConfService::start();
+
+$authDriver = ConfService::getAuthDriverImpl();
+ApplicationState::setSapiRestBase("/api");
+PluginsService::getInstance()->initActivePlugins();
+
+/**
+ * @param Task $task
+ * @param nsqphp\Logger\Stderr $logger
+ * @throws Exception
+ */
+function applyTask($task, $logger){
+
+    set_error_handler(function ($errno , $errstr , $errfile , $errline) use ($task){
+        if(error_reporting() == 0) return;
+        \Pydio\Tasks\TaskService::getInstance()->updateTaskStatus($task->getId(), Task::STATUS_FAILED, $errstr);
+    }, E_ALL & ~E_NOTICE & ~E_STRICT);
+
+    $userId = $task->getUserId();
+    $repoId = $task->getWsId();
+    $actionName = $task->getAction();
+    $parameters = $task->getParameters();
+
+    print($userId." - ".$repoId." - ".$actionName." - \n");
+    $logger->debug("Log User");
+    $user = AuthService::logUser($userId, "", true);
+    $logger->debug("Find Repo");
+    if($repoId == 'pydio'){
+        $userRepositories = \Pydio\Core\Services\UsersService::getRepositoriesForUser($user);
+        if(empty($userRepositories)){
+            throw new \Pydio\Core\Exception\NoActiveWorkspaceException();
+        }
+        $repo = array_shift($userRepositories);
+    }else{
+        $repo = RepositoryService::findRepositoryByIdOrAlias($repoId);
+        if ($repo == null) {
+            \Pydio\Tasks\TaskService::getInstance()->updateTaskStatus($task->getId(), Task::STATUS_FAILED, "Cannot find repository");
+            $logger->error("Cannot find repository with ID ".$repoId);
+            return;
+        }
+        //ConfService::switchRootDir($repo->getId());
+    }
+    $logger->debug("Init plugins");
+    $newCtx = \Pydio\Core\Model\Context::contextWithObjects($user, $repo);
+    PluginsService::getInstance($newCtx);
+
+    $fakeRequest = \Zend\Diactoros\ServerRequestFactory::fromGlobals(array(), array(), $parameters)
+        ->withAttribute("ctx", $newCtx)
+        ->withAttribute("action", $actionName)
+        ->withAttribute("pydio-task-id", $task->getId());
+    ;
+    try{
+        $response = Controller::run($fakeRequest);
+        if($response !== false && ($response->getBody()->getSize() || $response instanceof \Zend\Diactoros\Response\EmptyResponse)) {
+            echo $response->getBody();
+        }
+    }catch (Exception $e){
+        $logger->error("ERROR : ".$e->getMessage());
+        $logger->error($e->getTraceAsString());
+        \Pydio\Tasks\TaskService::getInstance()->updateTaskStatus($task->getId(), Task::STATUS_FAILED, $e->getMessage());
+    }
+
+    $logger->debug("Empty ShutdownScheduler!");
+    ShutdownScheduler::getInstance()->callRegisteredShutdown();
+
+    $logger->debug("Disconnecting");
+    AuthService::disconnect();
+    $repo->driverInstance = null;
+    $logger->debug("Clear Plugins Registry");
+    PluginsService::clearInstance($newCtx);
+    $logger->debug("Clear Loaded Repositories");
+    ConfService::getInstance()->invalidateLoadedRepositories();
+
+    restore_error_handler();
+
+}
+
+function listen(){
+
+    $logger = new nsqphp\Logger\Stderr;
+    $dedupe = new nsqphp\Dedupe\OppositeOfBloomFilterMemcached;
+    $lookup = new nsqphp\Lookup\FixedHosts('localhost:4150');
+    $requeueStrategy = new nsqphp\RequeueStrategy\FixedDelay;
+    $nsq = new nsqphp\nsqphp($lookup, $dedupe, $requeueStrategy, $logger);
+
+    $channel = 'worker';
+
+    $nsq->subscribe('task', $channel, function(\nsqphp\Message\Message $msg) use ($logger) {
+        $logger->debug("READ\t" . $msg->getId() . "\t" . $msg->getPayload());
+        $data = json_decode($msg->getPayload(), true);
+        if(isSet($data["pending_task"])){
+            $taskId = $data["pending_task"];
+            $task = \Pydio\Tasks\TaskService::getInstance()->getTaskById($taskId);
+            if($task instanceof Task ){
+                if($task->getStatus() == Task::STATUS_PENDING){
+                    $logger->info("--------------------------------------");
+                    $logger->info("Applying task ".$data["actionName"]);
+                    try{
+                        applyTask($task, $logger);
+                        // ALTERNATIVE : SEND IN BG 
+                        //$task->setSchedule(new Schedule(Schedule::TYPE_ONCE_NOW));
+                        //Controller::applyActionInBackground($task->getWsId(), $task->getAction(), $task->getParameters(), $task->getUserId(), "", $task->getId());
+                    }catch (Exception $e){
+                        $logger->error("Error : ".$e->getMessage());
+                        $logger->error("Error : ".$e->getTraceAsString());
+                    }
+                }else{
+                    $logger->debug("Skipping Task, status is not pending ". $task->getStatus());
+                }
+            }else{
+                $logger->debug("Skipping, cannot find task for id ". $taskId);
+            }
+        }
+
+    });
+
+    try{
+        $nsq->run();
+    }catch (Exception $e){
+        $logger->error("Socket Error ".$e->getMessage());
+        $logger->error("Restarting listener");
+        listen();
+    }
+}
+
+listen();
\ No newline at end of file
diff --git a/dist/phing/adhoctasks.xml b/dist/phing/adhoctasks.xml
index 42316a48d3..ce0f72d31e 100644
--- a/dist/phing/adhoctasks.xml
+++ b/dist/phing/adhoctasks.xml
@@ -99,6 +99,8 @@ class PydioParseGitSummarize extends Task
       private $extPluginsFolder;
       private $ignores = array("/.gitignore");
 
+      private $upgradeCleanFile = false;
+
       public function setSummarizeFile($summarizeFile)
       {
           $this->summarizeFile = $summarizeFile;
@@ -134,8 +136,39 @@ class PydioParseGitSummarize extends Task
           return $this->prefixPath;
       }
 
+      public function setUpgradeCleanFile($clean){
+           $this->upgradeCleanFile = true;
+      }
+
+      public function getUpgradeCleanFile(){
+        return $this->upgradeCleanFile;
+      }
+
+      protected function checkCleanFileFalsePositive(){
+           $cF = $this->upgradeDir."/UPGRADE/CLEAN-FILES";
+           if(!file_exists($cF)){
+                $this->log("No CLEAN-FILES found, nothing to do");
+           }
+           $lines = file($cF, FILE_IGNORE_NEW_LINES);
+           $newLines = [];
+           foreach($lines as $line){
+                if(file_exists($this->upgradeDir.$line)){
+                    $this->log("File $line was found in upgrade dir, we must ignore this git deletion.");
+                    continue;
+                } else {
+                    $newLines[] = $line;
+                }
+           }
+           file_put_contents($cF, implode("\n", $newLines));
+      }
+
       public function main()
       {
+           if($this->upgradeCleanFile || empty($this->summarizeFile)){
+                $this->checkCleanFileFalsePositive();
+                return;
+           }
+
           $summarizeLines = file($this->summarizeFile);
           $toDelete = array();
           if(isSet($this->prefixPath)) $this->sourceDir .= "/" . $this->prefixPath;
@@ -147,9 +180,11 @@ class PydioParseGitSummarize extends Task
                       $this->log("-- Skipping ".$path, Project::MSG_INFO);
                       continue;
                   }
-                  $end = str_replace($this->prefixPath, "", $path);
+                  $pref = str_replace("/", "\/", $this->prefixPath);
+                  $end = preg_replace("/^".$pref."/", "", $path);
               } else {
-                  $end = str_replace($this->sourceDir, '', $path);
+                  $pref = str_replace("/", "\/", $this->sourceDir);
+                  $end = preg_replace("/^".$pref."/", "", $path);
               }
               if (in_array($end, $this->ignores)) {
                   continue;
diff --git a/dist/phing/build-pydio.xml b/dist/phing/build-pydio.xml
index 27667d9b91..acd3ded0e4 100644
--- a/dist/phing/build-pydio.xml
+++ b/dist/phing/build-pydio.xml
@@ -141,17 +141,33 @@
         	<property name="passed_directory" value="${INNER_DIRECTORY}"/>
         </phingcall>
 
-    	<!-- BUILD JAVASCRIPT -->
-        <!--
-    	<exec command="npm install" dir="${INNER_DIRECTORY}/plugins/gui.ajax" passthru="true"/>
-        <exec command="grunt" dir="${INNER_DIRECTORY}/plugins/gui.ajax" passthru="true"/>
-	    <delete dir="${INNER_DIRECTORY}/plugins/gui.ajax/node_modules"/>
-	    -->
-        <phingcall target="iterate-plugins">
-            <property name="plugins_dir" value="${INNER_DIRECTORY}/plugins"/>
-            <property name="target" value="grunt"/>
+        <!-- RUN COMPOSER IF NECESSARY INSIDE CORE -->
+        <phingcall target="composer">
+            <property name="plugin_abs_dir" value="${INNER_DIRECTORY}/core"/>
         </phingcall>
 
+        <!-- RUN COMPOSER IF NECESSARY INSIDE PLUGINS -->
+        <if>
+            <not><isset property="skip-plugins-composer"/></not>
+            <then>
+                <phingcall target="iterate-plugins">
+                    <property name="plugins_dir" value="${INNER_DIRECTORY}/plugins"/>
+                    <property name="target" value="composer"/>
+                </phingcall>
+            </then>
+        </if>
+
+    	<!-- BUILD JAVASCRIPT -->
+        <if>
+            <not><isset property="skip-plugins-grunt"/></not>
+            <then>
+                <phingcall target="iterate-plugins">
+                    <property name="plugins_dir" value="${INNER_DIRECTORY}/plugins"/>
+                    <property name="target" value="grunt"/>
+                </phingcall>
+            </then>
+        </if>
+
         <!-- DISCRIMINATE PLUGINS -->
         <mkdir dir="${build.working_folder}/ext_plugins" />
         <pydio-plugins-discriminate all="${INNER_DIRECTORY}/plugins" ext="${build.working_folder}/ext_plugins"/>
@@ -183,6 +199,23 @@
         </phingcall>
 
 
+        <!-- RE-RUN CORE COMPOSER IF NECESSARY (Any changes appeared in core/src) -->
+        <if>
+            <or>
+                <!-- There was a change in core/src, rerun to make sure autoloader is up-to-date -->
+                <available type="dir" file="${upgrade_export}/core/src"/>
+                <!-- There was a change in composer.json, rerun to make sure vendor/ is up-to-date -->
+                <available type="file" file="${upgrade_export}/core/composer.json"/>
+            </or>
+            <then>
+                <copy file="${git.local_repository}/core/src/core/composer.json" todir="${upgrade_export}/core" overwrite="true"/>
+                <phingcall target="composer">
+                    <property name="plugin_abs_dir" value="${upgrade_export}/core"/>
+                </phingcall>
+            </then>
+        </if>
+
+        <!-- RE-RUN COMPOSER & GRUNT IF NECESSARY ON PLUGINS -->
         <phingcall target="iterate-plugins">
             <property name="plugins_dir" value="${git.local_repository}/core/src/plugins"/>
             <property name="upgrade_export" value="${upgrade_export}"/>
@@ -214,45 +247,44 @@
 		</copy>
 
 		<!-- ADDITIONAL UPGRADE SCRIPT -->
-		<if>
-			<available type="file" file="${git.local_repository}/dist/php/${build.version}.php"/>
-			<then>
-				<copy file="${git.local_repository}/dist/php/${build.version}.php" toFile="${upgrade_export}/UPGRADE/PHP-SCRIPT"/>
-			</then>
-		</if>
+        <phingcall target="add_update_script">
+            <property name="extension" value="php"/>
+            <property name="target_name" value="PHP-SCRIPT"/>
+        </phingcall>
 
-		<if>
-			<available type="file" file="${git.local_repository}/dist/php/${build.version}.html"/>
-			<then>
-				<copy file="${git.local_repository}/dist/php/${build.version}.html" toFile="${upgrade_export}/UPGRADE/NOTE-HTML"/>
-			</then>
-		</if>
+        <phingcall target="add_update_script">
+            <property name="extension" value="html"/>
+            <property name="target_name" value="NOTE-HTML"/>
+        </phingcall>
 
-		<if>
-			<available type="file" file="${git.local_repository}/dist/php/${build.version}.sql"/>
-			<then>
-				<copy file="${git.local_repository}/dist/php/${build.version}.sql" toFile="${upgrade_export}/UPGRADE/DB-UPGRADE.sql"/>
-			</then>
-		</if>
-		<if>
-			<available type="file" file="${git.local_repository}/dist/php/${build.version}.mysql"/>
-			<then>
-				<copy file="${git.local_repository}/dist/php/${build.version}.mysql" toFile="${upgrade_export}/UPGRADE/DB-UPGRADE.mysql"/>
-			</then>
-		</if>
-		<if>
-			<available type="file" file="${git.local_repository}/dist/php/${build.version}.pgsql"/>
-			<then>
-				<copy file="${git.local_repository}/dist/php/${build.version}.pgsql" toFile="${upgrade_export}/UPGRADE/DB-UPGRADE.pgsql"/>
-			</then>
-		</if>
-        <if>
-            <available type="file" file="${git.local_repository}/dist/php/${build.version}.sqlite"/>
-            <then>
-                <copy file="${git.local_repository}/dist/php/${build.version}.sqlite" toFile="${upgrade_export}/UPGRADE/DB-UPGRADE.sqlite"/>
-            </then>
-        </if>
+        <phingcall target="add_update_script">
+            <property name="extension" value="sql"/>
+            <property name="target_name" value="DB-UPGRADE.sql"/>
+        </phingcall>
 
+        <phingcall target="add_update_script">
+            <property name="extension" value="mysql"/>
+            <property name="target_name" value="DB-UPGRADE.mysql"/>
+        </phingcall>
+
+        <phingcall target="add_update_script">
+            <property name="extension" value="pgsql"/>
+            <property name="target_name" value="DB-UPGRADE.pgsql"/>
+        </phingcall>
+
+        <phingcall target="add_update_script">
+            <property name="extension" value="sqlite"/>
+            <property name="target_name" value="DB-UPGRADE.sqlite"/>
+        </phingcall>
+
+        <phingcall target="add_update_triggers">
+            <property name="input_folder" value="${git.local_repository}/dist/php"/>
+            <property name="output_folder" value="${upgrade_export}/UPGRADE"/>
+            <property name="version" value="${build.version}"/>
+        </phingcall>
+
+        <!-- FINALY, RECHECK CLEAN-FILES AS GIT MAY HAVE REGISTERED SOME DELETIONS THAT WE DO REQUIRE -->
+        <pydio-parse-git-summarize upgradeCleanFile="true" upgradeDir="${upgrade_export}" />
     </target>
 
     <target name="zip" description="Package as Zip archive">
@@ -319,6 +351,24 @@
                 ><fileset dir="${build.working_folder}/upgrade/export/" defaultexcludes="false"><include name="*/**"/></fileset></zip>
     </target>
 
+    <target name="add_update_script" description="Additional upgrade scripts, requires extension and target_name properties">
+        <if>
+            <available type="file" file="${git.local_repository}/dist/php/${build.version}.${extension}"/>
+            <then>
+                <copy file="${git.local_repository}/dist/php/${build.version}.${extension}" toFile="${upgrade_export}/UPGRADE/${target_name}"/>
+            </then>
+        </if>
+    </target>
+
+    <target name="add_update_triggers" description="Look for pre/post triggers and append them to the package">
+        <copy todir="${output_folder}" verbose="true">
+            <fileset dir="${input_folder}">
+                <include name="${version}-*-*.php"/>
+            </fileset>
+            <mapper type="regexp" from="^(.*)-(.*)-(.*).php" to="PHP--\3-\2.php"/>
+        </copy>
+    </target>
+
     <target name="build_external_plugins">
         <foreach param="filename" absparam="absfilename" target="zip_plugin">
             <fileset dir="${build.working_folder}/ext_plugins">
@@ -486,6 +536,7 @@
 
     <!-- We should have a ${local_repository_root} and ${upgrade_export} from upper scope -->
     <target name="force-update-if-package-json">
+        <!-- Looking for package.json File -->
         <if>
             <available file="${plugin_abs_dir}/package.json"/>
             <then>
@@ -532,6 +583,29 @@
                 </phingcall>
             </then>
         </if>
+        <!-- Looking for Composer.json File -->
+        <if>
+            <and>
+                <available file="${plugin_abs_dir}/composer.json"/>
+                <available type="dir" file="${upgrade_export}/plugins/${plugin}/src"/>
+            </and>
+            <then>
+                <copy todir="${upgrade_export}/plugins/${plugin}/src">
+                    <fileset dir="${local_repository_root}/plugins/${plugin}/src" defaultexcludes="false">
+                        <include name="*/**"/>
+                    </fileset>
+                </copy>
+                <echo message="RERUN COMPOSER JS FOR PLUGIN ${plugin}"/>
+                <copy todir="${upgrade_export}/plugins/${plugin}">
+                    <fileset dir="${local_repository_root}/plugins/${plugin}">
+                        <include name="composer.json"/>
+                    </fileset>
+                </copy>
+                <phingcall target="composer">
+                    <property name="plugin_abs_dir" override="true" value="${upgrade_export}/plugins/${plugin}"/>
+                </phingcall>
+            </then>
+        </if>
 
     </target>
 
@@ -547,6 +621,18 @@
         </if>
     </target>
 
+    <target name="composer">
+        <if>
+            <available type="file" file="${plugin_abs_dir}/composer.json"/>
+            <then>
+                <exec command="composer install --optimize-autoloader"
+                      dir="${plugin_abs_dir}"
+                      passthru="true"
+                />
+            </then>
+        </if>
+    </target>
+
     <target name="clean" description="Clean all working folders">
         <foreach list="${build.source_folder},${git.local_repository},${build.working_folder}/build,${build.working_folder}/ext_plugins,${build.working_folder}/upgrade,${build.working_folder}/dist,${build.working_folder}/deb,${build.working_folder}/rpm" param="filename" absparam="absfilename" target="delete_me">
         </foreach>
diff --git a/dist/php/6.5.1-extractArchive-post.php b/dist/php/6.5.1-extractArchive-post.php
new file mode 100644
index 0000000000..a158c9f8cc
--- /dev/null
+++ b/dist/php/6.5.1-extractArchive-post.php
@@ -0,0 +1,101 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+
+/**
+ * @param string $version
+ * @throws Exception
+ */
+function checkPhpVersion($version){
+    if(version_compare(PHP_VERSION, $version) < 0){
+        throw new Exception("For Pydio 7, PHP version must be greater or equal to $version, detected version is ".PHP_VERSION." - Upgrade aborted.");
+    }else{
+        echo "Checking Php Version (".PHP_VERSION.") : OK\n";
+    }
+}
+
+/**
+ * @param string $type
+ * @param string $name
+ * @throws Exception
+ */
+function checkPluginUsed($type, $name){
+
+    if($type === "conf"){
+        $p = ConfService::getConfStorageImpl();
+        if($p->getName() === $name){
+            throw new Exception("You are currently using $type.$name as configuration storage. This was deprecated in Pydio 6 and is now removed in Pydio7. Aborting upgrade");
+        }else{
+            echo "Checking plugin $type ($name) : OK\n";
+        }
+    }else if($type === "auth") {
+        $p = ConfService::getAuthDriverImpl();
+        if ($p->getName() === $name) {
+            throw new Exception("You are currently using $type.$name for authentication backend. This was deprecated in Pydio 6 and is now removed in Pydio7. Aborting upgrade");
+        } else {
+            if ($p->getName() === "multi") {
+                $drivers = $p->drivers;
+                if (isSet($drivers[$name])) {
+                    throw new Exception("You are currently using $type.$name for authentication backend. This was deprecated in Pydio 6 and is nowremoved in Pydio7. Aborting upgrade");
+                } else {
+                    echo "Checking plugin $type (" . implode(", ", array_keys($drivers)) . ") : OK\n";
+                }
+            }
+            echo "Checking plugin $type ($name) : OK\n";
+        }
+    }else if($type === "access"){
+
+        // Check if a workspace is currently using this plugin
+        echo "Should check usage of plugin $type ($name) in active workspaces : TODO\n";
+        
+
+    }else{
+        $plugs = AJXP_PluginsService::getInstance()->getActivePluginsForType($type);
+        if(isSet($plugs[$name])){
+            throw new Exception("You are currently using plugin $type.$name. This is removed in Pydio7. Please disable it before running upgrade. Aborting upgrade");
+        }
+        echo "Checking plugin $type ($name) : OK\n";
+    }
+
+}
+
+/**
+ * @param string $themeName
+ * @throws Exception
+ */
+function checkThemeUsed($themeName){
+
+    $p = AJXP_PluginsService::getInstance()->findPlugin("gui", "ajax");
+    $options = $p->getConfigs();
+    if(isSet($options["GUI_THEME"]) && $options["GUI_THEME"] === $themeName){
+        throw new Exception("You are currently using theme ".$options["GUI_THEME"]." which was removed from Pydio 7. If you want to be able to upgrade, you have to switch to Orbit theme. Aborting upgrade.");
+    }else{
+        echo "Checking usage of remove theme ($themeName): OK\n";
+    }
+
+}
+
+checkPhpVersion('5.5.9');
+checkPluginUsed("conf", "serial");
+checkPluginUsed("auth", "serial");
+checkPluginUsed("auth", "cmsms");
+checkPluginUsed("access", "remote_fs");
+checkThemeUsed("vision");
+checkThemeUsed("umbra");
\ No newline at end of file
diff --git a/dist/php/6.5.1.html b/dist/php/6.5.1.html
new file mode 100644
index 0000000000..bcb4189b7f
--- /dev/null
+++ b/dist/php/6.5.1.html
@@ -0,0 +1,13 @@
+<div style='font-family: "Open sans", "HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif; font-size: 13px;line-height: 1.5em;'
+     xmlns="http://www.w3.org/1999/html">
+
+    <h2>Pydio Core 6.5.1 - Beta1 for Pydio 7</h2>
+
+    This is the very first beta for next major release.
+    <p style="font-size: 14px;color: red;">
+        <b>Please update at your own risks!! Do not update servers that are live in production!</b>
+    </p>
+
+    If you want to participate to the beta program and get access to dedicated resources, please fill in <a target="_blank" href="https://pydio.typeform.com/to/hf6K4O">this small form</a>, we will be in contact soon.
+
+</div>
\ No newline at end of file
diff --git a/dist/php/6.5.1.mysql b/dist/php/6.5.1.mysql
new file mode 100644
index 0000000000..faef67ae1d
--- /dev/null
+++ b/dist/php/6.5.1.mysql
@@ -0,0 +1,32 @@
+DROP TABLE IF EXISTS ajxp_tasks;
+/* SEPARATOR */
+CREATE TABLE IF NOT EXISTS ajxp_tasks (
+    uid VARCHAR(255) NOT NULL ,
+    type INTEGER NOT NULL,
+    parent_uid VARCHAR(255) DEFAULT NULL,
+    flags INTEGER NOT NULL,
+    label VARCHAR(255) NOT NULL,
+    user_id VARCHAR(255) NOT NULL,
+    ws_id VARCHAR(32) NOT NULL,
+    status INTEGER NOT NULL,
+    status_msg VARCHAR(500) NOT NULL,
+    progress INTEGER NOT NULL,
+    schedule INTEGER NOT NULL,
+    schedule_value VARCHAR(255) DEFAULT NULL,
+    action VARCHAR(255) NOT NULL,
+    parameters VARCHAR(500) NOT NULL,
+    nodes VARCHAR(500) NOT NULL,
+    creation_date INTEGER NOT NULL DEFAULT 0,
+    status_update INTEGER NOT NULL DEFAULT 0,
+    PRIMARY KEY (uid)
+);
+/* SEPARATOR */
+CREATE INDEX ajxp_task_usr_idx ON ajxp_tasks (user_id);
+/* SEPARATOR */
+CREATE INDEX ajxp_task_status_idx ON ajxp_tasks (status);
+/* SEPARATOR */
+CREATE INDEX ajxp_task_type ON ajxp_tasks (type);
+/* SEPARATOR */
+CREATE INDEX ajxp_task_schedule ON ajxp_tasks (schedule);
+/* SEPARATOR */
+CREATE INDEX ajxp_task_nodes_idx ON ajxp_tasks (nodes);
\ No newline at end of file
diff --git a/dist/php/6.5.1.pgsql b/dist/php/6.5.1.pgsql
new file mode 100644
index 0000000000..f7db46d869
--- /dev/null
+++ b/dist/php/6.5.1.pgsql
@@ -0,0 +1,30 @@
+DROP TABLE IF EXISTS ajxp_tasks;
+
+CREATE TABLE IF NOT EXISTS ajxp_tasks (
+    uid VARCHAR(255) NOT NULL ,
+    type INTEGER NOT NULL,
+    parent_uid VARCHAR(255) DEFAULT NULL,
+    flags INTEGER NOT NULL,
+    label VARCHAR(255) NOT NULL,
+    user_id VARCHAR(255) NOT NULL,
+    ws_id VARCHAR(32) NOT NULL,
+    status INTEGER NOT NULL,
+    status_msg VARCHAR(500) NOT NULL,
+    progress INTEGER NOT NULL,
+    schedule INTEGER NOT NULL,
+    schedule_value VARCHAR(255) DEFAULT NULL,
+    action VARCHAR(255) NOT NULL,
+    parameters VARCHAR(500) NOT NULL,
+    nodes VARCHAR(500) NOT NULL,
+    creation_date INTEGER NOT NULL DEFAULT 0,
+    status_update INTEGER NOT NULL DEFAULT 0,
+
+    PRIMARY KEY (uid)
+);
+
+
+CREATE INDEX ajxp_task_usr_idx ON ajxp_tasks (user_id);
+CREATE INDEX ajxp_task_status_idx ON ajxp_tasks (status);
+CREATE INDEX ajxp_task_type ON ajxp_tasks (type);
+CREATE INDEX ajxp_task_schedule ON ajxp_tasks (schedule);
+CREATE INDEX ajxp_task_nodes_idx ON ajxp_tasks (nodes);
diff --git a/dist/php/6.5.1.php b/dist/php/6.5.1.php
new file mode 100644
index 0000000000..bf82fd43bd
--- /dev/null
+++ b/dist/php/6.5.1.php
@@ -0,0 +1,107 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+
+function updateSharePhpContent($installPath, $publicFolder){
+
+    $publicFolder = preg_replace("/^".str_replace(array("\\","/"), array("\\\\", "\/"), $installPath)."/", "", $publicFolder);
+    $sharePhpPath = $installPath."/".trim($publicFolder, "/")."/"."share.php";
+    if(!is_file($sharePhpPath)){
+        echo "No share.php file was found in public folder. If it does exist, you may have to manually upgrade its content.\n";
+        return;
+    }
+    echo "Upgrading content of $sharePhpPath file\n";
+    $folders = array_map(function($value){
+        return "..";
+    }, explode("/", trim($publicFolder, "/")));
+    $baseConfPath = implode("/", $folders);
+
+    $content = '
+    <?php
+        include_once("'.$baseConfPath.'/base.conf.php");
+        define(\'AJXP_EXEC\', true);
+        require_once AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/action.share/vendor/autoload.php";
+        $base = rtrim(dirname($_SERVER["SCRIPT_NAME"]), "/");
+        \Pydio\Share\ShareCenter::publicRoute($base, "/proxy", ["hash" => $_GET["hash"]]);    
+    ';
+    file_put_contents($sharePhpPath, $content);
+
+}
+
+function updateHtAccessContent($htAccessPath){
+
+    if(!is_file($htAccessPath)){
+        echo "No htaccess file found. Skipping Htaccess update.\n";
+        return;
+    }
+    echo "Upgrading content of Htaccess file\n";
+    $lines = file($htAccessPath, FILE_IGNORE_NEW_LINES);
+    $removeFlag = false;
+    $newLines = [];
+    // Remove unnecessary lines
+    foreach($lines as $index => $line){
+        if(!$removeFlag){
+            $newLines[] = $line;
+            if(trim($line) === "RewriteCond %{REQUEST_FILENAME} !-d"){
+                $removeFlag = true;
+            }
+        }else{
+            if(trim($line) === 'RewriteRule (.*) index.php [L]'){
+                $newLines[] = $line;
+                $removeFlag = false;
+            }
+        }
+    }
+    $contents = implode("\n", $newLines);
+    if(is_writable($htAccessPath)){
+        file_put_contents($htAccessPath, $contents);
+    }else{
+        echo "ERROR: Htaccess file could not be written. Update it manually to the following content: <pre>$contents</pre>";
+    }
+
+}
+
+function awsSdkVersion(){
+
+    $s3Options = ConfService::getConfStorageImpl()->loadPluginConfig("access", "s3");
+    if($s3Options["SDK_VERSION"] === "v2"){
+        $s3Options["SDK_VERSION"] = "v3";
+        ConfService::getConfStorageImpl()->savePluginConfig("access.s3", $s3Options);
+    }
+
+}
+
+function forceRenameConfFile($prefix){
+
+    // FORCE bootstrap_repositories copy
+    if (is_file(AJXP_INSTALL_PATH."/conf/$prefix.php".".new-".date("Ymd"))) {
+        rename(AJXP_INSTALL_PATH."/conf/$prefix.php", AJXP_INSTALL_PATH."/conf/$prefix.php.pre-update");
+        rename(AJXP_INSTALL_PATH."/conf/$prefix.php".".new-".date("Ymd"), AJXP_INSTALL_PATH."/conf/$prefix.php");
+    }
+
+
+}
+
+awsSdkVersion();
+updateHtAccessContent(AJXP_INSTALL_PATH."/.htaccess");
+updateSharePhpContent(AJXP_INSTALL_PATH, ConfService::getCoreConf("PUBLIC_DOWNLOAD_FOLDER"));
+forceRenameConfFile("bootstrap_conf");
+forceRenameConfFile("bootstrap_context");
+forceRenameConfFile("extensions.conf");
\ No newline at end of file
diff --git a/dist/php/6.5.1.sqlite b/dist/php/6.5.1.sqlite
new file mode 100644
index 0000000000..f7db46d869
--- /dev/null
+++ b/dist/php/6.5.1.sqlite
@@ -0,0 +1,30 @@
+DROP TABLE IF EXISTS ajxp_tasks;
+
+CREATE TABLE IF NOT EXISTS ajxp_tasks (
+    uid VARCHAR(255) NOT NULL ,
+    type INTEGER NOT NULL,
+    parent_uid VARCHAR(255) DEFAULT NULL,
+    flags INTEGER NOT NULL,
+    label VARCHAR(255) NOT NULL,
+    user_id VARCHAR(255) NOT NULL,
+    ws_id VARCHAR(32) NOT NULL,
+    status INTEGER NOT NULL,
+    status_msg VARCHAR(500) NOT NULL,
+    progress INTEGER NOT NULL,
+    schedule INTEGER NOT NULL,
+    schedule_value VARCHAR(255) DEFAULT NULL,
+    action VARCHAR(255) NOT NULL,
+    parameters VARCHAR(500) NOT NULL,
+    nodes VARCHAR(500) NOT NULL,
+    creation_date INTEGER NOT NULL DEFAULT 0,
+    status_update INTEGER NOT NULL DEFAULT 0,
+
+    PRIMARY KEY (uid)
+);
+
+
+CREATE INDEX ajxp_task_usr_idx ON ajxp_tasks (user_id);
+CREATE INDEX ajxp_task_status_idx ON ajxp_tasks (status);
+CREATE INDEX ajxp_task_type ON ajxp_tasks (type);
+CREATE INDEX ajxp_task_schedule ON ajxp_tasks (schedule);
+CREATE INDEX ajxp_task_nodes_idx ON ajxp_tasks (nodes);
diff --git a/dist/php/6.5.2-extractArchive-post.php b/dist/php/6.5.2-extractArchive-post.php
new file mode 100644
index 0000000000..f279e6832a
--- /dev/null
+++ b/dist/php/6.5.2-extractArchive-post.php
@@ -0,0 +1,103 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+
+/**
+ * @param string $version
+ * @throws Exception
+ */
+function checkPhpVersion($version){
+    if(version_compare(PHP_VERSION, $version) < 0){
+        throw new Exception("For Pydio 7, PHP version must be greater or equal to $version, detected version is ".PHP_VERSION." - Upgrade aborted.");
+    }else{
+        echo "Checking Php Version (".PHP_VERSION.") : OK\n";
+    }
+}
+
+/**
+ * @param string $type
+ * @param string $name
+ * @throws Exception
+ */
+function checkPluginUsed($type, $name){
+
+    if($type === "conf"){
+        $p = ConfService::getConfStorageImpl();
+        if($p->getName() === $name){
+            throw new Exception("You are currently using $type.$name as configuration storage. This was deprecated in Pydio 6 and is now removed in Pydio7. Aborting upgrade");
+        }else{
+            echo "Checking plugin $type ($name) : OK\n";
+        }
+    }else if($type === "auth") {
+        $p = ConfService::getAuthDriverImpl();
+        if ($p->getName() === $name) {
+            throw new Exception("You are currently using $type.$name for authentication backend. This was deprecated in Pydio 6 and is now removed in Pydio7. Aborting upgrade");
+        } else {
+            if ($p->getName() === "multi") {
+                $drivers = $p->drivers;
+                if (isSet($drivers[$name])) {
+                    throw new Exception("You are currently using $type.$name for authentication backend. This was deprecated in Pydio 6 and is nowremoved in Pydio7. Aborting upgrade");
+                } else {
+                    echo "Checking plugin $type (" . implode(", ", array_keys($drivers)) . ") : OK\n";
+                }
+            }
+            echo "Checking plugin $type ($name) : OK\n";
+        }
+    }else if($type === "access"){
+
+        // Check if a workspace is currently using this plugin
+        echo "Should check usage of plugin $type ($name) in active workspaces : TODO\n";
+        
+
+    }else{
+        $plugs = AJXP_PluginsService::getInstance()->getActivePluginsForType($type);
+        if(isSet($plugs[$name])){
+            throw new Exception("You are currently using plugin $type.$name. This is removed in Pydio7. Please disable it before running upgrade. Aborting upgrade");
+        }
+        echo "Checking plugin $type ($name) : OK\n";
+    }
+
+}
+
+/**
+ * @param string $themeName
+ * @throws Exception
+ */
+function checkThemeUsed($themeName){
+
+    $p = AJXP_PluginsService::getInstance()->findPlugin("gui", "ajax");
+    $options = $p->getConfigs();
+    if(isSet($options["GUI_THEME"]) && $options["GUI_THEME"] === $themeName){
+        throw new Exception("You are currently using theme ".$options["GUI_THEME"]." which was removed from Pydio 7. If you want to be able to upgrade, you have to switch to Orbit theme. Aborting upgrade.");
+    }else{
+        echo "Checking usage of remove theme ($themeName): OK\n";
+    }
+
+}
+
+checkPhpVersion('5.5.9');
+if(AJXP_VERSION === '6.4.2'){
+    checkPluginUsed("conf", "serial");
+    checkPluginUsed("auth", "serial");
+    checkPluginUsed("auth", "cmsms");
+    checkPluginUsed("access", "remote_fs");
+    checkThemeUsed("vision");
+    checkThemeUsed("umbra");
+}
diff --git a/dist/php/6.5.2.html b/dist/php/6.5.2.html
new file mode 100644
index 0000000000..0d3fad7750
--- /dev/null
+++ b/dist/php/6.5.2.html
@@ -0,0 +1,13 @@
+<div style='font-family: "Open sans", "HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif; font-size: 13px;line-height: 1.5em;'
+     xmlns="http://www.w3.org/1999/html">
+
+    <h2>Pydio Core 6.5.2 - Beta2 for Pydio 7</h2>
+
+    This is the second first beta for next major release.
+    <p style="font-size: 14px;color: red;">
+        <b>Please update at your own risks!! Do not update servers that are live in production!</b>
+    </p>
+
+    If you want to participate to the beta program and get access to dedicated resources, please fill in <a target="_blank" href="https://pydio.typeform.com/to/hf6K4O">this small form</a>, we will be in contact soon.
+
+</div>
\ No newline at end of file
diff --git a/dist/php/6.5.2.mysql b/dist/php/6.5.2.mysql
new file mode 100644
index 0000000000..4253554417
--- /dev/null
+++ b/dist/php/6.5.2.mysql
@@ -0,0 +1,40 @@
+/* SEPARATOR */
+DROP TABLE IF EXISTS ajxp_tasks;
+/* SEPARATOR */
+CREATE TABLE IF NOT EXISTS ajxp_tasks (
+    uid VARCHAR(255) NOT NULL ,
+    type INTEGER NOT NULL,
+    parent_uid VARCHAR(255) DEFAULT NULL,
+    flags INTEGER NOT NULL,
+    label VARCHAR(255) NOT NULL,
+    user_id VARCHAR(255) NOT NULL,
+    ws_id VARCHAR(32) NOT NULL,
+    status INTEGER NOT NULL,
+    status_msg VARCHAR(500) NOT NULL,
+    progress INTEGER NOT NULL,
+    schedule INTEGER NOT NULL,
+    schedule_value VARCHAR(255) DEFAULT NULL,
+    action VARCHAR(255) NOT NULL,
+    parameters VARCHAR(500) NOT NULL,
+    nodes VARCHAR(500) NOT NULL,
+    creation_date INTEGER NOT NULL DEFAULT 0,
+    status_update INTEGER NOT NULL DEFAULT 0,
+
+    PRIMARY KEY (uid)
+);
+/* SEPARATOR */
+CREATE INDEX ajxp_task_usr_idx ON ajxp_tasks (user_id);
+/* SEPARATOR */
+CREATE INDEX ajxp_task_status_idx ON ajxp_tasks (status);
+/* SEPARATOR */
+CREATE INDEX ajxp_task_type ON ajxp_tasks (type);
+/* SEPARATOR */
+CREATE INDEX ajxp_task_schedule ON ajxp_tasks (schedule);
+/* SEPARATOR */
+CREATE INDEX ajxp_task_nodes_idx ON ajxp_tasks (nodes);
+/* SEPARATOR */
+DROP TRIGGER IF EXISTS `LOG_UPDATE`;
+/* SEPARATOR */
+CREATE TRIGGER `LOG_UPDATE` AFTER UPDATE ON `ajxp_index`
+FOR EACH ROW INSERT INTO ajxp_changes (repository_identifier, node_id,source,target,type)
+  VALUES (new.repository_identifier, new.node_id, old.node_path, new.node_path, CASE old.node_path COLLATE utf8_bin = new.node_path COLLATE utf8_bin WHEN true THEN 'content' ELSE 'path' END);
\ No newline at end of file
diff --git a/dist/php/6.5.2.pgsql b/dist/php/6.5.2.pgsql
new file mode 100644
index 0000000000..09d1563f94
--- /dev/null
+++ b/dist/php/6.5.2.pgsql
@@ -0,0 +1,33 @@
+/* SEPARATOR */
+DROP TABLE IF EXISTS ajxp_tasks;
+/* SEPARATOR */
+CREATE TABLE IF NOT EXISTS ajxp_tasks (
+    uid VARCHAR(255) NOT NULL ,
+    type INTEGER NOT NULL,
+    parent_uid VARCHAR(255) DEFAULT NULL,
+    flags INTEGER NOT NULL,
+    label VARCHAR(255) NOT NULL,
+    user_id VARCHAR(255) NOT NULL,
+    ws_id VARCHAR(32) NOT NULL,
+    status INTEGER NOT NULL,
+    status_msg VARCHAR(500) NOT NULL,
+    progress INTEGER NOT NULL,
+    schedule INTEGER NOT NULL,
+    schedule_value VARCHAR(255) DEFAULT NULL,
+    action VARCHAR(255) NOT NULL,
+    parameters VARCHAR(500) NOT NULL,
+    nodes VARCHAR(500) NOT NULL,
+    creation_date INTEGER NOT NULL DEFAULT 0,
+    status_update INTEGER NOT NULL DEFAULT 0,
+    PRIMARY KEY (uid)
+);
+/* SEPARATOR */
+CREATE INDEX ajxp_task_usr_idx ON ajxp_tasks (user_id);
+/* SEPARATOR */
+CREATE INDEX ajxp_task_status_idx ON ajxp_tasks (status);
+/* SEPARATOR */
+CREATE INDEX ajxp_task_type ON ajxp_tasks (type);
+/* SEPARATOR */
+CREATE INDEX ajxp_task_schedule ON ajxp_tasks (schedule);
+/* SEPARATOR */
+CREATE INDEX ajxp_task_nodes_idx ON ajxp_tasks (nodes);
\ No newline at end of file
diff --git a/dist/php/6.5.2.php b/dist/php/6.5.2.php
new file mode 100644
index 0000000000..399913ca0f
--- /dev/null
+++ b/dist/php/6.5.2.php
@@ -0,0 +1,109 @@
+<?php
+/*
+ * Copyright 2007-2016 Abstrium <contact (at) pydio.com>
+ * This file is part of Pydio.
+ *
+ * Pydio is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Pydio 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Pydio.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The latest code can be found at <https://pydio.com/>.
+ */
+
+function updateSharePhpContent($installPath, $publicFolder){
+
+    $publicFolder = preg_replace("/^".str_replace(array("\\","/"), array("\\\\", "\/"), $installPath)."/", "", $publicFolder);
+    $sharePhpPath = $installPath."/".trim($publicFolder, "/")."/"."share.php";
+    if(!is_file($sharePhpPath)){
+        echo "No share.php file was found in public folder. If it does exist, you may have to manually upgrade its content.\n";
+        return;
+    }
+    echo "Upgrading content of $sharePhpPath file\n";
+    $folders = array_map(function($value){
+        return "..";
+    }, explode("/", trim($publicFolder, "/")));
+    $baseConfPath = implode("/", $folders);
+
+    $content = '<?php
+        include_once("'.$baseConfPath.'/base.conf.php");
+        define(\'AJXP_EXEC\', true);
+        require_once AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/action.share/vendor/autoload.php";
+        $base = rtrim(dirname($_SERVER["SCRIPT_NAME"]), "/");
+        \Pydio\Share\ShareCenter::publicRoute($base, "/proxy", ["hash" => $_GET["hash"]]);';
+    file_put_contents($sharePhpPath, $content);
+
+}
+
+function updateHtAccessContent($htAccessPath){
+
+    if(!is_file($htAccessPath)){
+        echo "No htaccess file found. Skipping Htaccess update.\n";
+        return;
+    }
+    echo "Upgrading content of Htaccess file\n";
+    $lines = file($htAccessPath, FILE_IGNORE_NEW_LINES);
+    $removeFlag = false;
+    $newLines = [];
+    // Remove unnecessary lines
+    foreach($lines as $index => $line){
+        if(!$removeFlag){
+            $newLines[] = $line;
+            if(trim($line) === "RewriteCond %{REQUEST_FILENAME} !-d"){
+                $removeFlag = true;
+            }
+        }else{
+            if(trim($line) === 'RewriteRule (.*) index.php [L]'){
+                $newLines[] = $line;
+                $removeFlag = false;
+            }
+        }
+    }
+    $contents = implode("\n", $newLines);
+    if(is_writable($htAccessPath)){
+        file_put_contents($htAccessPath, $contents);
+    }else{
+        echo "ERROR: Htaccess file could not be written. Update it manually to the following content: <pre>$contents</pre>";
+    }
+
+}
+
+function awsSdkVersion(){
+
+    $s3Options = ConfService::getConfStorageImpl()->loadPluginConfig("access", "s3");
+    if($s3Options["SDK_VERSION"] === "v2"){
+        $s3Options["SDK_VERSION"] = "v3";
+        ConfService::getConfStorageImpl()->savePluginConfig("access.s3", $s3Options);
+    }
+
+}
+
+function forceRenameConfFile($prefix){
+
+    // FORCE bootstrap_repositories copy
+    if (is_file(AJXP_INSTALL_PATH."/conf/$prefix.php".".new-".date("Ymd"))) {
+        rename(AJXP_INSTALL_PATH."/conf/$prefix.php", AJXP_INSTALL_PATH."/conf/$prefix.php.pre-update");
+        rename(AJXP_INSTALL_PATH."/conf/$prefix.php".".new-".date("Ymd"), AJXP_INSTALL_PATH."/conf/$prefix.php");
+    }
+
+
+}
+
+if(AJXP_VERSION === '6.4.2'){
+    awsSdkVersion();
+    updateHtAccessContent(AJXP_INSTALL_PATH."/.htaccess");
+    updateSharePhpContent(AJXP_INSTALL_PATH, ConfService::getCoreConf("PUBLIC_DOWNLOAD_FOLDER"));
+    forceRenameConfFile("bootstrap_conf");
+    forceRenameConfFile("bootstrap_context");
+    forceRenameConfFile("extensions.conf");
+}else if(AJXP_VERSION === '6.5.1'){
+    forceRenameConfFile("bootstrap_context");
+}
diff --git a/dist/php/6.5.2.sqlite b/dist/php/6.5.2.sqlite
new file mode 100644
index 0000000000..faef67ae1d
--- /dev/null
+++ b/dist/php/6.5.2.sqlite
@@ -0,0 +1,32 @@
+DROP TABLE IF EXISTS ajxp_tasks;
+/* SEPARATOR */
+CREATE TABLE IF NOT EXISTS ajxp_tasks (
+    uid VARCHAR(255) NOT NULL ,
+    type INTEGER NOT NULL,
+    parent_uid VARCHAR(255) DEFAULT NULL,
+    flags INTEGER NOT NULL,
+    label VARCHAR(255) NOT NULL,
+    user_id VARCHAR(255) NOT NULL,
+    ws_id VARCHAR(32) NOT NULL,
+    status INTEGER NOT NULL,
+    status_msg VARCHAR(500) NOT NULL,
+    progress INTEGER NOT NULL,
+    schedule INTEGER NOT NULL,
+    schedule_value VARCHAR(255) DEFAULT NULL,
+    action VARCHAR(255) NOT NULL,
+    parameters VARCHAR(500) NOT NULL,
+    nodes VARCHAR(500) NOT NULL,
+    creation_date INTEGER NOT NULL DEFAULT 0,
+    status_update INTEGER NOT NULL DEFAULT 0,
+    PRIMARY KEY (uid)
+);
+/* SEPARATOR */
+CREATE INDEX ajxp_task_usr_idx ON ajxp_tasks (user_id);
+/* SEPARATOR */
+CREATE INDEX ajxp_task_status_idx ON ajxp_tasks (status);
+/* SEPARATOR */
+CREATE INDEX ajxp_task_type ON ajxp_tasks (type);
+/* SEPARATOR */
+CREATE INDEX ajxp_task_schedule ON ajxp_tasks (schedule);
+/* SEPARATOR */
+CREATE INDEX ajxp_task_nodes_idx ON ajxp_tasks (nodes);
\ No newline at end of file
diff --git a/dist/scripts/tests/syntax.sh b/dist/scripts/tests/syntax.sh
index 5ec7eed9a9..693dc6fe4e 100755
--- a/dist/scripts/tests/syntax.sh
+++ b/dist/scripts/tests/syntax.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo -e "\e[1;34mChecking syntax error\e[00m"
-output=$(find . -name '*.php' -exec php --syntax-check {} \; | grep -v 'No syntax errors detected in')
+output=$(find . -type f \( -name '*.php' ! -name 'autoload_static.php' \) -exec php --syntax-check {} \; | grep -v 'No syntax errors detected in')
 if [[ $output ]]
 then 
     echo -e '\e[00;31mPlease check files syntax\e[00m'
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/.classpath b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/.classpath
deleted file mode 100644
index 30ec30393e..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/.classpath
+++ /dev/null
@@ -1,22 +0,0 @@
-<classpath>
-  <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
-  <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
-  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar" sourcepath="M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-io/1.3.2/commons-io-1.3.2.jar" sourcepath="M2_REPO/org/apache/commons/commons-io/1.3.2/commons-io-1.3.2-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.jar" sourcepath="M2_REPO/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar" sourcepath="M2_REPO/junit/junit/3.8.2/junit-3.8.2-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.5/spring-beans-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-beans/2.5/spring-beans-2.5-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/2.5/spring-context-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-context/2.5/spring-context-2.5-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context-support/2.5/spring-context-support-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-context-support/2.5/spring-context-support-2.5-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.5/spring-core-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-core/2.5/spring-core-2.5-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/2.5/spring-web-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-web/2.5/spring-web-2.5-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/springframework/spring-webmvc/2.5/spring-webmvc-2.5.jar" sourcepath="M2_REPO/org/springframework/spring-webmvc/2.5/spring-webmvc-2.5-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/tmatesoft/svnkit/1.1.2/svnkit-1.1.2.jar" sourcepath="M2_REPO/org/tmatesoft/svnkit/1.1.2/svnkit-1.1.2-sources.jar"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-</classpath>
\ No newline at end of file
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/.project b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/.project
deleted file mode 100644
index 307d7ded5f..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<projectDescription>
-  <name>org.argeo.ajaxplorer.jdrivers.core</name>
-  <comment>Sparta Web Application. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-  <projects/>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.wst.common.project.facet.core.builder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.wst.validation.validationbuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-    <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-    <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-  </natures>
-</projectDescription>
\ No newline at end of file
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/.settings/org.eclipse.jdt.core.prefs b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 746c1a5b4f..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Wed Feb 20 12:38:28 CET 2008
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/.settings/org.eclipse.wst.common.component b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index c4b2719b8a..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,51 +0,0 @@
-<project-modules id="moduleCoreId" project-version="2.0">
-  <wb-module deploy-name="org.argeo.ajaxplorer.jdrivers.core">
-    <property name="context-root" value="org.argeo.ajaxplorer.jdrivers.core"/>
-    <wb-resource deploy-path="/" source-path="src/main/webapp"/>
-    <property name="java-output-path" value="/target/classes"/>
-    <dependent-module archiveName="aopalliance-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="commons-fileupload-1.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-fileupload/commons-fileupload/1.2/commons-fileupload-1.2.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="commons-io-1.3.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/apache/commons/commons-io/1.3.2/commons-io-1.3.2.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="commons-logging-1.1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="ganymed-ssh2-build210.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="junit-3.8.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="log4j-1.2.14.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="spring-beans-2.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-beans/2.5/spring-beans-2.5.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="spring-context-2.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-context/2.5/spring-context-2.5.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="spring-context-support-2.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-context-support/2.5/spring-context-support-2.5.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="spring-core-2.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-core/2.5/spring-core-2.5.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="spring-web-2.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-web/2.5/spring-web-2.5.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="spring-webmvc-2.5.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/springframework/spring-webmvc/2.5/spring-webmvc-2.5.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <dependent-module archiveName="svnkit-1.1.2.jar" deploy-path="/WEB-INF/lib" handle="module:/classpath/var/M2_REPO/org/tmatesoft/svnkit/1.1.2/svnkit-1.1.2.jar">
-      <dependency-type>uses</dependency-type>
-    </dependent-module>
-    <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
-    <wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/resources"/>
-  </wb-module>
-</project-modules>
\ No newline at end of file
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/.settings/org.eclipse.wst.common.project.facet.core.xml b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index b325ba9fc5..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<faceted-project>
-  <fixed facet="jst.java"/>
-  <fixed facet="jst.web"/>
-  <installed facet="jst.web" version="2.5"/>
-  <installed facet="jst.java" version="5.0"/>
-</faceted-project>
\ No newline at end of file
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/pom.xml b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/pom.xml
deleted file mode 100644
index a7dfc9a672..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/pom.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.argeo.ajaxplorer.jdrivers</groupId>
-	<artifactId>org.argeo.ajaxplorer.jdrivers.core</artifactId>
-	<packaging>war</packaging>
-	<version>0.1-SNAPSHOT</version>
-	<description>Sparta Web Application</description>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-eclipse-plugin</artifactId>
-				<configuration>
-					<wtpversion>2.0</wtpversion>
-					<downloadSources>true</downloadSources>
-					<workspace>C:\mbaudier\workspace</workspace>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
-				</configuration>
-			</plugin>
-			<!-- 
-				<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-				<execution>
-				<id>copy-dependencies</id>
-				<phase>package</phase>
-				<goals>
-				<goal>copy-dependencies</goal>
-				</goals>
-				<configuration>
-				<outputDirectory>
-				src/main/webapp/WEB-INF/lib
-				</outputDirectory>
-				</configuration>
-				</execution>
-				</executions>
-				
-				</plugin>
-			-->
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.14</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>1.3.2</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-fileupload</groupId>
-			<artifactId>commons-fileupload</artifactId>
-			<version>1.2</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>2.5</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-			<version>2.5</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.tmatesoft</groupId>
-			<artifactId>svnkit</artifactId>
-			<version>1.1.2</version>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>3.8.2</version>
-		</dependency>
-
-	</dependencies>
-	<repositories>
-		<repository>
-			<id>central</id>
-			<url>http://www.argeo.org/maven/proxy</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</releases>
-		</repository>
-		<!-- 
-		<repository>
-			<id>apache.snapshots</id>
-			<url>
-				http://people.apache.org/maven-snapshot-repository/
-			</url>
-		</repository>
-		<repository>
-			<id>eclipse</id>
-			<url>http://repo1.maven.org/eclipse</url>
-		</repository>
-		<repository>
-			<id>codehaus</id>
-			<url>http://repository.codehaus.org</url>
-		</repository>
-		 -->
-	</repositories>
-	<!-- 
-	<pluginRepositories>
-		<pluginRepository>
-			<id>apache.snapshots</id>
-			<url>
-				http://people.apache.org/maven-snapshot-repository/
-			</url>
-		</pluginRepository>
-	</pluginRepositories> -->
-</project>
\ No newline at end of file
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/AjxpAction.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/AjxpAction.java
deleted file mode 100644
index d37bb4a534..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/AjxpAction.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.argeo.ajaxplorer.jdrivers;
-
-import javax.servlet.http.HttpServletRequest;
-
-public interface AjxpAction<T extends AjxpDriver>{
-	public AjxpAnswer execute(T driver, HttpServletRequest request);
-}
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/AjxpAnswer.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/AjxpAnswer.java
deleted file mode 100644
index 62ec9eaa1f..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/AjxpAnswer.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.argeo.ajaxplorer.jdrivers;
-
-import javax.servlet.http.HttpServletResponse;
-
-public interface AjxpAnswer {
-	public static AjxpAnswer DO_NOTHING = new AjxpAnswer(){
-		public void updateResponse(HttpServletResponse response) {
-		}
-	};
-
-	public void updateResponse(HttpServletResponse response);
-}
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/AjxpDriver.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/AjxpDriver.java
deleted file mode 100644
index e950d13227..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/AjxpDriver.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.argeo.ajaxplorer.jdrivers;
-
-import javax.servlet.http.HttpServletRequest;
-
-public interface AjxpDriver {
-	public AjxpAnswer executeAction(HttpServletRequest request); 
-}
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/AjxpDriverException.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/AjxpDriverException.java
deleted file mode 100644
index 8882b551f5..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/AjxpDriverException.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.argeo.ajaxplorer.jdrivers;
-
-public class AjxpDriverException extends RuntimeException {
-	static final long serialVersionUID = 1l;
-
-	public AjxpDriverException(String arg0) {
-		super(arg0);
-	}
-
-	public AjxpDriverException(String arg0, Throwable arg1) {
-		super(arg0, arg1);
-	}
-
-}
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/SimpleAjxpDriver.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/SimpleAjxpDriver.java
deleted file mode 100644
index ae28ad94ee..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/SimpleAjxpDriver.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.argeo.ajaxplorer.jdrivers;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-public class SimpleAjxpDriver implements AjxpDriver {
-	protected final Log log = LogFactory.getLog(getClass());
-	private Map<String, AjxpAction<? extends AjxpDriver>> actions = new TreeMap<String, AjxpAction<? extends AjxpDriver>>();
-
-	public AjxpAnswer executeAction(HttpServletRequest request) {
-		String actionStr = request.getParameter("get_action");
-		if (actionStr == null) {
-			actionStr = request.getParameter("action");
-		}
-		if (!actions.containsKey(actionStr)) {
-			throw new AjxpDriverException("Action " + actionStr
-					+ " not defined.");
-		}
-		AjxpAction action = actions.get(actionStr);
-		return action.execute(this,request);
-	}
-
-	public void setActions(Map<String, AjxpAction<? extends AjxpDriver>> actions) {
-		this.actions = actions;
-	}
-
-}
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/AbstractFileDownloadAction.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/AbstractFileDownloadAction.java
deleted file mode 100644
index eac735156d..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/AbstractFileDownloadAction.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.argeo.ajaxplorer.jdrivers.file;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-
-import org.argeo.ajaxplorer.jdrivers.AjxpAnswer;
-import org.argeo.ajaxplorer.jdrivers.AjxpDriverException;
-
-public abstract class AbstractFileDownloadAction extends FileAction {
-	public AjxpAnswer execute(FileDriver driver, HttpServletRequest request) {
-		String fileStr = request.getParameter(getFileParameter());
-		if (fileStr == null) {
-			throw new AjxpDriverException(
-					"A  file to download needs to be provided.");
-		}
-		File file = new File(driver.getBasePath() + fileStr);
-		return new AxpBasicDownloadAnswer(file);
-	}
-
-	/** Return 'file' by default. */
-	protected String getFileParameter() {
-		return "file";
-	}
-
-	/** To be overridden. Do nothing by default. */
-	protected void setHeaders(HttpServletResponse response, File file) {
-		// do nothing
-	}
-
-	protected class AxpBasicDownloadAnswer implements AjxpAnswer {
-		private final File file;
-
-		public AxpBasicDownloadAnswer(File file) {
-			this.file = file;
-		}
-
-		public void updateResponse(HttpServletResponse response) {
-			InputStream in = null;
-			OutputStream out = null;
-			try {
-				setHeaders(response, file);
-
-				if (log.isDebugEnabled())
-					log.debug("Download file " + file);
-				in = FileUtils.openInputStream(file);
-				out = response.getOutputStream();
-
-				copyFile(in, out);
-				out.flush();
-
-			} catch (Exception e) {
-				e.printStackTrace();
-				throw new AjxpDriverException("Cannot download file " + file, e);
-			} finally {
-				IOUtils.closeQuietly(in);
-				IOUtils.closeQuietly(out);
-			}
-
-		}
-
-		protected void copyFile(InputStream in, OutputStream out)
-				throws Exception {
-			IOUtils.copy(in, out);
-		}
-
-	}
-}
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/AjxpFile.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/AjxpFile.java
deleted file mode 100644
index 4f4aecc3e0..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/AjxpFile.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package org.argeo.ajaxplorer.jdrivers.file;
-
-import java.io.File;
-import java.net.URLEncoder;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.argeo.ajaxplorer.jdrivers.AjxpDriverException;
-
-public class AjxpFile {
-	private final static Log log = LogFactory.getLog(AjxpFile.class);
-
-	// FIXME: more generic modif time format?
-	private final static SimpleDateFormat sdf = new SimpleDateFormat(
-			"dd/MM/yyyy hh:mm");
-
-	private final File file;
-	private final String parentPath;
-	private final String filePath;
-
-	private final String ext;
-	private final FileType type;
-
-	public AjxpFile(File file, String parentPath) {
-		this.file = file;
-		this.parentPath = parentPath;
-		if (parentPath.equals("/")) {
-			this.filePath = "/" + file.getName();
-		} else {
-			this.filePath = parentPath + "/" + file.getName();
-		}
-		this.ext = file.isDirectory() ? null : file.getName().substring(
-				file.getName().indexOf('.') + 1);
-		this.type = FileType.findType(ext);
-	}
-
-	public String toXml(final LsMode mode, final String encoding) {
-		try {
-			StringBuffer buf = new StringBuffer();
-			buf.append("<tree");
-			addAttr("text", file.getName(), buf);
-			if (type != FileType.FOLDER) {
-				if (mode == LsMode.SEARCH)
-					addAttr("is_file", "true", buf);// FIXME: consistent value?
-				else if (mode == LsMode.FILE_LIST) {
-					addAttr("filename", filePath, buf);
-					addAttr("is_file", "1", buf);
-					addAttr("icon", type.getIcon(), buf);
-
-					addAttr("modiftime", formatModifTime(), buf);
-					addAttr("mimestring", type.getMimeString(), buf);
-					addAttr("filesize", formatFileSize(), buf);
-
-					if (type.isImage()) {
-						addAttr("is_image", "1", buf);
-						addAttr("image_type", type.getImageType(), buf);
-						addAttr("image_width", "100", buf);// FIXME: read image
-						addAttr("image_height", "100", buf);// FIXME: read image
-
-					} else {
-						addAttr("is_image", "0", buf);
-					}
-				}
-
-			} else {// dir
-				if (mode == LsMode.NULL || mode == LsMode.FILE_LIST) {
-					addAttr("filename", filePath, buf);
-					if (mode == LsMode.NULL) {
-						addAttr("icon", "client/images/foldericon.png", buf);
-						addAttr("openicon", "client/images/openfoldericon.png",
-								buf);
-						addAttr("parentName", parentPath, buf);
-						addAttr("src", "content.php?dir="
-								+ URLEncoder.encode(filePath, encoding), buf);
-						addAttr(
-								"action",
-								"javascript:ajaxplorer.getFoldersTree().clickNode(CURRENT_ID)",
-								buf);
-					} else if (mode == LsMode.FILE_LIST) {
-						addAttr("icon", type.getIcon(), buf);// FIXME:
-						// consistent?
-						addAttr("is_file", "0", buf);
-						addAttr("is_image", "0", buf);
-						addAttr("mimestring", "Directory", buf);
-						addAttr("modiftime", formatModifTime(), buf);
-						addAttr("filesize", "-", buf);
-					}
-				}
-
-			}
-
-			addAdditionalAttrs(buf, mode, encoding);
-
-			buf.append("/>");
-
-			if (log.isTraceEnabled())
-				log.trace(buf.toString());
-
-			return buf.toString();
-		} catch (Exception e) {
-			throw new AjxpDriverException("Could not serialize file " + file, e);
-		}
-	}
-
-	private String formatModifTime() {
-		return sdf.format(new Date(file.lastModified()));
-	}
-
-	private String formatFileSize() {
-		return (file.length() / 1024) + " Kb";
-	}
-
-	protected void addAttr(String attrName, String attrValue, StringBuffer buf) {
-		buf.append(" ").append(attrName).append("=\"").append(attrValue)
-				.append("\"");
-	}
-
-	/** To be overridden, do nothing by default. */
-	protected void addAdditionalAttrs(final StringBuffer buf,
-			final LsMode mode, final String encoding) {
-
-	}
-}
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/FileAction.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/FileAction.java
deleted file mode 100644
index d8a14c6d03..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/FileAction.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.argeo.ajaxplorer.jdrivers.file;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.ajaxplorer.jdrivers.AjxpAction;
-
-public abstract class FileAction implements AjxpAction<FileDriver> {
-	protected final Log log = LogFactory.getLog(getClass());
-}
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/FileDeleteAction.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/FileDeleteAction.java
deleted file mode 100644
index bd9e92f351..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/FileDeleteAction.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.argeo.ajaxplorer.jdrivers.file;
-
-import java.io.File;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.argeo.ajaxplorer.jdrivers.AjxpAnswer;
-
-public class FileDeleteAction<T extends FileDriver> extends FileAction {
-
-	public AjxpAnswer execute(FileDriver driver, HttpServletRequest request) {
-		Map<Object, Object> params = request.getParameterMap();
-		for (Object paramKey : params.keySet()) {
-			String param = paramKey.toString();
-			log.debug("param=" + param + " (" + params.get(paramKey));
-			if (param.length() < 4)
-				continue;
-			else {
-
-				if (param.substring(0, 4).equals("file")) {
-					String[] values = (String[]) params.get(paramKey);
-					for (String path : values) {
-						File file = driver.getFile(path);
-						executeDelete((T) driver, file);
-					}
-				}
-			}
-		}
-
-		return AjxpAnswer.DO_NOTHING;
-	}
-
-	protected void executeDelete(T driver, File file) {
-		log.debug("Delete file " + file);
-		file.delete();
-	}
-
-}
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/FileDownloadAction.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/FileDownloadAction.java
deleted file mode 100644
index 4a10450dd6..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/FileDownloadAction.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.argeo.ajaxplorer.jdrivers.file;
-
-import java.io.File;
-
-import javax.servlet.http.HttpServletResponse;
-
-public class FileDownloadAction extends AbstractFileDownloadAction {
-
-	@Override
-	protected void setHeaders(HttpServletResponse response, File file) {
-		setDefaultDownloadHeaders(response, file.getName(), file.length());
-	}
-
-	public static void setDefaultDownloadHeaders(HttpServletResponse response,
-			String fileName, Long fileLength) {
-		response.setContentType("application/force-download; name=\""
-				+ fileName + "\"");
-		response.setHeader("Content-Transfer-Encoding", "binary");
-		if (fileLength != null)
-			response.setContentLength(fileLength.intValue());
-		response.setHeader("Content-Disposition", "attachement; filename=\""
-				+ fileName + "\"");
-		response.setHeader("Expires", "0");
-		response.setHeader("Cache-Control", "no-cache, must-revalidate");
-		response.setHeader("Pragma", "no-cache");
-	}
-}
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/FileDriver.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/FileDriver.java
deleted file mode 100644
index 73180afa27..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/FileDriver.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.argeo.ajaxplorer.jdrivers.file;
-
-import java.io.File;
-
-import org.argeo.ajaxplorer.jdrivers.SimpleAjxpDriver;
-
-public class FileDriver extends SimpleAjxpDriver{
-	private String basePath;
-	private String encoding = "UTF-8";
-
-	public String getBasePath() {
-		return basePath;
-	}
-	
-	public File getBaseDir(){
-		return new File(getBasePath());
-	}
-
-	public void setBasePath(String basePath) {
-		if (basePath.charAt(basePath.length() - 1) != File.separatorChar)
-			basePath = basePath + File.separatorChar;
-		this.basePath = basePath;
-	}
-
-	public String getEncoding() {
-		return encoding;
-	}
-
-	public void setEncoding(String encoding) {
-		this.encoding = encoding;
-	}
-
-	public File getFile(String relpath) {
-		return new File(getBasePath() + relpath).getAbsoluteFile();
-	}
-
-	public File getFile(String dir, String fileName) {
-		return getFile(dir + File.separator + fileName);
-	}
-}
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/FileImageProxyAction.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/FileImageProxyAction.java
deleted file mode 100644
index 963ffc6c5d..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/FileImageProxyAction.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.argeo.ajaxplorer.jdrivers.file;
-
-import java.io.File;
-
-import javax.servlet.http.HttpServletResponse;
-
-public class FileImageProxyAction extends AbstractFileDownloadAction {
-
-	@Override
-	protected void setHeaders(HttpServletResponse response, File file) {
-		FileType fileType = FileType.findType(file);
-		response.setContentType(fileType.getImageType());
-		response.setContentLength((int) file.length());
-		response.setHeader("Cache-Control", "public");
-	}
-
-}
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/FileLsAction.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/FileLsAction.java
deleted file mode 100644
index 95e18bdb96..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/FileLsAction.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package org.argeo.ajaxplorer.jdrivers.file;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.OutputStreamWriter;
-import java.util.List;
-import java.util.Vector;
-
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.io.IOUtils;
-
-import org.argeo.ajaxplorer.jdrivers.AjxpAnswer;
-import org.argeo.ajaxplorer.jdrivers.AjxpDriverException;
-
-public class FileLsAction<T extends FileDriver, F extends AjxpFile> extends FileAction {
-
-	public AjxpAnswer execute(FileDriver driver, HttpServletRequest request) {
-		String modeStr = request.getParameter("mode");
-		final LsMode mode;
-		if (modeStr == null)
-			mode = LsMode.NULL;
-		else if (modeStr.equals("complete"))
-			mode = LsMode.COMPLETE;
-		else if (modeStr.equals("file_list"))
-			mode = LsMode.FILE_LIST;
-		else if (modeStr.equals("search"))
-			mode = LsMode.SEARCH;
-		else
-			throw new AjxpDriverException("Unkown mode " + modeStr);
-
-		String path = request.getParameter("dir");
-		if (path == null) {
-			path = "/";
-		}
-
-		boolean dirOnly = false;
-		if (mode == LsMode.NULL || mode == LsMode.COMPLETE) {
-			dirOnly = true;
-		}
-
-		List<F> ajxpFiles = listFiles((T)driver, path, dirOnly);
-		/*
-		 * File[] files = dir.listFiles(createFileFilter(request, dir)); List<AjxpFile>
-		 * ajxpFiles = new Vector<AjxpFile>(); for (File file : files) { if
-		 * (file.isDirectory()) { ajxpFiles.add(new AjxpFile(file, path)); }
-		 * else { if (!dirOnly) ajxpFiles.add(new AjxpFile(file, path)); } }
-		 */
-		return new AxpLsAnswer(driver, ajxpFiles, mode);
-	}
-
-	protected List<F> listFiles(T driver,
-			String path, boolean dirOnly) {
-		File dir = driver.getFile(path);
-
-		if (!dir.exists())
-			throw new AjxpDriverException("Dir " + dir + " does not exist.");
-
-		FileFilter filter = createFileFilter(dir);
-		File[] files = dir.listFiles(filter);
-		List<F> ajxpFiles = new Vector<F>();
-		for (File file : files) {
-			if (file.isDirectory()) {
-				ajxpFiles.add((F)new AjxpFile(file, path));
-			} else {
-				if (!dirOnly)
-					ajxpFiles.add((F)new AjxpFile(file, path));
-			}
-		}
-		return ajxpFiles;
-	}
-
-	/** To be overridden. Accept all by default. */
-	protected FileFilter createFileFilter(File dir) {
-		return new FileFilter() {
-			public boolean accept(File pathname) {
-				return true;
-			}
-
-		};
-	}
-
-	protected class AxpLsAnswer implements AjxpAnswer {
-		private final List<F> files;
-		private final LsMode mode;
-		private final FileDriver driver;
-
-		public AxpLsAnswer(FileDriver driver, List<F> files, LsMode mode) {
-			this.files = files;
-			this.mode = mode;
-			this.driver = driver;
-		}
-
-		public void updateResponse(HttpServletResponse response) {
-			final String encoding = driver.getEncoding();
-			response.setCharacterEncoding(encoding);
-			response.setContentType("text/xml");
-
-			ServletOutputStream out = null;
-			OutputStreamWriter writer = null;
-			try {
-				out = response.getOutputStream();
-				writer = new OutputStreamWriter(out, encoding);
-				writer.write("<?xml version=\"1.0\" encoding=\"" + encoding
-						+ "\"?>");
-				// TODO add current path
-				writer.write("<tree>");
-				for (AjxpFile file : files) {
-					writer.write(file.toXml(mode, encoding));
-				}
-				writer.write("</tree>");
-				writer.flush();
-
-			} catch (Exception e) {
-				throw new AjxpDriverException("Could not write response.", e);
-			} finally {
-				IOUtils.closeQuietly(writer);
-				IOUtils.closeQuietly(out);
-			}
-		}
-
-	}
-}
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/FileMkdirAction.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/FileMkdirAction.java
deleted file mode 100644
index d1735a7861..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/FileMkdirAction.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.argeo.ajaxplorer.jdrivers.file;
-
-import java.io.File;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.argeo.ajaxplorer.jdrivers.AjxpAnswer;
-
-public class FileMkdirAction<T extends FileDriver> extends FileAction {
-
-	public AjxpAnswer execute(FileDriver driver,
-			HttpServletRequest request) {
-		String dir = request.getParameter("dir");
-		String dirName = request.getParameter("dirname");
-
-		File newDir = driver.getFile(dir, dirName);
-		newDir.mkdirs();
-
-		postProcess((T)driver,newDir);
-
-		return AjxpAnswer.DO_NOTHING;
-	}
-
-	protected void postProcess(T driver,File newDir) {
-
-	}
-}
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/FileType.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/FileType.java
deleted file mode 100644
index f0305267dc..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/FileType.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.argeo.ajaxplorer.jdrivers.file;
-
-import java.io.File;
-
-import org.argeo.ajaxplorer.jdrivers.AjxpDriverException;
-
-public enum FileType {
-	FOLDER("folder.png", "Directory"), UNKNOWN("mime_empty.png", "Unkown"), GIF(
-			"image.png", "GIF Picture"), JPEG("image.png", "JPEG Picture"), PNG(
-			"image.png", "PNG Picture");
-
-	private final String icon;
-	private final String mimeString;
-
-	FileType(String icon, String mimeString) {
-		this.icon = icon;
-		this.mimeString = mimeString;
-	}
-
-	public String getIcon() {
-		return icon;
-	}
-
-	public String getMimeString() {
-		return mimeString;
-	}
-
-	public boolean isImage() {
-		return this == GIF || this == JPEG || this == PNG;
-	}
-
-	public String getImageType() {
-		switch (this) {
-		case GIF:
-			return "image/gif";
-		case JPEG:
-			return "image/jpeg";
-		case PNG:
-			return "image/png";
-		}
-		throw new AjxpDriverException("Image type undefined for " + this);
-	}
-
-	public static FileType findType(File file) {
-		String ext = file.isDirectory() ? null : file.getName().substring(
-				file.getName().indexOf('.') + 1);
-		return findType(ext);
-	}
-
-	/**
-	 * Find the type based on the extension.
-	 * 
-	 * @param ext
-	 *            the extension, null for a directory
-	 */
-	public static FileType findType(String extArg) {
-		if (extArg == null)
-			return FOLDER;
-
-		String ext = extArg.toLowerCase();
-		if (ext.equals("jpg") || ext.equals("jpeg"))
-			return JPEG;
-		else if (ext.equals("gif"))
-			return GIF;
-		else if (ext.equals("png"))
-			return PNG;
-		else
-			return UNKNOWN;
-	}
-}
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/FileUploadAction.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/FileUploadAction.java
deleted file mode 100644
index 6600deb026..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/FileUploadAction.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.argeo.ajaxplorer.jdrivers.file;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.io.IOUtils;
-import org.argeo.ajaxplorer.jdrivers.AjxpAnswer;
-import org.argeo.ajaxplorer.jdrivers.AjxpDriverException;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-
-public class FileUploadAction<T extends FileDriver> extends FileAction {
-
-	public AjxpAnswer execute(FileDriver driver, HttpServletRequest request) {
-		if (!(request instanceof MultipartHttpServletRequest)) {
-			throw new AjxpDriverException(
-					"Cann only deal with MultipartHttpServletRequest");
-		}
-		MultipartHttpServletRequest mpr = (MultipartHttpServletRequest) request;
-		String dir = mpr.getParameter("dir");
-		String fileName = mpr.getParameter("Filename");
-
-		InputStream in = null;
-		OutputStream out = null;
-		File file = null;
-		try {
-			MultipartFile mpfile = mpr.getFile("Filedata");
-			in = mpfile.getInputStream();
-			file = driver.getFile(dir, fileName);
-			out = new FileOutputStream(file);
-			IOUtils.copy(in, out);
-		} catch (IOException e) {
-			throw new AjxpDriverException("Cannot upload file.", e);
-		} finally {
-			IOUtils.closeQuietly(in);
-			IOUtils.closeQuietly(out);
-		}
-		postProcess((T)driver, file);
-
-		return AjxpAnswer.DO_NOTHING;
-	}
-
-	protected void postProcess(T driver,File file) {
-
-	}
-
-}
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/LsMode.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/LsMode.java
deleted file mode 100644
index 57988e103a..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/file/LsMode.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.argeo.ajaxplorer.jdrivers.file;
-
-public enum LsMode {
-	NULL, COMPLETE, FILE_LIST, SEARCH
-}
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/svn/SvnAjxpFile.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/svn/SvnAjxpFile.java
deleted file mode 100644
index b5a84dff96..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/svn/SvnAjxpFile.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.argeo.ajaxplorer.jdrivers.svn;
-
-import org.tmatesoft.svn.core.wc.SVNInfo;
-
-import org.argeo.ajaxplorer.jdrivers.file.AjxpFile;
-import org.argeo.ajaxplorer.jdrivers.file.LsMode;
-
-public class SvnAjxpFile extends AjxpFile {
-
-	protected final SVNInfo info;
-
-	public SvnAjxpFile(SVNInfo info, String parentPath) {
-		super(info.getFile(), parentPath);
-		this.info = info;
-	}
-
-	@Override
-	protected void addAdditionalAttrs(StringBuffer buf, LsMode mode,
-			String encoding) {
-		addAttr("author", info.getAuthor(), buf);
-		addAttr("revision", Long.toString(info.getRevision().getNumber()), buf);
-	}
-
-}
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/svn/SvnDeleteAction.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/svn/SvnDeleteAction.java
deleted file mode 100644
index 8e6affa019..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/svn/SvnDeleteAction.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.argeo.ajaxplorer.jdrivers.svn;
-
-import java.io.File;
-
-import org.tmatesoft.svn.core.SVNException;
-
-import org.argeo.ajaxplorer.jdrivers.AjxpDriverException;
-import org.argeo.ajaxplorer.jdrivers.file.FileDeleteAction;
-
-public class SvnDeleteAction extends FileDeleteAction<SvnDriver> {
-	@Override
-	protected void executeDelete(SvnDriver driver, File file) {
-		try {
-			driver.beginWriteAction(file.getParentFile());
-
-			log.debug("SVN Delete: " + file);
-			driver.getManager().getWCClient().doDelete(file, true, false);
-
-			driver.commitAll("Commit delete of " + file.getName());
-			driver.completeWriteAction(file.getParentFile());
-		} catch (SVNException e) {
-			throw new AjxpDriverException("Cannot delete file " + file, e);
-		} finally {
-			driver.rollbackWriteAction(file.getParentFile());
-		}
-	}
-
-}
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/svn/SvnDownloadAction.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/svn/SvnDownloadAction.java
deleted file mode 100644
index 89558f293d..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/svn/SvnDownloadAction.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.argeo.ajaxplorer.jdrivers.svn;
-
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.tmatesoft.svn.core.io.SVNRepository;
-
-import org.apache.commons.io.IOUtils;
-
-import org.argeo.ajaxplorer.jdrivers.AjxpAction;
-import org.argeo.ajaxplorer.jdrivers.AjxpAnswer;
-import org.argeo.ajaxplorer.jdrivers.AjxpDriverException;
-import org.argeo.ajaxplorer.jdrivers.file.FileDownloadAction;
-
-public class SvnDownloadAction implements AjxpAction<SvnDriver> {
-
-	public AjxpAnswer execute(SvnDriver driver, HttpServletRequest request) {
-		String path = request.getParameter("file");
-		if (path.charAt(path.length() - 1) == '/') {
-			// probably a directory
-			return AjxpAnswer.DO_NOTHING;
-		}
-
-		String revStr = request.getParameter("rev");
-		Long rev = Long.parseLong(revStr);
-		return new SvnDownloadAnswer(driver, path, rev);
-	}
-
-	public class SvnDownloadAnswer implements AjxpAnswer {
-		private final SvnDriver driver;
-		private final String path;
-		private final Long rev;
-
-		public SvnDownloadAnswer(SvnDriver driver, String path, Long rev) {
-			this.driver = driver;
-			this.path = path;
-			this.rev = rev;
-		}
-
-		public void updateResponse(HttpServletResponse response) {
-			ServletOutputStream out = null;
-			try {
-				FileDownloadAction.setDefaultDownloadHeaders(response,
-						getFileName(), null);
-				response.setHeader("AjaXplorer-SvnFileName", getFileName());
-
-				SVNRepository repository = driver.getRepository();
-				out = response.getOutputStream();
-				repository.getFile(path, rev, null, out);
-			} catch (Exception e) {
-				throw new AjxpDriverException("Cannot download revision " + rev
-						+ " of path " + path, e);
-			} finally {
-				IOUtils.closeQuietly(out);
-			}
-		}
-
-		protected String getFileName() {
-			int lastIndexSlash = path.lastIndexOf('/');
-			final String origFileName;
-			if (lastIndexSlash != -1) {
-				origFileName = path.substring(lastIndexSlash + 1);
-			} else {
-				origFileName = path;
-			}
-
-			int lastIndexPoint = origFileName.lastIndexOf('.');
-			String prefix = origFileName.substring(0, lastIndexPoint);
-			String ext = origFileName.substring(lastIndexPoint);
-			return prefix + "-" + rev + ext;
-		}
-	}
-}
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/svn/SvnDriver.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/svn/SvnDriver.java
deleted file mode 100644
index 40eea98288..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/svn/SvnDriver.java
+++ /dev/null
@@ -1,250 +0,0 @@
-package org.argeo.ajaxplorer.jdrivers.svn;
-
-import java.io.File;
-
-import org.springframework.beans.factory.BeanNameAware;
-import org.tmatesoft.svn.core.SVNException;
-import org.tmatesoft.svn.core.SVNURL;
-import org.tmatesoft.svn.core.internal.io.fs.FSRepositoryFactory;
-import org.tmatesoft.svn.core.io.SVNRepository;
-import org.tmatesoft.svn.core.wc.SVNClientManager;
-import org.tmatesoft.svn.core.wc.SVNInfo;
-import org.tmatesoft.svn.core.wc.SVNRevision;
-import org.tmatesoft.svn.core.wc.admin.SVNAdminClient;
-
-import org.argeo.ajaxplorer.jdrivers.AjxpDriverException;
-import org.argeo.ajaxplorer.jdrivers.file.FileDriver;
-
-public class SvnDriver extends FileDriver implements BeanNameAware {
-	private final static String DEFAULT_DATA_PATH = System
-			.getProperty("user.home")
-			+ File.separator + "AjaXplorerArchiver" + File.separator + "data";
-
-	private final static long WRITE_ACTION_TIMEOUT = 10 * 60 * 1000;
-
-	private SVNURL baseUrl;
-	private SVNClientManager manager;
-
-	private String beanName;
-
-	private boolean isInWriteAction = false;
-
-	public void init() {
-		FSRepositoryFactory.setup();
-		manager = SVNClientManager.newInstance();
-
-		String basePath = getBasePath();
-		if (basePath != null) {
-			File baseDir = new File(basePath);
-			if (baseDir.exists()) {// base dir exists
-				boolean shouldCheckOut = baseDirChecks(baseDir);
-				if (shouldCheckOut) {
-					checkOut(baseDir);
-				}
-			} else {
-				checkOut(baseDir);
-			}
-		} else {
-			String defaultBasePath = DEFAULT_DATA_PATH + File.separator
-					+ "svnwc" + File.separator + beanName;
-			log.warn("No base path provided, use " + defaultBasePath);
-			setBasePath(defaultBasePath);
-
-			File baseDir = new File(getBasePath());
-			if (!baseDir.exists()) {
-				baseDir.mkdirs();
-			}
-
-			if (baseDirChecks(baseDir)) {
-				if (getBaseUrl() == null) {
-					String defaultRepoPath = DEFAULT_DATA_PATH + File.separator
-							+ "svnrepos" + File.separator + beanName;
-					log.warn("No base URL found, create repository at "
-							+ defaultRepoPath);
-					baseUrl = createRepository(new File(defaultRepoPath));
-				}
-				checkOut(new File(getBasePath()));
-			}
-		}
-		log.info("SVN driver initialized with base url " + getBaseUrl()
-				+ " and base path " + getBasePath());
-	}
-
-	/** Builds a SVN URL. */
-	public SVNURL getSVNURL(String relativePath) {
-		try {
-			return baseUrl.appendPath(relativePath, false);
-		} catch (SVNException e) {
-			throw new AjxpDriverException(
-					"Cannot build URL from relative path " + relativePath
-							+ " and base url " + baseUrl);
-		}
-	}
-
-	public SVNRepository getRepository() {
-		try {
-			return manager.createRepository(baseUrl, true);
-		} catch (SVNException e) {
-			throw new AjxpDriverException("Cannot create repository for "
-					+ baseUrl, e);
-		}
-	}
-
-	/**
-	 * Verifies that the provided existing base dir is ok and whether one should
-	 * check out. Set the base url from the working copy.
-	 * 
-	 * @return whether one should check out.
-	 */
-	protected boolean baseDirChecks(File baseDir) {
-		if (!baseDir.isDirectory()) {
-			throw new AjxpDriverException("Base path " + baseDir
-					+ " is not a directory.");
-		}
-
-		try {// retrieves SVN infos
-			SVNInfo info = manager.getWCClient().doInfo(baseDir,
-					SVNRevision.WORKING);
-			SVNURL baseUrlTemp = info.getURL();
-			if (baseUrl != null) {
-				if (!baseUrl.equals(baseUrlTemp)) {
-					throw new AjxpDriverException(
-							"SVN URL of the working copy "
-									+ baseUrlTemp
-									+ " is not compatible with provided baseUrl "
-									+ baseUrl);
-				}
-			} else {
-				this.baseUrl = baseUrlTemp;
-			}
-			return false;
-		} catch (SVNException e) {// no info retrieved
-			log
-					.warn("Could not retrieve SVN info from "
-							+ baseDir
-							+ "("
-							+ e.getMessage()
-							+ "). Guess that it is and empty dir and try to check out from provided URL.");
-			if (baseDir.listFiles().length != 0) {
-				throw new AjxpDriverException("Base dir " + baseDir
-						+ " is not a working copy and not an empty dir.");
-			}
-			return true;
-		}
-	}
-
-	protected void checkOut(File baseDir) {
-		if (getBaseUrl() == null) {
-			throw new AjxpDriverException(
-					"No SVN URL provided, cannot check out.");
-		}
-
-		// Make sure directory exists
-		baseDir.mkdirs();
-
-		try {
-			long revision = manager.getUpdateClient().doCheckout(getBaseUrl(),
-					baseDir, SVNRevision.UNDEFINED, SVNRevision.HEAD, true);
-			log.info("Checked out from " + baseUrl + " to " + baseDir
-					+ " at revision " + revision);
-		} catch (SVNException e) {
-			throw new AjxpDriverException("Cannot check out from " + baseUrl
-					+ " to " + baseDir, e);
-		}
-	}
-
-	protected SVNURL createRepository(File repoDir) {
-		try {
-			SVNAdminClient adminClient = manager.getAdminClient();
-			return adminClient.doCreateRepository(repoDir, null, true, false);
-		} catch (SVNException e) {
-			throw new AjxpDriverException("Cannot create repository at "
-					+ repoDir, e);
-		}
-	}
-
-	private void updateIfRequired(File dir) {
-		try {
-			SVNInfo wcInfo = manager.getWCClient().doInfo(getBaseDir(),
-					SVNRevision.WORKING);
-			SVNRevision wcRev = wcInfo.getRevision();
-			SVNInfo repoInfo = manager.getWCClient().doInfo(getBaseUrl(),
-					null, SVNRevision.HEAD);
-			SVNRevision repoRev = repoInfo.getRevision();
-
-			if (log.isTraceEnabled())
-				log
-						.trace("WC Revision=" + wcRev + ", Repo Revision="
-								+ repoRev);
-
-			if (!wcRev.equals(repoRev)) {
-				log.debug("Update working copy from revision " + wcRev
-						+ " to revision " + repoRev);
-				manager.getUpdateClient().doUpdate(getBaseDir(),
-						SVNRevision.HEAD, true);
-			}
-		} catch (SVNException e) {
-			throw new AjxpDriverException("Cannot update working copy "
-					+ getBaseDir(),e);
-		}
-	}
-
-	public synchronized void beginWriteAction(File dir) {
-		if (isInWriteAction) {
-			try {
-				wait(WRITE_ACTION_TIMEOUT);
-			} catch (InterruptedException e) {
-				// silent
-			}
-			if (isInWriteAction) {
-				throw new AjxpDriverException(
-						"Still in write action after timeout "
-								+ WRITE_ACTION_TIMEOUT + " ms.");
-			}
-		}
-
-		isInWriteAction = true;
-		updateIfRequired(dir);
-	}
-
-	public synchronized void completeWriteAction(File dir) {
-		isInWriteAction = false;
-		notifyAll();
-	}
-
-	public synchronized void rollbackWriteAction(File dir) {
-		// TODO: revert?
-		isInWriteAction = false;
-		notifyAll();
-	}
-	
-	public void commitAll(String message) throws SVNException{
-		if(log.isTraceEnabled())
-		log.trace("SVN Commit: " + getBaseDir());
-		manager.getCommitClient().doCommit(new File[] { getBaseDir() }, true,
-				message, true, true);
-
-	}
-
-	/** Spring bean name, set at initialization. */
-	public void setBeanName(String beanName) {
-		this.beanName = beanName;
-	}
-
-	public void setBaseUrl(String baseUrl) {
-		try {
-			this.baseUrl = SVNURL.parseURIDecoded(baseUrl);
-		} catch (SVNException e) {
-			throw new AjxpDriverException("Cannot parse SVN URL " + baseUrl, e);
-		}
-	}
-
-	public SVNURL getBaseUrl() {
-		return baseUrl;
-	}
-
-	public SVNClientManager getManager() {
-		return manager;
-	}
-
-}
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/svn/SvnLogAction.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/svn/SvnLogAction.java
deleted file mode 100644
index 773e97a513..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/svn/SvnLogAction.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.argeo.ajaxplorer.jdrivers.svn;
-
-import java.io.File;
-import java.io.PrintWriter;
-import java.text.SimpleDateFormat;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.tmatesoft.svn.core.ISVNLogEntryHandler;
-import org.tmatesoft.svn.core.SVNException;
-import org.tmatesoft.svn.core.SVNLogEntry;
-import org.tmatesoft.svn.core.SVNLogEntryPath;
-import org.tmatesoft.svn.core.wc.SVNRevision;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.argeo.ajaxplorer.jdrivers.AjxpAction;
-import org.argeo.ajaxplorer.jdrivers.AjxpAnswer;
-import org.argeo.ajaxplorer.jdrivers.AjxpDriverException;
-
-public class SvnLogAction implements AjxpAction<SvnDriver> {
-	private final SimpleDateFormat sdfIso = new SimpleDateFormat(
-			"yyyy-MM-dd HH:mm:ss");
-	private final Log log = LogFactory.getLog(getClass());
-
-	public AjxpAnswer execute(SvnDriver driver, HttpServletRequest request) {
-		String fileStr = request.getParameter("file");
-		log.debug("Log file " + fileStr);
-		if (fileStr == null) {
-			throw new AjxpDriverException("A  file needs to be provided.");
-		}
-		File file = new File(driver.getBasePath() + fileStr);
-		return new SvnLogAnswer(driver, file);
-	}
-
-	protected class SvnLogAnswer implements AjxpAnswer {
-		private final SvnDriver driver;
-		private final File file;
-
-		public SvnLogAnswer(SvnDriver driver, File file) {
-			this.driver = driver;
-			this.file = file;
-		}
-
-		public void updateResponse(HttpServletResponse response) {
-			PrintWriter writer = null;
-			try {
-				writer = response.getWriter();
-				writer.append("<tree>");
-				writer.append("<log>");
-
-				final List<SVNLogEntry> logEntries = new Vector<SVNLogEntry>();
-				ISVNLogEntryHandler logHandler = new ISVNLogEntryHandler() {
-					public void handleLogEntry(SVNLogEntry logEntry)
-							throws SVNException {
-						logEntries.add(logEntry);
-					}
-				};
-
-				driver.getManager().getLogClient().doLog(new File[] { file },
-						SVNRevision.create(0), SVNRevision.HEAD, true, true,
-						100, logHandler);
-
-				for (int i = logEntries.size() - 1; i >= 0; i--) {
-					String xml = logEntryAsXml(logEntries.get(i), file);
-					if(log.isTraceEnabled())
-						log.trace(xml);
-					writer.append(xml);
-				}
-
-				writer.append("</log>");
-				writer.append("</tree>");
-			} catch (Exception e) {
-				throw new AjxpDriverException(
-						"Cannot retrieve log for " + file, e);
-			} finally {
-				IOUtils.closeQuietly(writer);
-			}
-		}
-
-	}
-
-	protected String logEntryAsXml(SVNLogEntry entry, File file) {
-		StringBuffer buf = new StringBuffer();
-		buf.append("<logentry");
-		buf.append(" revision=\"").append(entry.getRevision()).append("\"");
-		buf.append(" is_file=\"").append(file.isDirectory() ? "0" : "1")
-				.append("\"");
-		buf.append(">");
-
-		buf.append("<author>").append(entry.getAuthor()).append("</author>");
-		buf.append("<date>").append(sdfIso.format(entry.getDate())).append(
-				"</date>");
-
-		buf.append("<paths>");
-		Map<Object, SVNLogEntryPath> paths = entry.getChangedPaths();
-		for (SVNLogEntryPath path : paths.values()) {
-			buf.append("<path>").append(path.getPath()).append("</path>");
-		}
-		buf.append("</paths>");
-
-		buf.append("<msg>").append(entry.getMessage()).append("</msg>");
-
-		buf.append("</logentry>");
-		return buf.toString();
-	}
-
-}
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/svn/SvnLsAction.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/svn/SvnLsAction.java
deleted file mode 100644
index 12024c8c41..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/svn/SvnLsAction.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.argeo.ajaxplorer.jdrivers.svn;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.util.List;
-import java.util.Vector;
-
-import org.tmatesoft.svn.core.SVNException;
-import org.tmatesoft.svn.core.wc.SVNInfo;
-import org.tmatesoft.svn.core.wc.SVNRevision;
-import org.tmatesoft.svn.core.wc.SVNStatus;
-import org.tmatesoft.svn.core.wc.SVNWCClient;
-import org.tmatesoft.svn.core.wc.SVNWCUtil;
-
-import org.argeo.ajaxplorer.jdrivers.AjxpDriverException;
-import org.argeo.ajaxplorer.jdrivers.file.FileLsAction;
-
-public class SvnLsAction extends FileLsAction<SvnDriver, SvnAjxpFile> {
-
-	@Override
-	protected List<SvnAjxpFile> listFiles(SvnDriver driver, final String path,
-			final boolean dirOnly) {
-		try {
-			File dir = driver.getFile(path);
-			SVNWCClient client = driver.getManager().getWCClient();
-
-			final List<SvnAjxpFile> res = new Vector<SvnAjxpFile>();
-			FileFilter filter = createFileFilter(dir);
-			File[] files = dir.listFiles(filter);
-			for (File file : files) {
-				//SVNStatus status = driver.getManager().getStatusClient().doStatus(file, false);
-				
-				SVNInfo info = client.doInfo(file, SVNRevision.WORKING);
-				if (dirOnly) {
-					if (file.isDirectory())
-						res.add(new SvnAjxpFile(info, path));
-				} else {
-					res.add(new SvnAjxpFile(info, path));
-				}
-			}
-			return res;
-		} catch (SVNException e) {
-			throw new AjxpDriverException("Cannot list svn dir " + path, e);
-		}
-	}
-
-	@Override
-	protected FileFilter createFileFilter(File dir) {
-		return new FileFilter() {
-
-			public boolean accept(File pathname) {
-				if (pathname.getName().equals(".svn")) {
-					return false;
-				} else {
-					return true;
-				}
-			}
-
-		};
-	}
-
-}
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/svn/SvnMkdirAction.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/svn/SvnMkdirAction.java
deleted file mode 100644
index 6be526339b..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/svn/SvnMkdirAction.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.argeo.ajaxplorer.jdrivers.svn;
-
-import java.io.File;
-
-import org.tmatesoft.svn.core.SVNException;
-
-import org.argeo.ajaxplorer.jdrivers.AjxpDriverException;
-import org.argeo.ajaxplorer.jdrivers.file.FileMkdirAction;
-
-public class SvnMkdirAction extends FileMkdirAction<SvnDriver> {
-	@Override
-	protected void postProcess(SvnDriver driver, File newDir) {
-		try {
-			driver.beginWriteAction(newDir.getParentFile());
-
-			log.debug("SVN Add: " + newDir);
-			driver.getManager().getWCClient().doAdd(newDir, true,
-					newDir.isDirectory(), true, true);
-
-			driver.commitAll("Commit new dir " + newDir.getName());
-			driver.completeWriteAction(newDir.getParentFile());
-		} catch (SVNException e) {
-			throw new AjxpDriverException("Cannot commit new dir" + newDir, e);
-		} finally {
-			driver.rollbackWriteAction(newDir.getParentFile());
-		}
-	}
-
-}
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/svn/SvnUploadAction.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/svn/SvnUploadAction.java
deleted file mode 100644
index ec785523a7..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/svn/SvnUploadAction.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.argeo.ajaxplorer.jdrivers.svn;
-
-import java.io.File;
-
-import org.tmatesoft.svn.core.SVNException;
-
-import org.argeo.ajaxplorer.jdrivers.AjxpDriverException;
-import org.argeo.ajaxplorer.jdrivers.file.FileUploadAction;
-
-public class SvnUploadAction extends FileUploadAction<SvnDriver> {
-	@Override
-	protected void postProcess(SvnDriver driver, File file) {
-		try {
-			driver.beginWriteAction(file.getParentFile());
-
-			log.debug("SVN Add: " + file);
-			driver.getManager().getWCClient().doAdd(file, true,
-					file.isDirectory(), true, true);
-
-			driver.commitAll("Commit file " + file.getName());
-			driver.completeWriteAction(file.getParentFile());
-		} catch (SVNException e) {
-			throw new AjxpDriverException("Cannot commit file " + file, e);
-		} finally {
-			driver.rollbackWriteAction(file.getParentFile());
-		}
-	}
-
-}
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/web/AjxpDriverServlet.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/web/AjxpDriverServlet.java
deleted file mode 100644
index 1f8c965fdd..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/java/org/argeo/ajaxplorer/jdrivers/web/AjxpDriverServlet.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.argeo.ajaxplorer.jdrivers.web;
-
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.Map;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.ajaxplorer.jdrivers.AjxpAction;
-import org.argeo.ajaxplorer.jdrivers.AjxpAnswer;
-import org.argeo.ajaxplorer.jdrivers.AjxpDriver;
-
-import org.springframework.beans.BeanWrapper;
-import org.springframework.beans.BeanWrapperImpl;
-import org.springframework.beans.BeansException;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
-import org.springframework.web.servlet.HttpServletBean;
-
-public class AjxpDriverServlet extends HttpServletBean {
-	static final long serialVersionUID = 1l;
-
-	protected final Log log = LogFactory.getLog(getClass());
-	private String driverBean;
-	private AjxpDriver driver;
-
-	@Override
-	public void init(ServletConfig sc) throws ServletException {
-		super.init(sc);
-		WebApplicationContext context = WebApplicationContextUtils
-				.getRequiredWebApplicationContext(sc.getServletContext());
-		driverBean = sc.getInitParameter("driverBean");
-		if (driverBean == null) {
-			throw new ServletException(
-					"No driver found, please set the driverBean property");
-		}
-
-		logger.info("Loading driver " + driverBean);
-		driver = (AjxpDriver) context.getBean(driverBean);
-
-		// overrideBeanProperties(sc);
-	}
-
-	@Override
-	protected void doGet(HttpServletRequest req, HttpServletResponse resp)
-			throws ServletException, IOException {
-		processRequest("GET", req, resp);
-	}
-
-	@Override
-	protected void doPost(HttpServletRequest req, HttpServletResponse resp)
-			throws ServletException, IOException {
-		processRequest("POST", req, resp);
-	}
-
-	protected void processRequest(String method, HttpServletRequest req,
-			HttpServletResponse resp) throws ServletException, IOException {
-		long id = System.currentTimeMillis();
-		try {
-			if (log.isDebugEnabled())
-				logRequest(id, method, req);
-
-			AjxpAnswer answer = driver.executeAction(req);
-			answer.updateResponse(resp);
-
-			if (log.isDebugEnabled())
-				log.debug(id + " " + method + " completed");
-		} catch (Exception e) {
-			log.error(id + " Cannot process request.", e);
-			throw new ServletException("Cannot process request " + id, e);
-		}
-
-	}
-
-	public void setDriverBean(String driverName) {
-		this.driverBean = driverName;
-	}
-
-	protected void logRequest(long id, String method, HttpServletRequest req) {
-		if (log.isDebugEnabled()) {
-			StringBuffer buf = new StringBuffer(id + " Received " + method
-					+ ": ");
-			buf.append('{');
-			Map<String, String[]> params = req.getParameterMap();
-			int count1 = 0;
-			for (Map.Entry<String, String[]> entry : params.entrySet()) {
-				if (count1 != 0)
-					buf.append(", ");
-				buf.append(entry.getKey()).append("={");
-				int count2 = 0;
-				for (String value : entry.getValue()) {
-					if (count2 != 0)
-						buf.append(',');
-					buf.append(value);
-					count2++;
-				}
-				buf.append('}');
-				count1++;
-			}
-			buf.append('}');
-			log.debug(buf.toString());
-		}
-	}
-
-	protected void overrideBeanProperties(ServletConfig sc)
-			throws ServletException {
-		BeanWrapper wrapper = new BeanWrapperImpl(driver);
-		Enumeration<String> en = sc.getInitParameterNames();
-		while (en.hasMoreElements()) {
-			String name = en.nextElement();
-			if (name.indexOf(driverBean + '.') == 0
-					&& name.length() > (driverBean.length() + 1)) {
-				String propertyName = name.substring(driverBean.length() + 1);
-				String value = sc.getInitParameter(name);
-				if (value != null) {
-					try {
-						wrapper.setPropertyValue(propertyName, value);
-					} catch (BeansException e) {
-						throw new ServletException("Cannot set property "
-								+ propertyName + " of bean " + driverBean, e);
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/resources/log4j.properties b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/resources/log4j.properties
deleted file mode 100644
index ad03d349c3..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=INFO, console
-
-## Levels
-log4j.logger.org.argeo=TRACE
-
-## Appenders
-# A1 is set to be a ConsoleAppender.
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n
-
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/resources/org/argeo/ajaxplorer/jdrivers/file/beans.xml b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/resources/org/argeo/ajaxplorer/jdrivers/file/beans.xml
deleted file mode 100644
index 0d1cfaaf4d..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/resources/org/argeo/ajaxplorer/jdrivers/file/beans.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"
-	default-lazy-init="true">
-
-	<bean id="driver.file.template"
-		class="org.argeo.ajaxplorer.jdrivers.file.FileDriver"
-		abstract="true">
-		<property name="actions">
-			<map>
-				<entry key="ls" value-ref="action.file.ls" />
-				<entry key="download" value-ref="action.file.download" />
-				<entry key="image_proxy"
-					value-ref="action.file.image_proxy" />
-				<entry key="upload" value-ref="action.file.upload" />
-				<entry key="mkdir" value-ref="action.file.mkdir" />
-				<entry key="delete" value-ref="action.file.delete" />
-			</map>
-		</property>
-	</bean>
-
-	<!-- ACTIONS FS -->
-	<bean id="action.file.ls"
-		class="org.argeo.ajaxplorer.jdrivers.file.FileLsAction" />
-
-	<bean id="action.file.download"
-		class="org.argeo.ajaxplorer.jdrivers.file.FileDownloadAction" />
-
-	<bean id="action.file.image_proxy"
-		class="org.argeo.ajaxplorer.jdrivers.file.FileImageProxyAction" />
-
-	<bean id="action.file.upload"
-		class="org.argeo.ajaxplorer.jdrivers.file.FileUploadAction" />
-
-	<bean id="action.file.mkdir"
-		class="org.argeo.ajaxplorer.jdrivers.file.FileMkdirAction" />
-
-	<bean id="action.file.delete"
-		class="org.argeo.ajaxplorer.jdrivers.file.FileDeleteAction" />
-</beans>
\ No newline at end of file
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/resources/org/argeo/ajaxplorer/jdrivers/svn/beans.xml b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/resources/org/argeo/ajaxplorer/jdrivers/svn/beans.xml
deleted file mode 100644
index d6b3c2f885..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/resources/org/argeo/ajaxplorer/jdrivers/svn/beans.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"
-	default-lazy-init="true">
-
-	<import
-		resource="classpath:/org/argeo/ajaxplorer/jdrivers/file/beans.xml" />
-
-	<bean id="driver.svn.template"
-		class="org.argeo.ajaxplorer.jdrivers.svn.SvnDriver" init-method="init"
-		abstract="true">
-		<property name="actions">
-			<map>
-				<entry key="ls" value-ref="action.svn.ls" />
-				<entry key="download" value-ref="action.svn.download" />
-				<entry key="image_proxy"
-					value-ref="action.svn.image_proxy" />
-				<entry key="upload" value-ref="action.svn.upload" />
-				<entry key="mkdir" value-ref="action.svn.mkdir" />
-				<entry key="delete" value-ref="action.svn.delete" />
-				<entry key="svnlog" value-ref="action.svn.svnlog" />
-				<entry key="svndownload"
-					value-ref="action.svn.svndownload" />
-			</map>
-		</property>
-	</bean>
-
-	<!-- ACTIONS SVN -->
-	<bean id="action.svn.ls"
-		class="org.argeo.ajaxplorer.jdrivers.svn.SvnLsAction" />
-
-	<bean id="action.svn.upload"
-		class="org.argeo.ajaxplorer.jdrivers.svn.SvnUploadAction" />
-
-	<bean id="action.svn.mkdir"
-		class="org.argeo.ajaxplorer.jdrivers.svn.SvnMkdirAction" />
-
-	<bean id="action.svn.delete"
-		class="org.argeo.ajaxplorer.jdrivers.svn.SvnDeleteAction" />
-
-	<bean id="action.svn.svnlog"
-		class="org.argeo.ajaxplorer.jdrivers.svn.SvnLogAction" />
-
-	<bean id="action.svn.download"
-		class="org.argeo.ajaxplorer.jdrivers.file.FileDownloadAction" />
-
-	<bean id="action.svn.image_proxy"
-		class="org.argeo.ajaxplorer.jdrivers.file.FileImageProxyAction" />
-
-	<bean id="action.svn.svndownload"
-		class="org.argeo.ajaxplorer.jdrivers.svn.SvnDownloadAction" />
-
-
-</beans>
\ No newline at end of file
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/webapp/WEB-INF/applicationContext.xml b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/webapp/WEB-INF/applicationContext.xml
deleted file mode 100644
index 8cb5f9e622..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/webapp/WEB-INF/applicationContext.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"
-	default-lazy-init="true">
-
-	<import
-		resource="classpath:/org/argeo/ajaxplorer/jdrivers/svn/beans.xml" />
-
-	<bean id="defaultSvnArchiver" parent="driver.svn.template">
-		<!-- 
-			<property name="basePath"
-			value="${user.home}\AjaXplorerArchiver\data\svnwc\defaultSvnArchiver" />
-		-->
-	</bean>
-
-	<!--  WEB -->
-	<bean id="filterMultipartResolver"
-		class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
-	</bean>
-</beans>
\ No newline at end of file
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/webapp/WEB-INF/web.xml b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 249a169513..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns="http://java.sun.com/xml/ns/javaee"
-	xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-	id="WebApp_ID" version="2.5">
-	<display-name>org.argeo.ajaxplorer.jdrivers</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-
-	<!-- SPRING -->
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>/WEB-INF/applicationContext.xml</param-value>
-	</context-param>
-
-	<listener>
-		<listener-class>
-			org.springframework.web.context.ContextLoaderListener
-		</listener-class>
-	</listener>
-
-	<servlet>
-		<servlet-name>defaultSvnArchiver</servlet-name>
-		<servlet-class>
-			org.argeo.ajaxplorer.jdrivers.web.AjxpDriverServlet
-		</servlet-class>
-		<init-param>
-			<param-name>driverBean</param-name>
-			<param-value>defaultSvnArchiver</param-value>
-		</init-param>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>defaultSvnArchiver</servlet-name>
-		<url-pattern>/defaultSvnArchiver</url-pattern>
-	</servlet-mapping>
-
-	<filter>
-		<filter-name>multipart</filter-name>
-		<filter-class>
-			org.springframework.web.multipart.support.MultipartFilter
-		</filter-class>
-		<init-param>
-			<param-name>multipartResolverBeanName</param-name>
-			<param-value>filterMultipartResolver</param-value>
-		</init-param>
-	</filter>
-
-	<filter-mapping>
-		<filter-name>multipart</filter-name>
-		<servlet-name>defaultSvnArchiver</servlet-name>
-	</filter-mapping>
-</web-app>
\ No newline at end of file
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/test/java/org/argeo/ajaxplorer/jdrivers/svn/SvnKitTest.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/test/java/org/argeo/ajaxplorer/jdrivers/svn/SvnKitTest.java
deleted file mode 100644
index 2dd2a08bd4..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/test/java/org/argeo/ajaxplorer/jdrivers/svn/SvnKitTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.argeo.ajaxplorer.jdrivers.svn;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.tmatesoft.svn.core.internal.io.fs.FSRepositoryFactory;
-import org.tmatesoft.svn.core.internal.io.svn.SVNRepositoryFactoryImpl;
-import org.tmatesoft.svn.core.wc.ISVNOptions;
-import org.tmatesoft.svn.core.wc.SVNClientManager;
-import org.tmatesoft.svn.core.wc.SVNRevision;
-import org.tmatesoft.svn.core.wc.SVNWCUtil;
-
-public class SvnKitTest {//extends TestCase {
-/*
-	public void testUpdate() throws Exception {
-		SVNRepositoryFactoryImpl.setup();
-		FSRepositoryFactory.setup();
-		String path = "C:/mbaudier/test/ajxpRoot/";
-		File file = new File(path);
-		ISVNOptions options = SVNWCUtil.createDefaultOptions(true);
-		SVNClientManager manager = SVNClientManager.newInstance(options);
-		manager.getUpdateClient().doUpdate(file, SVNRevision.HEAD, true);
-	}*/
-}
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/test/java/org/tmatesoft/svn/examples/wc/CommitEventHandler.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/test/java/org/tmatesoft/svn/examples/wc/CommitEventHandler.java
deleted file mode 100644
index 63722f6cc5..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/test/java/org/tmatesoft/svn/examples/wc/CommitEventHandler.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * ====================================================================
- * Copyright (c) 2004-2007 TMate Software Ltd.  All rights reserved.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at http://svnkit.com/license.html
- * If newer versions of this license are posted there, you may use a
- * newer version instead, at your option.
- * ====================================================================
- */
-package org.tmatesoft.svn.examples.wc;
- 
-import org.tmatesoft.svn.core.SVNCancelException;
-import org.tmatesoft.svn.core.SVNProperty;
-import org.tmatesoft.svn.core.wc.ISVNEventHandler;
-import org.tmatesoft.svn.core.wc.SVNEvent;
-import org.tmatesoft.svn.core.wc.SVNEventAction;
- 
-/*
- * This class is an implementation of ISVNEventHandler intended for  processing   
- * events generated by do*() methods of an SVNCommitClient object. An  instance  
- * of this handler will be provided to  an  SVNCommitClient. When calling,  for 
- * example,  SVNCommitClient.doCommit(..)  on  a  WC  path,  this  method  will 
- * generate an event for each 'adding'/'deleting'/'sending'/.. action  it  will 
- * perform upon every path being committed. And this event is passed to 
- * 
- * ISVNEventHandler.handleEvent(SVNEvent event,  double progress) 
- * 
- * to notify the handler.  The  event  contains detailed  information about the 
- * path, action performed upon the path and some other. 
- */
-public class CommitEventHandler implements ISVNEventHandler {
-    /*
-     * progress  is  currently  reserved  for future purposes and now is always
-     * ISVNEventHandler.UNKNOWN  
-     */
-    public void handleEvent(SVNEvent event, double progress) {
-        /*
-         * Gets the current action. An action is represented by SVNEventAction.
-         * In case of a commit  an  action  can  be  determined  via  comparing 
-         * SVNEvent.getAction() with SVNEventAction.COMMIT_-like constants. 
-         */
-        SVNEventAction action = event.getAction();
-        if (action == SVNEventAction.COMMIT_MODIFIED) {
-            System.out.println("Sending   " + event.getFile());
-        } else if (action == SVNEventAction.COMMIT_DELETED) {
-            System.out.println("Deleting   " + event.getFile());
-        } else if (action == SVNEventAction.COMMIT_REPLACED) {
-            System.out.println("Replacing   " + event.getFile());
-        } else if (action == SVNEventAction.COMMIT_DELTA_SENT) {
-            System.out.println("Transmitting file data....");
-        } else if (action == SVNEventAction.COMMIT_ADDED) {
-            /*
-             * Gets the MIME-type of the item.
-             */
-            String mimeType = event.getMimeType();
-            if (SVNProperty.isBinaryMimeType(mimeType)) {
-                /*
-                 * If the item is a binary file
-                 */
-                System.out.println("Adding  (bin)  "
-                        + event.getFile());
-            } else {
-                System.out.println("Adding         "
-                        + event.getFile());
-            }
-        }
- 
-    }
-    
-    /*
-     * Should be implemented to check if the current operation is cancelled. If 
-     * it is, this method should throw an SVNCancelException. 
-     */
-    public void checkCancelled() throws SVNCancelException {
-    }
- 
-}
\ No newline at end of file
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/test/java/org/tmatesoft/svn/examples/wc/InfoHandler.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/test/java/org/tmatesoft/svn/examples/wc/InfoHandler.java
deleted file mode 100644
index 24a0b9a2d0..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/test/java/org/tmatesoft/svn/examples/wc/InfoHandler.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * ====================================================================
- * Copyright (c) 2004-2007 TMate Software Ltd.  All rights reserved.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at http://svnkit.com/license.html
- * If newer versions of this license are posted there, you may use a
- * newer version instead, at your option.
- * ====================================================================
- */
-package org.tmatesoft.svn.examples.wc;
- 
-import org.tmatesoft.svn.core.SVNNodeKind;
-import org.tmatesoft.svn.core.wc.ISVNInfoHandler;
-import org.tmatesoft.svn.core.wc.SVNInfo;
- 
-/*
- * An implementation of ISVNInfoHandler that is  used  in  WorkingCopy.java  to 
- * display  info  on  a  working  copy path.  This implementation is passed  to
- * 
- * SVNWCClient.doInfo(File path, SVNRevision revision, boolean recursive, 
- * ISVNInfoHandler handler) 
- * 
- * For each item to be processed doInfo(..) collects information and creates an 
- * SVNInfo which keeps that information. Then  doInfo(..)  calls  implementor's 
- * handler.handleInfo(SVNInfo) where it passes the gathered info.
- */
-public class InfoHandler implements ISVNInfoHandler {
-    /*
-     * This is an implementation  of  ISVNInfoHandler.handleInfo(SVNInfo info).
-     * Just prints out information on a Working Copy path in the manner of  the
-     * native SVN command line client.
-     */
-    public void handleInfo(SVNInfo info) {
-        System.out.println("-----------------INFO-----------------");
-        System.out.println("Local Path: " + info.getFile().getPath());
-        System.out.println("URL: " + info.getURL());
-        if (info.isRemote() && info.getRepositoryRootURL() != null) {
-            System.out.println("Repository Root URL: "
-                    + info.getRepositoryRootURL());
-        }
-        if(info.getRepositoryUUID() != null){
-            System.out.println("Repository UUID: " + info.getRepositoryUUID());
-        }
-        System.out.println("Revision: " + info.getRevision().getNumber());
-        System.out.println("Node Kind: " + info.getKind().toString());
-        if(!info.isRemote()){
-            System.out.println("Schedule: "
-                    + (info.getSchedule() != null ? info.getSchedule() : "normal"));
-        }
-        System.out.println("Last Changed Author: " + info.getAuthor());
-        System.out.println("Last Changed Revision: "
-                + info.getCommittedRevision().getNumber());
-        System.out.println("Last Changed Date: " + info.getCommittedDate());
-        if (info.getPropTime() != null) {
-            System.out
-                    .println("Properties Last Updated: " + info.getPropTime());
-        }
-        if (info.getKind() == SVNNodeKind.FILE && info.getChecksum() != null) {
-            if (info.getTextTime() != null) {
-                System.out.println("Text Last Updated: " + info.getTextTime());
-            }
-            System.out.println("Checksum: " + info.getChecksum());
-        }
-        if (info.getLock() != null) {
-            if (info.getLock().getID() != null) {
-                System.out.println("Lock Token: " + info.getLock().getID());
-            }
-            System.out.println("Lock Owner: " + info.getLock().getOwner());
-            System.out.println("Lock Created: "
-                    + info.getLock().getCreationDate());
-            if (info.getLock().getExpirationDate() != null) {
-                System.out.println("Lock Expires: "
-                        + info.getLock().getExpirationDate());
-            }
-            if (info.getLock().getComment() != null) {
-                System.out.println("Lock Comment: "
-                        + info.getLock().getComment());
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/test/java/org/tmatesoft/svn/examples/wc/StatusHandler.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/test/java/org/tmatesoft/svn/examples/wc/StatusHandler.java
deleted file mode 100644
index ec1056ce88..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/test/java/org/tmatesoft/svn/examples/wc/StatusHandler.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * ====================================================================
- * Copyright (c) 2004-2007 TMate Software Ltd.  All rights reserved.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at http://svnkit.com/license.html
- * If newer versions of this license are posted there, you may use a
- * newer version instead, at your option.
- * ====================================================================
- */
-package org.tmatesoft.svn.examples.wc;
- 
-import org.tmatesoft.svn.core.SVNCancelException;
-import org.tmatesoft.svn.core.SVNLock;
-import org.tmatesoft.svn.core.wc.ISVNStatusHandler;
-import org.tmatesoft.svn.core.wc.SVNStatus;
-import org.tmatesoft.svn.core.wc.SVNStatusType;
-import org.tmatesoft.svn.core.wc.SVNEvent;
-import org.tmatesoft.svn.core.wc.ISVNEventHandler;
-import org.tmatesoft.svn.core.wc.SVNEventAction;
- 
-/*
- * This is  an implementation of ISVNStatusHandler & ISVNEventHandler  that  is 
- * used in WorkingCopy.java to display status information. This  implementation  
- * is passed to 
- * 
- * SVNStatusClient.doStatus(File path, boolean recursive, boolean remote, 
- * boolean reportAll, boolean includeIgnored, boolean collectParentExternals, 
- * ISVNStatusHandler handler)
- * 
- * For each item to be processed doStatus(..) collects status  information  and 
- * creates an SVNStatus object which holds that information. Then  doStatus(..) 
- * calls an implementor's handler.handleStatus(SVNStatus) passing it the status 
- * info collected.
- * 
- * StatusHandler  will  be  also  provided  to  an  SVNStatusClient object as a 
- * handler of events generated by a doStatus(..) method. For  example,  if  the 
- * status is invoked with the flag remote=true (like 'svn status -u'  command), 
- * so then the status operation will be finished with dispatching  an  SVNEvent 
- * to ISVNEventHandler that will 'say' that the status is performed against the
- * youngest revision (the event holds that revision number). 
- */
-public class StatusHandler implements ISVNStatusHandler, ISVNEventHandler {
-    private boolean myIsRemote;
-    public StatusHandler(boolean isRemote) {
-        myIsRemote = isRemote;
-    }
-    /*
-     * This is  an  implementation  of ISVNStatusHandler.handleStatus(SVNStatus 
-     * status)
-     */
-    public void handleStatus(SVNStatus status) {
-        /*
-         * Gets  the  status  of  file/directory/symbolic link  text  contents. 
-         * It is  SVNStatusType  who  contains  information on the state of  an 
-         * item. 
-         */
-        SVNStatusType contentsStatus = status.getContentsStatus();
- 
-        String pathChangeType = " ";
-        
-        boolean isAddedWithHistory = status.isCopied();
-        if (contentsStatus == SVNStatusType.STATUS_MODIFIED) {
-            /*
-             * The contents of the file have been Modified.
-             */
-            pathChangeType = "M";
-        } else if (contentsStatus == SVNStatusType.STATUS_CONFLICTED) {
-            /*
-             * The  file  item  is  in a state of  Conflict. That  is,  changes 
-             * received from the server during an  update  overlap  with  local 
-             * changes the user has in his working copy. 
-             */
-            pathChangeType = "C";
-        } else if (contentsStatus == SVNStatusType.STATUS_DELETED) {
-            /*
-             * The file, directory or symbolic link item has been scheduled for 
-             * Deletion from the repository.
-             */
-            pathChangeType = "D";
-        } else if (contentsStatus == SVNStatusType.STATUS_ADDED) {
-            /*
-             * The file, directory or symbolic link item has been scheduled for 
-             * Addition to the repository.
-             */
-            pathChangeType = "A";
-        } else if (contentsStatus == SVNStatusType.STATUS_UNVERSIONED) {
-            /*
-             * The file, directory or symbolic link item is not  under  version 
-             * control.
-             */
-            pathChangeType = "?";
-        } else if (contentsStatus == SVNStatusType.STATUS_EXTERNAL) {
-            /*
-             * The item is unversioned, but is used by an eXternals definition.
-             */
-            pathChangeType = "X";
-        } else if (contentsStatus == SVNStatusType.STATUS_IGNORED) {
-            /*
-             * The file, directory or symbolic link item is not  under  version 
-             * control, and is configured to be Ignored during 'add',  'import' 
-             * and 'status' operations. 
-             */
-            pathChangeType = "I";
-        } else if (contentsStatus == SVNStatusType.STATUS_MISSING
-                || contentsStatus == SVNStatusType.STATUS_INCOMPLETE) {
-            /*
-             * The file, directory or  symbolic  link  item  is  under  version 
-             * control but is missing or somehow incomplete. The  item  can  be 
-             * missing if it is removed using a command incompatible  with  the 
-             * native Subversion command line client (for example, just removed 
-             * from the filesystem). In the case the item is  a  directory,  it 
-             * can  be  incomplete if the user happened to interrupt a checkout 
-             * or update.
-             */
-            pathChangeType = "!";
-        } else if (contentsStatus == SVNStatusType.STATUS_OBSTRUCTED) {
-            /*
-             * The file, directory or symbolic link item is in  the  repository 
-             * as one kind of object, but what's actually in the user's working 
-             * copy is some other kind. For example, Subversion  might  have  a 
-             * file in the repository,  but  the  user  removed  the  file  and 
-             * created a directory in its place, without using the 'svn delete' 
-             * or 'svn add' command (or SVNKit analogues for them).
-             */
-            pathChangeType = "~";
-        } else if (contentsStatus == SVNStatusType.STATUS_REPLACED) {
-            /*
-             * The file, directory or symbolic link item was  Replaced  in  the 
-             * user's working copy; that is, the item was deleted,  and  a  new 
-             * item with the same name was added (within  a  single  revision). 
-             * While they may have the same name, the repository considers them 
-             * to be distinct objects with distinct histories.
-             */
-            pathChangeType = "R";
-        } else if (contentsStatus == SVNStatusType.STATUS_NONE
-                || contentsStatus == SVNStatusType.STATUS_NORMAL) {
-            /*
-             * The item was not modified (normal).
-             */
-            pathChangeType = " ";
-        }
-        
-        /*
-         * If SVNStatusClient.doStatus(..) was invoked with  remote = true  the 
-         * following code finds out whether the current item had  been  changed 
-         * in the repository   
-         */
-        String remoteChangeType = " ";
- 
-        if(status.getRemotePropertiesStatus() != SVNStatusType.STATUS_NONE || 
-           status.getRemoteContentsStatus() != SVNStatusType.STATUS_NONE) {
-            /*
-             * the local item is out of date
-             */
-            remoteChangeType = "*";
-        }
-        /*
-         * Now getting the status of properties of an item. SVNStatusType  also 
-         * contains information on the properties state.
-         */
-        SVNStatusType propertiesStatus = status.getPropertiesStatus();
-        /*
-         * Default - properties are normal (unmodified).
-         */
-        String propertiesChangeType = " ";
-        if (propertiesStatus == SVNStatusType.STATUS_MODIFIED) {
-            /*
-             * Properties were modified.
-             */
-            propertiesChangeType = "M";
-        } else if (propertiesStatus == SVNStatusType.STATUS_CONFLICTED) {
-            /*
-             * Properties are in conflict with the repository.
-             */
-            propertiesChangeType = "C";
-        }
- 
-        /*
-         * Whether the item was locked in the .svn working area  (for  example, 
-         * during a commit or maybe the previous operation was interrupted, in 
-         * this case the lock needs to be cleaned up). 
-         */
-        boolean isLocked = status.isLocked();
-        /*
-         * Whether the item is switched to a different URL (branch).
-         */
-        boolean isSwitched = status.isSwitched();
-        /*
-         * If the item is a file it may be locked.
-         */
-        SVNLock localLock = status.getLocalLock();
-        /*
-         * If  doStatus()  was  run  with  remote=true  and the item is a file, 
-         * checks whether a remote lock presents.
-         */
-        SVNLock remoteLock = status.getRemoteLock();
-        String lockLabel = " ";
- 
-        if (localLock != null) {
-            /*
-             * at first suppose the file is locKed
-             */
-            lockLabel = "K";
-            if (remoteLock != null) {
-                /*
-                 * if the lock-token of the local lock differs from  the  lock-
-                 * token of the remote lock - the lock was sTolen!
-                 */
-                if (!remoteLock.getID().equals(localLock.getID())) {
-                    lockLabel = "T";
-                }
-            } else {
-                if(myIsRemote){
-	                /*
-	                 * the  local  lock presents but there's  no  lock  in  the
-	                 * repository - the lock was Broken. This  is  true only if 
-                     * doStatus() was invoked with remote=true.
-	                 */
-	                lockLabel = "B";
-                }
-            }
-        } else if (remoteLock != null) {
-            /*
-             * the file is not locally locked but locked  in  the  repository -
-             * the lock token is in some Other working copy.
-             */
-            lockLabel = "O";
-        }
- 
-        /*
-         * Obtains the working revision number of the item.
-         */
-        long workingRevision = status.getRevision().getNumber();
-        /*
-         * Obtains the number of the revision when the item was last changed. 
-         */
-        long lastChangedRevision = status.getCommittedRevision().getNumber();
-        String offset = "                                ";
-        String[] offsets = new String[3];
-        offsets[0] = offset.substring(0, 6 - String.valueOf(workingRevision)
-                .length());
-        offsets[1] = offset.substring(0, 6 - String
-                .valueOf(lastChangedRevision).length());
-        //status
-        offsets[2] = offset.substring(0,
-                offset.length()
-                        - (status.getAuthor() != null ? status.getAuthor()
-                                .length() : 1));
-        /*
-         * status is shown in the manner of the native Subversion command  line
-         * client's command "svn status"
-         */
-        System.out.println(pathChangeType
-                + propertiesChangeType
-                + (isLocked ? "L" : " ")
-                + (isAddedWithHistory ? "+" : " ")
-                + (isSwitched ? "S" : " ")
-                + lockLabel
-                + "  "
-                + remoteChangeType
-                + "  "
-                + workingRevision
-                + offsets[0]
-                + (lastChangedRevision >= 0 ? String
-                        .valueOf(lastChangedRevision) : "?") + offsets[1]
-                + (status.getAuthor() != null ? status.getAuthor() : "?")
-                + offsets[2] + status.getFile().getPath());
-    }
-    
-    /*
-     * This is an implementation for 
-     * ISVNEventHandler.handleEvent(SVNEvent event, double progress)
-     */
-    public void handleEvent(SVNEvent event, double progress) {
-        /*
-         * Gets the current action. An action is represented by SVNEventAction.
-         * In case of a status operation a current action can be determined via 
-         * SVNEvent.getAction() and SVNEventAction.STATUS_-like constants. 
-         */
-        SVNEventAction action = event.getAction();
-        /*
-         * Print out the revision against which the status was performed.  This 
-         * event is dispatched when the SVNStatusClient.doStatus() was  invoked 
-         * with the flag remote set to true - that is for  a  local  status  it 
-         * won't be dispatched.
-         */
-        if(action == SVNEventAction.STATUS_COMPLETED){
-            System.out.println("Status against revision:  "+ event.getRevision());
-        }
-    
-    }
- 
-    /*
-     * Should be implemented to check if the current operation is cancelled. If 
-     * it is, this method should throw an SVNCancelException. 
-     */
-    public void checkCancelled() throws SVNCancelException {
-    
-    }
-    
-}
\ No newline at end of file
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/test/java/org/tmatesoft/svn/examples/wc/UpdateEventHandler.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/test/java/org/tmatesoft/svn/examples/wc/UpdateEventHandler.java
deleted file mode 100644
index a6583c60bc..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/test/java/org/tmatesoft/svn/examples/wc/UpdateEventHandler.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * ====================================================================
- * Copyright (c) 2004-2007 TMate Software Ltd.  All rights reserved.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at http://svnkit.com/license.html
- * If newer versions of this license are posted there, you may use a
- * newer version instead, at your option.
- * ====================================================================
- */
-package org.tmatesoft.svn.examples.wc;
- 
-import org.tmatesoft.svn.core.SVNCancelException;
-import org.tmatesoft.svn.core.wc.ISVNEventHandler;
-import org.tmatesoft.svn.core.wc.SVNEvent;
-import org.tmatesoft.svn.core.wc.SVNStatusType;
-import org.tmatesoft.svn.core.wc.SVNEventAction;
- 
-/*
- * This class is an implementation of ISVNEventHandler intended for  processing   
- * events generated by do*() methods of an SVNUpdateClient object. An  instance  
- * of this handler will be provided to  an  SVNUpdateClient. When calling,  for 
- * example, SVNWCClient.doUpdate(..) on some path, that method will generate an 
- * event for each 'update'/'add'/'delete'/.. action it will perform upon  every 
- * path being updated. And this event is passed to 
- * 
- * ISVNEventHandler.handleEvent(SVNEvent event,  double progress) 
- * 
- * to notify the handler.  The  event  contains detailed  information about the 
- * path, action performed upon the path and some other. 
- */
-public class UpdateEventHandler implements ISVNEventHandler {
-    /*
-     * progress  is  currently  reserved  for future purposes and now is always
-     * ISVNEventHandler.UNKNOWN  
-     */
-    public void handleEvent(SVNEvent event, double progress) {
-        /*
-         * Gets the current action. An action is represented by SVNEventAction.
-         * In case of an update an  action  can  be  determined  via  comparing 
-         * SVNEvent.getAction() and SVNEventAction.UPDATE_-like constants. 
-         */
-        SVNEventAction action = event.getAction();
-        String pathChangeType = " ";
-        if (action == SVNEventAction.UPDATE_ADD) {
-            /*
-             * the item was added
-             */
-            pathChangeType = "A";
-        } else if (action == SVNEventAction.UPDATE_DELETE) {
-            /*
-             * the item was deleted
-             */
-            pathChangeType = "D";
-        } else if (action == SVNEventAction.UPDATE_UPDATE) {
-            /*
-             * Find out in details what  state the item is (after  having  been 
-             * updated).
-             * 
-             * Gets  the  status  of  file/directory  item   contents.  It   is 
-             * SVNStatusType  who contains information on the state of an item.
-             */
-            SVNStatusType contentsStatus = event.getContentsStatus();
-            if (contentsStatus == SVNStatusType.CHANGED) {
-                /*
-                 * the  item  was  modified in the repository (got  the changes 
-                 * from the repository
-                 */
-                pathChangeType = "U";
-            }else if (contentsStatus == SVNStatusType.CONFLICTED) {
-                /*
-                 * The file item is in  a  state  of Conflict. That is, changes
-                 * received from the repository during an update, overlap  with 
-                 * local changes the user has in his working copy.
-                 */
-                pathChangeType = "C";
-            } else if (contentsStatus == SVNStatusType.MERGED) {
-                /*
-                 * The file item was merGed (those  changes that came from  the 
-                 * repository  did  not  overlap local changes and were  merged 
-                 * into the file).
-                 */
-                pathChangeType = "G";
-            }
-        } else if (action == SVNEventAction.UPDATE_EXTERNAL) {
-            /*for externals definitions*/
-            System.out.println("Fetching external item into '"
-                    + event.getFile().getAbsolutePath() + "'");
-            System.out.println("External at revision " + event.getRevision());
-            return;
-        } else if (action == SVNEventAction.UPDATE_COMPLETED) {
-            /*
-             * Updating the working copy is completed. Prints out the revision.
-             */
-            System.out.println("At revision " + event.getRevision());
-            return;
-        } else if (action == SVNEventAction.ADD){
-            System.out.println("A     " + event.getFile());
-            return;
-        } else if (action == SVNEventAction.DELETE){
-            System.out.println("D     " + event.getFile());
-            return;
-        } else if (action == SVNEventAction.LOCKED){
-            System.out.println("L     " + event.getFile());
-            return;
-        } else if (action == SVNEventAction.LOCK_FAILED){
-            System.out.println("failed to lock    " + event.getFile());
-            return;
-        }
- 
-        /*
-         * Now getting the status of properties of an item. SVNStatusType  also
-         * contains information on the properties state.
-         */
-        SVNStatusType propertiesStatus = event.getPropertiesStatus();
-        /*
-         * At first consider properties are normal (unchanged).
-         */
-        String propertiesChangeType = " ";
-        if (propertiesStatus == SVNStatusType.CHANGED) {
-            /*
-             * Properties were updated.
-             */
-            propertiesChangeType = "U";
-        } else if (propertiesStatus == SVNStatusType.CONFLICTED) {
-            /*
-             * Properties are in conflict with the repository.
-             */
-            propertiesChangeType = "C";
-        } else if (propertiesStatus == SVNStatusType.MERGED) {
-            /*
-             * Properties that came from the repository were  merged  with  the
-             * local ones.
-             */
-            propertiesChangeType = "G";
-        }
- 
-        /*
-         * Gets the status of the lock.
-         */
-        String lockLabel = " ";
-        SVNStatusType lockType = event.getLockStatus();
-        
-        if (lockType == SVNStatusType.LOCK_UNLOCKED) {
-            /*
-             * The lock is broken by someone.
-             */
-            lockLabel = "B";
-        }
-        
-        System.out.println(pathChangeType
-                + propertiesChangeType
-                + lockLabel
-                + "       "
-                + event.getFile());
-    }
- 
-    /*
-     * Should be implemented to check if the current operation is cancelled. If 
-     * it is, this method should throw an SVNCancelException. 
-     */
-    public void checkCancelled() throws SVNCancelException {
-    }
- 
-}
\ No newline at end of file
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/test/java/org/tmatesoft/svn/examples/wc/WCEventHandler.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/test/java/org/tmatesoft/svn/examples/wc/WCEventHandler.java
deleted file mode 100644
index b89d33d725..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/test/java/org/tmatesoft/svn/examples/wc/WCEventHandler.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * ====================================================================
- * Copyright (c) 2004-2007 TMate Software Ltd.  All rights reserved.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at http://svnkit.com/license.html
- * If newer versions of this license are posted there, you may use a
- * newer version instead, at your option.
- * ====================================================================
- */
-package org.tmatesoft.svn.examples.wc;
- 
-import org.tmatesoft.svn.core.SVNCancelException;
-import org.tmatesoft.svn.core.wc.ISVNEventHandler;
-import org.tmatesoft.svn.core.wc.SVNEvent;
-import org.tmatesoft.svn.core.wc.SVNEventAction;
- 
-/*
- * This class is an implementation of ISVNEventHandler intended for  processing   
- * events generated by do*() methods of an SVNWCClient object. An  instance  of 
- * this handler will be provided to an SVNWCClient. When  calling, for example, 
- * SVNWCClient.doDelete(..) on some path, that method will  generate  an  event 
- * for each 'delete' action it will perform upon every path being deleted.  And
- * this event is passed to 
- * 
- * ISVNEventHandler.handleEvent(SVNEvent event,  double progress) 
- * 
- * to notify the handler.  The  event  contains detailed  information about the 
- * path, action performed upon the path and some other. 
- */
-public class WCEventHandler implements ISVNEventHandler {
-    /*
-     * progress  is  currently  reserved  for future purposes and now is always
-     * ISVNEventHandler.UNKNOWN  
-     */
-    public void handleEvent(SVNEvent event, double progress) {
-        /*
-         * Gets the current action. An action is represented by SVNEventAction.
-         */
-        SVNEventAction action = event.getAction();
-        if (action == SVNEventAction.ADD){
-            /*
-             * The item is scheduled for addition.
-             */
-            System.out.println("A     " + event.getFile());
-            return;
-        }else if (action == SVNEventAction.COPY){
-            /*
-             * The  item  is  scheduled for addition  with history (copied,  in 
-             * other words).
-             */
-            System.out.println("A  +  " + event.getFile());
-            return;
-        }else if (action == SVNEventAction.DELETE){
-            /*
-             * The item is scheduled for deletion. 
-             */
-            System.out.println("D     " + event.getFile());
-            return;
-        } else if (action == SVNEventAction.LOCKED){
-            /*
-             * The item is locked.
-             */
-            System.out.println("L     " + event.getFile());
-            return;
-        } else if (action == SVNEventAction.LOCK_FAILED){
-            /*
-             * Locking operation failed.
-             */
-            System.out.println("failed to lock    " + event.getFile());
-            return;
-        }
-    }
- 
-    /*
-     * Should be implemented to check if the current operation is cancelled. If 
-     * it is, this method should throw an SVNCancelException. 
-     */
-    public void checkCancelled() throws SVNCancelException {
-    }
- 
-}
\ No newline at end of file
diff --git a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/test/java/org/tmatesoft/svn/examples/wc/WorkingCopy.java b/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/test/java/org/tmatesoft/svn/examples/wc/WorkingCopy.java
deleted file mode 100644
index b901ce434d..0000000000
--- a/jdrivers/org.argeo.ajaxplorer.jdrivers.core/src/test/java/org/tmatesoft/svn/examples/wc/WorkingCopy.java
+++ /dev/null
@@ -1,1195 +0,0 @@
-package org.tmatesoft.svn.examples.wc;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.tmatesoft.svn.core.SVNCommitInfo;
-import org.tmatesoft.svn.core.SVNException;
-import org.tmatesoft.svn.core.SVNURL;
-import org.tmatesoft.svn.core.internal.io.dav.DAVRepositoryFactory;
-import org.tmatesoft.svn.core.internal.io.fs.FSRepositoryFactory;
-import org.tmatesoft.svn.core.internal.io.svn.SVNRepositoryFactoryImpl;
-import org.tmatesoft.svn.core.internal.util.SVNPathUtil;
-import org.tmatesoft.svn.core.wc.ISVNEventHandler;
-import org.tmatesoft.svn.core.wc.ISVNOptions;
-import org.tmatesoft.svn.core.wc.SVNClientManager;
-import org.tmatesoft.svn.core.wc.SVNRevision;
-import org.tmatesoft.svn.core.wc.SVNUpdateClient;
-import org.tmatesoft.svn.core.wc.SVNWCUtil;
-
-/*
- * This  is  a complex  example program that demonstrates how  you  can manage local
- * working copies as well as  URLs  (that is, items located  in  the  repository) by 
- * means of the  API  provided in the org.tmatesoft.svn.core.wc package. The package 
- * itself represents  a  high-level  API  consisting of classes and interfaces which 
- * allow to perform operations compatible with ones of the native Subversion command
- * line client.  These version control operations are logically grouped in a  set of 
- * classes which names meet  'SVN*Client'  pattern. For example, the package has the 
- * SVNUpdateClient class which is responsible for update-related operations (update,
- * switch, check out). Most of the  methods of these 'client' classes are named like
- * 'doSomething(..)' where 'Something' corresponds to the name of a version  control 
- * operation (usually similar to the name of the  corresponding  Subversion  command 
- * line client's command). So, for  users  familiar with the Subversion command line 
- * client it won't take much  effort and time  to  match a 'do*' method  against  an 
- * appropriate Subversion client's operation (or command, in other words).
- * 
- * Surely, it  may  seem  not  quite handy to deal with a number of classes that all 
- * need to be instantiated, initialized, kept.. For example, if a developer is going 
- * to use all (or several) of the SVN*Client classes and most of them will access  a 
- * repository (in that way when authentication is demanded), it becomes tiresome  to 
- * provide authentication info to every one of them. So, for managing purposes  like 
- * the previous one the  package  has got the class  called  SVNClientManager  whose 
- * get*Client() methods provide all necessary SVN*Client objects to a caller. 
- * 
- * A  developer once creates an instance of  SVNClientManager  providing (if needed) 
- * his  authentication  info/options (options  are  similar  to  the   SVN  run-time 
- * configuration settings that can be found in the config file) into an  appropriate 
- * SVNClientManager.newInstance(..) method. Further all SVN*Client objects  provided 
- * by the instance of SVNClientManager will use these authentication info/options.   
- *  
- * The program illustrates a  number  of  main  operations  usually carried out upon 
- * working copies and URLs. Here's a brief description  of  what  the  program  does 
- * (main steps):
- * 
- * 0)first of all initializes the  SVNKit  library  (it must be done prior to using 
- * the library);
- * 
- * 1)if the program was run with some in parameters, it fetches them out of the args 
- * parameter; the program expects the following input parameters: 
- * 
- * repositoryURL wcRootPath name password 
- * 
- * 2)next instantiates an SVNClientManager providing default options and  auth  info 
- * to it -  these parameters will be used by  all  SVN*Client  objects that will  be
- * created, kept and provided by the manager; default run-time options correspond to 
- * the client-side run-time settings found in the  'config'  file within the default 
- * SVN configuration area; also in this case the client manager will use the server-
- * side run-time settings found in the 'servers' file within the same area;
- * 
- * 3)the first operation  -  making an empty directory in a repository; that is like 
- * 'svn mkdir URL'  which  creates  a  new  directory  given  all  the  intermediate 
- * directories created); this operation is immediately committed to the repository;
- * 
- * 4)the next operation  - creating a new local directory (importDir) and a new file 
- * (importFile) in it and then importing the directory into the repository; 
- * 
- * 5)the next operation - checking out the directory created in the previous step to 
- * a local directory defined by the myWorkingCopyPath parameter ; 
- * 
- * 6)the next operation  -  recursively getting and displaying info for each item at 
- * the working revision in the working copy that was  checked  out  in  the previous 
- * step;
- * 
- * 7)the next operation - creating a new directory (newDir) with a file (newFile) in
- * the working copy and then  recursively  scheduling (if any subdirictories existed 
- * they would be also added:)) the created directory for addition;
- * 
- * 8)the next operation - recursively getting and displaying the working copy status
- * not including unchanged (normal) paths; the result must include those paths which
- * were scheduled for addition in the previous step; 
- * 
- * 9)the next operation  - recursively updating the working copy; if any local items
- * are out of date they will be updated to the latest revision;
- * 
- * 10)the next operation - committing local changes to the repository; this will add 
- * the directory with the file (that were  scheduled  for addition two steps before) 
- * to the repository;
- * 
- * 11)the next operation  -  locking  the  file  committed in the previous step (for 
- * example, if you temporarily need to keep a file locked to prevent someone's  else 
- * modifications);
- * 
- * 12)the next operation  -  showing status once again (here, to see that  the  file 
- * was locked);
- * 
- * 13)the next operation  -  copying  with  history  one  URL (url)  to another  one 
- * (copyURL) within the same repository;
- * 
- * 14)the next operation - switching the working copy to a different  URL  (copyURL)
- * where url was copied to in the previous step;
- * 
- * 15)the next operation  -  recursively  getting  and  displaying  info on the root 
- * directory of the working copy to demonstrate that the working copy is now  really
- * switched against copyURL;
- * 
- * 16)the next operation - scheduling the newDir directory for deletion;
- * 
- * 17)the next operation  -  showing  status  once  again  (here, to  see  that  the 
- * directory with all its entries were scheduled for deletion);
- * 
- * 18)the next operation - committing local changes to the repository; this operation
- * will delete the directory (newDir) with the file (newFile) that were scheduled for
- * deletion from the repository;
- * 
- *                                    * * *
- *                                    
- * This example can be  run  for a locally  installed  Subversion  repository via the 
- * svn:// protocol. This is how you can do it:
- * 
- * 1)after you install the Subversion on your machine (SVN is available for  download 
- * at  http://subversion.tigris.org/),  you should  create  a  new  repository  in  a 
- * directory, like this (in a command line under a Windows OS):
- * 
- * >svnadmin create X:\path\to\rep
- * 
- * 2)after the repository is created you can add a new account: open X:\path\to\rep\, 
- * then move into \conf and open the file - 'passwd'.  In  the file  you'll  see  the 
- * section [users]. Uncomment it and add a new account below the section name, like:
- * 
- * [users] 
- * userName = userPassword
- * 
- * In the program you may further use this account as user's credentials.
- * 
- * 3)the  next  step  is  to  launch  the  custom  Subversion  server (svnserve) in a 
- * background mode for the just created repository:
- * 
- * >svnserve -d -r X:\path\to
- * 
- * That's all. The repository is now available via  svn://localhost/rep.
- * 
- *                                    * * *
- * 
- * While  the  program  is  running, in your console  you'll see something like this:
-
- Making a new directory at 'svn://localhost/testRep/MyRepos'...
- Committed to revision 70
-
- Importing a new directory into 'svn://localhost/testRep/MyRepos/importDir'...
- Adding         importFile.txt
- Committed to revision 71
-
- Checking out a working copy from 'svn://localhost/testRep/MyRepos'...
- A         importDir
- A         importDir/importFile.txt
- At revision 71
-
- -----------------INFO-----------------
- Local Path: N:\MyWorkingCopy
- URL: svn://localhost/testRep/MyRepos
- Repository UUID: dbe83c44-f5aa-e043-94ec-ecdf6c56480f
- Revision: 71
- Node Kind: dir
- Schedule: normal
- Last Changed Author: userName
- Last Changed Revision: 71
- Last Changed Date: Thu Jul 21 23:43:15 NOVST 2005
- -----------------INFO-----------------
- Local Path: N:\MyWorkingCopy\importDir
- URL: svn://localhost/testRep/MyRepos/importDir
- Repository UUID: dbe83c44-f5aa-e043-94ec-ecdf6c56480f
- Revision: 71
- Node Kind: dir
- Schedule: normal
- Last Changed Author: userName
- Last Changed Revision: 71
- Last Changed Date: Thu Jul 21 23:43:15 NOVST 2005
- -----------------INFO-----------------
- Local Path: N:\MyWorkingCopy\importDir\importFile.txt
- URL: svn://localhost/testRep/MyRepos/importDir/importFile.txt
- Repository UUID: dbe83c44-f5aa-e043-94ec-ecdf6c56480f
- Revision: 71
- Node Kind: file
- Schedule: normal
- Last Changed Author: userName
- Last Changed Revision: 71
- Last Changed Date: Thu Jul 21 23:43:15 NOVST 2005
- Properties Last Updated: Thu Jul 21 23:43:16 NOVST 2005
- Text Last Updated: Thu Jul 21 23:43:16 NOVST 2005
- Checksum: 75e9e68e21ae4453f318424738aef57e
-
- Recursively scheduling a new directory 'N:\MyWorkingCopy\newDir' for addition...
- A     newDir
- A     newDir/newFile.txt
-
- Status for 'N:\MyWorkingCopy':
- A          0     ?    ?                 N:\MyWorkingCopy\newDir\newFile.txt
- A          0     ?    ?                 N:\MyWorkingCopy\newDir
-
- Updating 'N:\MyWorkingCopy'...
- At revision 71
-
- Committing changes for 'N:\MyWorkingCopy'...
- Adding         newDir
- Adding         newDir/newFile.txt
- Transmitting file data....
- Committed to revision 72
-
- Locking (with stealing if the entry is already locked) 'N:\MyWorkingCopy\newDir\newFile.txt'.
- L     newFile.txt
-
- Status for 'N:\MyWorkingCopy':
- K     72    72    userName         N:\MyWorkingCopy\newDir\newFile.txt
-
- Copying 'svn://localhost/testRep/MyRepos' to 'svn://localhost/testRep/MyReposCopy'...
- Committed to revision 73
-
- Switching 'N:\MyWorkingCopy' to 'svn://localhost/testRep/MyReposCopy'...
- B       newDir/newFile.txt
- At revision 73
-
- -----------------INFO-----------------
- Local Path: N:\MyWorkingCopy
- URL: svn://localhost/testRep/MyReposCopy
- Repository UUID: dbe83c44-f5aa-e043-94ec-ecdf6c56480f
- Revision: 73
- Node Kind: dir
- Schedule: normal
- Last Changed Author: userName
- Last Changed Revision: 73
- Last Changed Date: Thu Jul 21 23:43:19 NOVST 2005
- -----------------INFO-----------------
- Local Path: N:\MyWorkingCopy\importDir
- URL: svn://localhost/testRep/MyReposCopy/importDir
- Repository UUID: dbe83c44-f5aa-e043-94ec-ecdf6c56480f
- Revision: 73
- Node Kind: dir
- Schedule: normal
- Last Changed Author: userName
- Last Changed Revision: 71
- Last Changed Date: Thu Jul 21 23:43:15 NOVST 2005
- -----------------INFO-----------------
- Local Path: N:\MyWorkingCopy\importDir\importFile.txt
- URL: svn://localhost/testRep/MyReposCopy/importDir/importFile.txt
- Repository UUID: dbe83c44-f5aa-e043-94ec-ecdf6c56480f
- Revision: 73
- Node Kind: file
- Schedule: normal
- Last Changed Author: userName
- Last Changed Revision: 71
- Last Changed Date: Thu Jul 21 23:43:15 NOVST 2005
- Properties Last Updated: Thu Jul 21 23:43:16 NOVST 2005
- Text Last Updated: Thu Jul 21 23:43:16 NOVST 2005
- Checksum: 75e9e68e21ae4453f318424738aef57e
- -----------------INFO-----------------
- Local Path: N:\MyWorkingCopy\newDir
- URL: svn://localhost/testRep/MyReposCopy/newDir
- Repository UUID: dbe83c44-f5aa-e043-94ec-ecdf6c56480f
- Revision: 73
- Node Kind: dir
- Schedule: normal
- Last Changed Author: userName
- Last Changed Revision: 72
- Last Changed Date: Thu Jul 21 23:43:18 NOVST 2005
- -----------------INFO-----------------
- Local Path: N:\MyWorkingCopy\newDir\newFile.txt
- URL: svn://localhost/testRep/MyReposCopy/newDir/newFile.txt
- Repository UUID: dbe83c44-f5aa-e043-94ec-ecdf6c56480f
- Revision: 73
- Node Kind: file
- Schedule: normal
- Last Changed Author: userName
- Last Changed Revision: 72
- Last Changed Date: Thu Jul 21 23:43:18 NOVST 2005
- Properties Last Updated: Thu Jul 21 23:43:20 NOVST 2005
- Text Last Updated: Thu Jul 21 23:43:18 NOVST 2005
- Checksum: 023b67e9660b2faabaf84b10ba32c6cf
-
- Scheduling 'N:\MyWorkingCopy\newDir' for deletion ...
- D     newDir/newFile.txt
- D     newDir
-
- Status for 'N:\MyWorkingCopy':
- D          73    72    userName         N:\MyWorkingCopy\newDir\newFile.txt
- D          73    72    userName         N:\MyWorkingCopy\newDir
-
- Committing changes for 'N:\MyWorkingCopy'...
- Deleting   newDir
- Committed to revision 74
- * 
- */
-public class WorkingCopy {
-
-	private static SVNClientManager ourClientManager;
-	private static ISVNEventHandler myCommitEventHandler;
-	private static ISVNEventHandler myUpdateEventHandler;
-	private static ISVNEventHandler myWCEventHandler;
-
-	public static void main(String[] args) throws SVNException {
-		/*
-		 * Initializes the library (it must be done before ever using the
-		 * library itself)
-		 */
-		setupLibrary();
-
-		/*
-		 * Default values:
-		 */
-
-		/*
-		 * Assuming that 'svn://localhost/testRep' is an existing repository
-		 * path. SVNURL is a wrapper for URL strings that refer to repository
-		 * locations.
-		 */
-		SVNURL repositoryURL = null;
-		try {
-			repositoryURL = SVNURL.parseURIEncoded("svn://localhost/testRep");
-		} catch (SVNException e) {
-			//
-		}
-		String name = "userName";
-		String password = "userPassword";
-		String myWorkingCopyPath = "/MyWorkingCopy";
-
-		String importDir = "/importDir";
-		String importFile = importDir + "/importFile.txt";
-		String importFileText = "This unversioned file is imported into a repository";
-
-		String newDir = "/newDir";
-		String newFile = newDir + "/newFile.txt";
-		String fileText = "This is a new file added to the working copy";
-
-		if (args != null) {
-			/*
-			 * Obtains a URL that represents an already existing repository
-			 */
-			try {
-				repositoryURL = (args.length >= 1) ? SVNURL
-						.parseURIEncoded(args[0]) : repositoryURL;
-			} catch (SVNException e) {
-				System.err.println("'" + args[0] + "' is not a valid URL");
-				System.exit(1);
-			}
-			/*
-			 * Obtains a path to be a working copy root directory
-			 */
-			myWorkingCopyPath = (args.length >= 2) ? args[1]
-					: myWorkingCopyPath;
-			/*
-			 * Obtains an account name
-			 */
-			name = (args.length >= 3) ? args[2] : name;
-			/*
-			 * Obtains a password
-			 */
-			password = (args.length >= 4) ? args[3] : password;
-		}
-
-		/*
-		 * That's where a new directory will be created
-		 */
-		SVNURL url = repositoryURL.appendPath("MyRepos", false);
-		/*
-		 * That's where '/MyRepos' will be copied to (branched)
-		 */
-		SVNURL copyURL = repositoryURL.appendPath("MyReposCopy", false);
-		/*
-		 * That's where a local directory will be imported into. Note that it's
-		 * not necessary that the '/importDir' directory must already exist -
-		 * the SVN repository server will take care of creating it.
-		 */
-		SVNURL importToURL = url.appendPath(importDir, false);
-
-		/*
-		 * Creating custom handlers that will process events
-		 */
-		myCommitEventHandler = new CommitEventHandler();
-
-		myUpdateEventHandler = new UpdateEventHandler();
-
-		myWCEventHandler = new WCEventHandler();
-
-		/*
-		 * Creates a default run-time configuration options driver. Default
-		 * options created in this way use the Subversion run-time configuration
-		 * area (for instance, on a Windows platform it can be found in the
-		 * '%APPDATA%\Subversion' directory).
-		 * 
-		 * readonly = true - not to save any configuration changes that can be
-		 * done during the program run to a config file (config settings will
-		 * only be read to initialize; to enable changes the readonly flag
-		 * should be set to false).
-		 * 
-		 * SVNWCUtil is a utility class that creates a default options driver.
-		 */
-		ISVNOptions options = SVNWCUtil.createDefaultOptions(true);
-
-		/*
-		 * Creates an instance of SVNClientManager providing authentication
-		 * information (name, password) and an options driver
-		 */
-		ourClientManager = SVNClientManager
-				.newInstance(options, name, password);
-
-		/*
-		 * Sets a custom event handler for operations of an SVNCommitClient
-		 * instance
-		 */
-		ourClientManager.getCommitClient()
-				.setEventHandler(myCommitEventHandler);
-
-		/*
-		 * Sets a custom event handler for operations of an SVNUpdateClient
-		 * instance
-		 */
-		ourClientManager.getUpdateClient()
-				.setEventHandler(myUpdateEventHandler);
-
-		/*
-		 * Sets a custom event handler for operations of an SVNWCClient instance
-		 */
-		ourClientManager.getWCClient().setEventHandler(myWCEventHandler);
-
-		long committedRevision = -1;
-		System.out.println("Making a new directory at '" + url + "'...");
-		try {
-			/*
-			 * creates a new version comtrolled directory in a repository and
-			 * displays what revision the repository was committed to
-			 */
-			committedRevision = makeDirectory(url,
-					"making a new directory at '" + url + "'").getNewRevision();
-		} catch (SVNException svne) {
-			error("error while making a new directory at '" + url + "'", svne);
-		}
-		System.out.println("Committed to revision " + committedRevision);
-		System.out.println();
-
-		File anImportDir = new File(importDir);
-		File anImportFile = new File(anImportDir, SVNPathUtil.tail(importFile));
-		/*
-		 * creates a new local directory - './importDir' and a new file -
-		 * './importDir/importFile.txt' that will be imported into the
-		 * repository into the '/MyRepos/importDir' directory
-		 */
-		createLocalDir(anImportDir, new File[] { anImportFile },
-				new String[] { importFileText });
-
-		System.out.println("Importing a new directory into '" + importToURL
-				+ "'...");
-		try {
-			/*
-			 * recursively imports an unversioned directory into a repository
-			 * and displays what revision the repository was committed to
-			 */
-			boolean isRecursive = true;
-			committedRevision = importDirectory(
-					anImportDir,
-					importToURL,
-					"importing a new directory '"
-							+ anImportDir.getAbsolutePath() + "'", isRecursive)
-					.getNewRevision();
-		} catch (SVNException svne) {
-			error("error while importing a new directory '"
-					+ anImportDir.getAbsolutePath() + "' into '" + importToURL
-					+ "'", svne);
-		}
-		System.out.println("Committed to revision " + committedRevision);
-		System.out.println();
-
-		/*
-		 * creates a local directory where the working copy will be checked out
-		 * into
-		 */
-		File wcDir = new File(myWorkingCopyPath);
-		if (wcDir.exists()) {
-			error("the destination directory '" + wcDir.getAbsolutePath()
-					+ "' already exists!", null);
-		}
-		wcDir.mkdirs();
-
-		System.out.println("Checking out a working copy from '" + url + "'...");
-		try {
-			/*
-			 * recursively checks out a working copy from url into wcDir.
-			 * SVNRevision.HEAD means the latest revision to be checked out.
-			 */
-			checkout(url, SVNRevision.HEAD, wcDir, true);
-		} catch (SVNException svne) {
-			error("error while checking out a working copy for the location '"
-					+ url + "'", svne);
-		}
-		System.out.println();
-
-		/*
-		 * recursively displays info for wcDir at the current working revision
-		 * in the manner of 'svn info -R' command
-		 */
-		try {
-			showInfo(wcDir, SVNRevision.WORKING, true);
-		} catch (SVNException svne) {
-			error(
-					"error while recursively getting info for the working copy at'"
-							+ wcDir.getAbsolutePath() + "'", svne);
-		}
-		System.out.println();
-
-		File aNewDir = new File(wcDir, newDir);
-		File aNewFile = new File(aNewDir, SVNPathUtil.tail(newFile));
-		/*
-		 * creates a new local directory - 'wcDir/newDir' and a new file -
-		 * '/MyWorkspace/newDir/newFile.txt'
-		 */
-		createLocalDir(aNewDir, new File[] { aNewFile },
-				new String[] { fileText });
-
-		System.out.println("Recursively scheduling a new directory '"
-				+ aNewDir.getAbsolutePath() + "' for addition...");
-		try {
-			/*
-			 * recursively schedules aNewDir for addition
-			 */
-			addEntry(aNewDir);
-		} catch (SVNException svne) {
-			error("error while recursively adding the directory '"
-					+ aNewDir.getAbsolutePath() + "'", svne);
-		}
-		System.out.println();
-
-		boolean isRecursive = true;
-		boolean isRemote = true;
-		boolean isReportAll = false;
-		boolean isIncludeIgnored = true;
-		boolean isCollectParentExternals = false;
-		System.out.println("Status for '" + wcDir.getAbsolutePath() + "':");
-		try {
-			/*
-			 * gets and shows status information for the WC directory. status
-			 * will be recursive on wcDir, will also cover the repository, won't
-			 * cover unmodified entries, will disregard 'svn:ignore' property
-			 * ignores (if any), will ignore externals definitions.
-			 */
-			showStatus(wcDir, isRecursive, isRemote, isReportAll,
-					isIncludeIgnored, isCollectParentExternals);
-		} catch (SVNException svne) {
-			error("error while recursively performing status for '"
-					+ wcDir.getAbsolutePath() + "'", svne);
-		}
-		System.out.println();
-
-		System.out.println("Updating '" + wcDir.getAbsolutePath() + "'...");
-		try {
-			/*
-			 * recursively updates wcDir to the latest revision
-			 * (SVNRevision.HEAD)
-			 */
-			update(wcDir, SVNRevision.HEAD, true);
-		} catch (SVNException svne) {
-			error("error while recursively updating the working copy at '"
-					+ wcDir.getAbsolutePath() + "'", svne);
-		}
-		System.out.println("");
-
-		System.out.println("Committing changes for '" + wcDir.getAbsolutePath()
-				+ "'...");
-		try {
-			/*
-			 * commits changes in wcDir to the repository with not leaving items
-			 * locked (if any) after the commit succeeds; this will add aNewDir &
-			 * aNewFile to the repository.
-			 */
-			committedRevision = commit(wcDir, false,
-					"'/newDir' with '/newDir/newFile.txt' were added")
-					.getNewRevision();
-		} catch (SVNException svne) {
-			error("error while committing changes to the working copy at '"
-					+ wcDir.getAbsolutePath() + "'", svne);
-		}
-		System.out.println("Committed to revision " + committedRevision);
-		System.out.println();
-
-		System.out
-				.println("Locking (with stealing if the entry is already locked) '"
-						+ aNewFile.getAbsolutePath() + "'.");
-		try {
-			/*
-			 * locks aNewFile with stealing (if it has been already locked by
-			 * someone else), providing a lock comment
-			 */
-			lock(aNewFile, true, "locking '/newDir/newFile.txt'");
-		} catch (SVNException svne) {
-			error("error while locking the working copy file '"
-					+ aNewFile.getAbsolutePath() + "'", svne);
-		}
-		System.out.println();
-
-		System.out.println("Status for '" + wcDir.getAbsolutePath() + "':");
-		try {
-			/*
-			 * displays status once again to see the file is really locked
-			 */
-			showStatus(wcDir, isRecursive, isRemote, isReportAll,
-					isIncludeIgnored, isCollectParentExternals);
-		} catch (SVNException svne) {
-			error("error while recursively performing status for '"
-					+ wcDir.getAbsolutePath() + "'", svne);
-		}
-		System.out.println();
-
-		System.out.println("Copying '" + url + "' to '" + copyURL + "'...");
-		try {
-			/*
-			 * makes a branch of url at copyURL - that is URL->URL copying with
-			 * history
-			 */
-			committedRevision = copy(url, copyURL, false,
-					"remotely copying '" + url + "' to '" + copyURL + "'")
-					.getNewRevision();
-		} catch (SVNException svne) {
-			error("error while copying '" + url + "' to '" + copyURL + "'",
-					svne);
-		}
-		/*
-		 * displays what revision the repository was committed to
-		 */
-		System.out.println("Committed to revision " + committedRevision);
-		System.out.println();
-
-		System.out.println("Switching '" + wcDir.getAbsolutePath() + "' to '"
-				+ copyURL + "'...");
-		try {
-			/*
-			 * recursively switches wcDir to copyURL in the latest revision
-			 * (SVNRevision.HEAD)
-			 */
-			switchToURL(wcDir, copyURL, SVNRevision.HEAD, true);
-		} catch (SVNException svne) {
-			error("error while switching '" + wcDir.getAbsolutePath()
-					+ "' to '" + copyURL + "'", svne);
-		}
-		System.out.println();
-
-		/*
-		 * recursively displays info for the working copy once again to see it
-		 * was really switched to a new URL
-		 */
-		try {
-			showInfo(wcDir, SVNRevision.WORKING, true);
-		} catch (SVNException svne) {
-			error(
-					"error while recursively getting info for the working copy at'"
-							+ wcDir.getAbsolutePath() + "'", svne);
-		}
-		System.out.println();
-
-		System.out.println("Scheduling '" + aNewDir.getAbsolutePath()
-				+ "' for deletion ...");
-		try {
-			/*
-			 * schedules aNewDir for deletion (with forcing)
-			 */
-			delete(aNewDir, true);
-		} catch (SVNException svne) {
-			error("error while schediling '" + wcDir.getAbsolutePath()
-					+ "' for deletion", svne);
-		}
-		System.out.println();
-
-		System.out.println("Status for '" + wcDir.getAbsolutePath() + "':");
-		try {
-			/*
-			 * recursively displays status once more to see whether aNewDir was
-			 * really scheduled for deletion
-			 */
-			showStatus(wcDir, isRecursive, isRemote, isReportAll,
-					isIncludeIgnored, isCollectParentExternals);
-		} catch (SVNException svne) {
-			error("error while recursively performing status for '"
-					+ wcDir.getAbsolutePath() + "'", svne);
-		}
-		System.out.println();
-
-		System.out.println("Committing changes for '" + wcDir.getAbsolutePath()
-				+ "'...");
-		try {
-			/*
-			 * lastly commits changes in wcDir to the repository; all items that
-			 * were locked by the user (if any) will be unlocked after the
-			 * commit succeeds; this commit will remove aNewDir from the
-			 * repository.
-			 */
-			committedRevision = commit(
-					wcDir,
-					false,
-					"deleting '"
-							+ aNewDir.getAbsolutePath()
-							+ "' from the filesystem as well as from the repository")
-					.getNewRevision();
-		} catch (SVNException svne) {
-			error("error while committing changes to the working copy '"
-					+ wcDir.getAbsolutePath() + "'", svne);
-		}
-		System.out.println("Committed to revision " + committedRevision);
-		System.exit(0);
-	}
-
-	/*
-	 * Initializes the library to work with a repository via different
-	 * protocols.
-	 */
-	private static void setupLibrary() {
-		/*
-		 * For using over http:// and https://
-		 */
-		DAVRepositoryFactory.setup();
-		/*
-		 * For using over svn:// and svn+xxx://
-		 */
-		SVNRepositoryFactoryImpl.setup();
-
-		/*
-		 * For using over file:///
-		 */
-		FSRepositoryFactory.setup();
-	}
-
-	/*
-	 * Creates a new version controlled directory (doesn't create any
-	 * intermediate directories) right in a repository. Like 'svn mkdir URL -m
-	 * "some comment"' command. It's done by invoking
-	 * 
-	 * SVNCommitClient.doMkDir(SVNURL[] urls, String commitMessage)
-	 * 
-	 * which takes the following parameters:
-	 * 
-	 * urls - an array of URLs that are to be created;
-	 * 
-	 * commitMessage - a commit log message since a URL-based directory creation
-	 * is immediately committed to a repository.
-	 */
-	private static SVNCommitInfo makeDirectory(SVNURL url, String commitMessage)
-			throws SVNException {
-		/*
-		 * Returns SVNCommitInfo containing information on the new revision
-		 * committed (revision number, etc.)
-		 */
-		return ourClientManager.getCommitClient().doMkDir(new SVNURL[] { url },
-				commitMessage);
-	}
-
-	/*
-	 * Imports an unversioned directory into a repository location denoted by a
-	 * destination URL (all necessary parent non-existent paths will be created
-	 * automatically). This operation commits the repository to a new revision.
-	 * Like 'svn import PATH URL (-N) -m "some comment"' command. It's done by
-	 * invoking
-	 * 
-	 * SVNCommitClient.doImport(File path, SVNURL dstURL, String commitMessage,
-	 * boolean recursive)
-	 * 
-	 * which takes the following parameters:
-	 * 
-	 * path - a local unversioned directory or singal file that will be imported
-	 * into a repository;
-	 * 
-	 * dstURL - a repository location where the local unversioned directory/file
-	 * will be imported into; this URL path may contain non-existent parent
-	 * paths that will be created by the repository server;
-	 * 
-	 * commitMessage - a commit log message since the new directory/file are
-	 * immediately created in the repository;
-	 * 
-	 * recursive - if true and path parameter corresponds to a directory then
-	 * the directory will be added with all its child subdirictories, otherwise
-	 * the operation will cover only the directory itself (only those files
-	 * which are located in the directory).
-	 */
-	private static SVNCommitInfo importDirectory(File localPath, SVNURL dstURL,
-			String commitMessage, boolean isRecursive) throws SVNException {
-		/*
-		 * Returns SVNCommitInfo containing information on the new revision
-		 * committed (revision number, etc.)
-		 */
-		return ourClientManager.getCommitClient().doImport(localPath, dstURL,
-				commitMessage, isRecursive);
-
-	}
-
-	/*
-	 * Committs changes in a working copy to a repository. Like 'svn commit PATH
-	 * -m "some comment"' command. It's done by invoking
-	 * 
-	 * SVNCommitClient.doCommit(File[] paths, boolean keepLocks, String
-	 * commitMessage, boolean force, boolean recursive)
-	 * 
-	 * which takes the following parameters:
-	 * 
-	 * paths - working copy paths which changes are to be committed;
-	 * 
-	 * keepLocks - if true then doCommit(..) won't unlock locked paths;
-	 * otherwise they will be unlocked after a successful commit;
-	 * 
-	 * commitMessage - a commit log message;
-	 * 
-	 * force - if true then a non-recursive commit will be forced anyway;
-	 * 
-	 * recursive - if true and a path corresponds to a directory then
-	 * doCommit(..) recursively commits changes for the entire directory,
-	 * otherwise - only for child entries of the directory;
-	 */
-	private static SVNCommitInfo commit(File wcPath, boolean keepLocks,
-			String commitMessage) throws SVNException {
-		/*
-		 * Returns SVNCommitInfo containing information on the new revision
-		 * committed (revision number, etc.)
-		 */
-		return ourClientManager.getCommitClient().doCommit(
-				new File[] { wcPath }, keepLocks, commitMessage, false, true);
-	}
-
-	/*
-	 * Checks out a working copy from a repository. Like 'svn checkout URL[@REV]
-	 * PATH (-r..)' command; It's done by invoking
-	 * 
-	 * SVNUpdateClient.doCheckout(SVNURL url, File dstPath, SVNRevision
-	 * pegRevision, SVNRevision revision, boolean recursive)
-	 * 
-	 * which takes the following parameters:
-	 * 
-	 * url - a repository location from where a working copy is to be checked
-	 * out;
-	 * 
-	 * dstPath - a local path where the working copy will be fetched into;
-	 * 
-	 * pegRevision - an SVNRevision representing a revision to concretize url
-	 * (what exactly URL a user means and is sure of being the URL he needs); in
-	 * other words that is the revision in which the URL is first looked up;
-	 * 
-	 * revision - a revision at which a working copy being checked out is to be;
-	 * 
-	 * recursive - if true and url corresponds to a directory then
-	 * doCheckout(..) recursively fetches out the entire directory, otherwise -
-	 * only child entries of the directory;
-	 */
-	private static long checkout(SVNURL url, SVNRevision revision,
-			File destPath, boolean isRecursive) throws SVNException {
-
-		SVNUpdateClient updateClient = ourClientManager.getUpdateClient();
-		/*
-		 * sets externals not to be ignored during the checkout
-		 */
-		updateClient.setIgnoreExternals(false);
-		/*
-		 * returns the number of the revision at which the working copy is
-		 */
-		return updateClient.doCheckout(url, destPath, revision, revision,
-				isRecursive);
-	}
-
-	/*
-	 * Updates a working copy (brings changes from the repository into the
-	 * working copy). Like 'svn update PATH' command; It's done by invoking
-	 * 
-	 * SVNUpdateClient.doUpdate(File file, SVNRevision revision, boolean
-	 * recursive)
-	 * 
-	 * which takes the following parameters:
-	 * 
-	 * file - a working copy entry that is to be updated;
-	 * 
-	 * revision - a revision to which a working copy is to be updated;
-	 * 
-	 * recursive - if true and an entry is a directory then doUpdate(..)
-	 * recursively updates the entire directory, otherwise - only child entries
-	 * of the directory;
-	 */
-	private static long update(File wcPath, SVNRevision updateToRevision,
-			boolean isRecursive) throws SVNException {
-
-		SVNUpdateClient updateClient = ourClientManager.getUpdateClient();
-		/*
-		 * sets externals not to be ignored during the update
-		 */
-		updateClient.setIgnoreExternals(false);
-		/*
-		 * returns the number of the revision wcPath was updated to
-		 */
-		return updateClient.doUpdate(wcPath, updateToRevision, isRecursive);
-	}
-
-	/*
-	 * Updates a working copy to a different URL. Like 'svn switch URL' command.
-	 * It's done by invoking
-	 * 
-	 * SVNUpdateClient.doSwitch(File file, SVNURL url, SVNRevision revision,
-	 * boolean recursive)
-	 * 
-	 * which takes the following parameters:
-	 * 
-	 * file - a working copy entry that is to be switched to a new url;
-	 * 
-	 * url - a target URL a working copy is to be updated against;
-	 * 
-	 * revision - a revision to which a working copy is to be updated;
-	 * 
-	 * recursive - if true and an entry (file) is a directory then doSwitch(..)
-	 * recursively switches the entire directory, otherwise - only child entries
-	 * of the directory;
-	 */
-	private static long switchToURL(File wcPath, SVNURL url,
-			SVNRevision updateToRevision, boolean isRecursive)
-			throws SVNException {
-		SVNUpdateClient updateClient = ourClientManager.getUpdateClient();
-		/*
-		 * sets externals not to be ignored during the switch
-		 */
-		updateClient.setIgnoreExternals(false);
-		/*
-		 * returns the number of the revision wcPath was updated to
-		 */
-		return updateClient
-				.doSwitch(wcPath, url, updateToRevision, isRecursive);
-	}
-
-	/*
-	 * Collects status information on local path(s). Like 'svn status (-u) (-N)'
-	 * command. It's done by invoking
-	 * 
-	 * SVNStatusClient.doStatus(File path, boolean recursive, boolean remote,
-	 * boolean reportAll, boolean includeIgnored, boolean
-	 * collectParentExternals, ISVNStatusHandler handler)
-	 * 
-	 * which takes the following parameters:
-	 * 
-	 * path - an entry which status info to be gathered;
-	 * 
-	 * recursive - if true and an entry is a directory then doStatus(..)
-	 * collects status info not only for that directory but for each item inside
-	 * stepping down recursively;
-	 * 
-	 * remote - if true then doStatus(..) will cover the repository (not only
-	 * the working copy) as well to find out what entries are out of date;
-	 * 
-	 * reportAll - if true then doStatus(..) will also include unmodified
-	 * entries;
-	 * 
-	 * includeIgnored - if true then doStatus(..) will also include entries
-	 * being ignored;
-	 * 
-	 * collectParentExternals - if true then externals definitions won't be
-	 * ignored;
-	 * 
-	 * handler - an implementation of ISVNStatusHandler to process status info
-	 * per each entry doStatus(..) traverses; such info is collected in an
-	 * SVNStatus object and is passed to a handler's handleStatus(SVNStatus
-	 * status) method where an implementor decides what to do with it.
-	 */
-	private static void showStatus(File wcPath, boolean isRecursive,
-			boolean isRemote, boolean isReportAll, boolean isIncludeIgnored,
-			boolean isCollectParentExternals) throws SVNException {
-		/*
-		 * StatusHandler displays status information for each entry in the
-		 * console (in the manner of the native Subversion command line client)
-		 */
-		ourClientManager.getStatusClient().doStatus(wcPath, isRecursive,
-				isRemote, isReportAll, isIncludeIgnored,
-				isCollectParentExternals, new StatusHandler(isRemote));
-	}
-
-	/*
-	 * Collects information on local path(s). Like 'svn info (-R)' command. It's
-	 * done by invoking
-	 * 
-	 * SVNWCClient.doInfo(File path, SVNRevision revision, boolean recursive,
-	 * ISVNInfoHandler handler)
-	 * 
-	 * which takes the following parameters:
-	 * 
-	 * path - a local entry for which info will be collected;
-	 * 
-	 * revision - a revision of an entry which info is interested in; if it's
-	 * not WORKING then info is got from a repository;
-	 * 
-	 * recursive - if true and an entry is a directory then doInfo(..) collects
-	 * info not only for that directory but for each item inside stepping down
-	 * recursively;
-	 * 
-	 * handler - an implementation of ISVNInfoHandler to process info per each
-	 * entry doInfo(..) traverses; such info is collected in an SVNInfo object
-	 * and is passed to a handler's handleInfo(SVNInfo info) method where an
-	 * implementor decides what to do with it.
-	 */
-	private static void showInfo(File wcPath, SVNRevision revision,
-			boolean isRecursive) throws SVNException {
-		/*
-		 * InfoHandler displays information for each entry in the console (in
-		 * the manner of the native Subversion command line client)
-		 */
-		ourClientManager.getWCClient().doInfo(wcPath, revision, isRecursive,
-				new InfoHandler());
-	}
-
-	/*
-	 * Puts directories and files under version control scheduling them for
-	 * addition to a repository. They will be added in a next commit. Like 'svn
-	 * add PATH' command. It's done by invoking
-	 * 
-	 * SVNWCClient.doAdd(File path, boolean force, boolean mkdir, boolean
-	 * climbUnversionedParents, boolean recursive)
-	 * 
-	 * which takes the following parameters:
-	 * 
-	 * path - an entry to be scheduled for addition;
-	 * 
-	 * force - set to true to force an addition of an entry anyway;
-	 * 
-	 * mkdir - if true doAdd(..) creates an empty directory at path and
-	 * schedules it for addition, like 'svn mkdir PATH' command;
-	 * 
-	 * climbUnversionedParents - if true and the parent of the entry to be
-	 * scheduled for addition is not under version control, then doAdd(..)
-	 * automatically schedules the parent for addition, too;
-	 * 
-	 * recursive - if true and an entry is a directory then doAdd(..)
-	 * recursively schedules all its inner dir entries for addition as well.
-	 */
-	private static void addEntry(File wcPath) throws SVNException {
-		ourClientManager.getWCClient().doAdd(wcPath, false, false, false, true);
-	}
-
-	/*
-	 * Locks working copy paths, so that no other user can commit changes to
-	 * them. Like 'svn lock PATH' command. It's done by invoking
-	 * 
-	 * SVNWCClient.doLock(File[] paths, boolean stealLock, String lockMessage)
-	 * 
-	 * which takes the following parameters:
-	 * 
-	 * paths - an array of local entries to be locked;
-	 * 
-	 * stealLock - set to true to steal the lock from another user or working
-	 * copy;
-	 * 
-	 * lockMessage - an optional lock comment string.
-	 */
-	private static void lock(File wcPath, boolean isStealLock,
-			String lockComment) throws SVNException {
-		ourClientManager.getWCClient().doLock(new File[] { wcPath },
-				isStealLock, lockComment);
-	}
-
-	/*
-	 * Schedules directories and files for deletion from version control upon
-	 * the next commit (locally). Like 'svn delete PATH' command. It's done by
-	 * invoking
-	 * 
-	 * SVNWCClient.doDelete(File path, boolean force, boolean dryRun)
-	 * 
-	 * which takes the following parameters:
-	 * 
-	 * path - an entry to be scheduled for deletion;
-	 * 
-	 * force - a boolean flag which is set to true to force a deletion even if
-	 * an entry has local modifications;
-	 * 
-	 * dryRun - set to true not to delete an entry but to check if it can be
-	 * deleted; if false - then it's a deletion itself.
-	 */
-	private static void delete(File wcPath, boolean force) throws SVNException {
-		ourClientManager.getWCClient().doDelete(wcPath, force, false);
-	}
-
-	/*
-	 * Duplicates srcURL to dstURL (URL->URL)in a repository remembering
-	 * history. Like 'svn copy srcURL dstURL -m "some comment"' command. It's
-	 * done by invoking
-	 * 
-	 * doCopy(SVNURL srcURL, SVNRevision srcRevision, SVNURL dstURL, boolean
-	 * isMove, String commitMessage)
-	 * 
-	 * which takes the following parameters:
-	 * 
-	 * srcURL - a source URL that is to be copied;
-	 * 
-	 * srcRevision - a definite revision of srcURL
-	 * 
-	 * dstURL - a URL where srcURL will be copied; if srcURL & dstURL are both
-	 * directories then there are two cases: a) dstURL already exists - then
-	 * doCopy(..) will duplicate the entire source directory and put it inside
-	 * dstURL (for example, consider srcURL = svn://localhost/rep/MyRepos,
-	 * dstURL = svn://localhost/rep/MyReposCopy, in this case if doCopy(..)
-	 * succeeds MyRepos will be in MyReposCopy -
-	 * svn://localhost/rep/MyReposCopy/MyRepos); b) dstURL doesn't exist yet -
-	 * then doCopy(..) will create a directory and recursively copy entries from
-	 * srcURL into dstURL (for example, consider the same srcURL =
-	 * svn://localhost/rep/MyRepos, dstURL = svn://localhost/rep/MyReposCopy, in
-	 * this case if doCopy(..) succeeds MyRepos entries will be in MyReposCopy,
-	 * like: svn://localhost/rep/MyRepos/Dir1 ->
-	 * svn://localhost/rep/MyReposCopy/Dir1...);
-	 * 
-	 * isMove - if false then srcURL is only copied to dstURL what corresponds
-	 * to 'svn copy srcURL dstURL -m "some comment"'; but if it's true then
-	 * srcURL will be copied and deleted - 'svn move srcURL dstURL -m "some
-	 * comment"';
-	 * 
-	 * commitMessage - a commit log message since URL->URL copying is
-	 * immediately committed to a repository.
-	 */
-	private static SVNCommitInfo copy(SVNURL srcURL, SVNURL dstURL,
-			boolean isMove, String commitMessage) throws SVNException {
-		/*
-		 * SVNRevision.HEAD means the latest revision. Returns SVNCommitInfo
-		 * containing information on the new revision committed (revision
-		 * number, etc.)
-		 */
-		return null;
-//		return ourClientManager.getCopyClient().doCopy(
-//				new SVNCopySource[] { new SVNCopySource(SVNRevision.HEAD,
-//						SVNRevision.HEAD, srcURL) }, dstURL, isMove, true,
-//				false, commitMessage, null);
-	}
-
-	/*
-	 * Displays error information and exits.
-	 */
-	private static void error(String message, Exception e) {
-		System.err.println(message + (e != null ? ": " + e.getMessage() : ""));
-		System.exit(1);
-	}
-
-	/*
-	 * This method does not relate to SVNKit API. Just a method which creates
-	 * local directories and files :)
-	 */
-	private static final void createLocalDir(File aNewDir, File[] localFiles,
-			String[] fileContents) {
-		if (!aNewDir.mkdirs()) {
-			error("failed to create a new directory '"
-					+ aNewDir.getAbsolutePath() + "'.", null);
-		}
-		for (int i = 0; i < localFiles.length; i++) {
-			File aNewFile = localFiles[i];
-			try {
-				if (!aNewFile.createNewFile()) {
-					error("failed to create a new file '"
-							+ aNewFile.getAbsolutePath() + "'.", null);
-				}
-			} catch (IOException ioe) {
-				aNewFile.delete();
-				error("error while creating a new file '"
-						+ aNewFile.getAbsolutePath() + "'", ioe);
-			}
-
-			String contents = null;
-			if (i > fileContents.length - 1) {
-				continue;
-			}
-			contents = fileContents[i];
-
-			/*
-			 * writing a text into the file
-			 */
-			FileOutputStream fos = null;
-			try {
-				fos = new FileOutputStream(aNewFile);
-				fos.write(contents.getBytes());
-			} catch (FileNotFoundException fnfe) {
-				error("the file '" + aNewFile.getAbsolutePath()
-						+ "' is not found", fnfe);
-			} catch (IOException ioe) {
-				error("error while writing into the file '"
-						+ aNewFile.getAbsolutePath() + "'", ioe);
-			} finally {
-				if (fos != null) {
-					try {
-						fos.close();
-					} catch (IOException ioe) {
-						//
-					}
-				}
-			}
-		}
-	}
-}